diff options
Diffstat (limited to 'mail-mta/sendmail/files')
5 files changed, 0 insertions, 520 deletions
diff --git a/mail-mta/sendmail/files/libmilter-sharedlib.patch b/mail-mta/sendmail/files/libmilter-sharedlib.patch deleted file mode 100644 index 43ec78612190..000000000000 --- a/mail-mta/sendmail/files/libmilter-sharedlib.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4 ---- sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 1970-01-01 01:00:00.000000000 +0100 -+++ sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4 2009-08-22 21:51:10.000000000 +0200 -@@ -0,0 +1,39 @@ -+divert(-1) -+# -+# Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers. -+# All rights reserved. -+# -+# By using this file, you agree to the terms and conditions set -+# forth in the LICENSE file which can be found at the top level of -+# the sendmail distribution. -+# -+# -+# Definitions for Makefile construction for sendmail -+# -+divert(0)dnl -+include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl -+bldLIST_PUSH_ITEM(`bldC_PRODUCTS', bldCURRENT_PRODUCT)dnl -+bldPUSH_TARGET(bldCURRENT_PRODUCT`.so' bldCURRENT_PRODUCT`.a')dnl -+bldPUSH_INSTALL_TARGET(`install-'bldCURRENT_PRODUCT)dnl -+bldPUSH_CLEAN_TARGET(bldCURRENT_PRODUCT`-clean')dnl -+ -+include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4') -+divert(bldTARGETS_SECTION) -+bldCURRENT_PRODUCT.so: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'} -+ ${CCLINK} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.so -Wl,confSONAME,bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${bldCURRENT_PRODUCT`OBJS'} -lc ${LIBS} -+bldCURRENT_PRODUCT.a: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'} -+ ${AR} ${AROPTS} bldCURRENT_PRODUCT.a ${bldCURRENT_PRODUCT`OBJS'} -+ ${RANLIB} ${RANLIBOPTS} bldCURRENT_PRODUCT.a -+ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)') -+ -+install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a -+ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}"; else :; fi ') -+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${UBINMODE} bldCURRENT_PRODUCT.so "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so.${MILTER_SOVER}" -+ ${LN} ${LNOPTS} bldCURRENT_PRODUCT.so.${MILTER_SOVER} "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so" -+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"') -+ -+bldCURRENT_PRODUCT-clean: -+ rm -f ${OBJS} bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a ${MANPAGES} -+ -+divert(0) -+COPTS+= confCCOPTS_SO -diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4 ---- sendmail-8.14.3.orig/libmilter/Makefile.m4 2008-04-08 07:23:44.000000000 +0200 -+++ sendmail-8.14.3/libmilter/Makefile.m4 2009-08-22 21:53:35.000000000 +0200 -@@ -9,7 +9,7 @@ - SMSRCDIR=ifdef(`confSMSRCDIR', `confSMSRCDIR', `${SRCDIR}/sendmail') - PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} ') - --bldPRODUCT_START(`library', `libmilter') -+bldPRODUCT_START(`milterlibrary', `libmilter') - define(`bldINSTALLABLE', `true') - define(`LIBMILTER_EXTRAS', `errstring.c strl.c') - APPENDDEF(`confENVDEF', `-DNOT_SENDMAIL -Dsm_snprintf=snprintf') diff --git a/mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch b/mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch deleted file mode 100644 index 3348e921926c..000000000000 --- a/mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch +++ /dev/null @@ -1,211 +0,0 @@ -diff -Nru sendmail-8.14.3.orig/cf/cf/Makefile sendmail-8.14.3/cf/cf/Makefile ---- sendmail-8.14.3.orig/cf/cf/Makefile 2005-06-14 04:16:34.000000000 +0200 -+++ sendmail-8.14.3/cf/cf/Makefile 2009-09-20 10:55:50.000000000 +0200 -@@ -80,10 +80,10 @@ - install-cf: install-sendmail-cf install-submit-cf - - install-sendmail-cf: $(CF).cf -- $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf ${DESTDIR}$(MAILDIR)/sendmail.cf -+ $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf "${DESTDIR}$(MAILDIR)/sendmail.cf" - - install-submit-cf: $(SUBMIT).cf -- $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf ${DESTDIR}$(MAILDIR)/submit.cf -+ $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf "${DESTDIR}$(MAILDIR)/submit.cf" - - depend: - -diff -Nru sendmail-8.14.6.orig/devtools/M4/UNIX/defines.m4 sendmail-8.14.6/devtools/M4/UNIX/defines.m4 ---- sendmail-8.14.6.orig/devtools/M4/UNIX/defines.m4 2012-01-21 00:07:08.000000000 +0000 -+++ sendmail-8.14.6/devtools/M4/UNIX/defines.m4 2012-12-27 08:13:15.792214375 +0000 -@@ -26,7 +26,7 @@ - CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC') - # Linker for libraries - LD= ifdef(`confLD', `confLD', `confCC') --LDOPTS= ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `') -+LDOPTS= ifdef(`confLDOPTS', `confLDOPTS') - LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared') - - # Shell -@@ -71,7 +71,7 @@ - LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS') - - # libraries required on your system --LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') -+LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `') - - # location of sendmail binary (usually /usr/sbin or /usr/lib) - BINDIR= ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin') -diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 sendmail-8.14.3/devtools/M4/UNIX/executable.m4 ---- sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 2006-10-06 07:44:44.000000000 +0200 -+++ sendmail-8.14.3/devtools/M4/UNIX/executable.m4 2009-09-20 10:50:36.000000000 +0200 -@@ -30,12 +30,12 @@ - - ifdef(`bldNO_INSTALL', , - `install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT ifdef(`bldTARGET_INST_DEP', `bldTARGET_INST_DEP') -- ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'BINDIR}; else :; fi ') -- ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR} -+ ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"; else :; fi ') -+ ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" - ifdef(`bldTARGET_LINKS', `bldMAKE_TARGET_LINKS(${bldINSTALL_DIR`'BINDIR}/bldCURRENT_PRODUCT, ${bldCURRENT_PRODUCT`'TARGET_LINKS})')') - - strip-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT -- ${STRIP} ${STRIPOPTS} ${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT -+ ${STRIP} ${STRIPOPTS} "${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT" - - bldCURRENT_PRODUCT-clean: - rm -f ${OBJS} bldCURRENT_PRODUCT ${MANPAGES} -diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 sendmail-8.14.3/devtools/M4/UNIX/library.m4 ---- sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 2006-09-06 00:56:53.000000000 +0200 -+++ sendmail-8.14.3/devtools/M4/UNIX/library.m4 2009-09-20 10:50:36.000000000 +0200 -@@ -27,8 +27,8 @@ - ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)') - - install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a --ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ') -- ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}') -+ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${LIBDIR}"; else :; fi ') -+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"') - - bldCURRENT_PRODUCT-clean: - rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES} ---- sendmail-8.14.6.orig/devtools/M4/UNIX/manpage.m4 2012-01-21 00:07:08.000000000 +0000 -+++ sendmail-8.14.6/devtools/M4/UNIX/manpage.m4 2012-12-27 08:28:52.617502447 +0000 -@@ -68,11 +68,11 @@ - ifdef(`confNO_MAN_INSTALL', `divert(-1)', `dnl') - define(`bldMAN_INSTALL_CMD', - `ifdef(`confDONT_INSTALL_CATMAN', `dnl', --` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}; else :; fi ') -- ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'') -+` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}"; else :; fi ') -+ ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''") - ifdef(`confINSTALL_RAWMAN', --` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}; else :; fi ') -- ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'', `dnl')' -+` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'"; else :; fi ') -+ ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''", `dnl')' - )dnl - bldFOREACH(`bldMAN_INSTALL_CMD(', `bldMAN_PAGES') - ifdef(`confNO_MAN_INSTALL', `divert(0)', `dnl') -diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4 ---- sendmail-8.14.3.orig/libmilter/Makefile.m4 2008-04-08 07:23:44.000000000 +0200 -+++ sendmail-8.14.3/libmilter/Makefile.m4 2009-09-20 10:50:36.000000000 +0200 -@@ -32,9 +32,9 @@ - MFAPI= ${SRCDIR}/inc`'lude/libmilter/mfapi.h - MFDEF= ${SRCDIR}/inc`'lude/libmilter/mfdef.h - install-mfapi: ${MFAPI} -- if [ ! -d ${DESTDIR}${INCLUDEDIR}/libmilter ]; then mkdir -p ${DESTDIR}${INCLUDEDIR}/libmilter; else :; fi -- ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} ${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h -- ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} ${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h -+ if [ ! -d "${DESTDIR}${INCLUDEDIR}/libmilter" ]; then mkdir -p "${DESTDIR}${INCLUDEDIR}/libmilter"; else :; fi -+ ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} "${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h" -+ ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} "${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h" - divert(0) - - bldFINISH -diff -Nru sendmail-8.14.3.orig/mail.local/Makefile.m4 sendmail-8.14.3/mail.local/Makefile.m4 ---- sendmail-8.14.3.orig/mail.local/Makefile.m4 2006-06-28 23:08:02.000000000 +0200 -+++ sendmail-8.14.3/mail.local/Makefile.m4 2009-09-20 10:56:24.000000000 +0200 -@@ -30,7 +30,7 @@ - force-install: install-mail.local ifdef(`confNO_MAN_BUILD',, `install-docs') - - install-mail.local: mail.local -- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local ${DESTDIR}${EBINDIR} -+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local "${DESTDIR}${EBINDIR}" - divert - - bldFINISH -diff -Nru sendmail-8.14.3.orig/rmail/Makefile.m4 sendmail-8.14.3/rmail/Makefile.m4 ---- sendmail-8.14.3.orig/rmail/Makefile.m4 2006-06-28 23:08:04.000000000 +0200 -+++ sendmail-8.14.3/rmail/Makefile.m4 2009-09-20 10:55:29.000000000 +0200 -@@ -31,7 +31,7 @@ - force-install: install-rmail ifdef(`confNO_MAN_BUILD',, `install-docs') - - install-rmail: rmail -- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail ${DESTDIR}${UBINDIR} -+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail "${DESTDIR}${UBINDIR}" - divert - - bldFINISH -diff -Nru sendmail-8.14.3.orig/sendmail/Makefile.m4 sendmail-8.14.3/sendmail/Makefile.m4 ---- sendmail-8.14.3.orig/sendmail/Makefile.m4.orig 2008-03-27 17:13:33.000000000 +0100 -+++ sendmail-8.14.3/sendmail/Makefile.m4 2009-09-20 11:07:24.000000000 +0200 -@@ -14,9 +14,9 @@ - - dnl hack: /etc/mail is not defined as "location of .cf" in the build system - define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP', --`${DESTDIR}/etc/mail/submit.cf ${DESTDIR}${MSPQ}'))dnl -+`"${DESTDIR}/etc/mail/submit.cf" "${DESTDIR}${MSPQ}"'))dnl - define(`bldTARGET_LINKS', ifdef(`confLINKS', `confLINKS', --`${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat') -+`"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"') - )dnl - - # location of sendmail statistics file (usually /etc/mail/ or /var/log) -@@ -43,21 +43,21 @@ - statistics: - ${CP} /dev/null statistics - --${DESTDIR}/etc/mail/submit.cf: -+"${DESTDIR}/etc/mail/submit.cf": - @echo "Please read INSTALL if anything fails while installing the binary." - @echo "${DESTDIR}/etc/mail/submit.cf will be installed now." - cd ${SRCDIR}/cf/cf && make install-submit-cf - - MSPQ=ifdef(`confMSP_QUEUE_DIR', `confMSP_QUEUE_DIR', `/var/spool/clientmqueue') - --${DESTDIR}${MSPQ}: -+"${DESTDIR}${MSPQ}": - @echo "Please read INSTALL if anything fails while installing the binary." - @echo "You must have setup a new user ${MSPQOWN} and a new group ${GBINGRP}" - @echo "as explained in sendmail/SECURITY." -- mkdir -p ${DESTDIR}${MSPQ} -- chown ${MSPQOWN} ${DESTDIR}${MSPQ} -- chgrp ${GBINGRP} ${DESTDIR}${MSPQ} -- chmod 0770 ${DESTDIR}${MSPQ} -+ mkdir -p "${DESTDIR}${MSPQ}" -+ chown ${MSPQOWN} "${DESTDIR}${MSPQ}" -+ chgrp ${GBINGRP} "${DESTDIR}${MSPQ}" -+ chmod 0770 "${DESTDIR}${MSPQ}" - - divert(0) - -@@ -68,30 +68,30 @@ - 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 -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}" - for i in ${sendmailTARGET_LINKS}; do \ - rm -f $$i; \ - ${LN} ${LNOPTS} ${M`'BINDIR}/sendmail $$i; \ - done - --define(`confMTA_LINKS', `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat') -+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 -o ${M`'BINOWN} -g ${M`'BINGRP} -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; \ - done - - install-hf: -- if [ ! -d ${DESTDIR}${HFDIR} ]; then mkdir -p ${DESTDIR}${HFDIR}; else :; fi -- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile ${DESTDIR}${HFFILE} -+ if [ ! -d "${DESTDIR}${HFDIR}" ]; then mkdir -p "${DESTDIR}${HFDIR}"; else :; fi -+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -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} -+ 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-submit-st: statistics ${DESTDIR}${MSPQ} -- ${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${MSPQ}/${MSPSTFILE} -+install-submit-st: statistics "${DESTDIR}${MSPQ}" -+ ${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${MSPQ}/${MSPSTFILE}" - - divert(0) - bldPRODUCT_END diff --git a/mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch b/mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch deleted file mode 100644 index 03281d1990fe..000000000000 --- a/mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch +++ /dev/null @@ -1,52 +0,0 @@ -https://bugs.gentoo.org/700108 - ---- sendmail-8.15.2-r1/libmilter/sm_gethost.c.orig 2014-03-04 19:59:45.000000000 -0500 -+++ sendmail-8.15.2-r1/libmilter/sm_gethost.c 2019-11-15 09:32:25.812406080 -0500 -@@ -51,18 +51,21 @@ - { - bool resv6 = true; - struct hostent *h; -- -+#ifdef RES_USE_INET6 - if (family == AF_INET6) - { - /* From RFC2133, section 6.1 */ - resv6 = bitset(RES_USE_INET6, _res.options); - _res.options |= RES_USE_INET6; - } -+#endif - SM_SET_H_ERRNO(0); - h = gethostbyname(name); -+#ifdef RES_USE_INET6 - if (family == AF_INET6 && !resv6) - _res.options &= ~RES_USE_INET6; - -+#endif - /* the function is supposed to return only the requested family */ - if (h != NULL && h->h_addrtype != family) - { ---- sendmail-8.15.2-r2/sendmail/conf.c.orig 2019-11-14 17:36:41.262218822 -0500 -+++ sendmail-8.15.2-r2/sendmail/conf.c 2019-11-15 09:57:43.550284580 -0500 -@@ -4243,18 +4243,21 @@ - - # else /* HAS_GETHOSTBYNAME2 */ - bool resv6 = true; -- -+#ifdef RES_USE_INET6 - if (family == AF_INET6) - { - /* From RFC2133, section 6.1 */ - resv6 = bitset(RES_USE_INET6, _res.options); - _res.options |= RES_USE_INET6; - } -+#endif - SM_SET_H_ERRNO(0); - h = gethostbyname(name); -+#ifdef RES_USE_INET6 - if (!resv6) - _res.options &= ~RES_USE_INET6; - -+#endif - /* the function is supposed to return only the requested family */ - if (h != NULL && h->h_addrtype != family) - { diff --git a/mail-mta/sendmail/files/sendmail-8.15.2-openssl-1.1.0-fix.patch b/mail-mta/sendmail/files/sendmail-8.15.2-openssl-1.1.0-fix.patch deleted file mode 100644 index 54a67548941d..000000000000 --- a/mail-mta/sendmail/files/sendmail-8.15.2-openssl-1.1.0-fix.patch +++ /dev/null @@ -1,182 +0,0 @@ ---- sendmail-8.15.2.orig/sendmail/tls.c 2016-12-01 15:20:59.953546417 +0100 -+++ sendmail-8.15.2.orig/sendmail/tls.c 2016-12-01 17:26:43.868521378 +0100 -@@ -63,14 +63,28 @@ static unsigned char dh512_g[] = - static DH * - get_dh512() - { -- DH *dh = NULL; -+ DH *dh; -+ BIGNUM *p, *g; - - if ((dh = DH_new()) == NULL) - return NULL; -- dh->p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL); -- dh->g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL); -- if ((dh->p == NULL) || (dh->g == NULL)) -+ p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL); -+ g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL); -+ if (p == NULL || g == NULL) -+ { -+ BN_free(p); -+ BN_free(g); -+ DH_free(dh); - return NULL; -+ } -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10100005L -+ DH_set0_pqg(dh, p, NULL, g); -+#else -+ dh->p = p; -+ dh->g = g; -+#endif -+ - return dh; - } - -@@ -117,16 +131,27 @@ get_dh2048() - }; - static unsigned char dh2048_g[]={ 0x02, }; - DH *dh; -+ BIGNUM *p, *g; - - if ((dh=DH_new()) == NULL) - return(NULL); -- dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); -- dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); -- if ((dh->p == NULL) || (dh->g == NULL)) -+ p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL); -+ g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL); -+ if (p == NULL || g == NULL) - { -+ BN_free(p); -+ BN_free(g); - DH_free(dh); -- return(NULL); -+ return NULL; - } -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10100005L -+ DH_set0_pqg(dh, p, NULL, g); -+#else -+ dh->p = p; -+ dh->g = g; -+#endif -+ - return(dh); - } - # endif /* !NO_DH */ -@@ -715,6 +740,54 @@ static char server_session_id_context[] - # define SM_SSL_OP_TLS_BLOCK_PADDING_BUG 0 - #endif - -+static RSA * -+generate_rsa_key(bits, e) -+ int bits; -+ unsigned long e; -+{ -+#if OPENSSL_VERSION_NUMBER < 0x00908000L -+ return RSA_generate_key(bits, e, NULL, NULL); -+#else -+ BIGNUM *bne; -+ RSA *rsa = NULL; -+ -+ bne = BN_new(); -+ if (bne && BN_set_word(bne, e) != 1) -+ rsa = RSA_new(); -+ if (rsa && RSA_generate_key_ex(rsa, bits, bne, NULL) != 1) -+ { -+ RSA_free(rsa); -+ rsa = NULL; -+ } -+ BN_free(bne); -+ return rsa; -+#endif -+} -+ -+static DSA * -+generate_dsa_parameters(bits, seed, seed_len, counter_ret, h_ret) -+ int bits; -+ unsigned char *seed; -+ int seed_len; -+ int *counter_ret; -+ unsigned long *h_ret; -+{ -+#if OPENSSL_VERSION_NUMBER < 0x00908000L -+ return DSA_generate_parameters(bits, seed, seed_len, counter_ret, -+ h_ret, NULL, NULL); -+#else -+ DSA *dsa = DSA_new(); -+ -+ if (dsa && DSA_generate_parameters_ex(dsa, bits, seed, seed_len, -+ counter_ret, h_ret, NULL) != 1) -+ { -+ DSA_free(dsa); -+ dsa = NULL; -+ } -+ return dsa; -+#endif -+} -+ - bool - inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhparam) - SSL_CTX **ctx; -@@ -926,7 +999,7 @@ inittls(ctx, req, options, srv, certfile - { - /* get a pointer to the current certificate validation store */ - store = SSL_CTX_get_cert_store(*ctx); /* does not fail */ -- crl_file = BIO_new(BIO_s_file_internal()); -+ crl_file = BIO_new(BIO_s_file()); - if (crl_file != NULL) - { - if (BIO_read_filename(crl_file, CRLFile) >= 0) -@@ -1003,8 +1076,7 @@ inittls(ctx, req, options, srv, certfile - if (bitset(TLS_I_RSA_TMP, req) - # if SM_CONF_SHM - && ShmId != SM_SHM_NO_ID && -- (rsa_tmp = RSA_generate_key(RSA_KEYLENGTH, RSA_F4, NULL, -- NULL)) == NULL -+ (rsa_tmp = generate_rsa_key(RSA_KEYLENGTH, RSA_F4)) == NULL - # else /* SM_CONF_SHM */ - && 0 /* no shared memory: no need to generate key now */ - # endif /* SM_CONF_SHM */ -@@ -1210,8 +1282,8 @@ inittls(ctx, req, options, srv, certfile - sm_dprintf("inittls: Generating %d bit DH parameters\n", bits); - - /* this takes a while! */ -- dsa = DSA_generate_parameters(bits, NULL, 0, NULL, -- NULL, 0, NULL); -+ dsa = generate_dsa_parameters(bits, NULL, 0, NULL, -+ NULL); - dh = DSA_dup_DH(dsa); - DSA_free(dsa); - } -@@ -1747,7 +1819,7 @@ tmp_rsa_key(s, export, keylength) - - if (rsa_tmp != NULL) - RSA_free(rsa_tmp); -- rsa_tmp = RSA_generate_key(RSA_KEYLENGTH, RSA_F4, NULL, NULL); -+ rsa_tmp = generate_rsa_key(RSA_KEYLENGTH, RSA_F4); - if (rsa_tmp == NULL) - { - if (LogLevel > 0) -@@ -1974,11 +2046,20 @@ x509_verify_cb(ok, ctx) - { - if (LogLevel > 13) - tls_verify_log(ok, ctx, "x509"); -+#if OPENSSL_VERSION_NUMBER >= 0x10100005L -+ if (X509_STORE_CTX_get_error(ctx) == -+ X509_V_ERR_UNABLE_TO_GET_CRL) -+ { -+ X509_STORE_CTX_set_error(ctx, 0); -+ return 1; /* override it */ -+ } -+#else - if (ctx->error == X509_V_ERR_UNABLE_TO_GET_CRL) - { - ctx->error = 0; - return 1; /* override it */ - } -+#endif - } - return ok; - } diff --git a/mail-mta/sendmail/files/sendmail-starttls-multi-crl.patch b/mail-mta/sendmail/files/sendmail-starttls-multi-crl.patch deleted file mode 100644 index 8d93817d07da..000000000000 --- a/mail-mta/sendmail/files/sendmail-starttls-multi-crl.patch +++ /dev/null @@ -1,20 +0,0 @@ -Bug #354611 ---- sendmail/tls.c.orig 2010-05-26 21:54:30.000000000 -0600 -+++ sendmail/tls.c 2010-05-26 21:54:36.000000000 -0600 -@@ -723,11 +723,12 @@ - { - if (BIO_read_filename(crl_file, CRLFile) >= 0) - { -- crl = PEM_read_bio_X509_CRL(crl_file, NULL, -- NULL, NULL); -+ while((crl = PEM_read_bio_X509_CRL(crl_file, NULL, NULL, NULL))) -+ { -+ X509_STORE_add_crl(store, crl); -+ X509_CRL_free(crl); -+ } - BIO_free(crl_file); -- X509_STORE_add_crl(store, crl); -- X509_CRL_free(crl); - X509_STORE_set_flags(store, - X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL); - X509_STORE_set_verify_cb_func(store, |