From b5cb1795de1f0959de1e228bd2e784d1cea921a7 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 4 Jun 2007 11:25:53 +0000 Subject: refresh all package patches in the buildroot using quilt git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7490 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/linux-atm/patches/000-debian_16.patch | 564 ++++++++++++++------- package/linux-atm/patches/100-subdirs.patch | 23 +- package/linux-atm/patches/200-no_libfl.patch | 139 ++--- package/linux-atm/patches/300-no_autotools.patch | 92 ++-- .../patches/400-stdint_local_instead_of_host.patch | 7 +- 5 files changed, 519 insertions(+), 306 deletions(-) (limited to 'package/linux-atm') diff --git a/package/linux-atm/patches/000-debian_16.patch b/package/linux-atm/patches/000-debian_16.patch index da82cc832..de6434dc6 100644 --- a/package/linux-atm/patches/000-debian_16.patch +++ b/package/linux-atm/patches/000-debian_16.patch @@ -1,5 +1,7 @@ ---- linux-atm-2.4.1.orig/Makefile.in -+++ linux-atm-2.4.1/Makefile.in +Index: linux-atm-2.4.1/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/Makefile.in 2007-06-04 13:23:53.886541896 +0200 ++++ linux-atm-2.4.1/Makefile.in 2007-06-04 13:23:54.459454800 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -45,8 +47,10 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ ---- linux-atm-2.4.1.orig/aclocal.m4 -+++ linux-atm-2.4.1/aclocal.m4 +Index: linux-atm-2.4.1/aclocal.m4 +=================================================================== +--- linux-atm-2.4.1.orig/aclocal.m4 2007-06-04 13:23:53.891541136 +0200 ++++ linux-atm-2.4.1/aclocal.m4 2007-06-04 13:23:54.462454344 +0200 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p5 +dnl aclocal.m4 generated automatically by aclocal 1.4-p6 @@ -1498,8 +1502,10 @@ +AC_MSG_RESULT([$SED]) +]) + ---- linux-atm-2.4.1.orig/config.guess -+++ linux-atm-2.4.1/config.guess +Index: linux-atm-2.4.1/config.guess +=================================================================== +--- linux-atm-2.4.1.orig/config.guess 2007-06-04 13:23:53.896540376 +0200 ++++ linux-atm-2.4.1/config.guess 2007-06-04 13:23:54.463454192 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. @@ -2587,16 +2593,20 @@ # Apollos put the system type in the environment. ---- linux-atm-2.4.1.orig/config.h.in -+++ linux-atm-2.4.1/config.h.in +Index: linux-atm-2.4.1/config.h.in +=================================================================== +--- linux-atm-2.4.1.orig/config.h.in 2007-06-04 13:23:53.902539464 +0200 ++++ linux-atm-2.4.1/config.h.in 2007-06-04 13:23:54.463454192 +0200 @@ -1,4 +1,4 @@ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ #ifndef _ATM_CONFIG_H #define _ATM_CONFIG_H ---- linux-atm-2.4.1.orig/config.sub -+++ linux-atm-2.4.1/config.sub +Index: linux-atm-2.4.1/config.sub +=================================================================== +--- linux-atm-2.4.1.orig/config.sub 2007-06-04 13:23:53.907538704 +0200 ++++ linux-atm-2.4.1/config.sub 2007-06-04 13:23:54.464454040 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. @@ -3245,8 +3255,10 @@ esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; ---- linux-atm-2.4.1.orig/configure -+++ linux-atm-2.4.1/configure +Index: linux-atm-2.4.1/configure +=================================================================== +--- linux-atm-2.4.1.orig/configure 2007-06-04 13:23:53.913537792 +0200 ++++ linux-atm-2.4.1/configure 2007-06-04 13:23:54.473452672 +0200 @@ -1,24 +1,244 @@ #! /bin/sh - @@ -13003,8 +13015,10 @@ +fi ---- linux-atm-2.4.1.orig/ltmain.sh -+++ linux-atm-2.4.1/ltmain.sh +Index: linux-atm-2.4.1/ltmain.sh +=================================================================== +--- linux-atm-2.4.1.orig/ltmain.sh 2007-06-04 13:23:53.918537032 +0200 ++++ linux-atm-2.4.1/ltmain.sh 2007-06-04 13:23:54.479451760 +0200 @@ -49,14 +49,14 @@ fi @@ -14332,8 +14346,10 @@ # We need to display help for each of the modes. case $mode in "") $echo \ ---- linux-atm-2.4.1.orig/m4/Makefile.in -+++ linux-atm-2.4.1/m4/Makefile.in +Index: linux-atm-2.4.1/m4/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/m4/Makefile.in 2007-06-04 13:23:53.924536120 +0200 ++++ linux-atm-2.4.1/m4/Makefile.in 2007-06-04 13:23:54.480451608 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -14370,8 +14386,10 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ ---- linux-atm-2.4.1.orig/src/Makefile.in -+++ linux-atm-2.4.1/src/Makefile.in +Index: linux-atm-2.4.1/src/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/Makefile.in 2007-06-04 13:23:53.930535208 +0200 ++++ linux-atm-2.4.1/src/Makefile.in 2007-06-04 13:23:54.480451608 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -14427,8 +14445,10 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ ---- linux-atm-2.4.1.orig/src/include/Makefile.in -+++ linux-atm-2.4.1/src/include/Makefile.in +Index: linux-atm-2.4.1/src/include/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/include/Makefile.in 2007-06-04 13:23:53.936534296 +0200 ++++ linux-atm-2.4.1/src/include/Makefile.in 2007-06-04 13:23:54.481451456 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -14474,8 +14494,10 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ ---- linux-atm-2.4.1.orig/src/include/atmd.h -+++ linux-atm-2.4.1/src/include/atmd.h +Index: linux-atm-2.4.1/src/include/atmd.h +=================================================================== +--- linux-atm-2.4.1.orig/src/include/atmd.h 2007-06-04 13:23:53.942533384 +0200 ++++ linux-atm-2.4.1/src/include/atmd.h 2007-06-04 13:23:54.481451456 +0200 @@ -24,6 +24,10 @@ (i)->prev = (b)->prev; if ((b)->prev) (b)->prev->next = i; else r = i; \ (b)->prev = i; } else { (i)->next = r; (i)->prev = NULL; \ @@ -14487,8 +14509,10 @@ #define Q_REMOVE(r,i) ({ if ((i)->next) (i)->next->prev = (i)->prev; \ if ((i)->prev) (i)->prev->next = (i)->next; else r = (i)->next; }) ---- linux-atm-2.4.1.orig/src/lib/Makefile.in -+++ linux-atm-2.4.1/src/lib/Makefile.in +Index: linux-atm-2.4.1/src/lib/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/lib/Makefile.in 2007-06-04 13:23:53.948532472 +0200 ++++ linux-atm-2.4.1/src/lib/Makefile.in 2007-06-04 13:23:54.481451456 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -14716,8 +14740,10 @@ #libatm_la_SOURCES = text2atm.c atm2text.c atmequal.c sdu2cell.c text2qos.c \ ---- linux-atm-2.4.1.orig/src/lib/sapequal.c -+++ linux-atm-2.4.1/src/lib/sapequal.c +Index: linux-atm-2.4.1/src/lib/sapequal.c +=================================================================== +--- linux-atm-2.4.1.orig/src/lib/sapequal.c 2007-06-04 13:23:53.954531560 +0200 ++++ linux-atm-2.4.1/src/lib/sapequal.c 2007-06-04 13:23:54.482451304 +0200 @@ -65,6 +65,7 @@ CHECK(l2.itu.window,a.l2.itu.window > b.l2.itu.window); break; @@ -14734,8 +14760,10 @@ } return 1; } ---- linux-atm-2.4.1.orig/src/test/Makefile.in -+++ linux-atm-2.4.1/src/test/Makefile.in +Index: linux-atm-2.4.1/src/test/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/test/Makefile.in 2007-06-04 13:23:53.959530800 +0200 ++++ linux-atm-2.4.1/src/test/Makefile.in 2007-06-04 13:23:54.482451304 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -14939,8 +14967,10 @@ # 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. ---- linux-atm-2.4.1.orig/src/test/Makefile.am -+++ linux-atm-2.4.1/src/test/Makefile.am +Index: linux-atm-2.4.1/src/test/Makefile.am +=================================================================== +--- linux-atm-2.4.1.orig/src/test/Makefile.am 2007-06-04 13:23:53.965529888 +0200 ++++ linux-atm-2.4.1/src/test/Makefile.am 2007-06-04 13:23:54.483451152 +0200 @@ -26,6 +26,7 @@ isp.o: errnos.inc @@ -14952,8 +14982,10 @@ + | @PERL@ ./mkerrnos.pl | grep -v EMAXERRNO >errnos.inc \ + || { rm -f errnos.inc; exit 1; } + ---- linux-atm-2.4.1.orig/src/test/ttcp.c -+++ linux-atm-2.4.1/src/test/ttcp.c +Index: linux-atm-2.4.1/src/test/ttcp.c +=================================================================== +--- linux-atm-2.4.1.orig/src/test/ttcp.c 2007-06-04 13:23:53.971528976 +0200 ++++ linux-atm-2.4.1/src/test/ttcp.c 2007-06-04 13:23:54.483451152 +0200 @@ -55,6 +55,8 @@ /* #define SYSV */ /* required on SGI IRIX releases before 3.3 */ @@ -15413,8 +15445,10 @@ numCalls++; if(nread < 0) { perror("ttcp_mread"); ---- linux-atm-2.4.1.orig/src/debug/Makefile.in -+++ linux-atm-2.4.1/src/debug/Makefile.in +Index: linux-atm-2.4.1/src/debug/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/debug/Makefile.in 2007-06-04 13:23:53.977528064 +0200 ++++ linux-atm-2.4.1/src/debug/Makefile.in 2007-06-04 13:23:54.484451000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -15583,8 +15617,10 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. ---- linux-atm-2.4.1.orig/src/qgen/Makefile.in -+++ linux-atm-2.4.1/src/qgen/Makefile.in +Index: linux-atm-2.4.1/src/qgen/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/qgen/Makefile.in 2007-06-04 13:23:53.983527152 +0200 ++++ linux-atm-2.4.1/src/qgen/Makefile.in 2007-06-04 13:23:54.484451000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -15793,8 +15829,10 @@ default.nl: mknl.pl $(SYMFILES) ---- linux-atm-2.4.1.orig/src/qgen/ql_l.c -+++ linux-atm-2.4.1/src/qgen/ql_l.c +Index: linux-atm-2.4.1/src/qgen/ql_l.c +=================================================================== +--- linux-atm-2.4.1.orig/src/qgen/ql_l.c 2007-06-04 13:23:53.988526392 +0200 ++++ linux-atm-2.4.1/src/qgen/ql_l.c 2007-06-04 13:23:54.486450696 +0200 @@ -1,32 +1,85 @@ -/* A lexical scanner generated by flex */ @@ -17889,8 +17927,10 @@ exit(1); } + ---- linux-atm-2.4.1.orig/src/qgen/ql_y.c -+++ linux-atm-2.4.1/src/qgen/ql_y.c +Index: linux-atm-2.4.1/src/qgen/ql_y.c +=================================================================== +--- linux-atm-2.4.1.orig/src/qgen/ql_y.c 2007-06-04 13:23:53.994525480 +0200 ++++ linux-atm-2.4.1/src/qgen/ql_y.c 2007-06-04 13:23:54.488450392 +0200 @@ -1,21 +1,87 @@ +/* A Bison parser, made by GNU Bison 1.875d. */ @@ -20489,8 +20529,10 @@ + + + ---- linux-atm-2.4.1.orig/src/qgen/ql_y.y -+++ linux-atm-2.4.1/src/qgen/ql_y.y +Index: linux-atm-2.4.1/src/qgen/ql_y.y +=================================================================== +--- linux-atm-2.4.1.orig/src/qgen/ql_y.y 2007-06-04 13:23:53.999524720 +0200 ++++ linux-atm-2.4.1/src/qgen/ql_y.y 2007-06-04 13:23:54.488450392 +0200 @@ -17,6 +17,8 @@ #include "qgen.h" #include "file.h" @@ -20525,8 +20567,10 @@ $$->value = $5; $$->structure = NULL; $$->next = NULL; ---- linux-atm-2.4.1.orig/src/qgen/ql_l.l -+++ linux-atm-2.4.1/src/qgen/ql_l.l +Index: linux-atm-2.4.1/src/qgen/ql_l.l +=================================================================== +--- linux-atm-2.4.1.orig/src/qgen/ql_l.l 2007-06-04 13:23:54.005523808 +0200 ++++ linux-atm-2.4.1/src/qgen/ql_l.l 2007-06-04 13:23:54.489450240 +0200 @@ -68,7 +68,7 @@ %% @@ -20536,8 +20580,10 @@ { fprintf(stderr,"line %d: %s near \"%s\"\n",lineno,s,yytext); exit(1); ---- linux-atm-2.4.1.orig/src/qgen/qlib.c -+++ linux-atm-2.4.1/src/qgen/qlib.c +Index: linux-atm-2.4.1/src/qgen/qlib.c +=================================================================== +--- linux-atm-2.4.1.orig/src/qgen/qlib.c 2007-06-04 13:23:54.010523048 +0200 ++++ linux-atm-2.4.1/src/qgen/qlib.c 2007-06-04 13:23:54.489450240 +0200 @@ -26,14 +26,14 @@ #include "op.h" @@ -20564,8 +20610,10 @@ len = 0; while (scanf("%x",&c) == 1) msg[len++] = c; qd_start(); ---- linux-atm-2.4.1.orig/src/qgen/qlib.h -+++ linux-atm-2.4.1/src/qgen/qlib.h +Index: linux-atm-2.4.1/src/qgen/qlib.h +=================================================================== +--- linux-atm-2.4.1.orig/src/qgen/qlib.h 2007-06-04 13:23:54.016522136 +0200 ++++ linux-atm-2.4.1/src/qgen/qlib.h 2007-06-04 13:23:54.489450240 +0200 @@ -23,7 +23,9 @@ #define Q_FATAL -1 @@ -20576,8 +20624,10 @@ extern void q_report(int severity,const char *msg,...); #ifdef DUMP_MODE ---- linux-atm-2.4.1.orig/src/qgen/ql_y.h -+++ linux-atm-2.4.1/src/qgen/ql_y.h +Index: linux-atm-2.4.1/src/qgen/ql_y.h +=================================================================== +--- linux-atm-2.4.1.orig/src/qgen/ql_y.h 2007-06-04 13:23:54.021521376 +0200 ++++ linux-atm-2.4.1/src/qgen/ql_y.h 2007-06-04 13:23:54.490450088 +0200 @@ -1,4 +1,65 @@ -typedef union { +/* A Bison parser, made by GNU Bison 1.875d. */ @@ -20672,8 +20722,10 @@ + + + ---- linux-atm-2.4.1.orig/src/qgen/incl.pl -+++ linux-atm-2.4.1/src/qgen/incl.pl +Index: linux-atm-2.4.1/src/qgen/incl.pl +=================================================================== +--- linux-atm-2.4.1.orig/src/qgen/incl.pl 2007-06-04 13:23:54.027520464 +0200 ++++ linux-atm-2.4.1/src/qgen/incl.pl 2007-06-04 13:23:54.490450088 +0200 @@ -24,7 +24,7 @@ } die "no include file specified" unless defined $last; @@ -20683,8 +20735,10 @@ print $_."/".$last."\n" || die "print STDOUT: $!"; exit 0; } ---- linux-atm-2.4.1.orig/src/qgen/msg.fmt -+++ linux-atm-2.4.1/src/qgen/msg.fmt +Index: linux-atm-2.4.1/src/qgen/msg.fmt +=================================================================== +--- linux-atm-2.4.1.orig/src/qgen/msg.fmt 2007-06-04 13:23:54.034519400 +0200 ++++ linux-atm-2.4.1/src/qgen/msg.fmt 2007-06-04 13:23:54.490450088 +0200 @@ -53,7 +53,7 @@ ATM_TD_FW_PCR_0 { p##fw_pcr_0 <24> } \ ATM_TD_BW_PCR_0 { p##bw_pcr_0 <24> } \ @@ -20713,8 +20767,10 @@ #else #define TRAFFIC_DESCRIPTOR_ABR(p) /* not yet */ ---- linux-atm-2.4.1.orig/src/qgen/output -+++ linux-atm-2.4.1/src/qgen/output +Index: linux-atm-2.4.1/src/qgen/output +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/src/qgen/output 2007-06-04 13:23:54.491449936 +0200 @@ -0,0 +1,704 @@ +# 1 "" +# 1 "" @@ -21420,8 +21476,10 @@ + } + } +} ---- linux-atm-2.4.1.orig/src/saal/Makefile.in -+++ linux-atm-2.4.1/src/saal/Makefile.in +Index: linux-atm-2.4.1/src/saal/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/saal/Makefile.in 2007-06-04 13:23:54.046517576 +0200 ++++ linux-atm-2.4.1/src/saal/Makefile.in 2007-06-04 13:23:54.492449784 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -21610,8 +21668,10 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. ---- linux-atm-2.4.1.orig/src/sigd/Makefile.in -+++ linux-atm-2.4.1/src/sigd/Makefile.in +Index: linux-atm-2.4.1/src/sigd/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/sigd/Makefile.in 2007-06-04 13:23:54.051516816 +0200 ++++ linux-atm-2.4.1/src/sigd/Makefile.in 2007-06-04 13:23:54.492449784 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -21861,8 +21921,10 @@ mess.c: $(top_builddir)/src/qgen/uni.h mkmess.pl ---- linux-atm-2.4.1.orig/src/sigd/cfg_y.c -+++ linux-atm-2.4.1/src/sigd/cfg_y.c +Index: linux-atm-2.4.1/src/sigd/cfg_y.c +=================================================================== +--- linux-atm-2.4.1.orig/src/sigd/cfg_y.c 2007-06-04 13:23:54.057515904 +0200 ++++ linux-atm-2.4.1/src/sigd/cfg_y.c 2007-06-04 13:23:54.494449480 +0200 @@ -1,46 +1,137 @@ +/* A Bison parser, made by GNU Bison 1.875d. */ @@ -24582,8 +24644,10 @@ + + + ---- linux-atm-2.4.1.orig/src/sigd/proto.c -+++ linux-atm-2.4.1/src/sigd/proto.c +Index: linux-atm-2.4.1/src/sigd/proto.c +=================================================================== +--- linux-atm-2.4.1.orig/src/sigd/proto.c 2007-06-04 13:23:54.062515144 +0200 ++++ linux-atm-2.4.1/src/sigd/proto.c 2007-06-04 13:23:54.495449328 +0200 @@ -259,6 +259,7 @@ break; } @@ -24600,8 +24664,10 @@ } va_end(ap); } ---- linux-atm-2.4.1.orig/src/sigd/cfg_y.y -+++ linux-atm-2.4.1/src/sigd/cfg_y.y +Index: linux-atm-2.4.1/src/sigd/cfg_y.y +=================================================================== +--- linux-atm-2.4.1.orig/src/sigd/cfg_y.y 2007-06-04 13:23:54.068514232 +0200 ++++ linux-atm-2.4.1/src/sigd/cfg_y.y 2007-06-04 13:23:54.495449328 +0200 @@ -7,6 +7,7 @@ #include #endif @@ -24647,8 +24713,10 @@ } add_route(curr_sig,&addr,mask ? strtol(mask,NULL,10) : INT_MAX); } ---- linux-atm-2.4.1.orig/src/sigd/cfg_y.h -+++ linux-atm-2.4.1/src/sigd/cfg_y.h +Index: linux-atm-2.4.1/src/sigd/cfg_y.h +=================================================================== +--- linux-atm-2.4.1.orig/src/sigd/cfg_y.h 2007-06-04 13:23:54.074513320 +0200 ++++ linux-atm-2.4.1/src/sigd/cfg_y.h 2007-06-04 13:23:54.496449176 +0200 @@ -1,44 +1,127 @@ -typedef union { +/* A Bison parser, made by GNU Bison 1.875d. */ @@ -24815,8 +24883,10 @@ + + + ---- linux-atm-2.4.1.orig/src/maint/Makefile.in -+++ linux-atm-2.4.1/src/maint/Makefile.in +Index: linux-atm-2.4.1/src/maint/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/maint/Makefile.in 2007-06-04 13:23:54.079512560 +0200 ++++ linux-atm-2.4.1/src/maint/Makefile.in 2007-06-04 13:23:54.496449176 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -25003,8 +25073,10 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. ---- linux-atm-2.4.1.orig/src/maint/atmtcp.c -+++ linux-atm-2.4.1/src/maint/atmtcp.c +Index: linux-atm-2.4.1/src/maint/atmtcp.c +=================================================================== +--- linux-atm-2.4.1.orig/src/maint/atmtcp.c 2007-06-04 13:23:54.085511648 +0200 ++++ linux-atm-2.4.1/src/maint/atmtcp.c 2007-06-04 13:23:54.497449024 +0200 @@ -60,7 +60,7 @@ static IN *inputs = NULL; static fd_set in_set; @@ -25119,8 +25191,10 @@ int *fd2 = alloc_t(int); if ((fd = socket(PF_INET,SOCK_STREAM,0)) < 0) { ---- linux-atm-2.4.1.orig/src/maint/enitune.c -+++ linux-atm-2.4.1/src/maint/enitune.c +Index: linux-atm-2.4.1/src/maint/enitune.c +=================================================================== +--- linux-atm-2.4.1.orig/src/maint/enitune.c 2007-06-04 13:23:54.091510736 +0200 ++++ linux-atm-2.4.1/src/maint/enitune.c 2007-06-04 13:23:54.497449024 +0200 @@ -44,6 +44,7 @@ if (*end || mult.rx <= 100) usage(name); break; @@ -25129,8 +25203,10 @@ } if (argc != optind+1) usage(name); sioc.number = strtol(argv[optind],&end,0); ---- linux-atm-2.4.1.orig/src/arpd/Makefile.in -+++ linux-atm-2.4.1/src/arpd/Makefile.in +Index: linux-atm-2.4.1/src/arpd/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/arpd/Makefile.in 2007-06-04 13:23:54.097509824 +0200 ++++ linux-atm-2.4.1/src/arpd/Makefile.in 2007-06-04 13:23:54.497449024 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -25314,8 +25390,10 @@ install-data-am install-data install-am install uninstall-am uninstall \ all-redirect all-am all installdirs mostlyclean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \ ---- linux-atm-2.4.1.orig/src/arpd/atmarp.c -+++ linux-atm-2.4.1/src/arpd/atmarp.c +Index: linux-atm-2.4.1/src/arpd/atmarp.c +=================================================================== +--- linux-atm-2.4.1.orig/src/arpd/atmarp.c 2007-06-04 13:23:54.103508912 +0200 ++++ linux-atm-2.4.1/src/arpd/atmarp.c 2007-06-04 13:23:54.497449024 +0200 @@ -92,7 +92,7 @@ perror("read " ATMARP_DUMP_DIR "/" ATMARP_DUMP_FILE); return 1; @@ -25325,8 +25403,10 @@ perror("write stdout"); return 1; } ---- linux-atm-2.4.1.orig/src/ilmid/Makefile.in -+++ linux-atm-2.4.1/src/ilmid/Makefile.in +Index: linux-atm-2.4.1/src/ilmid/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/ilmid/Makefile.in 2007-06-04 13:23:54.108508152 +0200 ++++ linux-atm-2.4.1/src/ilmid/Makefile.in 2007-06-04 13:23:54.498448872 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -25564,8 +25644,10 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. ---- linux-atm-2.4.1.orig/src/ilmid/io.c -+++ linux-atm-2.4.1/src/ilmid/io.c +Index: linux-atm-2.4.1/src/ilmid/io.c +=================================================================== +--- linux-atm-2.4.1.orig/src/ilmid/io.c 2007-06-04 13:23:54.114507240 +0200 ++++ linux-atm-2.4.1/src/ilmid/io.c 2007-06-04 13:23:54.498448872 +0200 @@ -32,6 +32,7 @@ #include #include @@ -25580,8 +25662,10 @@ } + return 0; } ---- linux-atm-2.4.1.orig/src/ilmid/atmf_uni.c -+++ linux-atm-2.4.1/src/ilmid/atmf_uni.c +Index: linux-atm-2.4.1/src/ilmid/atmf_uni.c +=================================================================== +--- linux-atm-2.4.1.orig/src/ilmid/atmf_uni.c 2007-06-04 13:23:54.119506480 +0200 ++++ linux-atm-2.4.1/src/ilmid/atmf_uni.c 2007-06-04 13:23:54.498448872 +0200 @@ -187,7 +187,7 @@ newPrefix->name = alloc_t(AsnOid); newPrefix->name->octs = alloc(varBindName->octetLen); @@ -25600,8 +25684,10 @@ } return NOERROR; ---- linux-atm-2.4.1.orig/src/ilmid/mib.c -+++ linux-atm-2.4.1/src/ilmid/mib.c +Index: linux-atm-2.4.1/src/ilmid/mib.c +=================================================================== +--- linux-atm-2.4.1.orig/src/ilmid/mib.c 2007-06-04 13:23:54.124505720 +0200 ++++ linux-atm-2.4.1/src/ilmid/mib.c 2007-06-04 13:23:54.499448720 +0200 @@ -58,13 +58,13 @@ { NULL } }; @@ -25679,8 +25765,10 @@ return; } ---- linux-atm-2.4.1.orig/src/ilmid/mib.h -+++ linux-atm-2.4.1/src/ilmid/mib.h +Index: linux-atm-2.4.1/src/ilmid/mib.h +=================================================================== +--- linux-atm-2.4.1.orig/src/ilmid/mib.h 2007-06-04 13:23:54.130504808 +0200 ++++ linux-atm-2.4.1/src/ilmid/mib.h 2007-06-04 13:23:54.499448720 +0200 @@ -39,9 +39,9 @@ void *value; } Variable; @@ -25694,8 +25782,10 @@ void *MIBdelete(AsnOid *oid); AsnInt getString(VarBind *varbind, Variable *var); ---- linux-atm-2.4.1.orig/src/ilmid/ilmid.c -+++ linux-atm-2.4.1/src/ilmid/ilmid.c +Index: linux-atm-2.4.1/src/ilmid/ilmid.c +=================================================================== +--- linux-atm-2.4.1.orig/src/ilmid/ilmid.c 2007-06-04 13:23:54.135504048 +0200 ++++ linux-atm-2.4.1/src/ilmid/ilmid.c 2007-06-04 13:23:54.499448720 +0200 @@ -33,6 +33,7 @@ #include #endif @@ -25704,8 +25794,10 @@ #include #include #include ---- linux-atm-2.4.1.orig/src/ilmid/asn1/Makefile.in -+++ linux-atm-2.4.1/src/ilmid/asn1/Makefile.in +Index: linux-atm-2.4.1/src/ilmid/asn1/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/ilmid/asn1/Makefile.in 2007-06-04 13:23:54.141503136 +0200 ++++ linux-atm-2.4.1/src/ilmid/asn1/Makefile.in 2007-06-04 13:23:54.499448720 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -25911,8 +26003,10 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. ---- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_int.c -+++ linux-atm-2.4.1/src/ilmid/asn1/asn_int.c +Index: linux-atm-2.4.1/src/ilmid/asn1/asn_int.c +=================================================================== +--- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_int.c 2007-06-04 13:23:54.147502224 +0200 ++++ linux-atm-2.4.1/src/ilmid/asn1/asn_int.c 2007-06-04 13:23:54.500448568 +0200 @@ -185,7 +185,7 @@ AsnInt* v _AND_ unsigned short int indent) @@ -25937,8 +26031,10 @@ - fprintf(f,"%u", *v); + fprintf(f,"%lu", *v); } ---- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_octs.c -+++ linux-atm-2.4.1/src/ilmid/asn1/asn_octs.c +Index: linux-atm-2.4.1/src/ilmid/asn1/asn_octs.c +=================================================================== +--- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_octs.c 2007-06-04 13:23:54.152501464 +0200 ++++ linux-atm-2.4.1/src/ilmid/asn1/asn_octs.c 2007-06-04 13:23:54.500448568 +0200 @@ -21,6 +21,9 @@ #include #endif @@ -25949,8 +26045,10 @@ #include "asn_config.h" #include "asn_len.h" #include "asn_tag.h" ---- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_bits.c -+++ linux-atm-2.4.1/src/ilmid/asn1/asn_bits.c +Index: linux-atm-2.4.1/src/ilmid/asn1/asn_bits.c +=================================================================== +--- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_bits.c 2007-06-04 13:23:54.157500704 +0200 ++++ linux-atm-2.4.1/src/ilmid/asn1/asn_bits.c 2007-06-04 13:23:54.500448568 +0200 @@ -21,6 +21,9 @@ #include #endif @@ -25961,8 +26059,10 @@ #include "asn_config.h" #include "asn_len.h" #include "asn_tag.h" ---- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_oid.c -+++ linux-atm-2.4.1/src/ilmid/asn1/asn_oid.c +Index: linux-atm-2.4.1/src/ilmid/asn1/asn_oid.c +=================================================================== +--- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_oid.c 2007-06-04 13:23:54.163499792 +0200 ++++ linux-atm-2.4.1/src/ilmid/asn1/asn_oid.c 2007-06-04 13:23:54.500448568 +0200 @@ -21,6 +21,9 @@ #include #endif @@ -25991,8 +26091,10 @@ } fprintf(f,"}"); ---- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_list.c -+++ linux-atm-2.4.1/src/ilmid/asn1/asn_list.c +Index: linux-atm-2.4.1/src/ilmid/asn1/asn_list.c +=================================================================== +--- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_list.c 2007-06-04 13:23:54.168499032 +0200 ++++ linux-atm-2.4.1/src/ilmid/asn1/asn_list.c 2007-06-04 13:23:54.501448416 +0200 @@ -20,6 +20,8 @@ #include #endif @@ -26002,8 +26104,10 @@ #include "asn_config.h" #include "asn_list.h" ---- linux-atm-2.4.1.orig/src/ilmid/asn1/nibble_alloc.c -+++ linux-atm-2.4.1/src/ilmid/asn1/nibble_alloc.c +Index: linux-atm-2.4.1/src/ilmid/asn1/nibble_alloc.c +=================================================================== +--- linux-atm-2.4.1.orig/src/ilmid/asn1/nibble_alloc.c 2007-06-04 13:23:54.174498120 +0200 ++++ linux-atm-2.4.1/src/ilmid/asn1/nibble_alloc.c 2007-06-04 13:23:54.501448416 +0200 @@ -20,7 +20,9 @@ #include #endif @@ -26014,8 +26118,10 @@ #include "asn_config.h" #include "nibble_alloc.h" ---- linux-atm-2.4.1.orig/src/ilmid/asn1/nibble_alloc.h -+++ linux-atm-2.4.1/src/ilmid/asn1/nibble_alloc.h +Index: linux-atm-2.4.1/src/ilmid/asn1/nibble_alloc.h +=================================================================== +--- linux-atm-2.4.1.orig/src/ilmid/asn1/nibble_alloc.h 2007-06-04 13:23:54.181497056 +0200 ++++ linux-atm-2.4.1/src/ilmid/asn1/nibble_alloc.h 2007-06-04 13:23:54.501448416 +0200 @@ -39,13 +39,13 @@ void InitNibbleMem PROTO((unsigned long int initialSize, unsigned long int incrementSize)); @@ -26032,8 +26138,10 @@ #endif /* conditional include */ ---- linux-atm-2.4.1.orig/src/man/Makefile.in -+++ linux-atm-2.4.1/src/man/Makefile.in +Index: linux-atm-2.4.1/src/man/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/man/Makefile.in 2007-06-04 13:23:54.187496144 +0200 ++++ linux-atm-2.4.1/src/man/Makefile.in 2007-06-04 13:23:54.501448416 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -26070,8 +26178,10 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ ---- linux-atm-2.4.1.orig/src/led/Makefile.in -+++ linux-atm-2.4.1/src/led/Makefile.in +Index: linux-atm-2.4.1/src/led/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/led/Makefile.in 2007-06-04 13:23:54.193495232 +0200 ++++ linux-atm-2.4.1/src/led/Makefile.in 2007-06-04 13:23:54.502448264 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -26269,8 +26379,10 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. ---- linux-atm-2.4.1.orig/src/lane/Makefile.in -+++ linux-atm-2.4.1/src/lane/Makefile.in +Index: linux-atm-2.4.1/src/lane/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/lane/Makefile.in 2007-06-04 13:23:54.200494168 +0200 ++++ linux-atm-2.4.1/src/lane/Makefile.in 2007-06-04 13:23:54.502448264 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -26514,8 +26626,10 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. ---- linux-atm-2.4.1.orig/src/mpoad/Makefile.in -+++ linux-atm-2.4.1/src/mpoad/Makefile.in +Index: linux-atm-2.4.1/src/mpoad/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/mpoad/Makefile.in 2007-06-04 13:23:54.206493256 +0200 ++++ linux-atm-2.4.1/src/mpoad/Makefile.in 2007-06-04 13:23:54.503448112 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -26715,8 +26829,10 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. ---- linux-atm-2.4.1.orig/src/mpoad/p_factory.c -+++ linux-atm-2.4.1/src/mpoad/p_factory.c +Index: linux-atm-2.4.1/src/mpoad/p_factory.c +=================================================================== +--- linux-atm-2.4.1.orig/src/mpoad/p_factory.c 2007-06-04 13:23:54.212492344 +0200 ++++ linux-atm-2.4.1/src/mpoad/p_factory.c 2007-06-04 13:23:54.503448112 +0200 @@ -34,7 +34,7 @@ while( count > 1 ) { @@ -26726,8 +26842,10 @@ count -= 2; } ---- linux-atm-2.4.1.orig/src/switch/Makefile.in -+++ linux-atm-2.4.1/src/switch/Makefile.in +Index: linux-atm-2.4.1/src/switch/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/Makefile.in 2007-06-04 13:23:54.218491432 +0200 ++++ linux-atm-2.4.1/src/switch/Makefile.in 2007-06-04 13:23:54.503448112 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -26938,8 +27056,10 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. ---- linux-atm-2.4.1.orig/src/switch/cfg_y.c -+++ linux-atm-2.4.1/src/switch/cfg_y.c +Index: linux-atm-2.4.1/src/switch/cfg_y.c +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/cfg_y.c 2007-06-04 13:23:54.223490672 +0200 ++++ linux-atm-2.4.1/src/switch/cfg_y.c 2007-06-04 13:23:54.505447808 +0200 @@ -1,21 +1,87 @@ +/* A Bison parser, made by GNU Bison 1.875d. */ @@ -28972,8 +29092,10 @@ + + + ---- linux-atm-2.4.1.orig/src/switch/cfg_y.y -+++ linux-atm-2.4.1/src/switch/cfg_y.y +Index: linux-atm-2.4.1/src/switch/cfg_y.y +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/cfg_y.y 2007-06-04 13:23:54.229489760 +0200 ++++ linux-atm-2.4.1/src/switch/cfg_y.y 2007-06-04 13:23:54.505447808 +0200 @@ -10,6 +10,7 @@ #include #include @@ -28991,8 +29113,10 @@ static int itf; static SIGNALING_ENTITY *sig; ---- linux-atm-2.4.1.orig/src/switch/cfg_y.h -+++ linux-atm-2.4.1/src/switch/cfg_y.h +Index: linux-atm-2.4.1/src/switch/cfg_y.h +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/cfg_y.h 2007-06-04 13:23:54.234489000 +0200 ++++ linux-atm-2.4.1/src/switch/cfg_y.h 2007-06-04 13:23:54.505447808 +0200 @@ -1,19 +1,77 @@ -typedef union { +/* A Bison parser, made by GNU Bison 1.875d. */ @@ -29084,8 +29208,10 @@ + + + ---- linux-atm-2.4.1.orig/src/switch/debug/Makefile.in -+++ linux-atm-2.4.1/src/switch/debug/Makefile.in +Index: linux-atm-2.4.1/src/switch/debug/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/debug/Makefile.in 2007-06-04 13:23:54.239488240 +0200 ++++ linux-atm-2.4.1/src/switch/debug/Makefile.in 2007-06-04 13:23:54.506447656 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -29264,8 +29390,10 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. ---- linux-atm-2.4.1.orig/src/switch/debug/debug.c -+++ linux-atm-2.4.1/src/switch/debug/debug.c +Index: linux-atm-2.4.1/src/switch/debug/debug.c +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/debug/debug.c 2007-06-04 13:23:54.246487176 +0200 ++++ linux-atm-2.4.1/src/switch/debug/debug.c 2007-06-04 13:23:54.506447656 +0200 @@ -43,7 +43,7 @@ void fab_init(CALL *call) @@ -29284,8 +29412,10 @@ } ---- linux-atm-2.4.1.orig/src/switch/tcp/Makefile.in -+++ linux-atm-2.4.1/src/switch/tcp/Makefile.in +Index: linux-atm-2.4.1/src/switch/tcp/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/tcp/Makefile.in 2007-06-04 13:23:54.252486264 +0200 ++++ linux-atm-2.4.1/src/switch/tcp/Makefile.in 2007-06-04 13:23:54.506447656 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -29464,8 +29594,10 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. ---- linux-atm-2.4.1.orig/src/switch/tcp/tcpsw.c -+++ linux-atm-2.4.1/src/switch/tcp/tcpsw.c +Index: linux-atm-2.4.1/src/switch/tcp/tcpsw.c +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/tcp/tcpsw.c 2007-06-04 13:23:54.259485200 +0200 ++++ linux-atm-2.4.1/src/switch/tcp/tcpsw.c 2007-06-04 13:23:54.507447504 +0200 @@ -345,7 +345,7 @@ void fab_init(CALL *call) @@ -29484,8 +29616,10 @@ } ---- linux-atm-2.4.1.orig/src/config/Makefile.in -+++ linux-atm-2.4.1/src/config/Makefile.in +Index: linux-atm-2.4.1/src/config/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/config/Makefile.in 2007-06-04 13:23:54.264484440 +0200 ++++ linux-atm-2.4.1/src/config/Makefile.in 2007-06-04 13:23:54.507447504 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -29531,8 +29665,10 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ ---- linux-atm-2.4.1.orig/src/config/init-redhat/Makefile.in -+++ linux-atm-2.4.1/src/config/init-redhat/Makefile.in +Index: linux-atm-2.4.1/src/config/init-redhat/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/config/init-redhat/Makefile.in 2007-06-04 13:23:54.271483376 +0200 ++++ linux-atm-2.4.1/src/config/init-redhat/Makefile.in 2007-06-04 13:23:54.507447504 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -29569,8 +29705,10 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ ---- linux-atm-2.4.1.orig/src/extra/Makefile.in -+++ linux-atm-2.4.1/src/extra/Makefile.in +Index: linux-atm-2.4.1/src/extra/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/extra/Makefile.in 2007-06-04 13:23:54.277482464 +0200 ++++ linux-atm-2.4.1/src/extra/Makefile.in 2007-06-04 13:23:54.508447352 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -29616,8 +29754,10 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ ---- linux-atm-2.4.1.orig/src/extra/ANS/Makefile.in -+++ linux-atm-2.4.1/src/extra/ANS/Makefile.in +Index: linux-atm-2.4.1/src/extra/ANS/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/extra/ANS/Makefile.in 2007-06-04 13:23:54.285481248 +0200 ++++ linux-atm-2.4.1/src/extra/ANS/Makefile.in 2007-06-04 13:23:54.508447352 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -29654,8 +29794,10 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ ---- linux-atm-2.4.1.orig/doc/Makefile.in -+++ linux-atm-2.4.1/doc/Makefile.in +Index: linux-atm-2.4.1/doc/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/doc/Makefile.in 2007-06-04 13:23:54.291480336 +0200 ++++ linux-atm-2.4.1/doc/Makefile.in 2007-06-04 13:23:54.509447200 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -29692,12 +29834,16 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ ---- linux-atm-2.4.1.orig/debian/patches/00list -+++ linux-atm-2.4.1/debian/patches/00list +Index: linux-atm-2.4.1/debian/patches/00list +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/patches/00list 2007-06-04 13:23:54.509447200 +0200 @@ -0,0 +1 @@ +10_atmbr2684.h ---- linux-atm-2.4.1.orig/debian/patches/10_atmbr2684.h.dpatch -+++ linux-atm-2.4.1/debian/patches/10_atmbr2684.h.dpatch +Index: linux-atm-2.4.1/debian/patches/10_atmbr2684.h.dpatch +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/patches/10_atmbr2684.h.dpatch 2007-06-04 13:23:54.510447048 +0200 @@ -0,0 +1,598 @@ +#! /bin/sh -e +## 01_kernel-header.dpatch by @@ -30297,8 +30443,10 @@ ++#endif /* __KERNEL__ */ ++ ++#endif ---- linux-atm-2.4.1.orig/debian/control -+++ linux-atm-2.4.1/debian/control +Index: linux-atm-2.4.1/debian/control +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/control 2007-06-04 13:23:54.510447048 +0200 @@ -0,0 +1,57 @@ +Source: linux-atm +Section: net @@ -30357,8 +30505,10 @@ + Transfer Mode) related programs. + . + Homepage: http://linux-atm.sourceforge.net/ ---- linux-atm-2.4.1.orig/debian/rules -+++ linux-atm-2.4.1/debian/rules +Index: linux-atm-2.4.1/debian/rules +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/rules 2007-06-04 13:23:54.510447048 +0200 @@ -0,0 +1,136 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. @@ -30496,12 +30646,16 @@ +binary: binary-indep binary-arch +.PHONY: build binary-indep binary-arch binary install configure + get-2684 patch unpatch clean1 ---- linux-atm-2.4.1.orig/debian/atm-tools-br2684.install -+++ linux-atm-2.4.1/debian/atm-tools-br2684.install +Index: linux-atm-2.4.1/debian/atm-tools-br2684.install +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/atm-tools-br2684.install 2007-06-04 13:23:54.510447048 +0200 @@ -0,0 +1 @@ +debian/tmp/usr/sbin/br2684ctl usr/sbin ---- linux-atm-2.4.1.orig/debian/atm-tools-br2684/usr/share/doc/atm-tools-br2684/changelog.Debian -+++ linux-atm-2.4.1/debian/atm-tools-br2684/usr/share/doc/atm-tools-br2684/changelog.Debian +Index: linux-atm-2.4.1/debian/atm-tools-br2684/usr/share/doc/atm-tools-br2684/changelog.Debian +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/atm-tools-br2684/usr/share/doc/atm-tools-br2684/changelog.Debian 2007-06-04 13:23:54.511446896 +0200 @@ -0,0 +1,206 @@ +linux-atm (2.4.1-16) unstable; urgency=low + @@ -30709,8 +30863,10 @@ + * Initial Release. + + -- Russell Coker Fri, 24 Aug 2001 17:31:00 +0200 ---- linux-atm-2.4.1.orig/debian/atm-tools-br2684/usr/share/doc/atm-tools-br2684/changelog -+++ linux-atm-2.4.1/debian/atm-tools-br2684/usr/share/doc/atm-tools-br2684/changelog +Index: linux-atm-2.4.1/debian/atm-tools-br2684/usr/share/doc/atm-tools-br2684/changelog +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/atm-tools-br2684/usr/share/doc/atm-tools-br2684/changelog 2007-06-04 13:23:54.514446440 +0200 @@ -0,0 +1,3299 @@ +Version 2.4.0 to 2.4.1 (25-APR-2003) +===================== @@ -34011,12 +34167,16 @@ + structure) + - added code to read the ESI to zatm.c (but that code doesn't seem to work + yet) ---- linux-atm-2.4.1.orig/debian/atm-tools-br2684.manpages -+++ linux-atm-2.4.1/debian/atm-tools-br2684.manpages +Index: linux-atm-2.4.1/debian/atm-tools-br2684.manpages +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/atm-tools-br2684.manpages 2007-06-04 13:23:54.515446288 +0200 @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man8/br2684ctl.8 ---- linux-atm-2.4.1.orig/debian/atm-tools.atm -+++ linux-atm-2.4.1/debian/atm-tools.atm +Index: linux-atm-2.4.1/debian/atm-tools.atm +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/atm-tools.atm 2007-06-04 13:23:54.515446288 +0200 @@ -0,0 +1,27 @@ +#!/bin/sh +# Start/stop the atm daemon(s). @@ -34045,15 +34205,19 @@ + ;; +esac +exit 0 ---- linux-atm-2.4.1.orig/debian/atm-tools.docs -+++ linux-atm-2.4.1/debian/atm-tools.docs +Index: linux-atm-2.4.1/debian/atm-tools.docs +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/atm-tools.docs 2007-06-04 13:23:54.515446288 +0200 @@ -0,0 +1,4 @@ +BUGS +README +doc/README.tc +debian/README.br2684 ---- linux-atm-2.4.1.orig/debian/control.old -+++ linux-atm-2.4.1/debian/control.old +Index: linux-atm-2.4.1/debian/control.old +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/control.old 2007-06-04 13:23:54.515446288 +0200 @@ -0,0 +1,72 @@ +Source: linux-atm +Section: net @@ -34127,8 +34291,10 @@ + Transfer Mode) related programs. + . + Homepage: http://linux-atm.sourceforge.net/ ---- linux-atm-2.4.1.orig/debian/atm-tools.install -+++ linux-atm-2.4.1/debian/atm-tools.install +Index: linux-atm-2.4.1/debian/atm-tools.install +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/atm-tools.install 2007-06-04 13:23:54.516446136 +0200 @@ -0,0 +1,18 @@ +debian/tmp/usr/share/man/* +debian/tmp/usr/bin/* @@ -34148,12 +34314,16 @@ +debian/tmp/usr/sbin/lecs +debian/tmp/usr/sbin/mpcd +debian/tmp/etc/atmsigd.conf ---- linux-atm-2.4.1.orig/debian/atm-tools.manpages -+++ linux-atm-2.4.1/debian/atm-tools.manpages +Index: linux-atm-2.4.1/debian/atm-tools.manpages +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/atm-tools.manpages 2007-06-04 13:23:54.516446136 +0200 @@ -0,0 +1 @@ +debian/atm-tools.8 ---- linux-atm-2.4.1.orig/debian/atm-tools.pod -+++ linux-atm-2.4.1/debian/atm-tools.pod +Index: linux-atm-2.4.1/debian/atm-tools.pod +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/atm-tools.pod 2007-06-04 13:23:54.516446136 +0200 @@ -0,0 +1,27 @@ +=head1 NAME + @@ -34182,8 +34352,10 @@ + +This manpage was written by Marc Haber for linux-atm packaging in +Debian/GNU Operating System. ---- linux-atm-2.4.1.orig/debian/changelog -+++ linux-atm-2.4.1/debian/changelog +Index: linux-atm-2.4.1/debian/changelog +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/changelog 2007-06-04 13:23:54.517445984 +0200 @@ -0,0 +1,212 @@ +linux-atm (2.4.1-17) unstable; urgency=low + @@ -34397,8 +34569,10 @@ + * Initial Release. + + -- Russell Coker Fri, 24 Aug 2001 17:31:00 +0200 ---- linux-atm-2.4.1.orig/debian/checkout-br2684 -+++ linux-atm-2.4.1/debian/checkout-br2684 +Index: linux-atm-2.4.1/debian/checkout-br2684 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/checkout-br2684 2007-06-04 13:23:54.517445984 +0200 @@ -0,0 +1,25 @@ +#!/bin/bash -x + @@ -34425,8 +34599,10 @@ + +autoreconf -i -f + ---- linux-atm-2.4.1.orig/debian/copyright.header -+++ linux-atm-2.4.1/debian/copyright.header +Index: linux-atm-2.4.1/debian/copyright.header +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/copyright.header 2007-06-04 13:23:54.517445984 +0200 @@ -0,0 +1,18 @@ +This package was debianized by Russell Coker on +Fri, 24 Aug 2001 16:11:12 +0200 and is now maintained by Marc Haber @@ -34446,30 +34622,42 @@ +GPL 2.0 + +See /usr/share/common-licenses/GPL-2 ---- linux-atm-2.4.1.orig/debian/libatm1-dev.dirs -+++ linux-atm-2.4.1/debian/libatm1-dev.dirs +Index: linux-atm-2.4.1/debian/libatm1-dev.dirs +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/libatm1-dev.dirs 2007-06-04 13:23:54.517445984 +0200 @@ -0,0 +1,2 @@ +usr/lib +usr/include ---- linux-atm-2.4.1.orig/debian/libatm1-dev.docs -+++ linux-atm-2.4.1/debian/libatm1-dev.docs +Index: linux-atm-2.4.1/debian/libatm1-dev.docs +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/libatm1-dev.docs 2007-06-04 13:23:54.518445832 +0200 @@ -0,0 +1,2 @@ +doc/README.CLP +doc/atm-linux-howto.txt ---- linux-atm-2.4.1.orig/debian/libatm1-dev.install -+++ linux-atm-2.4.1/debian/libatm1-dev.install +Index: linux-atm-2.4.1/debian/libatm1-dev.install +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/libatm1-dev.install 2007-06-04 13:23:54.518445832 +0200 @@ -0,0 +1,2 @@ +debian/tmp/usr/include/* +debian/tmp/usr/lib/*.a usr/lib ---- linux-atm-2.4.1.orig/debian/libatm1-dev.links -+++ linux-atm-2.4.1/debian/libatm1-dev.links +Index: linux-atm-2.4.1/debian/libatm1-dev.links +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/libatm1-dev.links 2007-06-04 13:23:54.518445832 +0200 @@ -0,0 +1 @@ +lib/libatm.so.1 usr/lib/libatm.so ---- linux-atm-2.4.1.orig/debian/libatm1.dirs -+++ linux-atm-2.4.1/debian/libatm1.dirs +Index: linux-atm-2.4.1/debian/libatm1.dirs +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/libatm1.dirs 2007-06-04 13:23:54.519445680 +0200 @@ -0,0 +1 @@ +/lib ---- linux-atm-2.4.1.orig/debian/libatm1.install -+++ linux-atm-2.4.1/debian/libatm1.install +Index: linux-atm-2.4.1/debian/libatm1.install +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/debian/libatm1.install 2007-06-04 13:23:54.519445680 +0200 @@ -0,0 +1 @@ +debian/tmp/usr/lib/libatm.so.* lib diff --git a/package/linux-atm/patches/100-subdirs.patch b/package/linux-atm/patches/100-subdirs.patch index 073f68bd3..112c5bb63 100644 --- a/package/linux-atm/patches/100-subdirs.patch +++ b/package/linux-atm/patches/100-subdirs.patch @@ -1,6 +1,7 @@ -diff -ruN linux-atm-2.4.1/configure.in linux-atm-2.4.1.new/configure.in ---- linux-atm-2.4.1/configure.in 2003-04-25 04:17:05.000000000 +0200 -+++ linux-atm-2.4.1.new/configure.in 2005-07-27 15:45:49.532396543 +0200 +Index: linux-atm-2.4.1/configure.in +=================================================================== +--- linux-atm-2.4.1.orig/configure.in 2007-06-04 13:23:53.853546912 +0200 ++++ linux-atm-2.4.1/configure.in 2007-06-04 13:23:55.937230144 +0200 @@ -153,26 +153,5 @@ src/Makefile \ src/include/Makefile \ @@ -28,18 +29,19 @@ diff -ruN linux-atm-2.4.1/configure.in linux-atm-2.4.1.new/configure.in - src/extra/ANS/Makefile ) -diff -ruN linux-atm-2.4.1/src/Makefile.am linux-atm-2.4.1.new/src/Makefile.am ---- linux-atm-2.4.1/src/Makefile.am 2001-10-03 23:14:53.000000000 +0200 -+++ linux-atm-2.4.1.new/src/Makefile.am 2005-07-27 15:33:52.389309711 +0200 +Index: linux-atm-2.4.1/src/Makefile.am +=================================================================== +--- linux-atm-2.4.1.orig/src/Makefile.am 2007-06-04 13:23:53.858546152 +0200 ++++ linux-atm-2.4.1/src/Makefile.am 2007-06-04 13:23:55.937230144 +0200 @@ -1,3 +1,2 @@ -SUBDIRS = include lib test debug qgen saal sigd maint arpd ilmid man led lane \ - mpoad switch config extra +SUBDIRS = include lib - -diff -Nur linux-atm-2.4.1.orig/src/include/linux/atmbr2684.h linux-atm-2.4.1/src/include/linux/atmbr2684.h ---- linux-atm-2.4.1.orig/src/include/linux/atmbr2684.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-atm-2.4.1/src/include/linux/atmbr2684.h 2005-11-13 00:06:42.000000000 +0100 +Index: linux-atm-2.4.1/src/include/linux/atmbr2684.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-atm-2.4.1/src/include/linux/atmbr2684.h 2007-06-04 13:23:55.938229992 +0200 @@ -0,0 +1,117 @@ +#ifndef _LINUX_ATMBR2684_H +#define _LINUX_ATMBR2684_H @@ -158,4 +160,3 @@ diff -Nur linux-atm-2.4.1.orig/src/include/linux/atmbr2684.h linux-atm-2.4.1/src + struct br2684_filter_set) + +#endif /* _LINUX_ATMBR2684_H */ - diff --git a/package/linux-atm/patches/200-no_libfl.patch b/package/linux-atm/patches/200-no_libfl.patch index 1b538b2a3..e762e4d4a 100644 --- a/package/linux-atm/patches/200-no_libfl.patch +++ b/package/linux-atm/patches/200-no_libfl.patch @@ -1,6 +1,7 @@ -diff -ruN linux-atm-2.4.1/src/qgen/Makefile.am linux-atm-2.4.1.new/src/qgen/Makefile.am ---- linux-atm-2.4.1/src/qgen/Makefile.am 2001-09-03 20:41:05.000000000 +0200 -+++ linux-atm-2.4.1.new/src/qgen/Makefile.am 2005-07-26 14:49:05.000000000 +0200 +Index: linux-atm-2.4.1/src/qgen/Makefile.am +=================================================================== +--- linux-atm-2.4.1.orig/src/qgen/Makefile.am 2007-06-04 13:23:53.750562568 +0200 ++++ linux-atm-2.4.1/src/qgen/Makefile.am 2007-06-04 13:23:56.146198376 +0200 @@ -3,7 +3,7 @@ qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c \ @@ -10,24 +11,26 @@ diff -ruN linux-atm-2.4.1/src/qgen/Makefile.am linux-atm-2.4.1.new/src/qgen/Make q_dump_SOURCES = common.c q_dump_LDADD = qd.dump.standalone.o -diff -ruN linux-atm-2.4.1/src/qgen/Makefile.in linux-atm-2.4.1.new/src/qgen/Makefile.in ---- linux-atm-2.4.1/src/qgen/Makefile.in 2003-04-30 16:44:01.000000000 +0200 -+++ linux-atm-2.4.1.new/src/qgen/Makefile.in 2005-07-26 14:49:13.000000000 +0200 -@@ -91,7 +91,7 @@ - qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c \ - qgen.h second.c third.c +Index: linux-atm-2.4.1/src/qgen/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/qgen/Makefile.in 2007-06-04 13:23:54.484451000 +0200 ++++ linux-atm-2.4.1/src/qgen/Makefile.in 2007-06-04 13:23:56.146198376 +0200 +@@ -90,7 +90,7 @@ + + qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c qgen.h second.c third.c -qgen_LDADD = -lfl +qgen_LDADD = q_dump_SOURCES = common.c q_dump_LDADD = qd.dump.standalone.o -diff -ruN linux-atm-2.4.1/src/qgen/ql_l.c linux-atm-2.4.1.new/src/qgen/ql_l.c ---- linux-atm-2.4.1/src/qgen/ql_l.c 2003-04-24 21:46:49.000000000 +0200 -+++ linux-atm-2.4.1.new/src/qgen/ql_l.c 2005-07-26 20:45:40.000000000 +0200 -@@ -11,6 +11,11 @@ - #include - #include +Index: linux-atm-2.4.1/src/qgen/ql_l.c +=================================================================== +--- linux-atm-2.4.1.orig/src/qgen/ql_l.c 2007-06-04 13:23:54.486450696 +0200 ++++ linux-atm-2.4.1/src/qgen/ql_l.c 2007-06-04 13:23:56.147198224 +0200 +@@ -501,6 +501,11 @@ + #include "qgen.h" + #include "ql_y.h" +int yywrap(void) +{ @@ -35,11 +38,12 @@ diff -ruN linux-atm-2.4.1/src/qgen/ql_l.c linux-atm-2.4.1.new/src/qgen/ql_l.c +} + - /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ - #ifdef c_plusplus -diff -ruN linux-atm-2.4.1/src/sigd/cfg_l.c linux-atm-2.4.1.new/src/sigd/cfg_l.c ---- linux-atm-2.4.1/src/sigd/cfg_l.c 2003-04-24 21:47:21.000000000 +0200 -+++ linux-atm-2.4.1.new/src/sigd/cfg_l.c 2005-07-26 22:04:13.000000000 +0200 + typedef struct _tree { + struct _tree *left,*right; +Index: linux-atm-2.4.1/src/sigd/cfg_l.c +=================================================================== +--- linux-atm-2.4.1.orig/src/sigd/cfg_l.c 2007-06-04 13:23:53.767559984 +0200 ++++ linux-atm-2.4.1/src/sigd/cfg_l.c 2007-06-04 13:23:56.148198072 +0200 @@ -11,6 +11,10 @@ #include #include @@ -51,9 +55,10 @@ diff -ruN linux-atm-2.4.1/src/sigd/cfg_l.c linux-atm-2.4.1.new/src/sigd/cfg_l.c /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ #ifdef c_plusplus -diff -ruN linux-atm-2.4.1/src/sigd/Makefile.am linux-atm-2.4.1.new/src/sigd/Makefile.am ---- linux-atm-2.4.1/src/sigd/Makefile.am 2001-10-04 23:17:26.000000000 +0200 -+++ linux-atm-2.4.1.new/src/sigd/Makefile.am 2005-07-26 14:49:44.000000000 +0200 +Index: linux-atm-2.4.1/src/sigd/Makefile.am +=================================================================== +--- linux-atm-2.4.1.orig/src/sigd/Makefile.am 2007-06-04 13:23:53.772559224 +0200 ++++ linux-atm-2.4.1/src/sigd/Makefile.am 2007-06-04 13:23:56.148198072 +0200 @@ -8,7 +8,7 @@ $(top_builddir)/src/qgen/qd.dump.o \ $(top_builddir)/src/lib/libatm.la \ @@ -63,21 +68,23 @@ diff -ruN linux-atm-2.4.1/src/sigd/Makefile.am linux-atm-2.4.1.new/src/sigd/Make atmsigd_DEPENDENCIES = mess.c $(atmsigd_XTRAS) CLEANFILES = mess.c -diff -ruN linux-atm-2.4.1/src/sigd/Makefile.in linux-atm-2.4.1.new/src/sigd/Makefile.in ---- linux-atm-2.4.1/src/sigd/Makefile.in 2003-04-30 16:44:03.000000000 +0200 -+++ linux-atm-2.4.1.new/src/sigd/Makefile.in 2005-07-26 14:49:48.000000000 +0200 -@@ -97,7 +97,7 @@ - $(top_builddir)/src/lib/libatm.la \ - $(top_builddir)/src/saal/libsaal.a +Index: linux-atm-2.4.1/src/sigd/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/sigd/Makefile.in 2007-06-04 13:23:54.492449784 +0200 ++++ linux-atm-2.4.1/src/sigd/Makefile.in 2007-06-04 13:23:56.148198072 +0200 +@@ -92,7 +92,7 @@ + + atmsigd_XTRAS = mess.o $(top_builddir)/src/qgen/q.out.o $(top_builddir)/src/qgen/qd.dump.o $(top_builddir)/src/lib/libatm.la $(top_builddir)/src/saal/libsaal.a -atmsigd_LDADD = $(atmsigd_XTRAS) -lfl +atmsigd_LDADD = $(atmsigd_XTRAS) atmsigd_DEPENDENCIES = mess.c $(atmsigd_XTRAS) CLEANFILES = mess.c -diff -ruN linux-atm-2.4.1/src/switch/debug/debug.c linux-atm-2.4.1.new/src/switch/debug/debug.c ---- linux-atm-2.4.1/src/switch/debug/debug.c 2001-09-03 20:41:06.000000000 +0200 -+++ linux-atm-2.4.1.new/src/switch/debug/debug.c 2005-07-26 22:06:53.000000000 +0200 +Index: linux-atm-2.4.1/src/switch/debug/debug.c +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/debug/debug.c 2007-06-04 13:23:54.506447656 +0200 ++++ linux-atm-2.4.1/src/switch/debug/debug.c 2007-06-04 13:23:56.149197920 +0200 @@ -20,6 +20,11 @@ #define PRV(call) ((FAB *) (call)->fab) @@ -90,9 +97,10 @@ diff -ruN linux-atm-2.4.1/src/switch/debug/debug.c linux-atm-2.4.1.new/src/switc typedef struct _fab { CALL *next; /* relay.c may not keep track of calls, but WE are */ -diff -ruN linux-atm-2.4.1/src/switch/debug/Makefile.am linux-atm-2.4.1.new/src/switch/debug/Makefile.am ---- linux-atm-2.4.1/src/switch/debug/Makefile.am 2001-10-04 23:17:26.000000000 +0200 -+++ linux-atm-2.4.1.new/src/switch/debug/Makefile.am 2005-07-26 14:50:03.000000000 +0200 +Index: linux-atm-2.4.1/src/switch/debug/Makefile.am +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/debug/Makefile.am 2007-06-04 13:23:53.789556640 +0200 ++++ linux-atm-2.4.1/src/switch/debug/Makefile.am 2007-06-04 13:23:56.149197920 +0200 @@ -5,7 +5,7 @@ sw_debug_SOURCES = debug.c sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \ @@ -102,21 +110,23 @@ diff -ruN linux-atm-2.4.1/src/switch/debug/Makefile.am linux-atm-2.4.1.new/src/s sw_debug_DEPENDENCIES = $(sw_debug_XTRAS) -diff -ruN linux-atm-2.4.1/src/switch/debug/Makefile.in linux-atm-2.4.1.new/src/switch/debug/Makefile.in ---- linux-atm-2.4.1/src/switch/debug/Makefile.in 2003-04-30 16:44:13.000000000 +0200 -+++ linux-atm-2.4.1.new/src/switch/debug/Makefile.in 2005-07-26 14:50:08.000000000 +0200 -@@ -93,7 +93,7 @@ - sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \ - $(top_builddir)/src/lib/libatm.la +Index: linux-atm-2.4.1/src/switch/debug/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/debug/Makefile.in 2007-06-04 13:23:54.506447656 +0200 ++++ linux-atm-2.4.1/src/switch/debug/Makefile.in 2007-06-04 13:23:56.149197920 +0200 +@@ -92,7 +92,7 @@ + sw_debug_SOURCES = debug.c + sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a $(top_builddir)/src/lib/libatm.la -sw_debug_LDADD = $(sw_debug_XTRAS) -lfl +sw_debug_LDADD = $(sw_debug_XTRAS) sw_debug_DEPENDENCIES = $(sw_debug_XTRAS) -diff -ruN linux-atm-2.4.1/src/switch/tcp/Makefile.am linux-atm-2.4.1.new/src/switch/tcp/Makefile.am ---- linux-atm-2.4.1/src/switch/tcp/Makefile.am 2001-10-04 23:17:27.000000000 +0200 -+++ linux-atm-2.4.1.new/src/switch/tcp/Makefile.am 2005-07-26 14:50:16.000000000 +0200 +Index: linux-atm-2.4.1/src/switch/tcp/Makefile.am +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/tcp/Makefile.am 2007-06-04 13:23:53.801554816 +0200 ++++ linux-atm-2.4.1/src/switch/tcp/Makefile.am 2007-06-04 13:23:56.149197920 +0200 @@ -5,7 +5,7 @@ sw_tcp_SOURCES = tcpsw.c sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \ @@ -126,21 +136,23 @@ diff -ruN linux-atm-2.4.1/src/switch/tcp/Makefile.am linux-atm-2.4.1.new/src/swi sw_tcp_DEPENDENCIES = $(sw_tcp_XTRAS) EXTRA_DIST = mkfiles README -diff -ruN linux-atm-2.4.1/src/switch/tcp/Makefile.in linux-atm-2.4.1.new/src/switch/tcp/Makefile.in ---- linux-atm-2.4.1/src/switch/tcp/Makefile.in 2003-04-30 16:44:14.000000000 +0200 -+++ linux-atm-2.4.1.new/src/switch/tcp/Makefile.in 2005-07-26 14:50:19.000000000 +0200 -@@ -93,7 +93,7 @@ - sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \ - $(top_builddir)/src/lib/libatm.la +Index: linux-atm-2.4.1/src/switch/tcp/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/tcp/Makefile.in 2007-06-04 13:23:54.506447656 +0200 ++++ linux-atm-2.4.1/src/switch/tcp/Makefile.in 2007-06-04 13:23:56.150197768 +0200 +@@ -92,7 +92,7 @@ + sw_tcp_SOURCES = tcpsw.c + sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a $(top_builddir)/src/lib/libatm.la -sw_tcp_LDADD = $(sw_tcp_XTRAS) -lfl +sw_tcp_LDADD = $(sw_tcp_XTRAS) sw_tcp_DEPENDENCIES = $(sw_tcp_XTRAS) EXTRA_DIST = mkfiles README -diff -ruN linux-atm-2.4.1/src/switch/tcp/tcpsw.c linux-atm-2.4.1.new/src/switch/tcp/tcpsw.c ---- linux-atm-2.4.1/src/switch/tcp/tcpsw.c 2001-09-03 20:41:06.000000000 +0200 -+++ linux-atm-2.4.1.new/src/switch/tcp/tcpsw.c 2005-07-26 22:08:25.000000000 +0200 +Index: linux-atm-2.4.1/src/switch/tcp/tcpsw.c +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/tcp/tcpsw.c 2007-06-04 13:23:54.507447504 +0200 ++++ linux-atm-2.4.1/src/switch/tcp/tcpsw.c 2007-06-04 13:23:56.150197768 +0200 @@ -35,6 +35,10 @@ #define MAX_PACKET (ATM_MAX_AAL5_PDU+sizeof(struct atmtcp_hdr)) #define BUFFER_SIZE (MAX_PACKET*2) @@ -152,9 +164,10 @@ diff -ruN linux-atm-2.4.1/src/switch/tcp/tcpsw.c linux-atm-2.4.1.new/src/switch/ typedef struct _table { struct _link *out; /* output port */ -diff -ruN linux-atm-2.4.1/src/test/ispl_l.c linux-atm-2.4.1.new/src/test/ispl_l.c ---- linux-atm-2.4.1/src/test/ispl_l.c 2003-04-24 21:46:39.000000000 +0200 -+++ linux-atm-2.4.1.new/src/test/ispl_l.c 2005-07-26 20:45:19.000000000 +0200 +Index: linux-atm-2.4.1/src/test/ispl_l.c +=================================================================== +--- linux-atm-2.4.1.orig/src/test/ispl_l.c 2007-06-04 13:23:53.818552232 +0200 ++++ linux-atm-2.4.1/src/test/ispl_l.c 2007-06-04 13:23:56.151197616 +0200 @@ -11,6 +11,11 @@ #include #include @@ -167,9 +180,10 @@ diff -ruN linux-atm-2.4.1/src/test/ispl_l.c linux-atm-2.4.1.new/src/test/ispl_l. /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ #ifdef c_plusplus -diff -ruN linux-atm-2.4.1/src/test/Makefile.am linux-atm-2.4.1.new/src/test/Makefile.am ---- linux-atm-2.4.1/src/test/Makefile.am 2001-10-04 23:17:27.000000000 +0200 -+++ linux-atm-2.4.1.new/src/test/Makefile.am 2005-07-26 14:49:27.000000000 +0200 +Index: linux-atm-2.4.1/src/test/Makefile.am +=================================================================== +--- linux-atm-2.4.1.orig/src/test/Makefile.am 2007-06-04 13:23:54.483451152 +0200 ++++ linux-atm-2.4.1/src/test/Makefile.am 2007-06-04 13:23:56.151197616 +0200 @@ -15,7 +15,7 @@ bw_SOURCES = bw.c isp_SOURCES = isp.c isp.h ispl_y.y ispl_l.l @@ -179,9 +193,10 @@ diff -ruN linux-atm-2.4.1/src/test/Makefile.am linux-atm-2.4.1.new/src/test/Make isp_DEPENDENCIES = $(isp_XTRAS) errnos.inc window_SOURCES = window.c -diff -ruN linux-atm-2.4.1/src/test/Makefile.in linux-atm-2.4.1.new/src/test/Makefile.in ---- linux-atm-2.4.1/src/test/Makefile.in 2003-04-30 16:43:59.000000000 +0200 -+++ linux-atm-2.4.1.new/src/test/Makefile.in 2005-07-26 14:49:32.000000000 +0200 +Index: linux-atm-2.4.1/src/test/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/test/Makefile.in 2007-06-04 13:23:54.482451304 +0200 ++++ linux-atm-2.4.1/src/test/Makefile.in 2007-06-04 13:23:56.151197616 +0200 @@ -102,7 +102,7 @@ bw_SOURCES = bw.c isp_SOURCES = isp.c isp.h ispl_y.y ispl_l.l diff --git a/package/linux-atm/patches/300-no_autotools.patch b/package/linux-atm/patches/300-no_autotools.patch index 1b9be11ec..e8adf483a 100644 --- a/package/linux-atm/patches/300-no_autotools.patch +++ b/package/linux-atm/patches/300-no_autotools.patch @@ -1,6 +1,7 @@ -diff -urN linux-atm.old/aclocal.m4 linux-atm.dev/aclocal.m4 ---- linux-atm.old/aclocal.m4 2005-08-23 01:12:10.833789000 +0200 -+++ linux-atm.dev/aclocal.m4 2005-08-23 01:12:44.813623720 +0200 +Index: linux-atm-2.4.1/aclocal.m4 +=================================================================== +--- linux-atm-2.4.1.orig/aclocal.m4 2007-06-04 13:23:54.462454344 +0200 ++++ linux-atm-2.4.1/aclocal.m4 2007-06-04 13:23:56.488146392 +0200 @@ -10,6 +10,825 @@ dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A dnl PARTICULAR PURPOSE. @@ -9194,9 +9195,10 @@ diff -urN linux-atm.old/aclocal.m4 linux-atm.dev/aclocal.m4 AC_MSG_RESULT([$SED]) ]) -diff -urN linux-atm.old/configure linux-atm.dev/configure ---- linux-atm.old/configure 2005-08-23 01:12:10.846787000 +0200 -+++ linux-atm.dev/configure 2005-08-23 01:12:41.187175024 +0200 +Index: linux-atm-2.4.1/configure +=================================================================== +--- linux-atm-2.4.1.orig/configure 2007-06-04 13:23:54.473452672 +0200 ++++ linux-atm-2.4.1/configure 2007-06-04 13:23:56.494145480 +0200 @@ -1,9 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. @@ -11311,7 +11313,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -@@ -9267,9 +9534,9 @@ +@@ -9267,9 +9533,9 @@ (echo ':t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed if test -z "$ac_sed_cmds"; then @@ -11323,7 +11325,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure fi ac_sed_frag=`expr $ac_sed_frag + 1` ac_beg=$ac_end -@@ -9287,21 +9554,21 @@ +@@ -9287,21 +9553,21 @@ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin @@ -11353,7 +11355,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -9317,10 +9584,10 @@ +@@ -9317,10 +9583,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -11368,7 +11370,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -9358,12 +9625,45 @@ +@@ -9358,12 +9624,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac @@ -11420,7 +11422,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure case $INSTALL in -@@ -9371,11 +9671,6 @@ +@@ -9371,11 +9670,6 @@ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac @@ -11432,7 +11434,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ -@@ -9385,7 +9680,7 @@ +@@ -9385,7 +9679,7 @@ configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | @@ -11441,7 +11443,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure # First look for the input files in the build tree, otherwise in the # src tree. -@@ -9394,26 +9689,32 @@ +@@ -9394,26 +9688,32 @@ case $f in -) echo $tmp/stdin ;; [\\/$]*) @@ -11487,7 +11489,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub -@@ -9453,12 +9754,12 @@ +@@ -9453,12 +9753,12 @@ # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. @@ -11503,7 +11505,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure ac_uB='$,\1#\2define\3' ac_uC=' ' ac_uD=',;t' -@@ -9467,11 +9768,11 @@ +@@ -9467,11 +9767,11 @@ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin @@ -11519,7 +11521,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure * ) ac_file_in=$ac_file.in ;; esac -@@ -9485,28 +9786,29 @@ +@@ -9485,28 +9785,29 @@ case $f in -) echo $tmp/stdin ;; [\\/$]*) @@ -11563,7 +11565,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure _ACEOF -@@ -9529,9 +9831,9 @@ +@@ -9529,9 +9830,9 @@ s,[\\$`],\\&,g t clear : clear @@ -11575,7 +11577,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure : end _ACEOF # If some macros were called several times there might be several times -@@ -9545,13 +9847,13 @@ +@@ -9545,13 +9846,13 @@ # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. cat >>conftest.undefs <<\_ACEOF @@ -11591,7 +11593,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail -@@ -9560,7 +9862,7 @@ +@@ -9560,7 +9861,7 @@ # Write a limited-size here document to $tmp/defines.sed. echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS # Speed up: don't consider the non `#define' lines. @@ -11600,7 +11602,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS -@@ -9587,7 +9889,7 @@ +@@ -9587,7 +9888,7 @@ # Write a limited-size here document to $tmp/undefs.sed. echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS # Speed up: don't consider the non `#undef' @@ -11609,7 +11611,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS -@@ -9621,10 +9923,10 @@ +@@ -9621,10 +9922,10 @@ else ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -11624,7 +11626,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -9640,10 +9942,10 @@ +@@ -9640,10 +9941,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -11639,7 +11641,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -9675,16 +9977,41 @@ +@@ -9675,16 +9976,41 @@ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_dir=`(dirname "$ac_dest") 2>/dev/null || $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -11685,7 +11687,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure ac_builddir=. if test "$ac_dir" != .; then -@@ -9710,12 +10037,45 @@ +@@ -9710,12 +10036,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac @@ -11737,9 +11739,10 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -diff -urN linux-atm.old/doc/Makefile.in linux-atm.dev/doc/Makefile.in ---- linux-atm.old/doc/Makefile.in 2005-08-23 01:12:10.885781000 +0200 -+++ linux-atm.dev/doc/Makefile.in 2005-08-23 01:12:46.551359544 +0200 +Index: linux-atm-2.4.1/doc/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/doc/Makefile.in 2007-06-04 13:23:54.509447200 +0200 ++++ linux-atm-2.4.1/doc/Makefile.in 2007-06-04 13:23:56.494145480 +0200 @@ -63,24 +63,35 @@ host_triplet = @host@ target_alias = @target_alias@ @@ -11776,9 +11779,10 @@ diff -urN linux-atm.old/doc/Makefile.in linux-atm.dev/doc/Makefile.in STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ -diff -urN linux-atm.old/m4/Makefile.in linux-atm.dev/m4/Makefile.in ---- linux-atm.old/m4/Makefile.in 2005-08-23 01:12:10.850786000 +0200 -+++ linux-atm.dev/m4/Makefile.in 2005-08-23 01:12:46.559358328 +0200 +Index: linux-atm-2.4.1/m4/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/m4/Makefile.in 2007-06-04 13:23:54.480451608 +0200 ++++ linux-atm-2.4.1/m4/Makefile.in 2007-06-04 13:23:56.494145480 +0200 @@ -63,24 +63,35 @@ host_triplet = @host@ target_alias = @target_alias@ @@ -11815,9 +11819,10 @@ diff -urN linux-atm.old/m4/Makefile.in linux-atm.dev/m4/Makefile.in STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ -diff -urN linux-atm.old/Makefile.in linux-atm.dev/Makefile.in ---- linux-atm.old/Makefile.in 2005-08-23 01:12:10.830789000 +0200 -+++ linux-atm.dev/Makefile.in 2005-08-23 01:12:46.542360912 +0200 +Index: linux-atm-2.4.1/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/Makefile.in 2007-06-04 13:23:54.459454800 +0200 ++++ linux-atm-2.4.1/Makefile.in 2007-06-04 13:23:56.495145328 +0200 @@ -63,24 +63,35 @@ host_triplet = @host@ target_alias = @target_alias@ @@ -11854,9 +11859,10 @@ diff -urN linux-atm.old/Makefile.in linux-atm.dev/Makefile.in STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ -diff -urN linux-atm.old/src/include/Makefile.in linux-atm.dev/src/include/Makefile.in ---- linux-atm.old/src/include/Makefile.in 2005-08-23 01:12:10.851786000 +0200 -+++ linux-atm.dev/src/include/Makefile.in 2005-08-23 01:12:46.585354376 +0200 +Index: linux-atm-2.4.1/src/include/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/include/Makefile.in 2007-06-04 13:23:54.481451456 +0200 ++++ linux-atm-2.4.1/src/include/Makefile.in 2007-06-04 13:23:56.495145328 +0200 @@ -63,24 +63,35 @@ host_triplet = @host@ target_alias = @target_alias@ @@ -11893,9 +11899,10 @@ diff -urN linux-atm.old/src/include/Makefile.in linux-atm.dev/src/include/Makefi STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ -diff -urN linux-atm.old/src/lib/Makefile.in linux-atm.dev/src/lib/Makefile.in ---- linux-atm.old/src/lib/Makefile.in 2005-08-23 01:12:10.852786000 +0200 -+++ linux-atm.dev/src/lib/Makefile.in 2005-08-23 01:12:46.607351032 +0200 +Index: linux-atm-2.4.1/src/lib/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/lib/Makefile.in 2007-06-04 13:23:54.481451456 +0200 ++++ linux-atm-2.4.1/src/lib/Makefile.in 2007-06-04 13:23:56.496145176 +0200 @@ -65,24 +65,35 @@ host_triplet = @host@ target_alias = @target_alias@ @@ -11932,9 +11939,10 @@ diff -urN linux-atm.old/src/lib/Makefile.in linux-atm.dev/src/lib/Makefile.in STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ -diff -urN linux-atm.old/src/Makefile.in linux-atm.dev/src/Makefile.in ---- linux-atm.old/src/Makefile.in 2005-08-23 01:12:10.851786000 +0200 -+++ linux-atm.dev/src/Makefile.in 2005-08-23 01:12:46.572356352 +0200 +Index: linux-atm-2.4.1/src/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/Makefile.in 2007-06-04 13:23:54.480451608 +0200 ++++ linux-atm-2.4.1/src/Makefile.in 2007-06-04 13:23:56.496145176 +0200 @@ -63,30 +63,40 @@ host_triplet = @host@ target_alias = @target_alias@ diff --git a/package/linux-atm/patches/400-stdint_local_instead_of_host.patch b/package/linux-atm/patches/400-stdint_local_instead_of_host.patch index 7c1e8c14f..ead336cff 100644 --- a/package/linux-atm/patches/400-stdint_local_instead_of_host.patch +++ b/package/linux-atm/patches/400-stdint_local_instead_of_host.patch @@ -1,6 +1,7 @@ -diff -ur linux-atm.old/src/include/stdint.h linux-atm.dev/src/include/stdint.h ---- linux-atm.old/src/include/stdint.h 2001-09-03 20:41:06.000000000 +0200 -+++ linux-atm.dev/src/include/stdint.h 2006-09-27 19:13:56.000000000 +0200 +Index: linux-atm-2.4.1/src/include/stdint.h +=================================================================== +--- linux-atm-2.4.1.orig/src/include/stdint.h 2007-06-04 13:23:53.658576552 +0200 ++++ linux-atm-2.4.1/src/include/stdint.h 2007-06-04 13:23:56.839093040 +0200 @@ -6,7 +6,7 @@ #if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 -- cgit v1.2.3