1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-04 22:50:39 +02:00

refresh all package patches in the buildroot using quilt

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7490 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-06-04 11:25:53 +00:00
parent cca016f893
commit b5cb1795de
184 changed files with 3022 additions and 2289 deletions

View File

@ -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);

View File

@ -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

View File

@ -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
*/

View File

@ -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 */

View File

@ -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

View File

@ -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

View File

@ -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>

View File

@ -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); */

View File

@ -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>

View File

@ -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.
*/

View File

@ -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

View File

@ -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@

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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:

View File

@ -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;

View File

@ -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)
{

View File

@ -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;

View File

@ -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>

View File

@ -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;
}

View File

@ -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));

View File

@ -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>

View File

@ -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,

View File

@ -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)

View File

@ -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>

View File

@ -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"
*/

View File

@ -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

View File

@ -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)) {

View File

@ -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;

View File

@ -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[] = '

View File

@ -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;

File diff suppressed because it is too large Load Diff

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 */

View File

@ -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

View File

@ -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;

View File

@ -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;
}

View File

@ -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) {

View File

@ -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;

View File

@ -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

View File

@ -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. */

View File

@ -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_

View File

@ -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
+ && !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
- /* And if we can't receive any more data from them either, close up */
+ /* And if we can't receive any more data from them either, close up (server only) */
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);

View File

@ -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.
*/

View File

@ -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

View File

@ -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)

View File

@ -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; \

View File

@ -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);
}

View File

@ -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;

View File

@ -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)

View File

@ -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>

View File

@ -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;

View File

@ -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>

View File

@ -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

View File

@ -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:

View File

@ -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) {

View File

@ -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>

View File

@ -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

View File

@ -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)

View File

@ -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"

View File

@ -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>

View File

@ -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>

View File

@ -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

View File

@ -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

View File

@ -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(" ");
}

View File

@ -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);
+}

View File

@ -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>

View File

@ -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";

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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;

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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@

View File

@ -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)

View File

@ -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]?)

View File

@ -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@

File diff suppressed because it is too large Load Diff

View File

@ -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 */

View File

@ -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

View File

@ -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@

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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;

View File

@ -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;

View File

@ -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);

View File

@ -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);

View File

@ -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;

View File

@ -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 */
}

View File

@ -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;

View File

@ -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);
}

View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More