[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 58adb7e153b82f6b033038cfe236870c753b2140

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 58adb7e153b82f6b033038cfe236870c753b2140

[git]

[-- Attachment #1: Type: text/plain, Size: 3038 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  58adb7e153b82f6b033038cfe236870c753b2140 (commit)
       via  b0a349066b4d7141da40f1c5deaa0dc4eeae3d46 (commit)
      from  bd1063ae4ed4d6ca05d55d9192ab6949253caf96 (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 58adb7e153b82f6b033038cfe236870c753b2140
Merge: bd1063a b0a3490
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Sep 16 20:21:51 2012 +0200

    Merge remote-tracking branch 'stevee/openldap-update'

commit b0a349066b4d7141da40f1c5deaa0dc4eeae3d46
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun Sep 16 11:05:01 2012 +0200

    openldap: Update to 2.4.32.
    
    Also add scriptlets to interact with systemd.
    
    Fixes #10204.

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

Summary of changes:
 openldap/openldap.nm              |   25 +++++++++++++++++++------
 openldap/systemd/openldap.service |    2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/openldap/openldap.nm b/openldap/openldap.nm
index fef3ca5..1f80a01 100644
--- a/openldap/openldap.nm
+++ b/openldap/openldap.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = openldap
-version    = 2.4.30
+version    = 2.4.32
 release    = 1
 
 groups     = System/Daemons
@@ -51,11 +51,6 @@ build
 		--enable-ndb=no \
 		--disable-static
 
-# Doens't seem to work in chroot.
-#define test
-#	cd %{DIR_APP} && make check
-#endef
-
 	install_cmds
 		mv -v %{BUILDROOT}%{libdir}/slapd %{BUILDROOT}/usr/sbin/slapd
 		ln -svf slapd %{BUILDROOT}/usr/sbin/slapacl
@@ -85,6 +80,24 @@ end
 
 packages
 	package %{name}
+		script postin
+			systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script preun
+			systemctl --no-reload disable openldap.service >/dev/null 2>&1 || :
+			systemctl stop openldap.service >/dev/null 2>&1 || :
+		end
+
+		script postun
+			systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script postup
+			systemctl daemon-reload >/dev/null 2>&1 || :
+			systemctl try-restart openldap.service >/dev/null 2>&1 || :
+		end
+	end
 
 	package %{name}-libs
 		template LIBS
diff --git a/openldap/systemd/openldap.service b/openldap/systemd/openldap.service
index 4eb155f..8c2c57b 100644
--- a/openldap/systemd/openldap.service
+++ b/openldap/systemd/openldap.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Very Secure FTP Daemon
+Description=OpenLDAP
 After=basic.target
 
 [Service]


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