[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1cf32763378a9a5d14649d8cd8c2f0f06dfd2bee

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1cf32763378a9a5d14649d8cd8c2f0f06dfd2bee

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2726 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  1cf32763378a9a5d14649d8cd8c2f0f06dfd2bee (commit)
       via  92da72642ee4f52784b01ed7f186ec8d4d8834aa (commit)
      from  6cb06d262c0098700031c840e742cc38ae15db73 (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 1cf32763378a9a5d14649d8cd8c2f0f06dfd2bee
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Sep 16 12:49:55 2018 +0100

    rp-pppoe: Update to 3.12
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 92da72642ee4f52784b01ed7f186ec8d4d8834aa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Sep 16 12:41:23 2018 +0100

    rp-pppoe: Depend on pppd for which this has been compiled for
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 rp-pppoe/rp-pppoe.nm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/rp-pppoe/rp-pppoe.nm b/rp-pppoe/rp-pppoe.nm
index 156e46192..2a0da7f3b 100644
--- a/rp-pppoe/rp-pppoe.nm
+++ b/rp-pppoe/rp-pppoe.nm
@@ -4,11 +4,11 @@
 ###############################################################################
 
 name       = rp-pppoe
-version    = 3.11
+version    = 3.12
 release    = 1
 
 groups     = Networking/Dialin
-url        = http://www.roaringpenguin.com/pppoe/
+url        = https://www.roaringpenguin.com/products/pppoe
 license    = GPLv2+
 summary    = Administration tools for PPPoE connections.
 
@@ -33,10 +33,12 @@ build
 	DIR_APP := %{DIR_APP}/src
 	CFLAGS += -D_GNU_SOURCE -fno-strict-aliasing
 
+	pppd_version = %(pppd --version 2>&1 | awk '{ print $NF }')
+
 	prepare_cmds
 		# PLUGIN_DIR defaults to /etc/ppp/plugins, which is not what we want.
 		sed -i Makefile.in \
-			-e "s@^PLUGIN_DIR=.*@PLUGIN_DIR=%{libdir}/pppd/$(pppd --version 2>&1 | awk '{ print $NF }')@"
+			-e "s@^PLUGIN_DIR=.*@PLUGIN_DIR=%{libdir}/pppd/%{pppd_version}@"
 
 		# Always enable kernel mode PPPoE for the server, because we
 		# don't ship the userspace component.
@@ -66,7 +68,7 @@ packages
 	package %{name}
 		requires
 			iproute2
-			ppp
+			ppp = %{pppd_version}
 		end
 
 		script postin


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