[pkg-kolab] r388 - in trunk/kolabd/debian: . patches

[Steffen Joeris]

Author: white-guest
Date: 2006-05-26 14:56:03 +0000 (Fri, 26 May 2006)
New Revision: 388

Added:
   trunk/kolabd/debian/patches/80-kolab-syslog-facility.dpatch
Modified:
   trunk/kolabd/debian/changelog
   trunk/kolabd/debian/patches/00list
Log:
* include patch for syslog configuration (Closes: #368977)


Modified: trunk/kolabd/debian/changelog
===================================================================
--- trunk/kolabd/debian/changelog	2006-05-20 10:50:46 UTC (rev 387)
+++ trunk/kolabd/debian/changelog	2006-05-26 14:56:03 UTC (rev 388)
@@ -1,3 +1,10 @@
+kolabd (1.9.4dfsg-4) unstable; urgency=low
+
+  * Include patch to allow configuration for syslog (Closes: #368977)
+    Thanks to Marc Brockschmidt
+
+ -- Steffen Joeris <steffen.joeris at skolelinux.de>  Fri, 26 May 2006 16:52:16 +0200
+
 kolabd (1.9.4dfsg-3) unstable; urgency=low
 
   * Fixed init script messages (closes: #360936)

Modified: trunk/kolabd/debian/patches/00list
===================================================================
--- trunk/kolabd/debian/patches/00list	2006-05-20 10:50:46 UTC (rev 387)
+++ trunk/kolabd/debian/patches/00list	2006-05-26 14:56:03 UTC (rev 388)
@@ -5,3 +5,4 @@
 50-kolabpasswd-slappasswd-path
 60-kolabdcachetool-cachefiles
 70-kolab2.schema-removal.of.rfc2739.dpatch
+80-kolab-syslog-facility

Added: trunk/kolabd/debian/patches/80-kolab-syslog-facility.dpatch
===================================================================
--- trunk/kolabd/debian/patches/80-kolab-syslog-facility.dpatch	2006-05-20 10:50:46 UTC (rev 387)
+++ trunk/kolabd/debian/patches/80-kolab-syslog-facility.dpatch	2006-05-26 14:56:03 UTC (rev 388)
@@ -0,0 +1,38 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 80-kolab-syslog-facility.dpatch by Marc Brockschmidt <marc.brockschmidt at credativ.de>
+##
+## DP: Make the used syslog facility configureable
+
+ at DPATCH@
+diff -Nwru kolabd-1.9.4dfsg/kolabconf kolabd-1.9.4dfsg.patched/kolabconf
+--- kolabd-1.9.4dfsg/kolabconf	2005-04-28 02:16:59.000000000 +0200
++++ kolabd-1.9.4dfsg.patched/kolabconf	2006-05-26 15:32:13.000000000 +0200
+@@ -37,7 +37,7 @@
+ use Kolab::LDAP;
+ use vars qw($opt_d $opt_n $opt_h);
+ 
+-openlog('kolabconf', 'cons, pid', 'user');
++openlog('kolabconf', 'cons, pid', ($Kolab::config{'syslog_facility'} || 'user'));
+ 
+ getopts('dnh');
+ if ($opt_h) {
+diff -Nwru kolabd-1.9.4dfsg/kolab.conf kolabd-1.9.4dfsg.patched/kolab.conf
+--- kolabd-1.9.4dfsg/kolab.conf	2004-11-23 21:26:47.000000000 +0100
++++ kolabd-1.9.4dfsg.patched/kolab.conf	2006-05-26 15:21:52.000000000 +0200
+@@ -10,3 +10,4 @@
+ ldap_master_uri : @@@ldap_master_uri@@@
+ php_dn : cn=nobody,@@@kolab_basedn@@@
+ php_pw : @@@nobody_pw@@@
++syslog_facility : local5
+diff -Nwru kolabd-1.9.4dfsg/kolabd kolabd-1.9.4dfsg.patched/kolabd
+--- kolabd-1.9.4dfsg/kolabd	2004-12-22 14:50:03.000000000 +0100
++++ kolabd-1.9.4dfsg.patched/kolabd	2006-05-26 15:31:56.000000000 +0200
+@@ -49,7 +49,7 @@
+ use Kolab::LDAP::Backend;
+ use vars qw(%pids);
+ 
+-openlog('kolabd', 'cons, pid', 'user');
++openlog('kolabd', 'cons, pid', ($Kolab::config{'syslog_facility'} || 'user'));
+ 
+ my $prefix = $Kolab::config{'prefix'};
+ my $pidfile = IO::File->new("$prefix/var/kolab/kolab.pid", 'w+')


Property changes on: trunk/kolabd/debian/patches/80-kolab-syslog-facility.dpatch
___________________________________________________________________
Name: svn:executable
   + *