From ac99ad06d9bef8637a5b3fd7ddd8e96281c8769e Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 5 Nov 2010 14:05:24 +0000 Subject: Changes 0.65.1: This is a bugfix release. --- mail/courier-maildir/Makefile | 6 +++--- mail/courier-maildir/distinfo | 8 ++++---- mail/courier-mta/Makefile | 19 +++++++++---------- mail/courier-mta/Makefile.common | 10 +++++----- mail/courier-mta/PLIST | 14 +++++++------- mail/courier-mta/PLIST.esmtp | 4 ++-- mail/courier-mta/distinfo | 8 ++++---- net/couriertcpd/distinfo | 8 ++++---- 8 files changed, 38 insertions(+), 39 deletions(-) diff --git a/mail/courier-maildir/Makefile b/mail/courier-maildir/Makefile index 4a3988ec397..6a8d72d868a 100644 --- a/mail/courier-maildir/Makefile +++ b/mail/courier-maildir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2010/03/21 16:29:40 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2010/11/05 14:05:24 adam Exp $ DISTNAME= courier-${COURIER_VERSION} PKGNAME= ${DISTNAME:S/-/-maildir-/} @@ -101,8 +101,8 @@ do-install: ${DESTDIR}${EGDIR}/sharedindexupdate grep "^${DOCDIR:S/${PREFIX}\///}" ${PKGDIR}/PLIST | \ while read file; do \ - src=${WRKSRC:Q}/maildir/`basename $$file`; \ - dst=${DESTDIR}${PREFIX:Q}"/$$file"; \ + src=${WRKSRC}/maildir/`basename $$file`; \ + dst=${DESTDIR}${PREFIX}"/$$file"; \ ${INSTALL_DATA} "$$src" "$$dst"; \ done diff --git a/mail/courier-maildir/distinfo b/mail/courier-maildir/distinfo index c9172cb838d..816e79979bf 100644 --- a/mail/courier-maildir/distinfo +++ b/mail/courier-maildir/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.13 2010/06/15 23:01:23 pettai Exp $ +$NetBSD: distinfo,v 1.14 2010/11/05 14:05:24 adam Exp $ -SHA1 (courier-0.65.0.tar.bz2) = 4e5b7e64a35fe886a59621bc87e7f111428f19bc -RMD160 (courier-0.65.0.tar.bz2) = e5fc4742da27b3b97bd2592ad3ecc96618abada3 -Size (courier-0.65.0.tar.bz2) = 7099997 bytes +SHA1 (courier-0.65.1.tar.bz2) = 0a844cebd37ecbd1795a23d94f792242c0e4f947 +RMD160 (courier-0.65.1.tar.bz2) = 6874ee37020b1baba5014f82c96501e539198f29 +Size (courier-0.65.1.tar.bz2) = 7108548 bytes diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile index 586573c8657..34ece8f01c9 100644 --- a/mail/courier-mta/Makefile +++ b/mail/courier-mta/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.32 2010/08/21 16:34:59 seb Exp $ +# $NetBSD: Makefile,v 1.33 2010/11/05 14:12:11 adam Exp $ DISTNAME= courier-${COURIER_VERSION} PKGNAME= ${DISTNAME:S/-/-mta-/} -PKGREVISION= 1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} EXTRACT_SUFX= .tar.bz2 @@ -30,20 +29,20 @@ PLIST_SRC+= ${PKGDIR}/PLIST .include "options.mk" .if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= ac_cv_path_REHASH=${FALSE} +CONFIGURE_ARGS+= ac_cv_path_REHASH=${FALSE:Q} .endif USERGROUP_PHASE= configure CONFIGURE_ENV+= CERTTOOL=${COURIER_CERTTOOL:Q} CONFIGURE_ENV+= OPENSSL=${COURIER_OPENSSL:Q} -CONFIGURE_ENV+= PROCMAIL=${PREFIX:Q}/bin/procmail +CONFIGURE_ENV+= PROCMAIL=${PREFIX}/bin/procmail -CONFIGURE_ARGS+= --datadir=${DATADIR:Q} +CONFIGURE_ARGS+= --datadir=${DATADIR} CONFIGURE_ARGS+= --with-mailuid=${PKG_UID.${COURIER_USER}} CONFIGURE_ARGS+= --with-mailgid=${PKG_GID.${COURIER_GROUP}} CONFIGURE_ARGS+= --with-paranoid-smtpext -CONFIGURE_ARGS+= --with-piddir=${COURIER_STATEDIR:Q}/tmp +CONFIGURE_ARGS+= --with-piddir=${COURIER_STATEDIR}/tmp CONFIGURE_ARGS+= --with-transport=${COURIER_TRANSPORTS:M*:Q} #CONFIGURE_ARGS+= --with-certdb=${SSLCERTS} @@ -78,14 +77,14 @@ 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:Q}",g" \ - -e "s,@ROOT_USER@,"${ROOT_USER:Q}",g" \ - -e "s,@ROOT_GROUP@,"${ROOT_GROUP:Q}",g" +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_SED.paths+= -e "s,@PREFIX@,${PREFIX:Q},g" +SUBST_SED.paths+= -e "s,@PREFIX@,${PREFIX},g" SUBST_STAGE.paths= post-patch REPLACE_PERL+= courier/webadmin/*.pl courier/webadmin/*.pl.in webadmin/*.pl diff --git a/mail/courier-mta/Makefile.common b/mail/courier-mta/Makefile.common index a15bf1effe2..18e3a192fd8 100644 --- a/mail/courier-mta/Makefile.common +++ b/mail/courier-mta/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.11 2010/06/15 23:01:23 pettai Exp $ +# $NetBSD: Makefile.common,v 1.12 2010/11/05 14:12:11 adam Exp $ -COURIER_VERSION= 0.65.0 +COURIER_VERSION= 0.65.1 LICENSE= gnu-gpl-v3 .include "../../mk/bsd.prefs.mk" @@ -20,14 +20,14 @@ COURIER_SCRIPT_PERMS= ${COURIER_USER} ${COURIER_GROUP} 0755 PKG_GROUPS_VARS+= COURIER_GROUP PKG_USERS_VARS+= COURIER_USER -FILES_SUBST+= COURIER_STATEDIR=${COURIER_STATEDIR:Q} +FILES_SUBST+= COURIER_STATEDIR=${COURIER_STATEDIR} .include "../../security/courier-authlib/Makefile.common" USE_LIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --localstatedir=${COURIER_STATEDIR:Q} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --localstatedir=${COURIER_STATEDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --disable-root-check CONFIGURE_ARGS+= --enable-unicode diff --git a/mail/courier-mta/PLIST b/mail/courier-mta/PLIST index d20dd5ab7dc..a3e5e885045 100644 --- a/mail/courier-mta/PLIST +++ b/mail/courier-mta/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:04:30 joerg Exp $ +@comment $NetBSD: PLIST,v 1.8 2010/11/05 14:12:11 adam Exp $ bin/cancelmsg bin/courier-config bin/couriermlm @@ -50,12 +50,12 @@ man/man8/mkesmtpdcert.8 man/man8/submit.8 sbin/aliaslookup sbin/courier +sbin/courier-showconfig +sbin/courier-showmodules sbin/courierfilter sbin/filterctl sbin/makealiases sbin/makehosteddomains -sbin/courier-showconfig -sbin/courier-showmodules share/courier/courierctl.start share/courier/couriermlm/adminrequest.tmpl share/courier/couriermlm/confsubj.tmpl @@ -125,10 +125,10 @@ share/courier/courierwebadmin/admin-20aliases.html share/courier/courierwebadmin/admin-20aliases.pl share/courier/courierwebadmin/admin-30esmtp.html share/courier/courierwebadmin/admin-30esmtp.pl -share/courier/courierwebadmin/admin-31esmtp.html -share/courier/courierwebadmin/admin-31esmtp.pl share/courier/courierwebadmin/admin-30xspf.html share/courier/courierwebadmin/admin-30xspf.pl +share/courier/courierwebadmin/admin-31esmtp.html +share/courier/courierwebadmin/admin-31esmtp.pl share/courier/courierwebadmin/admin-34fax.html share/courier/courierwebadmin/admin-34fax.pl share/courier/courierwebadmin/admin-35fax.html @@ -155,11 +155,11 @@ share/courier/courierwebadmin/webadmin.pm share/courier/filterctl share/courier/makealiases share/courier/makehosteddomains -share/courier/perlfilter-wrapper.pl share/courier/perlfilter-example.pl +share/courier/perlfilter-wrapper.pl share/doc/courier/FAQ.html -share/doc/courier/aliaslookup.html share/doc/courier/aliases.html +share/doc/courier/aliaslookup.html share/doc/courier/bg.gif share/doc/courier/cancelmsg.html share/doc/courier/changelog.html diff --git a/mail/courier-mta/PLIST.esmtp b/mail/courier-mta/PLIST.esmtp index b2feb05ef33..0ffa81105be 100644 --- a/mail/courier-mta/PLIST.esmtp +++ b/mail/courier-mta/PLIST.esmtp @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST.esmtp,v 1.2 2009/06/14 18:04:30 joerg Exp $ +@comment $NetBSD: PLIST.esmtp,v 1.3 2010/11/05 14:12:11 adam Exp $ bin/addcr libexec/courier/modules/esmtp/addcr libexec/courier/modules/esmtp/courieresmtp libexec/courier/modules/esmtp/courieresmtpd sbin/courieresmtpd sbin/esmtpd -sbin/esmtpd-ssl sbin/esmtpd-msa +sbin/esmtpd-ssl sbin/makeacceptmailfor sbin/makepercentrelay sbin/makesmtpaccess diff --git a/mail/courier-mta/distinfo b/mail/courier-mta/distinfo index 3bff72ad369..539c82927c2 100644 --- a/mail/courier-mta/distinfo +++ b/mail/courier-mta/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.13 2010/06/15 23:01:23 pettai Exp $ +$NetBSD: distinfo,v 1.14 2010/11/05 14:12:11 adam Exp $ -SHA1 (courier-0.65.0.tar.bz2) = 4e5b7e64a35fe886a59621bc87e7f111428f19bc -RMD160 (courier-0.65.0.tar.bz2) = e5fc4742da27b3b97bd2592ad3ecc96618abada3 -Size (courier-0.65.0.tar.bz2) = 7099997 bytes +SHA1 (courier-0.65.1.tar.bz2) = 0a844cebd37ecbd1795a23d94f792242c0e4f947 +RMD160 (courier-0.65.1.tar.bz2) = 6874ee37020b1baba5014f82c96501e539198f29 +Size (courier-0.65.1.tar.bz2) = 7108548 bytes SHA1 (patch-aa) = eaf5ade8fb49254aeeb66a3dc07368d1559d62e8 SHA1 (patch-ab) = 0152fc7e178cd6634142e05606b5cfa66bfa163d SHA1 (patch-ac) = 78ce4535d6a0d88d00cf0199c879786cde0eb1c1 diff --git a/net/couriertcpd/distinfo b/net/couriertcpd/distinfo index d1021ee0e17..370172dbc4c 100644 --- a/net/couriertcpd/distinfo +++ b/net/couriertcpd/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.9 2010/06/15 23:01:23 pettai Exp $ +$NetBSD: distinfo,v 1.10 2010/11/05 14:06:15 adam Exp $ -SHA1 (courier-0.65.0.tar.bz2) = 4e5b7e64a35fe886a59621bc87e7f111428f19bc -RMD160 (courier-0.65.0.tar.bz2) = e5fc4742da27b3b97bd2592ad3ecc96618abada3 -Size (courier-0.65.0.tar.bz2) = 7099997 bytes +SHA1 (courier-0.65.1.tar.bz2) = 0a844cebd37ecbd1795a23d94f792242c0e4f947 +RMD160 (courier-0.65.1.tar.bz2) = 6874ee37020b1baba5014f82c96501e539198f29 +Size (courier-0.65.1.tar.bz2) = 7108548 bytes -- cgit v1.2.3