* [PATCH] linux-atm: update to 2.5.2
@ 2017-03-18 10:11 Marcel Lorenz
2017-04-06 9:07 ` Michael Tremer
0 siblings, 1 reply; 4+ messages in thread
From: Marcel Lorenz @ 2017-03-18 10:11 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 12086 bytes --]
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
config/rootfiles/common/linux-atm | 47 ++++---
lfs/linux-atm | 8 +-
src/patches/linux-atm-2.4.1-arpd_includes.patch | 42 -------
src/patches/linux-atm-2.4.1-gcc-4.patch | 161 ------------------------
4 files changed, 31 insertions(+), 227 deletions(-)
delete mode 100644 src/patches/linux-atm-2.4.1-arpd_includes.patch
delete mode 100644 src/patches/linux-atm-2.4.1-gcc-4.patch
diff --git a/config/rootfiles/common/linux-atm b/config/rootfiles/common/linux-atm
index 7cc8323..bcab145 100644
--- a/config/rootfiles/common/linux-atm
+++ b/config/rootfiles/common/linux-atm
@@ -1,11 +1,17 @@
#etc/atmsigd.conf
#etc/hosts.atm
+#lib/firmware/pca200e.bin
+#lib/firmware/pca200e_ecd.bin2
+#lib/firmware/sba200e_ecd.bin2
#usr/bin/aread
#usr/bin/atmdiag
#usr/bin/atmdump
+#usr/bin/atmswitch
#usr/bin/awrite
#usr/bin/saaldump
#usr/bin/sonetdiag
+#usr/bin/svc_recv
+#usr/bin/svc_send
#usr/bin/ttcp_atm
#usr/include/atm.h
#usr/include/atmarp.h
@@ -17,37 +23,40 @@
usr/lib/libatm.so
usr/lib/libatm.so.1
usr/lib/libatm.so.1.0.0
-#usr/man/man4
-#usr/man/man4/atmsigd.conf.4
-#usr/man/man7/qos.7
-#usr/man/man7/sap.7
-#usr/man/man8
-#usr/man/man8/atmaddr.8
-#usr/man/man8/atmarp.8
-#usr/man/man8/atmarpd.8
-#usr/man/man8/atmdiag.8
-#usr/man/man8/atmdump.8
-#usr/man/man8/atmloop.8
-#usr/man/man8/atmsigd.8
-#usr/man/man8/atmtcp.8
-#usr/man/man8/bus.8
-#usr/man/man8/esi.8
-#usr/man/man8/lecs.8
-#usr/man/man8/les.8
-#usr/man/man8/mpcd.8
-#usr/man/man8/zeppelin.8
#usr/sbin/atmaddr
#usr/sbin/atmarp
#usr/sbin/atmarpd
#usr/sbin/atmloop
#usr/sbin/atmsigd
#usr/sbin/atmtcp
+#usr/sbin/br2684ctl
#usr/sbin/bus
#usr/sbin/enitune
#usr/sbin/esi
+#usr/sbin/hediag
#usr/sbin/ilmid
+#usr/sbin/ilmidiag
#usr/sbin/lecs
#usr/sbin/les
#usr/sbin/mpcd
#usr/sbin/zeppelin
#usr/sbin/zntune
+#usr/share/man/man4/atmsigd.conf.4
+#usr/share/man/man7/qos.7
+#usr/share/man/man7/sap.7
+#usr/share/man/man8/atmaddr.8
+#usr/share/man/man8/atmarp.8
+#usr/share/man/man8/atmarpd.8
+#usr/share/man/man8/atmdiag.8
+#usr/share/man/man8/atmdump.8
+#usr/share/man/man8/atmloop.8
+#usr/share/man/man8/atmsigd.8
+#usr/share/man/man8/atmtcp.8
+#usr/share/man/man8/br2684ctl.8
+#usr/share/man/man8/bus.8
+#usr/share/man/man8/esi.8
+#usr/share/man/man8/ilmid.8
+#usr/share/man/man8/lecs.8
+#usr/share/man/man8/les.8
+#usr/share/man/man8/mpcd.8
+#usr/share/man/man8/zeppelin.8
diff --git a/lfs/linux-atm b/lfs/linux-atm
index 6465d14..4c32711 100644
--- a/lfs/linux-atm
+++ b/lfs/linux-atm
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2017 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 2.4.1
+VER = 2.5.2
THISAPP = linux-atm-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 84fef49cc39ff2605204246666f65864
+$(DL_FILE)_MD5 = d49499368c3cf15f73a05d9bce8824a8
install : $(TARGET)
@@ -70,8 +70,6 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-atm-2.4.1-gcc-4.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-atm-2.4.1-arpd_includes.patch
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-nls
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
diff --git a/src/patches/linux-atm-2.4.1-arpd_includes.patch b/src/patches/linux-atm-2.4.1-arpd_includes.patch
deleted file mode 100644
index 1a74ecf..0000000
--- a/src/patches/linux-atm-2.4.1-arpd_includes.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: linux-atm-2.4.1/src/arpd/arp.c
-===================================================================
---- linux-atm-2.4.1.orig/src/arpd/arp.c 2007-10-20 19:19:10.002198470 +0200
-+++ linux-atm-2.4.1/src/arpd/arp.c 2007-10-20 19:19:19.138719139 +0200
-@@ -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/if_arp.h>
- #include <linux/if_ether.h>
- #include <atm.h>
-Index: linux-atm-2.4.1/src/arpd/io.c
-===================================================================
---- linux-atm-2.4.1.orig/src/arpd/io.c 2007-10-20 19:19:09.994198016 +0200
-+++ linux-atm-2.4.1/src/arpd/io.c 2007-10-20 19:19:19.154720039 +0200
-@@ -16,12 +16,11 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
--#include <net/if.h>
-+#include <linux/if.h>
- #include <netinet/in.h>
- #include <atm.h>
- #include <linux/atmclip.h> /* for CLIP_DEFAULT_IDLETIMER */
- #include <linux/atmarp.h>
--#define _LINUX_NETDEVICE_H /* glibc2 */
- #include <linux/if_arp.h>
-
- #include "atmd.h"
-Index: linux-atm-2.4.1/src/arpd/itf.c
-===================================================================
---- linux-atm-2.4.1.orig/src/arpd/itf.c 2007-10-20 19:19:10.010198930 +0200
-+++ linux-atm-2.4.1/src/arpd/itf.c 2007-10-20 19:19:19.186721859 +0200
-@@ -12,7 +12,6 @@
- #include <sys/types.h>
- #include <linux/atmclip.h>
- #include <sys/socket.h>
--#define _LINUX_NETDEVICE_H /* glibc2 */
- #include <linux/if_arp.h>
-
- #include "atmd.h"
diff --git a/src/patches/linux-atm-2.4.1-gcc-4.patch b/src/patches/linux-atm-2.4.1-gcc-4.patch
deleted file mode 100644
index f6be9d2..0000000
--- a/src/patches/linux-atm-2.4.1-gcc-4.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff -Naur linux-atm-2.4.1-orig/src/ilmid/atmf_uni.c linux-atm-2.4.1/src/ilmid/atmf_uni.c
---- linux-atm-2.4.1-orig/src/ilmid/atmf_uni.c 2001-09-03 19:41:06.000000000 +0100
-+++ linux-atm-2.4.1/src/ilmid/atmf_uni.c 2005-08-13 10:22:44.000000000 +0100
-@@ -187,7 +187,7 @@
- newPrefix->name = alloc_t(AsnOid);
- newPrefix->name->octs = alloc(varBindName->octetLen);
- AsnOidCopy(newPrefix->name, varBindName);
-- Q_INSERT_BEFORE((NetPrefixNode *) var->value, newPrefix, prefix);
-+ Q_INSERT_BEFORE((*((NetPrefixNode **)&var->value)), newPrefix, prefix);
- if(atmNetPrefix.octs == NULL)
- {
- atmNetPrefix.octetLen = varBindName->octetLen - NETPREFIX_LEN - 2;
-@@ -197,7 +197,7 @@
- }
- else if (varbind->value->a.simple->a.number == INVALID && cmp == AsnOidEqual)
- {
-- Q_REMOVE((NetPrefixNode *) var->value, prefix);
-+ Q_REMOVE((*((NetPrefixNode **) &var->value)), prefix);
- }
-
- return NOERROR;
-diff -Naur linux-atm-2.4.1-orig/src/lib/sapequal.c linux-atm-2.4.1/src/lib/sapequal.c
---- linux-atm-2.4.1-orig/src/lib/sapequal.c 2001-09-03 19:41:05.000000000 +0100
-+++ linux-atm-2.4.1/src/lib/sapequal.c 2005-02-06 19:24:37.000000000 +0000
-@@ -65,6 +65,7 @@
- CHECK(l2.itu.window,a.l2.itu.window > b.l2.itu.window);
- break;
- default:
-+ ;
- }
- switch (a.l3_proto) {
- case ATM_L3_X25:
-@@ -83,6 +84,7 @@
- if (a.l3.user != b.l3.user) return 0;
- break;
- default:
-+ ;
- }
- return 1;
- }
-diff -Naur linux-atm-2.4.1-orig/src/maint/atmtcp.c linux-atm-2.4.1/src/maint/atmtcp.c
---- linux-atm-2.4.1-orig/src/maint/atmtcp.c 2001-09-03 19:41:06.000000000 +0100
-+++ linux-atm-2.4.1/src/maint/atmtcp.c 2005-08-13 10:22:44.000000000 +0100
-@@ -60,7 +60,7 @@
- static IN *inputs = NULL;
- static fd_set in_set;
- static int fds = 0;
--static int debug = 0;
-+int debug = 0;
- static int links = 0;
-
-
-diff -Naur linux-atm-2.4.1-orig/src/maint/enitune.c linux-atm-2.4.1/src/maint/enitune.c
---- linux-atm-2.4.1-orig/src/maint/enitune.c 2001-09-03 19:41:06.000000000 +0100
-+++ linux-atm-2.4.1/src/maint/enitune.c 2005-02-06 19:24:37.000000000 +0000
-@@ -44,6 +44,7 @@
- if (*end || mult.rx <= 100) usage(name);
- break;
- default:
-+ ;
- }
- if (argc != optind+1) usage(name);
- sioc.number = strtol(argv[optind],&end,0);
-diff -Naur linux-atm-2.4.1-orig/src/mpoad/p_factory.c linux-atm-2.4.1/src/mpoad/p_factory.c
---- linux-atm-2.4.1-orig/src/mpoad/p_factory.c 2001-09-03 19:41:06.000000000 +0100
-+++ linux-atm-2.4.1/src/mpoad/p_factory.c 2005-08-13 10:22:44.000000000 +0100
-@@ -31,16 +31,17 @@
- * beginning at location "addr".
- */
- uint32_t sum = 0;
-+ uint16_t *addr16 = addr;
-
- while( count > 1 ) {
- /* This is the inner loop */
-- sum += * ((uint16_t *) addr)++;
-+ sum += * addr16++;
- count -= 2;
- }
-
- /* Add left-over byte, if any */
- if( count > 0 )
-- sum += * (unsigned char *) addr;
-+ sum += * (unsigned char *) addr16;
-
- /* Fold 32-bit sum to 16 bits */
- while (sum>>16)
-diff -Naur linux-atm-2.4.1-orig/src/qgen/qlib.c linux-atm-2.4.1/src/qgen/qlib.c
---- linux-atm-2.4.1-orig/src/qgen/qlib.c 2001-09-03 19:41:05.000000000 +0100
-+++ linux-atm-2.4.1/src/qgen/qlib.c 2005-08-13 10:22:44.000000000 +0100
-@@ -26,8 +26,6 @@
- #include "op.h"
-
-
--static int debug = 0;
--
-
- void PREFIX(report)(int severity,const char *msg,...)
- {
-@@ -830,6 +828,8 @@
-
- #ifdef STANDALONE
-
-+int debug = 0;
-+
- int main(int argc,const char **argv)
- {
- unsigned char msg[5000]; /* should be large enough for that */
-diff -Naur linux-atm-2.4.1-orig/src/qgen/qlib.h linux-atm-2.4.1/src/qgen/qlib.h
---- linux-atm-2.4.1-orig/src/qgen/qlib.h 2001-09-03 19:41:05.000000000 +0100
-+++ linux-atm-2.4.1/src/qgen/qlib.h 2005-08-13 10:22:44.000000000 +0100
-@@ -23,7 +23,6 @@
- #define Q_FATAL -1
-
-
--extern int q_dump;
- extern void q_report(int severity,const char *msg,...);
-
- #ifdef DUMP_MODE
-diff -Naur linux-atm-2.4.1-orig/src/sigd/proto.c linux-atm-2.4.1/src/sigd/proto.c
---- linux-atm-2.4.1-orig/src/sigd/proto.c 2001-09-03 19:41:06.000000000 +0100
-+++ linux-atm-2.4.1/src/sigd/proto.c 2005-02-06 19:24:37.000000000 +0000
-@@ -259,6 +259,7 @@
- break;
- }
- default:
-+ ;
- }
- va_end(ap);
- if ((size = q_close(&dsc)) >= 0) to_signaling(sock->sig,q_buffer,size);
-@@ -288,6 +289,7 @@
- }
- break;
- default:
-+ ;
- }
- va_end(ap);
- }
-diff -Naur linux-atm-2.4.1-orig/src/switch/debug/debug.c linux-atm-2.4.1/src/switch/debug/debug.c
---- linux-atm-2.4.1-orig/src/switch/debug/debug.c 2001-09-03 19:41:06.000000000 +0100
-+++ linux-atm-2.4.1/src/switch/debug/debug.c 2005-08-13 10:22:44.000000000 +0100
-@@ -18,7 +18,7 @@
- #define COMPONENT "FAB(debug)"
-
-
--#define PRV(call) ((FAB *) (call)->fab)
-+#define PRV(call) (*((FAB **) &(call)->fab))
-
-
- typedef struct _fab {
-diff -Naur linux-atm-2.4.1-orig/src/switch/tcp/tcpsw.c linux-atm-2.4.1/src/switch/tcp/tcpsw.c
---- linux-atm-2.4.1-orig/src/switch/tcp/tcpsw.c 2001-09-03 19:41:06.000000000 +0100
-+++ linux-atm-2.4.1/src/switch/tcp/tcpsw.c 2005-08-13 10:22:44.000000000 +0100
-@@ -27,7 +27,7 @@
-
- #define COMPONENT "FAB(tcp)"
-
--#define PRV(call) ((FAB *) (call)->fab)
-+#define PRV(call) (*((FAB **) &(call)->fab))
-
- #define MAX_VCI 1024
-
--
2.9.3
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] linux-atm: update to 2.5.2
2017-03-18 10:11 [PATCH] linux-atm: update to 2.5.2 Marcel Lorenz
@ 2017-04-06 9:07 ` Michael Tremer
0 siblings, 0 replies; 4+ messages in thread
From: Michael Tremer @ 2017-04-06 9:07 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 13467 bytes --]
Anyone here who can test this?
On Sat, 2017-03-18 at 11:11 +0100, Marcel Lorenz wrote:
> Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
> ---
> config/rootfiles/common/linux-atm | 47 ++++---
> lfs/linux-atm | 8 +-
> src/patches/linux-atm-2.4.1-arpd_includes.patch | 42 -------
> src/patches/linux-atm-2.4.1-gcc-4.patch | 161 ---------------------
> ---
> 4 files changed, 31 insertions(+), 227 deletions(-)
> delete mode 100644 src/patches/linux-atm-2.4.1-arpd_includes.patch
> delete mode 100644 src/patches/linux-atm-2.4.1-gcc-4.patch
>
> diff --git a/config/rootfiles/common/linux-atm
> b/config/rootfiles/common/linux-atm
> index 7cc8323..bcab145 100644
> --- a/config/rootfiles/common/linux-atm
> +++ b/config/rootfiles/common/linux-atm
> @@ -1,11 +1,17 @@
> #etc/atmsigd.conf
> #etc/hosts.atm
> +#lib/firmware/pca200e.bin
> +#lib/firmware/pca200e_ecd.bin2
> +#lib/firmware/sba200e_ecd.bin2
> #usr/bin/aread
> #usr/bin/atmdiag
> #usr/bin/atmdump
> +#usr/bin/atmswitch
> #usr/bin/awrite
> #usr/bin/saaldump
> #usr/bin/sonetdiag
> +#usr/bin/svc_recv
> +#usr/bin/svc_send
> #usr/bin/ttcp_atm
> #usr/include/atm.h
> #usr/include/atmarp.h
> @@ -17,37 +23,40 @@
> usr/lib/libatm.so
> usr/lib/libatm.so.1
> usr/lib/libatm.so.1.0.0
> -#usr/man/man4
> -#usr/man/man4/atmsigd.conf.4
> -#usr/man/man7/qos.7
> -#usr/man/man7/sap.7
> -#usr/man/man8
> -#usr/man/man8/atmaddr.8
> -#usr/man/man8/atmarp.8
> -#usr/man/man8/atmarpd.8
> -#usr/man/man8/atmdiag.8
> -#usr/man/man8/atmdump.8
> -#usr/man/man8/atmloop.8
> -#usr/man/man8/atmsigd.8
> -#usr/man/man8/atmtcp.8
> -#usr/man/man8/bus.8
> -#usr/man/man8/esi.8
> -#usr/man/man8/lecs.8
> -#usr/man/man8/les.8
> -#usr/man/man8/mpcd.8
> -#usr/man/man8/zeppelin.8
> #usr/sbin/atmaddr
> #usr/sbin/atmarp
> #usr/sbin/atmarpd
> #usr/sbin/atmloop
> #usr/sbin/atmsigd
> #usr/sbin/atmtcp
> +#usr/sbin/br2684ctl
> #usr/sbin/bus
> #usr/sbin/enitune
> #usr/sbin/esi
> +#usr/sbin/hediag
> #usr/sbin/ilmid
> +#usr/sbin/ilmidiag
> #usr/sbin/lecs
> #usr/sbin/les
> #usr/sbin/mpcd
> #usr/sbin/zeppelin
> #usr/sbin/zntune
> +#usr/share/man/man4/atmsigd.conf.4
> +#usr/share/man/man7/qos.7
> +#usr/share/man/man7/sap.7
> +#usr/share/man/man8/atmaddr.8
> +#usr/share/man/man8/atmarp.8
> +#usr/share/man/man8/atmarpd.8
> +#usr/share/man/man8/atmdiag.8
> +#usr/share/man/man8/atmdump.8
> +#usr/share/man/man8/atmloop.8
> +#usr/share/man/man8/atmsigd.8
> +#usr/share/man/man8/atmtcp.8
> +#usr/share/man/man8/br2684ctl.8
> +#usr/share/man/man8/bus.8
> +#usr/share/man/man8/esi.8
> +#usr/share/man/man8/ilmid.8
> +#usr/share/man/man8/lecs.8
> +#usr/share/man/man8/les.8
> +#usr/share/man/man8/mpcd.8
> +#usr/share/man/man8/zeppelin.8
> diff --git a/lfs/linux-atm b/lfs/linux-atm
> index 6465d14..4c32711 100644
> --- a/lfs/linux-atm
> +++ b/lfs/linux-atm
> @@ -1,7 +1,7 @@
> #############################################################################
> ##
> #
> #
> # IPFire.org - A linux based
> firewall #
> -# Copyright (C) 2007 Michael Tremer & Christian
> Schmidt #
> +# Copyright (C) 2017 IPFire Team <info(a)ipfire.org>
> #
> #
> #
> # This program is free software: you can redistribute it and/or
> modify #
> # it under the terms of the GNU General Public License as published
> by #
> @@ -24,7 +24,7 @@
>
> include Config
>
> -VER = 2.4.1
> +VER = 2.5.2
>
> THISAPP = linux-atm-$(VER)
> DL_FILE = $(THISAPP).tar.gz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>
> -$(DL_FILE)_MD5 = 84fef49cc39ff2605204246666f65864
> +$(DL_FILE)_MD5 = d49499368c3cf15f73a05d9bce8824a8
>
> install : $(TARGET)
>
> @@ -70,8 +70,6 @@ $(subst %,%_MD5,$(objects)) :
> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> @$(PREBUILD)
> @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-atm-2.4.1-
> gcc-4.patch
> - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-atm-2.4.1-
> arpd_includes.patch
> cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --
> disable-nls
> cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
> cd $(DIR_APP) && make install
> diff --git a/src/patches/linux-atm-2.4.1-arpd_includes.patch
> b/src/patches/linux-atm-2.4.1-arpd_includes.patch
> deleted file mode 100644
> index 1a74ecf..0000000
> --- a/src/patches/linux-atm-2.4.1-arpd_includes.patch
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -Index: linux-atm-2.4.1/src/arpd/arp.c
> -===================================================================
> ---- linux-atm-2.4.1.orig/src/arpd/arp.c 2007-10-20 19:19:10.002198470
> +0200
> -+++ linux-atm-2.4.1/src/arpd/arp.c 2007-10-20 19:19:19.138719139 +0200
> -@@ -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/if_arp.h>
> - #include <linux/if_ether.h>
> - #include <atm.h>
> -Index: linux-atm-2.4.1/src/arpd/io.c
> -===================================================================
> ---- linux-atm-2.4.1.orig/src/arpd/io.c 2007-10-20 19:19:09.994198016
> +0200
> -+++ linux-atm-2.4.1/src/arpd/io.c 2007-10-20 19:19:19.154720039 +0200
> -@@ -16,12 +16,11 @@
> - #include <sys/types.h>
> - #include <sys/socket.h>
> - #include <sys/ioctl.h>
> --#include <net/if.h>
> -+#include <linux/if.h>
> - #include <netinet/in.h>
> - #include <atm.h>
> - #include <linux/atmclip.h> /* for CLIP_DEFAULT_IDLETIMER */
> - #include <linux/atmarp.h>
> --#define _LINUX_NETDEVICE_H /* glibc2 */
> - #include <linux/if_arp.h>
> -
> - #include "atmd.h"
> -Index: linux-atm-2.4.1/src/arpd/itf.c
> -===================================================================
> ---- linux-atm-2.4.1.orig/src/arpd/itf.c 2007-10-20 19:19:10.010198930
> +0200
> -+++ linux-atm-2.4.1/src/arpd/itf.c 2007-10-20 19:19:19.186721859 +0200
> -@@ -12,7 +12,6 @@
> - #include <sys/types.h>
> - #include <linux/atmclip.h>
> - #include <sys/socket.h>
> --#define _LINUX_NETDEVICE_H /* glibc2 */
> - #include <linux/if_arp.h>
> -
> - #include "atmd.h"
> diff --git a/src/patches/linux-atm-2.4.1-gcc-4.patch b/src/patches/linux-atm-
> 2.4.1-gcc-4.patch
> deleted file mode 100644
> index f6be9d2..0000000
> --- a/src/patches/linux-atm-2.4.1-gcc-4.patch
> +++ /dev/null
> @@ -1,161 +0,0 @@
> -diff -Naur linux-atm-2.4.1-orig/src/ilmid/atmf_uni.c linux-atm-
> 2.4.1/src/ilmid/atmf_uni.c
> ---- linux-atm-2.4.1-orig/src/ilmid/atmf_uni.c 2001-09-03
> 19:41:06.000000000 +0100
> -+++ linux-atm-2.4.1/src/ilmid/atmf_uni.c 2005-08-13 10:22:44.000000000
> +0100
> -@@ -187,7 +187,7 @@
> - newPrefix->name = alloc_t(AsnOid);
> - newPrefix->name->octs = alloc(varBindName->octetLen);
> - AsnOidCopy(newPrefix->name, varBindName);
> -- Q_INSERT_BEFORE((NetPrefixNode *) var->value, newPrefix, prefix);
> -+ Q_INSERT_BEFORE((*((NetPrefixNode **)&var->value)), newPrefix,
> prefix);
> - if(atmNetPrefix.octs == NULL)
> - {
> - atmNetPrefix.octetLen = varBindName->octetLen - NETPREFIX_LEN - 2;
> -@@ -197,7 +197,7 @@
> - }
> - else if (varbind->value->a.simple->a.number == INVALID && cmp ==
> AsnOidEqual)
> - {
> -- Q_REMOVE((NetPrefixNode *) var->value, prefix);
> -+ Q_REMOVE((*((NetPrefixNode **) &var->value)), prefix);
> - }
> -
> - return NOERROR;
> -diff -Naur linux-atm-2.4.1-orig/src/lib/sapequal.c linux-atm-
> 2.4.1/src/lib/sapequal.c
> ---- linux-atm-2.4.1-orig/src/lib/sapequal.c 2001-09-03
> 19:41:05.000000000 +0100
> -+++ linux-atm-2.4.1/src/lib/sapequal.c 2005-02-06 19:24:37.000000000
> +0000
> -@@ -65,6 +65,7 @@
> - CHECK(l2.itu.window,a.l2.itu.window > b.l2.itu.window);
> - break;
> - default:
> -+ ;
> - }
> - switch (a.l3_proto) {
> - case ATM_L3_X25:
> -@@ -83,6 +84,7 @@
> - if (a.l3.user != b.l3.user) return 0;
> - break;
> - default:
> -+ ;
> - }
> - return 1;
> - }
> -diff -Naur linux-atm-2.4.1-orig/src/maint/atmtcp.c linux-atm-
> 2.4.1/src/maint/atmtcp.c
> ---- linux-atm-2.4.1-orig/src/maint/atmtcp.c 2001-09-03
> 19:41:06.000000000 +0100
> -+++ linux-atm-2.4.1/src/maint/atmtcp.c 2005-08-13 10:22:44.000000000
> +0100
> -@@ -60,7 +60,7 @@
> - static IN *inputs = NULL;
> - static fd_set in_set;
> - static int fds = 0;
> --static int debug = 0;
> -+int debug = 0;
> - static int links = 0;
> -
> -
> -diff -Naur linux-atm-2.4.1-orig/src/maint/enitune.c linux-atm-
> 2.4.1/src/maint/enitune.c
> ---- linux-atm-2.4.1-orig/src/maint/enitune.c 2001-09-03
> 19:41:06.000000000 +0100
> -+++ linux-atm-2.4.1/src/maint/enitune.c 2005-02-06 19:24:37.000000000
> +0000
> -@@ -44,6 +44,7 @@
> - if (*end || mult.rx <= 100) usage(name);
> - break;
> - default:
> -+ ;
> - }
> - if (argc != optind+1) usage(name);
> - sioc.number = strtol(argv[optind],&end,0);
> -diff -Naur linux-atm-2.4.1-orig/src/mpoad/p_factory.c linux-atm-
> 2.4.1/src/mpoad/p_factory.c
> ---- linux-atm-2.4.1-orig/src/mpoad/p_factory.c 2001-09-03
> 19:41:06.000000000 +0100
> -+++ linux-atm-2.4.1/src/mpoad/p_factory.c 2005-08-13
> 10:22:44.000000000 +0100
> -@@ -31,16 +31,17 @@
> - * beginning at location "addr".
> - */
> - uint32_t sum = 0;
> -+ uint16_t *addr16 = addr;
> -
> - while( count > 1 ) {
> - /* This is the inner loop */
> -- sum += * ((uint16_t *) addr)++;
> -+ sum += * addr16++;
> - count -= 2;
> - }
> -
> - /* Add left-over byte, if any */
> - if( count > 0 )
> -- sum += * (unsigned char *) addr;
> -+ sum += * (unsigned char *) addr16;
> -
> - /* Fold 32-bit sum to 16 bits */
> - while (sum>>16)
> -diff -Naur linux-atm-2.4.1-orig/src/qgen/qlib.c linux-atm-
> 2.4.1/src/qgen/qlib.c
> ---- linux-atm-2.4.1-orig/src/qgen/qlib.c 2001-09-03 19:41:05.000000000
> +0100
> -+++ linux-atm-2.4.1/src/qgen/qlib.c 2005-08-13 10:22:44.000000000
> +0100
> -@@ -26,8 +26,6 @@
> - #include "op.h"
> -
> -
> --static int debug = 0;
> --
> -
> - void PREFIX(report)(int severity,const char *msg,...)
> - {
> -@@ -830,6 +828,8 @@
> -
> - #ifdef STANDALONE
> -
> -+int debug = 0;
> -+
> - int main(int argc,const char **argv)
> - {
> - unsigned char msg[5000]; /* should be large enough for that */
> -diff -Naur linux-atm-2.4.1-orig/src/qgen/qlib.h linux-atm-
> 2.4.1/src/qgen/qlib.h
> ---- linux-atm-2.4.1-orig/src/qgen/qlib.h 2001-09-03 19:41:05.000000000
> +0100
> -+++ linux-atm-2.4.1/src/qgen/qlib.h 2005-08-13 10:22:44.000000000
> +0100
> -@@ -23,7 +23,6 @@
> - #define Q_FATAL -1
> -
> -
> --extern int q_dump;
> - extern void q_report(int severity,const char *msg,...);
> -
> - #ifdef DUMP_MODE
> -diff -Naur linux-atm-2.4.1-orig/src/sigd/proto.c linux-atm-
> 2.4.1/src/sigd/proto.c
> ---- linux-atm-2.4.1-orig/src/sigd/proto.c 2001-09-03
> 19:41:06.000000000 +0100
> -+++ linux-atm-2.4.1/src/sigd/proto.c 2005-02-06 19:24:37.000000000
> +0000
> -@@ -259,6 +259,7 @@
> - break;
> - }
> - default:
> -+ ;
> - }
> - va_end(ap);
> - if ((size = q_close(&dsc)) >= 0) to_signaling(sock->sig,q_buffer,size);
> -@@ -288,6 +289,7 @@
> - }
> - break;
> - default:
> -+ ;
> - }
> - va_end(ap);
> - }
> -diff -Naur linux-atm-2.4.1-orig/src/switch/debug/debug.c linux-atm-
> 2.4.1/src/switch/debug/debug.c
> ---- linux-atm-2.4.1-orig/src/switch/debug/debug.c 2001-09-03
> 19:41:06.000000000 +0100
> -+++ linux-atm-2.4.1/src/switch/debug/debug.c 2005-08-13
> 10:22:44.000000000 +0100
> -@@ -18,7 +18,7 @@
> - #define COMPONENT "FAB(debug)"
> -
> -
> --#define PRV(call) ((FAB *) (call)->fab)
> -+#define PRV(call) (*((FAB **) &(call)->fab))
> -
> -
> - typedef struct _fab {
> -diff -Naur linux-atm-2.4.1-orig/src/switch/tcp/tcpsw.c linux-atm-
> 2.4.1/src/switch/tcp/tcpsw.c
> ---- linux-atm-2.4.1-orig/src/switch/tcp/tcpsw.c 2001-09-03
> 19:41:06.000000000 +0100
> -+++ linux-atm-2.4.1/src/switch/tcp/tcpsw.c 2005-08-13
> 10:22:44.000000000 +0100
> -@@ -27,7 +27,7 @@
> -
> - #define COMPONENT "FAB(tcp)"
> -
> --#define PRV(call) ((FAB *) (call)->fab)
> -+#define PRV(call) (*((FAB **) &(call)->fab))
> -
> - #define MAX_VCI 1024
> -
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] linux-atm: Update to 2.5.2
2023-02-21 13:21 [PATCH] linux-atm: Update " Stefan Schantl
@ 2023-02-22 9:51 ` Michael Tremer
0 siblings, 0 replies; 4+ messages in thread
From: Michael Tremer @ 2023-02-22 9:51 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 36929 bytes --]
Hey Stefan,
One of these patches has HTML content. I suppose this isn’t correct.
-Michael
> On 21 Feb 2023, at 13:21, Stefan Schantl <stefan.schantl(a)ipfire.org> wrote:
>
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> 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 @@
> +
> +<!DOCTYPE html>
> +<html lang='en'>
> +<head>
> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
> + <title>Tree - rpms/linux-atm - src.fedoraproject.org</title>
> + <link rel="shortcut icon" type="image/vnd.microsoft.icon"
> + href="/theme/static/favicon.ico?version=5.13.3"/>
> + <link href="/theme/static/fedora-bootstrap-1.3.0/fedora-bootstrap.min.css?version=5.13.3"
> + type="text/css" rel="stylesheet" />
> + <link href="/theme/static/fonts/fonts.css?version=5.13.3"
> + rel="stylesheet" type="text/css" />
> + <link href="/theme/static/fonts/hack_fonts/css/hack-extended.min.css?version=5.13.3"
> + type="text/css" rel="stylesheet" />
> + <link href="/theme/static/theme.css?version=5.13.3"
> + type="text/css" rel="stylesheet" />
> +
> + <link type="text/css" rel="stylesheet" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" href="/static/vendor/font-awesome/font-awesome.css?version=5.13.3"/>
> + <link type="text/css" rel="stylesheet" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" href="/static/pagure.css?version=5.13.3"/>
> +<link nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" rel="stylesheet" href="/static/vendor/highlight.js/styles/github.css?version=5.13.3"/>
> +<link nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" rel="stylesheet" href="/static/vendor/highlightjs-line-numbers/highlightjs-line-numbers.min.css?version=5.13.3"/>
> +<style nonce="LD5wTdqgZG9dfxKOAd2vMeXCn">
> + .hljs {
> + background: #fff;
> + }
> +</style>
> + </head>
> + <body id="home">
> +
> + <!-- start masthead -->
> + <nav class="navbar navbar-light masthead p-0 navbar-expand">
> + <div class="container">
> + <a href="/" class="navbar-brand">
> + <img height="40" src="/theme/static/pagure-logo.png?version=5.13.3"
> + alt="pagure Logo" id="pagureLogo"/>
> + </a>
> + <ul class="navbar-nav ml-auto">
> +
> +
> +
> + <li class="nav-item">
> + <a class="btn btn-primary" href="/login/?next=https://src.fedoraproject.org/rpms/linux-atm/blob/rawhide/f/linux-atm-2.5.1-disable-zntune.patch">Log In</a>
> + </li>
> + </ul>
> + </div>
> + </nav>
> + <!-- close masthead-->
> +
> + <div class="bodycontent">
> +
> +
> +<div class="bg-light border border-bottom pt-3">
> + <div class="container">
> + <div class="row mb-3">
> + <div class="col-6">
> + <div class="row">
> + <div class="col-auto pr-0">
> + <h3>
> +<i class="fa fa-archive text-muted"></i></h3>
> + </div>
> + <div class="col-auto pl-2">
> + <h3 class="mb-0">
> +<a href="/projects/rpms/%2A">rpms</a> / <a href="/rpms/linux-atm"><strong>linux-atm</strong></a>
> + </h3>
> + </div>
> + </div>
> + </div>
> + <div class="col-6 text-right">
> + <div class="btn-group">
> + <div class="btn-group">
> + <a href="#"
> + class="btn btn-sm dropdown-toggle btn-outline-primary"
> + data-toggle="dropdown" id="watch-button">
> + <i class="fa fa-clone fa-fw"></i>
> + <span>Clone</span>
> + </a>
> + <div class="dropdown-menu dropdown-menu-right">
> + <div class="m-3" id="source-dropdown">
> + <div>
> + <h5><strong>Source Code</strong></h5>
> +
> + <div class="form-group">
> + <div class="input-group input-group-sm">
> + <div class="input-group-prepend"><span class="input-group-text">GIT</span></div>
> + <input class="form-control bg-white select-on-focus" type="text" value="https://src.fedoraproject.org/rpms/linux-atm.git" readonly>
> + </div>
> + </div>
> + </div>
> + </div>
> + </div>
> +
> + </div>
> + </div>
> + </div>
> +</div>
> +
> +<ul class="nav nav-tabs nav-small border-bottom-0">
> + <li class="nav-item mr-2 text-dark">
> + <a class="nav-link active" href="/rpms/linux-atm">
> + <i class="fa fa-code fa-fw text-muted"></i>
> + <span class="d-none d-md-inline">Source</span>
> + </a>
> + </li>
> +
> + <li class="nav-item mr-2 text-dark">
> + <a class="nav-link" href="https://bugzilla.redhat.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&classification=Fedora&product=Fedora&product=Fedora EPEL&component=linux-atm">
> + <i class="fa fa-fw text-muted fa-exclamation-circle"></i>
> + <span class="d-none d-md-inline">Issues </span>
> + <span class="fa fa-external-link"></span>
> + </a>
> + </li>
> +
> + <li class="nav-item mr-2 text-dark">
> + <a class="nav-link" href="/rpms/linux-atm/pull-requests">
> + <i class="fa fa-fw text-muted fa-arrow-circle-down"></i>
> + <span class="d-none d-md-inline">Pull Requests </span>
> + <span class="badge badge-secondary py-0 d-none d-md-inline">
> + 0
> + </span>
> + </a>
> + </li>
> +
> +
> + <li class="nav-item mr-2 text-dark">
> + <a class="nav-link" href="/rpms/linux-atm/stats">
> + <i class="fa fa-line-chart fa-fw text-muted"></i>
> + <span class="d-none d-md-inline">Stats</span>
> + </a>
> + </li>
> +
> +
> +</ul>
> + </div>
> +</div>
> +
> +<div class="container pt-5 repo-body-container">
> + <div class="row">
> + <div class="col-2">
> +<nav class="nav nav-tabs nav-sidetabs flex-column">
> + <a class=
> + "nav-link nowrap
> +"
> + href="/rpms/linux-atm">
> + <i class="fa fa-home text-muted fa-fw"></i> <span class="d-none d-md-inline">Overview</span>
> + </a>
> + <a class=
> + "nav-link nowrap
> + active"
> + href="/rpms/linux-atm/tree/rawhide">
> + <i class="fa fa-file-code-o text-muted fa-fw"></i> Files
> + </a>
> + <a class=
> + "nav-link nowrap
> +"
> + href="/rpms/linux-atm/commits/rawhide">
> + <i class="fa fa-list-alt text-muted fa-fw" data-glyph="spreadsheet"></i> Commits
> + </a>
> + <a class=
> + "nav-link nowrap
> +"
> + href="/rpms/linux-atm/branches?branchname=rawhide">
> + <i class="fa fa-random text-muted fa-fw"></i> Branches
> + </a>
> + <a class=
> + "nav-link nowrap
> +"
> + href="/rpms/linux-atm/forks">
> + <i class="fa fa-code-fork text-muted fa-fw"></i> Forks
> + </a>
> + <a class=
> + "nav-link nowrap
> +"
> + href="/rpms/linux-atm/releases">
> + <i class="fa fa-tags text-muted fa-fw"></i> Releases
> + </a>
> +
> + <div class="col-xs-2 line-height-1"></div>
> + <h6>Monitoring status:</h6>
> + <div class="btn-group">
> + <button title="Monitoring status" class="btn btn-sm btn-outline-primary disabled"
> + id="monitoring-button">
> + <i id="monitoring-icon" class="fa fa-fw fa-eye"></i>
> + <span id="monitoring-label" class="fa fa-circle-o-notch fa-spin fa-1x fa-fw"></span>
> + </button>
> + </div>
> +
> + <div class="col-xs-2 line-height-1"></div>
> + <div id="orphan-section" class="pt-3">
> + <div class="col-xs-2 line-height-1"></div>
> +
> + </div>
> +
> + <div class="pt-3">
> + <div class="col-xs-2 line-height-1">
> + <h6>Bugzilla Assignee:</h6>
> + <dl>
> + <dt>Fedora: </dt>
> + <dd id="fedora_assignee_txt">
> + mrc0mmand
> + </dd>
> + <dt>EPEL: </dt>
> + <dd id="epel_assignee_txt">
> + orphan
> + </dd>
> + </dl>
> + </div>
> + </div>
> +
> + <div class="modal fade" id="modal_assignee" tabindex="-1"
> + role="dialog" aria-labelledby="Bugzilla assignee" aria-hidden="true">
> + <div class="modal-dialog" role="document">
> + <div class="modal-content">
> + <div class="modal-header">
> + <h4 class="modal-title">Bugzilla Assignee</h4>
> + <button type="button" class="close" data-dismiss="modal" aria-label="Close">
> + <span aria-hidden="true">×</span>
> + <span class="sr-only">Close</span>
> + </button>
> + </div>
> + <form id="change_assignees">
> + <div class="modal-body">
> + <label for="fedora_assignee">Fedora</label>
> + <input title="Default assignee for Fedora in bugzilla - Empty input resets to default"
> + class="form-control" name="fedora_assignee" id="fedora_assignee" value="mrc0mmand"/>
> + <label for="epel_assignee">EPEL</label>
> + <input title="Default assignee for EPEL in bugzilla (if applicable) - Empty input resets to default"
> + class="form-control" name="epel_assignee" id="epel_assignee" value="orphan" />
> + <p class="pt-2">
> + These two fields allow to specify a different default assignee for ticket opened against
> + this package in bugzilla. Note: The EPEL field is
> + always displayed for packages in the 'rpms' namespace regardless of whether it
> + is used in bugzilla or not. </p>
> + </div>
> + <div class="modal-footer">
> + <button class="btn btn-secondary" type="button" title="Update bugzilla overrides" id="reset_assignees">
> + Reset to defaults
> + </button>
> + <button class="btn btn-primary" type="submit" title="Update bugzilla overrides" id="update_assignees">
> + Update
> + </button>
> + </div>
> + </form>
> + </div>
> + </div>
> + </div>
> +
> + <div class="modal fade" id="modal_orphan" tabindex="-1"
> + role="dialog" aria-labelledby="Orphan this package" aria-hidden="true">
> + <div class="modal-dialog" role="document">
> + <div class="modal-content">
> + <div class="modal-header">
> + <h4 class="modal-title">Orphan package</h4>
> + <button type="button" class="close" data-dismiss="modal" aria-label="Close">
> + <span aria-hidden="true">×</span>
> + <span class="sr-only">Close</span>
> + </button>
> + </div>
> + <div class="modal-body">
> + <div class="form-group">
> + <label for="reason_menu">Reason</label>
> + <select id="reason_menu" class="form-control">
> +
> + <option id="lack_of_time_option_button">Lack of time</option>
> +
> + <option id="do_not_use_it_option_button">Do not use it anymore</option>
> +
> + <option id="unmaintained_option_button">Unmaintained upstream</option>
> +
> + <option id="fails_to_build_option_button">Fails to build from source</option>
> +
> + <option id="not_fixed_option_button">Important bug not fixed</option>
> +
> + <option id="other_option_button">Other</option>
> + </select>
> + </div>
> + <label for="orphan_reason_info">Additional info</label>
> + <input title="Additional info for orphaning reason"
> + class="form-control" name="orphan_reason_info" id="orphan_reason_info" value=""/>
> + </div>
> + <div class="modal-footer">
> + <button class="btn btn-primary" type="submit" title="Orphan this package" id="orphan_button">
> + Update
> + </button>
> + </div>
> + </div>
> + </div>
> + </div>
> +
> + <script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn">
> + window.addEventListener('load', function() {
> + set_up_monitoring = function(status){
> + var _label = "Disabled"
> + if (status === "monitoring") {
> + _label = "Monitoring";
> + $("#monitoring-icon").attr("class", "fa fa-fw fa-eye")
> + } else if (status === "monitoring-with-scratch") {
> + _label = "Scratch builds"
> + $("#monitoring-icon").attr("class", "fa fa-fw fa-eye")
> + } else {
> + $("#monitoring-icon").attr("class", "fa fa-fw fa-eye-slash")
> + }
> +
> + $("#monitoring-label").text(_label);
> + $("#monitoring-label").removeClass("fa fa-circle-o-notch fa-spin fa-1x fa-fw");
> + }
> +
> + $.ajax({
> + url: "/_dg/anitya/rpms/linux-atm",
> + type: 'GET',
> + dataType: 'json',
> + success: function(res) {
> + console.log(res);
> + set_up_monitoring(res.monitoring)
> + }
> + });
> +
> +
> + $("#reset_assignees").on('click', function(){
> + $('#fedora_assignee').val('');
> + $('#epel_assignee').val('');
> + $("#change_assignees").submit();
> + return false;
> + });
> +
> + $("#change_assignees").on('submit', function(){
> + $('html').css('cursor', 'progress');
> + $('#reset_assignees').attr('disabled', true);
> + $('#update_assignees').attr('disabled', true);
> + $('#update_assignees').text('Updating...');
> + $.ajax({
> + url: "/_dg/bzoverrides/rpms/linux-atm",
> + type: 'POST',
> + dataType: 'json',
> + data: {
> + 'epel_assignee': $('#epel_assignee').val(),
> + 'fedora_assignee': $('#fedora_assignee').val()
> + },
> + success: function(res) {
> + $("#fedora_assignee_txt").text(res.fedora_assignee);
> + $("#epel_assignee_txt").text(res.epel_assignee);
> + $('#modal_assignee').modal('hide');
> + $('#reset_assignees').attr('disabled', false);
> + $('#update_assignees').attr('disabled', false);
> + $('#update_assignees').text('Update');
> + $('html').css('cursor', 'default');
> + console.log("Successfully changed the bugzilla assignees");
> + return false;
> + },
> + error: function(res) {
> + var msg = '';
> + if(res.responseJSON.errors){
> + msg = ': ' + res.responseJSON.errors.join(', ');
> + }
> + alert("Unable to update the bugzilla assignee(s)" + msg);
> + $('html').css('cursor', 'default');
> + $('#reset_assignees').attr('disabled', false);
> + $('#update_assignees').attr('disabled', false);
> + $('#update_assignees').text('Update');
> + return false;
> + }
> + })
> + return false;
> + });
> +
> +
> + $.ajax({
> + url: "/_dg/actived/rpms/linux-atm",
> + type: 'GET',
> + dataType: 'json',
> + success: function(res) {
> + var _btn = $("#take_orphan_button");
> + if (!res.active){
> + _btn.off("click");
> + _btn.click(function(){
> + window.open(
> + "https://pagure.io/releng/new_issue?title="
> + + "Unretire rpms/linux-atm"
> + + "&template=package_unretiremet");
> + });
> + _btn.prop( "title", "Package retired - Open a releng ticket to adopt it" );
> + _btn.html("Retired");
> + }
> + _btn.removeClass('disabled');
> + }
> + });
> +
> + $("#orphan_button").click(function(){
> + $("#orphan_button").attr("disabled", true);
> + $.ajax({
> + url: "/_dg/orphan/rpms/linux-atm",
> + type: 'POST',
> + dataType: 'json',
> + data: {
> + 'orphan_reason': $('#reason_menu').val(),
> + 'orphan_reason_info': $('#orphan_reason_info').val()
> + },
> + success: function(res) {
> + $("#point_of_contact_div").html("Package is currently unmaintained");
> + $("#orphan_button").attr("disabled", false);
> + $('#modal_orphan').modal('hide');
> + $('#orphan-section').html('');
> + },
> + error: function(res) {
> + if (res.responseJSON.errors) {
> + alert('Unable to orphan the package: ' + res.responseJSON.errors);
> + } else {
> + alert('Unable to orphan the package: ' + res.responseJSON.error);
> + }
> + $("#orphan_button").attr("disabled", false);
> + }
> + });
> + });
> + });
> + </script>
> +
> +</nav> </div>
> + <div class="col-10">
> + <div class="row mb-1">
> + <div class="col-sm-6">
> + <h3>
> + Files
> + </h3>
> + </div>
> +
> + <div class="col-sm-6">
> + <div class="float-right">
> + <div class="btn-group">
> + <a href="#" class="btn btn-outline-light border-secondary text-dark btn-sm dropdown-toggle"
> + data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
> + <span class="fa fa-random fa-fw"></span> Branch: <span class="font-weight-bold">rawhide</span>
> + </a>
> + <div class="dropdown-menu dropdown-menu-right">
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f10">
> + <span class="fa fa-random fa-fw"></span> <span class="">f10</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f11">
> + <span class="fa fa-random fa-fw"></span> <span class="">f11</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f12">
> + <span class="fa fa-random fa-fw"></span> <span class="">f12</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f13">
> + <span class="fa fa-random fa-fw"></span> <span class="">f13</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f14">
> + <span class="fa fa-random fa-fw"></span> <span class="">f14</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f15">
> + <span class="fa fa-random fa-fw"></span> <span class="">f15</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f16">
> + <span class="fa fa-random fa-fw"></span> <span class="">f16</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f17">
> + <span class="fa fa-random fa-fw"></span> <span class="">f17</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f18">
> + <span class="fa fa-random fa-fw"></span> <span class="">f18</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f19">
> + <span class="fa fa-random fa-fw"></span> <span class="">f19</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f20">
> + <span class="fa fa-random fa-fw"></span> <span class="">f20</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f21">
> + <span class="fa fa-random fa-fw"></span> <span class="">f21</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f22">
> + <span class="fa fa-random fa-fw"></span> <span class="">f22</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f23">
> + <span class="fa fa-random fa-fw"></span> <span class="">f23</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f24">
> + <span class="fa fa-random fa-fw"></span> <span class="">f24</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f25">
> + <span class="fa fa-random fa-fw"></span> <span class="">f25</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f26">
> + <span class="fa fa-random fa-fw"></span> <span class="">f26</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f27">
> + <span class="fa fa-random fa-fw"></span> <span class="">f27</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f28">
> + <span class="fa fa-random fa-fw"></span> <span class="">f28</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f29">
> + <span class="fa fa-random fa-fw"></span> <span class="">f29</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f30">
> + <span class="fa fa-random fa-fw"></span> <span class="">f30</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f31">
> + <span class="fa fa-random fa-fw"></span> <span class="">f31</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f32">
> + <span class="fa fa-random fa-fw"></span> <span class="">f32</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f33">
> + <span class="fa fa-random fa-fw"></span> <span class="">f33</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f34">
> + <span class="fa fa-random fa-fw"></span> <span class="">f34</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f35">
> + <span class="fa fa-random fa-fw"></span> <span class="">f35</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f36">
> + <span class="fa fa-random fa-fw"></span> <span class="">f36</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f37">
> + <span class="fa fa-random fa-fw"></span> <span class="">f37</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f38">
> + <span class="fa fa-random fa-fw"></span> <span class="">f38</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f7">
> + <span class="fa fa-random fa-fw"></span> <span class="">f7</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f8">
> + <span class="fa fa-random fa-fw"></span> <span class="">f8</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f9">
> + <span class="fa fa-random fa-fw"></span> <span class="">f9</span>
> + </a>
> + <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/main">
> + <span class="fa fa-random fa-fw"></span> <span class="">main</span>
> + </a>
> + <a class="dropdown-item pl-1 active" href="/rpms/linux-atm/tree/rawhide">
> + <span class="fa fa-random fa-fw"></span> <span class="font-weight-bold">rawhide</span>
> + </a>
> + </div>
> + </div>
> + </div>
> + </div>
> + </div>
> + <div class="card mb-3">
> + <div class="card-header">
> + <ol class="breadcrumb p-0 bg-transparent mb-0">
> + <li class="breadcrumb-item">
> + <a href="/rpms/linux-atm/tree/rawhide">
> + <span class="fa fa-random">
> + </span> rawhide
> + </a>
> + </li>
> + <li class="active breadcrumb-item">
> + <span class="fa fa-file" data-glyph="">
> + </span> linux-atm-2.5.1-disable-zntune.patch
> + </li>
> + </ol>
> + </div>
> +
> + <div class="card-body p-0">
> + <div class="bg-light border text-right pr-2">
> + <form class="btn btn-sm" method="POST" name="fork_project"
> + action="/fork_edit/rpms/linux-atm/edit/rawhide/f/linux-atm-2.5.1-disable-zntune.patch">
> + <button class="btn btn-sm btn-secondary fork_project_btn">
> + Fork and Edit
> + </button>
> +
> + </form>
> +
> + <a class="btn btn-secondary btn-sm" href="/rpms/linux-atm/blob/rawhide/f/linux-atm-2.5.1-disable-zntune.patch" title="View as blob">Blob</a>
> +
> + <a class="btn btn-secondary btn-sm" href="/rpms/linux-atm/blame/linux-atm-2.5.1-disable-zntune.patch?identifier=rawhide" title="View git blame">Blame</a>
> +
> + <a class="btn btn-secondary btn-sm" href="/rpms/linux-atm/history/linux-atm-2.5.1-disable-zntune.patch?identifier=rawhide" title="View git log for this file">History</a>
> +
> + <a class="btn btn-secondary btn-sm" href="/rpms/linux-atm/raw/rawhide/f/linux-atm-2.5.1-disable-zntune.patch" title="View as raw">Raw</a>
> + </div>
> +
> + <pre class="syntaxhighlightblock"><code class="lang-diff">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.
> +</code></pre>
> + </div>
> + </div> <!-- end .card-->
> +
> +</div>
> +</div>
> +</div>
> + </div>
> +
> + <div class="footer pt-4 text-white">
> + <div class="container">
> + <div class="d-flex align-items-center">
> + <div>
> + <div>Powered by <a href="https://pagure.io/pagure" class="notblue">Pagure</a> 5.13.3</div>
> + <div>
> + <a href="https://docs.pagure.org/pagure/usage/index.html" class="notblue">Documentation</a> •
> + <a href="https://pagure.io/pagure/new_issue" class="notblue">File an Issue</a> •
> + <a href="/about">About this Instance</a> •
> + <a href="/ssh_info" class="notblue">SSH Hostkey/Fingerprint</a>
> + </div>
> + </div>
> + <div class="ml-auto text-right">
> + <div>© Red Hat, Inc. and others.</div>
> + </div>
> + </div>
> + </div>
> + </div>
> +
> +
> + <script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" src="/static/vendor/jquery/jquery.min.js?version=5.13.3"></script>
> +
> + <script src="/static/vendor/bootstrap/bootstrap.bundle.min.js?version=5.13.3"></script>
> +
> + <script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn">
> + $('[data-toggle="tooltip"]').tooltip({placement : 'bottom'});
> + $(".cancel_btn").click(function() {
> + history.back();
> + });
> + </script>
> +
> +<script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" src="/static/vendor/lazyload/lazyload.min.js?version=5.13.3"></script>
> +
> +<script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn">
> +window.addEventListener("load", function(event) {
> + lazyload();
> +});
> +</script>
> +
> +<script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn">
> +$("#giturl-toggle").on('click', function(event){
> + event.stopPropagation();
> + $("#giturl-more").toggle();
> + $("#giturl-toggle").hide();
> +})
> +
> +$(".fork_project_btn").click(function() {
> + $('#fork_project').submit();
> +});
> +
> +$(".select-on-focus").on("focus", function() {
> + $(this).select();
> +});
> +
> +</script>
> +
> +<script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" src="/static/vendor/highlight.js/highlight.pack.js?version=5.13.3"></script>
> +<script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" src="/static/vendor/highlightjs-line-numbers/highlightjs-line-numbers.min.js?version=5.13.3"></script>
> +<script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" src="/static/vendor/highlight.js/spec.js?version=5.13.3"></script>
> +
> +<script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn">
> + $(document).ready(function() {
> + $('.fork_project_btn').click($("[name=fork_project]").submit);
> +
> + $('pre.syntaxhighlightblock code').each(function(i, block) {
> + hljs.highlightBlock(block);
> + hljs.lineNumbersBlock(block);
> + });
> +
> + var cls = "highlighted-line";
> + var lines = location.hash.substr(2).split('-').map(function (x) { return parseInt(x, 10) });
> + if (! isNaN(lines[0]))
> + {
> + for (var i = lines[lines.length - 1]; i >= lines[0]; i--) {
> + $('#_' + i).parent().parent().addClass(cls);
> + }
> + setTimeout(function(){
> + $("#_" + lines[0]).get(0).scrollIntoView({behavior: "instant", block: "start", inline: "nearest"});
> + }, 50);
> + }
> +});
> +</script>
> +
> +<script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn">
> +
> + function updateHighlight() {
> + var cls = "highlighted-line";
> + $('.' + cls).removeClass(cls)
> + if (location.hash !== '') {
> + var lines = location.hash.substr(2).split('-').map(function (x) { return parseInt(x, 10) });
> + for (var i = lines[lines.length - 1]; i >= lines[0]; i--) {
> + $('[data-line-number=' + i + ']').closest('tr').addClass(cls);
> + }
> + return lines;
> + }
> + return [];
> + }
> + $(window).on('hashchange', updateHighlight);
> + var selected = [];
> + $("[data-line-number]").click(function (ev) {
> + var line = $(this).attr('data-line-number');
> + if (ev.shiftKey) {
> + selected = selected.slice(-1).concat(line);
> + } else {
> + selected = [line];
> + }
> +
> + var hash = '_' + selected[0];
> + if (selected.length === 2) {
> + hash = '_' + Math.min(selected[0], selected[1]) + '-' + Math.max(selected[0], selected[1]);
> + }
> + window.location.hash = hash;
> + return false;
> + });
> +
> +</script>
> +
> +
> +</body>
> +</html>
> \ 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 <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>
> +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 <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>
> +
> 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 <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
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] linux-atm: Update to 2.5.2
@ 2023-02-21 13:21 Stefan Schantl
2023-02-22 9:51 ` Michael Tremer
0 siblings, 1 reply; 4+ messages in thread
From: Stefan Schantl @ 2023-02-21 13:21 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 35089 bytes --]
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
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 @@
+
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <title>Tree - rpms/linux-atm - src.fedoraproject.org</title>
+ <link rel="shortcut icon" type="image/vnd.microsoft.icon"
+ href="/theme/static/favicon.ico?version=5.13.3"/>
+ <link href="/theme/static/fedora-bootstrap-1.3.0/fedora-bootstrap.min.css?version=5.13.3"
+ type="text/css" rel="stylesheet" />
+ <link href="/theme/static/fonts/fonts.css?version=5.13.3"
+ rel="stylesheet" type="text/css" />
+ <link href="/theme/static/fonts/hack_fonts/css/hack-extended.min.css?version=5.13.3"
+ type="text/css" rel="stylesheet" />
+ <link href="/theme/static/theme.css?version=5.13.3"
+ type="text/css" rel="stylesheet" />
+
+ <link type="text/css" rel="stylesheet" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" href="/static/vendor/font-awesome/font-awesome.css?version=5.13.3"/>
+ <link type="text/css" rel="stylesheet" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" href="/static/pagure.css?version=5.13.3"/>
+<link nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" rel="stylesheet" href="/static/vendor/highlight.js/styles/github.css?version=5.13.3"/>
+<link nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" rel="stylesheet" href="/static/vendor/highlightjs-line-numbers/highlightjs-line-numbers.min.css?version=5.13.3"/>
+<style nonce="LD5wTdqgZG9dfxKOAd2vMeXCn">
+ .hljs {
+ background: #fff;
+ }
+</style>
+ </head>
+ <body id="home">
+
+ <!-- start masthead -->
+ <nav class="navbar navbar-light masthead p-0 navbar-expand">
+ <div class="container">
+ <a href="/" class="navbar-brand">
+ <img height="40" src="/theme/static/pagure-logo.png?version=5.13.3"
+ alt="pagure Logo" id="pagureLogo"/>
+ </a>
+ <ul class="navbar-nav ml-auto">
+
+
+
+ <li class="nav-item">
+ <a class="btn btn-primary" href="/login/?next=https://src.fedoraproject.org/rpms/linux-atm/blob/rawhide/f/linux-atm-2.5.1-disable-zntune.patch">Log In</a>
+ </li>
+ </ul>
+ </div>
+ </nav>
+ <!-- close masthead-->
+
+ <div class="bodycontent">
+
+
+<div class="bg-light border border-bottom pt-3">
+ <div class="container">
+ <div class="row mb-3">
+ <div class="col-6">
+ <div class="row">
+ <div class="col-auto pr-0">
+ <h3>
+<i class="fa fa-archive text-muted"></i></h3>
+ </div>
+ <div class="col-auto pl-2">
+ <h3 class="mb-0">
+<a href="/projects/rpms/%2A">rpms</a> / <a href="/rpms/linux-atm"><strong>linux-atm</strong></a>
+ </h3>
+ </div>
+ </div>
+ </div>
+ <div class="col-6 text-right">
+ <div class="btn-group">
+ <div class="btn-group">
+ <a href="#"
+ class="btn btn-sm dropdown-toggle btn-outline-primary"
+ data-toggle="dropdown" id="watch-button">
+ <i class="fa fa-clone fa-fw"></i>
+ <span>Clone</span>
+ </a>
+ <div class="dropdown-menu dropdown-menu-right">
+ <div class="m-3" id="source-dropdown">
+ <div>
+ <h5><strong>Source Code</strong></h5>
+
+ <div class="form-group">
+ <div class="input-group input-group-sm">
+ <div class="input-group-prepend"><span class="input-group-text">GIT</span></div>
+ <input class="form-control bg-white select-on-focus" type="text" value="https://src.fedoraproject.org/rpms/linux-atm.git" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+</div>
+
+<ul class="nav nav-tabs nav-small border-bottom-0">
+ <li class="nav-item mr-2 text-dark">
+ <a class="nav-link active" href="/rpms/linux-atm">
+ <i class="fa fa-code fa-fw text-muted"></i>
+ <span class="d-none d-md-inline">Source</span>
+ </a>
+ </li>
+
+ <li class="nav-item mr-2 text-dark">
+ <a class="nav-link" href="https://bugzilla.redhat.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&classification=Fedora&product=Fedora&product=Fedora EPEL&component=linux-atm">
+ <i class="fa fa-fw text-muted fa-exclamation-circle"></i>
+ <span class="d-none d-md-inline">Issues </span>
+ <span class="fa fa-external-link"></span>
+ </a>
+ </li>
+
+ <li class="nav-item mr-2 text-dark">
+ <a class="nav-link" href="/rpms/linux-atm/pull-requests">
+ <i class="fa fa-fw text-muted fa-arrow-circle-down"></i>
+ <span class="d-none d-md-inline">Pull Requests </span>
+ <span class="badge badge-secondary py-0 d-none d-md-inline">
+ 0
+ </span>
+ </a>
+ </li>
+
+
+ <li class="nav-item mr-2 text-dark">
+ <a class="nav-link" href="/rpms/linux-atm/stats">
+ <i class="fa fa-line-chart fa-fw text-muted"></i>
+ <span class="d-none d-md-inline">Stats</span>
+ </a>
+ </li>
+
+
+</ul>
+ </div>
+</div>
+
+<div class="container pt-5 repo-body-container">
+ <div class="row">
+ <div class="col-2">
+<nav class="nav nav-tabs nav-sidetabs flex-column">
+ <a class=
+ "nav-link nowrap
+"
+ href="/rpms/linux-atm">
+ <i class="fa fa-home text-muted fa-fw"></i> <span class="d-none d-md-inline">Overview</span>
+ </a>
+ <a class=
+ "nav-link nowrap
+ active"
+ href="/rpms/linux-atm/tree/rawhide">
+ <i class="fa fa-file-code-o text-muted fa-fw"></i> Files
+ </a>
+ <a class=
+ "nav-link nowrap
+"
+ href="/rpms/linux-atm/commits/rawhide">
+ <i class="fa fa-list-alt text-muted fa-fw" data-glyph="spreadsheet"></i> Commits
+ </a>
+ <a class=
+ "nav-link nowrap
+"
+ href="/rpms/linux-atm/branches?branchname=rawhide">
+ <i class="fa fa-random text-muted fa-fw"></i> Branches
+ </a>
+ <a class=
+ "nav-link nowrap
+"
+ href="/rpms/linux-atm/forks">
+ <i class="fa fa-code-fork text-muted fa-fw"></i> Forks
+ </a>
+ <a class=
+ "nav-link nowrap
+"
+ href="/rpms/linux-atm/releases">
+ <i class="fa fa-tags text-muted fa-fw"></i> Releases
+ </a>
+
+ <div class="col-xs-2 line-height-1"></div>
+ <h6>Monitoring status:</h6>
+ <div class="btn-group">
+ <button title="Monitoring status" class="btn btn-sm btn-outline-primary disabled"
+ id="monitoring-button">
+ <i id="monitoring-icon" class="fa fa-fw fa-eye"></i>
+ <span id="monitoring-label" class="fa fa-circle-o-notch fa-spin fa-1x fa-fw"></span>
+ </button>
+ </div>
+
+ <div class="col-xs-2 line-height-1"></div>
+ <div id="orphan-section" class="pt-3">
+ <div class="col-xs-2 line-height-1"></div>
+
+ </div>
+
+ <div class="pt-3">
+ <div class="col-xs-2 line-height-1">
+ <h6>Bugzilla Assignee:</h6>
+ <dl>
+ <dt>Fedora: </dt>
+ <dd id="fedora_assignee_txt">
+ mrc0mmand
+ </dd>
+ <dt>EPEL: </dt>
+ <dd id="epel_assignee_txt">
+ orphan
+ </dd>
+ </dl>
+ </div>
+ </div>
+
+ <div class="modal fade" id="modal_assignee" tabindex="-1"
+ role="dialog" aria-labelledby="Bugzilla assignee" aria-hidden="true">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h4 class="modal-title">Bugzilla Assignee</h4>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+ <span aria-hidden="true">×</span>
+ <span class="sr-only">Close</span>
+ </button>
+ </div>
+ <form id="change_assignees">
+ <div class="modal-body">
+ <label for="fedora_assignee">Fedora</label>
+ <input title="Default assignee for Fedora in bugzilla - Empty input resets to default"
+ class="form-control" name="fedora_assignee" id="fedora_assignee" value="mrc0mmand"/>
+ <label for="epel_assignee">EPEL</label>
+ <input title="Default assignee for EPEL in bugzilla (if applicable) - Empty input resets to default"
+ class="form-control" name="epel_assignee" id="epel_assignee" value="orphan" />
+ <p class="pt-2">
+ These two fields allow to specify a different default assignee for ticket opened against
+ this package in bugzilla. Note: The EPEL field is
+ always displayed for packages in the 'rpms' namespace regardless of whether it
+ is used in bugzilla or not. </p>
+ </div>
+ <div class="modal-footer">
+ <button class="btn btn-secondary" type="button" title="Update bugzilla overrides" id="reset_assignees">
+ Reset to defaults
+ </button>
+ <button class="btn btn-primary" type="submit" title="Update bugzilla overrides" id="update_assignees">
+ Update
+ </button>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <div class="modal fade" id="modal_orphan" tabindex="-1"
+ role="dialog" aria-labelledby="Orphan this package" aria-hidden="true">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h4 class="modal-title">Orphan package</h4>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+ <span aria-hidden="true">×</span>
+ <span class="sr-only">Close</span>
+ </button>
+ </div>
+ <div class="modal-body">
+ <div class="form-group">
+ <label for="reason_menu">Reason</label>
+ <select id="reason_menu" class="form-control">
+
+ <option id="lack_of_time_option_button">Lack of time</option>
+
+ <option id="do_not_use_it_option_button">Do not use it anymore</option>
+
+ <option id="unmaintained_option_button">Unmaintained upstream</option>
+
+ <option id="fails_to_build_option_button">Fails to build from source</option>
+
+ <option id="not_fixed_option_button">Important bug not fixed</option>
+
+ <option id="other_option_button">Other</option>
+ </select>
+ </div>
+ <label for="orphan_reason_info">Additional info</label>
+ <input title="Additional info for orphaning reason"
+ class="form-control" name="orphan_reason_info" id="orphan_reason_info" value=""/>
+ </div>
+ <div class="modal-footer">
+ <button class="btn btn-primary" type="submit" title="Orphan this package" id="orphan_button">
+ Update
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn">
+ window.addEventListener('load', function() {
+ set_up_monitoring = function(status){
+ var _label = "Disabled"
+ if (status === "monitoring") {
+ _label = "Monitoring";
+ $("#monitoring-icon").attr("class", "fa fa-fw fa-eye")
+ } else if (status === "monitoring-with-scratch") {
+ _label = "Scratch builds"
+ $("#monitoring-icon").attr("class", "fa fa-fw fa-eye")
+ } else {
+ $("#monitoring-icon").attr("class", "fa fa-fw fa-eye-slash")
+ }
+
+ $("#monitoring-label").text(_label);
+ $("#monitoring-label").removeClass("fa fa-circle-o-notch fa-spin fa-1x fa-fw");
+ }
+
+ $.ajax({
+ url: "/_dg/anitya/rpms/linux-atm",
+ type: 'GET',
+ dataType: 'json',
+ success: function(res) {
+ console.log(res);
+ set_up_monitoring(res.monitoring)
+ }
+ });
+
+
+ $("#reset_assignees").on('click', function(){
+ $('#fedora_assignee').val('');
+ $('#epel_assignee').val('');
+ $("#change_assignees").submit();
+ return false;
+ });
+
+ $("#change_assignees").on('submit', function(){
+ $('html').css('cursor', 'progress');
+ $('#reset_assignees').attr('disabled', true);
+ $('#update_assignees').attr('disabled', true);
+ $('#update_assignees').text('Updating...');
+ $.ajax({
+ url: "/_dg/bzoverrides/rpms/linux-atm",
+ type: 'POST',
+ dataType: 'json',
+ data: {
+ 'epel_assignee': $('#epel_assignee').val(),
+ 'fedora_assignee': $('#fedora_assignee').val()
+ },
+ success: function(res) {
+ $("#fedora_assignee_txt").text(res.fedora_assignee);
+ $("#epel_assignee_txt").text(res.epel_assignee);
+ $('#modal_assignee').modal('hide');
+ $('#reset_assignees').attr('disabled', false);
+ $('#update_assignees').attr('disabled', false);
+ $('#update_assignees').text('Update');
+ $('html').css('cursor', 'default');
+ console.log("Successfully changed the bugzilla assignees");
+ return false;
+ },
+ error: function(res) {
+ var msg = '';
+ if(res.responseJSON.errors){
+ msg = ': ' + res.responseJSON.errors.join(', ');
+ }
+ alert("Unable to update the bugzilla assignee(s)" + msg);
+ $('html').css('cursor', 'default');
+ $('#reset_assignees').attr('disabled', false);
+ $('#update_assignees').attr('disabled', false);
+ $('#update_assignees').text('Update');
+ return false;
+ }
+ })
+ return false;
+ });
+
+
+ $.ajax({
+ url: "/_dg/actived/rpms/linux-atm",
+ type: 'GET',
+ dataType: 'json',
+ success: function(res) {
+ var _btn = $("#take_orphan_button");
+ if (!res.active){
+ _btn.off("click");
+ _btn.click(function(){
+ window.open(
+ "https://pagure.io/releng/new_issue?title="
+ + "Unretire rpms/linux-atm"
+ + "&template=package_unretiremet");
+ });
+ _btn.prop( "title", "Package retired - Open a releng ticket to adopt it" );
+ _btn.html("Retired");
+ }
+ _btn.removeClass('disabled');
+ }
+ });
+
+ $("#orphan_button").click(function(){
+ $("#orphan_button").attr("disabled", true);
+ $.ajax({
+ url: "/_dg/orphan/rpms/linux-atm",
+ type: 'POST',
+ dataType: 'json',
+ data: {
+ 'orphan_reason': $('#reason_menu').val(),
+ 'orphan_reason_info': $('#orphan_reason_info').val()
+ },
+ success: function(res) {
+ $("#point_of_contact_div").html("Package is currently unmaintained");
+ $("#orphan_button").attr("disabled", false);
+ $('#modal_orphan').modal('hide');
+ $('#orphan-section').html('');
+ },
+ error: function(res) {
+ if (res.responseJSON.errors) {
+ alert('Unable to orphan the package: ' + res.responseJSON.errors);
+ } else {
+ alert('Unable to orphan the package: ' + res.responseJSON.error);
+ }
+ $("#orphan_button").attr("disabled", false);
+ }
+ });
+ });
+ });
+ </script>
+
+</nav> </div>
+ <div class="col-10">
+ <div class="row mb-1">
+ <div class="col-sm-6">
+ <h3>
+ Files
+ </h3>
+ </div>
+
+ <div class="col-sm-6">
+ <div class="float-right">
+ <div class="btn-group">
+ <a href="#" class="btn btn-outline-light border-secondary text-dark btn-sm dropdown-toggle"
+ data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <span class="fa fa-random fa-fw"></span> Branch: <span class="font-weight-bold">rawhide</span>
+ </a>
+ <div class="dropdown-menu dropdown-menu-right">
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f10">
+ <span class="fa fa-random fa-fw"></span> <span class="">f10</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f11">
+ <span class="fa fa-random fa-fw"></span> <span class="">f11</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f12">
+ <span class="fa fa-random fa-fw"></span> <span class="">f12</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f13">
+ <span class="fa fa-random fa-fw"></span> <span class="">f13</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f14">
+ <span class="fa fa-random fa-fw"></span> <span class="">f14</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f15">
+ <span class="fa fa-random fa-fw"></span> <span class="">f15</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f16">
+ <span class="fa fa-random fa-fw"></span> <span class="">f16</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f17">
+ <span class="fa fa-random fa-fw"></span> <span class="">f17</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f18">
+ <span class="fa fa-random fa-fw"></span> <span class="">f18</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f19">
+ <span class="fa fa-random fa-fw"></span> <span class="">f19</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f20">
+ <span class="fa fa-random fa-fw"></span> <span class="">f20</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f21">
+ <span class="fa fa-random fa-fw"></span> <span class="">f21</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f22">
+ <span class="fa fa-random fa-fw"></span> <span class="">f22</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f23">
+ <span class="fa fa-random fa-fw"></span> <span class="">f23</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f24">
+ <span class="fa fa-random fa-fw"></span> <span class="">f24</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f25">
+ <span class="fa fa-random fa-fw"></span> <span class="">f25</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f26">
+ <span class="fa fa-random fa-fw"></span> <span class="">f26</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f27">
+ <span class="fa fa-random fa-fw"></span> <span class="">f27</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f28">
+ <span class="fa fa-random fa-fw"></span> <span class="">f28</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f29">
+ <span class="fa fa-random fa-fw"></span> <span class="">f29</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f30">
+ <span class="fa fa-random fa-fw"></span> <span class="">f30</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f31">
+ <span class="fa fa-random fa-fw"></span> <span class="">f31</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f32">
+ <span class="fa fa-random fa-fw"></span> <span class="">f32</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f33">
+ <span class="fa fa-random fa-fw"></span> <span class="">f33</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f34">
+ <span class="fa fa-random fa-fw"></span> <span class="">f34</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f35">
+ <span class="fa fa-random fa-fw"></span> <span class="">f35</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f36">
+ <span class="fa fa-random fa-fw"></span> <span class="">f36</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f37">
+ <span class="fa fa-random fa-fw"></span> <span class="">f37</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f38">
+ <span class="fa fa-random fa-fw"></span> <span class="">f38</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f7">
+ <span class="fa fa-random fa-fw"></span> <span class="">f7</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f8">
+ <span class="fa fa-random fa-fw"></span> <span class="">f8</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/f9">
+ <span class="fa fa-random fa-fw"></span> <span class="">f9</span>
+ </a>
+ <a class="dropdown-item pl-1 " href="/rpms/linux-atm/tree/main">
+ <span class="fa fa-random fa-fw"></span> <span class="">main</span>
+ </a>
+ <a class="dropdown-item pl-1 active" href="/rpms/linux-atm/tree/rawhide">
+ <span class="fa fa-random fa-fw"></span> <span class="font-weight-bold">rawhide</span>
+ </a>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="card mb-3">
+ <div class="card-header">
+ <ol class="breadcrumb p-0 bg-transparent mb-0">
+ <li class="breadcrumb-item">
+ <a href="/rpms/linux-atm/tree/rawhide">
+ <span class="fa fa-random">
+ </span> rawhide
+ </a>
+ </li>
+ <li class="active breadcrumb-item">
+ <span class="fa fa-file" data-glyph="">
+ </span> linux-atm-2.5.1-disable-zntune.patch
+ </li>
+ </ol>
+ </div>
+
+ <div class="card-body p-0">
+ <div class="bg-light border text-right pr-2">
+ <form class="btn btn-sm" method="POST" name="fork_project"
+ action="/fork_edit/rpms/linux-atm/edit/rawhide/f/linux-atm-2.5.1-disable-zntune.patch">
+ <button class="btn btn-sm btn-secondary fork_project_btn">
+ Fork and Edit
+ </button>
+
+ </form>
+
+ <a class="btn btn-secondary btn-sm" href="/rpms/linux-atm/blob/rawhide/f/linux-atm-2.5.1-disable-zntune.patch" title="View as blob">Blob</a>
+
+ <a class="btn btn-secondary btn-sm" href="/rpms/linux-atm/blame/linux-atm-2.5.1-disable-zntune.patch?identifier=rawhide" title="View git blame">Blame</a>
+
+ <a class="btn btn-secondary btn-sm" href="/rpms/linux-atm/history/linux-atm-2.5.1-disable-zntune.patch?identifier=rawhide" title="View git log for this file">History</a>
+
+ <a class="btn btn-secondary btn-sm" href="/rpms/linux-atm/raw/rawhide/f/linux-atm-2.5.1-disable-zntune.patch" title="View as raw">Raw</a>
+ </div>
+
+ <pre class="syntaxhighlightblock"><code class="lang-diff">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.
+</code></pre>
+ </div>
+ </div> <!-- end .card-->
+
+</div>
+</div>
+</div>
+ </div>
+
+ <div class="footer pt-4 text-white">
+ <div class="container">
+ <div class="d-flex align-items-center">
+ <div>
+ <div>Powered by <a href="https://pagure.io/pagure" class="notblue">Pagure</a> 5.13.3</div>
+ <div>
+ <a href="https://docs.pagure.org/pagure/usage/index.html" class="notblue">Documentation</a> •
+ <a href="https://pagure.io/pagure/new_issue" class="notblue">File an Issue</a> •
+ <a href="/about">About this Instance</a> •
+ <a href="/ssh_info" class="notblue">SSH Hostkey/Fingerprint</a>
+ </div>
+ </div>
+ <div class="ml-auto text-right">
+ <div>© Red Hat, Inc. and others.</div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" src="/static/vendor/jquery/jquery.min.js?version=5.13.3"></script>
+
+ <script src="/static/vendor/bootstrap/bootstrap.bundle.min.js?version=5.13.3"></script>
+
+ <script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn">
+ $('[data-toggle="tooltip"]').tooltip({placement : 'bottom'});
+ $(".cancel_btn").click(function() {
+ history.back();
+ });
+ </script>
+
+<script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" src="/static/vendor/lazyload/lazyload.min.js?version=5.13.3"></script>
+
+<script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn">
+window.addEventListener("load", function(event) {
+ lazyload();
+});
+</script>
+
+<script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn">
+$("#giturl-toggle").on('click', function(event){
+ event.stopPropagation();
+ $("#giturl-more").toggle();
+ $("#giturl-toggle").hide();
+})
+
+$(".fork_project_btn").click(function() {
+ $('#fork_project').submit();
+});
+
+$(".select-on-focus").on("focus", function() {
+ $(this).select();
+});
+
+</script>
+
+<script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" src="/static/vendor/highlight.js/highlight.pack.js?version=5.13.3"></script>
+<script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" src="/static/vendor/highlightjs-line-numbers/highlightjs-line-numbers.min.js?version=5.13.3"></script>
+<script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn" src="/static/vendor/highlight.js/spec.js?version=5.13.3"></script>
+
+<script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn">
+ $(document).ready(function() {
+ $('.fork_project_btn').click($("[name=fork_project]").submit);
+
+ $('pre.syntaxhighlightblock code').each(function(i, block) {
+ hljs.highlightBlock(block);
+ hljs.lineNumbersBlock(block);
+ });
+
+ var cls = "highlighted-line";
+ var lines = location.hash.substr(2).split('-').map(function (x) { return parseInt(x, 10) });
+ if (! isNaN(lines[0]))
+ {
+ for (var i = lines[lines.length - 1]; i >= lines[0]; i--) {
+ $('#_' + i).parent().parent().addClass(cls);
+ }
+ setTimeout(function(){
+ $("#_" + lines[0]).get(0).scrollIntoView({behavior: "instant", block: "start", inline: "nearest"});
+ }, 50);
+ }
+});
+</script>
+
+<script type="text/javascript" nonce="LD5wTdqgZG9dfxKOAd2vMeXCn">
+
+ function updateHighlight() {
+ var cls = "highlighted-line";
+ $('.' + cls).removeClass(cls)
+ if (location.hash !== '') {
+ var lines = location.hash.substr(2).split('-').map(function (x) { return parseInt(x, 10) });
+ for (var i = lines[lines.length - 1]; i >= lines[0]; i--) {
+ $('[data-line-number=' + i + ']').closest('tr').addClass(cls);
+ }
+ return lines;
+ }
+ return [];
+ }
+ $(window).on('hashchange', updateHighlight);
+ var selected = [];
+ $("[data-line-number]").click(function (ev) {
+ var line = $(this).attr('data-line-number');
+ if (ev.shiftKey) {
+ selected = selected.slice(-1).concat(line);
+ } else {
+ selected = [line];
+ }
+
+ var hash = '_' + selected[0];
+ if (selected.length === 2) {
+ hash = '_' + Math.min(selected[0], selected[1]) + '-' + Math.max(selected[0], selected[1]);
+ }
+ window.location.hash = hash;
+ return false;
+ });
+
+</script>
+
+
+</body>
+</html>
\ 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 <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>
+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 <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>
+
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 <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
--
2.30.2
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-22 9:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-18 10:11 [PATCH] linux-atm: update to 2.5.2 Marcel Lorenz
2017-04-06 9:07 ` Michael Tremer
2023-02-21 13:21 [PATCH] linux-atm: Update " Stefan Schantl
2023-02-22 9:51 ` Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox