pool/rp-pppoe
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 440643 from home:13ilya:branches:network

Browse Source 
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
This commit is contained in:
Marcus Meissner 2016-11-22 10:42:06 +00:00 committed by Git OBS Bridge
parent 5a71187441
commit 5c3ddabab8
10 changed files with 48 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
logger-path.diff
View File

@ -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

4
pppoe-connect
View File

@ -1,4 +1,4 @@
#! /bin/bash #!/bin/bash
# Generated automatically from pppoe-connect.in by configure. # Generated automatically from pppoe-connect.in by configure.
#*********************************************************************** #***********************************************************************
# #
@ -32,7 +32,7 @@ SETSID=/usr/bin/setsid
PPPOE=/usr/sbin/pppoe PPPOE=/usr/sbin/pppoe
BR2684CTL=/usr/sbin/br2684ctl BR2684CTL=/usr/sbin/br2684ctl
LOGGER="/usr/bin/logger -t `basename $0`" LOGGER="/usr/bin/logger -t `basename $0`"
NETWORKDIR=/etc/sysconfig/network-scripts NETWORKDIR=/etc/sysconfig/network
LS=/usr/bin/ls LS=/usr/bin/ls
get_device() { get_device() {

2
pppoe-server.service
View File

@ -3,7 +3,7 @@ Description=PPPoE Server.
After=syslog.target After=syslog.target
[Service] [Service]
ExecStart=/sbin/pppoe-server ExecStart=/usr/sbin/pppoe-server
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

12
pppoe-setup
View File

@ -1,4 +1,4 @@
#! /bin/bash #!/bin/bash
#*********************************************************************** #***********************************************************************
# #
# pppoe-setup # pppoe-setup
@ -13,11 +13,11 @@
# Paths to programs and config files # Paths to programs and config files
IP=/usr/sbin/ip IP=/usr/sbin/ip
PPPD=/usr/sbin/pppd PPPD=/usr/sbin/pppd
PPPOE=/sbin/pppoe PPPOE=/usr/sbin/pppoe
ECHO=/usr/bin/echo ECHO=/usr/bin/echo
LS=/usr/bin/ls LS=/usr/bin/ls
ID=/usr/bin/id ID=/usr/bin/id
NETWORKDIR=/etc/sysconfig/network-scripts NETWORKDIR=/etc/sysconfig/network
PAPFILE=/etc/ppp/chap-secrets PAPFILE=/etc/ppp/chap-secrets
CHAPFILE=/etc/ppp/pap-secrets CHAPFILE=/etc/ppp/pap-secrets
RESOLVFILE=/etc/resolv.conf RESOLVFILE=/etc/resolv.conf
@ -85,7 +85,7 @@ if [ ! -x $PPPD ] ; then
exit 1 exit 1
fi fi
# get the DSL config files in /etc/sysconfig/network-scripts # get the DSL config files in /etc/sysconfig/network
devices="" devices=""
device_count=0 device_count=0
get_device get_device
@ -483,9 +483,9 @@ $ECHO ""
$ECHO "" $ECHO ""
$ECHO "Congratulations, it should be all set up!" $ECHO "Congratulations, it should be all set up!"
$ECHO "" $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 "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 "to see the link status."
$ECHO "" $ECHO ""

8
pppoe-start
View File

@ -1,4 +1,4 @@
#! /bin/bash #!/bin/bash
# Generated automatically from pppoe-start.in by configure. # Generated automatically from pppoe-start.in by configure.
#*********************************************************************** #***********************************************************************
# #
@ -26,10 +26,11 @@ exec_prefix=/usr
# Paths to programs # Paths to programs
CONNECT=/usr/sbin/pppoe-connect CONNECT=/usr/sbin/pppoe-connect
STATUS=/usr/sbin/pppoe-status
ECHO=/usr/bin/echo ECHO=/usr/bin/echo
IP=/usr/sbin/ip IP=/usr/sbin/ip
LS=/usr/bin/ls LS=/usr/bin/ls
NETWORKDIR=/etc/sysconfig/network-scripts NETWORKDIR=/etc/sysconfig/network
get_device() { get_device() {
if [ ! -d $NETWORKDIR ] ; then if [ ! -d $NETWORKDIR ] ; then
@ -188,7 +189,7 @@ fi
# Monitor connection # Monitor connection
TIME=0 TIME=0
while [ true ] ; do while [ true ] ; do
/sbin/pppoe-status $CONFIG > /dev/null 2>&1 $STATUS $CONFIG > /dev/null 2>&1
# Looks like the interface came up # Looks like the interface came up
if [ $? = 0 ] ; then if [ $? = 0 ] ; then
@ -225,4 +226,3 @@ if [ -s /etc/default-routes ] ; then
fi fi
exit 1 exit 1

4
pppoe-status
View File

@ -1,4 +1,4 @@
#! /bin/bash #!/bin/bash
#*********************************************************************** #***********************************************************************
# #
# pppoe-status # pppoe-status
@ -22,7 +22,7 @@
# Defaults # Defaults
LS=/usr/bin/ls LS=/usr/bin/ls
IP=/usr/sbin/ip IP=/usr/sbin/ip
NETWORKDIR=/etc/sysconfig/network-scripts NETWORKDIR=/etc/sysconfig/network
get_device() { get_device() {
if [ ! -d $NETWORKDIR ] ; then if [ ! -d $NETWORKDIR ] ; then

6
pppoe-stop
View File

@ -1,4 +1,4 @@
#! /bin/bash #!/bin/bash
# Generated automatically from pppoe-stop.in by configure. # Generated automatically from pppoe-stop.in by configure.
#*********************************************************************** #***********************************************************************
# #
@ -23,8 +23,8 @@
export PATH=/sbin:/bin:/usr/sbin:/usr/bin export PATH=/sbin:/bin:/usr/sbin:/usr/bin
IP=/usr/sbin/ip IP=/usr/sbin/ip
LS=/bin/ls LS=/usr/bin/ls
NETWORKDIR=/etc/sysconfig/network-scripts NETWORKDIR=/etc/sysconfig/network
# Set to "C" locale so we can parse messages from commands # Set to "C" locale so we can parse messages from commands
LANG=C LANG=C

17
rp-pppoe-3.10-config.patch
View File

@ -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.12.orig/scripts/pppoe-connect.in 2015-11-11 17:10:02.000000000 +0200
--- rp-pppoe-3.10-orig/scripts/pppoe-connect.in 2008-06-30 14:00:42.000000000 +0000 +++ rp-pppoe-3.12/scripts/pppoe-connect.in 2016-11-16 17:25:28.510472180 +0200
+++ rp-pppoe-3.10/scripts/pppoe-connect.in 2009-05-08 00:03:58.229112396 +0000 @@ -18,7 +18,7 @@
@@ -48,7 +48,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="" SETSID=""
fi 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 +CONFIG=/etc/ppp/pppoe.conf
USER="" USER=""
ETH="" ETH=""

6
rp-pppoe.changes
View File

@ -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 Tue Oct 25 22:23:41 EEST 2016 - 13ilya@gmail.com

24
rp-pppoe.spec
View File

@ -24,7 +24,7 @@ License: GPL-2.0+
Group: Productivity/Networking/PPP Group: Productivity/Networking/PPP
Version: 3.12 Version: 3.12
Release: 0 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 Source1: pppoe-connect
Source2: pppoe-setup Source2: pppoe-setup
Source3: pppoe-start Source3: pppoe-start
@ -33,15 +33,14 @@ Source5: pppoe-stop
Source6: pppoe-server.service Source6: pppoe-server.service
Url: https://www.roaringpenguin.com/products/pppoe Url: https://www.roaringpenguin.com/products/pppoe
Patch0: docdir.diff Patch0: docdir.diff
Patch1: logger-path.diff Patch1: nonrfc-modems.diff
Patch2: nonrfc-modems.diff Patch2: release-buildsystem.diff
Patch3: release-buildsystem.diff Patch3: resolve-conf.diff
Patch4: resolve-conf.diff Patch4: rp-pppoe-3.10-config.patch
Patch5: %{name}-3.10-config.patch Patch5: rp-pppoe-3.10-init.patch
Patch6: %{name}-3.10-init.patch Patch6: rp-pppoe-pie.patch
Patch7: rp-pppoe-pie.patch Patch7: strip.diff
Patch8: strip.diff Requires: ppp net-tools
Requires: ppp net-tools-deprecated
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ppp BuildRequires: ppp
%if 0%{?has_systemd} %if 0%{?has_systemd}
@ -61,11 +60,10 @@ many ADSL service providers.
%patch1 %patch1
%patch2 %patch2
%patch3 %patch3
%patch4 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6
%patch7 %patch7
%patch8
%build %build
cd src cd src