282034c653
- remove some HTML cruft from netbsd-proto.mc - stop trying to set file ownership and group during stage-install - initialize sm_res earlier and test before calling res_ninit() - clear SSL_OP_TLSEXT_PADDING by defualt to fix interoperability issues - eliminate stray call to res_search() - verified with nm that all deprecated resolver functions have been eradicated The above should address the folling PRs: - PR/47207 - Richard Palo -- attempt to set ownership when unprivileged - PR/48566 - Emmanuel Dreyfus -- problem with TLS timeouts - PR/48913 - Matthias Scheler -- attempt to set ownership when unprivileged
49 lines
2.8 KiB
Text
49 lines
2.8 KiB
Text
$NetBSD: patch-an,v 1.2 2014/06/20 05:24:32 jnemeth Exp $
|
|
|
|
--- sendmail/Makefile.m4.orig 2014-05-16 20:40:15.000000000 +0000
|
|
+++ sendmail/Makefile.m4
|
|
@@ -4,7 +4,7 @@ include(confBUILDTOOLSDIR`/M4/switch.m4'
|
|
define(`confREQUIRE_LIBSM', `true')
|
|
define(`confREQUIRE_SM_OS_H', `true')
|
|
bldPRODUCT_START(`executable', `sendmail')
|
|
-define(`bldBIN_TYPE', `G')
|
|
+dnl define(`bldBIN_TYPE', `G')
|
|
define(`bldINSTALL_DIR', `')
|
|
define(`bldSOURCES', `main.c alias.c arpadate.c bf.c collect.c conf.c control.c convtime.c daemon.c deliver.c domain.c envelope.c err.c headers.c macro.c map.c mci.c milter.c mime.c parseaddr.c queue.c ratectrl.c readcf.c recipient.c sasl.c savemail.c sfsasl.c shmticklib.c sm_resolve.c srvrsmtp.c stab.c stats.c sysexits.c timers.c tls.c trace.c udb.c usersmtp.c util.c version.c ')
|
|
PREPENDDEF(`confENVDEF', `confMAPDEF')
|
|
@@ -68,7 +68,7 @@ ifdef(`confNO_STATISTICS_INSTALL',, `bld
|
|
divert(bldTARGETS_SECTION)
|
|
|
|
install-set-user-id: bldCURRENT_PRODUCT ifdef(`confNO_HELPFILE_INSTALL',, `install-hf') ifdef(`confNO_STATISTICS_INSTALL',, `install-st') ifdef(`confNO_MAN_BUILD',, `install-docs')
|
|
- ${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}
|
|
+ ${INSTALL} -c -m ${S`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}
|
|
for i in ${sendmailTARGET_LINKS}; do \
|
|
rm -f $$i; \
|
|
${LN} ${LNOPTS} ${M`'BINDIR}/sendmail $$i; \
|
|
@@ -76,7 +76,7 @@ install-set-user-id: bldCURRENT_PRODUCT
|
|
|
|
define(`confMTA_LINKS', `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
|
|
install-sm-mta: bldCURRENT_PRODUCT
|
|
- ${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}/sm-mta
|
|
+ ${INSTALL} -c -m ${M`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}/sm-mta
|
|
for i in confMTA_LINKS; do \
|
|
rm -f $$i; \
|
|
${LN} ${LNOPTS} ${M`'BINDIR}/sm-mta $$i; \
|
|
@@ -84,14 +84,14 @@ install-sm-mta: bldCURRENT_PRODUCT
|
|
|
|
install-hf:
|
|
if [ ! -d ${DESTDIR}${HFDIR} ]; then mkdir -p ${DESTDIR}${HFDIR}; else :; fi
|
|
- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile ${DESTDIR}${HFFILE}
|
|
+ ${INSTALL} -c -m 444 helpfile ${DESTDIR}${HFFILE}
|
|
|
|
install-st: statistics
|
|
if [ ! -d ${DESTDIR}${STDIR} ]; then mkdir -p ${DESTDIR}${STDIR}; else :; fi
|
|
- ${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${STPATH}
|
|
+ ${INSTALL} -c -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${STPATH}
|
|
|
|
install-submit-st: statistics ${DESTDIR}${MSPQ}
|
|
- ${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${MSPQ}/${MSPSTFILE}
|
|
+ ${INSTALL} -c -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${MSPQ}/${MSPSTFILE}
|
|
|
|
divert(0)
|
|
bldPRODUCT_END
|