Tue Apr 4 14:58:06 2017 UTC ()
Give absolute path to srsfilter. From Nathan Arthur in private mail.


(schmonz)
diff -r1.82 -r1.83 pkgsrc/mail/qmail/Makefile
diff -r1.1 -r1.2 pkgsrc/mail/qmail/files/README.srs
cvs diff -r1.82 -r1.83 pkgsrc/mail/qmail/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/qmail/Makefile 2017/04/04 07:50:18 1.82
+++ pkgsrc/mail/qmail/Makefile 2017/04/04 14:58:06 1.83
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.82 2017/04/04 07:50:18 schmonz Exp $ 1# $NetBSD: Makefile,v 1.83 2017/04/04 14:58:06 schmonz Exp $
2# 2#
3 3
4DISTNAME= ${PKGNAME_NOREV} 4DISTNAME= ${PKGNAME_NOREV}
5PKGNAME= qmail-1.03 5PKGNAME= qmail-1.03
6PKGREVISION= 26 6PKGREVISION= 26
7CATEGORIES= mail 7CATEGORIES= mail
8MASTER_SITES= http://qmail.org/ 8MASTER_SITES= http://qmail.org/
9 9
10MAINTAINER= schmonz@NetBSD.org 10MAINTAINER= schmonz@NetBSD.org
11HOMEPAGE= http://cr.yp.to/qmail.html 11HOMEPAGE= http://cr.yp.to/qmail.html
12COMMENT= Secure, reliable, efficient, simple, and fast MTA 12COMMENT= Secure, reliable, efficient, simple, and fast MTA
13LICENSE= public-domain 13LICENSE= public-domain
14 14
@@ -113,29 +113,30 @@ SUBST_CLASSES+= destdir @@ -113,29 +113,30 @@ SUBST_CLASSES+= destdir
113SUBST_STAGE.destdir= do-configure 113SUBST_STAGE.destdir= do-configure
114SUBST_FILES.destdir= Makefile 114SUBST_FILES.destdir= Makefile
115SUBST_SED.destdir= -e 's|\(^load inst.*\.o\) auto_qmail\.o\(.*\)|\1 auto_destdir.o\2|g' 115SUBST_SED.destdir= -e 's|\(^load inst.*\.o\) auto_qmail\.o\(.*\)|\1 auto_destdir.o\2|g'
116SUBST_SED.destdir+= -e 's|\(^ \./load inst.*\) auto_qmail\.o\(.*\)|\1 auto_destdir.o\2|g' 116SUBST_SED.destdir+= -e 's|\(^ \./load inst.*\) auto_qmail\.o\(.*\)|\1 auto_destdir.o\2|g'
117 117
118SUBST_CLASSES+= groups 118SUBST_CLASSES+= groups
119SUBST_STAGE.groups= do-configure 119SUBST_STAGE.groups= do-configure
120SUBST_FILES.groups= auto_uids.c 120SUBST_FILES.groups= auto_uids.c
121SUBST_SED.groups= -e 's,@QMAIL_QMAIL_GROUP@,${QMAIL_QMAIL_GROUP:Q},g' 121SUBST_SED.groups= -e 's,@QMAIL_QMAIL_GROUP@,${QMAIL_QMAIL_GROUP:Q},g'
122SUBST_SED.groups+= -e 's,@QMAIL_NOFILES_GROUP@,${QMAIL_NOFILES_GROUP:Q},g' 122SUBST_SED.groups+= -e 's,@QMAIL_NOFILES_GROUP@,${QMAIL_NOFILES_GROUP:Q},g'
123 123
124SUBST_CLASSES+= paths 124SUBST_CLASSES+= paths
125SUBST_STAGE.paths= do-configure 125SUBST_STAGE.paths= do-configure
126SUBST_FILES.paths= README.pkgsrc 126SUBST_FILES.paths= README.*
127SUBST_SED.paths= -e 's,@PKGNAME@,${PKGNAME:Q},g' 127SUBST_SED.paths= -e 's,@PKGNAME@,${PKGNAME:Q},g'
128SUBST_SED.paths+= -e 's,@PKG_INFO@,${PKG_INFO:Q},g' 128SUBST_SED.paths+= -e 's,@PKG_INFO@,${PKG_INFO:Q},g'
 129SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX:Q},g'
