[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. cd3ed4fd8d3529277cc27369a1633579fbb6d51a

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 5831 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  cd3ed4fd8d3529277cc27369a1633579fbb6d51a (commit)
       via  e35ee5f672dcb1c1ec76d3b935d7c233c0e8e30a (commit)
       via  c7edeb0f4d221247569bbc64b855925525463a86 (commit)
       via  6717aa4bb11969de8759b7ade6087f56b2f4580f (commit)
       via  da8841980ad55cdb6b7918a28164d01f99a9e739 (commit)
       via  93959bfe3ef46fed5da1861a14a532691bcc3e52 (commit)
       via  5cc0c01311ef0f893f8b541c762e5541b538a956 (commit)
      from  9901f43c0befba1a781b844760a68b4f4fd74cf6 (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 cd3ed4fd8d3529277cc27369a1633579fbb6d51a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Jun 22 11:26:42 2012 +0000

    ppp: Add systemd unit files.

commit e35ee5f672dcb1c1ec76d3b935d7c233c0e8e30a
Merge: c7edeb0 9901f43
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Jun 22 11:26:26 2012 +0000

    Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit c7edeb0f4d221247569bbc64b855925525463a86
Merge: 6717aa4 a965b2d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Jun 20 22:55:06 2012 +0000

    Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit 6717aa4bb11969de8759b7ade6087f56b2f4580f
Merge: da88419 9d35ee5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jun 5 21:04:51 2012 +0000

    Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit da8841980ad55cdb6b7918a28164d01f99a9e739
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun May 27 12:18:22 2012 +0000

    dhcp: Update the systemd unit file for dhclient.
    
    This update enables dhclient to be properly used
    with the current networking code.

commit 93959bfe3ef46fed5da1861a14a532691bcc3e52
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun May 27 12:16:16 2012 +0000

    hostapd: Make systemd unit file independent from network.service.
    
    Within the startup of network.service, hostapd needs to be
    started which will cause a deadlock.
    This patch removes the requirement of hostapd, that the network
    service has already to be up.

commit 5cc0c01311ef0f893f8b541c762e5541b538a956
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 16 12:47:54 2012 +0000

    libsolv: Update to recent development version.

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

Summary of changes:
 libsolv/libsolv.nm        |   21 +++------------------
 ppp/ppp.nm                |    4 ++--
 ppp/systemd/pppd(a).service |   14 ++++++++++++++
 3 files changed, 19 insertions(+), 20 deletions(-)
 create mode 100644 ppp/systemd/pppd(a).service

Difference in files:
diff --git a/libsolv/libsolv.nm b/libsolv/libsolv.nm
index 2750d22..5a2e048 100644
--- a/libsolv/libsolv.nm
+++ b/libsolv/libsolv.nm
@@ -5,8 +5,8 @@
 
 name       = libsolv
 version    = 0.0.0
-git_ver    = 0db9d7f
-release    = 3.git%{git_ver}
+git_ver    = c02d759
+release    = 4.git%{git_ver}
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = System/Libraries
@@ -33,27 +33,15 @@ build
 	end
 
 	prepare_cmds
-		# Remove -Werror from gcc command line.
-		find . -name CMakeLists.txt | xargs sed -e "s/-Werror//g" -i
-
-		# Do not build bindings, examples and tools.
-		sed "/bindings/d" -i CMakeLists.txt
-		sed "/examples/d" -i CMakeLists.txt
-		sed "/tools/d" -i CMakeLists.txt
-
 		# Make sure that libsatsolverext is linked properly to all needed
 		# libraries.
 		echo "TARGET_LINK_LIBRARIES(libsolvext libsolv \${EXPAT_LIBRARY} \${ZLIB_LIBRARY})" \
 			>> ext/CMakeLists.txt
-
-		# Remove the RPM stuff when we build with -DFEDORA=1 because we
-		# do not support RPM.
-		sed -e "s/DEBIAN/FEDORA/g" -i ext/CMakeLists.txt
 	end
 
 	build
 		mkdir build
-		cd build && cmake .. -DFEDORA=1 \
+		cd build && cmake .. \
 			-DCMAKE_INSTALL_PREFIX=/usr \
 			-DCMAKE_BUILD_TYPE=Release \
 			-DCMAKE_SKIP_RPATH=1
@@ -62,9 +50,6 @@ build
 
 	install
 		cd build && make install DESTDIR=%{BUILDROOT}
-
-		# Remove unusable header.
-		rm -vf %{BUILDROOT}/usr/include/solv/repo_rpmdb.h
 	end
 end
 
diff --git a/ppp/ppp.nm b/ppp/ppp.nm
index f82be75..8a0ab3f 100644
--- a/ppp/ppp.nm
+++ b/ppp/ppp.nm
@@ -5,7 +5,7 @@
 
 name       = ppp
 version    = 2.4.5
-release    = 3
+release    = 4
 
 groups     = System/Daemons
 url        = ftp://ftp.samba.org/pub/ppp/
@@ -34,7 +34,7 @@ build
 	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
 
diff --git a/ppp/systemd/pppd(a).service b/ppp/systemd/pppd(a).service
new file mode 100644
index 0000000..a99c7cc
--- /dev/null
+++ b/ppp/systemd/pppd(a).service
@@ -0,0 +1,14 @@
+[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
+UtmpIdentifier=%I
+KillMode=process


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