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

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

Browse Source 
- 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.

OBS-URL: https://build.opensuse.org/request/show/809720
OBS-URL: https://build.opensuse.org/package/show/network/rp-pppoe?expand=0&rev=28
This commit is contained in:
Илья Индиго 2020-05-28 01:34:41 +00:00 committed by Git OBS Bridge
parent 796c1a1e51
commit 5da48bef51
14 changed files with 195 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docdir.diff
View File

@ -1,11 +0,0 @@
--- ./src/Makefile.in.orig 2005-09-22 08:46:53.945913116 +0000
+++ ./src/Makefile.in 2005-09-22 08:47:37.751292213 +0000
@@ -22,7 +22,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
mandir=@mandir@
-docdir=@prefix@/share/doc/rp-pppoe-$(VERSION)
+docdir=@prefix@/share/doc/packages/rp-pppoe
install=@INSTALL@
install_dir=@INSTALL@ -d
sbindir=@sbindir@

63
nonrfc-modems.diff
View File

@ -1,63 +0,0 @@
--- scripts/pppoe-setup.in
+++ scripts/pppoe-setup.in
@@ -110,6 +110,42 @@
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"
@@ -221,6 +257,9 @@
$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"
@@ -297,6 +336,7 @@
-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

3
rp-pppoe-3.13.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8cd6bc71ba46bd5f6eb4daf60220ccdcd991a8525111dee466501b1b9717e676
size 224204

5
rp-pppoe-3.10-config.patch → rp-pppoe-3.14-config.patch
View File

@ -1,5 +1,6 @@
--- rp-pppoe-3.12.orig/scripts/pppoe-connect.in 2015-11-11 17:10:02.000000000 +0200 diff -Pdpru rp-pppoe-3.14.orig/scripts/pppoe-connect.in rp-pppoe-3.14/scripts/pppoe-connect.in
+++ rp-pppoe-3.12/scripts/pppoe-connect.in 2016-11-16 17:25:28.510472180 +0200 --- 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 @@ @@ -18,7 +18,7 @@
# Usage: pppoe-connect [config_file] # Usage: pppoe-connect [config_file]
# pppoe-connect interface user [config_file] # pppoe-connect interface user [config_file]

12
rp-pppoe-3.14-docdir.patch Normal file
View File

@ -0,0 +1,12 @@
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@

56
rp-pppoe-3.10-init.patch → rp-pppoe-3.14-init.patch
View File

