From 383423f00072c013467e855fc2045ff65ee6d141d89d8346176dfe01e049b623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?=
 =?UTF-8?q?=D0=BE?= <ilya@ilya.cf>
Date: Thu, 23 Nov 2017 12:26:51 +0000
Subject: [PATCH 1/2] Accepting request 544600 from home:13ilya

- Add Requires/Requires(pre) group(dialout) (boo#1067511).

OBS-URL: https://build.opensuse.org/request/show/544600
OBS-URL: https://build.opensuse.org/package/show/network/rp-pppoe?expand=0&rev=19
---
 pppoe.service    | 1 +
 rp-pppoe.changes | 5 +++++
 rp-pppoe.spec    | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/pppoe.service b/pppoe.service
index eb14ce1..033f389 100644
--- a/pppoe.service
+++ b/pppoe.service
@@ -4,6 +4,7 @@ After=network.target
 Wants=network.target
 
 [Service]
+Group=dialout
 Type=oneshot
 RemainAfterExit=true
 ExecStart=/usr/sbin/pppoe-start
diff --git a/rp-pppoe.changes b/rp-pppoe.changes
index dfff1d3..520a82f 100644
--- a/rp-pppoe.changes
+++ b/rp-pppoe.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov 23 11:26:52 UTC 2017 - ilya@ilya.pp.ua
+
+- Add Requires/Requires(pre) group(dialout) (boo#1067511).
+
 -------------------------------------------------------------------
 Thu Nov  9 12:53:45 UTC 2017 - ilya@ilya.pp.ua
 
diff --git a/rp-pppoe.spec b/rp-pppoe.spec
index 81f7498..5eee9df 100644
--- a/rp-pppoe.spec
+++ b/rp-pppoe.spec
@@ -41,8 +41,10 @@ Patch6:         %{name}-pie.patch
 Patch7:         strip.diff
 BuildRequires:  ppp
 BuildRequires:  systemd
+Requires:       group(dialout)
 Requires:       net-tools
 Requires:       ppp
+Requires(pre):  group(dialout)
 
 %description
 %{name} is a user-space redirector which permits the use of PPPoE

From 700cc2f71b6eed3b1dbe73486ef3fd9de8bb05feab5fdc4cfd8f69e13278a179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?=
 =?UTF-8?q?=D0=BE?= <ilya@ilya.cf>
Date: Thu, 23 Nov 2017 14:10:00 +0000
Subject: [PATCH 2/2] Accepting request 544629 from
 home:13ilya:branches:network

- Add Requires/Requires(pre) group(dialout) (boo#1067511).
- Add %verify_permissions script for pppoe-wrapper.

OBS-URL: https://build.opensuse.org/request/show/544629
OBS-URL: https://build.opensuse.org/package/show/network/rp-pppoe?expand=0&rev=20
---
 pppoe-server.service |  1 +
 rp-pppoe.changes     |  3 ++-
 rp-pppoe.spec        | 18 ++++++++++++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pppoe-server.service b/pppoe-server.service
index b1da382..7011fb8 100644
--- a/pppoe-server.service
+++ b/pppoe-server.service
@@ -3,6 +3,7 @@ Description=PPPoE Server.
 After=syslog.target
 
 [Service]
+Group=dialout
 ExecStart=/usr/sbin/pppoe-server
 
 [Install]
diff --git a/rp-pppoe.changes b/rp-pppoe.changes
index 520a82f..c6755db 100644
--- a/rp-pppoe.changes
+++ b/rp-pppoe.changes
@@ -1,7 +1,8 @@
 -------------------------------------------------------------------
-Thu Nov 23 11:26:52 UTC 2017 - ilya@ilya.pp.ua
+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
diff --git a/rp-pppoe.spec b/rp-pppoe.spec
index 5eee9df..0a4445a 100644
--- a/rp-pppoe.spec
+++ b/rp-pppoe.spec
@@ -16,6 +16,7 @@
 #
 
 %define _name pppoe
+%define _group dialout
 Name:           rp-%{_name}
 Version:        3.12
 Release:        0
@@ -41,10 +42,15 @@ Patch6:         %{name}-pie.patch
 Patch7:         strip.diff
 BuildRequires:  ppp
 BuildRequires:  systemd
-Requires:       group(dialout)
 Requires:       net-tools
 Requires:       ppp
-Requires(pre):  group(dialout)
+Requires(post): permissions
+%if 0%{?suse_version} >= 1330
+Requires:       group(%{_group})
+Requires(pre):  group(%{_group})
+%else
+Requires(pre):  shadow
+%endif
 
 %description
 %{name} is a user-space redirector which permits the use of PPPoE
@@ -92,6 +98,9 @@ mv %{buildroot}%{_sysconfdir}/ppp/plugins/README %{buildroot}%{_defaultdocdir}/%
 rm -rf %{buildroot}%{_sysconfdir}/ppp/plugins
 
 %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
 
@@ -102,11 +111,15 @@ rm -rf %{buildroot}%{_sysconfdir}/ppp/plugins
 %post
 %service_add_post %{_name}.service
 %service_add_post %{_name}-server.service
+%set_permissions %{_sbindir}/%{_name}-wrapper
 
 %postun
 %service_del_postun %{_name}.service
 %service_del_postun %{_name}-server.service
 
+%verifyscript
+%verify_permissions -e %{_sbindir}/%{_name}-wrapper
+
 %files
 %dir %{_defaultdocdir}/%{name}
 %doc %{_defaultdocdir}/%{name}/*
@@ -154,5 +167,6 @@ rm -rf %{buildroot}%{_sysconfdir}/ppp/plugins
 %{_datarootdir}/tk%{_name}/props-options.png
 %{_datarootdir}/tk%{_name}/en.msg
 %{_datarootdir}/tk%{_name}/ja.msg
+%verify(not mode caps) %attr(4750,root,dialout) %{_sbindir}/%{_name}-wrapper
 
 %changelog