Hello community, here is the log from the commit of package rp-pppoe for openSUSE:Factory checked in at 2020-06-03 20:28:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rp-pppoe (Old) and /work/SRC/openSUSE:Factory/.rp-pppoe.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rp-pppoe" Wed Jun 3 20:28:46 2020 rev:26 rq:809721 version:3.14 Changes: -------- --- /work/SRC/openSUSE:Factory/rp-pppoe/rp-pppoe.changes 2019-06-26 16:01:37.715428585 +0200 +++ /work/SRC/openSUSE:Factory/.rp-pppoe.new.3606/rp-pppoe.changes 2020-06-03 20:28:56.468520376 +0200 @@ -1,0 +2,19 @@ +Thu May 28 01:11:10 UTC 2020 - Илья Индиго <[email protected]> + +- Refresh spec-file via spec-cleaner and manual optimisations. + * Add make_build and autopatch macros. + * Remove group tag and obsoleted conditions. +- Refresh and rename patches: + * docdir.diff to rp-pppoe-3.14-docdir.patch + * nonrfc-modems.diff to rp-pppoe-3.14-nonrfc-modems.patch + * release-buildsystem.diff to rp-pppoe-3.14-release-buildsystem.patch + * resolve-conf.diff to rp-pppoe-3.14-resolve-conf.patch + * rp-pppoe-3.10-config.patch to rp-pppoe-3.14-config.patch + * rp-pppoe-3.10-init.patch to rp-pppoe-3.14-init.patch + * rp-pppoe-pie.patch to rp-pppoe-3.14-pie.patch + * strip.diff to rp-pppoe-3.14-strip.patch +- Update to 3.14 + * Add -H and -M options for sending HURL and MOTM packets respectively. + * Change VERSION macro to RP_VERSION to avoid conflict with pppd macro. + +------------------------------------------------------------------- Old: ---- docdir.diff nonrfc-modems.diff release-buildsystem.diff resolve-conf.diff rp-pppoe-3.10-config.patch rp-pppoe-3.10-init.patch rp-pppoe-3.13.tar.gz rp-pppoe-pie.patch strip.diff New: ---- rp-pppoe-3.14-config.patch rp-pppoe-3.14-docdir.patch rp-pppoe-3.14-init.patch rp-pppoe-3.14-nonrfc-modems.patch rp-pppoe-3.14-pie.patch rp-pppoe-3.14-release-buildsystem.patch rp-pppoe-3.14-resolve-conf.patch rp-pppoe-3.14-strip.patch rp-pppoe-3.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rp-pppoe.spec ++++++ --- /var/tmp/diff_new_pack.vqkGEu/_old 2020-06-03 20:28:57.456523379 +0200 +++ /var/tmp/diff_new_pack.vqkGEu/_new 2020-06-03 20:28:57.460523391 +0200 @@ -1,7 +1,7 @@ # # spec file for package rp-pppoe # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,10 @@ %define _name pppoe %define _group dialout Name: rp-%{_name} -Version: 3.13 +Version: 3.14 Release: 0 Summary: A PPP Over Ethernet Redirector for PPPD License: GPL-2.0-or-later -Group: Productivity/Networking/PPP URL: https://dianne.skoll.ca/projects/%{name} Source0: https://dianne.skoll.ca/projects/%{name}/download/%{name}-%{version}.tar.gz Source1: %{_name}-connect @@ -33,26 +32,22 @@ Source5: %{_name}-stop Source6: %{_name}.service Source7: %{_name}-server.service -Patch0: docdir.diff -Patch1: nonrfc-modems.diff -Patch2: release-buildsystem.diff -Patch3: resolve-conf.diff -Patch4: %{name}-3.10-config.patch -Patch5: %{name}-3.10-init.patch -Patch6: %{name}-pie.patch -Patch7: strip.diff +Patch0: %{name}-3.14-docdir.patch +Patch1: %{name}-3.14-nonrfc-modems.patch +Patch2: %{name}-3.14-release-buildsystem.patch +Patch3: %{name}-3.14-resolve-conf.patch +Patch4: %{name}-3.14-config.patch +Patch5: %{name}-3.14-init.patch +Patch6: %{name}-3.14-pie.patch +Patch7: %{name}-3.14-strip.patch BuildRequires: pkgconfig BuildRequires: ppp BuildRequires: pkgconfig(systemd) +Requires: group(%{_group}) Requires: net-tools Requires: ppp Requires(post): permissions -%if 0%{?suse_version} >= 1330 -Requires: group(%{_group}) Requires(pre): group(%{_group}) -%else -Requires(pre): shadow -%endif %description %{name} is a user-space redirector which permits the use of PPPoE @@ -61,21 +56,14 @@ %prep %setup -q -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 -p1 -%patch5 -p1 -%patch6 -%patch7 +%autopatch -p1 %build cd src %configure -make %{?_smp_mflags} +%make_build cd ../gui -make %{?_smp_mflags} +%make_build %install %make_install -C src ++++++ rp-pppoe-3.10-config.patch -> rp-pppoe-3.14-config.patch ++++++ --- /work/SRC/openSUSE:Factory/rp-pppoe/rp-pppoe-3.10-config.patch 2016-12-01 10:23:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rp-pppoe.new.3606/rp-pppoe-3.14-config.patch 2020-06-03 20:28:54.280513725 +0200 @@ -1,5 +1,6 @@ ---- rp-pppoe-3.12.orig/scripts/pppoe-connect.in 2015-11-11 17:10:02.000000000 +0200 -+++ rp-pppoe-3.12/scripts/pppoe-connect.in 2016-11-16 17:25:28.510472180 +0200 +diff -Pdpru rp-pppoe-3.14.orig/scripts/pppoe-connect.in rp-pppoe-3.14/scripts/pppoe-connect.in +--- rp-pppoe-3.14.orig/scripts/pppoe-connect.in 2020-05-27 03:29:37.000000000 +0300 ++++ rp-pppoe-3.14/scripts/pppoe-connect.in 2020-05-28 03:25:07.471458502 +0300 @@ -18,7 +18,7 @@ # Usage: pppoe-connect [config_file] # pppoe-connect interface user [config_file] @@ -17,4 +18,4 @@ +CONFIG=/etc/ppp/pppoe.conf USER="" ETH="" - \ No newline at end of file + ++++++ rp-pppoe-3.14-docdir.patch ++++++ diff -Pdpru rp-pppoe-3.14.orig/src/Makefile.in rp-pppoe-3.14/src/Makefile.in --- rp-pppoe-3.14.orig/src/Makefile.in 2020-05-27 03:29:37.000000000 +0300 +++ rp-pppoe-3.14/src/Makefile.in 2020-05-27 21:06:28.850733710 +0300 @@ -23,7 +23,7 @@ DEFINES= prefix=@prefix@ exec_prefix=@exec_prefix@ mandir=@mandir@ -docdir=@prefix@/share/doc/rp-pppoe-$(RP_VERSION) +docdir=@prefix@/share/doc/packages/rp-pppoe install=@INSTALL@ install_dir=@INSTALL@ -d sbindir=@sbindir@ ++++++ rp-pppoe-3.10-init.patch -> rp-pppoe-3.14-init.patch ++++++ --- /work/SRC/openSUSE:Factory/rp-pppoe/rp-pppoe-3.10-init.patch 2011-09-23 12:44:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rp-pppoe.new.3606/rp-pppoe-3.14-init.patch 2020-06-03 20:28:55.292516800 +0200 @@ -1,8 +1,8 @@ -diff -ruN rp-pppoe-3.10-orig/scripts/pppoe-init-suse.in rp-pppoe-3.10/scripts/pppoe-init-suse.in ---- rp-pppoe-3.10-orig/scripts/pppoe-init-suse.in 2008-06-30 14:00:42.000000000 +0000 -+++ rp-pppoe-3.10/scripts/pppoe-init-suse.in 2009-05-08 00:07:50.511480596 +0000 -@@ -12,53 +12,114 @@ - # 2 or any later version. +diff -Pdpru rp-pppoe-3.14.orig/scripts/pppoe-init-suse.in rp-pppoe-3.14/scripts/pppoe-init-suse.in +--- rp-pppoe-3.14.orig/scripts/pppoe-init-suse.in 2020-05-27 03:29:37.000000000 +0300 ++++ rp-pppoe-3.14/scripts/pppoe-init-suse.in 2020-05-28 03:46:47.354070399 +0300 +@@ -15,53 +15,106 @@ + # Modifed to work with SuSE 6.4 linux by Gary Cameron. # -# Source function library. @@ -37,7 +37,7 @@ -test "$PPPoE_START" = "yes" || exit 0 +CONFIG=`cat @sbindir@/pppoe-start | grep "^CONFIG" | awk -F"=" '{print $2}'` -+CF_BASE=$(basename $CONFIG) ++CF_BASE=`basename $CONFIG` +PIDFILE=`cat $CONFIG | grep "^PIDFILE" | awk -F"=" '{print $2}'` +PPPOE_PIDFILE=`cat @sbindir@/pppoe-connect | grep "^PPPOE_PIDFILE" | awk -F"=" '{print $2}'` +PPPD_PIDFILE=`cat @sbindir@/pppoe-connect | grep "^PPPD_PIDFILE" | awk -F"=" '{print $2}'` @@ -57,7 +57,6 @@ + esac + return $RES +} -+ # The echo return value for success (defined in /etc/rc.config). -return=$rc_done @@ -66,79 +65,66 @@ - echo -n "Bringing up PPPoE link" - $START > /dev/null 2>&1 || return=$rc_failed - echo -e "$return" -- ;; -+ echo -n "Bringing up PPPoE link: " -+ $START > /dev/null 2>&1 - -+ # Remember status and be verbose -+ rc_status -v -+ ;; ++ echo -n "Bringing up PPPoE link: " ++ $START > /dev/null 2>&1 ++ # Remember status and be verbose ++ rc_status -v + ;; +- stop) - echo -n "Shutting down PPPoE link" - $STOP > /dev/null 2>&1 || return=$rc_failed - echo -e "$return" -- ;; -+ echo -n "Shutting down PPPoE link: " -+ $STOP > /dev/null 2>&1 - -+ # Remember status and be verbose -+ rc_status -v -+ ;; ++ echo -n "Shutting down PPPoE link: " ++ $STOP > /dev/null 2>&1 ++ # Remember status and be verbose ++ rc_status -v ++ ;; + try-restart) -+ ## Stop the service and regardless of whether it was -+ ## running or not, start it again. -+ $0 stop -+ $0 start -+ -+ # Remember status and be quiet -+ rc_status -+ ;; - restart) -- $0 stop -- echo "Waiting" $restart_time "seconds for the host to reset itself" -- sleep $restart_time #Note: Need time for host to reset itself -- $0 start -- ;; ++ ## Stop the service and regardless of whether it was ++ ## running or not, start it again. ++ $0 stop ++ $0 start ++ # Remember status and be quiet ++ rc_status + ;; - -+ $0 stop -+ echo "Waiting" $restart_time "seconds for the host to reset itself" -+ sleep $restart_time #Note: Need time for host to reset itself -+ $0 start -+ -+ # Remember status and be quiet -+ rc_status -+ ;; + restart) + $0 stop + echo "Waiting" $restart_time "seconds for the host to reset itself" + sleep $restart_time #Note: Need time for host to reset itself + $0 start ++ # Remember status and be quiet ++ rc_status ++ ;; + reload|force-reload) -+ echo -n "Reload PPPoE link: " -+ rc_failed 5 -+ -+ # Remember status and be verbose -+ rc_status -v -+ ;; ++ echo -n "Reload PPPoE link: " ++ rc_failed 5 ++ # Remember status and be verbose ++ rc_status -v + ;; +- status) - $STATUS -- ;; ++ echo -n "Checking PPPoE link: " ++ # Return value is slightly different for the status command: ++ # 0 - service up and running ++ # 1 - service dead, but /var/run/ pid file exists ++ # 2 - service dead, but /var/lock/ lock file exists ++ # 3 - service not running (unused) ++ # 4 - service status unknown :-( ++ # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) ++ RET=`$STATUS > /dev/null 2>&1; echo $?` ++ chk_status $RET ++ # Remember status and be verbose ++ rc_status -v + ;; - -+ echo -n "Checking PPPoE link: " -+ # Return value is slightly different for the status command: -+ # 0 - service up and running -+ # 1 - service dead, but /var/run/ pid file exists -+ # 2 - service dead, but /var/lock/ lock file exists -+ # 3 - service not running (unused) -+ # 4 - service status unknown :-( -+ # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) -+ RET=`$STATUS > /dev/null 2>&1; echo $?` -+ chk_status $RET -+ -+ # Remember status and be verbose -+ rc_status -v -+ ;; *) - echo "Usage: pppoe {start|stop|restart|status}" -- exit 1 -+ echo "Usage: pppoe {start|stop|restart|status|try-restart}" -+ exit 1 ++ echo "Usage: pppoe {start|stop|restart|status|try-restart}" + exit 1 esac -+rc_exit - +- -exit 0 ++rc_exit ++++++ rp-pppoe-3.14-nonrfc-modems.patch ++++++ diff -Pdpru rp-pppoe-3.14.orig/scripts/pppoe-setup.in rp-pppoe-3.14/scripts/pppoe-setup.in --- rp-pppoe-3.14.orig/scripts/pppoe-setup.in 2020-05-27 03:29:37.000000000 +0300 +++ rp-pppoe-3.14/scripts/pppoe-setup.in 2020-05-28 02:55:29.251934958 +0300 @@ -109,6 +109,42 @@ while [ true ] ; do fi echo "" + echo "MODEM TYPE" + echo "" + echo "We will try to detect if your modem is compliant with RFC 2516" + echo "or not. 3COM's 3CP4130 is *NOT* compliant, for instance." + echo "" + echo "Searching for a modem at interface $E..." + $PPPOE -A -I $E > /dev/null 2>&1 + if [ $? -eq 1 ]; then + # not found + # try 3COM's + echo "" + echo "Not found, trying with 3COM's code..." + result=`$PPPOE -A -I $E -f 3c12:3c13 2>/dev/null` + if [ $? -eq 0 ]; then + echo "Non-RFC2516 compliant modem found! Probably 3CP4130..." + echo "Probing for service name..." + service=`echo "$result" | grep Service-Name | grep -v "3Com DL Manager" | cut -d : -f 2` + if [ -n "$service" ]; then + echo "Found service name = $service" + PPPOE_EXTRA="-f 3c12:3c13 -S $service" + else + echo "Couldn't find a service name, proceeding without one..." + PPPOE_EXTRA="-f 3c12:3c13" + fi + else + echo "" + echo "Didn't find a modem at interface $E, you can continue but" + echo "things might not work as you expect... :(" + echo "You might want to re-run this script and try a different interface." + fi + else + echo "Found a RFC 2516 compliant modem, congratulations! :)" + PPPOE_EXTRA="" + fi + + echo "" echo "Do you want the link to come up on demand, or stay up continuously?" echo "If you want it to come up on demand, enter the idle time in seconds" echo "after which the link should be dropped. If you want the link to" @@ -220,6 +256,9 @@ while [ true ] ; do echo "** Summary of what you entered **" echo "" echo "Ethernet Interface: $E" + if [ -n "$PPPOE_EXTRA" ]; then + echo "Extra parameters for modem (autodetected): \"$PPPOE_EXTRA\"" + fi echo "User name: $U" if [ "$D" = "no" ] ; then echo "Activate-on-demand: No" @@ -296,6 +335,7 @@ sed -e "s&^USER=.*&USER='$U'&" \ -e "s/^DNS1=.*/DNS1=$DNS1/" \ -e "s/^DNS2=.*/DNS2=$DNS2/" \ -e "s/^PEERDNS=.*/PEERDNS=$PEERDNS/" \ + -e "s/^PPPOE_EXTRA=.*/PPPOE_EXTRA=\"$PPPOE_EXTRA\"/" \ < $CONFIG-bak > $CONFIG if [ $? != 0 ] ; then ++++++ rp-pppoe-3.14-pie.patch ++++++ diff -Pdpru rp-pppoe-3.14.orig/gui/Makefile.in rp-pppoe-3.14/gui/Makefile.in --- rp-pppoe-3.14.orig/gui/Makefile.in 2020-05-27 03:29:37.000000000 +0300 +++ rp-pppoe-3.14/gui/Makefile.in 2020-05-28 03:51:05.322582248 +0300 @@ -38,10 +38,10 @@ all: pppoe-wrapper @echo "Type 'make install' as root to install the software." pppoe-wrapper: wrapper.o - @CC@ -o pppoe-wrapper wrapper.o + @CC@ -pie -Wl,-z,relro,-z,now -fwhole-program -o pppoe-wrapper wrapper.o wrapper.o: wrapper.c - @CC@ $(CFLAGS) -c -o wrapper.o wrapper.c + @CC@ -Wl,-z,relro,-z,now -fpie -fPIE -fwhole-program $(CFLAGS) -c -o wrapper.o wrapper.c install: all -mkdir -p $(DESTDIR)$(sbindir) ++++++ rp-pppoe-3.14-release-buildsystem.patch ++++++ diff -Pdpru rp-pppoe-3.14.orig/src/Makefile.in rp-pppoe-3.14/src/Makefile.in --- rp-pppoe-3.14.orig/src/Makefile.in 2020-05-27 03:29:37.000000000 +0300 +++ rp-pppoe-3.14/src/Makefile.in 2020-05-28 03:07:40.557172960 +0300 @@ -210,11 +210,9 @@ install: all mkdir -p $(DESTDIR)/etc/rc.d/init.d ;\ $(install) -m 755 ../scripts/pppoe-init $(DESTDIR)/etc/rc.d/init.d/pppoe ; \ fi - @if [ -f /etc/SuSE-release ] ; then \ - echo "Looks like a SuSE Linux system; installing $(DESTDIR)/etc/rc.d/init.d/pppoe" ; \ - mkdir -p $(DESTDIR)/etc/rc.d/init.d ;\ - $(install) -m 755 ../scripts/pppoe-init-suse $(DESTDIR)/etc/rc.d/init.d/pppoe ; \ - fi + echo "Looks like a SuSE Linux system; installing $(DESTDIR)/etc/init.d/pppoe" ; \ + mkdir -p $(DESTDIR)/etc/init.d ;\ + $(install) -m 755 ../scripts/pppoe-init-suse $(DESTDIR)/etc/init.d/pppoe ; \ @if [ -f l2tp/handlers/sync-pppd.so ] ; then \ mkdir -p $(DESTDIR)/usr/lib/l2tp/plugins ; \ ++++++ rp-pppoe-3.14-resolve-conf.patch ++++++ diff -Pdpru rp-pppoe-3.14.orig/scripts/pppoe-connect.in rp-pppoe-3.14/scripts/pppoe-connect.in --- rp-pppoe-3.14.orig/scripts/pppoe-connect.in 2020-05-27 03:29:37.000000000 +0300 +++ rp-pppoe-3.14/scripts/pppoe-connect.in 2020-05-28 03:18:01.758770756 +0300 @@ -232,16 +232,12 @@ fi PPP_STD_OPTIONS="$PLUGIN_OPTS $DOUNIT noipdefault noauth default-asyncmap $DEFAULTROUTE hide-password nodetach $PEERDNS mtu $MTU mru $MRU noaccomp nodeflate nopcomp novj novjccomp user $USER lcp-echo-interval $LCP_INTERVAL lcp-echo-failure $LCP_FAILURE $PPPD_EXTRA" # Jigger DNS if required... -if test "$DNSTYPE" = "SERVER" ; then - # Sorry, dude... - rm -f /etc/resolv.conf - ln -s /etc/ppp/resolv.conf /etc/resolv.conf -elif test "$DNSTYPE" = "SPECIFY" ; then +if test "$DNSTYPE" = "SPECIFY" ; then # Sorry, dude... rm -f /etc/resolv.conf echo "nameserver $DNS1" > /etc/resolv.conf if test -n "$DNS2" ; then - echo "nameserver $DNS2" >> /etc/resolv.conf + echo "nameserver $DNS2" >> /etc/resolv.conf fi fi ++++++ rp-pppoe-3.14-strip.patch ++++++ diff -Pdpru rp-pppoe-3.14.orig/gui/Makefile.in rp-pppoe-3.14/gui/Makefile.in --- rp-pppoe-3.14.orig/gui/Makefile.in 2020-05-27 03:29:37.000000000 +0300 +++ rp-pppoe-3.14/gui/Makefile.in 2020-05-28 03:54:38.555034196 +0300 @@ -47,7 +47,7 @@ install: all -mkdir -p $(DESTDIR)$(sbindir) -mkdir -p $(DESTDIR)$(bindir) -mkdir -p $(DESTDIR)/etc/ppp/rp-pppoe-gui - $(install) -m 4755 -s pppoe-wrapper $(DESTDIR)$(sbindir) + $(install) -m 4755 pppoe-wrapper $(DESTDIR)$(sbindir) $(install) -m 755 tkpppoe $(DESTDIR)$(bindir) -mkdir -p $(DESTDIR)$(mandir)/man1 $(install) -m 644 pppoe-wrapper.1 $(DESTDIR)$(mandir)/man1 ++++++ rp-pppoe-3.13.tar.gz -> rp-pppoe-3.14.tar.gz ++++++ ++++ 2982 lines of diff (skipped)
