Mon Mar 20 16:23:20 2017 UTC ()
When I added basic DESTDIR support, I introduced a regression: the
source package stopped initializing the queue. (DESTDIR makes source
packages generate binary packages, which had never had that feature. See
<http://mail-index.netbsd.org/pkgsrc-changes/2011/06/07/msg056339.html>
for where the regression was introduced.)

Add a dependency on mail/queue-fix and, if no queue is present at
pkg_add time, initialize it.

Defer creating users and groups all the way to pkg_add time, and improve
DESTDIR support to full "user-destdir". Since mail/postfix lets
unprivileged users install it, we do too. (Can't run a server that way,
but so what.)

A typical (privileged) binary package should now:

1. Install on any other system of matching OS and architecture,
2. Not need matching numeric UIDs and GIDs to do so, and
3. Be usable in production.

You know, like any other binary package.

Bump PKGREVISION.


(schmonz)
diff -r1.6 -r1.7 pkgsrc/mail/qmail/INSTALL
diff -r1.77 -r1.78 pkgsrc/mail/qmail/Makefile
diff -r1.29 -r1.30 pkgsrc/mail/qmail/distinfo
diff -r1.3 -r1.4 pkgsrc/mail/qmail/patches/patch-Makefile
diff -r0 -r1.5 pkgsrc/mail/qmail/patches/patch-hier.c
diff -r0 -r1.1 pkgsrc/mail/qmail/patches/patch-pkgsrc__user__destdir__fake__chown.c
diff -r0 -r1.1 pkgsrc/mail/qmail/patches/patch-pkgsrc__user__destdir__fake__uids.h
cvs diff -r1.6 -r1.7 pkgsrc/mail/qmail/INSTALL (expand / switch to unified diff)

--- pkgsrc/mail/qmail/INSTALL 2014/05/30 21:35:04 1.6
+++ pkgsrc/mail/qmail/INSTALL 2017/03/20 16:23:19 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: INSTALL,v 1.6 2014/05/30 21:35:04 schmonz Exp $ 1# $NetBSD: INSTALL,v 1.7 2017/03/20 16:23:19 schmonz Exp $
2 2
3DOCDIR=@DOCDIR@ 3DOCDIR=@DOCDIR@
4EGDIR=@EGDIR@ 4EGDIR=@EGDIR@
5OPENSSL=@OPENSSL@ 5OPENSSL=@OPENSSL@
6PKGMANDIR=@PKGMANDIR@ 6PKGMANDIR=@PKGMANDIR@
7QMAILDIR=@QMAILDIR@ 7QMAILDIR=@QMAILDIR@
8QMAIL_QUEUE_DIR=@QMAIL_QUEUE_DIR@ 8QMAIL_QUEUE_DIR=@QMAIL_QUEUE_DIR@
9QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@ 9QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@
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
@@ -44,26 +44,29 @@ EOF @@ -44,26 +44,29 @@ EOF
44 # keep in sync with Makefile:pre-install 44 # keep in sync with Makefile:pre-install
45 ${LN} -s ${PKG_SYSCONFDIR}/alias ${QMAILDIR}/alias 45 ${LN} -s ${PKG_SYSCONFDIR}/alias ${QMAILDIR}/alias
46 ${LN} -s ${PREFIX}/bin ${QMAILDIR}/bin 46 ${LN} -s ${PREFIX}/bin ${QMAILDIR}/bin
47 ${LN} -s ${EGDIR}/boot ${QMAILDIR}/boot 47 ${LN} -s ${EGDIR}/boot ${QMAILDIR}/boot
48 ${LN} -s ${PKG_SYSCONFDIR}/control ${QMAILDIR}/control 48 ${LN} -s ${PKG_SYSCONFDIR}/control ${QMAILDIR}/control
49 ${LN} -s ${DOCDIR} ${QMAILDIR}/doc 49 ${LN} -s ${DOCDIR} ${QMAILDIR}/doc
50 ${LN} -s ${PREFIX}/${PKGMANDIR} ${QMAILDIR}/man 50 ${LN} -s ${PREFIX}/${PKGMANDIR} ${QMAILDIR}/man
51 ${LN} -s ${QMAIL_QUEUE_DIR} ${QMAILDIR}/queue 51 ${LN} -s ${QMAIL_QUEUE_DIR} ${QMAILDIR}/queue
52 ${LN} -s ${PKG_SYSCONFDIR}/users ${QMAILDIR}/users 52 ${LN} -s ${PKG_SYSCONFDIR}/users ${QMAILDIR}/users
53 53
54 ;; 54 ;;
55 55
56POST-INSTALL) 56POST-INSTALL)
 57 if ! [ -d ${QMAIL_QUEUE_DIR} ] || ! [ -d ${QMAIL_QUEUE_DIR}/info ]; then
 58 ${PREFIX}/bin/queue-fix ${QMAIL_QUEUE_DIR}
 59 fi
