diffstat of debian/ for ppp_2.4.7-2+4.1 ppp_2.4.7-2+4.1endless1 changelog | 38 ++++++++++++++++++++++++++++++++++++++ ppp.pppd-dns.init | 23 ----------------------- ppp.pppd-dns.service | 10 ---------- rules | 2 -- 4 files changed, 38 insertions(+), 35 deletions(-) diff -Nru ppp-2.4.7/debian/changelog ppp-2.4.7/debian/changelog --- ppp-2.4.7/debian/changelog 2019-03-09 14:48:25.000000000 +0000 +++ ppp-2.4.7/debian/changelog 2019-03-25 07:35:35.000000000 +0000 @@ -1,3 +1,11 @@ +ppp (2.4.7-2+4.1endless1) UNRELEASED; urgency=low + + * Merge from Debian buster. + * Dropped patch replace-des-crypt.patch because it can be reverted + cleanly after applying upstream quilt patches + + -- Merge-o-Matic Mon, 25 Mar 2019 00:35:35 -0700 + ppp (2.4.7-2+4.1) unstable; urgency=medium * Non-maintainer upload. @@ -7,6 +15,35 @@ -- Chris Lamb Sat, 09 Mar 2019 14:48:25 +0000 +ppp (2.4.7-2+4endless2) eos; urgency=medium + + * Fix build with glibc 2.28. + + This will likely be merged into Debian's branches before our next update. + + +d/p/replace-des-crypt.patch + + https://bugs.debian.org/916163 + https://salsa.debian.org/debian/ppp/merge_requests/1 + https://github.com/paulusmack/ppp/commit/3c7b86229f7bd2600d74db14b1fe5b3896be3875 + + https://phabricator.endlessm.com/T25400 + + -- João Paulo Rechi Vita Fri, 22 Feb 2019 15:58:56 -0800 + +ppp (2.4.7-2+4endless1) eos; urgency=medium + + * Update to version 2.4.7-2+4 from Debian Buster (testing) carrying the + changes listed bellow. + https://phabricator.endlessm.com/T25400 + + * Remove pppd-dns.service and init script. On EOS, /etc/resolv.conf is a + symlink into /run, so there is nothing to restore after a crash and + reboot. + https://phabricator.endlessm.com/T18834 + + -- João Paulo Rechi Vita Fri, 22 Feb 2019 15:18:39 -0800 + ppp (2.4.7-2+4) unstable; urgency=medium * Update EAP-TLS patch to version 1.102. (Closes: #912822) @@ -1199,3 +1236,4 @@ just removing selected files within. (Closes: #107910) -- Michael Beattie Sat, 29 Sep 2001 23:15:44 +1200 + diff -Nru ppp-2.4.7/debian/ppp.pppd-dns.init ppp-2.4.7/debian/ppp.pppd-dns.init --- ppp-2.4.7/debian/ppp.pppd-dns.init 2018-11-04 12:56:54.000000000 +0000 +++ ppp-2.4.7/debian/ppp.pppd-dns.init 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -#!/bin/sh -e -### BEGIN INIT INFO -# Provides: pppd-dns -# Required-Start: $local_fs -# Required-Stop: -# Default-Start: S -# Default-Stop: -# Short-Description: Restore resolv.conf if the system crashed. -# Description: Restore /etc/resolv.conf if the system crashed before the -# ppp link was shut down. -### END INIT INFO - -. /lib/lsb/init-functions - -case "$1" in - start) ;; - stop|restart|force-reload) exit 0 ;; - *) echo "Usage: $0 {start|stop|restart|force-reload}" >&2; exit 1 ;; -esac - -[ -x /etc/ppp/ip-down.d/0000usepeerdns ] \ - && exec /etc/ppp/ip-down.d/0000usepeerdns - diff -Nru ppp-2.4.7/debian/ppp.pppd-dns.service ppp-2.4.7/debian/ppp.pppd-dns.service --- ppp-2.4.7/debian/ppp.pppd-dns.service 2018-11-04 12:56:54.000000000 +0000 +++ ppp-2.4.7/debian/ppp.pppd-dns.service 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -[Unit] -Description=Restore /etc/resolv.conf if the system crashed before the ppp link was shut down - -[Service] -Type=oneshot -ExecStart=/etc/ppp/ip-down.d/0000usepeerdns - -[Install] -WantedBy=multi-user.target - diff -Nru ppp-2.4.7/debian/rules ppp-2.4.7/debian/rules --- ppp-2.4.7/debian/rules 2018-11-04 12:56:54.000000000 +0000 +++ ppp-2.4.7/debian/rules 2019-03-25 07:35:35.000000000 +0000 @@ -120,10 +120,8 @@ $(DIR_PPP)/usr/share/doc/ppp/examples/scripts/ override_dh_installinit: - dh_installinit --name=pppd-dns --no-stop-on-upgrade --no-start override_dh_installsystemd: - dh_installsystemd --name=pppd-dns --no-stop-on-upgrade --no-start override_dh_perl: dh_perl -d --package=ppp-dev