Fri May 30 21:35:04 2014 UTC ()
Improve binary package:

* Reduce potential patch conflicts by switching more DESTDIR support to sed
* Enable `qmail-netqmail` by default
* Install `qmail-viruscan` signatures via CONF_FILES
* With `tls` option, don't generate cert, instruct the user at INSTALL time

That last change also fixes the source build with `tls` enabled on
systems that don't already have a /var/qmail/control, as reported
by Thomas Lazar on pkgsrc-users@.

While here, add a comment with the new location of the qregex patch.
Since it's named strangely, I've also placed a traditionally-named
copy on ftp.n.o.

Bump PKGREVISION.


(schmonz)
diff -r1.5 -r1.6 pkgsrc/mail/qmail/INSTALL
diff -r1.68 -r1.69 pkgsrc/mail/qmail/Makefile
diff -r1.15 -r1.16 pkgsrc/mail/qmail/PLIST
diff -r1.24 -r1.25 pkgsrc/mail/qmail/distinfo
diff -r1.33 -r1.34 pkgsrc/mail/qmail/options.mk
diff -r1.1 -r1.2 pkgsrc/mail/qmail/patches/patch-Makefile
cvs diff -r1.5 -r1.6 pkgsrc/mail/qmail/INSTALL (expand / switch to unified diff)

--- pkgsrc/mail/qmail/INSTALL 2011/06/07 02:53:42 1.5
+++ pkgsrc/mail/qmail/INSTALL 2014/05/30 21:35:04 1.6
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: INSTALL,v 1.5 2011/06/07 02:53:42 schmonz Exp $ 1# $NetBSD: INSTALL,v 1.6 2014/05/30 21:35:04 schmonz Exp $
2 2
3DOCDIR=@DOCDIR@ 3DOCDIR=@DOCDIR@
4EGDIR=@EGDIR@ 4EGDIR=@EGDIR@
 5OPENSSL=@OPENSSL@
5PKGMANDIR=@PKGMANDIR@ 6PKGMANDIR=@PKGMANDIR@
6QMAILDIR=@QMAILDIR@ 7QMAILDIR=@QMAILDIR@
7QMAIL_QUEUE_DIR=@QMAIL_QUEUE_DIR@ 8QMAIL_QUEUE_DIR=@QMAIL_QUEUE_DIR@
8QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@ 9QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@
9VIRUSCAN_SIGS_SRCFILE=@VIRUSCAN_SIGS_SRCFILE@ 
10 10
11VAR_QMAIL_DIRS="alias bin boot control doc man queue users" 11VAR_QMAIL_DIRS="alias bin boot control doc man queue users"
12 12
13case ${STAGE} in 13case ${STAGE} in
14 14
15PRE-INSTALL) 15PRE-INSTALL)
16 for dir in $VAR_QMAIL_DIRS; do 16 for dir in $VAR_QMAIL_DIRS; do
17 if [ -e ${QMAILDIR}/$dir ]; then 17 if [ -e ${QMAILDIR}/$dir ]; then
18 ${CAT} <<EOF 18 ${CAT} <<EOF
19=========================================================================== 19===========================================================================
20 20
21ERROR: ${QMAILDIR} exists and is non-empty. 21ERROR: ${QMAILDIR} exists and is non-empty.
22 22
@@ -55,25 +55,34 @@ EOF @@ -55,25 +55,34 @@ EOF
55 55
56POST-INSTALL) 56POST-INSTALL)
57 if ! [ -z ${QMAIL_QUEUE_EXTRA} ]; then 57 if ! [ -z ${QMAIL_QUEUE_EXTRA} ]; then
58 ${CAT} <<EOF 58 ${CAT} <<EOF
59=========================================================================== 59===========================================================================
60 60
61NOTE: Before using qmail, create a .qmail file corresponding with the local 61NOTE: Before using qmail, create a .qmail file corresponding with the local
62user or alias "${QMAIL_QUEUE_EXTRA}" that meets the requirements for 62user or alias "${QMAIL_QUEUE_EXTRA}" that meets the requirements for
63QUEUE_EXTRA. 63QUEUE_EXTRA.
64 64
65=========================================================================== 65===========================================================================
66EOF 66EOF
67 fi 67 fi
68 if ! [ -z ${VIRUSCAN_SIGS_SRCFILE} ] && \ 
69 ! [ -s ${PKG_SYSCONFDIR}/control/signatures ]; then 
70 ${SED} -e '1,15d' -e '34,$d' \ 
71 < ${VIRUSCAN_SIGS_SRCFILE} \ 
72 > ${PKG_SYSCONFDIR}/control/signatures 
73 ${CHMOD} 644 ${PKG_SYSCONFDIR}/control/signatures 
74 fi 
75 68
 69 SERVERCERT=${PKG_SYSCONFDIR}/control/servercert.pem
 70 if ! [ -z ${OPENSSL} ] && ! [ -s ${SERVERCERT} ]; then
 71 ${CAT} <<EOF
 72===========================================================================
 73
 74NOTE: If you don't already have an SSL certificate for qmail:
 75
 76# ${OPENSSL} req -new -x509 -nodes -days 366 -out ${SERVERCERT} -keyout ${SERVERCERT}
 77# chmod 640 ${SERVERCERT}
 78# chown qmaild:qmail ${SERVERCERT}
 79# ln -s ${SERVERCERT} ${PKG_SYSCONFDIR}/control/clientcert.pem
 80# update_tmprsadh
 81
 82===========================================================================
 83EOF
 84 fi
