CVS commit: pkgsrc/mail/courier-imap

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/mail/courier-imap
From: "Hans Rosenfeld" <hans%netbsd.org@localhost>
Date: Mon, 12 Feb 2024 21:36:09 +0000

Module Name:    pkgsrc
Committed By:   hans
Date:           Mon Feb 12 21:36:09 UTC 2024

Modified Files:
        pkgsrc/mail/courier-imap: Makefile PLIST distinfo options.mk
        pkgsrc/mail/courier-imap/patches: patch-aa patch-ak patch-ao
Added Files:
        pkgsrc/mail/courier-imap/patches: patch-makeimapaccess

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/mail/courier-imap/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/mail/courier-imap/PLIST
cvs rdiff -u -r1.30 -r1.31 pkgsrc/mail/courier-imap/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/courier-imap/options.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/courier-imap/patches/patch-aa
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/courier-imap/patches/patch-ak
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/courier-imap/patches/patch-ao
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/courier-imap/patches/patch-makeimapaccess

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/courier-imap/Makefile
diff -u pkgsrc/mail/courier-imap/Makefile:1.92 pkgsrc/mail/courier-imap/Makefile:1.93
--- pkgsrc/mail/courier-imap/Makefile:1.92      Tue Jun 28 11:34:19 2022
+++ pkgsrc/mail/courier-imap/Makefile   Mon Feb 12 21:36:08 2024
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.92 2022/06/28 11:34:19 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2024/02/12 21:36:08 hans Exp $
 
-DISTNAME=      courier-imap-4.10.0
-PKGREVISION=   12
+DISTNAME=      courier-imap-5.2.6
+PKGREVISION=   
 CATEGORIES=    mail
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
-EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       IMAP server for access to maildir-style mailboxes
 HOMEPAGE=      https://www.courier-mta.org/imap/
 
-DEPENDS+=      courier-maildir>=0.65.0:../../mail/courier-maildir
-DEPENDS+=      couriertcpd>=0.65.0:../../net/couriertcpd
+DEPENDS+=      courier-maildir>=1.3.5:../../mail/courier-maildir
+DEPENDS+=      couriertcpd>=1.3.5:../../net/couriertcpd
 
 USE_TOOLS+=            env gmake perl
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 
+LIBS.SunOS+=           -lnsl
+
 .include "options.mk"
 
 .include "../../mail/courier-mta/Makefile.common"
@@ -55,12 +55,12 @@ RCD_SCRIPTS=                courierimap courierimaps c
 SMF_METHODS=           courier-imap
 
 SUBST_CLASSES+=                courier
-SUBST_FILES.courier=   imap/imapd-ssl.dist.in
-SUBST_FILES.courier+=  imap/imapd.8.in
-SUBST_FILES.courier+=  imap/imapd.dist.in
-SUBST_FILES.courier+=  imap/mkpop3dcert.html.in
-SUBST_FILES.courier+=  imap/pop3d-ssl.dist.in
-SUBST_FILES.courier+=  imap/pop3d.dist.in
+SUBST_FILES.courier=   libs/imap/imapd-ssl.dist.in
+SUBST_FILES.courier+=  libs/imap/imapd.8.in
+SUBST_FILES.courier+=  libs/imap/imapd.dist.in
+SUBST_FILES.courier+=  libs/imap/mkpop3dcert.html.in
+SUBST_FILES.courier+=  libs/imap/pop3d-ssl.dist.in
+SUBST_FILES.courier+=  libs/imap/pop3d.dist.in
 SUBST_FILES.courier+=  imapd-ssl.rc.in
 SUBST_FILES.courier+=  imapd.rc.in
 SUBST_FILES.courier+=  pop3d-ssl.rc.in
@@ -88,14 +88,15 @@ NOT_FOR_UNPRIVILEGED=       yes
 post-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
        ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/imap
