[pkg-kolab] r229 - trunk/kolabd/debian/patches

[Noel Koethe]

Author: noel
Date: 2006-01-25 15:40:19 +0000 (Wed, 25 Jan 2006)
New Revision: 229

Added:
   trunk/kolabd/debian/patches/40-kolabd-pid-file.dpatch
Modified:
   trunk/kolabd/debian/patches/00list
Log:
correct pid file location of kolabd

Modified: trunk/kolabd/debian/patches/00list
===================================================================
--- trunk/kolabd/debian/patches/00list	2006-01-25 14:36:23 UTC (rev 228)
+++ trunk/kolabd/debian/patches/00list	2006-01-25 15:40:19 UTC (rev 229)
@@ -1,3 +1,4 @@
 10-perl-path-fixes
 20-kolabquotawarn-issue851
-30-bootstrap.dpatch
+30-bootstrap
+40-kolabd-pid-file

Added: trunk/kolabd/debian/patches/40-kolabd-pid-file.dpatch
===================================================================
--- trunk/kolabd/debian/patches/40-kolabd-pid-file.dpatch	2006-01-25 14:36:23 UTC (rev 228)
+++ trunk/kolabd/debian/patches/40-kolabd-pid-file.dpatch	2006-01-25 15:40:19 UTC (rev 229)
@@ -0,0 +1,38 @@
+#!/bin/sh -e
+## 40-kolabd-pid-file.dpatch by Noèl Köthe <noel at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This is the patch to correct the pid file path
+
+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 -p1 < $0;;
+      -unpatch) patch $patch_opts -p1 -R < $0;;
+      *)
+      echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+      exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- kolabd-1.9.4/kolabd.orig	2006-01-25 16:32:11.000000000 +0100
++++ kolabd-1.9.4/kolabd	2006-01-25 16:32:46.000000000 +0100
+@@ -52,8 +52,8 @@
+ openlog('kolabd', 'cons, pid', 'user');
+ 
+ my $prefix = $Kolab::config{'prefix'};
+-my $pidfile = IO::File->new("$prefix/var/kolab/kolab.pid", 'w+')
+-    || die "Unable to open PID file `$prefix/var/kolab/kolab.pid'";
++my $pidfile = IO::File->new("/var/run/kolab.pid", 'w+')
++    || die "Unable to open PID file `/var/run/kolab.pid'";
+ print $pidfile $$;
+ undef $pidfile;
+ 


Property changes on: trunk/kolabd/debian/patches/40-kolabd-pid-file.dpatch
___________________________________________________________________
Name: svn:executable
   + *