76 85
77 ;; 86 ;;
78 87
79esac 88esac
cvs diff -r1.68 -r1.69 pkgsrc/mail/qmail/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/qmail/Makefile 2014/04/16 04:57:23 1.68
+++ pkgsrc/mail/qmail/Makefile 2014/05/30 21:35:04 1.69
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.68 2014/04/16 04:57:23 schmonz Exp $ 1# $NetBSD: Makefile,v 1.69 2014/05/30 21:35:04 schmonz Exp $
2# 2#
3 3
4DISTNAME= ${PKGNAME_NOREV} 4DISTNAME= ${PKGNAME_NOREV}
5PKGNAME= qmail-1.03 5PKGNAME= qmail-1.03
6PKGREVISION= 18 6PKGREVISION= 19
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
15DEPENDS+= checkpassword-[0-9]*:../../sysutils/checkpassword 15DEPENDS+= checkpassword-[0-9]*:../../sysutils/checkpassword
16DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools 16DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools
17DEPENDS+= ucspi-tcp-[0-9]*:../../net/ucspi-tcp 17DEPENDS+= ucspi-tcp-[0-9]*:../../net/ucspi-tcp
18 18
19CONFLICTS+= courier-maildirmake-[0-9]* 19CONFLICTS+= courier-maildirmake-[0-9]*
@@ -36,31 +36,31 @@ DJB_BUILD_TARGETS= man @@ -36,31 +36,31 @@ DJB_BUILD_TARGETS= man
36DJB_RESTRICTED= no 36DJB_RESTRICTED= no
37 37
38PKG_SYSCONFSUBDIR= qmail 38PKG_SYSCONFSUBDIR= qmail
39OWN_DIRS+= ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/alias 39OWN_DIRS+= ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/alias
40OWN_DIRS+= ${PKG_SYSCONFDIR}/control ${PKG_SYSCONFDIR}/users 40OWN_DIRS+= ${PKG_SYSCONFDIR}/control ${PKG_SYSCONFDIR}/users
41OWN_DIRS+= ${QMAILDIR} ${QMAIL_QUEUE_DIR} 41OWN_DIRS+= ${QMAILDIR} ${QMAIL_QUEUE_DIR}
42 42
43DOCDIR= ${PREFIX}/share/doc/qmail 43DOCDIR= ${PREFIX}/share/doc/qmail
44EGDIR= ${PREFIX}/share/examples/qmail 44EGDIR= ${PREFIX}/share/examples/qmail
45SHAREDIR= ${PREFIX}/share/qmail 45SHAREDIR= ${PREFIX}/share/qmail
46PLIST_SUBST+= DARWINSUFX=${DARWINSUFX:Q} 46PLIST_SUBST+= DARWINSUFX=${DARWINSUFX:Q}
47MESSAGE_SUBST+= DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q} 47MESSAGE_SUBST+= DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q}
48FILES_SUBST+= DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q} 48FILES_SUBST+= DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q}
 49FILES_SUBST+= OPENSSL=${OPENSSL:Q}
49FILES_SUBST+= PKGMANDIR=${PKGMANDIR:Q} SHAREDIR=${SHAREDIR:Q} 50FILES_SUBST+= PKGMANDIR=${PKGMANDIR:Q} SHAREDIR=${SHAREDIR:Q}
50FILES_SUBST+= QMAILDIR=${QMAILDIR:Q} 51FILES_SUBST+= QMAILDIR=${QMAILDIR:Q}
51FILES_SUBST+= QMAIL_QUEUE_DIR=${QMAIL_QUEUE_DIR:Q} 52FILES_SUBST+= QMAIL_QUEUE_DIR=${QMAIL_QUEUE_DIR:Q}
52FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q} 53FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
53FILES_SUBST+= VIRUSCAN_SIGS_SRCFILE=${VIRUSCAN_SIGS_SRCFILE:Q} 
54FILES_SUBST+= PKGNAME=${PKGNAME:Q} 54FILES_SUBST+= PKGNAME=${PKGNAME:Q}
55 55
56SETUP_PROGRAMS= dnsfq dnsip dnsptr hostname install ipmeprint 56SETUP_PROGRAMS= dnsfq dnsip dnsptr hostname install ipmeprint
57SETUP_SCRIPTS= config config-fast 57SETUP_SCRIPTS= config config-fast
58 58
59MANDIRS= man 59MANDIRS= man
60.for j in 1 5 7 8 60.for j in 1 5 7 8
61MANDIRS+= man/man${j} 61MANDIRS+= man/man${j}
62.endfor 62.endfor
63INSTALLATION_DIRS= bin ${MANDIRS} ${DOCDIR} ${SHAREDIR} 63INSTALLATION_DIRS= bin ${MANDIRS} ${DOCDIR} ${SHAREDIR}
64INSTALLATION_DIRS+= ${EGDIR}/alias ${EGDIR}/boot ${EGDIR}/control 64INSTALLATION_DIRS+= ${EGDIR}/alias ${EGDIR}/boot ${EGDIR}/control
65INSTALLATION_DIRS+= ${EGDIR}/users 65INSTALLATION_DIRS+= ${EGDIR}/users
66 66
@@ -86,26 +86,32 @@ SUBST_MESSAGE.logging= Setting QUEUE_EXT @@ -86,26 +86,32 @@ SUBST_MESSAGE.logging= Setting QUEUE_EXT
86 86
87SUBST_CLASSES+= caseclash 87SUBST_CLASSES+= caseclash
88SUBST_STAGE.caseclash= do-configure 88SUBST_STAGE.caseclash= do-configure
89SUBST_FILES.caseclash= hier.c 89SUBST_FILES.caseclash= hier.c
90SUBST_SED.caseclash= -e 's|"INSTALL"|"INSTALL${DARWINSUFX}"|g' 90SUBST_SED.caseclash= -e 's|"INSTALL"|"INSTALL${DARWINSUFX}"|g'
91SUBST_SED.caseclash+= -e 's|"SENDMAIL"|"SENDMAIL${DARWINSUFX}"|g' 91SUBST_SED.caseclash+= -e 's|"SENDMAIL"|"SENDMAIL${DARWINSUFX}"|g'
92 92
93SUBST_CLASSES+= catpages 93SUBST_CLASSES+= catpages
94SUBST_STAGE.catpages= do-configure 94SUBST_STAGE.catpages= do-configure
95SUBST_FILES.catpages= hier.c 95SUBST_FILES.catpages= hier.c
96SUBST_SED.catpages= -e 's|.*"man/cat[0-9]".*||g' 96SUBST_SED.catpages= -e 's|.*"man/cat[0-9]".*||g'
97SUBST_SED.catpages+= -e 's|.*"tcp-environ\.5".*||g' # also in ucspi-tcp 97SUBST_SED.catpages+= -e 's|.*"tcp-environ\.5".*||g' # also in ucspi-tcp
98 98
 99SUBST_CLASSES+= destdir
 100SUBST_STAGE.destdir= do-configure
 101SUBST_FILES.destdir= Makefile
 102SUBST_SED.destdir= -e 's|\(^load inst.*\.o\) auto_qmail\.o\(.*\)|\1 auto_destdir.o\2|g'
 103SUBST_SED.destdir+= -e 's|\(^ \./load inst.*\) auto_qmail\.o\(.*\)|\1 auto_destdir.o\2|g'
 104