@ -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 diff -Pdpru rp-pppoe-3.14.orig/scripts/pppoe-init-suse.in rp-pppoe-3.14/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.14.orig/scripts/pppoe-init-suse.in 2020-05-27 03:29:37.000000000 +0300
+++ rp-pppoe-3.10/scripts/pppoe-init-suse.in 2009-05-08 00:07:50.511480596 +0000 +++ rp-pppoe-3.14/scripts/pppoe-init-suse.in 2020-05-28 03:46:47.354070399 +0300
@@ -12,53 +12,114 @@ @@ -15,53 +15,106 @@
# 2 or any later version.
# Modifed to work with SuSE 6.4 linux by Gary Cameron. # Modifed to work with SuSE 6.4 linux by Gary Cameron.
# #
-# Source function library. -# Source function library.
@ -37,7 +37,7 @@ diff -ruN rp-pppoe-3.10-orig/scripts/pppoe-init-suse.in rp-pppoe-3.10/scripts/pp
-test "$PPPoE_START" = "yes" || exit 0 -test "$PPPoE_START" = "yes" || exit 0
+CONFIG=`cat @sbindir@/pppoe-start | grep "^CONFIG" | awk -F"=" '{print $2}'` +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}'` +PIDFILE=`cat $CONFIG | grep "^PIDFILE" | awk -F"=" '{print $2}'`
+PPPOE_PIDFILE=`cat @sbindir@/pppoe-connect | grep "^PPPOE_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}'` +PPPD_PIDFILE=`cat @sbindir@/pppoe-connect | grep "^PPPD_PIDFILE" | awk -F"=" '{print $2}'`
@ -57,7 +57,6 @@ diff -ruN rp-pppoe-3.10-orig/scripts/pppoe-init-suse.in rp-pppoe-3.10/scripts/pp
+ esac + esac
+ return $RES + return $RES
+} +}
+
# The echo return value for success (defined in /etc/rc.config). # The echo return value for success (defined in /etc/rc.config).
-return=$rc_done -return=$rc_done
@ -66,21 +65,18 @@ diff -ruN rp-pppoe-3.10-orig/scripts/pppoe-init-suse.in rp-pppoe-3.10/scripts/pp
- echo -n "Bringing up PPPoE link" - echo -n "Bringing up PPPoE link"
- $START > /dev/null 2>&1 || return=$rc_failed - $START > /dev/null 2>&1 || return=$rc_failed
- echo -e "$return" - echo -e "$return"
- ;;
+ echo -n "Bringing up PPPoE link: " + echo -n "Bringing up PPPoE link: "
+ $START > /dev/null 2>&1 + $START > /dev/null 2>&1
+ # Remember status and be verbose + # Remember status and be verbose
+ rc_status -v + rc_status -v
+ ;; ;;
-
stop) stop)
- echo -n "Shutting down PPPoE link" - echo -n "Shutting down PPPoE link"
- $STOP > /dev/null 2>&1 || return=$rc_failed - $STOP > /dev/null 2>&1 || return=$rc_failed
- echo -e "$return" - echo -e "$return"
- ;;
+ echo -n "Shutting down PPPoE link: " + echo -n "Shutting down PPPoE link: "
+ $STOP > /dev/null 2>&1 + $STOP > /dev/null 2>&1
+ # Remember status and be verbose + # Remember status and be verbose
+ rc_status -v + rc_status -v
+ ;; + ;;
@ -89,36 +85,27 @@ diff -ruN rp-pppoe-3.10-orig/scripts/pppoe-init-suse.in rp-pppoe-3.10/scripts/pp
+ ## running or not, start it again. + ## running or not, start it again.
+ $0 stop + $0 stop
+ $0 start + $0 start
+
+ # Remember status and be quiet + # Remember status and be quiet
+ rc_status + 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
- ;;
- -
+ $0 stop restart)
+ echo "Waiting" $restart_time "seconds for the host to reset itself" $0 stop
+ sleep $restart_time #Note: Need time for host to reset itself echo "Waiting" $restart_time "seconds for the host to reset itself"
+ $0 start sleep $restart_time #Note: Need time for host to reset itself
+ $0 start
+ # Remember status and be quiet + # Remember status and be quiet
+ rc_status + rc_status
+ ;; + ;;
+ reload|force-reload) + reload|force-reload)
+ echo -n "Reload PPPoE link: " + echo -n "Reload PPPoE link: "
+ rc_failed 5 + rc_failed 5
+
+ # Remember status and be verbose + # Remember status and be verbose
+ rc_status -v + rc_status -v
+ ;; ;;
-
status) status)
- $STATUS - $STATUS
- ;;
-
+ echo -n "Checking PPPoE link: " + echo -n "Checking PPPoE link: "
+ # Return value is slightly different for the status command: + # Return value is slightly different for the status command:
+ # 0 - service up and running + # 0 - service up and running
@ -129,16 +116,15 @@ diff -ruN rp-pppoe-3.10-orig/scripts/pppoe-init-suse.in rp-pppoe-3.10/scripts/pp
+ # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) + # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
+ RET=`$STATUS > /dev/null 2>&1; echo $?` + RET=`$STATUS > /dev/null 2>&1; echo $?`
+ chk_status $RET + chk_status $RET
+
+ # Remember status and be verbose + # Remember status and be verbose
+ rc_status -v + rc_status -v
+ ;; ;;
-
*) *)
- echo "Usage: pppoe {start|stop|restart|status}" - echo "Usage: pppoe {start|stop|restart|status}"
- exit 1
+ echo "Usage: pppoe {start|stop|restart|status|try-restart}" + echo "Usage: pppoe {start|stop|restart|status|try-restart}"
+ exit 1 exit 1
esac esac
+rc_exit -
-exit 0 -exit 0
+rc_exit

