On Thu, Mar 03, 2016 at 08:00:40PM +0000, Stuart Henderson wrote:
> How about putting them in /usr/local/libexec/maildrop and
> /usr/local/libexec/courier-imap?
>
and what about this one, at least for the moment ?
I will think about a better solution if the problem will become worse with
future releases.
Plus remove an @extraunexec line that should not be there.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/mail/courier-imap/Makefile,v
retrieving revision 1.104
diff -u -p -r1.104 Makefile
--- Makefile 25 Jan 2016 14:35:46 -0000 1.104
+++ Makefile 6 Mar 2016 22:12:58 -0000
@@ -6,7 +6,7 @@ COMMENT-pop3= pop3 server for maildir f
V= 4.16.2
DISTNAME= courier-imap-${V}
PKGNAME-main= ${DISTNAME}
-REVISION= 1
+REVISION= 2
FULLPKGNAME-pop3= courier-pop3-${V}
FULLPKGPATH-pop3= mail/courier-imap,-pop3
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 6 Mar 2016 22:43:20 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- Makefile.in.orig Sun Mar 6 23:42:27 2016
++++ Makefile.in Sun Mar 6 23:43:12 2016
+@@ -406,10 +406,10 @@ CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_
+ databindir = $(datadir)
+ databin_SCRIPTS = mkimapdcert mkpop3dcert mkdhparams
+ binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw \
+- makeimapaccess makedat
++ makeimapaccess
+
+ sbinPROGRAMS = imaplogin pop3login
+-libexecPROGRAMS = makedatprog couriertcpd
++libexecPROGRAMS = makedat makedatprog couriertcpd
+ bin_PROGRAMS = @binPROGRAMS_exec@
+ sbin_PROGRAMS = @sbinPROGRAMS_exec@
+ libexec_PROGRAMS = @libexecPROGRAMS_exec@
Index: patches/patch-libs_bdbobj_Makefile_in
===================================================================
RCS file:
/var/cvs/ports/mail/courier-imap/patches/patch-libs_bdbobj_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-libs_bdbobj_Makefile_in
--- patches/patch-libs_bdbobj_Makefile_in 28 Apr 2015 07:20:02 -0000
1.2
+++ patches/patch-libs_bdbobj_Makefile_in 6 Mar 2016 22:15:25 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libs_bdbobj_Makefile_in,v 1.2 2015/04/28 07:20:02 giovanni Exp
$
---- libs/bdbobj/Makefile.in.orig Sat Dec 13 15:20:58 2014
-+++ libs/bdbobj/Makefile.in Sat Apr 4 23:23:25 2015
-@@ -124,7 +124,7 @@ am__objects_2 = testbdb.$(OBJEXT)
+--- libs/bdbobj/Makefile.in.orig Sat Jun 6 16:45:18 2015
++++ libs/bdbobj/Makefile.in Sun Mar 6 23:13:09 2016
+@@ -126,7 +126,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) \
Index: patches/patch-libs_maildir_Makefile_in
===================================================================
RCS file:
/var/cvs/ports/mail/courier-imap/patches/patch-libs_maildir_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-libs_maildir_Makefile_in
--- patches/patch-libs_maildir_Makefile_in 28 Apr 2015 07:20:02 -0000
1.2
+++ patches/patch-libs_maildir_Makefile_in 6 Mar 2016 22:15:19 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libs_maildir_Makefile_in,v 1.2 2015/04/28 07:20:02 giovanni
Exp $
---- libs/maildir/Makefile.in.orig Sat Dec 13 15:21:33 2014
-+++ libs/maildir/Makefile.in Sat Apr 4 23:23:25 2015
-@@ -575,7 +575,7 @@ clean-noinstLTLIBRARIES:
+--- libs/maildir/Makefile.in.orig Sat Jun 6 16:45:55 2015
++++ libs/maildir/Makefile.in Sun Mar 6 23:13:09 2016
+@@ -585,7 +585,7 @@ clean-noinstLTLIBRARIES:
}
libmaildir.la: $(libmaildir_la_OBJECTS) $(libmaildir_la_DEPENDENCIES)
$(EXTRA_libmaildir_la_DEPENDENCIES)
Index: patches/patch-libs_maildir_configure
===================================================================
RCS file:
/var/cvs/ports/mail/courier-imap/patches/patch-libs_maildir_configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-libs_maildir_configure
--- patches/patch-libs_maildir_configure 28 Apr 2015 07:20:02 -0000
1.2
+++ patches/patch-libs_maildir_configure 6 Mar 2016 22:15:19 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libs_maildir_configure,v 1.2 2015/04/28 07:20:02 giovanni Exp $
---- libs/maildir/configure.orig Sat Dec 13 15:21:34 2014
-+++ libs/maildir/configure Sat Apr 4 23:23:26 2015
-@@ -16561,7 +16561,7 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+--- libs/maildir/configure.orig Sat Jun 6 16:45:56 2015
++++ libs/maildir/configure Sun Mar 6 23:13:09 2016
+@@ -16562,7 +16562,7 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
fi
@@ -10,7 +10,7 @@ $OpenBSD: patch-libs_maildir_configure,v
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"
-@@ -16581,16 +16581,6 @@ if test "x$ac_cv_header_pcre_h" = xyes; then :
+@@ -16582,16 +16582,6 @@ if test "x$ac_cv_header_pcre_h" = xyes; then :
fi
@@ -27,7 +27,7 @@ $OpenBSD: patch-libs_maildir_configure,v
{ $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 :
-@@ -17055,7 +17045,7 @@ if ${ac_cv_lib_fam_FAMOpen+:} false; then :
+@@ -17056,7 +17046,7 @@ if ${ac_cv_lib_fam_FAMOpen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -36,7 +36,7 @@ $OpenBSD: patch-libs_maildir_configure,v
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -17090,7 +17080,7 @@ if test "x$ac_cv_lib_fam_FAMOpen" = xyes; then :
+@@ -17091,7 +17081,7 @@ if test "x$ac_cv_lib_fam_FAMOpen" = xyes; then :
LIBFAM=-lfam
cat >>confdefs.h <<_ACEOF
@@ -45,7 +45,7 @@ $OpenBSD: patch-libs_maildir_configure,v
_ACEOF
-@@ -17120,7 +17110,6 @@ fi
+@@ -17121,7 +17111,6 @@ fi
Index: patches/patch-makeimapaccess_in
===================================================================
RCS file: patches/patch-makeimapaccess_in
diff -N patches/patch-makeimapaccess_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-makeimapaccess_in 6 Mar 2016 22:15:19 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- makeimapaccess.in.orig Sun Mar 6 23:14:53 2016
++++ makeimapaccess.in Sun Mar 6 23:15:12 2016
+@@ -15,7 +15,7 @@ libexecdir="@libexecdir@"
+ . ${sysconfdir}/imapd-ssl
+
+ umask 022
+-${bindir}/makedat \
++${libexecdir}/makedat \
+ -src=${IMAPACCESSFILE} \
+ -file=${IMAPACCESSFILE}.dat \
+ -tmp=${IMAPACCESSFILE}.tmp -cidr || exit 1
Index: pkg/PLIST-main
===================================================================
RCS file: /var/cvs/ports/mail/courier-imap/pkg/PLIST-main,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST-main
--- pkg/PLIST-main 25 Jan 2016 14:35:46 -0000 1.13
+++ pkg/PLIST-main 6 Mar 2016 22:28:16 -0000
@@ -11,11 +11,11 @@
@bin bin/maildiracl
@bin bin/maildirkw
@bin bin/maildirmake
-@comment bin/makedat
bin/makeimapaccess
@bin libexec/couriertcpd
libexec/imapd-ssl.rc
libexec/imapd.rc
+libexec/makedat
@bin libexec/makedatprog
@man man/man1/couriertcpd.1
@man man/man1/maildiracl.1
Index: pkg/PLIST-pop3
===================================================================
RCS file: /var/cvs/ports/mail/courier-imap/pkg/PLIST-pop3,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST-pop3
--- pkg/PLIST-pop3 28 Apr 2012 11:06:12 -0000 1.12
+++ pkg/PLIST-pop3 6 Mar 2016 22:27:26 -0000
@@ -5,7 +5,6 @@
@newgroup _courier:571
@newuser _courier:571:571:daemon:Courier Mail Server:/var/empty:/sbin/nologin
@extraunexec rm -rf ${SYSCONFDIR}/*
-@extraunexec rm -rf ${LOCALSTATEDIR}/*
@bin bin/pop3d
libexec/pop3d-ssl.rc
libexec/pop3d.rc
