Update of /cvsroot/fink/experimental/thesin/finkinfo/test
In directory sc8-pr-cvs1:/tmp/cvs-serv15660
Modified Files:
cyrus21-2.1.13-1.info cyrus21-2.1.13-1.patch
Log Message:
Needs pam.d update-alternatives, daemonic scripts, and I need to finish the hack for
the perl mod...drm any ideas or do I just force perl 5.6.0 like I have done
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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cyrus21-2.1.13-1.info 20 Jun 2003 00:08:53 -0000 1.4
+++ cyrus21-2.1.13-1.info 20 Jun 2003 13:05:33 -0000 1.5
@@ -12,20 +12,20 @@
Source: mirror:custom:cyrus-imapd-%v.tar.gz
Source-MD5: ac3a4773c2f0fb2d0f9c5ec8669b7e65
###
+UpdatePOD: true
+###
UpdateConfigGuess: true
PatchScript: <<
- sed -e 's,@FINKPREFIX@,%p,g' %a/%f.patch | patch -p1
- patch -b -p0 < contrib/drac_auth.patch
+ sed -e 's,@FINKPREFIX@,%p,g' -e 's,@FINKINSTALL@,%i,g' %a/%f.patch | patch -p1
<<
###
NoSetLDFLAGS: true
SetCPPFLAGS: -no-cpp-precomp
-SetCFLAGS: -DDRAC_AUTH
-SetLIBS: -L%p/lib -ldrac
+SetLIBS: -L%p/lib
###
DocFiles: COPYRIGHT README*
###
-ConfigureParams: --with-bdb-incdir=%p/include/db4 --with-ucdsnmp=no
--with-seen-db=skiplist --with-mboxlist-db=skiplist --with-syslogfacility=MAIL
--with-pidfile=%p/var/run/cyrmaster.pid --with-tclsh=%p/bin/tclsh
--with-cyrus-user=cyrus --with-cyrus-group=mail --with-idle=poll --with-drac=%p
--enable-listext --enable-annotatemore --with-sasl=%p --with-auth=unix --enable-murder
--with-openssl=%p --with-perl=/usr/bin/perl --with-lock=fcntl
--with-cyrus-prefix=%p/lib/cyrus --includedir=%p/include/cyrus
--datadir=%p/share/cyrus --sharedstatedir=%p/share/cyrus
--localstatedir=%p/var/lib/cyrus --mandir=%p/share/man --infodir=%p/share/info
--libexecdir=%p/lib
+ConfigureParams: --with-bdb-incdir=%p/include/db4 --with-ucdsnmp=no
--with-seen-db=skiplist --with-mboxlist-db=skiplist --with-syslogfacility=MAIL
--with-pidfile=%p/var/run/cyrmaster.pid --with-tclsh=%p/bin/tclsh
--with-cyrus-user=cyrus --with-cyrus-group=mail --with-idle=poll --with-drac=%p
--enable-listext --enable-annotatemore --with-sasl=%p --with-auth=unix --enable-murder
--with-openssl=%p --with-perl=perl5.6.0 --with-lock=fcntl
--with-cyrus-prefix=%p/lib/cyrus --includedir=%p/include/cyrus
--datadir=%p/share/cyrus --sharedstatedir=%p/share/cyrus
--localstatedir=%p/var/lib/cyrus --mandir=%p/share/man --infodir=%p/share/info
--libexecdir=%p/lib
###
InstallScript: <<
#!/bin/sh
@@ -40,44 +40,47 @@
# make dirs and links to etc
mkdir -p %i/etc/cron.daily
mkdir -p %i/etc/cyrus
- mkdir -p %i/etc/defaults
+ mkdir -p %i/etc/default
mkdir -p %i/etc/pam.d
mkdir -p %i/etc/logcheck/ignore.d.server
mkdir -p %i/etc/logcheck/ignore.d.workstation
mkdir -p %i/include
mkdir -p %i/lib/cyrus
+ mkdir -p %i/sbin
+ mkdir -p %i/share/doc/%N/html/man
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/spool/cyrus
- mkdir -p %i/var/spool/sieve
+ mkdir -p %i/var/spool/sieve
- for i in master reconstruct quota deliver ; do \
- mv %i/lib/cyrus/bin/$$i %i/sbin/cyr$$i ;\
- done
+ for i in master reconstruct quota deliver; do \
+ mv %i/lib/cyrus/bin/$i %i/sbin/cyr$i ;\
+ done
- for i in mbpath ctl_mboxlist ctl_deliver ctl_cyrusdb squatter \
- tls_prune ipurge cyrdump cvt_cyrusdb chk_cyrus ; do \
- mv %i/lib/cyrus/bin/$$i %i/sbin/$$i ;\
- done
+ for i in mbpath ctl_mboxlist ctl_deliver ctl_cyrusdb squatter \
+ tls_prune ipurge cyrdump cvt_cyrusdb chk_cyrus ; do \
+ mv %i/lib/cyrus/bin/$i %i/sbin/$i ;\
+ done
mv %i/share/include/cyrus %i/include
# for stuff in /etc
install -m 644 fink/imapd.conf %i/etc
install -m 644 fink/cyrus.conf %i/etc
- (cd fink ; for i in *.pam ;\
- do install -m 644 $$i %i/etc/pam.d/$${i%.pam} ;\
- done)
+ (cd fink/pam ; for i in * ;\
+ do install -m 644 $i %i/etc/pam.d/$i ;\
+ done)
- # We rename some utils, so we need to sort out the manpages
- for i in master reconstruct quota deliver ; do \
- mv %i/share/man/man8/$$i.8 %i/share/man/man8/cyr$${i}.8 ; \
- done
+ # We rename some utils, so we need to sort out the manpages
+ for i in master reconstruct quota deliver ; do \
+ mv %i/share/man/man8/$i.8 %i/share/man/man8/cyr$i.8 ; \
+ done
# And add our own manpages
install -m 644 fink/cyrdump.8 %i/share/man/man8/cyrdump.8
+ install -m 644 fink/cyrus-makedirs.8 %i/share/man/man8/cyrus-makedirs.8
# SNMP files
install -m 644 master/CYRUS-MASTER.mib %i/share/snmp/mibs/CYRUS-MASTER-MIB.txt
@@ -90,15 +93,27 @@
install fink/cyrus-makedirs %i/sbin/cyrus-makedirs
install -m 644 fink/get-backtrace.gdb %i/lib/cyrus/get-backtrace.gdb
+ # Install imtest and its symlinks
+ for i in %i/bin/*test ; do \
+ rm -f "$i" || true ;\
+ (cd %i/bin &&\
+ ln -s imtest `basename $i`) ;\
+ done
+
# and logcheck files
install -m 644 fink/logcheck.ignore %i/etc/logcheck/ignore.d.workstation/cyrus21
install -m 644 fink/logcheck.ignore %i/etc/logcheck/ignore.d.server/cyrus21
# install Defaults
- install -m 644 fink/cyrus21.defaults %i/etc/defaults/cyrus21
+ install -m 644 fink/cyrus21.default %i/etc/default/cyrus21
# install cron.daily script
- isntall -m 644 fink.cron.daily %i/etc/cron.daily/cyrus21
+ install -m 644 fink/cron.daily %i/etc/cron.daily/cyrus21
+
+ # install docs
+ install -m 644 doc/* %i/share/doc/%N/html
+ install -m 644 doc/man/* %i/share/doc/%N/html/man
+ rm -f %i/share/doc/%N/html/Makefile.dist
# make links
ln -s %p/var/spool/sieve %i/etc/sieve
@@ -107,108 +122,9 @@
<<
###
SplitOff: <<
- Package: %N-shlibs
- Description: Cyrus mail system (shared libraries)
- DescDetail: <<
- Cyrus is a fully-featured IMAP daemon, with a number of features not
- found in other IMAP implementations, including:
- o Designed to handle massive quantities of mail
- o No need for users to have login accounts
- o Support for POP3 in addition to IMAP
- o Sieve server-side email filtering
- o Servers don't run as root
- o Easy support for mail quotas
- o SSL support, including secure IMAP
- o DRAC support for pop/imap-before-smtp
- For more information, see http://asg.web.cmu.edu/cyrus/.
- .
- Note: Cyrus doesn't support reading from and storing mail in your
- standard mail spool - it stores mail in a separate directory in its
- own MH-like format.
- .
- This package contains the Cyrus shared libraries.
- <<
-<<
-SplitOff2: <<
- Package: %N-common
- Depends: logcheck, anacron
- Description: Cyrus mail system (common files)
- Files: <<
- etc/cron.daily
- etc/default
- etc/logcheck/ignore.d.server
- etc/logcheck/ignore.d.workstation
- var/spool/cyrus
- var/spool/sieve
- var/run/cyrus/socket
- sbin/cyrreconstruct
- sbin/cyrquota
- etc/*conf
- etc/pam.d/lmtp
- etc/pam.d/sieve
- etc/defaults/cyrus21
- sbin/cyr*
- sbin/ctl_*
- sbin/cvt_*
- sbin/chk_*
- sbin/ipurge
- sbin/tls_prune
- sbin/mbpath
- lib/cyrus/bin/reconstruct
- lib/cyrus/bin/quota
- lib/cyrus/bin/lmtpd
- lib/cyrus/bin/timsieved
- lib/cyrus/bin/notifyd
- lib/cyrus/bin/fud
- lib/cyrus/get-backtrace.gdb
- share/snmp
- share/man/man5/cyrus.conf.5
- share/man/man5/imapd.conf.5
- share/man/man8/cyrdump.8
- share/man/man8/cyrus-makedirs.8
- share/man/man8/mbpath.8
- share/man/man8/timsieved.8
- share/man/man8/notifyd.8
- share/man/man8/lmtpd.8
- share/man/man8/ctl_*.8
- share/man/man8/cvt_*.8
- share/man/man8/chk_*.8
- share/man/man8/fud.8
- share/man/man8/ipurge.8
- share/man/man8/tls_prune.8
- share/man/man8/cyrdeliver.8
- share/man/man8/cyrmaster.8
- share/man/man8/cyrreconstruct.8
- share/man/man8/cyrquota.8
- <<
- DescDetail: <<
- Cyrus is a fully-featured IMAP daemon, with a number of features not
- found in other IMAP implementations, including:
- o Designed to handle massive quantities of mail
- o No need for users to have login accounts
- o Support for POP3 in addition to IMAP
- o Sieve server-side email filtering
- o Servers don't run as root
- o Easy support for mail quotas
- o SSL support, including secure IMAP
- o DRAC support for pop/imap-before-smtp
- o IPv6 support
- For more information, see http://asg.web.cmu.edu/cyrus/.
- .
- Note: Cyrus doesn't support reading from and storing mail in your
- standard mail spool - it stores mail in a separate directory in its
- own MH-like format.
- .
- This package contains the common files needed by the other Cyrus
- components. The cyrus21-imapd and/or cyrus21-pop3d packages are needed
- to enable IMAP and POP3 support respectively. cyrus21-murder can be
- used to enable IMAP, POP3 and LMTP proxying.
- <<
-<<
-SplitOff3: <<
Package: %N-doc
Files: <<
- share/doc/cyrus21-doc/html/*.html
+ share/doc/%N/html
<<
Description: Cyrus mail system (documentation files)
DescDetail: <<
@@ -232,7 +148,7 @@
This package contains documentation for the Cyrus IMAPd suite.
<<
<<
-SplitOff4: <<
+SplitOff2: <<
Package: %N-imapd
Files: <<
etc/pam.d/imap
@@ -265,13 +181,12 @@
Protocol).
<<
<<
-SplitOff5: <<
+SplitOff3: <<
Package: %N-pop3d
Files: <<
etc/pam.d/pop
- sbin/pop3*
lib/cyrus/bin/pop3d
- share/man/man8/pop3d*
+ share/man/man8/pop3d.8
<<
Description: Cyrus mail system (POP3 support)
DescDetail: <<
@@ -295,14 +210,16 @@
This package contains support for POP3 (Post Office Protocol).
<<
<<
-SplitOff6: <<
+SplitOff4: <<
Package: %N-admin
+ Depends: libcyrus-imap-pm
Files: <<
bin/cyradm
bin/sieveshell
+ bin/installsieve
share/icons/*
share/man/man1/sieveshell.1
- share/man/man1/cyradm.1p
+ share/man/man1/cyradm.1
<<
Description: Cyrus mail system (administration tool)
DescDetail: <<
@@ -329,7 +246,7 @@
sieve scripts.
<<
<<
-SplitOff7: <<
+SplitOff5: <<
Package: %N-murder
Files: <<
etc/pam.d/mupdate
@@ -361,7 +278,7 @@
proxy servers.
<<
<<
-SplitOff8: <<
+SplitOff6: <<
Package: %N-clients
Files: <<
bin/*test
@@ -391,12 +308,12 @@
The clients are fully SASL-enabled for authentication.
<<
<<
-SplitOff9: <<
+SplitOff7: <<
Package: %N-dev
Files: <<
include/cyrus
lib/*.a
- share/man/man3
+ share/man/man3/imclient.3
<<
Description: Cyrus mail system (developer files)
DescDetail: <<
@@ -421,15 +338,12 @@
to develop IMAP applications that interface with Cyrus.
<<
<<
-SplitOff10: <<
+SplitOff8: <<
Package: libcyrus-imap-pm
- Files: <<
+ Files: <<
+ share/podfiles
lib/perl5
- share/man/man3/Cyrus::IMAP.3pm
- share/man/man3/Cyrus::IMAP::Admin.3pm
- share/man/man3/Cyrus::IMAP::IMSP.3pm
- share/man/man3/Cyrus::IMAP::Shell.3pm
- share/man/man3/Cyrus::SIEVE::managesieve.3pm
+ share/man/man3/Cyrus*
<<
Description: Interface to Cyrus imap client imclient library
DescDetail: <<
@@ -454,6 +368,42 @@
.
The modules that compose Cyrus::SIEVE are also included, but they are
undocumented upstream.
+ <<
+<<
+SplitOff9: <<
+ Package: %N-common
+ Depends: logcheck, anacron
+ Description: Cyrus mail system (common files)
+ Files: <<
+ etc
+ var
+ sbin
+ lib
+ share/snmp
+ share/man
+ <<
+ DescDetail: <<
+ Cyrus is a fully-featured IMAP daemon, with a number of features not
+ found in other IMAP implementations, including:
+ o Designed to handle massive quantities of mail
+ o No need for users to have login accounts
+ o Support for POP3 in addition to IMAP
+ o Sieve server-side email filtering
+ o Servers don't run as root
+ o Easy support for mail quotas
+ o SSL support, including secure IMAP
+ o DRAC support for pop/imap-before-smtp
+ o IPv6 support
+ For more information, see http://asg.web.cmu.edu/cyrus/.
+ .
+ Note: Cyrus doesn't support reading from and storing mail in your
+ standard mail spool - it stores mail in a separate directory in its
+ own MH-like format.
+ .
+ This package contains the common files needed by the other Cyrus
+ components. The cyrus21-imapd and/or cyrus21-pop3d packages are needed
+ to enable IMAP and POP3 support respectively. cyrus21-murder can be
+ used to enable IMAP, POP3 and LMTP proxying.
<<
<<
###
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.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cyrus21-2.1.13-1.patch 20 Jun 2003 00:08:53 -0000 1.3
+++ cyrus21-2.1.13-1.patch 20 Jun 2003 13:05:33 -0000 1.4
@@ -1,7 +1,47 @@
+diff -ruN cyrus-imapd-2.1.13.orig/Makefile.in cyrus-imapd-2.1.13/Makefile.in
+--- cyrus-imapd-2.1.13.orig/Makefile.in Thu May 1 13:05:22 2003
++++ cyrus-imapd-2.1.13/Makefile.in Thu Jun 19 21:54:26 2003
+@@ -95,10 +95,10 @@
+ $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/bin
+ $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/lib
+ $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/include/cyrus
+- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man1
+- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man3
+- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man5
+- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man8
++ $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/share/man/man1
++ $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/share/man/man3
++ $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/share/man/man5
++ $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/share/man/man8
+ @for d in $(SUBDIRS); \
+ do \
+ (cd $$d; echo "### Making" install "in" `pwd`; \
+diff -ruN cyrus-imapd-2.1.13.orig/config.h.in cyrus-imapd-2.1.13/config.h.in
+--- cyrus-imapd-2.1.13.orig/config.h.in Thu May 1 13:08:13 2003
++++ cyrus-imapd-2.1.13/config.h.in Thu Jun 19 18:13:31 2003
+@@ -118,6 +118,9 @@
+ /* do we have SASL support for APOP? */
+ #undef HAVE_APOP
+
++/* the Dynamic Relay Authorization Control package */
++#undef DRAC_AUTH
++
+ /* do we have OpenSSL? */
+ #undef HAVE_SSL
+
diff -ruN cyrus-imapd-2.1.13.orig/configure cyrus-imapd-2.1.13/configure
--- cyrus-imapd-2.1.13.orig/configure Thu May 1 13:08:14 2003
-+++ cyrus-imapd-2.1.13/configure Thu Jun 19 16:25:21 2003
-@@ -1507,7 +1507,7 @@
++++ cyrus-imapd-2.1.13/configure Thu Jun 19 18:12:58 2003
+@@ -97,6 +97,8 @@
+ ac_help="$ac_help
+ --with-perl=PERL use PERL for perl"
+ ac_help="$ac_help
++ --with-drac=DIR use DRAC library in <DIR> [no] "
++ac_help="$ac_help
+ --with-libwrap=DIR use libwrap (rooted in DIR) [yes] "
+ ac_help="$ac_help
+ --with-ucdsnmp=DIR use ucd snmp (rooted in DIR) [yes] "
+@@ -1507,7 +1509,7 @@
# this is CMU ADD LIBPATH
if test "$andrew_runpath_switch" = "none" ; then
@@ -10,43 +50,75 @@
else
LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}"
fi
-diff -ruN cyrus-imapd-2.1.13.orig/contrib/drac_auth.patch
cyrus-imapd-2.1.13/contrib/drac_auth.patch
---- cyrus-imapd-2.1.13.orig/contrib/drac_auth.patch Wed Aug 14 14:50:59 2002
-+++ cyrus-imapd-2.1.13/contrib/drac_auth.patch Thu Jun 19 15:44:14 2003
-@@ -81,33 +81,6 @@
- /* do we have OpenSSL? */
- #undef HAVE_SSL
-
--Index: configure.in
--===================================================================
--RCS file: /afs/andrew/system/cvs/src/cyrus/configure.in,v
--retrieving revision 1.237
--diff -u -r1.237 configure.in
----- configure.in 2002/07/22 16:16:02 1.237
--+++ configure.in 2002/08/14 20:37:45
--@@ -879,6 +879,19 @@
-- SNMP_SUBDIRS=""
-- AC_SUBST(SNMP_SUBDIRS)
--
--+dnl
--+dnl Test for DRAC
--+dnl
--+DRACLIBS=
--+AC_ARG_WITH(drac, [ --with-drac=DIR use DRAC library in <DIR> [no] ],
--+ if test -d "$withval"; then
--+ LDFLAGS="$LDFLAGS -L${withval}"
--+ AC_CHECK_LIB(drac, dracauth,
--+ AC_DEFINE(DRAC_AUTH)
--+ DRACLIBS="-ldrac")
--+ fi)
--+AC_SUBST(DRACLIBS)
--+
-- CMU_SOCKETS
-- CMU_LIBWRAP
-- CMU_UCDSNMP
- Index: imap/Makefile.in
- ===================================================================
- RCS file: /afs/andrew/system/cvs/src/cyrus/imap/Makefile.in,v
+@@ -6734,6 +6736,60 @@
+ SNMP_SUBDIRS=""
+
+
++DRACLIBS=
++# Check whether --with-drac or --without-drac was given.
++if test "${with_drac+set}" = set; then
++ withval="$with_drac"
++ if test -d "$withval"; then
++ LDFLAGS="$LDFLAGS -L${withval}"
++ echo $ac_n "checking for dracauth in -ldrac""... $ac_c" 1>&6
++echo "configure:6759: checking for dracauth in -ldrac" >&5
++ac_lib_var=`echo drac'_'dracauth | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++ echo $ac_n "(cached) $ac_c" 1>&6
++else
++ ac_save_LIBS="$LIBS"
++LIBS="-ldrac $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 6767 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error. */
++/* We use char because int might match the return type of a gcc2
++ builtin and then its argument prototype would still apply. */
++char dracauth();
++
++int main() {
++dracauth()
++; return 0; }
++EOF
++if { (eval echo configure:6778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
++ rm -rf conftest*
++ eval "ac_cv_lib_$ac_lib_var=yes"
++else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
++ rm -rf conftest*
++ eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++ echo "$ac_t""yes" 1>&6
++ cat >> confdefs.h <<\EOF
++#define DRAC_AUTH 1
++EOF
++
++ DRACLIBS="-ldrac"
++else
++ echo "$ac_t""no" 1>&6
++fi
++
++ fi
++fi
++
++
+
+
+ # Check whether --with-libwrap or --without-libwrap was given.
+@@ -7258,6 +7314,7 @@
+ [EMAIL PROTECTED]@%$PERL%g
+ [EMAIL PROTECTED]@%$MD5OBJ%g
+ [EMAIL PROTECTED]@%$SNMP_SUBDIRS%g
[EMAIL PROTECTED]@%$DRACLIBS%g
+ [EMAIL PROTECTED]@%$LIB_WRAP%g
+ [EMAIL PROTECTED]@%$LIB_UCDSNMP%g
+ [EMAIL PROTECTED]@%$IMAP_COM_ERR_LIBS%g
diff -ruN cyrus-imapd-2.1.13.orig/fink/cron.daily cyrus-imapd-2.1.13/fink/cron.daily
--- cyrus-imapd-2.1.13.orig/fink/cron.daily Wed Dec 31 17:00:00 1969
+++ cyrus-imapd-2.1.13/fink/cron.daily Thu Jun 19 10:42:01 2003
@@ -487,9 +559,9 @@
+ tlsprune cmd="@FINKPREFIX@/sbin/tls_prune" at=0401
+}
+
-diff -ruN cyrus-imapd-2.1.13.orig/fink/cyrus21.defaults
cyrus-imapd-2.1.13/fink/cyrus21.defaults
---- cyrus-imapd-2.1.13.orig/fink/cyrus21.defaults Wed Dec 31 17:00:00 1969
-+++ cyrus-imapd-2.1.13/fink/cyrus21.defaults Thu Jun 19 10:08:24 2003
+diff -ruN cyrus-imapd-2.1.13.orig/fink/cyrus21.default
cyrus-imapd-2.1.13/fink/cyrus21.default
+--- cyrus-imapd-2.1.13.orig/fink/cyrus21.default Wed Dec 31 17:00:00 1969
++++ cyrus-imapd-2.1.13/fink/cyrus21.default Thu Jun 19 10:08:24 2003
@@ -0,0 +1,21 @@
+# Defaults for Cyrus IMAPd 2.1 scripts
+# sourced by /etc/init.d/cyrus21, /usr/sbin/cyrus-makedirs
@@ -512,6 +584,161 @@
+# or not. Switch it off if you are going to do your
+# own optimizations. Set to 1 to enable, 0 to disable
+#CYRUSOPTFILESYS=1
+diff -ruN cyrus-imapd-2.1.13.orig/fink/cyrus21.init
cyrus-imapd-2.1.13/fink/cyrus21.init
+--- cyrus-imapd-2.1.13.orig/fink/cyrus21.init Wed Dec 31 17:00:00 1969
++++ cyrus-imapd-2.1.13/fink/cyrus21.init Thu Jun 19 21:36:11 2003
+@@ -0,0 +1,151 @@
++#! /bin/sh
++#
++# cyrus21 /etc/init.d/ script for cyrus2 IMAPd
++# This file manages the Cyrus IMAPd master process.
++#
++# Copr. 2001 by Henrique de Moraes Holschuh <[EMAIL PROTECTED]>
++# Distributed under the GPL version 2
++#
++# Version: $Id$
++#
++
++# Overridable defaults
++unset CYRUS_VERBOSE
++unset LISTENQUEUE
++[ -r /etc/default/cyrus21 ] && . /etc/default/cyrus21
++
++[ "x${CYRUS_VERBOSE}" != "x" ] && export CYRUS_VERBOSE
++OPTIONS="-d"
++[ "x${LISTENQUEUE}" != "x" ] && OPTIONS="-l ${LISTENQUEUE} ${OPTIONS}"
++
++PATH=/sbin:/usr/sbin:/bin:/usr/bin
++DAEMON=/usr/sbin/cyrmaster
++NAME=cyrmaster
++DESC="Cyrus IMAPd"
++
++test -x ${DAEMON} || exit 0
++
++set -e
++
++START="--start --quiet --pidfile /var/run/${NAME}.pid --exec ${DAEMON} -- ${OPTIONS}"
++
++verifydb() {
++ while read -r DBKEY DBVALUE ; do
++ match=`gawk "/^${DBKEY}[[:blank:]]/ { print \\$2 }" < $1`
++ [ "x${match}" != "x${DBVALUE}" ] && return 0
++ done
++ return 1
++}
++
++createdir() {
++# $1 = user
++# $2 = group
++# $3 = permissions (octal)
++# $4 = path to directory
++ [ -d "$4" ] || mkdir -p "$4"
++ chown -c -h "$1:$2" "$4"
++ chmod -c "$3" "$4"
++}
++
++missingstatoverride () {
++ echo "$0: You are missing a dpkg-statoverride on $1. Add it." >&2
++ exit 1
++}
++
++fixdirs () {
++ dir=`dpkg-statoverride --list /var/run/cyrus` \
++ || missingstatoverride /var/run/cyrus
++ [ -z "$dir" ] \
++ || createdir $dir
++ dir=`dpkg-statoverride --list /var/run/cyrus/socket` \
++ || missingstatoverride /var/run/cyrus/socket
++ [ -z "$dir" ] \
++ || createdir $dir
++}
++
++case "$1" in
++ start)
++ # Verify if there are old Cyrus 1.5 spools that were not upgraded
++ [ -f /var/lib/cyrus/mailboxes -a -d /var/lib/cyrus/deliverdb -a \
++ -d /var/spool/cyrus/mail/user -a ! -d /var/spool/cyrus/mail/stage. ] && {
++ echo "$0: It appears that you still have an version 1.5 spool" 1>&2
++ echo "$0: that needs to be upgraded. Please refer to the guide" 1>&2
++ echo "$0: at /usr/share/doc/cyrus21-common/UPGRADE.Debian" 1>&2
++ echo
++ echo "$0: Cyrmaster not started."
++ exit 2
++ }
++ # Verify consistency of database backends
++ [ -f /usr/lib/cyrus/cyrus-db-types.active ] && {
++ # is it safe to start cyrmaster? compare "key value" pairs
++ # from the (old) active database types file with the new one
++ verifydb /usr/lib/cyrus/cyrus-db-types.txt \
++ < /usr/lib/cyrus/cyrus-db-types.active && {
++ echo "$0: Database backends mismatch! You must manually" 1>&2
++ echo "$0: verify and update the Cyrus databases to the" 1>&2
++ echo "$0: new backends." 1>&2
++ echo "$0: Please refer to
/usr/share/doc/cyrus21-common/README.Debian" 1>&2
++ echo "$0: for instructions." 1>&2
++ echo
++ echo "$0: Cyrmaster not started."
++ exit 2
++ }
++ }
++ echo -n "Starting ${DESC}: "
++ fixdirs
++ if start-stop-daemon ${START} >/dev/null 2>&1 ; then
++ echo "$NAME."
++ else
++ if start-stop-daemon --test ${START} >/dev/null 2>&1; then
++ echo "(failed)."
++ exit 1
++ else
++ echo "${DAEMON} already running."
++ exit 0
++ fi
++ fi
++ ;;
++ stop)
++ echo -n "Stopping $DESC: "
++ if start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
++ --quiet --startas $DAEMON >/dev/null 2>&1 ; then
++ echo "$NAME."
++ else
++ echo "(failed)."
++ fi
++ ;;
++ reload|force-reload)
++ echo "Reloading $DESC configuration files."
++ start-stop-daemon --stop --signal 1 --quiet \
++ --pidfile /var/run/$NAME.pid --exec $DAEMON >/dev/null 2>&1
++ ;;
++ restart)
++ $0 stop && {
++ echo -n "Waiting for complete shutdown..."
++ i=5
++ while [ $i -gt 0 ] ; do
++ if start-stop-daemon --start --test \
++ --pidfile /var/run/$NAME.pid \
++ --exec $DAEMON >/dev/null 2>&1 ; then
++ break
++ fi
++ sleep 2s
++ i=$(($i - 1))
++ echo -n "."
++ done
++ [ $i -eq 0 ] && {
++ echo
++ echo "fatal: incomplete shutdown detected, aborting."
++ exit 1
++ }
++ echo
++ }
++ exec $0 start
++ ;;
++ *)
++ echo "Usage: $0 {start|stop|restart|reload|force-reload}" 1>&2
++ exit 1
++ ;;
++esac
++
++exit 0
diff -ruN cyrus-imapd-2.1.13.orig/fink/get-backtrace.gdb
cyrus-imapd-2.1.13/fink/get-backtrace.gdb
--- cyrus-imapd-2.1.13.orig/fink/get-backtrace.gdb Wed Dec 31 17:00:00 1969
+++ cyrus-imapd-2.1.13/fink/get-backtrace.gdb Thu Jun 19 09:37:04 2003
@@ -520,25 +747,6 @@
+bt
+quit
+
-diff -ruN cyrus-imapd-2.1.13.orig/fink/imap.pam cyrus-imapd-2.1.13/fink/imap.pam
---- cyrus-imapd-2.1.13.orig/fink/imap.pam Wed Dec 31 17:00:00 1969
-+++ cyrus-imapd-2.1.13/fink/imap.pam Thu Jun 19 09:38:52 2003
-@@ -0,0 +1,15 @@
-+# PAM configuration file for Cyrus IMAP service
-+# $Id$
-+#
-+# If you want to use Cyrus in a setup where users don't have
-+# accounts on the local machine, you'll need to make sure
-+# you use something like pam_permit for account checking.
-+#
-+# Also, take a look into libpam-ldap, libpam-mysql/libpam-pgsql
-+# and libpam-pwdfile. They're likely to be helpful aid for creating
-+# a closed-box email system.
-+#
-+
-+auth required pam_unix.so nullok
-+account required pam_unix.so
-+
diff -ruN cyrus-imapd-2.1.13.orig/fink/imapd.conf cyrus-imapd-2.1.13/fink/imapd.conf
--- cyrus-imapd-2.1.13.orig/fink/imapd.conf Wed Dec 31 17:00:00 1969
+++ cyrus-imapd-2.1.13/fink/imapd.conf Thu Jun 19 11:00:34 2003
@@ -822,25 +1030,6 @@
+#
+# library traces NOT AVAIL ON OS X
+#debug_command: /usr/bin/ltrace -tt -n 2 -o /tmp/ltrace.cyrus.%s.%d -p %2$d <&- 2>&1
&
-diff -ruN cyrus-imapd-2.1.13.orig/fink/lmtp.pam cyrus-imapd-2.1.13/fink/lmtp.pam
---- cyrus-imapd-2.1.13.orig/fink/lmtp.pam Wed Dec 31 17:00:00 1969
-+++ cyrus-imapd-2.1.13/fink/lmtp.pam Thu Jun 19 09:38:52 2003
-@@ -0,0 +1,15 @@
-+# PAM configuration file for Cyrus LMTP service
-+# $Id$
-+#
-+# If you want to use Cyrus in a setup where users don't have
-+# accounts on the local machine, you'll need to make sure
-+# you use something like pam_permit for account checking.
-+#
-+# Also, take a look into libpam-ldap, libpam-mysql/libpam-pgsql
-+# and libpam-pwdfile. They're likely to be helpful aid for creating
-+# a closed-box email system.
-+#
-+
-+auth required pam_unix.so nullok
-+account required pam_unix.so
-+
diff -ruN cyrus-imapd-2.1.13.orig/fink/logcheck.ignore
cyrus-imapd-2.1.13/fink/logcheck.ignore
--- cyrus-imapd-2.1.13.orig/fink/logcheck.ignore Wed Dec 31 17:00:00 1969
+++ cyrus-imapd-2.1.13/fink/logcheck.ignore Thu Jun 19 09:37:12 2003
@@ -877,9 +1066,47 @@
+cyrus/imapd\[[0-9]+\]: +myfetch: starting txn
+cyrus/imapd\[[0-9]+\]: +mystore: reusing txn
+cyrus/imapd\[[0-9]+\]: +seen_db: user .* opened
-diff -ruN cyrus-imapd-2.1.13.orig/fink/mupdate.pam cyrus-imapd-2.1.13/fink/mupdate.pam
---- cyrus-imapd-2.1.13.orig/fink/mupdate.pam Wed Dec 31 17:00:00 1969
-+++ cyrus-imapd-2.1.13/fink/mupdate.pam Thu Jun 19 11:01:12 2003
+diff -ruN cyrus-imapd-2.1.13.orig/fink/pam/imap cyrus-imapd-2.1.13/fink/pam/imap
+--- cyrus-imapd-2.1.13.orig/fink/pam/imap Wed Dec 31 17:00:00 1969
++++ cyrus-imapd-2.1.13/fink/pam/imap Thu Jun 19 09:38:52 2003
+@@ -0,0 +1,15 @@
++# PAM configuration file for Cyrus IMAP service
++# $Id$
++#
++# If you want to use Cyrus in a setup where users don't have
++# accounts on the local machine, you'll need to make sure
++# you use something like pam_permit for account checking.
++#
++# Also, take a look into libpam-ldap, libpam-mysql/libpam-pgsql
++# and libpam-pwdfile. They're likely to be helpful aid for creating
++# a closed-box email system.
++#
++
++auth required pam_unix.so nullok
++account required pam_unix.so
++
+diff -ruN cyrus-imapd-2.1.13.orig/fink/pam/lmtp cyrus-imapd-2.1.13/fink/pam/lmtp
+--- cyrus-imapd-2.1.13.orig/fink/pam/lmtp Wed Dec 31 17:00:00 1969
++++ cyrus-imapd-2.1.13/fink/pam/lmtp Thu Jun 19 09:38:52 2003
+@@ -0,0 +1,15 @@
++# PAM configuration file for Cyrus LMTP service
++# $Id$
++#
++# If you want to use Cyrus in a setup where users don't have
++# accounts on the local machine, you'll need to make sure
++# you use something like pam_permit for account checking.
++#
++# Also, take a look into libpam-ldap, libpam-mysql/libpam-pgsql
++# and libpam-pwdfile. They're likely to be helpful aid for creating
++# a closed-box email system.
++#
++
++auth required pam_unix.so nullok
++account required pam_unix.so
++
+diff -ruN cyrus-imapd-2.1.13.orig/fink/pam/mupdate cyrus-imapd-2.1.13/fink/pam/mupdate
+--- cyrus-imapd-2.1.13.orig/fink/pam/mupdate Wed Dec 31 17:00:00 1969
++++ cyrus-imapd-2.1.13/fink/pam/mupdate Thu Jun 19 11:01:12 2003
@@ -0,0 +1,16 @@
+# PAM configuration file for Cyrus Murder mupdate service
+# $Id$
@@ -897,9 +1124,9 @@
+auth required pam_unix.so nullok
+account required pam_unix.so
+
-diff -ruN cyrus-imapd-2.1.13.orig/fink/pop.pam cyrus-imapd-2.1.13/fink/pop.pam
---- cyrus-imapd-2.1.13.orig/fink/pop.pam Wed Dec 31 17:00:00 1969
-+++ cyrus-imapd-2.1.13/fink/pop.pam Thu Jun 19 09:38:52 2003
+diff -ruN cyrus-imapd-2.1.13.orig/fink/pam/pop cyrus-imapd-2.1.13/fink/pam/pop
+--- cyrus-imapd-2.1.13.orig/fink/pam/pop Wed Dec 31 17:00:00 1969
++++ cyrus-imapd-2.1.13/fink/pam/pop Thu Jun 19 09:38:52 2003
@@ -0,0 +1,15 @@
+# PAM configuration file for Cyrus POP3 service
+# $Id$
@@ -916,9 +1143,9 @@
+auth required pam_unix.so nullok
+account required pam_unix.so
+
-diff -ruN cyrus-imapd-2.1.13.orig/fink/sieve.pam cyrus-imapd-2.1.13/fink/sieve.pam
---- cyrus-imapd-2.1.13.orig/fink/sieve.pam Wed Dec 31 17:00:00 1969
-+++ cyrus-imapd-2.1.13/fink/sieve.pam Thu Jun 19 09:38:52 2003
+diff -ruN cyrus-imapd-2.1.13.orig/fink/pam/sieve cyrus-imapd-2.1.13/fink/pam/sieve
+--- cyrus-imapd-2.1.13.orig/fink/pam/sieve Wed Dec 31 17:00:00 1969
++++ cyrus-imapd-2.1.13/fink/pam/sieve Thu Jun 19 09:38:52 2003
@@ -0,0 +1,15 @@
+# PAM configuration file for Cyrus SIEVE timsieved service
+# $Id$
@@ -935,6 +1162,203 @@
+auth required pam_unix.so nullok
+account required pam_unix.so
+
+diff -ruN cyrus-imapd-2.1.13.orig/imap/Makefile.in cyrus-imapd-2.1.13/imap/Makefile.in
+--- cyrus-imapd-2.1.13.orig/imap/Makefile.in Mon Mar 24 10:54:43 2003
++++ cyrus-imapd-2.1.13/imap/Makefile.in Thu Jun 19 18:15:55 2003
+@@ -67,6 +67,7 @@
+ SIEVE_LIBS = @SIEVE_LIBS@
+ IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
+ LIB_WRAP = @LIB_WRAP@
++DRAC_LIBS = @DRACLIBS@
+ LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
+ DEPLIBS = ../acap/libacap.a ../lib/libcyrus.a @DEPLIBS@
+
+@@ -212,15 +213,18 @@
+
+ imapd: xversion $(IMAPDOBJS) libimap.a $(DEPLIBS) $(SERVICE)
+ $(CC) $(LDFLAGS) -o imapd \
+- $(SERVICE) $(IMAPDOBJS) libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++ $(SERVICE) $(IMAPDOBJS) libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) \
++ $(DRAC_LIBS)
+
+ imapd.pure: $(IMAPDOBJS) libimap.a $(DEPLIBS) $(SERVICE)
+ $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
+- $(SERVICE) $(IMAPDOBJS) libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++ $(SERVICE) $(IMAPDOBJS) libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) \
++ $(DRAC_LIBS)
+
+ imapd.quant: $(IMAPDOBJS) libimap.a $(DEPLIBS) $(SERVICE)
+ $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
+- $(SERVICE) $(IMAPDOBJS) libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++ $(SERVICE) $(IMAPDOBJS) libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) \
++ $(DRAC_LIBS)
+
+ proxyd: $(PROXYDOBJS) libimap.a $(DEPLIBS) $(SERVICE)
+ $(CC) $(LDFLAGS) -o proxyd \
+@@ -252,7 +256,7 @@
+
+ pop3d: pop3d.o tls.o libimap.a $(DEPLIBS) $(SERVICE)
+ $(CC) $(LDFLAGS) -o pop3d pop3d.o tls.o $(SERVICE) \
+- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++ libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
+
+ 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/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
+@@ -62,7 +62,9 @@
+ #include <com_err.h>
+
+ #include <sys/ipc.h>
++#if !defined(__APPLE__)
+ #include <sys/msg.h>
++#endif
+
+ #include "acl.h"
+ #include "auth.h"
+diff -ruN cyrus-imapd-2.1.13.orig/imap/imapd.c cyrus-imapd-2.1.13/imap/imapd.c
+--- cyrus-imapd-2.1.13.orig/imap/imapd.c Tue Apr 22 10:02:06 2003
++++ cyrus-imapd-2.1.13/imap/imapd.c Thu Jun 19 18:26:59 2003
+@@ -120,6 +120,18 @@
+ static SSL *tls_conn = NULL;
+ #endif /* HAVE_SSL */
+
++#ifdef DRAC_AUTH
++static struct {
++ int interval; /* dracd "ping" interval; 0 = disabled */
++ unsigned long clientaddr;
++ struct prot_waitevent *event;
++} drac;
++
++extern int dracconn(char *server, char **errmsg);
++extern int dracsend(unsigned long userip, char **errmsg);
++extern int dracdisc(char **errmsg);
++#endif /* DRAC_AUTH */
++
+ /* current sub-user state */
+ static struct mailbox mboxstruct;
+ static struct mailbox *imapd_mailbox;
+@@ -560,6 +572,23 @@
+ /* setup for sending IMAP IDLE notifications */
+ idle_enabled();
+
++#ifdef DRAC_AUTH
++ /* setup for sending DRAC "pings" */
++ drac.event = NULL;
++ drac.interval = config_getint("dracinterval", 5);
++ if (drac.interval < 0) drac.interval = 0;
++ if (drac.interval) {
++ char *err;
++
++ if (dracconn((char*) config_getstring("drachost", "localhost"), &err) != 0) {
++ /* disable DRAC */
++ drac.interval = 0;
++ syslog(LOG_ERR, "dracconn: %s", err);
++ syslog(LOG_ERR, "DRAC notifications disabled");
++ }
++ }
++#endif /* DRAC_AUTH */
++
+ /* create connection to the SNMP listener, if available. */
+ snmp_connect(); /* ignore return code */
+ snmp_set_str(SERVER_NAME_VERSION,CYRUS_VERSION);
+@@ -641,6 +670,12 @@
+ imapd_haveaddr = 1;
+ }
+ }
++
++#ifdef DRAC_AUTH
++ drac.clientaddr = imapd_remoteaddr.sin_addr.s_addr;
++ } else {
++ drac.clientaddr = 0;
++#endif /* DRAC_AUTH */
+ }
+
+ /* create the SASL connection */
+@@ -683,6 +718,11 @@
+ prot_flush(imapd_out);
+ snmp_increment(ACTIVE_CONNECTIONS, -1);
+
++#ifdef DRAC_AUTH
++ if (drac.event) prot_removewaitevent(imapd_in, drac.event);
++ drac.event = NULL;
++#endif /* DRAC_AUTH */
++
+ /* cleanup */
+ imapd_reset();
+
+@@ -773,6 +813,10 @@
+ tls_shutdown_serverengine();
+ #endif
+
++#ifdef DRAC_AUTH
++ if (drac.interval) (void) dracdisc((char **)NULL);
++#endif /* DRAC_AUTH */
++
+ exit(code);
+ }
+
+@@ -796,6 +840,35 @@
+
+ }
+
++#ifdef DRAC_AUTH
++/*
++ * Ping dracd every 'drac.interval' minutes
++ * to let it know that we are still connected
++ */
++struct prot_waitevent *drac_ping(struct protstream *s,
++ struct prot_waitevent *ev, void *rock)
++{
++ char *err;
++ static int nfailure = 0;
++
++ if (dracsend(drac.clientaddr, &err) != 0) {
++ syslog(LOG_ERR, "dracsend: %s", err);
++ if (++nfailure >= 3) {
++ /* can't contact dracd for 3 consecutive tries - disable DRAC */
++ prot_removewaitevent(s, ev);
++ drac.event = NULL;
++ syslog(LOG_ERR, "DRAC notifications disabled");
++ return NULL;
++ }
++ }
++ else
++ nfailure = 0;
++
++ ev->mark = time(NULL) + (drac.interval * 60);
++ return ev;
++}
++#endif /* DRAC_AUTH */
++
+ /*
+ * Top-level command loop parsing
+ */
+@@ -1811,6 +1884,11 @@
+
+ prot_printf(imapd_out, "%s OK %s\r\n", tag, reply);
+
++#ifdef DRAC_AUTH
++ if (drac.interval && drac.clientaddr)
++ drac.event = prot_addwaitevent(imapd_in, 0 /* now */, drac_ping, NULL);
++#endif /* DRAC_AUTH */
++
+ /* Create telemetry log */
+ imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out);
+
+@@ -1931,6 +2009,11 @@
+
+ prot_setsasl(imapd_in, imapd_saslconn);
+ prot_setsasl(imapd_out, imapd_saslconn);
++
++#ifdef DRAC_AUTH
++ if (drac.interval && drac.clientaddr)
++ drac.event = prot_addwaitevent(imapd_in, 0 /* now */, drac_ping, NULL);
++#endif /* DRAC_AUTH */
+
+ /* Create telemetry log */
+ imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out);
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
@@ -948,6 +1372,52 @@
#include "acl.h"
#include "auth.h"
+diff -ruN cyrus-imapd-2.1.13.orig/imap/pop3d.c cyrus-imapd-2.1.13/imap/pop3d.c
+--- cyrus-imapd-2.1.13.orig/imap/pop3d.c Tue Apr 22 10:02:06 2003
++++ cyrus-imapd-2.1.13/imap/pop3d.c Thu Jun 19 18:36:10 2003
+@@ -100,6 +100,10 @@
+ extern char *optarg;
+ extern int opterr;
+
++#ifdef DRAC_AUTH
++static int drac_enabled;
++extern int dracauth(char *server, unsigned long userip, char **errmsg);
++#endif /* DRAC_AUTH */
+
+
+ #ifdef HAVE_SSL
+@@ -382,6 +386,10 @@
+ prot_settimeout(popd_in, timeout*60);
+ prot_setflushonread(popd_in, popd_out);
+
++#ifdef DRAC_AUTH
++ drac_enabled = (config_getint("dracinterval", 5) > 0);
++#endif /* DRAC_AUTH */
++
+ if (kflag) kpop();
+
+ /* we were connected on pop3s port so we should do
+@@ -1339,6 +1347,20 @@
+ }
+ popd_mailbox = &mboxstruct;
+ proc_register("pop3d", popd_clienthost, popd_userid, popd_mailbox->name);
++
++#ifdef DRAC_AUTH
++ if (drac_enabled) {
++ char *err;
++
++ if (dracauth((char*) config_getstring("drachost", "localhost"),
++ popd_remoteaddr.sin_addr.s_addr, &err) != 0) {
++ /* disable DRAC */
++ drac_enabled = 0;
++ syslog(LOG_ERR, "dracauth: %s", err);
++ syslog(LOG_ERR, "DRAC notifications disabled");
++ }
++ }
++#endif /* DRAC_AUTH */
+
+ /* Create telemetry log */
+ telemetry_log(popd_userid, popd_in, popd_out);
diff -ruN cyrus-imapd-2.1.13.orig/imap/setproctitle.c
cyrus-imapd-2.1.13/imap/setproctitle.c
--- cyrus-imapd-2.1.13.orig/imap/setproctitle.c Thu Feb 13 13:15:30 2003
+++ cyrus-imapd-2.1.13/imap/setproctitle.c Thu Jun 19 16:38:42 2003
@@ -959,3 +1429,124 @@
# include <machine/vmparam.h>
# include <sys/exec.h>
# ifndef PS_STRINGS /* hmmmm.... apparently not available after all */
+diff -ruN cyrus-imapd-2.1.13.orig/imap/version.c cyrus-imapd-2.1.13/imap/version.c
+--- cyrus-imapd-2.1.13.orig/imap/version.c Mon Mar 24 11:13:58 2003
++++ cyrus-imapd-2.1.13/imap/version.c Thu Jun 19 18:36:58 2003
+@@ -134,6 +134,10 @@
+ snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
+ "; %s", SIEVE_VERSION);
+ #endif
++#ifdef DRAC_AUTH
++ snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++ "; DRAC");
++#endif
+ #ifdef HAVE_LIBWRAP
+ snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
+ "; TCP Wrappers");
+diff -ruN cyrus-imapd-2.1.13.orig/imtest/imtest.c cyrus-imapd-2.1.13/imtest/imtest.c
+--- cyrus-imapd-2.1.13.orig/imtest/imtest.c Thu Feb 13 13:15:33 2003
++++ cyrus-imapd-2.1.13/imtest/imtest.c Thu Jun 19 18:52:34 2003
+@@ -47,7 +47,9 @@
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/ipc.h>
++#if !defined(__APPLE__)
+ #include <sys/msg.h>
++#endif
+ #include <sys/stat.h>
+ #include <fcntl.h>
+
+diff -ruN cyrus-imapd-2.1.13.orig/man/Makefile.in cyrus-imapd-2.1.13/man/Makefile.in
+--- cyrus-imapd-2.1.13.orig/man/Makefile.in Tue Jun 25 09:22:29 2002
++++ cyrus-imapd-2.1.13/man/Makefile.in Thu Jun 19 21:53:56 2003
+@@ -58,7 +58,7 @@
+
+ SHELL = /bin/sh
+
+-prefix = @prefix@
++prefix = @prefix@/share
+ exec_prefix = @exec_prefix@
+ cyrus_prefix = @cyrus_prefix@
+
+diff -ruN cyrus-imapd-2.1.13.orig/man/imapd.conf.5 cyrus-imapd-2.1.13/man/imapd.conf.5
+--- cyrus-imapd-2.1.13.orig/man/imapd.conf.5 Tue Nov 19 21:15:22 2002
++++ cyrus-imapd-2.1.13/man/imapd.conf.5 Thu Jun 19 18:38:39 2003
+@@ -382,8 +382,14 @@
+ The SASL password (if needed) to use when authenticating to the mupdate server.
+ .IP "\fBmupdate_retry_delay:\fR 20" 5
+ The time to wait between connection retries to the mupdate server.
++.IP "\fBdracinterval:\fR 5" 5
++If nonzero, enables the use of DRAC (Dynamic Relay Authorization Control)
++by the pop3d and imapd daemons. Also sets the interval (in minutes) between
++re-authorization requests made by imapd.
++.IP "\fBdrachost:\fR localhost" 5
++Hostname of the RPC dracd server.
+ .SH SEE ALSO
+ .PP
+ \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBlmtpd(8)\fR, \fBtimsieved(8)\fR,
+ \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/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
+@@ -80,13 +80,26 @@
+ (cd imap; \
+ OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
+ SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
+- $(PERL) Makefile.PL PREFIX=$(prefix))
++ $(PERL) Makefile.PL PREFIX=$(prefix) \
++ [EMAIL PROTECTED]@/lib/perl5/5.6.0 \
++ [EMAIL PROTECTED]@/lib/perl5/5.6.0/darwin \
++ [EMAIL PROTECTED]@/lib/perl5/5.6.0 \
++ [EMAIL PROTECTED]@/lib/perl5/5.6.0/darwin \
++ [EMAIL PROTECTED]@/share/man/man1 \
++ [EMAIL PROTECTED]@/share/man/man3)
+
+ install::
+ @for d in $(SUBDIRS); \
+ do \
+ (cd $$d; echo "### Making" install "in" `pwd`; \
+- $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) install) || exit 1; \
++ $(MAKE) $(MFLAGS) [EMAIL PROTECTED]@ \
++ [EMAIL PROTECTED]@/lib/perl5/5.6.0 \
++ [EMAIL PROTECTED]@/lib/perl5/5.6.0/darwin \
++ [EMAIL PROTECTED]@/lib/perl5/5.6.0 \
++ [EMAIL PROTECTED]@/lib/perl5/5.6.0/darwin \
++ [EMAIL PROTECTED]@/share/man/man1 \
++ [EMAIL PROTECTED]@/share/man/man3 \
++ DESTDIR=$(DESTDIR) install) || exit 1; \
+ done
+
+ clean::
+diff -ruN cyrus-imapd-2.1.13.orig/perl/sieve/Makefile.in
cyrus-imapd-2.1.13/perl/sieve/Makefile.in
+--- cyrus-imapd-2.1.13.orig/perl/sieve/Makefile.in Mon Jul 22 10:16:09 2002
++++ cyrus-imapd-2.1.13/perl/sieve/Makefile.in Thu Jun 19 20:38:47 2003
+@@ -78,7 +78,13 @@
+ if [ -f Makefile.PL ]; then \
+ OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
+ SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
+- $(PERL) Makefile.PL PREFIX=$(prefix); \
++ $(PERL) Makefile.PL PREFIX=$(prefix) \
++ [EMAIL PROTECTED]@/lib/perl5/5.6.0 \
++ [EMAIL PROTECTED]@/lib/perl5/5.6.0/darwin \
++ [EMAIL PROTECTED]@/lib/perl5/5.6.0 \
++ [EMAIL PROTECTED]@/lib/perl5/5.6.0/darwin \
++ [EMAIL PROTECTED]@/share/man/man1 \
++ [EMAIL PROTECTED]@/share/man/man3; \
+ fi; \
+ $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
+ done
+diff -ruN cyrus-imapd-2.1.13.orig/perl/sieve/lib/request.c
cyrus-imapd-2.1.13/perl/sieve/lib/request.c
+--- cyrus-imapd-2.1.13.orig/perl/sieve/lib/request.c Thu Feb 13 13:15:53 2003
++++ cyrus-imapd-2.1.13/perl/sieve/lib/request.c Thu Jun 19 19:16:29 2003
+@@ -51,7 +51,9 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/ipc.h>
++#if !defined(__APPLE__)
+ #include <sys/msg.h>
++#endif
+
+ #include <stdlib.h>
+ #include <stdio.h>
-------------------------------------------------------
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
