[pkg-kolab] r619 - in libkolab-perl/trunk/debian: . patches
petere at alioth.debian.org
petere at alioth.debian.org
Tue Jun 19 22:46:56 UTC 2007
Author: petere
Date: 2007-06-19 22:46:56 +0000 (Tue, 19 Jun 2007)
New Revision: 619
Added:
libkolab-perl/trunk/debian/patches/40-dist_conf.dpatch
Removed:
libkolab-perl/trunk/debian/patches/20-LDAP.pm-cachefiles.dpatch
libkolab-perl/trunk/debian/patches/30-slurpd.pm.dpatch
Modified:
libkolab-perl/trunk/debian/changelog
libkolab-perl/trunk/debian/copyright
libkolab-perl/trunk/debian/patches/00list
libkolab-perl/trunk/debian/patches/10-Kolab.pm.dpatch
libkolab-perl/trunk/debian/rules
Log:
* New upstream release
- Updated patches
- Obsoleted patches: 20-LDAP.pm-cachefiles.dpatch, 30-slurpd.pm.dpatch
* Init scripts invocations in the code are now using invoke-rc.d
Modified: libkolab-perl/trunk/debian/changelog
===================================================================
--- libkolab-perl/trunk/debian/changelog 2007-06-19 14:29:51 UTC (rev 618)
+++ libkolab-perl/trunk/debian/changelog 2007-06-19 22:46:56 UTC (rev 619)
@@ -1,10 +1,16 @@
-libkolab-perl (0.9.2-20060430-3) UNRELEASED; urgency=low
+libkolab-perl (5.8.7-20070420-1) UNRELEASED; urgency=low
[ Steffen Joeris ]
* Change my maintainer address
- -- Steffen Joeris <white at debian.org> Wed, 3 Jan 2007 11:29:07 +0100
+ [ Peter Eisentraut ]
+ * New upstream release
+ - Updated patches
+ - Obsoleted patches: 20-LDAP.pm-cachefiles.dpatch, 30-slurpd.pm.dpatch
+ * Init scripts invocations in the code are now using invoke-rc.d
+ -- Peter Eisentraut <petere at debian.org> Tue, 19 Jun 2007 16:32:19 +0200
+
libkolab-perl (0.9.2-20060430-2) unstable; urgency=low
* Added patch to Kolab.pm to remove spurious checks for ids of unused
Modified: libkolab-perl/trunk/debian/copyright
===================================================================
--- libkolab-perl/trunk/debian/copyright 2007-06-19 14:29:51 UTC (rev 618)
+++ libkolab-perl/trunk/debian/copyright 2007-06-19 22:46:56 UTC (rev 619)
@@ -7,15 +7,15 @@
Kolab-Conf/Conf.pm
Kolab-LDAP-Backend-slurpd/slurpd.pm
-## Copyright (c) 2004 Klaralvdalens Datakonsult AB
+## Copyright (c) 2004 Klaraelvdalens Datakonsult AB
## Copyright (c) 2003 Code Fusion cc
##
## Writen by Stuart Bingë <s.binge at codefusion.co.za>
## Portions based on work by the following people:
##
-## (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-## (c) 2003 Martin Konold <martin.konold at erfrakon.de>
-## (c) 2003 Achim Frank <achim.frank at erfrakon.de>
+## (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+## (c) 2003-2006 Martin Konold <martin.konold at erfrakon.de>
+## (c) 2003 Achim Frank <achim.frank at erfrakon.de>
Kolab-Cyrus/Cyrus.pm
@@ -31,7 +31,7 @@
Kolab-LDAP/LDAP.pm
-## Copyright (c) 2005 Klaralvdalens Datakonsult AB
+## Copyright (c) 2005 Klaraelvdalens Datakonsult AB
## Copyright (c) 2003 Code Fusion cc
##
## Writen by Stuart Bingë <s.binge at codefusion.co.za>
Modified: libkolab-perl/trunk/debian/patches/00list
===================================================================
--- libkolab-perl/trunk/debian/patches/00list 2007-06-19 14:29:51 UTC (rev 618)
+++ libkolab-perl/trunk/debian/patches/00list 2007-06-19 22:46:56 UTC (rev 619)
@@ -1,3 +1,2 @@
10-Kolab.pm
-20-LDAP.pm-cachefiles
-30-slurpd.pm
+40-dist_conf
Modified: libkolab-perl/trunk/debian/patches/10-Kolab.pm.dpatch
===================================================================
--- libkolab-perl/trunk/debian/patches/10-Kolab.pm.dpatch 2007-06-19 14:29:51 UTC (rev 618)
+++ libkolab-perl/trunk/debian/patches/10-Kolab.pm.dpatch 2007-06-19 22:46:56 UTC (rev 619)
@@ -1,144 +1,93 @@
#!/bin/sh /usr/share/dpatch/dpatch-run
@DPATCH@
-diff -urNad libkolab-perl-0.9.2-20060430~/Kolab/Kolab.pm libkolab-perl-0.9.2-20060430/Kolab/Kolab.pm
---- libkolab-perl-0.9.2-20060430~/Kolab/Kolab.pm 2006-07-07 17:23:59.000000000 +0200
-+++ libkolab-perl-0.9.2-20060430/Kolab/Kolab.pm 2006-09-21 21:17:06.000000000 +0200
-@@ -82,12 +82,12 @@
- &log('C', 'Unable to determine the kolab root directory', KOLAB_ERROR);
+diff -urNad libkolab-perl-5.8.7-20070420~/Kolab/Kolab.pm.in libkolab-perl-5.8.7-20070420/Kolab/Kolab.pm.in
+--- libkolab-perl-5.8.7-20070420~/Kolab/Kolab.pm.in 2007-03-28 03:48:28.000000000 +0200
++++ libkolab-perl-5.8.7-20070420/Kolab/Kolab.pm.in 2007-06-20 00:41:13.000000000 +0200
+@@ -112,30 +112,6 @@
$error = 1;
- } else {
-- %config = readConfig(%config, "$tempval/etc/kolab/kolab.globals");
-+ %config = readConfig(%config, "/etc/kolab/kolab.globals");
- $config{'prefix'} = $tempval;
}
- # Now read `kolab.conf', overwriting values read from `kolab.globals'
-- %config = readConfig(\%config, "$tempval/etc/kolab/kolab.conf");
-+ %config = readConfig(\%config, "/etc/kolab/kolab.conf");
-
- # $config{'log_level'} = KOLAB_WARN if (!exists $config{'log_level'});
- &log('C', 'Reloading configuration');
-@@ -101,22 +101,22 @@
- &log('C', "Unable to determine the gid of user `kolab'", KOLAB_ERROR);
- $error = 1;
- }
-- if (!($config{'kolab_n_uid'} = (getpwnam('kolab-n'))[2])) {
-- &log('C', "Unable to determine the uid of user `kolab-n'", KOLAB_ERROR);
+- $config{'kolab_n_uid'} = (getpwnam('@kolab_usr@'))[2];
+- if (!defined $config{'kolab_n_uid'}) {
+- &log('C', "Unable to determine the uid of user '@kolab_usr@'", KOLAB_ERROR);
- $error = 1;
- }
-- if (!($config{'kolab_n_gid'} = (getgrnam('kolab-n'))[2])) {
-- &log('C', "Unable to determine the gid of user `kolab-n'", KOLAB_ERROR);
+-
+- $config{'kolab_n_gid'} = (getgrnam('@kolab_grp@'))[2];
+- if (!defined $config{'kolab_n_gid'}) {
+- &log('C', "Unable to determine the gid of user @kolab_grp@'", KOLAB_ERROR);
- $error = 1;
- }
-- if (!($config{'kolab_r_uid'} = (getpwnam('kolab-r'))[2])) {
-- &log('C', "Unable to determine the uid of user `kolab-r'", KOLAB_ERROR);
+-
+- $config{'kolab_r_uid'} = (getpwnam('@kolab_rusr@'))[2];
+- if (!defined $config{'kolab_r_uid'}) {
+- &log('C', "Unable to determine the uid of user '@kolab_rusr@'", KOLAB_ERROR);
- $error = 1;
- }
-- if (!($config{'kolab_r_gid'} = (getgrnam('kolab-r'))[2])) {
-- &log('C', "Unable to determine the gid of user `kolab-r'", KOLAB_ERROR);
+-
+- $config{'kolab_r_gid'} = (getgrnam('@kolab_rgrp@'))[2];
+- if (!defined $config{'kolab_r_gid'}) {
+- &log('C', "Unable to determine the gid of user '@kolab_rgrp@'", KOLAB_ERROR);
- $error = 1;
- }
-+# if (!($config{'kolab_n_uid'} = (getpwnam('kolab-n'))[2])) {
-+# &log('C', "Unable to determine the uid of user `kolab-n'", KOLAB_ERROR);
-+# $error = 1;
-+# }
-+# if (!($config{'kolab_n_gid'} = (getgrnam('kolab-n'))[2])) {
-+# &log('C', "Unable to determine the gid of user `kolab-n'", KOLAB_ERROR);
-+# $error = 1;
-+# }
-+# if (!($config{'kolab_r_uid'} = (getpwnam('kolab-r'))[2])) {
-+# &log('C', "Unable to determine the uid of user `kolab-r'", KOLAB_ERROR);
-+# $error = 1;
-+# }
-+# if (!($config{'kolab_r_gid'} = (getgrnam('kolab-r'))[2])) {
-+# &log('C', "Unable to determine the gid of user `kolab-r'", KOLAB_ERROR);
-+# $error = 1;
-+# }
-
+-
# Make sure the critical variables we need were defined in kolab.conf
if (!exists $config{'bind_dn'} || !exists $config{'bind_pw'} || !exists $config{'ldap_uri'} || !exists $config{'base_dn'}) {
-@@ -126,7 +126,7 @@
-
- # Make a hash of the bind password available too
- if( !exists $config{'bind_pw_hash'} ) {
-- my $hashcmd = $config{'prefix'}."/sbin/slappasswd -s '".$config{'bind_pw'}."'";
-+ my $hashcmd = "/usr/sbin/slappasswd -s '".$config{'bind_pw'}."'";
- $config{'bind_pw_hash'} = `$hashcmd`;
- chomp($config{'bind_pw_hash'});
- }
-@@ -382,50 +382,50 @@
-
+ &log('C', "One or more required configuration variables (`bind_dn', `bind_pw', `ldap_uri' and/or `base_dn') are missing in `kolab.conf'", KOLAB_ERROR);
+@@ -399,50 +375,28 @@
+ {
if ($haschanged{'slapd'}) {
&log('K', 'Restarting OpenLDAP...');
-- system("$prefix/bin/openpkg rc openldap restart &");
-+ system("/etc/init.d/slapd restart &");
+- system("@KOLABRC@ rc openldap restart &");
++ system("invoke-rc.d slapd restart &");
}
if ($haschanged{'saslauthd'}) {
&log('K', 'Restarting SASLAuthd...');
-- system("$prefix/bin/openpkg rc sasl stop; sleep 1; $prefix/sbin/saslauthd -a ldap -n 5");
-+ system("/etc/init.d/saslauthd restart");
+- system("@KOLABRC@ rc sasl stop; sleep 1; @sbindir@/saslauthd -a ldap -n 5");
++ system("invoke-rc.d saslauthd restart");
}
if ($haschanged{'apache'}) {
&log('K', 'Reloading Apache...');
-- system("$prefix/sbin/apachectl graceful");
-+ system("/etc/init.d/apache2 graceful");
+- system("@sbindir@/apachectl graceful");
++ system("invoke-rc.d apache2 graceful");
}
if ($haschanged{'postfix'}) {
&log('K', 'Reloading Postfix...');
-- system("$prefix/sbin/postfix reload");
-+ system("/etc/init.d/postfix reload");
+- system("@sbindir@/postfix reload");
++ system("invoke-rc.d postfix reload");
}
if ($haschanged{'imapd'}) {
&log('K', 'Restarting imapd...');
-- system("$prefix/bin/openpkg rc imapd restart");
-+ system("/etc/init.d/kolab-cyrus restart");
- }
-
+ # Would it be enough with a reload here? /steffen
+- system("@KOLABRC@ rc imapd restart");
+- }
+-
- if ($haschanged{'amavisd'}) {
- &log('K', 'Restarting amavisd...');
-- system("$prefix/bin/openpkg rc amavisd restart");
+- system("@KOLABRC@ rc amavisd restart");
- }
-+ #if ($haschanged{'amavisd'}) {
-+ # &log('K', 'Restarting amavisd...');
-+ # system("$prefix/bin/openpkg rc amavisd restart");
-+ #}
-
+-
- if ($haschanged{'clamav'}) {
- &log('K', 'Restarting clamav...');
-- system("$prefix/bin/openpkg rc clamav restart");
+- system("@KOLABRC@ rc clamav restart");
- }
-+ #if ($haschanged{'clamav'}) {
-+ # &log('K', 'Restarting clamav...');
-+ # system("$prefix/bin/openpkg rc clamav restart");
-+ #}
-
+-
- if ($config{'proftpd-ftp'} =~ /true/i) {
- Kolab::log('K', 'Starting ProFTPd if not running');
-- system("$prefix/bin/openpkg rc proftpd start");
+- system("@KOLABRC@ rc proftpd start");
- if ($haschanged{'proftpd'}) {
- &log('K', 'Reloading ProFTPd...');
-- kill('SIGHUP', `cat $prefix/var/proftpd/proftpd.pid`);
+- kill('SIGHUP', `cat @ftpserver_pidfile@`);
- }
- } else {
- &log('K', 'Stopping ProFTPd, if running...');
-- system("$prefix/bin/openpkg rc proftpd stop");
-- }
-+ #if ($config{'proftpd-ftp'} =~ /true/i) {
-+ # Kolab::log('K', 'Starting ProFTPd if not running');
-+ # system("$prefix/bin/openpkg rc proftpd start");
-+ # if ($haschanged{'proftpd'}) {
-+ # &log('K', 'Reloading ProFTPd...');
-+ # kill('SIGHUP', `cat $prefix/var/proftpd/proftpd.pid`);
-+ # }
-+ #} else {
-+ # &log('K', 'Stopping ProFTPd, if running...');
-+ # system("$prefix/bin/openpkg rc proftpd stop");
-+ #}
+- system("@KOLABRC@ rc proftpd stop");
++ system("invoke-rc.d kolab-cyrus restart");
+ }
%Kolab::Conf::haschanged = ();
-
Deleted: libkolab-perl/trunk/debian/patches/20-LDAP.pm-cachefiles.dpatch
===================================================================
--- libkolab-perl/trunk/debian/patches/20-LDAP.pm-cachefiles.dpatch 2007-06-19 14:29:51 UTC (rev 618)
+++ libkolab-perl/trunk/debian/patches/20-LDAP.pm-cachefiles.dpatch 2007-06-19 22:46:56 UTC (rev 619)
@@ -1,50 +0,0 @@
-#!/bin/sh -e
-## 20-LDAP.pm-cachefiles.dpatch by Noèl Köthe
-##
-## DP: Here we correct the path of cache files
-
-if [ $# -lt 1 ]; then
-echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p0 < $0;;
- -unpatch) patch $patch_opts -p0 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
---- Kolab-LDAP/LDAP.pm.orig 2005-09-12 22:34:17.000000000 +0200
-+++ Kolab-LDAP/LDAP.pm 2006-01-25 00:19:39.000000000 +0100
-@@ -67,19 +67,19 @@
-
- Kolab::log('L', 'Opening mailbox uid cache DB');
-
-- if (!dbmopen(%uid_db, $Kolab::config{'prefix'} . '/var/kolab/mailbox-uidcache.db', 0666)) {
-+ if (!dbmopen(%uid_db, '/var/lib/kolab/mailbox-uidcache.db', 0666)) {
- Kolab::log('L', 'Unable to open mailbox uid cache DB', KOLAB_ERROR);
- exit(1);
- }
-
- Kolab::log('L', 'Opening graveyard uid/timestamp cache DB');
-
-- if (!dbmopen(%gyard_db, $Kolab::config{'prefix'} . '/var/kolab/graveyard-uidcache.db', 0666)) {
-+ if (!dbmopen(%gyard_db, '/var/lib/kolab/graveyard-uidcache.db', 0666)) {
- Kolab::log('L', 'Unable to open graveyard uid cache DB', KOLAB_ERROR);
- exit(1);
- }
-
-- if (!dbmopen(%gyard_ts_db, $Kolab::config{'prefix'} . '/var/kolab/graveyard-tscache.db', 0666)) {
-+ if (!dbmopen(%gyard_ts_db, '/var/lib/kolab/graveyard-tscache.db', 0666)) {
- Kolab::log('L', 'Unable to open graveyard timestamp cache DB', KOLAB_ERROR);
- exit(1);
- }
-
Deleted: libkolab-perl/trunk/debian/patches/30-slurpd.pm.dpatch
===================================================================
--- libkolab-perl/trunk/debian/patches/30-slurpd.pm.dpatch 2007-06-19 14:29:51 UTC (rev 618)
+++ libkolab-perl/trunk/debian/patches/30-slurpd.pm.dpatch 2007-06-19 22:46:56 UTC (rev 619)
@@ -1,36 +0,0 @@
-#!/bin/sh -e
-## 30-slurpd.pm.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
-##
-## DP: Here we correct the path for kolabconf
-
-if [ $# -lt 1 ]; then
-echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p0 < $0;;
- -unpatch) patch $patch_opts -p0 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -ur Kolab-LDAP-Backend-slurpd.orig/slurpd.pm Kolab-LDAP-Backend-slurpd/slurpd.pm
---- Kolab-LDAP-Backend-slurpd.orig/slurpd.pm 2006-07-07 17:23:59.000000000 +0200
-+++ Kolab-LDAP-Backend-slurpd/slurpd.pm 2006-08-21 21:00:53.000000000 +0200
-@@ -282,7 +282,7 @@
- Kolab::log('SD', 'Change detected w/ no pending LDAP messages; reloading services if needed');
- Kolab::LDAP::sync;
- Kolab::log('SD', 'Running kolabconf');
-- system($Kolab::config{'prefix'} ."/sbin/kolabconf") == 0
-+ system("/usr/sbin/kolabconf") == 0
- or Kolab::log('SD', "Failed to run kolabconf: $?", KOLAB_ERROR);
- Kolab::log('SD', 'Kolabconf complete');
- }
Added: libkolab-perl/trunk/debian/patches/40-dist_conf.dpatch
===================================================================
--- libkolab-perl/trunk/debian/patches/40-dist_conf.dpatch (rev 0)
+++ libkolab-perl/trunk/debian/patches/40-dist_conf.dpatch 2007-06-19 22:46:56 UTC (rev 619)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40-dist_conf.dpatch by Peter Eisentraut <petere at debian.org>
+##
+## DP: Adjusts some paths
+
+ at DPATCH@
+diff -urNad libkolab-perl-5.8.7-20070420.obsolete.0.59179420799865~/dist_conf/debian libkolab-perl-5.8.7-20070420.obsolete.0.59179420799865/dist_conf/debian
+--- libkolab-perl-5.8.7-20070420.obsolete.0.59179420799865~/dist_conf/debian 2007-04-20 17:08:22.000000000 +0200
++++ libkolab-perl-5.8.7-20070420.obsolete.0.59179420799865/dist_conf/debian 2007-06-19 16:58:28.000000000 +0200
+@@ -19,7 +19,7 @@
+ pkgdocdir=${datadir}/doc/kolab
+
+ # perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
+-perllib=${libdir}/perl5
++perllib=/usr/share/perl5
+
+ amavisd_conffile=${sysconfdir}/amavis/conf.d
+ amavisd_templatedir=${sysconfdir}/amavis/conf.d
Property changes on: libkolab-perl/trunk/debian/patches/40-dist_conf.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: libkolab-perl/trunk/debian/rules
===================================================================
--- libkolab-perl/trunk/debian/rules 2007-06-19 14:29:51 UTC (rev 618)
+++ libkolab-perl/trunk/debian/rules 2007-06-19 22:46:56 UTC (rev 619)
@@ -2,31 +2,22 @@
include /usr/share/dpatch/dpatch.make
-unpack: unpack-stamp
-unpack-stamp:
+config.status: configure patch-stamp
dh_testdir
- for i in Kolab*.tar.gz; do tar xvfz $$i || exit; done
- touch $@
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --with-dist=debian
-configure: configure-stamp
-configure-stamp: unpack-stamp patch-stamp
- dh_testdir
- for i in `find . -maxdepth 1 -type d -name "Kolab*"`; do (cd $$i && perl Makefile.PL INSTALLDIRS=vendor) || exit; done
- touch $@
-
build: build-stamp
-build-stamp: configure-stamp
+build-stamp: config.status
dh_testdir
- for i in `find . -maxdepth 1 -type d -name "Kolab*"`; do $(MAKE) -C $$i || exit; done
- touch $@
+ $(MAKE)
+ touch build-stamp
-clean:
+clean: clean-patched unpatch
+clean-patched:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
- rm -rf debian/patched patch-stamp
- rm -f unpack-stamp
- find . -maxdepth 1 -type d -name "Kolab*" | xargs rm -rf
+ rm -f build-stamp
+ -$(MAKE) distclean
dh_clean
install: build
@@ -34,23 +25,24 @@
dh_testroot
dh_clean -k
dh_installdirs
- for i in `find . -maxdepth 1 -type d -name "Kolab*"`; do $(MAKE) -C $$i install PREFIX=$(CURDIR)/debian/libkolab-perl/usr || exit; done
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/libkolab-perl
+ rm -rf $(CURDIR)/debian/libkolab-perl/usr/share/doc/kolab/
binary-indep: build install
dh_testdir
dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installman
- dh_link
- dh_compress
- dh_fixperms
- dh_perl
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_installchangelogs -i ChangeLog
+ dh_installdocs -i
+ dh_installman -i
+ dh_link -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_perl -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
binary: binary-indep binary-arch
+
.PHONY: build clean binary-indep binary-arch binary install
More information about the pkg-kolab-devel
mailing list