From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] linux-atm: update to 2.5.2
Date: Thu, 06 Apr 2017 10:07:46 +0100 [thread overview]
Message-ID: <1491469666.2643.123.camel@ipfire.org> (raw)
In-Reply-To: <20170318101136.20913-1-marcel.lorenz@ipfire.org>
[-- 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 --]
next prev parent reply other threads:[~2017-04-06 9:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-18 10:11 Marcel Lorenz
2017-04-06 9:07 ` Michael Tremer [this message]
2023-02-21 13:21 [PATCH] linux-atm: Update " Stefan Schantl
2023-02-22 9:51 ` Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1491469666.2643.123.camel@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox