[pkg-kolab] r1562 - in libkolab-perl/trunk/debian: . patches
Mathieu Parent
sathieu at alioth.debian.org
Sat Nov 19 17:00:49 UTC 2011
Author: sathieu
Date: 2011-11-19 17:00:48 +0000 (Sat, 19 Nov 2011)
New Revision: 1562
Removed:
libkolab-perl/trunk/debian/patches/60-fix-build.diff
libkolab-perl/trunk/debian/patches/70-reload-cyrus-conf.diff
libkolab-perl/trunk/debian/patches/90-slapd-runtime-config.diff
Modified:
libkolab-perl/trunk/debian/changelog
libkolab-perl/trunk/debian/compat
libkolab-perl/trunk/debian/control
libkolab-perl/trunk/debian/patches/series
Log:
removed three patches merged and moved to debhelper compat level 8
Modified: libkolab-perl/trunk/debian/changelog
===================================================================
--- libkolab-perl/trunk/debian/changelog 2011-11-19 16:55:44 UTC (rev 1561)
+++ libkolab-perl/trunk/debian/changelog 2011-11-19 17:00:48 UTC (rev 1562)
@@ -4,10 +4,14 @@
- 10-invoke-rc.diff removed, reworked upstream: we now use kolabsrv from
the kolabd package
- 30-bootstrap.diff refreshed
+ - 60-fix-build.diff removed, fixed upstream
+ - 70-reload-cyrus-conf.diff removed, fixed upstream
+ - 90-slapd-runtime-config.diff removed, looking for a better fix
* removed unused quilt dependency
* Drop old Breaks/Replaces on kolabconf, kolabd (no more in oldstable=lenny)
* Updated Standards-Version to 3.9.2: no changes
* d/watch: updated regexp to match perl-kolab-2.3+git-20101212.src.rpm
+ * Moved to debhelper compat level 8
-- Mathieu Parent <sathieu at debian.org> Tue, 24 May 2011 22:27:18 +0200
Modified: libkolab-perl/trunk/debian/compat
===================================================================
--- libkolab-perl/trunk/debian/compat 2011-11-19 16:55:44 UTC (rev 1561)
+++ libkolab-perl/trunk/debian/compat 2011-11-19 17:00:48 UTC (rev 1562)
@@ -1 +1 @@
-7
+8
Modified: libkolab-perl/trunk/debian/control
===================================================================
--- libkolab-perl/trunk/debian/control 2011-11-19 16:55:44 UTC (rev 1561)
+++ libkolab-perl/trunk/debian/control 2011-11-19 17:00:48 UTC (rev 1562)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Mathieu Parent <sathieu at debian.org>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 8)
Build-Depends-Indep: libnet-ldap-perl
Standards-Version: 3.9.2
Homepage: http://www.kolab.org/
Deleted: libkolab-perl/trunk/debian/patches/60-fix-build.diff
===================================================================
--- libkolab-perl/trunk/debian/patches/60-fix-build.diff 2011-11-19 16:55:44 UTC (rev 1561)
+++ libkolab-perl/trunk/debian/patches/60-fix-build.diff 2011-11-19 17:00:48 UTC (rev 1562)
@@ -1,38 +0,0 @@
-Goal: Fix build
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: Changes are ongoing on HEAD
-
-Index: b/Makefile.PL
-===================================================================
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -170,11 +170,11 @@
-
- # older versions of ExtUtils:MakeMaker don't support INSTALLVENDORSCRIPT
- my $installscript = "";
--if ($ExtUtils::MakeMaker::VERSION >= 6.42) {
-+#if ($ExtUtils::MakeMaker::VERSION >= 6.42) {
- $installscript = "INSTALLVENDORSCRIPT";
--} else {
-- $installscript = "INSTALLSCRIPT";
--}
-+#} else {
-+# $installscript = "INSTALLSCRIPT";
-+#}
-
- WriteMakefile(
- NAME => 'perl-kolab',
-Index: b/kolab.mk
-===================================================================
---- a/kolab.mk
-+++ b/kolab.mk
-@@ -1,5 +1,6 @@
- # Set KOLABDIR to the base directory of the OpenPKG/Kolab installation:
--KOLABDIR = $(shell openpkg rpm -q --qf '%{INSTALLPREFIX}\n' openpkg)
-+#KOLABDIR = $(shell openpkg rpm -q --qf '%{INSTALLPREFIX}\n' openpkg)
-+KOLABDIR = /notexistentdir
-
- ifeq ($(KOLABDIR),)
- $(error Could not determine KOLABDIR!)
Deleted: libkolab-perl/trunk/debian/patches/70-reload-cyrus-conf.diff
===================================================================
--- libkolab-perl/trunk/debian/patches/70-reload-cyrus-conf.diff 2011-11-19 16:55:44 UTC (rev 1561)
+++ libkolab-perl/trunk/debian/patches/70-reload-cyrus-conf.diff 2011-11-19 17:00:48 UTC (rev 1562)
@@ -1,21 +0,0 @@
-Goal: Reload cyrus when cyrus.conf is changed
-
-Related to #579933: kolabd: I can't enable/disable pop3/s and imap/s
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: Better change already commited to HEAD
-
-Index: libkolab-perl-2.2.4-20100624/lib/Kolab/Conf.pm
-===================================================================
---- libkolab-perl-2.2.4-20100624.orig/lib/Kolab/Conf.pm 2010-07-06 00:04:50.000000000 +0200
-+++ libkolab-perl-2.2.4-20100624/lib/Kolab/Conf.pm 2010-07-06 00:05:08.000000000 +0200
-@@ -297,7 +297,7 @@
- $haschanged{'apache'} = 1;
- } elsif ($cfg =~ /openldap/) {
- $haschanged{'slapd'} = 1;
-- } elsif ($cfg =~ /imapd/) {
-+ } elsif ($cfg =~ /(imapd|cyrus)/) {
- $haschanged{'imapd'} = 1;
- } elsif ($cfg =~ /amavisd/) {
- $haschanged{'amavisd'} = 1;
Deleted: libkolab-perl/trunk/debian/patches/90-slapd-runtime-config.diff
===================================================================
--- libkolab-perl/trunk/debian/patches/90-slapd-runtime-config.diff 2011-11-19 16:55:44 UTC (rev 1561)
+++ libkolab-perl/trunk/debian/patches/90-slapd-runtime-config.diff 2011-11-19 17:00:48 UTC (rev 1562)
@@ -1,70 +0,0 @@
-Goal: Use slapd.d "runtime configuration" for slapd
-
-Fixes #596710 (kolabd: kolab_bootstrap no longer works with
-slapd (version 2.4.23))
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: https://issues.kolab.org/issue3000
-
-Index: libkolab-perl-2.2.4-20100624/lib/Kolab/Conf.pm
-===================================================================
---- libkolab-perl-2.2.4-20100624.orig/lib/Kolab/Conf.pm 2010-09-13 21:18:54.000000000 +0200
-+++ libkolab-perl-2.2.4-20100624/lib/Kolab/Conf.pm 2010-09-14 08:28:22.000000000 +0200
-@@ -295,7 +295,7 @@
- $haschanged{'saslauthd'} = 1;
- } elsif ($cfg =~ /apache/) {
- $haschanged{'apache'} = 1;
-- } elsif ($cfg =~ /openldap/) {
-+ } elsif ($cfg =~ /openldap/ || $cfg =~ /slapd/) {
- $haschanged{'slapd'} = 1;
- } elsif ($cfg =~ /(imapd|cyrus)/) {
- $haschanged{'imapd'} = 1;
-@@ -854,8 +854,17 @@
- sub reload
- {
- if ($haschanged{'slapd'}) {
-- &Kolab::log('K', 'Restarting OpenLDAP...');
-- system("invoke-rc.d slapd restart &");
-+ &Kolab::log('K', 'Stopping OpenLDAP...');
-+ system("invoke-rc.d slapd stop");
-+ &Kolab::log('K', 'Deleting old slapd config...');
-+ system("rm -rf $Kolab::config{'ldapserver_confdir'}/slapd.d");
-+ &Kolab::log('K', 'Converting slapd config... (most errors here can be ignored)');
-+ system("mkdir $Kolab::config{'ldapserver_confdir'}/slapd.d");
-+ system("slaptest -f $Kolab::config{'ldapserver_confdir'}/slapd.conf -F $Kolab::config{'ldapserver_confdir'}/slapd.d");
-+ system("chown -R openldap $Kolab::config{'ldapserver_confdir'}/slapd.d");
-+ system("chgrp -R openldap $Kolab::config{'ldapserver_confdir'}/slapd.d");
-+ &Kolab::log('K', 'Starting OpenLDAP...');
-+ system("invoke-rc.d slapd start");
- }
-
- if ($haschanged{'saslauthd'}) {
-Index: libkolab-perl-2.2.4-20100624/sbin/kolab_bootstrap.in
-===================================================================
---- libkolab-perl-2.2.4-20100624.orig/sbin/kolab_bootstrap.in 2010-09-14 08:13:09.000000000 +0200
-+++ libkolab-perl-2.2.4-20100624/sbin/kolab_bootstrap.in 2010-09-14 08:27:09.000000000 +0200
-@@ -489,6 +489,14 @@
- Kolab::Conf::bootstrapConfig();
- $Kolab::config{"bootstrap_config"} = 'false';
-
-+ print "Deleting old slapd config...\n";
-+ system("rm -rf $Kolab::config{'ldapserver_confdir'}/slapd.d");
-+ print "Converting slapd config...\n";
-+ system("mkdir $Kolab::config{'ldapserver_confdir'}/slapd.d");
-+ system("slaptest -f $Kolab::config{'ldapserver_confdir'}/slapd.conf -F $Kolab::config{'ldapserver_confdir'}/slapd.d");
-+ system("chown -R openldap $Kolab::config{'ldapserver_confdir'}/slapd.d");
-+ system("chgrp -R openldap $Kolab::config{'ldapserver_confdir'}/slapd.d");
-+
- #ldap server should access to certificate key
- system("adduser --quiet $Kolab::config{'ldapserver_rusr'} $Kolab::config{'pki_grp'}");
-
-@@ -497,7 +505,7 @@
- $ldap_uri = "ldap://127.0.0.1:389/";
- # ensure that the database has correct permissions
- system("chown $Kolab::config{'ldapserver_rusr'}:$Kolab::config{'ldapserver_grp'} $Kolab::config{'ldapserver_dir'}/*");
-- (system("/usr/sbin/slapd -h ldap://127.0.0.1:389/ -f $Kolab::config{'ldapserver_confdir'}/slapd.conf -u $Kolab::config{'ldapserver_rusr'} -g $Kolab::config{'ldapserver_grp'}") == 0 ) || die( "Could not start temporary slapd: $!" );
-+ (system("/usr/sbin/slapd -h ldap://127.0.0.1:389/ -F $Kolab::config{'ldapserver_confdir'}/slapd.d -u $Kolab::config{'ldapserver_rusr'} -g $Kolab::config{'ldapserver_grp'}") == 0 ) || die( "Could not start temporary slapd: $!" );
- print ("Waiting for OpenLDAP to start\n");
- sleep 10;
-
Modified: libkolab-perl/trunk/debian/patches/series
===================================================================
--- libkolab-perl/trunk/debian/patches/series 2011-11-19 16:55:44 UTC (rev 1561)
+++ libkolab-perl/trunk/debian/patches/series 2011-11-19 17:00:48 UTC (rev 1562)
@@ -1,6 +1,3 @@
30-bootstrap.diff
40-disable-amavis.diff
-60-fix-build.diff
-70-reload-cyrus-conf.diff
-90-slapd-runtime-config.diff
92-sieve-port-4190.diff
More information about the pkg-kolab-devel
mailing list