[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0c2f4f120842d472477223165d1c3e1f0762a924

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0c2f4f120842d472477223165d1c3e1f0762a924

[git]

[-- Attachment #1: Type: text/plain, Size: 4003 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  0c2f4f120842d472477223165d1c3e1f0762a924 (commit)
       via  901ed44a03dfb1c4a185c9d3330222e8619e2c3e (commit)
      from  69f50c3067fcadd4db91a39328a4f6e3a36dc9c5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0c2f4f120842d472477223165d1c3e1f0762a924
Merge: 69f50c3 901ed44
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun May 26 10:31:43 2013 +0200

    Merge remote-tracking branch 'stevee/pppd-angel'

commit 901ed44a03dfb1c4a185c9d3330222e8619e2c3e
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Fri May 24 18:38:04 2013 +0200

    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.

-----------------------------------------------------------------------

Summary of changes:
 ppp/ppp.nm                | 21 ++++++++++++++-------
 ppp/ppp.tmpfiles          |  2 ++
 ppp/systemd/pppd(a).service |  9 +--------
 3 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 ppp/ppp.tmpfiles

Difference in files:
diff --git a/ppp/ppp.nm b/ppp/ppp.nm
index b893b54..994d397 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 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(a).service b/ppp/systemd/pppd(a).service
index a99c7cc..3298c69 100644
--- a/ppp/systemd/pppd(a).service
+++ b/ppp/systemd/pppd(a).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


hooks/post-receive
--
IPFire 3.x development tree