Gentoo Archives: gentoo-commits

From: "Hanno Böck" <hanno@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/libmilter/files/, mail-filter/libmilter/
Date: Sat, 16 Nov 2019 07:32:48
Message-Id: 1573889551.9d467a0e64ef635873702cecbf8f614b164a6907.hanno@gentoo
1 commit: 9d467a0e64ef635873702cecbf8f614b164a6907
2 Author: Hanno Böck <hanno <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 16 07:32:31 2019 +0000
4 Commit: Hanno Böck <hanno <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 16 07:32:31 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d467a0e
7
8 mail-filter/libmilter: Bump and glibc 2.30 support
9
10 Upstream versions aren't increased properly, so we have to
11 make this a _p1 version.
12 Newer build system patch from sendmail ebuild.
13 Patch for glibc 2.30 support extracted from OpenSUSE.
14
15 Closes: https://bugs.gentoo.org/691692
16 Signed-off-by: Hanno Böck <hanno <AT> gentoo.org>
17 Package-Manager: Portage-2.3.79, Repoman-2.3.18
18
19 mail-filter/libmilter/Manifest | 1 +
20 .../libmilter/files/libmilter-glibc-2.30.patch | 25 +++
21 .../files/sendmail-8.14.6-build-system.patch | 211 +++++++++++++++++++++
22 mail-filter/libmilter/libmilter-1.0.2_p1.ebuild | 72 +++++++
23 4 files changed, 309 insertions(+)
24
25 diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest
26 index 1fc4bdf2b58..02a7dd7b9e9 100644
27 --- a/mail-filter/libmilter/Manifest
28 +++ b/mail-filter/libmilter/Manifest
29 @@ -1 +1,2 @@
30 DIST sendmail.8.14.5.tar.gz 2092508 BLAKE2B 3d90fa9778ebb42f2f334b35e46d0f24e8fcfd46fe69d6032f246c90fc998fbeb21e70c70bc454c688a76ea00c90ee9b5f0e5e0fc9b89b9f16fa9c814a825f9c SHA512 178addd247f1c7c8ca90d70b9240db4cad4e55f0710d5df0fe979e5473a182d2035150c352836576a28bb2b9660b0d5ebfcd95269a156ac0d2c3dba3edb60452
31 +DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
32
33 diff --git a/mail-filter/libmilter/files/libmilter-glibc-2.30.patch b/mail-filter/libmilter/files/libmilter-glibc-2.30.patch
34 new file mode 100644
35 index 00000000000..5ceac845b90
36 --- /dev/null
37 +++ b/mail-filter/libmilter/files/libmilter-glibc-2.30.patch
38 @@ -0,0 +1,25 @@
39 +--- a/libmilter/sm_gethost.c 2014-03-05 01:59:45.000000000 +0100
40 ++++ b/libmilter/sm_gethost.c 2019-11-14 18:59:41.885353232 +0100
41 +@@ -51,18 +51,20 @@ sm_getipnodebyname(name, family, flags,
42 + {
43 + bool resv6 = true;
44 + struct hostent *h;
45 +-
46 ++#ifdef RES_USE_INET6
47 + if (family == AF_INET6)
48 + {
49 + /* From RFC2133, section 6.1 */
50 + resv6 = bitset(RES_USE_INET6, _res.options);
51 + _res.options |= RES_USE_INET6;
52 + }
53 ++#endif
54 + SM_SET_H_ERRNO(0);
55 + h = gethostbyname(name);
56 ++#ifdef RES_USE_INET6
57 + if (family == AF_INET6 && !resv6)
58 + _res.options &= ~RES_USE_INET6;
59 +-
60 ++#endif
61 + /* the function is supposed to return only the requested family */
62 + if (h != NULL && h->h_addrtype != family)
63 + {
64
65 diff --git a/mail-filter/libmilter/files/sendmail-8.14.6-build-system.patch b/mail-filter/libmilter/files/sendmail-8.14.6-build-system.patch
66 new file mode 100644
67 index 00000000000..3348e921926
68 --- /dev/null
69 +++ b/mail-filter/libmilter/files/sendmail-8.14.6-build-system.patch
70 @@ -0,0 +1,211 @@
71 +diff -Nru sendmail-8.14.3.orig/cf/cf/Makefile sendmail-8.14.3/cf/cf/Makefile
72 +--- sendmail-8.14.3.orig/cf/cf/Makefile 2005-06-14 04:16:34.000000000 +0200
73 ++++ sendmail-8.14.3/cf/cf/Makefile 2009-09-20 10:55:50.000000000 +0200
74 +@@ -80,10 +80,10 @@
75 + install-cf: install-sendmail-cf install-submit-cf
76 +
77 + install-sendmail-cf: $(CF).cf
78 +- $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf ${DESTDIR}$(MAILDIR)/sendmail.cf
79 ++ $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf "${DESTDIR}$(MAILDIR)/sendmail.cf"
80 +
81 + install-submit-cf: $(SUBMIT).cf
82 +- $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf ${DESTDIR}$(MAILDIR)/submit.cf
83 ++ $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf "${DESTDIR}$(MAILDIR)/submit.cf"
84 +
85 + depend:
86 +
87 +diff -Nru sendmail-8.14.6.orig/devtools/M4/UNIX/defines.m4 sendmail-8.14.6/devtools/M4/UNIX/defines.m4
88 +--- sendmail-8.14.6.orig/devtools/M4/UNIX/defines.m4 2012-01-21 00:07:08.000000000 +0000
89 ++++ sendmail-8.14.6/devtools/M4/UNIX/defines.m4 2012-12-27 08:13:15.792214375 +0000
90 +@@ -26,7 +26,7 @@
91 + CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC')
92 + # Linker for libraries
93 + LD= ifdef(`confLD', `confLD', `confCC')
94 +-LDOPTS= ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
95 ++LDOPTS= ifdef(`confLDOPTS', `confLDOPTS')
96 + LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared')
97 +
98 + # Shell
99 +@@ -71,7 +71,7 @@
100 + LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS')
101 +
102 + # libraries required on your system
103 +-LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST')
104 ++LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
105 +
106 + # location of sendmail binary (usually /usr/sbin or /usr/lib)
107 + BINDIR= ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin')
108 +diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 sendmail-8.14.3/devtools/M4/UNIX/executable.m4
109 +--- sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 2006-10-06 07:44:44.000000000 +0200
110 ++++ sendmail-8.14.3/devtools/M4/UNIX/executable.m4 2009-09-20 10:50:36.000000000 +0200
111 +@@ -30,12 +30,12 @@
112 +
113 + ifdef(`bldNO_INSTALL', ,
114 + `install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT ifdef(`bldTARGET_INST_DEP', `bldTARGET_INST_DEP')
115 +- ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'BINDIR}; else :; fi ')
116 +- ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR}
117 ++ ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"; else :; fi ')
118 ++ ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"
119 + ifdef(`bldTARGET_LINKS', `bldMAKE_TARGET_LINKS(${bldINSTALL_DIR`'BINDIR}/bldCURRENT_PRODUCT, ${bldCURRENT_PRODUCT`'TARGET_LINKS})')')
120 +
121 + strip-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT
122 +- ${STRIP} ${STRIPOPTS} ${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT
123 ++ ${STRIP} ${STRIPOPTS} "${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT"
124 +
125 + bldCURRENT_PRODUCT-clean:
126 + rm -f ${OBJS} bldCURRENT_PRODUCT ${MANPAGES}
127 +diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 sendmail-8.14.3/devtools/M4/UNIX/library.m4
128 +--- sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 2006-09-06 00:56:53.000000000 +0200
129 ++++ sendmail-8.14.3/devtools/M4/UNIX/library.m4 2009-09-20 10:50:36.000000000 +0200
130 +@@ -27,8 +27,8 @@
131 + ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
132 +
133 + install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a
134 +-ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ')
135 +- ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}')
136 ++ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${LIBDIR}"; else :; fi ')
137 ++ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"')
138 +
139 + bldCURRENT_PRODUCT-clean:
140 + rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES}
141 +--- sendmail-8.14.6.orig/devtools/M4/UNIX/manpage.m4 2012-01-21 00:07:08.000000000 +0000
142 ++++ sendmail-8.14.6/devtools/M4/UNIX/manpage.m4 2012-12-27 08:28:52.617502447 +0000
143 +@@ -68,11 +68,11 @@
144 + ifdef(`confNO_MAN_INSTALL', `divert(-1)', `dnl')
145 + define(`bldMAN_INSTALL_CMD',
146 + `ifdef(`confDONT_INSTALL_CATMAN', `dnl',
147 +-` 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 ')
148 +- ${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}'')
149 ++` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}"; else :; fi ')
150 ++ ${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}''")
151 + ifdef(`confINSTALL_RAWMAN',
152 +-` 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 ')
153 +- ${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')'
154 ++` 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 ')
155 ++ ${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')'
156 + )dnl
157 + bldFOREACH(`bldMAN_INSTALL_CMD(', `bldMAN_PAGES')
158 + ifdef(`confNO_MAN_INSTALL', `divert(0)', `dnl')
159 +diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4
160 +--- sendmail-8.14.3.orig/libmilter/Makefile.m4 2008-04-08 07:23:44.000000000 +0200
161 ++++ sendmail-8.14.3/libmilter/Makefile.m4 2009-09-20 10:50:36.000000000 +0200
162 +@@ -32,9 +32,9 @@
163 + MFAPI= ${SRCDIR}/inc`'lude/libmilter/mfapi.h
164 + MFDEF= ${SRCDIR}/inc`'lude/libmilter/mfdef.h
165 + install-mfapi: ${MFAPI}
166 +- if [ ! -d ${DESTDIR}${INCLUDEDIR}/libmilter ]; then mkdir -p ${DESTDIR}${INCLUDEDIR}/libmilter; else :; fi
167 +- ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} ${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h
168 +- ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} ${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h
169 ++ if [ ! -d "${DESTDIR}${INCLUDEDIR}/libmilter" ]; then mkdir -p "${DESTDIR}${INCLUDEDIR}/libmilter"; else :; fi
170 ++ ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} "${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h"
171 ++ ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} "${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h"
172 + divert(0)
173 +
174 + bldFINISH
175 +diff -Nru sendmail-8.14.3.orig/mail.local/Makefile.m4 sendmail-8.14.3/mail.local/Makefile.m4
176 +--- sendmail-8.14.3.orig/mail.local/Makefile.m4 2006-06-28 23:08:02.000000000 +0200
177 ++++ sendmail-8.14.3/mail.local/Makefile.m4 2009-09-20 10:56:24.000000000 +0200
178 +@@ -30,7 +30,7 @@
179 + force-install: install-mail.local ifdef(`confNO_MAN_BUILD',, `install-docs')
180 +
181 + install-mail.local: mail.local
182 +- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local ${DESTDIR}${EBINDIR}
183 ++ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local "${DESTDIR}${EBINDIR}"
184 + divert
185 +
186 + bldFINISH
187 +diff -Nru sendmail-8.14.3.orig/rmail/Makefile.m4 sendmail-8.14.3/rmail/Makefile.m4
188 +--- sendmail-8.14.3.orig/rmail/Makefile.m4 2006-06-28 23:08:04.000000000 +0200
189 ++++ sendmail-8.14.3/rmail/Makefile.m4 2009-09-20 10:55:29.000000000 +0200
190 +@@ -31,7 +31,7 @@
191 + force-install: install-rmail ifdef(`confNO_MAN_BUILD',, `install-docs')
192 +
193 + install-rmail: rmail
194 +- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail ${DESTDIR}${UBINDIR}
195 ++ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail "${DESTDIR}${UBINDIR}"
196 + divert
197 +
198 + bldFINISH
199 +diff -Nru sendmail-8.14.3.orig/sendmail/Makefile.m4 sendmail-8.14.3/sendmail/Makefile.m4
200 +--- sendmail-8.14.3.orig/sendmail/Makefile.m4.orig 2008-03-27 17:13:33.000000000 +0100
201 ++++ sendmail-8.14.3/sendmail/Makefile.m4 2009-09-20 11:07:24.000000000 +0200
202 +@@ -14,9 +14,9 @@
203 +
204 + dnl hack: /etc/mail is not defined as "location of .cf" in the build system
205 + define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP',
206 +-`${DESTDIR}/etc/mail/submit.cf ${DESTDIR}${MSPQ}'))dnl
207 ++`"${DESTDIR}/etc/mail/submit.cf" "${DESTDIR}${MSPQ}"'))dnl
208 + define(`bldTARGET_LINKS', ifdef(`confLINKS', `confLINKS',
209 +-`${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
210 ++`"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"')
211 + )dnl
212 +
213 + # location of sendmail statistics file (usually /etc/mail/ or /var/log)
214 +@@ -43,21 +43,21 @@
215 + statistics:
216 + ${CP} /dev/null statistics
217 +
218 +-${DESTDIR}/etc/mail/submit.cf:
219 ++"${DESTDIR}/etc/mail/submit.cf":
220 + @echo "Please read INSTALL if anything fails while installing the binary."
221 + @echo "${DESTDIR}/etc/mail/submit.cf will be installed now."
222 + cd ${SRCDIR}/cf/cf && make install-submit-cf
223 +
224 + MSPQ=ifdef(`confMSP_QUEUE_DIR', `confMSP_QUEUE_DIR', `/var/spool/clientmqueue')
225 +
226 +-${DESTDIR}${MSPQ}:
227 ++"${DESTDIR}${MSPQ}":
228 + @echo "Please read INSTALL if anything fails while installing the binary."
229 + @echo "You must have setup a new user ${MSPQOWN} and a new group ${GBINGRP}"
230 + @echo "as explained in sendmail/SECURITY."
231 +- mkdir -p ${DESTDIR}${MSPQ}
232 +- chown ${MSPQOWN} ${DESTDIR}${MSPQ}
233 +- chgrp ${GBINGRP} ${DESTDIR}${MSPQ}
234 +- chmod 0770 ${DESTDIR}${MSPQ}
235 ++ mkdir -p "${DESTDIR}${MSPQ}"
236 ++ chown ${MSPQOWN} "${DESTDIR}${MSPQ}"
237 ++ chgrp ${GBINGRP} "${DESTDIR}${MSPQ}"
238 ++ chmod 0770 "${DESTDIR}${MSPQ}"
239 +
240 + divert(0)
241 +
242 +@@ -68,30 +68,30 @@
243 + divert(bldTARGETS_SECTION)
244 +
245 + install-set-user-id: bldCURRENT_PRODUCT ifdef(`confNO_HELPFILE_INSTALL',, `install-hf') ifdef(`confNO_STATISTICS_INSTALL',, `install-st') ifdef(`confNO_MAN_BUILD',, `install-docs')
246 +- ${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}
247 ++ ${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}"
248 + for i in ${sendmailTARGET_LINKS}; do \
249 + rm -f $$i; \
250 + ${LN} ${LNOPTS} ${M`'BINDIR}/sendmail $$i; \
251 + done
252 +
253 +-define(`confMTA_LINKS', `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
254 ++define(`confMTA_LINKS', `"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"')
255 + install-sm-mta: bldCURRENT_PRODUCT
256 +- ${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}/sm-mta
257 ++ ${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}/sm-mta"
258 + for i in confMTA_LINKS; do \
259 + rm -f $$i; \
260 + ${LN} ${LNOPTS} ${M`'BINDIR}/sm-mta $$i; \
261 + done
262 +
263 + install-hf:
264 +- if [ ! -d ${DESTDIR}${HFDIR} ]; then mkdir -p ${DESTDIR}${HFDIR}; else :; fi
265 +- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile ${DESTDIR}${HFFILE}
266 ++ if [ ! -d "${DESTDIR}${HFDIR}" ]; then mkdir -p "${DESTDIR}${HFDIR}"; else :; fi
267 ++ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile "${DESTDIR}${HFFILE}"
268 +
269 + install-st: statistics
270 +- if [ ! -d ${DESTDIR}${STDIR} ]; then mkdir -p ${DESTDIR}${STDIR}; else :; fi
271 +- ${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${STPATH}
272 ++ if [ ! -d "${DESTDIR}${STDIR}" ]; then mkdir -p "${DESTDIR}${STDIR}"; else :; fi
273 ++ ${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${STPATH}"
274 +
275 +-install-submit-st: statistics ${DESTDIR}${MSPQ}
276 +- ${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${MSPQ}/${MSPSTFILE}
277 ++install-submit-st: statistics "${DESTDIR}${MSPQ}"
278 ++ ${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${MSPQ}/${MSPSTFILE}"
279 +
280 + divert(0)
281 + bldPRODUCT_END
282
283 diff --git a/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild b/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
284 new file mode 100644
285 index 00000000000..b7d5242cfdd
286 --- /dev/null
287 +++ b/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
288 @@ -0,0 +1,72 @@
289 +# Copyright 1999-2019 Gentoo Authors
290 +# Distributed under the terms of the GNU General Public License v2
291 +
292 +EAPI=7
293 +
294 +inherit multilib toolchain-funcs
295 +
296 +# This library is part of sendmail, but it does not share the version number with it.
297 +# In order to find the right libmilter version number, check SMFI_VERSION definition
298 +# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines).
299 +# For example, version 1.0.1 has a SMFI_VERSION of 0x01000001.
300 +SENDMAIL_VER=8.15.2
301 +
302 +DESCRIPTION="The Sendmail Filter API (Milter)"
303 +HOMEPAGE="http://www.sendmail.org/"
304 +SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${SENDMAIL_VER}.tar.gz"
305 +
306 +LICENSE="Sendmail"
307 +SLOT="0"
308 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
309 +IUSE="ipv6 poll"
310 +
311 +DEPEND="!mail-mta/sendmail
312 + !mail-mta/sendmail"
313 +RDEPEND="!mail-mta/sendmail"
314 +
315 +S="${WORKDIR}/sendmail-${SENDMAIL_VER}"
316 +
317 +# build system patch copied from sendmail ebuild
318 +# glibc patch from opensuse
319 +PATCHES=(
320 + "${FILESDIR}/sendmail-8.14.6-build-system.patch"
321 + "${FILESDIR}/${PN}-sharedlib.patch"
322 + "${FILESDIR}/${PN}-glibc-2.30.patch"
323 + )
324 +
325 +src_prepare() {
326 + default
327 +
328 + local CC="$(tc-getCC)"
329 + local ENVDEF="-DNETUNIX -DNETINET"
330 + use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
331 + use poll && ENVDEF="${ENVDEF} -DSM_CONF_POLL=1"
332 +
333 + sed -e "s:@@CFLAGS@@:${CFLAGS}:" \
334 + -e "s:@@LDFLAGS@@:${LDFLAGS}:" \
335 + -e "s:@@CC@@:${CC}:" \
336 + -e "s:@@ENVDEF@@:${ENVDEF}:" \
337 + "${FILESDIR}/gentoo.config.m4" > "${S}/devtools/Site/site.config.m4" \
338 + || die "failed to generate site.config.m4"
339 +}
340 +
341 +src_compile() {
342 + pushd libmilter
343 + emake -j1 MILTER_SOVER=${PV}
344 + popd
345 +}
346 +
347 +src_install () {
348 + local MY_LIBDIR=/usr/$(get_libdir)
349 + dodir "${MY_LIBDIR}"
350 + emake DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
351 + SBINOWN=root SBINGRP=0 UBINOWN=root UBINGRP=0 \
352 + LIBOWN=root LIBGRP=0 GBINOWN=root GBINGRP=0 \
353 + MANOWN=root MANGRP=0 INCOWN=root INCGRP=0 \
354 + MSPQOWN=root CFOWN=root CFGRP=0 \
355 + MILTER_SOVER=${PV} \
356 + install -C obj.*/libmilter
357 +
358 + dodoc libmilter/README
359 + dodoc libmilter/docs/*
360 +}