| 1 |
commit: 654d9d598347aafcbfd15b9b64e26fb67b7bd506 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 18 10:44:21 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 18 10:44:21 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=654d9d59 |
| 7 |
|
| 8 |
mail-mta/sendmail: fix patch path |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.2, Repoman-2.3.23 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/sendmail-8.14.6-build-system.patch | 73 +++++++++++++++++++--- |
| 14 |
...em.patch => sendmail-8.16.1-build-system.patch} | 0 |
| 15 |
mail-mta/sendmail/sendmail-8.16.1.ebuild | 2 +- |
| 16 |
3 files changed, 64 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
index c317a4e854f..3348e921926 100644 |
| 20 |
--- a/mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch |
| 21 |
+++ b/mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch |
| 22 |
@@ -126,25 +126,37 @@ diff -Nru sendmail-8.14.3.orig/rmail/Makefile.m4 sendmail-8.14.3/rmail/Makefile. |
| 23 |
divert |
| 24 |
|
| 25 |
bldFINISH |
| 26 |
- |
| 27 |
---- a/sendmail/Makefile.m4 2020-08-10 23:14:23.209900406 -0400 |
| 28 |
-+++ b/sendmail/Makefile.m4 2020-08-10 23:23:51.272863753 -0400 |
| 29 |
+diff -Nru sendmail-8.14.3.orig/sendmail/Makefile.m4 sendmail-8.14.3/sendmail/Makefile.m4 |
| 30 |
+--- sendmail-8.14.3.orig/sendmail/Makefile.m4.orig 2008-03-27 17:13:33.000000000 +0100 |
| 31 |
++++ sendmail-8.14.3/sendmail/Makefile.m4 2009-09-20 11:07:24.000000000 +0200 |
| 32 |
+@@ -14,9 +14,9 @@ |
| 33 |
+ |
| 34 |
+ dnl hack: /etc/mail is not defined as "location of .cf" in the build system |
| 35 |
+ define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP', |
| 36 |
+-`${DESTDIR}/etc/mail/submit.cf ${DESTDIR}${MSPQ}'))dnl |
| 37 |
++`"${DESTDIR}/etc/mail/submit.cf" "${DESTDIR}${MSPQ}"'))dnl |
| 38 |
+ define(`bldTARGET_LINKS', ifdef(`confLINKS', `confLINKS', |
| 39 |
+-`${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat') |
| 40 |
++`"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"') |
| 41 |
+ )dnl |
| 42 |
+ |
| 43 |
+ # location of sendmail statistics file (usually /etc/mail/ or /var/log) |
| 44 |
@@ -43,21 +43,21 @@ |
| 45 |
statistics: |
| 46 |
${CP} /dev/null statistics |
| 47 |
- |
| 48 |
+ |
| 49 |
-${DESTDIR}/etc/mail/submit.cf: |
| 50 |
-+${DESTDIR}/etc/mail/submit.cf: |
| 51 |
++"${DESTDIR}/etc/mail/submit.cf": |
| 52 |
@echo "Please read INSTALL if anything fails while installing the binary." |
| 53 |
@echo "${DESTDIR}/etc/mail/submit.cf will be installed now." |
| 54 |
cd ${SRCDIR}/cf/cf && make install-submit-cf |
| 55 |
- |
| 56 |
+ |
| 57 |
MSPQ=ifdef(`confMSP_QUEUE_DIR', `confMSP_QUEUE_DIR', `/var/spool/clientmqueue') |
| 58 |
- |
| 59 |
+ |
| 60 |
-${DESTDIR}${MSPQ}: |
| 61 |
-+${DESTDIR}${MSPQ}: |
| 62 |
++"${DESTDIR}${MSPQ}": |
| 63 |
@echo "Please read INSTALL if anything fails while installing the binary." |
| 64 |
- @echo "You must have set up a new user ${MSPQOWN} and a new group ${GBINGRP}" |
| 65 |
+ @echo "You must have setup a new user ${MSPQOWN} and a new group ${GBINGRP}" |
| 66 |
@echo "as explained in sendmail/SECURITY." |
| 67 |
- mkdir -p ${DESTDIR}${MSPQ} |
| 68 |
- chown ${MSPQOWN} ${DESTDIR}${MSPQ} |
| 69 |
@@ -154,5 +166,46 @@ diff -Nru sendmail-8.14.3.orig/rmail/Makefile.m4 sendmail-8.14.3/rmail/Makefile. |
| 70 |
+ chown ${MSPQOWN} "${DESTDIR}${MSPQ}" |
| 71 |
+ chgrp ${GBINGRP} "${DESTDIR}${MSPQ}" |
| 72 |
+ chmod 0770 "${DESTDIR}${MSPQ}" |
| 73 |
- |
| 74 |
+ |
| 75 |
+ divert(0) |
| 76 |
+ |
| 77 |
+@@ -68,30 +68,30 @@ |
| 78 |
+ divert(bldTARGETS_SECTION) |
| 79 |
+ |
| 80 |
+ install-set-user-id: bldCURRENT_PRODUCT ifdef(`confNO_HELPFILE_INSTALL',, `install-hf') ifdef(`confNO_STATISTICS_INSTALL',, `install-st') ifdef(`confNO_MAN_BUILD',, `install-docs') |
| 81 |
+- ${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR} |
| 82 |
++ ${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}" |
| 83 |
+ for i in ${sendmailTARGET_LINKS}; do \ |
| 84 |
+ rm -f $$i; \ |
| 85 |
+ ${LN} ${LNOPTS} ${M`'BINDIR}/sendmail $$i; \ |
| 86 |
+ done |
| 87 |
+ |
| 88 |
+-define(`confMTA_LINKS', `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat') |
| 89 |
++define(`confMTA_LINKS', `"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"') |
| 90 |
+ install-sm-mta: bldCURRENT_PRODUCT |
| 91 |
+- ${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}/sm-mta |
| 92 |
++ ${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}/sm-mta" |
| 93 |
+ for i in confMTA_LINKS; do \ |
| 94 |
+ rm -f $$i; \ |
| 95 |
+ ${LN} ${LNOPTS} ${M`'BINDIR}/sm-mta $$i; \ |
| 96 |
+ done |
| 97 |
+ |
| 98 |
+ install-hf: |
| 99 |
+- if [ ! -d ${DESTDIR}${HFDIR} ]; then mkdir -p ${DESTDIR}${HFDIR}; else :; fi |
| 100 |
+- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile ${DESTDIR}${HFFILE} |
| 101 |
++ if [ ! -d "${DESTDIR}${HFDIR}" ]; then mkdir -p "${DESTDIR}${HFDIR}"; else :; fi |
| 102 |
++ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile "${DESTDIR}${HFFILE}" |
| 103 |
+ |
| 104 |
+ install-st: statistics |
| 105 |
+- if [ ! -d ${DESTDIR}${STDIR} ]; then mkdir -p ${DESTDIR}${STDIR}; else :; fi |
| 106 |
+- ${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${STPATH} |
| 107 |
++ if [ ! -d "${DESTDIR}${STDIR}" ]; then mkdir -p "${DESTDIR}${STDIR}"; else :; fi |
| 108 |
++ ${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${STPATH}" |
| 109 |
+ |
| 110 |
+-install-submit-st: statistics ${DESTDIR}${MSPQ} |
| 111 |
+- ${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${MSPQ}/${MSPSTFILE} |
| 112 |
++install-submit-st: statistics "${DESTDIR}${MSPQ}" |
| 113 |
++ ${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${MSPQ}/${MSPSTFILE}" |
| 114 |
+ |
| 115 |
divert(0) |
| 116 |
+ bldPRODUCT_END |
| 117 |
|
| 118 |
diff --git a/mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch b/mail-mta/sendmail/files/sendmail-8.16.1-build-system.patch |
| 119 |
similarity index 100% |
| 120 |
copy from mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch |
| 121 |
copy to mail-mta/sendmail/files/sendmail-8.16.1-build-system.patch |
| 122 |
|
| 123 |
diff --git a/mail-mta/sendmail/sendmail-8.16.1.ebuild b/mail-mta/sendmail/sendmail-8.16.1.ebuild |
| 124 |
index fc5113138ed..02b31ff3c1c 100644 |
| 125 |
--- a/mail-mta/sendmail/sendmail-8.16.1.ebuild |
| 126 |
+++ b/mail-mta/sendmail/sendmail-8.16.1.ebuild |
| 127 |
@@ -46,7 +46,7 @@ RDEPEND="${DEPEND} |
| 128 |
PDEPEND="!mbox? ( mail-filter/procmail )" |
| 129 |
|
| 130 |
src_prepare() { |
| 131 |
- eapply "${FILESDIR}"/"${PN}"-8.14.6-build-system.patch |
| 132 |
+ eapply "${FILESDIR}"/"${PN}"-8.16.1-build-system.patch |
| 133 |
eapply -p0 "${FILESDIR}"/sendmail-delivered_hdr.patch |
| 134 |
|
| 135 |
local confCC="$(tc-getCC)" |
Archives