SOURCES: imp-prefs.patch (NEW), chora-prefs.patch (NEW) - patch pr...

[glen]

Author: glen                         Date: Wed Nov 30 22:40:08 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- patch prefs.xml

---- Files affected:
SOURCES:
   imp-prefs.patch (NONE -> 1.1)  (NEW), chora-prefs.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/imp-prefs.patch
diff -u /dev/null SOURCES/imp-prefs.patch:1.1
--- /dev/null	Wed Nov 30 23:40:08 2005
+++ SOURCES/imp-prefs.patch	Wed Nov 30 23:40:03 2005
@@ -0,0 +1,30 @@
+diff -u -r imp-4.0.4.pre/config/conf.xml imp-4.0.4/config/conf.xml
+--- imp-4.0.4.pre/config/conf.xml	2004-12-09 17:33:27.000000000 +0200
++++ imp-4.0.4/config/conf.xml	2005-12-01 00:35:22.000000000 +0200
+@@ -23,7 +23,7 @@
+    connecting to the PGP keyserver. Timeouts are not supported on all
+    systems.">10</configstring>
+    <configstring name="openssl_cafile" required="false" desc="The location of
+-   the root certificates bundle.">/somewhere/ca-bundle.crt</configstring>
++   the root certificates bundle.">/usr/share/ssl/ca-bundle.crt</configstring>
+    <configstring name="openssl_binary" required="false" desc="The location of
+    the OpenSSL binary on your system. This program is REQUIRED to import
+    personal S/MIME certificate information, as there is no native PHP function
+@@ -169,7 +169,7 @@
+    email address for each user (e.g. DSPAM), this setting should be empty and
+    you should look at the _imp_hook_spam_bounce hook instead."/>
+    <configstring name="program" required="false" desc="Should we report them
+-   via an external program? (e.g. /usr/local/bin/spamassassin -r)"/>
++   via an external program? (e.g. /usr/bin/spamassassin -r)"/>
+   </configsection>
+   <configsection name="notspam">
+    <configboolean name="reporting" desc="Should we display a 'report this
+@@ -184,7 +184,7 @@
+    email address for each user (e.g. DSPAM), this setting should be empty and
+    and you should look at the _imp_hook_spam_bounce hook instead."/>
+    <configstring name="program" required="false" desc="Should we report them
+-   via an external program? (e.g. /usr/local/bin/spamassassin -k)"/>
++   via an external program? (e.g. /usr/bin/spamassassin -k)"/>
+   </configsection>
+  </configtab>
+ 

================================================================
Index: SOURCES/chora-prefs.patch
diff -u /dev/null SOURCES/chora-prefs.patch:1.1
--- /dev/null	Wed Nov 30 23:40:08 2005
+++ SOURCES/chora-prefs.patch	Wed Nov 30 23:40:03 2005
@@ -0,0 +1,21 @@
+diff -u -r chora-2.0.1.pre/config/conf.xml chora-2.0.1.new/config/conf.xml
+--- chora-2.0.1.pre/config/conf.xml	2005-09-22 15:56:37.000000000 +0300
++++ chora-2.0.1.new/config/conf.xml	2005-12-01 00:31:17.000000000 +0200
+@@ -19,7 +19,7 @@
+ 
+    <configstring name="cvsps" required="false" desc="If you have cvsps
+    installed, we can generate patchset information. You need at least version
+-   2.0b6 of cvsps. Path to the cvsps executable, e.g. /usr/local/bin/cvsps"/>
++   2.0b6 of cvsps. Path to the cvsps executable, e.g. /usr/bin/cvsps"/>
+    <configstring name="cvsps_home" desc="Directory where the .cvsps cache
+    files can be created - it must be writeable by the
+    webserver.">/tmp</configstring>
+@@ -28,7 +28,7 @@
+    installed, we can generate repository graphs. Path to the cvsgraph
+    executable, e.g. /usr/bin/cvsgraph"/>
+    <configphp name="cvsgraph_conf" desc="CvsGraph configuration
+-   file">dirname(__FILE__) . '/cvsgraph.conf'</configphp>
++   file">/etc/webapps/horde-chora/cvsgraph.conf</configphp>
+   </configsection>
+  </configtab>
+ 
================================================================