pool/linux-atm
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 435704 from home:Andreas_Schwab:Factory

Browse Source 
- linux-atm-2.5.2-fix-header-conflict.patch: avoid conflict with kernel
  headers

OBS-URL: https://build.opensuse.org/request/show/435704
OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-atm?expand=0&rev=17
This commit is contained in:
Dirk Mueller 2016-10-17 12:51:51 +00:00 committed by Git OBS Bridge
parent a6b729bdf1
commit ceb1fd2758
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
linux-atm-2.5.2-fix-header-conflict.patch Normal file
View File

@ -0,0 +1,12 @@
Index: linux-atm-2.5.2/src/maint/zntune.c
===================================================================
--- linux-atm-2.5.2.orig/src/maint/zntune.c
+++ linux-atm-2.5.2/src/maint/zntune.c
@@ -14,6 +14,7 @@
#include <sys/ioctl.h>
#include <atm.h>
#include <sys/time.h> /* for struct timeval, although it's not used */
+#define _LINUX_TIME_H /* block linux/time.h from being included */
#include <linux/atm_zatm.h>

6
linux-atm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Oct 17 09:36:39 UTC 2016 - schwab@suse.de
- linux-atm-2.5.2-fix-header-conflict.patch: avoid conflict with kernel
headers
-------------------------------------------------------------------
Thu Jan 23 21:59:12 UTC 2014 - aj@ajaissle.de

5
linux-atm.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package linux-atm
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -30,6 +30,8 @@ Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{versi
Patch0: linux-atm-2.5.2_fdleak.patch
# PATCH-FIX-UPSTREAM linux-atm-2.5.2_implicit-fortify-decl.patch -- fix implicit declarations
Patch1: linux-atm-2.5.2_implicit-fortify-decl.patch
# PATCH-FIX-UPSTREAM linux-atm-2.5.2-fix-header-conflict.patch -- avoid conflict with kernel headers
Patch2: linux-atm-2.5.2-fix-header-conflict.patch
BuildRequires: bison
BuildRequires: flex
@ -63,6 +65,7 @@ networking.
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%configure --disable-static