[pkg-kolab] r1586 - in kolabd/trunk/debian: . patches
Mathieu Parent
sathieu at alioth.debian.org
Mon Nov 21 21:26:10 UTC 2011
Author: sathieu
Date: 2011-11-21 21:26:10 +0000 (Mon, 21 Nov 2011)
New Revision: 1586
Added:
kolabd/trunk/debian/patches/100-no-rootDSE.diff
Modified:
kolabd/trunk/debian/changelog
kolabd/trunk/debian/patches/series
kolabd/trunk/debian/rules
Log:
new 100-no-rootDSE.diff: don't ship rootDSE (Closes: #601410)
Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog 2011-11-20 18:23:10 UTC (rev 1585)
+++ kolabd/trunk/debian/changelog 2011-11-21 21:26:10 UTC (rev 1586)
@@ -26,6 +26,7 @@
* updated Standards-Version to 3.9.2: no changes
* apache.conf: updated to match upstream's RewriteRule
* new 01-distconf.diff: set $kolab_hooksdir
+ * new 100-no-rootDSE.diff: don't ship rootDSE (Closes: #601410)
-- Mathieu Parent <sathieu at debian.org> Sat, 19 Nov 2011 13:08:21 +0100
Added: kolabd/trunk/debian/patches/100-no-rootDSE.diff
===================================================================
--- kolabd/trunk/debian/patches/100-no-rootDSE.diff (rev 0)
+++ kolabd/trunk/debian/patches/100-no-rootDSE.diff 2011-11-21 21:26:10 UTC (rev 1586)
@@ -0,0 +1,17 @@
+Description: Don't include rootDSE
+Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
+Applied-Upstream: http://git.kolabsys.com/apt/kolabd/commit/?id=251b33d421f93d841e3ba9d1a2492944776f1900
+Last-Update: 2011-02-17
+Index: kolabd/kolabd/templates/slapd.conf.template
+===================================================================
+--- kolabd.orig/kolabd/templates/slapd.conf.template 2011-02-17 15:01:19.000000000 +0100
++++ kolabd/kolabd/templates/slapd.conf.template 2011-02-17 15:01:24.000000000 +0100
+@@ -69,8 +69,6 @@
+ TLSCertificateKeyFile @@@sysconfdir@@@/kolab/key.pem
+ @@@endif@@@
+
+-rootDSE @@@sysconfdir@@@/kolab/rootDSE.ldif
+-
+ defaultsearchbase "@@@base_dn@@@"
+
+ #require none
Modified: kolabd/trunk/debian/patches/series
===================================================================
--- kolabd/trunk/debian/patches/series 2011-11-20 18:23:10 UTC (rev 1585)
+++ kolabd/trunk/debian/patches/series 2011-11-21 21:26:10 UTC (rev 1586)
@@ -3,3 +3,4 @@
92-cyrus-template.diff
93-amavisd-template.diff
94-cyrus-template.diff
+100-no-rootDSE.diff
Modified: kolabd/trunk/debian/rules
===================================================================
--- kolabd/trunk/debian/rules 2011-11-20 18:23:10 UTC (rev 1585)
+++ kolabd/trunk/debian/rules 2011-11-21 21:26:10 UTC (rev 1586)
@@ -15,6 +15,7 @@
# Clean up
rm $(addprefix debian/kolabd/etc/kolab/templates/,clamd.* freshclam.* httpd.* local.cf.template)
rm -r debian/kolabd/etc/amavis/conf.d/*
+ rm debian/kolabd/etc/kolab/rootDSE.ldif
rmdir debian/kolabd/usr/bin
rm debian/kolabd/usr/sbin/kolab_sslcert.sh
rm -r debian/kolabd/usr/share/doc/kolab
More information about the pkg-kolab-devel
mailing list