From f44c75331e839f90d40dc2d31d632bcf92ced74f Mon Sep 17 00:00:00 2001 From: Rmys Date: Fri, 2 Jul 2021 19:53:34 +0300 Subject: [PATCH] linux-atm rebuild --- ...-Include-linux-sockios.h-for-SIOCGST.patch | 59 ++++++++++++ network/connection/files/gcc43.patch | 11 +++ .../linux-atm-2.5.0-disable-ilmidiag.patch | 11 +++ .../files/linux-atm-2.5.0-open-macro.patch | 11 +++ network/connection/files/man-pages.patch | 45 +++++++++ network/connection/files/netdevice.patch | 33 +++++++ .../files/remove-define-hacks.patch | 22 +++++ network/connection/files/sandbox.patch | 17 ++++ network/connection/pspec.xml | 91 +++++++++++++++++++ 9 files changed, 300 insertions(+) create mode 100644 network/connection/files/0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch create mode 100644 network/connection/files/gcc43.patch create mode 100644 network/connection/files/linux-atm-2.5.0-disable-ilmidiag.patch create mode 100644 network/connection/files/linux-atm-2.5.0-open-macro.patch create mode 100644 network/connection/files/man-pages.patch create mode 100644 network/connection/files/netdevice.patch create mode 100644 network/connection/files/remove-define-hacks.patch create mode 100644 network/connection/files/sandbox.patch create mode 100644 network/connection/pspec.xml diff --git a/network/connection/files/0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch b/network/connection/files/0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch new file mode 100644 index 0000000000..a54869db89 --- /dev/null +++ b/network/connection/files/0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch @@ -0,0 +1,59 @@ +From 4456e13880803a300e4b6f263ad22a37481b5df5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Aug 2019 09:33:43 -0700 +Subject: [PATCH] saaldump,atmdump: Include linux/sockios.h for SIOCGSTAMP + +In linux kernel commit 0768e17073dc527ccd18ed5f96ce85f9985e9115 +the asm-generic/sockios.h header no longer defines SIOCGSTAMP. +Instead it provides only SIOCGSTAMP_OLD. + +The linux/sockios.h header now defines SIOCGSTAMP using either +SIOCGSTAMP_OLD or SIOCGSTAMP_NEW as appropriate. This linux only +header file is not pulled so we get a build failure. + +Fixes +../../../linux-atm-2.5.2/src/maint/atmdump.c:142:18: error: use of undeclared identifier 'SIOCGSTAMP' + if (ioctl(s,SIOCGSTAMP,&stamp) < 0) { + ^ +1 error generated. +make[3]: *** [Makefile:623: atmdump.o] Error 1 +make[3]: *** Waiting for unfinished jobs.... +../../../linux-atm-2.5.2/src/maint/saaldump.c:169:14: error: use of undeclared identifier 'SIOCGSTAMP' + if (ioctl(s,SIOCGSTAMP,&stamp) < 0) { + ^ +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/maint/atmdump.c | 2 +- + src/maint/saaldump.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/maint/atmdump.c b/src/maint/atmdump.c +index 8b17826..9e4853b 100644 +--- a/src/maint/atmdump.c ++++ b/src/maint/atmdump.c +@@ -5,7 +5,7 @@ + #if HAVE_CONFIG_H + #include + #endif +- ++#include + #include + #include + #include +diff --git a/src/maint/saaldump.c b/src/maint/saaldump.c +index 83bdde9..69429a8 100644 +--- a/src/maint/saaldump.c ++++ b/src/maint/saaldump.c +@@ -5,7 +5,7 @@ + #if HAVE_CONFIG_H + #include + #endif +- ++#include + #include + #include + #include +-- +2.23.0 + diff --git a/network/connection/files/gcc43.patch b/network/connection/files/gcc43.patch new file mode 100644 index 0000000000..51b10a7328 --- /dev/null +++ b/network/connection/files/gcc43.patch @@ -0,0 +1,11 @@ +diff -Nur linux-atm-2.5.0-old/src/led/main.c linux-atm-2.5.0/src/led/main.c +--- linux-atm-2.5.0-old/src/led/main.c 2008-04-25 03:39:28.000000000 +0300 ++++ linux-atm-2.5.0/src/led/main.c 2008-04-25 03:39:43.000000000 +0300 +@@ -46,6 +46,7 @@ + #include + + #include ++#include + + /* Local incs */ + #include "join.h" diff --git a/network/connection/files/linux-atm-2.5.0-disable-ilmidiag.patch b/network/connection/files/linux-atm-2.5.0-disable-ilmidiag.patch new file mode 100644 index 0000000000..c420be9c58 --- /dev/null +++ b/network/connection/files/linux-atm-2.5.0-disable-ilmidiag.patch @@ -0,0 +1,11 @@ +--- linux-atm/src/ilmid/Makefile.am~ 2007-07-11 17:07:57.000000000 +0100 ++++ linux-atm/src/ilmid/Makefile.am 2007-08-23 09:22:45.000000000 +0100 +@@ -2,7 +2,7 @@ SUBDIRS = asn1 + + INCLUDES = -I$(srcdir)/../ilmid/asn1 + +-sbin_PROGRAMS = ilmid ilmidiag ++sbin_PROGRAMS = ilmid + + ilmid_SOURCES = rfc1157_snmp.c rfc1157_snmp.h rfc1155_smi.c rfc1155_smi.h \ + util.c util.h io.c io.h message.c message.h \ diff --git a/network/connection/files/linux-atm-2.5.0-open-macro.patch b/network/connection/files/linux-atm-2.5.0-open-macro.patch new file mode 100644 index 0000000000..928222fa28 --- /dev/null +++ b/network/connection/files/linux-atm-2.5.0-open-macro.patch @@ -0,0 +1,11 @@ +--- linux-atm/src/maint/atmtcp.c~ 2007-08-22 14:59:21.000000000 +0100 ++++ linux-atm/src/maint/atmtcp.c 2007-08-22 18:27:24.000000000 +0100 +@@ -109,7 +109,7 @@ static void control(int in_link,struct a + switch (msg->type) { + case ATMTCP_CTRL_OPEN: + if (out->ops->open) +- changed += out->ops->open(out,in_link,msg); ++ changed += (out->ops->open)(out,in_link,msg); + break; + case ATMTCP_CTRL_CLOSE: + if (out->ops->close) diff --git a/network/connection/files/man-pages.patch b/network/connection/files/man-pages.patch new file mode 100644 index 0000000000..c504cfe87d --- /dev/null +++ b/network/connection/files/man-pages.patch @@ -0,0 +1,45 @@ +diff -up linux-atm-2.5.1/src/led/zeppelin.8.fixman linux-atm-2.5.1/src/led/zeppelin.8 +--- linux-atm-2.5.1/src/led/zeppelin.8.fixman 2003-05-02 19:35:04.000000000 +0200 ++++ linux-atm-2.5.1/src/led/zeppelin.8 2010-10-13 12:58:18.000000000 +0200 +@@ -99,7 +99,7 @@ Ring and ATM parts of the ELAN, so using + recommended. Token Ring support has received less testing than its + Ethernet counterpart. + .SH FILES +-.IP \fI/var/run/lec[interface number].pid\fP ++\fI/var/run/lec[interface number].pid\fP + The file containing the process id of zeppelin. + .SH BUGS + John Bonham died 1980 and Led Zeppelin broke. +diff -up linux-atm-2.5.1/src/mpoad/mpcd.8.fixman linux-atm-2.5.1/src/mpoad/mpcd.8 +--- linux-atm-2.5.1/src/mpoad/mpcd.8.fixman 2001-10-10 00:33:07.000000000 +0200 ++++ linux-atm-2.5.1/src/mpoad/mpcd.8 2010-10-13 12:59:14.000000000 +0200 +@@ -28,7 +28,7 @@ mpcd \- ATM MPOA (Multi\-Protocol Over A + .B ]] + .SH DESCRIPTION + MPOA client +-.SM(MPC) is responsible for creating and receiving ++.SM (MPC) is responsible for creating and receiving + internetwork layer shortcuts. Using these shortcuts MPCs forward + unicast internetwork layer packets effectively over ATM without need + for routing protocols. +@@ -43,7 +43,7 @@ accepts shortcuts and packets arriving o + shortcuts is done with the help of + .SM MPOA + server +-.SM(MPS). ++.SM (MPS). + .PP + Just as the Linux + .SM LAN +diff -up linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman linux-atm-2.5.1/src/sigd/atmsigd.conf.4 +--- linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman 2001-10-10 00:33:07.000000000 +0200 ++++ linux-atm-2.5.1/src/sigd/atmsigd.conf.4 2010-10-13 12:58:49.000000000 +0200 +@@ -125,7 +125,7 @@ a comment. The `#' character cannot be e + .P + If an option is specified in \fBatmsigd.conf\fP and on the command + line, the command line has priority. +-.COMPATIBILITY ++.SH COMPATIBILITY + Certain options used by past versions of \fBatmsigd\fP but no longer documented + on the man page are still recognized and supported, but they also yield a + warning message. Future versions of \fBatmsigd\fP will not recognize those diff --git a/network/connection/files/netdevice.patch b/network/connection/files/netdevice.patch new file mode 100644 index 0000000000..22af6ef27f --- /dev/null +++ b/network/connection/files/netdevice.patch @@ -0,0 +1,33 @@ +diff -Nur linux-atm-2.5.0-old/src/arpd/arp.c linux-atm-2.5.0/src/arpd/arp.c +--- linux-atm-2.5.0-old/src/arpd/arp.c 2008-04-25 03:34:35.000000000 +0300 ++++ linux-atm-2.5.0/src/arpd/arp.c 2008-04-25 03:34:51.000000000 +0300 +@@ -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 -Nur linux-atm-2.5.0-old/src/arpd/io.c linux-atm-2.5.0/src/arpd/io.c +--- linux-atm-2.5.0-old/src/arpd/io.c 2008-04-25 03:34:35.000000000 +0300 ++++ linux-atm-2.5.0/src/arpd/io.c 2008-04-25 03:34:51.000000000 +0300 +@@ -21,7 +21,6 @@ + #include + #include /* for CLIP_DEFAULT_IDLETIMER */ + #include +-#define _LINUX_NETDEVICE_H /* glibc2 */ + #include + #include + +diff -Nur linux-atm-2.5.0-old/src/arpd/itf.c linux-atm-2.5.0/src/arpd/itf.c +--- linux-atm-2.5.0-old/src/arpd/itf.c 2008-04-25 03:34:35.000000000 +0300 ++++ linux-atm-2.5.0/src/arpd/itf.c 2008-04-25 03:34:51.000000000 +0300 +@@ -12,7 +12,6 @@ + #include + #include + #include +-#define _LINUX_NETDEVICE_H /* glibc2 */ + #include + #include + diff --git a/network/connection/files/remove-define-hacks.patch b/network/connection/files/remove-define-hacks.patch new file mode 100644 index 0000000000..cfac43c039 --- /dev/null +++ b/network/connection/files/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/network/connection/files/sandbox.patch b/network/connection/files/sandbox.patch new file mode 100644 index 0000000000..69939638fa --- /dev/null +++ b/network/connection/files/sandbox.patch @@ -0,0 +1,17 @@ +Index: linux-atm-2.5.1/src/config/Makefile.in +=================================================================== +--- linux-atm-2.5.1.orig/src/config/Makefile.in ++++ linux-atm-2.5.1/src/config/Makefile.in +@@ -413,10 +413,10 @@ uninstall-am: uninstall-local uninstall- + + + install-exec-local: +- -cp hosts.atm /etc ++ -cp hosts.atm $(DESTDIR)$(sysconfdir) + + uninstall-local: +- -rm /etc/hosts.atm ++ -rm $(DESTDIR)$(sysconfdir)/hosts.atm + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/network/connection/pspec.xml b/network/connection/pspec.xml new file mode 100644 index 0000000000..f0d70aba0d --- /dev/null +++ b/network/connection/pspec.xml @@ -0,0 +1,91 @@ + + + + + linux-atm + http://linux-atm.sourceforge.net/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + library + Tools to support ATM networking under Liunx + linux-atm contains tools for Asynchronous Transfer Mode. Supports raw ATM connections (PVCs and SVCs), IP over ATM, LAN emulation, MPOA, Arequipa, and some others. + mirrors://sourceforge/project/linux-atm/linux-atm/2.5.2/linux-atm-2.5.2.tar.gz + + flex + + + man-pages.patch + remove-define-hacks.patch + 0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch + + + + + linux-atm + + flex + + + /lib/firmware + /usr/sbin + /usr/bin + /etc + /usr/lib + /usr/share/man + /usr/share/doc + + + + + linux-atm-devel + Development files for linux-atm + + linux-atm + + + /usr/include + + + + + + 2021-07-02 + 2.5.2 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2019-04-23 + 2.5.2 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2017-02-18 + 2.5.2 + Release Bump + Kamil Atlı + suvari@pisilinux.org + + + 2016-06-09 + 2.5.2 + Release Bump + Pisi Linux Community + admin@pisilinux.org + + + 2015-04-13 + 2.5.2 + First release + Ertuğrul Erata + ertugrulerata@gmail.com + + +