1 |
commit: e2542b5fa54ad7471c5094910818f8c35cb284f9 |
2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 27 21:29:34 2021 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 27 21:34:36 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2542b5f |
7 |
|
8 |
mail-mta/sendmail: drop old version |
9 |
|
10 |
Bug: https://bugs.gentoo.org/730890 |
11 |
Closes: https://bugs.gentoo.org/699414 |
12 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
mail-mta/sendmail/Manifest | 1 - |
16 |
mail-mta/sendmail/files/libmilter-sharedlib.patch | 55 ------ |
17 |
.../files/sendmail-8.14.6-build-system.patch | 211 --------------------- |
18 |
.../files/sendmail-8.15.2-glibc-2.30.patch | 52 ----- |
19 |
.../files/sendmail-8.15.2-openssl-1.1.0-fix.patch | 182 ------------------ |
20 |
.../files/sendmail-starttls-multi-crl.patch | 20 -- |
21 |
mail-mta/sendmail/sendmail-8.15.2-r2.ebuild | 208 -------------------- |
22 |
7 files changed, 729 deletions(-) |
23 |
|
24 |
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest |
25 |
index 4ee9a044860..a244254cbfe 100644 |
26 |
--- a/mail-mta/sendmail/Manifest |
27 |
+++ b/mail-mta/sendmail/Manifest |
28 |
@@ -1,3 +1,2 @@ |
29 |
-DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9 |
30 |
DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2 |
31 |
DIST sendmail.8.17.1.tar.gz 2284027 BLAKE2B 4cbbc2bb536a48ea27994721e9dfefff7739ef1c825bbc0397202e600d8dad8f9a2572a777204693cf9630f767865d50566f0827be6b52be41c1e25532cb394c SHA512 ae42343fb06c09f2db5d919d602afc4241914387dfdae0f15e0967dda3be25bf1d3a4637b57266763679646a3cea6aa07e6453266fd9b7358c1a09ec2b627a15 |
32 |
|
33 |
diff --git a/mail-mta/sendmail/files/libmilter-sharedlib.patch b/mail-mta/sendmail/files/libmilter-sharedlib.patch |
34 |
deleted file mode 100644 |
35 |
index 43ec7861219..00000000000 |
36 |
--- a/mail-mta/sendmail/files/libmilter-sharedlib.patch |
37 |
+++ /dev/null |
38 |
@@ -1,55 +0,0 @@ |
39 |
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4 |
40 |
---- sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 1970-01-01 01:00:00.000000000 +0100 |
41 |
-+++ sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4 2009-08-22 21:51:10.000000000 +0200 |
42 |
-@@ -0,0 +1,39 @@ |
43 |
-+divert(-1) |
44 |
-+# |
45 |
-+# Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers. |
46 |
-+# All rights reserved. |
47 |
-+# |
48 |
-+# By using this file, you agree to the terms and conditions set |
49 |
-+# forth in the LICENSE file which can be found at the top level of |
50 |
-+# the sendmail distribution. |
51 |
-+# |
52 |
-+# |
53 |
-+# Definitions for Makefile construction for sendmail |
54 |
-+# |
55 |
-+divert(0)dnl |
56 |
-+include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl |
57 |
-+bldLIST_PUSH_ITEM(`bldC_PRODUCTS', bldCURRENT_PRODUCT)dnl |
58 |
-+bldPUSH_TARGET(bldCURRENT_PRODUCT`.so' bldCURRENT_PRODUCT`.a')dnl |
59 |
-+bldPUSH_INSTALL_TARGET(`install-'bldCURRENT_PRODUCT)dnl |
60 |
-+bldPUSH_CLEAN_TARGET(bldCURRENT_PRODUCT`-clean')dnl |
61 |
-+ |
62 |
-+include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4') |
63 |
-+divert(bldTARGETS_SECTION) |
64 |
-+bldCURRENT_PRODUCT.so: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'} |
65 |
-+ ${CCLINK} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.so -Wl,confSONAME,bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${bldCURRENT_PRODUCT`OBJS'} -lc ${LIBS} |
66 |
-+bldCURRENT_PRODUCT.a: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'} |
67 |
-+ ${AR} ${AROPTS} bldCURRENT_PRODUCT.a ${bldCURRENT_PRODUCT`OBJS'} |
68 |
-+ ${RANLIB} ${RANLIBOPTS} bldCURRENT_PRODUCT.a |
69 |
-+ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)') |
70 |
-+ |
71 |
-+install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a |
72 |
-+ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}"; else :; fi ') |
73 |
-+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${UBINMODE} bldCURRENT_PRODUCT.so "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so.${MILTER_SOVER}" |
74 |
-+ ${LN} ${LNOPTS} bldCURRENT_PRODUCT.so.${MILTER_SOVER} "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so" |
75 |
-+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"') |
76 |
-+ |
77 |
-+bldCURRENT_PRODUCT-clean: |
78 |
-+ rm -f ${OBJS} bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a ${MANPAGES} |
79 |
-+ |
80 |
-+divert(0) |
81 |
-+COPTS+= confCCOPTS_SO |
82 |
-diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4 |
83 |
---- sendmail-8.14.3.orig/libmilter/Makefile.m4 2008-04-08 07:23:44.000000000 +0200 |
84 |
-+++ sendmail-8.14.3/libmilter/Makefile.m4 2009-08-22 21:53:35.000000000 +0200 |
85 |
-@@ -9,7 +9,7 @@ |
86 |
- SMSRCDIR=ifdef(`confSMSRCDIR', `confSMSRCDIR', `${SRCDIR}/sendmail') |
87 |
- PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} ') |
88 |
- |
89 |
--bldPRODUCT_START(`library', `libmilter') |
90 |
-+bldPRODUCT_START(`milterlibrary', `libmilter') |
91 |
- define(`bldINSTALLABLE', `true') |
92 |
- define(`LIBMILTER_EXTRAS', `errstring.c strl.c') |
93 |
- APPENDDEF(`confENVDEF', `-DNOT_SENDMAIL -Dsm_snprintf=snprintf') |
94 |
|
95 |
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 |
96 |
deleted file mode 100644 |
97 |
index 3348e921926..00000000000 |
98 |
--- a/mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch |
99 |
+++ /dev/null |
100 |
@@ -1,211 +0,0 @@ |
101 |
-diff -Nru sendmail-8.14.3.orig/cf/cf/Makefile sendmail-8.14.3/cf/cf/Makefile |
102 |
---- sendmail-8.14.3.orig/cf/cf/Makefile 2005-06-14 04:16:34.000000000 +0200 |
103 |
-+++ sendmail-8.14.3/cf/cf/Makefile 2009-09-20 10:55:50.000000000 +0200 |
104 |
-@@ -80,10 +80,10 @@ |
105 |
- install-cf: install-sendmail-cf install-submit-cf |
106 |
- |
107 |
- install-sendmail-cf: $(CF).cf |
108 |
-- $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf ${DESTDIR}$(MAILDIR)/sendmail.cf |
109 |
-+ $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf "${DESTDIR}$(MAILDIR)/sendmail.cf" |
110 |
- |
111 |
- install-submit-cf: $(SUBMIT).cf |
112 |
-- $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf ${DESTDIR}$(MAILDIR)/submit.cf |
113 |
-+ $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf "${DESTDIR}$(MAILDIR)/submit.cf" |
114 |
- |
115 |
- depend: |
116 |
- |
117 |
-diff -Nru sendmail-8.14.6.orig/devtools/M4/UNIX/defines.m4 sendmail-8.14.6/devtools/M4/UNIX/defines.m4 |
118 |
---- sendmail-8.14.6.orig/devtools/M4/UNIX/defines.m4 2012-01-21 00:07:08.000000000 +0000 |
119 |
-+++ sendmail-8.14.6/devtools/M4/UNIX/defines.m4 2012-12-27 08:13:15.792214375 +0000 |
120 |
-@@ -26,7 +26,7 @@ |
121 |
- CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC') |
122 |
- # Linker for libraries |
123 |
- LD= ifdef(`confLD', `confLD', `confCC') |
124 |
--LDOPTS= ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `') |
125 |
-+LDOPTS= ifdef(`confLDOPTS', `confLDOPTS') |
126 |
- LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared') |
127 |
- |
128 |
- # Shell |
129 |
-@@ -71,7 +71,7 @@ |
130 |
- LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS') |
131 |
- |
132 |
- # libraries required on your system |
133 |
--LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') |
134 |
-+LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `') |
135 |
- |
136 |
- # location of sendmail binary (usually /usr/sbin or /usr/lib) |
137 |
- BINDIR= ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin') |
138 |
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 sendmail-8.14.3/devtools/M4/UNIX/executable.m4 |
139 |
---- sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 2006-10-06 07:44:44.000000000 +0200 |
140 |
-+++ sendmail-8.14.3/devtools/M4/UNIX/executable.m4 2009-09-20 10:50:36.000000000 +0200 |
141 |
-@@ -30,12 +30,12 @@ |
142 |
- |
143 |
- ifdef(`bldNO_INSTALL', , |
144 |
- `install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT ifdef(`bldTARGET_INST_DEP', `bldTARGET_INST_DEP') |
145 |
-- ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'BINDIR}; else :; fi ') |
146 |
-- ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR} |
147 |
-+ ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"; else :; fi ') |
148 |
-+ ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" |
149 |
- ifdef(`bldTARGET_LINKS', `bldMAKE_TARGET_LINKS(${bldINSTALL_DIR`'BINDIR}/bldCURRENT_PRODUCT, ${bldCURRENT_PRODUCT`'TARGET_LINKS})')') |
150 |
- |
151 |
- strip-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT |
152 |
-- ${STRIP} ${STRIPOPTS} ${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT |
153 |
-+ ${STRIP} ${STRIPOPTS} "${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT" |
154 |
- |
155 |
- bldCURRENT_PRODUCT-clean: |
156 |
- rm -f ${OBJS} bldCURRENT_PRODUCT ${MANPAGES} |
157 |
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 sendmail-8.14.3/devtools/M4/UNIX/library.m4 |
158 |
---- sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 2006-09-06 00:56:53.000000000 +0200 |
159 |
-+++ sendmail-8.14.3/devtools/M4/UNIX/library.m4 2009-09-20 10:50:36.000000000 +0200 |
160 |
-@@ -27,8 +27,8 @@ |
161 |
- ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)') |
162 |
- |
163 |
- install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a |
164 |
--ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ') |
165 |
-- ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}') |
166 |
-+ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${LIBDIR}"; else :; fi ') |
167 |
-+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"') |
168 |
- |
169 |
- bldCURRENT_PRODUCT-clean: |
170 |
- rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES} |
171 |
---- sendmail-8.14.6.orig/devtools/M4/UNIX/manpage.m4 2012-01-21 00:07:08.000000000 +0000 |
172 |
-+++ sendmail-8.14.6/devtools/M4/UNIX/manpage.m4 2012-12-27 08:28:52.617502447 +0000 |
173 |
-@@ -68,11 +68,11 @@ |
174 |
- ifdef(`confNO_MAN_INSTALL', `divert(-1)', `dnl') |
175 |
- define(`bldMAN_INSTALL_CMD', |
176 |
- `ifdef(`confDONT_INSTALL_CATMAN', `dnl', |
177 |
--` 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 ') |
178 |
-- ${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}'') |
179 |
-+` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}"; else :; fi ') |
180 |
-+ ${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}''") |
181 |
- ifdef(`confINSTALL_RAWMAN', |
182 |
--` 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 ') |
183 |
-- ${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')' |
184 |
-+` 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 ') |
185 |
-+ ${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')' |
186 |
- )dnl |
187 |
- bldFOREACH(`bldMAN_INSTALL_CMD(', `bldMAN_PAGES') |
188 |
- ifdef(`confNO_MAN_INSTALL', `divert(0)', `dnl') |
189 |
-diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4 |
190 |
---- sendmail-8.14.3.orig/libmilter/Makefile.m4 2008-04-08 07:23:44.000000000 +0200 |
191 |
-+++ sendmail-8.14.3/libmilter/Makefile.m4 2009-09-20 10:50:36.000000000 +0200 |
192 |
-@@ -32,9 +32,9 @@ |
193 |
- MFAPI= ${SRCDIR}/inc`'lude/libmilter/mfapi.h |
194 |
- MFDEF= ${SRCDIR}/inc`'lude/libmilter/mfdef.h |
195 |
- install-mfapi: ${MFAPI} |
196 |
-- if [ ! -d ${DESTDIR}${INCLUDEDIR}/libmilter ]; then mkdir -p ${DESTDIR}${INCLUDEDIR}/libmilter; else :; fi |
197 |
-- ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} ${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h |
198 |
-- ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} ${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h |
199 |
-+ if [ ! -d "${DESTDIR}${INCLUDEDIR}/libmilter" ]; then mkdir -p "${DESTDIR}${INCLUDEDIR}/libmilter"; else :; fi |
200 |
-+ ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} "${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h" |
201 |
-+ ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} "${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h" |
202 |
- divert(0) |
203 |
- |
204 |
- bldFINISH |
205 |
-diff -Nru sendmail-8.14.3.orig/mail.local/Makefile.m4 sendmail-8.14.3/mail.local/Makefile.m4 |
206 |
---- sendmail-8.14.3.orig/mail.local/Makefile.m4 2006-06-28 23:08:02.000000000 +0200 |
207 |
-+++ sendmail-8.14.3/mail.local/Makefile.m4 2009-09-20 10:56:24.000000000 +0200 |
208 |
-@@ -30,7 +30,7 @@ |
209 |
- force-install: install-mail.local ifdef(`confNO_MAN_BUILD',, `install-docs') |
210 |
- |
211 |
- install-mail.local: mail.local |
212 |
-- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local ${DESTDIR}${EBINDIR} |
213 |
-+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local "${DESTDIR}${EBINDIR}" |
214 |
- divert |
215 |
- |
216 |
- bldFINISH |
217 |
-diff -Nru sendmail-8.14.3.orig/rmail/Makefile.m4 sendmail-8.14.3/rmail/Makefile.m4 |
218 |
---- sendmail-8.14.3.orig/rmail/Makefile.m4 2006-06-28 23:08:04.000000000 +0200 |
219 |
-+++ sendmail-8.14.3/rmail/Makefile.m4 2009-09-20 10:55:29.000000000 +0200 |
220 |
-@@ -31,7 +31,7 @@ |
221 |
- force-install: install-rmail ifdef(`confNO_MAN_BUILD',, `install-docs') |
222 |
- |
223 |
- install-rmail: rmail |
224 |
-- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail ${DESTDIR}${UBINDIR} |
225 |
-+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail "${DESTDIR}${UBINDIR}" |
226 |
- divert |
227 |
- |
228 |
- bldFINISH |
229 |
-diff -Nru sendmail-8.14.3.orig/sendmail/Makefile.m4 sendmail-8.14.3/sendmail/Makefile.m4 |
230 |
---- sendmail-8.14.3.orig/sendmail/Makefile.m4.orig 2008-03-27 17:13:33.000000000 +0100 |
231 |
-+++ sendmail-8.14.3/sendmail/Makefile.m4 2009-09-20 11:07:24.000000000 +0200 |
232 |
-@@ -14,9 +14,9 @@ |
233 |
- |
234 |
- dnl hack: /etc/mail is not defined as "location of .cf" in the build system |
235 |
- define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP', |
236 |
--`${DESTDIR}/etc/mail/submit.cf ${DESTDIR}${MSPQ}'))dnl |
237 |
-+`"${DESTDIR}/etc/mail/submit.cf" "${DESTDIR}${MSPQ}"'))dnl |
238 |
- define(`bldTARGET_LINKS', ifdef(`confLINKS', `confLINKS', |
239 |
--`${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat') |
240 |
-+`"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"') |
241 |
- )dnl |
242 |
- |
243 |
- # location of sendmail statistics file (usually /etc/mail/ or /var/log) |
244 |
-@@ -43,21 +43,21 @@ |
245 |
- statistics: |
246 |
- ${CP} /dev/null statistics |
247 |
- |
248 |
--${DESTDIR}/etc/mail/submit.cf: |
249 |
-+"${DESTDIR}/etc/mail/submit.cf": |
250 |
- @echo "Please read INSTALL if anything fails while installing the binary." |
251 |
- @echo "${DESTDIR}/etc/mail/submit.cf will be installed now." |
252 |
- cd ${SRCDIR}/cf/cf && make install-submit-cf |
253 |
- |
254 |
- MSPQ=ifdef(`confMSP_QUEUE_DIR', `confMSP_QUEUE_DIR', `/var/spool/clientmqueue') |
255 |
- |
256 |
--${DESTDIR}${MSPQ}: |
257 |
-+"${DESTDIR}${MSPQ}": |
258 |
- @echo "Please read INSTALL if anything fails while installing the binary." |
259 |
- @echo "You must have setup a new user ${MSPQOWN} and a new group ${GBINGRP}" |
260 |
- @echo "as explained in sendmail/SECURITY." |
261 |
-- mkdir -p ${DESTDIR}${MSPQ} |
262 |
-- chown ${MSPQOWN} ${DESTDIR}${MSPQ} |
263 |
-- chgrp ${GBINGRP} ${DESTDIR}${MSPQ} |
264 |
-- chmod 0770 ${DESTDIR}${MSPQ} |
265 |
-+ mkdir -p "${DESTDIR}${MSPQ}" |
266 |
-+ chown ${MSPQOWN} "${DESTDIR}${MSPQ}" |
267 |
-+ chgrp ${GBINGRP} "${DESTDIR}${MSPQ}" |
268 |
-+ chmod 0770 "${DESTDIR}${MSPQ}" |
269 |
- |
270 |
- divert(0) |
271 |
- |
272 |
-@@ -68,30 +68,30 @@ |
273 |
- divert(bldTARGETS_SECTION) |
274 |
- |
275 |
- install-set-user-id: bldCURRENT_PRODUCT ifdef(`confNO_HELPFILE_INSTALL',, `install-hf') ifdef(`confNO_STATISTICS_INSTALL',, `install-st') ifdef(`confNO_MAN_BUILD',, `install-docs') |
276 |
-- ${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR} |
277 |
-+ ${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}" |
278 |
- for i in ${sendmailTARGET_LINKS}; do \ |
279 |
- rm -f $$i; \ |
280 |
- ${LN} ${LNOPTS} ${M`'BINDIR}/sendmail $$i; \ |
281 |
- done |
282 |
- |
283 |
--define(`confMTA_LINKS', `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat') |
284 |
-+define(`confMTA_LINKS', `"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"') |
285 |
- install-sm-mta: bldCURRENT_PRODUCT |
286 |
-- ${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}/sm-mta |
287 |
-+ ${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}/sm-mta" |
288 |
- for i in confMTA_LINKS; do \ |
289 |
- rm -f $$i; \ |
290 |
- ${LN} ${LNOPTS} ${M`'BINDIR}/sm-mta $$i; \ |
291 |
- done |
292 |
- |
293 |
- install-hf: |
294 |
-- if [ ! -d ${DESTDIR}${HFDIR} ]; then mkdir -p ${DESTDIR}${HFDIR}; else :; fi |
295 |
-- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile ${DESTDIR}${HFFILE} |
296 |
-+ if [ ! -d "${DESTDIR}${HFDIR}" ]; then mkdir -p "${DESTDIR}${HFDIR}"; else :; fi |
297 |
-+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile "${DESTDIR}${HFFILE}" |
298 |
- |
299 |
- install-st: statistics |
300 |
-- if [ ! -d ${DESTDIR}${STDIR} ]; then mkdir -p ${DESTDIR}${STDIR}; else :; fi |
301 |
-- ${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${STPATH} |
302 |
-+ if [ ! -d "${DESTDIR}${STDIR}" ]; then mkdir -p "${DESTDIR}${STDIR}"; else :; fi |
303 |
-+ ${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${STPATH}" |
304 |
- |
305 |
--install-submit-st: statistics ${DESTDIR}${MSPQ} |
306 |
-- ${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${MSPQ}/${MSPSTFILE} |
307 |
-+install-submit-st: statistics "${DESTDIR}${MSPQ}" |
308 |
-+ ${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${MSPQ}/${MSPSTFILE}" |
309 |
- |
310 |
- divert(0) |
311 |
- bldPRODUCT_END |
312 |
|
313 |
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 |
314 |
deleted file mode 100644 |
315 |
index 03281d1990f..00000000000 |
316 |
--- a/mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch |
317 |
+++ /dev/null |
318 |
@@ -1,52 +0,0 @@ |
319 |
-https://bugs.gentoo.org/700108 |
320 |
- |
321 |
---- sendmail-8.15.2-r1/libmilter/sm_gethost.c.orig 2014-03-04 19:59:45.000000000 -0500 |
322 |
-+++ sendmail-8.15.2-r1/libmilter/sm_gethost.c 2019-11-15 09:32:25.812406080 -0500 |
323 |
-@@ -51,18 +51,21 @@ |
324 |
- { |
325 |
- bool resv6 = true; |
326 |
- struct hostent *h; |
327 |
-- |
328 |
-+#ifdef RES_USE_INET6 |
329 |
- if (family == AF_INET6) |
330 |
- { |
331 |
- /* From RFC2133, section 6.1 */ |
332 |
- resv6 = bitset(RES_USE_INET6, _res.options); |
333 |
- _res.options |= RES_USE_INET6; |
334 |
- } |
335 |
-+#endif |
336 |
- SM_SET_H_ERRNO(0); |
337 |
- h = gethostbyname(name); |
338 |
-+#ifdef RES_USE_INET6 |
339 |
- if (family == AF_INET6 && !resv6) |
340 |
- _res.options &= ~RES_USE_INET6; |
341 |
- |
342 |
-+#endif |
343 |
- /* the function is supposed to return only the requested family */ |
344 |
- if (h != NULL && h->h_addrtype != family) |
345 |
- { |
346 |
---- sendmail-8.15.2-r2/sendmail/conf.c.orig 2019-11-14 17:36:41.262218822 -0500 |
347 |
-+++ sendmail-8.15.2-r2/sendmail/conf.c 2019-11-15 09:57:43.550284580 -0500 |
348 |
-@@ -4243,18 +4243,21 @@ |
349 |
- |
350 |
- # else /* HAS_GETHOSTBYNAME2 */ |
351 |
- bool resv6 = true; |
352 |
-- |
353 |
-+#ifdef RES_USE_INET6 |
354 |
- if (family == AF_INET6) |
355 |
- { |
356 |
- /* From RFC2133, section 6.1 */ |
357 |
- resv6 = bitset(RES_USE_INET6, _res.options); |
358 |
- _res.options |= RES_USE_INET6; |
359 |
- } |
360 |
-+#endif |
361 |
- SM_SET_H_ERRNO(0); |
362 |
- h = gethostbyname(name); |
363 |
-+#ifdef RES_USE_INET6 |
364 |
- if (!resv6) |
365 |
- _res.options &= ~RES_USE_INET6; |
366 |
- |
367 |
-+#endif |
368 |
- /* the function is supposed to return only the requested family */ |
369 |
- if (h != NULL && h->h_addrtype != family) |
370 |
- { |
371 |
|
372 |
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 |
373 |
deleted file mode 100644 |
374 |
index 54a67548941..00000000000 |
375 |
--- a/mail-mta/sendmail/files/sendmail-8.15.2-openssl-1.1.0-fix.patch |
376 |
+++ /dev/null |
377 |
@@ -1,182 +0,0 @@ |
378 |
---- sendmail-8.15.2.orig/sendmail/tls.c 2016-12-01 15:20:59.953546417 +0100 |
379 |
-+++ sendmail-8.15.2.orig/sendmail/tls.c 2016-12-01 17:26:43.868521378 +0100 |
380 |
-@@ -63,14 +63,28 @@ static unsigned char dh512_g[] = |
381 |
- static DH * |
382 |
- get_dh512() |
383 |
- { |
384 |
-- DH *dh = NULL; |
385 |
-+ DH *dh; |
386 |
-+ BIGNUM *p, *g; |
387 |
- |
388 |
- if ((dh = DH_new()) == NULL) |
389 |
- return NULL; |
390 |
-- dh->p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL); |
391 |
-- dh->g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL); |
392 |
-- if ((dh->p == NULL) || (dh->g == NULL)) |
393 |
-+ p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL); |
394 |
-+ g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL); |
395 |
-+ if (p == NULL || g == NULL) |
396 |
-+ { |
397 |
-+ BN_free(p); |
398 |
-+ BN_free(g); |
399 |
-+ DH_free(dh); |
400 |
- return NULL; |
401 |
-+ } |
402 |
-+ |
403 |
-+#if OPENSSL_VERSION_NUMBER >= 0x10100005L |
404 |
-+ DH_set0_pqg(dh, p, NULL, g); |
405 |
-+#else |
406 |
-+ dh->p = p; |
407 |
-+ dh->g = g; |
408 |
-+#endif |
409 |
-+ |
410 |
- return dh; |
411 |
- } |
412 |
- |
413 |
-@@ -117,16 +131,27 @@ get_dh2048() |
414 |
- }; |
415 |
- static unsigned char dh2048_g[]={ 0x02, }; |
416 |
- DH *dh; |
417 |
-+ BIGNUM *p, *g; |
418 |
- |
419 |
- if ((dh=DH_new()) == NULL) |
420 |
- return(NULL); |
421 |
-- dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); |
422 |
-- dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); |
423 |
-- if ((dh->p == NULL) || (dh->g == NULL)) |
424 |
-+ p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL); |
425 |
-+ g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL); |
426 |
-+ if (p == NULL || g == NULL) |
427 |
- { |
428 |
-+ BN_free(p); |
429 |
-+ BN_free(g); |
430 |
- DH_free(dh); |
431 |
-- return(NULL); |
432 |
-+ return NULL; |
433 |
- } |
434 |
-+ |
435 |
-+#if OPENSSL_VERSION_NUMBER >= 0x10100005L |
436 |
-+ DH_set0_pqg(dh, p, NULL, g); |
437 |
-+#else |
438 |
-+ dh->p = p; |
439 |
-+ dh->g = g; |
440 |
-+#endif |
441 |
-+ |
442 |
- return(dh); |
443 |
- } |
444 |
- # endif /* !NO_DH */ |
445 |
-@@ -715,6 +740,54 @@ static char server_session_id_context[] |
446 |
- # define SM_SSL_OP_TLS_BLOCK_PADDING_BUG 0 |
447 |
- #endif |
448 |
- |
449 |
-+static RSA * |
450 |
-+generate_rsa_key(bits, e) |
451 |
-+ int bits; |
452 |
-+ unsigned long e; |
453 |
-+{ |
454 |
-+#if OPENSSL_VERSION_NUMBER < 0x00908000L |
455 |
-+ return RSA_generate_key(bits, e, NULL, NULL); |
456 |
-+#else |
457 |
-+ BIGNUM *bne; |
458 |
-+ RSA *rsa = NULL; |
459 |
-+ |
460 |
-+ bne = BN_new(); |
461 |
-+ if (bne && BN_set_word(bne, e) != 1) |
462 |
-+ rsa = RSA_new(); |
463 |
-+ if (rsa && RSA_generate_key_ex(rsa, bits, bne, NULL) != 1) |
464 |
-+ { |
465 |
-+ RSA_free(rsa); |
466 |
-+ rsa = NULL; |
467 |
-+ } |
468 |
-+ BN_free(bne); |
469 |
-+ return rsa; |
470 |
-+#endif |
471 |
-+} |
472 |
-+ |
473 |
-+static DSA * |
474 |
-+generate_dsa_parameters(bits, seed, seed_len, counter_ret, h_ret) |
475 |
-+ int bits; |
476 |
-+ unsigned char *seed; |
477 |
-+ int seed_len; |
478 |
-+ int *counter_ret; |
479 |
-+ unsigned long *h_ret; |
480 |
-+{ |
481 |
-+#if OPENSSL_VERSION_NUMBER < 0x00908000L |
482 |
-+ return DSA_generate_parameters(bits, seed, seed_len, counter_ret, |
483 |
-+ h_ret, NULL, NULL); |
484 |
-+#else |
485 |
-+ DSA *dsa = DSA_new(); |
486 |
-+ |
487 |
-+ if (dsa && DSA_generate_parameters_ex(dsa, bits, seed, seed_len, |
488 |
-+ counter_ret, h_ret, NULL) != 1) |
489 |
-+ { |
490 |
-+ DSA_free(dsa); |
491 |
-+ dsa = NULL; |
492 |
-+ } |
493 |
-+ return dsa; |
494 |
-+#endif |
495 |
-+} |
496 |
-+ |
497 |
- bool |
498 |
- inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhparam) |
499 |
- SSL_CTX **ctx; |
500 |
-@@ -926,7 +999,7 @@ inittls(ctx, req, options, srv, certfile |
501 |
- { |
502 |
- /* get a pointer to the current certificate validation store */ |
503 |
- store = SSL_CTX_get_cert_store(*ctx); /* does not fail */ |
504 |
-- crl_file = BIO_new(BIO_s_file_internal()); |
505 |
-+ crl_file = BIO_new(BIO_s_file()); |
506 |
- if (crl_file != NULL) |
507 |
- { |
508 |
- if (BIO_read_filename(crl_file, CRLFile) >= 0) |
509 |
-@@ -1003,8 +1076,7 @@ inittls(ctx, req, options, srv, certfile |
510 |
- if (bitset(TLS_I_RSA_TMP, req) |
511 |
- # if SM_CONF_SHM |
512 |
- && ShmId != SM_SHM_NO_ID && |
513 |
-- (rsa_tmp = RSA_generate_key(RSA_KEYLENGTH, RSA_F4, NULL, |
514 |
-- NULL)) == NULL |
515 |
-+ (rsa_tmp = generate_rsa_key(RSA_KEYLENGTH, RSA_F4)) == NULL |
516 |
- # else /* SM_CONF_SHM */ |
517 |
- && 0 /* no shared memory: no need to generate key now */ |
518 |
- # endif /* SM_CONF_SHM */ |
519 |
-@@ -1210,8 +1282,8 @@ inittls(ctx, req, options, srv, certfile |
520 |
- sm_dprintf("inittls: Generating %d bit DH parameters\n", bits); |
521 |
- |
522 |
- /* this takes a while! */ |
523 |
-- dsa = DSA_generate_parameters(bits, NULL, 0, NULL, |
524 |
-- NULL, 0, NULL); |
525 |
-+ dsa = generate_dsa_parameters(bits, NULL, 0, NULL, |
526 |
-+ NULL); |
527 |
- dh = DSA_dup_DH(dsa); |
528 |
- DSA_free(dsa); |
529 |
- } |
530 |
-@@ -1747,7 +1819,7 @@ tmp_rsa_key(s, export, keylength) |
531 |
- |
532 |
- if (rsa_tmp != NULL) |
533 |
- RSA_free(rsa_tmp); |
534 |
-- rsa_tmp = RSA_generate_key(RSA_KEYLENGTH, RSA_F4, NULL, NULL); |
535 |
-+ rsa_tmp = generate_rsa_key(RSA_KEYLENGTH, RSA_F4); |
536 |
- if (rsa_tmp == NULL) |
537 |
- { |
538 |
- if (LogLevel > 0) |
539 |
-@@ -1974,11 +2046,20 @@ x509_verify_cb(ok, ctx) |
540 |
- { |
541 |
- if (LogLevel > 13) |
542 |
- tls_verify_log(ok, ctx, "x509"); |
543 |
-+#if OPENSSL_VERSION_NUMBER >= 0x10100005L |
544 |
-+ if (X509_STORE_CTX_get_error(ctx) == |
545 |
-+ X509_V_ERR_UNABLE_TO_GET_CRL) |
546 |
-+ { |
547 |
-+ X509_STORE_CTX_set_error(ctx, 0); |
548 |
-+ return 1; /* override it */ |
549 |
-+ } |
550 |
-+#else |
551 |
- if (ctx->error == X509_V_ERR_UNABLE_TO_GET_CRL) |
552 |
- { |
553 |
- ctx->error = 0; |
554 |
- return 1; /* override it */ |
555 |
- } |
556 |
-+#endif |
557 |
- } |
558 |
- return ok; |
559 |
- } |
560 |
|
561 |
diff --git a/mail-mta/sendmail/files/sendmail-starttls-multi-crl.patch b/mail-mta/sendmail/files/sendmail-starttls-multi-crl.patch |
562 |
deleted file mode 100644 |
563 |
index 8d93817d07d..00000000000 |
564 |
--- a/mail-mta/sendmail/files/sendmail-starttls-multi-crl.patch |
565 |
+++ /dev/null |
566 |
@@ -1,20 +0,0 @@ |
567 |
-Bug #354611 |
568 |
---- sendmail/tls.c.orig 2010-05-26 21:54:30.000000000 -0600 |
569 |
-+++ sendmail/tls.c 2010-05-26 21:54:36.000000000 -0600 |
570 |
-@@ -723,11 +723,12 @@ |
571 |
- { |
572 |
- if (BIO_read_filename(crl_file, CRLFile) >= 0) |
573 |
- { |
574 |
-- crl = PEM_read_bio_X509_CRL(crl_file, NULL, |
575 |
-- NULL, NULL); |
576 |
-+ while((crl = PEM_read_bio_X509_CRL(crl_file, NULL, NULL, NULL))) |
577 |
-+ { |
578 |
-+ X509_STORE_add_crl(store, crl); |
579 |
-+ X509_CRL_free(crl); |
580 |
-+ } |
581 |
- BIO_free(crl_file); |
582 |
-- X509_STORE_add_crl(store, crl); |
583 |
-- X509_CRL_free(crl); |
584 |
- X509_STORE_set_flags(store, |
585 |
- X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL); |
586 |
- X509_STORE_set_verify_cb_func(store, |
587 |
|
588 |
diff --git a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild b/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild |
589 |
deleted file mode 100644 |
590 |
index 6115996d21a..00000000000 |
591 |
--- a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild |
592 |
+++ /dev/null |
593 |
@@ -1,208 +0,0 @@ |
594 |
-# Copyright 1999-2021 Gentoo Authors |
595 |
-# Distributed under the terms of the GNU General Public License v2 |
596 |
- |
597 |
-EAPI=6 |
598 |
-inherit multilib systemd toolchain-funcs user |
599 |
- |
600 |
-DESCRIPTION="Widely-used Mail Transport Agent (MTA)" |
601 |
-HOMEPAGE="http://www.sendmail.org/" |
602 |
-SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz" |
603 |
- |
604 |
-LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript |
605 |
-SLOT="0" |
606 |
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" |
607 |
-IUSE="ssl ldap sasl tcpd mbox ipv6 nis sockets" |
608 |
- |
609 |
-DEPEND="net-mail/mailbase |
610 |
- sys-devel/m4 |
611 |
- sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) |
612 |
- tcpd? ( sys-apps/tcp-wrappers ) |
613 |
- ssl? ( |
614 |
- dev-libs/openssl:0= |
615 |
- ) |
616 |
- ldap? ( net-nds/openldap ) |
617 |
- >=sys-libs/db-3.2 |
618 |
- !net-mail/vacation |
619 |
- " |
620 |
-RDEPEND="${DEPEND} |
621 |
- >=net-mail/mailbase-0.00 |
622 |
- !mail-mta/courier |
623 |
- !mail-mta/esmtp |
624 |
- !mail-mta/exim |
625 |
- !mail-mta/mini-qmail |
626 |
- !mail-mta/msmtp[mta] |
627 |
- !mail-mta/netqmail |
628 |
- !mail-mta/nullmailer |
629 |
- !mail-mta/postfix |
630 |
- !mail-mta/opensmtpd |
631 |
- !mail-mta/qmail-ldap |
632 |
- !<mail-mta/ssmtp-2.64-r2 |
633 |
- !>=mail-mta/ssmtp-2.64-r2[mta]" |
634 |
- |
635 |
-PDEPEND="!mbox? ( mail-filter/procmail )" |
636 |
- |
637 |
-# libmilter library is part of sendmail, but it does not share the version number with it. |
638 |
-# In order to find the right libmilter version number, check SMFI_VERSION definition |
639 |
-# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines). |
640 |
-# For example, version 1.0.1 has a SMFI_VERSION of 0x01000001. |
641 |
-LIBMILTER_VER=1.0.2 |
642 |
- |
643 |
-pkg_setup() { |
644 |
- enewgroup smmsp 209 |
645 |
- enewuser smmsp 209 -1 /var/spool/mqueue smmsp |
646 |
-} |
647 |
- |
648 |
-src_prepare() { |
649 |
- eapply "${FILESDIR}"/"${PN}"-8.14.6-build-system.patch |
650 |
- eapply -p0 "${FILESDIR}"/sendmail-delivered_hdr.patch |
651 |
- eapply "${FILESDIR}"/libmilter-sharedlib.patch |
652 |
- eapply -p0 "${FILESDIR}"/sendmail-starttls-multi-crl.patch |
653 |
- eapply "${FILESDIR}"/${P}-openssl-1.1.0-fix.patch |
654 |
- eapply "${FILESDIR}"/${P}-glibc-2.30.patch |
655 |
- |
656 |
- local confCC="$(tc-getCC)" |
657 |
- local confCCOPTS="${CFLAGS}" |
658 |
- local confLDOPTS="${LDFLAGS}" |
659 |
- local confMAPDEF="-DMAP_REGEX" |
660 |
- local conf_sendmail_LIBS="" |
661 |
- use sasl && confLIBS="${confLIBS} -lsasl2" \ |
662 |
- && confENVDEF="${confENVDEF} -DSASL=2" \ |
663 |
- && confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \ |
664 |
- && conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2" |
665 |
- use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \ |
666 |
- && confLIBS="${confLIBS} -lwrap" |
667 |
- use ssl && confENVDEF="${confENVDEF} -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL" \ |
668 |
- && confENVDEF="${confENVDEF} -D_FFR_TLS_1" \ |
669 |
- && confLIBS="${confLIBS} -lssl -lcrypto" \ |
670 |
- && conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto" |
671 |
- use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \ |
672 |
- && confLIBS="${confLIBS} -lldap -llber" |
673 |
- use ipv6 && confENVDEF="${confENVDEF} -DNETINET6" |
674 |
- use nis && confENVDEF="${confENVDEF} -DNIS" |
675 |
- use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP" |
676 |
- sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \ |
677 |
- -e "s/@@confLDOPTS@@/${confLDOPTS}/" \ |
678 |
- -e "s/@@confCC@@/${confCC}/" \ |
679 |
- -e "s/@@confMAPDEF@@/${confMAPDEF}/" \ |
680 |
- -e "s/@@confENVDEF@@/${confENVDEF}/" \ |
681 |
- -e "s/@@confLIBS@@/${confLIBS}/" \ |
682 |
- -e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \ |
683 |
- "${FILESDIR}"/site.config.m4 > devtools/Site/site.config.m4 |
684 |
- echo "APPENDDEF(\`confLIBDIRS', \`-L${EROOT}usr/$(get_libdir)')" >> devtools/Site/site.config.m4 || die |
685 |
- |
686 |
- eapply_user |
687 |
-} |
688 |
- |
689 |
-src_compile() { |
690 |
- sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "compilation failed in main Build script" |
691 |
- pushd libmilter |
692 |
- sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" MILTER_SOVER=${LIBMILTER_VER} || die "libmilter compilation failed" |
693 |
- popd |
694 |
-} |
695 |
- |
696 |
-src_install() { |
697 |
- local MY_LIBDIR=/usr/$(get_libdir) |
698 |
- local MY_OBJDIR="obj.`uname -s`.`uname -r`.`uname -m`" |
699 |
- dodir /usr/bin ${MY_LIBDIR} /usr/include/libmilter |
700 |
- dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf |
701 |
- dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d |
702 |
- keepdir /var/spool/{clientmqueue,mqueue} |
703 |
- for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap |
704 |
- do |
705 |
- make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \ |
706 |
- SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \ |
707 |
- MANOWN=root MANGRP=root INCOWN=root INCGRP=root \ |
708 |
- LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \ |
709 |
- MSPQOWN=root CFOWN=root CFGRP=root \ |
710 |
- install -C "${MY_OBJDIR}/${dir}" \ |
711 |
- || die "install failed" |
712 |
- done |
713 |
- for dir in rmail mail.local |
714 |
- do |
715 |
- make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \ |
716 |
- SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \ |
717 |
- MANOWN=root MANGRP=root INCOWN=root INCGRP=root \ |
718 |
- LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \ |
719 |
- MSPQOWN=root CFOWN=root CFGRP=root \ |
720 |
- force-install -C "${MY_OBJDIR}/${dir}" \ |
721 |
- || die "install failed" |
722 |
- done |
723 |
- |
724 |
- make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \ |
725 |
- SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \ |
726 |
- MANOWN=root MANGRP=root INCOWN=root INCGRP=root \ |
727 |
- LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \ |
728 |
- MSPQOWN=root CFOWN=root CFGRP=root \ |
729 |
- MILTER_SOVER=${LIBMILTER_VER} \ |
730 |
- install -C "${MY_OBJDIR}/libmilter" \ |
731 |
- || die "install failed" |
732 |
- |
733 |
- fowners root:smmsp /usr/sbin/sendmail |
734 |
- fperms 2555 /usr/sbin/sendmail |
735 |
- fowners smmsp:smmsp /var/spool/clientmqueue |
736 |
- fperms 770 /var/spool/clientmqueue |
737 |
- fperms 700 /var/spool/mqueue |
738 |
- dosym ../sbin/makemap /usr/bin/makemap |
739 |
- dodoc FAQ KNOWNBUGS README RELEASE_NOTES doc/op/op.ps |
740 |
- newdoc sendmail/README README.sendmail |
741 |
- newdoc sendmail/SECURITY SECURITY |
742 |
- newdoc sendmail/TUNING TUNING |
743 |
- newdoc smrsh/README README.smrsh |
744 |
- newdoc libmilter/README README.libmilter |
745 |
- |
746 |
- newdoc cf/README README.cf |
747 |
- newdoc cf/cf/README README.install-cf |
748 |
- cp -pPR cf/* "${D}"/usr/share/sendmail-cf |
749 |
- |
750 |
- docinto contrib |
751 |
- dodoc contrib/* |
752 |
- |
753 |
- insinto /etc/mail |
754 |
- if use mbox |
755 |
- then |
756 |
- newins "${FILESDIR}"/sendmail.mc-r1 sendmail.mc |
757 |
- else |
758 |
- newins "${FILESDIR}"/sendmail-procmail.mc sendmail.mc |
759 |
- fi |
760 |
- m4 "${D}"/usr/share/sendmail-cf/m4/cf.m4 "${D}"/etc/mail/sendmail.mc \ |
761 |
- > "${D}"/etc/mail/sendmail.cf |
762 |
- echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \ |
763 |
- > "${D}"/etc/mail/submit.mc |
764 |
- cat "${D}"/usr/share/sendmail-cf/cf/submit.mc >> "${D}"/etc/mail/submit.mc |
765 |
- echo "# local-host-names - include all aliases for your machine here" \ |
766 |
- > "${D}"/etc/mail/local-host-names |
767 |
- cat <<- EOF > "${D}"/etc/mail/trusted-users |
768 |
- # trusted-users - users that can send mail as others without a warning |
769 |
- # apache, mailman, majordomo, uucp are good candidates |
770 |
- EOF |
771 |
- cat <<- EOF > "${D}"/etc/mail/access |
772 |
- # Check the /usr/share/doc/sendmail/README.cf file for a description |
773 |
- # of the format of this file. (search for access_db in that file) |
774 |
- # The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc |
775 |
- # package. |
776 |
- # |
777 |
- |
778 |
- EOF |
779 |
- cat <<- EOF > "${D}"/etc/conf.d/sendmail |
780 |
- # Config file for /etc/init.d/sendmail |
781 |
- # add start-up options here |
782 |
- SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode |
783 |
- CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue |
784 |
- KILL_OPTS="" # add -9/-15/your favorite evil SIG level here |
785 |
- |
786 |
- EOF |
787 |
- if use sasl; then |
788 |
- dodir /etc/sasl2 |
789 |
- cat <<- EOF > "${D}"/etc/sasl2/Sendmail.conf |
790 |
- pwcheck_method: saslauthd |
791 |
- mech_list: PLAIN LOGIN |
792 |
- |
793 |
- EOF |
794 |
- fi |
795 |
- |
796 |
- doinitd "${FILESDIR}"/sendmail |
797 |
- systemd_dounit "${FILESDIR}"/sendmail.service |
798 |
- systemd_dounit "${FILESDIR}"/sm-client.service |
799 |
- |
800 |
- keepdir /usr/adm/sm.bin |
801 |
-} |