aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2020-08-11 21:08:05 +0200
committerHans Dedecker <dedeckeh@gmail.com>2020-08-11 21:27:07 +0200
commit5e512cc9c1a441f5444ac05b666fec15faff9110 (patch)
tree60ab46a755bb33d13b0e567951af25f2d5229bcd
parentc43af7a6cb3303dba044595a6acd8dc8b9d3d046 (diff)
downloadupstream-5e512cc9c1a441f5444ac05b666fec15faff9110.tar.gz
upstream-5e512cc9c1a441f5444ac05b666fec15faff9110.tar.bz2
upstream-5e512cc9c1a441f5444ac05b666fec15faff9110.zip
ppp: update to latest git HEAD
677aa53 Fix -W option for pppoe-discovery utility (#157) 115c419 Accept Malformed Windows Success Message (#156) 5bdb148 pppd: Add documentation of stop-bits option to pppd man page (#154) 2a7981f Add ipv6cp-accept-remote option 0678d3b pppd: Fix the default value for ipv6cp-accept-local to false Refresh patches Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
-rw-r--r--package/network/services/ppp/Makefile6
-rw-r--r--package/network/services/ppp/patches/105-debian_demand.patch2
-rw-r--r--package/network/services/ppp/patches/110-debian_defaultroute.patch2
-rw-r--r--package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch6
-rw-r--r--package/network/services/ppp/patches/201-mppe_mppc_1.1.patch2
5 files changed, 9 insertions, 9 deletions
diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile
index bc1eccacb6..de73fdbe00 100644
--- a/package/network/services/ppp/Makefile
+++ b/package/network/services/ppp/Makefile
@@ -13,9 +13,9 @@ PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/paulusmack/ppp
-PKG_SOURCE_DATE:=2020-05-25
-PKG_SOURCE_VERSION:=ddd57c279f467e18c4fb3a661f21a069a5a37a1f
-PKG_MIRROR_HASH:=aac65e65dd25eaf8978a7a0b3258c863d90e29e247dd33d95276c0c189bcd424
+PKG_SOURCE_DATE:=2020-08-07
+PKG_SOURCE_VERSION:=045169401601639b9163e1df00f868a0a49131ce
+PKG_MIRROR_HASH:=0ceb3e649d191c1fe225be580135aa181d9d3ba3689503691c4c9469ddac64a3
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=BSD-4-Clause
PKG_CPE_ID:=cpe:/a:samba:ppp
diff --git a/package/network/services/ppp/patches/105-debian_demand.patch b/package/network/services/ppp/patches/105-debian_demand.patch
index fb6f39f4b9..c442f4c8af 100644
--- a/package/network/services/ppp/patches/105-debian_demand.patch
+++ b/package/network/services/ppp/patches/105-debian_demand.patch
@@ -150,7 +150,7 @@
} else {
--- a/pppd/ipv6cp.c
+++ b/pppd/ipv6cp.c
-@@ -1252,7 +1252,7 @@ ipv6cp_up(f)
+@@ -1258,7 +1258,7 @@ ipv6cp_up(f)
if (sif6defaultroute(f->unit, go->ourid, ho->hisid))
default_route_set[f->unit] = 1;
}
diff --git a/package/network/services/ppp/patches/110-debian_defaultroute.patch b/package/network/services/ppp/patches/110-debian_defaultroute.patch
index e474571767..21b329e5d5 100644
--- a/package/network/services/ppp/patches/110-debian_defaultroute.patch
+++ b/package/network/services/ppp/patches/110-debian_defaultroute.patch
@@ -137,7 +137,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
.B disconnect \fIscript
Execute the command specified by \fIscript\fR, by passing it to a
shell, after
-@@ -751,7 +756,12 @@ disable both forms of hardware flow cont
+@@ -756,7 +761,12 @@ disable both forms of hardware flow cont
.TP
.B nodefaultroute
Disable the \fIdefaultroute\fR option. The system administrator who
diff --git a/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch b/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch
index 5ef09b3f3e..a1110caecb 100644
--- a/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch
+++ b/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch
@@ -48,7 +48,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
"Enable multilink operation", OPT_PRIO | 1 },
--- a/pppd/ipv6cp.c
+++ b/pppd/ipv6cp.c
-@@ -1294,7 +1294,7 @@ ipv6cp_up(f)
+@@ -1300,7 +1300,7 @@ ipv6cp_up(f)
*/
if (ipv6cp_script_state == s_down && ipv6cp_script_pid == 0) {
ipv6cp_script_state = s_up;
@@ -57,7 +57,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
}
}
-@@ -1346,7 +1346,7 @@ ipv6cp_down(f)
+@@ -1352,7 +1352,7 @@ ipv6cp_down(f)
/* Execute the ipv6-down script */
if (ipv6cp_script_state == s_up && ipv6cp_script_pid == 0) {
ipv6cp_script_state = s_down;
@@ -66,7 +66,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
}
}
-@@ -1389,13 +1389,13 @@ ipv6cp_script_done(arg)
+@@ -1395,13 +1395,13 @@ ipv6cp_script_done(arg)
case s_up:
if (ipv6cp_fsm[0].state != OPENED) {
ipv6cp_script_state = s_down;
diff --git a/package/network/services/ppp/patches/201-mppe_mppc_1.1.patch b/package/network/services/ppp/patches/201-mppe_mppc_1.1.patch
index bc1b69ebf1..9345c10400 100644
--- a/package/network/services/ppp/patches/201-mppe_mppc_1.1.patch
+++ b/package/network/services/ppp/patches/201-mppe_mppc_1.1.patch
@@ -1473,7 +1473,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
--- a/pppd/chap_ms.c
+++ b/pppd/chap_ms.c
-@@ -962,13 +962,17 @@ set_mppe_enc_types(int policy, int types
+@@ -964,13 +964,17 @@ set_mppe_enc_types(int policy, int types
/*
* Disable undesirable encryption types. Note that we don't ENABLE
* any encryption types, to avoid overriding manual configuration.