Changeset 1252

Timestamp:

12/04/06 20:34:50 (5 years ago)

Author:

dnehring

Message:

Update ppp to 2.4.4, removing patches which are very special (precompiled
filter, special default route parameter, pppoatm tuning, ppp reconnect
reimplementation). patches are now usable again.

Files:

• trunk/freewrt/package/ppp/Makefile (modified) (3 diffs)
• trunk/freewrt/package/ppp/patches/101-debian_ip-up_option.patch (deleted)
• trunk/freewrt/package/ppp/patches/102-debian_pppoe_multicast_pado.patch (deleted)
• trunk/freewrt/package/ppp/patches/103-debian_pppoe_cleanup.patch (deleted)
• trunk/freewrt/package/ppp/patches/104-debian_fix_linkpidfile.patch (deleted)
• trunk/freewrt/package/ppp/patches/105-debian_pppoatm_cleanup.patch (deleted)
• trunk/freewrt/package/ppp/patches/106-debian_pppoatm_fix_mtu.patch (deleted)
• trunk/freewrt/package/ppp/patches/107-debian_stripMSdomain.patch (deleted)
• trunk/freewrt/package/ppp/patches/108-debian_defaultroute.patch (deleted)
• trunk/freewrt/package/ppp/patches/109-debian_demand.patch (deleted)
• trunk/freewrt/package/ppp/patches/200-makefile.patch (modified) (2 diffs)
• trunk/freewrt/package/ppp/patches/201-mppe_mppc_1.1.patch (modified) (16 diffs)
• trunk/freewrt/package/ppp/patches/202-atm_fix.patch (deleted)
• trunk/freewrt/package/ppp/patches/203-no_strip.patch (modified) (7 diffs)
• trunk/freewrt/package/ppp/patches/205-pppoe_iface_name.patch (deleted)
• trunk/freewrt/package/ppp/patches/207-ppp_reconnect.patch (deleted)
• trunk/freewrt/package/ppp/patches/300-filter-pcap-includes-lib.patch (deleted)
• trunk/freewrt/package/ppp/patches/310-precompiled_filter.patch (deleted)

trunk/freewrt/package/ppp/Makefile

