Marcus Glocker wrote:
Hi,
I recently updated mail/courier-imap to 4.6.0. Afterwards I noticed
that my configuration didn't work anymore, because imapd was hanging
in a pretty long loop, looking for ``/tmp/fam-hacki''.
So it looks like with our 4.6.0 port FAM has been enabled by default.
I really wonder if this is right. Do people really use FAM on
OpenBSD by default? Nobody noticed that issue has well? Or maybe
I'm missing something and you can enlight me.
Otherwise I would suggest the attached diff.
Regards,
Marcus
Thanks for spotting this, attached is a diff for Courier-imap 4.6.0
(which fixes man pages as well) and one for 4.7.0 (I will commit this
update soon).
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 28 Oct 2009 14:18:04 -0000 1.11
+++ Makefile 11 Jan 2010 15:48:16 -0000
@@ -6,21 +6,21 @@ COMMENT-mysql= mysql authentication mod
COMMENT-pgsql= pgsql authentication module for courier-authLib
COMMENT-userdb= userdb authentication module for courier-authLib
-DISTNAME= courier-authlib-0.62.4
+DISTNAME= courier-authlib-0.63.0
PKGNAME-main= ${DISTNAME}
PKGNAME-ldap= ${DISTNAME:S/lib-/lib-ldap-/}
PKGNAME-mysql= ${DISTNAME:S/lib-/lib-mysql-/}
PKGNAME-pgsql= ${DISTNAME:S/lib-/lib-pgsql-/}
PKGNAME-userdb= ${DISTNAME:S/lib-/lib-userdb-/}
-SHARED_LIBS += courierauth 0.0 # .0.0
+SHARED_LIBS += courierauth 1.0 # .0.0
SHARED_LIBS += courierauthsasl 1.0 # .0.0
SHARED_LIBS += courierauthsaslclient 0.0 # .0.0
-SHARED_LIBS += courierauthcommon 0.0 # .0.0
+SHARED_LIBS += courierauthcommon 1.0 # .0.0
SHARED_LIBS += authuserdb 0.0 # .0.0
SHARED_LIBS += authpwd 0.0 # .0.0
SHARED_LIBS += authpgsql 0.0 # .0.0
-SHARED_LIBS += authldap 0.0 # .0.0
+SHARED_LIBS += authldap 1.0 # .0.0
SHARED_LIBS += authmysql 0.0 # .0.0
SHARED_LIBS += authpipe 0.0 # .0.0
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 28 Oct 2009 14:18:04 -0000 1.3
+++ distinfo 11 Jan 2010 15:48:16 -0000
@@ -1,5 +1,5 @@
-MD5 (courier-authlib-0.62.4.tar.bz2) = QLAdfxnCnbfJGcCTinU3xw==
-RMD160 (courier-authlib-0.62.4.tar.bz2) = Et3enQCGmX31xuRbznHc9hMjiL4=
-SHA1 (courier-authlib-0.62.4.tar.bz2) = P1Q+zQPVIP36UlnQ0LRaEy5Qqpk=
-SHA256 (courier-authlib-0.62.4.tar.bz2) =
qwM1Zdvsn9ZeH3YYoxGmFCFM9y9KMFKtueC5ps7K8IE=
-SIZE (courier-authlib-0.62.4.tar.bz2) = 2175238
+MD5 (courier-authlib-0.63.0.tar.bz2) = QRqSfRePeDoej6uZZM4N0g==
+RMD160 (courier-authlib-0.63.0.tar.bz2) = RShnKhGJXJ1wU0BSPleChOQLXeo=
+SHA1 (courier-authlib-0.63.0.tar.bz2) = wIdydN6LWOxMekHP2HrZs3xAgwQ=
+SHA256 (courier-authlib-0.63.0.tar.bz2) =
e5YbllxEaZb+DspArS58xtR/yehZRPcBxFex2oyXisM=
+SIZE (courier-authlib-0.63.0.tar.bz2) = 2817119
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-imap/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- Makefile 26 Feb 2010 18:55:21 -0000 1.57
+++ Makefile 30 Mar 2010 09:29:37 -0000
@@ -3,10 +3,10 @@
COMMENT-main= imap server for maildir format mailboxes
COMMENT-pop3= pop3 server for maildir format mailboxes
-V= 4.6.0
+V= 4.7.0
DISTNAME= courier-imap-${V}
PKGNAME-main= ${DISTNAME}
-FULLPKGNAME-pop3= courier-pop3-${V}p0
+FULLPKGNAME-pop3= courier-pop3-${V}
FULLPKGPATH-pop3= mail/courier-imap,-pop3
CATEGORIES= mail
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/courier-imap/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 28 Oct 2009 14:20:19 -0000 1.11
+++ distinfo 30 Mar 2010 09:29:37 -0000
@@ -1,5 +1,5 @@
-MD5 (courier-imap-4.6.0.tar.bz2) = hzf7G1UkLCCnj9LReXBzEQ==
-RMD160 (courier-imap-4.6.0.tar.bz2) = Zk+ybBNRllr2sbsh4iIw72Yy8RA=
-SHA1 (courier-imap-4.6.0.tar.bz2) = vsJMN0AHw9omXgVEiRmSzlmU1X8=
-SHA256 (courier-imap-4.6.0.tar.bz2) =
2E5L1PZD7APvG96pdDxLkX/OejbPiWft7u+3wVuCWzc=
-SIZE (courier-imap-4.6.0.tar.bz2) = 3397972
+MD5 (courier-imap-4.7.0.tar.bz2) = 5phIkOGuzzzGsJmhYZMk5g==
+RMD160 (courier-imap-4.7.0.tar.bz2) = KrF2j7dxTP4pHtzADJbMJ2rxJ4I=
+SHA1 (courier-imap-4.7.0.tar.bz2) = lynzrdhpJWOGXaUWfP6I8iJ8OWg=
+SHA256 (courier-imap-4.7.0.tar.bz2) =
oKms7ns2OZ0iZmrFruIsvF21KZagd5HgM78fe643C58=
+SIZE (courier-imap-4.7.0.tar.bz2) = 3414328
Index: patches/patch-imap_courierpop3d_8_in
===================================================================
RCS file: patches/patch-imap_courierpop3d_8_in
diff -N patches/patch-imap_courierpop3d_8_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-imap_courierpop3d_8_in 30 Mar 2010 09:29:37 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- imap/courierpop3d.8.in.orig Fri Jan 8 20:00:30 2010
++++ imap/courierpop3d.8.in Fri Jan 8 20:01:00 2010
+@@ -27,7 +27,6 @@
+ .de SH-xref
+ .ie n \{\
+ .\}
+-.toupper \\$*
+ .el \{\
+ \\$*
+ .\}
+@@ -56,9 +55,6 @@
+ .ft B
+ .ne (2v + 1u)
+ .ie n \{\
+-.\" if n (TTY output), use uppercase
+-.toupper \\$*
+-.\}
+ .el \{\
+ .nr an-break-flag 0
+ .\" if not n (not TTY), use normal case (not uppercase)
Index: patches/patch-imap_imapd_8_in
===================================================================
RCS file: patches/patch-imap_imapd_8_in
diff -N patches/patch-imap_imapd_8_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-imap_imapd_8_in 30 Mar 2010 09:29:37 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- imap/imapd.8.in.orig Fri Jan 8 20:00:17 2010
++++ imap/imapd.8.in Fri Jan 8 20:00:46 2010
+@@ -27,7 +27,6 @@
+ .de SH-xref
+ .ie n \{\
+ .\}
+-.toupper \\$*
+ .el \{\
+ \\$*
+ .\}
+@@ -56,9 +55,6 @@
+ .ft B
+ .ne (2v + 1u)
+ .ie n \{\
+-.\" if n (TTY output), use uppercase
+-.toupper \\$*
+-.\}
+ .el \{\
+ .nr an-break-flag 0
+ .\" if not n (not TTY), use normal case (not uppercase)
Index: patches/patch-maildir_configure
===================================================================
RCS file: patches/patch-maildir_configure
diff -N patches/patch-maildir_configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-maildir_configure 30 Mar 2010 09:29:37 -0000
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- maildir/configure.orig Sun Nov 22 15:45:17 2009
++++ maildir/configure Tue Mar 30 11:23:32 2010
+@@ -18366,7 +18366,6 @@ if test "${ac_cv_lib_fam_FAMOpen+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lfam $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -18430,7 +18429,7 @@ if test "x$ac_cv_lib_fam_FAMOpen" = x""yes; then
+ LIBFAM=-lfam
+
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_FAM 1
++#define HAVE_FAM 0
+ _ACEOF
+
+
+@@ -18593,7 +18592,6 @@ fi
+
+
+
+-echo "$LIBFAM" >maildir.libdeps
+
+ { $as_echo "$as_me:$LINENO: checking for missing gethostname prototype" >&5
+ $as_echo_n "checking for missing gethostname prototype... " >&6; }
Index: patches/patch-maildir_maildiracl_1_in
===================================================================
RCS file: patches/patch-maildir_maildiracl_1_in
diff -N patches/patch-maildir_maildiracl_1_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-maildir_maildiracl_1_in 30 Mar 2010 09:29:37 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- maildir/maildiracl.1.in.orig Fri Jan 8 19:57:10 2010
++++ maildir/maildiracl.1.in Fri Jan 8 19:59:39 2010
+@@ -27,7 +27,6 @@
+ .de SH-xref
+ .ie n \{\
+ .\}
+-.toupper \\$*
+ .el \{\
+ \\$*
+ .\}
+@@ -56,9 +55,6 @@
+ .ft B
+ .ne (2v + 1u)
+ .ie n \{\
+-.\" if n (TTY output), use uppercase
+-.toupper \\$*
+-.\}
+ .el \{\
+ .nr an-break-flag 0
+ .\" if not n (not TTY), use normal case (not uppercase)
Index: patches/patch-maildir_maildirmake_1_in
===================================================================
RCS file: patches/patch-maildir_maildirmake_1_in
diff -N patches/patch-maildir_maildirmake_1_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-maildir_maildirmake_1_in 30 Mar 2010 09:29:37 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- maildir/maildirmake.1.in.orig Fri Jan 8 19:57:25 2010
++++ maildir/maildirmake.1.in Fri Jan 8 19:59:58 2010
+@@ -27,7 +27,6 @@
+ .de SH-xref
+ .ie n \{\
+ .\}
+-.toupper \\$*
+ .el \{\
+ \\$*
+ .\}
+@@ -56,9 +55,6 @@
+ .ft B
+ .ne (2v + 1u)
+ .ie n \{\
+-.\" if n (TTY output), use uppercase
+-.toupper \\$*
+-.\}
+ .el \{\
+ .nr an-break-flag 0
+ .\" if not n (not TTY), use normal case (not uppercase)
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-imap/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- Makefile 26 Feb 2010 18:55:21 -0000 1.57
+++ Makefile 30 Mar 2010 09:31:33 -0000
@@ -6,7 +6,7 @@ COMMENT-pop3= pop3 server for maildir f
V= 4.6.0
DISTNAME= courier-imap-${V}
PKGNAME-main= ${DISTNAME}
-FULLPKGNAME-pop3= courier-pop3-${V}p0
+FULLPKGNAME-pop3= courier-pop3-${V}p1
FULLPKGPATH-pop3= mail/courier-imap,-pop3
CATEGORIES= mail
Index: patches/patch-imap_courierpop3d_8_in
===================================================================
RCS file: patches/patch-imap_courierpop3d_8_in
diff -N patches/patch-imap_courierpop3d_8_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-imap_courierpop3d_8_in 30 Mar 2010 09:31:33 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- imap/courierpop3d.8.in.orig Fri Jan 8 20:00:30 2010
++++ imap/courierpop3d.8.in Fri Jan 8 20:01:00 2010
+@@ -27,7 +27,6 @@
+ .de SH-xref
+ .ie n \{\
+ .\}
+-.toupper \\$*
+ .el \{\
+ \\$*
+ .\}
+@@ -56,9 +55,6 @@
+ .ft B
+ .ne (2v + 1u)
+ .ie n \{\
+-.\" if n (TTY output), use uppercase
+-.toupper \\$*
+-.\}
+ .el \{\
+ .nr an-break-flag 0
+ .\" if not n (not TTY), use normal case (not uppercase)
Index: patches/patch-imap_imapd_8_in
===================================================================
RCS file: patches/patch-imap_imapd_8_in
diff -N patches/patch-imap_imapd_8_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-imap_imapd_8_in 30 Mar 2010 09:31:33 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- imap/imapd.8.in.orig Fri Jan 8 20:00:17 2010
++++ imap/imapd.8.in Fri Jan 8 20:00:46 2010
+@@ -27,7 +27,6 @@
+ .de SH-xref
+ .ie n \{\
+ .\}
+-.toupper \\$*
+ .el \{\
+ \\$*
+ .\}
+@@ -56,9 +55,6 @@
+ .ft B
+ .ne (2v + 1u)
+ .ie n \{\
+-.\" if n (TTY output), use uppercase
+-.toupper \\$*
+-.\}
+ .el \{\
+ .nr an-break-flag 0
+ .\" if not n (not TTY), use normal case (not uppercase)
Index: patches/patch-maildir_configure
===================================================================
RCS file: patches/patch-maildir_configure
diff -N patches/patch-maildir_configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-maildir_configure 30 Mar 2010 09:31:33 -0000
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- maildir/configure.orig Sun Nov 22 15:45:17 2009
++++ maildir/configure Tue Mar 30 11:23:32 2010
+@@ -18366,7 +18366,6 @@ if test "${ac_cv_lib_fam_FAMOpen+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lfam $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -18430,7 +18429,7 @@ if test "x$ac_cv_lib_fam_FAMOpen" = x""yes; then
+ LIBFAM=-lfam
+
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_FAM 1
++#define HAVE_FAM 0
+ _ACEOF
+
+
+@@ -18593,7 +18592,6 @@ fi
+
+
+
+-echo "$LIBFAM" >maildir.libdeps
+
+ { $as_echo "$as_me:$LINENO: checking for missing gethostname prototype" >&5
+ $as_echo_n "checking for missing gethostname prototype... " >&6; }
Index: patches/patch-maildir_maildiracl_1_in
===================================================================
RCS file: patches/patch-maildir_maildiracl_1_in
diff -N patches/patch-maildir_maildiracl_1_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-maildir_maildiracl_1_in 30 Mar 2010 09:31:33 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- maildir/maildiracl.1.in.orig Fri Jan 8 19:57:10 2010
++++ maildir/maildiracl.1.in Fri Jan 8 19:59:39 2010
+@@ -27,7 +27,6 @@
+ .de SH-xref
+ .ie n \{\
+ .\}
+-.toupper \\$*
+ .el \{\
+ \\$*
+ .\}
+@@ -56,9 +55,6 @@
+ .ft B
+ .ne (2v + 1u)
+ .ie n \{\
+-.\" if n (TTY output), use uppercase
+-.toupper \\$*
+-.\}
+ .el \{\
+ .nr an-break-flag 0
+ .\" if not n (not TTY), use normal case (not uppercase)
Index: patches/patch-maildir_maildirmake_1_in
===================================================================
RCS file: patches/patch-maildir_maildirmake_1_in
diff -N patches/patch-maildir_maildirmake_1_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-maildir_maildirmake_1_in 30 Mar 2010 09:31:33 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- maildir/maildirmake.1.in.orig Fri Jan 8 19:57:25 2010
++++ maildir/maildirmake.1.in Fri Jan 8 19:59:58 2010
+@@ -27,7 +27,6 @@
+ .de SH-xref
+ .ie n \{\
+ .\}
+-.toupper \\$*
+ .el \{\
+ \\$*
+ .\}
+@@ -56,9 +55,6 @@
+ .ft B
+ .ne (2v + 1u)
+ .ie n \{\
+-.\" if n (TTY output), use uppercase
+-.toupper \\$*
+-.\}
+ .el \{\
+ .nr an-break-flag 0
+ .\" if not n (not TTY), use normal case (not uppercase)