64
rp-pppoe-3.14-nonrfc-modems.patch Normal file
View File

@ -0,0 +1,64 @@
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

7
rp-pppoe-pie.patch → rp-pppoe-3.14-pie.patch
View File

@ -1,6 +1,7 @@
--- gui/Makefile.in.orig diff -Pdpru rp-pppoe-3.14.orig/gui/Makefile.in rp-pppoe-3.14/gui/Makefile.in
+++ gui/Makefile.in --- rp-pppoe-3.14.orig/gui/Makefile.in 2020-05-27 03:29:37.000000000 +0300
@@ -37,10 +37,10 @@ all: pppoe-wrapper +++ 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." @echo "Type 'make install' as root to install the software."
pppoe-wrapper: wrapper.o pppoe-wrapper: wrapper.o

11
release-buildsystem.diff → rp-pppoe-3.14-release-buildsystem.patch
View File

@ -1,10 +1,9 @@
Index: src/Makefile.in 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
--- src/Makefile.in.orig +++ rp-pppoe-3.14/src/Makefile.in 2020-05-28 03:07:40.557172960 +0300
+++ src/Makefile.in @@ -210,11 +210,9 @@ install: all
@@ -214,11 +214,9 @@ install: all
mkdir -p $(DESTDIR)/etc/rc.d/init.d ;\ mkdir -p $(DESTDIR)/etc/rc.d/init.d ;\
$(install) -m 755 ../scripts/pppoe-init-turbolinux $(DESTDIR)/etc/rc.d/init.d/pppoe ; \ $(install) -m 755 ../scripts/pppoe-init $(DESTDIR)/etc/rc.d/init.d/pppoe ; \
fi fi
- @if [ -f /etc/SuSE-release ] ; then \ - @if [ -f /etc/SuSE-release ] ; then \
- echo "Looks like a SuSE Linux system; installing $(DESTDIR)/etc/rc.d/init.d/pppoe" ; \ - echo "Looks like a SuSE Linux system; installing $(DESTDIR)/etc/rc.d/init.d/pppoe" ; \

21
resolve-conf.diff → rp-pppoe-3.14-resolve-conf.patch
View File

@ -1,21 +1,22 @@
Index: scripts/pppoe-connect.in 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
--- scripts/pppoe-connect.in.orig +++ rp-pppoe-3.14/scripts/pppoe-connect.in 2020-05-28 03:18:01.758770756 +0300
+++ scripts/pppoe-connect.in @@ -232,16 +232,12 @@ fi
@@ -232,11 +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" 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... # Jigger DNS if required...
-if test "$DNSTYPE" = "SERVER" ; then -if test "$DNSTYPE" = "SERVER" ; then
+#if test "$DNSTYPE" = "SERVER" ; then - # Sorry, dude...
# Sorry, dude...
- rm -f /etc/resolv.conf - rm -f /etc/resolv.conf
- ln -s /etc/ppp/resolv.conf /etc/resolv.conf - ln -s /etc/ppp/resolv.conf /etc/resolv.conf
-elif test "$DNSTYPE" = "SPECIFY" ; then -elif test "$DNSTYPE" = "SPECIFY" ; then
+ # done in ip-up/down
+ # rm -f /etc/resolv.conf
+ # ln -s /etc/ppp/resolv.conf /etc/resolv.conf
+if test "$DNSTYPE" = "SPECIFY" ; then +if test "$DNSTYPE" = "SPECIFY" ; then
# Sorry, dude... # Sorry, dude...
rm -f /etc/resolv.conf rm -f /etc/resolv.conf
echo "nameserver $DNS1" > /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

7
strip.diff → rp-pppoe-3.14-strip.patch
View File

