Mon Feb 12 21:36:09 2024 UTC (104d)
Update Courier-IMAP to 5.2.6

Changes since 4.10.0: Too many to list here (4.10.0 was released in 2011).
The full changelog can be found here:
https://sourceforge.net/p/courier/courier-libs.git/ci/b7f06ca767a6f7c03a9d24e49f659c3a23238c7a/tree/imap/ChangeLog

Note that the Maildir unicode format has changed in the 5.0 release. See
mail/courier-maildir/MESSAGE.UTF8 for details.


(hans)
diff -r1.92 -r1.93 pkgsrc/mail/courier-imap/Makefile
diff -r1.19 -r1.20 pkgsrc/mail/courier-imap/PLIST
diff -r1.30 -r1.31 pkgsrc/mail/courier-imap/distinfo
diff -r1.3 -r1.4 pkgsrc/mail/courier-imap/options.mk
diff -r1.15 -r1.16 pkgsrc/mail/courier-imap/patches/patch-aa
diff -r1.4 -r1.5 pkgsrc/mail/courier-imap/patches/patch-ak
diff -r1.2 -r1.3 pkgsrc/mail/courier-imap/patches/patch-ao
diff -r0 -r1.1 pkgsrc/mail/courier-imap/patches/patch-makeimapaccess
cvs diff -r1.92 -r1.93 pkgsrc/mail/courier-imap/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/courier-imap/Makefile 2022/06/28 11:34:19 1.92
+++ pkgsrc/mail/courier-imap/Makefile 2024/02/12 21:36:08 1.93
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile,v 1.92 2022/06/28 11:34:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.93 2024/02/12 21:36:08 hans Exp $
2 2
3DISTNAME= courier-imap-4.10.0 3DISTNAME= courier-imap-5.2.6
4PKGREVISION= 12 4PKGREVISION=
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} 
7EXTRACT_SUFX= .tar.bz2 
8 6
9MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= IMAP server for access to maildir-style mailboxes 8COMMENT= IMAP server for access to maildir-style mailboxes
11HOMEPAGE= https://www.courier-mta.org/imap/ 9HOMEPAGE= https://www.courier-mta.org/imap/
12 10
13DEPENDS+= courier-maildir>=0.65.0:../../mail/courier-maildir 11DEPENDS+= courier-maildir>=1.3.5:../../mail/courier-maildir
14DEPENDS+= couriertcpd>=0.65.0:../../net/couriertcpd 12DEPENDS+= couriertcpd>=1.3.5:../../net/couriertcpd
15 13
16USE_TOOLS+= env gmake perl 14USE_TOOLS+= env gmake perl
17USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
18USE_LIBTOOL= yes 16USE_LIBTOOL= yes
19 17
 18LIBS.SunOS+= -lnsl
 19
