PR#2: Include <linux/sockios.h> to fix another FTBFS with newer kernel headers - rpms/linux-atm

Scott Talbert • 4 years ago

0d2fa92

linux-atm.spec

file modified

+6 -1

		`@@ -1,7 +1,7 @@`
		`Summary: Tools to support ATM networking under Linux`
		`Name: linux-atm`
		`Version: 2.5.1`
		`- Release: 23%{?dist}`
		`+ Release: 24%{?dist}`
		`# The licensing here is a mess. This is as close to accurate as possible.`
		`License: BSD and GPLv2 and GPLv2+ and LGPLv2+ and MIT`
		`URL: http://linux-atm.sourceforge.net/`
		`@@ -17,6 +17,7 @@`
		`Patch5: man-pages.patch`
		`Patch6: add-string-formatting-to-build-with-gcc7.patch`
		`Patch7: remove-define-hacks.patch`
		`+ Patch8: siocgstamp.patch`

		`%description`
		`Tools to support ATM networking under Linux.`
		`@@ -45,6 +46,7 @@`
		`%patch5 -p1`
		`%patch6 -p1`
		`%patch7 -p1`
		`+ %patch8 -p1`

		`iconv -f iso8859-1 -t utf8 < src/extra/ANS/e164_cc > src/extra/ANS/e164_cc.1`
		`mv src/extra/ANS/e164_cc.1 src/extra/ANS/e164_cc`
		`@@ -97,6 +99,9 @@`
		`%{_libdir}/libatm.so`

		`%changelog`
		`+ * Tue Jun 18 2019 Scott Talbert <swt@techie.net> - 2.5.1-24`
		`+ - Include <linux/sockios.h> to fix another FTBFS with newer kernel headers`
		`+`
		`* Fri May 03 2019 Scott Talbert <swt@techie.net> - 2.5.1-23`
		`- Remove _LINUX_NETDEVICE_H define hacks to fix FTBFS (#1675323)`

siocgstamp.patch

file added

+22

		`@@ -0,0 +1,22 @@`
		`+ diff -up linux-atm-2.5.1/src/maint/atmdump.c.siocgstamp linux-atm-2.5.1/src/maint/atmdump.c`
		`+ --- linux-atm-2.5.1/src/maint/atmdump.c.siocgstamp 2001-10-09 18:33:07.000000000 -0400`
		`+ +++ linux-atm-2.5.1/src/maint/atmdump.c 2019-06-17 23:12:50.570085260 -0400`
		`+ @@ -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",`
		`+ diff -up linux-atm-2.5.1/src/maint/saaldump.c.siocgstamp linux-atm-2.5.1/src/maint/saaldump.c`
		`+ --- linux-atm-2.5.1/src/maint/saaldump.c.siocgstamp 2001-10-09 18:33:07.000000000 -0400`
		`+ +++ linux-atm-2.5.1/src/maint/saaldump.c 2019-06-17 23:13:06.620200319 -0400`
		`+ @@ -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`