Update Courier-MTA to 1.3.5
This updates the following packages that are all built from the same
source:
mail/courier-mta
mail/courier-maildir
net/couriertcpd
Changes since 0.68.1: Too many to list here (0.68.1 was released in 2012).
The full changelog can be found here:
713d051033/tree/courier/ChangeLog
Note that the Maildir unicode format has changed in the 1.0 release. See
mail/courier-maildir/MESSAGE.UTF8 for details.
This commit is contained in:
hans
parent
2635f4689c
commit
1c1d09ca51
|
|
@ -0,0 +1,13 @@
|
|||
================================================================================
|
||||
$NetBSD: MESSAGE.UTF8,v 1.1 2024/02/12 21:06:43 hans Exp $
|
||||
|
||||
The unicode format used by Courier Maildirs has been changed in SqWebmail 6.0,
|
||||
Courier-IMAP 5.0 and Courier 1.0. If you are updating SqWebmail, Courier-IMAP
|
||||
or Courier-MTA from earlier versions, and any of your users use any characters
|
||||
outside of US-ASCII in Maildir folder names, these Maildirs need to be converted
|
||||
manually.
|
||||
|
||||
Please see http://www.courier-mta.org/maildirmake.html for details and
|
||||
instructions.
|
||||
|
||||
================================================================================
|
||||
|
|
@ -1,11 +1,9 @@
|
|||
# $NetBSD: Makefile,v 1.40 2022/06/28 11:34:19 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.41 2024/02/12 21:06:43 hans Exp $
|
||||
|
||||
DISTNAME= courier-${COURIER_VERSION}
|
||||
PKGNAME= ${DISTNAME:S/-/-maildir-/}
|
||||
PKGREVISION= 11
|
||||
PKGREVISION=
|
||||
CATEGORIES= mail
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
COMMENT= Courier maildir utilities
|
||||
|
|
@ -16,6 +14,7 @@ CONFLICTS= courier-maildirmake-[0-9]*
|
|||
USE_TOOLS+= gmake perl:run
|
||||
USE_LANGUAGES= c c++
|
||||
|
||||
GNU_CONFIGURE_ICONV= no
|
||||
.include "../../mail/courier-mta/Makefile.common"
|
||||
|
||||
# This package doesn't need to depend on courier-authlib -- just fake
|
||||
|
|
@ -24,20 +23,20 @@ USE_LANGUAGES= c c++
|
|||
CONFIGURE_ENV+= ac_cv_path_COURIERAUTHCONFIG=${TRUE:Q}
|
||||
|
||||
# These are files required by the Courier configure scripts.
|
||||
WRKSRC_FILES= courier/courier.c config.guess config.sub \
|
||||
configure depcomp install-sh ltmain.sh missing \
|
||||
sysconftool
|
||||
WRKSRC_FILES+= Makefile.in courier.spec.in courier.lpspec.in \
|
||||
WRKSRC_FILES= courier/courier.c courier-debuild.in config.guess \
|
||||
config.sub configure compile depcomp install-sh \
|
||||
ltmain.sh missing sysconftool
|
||||
WRKSRC_FILES+= Makefile.in courier.spec.in \
|
||||
dbobj.h.in dbobj.config.in courier.service.in \
|
||||
courier.sysvinit.in
|
||||
|
||||
# These are subdirectories containing libraries used by courier-maildir.
|
||||
WRKSRC_SUBDIRS= bdbobj numlib liblock unicode rfc822 maildir
|
||||
WRKSRC_SUBDIRS= bdbobj numlib liblock rfc822 maildir
|
||||
|
||||
EXTRACT_ELEMENTS= ${WRKSRC_FILES:S/^/${DISTNAME}\//}
|
||||
EXTRACT_ELEMENTS+= ${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
|
||||
EXTRACT_ELEMENTS+= ${WRKSRC_SUBDIRS:S/^/${DISTNAME}\/libs\//}
|
||||
|
||||
BUILD_DIRS= ${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
|
||||
BUILD_DIRS= ${WRKSRC_SUBDIRS:S/^/${WRKSRC}\/libs\//}
|
||||
INSTALLATION_DIRS= bin sbin \
|
||||
${PKGMANDIR}/man1 ${PKGMANDIR}/man7 \
|
||||
${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \
|
||||
|
|
@ -69,37 +68,37 @@ post-extract:
|
|||
${CP} ${FILESDIR}/sharedindexupdate.sh ${WRKDIR}/sharedindexupdate.sh
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/maildir/deliverquota \
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/libs/maildir/deliverquota \
|
||||
${DESTDIR}${PREFIX}/bin/deliverquota
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildiracl \
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/libs/maildir/maildiracl \
|
||||
${DESTDIR}${PREFIX}/bin/courier-maildiracl
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildirkw \
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/libs/maildir/maildirkw \
|
||||
${DESTDIR}${PREFIX}/bin/courier-maildirkw
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildirmake \
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/libs/maildir/maildirmake \
|
||||
${DESTDIR}${PREFIX}/bin/courier-maildirmake
|
||||
${INSTALL_MAN} ${WRKSRC}/maildir/maildiracl.1 \
|
||||
${INSTALL_MAN} ${WRKSRC}/libs/maildir/maildiracl.1 \
|
||||
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/courier-maildiracl.1
|
||||
${INSTALL_MAN} ${WRKSRC}/maildir/maildirkw.1 \
|
||||
${INSTALL_MAN} ${WRKSRC}/libs/maildir/maildirkw.1 \
|
||||
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/courier-maildirkw.1
|
||||
${INSTALL_MAN} ${WRKSRC}/maildir/maildirmake.1 \
|
||||
${INSTALL_MAN} ${WRKSRC}/libs/maildir/maildirmake.1 \
|
||||
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/courier-maildirmake.1
|
||||
${INSTALL_MAN} ${WRKSRC}/maildir/maildir.5 \
|
||||
${INSTALL_MAN} ${WRKSRC}/libs/maildir/maildir.5 \
|
||||
${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/courier-maildir.5
|
||||
${INSTALL_MAN} ${WRKSRC}/maildir/maildirquota.7 \
|
||||
${INSTALL_MAN} ${WRKSRC}/libs/maildir/maildirquota.7 \
|
||||
${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/maildirquota.7
|
||||
${INSTALL_MAN} ${WRKSRC}/maildir/deliverquota.8 \
|
||||
${INSTALL_MAN} ${WRKSRC}/libs/maildir/deliverquota.8 \
|
||||
${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/deliverquota.8
|
||||
${INSTALL_DATA} ${WRKSRC}/maildir/quotawarnmsg \
|
||||
${INSTALL_DATA} ${WRKSRC}/libs/maildir/quotawarnmsg \
|
||||
${DESTDIR}${EGDIR}/quotawarnmsg
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/maildir/sharedindexinstall \
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/libs/maildir/sharedindexinstall \
|
||||
${DESTDIR}${PREFIX}/sbin/sharedindexinstall
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/maildir/sharedindexsplit \
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/libs/maildir/sharedindexsplit \
|
||||
${DESTDIR}${PREFIX}/sbin/sharedindexsplit
|
||||
${INSTALL_SCRIPT} ${WRKDIR}/sharedindexupdate.sh \
|
||||
${DESTDIR}${EGDIR}/sharedindexupdate
|
||||
grep "^${DOCDIR:S/${PREFIX}\///}" ${PKGDIR}/PLIST | \
|
||||
while read file; do \
|
||||
src=${WRKSRC}/maildir/`basename $$file`; \
|
||||
src=${WRKSRC}/libs/maildir/`basename $$file`; \
|
||||
dst=${DESTDIR}${PREFIX}"/$$file"; \
|
||||
${INSTALL_DATA} "$$src" "$$dst"; \
|
||||
done
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
$NetBSD: distinfo,v 1.19 2021/10/26 10:53:56 nia Exp $
|
||||
$NetBSD: distinfo,v 1.20 2024/02/12 21:06:43 hans Exp $
|
||||
|
||||
BLAKE2s (courier-0.68.1.tar.bz2) = ae4454b029a09f6c74e87df5f02140c71a3a8f1c05855dc72d2cfee4c8427d89
|
||||
SHA512 (courier-0.68.1.tar.bz2) = 89b9f27379a1433a4caf20e619516317b019898de2f16640f1e18022513415b5e52e1abcde5f390d34238afab4da20835e3669070c4d450ce581dc5639bf8be2
|
||||
Size (courier-0.68.1.tar.bz2) = 7024234 bytes
|
||||
BLAKE2s (courier-1.3.5.tar.bz2) = c642c73d91d1e49661461f2436bde29b3c67e34ccfc495c92ae065f508894aea
|
||||
SHA512 (courier-1.3.5.tar.bz2) = 5f51383356f4a36f9c114be6aa69d694c82bb95b1a336d2948d486d582bd6559da69be93b7c20aee2ff57826ab7eeb265aa20794074456d036b22da7f280f95d
|
||||
Size (courier-1.3.5.tar.bz2) = 7901040 bytes
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
# $NetBSD: Makefile,v 1.65 2023/10/24 22:09:41 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.66 2024/02/12 21:06:43 hans Exp $
|
||||
|
||||
DISTNAME= courier-${COURIER_VERSION}
|
||||
PKGNAME= ${DISTNAME:S/-/-mta-/}
|
||||
PKGREVISION= 20
|
||||
PKGREVISION=
|
||||
CATEGORIES= mail
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
CONFLICTS+= esmtp>=1.2 postfix-[0-9]* qmail-[0-9]* sendmail-[0-9]*
|
||||
|
||||
|
|
@ -60,7 +58,6 @@ SUBST_FILES.courier= \
|
|||
courier/filters/courierfilter.html.in \
|
||||
courier/module.esmtp/esmtpd-msa.dist.in \
|
||||
courier/module.esmtp/esmtpd-ssl.dist.in \
|
||||
courier/module.esmtp/esmtpd.cnf.openssl.in \
|
||||
courier/module.esmtp/esmtpd.dist.in \
|
||||
courier/module.esmtp/mkesmtpdcert.in
|
||||
SUBST_SED.courier= -e "s|^ESMTPDSTART=.*|ESMTPDSTART=YES|g"
|
||||
|
|
@ -71,13 +68,6 @@ SUBST_SED.courier+= -e "s|@datadir@/esmtpd.rand|@sysconfdir@/esmtpd.rand|g"
|
|||
SUBST_SED.courier+= -e "s|@libexecdir@/filters|@libexecdir@/courier/filters|g"
|
||||
SUBST_STAGE.courier= pre-configure
|
||||
|
||||
SUBST_CLASSES+= perms
|
||||
SUBST_FILES.perms= courier/perms.sh.in
|
||||
SUBST_SED.perms= -e "s,@REAL_ROOT_USER@,"${REAL_ROOT_USER}",g" \
|
||||
-e "s,@ROOT_USER@,"${ROOT_USER}",g" \
|
||||
-e "s,@ROOT_GROUP@,"${ROOT_GROUP}",g"
|
||||
SUBST_STAGE.perms= pre-configure
|
||||
|
||||
SUBST_CLASSES+= paths
|
||||
SUBST_FILES.paths= ${WRKDIR}/mailer.conf
|
||||
SUBST_VARS.paths= PREFIX
|
||||
|
|
@ -89,15 +79,14 @@ SPECIAL_PERMS+= ${DATADIR}/filterctl ${COURIER_USER} ${COURIER_GROUP} 0500
|
|||
SPECIAL_PERMS+= ${PREFIX}/sbin/courierfilter ${COURIER_USER} \
|
||||
${COURIER_GROUP} 0500
|
||||
|
||||
LIBS.SunOS+= -lsocket -lnsl
|
||||
|
||||
.include "../../lang/perl5/buildlink3.mk"
|
||||
.include "../../security/courier-authlib/buildlink3.mk"
|
||||
|
||||
post-extract:
|
||||
${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
|
||||
|
||||
pre-build:
|
||||
${RM} -f ${WRKSRC}/version
|
||||
|
||||
post-build:
|
||||
${TOUCH} ${WRKDIR}/locallowercase
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile.common,v 1.16 2020/05/25 05:33:59 rillig Exp $
|
||||
# $NetBSD: Makefile.common,v 1.17 2024/02/12 21:06:43 hans Exp $
|
||||
#
|
||||
# used by mail/courier-imap/Makefile
|
||||
# used by mail/courier-maildir/Makefile
|
||||
|
|
@ -6,11 +6,15 @@
|
|||
# used by mail/sqwebmail/Makefile
|
||||
# used by net/couriertcpd/Makefile
|
||||
|
||||
COURIER_VERSION= 0.68.1
|
||||
COURIER_VERSION= 1.3.5
|
||||
LICENSE= gnu-gpl-v3
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
USE_TOOLS+= pkg-config
|
||||
|
||||
DATADIR= ${PREFIX}/share/courier
|
||||
DOCDIR= ${PREFIX}/share/doc/courier
|
||||
EGDIR= ${PREFIX}/share/examples/courier
|
||||
|
|
@ -34,16 +38,13 @@ USE_LIBTOOL= yes
|
|||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS+= --localstatedir=${COURIER_STATEDIR}
|
||||
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
|
||||
CONFIGURE_ARGS+= --disable-root-check
|
||||
CONFIGURE_ARGS+= --with-notice=unicode
|
||||
.if ${PKGPATH} != mail/courier-maildir && ${PKGPATH} != net/couriertcpd
|
||||
CONFIGURE_ARGS+= --enable-unicode
|
||||
.endif
|
||||
.if ${PKGPATH} != mail/courier-imap
|
||||
CONFIGURE_ARGS+= --enable-utf7-folder-encoding
|
||||
.endif
|
||||
.if ${PKGPATH} != net/couriertcpd
|
||||
CONFIGURE_ARGS+= --with-trashquota
|
||||
.endif
|
||||
|
||||
USE_DB185= yes
|
||||
CONFIGURE_ARGS+= --with-db=db
|
||||
|
|
@ -52,4 +53,6 @@ CONFIGURE_ARGS+= --with-db=db
|
|||
CONFIGURE_ENV+= SYSCONFTOOL_PERL=${PERL5:Q}
|
||||
|
||||
.include "../../converters/libiconv/buildlink3.mk"
|
||||
.include "../../devel/pcre/buildlink3.mk"
|
||||
.include "../../devel/libidn2/buildlink3.mk"
|
||||
.include "../../mail/courier-unicode/buildlink3.mk"
|
||||
.include "../../devel/pcre2/buildlink3.mk"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.11 2014/03/11 14:05:02 jperkin Exp $
|
||||
@comment $NetBSD: PLIST,v 1.12 2024/02/12 21:06:43 hans Exp $
|
||||
bin/cancelmsg
|
||||
bin/courier-config
|
||||
bin/couriermlm
|
||||
|
|
@ -7,14 +7,18 @@ bin/mailq
|
|||
bin/rmail
|
||||
bin/sendmail
|
||||
bin/testmxlookup
|
||||
bin/verifysmtp
|
||||
bin/webmlmd
|
||||
bin/webmlmd.rc
|
||||
libexec/courier/aliascombine
|
||||
libexec/courier/aliascreate
|
||||
libexec/courier/aliasexp
|
||||
libexec/courier/courierd
|
||||
libexec/courier/courierfilter
|
||||
libexec/courier/filters/dupfilter
|
||||
libexec/courier/filters/perlfilter
|
||||
libexec/courier/filters/ratefilter
|
||||
libexec/courier/filters/verifyfilter
|
||||
libexec/courier/submit
|
||||
libexec/courier/submitmkdir
|
||||
libexec/courier/webmail/webadmin
|
||||
|
|
@ -47,7 +51,10 @@ man/man8/makepercentrelay.8
|
|||
man/man8/makesmtpaccess-msa.8
|
||||
man/man8/makesmtpaccess.8
|
||||
man/man8/mkesmtpdcert.8
|
||||
man/man8/ratefilter.8
|
||||
man/man8/submit.8
|
||||
man/man8/verifyfilter.8
|
||||
man/man8/verifysmtp.8
|
||||
sbin/aliaslookup
|
||||
sbin/courier
|
||||
sbin/courier-showconfig
|
||||
|
|
@ -59,6 +66,10 @@ sbin/makehosteddomains
|
|||
share/courier/courierctl.start
|
||||
share/courier/couriermlm/adminrequest.tmpl
|
||||
share/courier/couriermlm/confsubj.tmpl
|
||||
share/courier/couriermlm/couriermlm-rcptfilter-ctlmsg
|
||||
share/courier/couriermlm/couriermlm-rcptfilter-msg
|
||||
share/courier/couriermlm/couriermlm-smtpfilter-ctlmsg
|
||||
share/courier/couriermlm/couriermlm-smtpfilter-msg
|
||||
share/courier/couriermlm/digestsubj.tmpl
|
||||
share/courier/couriermlm/fetch.tmpl
|
||||
share/courier/couriermlm/fetchsubj.tmpl
|
||||
|
|
@ -156,14 +167,12 @@ share/courier/filterctl
|
|||
share/courier/makealiases
|
||||
share/courier/makehosteddomains
|
||||
share/courier/perlfilter-example.pl
|
||||
share/courier/perlfilter-ratelimit.pl
|
||||
share/courier/perlfilter-wrapper.pl
|
||||
share/doc/courier/FAQ.html
|
||||
share/doc/courier/aliases.html
|
||||
share/doc/courier/aliaslookup.html
|
||||
share/doc/courier/bg.gif
|
||||
share/courier/verifysender
|
||||
share/courier/verifysenderfull
|
||||
share/doc/courier/bg.png
|
||||
share/doc/courier/cancelmsg.html
|
||||
share/doc/courier/changelog.html
|
||||
share/doc/courier/chinese_flag.png
|
||||
share/doc/courier/courier.html
|
||||
share/doc/courier/courierd.html
|
||||
share/doc/courier/courierdsn.html
|
||||
|
|
@ -180,40 +189,39 @@ share/doc/courier/draft-varshavchik-verp-smtpext.txt
|
|||
share/doc/courier/dupfilter.html
|
||||
share/doc/courier/esmtp.html
|
||||
share/doc/courier/esmtpd.html
|
||||
share/doc/courier/footer.html
|
||||
share/doc/courier/frame.js
|
||||
share/doc/courier/header.html
|
||||
share/doc/courier/icon.gif
|
||||
share/doc/courier/index.html
|
||||
share/doc/courier/index2.html
|
||||
share/doc/courier/install.html
|
||||
share/doc/courier/intro.html
|
||||
share/doc/courier/japanese_flag.png
|
||||
share/doc/courier/layout.html
|
||||
share/doc/courier/links.html
|
||||
share/doc/courier/local.html
|
||||
share/doc/courier/localmailfilter.html
|
||||
share/doc/courier/mailq.html
|
||||
share/doc/courier/main.html
|
||||
share/doc/courier/makeacceptmailfor.html
|
||||
share/doc/courier/makealiases.html
|
||||
share/doc/courier/makehosteddomains.html
|
||||
share/doc/courier/makepercentrelay.html
|
||||
share/doc/courier/makesmtpaccess.html
|
||||
share/doc/courier/menu.html
|
||||
share/doc/courier/FAQ.html
|
||||
share/doc/courier/aliases.html
|
||||
share/doc/courier/aliaslookup.html
|
||||
share/doc/courier/mkesmtpdcert.html
|
||||
share/doc/courier/modules.html
|
||||
share/doc/courier/pop3d.html
|
||||
share/doc/courier/preline.html
|
||||
share/doc/courier/queue.html
|
||||
share/doc/courier/ratefilter.html
|
||||
share/doc/courier/repo.html
|
||||
share/doc/courier/rpm.html
|
||||
share/doc/courier/sendmail.html
|
||||
share/doc/courier/socks.html
|
||||
share/doc/courier/status.html
|
||||
share/doc/courier/structures.html
|
||||
share/doc/courier/style.css
|
||||
share/doc/courier/submit.html
|
||||
share/doc/courier/svn.html
|
||||
share/doc/courier/testmxlookup.html
|
||||
share/doc/courier/verifyfilter.html
|
||||
share/doc/courier/webmlmd.html
|
||||
share/examples/courier/aliases/system
|
||||
share/examples/courier/courierd.dist
|
||||
|
|
@ -223,4 +231,5 @@ share/examples/courier/maildrop
|
|||
share/examples/courier/maildropfilter
|
||||
share/examples/courier/mailer.conf
|
||||
share/examples/courier/smtpaccess/default
|
||||
share/examples/courier/webadmin/restartauthcmd
|
||||
share/examples/courier/webmlmrc.dist
|
||||
|
|
|
|||
|
|
@ -1,24 +1,20 @@
|
|||
$NetBSD: distinfo,v 1.23 2021/10/26 10:53:56 nia Exp $
|
||||
$NetBSD: distinfo,v 1.24 2024/02/12 21:06:43 hans Exp $
|
||||
|
||||
BLAKE2s (courier-0.68.1.tar.bz2) = ae4454b029a09f6c74e87df5f02140c71a3a8f1c05855dc72d2cfee4c8427d89
|
||||
SHA512 (courier-0.68.1.tar.bz2) = 89b9f27379a1433a4caf20e619516317b019898de2f16640f1e18022513415b5e52e1abcde5f390d34238afab4da20835e3669070c4d450ce581dc5639bf8be2
|
||||
Size (courier-0.68.1.tar.bz2) = 7024234 bytes
|
||||
SHA1 (patch-aa) = 26af5d3ffd188fb7ab6ce18ef3241305e3c2363a
|
||||
SHA1 (patch-ab) = b65ceddc722962592af713c20fcf99da76b6af50
|
||||
SHA1 (patch-ac) = 225b0c418758e38e4f144100b1b2a34362008c33
|
||||
SHA1 (patch-ad) = 4a086c2d72106913989aa248d4d70b932a67eb90
|
||||
BLAKE2s (courier-1.3.5.tar.bz2) = c642c73d91d1e49661461f2436bde29b3c67e34ccfc495c92ae065f508894aea
|
||||
SHA512 (courier-1.3.5.tar.bz2) = 5f51383356f4a36f9c114be6aa69d694c82bb95b1a336d2948d486d582bd6559da69be93b7c20aee2ff57826ab7eeb265aa20794074456d036b22da7f280f95d
|
||||
Size (courier-1.3.5.tar.bz2) = 7901040 bytes
|
||||
SHA1 (patch-aa) = 1be0b3b0a6ff226533310d94c51abadd4005ee40
|
||||
SHA1 (patch-ab) = 253ceb334093a965753d6a796fcec1940acfc5f0
|
||||
SHA1 (patch-ac) = b7147b6c85530161fb1620409119d2d00d4a30dc
|
||||
SHA1 (patch-ad) = abff3e30b384af39dabd3c0d721ad9ae10b16481
|
||||
SHA1 (patch-ae) = 25cf54b4764da79d7c2a4ee40189b93542a2d1ff
|
||||
SHA1 (patch-af) = d5222c55039eb1060d1486d1d776e9f7afe9a991
|
||||
SHA1 (patch-ag) = fc9bfb34ce7a93647076c2305d206fd36ce54d9a
|
||||
SHA1 (patch-af) = bd07ca8fa0ce711fb4849bc218ed3b4478b05617
|
||||
SHA1 (patch-ag) = 913ea4897d96bf3ad885dd6221edb54f79e34af3
|
||||
SHA1 (patch-ah) = ef516d4da2acaffe72dd32a859ef03c2593a7b1e
|
||||
SHA1 (patch-ai) = ee3ae11ec6342afcd2284f4607b6f15412c1ac15
|
||||
SHA1 (patch-aj) = 9c4e9525f05ca73cb7358e4e0b341ef3e9aa08a5
|
||||
SHA1 (patch-aj) = ddffd683d418d10880db4d407657b9995327567a
|
||||
SHA1 (patch-al) = 1c7935b46b7affafa86e4a858ba6a79b7fbebbc5
|
||||
SHA1 (patch-an) = 2b78be9a0e8a9daf528da83007ba865f9b8cc402
|
||||
SHA1 (patch-ax) = 8978eacb3aa13559905849e9a7038441c0dfef22
|
||||
SHA1 (patch-ay) = d4b391e76167cd27012f928587d5feb57ea1b4ff
|
||||
SHA1 (patch-courier_cdfilters.C) = 1f9169de45355cd9a4ecb7e8ddac30df05d368d0
|
||||
SHA1 (patch-courier_cdmsgq.C) = 467479ded922cfff97c4e5876a5234eef3f82b50
|
||||
SHA1 (patch-courier_cmlmfetch.C) = 7426b5642271a8bcd4ed442eb6571d191a454d1f
|
||||
SHA1 (patch-courier_module.esmtp_esmtpclient.c) = 54f66d60e1d5e444725630ae31c47554ab421609
|
||||
SHA1 (patch-courier_webmlmd.H) = 3a66894c376bf84ae5a43f4c6f3dfbb687f9436e
|
||||
SHA1 (patch-ax) = c7eb48d5aef5a51ae143385d688b092870b56e21
|
||||
SHA1 (patch-ay) = 58da42d53f34394034ddcf2fcf6cd4a82e7c43cd
|
||||
SHA1 (patch-configure) = efad44aa1bf7ec5546ce97a01b48933a63b2489e
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
$NetBSD: patch-aa,v 1.7 2012/06/09 11:45:38 adam Exp $
|
||||
$NetBSD: patch-aa,v 1.8 2024/02/12 21:06:43 hans Exp $
|
||||
|
||||
--- courier/Makefile.in.orig 2011-04-04 13:07:49.000000000 +0000
|
||||
--- courier/Makefile.in.orig 2023-08-04 00:12:02.000000000 +0000
|
||||
+++ courier/Makefile.in
|
||||
@@ -46,16 +46,16 @@ build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
@@ -101,16 +101,16 @@ host_triplet = @host@
|
||||
target_triplet = @target@
|
||||
@HAVE_SGML_TRUE@am__append_1 = $(GITFILES)
|
||||
pkglibexec_PROGRAMS = aliasexp$(EXEEXT) aliascombine$(EXEEXT) \
|
||||
- aliascreate$(EXEEXT) sqwebmaild$(EXEEXT) submit$(EXEEXT) \
|
||||
+ aliascreate$(EXEEXT) submit$(EXEEXT) \
|
||||
|
|
@ -23,11 +23,11 @@ $NetBSD: patch-aa,v 1.7 2012/06/09 11:45:38 adam Exp $
|
|||
+ courier-showmodules$(EXEEXT) aliaslookup$(EXEEXT) @COURIERLDAPALIASD@ \
|
||||
@EXTRASBIN@ $(am__empty)
|
||||
cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@
|
||||
subdir = .
|
||||
@@ -473,29 +473,26 @@ DISTCLEANFILES = uidgid
|
||||
BUILT_SOURCES = prefix.h exec_prefix.h sysconfdir.h localstatedir.h \
|
||||
libexecdir.h bindir.h sbindir.h datadir.h filtersocketdir.h \
|
||||
uidgid.h configargs.h sort.h webmlmdhandlerslist.H
|
||||
noinst_PROGRAMS = testtrack$(EXEEXT)
|
||||
@@ -657,30 +657,27 @@ BUILT_SOURCES = prefix.h exec_prefix.h s
|
||||
filtersocketdir.h configargs.h sort.h $(am__append_1) \
|
||||
courierd.dist webmlmrc.dist webmlmdhandlerslist.H
|
||||
@HAVE_SGML_TRUE@GITFILES = courierd.dist.in ldapaliasrc.dist webmlmrc.dist.in
|
||||
-extrapkglib = makedatprog courierpop3login pcpd
|
||||
+extrapkglib =
|
||||
webmaildir = $(libexecdir)/courier/webmail
|
||||
|
|
@ -56,12 +56,14 @@ $NetBSD: patch-aa,v 1.7 2012/06/09 11:45:38 adam Exp $
|
|||
|
||||
databindir = $(datadir)
|
||||
-databin_SCRIPTS = courierctl.start makedat makealiases makehosteddomains \
|
||||
- pop3d pop3d-ssl mkimapdcert mkpop3dcert
|
||||
- makeimapaccess \
|
||||
- pop3d pop3d-ssl mkimapdcert mkpop3dcert mkdhparams
|
||||
+databin_SCRIPTS = courierctl.start makealiases makehosteddomains
|
||||
+
|
||||
|
||||
mlmdatadir = $(datadir)/couriermlm
|
||||
mlmdata_DATA = \
|
||||
@@ -551,7 +548,7 @@ mlmdata_DATA = \
|
||||
@@ -741,7 +738,7 @@ mlmdata_DATA = \
|
||||
webmlmsublist.tmpl.html \
|
||||
webmlm.tmpl.html
|
||||
|
||||
|
|
@ -70,9 +72,9 @@ $NetBSD: patch-aa,v 1.7 2012/06/09 11:45:38 adam Exp $
|
|||
cmdlibdir = @libexecdir@/courier
|
||||
|
||||
# Subdirectories
|
||||
@@ -1890,6 +1887,12 @@ couriertls$(EXEEXT): ../tcpd/couriertls$
|
||||
courierpop3login$(EXEEXT): ../imap/pop3login$(EXEEXT)
|
||||
cp -f ../imap/pop3login$(EXEEXT) courierpop3login$(EXEEXT)
|
||||
@@ -2314,6 +2311,12 @@ couriertls$(EXEEXT): ../libs/tcpd/courie
|
||||
courierpop3login$(EXEEXT): ../libs/imap/pop3login$(EXEEXT)
|
||||
cp -f ../libs/imap/pop3login$(EXEEXT) courierpop3login$(EXEEXT)
|
||||
|
||||
+courier-showconfig$(EXEEXT): showconfig$(EXEEXT)
|
||||
+ cp -f showconfig$(EXEEXT) courier-showconfig$(EXEEXT)
|
||||
|
|
@ -83,7 +85,7 @@ $NetBSD: patch-aa,v 1.7 2012/06/09 11:45:38 adam Exp $
|
|||
sort.h:
|
||||
echo '#define SORT "$(SORT)"' >sort.h
|
||||
|
||||
@@ -2045,39 +2048,21 @@ dist-hook:
|
||||
@@ -2469,43 +2472,23 @@ dist-hook:
|
||||
|
||||
install-exec-hook:
|
||||
for d in $(bindir) $(sbindir) $(libexecdir) $(libexecdir)/courier \
|
||||
|
|
@ -91,25 +93,28 @@ $NetBSD: patch-aa,v 1.7 2012/06/09 11:45:38 adam Exp $
|
|||
$(localstatedir) $(localstatedir)/tmp\
|
||||
$(webmaildir)\
|
||||
$(localstatedir)/track\
|
||||
$(localstatedir)/sts\
|
||||
$(localstatedir)/msgs $(localstatedir)/msgq ; do \
|
||||
$(mkinstalldirs) $(DESTDIR)$$d || :; done
|
||||
- $(INSTALL_SCRIPT) imapd.rc $(DESTDIR)$(datadir)/imapd
|
||||
- $(INSTALL_SCRIPT) imapd-ssl.rc $(DESTDIR)$(datadir)/imapd-ssl
|
||||
- rm -f $(DESTDIR)$(sbindir)/imapd
|
||||
- $(LN_S) $(datadir)/imapd $(DESTDIR)$(sbindir)/imapd
|
||||
- $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/imapd` $(DESTDIR)$(sbindir)/imapd
|
||||
- rm -f $(DESTDIR)$(sbindir)/imapd-ssl
|
||||
- $(LN_S) $(datadir)/imapd-ssl $(DESTDIR)$(sbindir)/imapd-ssl
|
||||
- $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/imapd-ssl` $(DESTDIR)$(sbindir)/imapd-ssl
|
||||
- rm -f $(DESTDIR)$(sbindir)/mkdhparams
|
||||
- $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/mkdhparams` $(DESTDIR)$(sbindir)/mkdhparams
|
||||
- rm -f $(DESTDIR)$(sbindir)/mkimapdcert
|
||||
- $(LN_S) $(datadir)/mkimapdcert $(DESTDIR)$(sbindir)/mkimapdcert
|
||||
- $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/mkimapdcert` $(DESTDIR)$(sbindir)/mkimapdcert
|
||||
- rm -f $(DESTDIR)$(sbindir)/mkpop3dcert
|
||||
- $(LN_S) $(datadir)/mkpop3dcert $(DESTDIR)$(sbindir)/mkpop3dcert
|
||||
- $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/mkpop3dcert` $(DESTDIR)$(sbindir)/mkpop3dcert
|
||||
- rm -f $(DESTDIR)$(bindir)/makedat
|
||||
- $(LN_S) $(datadir)/makedat $(DESTDIR)$(bindir)/makedat
|
||||
- for f in makealiases makehosteddomains pop3d pop3d-ssl \
|
||||
- $(LN_S) `realpath -m --relative-to $(bindir) $(datadir)/makedat` $(DESTDIR)$(bindir)/makedat
|
||||
- for f in makealiases makehosteddomains makeimapaccess pop3d pop3d-ssl \
|
||||
+ for f in makealiases makehosteddomains \
|
||||
; do rm -f $(DESTDIR)$(sbindir)/$$f ; \
|
||||
$(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
|
||||
- rm -f $(DESTDIR)$(sbindir)/webgpg ; $(LN_S) $(datadir)/sqwebmail/webgpg $(DESTDIR)$(sbindir)/webgpg
|
||||
$(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done
|
||||
- rm -f $(DESTDIR)$(sbindir)/webgpg ; $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/sqwebmail/webgpg` $(DESTDIR)$(sbindir)/webgpg
|
||||
$(INSTALL_PROGRAM) ../webadmin/webadmin $(DESTDIR)$(webmaildir)/webadmin
|
||||
- mkdir -p $(DESTDIR)$(sysconfdir)/shared
|
||||
- chmod 755 $(DESTDIR)$(sysconfdir)/shared
|
||||
|
|
@ -119,19 +124,20 @@ $NetBSD: patch-aa,v 1.7 2012/06/09 11:45:38 adam Exp $
|
|||
install-data-hook:
|
||||
-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/aliases
|
||||
-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/smtpaccess
|
||||
-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/imapaccess
|
||||
- -$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/aliasdir
|
||||
echo @MAILDROP@ >$(DESTDIR)$(sysconfdir)/maildrop
|
||||
+ echo @MAILDROP@ >$(DESTDIR)$(sysconfdir)/maildropfilter
|
||||
test -f $(DESTDIR)$(sysconfdir)/enablefiltering && exit 0; \
|
||||
echo esmtp >$(DESTDIR)$(sysconfdir)/enablefiltering
|
||||
test -f $(DESTDIR)$(sysconfdir)/aliases/system && exit 0; \
|
||||
@@ -2089,10 +2074,6 @@ install-data-hook:
|
||||
@@ -2517,10 +2500,6 @@ install-data-hook:
|
||||
rm -f $(DESTDIR)$(bindir)/rmail
|
||||
$(LN_S) sendmail $(DESTDIR)$(bindir)/rmail
|
||||
-$(mkinstalldirs) $(DESTDIR)@mandir@/man8
|
||||
- -$(mkinstalldirs) $(DESTDIR)$(webmailimagedir)
|
||||
- for f in `cat ../webmail/images/filelist` ; do \
|
||||
- $(INSTALL_DATA) $(srcdir)/../webmail/images/$$f \
|
||||
- for f in `cat ../libs/sqwebmail/images/filelist` ; do \
|
||||
- $(INSTALL_DATA) $(srcdir)/../libs/sqwebmail/images/$$f \
|
||||
- $(DESTDIR)$(webmailimagedir) ; done
|
||||
|
||||
install-permissions: perms.sh
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
$NetBSD: patch-ab,v 1.7 2012/06/09 11:45:38 adam Exp $
|
||||
$NetBSD: patch-ab,v 1.8 2024/02/12 21:06:43 hans Exp $
|
||||
|
||||
--- courier/configure.orig 2007-11-24 03:26:42.000000000 +0000
|
||||
--- courier/configure.orig 2023-08-04 00:12:02.000000000 +0000
|
||||
+++ courier/configure
|
||||
@@ -16102,9 +16102,9 @@ done
|
||||
@@ -19294,9 +19294,9 @@ done
|
||||
|
||||
if test "$testmode" = "0"
|
||||
then
|
||||
- INSTALL_PROGRAM='${INSTALL} -m 700'
|
||||
- INSTALL_SCRIPT='${INSTALL} -m 700'
|
||||
- INSTALL_DATA='${INSTALL} -m 600'
|
||||
+ INSTALL_PROGRAM='${BSD_INSTALL_PROGRAM}'
|
||||
+ INSTALL_SCRIPT='${BSD_INSTALL_SCRIPT}'
|
||||
+ INSTALL_DATA='${BSD_INSTALL_DATA}'
|
||||
fi
|
||||
# Automake stupidity
|
||||
|
||||
-INSTALL_PROGRAM='${INSTALL} -m 700'
|
||||
-INSTALL_SCRIPT='${INSTALL} -m 700'
|
||||
-INSTALL_DATA='${INSTALL} -m 600'
|
||||
+INSTALL_PROGRAM='${BSD_INSTALL_PROGRAM}'
|
||||
+INSTALL_SCRIPT='${BSD_INSTALL_SCRIPT}'
|
||||
+INSTALL_DATA='${BSD_INSTALL_DATA}'
|
||||
|
||||
ac_ext=cpp
|
||||
ac_cpp='$CXXCPP $CPPFLAGS'
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
$NetBSD: patch-ac,v 1.7 2012/06/09 11:45:38 adam Exp $
|
||||
$NetBSD: patch-ac,v 1.8 2024/02/12 21:06:43 hans Exp $
|
||||
|
||||
--- courier/doc/Makefile.in.orig 2007-11-17 19:48:53.000000000 -0500
|
||||
--- courier/doc/Makefile.in.orig 2023-04-23 22:08:03.000000000 +0000
|
||||
+++ courier/doc/Makefile.in
|
||||
@@ -169,7 +169,7 @@ top_srcdir = @top_srcdir@
|
||||
@@ -261,7 +261,7 @@ top_srcdir = @top_srcdir@
|
||||
version = @version@
|
||||
htmldocdir = @datadir@/htmldoc
|
||||
CLEANFILES = permissions.dat
|
||||
-miscfiles = japanese_flag.png chinese_flag.png bg.gif icon.gif manpage.css \
|
||||
+miscfiles = japanese_flag.png chinese_flag.png bg.gif icon.gif \
|
||||
-miscfiles = japanese_flag.png icon.gif bg.png manpage.css \
|
||||
+miscfiles = japanese_flag.png icon.gif bg.png \
|
||||
draft-varshavchik-exdata-smtpext.txt \
|
||||
draft-varshavchik-verp-smtpext.txt \
|
||||
draft-varshavchik-security-smtpext.txt \
|
||||
@@ -207,67 +189,38 @@ htmlin = \
|
||||
draft-varshavchik-security-smtpext.txt
|
||||
@@ -293,71 +293,39 @@ htmlin = \
|
||||
courier.html \
|
||||
courierldapaliasd.html \
|
||||
couriermlm.html \
|
||||
|
|
@ -31,6 +31,7 @@ $NetBSD: patch-ac,v 1.7 2012/06/09 11:45:38 adam Exp $
|
|||
- maildirkw.html \
|
||||
- maildirmake.html \
|
||||
- maildirquota.html \
|
||||
- maildirwatch.html \
|
||||
- maildropex.html \
|
||||
- maildropfilter.html \
|
||||
- maildropgdbm.html \
|
||||
|
|
@ -42,10 +43,12 @@ $NetBSD: patch-ac,v 1.7 2012/06/09 11:45:38 adam Exp $
|
|||
makealiases.html \
|
||||
- makedat.html \
|
||||
makehosteddomains.html \
|
||||
- makeimapaccess.html \
|
||||
- makemime.html \
|
||||
makepercentrelay.html \
|
||||
makesmtpaccess.html \
|
||||
- mimegpg.html \
|
||||
- mkdhparams.html \
|
||||
mkesmtpdcert.html \
|
||||
- mkimapdcert.html \
|
||||
- mkpop3dcert.html \
|
||||
|
|
@ -64,24 +67,24 @@ $NetBSD: patch-ac,v 1.7 2012/06/09 11:45:38 adam Exp $
|
|||
- mailq.1 mailbot.1 makemime.1 mimegpg.1 maildiracl.1 \
|
||||
- makedat.1 reformail.1 reformime.1 couriermlm.1 testmxlookup.1 \
|
||||
- dot-forward.1 couriertls.1 couriertcpd.1 maildirkw.1 \
|
||||
- webmlmd.1
|
||||
-
|
||||
-man5 = dot-courier.5 maildir.5
|
||||
-man7 = localmailfilter.7 maildirquota.7 maildropgdbm.7 maildropfilter.7 \
|
||||
- maildropex.7
|
||||
- maildirwatch.1 \
|
||||
+man1 = sendmail.1 preline.1 cancelmsg.1 \
|
||||
+ mailq.1 \
|
||||
+ couriermlm.1 testmxlookup.1 \
|
||||
+ dot-forward.1 webmlmd.1
|
||||
+ dot-forward.1 \
|
||||
webmlmd.1
|
||||
|
||||
-man8 = aliaslookup.8 courier.8 courierldapaliasd.8 courierpop3d.8 \
|
||||
- deliverquota.8 \
|
||||
-man5 = dot-courier.5 maildir.5
|
||||
-man7 = localmailfilter.7 maildirquota.7 maildropgdbm.7 maildropfilter.7 \
|
||||
- maildropex.7
|
||||
+man5 = dot-courier.5
|
||||
+man7 = localmailfilter.7
|
||||
+
|
||||
|
||||
-man8 = aliaslookup.8 courier.8 courierldapaliasd.8 courierpop3d.8 \
|
||||
- deliverquota.8 makeimapaccess.8 \
|
||||
+man8 = aliaslookup.8 courier.8 courierldapaliasd.8 \
|
||||
esmtpd.8 makeacceptmailfor.8 makehosteddomains.8\
|
||||
- mkesmtpdcert.8 mkimapdcert.8 mkpop3dcert.8 \
|
||||
- mkesmtpdcert.8 mkdhparams.8 mkimapdcert.8 mkpop3dcert.8 \
|
||||
+ mkesmtpdcert.8 \
|
||||
makealiases.8 makepercentrelay.8 makesmtpaccess.8 \
|
||||
- pop3d.8 pop3d-ssl.8 submit.8 imapd.8
|
||||
|
|
@ -89,7 +92,7 @@ $NetBSD: patch-ac,v 1.7 2012/06/09 11:45:38 adam Exp $
|
|||
|
||||
BUILT_SOURCES = \
|
||||
aliaslookup.html aliaslookup.8 \
|
||||
@@ -294,7 +265,7 @@ BUILT_SOURCES = \
|
||||
@@ -385,7 +353,7 @@ BUILT_SOURCES = \
|
||||
webmlmd.html.in webmlmd.1.in
|
||||
|
||||
EXTRA_DIST = $(nohtmlin) $(BUILT_SOURCES) dotforward.1 pop3d-ssl.8
|
||||
|
|
@ -98,7 +101,7 @@ $NetBSD: patch-ac,v 1.7 2012/06/09 11:45:38 adam Exp $
|
|||
$(man1dir)/rmail.1 $(man1dir)/dotforward.1 \
|
||||
$(man8dir)/makesmtpaccess-msa.8 \
|
||||
$(man8dir)/esmtpd-msa.8
|
||||
@@ -1216,8 +1187,7 @@ preline.1: preline.1.in
|
||||
@@ -1385,8 +1353,7 @@ testmxlookup.1: testmxlookup.1.in
|
||||
|
||||
install-man-extra:
|
||||
cd $(DESTDIR)$(man8dir) ; \
|
||||
|
|
|
|||
|
|
@ -1,31 +1,35 @@
|
|||
$NetBSD: patch-ad,v 1.6 2012/06/09 11:45:38 adam Exp $
|
||||
$NetBSD: patch-ad,v 1.7 2024/02/12 21:06:43 hans Exp $
|
||||
|
||||
--- courier/filters/Makefile.in.orig 2007-11-17 19:49:01.000000000 -0500
|
||||
--- courier/filters/Makefile.in.orig 2023-04-23 22:07:56.000000000 +0000
|
||||
+++ courier/filters/Makefile.in
|
||||
@@ -282,11 +282,12 @@ SUBDIRS = libfilter perlfilter
|
||||
@@ -461,6 +461,7 @@ SUBDIRS = libfilter perlfilter
|
||||
CLEANFILES = $(htmldoc_DATA) $(man_MANS) filtersocketdir.h filteractivedir.h \
|
||||
pidfile.h permissions.dat
|
||||
|
||||
+pkglibexecdir = $(libexecdir)/courier
|
||||
htmldocdir = @datadir@/htmldoc
|
||||
htmldoc_DATA = courierfilter.html courierperlfilter.html dupfilter.html
|
||||
htmldoc_DATA = courierfilter.html courierperlfilter.html dupfilter.html ratefilter.html verifyfilter.html
|
||||
databindir = $(datadir)
|
||||
databin_SCRIPTS = filterctl
|
||||
@@ -468,7 +469,7 @@ databin_SCRIPTS = filterctl
|
||||
data_DATA = verifysender verifysenderfull
|
||||
courierfilterexecdir = $(libexecdir)/courier
|
||||
noinst_SCRIPTS = courierfilter.start
|
||||
-filterbindir = $(libexecdir)/filters
|
||||
+filterbindir = $(pkglibexecdir)/filters
|
||||
bin_SCRIPTS = verifysmtp
|
||||
filtersocketdir = $(localstatedir)/filters
|
||||
allfiltersocketdir = $(localstatedir)/allfilters
|
||||
filterconfdir = $(sysconfdir)/filters
|
||||
@@ -1080,16 +1081,12 @@ install-exec-hook:
|
||||
@@ -1435,8 +1436,6 @@ install-exec-hook:
|
||||
install-data-hook:
|
||||
-$(mkinstalldirs) $(DESTDIR)$(filtersocketdir)
|
||||
-$(mkinstalldirs) $(DESTDIR)$(allfiltersocketdir)
|
||||
- -$(mkinstalldirs) $(DESTDIR)$(filterconfdir)
|
||||
- -$(mkinstalldirs) $(DESTDIR)$(filteractivedir)
|
||||
-$(mkinstalldirs) $(DESTDIR)$(sbindir)
|
||||
-$(mkinstalldirs) $(DESTDIR)$(bindir)
|
||||
chmod 500 $(DESTDIR)$(datadir)/filterctl
|
||||
rm -f $(DESTDIR)$(sbindir)/filterctl
|
||||
$(LN_S) $(datadir)/filterctl $(DESTDIR)$(sbindir)/filterctl
|
||||
@@ -1445,8 +1444,6 @@ install-data-hook:
|
||||
chmod 755 $(DESTDIR)$(filterbindir)
|
||||
chmod 750 $(DESTDIR)$(filtersocketdir)
|
||||
chmod 750 $(DESTDIR)$(allfiltersocketdir)
|
||||
- chmod 750 $(DESTDIR)$(filterconfdir)
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
$NetBSD: patch-af,v 1.5 2012/06/09 11:45:38 adam Exp $
|
||||
$NetBSD: patch-af,v 1.6 2024/02/12 21:06:43 hans Exp $
|
||||
|
||||
--- courier/filters/perlfilter/Makefile.in.orig Sat Jul 21 20:31:15 2007
|
||||
--- courier/filters/perlfilter/Makefile.in.orig 2023-04-23 22:08:01.000000000 +0000
|
||||
+++ courier/filters/perlfilter/Makefile.in
|
||||
@@ -233,7 +233,8 @@ top_srcdir = @top_srcdir@
|
||||
EXTRA_DIST = perlfilter-wrapper.pl perlfilter-example.pl
|
||||
@@ -366,7 +366,8 @@ top_srcdir = @top_srcdir@
|
||||
EXTRA_DIST = $(script_SCRIPTS) $(script_DATA)
|
||||
BUILT_SOURCES = filtersocketdir.h wrapperpl.h xsinit.c
|
||||
CLEANFILES = $(BUILT_SOURCES) permissions.dat
|
||||
-filterbindir = $(libexecdir)/filters
|
||||
|
|
@ -11,4 +11,4 @@ $NetBSD: patch-af,v 1.5 2012/06/09 11:45:38 adam Exp $
|
|||
+filterbindir = $(pkglibexecdir)/filters
|
||||
filterbin_PROGRAMS = @perlfilter_prog@
|
||||
scriptdir = $(datadir)
|
||||
script_SCRIPTS = perlfilter-wrapper.pl perlfilter-example.pl
|
||||
script_SCRIPTS = perlfilter-wrapper.pl \
|
||||
|
|
|
|||
|
|
@ -1,28 +1,28 @@
|
|||
$NetBSD: patch-ag,v 1.4 2012/06/09 11:45:38 adam Exp $
|
||||
$NetBSD: patch-ag,v 1.5 2024/02/12 21:06:43 hans Exp $
|
||||
|
||||
--- courier/module.esmtp/mkesmtpdcert.in.orig 2007-11-04 16:17:03.000000000 -0500
|
||||
--- courier/module.esmtp/mkesmtpdcert.in.orig 2021-05-23 13:32:53.000000000 +0000
|
||||
+++ courier/module.esmtp/mkesmtpdcert.in
|
||||
@@ -8,7 +8,13 @@
|
||||
# ESMTP STARTTLS. Normally this script would get called by an automatic
|
||||
# package installation routine.
|
||||
@@ -14,7 +14,13 @@ if [ -z "$PEMFILE" ]; then
|
||||
PEMFILE=@certsdir@/esmtpd
|
||||
fi
|
||||
|
||||
-if test "@ssllib@" = "openssl"
|
||||
+case "$1" in
|
||||
+gnutls) ssllib=gnutls ;;
|
||||
+openssl) ssllib=openssl ;;
|
||||
+*) ssllib="@ssllib@" ;;
|
||||
+esac
|
||||
+esac
|
||||
+
|
||||
+if test "$ssllib" = "openssl"
|
||||
then
|
||||
test -x @OPENSSL@ || exit 0
|
||||
else
|
||||
@@ -31,7 +37,7 @@ cleanup() {
|
||||
|
||||
cd @mydatadir@
|
||||
@@ -40,7 +46,7 @@ umask 077
|
||||
BITS="$BITS"
|
||||
set -e
|
||||
|
||||
-if test "@ssllib@" = "openssl"
|
||||
+if test "$ssllib" = "openssl"
|
||||
then
|
||||
cp /dev/null @mydatadir@/esmtpd.pem
|
||||
chmod 600 @mydatadir@/esmtpd.pem
|
||||
cp /dev/null "$PEMFILE".pem
|
||||
chmod 600 "$PEMFILE".pem
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-aj,v 1.6 2012/06/09 11:45:38 adam Exp $
|
||||
$NetBSD: patch-aj,v 1.7 2024/02/12 21:06:43 hans Exp $
|
||||
|
||||
--- courier/perms.sh.in.orig 2011-04-04 13:01:21.000000000 +0000
|
||||
--- courier/perms.sh.in.orig 2022-04-04 01:11:04.000000000 +0000
|
||||
+++ courier/perms.sh.in
|
||||
@@ -10,115 +10,41 @@ exec_prefix="@exec_prefix@"
|
||||
@@ -10,121 +10,43 @@ exec_prefix="@exec_prefix@"
|
||||
datarootdir="@datarootdir@"
|
||||
|
||||
PERMS="
|
||||
|
|
@ -12,6 +12,7 @@ $NetBSD: patch-aj,v 1.6 2012/06/09 11:45:38 adam Exp $
|
|||
-@localstatedir@/tmp 770
|
||||
-@localstatedir@/msgs 750
|
||||
-@localstatedir@/msgq 750
|
||||
-@localstatedir@/sts 755
|
||||
-@localstatedir@/track 755
|
||||
-
|
||||
-@sysconfdir@ 755 x
|
||||
|
|
@ -19,6 +20,7 @@ $NetBSD: patch-aj,v 1.6 2012/06/09 11:45:38 adam Exp $
|
|||
-@sysconfdir@/aliases 750
|
||||
-@sysconfdir@/enablefiltering 644 config
|
||||
-@sysconfdir@/maildrop 644 config
|
||||
-@sysconfdir@/imapaccess 755
|
||||
-@sysconfdir@/smtpaccess 755
|
||||
-@sysconfdir@/shared 755
|
||||
-@sysconfdir@/shared.tmp 755
|
||||
|
|
@ -56,8 +58,8 @@ $NetBSD: patch-aj,v 1.6 2012/06/09 11:45:38 adam Exp $
|
|||
-@libexecdir@/courier/webmail/webmail 555 x root bin
|
||||
@libexecdir@/courier/webmail/webmlm 555 x root bin
|
||||
-@libexecdir@/courier/sqwebmaild 555
|
||||
-@libexecdir@/courier/sqwebpasswd 2755
|
||||
@libexecdir@/courier/webmail/webadmin 4555 x root bin
|
||||
-@libexecdir@/courier/sqwebpasswd 2555
|
||||
@libexecdir@/courier/webmail/webadmin 511 x root root
|
||||
|
||||
-@sbindir@ 755 x bin bin
|
||||
@sbindir@/courier 555
|
||||
|
|
@ -102,15 +104,19 @@ $NetBSD: patch-aj,v 1.6 2012/06/09 11:45:38 adam Exp $
|
|||
@sbindir@/makealiases 550
|
||||
@datadir@/makehosteddomains 555
|
||||
@sbindir@/makehosteddomains 555
|
||||
-@datadir@/pop3d 755
|
||||
-@sbindir@/pop3d 755
|
||||
-@datadir@/pop3d-ssl 755
|
||||
-@sbindir@/pop3d-ssl 755
|
||||
@datadir@/makeimapaccess 555
|
||||
@sbindir@/makeimapaccess 555
|
||||
-@datadir@/pop3d 555
|
||||
-@sbindir@/pop3d 555
|
||||
-@datadir@/pop3d-ssl 555
|
||||
-@sbindir@/pop3d-ssl 555
|
||||
-@sbindir@/webgpg 555
|
||||
|
||||
@datadir@ 755 x bin bin
|
||||
@datadir@/courierctl.start 555
|
||||
|
||||
-@datadir@/mkdhparams 755
|
||||
-@sbindir@/mkdhparams 755
|
||||
-@datadir@/mkimapdcert 755
|
||||
-@sbindir@/mkimapdcert 755
|
||||
-@datadir@/mkpop3dcert 755
|
||||
|
|
@ -118,32 +124,11 @@ $NetBSD: patch-aj,v 1.6 2012/06/09 11:45:38 adam Exp $
|
|||
@datadir@/couriermlm 755
|
||||
|
||||
@datadir@/couriermlm/adminrequest.tmpl 644
|
||||
@@ -186,11 +112,20 @@ do
|
||||
if test "$USER" = ""
|
||||
then
|
||||
USER="@mailuser@"
|
||||
+ elif test "$USER" = "root"
|
||||
+ then
|
||||
+ USER="@REAL_ROOT_USER@"
|
||||
+ elif test "$USER" = "bin"
|
||||
+ then
|
||||
+ USER="@ROOT_USER@"
|
||||
fi
|
||||
|
||||
if test "$GROUP" = ""
|
||||
then
|
||||
GROUP="@mailgroup@"
|
||||
+ elif test "$GROUP" = "bin"
|
||||
+ then
|
||||
+ GROUP="@ROOT_GROUP@"
|
||||
fi
|
||||
|
||||
case $FILE in
|
||||
@@ -211,26 +146,7 @@ do
|
||||
@@ -221,26 +143,8 @@ do
|
||||
echo $FILE $MODE $USER $GROUP $SPECIAL
|
||||
done
|
||||
|
||||
-. ../tcpd/couriertls.config
|
||||
-. ../libs/tcpd/couriertls.config
|
||||
-
|
||||
-if test "$couriertls" != ""
|
||||
-then
|
||||
|
|
@ -152,17 +137,17 @@ $NetBSD: patch-aj,v 1.6 2012/06/09 11:45:38 adam Exp $
|
|||
-
|
||||
if test "@HAVE_LDAP@" != 0
|
||||
then
|
||||
- echo @sysconfdir@/ldapaliasrc.dist 640 @mailuser@ @mailgroup@ config
|
||||
echo @sbindir@/courierldapaliasd 700 @mailuser@ @mailgroup@
|
||||
echo @sysconfdir@/ldapaliasrc.dist 640 @mailuser@ @mailgroup@ config
|
||||
echo @sbindir@/courierldapaliasd 500 @mailuser@ @mailgroup@
|
||||
fi
|
||||
-
|
||||
-echo @datadir@/sqwebmail/images 755 @mailuser@ @mailgroup@
|
||||
-
|
||||
-for f in `cat ../webmail/images/filelist 2>/dev/null`
|
||||
-for f in `cat ../libs/sqwebmail/images/filelist 2>/dev/null`
|
||||
-do
|
||||
- echo @datadir@/sqwebmail/images/$f 444 @mailuser@ @mailgroup@
|
||||
-done
|
||||
-
|
||||
-. ../maildrop/uidgid
|
||||
-. ../libs/maildrop/uidgid
|
||||
-
|
||||
-echo @bindir@/maildrop 4511 $uid @mailgroup@
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
$NetBSD: patch-ax,v 1.3 2012/06/09 11:45:38 adam Exp $
|
||||
$NetBSD: patch-ax,v 1.4 2024/02/12 21:06:43 hans Exp $
|
||||
|
||||
--- courier/module.esmtp/Makefile.in.orig 2007-11-17 19:49:38.000000000 -0500
|
||||
--- courier/module.esmtp/Makefile.in.orig 2023-04-24 02:29:24.000000000 +0000
|
||||
+++ courier/module.esmtp/Makefile.in
|
||||
@@ -954,17 +954,11 @@ install-data-local:
|
||||
test -f $(DESTDIR)$(sbindir)/courieresmtpd && exit 0; $(mkinstalldirs) $(DESTDIR)$(sbindir) || :; rm -f $(DESTDIR)$(sbindir)/courieresmtpd && $(LN_S) $(moduledir)/courieresmtpd $(DESTDIR)$(sbindir)/courieresmtpd
|
||||
@@ -1238,17 +1238,11 @@ install-data-local:
|
||||
test -f $(DESTDIR)$(sbindir)/courieresmtpd && exit 0; $(mkinstalldirs) $(DESTDIR)$(sbindir) || :; rm -f $(DESTDIR)$(sbindir)/courieresmtpd && $(LN_S) `realpath --relative-to $(sbindir) -m $(moduledir)/courieresmtpd` $(DESTDIR)$(sbindir)/courieresmtpd
|
||||
-$(mkinstalldirs) $(DESTDIR)$(bindir)
|
||||
test -f $(DESTDIR)$(bindir)/addcr && exit 0; rm -f $(DESTDIR)$(bindir)/addcr && $(LN_S) $(moduledir)/addcr $(DESTDIR)$(bindir)/addcr
|
||||
test -f $(DESTDIR)$(bindir)/addcr && exit 0; rm -f $(DESTDIR)$(bindir)/addcr && $(LN_S) `realpath -m --relative-to $(bindir) $(moduledir)/addcr` $(DESTDIR)$(bindir)/addcr
|
||||
- -$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/esmtpacceptmailfor.dir
|
||||
- -$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/esmtppercentrelay.dir
|
||||
-$(mkinstalldirs) $(DESTDIR)$(sbindir)
|
||||
for f in $(databin_SCRIPTS) ; do \
|
||||
rm -f $(DESTDIR)$(sbindir)/$$f ; \
|
||||
$(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
|
||||
$(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done
|
||||
cat </dev/null >>$(DESTDIR)$(sysconfdir)/esmtpauthclient
|
||||
- chmod 600 $(DESTDIR)$(sysconfdir)/esmtpauthclient
|
||||
- test -w /etc || exit 0; \
|
||||
- test `id -u` = 0 || exit 0; \
|
||||
- chown @mailuser@ $(DESTDIR)$(sysconfdir)/esmtpauthclient ; \
|
||||
- chgrp @mailgroup@ $(DESTDIR)$(sysconfdir)/esmtpauthclient
|
||||
rm -f $(DESTDIR)$(sbindir)/esmtpd-msa $(DESTDIR)$(sbindir)/makesmtpaccess-msa
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
$NetBSD: patch-ay,v 1.2 2010/06/15 23:01:23 pettai Exp $
|
||||
$NetBSD: patch-ay,v 1.3 2024/02/12 21:06:43 hans Exp $
|
||||
|
||||
--- webadmin/Makefile.in.orig 2007-11-17 19:53:34.000000000 -0500
|
||||
--- webadmin/Makefile.in.orig 2023-04-23 22:07:48.000000000 +0000
|
||||
+++ webadmin/Makefile.in
|
||||
@@ -679,9 +679,6 @@ uninstall-am: uninstall-webadminDATA uni
|
||||
|
||||
@@ -925,9 +925,6 @@ sockdir.h:
|
||||
echo '#define SOCKDIR "$(localstatedir)"' >sockdir.h
|
||||
|
||||
install-exec-hook:
|
||||
- -$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/webadmin/added
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-configure,v 1.1 2024/02/12 21:06:43 hans Exp $
|
||||
|
||||
--- configure.orig 2023-08-04 00:10:03.000000000 +0000
|
||||
+++ configure
|
||||
@@ -17325,7 +17325,7 @@ fi
|
||||
|
||||
|
||||
|
||||
-if test `$COURIERAUTHCONFIG --version=0.70.0.20200518` = "no"
|
||||
+if test "`$COURIERAUTHCONFIG --version=0.70.0.20200518`" = "no"
|
||||
then
|
||||
as_fn_error $? "Courier authentication library version 0.71 is required." "$LINENO" 5
|
||||
fi
|
||||
|
|
@ -1,11 +1,9 @@
|
|||
# $NetBSD: Makefile,v 1.32 2020/05/21 19:21:17 rillig Exp $
|
||||
# $NetBSD: Makefile,v 1.33 2024/02/12 21:06:44 hans Exp $
|
||||
|
||||
DISTNAME= courier-${COURIER_VERSION}
|
||||
PKGNAME= ${DISTNAME:S/-/tcpd-/}
|
||||
PKGREVISION= 9
|
||||
PKGREVISION=
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
COMMENT= Courier TCP socket and TLS servers
|
||||
|
|
@ -16,6 +14,8 @@ CONFLICTS= courier-imap<4.1.1
|
|||
USE_TOOLS+= gmake pkg-config
|
||||
USE_LANGUAGES= c c++
|
||||
|
||||
GNU_CONFIGURE_ICONV= no
|
||||
|
||||
.include "../../mail/courier-mta/Makefile.common"
|
||||
|
||||
# This package doesn't need to depend on courier-authlib -- just fake
|
||||
|
|
@ -25,32 +25,40 @@ USE_LANGUAGES= c c++
|
|||
CONFIGURE_ENV+= ac_cv_path_COURIERAUTHCONFIG=${TRUE:Q}
|
||||
|
||||
# These are files required by the Courier configure scripts.
|
||||
WRKSRC_FILES= courier/courier.c config.guess config.sub \
|
||||
configure depcomp install-sh ltmain.sh missing \
|
||||
sysconftool
|
||||
WRKSRC_FILES+= Makefile.in courier.spec.in courier.lpspec.in \
|
||||
WRKSRC_FILES= courier/courier.c compile config.guess config.sub \
|
||||
configure courier-debuild.in depcomp install-sh \
|
||||
ltmain.sh missing sysconftool
|
||||
WRKSRC_FILES+= Makefile.in courier.spec.in \
|
||||
dbobj.h.in dbobj.config.in courier.service.in \
|
||||
courier.sysvinit.in
|
||||
|
||||
# These are subdirectories containing libraries used by couriertcpd.
|
||||
WRKSRC_SUBDIRS= bdbobj numlib soxwrap md5 random128 unicode \
|
||||
WRKSRC_SUBDIRS= bdbobj numlib soxwrap md5 random128 \
|
||||
rfc822 rfc1035 liblock waitlib tcpd
|
||||
|
||||
EXTRACT_ELEMENTS= ${WRKSRC_FILES:S/^/${DISTNAME}\//}
|
||||
EXTRACT_ELEMENTS+= ${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
|
||||
EXTRACT_ELEMENTS+= ${WRKSRC_SUBDIRS:S/^/${DISTNAME}\/libs\//}
|
||||
|
||||
BUILD_DIRS= ${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
|
||||
BUILD_DIRS= ${WRKSRC_SUBDIRS:S/^/${WRKSRC}\/libs\//}
|
||||
INSTALLATION_DIRS= bin sbin ${PKGMANDIR}/man1 ${DOCDIR}
|
||||
|
||||
REQD_DIRS= ${DOCDIR}
|
||||
MAKE_DIRS+= ${COURIER_STATEDIR}
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tcpd/couriertcpd \
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/libs/tcpd/couriertcpd \
|
||||
${DESTDIR}${PREFIX}/sbin/couriertcpd
|
||||
${INSTALL_MAN} ${WRKSRC}/tcpd/couriertcpd.1 \
|
||||
${INSTALL_MAN} ${WRKSRC}/libs/tcpd/couriertcpd.1 \
|
||||
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/couriertcpd.1
|
||||
${INSTALL_DATA} ${WRKSRC}/tcpd/couriertcpd.html \
|
||||
${INSTALL_DATA} ${WRKSRC}/libs/tcpd/couriertcpd.html \
|
||||
${DESTDIR}${DOCDIR}/couriertcpd.html
|
||||
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/libs/tcpd/couriertls \
|
||||
${DESTDIR}${PREFIX}/bin/couriertls
|
||||
${INSTALL_MAN} ${WRKSRC}/libs/tcpd/couriertls.1 \
|
||||
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/couriertls.1
|
||||
${INSTALL_DATA} ${WRKSRC}/libs/tcpd/couriertls.html \
|
||||
${DESTDIR}${DOCDIR}/couriertls.html
|
||||
|
||||
.include "../../security/openssl/buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
@comment $NetBSD: PLIST,v 1.3 2019/09/26 11:36:55 wiz Exp $
|
||||
@comment $NetBSD: PLIST,v 1.4 2024/02/12 21:06:44 hans Exp $
|
||||
bin/couriertls
|
||||
man/man1/couriertcpd.1
|
||||
man/man1/couriertls.1
|
||||
sbin/couriertcpd
|
||||
share/doc/courier/couriertcpd.html
|
||||
share/doc/courier/couriertls.html
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
$NetBSD: distinfo,v 1.15 2021/10/26 11:05:29 nia Exp $
|
||||
$NetBSD: distinfo,v 1.16 2024/02/12 21:06:44 hans Exp $
|
||||
|
||||
BLAKE2s (courier-0.68.1.tar.bz2) = ae4454b029a09f6c74e87df5f02140c71a3a8f1c05855dc72d2cfee4c8427d89
|
||||
SHA512 (courier-0.68.1.tar.bz2) = 89b9f27379a1433a4caf20e619516317b019898de2f16640f1e18022513415b5e52e1abcde5f390d34238afab4da20835e3669070c4d450ce581dc5639bf8be2
|
||||
Size (courier-0.68.1.tar.bz2) = 7024234 bytes
|
||||
BLAKE2s (courier-1.3.5.tar.bz2) = c642c73d91d1e49661461f2436bde29b3c67e34ccfc495c92ae065f508894aea
|
||||
SHA512 (courier-1.3.5.tar.bz2) = 5f51383356f4a36f9c114be6aa69d694c82bb95b1a336d2948d486d582bd6559da69be93b7c20aee2ff57826ab7eeb265aa20794074456d036b22da7f280f95d
|
||||
Size (courier-1.3.5.tar.bz2) = 7901040 bytes
|
||||
|
|
|
|||
Loading…
Reference in New Issue