From 5c3ddabab8107855a59fed00cda6bde570781373ce4a9db88df98d42f5879deb Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 22 Nov 2016 10:42:06 +0000 Subject: [PATCH 1/2] Accepting request 440643 from home:13ilya:branches:network I fix bugs in patches and sources and now rp-pppoe. support modern net-tools. After update need again manualy with pppoe-setup add your modem and all will be fine. :-) OBS-URL: https://build.opensuse.org/request/show/440643 OBS-URL: https://build.opensuse.org/package/show/network/rp-pppoe?expand=0&rev=12 --- logger-path.diff | 33 --------------------------------- pppoe-connect | 4 ++-- pppoe-server.service | 2 +- pppoe-setup | 12 ++++++------ pppoe-start | 8 ++++---- pppoe-status | 4 ++-- pppoe-stop | 6 +++--- rp-pppoe-3.10-config.patch | 17 +++++++++++++---- rp-pppoe.changes | 6 ++++++ rp-pppoe.spec | 24 +++++++++++------------- 10 files changed, 48 insertions(+), 68 deletions(-) delete mode 100644 logger-path.diff diff --git a/logger-path.diff b/logger-path.diff deleted file mode 100644 index bb23ab6..0000000 --- a/logger-path.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- scripts/pppoe-connect.in -+++ scripts/pppoe-connect.in -@@ -32,7 +32,7 @@ - PPPD=@PPPD@ - SETSID=@SETSID@ - PPPOE=@sbindir@/pppoe --LOGGER="/usr/bin/logger -t `basename $0`" -+LOGGER="/bin/logger -t `basename $0`" - - # Set to "C" locale so we can parse messages from commands - LANG=C ---- scripts/pppoe-setup.in -+++ scripts/pppoe-setup.in -@@ -21,7 +21,7 @@ - PPPD=@PPPD@ - PPPOE=@sbindir@/pppoe - ECHO=@ECHO@ --LOGGER="/usr/bin/logger -t `basename $0`" -+LOGGER="/bin/logger -t `basename $0`" - - # Set to "C" locale so we can parse messages from commands - LANG=C ---- scripts/pppoe-stop.in -+++ scripts/pppoe-stop.in -@@ -25,7 +25,7 @@ - export LANG - - ME="`basename $0`" --LOGGER="/usr/bin/logger -t $ME" -+LOGGER="/bin/logger -t $ME" - CONFIG="$1" - if [ "$CONFIG" = "" ] ; then - CONFIG=/etc/ppp/pppoe.conf diff --git a/pppoe-connect b/pppoe-connect index 6a311f6..9906c56 100644 --- a/pppoe-connect +++ b/pppoe-connect @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/bash # Generated automatically from pppoe-connect.in by configure. #*********************************************************************** # @@ -32,7 +32,7 @@ SETSID=/usr/bin/setsid 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() { diff --git a/pppoe-server.service b/pppoe-server.service index cde645b..b1da382 100644 --- a/pppoe-server.service +++ b/pppoe-server.service @@ -3,7 +3,7 @@ Description=PPPoE Server. After=syslog.target [Service] -ExecStart=/sbin/pppoe-server +ExecStart=/usr/sbin/pppoe-server [Install] WantedBy=multi-user.target diff --git a/pppoe-setup b/pppoe-setup index e11ec9a..3a47384 100644 --- a/pppoe-setup +++ b/pppoe-setup @@ -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 @@ if [ ! -x $PPPD ] ; then 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 "" $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 "" diff --git a/pppoe-start b/pppoe-start index d0de82a..35b298a 100644 --- a/pppoe-start +++ b/pppoe-start @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/bash # Generated automatically from pppoe-start.in by configure. #*********************************************************************** # @@ -26,10 +26,11 @@ exec_prefix=/usr # 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 @@ fi # 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 @@ if [ -s /etc/default-routes ] ; then fi exit 1 - diff --git a/pppoe-status b/pppoe-status index 0918e81..df037b4 100644 --- a/pppoe-status +++ b/pppoe-status @@ -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 diff --git a/pppoe-stop b/pppoe-stop index 26c48bb..497dd75 100644 --- a/pppoe-stop +++ b/pppoe-stop @@ -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 diff --git a/rp-pppoe-3.10-config.patch b/rp-pppoe-3.10-config.patch index 1e253a3..fcbaa48 100644 --- a/rp-pppoe-3.10-config.patch +++ b/rp-pppoe-3.10-config.patch @@ -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 @@ diff -ruN rp-pppoe-3.10-orig/scripts/pppoe-connect.in rp-pppoe-3.10/scripts/pppo +CONFIG=/etc/ppp/pppoe.conf USER="" ETH="" + \ No newline at end of file diff --git a/rp-pppoe.changes b/rp-pppoe.changes index a618081..c3576a5 100644 --- a/rp-pppoe.changes +++ b/rp-pppoe.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 16 15:51:48 UTC 2016 - 13ilya@gmail.com + +- Fix patches and script for version 3.12. +- Add net-tools support. net-tools-deprecated is no longer required. + ------------------------------------------------------------------- Tue Oct 25 22:23:41 EEST 2016 - 13ilya@gmail.com diff --git a/rp-pppoe.spec b/rp-pppoe.spec index 6693700..298f561 100644 --- a/rp-pppoe.spec +++ b/rp-pppoe.spec @@ -24,7 +24,7 @@ License: GPL-2.0+ 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 +33,14 @@ Source5: pppoe-stop 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: ppp net-tools BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ppp %if 0%{?has_systemd} @@ -61,11 +60,10 @@ many ADSL service providers. %patch1 %patch2 %patch3 -%patch4 +%patch4 -p1 %patch5 -p1 -%patch6 -p1 +%patch6 %patch7 -%patch8 %build cd src From 7d146c58fb37a3220252400ffffe9a368f1d68a44d7f6f89f4465f30ccf7840a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 22 Nov 2016 11:34:33 +0000 Subject: [PATCH 2/2] - dropped logger-path.diff OBS-URL: https://build.opensuse.org/package/show/network/rp-pppoe?expand=0&rev=13 --- rp-pppoe.changes | 1 + rp-pppoe.spec | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/rp-pppoe.changes b/rp-pppoe.changes index c3576a5..03ded63 100644 --- a/rp-pppoe.changes +++ b/rp-pppoe.changes @@ -2,6 +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. ------------------------------------------------------------------- diff --git a/rp-pppoe.spec b/rp-pppoe.spec index 298f561..23b599e 100644 --- a/rp-pppoe.spec +++ b/rp-pppoe.spec @@ -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 @@ -13,6 +13,9 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + # %if 0%{?suse_version} > 1140 %define has_systemd 1 @@ -40,7 +43,8 @@ Patch4: rp-pppoe-3.10-config.patch Patch5: rp-pppoe-3.10-init.patch Patch6: rp-pppoe-pie.patch Patch7: strip.diff -Requires: ppp net-tools +Requires: net-tools +Requires: ppp BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ppp %if 0%{?has_systemd} @@ -174,4 +178,4 @@ mv %{buildroot}/etc/ppp/plugins/README %{buildroot}%_defaultdocdir/rp-pppoe/READ /usr/share/tkpppoe/en.msg /usr/share/tkpppoe/ja.msg -%changelog \ No newline at end of file +%changelog