diff --git a/linux-atm/linux-atm.nm b/linux-atm/linux-atm.nm index 4b3ac47ba..167275b88 100644 --- a/linux-atm/linux-atm.nm +++ b/linux-atm/linux-atm.nm @@ -4,8 +4,8 @@ ############################################################################### name = linux-atm -version = 2.5.1 -release = 2 +version = 2.5.2 +release = 1 groups = System/Daemons url = http://linux-atm.sourceforge.net/ @@ -17,7 +17,7 @@ description using theLinux ATM API. end -sources = %{thisapp}.tgz +sources = %{thisapp}.tar.gz source_dl = http://downloads.sf.net/%{name}/ build @@ -30,7 +30,8 @@ build end prepare_cmds - sed -e "s/-lfl/&_pic/g" -i src/*{,/*}/Makefile.in + # install firmware in /usr/lib + sed -i "s#/lib/firmware#/usr/lib/firmware#" src/extra/Makefile.in end PARALLELISMFLAGS = diff --git a/linux-atm/patches/add-string-formatting-to-build-with-gcc7.patch b/linux-atm/patches/add-string-formatting-to-build-with-gcc7.patch new file mode 100644 index 000000000..17aaf5798 --- /dev/null +++ b/linux-atm/patches/add-string-formatting-to-build-with-gcc7.patch @@ -0,0 +1,11 @@ +--- linux-atm-2.5.1-orig/src/test/ttcp.c 2017-05-28 12:16:24.984611487 +0000 ++++ linux-atm-2.5.1/src/test/ttcp.c 2017-05-28 12:17:25.370338343 +0000 +@@ -663,7 +663,7 @@ int no_check = 0; + exit(0); + + usage: +- fprintf(stderr, Usage); ++ fprintf(stderr, "%s", Usage); + exit(1); + } + diff --git a/linux-atm/patches/linux-atm-2.5.1-disable-zntune.patch b/linux-atm/patches/linux-atm-2.5.1-disable-zntune.patch new file mode 100644 index 000000000..8318c3ae6 --- /dev/null +++ b/linux-atm/patches/linux-atm-2.5.1-disable-zntune.patch @@ -0,0 +1,714 @@ + + + + + + Tree - rpms/linux-atm - src.fedoraproject.org + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+
+
+
+

+

+
+
+

+rpms / linux-atm +

+
+
+
+
+
+
+ + + Clone + + + +
+
+
+
+ + +
+
+ +
+
+
+
+
+ +
+
+ +
+ +
+
+
+ + +
+ + Blob + + Blame + + History + + Raw +
+ +
diff --git a/src/maint/Makefile.am b/src/maint/Makefile.am
+index 059bfdd..5c86dda 100644
+--- a/src/maint/Makefile.am
++++ b/src/maint/Makefile.am
+@@ -1,5 +1,5 @@
+ BOOTPGMS=atmaddr esi
+-SYSPGMS=atmloop atmtcp enitune zntune hediag # nstune
++SYSPGMS=atmloop atmtcp enitune hediag # nstune
+ USRPGMS=atmdiag atmdump sonetdiag saaldump
+ 
+ INCLUDES=-I$(srcdir)/../q2931 -I$(srcdir)/../saal -I.
+
+
+
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/linux-atm/patches/remove-define-hacks.patch b/linux-atm/patches/remove-define-hacks.patch new file mode 100644 index 000000000..cfac43c03 --- /dev/null +++ b/linux-atm/patches/remove-define-hacks.patch @@ -0,0 +1,22 @@ +diff -up linux-atm-2.5.1/src/arpd/arp.c.ftbfs linux-atm-2.5.1/src/arpd/arp.c +--- linux-atm-2.5.1/src/arpd/arp.c.ftbfs 2007-07-11 11:27:15.000000000 -0400 ++++ linux-atm-2.5.1/src/arpd/arp.c 2019-05-02 20:15:45.497338836 -0400 +@@ -15,7 +15,6 @@ + #include + #include /* for linux/if_arp.h */ + #include /* for ntohs, etc. */ +-#define _LINUX_NETDEVICE_H /* very crude hack for glibc2 */ + #include + #include + #include +diff -up linux-atm-2.5.1/src/arpd/itf.c.ftbfs linux-atm-2.5.1/src/arpd/itf.c +--- linux-atm-2.5.1/src/arpd/itf.c.ftbfs 2007-07-11 11:27:15.000000000 -0400 ++++ linux-atm-2.5.1/src/arpd/itf.c 2019-05-02 20:19:08.046499027 -0400 +@@ -12,7 +12,6 @@ + #include + #include + #include +-#define _LINUX_NETDEVICE_H /* glibc2 */ + #include + #include + diff --git a/linux-atm/patches/siocgstamp.patch b/linux-atm/patches/siocgstamp.patch new file mode 100644 index 000000000..dae437ad3 --- /dev/null +++ b/linux-atm/patches/siocgstamp.patch @@ -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 + #include /* for htonl and ntohl */ + #include ++#include + + + 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 + #include + #include ++#include + + #include "pdu.h" + #define DUMP_MODE