forked from pool/rp-pppoe
Accepting request 891597 from network
OBS-URL: https://build.opensuse.org/request/show/891597 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rp-pppoe?expand=0&rev=27
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
1d3c44d8b7
@ -379,8 +379,8 @@ while [ true ] ; do
|
||||
fi
|
||||
wait
|
||||
if test "$BR2684DEV" != ""; then
|
||||
kill `cat /var/run/nas$BR2684DEV.pid`
|
||||
rm /var/run/nas$BR2684DEV.pid
|
||||
kill `cat /run/nas$BR2684DEV.pid`
|
||||
rm /run/nas$BR2684DEV.pid
|
||||
fi
|
||||
|
||||
if test "$RETRY_ON_FAILURE" = "no" ; then
|
||||
|
||||
@ -400,13 +400,6 @@ else
|
||||
PEERDNS=no
|
||||
fi
|
||||
|
||||
# Where is pppd likely to put its pid?
|
||||
if [ -d /var/run ] ; then
|
||||
VARRUN=/var/run
|
||||
else
|
||||
VARRUN=/etc/ppp
|
||||
fi
|
||||
|
||||
$ECHO "USERCTL=$USERCTL" >$CONFIG
|
||||
$ECHO "BOOTPROTO=dialup" >>$CONFIG
|
||||
[ -z "$NAME" ] && NAME="DSL$DEVICE"
|
||||
@ -414,7 +407,7 @@ $ECHO "NAME=DSL$DEVICE" >>$CONFIG
|
||||
$ECHO "DEVICE=$DEVICE" >>$CONFIG
|
||||
$ECHO "TYPE=xDSL" >>$CONFIG
|
||||
$ECHO "ONBOOT=$ONBOOT" >>$CONFIG
|
||||
$ECHO "PIDFILE=/var/run/pppoe-adsl.pid" >>$CONFIG
|
||||
$ECHO "PIDFILE=/run/pppoe-adsl.pid" >>$CONFIG
|
||||
$ECHO "FIREWALL=$FIREWALL" >>$CONFIG
|
||||
[ -z "$PING" ] && PING="."
|
||||
$ECHO "PING=$PING" >>$CONFIG
|
||||
|
||||
@ -80,10 +80,10 @@ fi
|
||||
|
||||
PPPD_PID=`cat "$PPPD_PIDFILE"`
|
||||
|
||||
# Sigh. Some versions of pppd put PID files in /var/run; others put them
|
||||
# Sigh. Some versions of pppd put PID files in /run; others put them
|
||||
# in /etc/ppp. Since it's too messy to figure out what pppd does, we
|
||||
# try both locations.
|
||||
for i in /etc/ppp/ppp*.pid /var/run/ppp*.pid ; do
|
||||
for i in /etc/ppp/ppp*.pid /run/ppp*.pid ; do
|
||||
if [ -r $i ] ; then
|
||||
PID=`cat $i`
|
||||
if [ "$PID" = "$PPPD_PID" ] ; then
|
||||
|
||||
@ -116,14 +116,14 @@ if [ -r "$PIDFILE" ] ; then
|
||||
fi
|
||||
|
||||
# Kill br2684ctl if necessary
|
||||
if [ -n "$BR2684DEV" -a -r /var/run/nas$BR2684DEV.pid ]; then
|
||||
PIDS=`cat /var/run/nas$BR2684DEV.pid`
|
||||
if [ -n "$BR2684DEV" -a -r /run/nas$BR2684DEV.pid ]; then
|
||||
PIDS=`cat /run/nas$BR2684DEV.pid`
|
||||
kill -0 $PIDS > /dev/null 2>&1
|
||||
if [ $? = 0 ]; then
|
||||
$LOGGER -p daemon.notice "Killing br2684ctl for nas$BR2684DEV"
|
||||
kill $PIDS > /dev/null 2>&1
|
||||
fi
|
||||
rm -f /var/run/nas$BR2684DEV.pid
|
||||
rm -f /run/nas$BR2684DEV.pid
|
||||
fi
|
||||
|
||||
rm -f "$PIDFILE" "$PPPD_PIDFILE" "$PPPOE_PIDFILE" "$STARTPID"
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7825232f64ab4d618ef074d62d145ae43d6edc91b9a718c6130a4742bac40e2a
|
||||
size 224688
|
||||
3
rp-pppoe-3.15.tar.gz
Normal file
3
rp-pppoe-3.15.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b1f318bc7e4e5b0fd8a8e23e8803f5e6e43165245a5a10a7162a92a6cf17829a
|
||||
size 224966
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat May 8 20:24:02 UTC 2021 - Илья Индиго <ilya@ilya.pp.ua>
|
||||
|
||||
- Refreshed spec-file via spec-cleaner and manual optimisations.
|
||||
* Changed files: pppoe-connect, pppoe-setup, pppoe-status and
|
||||
pppoe-stop (replaced /var/run by /run).
|
||||
- Updated to 3.15
|
||||
* Don't ignore SIGTERM and SIGINT.
|
||||
Send PADT and exit if one of those signals is received.
|
||||
* Switch from net-tools to iproute2.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 28 01:11:10 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package rp-pppoe
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -19,7 +19,7 @@
|
||||
%define _name pppoe
|
||||
%define _group dialout
|
||||
Name: rp-%{_name}
|
||||
Version: 3.14
|
||||
Version: 3.15
|
||||
Release: 0
|
||||
Summary: A PPP Over Ethernet Redirector for PPPD
|
||||
License: GPL-2.0-or-later
|
||||
@ -44,7 +44,7 @@ BuildRequires: pkgconfig
|
||||
BuildRequires: ppp
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
Requires: group(%{_group})
|
||||
Requires: net-tools
|
||||
Requires: iproute2
|
||||
Requires: ppp
|
||||
Requires(post): permissions
|
||||
Requires(pre): group(%{_group})
|
||||
@ -55,8 +55,7 @@ Requires(pre): group(%{_group})
|
||||
many ADSL service providers.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%autopatch -p1
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
cd src
|
||||
@ -67,30 +66,26 @@ cd ../gui
|
||||
|
||||
%install
|
||||
%make_install -C src
|
||||
mkdir -p %{buildroot}%{_sbindir} %{buildroot}%{_unitdir}
|
||||
install -m 0755 %{SOURCE1} %{buildroot}%{_sbindir}
|
||||
install -m 0755 %{SOURCE2} %{buildroot}%{_sbindir}
|
||||
install -m 0755 %{SOURCE3} %{buildroot}%{_sbindir}
|
||||
install -m 0755 %{SOURCE4} %{buildroot}%{_sbindir}
|
||||
install -m 0755 %{SOURCE5} %{buildroot}%{_sbindir}
|
||||
install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/%{_name}.service
|
||||
install -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/%{_name}-server.service
|
||||
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{_name}
|
||||
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{_name}-server
|
||||
ln -sf %{_name}-stop %{buildroot}%{_sbindir}/adsl-stop
|
||||
ln -sf %{_name}-start %{buildroot}%{_sbindir}/adsl-start
|
||||
rm -rf %{buildroot}%{_sysconfdir}/ppp/%{_name}.conf \
|
||||
%{buildroot}%{_sysconfdir}/rc.d/init.d/%{_name} \
|
||||
%{buildroot}%{_initddir}
|
||||
%make_install -C gui
|
||||
install -d %{buildroot}%{_defaultdocdir}/%{name}
|
||||
mv %{buildroot}%{_sysconfdir}/ppp/plugins/README %{buildroot}%{_defaultdocdir}/%{name}/README.plugins
|
||||
rm -r %{buildroot}%{_sysconfdir}/ppp/plugins %{buildroot}%{_defaultdocdir}/%{name}/LICENSE
|
||||
mkdir -p %{buildroot}%{_sbindir} %{buildroot}%{_unitdir}
|
||||
install -p %{SOURCE1} %{buildroot}%{_sbindir}
|
||||
install -p %{SOURCE2} %{buildroot}%{_sbindir}
|
||||
install -p %{SOURCE3} %{buildroot}%{_sbindir}
|
||||
install -p %{SOURCE4} %{buildroot}%{_sbindir}
|
||||
install -p %{SOURCE5} %{buildroot}%{_sbindir}
|
||||
install -pm0644 %{SOURCE6} %{buildroot}%{_unitdir}/%{_name}.service
|
||||
install -pm0644 %{SOURCE7} %{buildroot}%{_unitdir}/%{_name}-server.service
|
||||
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{_name}
|
||||
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{_name}-server
|
||||
ln -s %{_name}-stop %{buildroot}%{_sbindir}/adsl-stop
|
||||
ln -s %{_name}-start %{buildroot}%{_sbindir}/adsl-start
|
||||
install -Dpm0644 %{buildroot}%{_sysconfdir}/ppp/plugins/README %{buildroot}%{_defaultdocdir}/%{name}/README.plugins
|
||||
rm -r %{buildroot}%{_initddir} \
|
||||
%{buildroot}%{_sysconfdir}/ppp/plugins \
|
||||
%{buildroot}%{_sysconfdir}/ppp/%{_name}.conf \
|
||||
%{buildroot}%{_defaultdocdir}/%{name}/LICENSE
|
||||
|
||||
%pre
|
||||
%if 0%{?suse_version} < 1330
|
||||
getent group %{_group} >/dev/null || %{_sbindir}/groupadd -r %{_group}
|
||||
%endif
|
||||
%service_add_pre %{_name}.service
|
||||
%service_add_pre %{_name}-server.service
|
||||
|
||||
@ -111,16 +106,15 @@ getent group %{_group} >/dev/null || %{_sbindir}/groupadd -r %{_group}
|
||||
%verify_permissions -e %{_sbindir}/%{_name}-wrapper
|
||||
|
||||
%files
|
||||
%defattr(0644,root,root,-)
|
||||
%license doc/LICENSE
|
||||
%dir %{_defaultdocdir}/%{name}
|
||||
%doc %{_defaultdocdir}/%{name}/*
|
||||
%attr(0750,root,root) %config(noreplace) %{_sysconfdir}/ppp/firewall-*
|
||||
%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/ppp/%{_name}-server-options
|
||||
%attr(0755,root,root) %{_bindir}/tkpppoe
|
||||
%attr(0755,root,root) %{_sbindir}/%{_name}
|
||||
%attr(0755,root,root) %{_sbindir}/%{_name}-{c,r,s}*
|
||||
%attr(4750,root,dialout) %{_sbindir}/%{_name}-wrapper
|
||||
%{_bindir}/tkpppoe
|
||||
%{_sbindir}/%{_name}
|
||||
%{_sbindir}/%{_name}-*
|
||||
%attr(4750,root,%{_group}) %{_sbindir}/%{_name}-wrapper
|
||||
%{_mandir}/man?/*%{?ext_man}
|
||||
%{_sbindir}/adsl-st*
|
||||
%{_sbindir}/rc%{_name}
|
||||
@ -129,7 +123,7 @@ getent group %{_group} >/dev/null || %{_sbindir}/groupadd -r %{_group}
|
||||
%{_unitdir}/%{_name}-server.service
|
||||
%dir %{_sysconfdir}/ppp/%{name}-gui
|
||||
%dir %{_datarootdir}/tk%{_name}
|
||||
%{_datarootdir}/tk%{_name}/?*.{html,msg,png}
|
||||
%verify(not mode caps) %attr(4750,root,dialout) %{_sbindir}/%{_name}-wrapper
|
||||
%{_datarootdir}/tk%{_name}/*
|
||||
%verify(not mode caps) %attr(4750,root,%{_group}) %{_sbindir}/%{_name}-wrapper
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user