ppp: Update package files to work with the new pppd-angel.

* The package now has a dependency to "/usr/lib/network/pppd-angel".
* Update the systemd file.
* Add systemd tmpfile to recreate required folders.

diff --git a/ppp/ppp.nm b/ppp/ppp.nm
index b893b54c78046619e653d7b1d651cd46bd737b6f..994d397fd281c50bd4600f4087ee161c842f2623 100644 (file)
--- a/ppp/ppp.nm
+++ b/ppp/ppp.nm
@@ -5,22 +5,22 @@
 
 name       = ppp
 version    = 2.4.5
-release    = 5
+release    = 6
 
 groups     = System/Daemons
-url        = ftp://ftp.samba.org/pub/ppp/
+url        = http://ppp.samba.org/
 license    = BSD and LGPLv2+ and GPLv2+ and Public Domain
 summary    = The PPP (Point-to-Point Protocol) daemon.
 
 description
-       The ppp package contains the PPP (Point-to-Point Protocol) daemon and \
-       documentation for PPP support. The PPP protocol provides a method for \
-       transmitting datagrams over serial point-to-point links. PPP is \
-       usually used to dial in to an ISP or other organization over a modem \
+       The ppp package contains the PPP (Point-to-Point Protocol) daemon and
+       documentation for PPP support. The PPP protocol provides a method for
+       transmitting datagrams over serial point-to-point links. PPP is
+       usually used to dial in to an ISP or other organization over a modem
        and phone line.
 end
 
-source_dl  =
+source_dl  = ftp://ftp.samba.org/pub/ppp/
 
 build
        requires
@@ -59,11 +59,18 @@ build
                chmod -v 600 %{BUILDROOT}/etc/ppp/secrets
                ln -svf secrets %{BUILDROOT}/etc/ppp/pap-secrets
                ln -svf secrets %{BUILDROOT}/etc/ppp/chap-secrets
+
+               mkdir -pv %{BUILDROOT}%{localstatedir}/lock/ppp
+               mkdir -pv %{BUILDROOT}/run/ppp
        end
 end
 
 packages
        package %{name}
+               requires
+                       /usr/lib/network/helpers/pppd-angel
+               end
+
                script postin
                        systemctl daemon-reload >/dev/null 2>&1 || :
                end

diff --git a/ppp/ppp.tmpfiles b/ppp/ppp.tmpfiles
new file mode 100644 (file)
index 0000000..2694760
--- /dev/null
+++ b/ppp/ppp.tmpfiles
@@ -0,0 +1,2 @@
+d      /run/ppp        0755 root root
+d      /var/lock/ppp   0755 root root

diff --git a/ppp/systemd/pppd@.service b/ppp/systemd/pppd@.service
index a99c7cc73d874a87713e106d9b2ddd9666abc62a..3298c69feed1bfee8ce07c0d832888164e1dfe70 100644 (file)
--- a/ppp/systemd/pppd@.service
+++ b/ppp/systemd/pppd@.service
@@ -1,14 +1,7 @@
 [Unit]
 Description=Point-to-Point protocol daemon on %I
-BindTo=dev-%I.device
-After=dev-%I.device
 
 [Service]
-Type=forking
-ExecStartPre=/usr/lib/network/helpers/pppd-config-helper create %I
-ExecStart=/usr/sbin/pppd file /run/network/ppp/%I/pppd.conf
-ExecStopPost=/usr/lib/network/helpers/pppd-config-helper remove %I
-PIDFile=/run/ppp-%I.pid
-Restart=failure
+ExecStart=/usr/lib/network/helpers/pppd-angel %I
 UtmpIdentifier=%I
 KillMode=process