20.include "options.mk" 20.include "options.mk"
21 21
22.include "../../mail/courier-mta/Makefile.common" 22.include "../../mail/courier-mta/Makefile.common"
23 23
24CONFIGURE_ARGS+= --datadir=${DATADIR} 24CONFIGURE_ARGS+= --datadir=${DATADIR}
25CONFIGURE_ARGS+= --libexecdir=${LIBEXECDIR} 25CONFIGURE_ARGS+= --libexecdir=${LIBEXECDIR}
26CONFIGURE_ARGS+= --with-mailuser=${REAL_ROOT_USER} 26CONFIGURE_ARGS+= --with-mailuser=${REAL_ROOT_USER}
27CONFIGURE_ARGS+= --with-piddir=${COURIER_STATEDIR}/tmp 27CONFIGURE_ARGS+= --with-piddir=${COURIER_STATEDIR}/tmp
28CONFIGURE_ARGS+= --program-transform-name='s/\.rc$$//' 28CONFIGURE_ARGS+= --program-transform-name='s/\.rc$$//'
29CONFIGURE_ENV+= CERTTOOL=${COURIER_CERTTOOL:Q} 29CONFIGURE_ENV+= CERTTOOL=${COURIER_CERTTOOL:Q}
30CONFIGURE_ENV+= OPENSSL=${COURIER_OPENSSL:Q} 30CONFIGURE_ENV+= OPENSSL=${COURIER_OPENSSL:Q}
31 31
32# The rfc1035 and tcpd bits are built and installed by net/couriertcpd. 32# The rfc1035 and tcpd bits are built and installed by net/couriertcpd.
@@ -45,32 +45,32 @@ MAKE_DIRS+= ${COURIER_STATEDIR} @@ -45,32 +45,32 @@ MAKE_DIRS+= ${COURIER_STATEDIR}
45MAKE_DIRS_PERMS+= ${COURIER_STATEDIR}/tmp \ 45MAKE_DIRS_PERMS+= ${COURIER_STATEDIR}/tmp \
46 ${COURIER_USER} ${COURIER_GROUP} 0770 46 ${COURIER_USER} ${COURIER_GROUP} 0770
47 47
48.for _file_ in imapd.cnf imapd.dist imapd-ssl.dist \ 48.for _file_ in imapd.cnf imapd.dist imapd-ssl.dist \
49 pop3d.cnf pop3d.dist pop3d-ssl.dist 49 pop3d.cnf pop3d.dist pop3d-ssl.dist
50CONF_FILES_PERMS+= ${EGDIR}/${_file_} \ 50CONF_FILES_PERMS+= ${EGDIR}/${_file_} \
51 ${PKG_SYSCONFDIR}/${_file_:S/.dist$//} \ 51 ${PKG_SYSCONFDIR}/${_file_:S/.dist$//} \
52 ${COURIER_FILE_PERMS} 52 ${COURIER_FILE_PERMS}
53.endfor 53.endfor
54RCD_SCRIPTS= courierimap courierimaps courierpop courierpops 54RCD_SCRIPTS= courierimap courierimaps courierpop courierpops
55SMF_METHODS= courier-imap 55SMF_METHODS= courier-imap
56 56
57SUBST_CLASSES+= courier 57SUBST_CLASSES+= courier
58SUBST_FILES.courier= imap/imapd-ssl.dist.in 58SUBST_FILES.courier= libs/imap/imapd-ssl.dist.in
59SUBST_FILES.courier+= imap/imapd.8.in 59SUBST_FILES.courier+= libs/imap/imapd.8.in
60SUBST_FILES.courier+= imap/imapd.dist.in 60SUBST_FILES.courier+= libs/imap/imapd.dist.in
61SUBST_FILES.courier+= imap/mkpop3dcert.html.in 61SUBST_FILES.courier+= libs/imap/mkpop3dcert.html.in
62SUBST_FILES.courier+= imap/pop3d-ssl.dist.in 62SUBST_FILES.courier+= libs/imap/pop3d-ssl.dist.in
63SUBST_FILES.courier+= imap/pop3d.dist.in 63SUBST_FILES.courier+= libs/imap/pop3d.dist.in
64SUBST_FILES.courier+= imapd-ssl.rc.in 64SUBST_FILES.courier+= imapd-ssl.rc.in
65SUBST_FILES.courier+= imapd.rc.in 65SUBST_FILES.courier+= imapd.rc.in
66SUBST_FILES.courier+= pop3d-ssl.rc.in 66SUBST_FILES.courier+= pop3d-ssl.rc.in
67SUBST_FILES.courier+= pop3d.rc.in 67SUBST_FILES.courier+= pop3d.rc.in
68SUBST_SED.courier= -e "s|^IMAPDSTART=.*|IMAPDSTART=YES|g" 68SUBST_SED.courier= -e "s|^IMAPDSTART=.*|IMAPDSTART=YES|g"
69SUBST_SED.courier+= -e "s|^IMAPDSSLSTART=.*|IMAPDSSLSTART=YES|g" 69SUBST_SED.courier+= -e "s|^IMAPDSSLSTART=.*|IMAPDSSLSTART=YES|g"
70SUBST_SED.courier+= -e "s|^POP3DSTART=.*|POP3DSTART=YES|g" 70SUBST_SED.courier+= -e "s|^POP3DSTART=.*|POP3DSTART=YES|g"
71SUBST_SED.courier+= -e "s|^POP3DSSLSTART=.*|POP3DSSLSTART=YES|g" 71SUBST_SED.courier+= -e "s|^POP3DSSLSTART=.*|POP3DSSLSTART=YES|g"
72SUBST_SED.courier+= -e "s|@mydatadir@|@sysconfdir@|g" 72SUBST_SED.courier+= -e "s|@mydatadir@|@sysconfdir@|g"
73SUBST_SED.courier+= -e "s|@datadir@/imapd.pem|@sysconfdir@/imapd.pem|g" 73SUBST_SED.courier+= -e "s|@datadir@/imapd.pem|@sysconfdir@/imapd.pem|g"
74SUBST_SED.courier+= -e "s|@datadir@/imapd.rand|@sysconfdir@/imapd.rand|g" 74SUBST_SED.courier+= -e "s|@datadir@/imapd.rand|@sysconfdir@/imapd.rand|g"
75SUBST_SED.courier+= -e "s|@datadir@/pop3d.pem|@sysconfdir@/pop3d.pem|g" 75SUBST_SED.courier+= -e "s|@datadir@/pop3d.pem|@sysconfdir@/pop3d.pem|g"
76SUBST_SED.courier+= -e "s|@datadir@/pop3d.rand|@sysconfdir@/pop3d.rand|g" 76SUBST_SED.courier+= -e "s|@datadir@/pop3d.rand|@sysconfdir@/pop3d.rand|g"
@@ -78,24 +78,25 @@ SUBST_SED.courier+= -e "s|@libexecdir@/c @@ -78,24 +78,25 @@ SUBST_SED.courier+= -e "s|@libexecdir@/c
78SUBST_SED.courier+= -e "s|@sbindir@/imaplogin|@libexecdir@/imaplogin|g" 78SUBST_SED.courier+= -e "s|@sbindir@/imaplogin|@libexecdir@/imaplogin|g"
79SUBST_SED.courier+= -e "s|@sbindir@/pop3login|@libexecdir@/courierpop3login|g" 79SUBST_SED.courier+= -e "s|@sbindir@/pop3login|@libexecdir@/courierpop3login|g"
80SUBST_SED.courier+= -e "s|@bindir@/pop3d|@libexecdir@/courierpop3d|g" 80SUBST_SED.courier+= -e "s|@bindir@/pop3d|@libexecdir@/courierpop3d|g"
81SUBST_STAGE.courier= pre-configure 81SUBST_STAGE.courier= pre-configure
82 82
83# configure: Cannot obtain information for user courier: Undefined error: 0 83# configure: Cannot obtain information for user courier: Undefined error: 0
84NOT_FOR_UNPRIVILEGED= yes 84NOT_FOR_UNPRIVILEGED= yes
85 85
86.include "../../security/courier-authlib/buildlink3.mk" 86.include "../../security/courier-authlib/buildlink3.mk"
87 87
88post-install: 88post-install:
89 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 89 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
90 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/imap 90 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/imap
91 ${INSTALL_DATA} ${WRKSRC}/imap/BUGS.html ${DESTDIR}${DOCDIR}/imap 91 ${INSTALL_DATA} ${WRKSRC}/libs/imap/BUGS.html ${DESTDIR}${DOCDIR}/imap
92 ${INSTALL_DATA} ${WRKSRC}/imap/README.html ${DESTDIR}${DOCDIR}/imap 92 ${INSTALL_DATA} ${WRKSRC}/libs/imap/README.proxy.html ${DESTDIR}${DOCDIR}/imap
93 ${INSTALL_DATA} ${WRKSRC}/imap/README.proxy.html ${DESTDIR}${DOCDIR}/imap 93 ${INSTALL_DATA} ${WRKSRC}/libs/imap/courierpop3d.html ${DESTDIR}${DOCDIR}
94 ${INSTALL_DATA} ${WRKSRC}/imap/courierpop3d.html ${DESTDIR}${DOCDIR} 94 ${INSTALL_DATA} ${WRKSRC}/libs/imap/imapd.html ${DESTDIR}${DOCDIR}
95 ${INSTALL_DATA} ${WRKSRC}/imap/imapd.html ${DESTDIR}${DOCDIR} 95 ${INSTALL_DATA} ${WRKSRC}/libs/imap/makeimapaccess.html ${DESTDIR}${DOCDIR}
96 ${INSTALL_DATA} ${WRKSRC}/imap/mkimapdcert.html ${DESTDIR}${DOCDIR} 96 ${INSTALL_DATA} ${WRKSRC}/libs/imap/mkdhparams.html ${DESTDIR}${DOCDIR}
97 ${INSTALL_DATA} ${WRKSRC}/imap/mkpop3dcert.html ${DESTDIR}${DOCDIR} 97 ${INSTALL_DATA} ${WRKSRC}/libs/imap/mkimapdcert.html ${DESTDIR}${DOCDIR}
98 ${INSTALL_DATA} ${WRKSRC}/imap/imapd.pam ${DESTDIR}${EGDIR}/imap.authpam 98 ${INSTALL_DATA} ${WRKSRC}/libs/imap/mkpop3dcert.html ${DESTDIR}${DOCDIR}
99 ${INSTALL_DATA} ${WRKSRC}/imap/pop3d.pam ${DESTDIR}${EGDIR}/pop3.authpam 99 ${INSTALL_DATA} ${WRKSRC}/libs/imap/imapd.pam ${DESTDIR}${EGDIR}/imap.authpam
 100 ${INSTALL_DATA} ${WRKSRC}/libs/imap/pop3d.pam ${DESTDIR}${EGDIR}/pop3.authpam
100 101
101.include "../../mk/bsd.pkg.mk" 102.include "../../mk/bsd.pkg.mk"
cvs diff -r1.19 -r1.20 pkgsrc/mail/courier-imap/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/courier-imap/PLIST 2014/03/11 14:05:02 1.19
+++ pkgsrc/mail/courier-imap/PLIST 2024/02/12 21:36:08 1.20
@@ -1,36 +1,42 @@ @@ -1,36 +1,42 @@
1@comment $NetBSD: PLIST,v 1.19 2014/03/11 14:05:02 jperkin Exp $ 1@comment $NetBSD: PLIST,v 1.20 2024/02/12 21:36:08 hans Exp $
2bin/imapd 2bin/imapd
3libexec/courier/courierpop3d 3libexec/courier/courierpop3d
4libexec/courier/courierpop3login 4libexec/courier/courierpop3login
5libexec/courier/imaplogin 5libexec/courier/imaplogin
 6libexec/courier/makedatprog
6man/man8/courierimapd.8 7man/man8/courierimapd.8
7man/man8/courierpop3d.8 8man/man8/courierpop3d.8
8man/man8/mkimapdcert.8 9man/man8/mkimapdcert.8
9man/man8/mkpop3dcert.8 10man/man8/mkpop3dcert.8
10sbin/imapd 11sbin/imapd
11sbin/imapd-ssl 12sbin/imapd-ssl
 13sbin/mkdhparams
12sbin/mkimapdcert 14sbin/mkimapdcert
13sbin/mkpop3dcert 15sbin/mkpop3dcert
14sbin/pop3d 16sbin/pop3d
15sbin/pop3d-ssl 17sbin/pop3d-ssl
16share/courier/imapd-ssl.rc 18share/courier/imapd-ssl.rc
17share/courier/imapd.rc 19share/courier/imapd.rc
 20share/courier/makeimapaccess
 21share/courier/makedat
 22share/courier/mkdhparams
18share/courier/mkimapdcert 23share/courier/mkimapdcert
19share/courier/mkpop3dcert 24share/courier/mkpop3dcert
20share/courier/pop3d-ssl.rc 25share/courier/pop3d-ssl.rc
21share/courier/pop3d.rc 26share/courier/pop3d.rc
22share/doc/courier/courierpop3d.html 27share/doc/courier/courierpop3d.html
23share/doc/courier/imap/BUGS.html 28share/doc/courier/imap/BUGS.html
24share/doc/courier/imap/README.html 
25share/doc/courier/imap/README.proxy.html 29share/doc/courier/imap/README.proxy.html
26share/doc/courier/imapd.html 30share/doc/courier/imapd.html
 31share/doc/courier/makeimapaccess.html
 32share/doc/courier/mkdhparams.html
27share/doc/courier/mkimapdcert.html 33share/doc/courier/mkimapdcert.html
28share/doc/courier/mkpop3dcert.html 34share/doc/courier/mkpop3dcert.html
29share/examples/courier/imap.authpam 35share/examples/courier/imap.authpam
30share/examples/courier/imapd-ssl.dist 36share/examples/courier/imapd-ssl.dist
31share/examples/courier/imapd.cnf 37share/examples/courier/imapd.cnf
32share/examples/courier/imapd.dist 38share/examples/courier/imapd.dist
33share/examples/courier/pop3.authpam 39share/examples/courier/pop3.authpam
34share/examples/courier/pop3d-ssl.dist 40share/examples/courier/pop3d-ssl.dist
35share/examples/courier/pop3d.cnf 41share/examples/courier/pop3d.cnf
36share/examples/courier/pop3d.dist 42share/examples/courier/pop3d.dist
cvs diff -r1.30 -r1.31 pkgsrc/mail/courier-imap/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/courier-imap/distinfo 2021/10/26 10:53:56 1.30
+++ pkgsrc/mail/courier-imap/distinfo 2024/02/12 21:36:08 1.31
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.30 2021/10/26 10:53:56 nia Exp $ 1$NetBSD: distinfo,v 1.31 2024/02/12 21:36:08 hans Exp $
2 2
3BLAKE2s (courier-imap-4.10.0.tar.bz2) = 7b688637f5f8bbeb6aca28817c7249c6a19d644feb83c5fd6f4adfd67171b901 3BLAKE2s (courier-imap-5.2.6.tar.bz2) = 6cb868eaca36847cde3a8e5f0e3f763bb211570f0f7d7ddcad5adb285b24ceb3
4SHA512 (courier-imap-4.10.0.tar.bz2) = 45885ea67356472338f3b6c0e3c1e8679f8a186edcb6c8fab9daf64a6972235f754ec4fd7696258e0537622a10750741d7629066bd1286cef5cae1f095bed7a4 4SHA512 (courier-imap-5.2.6.tar.bz2) = ee48ea5a5e043c3ce13027af2815ca07a1cba7d0ca328f8120ccc7f6134d18c610db202b2820c1dd589a427c1a3d096283c2f3fe9f9bd4815c9586dbe779d904
5Size (courier-imap-4.10.0.tar.bz2) = 3155953 bytes 5Size (courier-imap-5.2.6.tar.bz2) = 3411210 bytes
6SHA1 (patch-aa) = 268f89763de3cd3a02eb5179ca29fbd5478537a2 6SHA1 (patch-aa) = 9a4a8dccb6a741fd3c31d81cc85856792d1e8c59
7SHA1 (patch-ad) = 1091c9a5991c746855db7fc4d3e2e744142b2e3c 7SHA1 (patch-ad) = 1091c9a5991c746855db7fc4d3e2e744142b2e3c
8SHA1 (patch-ae) = 9d925f4639086af9f6faecd6a2fab2a9ecab670c 8SHA1 (patch-ae) = 9d925f4639086af9f6faecd6a2fab2a9ecab670c
9SHA1 (patch-af) = 0fa0e0bd2f1908404f866de9358c74403615967f 9SHA1 (patch-af) = 0fa0e0bd2f1908404f866de9358c74403615967f
10SHA1 (patch-ag) = 6ddd8b3f6a2cfbab4d814b51552dbf364384cf57 10SHA1 (patch-ag) = 6ddd8b3f6a2cfbab4d814b51552dbf364384cf57
11SHA1 (patch-ah) = e81da45833698ff6da23de640efc322ce34cec0d 11SHA1 (patch-ah) = e81da45833698ff6da23de640efc322ce34cec0d
12SHA1 (patch-ak) = 7bb9f11f4b407ca66676875cd5c74697011b0b9a 12SHA1 (patch-ak) = 3e40d53569b08e63bd7ca3876d0772544cd1d202
13SHA1 (patch-ao) = 0734a1adb01c4d071b480589c045334952c70c4b 13SHA1 (patch-ao) = 8797dcc86822d3ef0bcd52ad4f1ea2c8ed23341d
 14SHA1 (patch-makeimapaccess) = d04fce2070cf9cc8db34794846e4b61dec5d3779
cvs diff -r1.3 -r1.4 pkgsrc/mail/courier-imap/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/courier-imap/options.mk 2018/01/10 00:19:48 1.3
+++ pkgsrc/mail/courier-imap/options.mk 2024/02/12 21:36:08 1.4
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: options.mk,v 1.3 2018/01/10 00:19:48 rillig Exp $ 1# $NetBSD: options.mk,v 1.4 2024/02/12 21:36:08 hans Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.courier-imap 3PKG_OPTIONS_VAR= PKG_OPTIONS.courier-imap
4PKG_SUPPORTED_OPTIONS= courier-gnutls fam 4PKG_SUPPORTED_OPTIONS= courier-gnutls fam
5PKG_SUGGESTED_OPTIONS= # empty 5PKG_SUGGESTED_OPTIONS= # empty
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9### 9###
10### Support using the GNU TLS tools for creating certificates; otherwise 10### Support using the GNU TLS tools for creating certificates; otherwise
11### default to using OpenSSL. 11### default to using OpenSSL.
12### 12###
13COURIER_CERTTOOL= ${PREFIX}/bin/certtool 13COURIER_CERTTOOL= ${PREFIX}/bin/certtool
14.if !empty(PKG_OPTIONS:Mcourier-gnutls) 14.if !empty(PKG_OPTIONS:Mcourier-gnutls)
15COURIER_OPENSSL= ${PREFIX}/bin/openssl 15COURIER_OPENSSL= ${PREFIX}/bin/openssl
16.else 16.else
17USE_TOOLS+= openssl:run 17USE_TOOLS+= openssl:run
18COURIER_OPENSSL= ${TOOLS_OPENSSL} 18COURIER_OPENSSL= ${TOOLS_OPENSSL}
19.endif 19.endif
20 20
21SUBST_CLASSES+= tls 21SUBST_CLASSES+= tls
22SUBST_FILES.tls= imap/mkimapdcert.in imap/mkpop3dcert.in 22SUBST_FILES.tls= libs/imap/mkimapdcert.in libs/imap/mkpop3dcert.in
23SUBST_STAGE.tls= pre-configure 23SUBST_STAGE.tls= pre-configure
24.if !empty(PKG_OPTIONS:Mcourier-gnutls) 24.if !empty(PKG_OPTIONS:Mcourier-gnutls)
25SUBST_SED.tls= -e "s|@ssllib@|gnutls|g" 25SUBST_SED.tls= -e "s|@ssllib@|gnutls|g"
26.else 26.else
27SUBST_SED.tls= -e "s|@ssllib@|openssl|g" 27SUBST_SED.tls= -e "s|@ssllib@|openssl|g"
28.endif 28.endif
29 29
30### 30###
31### File Alteration Monitor support. This allows multiple imapd or pop3d 31### File Alteration Monitor support. This allows multiple imapd or pop3d
32### processes to be notified of changes to the underlying maildirs instead 32### processes to be notified of changes to the underlying maildirs instead
33### of needing to poll the maildirs. 33### of needing to poll the maildirs.
34### 34###
35.if !empty(PKG_OPTIONS:Mfam) 35.if !empty(PKG_OPTIONS:Mfam)
cvs diff -r1.15 -r1.16 pkgsrc/mail/courier-imap/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/mail/courier-imap/patches/patch-aa 2010/06/15 23:07:07 1.15
+++ pkgsrc/mail/courier-imap/patches/patch-aa 2024/02/12 21:36:09 1.16
@@ -1,88 +1,107 @@ @@ -1,88 +1,107 @@
1$NetBSD: patch-aa,v 1.15 2010/06/15 23:07:07 pettai Exp $ 1$NetBSD: patch-aa,v 1.16 2024/02/12 21:36:09 hans Exp $
2 2
3--- Makefile.in.orig 2010-05-30 23:20:04.000000000 +0200 3--- Makefile.in.orig 2023-04-25 02:26:35.000000000 +0000
4+++ Makefile.in 2010-06-14 00:25:33.000000000 +0200 4+++ Makefile.in
5@@ -289,9 +289,10 @@ 5@@ -416,19 +416,18 @@ SUBDIRS = libs/numlib libs/bdbobj libs/g
 6 libs/maildir libs/makedat libs/libhmac \
 7 libs/waitlib libs/tcpd libs/rootcerts libs/imap
6  8
7-sbin_SCRIPTS = sharedindexinstall sharedindexsplit 9-sbin_SCRIPTS = sharedindexinstall sharedindexsplit
8+sbin_SCRIPTS =  10+sbin_SCRIPTS =
9 CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS) 11 CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS)
10 databindir = $(datadir) 12 databindir = $(datadir)
11-databin_SCRIPTS = mkimapdcert mkpop3dcert 13-databin_SCRIPTS = mkimapdcert mkpop3dcert mkdhparams
12-binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw 14-binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw \
 15- makeimapaccess makedat
 16-
