refresh all package patches in the buildroot using quilt

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7490 3c298f89-4303-0410-b956-a3cf2f4a3e73

24 files changed, 367 insertions, 298 deletions

diff --git a/package/ppp/patches/010-use_target_for_configure.patch b/package/ppp/patches/010-use_target_for_configure.patch
index 56439a6122..dc4419696f 100644
--- a/package/ppp/patches/010-use_target_for_configure.patch
+++ b/package/ppp/patches/010-use_target_for_configure.patch
@@ -2,9 +2,11 @@
 	Use values exported from $(TOPDIR)/rules.mk for determining
 	the target system instead of the host configuration
 
---- ppp-2.4.3/configure.orig	Sat Nov  6 11:36:32 2004
-+++ ppp-2.4.3/configure	Sun Jun 18 23:40:46 2006
-@@ -8,9 +8,9 @@ SYSCONF=/etc
+Index: ppp-2.4.3/configure
+===================================================================
+--- ppp-2.4.3.orig/configure	2007-06-04 13:22:08.549555552 +0200
++++ ppp-2.4.3/configure	2007-06-04 13:22:08.618545064 +0200
+@@ -8,9 +8,9 @@
  #  if [ -d /NextApps ]; then
  #    system="NeXTStep"
  #  else
@@ -17,4 +19,3 @@
  #  fi
  state="unknown"
  
-
diff --git a/package/ppp/patches/100-debian_close_dev_ppp.patch b/package/ppp/patches/100-debian_close_dev_ppp.patch
index 4e50118e87..4091c60b37 100644
--- a/package/ppp/patches/100-debian_close_dev_ppp.patch
+++ b/package/ppp/patches/100-debian_close_dev_ppp.patch
@@ -15,10 +15,11 @@ The problem also occurs with the upstream version, but does not occur
 when a pty/tty device is used for the ppp connection.
 
 
-diff -u -r ppp-2.4.3/pppd/sys-linux.c ppp-2.4.3/pppd/sys-linux.c
---- ppp-2.4.3/pppd/sys-linux.c	2005-04-29 20:08:37.000000000 +0200
-+++ ppp-2.4.3/pppd/sys-linux.c	2005-04-29 20:07:03.000000000 +0200
-@@ -455,6 +455,13 @@
+Index: ppp-2.4.3/pppd/sys-linux.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/sys-linux.c	2007-06-04 13:22:08.527558896 +0200
++++ ppp-2.4.3/pppd/sys-linux.c	2007-06-04 13:22:08.807516336 +0200
+@@ -453,6 +453,13 @@
      if (new_style_driver) {
  	int flags;
  
diff --git a/package/ppp/patches/101-debian_ip-up_option.patch b/package/ppp/patches/101-debian_ip-up_option.patch
index 6033fda247..2461f123f7 100644
--- a/package/ppp/patches/101-debian_ip-up_option.patch
+++ b/package/ppp/patches/101-debian_ip-up_option.patch
@@ -1,7 +1,8 @@
-diff -ruNp ppp-2.4.3.orig/pppd/ipcp.c ppp-2.4.3/pppd/ipcp.c
---- ppp-2.4.3.orig/pppd/ipcp.c	2004-11-13 13:03:26.000000000 +0100
-+++ ppp-2.4.3/pppd/ipcp.c	2005-02-20 18:45:22.241810136 +0100
-@@ -1846,7 +1846,7 @@ ipcp_up(f)
+Index: ppp-2.4.3/pppd/ipcp.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/ipcp.c	2007-06-04 13:22:08.478566344 +0200
++++ ppp-2.4.3/pppd/ipcp.c	2007-06-04 13:22:09.003486544 +0200
+@@ -1846,7 +1846,7 @@
       */
      if (ipcp_script_state == s_down && ipcp_script_pid == 0) {
  	ipcp_script_state = s_up;
@@ -10,7 +11,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/ipcp.c ppp-2.4.3/pppd/ipcp.c
      }
  }
  
-@@ -1896,7 +1896,7 @@ ipcp_down(f)
+@@ -1896,7 +1896,7 @@
      /* Execute the ip-down script */
      if (ipcp_script_state == s_up && ipcp_script_pid == 0) {
  	ipcp_script_state = s_down;
@@ -19,7 +20,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/ipcp.c ppp-2.4.3/pppd/ipcp.c
      }
  }
  
-@@ -1950,13 +1950,13 @@ ipcp_script_done(arg)
+@@ -1950,13 +1950,13 @@
      case s_up:
  	if (ipcp_fsm[0].state != OPENED) {
  	    ipcp_script_state = s_down;
@@ -35,10 +36,11 @@ diff -ruNp ppp-2.4.3.orig/pppd/ipcp.c ppp-2.4.3/pppd/ipcp.c
  	}
  	break;
      }
-diff -ruNp ppp-2.4.3.orig/pppd/main.c ppp-2.4.3/pppd/main.c
---- ppp-2.4.3.orig/pppd/main.c	2005-02-20 18:46:14.409879384 +0100
-+++ ppp-2.4.3/pppd/main.c	2005-02-20 18:45:22.243809832 +0100
-@@ -314,6 +314,9 @@ main(argc, argv)
+Index: ppp-2.4.3/pppd/main.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/main.c	2007-06-04 13:22:08.487564976 +0200
++++ ppp-2.4.3/pppd/main.c	2007-06-04 13:22:09.004486392 +0200
+@@ -314,6 +314,9 @@
      struct protent *protp;
      char numbuf[16];
  
@@ -48,10 +50,11 @@ diff -ruNp ppp-2.4.3.orig/pppd/main.c ppp-2.4.3/pppd/main.c
      link_stats_valid = 0;
      new_phase(PHASE_INITIALIZE);
  
-diff -ruNp ppp-2.4.3.orig/pppd/options.c ppp-2.4.3/pppd/options.c
---- ppp-2.4.3.orig/pppd/options.c	2005-02-20 18:46:14.410879232 +0100
-+++ ppp-2.4.3/pppd/options.c	2005-02-20 18:46:02.154742448 +0100
-@@ -108,6 +108,8 @@ char	linkname[MAXPATHLEN];	/* logical na
+Index: ppp-2.4.3/pppd/options.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/options.c	2007-06-04 13:22:08.495563760 +0200
++++ ppp-2.4.3/pppd/options.c	2007-06-04 13:22:09.005486240 +0200
+@@ -108,6 +108,8 @@
  bool	tune_kernel;		/* may alter kernel settings */
  int	connect_delay = 1000;	/* wait this many ms after connect script */
  int	req_unit = -1;		/* requested interface unit */
@@ -60,7 +63,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/options.c ppp-2.4.3/pppd/options.c
  bool	multilink = 0;		/* Enable multilink operation */
  char	*bundle_name = NULL;	/* bundle name for multilink */
  bool	dump_options;		/* print out option values */
-@@ -276,6 +278,13 @@ option_t general_options[] = {
+@@ -276,6 +278,13 @@
        "Number of seconds to wait for child processes at exit",
        OPT_PRIO },
  
@@ -74,10 +77,11 @@ diff -ruNp ppp-2.4.3.orig/pppd/options.c ppp-2.4.3/pppd/options.c
  #ifdef HAVE_MULTILINK
      { "multilink", o_bool, &multilink,
        "Enable multilink operation", OPT_PRIO | 1 },
-diff -ruNp ppp-2.4.3.orig/pppd/pppd.h ppp-2.4.3/pppd/pppd.h
---- ppp-2.4.3.orig/pppd/pppd.h	2005-02-20 18:46:14.414878624 +0100
-+++ ppp-2.4.3/pppd/pppd.h	2005-02-20 18:45:22.247809224 +0100
-@@ -312,6 +312,8 @@ extern bool	tune_kernel;	/* May alter ke
+Index: ppp-2.4.3/pppd/pppd.h
+===================================================================
+--- ppp-2.4.3.orig/pppd/pppd.h	2007-06-04 13:22:08.505562240 +0200
++++ ppp-2.4.3/pppd/pppd.h	2007-06-04 13:22:09.005486240 +0200
+@@ -312,6 +312,8 @@
  extern int	connect_delay;	/* Time to delay after connect script */
  extern int	max_data_rate;	/* max bytes/sec through charshunt */
  extern int	req_unit;	/* interface unit number to use */
