Menu
▾
▴
[Ipcop-svn] SF.net SVN: ipcop: [1037] ipcop/trunk
|
From: <ges...@us...> - 2008-01-27 23:31:36
|
Revision: 1037
http://ipcop.svn.sourceforge.net/ipcop/?rev=1037&view=rev
Author: gespinasse
Date: 2008-01-27 15:31:40 -0800 (Sun, 27 Jan 2008)
Log Message:
-----------
Upgrade linux-atm from 2.4.1 to 2.5.0
Same many warnings during compilation
This version provide br2684ctl (and this particular one support routed settings)
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/linux-atm
ipcop/trunk/lfs/linux-atm
Added Paths:
-----------
ipcop/trunk/src/patches/linux-atm-2.5.0-headers.patch
Removed Paths:
-------------
ipcop/trunk/src/patches/linux-atm-2.4.1-gcc-4.patch
Modified: ipcop/trunk/config/rootfiles/common/linux-atm
===================================================================
--- ipcop/trunk/config/rootfiles/common/linux-atm 2008-01-27 23:25:33 UTC (rev 1036)
+++ ipcop/trunk/config/rootfiles/common/linux-atm 2008-01-27 23:31:40 UTC (rev 1037)
@@ -1,13 +1,16 @@
-## linux-atm-2.4.1
-##
+# linux-atm-2.5.0
+#
#etc/atmsigd.conf
#etc/hosts.atm
-usr/bin/aread
-usr/bin/atmdiag
+#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
@@ -22,13 +25,16 @@
#usr/sbin/atmaddr
usr/sbin/atmarp
usr/sbin/atmarpd
-usr/sbin/atmloop
+#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
@@ -45,8 +51,10 @@
#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
Modified: ipcop/trunk/lfs/linux-atm
===================================================================
--- ipcop/trunk/lfs/linux-atm 2008-01-27 23:25:33 UTC (rev 1036)
+++ ipcop/trunk/lfs/linux-atm 2008-01-27 23:31:40 UTC (rev 1037)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = linux-atm
-VER = 2.4.1
+VER = 2.5.0
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 84fef49cc39ff2605204246666f65864
+$(DL_FILE)_MD5 = 0b45a0e801fac7093ce4b0cadf419965
install : $(TARGET)
@@ -83,7 +83,7 @@
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/linux-atm-2.4.1-gcc-4.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/linux-atm-2.5.0-headers.patch
cd $(DIR_APP) && ./configure --prefix=/usr \
--sysconfdir=/etc
cd $(DIR_APP) && make -j $(PARALLELISM)
Deleted: ipcop/trunk/src/patches/linux-atm-2.4.1-gcc-4.patch
===================================================================
--- ipcop/trunk/src/patches/linux-atm-2.4.1-gcc-4.patch 2008-01-27 23:25:33 UTC (rev 1036)
+++ ipcop/trunk/src/patches/linux-atm-2.4.1-gcc-4.patch 2008-01-27 23:31:40 UTC (rev 1037)
@@ -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
-
Added: ipcop/trunk/src/patches/linux-atm-2.5.0-headers.patch
===================================================================
--- ipcop/trunk/src/patches/linux-atm-2.5.0-headers.patch (rev 0)
+++ ipcop/trunk/src/patches/linux-atm-2.5.0-headers.patch 2008-01-27 23:31:40 UTC (rev 1037)
@@ -0,0 +1,214 @@
+--- linux-atm/src/maint/hediag.c.orig
++++ linux-atm/src/maint/hediag.c
+@@ -1,4 +1,6 @@
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+--- linux-atm/src/arpd/io.c
++++ linux-atm/src/arpd/io.c
+@@ -16,7 +16,7 @@
+ #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 */
+--- linux-atm/src/debug/svctor.c
++++ linux-atm/src/debug/svctor.c
+@@ -20,6 +20,7 @@
+ #define QOS "ubr,aal5:tx:max_sdu=100,rx:max_sdu=100"
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <signal.h>
+--- linux-atm/src/ilmid/asn1/asn_bits.c
++++ linux-atm/src/ilmid/asn1/asn_bits.c
+@@ -20,6 +20,8 @@
+ #if HAVE_CONFIG_H
+ #include <config.h>
+ #endif
++#include <stdlib.h>
++#include <string.h>
+
+ #include "asn_config.h"
+ #include "asn_len.h"
+--- linux-atm/src/ilmid/asn1/asn_list.c
++++ linux-atm/src/ilmid/asn1/asn_list.c
+@@ -20,6 +20,7 @@
+ #include <config.h>
+ #endif
+
++#include <stdlib.h>
+ #include "asn_config.h"
+ #include "asn_list.h"
+
+--- linux-atm/src/ilmid/asn1/asn_octs.c
++++ linux-atm/src/ilmid/asn1/asn_octs.c
+@@ -20,6 +20,8 @@
+ #if HAVE_CONFIG_H
+ #include <config.h>
+ #endif
++#include <stdlib.h>
++#include <string.h>
+
+ #include "asn_config.h"
+ #include "asn_len.h"
+--- linux-atm/src/ilmid/asn1/asn_oid.c
++++ linux-atm/src/ilmid/asn1/asn_oid.c
+@@ -20,6 +20,8 @@
+ #if HAVE_CONFIG_H
+ #include <config.h>
+ #endif
++#include <stdlib.h>
++#include <string.h>
+
+ #include "asn_config.h"
+ #include "asn_len.h"
+--- linux-atm/src/ilmid/asn1/nibble_alloc.c
++++ linux-atm/src/ilmid/asn1/nibble_alloc.c
+@@ -20,6 +20,7 @@
+ #include <config.h>
+ #endif
+
++#include <stdlib.h>
+ #include <memory.h>
+ #include "asn_config.h"
+ #include "nibble_alloc.h"
+--- linux-atm/src/ilmid/atmf_uni.c
++++ linux-atm/src/ilmid/atmf_uni.c
+@@ -25,6 +25,7 @@
+ #include <config.h>
+ #endif
+
++#include <stdlib.h>
+ #include "atmf_uni.h"
+ #include "atmd.h"
+ #include "util.h"
+--- linux-atm/src/ilmid/mib.c
++++ linux-atm/src/ilmid/mib.c
+@@ -30,6 +30,7 @@
+ #include "atmf_uni.h"
+ #include "util.h"
+ #include "atmd.h"
++#include "io.h"
+
+ #include <unistd.h> /* gethostname() */
+ #include <netdb.h> /* gethostbyname() */
+--- linux-atm/src/lane/lecs_db.l
++++ linux-atm/src/lane/lecs_db.l
+@@ -7,6 +7,7 @@
+ /*Standard includes*/
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ /* Local includes */
+ #include "lecs_load.h"
+--- linux-atm/src/lane/load_lex.l
++++ linux-atm/src/lane/load_lex.l
+@@ -4,6 +4,7 @@
+ #include <config.h>
+ #endif
+
++#include <string.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+
+--- linux-atm/src/lane/mem_lecs.c
++++ linux-atm/src/lane/mem_lecs.c
+@@ -13,6 +13,7 @@
+ /* System includes */
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <sys/types.h>
+
+ /* Local includes */
+--- linux-atm/src/mpoad/k_interf.c
++++ linux-atm/src/mpoad/k_interf.c
+@@ -3,6 +3,7 @@
+ #endif
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <errno.h>
+--- linux-atm/src/qgen/ql_y.y
++++ linux-atm/src/qgen/ql_y.y
+@@ -26,6 +26,8 @@
+ static STRUCTURE *structures = NULL;
+ static const char *abort_id; /* indicates abort flag */
+
++void yyerror(const char *s);
++int yylex ( void );
+
+ static NAME_LIST *get_name_list(const char *name)
+ {
+--- linux-atm/src/sigd/cfg_y.y
++++ linux-atm/src/sigd/cfg_y.y
+@@ -7,6 +7,7 @@
+ #include <config.h>
+ #endif
+
++#include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
+ #include <limits.h>
+@@ -23,6 +24,9 @@
+ static RULE *rule;
+ static SIG_ENTITY *curr_sig = &_entity;
+
++void yyerror(const char *s);
++void yywarn(const char *s);
++int yylex ( void );
+
+ static int hex2num(char digit)
+ {
+@@ -126,7 +130,7 @@
+ for (sig = entities; sig; sig = sig->next)
+ if (atm_equal((struct sockaddr *) &sig->signaling_pvc,
+ (struct sockaddr *) &$2,0,0))
+- yyerror("duplicate PVC address %d.%d.%d",S_PVC(sig));
++ yyerror("duplicate PVC address");
+ curr_sig = alloc_t(SIG_ENTITY);
+ *curr_sig = _entity;
+ curr_sig->signaling_pvc = $2;
+--- linux-atm/src/switch/cfg_y.y
++++ linux-atm/src/switch/cfg_y.y
+@@ -7,6 +7,7 @@
+ #include <config.h>
+ #endif
+
++#include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+ #include <limits.h>
+@@ -22,6 +23,9 @@
+ static int itf;
+ static SIGNALING_ENTITY *sig;
+
++void yyerror(const char *s);
++int yylex ( void );
++
+ %}
+
+ %union {
+--- linux-atm/src/test/ispl_y.y
++++ linux-atm/src/test/ispl_y.y
+@@ -19,6 +19,7 @@
+
+ static struct atmsvc_msg msg;
+
++int yylex ( void );
+
+ %}
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
