Hello community, here is the log from the commit of package rp-pppoe for openSUSE:Factory checked in at 2016-12-01 10:23:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rp-pppoe (Old) and /work/SRC/openSUSE:Factory/.rp-pppoe.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rp-pppoe" Changes: -------- --- /work/SRC/openSUSE:Factory/rp-pppoe/rp-pppoe.changes 2016-11-14 20:10:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rp-pppoe.new/rp-pppoe.changes 2016-12-01 10:23:25.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Nov 16 15:51:48 UTC 2016 - 13ilya@gmail.com + +- Fix patches and script for version 3.12. +- dropped logger-path.diff +- Add net-tools support. net-tools-deprecated is no longer required. + +------------------------------------------------------------------- Old: ---- logger-path.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rp-pppoe.spec ++++++ --- /var/tmp/diff_new_pack.JEo2g2/_old 2016-12-01 10:23:26.000000000 +0100 +++ /var/tmp/diff_new_pack.JEo2g2/_new 2016-12-01 10:23:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rp-pppoe # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,6 +14,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + +# %if 0%{?suse_version} > 1140 %define has_systemd 1 %endif @@ -24,7 +27,7 @@ Group: Productivity/Networking/PPP Version: 3.12 Release: 0 -Source0: https://www.roaringpenguin.com/files/download/rp-pppoe-%{version}.tar.gz +Source0: https://www.roaringpenguin.com/files/download/%{name}-%{version}.tar.gz Source1: pppoe-connect Source2: pppoe-setup Source3: pppoe-start @@ -33,15 +36,15 @@ Source6: pppoe-server.service Url: https://www.roaringpenguin.com/products/pppoe Patch0: docdir.diff -Patch1: logger-path.diff -Patch2: nonrfc-modems.diff -Patch3: release-buildsystem.diff -Patch4: resolve-conf.diff -Patch5: %{name}-3.10-config.patch -Patch6: %{name}-3.10-init.patch -Patch7: rp-pppoe-pie.patch -Patch8: strip.diff -Requires: ppp net-tools-deprecated +Patch1: nonrfc-modems.diff +Patch2: release-buildsystem.diff +Patch3: resolve-conf.diff +Patch4: rp-pppoe-3.10-config.patch +Patch5: rp-pppoe-3.10-init.patch +Patch6: rp-pppoe-pie.patch +Patch7: strip.diff +Requires: net-tools +Requires: ppp BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ppp %if 0%{?has_systemd} @@ -61,11 +64,10 @@ %patch1 %patch2 %patch3 -%patch4 +%patch4 -p1 %patch5 -p1 -%patch6 -p1 +%patch6 %patch7 -%patch8 %build cd src ++++++ pppoe-connect ++++++ --- /var/tmp/diff_new_pack.JEo2g2/_old 2016-12-01 10:23:26.000000000 +0100 +++ /var/tmp/diff_new_pack.JEo2g2/_new 2016-12-01 10:23:26.000000000 +0100 @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/bash # Generated automatically from pppoe-connect.in by configure. #*********************************************************************** # @@ -32,7 +32,7 @@ PPPOE=/usr/sbin/pppoe BR2684CTL=/usr/sbin/br2684ctl LOGGER="/usr/bin/logger -t `basename $0`" -NETWORKDIR=/etc/sysconfig/network-scripts +NETWORKDIR=/etc/sysconfig/network LS=/usr/bin/ls get_device() { ++++++ pppoe-server.service ++++++ --- /var/tmp/diff_new_pack.JEo2g2/_old 2016-12-01 10:23:26.000000000 +0100 +++ /var/tmp/diff_new_pack.JEo2g2/_new 2016-12-01 10:23:26.000000000 +0100 @@ -3,7 +3,7 @@ After=syslog.target [Service] -ExecStart=/sbin/pppoe-server +ExecStart=/usr/sbin/pppoe-server [Install] WantedBy=multi-user.target ++++++ pppoe-setup ++++++ --- /var/tmp/diff_new_pack.JEo2g2/_old 2016-12-01 10:23:26.000000000 +0100 +++ /var/tmp/diff_new_pack.JEo2g2/_new 2016-12-01 10:23:26.000000000 +0100 @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/bash #*********************************************************************** # # pppoe-setup @@ -13,11 +13,11 @@ # Paths to programs and config files IP=/usr/sbin/ip PPPD=/usr/sbin/pppd -PPPOE=/sbin/pppoe +PPPOE=/usr/sbin/pppoe ECHO=/usr/bin/echo LS=/usr/bin/ls ID=/usr/bin/id -NETWORKDIR=/etc/sysconfig/network-scripts +NETWORKDIR=/etc/sysconfig/network PAPFILE=/etc/ppp/chap-secrets CHAPFILE=/etc/ppp/pap-secrets RESOLVFILE=/etc/resolv.conf @@ -85,7 +85,7 @@ exit 1 fi -# get the DSL config files in /etc/sysconfig/network-scripts +# get the DSL config files in /etc/sysconfig/network devices="" device_count=0 get_device @@ -483,9 +483,9 @@ $ECHO "" $ECHO "Congratulations, it should be all set up!" $ECHO "" -$ECHO "Type '/sbin/ifup $dsl_device' to bring up your xDSL link and '/sbin/ifdown $dsl_device'" +$ECHO "Type '/usr/sbin/ifup $dsl_device' to bring up your xDSL link and '/sbin/ifdown $dsl_device'" $ECHO "to bring it down." -$ECHO "Type '/sbin/pppoe-status $NETWORKDIR/ifcfg-$dsl_device'" +$ECHO "Type '/usr/sbin/pppoe-status $NETWORKDIR/ifcfg-$dsl_device'" $ECHO "to see the link status." $ECHO "" ++++++ pppoe-start ++++++ --- /var/tmp/diff_new_pack.JEo2g2/_old 2016-12-01 10:23:26.000000000 +0100 +++ /var/tmp/diff_new_pack.JEo2g2/_new 2016-12-01 10:23:26.000000000 +0100 @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/bash # Generated automatically from pppoe-start.in by configure. #*********************************************************************** # @@ -26,10 +26,11 @@ # Paths to programs CONNECT=/usr/sbin/pppoe-connect +STATUS=/usr/sbin/pppoe-status ECHO=/usr/bin/echo IP=/usr/sbin/ip LS=/usr/bin/ls -NETWORKDIR=/etc/sysconfig/network-scripts +NETWORKDIR=/etc/sysconfig/network get_device() { if [ ! -d $NETWORKDIR ] ; then @@ -188,7 +189,7 @@ # Monitor connection TIME=0 while [ true ] ; do - /sbin/pppoe-status $CONFIG > /dev/null 2>&1 + $STATUS $CONFIG > /dev/null 2>&1 # Looks like the interface came up if [ $? = 0 ] ; then @@ -225,4 +226,3 @@ fi exit 1 - ++++++ pppoe-status ++++++ --- /var/tmp/diff_new_pack.JEo2g2/_old 2016-12-01 10:23:26.000000000 +0100 +++ /var/tmp/diff_new_pack.JEo2g2/_new 2016-12-01 10:23:26.000000000 +0100 @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/bash #*********************************************************************** # # pppoe-status @@ -22,7 +22,7 @@ # Defaults LS=/usr/bin/ls IP=/usr/sbin/ip -NETWORKDIR=/etc/sysconfig/network-scripts +NETWORKDIR=/etc/sysconfig/network get_device() { if [ ! -d $NETWORKDIR ] ; then ++++++ pppoe-stop ++++++ --- /var/tmp/diff_new_pack.JEo2g2/_old 2016-12-01 10:23:26.000000000 +0100 +++ /var/tmp/diff_new_pack.JEo2g2/_new 2016-12-01 10:23:26.000000000 +0100 @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/bash # Generated automatically from pppoe-stop.in by configure. #*********************************************************************** # @@ -23,8 +23,8 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin IP=/usr/sbin/ip -LS=/bin/ls -NETWORKDIR=/etc/sysconfig/network-scripts +LS=/usr/bin/ls +NETWORKDIR=/etc/sysconfig/network # Set to "C" locale so we can parse messages from commands LANG=C ++++++ rp-pppoe-3.10-config.patch ++++++ --- /var/tmp/diff_new_pack.JEo2g2/_old 2016-12-01 10:23:27.000000000 +0100 +++ /var/tmp/diff_new_pack.JEo2g2/_new 2016-12-01 10:23:27.000000000 +0100 @@ -1,7 +1,15 @@ -diff -ruN rp-pppoe-3.10-orig/scripts/pppoe-connect.in rp-pppoe-3.10/scripts/pppoe-connect.in ---- rp-pppoe-3.10-orig/scripts/pppoe-connect.in 2008-06-30 14:00:42.000000000 +0000 -+++ rp-pppoe-3.10/scripts/pppoe-connect.in 2009-05-08 00:03:58.229112396 +0000 -@@ -48,7 +48,7 @@ +--- 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 +@@ -18,7 +18,7 @@ + # Usage: pppoe-connect [config_file] + # pppoe-connect interface user [config_file] + # Second form overrides USER and ETH from config file. +-# If config_file is omitted, defaults to /etc//ppp/pppoe.conf ++# If config_file is omitted, defaults to /etc/ppp/pppoe.conf + # + #*********************************************************************** + +@@ -48,7 +48,7 @@ if test "$SETSID" != "" -a ! -x "$SETSID SETSID="" fi @@ -9,3 +17,4 @@ +CONFIG=/etc/ppp/pppoe.conf USER="" ETH="" + \ No newline at end of file