129SUBST_SED.paths+= -e 's,@GREP@,${GREP:Q},g' 130SUBST_SED.paths+= -e 's,@GREP@,${GREP:Q},g'
130 131
131SUBST_CLASSES+= users 132SUBST_CLASSES+= users
132SUBST_STAGE.users= do-configure 133SUBST_STAGE.users= do-configure
133SUBST_FILES.users= auto_uids.c 134SUBST_FILES.users= auto_uids.c
134SUBST_SED.users= -e 's,@QMAIL_ROOT_USER@,${QMAIL_ROOT_USER:Q},g' 135SUBST_SED.users= -e 's,@QMAIL_ROOT_USER@,${QMAIL_ROOT_USER:Q},g'
135SUBST_SED.users+= -e 's,@QMAIL_ALIAS_USER@,${QMAIL_ALIAS_USER:Q},g' 136SUBST_SED.users+= -e 's,@QMAIL_ALIAS_USER@,${QMAIL_ALIAS_USER:Q},g'
136SUBST_SED.users+= -e 's,@QMAIL_DAEMON_USER@,${QMAIL_DAEMON_USER:Q},g' 137SUBST_SED.users+= -e 's,@QMAIL_DAEMON_USER@,${QMAIL_DAEMON_USER:Q},g'
137SUBST_SED.users+= -e 's,@QMAIL_LOG_USER@,${QMAIL_LOG_USER:Q},g' 138SUBST_SED.users+= -e 's,@QMAIL_LOG_USER@,${QMAIL_LOG_USER:Q},g'
138SUBST_SED.users+= -e 's,@QMAIL_PASSWD_USER@,${QMAIL_PASSWD_USER:Q},g' 139SUBST_SED.users+= -e 's,@QMAIL_PASSWD_USER@,${QMAIL_PASSWD_USER:Q},g'
139SUBST_SED.users+= -e 's,@QMAIL_QUEUE_USER@,${QMAIL_QUEUE_USER:Q},g' 140SUBST_SED.users+= -e 's,@QMAIL_QUEUE_USER@,${QMAIL_QUEUE_USER:Q},g'
140SUBST_SED.users+= -e 's,@QMAIL_REMOTE_USER@,${QMAIL_REMOTE_USER:Q},g' 141SUBST_SED.users+= -e 's,@QMAIL_REMOTE_USER@,${QMAIL_REMOTE_USER:Q},g'
141SUBST_SED.users+= -e 's,@QMAIL_SEND_USER@,${QMAIL_SEND_USER:Q},g' 142SUBST_SED.users+= -e 's,@QMAIL_SEND_USER@,${QMAIL_SEND_USER:Q},g'
cvs diff -r1.1 -r1.2 pkgsrc/mail/qmail/files/README.srs (expand / switch to unified diff)

--- pkgsrc/mail/qmail/files/README.srs 2017/03/31 13:52:00 1.1
+++ pkgsrc/mail/qmail/files/README.srs 2017/04/04 14:58:06 1.2
@@ -7,27 +7,27 @@ It is documented more fully by its autho @@ -7,27 +7,27 @@ It is documented more fully by its autho
7<URL:http://www.mco2.com.br/opensource/qmail/srs/> 7<URL:http://www.mco2.com.br/opensource/qmail/srs/>
8 8
9 9
10For qmail to SRS-rewrite your outgoing mail: 10For qmail to SRS-rewrite your outgoing mail:
11 11
12# echo "srs.$YOURDOMAIN" > @PKG_SYSCONFDIR@/control/srs_domain 12# echo "srs.$YOURDOMAIN" > @PKG_SYSCONFDIR@/control/srs_domain
13# echo "$SECRET" > @PKG_SYSCONFDIR@/control/srs_secrets 13# echo "$SECRET" > @PKG_SYSCONFDIR@/control/srs_secrets
14 14
15 15
16For qmail to accept and SRS-check your incoming mail: 16For qmail to accept and SRS-check your incoming mail:
17 17
18# echo "srs.$YOURDOMAIN" >> @PKG_SYSCONFDIR@/control/rcpthosts 18# echo "srs.$YOURDOMAIN" >> @PKG_SYSCONFDIR@/control/rcpthosts
19# echo "srs.$YOURDOMAIN:srs" >> @PKG_SYSCONFDIR@/control/virtualdomains 19# echo "srs.$YOURDOMAIN:srs" >> @PKG_SYSCONFDIR@/control/virtualdomains
20# echo "| srsfilter" > @PKG_SYSCONFDIR@/alias/.qmail-srs-default 20# echo "| @PREFIX@/bin/srsfilter" > @PKG_SYSCONFDIR@/alias/.qmail-srs-default
21 21
22 22
23For other MTAs to deliver mail to your SRS subdomain: 23For other MTAs to deliver mail to your SRS subdomain:
24 24
25- Create a DNS MX record for "srs.$YOURDOMAIN" pointing to your qmail host. 25- Create a DNS MX record for "srs.$YOURDOMAIN" pointing to your qmail host.
26 26
27 27
28Optional configuration parameters: 28Optional configuration parameters:
29 29
30Maximum permitted age of a rewritten address, in days (libsrs2 defaults to 21): 30Maximum permitted age of a rewritten address, in days (libsrs2 defaults to 21):
31# echo 7 > @PKG_SYSCONFDIR@/control/srs_maxage 31# echo 7 > @PKG_SYSCONFDIR@/control/srs_maxage
32 32
33Length of generated hash in a rewritten address (longer is more secure): 33Length of generated hash in a rewritten address (longer is more secure):