99SUBST_CLASSES+= paths 105SUBST_CLASSES+= paths
100SUBST_STAGE.paths= do-configure 106SUBST_STAGE.paths= do-configure
101SUBST_FILES.paths= README.pkgsrc 107SUBST_FILES.paths= README.pkgsrc
102SUBST_SED.paths= -e 's,@PKGNAME@,${PKGNAME:Q},g' 108SUBST_SED.paths= -e 's,@PKGNAME@,${PKGNAME:Q},g'
103SUBST_SED.paths+= -e 's,@PKG_INFO@,${PKG_INFO:Q},g' 109SUBST_SED.paths+= -e 's,@PKG_INFO@,${PKG_INFO:Q},g'
104SUBST_SED.paths+= -e 's,@GREP@,${GREP:Q},g' 110SUBST_SED.paths+= -e 's,@GREP@,${GREP:Q},g'
105 111
106SUBST_FILES.djbware+= cdb_seek.c dns.c 112SUBST_FILES.djbware+= cdb_seek.c dns.c
107 113
108USERGROUP_PHASE= configure 114USERGROUP_PHASE= configure
109PKG_GROUPS= qmail nofiles 115PKG_GROUPS= qmail nofiles
110PKG_USERS+= alias:nofiles 116PKG_USERS+= alias:nofiles
111PKG_USERS+= qmaill:nofiles qmaild:nofiles qmailp:nofiles 117PKG_USERS+= qmaill:nofiles qmaild:nofiles qmailp:nofiles
@@ -113,50 +119,50 @@ PKG_USERS+= qmailq:qmail qmailr:qmail q @@ -113,50 +119,50 @@ PKG_USERS+= qmailq:qmail qmailr:qmail q
113.for user in ${PKG_USERS:C/\:.*//} 119.for user in ${PKG_USERS:C/\:.*//}
114PKG_HOME.${user}= ${QMAILDIR} 120PKG_HOME.${user}= ${QMAILDIR}
115.endfor 121.endfor
116PKG_HOME.alias= ${QMAILDIR}/alias 122PKG_HOME.alias= ${QMAILDIR}/alias
117 123
118SPECIAL_PERMS+= ${PREFIX}/bin/qmail-queue qmailq qmail 4555 124SPECIAL_PERMS+= ${PREFIX}/bin/qmail-queue qmailq qmail 4555
119 125
120.if ${OPSYS} == "Darwin" 126.if ${OPSYS} == "Darwin"
121DARWINSUFX= .doc 127DARWINSUFX= .doc
122.else 128.else
123DARWINSUFX= # empty 129DARWINSUFX= # empty
124.endif 130.endif
125 131
126post-extract: 132post-extract: post-extract-viruscan
127 ${CP} ${FILESDIR}/README.pkgsrc ${WRKSRC} 133 ${CP} ${FILESDIR}/README.pkgsrc ${WRKSRC}
128.if ${OPSYS} == "Darwin" 134.if ${OPSYS} == "Darwin"
129. for i in INSTALL SENDMAIL 135. for i in INSTALL SENDMAIL
130 mv ${WRKSRC}/${i} ${WRKSRC}/${i}${DARWINSUFX} 136 mv ${WRKSRC}/${i} ${WRKSRC}/${i}${DARWINSUFX}
131. endfor 137. endfor
132.endif 138.endif
133 139
134pre-install: 140pre-install:
135. if ${USE_DESTDIR} != "no" 141. if ${USE_DESTDIR} != "no"
136 ${MKDIR} ${DESTDIR}${QMAILDIR} 142 ${MKDIR} ${DESTDIR}${QMAILDIR}
137 ${MKDIR} ${DESTDIR}${QMAIL_QUEUE_DIR} 143 ${MKDIR} ${DESTDIR}${QMAIL_QUEUE_DIR}
138 # keep in sync with INSTALL:PRE-INSTALL 144 # keep in sync with INSTALL:PRE-INSTALL
139 ${LN} -s ${DESTDIR}${EGDIR}/alias ${DESTDIR}${QMAILDIR}/alias 145 ${LN} -s ${DESTDIR}${EGDIR}/alias ${DESTDIR}${QMAILDIR}/alias
140 ${LN} -s ${DESTDIR}${PREFIX}/bin ${DESTDIR}${QMAILDIR}/bin 146 ${LN} -s ${DESTDIR}${PREFIX}/bin ${DESTDIR}${QMAILDIR}/bin
141 ${LN} -s ${DESTDIR}${EGDIR}/boot ${DESTDIR}${QMAILDIR}/boot 147 ${LN} -s ${DESTDIR}${EGDIR}/boot ${DESTDIR}${QMAILDIR}/boot
142 ${LN} -s ${DESTDIR}${EGDIR}/control ${DESTDIR}${QMAILDIR}/control 148 ${LN} -s ${DESTDIR}${EGDIR}/control ${DESTDIR}${QMAILDIR}/control
143 ${LN} -s ${DESTDIR}${DOCDIR} ${DESTDIR}${QMAILDIR}/doc 149 ${LN} -s ${DESTDIR}${DOCDIR} ${DESTDIR}${QMAILDIR}/doc
144 ${LN} -s ${DESTDIR}${PREFIX}/${PKGMANDIR} ${DESTDIR}${QMAILDIR}/man 150 ${LN} -s ${DESTDIR}${PREFIX}/${PKGMANDIR} ${DESTDIR}${QMAILDIR}/man
145 ${LN} -s ${DESTDIR}${QMAIL_QUEUE_DIR} ${DESTDIR}${QMAILDIR}/queue 151 ${LN} -s ${DESTDIR}${QMAIL_QUEUE_DIR} ${DESTDIR}${QMAILDIR}/queue
146 ${LN} -s ${DESTDIR}${EGDIR}/users ${DESTDIR}${QMAILDIR}/users 152 ${LN} -s ${DESTDIR}${EGDIR}/users ${DESTDIR}${QMAILDIR}/users
147. endif 153. endif
148 154
149post-install: 155post-install: post-install-viruscan
150 # qmail's installer sets strange permissions, set them back 156 # qmail's installer sets strange permissions, set them back
151. if (${PKG_INSTALLATION_TYPE} == "overwrite") 157. if (${PKG_INSTALLATION_TYPE} == "overwrite")
152. for i in bin boot 158. for i in bin boot
153 ${CHGRP} ${BINGRP} ${DESTDIR}${QMAILDIR}/${i} 159 ${CHGRP} ${BINGRP} ${DESTDIR}${QMAILDIR}/${i}
154. endfor 160. endfor
155. for i in doc 161. for i in doc
156 ${CHGRP} ${SHAREGRP} ${DESTDIR}${QMAILDIR}/${i} 162 ${CHGRP} ${SHAREGRP} ${DESTDIR}${QMAILDIR}/${i}
157. endfor 163. endfor
158. for i in ${MANDIRS} 164. for i in ${MANDIRS}
159 ${CHGRP} ${MANGRP} ${DESTDIR}${QMAILDIR}/${i} 165 ${CHGRP} ${MANGRP} ${DESTDIR}${QMAILDIR}/${i}
160. endfor 166. endfor
161. endif 167. endif
162 168
cvs diff -r1.15 -r1.16 pkgsrc/mail/qmail/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/qmail/PLIST 2012/03/12 03:53:55 1.15
+++ pkgsrc/mail/qmail/PLIST 2014/05/30 21:35:04 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.15 2012/03/12 03:53:55 sbd Exp $ 1@comment $NetBSD: PLIST,v 1.16 2014/05/30 21:35:04 schmonz Exp $
2bin/bouncesaying 2bin/bouncesaying
3bin/condredirect 3bin/condredirect
4bin/datemail 4bin/datemail
5bin/elq 5bin/elq
6bin/except 6bin/except
7bin/forward 7bin/forward
8bin/maildir2mbox 8bin/maildir2mbox
9bin/maildirmake 9bin/maildirmake
10bin/maildirwatch 10bin/maildirwatch
11bin/mailsubj 11bin/mailsubj
12bin/pinq 12bin/pinq
13bin/predate 13bin/predate
14bin/preline 14bin/preline
@@ -119,21 +119,22 @@ share/doc/qmail/SENDMAIL${DARWINSUFX} @@ -119,21 +119,22 @@ share/doc/qmail/SENDMAIL${DARWINSUFX}
119share/doc/qmail/TEST.deliver 119share/doc/qmail/TEST.deliver
120share/doc/qmail/TEST.receive 120share/doc/qmail/TEST.receive
121share/doc/qmail/UPGRADE 121share/doc/qmail/UPGRADE
122share/examples/qmail/boot/binm1 122share/examples/qmail/boot/binm1
123share/examples/qmail/boot/binm1+df 123share/examples/qmail/boot/binm1+df
124share/examples/qmail/boot/binm2 124share/examples/qmail/boot/binm2
125share/examples/qmail/boot/binm2+df 125share/examples/qmail/boot/binm2+df
126share/examples/qmail/boot/binm3 126share/examples/qmail/boot/binm3
127share/examples/qmail/boot/binm3+df 127share/examples/qmail/boot/binm3+df
128share/examples/qmail/boot/home 128share/examples/qmail/boot/home
129share/examples/qmail/boot/home+df 129share/examples/qmail/boot/home+df
130share/examples/qmail/boot/proc 130share/examples/qmail/boot/proc
131share/examples/qmail/boot/proc+df 131share/examples/qmail/boot/proc+df
 132${PLIST.viruscan}share/examples/qmail/control/signatures
132share/qmail/setup/config 133share/qmail/setup/config
133share/qmail/setup/config-fast 134share/qmail/setup/config-fast
134share/qmail/setup/dnsfq 135share/qmail/setup/dnsfq
135share/qmail/setup/dnsip 136share/qmail/setup/dnsip
136share/qmail/setup/dnsptr 137share/qmail/setup/dnsptr
137share/qmail/setup/hostname 138share/qmail/setup/hostname
138share/qmail/setup/install 139share/qmail/setup/install
139share/qmail/setup/ipmeprint 140share/qmail/setup/ipmeprint
cvs diff -r1.24 -r1.25 pkgsrc/mail/qmail/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/qmail/distinfo 2014/04/16 04:57:23 1.24
+++ pkgsrc/mail/qmail/distinfo 2014/05/30 21:35:04 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.24 2014/04/16 04:57:23 schmonz Exp $ 1$NetBSD: distinfo,v 1.25 2014/05/30 21:35:04 schmonz Exp $
2 2
3SHA1 (qmail-1.03.tar.gz) = 18fb960481291a0503e93a94df3f6094edb7f27a 3SHA1 (qmail-1.03.tar.gz) = 18fb960481291a0503e93a94df3f6094edb7f27a
4RMD160 (qmail-1.03.tar.gz) = b851f273f1d365d38efd949b1efcf35768ffa30f 4RMD160 (qmail-1.03.tar.gz) = b851f273f1d365d38efd949b1efcf35768ffa30f
5Size (qmail-1.03.tar.gz) = 220668 bytes 5Size (qmail-1.03.tar.gz) = 220668 bytes
6SHA1 (netqmail-1.06.tar.gz) = 9ee9a603e2ad3d8e1d34b900e19b7a5d275f538b 6SHA1 (netqmail-1.06.tar.gz) = 9ee9a603e2ad3d8e1d34b900e19b7a5d275f538b
7RMD160 (netqmail-1.06.tar.gz) = d31598afa862abb35bc1feb8d038ab619b5a17a2 7RMD160 (netqmail-1.06.tar.gz) = d31598afa862abb35bc1feb8d038ab619b5a17a2
8Size (netqmail-1.06.tar.gz) = 260941 bytes 8Size (netqmail-1.06.tar.gz) = 260941 bytes
9SHA1 (badrcptto.patch) = 713875ab08239416b6d22ba0d846b14a6aa6912f 9SHA1 (badrcptto.patch) = 713875ab08239416b6d22ba0d846b14a6aa6912f
10RMD160 (badrcptto.patch) = 88e29eeb203f30ec9c9d01cc42f1b849ea08d509 10RMD160 (badrcptto.patch) = 88e29eeb203f30ec9c9d01cc42f1b849ea08d509
11Size (badrcptto.patch) = 3033 bytes 11Size (badrcptto.patch) = 3033 bytes
12SHA1 (qmail-103.patch) = dfb9cdabe91449dad2117115177b0a6a356baa9f 12SHA1 (qmail-103.patch) = dfb9cdabe91449dad2117115177b0a6a356baa9f
13RMD160 (qmail-103.patch) = 437f8b3063438bbd82c59557333b3566214afa9c 13RMD160 (qmail-103.patch) = 437f8b3063438bbd82c59557333b3566214afa9c
14Size (qmail-103.patch) = 2104 bytes 14Size (qmail-103.patch) = 2104 bytes
@@ -20,16 +20,16 @@ RMD160 (qregex-20060423.patch) = f28245f @@ -20,16 +20,16 @@ RMD160 (qregex-20060423.patch) = f28245f
20Size (qregex-20060423.patch) = 26745 bytes 20Size (qregex-20060423.patch) = 26745 bytes
21SHA1 (qmail-1.03-realrcptto-2006.12.10.patch) = 89e06519df0f52f748afec583e3e2ce33fe5dfb2 21SHA1 (qmail-1.03-realrcptto-2006.12.10.patch) = 89e06519df0f52f748afec583e3e2ce33fe5dfb2
22RMD160 (qmail-1.03-realrcptto-2006.12.10.patch) = 0f6ad12dd24accab324097350a90f7717747eb56 22RMD160 (qmail-1.03-realrcptto-2006.12.10.patch) = 0f6ad12dd24accab324097350a90f7717747eb56
23Size (qmail-1.03-realrcptto-2006.12.10.patch) = 17718 bytes 23Size (qmail-1.03-realrcptto-2006.12.10.patch) = 17718 bytes
24SHA1 (netqmail-1.05-tls-smtpauth-20070417.patch) = d24cb13cf1371044fc2dfe20471478f59b5524e5 24SHA1 (netqmail-1.05-tls-smtpauth-20070417.patch) = d24cb13cf1371044fc2dfe20471478f59b5524e5
25RMD160 (netqmail-1.05-tls-smtpauth-20070417.patch) = 81a00e06fa67a4073b1a5bf5195fbbac675cd46b 25RMD160 (netqmail-1.05-tls-smtpauth-20070417.patch) = 81a00e06fa67a4073b1a5bf5195fbbac675cd46b
26Size (netqmail-1.05-tls-smtpauth-20070417.patch) = 67942 bytes 26Size (netqmail-1.05-tls-smtpauth-20070417.patch) = 67942 bytes
27SHA1 (qmail-smtpd-viruscan-1.3.patch) = 3a8f4e38df1c3f483f72b1a24ebc36664d075dd9 27SHA1 (qmail-smtpd-viruscan-1.3.patch) = 3a8f4e38df1c3f483f72b1a24ebc36664d075dd9
28RMD160 (qmail-smtpd-viruscan-1.3.patch) = ad6c5ef7894177fd5a7f131765eff22d092ecf54 28RMD160 (qmail-smtpd-viruscan-1.3.patch) = ad6c5ef7894177fd5a7f131765eff22d092ecf54
29Size (qmail-smtpd-viruscan-1.3.patch) = 8891 bytes 29Size (qmail-smtpd-viruscan-1.3.patch) = 8891 bytes
30SHA1 (qmail-smtpd-viruscan-logging.patch) = ca7105b5561cf280e9e3a465d2d68a16673ff56c 30SHA1 (qmail-smtpd-viruscan-logging.patch) = ca7105b5561cf280e9e3a465d2d68a16673ff56c
31RMD160 (qmail-smtpd-viruscan-logging.patch) = 79631cb7b5b120f98397011c4fb94726c48b83e4 31RMD160 (qmail-smtpd-viruscan-logging.patch) = 79631cb7b5b120f98397011c4fb94726c48b83e4
32Size (qmail-smtpd-viruscan-logging.patch) = 2157 bytes 32Size (qmail-smtpd-viruscan-logging.patch) = 2157 bytes
33SHA1 (patch-Makefile) = 2c8c50889cbc7da8c51bf6d44c0b31f5f0853896 33SHA1 (patch-Makefile) = 66519495fcb2c051ef6a74b49498c565d89044d4
34SHA1 (patch-spawn.c) = aad06c4ed3ad4bd0e500ab561d7f7307c19e3283 34SHA1 (patch-spawn.c) = aad06c4ed3ad4bd0e500ab561d7f7307c19e3283
35SHA1 (patch-strerr_sys.c) = 15e6466c655058664cb660e5e12232bf45010814 35SHA1 (patch-strerr_sys.c) = 15e6466c655058664cb660e5e12232bf45010814
cvs diff -r1.33 -r1.34 pkgsrc/mail/qmail/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/qmail/options.mk 2014/04/16 04:57:23 1.33
+++ pkgsrc/mail/qmail/options.mk 2014/05/30 21:35:04 1.34
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: options.mk,v 1.33 2014/04/16 04:57:23 schmonz Exp $ 1# $NetBSD: options.mk,v 1.34 2014/05/30 21:35:04 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.qmail 3PKG_OPTIONS_VAR= PKG_OPTIONS.qmail
4PKG_OPTIONS_OPTIONAL_GROUPS= rcpt 4PKG_OPTIONS_OPTIONAL_GROUPS= rcpt
5PKG_OPTIONS_GROUP.rcpt= qmail-badrcptto qmail-qregex qmail-realrcptto 5PKG_OPTIONS_GROUP.rcpt= qmail-badrcptto qmail-qregex qmail-realrcptto
6PKG_SUPPORTED_OPTIONS+= sasl syncdir tls qmail-bigdns qmail-netqmail 6PKG_SUPPORTED_OPTIONS+= sasl syncdir tls qmail-bigdns qmail-netqmail
7PKG_SUPPORTED_OPTIONS+= qmail-outgoingip qmail-viruscan 7PKG_SUPPORTED_OPTIONS+= qmail-outgoingip qmail-viruscan
 8PKG_SUGGESTED_OPTIONS+= qmail-netqmail
8 9
9.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
10 11
11.if !empty(PKG_OPTIONS:Mqmail-badrcptto) 12.if !empty(PKG_OPTIONS:Mqmail-badrcptto)
12BADRCPTTO_PATCH= badrcptto.patch 13BADRCPTTO_PATCH= badrcptto.patch
13PATCHFILES+= ${BADRCPTTO_PATCH} 14PATCHFILES+= ${BADRCPTTO_PATCH}
14SITES.${BADRCPTTO_PATCH}= http://patch.be/qmail/ 15SITES.${BADRCPTTO_PATCH}= http://patch.be/qmail/
15PATCH_DIST_STRIP.${BADRCPTTO_PATCH}= -p1 16PATCH_DIST_STRIP.${BADRCPTTO_PATCH}= -p1
16.endif 17.endif
17 18
18.if !empty(PKG_OPTIONS:Mqmail-bigdns) 19.if !empty(PKG_OPTIONS:Mqmail-bigdns)
19BIGDNS_PATCH= qmail-103.patch 20BIGDNS_PATCH= qmail-103.patch
20PATCHFILES+= ${BIGDNS_PATCH} 21PATCHFILES+= ${BIGDNS_PATCH}
@@ -27,69 +28,88 @@ DISTNAME= netqmail-1.06 @@ -27,69 +28,88 @@ DISTNAME= netqmail-1.06
27.endif 28.endif
28 29
29.if !empty(PKG_OPTIONS:Mqmail-outgoingip) 30.if !empty(PKG_OPTIONS:Mqmail-outgoingip)
30OUTGOINGIP_PATCH= outgoingip.patch 31OUTGOINGIP_PATCH= outgoingip.patch
31PATCHFILES+= ${OUTGOINGIP_PATCH} 32PATCHFILES+= ${OUTGOINGIP_PATCH}
32SITES.${OUTGOINGIP_PATCH}= http://www.qmail.org/ 33SITES.${OUTGOINGIP_PATCH}= http://www.qmail.org/
33.endif 34.endif
34 35
35PLIST_VARS+= qregex 36PLIST_VARS+= qregex
36.if !empty(PKG_OPTIONS:Mqmail-qregex) 37.if !empty(PKG_OPTIONS:Mqmail-qregex)
37QREGEX_PATCH= qregex-20060423.patch 38QREGEX_PATCH= qregex-20060423.patch
38PATCHFILES+= ${QREGEX_PATCH} 39PATCHFILES+= ${QREGEX_PATCH}
39SITES.${QREGEX_PATCH}= http://www.arda.homeunix.net/store/qmail/ 40SITES.${QREGEX_PATCH}= http://www.arda.homeunix.net/store/qmail/
 41# actually http://www.arda.homeunix.net/?ddownload=409
40PATCH_DIST_STRIP.${QREGEX_PATCH}= -p3 42PATCH_DIST_STRIP.${QREGEX_PATCH}= -p3
41PLIST.qregex= yes 43PLIST.qregex= yes
42.endif 44.endif
43 45
44.if !empty(PKG_OPTIONS:Mqmail-realrcptto) 46.if !empty(PKG_OPTIONS:Mqmail-realrcptto)
45REALRCPTTO_PATCH= qmail-1.03-realrcptto-2006.12.10.patch 47REALRCPTTO_PATCH= qmail-1.03-realrcptto-2006.12.10.patch
46PATCHFILES+= ${REALRCPTTO_PATCH} 48PATCHFILES+= ${REALRCPTTO_PATCH}
47SITES.${REALRCPTTO_PATCH}= http://code.dogmap.org/qmail/ 49SITES.${REALRCPTTO_PATCH}= http://code.dogmap.org/qmail/
48PATCH_DIST_STRIP.${REALRCPTTO_PATCH}= -p1 50PATCH_DIST_STRIP.${REALRCPTTO_PATCH}= -p1
49.endif 51.endif
50 52
51PLIST_VARS+= tls 53PLIST_VARS+= tls
52.if !empty(PKG_OPTIONS:Msasl) || !empty(PKG_OPTIONS:Mtls) 54.if !empty(PKG_OPTIONS:Msasl) || !empty(PKG_OPTIONS:Mtls)
53. if empty(PKG_OPTIONS:Msasl) 55. if empty(PKG_OPTIONS:Msasl)
54PKG_OPTIONS+= sasl 56PKG_OPTIONS+= sasl
55. endif 57. endif
56. include "../../security/openssl/buildlink3.mk" 58. include "../../security/openssl/buildlink3.mk"
57TLSSASL_PATCH= netqmail-1.05-tls-smtpauth-20070417.patch 59TLSSASL_PATCH= netqmail-1.05-tls-smtpauth-20070417.patch
58PATCHFILES+= ${TLSSASL_PATCH} 60PATCHFILES+= ${TLSSASL_PATCH}
59SITES.${TLSSASL_PATCH}= https://raw.githubusercontent.com/shupp/legacy-qmail-related/master/patches/ 61SITES.${TLSSASL_PATCH}= https://raw.githubusercontent.com/shupp/legacy-qmail-related/master/patches/
60. if !empty(PKG_OPTIONS:Mtls) 62. if !empty(PKG_OPTIONS:Mtls)
61CFLAGS+= -DTLS=20070408 # NOTE: update according to the patch 63CFLAGS+= -DTLS=20070408 # NOTE: match what's _in_ the patch
62DJB_INSTALL_TARGETS= cert tmprsadh 64USE_TOOLS+= openssl
63USE_TOOLS+= gmake 65SUBST_CLASSES+= tmprsadh
 66SUBST_STAGE.tmprsadh= do-configure
 67SUBST_FILES.tmprsadh= update_tmprsadh.sh
 68SUBST_SED.tmprsadh= -e 's|^export PATH=.*||'
 69SUBST_SED.tmprsadh+= -e 's|^openssl |${OPENSSL} |'
64PLIST.tls= yes 70PLIST.tls= yes
65. endif 71. endif
66.endif 72.endif
67 73
68.if !empty(PKG_OPTIONS:Msyncdir) 74.if !empty(PKG_OPTIONS:Msyncdir)
69. include "../../devel/syncdir/buildlink3.mk" 75. include "../../devel/syncdir/buildlink3.mk"
70SUBST_CLASSES+= load 76SUBST_CLASSES+= load
71SUBST_STAGE.load= do-configure 77SUBST_STAGE.load= do-configure
72SUBST_FILES.load= make-load.sh 78SUBST_FILES.load= make-load.sh
73SUBST_SED.load= -e '$$s|$$| ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.syncdir}/lib -L${BUILDLINK_PREFIX.syncdir}/lib \-lsyncdir|' 79SUBST_SED.load= -e '$$s|$$| ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.syncdir}/lib -L${BUILDLINK_PREFIX.syncdir}/lib \-lsyncdir|'
74. if ${OPSYS} == "Darwin" 80. if ${OPSYS} == "Darwin"
75SUBST_SED.load+= -e '$$s|$$| -bind_at_load|' 81SUBST_SED.load+= -e '$$s|$$| -bind_at_load|'
76. endif 82. endif
77SUBST_MESSAGE.load= Setting linker flags for syncdir. 83SUBST_MESSAGE.load= Setting linker flags for syncdir.
78.endif 84.endif
79 85
 86PLIST_VARS+= viruscan
80.if !empty(PKG_OPTIONS:Mqmail-viruscan) 87.if !empty(PKG_OPTIONS:Mqmail-viruscan)
81VIRUSCAN_PATCH= qmail-smtpd-viruscan-1.3.patch 88VIRUSCAN_PATCH= qmail-smtpd-viruscan-1.3.patch
82VIRUSCAN_LOG_PATCH= qmail-smtpd-viruscan-logging.patch 89VIRUSCAN_LOG_PATCH= qmail-smtpd-viruscan-logging.patch
83PATCHFILES+= ${VIRUSCAN_PATCH} ${VIRUSCAN_LOG_PATCH} 90PATCHFILES+= ${VIRUSCAN_PATCH} ${VIRUSCAN_LOG_PATCH}
84SITES.${VIRUSCAN_PATCH}= http://www.qmail.org/ 91SITES.${VIRUSCAN_PATCH}= http://www.qmail.org/
85SITES.${VIRUSCAN_LOG_PATCH}= ${MASTER_SITE_LOCAL} 92SITES.${VIRUSCAN_LOG_PATCH}= ${MASTER_SITE_LOCAL}
86PATCH_DIST_STRIP.${VIRUSCAN_PATCH}= -p1 93PATCH_DIST_STRIP.${VIRUSCAN_PATCH}= -p1
87PATCH_DIST_STRIP.${VIRUSCAN_LOG_PATCH}= -p1 94PATCH_DIST_STRIP.${VIRUSCAN_LOG_PATCH}= -p1
88SUBST_CLASSES+= viruscan 95SUBST_CLASSES+= viruscan
89SUBST_STAGE.viruscan= do-configure 96SUBST_STAGE.viruscan= do-configure
90SUBST_FILES.viruscan= qmail-smtpd.c 97SUBST_FILES.viruscan= qmail-smtpd.c
91SUBST_SED.viruscan= -e 's|qmail-smtpd: ||g' 98SUBST_SED.viruscan= -e 's|qmail-smtpd: ||g'
92VIRUSCAN_SIGS_SRCFILE= ${DISTDIR}/${VIRUSCAN_PATCH} 99PLIST.viruscan= yes
 100post-extract-viruscan:
 101 ${SED} -e '1,15d' -e '34,$$d' \
 102 < ${DISTDIR}/${VIRUSCAN_PATCH} \
 103 > ${WRKSRC}/signatures
 104 ${CHMOD} 644 ${WRKSRC}/signatures
 105post-install-viruscan:
 106 ${INSTALL_DATA} ${WRKSRC}/signatures ${DESTDIR}/${EGDIR}/control
 107. for i in control/signatures
 108CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i}
 109. endfor
