Changeset 3749
- Timestamp:
- 05/19/08 13:28:20 (7 months ago)
- Files:
-
- branches/freewrt_1_0/package/ppp/Makefile (modified) (3 diffs)
- branches/freewrt_1_0/package/ppp/files/etc/ppp/options (modified) (1 diff)
- branches/freewrt_1_0/package/ppp/patches/101-debian_ip-up_option.patch (deleted)
- branches/freewrt_1_0/package/ppp/patches/102-debian_pppoe_multicast_pado.patch (deleted)
- branches/freewrt_1_0/package/ppp/patches/103-debian_pppoe_cleanup.patch (deleted)
- branches/freewrt_1_0/package/ppp/patches/104-debian_fix_linkpidfile.patch (deleted)
- branches/freewrt_1_0/package/ppp/patches/105-debian_pppoatm_cleanup.patch (deleted)
- branches/freewrt_1_0/package/ppp/patches/106-debian_pppoatm_fix_mtu.patch (deleted)
- branches/freewrt_1_0/package/ppp/patches/107-debian_stripMSdomain.patch (deleted)
- branches/freewrt_1_0/package/ppp/patches/108-debian_defaultroute.patch (deleted)
- branches/freewrt_1_0/package/ppp/patches/109-debian_demand.patch (deleted)
- branches/freewrt_1_0/package/ppp/patches/200-makefile.patch (modified) (2 diffs)
- branches/freewrt_1_0/package/ppp/patches/201-mppe_mppc_1.1.patch (modified) (16 diffs)
- branches/freewrt_1_0/package/ppp/patches/202-atm_fix.patch (deleted)
- branches/freewrt_1_0/package/ppp/patches/203-no_strip.patch (modified) (7 diffs)
- branches/freewrt_1_0/package/ppp/patches/205-pppoe_iface_name.patch (deleted)
- branches/freewrt_1_0/package/ppp/patches/206-radius_config.patch (modified) (1 diff)
- branches/freewrt_1_0/package/ppp/patches/207-ppp_reconnect.patch (deleted)
- branches/freewrt_1_0/package/ppp/patches/300-filter-pcap-includes-lib.patch (deleted)
- branches/freewrt_1_0/package/ppp/patches/310-precompiled_filter.patch (deleted)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/freewrt_1_0/package/ppp/Makefile
r3585 r3749 8 8 9 9 PKG_NAME:= ppp 10 PKG_VERSION:= 2.4. 311 PKG_RELEASE:= 1 112 PKG_MD5SUM:= 848f6c3cafeb6074ffeb293c3af79b7c10 PKG_VERSION:= 2.4.4 11 PKG_RELEASE:= 1 12 PKG_MD5SUM:= 183800762e266132218b204dfb428d29 13 13 14 14 PKG_SOURCE_URL:= ftp://ftp.samba.org/pub/ppp/ … … 111 111 $(RSTRIP) $(IDIR_PPP) 112 112 $(IPKG_BUILD) $(IDIR_PPP) $(PACKAGE_DIR) 113 113 114 114 $(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius.conf: 115 115 $(INSTALL_DIR) $(IDIR_PPP_MOD_RADIUS)/etc/ppp … … 155 155 $(IDIR_PPPUMTS)/etc/network/if-down.d/ 156 156 $(IPKG_BUILD) $(IDIR_PPPUMTS) $(PACKAGE_DIR) 157 branches/freewrt_1_0/package/ppp/files/etc/ppp/options
r842 r3749 1 1 lock 2 logfile /dev/null branches/freewrt_1_0/package/ppp/patches/200-makefile.patch
r3585 r3749 1 diff -Nur ppp-2.4. 3.orig/pppd/Makefile.linux ppp-2.4.3/pppd/Makefile.linux2 --- ppp-2.4. 3.orig/pppd/Makefile.linux 2004-11-13 13:02:22.000000000 +01003 +++ ppp-2.4. 3/pppd/Makefile.linux 2007-10-04 09:12:52.000000000 +02001 diff -Nur ppp-2.4.4.orig/pppd/Makefile.linux ppp-2.4.4/pppd/Makefile.linux 2 --- ppp-2.4.4.orig/pppd/Makefile.linux 2006-06-04 07:07:46.000000000 +0200 3 +++ ppp-2.4.4/pppd/Makefile.linux 2007-10-04 08:53:26.000000000 +0200 4 4 @@ -48,7 +48,7 @@ 5 5 # Uncomment the next line to include support for PPP packet filtering. … … 30 30 +COMPILE_FLAGS= -DHAVE_PATHS_H -DHAVE_MMAP 31 31 32 CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) 32 CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"' 33 33 34 @@ -117,1 2 +117,12@@34 @@ -117,10 +117,8 @@ 35 35 #LIBS += -lshadow $(LIBS) 36 36 endif 37 37 38 38 -ifneq ($(wildcard /usr/include/crypt.h),) 39 +#ifneq ($(wildcard /usr/include/crypt.h),) 40 CFLAGS += -DHAVE_CRYPT_H=1 41 -endif 42 -ifneq ($(wildcard /usr/lib/libcrypt.*),) 43 +#endif 44 +#ifneq ($(wildcard /usr/lib/libcrypt.*),) 39 CFLAGS += -DHAVE_CRYPT_H=1 45 40 LIBS += -lcrypt 46 41 -endif 47 +#endif48 42 49 43 ifdef NEEDDES branches/freewrt_1_0/package/ppp/patches/201-mppe_mppc_1.1.patch
r1 r3749 100 100 * Definitions for other, as yet unsupported, compression methods. 101 101 */ 102 diff -ruN ppp-2.4.3.orig/pppd/ccp.c ppp-2.4.3/pppd/ccp.c 103 --- ppp-2.4.3.orig/pppd/ccp.c 2004-11-13 03:28:15.000000000 +0100 104 +++ ppp-2.4.3/pppd/ccp.c 2004-11-21 13:54:09.000000000 +0100 102 --- ppp-2.4.4/pppd/ccp.c.orig 2005-07-09 02:23:05.000000000 +0200 103 +++ ppp-2.4.4/pppd/ccp.c 2006-07-21 23:34:12.121546000 +0200 105 104 @@ -62,12 +62,10 @@ 106 105 static char bsd_value[8]; … … 718 717 static int 719 718 ccp_nakci(f, p, len, treat_as_reject) 720 @@ -90 0,6 +1079,8 @@721 int len;719 @@ -901,6 +1080,8 @@ 720 int treat_as_reject; 722 721 { 723 722 ccp_options *go = &ccp_gotoptions[f->unit]; … … 727 726 ccp_options try; /* options to ask for next time */ 728 727 729 @@ -90 7,28 +1088,100 @@728 @@ -908,28 +1089,100 @@ 730 729 try = *go; 731 730 … … 846 845 && p[0] == (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT) 847 846 && p[1] == CILEN_DEFLATE) { 848 @@ -100 1,14 +1254,50 @@847 @@ -1002,14 +1255,50 @@ 849 848 return -1; 850 849 … … 901 900 && p[0] == CI_DEFLATE && p[1] == CILEN_DEFLATE) { 902 901 if (p[2] != DEFLATE_MAKE_OPT(go->deflate_size) 903 @@ -107 2,14 +1361,15 @@902 @@ -1073,14 +1362,15 @@ 904 903 int dont_nak; 905 904 { … … 921 920 ret = CONFACK; 922 921 retp = p0 = p; 923 @@ -110 2,103 +1392,305@@922 @@ -1103,106 +1393,307 @@ 924 923 switch (type) { 925 924 #ifdef MPPE … … 1183 1182 } else { 1184 1183 - /* Neither are set. */ 1184 - /* We cannot accept this. */ 1185 1185 + /* MPPE is not compatible with other compression types */ 1186 1186 + if (wo->mppe) { … … 1195 1195 + p[2] = p2; 1196 1196 + p[5] = p5; 1197 newret = CONFREJ; 1198 break; 1197 newret = CONFNAK; 1198 /* Give the peer our idea of what can be used, 1199 so it can choose and confirm */ 1200 ho->mppe = ao->mppe; 1199 1201 } 1200 1202 … … 1299 1301 case CI_DEFLATE_DRAFT: 1300 1302 if (!ao->deflate || clen != CILEN_DEFLATE 1301 @@ -134 0,12 +1832,6 @@1303 @@ -1344,12 +1835,6 @@ 1302 1304 else 1303 1305 *lenp = retp - p0; … … 1312 1314 } 1313 1315 1314 @@ -13 67,24 +1853,35 @@1316 @@ -1371,24 +1856,35 @@ 1315 1317 char *p = result; 1316 1318 char *q = result + sizeof(result); /* 1 past result */ … … 1364 1366 case CI_DEFLATE_DRAFT: 1365 1367 if (opt2 != NULL && opt2->deflate_size != opt->deflate_size) 1366 @@ -144 0,12 +1937,12 @@1368 @@ -1444,12 +1940,12 @@ 1367 1369 } else if (ANY_COMPRESS(*ho)) 1368 1370 notice("%s transmit compression enabled", method_name(ho, NULL)); … … 1379 1381 1380 1382 /* 1381 @@ -14 68,7 +1965,7 @@1383 @@ -1472,7 +1968,7 @@ 1382 1384 lcp_close(f->unit, "MPPE disabled"); 1383 1385 } … … 1388 1390 1389 1391 /* 1390 @@ -15 28,24 +2025,28 @@1392 @@ -1532,24 +2028,28 @@ 1391 1393 #ifdef MPPE 1392 1394 case CI_MPPE: … … 1429 1431 case CI_DEFLATE_DRAFT: 1430 1432 if (optlen >= CILEN_DEFLATE) { 1431 @@ -163 1,6 +2132,7 @@1433 @@ -1635,6 +2135,7 @@ 1432 1434 error("Lost compression sync: disabling compression"); 1433 1435 ccp_close(unit, "Lost compression sync"); … … 1437 1439 * If we were doing MPPE, we must also take the link down. 1438 1440 */ 1439 @@ -16 38,9 +2140,18 @@1441 @@ -1642,9 +2143,18 @@ 1440 1442 error("Too many MPPE errors, closing LCP"); 1441 1443 lcp_close(unit, "Too many MPPE errors"); … … 1457 1459 * We don't do that if we are still waiting for an 1458 1460 * acknowledgement to a previous reset-request. 1459 @@ -167 1,4 +2182,3 @@1461 @@ -1675,4 +2185,3 @@ 1460 1462 } else 1461 1463 ccp_localstate[f->unit] &= ~RACK_PENDING; branches/freewrt_1_0/package/ppp/patches/203-no_strip.patch
r1 r3749 1 diff - ruN ppp-2.4.3-orig/chat/Makefile.linux ppp-2.4.3-3/chat/Makefile.linux2 --- ppp-2.4. 3-orig/chat/Makefile.linux 2004-11-03 12:51:47.000000000 +01003 +++ ppp-2.4. 3-3/chat/Makefile.linux 2004-12-05 17:42:43.000000000 +01001 diff -Nur ppp-2.4.4.orig/chat/Makefile.linux ppp-2.4.4/chat/Makefile.linux 2 --- ppp-2.4.4.orig/chat/Makefile.linux 2006-06-04 07:07:46.000000000 +0200 3 +++ ppp-2.4.4/chat/Makefile.linux 2006-12-04 14:17:39.000000000 +0100 4 4 @@ -25,7 +25,7 @@ 5 5 6 6 install: chat 7 mkdir -p $(BINDIR) 7 mkdir -p $(BINDIR) $(MANDIR) 8 8 - $(INSTALL) -s -c chat $(BINDIR) 9 9 + $(INSTALL) -c chat $(BINDIR) … … 11 11 12 12 clean: 13 diff - ruN ppp-2.4.3-orig/pppd/Makefile.linux ppp-2.4.3-3/pppd/Makefile.linux14 --- ppp-2.4. 3-orig/pppd/Makefile.linux 2004-11-13 13:02:22.000000000 +010015 +++ ppp-2.4. 3-3/pppd/Makefile.linux 2004-12-16 04:43:41.000000000 +010013 diff -Nur ppp-2.4.4.orig/pppd/Makefile.linux ppp-2.4.4/pppd/Makefile.linux 14 --- ppp-2.4.4.orig/pppd/Makefile.linux 2006-06-04 07:07:46.000000000 +0200 15 +++ ppp-2.4.4/pppd/Makefile.linux 2006-12-04 14:17:39.000000000 +0100 16 16 @@ -99,7 +99,7 @@ 17 17 CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include … … 23 23 EXTRACLEAN += srp-entry.o 24 24 NEEDDES=y 25 @@ -20 2,7 +202,7 @@25 @@ -200,7 +200,7 @@ 26 26 install: pppd 27 27 mkdir -p $(BINDIR) $(MANDIR) … … 32 32 chmod o-rx,u+s $(BINDIR)/pppd; fi 33 33 $(INSTALL) -c -m 444 pppd.8 $(MANDIR) 34 diff - ruN ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.3-3/pppd/plugins/radius/Makefile.linux35 --- ppp-2.4. 3-orig/pppd/plugins/radius/Makefile.linux 2004-11-14 08:02:31.000000000 +010036 +++ ppp-2.4. 3-3/pppd/plugins/radius/Makefile.linux 2004-12-05 17:43:17.000000000 +010037 @@ -36,9 +3 7,9 @@34 diff -Nur ppp-2.4.4.orig/pppd/plugins/radius/Makefile.linux ppp-2.4.4/pppd/plugins/radius/Makefile.linux 35 --- ppp-2.4.4.orig/pppd/plugins/radius/Makefile.linux 2006-06-04 07:04:14.000000000 +0200 36 +++ ppp-2.4.4/pppd/plugins/radius/Makefile.linux 2006-12-04 14:17:39.000000000 +0100 37 @@ -36,9 +36,9 @@ 38 38 39 39 install: all … … 48 48 $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR) 49 49 50 diff - ruN ppp-2.4.3-orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3-3/pppd/plugins/rp-pppoe/Makefile.linux51 --- ppp-2.4. 3-orig/pppd/plugins/rp-pppoe/Makefile.linux 2004-11-14 08:58:37.000000000 +010052 +++ ppp-2.4. 3-3/pppd/plugins/rp-pppoe/Makefile.linux 2004-12-05 17:43:23.000000000 +010050 diff -Nur ppp-2.4.4.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux 51 --- ppp-2.4.4.orig/pppd/plugins/rp-pppoe/Makefile.linux 2006-06-04 07:07:46.000000000 +0200 52 +++ ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux 2006-12-04 14:17:39.000000000 +0100 53 53 @@ -39,9 +39,9 @@ 54 54 … … 63 63 clean: 64 64 rm -f *.o *.so 65 diff - ruN ppp-2.4.3-orig/pppdump/Makefile.linux ppp-2.4.3-3/pppdump/Makefile.linux66 --- ppp-2.4. 3-orig/pppdump/Makefile.linux 2004-10-31 02:36:52.000000000 +020067 +++ ppp-2.4. 3-3/pppdump/Makefile.linux 2004-12-05 17:50:34.000000000 +010068 @@ -17,5 +1 8,5 @@65 diff -Nur ppp-2.4.4.orig/pppdump/Makefile.linux ppp-2.4.4/pppdump/Makefile.linux 66 --- ppp-2.4.4.orig/pppdump/Makefile.linux 2006-06-04 07:04:14.000000000 +0200 67 +++ ppp-2.4.4/pppdump/Makefile.linux 2006-12-04 14:17:39.000000000 +0100 68 @@ -17,5 +17,5 @@ 69 69 70 70 install: … … 73 73 + $(INSTALL) -c pppdump $(BINDIR) 74 74 $(INSTALL) -c -m 444 pppdump.8 $(MANDIR) 75 diff - ruN ppp-2.4.3-orig/pppstats/Makefile.linux ppp-2.4.3-3/pppstats/Makefile.linux76 --- ppp-2.4. 3-orig/pppstats/Makefile.linux 2004-10-31 23:09:03.000000000 +010077 +++ ppp-2.4. 3-3/pppstats/Makefile.linux 2004-12-05 17:43:38.000000000 +010075 diff -Nur ppp-2.4.4.orig/pppstats/Makefile.linux ppp-2.4.4/pppstats/Makefile.linux 76 --- ppp-2.4.4.orig/pppstats/Makefile.linux 2006-06-04 07:07:46.000000000 +0200 77 +++ ppp-2.4.4/pppstats/Makefile.linux 2006-12-04 14:17:39.000000000 +0100 78 78 @@ -22,7 +22,7 @@ 79 79 branches/freewrt_1_0/package/ppp/patches/206-radius_config.patch
r1 r3749 1 diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/config.c ppp-2.4.3-3/pppd/plugins/radius/config.c 2 --- ppp-2.4.3-orig/pppd/plugins/radius/config.c 2004-11-14 08:26:26.000000000 +0100 3 +++ ppp-2.4.3-3/pppd/plugins/radius/config.c 2004-12-16 04:03:46.000000000 +0100 4 @@ -369,31 +369,37 @@ 5 } 6 #endif 1 diff -Nur ppp-2.4.4-orig/pppd/plugins/radius/etc/radiusclient.conf ppp-2.4.4/pppd/plugins/radius/etc/radiusclient.conf 2 --- ppp-2.4.4-orig/pppd/plugins/radius/etc/radiusclient.conf 2004-11-14 00:48:39.000000000 +0100 3 +++ ppp-2.4.4/pppd/plugins/radius/etc/radiusclient.conf 2007-01-23 23:56:52.000000000 +0100 4 @@ -22,7 +22,7 @@ 7 5 8 +#if 0 9 if (rc_conf_int("login_tries") <= 0) 10 { 11 error("%s: login_tries <= 0 is illegal", filename); 12 return (-1); 13 } 14 +#endif 15 if (rc_conf_str("seqfile") == NULL) 16 { 17 error("%s: seqfile not specified", filename); 18 return (-1); 19 } 20 +#if 0 21 if (rc_conf_int("login_timeout") <= 0) 22 { 23 error("%s: login_timeout <= 0 is illegal", filename); 24 return (-1); 25 } 26 +#endif 27 if (rc_conf_str("mapfile") == NULL) 28 { 29 error("%s: mapfile not specified", filename); 30 return (-1); 31 } 32 +#if 0 33 if (rc_conf_str("nologin") == NULL) 34 { 35 error("%s: nologin not specified", filename); 36 return (-1); 37 } 38 +#endif 6 # name of the issue file. it's only display when no username is passed 7 # on the radlogin command line (default /etc/radiusclient/issue) 8 -issue /usr/local/etc/radiusclient/issue 9 +issue /etc/radiusclient/issue 39 10 40 return 0; 41 } 42 diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/options.h ppp-2.4.3-3/pppd/plugins/radius/options.h 43 --- ppp-2.4.3-orig/pppd/plugins/radius/options.h 2004-11-14 08:26:26.000000000 +0100 44 +++ ppp-2.4.3-3/pppd/plugins/radius/options.h 2004-12-16 04:09:16.000000000 +0100 45 @@ -31,24 +31,21 @@ 46 static SERVER acctserver = {0}; 47 static SERVER authserver = {0}; 11 # RADIUS settings 48 12 49 -int default_tries = 4; 50 -int default_timeout = 60; 51 - 52 static OPTION config_options[] = { 53 /* internally used options */ 54 {"config_file", OT_STR, ST_UNDEF, NULL}, 55 /* General options */ 56 {"auth_order", OT_AUO, ST_UNDEF, NULL}, 57 -{"login_tries", OT_INT, ST_UNDEF, &default_tries}, 58 -{"login_timeout", OT_INT, ST_UNDEF, &default_timeout}, 59 -{"nologin", OT_STR, ST_UNDEF, "/etc/nologin"}, 60 -{"issue", OT_STR, ST_UNDEF, "/etc/radiusclient/issue"}, 61 +{"login_tries", OT_INT, ST_UNDEF, NULL}, 62 +{"login_timeout", OT_INT, ST_UNDEF, NULL}, 63 +{"nologin", OT_STR, ST_UNDEF, NULL}, 64 +{"issue", OT_STR, ST_UNDEF, NULL}, 65 /* RADIUS specific options */ 66 {"authserver", OT_SRV, ST_UNDEF, &authserver}, 67 {"acctserver", OT_SRV, ST_UNDEF, &acctserver}, 68 {"servers", OT_STR, ST_UNDEF, NULL}, 69 {"dictionary", OT_STR, ST_UNDEF, NULL}, 70 -{"login_radius", OT_STR, ST_UNDEF, "/usr/sbin/login.radius"}, 71 +{"login_radius", OT_STR, ST_UNDEF, NULL}, 72 {"seqfile", OT_STR, ST_UNDEF, NULL}, 73 {"mapfile", OT_STR, ST_UNDEF, NULL}, 74 {"default_realm", OT_STR, ST_UNDEF, NULL}, 13 @@ -43,22 +43,22 @@ 14 15 # file holding shared secrets used for the communication 16 # between the RADIUS client and server 17 -servers /usr/local/etc/radiusclient/servers 18 +servers /etc/radiusclient/servers 19 20 # dictionary of allowed attributes and values 21 # just like in the normal RADIUS distributions 22 -dictionary /usr/local/etc/radiusclient/dictionary 23 +dictionary /etc/radiusclient/dictionary 24 25 # program to call for a RADIUS authenticated login 26 # (default /usr/sbin/login.radius) 27 -login_radius /usr/local/sbin/login.radius 28 +login_radius /sbin/login.radius 29 30 # file which holds sequence number for communication with the 31 # RADIUS server 32 seqfile /var/run/radius.seq 33 34 # file which specifies mapping between ttyname and NAS-Port attribute 35 -mapfile /usr/local/etc/radiusclient/port-id-map 36 +mapfile /etc/radiusclient/port-id-map 37 38 # default authentication realm to append to all usernames if no 39 # realm was explicitly specified by the user
