On 03/03/16 21:00, Stuart Henderson wrote:
How about putting them in /usr/local/libexec/maildrop and
/usr/local/libexec/courier-imap?
maildrop upstream prefix is /usr/local, courier-imap upstream prefix is
/usr/lib/courier-imap, what about moving only courier-imap ? This way you do
not have to change postfix/master.cf or smtpd.conf(5).
Slightly tested diff attached.
Cheers & Thanks
Giovanni
On 3 March 2016 17:21:29 GMT+00:00, Giovanni Bechis <[email protected]> wrote:
Hi,
in latest Courier-* versions, makedat(1) is installed by both programs;
atm is @commented in PLIST-main in courier-imap;
makeimapaccess(1) in courier-imap uses makedat to create its database,
for now, as a workaround, you can install maildrop package.
I asked upstream and they reply that we should install maildrop and
courier-imap in different $prefixes.
Other possibilities ? Maybe rename makedat(1) in makedat.maildrop(1) or
something like that ?
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 4 Mar 2016 08:32:33 -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
@@ -32,6 +32,8 @@ CONFIGURE_STYLE= autoconf automake
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.15
+COURIER_PREFIX= ${PREFIX}/libexec/courier-imap
+COURIER_TRUEPREFIX= ${TRUEPREFIX}/libexec/courier-imap
# AM_PROG_LIBTOOL, aclocal is run during build
BUILD_DEPENDS += devel/libtool
@@ -49,10 +51,12 @@ LIB_DEPENDS= mail/courier-authlib \
EXAMPLE_DIR= ${PREFIX}/share/examples/courier
SYSCONFDIR= /etc/courier
-CONFIGURE_ARGS= --sbindir=${PREFIX}/sbin \
- --datadir=${PREFIX}/sbin \
- --prefix=${PREFIX} \
- --bindir=${PREFIX}/bin \
+CONFIGURE_ARGS= --sbindir=${COURIER_PREFIX}/sbin \
+ --datadir=${COURIER_PREFIX}/sbin \
+ --prefix=${COURIER_PREFIX} \
+ --bindir=${COURIER_PREFIX}/bin \
+ --libdir=${COURIER_PREFIX}/lib \
+ --libexecdir=${COURIER_PREFIX}/libexec \
--mandir=${PREFIX}/man \
--enable-static \
--disable-root-check \
@@ -62,7 +66,7 @@ CONFIGURE_ARGS= --sbindir=${PREFIX}/sbi
--with-locking-method=fcntl \
--with-mailuser=_courier \
--with-piddir=${BASELOCALSTATEDIR}/run/courier \
- --with-makedatprog=${TRUEPREFIX}/libexec/makedat \
+ --with-makedatprog=${COURIER_TRUEPREFIX}/libexec/makedat \
--with-db=gdbm \
--with-certsdir=/etc/ssl \
--cache-file=${WRKDIR}/courier-imap.cache
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 4 Mar 2016 08:45:24 -0000
@@ -5,18 +5,27 @@
@newgroup _courier:571
@newuser _courier:571:571:daemon:Courier Mail Server:/var/empty:/sbin/nologin
@extraunexec rm -rf ${SYSCONFDIR}/*
-@bin bin/couriertls
-@bin bin/deliverquota
-@bin bin/imapd
-@bin bin/maildiracl
-@bin bin/maildirkw
-@bin bin/maildirmake
-@comment bin/makedat
-bin/makeimapaccess
-@bin libexec/couriertcpd
-libexec/imapd-ssl.rc
-libexec/imapd.rc
-@bin libexec/makedatprog
+libexec/courier-imap/
+libexec/courier-imap/bin/
+@bin libexec/courier-imap/bin/couriertls
+@bin libexec/courier-imap/bin/deliverquota
+@bin libexec/courier-imap/bin/imapd
+@bin libexec/courier-imap/bin/maildiracl
+@bin libexec/courier-imap/bin/maildirkw
+@bin libexec/courier-imap/bin/maildirmake
+libexec/courier-imap/bin/makedat
+libexec/courier-imap/bin/makeimapaccess
+libexec/courier-imap/libexec/
+@bin libexec/courier-imap/libexec/couriertcpd
+libexec/courier-imap/libexec/imapd-ssl.rc
+libexec/courier-imap/libexec/imapd.rc
+@bin libexec/courier-imap/libexec/makedatprog
+libexec/courier-imap/sbin/
+@bin libexec/courier-imap/sbin/imaplogin
+libexec/courier-imap/sbin/mkdhparams
+libexec/courier-imap/sbin/mkimapdcert
+libexec/courier-imap/sbin/sharedindexinstall
+libexec/courier-imap/sbin/sharedindexsplit
@man man/man1/couriertcpd.1
@man man/man1/maildiracl.1
@man man/man1/maildirkw.1
@@ -26,11 +35,6 @@ libexec/imapd.rc
@man man/man8/makeimapaccess.8
@man man/man8/mkdhparams.8
@man man/man8/mkimapdcert.8
-@bin sbin/imaplogin
-sbin/mkdhparams
-sbin/mkimapdcert
-sbin/sharedindexinstall
-sbin/sharedindexsplit
share/doc/courier/
share/doc/courier/AUTHORS
share/doc/courier/ChangeLog
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 4 Mar 2016 08:45:47 -0000
@@ -6,12 +6,12 @@
@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
+@bin libexec/courier-imap/bin/pop3d
+libexec/courier-imap/libexec/pop3d-ssl.rc
+libexec/courier-imap/libexec/pop3d.rc
+libexec/courier-imap/sbin/mkpop3dcert
+@bin libexec/courier-imap/sbin/pop3login
@man man/man8/mkpop3dcert.8
-sbin/mkpop3dcert
-@bin sbin/pop3login
@mode 600
share/examples/courier/pop3d-ssl.dist
@sample ${SYSCONFDIR}/pop3d-ssl
Index: pkg/courier_imap.rc
===================================================================
RCS file: /var/cvs/ports/mail/courier-imap/pkg/courier_imap.rc,v
retrieving revision 1.6
diff -u -p -r1.6 courier_imap.rc
--- pkg/courier_imap.rc 15 Jul 2015 21:14:06 -0000 1.6
+++ pkg/courier_imap.rc 4 Mar 2016 09:32:58 -0000
@@ -2,7 +2,7 @@
#
# $OpenBSD: courier_imap.rc,v 1.6 2015/07/15 21:14:06 ajacoutot Exp $
-daemon="${TRUEPREFIX}/libexec/imapd.rc"
+daemon="${TRUEPREFIX}/libexec/courier-imap/libexec/imapd.rc"
. /etc/rc.d/rc.subr
Index: pkg/courier_imap_ssl.rc
===================================================================
RCS file: /var/cvs/ports/mail/courier-imap/pkg/courier_imap_ssl.rc,v
retrieving revision 1.2
diff -u -p -r1.2 courier_imap_ssl.rc
--- pkg/courier_imap_ssl.rc 15 Jul 2015 21:14:06 -0000 1.2
+++ pkg/courier_imap_ssl.rc 4 Mar 2016 09:33:08 -0000
@@ -2,7 +2,7 @@
#
# $OpenBSD: courier_imap_ssl.rc,v 1.2 2015/07/15 21:14:06 ajacoutot Exp $
-daemon="${TRUEPREFIX}/libexec/imapd-ssl.rc"
+daemon="${TRUEPREFIX}/libexec/courier-imap/libexec/imapd-ssl.rc"
. /etc/rc.d/rc.subr
Index: pkg/courier_pop3.rc
===================================================================
RCS file: /var/cvs/ports/mail/courier-imap/pkg/courier_pop3.rc,v
retrieving revision 1.6
diff -u -p -r1.6 courier_pop3.rc
--- pkg/courier_pop3.rc 15 Jul 2015 21:14:06 -0000 1.6
+++ pkg/courier_pop3.rc 4 Mar 2016 09:33:19 -0000
@@ -2,7 +2,7 @@
#
# $OpenBSD: courier_pop3.rc,v 1.6 2015/07/15 21:14:06 ajacoutot Exp $
-daemon="${TRUEPREFIX}/libexec/pop3d.rc"
+daemon="${TRUEPREFIX}/libexec/courier-imap/libexec/pop3d.rc"
. /etc/rc.d/rc.subr
Index: pkg/courier_pop3_ssl.rc
===================================================================
RCS file: /var/cvs/ports/mail/courier-imap/pkg/courier_pop3_ssl.rc,v
retrieving revision 1.2
diff -u -p -r1.2 courier_pop3_ssl.rc
--- pkg/courier_pop3_ssl.rc 15 Jul 2015 21:14:06 -0000 1.2
+++ pkg/courier_pop3_ssl.rc 4 Mar 2016 09:33:31 -0000
@@ -2,7 +2,7 @@
#
# $OpenBSD: courier_pop3_ssl.rc,v 1.2 2015/07/15 21:14:06 ajacoutot Exp $
-daemon="${TRUEPREFIX}/libexec/pop3d-ssl.rc"
+daemon="${TRUEPREFIX}/libexec/courier-imap/libexec/pop3d-ssl.rc"
. /etc/rc.d/rc.subr