93.else 110.else
94VIRUSCAN_SIGS_SRCFILE= # undefined 111post-extract-viruscan:
 112 ${DO_NADA}
 113post-install-viruscan:
 114 ${DO_NADA}
95.endif 115.endif
cvs diff -r1.1 -r1.2 pkgsrc/mail/qmail/patches/Attic/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/mail/qmail/patches/Attic/patch-Makefile 2013/08/15 15:43:48 1.1
+++ pkgsrc/mail/qmail/patches/Attic/patch-Makefile 2014/05/30 21:35:04 1.2
@@ -1,53 +1,21 @@ @@ -1,53 +1,21 @@
1$NetBSD: patch-Makefile,v 1.1 2013/08/15 15:43:48 schmonz Exp $ 1$NetBSD: patch-Makefile,v 1.2 2014/05/30 21:35:04 schmonz Exp $
2 2
3DESTDIR support. 3DESTDIR support.
4 4
5--- Makefile.orig 1998-06-15 10:53:16.000000000 +0000 5--- Makefile.orig 1998-06-15 10:53:16.000000000 +0000
6+++ Makefile 6+++ Makefile
7@@ -78,6 +78,14 @@ auto_break.o: \ 7@@ -4,6 +4,14 @@ SHELL=/bin/sh
8 compile auto_break.c 8
9 ./compile auto_break.c 9 default: it
10  10
11+auto_destdir.c: \ 11+auto_destdir.c: \
12+auto-str conf-destdir 12+auto-str conf-destdir
13+ ./auto-str auto_qmail `head -1 conf-destdir` > auto_destdir.c 13+ ./auto-str auto_qmail `head -1 conf-destdir` > auto_destdir.c
14+ 14+
15+auto_destdir.o: \ 15+auto_destdir.o: \
16+compile auto_destdir.c 16+compile auto_destdir.c
17+ ./compile auto_destdir.c 17+ ./compile auto_destdir.c
18+ 18+
19 auto_patrn.c: \ 19 addresses.0: \
20 auto-int8 conf-patrn 20 addresses.5
21 ./auto-int8 auto_patrn `head -1 conf-patrn` > auto_patrn.c 21 nroff -man addresses.5 > addresses.0
22@@ -740,15 +748,15 @@ seek.h fork.h 
23 ./compile idedit.c 
24  
25 install: \ 
26-load install.o fifo.o hier.o auto_qmail.o auto_split.o auto_uids.o \ 
27+load install.o fifo.o hier.o auto_destdir.o auto_split.o auto_uids.o \ 
28 strerr.a substdio.a open.a error.a str.a fs.a 
29- ./load install fifo.o hier.o auto_qmail.o auto_split.o \ 
30+ ./load install fifo.o hier.o auto_destdir.o auto_split.o \ 
31 auto_uids.o strerr.a substdio.a open.a error.a str.a fs.a  
32  
33 install-big: \ 
34-load install-big.o fifo.o install.o auto_qmail.o auto_split.o \ 
35+load install-big.o fifo.o install.o auto_destdir.o auto_split.o \ 
36 auto_uids.o strerr.a substdio.a open.a error.a str.a fs.a 
37- ./load install-big fifo.o install.o auto_qmail.o \ 
38+ ./load install-big fifo.o install.o auto_destdir.o \ 
39 auto_split.o auto_uids.o strerr.a substdio.a open.a error.a \ 
40 str.a fs.a  
41  
42@@ -763,9 +771,9 @@ exit.h 
43 ./compile install.c 
44  
45 instcheck: \ 
46-load instcheck.o fifo.o hier.o auto_qmail.o auto_split.o auto_uids.o \ 
47+load instcheck.o fifo.o hier.o auto_destdir.o auto_split.o auto_uids.o \ 
48 strerr.a substdio.a error.a str.a fs.a 
49- ./load instcheck fifo.o hier.o auto_qmail.o auto_split.o \ 
50+ ./load instcheck fifo.o hier.o auto_destdir.o auto_split.o \ 
51 auto_uids.o strerr.a substdio.a error.a str.a fs.a  
52  
53 instcheck.o: \