-       ${INSTALL_DATA} ${WRKSRC}/imap/BUGS.html ${DESTDIR}${DOCDIR}/imap
-       ${INSTALL_DATA} ${WRKSRC}/imap/README.html ${DESTDIR}${DOCDIR}/imap
-       ${INSTALL_DATA} ${WRKSRC}/imap/README.proxy.html ${DESTDIR}${DOCDIR}/imap
-       ${INSTALL_DATA} ${WRKSRC}/imap/courierpop3d.html ${DESTDIR}${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/imap/imapd.html ${DESTDIR}${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/imap/mkimapdcert.html ${DESTDIR}${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/imap/mkpop3dcert.html ${DESTDIR}${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/imap/imapd.pam ${DESTDIR}${EGDIR}/imap.authpam
-       ${INSTALL_DATA} ${WRKSRC}/imap/pop3d.pam ${DESTDIR}${EGDIR}/pop3.authpam
+       ${INSTALL_DATA} ${WRKSRC}/libs/imap/BUGS.html ${DESTDIR}${DOCDIR}/imap
+       ${INSTALL_DATA} ${WRKSRC}/libs/imap/README.proxy.html ${DESTDIR}${DOCDIR}/imap
+       ${INSTALL_DATA} ${WRKSRC}/libs/imap/courierpop3d.html ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/libs/imap/imapd.html ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/libs/imap/makeimapaccess.html ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/libs/imap/mkdhparams.html ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/libs/imap/mkimapdcert.html ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/libs/imap/mkpop3dcert.html ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/libs/imap/imapd.pam ${DESTDIR}${EGDIR}/imap.authpam
+       ${INSTALL_DATA} ${WRKSRC}/libs/imap/pop3d.pam ${DESTDIR}${EGDIR}/pop3.authpam
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/courier-imap/PLIST
diff -u pkgsrc/mail/courier-imap/PLIST:1.19 pkgsrc/mail/courier-imap/PLIST:1.20
--- pkgsrc/mail/courier-imap/PLIST:1.19 Tue Mar 11 14:05:02 2014
+++ pkgsrc/mail/courier-imap/PLIST      Mon Feb 12 21:36:08 2024
@@ -1,29 +1,35 @@
-@comment $NetBSD: PLIST,v 1.19 2014/03/11 14:05:02 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.20 2024/02/12 21:36:08 hans Exp $
 bin/imapd
 libexec/courier/courierpop3d
 libexec/courier/courierpop3login
 libexec/courier/imaplogin
+libexec/courier/makedatprog
 man/man8/courierimapd.8
 man/man8/courierpop3d.8
 man/man8/mkimapdcert.8
 man/man8/mkpop3dcert.8
 sbin/imapd
 sbin/imapd-ssl
+sbin/mkdhparams
 sbin/mkimapdcert
 sbin/mkpop3dcert
 sbin/pop3d
 sbin/pop3d-ssl
 share/courier/imapd-ssl.rc
 share/courier/imapd.rc
+share/courier/makeimapaccess
+share/courier/makedat
+share/courier/mkdhparams
 share/courier/mkimapdcert
 share/courier/mkpop3dcert
 share/courier/pop3d-ssl.rc
 share/courier/pop3d.rc
 share/doc/courier/courierpop3d.html
 share/doc/courier/imap/BUGS.html
-share/doc/courier/imap/README.html
 share/doc/courier/imap/README.proxy.html
 share/doc/courier/imapd.html
+share/doc/courier/makeimapaccess.html
+share/doc/courier/mkdhparams.html
 share/doc/courier/mkimapdcert.html
 share/doc/courier/mkpop3dcert.html
 share/examples/courier/imap.authpam

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

Index: pkgsrc/mail/courier-imap/options.mk
diff -u pkgsrc/mail/courier-imap/options.mk:1.3 pkgsrc/mail/courier-imap/options.mk:1.4
--- pkgsrc/mail/courier-imap/options.mk:1.3     Wed Jan 10 00:19:48 2018
+++ pkgsrc/mail/courier-imap/options.mk Mon Feb 12 21:36:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2018/01/10 00:19:48 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2024/02/12 21:36:08 hans Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.courier-imap
 PKG_SUPPORTED_OPTIONS=         courier-gnutls fam
@@ -19,7 +19,7 @@ COURIER_OPENSSL=      ${TOOLS_OPENSSL}
 .endif
 
 SUBST_CLASSES+=                tls
-SUBST_FILES.tls=       imap/mkimapdcert.in imap/mkpop3dcert.in
+SUBST_FILES.tls=       libs/imap/mkimapdcert.in libs/imap/mkpop3dcert.in
 SUBST_STAGE.tls=       pre-configure
 .if !empty(PKG_OPTIONS:Mcourier-gnutls)
 SUBST_SED.tls=         -e "s|@ssllib@|gnutls|g"

Index: pkgsrc/mail/courier-imap/patches/patch-aa
diff -u pkgsrc/mail/courier-imap/patches/patch-aa:1.15 pkgsrc/mail/courier-imap/patches/patch-aa:1.16
--- pkgsrc/mail/courier-imap/patches/patch-aa:1.15      Tue Jun 15 23:07:07 2010
+++ pkgsrc/mail/courier-imap/patches/patch-aa   Mon Feb 12 21:36:09 2024
@@ -1,88 +1,107 @@
-$NetBSD: patch-aa,v 1.15 2010/06/15 23:07:07 pettai Exp $
+$NetBSD: patch-aa,v 1.16 2024/02/12 21:36:09 hans Exp $
 
---- Makefile.in.orig   2010-05-30 23:20:04.000000000 +0200
-+++ Makefile.in        2010-06-14 00:25:33.000000000 +0200
-@@ -289,9 +289,10 @@
+--- Makefile.in.orig   2023-04-25 02:26:35.000000000 +0000
++++ Makefile.in
+@@ -416,19 +416,18 @@ SUBDIRS = libs/numlib libs/bdbobj libs/g
+       libs/maildir libs/makedat libs/libhmac \
+       libs/waitlib libs/tcpd libs/rootcerts libs/imap
  
 -sbin_SCRIPTS = sharedindexinstall sharedindexsplit
 +sbin_SCRIPTS = 
  CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS)
  databindir = $(datadir)
--databin_SCRIPTS = mkimapdcert mkpop3dcert
--binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw
+-databin_SCRIPTS = mkimapdcert mkpop3dcert mkdhparams
+-binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw \
+-      makeimapaccess makedat
+-
 -sbinPROGRAMS = imaplogin pop3login
 -libexecPROGRAMS = makedatprog couriertcpd
-+databin_SCRIPTS = mkimapdcert mkpop3dcert \
++databin_SCRIPTS = makedat makeimapaccess mkimapdcert mkpop3dcert mkdhparams \
 +      imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
 +binPROGRAMS = imapd
 +sbinPROGRAMS = 
-+libexecPROGRAMS = imaplogin courierpop3login courierpop3d
++libexecPROGRAMS = imaplogin courierpop3login courierpop3d makedatprog
  bin_PROGRAMS = @binPROGRAMS_exec@
-@@ -299,3 +300,3 @@
+ sbin_PROGRAMS = @sbinPROGRAMS_exec@
  libexec_PROGRAMS = @libexecPROGRAMS_exec@
--man_MANS = couriertcpd.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1
+-man_MANS = couriertcpd.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkdhparams.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1 makeimapaccess.8
 +man_MANS = courierimapd.8 courierpop3d.8 mkimapdcert.8 mkpop3dcert.8
  
-@@ -310,5 +311,5 @@
+ # Copyright 2000 Double Precision, Inc.  See COPYING for
+ # distribution information.
+@@ -443,9 +442,9 @@ EXTRA_DIST = README README.cygwin COPYIN
+       packaging/debian/rules packaging/debian/source/format \
+       sysconftool
  sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
 -      imapd.cnf pop3d.cnf quotawarnmsg.example
 +      imapd.cnf pop3d.cnf
  
 -libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
 +libexec_SCRIPTS = 
- HTML2TXT = links -dump -no-numbering -no-references
-@@ -1227,7 +1228,7 @@
+ HTML2TXT = elinks -dump -no-numbering -no-references
  
--pop3login$(EXEEXT): imap/pop3login$(EXEEXT)
--      cp imap/pop3login$(EXEEXT) .
-+courierpop3login$(EXEEXT): imap/pop3login$(EXEEXT)
-+      cp imap/pop3login$(EXEEXT) ./$@
- 
--pop3d$(EXEEXT): imap/pop3d$(EXEEXT)
--      cp imap/pop3d$(EXEEXT) .
-+courierpop3d$(EXEEXT): imap/pop3d$(EXEEXT)
-+      cp imap/pop3d$(EXEEXT) ./$@
- 
-@@ -1275,4 +1276,7 @@
- 
--imapd.8: imap/imapd.8
--      cp imap/imapd.8 .
-+courierimapd.8: imap/imapd.8
-+      cp imap/imapd.8 ./$@
+ #
+@@ -1384,11 +1383,11 @@ sharedindexinstall: libs/maildir/sharedi
+ sharedindexsplit: libs/maildir/sharedindexsplit
+       cp libs/maildir/sharedindexsplit .
+ 
+-pop3login: libs/imap/pop3login
+-      cp libs/imap/pop3login .
++courierpop3login: libs/imap/pop3login
++      cp libs/imap/pop3login ./$@
+ 
+-pop3d: libs/imap/pop3d
+-      cp libs/imap/pop3d .
++courierpop3d: libs/imap/pop3d
++      cp libs/imap/pop3d ./$@
+ 
+ makedat: libs/makedat/makedat
+       cp libs/makedat/makedat .
+@@ -1435,8 +1434,11 @@ maildiracl.1: libs/maildir/maildiracl.1
+ maildirkw.1: libs/maildir/maildirkw.1
+       cp $(srcdir)/libs/maildir/maildirkw.1 .
+ 
+-imapd.8: libs/imap/imapd.8
+-      cp libs/imap/imapd.8 .
++courierimapd.8: libs/imap/imapd.8
++      cp libs/imap/imapd.8 ./$@
 +
-+courierpop3d.8: imap/courierpop3d.8
-+      cp imap/courierpop3d.8 .
++courierpop3d.8: libs/imap/courierpop3d.8
++      cp libs/imap/courierpop3d.8 .
  
-@@ -1302,4 +1306,2 @@
+ mkdhparams: libs/imap/mkdhparams
+       cp libs/imap/mkdhparams .
+@@ -1471,22 +1473,16 @@ quotawarnmsg.example: libs/maildir/quota
+ install-exec-local:
+       $(mkinstalldirs) $(DESTDIR)$(databindir)
        $(mkinstalldirs) $(DESTDIR)$(bindir)
--      test ! -x tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
--              tcpd/couriertls $(DESTDIR)$(bindir)/couriertls
+-      test ! -x libs/tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
+-              libs/tcpd/couriertls $(DESTDIR)$(bindir)/couriertls
        $(mkinstalldirs) $(DESTDIR)$(sbindir)
-@@ -1308,2 +1310,5 @@
-               $(LN_S) $(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
-+      for f in imapd-ssl imapd pop3d pop3d-ssl ; \
+       for f in mkimapdcert mkpop3dcert mkdhparams; \
+               do rm -f $(DESTDIR)$(sbindir)/$$f ; \
+               $(LN_S) `realpath --relative-to $(sbindir) -m $(databindir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done
++      for f in imapd-ssl imapd pop3d pop3d-ssl; \
 +              do rm -f $(DESTDIR)$(sbindir)/$$f ; \
-+              $(LN_S) $(databindir)/$$f.rc $(DESTDIR)$(sbindir)/$$f ; done
++              $(LN_S) `realpath --relative-to $(sbindir) -m $(databindir)/$$f.rc` $(DESTDIR)$(sbindir)/$$f ; done
        $(mkinstalldirs) $(DESTDIR)$(localstatedir)
-@@ -1311,17 +1316,4 @@
+ 
  install-exec-hook:
 -      chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example
 -      mkdir -p $(DESTDIR)$(sysconfdir)/shared
 -      chmod 755 $(DESTDIR)$(sysconfdir)/shared
 -      mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
 -      chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
+-      mkdir -p $(DESTDIR)$(sysconfdir)/imapaccess
+-      chmod 755 $(DESTDIR)$(sysconfdir)/imapaccess
  
  install-data-local: install-man
--      test -d $(DESTDIR)/etc/pam.d || exit 0 ; \
--      test -w $(DESTDIR)/etc/pam.d || exit 0 ; \
--      test -f $(DESTDIR)/etc/pam.d/imap || \
--              $(INSTALL_DATA) $(srcdir)/imap/imapd.pam \
--              $(DESTDIR)/etc/pam.d/imap || exit 1 ;\
--      test -f $(DESTDIR)/etc/pam.d/pop3 || \
--              $(INSTALL_DATA) $(srcdir)/imap/pop3d.pam \
--              $(DESTDIR)/etc/pam.d/pop3 || exit 1
        for f in $(man_MANS); do chmod a+r $(DESTDIR)$(mandir)/*/$$f; done
-@@ -1332,3 +1324,2 @@
+@@ -1495,7 +1491,6 @@ install-data-local: install-man
+ uninstall-local:
+       for f in mkimapdcert mkpop3dcert mkdhparams; \
                do rm -f $(DESTDIR)$(sbindir)/$$f ; done
 -      rm -f $(DESTDIR)$(bindir)/couriertls
  
+ dist-hook: courier-imap.spec
+       test -f $(srcdir)/rpm.release && cp $(srcdir)/rpm.release $(distdir) \

Index: pkgsrc/mail/courier-imap/patches/patch-ak
diff -u pkgsrc/mail/courier-imap/patches/patch-ak:1.4 pkgsrc/mail/courier-imap/patches/patch-ak:1.5
--- pkgsrc/mail/courier-imap/patches/patch-ak:1.4       Wed Nov 10 10:00:06 2010
+++ pkgsrc/mail/courier-imap/patches/patch-ak   Mon Feb 12 21:36:09 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.4 2010/11/10 10:00:06 adam Exp $
+$NetBSD: patch-ak,v 1.5 2024/02/12 21:36:09 hans Exp $
 
---- imap/mkimapdcert.in.orig   2010-06-29 01:39:59.000000000 +0000
-+++ imap/mkimapdcert.in
-@@ -9,7 +9,13 @@
+--- libs/imap/mkimapdcert.in.orig      2013-11-11 02:56:33.000000000 +0000
++++ libs/imap/mkimapdcert.in
+@@ -8,7 +8,13 @@
  # IMAP over SSL.  Normally this script would get called by an automatic
  # package installation routine.
  
@@ -12,12 +12,12 @@ $NetBSD: patch-ak,v 1.4 2010/11/10 10:00
 +openssl)      ssllib=openssl ;;
 +*)            ssllib="@ssllib@" ;;
 +esac
-+
++       
 +if test "$ssllib" = "openssl"
  then
        test -x @OPENSSL@ || exit 0
  else
-@@ -36,7 +42,7 @@ cleanup() {
+@@ -38,7 +44,7 @@ cleanup() {
  
  cd @certsdir@
  

Index: pkgsrc/mail/courier-imap/patches/patch-ao
diff -u pkgsrc/mail/courier-imap/patches/patch-ao:1.2 pkgsrc/mail/courier-imap/patches/patch-ao:1.3
--- pkgsrc/mail/courier-imap/patches/patch-ao:1.2       Wed Nov 10 10:00:06 2010
+++ pkgsrc/mail/courier-imap/patches/patch-ao   Mon Feb 12 21:36:09 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.2 2010/11/10 10:00:06 adam Exp $
+$NetBSD: patch-ao,v 1.3 2024/02/12 21:36:09 hans Exp $
 
---- imap/mkpop3dcert.in.orig   2010-06-29 01:39:59.000000000 +0000
-+++ imap/mkpop3dcert.in
-@@ -9,7 +9,13 @@
+--- libs/imap/mkpop3dcert.in.orig      2013-11-11 02:56:33.000000000 +0000
++++ libs/imap/mkpop3dcert.in
+@@ -8,7 +8,13 @@
  # POP3 over SSL.  Normally this script would get called by an automatic
  # package installation routine.
  
@@ -11,15 +11,15 @@ $NetBSD: patch-ao,v 1.2 2010/11/10 10:00
 +gnutls)               ssllib="gnutls" ;;
 +openssl)      ssllib="openssl" ;;
 +*)            ssllib="@ssllib@" ;;
-+esac
++esac   
 +
 +if test "$ssllib" = "openssl"
  then
        test -x @OPENSSL@ || exit 0
  else
-@@ -36,7 +42,7 @@ cleanup() {
- 
- cd @certsdir@
+@@ -39,7 +45,7 @@ umask 077
+ BITS="$BITS"
+ set -e
  
 -if test "@ssllib@" = "openssl"
 +if test "$ssllib" = "openssl"

Added files:

Index: pkgsrc/mail/courier-imap/patches/patch-makeimapaccess
diff -u /dev/null pkgsrc/mail/courier-imap/patches/patch-makeimapaccess:1.1
--- /dev/null   Mon Feb 12 21:36:09 2024
+++ pkgsrc/mail/courier-imap/patches/patch-makeimapaccess       Mon Feb 12 21:36:09 2024
@@ -0,0 +1,27 @@
+$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

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index