Don't build postscreen(8) if "MKCRYPTO" is set to "no". It cannot be
built without TLS support, at least not without major surgery. I've only tested this by building with "MKCRYPTO" set to "yes" because the build fails much ealier otherwise. Problem reported by Nick Hudson in private e-mail.
This commit is contained in:
tron
parent
63b031c3bb
commit
bb4b748000
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: mi,v 1.972 2011/11/24 21:44:19 ahoka Exp $
|
||||
# $NetBSD: mi,v 1.973 2011/11/28 16:22:14 tron Exp $
|
||||
#
|
||||
# Note: Don't delete entries from here - mark them as "obsolete" instead,
|
||||
# unless otherwise stated below.
|
||||
|
|
@ -1066,7 +1066,7 @@
|
|||
./usr/libexec/postfix/postfix-script base-postfix-bin postfix
|
||||
./usr/libexec/postfix/postfix-wrapper base-postfix-bin postfix
|
||||
./usr/libexec/postfix/postmulti-script base-postfix-bin postfix
|
||||
./usr/libexec/postfix/postscreen base-postfix-bin postfix
|
||||
./usr/libexec/postfix/postscreen base-postfix-bin postfix,crypto
|
||||
./usr/libexec/postfix/proxymap base-postfix-bin postfix
|
||||
./usr/libexec/postfix/qmgr base-postfix-bin postfix
|
||||
./usr/libexec/postfix/qmqpd base-obsolete obsolete
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: mi,v 1.1712 2011/11/25 07:50:36 njoly Exp $
|
||||
# $NetBSD: mi,v 1.1713 2011/11/28 16:22:15 tron Exp $
|
||||
#
|
||||
# Note: don't delete entries from here - mark them as "obsolete" instead.
|
||||
#
|
||||
|
|
@ -3995,7 +3995,7 @@
|
|||
./usr/libdata/debug/usr/libexec/postfix/oqmgr.debug comp-postfix-debug postfix,debug
|
||||
./usr/libdata/debug/usr/libexec/postfix/pickup.debug comp-postfix-debug postfix,debug
|
||||
./usr/libdata/debug/usr/libexec/postfix/pipe.debug comp-postfix-debug postfix,debug
|
||||
./usr/libdata/debug/usr/libexec/postfix/postscreen.debug comp-postfix-debug postfix,debug
|
||||
./usr/libdata/debug/usr/libexec/postfix/postscreen.debug comp-postfix-debug postfix,crypto,debug
|
||||
./usr/libdata/debug/usr/libexec/postfix/proxymap.debug comp-postfix-debug postfix,debug
|
||||
./usr/libdata/debug/usr/libexec/postfix/qmgr.debug comp-postfix-debug postfix,debug
|
||||
./usr/libdata/debug/usr/libexec/postfix/scache.debug comp-postfix-debug postfix,debug
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: mi,v 1.1359 2011/11/27 09:00:32 isaki Exp $
|
||||
# $NetBSD: mi,v 1.1360 2011/11/28 16:22:17 tron Exp $
|
||||
#
|
||||
# Note: don't delete entries from here - mark them as "obsolete" instead.
|
||||
#
|
||||
|
|
@ -2651,7 +2651,7 @@
|
|||
./usr/share/man/cat8/pmppc/makedev.0 man-obsolete obsolete
|
||||
./usr/share/man/cat8/portmap.0 man-obsolete obsolete
|
||||
./usr/share/man/cat8/postinstall.0 man-sys-catman .cat
|
||||
./usr/share/man/cat8/postscreen.0 man-postfix-catman postfix,.cat
|
||||
./usr/share/man/cat8/postscreen.0 man-postfix-catman postfix,crypto,.cat
|
||||
./usr/share/man/cat8/powerd.0 man-sysutil-catman .cat
|
||||
./usr/share/man/cat8/poweroff.0 man-sysutil-catman .cat
|
||||
./usr/share/man/cat8/pppd.0 man-ppp-catman .cat
|
||||
|
|
@ -5252,7 +5252,7 @@
|
|||
./usr/share/man/html8/pipe.html man-postfix-htmlman postfix,html
|
||||
./usr/share/man/html8/pmax/boot.html man-sys-htmlman html
|
||||
./usr/share/man/html8/postinstall.html man-sys-htmlman html
|
||||
./usr/share/man/html8/postscreen.html man-postfix-htmlman postfix,html
|
||||
./usr/share/man/html8/postscreen.html man-postfix-htmlman postfix,crypto,html
|
||||
./usr/share/man/html8/powerd.html man-sysutil-htmlman html
|
||||
./usr/share/man/html8/poweroff.html man-sysutil-htmlman html
|
||||
./usr/share/man/html8/pppd.html man-ppp-htmlman html
|
||||
|
|
@ -8120,7 +8120,7 @@
|
|||
./usr/share/man/man8/pmppc/makedev.8 man-obsolete obsolete
|
||||
./usr/share/man/man8/portmap.8 man-obsolete obsolete
|
||||
./usr/share/man/man8/postinstall.8 man-sys-man .man
|
||||
./usr/share/man/man8/postscreen.8 man-postfix-man postfix,.man
|
||||
./usr/share/man/man8/postscreen.8 man-postfix-man postfix,crypto,.man
|
||||
./usr/share/man/man8/powerd.8 man-sysutil-man .man
|
||||
./usr/share/man/man8/poweroff.8 man-sysutil-man .man
|
||||
./usr/share/man/man8/pppd.8 man-ppp-man .man
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
# $NetBSD: Makefile,v 1.3 2011/03/02 22:24:55 tron Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2011/11/28 16:22:14 tron Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
SUBDIR= anvil bounce cleanup discard dnsblog error flush local master oqmgr \
|
||||
pickup pipe postfix-script postscreen proxymap qmgr scache sendmail \
|
||||
pickup pipe postfix-script proxymap qmgr scache sendmail \
|
||||
showq smtp smtpd spawn trivial-rewrite verify virtual
|
||||
|
||||
.if ${MKCRYPTO} != "no"
|
||||
SUBDIR+= tlsmgr tlsproxy
|
||||
SUBDIR+= postscreen tlsmgr tlsproxy
|
||||
.endif
|
||||
|
||||
# Not built: fsstone (unneeded), smtpstone (unneeded), qmqpd (unneeded)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.2 2011/03/02 22:24:56 tron Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2011/11/28 16:22:14 tron Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -6,13 +6,13 @@ DIST= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist/man/man8
|
|||
.PATH: ${DIST}
|
||||
|
||||
MAN= anvil.8 bounce.8 cleanup.8 discard.8 dnsblog.8 error.8 local.8 \
|
||||
master.8 pickup.8 pipe.8 postscreen.8 proxymap.8 qmgr.8 \
|
||||
master.8 pickup.8 pipe.8 proxymap.8 qmgr.8 \
|
||||
scache.8 showq.8 smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 \
|
||||
oqmgr.8 spawn.8 flush.8 virtual.8 \
|
||||
verify.8
|
||||
|
||||
.if ${MKCRYPTO} != "no"
|
||||
MAN+= tlsmgr.8 tlsproxy.8
|
||||
MAN+= postscreen.8 tlsmgr.8 tlsproxy.8
|
||||
.endif
|
||||
|
||||
MLINKS= bounce.8 defer.8
|
||||
|
|
|
|||
Loading…
Reference in New Issue