@ -1,6 +1,7 @@
--- gui/Makefile.in diff -Pdpru rp-pppoe-3.14.orig/gui/Makefile.in rp-pppoe-3.14/gui/Makefile.in
+++ gui/Makefile.in --- rp-pppoe-3.14.orig/gui/Makefile.in 2020-05-27 03:29:37.000000000 +0300
@@ -46,7 +46,7 @@ +++ 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)$(sbindir)
-mkdir -p $(DESTDIR)$(bindir) -mkdir -p $(DESTDIR)$(bindir)
-mkdir -p $(DESTDIR)/etc/ppp/rp-pppoe-gui -mkdir -p $(DESTDIR)/etc/ppp/rp-pppoe-gui

3
rp-pppoe-3.14.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7825232f64ab4d618ef074d62d145ae43d6edc91b9a718c6130a4742bac40e2a
size 224688

19
rp-pppoe.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Thu May 28 01:11:10 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua>
- 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.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 17 07:50:57 UTC 2019 - Илья Индиго <ilya@ilya.pp.ua> Mon Jun 17 07:50:57 UTC 2019 - Илья Индиго <ilya@ilya.pp.ua>

40
rp-pppoe.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package rp-pppoe # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,11 +19,10 @@
%define _name pppoe %define _name pppoe
%define _group dialout %define _group dialout
Name: rp-%{_name} Name: rp-%{_name}
Version: 3.13 Version: 3.14
Release: 0 Release: 0
Summary: A PPP Over Ethernet Redirector for PPPD Summary: A PPP Over Ethernet Redirector for PPPD
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: Productivity/Networking/PPP
URL: https://dianne.skoll.ca/projects/%{name} URL: https://dianne.skoll.ca/projects/%{name}
Source0: https://dianne.skoll.ca/projects/%{name}/download/%{name}-%{version}.tar.gz Source0: https://dianne.skoll.ca/projects/%{name}/download/%{name}-%{version}.tar.gz
Source1: %{_name}-connect Source1: %{_name}-connect
@ -33,26 +32,22 @@ Source4: %{_name}-status
Source5: %{_name}-stop Source5: %{_name}-stop
Source6: %{_name}.service Source6: %{_name}.service
Source7: %{_name}-server.service Source7: %{_name}-server.service
Patch0: docdir.diff Patch0: %{name}-3.14-docdir.patch
Patch1: nonrfc-modems.diff Patch1: %{name}-3.14-nonrfc-modems.patch
Patch2: release-buildsystem.diff Patch2: %{name}-3.14-release-buildsystem.patch
Patch3: resolve-conf.diff Patch3: %{name}-3.14-resolve-conf.patch
Patch4: %{name}-3.10-config.patch Patch4: %{name}-3.14-config.patch
Patch5: %{name}-3.10-init.patch Patch5: %{name}-3.14-init.patch
Patch6: %{name}-pie.patch Patch6: %{name}-3.14-pie.patch
Patch7: strip.diff Patch7: %{name}-3.14-strip.patch
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: ppp BuildRequires: ppp
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
Requires: group(%{_group})
Requires: net-tools Requires: net-tools
Requires: ppp Requires: ppp
Requires(post): permissions Requires(post): permissions
%if 0%{?suse_version} >= 1330
Requires: group(%{_group})
Requires(pre): group(%{_group}) Requires(pre): group(%{_group})
%else
Requires(pre): shadow
%endif
%description %description
%{name} is a user-space redirector which permits the use of PPPoE %{name} is a user-space redirector which permits the use of PPPoE
@ -61,21 +56,14 @@ many ADSL service providers.
%prep %prep
%setup -q %setup -q
%patch0 %autopatch -p1
%patch1
%patch2
%patch3
%patch4 -p1
%patch5 -p1
%patch6
%patch7
%build %build
cd src cd src
%configure %configure
make %{?_smp_mflags} %make_build
cd ../gui cd ../gui
make %{?_smp_mflags} %make_build
%install %install
%make_install -C src %make_install -C src