summaryrefslogtreecommitdiff
path: root/mail/courier-imap/patches
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-02-18 22:12:46 +0000
committerjlam <jlam@pkgsrc.org>2005-02-18 22:12:46 +0000
commit77eebb3972223c7317941cc61e2c726af81f1582 (patch)
tree5c5b8507f600a375dc38678ec84da49553719cac /mail/courier-imap/patches
parent6db647b41a133df247c95d15e125cb68eb498315 (diff)
downloadpkgsrc-77eebb3972223c7317941cc61e2c726af81f1582.tar.gz
Update mail/courier-imap to courier-imap-4.0.1. Changes from version
3.0.5 include: * Implemented IMAP and POP3 proxy aggregator. With a proxy aggregator, the mail accounts are split between multiple, independent servers, with an IMAP/POP3 server running on each individual server. A separate, proxy server sits in front and accepts ordinary IMAP and POP3 connections. It reads the login ID, determines which server the account is located on, connects to the server, and logs in. Then, for the lifetime on the login session the front-end server takes itself out of the loop, and forwards all session traffic between the IMAP/POP3 client, and the back-end server. * Use courier-authlib for user authentication. * IPv6 support. * Minor bug fixes. Please note when updating that the locations of the userdb files has changed to be within the courier-authlib config directory, e.g. /usr/pkg/etc/authlib/userdb*.
Diffstat (limited to 'mail/courier-imap/patches')
-rw-r--r--mail/courier-imap/patches/patch-aa123
-rw-r--r--mail/courier-imap/patches/patch-ab11
-rw-r--r--mail/courier-imap/patches/patch-ad15
-rw-r--r--mail/courier-imap/patches/patch-ae43
-rw-r--r--mail/courier-imap/patches/patch-af43
-rw-r--r--mail/courier-imap/patches/patch-ag41
-rw-r--r--mail/courier-imap/patches/patch-ah41
-rw-r--r--mail/courier-imap/patches/patch-ai24
-rw-r--r--mail/courier-imap/patches/patch-aj24
9 files changed, 132 insertions, 233 deletions
diff --git a/mail/courier-imap/patches/patch-aa b/mail/courier-imap/patches/patch-aa
index 38f6f3c064d..ea5282a5264 100644
--- a/mail/courier-imap/patches/patch-aa
+++ b/mail/courier-imap/patches/patch-aa
@@ -1,72 +1,61 @@
-$NetBSD: patch-aa,v 1.9 2004/07/14 20:07:16 jlam Exp $
+$NetBSD: patch-aa,v 1.10 2005/02/18 22:12:46 jlam Exp $
---- Makefile.in.orig Fri Jun 11 21:38:19 2004
-+++ Makefile.in Tue Jul 13 20:33:19 2004
-@@ -140,12 +140,12 @@
-
+--- Makefile.in.orig 2005-01-04 19:57:19.000000000 -0500
++++ Makefile.in
+@@ -231,10 +231,11 @@ DIST_SUBDIRS = numlib md5 sha1 bdbobj gd
-sbin_SCRIPTS = sharedindexinstall sharedindexsplit
+sbin_SCRIPTS =
CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS)
databindir = $(datadir)
--databin_SCRIPTS = mkimapdcert mkpop3dcert vchkpw2userdb makeuserdb pw2userdb
-+databin_SCRIPTS = mkimapdcert mkpop3dcert
-
+-databin_SCRIPTS = mkimapdcert mkpop3dcert
-binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw
--sbinPROGRAMS = authenumerate imaplogin pop3login userdbpw courierlogger
+-sbinPROGRAMS = imaplogin pop3login
-libexecPROGRAMS = makedatprog couriertcpd
-+binPROGRAMS = imapd pop3d
-+sbinPROGRAMS = imaplogin pop3login
-+libexecPROGRAMS = couriertcpd
-
- bin_PROGRAMS = @binPROGRAMS_exec@
-@@ -155,5 +155,5 @@
- EXTRA_PROGRAMS =
-
--man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.1 courierlogger.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1
-+man_MANS = couriertcpd.1 courier-imapd.8 mkimapdcert.8 mkpop3dcert.8
-
-
-@@ -169,5 +169,5 @@
-
+-man_MANS = couriertcpd.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1
++databin_SCRIPTS = mkimapdcert mkpop3dcert \
++ imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
++binPROGRAMS = imapd
++sbinPROGRAMS = couriertcpd
++libexecPROGRAMS = imaplogin courierpop3login courierpop3d
++man_MANS = couriertcpd.1 courierimapd.8 courierpop3d.8 mkimapdcert.8 mkpop3dcert.8
+
+@@ -250,5 +251,5 @@ sysconftool
sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
- imapd.cnf pop3d.cnf quotawarnmsg.example
+ imapd.cnf pop3d.cnf
- libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
-@@ -980,6 +980,6 @@
- cp $(srcdir)/maildir/maildirkw.1 .
+-libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
++libexec_SCRIPTS =
+ HTML2TXT = `which lynx 2>/dev/null && echo "lynx -dump -nolist" && exit; echo "links -dump"`
+@@ -996,7 +997,7 @@ sharedindexsplit: maildir/sharedindexspl
+
+-pop3login$(EXEEXT): imap/pop3login$(EXEEXT)
+- cp imap/pop3login$(EXEEXT) .
++courierpop3login$(EXEEXT): imap/pop3login$(EXEEXT)
++ cp imap/pop3login$(EXEEXT) ./$@
+
+-pop3d$(EXEEXT): imap/pop3d$(EXEEXT)
+- cp imap/pop3d$(EXEEXT) .
++courierpop3d$(EXEEXT): imap/pop3d$(EXEEXT)
++ cp imap/pop3d$(EXEEXT) ./$@
+
+@@ -1044,4 +1045,7 @@ maildirkw.1: maildir/maildirkw.1
-imapd.8: imap/imapd.8
- cp imap/imapd.8 .
-+courier-imapd.8: imap/imapd.8
++courierimapd.8: imap/imapd.8
+ cp imap/imapd.8 ./$@
++
++courierpop3d.8: imap/courierpop3d.8
++ cp imap/courierpop3d.8 .
- mkimapdcert: imap/mkimapdcert
-@@ -1007,20 +1007,9 @@
-
- install-exec-local:
-- $(mkinstalldirs) $(DESTDIR)$(libexecdir)/authlib
-- for f in `cat authlib/installlist` dummy ; do \
-- test "$$f" = "dummy" && continue ; \
-- $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) authlib/$$f \
-- $(DESTDIR)$(libexecdir)/authlib/$$f ; done
-- for f in `cat authlib/installlist.sh` dummy ; do \
-- test "$$f" = "dummy" && continue ; \
-- $(INSTALL_SCRIPT) authlib/$$f \
-- $(DESTDIR)$(libexecdir)/authlib/$$f ; done
-- $(mkinstalldirs) $(DESTDIR)$(databindir)
-- $(INSTALL_SCRIPT) userdb/userdb.pl $(DESTDIR)$(databindir)/userdb
- $(mkinstalldirs) $(DESTDIR)$(bindir)
- test ! -x tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
- tcpd/couriertls $(DESTDIR)$(bindir)/couriertls
+@@ -1074,3 +1078,3 @@ install-exec-local:
$(mkinstalldirs) $(DESTDIR)$(sbindir)
-- for f in mkimapdcert mkpop3dcert vchkpw2userdb makeuserdb pw2userdb userdb ; \
-+ for f in mkimapdcert mkpop3dcert ; \
+- for f in mkimapdcert mkpop3dcert ; \
++ for f in imapd-ssl imapd mkimapdcert mkpop3dcert pop3d pop3d-ssl ; \
do rm -f $(DESTDIR)$(sbindir)/$$f ; \
- $(LN_S) $(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
-@@ -1028,34 +1017,8 @@
-
+@@ -1080,17 +1084,4 @@ install-exec-local:
install-exec-hook:
- chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example
- mkdir -p $(DESTDIR)$(sysconfdir)/shared
@@ -74,29 +63,13 @@ $NetBSD: patch-aa,v 1.9 2004/07/14 20:07:16 jlam Exp $
- mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
- chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
- # If authlib built authpam, install the PAM configuration file
-
install-data-local: install-man
-- for f in `cat authlib/modulelist ; . authlib/authdaemonrc ; echo $$authmodulelist ` ; do \
-- test "$$f" = "authpam" || continue ; \
-- test -d $(DESTDIR)/etc/pam.d || continue ; \
-- test -w $(DESTDIR)/etc/pam.d || continue ; \
-- test -f $(DESTDIR)/etc/pam.d/imap || \
-- $(INSTALL_DATA) $(srcdir)/imap/imapd.pam \
-- $(DESTDIR)/etc/pam.d/imap || exit 1 ;\
-- test -f $(DESTDIR)/etc/pam.d/pop3 || \
-- $(INSTALL_DATA) $(srcdir)/imap/pop3d.pam \
-- $(DESTDIR)/etc/pam.d/pop3 || exit 1 ;\
-- done
-- rm -f $(DESTDIR)$(man8dir)/pw2userdb.8
-- rm -f $(DESTDIR)$(man8dir)/vchkpw2userdb.8
-- $(LN_S) makeuserdb.8 $(DESTDIR)$(man8dir)/pw2userdb.8
-- $(LN_S) makeuserdb.8 $(DESTDIR)$(man8dir)/vchkpw2userdb.8
-- . authlib/authdaemonrc ; test "$$authdaemonvar" = "" && exit 0; \
-- $(mkinstalldirs) $(DESTDIR)$$authdaemonvar ; \
-- chmod 700 $(DESTDIR)$$authdaemonvar
-- for f in $(man_MANS); do chmod a+r $(DESTDIR)$(mandir)/*/$$f; done
-- @cat authlib/authdaemon.msg
-- @echo "Do not forget to run make install-configure"
-
- uninstall-local:
+- test -d $(DESTDIR)/etc/pam.d || exit 0 ; \
+- test -w $(DESTDIR)/etc/pam.d || exit 0 ; \
+- test -f $(DESTDIR)/etc/pam.d/imap || \
+- $(INSTALL_DATA) $(srcdir)/imap/imapd.pam \
+- $(DESTDIR)/etc/pam.d/imap || exit 1 ;\
+- test -f $(DESTDIR)/etc/pam.d/pop3 || \
+- $(INSTALL_DATA) $(srcdir)/imap/pop3d.pam \
+- $(DESTDIR)/etc/pam.d/pop3 || exit 1
+ for f in $(man_MANS); do chmod a+r $(DESTDIR)$(mandir)/*/$$f; done
diff --git a/mail/courier-imap/patches/patch-ab b/mail/courier-imap/patches/patch-ab
deleted file mode 100644
index bc2399f70db..00000000000
--- a/mail/courier-imap/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2004/07/14 20:07:16 jlam Exp $
-
---- authlib/Makefile.in.orig Tue Jul 13 03:32:28 2004
-+++ authlib/Makefile.in Tue Jul 13 03:32:54 2004
-@@ -1312,5 +1312,5 @@
- info-am:
-
--install-data-am: install-data-local
-+install-data-am:
-
- install-exec-am:
diff --git a/mail/courier-imap/patches/patch-ad b/mail/courier-imap/patches/patch-ad
index 53e480e6812..f3a8c2b30ab 100644
--- a/mail/courier-imap/patches/patch-ad
+++ b/mail/courier-imap/patches/patch-ad
@@ -1,8 +1,17 @@
-$NetBSD: patch-ad,v 1.3 2004/02/22 03:13:07 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2005/02/18 22:12:46 jlam Exp $
---- configure.orig Thu Nov 27 15:51:08 2003
+--- configure.orig 2005-01-04 19:57:18.000000000 -0500
+++ configure
-@@ -3607,9 +3607,6 @@ else
+@@ -19568,7 +19568,7 @@ echo "$as_me: error: courierauthconfig n
+ fi
+ $COURIERAUTHCONFIG --configfiles >conftest || exit 1
+ sed 's/^/auth/' <conftest >conftest2
+-. conftest2
++. ./conftest2
+ if test ! -x $authsbindir/courierlogger$EXEEXT
+ then
+ { { echo "$as_me:$LINENO: error: authlib configuration error - $authsbindir/courierlogger$EXEEXT not found" >&5
+@@ -20376,9 +20376,6 @@ else
ac_configure_args="$ac_configure_args --with-authchangepwdir=/var/tmp/dev/null"
fi;
diff --git a/mail/courier-imap/patches/patch-ae b/mail/courier-imap/patches/patch-ae
index f0398d9b354..331740cda32 100644
--- a/mail/courier-imap/patches/patch-ae
+++ b/mail/courier-imap/patches/patch-ae
@@ -1,35 +1,26 @@
-$NetBSD: patch-ae,v 1.5 2004/07/14 20:07:17 jlam Exp $
+$NetBSD: patch-ae,v 1.6 2005/02/18 22:12:46 jlam Exp $
---- imapd-ssl.rc.in.orig Tue Jul 13 03:37:29 2004
-+++ imapd-ssl.rc.in Tue Jul 13 03:39:05 2004
-@@ -34,18 +34,13 @@
- LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
- done
+--- imapd-ssl.rc.in.orig 2004-11-24 23:57:04.000000000 -0500
++++ imapd-ssl.rc.in
+@@ -9,6 +9,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ libexecdir=@libexecdir@
++sbindir=@sbindir@
-- if test -x ${libexecdir}/authlib/authdaemond
-- then
-- @SETENV@ - DEBUG_LOGIN="$DEBUG_LOGIN" ${libexecdir}/authlib/authdaemond start
-- fi
--
- if test "$TLS_CACHEFILE" != ""
- then
- rm -f $TLS_CACHEFILE
- fi
+ if test ! -f @sysconfdir@/imapd
+ then
+@@ -35,11 +36,12 @@ start)
+ umask $IMAP_UMASK
@ULIMIT@ $IMAP_ULIMITD
- @SETENV@ - @SHELL@ -c " set -a ;
+ @SETENV@ -i @SHELL@ -c " set -a ;
prefix=@prefix@ ;
exec_prefix=@exec_prefix@ ;
bindir=@bindir@ ;
-@@ -64,10 +59,6 @@
- ;;
- stop)
- @libexecdir@/couriertcpd -pid=$SSLPIDFILE -stop
-- if test -x ${libexecdir}/authlib/authdaemond
-- then
-- ${libexecdir}/authlib/authdaemond stop
-- fi
- ;;
- esac
- exit 0
+ libexecdir=@libexecdir@ ;
++ sbindir=@sbindir@ ;
+ . @sysconfdir@/imapd ; \
+ . @sysconfdir@/imapd-ssl ; \
+ IMAP_TLS=1; export IMAP_TLS; \
diff --git a/mail/courier-imap/patches/patch-af b/mail/courier-imap/patches/patch-af
index 9955d352927..f12a0e4a1fc 100644
--- a/mail/courier-imap/patches/patch-af
+++ b/mail/courier-imap/patches/patch-af
@@ -1,35 +1,26 @@
-$NetBSD: patch-af,v 1.5 2004/07/14 20:07:17 jlam Exp $
+$NetBSD: patch-af,v 1.6 2005/02/18 22:12:46 jlam Exp $
---- imapd.rc.in.orig Tue Jul 13 03:39:46 2004
-+++ imapd.rc.in Tue Jul 13 03:40:04 2004
-@@ -34,18 +34,13 @@
- LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
- done
+--- imapd.rc.in.orig 2004-11-24 23:57:04.000000000 -0500
++++ imapd.rc.in
+@@ -9,6 +9,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ libexecdir=@libexecdir@
++sbindir=@sbindir@
-- if test -x ${libexecdir}/authlib/authdaemond
-- then
-- @SETENV@ - DEBUG_LOGIN="$DEBUG_LOGIN" ${libexecdir}/authlib/authdaemond start
-- fi
--
- if test "$TLS_CACHEFILE" != ""
- then
- rm -f $TLS_CACHEFILE
- fi
+ if test ! -f @sysconfdir@/imapd
+ then
+@@ -35,11 +36,12 @@ start)
+ umask $IMAP_UMASK
@ULIMIT@ $IMAP_ULIMITD
- @SETENV@ - @SHELL@ -c " set -a ;
+ @SETENV@ -i @SHELL@ -c " set -a ;
prefix=@prefix@ ;
exec_prefix=@exec_prefix@ ;
bindir=@bindir@ ;
-@@ -64,10 +59,6 @@
- ;;
- stop)
- @libexecdir@/couriertcpd -pid=$PIDFILE -stop
-- if test -x ${libexecdir}/authlib/authdaemond
-- then
-- ${libexecdir}/authlib/authdaemond stop
-- fi
- ;;
- esac
- exit 0
+ libexecdir=@libexecdir@ ;
++ sbindir=@sbindir@ ;
+ . @sysconfdir@/imapd ; \
+ . @sysconfdir@/imapd-ssl ; \
+ IMAP_STARTTLS=$IMAPDSTARTTLS ; export IMAP_STARTTLS ; \
diff --git a/mail/courier-imap/patches/patch-ag b/mail/courier-imap/patches/patch-ag
index 0be4c917752..cb9d7cbdef7 100644
--- a/mail/courier-imap/patches/patch-ag
+++ b/mail/courier-imap/patches/patch-ag
@@ -1,29 +1,26 @@
-$NetBSD: patch-ag,v 1.5 2004/07/14 20:07:17 jlam Exp $
+$NetBSD: patch-ag,v 1.6 2005/02/18 22:12:46 jlam Exp $
---- pop3d-ssl.rc.in.orig Tue Jul 13 03:40:29 2004
-+++ pop3d-ssl.rc.in Tue Jul 13 03:40:51 2004
-@@ -34,12 +34,7 @@
- LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
- done
+--- pop3d-ssl.rc.in.orig 2004-10-20 20:45:45.000000000 -0400
++++ pop3d-ssl.rc.in
+@@ -9,6 +9,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ libexecdir=@libexecdir@
++sbindir=@sbindir@
-- if test -x ${libexecdir}/authlib/authdaemond
-- then
-- @SETENV@ - DEBUG_LOGIN="$DEBUG_LOGIN" ${libexecdir}/authlib/authdaemond start
-- fi
--
+ if test ! -f @sysconfdir@/pop3d
+ then
+@@ -28,11 +29,12 @@ fi
+
+ case $1 in
+ start)
- @SETENV@ - @SHELL@ -c " set -a ;
+ @SETENV@ -i @SHELL@ -c " set -a ;
prefix=@prefix@ ;
exec_prefix=@exec_prefix@ ;
bindir=@bindir@ ;
-@@ -60,10 +55,6 @@
- ;;
- stop)
- @libexecdir@/couriertcpd -pid=$SSLPIDFILE -stop
-- if test -x ${libexecdir}/authlib/authdaemond
-- then
-- ${libexecdir}/authlib/authdaemond stop
-- fi
- ;;
- esac
- exit 0
+ libexecdir=@libexecdir@ ;
++ sbindir=@sbindir@ ;
+ . @sysconfdir@/pop3d ; \
+ . @sysconfdir@/pop3d-ssl ; \
+ POP3_TLS=1; export POP3_TLS; \
diff --git a/mail/courier-imap/patches/patch-ah b/mail/courier-imap/patches/patch-ah
index 012a50a5cf7..2cf54bc3c1b 100644
--- a/mail/courier-imap/patches/patch-ah
+++ b/mail/courier-imap/patches/patch-ah
@@ -1,29 +1,26 @@
-$NetBSD: patch-ah,v 1.4 2004/07/14 20:07:17 jlam Exp $
+$NetBSD: patch-ah,v 1.5 2005/02/18 22:12:46 jlam Exp $
---- pop3d.rc.in.orig Tue Jul 13 03:41:28 2004
-+++ pop3d.rc.in Tue Jul 13 03:41:41 2004
-@@ -33,12 +33,7 @@
- LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
- done
+--- pop3d.rc.in.orig 2004-10-20 20:45:46.000000000 -0400
++++ pop3d.rc.in
+@@ -9,6 +9,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ libexecdir=@libexecdir@
++sbindir=@sbindir@
-- if test -x ${libexecdir}/authlib/authdaemond
-- then
-- @SETENV@ - DEBUG_LOGIN="$DEBUG_LOGIN" ${libexecdir}/authlib/authdaemond start
-- fi
--
+ if test ! -f @sysconfdir@/pop3d
+ then
+@@ -27,11 +28,12 @@ fi
+
+ case $1 in
+ start)
- @SETENV@ - @SHELL@ -c " set -a ;
+ @SETENV@ -i @SHELL@ -c " set -a ;
prefix=@prefix@ ;
exec_prefix=@exec_prefix@ ;
bindir=@bindir@ ;
-@@ -57,10 +52,6 @@
- ;;
- stop)
- @libexecdir@/couriertcpd -pid=$PIDFILE -stop
-- if test -x ${libexecdir}/authlib/authdaemond
-- then
-- ${libexecdir}/authlib/authdaemond stop
-- fi
- ;;
- esac
- exit 0
+ libexecdir=@libexecdir@ ;
++ sbindir=@sbindir@ ;
+ . @sysconfdir@/pop3d ; \
+ . @sysconfdir@/pop3d-ssl ; \
+ TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \
diff --git a/mail/courier-imap/patches/patch-ai b/mail/courier-imap/patches/patch-ai
deleted file mode 100644
index 38624258e9f..00000000000
--- a/mail/courier-imap/patches/patch-ai
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/07/14 20:07:17 jlam Exp $
-
---- imap/imapd.dist.in.orig Tue Jul 13 04:01:49 2004
-+++ imap/imapd.dist.in Tue Jul 13 04:01:58 2004
-@@ -92,19 +92,6 @@
-
- AUTHMODULES_ORIG="@AUTHMODULES@"
-
--##NAME: DEBUG_LOGIN:0
--#
--# Dump additional login diagnostics to syslog
--#
--# DEBUG_LOGIN=0 - turn off login debugging
--# DEBUG_LOGIN=1 - turn on login debugging
--# DEBUG_LOGIN=2 - turn on login debugging + log passwords too
--#
--# Note that most information is sent to syslog at level 'debug', so
--# you may need to modify your /etc/syslog.conf to be able to see it.
--
--DEBUG_LOGIN=0
--
- ##NAME: IMAP_CAPABILITY:1
- #
- # IMAP_CAPABILITY specifies what most of the response should be to the
diff --git a/mail/courier-imap/patches/patch-aj b/mail/courier-imap/patches/patch-aj
deleted file mode 100644
index b8d5262afa6..00000000000
--- a/mail/courier-imap/patches/patch-aj
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2004/07/14 20:07:17 jlam Exp $
-
---- imap/pop3d.dist.in.orig Tue Jul 13 04:02:36 2004
-+++ imap/pop3d.dist.in Tue Jul 13 04:02:51 2004
-@@ -54,19 +54,6 @@
-
- AUTHMODULES_ORIG="@AUTHMODULES@"
-
--##NAME: DEBUG_LOGIN:0
--#
--# Dump additional login diagnostics to syslog
--#
--# DEBUG_LOGIN=0 - turn off login debugging
--# DEBUG_LOGIN=1 - turn on login debugging
--# DEBUG_LOGIN=2 - turn on login debugging + log passwords too
--#
--# Note that most information is sent to syslog at level 'debug', so
--# you may need to modify your /etc/syslog.conf to be able to see it.
--
--DEBUG_LOGIN=0
--
- ##NAME: POP3AUTH:1
- #
- # To advertise the SASL capability, per RFC 2449, uncomment the POP3AUTH