diff --git a/package/acx/patches/001-no-reset.diff b/package/acx/patches/001-no-reset.diff
index c79c2456a60a7e0319f2db939398732631deda34..1166d07c2620fb966b9293fb1c8d7b75e472f236 100644
--- a/package/acx/patches/001-no-reset.diff
+++ b/package/acx/patches/001-no-reset.diff
@@ -1,6 +1,8 @@
---- acx-20060521.orig/pci.c 2007-01-25 15:43:48.000000000 +0700
-+++ acx-20060521/pci.c 2007-01-25 15:43:48.000000000 +0700
-@@ -906,10 +906,13 @@
+Index: acx-20070101/pci.c
+===================================================================
+--- acx-20070101.orig/pci.c 2007-06-04 13:22:42.489395912 +0200
++++ acx-20070101/pci.c 2007-06-04 13:22:42.557385576 +0200
+@@ -925,10 +925,13 @@
acx_lock(adev, flags);
diff --git a/package/acx/patches/002-disable-usb.diff b/package/acx/patches/002-disable-usb.diff
index 4eb01829b744e3d4c2999b9d3b6c21775db87320..2c7eb1665a500a2ab3666295545e0d238da05bc6 100644
--- a/package/acx/patches/002-disable-usb.diff
+++ b/package/acx/patches/002-disable-usb.diff
@@ -1,5 +1,7 @@
---- acx-20070101.orig/Makefile 2007-01-25 17:09:24.000000000 +0700
-+++ acx-20070101/Makefile 2007-01-25 17:09:41.000000000 +0700
+Index: acx-20070101/Makefile
+===================================================================
+--- acx-20070101.orig/Makefile 2007-06-04 13:22:42.463399864 +0200
++++ acx-20070101/Makefile 2007-06-04 13:22:42.747356696 +0200
@@ -1,7 +1,7 @@
obj-m += acx.o
@@ -9,8 +11,10 @@
acx-objs := wlan.o conv.o ioctl.o common.o $(acx-obj-y)
---- acx-20070101.orig/acx_config.h 2007-01-25 17:21:05.000000000 +0700
-+++ acx-20070101/acx_config.h 2007-01-25 17:21:08.000000000 +0700
+Index: acx-20070101/acx_config.h
+===================================================================
+--- acx-20070101.orig/acx_config.h 2007-06-04 13:22:42.469398952 +0200
++++ acx-20070101/acx_config.h 2007-06-04 13:22:42.747356696 +0200
@@ -1,6 +1,6 @@
/* temporary hack until proper Kconfig integration */
#define CONFIG_ACX_PCI 1
diff --git a/package/acx/patches/003-endianness-fixes.patch b/package/acx/patches/003-endianness-fixes.patch
index 05f6acf98d955cf948057a91ee774e87cad0f6f7..d4262852b1b05017f10529690de815174d94f1bc 100644
--- a/package/acx/patches/003-endianness-fixes.patch
+++ b/package/acx/patches/003-endianness-fixes.patch
@@ -1,6 +1,7 @@
-diff -Nur -x '*.o' -x '*.ko' acx-20070101/pci.c acx-20070101.big/pci.c
---- acx-20070101/pci.c 2007-06-02 17:29:53.000000000 +0200
-+++ acx-20070101.big/pci.c 2007-06-02 17:23:37.000000000 +0200
+Index: acx-20070101/pci.c
+===================================================================
+--- acx-20070101.orig/pci.c 2007-06-04 13:22:42.557385576 +0200
++++ acx-20070101/pci.c 2007-06-04 13:22:42.946326448 +0200
@@ -123,6 +123,11 @@
** Register access
*/
diff --git a/package/alsa/patches/100-compile_fix.patch b/package/alsa/patches/100-compile_fix.patch
index 2e2a3df79a3f593d258250f000f65b8315ffcfd7..edc15fea892bb1d300800805f0d75fcbc4c63407 100644
--- a/package/alsa/patches/100-compile_fix.patch
+++ b/package/alsa/patches/100-compile_fix.patch
@@ -1,7 +1,8 @@
-diff -urN alsa.old/include/adriver.h alsa.dev/include/adriver.h
---- alsa.old/include/adriver.h 2006-04-19 08:24:30.000000000 +0200
-+++ alsa.dev/include/adriver.h 2006-05-31 17:24:49.000000000 +0200
-@@ -451,7 +451,7 @@
+Index: alsa-driver-1.0.14rc1/include/adriver.h
+===================================================================
+--- alsa-driver-1.0.14rc1.orig/include/adriver.h 2007-06-04 13:22:44.887031416 +0200
++++ alsa-driver-1.0.14rc1/include/adriver.h 2007-06-04 13:22:44.956020928 +0200
+@@ -514,7 +514,7 @@
#endif /* < 2.6.0 */
/* workarounds for USB API */
@@ -10,9 +11,9 @@ diff -urN alsa.old/include/adriver.h alsa.dev/include/adriver.h
#include <linux/usb.h>
-@@ -1174,4 +1174,5 @@
- */
- #define OPL3_HW_OPL3_PC98 0x0305 /* PC9800 */
+@@ -1360,4 +1360,5 @@
+ #endif
+ #endif
+#undef info /* used in several structs */
#endif /* __SOUND_LOCAL_DRIVER_H */
diff --git a/package/alsa/patches/110-cp_command.patch b/package/alsa/patches/110-cp_command.patch
index 4684f9edde1848e43daf37777e890c44d81b6abc..f9719b57411bde37bc97b00f9b773d7ba60b6e61 100644
--- a/package/alsa/patches/110-cp_command.patch
+++ b/package/alsa/patches/110-cp_command.patch
@@ -1,7 +1,8 @@
-diff -ruN alsa-driver-1.0.14rc1-old/Makefile alsa-driver-1.0.14rc1-new/Makefile
---- alsa-driver-1.0.14rc1-old/Makefile 2006-12-15 16:23:38.000000000 +0100
-+++ alsa-driver-1.0.14rc1-new/Makefile 2006-12-15 16:24:57.000000000 +0100
-@@ -116,7 +116,7 @@
+Index: alsa-driver-1.0.14rc1/Makefile
+===================================================================
+--- alsa-driver-1.0.14rc1.orig/Makefile 2007-06-04 13:22:44.865034760 +0200
++++ alsa-driver-1.0.14rc1/Makefile 2007-06-04 13:22:45.149991440 +0200
+@@ -115,7 +115,7 @@
if [ ! -d include/sound -a ! -L include/sound ]; then \
ln -sf ../alsa-kernel/include include/sound ; \
fi
diff --git a/package/aodv-uu/patches/001-normalize.patch b/package/aodv-uu/patches/001-normalize.patch
index 3c76700fbb38a838ae1ff511a56445834a1eb898..bdc6fdae4ee18a450f9972f4cef2fe61062931d7 100644
--- a/package/aodv-uu/patches/001-normalize.patch
+++ b/package/aodv-uu/patches/001-normalize.patch
@@ -1,6 +1,7 @@
-diff -urN aodv-uu-0.9.1/lnx/Makefile aodv-uu-0.9.1.new/lnx/Makefile
---- aodv-uu-0.9.1/lnx/Makefile 2005-03-17 22:37:59.000000000 +0100
-+++ aodv-uu-0.9.1.new/lnx/Makefile 2006-07-25 15:46:02.000000000 +0200
+Index: aodv-uu-0.9.3/lnx/Makefile
+===================================================================
+--- aodv-uu-0.9.3.orig/lnx/Makefile 2007-06-04 13:22:19.859836128 +0200
++++ aodv-uu-0.9.3/lnx/Makefile 2007-06-04 13:22:19.932825032 +0200
@@ -30,7 +30,7 @@
KCFLAGS=-Wall -Wno-strict-aliasing -O2 $(KDEFS) $(KINC) $(XDEFS)
KCFLAGS_ARM=-Wall -O2 -D__KERNEL__ -DMODULE -nostdinc $(shell $(ARM_CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp') -I$(KERNEL_INC)
@@ -10,15 +11,16 @@ diff -urN aodv-uu-0.9.1/lnx/Makefile aodv-uu-0.9.1.new/lnx/Makefile
.PHONY: clean clean-2.4 clean-2.6 indent default
# Check for kernel version
-@@ -87,5 +87,3 @@
-
+@@ -89,5 +89,3 @@
+ etags *.c *.h
indent:
indent -kr -i8 -ts8 -sob -l80 -ss -ncs *.c *.h
-endif
-
-diff -urN aodv-uu-0.9.1/Makefile aodv-uu-0.9.1.new/Makefile
---- aodv-uu-0.9.1/Makefile 2006-07-25 15:03:49.000000000 +0200
-+++ aodv-uu-0.9.1.new/Makefile 2006-07-25 15:03:59.000000000 +0200
+Index: aodv-uu-0.9.3/Makefile
+===================================================================
+--- aodv-uu-0.9.3.orig/Makefile 2007-06-04 13:22:19.866835064 +0200
++++ aodv-uu-0.9.3/Makefile 2007-06-04 13:22:19.932825032 +0200
@@ -87,7 +87,7 @@
mips: aodvd-mips kaodv-mips
@@ -28,7 +30,7 @@ diff -urN aodv-uu-0.9.1/Makefile aodv-uu-0.9.1.new/Makefile
./endian > endian.h
$(OBJS): %.o: %.c Makefile
-@@ -138,19 +138,18 @@
+@@ -143,19 +143,18 @@
@makedepend -Y./ -- $(DEFS) -- $(SRC) &>/dev/null
@makedepend -a -Y./ -- $(KDEFS) kaodv.c &>/dev/null
diff --git a/package/aodv-uu/patches/002-linux_2.6.19_ip_route_me_harder_change.patch b/package/aodv-uu/patches/002-linux_2.6.19_ip_route_me_harder_change.patch
index b8b6583b09c039705891a78bfc030398ffe0dee4..638de87ff7ce5a3b50a8a781dcba501b1242ac6e 100644
--- a/package/aodv-uu/patches/002-linux_2.6.19_ip_route_me_harder_change.patch
+++ b/package/aodv-uu/patches/002-linux_2.6.19_ip_route_me_harder_change.patch
@@ -1,6 +1,7 @@
-diff -ruN aodv-uu-0.9.3-old/lnx/kaodv-mod.c aodv-uu-0.9.3-new/lnx/kaodv-mod.c
---- aodv-uu-0.9.3-old/lnx/kaodv-mod.c 2006-09-20 19:58:38.000000000 +0200
-+++ aodv-uu-0.9.3-new/lnx/kaodv-mod.c 2006-12-16 22:08:01.000000000 +0100
+Index: aodv-uu-0.9.3/lnx/kaodv-mod.c
+===================================================================
+--- aodv-uu-0.9.3.orig/lnx/kaodv-mod.c 2007-06-04 13:22:19.830840536 +0200
++++ aodv-uu-0.9.3/lnx/kaodv-mod.c 2007-06-04 13:22:20.130794936 +0200
@@ -19,7 +19,7 @@
* Author: Erik Nordström, <erik.nordstrom@it.uu.se>
*
@@ -22,9 +23,10 @@ diff -ruN aodv-uu-0.9.3-old/lnx/kaodv-mod.c aodv-uu-0.9.3-new/lnx/kaodv-mod.c
}
break;
case NF_IP_POST_ROUTING:
-diff -ruN aodv-uu-0.9.3-old/lnx/kaodv-queue.c aodv-uu-0.9.3-new/lnx/kaodv-queue.c
---- aodv-uu-0.9.3-old/lnx/kaodv-queue.c 2006-09-20 19:58:38.000000000 +0200
-+++ aodv-uu-0.9.3-new/lnx/kaodv-queue.c 2006-12-16 22:17:16.000000000 +0100
+Index: aodv-uu-0.9.3/lnx/kaodv-queue.c
+===================================================================
+--- aodv-uu-0.9.3.orig/lnx/kaodv-queue.c 2007-06-04 13:22:19.837839472 +0200
++++ aodv-uu-0.9.3/lnx/kaodv-queue.c 2007-06-04 13:22:20.130794936 +0200
@@ -29,6 +29,7 @@
#include <linux/spinlock.h>
#include <linux/sysctl.h>
diff --git a/package/aodv-uu/patches/003-linux_2.6.19_security_netlink_recv_change.patch b/package/aodv-uu/patches/003-linux_2.6.19_security_netlink_recv_change.patch
index 725f03bc2f3481559becdcdca42eab603997b46a..53d90643dccfadf8fbf3b251a4203a0bcc107dfb 100644
--- a/package/aodv-uu/patches/003-linux_2.6.19_security_netlink_recv_change.patch
+++ b/package/aodv-uu/patches/003-linux_2.6.19_security_netlink_recv_change.patch
@@ -1,6 +1,7 @@
-diff -ruN aodv-uu-0.9.3-old/lnx/kaodv-netlink.c aodv-uu-0.9.3-new/lnx/kaodv-netlink.c
---- aodv-uu-0.9.3-old/lnx/kaodv-netlink.c 2006-09-20 19:58:38.000000000 +0200
-+++ aodv-uu-0.9.3-new/lnx/kaodv-netlink.c 2006-12-16 22:14:14.000000000 +0100
+Index: aodv-uu-0.9.3/lnx/kaodv-netlink.c
+===================================================================
+--- aodv-uu-0.9.3.orig/lnx/kaodv-netlink.c 2007-06-04 13:22:19.810843576 +0200
++++ aodv-uu-0.9.3/lnx/kaodv-netlink.c 2007-06-04 13:22:20.326765144 +0200
@@ -284,7 +284,11 @@
/* RCV_SKB_FAIL(-EINVAL); */
diff --git a/package/aodv-uu/patches/004-linux_2.6.19_includes.patch b/package/aodv-uu/patches/004-linux_2.6.19_includes.patch
index 92cae3e1c822f331c855b46703d201fe637b9896..8dc1adf013271a5d04b938e2397b97afc0b242df 100644
--- a/package/aodv-uu/patches/004-linux_2.6.19_includes.patch
+++ b/package/aodv-uu/patches/004-linux_2.6.19_includes.patch
@@ -1,5 +1,7 @@
---- aodv-uu-0.9.3-old/main.c 2006-09-20 19:58:38.000000000 +0200
-+++ aodv-uu-0.9.3/main.c 2006-12-16 22:27:36.000000000 +0100
+Index: aodv-uu-0.9.3/main.c
+===================================================================
+--- aodv-uu-0.9.3.orig/main.c 2007-06-04 13:22:19.782847832 +0200
++++ aodv-uu-0.9.3/main.c 2007-06-04 13:22:20.513736720 +0200
@@ -26,6 +26,8 @@
#include <sys/types.h>
#include <sys/socket.h>
@@ -9,8 +11,10 @@
#include <linux/sockios.h>
#include <linux/wireless.h>
#include <getopt.h>
---- aodv-uu-0.9.3-old/nl.c 2006-09-20 19:58:38.000000000 +0200
-+++ aodv-uu-0.9.3/nl.c 2006-12-16 22:29:55.000000000 +0100
+Index: aodv-uu-0.9.3/nl.c
+===================================================================
+--- aodv-uu-0.9.3.orig/nl.c 2007-06-04 13:22:19.789846768 +0200
++++ aodv-uu-0.9.3/nl.c 2007-06-04 13:22:20.513736720 +0200
@@ -33,6 +33,10 @@
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/package/arptables/patches/100-autoconf_h.patch b/package/arptables/patches/100-autoconf_h.patch
index b32b00ce91fee8b2991576008cd6a5ef70d98ebc..9b97ff940f2ae56561b1bce7653c3d411a51bea9 100644
--- a/package/arptables/patches/100-autoconf_h.patch
+++ b/package/arptables/patches/100-autoconf_h.patch
@@ -1,6 +1,7 @@
-diff -ur arptables.old/include/linux/netfilter_arp.h arptables.dev/include/linux/netfilter_arp.h
---- arptables.old/include/linux/netfilter_arp.h 2003-10-25 13:39:06.000000000 +0200
-+++ arptables.dev/include/linux/netfilter_arp.h 2006-12-14 20:35:10.000000000 +0100
+Index: arptables-v0.0.3-2/include/linux/netfilter_arp.h
+===================================================================
+--- arptables-v0.0.3-2.orig/include/linux/netfilter_arp.h 2007-06-04 13:22:21.014660568 +0200
++++ arptables-v0.0.3-2/include/linux/netfilter_arp.h 2007-06-04 13:22:21.087649472 +0200
@@ -7,7 +7,7 @@
* (C)2002 Rusty Russell IBM -- This code is GPL.
*/
@@ -10,9 +11,10 @@ diff -ur arptables.old/include/linux/netfilter_arp.h arptables.dev/include/linux
#include <linux/netfilter.h>
/* There is no PF_ARP. */
-diff -ur arptables.old/include/netfilter_arp.h arptables.dev/include/netfilter_arp.h
---- arptables.old/include/netfilter_arp.h 2003-10-25 12:43:24.000000000 +0200
-+++ arptables.dev/include/netfilter_arp.h 2006-12-14 20:34:57.000000000 +0100
+Index: arptables-v0.0.3-2/include/netfilter_arp.h
+===================================================================
+--- arptables-v0.0.3-2.orig/include/netfilter_arp.h 2007-06-04 13:22:21.021659504 +0200
++++ arptables-v0.0.3-2/include/netfilter_arp.h 2007-06-04 13:22:21.087649472 +0200
@@ -7,7 +7,7 @@
* (C)2002 Rusty Russell IBM -- This code is GPL.
*/
diff --git a/package/br2684ctl/patches/100-debian.patch b/package/br2684ctl/patches/100-debian.patch
index bfcd4ec6a38b062533ecd6a48158bf62bd015960..45f63640dadbe0164bdf77ef930b418419c1473f 100644
--- a/package/br2684ctl/patches/100-debian.patch
+++ b/package/br2684ctl/patches/100-debian.patch
@@ -1,5 +1,7 @@
---- br2684ctl-20040226.orig/br2684ctl.c
-+++ br2684ctl-20040226/br2684ctl.c
+Index: br2684ctl-20040226.orig/br2684ctl.c
+===================================================================
+--- br2684ctl-20040226.orig.orig/br2684ctl.c 2007-06-04 13:22:22.142489112 +0200
++++ br2684ctl-20040226.orig/br2684ctl.c 2007-06-04 13:22:22.213478320 +0200
@@ -3,6 +3,8 @@
#include <unistd.h>
#include <errno.h>
@@ -73,8 +75,10 @@
return 0;
}
---- br2684ctl-20040226.orig/Makefile
-+++ br2684ctl-20040226/Makefile
+Index: br2684ctl-20040226.orig/Makefile
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ br2684ctl-20040226.orig/Makefile 2007-06-04 13:22:22.215478016 +0200
@@ -0,0 +1,13 @@
+OPTS := -O2
+CFLAGS := -Wall -g
diff --git a/package/bridge/patches/001-patch-libbridge_makefile_in b/package/bridge/patches/001-patch-libbridge_makefile_in
index f44737750bf8910473e390fb322f39e8616c71dd..5d211284a2e4e5237a3787e257e106774b3e26d2 100644
--- a/package/bridge/patches/001-patch-libbridge_makefile_in
+++ b/package/bridge/patches/001-patch-libbridge_makefile_in
@@ -1,5 +1,7 @@
---- bridge-utils-0.9.6/libbridge/Makefile.in.dist 2004-03-01 20:55:52.000000000 -0600
-+++ bridge-utils-0.9.6/libbridge/Makefile.in 2004-03-01 20:56:23.000000000 -0600
+Index: bridge-utils-1.0.6/libbridge/Makefile.in
+===================================================================
+--- bridge-utils-1.0.6.orig/libbridge/Makefile.in 2007-06-04 13:21:26.951879360 +0200
++++ bridge-utils-1.0.6/libbridge/Makefile.in 2007-06-04 13:21:27.019869024 +0200
@@ -5,7 +5,7 @@
RANLIB=@RANLIB@
diff --git a/package/busybox/patches/000-autoconf.patch b/package/busybox/patches/000-autoconf.patch
index 038d240c87cf6ec9704a613f2ad0248937f1c705..a4ca20d2c2e4f56d9c62eeef620d02d63bae3521 100644
--- a/package/busybox/patches/000-autoconf.patch
+++ b/package/busybox/patches/000-autoconf.patch
@@ -1,6 +1,7 @@
-diff -ur busybox.old/applets/Kbuild busybox.dev/applets/Kbuild
---- busybox.old/applets/Kbuild 2007-04-25 15:25:30.000000000 -0700
-+++ busybox.dev/applets/Kbuild 2007-04-25 15:25:11.000000000 -0700
+Index: busybox-1.4.2/applets/Kbuild
+===================================================================
+--- busybox-1.4.2.orig/applets/Kbuild 2007-06-04 13:21:32.429046704 +0200
++++ busybox-1.4.2/applets/Kbuild 2007-06-04 13:21:32.495036672 +0200
@@ -10,7 +10,7 @@
# Generated file needs additional love
diff --git a/package/busybox/patches/110-wget_getopt_fix.patch b/package/busybox/patches/110-wget_getopt_fix.patch
index 8536fced816e001e5aae3d87f39140c0bfa78c3d..fd530df9d3872e230a7dc3b86e6186d1e3af2134 100644
--- a/package/busybox/patches/110-wget_getopt_fix.patch
+++ b/package/busybox/patches/110-wget_getopt_fix.patch
@@ -1,6 +1,7 @@
-diff -ur busybox.old/networking/wget.c busybox.dev/networking/wget.c
---- busybox.old/networking/wget.c 2007-01-27 15:44:02.235530528 +0100
-+++ busybox.dev/networking/wget.c 2007-01-27 15:53:26.549741728 +0100
+Index: busybox-1.4.2/networking/wget.c
+===================================================================
+--- busybox-1.4.2.orig/networking/wget.c 2007-06-04 13:21:32.408049896 +0200
++++ busybox-1.4.2/networking/wget.c 2007-06-04 13:21:32.681008400 +0200
@@ -136,7 +136,7 @@
{ "directory-prefix", required_argument, NULL, 'P' },
{ "proxy", required_argument, NULL, 'Y' },
@@ -10,4 +11,3 @@ diff -ur busybox.old/networking/wget.c busybox.dev/networking/wget.c
{ "header", required_argument, NULL, 0xfe },
{ 0, 0, 0, 0 }
};
-Only in busybox.dev/networking: .wget.c.swp
diff --git a/package/busybox/patches/130-drop_werror.patch b/package/busybox/patches/130-drop_werror.patch
index c8269e1f2a610bc645646659677a26fa20e3fc6d..cd3a67b5d80449c9f65c4c1a4bd29e1cf78a422b 100644
--- a/package/busybox/patches/130-drop_werror.patch
+++ b/package/busybox/patches/130-drop_werror.patch
@@ -1,6 +1,7 @@
-diff -ur busybox.old/Makefile.flags busybox.dev/Makefile.flags
---- busybox.old/Makefile.flags 2006-12-27 05:57:07.000000000 +0100
-+++ busybox.dev/Makefile.flags 2007-01-06 19:53:01.000000000 +0100
+Index: busybox-1.4.2/Makefile.flags
+===================================================================
+--- busybox-1.4.2.orig/Makefile.flags 2007-06-04 13:21:32.387053088 +0200
++++ busybox-1.4.2/Makefile.flags 2007-06-04 13:21:32.871979368 +0200
@@ -16,7 +16,7 @@
-D"BB_VER=KBUILD_STR($(BB_VER))" -DBB_BT=AUTOCONF_TIMESTAMP
diff --git a/package/busybox/patches/140-trylink_bash.patch b/package/busybox/patches/140-trylink_bash.patch
index f5e0b7b91c9f2869ea28f7bdd25243b520579e53..67da20d7349872ce2bf2593d1d5b8a335d8f54c8 100644
--- a/package/busybox/patches/140-trylink_bash.patch
+++ b/package/busybox/patches/140-trylink_bash.patch
@@ -1,6 +1,7 @@
-diff -ruN busybox-1.3.1-old/scripts/trylink busybox-1.3.1-new/scripts/trylink
---- busybox-1.3.1-old/scripts/trylink 2006-12-27 05:53:24.000000000 +0100
-+++ busybox-1.3.1-new/scripts/trylink 2007-01-01 21:01:08.000000000 +0100
+Index: busybox-1.4.2/scripts/trylink
+===================================================================
+--- busybox-1.4.2.orig/scripts/trylink 2007-06-04 13:21:32.367056128 +0200
++++ busybox-1.4.2/scripts/trylink 2007-06-04 13:21:33.052951856 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
diff --git a/package/busybox/patches/200-etc_crontabs.patch b/package/busybox/patches/200-etc_crontabs.patch
index 5ec01c1eb0a54edc839e6cf48436d58f3145765a..49b7882acdd340c8d636f989ebb71a08533d51d3 100644
--- a/package/busybox/patches/200-etc_crontabs.patch
+++ b/package/busybox/patches/200-etc_crontabs.patch
@@ -1,7 +1,8 @@
-diff -urN busybox.old/miscutils/crond.c busybox.dev/miscutils/crond.c
---- busybox.old/miscutils/crond.c 2004-04-14 19:51:21.000000000 +0200
-+++ busybox.dev/miscutils/crond.c 2005-12-11 22:54:07.878256250 +0100
-@@ -36,7 +36,7 @@
+Index: busybox-1.4.2/miscutils/crond.c
+===================================================================
+--- busybox-1.4.2.orig/miscutils/crond.c 2007-06-04 13:21:32.339060384 +0200
++++ busybox-1.4.2/miscutils/crond.c 2007-06-04 13:21:33.235924040 +0200
+@@ -18,7 +18,7 @@
#define arysize(ary) (sizeof(ary)/sizeof((ary)[0]))
#ifndef CRONTABS
@@ -10,11 +11,12 @@ diff -urN busybox.old/miscutils/crond.c busybox.dev/miscutils/crond.c
#endif
#ifndef TMPDIR
#define TMPDIR "/var/spool/cron"
-diff -urN busybox.old/miscutils/crontab.c busybox.dev/miscutils/crontab.c
---- busybox.old/miscutils/crontab.c 2004-04-14 19:51:21.000000000 +0200
-+++ busybox.dev/miscutils/crontab.c 2005-12-11 22:54:28.647554250 +0100
-@@ -28,7 +28,7 @@
- #include <sys/resource.h>
+Index: busybox-1.4.2/miscutils/crontab.c
+===================================================================
+--- busybox-1.4.2.orig/miscutils/crontab.c 2007-06-04 13:21:32.346059320 +0200
++++ busybox-1.4.2/miscutils/crontab.c 2007-06-04 13:21:33.236923888 +0200
+@@ -13,7 +13,7 @@
+ #include "busybox.h"
#ifndef CRONTABS
-#define CRONTABS "/var/spool/cron/crontabs"
diff --git a/package/busybox/patches/240-udhcpc_retries.patch b/package/busybox/patches/240-udhcpc_retries.patch
index 3142eac6e1d0f2295e2ef5455cf9821ccd2f0198..4f15c42c64e76b4e7e705754ff5f77af3fcc2cff 100644
--- a/package/busybox/patches/240-udhcpc_retries.patch
+++ b/package/busybox/patches/240-udhcpc_retries.patch
@@ -1,7 +1,8 @@
-diff -ur busybox.old/networking/udhcp/dhcpc.c busybox.dev/networking/udhcp/dhcpc.c
---- busybox.old/networking/udhcp/dhcpc.c 2006-11-10 00:17:26.000000000 +0100
-+++ busybox.dev/networking/udhcp/dhcpc.c 2006-11-10 00:17:10.000000000 +0100
-@@ -330,7 +330,7 @@
+Index: busybox-1.4.2/networking/udhcp/dhcpc.c
+===================================================================
+--- busybox-1.4.2.orig/networking/udhcp/dhcpc.c 2007-06-04 13:21:32.319063424 +0200
++++ busybox-1.4.2/networking/udhcp/dhcpc.c 2007-06-04 13:21:33.430894400 +0200
+@@ -291,7 +291,7 @@
/* timeout dropped to zero */
switch (state) {
case INIT_SELECTING:
@@ -10,7 +11,7 @@ diff -ur busybox.old/networking/udhcp/dhcpc.c busybox.dev/networking/udhcp/dhcpc
if (packet_num == 0)
xid = random_xid();
-@@ -355,7 +355,7 @@
+@@ -316,7 +316,7 @@
break;
case RENEW_REQUESTED:
case REQUESTING:
diff --git a/package/busybox/patches/241-udhcpc-oversized_packets.patch b/package/busybox/patches/241-udhcpc-oversized_packets.patch
index d324d752d874f6301e36e868dcf3034d2a211802..e10bb8389c4c0b55ed6ac9042de3ef68f930a81f 100644
--- a/package/busybox/patches/241-udhcpc-oversized_packets.patch
+++ b/package/busybox/patches/241-udhcpc-oversized_packets.patch
@@ -1,6 +1,7 @@
-diff -ruN busybox-1.3.1-old/networking/udhcp/packet.c busybox-1.3.1/networking/udhcp/packet.c
---- busybox-1.3.1-old/networking/udhcp/packet.c 2006-12-27 05:52:33.000000000 +0100
-+++ busybox-1.3.1/networking/udhcp/packet.c 2006-12-28 05:38:36.000000000 +0100
+Index: busybox-1.4.2/networking/udhcp/packet.c
+===================================================================
+--- busybox-1.4.2.orig/networking/udhcp/packet.c 2007-06-04 13:21:32.289067984 +0200
++++ busybox-1.4.2/networking/udhcp/packet.c 2007-06-04 13:21:33.619865672 +0200
@@ -107,6 +107,10 @@
return ~sum;
}
@@ -64,10 +65,11 @@ diff -ruN busybox-1.3.1-old/networking/udhcp/packet.c busybox-1.3.1/networking/u
close(fd);
return result;
}
-diff -ruN busybox-1.3.1-old/networking/udhcp/common.h busybox-1.3.1/networking/udhcp/common.h
---- busybox-1.3.1-old/networking/udhcp/common.h 2006-12-27 05:52:33.000000000 +0100
-+++ busybox-1.3.1/networking/udhcp/common.h 2006-12-28 05:17:06.000000000 +0100
-@@ -26,6 +26,8 @@
+Index: busybox-1.4.2/networking/udhcp/common.h
+===================================================================
+--- busybox-1.4.2.orig/networking/udhcp/common.h 2007-06-04 13:21:32.297066768 +0200
++++ busybox-1.4.2/networking/udhcp/common.h 2007-06-04 13:21:33.620865520 +0200
+@@ -22,6 +22,8 @@
#include <netinet/udp.h>
#include <netinet/ip.h>
@@ -76,7 +78,7 @@ diff -ruN busybox-1.3.1-old/networking/udhcp/common.h busybox-1.3.1/networking/u
struct dhcpMessage {
uint8_t op;
uint8_t htype;
-@@ -42,7 +44,7 @@
+@@ -38,7 +40,7 @@
uint8_t sname[64];
uint8_t file[128];
uint32_t cookie;
diff --git a/package/busybox/patches/242-udhcpc_msgs.patch b/package/busybox/patches/242-udhcpc_msgs.patch
index e8bdfeb13800e27ec1f1bc3b8d0d50ccdc8a67cc..4ec99afca6790e12209b1c0015b7df8a25f1751e 100644
--- a/package/busybox/patches/242-udhcpc_msgs.patch
+++ b/package/busybox/patches/242-udhcpc_msgs.patch
@@ -1,6 +1,7 @@
-diff -ur busybox.old/networking/udhcp/clientpacket.c busybox.dev/networking/udhcp/clientpacket.c
---- busybox.old/networking/udhcp/clientpacket.c 2007-03-18 17:59:24.000000000 +0100
-+++ busybox.dev/networking/udhcp/clientpacket.c 2007-05-14 16:03:26.698979472 +0200
+Index: busybox-1.4.2/networking/udhcp/clientpacket.c
+===================================================================
+--- busybox-1.4.2.orig/networking/udhcp/clientpacket.c 2007-06-04 13:21:32.270070872 +0200
++++ busybox-1.4.2/networking/udhcp/clientpacket.c 2007-06-04 13:21:33.813836184 +0200
@@ -78,6 +78,7 @@
int send_discover(unsigned long xid, unsigned long requested)
{
diff --git a/package/busybox/patches/250-ash_export-n.patch b/package/busybox/patches/250-ash_export-n.patch
index 9823afeaf5f148ac8f5f1e1b7f0dc749cac5da0e..b5a8794f5a66e9564f3938fbfaa76c0122d7a14e 100644
--- a/package/busybox/patches/250-ash_export-n.patch
+++ b/package/busybox/patches/250-ash_export-n.patch
@@ -1,6 +1,8 @@
---- busybox.old/shell/ash.c 2006-11-22 12:02:03.000000000 -0800
-+++ busybox.dev/shell/ash.c 2006-11-22 11:05:32.000000000 -0800
-@@ -12257,9 +12257,18 @@
+Index: busybox-1.4.2/shell/ash.c
+===================================================================
+--- busybox-1.4.2.orig/shell/ash.c 2007-06-04 13:21:32.248074216 +0200
++++ busybox-1.4.2/shell/ash.c 2007-06-04 13:21:34.000807760 +0200
+@@ -12237,9 +12237,18 @@
const char *p;
char **aptr;
int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT;
@@ -20,7 +22,7 @@
if (notp && ((name = *(aptr = argptr)))) {
do {
if ((p = strchr(name, '=')) != NULL) {
-@@ -12267,10 +12276,11 @@
+@@ -12247,10 +12256,11 @@
} else {
if ((vp = *findvar(hashvar(name), name))) {
vp->flags |= flag;
diff --git a/package/busybox/patches/300-netmsg.patch b/package/busybox/patches/300-netmsg.patch
index e51a8bb78b8e587411126633d579b8126a306d8e..a400bb0515fd41a2ecf5baf47fb03edc0629bf88 100644
--- a/package/busybox/patches/300-netmsg.patch
+++ b/package/busybox/patches/300-netmsg.patch
@@ -1,7 +1,8 @@
-diff -ruN busybox-1.3.1-old/include/applets.h busybox-1.3.1-new/include/applets.h
---- busybox-1.3.1-old/include/applets.h 2006-12-27 05:56:18.000000000 +0100
-+++ busybox-1.3.1-new/include/applets.h 2006-12-28 07:25:35.000000000 +0100
-@@ -211,6 +211,7 @@
+Index: busybox-1.4.2/include/applets.h
+===================================================================
+--- busybox-1.4.2.orig/include/applets.h 2007-06-04 13:21:32.210079992 +0200
++++ busybox-1.4.2/include/applets.h 2007-06-04 13:21:34.188779184 +0200
+@@ -209,6 +209,7 @@
USE_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
@@ -9,10 +10,11 @@ diff -ruN busybox-1.3.1-old/include/applets.h busybox-1.3.1-new/include/applets.
USE_NETSTAT(APPLET(netstat, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
-diff -ruN busybox-1.3.1-old/networking/Config.in busybox-1.3.1-new/networking/Config.in
---- busybox-1.3.1-old/networking/Config.in 2006-12-27 05:52:39.000000000 +0100
-+++ busybox-1.3.1-new/networking/Config.in 2006-12-28 07:25:35.000000000 +0100
-@@ -452,6 +452,12 @@
+Index: busybox-1.4.2/networking/Config.in
+===================================================================
+--- busybox-1.4.2.orig/networking/Config.in 2007-06-04 13:21:32.216079080 +0200
++++ busybox-1.4.2/networking/Config.in 2007-06-04 13:21:34.188779184 +0200
+@@ -458,6 +458,12 @@
help
A simple Unix utility which reads and writes data across network
connections.
@@ -25,10 +27,11 @@ diff -ruN busybox-1.3.1-old/networking/Config.in busybox-1.3.1-new/networking/Co
config NC_SERVER
bool "Netcat server options (-lp)"
-diff -ruN busybox-1.3.1-old/networking/Kbuild busybox-1.3.1-new/networking/Kbuild
---- busybox-1.3.1-old/networking/Kbuild 2006-12-27 05:52:39.000000000 +0100
-+++ busybox-1.3.1-new/networking/Kbuild 2006-12-28 07:28:29.000000000 +0100
-@@ -25,6 +25,7 @@
+Index: busybox-1.4.2/networking/Kbuild
+===================================================================
+--- busybox-1.4.2.orig/networking/Kbuild 2007-06-04 13:21:32.221078320 +0200
++++ busybox-1.4.2/networking/Kbuild 2007-06-04 13:21:34.188779184 +0200
+@@ -27,6 +27,7 @@
lib-$(CONFIG_IPTUNNEL) += iptunnel.o
lib-$(CONFIG_NAMEIF) += nameif.o
lib-$(CONFIG_NC) += nc.o
@@ -36,9 +39,10 @@ diff -ruN busybox-1.3.1-old/networking/Kbuild busybox-1.3.1-new/networking/Kbuil
lib-$(CONFIG_NETSTAT) += netstat.o
lib-$(CONFIG_NSLOOKUP) += nslookup.o
lib-$(CONFIG_PING) += ping.o
-diff -ruN busybox-1.3.1-old/networking/netmsg.c busybox-1.3.1-new/networking/netmsg.c
---- busybox-1.3.1-old/networking/netmsg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.3.1-new/networking/netmsg.c 2006-12-28 07:25:52.000000000 +0100
+Index: busybox-1.4.2/networking/netmsg.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/networking/netmsg.c 2007-06-04 13:21:34.188779184 +0200
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
diff --git a/package/busybox/patches/310-passwd_access.patch b/package/busybox/patches/310-passwd_access.patch
index b6a06cfd7cb6ee4a57c842557f61deb47bc72165..22e6abcb01fcfbda1d3a9f68c857a11e4751db36 100644
--- a/package/busybox/patches/310-passwd_access.patch
+++ b/package/busybox/patches/310-passwd_access.patch
@@ -1,10 +1,11 @@
Copyright (C) 2006 OpenWrt.org
-diff -ruN busybox-1.3.1-old/networking/httpd.c busybox-1.3.1/networking/httpd.c
---- busybox-1.3.1-old/networking/httpd.c 2006-12-28 18:17:23.000000000 +0100
-+++ busybox-1.3.1/networking/httpd.c 2006-12-28 19:56:34.000000000 +0100
-@@ -1381,12 +1381,26 @@
+Index: busybox-1.4.2/networking/httpd.c
+===================================================================
+--- busybox-1.4.2.orig/networking/httpd.c 2007-06-04 13:21:32.190083032 +0200
++++ busybox-1.4.2/networking/httpd.c 2007-06-04 13:21:34.401746808 +0200
+@@ -1402,12 +1402,26 @@
if (ENABLE_FEATURE_HTTPD_AUTH_MD5) {
char *cipher;
char *pp;
@@ -31,7 +32,7 @@ diff -ruN busybox-1.3.1-old/networking/httpd.c busybox-1.3.1/networking/httpd.c
if (pp && pp[1] == '$' && pp[2] == '1' &&
pp[3] == '$' && pp[4]) {
pp++;
-@@ -1396,6 +1410,10 @@
+@@ -1417,6 +1431,10 @@
/* unauthorized */
continue;
}
diff --git a/package/busybox/patches/330-httpd_user_agent.patch b/package/busybox/patches/330-httpd_user_agent.patch
index 316604eaff50d16bf1d8b7bc9f601fca1463aae2..d9fa874af5c8cfca4f9970a43c2d863f9480a182 100644
--- a/package/busybox/patches/330-httpd_user_agent.patch
+++ b/package/busybox/patches/330-httpd_user_agent.patch
@@ -1,6 +1,7 @@
-diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c
---- busybox.old/networking/httpd.c 2007-01-19 22:22:59.000000000 +0100
-+++ busybox.dev/networking/httpd.c 2007-01-22 13:09:03.000000000 +0100
+Index: busybox-1.4.2/networking/httpd.c
+===================================================================
+--- busybox-1.4.2.orig/networking/httpd.c 2007-06-04 13:21:34.401746808 +0200
++++ busybox-1.4.2/networking/httpd.c 2007-06-04 13:21:34.588718384 +0200
@@ -137,6 +137,7 @@
const char *query;
@@ -17,7 +18,7 @@ diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c
#if ENABLE_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
setenv_long("REMOTE_PORT", config->port);
#endif
-@@ -1629,6 +1631,8 @@
+@@ -1647,6 +1649,8 @@
content_type = strdup(skip_whitespace(buf + sizeof("Content-Type:")-1));
} else if ((STRNCASECMP(buf, "Referer:") == 0)) {
config->referer = strdup(skip_whitespace(buf + sizeof("Referer:")-1));
diff --git a/package/busybox/patches/340-lock_util.patch b/package/busybox/patches/340-lock_util.patch
index c1197e24e14ef6287226b49080508a5231223eb5..5bce455d75b76a971c5e54023a4ab36e0ac8d23c 100644
--- a/package/busybox/patches/340-lock_util.patch
+++ b/package/busybox/patches/340-lock_util.patch
@@ -1,7 +1,8 @@
-diff -ruN busybox-1.3.1-old/include/applets.h busybox-1.3.1/include/applets.h
---- busybox-1.3.1-old/include/applets.h 2006-12-28 07:43:24.000000000 +0100
-+++ busybox-1.3.1/include/applets.h 2006-12-28 03:11:36.000000000 +0100
-@@ -180,6 +180,7 @@
+Index: busybox-1.4.2/include/applets.h
+===================================================================
+--- busybox-1.4.2.orig/include/applets.h 2007-06-04 13:21:34.188779184 +0200
++++ busybox-1.4.2/include/applets.h 2007-06-04 13:21:34.786688288 +0200
+@@ -178,6 +178,7 @@
USE_LN(APPLET(ln, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER))
@@ -9,10 +10,11 @@ diff -ruN busybox-1.3.1-old/include/applets.h busybox-1.3.1/include/applets.h
USE_LOGGER(APPLET(logger, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_LOGIN(APPLET(login, _BB_DIR_BIN, _BB_SUID_ALWAYS))
USE_LOGNAME(APPLET(logname, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
-diff -ruN busybox-1.3.1-old/miscutils/Config.in busybox-1.3.1/miscutils/Config.in
---- busybox-1.3.1-old/miscutils/Config.in 2006-12-27 05:56:09.000000000 +0100
-+++ busybox-1.3.1/miscutils/Config.in 2006-12-28 03:14:16.000000000 +0100
-@@ -232,6 +232,12 @@
+Index: busybox-1.4.2/miscutils/Config.in
+===================================================================
+--- busybox-1.4.2.orig/miscutils/Config.in 2007-06-04 13:21:32.136091240 +0200
++++ busybox-1.4.2/miscutils/Config.in 2007-06-04 13:21:34.786688288 +0200
+@@ -237,6 +237,12 @@
Enables the 'hdparm -d' option to get/set using_dma flag.
This is dangerous stuff, so you should probably say N.
@@ -25,9 +27,10 @@ diff -ruN busybox-1.3.1-old/miscutils/Config.in busybox-1.3.1/miscutils/Config.i
config MAKEDEVS
bool "makedevs"
default n
-diff -ruN busybox-1.3.1-old/miscutils/Kbuild busybox-1.3.1/miscutils/Kbuild
---- busybox-1.3.1-old/miscutils/Kbuild 2006-12-27 05:56:09.000000000 +0100
-+++ busybox-1.3.1/miscutils/Kbuild 2006-12-28 03:15:47.000000000 +0100
+Index: busybox-1.4.2/miscutils/Kbuild
+===================================================================
+--- busybox-1.4.2.orig/miscutils/Kbuild 2007-06-04 13:21:32.142090328 +0200
++++ busybox-1.4.2/miscutils/Kbuild 2007-06-04 13:21:34.786688288 +0200
@@ -15,6 +15,7 @@
lib-$(CONFIG_HDPARM) += hdparm.o
lib-$(CONFIG_LAST) += last.o
@@ -36,9 +39,10 @@ diff -ruN busybox-1.3.1-old/miscutils/Kbuild busybox-1.3.1/miscutils/Kbuild
lib-$(CONFIG_MAKEDEVS) += makedevs.o
lib-$(CONFIG_MOUNTPOINT) += mountpoint.o
lib-$(CONFIG_MT) += mt.o
-diff -ruN busybox-1.3.1-old/miscutils/lock.c busybox-1.3.1/miscutils/lock.c
---- busybox-1.3.1-old/miscutils/lock.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.3.1/miscutils/lock.c 2006-12-28 03:11:36.000000000 +0100
+Index: busybox-1.4.2/miscutils/lock.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/miscutils/lock.c 2007-06-04 13:21:34.787688136 +0200
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
diff --git a/package/busybox/patches/350-httpd_redir.patch b/package/busybox/patches/350-httpd_redir.patch
index 86338aaedfde70f26b17b98f7d2861baa9d4497e..d8f430b89daab5c77aaf95e560aeab30e095374d 100644
--- a/package/busybox/patches/350-httpd_redir.patch
+++ b/package/busybox/patches/350-httpd_redir.patch
@@ -1,7 +1,8 @@
-diff -ur bb.old/include/usage.h bb.dev/include/usage.h
---- bb.old/include/usage.h 2007-03-29 13:25:55.080325000 +0200
-+++ bb.dev/include/usage.h 2007-03-29 13:31:04.241326192 +0200
-@@ -1333,7 +1333,8 @@
+Index: busybox-1.4.2/include/usage.h
+===================================================================
+--- busybox-1.4.2.orig/include/usage.h 2007-06-04 13:21:32.103096256 +0200
++++ busybox-1.4.2/include/usage.h 2007-06-04 13:21:35.005655000 +0200
+@@ -1257,7 +1257,8 @@
USE_FEATURE_HTTPD_BASIC_AUTH(" [-r <realm>]") \
USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \
" [-h home]" \
@@ -11,7 +12,7 @@ diff -ur bb.old/include/usage.h bb.dev/include/usage.h
#define httpd_full_usage \
"Listen for incoming http server requests" \
"\n\nOptions:\n" \
-@@ -1349,7 +1350,9 @@
+@@ -1273,7 +1274,9 @@
" -m PASS Crypt PASS with md5 algorithm\n") \
" -h HOME Specifies http HOME directory (default ./)\n" \
" -e STRING HTML encode STRING\n" \
@@ -22,10 +23,11 @@ diff -ur bb.old/include/usage.h bb.dev/include/usage.h
#define hwclock_trivial_usage \
"[-r|--show] [-s|--hctosys] [-w|--systohc] [-l|--localtime] [-u|--utc]"
-diff -ur bb.old/networking/httpd.c bb.dev/networking/httpd.c
---- bb.old/networking/httpd.c 2007-03-29 13:25:55.016335000 +0200
-+++ bb.dev/networking/httpd.c 2007-03-29 13:40:05.353064704 +0200
-@@ -141,6 +141,8 @@
+Index: busybox-1.4.2/networking/httpd.c
+===================================================================
+--- busybox-1.4.2.orig/networking/httpd.c 2007-06-04 13:21:34.588718384 +0200
++++ busybox-1.4.2/networking/httpd.c 2007-06-04 13:21:35.006654848 +0200
+@@ -140,6 +140,8 @@
USE_FEATURE_HTTPD_CGI(char *user_agent;)
const char *configFile;
@@ -34,7 +36,7 @@ diff -ur bb.old/networking/httpd.c bb.dev/networking/httpd.c
unsigned int rmt_ip;
#if ENABLE_FEATURE_HTTPD_CGI || DEBUG
-@@ -881,8 +883,11 @@
+@@ -880,8 +882,11 @@
}
#endif
if (responseNum == HTTP_MOVED_TEMPORARILY) {
@@ -47,7 +49,7 @@ diff -ur bb.old/networking/httpd.c bb.dev/networking/httpd.c
(config->query ? "?" : ""),
(config->query ? config->query : ""));
}
-@@ -1598,8 +1603,12 @@
+@@ -1594,8 +1599,12 @@
*++purl = '\0'; /* so keep last character */
test = purl; /* end ptr */
@@ -61,7 +63,7 @@ diff -ur bb.old/networking/httpd.c bb.dev/networking/httpd.c
if (is_directory(url + 1, 1, &sb)) {
config->found_moved_temporarily = url;
}
-@@ -1901,7 +1910,9 @@
+@@ -1897,7 +1906,9 @@
#endif
enum {
@@ -72,7 +74,7 @@ diff -ur bb.old/networking/httpd.c bb.dev/networking/httpd.c
d_opt_decode_url,
h_opt_home_httpd,
USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)
-@@ -1923,7 +1934,7 @@
+@@ -1919,7 +1930,7 @@
OPT_FOREGROUND = 1 << p_opt_foreground,
};
@@ -81,7 +83,7 @@ diff -ur bb.old/networking/httpd.c bb.dev/networking/httpd.c
USE_FEATURE_HTTPD_ENCODE_URL_STR("e:")
USE_FEATURE_HTTPD_BASIC_AUTH("r:")
USE_FEATURE_HTTPD_AUTH_MD5("m:")
-@@ -1954,6 +1965,7 @@
+@@ -1951,6 +1962,7 @@
config->ContentLength = -1;
opt = getopt32(argc, argv, httpd_opts,
diff --git a/package/busybox/patches/400-revert_awk_getopt.patch b/package/busybox/patches/400-revert_awk_getopt.patch
index 9aa747bfca6f82278871a453b5f6f3c40ca8a904..d9c7cfb709b548a3a44dfd7ed4b15806f944169d 100644
--- a/package/busybox/patches/400-revert_awk_getopt.patch
+++ b/package/busybox/patches/400-revert_awk_getopt.patch
@@ -1,6 +1,7 @@
-diff -ur busybox.old/editors/awk.c busybox.dev/editors/awk.c
---- busybox.old/editors/awk.c 2007-01-19 22:23:12.000000000 +0100
-+++ busybox.dev/editors/awk.c 2007-01-26 20:09:45.000000000 +0100
+Index: busybox-1.4.2/editors/awk.c
+===================================================================
+--- busybox-1.4.2.orig/editors/awk.c 2007-06-04 13:21:32.083099296 +0200
++++ busybox-1.4.2/editors/awk.c 2007-06-04 13:21:35.202625056 +0200
@@ -2639,14 +2639,13 @@
int awk_main(int argc, char **argv)
diff --git a/package/busybox/patches/401-darwin_includes.patch b/package/busybox/patches/401-darwin_includes.patch
index a5602d9518a73f6841581ad18a0189a3fea291b2..f563e1086379488467fc41d0dc13ef4f7ffdbf36 100644
--- a/package/busybox/patches/401-darwin_includes.patch
+++ b/package/busybox/patches/401-darwin_includes.patch
@@ -1,5 +1,7 @@
---- busybox-1.3.1/include/platform.h 2006-12-27 05:56:18.000000000 +0100
-+++ busybox-1.3.1.new/include/platform.h 2007-01-02 18:28:25.000000000 +0100
+Index: busybox-1.4.2/include/platform.h
+===================================================================
+--- busybox-1.4.2.orig/include/platform.h 2007-06-04 13:21:32.055103552 +0200
++++ busybox-1.4.2/include/platform.h 2007-06-04 13:21:35.387596936 +0200
@@ -128,9 +128,11 @@
# include <netinet/in.h>
#endif
@@ -11,8 +13,8 @@
+#endif
/* ---- Compiler dependent settings ------------------------- */
- #ifndef __GNUC__
-@@ -168,7 +170,7 @@
+ #if (defined __digital__ && defined __unix__)
+@@ -161,7 +163,7 @@
#define HAVE_STDINT_H
#else
/* Largest integral types. */
@@ -21,8 +23,10 @@
typedef long int intmax_t;
typedef unsigned long int uintmax_t;
#else
---- busybox-1.3.1/include/libbb.h 2006-12-27 05:56:18.000000000 +0100
-+++ busybox-1.3.1.new/include/libbb.h 2007-01-02 18:29:13.000000000 +0100
+Index: busybox-1.4.2/include/libbb.h
+===================================================================
+--- busybox-1.4.2.orig/include/libbb.h 2007-06-04 13:21:32.062102488 +0200
++++ busybox-1.4.2/include/libbb.h 2007-06-04 13:21:35.388596784 +0200
@@ -17,7 +17,9 @@
#include <errno.h>
#include <fcntl.h>
diff --git a/package/busybox/patches/410-httpd_cgi_headers.patch b/package/busybox/patches/410-httpd_cgi_headers.patch
index b0f56364382ec883f93d88fd7d2b79df095c9ff4..98f094ee580a83e26bd5f2c0a1456dde94e26bcd 100644
--- a/package/busybox/patches/410-httpd_cgi_headers.patch
+++ b/package/busybox/patches/410-httpd_cgi_headers.patch
@@ -1,7 +1,8 @@
-diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c
---- busybox.old/networking/httpd.c 2007-01-19 22:22:59.000000000 +0100
-+++ busybox.dev/networking/httpd.c 2007-02-10 16:36:50.950661760 +0100
-@@ -1224,7 +1224,7 @@
+Index: busybox-1.4.2/networking/httpd.c
+===================================================================
+--- busybox-1.4.2.orig/networking/httpd.c 2007-06-04 13:21:35.006654848 +0200
++++ busybox-1.4.2/networking/httpd.c 2007-06-04 13:21:35.585566840 +0200
+@@ -1231,7 +1231,7 @@
* "chopped up into small chunks" syndrome here */
rbuf[count] = '\0';
/* check to see if the user script added headers */
@@ -10,7 +11,7 @@ diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c
if (memcmp(rbuf, HTTP_200, 4) != 0) {
/* there is no "HTTP", do it ourself */
full_write(s, HTTP_200, sizeof(HTTP_200)-1);
-@@ -1235,9 +1235,9 @@
+@@ -1242,9 +1242,9 @@
* echo -en "Location: http://www.busybox.net\r\n"
* echo -en "\r\n"
*/
diff --git a/package/busybox/patches/420-httpd_sendcgi_fix.patch b/package/busybox/patches/420-httpd_sendcgi_fix.patch
index f2ed2f3e86ab489dbdb84d90774b9d670194755a..9998cc2455836fa39ea371c0a0d48255bc3a50f5 100644
--- a/package/busybox/patches/420-httpd_sendcgi_fix.patch
+++ b/package/busybox/patches/420-httpd_sendcgi_fix.patch
@@ -1,7 +1,8 @@
-diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c
---- busybox.old/networking/httpd.c 2007-02-10 16:36:50.950661000 +0100
-+++ busybox.dev/networking/httpd.c 2007-02-11 21:24:52.026742384 +0100
-@@ -1211,9 +1211,10 @@
+Index: busybox-1.4.2/networking/httpd.c
+===================================================================
+--- busybox-1.4.2.orig/networking/httpd.c 2007-06-04 13:21:35.585566840 +0200
++++ busybox-1.4.2/networking/httpd.c 2007-06-04 13:21:35.775537960 +0200
+@@ -1218,9 +1218,10 @@
#if PIPESIZE >= MAX_MEMORY_BUFF
# error "PIPESIZE >= MAX_MEMORY_BUFF"
#endif
diff --git a/package/busybox/patches/430-uniq_memleak.patch b/package/busybox/patches/430-uniq_memleak.patch
index 10f464bd144b7132e83d3d03e5c5d1a3dae78c87..d43806f518866cea9fc9c87d70bd55cfe223c4eb 100644
--- a/package/busybox/patches/430-uniq_memleak.patch
+++ b/package/busybox/patches/430-uniq_memleak.patch
@@ -1,6 +1,7 @@
-diff -ur bb.old/coreutils/uniq.c bb.dev/coreutils/uniq.c
---- bb.old/coreutils/uniq.c 2007-01-24 22:34:43.000000000 +0100
-+++ bb.dev/coreutils/uniq.c 2007-02-16 20:04:19.245454368 +0100
+Index: busybox-1.4.2/coreutils/uniq.c
+===================================================================
+--- busybox-1.4.2.orig/coreutils/uniq.c 2007-06-04 13:21:31.993112976 +0200
++++ busybox-1.4.2/coreutils/uniq.c 2007-06-04 13:21:35.960509840 +0200
@@ -83,6 +83,8 @@
if (!s0 || strcmp(e0, e1)) {
diff --git a/package/busybox/patches/440-httpd_chdir.patch b/package/busybox/patches/440-httpd_chdir.patch
index fcd2689bf6091826050853834ce880a8835690d0..8ef70b84d3bd6a378f3b1f810d094ca7eb4d6279 100644
--- a/package/busybox/patches/440-httpd_chdir.patch
+++ b/package/busybox/patches/440-httpd_chdir.patch
@@ -1,6 +1,7 @@
-diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c
---- busybox.old/networking/httpd.c 2007-02-27 23:15:20.611300000 +0100
-+++ busybox.dev/networking/httpd.c 2007-02-27 23:18:10.022546112 +0100
+Index: busybox-1.4.2/networking/httpd.c
+===================================================================
+--- busybox-1.4.2.orig/networking/httpd.c 2007-06-04 13:21:35.775537960 +0200
++++ busybox-1.4.2/networking/httpd.c 2007-06-04 13:21:36.144481872 +0200
@@ -102,6 +102,7 @@
static const char default_path_httpd_conf[] = "/etc";
static const char httpd_conf[] = "httpd.conf";
@@ -9,7 +10,7 @@ diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c
#define TIMEOUT 60
-@@ -1500,6 +1501,8 @@
+@@ -1505,6 +1506,8 @@
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH
int credentials = -1; /* if not required this is Ok */
#endif
@@ -18,7 +19,7 @@ diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c
sa.sa_handler = handle_sigalrm;
sigemptyset(&sa.sa_mask);
-@@ -1931,7 +1934,6 @@
+@@ -1942,7 +1945,6 @@
int httpd_main(int argc, char *argv[])
{
unsigned opt;
diff --git a/package/busybox/patches/440-usage_compressed_fix.patch b/package/busybox/patches/440-usage_compressed_fix.patch
index 9bf4d4cda885f3f79b164d2bb2db8743e05c6449..c9e29cec00d731498afb68cfd65419bc1806cde5 100644
--- a/package/busybox/patches/440-usage_compressed_fix.patch
+++ b/package/busybox/patches/440-usage_compressed_fix.patch
@@ -1,6 +1,7 @@
-diff -urN busybox-1.4.1/applets/usage_compressed busybox-1.4.1.new/applets/usage_compressed
---- busybox-1.4.1/applets/usage_compressed 2007-01-24 22:34:50.000000000 +0100
-+++ busybox-1.4.1.new/applets/usage_compressed 2007-02-26 22:28:56.000000000 +0100
+Index: busybox-1.4.2/applets/usage_compressed
+===================================================================
+--- busybox-1.4.2.orig/applets/usage_compressed 2007-06-04 13:21:31.952119208 +0200
++++ busybox-1.4.2/applets/usage_compressed 2007-06-04 13:21:36.331453448 +0200
@@ -14,6 +14,6 @@
echo 'static const char packed_usage[] = '
diff --git a/package/busybox/patches/450-truncated_ping_results.patch b/package/busybox/patches/450-truncated_ping_results.patch
index f60a1a9c0277b302684fad861492f4416ad92062..34582c2ba9797cca6c029fcc1fd0728ce477522c 100644
--- a/package/busybox/patches/450-truncated_ping_results.patch
+++ b/package/busybox/patches/450-truncated_ping_results.patch
@@ -1,5 +1,7 @@
---- busybox-1.4.1/networking/ping.c 2007-01-24 22:34:34.000000000 +0100
-+++ busybox-1.4.1.new/networking/ping.c 2007-02-28 20:35:59.000000000 +0100
+Index: busybox-1.4.2/networking/ping.c
+===================================================================
+--- busybox-1.4.2.orig/networking/ping.c 2007-06-04 13:21:31.931122400 +0200
++++ busybox-1.4.2/networking/ping.c 2007-06-04 13:21:36.518425024 +0200
@@ -70,7 +70,7 @@
struct sockaddr_in pingaddr;
struct icmp *pkt;
diff --git a/package/busybox/patches/911-ipkg.patch b/package/busybox/patches/911-ipkg.patch
index 8f482ebc43d254b406ece3646a3c7963c215fb66..d96063b2335d8da1dc6f89806f4dff0f4fc533b4 100644
--- a/package/busybox/patches/911-ipkg.patch
+++ b/package/busybox/patches/911-ipkg.patch
@@ -1,6 +1,7 @@
-diff -urN busybox.old/archival/Config.in busybox.dev/archival/Config.in
---- busybox.old/archival/Config.in 2007-01-19 22:23:02.000000000 +0100
-+++ busybox.dev/archival/Config.in 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/Config.in
+===================================================================
+--- busybox-1.4.2.orig/archival/Config.in 2007-06-04 13:21:31.573176816 +0200
++++ busybox-1.4.2/archival/Config.in 2007-06-04 13:21:36.706396448 +0200
@@ -121,6 +121,14 @@
gzip is used to compress files.
It's probably the most widely used UNIX compression program.
@@ -16,9 +17,10 @@ diff -urN busybox.old/archival/Config.in busybox.dev/archival/Config.in
config RPM2CPIO
bool "rpm2cpio"
default n
-diff -urN busybox.old/archival/dpkg.c busybox.dev/archival/dpkg.c
---- busybox.old/archival/dpkg.c 2007-01-19 22:23:02.000000000 +0100
-+++ busybox.dev/archival/dpkg.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/dpkg.c
+===================================================================
+--- busybox-1.4.2.orig/archival/dpkg.c 2007-06-04 13:21:31.579175904 +0200
++++ busybox-1.4.2/archival/dpkg.c 2007-06-04 13:21:36.706396448 +0200
@@ -1463,6 +1463,10 @@
return ar_handle->sub_archive->buffer;
}
@@ -39,9 +41,10 @@ diff -urN busybox.old/archival/dpkg.c busybox.dev/archival/dpkg.c
static void unpack_package(deb_file_t *deb_file)
{
const char *package_name = name_hashtable[package_hashtable[deb_file->package]->name];
-diff -urN busybox.old/archival/ipkg.c busybox.dev/archival/ipkg.c
---- busybox.old/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/ipkg.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/ipkg.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/ipkg.c 2007-06-04 13:21:36.707396296 +0200
@@ -0,0 +1,26 @@
+/* ipkg.c - the itsy package management system
+
@@ -69,9 +72,10 @@ diff -urN busybox.old/archival/ipkg.c busybox.dev/archival/ipkg.c
+{
+ return ipkg_op(argc, argv);
+}
-diff -urN busybox.old/archival/Kbuild busybox.dev/archival/Kbuild
---- busybox.old/archival/Kbuild 2007-01-19 22:23:02.000000000 +0100
-+++ busybox.dev/archival/Kbuild 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/Kbuild
+===================================================================
+--- busybox-1.4.2.orig/archival/Kbuild 2007-06-04 13:21:31.588174536 +0200
++++ busybox-1.4.2/archival/Kbuild 2007-06-04 13:21:36.707396296 +0200
@@ -15,6 +15,7 @@
lib-$(CONFIG_DPKG_DEB) += dpkg_deb.o
lib-$(CONFIG_GUNZIP) += gunzip.o
@@ -80,9 +84,10 @@ diff -urN busybox.old/archival/Kbuild busybox.dev/archival/Kbuild
lib-$(CONFIG_RPM2CPIO) += rpm2cpio.o
lib-$(CONFIG_RPM) += rpm.o
lib-$(CONFIG_TAR) += tar.o
-diff -urN busybox.old/archival/libipkg/args.c busybox.dev/archival/libipkg/args.c
---- busybox.old/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/args.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/args.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/args.c 2007-06-04 13:21:36.707396296 +0200
@@ -0,0 +1,242 @@
+/* args.c - parse command-line args
+
@@ -326,9 +331,10 @@ diff -urN busybox.old/archival/libipkg/args.c busybox.dev/archival/libipkg/args.
+{
+ bb_error_msg("version %s\n", IPKG_VERSION);
+}
-diff -urN busybox.old/archival/libipkg/args.h busybox.dev/archival/libipkg/args.h
---- busybox.old/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/args.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/args.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/args.h 2007-06-04 13:21:36.707396296 +0200
@@ -0,0 +1,72 @@
+/* args.h - parse command-line args
+
@@ -402,9 +408,10 @@ diff -urN busybox.old/archival/libipkg/args.h busybox.dev/archival/libipkg/args.
+void args_usage(char *complaint);
+
+#endif
-diff -urN busybox.old/archival/libipkg/conffile.c busybox.dev/archival/libipkg/conffile.c
---- busybox.old/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/conffile.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/conffile.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/conffile.c 2007-06-04 13:21:36.708396144 +0200
@@ -0,0 +1,64 @@
+/* conffile.c - the itsy package management system
+
@@ -470,9 +477,10 @@ diff -urN busybox.old/archival/libipkg/conffile.c busybox.dev/archival/libipkg/c
+
+ return ret;
+}
-diff -urN busybox.old/archival/libipkg/conffile.h busybox.dev/archival/libipkg/conffile.h
---- busybox.old/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/conffile.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/conffile.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/conffile.h 2007-06-04 13:21:36.708396144 +0200
@@ -0,0 +1,30 @@
+/* conffile.h - the itsy package management system
+
@@ -504,9 +512,10 @@ diff -urN busybox.old/archival/libipkg/conffile.h busybox.dev/archival/libipkg/c
+
+#endif
+
-diff -urN busybox.old/archival/libipkg/conffile_list.c busybox.dev/archival/libipkg/conffile_list.c
---- busybox.old/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/conffile_list.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/conffile_list.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/conffile_list.c 2007-06-04 13:21:36.708396144 +0200
@@ -0,0 +1,47 @@
+/* conffile_list.c - the itsy package management system
+
@@ -555,9 +564,10 @@ diff -urN busybox.old/archival/libipkg/conffile_list.c busybox.dev/archival/libi
+ return nv_pair_list_pop(list);
+}
+
-diff -urN busybox.old/archival/libipkg/conffile_list.h busybox.dev/archival/libipkg/conffile_list.h
---- busybox.old/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/conffile_list.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/conffile_list.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/conffile_list.h 2007-06-04 13:21:36.708396144 +0200
@@ -0,0 +1,36 @@
+/* conffile_list.h - the itsy package management system
+
@@ -595,9 +605,10 @@ diff -urN busybox.old/archival/libipkg/conffile_list.h busybox.dev/archival/libi
+
+#endif
+
-diff -urN busybox.old/archival/libipkg/file_util.c busybox.dev/archival/libipkg/file_util.c
---- busybox.old/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/file_util.c 2007-01-22 14:00:52.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/file_util.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/file_util.c 2007-06-04 13:21:36.708396144 +0200
@@ -0,0 +1,132 @@
+/* file_util.c - convenience routines for common stat operations
+
@@ -731,9 +742,10 @@ diff -urN busybox.old/archival/libipkg/file_util.c busybox.dev/archival/libipkg/
+ return hash_file(file_name, HASH_MD5);
+}
+
-diff -urN busybox.old/archival/libipkg/file_util.h busybox.dev/archival/libipkg/file_util.h
---- busybox.old/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/file_util.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/file_util.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/file_util.h 2007-06-04 13:21:36.708396144 +0200
@@ -0,0 +1,29 @@
+/* file_util.h - convenience routines for common file operations
+
@@ -764,9 +776,10 @@ diff -urN busybox.old/archival/libipkg/file_util.h busybox.dev/archival/libipkg/
+char *file_md5sum_alloc(const char *file_name);
+
+#endif
-diff -urN busybox.old/archival/libipkg/hash_table.c busybox.dev/archival/libipkg/hash_table.c
---- busybox.old/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/hash_table.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/hash_table.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/hash_table.c 2007-06-04 13:21:36.709395992 +0200
@@ -0,0 +1,155 @@
+/* hash.c - hash tables for ipkg
+
@@ -923,9 +936,10 @@ diff -urN busybox.old/archival/libipkg/hash_table.c busybox.dev/archival/libipkg
+ }
+}
+
-diff -urN busybox.old/archival/libipkg/hash_table.h busybox.dev/archival/libipkg/hash_table.h
---- busybox.old/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/hash_table.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/hash_table.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/hash_table.h 2007-06-04 13:21:36.709395992 +0200
@@ -0,0 +1,44 @@
+/* hash.h - hash tables for ipkg
+
@@ -971,9 +985,10 @@ diff -urN busybox.old/archival/libipkg/hash_table.h busybox.dev/archival/libipkg
+void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data);
+
+#endif /* _HASH_TABLE_H_ */
-diff -urN busybox.old/archival/libipkg/ipkg_cmd.c busybox.dev/archival/libipkg/ipkg_cmd.c
---- busybox.old/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_cmd.c 2007-01-22 13:47:47.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_cmd.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_cmd.c 2007-06-04 13:21:36.710395840 +0200
@@ -0,0 +1,1431 @@
+/* ipkg_cmd.c - the itsy package management system
+
@@ -2406,9 +2421,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_cmd.c busybox.dev/archival/libipkg/i
+}
+
+
-diff -urN busybox.old/archival/libipkg/ipkg_cmd.h busybox.dev/archival/libipkg/ipkg_cmd.h
---- busybox.old/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_cmd.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_cmd.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_cmd.h 2007-06-04 13:21:36.710395840 +0200
@@ -0,0 +1,46 @@
+/* ipkg_cmd.h - the itsy package management system
+
@@ -2456,9 +2472,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_cmd.h busybox.dev/archival/libipkg/i
+int pkg_mark_provides(pkg_t *pkg);
+
+#endif
-diff -urN busybox.old/archival/libipkg/ipkg_conf.c busybox.dev/archival/libipkg/ipkg_conf.c
---- busybox.old/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_conf.c 2007-01-22 13:41:06.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_conf.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_conf.c 2007-06-04 13:21:36.711395688 +0200
@@ -0,0 +1,711 @@
+/* ipkg_conf.c - the itsy package management system
+
@@ -3171,9 +3188,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_conf.c busybox.dev/archival/libipkg/
+ sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
+ return root_filename;
+}
-diff -urN busybox.old/archival/libipkg/ipkg_conf.h busybox.dev/archival/libipkg/ipkg_conf.h
---- busybox.old/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_conf.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_conf.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_conf.h 2007-06-04 13:21:36.711395688 +0200
@@ -0,0 +1,107 @@
+/* ipkg_conf.h - the itsy package management system
+
@@ -3282,9 +3300,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_conf.h busybox.dev/archival/libipkg/
+char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
+
+#endif
-diff -urN busybox.old/archival/libipkg/ipkg_configure.c busybox.dev/archival/libipkg/ipkg_configure.c
---- busybox.old/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_configure.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_configure.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_configure.c 2007-06-04 13:21:36.712395536 +0200
@@ -0,0 +1,40 @@
+/* ipkg_configure.c - the itsy package management system
+
@@ -3326,9 +3345,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_configure.c busybox.dev/archival/lib
+ return 0;
+}
+
-diff -urN busybox.old/archival/libipkg/ipkg_configure.h busybox.dev/archival/libipkg/ipkg_configure.h
---- busybox.old/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_configure.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_configure.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_configure.h 2007-06-04 13:21:36.712395536 +0200
@@ -0,0 +1,25 @@
+/* ipkg_configure.h - the itsy package management system
+
@@ -3355,9 +3375,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_configure.h busybox.dev/archival/lib
+int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
+
+#endif
-diff -urN busybox.old/archival/libipkg/ipkg_download.c busybox.dev/archival/libipkg/ipkg_download.c
---- busybox.old/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_download.c 2007-01-22 13:41:06.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_download.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_download.c 2007-06-04 13:21:36.712395536 +0200
@@ -0,0 +1,195 @@
+/* ipkg_download.c - the itsy package management system
+
@@ -3554,9 +3575,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_download.c busybox.dev/archival/libi
+ }
+ return 0;
+}
-diff -urN busybox.old/archival/libipkg/ipkg_download.h busybox.dev/archival/libipkg/ipkg_download.h
---- busybox.old/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_download.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_download.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_download.h 2007-06-04 13:21:36.712395536 +0200
@@ -0,0 +1,30 @@
+/* ipkg_download.h - the itsy package management system
+
@@ -3588,9 +3610,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_download.h busybox.dev/archival/libi
+int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
+
+#endif
-diff -urN busybox.old/archival/libipkg/ipkg.h busybox.dev/archival/libipkg/ipkg.h
---- busybox.old/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg.h 2007-06-04 13:21:36.712395536 +0200
@@ -0,0 +1,74 @@
+/* ipkg.h - the itsy package management system
+
@@ -3666,9 +3689,10 @@ diff -urN busybox.old/archival/libipkg/ipkg.h busybox.dev/archival/libipkg/ipkg.
+extern ipkg_conf_t *global_conf;
+
+#endif
-diff -urN busybox.old/archival/libipkg/ipkg_includes.h busybox.dev/archival/libipkg/ipkg_includes.h
---- busybox.old/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_includes.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_includes.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_includes.h 2007-06-04 13:21:36.713395384 +0200
@@ -0,0 +1,79 @@
+#ifndef IPKG_INCLUDES_H
+#define IPKG_INCLUDES_H
@@ -3749,9 +3773,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_includes.h busybox.dev/archival/libi
+#endif
+
+#endif /* IPKG_INCLUDES_H */
-diff -urN busybox.old/archival/libipkg/ipkg_install.c busybox.dev/archival/libipkg/ipkg_install.c
---- busybox.old/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_install.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_install.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_install.c 2007-06-04 13:21:36.714395232 +0200
@@ -0,0 +1,1942 @@
+/* ipkg_install.c - the itsy package management system
+
@@ -5695,9 +5720,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_install.c busybox.dev/archival/libip
+}
+
+#endif
-diff -urN busybox.old/archival/libipkg/ipkg_install.h busybox.dev/archival/libipkg/ipkg_install.h
---- busybox.old/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_install.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_install.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_install.h 2007-06-04 13:21:36.715395080 +0200
@@ -0,0 +1,35 @@
+/* ipkg_install.h - the itsy package management system
+
@@ -5734,9 +5760,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_install.h busybox.dev/archival/libip
+int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed);
+
+#endif
-diff -urN busybox.old/archival/libipkg/ipkg_message.c busybox.dev/archival/libipkg/ipkg_message.c
---- busybox.old/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_message.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_message.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_message.c 2007-06-04 13:21:36.715395080 +0200
@@ -0,0 +1,61 @@
+/* ipkg_message.c - the itsy package management system
+
@@ -5799,9 +5826,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_message.c busybox.dev/archival/libip
+ }
+}
+#endif
-diff -urN busybox.old/archival/libipkg/ipkg_message.h busybox.dev/archival/libipkg/ipkg_message.h
---- busybox.old/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_message.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_message.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_message.h 2007-06-04 13:21:36.715395080 +0200
@@ -0,0 +1,32 @@
+/* ipkg_message.h - the itsy package management system
+
@@ -5835,9 +5863,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_message.h busybox.dev/archival/libip
+extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, char *fmt, ...);
+
+#endif /* _IPKG_MESSAGE_H_ */
-diff -urN busybox.old/archival/libipkg/ipkg_remove.c busybox.dev/archival/libipkg/ipkg_remove.c
---- busybox.old/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_remove.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_remove.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_remove.c 2007-06-04 13:21:36.716394928 +0200
@@ -0,0 +1,383 @@
+/* ipkg_remove.c - the itsy package management system
+
@@ -6222,9 +6251,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_remove.c busybox.dev/archival/libipk
+
+ return 0;
+}
-diff -urN busybox.old/archival/libipkg/ipkg_remove.h busybox.dev/archival/libipkg/ipkg_remove.h
---- busybox.old/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_remove.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_remove.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_remove.h 2007-06-04 13:21:36.716394928 +0200
@@ -0,0 +1,33 @@
+/* ipkg_remove.h - the itsy package management system
+
@@ -6259,9 +6289,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_remove.h busybox.dev/archival/libipk
+
+
+#endif
-diff -urN busybox.old/archival/libipkg/ipkg_upgrade.c busybox.dev/archival/libipkg/ipkg_upgrade.c
---- busybox.old/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_upgrade.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_upgrade.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_upgrade.c 2007-06-04 13:21:36.716394928 +0200
@@ -0,0 +1,77 @@
+/* ipkg_upgrade.c - the itsy package management system
+
@@ -6340,9 +6371,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_upgrade.c busybox.dev/archival/libip
+ new->state_flag |= SF_USER;
+ return ipkg_install_pkg(conf, new,1);
+}
-diff -urN busybox.old/archival/libipkg/ipkg_upgrade.h busybox.dev/archival/libipkg/ipkg_upgrade.h
---- busybox.old/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_upgrade.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_upgrade.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_upgrade.h 2007-06-04 13:21:36.716394928 +0200
@@ -0,0 +1,18 @@
+/* ipkg_upgrade.c - the itsy package management system
+
@@ -6362,9 +6394,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_upgrade.h busybox.dev/archival/libip
+#include "ipkg.h"
+
+int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
-diff -urN busybox.old/archival/libipkg/ipkg_utils.c busybox.dev/archival/libipkg/ipkg_utils.c
---- busybox.old/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_utils.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_utils.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_utils.c 2007-06-04 13:21:36.716394928 +0200
@@ -0,0 +1,181 @@
+/* ipkg_utils.c - the itsy package management system
+
@@ -6547,9 +6580,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_utils.c busybox.dev/archival/libipkg
+}
+
+
-diff -urN busybox.old/archival/libipkg/ipkg_utils.h busybox.dev/archival/libipkg/ipkg_utils.h
---- busybox.old/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/ipkg_utils.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/ipkg_utils.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/ipkg_utils.h 2007-06-04 13:21:36.717394776 +0200
@@ -0,0 +1,29 @@
+/* ipkg_utils.h - the itsy package management system
+
@@ -6580,9 +6614,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_utils.h busybox.dev/archival/libipkg
+int line_is_blank(const char *line);
+
+#endif
-diff -urN busybox.old/archival/libipkg/Kbuild busybox.dev/archival/libipkg/Kbuild
---- busybox.old/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/Kbuild 2007-01-22 14:01:06.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/Kbuild
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/Kbuild 2007-06-04 13:21:36.717394776 +0200
@@ -0,0 +1,60 @@
+# Makefile for busybox
+#
@@ -6644,9 +6679,10 @@ diff -urN busybox.old/archival/libipkg/Kbuild busybox.dev/archival/libipkg/Kbuil
+IPKG_ARCH:=$(TARGET_ARCH)
+endif
+CFLAGS += -DIPKG_LIB -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
-diff -urN busybox.old/archival/libipkg/libipkg.c busybox.dev/archival/libipkg/libipkg.c
---- busybox.old/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/libipkg.c 2007-01-22 13:41:06.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/libipkg.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/libipkg.c 2007-06-04 13:21:36.717394776 +0200
@@ -0,0 +1,527 @@
+/* ipkglib.c - the itsy package management system
+
@@ -7175,9 +7211,10 @@ diff -urN busybox.old/archival/libipkg/libipkg.c busybox.dev/archival/libipkg/li
+}
+
+#endif /* IPKG_LIB */
-diff -urN busybox.old/archival/libipkg/libipkg.h busybox.dev/archival/libipkg/libipkg.h
---- busybox.old/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/libipkg.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/libipkg.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/libipkg.h 2007-06-04 13:21:36.718394624 +0200
@@ -0,0 +1,87 @@
+/* ipkglib.h - the itsy package management system
+
@@ -7266,9 +7303,10 @@ diff -urN busybox.old/archival/libipkg/libipkg.h busybox.dev/archival/libipkg/li
+
+
+#endif
-diff -urN busybox.old/archival/libipkg/nv_pair.c busybox.dev/archival/libipkg/nv_pair.c
---- busybox.old/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/nv_pair.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/nv_pair.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/nv_pair.c 2007-06-04 13:21:36.718394624 +0200
@@ -0,0 +1,40 @@
+/* nv_pair.c - the itsy package management system
+
@@ -7310,9 +7348,10 @@ diff -urN busybox.old/archival/libipkg/nv_pair.c busybox.dev/archival/libipkg/nv
+}
+
+
-diff -urN busybox.old/archival/libipkg/nv_pair.h busybox.dev/archival/libipkg/nv_pair.h
---- busybox.old/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/nv_pair.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/nv_pair.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/nv_pair.h 2007-06-04 13:21:36.718394624 +0200
@@ -0,0 +1,32 @@
+/* nv_pair.h - the itsy package management system
+
@@ -7346,9 +7385,10 @@ diff -urN busybox.old/archival/libipkg/nv_pair.h busybox.dev/archival/libipkg/nv
+
+#endif
+
-diff -urN busybox.old/archival/libipkg/nv_pair_list.c busybox.dev/archival/libipkg/nv_pair_list.c
---- busybox.old/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/nv_pair_list.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/nv_pair_list.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/nv_pair_list.c 2007-06-04 13:21:36.718394624 +0200
@@ -0,0 +1,98 @@
+/* nv_pair_list.c - the itsy package management system
+
@@ -7448,9 +7488,10 @@ diff -urN busybox.old/archival/libipkg/nv_pair_list.c busybox.dev/archival/libip
+ }
+ return NULL;
+}
-diff -urN busybox.old/archival/libipkg/nv_pair_list.h busybox.dev/archival/libipkg/nv_pair_list.h
---- busybox.old/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/nv_pair_list.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/nv_pair_list.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/nv_pair_list.h 2007-06-04 13:21:36.718394624 +0200
@@ -0,0 +1,60 @@
+/* nv_pair_list.h - the itsy package management system
+
@@ -7512,9 +7553,10 @@ diff -urN busybox.old/archival/libipkg/nv_pair_list.h busybox.dev/archival/libip
+
+#endif
+
-diff -urN busybox.old/archival/libipkg/pkg.c busybox.dev/archival/libipkg/pkg.c
---- busybox.old/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg.c 2007-01-22 13:41:10.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg.c 2007-06-04 13:21:36.720394320 +0200
@@ -0,0 +1,1747 @@
+/* pkg.c - the itsy package management system
+
@@ -9263,9 +9305,10 @@ diff -urN busybox.old/archival/libipkg/pkg.c busybox.dev/archival/libipkg/pkg.c
+ }
+ return 0;
+}
-diff -urN busybox.old/archival/libipkg/pkg_depends.c busybox.dev/archival/libipkg/pkg_depends.c
---- busybox.old/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_depends.c 2007-01-22 13:41:06.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_depends.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_depends.c 2007-06-04 13:21:36.724393712 +0200
@@ -0,0 +1,1031 @@
+/* pkg_depends.c - the itsy package management system
+
@@ -10298,9 +10341,10 @@ diff -urN busybox.old/archival/libipkg/pkg_depends.c busybox.dev/archival/libipk
+
+ return 0;
+}
-diff -urN busybox.old/archival/libipkg/pkg_depends.h busybox.dev/archival/libipkg/pkg_depends.h
---- busybox.old/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_depends.h 2007-01-22 13:41:06.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_depends.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_depends.h 2007-06-04 13:21:36.724393712 +0200
@@ -0,0 +1,105 @@
+/* pkg_depends.h - the itsy package management system
+
@@ -10407,9 +10451,10 @@ diff -urN busybox.old/archival/libipkg/pkg_depends.h busybox.dev/archival/libipk
+int pkg_dependence_satisfied(ipkg_conf_t *conf, depend_t *depend);
+
+#endif
-diff -urN busybox.old/archival/libipkg/pkg_dest.c busybox.dev/archival/libipkg/pkg_dest.c
---- busybox.old/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_dest.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_dest.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_dest.c 2007-06-04 13:21:36.725393560 +0200
@@ -0,0 +1,92 @@
+/* pkg_dest.c - the itsy package management system
+
@@ -10503,9 +10548,10 @@ diff -urN busybox.old/archival/libipkg/pkg_dest.c busybox.dev/archival/libipkg/p
+
+ dest->root_dir = NULL;
+}
-diff -urN busybox.old/archival/libipkg/pkg_dest.h busybox.dev/archival/libipkg/pkg_dest.h
---- busybox.old/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_dest.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_dest.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_dest.h 2007-06-04 13:21:36.725393560 +0200
@@ -0,0 +1,38 @@
+/* pkg_dest.h - the itsy package management system
+
@@ -10545,9 +10591,10 @@ diff -urN busybox.old/archival/libipkg/pkg_dest.h busybox.dev/archival/libipkg/p
+
+#endif
+
-diff -urN busybox.old/archival/libipkg/pkg_dest_list.c busybox.dev/archival/libipkg/pkg_dest_list.c
---- busybox.old/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_dest_list.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_dest_list.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_dest_list.c 2007-06-04 13:21:36.725393560 +0200
@@ -0,0 +1,85 @@
+/* pkg_dest_list.c - the itsy package management system
+
@@ -10634,9 +10681,10 @@ diff -urN busybox.old/archival/libipkg/pkg_dest_list.c busybox.dev/archival/libi
+{
+ return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
+}
-diff -urN busybox.old/archival/libipkg/pkg_dest_list.h busybox.dev/archival/libipkg/pkg_dest_list.h
---- busybox.old/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_dest_list.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_dest_list.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_dest_list.h 2007-06-04 13:21:36.725393560 +0200
@@ -0,0 +1,50 @@
+/* pkg_dest_list.h - the itsy package management system
+
@@ -10688,9 +10736,10 @@ diff -urN busybox.old/archival/libipkg/pkg_dest_list.h busybox.dev/archival/libi
+
+#endif
+
-diff -urN busybox.old/archival/libipkg/pkg_extract.c busybox.dev/archival/libipkg/pkg_extract.c
---- busybox.old/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_extract.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_extract.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_extract.c 2007-06-04 13:21:36.726393408 +0200
@@ -0,0 +1,224 @@
+/* pkg_extract.c - the itsy package management system
+
@@ -10916,9 +10965,10 @@ diff -urN busybox.old/archival/libipkg/pkg_extract.c busybox.dev/archival/libipk
+
+ return 0;
+}
-diff -urN busybox.old/archival/libipkg/pkg_extract.h busybox.dev/archival/libipkg/pkg_extract.h
---- busybox.old/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_extract.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_extract.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_extract.h 2007-06-04 13:21:36.726393408 +0200
@@ -0,0 +1,32 @@
+/* pkg_extract.c - the itsy package management system
+
@@ -10952,9 +11002,10 @@ diff -urN busybox.old/archival/libipkg/pkg_extract.h busybox.dev/archival/libipk
+int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file);
+
+#endif
-diff -urN busybox.old/archival/libipkg/pkg.h busybox.dev/archival/libipkg/pkg.h
---- busybox.old/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg.h 2007-01-22 13:41:06.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg.h 2007-06-04 13:21:36.726393408 +0200
@@ -0,0 +1,232 @@
+/* pkg.h - the itsy package management system
+
@@ -11188,9 +11239,10 @@ diff -urN busybox.old/archival/libipkg/pkg.h busybox.dev/archival/libipkg/pkg.h
+int pkg_write_changed_filelists(ipkg_conf_t *conf);
+
+#endif
-diff -urN busybox.old/archival/libipkg/pkg_hash.c busybox.dev/archival/libipkg/pkg_hash.c
---- busybox.old/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_hash.c 2007-01-22 13:41:06.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_hash.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_hash.c 2007-06-04 13:21:36.727393256 +0200
@@ -0,0 +1,616 @@
+/* ipkg_hash.c - the itsy package management system
+
@@ -11808,9 +11860,10 @@ diff -urN busybox.old/archival/libipkg/pkg_hash.c busybox.dev/archival/libipkg/p
+}
+
+
-diff -urN busybox.old/archival/libipkg/pkg_hash.h busybox.dev/archival/libipkg/pkg_hash.h
---- busybox.old/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_hash.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_hash.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_hash.h 2007-06-04 13:21:36.727393256 +0200
@@ -0,0 +1,61 @@
+/* pkg_hash.h - the itsy package management system
+
@@ -11873,9 +11926,10 @@ diff -urN busybox.old/archival/libipkg/pkg_hash.h busybox.dev/archival/libipkg/p
+
+#endif
+
-diff -urN busybox.old/archival/libipkg/pkg_parse.c busybox.dev/archival/libipkg/pkg_parse.c
---- busybox.old/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_parse.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_parse.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_parse.c 2007-06-04 13:21:36.727393256 +0200
@@ -0,0 +1,366 @@
+/* pkg_parse.c - the itsy package management system
+
@@ -12243,9 +12297,10 @@ diff -urN busybox.old/archival/libipkg/pkg_parse.c busybox.dev/archival/libipkg/
+
+ return 0;
+}
-diff -urN busybox.old/archival/libipkg/pkg_parse.h busybox.dev/archival/libipkg/pkg_parse.h
---- busybox.old/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_parse.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_parse.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_parse.h 2007-06-04 13:21:36.728393104 +0200
@@ -0,0 +1,31 @@
+/* pkg_parse.h - the itsy package management system
+
@@ -12278,9 +12333,10 @@ diff -urN busybox.old/archival/libipkg/pkg_parse.h busybox.dev/archival/libipkg/
+int pkg_valorize_other_field(pkg_t *pkg, char ***raw);
+
+#endif
-diff -urN busybox.old/archival/libipkg/pkg_src.c busybox.dev/archival/libipkg/pkg_src.c
---- busybox.old/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_src.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_src.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_src.c 2007-06-04 13:21:36.728393104 +0200
@@ -0,0 +1,43 @@
+/* pkg_src.c - the itsy package management system
+
@@ -12325,9 +12381,10 @@ diff -urN busybox.old/archival/libipkg/pkg_src.c busybox.dev/archival/libipkg/pk
+}
+
+
-diff -urN busybox.old/archival/libipkg/pkg_src.h busybox.dev/archival/libipkg/pkg_src.h
---- busybox.old/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_src.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_src.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_src.h 2007-06-04 13:21:36.728393104 +0200
@@ -0,0 +1,34 @@
+/* pkg_src.h - the itsy package management system
+
@@ -12363,9 +12420,10 @@ diff -urN busybox.old/archival/libipkg/pkg_src.h busybox.dev/archival/libipkg/pk
+void pkg_src_deinit(pkg_src_t *src);
+
+#endif
-diff -urN busybox.old/archival/libipkg/pkg_src_list.c busybox.dev/archival/libipkg/pkg_src_list.c
---- busybox.old/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_src_list.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_src_list.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_src_list.c 2007-06-04 13:21:36.728393104 +0200
@@ -0,0 +1,75 @@
+/* pkg_src_list.c - the itsy package management system
+
@@ -12442,9 +12500,10 @@ diff -urN busybox.old/archival/libipkg/pkg_src_list.c busybox.dev/archival/libip
+{
+ return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
+}
-diff -urN busybox.old/archival/libipkg/pkg_src_list.h busybox.dev/archival/libipkg/pkg_src_list.h
---- busybox.old/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_src_list.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_src_list.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_src_list.h 2007-06-04 13:21:36.728393104 +0200
@@ -0,0 +1,57 @@
+/* pkg_src_list.h - the itsy package management system
+
@@ -12503,9 +12562,10 @@ diff -urN busybox.old/archival/libipkg/pkg_src_list.h busybox.dev/archival/libip
+
+#endif
+
-diff -urN busybox.old/archival/libipkg/pkg_vec.c busybox.dev/archival/libipkg/pkg_vec.c
---- busybox.old/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_vec.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_vec.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_vec.c 2007-06-04 13:21:36.729392952 +0200
@@ -0,0 +1,230 @@
+/* pkg_vec.c - the itsy package management system
+
@@ -12737,9 +12797,10 @@ diff -urN busybox.old/archival/libipkg/pkg_vec.c busybox.dev/archival/libipkg/pk
+ qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
+}
+
-diff -urN busybox.old/archival/libipkg/pkg_vec.h busybox.dev/archival/libipkg/pkg_vec.h
---- busybox.old/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/pkg_vec.h 2007-01-22 13:41:06.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/pkg_vec.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/pkg_vec.h 2007-06-04 13:21:36.729392952 +0200
@@ -0,0 +1,64 @@
+/* pkg_vec.h - the itsy package management system
+
@@ -12805,9 +12866,10 @@ diff -urN busybox.old/archival/libipkg/pkg_vec.h busybox.dev/archival/libipkg/pk
+void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));
+#endif
+
-diff -urN busybox.old/archival/libipkg/sprintf_alloc.h busybox.dev/archival/libipkg/sprintf_alloc.h
---- busybox.old/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/sprintf_alloc.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/sprintf_alloc.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/sprintf_alloc.h 2007-06-04 13:21:36.729392952 +0200
@@ -0,0 +1,25 @@
+/* sprintf_alloca.c -- like sprintf with memory allocation
+
@@ -12834,9 +12896,10 @@ diff -urN busybox.old/archival/libipkg/sprintf_alloc.h busybox.dev/archival/libi
+#define sprintf_alloc(str, fmt, args...) *str = xasprintf(fmt, ## args)
+
+#endif
-diff -urN busybox.old/archival/libipkg/str_list.c busybox.dev/archival/libipkg/str_list.c
---- busybox.old/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/str_list.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/str_list.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/str_list.c 2007-06-04 13:21:36.729392952 +0200
@@ -0,0 +1,76 @@
+/* str_list.c - the itsy package management system
+
@@ -12914,9 +12977,10 @@ diff -urN busybox.old/archival/libipkg/str_list.c busybox.dev/archival/libipkg/s
+ (void *)target_str,
+ (void_list_cmp_t)strcmp);
+}
-diff -urN busybox.old/archival/libipkg/str_list.h busybox.dev/archival/libipkg/str_list.h
---- busybox.old/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/str_list.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/str_list.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/str_list.h 2007-06-04 13:21:36.729392952 +0200
@@ -0,0 +1,51 @@
+/* str_list.h - the itsy package management system
+
@@ -12969,9 +13033,10 @@ diff -urN busybox.old/archival/libipkg/str_list.h busybox.dev/archival/libipkg/s
+char *str_list_remove_elt(str_list_t *list, const char *target_str);
+
+#endif
-diff -urN busybox.old/archival/libipkg/str_util.c busybox.dev/archival/libipkg/str_util.c
---- busybox.old/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/str_util.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/str_util.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/str_util.c 2007-06-04 13:21:36.730392800 +0200
@@ -0,0 +1,73 @@
+/* str_utils.c - the itsy package management system
+
@@ -13046,9 +13111,10 @@ diff -urN busybox.old/archival/libipkg/str_util.c busybox.dev/archival/libipkg/s
+ return str ? strdup(str) : NULL;
+}
+
-diff -urN busybox.old/archival/libipkg/str_util.h busybox.dev/archival/libipkg/str_util.h
---- busybox.old/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/str_util.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/str_util.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/str_util.h 2007-06-04 13:21:36.730392800 +0200
@@ -0,0 +1,28 @@
+/* str_utils.h - the itsy package management system
+
@@ -13078,9 +13144,10 @@ diff -urN busybox.old/archival/libipkg/str_util.h busybox.dev/archival/libipkg/s
+char *str_dup_safe(const char *str);
+
+#endif
-diff -urN busybox.old/archival/libipkg/user.c busybox.dev/archival/libipkg/user.c
---- busybox.old/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/user.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/user.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/user.c 2007-06-04 13:21:36.730392800 +0200
@@ -0,0 +1,58 @@
+/* user.c - the itsy package management system
+
@@ -13140,9 +13207,10 @@ diff -urN busybox.old/archival/libipkg/user.c busybox.dev/archival/libipkg/user.
+
+ return response;
+}
-diff -urN busybox.old/archival/libipkg/user.h busybox.dev/archival/libipkg/user.h
---- busybox.old/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/user.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/user.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/user.h 2007-06-04 13:21:36.730392800 +0200
@@ -0,0 +1,23 @@
+/* user.c - the itsy package management system
+
@@ -13167,9 +13235,10 @@ diff -urN busybox.old/archival/libipkg/user.h busybox.dev/archival/libipkg/user.
+
+char *get_user_response(const char *format, ...);
+
-diff -urN busybox.old/archival/libipkg/void_list.c busybox.dev/archival/libipkg/void_list.c
---- busybox.old/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/void_list.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/void_list.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/void_list.c 2007-06-04 13:21:36.731392648 +0200
@@ -0,0 +1,194 @@
+/* void_list.c - the itsy package management system
+
@@ -13365,9 +13434,10 @@ diff -urN busybox.old/archival/libipkg/void_list.c busybox.dev/archival/libipkg/
+ else
+ return NULL;
+}
-diff -urN busybox.old/archival/libipkg/void_list.h busybox.dev/archival/libipkg/void_list.h
---- busybox.old/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/void_list.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/void_list.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/void_list.h 2007-06-04 13:21:36.731392648 +0200
@@ -0,0 +1,59 @@
+/* void_list.h - the itsy package management system
+
@@ -13428,9 +13498,10 @@ diff -urN busybox.old/archival/libipkg/void_list.h busybox.dev/archival/libipkg/
+void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp);
+
+#endif
-diff -urN busybox.old/archival/libipkg/xsystem.c busybox.dev/archival/libipkg/xsystem.c
---- busybox.old/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/xsystem.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/xsystem.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/xsystem.c 2007-06-04 13:21:36.731392648 +0200
@@ -0,0 +1,64 @@
+/* xsystem.c - system(3) with error messages
+
@@ -13496,9 +13567,10 @@ diff -urN busybox.old/archival/libipkg/xsystem.c busybox.dev/archival/libipkg/xs
+ return -1;
+}
+
-diff -urN busybox.old/archival/libipkg/xsystem.h busybox.dev/archival/libipkg/xsystem.h
---- busybox.old/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/archival/libipkg/xsystem.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libipkg/xsystem.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/archival/libipkg/xsystem.h 2007-06-04 13:21:36.731392648 +0200
@@ -0,0 +1,34 @@
+/* xsystem.h - system(3) with error messages
+
@@ -13534,9 +13606,10 @@ diff -urN busybox.old/archival/libipkg/xsystem.h busybox.dev/archival/libipkg/xs
+
+#endif
+
-diff -urN busybox.old/archival/libunarchive/data_extract_all.c busybox.dev/archival/libunarchive/data_extract_all.c
---- busybox.old/archival/libunarchive/data_extract_all.c 2007-01-19 22:23:02.000000000 +0100
-+++ busybox.dev/archival/libunarchive/data_extract_all.c 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libunarchive/data_extract_all.c
+===================================================================
+--- busybox-1.4.2.orig/archival/libunarchive/data_extract_all.c 2007-06-04 13:21:31.879130304 +0200
++++ busybox-1.4.2/archival/libunarchive/data_extract_all.c 2007-06-04 13:21:36.731392648 +0200
@@ -117,3 +117,17 @@
utime(file_header->name, &t);
}
@@ -13555,9 +13628,10 @@ diff -urN busybox.old/archival/libunarchive/data_extract_all.c busybox.dev/archi
+ }
+}
+
-diff -urN busybox.old/archival/libunarchive/Kbuild busybox.dev/archival/libunarchive/Kbuild
---- busybox.old/archival/libunarchive/Kbuild 2007-01-19 22:23:02.000000000 +0100
-+++ busybox.dev/archival/libunarchive/Kbuild 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/archival/libunarchive/Kbuild
+===================================================================
+--- busybox-1.4.2.orig/archival/libunarchive/Kbuild 2007-06-04 13:21:31.886129240 +0200
++++ busybox-1.4.2/archival/libunarchive/Kbuild 2007-06-04 13:21:36.732392496 +0200
@@ -47,6 +47,7 @@
lib-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o
lib-$(CONFIG_GUNZIP) += $(GUNZIP_FILES)
@@ -13566,9 +13640,10 @@ diff -urN busybox.old/archival/libunarchive/Kbuild busybox.dev/archival/libunarc
lib-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o
lib-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o
lib-$(CONFIG_TAR) += get_header_tar.o
-diff -urN busybox.old/include/applets.h busybox.dev/include/applets.h
---- busybox.old/include/applets.h 2007-01-20 16:34:47.000000000 +0100
-+++ busybox.dev/include/applets.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/include/applets.h
+===================================================================
+--- busybox-1.4.2.orig/include/applets.h 2007-06-04 13:21:34.786688288 +0200
++++ busybox-1.4.2/include/applets.h 2007-06-04 13:21:36.732392496 +0200
@@ -160,6 +160,7 @@
USE_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS))
@@ -13577,9 +13652,10 @@ diff -urN busybox.old/include/applets.h busybox.dev/include/applets.h
USE_IPLINK(APPLET(iplink, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_IPRULE(APPLET(iprule, _BB_DIR_BIN, _BB_SUID_NEVER))
-diff -urN busybox.old/include/unarchive.h busybox.dev/include/unarchive.h
---- busybox.old/include/unarchive.h 2007-01-19 22:23:10.000000000 +0100
-+++ busybox.dev/include/unarchive.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/include/unarchive.h
+===================================================================
+--- busybox-1.4.2.orig/include/unarchive.h 2007-06-04 13:21:31.897127568 +0200
++++ busybox-1.4.2/include/unarchive.h 2007-06-04 13:21:36.732392496 +0200
@@ -76,6 +76,7 @@
extern void data_skip(archive_handle_t *archive_handle);
@@ -13588,9 +13664,10 @@ diff -urN busybox.old/include/unarchive.h busybox.dev/include/unarchive.h
extern void data_extract_to_stdout(archive_handle_t *archive_handle);
extern void data_extract_to_buffer(archive_handle_t *archive_handle);
-diff -urN busybox.old/include/usage.h busybox.dev/include/usage.h
---- busybox.old/include/usage.h 2007-01-19 22:23:10.000000000 +0100
-+++ busybox.dev/include/usage.h 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/include/usage.h
+===================================================================
+--- busybox-1.4.2.orig/include/usage.h 2007-06-04 13:21:35.005655000 +0200
++++ busybox-1.4.2/include/usage.h 2007-06-04 13:21:36.734392192 +0200
@@ -1133,6 +1133,82 @@
"$ ls -la /tmp/busybox*\n" \
"-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
@@ -13674,9 +13751,10 @@ diff -urN busybox.old/include/usage.h busybox.dev/include/usage.h
#define halt_trivial_usage \
"[-d<delay>] [-n<nosync>] [-f<force>]"
#define halt_full_usage \
-diff -urN busybox.old/Makefile busybox.dev/Makefile
---- busybox.old/Makefile 2007-01-20 21:21:39.000000000 +0100
-+++ busybox.dev/Makefile 2007-01-22 13:41:03.000000000 +0100
+Index: busybox-1.4.2/Makefile
+===================================================================
+--- busybox-1.4.2.orig/Makefile 2007-06-04 13:21:31.910125592 +0200
++++ busybox-1.4.2/Makefile 2007-06-04 13:21:36.734392192 +0200
@@ -423,6 +423,7 @@
libs-y := \
diff --git a/package/busybox/patches/913-libbb_hash.patch b/package/busybox/patches/913-libbb_hash.patch
index a9cb23988e479320194005223aa215ef427ffa33..e371b328383e99123a17e1b2da62562560182b06 100644
--- a/package/busybox/patches/913-libbb_hash.patch
+++ b/package/busybox/patches/913-libbb_hash.patch
@@ -1,6 +1,7 @@
-diff -ur busybox.old/coreutils/md5_sha1_sum.c busybox.dev/coreutils/md5_sha1_sum.c
---- busybox.old/coreutils/md5_sha1_sum.c 2007-01-19 22:23:05.000000000 +0100
-+++ busybox.dev/coreutils/md5_sha1_sum.c 2007-01-22 13:24:51.000000000 +0100
+Index: busybox-1.4.2/coreutils/md5_sha1_sum.c
+===================================================================
+--- busybox-1.4.2.orig/coreutils/md5_sha1_sum.c 2007-06-04 13:21:31.536182440 +0200
++++ busybox-1.4.2/coreutils/md5_sha1_sum.c 2007-06-04 13:21:37.709243992 +0200
@@ -8,76 +8,10 @@
#include "busybox.h"
@@ -78,10 +79,11 @@ diff -ur busybox.old/coreutils/md5_sha1_sum.c busybox.dev/coreutils/md5_sha1_sum
int md5_sha1_sum_main(int argc, char **argv)
{
int return_value = EXIT_SUCCESS;
-diff -ur busybox.old/include/libbb.h busybox.dev/include/libbb.h
---- busybox.old/include/libbb.h 2007-01-19 22:23:10.000000000 +0100
-+++ busybox.dev/include/libbb.h 2007-01-22 13:28:56.000000000 +0100
-@@ -637,6 +637,7 @@
+Index: busybox-1.4.2/include/libbb.h
+===================================================================
+--- busybox-1.4.2.orig/include/libbb.h 2007-06-04 13:21:35.388596784 +0200
++++ busybox-1.4.2/include/libbb.h 2007-06-04 13:21:37.709243992 +0200
+@@ -641,6 +641,7 @@
extern const char bb_uuenc_tbl_std[];
void bb_uuencode(const unsigned char *s, char *store, const int length, const char *tbl);
@@ -89,7 +91,7 @@ diff -ur busybox.old/include/libbb.h busybox.dev/include/libbb.h
typedef struct sha1_ctx_t {
uint32_t count[2];
uint32_t hash[5];
-@@ -658,6 +659,8 @@
+@@ -662,6 +663,8 @@
void md5_begin(md5_ctx_t *ctx);
void md5_hash(const void *data, size_t length, md5_ctx_t *ctx);
void *md5_end(void *resbuf, md5_ctx_t *ctx);
@@ -98,9 +100,10 @@ diff -ur busybox.old/include/libbb.h busybox.dev/include/libbb.h
uint32_t *crc32_filltable(int endian);
-diff -ur busybox.old/libbb/Kbuild busybox.dev/libbb/Kbuild
---- busybox.old/libbb/Kbuild 2007-01-19 22:23:06.000000000 +0100
-+++ busybox.dev/libbb/Kbuild 2007-01-22 13:29:24.000000000 +0100
+Index: busybox-1.4.2/libbb/Kbuild
+===================================================================
+--- busybox-1.4.2.orig/libbb/Kbuild 2007-06-04 13:21:31.548180616 +0200
++++ busybox-1.4.2/libbb/Kbuild 2007-06-04 13:21:37.710243840 +0200
@@ -37,6 +37,7 @@
lib-y += get_last_path_component.o
lib-y += get_line_from_file.o
@@ -109,8 +112,10 @@ diff -ur busybox.old/libbb/Kbuild busybox.dev/libbb/Kbuild
lib-y += herror_msg.o
lib-y += herror_msg_and_die.o
lib-y += human_readable.o
---- busybox.old/libbb/hash.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/libbb/hash.c 2007-01-22 13:52:41.000000000 +0100
+Index: busybox-1.4.2/libbb/hash.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/libbb/hash.c 2007-06-04 13:21:37.710243840 +0200
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2003 Glenn L. McGrath
diff --git a/package/busybox/patches/920-awx.patch b/package/busybox/patches/920-awx.patch
index 27a8534d519fa6cfa7f8df30fc6d519be044f520..2abab323e5ddb25043df177f199460825ac63bfe 100644
--- a/package/busybox/patches/920-awx.patch
+++ b/package/busybox/patches/920-awx.patch
@@ -1,6 +1,7 @@
-diff -urN bb.old/editors/awk.c bb.dev/editors/awk.c
---- bb.old/editors/awk.c 2007-05-20 04:17:05.002197784 +0200
-+++ bb.dev/editors/awk.c 2007-05-20 22:40:48.183743936 +0200
+Index: busybox-1.4.2/editors/awk.c
+===================================================================
+--- busybox-1.4.2.orig/editors/awk.c 2007-06-04 13:21:35.202625056 +0200
++++ busybox-1.4.2/editors/awk.c 2007-06-04 13:21:37.927210856 +0200
@@ -30,6 +30,11 @@
/* these flags are static, don't change them when value is changed */
#define VF_DONTTOUCH (VF_ARRAY | VF_SPECIAL | VF_WALK | VF_CHILD | VF_DIRTY)
@@ -95,9 +96,10 @@ diff -urN bb.old/editors/awk.c bb.dev/editors/awk.c
programname = NULL;
while((c = getopt(argc, argv, "F:v:f:W:")) != EOF) {
switch (c) {
-diff -urN bb.old/editors/awx.c bb.dev/editors/awx.c
---- bb.old/editors/awx.c 1970-01-01 01:00:00.000000000 +0100
-+++ bb.dev/editors/awx.c 2007-05-23 22:37:38.547183608 +0200
+Index: busybox-1.4.2/editors/awx.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/editors/awx.c 2007-06-04 13:21:37.928210704 +0200
@@ -0,0 +1,633 @@
+/*
+ * awk web extension
@@ -732,9 +734,10 @@ diff -urN bb.old/editors/awx.c bb.dev/editors/awx.c
+ return awk_main(argc, argv);
+}
+
-diff -urN bb.old/editors/awx_parser.h bb.dev/editors/awx_parser.h
---- bb.old/editors/awx_parser.h 1970-01-01 01:00:00.000000000 +0100
-+++ bb.dev/editors/awx_parser.h 2007-05-20 22:30:31.380512280 +0200
+Index: busybox-1.4.2/editors/awx_parser.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/editors/awx_parser.h 2007-06-04 13:21:37.928210704 +0200
@@ -0,0 +1,38 @@
+#ifndef __TEMPLATE_PARSER_H
+#define __TEMPLATE_PARSER_H
@@ -774,9 +777,10 @@ diff -urN bb.old/editors/awx_parser.h bb.dev/editors/awx_parser.h
+void free_template(struct template_cb *cb, struct template_element *e);
+
+#endif
-diff -urN bb.old/editors/awx_parser.l bb.dev/editors/awx_parser.l
---- bb.old/editors/awx_parser.l 1970-01-01 01:00:00.000000000 +0100
-+++ bb.dev/editors/awx_parser.l 2007-05-23 19:13:40.459655704 +0200
+Index: busybox-1.4.2/editors/awx_parser.l
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/editors/awx_parser.l 2007-06-04 13:21:37.929210552 +0200
@@ -0,0 +1,302 @@
+%{
+#include <stdio.h>
@@ -1080,9 +1084,10 @@ diff -urN bb.old/editors/awx_parser.l bb.dev/editors/awx_parser.l
+ free(e);
+ return free_template(cb, next);
+}
-diff -urN bb.old/editors/Config.in bb.dev/editors/Config.in
---- bb.old/editors/Config.in 2007-05-20 04:17:05.003197632 +0200
-+++ bb.dev/editors/Config.in 2007-05-20 22:30:31.380512280 +0200
+Index: busybox-1.4.2/editors/Config.in
+===================================================================
+--- busybox-1.4.2.orig/editors/Config.in 2007-06-04 13:21:31.486190040 +0200
++++ busybox-1.4.2/editors/Config.in 2007-06-04 13:21:37.929210552 +0200
@@ -12,6 +12,13 @@
Awk is used as a pattern scanning and processing language. This is
the BusyBox implementation of that programming language.
@@ -1097,9 +1102,10 @@ diff -urN bb.old/editors/Config.in bb.dev/editors/Config.in
config FEATURE_AWK_MATH
bool "Enable math functions (requires libm)"
default y
-diff -urN bb.old/editors/Kbuild bb.dev/editors/Kbuild
---- bb.old/editors/Kbuild 2007-03-18 17:59:37.000000000 +0100
-+++ bb.dev/editors/Kbuild 2007-05-20 22:30:31.381512128 +0200
+Index: busybox-1.4.2/editors/Kbuild
+===================================================================
+--- busybox-1.4.2.orig/editors/Kbuild 2007-06-04 13:21:31.492189128 +0200
++++ busybox-1.4.2/editors/Kbuild 2007-06-04 13:21:37.929210552 +0200
@@ -10,3 +10,12 @@
lib-$(CONFIG_PATCH) += patch.o
lib-$(CONFIG_SED) += sed.o
@@ -1113,9 +1119,10 @@ diff -urN bb.old/editors/Kbuild bb.dev/editors/Kbuild
+editors/awx_parser.o: editors/awx_parser.c FORCE
+ $(call cmd,force_checksrc)
+ $(call if_changed_rule,cc_o_c)
-diff -urN bb.old/include/applets.h bb.dev/include/applets.h
---- bb.old/include/applets.h 2007-05-20 04:17:05.003197632 +0200
-+++ bb.dev/include/applets.h 2007-05-20 22:30:31.381512128 +0200
+Index: busybox-1.4.2/include/applets.h
+===================================================================
+--- busybox-1.4.2.orig/include/applets.h 2007-06-04 13:21:36.732392496 +0200
++++ busybox-1.4.2/include/applets.h 2007-06-04 13:21:37.929210552 +0200
@@ -60,6 +60,7 @@
USE_ARPING(APPLET(arping, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_ASH(APPLET_NOUSAGE(ash, ash, _BB_DIR_BIN, _BB_SUID_NEVER))
@@ -1124,9 +1131,10 @@ diff -urN bb.old/include/applets.h bb.dev/include/applets.h
USE_BASENAME(APPLET(basename, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER))
//USE_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_NEVER))
-diff -urN bb.old/include/cgi.h bb.dev/include/cgi.h
---- bb.old/include/cgi.h 1970-01-01 01:00:00.000000000 +0100
-+++ bb.dev/include/cgi.h 2007-05-20 22:30:31.381512128 +0200
+Index: busybox-1.4.2/include/cgi.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/include/cgi.h 2007-06-04 13:21:37.929210552 +0200
@@ -0,0 +1,8 @@
+#ifndef CGI_H
+#define CGI_H
@@ -1136,9 +1144,10 @@ diff -urN bb.old/include/cgi.h bb.dev/include/cgi.h
+int cgi_init(var_handler);
+
+#endif
-diff -urN bb.old/libbb/cgi.c bb.dev/libbb/cgi.c
---- bb.old/libbb/cgi.c 1970-01-01 01:00:00.000000000 +0100
-+++ bb.dev/libbb/cgi.c 2007-05-20 22:30:31.382511976 +0200
+Index: busybox-1.4.2/libbb/cgi.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/libbb/cgi.c 2007-06-04 13:21:37.930210400 +0200
@@ -0,0 +1,457 @@
+/* --------------------------------------------------------------------------
+ * functions for processing cgi form data
@@ -1597,9 +1606,10 @@ diff -urN bb.old/libbb/cgi.c bb.dev/libbb/cgi.c
+
+ return retval;
+}
-diff -urN bb.old/libbb/Kbuild bb.dev/libbb/Kbuild
---- bb.old/libbb/Kbuild 2007-05-20 04:17:05.004197480 +0200
-+++ bb.dev/libbb/Kbuild 2007-05-20 22:30:31.382511976 +0200
+Index: busybox-1.4.2/libbb/Kbuild
+===================================================================
+--- busybox-1.4.2.orig/libbb/Kbuild 2007-06-04 13:21:37.710243840 +0200
++++ busybox-1.4.2/libbb/Kbuild 2007-06-04 13:21:37.930210400 +0200
@@ -118,3 +118,6 @@
lib-$(CONFIG_MDEV) += xregcomp.o
lib-$(CONFIG_LESS) += xregcomp.o
diff --git a/package/comgt/patches/001-Makefile.patch b/package/comgt/patches/001-Makefile.patch
index c3723fa46318bf255bc9a97d8333256266128fdc..32b56b12b747e0170c33f5e7b80f68814e702a97 100644
--- a/package/comgt/patches/001-Makefile.patch
+++ b/package/comgt/patches/001-Makefile.patch
@@ -1,126 +1,90 @@
-diff -rhNp comgt.0.32/Makefile gcom-032/Makefile
-*** comgt.0.32/Makefile 2007-02-10 19:07:58.723709368 +0100
---- gcom-032/Makefile 2007-02-10 19:18:26.764232696 +0100
-***************
-*** 1,7 ****
- #
-! # Makefile - build and install the comgt package
- # Copyright (C) 2005 Martin Gregorie
-- # Copyright (C) 2006 Paul Hardwick
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
---- 1,6 ----
- #
-! # Makefile - build and install the gmon package
- # Copyright (C) 2005 Martin Gregorie
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-***************
-*** 17,79 ****
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- #
-! # martin@gregorie.org, paul@peck.org.uk
- #
-! # $Id: Makefile,v 1.4 2006/10/20 14:30:19 pharscape Exp $
- #
-- #
--
-- LIB = -L/usr/local/lib
-- INC = -I/usr/local/include
- EXE = /usr/local/bin
- MAN = /usr/share/man/man1
-! CPROG = comgt
-! SCRIPTPATH = /etc/comgt/
-! SCRIPTSRC = ./scripts/
-! BIN = $(CPROG)
-! MANP = comgt.1 sigmon.1
-!
-! CFLAGS = -c
-! LDFLAGS =
-
- all: $(BIN)
-
- install:
- chmod a-w $(BIN)
- chmod u+rw $(BIN)
- chmod a+x $(BIN)
-! cp $(BIN) $(EXE)
- chmod a-wx $(MANP)
- chmod u+rw $(MANP)
- chmod a+r $(MANP)
- cp $(MANP) $(MAN)
-- -mkdir $(SCRIPTPATH)
-- chmod a-w $(SCRIPTPATH)
-- chmod u+rw $(SCRIPTPATH)
-- chmod a+x $(SCRIPTPATH)
-- cp -f $(SCRIPTSRC)* $(SCRIPTPATH)
-- chmod a-w $(SCRIPTPATH)*
-- chmod u+rw $(SCRIPTPATH)*
-- chmod a+x $(SCRIPTPATH)*
--
--
--
-
- uninstall:
- cd $(EXE); rm $(BIN)
- cd $(MAN); rm $(MANP)
-- -rm -r $(SCRIPTPATH)
-
- clean:
-! -rm *.o
-! -rm $(CPROG)
-! -rm *~
-! -rm $(SCRIPTSRC)*~
-
-
-! comgt: comgt.o
-! cc comgt.o $(LDFLAGS) -o comgt
-
-! comgt.o: comgt.c comgt.h
-! cc comgt.c $(CFLAGS)
-
---- 16,56 ----
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- #
-! # martin@gregorie.org
- #
-! # $Id$
- #
- EXE = /usr/local/bin
- MAN = /usr/share/man/man1
-! CPROG = gcom
-! SCRIPT = sigmon
-! BIN = $(CPROG) $(SCRIPT)
-! MANP = gcom.1 sigmon.1
-
- all: $(BIN)
-
- install:
-+ mv ($BIN} {$BIN2}
- chmod a-w $(BIN)
- chmod u+rw $(BIN)
- chmod a+x $(BIN)
-! cp $(BIN) $(EXE)/gcom
- chmod a-wx $(MANP)
- chmod u+rw $(MANP)
- chmod a+r $(MANP)
- cp $(MANP) $(MAN)
-
- uninstall:
- cd $(EXE); rm $(BIN)
- cd $(MAN); rm $(MANP)
-
- clean:
-! rm *.o $(CPROG)
-
-
-! gcom: gcom.o
-! $(CC) gcom.o $(LDFLAGS) -o gcom
-
-! gcom.o: comgt.c comgt.h
-! $(CC) -c $(CFLAGS) comgt.c -o gcom.o
-
+Index: comgt.0.32/Makefile
+===================================================================
+--- comgt.0.32.orig/Makefile 2007-06-04 13:22:22.665409616 +0200
++++ comgt.0.32/Makefile 2007-06-04 13:22:22.730399736 +0200
+@@ -1,7 +1,6 @@
+ #
+-# Makefile - build and install the comgt package
++# Makefile - build and install the gmon package
+ # Copyright (C) 2005 Martin Gregorie
+-# Copyright (C) 2006 Paul Hardwick
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -17,63 +16,41 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ #
+-# martin@gregorie.org, paul@peck.org.uk
++# martin@gregorie.org
+ #
+-# $Id: Makefile,v 1.4 2006/10/20 14:30:19 pharscape Exp $
++# $Id$
+ #
+-#
+-
+-LIB = -L/usr/local/lib
+-INC = -I/usr/local/include
+ EXE = /usr/local/bin
+ MAN = /usr/share/man/man1
+-CPROG = comgt
+-SCRIPTPATH = /etc/comgt/
+-SCRIPTSRC = ./scripts/
+-BIN = $(CPROG)
+-MANP = comgt.1 sigmon.1
+-
+-CFLAGS = -c
+-LDFLAGS =
++CPROG = gcom
++SCRIPT = sigmon
++BIN = $(CPROG) $(SCRIPT)
++MANP = gcom.1 sigmon.1
+
+ all: $(BIN)
+
+ install:
++ mv ($BIN} {$BIN2}
+ chmod a-w $(BIN)
+ chmod u+rw $(BIN)
+ chmod a+x $(BIN)
+- cp $(BIN) $(EXE)
++ cp $(BIN) $(EXE)/gcom
+ chmod a-wx $(MANP)
+ chmod u+rw $(MANP)
+ chmod a+r $(MANP)
+ cp $(MANP) $(MAN)
+- -mkdir $(SCRIPTPATH)
+- chmod a-w $(SCRIPTPATH)
+- chmod u+rw $(SCRIPTPATH)
+- chmod a+x $(SCRIPTPATH)
+- cp -f $(SCRIPTSRC)* $(SCRIPTPATH)
+- chmod a-w $(SCRIPTPATH)*
+- chmod u+rw $(SCRIPTPATH)*
+- chmod a+x $(SCRIPTPATH)*
+-
+-
+-
+
+ uninstall:
+ cd $(EXE); rm $(BIN)
+ cd $(MAN); rm $(MANP)
+- -rm -r $(SCRIPTPATH)
+
+ clean:
+- -rm *.o
+- -rm $(CPROG)
+- -rm *~
+- -rm $(SCRIPTSRC)*~
++ rm *.o $(CPROG)
+
+
+-comgt: comgt.o
+- cc comgt.o $(LDFLAGS) -o comgt
++gcom: gcom.o
++ $(CC) gcom.o $(LDFLAGS) -o gcom
+
+-comgt.o: comgt.c comgt.h
+- cc comgt.c $(CFLAGS)
++gcom.o: comgt.c comgt.h
++ $(CC) -c $(CFLAGS) comgt.c -o gcom.o
+
diff --git a/package/dnsmasq/patches/101-ipv6.patch b/package/dnsmasq/patches/101-ipv6.patch
index 5cbf7817447075a3e0e981005bd23cf0b6e99102..e107fe20f85b046f8491923f4fc38d83099c4b3d 100644
--- a/package/dnsmasq/patches/101-ipv6.patch
+++ b/package/dnsmasq/patches/101-ipv6.patch
@@ -1,6 +1,8 @@
---- dnsmasq-2.15.orig/src/config.h 2004-09-20 15:47:57.000000000 +0200
-+++ dnsmasq-2.15/src/config.h 2004-09-20 23:21:10.000000000 +0200
-@@ -78,8 +78,9 @@
+Index: dnsmasq-2.38/src/config.h
+===================================================================
+--- dnsmasq-2.38.orig/src/config.h 2007-06-04 13:22:23.553274640 +0200
++++ dnsmasq-2.38/src/config.h 2007-06-04 13:22:23.626263544 +0200
+@@ -280,8 +280,9 @@
/* We assume that systems which don't have IPv6
headers don't have ntop and pton either */
diff --git a/package/dnsmasq/patches/102-rtnetlink.patch b/package/dnsmasq/patches/102-rtnetlink.patch
index 03f9917a1bc51fb703a157dc622e86e10e7a3b26..3079c1eec3a17fc2f2252a50face126dd2cdce81 100644
--- a/package/dnsmasq/patches/102-rtnetlink.patch
+++ b/package/dnsmasq/patches/102-rtnetlink.patch
@@ -1,5 +1,7 @@
---- dnsmasq-2.35/src/netlink.c.orig 2006-12-04 23:32:49.000000000 +0100
-+++ dnsmasq-2.35/src/netlink.c 2006-12-04 23:33:18.000000000 +0100
+Index: dnsmasq-2.38/src/netlink.c
+===================================================================
+--- dnsmasq-2.38.orig/src/netlink.c 2007-06-04 13:22:23.531277984 +0200
++++ dnsmasq-2.38/src/netlink.c 2007-06-04 13:22:23.814234968 +0200
@@ -17,6 +17,10 @@
#include <linux/types.h>
#include <linux/netlink.h>
@@ -9,5 +11,5 @@
+# define IFA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
+#endif
- static struct iovec iov;
-
+ /* linux 2.6.19 buggers up the headers, patch it up here. */
+ #ifndef IFA_RTA
diff --git a/package/dnsmasq/patches/103-hosts-fqdn.patch b/package/dnsmasq/patches/103-hosts-fqdn.patch
index 0541614191a891d7720370ad637e14f25f8105f1..243e73b02ef29130c77c584c61b22ad7424c256e 100644
--- a/package/dnsmasq/patches/103-hosts-fqdn.patch
+++ b/package/dnsmasq/patches/103-hosts-fqdn.patch
@@ -1,6 +1,8 @@
---- dnsmasq-2.35/src/cache.c.orig 2007-02-12 14:35:58.000000000 -0800
-+++ dnsmasq-2.35/src/cache.c 2007-02-12 14:36:51.000000000 -0800
-@@ -720,10 +720,11 @@
+Index: dnsmasq-2.38/src/cache.c
+===================================================================
+--- dnsmasq-2.38.orig/src/cache.c 2007-06-04 13:22:23.510281176 +0200
++++ dnsmasq-2.38/src/cache.c 2007-06-04 13:22:24.014204568 +0200
+@@ -749,10 +749,11 @@
while ((token = strtok(NULL, " \t\n\r")) && (*token != '#'))
{
struct crec *cache;
diff --git a/package/dropbear/patches/100-pubkey_path.patch b/package/dropbear/patches/100-pubkey_path.patch
index cbe525bcc31203d8102c73515bd717750a103b98..3f76e3a743913e52a010a43c6da3ac1c6bcaf2f5 100644
--- a/package/dropbear/patches/100-pubkey_path.patch
+++ b/package/dropbear/patches/100-pubkey_path.patch
@@ -1,5 +1,7 @@
---- dropbear.old/svr-authpubkey.c.orig 2006-06-03 14:54:43.000000000 +0000
-+++ dropbear.dev/svr-authpubkey.c 2006-06-03 15:03:19.000000000 +0000
+Index: dropbear-0.49/svr-authpubkey.c
+===================================================================
+--- dropbear-0.49.orig/svr-authpubkey.c 2007-06-04 13:21:39.475975408 +0200
++++ dropbear-0.49/svr-authpubkey.c 2007-06-04 13:21:39.542965224 +0200
@@ -176,6 +176,8 @@
goto out;
}
diff --git a/package/dropbear/patches/110-change_user.patch b/package/dropbear/patches/110-change_user.patch
index ac617e2806c4492db294282837f5c3b5f72e8d7e..9a9a6afda14ad89c27f130c4385bce9d695c08e2 100644
--- a/package/dropbear/patches/110-change_user.patch
+++ b/package/dropbear/patches/110-change_user.patch
@@ -1,7 +1,8 @@
-diff -urN dropbear.old/svr-chansession.c dropbear.dev/svr-chansession.c
---- dropbear.old/svr-chansession.c 2005-12-09 06:42:33.000000000 +0100
-+++ dropbear.dev/svr-chansession.c 2005-12-12 01:42:38.982034750 +0100
-@@ -860,12 +860,12 @@
+Index: dropbear-0.49/svr-chansession.c
+===================================================================
+--- dropbear-0.49.orig/svr-chansession.c 2007-06-04 13:21:39.455978448 +0200
++++ dropbear-0.49/svr-chansession.c 2007-06-04 13:21:39.751933456 +0200
+@@ -908,12 +908,12 @@
/* We can only change uid/gid as root ... */
if (getuid() == 0) {
diff --git a/package/dropbear/patches/120-hostkey_prompt.patch b/package/dropbear/patches/120-hostkey_prompt.patch
index d18bff86a2c862726073602a439bbb05ae4fe55f..3a34771bed317273474ae46f4450473550238315 100644
--- a/package/dropbear/patches/120-hostkey_prompt.patch
+++ b/package/dropbear/patches/120-hostkey_prompt.patch
@@ -1,5 +1,7 @@
---- dropbear-0.49/cli-kex.c.orig 2007-02-22 09:51:36.000000000 -0600
-+++ dropbear-0.49/cli-kex.c 2007-03-22 13:45:57.000000000 -0500
+Index: dropbear-0.49/cli-kex.c
+===================================================================
+--- dropbear-0.49.orig/cli-kex.c 2007-06-04 13:21:39.435981488 +0200
++++ dropbear-0.49/cli-kex.c 2007-06-04 13:21:39.937905184 +0200
@@ -126,7 +126,7 @@
m_free(fp);
return;
diff --git a/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch b/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch
index 9b79e4864e0caf45161d52e89ffa20cb4a834083..b8a7d44e81f4613e62e80d8189307cc7337f2f01 100644
--- a/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch
+++ b/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch
@@ -1,7 +1,8 @@
-diff -ruN dropbear-0.48-old/cli-runopts.c dropbear-0.48-new/cli-runopts.c
---- dropbear-0.48-old/cli-runopts.c 2006-03-09 16:06:03.000000000 +0100
-+++ dropbear-0.48-new/cli-runopts.c 2006-03-11 12:28:54.000000000 +0100
-@@ -188,6 +188,10 @@
+Index: dropbear-0.49/cli-runopts.c
+===================================================================
+--- dropbear-0.49.orig/cli-runopts.c 2007-06-04 13:21:39.414984680 +0200
++++ dropbear-0.49/cli-runopts.c 2007-06-04 13:21:40.122877064 +0200
+@@ -203,6 +203,10 @@
debug_trace = 1;
break;
#endif
@@ -12,7 +13,7 @@ diff -ruN dropbear-0.48-old/cli-runopts.c dropbear-0.48-new/cli-runopts.c
case 'F':
case 'e':
case 'c':
-@@ -199,7 +203,6 @@
+@@ -214,7 +218,6 @@
#ifndef ENABLE_CLI_LOCALTCPFWD
case 'L':
#endif
diff --git a/package/dropbear/patches/140-use_dev_urandom.patch b/package/dropbear/patches/140-use_dev_urandom.patch
index e1424f59a39eadac871dac1f457529eeeba02235..61deff8540fd05015377e200d79985152193d535 100644
--- a/package/dropbear/patches/140-use_dev_urandom.patch
+++ b/package/dropbear/patches/140-use_dev_urandom.patch
@@ -1,7 +1,8 @@
-diff -urN dropbear-0.45.old/options.h dropbear-0.45/options.h
---- dropbear-0.45.old/options.h 2005-03-14 17:12:22.000000000 +0100
-+++ dropbear-0.45/options.h 2005-03-14 17:13:49.000000000 +0100
-@@ -143,7 +143,7 @@
+Index: dropbear-0.49/options.h
+===================================================================
+--- dropbear-0.49.orig/options.h 2007-06-04 13:21:39.394987720 +0200
++++ dropbear-0.49/options.h 2007-06-04 13:21:40.305849248 +0200
+@@ -159,7 +159,7 @@
* however significantly reduce the security of your ssh connections
* if the PRNG state becomes guessable - make sure you know what you are
* doing if you change this. */
diff --git a/package/dropbear/patches/150-dbconvert_standalone.patch b/package/dropbear/patches/150-dbconvert_standalone.patch
index 50c035ae8c802cf086ca05022fd941d09143da15..d8e283e4de85cb82e117b9021de53bf282dd3237 100644
--- a/package/dropbear/patches/150-dbconvert_standalone.patch
+++ b/package/dropbear/patches/150-dbconvert_standalone.patch
@@ -1,5 +1,7 @@
---- dropbear-0.47.old/options.h 2006-01-31 13:36:25.301562500 +0100
-+++ dropbear-0.47.dev/options.h 2006-01-31 13:37:41.846346250 +0100
+Index: dropbear-0.49/options.h
+===================================================================
+--- dropbear-0.49.orig/options.h 2007-06-04 13:21:40.305849248 +0200
++++ dropbear-0.49/options.h 2007-06-04 13:21:40.493820672 +0200
@@ -5,6 +5,11 @@
#ifndef _OPTIONS_H_
#define _OPTIONS_H_
diff --git a/package/dropbear/patches/160-tty_close.patch b/package/dropbear/patches/160-tty_close.patch
index c85429ce892d6e3ba8733bd83c4e6c0487ddfb8b..0fd9ef684d60bf5ba67f3096cf7189b150038e6d 100644
--- a/package/dropbear/patches/160-tty_close.patch
+++ b/package/dropbear/patches/160-tty_close.patch
@@ -1,28 +1,17 @@
-diff -ur db.old/common-channel.c db.dev/common-channel.c
---- db.old/common-channel.c 2007-02-22 17:17:15.000000000 +0100
-+++ db.dev/common-channel.c 2007-05-06 19:50:19.154943528 +0200
-@@ -309,15 +309,15 @@
- && (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED)) {
+Index: dropbear-0.49/common-channel.c
+===================================================================
+--- dropbear-0.49.orig/common-channel.c 2007-06-04 13:21:39.354993800 +0200
++++ dropbear-0.49/common-channel.c 2007-06-04 13:21:40.676792856 +0200
+@@ -310,10 +310,10 @@
send_msg_channel_eof(channel);
}
--
+
- /* And if we can't receive any more data from them either, close up */
-- if (!channel->sent_close
-- && channel->readfd == FD_CLOSED
-- && (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED)
-- && !write_pending(channel)) {
-- TRACE(("sending close, readfd is closed"))
-- send_msg_channel_close(channel);
-- }
-+
+ /* And if we can't receive any more data from them either, close up (server only) */
-+ if (!channel->sent_close
-+ && channel->readfd == FD_CLOSED
+ if (!channel->sent_close
+ && channel->readfd == FD_CLOSED
+- && (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED)
+ && !ERRFD_IS_WRITE(channel)
-+ && !write_pending(channel)) {
-+ TRACE(("sending close, readfd is closed"))
-+ send_msg_channel_close(channel);
-+ }
- }
-
- /* Check whether a deferred (EINPROGRESS) connect() was successful, and
+ && !write_pending(channel)) {
+ TRACE(("sending close, readfd is closed"))
+ send_msg_channel_close(channel);
diff --git a/package/ebtables/patches/100-autoconf_h.patch b/package/ebtables/patches/100-autoconf_h.patch
index 9606ab61116c6fb305884a034bcb4bc77fe487a4..9235993da3ce283e3530c882535032d7f9865978 100644
--- a/package/ebtables/patches/100-autoconf_h.patch
+++ b/package/ebtables/patches/100-autoconf_h.patch
@@ -1,6 +1,7 @@
-diff -ur ebtables.old/include/linux/netfilter_bridge.h ebtables.dev/include/linux/netfilter_bridge.h
---- ebtables.old/include/linux/netfilter_bridge.h 2006-03-30 19:24:57.000000000 +0200
-+++ ebtables.dev/include/linux/netfilter_bridge.h 2006-12-14 20:59:16.000000000 +0100
+Index: ebtables-v2.0.8-rc2/include/linux/netfilter_bridge.h
+===================================================================
+--- ebtables-v2.0.8-rc2.orig/include/linux/netfilter_bridge.h 2007-06-04 13:22:27.306704032 +0200
++++ ebtables-v2.0.8-rc2/include/linux/netfilter_bridge.h 2007-06-04 13:22:27.372694000 +0200
@@ -4,7 +4,7 @@
/* bridge-specific defines for netfilter.
*/
diff --git a/package/fuse/patches/100-cross_compile.patch b/package/fuse/patches/100-cross_compile.patch
index b7ec1518cef6ac802a1a5fbb92040f64d1660631..ffb8265537be1629340e40591dabc5f1043c7df7 100644
--- a/package/fuse/patches/100-cross_compile.patch
+++ b/package/fuse/patches/100-cross_compile.patch
@@ -1,5 +1,7 @@
---- fuse.old/kernel/configure 2007-04-01 21:04:47.000000000 +0200
-+++ fuse.dev/kernel/configure 2007-04-01 21:05:44.000000000 +0200
+Index: fuse-2.6.3/kernel/configure
+===================================================================
+--- fuse-2.6.3.orig/kernel/configure 2007-06-04 13:22:29.716337712 +0200
++++ fuse-2.6.3/kernel/configure 2007-06-04 13:22:29.783327528 +0200
@@ -1851,7 +1851,9 @@
{ echo "$as_me:$LINENO: checking kernel source version" >&5
diff --git a/package/fuse/patches/102-no_depmod.patch b/package/fuse/patches/102-no_depmod.patch
index ea9539a2006cffef923dd87d50df03a77aaeeeed..a6b9732517cb262d7c3c6115a4a6e6d9866f746d 100644
--- a/package/fuse/patches/102-no_depmod.patch
+++ b/package/fuse/patches/102-no_depmod.patch
@@ -1,7 +1,8 @@
-diff -ruN fuse-2.5.3-old/kernel/Makefile.in fuse-2.5.3-new/kernel/Makefile.in
---- fuse-2.5.3-old/kernel/Makefile.in 2006-06-17 00:04:06.000000000 +0200
-+++ fuse-2.5.3-new/kernel/Makefile.in 2006-06-17 00:08:44.000000000 +0200
-@@ -31,11 +31,9 @@
+Index: fuse-2.6.3/kernel/Makefile.in
+===================================================================
+--- fuse-2.6.3.orig/kernel/Makefile.in 2007-06-04 13:22:29.695340904 +0200
++++ fuse-2.6.3/kernel/Makefile.in 2007-06-04 13:22:29.975298344 +0200
+@@ -25,11 +25,9 @@
install-y: all
$(mkdir_p) $(DESTDIR)$(fusemoduledir)
$(INSTALL) -m 644 $(fusemodule) $(DESTDIR)$(fusemoduledir)/$(fusemodule)
diff --git a/package/fuse/patches/112-no_break_on_mknod.patch b/package/fuse/patches/112-no_break_on_mknod.patch
index 96ed70f2917e03d976474aa0f87735a2db783198..38c75c29d4e4f3ad80fcbd07c1e8dbade36006c8 100644
--- a/package/fuse/patches/112-no_break_on_mknod.patch
+++ b/package/fuse/patches/112-no_break_on_mknod.patch
@@ -1,12 +1,13 @@
-diff -ruN fuse-2.4.1-old/util/Makefile.in fuse-2.4.1-new/util/Makefile.in
---- fuse-2.4.1-old/util/Makefile.in 2005-10-17 12:29:20.000000000 +0200
-+++ fuse-2.4.1-new/util/Makefile.in 2005-10-19 17:11:13.000000000 +0200
-@@ -445,7 +445,7 @@
+Index: fuse-2.6.3/util/Makefile.in
+===================================================================
+--- fuse-2.6.3.orig/util/Makefile.in 2007-06-04 13:22:29.674344096 +0200
++++ fuse-2.6.3/util/Makefile.in 2007-06-04 13:22:30.163269768 +0200
+@@ -489,7 +489,7 @@
install-exec-hook:
-chown root $(DESTDIR)$(bindir)/fusermount
-chmod u+s $(DESTDIR)$(bindir)/fusermount
- @if test ! -e $(DESTDIR)/dev/fuse; then \
+ -@if test ! -e $(DESTDIR)/dev/fuse; then \
$(mkdir_p) $(DESTDIR)/dev; \
- echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229"; \
- mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229; \
+ echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true"; \
+ mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true; \
diff --git a/package/fuse/patches/200-disable_compat.patch b/package/fuse/patches/200-disable_compat.patch
index 4d50ada566977bd99c5e26ec5fa57ca4fd8dc4ea..93c0dfc10485e196e55abf17a9f2731c3c9446e2 100644
--- a/package/fuse/patches/200-disable_compat.patch
+++ b/package/fuse/patches/200-disable_compat.patch
@@ -1,6 +1,7 @@
-diff -ur fuse.old/include/fuse_common_compat.h fuse.dev/include/fuse_common_compat.h
---- fuse.old/include/fuse_common_compat.h 2006-09-22 21:30:16.000000000 +0200
-+++ fuse.dev/include/fuse_common_compat.h 2007-02-27 15:42:40.370284776 +0100
+Index: fuse-2.6.3/include/fuse_common_compat.h
+===================================================================
+--- fuse-2.6.3.orig/include/fuse_common_compat.h 2007-06-04 13:22:29.628351088 +0200
++++ fuse-2.6.3/include/fuse_common_compat.h 2007-06-04 13:22:30.344242256 +0200
@@ -17,6 +17,7 @@
unsigned int keep_cache : 1;
};
@@ -15,9 +16,10 @@ diff -ur fuse.old/include/fuse_common_compat.h fuse.dev/include/fuse_common_comp
void fuse_unmount_compat22(const char *mountpoint);
-
+#endif
-diff -ur fuse.old/lib/fuse.c fuse.dev/lib/fuse.c
---- fuse.old/lib/fuse.c 2007-02-02 12:57:48.000000000 +0100
-+++ fuse.dev/lib/fuse.c 2007-02-27 15:46:09.721458560 +0100
+Index: fuse-2.6.3/lib/fuse.c
+===================================================================
+--- fuse-2.6.3.orig/lib/fuse.c 2007-06-04 13:22:29.634350176 +0200
++++ fuse-2.6.3/lib/fuse.c 2007-06-04 13:22:30.345242104 +0200
@@ -128,6 +128,7 @@
static pthread_mutex_t fuse_context_lock = PTHREAD_MUTEX_INITIALIZER;
static int fuse_context_ref;
@@ -130,9 +132,10 @@ diff -ur fuse.old/lib/fuse.c fuse.dev/lib/fuse.c
__asm__(".symver fuse_new_compat25,fuse_new@FUSE_2.5");
+
+#endif
-diff -ur fuse.old/lib/fuse_lowlevel.c fuse.dev/lib/fuse_lowlevel.c
---- fuse.old/lib/fuse_lowlevel.c 2006-12-09 19:52:22.000000000 +0100
-+++ fuse.dev/lib/fuse_lowlevel.c 2007-02-27 15:32:35.903177744 +0100
+Index: fuse-2.6.3/lib/fuse_lowlevel.c
+===================================================================
+--- fuse-2.6.3.orig/lib/fuse_lowlevel.c 2007-06-04 13:22:29.639349416 +0200
++++ fuse-2.6.3/lib/fuse_lowlevel.c 2007-06-04 13:22:30.346241952 +0200
@@ -1297,6 +1297,7 @@
}
@@ -146,9 +149,10 @@ diff -ur fuse.old/lib/fuse_lowlevel.c fuse.dev/lib/fuse_lowlevel.c
__asm__(".symver fuse_lowlevel_new_compat25,fuse_lowlevel_new@FUSE_2.5");
+#endif
-diff -ur fuse.old/lib/helper.c fuse.dev/lib/helper.c
---- fuse.old/lib/helper.c 2006-12-09 19:52:22.000000000 +0100
-+++ fuse.dev/lib/helper.c 2007-02-27 15:35:17.340635520 +0100
+Index: fuse-2.6.3/lib/helper.c
+===================================================================
+--- fuse-2.6.3.orig/lib/helper.c 2007-06-04 13:22:29.645348504 +0200
++++ fuse-2.6.3/lib/helper.c 2007-06-04 13:22:30.346241952 +0200
@@ -195,7 +195,7 @@
struct fuse_args *args)
{
@@ -171,9 +175,10 @@ diff -ur fuse.old/lib/helper.c fuse.dev/lib/helper.c
__asm__(".symver fuse_main_real_compat25,fuse_main_real@FUSE_2.5");
__asm__(".symver fuse_mount_compat25,fuse_mount@FUSE_2.5");
+#endif
-diff -ur fuse.old/lib/mount.c fuse.dev/lib/mount.c
---- fuse.old/lib/mount.c 2007-01-02 18:10:33.000000000 +0100
-+++ fuse.dev/lib/mount.c 2007-02-27 15:40:13.645590320 +0100
+Index: fuse-2.6.3/lib/mount.c
+===================================================================
+--- fuse-2.6.3.orig/lib/mount.c 2007-06-04 13:22:29.652347440 +0200
++++ fuse-2.6.3/lib/mount.c 2007-06-04 13:22:30.346241952 +0200
@@ -219,11 +219,16 @@
waitpid(pid, NULL, 0);
}
diff --git a/package/haserl/patches/100-cookie_prefix.patch b/package/haserl/patches/100-cookie_prefix.patch
index abd19bcb43e37e4657c8b229cc3b2cd6383e8242..ba91fe690d8a875c366a1f7fb774a78ac080ac8c 100644
--- a/package/haserl/patches/100-cookie_prefix.patch
+++ b/package/haserl/patches/100-cookie_prefix.patch
@@ -1,6 +1,7 @@
-diff -ur haserl.old/src/haserl.c haserl.dev/src/haserl.c
---- haserl.old/src/haserl.c 2004-11-10 18:59:35.000000000 +0100
-+++ haserl.dev/src/haserl.c 2006-11-25 03:24:31.000000000 +0100
+Index: haserl-0.8.0/src/haserl.c
+===================================================================
+--- haserl-0.8.0.orig/src/haserl.c 2007-06-04 13:22:30.973146648 +0200
++++ haserl-0.8.0/src/haserl.c 2007-06-04 13:22:31.039136616 +0200
@@ -74,6 +74,7 @@
token_t /*@null@*/ *token_list = NULL;
diff --git a/package/hostapd/patches/001-cross_compile_fix.patch b/package/hostapd/patches/001-cross_compile_fix.patch
index 8b5ca681d27dfd9c40da4cc1f44a7d8adfcd1112..669264cb64567b393a9699ef106856f51acaad3b 100644
--- a/package/hostapd/patches/001-cross_compile_fix.patch
+++ b/package/hostapd/patches/001-cross_compile_fix.patch
@@ -1,9 +1,10 @@
Common subdirectories: hostapd-0.5.2/logwatch and hostapd-0.5.2.new/logwatch
-diff -u hostapd-0.5.2/Makefile hostapd-0.5.2.new/Makefile
---- hostapd-0.5.2/Makefile 2006-03-20 03:20:09.000000000 +0000
-+++ hostapd-0.5.2.new/Makefile 2006-03-21 22:25:23.803473592 +0000
-@@ -3,7 +3,7 @@
- DIR_HOSTAP=.
+Index: hostapd-0.5.7/Makefile
+===================================================================
+--- hostapd-0.5.7.orig/Makefile 2007-06-04 13:22:31.790022464 +0200
++++ hostapd-0.5.7/Makefile 2007-06-04 13:22:31.856012432 +0200
+@@ -2,7 +2,7 @@
+ DIR_WPA_SUPPLICANT=.
ifndef CFLAGS
-CFLAGS = -MMD -O2 -Wall -g
@@ -11,7 +12,7 @@ diff -u hostapd-0.5.2/Makefile hostapd-0.5.2.new/Makefile
endif
# define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
-@@ -266,7 +266,7 @@
+@@ -336,7 +336,7 @@
for i in $(ALL); do cp $$i /usr/local/bin/$$i; done
hostapd: $(OBJS)
@@ -20,7 +21,7 @@ diff -u hostapd-0.5.2/Makefile hostapd-0.5.2.new/Makefile
driver_conf.c: Makefile .config
rm -f driver_conf.c
-@@ -330,10 +330,10 @@
+@@ -400,10 +400,10 @@
endif
nt_password_hash: $(NOBJS)
diff --git a/package/hostapd/patches/100-madwifi_fixes.patch b/package/hostapd/patches/100-madwifi_fixes.patch
index f63cee7bcc07a442d4a548c34a655d3dbf8884f8..74d0c44d635335ceb293afd7c8e2c5ece04e5ca2 100644
--- a/package/hostapd/patches/100-madwifi_fixes.patch
+++ b/package/hostapd/patches/100-madwifi_fixes.patch
@@ -1,5 +1,7 @@
---- hostapd-0.5.7.orig/driver_madwifi.c 2006-11-25 02:16:56.000000000 +0100
-+++ hostapd-0.5.7/driver_madwifi.c 2007-01-06 15:58:23.761503234 +0100
+Index: hostapd-0.5.7/driver_madwifi.c
+===================================================================
+--- hostapd-0.5.7.orig/driver_madwifi.c 2007-06-04 13:22:31.768025808 +0200
++++ hostapd-0.5.7/driver_madwifi.c 2007-06-04 13:22:32.051982640 +0200
@@ -21,12 +21,9 @@
#include <include/compat.h>
#include <net80211/ieee80211.h>
diff --git a/package/hotplug2/patches/100-rules_override.patch b/package/hotplug2/patches/100-rules_override.patch
index 0d3b672e6866fc5c35d7f1317929710dcfb6cccf..55b2aaacc9ea11bb137aa9f60255281cb8dcc6b0 100644
--- a/package/hotplug2/patches/100-rules_override.patch
+++ b/package/hotplug2/patches/100-rules_override.patch
@@ -1,6 +1,7 @@
-diff -ur hotplug2.old/hotplug2.c hotplug2.dev/hotplug2.c
---- hotplug2.old/hotplug2.c 2006-10-08 15:18:23.000000000 +0200
-+++ hotplug2.dev/hotplug2.c 2007-05-05 11:38:51.456551560 +0200
+Index: hotplug2-0.9/hotplug2.c
+===================================================================
+--- hotplug2-0.9.orig/hotplug2.c 2007-06-04 13:21:41.134723240 +0200
++++ hotplug2-0.9/hotplug2.c 2007-06-04 13:21:41.203712752 +0200
@@ -391,6 +391,7 @@
int rv = 0;
int i;
diff --git a/package/iproute2/patches/000-debian_patches_3.patch b/package/iproute2/patches/000-debian_patches_3.patch
index c6b1bd6bb7cb4fd6b07229484c217aeb1233f93e..b57963c969453cb552b2ab8e02039a0343d777bf 100644
--- a/package/iproute2/patches/000-debian_patches_3.patch
+++ b/package/iproute2/patches/000-debian_patches_3.patch
@@ -1,6 +1,7 @@
-diff -Nur iproute2-2.6.15-060110/doc/ip-cref.tex iproute2-2.6.15-060110-owrt/doc/ip-cref.tex
---- iproute2-2.6.15-060110/doc/ip-cref.tex 2004-04-15 22:56:59.000000000 +0200
-+++ iproute2-2.6.15-060110-owrt/doc/ip-cref.tex 2006-03-22 12:49:35.000000000 +0100
+Index: iproute2-2.6.15-060110/doc/ip-cref.tex
+===================================================================
+--- iproute2-2.6.15-060110.orig/doc/ip-cref.tex 2007-06-04 13:22:33.437771968 +0200
++++ iproute2-2.6.15-060110/doc/ip-cref.tex 2007-06-04 13:22:33.577750688 +0200
@@ -1322,6 +1322,19 @@
If it is not given, Linux uses the value selected with \verb|sysctl|
variable \verb|net/ipv4/tcp_reordering|.
@@ -31,9 +32,10 @@ diff -Nur iproute2-2.6.15-060110/doc/ip-cref.tex iproute2-2.6.15-060110-owrt/doc
\end{thebibliography}
-diff -Nur iproute2-2.6.15-060110/doc/Makefile iproute2-2.6.15-060110-owrt/doc/Makefile
---- iproute2-2.6.15-060110/doc/Makefile 2005-03-10 20:01:36.000000000 +0100
-+++ iproute2-2.6.15-060110-owrt/doc/Makefile 2006-03-22 12:49:35.000000000 +0100
+Index: iproute2-2.6.15-060110/doc/Makefile
+===================================================================
+--- iproute2-2.6.15-060110.orig/doc/Makefile 2007-06-04 13:22:33.444770904 +0200
++++ iproute2-2.6.15-060110/doc/Makefile 2007-06-04 13:22:33.577750688 +0200
@@ -14,6 +14,7 @@
PAGESPERPAGE=2
@@ -65,9 +67,10 @@ diff -Nur iproute2-2.6.15-060110/doc/Makefile iproute2-2.6.15-060110-owrt/doc/Ma
clean:
- rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html
+ rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html $(TXTFILES)
-diff -Nur iproute2-2.6.15-060110/include/linux/pkt_sched.h iproute2-2.6.15-060110-owrt/include/linux/pkt_sched.h
---- iproute2-2.6.15-060110/include/linux/pkt_sched.h 2005-12-10 00:27:44.000000000 +0100
-+++ iproute2-2.6.15-060110-owrt/include/linux/pkt_sched.h 2006-03-22 12:49:35.000000000 +0100
+Index: iproute2-2.6.15-060110/include/linux/pkt_sched.h
+===================================================================
+--- iproute2-2.6.15-060110.orig/include/linux/pkt_sched.h 2007-06-04 13:22:33.451769840 +0200
++++ iproute2-2.6.15-060110/include/linux/pkt_sched.h 2007-06-04 13:22:33.578750536 +0200
@@ -1,3 +1,409 @@
+#if 0
+#ifndef __LINUX_PKT_SCHED_H
@@ -595,9 +598,10 @@ diff -Nur iproute2-2.6.15-060110/include/linux/pkt_sched.h iproute2-2.6.15-06011
+};
+
#endif
-diff -Nur iproute2-2.6.15-060110/ip/iproute.c iproute2-2.6.15-060110-owrt/ip/iproute.c
---- iproute2-2.6.15-060110/ip/iproute.c 2005-10-13 00:49:50.000000000 +0200
-+++ iproute2-2.6.15-060110-owrt/ip/iproute.c 2006-03-22 12:49:35.000000000 +0100
+Index: iproute2-2.6.15-060110/ip/iproute.c
+===================================================================
+--- iproute2-2.6.15-060110.orig/ip/iproute.c 2007-06-04 13:22:33.456769080 +0200
++++ iproute2-2.6.15-060110/ip/iproute.c 2007-06-04 13:22:33.578750536 +0200
@@ -60,7 +60,7 @@
fprintf(stderr, "OPTIONS := FLAGS [ mtu NUMBER ] [ advmss NUMBER ]\n");
fprintf(stderr, " [ rtt NUMBER ] [ rttvar NUMBER ]\n");
@@ -647,9 +651,10 @@ diff -Nur iproute2-2.6.15-060110/ip/iproute.c iproute2-2.6.15-060110-owrt/ip/ipr
} else if (strcmp(*argv, "rtt") == 0) {
unsigned rtt;
NEXT_ARG();
-diff -Nur iproute2-2.6.15-060110/ip/iptunnel.c iproute2-2.6.15-060110-owrt/ip/iptunnel.c
---- iproute2-2.6.15-060110/ip/iptunnel.c 2005-02-10 19:31:18.000000000 +0100
-+++ iproute2-2.6.15-060110-owrt/ip/iptunnel.c 2006-03-22 12:49:35.000000000 +0100
+Index: iproute2-2.6.15-060110/ip/iptunnel.c
+===================================================================
+--- iproute2-2.6.15-060110.orig/ip/iptunnel.c 2007-06-04 13:22:33.463768016 +0200
++++ iproute2-2.6.15-060110/ip/iptunnel.c 2007-06-04 13:22:33.579750384 +0200
@@ -225,7 +225,7 @@
NEXT_ARG();
p->i_flags |= GRE_KEY;
@@ -659,9 +664,10 @@ diff -Nur iproute2-2.6.15-060110/ip/iptunnel.c iproute2-2.6.15-060110-owrt/ip/ip
else {
if (get_unsigned(&uval, *argv, 0)<0) {
fprintf(stderr, "invalid value of \"ikey\"\n");
-diff -Nur iproute2-2.6.15-060110/Makefile iproute2-2.6.15-060110-owrt/Makefile
---- iproute2-2.6.15-060110/Makefile 2005-07-09 00:08:47.000000000 +0200
-+++ iproute2-2.6.15-060110-owrt/Makefile 2006-03-22 12:51:29.000000000 +0100
+Index: iproute2-2.6.15-060110/Makefile
+===================================================================
+--- iproute2-2.6.15-060110.orig/Makefile 2007-06-04 13:22:33.468767256 +0200
++++ iproute2-2.6.15-060110/Makefile 2007-06-04 13:22:33.579750384 +0200
@@ -32,7 +32,7 @@
LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
@@ -689,9 +695,10 @@ diff -Nur iproute2-2.6.15-060110/Makefile iproute2-2.6.15-060110-owrt/Makefile
do $(MAKE) $(MFLAGS) -C $$i clean; done
clobber: clean
-diff -Nur iproute2-2.6.15-060110/man/man8/ip.8 iproute2-2.6.15-060110-owrt/man/man8/ip.8
---- iproute2-2.6.15-060110/man/man8/ip.8 2006-01-03 20:25:29.000000000 +0100
-+++ iproute2-2.6.15-060110-owrt/man/man8/ip.8 2006-03-22 12:49:35.000000000 +0100
+Index: iproute2-2.6.15-060110/man/man8/ip.8
+===================================================================
+--- iproute2-2.6.15-060110.orig/man/man8/ip.8 2007-06-04 13:22:33.473766496 +0200
++++ iproute2-2.6.15-060110/man/man8/ip.8 2007-06-04 13:22:33.580750232 +0200
@@ -1808,6 +1808,8 @@
.RB "IP Command reference " ip-cref.ps
.br
@@ -701,9 +708,10 @@ diff -Nur iproute2-2.6.15-060110/man/man8/ip.8 iproute2-2.6.15-060110-owrt/man/m
.SH AUTHOR
Original Manpage by Michail Litvak <mci@owl.openwall.com>
-diff -Nur iproute2-2.6.15-060110/man/man8/tc.8 iproute2-2.6.15-060110-owrt/man/man8/tc.8
---- iproute2-2.6.15-060110/man/man8/tc.8 2004-06-08 22:34:17.000000000 +0200
-+++ iproute2-2.6.15-060110-owrt/man/man8/tc.8 2006-03-22 12:49:35.000000000 +0100
+Index: iproute2-2.6.15-060110/man/man8/tc.8
+===================================================================
+--- iproute2-2.6.15-060110.orig/man/man8/tc.8 2007-06-04 13:22:33.481765280 +0200
++++ iproute2-2.6.15-060110/man/man8/tc.8 2007-06-04 13:22:33.580750232 +0200
@@ -341,7 +341,7 @@
.BR tc-pfifo (8),
.BR tc-bfifo (8),
@@ -713,9 +721,10 @@ diff -Nur iproute2-2.6.15-060110/man/man8/tc.8 iproute2-2.6.15-060110-owrt/man/m
.SH AUTHOR
Manpage maintained by bert hubert (ahu@ds9a.nl)
-diff -Nur iproute2-2.6.15-060110/misc/Makefile iproute2-2.6.15-060110-owrt/misc/Makefile
---- iproute2-2.6.15-060110/misc/Makefile 2005-06-23 19:39:57.000000000 +0200
-+++ iproute2-2.6.15-060110-owrt/misc/Makefile 2006-03-22 12:49:35.000000000 +0100
+Index: iproute2-2.6.15-060110/misc/Makefile
+===================================================================
+--- iproute2-2.6.15-060110.orig/misc/Makefile 2007-06-04 13:22:33.486764520 +0200
++++ iproute2-2.6.15-060110/misc/Makefile 2007-06-04 13:22:33.580750232 +0200
@@ -1,7 +1,8 @@
SSOBJ=ss.o ssfilter.o
LNSTATOBJ=lnstat.o lnstat_util.o
@@ -726,9 +735,10 @@ diff -Nur iproute2-2.6.15-060110/misc/Makefile iproute2-2.6.15-060110-owrt/misc/
include ../Config
-diff -Nur iproute2-2.6.15-060110/misc/netbug iproute2-2.6.15-060110-owrt/misc/netbug
---- iproute2-2.6.15-060110/misc/netbug 2004-04-15 22:56:59.000000000 +0200
-+++ iproute2-2.6.15-060110-owrt/misc/netbug 2006-03-22 12:49:35.000000000 +0100
+Index: iproute2-2.6.15-060110/misc/netbug
+===================================================================
+--- iproute2-2.6.15-060110.orig/misc/netbug 2007-06-04 13:22:33.492763608 +0200
++++ iproute2-2.6.15-060110/misc/netbug 2007-06-04 13:22:33.580750232 +0200
@@ -1,23 +1,16 @@
#! /bin/bash
@@ -771,9 +781,10 @@ diff -Nur iproute2-2.6.15-060110/misc/netbug iproute2-2.6.15-060110-owrt/misc/ne
echo "Sending to <$mail>; subject is $netbug"
-diff -Nur iproute2-2.6.15-060110/tc/Makefile iproute2-2.6.15-060110-owrt/tc/Makefile
---- iproute2-2.6.15-060110/tc/Makefile 2005-07-06 00:11:37.000000000 +0200
-+++ iproute2-2.6.15-060110-owrt/tc/Makefile 2006-03-22 12:49:35.000000000 +0100
+Index: iproute2-2.6.15-060110/tc/Makefile
+===================================================================
+--- iproute2-2.6.15-060110.orig/tc/Makefile 2007-06-04 13:22:33.498762696 +0200
++++ iproute2-2.6.15-060110/tc/Makefile 2007-06-04 13:22:33.581750080 +0200
@@ -11,6 +11,7 @@
TCMODULES += q_prio.o
TCMODULES += q_tbf.o
@@ -782,9 +793,10 @@ diff -Nur iproute2-2.6.15-060110/tc/Makefile iproute2-2.6.15-060110-owrt/tc/Make
TCMODULES += f_rsvp.o
TCMODULES += f_u32.o
TCMODULES += f_route.o
-diff -Nur iproute2-2.6.15-060110/tc/q_htb.c iproute2-2.6.15-060110-owrt/tc/q_htb.c
---- iproute2-2.6.15-060110/tc/q_htb.c 2005-01-18 23:11:58.000000000 +0100
-+++ iproute2-2.6.15-060110-owrt/tc/q_htb.c 2006-03-22 12:49:35.000000000 +0100
+Index: iproute2-2.6.15-060110/tc/q_htb.c
+===================================================================
+--- iproute2-2.6.15-060110.orig/tc/q_htb.c 2007-06-04 13:22:33.503761936 +0200
++++ iproute2-2.6.15-060110/tc/q_htb.c 2007-06-04 13:22:33.581750080 +0200
@@ -1,3 +1,311 @@
+#if 0
+/*
@@ -1097,9 +1109,10 @@ diff -Nur iproute2-2.6.15-060110/tc/q_htb.c iproute2-2.6.15-060110-owrt/tc/q_htb
/*
* q_htb.c HTB.
*
-diff -Nur iproute2-2.6.15-060110/tc/q_wrr.c iproute2-2.6.15-060110-owrt/tc/q_wrr.c
---- iproute2-2.6.15-060110/tc/q_wrr.c 1970-01-01 01:00:00.000000000 +0100
-+++ iproute2-2.6.15-060110-owrt/tc/q_wrr.c 2006-03-22 12:49:35.000000000 +0100
+Index: iproute2-2.6.15-060110/tc/q_wrr.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iproute2-2.6.15-060110/tc/q_wrr.c 2007-06-04 13:22:33.582749928 +0200
@@ -0,0 +1,322 @@
+#include <stdio.h>
+#include <stdlib.h>
diff --git a/package/iproute2/patches/001-iproute2-2.6.11_Config.patch b/package/iproute2/patches/001-iproute2-2.6.11_Config.patch
index c1491f455f3a895b8d71b7529bd76d97784dc3cf..ea977c19f11d0185dcc619cd79a3a2105933780f 100644
--- a/package/iproute2/patches/001-iproute2-2.6.11_Config.patch
+++ b/package/iproute2/patches/001-iproute2-2.6.11_Config.patch
@@ -1,6 +1,7 @@
-diff -ruN iproute2-2.6.9-old/Config iproute2-2.6.9-new/Config
---- iproute2-2.6.9-old/Config 1970-01-01 01:00:00.000000000 +0100
-+++ iproute2-2.6.9-new/Config 2005-03-22 23:56:56.000000000 +0100
+Index: iproute2-2.6.15-060110/Config
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iproute2-2.6.15-060110/Config 2007-06-04 13:22:33.920698552 +0200
@@ -0,0 +1,4 @@
+# Fixed config to disable ATM support even if present on host system
+TC_CONFIG_ATM:=n
diff --git a/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch b/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch
index 34eaeb055353861336cf0089915625bbda1754ee..fd7b22b437bdf04c36b1af0b5dd6f5791180dd03 100644
--- a/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch
+++ b/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch
@@ -1,6 +1,7 @@
-diff -Nur iproute2-2.6.11-050330/ip/ipxfrm.c iproute2-2.6.11-050330.new/ip/ipxfrm.c
---- iproute2-2.6.11-050330/ip/ipxfrm.c 2005-04-01 21:58:11.000000000 +0200
-+++ iproute2-2.6.11-050330.new/ip/ipxfrm.c 2005-05-27 12:27:44.000000000 +0200
+Index: iproute2-2.6.15-060110/ip/ipxfrm.c
+===================================================================
+--- iproute2-2.6.15-060110.orig/ip/ipxfrm.c 2007-06-04 13:22:33.399777744 +0200
++++ iproute2-2.6.15-060110/ip/ipxfrm.c 2007-06-04 13:22:34.104670584 +0200
@@ -444,7 +444,6 @@
switch (sel->proto) {
case IPPROTO_TCP:
diff --git a/package/iproute2/patches/003-iproute2-htb_overhead.patch b/package/iproute2/patches/003-iproute2-htb_overhead.patch
index 77ab98383536d8821662a7248c6615f92b81e4c6..5b1bdb8d8680057ef5a8d080a3f5eafe1d8d540f 100644
--- a/package/iproute2/patches/003-iproute2-htb_overhead.patch
+++ b/package/iproute2/patches/003-iproute2-htb_overhead.patch
@@ -1,6 +1,8 @@
---- iproute2-2.6.11-050330.new/tc/q_htb.c Sun May 12 22:18:27 2002
-+++ iproute2-2.6.11-050330.new/tc/q_htb.c Sat Oct 18 00:05:18 2003
-@@ -34,10 +34,14 @@
+Index: iproute2-2.6.15-060110/tc/q_htb.c
+===================================================================
+--- iproute2-2.6.15-060110.orig/tc/q_htb.c 2007-06-04 13:22:33.581750080 +0200
++++ iproute2-2.6.15-060110/tc/q_htb.c 2007-06-04 13:22:34.291642160 +0200
+@@ -35,10 +35,14 @@
" default minor id of class to which unclassified packets are sent {0}\n"
" r2q DRR quantums are computed as rate in Bps/r2q {10}\n"
" debug string of 16 numbers each 0-3 {0}\n\n"
@@ -16,7 +18,7 @@
" ceil definite upper class rate (no borrows) {rate}\n"
" cburst burst but for ceil {computed}\n"
" mtu max packet size we create rate map for {1600}\n"
-@@ -102,7 +106,9 @@
+@@ -103,7 +107,9 @@
struct tc_htb_opt opt;
__u32 rtab[256],ctab[256];
unsigned buffer=0,cbuffer=0;
@@ -27,7 +29,7 @@
struct rtattr *tail;
memset(&opt, 0, sizeof(opt)); mtu = 1600; /* eth packet len */
-@@ -119,6 +125,16 @@
+@@ -120,6 +126,16 @@
if (get_u32(&mtu, *argv, 10)) {
explain1("mtu"); return -1;
}
@@ -44,7 +46,7 @@
} else if (matches(*argv, "quantum") == 0) {
NEXT_ARG();
if (get_u32(&opt.quantum, *argv, 10)) {
-@@ -190,14 +206,18 @@
+@@ -191,14 +207,18 @@
if (!buffer) buffer = opt.rate.rate / HZ + mtu;
if (!cbuffer) cbuffer = opt.ceil.rate / HZ + mtu;
@@ -65,7 +67,7 @@
fprintf(stderr, "htb: failed to calculate ceil rate table.\n");
return -1;
}
-@@ -221,6 +241,7 @@
+@@ -222,6 +242,7 @@
double buffer,cbuffer;
SPRINT_BUF(b1);
SPRINT_BUF(b2);
@@ -73,7 +75,7 @@
if (opt == NULL)
return 0;
-@@ -243,10 +264,16 @@
+@@ -244,10 +265,16 @@
fprintf(f, "ceil %s ", sprint_rate(hopt->ceil.rate, b1));
cbuffer = ((double)hopt->ceil.rate*tc_core_tick2usec(hopt->cbuffer))/1000000;
if (show_details) {
diff --git a/package/iproute2/patches/004-darwin_fixes.patch b/package/iproute2/patches/004-darwin_fixes.patch
index 775705c9a4305d493fc0658a7e6f447d5a5d3e8b..bb2ca3fd1949d2935aafd4a568092bffa8116eb8 100644
--- a/package/iproute2/patches/004-darwin_fixes.patch
+++ b/package/iproute2/patches/004-darwin_fixes.patch
@@ -1,6 +1,7 @@
-diff -urN iproute2-2.6.15-060110/netem/maketable.c iproute2-2.6.15-060110.new/netem/maketable.c
---- iproute2-2.6.15-060110/netem/maketable.c 2005-02-09 23:05:41.000000000 +0100
-+++ iproute2-2.6.15-060110.new/netem/maketable.c 2007-04-08 22:40:21.000000000 +0200
+Index: iproute2-2.6.15-060110/netem/maketable.c
+===================================================================
+--- iproute2-2.6.15-060110.orig/netem/maketable.c 2007-06-04 13:22:33.339786864 +0200
++++ iproute2-2.6.15-060110/netem/maketable.c 2007-06-04 13:22:34.476614040 +0200
@@ -10,7 +10,9 @@
#include <stdio.h>
#include <stdlib.h>
@@ -11,9 +12,10 @@ diff -urN iproute2-2.6.15-060110/netem/maketable.c iproute2-2.6.15-060110.new/ne
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
-diff -urN iproute2-2.6.15-060110/netem/normal.c iproute2-2.6.15-060110.new/netem/normal.c
---- iproute2-2.6.15-060110/netem/normal.c 2005-03-30 20:11:49.000000000 +0200
-+++ iproute2-2.6.15-060110.new/netem/normal.c 2007-04-08 22:47:26.000000000 +0200
+Index: iproute2-2.6.15-060110/netem/normal.c
+===================================================================
+--- iproute2-2.6.15-060110.orig/netem/normal.c 2007-06-04 13:22:33.344786104 +0200
++++ iproute2-2.6.15-060110/netem/normal.c 2007-06-04 13:22:34.476614040 +0200
@@ -8,8 +8,12 @@
#include <string.h>
#include <limits.h>
@@ -27,9 +29,10 @@ diff -urN iproute2-2.6.15-060110/netem/normal.c iproute2-2.6.15-060110.new/netem
#define TABLESIZE 16384
#define TABLEFACTOR NETEM_DIST_SCALE
-diff -urN iproute2-2.6.15-060110/netem/pareto.c iproute2-2.6.15-060110.new/netem/pareto.c
---- iproute2-2.6.15-060110/netem/pareto.c 2005-02-09 23:05:41.000000000 +0100
-+++ iproute2-2.6.15-060110.new/netem/pareto.c 2007-04-08 22:48:36.000000000 +0200
+Index: iproute2-2.6.15-060110/netem/pareto.c
+===================================================================
+--- iproute2-2.6.15-060110.orig/netem/pareto.c 2007-06-04 13:22:33.349785344 +0200
++++ iproute2-2.6.15-060110/netem/pareto.c 2007-06-04 13:22:34.476614040 +0200
@@ -7,8 +7,12 @@
#include <math.h>
#include <limits.h>
@@ -43,9 +46,10 @@ diff -urN iproute2-2.6.15-060110/netem/pareto.c iproute2-2.6.15-060110.new/netem
static const double a=3.0;
#define TABLESIZE 16384
-diff -urN iproute2-2.6.15-060110/netem/paretonormal.c iproute2-2.6.15-060110.new/netem/paretonormal.c
---- iproute2-2.6.15-060110/netem/paretonormal.c 2005-08-08 22:24:41.000000000 +0200
-+++ iproute2-2.6.15-060110.new/netem/paretonormal.c 2007-04-08 22:49:56.000000000 +0200
+Index: iproute2-2.6.15-060110/netem/paretonormal.c
+===================================================================
+--- iproute2-2.6.15-060110.orig/netem/paretonormal.c 2007-06-04 13:22:33.356784280 +0200
++++ iproute2-2.6.15-060110/netem/paretonormal.c 2007-06-04 13:22:34.476614040 +0200
@@ -15,10 +15,13 @@
#include <string.h>
#include <math.h>
diff --git a/package/iproute2/patches/005-flex-generated.patch b/package/iproute2/patches/005-flex-generated.patch
index fa5f571d2056bc78f3e71727fbd671af03c38e66..800c832748b982aaf9b75e64fbb41de5c3d1331f 100644
--- a/package/iproute2/patches/005-flex-generated.patch
+++ b/package/iproute2/patches/005-flex-generated.patch
@@ -1,6 +1,7 @@
-diff -urN iproute2-2.6.15-060110.old/tc/emp_ematch.lex.c iproute2-2.6.15-060110/tc/emp_ematch.lex.c
---- iproute2-2.6.15-060110.old/tc/emp_ematch.lex.c 1970-01-01 01:00:00.000000000 +0100
-+++ iproute2-2.6.15-060110/tc/emp_ematch.lex.c 2007-05-07 16:27:53.000000000 +0200
+Index: iproute2-2.6.15-060110/tc/emp_ematch.lex.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iproute2-2.6.15-060110/tc/emp_ematch.lex.c 2007-06-04 13:22:34.695580752 +0200
@@ -0,0 +1,1764 @@
+#define yy_create_buffer ematch__create_buffer
+#define yy_delete_buffer ematch__delete_buffer
diff --git a/package/ipsec-tools/patches/001-no_libfl.patch b/package/ipsec-tools/patches/001-no_libfl.patch
index c842e229ed2f3b108cc9a750f3f71adefe5990c7..8abc9a07ed0379103b562c3eed5614c887d8b732 100644
--- a/package/ipsec-tools/patches/001-no_libfl.patch
+++ b/package/ipsec-tools/patches/001-no_libfl.patch
@@ -1,6 +1,7 @@
-diff -ruN ipsec-tools-0.6.3-old/src/racoon/cftoken.l ipsec-tools-0.6.3-new/src/racoon/cftoken.l
---- ipsec-tools-0.6.3-old/src/racoon/cftoken.l 2005-11-06 18:18:26.000000000 +0100
-+++ ipsec-tools-0.6.3-new/src/racoon/cftoken.l 2005-12-09 01:27:27.000000000 +0100
+Index: ipsec-tools-0.6.6/src/racoon/cftoken.l
+===================================================================
+--- ipsec-tools-0.6.6.orig/src/racoon/cftoken.l 2007-06-04 13:22:36.567296208 +0200
++++ ipsec-tools-0.6.6/src/racoon/cftoken.l 2007-06-04 13:22:36.646284200 +0200
@@ -105,6 +105,8 @@
static int incstackp = 0;
@@ -10,9 +11,10 @@ diff -ruN ipsec-tools-0.6.3-old/src/racoon/cftoken.l ipsec-tools-0.6.3-new/src/r
%}
/* common seciton */
-diff -ruN ipsec-tools-0.6.3-old/src/setkey/token.l ipsec-tools-0.6.3-new/src/setkey/token.l
---- ipsec-tools-0.6.3-old/src/setkey/token.l 2005-06-29 15:01:30.000000000 +0200
-+++ ipsec-tools-0.6.3-new/src/setkey/token.l 2005-12-09 01:27:31.000000000 +0100
+Index: ipsec-tools-0.6.6/src/setkey/token.l
+===================================================================
+--- ipsec-tools-0.6.6.orig/src/setkey/token.l 2007-06-04 13:22:36.575294992 +0200
++++ ipsec-tools-0.6.6/src/setkey/token.l 2007-06-04 13:22:36.646284200 +0200
@@ -84,6 +84,8 @@
#ifndef SADB_X_EALG_AESCTR
#define SADB_X_EALG_AESCTR (-1)
diff --git a/package/ipsec-tools/patches/002-configure_cppflags_typo.patch b/package/ipsec-tools/patches/002-configure_cppflags_typo.patch
index f725ebdeed45ec56651a30293430de6b217edba3..407c67ecee342a189e812153ef910c213c4c9f69 100644
--- a/package/ipsec-tools/patches/002-configure_cppflags_typo.patch
+++ b/package/ipsec-tools/patches/002-configure_cppflags_typo.patch
@@ -1,7 +1,8 @@
-diff -ruN ipsec-tools-0.6.3-old/configure.ac ipsec-tools-0.6.3-new/configure.ac
---- ipsec-tools-0.6.3-old/configure.ac 2005-11-21 12:11:41.000000000 +0100
-+++ ipsec-tools-0.6.3-new/configure.ac 2005-12-09 02:09:06.000000000 +0100
-@@ -180,7 +180,7 @@
+Index: ipsec-tools-0.6.6/configure.ac
+===================================================================
+--- ipsec-tools-0.6.6.orig/configure.ac 2007-06-04 13:22:36.540300312 +0200
++++ ipsec-tools-0.6.6/configure.ac 2007-06-04 13:22:36.841254560 +0200
+@@ -183,7 +183,7 @@
if test "x$crypto_dir" != "x"; then
LIBS="$LIBS -L${crypto_dir}/lib"
@@ -10,10 +11,11 @@ diff -ruN ipsec-tools-0.6.3-old/configure.ac ipsec-tools-0.6.3-new/configure.ac
fi
AC_MSG_CHECKING(openssl version)
-diff -ruN ipsec-tools-0.6.3-old/configure ipsec-tools-0.6.3-new/configure
---- ipsec-tools-0.6.3-old/configure 2005-11-21 12:15:12.000000000 +0100
-+++ ipsec-tools-0.6.3-new/configure 2005-12-09 02:09:13.000000000 +0100
-@@ -23680,7 +23680,7 @@
+Index: ipsec-tools-0.6.6/configure
+===================================================================
+--- ipsec-tools-0.6.6.orig/configure 2007-06-04 13:22:36.547299248 +0200
++++ ipsec-tools-0.6.6/configure 2007-06-04 13:22:36.850253192 +0200
+@@ -23687,7 +23687,7 @@
if test "x$crypto_dir" != "x"; then
LIBS="$LIBS -L${crypto_dir}/lib"
diff --git a/package/ipsec-tools/patches/003-linux_2.6.19_rtnetlink_changes.diff b/package/ipsec-tools/patches/003-linux_2.6.19_rtnetlink_changes.diff
index 555290674c8edf2264001dd69f84c12d3242bdb3..52d092e6ce97be23f2e09933c287e17cdd45bd9c 100644
--- a/package/ipsec-tools/patches/003-linux_2.6.19_rtnetlink_changes.diff
+++ b/package/ipsec-tools/patches/003-linux_2.6.19_rtnetlink_changes.diff
@@ -1,6 +1,7 @@
-diff -ruN ipsec-tools-0.6.6-old/src/racoon/grabmyaddr.c ipsec-tools-0.6.6-new/src/racoon/grabmyaddr.c
---- ipsec-tools-0.6.6-old/src/racoon/grabmyaddr.c 2005-07-16 06:41:01.000000000 +0200
-+++ ipsec-tools-0.6.6-new/src/racoon/grabmyaddr.c 2006-12-15 15:50:13.000000000 +0100
+Index: ipsec-tools-0.6.6/src/racoon/grabmyaddr.c
+===================================================================
+--- ipsec-tools-0.6.6.orig/src/racoon/grabmyaddr.c 2007-06-04 13:22:36.521303200 +0200
++++ ipsec-tools-0.6.6/src/racoon/grabmyaddr.c 2007-06-04 13:22:37.064220664 +0200
@@ -77,10 +77,17 @@
#ifdef __linux__
#include <linux/types.h>
diff --git a/package/ipset/patches/001-kernel_26.patch b/package/ipset/patches/001-kernel_26.patch
index 46112ab25f7bebffa72d34e7df27dc6ca691a67f..4101f46bf9182780870778b92a4e51f314118c84 100644
--- a/package/ipset/patches/001-kernel_26.patch
+++ b/package/ipset/patches/001-kernel_26.patch
@@ -1,6 +1,7 @@
-diff -Nur ipset-2.2.3.orig/ipset.c ipset-2.2.3/ipset.c
---- ipset-2.2.3.orig/ipset.c 2005-04-05 09:56:02.000000000 +0200
-+++ ipset-2.2.3/ipset.c 2005-09-29 13:07:07.446923250 +0200
+Index: ipset-2.2.3/ipset.c
+===================================================================
+--- ipset-2.2.3.orig/ipset.c 2007-06-04 13:22:37.544147704 +0200
++++ ipset-2.2.3/ipset.c 2007-06-04 13:22:37.644132504 +0200
@@ -21,7 +21,6 @@
#include <stdarg.h>
#include <netdb.h>
@@ -9,9 +10,10 @@ diff -Nur ipset-2.2.3.orig/ipset.c ipset-2.2.3/ipset.c
#include "ipset.h"
-diff -Nur ipset-2.2.3.orig/ipset_iphash.c ipset-2.2.3/ipset_iphash.c
---- ipset-2.2.3.orig/ipset_iphash.c 2005-01-19 14:38:57.000000000 +0100
-+++ ipset-2.2.3/ipset_iphash.c 2005-09-29 13:07:26.308102000 +0200
+Index: ipset-2.2.3/ipset_iphash.c
+===================================================================
+--- ipset-2.2.3.orig/ipset_iphash.c 2007-06-04 13:22:37.550146792 +0200
++++ ipset-2.2.3/ipset_iphash.c 2007-06-04 13:22:37.644132504 +0200
@@ -25,7 +25,6 @@
#include <sys/types.h>
#include <netinet/in.h>
@@ -20,9 +22,10 @@ diff -Nur ipset-2.2.3.orig/ipset_iphash.c ipset-2.2.3/ipset_iphash.c
#include <asm/types.h>
#include <linux/netfilter_ipv4/ip_set_iphash.h>
-diff -Nur ipset-2.2.3.orig/ipset_ipmap.c ipset-2.2.3/ipset_ipmap.c
---- ipset-2.2.3.orig/ipset_ipmap.c 2005-01-19 14:38:57.000000000 +0100
-+++ ipset-2.2.3/ipset_ipmap.c 2005-09-29 13:07:07.446923250 +0200
+Index: ipset-2.2.3/ipset_ipmap.c
+===================================================================
+--- ipset-2.2.3.orig/ipset_ipmap.c 2007-06-04 13:22:37.556145880 +0200
++++ ipset-2.2.3/ipset_ipmap.c 2007-06-04 13:22:37.644132504 +0200
@@ -22,7 +22,6 @@
#include <sys/socket.h>
#include <netinet/in.h>
@@ -31,9 +34,10 @@ diff -Nur ipset-2.2.3.orig/ipset_ipmap.c ipset-2.2.3/ipset_ipmap.c
#include <linux/netfilter_ipv4/ip_set_ipmap.h>
#include "ipset.h"
-diff -Nur ipset-2.2.3.orig/ipset_macipmap.c ipset-2.2.3/ipset_macipmap.c
---- ipset-2.2.3.orig/ipset_macipmap.c 2005-01-19 14:38:57.000000000 +0100
-+++ ipset-2.2.3/ipset_macipmap.c 2005-09-29 13:07:07.446923250 +0200
+Index: ipset-2.2.3/ipset_macipmap.c
+===================================================================
+--- ipset-2.2.3.orig/ipset_macipmap.c 2007-06-04 13:22:37.561145120 +0200
++++ ipset-2.2.3/ipset_macipmap.c 2007-06-04 13:22:37.645132352 +0200
@@ -24,7 +24,6 @@
#include <sys/socket.h>
#include <netinet/in.h>
@@ -42,9 +46,10 @@ diff -Nur ipset-2.2.3.orig/ipset_macipmap.c ipset-2.2.3/ipset_macipmap.c
#include <linux/if_ether.h>
#include <linux/netfilter_ipv4/ip_set_macipmap.h>
-diff -Nur ipset-2.2.3.orig/ipset_nethash.c ipset-2.2.3/ipset_nethash.c
---- ipset-2.2.3.orig/ipset_nethash.c 2005-05-09 07:44:25.000000000 +0200
-+++ ipset-2.2.3/ipset_nethash.c 2005-09-29 13:07:07.446923250 +0200
+Index: ipset-2.2.3/ipset_nethash.c
+===================================================================
+--- ipset-2.2.3.orig/ipset_nethash.c 2007-06-04 13:22:37.567144208 +0200
++++ ipset-2.2.3/ipset_nethash.c 2007-06-04 13:22:37.645132352 +0200
@@ -25,7 +25,6 @@
#include <sys/types.h>
#include <netinet/in.h>
@@ -53,9 +58,10 @@ diff -Nur ipset-2.2.3.orig/ipset_nethash.c ipset-2.2.3/ipset_nethash.c
#include <asm/types.h>
#include <linux/netfilter_ipv4/ip_set_nethash.h>
-diff -Nur ipset-2.2.3.orig/ipset_portmap.c ipset-2.2.3/ipset_portmap.c
---- ipset-2.2.3.orig/ipset_portmap.c 2005-01-19 14:38:57.000000000 +0100
-+++ ipset-2.2.3/ipset_portmap.c 2005-09-29 13:07:07.446923250 +0200
+Index: ipset-2.2.3/ipset_portmap.c
+===================================================================
+--- ipset-2.2.3.orig/ipset_portmap.c 2007-06-04 13:22:37.573143296 +0200
++++ ipset-2.2.3/ipset_portmap.c 2007-06-04 13:22:37.645132352 +0200
@@ -21,7 +21,6 @@
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/package/iptables/patches/001-ipp2p-0.8.1rc1.patch b/package/iptables/patches/001-ipp2p-0.8.1rc1.patch
index f7129b4560e9372c2267b0b3aedae4d60f302a00..06397410bc0dfc6fd8318fa7dfd4353a3f1685ba 100644
--- a/package/iptables/patches/001-ipp2p-0.8.1rc1.patch
+++ b/package/iptables/patches/001-ipp2p-0.8.1rc1.patch
@@ -1,9 +1,10 @@
-diff -urN iptables.old/extensions/Makefile iptables.dev/extensions/Makefile
---- iptables.old/extensions/Makefile 2005-07-20 04:22:56.000000000 +0200
-+++ iptables.dev/extensions/Makefile 2006-03-23 14:42:28.000000000 +0100
-@@ -8,6 +8,10 @@
- PF_EXT_SLIB:=ah addrtype comment connlimit connmark conntrack dscp ecn esp hashlimit helper icmp iprange length limit mac mark multiport owner physdev pkttype realm rpc sctp standard state tcp tcpmss tos ttl udp unclean CLASSIFY CONNMARK DNAT DSCP ECN LOG MARK MASQUERADE MIRROR NETMAP NFQUEUE NOTRACK REDIRECT REJECT SAME SNAT TARPIT TCPMSS TOS TRACE TTL ULOG
- PF6_EXT_SLIB:=eui64 hl icmpv6 length limit mac mark multiport owner physdev standard tcp udp HL LOG NFQUEUE MARK TRACE
+Index: iptables-1.3.7/extensions/Makefile
+===================================================================
+--- iptables-1.3.7.orig/extensions/Makefile 2007-06-04 13:21:43.398379112 +0200
++++ iptables-1.3.7/extensions/Makefile 2007-06-04 13:21:43.484366040 +0200
+@@ -13,6 +13,10 @@
+ PF6_EXT_SE_SLIB:=SECMARK CONNSECMARK
+ endif
+
+# ipp2p
@@ -12,9 +13,10 @@ diff -urN iptables.old/extensions/Makefile iptables.dev/extensions/Makefile
# Optionals
PF_EXT_SLIB_OPTS:=$(foreach T,$(wildcard extensions/.*-test),$(shell KERNEL_DIR=$(KERNEL_DIR) $(T)))
PF6_EXT_SLIB_OPTS:=$(foreach T,$(wildcard extensions/.*-test6),$(shell KERNEL_DIR=$(KERNEL_DIR) $(T)))
-diff -urN iptables.old/extensions/libipt_ipp2p.c iptables.dev/extensions/libipt_ipp2p.c
---- iptables.old/extensions/libipt_ipp2p.c 1970-01-01 01:00:00.000000000 +0100
-+++ iptables.dev/extensions/libipt_ipp2p.c 2006-03-23 14:43:26.000000000 +0100
+Index: iptables-1.3.7/extensions/libipt_ipp2p.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iptables-1.3.7/extensions/libipt_ipp2p.c 2007-06-04 13:21:43.485365888 +0200
@@ -0,0 +1,401 @@
+
+#include <stdio.h>
@@ -417,9 +419,10 @@ diff -urN iptables.old/extensions/libipt_ipp2p.c iptables.dev/extensions/libipt_
+ register_match(&ipp2p);
+}
+
-diff -urN iptables.old/include/linux/netfilter_ipv4/ipt_ipp2p.h iptables.dev/include/linux/netfilter_ipv4/ipt_ipp2p.h
---- iptables.old/include/linux/netfilter_ipv4/ipt_ipp2p.h 1970-01-01 01:00:00.000000000 +0100
-+++ iptables.dev/include/linux/netfilter_ipv4/ipt_ipp2p.h 2006-03-23 14:44:26.000000000 +0100
+Index: iptables-1.3.7/include/linux/netfilter_ipv4/ipt_ipp2p.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iptables-1.3.7/include/linux/netfilter_ipv4/ipt_ipp2p.h 2007-06-04 13:21:43.485365888 +0200
@@ -0,0 +1,31 @@
+#ifndef __IPT_IPP2P_H
+#define __IPT_IPP2P_H
diff --git a/package/iptables/patches/002-layer7-1.5nbd.patch b/package/iptables/patches/002-layer7-1.5nbd.patch
index 95c62a860a2e0343978485d7d3e7408c8dd6d2fb..1fc4fdeca9c2a74f66bd7b072fff7894866c47dd 100644
--- a/package/iptables/patches/002-layer7-1.5nbd.patch
+++ b/package/iptables/patches/002-layer7-1.5nbd.patch
@@ -1,12 +1,14 @@
-diff -urN iptables.old/extensions/.layer7-test iptables.dev/extensions/.layer7-test
---- iptables.old/extensions/.layer7-test 1970-01-01 01:00:00.000000000 +0100
-+++ iptables.dev/extensions/.layer7-test 2005-11-10 16:57:51.819381000 +0100
+Index: iptables-1.3.7/extensions/.layer7-test
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iptables-1.3.7/extensions/.layer7-test 2007-06-04 13:21:43.708331992 +0200
@@ -0,0 +1,2 @@
+#! /bin/sh
+[ -f $KERNEL_DIR/include/linux/netfilter_ipv4/ipt_layer7.h ] && echo layer7
-diff -urN iptables.old/extensions/ipt_layer7.h iptables.dev/extensions/ipt_layer7.h
---- iptables.old/extensions/ipt_layer7.h 1970-01-01 01:00:00.000000000 +0100
-+++ iptables.dev/extensions/ipt_layer7.h 2005-11-10 17:46:32.933599750 +0100
+Index: iptables-1.3.7/extensions/ipt_layer7.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iptables-1.3.7/extensions/ipt_layer7.h 2007-06-04 13:21:43.708331992 +0200
@@ -0,0 +1,27 @@
+/*
+ By Matthew Strait <quadong@users.sf.net>, Dec 2003.
@@ -35,9 +37,10 @@ diff -urN iptables.old/extensions/ipt_layer7.h iptables.dev/extensions/ipt_layer
+};
+
+#endif /* _IPT_LAYER7_H */
-diff -urN iptables.old/extensions/libipt_layer7.c iptables.dev/extensions/libipt_layer7.c
---- iptables.old/extensions/libipt_layer7.c 1970-01-01 01:00:00.000000000 +0100
-+++ iptables.dev/extensions/libipt_layer7.c 2005-11-10 17:47:01.399378750 +0100
+Index: iptables-1.3.7/extensions/libipt_layer7.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iptables-1.3.7/extensions/libipt_layer7.c 2007-06-04 13:21:43.709331840 +0200
@@ -0,0 +1,358 @@
+/*
+ Shared library add-on to iptables to add layer 7 matching support.
@@ -397,9 +400,10 @@ diff -urN iptables.old/extensions/libipt_layer7.c iptables.dev/extensions/libipt
+{
+ register_match(&layer7);
+}
-diff -urN iptables.old/extensions/libipt_layer7.man iptables.dev/extensions/libipt_layer7.man
---- iptables.old/extensions/libipt_layer7.man 1970-01-01 01:00:00.000000000 +0100
-+++ iptables.dev/extensions/libipt_layer7.man 2005-11-10 16:57:51.823381250 +0100
+Index: iptables-1.3.7/extensions/libipt_layer7.man
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iptables-1.3.7/extensions/libipt_layer7.man 2007-06-04 13:21:43.709331840 +0200
@@ -0,0 +1,13 @@
+This module matches packets based on the application layer data of
+their connections. It uses regular expression matching to compare
diff --git a/package/iptables/patches/004-multiport_v1.patch b/package/iptables/patches/004-multiport_v1.patch
index 90b5144c753b642e7f6897479daabdb413a0bb1d..46821383e1641bb74ff529090ac0fe93961febe3 100644
--- a/package/iptables/patches/004-multiport_v1.patch
+++ b/package/iptables/patches/004-multiport_v1.patch
@@ -1,6 +1,7 @@
-diff -urN iptables.old/extensions/libipt_multiport.c iptables.dev/extensions/libipt_multiport.c
---- iptables.old/extensions/libipt_multiport.c 2005-02-19 20:19:17.000000000 +0100
-+++ iptables.dev/extensions/libipt_multiport.c 2006-02-04 05:46:12.154127750 +0100
+Index: iptables-1.3.7/extensions/libipt_multiport.c
+===================================================================
+--- iptables-1.3.7.orig/extensions/libipt_multiport.c 2007-06-04 13:21:43.344387320 +0200
++++ iptables-1.3.7/extensions/libipt_multiport.c 2007-06-04 13:21:43.932297944 +0200
@@ -8,24 +8,6 @@
/* To ensure that iptables compiles with an old kernel */
#include "../include/linux/netfilter_ipv4/ipt_multiport.h"
@@ -26,8 +27,8 @@ diff -urN iptables.old/extensions/libipt_multiport.c iptables.dev/extensions/lib
static void
help_v1(void)
{
-@@ -75,26 +57,6 @@
- "invalid port/service `%s' specified", port);
+@@ -68,26 +50,6 @@
+ }
}
-static unsigned int
@@ -53,8 +54,8 @@ diff -urN iptables.old/extensions/libipt_multiport.c iptables.dev/extensions/lib
static void
parse_multi_ports_v1(const char *portstring,
struct ipt_multiport_v1 *multiinfo,
-@@ -160,58 +122,6 @@
- "multiport only works with TCP or UDP");
+@@ -153,58 +115,6 @@
+ "multiport only works with TCP, UDP, SCTP and DCCP");
}
-/* Function which parses command options; returns true if it
@@ -112,7 +113,7 @@ diff -urN iptables.old/extensions/libipt_multiport.c iptables.dev/extensions/lib
static int
parse_v1(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
-@@ -289,43 +199,6 @@
+@@ -281,43 +191,6 @@
printf("%s", service);
}
@@ -156,7 +157,7 @@ diff -urN iptables.old/extensions/libipt_multiport.c iptables.dev/extensions/lib
static void
print_v1(const struct ipt_ip *ip,
const struct ipt_entry_match *match,
-@@ -369,34 +242,6 @@
+@@ -361,34 +234,6 @@
printf(" ");
}
@@ -191,7 +192,7 @@ diff -urN iptables.old/extensions/libipt_multiport.c iptables.dev/extensions/lib
static void save_v1(const struct ipt_ip *ip,
const struct ipt_entry_match *match)
{
-@@ -432,19 +277,20 @@
+@@ -424,19 +269,20 @@
printf(" ");
}
diff --git a/package/iptables/patches/005-imq1.patch b/package/iptables/patches/005-imq1.patch
index acb952f4385255c5757369c4fc4fc97804f5c23b..49ce9df65d83afe9c7c329de11d60db97668b020 100644
--- a/package/iptables/patches/005-imq1.patch
+++ b/package/iptables/patches/005-imq1.patch
@@ -1,11 +1,15 @@
---- iptables-1.3.6.orig/extensions.orig/.IMQ-test6 Thu Jan 1 01:00:00 1970
-+++ iptables-1.3.6/extensions/.IMQ-test6 Mon Jun 16 10:12:47 2003
+Index: iptables-1.3.7/extensions/.IMQ-test6
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iptables-1.3.7/extensions/.IMQ-test6 2007-06-04 13:21:44.124268760 +0200
@@ -0,0 +1,3 @@
+#!/bin/sh
+# True if IMQ target patch is applied.
+[ -f $KERNEL_DIR/net/ipv6/netfilter/ip6t_IMQ.c ] && echo IMQ
---- iptables-1.3.6.orig/extensions.orig/libip6t_IMQ.c Thu Jan 1 01:00:00 1970
-+++ iptables-1.3.6/extensions/libip6t_IMQ.c Mon Jun 16 10:12:47 2003
+Index: iptables-1.3.7/extensions/libip6t_IMQ.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iptables-1.3.7/extensions/libip6t_IMQ.c 2007-06-04 13:21:44.125268608 +0200
@@ -0,0 +1,101 @@
+/* Shared library add-on to iptables to add IMQ target support. */
+#include <stdio.h>
@@ -108,14 +112,18 @@
+{
+ register_target6(&imq);
+}
---- iptables-1.3.6.orig/extensions.orig/.IMQ-test Thu Jan 1 01:00:00 1970
-+++ iptables-1.3.6/extensions/.IMQ-test Mon Jun 16 10:12:47 2003
+Index: iptables-1.3.7/extensions/.IMQ-test
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iptables-1.3.7/extensions/.IMQ-test 2007-06-04 13:21:44.125268608 +0200
@@ -0,0 +1,3 @@
+#!/bin/sh
+# True if IMQ target patch is applied.
+[ -f $KERNEL_DIR/net/ipv4/netfilter/ipt_IMQ.c ] && echo IMQ
---- iptables-1.3.6.orig/extensions.orig/libipt_IMQ.c Thu Jan 1 01:00:00 1970
-+++ iptables-1.3.6/extensions/libipt_IMQ.c Mon Jun 16 10:12:47 2003
+Index: iptables-1.3.7/extensions/libipt_IMQ.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iptables-1.3.7/extensions/libipt_IMQ.c 2007-06-04 13:21:44.125268608 +0200
@@ -0,0 +1,101 @@
+/* Shared library add-on to iptables to add IMQ target support. */
+#include <stdio.h>
@@ -218,4 +226,3 @@
+{
+ register_target(&imq);
+}
-
diff --git a/package/iptables/patches/006-iprange-typesh.patch b/package/iptables/patches/006-iprange-typesh.patch
index 2dc60d44b3427638291938a81ebfb8502b9a78f1..4b4e16f281bda1ff03b7060fcdd4e83df998ecf0 100644
--- a/package/iptables/patches/006-iprange-typesh.patch
+++ b/package/iptables/patches/006-iprange-typesh.patch
@@ -1,5 +1,7 @@
---- iptables-1.3.5/extensions/libipt_iprange.c.orig 2006-12-05 19:28:58.000000000 +0100
-+++ iptables-1.3.5/extensions/libipt_iprange.c 2006-12-05 19:30:28.000000000 +0100
+Index: iptables-1.3.7/extensions/libipt_iprange.c
+===================================================================
+--- iptables-1.3.7.orig/extensions/libipt_iprange.c 2007-06-04 13:21:43.288395832 +0200
++++ iptables-1.3.7/extensions/libipt_iprange.c 2007-06-04 13:21:44.343235472 +0200
@@ -6,6 +6,7 @@
#include <getopt.h>
diff --git a/package/iptables/patches/008-chaostables.patch b/package/iptables/patches/008-chaostables.patch
index 7fc1aab456dbefecdafb68e5111372effa3232e8..25e686a842d1b6231177d1ec041bf962e16c7bf5 100644
--- a/package/iptables/patches/008-chaostables.patch
+++ b/package/iptables/patches/008-chaostables.patch
@@ -1,18 +1,21 @@
-diff -ruN iptables-1.3.5.orig/extensions/.CHAOS-test iptables-1.3.5/extensions/.CHAOS-test
---- iptables-1.3.5.orig/extensions/.CHAOS-test 1970-01-01 01:00:00.000000000 +0100
-+++ iptables-1.3.5/extensions/.CHAOS-test 2007-01-09 16:05:23.251885840 +0100
+Index: iptables-1.3.7/extensions/.CHAOS-test
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iptables-1.3.7/extensions/.CHAOS-test 2007-06-04 13:21:44.537205984 +0200
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ -f "$KERNEL_DIR/include/linux/netfilter/xt_CHAOS.h" ] && echo "CHAOS";
-diff -ruN iptables-1.3.5.orig/extensions/.DELUDE-test iptables-1.3.5/extensions/.DELUDE-test
---- iptables-1.3.5.orig/extensions/.DELUDE-test 1970-01-01 01:00:00.000000000 +0100
-+++ iptables-1.3.5/extensions/.DELUDE-test 2007-01-09 16:05:18.104057722 +0100
+Index: iptables-1.3.7/extensions/.DELUDE-test
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iptables-1.3.7/extensions/.DELUDE-test 2007-06-04 13:21:44.537205984 +0200
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "DELUDE";
-diff -ruN iptables-1.3.5.orig/extensions/libipt_CHAOS.c iptables-1.3.5/extensions/libipt_CHAOS.c
---- iptables-1.3.5.orig/extensions/libipt_CHAOS.c 1970-01-01 01:00:00.000000000 +0100
-+++ iptables-1.3.5/extensions/libipt_CHAOS.c 2007-01-09 16:05:23.251885840 +0100
+Index: iptables-1.3.7/extensions/libipt_CHAOS.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iptables-1.3.7/extensions/libipt_CHAOS.c 2007-06-04 13:21:44.537205984 +0200
@@ -0,0 +1,111 @@
+/*
+ CHAOS target for iptables
@@ -125,9 +128,10 @@ diff -ruN iptables-1.3.5.orig/extensions/libipt_CHAOS.c iptables-1.3.5/extension
+ register_target(&libipt_chaos_info);
+ return;
+}
-diff -ruN iptables-1.3.5.orig/extensions/libipt_DELUDE.c iptables-1.3.5/extensions/libipt_DELUDE.c
---- iptables-1.3.5.orig/extensions/libipt_DELUDE.c 1970-01-01 01:00:00.000000000 +0100
-+++ iptables-1.3.5/extensions/libipt_DELUDE.c 2007-01-09 16:05:18.104057722 +0100
+Index: iptables-1.3.7/extensions/libipt_DELUDE.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iptables-1.3.7/extensions/libipt_DELUDE.c 2007-06-04 13:21:44.537205984 +0200
@@ -0,0 +1,66 @@
+/*
+ DELUDE target for iptables
@@ -195,9 +199,10 @@ diff -ruN iptables-1.3.5.orig/extensions/libipt_DELUDE.c iptables-1.3.5/extensio
+ register_target(&libipt_delude_info);
+ return;
+}
-diff -ruN iptables-1.3.5.orig/extensions/libipt_portscan.c iptables-1.3.5/extensions/libipt_portscan.c
---- iptables-1.3.5.orig/extensions/libipt_portscan.c 1970-01-01 01:00:00.000000000 +0100
-+++ iptables-1.3.5/extensions/libipt_portscan.c 2007-01-09 16:05:14.228187134 +0100
+Index: iptables-1.3.7/extensions/libipt_portscan.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iptables-1.3.7/extensions/libipt_portscan.c 2007-06-04 13:21:44.538205832 +0200
@@ -0,0 +1,129 @@
+/*
+ portscan match for iptables
@@ -328,9 +333,10 @@ diff -ruN iptables-1.3.5.orig/extensions/libipt_portscan.c iptables-1.3.5/extens
+ register_match(&libipt_portscan_info);
+ return;
+}
-diff -ruN iptables-1.3.5.orig/extensions/.portscan-test iptables-1.3.5/extensions/.portscan-test
---- iptables-1.3.5.orig/extensions/.portscan-test 1970-01-01 01:00:00.000000000 +0100
-+++ iptables-1.3.5/extensions/.portscan-test 2007-01-09 16:05:14.228187134 +0100
+Index: iptables-1.3.7/extensions/.portscan-test
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ iptables-1.3.7/extensions/.portscan-test 2007-06-04 13:21:44.538205832 +0200
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ -f "$KERNEL_DIR/include/linux/netfilter/xt_portscan.h" ] && echo "portscan";
diff --git a/package/isakmpd/patches/010-debian_3.patch b/package/isakmpd/patches/010-debian_3.patch
index 551ae1ffcd81889826dd00ba77e8dc9a1cea0bf4..0f50cf9c07e926d41a54ddad0d497de4ea6a65f6 100644
--- a/package/isakmpd/patches/010-debian_3.patch
+++ b/package/isakmpd/patches/010-debian_3.patch
@@ -1,5 +1,7 @@
---- isakmpd-20041012.orig/dpd.c
-+++ isakmpd-20041012/dpd.c
+Index: isakmpd-20041012.orig/dpd.c
+===================================================================
+--- isakmpd-20041012.orig.orig/dpd.c 2007-06-04 13:22:39.088912864 +0200
++++ isakmpd-20041012.orig/dpd.c 2007-06-04 13:22:39.282883376 +0200
@@ -26,6 +26,7 @@
#include <sys/types.h>
@@ -24,8 +26,10 @@
}
if (!sa->dpd_event)
log_print("dpd_timer_reset: timer_add_event failed");
---- isakmpd-20041012.orig/ipsec.c
-+++ isakmpd-20041012/ipsec.c
+Index: isakmpd-20041012.orig/ipsec.c
+===================================================================
+--- isakmpd-20041012.orig.orig/ipsec.c 2007-06-04 13:22:39.093912104 +0200
++++ isakmpd-20041012.orig/ipsec.c 2007-06-04 13:22:39.283883224 +0200
@@ -1020,6 +1020,52 @@
}
}
@@ -99,8 +103,10 @@
type = conf_get_str(section, "ID-type");
if (!type) {
---- isakmpd-20041012.orig/GNUmakefile
-+++ isakmpd-20041012/GNUmakefile
+Index: isakmpd-20041012.orig/GNUmakefile
+===================================================================
+--- isakmpd-20041012.orig.orig/GNUmakefile 2007-06-04 13:22:39.099911192 +0200
++++ isakmpd-20041012.orig/GNUmakefile 2007-06-04 13:22:39.283883224 +0200
@@ -40,12 +40,12 @@
# integrated, freebsd/netbsd means FreeBSD/NetBSD with KAME IPsec.
# darwin means MacOS X 10.2 and later with KAME IPsec. linux means Linux-2.5
@@ -157,8 +163,10 @@
CFLAGS+= ${IPSEC_CFLAGS}
LDADD+= ${DESLIB}
DPADD+= ${DESLIBDEP}
---- isakmpd-20041012.orig/exchange.h
-+++ isakmpd-20041012/exchange.h
+Index: isakmpd-20041012.orig/exchange.h
+===================================================================
+--- isakmpd-20041012.orig.orig/exchange.h 2007-06-04 13:22:39.104910432 +0200
++++ isakmpd-20041012.orig/exchange.h 2007-06-04 13:22:39.283883224 +0200
@@ -221,6 +221,8 @@
#define EXCHANGE_FLAG_NAT_T_ENABLE 0x10 /* We are doing NAT-T. */
#define EXCHANGE_FLAG_NAT_T_KEEPALIVE 0x20 /* We are the NAT:ed peer. */
@@ -168,8 +176,10 @@
extern int exchange_add_certs(struct message *);
extern void exchange_finalize(struct message *);
---- isakmpd-20041012.orig/log.c
-+++ isakmpd-20041012/log.c
+Index: isakmpd-20041012.orig/log.c
+===================================================================
+--- isakmpd-20041012.orig.orig/log.c 2007-06-04 13:22:39.110909520 +0200
++++ isakmpd-20041012.orig/log.c 2007-06-04 13:22:39.284883072 +0200
@@ -79,7 +79,6 @@
struct packhdr {
@@ -237,8 +247,10 @@
sum = 0;
for (i = 0; i < hdrlen; i += 2)
---- isakmpd-20041012.orig/nat_traversal.c
-+++ isakmpd-20041012/nat_traversal.c
+Index: isakmpd-20041012.orig/nat_traversal.c
+===================================================================
+--- isakmpd-20041012.orig.orig/nat_traversal.c 2007-06-04 13:22:39.115908760 +0200
++++ isakmpd-20041012.orig/nat_traversal.c 2007-06-04 13:22:39.284883072 +0200
@@ -1,4 +1,4 @@
-/* $OpenBSD: nat_traversal.c,v 1.7 2004/08/08 19:11:06 deraadt Exp $ */
+/* $OpenBSD: nat_traversal.c,v 1.17 2006/06/14 14:03:33 hshoexer Exp $ */
@@ -583,8 +595,10 @@
return 1;
hbuf = nat_t_generate_nat_d_hash(msg, sa, &hbuflen);
---- isakmpd-20041012.orig/udp_encap.c
-+++ isakmpd-20041012/udp_encap.c
+Index: isakmpd-20041012.orig/udp_encap.c
+===================================================================
+--- isakmpd-20041012.orig.orig/udp_encap.c 2007-06-04 13:22:39.121907848 +0200
++++ isakmpd-20041012.orig/udp_encap.c 2007-06-04 13:22:39.284883072 +0200
@@ -61,6 +61,11 @@
#define UDP_SIZE 65536
@@ -616,16 +630,20 @@
/* Wildcard address ? */
switch (laddr->sa_family) {
case AF_INET:
---- isakmpd-20041012.orig/apps/Makefile
-+++ isakmpd-20041012/apps/Makefile
+Index: isakmpd-20041012.orig/apps/Makefile
+===================================================================
+--- isakmpd-20041012.orig.orig/apps/Makefile 2007-06-04 13:22:39.126907088 +0200
++++ isakmpd-20041012.orig/apps/Makefile 2007-06-04 13:22:39.285882920 +0200
@@ -31,4 +31,4 @@
SUBDIR= certpatch
-.include <bsd.subdir.mk>
+#.include <bsd.subdir.mk>
---- isakmpd-20041012.orig/apps/certpatch/GNUmakefile
-+++ isakmpd-20041012/apps/certpatch/GNUmakefile
+Index: isakmpd-20041012.orig/apps/certpatch/GNUmakefile
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ isakmpd-20041012.orig/apps/certpatch/GNUmakefile 2007-06-04 13:22:39.285882920 +0200
@@ -0,0 +1,55 @@
+# $OpenBSD: Makefile,v 1.7 2003/06/03 14:35:00 ho Exp $
+# $EOM: Makefile,v 1.6 2000/03/28 21:22:06 ho Exp $
@@ -682,8 +700,10 @@
+
+clean:
+ rm -f ${PROG}
---- isakmpd-20041012.orig/pf_key_v2.c
-+++ isakmpd-20041012/pf_key_v2.c
+Index: isakmpd-20041012.orig/pf_key_v2.c
+===================================================================
+--- isakmpd-20041012.orig.orig/pf_key_v2.c 2007-06-04 13:22:39.137905416 +0200
++++ isakmpd-20041012.orig/pf_key_v2.c 2007-06-04 13:22:39.287882616 +0200
@@ -1055,6 +1055,10 @@
#endif
#if defined (USE_NAT_TRAVERSAL) && defined (SADB_X_EXT_UDPENCAP)
@@ -800,8 +820,10 @@
msg.sadb_msg_satype = SADB_SATYPE_UNSPEC;
msg.sadb_msg_seq = 0;
flow = pf_key_v2_msg_new(&msg, 0);
---- isakmpd-20041012.orig/isakmp_num.cst
-+++ isakmpd-20041012/isakmp_num.cst
+Index: isakmpd-20041012.orig/isakmp_num.cst
+===================================================================
+--- isakmpd-20041012.orig.orig/isakmp_num.cst 2007-06-04 13:22:39.143904504 +0200
++++ isakmpd-20041012.orig/isakmp_num.cst 2007-06-04 13:22:39.287882616 +0200
@@ -57,15 +57,18 @@
KD 17 # RFC 3547, Key Download
SEQ 18 # RFC 3547, Sequence Number
@@ -824,8 +846,10 @@
.
# ISAKMP exchange types.
---- isakmpd-20041012.orig/ipsec_num.cst
-+++ isakmpd-20041012/ipsec_num.cst
+Index: isakmpd-20041012.orig/ipsec_num.cst
+===================================================================
+--- isakmpd-20041012.orig.orig/ipsec_num.cst 2007-06-04 13:22:39.149903592 +0200
++++ isakmpd-20041012.orig/ipsec_num.cst 2007-06-04 13:22:39.287882616 +0200
@@ -62,10 +62,10 @@
IPSEC_ENCAP
TUNNEL 1
@@ -841,8 +865,10 @@
.
# IPSEC authentication algorithm.
---- isakmpd-20041012.orig/nat_traversal.h
-+++ isakmpd-20041012/nat_traversal.h
+Index: isakmpd-20041012.orig/nat_traversal.h
+===================================================================
+--- isakmpd-20041012.orig.orig/nat_traversal.h 2007-06-04 13:22:39.154902832 +0200
++++ isakmpd-20041012.orig/nat_traversal.h 2007-06-04 13:22:39.287882616 +0200
@@ -1,4 +1,4 @@
-/* $OpenBSD: nat_traversal.h,v 1.2 2004/06/21 23:27:10 ho Exp $ */
+/* $OpenBSD: nat_traversal.h,v 1.4 2005/07/25 15:03:47 hshoexer Exp $ */
@@ -874,8 +900,10 @@
void nat_t_init(void);
int nat_t_add_vendor_payloads(struct message *);
void nat_t_check_vendor_payload(struct message *, struct payload *);
---- isakmpd-20041012.orig/message.c
-+++ isakmpd-20041012/message.c
+Index: isakmpd-20041012.orig/message.c
+===================================================================
+--- isakmpd-20041012.orig.orig/message.c 2007-06-04 13:22:39.160901920 +0200
++++ isakmpd-20041012.orig/message.c 2007-06-04 13:22:39.288882464 +0200
@@ -112,6 +112,7 @@
message_validate_hash, message_validate_sig, message_validate_nonce,
message_validate_notify, message_validate_delete,
@@ -925,8 +953,10 @@
return ISAKMP_NAT_OA_SZ;
#endif
/* Not yet supported and any other unknown payloads. */
---- isakmpd-20041012.orig/policy.c
-+++ isakmpd-20041012/policy.c
+Index: isakmpd-20041012.orig/policy.c
+===================================================================
+--- isakmpd-20041012.orig.orig/policy.c 2007-06-04 13:22:39.165901160 +0200
++++ isakmpd-20041012.orig/policy.c 2007-06-04 13:22:39.289882312 +0200
@@ -511,7 +511,10 @@
break;
}
@@ -964,8 +994,10 @@
/* Get policy file from configuration. */
policy_file = conf_get_str("General", "Policy-file");
if (!policy_file)
---- isakmpd-20041012.orig/ike_phase_1.c
-+++ isakmpd-20041012/ike_phase_1.c
+Index: isakmpd-20041012.orig/ike_phase_1.c
+===================================================================
+--- isakmpd-20041012.orig.orig/ike_phase_1.c 2007-06-04 13:22:39.170900400 +0200
++++ isakmpd-20041012.orig/ike_phase_1.c 2007-06-04 13:22:39.290882160 +0200
@@ -1040,9 +1040,9 @@
/* Compare expected/desired and received remote ID */
@@ -978,8 +1010,10 @@
return -1;
}
free(rid);
---- isakmpd-20041012.orig/x509.c
-+++ isakmpd-20041012/x509.c
+Index: isakmpd-20041012.orig/x509.c
+===================================================================
+--- isakmpd-20041012.orig.orig/x509.c 2007-06-04 13:22:39.176899488 +0200
++++ isakmpd-20041012.orig/x509.c 2007-06-04 13:22:39.290882160 +0200
@@ -910,7 +910,11 @@
X509_STORE_CTX_init(&csc, x509_cas, cert, NULL);
#if OPENSSL_VERSION_NUMBER >= 0x00907000L
@@ -992,8 +1026,10 @@
X509_STORE_CTX_set_flags(&csc, X509_V_FLAG_CRL_CHECK);
X509_STORE_CTX_set_flags(&csc, X509_V_FLAG_CRL_CHECK_ALL);
}
---- isakmpd-20041012.orig/sysdep/linux/sysdep.c
-+++ isakmpd-20041012/sysdep/linux/sysdep.c
+Index: isakmpd-20041012.orig/sysdep/linux/sysdep.c
+===================================================================
+--- isakmpd-20041012.orig.orig/sysdep/linux/sysdep.c 2007-06-04 13:22:39.182898576 +0200
++++ isakmpd-20041012.orig/sysdep/linux/sysdep.c 2007-06-04 13:22:39.291882008 +0200
@@ -169,22 +169,22 @@
return 0;
@@ -1026,8 +1062,10 @@
return -1;
}
return 0;
---- isakmpd-20041012.orig/sysdep/linux/GNUmakefile.sysdep
-+++ isakmpd-20041012/sysdep/linux/GNUmakefile.sysdep
+Index: isakmpd-20041012.orig/sysdep/linux/GNUmakefile.sysdep
+===================================================================
+--- isakmpd-20041012.orig.orig/sysdep/linux/GNUmakefile.sysdep 2007-06-04 13:22:39.187897816 +0200
++++ isakmpd-20041012.orig/sysdep/linux/GNUmakefile.sysdep 2007-06-04 13:22:39.291882008 +0200
@@ -33,13 +33,13 @@
LDADD+= -lgmp ${LIBSYSDEP} ${LIBCRYPTO}
DPADD+= ${LIBGMP} ${LIBSYSDEP}
@@ -1055,8 +1093,10 @@
CFLAGS="${CFLAGS}" MKDEP="${MKDEP}" ${MAKECMDGOALS}
ifeq ($(findstring clean,$(MAKECMDGOALS)),clean)
---- isakmpd-20041012.orig/sysdep/linux/include/bitstring.h
-+++ isakmpd-20041012/sysdep/linux/include/bitstring.h
+Index: isakmpd-20041012.orig/sysdep/linux/include/bitstring.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ isakmpd-20041012.orig/sysdep/linux/include/bitstring.h 2007-06-04 13:22:39.291882008 +0200
@@ -0,0 +1,132 @@
+/* $OpenBSD: bitstring.h,v 1.4 2002/06/19 02:50:10 millert Exp $ */
+/* $NetBSD: bitstring.h,v 1.5 1997/05/14 15:49:55 pk Exp $ */
@@ -1190,8 +1230,10 @@
+} while(0)
+
+#endif /* !_BITSTRING_H_ */
---- isakmpd-20041012.orig/sysdep/linux/include/sys/queue.h
-+++ isakmpd-20041012/sysdep/linux/include/sys/queue.h
+Index: isakmpd-20041012.orig/sysdep/linux/include/sys/queue.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ isakmpd-20041012.orig/sysdep/linux/include/sys/queue.h 2007-06-04 13:22:39.292881856 +0200
@@ -0,0 +1,453 @@
+/*
+ * Copyright (c) 1991, 1993
@@ -1646,8 +1688,10 @@
+#endif /* _KERNEL */
+
+#endif /* !_SYS_QUEUE_H_ */
---- isakmpd-20041012.orig/sysdep/common/pcap.h
-+++ isakmpd-20041012/sysdep/common/pcap.h
+Index: isakmpd-20041012.orig/sysdep/common/pcap.h
+===================================================================
+--- isakmpd-20041012.orig.orig/sysdep/common/pcap.h 2007-06-04 13:22:39.203895384 +0200
++++ isakmpd-20041012.orig/sysdep/common/pcap.h 2007-06-04 13:22:39.292881856 +0200
@@ -55,8 +55,13 @@
u_int32_t linktype; /* data link type (DLT_*) */
};
@@ -1663,8 +1707,10 @@
u_int32_t caplen; /* length of portion present */
u_int32_t len; /* length this packet (off wire) */
};
---- isakmpd-20041012.orig/sysdep/common/libsysdep/arc4random.c
-+++ isakmpd-20041012/sysdep/common/libsysdep/arc4random.c
+Index: isakmpd-20041012.orig/sysdep/common/libsysdep/arc4random.c
+===================================================================
+--- isakmpd-20041012.orig.orig/sysdep/common/libsysdep/arc4random.c 2007-06-04 13:22:39.211894168 +0200
++++ isakmpd-20041012.orig/sysdep/common/libsysdep/arc4random.c 2007-06-04 13:22:39.292881856 +0200
@@ -78,7 +78,7 @@
static void
arc4_stir(struct arc4_stream *as)
@@ -1674,8 +1720,10 @@
struct {
struct timeval tv;
u_int8_t rnd[128 - sizeof(struct timeval)];
---- isakmpd-20041012.orig/x509v3.cnf
-+++ isakmpd-20041012/x509v3.cnf
+Index: isakmpd-20041012.orig/x509v3.cnf
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ isakmpd-20041012.orig/x509v3.cnf 2007-06-04 13:22:39.293881704 +0200
@@ -0,0 +1,26 @@
+# default settings
+CERTPATHLEN = 1
@@ -1703,4 +1751,3 @@
+# The address must be provided in the CERTFQDN environment variable
+[x509v3_FQDN]
+subjectAltName=DNS:$ENV::CERTFQDN
-
diff --git a/package/isakmpd/patches/020-standardize.patch b/package/isakmpd/patches/020-standardize.patch
index d6c5e87b5bf76146f7ae4371a9dc226c776a18da..435782b6376c3d47036f6281128d71e2ba402826 100644
--- a/package/isakmpd/patches/020-standardize.patch
+++ b/package/isakmpd/patches/020-standardize.patch
@@ -1,7 +1,16 @@
-diff -urN isakmpd/GNUmakefile isakmpd.new/GNUmakefile
---- isakmpd/GNUmakefile 2004-01-16 13:36:32.000000000 +0100
-+++ isakmpd.new/GNUmakefile 2006-09-03 17:33:03.000000000 +0200
-@@ -238,3 +238,16 @@
+Index: isakmpd-20041012.orig/GNUmakefile
+===================================================================
+--- isakmpd-20041012.orig.orig/GNUmakefile 2007-06-04 13:22:39.283883224 +0200
++++ isakmpd-20041012.orig/GNUmakefile 2007-06-04 13:22:39.722816496 +0200
+@@ -168,7 +168,6 @@
+ X509= x509.c
+ CFLAGS+= -DUSE_LIBCRYPTO
+ LDADD+= -lcrypto
+-DPADD+= ${LIBCRYPTO}
+ endif
+
+ ifdef USE_RAWKEY
+@@ -242,3 +241,16 @@
realcleandepend:
rm -f .depend tags
@@ -18,9 +27,10 @@ diff -urN isakmpd/GNUmakefile isakmpd.new/GNUmakefile
+ $(INSTALL) $(INSTALL_OPTS) -m 444 isakmpd.8 $(DESTDIR)$(MANDIR)/man8
+ -mkdir -p $(DESTDIR)$(MANDIR)/man5
+ $(INSTALL) $(INSTALL_OPTS) -m 444 isakmpd.conf.5 isakmpd.policy.5 $(DESTDIR)$(MANDIR)/man5
-diff -urN isakmpd/samples/Makefile isakmpd.new/samples/Makefile
---- isakmpd/samples/Makefile 2003-06-03 16:39:50.000000000 +0200
-+++ isakmpd.new/samples/Makefile 2006-09-03 17:07:24.000000000 +0200
+Index: isakmpd-20041012.orig/samples/Makefile
+===================================================================
+--- isakmpd-20041012.orig.orig/samples/Makefile 2007-06-04 13:22:39.015923960 +0200
++++ isakmpd-20041012.orig/samples/Makefile 2007-06-04 13:22:39.722816496 +0200
@@ -26,7 +26,7 @@
#
@@ -30,10 +40,10 @@ diff -urN isakmpd/samples/Makefile isakmpd.new/samples/Makefile
# The mkdir below is for installation on OpenBSD pre 2.7
install:
-
-diff -urN isakmp.old/sysdep/linux/GNUmakefile.sysdep isakmp.dev/sysdep/linux/GNUmakefile.sysdep
---- isakmp.old/sysdep/linux/GNUmakefile.sysdep 2006-09-07 13:49:20.000000000 +0200
-+++ isakmp.dev/sysdep/linux/GNUmakefile.sysdep 2006-09-07 13:51:41.000000000 +0200
+Index: isakmpd-20041012.orig/sysdep/linux/GNUmakefile.sysdep
+===================================================================
+--- isakmpd-20041012.orig.orig/sysdep/linux/GNUmakefile.sysdep 2007-06-04 13:22:39.291882008 +0200
++++ isakmpd-20041012.orig/sysdep/linux/GNUmakefile.sysdep 2007-06-04 13:22:39.722816496 +0200
@@ -25,18 +25,18 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
@@ -57,20 +67,10 @@ diff -urN isakmp.old/sysdep/linux/GNUmakefile.sysdep isakmp.dev/sysdep/linux/GNU
FEATURES= debug tripledes blowfish cast ec aggressive x509 policy
FEATURES+= dpd nat_traversal isakmp_cfg des aes
-diff -ruN isakmpd-20041012.orig/GNUmakefile isakmpd-20041012.new/GNUmakefile
---- isakmpd-20041012.orig/GNUmakefile 2006-12-16 22:41:26.000000000 +0100
-+++ isakmpd-20041012.new/GNUmakefile 2006-12-16 22:48:27.000000000 +0100
-@@ -169,7 +169,6 @@
- X509= x509.c
- CFLAGS+= -DUSE_LIBCRYPTO
- LDADD+= -lcrypto
--DPADD+= ${LIBCRYPTO}
- endif
-
- ifdef USE_RAWKEY
-diff -ruN isakmpd-20041012.orig/Makefile isakmpd-20041012.new/Makefile
---- isakmpd-20041012.orig/Makefile 2004-10-12 23:25:52.000000000 +0200
-+++ isakmpd-20041012.new/Makefile 2006-12-16 22:46:48.000000000 +0100
+Index: isakmpd-20041012.orig/Makefile
+===================================================================
+--- isakmpd-20041012.orig.orig/Makefile 2007-06-04 13:22:39.028921984 +0200
++++ isakmpd-20041012.orig/Makefile 2007-06-04 13:22:39.723816344 +0200
@@ -147,7 +147,6 @@
.ifdef USE_LIBCRYPTO
CFLAGS+= -DUSE_LIBCRYPTO
@@ -79,9 +79,10 @@ diff -ruN isakmpd-20041012.orig/Makefile isakmpd-20041012.new/Makefile
.endif
.ifdef USE_LIBDES
-diff -ruN isakmpd-20041012.orig/apps/certpatch/Makefile isakmpd-20041012.new/apps/certpatch/Makefile
---- isakmpd-20041012.orig/apps/certpatch/Makefile 2004-10-12 23:25:52.000000000 +0200
-+++ isakmpd-20041012.new/apps/certpatch/Makefile 2006-12-16 22:48:58.000000000 +0100
+Index: isakmpd-20041012.orig/apps/certpatch/Makefile
+===================================================================
+--- isakmpd-20041012.orig.orig/apps/certpatch/Makefile 2007-06-04 13:22:39.035920920 +0200
++++ isakmpd-20041012.orig/apps/certpatch/Makefile 2007-06-04 13:22:39.723816344 +0200
@@ -40,7 +40,6 @@
.PATH: ${TOPSRC} ${TOPSRC}/sysdep/${OS} ${TOPOBJ}
CFLAGS+= -I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall
@@ -90,9 +91,10 @@ diff -ruN isakmpd-20041012.orig/apps/certpatch/Makefile isakmpd-20041012.new/app
MAN= certpatch.8
.if ${FEATURES:Mgmp} == "gmp"
-diff -ruN isakmpd-20041012.orig/regress/crypto/Makefile isakmpd-20041012.new/regress/crypto/Makefile
---- isakmpd-20041012.orig/regress/crypto/Makefile 2004-10-12 23:25:52.000000000 +0200
-+++ isakmpd-20041012.new/regress/crypto/Makefile 2006-12-16 22:50:02.000000000 +0100
+Index: isakmpd-20041012.orig/regress/crypto/Makefile
+===================================================================
+--- isakmpd-20041012.orig.orig/regress/crypto/Makefile 2007-06-04 13:22:39.041920008 +0200
++++ isakmpd-20041012.orig/regress/crypto/Makefile 2007-06-04 13:22:39.723816344 +0200
@@ -13,7 +13,7 @@
-DUSE_TRIPLEDES -DUSE_CAST -DUSE_BLOWFISH -DUSE_DES \
-DUSE_AES
@@ -102,9 +104,10 @@ diff -ruN isakmpd-20041012.orig/regress/crypto/Makefile isakmpd-20041012.new/reg
NOMAN=
DEBUG= -g
-diff -ruN isakmpd-20041012.orig/regress/dh/Makefile isakmpd-20041012.new/regress/dh/Makefile
---- isakmpd-20041012.orig/regress/dh/Makefile 2004-10-12 23:25:52.000000000 +0200
-+++ isakmpd-20041012.new/regress/dh/Makefile 2006-12-16 22:49:25.000000000 +0100
+Index: isakmpd-20041012.orig/regress/dh/Makefile
+===================================================================
+--- isakmpd-20041012.orig.orig/regress/dh/Makefile 2007-06-04 13:22:39.048918944 +0200
++++ isakmpd-20041012.orig/regress/dh/Makefile 2007-06-04 13:22:39.726815888 +0200
@@ -15,7 +15,6 @@
-DUSE_EC
NOMAN=
@@ -113,9 +116,10 @@ diff -ruN isakmpd-20041012.orig/regress/dh/Makefile isakmpd-20041012.new/regress
DEBUG= -g
.if ${FEATURES:Mgmp} == "gmp"
-diff -ruN isakmpd-20041012.orig/regress/group/Makefile isakmpd-20041012.new/regress/group/Makefile
---- isakmpd-20041012.orig/regress/group/Makefile 2004-10-12 23:25:52.000000000 +0200
-+++ isakmpd-20041012.new/regress/group/Makefile 2006-12-16 22:49:30.000000000 +0100
+Index: isakmpd-20041012.orig/regress/group/Makefile
+===================================================================
+--- isakmpd-20041012.orig.orig/regress/group/Makefile 2007-06-04 13:22:39.054918032 +0200
++++ isakmpd-20041012.orig/regress/group/Makefile 2007-06-04 13:22:39.727815736 +0200
@@ -15,7 +15,6 @@
-DUSE_EC
NOMAN=
@@ -124,9 +128,10 @@ diff -ruN isakmpd-20041012.orig/regress/group/Makefile isakmpd-20041012.new/regr
DEBUG= -g
.if ${FEATURES:Mgmp} == "gmp"
-diff -ruN isakmpd-20041012.orig/regress/rsakeygen/Makefile isakmpd-20041012.new/regress/rsakeygen/Makefile
---- isakmpd-20041012.orig/regress/rsakeygen/Makefile 2004-10-12 23:25:52.000000000 +0200
-+++ isakmpd-20041012.new/regress/rsakeygen/Makefile 2006-12-16 22:49:41.000000000 +0100
+Index: isakmpd-20041012.orig/regress/rsakeygen/Makefile
+===================================================================
+--- isakmpd-20041012.orig.orig/regress/rsakeygen/Makefile 2007-06-04 13:22:39.060917120 +0200
++++ isakmpd-20041012.orig/regress/rsakeygen/Makefile 2007-06-04 13:22:39.727815736 +0200
@@ -62,7 +62,6 @@
.ifdef USE_LIBCRYPTO
CFLAGS+= -DUSE_LIBCRYPTO
@@ -135,9 +140,10 @@ diff -ruN isakmpd-20041012.orig/regress/rsakeygen/Makefile isakmpd-20041012.new/
.endif
.if !defined (HAVE_DLOPEN) && !defined (USE_LIBCRYPTO)
-diff -ruN isakmpd-20041012.orig/regress/x509/Makefile isakmpd-20041012.new/regress/x509/Makefile
---- isakmpd-20041012.orig/regress/x509/Makefile 2004-10-12 23:25:52.000000000 +0200
-+++ isakmpd-20041012.new/regress/x509/Makefile 2006-12-16 22:49:49.000000000 +0100
+Index: isakmpd-20041012.orig/regress/x509/Makefile
+===================================================================
+--- isakmpd-20041012.orig.orig/regress/x509/Makefile 2007-06-04 13:22:39.068915904 +0200
++++ isakmpd-20041012.orig/regress/x509/Makefile 2007-06-04 13:22:39.727815736 +0200
@@ -78,7 +78,6 @@
X509= x509.c
CFLAGS+= -DUSE_LIBCRYPTO
diff --git a/package/isakmpd/patches/030-openssl_hashes.patch b/package/isakmpd/patches/030-openssl_hashes.patch
index 680db86a31d314bfe55c69053a6194588e4403b1..f50afc598ed86491950b6d1266e907d9c575e58f 100644
--- a/package/isakmpd/patches/030-openssl_hashes.patch
+++ b/package/isakmpd/patches/030-openssl_hashes.patch
@@ -1,7 +1,8 @@
-diff -urN isakmpd/GNUmakefile isakmpd.new/GNUmakefile
---- isakmpd/GNUmakefile 2006-09-01 19:29:05.000000000 +0200
-+++ isakmpd.new/GNUmakefile 2006-09-01 19:29:28.000000000 +0200
-@@ -75,13 +75,14 @@
+Index: isakmpd-20041012.orig/GNUmakefile
+===================================================================
+--- isakmpd-20041012.orig.orig/GNUmakefile 2007-06-04 13:22:39.722816496 +0200
++++ isakmpd-20041012.orig/GNUmakefile 2007-06-04 13:22:40.000774240 +0200
+@@ -76,13 +76,14 @@
isakmp_fld.c isakmp_fld.h
MAN= isakmpd.8 isakmpd.conf.5 isakmpd.policy.5
@@ -17,7 +18,7 @@ diff -urN isakmpd/GNUmakefile isakmpd.new/GNUmakefile
# Do execution time profiles
#CFLAGS+= -pg
-@@ -172,6 +173,14 @@
+@@ -175,6 +176,14 @@
CFLAGS+= -DUSE_RAWKEY
endif
@@ -30,11 +31,12 @@ diff -urN isakmpd/GNUmakefile isakmpd.new/GNUmakefile
+endif
+
SRCS+= ${IPSEC_SRCS} ${X509} ${POLICY} ${EC} ${AGGRESSIVE} ${DNSSEC} \
- $(ISAKMP_CFG)
+ $(ISAKMP_CFG) ${DPD} ${NAT_TRAVERSAL}
CFLAGS+= ${IPSEC_CFLAGS}
-diff -urN isakmpd/sysdep/common/libsysdep/GNUmakefile isakmpd.new/sysdep/common/libsysdep/GNUmakefile
---- isakmpd/sysdep/common/libsysdep/GNUmakefile 2003-06-03 16:52:06.000000000 +0200
-+++ isakmpd.new/sysdep/common/libsysdep/GNUmakefile 2006-09-01 19:29:28.000000000 +0200
+Index: isakmpd-20041012.orig/sysdep/common/libsysdep/GNUmakefile
+===================================================================
+--- isakmpd-20041012.orig.orig/sysdep/common/libsysdep/GNUmakefile 2007-06-04 13:22:38.959932472 +0200
++++ isakmpd-20041012.orig/sysdep/common/libsysdep/GNUmakefile 2007-06-04 13:22:40.000774240 +0200
@@ -31,10 +31,18 @@
.CURDIR:= $(shell pwd)
@@ -55,9 +57,10 @@ diff -urN isakmpd/sysdep/common/libsysdep/GNUmakefile isakmpd.new/sysdep/common/
lib${LIB}.a: ${SRCS:%.c=%.o}
ar cq $@ ${SRCS:%.c=%.o}
-diff -urN isakmpd/sysdep/common/libsysdep/md5.c isakmpd.new/sysdep/common/libsysdep/md5.c
---- isakmpd/sysdep/common/libsysdep/md5.c 2002-06-14 23:34:58.000000000 +0200
-+++ isakmpd.new/sysdep/common/libsysdep/md5.c 2006-09-01 19:29:28.000000000 +0200
+Index: isakmpd-20041012.orig/sysdep/common/libsysdep/md5.c
+===================================================================
+--- isakmpd-20041012.orig.orig/sysdep/common/libsysdep/md5.c 2007-06-04 13:22:38.964931712 +0200
++++ isakmpd-20041012.orig/sysdep/common/libsysdep/md5.c 2007-06-04 13:22:40.000774240 +0200
@@ -5,6 +5,8 @@
* changes to accommodate it in the kernel by ji.
*/
@@ -72,9 +75,10 @@ diff -urN isakmpd/sysdep/common/libsysdep/md5.c isakmpd.new/sysdep/common/libsys
#endif
+#endif /* USE_OPENSSL_MD5 */
-diff -urN isakmpd/sysdep/common/libsysdep/sha1.c isakmpd.new/sysdep/common/libsysdep/sha1.c
---- isakmpd/sysdep/common/libsysdep/sha1.c 2001-01-28 23:38:48.000000000 +0100
-+++ isakmpd.new/sysdep/common/libsysdep/sha1.c 2006-09-01 19:29:28.000000000 +0200
+Index: isakmpd-20041012.orig/sysdep/common/libsysdep/sha1.c
+===================================================================
+--- isakmpd-20041012.orig.orig/sysdep/common/libsysdep/sha1.c 2007-06-04 13:22:38.970930800 +0200
++++ isakmpd-20041012.orig/sysdep/common/libsysdep/sha1.c 2007-06-04 13:22:40.001774088 +0200
@@ -1,5 +1,7 @@
/* $OpenBSD: sha1.c,v 1.2 2001/01/28 22:38:48 niklas Exp $ */
@@ -89,9 +93,10 @@ diff -urN isakmpd/sysdep/common/libsysdep/sha1.c isakmpd.new/sysdep/common/libsy
}
+
+#endif /* USE_OPENSSL_SHA1 */
-diff -urN isakmpd/sysdep/common/md5.h isakmpd.new/sysdep/common/md5.h
---- isakmpd/sysdep/common/md5.h 2001-01-28 23:38:47.000000000 +0100
-+++ isakmpd.new/sysdep/common/md5.h 2006-09-01 19:29:28.000000000 +0200
+Index: isakmpd-20041012.orig/sysdep/common/md5.h
+===================================================================
+--- isakmpd-20041012.orig.orig/sysdep/common/md5.h 2007-06-04 13:22:38.976929888 +0200
++++ isakmpd-20041012.orig/sysdep/common/md5.h 2007-06-04 13:22:40.001774088 +0200
@@ -1,5 +1,15 @@
/* $OpenBSD: md5.h,v 1.2 2001/01/28 22:38:47 niklas Exp $ */
@@ -114,9 +119,10 @@ diff -urN isakmpd/sysdep/common/md5.h isakmpd.new/sysdep/common/md5.h
#define _MD5_H_
+
+#endif /* USE_OPENSSL_MD5 */
-diff -urN isakmpd/sysdep/common/sha1.h isakmpd.new/sysdep/common/sha1.h
---- isakmpd/sysdep/common/sha1.h 2001-01-28 23:38:47.000000000 +0100
-+++ isakmpd.new/sysdep/common/sha1.h 2006-09-01 19:29:28.000000000 +0200
+Index: isakmpd-20041012.orig/sysdep/common/sha1.h
+===================================================================
+--- isakmpd-20041012.orig.orig/sysdep/common/sha1.h 2007-06-04 13:22:38.982928976 +0200
++++ isakmpd-20041012.orig/sysdep/common/sha1.h 2007-06-04 13:22:40.001774088 +0200
@@ -1,5 +1,16 @@
/* $OpenBSD: sha1.h,v 1.2 2001/01/28 22:38:47 niklas Exp $ */
@@ -140,10 +146,11 @@ diff -urN isakmpd/sysdep/common/sha1.h isakmpd.new/sysdep/common/sha1.h
void SHA1Final(unsigned char digest[20], SHA1_CTX* context);
+
+#endif /* USE_OPENSSL_SHA1 */
-diff -urN isakmpd/sysdep/linux/GNUmakefile.sysdep isakmpd.new/sysdep/linux/GNUmakefile.sysdep
---- isakmpd/sysdep/linux/GNUmakefile.sysdep 2006-09-01 19:29:05.000000000 +0200
-+++ isakmpd.new/sysdep/linux/GNUmakefile.sysdep 2006-09-01 19:29:29.000000000 +0200
-@@ -48,6 +48,8 @@
+Index: isakmpd-20041012.orig/sysdep/linux/GNUmakefile.sysdep
+===================================================================
+--- isakmpd-20041012.orig.orig/sysdep/linux/GNUmakefile.sysdep 2007-06-04 13:22:39.722816496 +0200
++++ isakmpd-20041012.orig/sysdep/linux/GNUmakefile.sysdep 2007-06-04 13:22:40.001774088 +0200
+@@ -47,6 +47,8 @@
USE_LIBCRYPO= defined
HAVE_DLOPEN= defined
USE_KEYNOTE= defined
diff --git a/package/isakmpd/patches/040-security_fix.patch b/package/isakmpd/patches/040-security_fix.patch
index 9128880107d2686899690ab2a5b63b408f88cc6e..d70a722452e37071834bb745df63ac665561fc79 100644
--- a/package/isakmpd/patches/040-security_fix.patch
+++ b/package/isakmpd/patches/040-security_fix.patch
@@ -1,12 +1,8 @@
-Index: sbin/isakmpd/ipsec.c
+Index: isakmpd-20041012.orig/ipsec.c
===================================================================
-RCS file: /cvs/src/sbin/isakmpd/ipsec.c,v
-retrieving revision 1.122
-retrieving revision 1.122.2.1
-diff -u -p -r1.122 -r1.122.2.1
---- isakmpd/ipsec.c 23 Sep 2005 14:44:03 -0000 1.122
-+++ isakmpd/ipsec.c 19 Aug 2006 20:23:28 -0000 1.122.2.1
-@@ -2076,9 +2076,10 @@ ipsec_proto_init(struct proto *proto, ch
+--- isakmpd-20041012.orig.orig/ipsec.c 2007-06-04 13:22:39.283883224 +0200
++++ isakmpd-20041012.orig/ipsec.c 2007-06-04 13:22:40.247736696 +0200
+@@ -2176,9 +2176,10 @@
{
struct ipsec_proto *iproto = proto->data;
diff --git a/package/isakmpd/patches/050-ar_cross.patch b/package/isakmpd/patches/050-ar_cross.patch
index 775e94d905ca7a3183b4927b88db478af37b8edc..2bac048db38bd5d6e67a61f40a17295667d6d76e 100644
--- a/package/isakmpd/patches/050-ar_cross.patch
+++ b/package/isakmpd/patches/050-ar_cross.patch
@@ -1,6 +1,7 @@
-diff -ruN isakmpd-20041012.orig/sysdep/common/libsysdep/GNUmakefile isakmpd-20041012.new/sysdep/common/libsysdep/GNUmakefile
---- isakmpd-20041012.orig/sysdep/common/libsysdep/GNUmakefile 2007-01-08 03:16:16.000000000 +0100
-+++ isakmpd-20041012.new/sysdep/common/libsysdep/GNUmakefile 2007-01-08 03:23:24.000000000 +0100
+Index: isakmpd-20041012.orig/sysdep/common/libsysdep/GNUmakefile
+===================================================================
+--- isakmpd-20041012.orig.orig/sysdep/common/libsysdep/GNUmakefile 2007-06-04 13:22:40.000774240 +0200
++++ isakmpd-20041012.orig/sysdep/common/libsysdep/GNUmakefile 2007-06-04 13:22:40.431708728 +0200
@@ -44,7 +44,7 @@
endif
diff --git a/package/keynote/patches/001-build.patch b/package/keynote/patches/001-build.patch
index b2258d472094b69bb9196b0bf99ba9e156ec8d81..88db37230b01cd92825401786ac2c0be84efee2a 100644
--- a/package/keynote/patches/001-build.patch
+++ b/package/keynote/patches/001-build.patch
@@ -1,6 +1,7 @@
-diff -ru keynote-2.3/configure.in keynote-2.3.new/configure.in
---- keynote-2.3/configure.in 2000-09-27 01:16:28.000000000 +0200
-+++ keynote-2.3.new/configure.in 2004-01-16 11:34:03.991537404 +0100
+Index: keynote-2.3/configure.in
+===================================================================
+--- keynote-2.3.orig/configure.in 2007-06-04 13:22:41.284579072 +0200
++++ keynote-2.3/configure.in 2007-06-04 13:22:41.389563112 +0200
@@ -21,19 +21,13 @@
AC_PATH_PROG(ECHO, echo, /bin/echo)
AC_PATH_PROG(SED, sed, /usr/bin/sed)
@@ -22,9 +23,10 @@ diff -ru keynote-2.3/configure.in keynote-2.3.new/configure.in
AC_HEADER_STDC
AC_HEADER_TIME
-diff -ru keynote-2.3/keynote-keygen.c keynote-2.3.new/keynote-keygen.c
---- keynote-2.3/keynote-keygen.c 2000-09-27 02:09:13.000000000 +0200
-+++ keynote-2.3.new/keynote-keygen.c 2004-01-16 11:32:06.652242269 +0100
+Index: keynote-2.3/keynote-keygen.c
+===================================================================
+--- keynote-2.3.orig/keynote-keygen.c 2007-06-04 13:22:41.290578160 +0200
++++ keynote-2.3/keynote-keygen.c 2007-06-04 13:22:41.389563112 +0200
@@ -161,7 +161,7 @@
if (strlen(algname) + 2 > prlen)
{
@@ -34,10 +36,11 @@ diff -ru keynote-2.3/keynote-keygen.c keynote-2.3.new/keynote-keygen.c
exit(-1);
}
-diff -ru keynote-2.3/keynote.l keynote-2.3.new/keynote.l
---- keynote-2.3/keynote.l 2000-08-11 22:49:13.000000000 +0200
-+++ keynote-2.3.new/keynote.l 2004-01-16 11:17:29.910430978 +0100
-@@ -61,7 +61,8 @@ struct lex_list
+Index: keynote-2.3/keynote.l
+===================================================================
+--- keynote-2.3.orig/keynote.l 2007-06-04 13:22:41.295577400 +0200
++++ keynote-2.3/keynote.l 2007-06-04 13:22:41.390562960 +0200
+@@ -61,7 +61,8 @@
static struct lex_list *keynote_lex_list = (struct lex_list *) NULL;
static int keynote_max_lex_list = 32;
static int keynote_lex_counter = 0;
@@ -56,9 +59,10 @@ diff -ru keynote-2.3/keynote.l keynote-2.3.new/keynote.l
}
return en;
-diff -ru keynote-2.3/keynote-ver.l keynote-2.3.new/keynote-ver.l
---- keynote-2.3/keynote-ver.l 2000-08-11 22:49:13.000000000 +0200
-+++ keynote-2.3.new/keynote-ver.l 2004-01-16 11:31:14.667107044 +0100
+Index: keynote-2.3/keynote-ver.l
+===================================================================
+--- keynote-2.3.orig/keynote-ver.l 2007-06-04 13:22:41.301576488 +0200
++++ keynote-2.3/keynote-ver.l 2007-06-04 13:22:41.390562960 +0200
@@ -267,7 +267,7 @@
if (0)
{
@@ -68,9 +72,10 @@ diff -ru keynote-2.3/keynote-ver.l keynote-2.3.new/keynote-ver.l
}
}
-diff -ru keynote-2.3/keynote-ver.y keynote-2.3.new/keynote-ver.y
---- keynote-2.3/keynote-ver.y 1999-10-12 00:34:29.000000000 +0200
-+++ keynote-2.3.new/keynote-ver.y 2004-01-16 11:07:19.709634736 +0100
+Index: keynote-2.3/keynote-ver.y
+===================================================================
+--- keynote-2.3.orig/keynote-ver.y 2007-06-04 13:22:41.306575728 +0200
++++ keynote-2.3/keynote-ver.y 2007-06-04 13:22:41.390562960 +0200
@@ -49,7 +49,7 @@
return keynote_errno;
free($1);
@@ -88,9 +93,10 @@ diff -ru keynote-2.3/keynote-ver.y keynote-2.3.new/keynote-ver.y
%%
void
kverror(char *s)
-diff -ru keynote-2.3/keynote.y keynote-2.3.new/keynote.y
---- keynote-2.3/keynote.y 2000-06-14 08:28:23.000000000 +0200
-+++ keynote-2.3.new/keynote.y 2004-01-16 11:14:55.365898229 +0100
+Index: keynote-2.3/keynote.y
+===================================================================
+--- keynote-2.3.orig/keynote.y 2007-06-04 13:22:41.311574968 +0200
++++ keynote-2.3/keynote.y 2007-06-04 13:22:41.391562808 +0200
@@ -73,8 +73,7 @@
%}
%%
@@ -274,9 +280,10 @@ diff -ru keynote-2.3/keynote.y keynote-2.3.new/keynote.y
%%
/*
-diff -ru keynote-2.3/Makefile.in keynote-2.3.new/Makefile.in
---- keynote-2.3/Makefile.in 2000-09-27 01:16:27.000000000 +0200
-+++ keynote-2.3.new/Makefile.in 2004-01-16 11:35:38.841528129 +0100
+Index: keynote-2.3/Makefile.in
+===================================================================
+--- keynote-2.3.orig/Makefile.in 2007-06-04 13:22:41.317574056 +0200
++++ keynote-2.3/Makefile.in 2007-06-04 13:22:41.391562808 +0200
@@ -41,7 +41,8 @@
YACCFLAGS = -d -p kn -b k
LEXFLAGS2 = -Pkv -s -i
@@ -296,9 +303,10 @@ diff -ru keynote-2.3/Makefile.in keynote-2.3.new/Makefile.in
k.tab.c: keynote.y header.h keynote.h assertion.h config.h
$(YACC) $(YACCFLAGS) keynote.y
-diff -ru keynote-2.3/signature.c keynote-2.3.new/signature.c
---- keynote-2.3/signature.c 1999-10-12 00:34:31.000000000 +0200
-+++ keynote-2.3.new/signature.c 2004-01-16 11:30:48.062084986 +0100
+Index: keynote-2.3/signature.c
+===================================================================
+--- keynote-2.3.orig/signature.c 2007-06-04 13:22:41.323573144 +0200
++++ keynote-2.3/signature.c 2007-06-04 13:22:41.392562656 +0200
@@ -515,7 +515,7 @@
kk = dc->dec_key;
if (keytype == KEYNOTE_PRIVATE_KEY)
diff --git a/package/keynote/patches/002-cross_compile.patch b/package/keynote/patches/002-cross_compile.patch
index c6d5365507cdf6ca82f8059f535f59d4cf93b8f1..050efbd75b787344ce8df6c1da5cbbb1b03ab87f 100644
--- a/package/keynote/patches/002-cross_compile.patch
+++ b/package/keynote/patches/002-cross_compile.patch
@@ -1,6 +1,7 @@
-diff -urN keynote-2.3/configure keynote-2.3.new/configure
---- keynote-2.3/configure 2000-09-27 01:16:28.000000000 +0200
-+++ keynote-2.3.new/configure 2006-09-01 19:16:35.000000000 +0200
+Index: keynote-2.3/configure
+===================================================================
+--- keynote-2.3.orig/configure 2007-06-04 13:22:41.259582872 +0200
++++ keynote-2.3/configure 2007-06-04 13:22:41.658522224 +0200
@@ -889,52 +889,10 @@
done
test -n "$YACC" || YACC="yacc"
@@ -561,9 +562,10 @@ diff -urN keynote-2.3/configure keynote-2.3.new/configure
s%@RM@%$RM%g
s%@AR@%$AR%g
s%@NROFF@%$NROFF%g
-diff -urN keynote-2.3/configure.in keynote-2.3.new/configure.in
---- keynote-2.3/configure.in 2006-09-01 19:08:13.000000000 +0200
-+++ keynote-2.3.new/configure.in 2006-09-01 19:16:05.000000000 +0200
+Index: keynote-2.3/configure.in
+===================================================================
+--- keynote-2.3.orig/configure.in 2007-06-04 13:22:41.389563112 +0200
++++ keynote-2.3/configure.in 2007-06-04 13:22:41.658522224 +0200
@@ -9,8 +9,8 @@
AC_PROG_CC
AC_PROG_RANLIB
diff --git a/package/libpcap/patches/100-shared-lib.patch b/package/libpcap/patches/100-shared-lib.patch
index 54cc774a3760d311d7c391b67d02d48487a1736c..2ca9f51bd1be5557f6227fe3f317bfe11fc08153 100644
--- a/package/libpcap/patches/100-shared-lib.patch
+++ b/package/libpcap/patches/100-shared-lib.patch
@@ -1,6 +1,7 @@
-diff -urN libpcap-0.9.4.orig/Makefile.in libpcap-0.9.4/Makefile.in
---- libpcap-0.9.4.orig/Makefile.in 2003-12-15 02:35:03.000000000 +0100
-+++ libpcap-0.9.4/Makefile.in 2006-02-05 16:56:18.000000000 +0100
+Index: libpcap-0.9.4/Makefile.in
+===================================================================
+--- libpcap-0.9.4.orig/Makefile.in 2007-06-04 13:22:03.547316008 +0200
++++ libpcap-0.9.4/Makefile.in 2007-06-04 13:22:03.614305824 +0200
@@ -37,6 +37,15 @@
srcdir = @srcdir@
VPATH = @srcdir@
diff --git a/package/libpcap/patches/101-cross-compile-fix.patch b/package/libpcap/patches/101-cross-compile-fix.patch
index 5ba78adaef6f9c380cc20834f3fe0473b1d09775..e73b4c9c24f1d0e342099cfc7c1b1cce8b0fa733 100644
--- a/package/libpcap/patches/101-cross-compile-fix.patch
+++ b/package/libpcap/patches/101-cross-compile-fix.patch
@@ -1,6 +1,7 @@
-diff -urN libpcap-0.9.4.orig/Makefile.in libpcap-0.9.4/Makefile.in
---- libpcap-0.9.4.orig/Makefile.in 2006-02-05 16:57:16.000000000 +0100
-+++ libpcap-0.9.4/Makefile.in 2006-02-05 16:57:03.000000000 +0100
+Index: libpcap-0.9.4/Makefile.in
+===================================================================
+--- libpcap-0.9.4.orig/Makefile.in 2007-06-04 13:22:03.614305824 +0200
++++ libpcap-0.9.4/Makefile.in 2007-06-04 13:22:03.799277704 +0200
@@ -117,7 +117,7 @@
libpcap.a: $(OBJ)
diff --git a/package/libpcap/patches/102-alt-ether.patch b/package/libpcap/patches/102-alt-ether.patch
index 347265d6e913a0ac4d9ab1779652a3de538f721c..5f356ca99036c6bf5ef5ca9bd3f279426777825a 100644
--- a/package/libpcap/patches/102-alt-ether.patch
+++ b/package/libpcap/patches/102-alt-ether.patch
@@ -1,6 +1,7 @@
-diff -urN libpcap-0.9.4.orig/nametoaddr.c libpcap-0.9.4/nametoaddr.c
---- libpcap-0.9.4.orig/nametoaddr.c 2005-04-20 13:13:51.000000000 +0200
-+++ libpcap-0.9.4/nametoaddr.c 2006-02-05 16:58:46.000000000 +0100
+Index: libpcap-0.9.4/nametoaddr.c
+===================================================================
+--- libpcap-0.9.4.orig/nametoaddr.c 2007-06-04 13:22:03.499323304 +0200
++++ libpcap-0.9.4/nametoaddr.c 2007-06-04 13:22:03.986249280 +0200
@@ -410,7 +410,7 @@
e = ep = (u_char *)malloc(6);
@@ -10,9 +11,10 @@ diff -urN libpcap-0.9.4.orig/nametoaddr.c libpcap-0.9.4/nametoaddr.c
s += 1;
d = xdtoi(*s++);
if (isxdigit((unsigned char)*s)) {
-diff -urN libpcap-0.9.4.orig/scanner.l libpcap-0.9.4/scanner.l
---- libpcap-0.9.4.orig/scanner.l 2005-09-05 11:08:07.000000000 +0200
-+++ libpcap-0.9.4/scanner.l 2006-02-05 17:00:13.000000000 +0100
+Index: libpcap-0.9.4/scanner.l
+===================================================================
+--- libpcap-0.9.4.orig/scanner.l 2007-06-04 13:22:03.506322240 +0200
++++ libpcap-0.9.4/scanner.l 2007-06-04 13:22:03.987249128 +0200
@@ -80,6 +80,7 @@
N ([0-9]+|(0X|0x)[0-9A-Fa-f]+)
B ([0-9A-Fa-f][0-9A-Fa-f]?)
diff --git a/package/libpcap/patches/103-flex_workaround.patch b/package/libpcap/patches/103-flex_workaround.patch
index 5b6d0db0cbfaa6686a611a8a31bb1550219f0405..19848979b49906f8e9170a9a534320f2b5e423da 100644
--- a/package/libpcap/patches/103-flex_workaround.patch
+++ b/package/libpcap/patches/103-flex_workaround.patch
@@ -1,9 +1,10 @@
Copyright (C) 2006 Markus Wigge
-diff -urN libpcap-0.9.4.orig/Makefile.in libpcap-0.9.4/Makefile.in
---- libpcap-0.9.4.orig/Makefile.in 2006-07-19 09:27:47.000000000 +0200
-+++ libpcap-0.9.4/Makefile.in 2006-07-19 09:34:48.000000000 +0200
+Index: libpcap-0.9.4/Makefile.in
+===================================================================
+--- libpcap-0.9.4.orig/Makefile.in 2007-06-04 13:22:03.799277704 +0200
++++ libpcap-0.9.4/Makefile.in 2007-06-04 13:22:04.181219640 +0200
@@ -53,7 +53,7 @@
CC = @CC@
CCOPT = @V_CCOPT@
@@ -12,3 +13,4 @@ diff -urN libpcap-0.9.4.orig/Makefile.in libpcap-0.9.4/Makefile.in
+DEFS = -D_BSD_SOURCE @DEFS@ @V_DEFS@
LIBS = @V_LIBS@
DYEXT = @DYEXT@
+
diff --git a/package/linux-atm/patches/000-debian_16.patch b/package/linux-atm/patches/000-debian_16.patch
index da82cc832e7f1bd1fbb1372bfe1f77930234c516..de6434dc6a5ec52850a4ca6e7a88bf3eb5d1abc0 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 "<stdin>"
+# 1 "<built-in>"
@@ -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 <config.h>
#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 <net/if.h>
#include <atm.h>
@@ -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 <config.h>
#endif
@@ -25704,8 +25794,10 @@
#include <unistd.h>
#include <sys/time.h>
#include <errno.h>
---- 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 <config.h>
#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 <config.h>
#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 <config.h>
#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 <config.h>
#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 <config.h>
#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 <string.h>
#include <errno.h>
@@ -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 <bengen+debian@hilluzination.de>
@@ -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 <russell@coker.com.au> 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 <russell@coker.com.au> 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 <russell@coker.com.au> 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 073f68bd365bc01f637d7afcbfbd735e08c133b5..112c5bb6353ade84b952d84cd5638efc22891f63 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 1b538b2a3b51213317de42cc064a3e3fddc6e04e..e762e4d4a755301dc1723c4197fd8cb5dfea9843 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 <stdio.h>
- #include <unistd.h>
+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 <stdio.h>
#include <unistd.h>
@@ -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 <stdio.h>
#include <unistd.h>
@@ -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 1b9be11ece3f308e73ff469de356b10e0b7a2dd8..e8adf483aa268df1c98eb899e13c2c0ac9a8289c 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 <<CEOF' >>$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 <<CEOF' >>$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 7c1e8c14f465c8c87854b8ca51120a2f1d9a18eb..ead336cff4c32eb68f72e454ed4b6b879d9fc0df 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
diff --git a/package/madwifi/patches/100-kernel_cflags.patch b/package/madwifi/patches/100-kernel_cflags.patch
index ffb600c7a566af7abb1eb8c17d3a277eb5d59665..10c7280486e77788e2498a345a550750dc000ad1 100644
--- a/package/madwifi/patches/100-kernel_cflags.patch
+++ b/package/madwifi/patches/100-kernel_cflags.patch
@@ -1,6 +1,7 @@
-diff -urN madwifi-ng-r2377-20070526.old/hal/public/mips-be-elf.inc madwifi-ng-r2377-20070526.dev/hal/public/mips-be-elf.inc
---- madwifi-ng-r2377-20070526.old/hal/public/mips-be-elf.inc 2006-05-27 04:48:16.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/hal/public/mips-be-elf.inc 2007-05-26 18:51:08.033866208 +0200
+Index: madwifi-ng-r2420-20070602/hal/public/mips-be-elf.inc
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/hal/public/mips-be-elf.inc 2007-06-04 13:21:53.676816552 +0200
++++ madwifi-ng-r2420-20070602/hal/public/mips-be-elf.inc 2007-06-04 13:21:53.760803784 +0200
@@ -71,5 +71,5 @@
LDOPTS= -EB
@@ -8,9 +9,10 @@ diff -urN madwifi-ng-r2377-20070526.old/hal/public/mips-be-elf.inc madwifi-ng-r2
-COPTS+= -G 0 -EB -mno-abicalls -fno-pic -mips2 -Wa,--trap \
+COPTS+= -G 0 -mno-abicalls -fno-pic -mips32 -Wa,--trap \
-fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls
-diff -urN madwifi-ng-r2377-20070526.old/hal/public/mips-le-elf.inc madwifi-ng-r2377-20070526.dev/hal/public/mips-le-elf.inc
---- madwifi-ng-r2377-20070526.old/hal/public/mips-le-elf.inc 2006-05-27 04:48:16.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/hal/public/mips-le-elf.inc 2007-05-26 18:51:08.033866208 +0200
+Index: madwifi-ng-r2420-20070602/hal/public/mips-le-elf.inc
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/hal/public/mips-le-elf.inc 2007-06-04 13:21:53.681815792 +0200
++++ madwifi-ng-r2420-20070602/hal/public/mips-le-elf.inc 2007-06-04 13:21:53.760803784 +0200
@@ -68,5 +68,5 @@
LDOPTS= -EL
@@ -18,9 +20,10 @@ diff -urN madwifi-ng-r2377-20070526.old/hal/public/mips-le-elf.inc madwifi-ng-r2
-COPTS+= -G 0 -EL -mno-abicalls -fno-pic -mips2 -Wa,--trap \
+COPTS+= -G 0 -mno-abicalls -fno-pic -mips32 -Wa,--trap \
-fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls
-diff -urN madwifi-ng-r2377-20070526.old/hal/public/xscale-be-elf.inc madwifi-ng-r2377-20070526.dev/hal/public/xscale-be-elf.inc
---- madwifi-ng-r2377-20070526.old/hal/public/xscale-be-elf.inc 2006-09-14 08:21:22.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/hal/public/xscale-be-elf.inc 2007-05-26 18:51:08.034866056 +0200
+Index: madwifi-ng-r2420-20070602/hal/public/xscale-be-elf.inc
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/hal/public/xscale-be-elf.inc 2007-06-04 13:21:53.688814728 +0200
++++ madwifi-ng-r2420-20070602/hal/public/xscale-be-elf.inc 2007-06-04 13:21:53.760803784 +0200
@@ -77,5 +77,5 @@
LDOPTS= -EB
@@ -28,9 +31,10 @@ diff -urN madwifi-ng-r2377-20070526.old/hal/public/xscale-be-elf.inc madwifi-ng-
-COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \
+COPTS+= -march=armv5te -mbig-endian -fno-strict-aliasing -fno-common \
-mtune=xscale -mshort-load-bytes
-diff -urN madwifi-ng-r2377-20070526.old/Makefile madwifi-ng-r2377-20070526.dev/Makefile
---- madwifi-ng-r2377-20070526.old/Makefile 2007-05-26 00:31:56.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/Makefile 2007-05-26 18:51:08.034866056 +0200
+Index: madwifi-ng-r2420-20070602/Makefile
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/Makefile 2007-06-04 13:21:53.694813816 +0200
++++ madwifi-ng-r2420-20070602/Makefile 2007-06-04 13:21:53.760803784 +0200
@@ -56,7 +56,7 @@
all: modules tools
diff --git a/package/madwifi/patches/102-multicall_binary.patch b/package/madwifi/patches/102-multicall_binary.patch
index 2b3530a469be5363866761e80c2c879d917d80dc..31dec0f4e496a98a5711cebbb6c8eeb810dc8c1f 100644
--- a/package/madwifi/patches/102-multicall_binary.patch
+++ b/package/madwifi/patches/102-multicall_binary.patch
@@ -1,6 +1,7 @@
-diff -urN madwifi-ng-r2377-20070526.old/tools/80211debug.c madwifi-ng-r2377-20070526.dev/tools/80211debug.c
---- madwifi-ng-r2377-20070526.old/tools/80211debug.c 2007-05-24 23:21:08.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/tools/80211debug.c 2007-05-26 18:51:08.119853136 +0200
+Index: madwifi-ng-r2420-20070602/tools/80211debug.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/tools/80211debug.c 2007-06-04 13:21:53.599828256 +0200
++++ madwifi-ng-r2420-20070602/tools/80211debug.c 2007-06-04 13:21:53.990768824 +0200
@@ -49,6 +49,10 @@
#include <getopt.h>
#include <err.h>
@@ -32,9 +33,10 @@ diff -urN madwifi-ng-r2377-20070526.old/tools/80211debug.c madwifi-ng-r2377-2007
const char *ifname = "ath0";
const char *cp, *tp;
const char *sep;
-diff -urN madwifi-ng-r2377-20070526.old/tools/80211stats.c madwifi-ng-r2377-20070526.dev/tools/80211stats.c
---- madwifi-ng-r2377-20070526.old/tools/80211stats.c 2007-02-07 04:18:49.000000000 +0100
-+++ madwifi-ng-r2377-20070526.dev/tools/80211stats.c 2007-05-26 18:51:08.119853136 +0200
+Index: madwifi-ng-r2420-20070602/tools/80211stats.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/tools/80211stats.c 2007-06-04 13:21:53.607827040 +0200
++++ madwifi-ng-r2420-20070602/tools/80211stats.c 2007-06-04 13:21:53.991768672 +0200
@@ -60,6 +60,10 @@
#include "net80211/ieee80211_crypto.h"
#include "net80211/ieee80211_ioctl.h"
@@ -66,9 +68,10 @@ diff -urN madwifi-ng-r2377-20070526.old/tools/80211stats.c madwifi-ng-r2377-2007
int c, len;
struct ieee80211req_sta_info *si;
u_int8_t buf[24*1024], *cp;
-diff -urN madwifi-ng-r2377-20070526.old/tools/athchans.c madwifi-ng-r2377-20070526.dev/tools/athchans.c
---- madwifi-ng-r2377-20070526.old/tools/athchans.c 2007-02-07 04:18:49.000000000 +0100
-+++ madwifi-ng-r2377-20070526.dev/tools/athchans.c 2007-05-26 18:51:08.119853136 +0200
+Index: madwifi-ng-r2420-20070602/tools/athchans.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/tools/athchans.c 2007-06-04 13:21:53.613826128 +0200
++++ madwifi-ng-r2420-20070602/tools/athchans.c 2007-06-04 13:21:53.991768672 +0200
@@ -59,6 +59,10 @@
#include "net80211/ieee80211_crypto.h"
#include "net80211/ieee80211_ioctl.h"
@@ -80,7 +83,7 @@ diff -urN madwifi-ng-r2377-20070526.old/tools/athchans.c madwifi-ng-r2377-200705
static int s = -1;
const char *progname;
-@@ -136,9 +140,20 @@
+@@ -138,9 +142,20 @@
}
#define MAXCHAN ((int)(sizeof(struct ieee80211req_chanlist) * NBBY))
@@ -101,9 +104,10 @@ diff -urN madwifi-ng-r2377-20070526.old/tools/athchans.c madwifi-ng-r2377-200705
const char *ifname = "wifi0";
struct ieee80211req_chanlist chanlist;
int c;
-diff -urN madwifi-ng-r2377-20070526.old/tools/athctrl.c madwifi-ng-r2377-20070526.dev/tools/athctrl.c
---- madwifi-ng-r2377-20070526.old/tools/athctrl.c 2006-02-03 13:03:03.000000000 +0100
-+++ madwifi-ng-r2377-20070526.dev/tools/athctrl.c 2007-05-26 18:51:08.120852984 +0200
+Index: madwifi-ng-r2420-20070602/tools/athctrl.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/tools/athctrl.c 2007-06-04 13:21:53.618825368 +0200
++++ madwifi-ng-r2420-20070602/tools/athctrl.c 2007-06-04 13:21:53.991768672 +0200
@@ -53,6 +53,10 @@
#include <net/if.h>
@@ -116,7 +120,7 @@ diff -urN madwifi-ng-r2377-20070526.old/tools/athctrl.c madwifi-ng-r2377-2007052
setsysctrl(const char *dev, const char *control , u_long value)
{
@@ -87,9 +91,19 @@
- exit(1);
+ exit(1);
}
+#ifdef DOMULTI
@@ -135,9 +139,10 @@ diff -urN madwifi-ng-r2377-20070526.old/tools/athctrl.c madwifi-ng-r2377-2007052
char device[IFNAMSIZ + 1];
int distance = -1;
int c;
-diff -urN madwifi-ng-r2377-20070526.old/tools/athdebug.c madwifi-ng-r2377-20070526.dev/tools/athdebug.c
---- madwifi-ng-r2377-20070526.old/tools/athdebug.c 2007-05-24 23:21:08.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/tools/athdebug.c 2007-05-26 18:51:08.120852984 +0200
+Index: madwifi-ng-r2420-20070602/tools/athdebug.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/tools/athdebug.c 2007-06-04 13:21:53.624824456 +0200
++++ madwifi-ng-r2420-20070602/tools/athdebug.c 2007-06-04 13:21:53.991768672 +0200
@@ -52,6 +52,10 @@
#include <getopt.h>
#include <err.h>
@@ -170,9 +175,10 @@ diff -urN madwifi-ng-r2377-20070526.old/tools/athdebug.c madwifi-ng-r2377-200705
#ifdef __linux__
const char *ifname = "wifi0";
#else
-diff -urN madwifi-ng-r2377-20070526.old/tools/athkey.c madwifi-ng-r2377-20070526.dev/tools/athkey.c
---- madwifi-ng-r2377-20070526.old/tools/athkey.c 2007-02-07 04:18:49.000000000 +0100
-+++ madwifi-ng-r2377-20070526.dev/tools/athkey.c 2007-05-26 18:51:08.121852832 +0200
+Index: madwifi-ng-r2420-20070602/tools/athkey.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/tools/athkey.c 2007-06-04 13:21:53.630823544 +0200
++++ madwifi-ng-r2420-20070602/tools/athkey.c 2007-06-04 13:21:54.000767304 +0200
@@ -59,6 +59,10 @@
#include "net80211/ieee80211_crypto.h"
#include "net80211/ieee80211_ioctl.h"
@@ -184,7 +190,7 @@ diff -urN madwifi-ng-r2377-20070526.old/tools/athkey.c madwifi-ng-r2377-20070526
static int s = -1;
const char *progname;
-@@ -209,9 +213,19 @@
+@@ -211,9 +215,19 @@
exit(-1);
}
@@ -204,9 +210,10 @@ diff -urN madwifi-ng-r2377-20070526.old/tools/athkey.c madwifi-ng-r2377-20070526
const char *ifname = "wifi0";
struct ieee80211req_key setkey;
struct ieee80211req_del_key delkey;
-diff -urN madwifi-ng-r2377-20070526.old/tools/athstats.c madwifi-ng-r2377-20070526.dev/tools/athstats.c
---- madwifi-ng-r2377-20070526.old/tools/athstats.c 2007-03-27 03:45:42.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/tools/athstats.c 2007-05-26 18:51:08.121852832 +0200
+Index: madwifi-ng-r2420-20070602/tools/athstats.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/tools/athstats.c 2007-06-04 13:21:53.635822784 +0200
++++ madwifi-ng-r2420-20070602/tools/athstats.c 2007-06-04 13:21:54.000767304 +0200
@@ -63,6 +63,10 @@
#include "wireless_copy.h"
#include "if_athioctl.h"
@@ -239,9 +246,10 @@ diff -urN madwifi-ng-r2377-20070526.old/tools/athstats.c madwifi-ng-r2377-200705
#ifdef __linux__
const char *ifname = "wifi0";
#else
-diff -urN madwifi-ng-r2377-20070526.old/tools/do_multi.c madwifi-ng-r2377-20070526.dev/tools/do_multi.c
---- madwifi-ng-r2377-20070526.old/tools/do_multi.c 1970-01-01 01:00:00.000000000 +0100
-+++ madwifi-ng-r2377-20070526.dev/tools/do_multi.c 2007-05-26 18:51:08.121852832 +0200
+Index: madwifi-ng-r2420-20070602/tools/do_multi.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ madwifi-ng-r2420-20070602/tools/do_multi.c 2007-06-04 13:21:54.000767304 +0200
@@ -0,0 +1,30 @@
+#include <string.h>
+#include "do_multi.h"
@@ -273,9 +281,10 @@ diff -urN madwifi-ng-r2377-20070526.old/tools/do_multi.c madwifi-ng-r2377-200705
+
+ return ret;
+}
-diff -urN madwifi-ng-r2377-20070526.old/tools/do_multi.h madwifi-ng-r2377-20070526.dev/tools/do_multi.h
---- madwifi-ng-r2377-20070526.old/tools/do_multi.h 1970-01-01 01:00:00.000000000 +0100
-+++ madwifi-ng-r2377-20070526.dev/tools/do_multi.h 2007-05-26 18:51:08.122852680 +0200
+Index: madwifi-ng-r2420-20070602/tools/do_multi.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ madwifi-ng-r2420-20070602/tools/do_multi.h 2007-06-04 13:21:54.000767304 +0200
@@ -0,0 +1,9 @@
+
+int a80211debug_init(int argc, char *argv[]);
@@ -286,9 +295,10 @@ diff -urN madwifi-ng-r2377-20070526.old/tools/do_multi.h madwifi-ng-r2377-200705
+int athkey_init(int argc, char *argv[]);
+int athstats_init(int argc, char *argv[]);
+int wlanconfig_init(int argc, char *argv[]);
-diff -urN madwifi-ng-r2377-20070526.old/tools/Makefile madwifi-ng-r2377-20070526.dev/tools/Makefile
---- madwifi-ng-r2377-20070526.old/tools/Makefile 2007-03-27 03:45:42.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/tools/Makefile 2007-05-26 18:51:08.122852680 +0200
+Index: madwifi-ng-r2420-20070602/tools/Makefile
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/tools/Makefile 2007-06-04 13:21:53.649820656 +0200
++++ madwifi-ng-r2420-20070602/tools/Makefile 2007-06-04 13:21:54.001767152 +0200
@@ -49,6 +49,12 @@
ALL= athstats 80211stats athkey athchans athctrl \
@@ -333,9 +343,10 @@ diff -urN madwifi-ng-r2377-20070526.old/tools/Makefile madwifi-ng-r2377-20070526
athstats: athstats.c
$(CC) -o athstats $(ALL_CFLAGS) -I$(TOP)/ath $(LDFLAGS) athstats.c
80211stats: 80211stats.c
-diff -urN madwifi-ng-r2377-20070526.old/tools/wlanconfig.c madwifi-ng-r2377-20070526.dev/tools/wlanconfig.c
---- madwifi-ng-r2377-20070526.old/tools/wlanconfig.c 2007-04-29 19:35:25.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/tools/wlanconfig.c 2007-05-26 18:51:08.123852528 +0200
+Index: madwifi-ng-r2420-20070602/tools/wlanconfig.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/tools/wlanconfig.c 2007-06-04 13:21:53.656819592 +0200
++++ madwifi-ng-r2420-20070602/tools/wlanconfig.c 2007-06-04 13:21:54.001767152 +0200
@@ -62,6 +62,10 @@
#include "net80211/ieee80211_crypto.h"
#include "net80211/ieee80211_ioctl.h"
diff --git a/package/madwifi/patches/103-disable_rfkill.patch b/package/madwifi/patches/103-disable_rfkill.patch
index 93c4cc06ede98b414c1001fc71cf1d21675488e3..5a35736fd221c37c327e849fdd4c42d4b5d1f1a3 100644
--- a/package/madwifi/patches/103-disable_rfkill.patch
+++ b/package/madwifi/patches/103-disable_rfkill.patch
@@ -1,7 +1,8 @@
-diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
---- madwifi-ng-r2377-20070526.old/ath/if_ath.c 2007-05-25 22:03:27.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c 2007-05-26 18:51:08.212839000 +0200
-@@ -257,7 +257,7 @@
+Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_ath.c 2007-06-04 13:21:53.574832056 +0200
++++ madwifi-ng-r2420-20070602/ath/if_ath.c 2007-06-04 13:21:54.287723680 +0200
+@@ -269,7 +269,7 @@
static int ath_xchanmode = AH_TRUE; /* enable extended channels */
static char *autocreate = NULL;
static char *ratectl = DEF_RATE_CTL;
diff --git a/package/madwifi/patches/104-autocreate_none.patch b/package/madwifi/patches/104-autocreate_none.patch
index f7e0633e8b770bf496c310f8f3e53583212ce668..b2724e727ed5d581c016f5cd6b14e1978cdb1dfd 100644
--- a/package/madwifi/patches/104-autocreate_none.patch
+++ b/package/madwifi/patches/104-autocreate_none.patch
@@ -1,7 +1,8 @@
-diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
---- madwifi-ng-r2377-20070526.old/ath/if_ath.c 2007-05-26 18:51:08.298825928 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c 2007-05-26 18:51:08.306824712 +0200
-@@ -410,7 +410,7 @@
+Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_ath.c 2007-06-04 13:21:54.287723680 +0200
++++ madwifi-ng-r2420-20070602/ath/if_ath.c 2007-06-04 13:21:54.479694496 +0200
+@@ -424,7 +424,7 @@
HAL_STATUS status;
int error = 0;
unsigned int i;
diff --git a/package/madwifi/patches/105-ratectl_attach.patch b/package/madwifi/patches/105-ratectl_attach.patch
index f0910b5209f01f0627bd471bf47779d5b3472c91..577bbcd96d8992da4386b1a7aef31165adfffb68 100644
--- a/package/madwifi/patches/105-ratectl_attach.patch
+++ b/package/madwifi/patches/105-ratectl_attach.patch
@@ -1,6 +1,7 @@
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_rate.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_rate.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_rate.c 2007-03-28 09:07:07.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_rate.c 2007-05-26 18:51:08.398810728 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_rate.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_rate.c 2007-06-04 13:21:53.530838744 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_rate.c 2007-06-04 13:21:54.814643576 +0200
@@ -100,8 +100,18 @@
ieee80211_load_module(buf);
diff --git a/package/madwifi/patches/110-init_fix_PR_914.patch b/package/madwifi/patches/110-init_fix_PR_914.patch
index c32df2220fc5303d31b6df8fa30d4817c0c8f47a..4c6a16de56fa2c4d0d4a02005f63a4617bea07fe 100644
--- a/package/madwifi/patches/110-init_fix_PR_914.patch
+++ b/package/madwifi/patches/110-init_fix_PR_914.patch
@@ -1,7 +1,8 @@
-diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
---- madwifi-ng-r2377-20070526.old/ath/if_ath.c 2007-05-26 18:51:08.393811488 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c 2007-05-26 18:51:08.485797504 +0200
-@@ -1959,7 +1959,10 @@
+Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_ath.c 2007-06-04 13:21:54.479694496 +0200
++++ madwifi-ng-r2420-20070602/ath/if_ath.c 2007-06-04 13:21:55.006614392 +0200
+@@ -1980,7 +1980,10 @@
ath_draintxq(sc);
if (!sc->sc_invalid) {
ath_stoprecv(sc);
diff --git a/package/madwifi/patches/111-minstrel_crash.patch b/package/madwifi/patches/111-minstrel_crash.patch
index cdf2fffe507c206d2f9627fc996a12c50d90552d..24ca406999e193c89d1e0d9aebdb7ef75496c763 100644
--- a/package/madwifi/patches/111-minstrel_crash.patch
+++ b/package/madwifi/patches/111-minstrel_crash.patch
@@ -1,6 +1,7 @@
-diff -urN madwifi-ng-r2377-20070526.old/ath_rate/minstrel/minstrel.c madwifi-ng-r2377-20070526.dev/ath_rate/minstrel/minstrel.c
---- madwifi-ng-r2377-20070526.old/ath_rate/minstrel/minstrel.c 2007-05-21 19:33:26.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath_rate/minstrel/minstrel.c 2007-05-26 18:51:08.575783824 +0200
+Index: madwifi-ng-r2420-20070602/ath_rate/minstrel/minstrel.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath_rate/minstrel/minstrel.c 2007-06-04 13:21:53.488845128 +0200
++++ madwifi-ng-r2420-20070602/ath_rate/minstrel/minstrel.c 2007-06-04 13:21:55.198585208 +0200
@@ -388,6 +388,9 @@
int rc1, rc2, rc3; /* Index into the rate table, so for example, it is 0..11 */
int rixc1, rixc2, rixc3; /* The actual bit rate used */
@@ -11,4 +12,3 @@ diff -urN madwifi-ng-r2377-20070526.old/ath_rate/minstrel/minstrel.c madwifi-ng-
if (sn->is_sampling) {
rc1 = sn->max_tp_rate;
sn->is_sampling = 0;
-
diff --git a/package/madwifi/patches/112-keycache_PR_962.patch b/package/madwifi/patches/112-keycache_PR_962.patch
index fd0be587ef95bd81bb593b212f6b8a009f6e73d8..251a233f5b69a1229a42dbe8943070880a68c696 100644
--- a/package/madwifi/patches/112-keycache_PR_962.patch
+++ b/package/madwifi/patches/112-keycache_PR_962.patch
@@ -1,7 +1,8 @@
-diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
---- madwifi-ng-r2377-20070526.old/ath/if_ath.c 2007-05-26 18:51:08.569784736 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c 2007-05-26 18:51:08.661770752 +0200
-@@ -5672,7 +5672,8 @@
+Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_ath.c 2007-06-04 13:21:55.006614392 +0200
++++ madwifi-ng-r2420-20070602/ath/if_ath.c 2007-06-04 13:21:55.390556024 +0200
+@@ -5698,7 +5698,8 @@
* frame; it'll be dropped where it's not wanted.
*/
if (rs->rs_keyix != HAL_RXKEYIX_INVALID &&
@@ -11,9 +12,10 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.d
struct ath_node *an;
/*
* Fast path: node is present in the key map;
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c 2007-05-21 17:53:39.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.c 2007-05-26 18:51:08.663770448 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_node.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_node.c 2007-06-04 13:21:53.459849536 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_node.c 2007-06-04 13:21:55.391555872 +0200
@@ -1269,8 +1269,6 @@
IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
@@ -44,9 +46,10 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c madwifi-ng-r23
/*
* Return a reference to the appropriate node for sending
* a data frame. This handles node discovery in adhoc networks.
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.h
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.h 2007-05-21 17:53:39.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.h 2007-05-26 18:51:08.664770296 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_node.h
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_node.h 2007-06-04 13:21:53.466848472 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_node.h 2007-06-04 13:21:55.392555720 +0200
@@ -323,6 +323,8 @@
*pni = NULL; /* guard against use */
}
diff --git a/package/madwifi/patches/113-no_ibss_pwrsave.patch b/package/madwifi/patches/113-no_ibss_pwrsave.patch
index b8dc3ce84df93df84347095ed7f49ad9f1a542ee..f11be5693ce45310e6cebe80cb40b8b8f7b39a2d 100644
--- a/package/madwifi/patches/113-no_ibss_pwrsave.patch
+++ b/package/madwifi/patches/113-no_ibss_pwrsave.patch
@@ -1,6 +1,7 @@
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_scan.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_scan.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_scan.c 2007-05-17 03:01:29.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_scan.c 2007-05-26 18:51:08.754756616 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_scan.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_scan.c 2007-06-04 13:21:53.432853640 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_scan.c 2007-06-04 13:21:55.608522888 +0200
@@ -291,7 +291,8 @@
struct ieee80211com *ic = vap->iv_ic;
int delay;
diff --git a/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch b/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch
index 73ba122450736d8f4b371301ae7f0244fae0e7ca..f9a13e634b1c1a15ced13ff97840ef13e0a8aa4f 100644
--- a/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch
+++ b/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch
@@ -1,7 +1,8 @@
-diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
---- madwifi-ng-r2377-20070526.old/ath/if_ath.c 2007-05-26 18:51:08.747757680 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c 2007-05-26 18:51:08.841743392 +0200
-@@ -4373,16 +4373,31 @@
+Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_ath.c 2007-06-04 13:21:55.390556024 +0200
++++ madwifi-ng-r2420-20070602/ath/if_ath.c 2007-06-04 13:21:55.808492488 +0200
+@@ -4394,16 +4394,31 @@
struct ieee80211com *ic = &sc->sc_ic;
struct ath_hal *ah = sc->sc_ah;
struct ieee80211_node *ni;
@@ -37,7 +38,7 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.d
/* XXX conditionalize multi-bss support? */
if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
/*
-@@ -4396,20 +4411,61 @@
+@@ -4417,20 +4432,61 @@
if (sc->sc_stagbeacons)
intval /= ATH_BCBUF; /* for staggered beacons */
if ((sc->sc_nostabeacons) &&
@@ -108,7 +109,7 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.d
int dtimperiod, dtimcount;
int cfpperiod, cfpcount;
-@@ -4425,13 +4481,13 @@
+@@ -4446,13 +4502,13 @@
dtimcount = 0; /* XXX? */
cfpperiod = 1; /* NB: no PCF support yet */
cfpcount = 0;
@@ -125,7 +126,7 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.d
do {
nexttbtt += intval;
if (--dtimcount < 0) {
-@@ -4439,7 +4495,7 @@
+@@ -4460,7 +4516,7 @@
if (--cfpcount < 0)
cfpcount = cfpperiod - 1;
}
@@ -134,8 +135,8 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.d
#undef FUDGE
memset(&bs, 0, sizeof(bs));
bs.bs_intval = intval;
-@@ -4491,7 +4547,7 @@
- DPRINTF(sc, ATH_DEBUG_BEACON,
+@@ -4512,7 +4568,7 @@
+ DPRINTF(sc, ATH_DEBUG_BEACON,
"%s: tsf %llu tsf:tu %u intval %u nexttbtt %u dtim %u nextdtim %u bmiss %u sleep %u cfp:period %u maxdur %u next %u timoffset %u\n",
__func__,
- (unsigned long long) tsf, tsftu,
@@ -143,7 +144,7 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.d
bs.bs_intval,
bs.bs_nexttbtt,
bs.bs_dtimperiod,
-@@ -4510,7 +4566,7 @@
+@@ -4531,7 +4587,7 @@
ath_hal_intrset(ah, sc->sc_imask);
} else {
ath_hal_intrset(ah, 0);
@@ -152,7 +153,7 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.d
intval |= HAL_BEACON_RESET_TSF;
if (ic->ic_opmode == IEEE80211_M_IBSS) {
/*
-@@ -4547,8 +4603,40 @@
+@@ -4568,8 +4624,40 @@
if (ic->ic_opmode == IEEE80211_M_IBSS && sc->sc_hasveol)
ath_beacon_start_adhoc(sc, vap);
}
diff --git a/package/madwifi/patches/117-no_tpc.patch b/package/madwifi/patches/117-no_tpc.patch
index 96c581663a9b62cad3d32d13d7c40f4b2a66792a..e573b267d359b228cb8e31353815c6a919f979ef 100644
--- a/package/madwifi/patches/117-no_tpc.patch
+++ b/package/madwifi/patches/117-no_tpc.patch
@@ -1,6 +1,7 @@
-diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
---- madwifi.old/ath/if_ath.c 2007-06-01 16:44:25.170898128 +0200
-+++ madwifi.dev/ath/if_ath.c 2007-06-01 20:01:24.205131816 +0200
+Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_ath.c 2007-06-04 13:21:55.808492488 +0200
++++ madwifi-ng-r2420-20070602/ath/if_ath.c 2007-06-04 13:21:56.713354928 +0200
@@ -271,7 +271,7 @@
static char *ratectl = DEF_RATE_CTL;
static int rfkill = 0;
diff --git a/package/madwifi/patches/118-txstop_workaround.patch b/package/madwifi/patches/118-txstop_workaround.patch
index 9b381e1851b0b5c210bc776218a82e153d0b086b..3133c41e6968583de6af8ea2ec39942d0dfbedff 100644
--- a/package/madwifi/patches/118-txstop_workaround.patch
+++ b/package/madwifi/patches/118-txstop_workaround.patch
@@ -1,7 +1,8 @@
-diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
---- madwifi-ng-r2377-20070526.old/ath/if_ath.c 2007-05-26 18:51:08.924730776 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c 2007-05-26 18:51:08.933729408 +0200
-@@ -2220,6 +2220,17 @@
+Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_ath.c 2007-06-04 13:21:56.713354928 +0200
++++ madwifi-ng-r2420-20070602/ath/if_ath.c 2007-06-04 13:21:56.911324832 +0200
+@@ -2242,6 +2242,17 @@
txq->axq_link = &lastds->ds_link;
ath_hal_txstart(ah, txq->axq_qnum);
sc->sc_dev->trans_start = jiffies;
@@ -17,9 +18,9 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.d
+ }
+ }
}
- ATH_TXQ_UNLOCK(txq);
+ ATH_TXQ_UNLOCK_IRQ(txq);
-@@ -7262,6 +7273,7 @@
+@@ -7285,6 +7296,7 @@
__func__, ds);
#else
ds = bf->bf_desc; /* NB: last descriptor */
@@ -27,10 +28,11 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.d
#endif
ts = &bf->bf_dsstatus.ds_txstat;
status = ath_hal_txprocdesc(ah, ds, ts);
-diff -urN madwifi-ng-r2377-20070526.old/ath/if_athvar.h madwifi-ng-r2377-20070526.dev/ath/if_athvar.h
---- madwifi-ng-r2377-20070526.old/ath/if_athvar.h 2007-05-25 04:38:02.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath/if_athvar.h 2007-05-26 18:51:08.933729408 +0200
-@@ -685,6 +685,14 @@
+Index: madwifi-ng-r2420-20070602/ath/if_athvar.h
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_athvar.h 2007-06-04 13:21:53.369863216 +0200
++++ madwifi-ng-r2420-20070602/ath/if_athvar.h 2007-06-04 13:21:56.911324832 +0200
+@@ -686,6 +686,14 @@
u_int sc_slottimeconf; /* manual override for slottime */
int16_t sc_channoise; /* Measured noise of current channel (dBm) */
u_int64_t sc_tsf; /* TSF at last rx interrupt */
diff --git a/package/madwifi/patches/119-minstrel_rates.patch b/package/madwifi/patches/119-minstrel_rates.patch
index 605342739d2e68d75f65454954c9070f8c164734..50cbb5a64b57d2e9cff21be6069b733155b93187 100644
--- a/package/madwifi/patches/119-minstrel_rates.patch
+++ b/package/madwifi/patches/119-minstrel_rates.patch
@@ -1,6 +1,7 @@
-diff -ur madwifi.old/ath_rate/minstrel/minstrel.c madwifi.dev/ath_rate/minstrel/minstrel.c
---- madwifi.old/ath_rate/minstrel/minstrel.c 2007-06-01 16:44:25.137903000 +0200
-+++ madwifi.dev/ath_rate/minstrel/minstrel.c 2007-06-01 22:03:15.408659936 +0200
+Index: madwifi-ng-r2420-20070602/ath_rate/minstrel/minstrel.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath_rate/minstrel/minstrel.c 2007-06-04 13:21:55.198585208 +0200
++++ madwifi-ng-r2420-20070602/ath_rate/minstrel/minstrel.c 2007-06-04 13:21:57.115293824 +0200
@@ -358,6 +358,8 @@
if (sn->rs_sampleColumn >= MINSTREL_COLUMNS)
sn->rs_sampleColumn = 0;
diff --git a/package/madwifi/patches/120-soc_fix.patch b/package/madwifi/patches/120-soc_fix.patch
index d808bfbfadc9e8390ee95d14ce9f6cf5ae8b26b8..067dbfbb1c081a50848cd1897deb3dcc2ba39296 100644
--- a/package/madwifi/patches/120-soc_fix.patch
+++ b/package/madwifi/patches/120-soc_fix.patch
@@ -1,6 +1,7 @@
-diff -ur madwifi.old/ath/if_ath_ahb.c madwifi.dev/ath/if_ath_ahb.c
---- madwifi.old/ath/if_ath_ahb.c 2007-05-30 03:41:18.000000000 +0200
-+++ madwifi.dev/ath/if_ath_ahb.c 2007-06-01 12:04:02.887273960 +0200
+Index: madwifi-ng-r2420-20070602/ath/if_ath_ahb.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_ath_ahb.c 2007-06-04 13:21:53.320870664 +0200
++++ madwifi-ng-r2420-20070602/ath/if_ath_ahb.c 2007-06-04 13:21:57.306264792 +0200
@@ -275,11 +275,10 @@
diff --git a/package/madwifi/patches/121-ibss_hostap.patch b/package/madwifi/patches/121-ibss_hostap.patch
index a5a3ca99bc02b7b89987e0005eeb989ef16d5270..24cbe9811710b00712cad829fb9189a3ef959bd9 100644
--- a/package/madwifi/patches/121-ibss_hostap.patch
+++ b/package/madwifi/patches/121-ibss_hostap.patch
@@ -1,6 +1,7 @@
-diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
---- madwifi.old/ath/if_ath.c 2007-06-01 12:22:06.641518272 +0200
-+++ madwifi.dev/ath/if_ath.c 2007-06-01 12:22:55.326117088 +0200
+Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_ath.c 2007-06-04 13:21:56.911324832 +0200
++++ madwifi-ng-r2420-20070602/ath/if_ath.c 2007-06-04 13:21:57.500235304 +0200
@@ -407,7 +407,6 @@
* and use the next two bits as the index of the VAP.
*/
@@ -9,7 +10,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
#define ATH_SET_VAP_BSSID(bssid, id) \
do { \
if (id) \
-@@ -1048,9 +1048,12 @@
+@@ -1048,9 +1047,12 @@
ic_opmode = opmode;
break;
case IEEE80211_M_IBSS:
@@ -25,7 +26,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
break;
case IEEE80211_M_AHDEMO:
case IEEE80211_M_MONITOR:
-@@ -1080,7 +1083,7 @@
+@@ -1080,7 +1082,7 @@
return NULL;
}
@@ -34,7 +35,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
printk(KERN_WARNING "too many virtual ap's (already got %d)\n", sc->sc_nvaps);
return NULL;
}
-@@ -1115,8 +1118,9 @@
+@@ -1115,8 +1117,9 @@
*/
if (opmode == IEEE80211_M_MONITOR)
dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -46,7 +47,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
struct ieee80211vap *v;
unsigned int id_mask, id;
-@@ -1129,18 +1133,22 @@
+@@ -1129,18 +1132,22 @@
/* do a full search to mark all the allocated VAPs */
id_mask = 0;
@@ -73,7 +74,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
STAILQ_INIT(&avp->av_mcastq.axq_q);
ATH_TXQ_LOCK_INIT(&avp->av_mcastq);
if (opmode == IEEE80211_M_HOSTAP || opmode == IEEE80211_M_IBSS) {
-@@ -1150,33 +1158,14 @@
+@@ -1150,33 +1157,14 @@
*/
avp->av_bcbuf = STAILQ_FIRST(&sc->sc_bbuf);
STAILQ_REMOVE_HEAD(&sc->sc_bbuf, bf_list);
@@ -109,7 +110,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
/*
* Multiple VAPs are to transmit beacons and we
* have h/w support for TSF adjusting; enable use
-@@ -1286,7 +1275,9 @@
+@@ -1286,7 +1274,9 @@
sc->sc_stagbeacons = 0;
}
@@ -120,16 +121,16 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
sc->sc_nstavaps--;
sc->sc_nostabeacons = 0;
} else if (vap->iv_opmode == IEEE80211_M_MONITOR)
-@@ -3368,7 +3367,7 @@
- ((ic->ic_opmode == IEEE80211_M_HOSTAP) &&
- (ic->ic_protmode != IEEE80211_PROT_NONE)))
+@@ -3362,7 +3352,7 @@
+ sc->sc_opmode == HAL_M_IBSS || /* NB: AHDEMO too */
+ (sc->sc_nostabeacons) || sc->sc_scanning)
rfilt |= HAL_RX_FILTER_BEACON;
- if (sc->sc_nmonvaps > 0)
+ if ((sc->sc_nmonvaps > 0) || ((sc->sc_nvaps > 0) && (sc->sc_nibssvaps > 0)))
rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
HAL_RX_FILTER_PROBEREQ | HAL_RX_FILTER_PROM);
return rfilt;
-@@ -5809,12 +5801,20 @@
+@@ -5809,12 +5799,20 @@
type = ieee80211_input(ni, skb, rs->rs_rssi, rs->rs_tstamp);
ieee80211_unref_node(&ni);
} else {
@@ -152,9 +153,10 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
if (ni != NULL) {
struct ath_node *an = ATH_NODE(ni);
ieee80211_keyix_t keyix;
-diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
---- madwifi.old/ath/if_athvar.h 2007-06-01 12:22:06.642518120 +0200
-+++ madwifi.dev/ath/if_athvar.h 2007-06-01 12:21:54.640342728 +0200
+Index: madwifi-ng-r2420-20070602/ath/if_athvar.h
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_athvar.h 2007-06-04 13:21:56.911324832 +0200
++++ madwifi-ng-r2420-20070602/ath/if_athvar.h 2007-06-04 13:21:57.500235304 +0200
@@ -199,7 +199,7 @@
#define ATH_RXBUF 40 /* number of RX buffers */
#define ATH_TXBUF 200 /* number of TX buffers */
@@ -172,9 +174,10 @@ diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
u_int8_t sc_nbcnvaps; /* # of vaps sending beacons */
u_int sc_fftxqmin; /* aggregation threshold */
HAL_INT sc_imask; /* interrupt mask copy */
-diff -ur madwifi.old/net80211/ieee80211_beacon.c madwifi.dev/net80211/ieee80211_beacon.c
---- madwifi.old/net80211/ieee80211_beacon.c 2007-06-01 12:22:06.642518120 +0200
-+++ madwifi.dev/net80211/ieee80211_beacon.c 2007-06-01 12:21:54.640342728 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_beacon.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_beacon.c 2007-06-04 13:21:53.286875832 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_beacon.c 2007-06-04 13:21:57.501235152 +0200
@@ -111,7 +111,7 @@
bo->bo_tim = frm;
@@ -184,10 +187,11 @@ diff -ur madwifi.old/net80211/ieee80211_beacon.c madwifi.dev/net80211/ieee80211_
*frm++ = IEEE80211_ELEMID_IBSSPARMS;
*frm++ = 2;
*frm++ = 0; *frm++ = 0; /* TODO: ATIM window */
-diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_input.c
---- madwifi.old/net80211/ieee80211_input.c 2007-06-01 12:22:06.645517664 +0200
-+++ madwifi.dev/net80211/ieee80211_input.c 2007-06-01 12:21:54.642342424 +0200
-@@ -2953,7 +2953,13 @@
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_input.c 2007-06-04 13:21:53.292874920 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_input.c 2007-06-04 13:21:57.502235000 +0200
+@@ -2939,7 +2939,13 @@
return;
}
if (ni == vap->iv_bss) {
@@ -202,7 +206,7 @@ diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_i
/*
* XXX Cannot tell if the sender is operating
* in ibss mode. But we need a new node to
-@@ -2962,12 +2968,13 @@
+@@ -2948,12 +2954,13 @@
*/
ni = ieee80211_fakeup_adhoc_node(vap,
wh->i_addr2);
@@ -217,9 +221,10 @@ diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_i
}
IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_INPUT, wh->i_addr2,
-diff -ur madwifi.old/net80211/ieee80211_node.c madwifi.dev/net80211/ieee80211_node.c
---- madwifi.old/net80211/ieee80211_node.c 2007-06-01 12:22:06.646517512 +0200
-+++ madwifi.dev/net80211/ieee80211_node.c 2007-06-01 12:21:54.644342120 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_node.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_node.c 2007-06-04 13:21:55.391555872 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_node.c 2007-06-04 13:21:57.503234848 +0200
@@ -1082,8 +1082,25 @@
IEEE80211_NODE_TABLE_LOCK_ASSERT(nt);
diff --git a/package/madwifi/patches/122-replayfail_workaround.patch b/package/madwifi/patches/122-replayfail_workaround.patch
index 49f1a13a8f11c07856bc670cba27939fbd1be90a..5931ec733ba3994acb4c74734e7d19ee49b2a98c 100644
--- a/package/madwifi/patches/122-replayfail_workaround.patch
+++ b/package/madwifi/patches/122-replayfail_workaround.patch
@@ -1,6 +1,7 @@
-diff -ur madwifi.old/net80211/ieee80211_linux.c madwifi.dev/net80211/ieee80211_linux.c
---- madwifi.old/net80211/ieee80211_linux.c 2007-05-30 03:41:18.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_linux.c 2007-06-02 01:43:40.818092096 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_linux.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_linux.c 2007-06-04 13:21:53.255880544 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_linux.c 2007-06-04 13:21:57.745198064 +0200
@@ -285,6 +285,9 @@
k->wk_cipher->ic_name, k->wk_keyix,
(unsigned long long)rsc );
diff --git a/package/madwifi/patches/123-ccmp_checks.patch b/package/madwifi/patches/123-ccmp_checks.patch
index f549cd4e5e242757866b3820274a50b0c0090753..8370d357969449710452b9caad694da69693cf20 100644
--- a/package/madwifi/patches/123-ccmp_checks.patch
+++ b/package/madwifi/patches/123-ccmp_checks.patch
@@ -1,7 +1,21 @@
-diff -ur madwifi.old/net80211/ieee80211_crypto_ccmp.c madwifi.dev/net80211/ieee80211_crypto_ccmp.c
---- madwifi.old/net80211/ieee80211_crypto_ccmp.c 2007-06-02 04:37:47.425966000 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto_ccmp.c 2007-06-02 18:38:27.675882768 +0200
-@@ -465,6 +465,9 @@
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_ccmp.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_crypto_ccmp.c 2007-06-04 13:21:53.234883736 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_ccmp.c 2007-06-04 13:21:57.936169032 +0200
+@@ -118,6 +118,12 @@
+ ctx->cc_ic = vap->iv_ic;
+ ctx->cc_tfm = crypto_alloc_cipher("aes", 0,
+ CRYPTO_ALG_ASYNC);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++ if (IS_ERR(ctx->cc_tfm))
++ ctx->cc_tfm = NULL;
++#endif
++
+ if (ctx->cc_tfm == NULL) {
+ IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO,
+ "%s: unable to load kernel AES crypto support\n",
+@@ -465,6 +471,9 @@
uint8_t *mic, *pos;
u_int space;
@@ -11,7 +25,7 @@ diff -ur madwifi.old/net80211/ieee80211_crypto_ccmp.c madwifi.dev/net80211/ieee8
ctx->cc_vap->iv_stats.is_crypto_ccmp++;
skb = skb0;
-@@ -579,6 +582,9 @@
+@@ -579,6 +588,9 @@
uint8_t *pos, *mic;
u_int space;
@@ -21,19 +35,3 @@ diff -ur madwifi.old/net80211/ieee80211_crypto_ccmp.c madwifi.dev/net80211/ieee8
ctx->cc_vap->iv_stats.is_crypto_ccmp++;
skb = skb0;
-diff -ur madwifi.old/net80211/ieee80211_crypto_ccmp.c madwifi.dev/net80211/ieee80211_crypto_ccmp.c
---- madwifi.old/net80211/ieee80211_crypto_ccmp.c 2007-06-02 19:40:56.291006648 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto_ccmp.c 2007-06-03 04:19:47.561334192 +0200
-@@ -118,6 +118,12 @@
- ctx->cc_ic = vap->iv_ic;
- ctx->cc_tfm = crypto_alloc_cipher("aes", 0,
- CRYPTO_ALG_ASYNC);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+ if (IS_ERR(ctx->cc_tfm))
-+ ctx->cc_tfm = NULL;
-+#endif
-+
- if (ctx->cc_tfm == NULL) {
- IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO,
- "%s: unable to load kernel AES crypto support\n",
diff --git a/package/madwifi/patches/200-no_debug.patch b/package/madwifi/patches/200-no_debug.patch
index fda9d3e557046c8d6e9a61e90295503bedaf64a1..cecc266dac37ad012efeb148a45cb89fe10f0b9b 100644
--- a/package/madwifi/patches/200-no_debug.patch
+++ b/package/madwifi/patches/200-no_debug.patch
@@ -1,6 +1,7 @@
-diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
---- madwifi-ng-r2377-20070526.old/ath/if_ath.c 2007-05-26 18:51:09.199688976 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c 2007-05-26 18:51:09.207687760 +0200
+Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_ath.c 2007-06-04 13:21:57.500235304 +0200
++++ madwifi-ng-r2420-20070602/ath/if_ath.c 2007-06-04 13:21:58.130139544 +0200
@@ -75,7 +75,7 @@
#include <net80211/if_llc.h>
#endif
@@ -10,7 +11,7 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.d
#include "net80211/if_athproto.h"
#include "if_athvar.h"
-@@ -368,7 +368,7 @@
+@@ -382,7 +382,7 @@
ath_keyprint(sc, __func__, ix, hk, mac); \
} while (0)
#else /* defined(AR_DEBUG) */
@@ -19,9 +20,10 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.d
#define DPRINTF(sc, _m, _fmt, ...)
#define KEYPRINTF(sc, k, ix, mac)
#endif /* defined(AR_DEBUG) */
-diff -urN madwifi-ng-r2377-20070526.old/ath_rate/amrr/amrr.c madwifi-ng-r2377-20070526.dev/ath_rate/amrr/amrr.c
---- madwifi-ng-r2377-20070526.old/ath_rate/amrr/amrr.c 2007-05-21 19:33:26.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath_rate/amrr/amrr.c 2007-05-26 18:51:09.208687608 +0200
+Index: madwifi-ng-r2420-20070602/ath_rate/amrr/amrr.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath_rate/amrr/amrr.c 2007-06-04 13:21:53.164894376 +0200
++++ madwifi-ng-r2420-20070602/ath_rate/amrr/amrr.c 2007-06-04 13:21:58.131139392 +0200
@@ -69,7 +69,7 @@
#include "amrr.h"
@@ -31,9 +33,10 @@ diff -urN madwifi-ng-r2377-20070526.old/ath_rate/amrr/amrr.c madwifi-ng-r2377-20
#ifdef AMRR_DEBUG
#define DPRINTF(sc, _fmt, ...) do { \
if (sc->sc_debug & 0x10) \
-diff -urN madwifi-ng-r2377-20070526.old/ath_rate/minstrel/minstrel.c madwifi-ng-r2377-20070526.dev/ath_rate/minstrel/minstrel.c
---- madwifi-ng-r2377-20070526.old/ath_rate/minstrel/minstrel.c 2007-05-26 18:51:08.653771968 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath_rate/minstrel/minstrel.c 2007-05-26 18:51:09.208687608 +0200
+Index: madwifi-ng-r2420-20070602/ath_rate/minstrel/minstrel.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath_rate/minstrel/minstrel.c 2007-06-04 13:21:57.115293824 +0200
++++ madwifi-ng-r2420-20070602/ath_rate/minstrel/minstrel.c 2007-06-04 13:21:58.132139240 +0200
@@ -116,7 +116,7 @@
#include "minstrel.h"
@@ -43,9 +46,10 @@ diff -urN madwifi-ng-r2377-20070526.old/ath_rate/minstrel/minstrel.c madwifi-ng-
#ifdef MINSTREL_DEBUG
enum {
ATH_DEBUG_RATE = 0x00000010 /* rate control */
-diff -urN madwifi-ng-r2377-20070526.old/ath_rate/onoe/onoe.c madwifi-ng-r2377-20070526.dev/ath_rate/onoe/onoe.c
---- madwifi-ng-r2377-20070526.old/ath_rate/onoe/onoe.c 2007-05-21 19:33:26.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath_rate/onoe/onoe.c 2007-05-26 18:51:09.209687456 +0200
+Index: madwifi-ng-r2420-20070602/ath_rate/onoe/onoe.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath_rate/onoe/onoe.c 2007-06-04 13:21:53.176892552 +0200
++++ madwifi-ng-r2420-20070602/ath_rate/onoe/onoe.c 2007-06-04 13:21:58.132139240 +0200
@@ -65,7 +65,7 @@
#include "onoe.h"
@@ -55,9 +59,10 @@ diff -urN madwifi-ng-r2377-20070526.old/ath_rate/onoe/onoe.c madwifi-ng-r2377-20
#ifdef ONOE_DEBUG
enum {
ATH_DEBUG_RATE = 0x00000010, /* rate control */
-diff -urN madwifi-ng-r2377-20070526.old/ath_rate/sample/sample.c madwifi-ng-r2377-20070526.dev/ath_rate/sample/sample.c
---- madwifi-ng-r2377-20070526.old/ath_rate/sample/sample.c 2007-05-21 19:33:26.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath_rate/sample/sample.c 2007-05-26 18:51:09.209687456 +0200
+Index: madwifi-ng-r2420-20070602/ath_rate/sample/sample.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath_rate/sample/sample.c 2007-06-04 13:21:53.183891488 +0200
++++ madwifi-ng-r2420-20070602/ath_rate/sample/sample.c 2007-06-04 13:21:58.133139088 +0200
@@ -67,7 +67,7 @@
#include "sample.h"
@@ -67,9 +72,10 @@ diff -urN madwifi-ng-r2377-20070526.old/ath_rate/sample/sample.c madwifi-ng-r237
#ifdef SAMPLE_DEBUG
enum {
ATH_DEBUG_NODE = 0x00080000, /* node management */
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c 2007-05-21 17:53:39.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.c 2007-05-26 18:51:09.210687304 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_proto.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_proto.c 2007-06-04 13:21:53.189890576 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_proto.c 2007-06-04 13:21:58.133139088 +0200
@@ -312,6 +312,7 @@
}
EXPORT_SYMBOL(ieee80211_print_essid);
@@ -86,9 +92,10 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c madwifi-ng-r2
int
ieee80211_fix_rate(struct ieee80211_node *ni, int flags)
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.h
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.h 2007-01-30 05:01:29.000000000 +0100
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.h 2007-05-26 18:51:09.211687152 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_proto.h
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_proto.h 2007-06-04 13:21:53.194889816 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_proto.h 2007-06-04 13:21:58.134138936 +0200
@@ -247,7 +247,11 @@
#endif
int ieee80211_new_state(struct ieee80211vap *, enum ieee80211_state, int);
@@ -101,9 +108,10 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.h madwifi-ng-r2
struct sk_buff *ieee80211_getcfframe(struct ieee80211vap *, int);
/*
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_var.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_var.h
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_var.h 2007-05-24 23:26:38.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_var.h 2007-05-26 18:51:09.211687152 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_var.h
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_var.h 2007-06-04 13:21:53.201888752 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_var.h 2007-06-04 13:21:58.134138936 +0200
@@ -35,8 +35,8 @@
#ifndef _NET80211_IEEE80211_VAR_H_
#define _NET80211_IEEE80211_VAR_H_
@@ -115,9 +123,10 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_var.h madwifi-ng-r237
/* Definitions for IEEE 802.11 drivers. */
#include <net80211/ieee80211_linux.h>
-diff -urN madwifi-ng-r2377-20070526.old/tools/do_multi.c madwifi-ng-r2377-20070526.dev/tools/do_multi.c
---- madwifi-ng-r2377-20070526.old/tools/do_multi.c 2007-05-26 18:51:08.203840368 +0200
-+++ madwifi-ng-r2377-20070526.dev/tools/do_multi.c 2007-05-26 18:51:09.212687000 +0200
+Index: madwifi-ng-r2420-20070602/tools/do_multi.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/tools/do_multi.c 2007-06-04 13:21:54.000767304 +0200
++++ madwifi-ng-r2420-20070602/tools/do_multi.c 2007-06-04 13:21:58.134138936 +0200
@@ -9,16 +9,20 @@
progname = basename(argv[0]);
@@ -139,9 +148,10 @@ diff -urN madwifi-ng-r2377-20070526.old/tools/do_multi.c madwifi-ng-r2377-200705
if(strcmp(progname, "athkey") == 0)
ret = athkey_init(argc, argv);
if(strcmp(progname, "athstats") == 0)
-diff -urN madwifi-ng-r2377-20070526.old/tools/Makefile madwifi-ng-r2377-20070526.dev/tools/Makefile
---- madwifi-ng-r2377-20070526.old/tools/Makefile 2007-05-26 18:51:08.203840368 +0200
-+++ madwifi-ng-r2377-20070526.dev/tools/Makefile 2007-05-26 18:51:09.212687000 +0200
+Index: madwifi-ng-r2420-20070602/tools/Makefile
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/tools/Makefile 2007-06-04 13:21:54.001767152 +0200
++++ madwifi-ng-r2420-20070602/tools/Makefile 2007-06-04 13:21:58.134138936 +0200
@@ -52,7 +52,7 @@
ifdef DOMULTI
@@ -160,4 +170,3 @@ diff -urN madwifi-ng-r2377-20070526.old/tools/Makefile madwifi-ng-r2377-20070526
ln -s -f madwifi_multi $$i; \
done
-
diff --git a/package/madwifi/patches/300-napi_polling.patch b/package/madwifi/patches/300-napi_polling.patch
index f8135710e4d7b182131def9f20c5db1dfe3f0bd4..7990ed7092ebf36d2dd0a1a16c0232a8dd5ae3c4 100644
--- a/package/madwifi/patches/300-napi_polling.patch
+++ b/package/madwifi/patches/300-napi_polling.patch
@@ -1,6 +1,7 @@
-diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
---- madwifi.old/ath/if_ath.c 2007-06-01 11:26:04.181689864 +0200
-+++ madwifi.dev/ath/if_ath.c 2007-06-01 11:39:53.078678368 +0200
+Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_ath.c 2007-06-04 13:21:58.130139544 +0200
++++ madwifi-ng-r2420-20070602/ath/if_ath.c 2007-06-04 13:21:58.427094400 +0200
@@ -167,7 +167,7 @@
int, u_int32_t);
static void ath_setdefantenna(struct ath_softc *, u_int);
@@ -10,7 +11,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
static int ath_hardstart(struct sk_buff *, struct net_device *);
static int ath_mgtstart(struct ieee80211com *, struct sk_buff *);
#ifdef ATH_SUPERG_COMP
-@@ -443,7 +443,6 @@
+@@ -442,7 +442,6 @@
ATH_TXBUF_LOCK_INIT(sc);
ATH_RXBUF_LOCK_INIT(sc);
@@ -18,7 +19,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
ATH_INIT_TQUEUE(&sc->sc_txtq, ath_tx_tasklet, dev);
ATH_INIT_TQUEUE(&sc->sc_bmisstq, ath_bmiss_tasklet, dev);
ATH_INIT_TQUEUE(&sc->sc_bstucktq, ath_bstuck_tasklet, dev);
-@@ -700,6 +699,8 @@
+@@ -699,6 +698,8 @@
dev->set_mac_address = ath_set_mac_address;
dev->change_mtu = ath_change_mtu;
dev->tx_queue_len = ATH_TXBUF - 1; /* 1 for mgmt frame */
@@ -27,7 +28,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
#ifdef USE_HEADERLEN_RESV
dev->hard_header_len += sizeof(struct ieee80211_qosframe) +
sizeof(struct llc) +
-@@ -1665,6 +1666,7 @@
+@@ -1664,6 +1665,7 @@
*/
ath_hal_getisr(ah, &status); /* NB: clears ISR too */
DPRINTF(sc, ATH_DEBUG_INTR, "%s: status 0x%x\n", __func__, status);
@@ -35,7 +36,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
status &= sc->sc_imask; /* discard unasked for bits */
if (status & HAL_INT_FATAL) {
sc->sc_stats.ast_hardware++;
-@@ -1700,7 +1702,12 @@
+@@ -1699,7 +1701,12 @@
if (status & HAL_INT_RX) {
sc->sc_tsf = ath_hal_gettsf64(ah);
ath_uapsd_processtriggers(sc);
@@ -49,7 +50,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
}
if (status & HAL_INT_TX) {
#ifdef ATH_SUPERG_DYNTURBO
-@@ -1726,6 +1733,11 @@
+@@ -1725,6 +1732,11 @@
}
}
#endif
@@ -61,7 +62,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark);
}
if (status & HAL_INT_BMISS) {
-@@ -3296,10 +3308,10 @@
+@@ -3295,10 +3307,10 @@
*
* XXX Using in_softirq is not right since we might
* be called from other soft irq contexts than
@@ -74,7 +75,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
netif_stop_queue(dev);
}
-@@ -3312,7 +3324,7 @@
+@@ -3311,7 +3323,7 @@
DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s:\n", __func__);
netif_start_queue(dev);
if (!in_softirq()) /* NB: see above */
@@ -83,7 +84,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
}
/*
-@@ -5573,13 +5585,12 @@
+@@ -5569,13 +5581,12 @@
sc->sc_rxotherant = 0;
}
@@ -99,7 +100,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
struct ath_buf *bf;
struct ath_softc *sc = dev->priv;
struct ieee80211com *ic = &sc->sc_ic;
-@@ -5591,12 +5602,15 @@
+@@ -5587,12 +5598,15 @@
unsigned int len;
int type;
u_int phyerr;
@@ -115,7 +116,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
do {
bf = STAILQ_FIRST(&sc->sc_rxbuf);
if (bf == NULL) { /* XXX ??? can this happen */
-@@ -5620,6 +5634,13 @@
+@@ -5616,6 +5630,13 @@
/* NB: never process the self-linked entry at the end */
break;
}
@@ -129,7 +130,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
skb = bf->bf_skb;
if (skb == NULL) { /* XXX ??? can this happen */
printk("%s: no skbuff (%s)\n", DEV_NAME(dev), __func__);
-@@ -5658,6 +5679,7 @@
+@@ -5654,6 +5675,7 @@
sc->sc_stats.ast_rx_phyerr++;
phyerr = rs->rs_phyerr & 0x1f;
sc->sc_stats.ast_rx_phy[phyerr]++;
@@ -137,7 +138,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
}
if (rs->rs_status & HAL_RXERR_DECRYPT) {
/*
-@@ -5868,9 +5890,29 @@
+@@ -5865,9 +5887,29 @@
STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list);
ATH_RXBUF_UNLOCK_IRQ(sc);
} while (ath_rxbuf_init(sc, bf) == 0);
@@ -167,7 +168,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
#undef PA2DESC
}
-@@ -7487,11 +7529,22 @@
+@@ -7484,11 +7526,22 @@
struct net_device *dev = (struct net_device *)data;
struct ath_softc *sc = dev->priv;
@@ -190,7 +191,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
netif_wake_queue(dev);
if (sc->sc_softled)
-@@ -7508,6 +7561,7 @@
+@@ -7505,6 +7558,7 @@
struct net_device *dev = (struct net_device *)data;
struct ath_softc *sc = dev->priv;
@@ -198,7 +199,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
/*
* Process each active queue.
*/
-@@ -7528,6 +7582,16 @@
+@@ -7525,6 +7579,16 @@
if (sc->sc_uapsdq && txqactive(sc->sc_ah, sc->sc_uapsdq->axq_qnum))
ath_tx_processq(sc, sc->sc_uapsdq);
@@ -215,7 +216,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
netif_wake_queue(dev);
if (sc->sc_softled)
-@@ -7545,6 +7609,7 @@
+@@ -7542,6 +7606,7 @@
unsigned int i;
/* Process each active queue. */
@@ -223,7 +224,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
for (i = 0; i < HAL_NUM_TX_QUEUES; i++)
if (ATH_TXQ_SETUP(sc, i) && txqactive(sc->sc_ah, i))
ath_tx_processq(sc, &sc->sc_txq[i]);
-@@ -7553,6 +7618,16 @@
+@@ -7550,6 +7615,16 @@
ath_tx_processq(sc, sc->sc_xrtxq);
#endif
@@ -240,7 +241,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
netif_wake_queue(dev);
if (sc->sc_softled)
-@@ -7651,6 +7726,7 @@
+@@ -7648,6 +7723,7 @@
ath_draintxq(struct ath_softc *sc)
{
struct ath_hal *ah = sc->sc_ah;
@@ -248,7 +249,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
unsigned int i;
/* XXX return value */
-@@ -9170,9 +9246,9 @@
+@@ -9167,9 +9243,9 @@
dev->mtu = mtu;
if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) {
/* NB: the rx buffers may need to be reallocated */
@@ -260,9 +261,10 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
}
ATH_UNLOCK(sc);
-diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
---- madwifi.old/ath/if_athvar.h 2007-06-01 11:26:04.158693360 +0200
-+++ madwifi.dev/ath/if_athvar.h 2007-06-01 11:33:26.549439744 +0200
+Index: madwifi-ng-r2420-20070602/ath/if_athvar.h
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_athvar.h 2007-06-04 13:21:57.500235304 +0200
++++ madwifi-ng-r2420-20070602/ath/if_athvar.h 2007-06-04 13:21:58.428094248 +0200
@@ -48,6 +48,10 @@
#include "if_athioctl.h"
#include "net80211/ieee80211.h" /* XXX for WME_NUM_AC */
@@ -299,10 +301,11 @@ diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
#define ATH_RXBUF_LOCK_INIT(_sc) spin_lock_init(&(_sc)->sc_rxbuflock)
#define ATH_RXBUF_LOCK_DESTROY(_sc)
-diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_input.c
---- madwifi.old/net80211/ieee80211_input.c 2007-06-01 11:26:04.183689560 +0200
-+++ madwifi.dev/net80211/ieee80211_input.c 2007-06-01 11:31:46.931583960 +0200
-@@ -1144,8 +1144,9 @@
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_input.c 2007-06-04 13:21:57.502235000 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_input.c 2007-06-04 13:21:58.461089232 +0200
+@@ -1128,8 +1128,9 @@
if (ni->ni_vlan != 0 && vap->iv_vlgrp != NULL) {
/* attach vlan tag */
vlan_hwaccel_receive_skb(skb, vap->iv_vlgrp, ni->ni_vlan);
diff --git a/package/madwifi/patches/301-tx_locking.patch b/package/madwifi/patches/301-tx_locking.patch
index 884035dd10ea819b4b4a28bf1cf623fd31032d9e..f2b4cc7fb1cc66b2b0147838b9abe7d9c704616c 100644
--- a/package/madwifi/patches/301-tx_locking.patch
+++ b/package/madwifi/patches/301-tx_locking.patch
@@ -1,7 +1,8 @@
-diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
---- madwifi.old/ath/if_ath.c 2007-06-01 16:44:25.170898128 +0200
-+++ madwifi.dev/ath/if_ath.c 2007-06-01 20:01:24.205131816 +0200
-@@ -2555,7 +2555,7 @@
+Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_ath.c 2007-06-04 13:21:58.427094400 +0200
++++ madwifi-ng-r2420-20070602/ath/if_ath.c 2007-06-04 13:21:58.684055336 +0200
+@@ -2554,7 +2554,7 @@
/* NB: use this lock to protect an->an_ff_txbuf in athff_can_aggregate()
* call too.
*/
@@ -10,7 +11,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
if (athff_can_aggregate(sc, eh, an, skb, vap->iv_fragthreshold, &ff_flush)) {
if (an->an_tx_ffbuf[skb->priority]) { /* i.e., frame on the staging queue */
bf = an->an_tx_ffbuf[skb->priority];
-@@ -2563,6 +2563,7 @@
+@@ -2562,6 +2562,7 @@
/* get (and remove) the frame from staging queue */
TAILQ_REMOVE(&txq->axq_stageq, bf, bf_stagelist);
an->an_tx_ffbuf[skb->priority] = NULL;
@@ -18,7 +19,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
/*
* chain skbs and add FF magic
-@@ -2585,7 +2586,7 @@
+@@ -2584,7 +2585,7 @@
*/
ATH_HARDSTART_GET_TX_BUF_WITH_LOCK;
if (bf == NULL) {
@@ -27,7 +28,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
goto hardstart_fail;
}
DPRINTF(sc, ATH_DEBUG_XMIT | ATH_DEBUG_FF,
-@@ -2597,8 +2598,7 @@
+@@ -2596,8 +2597,7 @@
an->an_tx_ffbuf[skb->priority] = bf;
TAILQ_INSERT_HEAD(&txq->axq_stageq, bf, bf_stagelist);
@@ -37,7 +38,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
return 0;
}
-@@ -2650,12 +2650,12 @@
+@@ -2649,12 +2649,12 @@
ATH_HARDSTART_GET_TX_BUF_WITH_LOCK;
if (bf == NULL) {
@@ -52,9 +53,10 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
ff_bypass:
-diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
---- madwifi.old/ath/if_athvar.h 2007-06-01 16:44:25.149901320 +0200
-+++ madwifi.dev/ath/if_athvar.h 2007-06-01 20:00:06.916881416 +0200
+Index: madwifi-ng-r2420-20070602/ath/if_athvar.h
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_athvar.h 2007-06-04 13:21:58.428094248 +0200
++++ madwifi-ng-r2420-20070602/ath/if_athvar.h 2007-06-04 13:21:58.684055336 +0200
@@ -484,6 +484,8 @@
#define ATH_TXQ_INTR_PERIOD 5 /* axq_intrcnt period for intr gen */
#define ATH_TXQ_LOCK_INIT(_tq) spin_lock_init(&(_tq)->axq_lock)
@@ -64,4 +66,3 @@ diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
#define ATH_TXQ_LOCK_IRQ(_tq) do { \
unsigned long __axq_lockflags; \
spin_lock_irqsave(&(_tq)->axq_lock, __axq_lockflags);
-
diff --git a/package/madwifi/patches/305-pureg_fix.patch b/package/madwifi/patches/305-pureg_fix.patch
index 4193821877ab8fded3d2b0c1426c63a8025b6068..d3c49d1cb713062dfbb49846e4061c9299ae7aae 100644
--- a/package/madwifi/patches/305-pureg_fix.patch
+++ b/package/madwifi/patches/305-pureg_fix.patch
@@ -1,7 +1,8 @@
-diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
---- madwifi-ng-r2377-20070526.old/ath/if_ath.c 2007-05-26 18:51:09.426654472 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c 2007-05-26 18:51:09.440652344 +0200
-@@ -3383,7 +3383,9 @@
+Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_ath.c 2007-06-04 13:21:58.684055336 +0200
++++ madwifi-ng-r2420-20070602/ath/if_ath.c 2007-06-04 13:21:58.895023264 +0200
+@@ -3362,7 +3362,9 @@
rfilt |= HAL_RX_FILTER_PROM;
if (ic->ic_opmode == IEEE80211_M_STA ||
sc->sc_opmode == HAL_M_IBSS || /* NB: AHDEMO too */
@@ -10,11 +11,12 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.d
+ ((ic->ic_opmode == IEEE80211_M_HOSTAP) &&
+ (ic->ic_protmode != IEEE80211_PROT_NONE)))
rfilt |= HAL_RX_FILTER_BEACON;
- if (sc->sc_nmonvaps > 0)
- rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_input.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c 2007-05-26 18:51:09.429654016 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_input.c 2007-05-26 18:51:09.443651888 +0200
+ if ((sc->sc_nmonvaps > 0) || ((sc->sc_nvaps > 0) && (sc->sc_nibssvaps > 0)))
+ rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_input.c 2007-06-04 13:21:58.461089232 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_input.c 2007-06-04 13:21:58.897022960 +0200
@@ -321,11 +321,12 @@
bssid = wh->i_addr3;
}
@@ -40,7 +42,7 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2
/* not interested in */
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
bssid, NULL, "%s", "not to bss");
-@@ -2555,7 +2557,7 @@
+@@ -2542,7 +2544,7 @@
u_int8_t *frm, *efrm;
u_int8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath;
u_int8_t rate;
@@ -49,7 +51,7 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2
u_int8_t qosinfo;
wh = (struct ieee80211_frame *) skb->data;
-@@ -2577,11 +2579,15 @@
+@@ -2564,11 +2566,15 @@
* o station mode when associated (to collect state
* updates such as 802.11g slot time), or
* o adhoc mode (to discover neighbors)
@@ -66,7 +68,7 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2
vap->iv_stats.is_rx_mgtdiscard++;
return;
}
-@@ -2664,6 +2670,7 @@
+@@ -2651,6 +2657,7 @@
break;
}
scan.erp = frm[2];
@@ -74,7 +76,7 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2
break;
case IEEE80211_ELEMID_RSN:
scan.rsn = frm;
-@@ -2839,6 +2846,20 @@
+@@ -2826,6 +2833,20 @@
ieee80211_bg_scan(vap);
return;
}
@@ -95,9 +97,10 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2
/*
* If scanning, just pass information to the scan module.
*/
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c 2007-05-26 18:51:09.430653864 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.c 2007-05-26 18:51:09.444651736 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_node.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_node.c 2007-06-04 13:21:57.503234848 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_node.c 2007-06-04 13:21:58.897022960 +0200
@@ -332,10 +332,16 @@
/* Update country ie information */
ieee80211_build_countryie(ic);
@@ -117,11 +120,12 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c madwifi-ng-r23
(void) ieee80211_sta_join1(PASS_NODE(ni));
}
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c 2007-05-26 18:51:09.431653712 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.c 2007-05-26 18:51:09.445651584 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_proto.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_proto.c 2007-06-04 13:21:58.133139088 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_proto.c 2007-06-04 13:21:58.898022808 +0200
@@ -586,6 +586,28 @@
- { 4, { 2, 4, 11, 22 } }, /* IEEE80211_MODE_TURBO_G (mixed b/g) */
+ { 4, { 2, 4, 11, 22 } }, /* IEEE80211_MODE_TURBO_G (mixed b/g) */
};
+static const struct ieee80211_rateset basicpureg[] = {
@@ -149,10 +153,11 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c madwifi-ng-r2
/*
* Mark the basic rates for the 11g rate table based on the
* specified mode. For 11b compatibility we mark only 11b
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_var.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_var.h
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_var.h 2007-05-26 18:51:09.321670432 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_var.h 2007-05-26 18:51:09.445651584 +0200
-@@ -584,6 +584,8 @@
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_var.h
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_var.h 2007-06-04 13:21:58.134138936 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_var.h 2007-06-04 13:21:58.899022656 +0200
+@@ -593,6 +593,8 @@
void ieee80211_build_countryie(struct ieee80211com *);
int ieee80211_media_setup(struct ieee80211com *, struct ifmedia *, u_int32_t,
ifm_change_cb_t, ifm_stat_cb_t);
@@ -161,4 +166,3 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_var.h madwifi-ng-r237
/* Key update synchronization methods. XXX should not be visible. */
static __inline void
-
diff --git a/package/madwifi/patches/309-micfail_detect.patch b/package/madwifi/patches/309-micfail_detect.patch
index ff3be903c6cba0b35d03e5bcd7a6154c0da52764..4ff11aba556f8e0f1363c13f149a7038db90f212 100644
--- a/package/madwifi/patches/309-micfail_detect.patch
+++ b/package/madwifi/patches/309-micfail_detect.patch
@@ -1,7 +1,8 @@
-diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
---- madwifi.old/ath/if_ath.c 2007-06-01 11:39:53.078678000 +0200
-+++ madwifi.dev/ath/if_ath.c 2007-06-01 11:50:32.819422992 +0200
-@@ -5604,6 +5604,7 @@
+Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_ath.c 2007-06-04 13:21:58.895023264 +0200
++++ madwifi-ng-r2420-20070602/ath/if_ath.c 2007-06-04 13:21:59.133986936 +0200
+@@ -5602,6 +5602,7 @@
u_int phyerr;
u_int processed = 0, early_stop = 0;
u_int rx_limit = dev->quota;
@@ -9,7 +10,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
/* Let the 802.11 layer know about the new noise floor */
sc->sc_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
-@@ -5698,25 +5699,7 @@
+@@ -5696,25 +5697,7 @@
}
if (rs->rs_status & HAL_RXERR_MIC) {
sc->sc_stats.ast_rx_badmic++;
@@ -36,7 +37,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
}
/*
* Reject error frames if we have no vaps that
-@@ -5774,8 +5757,9 @@
+@@ -5772,8 +5755,9 @@
/*
* Finished monitor mode handling, now reject
* error frames before passing to other vaps
@@ -47,7 +48,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
dev_kfree_skb(skb);
skb = NULL;
goto rx_next;
-@@ -5806,6 +5790,27 @@
+@@ -5804,6 +5788,27 @@
sc->sc_hwmap[rs->rs_rate].ieeerate,
rs->rs_rssi);
@@ -75,9 +76,10 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
/*
* Locate the node for sender, track state, and then
* pass the (referenced) node up to the 802.11 layer
-diff -ur madwifi.old/net80211/ieee80211_crypto_ccmp.c madwifi.dev/net80211/ieee80211_crypto_ccmp.c
---- madwifi.old/net80211/ieee80211_crypto_ccmp.c 2007-05-30 03:41:18.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto_ccmp.c 2007-06-01 11:45:05.000259080 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_ccmp.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_crypto_ccmp.c 2007-06-04 13:21:57.936169032 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_ccmp.c 2007-06-04 13:21:59.134986784 +0200
@@ -78,7 +78,7 @@
static int ccmp_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
static int ccmp_decap(struct ieee80211_key *, struct sk_buff *, int);
@@ -87,7 +89,7 @@ diff -ur madwifi.old/net80211/ieee80211_crypto_ccmp.c madwifi.dev/net80211/ieee8
static const struct ieee80211_cipher ccmp = {
.ic_name = "AES-CCM",
-@@ -298,7 +298,7 @@
+@@ -304,7 +304,7 @@
* Verify and strip MIC from the frame.
*/
static int
@@ -96,9 +98,10 @@ diff -ur madwifi.old/net80211/ieee80211_crypto_ccmp.c madwifi.dev/net80211/ieee8
{
return 1;
}
-diff -ur madwifi.old/net80211/ieee80211_crypto.h madwifi.dev/net80211/ieee80211_crypto.h
---- madwifi.old/net80211/ieee80211_crypto.h 2007-04-16 14:32:29.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto.h 2007-06-01 11:45:05.000259080 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto.h
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_crypto.h 2007-06-04 13:21:53.000919304 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_crypto.h 2007-06-04 13:21:59.134986784 +0200
@@ -145,7 +145,7 @@
int (*ic_encap)(struct ieee80211_key *, struct sk_buff *, u_int8_t);
int (*ic_decap)(struct ieee80211_key *, struct sk_buff *, int);
@@ -121,9 +124,10 @@ diff -ur madwifi.old/net80211/ieee80211_crypto.h madwifi.dev/net80211/ieee80211_
}
/*
-diff -ur madwifi.old/net80211/ieee80211_crypto_none.c madwifi.dev/net80211/ieee80211_crypto_none.c
---- madwifi.old/net80211/ieee80211_crypto_none.c 2006-09-20 10:45:13.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto_none.c 2007-06-01 11:45:05.000259080 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_none.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_crypto_none.c 2007-06-04 13:21:53.005918544 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_none.c 2007-06-04 13:21:59.134986784 +0200
@@ -52,7 +52,7 @@
static int none_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
static int none_decap(struct ieee80211_key *, struct sk_buff *, int);
@@ -142,9 +146,10 @@ diff -ur madwifi.old/net80211/ieee80211_crypto_none.c madwifi.dev/net80211/ieee8
{
struct ieee80211vap *vap = k->wk_private;
-diff -ur madwifi.old/net80211/ieee80211_crypto_tkip.c madwifi.dev/net80211/ieee80211_crypto_tkip.c
---- madwifi.old/net80211/ieee80211_crypto_tkip.c 2007-05-30 03:41:18.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto_tkip.c 2007-06-01 11:45:05.001258928 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_tkip.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_crypto_tkip.c 2007-06-04 13:21:53.011917632 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_tkip.c 2007-06-04 13:21:59.135986632 +0200
@@ -57,7 +57,7 @@
static int tkip_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
static int tkip_enmic(struct ieee80211_key *, struct sk_buff *, int);
@@ -172,9 +177,10 @@ diff -ur madwifi.old/net80211/ieee80211_crypto_tkip.c madwifi.dev/net80211/ieee8
struct ieee80211vap *vap = ctx->tc_vap;
u8 mic[IEEE80211_WEP_MICLEN];
u8 mic0[IEEE80211_WEP_MICLEN];
-diff -ur madwifi.old/net80211/ieee80211_crypto_wep.c madwifi.dev/net80211/ieee80211_crypto_wep.c
---- madwifi.old/net80211/ieee80211_crypto_wep.c 2007-05-29 23:55:25.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto_wep.c 2007-06-01 11:45:05.001258928 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_wep.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_crypto_wep.c 2007-06-04 13:21:53.016916872 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_wep.c 2007-06-04 13:21:59.135986632 +0200
@@ -54,7 +54,7 @@
static int wep_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
static int wep_decap(struct ieee80211_key *, struct sk_buff *, int);
@@ -193,9 +199,10 @@ diff -ur madwifi.old/net80211/ieee80211_crypto_wep.c madwifi.dev/net80211/ieee80
{
return 1;
}
-diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_input.c
---- madwifi.old/net80211/ieee80211_input.c 2007-06-01 11:31:46.931583000 +0200
-+++ madwifi.dev/net80211/ieee80211_input.c 2007-06-01 11:45:05.003258624 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_input.c 2007-06-04 13:21:58.897022960 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_input.c 2007-06-04 13:21:59.137986328 +0200
@@ -632,7 +632,7 @@
* Next strip any MSDU crypto bits.
*/
@@ -205,7 +212,7 @@ diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_i
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
ni->ni_macaddr, "data", "%s", "demic error");
IEEE80211_NODE_STAT(ni, rx_demicfail);
-@@ -3744,6 +3744,47 @@
+@@ -3730,6 +3730,47 @@
}
#endif
@@ -253,9 +260,10 @@ diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_i
#ifdef IEEE80211_DEBUG
/*
* Debugging support.
-diff -ur madwifi.old/net80211/ieee80211_proto.h madwifi.dev/net80211/ieee80211_proto.h
---- madwifi.old/net80211/ieee80211_proto.h 2007-06-01 11:26:04.172691000 +0200
-+++ madwifi.dev/net80211/ieee80211_proto.h 2007-06-01 11:45:05.004258472 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_proto.h
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_proto.h 2007-06-04 13:21:58.134138936 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_proto.h 2007-06-04 13:21:59.137986328 +0200
@@ -91,6 +91,7 @@
void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode);
enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *);
@@ -264,8 +272,10 @@ diff -ur madwifi.old/net80211/ieee80211_proto.h madwifi.dev/net80211/ieee80211_p
/*
* Return the size of the 802.11 header for a management or data frame.
---- madwifi.old/net80211/ieee80211_linux.c 2007-06-02 04:05:42.902538336 +0200
-+++ madwifi.dev/net80211/ieee80211_linux.c 2007-06-02 04:05:55.302653232 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_linux.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_linux.c 2007-06-04 13:21:57.745198064 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_linux.c 2007-06-04 13:21:59.137986328 +0200
@@ -291,8 +291,8 @@
/* TODO: needed parameters: count, keyid, key type, src address, TSC */
snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag,
diff --git a/package/madwifi/patches/310-erp_beacon_check.patch b/package/madwifi/patches/310-erp_beacon_check.patch
index e63cca5709e9ac5571725bd6ac85cf8d28016650..22244cb9fe0fbb11304d857bb07610c10b906a14 100644
--- a/package/madwifi/patches/310-erp_beacon_check.patch
+++ b/package/madwifi/patches/310-erp_beacon_check.patch
@@ -1,6 +1,7 @@
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_beacon.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_beacon.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_beacon.c 2007-05-26 18:51:09.428654168 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_beacon.c 2007-05-26 18:51:09.645621184 +0200
+Index: madwifi-ng-r2420-20070602/net80211/ieee80211_beacon.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_beacon.c 2007-06-04 13:21:57.501235152 +0200
++++ madwifi-ng-r2420-20070602/net80211/ieee80211_beacon.c 2007-06-04 13:21:59.411944680 +0200
@@ -512,7 +512,7 @@
vap->iv_flags &= ~IEEE80211_F_XRUPDATE;
}
diff --git a/package/nozomi/patches/001-devfs.patch b/package/nozomi/patches/001-devfs.patch
index a532e579ff9460ee6716430c636bfceca4b5a195..742409ec6862f80ab38104a415e276c1cc7d2a48 100644
--- a/package/nozomi/patches/001-devfs.patch
+++ b/package/nozomi/patches/001-devfs.patch
@@ -1,5 +1,7 @@
---- kmod-nozomi.orig/nozomi.c 2006-02-09 18:07:27.000000000 +0100
-+++ kmod-nozomi/nozomi.c 2006-09-06 10:55:48.000000000 +0200
+Index: nozomi-060209/nozomi.c
+===================================================================
+--- nozomi-060209.orig/nozomi.c 2007-06-04 13:22:47.268669352 +0200
++++ nozomi-060209/nozomi.c 2007-06-04 13:22:47.338658712 +0200
@@ -2093,11 +2093,15 @@
td->magic = TTY_DRIVER_MAGIC;
diff --git a/package/nozomi/patches/002-nozomi_vf_01.patch b/package/nozomi/patches/002-nozomi_vf_01.patch
index 77dca1fbbfee7e97d7bc20a93f96fa3b87cad687..f78a2441794c0d663bc4f3d42e677eb5752a9365 100644
--- a/package/nozomi/patches/002-nozomi_vf_01.patch
+++ b/package/nozomi/patches/002-nozomi_vf_01.patch
@@ -1,5 +1,7 @@
---- nozomi/nozomi.c.orig 2006-04-16 12:15:42.000000000 +0100
-+++ nozomi/nozomi.c 2006-04-19 18:27:29.000000000 +0100
+Index: nozomi-060209/nozomi.c
+===================================================================
+--- nozomi-060209.orig/nozomi.c 2007-06-04 13:22:47.338658712 +0200
++++ nozomi-060209/nozomi.c 2007-06-04 13:22:47.527629984 +0200
@@ -7,6 +7,9 @@
*
* Maintained by: Paul Hardwick, p.hardwick@option.com
@@ -46,7 +48,7 @@
} while(0)
#define GET_MEM(value__, addr__, length__) \
-@@ -265,7 +268,7 @@
+@@ -265,7 +269,7 @@
/* There are two types of nozomi cards, one with 2048 memory and with 8192 memory */
typedef enum {
F32_2 = 2048, /* Has 512 bytes downlink and uplink * 2 -> 2048 */
@@ -55,7 +57,7 @@
} card_type_t;
/* Two different toggle channels exist */
-@@ -438,12 +441,12 @@
+@@ -438,12 +442,12 @@
u32 base_addr;
u8 closing;
@@ -73,7 +75,7 @@
card_type_t card_type;
config_table_t config_table; /* Configuration table */
struct pci_dev *pdev;
-@@ -490,7 +493,7 @@
+@@ -490,7 +494,7 @@
/* Used to store interrupt variables */
typedef struct {
@@ -82,7 +84,7 @@
} irq_t;
MODULE_DEVICE_TABLE(pci, nozomi_pci_tbl);
-@@ -1345,9 +1348,9 @@
+@@ -1345,9 +1349,9 @@
u32 offset = dc->base_addr + dc->card_type/2;
int i;
@@ -95,7 +97,7 @@
dc->ier_last_written = 0;
dc->closing = 0;
-@@ -1366,13 +1369,16 @@
+@@ -1366,13 +1370,16 @@
static void tty_flip_queue_function(void *tmp_dc) {
dc_t *dc = (dc_t*) tmp_dc;
int i;
@@ -112,7 +114,7 @@
}
}
}
-@@ -1555,7 +1561,11 @@
+@@ -1555,7 +1562,11 @@
static void tty_do_close(dc_t *dc, port_t *port) {
@@ -125,7 +127,7 @@
if ( !port->tty_open_count ) {
goto exit;
-@@ -1569,7 +1579,9 @@
+@@ -1569,7 +1580,9 @@
if ( port->tty_open_count == 0) {
D1("close: %d", port->token_dl );
@@ -135,7 +137,7 @@
}
exit:
-@@ -1679,8 +1691,11 @@
+@@ -1679,8 +1692,11 @@
s32 index = get_index(tty);
port_t *port = get_port_by_tty(tty);
dc_t *dc = get_dc_by_tty(tty);
@@ -148,7 +150,7 @@
tty->low_latency = 1;
tty->driver_data = port;
-@@ -1698,7 +1713,9 @@
+@@ -1698,7 +1714,9 @@
if ( port->tty_open_count == 1) {
port->rx_data = port->tx_data = 0;
D1("open: %d", port->token_dl );
@@ -158,7 +160,7 @@
}
up(&port->tty_sem);
-@@ -1722,6 +1739,7 @@
+@@ -1722,6 +1740,7 @@
int rval = -EINVAL;
dc_t *dc = get_dc_by_tty(tty);
port_t *port = (port_t *) tty->driver_data;
@@ -166,7 +168,7 @@
/* D1( "WRITEx: %d, index = %d", count, index); */
-@@ -1729,7 +1747,10 @@
+@@ -1729,7 +1748,10 @@
return -ENODEV;
}
@@ -178,7 +180,7 @@
if (! port->tty_open_count) {
D1( " ");
-@@ -1752,6 +1773,7 @@
+@@ -1752,6 +1774,7 @@
goto exit;
}
@@ -186,7 +188,7 @@
// CTS is only valid on the modem channel
if ( port == &(dc->port[PORT_MDM]) ) {
if ( port->ctrl_dl.CTS ) {
-@@ -1763,6 +1785,7 @@
+@@ -1763,6 +1786,7 @@
} else {
enable_transmit_ul(port->tty_index, dc );
}
@@ -194,7 +196,7 @@
exit:
up(&port->tty_sem);
-@@ -1782,7 +1805,9 @@
+@@ -1782,7 +1806,9 @@
return 0;
}
@@ -205,7 +207,7 @@
if (! port->tty_open_count) {
goto exit;
-@@ -1969,6 +1994,8 @@
+@@ -1969,6 +1995,8 @@
static int ntty_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg) {
port_t *port = (port_t *) tty->driver_data;
@@ -214,7 +216,7 @@
int mask;
int rval = -ENOIOCTLCMD;
-@@ -1991,7 +2018,9 @@
+@@ -1991,7 +2019,9 @@
rval = ntty_ioctl_tiocgicount(tty, file, cmd, arg);
break;
case TIOCMGET:
@@ -224,7 +226,7 @@
break;
case TIOCMSET:
rval = ntty_tiocmset(tty, file, arg);
-@@ -2000,20 +2029,24 @@
+@@ -2000,20 +2030,24 @@
if (get_user(mask, (unsigned long *) arg))
return -EFAULT;
diff --git a/package/ntfs-3g/patches/100-no_ldconfig.patch b/package/ntfs-3g/patches/100-no_ldconfig.patch
index c64db73d28c7a3e801a5d3ca711146a7164ad5f9..60371cb14591560a01e93171daf0de7b7be35eab 100644
--- a/package/ntfs-3g/patches/100-no_ldconfig.patch
+++ b/package/ntfs-3g/patches/100-no_ldconfig.patch
@@ -1,6 +1,7 @@
-diff -Nur ntfs-3g-0.20070207-RC1/src/Makefile.in ntfs-3g-0.20070207-RC1-owrt/src/Makefile.in
---- ntfs-3g-0.20070207-RC1/src/Makefile.in 2007-02-06 22:43:10.000000000 +0100
-+++ ntfs-3g-0.20070207-RC1-owrt/src/Makefile.in 2007-02-08 12:54:27.000000000 +0100
+Index: ntfs-3g-1.0/src/Makefile.in
+===================================================================
+--- ntfs-3g-1.0.orig/src/Makefile.in 2007-06-04 13:23:57.444001080 +0200
++++ ntfs-3g-1.0/src/Makefile.in 2007-06-04 13:23:57.567982232 +0200
@@ -582,7 +582,7 @@
install-exec-hook:
$(INSTALL) -d $(DESTDIR)/sbin
diff --git a/package/openssl/patches/110-optimize-for-size.patch b/package/openssl/patches/110-optimize-for-size.patch
index 8c78b6a01cfd1a6ae011f654390b8a283328ffaf..e0a1952d321869f55006ea0690e81b6d28993373 100644
--- a/package/openssl/patches/110-optimize-for-size.patch
+++ b/package/openssl/patches/110-optimize-for-size.patch
@@ -1,6 +1,7 @@
-diff -ur openssl-0.9.8a/Configure openssl-0.9.8a-owrt/Configure
---- openssl-0.9.8a/Configure 2005-08-02 12:59:42.000000000 +0200
-+++ openssl-0.9.8a-owrt/Configure 2006-03-23 14:16:35.000000000 +0100
+Index: openssl-0.9.8e/Configure
+===================================================================
+--- openssl-0.9.8e.orig/Configure 2007-06-04 13:23:32.150846224 +0200
++++ openssl-0.9.8e/Configure 2007-06-04 13:23:32.217836040 +0200
@@ -353,6 +353,8 @@
"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
diff --git a/package/openssl/patches/120-makedepend.patch b/package/openssl/patches/120-makedepend.patch
index c802fe4adc57c622aea42b5a6f29adce2569b25a..d256dd88ab24b91d1170e2d8021b469eb5d26354 100644
--- a/package/openssl/patches/120-makedepend.patch
+++ b/package/openssl/patches/120-makedepend.patch
@@ -1,12 +1,13 @@
-diff -ruN openssl-0.9.7g-old/util/domd openssl-0.9.7g-new/util/domd
---- openssl-0.9.7g-old/util/domd 2004-05-11 14:46:18.000000000 +0200
-+++ openssl-0.9.7g-new/util/domd 2005-05-30 20:20:04.000000000 +0200
+Index: openssl-0.9.8e/util/domd
+===================================================================
+--- openssl-0.9.8e.orig/util/domd 2007-06-04 13:23:32.130849264 +0200
++++ openssl-0.9.8e/util/domd 2007-06-04 13:23:32.408807008 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Do a makedepend, only leave out the standard headers
# Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
-
+
@@ -14,7 +14,8 @@
cp Makefile Makefile.save
# fake the presence of Kerberos
diff --git a/package/openssl/patches/130-perl-path.patch b/package/openssl/patches/130-perl-path.patch
index 42467b838807769f84c42b39618cfe49841be93f..3edc796f2e55b232cb66b76491a1278e819eced2 100644
--- a/package/openssl/patches/130-perl-path.patch
+++ b/package/openssl/patches/130-perl-path.patch
@@ -1,69 +1,77 @@
-diff -Nur openssl-0.9.7f/Configure openssl-0.9.7f.new/Configure
---- openssl-0.9.7f/Configure 2005-03-12 12:28:21.000000000 +0100
-+++ openssl-0.9.7f.new/Configure 2005-04-03 20:32:00.000000000 +0200
+Index: openssl-0.9.8e/Configure
+===================================================================
+--- openssl-0.9.8e.orig/Configure 2007-06-04 13:23:32.217836040 +0200
++++ openssl-0.9.8e/Configure 2007-06-04 13:23:32.598778128 +0200
@@ -1,4 +1,4 @@
-:
+#!/usr/bin/perl
eval 'exec perl -S $0 ${1+"$@"}'
if $running_under_some_shell;
##
-diff -Nur openssl-0.9.7f/tools/c_rehash.in openssl-0.9.7f.new/tools/c_rehash.in
---- openssl-0.9.7f/tools/c_rehash.in 2002-10-11 22:35:45.000000000 +0200
-+++ openssl-0.9.7f.new/tools/c_rehash.in 2005-04-03 20:41:17.000000000 +0200
+Index: openssl-0.9.8e/tools/c_rehash.in
+===================================================================
+--- openssl-0.9.8e.orig/tools/c_rehash.in 2007-06-04 13:23:32.074857776 +0200
++++ openssl-0.9.8e/tools/c_rehash.in 2007-06-04 13:23:32.598778128 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
# Perl c_rehash script, scan all files in a directory
-diff -Nur openssl-0.9.7f/util/clean-depend.pl openssl-0.9.7f.new/util/clean-depend.pl
---- openssl-0.9.7f/util/clean-depend.pl 2001-10-10 10:27:28.000000000 +0200
-+++ openssl-0.9.7f.new/util/clean-depend.pl 2005-04-03 20:41:38.000000000 +0200
+Index: openssl-0.9.8e/util/clean-depend.pl
+===================================================================
+--- openssl-0.9.8e.orig/util/clean-depend.pl 2007-06-04 13:23:32.080856864 +0200
++++ openssl-0.9.8e/util/clean-depend.pl 2007-06-04 13:23:32.598778128 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
# Clean the dependency list in a makefile of standard includes...
# Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
-diff -Nur openssl-0.9.7f/util/mkdef.pl openssl-0.9.7f.new/util/mkdef.pl
---- openssl-0.9.7f/util/mkdef.pl 2005-02-05 18:19:23.000000000 +0100
-+++ openssl-0.9.7f.new/util/mkdef.pl 2005-04-03 20:42:49.000000000 +0200
+Index: openssl-0.9.8e/util/mkdef.pl
+===================================================================
+--- openssl-0.9.8e.orig/util/mkdef.pl 2007-06-04 13:23:32.085856104 +0200
++++ openssl-0.9.8e/util/mkdef.pl 2007-06-04 13:23:32.599777976 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl
#
# generate a .def file
#
-diff -Nur openssl-0.9.7f/util/mkerr.pl openssl-0.9.7f.new/util/mkerr.pl
---- openssl-0.9.7f/util/mkerr.pl 2005-01-31 02:28:17.000000000 +0100
-+++ openssl-0.9.7f.new/util/mkerr.pl 2005-04-03 20:43:02.000000000 +0200
+Index: openssl-0.9.8e/util/mkerr.pl
+===================================================================
+--- openssl-0.9.8e.orig/util/mkerr.pl 2007-06-04 13:23:32.091855192 +0200
++++ openssl-0.9.8e/util/mkerr.pl 2007-06-04 13:23:32.599777976 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl
my $config = "crypto/err/openssl.ec";
my $debug = 0;
-diff -Nur openssl-0.9.7f/util/mkstack.pl openssl-0.9.7f.new/util/mkstack.pl
---- openssl-0.9.7f/util/mkstack.pl 2004-10-04 18:27:36.000000000 +0200
-+++ openssl-0.9.7f.new/util/mkstack.pl 2005-04-03 20:43:18.000000000 +0200
+Index: openssl-0.9.8e/util/mkstack.pl
+===================================================================
+--- openssl-0.9.8e.orig/util/mkstack.pl 2007-06-04 13:23:32.096854432 +0200
++++ openssl-0.9.8e/util/mkstack.pl 2007-06-04 13:23:32.600777824 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl
# This is a utility that searches out "DECLARE_STACK_OF()"
# declarations in .h and .c files, and updates/creates/replaces
-diff -Nur openssl-0.9.7f/util/pod2man.pl openssl-0.9.7f.new/util/pod2man.pl
---- openssl-0.9.7f/util/pod2man.pl 2002-05-30 17:30:21.000000000 +0200
-+++ openssl-0.9.7f.new/util/pod2man.pl 2005-04-03 20:43:52.000000000 +0200
+Index: openssl-0.9.8e/util/pod2man.pl
+===================================================================
+--- openssl-0.9.8e.orig/util/pod2man.pl 2007-06-04 13:23:32.102853520 +0200
++++ openssl-0.9.8e/util/pod2man.pl 2007-06-04 13:23:32.600777824 +0200
@@ -1,4 +1,4 @@
-: #!/usr/bin/perl-5.005
+#!/usr/bin/perl
eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
if $running_under_some_shell;
-diff -Nur openssl-0.9.7f/util/selftest.pl openssl-0.9.7f.new/util/selftest.pl
---- openssl-0.9.7f/util/selftest.pl 2004-05-11 14:46:19.000000000 +0200
-+++ openssl-0.9.7f.new/util/selftest.pl 2005-04-03 20:44:10.000000000 +0200
+Index: openssl-0.9.8e/util/selftest.pl
+===================================================================
+--- openssl-0.9.8e.orig/util/selftest.pl 2007-06-04 13:23:32.109852456 +0200
++++ openssl-0.9.8e/util/selftest.pl 2007-06-04 13:23:32.600777824 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl
diff --git a/package/openssl/patches/140-makefile-dirs.patch b/package/openssl/patches/140-makefile-dirs.patch
index 89022e0c6cdc8708e8df93879925d9ba26d4ab6b..b35c8de0e08fde2ce643fded84cb10dd59265da8 100644
--- a/package/openssl/patches/140-makefile-dirs.patch
+++ b/package/openssl/patches/140-makefile-dirs.patch
@@ -1,8 +1,10 @@
---- openssl-0.9.8a/Makefile.org 2006-02-21 20:57:45.000000000 -0800
-+++ openssl-0.9.8a-new/Makefile.org 2006-02-21 21:37:11.000000000 -0800
-@@ -100,7 +100,7 @@
- KRB5_INCLUDES=
- LIBKRB5=
+Index: openssl-0.9.8e/Makefile.org
+===================================================================
+--- openssl-0.9.8e.orig/Makefile.org 2007-06-04 13:23:32.048861728 +0200
++++ openssl-0.9.8e/Makefile.org 2007-06-04 13:23:32.857738760 +0200
+@@ -104,7 +104,7 @@
+ ZLIB_INCLUDE=
+ LIBZLIB=
-DIRS= crypto ssl engines apps test tools
+DIRS= crypto ssl apps
diff --git a/package/openssl/patches/150-no_engines.patch b/package/openssl/patches/150-no_engines.patch
index b928fbcc61d4cbeef0db0a7e2852a3c6af3aa89c..104cba07a2a52e939943606f4f7fa1974abde6cc 100644
--- a/package/openssl/patches/150-no_engines.patch
+++ b/package/openssl/patches/150-no_engines.patch
@@ -1,6 +1,7 @@
-diff -udrNP openssl-0.9.8-stable-SNAP-20050703.orig/util/libeay.num openssl-0.9.8-stable-SNAP-20050703/util/libeay.num
---- openssl-0.9.8-stable-SNAP-20050703.orig/util/libeay.num 2005-07-04 00:27:14.653639088 +0200
-+++ openssl-0.9.8-stable-SNAP-20050703/util/libeay.num 2005-07-04 22:50:07.986576664 +0200
+Index: openssl-0.9.8e/util/libeay.num
+===================================================================
+--- openssl-0.9.8e.orig/util/libeay.num 2007-06-04 13:23:32.021865832 +0200
++++ openssl-0.9.8e/util/libeay.num 2007-06-04 13:23:33.045710184 +0200
@@ -2071,7 +2071,6 @@
UI_add_error_string 2633 EXIST::FUNCTION:
KRB5_CHECKSUM_free 2634 EXIST::FUNCTION:
@@ -66,10 +67,11 @@ diff -udrNP openssl-0.9.8-stable-SNAP-20050703.orig/util/libeay.num openssl-0.9.
EC_GROUP_set_curve_name 3533 EXIST::FUNCTION:EC
X509_CERT_PAIR_it 3534 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
X509_CERT_PAIR_it 3534 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-diff -udrNP openssl-0.9.8-stable-SNAP-20050703.orig/Configure openssl-0.9.8-stable-SNAP-20050703/Configure
---- openssl-0.9.8-stable-SNAP-20050703.orig/Configure 2005-07-04 00:27:11.169168808 +0200
-+++ openssl-0.9.8-stable-SNAP-20050703/Configure 2005-07-05 00:02:12.590136992 +0200
-@@ -1623,6 +1624,11 @@
+Index: openssl-0.9.8e/Configure
+===================================================================
+--- openssl-0.9.8e.orig/Configure 2007-06-04 13:23:32.598778128 +0200
++++ openssl-0.9.8e/Configure 2007-06-04 13:23:33.046710032 +0200
+@@ -1644,6 +1644,11 @@
close(OUT);
}
diff --git a/package/openssl/patches/160-disable_doc_tests.patch b/package/openssl/patches/160-disable_doc_tests.patch
index 27e203347552e745c36aabe011677c6445d29770..9706a0b2a82469a2f739b2f5f248e386ee1a6a69 100644
--- a/package/openssl/patches/160-disable_doc_tests.patch
+++ b/package/openssl/patches/160-disable_doc_tests.patch
@@ -1,16 +1,17 @@
-diff -urN openssl-0.9.8a/Makefile openssl-0.9.8a.new/Makefile
---- openssl-0.9.8a/Makefile 2005-10-11 12:21:48.000000000 +0200
-+++ openssl-0.9.8a.new/Makefile 2006-03-29 15:23:28.107586680 +0200
-@@ -102,7 +102,7 @@
- KRB5_INCLUDES=
- LIBKRB5=
+Index: openssl-0.9.8e/Makefile
+===================================================================
+--- openssl-0.9.8e.orig/Makefile 2007-06-04 13:23:31.995869784 +0200
++++ openssl-0.9.8e/Makefile 2007-06-04 13:23:33.246679632 +0200
+@@ -106,7 +106,7 @@
+ ZLIB_INCLUDE=
+ LIBZLIB=
-DIRS= crypto ssl engines apps test tools
+DIRS= crypto ssl engines apps tools
SHLIBDIRS= crypto ssl
# dirs in crypto to build
-@@ -119,7 +119,7 @@
+@@ -123,7 +123,7 @@
# tests to perform. "alltests" is a special word indicating that all tests
# should be performed.
@@ -19,7 +20,7 @@ diff -urN openssl-0.9.8a/Makefile openssl-0.9.8a.new/Makefile
MAKEFILE= Makefile
-@@ -131,7 +131,7 @@
+@@ -135,7 +135,7 @@
TOP= .
ONEDIRS=out tmp
@@ -28,7 +29,7 @@ diff -urN openssl-0.9.8a/Makefile openssl-0.9.8a.new/Makefile
WDIRS= windows
LIBS= libcrypto.a libssl.a
SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
-@@ -204,7 +204,7 @@
+@@ -225,7 +225,7 @@
@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
sub_all: build_all
@@ -37,7 +38,7 @@ diff -urN openssl-0.9.8a/Makefile openssl-0.9.8a.new/Makefile
build_libs: build_crypto build_ssl build_engines
-@@ -454,7 +454,7 @@
+@@ -475,7 +475,7 @@
dist_pem_h:
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
@@ -46,9 +47,10 @@ diff -urN openssl-0.9.8a/Makefile openssl-0.9.8a.new/Makefile
install_sw:
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
-diff -urN openssl-0.9.8b/Makefile.org openssl-0.9.8b.new/Makefile.org
---- openssl-0.9.8b/Makefile.org 2006-09-01 19:34:51.000000000 +0200
-+++ openssl-0.9.8b.new/Makefile.org 2006-09-01 19:36:38.000000000 +0200
+Index: openssl-0.9.8e/Makefile.org
+===================================================================
+--- openssl-0.9.8e.orig/Makefile.org 2007-06-04 13:23:32.857738760 +0200
++++ openssl-0.9.8e/Makefile.org 2007-06-04 13:23:33.246679632 +0200
@@ -473,7 +473,7 @@
dist_pem_h:
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
diff --git a/package/openssl/patches/170-bash_path.patch b/package/openssl/patches/170-bash_path.patch
index b6dc27efee1601eb41ddb4cffc316a61bd0b0a68..45b6269cacf7519bc99fdd15cec6b8936b59e755 100644
--- a/package/openssl/patches/170-bash_path.patch
+++ b/package/openssl/patches/170-bash_path.patch
@@ -1,5 +1,7 @@
---- openssl.old/util/domd Sun Oct 15 01:04:33 2006
-+++ openssl.dev/util/domd Sun Oct 15 01:04:44 2006
+Index: openssl-0.9.8e/util/domd
+===================================================================
+--- openssl-0.9.8e.orig/util/domd 2007-06-04 13:23:32.408807008 +0200
++++ openssl-0.9.8e/util/domd 2007-06-04 13:23:33.442649840 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
diff --git a/package/openswan/patches/100-pluto_includes.patch b/package/openswan/patches/100-pluto_includes.patch
index 8cd1398d4a917558674e3ece7475e003d9000766..cb16d72e58017f73fe58d5f050e8034280f5be77 100644
--- a/package/openswan/patches/100-pluto_includes.patch
+++ b/package/openswan/patches/100-pluto_includes.patch
@@ -1,7 +1,8 @@
-diff -Nur openswan-2.4.0.orig/programs/pluto/Makefile openswan-2.4.0/programs/pluto/Makefile
---- openswan-2.4.0.orig/programs/pluto/Makefile 2005-08-12 03:12:38.000000000 +0200
-+++ openswan-2.4.0/programs/pluto/Makefile 2005-09-29 13:41:14.016377750 +0200
-@@ -271,7 +271,7 @@
+Index: openswan-2.4.8/programs/pluto/Makefile
+===================================================================
+--- openswan-2.4.8.orig/programs/pluto/Makefile 2007-06-04 13:22:49.950261688 +0200
++++ openswan-2.4.8/programs/pluto/Makefile 2007-06-04 13:22:50.017251504 +0200
+@@ -265,7 +265,7 @@
LIBSPLUTO+=$(HAVE_THREADS_LIBS) ${XAUTHPAM_LIBS}
LIBSPLUTO+=${CURL_LIBS}
LIBSPLUTO+=${EXTRA_CRYPTO_LIBS}
diff --git a/package/openswan/patches/110-scripts.patch b/package/openswan/patches/110-scripts.patch
index a350cd123810ce9f925abaf29c6a0baf3f38280a..28269f32752beb94e0f21d95296d1cf0844b954e 100644
--- a/package/openswan/patches/110-scripts.patch
+++ b/package/openswan/patches/110-scripts.patch
@@ -1,15 +1,17 @@
-diff -urN openswan.old/programs/loggerfix openswan.dev/programs/loggerfix
---- openswan.old/programs/loggerfix 1970-01-01 01:00:00.000000000 +0100
-+++ openswan.dev/programs/loggerfix 2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/loggerfix
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ openswan-2.4.8/programs/loggerfix 2007-06-04 13:22:50.209222320 +0200
@@ -0,0 +1,5 @@
+#!/bin/sh
+# use filename instead of /dev/null to log, but dont log to flash or ram
+# pref. log to nfs mount
+echo "$*" >> /dev/null
+exit 0
-diff -urN openswan.old/programs/look/look.in openswan.dev/programs/look/look.in
---- openswan.old/programs/look/look.in 2006-10-08 20:43:21.000000000 +0200
-+++ openswan.dev/programs/look/look.in 2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/look/look.in
+===================================================================
+--- openswan-2.4.8.orig/programs/look/look.in 2007-06-04 13:22:49.874273240 +0200
++++ openswan-2.4.8/programs/look/look.in 2007-06-04 13:22:50.209222320 +0200
@@ -84,7 +84,7 @@
then
pat="$pat|$defaultroutephys\$|$defaultroutevirt\$"
@@ -19,9 +21,10 @@ diff -urN openswan.old/programs/look/look.in openswan.dev/programs/look/look.in
do
pat="$pat|$i\$"
done
-diff -urN openswan.old/programs/_plutorun/_plutorun.in openswan.dev/programs/_plutorun/_plutorun.in
---- openswan.old/programs/_plutorun/_plutorun.in 2006-10-08 20:43:21.000000000 +0200
-+++ openswan.dev/programs/_plutorun/_plutorun.in 2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/_plutorun/_plutorun.in
+===================================================================
+--- openswan-2.4.8.orig/programs/_plutorun/_plutorun.in 2007-06-04 13:22:49.880272328 +0200
++++ openswan-2.4.8/programs/_plutorun/_plutorun.in 2007-06-04 13:22:50.209222320 +0200
@@ -147,7 +147,7 @@
exit 1
fi
@@ -31,9 +34,10 @@ diff -urN openswan.old/programs/_plutorun/_plutorun.in openswan.dev/programs/_pl
then
echo Cannot write to directory to create \"$stderrlog\".
exit 1
-diff -urN openswan.old/programs/_realsetup/_realsetup.in openswan.dev/programs/_realsetup/_realsetup.in
---- openswan.old/programs/_realsetup/_realsetup.in 2006-10-08 20:43:21.000000000 +0200
-+++ openswan.dev/programs/_realsetup/_realsetup.in 2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/_realsetup/_realsetup.in
+===================================================================
+--- openswan-2.4.8.orig/programs/_realsetup/_realsetup.in 2007-06-04 13:22:49.888271112 +0200
++++ openswan-2.4.8/programs/_realsetup/_realsetup.in 2007-06-04 13:22:50.210222168 +0200
@@ -232,7 +232,7 @@
# misc pre-Pluto setup
@@ -43,9 +47,10 @@ diff -urN openswan.old/programs/_realsetup/_realsetup.in openswan.dev/programs/_
if test " $IPSECforwardcontrol" = " yes"
then
-diff -urN openswan.old/programs/send-pr/send-pr.in openswan.dev/programs/send-pr/send-pr.in
---- openswan.old/programs/send-pr/send-pr.in 2006-10-08 20:43:21.000000000 +0200
-+++ openswan.dev/programs/send-pr/send-pr.in 2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/send-pr/send-pr.in
+===================================================================
+--- openswan-2.4.8.orig/programs/send-pr/send-pr.in 2007-06-04 13:22:49.894270200 +0200
++++ openswan-2.4.8/programs/send-pr/send-pr.in 2007-06-04 13:22:50.210222168 +0200
@@ -402,7 +402,7 @@
else
if [ "$fieldname" != "Category" ]
@@ -82,9 +87,10 @@ diff -urN openswan.old/programs/send-pr/send-pr.in openswan.dev/programs/send-pr
echo "/^>${fieldname}:/ s/${dpat}//" >> $FIXFIL
fi
echo "${fmtname}${desc}" >> $file
-diff -urN openswan.old/programs/setup/setup.in openswan.dev/programs/setup/setup.in
---- openswan.old/programs/setup/setup.in 2006-10-08 20:43:21.000000000 +0200
-+++ openswan.dev/programs/setup/setup.in 2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/setup/setup.in
+===================================================================
+--- openswan-2.4.8.orig/programs/setup/setup.in 2007-06-04 13:22:49.902268984 +0200
++++ openswan-2.4.8/programs/setup/setup.in 2007-06-04 13:22:50.210222168 +0200
@@ -117,12 +117,21 @@
# do it
case "$1" in
@@ -108,9 +114,10 @@ diff -urN openswan.old/programs/setup/setup.in openswan.dev/programs/setup/setup
tmp=/var/run/pluto/ipsec_setup.st
outtmp=/var/run/pluto/ipsec_setup.out
(
-diff -urN openswan.old/programs/showhostkey/showhostkey.in openswan.dev/programs/showhostkey/showhostkey.in
---- openswan.old/programs/showhostkey/showhostkey.in 2006-10-08 20:43:21.000000000 +0200
-+++ openswan.dev/programs/showhostkey/showhostkey.in 2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/showhostkey/showhostkey.in
+===================================================================
+--- openswan-2.4.8.orig/programs/showhostkey/showhostkey.in 2007-06-04 13:22:49.908268072 +0200
++++ openswan-2.4.8/programs/showhostkey/showhostkey.in 2007-06-04 13:22:50.214221560 +0200
@@ -63,7 +63,7 @@
exit 1
fi
@@ -129,9 +136,10 @@ diff -urN openswan.old/programs/showhostkey/showhostkey.in openswan.dev/programs
if (id == "") {
pat = "^" suffix
printid = "default"
-diff -urN openswan.old/programs/starter/klips.c openswan.dev/programs/starter/klips.c
---- openswan.old/programs/starter/klips.c 2006-10-08 20:43:21.000000000 +0200
-+++ openswan.dev/programs/starter/klips.c 2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/starter/klips.c
+===================================================================
+--- openswan-2.4.8.orig/programs/starter/klips.c 2007-06-04 13:22:49.914267160 +0200
++++ openswan-2.4.8/programs/starter/klips.c 2007-06-04 13:22:50.214221560 +0200
@@ -83,7 +83,7 @@
if (stat(PROC_MODULES,&stb)==0) {
unsetenv("MODPATH");
@@ -141,9 +149,10 @@ diff -urN openswan.old/programs/starter/klips.c openswan.dev/programs/starter/kl
}
if (stat(PROC_IPSECVERSION,&stb)==0) {
_klips_module_loaded = 1;
-diff -urN openswan.old/programs/starter/netkey.c openswan.dev/programs/starter/netkey.c
---- openswan.old/programs/starter/netkey.c 2006-10-08 20:43:21.000000000 +0200
-+++ openswan.dev/programs/starter/netkey.c 2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/starter/netkey.c
+===================================================================
+--- openswan-2.4.8.orig/programs/starter/netkey.c 2007-06-04 13:22:49.920266248 +0200
++++ openswan-2.4.8/programs/starter/netkey.c 2007-06-04 13:22:50.214221560 +0200
@@ -75,7 +75,7 @@
if (stat(PROC_MODULES,&stb)==0) {
unsetenv("MODPATH");
@@ -153,10 +162,11 @@ diff -urN openswan.old/programs/starter/netkey.c openswan.dev/programs/starter/n
}
if (stat(PROC_NETKEY,&stb)==0) {
_netkey_module_loaded = 1;
-diff -ruN openswan-2.4.7-old/programs/_startklips/_startklips.in openswan-2.4.7-new/programs/_startklips/_startklips.in
---- openswan-2.4.7-old/programs/_startklips/_startklips.in 2006-12-15 16:29:48.000000000 +0100
-+++ openswan-2.4.7-new/programs/_startklips/_startklips.in 2006-12-15 17:18:52.000000000 +0100
-@@ -269,16 +269,16 @@
+Index: openswan-2.4.8/programs/_startklips/_startklips.in
+===================================================================
+--- openswan-2.4.8.orig/programs/_startklips/_startklips.in 2007-06-04 13:22:49.928265032 +0200
++++ openswan-2.4.8/programs/_startklips/_startklips.in 2007-06-04 13:22:50.215221408 +0200
+@@ -272,16 +272,16 @@
echo "FATAL ERROR: Both KLIPS and NETKEY IPsec code is present in kernel"
exit
fi
@@ -177,7 +187,7 @@ diff -ruN openswan-2.4.7-old/programs/_startklips/_startklips.in openswan-2.4.7-
fi
if test ! -f $ipsecversion && test ! -f $netkey
then
-@@ -291,27 +291,27 @@
+@@ -294,27 +294,27 @@
# modules shared between klips and netkey
if test -f $modules
then
@@ -218,7 +228,7 @@ diff -ruN openswan-2.4.7-old/programs/_startklips/_startklips.in openswan-2.4.7-
fi
if test ! -f $ipsecversion && $klips
-@@ -324,7 +324,7 @@
+@@ -327,7 +327,7 @@
fi
unset MODPATH MODULECONF # no user overrides!
depmod -a >/dev/null 2>&1
@@ -227,4 +237,3 @@ diff -ruN openswan-2.4.7-old/programs/_startklips/_startklips.in openswan-2.4.7-
if test ! -f $ipsecversion
then
echo "kernel appears to lack IPsec support (neither CONFIG_KLIPS or CONFIG_NET_KEY are set)"
-
diff --git a/package/openswan/patches/120-use_dev_urandom.patch b/package/openswan/patches/120-use_dev_urandom.patch
index 1a198845841fbb5a14817464587a55d9207409fe..6bbcbf16479a6f6e58a4443379bdd09141c5d646 100644
--- a/package/openswan/patches/120-use_dev_urandom.patch
+++ b/package/openswan/patches/120-use_dev_urandom.patch
@@ -1,6 +1,7 @@
-diff -urN openswan-2.3.1dr6.old/programs/ranbits/ranbits.c openswan-2.3.1dr6.dev/programs/ranbits/ranbits.c
---- openswan-2.3.1dr6.old/programs/ranbits/ranbits.c 2004-04-04 03:50:56.000000000 +0200
-+++ openswan-2.3.1dr6.dev/programs/ranbits/ranbits.c 2005-04-05 17:37:16.000000000 +0200
+Index: openswan-2.4.8/programs/ranbits/ranbits.c
+===================================================================
+--- openswan-2.4.8.orig/programs/ranbits/ranbits.c 2007-06-04 13:22:49.835279168 +0200
++++ openswan-2.4.8/programs/ranbits/ranbits.c 2007-06-04 13:22:51.648003592 +0200
@@ -29,7 +29,7 @@
#include <openswan.h>
@@ -10,9 +11,10 @@ diff -urN openswan-2.3.1dr6.old/programs/ranbits/ranbits.c openswan-2.3.1dr6.dev
#endif
#ifndef QDEVICE
#define QDEVICE "/dev/urandom"
-diff -urN openswan-2.3.1dr6.old/programs/rsasigkey/rsasigkey.c openswan-2.3.1dr6.dev/programs/rsasigkey/rsasigkey.c
---- openswan-2.3.1dr6.old/programs/rsasigkey/rsasigkey.c 2004-05-23 23:32:03.000000000 +0200
-+++ openswan-2.3.1dr6.dev/programs/rsasigkey/rsasigkey.c 2005-04-05 17:38:00.000000000 +0200
+Index: openswan-2.4.8/programs/rsasigkey/rsasigkey.c
+===================================================================
+--- openswan-2.4.8.orig/programs/rsasigkey/rsasigkey.c 2007-06-04 13:22:49.842278104 +0200
++++ openswan-2.4.8/programs/rsasigkey/rsasigkey.c 2007-06-04 13:22:51.649003440 +0200
@@ -31,7 +31,7 @@
#include <gmp.h>
@@ -22,9 +24,10 @@ diff -urN openswan-2.3.1dr6.old/programs/rsasigkey/rsasigkey.c openswan-2.3.1dr6
#endif
#ifndef MAXBITS
#define MAXBITS 20000
-diff -urN openswan-2.3.1dr6.old/programs/starter/files.h openswan-2.3.1dr6.dev/programs/starter/files.h
---- openswan-2.3.1dr6.old/programs/starter/files.h 2005-01-11 18:52:51.000000000 +0100
-+++ openswan-2.3.1dr6.dev/programs/starter/files.h 2005-04-05 17:38:16.000000000 +0200
+Index: openswan-2.4.8/programs/starter/files.h
+===================================================================
+--- openswan-2.4.8.orig/programs/starter/files.h 2007-06-04 13:22:49.850276888 +0200
++++ openswan-2.4.8/programs/starter/files.h 2007-06-04 13:22:51.649003440 +0200
@@ -36,7 +36,7 @@
#define MY_PID_FILE "/var/run/pluto/ipsec-starter.pid"
diff --git a/package/openswan/patches/130-sysctl_api_change.patch b/package/openswan/patches/130-sysctl_api_change.patch
index e01b94ed82e1098dcb18d8f65c15ddd74311fbd3..894d273f5b680d21ba91c5946647aab4266d58a5 100644
--- a/package/openswan/patches/130-sysctl_api_change.patch
+++ b/package/openswan/patches/130-sysctl_api_change.patch
@@ -1,6 +1,7 @@
-diff -ur openswan.old/linux/net/ipsec/sysctl_net_ipsec.c openswan.dev/linux/net/ipsec/sysctl_net_ipsec.c
---- openswan.old/linux/net/ipsec/sysctl_net_ipsec.c 2004-07-10 21:11:18.000000000 +0200
-+++ openswan.dev/linux/net/ipsec/sysctl_net_ipsec.c 2007-05-28 22:40:57.001031592 +0200
+Index: openswan-2.4.8/linux/net/ipsec/sysctl_net_ipsec.c
+===================================================================
+--- openswan-2.4.8.orig/linux/net/ipsec/sysctl_net_ipsec.c 2007-06-04 13:22:49.815282208 +0200
++++ openswan-2.4.8/linux/net/ipsec/sysctl_net_ipsec.c 2007-06-04 13:22:51.852972432 +0200
@@ -130,7 +130,11 @@
int ipsec_sysctl_register(void)
diff --git a/package/pcmcia-cs/patches/001-config-novatel_merlin_u630.patch b/package/pcmcia-cs/patches/001-config-novatel_merlin_u630.patch
index 071a69729834d5ad06bdf1e8c275379f2a798250..c9dca5b72ce10190531d43a71a385e99f668e6c7 100644
--- a/package/pcmcia-cs/patches/001-config-novatel_merlin_u630.patch
+++ b/package/pcmcia-cs/patches/001-config-novatel_merlin_u630.patch
@@ -1,6 +1,7 @@
-diff -ruN pcmcia-cs-3.2.8-old/etc/config pcmcia-cs-3.2.8-new/etc/config
---- pcmcia-cs-3.2.8-old/etc/config 2004-07-16 18:38:25.000000000 +0200
-+++ pcmcia-cs-3.2.8-new/etc/config 2005-11-21 08:52:54.000000000 +0100
+Index: pcmcia-cs-3.2.8/etc/config
+===================================================================
+--- pcmcia-cs-3.2.8.orig/etc/config 2007-06-04 13:23:59.533683400 +0200
++++ pcmcia-cs-3.2.8/etc/config 2007-06-04 13:23:59.600673216 +0200
@@ -2413,6 +2413,10 @@
pci 0x115d, 0x0101
bind "serial_cb"
diff --git a/package/pcmcia-cs/patches/002-serial-cardctl_path.patch b/package/pcmcia-cs/patches/002-serial-cardctl_path.patch
index a66069bcd2f98bcc8cb4ef4d6f1736cfc5a775a6..8eaf02a609a4f02cd9488685c207beca990179f0 100644
--- a/package/pcmcia-cs/patches/002-serial-cardctl_path.patch
+++ b/package/pcmcia-cs/patches/002-serial-cardctl_path.patch
@@ -1,6 +1,7 @@
-diff -urN pcmcia-cs-3.2.8-old/etc/shared pcmcia-cs-3.2.8-new/etc/shared
---- pcmcia-cs-3.2.8-old/etc/shared 2004-02-28 17:49:45.000000000 +0100
-+++ pcmcia-cs-3.2.8-new/etc/shared 2006-03-29 18:49:07.000000000 +0200
+Index: pcmcia-cs-3.2.8/etc/shared
+===================================================================
+--- pcmcia-cs-3.2.8.orig/etc/shared 2007-06-04 13:23:59.512686592 +0200
++++ pcmcia-cs-3.2.8/etc/shared 2007-06-04 13:24:00.335561496 +0200
@@ -167,7 +167,7 @@
STAB=/var/run/stab
fi
diff --git a/package/pcmcia-cs/patches/003-cardmgr_c.patch b/package/pcmcia-cs/patches/003-cardmgr_c.patch
index 7078db7f78bce7276ebf314507bd1c98609cb51e..c5c100c628d1a610e85edd4a634524e4d7cbd220 100644
--- a/package/pcmcia-cs/patches/003-cardmgr_c.patch
+++ b/package/pcmcia-cs/patches/003-cardmgr_c.patch
@@ -1,6 +1,7 @@
-diff -urN pcmcia-cs-3.2.8-old/cardmgr/cardmgr.c pcmcia-cs-3.2.8-new/cardmgr/cardmgr.c
---- pcmcia-cs-3.2.8-old/cardmgr/cardmgr.c 2004-05-21 08:39:36.000000000 +0200
-+++ pcmcia-cs-3.2.8-new/cardmgr/cardmgr.c 2006-03-29 20:27:03.000000000 +0200
+Index: pcmcia-cs-3.2.8/cardmgr/cardmgr.c
+===================================================================
+--- pcmcia-cs-3.2.8.orig/cardmgr/cardmgr.c 2007-06-04 13:23:59.491689784 +0200
++++ pcmcia-cs-3.2.8/cardmgr/cardmgr.c 2007-06-04 13:24:00.561527144 +0200
@@ -739,10 +739,7 @@
int ret;
diff --git a/package/pcmcia-cs/patches/004-pcmcia_resources.patch b/package/pcmcia-cs/patches/004-pcmcia_resources.patch
index 3be664b875d6b94f9c1c18cf61998e568c5d83c9..ce8653746f030ef48791203c79fb48a29b7b9fb0 100644
--- a/package/pcmcia-cs/patches/004-pcmcia_resources.patch
+++ b/package/pcmcia-cs/patches/004-pcmcia_resources.patch
@@ -1,6 +1,7 @@
-diff -ur pcmcia.old/etc/config.opts pcmcia.dev/etc/config.opts
---- pcmcia.old/etc/config.opts 2003-12-06 07:09:24.000000000 +0100
-+++ pcmcia.dev/etc/config.opts 2006-12-01 01:01:36.000000000 +0100
+Index: pcmcia-cs-3.2.8/etc/config.opts
+===================================================================
+--- pcmcia-cs-3.2.8.orig/etc/config.opts 2007-06-04 13:23:59.471692824 +0200
++++ pcmcia-cs-3.2.8/etc/config.opts 2007-06-04 13:24:00.759497048 +0200
@@ -17,14 +17,13 @@
#
diff --git a/package/ppp/patches/010-use_target_for_configure.patch b/package/ppp/patches/010-use_target_for_configure.patch
index 56439a6122ca753e677171ca166d2a5159e0236a..dc4419696f5e106cfde62b5f6e14ec98ce508837 100644
--- a/package/ppp/patches/010-use_target_for_configure.patch
+++ b/package/ppp/patches/010-use_target_for_configure.patch
@@ -2,9 +2,11 @@
Use values exported from $(TOPDIR)/rules.mk for determining
the target system instead of the host configuration
---- ppp-2.4.3/configure.orig Sat Nov 6 11:36:32 2004
-+++ ppp-2.4.3/configure Sun Jun 18 23:40:46 2006
-@@ -8,9 +8,9 @@ SYSCONF=/etc
+Index: ppp-2.4.3/configure
+===================================================================
+--- ppp-2.4.3.orig/configure 2007-06-04 13:22:08.549555552 +0200
++++ ppp-2.4.3/configure 2007-06-04 13:22:08.618545064 +0200
+@@ -8,9 +8,9 @@
# if [ -d /NextApps ]; then
# system="NeXTStep"
# else
@@ -17,4 +19,3 @@
# fi
state="unknown"
-
diff --git a/package/ppp/patches/100-debian_close_dev_ppp.patch b/package/ppp/patches/100-debian_close_dev_ppp.patch
index 4e50118e87e3758841add4f977302b4a97f280dd..4091c60b37b1a2c96dd172d75d2b62ce0fa291bf 100644
--- a/package/ppp/patches/100-debian_close_dev_ppp.patch
+++ b/package/ppp/patches/100-debian_close_dev_ppp.patch
@@ -15,10 +15,11 @@ The problem also occurs with the upstream version, but does not occur
when a pty/tty device is used for the ppp connection.
-diff -u -r ppp-2.4.3/pppd/sys-linux.c ppp-2.4.3/pppd/sys-linux.c
---- ppp-2.4.3/pppd/sys-linux.c 2005-04-29 20:08:37.000000000 +0200
-+++ ppp-2.4.3/pppd/sys-linux.c 2005-04-29 20:07:03.000000000 +0200
-@@ -455,6 +455,13 @@
+Index: ppp-2.4.3/pppd/sys-linux.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/sys-linux.c 2007-06-04 13:22:08.527558896 +0200
++++ ppp-2.4.3/pppd/sys-linux.c 2007-06-04 13:22:08.807516336 +0200
+@@ -453,6 +453,13 @@
if (new_style_driver) {
int flags;
diff --git a/package/ppp/patches/101-debian_ip-up_option.patch b/package/ppp/patches/101-debian_ip-up_option.patch
index 6033fda247721021a7027bdbee8df581aab64415..2461f123f7ab1a88ec41b0e7a0975aa26551ddcc 100644
--- a/package/ppp/patches/101-debian_ip-up_option.patch
+++ b/package/ppp/patches/101-debian_ip-up_option.patch
@@ -1,7 +1,8 @@
-diff -ruNp ppp-2.4.3.orig/pppd/ipcp.c ppp-2.4.3/pppd/ipcp.c
---- ppp-2.4.3.orig/pppd/ipcp.c 2004-11-13 13:03:26.000000000 +0100
-+++ ppp-2.4.3/pppd/ipcp.c 2005-02-20 18:45:22.241810136 +0100
-@@ -1846,7 +1846,7 @@ ipcp_up(f)
+Index: ppp-2.4.3/pppd/ipcp.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/ipcp.c 2007-06-04 13:22:08.478566344 +0200
++++ ppp-2.4.3/pppd/ipcp.c 2007-06-04 13:22:09.003486544 +0200
+@@ -1846,7 +1846,7 @@
*/
if (ipcp_script_state == s_down && ipcp_script_pid == 0) {
ipcp_script_state = s_up;
@@ -10,7 +11,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/ipcp.c ppp-2.4.3/pppd/ipcp.c
}
}
-@@ -1896,7 +1896,7 @@ ipcp_down(f)
+@@ -1896,7 +1896,7 @@
/* Execute the ip-down script */
if (ipcp_script_state == s_up && ipcp_script_pid == 0) {
ipcp_script_state = s_down;
@@ -19,7 +20,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/ipcp.c ppp-2.4.3/pppd/ipcp.c
}
}
-@@ -1950,13 +1950,13 @@ ipcp_script_done(arg)
+@@ -1950,13 +1950,13 @@
case s_up:
if (ipcp_fsm[0].state != OPENED) {
ipcp_script_state = s_down;
@@ -35,10 +36,11 @@ diff -ruNp ppp-2.4.3.orig/pppd/ipcp.c ppp-2.4.3/pppd/ipcp.c
}
break;
}
-diff -ruNp ppp-2.4.3.orig/pppd/main.c ppp-2.4.3/pppd/main.c
---- ppp-2.4.3.orig/pppd/main.c 2005-02-20 18:46:14.409879384 +0100
-+++ ppp-2.4.3/pppd/main.c 2005-02-20 18:45:22.243809832 +0100
-@@ -314,6 +314,9 @@ main(argc, argv)
+Index: ppp-2.4.3/pppd/main.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/main.c 2007-06-04 13:22:08.487564976 +0200
++++ ppp-2.4.3/pppd/main.c 2007-06-04 13:22:09.004486392 +0200
+@@ -314,6 +314,9 @@
struct protent *protp;
char numbuf[16];
@@ -48,10 +50,11 @@ diff -ruNp ppp-2.4.3.orig/pppd/main.c ppp-2.4.3/pppd/main.c
link_stats_valid = 0;
new_phase(PHASE_INITIALIZE);
-diff -ruNp ppp-2.4.3.orig/pppd/options.c ppp-2.4.3/pppd/options.c
---- ppp-2.4.3.orig/pppd/options.c 2005-02-20 18:46:14.410879232 +0100
-+++ ppp-2.4.3/pppd/options.c 2005-02-20 18:46:02.154742448 +0100
-@@ -108,6 +108,8 @@ char linkname[MAXPATHLEN]; /* logical na
+Index: ppp-2.4.3/pppd/options.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/options.c 2007-06-04 13:22:08.495563760 +0200
++++ ppp-2.4.3/pppd/options.c 2007-06-04 13:22:09.005486240 +0200
+@@ -108,6 +108,8 @@
bool tune_kernel; /* may alter kernel settings */
int connect_delay = 1000; /* wait this many ms after connect script */
int req_unit = -1; /* requested interface unit */
@@ -60,7 +63,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/options.c ppp-2.4.3/pppd/options.c
bool multilink = 0; /* Enable multilink operation */
char *bundle_name = NULL; /* bundle name for multilink */
bool dump_options; /* print out option values */
-@@ -276,6 +278,13 @@ option_t general_options[] = {
+@@ -276,6 +278,13 @@
"Number of seconds to wait for child processes at exit",
OPT_PRIO },
@@ -74,10 +77,11 @@ diff -ruNp ppp-2.4.3.orig/pppd/options.c ppp-2.4.3/pppd/options.c
#ifdef HAVE_MULTILINK
{ "multilink", o_bool, &multilink,
"Enable multilink operation", OPT_PRIO | 1 },
-diff -ruNp ppp-2.4.3.orig/pppd/pppd.h ppp-2.4.3/pppd/pppd.h
---- ppp-2.4.3.orig/pppd/pppd.h 2005-02-20 18:46:14.414878624 +0100
-+++ ppp-2.4.3/pppd/pppd.h 2005-02-20 18:45:22.247809224 +0100
-@@ -312,6 +312,8 @@ extern bool tune_kernel; /* May alter ke
+Index: ppp-2.4.3/pppd/pppd.h
+===================================================================
+--- ppp-2.4.3.orig/pppd/pppd.h 2007-06-04 13:22:08.505562240 +0200
++++ ppp-2.4.3/pppd/pppd.h 2007-06-04 13:22:09.005486240 +0200
+@@ -312,6 +312,8 @@
extern int connect_delay; /* Time to delay after connect script */
extern int max_data_rate; /* max bytes/sec through charshunt */
extern int req_unit; /* interface unit number to use */
diff --git a/package/ppp/patches/102-debian_pppoe_multicast_pado.patch b/package/ppp/patches/102-debian_pppoe_multicast_pado.patch
index ea5275c4612ce14aebd8b3f0a7dad5ff926279a4..3a92005903adb751606c2fb83ba591dfee31c04e 100644
--- a/package/ppp/patches/102-debian_pppoe_multicast_pado.patch
+++ b/package/ppp/patches/102-debian_pppoe_multicast_pado.patch
@@ -1,7 +1,8 @@
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c 2004-11-04 11:07:37.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c 2005-02-24 21:00:11.586697752 +0100
-@@ -365,8 +365,8 @@ waitForPADO(PPPoEConnection *conn, int t
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c 2007-06-04 13:22:08.458569384 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c 2007-06-04 13:22:09.225452800 +0200
+@@ -365,8 +365,8 @@
if (!packetIsForMe(conn, &packet)) continue;
if (packet.code == CODE_PADO) {
diff --git a/package/ppp/patches/103-debian_pppoe_cleanup.patch b/package/ppp/patches/103-debian_pppoe_cleanup.patch
index 8a97a0b2e5bbc15b3bb44ab863395a7c805ca75c..81fa7e9513554f5dd7fe12c8831b732ccdf1cbad 100644
--- a/package/ppp/patches/103-debian_pppoe_cleanup.patch
+++ b/package/ppp/patches/103-debian_pppoe_cleanup.patch
@@ -1,7 +1,8 @@
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/rp-pppoe/common.c
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c 2004-02-02 04:36:46.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/common.c 2005-03-11 02:09:19.000000000 +0100
-@@ -18,10 +18,6 @@ static char const RCSID[] =
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/common.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c 2007-06-04 13:22:08.391579568 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/common.c 2007-06-04 13:22:09.414424072 +0200
+@@ -18,10 +18,6 @@
#include "pppoe.h"
@@ -12,7 +13,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
#include <string.h>
#include <errno.h>
#include <stdlib.h>
-@@ -50,17 +46,17 @@ parsePacket(PPPoEPacket *packet, ParseFu
+@@ -50,17 +46,17 @@
UINT16_t tagType, tagLen;
if (packet->ver != 1) {
@@ -33,7 +34,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
return -1;
}
-@@ -76,7 +72,7 @@ parsePacket(PPPoEPacket *packet, ParseFu
+@@ -76,7 +72,7 @@
return 0;
}
if ((curTag - packet->payload) + tagLen + TAG_HDR_SIZE > len) {
@@ -42,7 +43,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
return -1;
}
func(tagType, tagLen, curTag+TAG_HDR_SIZE, extra);
-@@ -105,17 +101,17 @@ findTag(PPPoEPacket *packet, UINT16_t ty
+@@ -105,17 +101,17 @@
UINT16_t tagType, tagLen;
if (packet->ver != 1) {
@@ -63,7 +64,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
return NULL;
}
-@@ -131,7 +127,7 @@ findTag(PPPoEPacket *packet, UINT16_t ty
+@@ -131,7 +127,7 @@
return NULL;
}
if ((curTag - packet->payload) + tagLen + TAG_HDR_SIZE > len) {
@@ -72,7 +73,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
return NULL;
}
if (tagType == type) {
-@@ -143,6 +139,7 @@ findTag(PPPoEPacket *packet, UINT16_t ty
+@@ -143,6 +139,7 @@
return NULL;
}
@@ -80,7 +81,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
/**********************************************************************
*%FUNCTION: printErr
*%ARGUMENTS:
-@@ -158,6 +155,7 @@ printErr(char const *str)
+@@ -158,6 +155,7 @@
fprintf(stderr, "pppoe: %s\n", str);
syslog(LOG_ERR, "%s", str);
}
@@ -88,7 +89,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
/**********************************************************************
-@@ -172,7 +170,7 @@ strDup(char const *str)
+@@ -172,7 +170,7 @@
{
char *copy = malloc(strlen(str)+1);
if (!copy) {
@@ -97,7 +98,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
}
strcpy(copy, str);
return copy;
-@@ -467,9 +465,10 @@ sendPADT(PPPoEConnection *conn, char con
+@@ -467,9 +465,10 @@
fprintf(conn->debugFile, "\n");
fflush(conn->debugFile);
}
@@ -109,16 +110,17 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
/**********************************************************************
*%FUNCTION: parseLogErrs
*%ARGUMENTS:
-@@ -501,4 +500,5 @@ parseLogErrs(UINT16_t type, UINT16_t len
+@@ -501,4 +500,5 @@
break;
}
}
+#endif
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c 2005-03-11 02:12:52.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c 2005-03-10 12:24:19.000000000 +0100
-@@ -13,10 +13,6 @@ static char const RCSID[] =
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c 2007-06-04 13:22:09.225452800 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c 2007-06-04 13:22:09.414424072 +0200
+@@ -13,10 +13,6 @@
#include "pppoe.h"
@@ -129,7 +131,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
#include <string.h>
#include <stdlib.h>
#include <errno.h>
-@@ -167,24 +163,21 @@ parsePADOTags(UINT16_t type, UINT16_t le
+@@ -167,24 +163,21 @@
if (conn->printACNames) {
printf("Got a Service-Name-Error tag: %.*s\n", (int) len, data);
} else {
@@ -157,7 +159,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
}
break;
}
-@@ -209,20 +202,14 @@ parsePADSTags(UINT16_t type, UINT16_t le
+@@ -209,20 +202,14 @@
PPPoEConnection *conn = (PPPoEConnection *) extra;
switch(type) {
case TAG_SERVICE_NAME:
@@ -182,7 +184,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
case TAG_RELAY_SESSION_ID:
conn->relayId.type = htons(type);
conn->relayId.length = htons(len);
-@@ -336,7 +323,7 @@ waitForPADO(PPPoEConnection *conn, int t
+@@ -336,7 +323,7 @@
if (r >= 0 || errno != EINTR) break;
}
if (r < 0) {
@@ -191,7 +193,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
}
if (r == 0) return; /* Timed out */
}
-@@ -346,8 +333,7 @@ waitForPADO(PPPoEConnection *conn, int t
+@@ -346,8 +333,7 @@
/* Check length */
if (ntohs(packet.length) + HDR_SIZE > len) {
@@ -201,7 +203,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
continue;
}
-@@ -366,16 +352,16 @@ waitForPADO(PPPoEConnection *conn, int t
+@@ -366,16 +352,16 @@
if (packet.code == CODE_PADO) {
if (BROADCAST(packet.ethHdr.h_source)) {
@@ -221,7 +223,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
continue;
}
conn->numPADOs++;
-@@ -513,7 +499,7 @@ waitForPADS(PPPoEConnection *conn, int t
+@@ -513,7 +499,7 @@
if (r >= 0 || errno != EINTR) break;
}
if (r < 0) {
@@ -230,7 +232,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
}
if (r == 0) return;
}
-@@ -523,8 +509,7 @@ waitForPADS(PPPoEConnection *conn, int t
+@@ -523,8 +509,7 @@
/* Check length */
if (ntohs(packet.length) + HDR_SIZE > len) {
@@ -240,7 +242,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
continue;
}
-@@ -556,11 +541,12 @@ waitForPADS(PPPoEConnection *conn, int t
+@@ -556,11 +541,12 @@
/* Don't bother with ntohs; we'll just end up converting it back... */
conn->session = packet.session;
@@ -255,7 +257,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
}
}
-@@ -620,7 +606,7 @@ discovery(PPPoEConnection *conn)
+@@ -620,7 +606,7 @@
/* If we're only printing access concentrator names, we're done */
if (conn->printACNames) {
@@ -264,10 +266,11 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
}
timeout = PADI_TIMEOUT;
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-pppoe/if.c
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c 2001-12-14 03:55:20.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/if.c 2005-03-10 13:32:43.000000000 +0100
-@@ -40,10 +40,6 @@ static char const RCSID[] =
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/if.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c 2007-06-04 13:22:08.402577896 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/if.c 2007-06-04 13:22:09.416423768 +0200
+@@ -40,10 +40,6 @@
#include <sys/ioctl.h>
#endif
@@ -278,7 +281,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
#include <errno.h>
#include <stdlib.h>
#include <string.h>
-@@ -127,7 +123,7 @@ etherType(PPPoEPacket *packet)
+@@ -127,7 +123,7 @@
{
UINT16_t type = (UINT16_t) ntohs(packet->ethHdr.h_proto);
if (type != Eth_PPPOE_Discovery && type != Eth_PPPOE_Session) {
@@ -287,7 +290,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
return type;
}
-@@ -156,7 +152,7 @@ getHWaddr(int sock, char const *ifname,
+@@ -156,7 +152,7 @@
ifc.ifc_len = sizeof(inbuf);
ifc.ifc_buf = inbuf;
if (ioctl(sock, SIOCGIFCONF, &ifc) < 0) {
@@ -296,7 +299,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
ifr = ifc.ifc_req;
ifreq.ifr_name[0] = '\0';
-@@ -172,9 +168,7 @@ getHWaddr(int sock, char const *ifname,
+@@ -172,9 +168,7 @@
(sdl->sdl_alen == ETH_ALEN) &&
!strncmp(ifname, ifr->ifr_name, sizeof(ifr->ifr_name))) {
if (found) {
@@ -307,7 +310,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
} else {
found = 1;
memcpy(hwaddr, LLADDR(sdl), ETH_ALEN);
-@@ -183,9 +177,7 @@ getHWaddr(int sock, char const *ifname,
+@@ -183,9 +177,7 @@
}
}
if (!found) {
@@ -318,7 +321,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
}
-@@ -252,7 +244,7 @@ initFilter(int fd, UINT16_t type, unsign
+@@ -252,7 +244,7 @@
/* Apply the filter */
if (ioctl(fd, BIOCSETF, &bpfProgram) < 0) {
@@ -327,7 +330,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
}
}
-@@ -298,42 +290,36 @@ openInterface(char const *ifname, UINT16
+@@ -298,42 +290,36 @@
if (fd < 0) {
switch (errno) {
case EACCES: /* permission denied */
@@ -378,7 +381,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
getHWaddr(sock, ifname, hwaddr);
initFilter(fd, type, hwaddr);
-@@ -342,58 +328,52 @@ openInterface(char const *ifname, UINT16
+@@ -342,58 +328,52 @@
#if !defined(__OpenBSD__)
strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
if (ioctl(sock, SIOCGIFMTU, &ifr) < 0) {
@@ -448,7 +451,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
ifname,
hwaddr[0], hwaddr[1], hwaddr[2],
hwaddr[3], hwaddr[4], hwaddr[5],
-@@ -442,48 +422,41 @@ openInterface(char const *ifname, UINT16
+@@ -442,48 +422,41 @@
if ((fd = socket(domain, stype, htons(type))) < 0) {
/* Give a more helpful message for the common error case */
if (errno == EPERM) {
@@ -507,7 +510,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
#ifdef HAVE_STRUCT_SOCKADDR_LL
-@@ -493,7 +466,7 @@ openInterface(char const *ifname, UINT16
+@@ -493,7 +466,7 @@
strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
if (ioctl(fd, SIOCGIFINDEX, &ifr) < 0) {
@@ -516,7 +519,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
sa.sll_ifindex = ifr.ifr_ifindex;
-@@ -503,7 +476,7 @@ openInterface(char const *ifname, UINT16
+@@ -503,7 +476,7 @@
/* We're only interested in packets on specified interface */
if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
@@ -525,7 +528,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
return fd;
-@@ -527,13 +500,11 @@ sendPacket(PPPoEConnection *conn, int so
+@@ -527,13 +500,11 @@
{
#if defined(USE_BPF)
if (write(sock, pkt, size) < 0) {
@@ -541,7 +544,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
#else
#ifdef USE_DLPI
-@@ -577,12 +548,11 @@ sendPacket(PPPoEConnection *conn, int so
+@@ -577,12 +548,11 @@
struct sockaddr sa;
if (!conn) {
@@ -556,7 +559,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
#endif
#endif
-@@ -632,26 +602,24 @@ receivePacket(int sock, PPPoEPacket *pkt
+@@ -632,26 +602,24 @@
if (bpfSize <= 0) {
bpfOffset = 0;
if ((bpfSize = read(sock, bpfBuffer, bpfLength)) < 0) {
@@ -587,7 +590,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
clearPacketHeader(pkt); /* resets bpfSize and bpfOffset */
return 0;
}
-@@ -676,16 +644,14 @@ receivePacket(int sock, PPPoEPacket *pkt
+@@ -676,16 +644,14 @@
data.len = 0;
if ((retval = getmsg(sock, NULL, &data, &flags)) < 0) {
@@ -606,7 +609,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
#endif
#endif
-@@ -716,7 +682,7 @@ openInterface(char const *ifname, UINT16
+@@ -716,7 +682,7 @@
int ppa;
if(strlen(ifname) > PATH_MAX) {
@@ -615,7 +618,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
ppa = atoi(&ifname[strlen(ifname)-1]);
-@@ -729,9 +695,9 @@ openInterface(char const *ifname, UINT16
+@@ -729,9 +695,9 @@
if (( fd = open(base_dev, O_RDWR)) < 0) {
/* Give a more helpful message for the common error case */
if (errno == EPERM) {
@@ -627,7 +630,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
/* rearranged order of DLPI code - delphys 20010803 */
-@@ -747,17 +713,18 @@ openInterface(char const *ifname, UINT16
+@@ -747,17 +713,18 @@
dl_abssaplen = ABS(dlp->info_ack.dl_sap_length);
dl_saplen = dlp->info_ack.dl_sap_length;
if (ETHERADDRL != (dlp->info_ack.dl_addr_length - dl_abssaplen))
@@ -649,7 +652,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
return fd;
}
-@@ -780,7 +747,7 @@ void dlpromisconreq(int fd, u_long level
+@@ -780,7 +747,7 @@
flags = 0;
if (putmsg(fd, &ctl, (struct strbuf*) NULL, flags) < 0)
@@ -658,7 +661,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
-@@ -799,7 +766,7 @@ void dlinforeq(int fd)
+@@ -799,7 +766,7 @@
flags = RS_HIPRI;
if (putmsg(fd, &ctl, (struct strbuf*) NULL, flags) < 0)
@@ -667,7 +670,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
void dlunitdatareq(int fd, u_char *addrp, int addrlen, u_long minpri, u_long maxpri, u_char *datap, int datalen)
-@@ -827,7 +794,7 @@ void dlunitdatareq(int fd, u_char *addrp
+@@ -827,7 +794,7 @@
data.buf = (char *) datap;
if (putmsg(fd, &ctl, &data, 0) < 0)
@@ -676,7 +679,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
void dlinfoack(int fd, char *bufp)
-@@ -847,18 +814,14 @@ void dlinfoack(int fd, char *bufp)
+@@ -847,18 +814,14 @@
expecting(DL_INFO_ACK, dlp);
if (ctl.len < sizeof (dl_info_ack_t)) {
@@ -698,7 +701,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
}
-@@ -882,7 +845,7 @@ void dlbindreq(int fd, u_long sap, u_lon
+@@ -882,7 +845,7 @@
flags = 0;
if (putmsg(fd, &ctl, (struct strbuf*) NULL, flags) < 0)
@@ -707,7 +710,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
void dlattachreq(int fd, u_long ppa)
-@@ -901,7 +864,7 @@ void dlattachreq(int fd, u_long ppa)
+@@ -901,7 +864,7 @@
flags = 0;
if (putmsg(fd, &ctl, (struct strbuf*) NULL, flags) < 0)
@@ -716,7 +719,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
void dlokack(int fd, char *bufp)
-@@ -921,18 +884,14 @@ void dlokack(int fd, char *bufp)
+@@ -921,18 +884,14 @@
expecting(DL_OK_ACK, dlp);
if (ctl.len < sizeof (dl_ok_ack_t)) {
@@ -738,7 +741,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
}
-@@ -953,12 +912,10 @@ void dlbindack(int fd, char *bufp)
+@@ -953,12 +912,10 @@
expecting(DL_BIND_ACK, dlp);
if (flags != RS_HIPRI)
@@ -753,7 +756,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
}
-@@ -989,8 +946,7 @@ void strgetmsg(int fd, struct strbuf *ct
+@@ -989,8 +946,7 @@
*/
(void) signal(SIGALRM, sigalrm);
if (alarm(MAXWAIT) < 0) {
@@ -763,7 +766,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
/*
-@@ -998,61 +954,48 @@ void strgetmsg(int fd, struct strbuf *ct
+@@ -998,61 +954,48 @@
*/
*flagsp = 0;
if ((rc = getmsg(fd, ctlp, datap, flagsp)) < 0) {
@@ -833,10 +836,11 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
}
}
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/Makefile.linux 2004-11-14 08:58:37.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux 2005-03-11 01:48:27.000000000 +0100
-@@ -28,8 +28,8 @@ COPTS=-O2 -g
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/Makefile.linux 2007-06-04 13:22:08.408576984 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux 2007-06-04 13:22:09.416423768 +0200
+@@ -28,8 +28,8 @@
CFLAGS=$(COPTS) -I../../../include/linux
all: rp-pppoe.so pppoe-discovery
@@ -847,10 +851,11 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3/pppd/pl
pppoe-discovery.o: pppoe-discovery.c
$(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe-discovery.o pppoe-discovery.c
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/plugin.c 2004-11-04 11:07:37.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c 2005-03-11 02:12:39.000000000 +0100
-@@ -35,7 +35,6 @@ static char const RCSID[] =
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/plugin.c 2007-06-04 13:22:08.414576072 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c 2007-06-04 13:22:09.417423616 +0200
+@@ -35,7 +35,6 @@
#include "pppd/pathnames.h"
#include <linux/types.h>
@@ -858,7 +863,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3/pppd/plugins/
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/socket.h>
-@@ -173,10 +172,8 @@ PPPOEConnectDevice(void)
+@@ -173,10 +172,8 @@
(unsigned) conn->peerEth[5]);
if (connect(conn->sessionSocket, (struct sockaddr *) &sp,
@@ -870,7 +875,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3/pppd/plugins/
return conn->sessionSocket;
}
-@@ -365,11 +362,9 @@ plugin_init(void)
+@@ -365,11 +362,9 @@
}
add_options(Options);
@@ -883,7 +888,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3/pppd/plugins/
/**********************************************************************
*%FUNCTION: fatalSys
*%ARGUMENTS:
-@@ -423,6 +418,7 @@ sysErr(char const *str)
+@@ -423,6 +418,7 @@
{
rp_fatal(str);
}
@@ -891,9 +896,10 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3/pppd/plugins/
struct channel pppoe_channel = {
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp-2.4.3/pppd/plugins/rp-pppoe/pppoe-discovery.c
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c 2004-11-13 13:12:05.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/pppoe-discovery.c 2005-03-11 02:06:13.000000000 +0100
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/pppoe-discovery.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c 2007-06-04 13:22:08.420575160 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/pppoe-discovery.c 2007-06-04 13:22:09.417423616 +0200
@@ -17,14 +17,8 @@
#include "pppoe.h"
@@ -909,7 +915,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp-2.4.3/pppd
int main(int argc, char *argv[])
{
int opt;
-@@ -32,17 +26,17 @@ int main(int argc, char *argv[])
+@@ -32,17 +26,17 @@
conn = malloc(sizeof(PPPoEConnection));
if (!conn)
@@ -930,7 +936,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp-2.4.3/pppd
break;
case 'U':
conn->useHostUniq = 1;
-@@ -57,7 +51,7 @@ int main(int argc, char *argv[])
+@@ -57,7 +51,7 @@
fprintf(conn->debugFile, "pppoe-discovery %s\n", VERSION);
break;
case 'I':
@@ -939,7 +945,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp-2.4.3/pppd
break;
case 'A':
/* this is the default */
-@@ -74,7 +68,7 @@ int main(int argc, char *argv[])
+@@ -74,7 +68,7 @@
/* default interface name */
if (!conn->ifName)
@@ -948,7 +954,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp-2.4.3/pppd
conn->discoverySocket = -1;
conn->sessionSocket = -1;
-@@ -84,39 +78,6 @@ int main(int argc, char *argv[])
+@@ -84,39 +78,6 @@
exit(0);
}
@@ -988,10 +994,11 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp-2.4.3/pppd
void usage(void)
{
fprintf(stderr, "Usage: pppoe-discovery [options]\n");
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe.h ppp-2.4.3/pppd/plugins/rp-pppoe/pppoe.h
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe.h 2004-11-04 11:07:37.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/pppoe.h 2005-03-11 02:08:00.000000000 +0100
-@@ -307,12 +307,18 @@ void discovery(PPPoEConnection *conn);
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/pppoe.h
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe.h 2007-06-04 13:22:08.426574248 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/pppoe.h 2007-06-04 13:22:09.418423464 +0200
+@@ -307,12 +307,18 @@
unsigned char *findTag(PPPoEPacket *packet, UINT16_t tagType,
PPPoETag *tag);
@@ -1011,9 +1018,10 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe.h ppp-2.4.3/pppd/plugins/r
return; \
} \
} while(0)
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/utils.c ppp-2.4.3/pppd/plugins/rp-pppoe/utils.c
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/utils.c 1970-01-01 01:00:00.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/utils.c 2005-03-11 02:07:57.000000000 +0100
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/utils.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/utils.c 2007-06-04 13:22:09.418423464 +0200
@@ -0,0 +1,62 @@
+#include <stdio.h>
+#include <stdlib.h>
diff --git a/package/ppp/patches/104-debian_fix_linkpidfile.patch b/package/ppp/patches/104-debian_fix_linkpidfile.patch
index 9e32adcae15c4afc89fd9db49ad57f78219ac0e3..431ce83cf9c41a09d6917df7d5cc1e9f50b08bde 100644
--- a/package/ppp/patches/104-debian_fix_linkpidfile.patch
+++ b/package/ppp/patches/104-debian_fix_linkpidfile.patch
@@ -23,14 +23,11 @@ call has now been removed which is why I'm seeing this problem.
[...]
--
-Index: pppd/main.c
+Index: ppp-2.4.3/pppd/main.c
===================================================================
-RCS file: /var/cvs/snwb/packages/ppp/pppd/main.c,v
-retrieving revision 1.11
-diff -u -r1.11 main.c
---- ppp/pppd/main.c 29 Nov 2004 22:49:23 -0000 1.11
-+++ ppp/pppd/main.c 5 Dec 2004 23:59:58 -0000
-@@ -819,8 +819,7 @@
+--- ppp-2.4.3.orig/pppd/main.c 2007-06-04 13:22:09.004486392 +0200
++++ ppp-2.4.3/pppd/main.c 2007-06-04 13:22:10.548251704 +0200
+@@ -768,8 +768,7 @@
/* update pid files if they have been written already */
if (pidfilename[0])
create_pidfile(pid);
@@ -40,4 +37,3 @@ diff -u -r1.11 main.c
exit(0); /* parent dies */
}
setsid();
-
diff --git a/package/ppp/patches/105-debian_pppoatm_cleanup.patch b/package/ppp/patches/105-debian_pppoatm_cleanup.patch
index 2437a12003ed1fd185f5c502303bcb2621e3294a..80f4445888f582f96e1ea0f6829e1498a57bd9da 100644
--- a/package/ppp/patches/105-debian_pppoatm_cleanup.patch
+++ b/package/ppp/patches/105-debian_pppoatm_cleanup.patch
@@ -1,7 +1,8 @@
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c
---- ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c 2005-03-22 14:44:18.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c 2005-03-22 14:44:02.000000000 +0100
-@@ -70,18 +70,20 @@ static int setdevname_pppoatm(const char
+Index: ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c 2007-06-04 13:22:08.348586104 +0200
++++ ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c 2007-06-04 13:22:10.825209600 +0200
+@@ -70,18 +70,20 @@
{
struct sockaddr_atmpvc addr;
extern struct stat devstat;
@@ -28,7 +29,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
memcpy(&pvcaddr, &addr, sizeof pvcaddr);
strlcpy(devnam, cp, sizeof devnam);
devstat.st_mode = S_IFSOCK;
-@@ -93,7 +95,6 @@ static int setdevname_pppoatm(const char
+@@ -93,7 +95,6 @@
lcp_allowoptions[0].neg_asyncmap = 0;
lcp_wantoptions[0].neg_pcompression = 0;
}
@@ -36,7 +37,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
device_got_set = 1;
return 1;
}
-@@ -108,6 +109,7 @@ static void no_device_given_pppoatm(void
+@@ -108,6 +109,7 @@
static void set_line_discipline_pppoatm(int fd)
{
struct atm_backend_ppp be;
@@ -44,7 +45,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
be.backend_num = ATM_BACKEND_PPP;
if (!llc_encaps)
be.encaps = PPPOATM_ENCAPS_VC;
-@@ -115,6 +117,7 @@ static void set_line_discipline_pppoatm(
+@@ -115,6 +117,7 @@
be.encaps = PPPOATM_ENCAPS_LLC;
else
be.encaps = PPPOATM_ENCAPS_AUTODETECT;
@@ -52,7 +53,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
if (ioctl(fd, ATM_SETBACKEND, &be) < 0)
fatal("ioctl(ATM_SETBACKEND): %m");
}
-@@ -179,16 +182,19 @@ static void send_config_pppoa(int mtu,
+@@ -175,16 +178,19 @@
{
int sock;
struct ifreq ifr;
@@ -73,7 +74,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
}
static void recv_config_pppoa(int mru,
-@@ -202,7 +208,7 @@ static void recv_config_pppoa(int mru,
+@@ -198,7 +204,7 @@
void plugin_init(void)
{
@@ -82,7 +83,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
extern int new_style_driver; /* From sys-linux.c */
if (!ppp_available() && !new_style_driver)
fatal("Kernel doesn't support ppp_generic - "
-@@ -210,9 +216,9 @@ void plugin_init(void)
+@@ -206,9 +212,9 @@
#else
fatal("No PPPoATM support on this OS");
#endif
diff --git a/package/ppp/patches/106-debian_pppoatm_fix_mtu.patch b/package/ppp/patches/106-debian_pppoatm_fix_mtu.patch
index ef28b5cf2b16b3fdf533594659440716769c30ed..367c84e56312636bdb8b243c32c81bec0db14c3f 100644
--- a/package/ppp/patches/106-debian_pppoatm_fix_mtu.patch
+++ b/package/ppp/patches/106-debian_pppoatm_fix_mtu.patch
@@ -1,7 +1,8 @@
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c
---- ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c 2005-05-04 02:00:28.000000000 +0200
-+++ ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c 2005-05-04 01:59:11.000000000 +0200
-@@ -183,8 +183,11 @@ static void send_config_pppoa(int mtu,
+Index: ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c 2007-06-04 13:22:10.825209600 +0200
++++ ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c 2007-06-04 13:22:11.014180872 +0200
+@@ -179,8 +179,11 @@
int sock;
struct ifreq ifr;
@@ -15,7 +16,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
sock = socket(AF_INET, SOCK_DGRAM, 0);
if (sock < 0)
-@@ -202,8 +205,11 @@ static void recv_config_pppoa(int mru,
+@@ -198,8 +201,11 @@
int pcomp,
int accomp)
{
diff --git a/package/ppp/patches/107-debian_stripMSdomain.patch b/package/ppp/patches/107-debian_stripMSdomain.patch
index d52e38645dcd2f58fdcf3aa5d895c2458865c1bf..de1d1e8d3cc702f1faa942f4d4931929b5f2e500 100644
--- a/package/ppp/patches/107-debian_stripMSdomain.patch
+++ b/package/ppp/patches/107-debian_stripMSdomain.patch
@@ -1,6 +1,7 @@
-diff -ruN ppp.orig/pppd/chap-new.c ppp/pppd/chap-new.c
---- ppp.orig/pppd/chap-new.c 2003-11-27 23:25:17.000000000 +0100
-+++ ppp/pppd/chap-new.c 2003-12-02 12:26:21.000000000 +0100
+Index: ppp-2.4.3/pppd/chap-new.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/chap-new.c 2007-06-04 13:22:08.298593704 +0200
++++ ppp-2.4.3/pppd/chap-new.c 2007-06-04 13:22:11.199152752 +0200
@@ -57,6 +57,7 @@
int chap_timeout_time = 3;
int chap_max_transmits = 10;
diff --git a/package/ppp/patches/108-debian_defaultroute.patch b/package/ppp/patches/108-debian_defaultroute.patch
index 76b444e4b24f5265eabfb77e1f0acfe6d0cc57f2..36130abb2a8efdaf817a4f0b95b7ab474643c428 100644
--- a/package/ppp/patches/108-debian_defaultroute.patch
+++ b/package/ppp/patches/108-debian_defaultroute.patch
@@ -1,10 +1,11 @@
---- ppp/pppd/ipcp.c Wed May 31 17:20:41 2000
-+++ ppp/pppd/ipcp.c Wed May 31 17:27:19 2000
-@@ -145,7 +145,17 @@
- { "-defaultroute", o_bool, &ipcp_allowoptions[0].default_route,
- "disable defaultroute option", OPT_A2COPY,
+Index: ppp-2.4.3/pppd/ipcp.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/ipcp.c 2007-06-04 13:22:09.003486544 +0200
++++ ppp-2.4.3/pppd/ipcp.c 2007-06-04 13:22:11.387124176 +0200
+@@ -197,6 +197,16 @@
+ "disable defaultroute option", OPT_ALIAS | OPT_A2CLR,
&ipcp_wantoptions[0].default_route },
-
+
+#ifdef __linux__
+ { "replacedefaultroute", o_bool,
+ &ipcp_wantoptions[0].replace_default_route,
@@ -18,7 +19,7 @@
{ "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp,
"Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp },
{ "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp,
-@@ -195,7 +205,7 @@
+@@ -263,7 +273,7 @@
ip_active_pkt
};
@@ -27,7 +28,7 @@
static void ipcp_script __P((char *)); /* Run an up/down script */
static void ipcp_script_done __P((void *));
-@@ -1344,7 +1354,12 @@
+@@ -1659,7 +1669,12 @@
if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE))
return 0;
if (wo->default_route)
@@ -40,7 +41,7 @@
default_route_set[u] = 1;
if (wo->proxy_arp)
if (sifproxyarp(u, wo->hisaddr))
-@@ -1420,7 +1435,8 @@
+@@ -1741,7 +1756,8 @@
*/
if (demand) {
if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) {
@@ -49,8 +50,8 @@
+ wo->replace_default_route);
if (go->ouraddr != wo->ouraddr) {
warn("Local IP address changed to %I", go->ouraddr);
- script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr));
-@@ -1445,7 +1461,12 @@
+ script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr), 0);
+@@ -1766,7 +1782,12 @@
/* assign a default route through the interface if required */
if (ipcp_wantoptions[f->unit].default_route)
@@ -63,7 +64,7 @@
default_route_set[f->unit] = 1;
/* Make a proxy ARP entry if requested. */
-@@ -1492,7 +1513,12 @@
+@@ -1813,7 +1834,12 @@
/* assign a default route through the interface if required */
if (ipcp_wantoptions[f->unit].default_route)
@@ -76,7 +77,7 @@
default_route_set[f->unit] = 1;
/* Make a proxy ARP entry if requested. */
-@@ -1559,7 +1585,7 @@
+@@ -1890,7 +1916,7 @@
sifnpmode(f->unit, PPP_IP, NPMODE_DROP);
sifdown(f->unit);
ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr,
@@ -85,7 +86,7 @@
}
/* Execute the ip-down script */
-@@ -1575,16 +1601,25 @@
+@@ -1906,16 +1932,25 @@
* proxy arp entries, etc.
*/
static void
@@ -113,9 +114,11 @@
cifdefaultroute(unit, ouraddr, hisaddr);
default_route_set[unit] = 0;
}
---- ppp/pppd/ipcp.h Wed May 31 17:20:41 2000
-+++ ppp/pppd/ipcp.h Wed May 31 15:56:17 2000
-@@ -47,6 +47,7 @@
+Index: ppp-2.4.3/pppd/ipcp.h
+===================================================================
+--- ppp-2.4.3.orig/pppd/ipcp.h 2007-06-04 13:22:08.263599024 +0200
++++ ppp-2.4.3/pppd/ipcp.h 2007-06-04 13:22:11.387124176 +0200
+@@ -70,6 +70,7 @@
bool old_addrs; /* Use old (IP-Addresses) option? */
bool req_addr; /* Ask peer to send IP address? */
bool default_route; /* Assign default route through interface? */
@@ -123,9 +126,11 @@
bool proxy_arp; /* Make proxy ARP entry for peer? */
bool neg_vj; /* Van Jacobson Compression? */
bool old_vj; /* use old (short) form of VJ option? */
---- ppp/pppd/pppd.h Wed May 31 17:20:41 2000
-+++ ppp/pppd/pppd.h Wed May 31 15:56:17 2000
-@@ -416,7 +416,11 @@
+Index: ppp-2.4.3/pppd/pppd.h
+===================================================================
+--- ppp-2.4.3.orig/pppd/pppd.h 2007-06-04 13:22:09.005486240 +0200
++++ ppp-2.4.3/pppd/pppd.h 2007-06-04 13:22:11.388124024 +0200
+@@ -642,7 +642,11 @@
int cif6addr __P((int, eui64_t, eui64_t));
/* Remove an IPv6 address from i/f */
#endif
@@ -137,9 +142,11 @@
/* Create default route through i/f */
int cifdefaultroute __P((int, u_int32_t, u_int32_t));
/* Delete default route through i/f */
---- ppp/pppd/sys-linux.c Wed May 31 17:20:41 2000
-+++ ppp/pppd/sys-linux.c Wed May 31 17:37:23 2000
-@@ -143,6 +143,8 @@
+Index: ppp-2.4.3/pppd/sys-linux.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/sys-linux.c 2007-06-04 13:22:08.807516336 +0200
++++ ppp-2.4.3/pppd/sys-linux.c 2007-06-04 13:22:11.389123872 +0200
+@@ -206,6 +206,8 @@
static int if_is_up; /* Interface has been marked up */
static u_int32_t default_route_gateway; /* Gateway for default route added */
@@ -148,7 +155,7 @@
static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */
static char proxy_arp_dev[16]; /* Device for proxy arp entry */
static u_int32_t our_old_addr; /* for detecting address changes */
-@@ -1209,6 +1211,9 @@
+@@ -1520,6 +1522,9 @@
p = NULL;
}
@@ -158,10 +165,23 @@
SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16);
SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16);
SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16);
-@@ -1278,19 +1283,53 @@
+@@ -1589,19 +1594,53 @@
/********************************************************************
*
* sifdefaultroute - assign a default route through the address given.
+- */
+-
+-int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway)
+-{
+- struct rtentry rt;
+-
+- if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) {
+- u_int32_t old_gateway = SIN_ADDR(rt.rt_gateway);
+-
+- if (old_gateway != gateway)
+- error("not replacing existing default route to %s [%I]",
+- rt.rt_dev, old_gateway);
+- return 0;
+ *
+ * If the global default_rt_repl_rest flag is set, then this function
+ * already replaced the original system defaultroute with some other
@@ -170,22 +190,13 @@
+ * when pppd sets first a defaultroute it it's temporary ppp0 addresses
+ * and then changes the temporary addresses to the addresses for the real
+ * ppp connection when it has come up.
- */
-
--int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway)
++ */
++
+int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway, bool replace)
- {
-- struct rtentry rt;
--
-- if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) {
-- u_int32_t old_gateway = SIN_ADDR(rt.rt_gateway);
++{
+ struct rtentry rt, tmp_rt;
+ struct rtentry *del_rt = NULL;
-
-- if (old_gateway != gateway)
-- error("not replacing existing default route to %s [%I]",
-- rt.rt_dev, old_gateway);
-- return 0;
++
+
+ if (default_rt_repl_rest) {
+ /* We have already reclaced the original defaultroute, if we
@@ -221,8 +232,8 @@
}
memset (&rt, '\0', sizeof (rt));
-@@ -1310,6 +1349,12 @@
- error("default route ioctl(SIOCADDRT): %m(%d)", errno);
+@@ -1623,6 +1662,12 @@
+ error("default route ioctl(SIOCADDRT): %m");
return 0;
}
+ if (default_rt_repl_rest && del_rt)
@@ -234,11 +245,10 @@
default_route_gateway = gateway;
return 1;
-@@ -1344,6 +1389,16 @@
- error("default route ioctl(SIOCDELRT): %m (%d)", errno);
+@@ -1658,6 +1703,16 @@
return 0;
}
-+ }
+ }
+ if (default_rt_repl_rest) {
+ notice("restoring old default route to %s [%I]",
+ old_def_rt.rt_dev, SIN_ADDR(old_def_rt.rt_gateway));
@@ -248,6 +258,7 @@
+ return 0;
+ }
+ default_rt_repl_rest = 0;
- }
++ }
return 1;
+ }
diff --git a/package/ppp/patches/109-debian_demand.patch b/package/ppp/patches/109-debian_demand.patch
index e024696697cedbdb2bda795100746050780407d3..74ce6c71c871607893e6cd4865e4cfcd0fdf9c72 100644
--- a/package/ppp/patches/109-debian_demand.patch
+++ b/package/ppp/patches/109-debian_demand.patch
@@ -1,6 +1,8 @@
---- ppp/pppd/demand.c
-+++ ppp/pppd/demand.c 2000/06/28 14:54:04
-@@ -25,6 +25,8 @@
+Index: ppp-2.4.3/pppd/demand.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/demand.c 2007-06-04 13:22:08.217606016 +0200
++++ ppp-2.4.3/pppd/demand.c 2007-06-04 13:22:11.613089824 +0200
+@@ -36,6 +36,8 @@
#include <errno.h>
#include <fcntl.h>
#include <netdb.h>
@@ -9,16 +11,16 @@
#include <sys/param.h>
#include <sys/types.h>
#include <sys/wait.h>
-@@ -32,6 +34,8 @@
+@@ -43,6 +45,8 @@
#include <sys/resource.h>
#include <sys/stat.h>
#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
#ifdef PPP_FILTER
- #include <net/if.h>
- #include <net/bpf.h>
-@@ -210,6 +214,14 @@
+ #include <pcap-bpf.h>
+ #endif
+@@ -221,6 +225,14 @@
int c, rv;
rv = 0;
@@ -33,7 +35,7 @@
for (; n > 0; --n) {
c = *p++;
if (c == PPP_FLAG) {
-@@ -288,17 +300,102 @@
+@@ -299,17 +311,102 @@
* loopback, now that the real serial link is up.
*/
void
@@ -137,9 +139,11 @@
output(0, pkt->data, pkt->length);
free(pkt);
} else {
---- ppp/pppd/ipcp.c
-+++ ppp/pppd/ipcp.c 2000/06/28 12:32:05
-@@ -1454,7 +1454,7 @@
+Index: ppp-2.4.3/pppd/ipcp.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/ipcp.c 2007-06-04 13:22:11.387124176 +0200
++++ ppp-2.4.3/pppd/ipcp.c 2007-06-04 13:22:11.614089672 +0200
+@@ -1796,7 +1796,7 @@
proxy_arp_set[f->unit] = 1;
}
@@ -148,9 +152,11 @@
sifnpmode(f->unit, PPP_IP, NPMODE_PASS);
} else {
---- ppp/pppd/ipv6cp.c
-+++ ppp/pppd/ipv6cp.c 2000/06/28 12:32:06
-@@ -1153,7 +1153,7 @@
+Index: ppp-2.4.3/pppd/ipv6cp.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/ipv6cp.c 2007-06-04 13:22:08.229604192 +0200
++++ ppp-2.4.3/pppd/ipv6cp.c 2007-06-04 13:22:11.614089672 +0200
+@@ -1232,7 +1232,7 @@
}
}
@@ -159,9 +165,11 @@
sifnpmode(f->unit, PPP_IPV6, NPMODE_PASS);
} else {
---- ppp/pppd/pppd.h
-+++ ppp/pppd/pppd.h 2000/06/28 12:32:06
-@@ -359,7 +359,7 @@
+Index: ppp-2.4.3/pppd/pppd.h
+===================================================================
+--- ppp-2.4.3.orig/pppd/pppd.h 2007-06-04 13:22:11.388124024 +0200
++++ ppp-2.4.3/pppd/pppd.h 2007-06-04 13:22:11.615089520 +0200
+@@ -563,7 +563,7 @@
void demand_block __P((void)); /* set all NPs to queue up packets */
void demand_unblock __P((void)); /* set all NPs to pass packets */
void demand_discard __P((void)); /* set all NPs to discard packets */
diff --git a/package/ppp/patches/200-makefile.patch b/package/ppp/patches/200-makefile.patch
index 9eddc7cd4f431d1aea6bf4616d0e1f42880a143d..aec6d8bd65c93a23767e4eddf3a8724eb4d07039 100644
--- a/package/ppp/patches/200-makefile.patch
+++ b/package/ppp/patches/200-makefile.patch
@@ -1,7 +1,8 @@
-diff -ruN ppp-2.4.3-orig/pppd/Makefile.linux ppp-2.4.3-3/pppd/Makefile.linux
---- ppp-2.4.3-orig/pppd/Makefile.linux 2004-11-13 13:02:22.000000000 +0100
-+++ ppp-2.4.3-3/pppd/Makefile.linux 2004-12-16 04:43:41.000000000 +0100
-@@ -49,19 +49,19 @@
+Index: ppp-2.4.3/pppd/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppd/Makefile.linux 2007-06-04 13:22:08.197609056 +0200
++++ ppp-2.4.3/pppd/Makefile.linux 2007-06-04 13:22:11.837055776 +0200
+@@ -48,21 +48,21 @@
# Uncomment the next line to include support for PPP packet filtering.
# This requires that the libpcap library and headers be installed
# and that the kernel driver support PPP packet filtering.
@@ -26,6 +27,8 @@ diff -ruN ppp-2.4.3-orig/pppd/Makefile.linux ppp-2.4.3-3/pppd/Makefile.linux
-#HAVE_INET6=y
+HAVE_INET6=y
+ # Enable plugins
+ PLUGIN=y
@@ -77,7 +77,7 @@
INCLUDE_DIRS= -I../include
diff --git a/package/ppp/patches/201-mppe_mppc_1.1.patch b/package/ppp/patches/201-mppe_mppc_1.1.patch
index 7e09f1a792bd67999b3d6a788d4b15e0e242eba3..4575fa9431ff7456222ea5e00b64f15d72fc9588 100644
--- a/package/ppp/patches/201-mppe_mppc_1.1.patch
+++ b/package/ppp/patches/201-mppe_mppc_1.1.patch
@@ -1,6 +1,7 @@
-diff -ruN ppp-2.4.3.orig/include/linux/ppp-comp.h ppp-2.4.3/include/linux/ppp-comp.h
---- ppp-2.4.3.orig/include/linux/ppp-comp.h 2002-12-06 10:49:15.000000000 +0100
-+++ ppp-2.4.3/include/linux/ppp-comp.h 2004-11-21 13:54:09.000000000 +0100
+Index: ppp-2.4.3/include/linux/ppp-comp.h
+===================================================================
+--- ppp-2.4.3.orig/include/linux/ppp-comp.h 2007-06-04 13:22:08.143617264 +0200
++++ ppp-2.4.3/include/linux/ppp-comp.h 2007-06-04 13:22:12.031026288 +0200
@@ -36,7 +36,7 @@
*/
@@ -62,9 +63,10 @@ diff -ruN ppp-2.4.3.orig/include/linux/ppp-comp.h ppp-2.4.3/include/linux/ppp-co
/*
* Definitions for other, as yet unsupported, compression methods.
*/
-diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
---- ppp-2.4.3.orig/include/net/ppp-comp.h 2002-12-06 10:49:15.000000000 +0100
-+++ ppp-2.4.3/include/net/ppp-comp.h 2004-11-21 13:54:09.000000000 +0100
+Index: ppp-2.4.3/include/net/ppp-comp.h
+===================================================================
+--- ppp-2.4.3.orig/include/net/ppp-comp.h 2007-06-04 13:22:08.150616200 +0200
++++ ppp-2.4.3/include/net/ppp-comp.h 2007-06-04 13:22:12.031026288 +0200
@@ -255,6 +255,33 @@
opts |= MPPE_OPT_UNKNOWN; \
} while (/* CONSTCOND */ 0)
@@ -99,9 +101,10 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
/*
* Definitions for other, as yet unsupported, compression methods.
*/
-diff -ruN ppp-2.4.3.orig/pppd/ccp.c ppp-2.4.3/pppd/ccp.c
---- ppp-2.4.3.orig/pppd/ccp.c 2004-11-13 03:28:15.000000000 +0100
-+++ ppp-2.4.3/pppd/ccp.c 2004-11-21 13:54:09.000000000 +0100
+Index: ppp-2.4.3/pppd/ccp.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/ccp.c 2007-06-04 13:22:08.157615136 +0200
++++ ppp-2.4.3/pppd/ccp.c 2007-06-04 13:22:12.033025984 +0200
@@ -62,12 +62,10 @@
static char bsd_value[8];
static char deflate_value[8];
@@ -1461,9 +1464,10 @@ diff -ruN ppp-2.4.3.orig/pppd/ccp.c ppp-2.4.3/pppd/ccp.c
ccp_localstate[f->unit] &= ~RACK_PENDING;
}
-
-diff -ruN ppp-2.4.3.orig/pppd/ccp.h ppp-2.4.3/pppd/ccp.h
---- ppp-2.4.3.orig/pppd/ccp.h 2004-11-04 11:02:26.000000000 +0100
-+++ ppp-2.4.3/pppd/ccp.h 2004-11-21 13:54:09.000000000 +0100
+Index: ppp-2.4.3/pppd/ccp.h
+===================================================================
+--- ppp-2.4.3.orig/pppd/ccp.h 2007-06-04 13:22:08.162614376 +0200
++++ ppp-2.4.3/pppd/ccp.h 2007-06-04 13:22:12.033025984 +0200
@@ -37,9 +37,17 @@
bool predictor_2; /* do Predictor-2? */
bool deflate_correct; /* use correct code for deflate? */
@@ -1482,9 +1486,10 @@ diff -ruN ppp-2.4.3.orig/pppd/ccp.h ppp-2.4.3/pppd/ccp.h
short method; /* code for chosen compression method */
} ccp_options;
-diff -ruN ppp-2.4.3.orig/pppd/chap_ms.c ppp-2.4.3/pppd/chap_ms.c
---- ppp-2.4.3.orig/pppd/chap_ms.c 2004-11-12 10:57:43.000000000 +0100
-+++ ppp-2.4.3/pppd/chap_ms.c 2004-11-21 13:54:09.000000000 +0100
+Index: ppp-2.4.3/pppd/chap_ms.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/chap_ms.c 2007-06-04 13:22:08.168613464 +0200
++++ ppp-2.4.3/pppd/chap_ms.c 2007-06-04 13:22:12.033025984 +0200
@@ -895,13 +895,17 @@
/*
* Disable undesirable encryption types. Note that we don't ENABLE
@@ -1505,9 +1510,10 @@ diff -ruN ppp-2.4.3.orig/pppd/chap_ms.c ppp-2.4.3/pppd/chap_ms.c
break;
default:
break;
-diff -ruN ppp-2.4.3.orig/pppd/pppd.8 ppp-2.4.3/pppd/pppd.8
---- ppp-2.4.3.orig/pppd/pppd.8 2004-11-13 13:22:49.000000000 +0100
-+++ ppp-2.4.3/pppd/pppd.8 2004-11-21 14:24:47.000000000 +0100
+Index: ppp-2.4.3/pppd/pppd.8
+===================================================================
+--- ppp-2.4.3.orig/pppd/pppd.8 2007-06-04 13:22:08.175612400 +0200
++++ ppp-2.4.3/pppd/pppd.8 2007-06-04 13:22:12.034025832 +0200
@@ -622,9 +622,29 @@
Enables the use of PPP multilink; this is an alias for the `multilink'
option. This option is currently only available under Linux.
diff --git a/package/ppp/patches/202-atm_fix.patch b/package/ppp/patches/202-atm_fix.patch
index 40d9d595cf9f216cd9feef61e85a93e00a589d16..853f7ae88e4cf2b6463bcf189f306ff97e5baedd 100644
--- a/package/ppp/patches/202-atm_fix.patch
+++ b/package/ppp/patches/202-atm_fix.patch
@@ -1,5 +1,7 @@
---- ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c 2005-08-26 15:18:55.000000000 +0200
-+++ ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c 2005-08-26 15:19:51.000000000 +0200
+Index: ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c 2007-06-04 13:22:11.014180872 +0200
++++ ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c 2007-06-04 13:22:12.281988136 +0200
@@ -136,8 +136,6 @@
int fd;
struct atm_qos qos;
diff --git a/package/ppp/patches/203-no_strip.patch b/package/ppp/patches/203-no_strip.patch
index 216973cf599d160e564e3b6711812a15c6623109..f3df1fc9fd055c454589ad57937167935ed73860 100644
--- a/package/ppp/patches/203-no_strip.patch
+++ b/package/ppp/patches/203-no_strip.patch
@@ -1,6 +1,7 @@
-diff -ruN ppp-2.4.3-orig/chat/Makefile.linux ppp-2.4.3-3/chat/Makefile.linux
---- ppp-2.4.3-orig/chat/Makefile.linux 2004-11-03 12:51:47.000000000 +0100
-+++ ppp-2.4.3-3/chat/Makefile.linux 2004-12-05 17:42:43.000000000 +0100
+Index: ppp-2.4.3/chat/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/chat/Makefile.linux 2007-06-04 13:22:08.064629272 +0200
++++ ppp-2.4.3/chat/Makefile.linux 2007-06-04 13:22:12.463960472 +0200
@@ -25,7 +25,7 @@
install: chat
@@ -10,9 +11,10 @@ diff -ruN ppp-2.4.3-orig/chat/Makefile.linux ppp-2.4.3-3/chat/Makefile.linux
$(INSTALL) -c -m 644 chat.8 $(MANDIR)
clean:
-diff -ruN ppp-2.4.3-orig/pppd/Makefile.linux ppp-2.4.3-3/pppd/Makefile.linux
---- ppp-2.4.3-orig/pppd/Makefile.linux 2004-11-13 13:02:22.000000000 +0100
-+++ ppp-2.4.3-3/pppd/Makefile.linux 2004-12-16 04:43:41.000000000 +0100
+Index: ppp-2.4.3/pppd/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppd/Makefile.linux 2007-06-04 13:22:11.837055776 +0200
++++ ppp-2.4.3/pppd/Makefile.linux 2007-06-04 13:22:12.463960472 +0200
@@ -99,7 +99,7 @@
CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto
@@ -31,10 +33,11 @@ diff -ruN ppp-2.4.3-orig/pppd/Makefile.linux ppp-2.4.3-3/pppd/Makefile.linux
if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
chmod o-rx,u+s $(BINDIR)/pppd; fi
$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
-diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.3-3/pppd/plugins/radius/Makefile.linux
---- ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux 2004-11-14 08:02:31.000000000 +0100
-+++ ppp-2.4.3-3/pppd/plugins/radius/Makefile.linux 2004-12-05 17:43:17.000000000 +0100
-@@ -36,9 +37,9 @@
+Index: ppp-2.4.3/pppd/plugins/radius/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/radius/Makefile.linux 2007-06-04 13:22:08.076627448 +0200
++++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux 2007-06-04 13:22:12.463960472 +0200
+@@ -36,9 +36,9 @@
install: all
$(INSTALL) -d -m 755 $(LIBDIR)
@@ -47,9 +50,10 @@ diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.3-3/pppd/plu
$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
-diff -ruN ppp-2.4.3-orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3-3/pppd/plugins/rp-pppoe/Makefile.linux
---- ppp-2.4.3-orig/pppd/plugins/rp-pppoe/Makefile.linux 2004-11-14 08:58:37.000000000 +0100
-+++ ppp-2.4.3-3/pppd/plugins/rp-pppoe/Makefile.linux 2004-12-05 17:43:23.000000000 +0100
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/Makefile.linux 2007-06-04 13:22:09.416423768 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux 2007-06-04 13:22:12.468959712 +0200
@@ -39,9 +39,9 @@
install: all
@@ -62,19 +66,21 @@ diff -ruN ppp-2.4.3-orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3-3/pppd/p
clean:
rm -f *.o *.so
-diff -ruN ppp-2.4.3-orig/pppdump/Makefile.linux ppp-2.4.3-3/pppdump/Makefile.linux
---- ppp-2.4.3-orig/pppdump/Makefile.linux 2004-10-31 02:36:52.000000000 +0200
-+++ ppp-2.4.3-3/pppdump/Makefile.linux 2004-12-05 17:50:34.000000000 +0100
-@@ -17,5 +18,5 @@
+Index: ppp-2.4.3/pppdump/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppdump/Makefile.linux 2007-06-04 13:22:08.091625168 +0200
++++ ppp-2.4.3/pppdump/Makefile.linux 2007-06-04 13:22:12.468959712 +0200
+@@ -17,5 +17,5 @@
install:
mkdir -p $(BINDIR) $(MANDIR)
- $(INSTALL) -s -c pppdump $(BINDIR)
+ $(INSTALL) -c pppdump $(BINDIR)
$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
-diff -ruN ppp-2.4.3-orig/pppstats/Makefile.linux ppp-2.4.3-3/pppstats/Makefile.linux
---- ppp-2.4.3-orig/pppstats/Makefile.linux 2004-10-31 23:09:03.000000000 +0100
-+++ ppp-2.4.3-3/pppstats/Makefile.linux 2004-12-05 17:43:38.000000000 +0100
+Index: ppp-2.4.3/pppstats/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppstats/Makefile.linux 2007-06-04 13:22:08.099623952 +0200
++++ ppp-2.4.3/pppstats/Makefile.linux 2007-06-04 13:22:12.468959712 +0200
@@ -22,7 +22,7 @@
install: pppstats
diff --git a/package/ppp/patches/204-opt_flags.patch b/package/ppp/patches/204-opt_flags.patch
index 200e76b5b50de4e569cfc6124c4fe378ee970626..0b59b607d3cf5be8f88e38f68ae733419509ec89 100644
--- a/package/ppp/patches/204-opt_flags.patch
+++ b/package/ppp/patches/204-opt_flags.patch
@@ -1,6 +1,7 @@
-diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.3-3/pppd/plugins/radius/Makefile.linux
---- ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux 2004-11-14 08:02:31.000000000 +0100
-+++ ppp-2.4.3-3/pppd/plugins/radius/Makefile.linux 2004-12-05 17:43:17.000000000 +0100
+Index: ppp-2.4.3/pppd/plugins/radius/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/radius/Makefile.linux 2007-06-04 13:22:12.463960472 +0200
++++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux 2007-06-04 13:22:12.705923688 +0200
@@ -12,7 +12,8 @@
INSTALL = install
@@ -11,9 +12,10 @@ diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.3-3/pppd/plu
# Uncomment the next line to include support for Microsoft's
# MS-CHAP authentication protocol.
-diff -ruN ppp-2.4.3-orig/pppdump/Makefile.linux ppp-2.4.3-3/pppdump/Makefile.linux
---- ppp-2.4.3-orig/pppdump/Makefile.linux 2004-10-31 02:36:52.000000000 +0200
-+++ ppp-2.4.3-3/pppdump/Makefile.linux 2004-12-05 17:50:34.000000000 +0100
+Index: ppp-2.4.3/pppdump/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppdump/Makefile.linux 2007-06-04 13:22:12.468959712 +0200
++++ ppp-2.4.3/pppdump/Makefile.linux 2007-06-04 13:22:12.705923688 +0200
@@ -2,7 +2,8 @@
BINDIR = $(DESTDIR)/sbin
MANDIR = $(DESTDIR)/share/man/man8
diff --git a/package/ppp/patches/205-pppoe_iface_name.patch b/package/ppp/patches/205-pppoe_iface_name.patch
index 864866b0d736d24ac4767de7c179f55910f2721c..4b5d6274821977c049287317ada4046d597f08d7 100644
--- a/package/ppp/patches/205-pppoe_iface_name.patch
+++ b/package/ppp/patches/205-pppoe_iface_name.patch
@@ -1,7 +1,8 @@
-diff -urN ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3.new/pppd/plugins/rp-pppoe/plugin.c
---- ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c 2004-11-04 11:07:37.000000000 +0100
-+++ ppp-2.4.3.new/pppd/plugins/rp-pppoe/plugin.c 2007-04-17 18:38:12.000000000 +0200
-@@ -285,9 +285,9 @@
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/plugin.c 2007-06-04 13:22:09.417423616 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c 2007-06-04 13:22:12.953885992 +0200
+@@ -282,9 +282,9 @@
if (strlen(cmd) > 4 && !strncmp(cmd, "nic-", 4)) {
/* Strip off "nic-" */
cmd += 4;
diff --git a/package/ppp/patches/206-radius_config.patch b/package/ppp/patches/206-radius_config.patch
index 90c02af4c146443b3f21136ea905633a48dcdc26..4a7fa40e36ef4a2b2a88c71ec1bb523cfc82031f 100644
--- a/package/ppp/patches/206-radius_config.patch
+++ b/package/ppp/patches/206-radius_config.patch
@@ -1,6 +1,7 @@
-diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/config.c ppp-2.4.3-3/pppd/plugins/radius/config.c
---- ppp-2.4.3-orig/pppd/plugins/radius/config.c 2004-11-14 08:26:26.000000000 +0100
-+++ ppp-2.4.3-3/pppd/plugins/radius/config.c 2004-12-16 04:03:46.000000000 +0100
+Index: ppp-2.4.3/pppd/plugins/radius/config.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/radius/config.c 2007-06-04 13:22:07.980642040 +0200
++++ ppp-2.4.3/pppd/plugins/radius/config.c 2007-06-04 13:22:13.139857720 +0200
@@ -369,31 +369,37 @@
}
#endif
@@ -39,9 +40,10 @@ diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/config.c ppp-2.4.3-3/pppd/plugins/r
return 0;
}
-diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/options.h ppp-2.4.3-3/pppd/plugins/radius/options.h
---- ppp-2.4.3-orig/pppd/plugins/radius/options.h 2004-11-14 08:26:26.000000000 +0100
-+++ ppp-2.4.3-3/pppd/plugins/radius/options.h 2004-12-16 04:09:16.000000000 +0100
+Index: ppp-2.4.3/pppd/plugins/radius/options.h
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/radius/options.h 2007-06-04 13:22:07.989640672 +0200
++++ ppp-2.4.3/pppd/plugins/radius/options.h 2007-06-04 13:22:13.139857720 +0200
@@ -31,24 +31,21 @@
static SERVER acctserver = {0};
static SERVER authserver = {0};
diff --git a/package/ppp/patches/207-ppp_reconnect.patch b/package/ppp/patches/207-ppp_reconnect.patch
index 9311c9ef4e9088fd94c968172de516ba214cdd71..d5181134802e8afb2692ea661fea73e268677100 100644
--- a/package/ppp/patches/207-ppp_reconnect.patch
+++ b/package/ppp/patches/207-ppp_reconnect.patch
@@ -1,6 +1,7 @@
-diff -urN -x'*.swp' ppp.old/pppd/auth.c ppp.dev/pppd/auth.c
---- ppp.old/pppd/auth.c 2004-11-12 11:30:51.000000000 +0100
-+++ ppp.dev/pppd/auth.c 2005-07-13 14:54:23.000000000 +0200
+Index: ppp-2.4.3/pppd/auth.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/auth.c 2007-06-04 13:22:07.941647968 +0200
++++ ppp-2.4.3/pppd/auth.c 2007-06-04 13:22:13.340827168 +0200
@@ -532,6 +532,12 @@
link_required(unit)
int unit;
@@ -71,9 +72,10 @@ diff -urN -x'*.swp' ppp.old/pppd/auth.c ppp.dev/pppd/auth.c
logged_in = 0;
}
-diff -urN -x'*.swp' ppp.old/pppd/main.c ppp.dev/pppd/main.c
---- ppp.old/pppd/main.c 2005-07-13 11:34:28.000000000 +0200
-+++ ppp.dev/pppd/main.c 2005-07-13 14:49:06.000000000 +0200
+Index: ppp-2.4.3/pppd/main.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/main.c 2007-06-04 13:22:10.548251704 +0200
++++ ppp-2.4.3/pppd/main.c 2007-06-04 13:22:13.340827168 +0200
@@ -537,6 +537,7 @@
script_unsetenv("BYTES_RCVD");
@@ -82,9 +84,10 @@ diff -urN -x'*.swp' ppp.old/pppd/main.c ppp.dev/pppd/main.c
while (phase != PHASE_DEAD) {
handle_events();
get_input();
-diff -urN -x'*.swp' ppp.old/pppd/pppd.h ppp.dev/pppd/pppd.h
---- ppp.old/pppd/pppd.h 2005-07-13 11:34:28.000000000 +0200
-+++ ppp.dev/pppd/pppd.h 2005-07-13 14:48:56.000000000 +0200
+Index: ppp-2.4.3/pppd/pppd.h
+===================================================================
+--- ppp-2.4.3.orig/pppd/pppd.h 2007-06-04 13:22:11.615089520 +0200
++++ ppp-2.4.3/pppd/pppd.h 2007-06-04 13:22:13.341827016 +0200
@@ -526,6 +526,7 @@
/* Procedures exported from auth.c */
@@ -93,9 +96,10 @@ diff -urN -x'*.swp' ppp.old/pppd/pppd.h ppp.dev/pppd/pppd.h
void link_terminated __P((int)); /* we are finished with the link */
void link_down __P((int)); /* the LCP layer has left the Opened state */
void upper_layers_down __P((int));/* take all NCPs down */
-diff -urN -x'*.swp' ppp.old/pppd/tty.c ppp.dev/pppd/tty.c
---- ppp.old/pppd/tty.c 2004-11-13 13:07:29.000000000 +0100
-+++ ppp.dev/pppd/tty.c 2005-07-13 14:46:57.000000000 +0200
+Index: ppp-2.4.3/pppd/tty.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/tty.c 2007-06-04 13:22:07.960645080 +0200
++++ ppp-2.4.3/pppd/tty.c 2007-06-04 13:22:13.341827016 +0200
@@ -755,14 +755,6 @@
close(pty_master);
pty_master = -1;
diff --git a/package/ppp/patches/208-no_exponential_timeout.patch b/package/ppp/patches/208-no_exponential_timeout.patch
index d6c986a7ed8eef016c8d7f1b84d93a074bf372a8..e6ad0e991ca1503b4a5e4f09619f707adcf1e50e 100644
--- a/package/ppp/patches/208-no_exponential_timeout.patch
+++ b/package/ppp/patches/208-no_exponential_timeout.patch
@@ -1,6 +1,7 @@
-diff -urN ppp.old/pppd/plugins/rp-pppoe/discovery.c ppp.dev/pppd/plugins/rp-pppoe/discovery.c
---- ppp.old/pppd/plugins/rp-pppoe/discovery.c 2005-09-05 15:25:35.917232000 +0200
-+++ ppp.dev/pppd/plugins/rp-pppoe/discovery.c 2005-09-05 15:29:17.233586872 +0200
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c 2007-06-04 13:22:09.414424072 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c 2007-06-04 13:22:13.567792664 +0200
@@ -593,12 +593,14 @@
conn->discoveryState = STATE_SENT_PADI;
waitForPADO(conn, timeout);
diff --git a/package/ppp/patches/209-compensate_time_change.patch b/package/ppp/patches/209-compensate_time_change.patch
index f43085ab11970c16ae78d6356f848501b83a3564..7c47de01a9a74da0e30e69dd411a222564812319 100644
--- a/package/ppp/patches/209-compensate_time_change.patch
+++ b/package/ppp/patches/209-compensate_time_change.patch
@@ -1,6 +1,7 @@
-diff -urN ppp.old/pppd/main.c ppp.dev/pppd/main.c
---- ppp.old/pppd/main.c 2005-11-11 19:19:28.177790000 +0100
-+++ ppp.dev/pppd/main.c 2005-11-11 20:18:05.957363000 +0100
+Index: ppp-2.4.3/pppd/main.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/main.c 2007-06-04 13:22:13.340827168 +0200
++++ ppp-2.4.3/pppd/main.c 2007-06-04 13:22:13.755764088 +0200
@@ -90,6 +90,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/package/ppp/patches/210-lcp_mtu_max.patch b/package/ppp/patches/210-lcp_mtu_max.patch
index 2056a873257156894ccb4d100541152e1b4ba682..92dd59dd778a67c57fbbbf9153c5c2e75ad24d50 100644
--- a/package/ppp/patches/210-lcp_mtu_max.patch
+++ b/package/ppp/patches/210-lcp_mtu_max.patch
@@ -1,5 +1,7 @@
---- ppp-2.4.3/pppd/lcp.c.old 2006-10-10 14:19:11.000000000 +0200
-+++ ppp-2.4.3/pppd/lcp.c 2006-10-10 14:19:55.000000000 +0200
+Index: ppp-2.4.3/pppd/lcp.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/lcp.c 2007-06-04 13:22:07.874658152 +0200
++++ ppp-2.4.3/pppd/lcp.c 2007-06-04 13:22:13.945735208 +0200
@@ -1891,12 +1891,12 @@
* the interface MTU is set to the lowest of that, the
* MTU we want to use, and our link MRU.
diff --git a/package/ppp/patches/300-filter-pcap-includes-lib.patch b/package/ppp/patches/300-filter-pcap-includes-lib.patch
index 3f6247d6ef816a1dfb24a8e07c67ae2fa183b99c..bc8bee95fd143fd85f2c72c49a5c9e7e6866030c 100644
--- a/package/ppp/patches/300-filter-pcap-includes-lib.patch
+++ b/package/ppp/patches/300-filter-pcap-includes-lib.patch
@@ -1,6 +1,7 @@
-diff -urN ppp-2.4.3.orig/pppd/Makefile.linux ppp-2.4.3/pppd/Makefile.linux
---- ppp-2.4.3.orig/pppd/Makefile.linux 2006-02-05 20:13:06.000000000 +0100
-+++ ppp-2.4.3/pppd/Makefile.linux 2006-02-05 20:24:22.000000000 +0100
+Index: ppp-2.4.3/pppd/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppd/Makefile.linux 2007-06-04 13:22:12.463960472 +0200
++++ ppp-2.4.3/pppd/Makefile.linux 2007-06-04 13:22:14.133706632 +0200
@@ -172,8 +172,8 @@
ifdef FILTER
diff --git a/package/ppp/patches/310-precompiled_filter.patch b/package/ppp/patches/310-precompiled_filter.patch
index df9452c379839bfcbb3ea6a7e8ef55508c690357..0ad8093734cc5a720a54cec8f78c694fb99df8c7 100644
--- a/package/ppp/patches/310-precompiled_filter.patch
+++ b/package/ppp/patches/310-precompiled_filter.patch
@@ -1,6 +1,7 @@
-diff -urN ppp.old/pppd/Makefile.linux ppp.dev/pppd/Makefile.linux
---- ppp.old/pppd/Makefile.linux 2006-03-18 15:58:00.000000000 +0100
-+++ ppp.dev/pppd/Makefile.linux 2006-03-18 16:52:01.000000000 +0100
+Index: ppp-2.4.3/pppd/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppd/Makefile.linux 2007-06-04 13:22:14.133706632 +0200
++++ ppp-2.4.3/pppd/Makefile.linux 2007-06-04 13:22:14.320678208 +0200
@@ -50,6 +50,9 @@
# and that the kernel driver support PPP packet filtering.
#FILTER=y
@@ -26,9 +27,10 @@ diff -urN ppp.old/pppd/Makefile.linux ppp.dev/pppd/Makefile.linux
ifdef HAVE_INET6
PPPDSRCS += ipv6cp.c eui64.c
HEADERS += ipv6cp.h eui64.h
-diff -urN ppp.old/pppd/demand.c ppp.dev/pppd/demand.c
---- ppp.old/pppd/demand.c 2006-03-18 15:58:00.000000000 +0100
-+++ ppp.dev/pppd/demand.c 2006-03-18 18:09:16.000000000 +0100
+Index: ppp-2.4.3/pppd/demand.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/demand.c 2007-06-04 13:22:11.613089824 +0200
++++ ppp-2.4.3/pppd/demand.c 2007-06-04 13:22:14.320678208 +0200
@@ -438,12 +438,14 @@
return 0;
proto = PPP_PROTOCOL(p);
@@ -44,9 +46,10 @@ diff -urN ppp.old/pppd/demand.c ppp.dev/pppd/demand.c
#endif
for (i = 0; (protp = protocols[i]) != NULL; ++i) {
if (protp->protocol < 0xC000 && (protp->protocol & ~0x8000) == proto) {
-diff -urN ppp.old/pppd/options.c ppp.dev/pppd/options.c
---- ppp.old/pppd/options.c 2006-03-18 15:58:00.000000000 +0100
-+++ ppp.dev/pppd/options.c 2006-03-18 18:05:58.000000000 +0100
+Index: ppp-2.4.3/pppd/options.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/options.c 2007-06-04 13:22:09.005486240 +0200
++++ ppp-2.4.3/pppd/options.c 2007-06-04 13:22:14.321678056 +0200
@@ -57,14 +57,7 @@
#ifdef PPP_FILTER
@@ -140,9 +143,10 @@ diff -urN ppp.old/pppd/options.c ppp.dev/pppd/options.c
if (pcap_compile(pc, &active_filter, *argv, 1, netmask) == -1) {
option_error("error in active-filter expression: %s\n",
pcap_geterr(pc));
-diff -urN ppp.old/pppd/pcap_pcc.c ppp.dev/pppd/pcap_pcc.c
---- ppp.old/pppd/pcap_pcc.c 1970-01-01 01:00:00.000000000 +0100
-+++ ppp.dev/pppd/pcap_pcc.c 2006-03-18 16:51:31.000000000 +0100
+Index: ppp-2.4.3/pppd/pcap_pcc.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ ppp-2.4.3/pppd/pcap_pcc.c 2007-06-04 13:22:14.321678056 +0200
@@ -0,0 +1,74 @@
+#include <pcap.h>
+#include <pcap-bpf.h>
@@ -218,9 +222,10 @@ diff -urN ppp.old/pppd/pcap_pcc.c ppp.dev/pppd/pcap_pcc.c
+ fclose (f);
+ return 0;
+}
-diff -urN ppp.old/pppd/pcap_pcc.h ppp.dev/pppd/pcap_pcc.h
---- ppp.old/pppd/pcap_pcc.h 1970-01-01 01:00:00.000000000 +0100
-+++ ppp.dev/pppd/pcap_pcc.h 2006-03-18 15:59:14.000000000 +0100
+Index: ppp-2.4.3/pppd/pcap_pcc.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ ppp-2.4.3/pppd/pcap_pcc.h 2007-06-04 13:22:14.321678056 +0200
@@ -0,0 +1,7 @@
+#ifndef PCAP_PCC_H
+#define PCAP_PCC_H
diff --git a/package/qc-usb/patches/001-linux_autoconf.patch b/package/qc-usb/patches/001-linux_autoconf.patch
index e06271b36a8e1d76fd293d11ed52b296568f512c..a9df4ff9abf26a94201cc2ca663da4221b373a74 100644
--- a/package/qc-usb/patches/001-linux_autoconf.patch
+++ b/package/qc-usb/patches/001-linux_autoconf.patch
@@ -1,6 +1,7 @@
-diff -ruaN qc-usb-0.6.5.orig/qc-memory.c qc-usb-0.6.5/qc-memory.c
---- qc-usb-0.6.5.orig/qc-memory.c 2005-03-20 18:00:45.000000000 -0500
-+++ qc-usb-0.6.5/qc-memory.c 2007-01-13 10:50:24.000000000 -0500
+Index: qc-usb-0.6.5/qc-memory.c
+===================================================================
+--- qc-usb-0.6.5.orig/qc-memory.c 2007-06-04 13:22:52.398889440 +0200
++++ qc-usb-0.6.5/qc-memory.c 2007-06-04 13:22:52.469878648 +0200
@@ -27,7 +27,7 @@
*/
/* }}} */
@@ -10,9 +11,10 @@ diff -ruaN qc-usb-0.6.5.orig/qc-memory.c qc-usb-0.6.5/qc-memory.c
#include <linux/version.h>
#ifdef CONFIG_SMP
-diff -ruaN qc-usb-0.6.5.orig/quickcam.h qc-usb-0.6.5/quickcam.h
---- qc-usb-0.6.5.orig/quickcam.h 2006-10-23 22:07:42.000000000 -0400
-+++ qc-usb-0.6.5/quickcam.h 2007-01-13 10:50:45.000000000 -0500
+Index: qc-usb-0.6.5/quickcam.h
+===================================================================
+--- qc-usb-0.6.5.orig/quickcam.h 2007-06-04 13:22:52.404888528 +0200
++++ qc-usb-0.6.5/quickcam.h 2007-06-04 13:22:52.470878496 +0200
@@ -76,7 +76,7 @@
#ifdef __KERNEL__
diff --git a/package/rt2500/patches/001-rt2561t.patch b/package/rt2500/patches/001-rt2561t.patch
index 8bdb623b51e9a2fcbf61c9ba85bdd3a9b06ba2f4..ca0722161232f30ae84af6d8bf68558a9863e422 100644
--- a/package/rt2500/patches/001-rt2561t.patch
+++ b/package/rt2500/patches/001-rt2561t.patch
@@ -1,6 +1,7 @@
-diff -urN rt2500-1.1.0-b4/Module/rt_config.h rt2500-1.1.0-b4.new/Module/rt_config.h
---- rt2500-1.1.0-b4/Module/rt_config.h 2006-06-17 22:12:58.000000000 +0200
-+++ rt2500-1.1.0-b4.new/Module/rt_config.h 2006-12-30 02:56:30.000000000 +0100
+Index: rt2500-1.1.0-b4/Module/rt_config.h
+===================================================================
+--- rt2500-1.1.0-b4.orig/Module/rt_config.h 2007-06-04 13:22:53.001797784 +0200
++++ rt2500-1.1.0-b4/Module/rt_config.h 2007-06-04 13:22:53.074786688 +0200
@@ -55,7 +55,7 @@
#error You must compile this driver with "-O".
#endif
@@ -18,9 +19,10 @@ diff -urN rt2500-1.1.0-b4/Module/rt_config.h rt2500-1.1.0-b4.new/Module/rt_confi
};
#ifdef RTMP_EMBEDDED
-diff -urN rt2500-1.1.0-b4/Module/rtmp_main.c rt2500-1.1.0-b4.new/Module/rtmp_main.c
---- rt2500-1.1.0-b4/Module/rtmp_main.c 2006-06-17 22:12:58.000000000 +0200
-+++ rt2500-1.1.0-b4.new/Module/rtmp_main.c 2006-12-30 02:56:01.000000000 +0100
+Index: rt2500-1.1.0-b4/Module/rtmp_main.c
+===================================================================
+--- rt2500-1.1.0-b4.orig/Module/rtmp_main.c 2007-06-04 13:22:53.008796720 +0200
++++ rt2500-1.1.0-b4/Module/rtmp_main.c 2007-06-04 13:22:53.074786688 +0200
@@ -975,6 +975,7 @@
static struct pci_device_id rt2500_pci_tbl[] __devinitdata =
{
diff --git a/package/shfs/patches/100-kmod_build.patch b/package/shfs/patches/100-kmod_build.patch
index 11701033f5befe2c8fcbecb77e126f81c6b555fc..16f198c4f65030a7fefe817be62da2211bf4126d 100644
--- a/package/shfs/patches/100-kmod_build.patch
+++ b/package/shfs/patches/100-kmod_build.patch
@@ -1,5 +1,7 @@
---- shfs-0.35-orig/shfs/Linux-2.4/Makefile 2004-06-01 15:16:19.000000000 +0200
-+++ shfs-0.35-2/shfs/Linux-2.4/Makefile 2005-04-09 02:34:35.000000000 +0200
+Index: shfs-0.35/shfs/Linux-2.4/Makefile
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.4/Makefile 2007-06-04 13:22:58.143016200 +0200
++++ shfs-0.35/shfs/Linux-2.4/Makefile 2007-06-04 13:22:58.209006168 +0200
@@ -1,3 +1,13 @@
+#
+# the original Makefile was trashed and replaced by this one
@@ -14,7 +16,7 @@
ifndef KERNEL
KERNEL=$(shell uname -r)
endif
-@@ -10,67 +24,29 @@
+@@ -10,67 +20,29 @@
KERNEL_SOURCES=${MODULESDIR}/build
endif
diff --git a/package/shfs/patches/101-shfs_0.35_2.6.18_dentry.patch b/package/shfs/patches/101-shfs_0.35_2.6.18_dentry.patch
index 25c3dc6f33fa9f15ac27fd62d82d181b91c1e8c8..e7754b037d5b322b517ef156e40e82b53663dc75 100644
--- a/package/shfs/patches/101-shfs_0.35_2.6.18_dentry.patch
+++ b/package/shfs/patches/101-shfs_0.35_2.6.18_dentry.patch
@@ -1,6 +1,8 @@
---- shfs-0.35.orig/shfs/Linux-2.6/inode.c
-+++ shfs-0.35/shfs/Linux-2.6/inode.c
-@@ -341,12 +341,21 @@ out:
+Index: shfs-0.35/shfs/Linux-2.6/inode.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/inode.c 2007-06-04 13:22:58.091024104 +0200
++++ shfs-0.35/shfs/Linux-2.6/inode.c 2007-06-04 13:22:58.397977440 +0200
+@@ -337,12 +337,21 @@
return -EINVAL;
}
@@ -22,9 +24,11 @@
static struct file_system_type sh_fs_type = {
.owner = THIS_MODULE,
---- shfs-0.35.orig/shfs/Linux-2.6/file.c
-+++ shfs-0.35/shfs/Linux-2.6/file.c
-@@ -199,7 +199,7 @@ shfs_file_open(struct inode *inode, stru
+Index: shfs-0.35/shfs/Linux-2.6/file.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/file.c 2007-06-04 13:22:58.096023344 +0200
++++ shfs-0.35/shfs/Linux-2.6/file.c 2007-06-04 13:22:58.397977440 +0200
+@@ -199,7 +199,7 @@
}
static int
@@ -33,7 +37,7 @@
{
struct dentry *dentry = f->f_dentry;
struct shfs_sb_info *info = info_from_dentry(dentry);
-@@ -222,6 +222,16 @@ shfs_file_flush(struct file *f)
+@@ -222,6 +222,16 @@
}
static int
@@ -50,7 +54,7 @@
shfs_file_release(struct inode *inode, struct file *f)
{
struct dentry *dentry = f->f_dentry;
-@@ -311,7 +321,7 @@ shfs_slow_write(struct file *f, const ch
+@@ -311,7 +321,7 @@
DEBUG("\n");
written = generic_file_write(f, buf, count, offset);
if (written > 0) {
@@ -61,9 +65,9 @@
Index: shfs-0.35/shfs/Linux-2.6/proc.c
===================================================================
---- shfs-0.35.orig/shfs/Linux-2.6/proc.c
-+++ shfs-0.35/shfs/Linux-2.6/proc.c
-@@ -570,6 +570,16 @@ error:
+--- shfs-0.35.orig/shfs/Linux-2.6/proc.c 2007-06-04 13:22:58.102022432 +0200
++++ shfs-0.35/shfs/Linux-2.6/proc.c 2007-06-04 13:22:58.398977288 +0200
+@@ -570,6 +570,16 @@
return result;
}
@@ -80,14 +84,16 @@ Index: shfs-0.35/shfs/Linux-2.6/proc.c
int
shfs_statfs(struct super_block *sb, struct kstatfs *attr)
{
-@@ -578,4 +588,5 @@ shfs_statfs(struct super_block *sb, stru
+@@ -578,4 +588,5 @@
DEBUG("\n");
return info->fops.statfs(info, attr);
}
+#endif
---- shfs-0.35.orig/shfs/Linux-2.6/shfs_fs.h
-+++ shfs-0.35/shfs/Linux-2.6/shfs_fs.h
+Index: shfs-0.35/shfs/Linux-2.6/shfs_fs.h
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/shfs_fs.h 2007-06-04 13:22:58.107021672 +0200
++++ shfs-0.35/shfs/Linux-2.6/shfs_fs.h 2007-06-04 13:22:58.398977288 +0200
@@ -9,6 +9,12 @@
#include <linux/ioctl.h>
@@ -101,7 +107,7 @@ Index: shfs-0.35/shfs/Linux-2.6/proc.c
#define SHFS_MAX_AGE(info) (((info)->ttl * HZ) / 1000)
#define SOCKBUF_SIZE (SHFS_PATH_MAX * 10)
-@@ -100,7 +106,12 @@ int reply(char *s);
+@@ -101,7 +107,12 @@
void set_garbage(struct shfs_sb_info *info, int write, int count);
int get_name(struct dentry *d, char *name);
int shfs_notify_change(struct dentry *dentry, struct iattr *attr);
@@ -114,9 +120,11 @@ Index: shfs-0.35/shfs/Linux-2.6/proc.c
/* shfs/inode.c */
void shfs_set_inode_attr(struct inode *inode, struct shfs_fattr *fattr);
---- shfs-0.35.orig/shfs/Linux-2.6/symlink.c
-+++ shfs-0.35/shfs/Linux-2.6/symlink.c
-@@ -41,7 +41,7 @@ error:
+Index: shfs-0.35/shfs/Linux-2.6/symlink.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/symlink.c 2007-06-04 13:22:58.113020760 +0200
++++ shfs-0.35/shfs/Linux-2.6/symlink.c 2007-06-04 13:22:58.398977288 +0200
+@@ -41,7 +41,7 @@
return result;
}
@@ -125,7 +133,7 @@ Index: shfs-0.35/shfs/Linux-2.6/proc.c
shfs_follow_link(struct dentry *dentry, struct nameidata *nd)
{
struct shfs_sb_info *info = info_from_dentry(dentry);
-@@ -61,7 +61,7 @@ shfs_follow_link(struct dentry *dentry,
+@@ -61,7 +61,7 @@
DEBUG("%s\n", real_name);
result = vfs_follow_link(nd, real_name);
error:
@@ -134,8 +142,10 @@ Index: shfs-0.35/shfs/Linux-2.6/proc.c
}
struct inode_operations shfs_symlink_inode_operations = {
---- shfs-0.35.orig/shfs/Linux-2.6/dcache.c 2004-06-01 15:16:19.000000000 +0200
-+++ shfs-0.35/shfs/Linux-2.6/dcache.c 2006-02-17 17:36:02.000000000 +0100
+Index: shfs-0.35/shfs/Linux-2.6/dcache.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/dcache.c 2007-06-04 13:22:58.121019544 +0200
++++ shfs-0.35/shfs/Linux-2.6/dcache.c 2007-06-04 13:22:58.398977288 +0200
@@ -68,7 +68,7 @@
spin_lock(&dcache_lock);
next = parent->d_subdirs.next;
diff --git a/package/shfs/patches/102-shfs_0.35_clean_inode_clear.patch b/package/shfs/patches/102-shfs_0.35_clean_inode_clear.patch
index 6ca6ec021deef43b0d71f77310ea82f35c22831d..f12fc9650994eec100639bfa85137d3736866483 100644
--- a/package/shfs/patches/102-shfs_0.35_clean_inode_clear.patch
+++ b/package/shfs/patches/102-shfs_0.35_clean_inode_clear.patch
@@ -1,5 +1,7 @@
---- shfs-0.35.orig/shfs/Linux-2.6/inode.c.orig 2006-01-04 16:23:11.000000000 -0600
-+++ shfs-0.35/shfs/Linux-2.6/inode.c 2006-01-04 16:24:45.000000000 -0600
+Index: shfs-0.35/shfs/Linux-2.6/inode.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/inode.c 2007-06-04 13:22:58.397977440 +0200
++++ shfs-0.35/shfs/Linux-2.6/inode.c 2007-06-04 13:22:58.637940960 +0200
@@ -8,6 +8,7 @@
#include <linux/modversions.h>
#endif
diff --git a/package/shfs/patches/103-shfs_0.35_gcc4.patch b/package/shfs/patches/103-shfs_0.35_gcc4.patch
index 846dcb0d3e595e70f17b680e1520f5d5eec73ee1..e4c13882c4379ffdd3535b17665bb291c6515e75 100644
--- a/package/shfs/patches/103-shfs_0.35_gcc4.patch
+++ b/package/shfs/patches/103-shfs_0.35_gcc4.patch
@@ -1,5 +1,7 @@
---- shfs-0.35/shfs/Linux-2.6/dir.c 2004-06-01 09:16:19.000000000 -0400
-+++ shfs-0.35-new/shfs/Linux-2.6/dir.c 2005-02-11 18:12:00.000000000 -0500
+Index: shfs-0.35/shfs/Linux-2.6/dir.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/dir.c 2007-06-04 13:22:58.041031704 +0200
++++ shfs-0.35/shfs/Linux-2.6/dir.c 2007-06-04 13:22:58.822912840 +0200
@@ -19,6 +19,8 @@
#include "shfs_debug.h"
#include "proc.h"
@@ -9,9 +11,11 @@
static int
shfs_dir_open(struct inode *inode, struct file *filp)
{
---- shfs-0.35/shfs/Linux-2.6/shfs_fs.h 2004-06-01 09:16:19.000000000 -0400
-+++ shfs-0.35-new/shfs/Linux-2.6/shfs_fs.h 2005-02-11 18:12:03.000000000 -0500
-@@ -50,7 +50,6 @@
+Index: shfs-0.35/shfs/Linux-2.6/shfs_fs.h
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/shfs_fs.h 2007-06-04 13:22:58.398977288 +0200
++++ shfs-0.35/shfs/Linux-2.6/shfs_fs.h 2007-06-04 13:22:58.823912688 +0200
+@@ -56,7 +56,6 @@
#define ROUND_TO_MINS(x) do { (x).tv_sec = ((x).tv_sec / 60) * 60; (x).tv_nsec = 0; } while (0)
/* shfs/dir.c */
diff --git a/package/shfs/patches/104-shfs_0.35_inode_and_fs.patch b/package/shfs/patches/104-shfs_0.35_inode_and_fs.patch
index f7857bf73c6bb32a446e346723dedd335829f219..0953e6b0aad3272c8818a41d6302543a59ac5ad5 100644
--- a/package/shfs/patches/104-shfs_0.35_inode_and_fs.patch
+++ b/package/shfs/patches/104-shfs_0.35_inode_and_fs.patch
@@ -1,5 +1,7 @@
---- shfs-0.35.orig/shfs/Linux-2.6/fcache.c 2007-01-03 22:29:26.000000000 -0600
-+++ shfs-0.35/shfs/Linux-2.6/fcache.c 2007-01-03 22:34:21.000000000 -0600
+Index: shfs-0.35/shfs/Linux-2.6/fcache.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/fcache.c 2007-06-04 13:22:57.997038392 +0200
++++ shfs-0.35/shfs/Linux-2.6/fcache.c 2007-06-04 13:22:59.019882896 +0200
@@ -100,7 +100,11 @@
VERBOSE("dir in file cache?\n");
return -EINVAL;
@@ -72,9 +74,11 @@
if (!p) {
VERBOSE("inode without info\n");
return -EINVAL;
---- shfs-0.35.orig/shfs/Linux-2.6/inode.c 2004-06-01 08:16:19.000000000 -0500
-+++ shfs-0.35/shfs/Linux-2.6/inode.c 2007-01-03 22:39:44.000000000 -0600
-@@ -35,7 +36,11 @@
+Index: shfs-0.35/shfs/Linux-2.6/inode.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/inode.c 2007-06-04 13:22:58.637940960 +0200
++++ shfs-0.35/shfs/Linux-2.6/inode.c 2007-06-04 13:22:59.020882744 +0200
+@@ -36,7 +36,11 @@
shfs_set_inode_attr(struct inode *inode, struct shfs_fattr *fattr)
{
struct shfs_sb_info *info = info_from_inode(inode);
@@ -86,7 +90,7 @@
struct timespec last_time = inode->i_mtime;
loff_t last_size = inode->i_size;
-@@ -52,7 +57,9 @@
+@@ -53,7 +57,9 @@
inode->i_ctime = fattr->f_ctime;
inode->i_atime = fattr->f_atime;
inode->i_mtime = fattr->f_mtime;
@@ -96,7 +100,7 @@
inode->i_blocks = fattr->f_blocks;
inode->i_size = fattr->f_size;
-@@ -75,7 +82,11 @@
+@@ -76,7 +82,11 @@
if (!inode)
return NULL;
inode->i_ino = fattr->f_ino;
@@ -108,7 +112,7 @@
if (!i)
return NULL;
i->cache = NULL;
-@@ -107,7 +118,11 @@
+@@ -108,7 +118,11 @@
struct shfs_inode_info *i;
DEBUG("ino: %lu\n", inode->i_ino);
@@ -120,7 +124,7 @@
if (!i) {
VERBOSE("invalid inode\n");
goto out;
-@@ -172,7 +190,11 @@
+@@ -176,7 +190,11 @@
{
struct shfs_sb_info *info = info_from_dentry(dentry);
struct inode *inode = dentry->d_inode;
@@ -132,8 +136,10 @@
int result;
DEBUG("%s\n", dentry->d_name.name);
---- shfs-0.35.orig/shfs/Linux-2.6/dir.c 2007-01-03 22:38:23.000000000 -0600
-+++ shfs-0.35/shfs/Linux-2.6/dir.c 2007-01-03 22:39:06.000000000 -0600
+Index: shfs-0.35/shfs/Linux-2.6/dir.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/dir.c 2007-06-04 13:22:58.822912840 +0200
++++ shfs-0.35/shfs/Linux-2.6/dir.c 2007-06-04 13:22:59.020882744 +0200
@@ -302,8 +302,13 @@
shfs_invalid_dir_cache(dir);
@@ -148,8 +154,10 @@
return result;
}
---- shfs-0.35.orig/shfs/Linux-2.6/file.c 2007-01-03 22:40:24.000000000 -0600
-+++ shfs-0.35/shfs/Linux-2.6/file.c 2007-01-03 22:45:11.000000000 -0600
+Index: shfs-0.35/shfs/Linux-2.6/file.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/file.c 2007-06-04 13:22:58.397977440 +0200
++++ shfs-0.35/shfs/Linux-2.6/file.c 2007-06-04 13:22:59.020882744 +0200
@@ -90,7 +90,11 @@
struct dentry *dentry = f->f_dentry;
struct shfs_sb_info *info = info_from_dentry(dentry);
@@ -227,8 +235,10 @@
};
struct file_operations shfs_slow_operations = {
---- shfs-0.35.orig/shfs/Linux-2.6/proc.c 2007-01-03 22:45:32.000000000 -0600
-+++ shfs-0.35/shfs/Linux-2.6/proc.c 2007-01-03 22:57:17.000000000 -0600
+Index: shfs-0.35/shfs/Linux-2.6/proc.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/proc.c 2007-06-04 13:22:58.398977288 +0200
++++ shfs-0.35/shfs/Linux-2.6/proc.c 2007-06-04 13:22:59.021882592 +0200
@@ -149,7 +149,12 @@
{
struct file *f = info->sock;
diff --git a/package/shfs/patches/105-space_chars.patch b/package/shfs/patches/105-space_chars.patch
index 3a9aede7bffd7f2e57350a73ded4497bcfc82e59..03ad8328c63713fb729dfdf38078d9455a44e416 100644
--- a/package/shfs/patches/105-space_chars.patch
+++ b/package/shfs/patches/105-space_chars.patch
@@ -1,5 +1,7 @@
---- shfs-0.35.orig/shfs/Linux-2.4/shell.c 31 May 2004 16:32:13 -0000 1.6
-+++ shfs-0.35/shfs/Linux-2.4/shell.c 3 Jun 2004 09:09:54 -0000
+Index: shfs-0.35/shfs/Linux-2.4/shell.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.4/shell.c 2007-06-04 13:22:57.970042496 +0200
++++ shfs-0.35/shfs/Linux-2.4/shell.c 2007-06-04 13:22:59.249847936 +0200
@@ -213,6 +213,7 @@
int c = 0;
int is_space = 1;
@@ -31,8 +33,10 @@
}
}
s++;
---- shfs-0.35.orig/shfs/Linux-2.6/shell.c 31 May 2004 16:32:13 -0000 1.7
-+++ shfs-0.35/shfs/Linux-2.6/shell.c 3 Jun 2004 09:09:57 -0000
+Index: shfs-0.35/shfs/Linux-2.6/shell.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/shell.c 2007-06-04 13:22:57.977041432 +0200
++++ shfs-0.35/shfs/Linux-2.6/shell.c 2007-06-04 13:22:59.249847936 +0200
@@ -225,6 +225,7 @@
int c = 0;
int is_space = 1;
diff --git a/package/shfs/patches/106-uidgid32.patch b/package/shfs/patches/106-uidgid32.patch
index 1bd980369b981873a1e287efea428c52943618ba..60510a28d3ed7c026c9dadc480a9262ff02f54bf 100644
--- a/package/shfs/patches/106-uidgid32.patch
+++ b/package/shfs/patches/106-uidgid32.patch
@@ -1,5 +1,7 @@
---- shfs-0.35.orig/shfs/Linux-2.4/shfs_fs_sb.h 24 Mar 2004 13:40:02 -0000 1.2
-+++ shfs-0.35/shfs/Linux-2.4/shfs_fs_sb.h 3 Jun 2004 17:12:28 -0000
+Index: shfs-0.35/shfs/Linux-2.4/shfs_fs_sb.h
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.4/shfs_fs_sb.h 2007-06-04 13:22:57.941046904 +0200
++++ shfs-0.35/shfs/Linux-2.4/shfs_fs_sb.h 2007-06-04 13:22:59.448817688 +0200
@@ -38,10 +38,10 @@
struct shfs_fileops fops;
int version;
@@ -15,8 +17,10 @@
char mount_point[SHFS_PATH_MAX];
struct semaphore sock_sem; /* next 4 vars are guarded */
struct file *sock;
---- shfs-0.35.orig/shfs/Linux-2.6/shfs_fs_sb.h 24 Mar 2004 13:40:02 -0000 1.2
-+++ shfs-0.35/shfs/Linux-2.6/shfs_fs_sb.h 3 Jun 2004 17:12:28 -0000
+Index: shfs-0.35/shfs/Linux-2.6/shfs_fs_sb.h
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/shfs_fs_sb.h 2007-06-04 13:22:57.949045688 +0200
++++ shfs-0.35/shfs/Linux-2.6/shfs_fs_sb.h 2007-06-04 13:22:59.449817536 +0200
@@ -38,10 +38,10 @@
struct shfs_fileops fops;
int version;
diff --git a/package/shfs/patches/107-df.patch b/package/shfs/patches/107-df.patch
index 07eaaf234f0130f6419f596b8c05ddc9fbdc0361..ca2c9d079ae9a4dfeadc9dff67fb7d51de55b834 100644
--- a/package/shfs/patches/107-df.patch
+++ b/package/shfs/patches/107-df.patch
@@ -1,5 +1,7 @@
---- shfs-0.35.orig/shfs/Linux-2.4/shell.c 3 Jun 2004 13:20:44 -0000 1.8
-+++ shfs-0.35/shfs/Linux-2.4/shell.c 18 Jun 2004 12:19:52 -0000
+Index: shfs-0.35/shfs/Linux-2.4/shell.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.4/shell.c 2007-06-04 13:22:59.249847936 +0200
++++ shfs-0.35/shfs/Linux-2.4/shell.c 2007-06-04 13:22:59.643788048 +0200
@@ -961,11 +961,11 @@
s = info->sockbuf;
@@ -15,8 +17,10 @@
result = sock_readln(info, info->sockbuf, SOCKBUF_SIZE);
if (result < 0)
---- shfs-0.35.orig/shfs/Linux-2.6/shell.c 3 Jun 2004 13:20:47 -0000 1.9
-+++ shfs-0.35/shfs/Linux-2.6/shell.c 18 Jun 2004 12:19:53 -0000
+Index: shfs-0.35/shfs/Linux-2.6/shell.c
+===================================================================
+--- shfs-0.35.orig/shfs/Linux-2.6/shell.c 2007-06-04 13:22:59.249847936 +0200
++++ shfs-0.35/shfs/Linux-2.6/shell.c 2007-06-04 13:22:59.643788048 +0200
@@ -974,11 +974,11 @@
s = info->sockbuf;
diff --git a/package/shfs/patches/108-no_update_mtab.patch b/package/shfs/patches/108-no_update_mtab.patch
index 1f519bb5754afafa9247507d98642e007d297b7b..9b4a9aeeb0729f18dcffd3033490c9680f2f4a2c 100644
--- a/package/shfs/patches/108-no_update_mtab.patch
+++ b/package/shfs/patches/108-no_update_mtab.patch
@@ -1,5 +1,7 @@
---- shfs-0.35.orig/shfsmount/shfsmount.c 2004-06-01 14:16:19.000000000 +0100
-+++ shfs-0.35/shfsmount/shfsmount.c 2007-03-28 21:23:47.194043034 +0100
+Index: shfs-0.35/shfsmount/shfsmount.c
+===================================================================
+--- shfs-0.35.orig/shfsmount/shfsmount.c 2007-06-04 13:22:57.883055720 +0200
++++ shfs-0.35/shfsmount/shfsmount.c 2007-06-04 13:22:59.838758408 +0200
@@ -74,7 +74,7 @@
static int have_uid = 0;
@@ -9,8 +11,10 @@
/* preserve owner of files */
static int preserve = 0;
---- shfs-0.35.orig/shfsmount/shfsumount.c 2004-06-01 14:16:19.000000000 +0100
-+++ shfs-0.35/shfsmount/shfsumount.c 2007-03-28 21:49:28.937840351 +0100
+Index: shfs-0.35/shfsmount/shfsumount.c
+===================================================================
+--- shfs-0.35.orig/shfsmount/shfsumount.c 2007-06-04 13:22:57.890054656 +0200
++++ shfs-0.35/shfsmount/shfsumount.c 2007-06-04 13:22:59.838758408 +0200
@@ -67,10 +67,6 @@
FILE *new_mtab;
struct mntent *ment;
diff --git a/package/strongswan/patches/100-ar-fixes.patch b/package/strongswan/patches/100-ar-fixes.patch
index d6ce9f337aba32290f3342646e737ff57abd35a0..2e9d7800eb3ad695d080a6e9d78c35acf8a205f0 100644
--- a/package/strongswan/patches/100-ar-fixes.patch
+++ b/package/strongswan/patches/100-ar-fixes.patch
@@ -1,6 +1,7 @@
-diff -ruN strongswan-2.8.1-orig/lib/libcrypto/libaes/Makefile strongswan-2.8.1/lib/libcrypto/libaes/Makefile
---- strongswan-2.8.1-orig/lib/libcrypto/libaes/Makefile 2004-03-22 16:53:16.000000000 -0500
-+++ strongswan-2.8.1/lib/libcrypto/libaes/Makefile 2007-01-17 00:48:52.260789653 -0500
+Index: strongswan-2.8.2/lib/libcrypto/libaes/Makefile
+===================================================================
+--- strongswan-2.8.2.orig/lib/libcrypto/libaes/Makefile 2007-06-04 13:23:04.777007680 +0200
++++ strongswan-2.8.2/lib/libcrypto/libaes/Makefile 2007-06-04 13:23:04.873992936 +0200
@@ -25,10 +25,8 @@
$(BLIB): $(LIBOBJ)
@@ -14,9 +15,10 @@ diff -ruN strongswan-2.8.1-orig/lib/libcrypto/libaes/Makefile strongswan-2.8.1/l
testx: test_main_mac.o $(BLIB)
$(CC) -o $@ $^
-diff -ruN strongswan-2.8.1-orig/lib/libcrypto/libblowfish/Makefile strongswan-2.8.1/lib/libcrypto/libblowfish/Makefile
---- strongswan-2.8.1-orig/lib/libcrypto/libblowfish/Makefile 2004-03-22 16:53:16.000000000 -0500
-+++ strongswan-2.8.1/lib/libcrypto/libblowfish/Makefile 2007-01-17 01:40:41.716879761 -0500
+Index: strongswan-2.8.2/lib/libcrypto/libblowfish/Makefile
+===================================================================
+--- strongswan-2.8.2.orig/lib/libcrypto/libblowfish/Makefile 2007-06-04 13:23:04.783006768 +0200
++++ strongswan-2.8.2/lib/libcrypto/libblowfish/Makefile 2007-06-04 13:23:04.873992936 +0200
@@ -58,7 +58,7 @@
lib: $(LIB)
@@ -26,9 +28,10 @@ diff -ruN strongswan-2.8.1-orig/lib/libcrypto/libblowfish/Makefile strongswan-2.
$(RANLIB) $(LIB)
# elf
-diff -ruN strongswan-2.8.1-orig/lib/libcrypto/libserpent/Makefile strongswan-2.8.1/lib/libcrypto/libserpent/Makefile
---- strongswan-2.8.1-orig/lib/libcrypto/libserpent/Makefile 2004-03-22 16:53:16.000000000 -0500
-+++ strongswan-2.8.1/lib/libcrypto/libserpent/Makefile 2007-01-17 00:50:37.692571031 -0500
+Index: strongswan-2.8.2/lib/libcrypto/libserpent/Makefile
+===================================================================
+--- strongswan-2.8.2.orig/lib/libcrypto/libserpent/Makefile 2007-06-04 13:23:04.790005704 +0200
++++ strongswan-2.8.2/lib/libcrypto/libserpent/Makefile 2007-06-04 13:23:04.873992936 +0200
@@ -8,10 +8,8 @@
$(BLIB): $(LIBOBJ)
@@ -42,9 +45,10 @@ diff -ruN strongswan-2.8.1-orig/lib/libcrypto/libserpent/Makefile strongswan-2.8
test: test_main.o $(BLIB)
$(CC) -o $@ $^
-diff -ruN strongswan-2.8.1-orig/lib/libcrypto/libsha2/Makefile strongswan-2.8.1/lib/libcrypto/libsha2/Makefile
---- strongswan-2.8.1-orig/lib/libcrypto/libsha2/Makefile 2004-03-22 16:53:16.000000000 -0500
-+++ strongswan-2.8.1/lib/libcrypto/libsha2/Makefile 2007-01-17 00:50:46.050791555 -0500
+Index: strongswan-2.8.2/lib/libcrypto/libsha2/Makefile
+===================================================================
+--- strongswan-2.8.2.orig/lib/libcrypto/libsha2/Makefile 2007-06-04 13:23:04.796004792 +0200
++++ strongswan-2.8.2/lib/libcrypto/libsha2/Makefile 2007-06-04 13:23:04.874992784 +0200
@@ -9,10 +9,8 @@
$(BLIB): $(LIBOBJ)
@@ -58,9 +62,10 @@ diff -ruN strongswan-2.8.1-orig/lib/libcrypto/libsha2/Makefile strongswan-2.8.1/
test: test_main.o $(BLIB)
$(CC) -o $@ $^
-diff -ruN strongswan-2.8.1-orig/lib/libcrypto/libtwofish/Makefile strongswan-2.8.1/lib/libcrypto/libtwofish/Makefile
---- strongswan-2.8.1-orig/lib/libcrypto/libtwofish/Makefile 2004-03-22 16:53:17.000000000 -0500
-+++ strongswan-2.8.1/lib/libcrypto/libtwofish/Makefile 2007-01-17 00:50:53.533988997 -0500
+Index: strongswan-2.8.2/lib/libcrypto/libtwofish/Makefile
+===================================================================
+--- strongswan-2.8.2.orig/lib/libcrypto/libtwofish/Makefile 2007-06-04 13:23:04.804003576 +0200
++++ strongswan-2.8.2/lib/libcrypto/libtwofish/Makefile 2007-06-04 13:23:04.874992784 +0200
@@ -9,10 +9,8 @@
$(BLIB): $(LIBOBJ)
diff --git a/package/strongswan/patches/110-make-ipsec.patch b/package/strongswan/patches/110-make-ipsec.patch
index 861def4118818877674225b5568152403f178221..0d2a4e6fb16da9665249e19a545798a8e0b80414 100644
--- a/package/strongswan/patches/110-make-ipsec.patch
+++ b/package/strongswan/patches/110-make-ipsec.patch
@@ -1,6 +1,7 @@
-diff -ruN strongswan-2.8.1-orig/programs/ipsec/Makefile strongswan-2.8.1/programs/ipsec/Makefile
---- strongswan-2.8.1-orig/programs/ipsec/Makefile 2006-02-10 06:27:31.000000000 -0500
-+++ strongswan-2.8.1/programs/ipsec/Makefile 2007-01-17 02:46:06.027124968 -0500
+Index: strongswan-2.8.2/programs/ipsec/Makefile
+===================================================================
+--- strongswan-2.8.2.orig/programs/ipsec/Makefile 2007-06-04 13:23:04.756010872 +0200
++++ strongswan-2.8.2/programs/ipsec/Makefile 2007-06-04 13:23:05.227939128 +0200
@@ -24,5 +24,5 @@
include ../Makefile.program
diff --git a/package/strongswan/patches/120-make-pluto.patch b/package/strongswan/patches/120-make-pluto.patch
index 890863fa0e2a13e2579598724ac769026cb05072..e0dd813bb73b2b490420ce26abf7598bfbe8cad0 100644
--- a/package/strongswan/patches/120-make-pluto.patch
+++ b/package/strongswan/patches/120-make-pluto.patch
@@ -1,6 +1,7 @@
-diff -ruN strongswan-2.8.1-orig/programs/pluto/alg/Makefile strongswan-2.8.1/programs/pluto/alg/Makefile
---- strongswan-2.8.1-orig/programs/pluto/alg/Makefile 2004-06-23 00:45:20.000000000 -0400
-+++ strongswan-2.8.1/programs/pluto/alg/Makefile 2007-01-17 00:19:58.249033414 -0500
+Index: strongswan-2.8.2/programs/pluto/alg/Makefile
+===================================================================
+--- strongswan-2.8.2.orig/programs/pluto/alg/Makefile 2007-06-04 13:23:04.734014216 +0200
++++ strongswan-2.8.2/programs/pluto/alg/Makefile 2007-06-04 13:23:05.416910400 +0200
@@ -20,7 +20,7 @@
include Config.ike_alg
diff --git a/package/strongswan/patches/130-make-starter.patch b/package/strongswan/patches/130-make-starter.patch
index 9250f01081dc52145be93a11823b772ed6306d80..93888ab6b606c4ae9cd4b16e537ad8f60870f2f4 100644
--- a/package/strongswan/patches/130-make-starter.patch
+++ b/package/strongswan/patches/130-make-starter.patch
@@ -1,6 +1,7 @@
-diff -ruN strongswan-2.8.1-orig/programs/starter/Makefile strongswan-2.8.1/programs/starter/Makefile
---- strongswan-2.8.1-orig/programs/starter/Makefile 2006-02-17 14:34:02.000000000 -0500
-+++ strongswan-2.8.1/programs/starter/Makefile 2007-01-17 16:15:30.740490094 -0500
+Index: strongswan-2.8.2/programs/starter/Makefile
+===================================================================
+--- strongswan-2.8.2.orig/programs/starter/Makefile 2007-06-04 13:23:04.711017712 +0200
++++ strongswan-2.8.2/programs/starter/Makefile 2007-06-04 13:23:06.227787128 +0200
@@ -16,7 +16,6 @@
FREESWANSRCDIR?=$(shell cd ../..; pwd)
include ${FREESWANSRCDIR}/Makefile.inc
diff --git a/package/strongswan/patches/200-wakeup-showstatus.patch b/package/strongswan/patches/200-wakeup-showstatus.patch
index 2722282454470083c12dfaba8b2764d21cf37cb6..731f83c2e0ac4f0dd31aa5b84bc46176d53f473b 100644
--- a/package/strongswan/patches/200-wakeup-showstatus.patch
+++ b/package/strongswan/patches/200-wakeup-showstatus.patch
@@ -1,6 +1,7 @@
-diff -ruN strongswan-2.8.2-orig/programs/Makefile strongswan-2.8.2/programs/Makefile
---- strongswan-2.8.2-orig/programs/Makefile 2006-08-28 07:12:36.000000000 -0400
-+++ strongswan-2.8.2/programs/Makefile 2007-02-05 00:27:47.214280563 -0500
+Index: strongswan-2.8.2/programs/Makefile
+===================================================================
+--- strongswan-2.8.2.orig/programs/Makefile 2007-06-04 13:23:04.661025312 +0200
++++ strongswan-2.8.2/programs/Makefile 2007-06-04 13:23:06.414758704 +0200
@@ -22,7 +22,7 @@
SUBDIRS+=_realsetup _secretcensor _startklips _updown _updown_espmark
SUBDIRS+=auto barf ipsec look manual ranbits secrets starter
@@ -10,9 +11,10 @@ diff -ruN strongswan-2.8.2-orig/programs/Makefile strongswan-2.8.2/programs/Make
ifeq ($(USE_LWRES),true)
SUBDIRS+=lwdnsq
-diff -ruN strongswan-2.8.2-orig/programs/_showstatus/Makefile strongswan-2.8.2/programs/_showstatus/Makefile
---- strongswan-2.8.2-orig/programs/_showstatus/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ strongswan-2.8.2/programs/_showstatus/Makefile 2007-02-05 00:31:11.380714322 -0500
+Index: strongswan-2.8.2/programs/_showstatus/Makefile
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ strongswan-2.8.2/programs/_showstatus/Makefile 2007-06-04 13:23:06.414758704 +0200
@@ -0,0 +1,22 @@
+# Makefile for miscelaneous programs
+# Copyright (C) 2002 Michael Richardson <mcr@freeswan.org>
@@ -36,9 +38,10 @@ diff -ruN strongswan-2.8.2-orig/programs/_showstatus/Makefile strongswan-2.8.2/p
+PROGRAMDIR=${LIBDIR}
+
+include ../Makefile.program
-diff -ruN strongswan-2.8.2-orig/programs/_showstatus/_showstatus.8 strongswan-2.8.2/programs/_showstatus/_showstatus.8
---- strongswan-2.8.2-orig/programs/_showstatus/_showstatus.8 1969-12-31 19:00:00.000000000 -0500
-+++ strongswan-2.8.2/programs/_showstatus/_showstatus.8 2007-02-05 00:36:00.650410824 -0500
+Index: strongswan-2.8.2/programs/_showstatus/_showstatus.8
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ strongswan-2.8.2/programs/_showstatus/_showstatus.8 2007-06-04 13:23:06.414758704 +0200
@@ -0,0 +1,23 @@
+.TH _showstatus 8 "03 Feb 2007"
+.\"
@@ -63,9 +66,10 @@ diff -ruN strongswan-2.8.2-orig/programs/_showstatus/_showstatus.8 strongswan-2.
+by Kevin Cody Jr. Original manpage for _updown by Michael Richardson.
+Original program written by Henry Spencer. Extended for the Linux strongSwan
+project <http://www.strongswan.org/> by Andreas Steffen.
-diff -ruN strongswan-2.8.2-orig/programs/_showstatus/_showstatus.in strongswan-2.8.2/programs/_showstatus/_showstatus.in
---- strongswan-2.8.2-orig/programs/_showstatus/_showstatus.in 1969-12-31 19:00:00.000000000 -0500
-+++ strongswan-2.8.2/programs/_showstatus/_showstatus.in 2007-02-05 00:55:56.563116192 -0500
+Index: strongswan-2.8.2/programs/_showstatus/_showstatus.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ strongswan-2.8.2/programs/_showstatus/_showstatus.in 2007-06-04 13:23:06.414758704 +0200
@@ -0,0 +1,70 @@
+#! /bin/sh
+#
@@ -137,9 +141,10 @@ diff -ruN strongswan-2.8.2-orig/programs/_showstatus/_showstatus.in strongswan-2
+ ;;
+esac
+
-diff -ruN strongswan-2.8.2-orig/programs/wakeup/Makefile strongswan-2.8.2/programs/wakeup/Makefile
---- strongswan-2.8.2-orig/programs/wakeup/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ strongswan-2.8.2/programs/wakeup/Makefile 2007-02-05 00:28:03.960726309 -0500
+Index: strongswan-2.8.2/programs/wakeup/Makefile
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ strongswan-2.8.2/programs/wakeup/Makefile 2007-06-04 13:23:06.415758552 +0200
@@ -0,0 +1,22 @@
+# Makefile for miscelaneous programs
+# Copyright (C) 2002 Michael Richardson <mcr@freeswan.org>
@@ -163,9 +168,10 @@ diff -ruN strongswan-2.8.2-orig/programs/wakeup/Makefile strongswan-2.8.2/progra
+PROGRAMDIR=${LIBDIR}
+
+include ../Makefile.program
-diff -ruN strongswan-2.8.2-orig/programs/wakeup/wakeup.8 strongswan-2.8.2/programs/wakeup/wakeup.8
---- strongswan-2.8.2-orig/programs/wakeup/wakeup.8 1969-12-31 19:00:00.000000000 -0500
-+++ strongswan-2.8.2/programs/wakeup/wakeup.8 2007-02-05 00:36:34.029298760 -0500
+Index: strongswan-2.8.2/programs/wakeup/wakeup.8
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ strongswan-2.8.2/programs/wakeup/wakeup.8 2007-06-04 13:23:06.415758552 +0200
@@ -0,0 +1,16 @@
+.TH wakeup 8 "03 Feb 2007"
+.\"
@@ -183,9 +189,10 @@ diff -ruN strongswan-2.8.2-orig/programs/wakeup/wakeup.8 strongswan-2.8.2/progra
+by Kevin Cody Jr. Original manpage for _updown by Michael Richardson.
+Original program written by Henry Spencer. Extended for the Linux strongSwan
+project <http://www.strongswan.org/> by Andreas Steffen.
-diff -ruN strongswan-2.8.2-orig/programs/wakeup/wakeup.in strongswan-2.8.2/programs/wakeup/wakeup.in
---- strongswan-2.8.2-orig/programs/wakeup/wakeup.in 1969-12-31 19:00:00.000000000 -0500
-+++ strongswan-2.8.2/programs/wakeup/wakeup.in 2007-02-05 00:28:03.961726336 -0500
+Index: strongswan-2.8.2/programs/wakeup/wakeup.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ strongswan-2.8.2/programs/wakeup/wakeup.in 2007-06-04 13:23:06.415758552 +0200
@@ -0,0 +1,38 @@
+#! /bin/sh
+# wakeup script
diff --git a/package/strongswan/patches/210-updown.patch b/package/strongswan/patches/210-updown.patch
index 9361f43481d0e07b3305f07ae4b16714b89f36a8..d546625316a6aba4957bfda14a938028adbfda02 100644
--- a/package/strongswan/patches/210-updown.patch
+++ b/package/strongswan/patches/210-updown.patch
@@ -1,6 +1,7 @@
-diff -ruN strongswan-2.8.2-orig/programs/_updown/_updown.8 strongswan-2.8.2/programs/_updown/_updown.8
---- strongswan-2.8.2-orig/programs/_updown/_updown.8 2006-04-17 02:48:49.000000000 -0400
-+++ strongswan-2.8.2/programs/_updown/_updown.8 2007-02-05 02:13:05.252612099 -0500
+Index: strongswan-2.8.2/programs/_updown/_updown.8
+===================================================================
+--- strongswan-2.8.2.orig/programs/_updown/_updown.8 2007-06-04 13:23:04.632029720 +0200
++++ strongswan-2.8.2/programs/_updown/_updown.8 2007-06-04 13:23:06.656721920 +0200
@@ -8,8 +8,23 @@
.I _updown
is invoked by pluto when it has brought up a new connection. This script
@@ -27,9 +28,10 @@ diff -ruN strongswan-2.8.2-orig/programs/_updown/_updown.8 strongswan-2.8.2/prog
.SH "SEE ALSO"
ipsec(8), ipsec_pluto(8).
.SH HISTORY
-diff -ruN strongswan-2.8.2-orig/programs/_updown/_updown.in strongswan-2.8.2/programs/_updown/_updown.in
---- strongswan-2.8.2-orig/programs/_updown/_updown.in 2006-04-17 11:06:29.000000000 -0400
-+++ strongswan-2.8.2/programs/_updown/_updown.in 2007-02-05 02:08:24.969100428 -0500
+Index: strongswan-2.8.2/programs/_updown/_updown.in
+===================================================================
+--- strongswan-2.8.2.orig/programs/_updown/_updown.in 2007-06-04 13:23:04.642028200 +0200
++++ strongswan-2.8.2/programs/_updown/_updown.in 2007-06-04 13:23:06.657721768 +0200
@@ -5,6 +5,7 @@
# Copyright (C) 2003-2004 Tuomo Soini
# Copyright (C) 2002-2004 Michael Richardson
diff --git a/package/strongswan/patches/300-openwrt.patch b/package/strongswan/patches/300-openwrt.patch
index 7386af56abd187ec6135680a6781039ba2414e90..e249a8d613475fb14fddbf5698d5f1ede1c4016f 100644
--- a/package/strongswan/patches/300-openwrt.patch
+++ b/package/strongswan/patches/300-openwrt.patch
@@ -1,6 +1,7 @@
-diff -ruN strongswan-2.8.1-orig/Makefile.inc strongswan-2.8.1/Makefile.inc
---- strongswan-2.8.1-orig/Makefile.inc 2007-01-11 16:42:11.000000000 -0500
-+++ strongswan-2.8.1/Makefile.inc 2007-01-17 02:42:25.961297797 -0500
+Index: strongswan-2.8.2/Makefile.inc
+===================================================================
+--- strongswan-2.8.2.orig/Makefile.inc 2007-06-04 13:23:04.604033976 +0200
++++ strongswan-2.8.2/Makefile.inc 2007-06-04 13:23:06.855691672 +0200
@@ -123,7 +123,7 @@
# With a non-null DESTDIR, INC_RCDEFAULT will be used unless one of the
# INC_RCDIRS directories has been pre-created under DESTDIR.
@@ -10,9 +11,10 @@ diff -ruN strongswan-2.8.1-orig/Makefile.inc strongswan-2.8.1/Makefile.inc
# RCDIR is where boot/shutdown scripts go; FINALRCDIR is where they think
# will finally be (so utils/Makefile can create a symlink in BINDIR to the
-diff -ruN strongswan-2.8.1-orig/programs/showhostkey/showhostkey.in strongswan-2.8.1/programs/showhostkey/showhostkey.in
---- strongswan-2.8.1-orig/programs/showhostkey/showhostkey.in 2004-03-15 15:35:31.000000000 -0500
-+++ strongswan-2.8.1/programs/showhostkey/showhostkey.in 2007-01-17 00:02:35.433150839 -0500
+Index: strongswan-2.8.2/programs/showhostkey/showhostkey.in
+===================================================================
+--- strongswan-2.8.2.orig/programs/showhostkey/showhostkey.in 2007-06-04 13:23:04.612032760 +0200
++++ strongswan-2.8.2/programs/showhostkey/showhostkey.in 2007-06-04 13:23:06.855691672 +0200
@@ -62,7 +62,7 @@
exit 1
fi
diff --git a/package/strongswan/patches/310-make-ipsec-alg.patch b/package/strongswan/patches/310-make-ipsec-alg.patch
index cf4842a93578601d501162ac231d77b07edbf938..d5fad3d3e0314cc1427d36ab070456c429933dda 100644
--- a/package/strongswan/patches/310-make-ipsec-alg.patch
+++ b/package/strongswan/patches/310-make-ipsec-alg.patch
@@ -1,6 +1,7 @@
-diff -ruN strongswan-2.8.1-orig/linux/net/ipsec/alg/Makefile.alg_cryptoapi strongswan-2.8.1/linux/net/ipsec/alg/Makefile.alg_cryptoapi
---- strongswan-2.8.1-orig/linux/net/ipsec/alg/Makefile.alg_cryptoapi 2004-03-22 16:53:19.000000000 -0500
-+++ strongswan-2.8.1/linux/net/ipsec/alg/Makefile.alg_cryptoapi 2007-01-17 02:28:26.835241726 -0500
+Index: strongswan-2.8.2/linux/net/ipsec/alg/Makefile.alg_cryptoapi
+===================================================================
+--- strongswan-2.8.2.orig/linux/net/ipsec/alg/Makefile.alg_cryptoapi 2007-06-04 13:23:04.583037168 +0200
++++ strongswan-2.8.2/linux/net/ipsec/alg/Makefile.alg_cryptoapi 2007-06-04 13:23:07.053661576 +0200
@@ -1,10 +1,10 @@
MOD_CRYPTOAPI := ipsec_cryptoapi.o
diff --git a/package/strongswan/patches/320-no-modprobe.patch b/package/strongswan/patches/320-no-modprobe.patch
index cbd720a6a33f6e44bde7c9845d077a04b2895a41..d8c3648baff422ec406a091b8d536ac1f7991e44 100644
--- a/package/strongswan/patches/320-no-modprobe.patch
+++ b/package/strongswan/patches/320-no-modprobe.patch
@@ -1,6 +1,7 @@
-diff -ruN strongswan-2.8.1-orig/programs/starter/klips.c strongswan-2.8.1/programs/starter/klips.c
---- strongswan-2.8.1-orig/programs/starter/klips.c 2006-02-15 13:33:57.000000000 -0500
-+++ strongswan-2.8.1/programs/starter/klips.c 2007-01-16 23:57:19.107972109 -0500
+Index: strongswan-2.8.2/programs/starter/klips.c
+===================================================================
+--- strongswan-2.8.2.orig/programs/starter/klips.c 2007-06-04 13:23:04.544043096 +0200
++++ strongswan-2.8.2/programs/starter/klips.c 2007-06-04 13:23:07.238633456 +0200
@@ -44,7 +44,7 @@
unsetenv("MODPATH");
unsetenv("MODULECONF");
@@ -27,9 +28,10 @@ diff -ruN strongswan-2.8.1-orig/programs/starter/klips.c strongswan-2.8.1/progra
}
starter_klips_clear();
-diff -ruN strongswan-2.8.1-orig/programs/starter/netkey.c strongswan-2.8.1/programs/starter/netkey.c
---- strongswan-2.8.1-orig/programs/starter/netkey.c 2006-02-15 13:33:57.000000000 -0500
-+++ strongswan-2.8.1/programs/starter/netkey.c 2007-01-16 23:57:28.094204186 -0500
+Index: strongswan-2.8.2/programs/starter/netkey.c
+===================================================================
+--- strongswan-2.8.2.orig/programs/starter/netkey.c 2007-06-04 13:23:04.551042032 +0200
++++ strongswan-2.8.2/programs/starter/netkey.c 2007-06-04 13:23:07.238633456 +0200
@@ -36,7 +36,7 @@
/* af_key module makes the netkey proc interface visible */
if (stat(PROC_MODULES, &stb) == 0)
@@ -56,9 +58,10 @@ diff -ruN strongswan-2.8.1-orig/programs/starter/netkey.c strongswan-2.8.1/progr
}
DBG(DBG_CONTROL,
-diff -ruN strongswan-2.8.1-orig/programs/_startklips/_startklips.in strongswan-2.8.1/programs/_startklips/_startklips.in
---- strongswan-2.8.1-orig/programs/_startklips/_startklips.in 2005-05-06 18:11:33.000000000 -0400
-+++ strongswan-2.8.1/programs/_startklips/_startklips.in 2007-01-17 00:04:11.189627735 -0500
+Index: strongswan-2.8.2/programs/_startklips/_startklips.in
+===================================================================
+--- strongswan-2.8.2.orig/programs/_startklips/_startklips.in 2007-06-04 13:23:04.560040664 +0200
++++ strongswan-2.8.2/programs/_startklips/_startklips.in 2007-06-04 13:23:07.238633456 +0200
@@ -249,7 +249,7 @@
if test ! -f $ipsecversion && test ! -f $netkey
diff --git a/package/strongswan/patches/350-make-programs.patch b/package/strongswan/patches/350-make-programs.patch
index 5c2173b469092b38335eca15d452ef6cb20e55ae..aba957754f8a2b7e94466af5d13e595834ccf755 100644
--- a/package/strongswan/patches/350-make-programs.patch
+++ b/package/strongswan/patches/350-make-programs.patch
@@ -1,6 +1,7 @@
-diff -ruN strongswan-2.8.2-orig/programs/Makefile strongswan-2.8.2/programs/Makefile
---- strongswan-2.8.2-orig/programs/Makefile 2006-08-28 07:12:36.000000000 -0400
-+++ strongswan-2.8.2/programs/Makefile 2007-02-04 01:24:18.751598552 -0500
+Index: strongswan-2.8.2/programs/Makefile
+===================================================================
+--- strongswan-2.8.2.orig/programs/Makefile 2007-06-04 13:23:06.414758704 +0200
++++ strongswan-2.8.2/programs/Makefile 2007-06-04 13:23:07.444602144 +0200
@@ -17,12 +17,10 @@
FREESWANSRCDIR=..
include ${FREESWANSRCDIR}/Makefile.inc
diff --git a/package/udev/patches/001-no_debug.patch b/package/udev/patches/001-no_debug.patch
index 8b3df30bf36d1a95c823e41ab2ccc6601fe68ea7..626181e47840638123b06e13115eb3105d80b6f8 100644
--- a/package/udev/patches/001-no_debug.patch
+++ b/package/udev/patches/001-no_debug.patch
@@ -1,6 +1,7 @@
-diff -Nur udev-103-old/Makefile udev-103-new/Makefile
---- udev-103-old/Makefile 2006-10-20 14:43:35.000000000 +0200
-+++ udev-103-new/Makefile 2006-11-24 15:44:35.000000000 +0100
+Index: udev-106/Makefile
+===================================================================
+--- udev-106.orig/Makefile 2007-06-04 13:22:17.765154568 +0200
++++ udev-106/Makefile 2007-06-04 13:22:17.831144536 +0200
@@ -113,7 +113,7 @@
AR = $(CROSS_COMPILE)ar
RANLIB = $(CROSS_COMPILE)ranlib
diff --git a/package/udev/patches/002-udevtrigger_no_config.patch b/package/udev/patches/002-udevtrigger_no_config.patch
index e9c22d4c0b1a386bb5deda87321cd292f358ca6a..db68ebf760edb1d9b4348a254a960e99b52b8aa7 100644
--- a/package/udev/patches/002-udevtrigger_no_config.patch
+++ b/package/udev/patches/002-udevtrigger_no_config.patch
@@ -1,5 +1,7 @@
---- udev.old/udevtrigger.c 2007-03-03 18:42:09.000000000 +0100
-+++ udev.dev/udevtrigger.c 2007-03-04 21:15:18.459211632 +0100
+Index: udev-106/udevtrigger.c
+===================================================================
+--- udev-106.orig/udevtrigger.c 2007-06-04 13:22:17.745157608 +0200
++++ udev-106/udevtrigger.c 2007-06-04 13:22:18.022115504 +0200
@@ -446,7 +446,6 @@
};
diff --git a/package/udev/patches/003-portability.patch b/package/udev/patches/003-portability.patch
index 0744f5c259c2c3579a5fb14954635dc43d8a6c83..f11f969bbc3f3bfb363aa3fe68df7f8f168568a0 100644
--- a/package/udev/patches/003-portability.patch
+++ b/package/udev/patches/003-portability.patch
@@ -1,6 +1,7 @@
-diff -ur udev.old/Makefile udev.dev/Makefile
---- udev.old/Makefile 2007-04-29 03:20:27.056490320 +0200
-+++ udev.dev/Makefile 2007-04-29 03:26:32.693904984 +0200
+Index: udev-106/Makefile
+===================================================================
+--- udev-106.orig/Makefile 2007-06-04 13:22:17.831144536 +0200
++++ udev-106/Makefile 2007-06-04 13:22:18.210086928 +0200
@@ -246,13 +246,15 @@
.PHONY: install-config
diff --git a/package/util-linux/patches/100-llseek.patch b/package/util-linux/patches/100-llseek.patch
index 51bd09d6ea23ae2c6efa841b1ff064af61ed2e9c..265aa182cd5d1c1972446d0fc9eee53f035b1ce4 100644
--- a/package/util-linux/patches/100-llseek.patch
+++ b/package/util-linux/patches/100-llseek.patch
@@ -1,7 +1,8 @@
-diff -ur util-linux.old/fdisk/llseek.c util-linux.dev/fdisk/llseek.c
---- util-linux.old/fdisk/llseek.c 2003-07-13 23:13:33.000000000 +0200
-+++ util-linux.dev/fdisk/llseek.c 2006-12-14 23:06:12.000000000 +0100
-@@ -29,13 +29,7 @@
+Index: util-linux-2.12r/fdisk/llseek.c
+===================================================================
+--- util-linux-2.12r.orig/fdisk/llseek.c 2007-06-04 13:22:28.258559328 +0200
++++ util-linux-2.12r/fdisk/llseek.c 2007-06-04 13:22:28.339547016 +0200
+@@ -29,16 +29,10 @@
static int _llseek (unsigned int, unsigned long,
unsigned long, long long *, unsigned int);
@@ -14,50 +15,13 @@ diff -ur util-linux.old/fdisk/llseek.c util-linux.dev/fdisk/llseek.c
-#else
+#ifndef __NR__llseek
- /* no __NR__llseek on compilation machine - might give it explicitly */
- static int _llseek (unsigned int fd, unsigned long oh,
-diff -ur util-linux.old/fdisk/sfdisk.c util-linux.dev/fdisk/sfdisk.c
---- util-linux.old/fdisk/sfdisk.c 2005-01-04 23:31:57.000000000 +0100
-+++ util-linux.dev/fdisk/sfdisk.c 2006-12-14 23:05:41.000000000 +0100
-@@ -176,12 +176,6 @@
- #define use_lseek
- #endif
-
--#ifndef use_lseek
--static __attribute__used
--_syscall5(int, _llseek, unsigned int, fd, ulong, hi, ulong, lo,
-- loff_t *, res, unsigned int, wh);
--#endif
--
- static int
- sseek(char *dev, unsigned int fd, unsigned long s) {
- loff_t in, out;
-diff -ur util-linux.old/partx/partx.c util-linux.dev/partx/partx.c
---- util-linux.old/partx/partx.c 2004-08-23 22:13:27.000000000 +0200
-+++ util-linux.dev/partx/partx.c 2006-12-14 23:06:42.000000000 +0100
-@@ -339,9 +339,6 @@
-
- #ifdef NEED__llseek
- #include <linux/unistd.h> /* _syscall */
--static
--_syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo,
-- long long *, res, uint, wh);
- #endif
-
- static int
-diff -ur util-linux.old/fdisk/llseek.c util-linux.dev/fdisk/llseek.c
---- util-linux.old/fdisk/llseek.c 2007-01-20 15:53:17.870636000 +0100
-+++ util-linux.dev/fdisk/llseek.c 2007-01-20 15:55:33.458024160 +0100
-@@ -32,7 +32,7 @@
- #ifndef __NR__llseek
-
/* no __NR__llseek on compilation machine - might give it explicitly */
-static int _llseek (unsigned int fd, unsigned long oh,
+static int __llseek (unsigned int fd, unsigned long oh,
unsigned long ol, long long *result,
unsigned int origin) {
errno = ENOSYS;
-@@ -41,17 +41,8 @@
+@@ -47,17 +41,8 @@
#endif
@@ -77,3 +41,34 @@ diff -ur util-linux.old/fdisk/llseek.c util-linux.dev/fdisk/llseek.c
#endif /* __alpha__ */
+Index: util-linux-2.12r/fdisk/sfdisk.c
+===================================================================
+--- util-linux-2.12r.orig/fdisk/sfdisk.c 2007-06-04 13:22:28.265558264 +0200
++++ util-linux-2.12r/fdisk/sfdisk.c 2007-06-04 13:22:28.338547168 +0200
+@@ -176,12 +176,6 @@
+ #define use_lseek
+ #endif
+
+-#ifndef use_lseek
+-static __attribute__used
+-_syscall5(int, _llseek, unsigned int, fd, ulong, hi, ulong, lo,
+- loff_t *, res, unsigned int, wh);
+-#endif
+-
+ static int
+ sseek(char *dev, unsigned int fd, unsigned long s) {
+ loff_t in, out;
+Index: util-linux-2.12r/partx/partx.c
+===================================================================
+--- util-linux-2.12r.orig/partx/partx.c 2007-06-04 13:22:28.272557200 +0200
++++ util-linux-2.12r/partx/partx.c 2007-06-04 13:22:28.339547016 +0200
+@@ -339,9 +339,6 @@
+
+ #ifdef NEED__llseek
+ #include <linux/unistd.h> /* _syscall */
+-static
+-_syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo,
+- long long *, res, uint, wh);
+ #endif
+
+ static int
diff --git a/package/util-linux/patches/501-mconfig.patch b/package/util-linux/patches/501-mconfig.patch
index 67e6530de9e6f001d931ecb3bdccf5180576b402..867352d771a1c03fd960164631ea39196c54529b 100644
--- a/package/util-linux/patches/501-mconfig.patch
+++ b/package/util-linux/patches/501-mconfig.patch
@@ -1,5 +1,7 @@
---- util-linux-2.12r-orig/MCONFIG 2004-12-13 00:15:48.000000000 +0100
-+++ util-linux-2.12r/MCONFIG 2005-10-03 17:54:15.945049312 +0200
+Index: util-linux-2.12r/MCONFIG
+===================================================================
+--- util-linux-2.12r.orig/MCONFIG 2007-06-04 13:22:28.239562216 +0200
++++ util-linux-2.12r/MCONFIG 2007-06-04 13:22:28.549515096 +0200
@@ -16,8 +16,8 @@
# Select for ARCH one of intel, alpha, sparc, arm, m68k, mips
# Select for CPU i386 if the binaries must be able to run on an intel 386
diff --git a/package/util-linux/patches/601-util-linux-2.12r-umount-no-special.patch b/package/util-linux/patches/601-util-linux-2.12r-umount-no-special.patch
index d79598fc84566a7020235ba7e22bd3dbc3588614..114c18fe169af3c10a5e41ea19f8df4c79fcfb4f 100644
--- a/package/util-linux/patches/601-util-linux-2.12r-umount-no-special.patch
+++ b/package/util-linux/patches/601-util-linux-2.12r-umount-no-special.patch
@@ -1,5 +1,7 @@
---- util-linux-2.12r.old/mount/umount.c
-+++ util-linux-2.12r/mount/umount.c
+Index: util-linux-2.12r/mount/umount.c
+===================================================================
+--- util-linux-2.12r.orig/mount/umount.c 2007-06-04 13:22:28.218565408 +0200
++++ util-linux-2.12r/mount/umount.c 2007-06-04 13:22:28.736486672 +0200
@@ -31,7 +31,7 @@
#include <arpa/inet.h>
#endif
diff --git a/package/wireless-tools/patches/001-debian.patch b/package/wireless-tools/patches/001-debian.patch
index ba8755b705c8f29e08846759ab6a5cd8b14ba853..1d9c78eb2ddbce7cb4d02058124fea5b173a9a27 100644
--- a/package/wireless-tools/patches/001-debian.patch
+++ b/package/wireless-tools/patches/001-debian.patch
@@ -1,6 +1,8 @@
---- wireless-tools-27.orig/iwlib.c
-+++ wireless-tools-27/iwlib.c
-@@ -622,6 +622,7 @@
+Index: wireless_tools.29/iwlib.c
+===================================================================
+--- wireless_tools.29.orig/iwlib.c 2007-06-04 13:22:18.700012448 +0200
++++ wireless_tools.29/iwlib.c 2007-06-04 13:22:18.773001352 +0200
+@@ -667,6 +667,7 @@
{
struct iwreq wrq;
@@ -8,9 +10,11 @@
memset((char *) info, 0, sizeof(struct wireless_config));
/* Get wireless name */
---- wireless-tools-27.orig/Makefile
-+++ wireless-tools-27/Makefile
-@@ -64,8 +64,8 @@
+Index: wireless_tools.29/Makefile
+===================================================================
+--- wireless_tools.29.orig/Makefile 2007-06-04 13:22:18.707011384 +0200
++++ wireless_tools.29/Makefile 2007-06-04 13:22:18.774001200 +0200
+@@ -73,8 +73,8 @@
# Install directories
INSTALL_DIR= $(PREFIX)/sbin/
INSTALL_LIB= $(PREFIX)/lib/
@@ -21,7 +25,7 @@
# Various commands
RM = rm -f
-@@ -81,9 +81,9 @@
+@@ -102,9 +102,9 @@
endif
# Other flags
@@ -31,5 +35,5 @@
-#CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I.
+CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I.
DEPFLAGS=-MMD
- XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG)
+ XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG) $(WEDEF_FLAG)
PICFLAG=-fPIC
diff --git a/package/yamonenv/patches/001-yamonenv_mtd_partition.patch b/package/yamonenv/patches/001-yamonenv_mtd_partition.patch
index 8a7145908428f51266d54aeb380b15d29628a35d..59a126a2ad1ca7db87992c4021e724ca10d2343b 100644
--- a/package/yamonenv/patches/001-yamonenv_mtd_partition.patch
+++ b/package/yamonenv/patches/001-yamonenv_mtd_partition.patch
@@ -1,6 +1,7 @@
-diff -urN yamonenv/src/yamonenv.c yamonenv.new/src/yamonenv.c
---- yamonenv/src/yamonenv.c 2005-10-21 15:40:11.000000000 +0200
-+++ yamonenv.new/src/yamonenv.c 2007-04-08 22:17:44.000000000 +0200
+Index: yamonenv/src/yamonenv.c
+===================================================================
+--- yamonenv.orig/src/yamonenv.c 2007-06-04 13:24:02.640211136 +0200
++++ yamonenv/src/yamonenv.c 2007-06-04 13:24:02.710200496 +0200
@@ -12,7 +12,7 @@
#include <fcntl.h>
#include <unistd.h>
diff --git a/package/zlib/patches/100-cross_compile.patch b/package/zlib/patches/100-cross_compile.patch
index b95ccf3f5af011788410461f9030386b018a4e17..5c82f1694cbf438174a3d96e2c86a729d65b2440 100644
--- a/package/zlib/patches/100-cross_compile.patch
+++ b/package/zlib/patches/100-cross_compile.patch
@@ -1,6 +1,7 @@
-diff -ruN zlib-1.2.3-orig/Makefile.in zlib-1.2.3-2/Makefile.in
---- zlib-1.2.3-orig/Makefile.in 2005-07-18 10:25:21.000000000 +0800
-+++ zlib-1.2.3-2/Makefile.in 2006-10-16 21:23:27.000000000 +0800
+Index: zlib-1.2.3/Makefile.in
+===================================================================
+--- zlib-1.2.3.orig/Makefile.in 2007-06-04 13:24:03.760040896 +0200
++++ zlib-1.2.3/Makefile.in 2007-06-04 13:24:03.839028888 +0200
@@ -25,20 +25,23 @@
# -Wstrict-prototypes -Wmissing-prototypes
@@ -87,9 +88,10 @@ diff -ruN zlib-1.2.3-orig/Makefile.in zlib-1.2.3-2/Makefile.in
# The ranlib in install is needed on NeXTSTEP which checks file times
# ldconfig is for Linux
-diff -ruN zlib-1.2.3-orig/configure zlib-1.2.3-2/configure
---- zlib-1.2.3-orig/configure 2005-07-12 04:11:57.000000000 +0800
-+++ zlib-1.2.3-2/configure 2006-10-16 21:25:38.000000000 +0800
+Index: zlib-1.2.3/configure
+===================================================================
+--- zlib-1.2.3.orig/configure 2007-06-04 13:24:03.765040136 +0200
++++ zlib-1.2.3/configure 2007-06-04 13:24:03.839028888 +0200
@@ -23,7 +23,7 @@
VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
@@ -202,9 +204,10 @@ diff -ruN zlib-1.2.3-orig/configure zlib-1.2.3-2/configure
+/^mandir *=/s%=.*%= $mandir%
+/^LDFLAGS *=/s%=.*%= $LDFLAGS%
" > Makefile
-diff -ruN zlib-1.2.3-orig/contrib/minizip/Makefile zlib-1.2.3-2/contrib/minizip/Makefile
---- zlib-1.2.3-orig/contrib/minizip/Makefile 2005-07-13 02:08:40.000000000 +0800
-+++ zlib-1.2.3-2/contrib/minizip/Makefile 2006-10-16 21:23:27.000000000 +0800
+Index: zlib-1.2.3/contrib/minizip/Makefile
+===================================================================
+--- zlib-1.2.3.orig/contrib/minizip/Makefile 2007-06-04 13:24:03.773038920 +0200
++++ zlib-1.2.3/contrib/minizip/Makefile 2007-06-04 13:24:03.839028888 +0200
@@ -1,8 +1,8 @@
CC=cc
-CFLAGS=-O -I../..