[pkg-kolab] r1550 - in libkolab-perl/trunk/debian: . patches
Mathieu Parent
sathieu at alioth.debian.org
Tue May 24 21:35:42 UTC 2011
Author: sathieu
Date: 2011-05-24 21:35:42 +0000 (Tue, 24 May 2011)
New Revision: 1550
Removed:
libkolab-perl/trunk/debian/patches/10-invoke-rc.diff
Modified:
libkolab-perl/trunk/debian/changelog
libkolab-perl/trunk/debian/patches/series
Log:
10-invoke-rc.diff removed, reworked upstream: we now use kolabsrv from the kolabd package
Modified: libkolab-perl/trunk/debian/changelog
===================================================================
--- libkolab-perl/trunk/debian/changelog 2011-05-24 20:26:39 UTC (rev 1549)
+++ libkolab-perl/trunk/debian/changelog 2011-05-24 21:35:42 UTC (rev 1550)
@@ -1,11 +1,14 @@
-libkolab-perl (1:2.2.4-20100624-4) UNRELEASED; urgency=low
+libkolab-perl (1:2.3+git-20101212-1) UNRELEASED; urgency=low
+ * New release 2.3.1 (20101212)
+ - 10-invoke-rc.diff removed, reworked upstream: we now use kolabsrv from
+ the kolabd package
* 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
- -- Mathieu Parent <sathieu at debian.org> Tue, 24 May 2011 22:25:46 +0200
+ -- Mathieu Parent <sathieu at debian.org> Tue, 24 May 2011 22:27:18 +0200
libkolab-perl (1:2.2.4-20100624-3) unstable; urgency=low
Deleted: libkolab-perl/trunk/debian/patches/10-invoke-rc.diff
===================================================================
--- libkolab-perl/trunk/debian/patches/10-invoke-rc.diff 2011-05-24 20:26:39 UTC (rev 1549)
+++ libkolab-perl/trunk/debian/patches/10-invoke-rc.diff 2011-05-24 21:35:42 UTC (rev 1550)
@@ -1,105 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30-invoke-rc.dpatch by <math.parent at gmail.com>
-##
-## DP: Debian specific invocation of services
-
- at DPATCH@
-Index: b/lib/Kolab/Conf.pm
-===================================================================
---- a/lib/Kolab/Conf.pm
-+++ b/lib/Kolab/Conf.pm
-@@ -855,38 +855,28 @@
- {
- if ($haschanged{'slapd'}) {
- &Kolab::log('K', 'Restarting OpenLDAP...');
-- system("$Kolab::config{'KOLABRC'} rc openldap restart &");
-+ system("invoke-rc.d slapd restart &");
- }
-
- if ($haschanged{'saslauthd'}) {
- &Kolab::log('K', 'Restarting SASLAuthd...');
-- system("$Kolab::config{'KOLABRC'} rc sasl stop; sleep 1; $Kolab::config{sbindir}/saslauthd -a ldap -n 5");
-+ system("invoke-rc.d saslauthd restart");
- }
-
- if ($haschanged{'apache'}) {
- &Kolab::log('K', 'Reloading Apache...');
-- system("$Kolab::config{sbindir}/apachectl graceful");
-+ system("invoke-rc.d apache2 graceful");
- }
-
- if ($haschanged{'postfix'}) {
- &Kolab::log('K', 'Reloading Postfix...');
-- system("$Kolab::config{sbindir}/postfix reload");
-+ system("invoke-rc.d postfix reload");
- }
-
- if ($haschanged{'imapd'}) {
- &Kolab::log('K', 'Restarting imapd...');
- # Would it be enough with a reload here? /steffen
-- system("$Kolab::config{'KOLABRC'} rc imapd restart");
-- }
--
-- if ($haschanged{'amavisd'}) {
-- &Kolab::log('K', 'Restarting amavisd...');
-- system("$Kolab::config{'KOLABRC'} rc amavisd restart");
-- }
--
-- if ($haschanged{'clamav'}) {
-- &Kolab::log('K', 'Restarting clamav...');
-- system("$Kolab::config{'KOLABRC'} rc clamav restart");
-+ system("invoke-rc.d kolab-cyrus restart");
- }
-
- %Kolab::Conf::haschanged = ();
-Index: b/sbin/kolab_bootstrap.in
-===================================================================
---- a/sbin/kolab_bootstrap.in
-+++ b/sbin/kolab_bootstrap.in
-@@ -112,7 +112,7 @@
- print ("Error: Found $name running on Port $port\n");
- print ("Check your installation!\n");
- print ("You must stop the service $name before running Kolab\n");
-- print ("You may try to execute \"$Kolab::config{'KOLABRC'} rc all stop\" initially\n");
-+ print ("You may try to execute \"/etc/init.d/\$DAEMON stop\" initially\n");
- exit 1;
- }
- }
-@@ -645,7 +645,7 @@
-
- if ($ldap_uri =~ /127\.0\.0\.1/ || $ldap_uri =~ /localhost/) {
- print "\nkill temporary slapd\n\n";
-- system("$Kolab::config{'KOLABRC'} rc $Kolab::config{'LDAPD'} stop");
-+ system("invoke-rc.d slapd stop");
- sleep 1; # actually race should be impossible
- system("killall -9 slapd >/dev/null 2>&1");
- }
-@@ -698,7 +698,7 @@
- ##### Slave server setup
-
- print "stop running slapd (if any)\n";
-- kolab_system("$Kolab::config{'KOLABRC'} rc $Kolab::config{'LDAPD'} stop");
-+ kolab_system("invoke-rc.d slapd stop");
-
- # Make sure that no rogue demons are running
- tryConnect( '127.0.0.1', 389 ) && die "A process is already listening to port 389 (ldap)\n"
-@@ -822,9 +822,9 @@
- is copied over to this slave. Please make sure that this slave is entered into the list
- of kolabhosts on the master before proceeding.
- EOS
-- kolab_system("ssh -C $master_host \'$Kolab::config{'KOLABRC'} rc $Kolab::config{'LDAPD'} stop".
-+ kolab_system("ssh -C $master_host \'invoke-rc.d slapd stop".
- " && $Kolab::config{'TAR'} -C $Kolab::config{'ldapserver_statedir'} -pcf - openldap-data".
-- " && $Kolab::config{'KOLABRC'} rc $Kolab::config{'LDAPD'} start\'".
-+ " && invoke-rc.d slapd start\'".
- " | $Kolab::config{'TAR'} -C $Kolab::config{'ldapserver_statedir'} -pxf -");
- }
-
-@@ -916,6 +916,6 @@
-
- #system("@CONFIG_DIR@/kolab_sslcert.sh $fqdn");
- print "kolab is now ready to run!\n";
--print "please run '$Kolab::config{'KOLABRC'} rc all start'\n";
-+print "please restart all the daemons\n";
- print ("Use login=manager and passwd=" . Encode::decode_utf8($bind_pw) . " when you log into\n");
- print ("the webinterface https://$fqdn$Kolab::config{'kolab_wui'} !\n");
Modified: libkolab-perl/trunk/debian/patches/series
===================================================================
--- libkolab-perl/trunk/debian/patches/series 2011-05-24 20:26:39 UTC (rev 1549)
+++ libkolab-perl/trunk/debian/patches/series 2011-05-24 21:35:42 UTC (rev 1550)
@@ -1,4 +1,3 @@
-10-invoke-rc.diff
30-bootstrap.diff
40-disable-amavis.diff
60-fix-build.diff
More information about the pkg-kolab-devel
mailing list