summaryrefslogtreecommitdiff
path: root/mail/courier-mta
diff options
context:
space:
mode:
Diffstat (limited to 'mail/courier-mta')
-rw-r--r--mail/courier-mta/Makefile29
-rw-r--r--mail/courier-mta/Makefile.common4
-rw-r--r--mail/courier-mta/distinfo23
-rw-r--r--mail/courier-mta/files/courierd.sh4
-rw-r--r--mail/courier-mta/files/courieresmtp.sh18
-rw-r--r--mail/courier-mta/files/courieresmtpmsa.sh18
-rw-r--r--mail/courier-mta/files/courieresmtps.sh18
-rw-r--r--mail/courier-mta/files/courierfilter.sh4
-rw-r--r--mail/courier-mta/files/courierldapaliasd.sh3
-rw-r--r--mail/courier-mta/files/webmlm.sh8
-rw-r--r--mail/courier-mta/options.mk33
-rw-r--r--mail/courier-mta/patches/patch-aa14
-rw-r--r--mail/courier-mta/patches/patch-ab6
-rw-r--r--mail/courier-mta/patches/patch-ac12
-rw-r--r--mail/courier-mta/patches/patch-ad21
-rw-r--r--mail/courier-mta/patches/patch-ag28
-rw-r--r--mail/courier-mta/patches/patch-ai33
-rw-r--r--mail/courier-mta/patches/patch-aj22
-rw-r--r--mail/courier-mta/patches/patch-ax22
-rw-r--r--mail/courier-mta/patches/patch-ay14
20 files changed, 240 insertions, 94 deletions
diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile
index 6138302201e..26ffd9b937b 100644
--- a/mail/courier-mta/Makefile
+++ b/mail/courier-mta/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2007/10/17 13:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2008/02/19 18:45:23 jlam Exp $
DISTNAME= courier-${COURIER_VERSION}
PKGNAME= ${DISTNAME:S/-/-mta-/}
-PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
EXTRACT_SUFX= .tar.bz2
@@ -15,9 +14,10 @@ HOMEPAGE= http://www.courier-mta.org/
DEPENDS+= courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
DEPENDS+= couriertcpd>=${COURIER_VERSION}:../../net/couriertcpd
-DEPENDS+= maildrop>=2.0.4nb2:../../mail/maildrop
+DEPENDS+= maildrop>=2.0.4nb3:../../mail/maildrop
-USE_TOOLS+= gmake openssl:run perl:run
+PKG_DESTDIR_SUPPORT= user-destdir
+USE_TOOLS+= gmake perl:run
USE_LANGUAGES= c c++
GCC_REQD+= 3.0 # need Standard C++ Library
@@ -30,8 +30,9 @@ PLIST_SRC+= ${PKGDIR}/PLIST
USERGROUP_PHASE= configure
-CONFIGURE_ENV+= OPENSSL=${TOOLS_OPENSSL:Q}
-CONFIGURE_ENV+= PROCMAIL=${LOCALBASE:Q}/bin/procmail
+CONFIGURE_ENV+= CERTTOOL=${COURIER_CERTTOOL:Q}
+CONFIGURE_ENV+= OPENSSL=${COURIER_OPENSSL:Q}
+CONFIGURE_ENV+= PROCMAIL=${PREFIX:Q}/bin/procmail
CONFIGURE_ARGS+= --datadir=${DATADIR:Q}
CONFIGURE_ARGS+= --with-mailuid=${PKG_UID.${COURIER_USER}}
@@ -59,11 +60,12 @@ SUBST_FILES.courier= courier/doc/mkesmtpdcert.8.in \
courier/filters/courierfilter.html.in \
courier/module.esmtp/esmtpd-msa.dist.in \
courier/module.esmtp/esmtpd-ssl.dist.in \
- courier/module.esmtp/esmtpd.cnf.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" \
-e "s|^ESMTPDSSLSTART=.*|ESMTPDSSLSTART=YES|g" \
+ -e "s|@mydatadir@|@sysconfdir@|g" \
-e "s|@datadir@/esmtpd.pem|@sysconfdir@/esmtpd.pem|g" \
-e "s|@datadir@/esmtpd.rand|@sysconfdir@/esmtpd.rand|g" \
-e "s|@libexecdir@/filters|@libexecdir@/courier/filters|g"
@@ -78,7 +80,7 @@ SUBST_STAGE.perms= pre-configure
SUBST_CLASSES+= paths
SUBST_FILES.paths= ${WRKDIR}/mailer.conf
-SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
+SUBST_SED.paths+= -e "s,@PREFIX@,${PREFIX:Q},g"
SUBST_STAGE.paths= post-patch
REPLACE_PERL+= courier/webadmin/*.pl courier/webadmin/*.pl.in webadmin/*.pl
@@ -96,9 +98,12 @@ post-install:
cd ${WRKSRC}/courier && \
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install-permissions
${CHOWN} ${COURIER_USER}:${COURIER_GROUP} \
- ${DATADIR}/filterctl ${PREFIX}/sbin/courierfilter
- ${CHMOD} 0500 ${DATADIR}/filterctl ${PREFIX}/sbin/courierfilter
- ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EGDIR}
- ${INSTALL_DATA} ${WRKDIR}/locallowercase ${EGDIR}/locallowercase
+ ${DESTDIR}${DATADIR}/filterctl \
+ ${DESTDIR}${PREFIX}/sbin/courierfilter
+ ${CHMOD} 0500 ${DESTDIR}${DATADIR}/filterctl \
+ ${DESTDIR}${PREFIX}/sbin/courierfilter
+ ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${DESTDIR}${EGDIR}
+ ${INSTALL_DATA} ${WRKDIR}/locallowercase \
+ ${DESTDIR}${EGDIR}/locallowercase
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-mta/Makefile.common b/mail/courier-mta/Makefile.common
index d9a7154e404..139031319e9 100644
--- a/mail/courier-mta/Makefile.common
+++ b/mail/courier-mta/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.8 2007/10/31 14:22:55 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2008/02/19 18:45:23 jlam Exp $
-COURIER_VERSION= 0.57.1
+COURIER_VERSION= 0.58.0
#LICENSE= gnu-gpl-v3
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/courier-mta/distinfo b/mail/courier-mta/distinfo
index d57a21c2a19..e738602b059 100644
--- a/mail/courier-mta/distinfo
+++ b/mail/courier-mta/distinfo
@@ -1,16 +1,19 @@
-$NetBSD: distinfo,v 1.10 2007/10/17 13:50:30 jlam Exp $
+$NetBSD: distinfo,v 1.11 2008/02/19 18:45:23 jlam Exp $
-SHA1 (courier-0.57.1.tar.bz2) = 5e602d4a4d5dd33b17146c7f54467ac6352e9340
-RMD160 (courier-0.57.1.tar.bz2) = 28b9f409e281403280b69f3a4f4be8b9e4f74dc2
-Size (courier-0.57.1.tar.bz2) = 7098660 bytes
-SHA1 (patch-aa) = 10e3bc04883578ea235d9631ee72ead707f92a68
-SHA1 (patch-ab) = e01fd7a1b3993b849c2495874f61c68a89384f9d
-SHA1 (patch-ac) = 7790248b02a333e11f1429c88e7428b7e0fedb8d
-SHA1 (patch-ad) = 0899aea066310909e4595974e5df69980a4db5d2
+SHA1 (courier-0.58.0.tar.bz2) = 964d81e6de5390678c9f10dddbc176273b925f6d
+RMD160 (courier-0.58.0.tar.bz2) = 940fb7967d154aeeb462691beb508155b3df4e29
+Size (courier-0.58.0.tar.bz2) = 7123136 bytes
+SHA1 (patch-aa) = 3f5465bd153d51f1dd6ed2f7849c098957afec2e
+SHA1 (patch-ab) = 6b46f55cafc63611d841e03dbe53c9f0b6731920
+SHA1 (patch-ac) = 3db182c84827d53af35ea45b7296b98ecf0579d8
+SHA1 (patch-ad) = faa1d2f21f55550efa631c25435fefee5b235bf2
SHA1 (patch-ae) = e52ab2f6a4e253dc4a28291db6744ea2593f2fc3
SHA1 (patch-af) = a3bcc672fc05e05497d7408c1a96ad52226aee01
+SHA1 (patch-ag) = 1bedd756d9932365896da82704941cdbc06e1dfd
SHA1 (patch-ah) = 78e0db8d5319d985d7e8aec4c1240561fead3a00
-SHA1 (patch-ai) = a66ce54eb2bc9ecb9905588a7bf5e3423ac57214
-SHA1 (patch-aj) = 5e3bcd5c8b0186dd048807deb6603102d05f1303
+SHA1 (patch-ai) = 1337870d95bb46882980553ffba6ec6956bc9147
+SHA1 (patch-aj) = cf666ac5c05e9fb5aef9c23d534edefa745ab547
SHA1 (patch-al) = 1c7935b46b7affafa86e4a858ba6a79b7fbebbc5
SHA1 (patch-an) = 1c78baf7fc393b013c47745b914571aff94f1497
+SHA1 (patch-ax) = ed01509d1868b92e80ec98e320ac285345584e31
+SHA1 (patch-ay) = 499f46a7116da4f7adfa6e7c2d7e4e4856174a9f
diff --git a/mail/courier-mta/files/courierd.sh b/mail/courier-mta/files/courierd.sh
index 1823c0bb7e4..b4fec529bdc 100644
--- a/mail/courier-mta/files/courierd.sh
+++ b/mail/courier-mta/files/courierd.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: courierd.sh,v 1.4 2007/08/10 17:57:04 jlam Exp $
+# $NetBSD: courierd.sh,v 1.5 2008/02/19 18:45:24 jlam Exp $
#
# Courier core processes
#
@@ -36,7 +36,7 @@ courierd_prestart()
@COURIER_USER@ @COURIER_GROUP@ 0750
mkdir_perms @COURIER_STATEDIR@/msgs \
@COURIER_USER@ @COURIER_GROUP@ 0750
- mkdir_perms @COURIER_STATEDIR@/tmp\
+ mkdir_perms @COURIER_STATEDIR@/tmp \
@COURIER_USER@ @COURIER_GROUP@ 0770
mkdir_perms @COURIER_STATEDIR@/track \
@COURIER_USER@ @COURIER_GROUP@ 0755
diff --git a/mail/courier-mta/files/courieresmtp.sh b/mail/courier-mta/files/courieresmtp.sh
index 12771c1f3db..417dc0ffb0d 100644
--- a/mail/courier-mta/files/courieresmtp.sh
+++ b/mail/courier-mta/files/courieresmtp.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: courieresmtp.sh,v 1.4 2007/09/22 04:42:03 jlam Exp $
+# $NetBSD: courieresmtp.sh,v 1.5 2008/02/19 18:45:24 jlam Exp $
#
# Courier ESMTP services daemon
#
@@ -17,9 +17,25 @@ ctl_command="@PREFIX@/sbin/esmtpd"
pidfile="@COURIER_STATEDIR@/tmp/esmtp.pid"
required_files="@PKG_SYSCONFDIR@/esmtpd @PKG_SYSCONFDIR@/esmtpd-ssl"
+start_precmd="${name}_prestart"
start_cmd="${name}_doit start"
stop_cmd="${name}_doit stop"
+mkdir_perms()
+{
+ dir="$1"; user="$2"; group="$3"; mode="$4"
+ @TEST@ -d $dir || @MKDIR@ $dir
+ @CHOWN@ $user $dir
+ @CHGRP@ $group $dir
+ @CHMOD@ $mode $dir
+}
+
+courieresmtp_prestart()
+{
+ mkdir_perms @COURIER_STATEDIR@/tmp \
+ @COURIER_USER@ @COURIER_GROUP@ 0770
+}
+
courieresmtp_doit()
{
action=$1
diff --git a/mail/courier-mta/files/courieresmtpmsa.sh b/mail/courier-mta/files/courieresmtpmsa.sh
index 98086da8954..391cf312d21 100644
--- a/mail/courier-mta/files/courieresmtpmsa.sh
+++ b/mail/courier-mta/files/courieresmtpmsa.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: courieresmtpmsa.sh,v 1.4 2007/09/22 04:42:03 jlam Exp $
+# $NetBSD: courieresmtpmsa.sh,v 1.5 2008/02/19 18:45:24 jlam Exp $
#
# Courier ESMTP-MSA (RFC 2476) services daemon
#
@@ -17,9 +17,25 @@ ctl_command="@PREFIX@/sbin/esmtpd-msa"
pidfile="@COURIER_STATEDIR@/tmp/esmtpd-msa.pid"
required_files="@PKG_SYSCONFDIR@/esmtpd @PKG_SYSCONFDIR@/esmtpd-msa"
+start_precmd="${name}_prestart"
start_cmd="${name}_doit start"
stop_cmd="${name}_doit stop"
+mkdir_perms()
+{
+ dir="$1"; user="$2"; group="$3"; mode="$4"
+ @TEST@ -d $dir || @MKDIR@ $dir
+ @CHOWN@ $user $dir
+ @CHGRP@ $group $dir
+ @CHMOD@ $mode $dir
+}
+
+courieresmtpmsa_prestart()
+{
+ mkdir_perms @COURIER_STATEDIR@/tmp \
+ @COURIER_USER@ @COURIER_GROUP@ 0770
+}
+
courieresmtpmsa_doit()
{
action=$1
diff --git a/mail/courier-mta/files/courieresmtps.sh b/mail/courier-mta/files/courieresmtps.sh
index 445b44cd3fc..6e75e72cf61 100644
--- a/mail/courier-mta/files/courieresmtps.sh
+++ b/mail/courier-mta/files/courieresmtps.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: courieresmtps.sh,v 1.5 2007/09/22 04:42:03 jlam Exp $
+# $NetBSD: courieresmtps.sh,v 1.6 2008/02/19 18:45:24 jlam Exp $
#
# Courier ESMTP/SSL services daemon
#
@@ -17,9 +17,25 @@ ctl_command="@PREFIX@/sbin/esmtpd-ssl"
pidfile="@COURIER_STATEDIR@/tmp/esmtpd-ssl.pid"
required_files="@PKG_SYSCONFDIR@/esmtpd @PKG_SYSCONFDIR@/esmtpd-ssl"
+start_precmd="${name}_prestart"
start_cmd="${name}_doit start"
stop_cmd="${name}_doit stop"
+mkdir_perms()
+{
+ dir="$1"; user="$2"; group="$3"; mode="$4"
+ @TEST@ -d $dir || @MKDIR@ $dir
+ @CHOWN@ $user $dir
+ @CHGRP@ $group $dir
+ @CHMOD@ $mode $dir
+}
+
+courieresmtps_prestart()
+{
+ mkdir_perms @COURIER_STATEDIR@/tmp \
+ @COURIER_USER@ @COURIER_GROUP@ 0770
+}
+
courieresmtps_doit()
{
action=$1
diff --git a/mail/courier-mta/files/courierfilter.sh b/mail/courier-mta/files/courierfilter.sh
index dcd03907481..9fe0913a5ee 100644
--- a/mail/courier-mta/files/courierfilter.sh
+++ b/mail/courier-mta/files/courierfilter.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: courierfilter.sh,v 1.5 2007/09/22 04:42:03 jlam Exp $
+# $NetBSD: courierfilter.sh,v 1.6 2008/02/19 18:45:24 jlam Exp $
#
# Courier mail filter daemon
#
@@ -40,6 +40,8 @@ courierfilter_prestart()
@COURIER_USER@ @COURIER_GROUP@ 0750
mkdir_perms @PKG_SYSCONFDIR@/filters/active \
@COURIER_USER@ @COURIER_GROUP@ 0750
+ mkdir_perms @COURIER_STATEDIR@/tmp \
+ @COURIER_USER@ @COURIER_GROUP@ 0770
}
courierfilter_doit()
diff --git a/mail/courier-mta/files/courierldapaliasd.sh b/mail/courier-mta/files/courierldapaliasd.sh
index 9bcfbe699bb..f5c58eb693a 100644
--- a/mail/courier-mta/files/courierldapaliasd.sh
+++ b/mail/courier-mta/files/courierldapaliasd.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: courierldapaliasd.sh,v 1.4 2007/08/10 17:57:04 jlam Exp $
+# $NetBSD: courierldapaliasd.sh,v 1.5 2008/02/19 18:45:24 jlam Exp $
#
# Courier LDAP mail aliasing daemon
#
@@ -32,7 +32,6 @@ mkdir_perms()
courierldapaliasd_prestart()
{
- @MKDIR@ @COURIER_STATEDIR@
mkdir_perms @COURIER_STATEDIR@/tmp \
@COURIER_USER@ @COURIER_GROUP@ 0770
}
diff --git a/mail/courier-mta/files/webmlm.sh b/mail/courier-mta/files/webmlm.sh
index e238113b81c..fb705d05d18 100644
--- a/mail/courier-mta/files/webmlm.sh
+++ b/mail/courier-mta/files/webmlm.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: webmlm.sh,v 1.3 2007/09/22 05:07:49 jlam Exp $
+# $NetBSD: webmlm.sh,v 1.4 2008/02/19 18:45:24 jlam Exp $
#
# Courier mailing list management daemon
#
@@ -18,9 +18,15 @@ pidfile="@COURIER_STATEDIR@/webmlm.pid"
required_files="@PKG_SYSCONFDIR@/webmlmrc"
restart_cmd="${name}_doit restart"
+start_precmd="${name}_prestart"
start_cmd="${name}_doit start"
stop_cmd="${name}_doit stop"
+webmlm_prestart()
+{
+ @TEST@ -d @COURIER_STATEDIR@ || @MKDIR@ @COURIER_STATEDIR@
+}
+
webmlm_doit()
{
action=$1
diff --git a/mail/courier-mta/options.mk b/mail/courier-mta/options.mk
index 614ee8f2bde..b3a96bdb1a3 100644
--- a/mail/courier-mta/options.mk
+++ b/mail/courier-mta/options.mk
@@ -1,11 +1,14 @@
-# $NetBSD: options.mk,v 1.8 2007/09/21 14:12:19 jlam Exp $
+# $NetBSD: options.mk,v 1.9 2008/02/19 18:45:23 jlam Exp $
# Global and legacy options
-PKG_OPTIONS_VAR= PKG_OPTIONS.courier-mta
-PKG_SUPPORTED_OPTIONS= courier-dsn courier-esmtp courier-local \
- courier-uucp inet6 ldap
-PKG_SUGGESTED_OPTIONS= courier-dsn courier-esmtp courier-local inet6
+PKG_OPTIONS_VAR= PKG_OPTIONS.courier-mta
+PKG_SUPPORTED_OPTIONS= courier-dsn courier-esmtp courier-local \
+ courier-uucp inet6 ldap
+PKG_OPTIONS_OPTIONAL_GROUPS= tls
+PKG_OPTIONS_GROUP.tls= gnutls ssl
+PKG_SUGGESTED_OPTIONS= courier-dsn courier-esmtp courier-local \
+ inet6 ssl
.include "../../mk/bsd.options.mk"
@@ -140,3 +143,23 @@ CONF_FILES_PERMS+= ${EGDIR}/ldapaliasrc.dist \
FILES_SUBST+= COURIERLDAPALIASD=
CONFIGURE_ARGS+= --without-ldapaliasd
.endif
+
+######################################################################
+###
+### Default to using the OpenSSL or GNUTLS tools for creating certificates.
+###
+.if !empty(PKG_OPTIONS:Mgnutls) || !empty(PKG_OPTIONS:Mssl)
+SUBST_CLASSES+= tls
+SUBST_FILES.tls= courier/module.esmtp/mkesmtpdcert.in
+SUBST_STAGE.tls= pre-configure
+COURIER_CERTTOOL= ${PREFIX}/bin/certtool
+COURIER_OPENSSL= ${PREFIX}/bin/openssl
+.endif
+.if !empty(PKG_OPTIONS:Mgnutls)
+SUBST_SED.tls= -e "s|@ssllib@|gnutls|g"
+.endif
+.if !empty(PKG_OPTIONS:Mssl)
+USE_TOOLS+= openssl:run
+COURIER_OPENSSL= ${TOOLS_OPENSSL}
+SUBST_SED.tls= -e "s|@ssllib@|openssl|g"
+.endif
diff --git a/mail/courier-mta/patches/patch-aa b/mail/courier-mta/patches/patch-aa
index 0b2d5614b31..6957c39bd85 100644
--- a/mail/courier-mta/patches/patch-aa
+++ b/mail/courier-mta/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2007/10/15 15:37:14 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2008/02/19 18:45:24 jlam Exp $
---- courier/Makefile.in.orig Sat Sep 29 14:57:58 2007
+--- courier/Makefile.in.orig 2007-11-23 22:26:43.000000000 -0500
+++ courier/Makefile.in
@@ -46,16 +46,16 @@ build_triplet = @build@
host_triplet = @host@
@@ -84,7 +84,13 @@ $NetBSD: patch-aa,v 1.4 2007/10/15 15:37:14 jlam Exp $
sort.h:
echo '#define SORT "$(SORT)"' >sort.h
-@@ -1834,33 +1837,16 @@ install-exec-hook:
+@@ -1828,39 +1831,21 @@ dist-hook:
+
+ install-exec-hook:
+ for d in $(bindir) $(sbindir) $(libexecdir) $(libexecdir)/courier \
+- $(sysconfdir)/filters \
+ $(localstatedir) $(localstatedir)/tmp\
+ $(webmaildir)\
$(localstatedir)/track\
$(localstatedir)/msgs $(localstatedir)/msgq ; do \
$(mkinstalldirs) $(DESTDIR)$$d || :; done
@@ -120,7 +126,7 @@ $NetBSD: patch-aa,v 1.4 2007/10/15 15:37:14 jlam Exp $
test -f $(DESTDIR)$(sysconfdir)/enablefiltering && exit 0; \
echo esmtp >$(DESTDIR)$(sysconfdir)/enablefiltering
test -f $(DESTDIR)$(sysconfdir)/aliases/system && exit 0; \
-@@ -1872,10 +1858,6 @@ install-data-hook:
+@@ -1872,10 +1857,6 @@ install-data-hook:
rm -f $(DESTDIR)$(bindir)/rmail
$(LN_S) sendmail $(DESTDIR)$(bindir)/rmail
-$(mkinstalldirs) $(DESTDIR)@mandir@/man8
diff --git a/mail/courier-mta/patches/patch-ab b/mail/courier-mta/patches/patch-ab
index 0eeaee25fed..fccf66711f2 100644
--- a/mail/courier-mta/patches/patch-ab
+++ b/mail/courier-mta/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2007/10/15 15:37:14 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2008/02/19 18:45:24 jlam Exp $
---- courier/configure.orig Sat Sep 29 14:57:58 2007
+--- courier/configure.orig 2007-11-23 22:26:42.000000000 -0500
+++ courier/configure
-@@ -22280,9 +22280,9 @@ done
+@@ -22366,9 +22366,9 @@ done
if test "$testmode" = "0"
then
diff --git a/mail/courier-mta/patches/patch-ac b/mail/courier-mta/patches/patch-ac
index 12a7872c82f..c3f3ca585a5 100644
--- a/mail/courier-mta/patches/patch-ac
+++ b/mail/courier-mta/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2007/10/15 15:37:14 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2008/02/19 18:45:24 jlam Exp $
---- courier/doc/Makefile.in.orig Sun Jul 22 01:32:34 2007
+--- courier/doc/Makefile.in.orig 2007-11-17 19:48:53.000000000 -0500
+++ courier/doc/Makefile.in
@@ -151,7 +151,7 @@ top_srcdir = @top_srcdir@
version = @version@
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.4 2007/10/15 15:37:14 jlam Exp $
draft-varshavchik-exdata-smtpext.txt \
draft-varshavchik-verp-smtpext.txt \
draft-varshavchik-security-smtpext.txt \
-@@ -189,66 +189,39 @@ htmlin = \
+@@ -189,66 +189,38 @@ htmlin = \
courier.html \
courierldapaliasd.html \
couriermlm.html \
@@ -74,11 +74,11 @@ $NetBSD: patch-ac,v 1.4 2007/10/15 15:37:14 jlam Exp $
+ dot-forward.1 webmlmd.1
-man8 = aliaslookup.8 courier.8 courierldapaliasd.8 courierpop3d.8 \
+- deliverquota.8 \
+man5 = dot-courier.5
+man7 = localmailfilter.7
+
+man8 = aliaslookup.8 courier.8 courierldapaliasd.8 \
- deliverquota.8 \
esmtpd.8 makeacceptmailfor.8 makehosteddomains.8\
- mkesmtpdcert.8 mkimapdcert.8 mkpop3dcert.8 \
+ mkesmtpdcert.8 \
@@ -88,7 +88,7 @@ $NetBSD: patch-ac,v 1.4 2007/10/15 15:37:14 jlam Exp $
BUILT_SOURCES = \
aliaslookup.html aliaslookup.8 \
-@@ -275,7 +248,7 @@ BUILT_SOURCES = \
+@@ -275,7 +247,7 @@ BUILT_SOURCES = \
webmlmd.html.in webmlmd.1.in
EXTRA_DIST = $(nohtmlin) $(BUILT_SOURCES)
@@ -97,7 +97,7 @@ $NetBSD: patch-ac,v 1.4 2007/10/15 15:37:14 jlam Exp $
$(man1dir)/rmail.1 $(man1dir)/dotforward.1 \
$(man8dir)/makesmtpaccess-msa.8 \
$(man8dir)/esmtpd-msa.8
-@@ -1156,8 +1129,7 @@ preline.1: preline.1.in
+@@ -1156,8 +1128,7 @@ preline.1: preline.1.in
install-man-extra:
cd $(DESTDIR)$(man8dir) ; \
diff --git a/mail/courier-mta/patches/patch-ad b/mail/courier-mta/patches/patch-ad
index b92ce652a45..ab90ca304f6 100644
--- a/mail/courier-mta/patches/patch-ad
+++ b/mail/courier-mta/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2007/10/15 15:37:14 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2008/02/19 18:45:24 jlam Exp $
---- courier/filters/Makefile.in.orig Sun Jul 22 01:32:33 2007
+--- courier/filters/Makefile.in.orig 2007-11-17 19:49:01.000000000 -0500
+++ courier/filters/Makefile.in
@@ -236,11 +236,12 @@ SUBDIRS = libfilter perlfilter
CLEANFILES = $(htmldoc_DATA) $(man_MANS) filtersocketdir.h filteractivedir.h \
@@ -16,3 +16,20 @@ $NetBSD: patch-ad,v 1.3 2007/10/15 15:37:14 jlam Exp $
filtersocketdir = $(localstatedir)/filters
allfiltersocketdir = $(localstatedir)/allfilters
filterconfdir = $(sysconfdir)/filters
+@@ -931,16 +932,12 @@ install-exec-hook:
+ install-data-hook:
+ -$(mkinstalldirs) $(DESTDIR)$(filtersocketdir)
+ -$(mkinstalldirs) $(DESTDIR)$(allfiltersocketdir)
+- -$(mkinstalldirs) $(DESTDIR)$(filterconfdir)
+- -$(mkinstalldirs) $(DESTDIR)$(filteractivedir)
+ -$(mkinstalldirs) $(DESTDIR)$(sbindir)
+ chmod 500 $(DESTDIR)$(datadir)/filterctl
+ rm -f $(DESTDIR)$(sbindir)/filterctl
+ $(LN_S) $(datadir)/filterctl $(DESTDIR)$(sbindir)/filterctl
+ chmod 750 $(DESTDIR)$(filtersocketdir)
+ chmod 750 $(DESTDIR)$(allfiltersocketdir)
+- chmod 750 $(DESTDIR)$(filterconfdir)
+- chmod 750 $(DESTDIR)$(filteractivedir)
+ -chown @mailuser@ $(DESTDIR)$(filtersocketdir) \
+ $(DESTDIR)$(allfiltersocketdir) \
+ $(DESTDIR)$(filterconfdir) \
diff --git a/mail/courier-mta/patches/patch-ag b/mail/courier-mta/patches/patch-ag
new file mode 100644
index 00000000000..042c2469c3c
--- /dev/null
+++ b/mail/courier-mta/patches/patch-ag
@@ -0,0 +1,28 @@
+$NetBSD: patch-ag,v 1.3 2008/02/19 18:45:24 jlam Exp $
+
+--- courier/module.esmtp/mkesmtpdcert.in.orig 2007-11-04 16:17:03.000000000 -0500
++++ courier/module.esmtp/mkesmtpdcert.in
+@@ -9,7 +9,13 @@
+ # ESMTP STARTTLS. Normally this script would get called by an automatic
+ # package installation routine.
+
+-if test "@ssllib@" = "openssl"
++case "$1" in
++gnutls) ssllib=gnutls ;;
++openssl) ssllib=openssl ;;
++*) ssllib="@ssllib@" ;;
++esac
++
++if test "$ssllib" = "openssl"
+ then
+ test -x @OPENSSL@ || exit 0
+ else
+@@ -32,7 +38,7 @@ cleanup() {
+
+ cd @mydatadir@
+
+-if test "@ssllib@" = "openssl"
++if test "$ssllib" = "openssl"
+ then
+ cp /dev/null @mydatadir@/esmtpd.pem
+ chmod 600 @mydatadir@/esmtpd.pem
diff --git a/mail/courier-mta/patches/patch-ai b/mail/courier-mta/patches/patch-ai
index 501e9edf2b5..0df8e498607 100644
--- a/mail/courier-mta/patches/patch-ai
+++ b/mail/courier-mta/patches/patch-ai
@@ -1,35 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2007/10/17 13:50:30 jlam Exp $
+$NetBSD: patch-ai,v 1.4 2008/02/19 18:45:24 jlam Exp $
---- courier/module.local/local.c.orig Sun Oct 7 16:37:52 2007
+--- courier/module.local/local.c.orig 2007-10-16 22:04:01.000000000 -0400
+++ courier/module.local/local.c
-@@ -391,8 +391,6 @@ toalias:
- }
-
- not_found:
-- if (hostdomain) free(hostdomain);
--
- /*
- ** When submit is being called by the sendmail command line,
- ** don't reject unknown addresses, instead accept them (and bounce
-@@ -407,6 +405,8 @@ not_found:
- {
- free(addr);
- (*delfunc)(rwi, rwi->ptr, rwi->ptr);
-+ if (hostdomain) free(hostdomain);
-+
- return;
- }
-
-@@ -420,6 +420,8 @@ not_found:
- snprintf(buf, 255, "User <%s> unknown",
- orig_addr ? orig_addr:"");
- free(addr);
-+ if (hostdomain) free(hostdomain);
-+
- if (orig_addr)
- free(orig_addr);
- (*rwi->err_func)(550, buf, rwi);
-@@ -745,6 +747,8 @@ const char *quota;
+@@ -747,6 +747,8 @@ const char *quota;
strlen(argv[7])), "SENDER="),
argv[7]));
diff --git a/mail/courier-mta/patches/patch-aj b/mail/courier-mta/patches/patch-aj
index e7dc06db837..d90614b4d14 100644
--- a/mail/courier-mta/patches/patch-aj
+++ b/mail/courier-mta/patches/patch-aj
@@ -1,19 +1,19 @@
-$NetBSD: patch-aj,v 1.4 2007/10/15 15:37:14 jlam Exp $
+$NetBSD: patch-aj,v 1.5 2008/02/19 18:45:24 jlam Exp $
---- courier/perms.sh.in.orig Sun Jul 1 15:36:31 2007
+--- courier/perms.sh.in.orig 2007-07-01 11:36:31.000000000 -0400
+++ courier/perms.sh.in
-@@ -11,119 +11,47 @@ exec_prefix="@exec_prefix@"
+@@ -11,119 +11,41 @@ exec_prefix="@exec_prefix@"
datarootdir="@datarootdir@"
PERMS="
-. 755
-
- @localstatedir@ 755 x bin bin
- @localstatedir@/tmp 770
- @localstatedir@/msgs 750
- @localstatedir@/msgq 750
- @localstatedir@/track 755
-
+-@localstatedir@ 755 x bin bin
+-@localstatedir@/tmp 770
+-@localstatedir@/msgs 750
+-@localstatedir@/msgq 750
+-@localstatedir@/track 755
+-
-@sysconfdir@ 755 x
-@sysconfdir@/aliasdir 755
-@sysconfdir@/aliases 750
@@ -122,7 +122,7 @@ $NetBSD: patch-aj,v 1.4 2007/10/15 15:37:14 jlam Exp $
@datadir@/couriermlm 755
@datadir@/couriermlm/adminrequest.tmpl 644
-@@ -191,11 +119,20 @@ do
+@@ -191,11 +113,20 @@ do
if test "$USER" = ""
then
USER="@mailuser@"
@@ -143,7 +143,7 @@ $NetBSD: patch-aj,v 1.4 2007/10/15 15:37:14 jlam Exp $
fi
case $FILE in
-@@ -216,26 +153,7 @@ do
+@@ -216,26 +147,7 @@ do
echo $FILE $MODE $USER $GROUP $SPECIAL
done
diff --git a/mail/courier-mta/patches/patch-ax b/mail/courier-mta/patches/patch-ax
new file mode 100644
index 00000000000..c71e668dd4b
--- /dev/null
+++ b/mail/courier-mta/patches/patch-ax
@@ -0,0 +1,22 @@
+$NetBSD: patch-ax,v 1.1 2008/02/19 18:45:24 jlam Exp $
+
+--- courier/module.esmtp/Makefile.in.orig 2007-11-17 19:49:38.000000000 -0500
++++ courier/module.esmtp/Makefile.in
+@@ -870,17 +870,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
+ -$(mkinstalldirs) $(DESTDIR)$(bindir)
+ test -f $(DESTDIR)$(bindir)/addcr && exit 0; rm -f $(DESTDIR)$(bindir)/addcr && $(LN_S) $(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
+ cat </dev/null >>$(DESTDIR)$(sysconfdir)/esmtpauthclient
+- chmod 600 $(DESTDIR)$(sysconfdir)/esmtpauthclient
+- test -w /etc || exit 0; \
+- chown @mailuser@ $(DESTDIR)$(sysconfdir)/esmtpauthclient ; \
+- chgrp @mailgroup@ $(DESTDIR)$(sysconfdir)/esmtpauthclient
+ rm -f $(DESTDIR)$(sbindir)/esmtpd-msa $(DESTDIR)$(sbindir)/makesmtpaccess-msa
+ $(LN_S) esmtpd $(DESTDIR)$(sbindir)/esmtpd-msa
+ $(LN_S) makesmtpaccess $(DESTDIR)$(sbindir)/makesmtpaccess-msa
diff --git a/mail/courier-mta/patches/patch-ay b/mail/courier-mta/patches/patch-ay
new file mode 100644
index 00000000000..87ee4933a81
--- /dev/null
+++ b/mail/courier-mta/patches/patch-ay
@@ -0,0 +1,14 @@
+$NetBSD: patch-ay,v 1.1 2008/02/19 18:45:24 jlam Exp $
+
+--- webadmin/Makefile.in.orig 2007-11-17 19:53:34.000000000 -0500
++++ webadmin/Makefile.in
+@@ -603,9 +603,6 @@ uninstall-am: uninstall-webadminDATA uni
+
+
+ install-exec-hook:
+- -$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/webadmin/added
+- -$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/webadmin/removed
+- chmod 700 $(DESTDIR)$(sysconfdir)/webadmin
+ -chown @mailuser@ $(DESTDIR)$(sysconfdir)/webadmin
+ -chown @mailuser@ $(DESTDIR)$(sysconfdir)/webadmin/added
+ -chown @mailuser@ $(DESTDIR)$(sysconfdir)/webadmin/removed
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-17 07:47:49 +0000