From nobody Mon Sep 11 14:36:43 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkq6N0bq1z4sKT2; Mon, 11 Sep 2023 14:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkq6M6hwBz3KLj; Mon, 11 Sep 2023 14:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694443003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MgYLK1oOISevKJZH8tyAKkLcjdgIRdkDQFl+6KorF6s=; b=DOh6EDqarEJRMk0R1+4kHCQNpSfeqBiJ+gsww1bI55r6LtmiKGI650W14lo/ZgK8bV3Giu LbCvOz/aGMM8pdQJt8LwOkKHOwuo+TfL/5QzvQq05p3cXGurXza4H2gpqD+WFbogz4TJmc MImCXUgFU0sNyyvFhRvo+rC0Y9W7GKlSM+Zbm0uZbMAW1/CMlPi7gZdNKBkwkSc0H+jrZy U6583nVcK6N11SYfi9JFnMPdvEkUXZ2f0ZQsXU1F42ony4AkszqeXopMEsn46Av6Nhcr8k GNuvqysDPQq88iqEb2ZVOOV/GT7rF8ec/g6OXfz3pBoToxTe5AbA6Hsy105itQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694443003; a=rsa-sha256; cv=none; b=n4Nhk2VKiUbc78sEyriMmtS5B7wdcMutJvkYxKpGflAuF1AefbqbcDZnloeOra5iqbmk8x HnCsBhP6xnASy1r0h9WMZdsfKNcYjVyb3obvgxXdESTim+ZFZtEwb1ps7a1cMELPPsv7+T e3+j7FmCsAKQ4ZHhBlIp7+IyPYWAOjRce2V4fchR4HU3W9iJmeotYI9+PrVsd9exdyY5n6 eoXAxChgxT6xDU4J7P+LvnE/RkOFvB66NHAQnsXy95ZermHrWIBDHlG34pN8qReAFEte7K 3iKaiHsX0ZyzKVXd9VUACTmkPlKY0zqxVVNdrqDGKGW/8ioIvNsdFnsaCOV72Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694443003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MgYLK1oOISevKJZH8tyAKkLcjdgIRdkDQFl+6KorF6s=; b=PvmgZeotbOmQQ+upTx5RE3mZ6RDRPEkoFrd/lGiqnEWViBL5m41F2RLpQTdvrH8JPngGMr Io/C6Hpo0ua3DO7XoBGNxYqA2HliSrQwqftOmmFtjxtPJzw+vOTPNegQwkfAiajHRbhbRy 0LtJBG8ZNqhVDocxMvXrDq+uHlimBoM5HSYMbnQa5AzirnoNXaw3er9TVOoS7k7eFKAz8L QTq1Gd+bFB74D2kd4Af1ZxSoQMiYhTF4hvZ5qhVx7cEm5hH3ieS1Rh1wiB917hO7kM5Cx4 ps21lje8Fa4h2MO+rpJHAiNPMGs+5OFYM3J8J7HWKEt3CXWOfeXaucCtS0D6IA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkq6M5g8NzskL; Mon, 11 Sep 2023 14:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BEahG1058098; Mon, 11 Sep 2023 14:36:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BEahuo058095; Mon, 11 Sep 2023 14:36:43 GMT (envelope-from git) Date: Mon, 11 Sep 2023 14:36:43 GMT Message-Id: <202309111436.38BEahuo058095@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: 48398ec51f1b - main - mail/courier: Update to 1.1.11 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48398ec51f1bf338df18168ac520eb4729b88b09 Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=48398ec51f1bf338df18168ac520eb4729b88b09 commit 48398ec51f1bf338df18168ac520eb4729b88b09 Author: Milan Obuch AuthorDate: 2023-09-11 14:35:09 +0000 Commit: Juraj Lutter CommitDate: 2023-09-11 14:36:26 +0000 mail/courier: Update to 1.1.11 - Update to 1.1.11 - Clean up Makefile a bit - Move chown/chmod into pkg-plist PR: 268008 --- mail/courier/Makefile | 194 +++--- mail/courier/Makefile.doc | 36 +- mail/courier/Makefile.own | 67 -- mail/courier/distinfo | 5 +- mail/courier/files/courier.in | 20 +- mail/courier/files/extra-patch-maildrop__maildir.C | 33 - mail/courier/files/extra-patch-webmail__folder.c | 82 +-- .../extra-patch-webmail__images__sqwebmail.css | 15 +- mail/courier/files/extra-patch-webmail__maildir.c | 4 +- mail/courier/files/extra-patch-webmail__maildir.h | 9 +- mail/courier/files/extra-patch-webmail__msg2html.c | 4 +- mail/courier/files/patch-courier__cmlmfetch.C | 11 - mail/courier/files/patch-courier__configure | 61 +- mail/courier/files/patch-courier__doc__Makefile.in | 71 -- mail/courier/files/patch-courier__imapd-ssl.rc.in | 11 + mail/courier/files/patch-courier__imapd.rc.in | 11 + .../courier/files/patch-courier__libs__Makefile.in | 13 + .../files/patch-courier__module.esmtp__configure | 44 ++ .../patch-courier__module.esmtp__mkesmtpdcert.in | 27 +- mail/courier/files/patch-courier__perms.sh.in | 52 +- mail/courier/files/patch-courier__pop3d-ssl.in | 11 + mail/courier/files/patch-courier__pop3d.in | 11 + mail/courier/files/patch-courier__submit2.C | 11 - mail/courier/files/patch-courier__webmlmd.H | 11 - mail/courier/files/patch-courier__webmlmd.rc.in | 13 +- mail/courier/files/patch-imap__mkimapdcert.in | 11 - mail/courier/files/patch-imap__mkpop3dcert.in | 11 - mail/courier/files/patch-liblock__locktest.c | 81 --- mail/courier/files/patch-libs__imap__mkdhparams.in | 11 + .../courier/files/patch-libs__imap__mkimapdcert.in | 20 + .../courier/files/patch-libs__imap__mkpop3dcert.in | 20 + mail/courier/files/patch-tcpd__libcouriertls.c | 18 - mail/courier/files/pkg-message.in | 27 + mail/courier/pkg-plist | 732 ++++++++++----------- 34 files changed, 778 insertions(+), 980 deletions(-) diff --git a/mail/courier/Makefile b/mail/courier/Makefile index 273585a902b0..85742588b14b 100644 --- a/mail/courier/Makefile +++ b/mail/courier/Makefile @@ -1,6 +1,5 @@ PORTNAME= courier -PORTVERSION= 0.65.3 -PORTREVISION= 6 +PORTVERSION= 1.1.11 CATEGORIES= mail MASTER_SITES= SF @@ -11,19 +10,19 @@ WWW= https://www.Courier-MTA.org/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING.GPL -BROKEN= ld: error: duplicate symbol: sqwebmail_content_charset -DEPRECATED= Broken for more than a year and fails to build on supported RELEASE -EXPIRATION_DATE= 2023-06-01 - -BUILD_DEPENDS= courierauthconfig:security/courier-authlib-base +BUILD_DEPENDS= courierauthconfig:security/courier-authlib-base \ + wget:ftp/wget LIB_DEPENDS= libidn.so:dns/libidn \ - libpcre.so:devel/pcre + libpcre.so:devel/pcre \ + libgdbm.so:databases/gdbm \ + libcourier-unicode.so:devel/courier-unicode \ + libpcre2-8.so:devel/pcre2 RUN_DEPENDS= courierauthconfig:security/courier-authlib-base \ ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool \ ${LOCALBASE}/etc/mime.types:misc/mime-support \ p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \ - ca_root_nss>=3.*:security/ca_root_nss - + ca_root_nss>=3.*:security/ca_root_nss \ + ${LOCALBASE}/bin/wget:ftp/wget CONFLICTS= courier-imap-2.* couriermlm-0.* \ exim-4.* maildrop-1.* \ panda-imap-201* postfix-1.* postfix-2.* \ @@ -49,10 +48,10 @@ MAILDROPDEFAULT?=./Maildir # End of user-serviceable variables -MAILOWN= courier -MAILGRP= courier -MAILUID= 465 -MAILGID= 465 +MAILOWN?= courier +MAILGRP?= courier +MAILUID?= 465 +MAILGID?= 465 ETCDIR= ${PREFIX}/etc SYSCONFDIR= ${ETCDIR}/courier LIBEXECDIR= ${PREFIX}/libexec @@ -62,13 +61,15 @@ CALENDIR= /var/spool/calendar MIMETYPES= ${LOCALBASE}/etc/mime.types WITH_TRANSPORT= local esmtp dsn -USES= fam gettext gmake libtool perl5 pkgconfig tar:bzip2 ssl +USES= fam gettext gmake libtool perl5 pkgconfig tar:bzip2 ssl shebangfix USE_SUBMAKE= yes USE_RC_SUBR= courier +SHEBANG_FILES= courier/filters/perlfilter/perlfilter-ratelimit.pl \ + courier/filters/perlfilter/perlfilter-wrapper.pl GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-root-check \ - --with-db=db \ + --with-db=gdbm \ --enable-syslog=1 --enable-use-flock \ --program-transform-name=s,^,, \ --enable-utf7-folder-encoding \ @@ -87,29 +88,30 @@ CONFIGURE_ARGS= --disable-root-check \ --with-cachedir=${CACHEDIR} \ --with-cacheowner=${CACHEOWN} \ --with-calendardir=${CALENDIR} \ - --with-certsdir=${SYSCONFDIR} \ + --with-mydatadir=${SYSCONFDIR} \ --with-transport='${WITH_TRANSPORT}' \ --with-default-maildrop=${MAILDROPDEFAULT} \ --with-paranoid-smtpext \ - --enable-workarounds-for-imap-client-bugs + --enable-workarounds-for-imap-client-bugs \ + --with-notice=unicode + CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip install-perms PLIST_SUB+= BINOWN="${BINOWN}" BINGRP="${BINGRP}" \ + CACHEOWN="${CACHEOWN}" CACHEDIR="${CACHEDIR}" \ + CALENDIR="${CALENDIR}" LOCALSTATEDIR="${LOCALSTATEDIR}" \ MAILOWN="${MAILOWN}" MAILGRP="${MAILGRP}" \ MAILUID="${MAILUID}" MAILGID="${MAILGID}" \ - CACHEOWN="${CACHEOWN}" CACHEDIR="${CACHEDIR}" \ - CALENDIR="${CALENDIR}" LOCALSTATEDIR="${LOCALSTATEDIR}" + SHAREOWN="${SHAREOWN}" SHAREGRP="${SHAREGRP}" + SUB_LIST:= ${PLIST_SUB} SUB_FILES+= pkg-message crontab sharedindexupdate -#SUB_FILES+= pkg-install pkg-message crontab sharedindexupdate -OPTIONS_DEFINE= LDAP PROCMAIL SENDFAX UUCP IPV6 MAILDROPFLAGS DOCS +OPTIONS_DEFINE= LDAP PROCMAIL SENDFAX UUCP IPV6 DOCS CERTSDIR OPTIONS_GROUP= WEBMAIL -#OPTIONS_GROUP= SYSTEM WEBMAIL -#OPTIONS_GROUP_SYSTEM= RCCONF MAILCONF PERIODIC OPTIONS_GROUP_WEBMAIL= GNUPG WEBMAILRSENT WEBMAILFLAGS WEBMAILXFACE OPTIONS_RADIO= ALIASES SPELL OPTIONS_RADIO_ALIASES= SYSTEMALIASES EMPTYALIASES @@ -123,7 +125,7 @@ ISPELL_DESC= ISpell support for WebMail PROCMAIL_DESC= Procmail local delivery support SENDFAX_DESC= mgetty+sendfax support UUCP_DESC= UUCP support -MAILDROPFLAGS_DESC= maildrop set flags patch +CERTSDIR_DESC= separate .pem directory for certificates WEBMAILRSENT_DESC= enable Autorename Sent folder WEBMAILFLAGS_DESC= webmail show flags patch WEBMAILXFACE_DESC= experimental webmail X-Face patch @@ -136,7 +138,6 @@ PERIODIC_DESC= modify/create periodic.conf .include .include "${.CURDIR}/Makefile.doc" -.include "${.CURDIR}/Makefile.own" .if ${PORT_OPTIONS:MLDAP} USES+= ldap @@ -174,6 +175,9 @@ SUB_LIST+= WITHEMPTYALIASES="@comment " .if ${PORT_OPTIONS:MGNUPG} BUILD_DEPENDS+= gpg:security/gnupg RUN_DEPENDS+= gpg:security/gnupg +.else +# This is a hack! But works well (at least partially) for me... +CONFIGURE_ENV+= GPG="${WRKSRC}/fakegpg" .endif .if ${PORT_OPTIONS:MASPELL} @@ -224,17 +228,13 @@ CONFIGURE_ARGS+=--with-ipv6 CONFIGURE_ARGS+=--without-ipv6 .endif -.if ${PORT_OPTIONS:MMAILDROPFLAGS} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-maildrop__maildir.C -.endif - .if ${PORT_OPTIONS:MWEBMAILXFACE} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-webmail__msg2html.c +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libs__sqwebmail__msg2html.c .endif .if ${PORT_OPTIONS:MWEBMAILFLAGS} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-webmail__folder.c ${FILESDIR}/extra-patch-webmail__maildir.c -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-webmail__maildir.h ${FILESDIR}/extra-patch-webmail__images__sqwebmail.css +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libs__sqwebmail__folder.c ${FILESDIR}/extra-patch-libs__sqwebmail__maildir.c +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libs__sqwebmail__maildir.h ${FILESDIR}/extra-patch-libs__sqwebmail__images__sqwebmail.css .endif .if ${PORT_OPTIONS:MWEBMAILRSENT} @@ -261,97 +261,131 @@ SUB_LIST+= PERIODIC="y" SUB_LIST+= PERIODIC="n" .endif -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= pkg-static: Unable to access file /wrkdirs/usr/ports/mail/courier/work/stage/usr/local/bin/couriertls -BROKEN_FreeBSD_13= pkg-static: Unable to access file /wrkdirs/usr/ports/mail/courier/work/stage/usr/local/bin/couriertls +.if ${PORT_OPTIONS:MCERTSDIR} +CONFIGURE_ARGS+=--with-certsdir=${SYSCONFDIR}/.pem +PLIST_SUB+= WITHCERTSDIR="" +SUB_LIST+= CERTSDIR="${SYSCONFDIR}/.pem" +.else +CONFIGURE_ARGS+=--with-certsdir=${SYSCONFDIR} +PLIST_SUB+= WITHCERTSDIR="@comment " +SUB_LIST+= CERTSDIR="${SYSCONFDIR}" .endif +_CNFFILES= esmtpd.cnf \ + imapd.cnf \ + pop3d.cnf + +_DISTEXFILES= courierd.dist \ + esmtpd-msa.dist \ + esmtpd-ssl.dist \ + esmtpd.dist \ + faxcoverpage.tr.dist \ + faxnotifyrc.dist \ + faxrc.dist \ + imapd-ssl.dist \ + imapd.dist \ + ldapaddressbook.dist \ + ldapaliasrc.dist \ + pop3d-ssl.dist \ + pop3d.dist \ + sqwebmaild.dist \ + webmlmrc.dist + pre-everything:: @${ECHO_MSG} "===> --------------------------------------------------------" @${ECHO_MSG} "===> Run 'make config' to (re)configure ${PKGNAME}" @${ECHO_MSG} "===> --------------------------------------------------------" pre-patch: - @${CP} ${TEMPLATES}/config.guess ${TEMPLATES}/config.sub ${WRKSRC} + ${CP} ${TEMPLATES}/config.guess ${TEMPLATES}/config.sub ${WRKSRC} post-patch: - @${REINPLACE_CMD} -i '' -e 's|#! perl|#!${PERL}|g' \ + ${REINPLACE_CMD} -i '' -e 's|#! perl|#!${PERL}|g' \ ${WRKSRC}/webadmin/*.pl \ ${WRKSRC}/webadmin/*.pl.in \ ${WRKSRC}/courier/webadmin/*.pl \ ${WRKSRC}/courier/webadmin/*.pl.in - @${REINPLACE_CMD} -e 's|^PROG=\./|PROG=exec ./|g' \ + ${REINPLACE_CMD} -e 's|^PROG=\./|PROG=exec ./|g' \ ${WRKSRC}/courier/module.*/courier.config - @${REINPLACE_CMD} -e 's|@mydatadir@|@sysconfdir@|g' \ - ${WRKSRC}/*/mk*cert.* \ + ${REINPLACE_CMD} -e 's|@mydatadir@|@sysconfdir@|g' \ ${WRKSRC}/*/*/mk*cert.* - @${REINPLACE_CMD} -e 's|^\(TLS_CERTFILE=\)@mydatadir@|\1@sysconfdir@|g' \ + ${REINPLACE_CMD} -e 's|^\(TLS_CERTFILE=\)@mydatadir@|\1@sysconfdir@|g' \ + ${WRKSRC}/*/*.dist.in \ + ${WRKSRC}/*/*/*.dist.in + ${REINPLACE_CMD} -e 's|^\(TLS_DHPARAMS=\)@mydatadir@|\1@sysconfdir@|g' \ ${WRKSRC}/*/*.dist.in \ ${WRKSRC}/*/*/*.dist.in - @${REINPLACE_CMD} -e 's|^\(RANDFILE[[:space:]]*=[[:space:]]*\)@mydatadir@|\1@sysconfdir@|g' \ - ${WRKSRC}/*/*.cnf.openssl.in \ + ${REINPLACE_CMD} -e 's|^\(RANDFILE[[:space:]]*=[[:space:]]*\)@mydatadir@|\1@sysconfdir@|g' \ ${WRKSRC}/*/*/*.cnf.openssl.in - @${REINPLACE_CMD} -e 's|$$(INSTALL_DATA) \(.$$$$file.\)|${INSTALL_MAN} \1|' \ + ${REINPLACE_CMD} -e 's|$$(INSTALL_DATA) \(.$$$$file.\)|${INSTALL_MAN} \1|' \ ${WRKSRC}/Makefile.in \ ${WRKSRC}/*/Makefile.in \ ${WRKSRC}/*/*/Makefile.in \ ${WRKSRC}/*/*/*/Makefile.in - @${REINPLACE_CMD} -e 's|^\(INSTALL_STRIP_PROGRAM=\).*$$|\1"${INSTALL_PROGRAM} -s"|' \ + ${REINPLACE_CMD} -e 's|^\(INSTALL_STRIP_PROGRAM=\).*$$|\1"${INSTALL_PROGRAM} -s"|' \ -e 's|; ldapaliasd="yes"||' \ ${WRKSRC}/configure \ ${WRKSRC}/*/configure \ ${WRKSRC}/*/*/configure \ ${WRKSRC}/*/*/*/configure - @${REINPLACE_CMD} -E -e 's/(root|bin)[[:space:]]*bin/root wheel/g' \ + ${REINPLACE_CMD} -E -e 's/(root|bin)[[:space:]]*bin/root wheel/g' \ ${WRKSRC}/courier/perms.sh.in - @${REINPLACE_CMD} '/^courieresmtp_LDADD =/s/$$/ -lcourierauth/' \ + ${REINPLACE_CMD} '/^courieresmtp_LDADD =/s/$$/ -lcourierauth/' \ ${WRKSRC}/courier/module.esmtp/Makefile.in # Avoid conflict with C++20 by adding .txt suffix - @${REINPLACE_CMD} -i .c++20 's/>version$$/&.txt/' ${WRKSRC}/configure - @${FIND} ${WRKSRC} -name configure -exec ${REINPLACE_CMD} \ + ${REINPLACE_CMD} -i .c++20 's/>version$$/&.txt/' ${WRKSRC}/configure + ${FIND} ${WRKSRC} -name configure -exec ${REINPLACE_CMD} \ -i .c++20 '/^version.*cat/s,/version,&.txt,' {} + +pre-configure: +# This is a hack! But works well (at least partially) for me... + touch ${WRKSRC}/fakegpg + chmod +x ${WRKSRC}/fakegpg + post-build: - @${PERL} -pi -e 's|^(auth)\s+(required).*|$$1\t\t$$2\tpam_unix.so\ttry_first_pass|g;' \ - -e 's|^(account)\s+(required).*|$$1 \t$$2\tpam_unix.so|g;' \ - -e 's|^(session)\s+(required).*|$$1 \t$$2\tpam_permit.so|g;' \ + ${PERL} -pi -e 's|^(auth)\s+(required).*|$$1\t\t$$2\tpam_unix.so\ttry_first_pass|g;' \ + -e 's|^(account)\s+(required).*|$$1 \t$$2\tpam_unix.so|g;' \ + -e 's|^(session)\s+(required).*|$$1 \t$$2\tpam_permit.so|g;' \ ${WRKSRC}/*/*.authpam* \ ${WRKSRC}/*/*/*.authpam* - @${LN} -f ${WRKSRC}/gpglib/README.html ${WRKSRC}/gpglib/README.gpglib.html - @${LN} -f ${WRKSRC}/imap/BUGS ${WRKSRC}/imap/BUGS.imap - @${LN} -f ${WRKSRC}/imap/BUGS.html ${WRKSRC}/imap/BUGS.imap.html - @${LN} -f ${WRKSRC}/imap/README ${WRKSRC}/imap/README.imap - @${LN} -f ${WRKSRC}/imap/README.html ${WRKSRC}/imap/README.imap.html - @${LN} -f ${WRKSRC}/maildrop/README.html ${WRKSRC}/maildrop/README.maildrop.html - @${LN} -f ${WRKSRC}/pcp/README.html ${WRKSRC}/pcp/README.pcp.html - @${LN} -f ${WRKSRC}/webmail/BUGS ${WRKSRC}/webmail/BUGS.webmail - @${LN} -f ${WRKSRC}/webmail/BUGS.html ${WRKSRC}/webmail/BUGS.webmail.html - @${LN} -f ${WRKSRC}/webmail/SECURITY ${WRKSRC}/webmail/SECURITY.webmail - @${LN} -f ${WRKSRC}/webmail/SECURITY.html ${WRKSRC}/webmail/SECURITY.webmail.html + ${INSTALL} -lrs ${WRKSRC}/libs/gpglib/README.html ${WRKSRC}/libs/gpglib/README.gpglib.html + ${INSTALL} -lrs ${WRKSRC}/libs/imap/BUGS ${WRKSRC}/libs/imap/BUGS.imap + ${INSTALL} -lrs ${WRKSRC}/libs/imap/BUGS.html ${WRKSRC}/libs/imap/BUGS.imap.html + ${INSTALL} -lrs ${WRKSRC}/libs/maildrop/README.html ${WRKSRC}/libs/maildrop/README.maildrop.html + ${INSTALL} -lrs ${WRKSRC}/libs/pcp/README.html ${WRKSRC}/libs/pcp/README.pcp.html + ${INSTALL} -lrs ${WRKSRC}/libs/sqwebmail/BUGS ${WRKSRC}/libs/sqwebmail/BUGS.sqwebmail + ${INSTALL} -lrs ${WRKSRC}/libs/sqwebmail/BUGS.html ${WRKSRC}/libs/sqwebmail/BUGS.sqwebmail.html + ${INSTALL} -lrs ${WRKSRC}/libs/sqwebmail/SECURITY ${WRKSRC}/libs/sqwebmail/SECURITY.sqwebmail + ${INSTALL} -lrs ${WRKSRC}/libs/sqwebmail/SECURITY.html ${WRKSRC}/libs/sqwebmail/SECURITY.sqwebmail.html post-install: - @${LN} -f ${STAGEDIR}${SYSCONFDIR}/maildrop ${STAGEDIR}${SYSCONFDIR}/maildropfilter - @${INSTALL_DATA} /dev/null ${STAGEDIR}${SYSCONFDIR}/locallowercase - @${INSTALL_DATA} ${WRKDIR}/crontab ${STAGEDIR}${SYSCONFDIR}/ - @${INSTALL_SCRIPT} ${WRKDIR}/sharedindexupdate ${STAGEDIR}${DATADIR}/ -.for file in ${OWNER0} - @-${CHOWN} -Rh ${BINOWN}:${BINGRP} ${STAGEDIR}${PREFIX}/${file} +.for _cfgfile in ${_CNFFILES} + -${MV} ${STAGEDIR}${SYSCONFDIR}/${_cfgfile} ${STAGEDIR}${SYSCONFDIR}/${_cfgfile:S/.cnf/.cnf.sample/g} .endfor +.for _cfgfile in ${_DISTEXFILES} + -${MV} ${STAGEDIR}${SYSCONFDIR}/${_cfgfile} ${STAGEDIR}${SYSCONFDIR}/${_cfgfile:S/.dist/.sample/g} +.endfor + ${INSTALL} -lrs ${STAGEDIR}${SYSCONFDIR}/maildrop ${STAGEDIR}${SYSCONFDIR}/maildropfilter + ${INSTALL_DATA} /dev/null ${STAGEDIR}${SYSCONFDIR}/locallowercase + ${INSTALL_DATA} ${WRKDIR}/crontab ${STAGEDIR}${SYSCONFDIR}/ + ${INSTALL_SCRIPT} ${WRKDIR}/sharedindexupdate ${STAGEDIR}${DATADIR}/ .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR}/html + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR}/html .for f in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .for f in ${HTMLDOCS} - @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/html + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/html .endfor - @${INSTALL_DATA} ${STAGEDIR}${DATADIR}/htmldoc/* ${STAGEDIR}${DOCSDIR}/html + ${INSTALL_DATA} ${STAGEDIR}${DATADIR}/htmldoc/* ${STAGEDIR}${DOCSDIR}/html +.endif +.if ${PORT_OPTIONS:MCERTSDIR} + ${MKDIR} ${STAGEDIR}${SYSCONFDIR}/.pem .endif - @${RM} -r ${STAGEDIR}${DATADIR}/htmldoc - @-${CHOWN} -Rh ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR} - @${CHMOD} -R a+r ${STAGEDIR}${DATADIR}/courierwebadmin - @${CHMOD} -R a-w ${STAGEDIR}${DATADIR} ${STAGEDIR}${LIBEXECDIR}/courier - @${CHMOD} 550 ${STAGEDIR}${LIBEXECDIR}/courier/modules/esmtp/courieresmtp* + ${RM} -r ${STAGEDIR}${DATADIR}/htmldoc + ${CHMOD} -R a+r ${STAGEDIR}${DATADIR}/courierwebadmin + ${CHMOD} -R a-w ${STAGEDIR}${DATADIR} ${STAGEDIR}${LIBEXECDIR}/courier + ${CHMOD} 550 ${STAGEDIR}${LIBEXECDIR}/courier/modules/esmtp/courieresmtp* .include diff --git a/mail/courier/Makefile.doc b/mail/courier/Makefile.doc index a0e0cfcc166e..d93cdb4798c9 100644 --- a/mail/courier/Makefile.doc +++ b/mail/courier/Makefile.doc @@ -8,24 +8,22 @@ DOCS= AUTHORS \ NEWS \ README \ TODO \ - imap/BUGS.imap \ - imap/README.imap \ - imap/README.proxy \ - maildir/README.maildirquota.txt \ - maildir/README.sharedfolders.txt \ - tcpd/README.couriertls \ - webmail/BUGS.webmail \ - webmail/SECURITY.webmail + libs/imap/BUGS.imap \ + libs/imap/README.imap.proxy \ + libs/maildir/README.maildirquota.txt \ + libs/maildir/README.sharedfolders.txt \ + libs/tcpd/README.couriertls \ + libs/sqwebmail/BUGS.webmail \ + libs/sqwebmail/SECURITY.webmail HTMLDOCS=NEWS.html \ - gpglib/README.gpglib.html \ - imap/BUGS.imap.html \ - imap/README.imap.html \ - imap/README.proxy.html \ - maildir/README.maildirfilter.html \ - maildir/README.maildirquota.html \ - maildir/README.sharedfolders.html \ - maildrop/README.maildrop.html \ - pcp/README.pcp.html \ - webmail/BUGS.webmail.html \ - webmail/SECURITY.webmail.html + libs/gpglib/README.gpglib.html \ + libs/imap/BUGS.imap.html \ + libs/imap/README.imap.proxy.html \ + libs/maildir/README.maildirfilter.html \ + libs/maildir/README.maildirquota.html \ + libs/maildir/README.sharedfolders.html \ + libs/maildrop/README.maildrop.html \ + libs/pcp/README.pcp.html \ + libs/sqwebmail/BUGS.webmail.html \ + libs/sqwebmail/SECURITY.webmail.html diff --git a/mail/courier/Makefile.own b/mail/courier/Makefile.own deleted file mode 100644 index 3d1b346df0ba..000000000000 --- a/mail/courier/Makefile.own +++ /dev/null @@ -1,67 +0,0 @@ -OWNER0= bin/courier-config \ - bin/couriermlm \ - bin/couriertls \ - bin/deliverquota \ - bin/dotforward \ - bin/imapd \ - bin/lockmail \ - bin/mailbot \ - bin/maildirmake \ - bin/maildiracl \ - bin/maildirkw \ - bin/makemime \ - bin/mimegpg \ - bin/preline \ - bin/reformail \ - bin/reformime \ - bin/sendmail \ - bin/testmxlookup \ - bin/webmlmd \ - bin/webmlmd.rc \ - etc/courier/courierd.dist \ - etc/courier/enablefiltering \ - etc/courier/esmtp.authpam \ - etc/courier/esmtpd-msa.dist \ - etc/courier/esmtpd-ssl.dist \ - etc/courier/esmtpd.cnf \ - etc/courier/esmtpd.dist \ - etc/courier/imapd-ssl.dist \ - etc/courier/imapd.authpam \ - etc/courier/imapd.cnf \ - etc/courier/imapd.dist \ - etc/courier/ldapaddressbook.dist \ - etc/courier/locallowercase \ - etc/courier/maildrop \ - etc/courier/maildropfilter \ - etc/courier/pop3d-ssl.dist \ - etc/courier/pop3d.authpam \ - etc/courier/pop3d.cnf \ - etc/courier/pop3d.dist \ - etc/courier/quotawarnmsg.example \ - etc/courier/rfcerr2045.txt \ - etc/courier/rfcerr2046.txt \ - etc/courier/rfcerr2047.txt \ - etc/courier/rfcerrheader.txt \ - etc/courier/smtpaccess/default \ - etc/courier/webmail.authpam \ - etc/courier/webmlmrc.dist \ - libexec/courier/courierpop3d \ - libexec/courier/courierpop3login \ - libexec/courier/imaplogin \ - libexec/courier/makedatprog \ - libexec/courier/modules \ - libexec/courier/pcpd \ - libexec/courier/sqwebmaild \ - libexec/courier/webmail/webadmin \ - libexec/courier/webmail/webmail \ - libexec/courier/webmail/webmlm \ - libexec/filters/dupfilter \ - libexec/filters/perlfilter \ - sbin/courier \ - sbin/couriertcpd \ - sbin/showconfig \ - sbin/webmaild - -.if defined(WITH_LDAP) && !defined(WITHOUT_LDAP) -OWNER0+=sbin/courierldapaliasd -.endif diff --git a/mail/courier/distinfo b/mail/courier/distinfo index 0d76693c1c49..af6d59963b10 100644 --- a/mail/courier/distinfo +++ b/mail/courier/distinfo @@ -1,2 +1,3 @@ -SHA256 (courier-0.65.3.tar.bz2) = a743ba01137230165b00d726cf0faef3998d43edc0bfb00d8358eeefd96c7d60 -SIZE (courier-0.65.3.tar.bz2) = 7152828 +TIMESTAMP = 1686226592 +SHA256 (courier-1.1.11.tar.bz2) = 4fe3b73e7da159351ab973b52044996aa0006076f2effdcc4c004be087c5f777 +SIZE (courier-1.1.11.tar.bz2) = 7895772 diff --git a/mail/courier/files/courier.in b/mail/courier/files/courier.in index 2dcecaa786e6..45a3e5a54bf5 100644 --- a/mail/courier/files/courier.in +++ b/mail/courier/files/courier.in @@ -13,6 +13,7 @@ prefix="%%PREFIX%%" exec_prefix="${prefix}" sysconfdir="${prefix}/etc/courier" +certsdir="%%CERTSDIR%%" sbindir="${exec_prefix}/sbin" bindir="${exec_prefix}/bin" libexecdir="${prefix}/libexec" @@ -127,7 +128,7 @@ courier_start() if [ "$esmtpdcert" = 1 ]; then # If we do not have a certificate, make one up. - if [ ! -f ${sysconfdir}/esmtpd.pem \ + if [ ! -f ${certsdir}/esmtpd.pem \ -a -x "$COURIERTLS" \ -a -x ${sbindir}/mkesmtpdcert ]; then echo -n " generating-ESMTP-SSL-certificate..." @@ -194,10 +195,12 @@ courier_start() case "$IMAPDSSLSTART" in [Yy]*) # If we do not have a certificate, make one up. if [ -x "$COURIERTLS" ]; then - if [ ! -f ${sysconfdir}/imapd.pem \ + if [ ! -f ${certsdir}/imapd.pem \ -a -x ${sbindir}/mkimapdcert ]; then echo -n " generating-IMAP-SSL-certificate..." ${sbindir}/mkimapdcert >/dev/null 2>&1 + # double usage - DH params need to exist + esmtpdcert=1 fi if [ -x ${sbindir}/imapd-ssl ]; then echo -n " imapd-ssl" @@ -227,10 +230,12 @@ courier_start() case "$POP3DSSLSTART" in [Yy]*) # If we do not have a certificate, make one up. if [ -x "$COURIERTLS" ]; then - if [ ! -f ${sysconfdir}/pop3d.pem \ + if [ ! -f ${certsdir}/pop3d.pem \ -a -x ${sbindir}/mkpop3dcert ]; then echo -n " generating-POP3-SSL-certificate..." ${sbindir}/mkpop3dcert >/dev/null 2>&1 + # double usage - DH params need to exist + esmtpdcert=1 fi if [ -x ${sbindir}/pop3d-ssl ]; then echo -n " pop3d-ssl" @@ -241,6 +246,15 @@ courier_start() esac fi + if [ "$esmtpdcert" = 1 ]; then + # If we do not have DH params, make them up. + if [ ! -f ${certsdir}/dhparams.pem \ + -a -x ${sbindir}/mkdhparams ]; then + echo -n " generating-DH-params..." + ${sbindir}/mkdhparams >/dev/null 2>&1 + fi + fi + LISTS="" if [ -f ${sysconfdir}/webmlmrc ]; then . ${sysconfdir}/webmlmrc diff --git a/mail/courier/files/extra-patch-maildrop__maildir.C b/mail/courier/files/extra-patch-maildrop__maildir.C deleted file mode 100644 index ba1d64c18051..000000000000 --- a/mail/courier/files/extra-patch-maildrop__maildir.C +++ /dev/null @@ -1,33 +0,0 @@ ---- maildrop/maildir.C.orig Thu Jan 15 04:12:13 2004 -+++ maildrop/maildir.C Thu Jul 5 00:09:38 2007 -@@ -137,7 +137,6 @@ - tmpname=createInfo.tmpname; - newname=createInfo.newname; - tmpname += '\0'; -- newname += '\0'; - maildir_tmpcreate_free(&createInfo); - - file.fd(f); -@@ -181,6 +180,22 @@ - { - if (is_open) - { -+ Buffer b; -+ -+ b="MFLAGS"; -+ -+ const char *f=GetVarStr(b); -+ -+ if (f && strlen(f) > 0) -+ { -+ newname += ':'; -+ newname += '2'; -+ newname += ','; -+ newname += f; -+ } -+ -+ newname += '\0'; -+ - Buffer keywords; - - keywords="KEYWORDS"; diff --git a/mail/courier/files/extra-patch-webmail__folder.c b/mail/courier/files/extra-patch-webmail__folder.c index d1a6139cbcd3..d62fbc5703e3 100644 --- a/mail/courier/files/extra-patch-webmail__folder.c +++ b/mail/courier/files/extra-patch-webmail__folder.c @@ -1,7 +1,7 @@ ---- webmail/folder.c.orig 2008-07-20 19:00:33.000000000 +0200 -+++ webmail/folder.c 2009-06-04 08:32:54.000000000 +0200 -@@ -247,6 +247,18 @@ - return (maildir_msgmovefile(folder, file, cgi("moveto"), pos)); +--- libs/sqwebmail/folder.c.orig 2008-07-20 19:00:33.000000000 +0200 ++++ libs/sqwebmail/folder.c 2009-06-04 08:32:54.000000000 +0200 +@@ -331,6 +331,18 @@ + return rc ? "quota":""; } +static int groupmark(const char *folder, const char *file, size_t pos) @@ -18,10 +18,10 @@ + void folder_delmsgs(const char *dir, size_t pos) { - int rc=0; -@@ -317,6 +329,16 @@ - rc=group_movedel( dir, &groupmove ); - maildir_savefoldermsgs(dir); + const char *status=do_folder_delmsgs(dir, pos); +@@ -392,6 +404,16 @@ + } + fclose(fp); } + else if (*cgi("cmdmark")) + { @@ -34,42 +34,18 @@ + maildir_savefoldermsgs(dir); + } - maildir_cleanup(); - -@@ -441,7 +463,7 @@ - - folder_navigate(dir, pos, highend, morebefore, moreafter); + fprintf(ofp, "%s\n%s\n", maildir, path); + fclose(ofp); +@@ -510,7 +532,7 @@ + folder_navigate(dir, pos, highend, morebefore, moreafter, + last_message_searched_ptr); - printf("\n", + printf("
%s %s%s%s%s
\n", getarg("NUM"), getarg("DATE"), (strncmp(dir, INBOX "." SENT, sizeof(INBOX)+sizeof(SENT)-1) && -@@ -486,12 +508,13 @@ - if ((q=strrchr(p, '/')) != 0) - p=q+1; - -- printf("
%s   %s%s%s%s
%s%ld.%s%s%ld.%s%s!" : "", - (long) (pos+i), - (long) (pos+i)); - printf("\" onchange=\"setsel('MOVE-%ld', 'row%d', 'folder-index-bg-%d');\"%s /> %s%s%s%s", -+ printf("\" />%s%s%s%s", - folder_index_entry_start, - type, - folder_index_entry_end, -@@ -545,9 +568,9 @@ +@@ -531,9 +553,9 @@ if (found) { @@ -82,7 +58,7 @@ puts("