57 if ! [ -z ${QMAIL_QUEUE_EXTRA} ]; then 60 if ! [ -z ${QMAIL_QUEUE_EXTRA} ]; then
58 ${CAT} <<EOF 61 ${CAT} <<EOF
59=========================================================================== 62===========================================================================
60 63
61NOTE: Before using qmail, create a .qmail file corresponding with the local 64NOTE: Before using qmail, create a .qmail file corresponding with the local
62user or alias "${QMAIL_QUEUE_EXTRA}" that meets the requirements for 65user or alias "${QMAIL_QUEUE_EXTRA}" that meets the requirements for
63QUEUE_EXTRA. 66QUEUE_EXTRA.
64 67
65=========================================================================== 68===========================================================================
66EOF 69EOF
67 fi 70 fi
68 71
69 SERVERCERT=${PKG_SYSCONFDIR}/control/servercert.pem 72 SERVERCERT=${PKG_SYSCONFDIR}/control/servercert.pem
cvs diff -r1.77 -r1.78 pkgsrc/mail/qmail/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/qmail/Makefile 2017/03/10 03:13:29 1.77
+++ pkgsrc/mail/qmail/Makefile 2017/03/20 16:23:19 1.78
@@ -1,43 +1,41 @@ @@ -1,43 +1,41 @@
1# $NetBSD: Makefile,v 1.77 2017/03/10 03:13:29 schmonz Exp $ 1# $NetBSD: Makefile,v 1.78 2017/03/20 16:23:19 schmonz Exp $
2# 2#
3 3
4DISTNAME= ${PKGNAME_NOREV} 4DISTNAME= ${PKGNAME_NOREV}
5PKGNAME= qmail-1.03 5PKGNAME= qmail-1.03
6PKGREVISION= 21 6PKGREVISION= 22
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+= queue-fix-[0-9]*:../../mail/queue-fix
17DEPENDS+= ucspi-tcp-[0-9]*:../../net/ucspi-tcp 18DEPENDS+= ucspi-tcp-[0-9]*:../../net/ucspi-tcp
18 19
19CONFLICTS+= courier-maildirmake-[0-9]* 20CONFLICTS+= courier-maildirmake-[0-9]*
20CONFLICTS+= courier-mta-[0-9]* 21CONFLICTS+= courier-mta-[0-9]*
21CONFLICTS+= mirrordir-[0-9]* 22CONFLICTS+= mirrordir-[0-9]*
22CONFLICTS+= mutt<=1.4.2.1nb1 23CONFLICTS+= mutt<=1.4.2.1nb1
23CONFLICTS+= netqmail-[0-9]* 24CONFLICTS+= netqmail-[0-9]*
24CONFLICTS+= pulsar<=0.1.1 25CONFLICTS+= pulsar<=0.1.1
25 26
26NOT_FOR_UNPRIVILEGED= yes 
27 
28WRKSRC= ${WRKDIR}/${DISTNAME} 27WRKSRC= ${WRKDIR}/${DISTNAME}
29 28
30PKG_DESTDIR_SUPPORT= destdir 
31USE_TOOLS+= nroff 29USE_TOOLS+= nroff
32 30
33DJB_CONFIG_CMDS= ${ECHO} ${DESTDIR:Q}${QMAILDIR:Q} > conf-destdir 31DJB_CONFIG_CMDS= ${ECHO} ${DESTDIR:Q}${QMAILDIR:Q} > conf-destdir
34DJB_BUILD_TARGETS= man 32DJB_BUILD_TARGETS= man
35DJB_RESTRICTED= no 33DJB_RESTRICTED= no
36 34
37PKG_SYSCONFSUBDIR= qmail 35PKG_SYSCONFSUBDIR= qmail
38OWN_DIRS+= ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/alias 36OWN_DIRS+= ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/alias
39OWN_DIRS+= ${PKG_SYSCONFDIR}/control ${PKG_SYSCONFDIR}/users 37OWN_DIRS+= ${PKG_SYSCONFDIR}/control ${PKG_SYSCONFDIR}/users
40OWN_DIRS+= ${QMAILDIR} ${QMAIL_QUEUE_DIR} 38OWN_DIRS+= ${QMAILDIR} ${QMAIL_QUEUE_DIR}
41 39
42DOCDIR= ${PREFIX}/share/doc/qmail 40DOCDIR= ${PREFIX}/share/doc/qmail
43EGDIR= ${PREFIX}/share/examples/qmail 41EGDIR= ${PREFIX}/share/examples/qmail
@@ -100,46 +98,43 @@ SUBST_STAGE.destdir= do-configure @@ -100,46 +98,43 @@ SUBST_STAGE.destdir= do-configure
100SUBST_FILES.destdir= Makefile 98SUBST_FILES.destdir= Makefile
101SUBST_SED.destdir= -e 's|\(^load inst.*\.o\) auto_qmail\.o\(.*\)|\1 auto_destdir.o\2|g' 99SUBST_SED.destdir= -e 's|\(^load inst.*\.o\) auto_qmail\.o\(.*\)|\1 auto_destdir.o\2|g'
102SUBST_SED.destdir+= -e 's|\(^ \./load inst.*\) auto_qmail\.o\(.*\)|\1 auto_destdir.o\2|g' 100SUBST_SED.destdir+= -e 's|\(^ \./load inst.*\) auto_qmail\.o\(.*\)|\1 auto_destdir.o\2|g'
103 101
104SUBST_CLASSES+= paths 102SUBST_CLASSES+= paths
105SUBST_STAGE.paths= do-configure 103SUBST_STAGE.paths= do-configure
106SUBST_FILES.paths= README.pkgsrc 104SUBST_FILES.paths= README.pkgsrc
107SUBST_SED.paths= -e 's,@PKGNAME@,${PKGNAME:Q},g' 105SUBST_SED.paths= -e 's,@PKGNAME@,${PKGNAME:Q},g'
108SUBST_SED.paths+= -e 's,@PKG_INFO@,${PKG_INFO:Q},g' 106SUBST_SED.paths+= -e 's,@PKG_INFO@,${PKG_INFO:Q},g'
109SUBST_SED.paths+= -e 's,@GREP@,${GREP:Q},g' 107SUBST_SED.paths+= -e 's,@GREP@,${GREP:Q},g'
110 108
111SUBST_FILES.djbware+= cdb_seek.c dns.c 109SUBST_FILES.djbware+= cdb_seek.c dns.c
112 110
113USERGROUP_PHASE= pre-install 
114PKG_GROUPS= qmail nofiles 111PKG_GROUPS= qmail nofiles
115PKG_USERS+= alias:nofiles 112PKG_USERS+= alias:nofiles
116PKG_USERS+= qmaill:nofiles qmaild:nofiles qmailp:nofiles 113PKG_USERS+= qmaill:nofiles qmaild:nofiles qmailp:nofiles
117PKG_USERS+= qmailq:qmail qmailr:qmail qmails:qmail 114PKG_USERS+= qmailq:qmail qmailr:qmail qmails:qmail
118.for user in ${PKG_USERS:C/\:.*//} 115.for user in ${PKG_USERS:C/\:.*//}
119PKG_HOME.${user}= ${QMAILDIR} 116PKG_HOME.${user}= ${QMAILDIR}
120.endfor 117.endfor
121PKG_HOME.alias= ${QMAILDIR}/alias 118PKG_HOME.alias= ${QMAILDIR}/alias
122 119
123QMAIL_ROOT_ONLY_READABLES= qmail-clean qmail-getpw qmail-local qmail-popup 120SPECIAL_PERMS+= ${PREFIX}/bin/qmail-queue qmailq qmail 04711
124QMAIL_ROOT_ONLY_READABLES+= qmail-pw2u qmail-remote qmail-rspawn qmail-send 121.for f in qmail-inject qmail-pop3d qmail-qmqpc qmail-qmqpd qmail-qmtpd qmail-qread qmail-qstat qmail-showctl qmail-smtpd qmail-tcpok qmail-tcpto
125QMAIL_ROOT_ONLY_READABLES+= splogger 122SPECIAL_PERMS+= ${PREFIX}/bin/${f} root qmail 0755
126QMAIL_ROOT_ONLY_EVERYTHINGS= qmail-lspawn qmail-newmrh qmail-newu qmail-start 123.endfor
127 124.for f in qmail-clean qmail-getpw qmail-local qmail-popup qmail-pw2u qmail-remote qmail-rspawn qmail-send splogger
128SPECIAL_PERMS+= ${PREFIX}/bin/qmail-queue qmailq qmail 4555 
129.for f in ${QMAIL_ROOT_ONLY_READABLES} 
130SPECIAL_PERMS+= ${PREFIX}/bin/${f} root qmail 0711 125SPECIAL_PERMS+= ${PREFIX}/bin/${f} root qmail 0711
131.endfor 126.endfor
132.for f in ${QMAIL_ROOT_ONLY_EVERYTHINGS} 127.for f in qmail-lspawn qmail-newmrh qmail-newu qmail-start
133SPECIAL_PERMS+= ${PREFIX}/bin/${f} root qmail 0700 128SPECIAL_PERMS+= ${PREFIX}/bin/${f} root qmail 0700
134.endfor 129.endfor
135 130
136OPSYSVARS+= DARWINSUFX 131OPSYSVARS+= DARWINSUFX
137DARWINSUFX.Darwin= .doc 132DARWINSUFX.Darwin= .doc
138DARWINSUFX.*= # empty 133DARWINSUFX.*= # empty
139 134
140post-extract: post-extract-viruscan 135post-extract: post-extract-viruscan
141 ${CP} ${FILESDIR}/README.pkgsrc ${WRKSRC} 136 ${CP} ${FILESDIR}/README.pkgsrc ${WRKSRC}
142.if ${OPSYS} == "Darwin" 137.if ${OPSYS} == "Darwin"
143. for i in INSTALL SENDMAIL 138. for i in INSTALL SENDMAIL
144 mv ${WRKSRC}/${i} ${WRKSRC}/${i}${DARWINSUFX} 139 mv ${WRKSRC}/${i} ${WRKSRC}/${i}${DARWINSUFX}
145. endfor 140. endfor
@@ -149,42 +144,26 @@ pre-install: @@ -149,42 +144,26 @@ pre-install:
149 ${MKDIR} ${DESTDIR}${QMAILDIR} 144 ${MKDIR} ${DESTDIR}${QMAILDIR}
150 ${MKDIR} ${DESTDIR}${QMAIL_QUEUE_DIR} 145 ${MKDIR} ${DESTDIR}${QMAIL_QUEUE_DIR}
151 # keep in sync with INSTALL:PRE-INSTALL 146 # keep in sync with INSTALL:PRE-INSTALL
152 ${LN} -s ${DESTDIR}${EGDIR}/alias ${DESTDIR}${QMAILDIR}/alias 147 ${LN} -s ${DESTDIR}${EGDIR}/alias ${DESTDIR}${QMAILDIR}/alias
153 ${LN} -s ${DESTDIR}${PREFIX}/bin ${DESTDIR}${QMAILDIR}/bin 148 ${LN} -s ${DESTDIR}${PREFIX}/bin ${DESTDIR}${QMAILDIR}/bin
154 ${LN} -s ${DESTDIR}${EGDIR}/boot ${DESTDIR}${QMAILDIR}/boot 149 ${LN} -s ${DESTDIR}${EGDIR}/boot ${DESTDIR}${QMAILDIR}/boot
155 ${LN} -s ${DESTDIR}${EGDIR}/control ${DESTDIR}${QMAILDIR}/control 150 ${LN} -s ${DESTDIR}${EGDIR}/control ${DESTDIR}${QMAILDIR}/control
156 ${LN} -s ${DESTDIR}${DOCDIR} ${DESTDIR}${QMAILDIR}/doc 151 ${LN} -s ${DESTDIR}${DOCDIR} ${DESTDIR}${QMAILDIR}/doc
157 ${LN} -s ${DESTDIR}${PREFIX}/${PKGMANDIR} ${DESTDIR}${QMAILDIR}/man 152 ${LN} -s ${DESTDIR}${PREFIX}/${PKGMANDIR} ${DESTDIR}${QMAILDIR}/man
158 ${LN} -s ${DESTDIR}${QMAIL_QUEUE_DIR} ${DESTDIR}${QMAILDIR}/queue 153 ${LN} -s ${DESTDIR}${QMAIL_QUEUE_DIR} ${DESTDIR}${QMAILDIR}/queue
159 ${LN} -s ${DESTDIR}${EGDIR}/users ${DESTDIR}${QMAILDIR}/users 154 ${LN} -s ${DESTDIR}${EGDIR}/users ${DESTDIR}${QMAILDIR}/users
160 155
161post-install: post-install-viruscan 156post-install: post-install-viruscan
162 # allow packaging as non-root, fix at install time with SPECIAL_PERMS 
163 ${CHMOD} 0755 ${DESTDIR}${PREFIX}/bin/qmail-queue 
164. for f in ${QMAIL_ROOT_ONLY_READABLES} ${QMAIL_ROOT_ONLY_EVERYTHINGS} 
165 ${CHMOD} 0755 ${DESTDIR}${PREFIX}/bin/${f} 
166. endfor 
167 # qmail's installer sets strange permissions, set them back 
168. for i in bin boot 
169 ${CHGRP} ${BINGRP} ${DESTDIR}${QMAILDIR}/${i} 
170. endfor 
171. for i in doc 
172 ${CHGRP} ${SHAREGRP} ${DESTDIR}${QMAILDIR}/${i} 
173. endfor 
174. for i in ${MANDIRS} 
175 ${CHGRP} ${MANGRP} ${DESTDIR}${QMAILDIR}/${i} 
176. endfor 
177 
178 ${INSTALL_DATA} ${WRKSRC}/README.pkgsrc ${DESTDIR}${DOCDIR} 157 ${INSTALL_DATA} ${WRKSRC}/README.pkgsrc ${DESTDIR}${DOCDIR}
179 158
180 ${INSTALL_PROGRAM_DIR} ${DESTDIR}${SHAREDIR}/setup 159 ${INSTALL_PROGRAM_DIR} ${DESTDIR}${SHAREDIR}/setup
181 for i in ${SETUP_PROGRAMS}; do \ 160 for i in ${SETUP_PROGRAMS}; do \
182 ${INSTALL_PROGRAM} ${WRKSRC}/$$i \ 161 ${INSTALL_PROGRAM} ${WRKSRC}/$$i \
183 ${DESTDIR}${SHAREDIR}/setup; \ 162 ${DESTDIR}${SHAREDIR}/setup; \
184 done 163 done
185 for i in ${SETUP_SCRIPTS}; do \ 164 for i in ${SETUP_SCRIPTS}; do \
186 ${INSTALL_SCRIPT} ${WRKSRC}/$$i \ 165 ${INSTALL_SCRIPT} ${WRKSRC}/$$i \
187 ${DESTDIR}${SHAREDIR}/setup; \ 166 ${DESTDIR}${SHAREDIR}/setup; \
188 done 167 done
189 168
190.include "../../mk/djbware.mk" 169.include "../../mk/djbware.mk"
cvs diff -r1.29 -r1.30 pkgsrc/mail/qmail/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/qmail/distinfo 2017/03/10 03:13:29 1.29
+++ pkgsrc/mail/qmail/distinfo 2017/03/20 16:23:19 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.29 2017/03/10 03:13:29 schmonz Exp $ 1$NetBSD: distinfo,v 1.30 2017/03/20 16:23:19 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
5SHA512 (qmail-1.03.tar.gz) = f2cc47c3ef4a3595d5953f216811a9b60f505cf8cbfd31ae31a888ee04916936210ef1c23d59e8d280a5f0e1c3794b90ee212b2b0f36361c5eff842598c8aee2 5SHA512 (qmail-1.03.tar.gz) = f2cc47c3ef4a3595d5953f216811a9b60f505cf8cbfd31ae31a888ee04916936210ef1c23d59e8d280a5f0e1c3794b90ee212b2b0f36361c5eff842598c8aee2
6Size (qmail-1.03.tar.gz) = 220668 bytes 6Size (qmail-1.03.tar.gz) = 220668 bytes
7SHA1 (netqmail-1.06.tar.gz) = 9ee9a603e2ad3d8e1d34b900e19b7a5d275f538b 7SHA1 (netqmail-1.06.tar.gz) = 9ee9a603e2ad3d8e1d34b900e19b7a5d275f538b
8RMD160 (netqmail-1.06.tar.gz) = d31598afa862abb35bc1feb8d038ab619b5a17a2 8RMD160 (netqmail-1.06.tar.gz) = d31598afa862abb35bc1feb8d038ab619b5a17a2
9SHA512 (netqmail-1.06.tar.gz) = de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b 9SHA512 (netqmail-1.06.tar.gz) = de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b
10Size (netqmail-1.06.tar.gz) = 260941 bytes 10Size (netqmail-1.06.tar.gz) = 260941 bytes
11SHA1 (badrcptto.patch) = 713875ab08239416b6d22ba0d846b14a6aa6912f 11SHA1 (badrcptto.patch) = 713875ab08239416b6d22ba0d846b14a6aa6912f
12RMD160 (badrcptto.patch) = 88e29eeb203f30ec9c9d01cc42f1b849ea08d509 12RMD160 (badrcptto.patch) = 88e29eeb203f30ec9c9d01cc42f1b849ea08d509
13SHA512 (badrcptto.patch) = 317e7bbcc48af47c363280a172f0b37d756ed2b6e88ae377b16ee675de863da4f95b4ae6c8bf471509e7f558252cb6ad24cf35eaed478e947288ffcfd1d21713 13SHA512 (badrcptto.patch) = 317e7bbcc48af47c363280a172f0b37d756ed2b6e88ae377b16ee675de863da4f95b4ae6c8bf471509e7f558252cb6ad24cf35eaed478e947288ffcfd1d21713
14Size (badrcptto.patch) = 3033 bytes 14Size (badrcptto.patch) = 3033 bytes
@@ -30,18 +30,21 @@ SHA512 (qmail-1.03-realrcptto-2006.12.10 @@ -30,18 +30,21 @@ SHA512 (qmail-1.03-realrcptto-2006.12.10
30Size (qmail-1.03-realrcptto-2006.12.10.patch) = 17718 bytes 30Size (qmail-1.03-realrcptto-2006.12.10.patch) = 17718 bytes
31SHA1 (netqmail-1.05-tls-smtpauth-20070417.patch) = d24cb13cf1371044fc2dfe20471478f59b5524e5 31SHA1 (netqmail-1.05-tls-smtpauth-20070417.patch) = d24cb13cf1371044fc2dfe20471478f59b5524e5
32RMD160 (netqmail-1.05-tls-smtpauth-20070417.patch) = 81a00e06fa67a4073b1a5bf5195fbbac675cd46b 32RMD160 (netqmail-1.05-tls-smtpauth-20070417.patch) = 81a00e06fa67a4073b1a5bf5195fbbac675cd46b
33SHA512 (netqmail-1.05-tls-smtpauth-20070417.patch) = ce5fb50ae9a7683b708eeb65c68a0db47c5817eb3fc14457c4f7c5746916ca2734c647a2369bf6f1240477ee818e3e7d7870aec3edbad2eaace179cba6267e41 33SHA512 (netqmail-1.05-tls-smtpauth-20070417.patch) = ce5fb50ae9a7683b708eeb65c68a0db47c5817eb3fc14457c4f7c5746916ca2734c647a2369bf6f1240477ee818e3e7d7870aec3edbad2eaace179cba6267e41
34Size (netqmail-1.05-tls-smtpauth-20070417.patch) = 67942 bytes 34Size (netqmail-1.05-tls-smtpauth-20070417.patch) = 67942 bytes
35SHA1 (qmail-smtpd-viruscan-1.3.patch) = 3a8f4e38df1c3f483f72b1a24ebc36664d075dd9 35SHA1 (qmail-smtpd-viruscan-1.3.patch) = 3a8f4e38df1c3f483f72b1a24ebc36664d075dd9
36RMD160 (qmail-smtpd-viruscan-1.3.patch) = ad6c5ef7894177fd5a7f131765eff22d092ecf54 36RMD160 (qmail-smtpd-viruscan-1.3.patch) = ad6c5ef7894177fd5a7f131765eff22d092ecf54
37SHA512 (qmail-smtpd-viruscan-1.3.patch) = acc84c793aba4f3987cf1479c9cf246b319f617cb4f3a483ee57632f4507038d396435b5b154583f0a61c6363f1af4551a9a657089c6922014d2584c12fd6d6f 37SHA512 (qmail-smtpd-viruscan-1.3.patch) = acc84c793aba4f3987cf1479c9cf246b319f617cb4f3a483ee57632f4507038d396435b5b154583f0a61c6363f1af4551a9a657089c6922014d2584c12fd6d6f
38Size (qmail-smtpd-viruscan-1.3.patch) = 8891 bytes 38Size (qmail-smtpd-viruscan-1.3.patch) = 8891 bytes
39SHA1 (qmail-smtpd-viruscan-logging.patch) = ca7105b5561cf280e9e3a465d2d68a16673ff56c 39SHA1 (qmail-smtpd-viruscan-logging.patch) = ca7105b5561cf280e9e3a465d2d68a16673ff56c
40RMD160 (qmail-smtpd-viruscan-logging.patch) = 79631cb7b5b120f98397011c4fb94726c48b83e4 40RMD160 (qmail-smtpd-viruscan-logging.patch) = 79631cb7b5b120f98397011c4fb94726c48b83e4
41SHA512 (qmail-smtpd-viruscan-logging.patch) = 6441dfb5dd8951a765d7172f44420d691976f4aa13c77ef16c459c6457cf32086a730278350bcb801ed4c986cbafa3c7a483c399ed073c02d53ad2ea18781efe 41SHA512 (qmail-smtpd-viruscan-logging.patch) = 6441dfb5dd8951a765d7172f44420d691976f4aa13c77ef16c459c6457cf32086a730278350bcb801ed4c986cbafa3c7a483c399ed073c02d53ad2ea18781efe
42Size (qmail-smtpd-viruscan-logging.patch) = 2157 bytes 42Size (qmail-smtpd-viruscan-logging.patch) = 2157 bytes
43SHA1 (patch-Makefile) = bd2b4bc966767df6e4b700213201fe2d38ca82aa 43SHA1 (patch-Makefile) = 7ab7c2893393f42d8587a14a2d0c86c09e60061a
44SHA1 (patch-auto__uids.c) = f900b61e047eb8776e5ff2e0381f2a53d49fafad 44SHA1 (patch-auto__uids.c) = f900b61e047eb8776e5ff2e0381f2a53d49fafad
45SHA1 (patch-auto__uids.h) = 5041dc91e51fc8413c0bf5e83c3d6b423f71cf86 45SHA1 (patch-auto__uids.h) = 5041dc91e51fc8413c0bf5e83c3d6b423f71cf86
 46SHA1 (patch-hier.c) = 7578a0977f168e337748773d63e57504bf7bf075
 47SHA1 (patch-pkgsrc__user__destdir__fake__chown.c) = 3897b81327ca5c59503199d08dd6ed5cdc6a531a
 48SHA1 (patch-pkgsrc__user__destdir__fake__uids.h) = 139f6cf38c1b928265a16bd3335b8ce6d7563f96
46SHA1 (patch-spawn.c) = aad06c4ed3ad4bd0e500ab561d7f7307c19e3283 49SHA1 (patch-spawn.c) = aad06c4ed3ad4bd0e500ab561d7f7307c19e3283
47SHA1 (patch-strerr_sys.c) = 15e6466c655058664cb660e5e12232bf45010814 50SHA1 (patch-strerr_sys.c) = 15e6466c655058664cb660e5e12232bf45010814
cvs diff -r1.3 -r1.4 pkgsrc/mail/qmail/patches/Attic/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/mail/qmail/patches/Attic/patch-Makefile 2017/03/10 03:13:29 1.3
+++ pkgsrc/mail/qmail/patches/Attic/patch-Makefile 2017/03/20 16:23:20 1.4
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-Makefile,v 1.3 2017/03/10 03:13:29 schmonz Exp $ 1$NetBSD: patch-Makefile,v 1.4 2017/03/20 16:23:20 schmonz Exp $
2 2
3DESTDIR support. 3DESTDIR support, and don't hardcode numeric IDs into binaries.
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@@ -4,6 +4,14 @@ SHELL=/bin/sh 7@@ -4,6 +4,14 @@ SHELL=/bin/sh
8  8
9 default: it 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
File Added: pkgsrc/mail/qmail/patches/Attic/patch-hier.c
$NetBSD: patch-hier.c,v 1.5 2017/03/20 16:23:20 schmonz Exp $

Install files without needing real qmail users to exist yet.

--- hier.c.orig	1998-06-15 10:53:16.000000000 +0000
+++ hier.c
@@ -1,6 +1,7 @@
 #include "auto_qmail.h"
 #include "auto_split.h"
-#include "auto_uids.h"
+#include "pkgsrc_user_destdir_fake_uids.h"
+#include "pkgsrc_user_destdir_fake_chown.c"
 #include "fmt.h"
 #include "fifo.h"
File Added: pkgsrc/mail/qmail/patches/Attic/patch-pkgsrc__user__destdir__fake__chown.c
$NetBSD: patch-pkgsrc__user__destdir__fake__chown.c,v 1.1 2017/03/20 16:23:20 schmonz Exp $

Install files without needing real qmail users to exist yet.

--- pkgsrc_user_destdir_fake_chown.c.orig	2017-03-20 13:51:05.000000000 +0000
+++ pkgsrc_user_destdir_fake_chown.c
@@ -0,0 +1,8 @@
+int chown(path,owner,group)
+const char *path;
+unsigned int owner;
+unsigned int group;
+{
+  /* pkgsrc: can't chown in stage-install, will chown on install */
+  return 0;
+}
File Added: pkgsrc/mail/qmail/patches/Attic/patch-pkgsrc__user__destdir__fake__uids.h
$NetBSD: patch-pkgsrc__user__destdir__fake__uids.h,v 1.1 2017/03/20 16:23:20 schmonz Exp $

Install files without needing real qmail users to exist yet.

--- pkgsrc_user_destdir_fake_uids.h.orig	2017-03-20 13:49:34.000000000 +0000
+++ pkgsrc_user_destdir_fake_uids.h
@@ -0,0 +1,16 @@
+#ifndef AUTO_UIDS_H
+#define AUTO_UIDS_H
+
+#define auto_uido  0
+#define auto_uida  1
+#define auto_uidd  2
+#define auto_uidl  3
+#define auto_uidp  4
+#define auto_uidq  5
+#define auto_uidr  6
+#define auto_uids  7
+
+#define auto_gidq  8
+#define auto_gidn  9
+
+#endif