Source: ppp
Version: 2.4.9-1+1.1
As preparation for #1006705 and according to the LowNMU, I am uploading a NMU
for ppp.
Please find the debdiff attached.
diff -Nru ppp-2.4.9/debian/changelog ppp-2.4.9/debian/changelog
--- ppp-2.4.9/debian/changelog 2021-01-07 01:10:29.000000000 +0100
+++ ppp-2.4.9/debian/changelog 2022-04-11 11:11:33.000000000 +0200
@@ -1,3 +1,19 @@
+ppp (2.4.9-1+1.1) unstable; urgency=high
+
+ * Non-maintainer upload
+
+ [ Paul Wise ]
+ * Compile for host architecture (Closes: #990021)
+
+ [ Till Kamppeter ]
+ * Let 0000usepeerdns exit when NetworkManager is in use (LP: #1778946)
+
+ [ Eivind Næss ]
+ * d/p/eap-mschap-v2-namelen.patch: fix the length of the username when
+ responding to an EAP MSCHAPv2 challenge (LP: #1958196)
+
+ -- Bastian Germann <b...@debian.org> Mon, 11 Apr 2022 11:11:33 +0200
+
ppp (2.4.9-1+1) unstable; urgency=medium
[ Samuel Thibault ]
diff -Nru ppp-2.4.9/debian/extra/ip-up.d/0000usepeerdns
ppp-2.4.9/debian/extra/ip-up.d/0000usepeerdns
--- ppp-2.4.9/debian/extra/ip-up.d/0000usepeerdns 2021-01-07
01:10:29.000000000 +0100
+++ ppp-2.4.9/debian/extra/ip-up.d/0000usepeerdns 2022-04-11
10:28:56.000000000 +0200
@@ -11,6 +11,13 @@
systemctl is-active --quiet systemd-resolved.service &&
exit 0
+case "$6" in
+ nm-*-service-*|/org/freedesktop/NetworkManager/PPP/*)
+ # NetworkManager handles it
+ exit 0
+ ;;
+esac
+
# create the file if it does not exist
if [ ! -e /etc/resolv.conf ]; then
: > /etc/resolv.conf
diff -Nru ppp-2.4.9/debian/.gitignore ppp-2.4.9/debian/.gitignore
--- ppp-2.4.9/debian/.gitignore 2021-01-07 01:10:29.000000000 +0100
+++ ppp-2.4.9/debian/.gitignore 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-/.debhelper/
-/ppp/
-/ppp-dev/
-/ppp-udeb/
-/tmp-ppp/
-/tmp-udeb/
-
-/changelog-from-README
-/debhelper-build-stamp
-/extra/dh_ppp.1p
-/files
-
-*.debhelper
-*.debhelper.log
-*.substvars
diff -Nru ppp-2.4.9/debian/patches/eap-mschap-v2-namelen.patch
ppp-2.4.9/debian/patches/eap-mschap-v2-namelen.patch
--- ppp-2.4.9/debian/patches/eap-mschap-v2-namelen.patch 1970-01-01
01:00:00.000000000 +0100
+++ ppp-2.4.9/debian/patches/eap-mschap-v2-namelen.patch 2022-04-11
10:54:12.000000000 +0200
@@ -0,0 +1,22 @@
+Description: This fixes the length of the username when responding to an EAP
+ MSCHAPv2 challenge.
+ .
+ [rbasak]
+ Also see the discussion in the MP:
+ https://code.launchpad.net/~eivnaes/ubuntu/+source/ppp/+git/ppp/+merge/415397
+Author: Eivind Næss <eivn...@yahoo.com>
+Acked-By: Robie Basak <robie.ba...@ubuntu.com>
+Origin: upstream,
https://github.com/ppp-project/ppp/commit/d7e62a8499c4032d79e05afbd8fd3efd51c5b148
+Bug-Ubuntu: https://launchpad.net/bugs/1958196
+Last-Update: 2022-02-24
+
+--- a/pppd/eap.c
++++ b/pppd/eap.c
+@@ -2261,6 +2261,7 @@
+ eap_send_nak(esp, id, EAPT_SRP);
+ break;
+ }
++ esp->es_client.ea_namelen = strlen(esp->es_client.ea_name);
+
+ /* Create the MSCHAPv2 response (and add to cache) */
+ unsigned char response[MS_CHAP2_RESPONSE_LEN+1]; // VLEN + VALUE
diff -Nru ppp-2.4.9/debian/patches/series ppp-2.4.9/debian/patches/series
--- ppp-2.4.9/debian/patches/series 2021-01-07 01:10:29.000000000 +0100
+++ ppp-2.4.9/debian/patches/series 2022-04-11 10:55:48.000000000 +0200
@@ -15,3 +15,6 @@
zzz_config
pppd-soname-hack.patch
replace-vendored-hash-functions.patch
+
+# upstream backports
+eap-mschap-v2-namelen.patch
diff -Nru ppp-2.4.9/debian/rules ppp-2.4.9/debian/rules
--- ppp-2.4.9/debian/rules 2021-01-07 01:10:29.000000000 +0100
+++ ppp-2.4.9/debian/rules 2022-04-11 10:24:10.000000000 +0200
@@ -60,7 +60,7 @@
[ ! -f Makefile ] || $(MAKE) dist-clean
override_dh_auto_configure:
- ./configure --prefix=/usr
+ ./configure --prefix=/usr --cc=gcc
--cross_compile="$(DEB_HOST_GNU_TYPE)-"
if [ ! -d pppd-udeb/ ]; then \
mkdir pppd-udeb/ && \
cp -ldpR pppd/* pppd-udeb/; \
