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.diff -r1.6 -r1.7 pkgsrc/mail/qmail/INSTALL
(schmonz)
@@ -1,88 +1,91 @@ | @@ -1,88 +1,91 @@ | |||
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 | |||
3 | DOCDIR=@DOCDIR@ | 3 | DOCDIR=@DOCDIR@ | |
4 | EGDIR=@EGDIR@ | 4 | EGDIR=@EGDIR@ | |
5 | OPENSSL=@OPENSSL@ | 5 | OPENSSL=@OPENSSL@ | |
6 | PKGMANDIR=@PKGMANDIR@ | 6 | PKGMANDIR=@PKGMANDIR@ | |
7 | QMAILDIR=@QMAILDIR@ | 7 | QMAILDIR=@QMAILDIR@ | |
8 | QMAIL_QUEUE_DIR=@QMAIL_QUEUE_DIR@ | 8 | QMAIL_QUEUE_DIR=@QMAIL_QUEUE_DIR@ | |
9 | QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@ | 9 | QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@ | |
10 | 10 | |||
11 | VAR_QMAIL_DIRS="alias bin boot control doc man queue users" | 11 | VAR_QMAIL_DIRS="alias bin boot control doc man queue users" | |
12 | 12 | |||
13 | case ${STAGE} in | 13 | case ${STAGE} in | |
14 | 14 | |||
15 | PRE-INSTALL) | 15 | PRE-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 | |||
21 | ERROR: ${QMAILDIR} exists and is non-empty. | 21 | ERROR: ${QMAILDIR} exists and is non-empty. | |
22 | 22 | |||
23 | Please remove or rename it, then try again. | 23 | Please remove or rename it, then try again. | |
24 | 24 | |||
25 | =========================================================================== | 25 | =========================================================================== | |
26 | EOF | 26 | EOF | |
27 | exit 1 | 27 | exit 1 | |
28 | fi | 28 | fi | |
29 | done | 29 | done | |
30 | 30 | |||
31 | if ${ECHO} ${QMAIL_QUEUE_DIR} | ${GREP} -q "^${QMAILDIR}/"; then | 31 | if ${ECHO} ${QMAIL_QUEUE_DIR} | ${GREP} -q "^${QMAILDIR}/"; then | |
32 | ${CAT} <<EOF | 32 | ${CAT} <<EOF | |
33 | =========================================================================== | 33 | =========================================================================== | |
34 | 34 | |||
35 | ERROR: QMAIL_QUEUE_DIR must not be under ${QMAILDIR}. | 35 | ERROR: QMAIL_QUEUE_DIR must not be under ${QMAILDIR}. | |
36 | 36 | |||
37 | Please adjust your definition of QMAIL_QUEUE_DIR, then try again. | 37 | Please adjust your definition of QMAIL_QUEUE_DIR, then try again. | |
38 | 38 | |||
39 | =========================================================================== | 39 | =========================================================================== | |
40 | EOF | 40 | EOF | |
41 | exit 1 | 41 | exit 1 | |
42 | fi | 42 | fi | |
43 | 43 | |||
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 | |||
56 | POST-INSTALL) | 56 | POST-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 | |||
61 | NOTE: Before using qmail, create a .qmail file corresponding with the local | 64 | NOTE: Before using qmail, create a .qmail file corresponding with the local | |
62 | user or alias "${QMAIL_QUEUE_EXTRA}" that meets the requirements for | 65 | user or alias "${QMAIL_QUEUE_EXTRA}" that meets the requirements for | |
63 | QUEUE_EXTRA. | 66 | QUEUE_EXTRA. | |
64 | 67 | |||
65 | =========================================================================== | 68 | =========================================================================== | |
66 | EOF | 69 | EOF | |
67 | fi | 70 | fi | |
68 | 71 | |||
69 | SERVERCERT=${PKG_SYSCONFDIR}/control/servercert.pem | 72 | SERVERCERT=${PKG_SYSCONFDIR}/control/servercert.pem | |
70 | if ! [ -z ${OPENSSL} ] && ! [ -s ${SERVERCERT} ]; then | 73 | if ! [ -z ${OPENSSL} ] && ! [ -s ${SERVERCERT} ]; then | |
71 | ${CAT} <<EOF | 74 | ${CAT} <<EOF | |
72 | =========================================================================== | 75 | =========================================================================== | |
73 | 76 | |||
74 | NOTE: If you don't already have an SSL certificate for qmail: | 77 | NOTE: If you don't already have an SSL certificate for qmail: | |
75 | 78 | |||
76 | # ${OPENSSL} req -new -x509 -nodes -days 366 -out ${SERVERCERT} -keyout ${SERVERCERT} | 79 | # ${OPENSSL} req -new -x509 -nodes -days 366 -out ${SERVERCERT} -keyout ${SERVERCERT} | |
77 | # chmod 640 ${SERVERCERT} | 80 | # chmod 640 ${SERVERCERT} | |
78 | # chown qmaild:qmail ${SERVERCERT} | 81 | # chown qmaild:qmail ${SERVERCERT} | |
79 | # ln -s ${SERVERCERT} ${PKG_SYSCONFDIR}/control/clientcert.pem | 82 | # ln -s ${SERVERCERT} ${PKG_SYSCONFDIR}/control/clientcert.pem | |
80 | # update_tmprsadh | 83 | # update_tmprsadh | |
81 | 84 | |||
82 | =========================================================================== | 85 | =========================================================================== | |
83 | EOF | 86 | EOF | |
84 | fi | 87 | fi | |
85 | 88 | |||
86 | ;; | 89 | ;; | |
87 | 90 | |||
88 | esac | 91 | esac |
@@ -1,191 +1,170 @@ | @@ -1,191 +1,170 @@ | |||
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 | |||
4 | DISTNAME= ${PKGNAME_NOREV} | 4 | DISTNAME= ${PKGNAME_NOREV} | |
5 | PKGNAME= qmail-1.03 | 5 | PKGNAME= qmail-1.03 | |
6 | PKGREVISION= 21 | 6 | PKGREVISION= 22 | |
7 | CATEGORIES= mail | 7 | CATEGORIES= mail | |
8 | MASTER_SITES= http://qmail.org/ | 8 | MASTER_SITES= http://qmail.org/ | |
9 | 9 | |||
10 | MAINTAINER= schmonz@NetBSD.org | 10 | MAINTAINER= schmonz@NetBSD.org | |
11 | HOMEPAGE= http://cr.yp.to/qmail.html | 11 | HOMEPAGE= http://cr.yp.to/qmail.html | |
12 | COMMENT= Secure, reliable, efficient, simple, and fast MTA | 12 | COMMENT= Secure, reliable, efficient, simple, and fast MTA | |
13 | LICENSE= public-domain | 13 | LICENSE= public-domain | |
14 | 14 | |||
15 | DEPENDS+= checkpassword-[0-9]*:../../sysutils/checkpassword | 15 | DEPENDS+= checkpassword-[0-9]*:../../sysutils/checkpassword | |
16 | DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools | 16 | DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools | |
17 | DEPENDS+= queue-fix-[0-9]*:../../mail/queue-fix | |||
17 | DEPENDS+= ucspi-tcp-[0-9]*:../../net/ucspi-tcp | 18 | DEPENDS+= ucspi-tcp-[0-9]*:../../net/ucspi-tcp | |
18 | 19 | |||
19 | CONFLICTS+= courier-maildirmake-[0-9]* | 20 | CONFLICTS+= courier-maildirmake-[0-9]* | |
20 | CONFLICTS+= courier-mta-[0-9]* | 21 | CONFLICTS+= courier-mta-[0-9]* | |
21 | CONFLICTS+= mirrordir-[0-9]* | 22 | CONFLICTS+= mirrordir-[0-9]* | |
22 | CONFLICTS+= mutt<=1.4.2.1nb1 | 23 | CONFLICTS+= mutt<=1.4.2.1nb1 | |
23 | CONFLICTS+= netqmail-[0-9]* | 24 | CONFLICTS+= netqmail-[0-9]* | |
24 | CONFLICTS+= pulsar<=0.1.1 | 25 | CONFLICTS+= pulsar<=0.1.1 | |
25 | 26 | |||
26 | NOT_FOR_UNPRIVILEGED= yes | |||
27 | ||||
28 | WRKSRC= ${WRKDIR}/${DISTNAME} | 27 | WRKSRC= ${WRKDIR}/${DISTNAME} | |
29 | 28 | |||
30 | PKG_DESTDIR_SUPPORT= destdir | |||
31 | USE_TOOLS+= nroff | 29 | USE_TOOLS+= nroff | |
32 | 30 | |||
33 | DJB_CONFIG_CMDS= ${ECHO} ${DESTDIR:Q}${QMAILDIR:Q} > conf-destdir | 31 | DJB_CONFIG_CMDS= ${ECHO} ${DESTDIR:Q}${QMAILDIR:Q} > conf-destdir | |
34 | DJB_BUILD_TARGETS= man | 32 | DJB_BUILD_TARGETS= man | |
35 | DJB_RESTRICTED= no | 33 | DJB_RESTRICTED= no | |
36 | 34 | |||
37 | PKG_SYSCONFSUBDIR= qmail | 35 | PKG_SYSCONFSUBDIR= qmail | |
38 | OWN_DIRS+= ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/alias | 36 | OWN_DIRS+= ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/alias | |
39 | OWN_DIRS+= ${PKG_SYSCONFDIR}/control ${PKG_SYSCONFDIR}/users | 37 | OWN_DIRS+= ${PKG_SYSCONFDIR}/control ${PKG_SYSCONFDIR}/users | |
40 | OWN_DIRS+= ${QMAILDIR} ${QMAIL_QUEUE_DIR} | 38 | OWN_DIRS+= ${QMAILDIR} ${QMAIL_QUEUE_DIR} | |
41 | 39 | |||
42 | DOCDIR= ${PREFIX}/share/doc/qmail | 40 | DOCDIR= ${PREFIX}/share/doc/qmail | |
43 | EGDIR= ${PREFIX}/share/examples/qmail | 41 | EGDIR= ${PREFIX}/share/examples/qmail | |
44 | SHAREDIR= ${PREFIX}/share/qmail | 42 | SHAREDIR= ${PREFIX}/share/qmail | |
45 | PLIST_SUBST+= DARWINSUFX=${DARWINSUFX:Q} | 43 | PLIST_SUBST+= DARWINSUFX=${DARWINSUFX:Q} | |
46 | MESSAGE_SUBST+= DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q} | 44 | MESSAGE_SUBST+= DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q} | |
47 | FILES_SUBST+= DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q} | 45 | FILES_SUBST+= DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q} | |
48 | FILES_SUBST+= OPENSSL=${OPENSSL:Q} | 46 | FILES_SUBST+= OPENSSL=${OPENSSL:Q} | |
49 | FILES_SUBST+= PKGMANDIR=${PKGMANDIR:Q} SHAREDIR=${SHAREDIR:Q} | 47 | FILES_SUBST+= PKGMANDIR=${PKGMANDIR:Q} SHAREDIR=${SHAREDIR:Q} | |
50 | FILES_SUBST+= QMAILDIR=${QMAILDIR:Q} | 48 | FILES_SUBST+= QMAILDIR=${QMAILDIR:Q} | |
51 | FILES_SUBST+= QMAIL_QUEUE_DIR=${QMAIL_QUEUE_DIR:Q} | 49 | FILES_SUBST+= QMAIL_QUEUE_DIR=${QMAIL_QUEUE_DIR:Q} | |
52 | FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q} | 50 | FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q} | |
53 | FILES_SUBST+= PKGNAME=${PKGNAME:Q} | 51 | FILES_SUBST+= PKGNAME=${PKGNAME:Q} | |
54 | 52 | |||
55 | SETUP_PROGRAMS= dnsfq dnsip dnsptr hostname install ipmeprint | 53 | SETUP_PROGRAMS= dnsfq dnsip dnsptr hostname install ipmeprint | |
56 | SETUP_SCRIPTS= config config-fast | 54 | SETUP_SCRIPTS= config config-fast | |
57 | 55 | |||
58 | MANDIRS= man | 56 | MANDIRS= man | |
59 | .for j in 1 5 7 8 | 57 | .for j in 1 5 7 8 | |
60 | MANDIRS+= man/man${j} | 58 | MANDIRS+= man/man${j} | |
61 | .endfor | 59 | .endfor | |
62 | INSTALLATION_DIRS= bin ${MANDIRS} ${DOCDIR} ${SHAREDIR} | 60 | INSTALLATION_DIRS= bin ${MANDIRS} ${DOCDIR} ${SHAREDIR} | |
63 | INSTALLATION_DIRS+= ${EGDIR}/alias ${EGDIR}/boot ${EGDIR}/control | 61 | INSTALLATION_DIRS+= ${EGDIR}/alias ${EGDIR}/boot ${EGDIR}/control | |
64 | INSTALLATION_DIRS+= ${EGDIR}/users | 62 | INSTALLATION_DIRS+= ${EGDIR}/users | |
65 | 63 | |||
66 | .include "../../mk/bsd.prefs.mk" | 64 | .include "../../mk/bsd.prefs.mk" | |
67 | 65 | |||
68 | BUILD_DEFS+= QMAILDIR QMAIL_QUEUE_DIR QMAIL_QUEUE_EXTRA | 66 | BUILD_DEFS+= QMAILDIR QMAIL_QUEUE_DIR QMAIL_QUEUE_EXTRA | |
69 | 67 | |||
70 | .if !empty(QMAIL_QUEUE_DIR:M${QMAILDIR}/*) | 68 | .if !empty(QMAIL_QUEUE_DIR:M${QMAILDIR}/*) | |
71 | PKG_FAIL_REASON+= "QMAIL_QUEUE_DIR must not be under ${QMAILDIR}" | 69 | PKG_FAIL_REASON+= "QMAIL_QUEUE_DIR must not be under ${QMAILDIR}" | |
72 | .endif | 70 | .endif | |
73 | 71 | |||
74 | .if !empty(QMAIL_QUEUE_EXTRA) | 72 | .if !empty(QMAIL_QUEUE_EXTRA) | |
75 | USE_TOOLS+= expr | 73 | USE_TOOLS+= expr | |
76 | QUEUE_EXTRA= "T${QMAIL_QUEUE_EXTRA}\\0" | 74 | QUEUE_EXTRA= "T${QMAIL_QUEUE_EXTRA}\\0" | |
77 | QUEUE_EXTRALEN_cmd= ${EXPR} `${ECHO_N} ${QMAIL_QUEUE_EXTRA} | ${WC} -c` + 2 | 75 | QUEUE_EXTRALEN_cmd= ${EXPR} `${ECHO_N} ${QMAIL_QUEUE_EXTRA} | ${WC} -c` + 2 | |
78 | SUBST_CLASSES+= logging | 76 | SUBST_CLASSES+= logging | |
79 | SUBST_STAGE.logging= do-configure | 77 | SUBST_STAGE.logging= do-configure | |
80 | SUBST_FILES.logging= extra.h | 78 | SUBST_FILES.logging= extra.h | |
81 | SUBST_SED.logging= -e 's|0|${QUEUE_EXTRALEN_cmd:sh}|g' | 79 | SUBST_SED.logging= -e 's|0|${QUEUE_EXTRALEN_cmd:sh}|g' | |
82 | SUBST_SED.logging+= -e 's|""|${QUEUE_EXTRA}|g' | 80 | SUBST_SED.logging+= -e 's|""|${QUEUE_EXTRA}|g' | |
83 | SUBST_MESSAGE.logging= Setting QUEUE_EXTRA. | 81 | SUBST_MESSAGE.logging= Setting QUEUE_EXTRA. | |
84 | .endif | 82 | .endif | |
85 | 83 | |||
86 | SUBST_CLASSES+= caseclash | 84 | SUBST_CLASSES+= caseclash | |
87 | SUBST_STAGE.caseclash= do-configure | 85 | SUBST_STAGE.caseclash= do-configure | |
88 | SUBST_FILES.caseclash= hier.c | 86 | SUBST_FILES.caseclash= hier.c | |
89 | SUBST_SED.caseclash= -e 's|"INSTALL"|"INSTALL${DARWINSUFX}"|g' | 87 | SUBST_SED.caseclash= -e 's|"INSTALL"|"INSTALL${DARWINSUFX}"|g' | |
90 | SUBST_SED.caseclash+= -e 's|"SENDMAIL"|"SENDMAIL${DARWINSUFX}"|g' | 88 | SUBST_SED.caseclash+= -e 's|"SENDMAIL"|"SENDMAIL${DARWINSUFX}"|g' | |
91 | 89 | |||
92 | SUBST_CLASSES+= catpages | 90 | SUBST_CLASSES+= catpages | |
93 | SUBST_STAGE.catpages= do-configure | 91 | SUBST_STAGE.catpages= do-configure | |
94 | SUBST_FILES.catpages= hier.c | 92 | SUBST_FILES.catpages= hier.c | |
95 | SUBST_SED.catpages= -e 's|.*"man/cat[0-9]".*||g' | 93 | SUBST_SED.catpages= -e 's|.*"man/cat[0-9]".*||g' | |
96 | SUBST_SED.catpages+= -e 's|.*"tcp-environ\.5".*||g' # also in ucspi-tcp | 94 | SUBST_SED.catpages+= -e 's|.*"tcp-environ\.5".*||g' # also in ucspi-tcp | |
97 | 95 | |||
98 | SUBST_CLASSES+= destdir | 96 | SUBST_CLASSES+= destdir | |
99 | SUBST_STAGE.destdir= do-configure | 97 | SUBST_STAGE.destdir= do-configure | |
100 | SUBST_FILES.destdir= Makefile | 98 | SUBST_FILES.destdir= Makefile | |
101 | SUBST_SED.destdir= -e 's|\(^load inst.*\.o\) auto_qmail\.o\(.*\)|\1 auto_destdir.o\2|g' | 99 | SUBST_SED.destdir= -e 's|\(^load inst.*\.o\) auto_qmail\.o\(.*\)|\1 auto_destdir.o\2|g' | |
102 | SUBST_SED.destdir+= -e 's|\(^ \./load inst.*\) auto_qmail\.o\(.*\)|\1 auto_destdir.o\2|g' | 100 | SUBST_SED.destdir+= -e 's|\(^ \./load inst.*\) auto_qmail\.o\(.*\)|\1 auto_destdir.o\2|g' | |
103 | 101 | |||
104 | SUBST_CLASSES+= paths | 102 | SUBST_CLASSES+= paths | |
105 | SUBST_STAGE.paths= do-configure | 103 | SUBST_STAGE.paths= do-configure | |
106 | SUBST_FILES.paths= README.pkgsrc | 104 | SUBST_FILES.paths= README.pkgsrc | |
107 | SUBST_SED.paths= -e 's,@PKGNAME@,${PKGNAME:Q},g' | 105 | SUBST_SED.paths= -e 's,@PKGNAME@,${PKGNAME:Q},g' | |
108 | SUBST_SED.paths+= -e 's,@PKG_INFO@,${PKG_INFO:Q},g' | 106 | SUBST_SED.paths+= -e 's,@PKG_INFO@,${PKG_INFO:Q},g' | |
109 | SUBST_SED.paths+= -e 's,@GREP@,${GREP:Q},g' | 107 | SUBST_SED.paths+= -e 's,@GREP@,${GREP:Q},g' | |
110 | 108 | |||
111 | SUBST_FILES.djbware+= cdb_seek.c dns.c | 109 | SUBST_FILES.djbware+= cdb_seek.c dns.c | |
112 | 110 | |||
113 | USERGROUP_PHASE= pre-install | |||
114 | PKG_GROUPS= qmail nofiles | 111 | PKG_GROUPS= qmail nofiles | |
115 | PKG_USERS+= alias:nofiles | 112 | PKG_USERS+= alias:nofiles | |
116 | PKG_USERS+= qmaill:nofiles qmaild:nofiles qmailp:nofiles | 113 | PKG_USERS+= qmaill:nofiles qmaild:nofiles qmailp:nofiles | |
117 | PKG_USERS+= qmailq:qmail qmailr:qmail qmails:qmail | 114 | PKG_USERS+= qmailq:qmail qmailr:qmail qmails:qmail | |
118 | .for user in ${PKG_USERS:C/\:.*//} | 115 | .for user in ${PKG_USERS:C/\:.*//} | |
119 | PKG_HOME.${user}= ${QMAILDIR} | 116 | PKG_HOME.${user}= ${QMAILDIR} | |
120 | .endfor | 117 | .endfor | |
121 | PKG_HOME.alias= ${QMAILDIR}/alias | 118 | PKG_HOME.alias= ${QMAILDIR}/alias | |
122 | 119 | |||
123 | QMAIL_ROOT_ONLY_READABLES= qmail-clean qmail-getpw qmail-local qmail-popup | 120 | SPECIAL_PERMS+= ${PREFIX}/bin/qmail-queue qmailq qmail 04711 | |
124 | QMAIL_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 | |
125 | QMAIL_ROOT_ONLY_READABLES+= splogger | 122 | SPECIAL_PERMS+= ${PREFIX}/bin/${f} root qmail 0755 | |
126 | QMAIL_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 | ||
128 | SPECIAL_PERMS+= ${PREFIX}/bin/qmail-queue qmailq qmail 4555 | |||
129 | .for f in ${QMAIL_ROOT_ONLY_READABLES} | |||
130 | SPECIAL_PERMS+= ${PREFIX}/bin/${f} root qmail 0711 | 125 | SPECIAL_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 | |
133 | SPECIAL_PERMS+= ${PREFIX}/bin/${f} root qmail 0700 | 128 | SPECIAL_PERMS+= ${PREFIX}/bin/${f} root qmail 0700 | |
134 | .endfor | 129 | .endfor | |
135 | 130 | |||
136 | OPSYSVARS+= DARWINSUFX | 131 | OPSYSVARS+= DARWINSUFX | |
137 | DARWINSUFX.Darwin= .doc | 132 | DARWINSUFX.Darwin= .doc | |
138 | DARWINSUFX.*= # empty | 133 | DARWINSUFX.*= # empty | |
139 | 134 | |||
140 | post-extract: post-extract-viruscan | 135 | post-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 | |
146 | .endif | 141 | .endif | |
147 | 142 | |||
148 | pre-install: | 143 | 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 | |||
161 | post-install: post-install-viruscan | 156 | post-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" | |
191 | .include "../../mk/bsd.pkg.mk" | 170 | .include "../../mk/bsd.pkg.mk" |
@@ -1,47 +1,50 @@ | @@ -1,47 +1,50 @@ | |||
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 | |||
3 | SHA1 (qmail-1.03.tar.gz) = 18fb960481291a0503e93a94df3f6094edb7f27a | 3 | SHA1 (qmail-1.03.tar.gz) = 18fb960481291a0503e93a94df3f6094edb7f27a | |
4 | RMD160 (qmail-1.03.tar.gz) = b851f273f1d365d38efd949b1efcf35768ffa30f | 4 | RMD160 (qmail-1.03.tar.gz) = b851f273f1d365d38efd949b1efcf35768ffa30f | |
5 | SHA512 (qmail-1.03.tar.gz) = f2cc47c3ef4a3595d5953f216811a9b60f505cf8cbfd31ae31a888ee04916936210ef1c23d59e8d280a5f0e1c3794b90ee212b2b0f36361c5eff842598c8aee2 | 5 | SHA512 (qmail-1.03.tar.gz) = f2cc47c3ef4a3595d5953f216811a9b60f505cf8cbfd31ae31a888ee04916936210ef1c23d59e8d280a5f0e1c3794b90ee212b2b0f36361c5eff842598c8aee2 | |
6 | Size (qmail-1.03.tar.gz) = 220668 bytes | 6 | Size (qmail-1.03.tar.gz) = 220668 bytes | |
7 | SHA1 (netqmail-1.06.tar.gz) = 9ee9a603e2ad3d8e1d34b900e19b7a5d275f538b | 7 | SHA1 (netqmail-1.06.tar.gz) = 9ee9a603e2ad3d8e1d34b900e19b7a5d275f538b | |
8 | RMD160 (netqmail-1.06.tar.gz) = d31598afa862abb35bc1feb8d038ab619b5a17a2 | 8 | RMD160 (netqmail-1.06.tar.gz) = d31598afa862abb35bc1feb8d038ab619b5a17a2 | |
9 | SHA512 (netqmail-1.06.tar.gz) = de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b | 9 | SHA512 (netqmail-1.06.tar.gz) = de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b | |
10 | Size (netqmail-1.06.tar.gz) = 260941 bytes | 10 | Size (netqmail-1.06.tar.gz) = 260941 bytes | |
11 | SHA1 (badrcptto.patch) = 713875ab08239416b6d22ba0d846b14a6aa6912f | 11 | SHA1 (badrcptto.patch) = 713875ab08239416b6d22ba0d846b14a6aa6912f | |
12 | RMD160 (badrcptto.patch) = 88e29eeb203f30ec9c9d01cc42f1b849ea08d509 | 12 | RMD160 (badrcptto.patch) = 88e29eeb203f30ec9c9d01cc42f1b849ea08d509 | |
13 | SHA512 (badrcptto.patch) = 317e7bbcc48af47c363280a172f0b37d756ed2b6e88ae377b16ee675de863da4f95b4ae6c8bf471509e7f558252cb6ad24cf35eaed478e947288ffcfd1d21713 | 13 | SHA512 (badrcptto.patch) = 317e7bbcc48af47c363280a172f0b37d756ed2b6e88ae377b16ee675de863da4f95b4ae6c8bf471509e7f558252cb6ad24cf35eaed478e947288ffcfd1d21713 | |
14 | Size (badrcptto.patch) = 3033 bytes | 14 | Size (badrcptto.patch) = 3033 bytes | |
15 | SHA1 (qmail-103.patch) = dfb9cdabe91449dad2117115177b0a6a356baa9f | 15 | SHA1 (qmail-103.patch) = dfb9cdabe91449dad2117115177b0a6a356baa9f | |
16 | RMD160 (qmail-103.patch) = 437f8b3063438bbd82c59557333b3566214afa9c | 16 | RMD160 (qmail-103.patch) = 437f8b3063438bbd82c59557333b3566214afa9c | |
17 | SHA512 (qmail-103.patch) = b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354 | 17 | SHA512 (qmail-103.patch) = b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354 | |
18 | Size (qmail-103.patch) = 2104 bytes | 18 | Size (qmail-103.patch) = 2104 bytes | |
19 | SHA1 (outgoingip.patch) = c37b50facc72f82cad6505d2db88d5eccc5418b2 | 19 | SHA1 (outgoingip.patch) = c37b50facc72f82cad6505d2db88d5eccc5418b2 | |
20 | RMD160 (outgoingip.patch) = 032c653d395e5f599c0998e92debb09d84f90f0f | 20 | RMD160 (outgoingip.patch) = 032c653d395e5f599c0998e92debb09d84f90f0f | |
21 | SHA512 (outgoingip.patch) = 876eba3e65eba02f62838e5324cf64985254805ac5ec9417b168caa8c8d150a5185885d49a92d968690438289963bd6569e3de3330daf71a248206cd94227cd2 | 21 | SHA512 (outgoingip.patch) = 876eba3e65eba02f62838e5324cf64985254805ac5ec9417b168caa8c8d150a5185885d49a92d968690438289963bd6569e3de3330daf71a248206cd94227cd2 | |
22 | Size (outgoingip.patch) = 6839 bytes | 22 | Size (outgoingip.patch) = 6839 bytes | |
23 | SHA1 (qregex-20060423.patch) = fe52992254e5d464ce0fa0b68cf15ee744266b83 | 23 | SHA1 (qregex-20060423.patch) = fe52992254e5d464ce0fa0b68cf15ee744266b83 | |
24 | RMD160 (qregex-20060423.patch) = f28245fee8bcc38e84816fe379be886376740a0c | 24 | RMD160 (qregex-20060423.patch) = f28245fee8bcc38e84816fe379be886376740a0c | |
25 | SHA512 (qregex-20060423.patch) = 5b93deee7cce7762a8d25a6b3428c67512b81c64443e05c96cdc20fb3a9fc288a45bcb1e133ad70bd520fc807f011b9c5565f72dfb7925e9e010417eb8260631 | 25 | SHA512 (qregex-20060423.patch) = 5b93deee7cce7762a8d25a6b3428c67512b81c64443e05c96cdc20fb3a9fc288a45bcb1e133ad70bd520fc807f011b9c5565f72dfb7925e9e010417eb8260631 | |
26 | Size (qregex-20060423.patch) = 26745 bytes | 26 | Size (qregex-20060423.patch) = 26745 bytes | |
27 | SHA1 (qmail-1.03-realrcptto-2006.12.10.patch) = 89e06519df0f52f748afec583e3e2ce33fe5dfb2 | 27 | SHA1 (qmail-1.03-realrcptto-2006.12.10.patch) = 89e06519df0f52f748afec583e3e2ce33fe5dfb2 | |
28 | RMD160 (qmail-1.03-realrcptto-2006.12.10.patch) = 0f6ad12dd24accab324097350a90f7717747eb56 | 28 | RMD160 (qmail-1.03-realrcptto-2006.12.10.patch) = 0f6ad12dd24accab324097350a90f7717747eb56 | |
29 | SHA512 (qmail-1.03-realrcptto-2006.12.10.patch) = 96fedb97e5c0871f6de3fe91819353503ec0878a31303496072d2cad97384b0c845c7e5f1e76cb9a90c469916dd1353400b4314cdb5b48747b6ed72c09917721 | 29 | SHA512 (qmail-1.03-realrcptto-2006.12.10.patch) = 96fedb97e5c0871f6de3fe91819353503ec0878a31303496072d2cad97384b0c845c7e5f1e76cb9a90c469916dd1353400b4314cdb5b48747b6ed72c09917721 | |
30 | Size (qmail-1.03-realrcptto-2006.12.10.patch) = 17718 bytes | 30 | Size (qmail-1.03-realrcptto-2006.12.10.patch) = 17718 bytes | |
31 | SHA1 (netqmail-1.05-tls-smtpauth-20070417.patch) = d24cb13cf1371044fc2dfe20471478f59b5524e5 | 31 | SHA1 (netqmail-1.05-tls-smtpauth-20070417.patch) = d24cb13cf1371044fc2dfe20471478f59b5524e5 | |
32 | RMD160 (netqmail-1.05-tls-smtpauth-20070417.patch) = 81a00e06fa67a4073b1a5bf5195fbbac675cd46b | 32 | RMD160 (netqmail-1.05-tls-smtpauth-20070417.patch) = 81a00e06fa67a4073b1a5bf5195fbbac675cd46b | |
33 | SHA512 (netqmail-1.05-tls-smtpauth-20070417.patch) = ce5fb50ae9a7683b708eeb65c68a0db47c5817eb3fc14457c4f7c5746916ca2734c647a2369bf6f1240477ee818e3e7d7870aec3edbad2eaace179cba6267e41 | 33 | SHA512 (netqmail-1.05-tls-smtpauth-20070417.patch) = ce5fb50ae9a7683b708eeb65c68a0db47c5817eb3fc14457c4f7c5746916ca2734c647a2369bf6f1240477ee818e3e7d7870aec3edbad2eaace179cba6267e41 | |
34 | Size (netqmail-1.05-tls-smtpauth-20070417.patch) = 67942 bytes | 34 | Size (netqmail-1.05-tls-smtpauth-20070417.patch) = 67942 bytes | |
35 | SHA1 (qmail-smtpd-viruscan-1.3.patch) = 3a8f4e38df1c3f483f72b1a24ebc36664d075dd9 | 35 | SHA1 (qmail-smtpd-viruscan-1.3.patch) = 3a8f4e38df1c3f483f72b1a24ebc36664d075dd9 | |
36 | RMD160 (qmail-smtpd-viruscan-1.3.patch) = ad6c5ef7894177fd5a7f131765eff22d092ecf54 | 36 | RMD160 (qmail-smtpd-viruscan-1.3.patch) = ad6c5ef7894177fd5a7f131765eff22d092ecf54 | |
37 | SHA512 (qmail-smtpd-viruscan-1.3.patch) = acc84c793aba4f3987cf1479c9cf246b319f617cb4f3a483ee57632f4507038d396435b5b154583f0a61c6363f1af4551a9a657089c6922014d2584c12fd6d6f | 37 | SHA512 (qmail-smtpd-viruscan-1.3.patch) = acc84c793aba4f3987cf1479c9cf246b319f617cb4f3a483ee57632f4507038d396435b5b154583f0a61c6363f1af4551a9a657089c6922014d2584c12fd6d6f | |
38 | Size (qmail-smtpd-viruscan-1.3.patch) = 8891 bytes | 38 | Size (qmail-smtpd-viruscan-1.3.patch) = 8891 bytes | |
39 | SHA1 (qmail-smtpd-viruscan-logging.patch) = ca7105b5561cf280e9e3a465d2d68a16673ff56c | 39 | SHA1 (qmail-smtpd-viruscan-logging.patch) = ca7105b5561cf280e9e3a465d2d68a16673ff56c | |
40 | RMD160 (qmail-smtpd-viruscan-logging.patch) = 79631cb7b5b120f98397011c4fb94726c48b83e4 | 40 | RMD160 (qmail-smtpd-viruscan-logging.patch) = 79631cb7b5b120f98397011c4fb94726c48b83e4 | |
41 | SHA512 (qmail-smtpd-viruscan-logging.patch) = 6441dfb5dd8951a765d7172f44420d691976f4aa13c77ef16c459c6457cf32086a730278350bcb801ed4c986cbafa3c7a483c399ed073c02d53ad2ea18781efe | 41 | SHA512 (qmail-smtpd-viruscan-logging.patch) = 6441dfb5dd8951a765d7172f44420d691976f4aa13c77ef16c459c6457cf32086a730278350bcb801ed4c986cbafa3c7a483c399ed073c02d53ad2ea18781efe | |
42 | Size (qmail-smtpd-viruscan-logging.patch) = 2157 bytes | 42 | Size (qmail-smtpd-viruscan-logging.patch) = 2157 bytes | |
43 | SHA1 (patch-Makefile) = bd2b4bc966767df6e4b700213201fe2d38ca82aa | 43 | SHA1 (patch-Makefile) = 7ab7c2893393f42d8587a14a2d0c86c09e60061a | |
44 | SHA1 (patch-auto__uids.c) = f900b61e047eb8776e5ff2e0381f2a53d49fafad | 44 | SHA1 (patch-auto__uids.c) = f900b61e047eb8776e5ff2e0381f2a53d49fafad | |
45 | SHA1 (patch-auto__uids.h) = 5041dc91e51fc8413c0bf5e83c3d6b423f71cf86 | 45 | SHA1 (patch-auto__uids.h) = 5041dc91e51fc8413c0bf5e83c3d6b423f71cf86 | |
46 | SHA1 (patch-hier.c) = 7578a0977f168e337748773d63e57504bf7bf075 | |||
47 | SHA1 (patch-pkgsrc__user__destdir__fake__chown.c) = 3897b81327ca5c59503199d08dd6ed5cdc6a531a | |||
48 | SHA1 (patch-pkgsrc__user__destdir__fake__uids.h) = 139f6cf38c1b928265a16bd3335b8ce6d7563f96 | |||
46 | SHA1 (patch-spawn.c) = aad06c4ed3ad4bd0e500ab561d7f7307c19e3283 | 49 | SHA1 (patch-spawn.c) = aad06c4ed3ad4bd0e500ab561d7f7307c19e3283 | |
47 | SHA1 (patch-strerr_sys.c) = 15e6466c655058664cb660e5e12232bf45010814 | 50 | SHA1 (patch-strerr_sys.c) = 15e6466c655058664cb660e5e12232bf45010814 |
@@ -1,39 +1,39 @@ | @@ -1,39 +1,39 @@ | |||
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 | |||
3 | DESTDIR support. | 3 | DESTDIR 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 | |
17 | + ./compile auto_destdir.c | 17 | + ./compile auto_destdir.c | |
18 | + | 18 | + | |
19 | addresses.0: \ | 19 | addresses.0: \ | |
20 | addresses.5 | 20 | addresses.5 | |
21 | nroff -man addresses.5 > addresses.0 | 21 | nroff -man addresses.5 > addresses.0 | |
22 | @@ -110,7 +118,7 @@ auto_split.o: \ | 22 | @@ -110,7 +118,7 @@ auto_split.o: \ | |
23 | compile auto_split.c | 23 | compile auto_split.c | |
24 | ./compile auto_split.c | 24 | ./compile auto_split.c | |
25 | 25 | |||
26 | -auto_uids.c: \ | 26 | -auto_uids.c: \ | |
27 | +auto_uids_orig.c: \ | 27 | +auto_uids_orig.c: \ | |
28 | auto-uid auto-gid conf-users conf-groups | 28 | auto-uid auto-gid conf-users conf-groups | |
29 | ( ./auto-uid auto_uida `head -1 conf-users` \ | 29 | ( ./auto-uid auto_uida `head -1 conf-users` \ | |
30 | &&./auto-uid auto_uidd `head -2 conf-users | tail -1` \ | 30 | &&./auto-uid auto_uidd `head -2 conf-users | tail -1` \ | |
31 | @@ -122,7 +130,7 @@ auto-uid auto-gid conf-users conf-groups | 31 | @@ -122,7 +130,7 @@ auto-uid auto-gid conf-users conf-groups | |
32 | &&./auto-uid auto_uids `head -8 conf-users | tail -1` \ | 32 | &&./auto-uid auto_uids `head -8 conf-users | tail -1` \ | |
33 | &&./auto-gid auto_gidq `head -1 conf-groups` \ | 33 | &&./auto-gid auto_gidq `head -1 conf-groups` \ | |
34 | &&./auto-gid auto_gidn `head -2 conf-groups | tail -1` \ | 34 | &&./auto-gid auto_gidn `head -2 conf-groups | tail -1` \ | |
35 | - ) > auto_uids.c.tmp && mv auto_uids.c.tmp auto_uids.c | 35 | - ) > auto_uids.c.tmp && mv auto_uids.c.tmp auto_uids.c | |
36 | + ) > auto_uids_orig.c.tmp && mv auto_uids_orig.c.tmp auto_uids_orig.c | 36 | + ) > auto_uids_orig.c.tmp && mv auto_uids_orig.c.tmp auto_uids_orig.c | |
37 | 37 | |||
38 | auto_uids.o: \ | 38 | auto_uids.o: \ | |
39 | compile auto_uids.c | 39 | compile auto_uids.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"
$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;
+}
$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