Hello community, here is the log from the commit of package pptpd for openSUSE:Factory checked in at 2015-03-16 07:00:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pptpd (Old) and /work/SRC/openSUSE:Factory/.pptpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pptpd" Changes: -------- --- /work/SRC/openSUSE:Factory/pptpd/pptpd.changes 2014-08-07 08:08:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pptpd.new/pptpd.changes 2015-03-16 07:00:53.000000000 +0100 @@ -1,0 +2,29 @@ +Thu Mar 12 10:04:45 UTC 2015 - p.drou...@gmail.com + +- Update to version 1.4.0 + * change GPL license FSF addresses + * clean up unused return value warnings + * don't leak memory on duplicate packet + * clean up several compiler warnings + * use pppd.h from ppp *dev + * do not drop connection on ENOBUFS + * fix binary trash when launching pppd + * add remotenumber support + * catch missing EOL at EOF + * add bcrelay manual page + * fix segfault on invalid IP range + * add support for VRFs through libvrf + * fix implementation of IDLE_WAIT + * fix compilation with uclibc with legacy support disabled + * avoid ipparam and logwtmp on BSD + * compiler fix for pptp_gre_header + * suppress "ignored a SET LINK INFO packet with real ACCMs" + * add missing logwtmp option on pptpd.conf manyal page + * fix reordering some more +- Do not provide a sysvinit script on a system which support + systemd; it's redundant +- Remove pptpd-pptpd-logwtmp-version.patch; fixed on upstream release +- Remove depreciated AUTHORS section +- Update pptpd-stringcompare.patch + +------------------------------------------------------------------- Old: ---- pptpd-1.3.4.tar.gz pptpd-pptpd-logwtmp-version.patch New: ---- pptpd-1.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pptpd.spec ++++++ --- /var/tmp/diff_new_pack.ravJyr/_old 2015-03-16 07:00:54.000000000 +0100 +++ /var/tmp/diff_new_pack.ravJyr/_new 2015-03-16 07:00:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pptpd # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,9 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: pptpd -Version: 1.3.4 +Version: 1.4.0 Release: 0 Url: http://www.poptop.org/ Summary: PoPToP - PPTP Daemon, Linux as Microsoft VPN Server @@ -33,10 +32,8 @@ Source9: pptpd.service Patch0: makefile.diff Patch1: pptpd-cflags.patch -Patch2: pptpd-pptpd-logwtmp-version.patch Patch3: pptpd-stringcompare.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %fillup_prereq %insserv_prereq BuildRequires: automake BuildRequires: ppp-devel Requires: ppp @@ -44,6 +41,8 @@ BuildRequires: systemd %{?systemd_requires} %define has_systemd 1 +%else +PreReq: %fillup_prereq %insserv_prereq %endif %description @@ -52,22 +51,11 @@ environment. This release supports Windows 95/98/NT/2000 PPTP clients and PPTP Linux clients. - - -Authors: --------- - Matthew Ramsay <matth...@moreton.com.au> - Kevin Thayer <t...@netmagic.net> - David Luyer <lu...@ucs.uwa.edu.au> - Peter Galbavy <peter.galb...@knowledge.com> - %prep %setup -q -a 3 %patch0 %patch1 -p1 -%patch2 %patch3 -rm plugins/pppd.h rm plugins/patchlevel.h %build @@ -79,22 +67,20 @@ make install DESTDIR=%{buildroot} install -m 0755 pptpd %{buildroot}/usr/sbin/pptpd install -m 0755 pptpctrl %{buildroot}/usr/sbin/pptpctrl -mkdir -p %{buildroot}/etc/init.d -install -m 0644 %{S:4} %{buildroot}/etc/pptpd.conf -install -m 0744 %{S:1} %{buildroot}/etc/init.d/pptpd -ln -sf ../../etc/init.d/pptpd %{buildroot}/usr/sbin/rcpptpd -find {samples,PPTP-Installation,pptp-server} -type f -exec chmod -x {} + -chmod -x AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO -mkdir -p %{buildroot}/usr/lib/modules-load.d %if 0%{?has_systemd} install -D -m 0644 %{S:9} %{buildroot}%{_unitdir}/`basename %{S:9}` mkdir -p %{buildroot}/usr/lib/modules-load.d 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 - -%clean -rm -rf %{buildroot} +install -Dm 0644 %{S:4} %{buildroot}/etc/pptpd.conf +find {samples,PPTP-Installation,pptp-server} -type f -exec chmod -x {} + +chmod -x AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO +mkdir -p %{buildroot}/usr/lib/modules-load.d %pre %if 0%{?has_systemd} @@ -102,41 +88,46 @@ %endif %preun -%stop_on_removal pptpd %if 0%{?has_systemd} %service_del_preun %{name}.service +%else +%stop_on_removal pptpd %endif %post -%{fillup_and_insserv pptpd} %if 0%{?has_systemd} %service_add_post %{name}.service +%else +%{fillup_and_insserv pptpd} %endif %postun -%restart_on_update pptpd -%{insserv_cleanup} %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 INSTALL NEWS README* TODO +%doc AUTHORS COPYING ChangeLog NEWS README* TODO %doc samples PPTP-Installation pptp-server %config /etc/pptpd.conf %{_mandir}/*/pptp* +%{_mandir}/man8/bcrelay.8.gz /usr/sbin/pptpctrl /usr/sbin/pptpd -/usr/sbin/rcpptpd /usr/sbin/bcrelay /usr/lib/pptpd -/etc/init.d/pptpd %if 0%{?has_systemd} %{_unitdir}/%{name}.service /usr/lib/modules-load.d/pptpd.conf +%else +/usr/sbin/rcpptpd +/etc/init.d/pptpd %endif %changelog ++++++ pptpd-1.3.4.tar.gz -> pptpd-1.4.0.tar.gz ++++++ ++++ 22517 lines of diff (skipped) ++++++ pptpd-stringcompare.patch ++++++ --- /var/tmp/diff_new_pack.ravJyr/_old 2015-03-16 07:00:54.000000000 +0100 +++ /var/tmp/diff_new_pack.ravJyr/_new 2015-03-16 07:00:54.000000000 +0100 @@ -1,26 +1,26 @@ --- bcrelay.c +++ bcrelay.c -@@ -381,12 +381,12 @@ +@@ -382,12 +382,12 @@ return 1; } } -- if (ifin == "") { +- if (ifin == empty) { + if (!strlen(ifin)) { syslog(LOG_INFO,"Incoming interface required!"); showusage(argv[0]); _exit(1); } -- if (ifout == "" && ipsec == "") { +- if (ifout == empty && ipsec == empty) { + if (!strlen(ifout) && !strlen(ipsec)) { syslog(LOG_INFO,"Listen-mode or outgoing or IPsec interface required!"); showusage(argv[0]); _exit(1); -@@ -870,7 +870,7 @@ +@@ -875,7 +875,7 @@ // IPSEC tunnels are a fun one. We must change the destination address // so that it will be routed to the correct tunnel end point. // We can define several tunnel end points for the same ipsec interface. -- } else if (ipsec != "" && strncmp(ifs.ifc_req[i].ifr_name, "ipsec", 5) == 0) { -+ } else if (strlen(ipsec) && strncmp(ifs.ifc_req[i].ifr_name, "ipsec", 5) == 0) { +- } else if (ipsec != empty && strncmp(ifs.ifc_req[i].ifr_name, "ipsec", 5) == 0) { ++ } else if (strlen(ipsec) && strncmp(ifs.ifc_req[i].ifr_name, "ipsec", 5) == 0) { if (strncmp(ifs.ifc_req[i].ifr_name, ipsec, 6) == 0) { struct hostent *hp = gethostbyname(ipsec+7); ioctl(s, SIOCGIFINDEX, &ifs.ifc_req[i]); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
