From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Fri, 24 May 2013 16:38:04 +0000 (+0200)
Subject: ppp: Update package files to work with the new pppd-angel.
X-Git-Tag: pango~220^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=901ed44a03dfb1c4a185c9d3330222e8619e2c3e;p=people%2Fstevee%2Fipfire-3.x.git

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 b893b54c7..994d397fd 100644
--- 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
index 000000000..269476058
--- /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 a99c7cc73..3298c69fe 100644
--- 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