@@ -8 +8 @@
-
-PKG_NAME:=              ppp
-3
-8
-848f6c3cafeb6074ffeb293c3af79b7c
+4
+1
+183800762e266132218b204dfb428d29
-
-PKG_SOURCE_URL:=        ftp://ftp.samba.org/pub/ppp/
@@ -111 +111 @@
-        $(RSTRIP) $(IDIR_PPP)
-        $(IPKG_BUILD) $(IDIR_PPP) $(PACKAGE_DIR)
-
+
-$(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius.conf:
-        $(INSTALL_DIR) $(IDIR_PPP_MOD_RADIUS)/etc/ppp
@@ -158 +158 @@
-                $(IDIR_PPPUMTS)/etc/network/if-down.d/
-        $(IPKG_BUILD) $(IDIR_PPPUMTS) $(PACKAGE_DIR)
-

trunk/freewrt/package/ppp/patches/200-makefile.patch

@@ -1 @@
-ruN ppp-2.4.3-orig/pppd/Makefile.linux ppp-2.4.3-3
-3-orig/pppd/Makefile.linux 2004-11-13 13:02:22.000000000 +01
-3-3/pppd/Makefile.linux    2004-12-16 04:43
+Nur ppp-2.4.4.orig/pppd/Makefile.linux ppp-2.4.4
+4.orig/pppd/Makefile.linux 2006-06-04 07:07:46.000000000 +02
+4/pppd/Makefile.linux      2006-12-04 14:12
-@@ -48,19 +48,19 @@
- # Uncomment the next line to include support for PPP packet filtering.
@@ -33 +33 @@
-+COMPILE_FLAGS= -DHAVE_PATHS_H -DHAVE_MMAP
- 
-
+ '-DDESTDIR="@DESTDIR@"'
- 
-2 +117,12
+0 +117,8
- #LIBS     += -lshadow $(LIBS)
- endif
- 
--ifneq ($(wildcard /usr/include/crypt.h),)
-
-
-
-
-
-
+
- LIBS   += -lcrypt
--endif
-+#endif
- 
- ifdef NEEDDES

trunk/freewrt/package/ppp/patches/201-mppe_mppc_1.1.patch

@@ -100 +100 @@
-  * Definitions for other, as yet unsupported, compression methods.
-  */
-
-
-
+
+
-@@ -62,12 +62,10 @@
- static char bsd_value[8];
@@ -718 +717 @@
- static int
- ccp_nakci(f, p, len, treat_as_reject)
-0,6 +1079
-len
+1,6 +1080
+treat_as_reject
- {
-     ccp_options *go = &ccp_gotoptions[f->unit];
@@ -727 +726 @@
-     ccp_options try;           /* options to ask for next time */
- 
-7,28 +1088
+8,28 +1089
-     try = *go;
- 
@@ -846 +845 @@
-        && p[0] == (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT)
-        && p[1] == CILEN_DEFLATE) {
-1,14 +1254
+2,14 +1255
-        return -1;
- 
@@ -901 +900 @@
-        && p[0] == CI_DEFLATE && p[1] == CILEN_DEFLATE) {
-        if (p[2] != DEFLATE_MAKE_OPT(go->deflate_size)
-2,14 +1361
+3,14 +1362
-     int dont_nak;
- {
@@ -921 +920 @@
-     ret = CONFACK;
-     retp = p0 = p;
-2,103 +1392,305
+3,106 +1393,307
-            switch (type) {
- #ifdef MPPE
@@ -1183 +1182 @@
-                } else {
--                   /* Neither are set. */
+-                   /* We cannot accept this.  */
-+                   /* MPPE is not compatible with other compression types */
-+                   if (wo->mppe) {
@@ -1195 +1195 @@
-+                   p[2] = p2;
-+                   p[5] = p5;
-
-
+
+
+
+
-                }
- 
@@ -1299 +1301 @@
-            case CI_DEFLATE_DRAFT:
-                if (!ao->deflate || clen != CILEN_DEFLATE
-0,12 +1832
+4,12 +1835
-        else
-            *lenp = retp - p0;
@@ -1312 +1314 @@
- }
- 
-67,24 +1853
+71,24 +1856
-        char *p = result;
-        char *q = result + sizeof(result); /* 1 past result */
@@ -1364 +1366 @@
-     case CI_DEFLATE_DRAFT:
-        if (opt2 != NULL && opt2->deflate_size != opt->deflate_size)
-0,12 +1937
+4,12 +1940
-     } else if (ANY_COMPRESS(*ho))
-        notice("%s transmit compression enabled", method_name(ho, NULL));
@@ -1379 +1381 @@
- 
- /*
-68,7 +1965
+72,7 +1968
-            lcp_close(f->unit, "MPPE disabled");
-        }
@@ -1388 +1390 @@
- 
- /*
-28,24 +2025
+32,24 +2028
- #ifdef MPPE
-            case CI_MPPE:
@@ -1429 +1431 @@
-            case CI_DEFLATE_DRAFT:
-                if (optlen >= CILEN_DEFLATE) {
-1,6 +2132
+5,6 +2135
-            error("Lost compression sync: disabling compression");
-            ccp_close(unit, "Lost compression sync");
@@ -1437 +1439 @@
-             * If we were doing MPPE, we must also take the link down.
-             */
-38,9 +2140
+42,9 +2143
-                error("Too many MPPE errors, closing LCP");
-                lcp_close(unit, "Too many MPPE errors");
@@ -1457 +1459 @@
-             * We don't do that if we are still waiting for an
-             * acknowledgement to a previous reset-request.
-1,4 +2182
+5,4 +2185
-     } else
-        ccp_localstate[f->unit] &= ~RACK_PENDING;

trunk/freewrt/package/ppp/patches/203-no_strip.patch

@@ -1 @@
-ruN ppp-2.4.3-orig/chat/Makefile.linux ppp-2.4.3-3
-3-orig/chat/Makefile.linux 2004-11-03 12:51:47.000000000 +01
-3-3/chat/Makefile.linux    2004-12-05 17:42:43
+Nur ppp-2.4.4.orig/chat/Makefile.linux ppp-2.4.4
+4.orig/chat/Makefile.linux 2006-06-04 07:07:46.000000000 +02
+4/chat/Makefile.linux      2006-12-04 14:17:39
-@@ -25,7 +25,7 @@
- 
- install: chat
-
+ $(MANDIR)
--       $(INSTALL) -s -c chat $(BINDIR)
-+       $(INSTALL) -c chat $(BINDIR)
@@ -11 +11 @@
- 
- clean:
-ruN ppp-2.4.3-orig/pppd/Makefile.linux ppp-2.4.3-3
-3-orig/pppd/Makefile.linux 2004-11-13 13:02:22.000000000 +01
-3-3/pppd/Makefile.linux    2004-12-16 04:43:41
+Nur ppp-2.4.4.orig/pppd/Makefile.linux ppp-2.4.4
+4.orig/pppd/Makefile.linux 2006-06-04 07:07:46.000000000 +02
+4/pppd/Makefile.linux      2006-12-04 14:17:39
-@@ -99,7 +99,7 @@
- CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
@@ -23 +23 @@
- EXTRACLEAN += srp-entry.o
- NEEDDES=y
-2,7 +202
+0,7 +200
- install: pppd
-        mkdir -p $(BINDIR) $(MANDIR)
@@ -32 +32 @@
-          chmod o-rx,u+s $(BINDIR)/pppd; fi
-        $(INSTALL) -c -m 444 pppd.8 $(MANDIR)
-ruN ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.3-3
-3-orig/pppd/plugins/radius/Makefile.linux  2004-11-14 08:02:31.000000000 +01
-3-3/pppd/plugins/radius/Makefile.linux     2004-12-05 17:43:17
-7
+Nur ppp-2.4.4.orig/pppd/plugins/radius/Makefile.linux ppp-2.4.4
+4.orig/pppd/plugins/radius/Makefile.linux  2006-06-04 07:04:14.000000000 +02
+4/pppd/plugins/radius/Makefile.linux       2006-12-04 14:17:39
+6
- 
- install: all
@@ -48 +48 @@
-        $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
- 
-ruN ppp-2.4.3-orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3-3
-3-orig/pppd/plugins/rp-pppoe/Makefile.linux        2004-11-14 08:58:37.000000000 +01
-3-3/pppd/plugins/rp-pppoe/Makefile.linux   2004-12-05 17:43:23
+Nur ppp-2.4.4.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.4
+4.orig/pppd/plugins/rp-pppoe/Makefile.linux        2006-06-04 07:07:46.000000000 +02
+4/pppd/plugins/rp-pppoe/Makefile.linux     2006-12-04 14:17:39
-@@ -39,9 +39,9 @@
- 
@@ -63 +63 @@
- clean:
-        rm -f *.o *.so
-ruN ppp-2.4.3-orig/pppdump/Makefile.linux ppp-2.4.3-3
-3-orig/pppdump/Makefile.linux      2004-10-31 02:36:52
-3-3/pppdump/Makefile.linux 2004-12-05 17:50:34
-8
+Nur ppp-2.4.4.orig/pppdump/Makefile.linux ppp-2.4.4
+4.orig/pppdump/Makefile.linux      2006-06-04 07:04:14
+4/pppdump/Makefile.linux   2006-12-04 14:17:39
+7
- 
- install:
@@ -73 +73 @@
-+       $(INSTALL) -c pppdump $(BINDIR)
-        $(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
-ruN ppp-2.4.3-orig/pppstats/Makefile.linux ppp-2.4.3-3
-3-orig/pppstats/Makefile.linux     2004-10-31 23:09:03.000000000 +01
-3-3/pppstats/Makefile.linux        2004-12-05 17:43:38
+Nur ppp-2.4.4.orig/pppstats/Makefile.linux ppp-2.4.4
+4.orig/pppstats/Makefile.linux     2006-06-04 07:07:46.000000000 +02
+4/pppstats/Makefile.linux  2006-12-04 14:17:39
-@@ -22,7 +22,7 @@
-