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

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 6150 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  7d6aa181005b31a60019df569b02ed43b5ec67c7 (commit)
       via  4cdab979a319217dfdce2491a28736ff1470b1dc (commit)
       via  580e5e841a4fb5fd0d0c00022cbc565f10665dce (commit)
      from  e36f27e13e803a0baa0480b14cde8e70a0501653 (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 7d6aa181005b31a60019df569b02ed43b5ec67c7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Apr 15 22:57:52 2012 +0200

    pam_ldap: Move to /usr.

commit 4cdab979a319217dfdce2491a28736ff1470b1dc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Apr 15 22:55:07 2012 +0200

    filesystem: Add /var/{lock,run} symlinks and fix scriplet.
    
    systemd apparently does not bind-mount /var/lock and /var/run
    anymore but symlinks them instead to their corresponding directories
    in /run.
    
    The scriptlet contained an error which caused a crash on all
    architectures except x86_64 because of a bad checking of
    the directory existance. Hopefully this is now properly fixed.

commit 580e5e841a4fb5fd0d0c00022cbc565f10665dce
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Apr 15 22:53:22 2012 +0200

    dbus: Update to 1.4.20.

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

Summary of changes:
 dbus/dbus.nm             |   22 ++++++++++++----------
 filesystem/filesystem.nm |   10 ++++++----
 pam_ldap/pam_ldap.nm     |   11 ++++++-----
 3 files changed, 24 insertions(+), 19 deletions(-)

Difference in files:
diff --git a/dbus/dbus.nm b/dbus/dbus.nm
index 168e61f..1531535 100644
--- a/dbus/dbus.nm
+++ b/dbus/dbus.nm
@@ -4,9 +4,10 @@
 ###############################################################################
 
 name       = dbus
-version    = 1.4.16
-release    = 3
+version    = 1.4.20
+release    = 1
 
+maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
 groups     = System/Daemons
 url        = http://www.freedesktop.org/software/dbus/
 license    = GPLv2+ AFL
@@ -26,12 +27,13 @@ build
 		expat-devel
 		libcap-ng-devel
 		libselinux-devel
+		systemd-units
 	end
 
 	configure_options += \
 		--enable-libaudit \
 		--enable-selinux=yes \
-		--with-systemdsystemunitdir=/lib/systemd/system/ \
+		--with-systemdsystemunitdir=%{unitdir} \
 		--with-dbus-user=dbus
 end
 
@@ -49,27 +51,27 @@ packages
 
 		# Just search for new unit files that were just installed.
 		script postin
-			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+			systemctl daemon-reload >/dev/null 2>&1 || :
 
 			# The dbus service should be started on default.
-			/bin/systemctl enable dbus.service > /dev/null 2>&1 || :
+			systemctl enable dbus.service > /dev/null 2>&1 || :
 		end
 
 		# Disable the service that is to be removed and stop it if it is still running.
 		script preun
-			/bin/systemctl --no-reload disable dbus.service >/dev/null 2>&1 || :
-			/bin/systemctl stop dbus.service >/dev/null 2>&1 || :
+			systemctl --no-reload disable dbus.service >/dev/null 2>&1 || :
+			systemctl stop dbus.service >/dev/null 2>&1 || :
 		end
 
 		# Just tell systemd that unitfiles have been removed.
 		script postun
-			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+			systemctl daemon-reload >/dev/null 2>&1 || :
 		end
 
 		# Try to restart the service if it is running.
 		script postup
-			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-			/bin/systemctl try-restart dbus.service >/dev/null 2>&1 || :
+			systemctl daemon-reload >/dev/null 2>&1 || :
+			systemctl try-restart dbus.service >/dev/null 2>&1 || :
 		end
 	end
 
diff --git a/filesystem/filesystem.nm b/filesystem/filesystem.nm
index 65d62e9..b7966a8 100644
--- a/filesystem/filesystem.nm
+++ b/filesystem/filesystem.nm
@@ -5,7 +5,7 @@
 
 name       = filesystem
 version    = 002
-release    = 1
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = Base Build System/Base
@@ -75,11 +75,9 @@ build
 			var/empty \
 			var/lib \
 			var/local \
-			var/lock/subsys \
 			var/log \
 			var/nis \
 			var/preserve \
-			var/run \
 			var/spool/{mail,lpd} \
 			var/tmp \
 			var/db \
@@ -92,6 +90,8 @@ build
 
 		ln -snf ../var/tmp usr/tmp
 		ln -snf spool/mail var/mail
+		ln -snf ../run var/run
+		ln -snf ../run/lock var/lock
 
 		# Setting correct permissions.
 		chmod 1777 %{BUILDROOT}/{,var/}tmp
@@ -121,7 +121,9 @@ packages
 				if not os.path.exists(usr_dir):
 					os.makedirs(usr_dir)
 
-				if not os.path.exists(dir):
+				try:
+					os.lstat(dir)
+				except OSError:
 					os.symlink(usr_dir[1:], dir)
 		end
 	end
diff --git a/pam_ldap/pam_ldap.nm b/pam_ldap/pam_ldap.nm
index 05a88ab..9d9154b 100644
--- a/pam_ldap/pam_ldap.nm
+++ b/pam_ldap/pam_ldap.nm
@@ -5,7 +5,7 @@
 
 name       = pam_ldap
 version    = 186
-release    = 2
+release    = 3
 
 groups     = System/Base
 url        = http://www.padl.com/OSS/pam_ldap.html
@@ -33,9 +33,6 @@ build
 	end
 
 	configure_options += \
-		--sysconfdir=/etc \
-		--libdir=/%{lib} \
-		--mandir=/usr/share/man \
 		--with-ldap-conf-file=/etc/pam_ldap.conf \
 		--with-ldap-secret-file=/etc/pam_ldap.secret
 
@@ -64,7 +61,7 @@ build
 
 	install
 		# Create directory layout
-		mkdir -pv %{BUILDROOT}/{etc,%{lib}/security,%{libdir}}
+		mkdir -pv %{BUILDROOT}/{etc,%{libdir}/security}
 
 		# Prevent to install an ldap.conf
 		touch %{BUILDROOT}/etc/ldap.conf
@@ -82,6 +79,10 @@ end
 
 packages
 	package %{name}
+		conflicts
+			filesystem < 002
+		end
+	end
 
 	package %{name}-debuginfo
 		template DEBUGINFO


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