ppp: Re-add ifname patch

[people/ms/ipfire-3.x.git] / ppp / ppp.nm

diff --git a/ppp/ppp.nm b/ppp/ppp.nm
index 8930a9278a07df7e75629851b65754607bf9bf85..e12c68a9ec66227bc1970860eba243bb3b3240a6 100644 (file)
--- a/ppp/ppp.nm
+++ b/ppp/ppp.nm
@@ -4,34 +4,39 @@
 ###############################################################################
 
 name       = ppp
-version    = 2.4.5
+version    = 2.4.6
 release    = 2
 
 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
                libpcap-devel
+               libudev-devel
                linux-atm-devel
                openssl-devel
                pam-devel
+               systemd-units
        end
 
+       # Explicitely add -fPIC to CFLAGS.
+       CFLAGS += -fPIC
+
        prepare_cmds
-               sed -e "s@^RUNDIR .*@RUNDIR = /var/run/ppp@" \
+               sed -e "s@^RUNDIR .*@RUNDIR = /run/ppp@" \
                        -e "s@^LOGDIR .*@LOGDIR = /var/log/ppp@" \
                        -i linux/Makefile.top
 
@@ -55,11 +60,29 @@ 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
+
+               script postup
+                       systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               script postun
+                       systemctl daemon-reload >/dev/null 2>&1 || :
+               end
        end
 
        package %{name}-devel