Update of /cvsroot/fink/experimental/thesin/finkinfo/test
In directory sc8-pr-cvs1:/tmp/cvs-serv18268
Modified Files:
cyrus21-2.1.13-1.info cyrus21-2.1.13-1.patch
Log Message:
this should do it
Index: cyrus21-2.1.13-1.info
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/test/cyrus21-2.1.13-1.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cyrus21-2.1.13-1.info 20 Jun 2003 16:31:05 -0000 1.7
+++ cyrus21-2.1.13-1.info 20 Jun 2003 19:27:50 -0000 1.8
@@ -49,7 +49,9 @@
mkdir -p %i/share/icons/mini
mkdir -p %i/share/man/man8
mkdir -p %i/share/snmp/mibs
- mkdir -p %i/var/run/cyrus/socket
+ mkdir -p %i/var/lib/cyrus/db
+ mkdir -p %i/var/lib/cyrus/proc
+ mkdir -p %i/var/lib/cyrus/socket
mkdir -p %i/var/spool/cyrus
mkdir -p %i/var/spool/sieve
@@ -393,7 +395,7 @@
<<
SplitOff9: <<
Package: %N-common
- Depends: logcheck, anacron, openssl097-shlibs, dlcompat-shlibs, db41-shlibs |
db41-ssl-shlibs, cyrus-sasl2-shlibs
+ Depends: daemonic, logcheck, anacron, openssl097-shlibs, dlcompat-shlibs,
db41-shlibs | db41-ssl-shlibs, cyrus-sasl2-shlibs, passwd (>> 20030330-1)
Description: Cyrus mail system (common files)
ConfFiles: <<
%p/etc/cyrus.conf
@@ -418,7 +420,7 @@
<daemon name="cyrus21">
<executable background="yes">%p/sbin/cyrmaster</executable>
- <parameters> -l 64 -d</parameters>
+ <parameters> -l 64 -p %p/var/run/cyrus21.pid -d</parameters>
<pidfile>%p/var/run/cyrus21.pid</pidfile>
</daemon>
</service>
@@ -426,6 +428,10 @@
PostInstScript: <<
update-alternatives --install /etc/pam.d/lmtp pam.d-lmtp %p/etc/pam.d/lmtp 60
update-alternatives --install /etc/pam.d/sieve pam.d-sieve %p/etc/pam.d/sieve 60
+ echo "Changing Ownership of db and spool directories..."
+ chown -R cyrus:mail %p/var/lib/cyrus
+ chown -R cyrus:mail %p/var/spool/cyrus
+ chown -R cyrus:mail %p/var/spool/sieve
<<
PreRmScript: <<
update-alternatives --remove pam.d-lmtp %p/etc/pam.d/lmtp
Index: cyrus21-2.1.13-1.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/test/cyrus21-2.1.13-1.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cyrus21-2.1.13-1.patch 20 Jun 2003 13:05:33 -0000 1.4
+++ cyrus21-2.1.13-1.patch 20 Jun 2003 19:27:50 -0000 1.5
@@ -1204,6 +1204,18 @@
pop3proxyd: pop3proxyd.o tls.o libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o pop3proxyd pop3proxyd.o tls.o $(SERVICE) \
+diff -ruN cyrus-imapd-2.1.13.orig/imap/config.c cyrus-imapd-2.1.13/imap/config.c
+--- cyrus-imapd-2.1.13.orig/imap/config.c Mon Apr 14 14:31:36 2003
++++ cyrus-imapd-2.1.13/imap/config.c Fri Jun 20 11:26:13 2003
+@@ -68,7 +68,7 @@
+ #include "hash.h"
+ #include "prot.h" /* for PROT_BUFSIZE */
+
+-#define CONFIG_FILENAME "/etc/imapd.conf"
++#define CONFIG_FILENAME "@FINKPREFIX@/etc/imapd.conf"
+
+ #define CONFIGHASHSIZE 200 /* > 2x # of options */
+ static struct hash_table confighash;
diff -ruN cyrus-imapd-2.1.13.orig/imap/cvt_cyrusdb.c
cyrus-imapd-2.1.13/imap/cvt_cyrusdb.c
--- cyrus-imapd-2.1.13.orig/imap/cvt_cyrusdb.c Mon Apr 14 14:15:12 2003
+++ cyrus-imapd-2.1.13/imap/cvt_cyrusdb.c Thu Jun 19 18:47:18 2003
@@ -1359,6 +1371,18 @@
/* Create telemetry log */
imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out);
+diff -ruN cyrus-imapd-2.1.13.orig/imap/krbck.c cyrus-imapd-2.1.13/imap/krbck.c
+--- cyrus-imapd-2.1.13.orig/imap/krbck.c Thu Feb 13 13:15:26 2003
++++ cyrus-imapd-2.1.13/imap/krbck.c Fri Jun 20 11:26:03 2003
+@@ -59,7 +59,7 @@
+
+ #define EXIT_CHOKE (int) 10
+
+-#define CONFIG_FILENAME "/etc/imapd.conf"
++#define CONFIG_FILENAME "@FINKPREFIX@/etc/imapd.conf"
+ #define MAX_FILENAME_LEN 255
+
+ static int evalcheck(char*, int, char*);
diff -ruN cyrus-imapd-2.1.13.orig/imap/mboxlist.c cyrus-imapd-2.1.13/imap/mboxlist.c
--- cyrus-imapd-2.1.13.orig/imap/mboxlist.c Wed Apr 30 14:33:20 2003
+++ cyrus-imapd-2.1.13/imap/mboxlist.c Thu Jun 19 15:50:07 2003
@@ -1487,6 +1511,18 @@
\fBidled(8)\fR, \fBnotifyd(8)\fR, \fBdeliver(8)\fR, \fBmaster(8)\fR,
-\fBciphers(1)\fR
+\fBrpc.dracd(1m)\fR, \fBciphers(1)\fR
+diff -ruN cyrus-imapd-2.1.13.orig/master/masterconf.c
cyrus-imapd-2.1.13/master/masterconf.c
+--- cyrus-imapd-2.1.13.orig/master/masterconf.c Thu Feb 13 13:15:45 2003
++++ cyrus-imapd-2.1.13/master/masterconf.c Fri Jun 20 11:21:24 2003
+@@ -58,7 +58,7 @@
+
+ #include "masterconf.h"
+
+-#define CONFIG_FILENAME "/etc/cyrus.conf"
++#define CONFIG_FILENAME "@FINKPREFIX@/etc/cyrus.conf"
+
+ struct configlist {
+ char *key;
diff -ruN cyrus-imapd-2.1.13.orig/perl/Makefile.in cyrus-imapd-2.1.13/perl/Makefile.in
--- cyrus-imapd-2.1.13.orig/perl/Makefile.in Thu Jan 2 10:27:35 2003
+++ cyrus-imapd-2.1.13/perl/Makefile.in Thu Jun 19 21:26:18 2003
@@ -1550,3 +1586,93 @@
#include <stdlib.h>
#include <stdio.h>
+diff -ruN cyrus-imapd-2.1.13.orig/tools/dohash cyrus-imapd-2.1.13/tools/dohash
+--- cyrus-imapd-2.1.13.orig/tools/dohash Thu Feb 22 21:43:01 2001
++++ cyrus-imapd-2.1.13/tools/dohash Fri Jun 20 11:26:50 2003
+@@ -89,7 +89,7 @@
+ }
+ }
+
+-$imapdconf = shift || "/etc/imapd.conf";
++$imapdconf = shift || "@FINKPREFIX@/etc/imapd.conf";
+
+ $yn = "y";
+ $hashispool = 0;
+@@ -112,7 +112,7 @@
+ }
+ close CONF;
+
+-if (! $conf) { $conf = "/var/imap"; }
++if (! $conf) { $conf = "@FINKPREFIX@/var/imap"; }
+
+ if ($interactive) {
+ print "upgrade $conf? ";
+diff -ruN cyrus-imapd-2.1.13.orig/tools/mkimap cyrus-imapd-2.1.13/tools/mkimap
+--- cyrus-imapd-2.1.13.orig/tools/mkimap Thu Sep 27 10:02:34 2001
++++ cyrus-imapd-2.1.13/tools/mkimap Fri Jun 20 11:24:36 2003
+@@ -59,7 +59,7 @@
+ __END__
+ require 5;
+
+-$imapdconf = shift || "/etc/imapd.conf";
++$imapdconf = shift || "@FINKPREFIX@/etc/imapd.conf";
+ $sievedir = "/usr/sieve";
+ $nosievedir = 0;
+ $hashispool = 0;
+diff -ruN cyrus-imapd-2.1.13.orig/tools/rehash cyrus-imapd-2.1.13/tools/rehash
+--- cyrus-imapd-2.1.13.orig/tools/rehash Fri Aug 23 15:10:43 2002
++++ cyrus-imapd-2.1.13/tools/rehash Fri Jun 20 11:27:01 2003
+@@ -132,7 +132,7 @@
+ }
+ }
+
+-$imapdconf = shift || "/etc/imapd.conf";
++$imapdconf = shift || "@FINKPREFIX@/etc/imapd.conf";
+
+ $yn = "y";
+ $sievedir = "/usr/sieve";
+@@ -165,7 +165,7 @@
+ }
+ close CONF;
+
+-if (! $conf) { $conf = "/var/imap"; }
++if (! $conf) { $conf = "@FINKPREFIX@/var/imap"; }
+
+ if ($interactive) {
+ print "upgrade $conf? ";
+diff -ruN cyrus-imapd-2.1.13.orig/tools/translatesieve
cyrus-imapd-2.1.13/tools/translatesieve
+--- cyrus-imapd-2.1.13.orig/tools/translatesieve Tue May 7 14:49:42 2002
++++ cyrus-imapd-2.1.13/tools/translatesieve Fri Jun 20 11:25:15 2003
+@@ -85,7 +85,7 @@
+ }
+ }
+
+-$imapdconf = shift || "/etc/imapd.conf";
++$imapdconf = shift || "@FINKPREFIX@/etc/imapd.conf";
+
+ $sievedir = "/usr/sieve";
+ $unixhierarchysep = 0;
+diff -ruN cyrus-imapd-2.1.13.orig/tools/undohash cyrus-imapd-2.1.13/tools/undohash
+--- cyrus-imapd-2.1.13.orig/tools/undohash Sat May 25 13:57:53 2002
++++ cyrus-imapd-2.1.13/tools/undohash Fri Jun 20 11:25:25 2003
+@@ -45,7 +45,7 @@
+
+ $| = 1;
+
+-$imapdconf = shift || "/etc/imapd.conf";
++$imapdconf = shift || "@FINKPREFIX@/etc/imapd.conf";
+ $hashispool = 0;
+
+ open CONF, $imapdconf or die "can't open $imapdconf";
+diff -ruN cyrus-imapd-2.1.13.orig/tools/upgradesieve
cyrus-imapd-2.1.13/tools/upgradesieve
+--- cyrus-imapd-2.1.13.orig/tools/upgradesieve Thu Feb 22 21:46:56 2001
++++ cyrus-imapd-2.1.13/tools/upgradesieve Fri Jun 20 11:25:39 2003
+@@ -85,7 +85,7 @@
+ }
+ }
+
+-$imapdconf = shift || "/etc/imapd.conf";
++$imapdconf = shift || "@FINKPREFIX@/etc/imapd.conf";
+
+ $sievedir = "/usr/sieve";
+
-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