13-sbinPROGRAMS = imaplogin pop3login 17-sbinPROGRAMS = imaplogin pop3login
14-libexecPROGRAMS = makedatprog couriertcpd 18-libexecPROGRAMS = makedatprog couriertcpd
15+databin_SCRIPTS = mkimapdcert mkpop3dcert \ 19+databin_SCRIPTS = makedat makeimapaccess mkimapdcert mkpop3dcert mkdhparams \
16+ imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc 20+ imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
17+binPROGRAMS = imapd 21+binPROGRAMS = imapd
18+sbinPROGRAMS =  22+sbinPROGRAMS =
19+libexecPROGRAMS = imaplogin courierpop3login courierpop3d 23+libexecPROGRAMS = imaplogin courierpop3login courierpop3d makedatprog
20 bin_PROGRAMS = @binPROGRAMS_exec@ 24 bin_PROGRAMS = @binPROGRAMS_exec@
21@@ -299,3 +300,3 @@ 25 sbin_PROGRAMS = @sbinPROGRAMS_exec@
22 libexec_PROGRAMS = @libexecPROGRAMS_exec@ 26 libexec_PROGRAMS = @libexecPROGRAMS_exec@
23-man_MANS = couriertcpd.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1 27-man_MANS = couriertcpd.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkdhparams.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1 makeimapaccess.8
24+man_MANS = courierimapd.8 courierpop3d.8 mkimapdcert.8 mkpop3dcert.8 28+man_MANS = courierimapd.8 courierpop3d.8 mkimapdcert.8 mkpop3dcert.8
25  29
26@@ -310,5 +311,5 @@ 30 # Copyright 2000 Double Precision, Inc. See COPYING for
 31 # distribution information.
 32@@ -443,9 +442,9 @@ EXTRA_DIST = README README.cygwin COPYIN
 33 packaging/debian/rules packaging/debian/source/format \
 34 sysconftool
