[Pkg-openldap-devel] r1156 - openldap/trunk/debian

[vorlon at alioth.debian.org]

tags 488409 pending
thanks

Author: vorlon
Date: 2008-06-29 07:17:49 +0000 (Sun, 29 Jun 2008)
New Revision: 1156

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/rules
   openldap/trunk/debian/slapd.links
Log:
Use hardlinks instead of symlinks for the various slap* commands; this
is functionally equivalent for us, and reduces divergence from
derivatives such as Ubuntu that use apparmor.  Closes: #488409.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2008-06-28 16:17:00 UTC (rev 1155)
+++ openldap/trunk/debian/changelog	2008-06-29 07:17:49 UTC (rev 1156)
@@ -1,4 +1,4 @@
-openldap2.3 (2.4.10-1) UNRELEASED; urgency=low
+openldap2.3 (2.4.10-2) UNRELEASED; urgency=low
 
   [ Steve Langasek ]
   * New upstream release.
@@ -8,12 +8,15 @@
     - Drop patch hurd-path-max, integrated upstream.
   * Drop spurious build-dependency on heimdal-dev, introduced accidentally
     as part of an aborted attempt to build the smbk5pwd overlay.
+  * Use hardlinks instead of symlinks for the various slap* commands; this
+    is functionally equivalent for us, and reduces divergence from
+    derivatives such as Ubuntu that use apparmor.  Closes: #488409.
 
   [ Matthijs Mohlmann ]
   * All manpages in category 5 were missing, wrong directory.
     (Closes: #474976, #483631, #483633)
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Fri, 30 May 2008 08:58:35 +0200
+ -- Steve Langasek <vorlon at debian.org>  Sun, 29 Jun 2008 00:16:09 -0700
 
 openldap2.3 (2.4.9-1) unstable; urgency=low
 

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2008-06-28 16:17:00 UTC (rev 1155)
+++ openldap/trunk/debian/rules	2008-06-29 07:17:49 UTC (rev 1156)
@@ -33,6 +33,7 @@
 installdir	:= $(CURDIR)/debian/install
 tmpdir		:= $(CURDIR)/debian/tmp
 builddir	:= $(CURDIR)/debian/build
+slapddir	:= $(CURDIR)/debian/slapd/usr/sbin
 
 MAKEVARS	:= DESTDIR=$(installdir) STRIP=
 
@@ -149,6 +150,12 @@
 	dh_strip -pslapd --dbg-package=slapd-dbg
 	dh_strip -pldap-utils
 	dh_link -a
+
+	# hardlink these so not confined by apparmor
+	for f in slapacl slapadd slapauth slapcat slapdn slapindex slappasswd slaptest ; do \
+	    ln -f $(slapddir)/slapd $(slapddir)/$$f ; \
+	done ;
+
 	dh_compress -a
 	dh_fixperms -a
 	# ideally we would do this and not have any libldap-2.4.so.2 links

Modified: openldap/trunk/debian/slapd.links
===================================================================
--- openldap/trunk/debian/slapd.links	2008-06-28 16:17:00 UTC (rev 1155)
+++ openldap/trunk/debian/slapd.links	2008-06-29 07:17:49 UTC (rev 1156)
@@ -1,10 +1,2 @@
 usr/share/slapd/DB_CONFIG usr/share/doc/slapd/examples/DB_CONFIG
 usr/share/slapd/slapd.conf usr/share/doc/slapd/examples/slapd.conf
-usr/sbin/slapd usr/sbin/slapacl
-usr/sbin/slapd usr/sbin/slapadd
-usr/sbin/slapd usr/sbin/slapauth
-usr/sbin/slapd usr/sbin/slapcat
-usr/sbin/slapd usr/sbin/slapdn
-usr/sbin/slapd usr/sbin/slapindex
-usr/sbin/slapd usr/sbin/slappasswd
-usr/sbin/slapd usr/sbin/slaptest