commit: 88746d67250bc81b28f59c5f6845c00364e40158 Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de> AuthorDate: Sat Jun 6 21:44:18 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sun Jul 26 08:00:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88746d67
mail-mta/notqmail[qmail-spp]: fix build The original patch version does not apply to notqmail anymore, so use a rebased version instead. While at it explicitely specify some USE flag dependencies. Closes: https://bugs.gentoo.org/727322 Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de> Closes: https://github.com/gentoo/gentoo/pull/16826 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> mail-mta/notqmail/Manifest | 3 +- ...mail-1.08-r1.ebuild => notqmail-1.08-r2.ebuild} | 35 ++++++++++++---------- mail-mta/notqmail/notqmail-9999.ebuild | 35 ++++++++++++---------- 3 files changed, 42 insertions(+), 31 deletions(-) diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest index 57b6074b1bd..01bd981c66e 100644 --- a/mail-mta/notqmail/Manifest +++ b/mail-mta/notqmail/Manifest @@ -1,7 +1,8 @@ DIST genqmail-20191010.tar.bz2 10063 BLAKE2B bd1b664fca9fdb92aba49930b1d0c336097f2bad56ea814014c0d811d9d96fb861925dd0b016ce4ef1edd0473481fa807e81be17b7169688bfbd72a72e287718 SHA512 8d19a25b8745a04f7bdb378259dcee7b43f62cf90e7a7d8f4843d39169f8221cd8c5b9c332b37e5ecc7917366093e56f34bc4362b8ab0dd1785a6d0f12687a4b DIST notqmail-1.08-auth.patch 71183 BLAKE2B c980475ef7a2ad6e05d71f494293579e5082b63606fd0bbbd51fff5d067912b1548b4033f36de8030d60b195a684ff0845afe022d316ad835b1ad0b360cafbd6 SHA512 697b8b2a26a10c0029918193046dd2758bb3e84af97fb2e99f29bfb23efb0a9e0ee6ecca0431369e348d1414ef70bc5c446420b4f019ba427d16d0f07f23f6e3 DIST notqmail-1.08-big-todo.patch 7179 BLAKE2B f7582d0193096f17316feb15e65c2b841545e274309351fc2921120ec3a4fb35b1998fbd8b8ca573c7dbd690ab7197f4b4f9105671f7d299687bf339b747deb2 SHA512 8444c8b4558410682d46e4954973721a1fb5e90585c9a3a4d7603448faf68cc0d07d2b5d51977ce72d35551b5c43b03014638251b542e48fe9cbef327cacc7c6 +DIST notqmail-1.08-spp.patch 14304 BLAKE2B 61cb1cf48e0af93d4928906fa115fe71df888d676d38bf4e2c23106900d7f66964a915f90cb0cc3b36130a9a9a2050f209471fdc9c03bb16a82cae2e35b94278 SHA512 b0671b6a370f4eda0721a655a140f24b0585ab752f46260f90aa3afbcf86d5ba2970985c7f88af95402c8e4e7c9e2fe54a75b9cf7a598f8fb1901dccc4960c8a DIST notqmail-1.08-tls-20200107.patch 50123 BLAKE2B 94bbab86bd089c6ac032bfabc300eb89b367c239ae7a60256c417a2abfa583984e6273eae6df22d44b98dcefce4904f6db9625ff2a57f4b30a8fff8c629d374b SHA512 bdccdf98024f811802504872b8e3f3ac3010c1f218a0ec79bb12e635c35bfa15471c2b7e499c14e6bec9b5d3e48f1e584e26ba2ca01f1ce73a347a338de2a304 +DIST notqmail-1.08-tls-spp.patch 64223 BLAKE2B d2337017dacd41d975a9ebd4650cce58425c3c6e1ebfaaaf29a222a532cfd246fec16f52997e85eb921ad376235eb69a8580ba8df493bf760f3d8237311411c0 SHA512 012cdc62c2361737fb984e750a28bd06f357aefd9fa8d909e2e380e65fc5ae3a2cbef3f592eb60455ad858385dbf8e8b50a2f6358a9ffa3f885aa76250a336a0 DIST notqmail-1.08.tar.xz 179500 BLAKE2B 6c774037b257849aea65e7761a6f6c9918079faa490c0ed027d73a8b32de5d5907a54a59162b9b68479229c4b92a23fe28cd2f334123cfe674a94502b90a3635 SHA512 c18d09e28c2e580522eea144e5344e814811108b12f3272b4cf10ad58d9d3d8e666616dcfea2f369e226b68db4fe8cf67cbae994b242d36e9e07c289a0539394 DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a SHA512 b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354 -DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf diff --git a/mail-mta/notqmail/notqmail-1.08-r1.ebuild b/mail-mta/notqmail/notqmail-1.08-r2.ebuild similarity index 76% rename from mail-mta/notqmail/notqmail-1.08-r1.ebuild rename to mail-mta/notqmail/notqmail-1.08-r2.ebuild index f025f8eddc5..f6de8967357 100644 --- a/mail-mta/notqmail/notqmail-1.08-r1.ebuild +++ b/mail-mta/notqmail/notqmail-1.08-r2.ebuild @@ -36,10 +36,20 @@ SRC_URI="${SRC_URI} highvolume? ( https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> ${QMAIL_BIGTODO_F} ) - qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} ) - https://github.com/notqmail/notqmail/commit/b224a3ceb63ff8ebc57648bf304e079d0bf55023.patch -> ${PN}-1.08-auth.patch + qmail-spp? ( + ssl? ( + https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> ${PN}-1.08-auth.patch + https://github.com/notqmail/notqmail/commit/d950cc34491afe90432cafcaeda61d1c1a9508e9.patch -> ${PN}-1.08-tls-spp.patch + ) + !ssl? ( + https://github.com/notqmail/notqmail/commit/b36d52a0dd7315a969f2a9a7455717466e45be23.patch -> ${PN}-1.08-spp.patch + ) + ) ssl? ( - https://github.com/notqmail/notqmail/commit/ed58c2eff21612037bbcc633f4b3a8e708f522a0.patch -> ${QMAIL_TLS_F} + https://github.com/notqmail/notqmail/commit/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> ${QMAIL_TLS_F} + ) + !ssl? ( + https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> ${PN}-1.08-auth.patch ) ) " @@ -47,7 +57,7 @@ SRC_URI="${SRC_URI} LICENSE="public-domain" SLOT="0" IUSE="authcram gencertdaily highvolume libressl -pop3 qmail-spp ssl test vanilla" -REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )" +REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl ) libressl? ( ssl )" RESTRICT="!test? ( test )" DEPEND=" @@ -92,7 +102,6 @@ RDEPEND="${DEPEND} src_unpack() { genqmail_src_unpack - use qmail-spp && qmail_spp_src_unpack [[ ${PV} == "9999" ]] && git-r3_src_unpack [[ ${PV} != "9999" ]] && default @@ -104,25 +113,21 @@ PATCHES=( src_prepare() { if ! use vanilla; then - if use ssl; then + if use qmail-spp; then + PATCHES+=( "${DISTDIR}/${P}-auth.patch" ) + elif use ssl; then PATCHES+=( "${DISTDIR}/${QMAIL_TLS_F}" ) else PATCHES+=( "${DISTDIR}/${P}-auth.patch" ) fi - if use highvolume; then - PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" ) - fi + use highvolume && PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" ) if use qmail-spp; then if use ssl; then - SPP_PATCH="${QMAIL_SPP_S}/qmail-spp-smtpauth-tls-20060105.diff" + PATCHES+=( "${DISTDIR}/${PN}-1.08-tls-spp.patch" ) else - SPP_PATCH="${QMAIL_SPP_S}/netqmail-spp.diff" + PATCHES+=( "${DISTDIR}/${PN}-1.08-spp.patch" ) fi - # make the patch work with "-p1" - sed -e 's#^--- \([Mq]\)#--- a/\1#' -e 's#^+++ \([Mq]\)#+++ b/\1#' -i ${SPP_PATCH} || die - - PATCHES+=( "${SPP_PATCH}" ) fi fi diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild index eb09e7fa8d3..393242d48ca 100644 --- a/mail-mta/notqmail/notqmail-9999.ebuild +++ b/mail-mta/notqmail/notqmail-9999.ebuild @@ -36,10 +36,20 @@ SRC_URI="${SRC_URI} highvolume? ( https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> ${QMAIL_BIGTODO_F} ) - qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} ) - https://github.com/notqmail/notqmail/commit/b224a3ceb63ff8ebc57648bf304e079d0bf55023.patch -> ${PN}-1.08-auth.patch + qmail-spp? ( + ssl? ( + https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> ${PN}-1.08-auth.patch + https://github.com/notqmail/notqmail/commit/d950cc34491afe90432cafcaeda61d1c1a9508e9.patch -> ${PN}-1.08-tls-spp.patch + ) + !ssl? ( + https://github.com/notqmail/notqmail/commit/b36d52a0dd7315a969f2a9a7455717466e45be23.patch -> ${PN}-1.08-spp.patch + ) + ) ssl? ( - https://github.com/notqmail/notqmail/commit/ed58c2eff21612037bbcc633f4b3a8e708f522a0.patch -> ${QMAIL_TLS_F} + https://github.com/notqmail/notqmail/commit/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> ${QMAIL_TLS_F} + ) + !ssl? ( + https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> ${PN}-1.08-auth.patch ) ) " @@ -47,7 +57,7 @@ SRC_URI="${SRC_URI} LICENSE="public-domain" SLOT="0" IUSE="authcram gencertdaily highvolume libressl -pop3 qmail-spp ssl test vanilla" -REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )" +REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl ) libressl? ( ssl )" RESTRICT="!test? ( test )" DEPEND=" @@ -92,7 +102,6 @@ RDEPEND="${DEPEND} src_unpack() { genqmail_src_unpack - use qmail-spp && qmail_spp_src_unpack [[ ${PV} == "9999" ]] && git-r3_src_unpack [[ ${PV} != "9999" ]] && default @@ -104,25 +113,21 @@ PATCHES=( src_prepare() { if ! use vanilla; then - if use ssl; then + if use qmail-spp; then + PATCHES+=( "${DISTDIR}/${P}-auth.patch" ) + elif use ssl; then PATCHES+=( "${DISTDIR}/${QMAIL_TLS_F}" ) else PATCHES+=( "${DISTDIR}/${P}-auth.patch" ) fi - if use highvolume; then - PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" ) - fi + use highvolume && PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" ) if use qmail-spp; then if use ssl; then - SPP_PATCH="${QMAIL_SPP_S}/qmail-spp-smtpauth-tls-20060105.diff" + PATCHES+=( "${DISTDIR}/${PN}-1.08-tls-spp.patch" ) else - SPP_PATCH="${QMAIL_SPP_S}/netqmail-spp.diff" + PATCHES+=( "${DISTDIR}/${PN}-1.08-spp.patch" ) fi - # make the patch work with "-p1" - sed -e 's#^--- \([Mq]\)#--- a/\1#' -e 's#^+++ \([Mq]\)#+++ b/\1#' -i ${SPP_PATCH} || die - - PATCHES+=( "${SPP_PATCH}" ) fi fi
