diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2009-05-21 10:48:24 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2009-05-21 10:48:24 +0000 |
commit | b97b54291da149cf68a6db878aae2f92962e1cad (patch) | |
tree | f38b2d8c653a7677346f4b25e4f80e636a73ea42 /package/ppp/patches/100-debian_ip-ip_option.patch | |
parent | 9137c11605e9bd0f7cc67895fd852e0b04cb672d (diff) | |
download | master-31e0f0ae-b97b54291da149cf68a6db878aae2f92962e1cad.tar.gz master-31e0f0ae-b97b54291da149cf68a6db878aae2f92962e1cad.tar.bz2 master-31e0f0ae-b97b54291da149cf68a6db878aae2f92962e1cad.zip |
Make patches apply agagin. The deleted parts were two times in the patches.
SVN-Revision: 15957
Diffstat (limited to 'package/ppp/patches/100-debian_ip-ip_option.patch')
-rw-r--r-- | package/ppp/patches/100-debian_ip-ip_option.patch | 88 |
1 files changed, 0 insertions, 88 deletions
diff --git a/package/ppp/patches/100-debian_ip-ip_option.patch b/package/ppp/patches/100-debian_ip-ip_option.patch index 2b64ba874e..9b4c4dcbd9 100644 --- a/package/ppp/patches/100-debian_ip-ip_option.patch +++ b/package/ppp/patches/100-debian_ip-ip_option.patch @@ -86,91 +86,3 @@ diff -Naur ppp-2.4.4.orig/pppd/pppd.h ppp-2.4.4/pppd/pppd.h extern bool multilink; /* enable multilink operation */ extern bool noendpoint; /* don't send or accept endpt. discrim. */ extern char *bundle_name; /* bundle name for multilink */ -diff -Naur ppp-2.4.4.orig/pppd/ipcp.c ppp-2.4.4/pppd/ipcp.c ---- ppp-2.4.4.orig/pppd/ipcp.c 2005-08-25 19:59:34.000000000 -0400 -+++ ppp-2.4.4/pppd/ipcp.c 2009-05-07 15:47:29.000000000 -0400 -@@ -1850,7 +1850,7 @@ - */ - if (ipcp_script_state == s_down && ipcp_script_pid == 0) { - ipcp_script_state = s_up; -- ipcp_script(_PATH_IPUP, 0); -+ ipcp_script(path_ipup, 0); - } - } - -@@ -1900,7 +1900,7 @@ - /* Execute the ip-down script */ - if (ipcp_script_state == s_up && ipcp_script_pid == 0) { - ipcp_script_state = s_down; -- ipcp_script(_PATH_IPDOWN, 0); -+ ipcp_script(path_ipdown, 0); - } - } - -@@ -1954,13 +1954,13 @@ - case s_up: - if (ipcp_fsm[0].state != OPENED) { - ipcp_script_state = s_down; -- ipcp_script(_PATH_IPDOWN, 0); -+ ipcp_script(path_ipdown, 0); - } - break; - case s_down: - if (ipcp_fsm[0].state == OPENED) { - ipcp_script_state = s_up; -- ipcp_script(_PATH_IPUP, 0); -+ ipcp_script(path_ipup, 0); - } - break; - } -diff -Naur ppp-2.4.4.orig/pppd/main.c ppp-2.4.4/pppd/main.c ---- ppp-2.4.4.orig/pppd/main.c 2006-06-03 23:52:50.000000000 -0400 -+++ ppp-2.4.4/pppd/main.c 2009-05-07 15:47:29.000000000 -0400 -@@ -315,6 +315,9 @@ - struct protent *protp; - char numbuf[16]; - -+ strlcpy(path_ipup, _PATH_IPUP, sizeof(path_ipup)); -+ strlcpy(path_ipdown, _PATH_IPDOWN, sizeof(path_ipdown)); -+ - link_stats_valid = 0; - new_phase(PHASE_INITIALIZE); - -diff -Naur ppp-2.4.4.orig/pppd/options.c ppp-2.4.4/pppd/options.c ---- ppp-2.4.4.orig/pppd/options.c 2006-06-18 07:26:00.000000000 -0400 -+++ ppp-2.4.4/pppd/options.c 2009-05-07 15:47:29.000000000 -0400 -@@ -113,6 +113,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 */ -+char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ -+char path_ipdown[MAXPATHLEN];/* pathname of ip-down script */ - bool multilink = 0; /* Enable multilink operation */ - char *bundle_name = NULL; /* bundle name for multilink */ - bool dump_options; /* print out option values */ -@@ -281,6 +283,13 @@ - "Number of seconds to wait for child processes at exit", - OPT_PRIO }, - -+ { "ip-up-script", o_string, path_ipup, -+ "Set pathname of ip-up script", -+ OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN }, -+ { "ip-down-script", o_string, path_ipdown, -+ "Set pathname of ip-down script", -+ OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN }, -+ - #ifdef HAVE_MULTILINK - { "multilink", o_bool, &multilink, - "Enable multilink operation", OPT_PRIO | 1 }, -diff -Naur ppp-2.4.4.orig/pppd/pppd.h ppp-2.4.4/pppd/pppd.h ---- ppp-2.4.4.orig/pppd/pppd.h 2005-08-25 19:59:34.000000000 -0400 -+++ ppp-2.4.4/pppd/pppd.h 2009-05-07 15:47:29.000000000 -0400 -@@ -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 */ -+extern char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ -+extern char path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */ - extern bool multilink; /* enable multilink operation */ - extern bool noendpoint; /* don't send or accept endpt. discrim. */ - extern char *bundle_name; /* bundle name for multilink */ |