27 sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \ 35 sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
28- imapd.cnf pop3d.cnf quotawarnmsg.example 36- imapd.cnf pop3d.cnf quotawarnmsg.example
29+ imapd.cnf pop3d.cnf 37+ imapd.cnf pop3d.cnf
30  38
31-libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc 39-libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
32+libexec_SCRIPTS =  40+libexec_SCRIPTS =
33 HTML2TXT = links -dump -no-numbering -no-references 41 HTML2TXT = elinks -dump -no-numbering -no-references
34@@ -1227,7 +1228,7 @@ 
35  42
36-pop3login$(EXEEXT): imap/pop3login$(EXEEXT) 43 #
37- cp imap/pop3login$(EXEEXT) . 44@@ -1384,11 +1383,11 @@ sharedindexinstall: libs/maildir/sharedi
38+courierpop3login$(EXEEXT): imap/pop3login$(EXEEXT) 45 sharedindexsplit: libs/maildir/sharedindexsplit
39+ cp imap/pop3login$(EXEEXT) ./$@ 46 cp libs/maildir/sharedindexsplit .
40  47
41-pop3d$(EXEEXT): imap/pop3d$(EXEEXT) 48-pop3login: libs/imap/pop3login
42- cp imap/pop3d$(EXEEXT) . 49- cp libs/imap/pop3login .
43+courierpop3d$(EXEEXT): imap/pop3d$(EXEEXT) 50+courierpop3login: libs/imap/pop3login
44+ cp imap/pop3d$(EXEEXT) ./$@ 51+ cp libs/imap/pop3login ./$@
45  52
46@@ -1275,4 +1276,7 @@ 53-pop3d: libs/imap/pop3d
47  54- cp libs/imap/pop3d .
48-imapd.8: imap/imapd.8 55+courierpop3d: libs/imap/pop3d
49- cp imap/imapd.8 . 56+ cp libs/imap/pop3d ./$@
50+courierimapd.8: imap/imapd.8 57
51+ cp imap/imapd.8 ./$@ 58 makedat: libs/makedat/makedat
 59 cp libs/makedat/makedat .
 60@@ -1435,8 +1434,11 @@ maildiracl.1: libs/maildir/maildiracl.1
 61 maildirkw.1: libs/maildir/maildirkw.1
 62 cp $(srcdir)/libs/maildir/maildirkw.1 .
 63
 64-imapd.8: libs/imap/imapd.8
 65- cp libs/imap/imapd.8 .
 66+courierimapd.8: libs/imap/imapd.8
 67+ cp libs/imap/imapd.8 ./$@
