From patchwork Tue Feb 21 13:21:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 6584 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4PLg1Z106Wz3x1t for ; Tue, 21 Feb 2023 13:22:10 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4PLg1X5kCnzyP; Tue, 21 Feb 2023 13:22:08 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4PLg1X3mYNz2xc5; Tue, 21 Feb 2023 13:22:08 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4PLg1V4nqYz2xFK for ; Tue, 21 Feb 2023 13:22:06 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4PLg1T4gCNzqt; Tue, 21 Feb 2023 13:22:05 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1676985725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5rnc5X9i65yAsDHrcYT82Gwid7SfoS2agvwxzUXjP20=; b=Xl6YYX0JzrbaahSt0ztS/VpC55ELiglyAdRiTB5wR7lZRwR+IRLwDKiucgfb8v7TYeFWPQ Ysl5AaG+sfOUE1AQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1676985725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5rnc5X9i65yAsDHrcYT82Gwid7SfoS2agvwxzUXjP20=; b=ToE8fmDO4k75dZcVp3dU1SrMEq001qV+Z/TXP9VwnwOC1y4HZd53v9JBMW3HAbJbpF3fgE +rSwSR6biFinS4i7vrT1h3j/xMbO/g2Vz9kFQrek2ioYUwKej2OAexnAP9gneGdxT6/uf+ k0dW7kidAhpy8x2IjPk1BHiLa+nVrFmGpxK1CvNx0cBRYIG3Ph4efTUx2gF5FokJ5uFfsb 4g1DeLPyMu8Z98zm0sIl+Th1t8OvFEjaJcZAbY5TVbbFYwPa112+tq+TPUZhxzwQk4nerl KSn++01yus5Gmt2+G5sbDDbsstn+RYAbM6XCtX9ApuBAaM2WuUx8cyPxsD2ZHA== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH] linux-atm: Update to 2.5.2 Date: Tue, 21 Feb 2023 14:21:59 +0100 Message-Id: <20230221132159.762733-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Stefan Schantl --- linux-atm/linux-atm.nm | 9 +- ...string-formatting-to-build-with-gcc7.patch | 11 + .../linux-atm-2.5.1-disable-zntune.patch | 714 ++++++++++++++++++ linux-atm/patches/remove-define-hacks.patch | 22 + linux-atm/patches/siocgstamp.patch | 22 + 5 files changed, 774 insertions(+), 4 deletions(-) create mode 100644 linux-atm/patches/add-string-formatting-to-build-with-gcc7.patch create mode 100644 linux-atm/patches/linux-atm-2.5.1-disable-zntune.patch create mode 100644 linux-atm/patches/remove-define-hacks.patch create mode 100644 linux-atm/patches/siocgstamp.patch 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 + +
+
+
+
Source Code
+ +
+
+
GIT
+ +
+
+
+
+
+ +
+
+
+
+ + +
+
+ +
+
+
+
+
+
+
+

+ Files +

+
+ +
+
+
+ +
+ + f10 + + + f11 + + + f12 + + + f13 + + + f14 + + + f15 + + + f16 + + + f17 + + + f18 + + + f19 + + + f20 + + + f21 + + + f22 + + + f23 + + + f24 + + + f25 + + + f26 + + + f27 + + + f28 + + + f29 + + + f30 + + + f31 + + + f32 + + + f33 + + + f34 + + + f35 + + + f36 + + + f37 + + + f38 + + + f7 + + + f8 + + + f9 + + + main + + + rawhide + +
+
+
+
+
+
+
+
    +
  1. + + +   rawhide + +
    2. +
  2. + +   linux-atm-2.5.1-disable-zntune.patch +
    3. +
+
+ +
+
+
+ + +
+ + 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.
+
+
+
+ +
+
+
+
+ +
+
+
+
+
Powered by Pagure 5.13.3
+ +
+
+
© Red Hat, Inc. and others.
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + \ 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