Your message dated Sun, 21 Apr 2024 10:08:39 +0000
with message-id <e1ryu7j-00gjo1...@fasolo.debian.org>
and subject line Bug#1056898: fixed in pptpd 1.4.0-13
has caused the Debian Bug report #1056898,
regarding pptpd: Build failures with ppp-2.5.0
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1056898: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1056898
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: pptpd
Version: 1.4.0-12
Severity: important
Tags: patch
Hi Christoph,
I'm preparing to upload ppp-2.5.0 to unstable, and pptpd fails to build
with the updated pppd plugin API in ppp-2.5.0. I've prepared a patch for
pptpd which fixes the problem; I have build-tested this but not runtime
tested.
Please could you try the patch and test the pptpd-logwtmp.so pppd
plugin, and upload the package to unstable?
I'll upgrade the bug to RC when I upload ppp-2.5.0 to unstable. I can
also NMU if you would like me to.
Many thanks,
Chris
--
diff --git a/debian/changelog b/debian/changelog
index 3e5aae3f64ab..164fdbc6c664 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pptpd (1.4.0-13) UNRELEASED; urgency=medium
+
+ * Fix build failures with ppp 2.5.0. (Closes: XXXXXXX)
+
+ -- Chris Boot <bo...@debian.org> Sun, 26 Nov 2023 10:48:24 +0000
+
pptpd (1.4.0-12) unstable; urgency=medium
* Packaging cleanup
diff --git a/debian/control b/debian/control
index c81c783cf42d..04fc6d23fb55 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,9 @@ Standards-Version: 4.5.1
Vcs-Browser: https://git.in-ulm.de/cbiedl/pptpd
Vcs-Git: https://git.in-ulm.de/cbiedl/pptpd.git
Build-Depends: debhelper-compat (= 13),
+ dh-sequence-ppp,
libwrap0-dev,
- ppp-dev (>= 2.4.7-1+~),
+ ppp-dev (>= 2.5.0-1+~),
Priority: optional
Rules-Requires-Root: no
Section: net
diff --git a/debian/patches/local.ppp-2.5.patch
b/debian/patches/local.ppp-2.5.patch
new file mode 100644
index 000000000000..6f9be9ad20d9
--- /dev/null
+++ b/debian/patches/local.ppp-2.5.patch
@@ -0,0 +1,66 @@
+Subject: Build fixes for ppp-2.5
+Author: Chris Boot <bo...@debian.org>
+Last-Update: 2023-11-26
+
+--- a/plugins/pptpd-logwtmp.c
++++ b/plugins/pptpd-logwtmp.c
+@@ -12,9 +12,12 @@
+ #include <unistd.h>
+ #include <utmp.h>
+ #include <string.h>
++#include <linux/if.h>
++#include <linux/limits.h>
+ #include <pppd/pppd.h>
++#include <pppd/options.h>
+
+-char pppd_version[] = VERSION;
++char pppd_version[] = PPPD_VERSION;
+
+ static char pptpd_original_ip[PATH_MAX+1];
+ static bool pptpd_logwtmp_strip_domain = 0;
+@@ -28,7 +31,7 @@
+ { NULL }
+ };
+
+-static char *reduce(char *user)
++static const char *reduce(const char *user)
+ {
+ char *sep;
+ if (!pptpd_logwtmp_strip_domain) return user;
+@@ -42,8 +45,10 @@
+
+ static void ip_up(void *opaque, int arg)
+ {
+- char *user = reduce(peer_authname);
+- if (debug)
++ char ifname[IFNAMSIZ];
++ const char *user = reduce(ppp_peer_authname(NULL, 0));
++ ppp_get_ifname(ifname, sizeof(ifname));
++ if (debug_on())
+ notice("pptpd-logwtmp.so ip-up %s %s %s", ifname, user,
+ pptpd_original_ip);
+ logwtmp(ifname, user, pptpd_original_ip);
+@@ -51,16 +56,18 @@
+
+ static void ip_down(void *opaque, int arg)
+ {
+- if (debug)
++ char ifname[IFNAMSIZ];
++ ppp_get_ifname(ifname, sizeof(ifname));
++ if (debug_on())
+ notice("pptpd-logwtmp.so ip-down %s", ifname);
+ logwtmp(ifname, "", "");
+ }
+
+ void plugin_init(void)
+ {
+- add_options(options);
+- add_notifier(&ip_up_notifier, ip_up, NULL);
+- add_notifier(&ip_down_notifier, ip_down, NULL);
+- if (debug)
++ ppp_add_options(options);
++ ppp_add_notify(NF_IP_UP, ip_up, NULL);
++ ppp_add_notify(NF_IP_DOWN, ip_down, NULL);
++ if (debug_on())
+ notice("pptpd-logwtmp: $Version$");
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 105d7f3903e3..d7cf62738b62 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ local.build_hardening-flags.patch
local.build_plugin.patch
local.fix-typos.patch
local.install-nonroot.patch
+local.ppp-2.5.patch
diff --git a/debian/rules b/debian/rules
index c442aa544882..ced3421adef8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
- dh $@ --with ppp
+ dh $@
override_dh_auto_configure:
dh_auto_configure -- \
--- End Message ---
--- Begin Message ---
Source: pptpd
Source-Version: 1.4.0-13
Done: Christoph Biedl <debian.a...@manchmal.in-ulm.de>
We believe that the bug you reported is fixed in the latest version of
pptpd, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1056...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Christoph Biedl <debian.a...@manchmal.in-ulm.de> (supplier of updated pptpd
package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sun, 21 Apr 2024 09:43:03 +0200
Source: pptpd
Architecture: source
Version: 1.4.0-13
Distribution: unstable
Urgency: medium
Maintainer: Christoph Biedl <debian.a...@manchmal.in-ulm.de>
Changed-By: Christoph Biedl <debian.a...@manchmal.in-ulm.de>
Closes: 1056898
Changes:
pptpd (1.4.0-13) unstable; urgency=medium
.
* Adjust for pppd 2.5. Closes: #1056898
Checksums-Sha1:
500eee5654eb956bdab0f62cf9cca525b88ff076 1920 pptpd_1.4.0-13.dsc
c766a427255efc035579320f12307a055f6fd4b1 26096 pptpd_1.4.0-13.debian.tar.xz
08db35cf4b1a260fa6d428c40399ec1928a8cdfa 6587 pptpd_1.4.0-13_armel.buildinfo
Checksums-Sha256:
30e10b8ec3ab02f206633fecf33936d89ee726d543185925cace750e3f110c51 1920
pptpd_1.4.0-13.dsc
0ef2db140ba312b5889705052fc864d613fe1b5a2a2e63dea5f31ee261cbcd7d 26096
pptpd_1.4.0-13.debian.tar.xz
b0f8d808c235979fc6f26433901d080a2d138de0f1ad7ea25355973771323737 6587
pptpd_1.4.0-13_armel.buildinfo
Files:
b2864620e345213f70f0d10a9d2e386e 1920 net optional pptpd_1.4.0-13.dsc
64be67008c9eb371d4bbc72dcd0a35e2 26096 net optional
pptpd_1.4.0-13.debian.tar.xz
98ba7f9ef9582ecce0d47533657cd9fe 6587 net optional
pptpd_1.4.0-13_armel.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEWXMI+726A12MfJXdxCxY61kUkv0FAmYk27EACgkQxCxY61kU
kv24kxAArvlLydQUjAhb5c2my1ErBrdnsDUjeijTv9CA//0g8EaU+Rx6E4F+X+/U
40sk21HxmxVCLXHNhRDzncz91YdlUpfMzJc8LcG1CEhf6uJb+sq2eIXbbtMvZdhr
mB9C8nf31amXC2YlqvIlLogrJpis0rlH3We3wsTEZwBHA/rky4vl7nK67ob7Ldon
99raPOWxIOBqwisr+BqhkitkeIUd9nOMJGK6i2qm3hCkojOcRV8AssDPK/JnxNC2
lv7PotvkQKRpMXozZKEd9WwH6nDVw+PMPkHSwu5dhAWL4fBMyhMrkDrDf7g/JVsv
d8AbnwLHdFHp4XR54xkdS9ZxmDM8h4AepoUufimLLNEptQvATN5u/y1VJIVk2lZI
NxKXbLMzbBJ0ZOrrNt1sI4qzyYwAq5LcDbu+LQnnrFMmDNvsGgUFn4EkuHCmvaij
DF8QBfazVHpmm23Ykc764G9fVISqXC51xplqU3dLf4BrXcl8DrltV/CSdh0OU1Oy
z/5PxKlwMOB2zyeuJzeAx/CA/RrMDH+IKpLN1YJWolSYRiIk25ct4lz6+jc09Fkh
bxR0bPdzY/oq2WkC4yWNQOjCl0FyRX9nmiiRCO7wxQrqf5gGWEfeTANGFGJTY/no
UfWxrpPOwUBKKeT6o6qeG9R+JrTS0u4TMylxqN4cqEGrgVHifVY=
=u1Yn
-----END PGP SIGNATURE-----
pgpTX8Qh9Q4Y0.pgp
Description: PGP signature
--- End Message ---
