On Sun, Jun 01, 2014 at 12:18:33PM +0100, Stuart Henderson wrote:
> On 2014/06/01 11:18, Giovanni Bechis wrote:
> > +BUILD_DEPENDS= devel/pcre
>
> hmmm, is this statically linking pcre into the installed binaries?
> if so, that makes it a bit awkward for -stable updates if there's a
> security fix in pcre.
>
thanks for spotting this, I haven't think about it, new diff with pcre in
LIB_DEPENDS.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-imap/Makefile,v
retrieving revision 1.93
diff -u -p -u -p -r1.93 Makefile
--- Makefile 15 Apr 2014 08:53:04 -0000 1.93
+++ Makefile 1 Jun 2014 16:34:45 -0000
@@ -3,16 +3,12 @@
COMMENT-main= imap server for maildir format mailboxes
COMMENT-pop3= pop3 server for maildir format mailboxes
-V= 4.13
+V= 4.15
DISTNAME= courier-imap-${V}
-REVISION= 0
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-pop3= courier-pop3-${V}
FULLPKGPATH-pop3= mail/courier-imap,-pop3
-REVISION-main= 0
-REVISION-pop3= 0
-
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
@@ -24,8 +20,10 @@ MAINTAINER= Giovanni Bechis <giovanni@o
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c courierauth courierauthsasl gdbm idn
-WANTLIB-pop3= c courierauth courierauthsasl idn ${MODGETTEXT_WANTLIB}
+WANTLIB= c courierauth courierauthcommon courierauthsasl gdbm
+WANTLIB+= idn pcre
+WANTLIB-pop3= c courierauth courierauthcommon courierauthsasl
+WANTLIB-pop3+= idn pcre ${MODGETTEXT_WANTLIB}
USE_GMAKE= Yes
USE_GROFF= Yes
@@ -39,7 +37,8 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/
ac_cv_lib_db_db_env_create=no
LIB_DEPENDS= mail/courier-authlib \
- devel/libidn
+ devel/libidn \
+ devel/pcre
LOCALSTATEDIR= ${BASELOCALSTATEDIR}/run/courier
EXAMPLE_DIR= ${PREFIX}/share/examples/courier
@@ -64,13 +63,13 @@ CONFIGURE_ARGS= --sbindir=${PREFIX}/sbi
--cache-file=${WRKDIR}/courier-imap.cache
DOCS= AUTHORS INSTALL \
- NEWS imap/ChangeLog \
- imap/README imap/README.proxy \
- maildir/README.imapkeywords.html \
- maildir/README.maildirfilter.html \
- maildir/README.maildirquota.txt \
- maildir/README.sharedfolders.txt \
- tcpd/README.couriertls
+ NEWS libs/imap/ChangeLog \
+ libs/imap/README libs/imap/README.proxy \
+ libs/maildir/README.imapkeywords.html \
+ libs/maildir/README.maildirfilter.html \
+ libs/maildir/README.maildirquota.txt \
+ libs/maildir/README.sharedfolders.txt \
+ libs/tcpd/README.couriertls
FLAVORS= no_trashquota imap_bugs
FLAVOR?=
@@ -112,15 +111,15 @@ NO_TEST= Yes
post-extract:
@perl -pi -e 's,\@datadir\@\/imapd.rand,\/dev\/urandom,g' \
- ${WRKSRC}/imap/imapd.cnf.openssl.in
+ ${WRKSRC}/libs/imap/imapd.cnf.openssl.in
@perl -pi -e 's,\@datadir\@\/imapd.rand,\/dev\/urandom,g' \
- ${WRKSRC}/imap/pop3d.cnf.openssl.in
+ ${WRKSRC}/libs/imap/pop3d.cnf.openssl.in
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/courier
- ${INSTALL_DATA} ${WRKSRC}/unicode/README \
+ ${INSTALL_DATA} ${WRKSRC}/libs/unicode/README \
${PREFIX}/share/doc/courier/README.unicode.txt
- ${INSTALL_DATA} ${WRKSRC}/imap/README \
+ ${INSTALL_DATA} ${WRKSRC}/libs/imap/README \
${PREFIX}/share/doc/courier/README.imap.txt
. for i in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/courier
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/courier-imap/distinfo,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 distinfo
--- distinfo 7 May 2013 08:12:09 -0000 1.18
+++ distinfo 1 Jun 2014 16:34:45 -0000
@@ -1,2 +1,2 @@
-SHA256 (courier-imap-4.13.tar.bz2) =
vH4TxHpDF4AZXl/WXbdM0cjnFXhlIU9Nx4USxJFTazQ=
-SIZE (courier-imap-4.13.tar.bz2) = 3209625
+SHA256 (courier-imap-4.15.tar.bz2) =
bDQQfnup5TltULWPtBSklYBjNcq3E1yWrYWjgWeFsQk=
+SIZE (courier-imap-4.15.tar.bz2) = 3266353
Index: patches/patch-bdbobj_Makefile_in
===================================================================
RCS file: patches/patch-bdbobj_Makefile_in
diff -N patches/patch-bdbobj_Makefile_in
--- patches/patch-bdbobj_Makefile_in 9 May 2011 09:30:26 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-bdbobj_Makefile_in,v 1.2 2011/05/09 09:30:26 giovanni Exp $
-
-Removing "-static" from libtool linking flags makes our libtool happy
-and doesn't break the testbdb binary
-
---- bdbobj/Makefile.in.orig Mon Apr 4 17:04:28 2011
-+++ bdbobj/Makefile.in Wed Apr 13 15:53:46 2011
-@@ -72,7 +72,7 @@ am__objects_2 = testbdb.$(OBJEXT)
- testbdb_OBJECTS = $(am_testbdb_OBJECTS)
- testbdb_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-- $(testbdb_LDFLAGS) $(LDFLAGS) -o $@
-+ $(LDFLAGS) -o $@
- SCRIPTS = $(noinst_SCRIPTS)
- DEFAULT_INCLUDES = -I.@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/../depcomp
Index: patches/patch-imap_imapd-ssl_dist_in
===================================================================
RCS file: patches/patch-imap_imapd-ssl_dist_in
diff -N patches/patch-imap_imapd-ssl_dist_in
--- patches/patch-imap_imapd-ssl_dist_in 18 Oct 2012 08:06:27 -0000
1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.9 2012/10/18 08:06:27 giovanni Exp $
---- imap/imapd-ssl.dist.in.orig Fri Jun 22 14:24:14 2012
-+++ imap/imapd-ssl.dist.in Sat Sep 22 11:48:04 2012
-@@ -72,13 +72,13 @@ SSLLOGGEROPTS="-name=imapd-ssl"
- #
- # Whether or not to start IMAP over SSL on simap port:
-
--IMAPDSSLSTART=NO
-+IMAPDSSLSTART=YES
-
- ##NAME: IMAPDSTARTTLS:0
- #
- # Whether or not to implement IMAP STARTTLS extension instead:
-
--IMAPDSTARTTLS=YES
-+IMAPDSTARTTLS=NO
-
- ##NAME: IMAP_TLS_REQUIRED:1
- #
-@@ -268,8 +268,8 @@ TLS_VERIFYPEER=NONE
- # problems with SSL clients. Disable SSL caching by commenting out the
- # following settings:
-
--TLS_CACHEFILE=@localstatedir@/couriersslcache
--TLS_CACHESIZE=524288
-+# TLS_CACHEFILE=@localstatedir@/couriersslcache
-+# TLS_CACHESIZE=524288
-
- ##NAME: MAILDIRPATH:0
- #
Index: patches/patch-imap_pop3d-ssl_dist_in
===================================================================
RCS file: patches/patch-imap_pop3d-ssl_dist_in
diff -N patches/patch-imap_pop3d-ssl_dist_in
--- patches/patch-imap_pop3d-ssl_dist_in 18 Oct 2012 08:06:27 -0000
1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-imap_pop3d-ssl_dist_in,v 1.9 2012/10/18 08:06:27 giovanni Exp $
---- imap/pop3d-ssl.dist.in.orig Fri Jun 22 14:24:14 2012
-+++ imap/pop3d-ssl.dist.in Sat Sep 22 11:48:04 2012
-@@ -253,8 +253,8 @@ TLS_VERIFYPEER=NONE
- # problems with SSL clients. Disable SSL caching by commenting out the
- # following settings:
-
--TLS_CACHEFILE=@localstatedir@/couriersslcache
--TLS_CACHESIZE=524288
-+# TLS_CACHEFILE=@localstatedir@/couriersslcache
-+# TLS_CACHESIZE=524288
-
- ##NAME: MAILDIRPATH:0
- #
Index: patches/patch-liblock_locktest_c
===================================================================
RCS file: patches/patch-liblock_locktest_c
diff -N patches/patch-liblock_locktest_c
--- patches/patch-liblock_locktest_c 17 Mar 2013 19:37:36 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,85 +0,0 @@
-$OpenBSD: patch-liblock_locktest_c,v 1.2 2013/03/17 19:37:36 rpe Exp $
-
-mktemp change
-
---- liblock/locktest.c.orig Mon Dec 6 11:18:55 1999
-+++ liblock/locktest.c Fri Jan 6 19:06:31 2006
-@@ -5,6 +5,7 @@
-
- /* $Id */
-
-+#include <paths.h>
- #include "liblock.h"
- #if USE_FCNTL
- #include "lockfcntl.c"
-@@ -20,11 +21,23 @@
-
- int main()
- {
-+#define FILENAME "courier-imap.locktest.XXXXXXXXXX"
- int fd[2];
- pid_t p;
- int s;
- int f;
-
-+ char *name;
-+ const char *tmpdir;
-+ if ((tmpdir = (char *)getenv("TMPDIR")) == NULL)
-+ tmpdir = _PATH_TMP;
-+ (void)asprintf(&name, "%s%s%s", tmpdir,
-+ (tmpdir[strlen(tmpdir) - 1] == '/') ? "" : "/", FILENAME);
-+ if (name == NULL) {
-+ perror("get filename");
-+ exit(1);
-+ }
-+
- signal(SIGCHLD, SIG_DFL);
- if (pipe(fd))
- {
-@@ -32,6 +45,12 @@ int f;
- return (1);
- }
-
-+ if ((f=mkstemp(name)) < 0)
-+ {
-+ perror("open");
-+ exit(1);
-+ }
-+
- if ((p=fork()) == (pid_t)-1)
- {
- perror("fork");
-@@ -46,7 +65,7 @@ int f;
- read(fd[0], &c, 1);
- close(fd[0]);
-
-- if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
-+ if ((f=open(name, O_RDWR)) < 0)
- {
- perror("open");
- exit(1);
-@@ -56,22 +75,18 @@ int f;
- if (ll_lockfd(f, ll_writelock, 0, 0))
- {
- close(f);
-+ unlink(name);
- exit(0);
- }
- close(f);
- exit(1);
- }
--
-- if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
-- {
-- perror("open");
-- exit(1);
-- }
-
- if (ll_lockfd(f, ll_writelock, 0, 0))
- {
- perror("lock");
- close(f);
-+ unlink(name);
- exit(1);
- }
- close(fd[1]);
Index: patches/patch-libs_bdbobj_Makefile_in
===================================================================
RCS file: patches/patch-libs_bdbobj_Makefile_in
diff -N patches/patch-libs_bdbobj_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_bdbobj_Makefile_in 1 Jun 2014 16:34:45 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libs/bdbobj/Makefile.in.orig Sun Aug 25 20:52:35 2013
++++ libs/bdbobj/Makefile.in Fri Oct 4 15:11:24 2013
+@@ -123,7 +123,7 @@ am__objects_2 = testbdb.$(OBJEXT)
+ testbdb_OBJECTS = $(am_testbdb_OBJECTS)
+ testbdb_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(testbdb_LDFLAGS) $(LDFLAGS) -o $@
++ $(CXXFLAGS) $(LDFLAGS) -o $@
+ SCRIPTS = $(noinst_SCRIPTS)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
Index: patches/patch-libs_imap_imapd-ssl_dist_in
===================================================================
RCS file: patches/patch-libs_imap_imapd-ssl_dist_in
diff -N patches/patch-libs_imap_imapd-ssl_dist_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_imap_imapd-ssl_dist_in 1 Jun 2014 16:34:45 -0000
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- libs/imap/imapd-ssl.dist.in.orig Mon Nov 11 03:56:33 2013
++++ libs/imap/imapd-ssl.dist.in Sun Jun 1 17:41:04 2014
+@@ -72,13 +72,13 @@ SSLLOGGEROPTS="-name=imapd-ssl"
+ #
+ # Whether or not to start IMAP over SSL on simap port:
+
+-IMAPDSSLSTART=NO
++IMAPDSSLSTART=YES
+
+ ##NAME: IMAPDSTARTTLS:0
+ #
+ # Whether or not to implement IMAP STARTTLS extension instead:
+
+-IMAPDSTARTTLS=YES
++IMAPDSTARTTLS=NO
+
+ ##NAME: IMAP_TLS_REQUIRED:1
+ #
+@@ -293,8 +293,8 @@ TLS_VERIFYPEER=NONE
+ # problems with SSL clients. Disable SSL caching by commenting out the
+ # following settings:
+
+-TLS_CACHEFILE=@localstatedir@/couriersslcache
+-TLS_CACHESIZE=524288
++# TLS_CACHEFILE=@localstatedir@/couriersslcache
++# TLS_CACHESIZE=524288
+
+ ##NAME: MAILDIRPATH:0
+ #
Index: patches/patch-libs_imap_pop3d-ssl_dist_in
===================================================================
RCS file: patches/patch-libs_imap_pop3d-ssl_dist_in
diff -N patches/patch-libs_imap_pop3d-ssl_dist_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_imap_pop3d-ssl_dist_in 1 Jun 2014 16:34:45 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- libs/imap/pop3d-ssl.dist.in.orig Mon Nov 11 03:56:33 2013
++++ libs/imap/pop3d-ssl.dist.in Sun Jun 1 17:41:04 2014
+@@ -256,8 +256,8 @@ TLS_VERIFYPEER=NONE
+ # problems with SSL clients. Disable SSL caching by commenting out the
+ # following settings:
+
+-TLS_CACHEFILE=@localstatedir@/couriersslcache
+-TLS_CACHESIZE=524288
++# TLS_CACHEFILE=@localstatedir@/couriersslcache
++# TLS_CACHESIZE=524288
+
+ ##NAME: MAILDIRPATH:0
+ #
Index: patches/patch-libs_liblock_locktest_c
===================================================================
RCS file: patches/patch-libs_liblock_locktest_c
diff -N patches/patch-libs_liblock_locktest_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_liblock_locktest_c 1 Jun 2014 16:34:45 -0000
@@ -0,0 +1,82 @@
+$OpenBSD$
+--- libs/liblock/locktest.c.orig Sun Aug 25 20:52:10 2013
++++ libs/liblock/locktest.c Fri Oct 4 15:13:39 2013
+@@ -5,6 +5,7 @@
+
+ /* $Id */
+
++#include <paths.h>
+ #include "liblock.h"
+ #if USE_FCNTL
+ #include "lockfcntl.c"
+@@ -20,11 +21,23 @@
+
+ int main()
+ {
++#define FILENAME "courier-imap.locktest.XXXXXXXXXX"
+ int fd[2];
+ pid_t p;
+ int s;
+ int f;
+
++ char *name;
++ const char *tmpdir;
++ if ((tmpdir = (char *)getenv("TMPDIR")) == NULL)
++ tmpdir = _PATH_TMP;
++ (void)asprintf(&name, "%s%s%s", tmpdir,
++ (tmpdir[strlen(tmpdir) - 1] == '/') ? "" : "/", FILENAME);
++ if (name == NULL) {
++ perror("get filename");
++ exit(1);
++ }
++
+ signal(SIGCHLD, SIG_DFL);
+ if (pipe(fd))
+ {
+@@ -32,6 +45,12 @@ int f;
+ return (1);
+ }
+
++ if ((f=mkstemp(name)) < 0)
++ {
++ perror("open");
++ exit(1);
++ }
++
+ if ((p=fork()) == (pid_t)-1)
+ {
+ perror("fork");
+@@ -46,7 +65,7 @@ int f;
+ read(fd[0], &c, 1);
+ close(fd[0]);
+
+- if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
++ if ((f=open(name, O_RDWR)) < 0)
+ {
+ perror("open");
+ exit(1);
+@@ -56,22 +75,18 @@ int f;
+ if (ll_lockfd(f, ll_writelock, 0, 0))
+ {
+ close(f);
++ unlink(name);
+ exit(0);
+ }
+ close(f);
+ exit(1);
+ }
+-
+- if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
+- {
+- perror("open");
+- exit(1);
+- }
+
+ if (ll_lockfd(f, ll_writelock, 0, 0))
+ {
+ perror("lock");
+ close(f);
++ unlink(name);
+ exit(1);
+ }
+ close(fd[1]);
Index: patches/patch-libs_maildir_Makefile_in
===================================================================
RCS file: patches/patch-libs_maildir_Makefile_in
diff -N patches/patch-libs_maildir_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_maildir_Makefile_in 1 Jun 2014 16:34:45 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libs/maildir/Makefile.in.orig Sun Jun 1 18:22:24 2014
++++ libs/maildir/Makefile.in Sun Jun 1 18:24:01 2014
+@@ -574,7 +574,7 @@ clean-noinstLTLIBRARIES:
+ }
+
+ libmaildir.la: $(libmaildir_la_OBJECTS) $(libmaildir_la_DEPENDENCIES)
$(EXTRA_libmaildir_la_DEPENDENCIES)
+- $(AM_V_CXXLD)$(CXXLINK) $(libmaildir_la_OBJECTS)
$(libmaildir_la_LIBADD) $(LIBS)
++ $(AM_V_CXXLD)$(CXXLINK) $(libmaildir_la_OBJECTS)
$(libmaildir_la_LIBADD) $(LIBS) $(LIBPCRE)
+
+ clean-noinstPROGRAMS:
+ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
Index: patches/patch-libs_maildir_configure
===================================================================
RCS file: patches/patch-libs_maildir_configure
diff -N patches/patch-libs_maildir_configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_maildir_configure 1 Jun 2014 16:34:45 -0000
@@ -0,0 +1,55 @@
+$OpenBSD$
+--- libs/maildir/configure.orig Sun Aug 25 20:53:34 2013
++++ libs/maildir/configure Sun Jun 1 18:11:15 2014
+@@ -16396,7 +16396,7 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+
+ fi
+
+-for ac_header in sys/stat.h sys/wait.h fcntl.h unistd.h sysexits.h utime.h
pcre.h pcre/pcre.h
++for ac_header in sys/stat.h sys/wait.h fcntl.h unistd.h sysexits.h utime.h
pcre.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header"
"$ac_includes_default"
+@@ -16416,16 +16416,6 @@ if test "x$ac_cv_header_pcre_h" = xyes; then :
+ fi
+
+
+-
+-ac_fn_c_check_header_mongrel "$LINENO" "pcre/pcre.h"
"ac_cv_header_pcre_pcre_h" "$ac_includes_default"
+-if test "x$ac_cv_header_pcre_pcre_h" = xyes; then :
+- LIBPCRE=-lpcre
+-fi
+-
+-
+-
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is
POSIX.1 compatible" >&5
+ $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
+ if ${ac_cv_header_sys_wait_h+:} false; then :
+@@ -16890,7 +16880,7 @@ if ${ac_cv_lib_fam_FAMOpen+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lfam $LIBS"
++LIBS="$LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -16925,7 +16915,7 @@ if test "x$ac_cv_lib_fam_FAMOpen" = xyes; then :
+ LIBFAM=-lfam
+
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_FAM 1
++#define HAVE_FAM 0
+ _ACEOF
+
+
+@@ -16955,7 +16945,6 @@ fi
+
+
+
+-echo "$LIBFAM" >maildir.libdeps
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for missing gethostname
prototype" >&5
+ $as_echo_n "checking for missing gethostname prototype... " >&6; }
Index: patches/patch-libs_tcpd_libcouriertls_c
===================================================================
RCS file: patches/patch-libs_tcpd_libcouriertls_c
diff -N patches/patch-libs_tcpd_libcouriertls_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_tcpd_libcouriertls_c 1 Jun 2014 16:34:45 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libs/tcpd/libcouriertls.c.orig Mon Nov 11 03:56:33 2013
++++ libs/tcpd/libcouriertls.c Sun Jun 1 17:41:05 2014
+@@ -806,7 +806,7 @@ static int get_func(void *rec, size_t recsize,
+ time_t timeout;
+ size_t session_id_len;
+
+- unsigned char *sess;
++ const unsigned char *sess;
+
+ if (recsize < sizeof(timeout)+sizeof(session_id_len))
+ return (0);
Index: patches/patch-maildir_configure
===================================================================
RCS file: patches/patch-maildir_configure
diff -N patches/patch-maildir_configure
--- patches/patch-maildir_configure 18 Oct 2012 08:06:27 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-maildir_configure,v 1.4 2012/10/18 08:06:27 giovanni Exp $
---- maildir/configure.orig Sun Jun 3 04:15:18 2012
-+++ maildir/configure Sat Sep 22 11:48:05 2012
-@@ -16802,7 +16802,7 @@ if ${ac_cv_lib_fam_FAMOpen+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lfam $LIBS"
-+LIBS="$LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -16837,7 +16837,7 @@ if test "x$ac_cv_lib_fam_FAMOpen" = xyes; then :
- LIBFAM=-lfam
-
- cat >>confdefs.h <<_ACEOF
--#define HAVE_FAM 1
-+#define HAVE_FAM 0
- _ACEOF
-
-
-@@ -16867,7 +16867,6 @@ fi
-
-
-
--echo "$LIBFAM" >maildir.libdeps
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for missing gethostname
prototype" >&5
- $as_echo_n "checking for missing gethostname prototype... " >&6; }
Index: patches/patch-tcpd_libcouriertls_c
===================================================================
RCS file: patches/patch-tcpd_libcouriertls_c
diff -N patches/patch-tcpd_libcouriertls_c
--- patches/patch-tcpd_libcouriertls_c 28 Oct 2009 14:20:19 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tcpd_libcouriertls_c,v 1.2 2009/10/28 14:20:19 giovanni Exp $
---- tcpd/libcouriertls.c.orig Sun Jul 13 16:27:33 2008
-+++ tcpd/libcouriertls.c Mon Jun 15 15:25:07 2009
-@@ -814,7 +814,7 @@ static int get_func(void *rec, size_t recsize,
- time_t timeout;
- size_t session_id_len;
-
-- unsigned char *sess;
-+ const unsigned char *sess;
-
- if (recsize < sizeof(timeout)+sizeof(session_id_len))
- return (0);
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/courier-imap/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST-main
--- pkg/PLIST-main 28 Apr 2012 11:06:12 -0000 1.9
+++ pkg/PLIST-main 1 Jun 2014 16:34:45 -0000
@@ -22,8 +22,10 @@ libexec/imapd.rc
@man man/man1/maildirmake.1
@man man/man8/deliverquota.8
@man man/man8/imapd.8
+@man man/man8/mkdhparams.8
@man man/man8/mkimapdcert.8
@bin sbin/imaplogin
+sbin/mkdhparams
sbin/mkimapdcert
sbin/sharedindexinstall
sbin/sharedindexsplit
