[pkg-kolab] r466 - in libkolab-perl/trunk/debian: . patches

[Peter Eisentraut]

Author: petere
Date: 2006-09-21 19:29:10 +0000 (Thu, 21 Sep 2006)
New Revision: 466

Modified:
   libkolab-perl/trunk/debian/changelog
   libkolab-perl/trunk/debian/patches/10-Kolab.pm.dpatch
Log:
* Added patch to Kolab.pm to remove spurious checks for ids of unused
  kolab-n and kolab-r users

Modified: libkolab-perl/trunk/debian/changelog
===================================================================
--- libkolab-perl/trunk/debian/changelog	2006-09-21 13:00:32 UTC (rev 465)
+++ libkolab-perl/trunk/debian/changelog	2006-09-21 19:29:10 UTC (rev 466)
@@ -1,3 +1,10 @@
+libkolab-perl (0.9.2-20060430-2) unstable; urgency=low
+
+  * Added patch to Kolab.pm to remove spurious checks for ids of unused
+    kolab-n and kolab-r users
+
+ -- Peter Eisentraut <petere at debian.org>  Thu, 21 Sep 2006 21:27:32 +0200
+
 libkolab-perl (0.9.2-20060430-1) unstable; urgency=low
 
   * New upstream release

Modified: libkolab-perl/trunk/debian/patches/10-Kolab.pm.dpatch
===================================================================
--- libkolab-perl/trunk/debian/patches/10-Kolab.pm.dpatch	2006-09-21 13:00:32 UTC (rev 465)
+++ libkolab-perl/trunk/debian/patches/10-Kolab.pm.dpatch	2006-09-21 19:29:10 UTC (rev 466)
@@ -1,29 +1,9 @@
-#!/bin/sh -e
-## 10-perl-path-fixes.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
-##
-## DP: Here we correct the pathes of kolab.
+#!/bin/sh /usr/share/dpatch/dpatch-run
 
-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
-
 @DPATCH@
---- Kolab/Kolab.pm.bak	2006-01-09 15:39:44.000000000 +0100
-+++ Kolab/Kolab.pm	2006-01-09 15:44:46.000000000 +0100
+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);	
  	$error = 1;
@@ -39,6 +19,45 @@
  
  #    $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);
+-	$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;
+-    }
++#    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
@@ -84,12 +103,20 @@
 -        &log('K', 'Restarting amavisd...');
 -        system("$prefix/bin/openpkg 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");
 -    }
--
++    #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");
@@ -101,16 +128,6 @@
 -        &log('K', 'Stopping ProFTPd, if running...');
 -        system("$prefix/bin/openpkg rc proftpd stop");
 -    }
-+    #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");
-+    #}
-+
 +    #if ($config{'proftpd-ftp'} =~ /true/i) {
 +    #    Kolab::log('K', 'Starting ProFTPd if not running');
 +    #    system("$prefix/bin/openpkg rc proftpd start");