Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pptpd for openSUSE:Factory checked in at 2024-02-07 18:50:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pptpd (Old) and /work/SRC/openSUSE:Factory/.pptpd.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pptpd" Wed Feb 7 18:50:58 2024 rev:26 rq:1144930 version:1.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/pptpd/pptpd.changes 2022-05-19 22:50:24.642418764 +0200 +++ /work/SRC/openSUSE:Factory/.pptpd.new.1815/pptpd.changes 2024-02-07 18:53:43.582237693 +0100 @@ -1,0 +2,9 @@ +Wed Feb 7 13:03:39 UTC 2024 - Dirk Müller <dmuel...@suse.com> + +- drop LIESMICH.SUSE, rcpptpd: only for non-systemd distros +- remove ifconditions for systemd, all maintained distros + have it by now +- add bcrelay-iflog-size-limit.patch, gcc-14-fix.patch, + ppp-2.5.0.patch to fix build in TW + +------------------------------------------------------------------- Old: ---- LIESMICH.SUSE rcpptpd New: ---- bcrelay-iflog-size-limit.patch gcc-14-fix.patch ppp-2.5.0.patch BETA DEBUG BEGIN: New: have it by now - add bcrelay-iflog-size-limit.patch, gcc-14-fix.patch, ppp-2.5.0.patch to fix build in TW New: have it by now - add bcrelay-iflog-size-limit.patch, gcc-14-fix.patch, ppp-2.5.0.patch to fix build in TW New:- add bcrelay-iflog-size-limit.patch, gcc-14-fix.patch, ppp-2.5.0.patch to fix build in TW BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pptpd.spec ++++++ --- /var/tmp/diff_new_pack.0FmCEK/_old 2024-02-07 18:53:44.138257903 +0100 +++ /var/tmp/diff_new_pack.0FmCEK/_new 2024-02-07 18:53:44.142258048 +0100 @@ -1,7 +1,7 @@ # # spec file for package pptpd # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,33 +19,28 @@ Name: pptpd Version: 1.4.0 Release: 0 -URL: http://www.poptop.org/ Summary: PoPToP - PPTP Daemon, Linux as Microsoft VPN Server License: GPL-2.0-or-later Group: Productivity/Networking/PPP -Source: http://downloads.sourceforge.net/project/poptop/pptpd/pptpd-%{version}/pptpd-%{version}.tar.gz -Source1: rcpptpd +URL: https://www.poptop.org/ +Source: https://downloads.sourceforge.net/project/poptop/pptpd/pptpd-%{version}/pptpd-%{version}.tar.gz Source3: pptp-install.tar.bz2 Source4: pptpd.conf Source5: options.ppp0 Source7: README.SUSE -Source8: LIESMICH.SUSE Source9: pptpd.service Patch0: makefile.diff Patch1: pptpd-cflags.patch +Patch2: ppp-2.5.0.patch Patch3: pptpd-stringcompare.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch4: bcrelay-iflog-size-limit.patch +Patch5: gcc-14-fix.patch BuildRequires: automake +BuildRequires: pkgconfig BuildRequires: ppp-devel -Requires: ppp -%if 0%{?suse_version} > 1140 BuildRequires: pkgconfig(udev) +Requires: ppp %{?systemd_ordering} -%define has_systemd 1 -%else -PreReq: %fillup_prereq -PreReq: %insserv_prereq -%endif %description PoPToP is a PPTP(Point-to-Point Tunneling Protocol) server solution for @@ -55,79 +50,56 @@ %prep %setup -q -a 3 -%patch0 -%patch1 -p1 -%patch3 +%patch -P 0 +%patch -P 1 -p1 +%patch -P 2 -p1 +%patch -P 3 +%patch -P 4 -p1 +%patch -P 5 -p1 rm plugins/patchlevel.h +cp -p %{SOURCE5} %{SOURCE7} . %build autoreconf -i -f %configure -make OPTFLAGS="$RPM_OPT_FLAGS" +%make_build OPTFLAGS="%{optflags}" %install -make install DESTDIR=%{buildroot} -install -m 0755 pptpd %{buildroot}/usr/sbin/pptpd -install -m 0755 pptpctrl %{buildroot}/usr/sbin/pptpctrl +%make_install +install -m 0755 pptpd %{buildroot}%{_sbindir}/pptpd +install -m 0755 pptpctrl %{buildroot}%{_sbindir}/pptpctrl -%if 0%{?has_systemd} -install -D -m 0644 %{S:9} %{buildroot}%{_unitdir}/`basename %{S:9}` +install -D -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/`basename %{SOURCE9}` mkdir -p %{buildroot}%{_modulesloaddir} -echo "ppp_mppe" > %{buildroot}/usr/lib/modules-load.d/pptpd.conf -%else -mkdir -p %{buildroot}/etc/init.d -install -m 0744 %{S:1} %{buildroot}/etc/init.d/pptpd -ln -sf ../../etc/init.d/pptpd %{buildroot}/usr/sbin/rcpptpd -%endif -install -Dm 0644 %{S:4} %{buildroot}/etc/pptpd.conf +echo "ppp_mppe" > %{buildroot}%{_prefix}/lib/modules-load.d/pptpd.conf +install -Dm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pptpd.conf find {samples,PPTP-Installation,pptp-server} -type f -exec chmod -x {} + chmod -x AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO %pre -%if 0%{?has_systemd} %service_add_pre %{name}.service -%endif %preun -%if 0%{?has_systemd} %service_del_preun %{name}.service -%else -%stop_on_removal pptpd -%endif %post -%if 0%{?has_systemd} %service_add_post %{name}.service -%else -%{fillup_and_insserv pptpd} -%endif %postun -%if 0%{?has_systemd} %service_del_postun %{name}.service -%else -%restart_on_update pptpd -%{insserv_cleanup} -%endif %files -%defattr (-, root, root) -%doc $RPM_SOURCE_DIR/README.SUSE $RPM_SOURCE_DIR/LIESMICH.SUSE -%doc $RPM_SOURCE_DIR/options.ppp0 -%doc AUTHORS COPYING ChangeLog NEWS README* TODO +%license COPYING +%doc README.SUSE options.ppp0 +%doc ChangeLog NEWS README* TODO %doc samples PPTP-Installation pptp-server -%config /etc/pptpd.conf +%config %{_sysconfdir}/pptpd.conf %{_mandir}/*/pptp* -%{_mandir}/man8/bcrelay.8.gz -/usr/sbin/pptpctrl -/usr/sbin/pptpd -/usr/sbin/bcrelay -/usr/lib/pptpd -%if 0%{?has_systemd} +%{_mandir}/man8/bcrelay.8%{?ext_man} +%{_sbindir}/pptpctrl +%{_sbindir}/pptpd +%{_sbindir}/bcrelay +%{_prefix}/lib/pptpd %{_unitdir}/%{name}.service %{_modulesloaddir}/pptpd.conf -%else -/usr/sbin/rcpptpd -/etc/init.d/pptpd -%endif ++++++ bcrelay-iflog-size-limit.patch ++++++ diff --git a/bcrelay.c b/bcrelay.c index c5a6c73..02e7cdc 100644 --- a/bcrelay.c +++ b/bcrelay.c @@ -963,21 +963,21 @@ static char *iflistToString( struct iflist *ifp ) static char *iflistLogRToString( struct iflist *ifp, int idx, struct ifsnr *ifnr ) { - static char str_tr[MAX_IFLOGTOSTR]; /* - * This makes function: 1) non-reentrant (doesn't matter). - * 2) not useable multiple times by (s)printf. - */ - sprintf(str_tr, "%s", ifp->ifname); + static char str_tr[MAX_IFLOGTOSTR] = { 0 }; /* + * This makes function: 1) non-reentrant (doesn't matter). + * 2) not useable multiple times by (s)printf. + */ + snprintf(str_tr, MAX_IFLOGTOSTR, "%s", ifp->ifname); return str_tr; } static char *iflistLogIToString( struct iflist *ifp, int idx, struct ifsnr *ifnr ) { - static char str_tr[MAX_IFLOGTOSTR]; /* - * This makes function: 1) non-reentrant (doesn't matter). - * 2) not useable multiple times by (s)printf. - */ - sprintf(str_tr, "%s(%d/%d/%d)", ifp->ifname, idx, ifp->index, ifnr->sock_nr); + static char str_tr[MAX_IFLOGTOSTR + 64] = { 0 }; /* + * This makes function: 1) non-reentrant (doesn't matter). + * 2) not useable multiple times by (s)printf. + */ + snprintf(str_tr, MAX_IFLOGTOSTR, "%s(%d/%d/%d)", ifp->ifname, idx, ifp->index, ifnr->sock_nr); return str_tr; } ++++++ gcc-14-fix.patch ++++++ diff --git a/compat.c b/compat.c index 8a91a66..285220c 100644 --- a/compat.c +++ b/compat.c @@ -10,9 +10,9 @@ #include "compat.h" #include "our_syslog.h" +#include <string.h> #ifndef HAVE_STRLCPY -#include <string.h> #include <stdio.h> void strlcpy(char *dst, const char *src, size_t size) ++++++ ppp-2.5.0.patch ++++++ diff --git a/plugins/pptpd-logwtmp.c b/plugins/pptpd-logwtmp.c index ac5ecc2..fb24b29 100644 --- a/plugins/pptpd-logwtmp.c +++ b/plugins/pptpd-logwtmp.c @@ -12,9 +12,11 @@ #include <unistd.h> #include <utmp.h> #include <string.h> +#include <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; @@ -42,25 +44,25 @@ static char *reduce(char *user) static void ip_up(void *opaque, int arg) { - char *user = reduce(peer_authname); - if (debug) - notice("pptpd-logwtmp.so ip-up %s %s %s", ifname, user, - pptpd_original_ip); - logwtmp(ifname, user, pptpd_original_ip); + char *user = reduce(ppp_peer_authname(NULL, 0)); + if (debug_on()) + notice("pptpd-logwtmp.so ip-up %s %s %s", ppp_ifname(), user, + pptpd_original_ip); + logwtmp(ppp_ifname(), user, pptpd_original_ip); } static void ip_down(void *opaque, int arg) { - if (debug) - notice("pptpd-logwtmp.so ip-down %s", ifname); - logwtmp(ifname, "", ""); + if (debug_on()) + notice("pptpd-logwtmp.so ip-down %s", ppp_ifname()); + logwtmp(ppp_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$"); }
