Hello community, here is the log from the commit of package linux-atm for openSUSE:Leap:15.2 checked in at 2020-06-24 10:28:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/linux-atm (Old) and /work/SRC/openSUSE:Leap:15.2/.linux-atm.new.2956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linux-atm" Wed Jun 24 10:28:13 2020 rev:12 rq:772135 version:2.5.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/linux-atm/linux-atm.changes 2020-01-15 15:27:10.134635143 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.linux-atm.new.2956/linux-atm.changes 2020-06-24 10:28:15.986367525 +0200 @@ -1,0 +2,18 @@ +Fri Dec 6 11:26:11 UTC 2019 - Martin Pluskal <[email protected]> + +- Modernise spec file a bit: + * Move licnse to library package + * Use more of new macros for building + +------------------------------------------------------------------- +Thu Jul 11 06:03:18 UTC 2019 - Jiri Slaby <[email protected]> + +- add fix-build-after-y2038-changes-in-glibc.patch + +------------------------------------------------------------------- +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: ---- fix-build-after-y2038-changes-in-glibc.patch linux-atm-2.5.2-remove-headers-crude-hack.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linux-atm.spec ++++++ --- /var/tmp/diff_new_pack.uuJzJb/_old 2020-06-24 10:28:16.374369127 +0200 +++ /var/tmp/diff_new_pack.uuJzJb/_new 2020-06-24 10:28:16.378369144 +0200 @@ -1,7 +1,7 @@ # # spec file for package linux-atm # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,19 +12,18 @@ # 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/ # +%global sover 1 Name: linux-atm Version: 2.5.2 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/ +URL: http://linux-atm.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM linux-atm-2.5.2_fdleak.patch Patch0: linux-atm-2.5.2_fdleak.patch @@ -32,25 +31,24 @@ 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 +# PATCH-FIX-UPSTREAM fix-build-after-y2038-changes-in-glibc.patch -- fix build after y2038 changes in glibc +Patch4: fix-build-after-y2038-changes-in-glibc.patch BuildRequires: bison BuildRequires: flex BuildRequires: glibc-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Tools to support ATM (Asynchronous Transfer Mode) networking. - %package -n libatm%{sover} - Summary: Libraries for ATM Group: System/Libraries %description -n libatm%{sover} Libraries for ATM (Asynchronous Transfer Mode) networking. - %package devel Summary: Development for ATM Group: Development/Libraries/C and C++ @@ -60,42 +58,34 @@ Libraries and header files for ATM (Asynchronous Transfer Mode) networking. - %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 %build %configure --disable-static -%{__make} %{?_smp_mflags} +%make_build %install -%{__make} install DESTDIR=%{buildroot} -%{__rm} -rf %{buildroot}%{_libdir}/*.la +%make_install +find %{buildroot} -type f -name "*.la" -delete -print %post -n libatm%{sover} -p /sbin/ldconfig - %postun -n libatm%{sover} -p /sbin/ldconfig %files -%defattr(-,root,root) +%doc README AUTHORS ChangeLog NEWS THANKS BUGS %config(noreplace) %{_sysconfdir}/atmsigd.conf %config(noreplace) %{_sysconfdir}/hosts.atm %{_bindir}/* %{_sbindir}/* /lib/firmware/* -%doc README AUTHORS ChangeLog NEWS THANKS BUGS -%doc COPYING COPYING.GPL COPYING.LGPL -%doc %{_mandir}/man*/*.gz +%{_mandir}/man*/*.gz %files -n libatm%{sover} -%defattr(-,root,root) +%license COPYING COPYING.GPL COPYING.LGPL %{_libdir}/libatm.so.%{sover}* %files devel -%defattr(-,root,root) %{_includedir}/atm*.h %{_libdir}/libatm.so ++++++ fix-build-after-y2038-changes-in-glibc.patch ++++++ From: Bastien Nocera <[email protected]> Date: Fri, 7 Jun 2019 09:51:33 +0200 Subject: fix build after y2038 changes in glibc Patch-mainline: upstream seems to be dead SIOCGSTAMP is now defined in linux/sockios.h. Include that file wherever needed. Signed-off-by: Jiri Slaby <[email protected]> --- src/maint/atmdump.c | 1 + src/maint/saaldump.c | 1 + 2 files changed, 2 insertions(+) --- a/src/maint/atmdump.c +++ b/src/maint/atmdump.c @@ -16,6 +16,7 @@ #include <sys/socket.h> #include <netinet/in.h> /* for htonl and ntohl */ #include <atm.h> +#include <linux/sockios.h> static const char *pti[] = { "Data SDU 0","Data SDU 1","Data SDU 0, CE", --- a/src/maint/saaldump.c +++ b/src/maint/saaldump.c @@ -16,6 +16,7 @@ #include <sys/types.h> #include <sys/socket.h> #include <atm.h> +#include <linux/sockios.h> #include "pdu.h" #define DUMP_MODE ++++++ 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>
