diff options
Diffstat (limited to 'net-dialup')
| -rw-r--r-- | net-dialup/linux-atm/ChangeLog | 7 | ||||
| -rw-r--r-- | net-dialup/linux-atm/Manifest | 12 | ||||
| -rw-r--r-- | net-dialup/linux-atm/files/2.4.1-gcc4.patch | 105 | ||||
| -rw-r--r-- | net-dialup/linux-atm/files/2.4.1-stdlib.patch | 42 | ||||
| -rw-r--r-- | net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild | 19 |
5 files changed, 176 insertions, 9 deletions
diff --git a/net-dialup/linux-atm/ChangeLog b/net-dialup/linux-atm/ChangeLog index 6718cd875f4e..00221a621586 100644 --- a/net-dialup/linux-atm/ChangeLog +++ b/net-dialup/linux-atm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-dialup/linux-atm # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/linux-atm/ChangeLog,v 1.14 2005/06/18 21:32:20 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/linux-atm/ChangeLog,v 1.15 2005/07/21 19:51:37 mrness Exp $ + + 21 Jul 2005; Alin Nastac <mrness@gentoo.org> +files/2.4.1-gcc4.patch, + +files/2.4.1-stdlib.patch, linux-atm-2.4.1-r1.ebuild: + Fix compilation problems on gcc-4, thanks to Kerin Millar + <kerframil@gmail.com> (#99753). 18 Jun 2005; Jason Wever <weeve@gentoo.org> linux-atm-2.4.1-r1.ebuild: Stable on SPARC. diff --git a/net-dialup/linux-atm/Manifest b/net-dialup/linux-atm/Manifest index 6073ef60858a..8587f89c2aef 100644 --- a/net-dialup/linux-atm/Manifest +++ b/net-dialup/linux-atm/Manifest @@ -1,8 +1,10 @@ -MD5 f592178a43bcce50870d912cfd84a746 ChangeLog 1594 -MD5 c3e1c808b2afe90339d280490cfba6c6 linux-atm-2.4.1.ebuild 857 +MD5 e624be9ac678d7503517c7f20234d6f5 linux-atm-2.4.1-r1.ebuild 1400 +MD5 86e7b32fe170fb984c3ca6a9b80da9a7 ChangeLog 1855 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163 -MD5 0e1e8bc5bee49d24aa78e2f8f0a1a0a9 linux-atm-2.4.1-r1.ebuild 995 -MD5 6a54ce48b2a9cb74b5b968847fe7a1ea files/digest-linux-atm-2.4.1 67 +MD5 c3e1c808b2afe90339d280490cfba6c6 linux-atm-2.4.1.ebuild 857 MD5 377f9a635f2f11c0d0e8b5c6b83d14d7 files/2.4.1-gcc34.patch 1175 -MD5 2513dd16d6943f14795364d0d71aab50 files/2.4.1-uclibc.patch 497 +MD5 6a54ce48b2a9cb74b5b968847fe7a1ea files/digest-linux-atm-2.4.1 67 +MD5 d7dd6d910e147168b4d1204e618f5a79 files/2.4.1-stdlib.patch 1216 MD5 6a54ce48b2a9cb74b5b968847fe7a1ea files/digest-linux-atm-2.4.1-r1 67 +MD5 2513dd16d6943f14795364d0d71aab50 files/2.4.1-uclibc.patch 497 +MD5 30ac2602fbe634b8719307df79b1f4cb files/2.4.1-gcc4.patch 3394 diff --git a/net-dialup/linux-atm/files/2.4.1-gcc4.patch b/net-dialup/linux-atm/files/2.4.1-gcc4.patch new file mode 100644 index 000000000000..3da42b023ab4 --- /dev/null +++ b/net-dialup/linux-atm/files/2.4.1-gcc4.patch @@ -0,0 +1,105 @@ +--- linux-atm/src/ilmid/atmf_uni.c~ 2005-01-18 14:35:53.000000000 +0000 ++++ linux-atm/src/ilmid/atmf_uni.c 2005-03-02 15:29:37.000000000 +0000 +@@ -228,7 +228,7 @@ AsnInt setNetPrefix(VarBind *varbind, Va + 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; +@@ -238,7 +238,7 @@ AsnInt setNetPrefix(VarBind *varbind, Va + } + 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; +--- linux-atm/src/maint/atmtcp.c~ 2001-10-09 23:33:07.000000000 +0100 ++++ linux-atm/src/maint/atmtcp.c 2005-03-02 14:48:12.000000000 +0000 +@@ -60,7 +60,7 @@ static OUT *outputs = NULL; + static IN *inputs = NULL; + static fd_set in_set; + static int fds = 0; +-static int debug = 0; ++int debug = 0; + static int links = 0; + + +--- linux-atm/src/mpoad/p_factory.c~ 2001-10-09 23:33:07.000000000 +0100 ++++ linux-atm/src/mpoad/p_factory.c 2005-03-02 15:33:06.000000000 +0000 +@@ -31,16 +31,17 @@ unsigned short compute_ip_csum(unsigned + * 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) +--- linux-atm/src/qgen/qlib.c~ 2001-10-09 23:33:07.000000000 +0100 ++++ linux-atm/src/qgen/qlib.c 2005-03-02 14:42:45.000000000 +0000 +@@ -26,8 +26,6 @@ int q_dump = 0; + #include "op.h" + + +-static int debug = 0; +- + + void PREFIX(report)(int severity,const char *msg,...) + { +@@ -830,6 +828,8 @@ int PREFIX(close)(Q_DSC *dsc) + + #ifdef STANDALONE + ++int debug = 0; ++ + int main(int argc,const char **argv) + { + unsigned char msg[5000]; /* should be large enough for that */ +--- linux-atm/src/qgen/qlib.h~ 2001-10-09 23:33:07.000000000 +0100 ++++ linux-atm/src/qgen/qlib.h 2005-03-02 14:40:47.000000000 +0000 +@@ -23,7 +23,6 @@ + #define Q_FATAL -1 + + +-extern int q_dump; + extern void q_report(int severity,const char *msg,...); + + #ifdef DUMP_MODE +--- linux-atm/src/switch/debug/debug.c~ 2001-10-09 23:33:08.000000000 +0100 ++++ linux-atm/src/switch/debug/debug.c 2005-03-02 15:34:19.000000000 +0000 +@@ -18,7 +18,7 @@ + #define COMPONENT "FAB(debug)" + + +-#define PRV(call) ((FAB *) (call)->fab) ++#define PRV(call) (*((FAB **) &(call)->fab)) + + + typedef struct _fab { +--- linux-atm/src/switch/tcp/tcpsw.c~ 2001-10-09 23:33:08.000000000 +0100 ++++ linux-atm/src/switch/tcp/tcpsw.c 2005-03-02 15:34:55.000000000 +0000 +@@ -27,7 +27,7 @@ + + #define COMPONENT "FAB(tcp)" + +-#define PRV(call) ((FAB *) (call)->fab) ++#define PRV(call) (*((FAB **) &(call)->fab)) + + #define MAX_VCI 1024 + diff --git a/net-dialup/linux-atm/files/2.4.1-stdlib.patch b/net-dialup/linux-atm/files/2.4.1-stdlib.patch new file mode 100644 index 000000000000..64685a77cb88 --- /dev/null +++ b/net-dialup/linux-atm/files/2.4.1-stdlib.patch @@ -0,0 +1,42 @@ +--- linux-atm/src/sigd/cfg_y.y.orig 2005-01-18 17:24:39.000000000 +0000 ++++ linux-atm/src/sigd/cfg_y.y 2005-01-18 17:24:49.000000000 +0000 +@@ -7,6 +7,7 @@ + #include <config.h> + #endif + ++#include <stdlib.h> + #include <string.h> + #include <ctype.h> + #include <limits.h> +--- linux-atm/src/switch/cfg_y.y.orig 2005-01-18 17:59:05.000000000 +0000 ++++ linux-atm/src/switch/cfg_y.y 2005-01-18 17:59:15.000000000 +0000 +@@ -7,6 +7,7 @@ + #include <config.h> + #endif + ++#include <stdlib.h> + #include <string.h> + #include <errno.h> + #include <limits.h> +--- linux-atm/src/test/ttcp.c.orig 2005-01-18 18:00:04.000000000 +0000 ++++ linux-atm/src/test/ttcp.c 2005-01-18 18:03:00.000000000 +0000 +@@ -54,7 +54,11 @@ static char RCSid[] = "ttcp.c $Revision: + /* #define BSD41a */ + /* #define SYSV */ /* required on SGI IRIX releases before 3.3 */ + ++#include <stdlib.h> ++#include <unistd.h> ++#include <string.h> + #include <stdio.h> ++#include <sys/select.h> + #include <signal.h> + #include <ctype.h> + #include <errno.h> +@@ -120,7 +124,6 @@ static struct timeval stop_time; /* Time + static struct rusage ru0; /* Resource utilization at the start */ + + struct hostent *addr; +-extern int errno; + extern int optind; + extern char *optarg; + diff --git a/net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild b/net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild index a2e59a45c36e..8317f7cf0ac5 100644 --- a/net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild +++ b/net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild,v 1.7 2005/06/18 21:32:20 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild,v 1.8 2005/07/21 19:51:37 mrness Exp $ inherit eutils @@ -18,13 +18,26 @@ DEPEND="virtual/libc" src_unpack() { unpack ${A} + cd ${S} - epatch ${FILESDIR}/${PV}-gcc34.patch ${FILESDIR}/${PV}-uclibc.patch + + # Fix labels at end of compound statement errors + epatch ${FILESDIR}/${PV}-gcc34.patch + + # Fedora patch to fix gcc-4 compilation issues + # In particular, this corrects "invalid lvalue in assignment" errors + epatch ${FILESDIR}/${PV}-gcc4.patch + + # Fedora patch: include stdlib.h for strtol prototype in sigd/cfg_y.y + epatch ${FILESDIR}/${PV}-stdlib.patch + + # Fixed broken compilation on uclibc env (bug #61184) + epatch ${FILESDIR}/${PV}-uclibc.patch } src_compile() { econf || die "configure failed" - sed -i 's:hosts.atm :hosts.atm ${D}:' src/config/Makefile || die "fail seding the Makefile" + sed -i 's:cp hosts.atm /etc:cp hosts.atm ${D}/etc:' src/config/Makefile || die "sed operation on Makefile failed" emake || die "make failed" } |