Accepting request 544630 from network
OBS-URL: https://build.opensuse.org/request/show/544630 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rp-pppoe?expand=0&rev=23
This commit is contained in:
commit
fb034c69d4
@ -3,6 +3,7 @@ Description=PPPoE Server.
|
|||||||
After=syslog.target
|
After=syslog.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
|
Group=dialout
|
||||||
ExecStart=/usr/sbin/pppoe-server
|
ExecStart=/usr/sbin/pppoe-server
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
@ -4,6 +4,7 @@ After=network.target
|
|||||||
Wants=network.target
|
Wants=network.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
|
Group=dialout
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
RemainAfterExit=true
|
RemainAfterExit=true
|
||||||
ExecStart=/usr/sbin/pppoe-start
|
ExecStart=/usr/sbin/pppoe-start
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Nov 23 14:06:28 UTC 2017 - ilya@ilya.pp.ua
|
||||||
|
|
||||||
|
- Add Requires/Requires(pre) group(dialout) (boo#1067511).
|
||||||
|
- Add %verify_permissions script for pppoe-wrapper.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Nov 9 12:53:45 UTC 2017 - ilya@ilya.pp.ua
|
Thu Nov 9 12:53:45 UTC 2017 - ilya@ilya.pp.ua
|
||||||
|
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
%define _name pppoe
|
%define _name pppoe
|
||||||
|
%define _group dialout
|
||||||
Name: rp-%{_name}
|
Name: rp-%{_name}
|
||||||
Version: 3.12
|
Version: 3.12
|
||||||
Release: 0
|
Release: 0
|
||||||
@ -43,6 +44,13 @@ BuildRequires: ppp
|
|||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
Requires: net-tools
|
Requires: net-tools
|
||||||
Requires: ppp
|
Requires: ppp
|
||||||
|
Requires(post): permissions
|
||||||
|
%if 0%{?suse_version} >= 1330
|
||||||
|
Requires: 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
|
||||||
@ -90,6 +98,9 @@ mv %{buildroot}%{_sysconfdir}/ppp/plugins/README %{buildroot}%{_defaultdocdir}/%
|
|||||||
rm -rf %{buildroot}%{_sysconfdir}/ppp/plugins
|
rm -rf %{buildroot}%{_sysconfdir}/ppp/plugins
|
||||||
|
|
||||||
%pre
|
%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}.service
|
||||||
%service_add_pre %{_name}-server.service
|
%service_add_pre %{_name}-server.service
|
||||||
|
|
||||||
@ -100,11 +111,15 @@ rm -rf %{buildroot}%{_sysconfdir}/ppp/plugins
|
|||||||
%post
|
%post
|
||||||
%service_add_post %{_name}.service
|
%service_add_post %{_name}.service
|
||||||
%service_add_post %{_name}-server.service
|
%service_add_post %{_name}-server.service
|
||||||
|
%set_permissions %{_sbindir}/%{_name}-wrapper
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
%service_del_postun %{_name}.service
|
%service_del_postun %{_name}.service
|
||||||
%service_del_postun %{_name}-server.service
|
%service_del_postun %{_name}-server.service
|
||||||
|
|
||||||
|
%verifyscript
|
||||||
|
%verify_permissions -e %{_sbindir}/%{_name}-wrapper
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%dir %{_defaultdocdir}/%{name}
|
%dir %{_defaultdocdir}/%{name}
|
||||||
%doc %{_defaultdocdir}/%{name}/*
|
%doc %{_defaultdocdir}/%{name}/*
|
||||||
@ -152,5 +167,6 @@ rm -rf %{buildroot}%{_sysconfdir}/ppp/plugins
|
|||||||
%{_datarootdir}/tk%{_name}/props-options.png
|
%{_datarootdir}/tk%{_name}/props-options.png
|
||||||
%{_datarootdir}/tk%{_name}/en.msg
|
%{_datarootdir}/tk%{_name}/en.msg
|
||||||
%{_datarootdir}/tk%{_name}/ja.msg
|
%{_datarootdir}/tk%{_name}/ja.msg
|
||||||
|
%verify(not mode caps) %attr(4750,root,dialout) %{_sbindir}/%{_name}-wrapper
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
x
Reference in New Issue
Block a user