diff --git a/package/ppp/patches/102-debian_pppoe_multicast_pado.patch b/package/ppp/patches/102-debian_pppoe_multicast_pado.patch
index ea5275c461..3a92005903 100644
--- a/package/ppp/patches/102-debian_pppoe_multicast_pado.patch
+++ b/package/ppp/patches/102-debian_pppoe_multicast_pado.patch
@@ -1,7 +1,8 @@
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c	2004-11-04 11:07:37.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c	2005-02-24 21:00:11.586697752 +0100
-@@ -365,8 +365,8 @@ waitForPADO(PPPoEConnection *conn, int t
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c	2007-06-04 13:22:08.458569384 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c	2007-06-04 13:22:09.225452800 +0200
+@@ -365,8 +365,8 @@
  	if (!packetIsForMe(conn, &packet)) continue;
  
  	if (packet.code == CODE_PADO) {
diff --git a/package/ppp/patches/103-debian_pppoe_cleanup.patch b/package/ppp/patches/103-debian_pppoe_cleanup.patch
index 8a97a0b2e5..81fa7e9513 100644
--- a/package/ppp/patches/103-debian_pppoe_cleanup.patch
+++ b/package/ppp/patches/103-debian_pppoe_cleanup.patch
@@ -1,7 +1,8 @@
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/rp-pppoe/common.c
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c	2004-02-02 04:36:46.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/common.c	2005-03-11 02:09:19.000000000 +0100
-@@ -18,10 +18,6 @@ static char const RCSID[] =
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/common.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c	2007-06-04 13:22:08.391579568 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/common.c	2007-06-04 13:22:09.414424072 +0200
+@@ -18,10 +18,6 @@
  
  #include "pppoe.h"
  
@@ -12,7 +13,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
  #include <string.h>
  #include <errno.h>
  #include <stdlib.h>
-@@ -50,17 +46,17 @@ parsePacket(PPPoEPacket *packet, ParseFu
+@@ -50,17 +46,17 @@
      UINT16_t tagType, tagLen;
  
      if (packet->ver != 1) {
@@ -33,7 +34,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
  	return -1;
      }
  
-@@ -76,7 +72,7 @@ parsePacket(PPPoEPacket *packet, ParseFu
+@@ -76,7 +72,7 @@
  	    return 0;
  	}
  	if ((curTag - packet->payload) + tagLen + TAG_HDR_SIZE > len) {
@@ -42,7 +43,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
  	    return -1;
  	}
  	func(tagType, tagLen, curTag+TAG_HDR_SIZE, extra);
-@@ -105,17 +101,17 @@ findTag(PPPoEPacket *packet, UINT16_t ty
+@@ -105,17 +101,17 @@
      UINT16_t tagType, tagLen;
  
      if (packet->ver != 1) {
@@ -63,7 +64,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
  	return NULL;
      }
  
-@@ -131,7 +127,7 @@ findTag(PPPoEPacket *packet, UINT16_t ty
+@@ -131,7 +127,7 @@
  	    return NULL;
  	}
  	if ((curTag - packet->payload) + tagLen + TAG_HDR_SIZE > len) {
@@ -72,7 +73,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
  	    return NULL;
  	}
  	if (tagType == type) {
-@@ -143,6 +139,7 @@ findTag(PPPoEPacket *packet, UINT16_t ty
+@@ -143,6 +139,7 @@
      return NULL;
  }
  
@@ -80,7 +81,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
  /**********************************************************************
  *%FUNCTION: printErr
  *%ARGUMENTS:
-@@ -158,6 +155,7 @@ printErr(char const *str)
+@@ -158,6 +155,7 @@
      fprintf(stderr, "pppoe: %s\n", str);
      syslog(LOG_ERR, "%s", str);
  }
@@ -88,7 +89,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
  
  
  /**********************************************************************
-@@ -172,7 +170,7 @@ strDup(char const *str)
+@@ -172,7 +170,7 @@
  {
      char *copy = malloc(strlen(str)+1);
      if (!copy) {
@@ -97,7 +98,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
      }
      strcpy(copy, str);
      return copy;
-@@ -467,9 +465,10 @@ sendPADT(PPPoEConnection *conn, char con
+@@ -467,9 +465,10 @@
  	fprintf(conn->debugFile, "\n");
  	fflush(conn->debugFile);
      }
@@ -109,16 +110,17 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/common.c ppp-2.4.3/pppd/plugins/
  /**********************************************************************
  *%FUNCTION: parseLogErrs
  *%ARGUMENTS:
-@@ -501,4 +500,5 @@ parseLogErrs(UINT16_t type, UINT16_t len
+@@ -501,4 +500,5 @@
  	break;
      }
  }
 +#endif
  
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c	2005-03-11 02:12:52.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c	2005-03-10 12:24:19.000000000 +0100
-@@ -13,10 +13,6 @@ static char const RCSID[] =
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c	2007-06-04 13:22:09.225452800 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c	2007-06-04 13:22:09.414424072 +0200
+@@ -13,10 +13,6 @@
  
  #include "pppoe.h"
  
@@ -129,7 +131,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
  #include <string.h>
  #include <stdlib.h>
  #include <errno.h>
-@@ -167,24 +163,21 @@ parsePADOTags(UINT16_t type, UINT16_t le
+@@ -167,24 +163,21 @@
  	if (conn->printACNames) {
  	    printf("Got a Service-Name-Error tag: %.*s\n", (int) len, data);
  	} else {
@@ -157,7 +159,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
  	}
  	break;
      }
-@@ -209,20 +202,14 @@ parsePADSTags(UINT16_t type, UINT16_t le
+@@ -209,20 +202,14 @@
      PPPoEConnection *conn = (PPPoEConnection *) extra;
      switch(type) {
      case TAG_SERVICE_NAME:
@@ -182,7 +184,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
      case TAG_RELAY_SESSION_ID:
  	conn->relayId.type = htons(type);
  	conn->relayId.length = htons(len);
-@@ -336,7 +323,7 @@ waitForPADO(PPPoEConnection *conn, int t
+@@ -336,7 +323,7 @@
  		if (r >= 0 || errno != EINTR) break;
  	    }
  	    if (r < 0) {
@@ -191,7 +193,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
  	    }
  	    if (r == 0) return;        /* Timed out */
  	}
-@@ -346,8 +333,7 @@ waitForPADO(PPPoEConnection *conn, int t
+@@ -346,8 +333,7 @@
  
  	/* Check length */
  	if (ntohs(packet.length) + HDR_SIZE > len) {
@@ -201,7 +203,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
  	    continue;
  	}
  
-@@ -366,16 +352,16 @@ waitForPADO(PPPoEConnection *conn, int t
+@@ -366,16 +352,16 @@
  
  	if (packet.code == CODE_PADO) {
  	    if (BROADCAST(packet.ethHdr.h_source)) {
@@ -221,7 +223,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
  		continue;
  	    }
  	    conn->numPADOs++;
-@@ -513,7 +499,7 @@ waitForPADS(PPPoEConnection *conn, int t
+@@ -513,7 +499,7 @@
  		if (r >= 0 || errno != EINTR) break;
  	    }
  	    if (r < 0) {
@@ -230,7 +232,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
  	    }
  	    if (r == 0) return;
  	}
-@@ -523,8 +509,7 @@ waitForPADS(PPPoEConnection *conn, int t
+@@ -523,8 +509,7 @@
  
  	/* Check length */
  	if (ntohs(packet.length) + HDR_SIZE > len) {
@@ -240,7 +242,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
  	    continue;
  	}
  
-@@ -556,11 +541,12 @@ waitForPADS(PPPoEConnection *conn, int t
+@@ -556,11 +541,12 @@
      /* Don't bother with ntohs; we'll just end up converting it back... */
      conn->session = packet.session;
  
@@ -255,7 +257,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
      }
  }
  
-@@ -620,7 +606,7 @@ discovery(PPPoEConnection *conn)
+@@ -620,7 +606,7 @@
  
      /* If we're only printing access concentrator names, we're done */
      if (conn->printACNames) {
@@ -264,10 +266,11 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.3/pppd/plugi
      }
  
      timeout = PADI_TIMEOUT;
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-pppoe/if.c
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c	2001-12-14 03:55:20.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/if.c	2005-03-10 13:32:43.000000000 +0100
-@@ -40,10 +40,6 @@ static char const RCSID[] =
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/if.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c	2007-06-04 13:22:08.402577896 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/if.c	2007-06-04 13:22:09.416423768 +0200
+@@ -40,10 +40,6 @@
  #include <sys/ioctl.h>
  #endif
  
@@ -278,7 +281,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
  #include <errno.h>
  #include <stdlib.h>
  #include <string.h>
-@@ -127,7 +123,7 @@ etherType(PPPoEPacket *packet)
+@@ -127,7 +123,7 @@
  {
      UINT16_t type = (UINT16_t) ntohs(packet->ethHdr.h_proto);
      if (type != Eth_PPPOE_Discovery && type != Eth_PPPOE_Session) {
@@ -287,7 +290,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
      }
      return type;
  }
-@@ -156,7 +152,7 @@ getHWaddr(int sock, char const *ifname, 
+@@ -156,7 +152,7 @@
      ifc.ifc_len = sizeof(inbuf);
      ifc.ifc_buf = inbuf;
      if (ioctl(sock, SIOCGIFCONF, &ifc) < 0) {
@@ -296,7 +299,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
      }
      ifr = ifc.ifc_req;
      ifreq.ifr_name[0] = '\0';
-@@ -172,9 +168,7 @@ getHWaddr(int sock, char const *ifname, 
+@@ -172,9 +168,7 @@
  	        (sdl->sdl_alen == ETH_ALEN) &&
  		!strncmp(ifname, ifr->ifr_name, sizeof(ifr->ifr_name))) {
  		if (found) {
@@ -307,7 +310,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
  		} else {
  		    found = 1;
  	            memcpy(hwaddr, LLADDR(sdl), ETH_ALEN);
-@@ -183,9 +177,7 @@ getHWaddr(int sock, char const *ifname, 
+@@ -183,9 +177,7 @@
  	}
      }
      if (!found) {
@@ -318,7 +321,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
      }
  }
  
-@@ -252,7 +244,7 @@ initFilter(int fd, UINT16_t type, unsign
+@@ -252,7 +244,7 @@
        
        /* Apply the filter */
        if (ioctl(fd, BIOCSETF, &bpfProgram) < 0) {
@@ -327,7 +330,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
        }
      }
  }
-@@ -298,42 +290,36 @@ openInterface(char const *ifname, UINT16
+@@ -298,42 +290,36 @@
      if (fd < 0) {
  	switch (errno) {
  	case EACCES:		/* permission denied */
@@ -378,7 +381,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
      }
      getHWaddr(sock, ifname, hwaddr);
      initFilter(fd, type, hwaddr);
-@@ -342,58 +328,52 @@ openInterface(char const *ifname, UINT16
+@@ -342,58 +328,52 @@
  #if !defined(__OpenBSD__)
      strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
      if (ioctl(sock, SIOCGIFMTU, &ifr) < 0) {
@@ -448,7 +451,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
  	   ifname, 
  	   hwaddr[0], hwaddr[1], hwaddr[2],
  	   hwaddr[3], hwaddr[4], hwaddr[5],
-@@ -442,48 +422,41 @@ openInterface(char const *ifname, UINT16
+@@ -442,48 +422,41 @@
      if ((fd = socket(domain, stype, htons(type))) < 0) {
  	/* Give a more helpful message for the common error case */
  	if (errno == EPERM) {
@@ -507,7 +510,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
      }
  
  #ifdef HAVE_STRUCT_SOCKADDR_LL
-@@ -493,7 +466,7 @@ openInterface(char const *ifname, UINT16
+@@ -493,7 +466,7 @@
  
      strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
      if (ioctl(fd, SIOCGIFINDEX, &ifr) < 0) {
@@ -516,7 +519,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
      }
      sa.sll_ifindex = ifr.ifr_ifindex;
  
-@@ -503,7 +476,7 @@ openInterface(char const *ifname, UINT16
+@@ -503,7 +476,7 @@
  
      /* We're only interested in packets on specified interface */
      if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
@@ -525,7 +528,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
      }
  
      return fd;
-@@ -527,13 +500,11 @@ sendPacket(PPPoEConnection *conn, int so
+@@ -527,13 +500,11 @@
  {
  #if defined(USE_BPF)
      if (write(sock, pkt, size) < 0) {
@@ -541,7 +544,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
      }
  #else
  #ifdef USE_DLPI
-@@ -577,12 +548,11 @@ sendPacket(PPPoEConnection *conn, int so
+@@ -577,12 +548,11 @@
      struct sockaddr sa;
  
      if (!conn) {
@@ -556,7 +559,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
      }
  #endif
  #endif
-@@ -632,26 +602,24 @@ receivePacket(int sock, PPPoEPacket *pkt
+@@ -632,26 +602,24 @@
      if (bpfSize <= 0) {
  	bpfOffset = 0;
  	if ((bpfSize = read(sock, bpfBuffer, bpfLength)) < 0) {
@@ -587,7 +590,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
  	clearPacketHeader(pkt);		/* resets bpfSize and bpfOffset */
  	return 0;
      }
-@@ -676,16 +644,14 @@ receivePacket(int sock, PPPoEPacket *pkt
+@@ -676,16 +644,14 @@
  	data.len = 0; 
  	
  	if ((retval = getmsg(sock, NULL, &data, &flags)) < 0) {
@@ -606,7 +609,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
      }
  #endif
  #endif
-@@ -716,7 +682,7 @@ openInterface(char const *ifname, UINT16
+@@ -716,7 +682,7 @@
      int ppa; 
  
      if(strlen(ifname) > PATH_MAX) {
@@ -615,7 +618,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
      }
  
      ppa = atoi(&ifname[strlen(ifname)-1]);
-@@ -729,9 +695,9 @@ openInterface(char const *ifname, UINT16
+@@ -729,9 +695,9 @@
      if (( fd = open(base_dev, O_RDWR)) < 0) {
  	/* Give a more helpful message for the common error case */
  	if (errno == EPERM) {
@@ -627,7 +630,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
      }
  
  /* rearranged order of DLPI code - delphys 20010803 */
-@@ -747,17 +713,18 @@ openInterface(char const *ifname, UINT16
+@@ -747,17 +713,18 @@
      dl_abssaplen = ABS(dlp->info_ack.dl_sap_length);
      dl_saplen = dlp->info_ack.dl_sap_length;
      if (ETHERADDRL != (dlp->info_ack.dl_addr_length - dl_abssaplen))
@@ -649,7 +652,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
  
      return fd;
  }
-@@ -780,7 +747,7 @@ void dlpromisconreq(int fd, u_long level
+@@ -780,7 +747,7 @@
          flags = 0;
  
          if (putmsg(fd, &ctl, (struct strbuf*) NULL, flags) < 0)
@@ -658,7 +661,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
  
  }
  
-@@ -799,7 +766,7 @@ void dlinforeq(int fd)
+@@ -799,7 +766,7 @@
          flags = RS_HIPRI;
  
          if (putmsg(fd, &ctl, (struct strbuf*) NULL, flags) < 0)
@@ -667,7 +670,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
  }
  
  void dlunitdatareq(int fd, u_char *addrp, int addrlen, u_long minpri, u_long maxpri, u_char *datap, int datalen)
-@@ -827,7 +794,7 @@ void dlunitdatareq(int fd, u_char *addrp
+@@ -827,7 +794,7 @@
          data.buf = (char *) datap;
  
          if (putmsg(fd, &ctl, &data, 0) < 0)
@@ -676,7 +679,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
  }
  
  void dlinfoack(int fd, char *bufp)
-@@ -847,18 +814,14 @@ void dlinfoack(int fd, char *bufp)
+@@ -847,18 +814,14 @@
          expecting(DL_INFO_ACK, dlp);
  
          if (ctl.len < sizeof (dl_info_ack_t)) {
@@ -698,7 +701,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
  	}
  }
  
-@@ -882,7 +845,7 @@ void dlbindreq(int fd, u_long sap, u_lon
+@@ -882,7 +845,7 @@
          flags = 0;
  
          if (putmsg(fd, &ctl, (struct strbuf*) NULL, flags) < 0)
@@ -707,7 +710,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
  }
  
  void dlattachreq(int fd, u_long ppa)
-@@ -901,7 +864,7 @@ void dlattachreq(int fd, u_long ppa)
+@@ -901,7 +864,7 @@
          flags = 0;
  
          if (putmsg(fd, &ctl, (struct strbuf*) NULL, flags) < 0)
@@ -716,7 +719,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
  }
  
  void dlokack(int fd, char *bufp)
-@@ -921,18 +884,14 @@ void dlokack(int fd, char *bufp)
+@@ -921,18 +884,14 @@
          expecting(DL_OK_ACK, dlp);
  
          if (ctl.len < sizeof (dl_ok_ack_t)) { 
@@ -738,7 +741,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
  	}
  }
  
-@@ -953,12 +912,10 @@ void dlbindack(int fd, char *bufp)
+@@ -953,12 +912,10 @@
          expecting(DL_BIND_ACK, dlp);
  
          if (flags != RS_HIPRI)
@@ -753,7 +756,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
  	}
  }
  
-@@ -989,8 +946,7 @@ void strgetmsg(int fd, struct strbuf *ct
+@@ -989,8 +946,7 @@
           */
          (void) signal(SIGALRM, sigalrm);
          if (alarm(MAXWAIT) < 0) {
@@ -763,7 +766,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
          }
  
          /*
-@@ -998,61 +954,48 @@ void strgetmsg(int fd, struct strbuf *ct
+@@ -998,61 +954,48 @@
           */
          *flagsp = 0;
          if ((rc = getmsg(fd, ctlp, datap, flagsp)) < 0) {
@@ -833,10 +836,11 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.3/pppd/plugins/rp-p
  	}
  }
  
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/Makefile.linux	2004-11-14 08:58:37.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux	2005-03-11 01:48:27.000000000 +0100
-@@ -28,8 +28,8 @@ COPTS=-O2 -g
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/Makefile.linux	2007-06-04 13:22:08.408576984 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux	2007-06-04 13:22:09.416423768 +0200
+@@ -28,8 +28,8 @@
  CFLAGS=$(COPTS) -I../../../include/linux
  all: rp-pppoe.so pppoe-discovery
  
@@ -847,10 +851,11 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3/pppd/pl
  
  pppoe-discovery.o: pppoe-discovery.c
  	$(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe-discovery.o pppoe-discovery.c
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/plugin.c	2004-11-04 11:07:37.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c	2005-03-11 02:12:39.000000000 +0100
-@@ -35,7 +35,6 @@ static char const RCSID[] =
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/plugin.c	2007-06-04 13:22:08.414576072 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c	2007-06-04 13:22:09.417423616 +0200
+@@ -35,7 +35,6 @@
  #include "pppd/pathnames.h"
  
  #include <linux/types.h>
@@ -858,7 +863,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3/pppd/plugins/
  #include <sys/ioctl.h>
  #include <sys/types.h>
  #include <sys/socket.h>
-@@ -173,10 +172,8 @@ PPPOEConnectDevice(void)
+@@ -173,10 +172,8 @@
  	    (unsigned) conn->peerEth[5]);
  
      if (connect(conn->sessionSocket, (struct sockaddr *) &sp,
@@ -870,7 +875,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3/pppd/plugins/
  
      return conn->sessionSocket;
  }
-@@ -365,11 +362,9 @@ plugin_init(void)
+@@ -365,11 +362,9 @@
      }
  
      add_options(Options);
@@ -883,7 +888,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3/pppd/plugins/
  /**********************************************************************
  *%FUNCTION: fatalSys
  *%ARGUMENTS:
-@@ -423,6 +418,7 @@ sysErr(char const *str)
+@@ -423,6 +418,7 @@
  {
      rp_fatal(str);
  }
@@ -891,9 +896,10 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3/pppd/plugins/
  
  
  struct channel pppoe_channel = {
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp-2.4.3/pppd/plugins/rp-pppoe/pppoe-discovery.c
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c	2004-11-13 13:12:05.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/pppoe-discovery.c	2005-03-11 02:06:13.000000000 +0100
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/pppoe-discovery.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c	2007-06-04 13:22:08.420575160 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/pppoe-discovery.c	2007-06-04 13:22:09.417423616 +0200
 @@ -17,14 +17,8 @@
  
  #include "pppoe.h"
@@ -909,7 +915,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp-2.4.3/pppd
  int main(int argc, char *argv[])
  {
      int opt;
-@@ -32,17 +26,17 @@ int main(int argc, char *argv[])
+@@ -32,17 +26,17 @@
  
      conn = malloc(sizeof(PPPoEConnection));
      if (!conn)
@@ -930,7 +936,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp-2.4.3/pppd
  	    break;
  	case 'U':
  	    conn->useHostUniq = 1;
-@@ -57,7 +51,7 @@ int main(int argc, char *argv[])
+@@ -57,7 +51,7 @@
  	    fprintf(conn->debugFile, "pppoe-discovery %s\n", VERSION);
  	    break;
  	case 'I':
@@ -939,7 +945,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp-2.4.3/pppd
  	    break;
  	case 'A':
  	    /* this is the default */
-@@ -74,7 +68,7 @@ int main(int argc, char *argv[])
+@@ -74,7 +68,7 @@
  
      /* default interface name */
      if (!conn->ifName)
@@ -948,7 +954,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp-2.4.3/pppd
  
      conn->discoverySocket = -1;
      conn->sessionSocket = -1;
-@@ -84,39 +78,6 @@ int main(int argc, char *argv[])
+@@ -84,39 +78,6 @@
      exit(0);
  }
  
@@ -988,10 +994,11 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp-2.4.3/pppd
  void usage(void)
  {
      fprintf(stderr, "Usage: pppoe-discovery [options]\n");
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe.h ppp-2.4.3/pppd/plugins/rp-pppoe/pppoe.h
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe.h	2004-11-04 11:07:37.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/pppoe.h	2005-03-11 02:08:00.000000000 +0100
-@@ -307,12 +307,18 @@ void discovery(PPPoEConnection *conn);
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/pppoe.h
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe.h	2007-06-04 13:22:08.426574248 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/pppoe.h	2007-06-04 13:22:09.418423464 +0200
+@@ -307,12 +307,18 @@
  unsigned char *findTag(PPPoEPacket *packet, UINT16_t tagType,
  		       PPPoETag *tag);
  
@@ -1011,9 +1018,10 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/pppoe.h ppp-2.4.3/pppd/plugins/r
          return; \
      } \
  } while(0)
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/rp-pppoe/utils.c ppp-2.4.3/pppd/plugins/rp-pppoe/utils.c
---- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/utils.c	1970-01-01 01:00:00.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/utils.c	2005-03-11 02:07:57.000000000 +0100
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/utils.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/utils.c	2007-06-04 13:22:09.418423464 +0200
 @@ -0,0 +1,62 @@
 +#include <stdio.h>
 +#include <stdlib.h>
diff --git a/package/ppp/patches/104-debian_fix_linkpidfile.patch b/package/ppp/patches/104-debian_fix_linkpidfile.patch
index 9e32adcae1..431ce83cf9 100644
--- a/package/ppp/patches/104-debian_fix_linkpidfile.patch
+++ b/package/ppp/patches/104-debian_fix_linkpidfile.patch
@@ -23,14 +23,11 @@ call has now been removed which is why I'm seeing this problem.
 [...]
 
 --
-Index: pppd/main.c
+Index: ppp-2.4.3/pppd/main.c
 ===================================================================
-RCS file: /var/cvs/snwb/packages/ppp/pppd/main.c,v
-retrieving revision 1.11
-diff -u -r1.11 main.c
---- ppp/pppd/main.c	29 Nov 2004 22:49:23 -0000	1.11
-+++ ppp/pppd/main.c	5 Dec 2004 23:59:58 -0000
-@@ -819,8 +819,7 @@
+--- ppp-2.4.3.orig/pppd/main.c	2007-06-04 13:22:09.004486392 +0200
++++ ppp-2.4.3/pppd/main.c	2007-06-04 13:22:10.548251704 +0200
+@@ -768,8 +768,7 @@
  	/* update pid files if they have been written already */
  	if (pidfilename[0])
  	    create_pidfile(pid);
@@ -40,4 +37,3 @@ diff -u -r1.11 main.c
  	exit(0);		/* parent dies */
      }
      setsid();
-
diff --git a/package/ppp/patches/105-debian_pppoatm_cleanup.patch b/package/ppp/patches/105-debian_pppoatm_cleanup.patch
index 2437a12003..80f4445888 100644
--- a/package/ppp/patches/105-debian_pppoatm_cleanup.patch
+++ b/package/ppp/patches/105-debian_pppoatm_cleanup.patch
@@ -1,7 +1,8 @@
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c
---- ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c	2005-03-22 14:44:18.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c	2005-03-22 14:44:02.000000000 +0100
-@@ -70,18 +70,20 @@ static int setdevname_pppoatm(const char
+Index: ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c	2007-06-04 13:22:08.348586104 +0200
++++ ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c	2007-06-04 13:22:10.825209600 +0200
+@@ -70,18 +70,20 @@
  {
  	struct sockaddr_atmpvc addr;
  	extern struct stat devstat;
@@ -28,7 +29,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
  	memcpy(&pvcaddr, &addr, sizeof pvcaddr);
  	strlcpy(devnam, cp, sizeof devnam);
  	devstat.st_mode = S_IFSOCK;
-@@ -93,7 +95,6 @@ static int setdevname_pppoatm(const char
+@@ -93,7 +95,6 @@
  		lcp_allowoptions[0].neg_asyncmap = 0;
  		lcp_wantoptions[0].neg_pcompression = 0;
  	}
@@ -36,7 +37,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
  	device_got_set = 1;
  	return 1;
  }
-@@ -108,6 +109,7 @@ static void no_device_given_pppoatm(void
+@@ -108,6 +109,7 @@
  static void set_line_discipline_pppoatm(int fd)
  {
  	struct atm_backend_ppp be;
@@ -44,7 +45,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
  	be.backend_num = ATM_BACKEND_PPP;
  	if (!llc_encaps)
  		be.encaps = PPPOATM_ENCAPS_VC;
-@@ -115,6 +117,7 @@ static void set_line_discipline_pppoatm(
+@@ -115,6 +117,7 @@
  		be.encaps = PPPOATM_ENCAPS_LLC;
  	else
  		be.encaps = PPPOATM_ENCAPS_AUTODETECT;
@@ -52,7 +53,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
  	if (ioctl(fd, ATM_SETBACKEND, &be) < 0)
  		fatal("ioctl(ATM_SETBACKEND): %m");
  }
-@@ -179,16 +182,19 @@ static void send_config_pppoa(int mtu,
+@@ -175,16 +178,19 @@
  {
  	int sock;
  	struct ifreq ifr;
@@ -73,7 +74,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
  }
  
  static void recv_config_pppoa(int mru,
-@@ -202,7 +208,7 @@ static void recv_config_pppoa(int mru,
+@@ -198,7 +204,7 @@
  
  void plugin_init(void)
  {
@@ -82,7 +83,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
  	extern int new_style_driver;	/* From sys-linux.c */
  	if (!ppp_available() && !new_style_driver)
  		fatal("Kernel doesn't support ppp_generic - "
-@@ -210,9 +216,9 @@ void plugin_init(void)
+@@ -206,9 +212,9 @@
  #else
  	fatal("No PPPoATM support on this OS");
  #endif
diff --git a/package/ppp/patches/106-debian_pppoatm_fix_mtu.patch b/package/ppp/patches/106-debian_pppoatm_fix_mtu.patch
index ef28b5cf2b..367c84e563 100644
--- a/package/ppp/patches/106-debian_pppoatm_fix_mtu.patch
+++ b/package/ppp/patches/106-debian_pppoatm_fix_mtu.patch
@@ -1,7 +1,8 @@
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c
---- ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c	2005-05-04 02:00:28.000000000 +0200
-+++ ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c	2005-05-04 01:59:11.000000000 +0200
-@@ -183,8 +183,11 @@ static void send_config_pppoa(int mtu,
+Index: ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c	2007-06-04 13:22:10.825209600 +0200
++++ ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c	2007-06-04 13:22:11.014180872 +0200
+@@ -179,8 +179,11 @@
  	int sock;
  	struct ifreq ifr;
  
@@ -15,7 +16,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
  
  	sock = socket(AF_INET, SOCK_DGRAM, 0);
  	if (sock < 0)
-@@ -202,8 +205,11 @@ static void recv_config_pppoa(int mru,
+@@ -198,8 +201,11 @@
  			      int pcomp,
  			      int accomp)
  {
diff --git a/package/ppp/patches/107-debian_stripMSdomain.patch b/package/ppp/patches/107-debian_stripMSdomain.patch
index d52e38645d..de1d1e8d3c 100644
--- a/package/ppp/patches/107-debian_stripMSdomain.patch
+++ b/package/ppp/patches/107-debian_stripMSdomain.patch
@@ -1,6 +1,7 @@
-diff -ruN ppp.orig/pppd/chap-new.c ppp/pppd/chap-new.c
---- ppp.orig/pppd/chap-new.c	2003-11-27 23:25:17.000000000 +0100
-+++ ppp/pppd/chap-new.c	2003-12-02 12:26:21.000000000 +0100
+Index: ppp-2.4.3/pppd/chap-new.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/chap-new.c	2007-06-04 13:22:08.298593704 +0200
++++ ppp-2.4.3/pppd/chap-new.c	2007-06-04 13:22:11.199152752 +0200
 @@ -57,6 +57,7 @@
  int chap_timeout_time = 3;
  int chap_max_transmits = 10;
diff --git a/package/ppp/patches/108-debian_defaultroute.patch b/package/ppp/patches/108-debian_defaultroute.patch
index 76b444e4b2..36130abb2a 100644
--- a/package/ppp/patches/108-debian_defaultroute.patch
+++ b/package/ppp/patches/108-debian_defaultroute.patch
@@ -1,10 +1,11 @@
---- ppp/pppd/ipcp.c	Wed May 31 17:20:41 2000
-+++ ppp/pppd/ipcp.c	Wed May 31 17:27:19 2000
-@@ -145,7 +145,17 @@
-     { "-defaultroute", o_bool, &ipcp_allowoptions[0].default_route,
-       "disable defaultroute option", OPT_A2COPY,
+Index: ppp-2.4.3/pppd/ipcp.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/ipcp.c	2007-06-04 13:22:09.003486544 +0200
++++ ppp-2.4.3/pppd/ipcp.c	2007-06-04 13:22:11.387124176 +0200
+@@ -197,6 +197,16 @@
+       "disable defaultroute option", OPT_ALIAS | OPT_A2CLR,
        &ipcp_wantoptions[0].default_route },
-
+ 
 +#ifdef __linux__
 +    { "replacedefaultroute", o_bool,
 +				&ipcp_wantoptions[0].replace_default_route,
@@ -18,7 +19,7 @@
      { "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp,
        "Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp },
      { "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp,
-@@ -195,7 +205,7 @@
+@@ -263,7 +273,7 @@
      ip_active_pkt
  };
  
@@ -27,7 +28,7 @@
  static void ipcp_script __P((char *));		/* Run an up/down script */
  static void ipcp_script_done __P((void *));
  
-@@ -1344,7 +1354,12 @@
+@@ -1659,7 +1669,12 @@
      if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE))
  	return 0;
      if (wo->default_route)
@@ -40,7 +41,7 @@
  	    default_route_set[u] = 1;
      if (wo->proxy_arp)
  	if (sifproxyarp(u, wo->hisaddr))
-@@ -1420,7 +1435,8 @@
+@@ -1741,7 +1756,8 @@
       */
      if (demand) {
  	if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) {
@@ -49,8 +50,8 @@
 +				      wo->replace_default_route);
  	    if (go->ouraddr != wo->ouraddr) {
  		warn("Local IP address changed to %I", go->ouraddr);
- 		script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr));
-@@ -1445,7 +1461,12 @@
+ 		script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr), 0);
+@@ -1766,7 +1782,12 @@
  
  	    /* assign a default route through the interface if required */
  	    if (ipcp_wantoptions[f->unit].default_route) 
@@ -63,7 +64,7 @@
  		    default_route_set[f->unit] = 1;
  
  	    /* Make a proxy ARP entry if requested. */
-@@ -1492,7 +1513,12 @@
+@@ -1813,7 +1834,12 @@
  
  	/* assign a default route through the interface if required */
  	if (ipcp_wantoptions[f->unit].default_route) 
@@ -76,7 +77,7 @@
  		default_route_set[f->unit] = 1;
  
  	/* Make a proxy ARP entry if requested. */
-@@ -1559,7 +1585,7 @@
+@@ -1890,7 +1916,7 @@
  	sifnpmode(f->unit, PPP_IP, NPMODE_DROP);
  	sifdown(f->unit);
  	ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr,
@@ -85,7 +86,7 @@
      }
  
      /* Execute the ip-down script */
-@@ -1575,16 +1601,25 @@
+@@ -1906,16 +1932,25 @@
   * proxy arp entries, etc.
   */
  static void
@@ -113,9 +114,11 @@
  	cifdefaultroute(unit, ouraddr, hisaddr);
  	default_route_set[unit] = 0;
      }
---- ppp/pppd/ipcp.h	Wed May 31 17:20:41 2000
-+++ ppp/pppd/ipcp.h	Wed May 31 15:56:17 2000
-@@ -47,6 +47,7 @@
+Index: ppp-2.4.3/pppd/ipcp.h
+===================================================================
+--- ppp-2.4.3.orig/pppd/ipcp.h	2007-06-04 13:22:08.263599024 +0200
++++ ppp-2.4.3/pppd/ipcp.h	2007-06-04 13:22:11.387124176 +0200
+@@ -70,6 +70,7 @@
      bool old_addrs;		/* Use old (IP-Addresses) option? */
      bool req_addr;		/* Ask peer to send IP address? */
      bool default_route;		/* Assign default route through interface? */
@@ -123,9 +126,11 @@
      bool proxy_arp;		/* Make proxy ARP entry for peer? */
      bool neg_vj;		/* Van Jacobson Compression? */
      bool old_vj;		/* use old (short) form of VJ option? */
---- ppp/pppd/pppd.h	Wed May 31 17:20:41 2000
-+++ ppp/pppd/pppd.h	Wed May 31 15:56:17 2000
-@@ -416,7 +416,11 @@
+Index: ppp-2.4.3/pppd/pppd.h
+===================================================================
+--- ppp-2.4.3.orig/pppd/pppd.h	2007-06-04 13:22:09.005486240 +0200
++++ ppp-2.4.3/pppd/pppd.h	2007-06-04 13:22:11.388124024 +0200
+@@ -642,7 +642,11 @@
  int  cif6addr __P((int, eui64_t, eui64_t));
  				/* Remove an IPv6 address from i/f */
  #endif
@@ -137,9 +142,11 @@
  				/* Create default route through i/f */
  int  cifdefaultroute __P((int, u_int32_t, u_int32_t));
  				/* Delete default route through i/f */
---- ppp/pppd/sys-linux.c	Wed May 31 17:20:41 2000
-+++ ppp/pppd/sys-linux.c	Wed May 31 17:37:23 2000
-@@ -143,6 +143,8 @@
+Index: ppp-2.4.3/pppd/sys-linux.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/sys-linux.c	2007-06-04 13:22:08.807516336 +0200
++++ ppp-2.4.3/pppd/sys-linux.c	2007-06-04 13:22:11.389123872 +0200
+@@ -206,6 +206,8 @@
  
  static int	if_is_up;	/* Interface has been marked up */
  static u_int32_t default_route_gateway;	/* Gateway for default route added */
@@ -148,7 +155,7 @@
  static u_int32_t proxy_arp_addr;	/* Addr for proxy arp entry added */
  static char proxy_arp_dev[16];		/* Device for proxy arp entry */
  static u_int32_t our_old_addr;		/* for detecting address changes */
-@@ -1209,6 +1211,9 @@
+@@ -1520,6 +1522,9 @@
  	p = NULL;
      }
  
@@ -158,10 +165,23 @@
      SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16);
      SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16);
      SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16);
-@@ -1278,19 +1283,53 @@
+@@ -1589,19 +1594,53 @@
  /********************************************************************
   *
   * sifdefaultroute - assign a default route through the address given.
+- */
+-
+-int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway)
+-{
+-    struct rtentry rt;
+-
+-    if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) {
+-	u_int32_t old_gateway = SIN_ADDR(rt.rt_gateway);
+-
+-	if (old_gateway != gateway)
+-	    error("not replacing existing default route to %s [%I]",
+-		  rt.rt_dev, old_gateway);
+-	return 0;
 + *
 + * If the global default_rt_repl_rest flag is set, then this function
 + * already replaced the original system defaultroute with some other
@@ -170,22 +190,13 @@
 + * when pppd sets first a defaultroute it it's temporary ppp0 addresses
 + * and then changes the temporary addresses to the addresses for the real
 + * ppp connection when it has come up.
-  */
- 
--int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway)
++ */
++
 +int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway, bool replace)
- {
--    struct rtentry rt;
--
--    if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) {
--	u_int32_t old_gateway = SIN_ADDR(rt.rt_gateway);
++{
 +    struct rtentry rt, tmp_rt;
 +    struct rtentry *del_rt = NULL;
- 
--	if (old_gateway != gateway)
--	    error("not replacing existing default route to %s [%I]",
--		  rt.rt_dev, old_gateway);
--	return 0;
++
 +    
 +    if (default_rt_repl_rest) {
 +	/* We have already reclaced the original defaultroute, if we
@@ -221,8 +232,8 @@
      }
  
      memset (&rt, '\0', sizeof (rt));
-@@ -1310,6 +1349,12 @@
- 	    error("default route ioctl(SIOCADDRT): %m(%d)", errno);
+@@ -1623,6 +1662,12 @@
+ 	    error("default route ioctl(SIOCADDRT): %m");
  	return 0;
      }
 +    if (default_rt_repl_rest && del_rt)
@@ -234,11 +245,10 @@
  
      default_route_gateway = gateway;
      return 1;
-@@ -1344,6 +1389,16 @@
- 		error("default route ioctl(SIOCDELRT): %m (%d)", errno);
+@@ -1658,6 +1703,16 @@
  	    return 0;
  	}
-+    }
+     }
 +    if (default_rt_repl_rest) {
 +	notice("restoring old default route to %s [%I]",
 +			old_def_rt.rt_dev, SIN_ADDR(old_def_rt.rt_gateway));
@@ -248,6 +258,7 @@
 +	    return 0;
 +        }
 +        default_rt_repl_rest = 0;
-     }
++    }
  
      return 1;
+ }
diff --git a/package/ppp/patches/109-debian_demand.patch b/package/ppp/patches/109-debian_demand.patch
index e024696697..74ce6c71c8 100644
--- a/package/ppp/patches/109-debian_demand.patch
+++ b/package/ppp/patches/109-debian_demand.patch
@@ -1,6 +1,8 @@
---- ppp/pppd/demand.c
-+++ ppp/pppd/demand.c	2000/06/28 14:54:04
-@@ -25,6 +25,8 @@
+Index: ppp-2.4.3/pppd/demand.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/demand.c	2007-06-04 13:22:08.217606016 +0200
++++ ppp-2.4.3/pppd/demand.c	2007-06-04 13:22:11.613089824 +0200
+@@ -36,6 +36,8 @@
  #include <errno.h>
  #include <fcntl.h>
  #include <netdb.h>
@@ -9,16 +11,16 @@
  #include <sys/param.h>
  #include <sys/types.h>
  #include <sys/wait.h>
-@@ -32,6 +34,8 @@
+@@ -43,6 +45,8 @@
  #include <sys/resource.h>
  #include <sys/stat.h>
  #include <sys/socket.h>
 +#include <netinet/in.h>
 +#include <arpa/inet.h>
  #ifdef PPP_FILTER
- #include <net/if.h>
- #include <net/bpf.h>
-@@ -210,6 +214,14 @@
+ #include <pcap-bpf.h>
+ #endif
+@@ -221,6 +225,14 @@
      int c, rv;
  
      rv = 0;
@@ -33,7 +35,7 @@
      for (; n > 0; --n) {
  	c = *p++;
  	if (c == PPP_FLAG) {
-@@ -288,17 +300,102 @@
+@@ -299,17 +311,102 @@
   * loopback, now that the real serial link is up.
   */
  void
@@ -137,9 +139,11 @@
  	    output(0, pkt->data, pkt->length);
  	    free(pkt);
  	} else {
---- ppp/pppd/ipcp.c
-+++ ppp/pppd/ipcp.c	2000/06/28 12:32:05
-@@ -1454,7 +1454,7 @@
+Index: ppp-2.4.3/pppd/ipcp.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/ipcp.c	2007-06-04 13:22:11.387124176 +0200
++++ ppp-2.4.3/pppd/ipcp.c	2007-06-04 13:22:11.614089672 +0200
+@@ -1796,7 +1796,7 @@
  		    proxy_arp_set[f->unit] = 1;
  
  	}
@@ -148,9 +152,11 @@
  	sifnpmode(f->unit, PPP_IP, NPMODE_PASS);
  
      } else {
---- ppp/pppd/ipv6cp.c
-+++ ppp/pppd/ipv6cp.c	2000/06/28 12:32:06
-@@ -1153,7 +1153,7 @@
+Index: ppp-2.4.3/pppd/ipv6cp.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/ipv6cp.c	2007-06-04 13:22:08.229604192 +0200
++++ ppp-2.4.3/pppd/ipv6cp.c	2007-06-04 13:22:11.614089672 +0200
+@@ -1232,7 +1232,7 @@
  	    }
  
  	}
@@ -159,9 +165,11 @@
  	sifnpmode(f->unit, PPP_IPV6, NPMODE_PASS);
  
      } else {
---- ppp/pppd/pppd.h
-+++ ppp/pppd/pppd.h	2000/06/28 12:32:06
-@@ -359,7 +359,7 @@
+Index: ppp-2.4.3/pppd/pppd.h
+===================================================================
+--- ppp-2.4.3.orig/pppd/pppd.h	2007-06-04 13:22:11.388124024 +0200
++++ ppp-2.4.3/pppd/pppd.h	2007-06-04 13:22:11.615089520 +0200
+@@ -563,7 +563,7 @@
  void demand_block __P((void));	/* set all NPs to queue up packets */
  void demand_unblock __P((void)); /* set all NPs to pass packets */
  void demand_discard __P((void)); /* set all NPs to discard packets */
diff --git a/package/ppp/patches/200-makefile.patch b/package/ppp/patches/200-makefile.patch
index 9eddc7cd4f..aec6d8bd65 100644
--- a/package/ppp/patches/200-makefile.patch
+++ b/package/ppp/patches/200-makefile.patch
@@ -1,7 +1,8 @@
-diff -ruN ppp-2.4.3-orig/pppd/Makefile.linux ppp-2.4.3-3/pppd/Makefile.linux
---- ppp-2.4.3-orig/pppd/Makefile.linux	2004-11-13 13:02:22.000000000 +0100
-+++ ppp-2.4.3-3/pppd/Makefile.linux	2004-12-16 04:43:41.000000000 +0100
-@@ -49,19 +49,19 @@
+Index: ppp-2.4.3/pppd/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppd/Makefile.linux	2007-06-04 13:22:08.197609056 +0200
++++ ppp-2.4.3/pppd/Makefile.linux	2007-06-04 13:22:11.837055776 +0200
+@@ -48,21 +48,21 @@
  # Uncomment the next line to include support for PPP packet filtering.
  # This requires that the libpcap library and headers be installed
  # and that the kernel driver support PPP packet filtering.
@@ -26,6 +27,8 @@ diff -ruN ppp-2.4.3-orig/pppd/Makefile.linux ppp-2.4.3-3/pppd/Makefile.linux
 -#HAVE_INET6=y
 +HAVE_INET6=y
  
+ # Enable plugins
+ PLUGIN=y
 @@ -77,7 +77,7 @@
  
  INCLUDE_DIRS= -I../include
diff --git a/package/ppp/patches/201-mppe_mppc_1.1.patch b/package/ppp/patches/201-mppe_mppc_1.1.patch
index 7e09f1a792..4575fa9431 100644
--- a/package/ppp/patches/201-mppe_mppc_1.1.patch
+++ b/package/ppp/patches/201-mppe_mppc_1.1.patch
@@ -1,6 +1,7 @@
-diff -ruN ppp-2.4.3.orig/include/linux/ppp-comp.h ppp-2.4.3/include/linux/ppp-comp.h
---- ppp-2.4.3.orig/include/linux/ppp-comp.h	2002-12-06 10:49:15.000000000 +0100
-+++ ppp-2.4.3/include/linux/ppp-comp.h	2004-11-21 13:54:09.000000000 +0100
+Index: ppp-2.4.3/include/linux/ppp-comp.h
+===================================================================
+--- ppp-2.4.3.orig/include/linux/ppp-comp.h	2007-06-04 13:22:08.143617264 +0200
++++ ppp-2.4.3/include/linux/ppp-comp.h	2007-06-04 13:22:12.031026288 +0200
 @@ -36,7 +36,7 @@
   */
  
@@ -62,9 +63,10 @@ diff -ruN ppp-2.4.3.orig/include/linux/ppp-comp.h ppp-2.4.3/include/linux/ppp-co
  /*
   * Definitions for other, as yet unsupported, compression methods.
   */
-diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
---- ppp-2.4.3.orig/include/net/ppp-comp.h	2002-12-06 10:49:15.000000000 +0100
-+++ ppp-2.4.3/include/net/ppp-comp.h	2004-11-21 13:54:09.000000000 +0100
+Index: ppp-2.4.3/include/net/ppp-comp.h
+===================================================================
+--- ppp-2.4.3.orig/include/net/ppp-comp.h	2007-06-04 13:22:08.150616200 +0200
++++ ppp-2.4.3/include/net/ppp-comp.h	2007-06-04 13:22:12.031026288 +0200
 @@ -255,6 +255,33 @@
  	    opts |= MPPE_OPT_UNKNOWN;		\
      } while (/* CONSTCOND */ 0)
@@ -99,9 +101,10 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
  /*
   * Definitions for other, as yet unsupported, compression methods.
   */
-diff -ruN ppp-2.4.3.orig/pppd/ccp.c ppp-2.4.3/pppd/ccp.c
---- ppp-2.4.3.orig/pppd/ccp.c	2004-11-13 03:28:15.000000000 +0100
-+++ ppp-2.4.3/pppd/ccp.c	2004-11-21 13:54:09.000000000 +0100
+Index: ppp-2.4.3/pppd/ccp.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/ccp.c	2007-06-04 13:22:08.157615136 +0200
++++ ppp-2.4.3/pppd/ccp.c	2007-06-04 13:22:12.033025984 +0200
 @@ -62,12 +62,10 @@
  static char bsd_value[8];
  static char deflate_value[8];
@@ -1461,9 +1464,10 @@ diff -ruN ppp-2.4.3.orig/pppd/ccp.c ppp-2.4.3/pppd/ccp.c
  	ccp_localstate[f->unit] &= ~RACK_PENDING;
  }
 -
-diff -ruN ppp-2.4.3.orig/pppd/ccp.h ppp-2.4.3/pppd/ccp.h
---- ppp-2.4.3.orig/pppd/ccp.h	2004-11-04 11:02:26.000000000 +0100
-+++ ppp-2.4.3/pppd/ccp.h	2004-11-21 13:54:09.000000000 +0100
+Index: ppp-2.4.3/pppd/ccp.h
+===================================================================
+--- ppp-2.4.3.orig/pppd/ccp.h	2007-06-04 13:22:08.162614376 +0200
++++ ppp-2.4.3/pppd/ccp.h	2007-06-04 13:22:12.033025984 +0200
 @@ -37,9 +37,17 @@
      bool predictor_2;		/* do Predictor-2? */
      bool deflate_correct;	/* use correct code for deflate? */
@@ -1482,9 +1486,10 @@ diff -ruN ppp-2.4.3.orig/pppd/ccp.h ppp-2.4.3/pppd/ccp.h
      short method;		/* code for chosen compression method */
  } ccp_options;
  
-diff -ruN ppp-2.4.3.orig/pppd/chap_ms.c ppp-2.4.3/pppd/chap_ms.c
---- ppp-2.4.3.orig/pppd/chap_ms.c	2004-11-12 10:57:43.000000000 +0100
-+++ ppp-2.4.3/pppd/chap_ms.c	2004-11-21 13:54:09.000000000 +0100
+Index: ppp-2.4.3/pppd/chap_ms.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/chap_ms.c	2007-06-04 13:22:08.168613464 +0200
++++ ppp-2.4.3/pppd/chap_ms.c	2007-06-04 13:22:12.033025984 +0200
 @@ -895,13 +895,17 @@
      /*
       * Disable undesirable encryption types.  Note that we don't ENABLE
@@ -1505,9 +1510,10 @@ diff -ruN ppp-2.4.3.orig/pppd/chap_ms.c ppp-2.4.3/pppd/chap_ms.c
  	    break;
  	default:
  	    break;
-diff -ruN ppp-2.4.3.orig/pppd/pppd.8 ppp-2.4.3/pppd/pppd.8
---- ppp-2.4.3.orig/pppd/pppd.8	2004-11-13 13:22:49.000000000 +0100
-+++ ppp-2.4.3/pppd/pppd.8	2004-11-21 14:24:47.000000000 +0100
+Index: ppp-2.4.3/pppd/pppd.8
+===================================================================
+--- ppp-2.4.3.orig/pppd/pppd.8	2007-06-04 13:22:08.175612400 +0200
++++ ppp-2.4.3/pppd/pppd.8	2007-06-04 13:22:12.034025832 +0200
 @@ -622,9 +622,29 @@
  Enables the use of PPP multilink; this is an alias for the `multilink'
  option.  This option is currently only available under Linux.
diff --git a/package/ppp/patches/202-atm_fix.patch b/package/ppp/patches/202-atm_fix.patch
index 40d9d595cf..853f7ae88e 100644
--- a/package/ppp/patches/202-atm_fix.patch
+++ b/package/ppp/patches/202-atm_fix.patch
@@ -1,5 +1,7 @@
---- ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c	2005-08-26 15:18:55.000000000 +0200
-+++ ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c	2005-08-26 15:19:51.000000000 +0200
+Index: ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c	2007-06-04 13:22:11.014180872 +0200
++++ ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c	2007-06-04 13:22:12.281988136 +0200
 @@ -136,8 +136,6 @@
  	int fd;
  	struct atm_qos qos;
diff --git a/package/ppp/patches/203-no_strip.patch b/package/ppp/patches/203-no_strip.patch
index 216973cf59..f3df1fc9fd 100644
--- a/package/ppp/patches/203-no_strip.patch
+++ b/package/ppp/patches/203-no_strip.patch
@@ -1,6 +1,7 @@
-diff -ruN ppp-2.4.3-orig/chat/Makefile.linux ppp-2.4.3-3/chat/Makefile.linux
---- ppp-2.4.3-orig/chat/Makefile.linux	2004-11-03 12:51:47.000000000 +0100
-+++ ppp-2.4.3-3/chat/Makefile.linux	2004-12-05 17:42:43.000000000 +0100
+Index: ppp-2.4.3/chat/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/chat/Makefile.linux	2007-06-04 13:22:08.064629272 +0200
++++ ppp-2.4.3/chat/Makefile.linux	2007-06-04 13:22:12.463960472 +0200
 @@ -25,7 +25,7 @@
  
  install: chat
@@ -10,9 +11,10 @@ diff -ruN ppp-2.4.3-orig/chat/Makefile.linux ppp-2.4.3-3/chat/Makefile.linux
  	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
  
  clean:
-diff -ruN ppp-2.4.3-orig/pppd/Makefile.linux ppp-2.4.3-3/pppd/Makefile.linux
---- ppp-2.4.3-orig/pppd/Makefile.linux	2004-11-13 13:02:22.000000000 +0100
-+++ ppp-2.4.3-3/pppd/Makefile.linux	2004-12-16 04:43:41.000000000 +0100
+Index: ppp-2.4.3/pppd/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppd/Makefile.linux	2007-06-04 13:22:11.837055776 +0200
++++ ppp-2.4.3/pppd/Makefile.linux	2007-06-04 13:22:12.463960472 +0200
 @@ -99,7 +99,7 @@
  CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
  LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
@@ -31,10 +33,11 @@ diff -ruN ppp-2.4.3-orig/pppd/Makefile.linux ppp-2.4.3-3/pppd/Makefile.linux
  	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
  	  chmod o-rx,u+s $(BINDIR)/pppd; fi
  	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
-diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.3-3/pppd/plugins/radius/Makefile.linux
---- ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux	2004-11-14 08:02:31.000000000 +0100
-+++ ppp-2.4.3-3/pppd/plugins/radius/Makefile.linux	2004-12-05 17:43:17.000000000 +0100
-@@ -36,9 +37,9 @@
+Index: ppp-2.4.3/pppd/plugins/radius/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/radius/Makefile.linux	2007-06-04 13:22:08.076627448 +0200
++++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux	2007-06-04 13:22:12.463960472 +0200
+@@ -36,9 +36,9 @@
  
  install: all
  	$(INSTALL) -d -m 755 $(LIBDIR)
@@ -47,9 +50,10 @@ diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.3-3/pppd/plu
  	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
  	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
  
-diff -ruN ppp-2.4.3-orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3-3/pppd/plugins/rp-pppoe/Makefile.linux
---- ppp-2.4.3-orig/pppd/plugins/rp-pppoe/Makefile.linux	2004-11-14 08:58:37.000000000 +0100
-+++ ppp-2.4.3-3/pppd/plugins/rp-pppoe/Makefile.linux	2004-12-05 17:43:23.000000000 +0100
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/Makefile.linux	2007-06-04 13:22:09.416423768 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux	2007-06-04 13:22:12.468959712 +0200
 @@ -39,9 +39,9 @@
  
  install: all
@@ -62,19 +66,21 @@ diff -ruN ppp-2.4.3-orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3-3/pppd/p
  
  clean:
  	rm -f *.o *.so
-diff -ruN ppp-2.4.3-orig/pppdump/Makefile.linux ppp-2.4.3-3/pppdump/Makefile.linux
---- ppp-2.4.3-orig/pppdump/Makefile.linux	2004-10-31 02:36:52.000000000 +0200
-+++ ppp-2.4.3-3/pppdump/Makefile.linux	2004-12-05 17:50:34.000000000 +0100
-@@ -17,5 +18,5 @@
+Index: ppp-2.4.3/pppdump/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppdump/Makefile.linux	2007-06-04 13:22:08.091625168 +0200
++++ ppp-2.4.3/pppdump/Makefile.linux	2007-06-04 13:22:12.468959712 +0200
+@@ -17,5 +17,5 @@
  
  install:
  	mkdir -p $(BINDIR) $(MANDIR)
 -	$(INSTALL) -s -c pppdump $(BINDIR)
 +	$(INSTALL) -c pppdump $(BINDIR)
  	$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
-diff -ruN ppp-2.4.3-orig/pppstats/Makefile.linux ppp-2.4.3-3/pppstats/Makefile.linux
---- ppp-2.4.3-orig/pppstats/Makefile.linux	2004-10-31 23:09:03.000000000 +0100
-+++ ppp-2.4.3-3/pppstats/Makefile.linux	2004-12-05 17:43:38.000000000 +0100
+Index: ppp-2.4.3/pppstats/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppstats/Makefile.linux	2007-06-04 13:22:08.099623952 +0200
++++ ppp-2.4.3/pppstats/Makefile.linux	2007-06-04 13:22:12.468959712 +0200
 @@ -22,7 +22,7 @@
  
  install: pppstats
diff --git a/package/ppp/patches/204-opt_flags.patch b/package/ppp/patches/204-opt_flags.patch
index 200e76b5b5..0b59b607d3 100644
--- a/package/ppp/patches/204-opt_flags.patch
+++ b/package/ppp/patches/204-opt_flags.patch
@@ -1,6 +1,7 @@
-diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.3-3/pppd/plugins/radius/Makefile.linux
---- ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux	2004-11-14 08:02:31.000000000 +0100
-+++ ppp-2.4.3-3/pppd/plugins/radius/Makefile.linux	2004-12-05 17:43:17.000000000 +0100
+Index: ppp-2.4.3/pppd/plugins/radius/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/radius/Makefile.linux	2007-06-04 13:22:12.463960472 +0200
++++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux	2007-06-04 13:22:12.705923688 +0200
 @@ -12,7 +12,8 @@
  INSTALL	= install
  
@@ -11,9 +12,10 @@ diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.3-3/pppd/plu
  
  # Uncomment the next line to include support for Microsoft's
  # MS-CHAP authentication protocol.
-diff -ruN ppp-2.4.3-orig/pppdump/Makefile.linux ppp-2.4.3-3/pppdump/Makefile.linux
---- ppp-2.4.3-orig/pppdump/Makefile.linux	2004-10-31 02:36:52.000000000 +0200
-+++ ppp-2.4.3-3/pppdump/Makefile.linux	2004-12-05 17:50:34.000000000 +0100
+Index: ppp-2.4.3/pppdump/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppdump/Makefile.linux	2007-06-04 13:22:12.468959712 +0200
++++ ppp-2.4.3/pppdump/Makefile.linux	2007-06-04 13:22:12.705923688 +0200
 @@ -2,7 +2,8 @@
  BINDIR = $(DESTDIR)/sbin
  MANDIR = $(DESTDIR)/share/man/man8
diff --git a/package/ppp/patches/205-pppoe_iface_name.patch b/package/ppp/patches/205-pppoe_iface_name.patch
index 864866b0d7..4b5d627482 100644
--- a/package/ppp/patches/205-pppoe_iface_name.patch
+++ b/package/ppp/patches/205-pppoe_iface_name.patch
@@ -1,7 +1,8 @@
-diff -urN ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3.new/pppd/plugins/rp-pppoe/plugin.c
---- ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c	2004-11-04 11:07:37.000000000 +0100
-+++ ppp-2.4.3.new/pppd/plugins/rp-pppoe/plugin.c	2007-04-17 18:38:12.000000000 +0200
-@@ -285,9 +285,9 @@
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/plugin.c	2007-06-04 13:22:09.417423616 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c	2007-06-04 13:22:12.953885992 +0200
+@@ -282,9 +282,9 @@
      if (strlen(cmd) > 4 && !strncmp(cmd, "nic-", 4)) {
  	/* Strip off "nic-" */
  	cmd += 4;
diff --git a/package/ppp/patches/206-radius_config.patch b/package/ppp/patches/206-radius_config.patch
index 90c02af4c1..4a7fa40e36 100644
--- a/package/ppp/patches/206-radius_config.patch
+++ b/package/ppp/patches/206-radius_config.patch
@@ -1,6 +1,7 @@
-diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/config.c ppp-2.4.3-3/pppd/plugins/radius/config.c
---- ppp-2.4.3-orig/pppd/plugins/radius/config.c	2004-11-14 08:26:26.000000000 +0100
-+++ ppp-2.4.3-3/pppd/plugins/radius/config.c	2004-12-16 04:03:46.000000000 +0100
+Index: ppp-2.4.3/pppd/plugins/radius/config.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/radius/config.c	2007-06-04 13:22:07.980642040 +0200
++++ ppp-2.4.3/pppd/plugins/radius/config.c	2007-06-04 13:22:13.139857720 +0200
 @@ -369,31 +369,37 @@
  	}
  #endif
@@ -39,9 +40,10 @@ diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/config.c ppp-2.4.3-3/pppd/plugins/r
  
  	return 0;
  }
-diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/options.h ppp-2.4.3-3/pppd/plugins/radius/options.h
---- ppp-2.4.3-orig/pppd/plugins/radius/options.h	2004-11-14 08:26:26.000000000 +0100
-+++ ppp-2.4.3-3/pppd/plugins/radius/options.h	2004-12-16 04:09:16.000000000 +0100
+Index: ppp-2.4.3/pppd/plugins/radius/options.h
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/radius/options.h	2007-06-04 13:22:07.989640672 +0200
++++ ppp-2.4.3/pppd/plugins/radius/options.h	2007-06-04 13:22:13.139857720 +0200
 @@ -31,24 +31,21 @@
  static SERVER acctserver = {0};
  static SERVER authserver = {0};
diff --git a/package/ppp/patches/207-ppp_reconnect.patch b/package/ppp/patches/207-ppp_reconnect.patch
index 9311c9ef4e..d518113480 100644
--- a/package/ppp/patches/207-ppp_reconnect.patch
+++ b/package/ppp/patches/207-ppp_reconnect.patch
@@ -1,6 +1,7 @@
-diff -urN -x'*.swp' ppp.old/pppd/auth.c ppp.dev/pppd/auth.c
---- ppp.old/pppd/auth.c	2004-11-12 11:30:51.000000000 +0100
-+++ ppp.dev/pppd/auth.c	2005-07-13 14:54:23.000000000 +0200
+Index: ppp-2.4.3/pppd/auth.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/auth.c	2007-06-04 13:22:07.941647968 +0200
++++ ppp-2.4.3/pppd/auth.c	2007-06-04 13:22:13.340827168 +0200
 @@ -532,6 +532,12 @@
  link_required(unit)
      int unit;
@@ -71,9 +72,10 @@ diff -urN -x'*.swp' ppp.old/pppd/auth.c ppp.dev/pppd/auth.c
      logged_in = 0;
  }
  
-diff -urN -x'*.swp' ppp.old/pppd/main.c ppp.dev/pppd/main.c
---- ppp.old/pppd/main.c	2005-07-13 11:34:28.000000000 +0200
-+++ ppp.dev/pppd/main.c	2005-07-13 14:49:06.000000000 +0200
+Index: ppp-2.4.3/pppd/main.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/main.c	2007-06-04 13:22:10.548251704 +0200
++++ ppp-2.4.3/pppd/main.c	2007-06-04 13:22:13.340827168 +0200
 @@ -537,6 +537,7 @@
  	script_unsetenv("BYTES_RCVD");
  
@@ -82,9 +84,10 @@ diff -urN -x'*.swp' ppp.old/pppd/main.c ppp.dev/pppd/main.c
  	while (phase != PHASE_DEAD) {
  	    handle_events();
  	    get_input();
-diff -urN -x'*.swp' ppp.old/pppd/pppd.h ppp.dev/pppd/pppd.h
---- ppp.old/pppd/pppd.h	2005-07-13 11:34:28.000000000 +0200
-+++ ppp.dev/pppd/pppd.h	2005-07-13 14:48:56.000000000 +0200
+Index: ppp-2.4.3/pppd/pppd.h
+===================================================================
+--- ppp-2.4.3.orig/pppd/pppd.h	2007-06-04 13:22:11.615089520 +0200
++++ ppp-2.4.3/pppd/pppd.h	2007-06-04 13:22:13.341827016 +0200
 @@ -526,6 +526,7 @@
  
  /* Procedures exported from auth.c */
@@ -93,9 +96,10 @@ diff -urN -x'*.swp' ppp.old/pppd/pppd.h ppp.dev/pppd/pppd.h
  void link_terminated __P((int));  /* we are finished with the link */
  void link_down __P((int));	  /* the LCP layer has left the Opened state */
  void upper_layers_down __P((int));/* take all NCPs down */
-diff -urN -x'*.swp' ppp.old/pppd/tty.c ppp.dev/pppd/tty.c
---- ppp.old/pppd/tty.c	2004-11-13 13:07:29.000000000 +0100
-+++ ppp.dev/pppd/tty.c	2005-07-13 14:46:57.000000000 +0200
+Index: ppp-2.4.3/pppd/tty.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/tty.c	2007-06-04 13:22:07.960645080 +0200
++++ ppp-2.4.3/pppd/tty.c	2007-06-04 13:22:13.341827016 +0200
 @@ -755,14 +755,6 @@
  		close(pty_master);
  		pty_master = -1;
diff --git a/package/ppp/patches/208-no_exponential_timeout.patch b/package/ppp/patches/208-no_exponential_timeout.patch
index d6c986a7ed..e6ad0e991c 100644
--- a/package/ppp/patches/208-no_exponential_timeout.patch
+++ b/package/ppp/patches/208-no_exponential_timeout.patch
@@ -1,6 +1,7 @@
-diff -urN ppp.old/pppd/plugins/rp-pppoe/discovery.c ppp.dev/pppd/plugins/rp-pppoe/discovery.c
---- ppp.old/pppd/plugins/rp-pppoe/discovery.c	2005-09-05 15:25:35.917232000 +0200
-+++ ppp.dev/pppd/plugins/rp-pppoe/discovery.c	2005-09-05 15:29:17.233586872 +0200
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/discovery.c	2007-06-04 13:22:09.414424072 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c	2007-06-04 13:22:13.567792664 +0200
 @@ -593,12 +593,14 @@
  	conn->discoveryState = STATE_SENT_PADI;
  	waitForPADO(conn, timeout);
diff --git a/package/ppp/patches/209-compensate_time_change.patch b/package/ppp/patches/209-compensate_time_change.patch
index f43085ab11..7c47de01a9 100644
--- a/package/ppp/patches/209-compensate_time_change.patch
+++ b/package/ppp/patches/209-compensate_time_change.patch
@@ -1,6 +1,7 @@
-diff -urN ppp.old/pppd/main.c ppp.dev/pppd/main.c
---- ppp.old/pppd/main.c	2005-11-11 19:19:28.177790000 +0100
-+++ ppp.dev/pppd/main.c	2005-11-11 20:18:05.957363000 +0100
+Index: ppp-2.4.3/pppd/main.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/main.c	2007-06-04 13:22:13.340827168 +0200
++++ ppp-2.4.3/pppd/main.c	2007-06-04 13:22:13.755764088 +0200
 @@ -90,6 +90,7 @@
  #include <sys/socket.h>
  #include <netinet/in.h>
diff --git a/package/ppp/patches/210-lcp_mtu_max.patch b/package/ppp/patches/210-lcp_mtu_max.patch
index 2056a87325..92dd59dd77 100644
--- a/package/ppp/patches/210-lcp_mtu_max.patch
+++ b/package/ppp/patches/210-lcp_mtu_max.patch
@@ -1,5 +1,7 @@
---- ppp-2.4.3/pppd/lcp.c.old	2006-10-10 14:19:11.000000000 +0200
-+++ ppp-2.4.3/pppd/lcp.c	2006-10-10 14:19:55.000000000 +0200
+Index: ppp-2.4.3/pppd/lcp.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/lcp.c	2007-06-04 13:22:07.874658152 +0200
++++ ppp-2.4.3/pppd/lcp.c	2007-06-04 13:22:13.945735208 +0200
 @@ -1891,12 +1891,12 @@
       * the interface MTU is set to the lowest of that, the
       * MTU we want to use, and our link MRU.
diff --git a/package/ppp/patches/300-filter-pcap-includes-lib.patch b/package/ppp/patches/300-filter-pcap-includes-lib.patch
index 3f6247d6ef..bc8bee95fd 100644
--- a/package/ppp/patches/300-filter-pcap-includes-lib.patch
+++ b/package/ppp/patches/300-filter-pcap-includes-lib.patch
@@ -1,6 +1,7 @@
-diff -urN ppp-2.4.3.orig/pppd/Makefile.linux ppp-2.4.3/pppd/Makefile.linux
---- ppp-2.4.3.orig/pppd/Makefile.linux	2006-02-05 20:13:06.000000000 +0100
-+++ ppp-2.4.3/pppd/Makefile.linux	2006-02-05 20:24:22.000000000 +0100
+Index: ppp-2.4.3/pppd/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppd/Makefile.linux	2007-06-04 13:22:12.463960472 +0200
++++ ppp-2.4.3/pppd/Makefile.linux	2007-06-04 13:22:14.133706632 +0200
 @@ -172,8 +172,8 @@
  
  ifdef FILTER
diff --git a/package/ppp/patches/310-precompiled_filter.patch b/package/ppp/patches/310-precompiled_filter.patch
index df9452c379..0ad8093734 100644
--- a/package/ppp/patches/310-precompiled_filter.patch
+++ b/package/ppp/patches/310-precompiled_filter.patch
@@ -1,6 +1,7 @@
-diff -urN ppp.old/pppd/Makefile.linux ppp.dev/pppd/Makefile.linux
---- ppp.old/pppd/Makefile.linux	2006-03-18 15:58:00.000000000 +0100
-+++ ppp.dev/pppd/Makefile.linux	2006-03-18 16:52:01.000000000 +0100
+Index: ppp-2.4.3/pppd/Makefile.linux
+===================================================================
+--- ppp-2.4.3.orig/pppd/Makefile.linux	2007-06-04 13:22:14.133706632 +0200
++++ ppp-2.4.3/pppd/Makefile.linux	2007-06-04 13:22:14.320678208 +0200
 @@ -50,6 +50,9 @@
  # and that the kernel driver support PPP packet filtering.
  #FILTER=y
@@ -26,9 +27,10 @@ diff -urN ppp.old/pppd/Makefile.linux ppp.dev/pppd/Makefile.linux
  ifdef HAVE_INET6
       PPPDSRCS += ipv6cp.c eui64.c
       HEADERS  += ipv6cp.h eui64.h
-diff -urN ppp.old/pppd/demand.c ppp.dev/pppd/demand.c
---- ppp.old/pppd/demand.c	2006-03-18 15:58:00.000000000 +0100
-+++ ppp.dev/pppd/demand.c	2006-03-18 18:09:16.000000000 +0100
+Index: ppp-2.4.3/pppd/demand.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/demand.c	2007-06-04 13:22:11.613089824 +0200
++++ ppp-2.4.3/pppd/demand.c	2007-06-04 13:22:14.320678208 +0200
 @@ -438,12 +438,14 @@
  	return 0;
      proto = PPP_PROTOCOL(p);
@@ -44,9 +46,10 @@ diff -urN ppp.old/pppd/demand.c ppp.dev/pppd/demand.c
  #endif
      for (i = 0; (protp = protocols[i]) != NULL; ++i) {
  	if (protp->protocol < 0xC000 && (protp->protocol & ~0x8000) == proto) {
-diff -urN ppp.old/pppd/options.c ppp.dev/pppd/options.c
---- ppp.old/pppd/options.c	2006-03-18 15:58:00.000000000 +0100
-+++ ppp.dev/pppd/options.c	2006-03-18 18:05:58.000000000 +0100
+Index: ppp-2.4.3/pppd/options.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/options.c	2007-06-04 13:22:09.005486240 +0200
++++ ppp-2.4.3/pppd/options.c	2007-06-04 13:22:14.321678056 +0200
 @@ -57,14 +57,7 @@
  
  #ifdef PPP_FILTER
@@ -140,9 +143,10 @@ diff -urN ppp.old/pppd/options.c ppp.dev/pppd/options.c
      if (pcap_compile(pc, &active_filter, *argv, 1, netmask) == -1) {
  	option_error("error in active-filter expression: %s\n",
  		     pcap_geterr(pc));
-diff -urN ppp.old/pppd/pcap_pcc.c ppp.dev/pppd/pcap_pcc.c
---- ppp.old/pppd/pcap_pcc.c	1970-01-01 01:00:00.000000000 +0100
-+++ ppp.dev/pppd/pcap_pcc.c	2006-03-18 16:51:31.000000000 +0100
+Index: ppp-2.4.3/pppd/pcap_pcc.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ppp-2.4.3/pppd/pcap_pcc.c	2007-06-04 13:22:14.321678056 +0200
 @@ -0,0 +1,74 @@
 +#include <pcap.h>
 +#include <pcap-bpf.h>
@@ -218,9 +222,10 @@ diff -urN ppp.old/pppd/pcap_pcc.c ppp.dev/pppd/pcap_pcc.c
 +  fclose (f);
 +  return 0;
 +}
-diff -urN ppp.old/pppd/pcap_pcc.h ppp.dev/pppd/pcap_pcc.h
---- ppp.old/pppd/pcap_pcc.h	1970-01-01 01:00:00.000000000 +0100
-+++ ppp.dev/pppd/pcap_pcc.h	2006-03-18 15:59:14.000000000 +0100
+Index: ppp-2.4.3/pppd/pcap_pcc.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ppp-2.4.3/pppd/pcap_pcc.h	2007-06-04 13:22:14.321678056 +0200
 @@ -0,0 +1,7 @@
 +#ifndef PCAP_PCC_H
 +#define PCAP_PCC_H