Hello community, here is the log from the commit of package linux-atm for openSUSE:Factory checked in at 2019-01-15 09:09:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linux-atm (Old) and /work/SRC/openSUSE:Factory/.linux-atm.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linux-atm" Tue Jan 15 09:09:12 2019 rev:27 rq:664380 version:2.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/linux-atm/linux-atm.changes 2016-11-04 20:48:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.linux-atm.new.28833/linux-atm.changes 2019-01-15 09:09:28.574618546 +0100 @@ -1,0 +2,6 @@ +Wed Jan 9 08:45:59 UTC 2019 - Jiri Slaby <[email protected]> + +- add linux-atm-2.5.2-remove-headers-crude-hack.patch +- switch from %doc to %license for licenses + +------------------------------------------------------------------- New: ---- linux-atm-2.5.2-remove-headers-crude-hack.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linux-atm.spec ++++++ --- /var/tmp/diff_new_pack.tuwJSD/_old 2019-01-15 09:09:28.994618161 +0100 +++ /var/tmp/diff_new_pack.tuwJSD/_new 2019-01-15 09:09:28.998618156 +0100 @@ -1,7 +1,7 @@ # # spec file for package linux-atm # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,7 +21,7 @@ Release: 0 %global sover 1 Summary: Tools for ATM -License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ +License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Networking/Other Url: http://linux-atm.sourceforge.net/ @@ -32,6 +32,8 @@ 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 +# PATCH-FIX-UPSTREAM linux-atm-2.5.2-remove-headers-crude-hack.patch -- Remove headers crude hack +Patch3: linux-atm-2.5.2-remove-headers-crude-hack.patch BuildRequires: bison BuildRequires: flex @@ -63,9 +65,7 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autopatch -p1 %build %configure --disable-static @@ -87,7 +87,7 @@ %{_sbindir}/* /lib/firmware/* %doc README AUTHORS ChangeLog NEWS THANKS BUGS -%doc COPYING COPYING.GPL COPYING.LGPL +%license COPYING COPYING.GPL COPYING.LGPL %doc %{_mandir}/man*/*.gz %files -n libatm%{sover} ++++++ linux-atm-2.5.2-remove-headers-crude-hack.patch ++++++ From: Jiri Slaby <[email protected]> Subject: Remove headers crude hack Now, the glibc headers seem to be fixed, so remove this hack which prevents build on systems with kernel >= 4.20. linux/if_arp.h really needs to include linux/netdevice.h to have IFNAMSIZ defined. If not, the build fails miserably: gcc -DHAVE_CONFIG_H -I. -I../.. -I../../src/include -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -g -Wall -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -c itf.c In file included from itf.c:17: /usr/include/linux/if_arp.h:121:16: error: 'IFNAMSIZ' undeclared here (not in a function) char arp_dev[IFNAMSIZ]; ^~~~~~~~ --- src/arpd/arp.c | 1 - src/arpd/io.c | 1 - src/arpd/itf.c | 1 - 3 files changed, 3 deletions(-) --- a/src/arpd/arp.c +++ b/src/arpd/arp.c @@ -15,7 +15,6 @@ #include <sys/types.h> #include <sys/socket.h> /* for linux/if_arp.h */ #include <netinet/in.h> /* for ntohs, etc. */ -#define _LINUX_NETDEVICE_H /* very crude hack for glibc2 */ #include <linux/types.h> #include <linux/if_arp.h> #include <linux/if_ether.h> --- a/src/arpd/io.c +++ b/src/arpd/io.c @@ -21,7 +21,6 @@ #include <atm.h> #include <linux/atmclip.h> /* for CLIP_DEFAULT_IDLETIMER */ #include <linux/atmarp.h> -#define _LINUX_NETDEVICE_H /* glibc2 */ #include <linux/types.h> #include <linux/if_arp.h> --- a/src/arpd/itf.c +++ b/src/arpd/itf.c @@ -12,7 +12,6 @@ #include <sys/types.h> #include <linux/atmclip.h> #include <sys/socket.h> -#define _LINUX_NETDEVICE_H /* glibc2 */ #include <linux/types.h> #include <linux/if_arp.h>