52+ 68+
53+courierpop3d.8: imap/courierpop3d.8 69+courierpop3d.8: libs/imap/courierpop3d.8
54+ cp imap/courierpop3d.8 . 70+ cp libs/imap/courierpop3d.8 .
55  71
56@@ -1302,4 +1306,2 @@ 72 mkdhparams: libs/imap/mkdhparams
 73 cp libs/imap/mkdhparams .
 74@@ -1471,22 +1473,16 @@ quotawarnmsg.example: libs/maildir/quota
 75 install-exec-local:
 76 $(mkinstalldirs) $(DESTDIR)$(databindir)
57 $(mkinstalldirs) $(DESTDIR)$(bindir) 77 $(mkinstalldirs) $(DESTDIR)$(bindir)
58- test ! -x tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \ 78- test ! -x libs/tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
59- tcpd/couriertls $(DESTDIR)$(bindir)/couriertls 79- libs/tcpd/couriertls $(DESTDIR)$(bindir)/couriertls
60 $(mkinstalldirs) $(DESTDIR)$(sbindir) 80 $(mkinstalldirs) $(DESTDIR)$(sbindir)
61@@ -1308,2 +1310,5 @@ 81 for f in mkimapdcert mkpop3dcert mkdhparams; \
62 $(LN_S) $(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done 82 do rm -f $(DESTDIR)$(sbindir)/$$f ; \
63+ for f in imapd-ssl imapd pop3d pop3d-ssl ; \ 83 $(LN_S) `realpath --relative-to $(sbindir) -m $(databindir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done
 84+ for f in imapd-ssl imapd pop3d pop3d-ssl; \
64+ do rm -f $(DESTDIR)$(sbindir)/$$f ; \ 85+ do rm -f $(DESTDIR)$(sbindir)/$$f ; \
65+ $(LN_S) $(databindir)/$$f.rc $(DESTDIR)$(sbindir)/$$f ; done 86+ $(LN_S) `realpath --relative-to $(sbindir) -m $(databindir)/$$f.rc` $(DESTDIR)$(sbindir)/$$f ; done
66 $(mkinstalldirs) $(DESTDIR)$(localstatedir) 87 $(mkinstalldirs) $(DESTDIR)$(localstatedir)
67@@ -1311,17 +1316,4 @@ 88
68 install-exec-hook: 89 install-exec-hook:
69- chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example 90- chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example
70- mkdir -p $(DESTDIR)$(sysconfdir)/shared 91- mkdir -p $(DESTDIR)$(sysconfdir)/shared
71- chmod 755 $(DESTDIR)$(sysconfdir)/shared 92- chmod 755 $(DESTDIR)$(sysconfdir)/shared
72- mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp 93- mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
73- chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp 94- chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
 95- mkdir -p $(DESTDIR)$(sysconfdir)/imapaccess
 96- chmod 755 $(DESTDIR)$(sysconfdir)/imapaccess
74  97
75 install-data-local: install-man 98 install-data-local: install-man
76- test -d $(DESTDIR)/etc/pam.d || exit 0 ; \ 
77- test -w $(DESTDIR)/etc/pam.d || exit 0 ; \ 
78- test -f $(DESTDIR)/etc/pam.d/imap || \ 
79- $(INSTALL_DATA) $(srcdir)/imap/imapd.pam \ 
80- $(DESTDIR)/etc/pam.d/imap || exit 1 ;\ 
81- test -f $(DESTDIR)/etc/pam.d/pop3 || \ 
82- $(INSTALL_DATA) $(srcdir)/imap/pop3d.pam \ 
83- $(DESTDIR)/etc/pam.d/pop3 || exit 1 
84 for f in $(man_MANS); do chmod a+r $(DESTDIR)$(mandir)/*/$$f; done 99 for f in $(man_MANS); do chmod a+r $(DESTDIR)$(mandir)/*/$$f; done
85@@ -1332,3 +1324,2 @@ 100@@ -1495,7 +1491,6 @@ install-data-local: install-man
 101 uninstall-local:
 102 for f in mkimapdcert mkpop3dcert mkdhparams; \
86 do rm -f $(DESTDIR)$(sbindir)/$$f ; done 103 do rm -f $(DESTDIR)$(sbindir)/$$f ; done
87- rm -f $(DESTDIR)$(bindir)/couriertls 104- rm -f $(DESTDIR)$(bindir)/couriertls
88  105
 106 dist-hook: courier-imap.spec
 107 test -f $(srcdir)/rpm.release && cp $(srcdir)/rpm.release $(distdir) \
cvs diff -r1.4 -r1.5 pkgsrc/mail/courier-imap/patches/patch-ak (expand / switch to unified diff)

--- pkgsrc/mail/courier-imap/patches/patch-ak 2010/11/10 10:00:06 1.4
+++ pkgsrc/mail/courier-imap/patches/patch-ak 2024/02/12 21:36:09 1.5
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: patch-ak,v 1.4 2010/11/10 10:00:06 adam Exp $ 1$NetBSD: patch-ak,v 1.5 2024/02/12 21:36:09 hans Exp $
2 2
3--- imap/mkimapdcert.in.orig 2010-06-29 01:39:59.000000000 +0000 3--- libs/imap/mkimapdcert.in.orig 2013-11-11 02:56:33.000000000 +0000
4+++ imap/mkimapdcert.in 4+++ libs/imap/mkimapdcert.in
5@@ -9,7 +9,13 @@ 5@@ -8,7 +8,13 @@
6 # IMAP over SSL. Normally this script would get called by an automatic 6 # IMAP over SSL. Normally this script would get called by an automatic
7 # package installation routine. 7 # package installation routine.
8  8
9-if test "@ssllib@" = "openssl" 9-if test "@ssllib@" = "openssl"
10+case "$1" in 10+case "$1" in
11+gnutls) ssllib=gnutls ;; 11+gnutls) ssllib=gnutls ;;
12+openssl) ssllib=openssl ;; 12+openssl) ssllib=openssl ;;
13+*) ssllib="@ssllib@" ;; 13+*) ssllib="@ssllib@" ;;
14+esac 14+esac
15+ 15+
16+if test "$ssllib" = "openssl" 16+if test "$ssllib" = "openssl"
17 then 17 then
18 test -x @OPENSSL@ || exit 0 18 test -x @OPENSSL@ || exit 0
19 else 19 else
20@@ -36,7 +42,7 @@ cleanup() { 20@@ -38,7 +44,7 @@ cleanup() {
21  21
22 cd @certsdir@ 22 cd @certsdir@
23  23
24-if test "@ssllib@" = "openssl" 24-if test "@ssllib@" = "openssl"
25+if test "$ssllib" = "openssl" 25+if test "$ssllib" = "openssl"
26 then 26 then
27 cp /dev/null @certsdir@/imapd.pem 27 cp /dev/null @certsdir@/imapd.pem
28 chmod 600 @certsdir@/imapd.pem 28 chmod 600 @certsdir@/imapd.pem
cvs diff -r1.2 -r1.3 pkgsrc/mail/courier-imap/patches/patch-ao (expand / switch to unified diff)

--- pkgsrc/mail/courier-imap/patches/patch-ao 2010/11/10 10:00:06 1.2
+++ pkgsrc/mail/courier-imap/patches/patch-ao 2024/02/12 21:36:09 1.3
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: patch-ao,v 1.2 2010/11/10 10:00:06 adam Exp $ 1$NetBSD: patch-ao,v 1.3 2024/02/12 21:36:09 hans Exp $
2 2
3--- imap/mkpop3dcert.in.orig 2010-06-29 01:39:59.000000000 +0000 3--- libs/imap/mkpop3dcert.in.orig 2013-11-11 02:56:33.000000000 +0000
4+++ imap/mkpop3dcert.in 4+++ libs/imap/mkpop3dcert.in
5@@ -9,7 +9,13 @@ 5@@ -8,7 +8,13 @@
6 # POP3 over SSL. Normally this script would get called by an automatic 6 # POP3 over SSL. Normally this script would get called by an automatic
7 # package installation routine. 7 # package installation routine.
8  8
9-if test "@ssllib@" = "openssl" 9-if test "@ssllib@" = "openssl"
10+case "$1" in 10+case "$1" in
11+gnutls) ssllib="gnutls" ;; 11+gnutls) ssllib="gnutls" ;;
12+openssl) ssllib="openssl" ;; 12+openssl) ssllib="openssl" ;;
13+*) ssllib="@ssllib@" ;; 13+*) ssllib="@ssllib@" ;;
14+esac 14+esac
15+ 15+
16+if test "$ssllib" = "openssl" 16+if test "$ssllib" = "openssl"
17 then 17 then
18 test -x @OPENSSL@ || exit 0 18 test -x @OPENSSL@ || exit 0
19 else 19 else
20@@ -36,7 +42,7 @@ cleanup() { 20@@ -39,7 +45,7 @@ umask 077
21  21 BITS="$BITS"
22 cd @certsdir@ 22 set -e
23  23
24-if test "@ssllib@" = "openssl" 24-if test "@ssllib@" = "openssl"
25+if test "$ssllib" = "openssl" 25+if test "$ssllib" = "openssl"
26 then 26 then
27 cp /dev/null @certsdir@/pop3d.pem 27 cp /dev/null @certsdir@/pop3d.pem
28 chmod 600 @certsdir@/pop3d.pem 28 chmod 600 @certsdir@/pop3d.pem
File Added: pkgsrc/mail/courier-imap/patches/patch-makeimapaccess
$NetBSD: patch-makeimapaccess,v 1.1 2024/02/12 21:36:09 hans Exp $

--- makeimapaccess.in.orig	2015-02-24 04:17:12.000000000 +0000
+++ makeimapaccess.in
@@ -7,7 +7,7 @@ prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 sysconfdir="@sysconfdir@"
 localstatedir="@localstatedir@"
-bindir="@bindir@"
+datadir="@datadir@"
 sbindir="@sbindir@"
 libexecdir="@libexecdir@"
 
@@ -15,10 +15,10 @@ libexecdir="@libexecdir@"
 . ${sysconfdir}/imapd-ssl
 
 umask 022
-${bindir}/makedat \
+${datadir}/makedat \
 	-src=${IMAPACCESSFILE} \
 	-file=${IMAPACCESSFILE}.dat \
 	-tmp=${IMAPACCESSFILE}.tmp -cidr || exit 1
 
-${libexecdir}/couriertcpd -pid=$PIDFILE -restart
-${libexecdir}/couriertcpd -pid=$SSLPIDFILE -restart
+${sbindir}/couriertcpd -pid=$PIDFILE -restart
+${sbindir}/couriertcpd -pid=$SSLPIDFILE -restart