From 38d3c30e937e5e5b51b471d1756a1487fdd09a74 Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Thu, 6 Aug 2020 08:18:28 +0200 Subject: mail-mta/n[eo]tqmail: bump genqmail tarball Closes: https://bugs.gentoo.org/735090 Signed-off-by: Rolf Eike Beer Closes: https://github.com/gentoo/gentoo/pull/17027 Signed-off-by: Sergei Trofimovich --- mail-mta/netqmail/Manifest | 2 +- mail-mta/netqmail/netqmail-1.06-r13.ebuild | 203 ----------------------------- mail-mta/netqmail/netqmail-1.06-r14.ebuild | 203 +++++++++++++++++++++++++++++ mail-mta/notqmail/Manifest | 2 +- mail-mta/notqmail/notqmail-1.08-r2.ebuild | 192 --------------------------- mail-mta/notqmail/notqmail-1.08-r3.ebuild | 192 +++++++++++++++++++++++++++ mail-mta/notqmail/notqmail-9999.ebuild | 2 +- 7 files changed, 398 insertions(+), 398 deletions(-) delete mode 100644 mail-mta/netqmail/netqmail-1.06-r13.ebuild create mode 100644 mail-mta/netqmail/netqmail-1.06-r14.ebuild delete mode 100644 mail-mta/notqmail/notqmail-1.08-r2.ebuild create mode 100644 mail-mta/notqmail/notqmail-1.08-r3.ebuild (limited to 'mail-mta') diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest index e79904ce151d..4e98e5c41266 100644 --- a/mail-mta/netqmail/Manifest +++ b/mail-mta/netqmail/Manifest @@ -1,5 +1,5 @@ DIST big-todo.103.patch 5546 BLAKE2B 34889a97c642bafedebdd3fba7dd848e58f692bbebb33da26f39d47d65ac2067cc6bfeea9f044dcebcdce53bf789c7b2e029d6542ad1926a420291d4b59d7554 SHA512 fe6e19a94fb7dbe51f7164e38a91d8edb636251569d44ace1e146fe5f607b240edafb2884daaac481ff3219142ab553cfd5b01786e0dfc4662ef07336b789975 -DIST genqmail-20191010.tar.bz2 10063 BLAKE2B bd1b664fca9fdb92aba49930b1d0c336097f2bad56ea814014c0d811d9d96fb861925dd0b016ce4ef1edd0473481fa807e81be17b7169688bfbd72a72e287718 SHA512 8d19a25b8745a04f7bdb378259dcee7b43f62cf90e7a7d8f4843d39169f8221cd8c5b9c332b37e5ecc7917366093e56f34bc4362b8ab0dd1785a6d0f12687a4b +DIST genqmail-20200817.tar.bz2 10071 BLAKE2B dfeb8aa094c0db1b672e5e7a39f3866e02c088e366d5814832870140c1422d7c5fc0cf655614641ec45b5e819d3c4f8b910252d39231f7ae0394a81fd3309245 SHA512 665ac06bfb127e8c905dda888834520046fc327d21db2aa15da575f434ceff7e811f4206f7cde3c87815aab86f93b7b3e374547809eb02dd0ea0af419da121a8 DIST netqmail-1.05-tls-smtpauth-20190114.patch 68060 BLAKE2B 46a887c23e09d6cb9fa9a5259c288cfd9dc8ce51f361d076794ebf754250a35e33787426cdd53989dc196ce4a3a61fd1e66896b2ff0368c98a4566d7bef6c517 SHA512 33cbf4d05c4212efecb23237c1b3fb67ef9a1543f11d81ac1c397416a4153af3d67e144686f1764d8b5e7ccbbbbd51044bbe51cf833c6ac779344048384cabc1 DIST netqmail-1.06.tar.gz 260941 BLAKE2B f60cf737f308d70433da917b30a07af600f8956ae718bcf17f1628382523d7fdfa2456549066b57674a112a53946a410136ee89c0911402b24a4153bbc37d39a SHA512 de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a SHA512 b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354 diff --git a/mail-mta/netqmail/netqmail-1.06-r13.ebuild b/mail-mta/netqmail/netqmail-1.06-r13.ebuild deleted file mode 100644 index 738fa4800d1f..000000000000 --- a/mail-mta/netqmail/netqmail-1.06-r13.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GENQMAIL_PV=20191010 -QMAIL_SPP_PV=0.42 - -QMAIL_TLS_PV=20190114 -QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch -QMAIL_TLS_CVE=vu555316.patch - -QMAIL_BIGTODO_PV=103 -QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch - -QMAIL_LARGE_DNS='qmail-103.patch' - -QMAIL_SMTPUTF8='qmail-smtputf8.patch' - -inherit qmail - -DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent" -HOMEPAGE=" - http://netqmail.org - https://cr.yp.to/qmail.html - http://qmail.org -" -SRC_URI="mirror://qmail/${P}.tar.gz - https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F} - https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS} - !vanilla? ( - highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} ) - qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} ) - ssl? ( - https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F} - http://inoa.net/qmail-tls/${QMAIL_TLS_CVE} - https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch - ) - ) -" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla" -REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )" -RESTRICT="test" - -DEPEND=" - acct-group/nofiles - acct-group/qmail - acct-user/alias - acct-user/qmaild - acct-user/qmaill - acct-user/qmailp - acct-user/qmailq - acct-user/qmailr - acct-user/qmails - net-dns/libidn2 - net-mail/queue-repair - sys-apps/gentoo-functions - sys-apps/groff - ssl? ( - !libressl? ( >=dev-libs/openssl-1.1:0= ) - libressl? ( dev-libs/libressl:= ) - ) -" -RDEPEND="${DEPEND} - sys-apps/ucspi-tcp - virtual/checkpassword - virtual/daemontools - authcram? ( >=net-mail/cmd5checkpw-0.30 ) - ssl? ( - pop3? ( sys-apps/ucspi-ssl ) - ) - !mail-mta/courier - !mail-mta/esmtp - !mail-mta/exim - !mail-mta/mini-qmail - !mail-mta/msmtp[mta] - !mail-mta/nullmailer - !mail-mta/opensmtpd - !mail-mta/postfix - !mail-mta/qmail-ldap - !mail-mta/sendmail - !mail-mta/ssmtp[mta] -" - -pkg_setup() { - if [[ -n "${QMAIL_PATCH_DIR}" ]]; then - eerror - eerror "The QMAIL_PATCH_DIR variable for custom patches" - eerror "has been removed from ${PN}. If you need custom patches" - eerror "see 'user patches' in the portage manual." - eerror - die "QMAIL_PATCH_DIR is not supported anymore" - fi -} - -src_unpack() { - genqmail_src_unpack - use qmail-spp && qmail_spp_src_unpack - - unpack ${P}.tar.gz -} - -PATCHES=( - "${FILESDIR}/${PV}-exit.patch" - "${FILESDIR}/${PV}-readwrite.patch" - "${DISTDIR}/${QMAIL_LARGE_DNS}" - "${FILESDIR}/${PV}-fbsd-utmpx.patch" - "${FILESDIR}/${P}-ipme-multiple.patch" - "${FILESDIR}/${P}-any-to-cname.patch" - "${FILESDIR}/${P}-CVE-2005-1513.patch" - "${FILESDIR}/${P}-CVE-2005-1514.patch" - "${FILESDIR}/${P}-CVE-2005-1515.patch" - "${FILESDIR}/${P}-overflows.patch" -) - -src_prepare() { - if ! use vanilla; then - if use ssl; then - # This patch contains relative paths and needs to be cleaned up. - sed 's~^--- \.\./\.\./~--- ~g' \ - < "${DISTDIR}"/${QMAIL_TLS_F} \ - > "${T}"/${QMAIL_TLS_F} || die - PATCHES+=( "${T}/${QMAIL_TLS_F}" - "${DISTDIR}/${QMAIL_TLS_CVE}" - "${FILESDIR}/qmail-smtputf8.patch" - "${FILESDIR}/qmail-smtputf8-crlf-fix.patch" - ) - fi - if use highvolume; then - PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" ) - fi - - if use qmail-spp; then - if use ssl; then - SPP_PATCH="${QMAIL_SPP_S}/qmail-spp-smtpauth-tls-20060105.diff" - else - SPP_PATCH="${QMAIL_SPP_S}/netqmail-spp.diff" - 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 - - default - - qmail_src_postunpack - - # Fix bug #33818 but for netqmail (Bug 137015) - if ! use authcram; then - einfo "Disabled CRAM_MD5 support" - sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die - else - einfo "Enabled CRAM_MD5 support" - fi - - ht_fix_file Makefile* -} - -src_compile() { - qmail_src_compile - use qmail-spp && qmail_spp_src_compile -} - -src_install() { - qmail_src_install -} - -pkg_postinst() { - qmail_queue_setup - qmail_rootmail_fixup - qmail_tcprules_build - - qmail_config_notice - qmail_supervise_config_notice - elog - elog "If you are looking for documentation, check those links:" - elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail" - elog " -- qmail/vpopmail Virtual Mail Hosting System Guide" - elog "http://www.lifewithqmail.com/" - elog " -- Life with qmail" - elog -} - -pkg_preinst() { - qmail_tcprules_fixup -} - -pkg_config() { - # avoid some weird locale problems - export LC_ALL=C - - qmail_config_fast - qmail_tcprules_config - qmail_tcprules_build - - use ssl && qmail_ssl_generate -} diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild b/mail-mta/netqmail/netqmail-1.06-r14.ebuild new file mode 100644 index 000000000000..af1fe14bd123 --- /dev/null +++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild @@ -0,0 +1,203 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +GENQMAIL_PV=20200817 +QMAIL_SPP_PV=0.42 + +QMAIL_TLS_PV=20190114 +QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch +QMAIL_TLS_CVE=vu555316.patch + +QMAIL_BIGTODO_PV=103 +QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch + +QMAIL_LARGE_DNS='qmail-103.patch' + +QMAIL_SMTPUTF8='qmail-smtputf8.patch' + +inherit qmail + +DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent" +HOMEPAGE=" + http://netqmail.org + https://cr.yp.to/qmail.html + http://qmail.org +" +SRC_URI="mirror://qmail/${P}.tar.gz + https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F} + https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS} + !vanilla? ( + highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} ) + qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} ) + ssl? ( + https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F} + http://inoa.net/qmail-tls/${QMAIL_TLS_CVE} + https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch + ) + ) +" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" +IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla" +REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )" +RESTRICT="test" + +DEPEND=" + acct-group/nofiles + acct-group/qmail + acct-user/alias + acct-user/qmaild + acct-user/qmaill + acct-user/qmailp + acct-user/qmailq + acct-user/qmailr + acct-user/qmails + net-dns/libidn2 + net-mail/queue-repair + sys-apps/gentoo-functions + sys-apps/groff + ssl? ( + !libressl? ( >=dev-libs/openssl-1.1:0= ) + libressl? ( dev-libs/libressl:= ) + ) +" +RDEPEND="${DEPEND} + sys-apps/ucspi-tcp + virtual/checkpassword + virtual/daemontools + authcram? ( >=net-mail/cmd5checkpw-0.30 ) + ssl? ( + pop3? ( sys-apps/ucspi-ssl ) + ) + !mail-mta/courier + !mail-mta/esmtp + !mail-mta/exim + !mail-mta/mini-qmail + !mail-mta/msmtp[mta] + !mail-mta/nullmailer + !mail-mta/opensmtpd + !mail-mta/postfix + !mail-mta/qmail-ldap + !mail-mta/sendmail + !mail-mta/ssmtp[mta] +" + +pkg_setup() { + if [[ -n "${QMAIL_PATCH_DIR}" ]]; then + eerror + eerror "The QMAIL_PATCH_DIR variable for custom patches" + eerror "has been removed from ${PN}. If you need custom patches" + eerror "see 'user patches' in the portage manual." + eerror + die "QMAIL_PATCH_DIR is not supported anymore" + fi +} + +src_unpack() { + genqmail_src_unpack + use qmail-spp && qmail_spp_src_unpack + + unpack ${P}.tar.gz +} + +PATCHES=( + "${FILESDIR}/${PV}-exit.patch" + "${FILESDIR}/${PV}-readwrite.patch" + "${DISTDIR}/${QMAIL_LARGE_DNS}" + "${FILESDIR}/${PV}-fbsd-utmpx.patch" + "${FILESDIR}/${P}-ipme-multiple.patch" + "${FILESDIR}/${P}-any-to-cname.patch" + "${FILESDIR}/${P}-CVE-2005-1513.patch" + "${FILESDIR}/${P}-CVE-2005-1514.patch" + "${FILESDIR}/${P}-CVE-2005-1515.patch" + "${FILESDIR}/${P}-overflows.patch" +) + +src_prepare() { + if ! use vanilla; then + if use ssl; then + # This patch contains relative paths and needs to be cleaned up. + sed 's~^--- \.\./\.\./~--- ~g' \ + < "${DISTDIR}"/${QMAIL_TLS_F} \ + > "${T}"/${QMAIL_TLS_F} || die + PATCHES+=( "${T}/${QMAIL_TLS_F}" + "${DISTDIR}/${QMAIL_TLS_CVE}" + "${FILESDIR}/qmail-smtputf8.patch" + "${FILESDIR}/qmail-smtputf8-crlf-fix.patch" + ) + fi + if use highvolume; then + PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" ) + fi + + if use qmail-spp; then + if use ssl; then + SPP_PATCH="${QMAIL_SPP_S}/qmail-spp-smtpauth-tls-20060105.diff" + else + SPP_PATCH="${QMAIL_SPP_S}/netqmail-spp.diff" + 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 + + default + + qmail_src_postunpack + + # Fix bug #33818 but for netqmail (Bug 137015) + if ! use authcram; then + einfo "Disabled CRAM_MD5 support" + sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die + else + einfo "Enabled CRAM_MD5 support" + fi + + ht_fix_file Makefile* +} + +src_compile() { + qmail_src_compile + use qmail-spp && qmail_spp_src_compile +} + +src_install() { + qmail_src_install +} + +pkg_postinst() { + qmail_queue_setup + qmail_rootmail_fixup + qmail_tcprules_build + + qmail_config_notice + qmail_supervise_config_notice + elog + elog "If you are looking for documentation, check those links:" + elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail" + elog " -- qmail/vpopmail Virtual Mail Hosting System Guide" + elog "http://www.lifewithqmail.com/" + elog " -- Life with qmail" + elog +} + +pkg_preinst() { + qmail_tcprules_fixup +} + +pkg_config() { + # avoid some weird locale problems + export LC_ALL=C + + qmail_config_fast + qmail_tcprules_config + qmail_tcprules_build + + use ssl && qmail_ssl_generate +} diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest index 01bd981c66e6..7944b1c3be37 100644 --- a/mail-mta/notqmail/Manifest +++ b/mail-mta/notqmail/Manifest @@ -1,4 +1,4 @@ -DIST genqmail-20191010.tar.bz2 10063 BLAKE2B bd1b664fca9fdb92aba49930b1d0c336097f2bad56ea814014c0d811d9d96fb861925dd0b016ce4ef1edd0473481fa807e81be17b7169688bfbd72a72e287718 SHA512 8d19a25b8745a04f7bdb378259dcee7b43f62cf90e7a7d8f4843d39169f8221cd8c5b9c332b37e5ecc7917366093e56f34bc4362b8ab0dd1785a6d0f12687a4b +DIST genqmail-20200817.tar.bz2 10071 BLAKE2B dfeb8aa094c0db1b672e5e7a39f3866e02c088e366d5814832870140c1422d7c5fc0cf655614641ec45b5e819d3c4f8b910252d39231f7ae0394a81fd3309245 SHA512 665ac06bfb127e8c905dda888834520046fc327d21db2aa15da575f434ceff7e811f4206f7cde3c87815aab86f93b7b3e374547809eb02dd0ea0af419da121a8 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 diff --git a/mail-mta/notqmail/notqmail-1.08-r2.ebuild b/mail-mta/notqmail/notqmail-1.08-r2.ebuild deleted file mode 100644 index f277610d306a..000000000000 --- a/mail-mta/notqmail/notqmail-1.08-r2.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GENQMAIL_PV=20191010 -QMAIL_SPP_PV=0.42 - -QMAIL_TLS_PV=20200107 -QMAIL_TLS_F=notqmail-1.08-tls-${QMAIL_TLS_PV}.patch - -QMAIL_BIGTODO_F=notqmail-1.08-big-todo.patch - -QMAIL_LARGE_DNS="qmail-103.patch" - -inherit qmail systemd - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/notqmail/notqmail.git" - inherit git-r3 -else - KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" - SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz" -fi - -DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent" -HOMEPAGE=" - https://notqmail.org - https://cr.yp.to/qmail.html - http://qmail.org -" -SRC_URI="${SRC_URI} - https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F} - https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS} - !vanilla? ( - highvolume? ( - https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> ${QMAIL_BIGTODO_F} - ) - 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/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> ${QMAIL_TLS_F} - ) - !ssl? ( - https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> ${PN}-1.08-auth.patch - ) - ) -" - -LICENSE="public-domain" -SLOT="0" -IUSE="authcram gencertdaily highvolume libressl -pop3 qmail-spp ssl test vanilla" -REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl ) libressl? ( ssl )" -RESTRICT="!test? ( test )" - -DEPEND=" - net-dns/libidn2 - net-mail/queue-repair - sys-apps/gentoo-functions - ssl? ( - !libressl? ( >=dev-libs/openssl-1.1:0= ) - libressl? ( dev-libs/libressl:= ) - ) - test? ( dev-libs/check ) -" -RDEPEND="${DEPEND} - acct-group/nofiles - acct-group/qmail - acct-user/alias - acct-user/qmaild - acct-user/qmaill - acct-user/qmailp - acct-user/qmailq - acct-user/qmailr - acct-user/qmails - sys-apps/ucspi-tcp - virtual/checkpassword - virtual/daemontools - authcram? ( >=net-mail/cmd5checkpw-0.30 ) - ssl? ( - pop3? ( sys-apps/ucspi-ssl ) - ) - !mail-mta/courier - !mail-mta/esmtp - !mail-mta/exim - !mail-mta/msmtp[mta] - !mail-mta/nullmailer - !mail-mta/opensmtpd - !mail-mta/postfix - !mail-mta/qmail-ldap - !mail-mta/netqmail - !mail-mta/sendmail - !mail-mta/ssmtp[mta] -" - -src_unpack() { - genqmail_src_unpack - - [[ ${PV} == "9999" ]] && git-r3_src_unpack - [[ ${PV} != "9999" ]] && default -} - -PATCHES=( - "${DISTDIR}/${QMAIL_LARGE_DNS}" -) - -src_prepare() { - if ! use vanilla; 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 - use highvolume && PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" ) - - if use qmail-spp; then - if use ssl; then - PATCHES+=( "${DISTDIR}/${PN}-1.08-tls-spp.patch" ) - else - PATCHES+=( "${DISTDIR}/${PN}-1.08-spp.patch" ) - fi - fi - fi - - default - - qmail_src_postunpack - - if ! use authcram; then - einfo "Disabled CRAM_MD5 support" - sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die - else - einfo "Enabled CRAM_MD5 support" - fi - - ht_fix_file Makefile* -} - -src_compile() { - qmail_src_compile NROFF=true - emake qmail-send.service - use qmail-spp && qmail_spp_src_compile -} - -src_install() { - qmail_src_install - systemd_dounit "${S}"/qmail-send.service -} - -src_test() { - emake test -} - -pkg_postinst() { - qmail_queue_setup - qmail_rootmail_fixup - qmail_tcprules_build - - qmail_config_notice - qmail_supervise_config_notice - elog - elog "If you are looking for documentation, check those links:" - elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail" - elog " -- qmail/vpopmail Virtual Mail Hosting System Guide" - elog "http://www.lifewithqmail.com/" - elog " -- Life with qmail" - elog -} - -pkg_preinst() { - qmail_tcprules_fixup -} - -pkg_config() { - # avoid some weird locale problems - export LC_ALL=C - - qmail_config_fast - qmail_tcprules_config - qmail_tcprules_build - - use ssl && qmail_ssl_generate -} diff --git a/mail-mta/notqmail/notqmail-1.08-r3.ebuild b/mail-mta/notqmail/notqmail-1.08-r3.ebuild new file mode 100644 index 000000000000..73025375ceda --- /dev/null +++ b/mail-mta/notqmail/notqmail-1.08-r3.ebuild @@ -0,0 +1,192 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +GENQMAIL_PV=20200817 +QMAIL_SPP_PV=0.42 + +QMAIL_TLS_PV=20200107 +QMAIL_TLS_F=notqmail-1.08-tls-${QMAIL_TLS_PV}.patch + +QMAIL_BIGTODO_F=notqmail-1.08-big-todo.patch + +QMAIL_LARGE_DNS="qmail-103.patch" + +inherit qmail systemd + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/notqmail/notqmail.git" + inherit git-r3 +else + KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" + SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz" +fi + +DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent" +HOMEPAGE=" + https://notqmail.org + https://cr.yp.to/qmail.html + http://qmail.org +" +SRC_URI="${SRC_URI} + https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F} + https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS} + !vanilla? ( + highvolume? ( + https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> ${QMAIL_BIGTODO_F} + ) + 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/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> ${QMAIL_TLS_F} + ) + !ssl? ( + https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> ${PN}-1.08-auth.patch + ) + ) +" + +LICENSE="public-domain" +SLOT="0" +IUSE="authcram gencertdaily highvolume libressl -pop3 qmail-spp ssl test vanilla" +REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl ) libressl? ( ssl )" +RESTRICT="!test? ( test )" + +DEPEND=" + net-dns/libidn2 + net-mail/queue-repair + sys-apps/gentoo-functions + ssl? ( + !libressl? ( >=dev-libs/openssl-1.1:0= ) + libressl? ( dev-libs/libressl:= ) + ) + test? ( dev-libs/check ) +" +RDEPEND="${DEPEND} + acct-group/nofiles + acct-group/qmail + acct-user/alias + acct-user/qmaild + acct-user/qmaill + acct-user/qmailp + acct-user/qmailq + acct-user/qmailr + acct-user/qmails + sys-apps/ucspi-tcp + virtual/checkpassword + virtual/daemontools + authcram? ( >=net-mail/cmd5checkpw-0.30 ) + ssl? ( + pop3? ( sys-apps/ucspi-ssl ) + ) + !mail-mta/courier + !mail-mta/esmtp + !mail-mta/exim + !mail-mta/msmtp[mta] + !mail-mta/nullmailer + !mail-mta/opensmtpd + !mail-mta/postfix + !mail-mta/qmail-ldap + !mail-mta/netqmail + !mail-mta/sendmail + !mail-mta/ssmtp[mta] +" + +src_unpack() { + genqmail_src_unpack + + [[ ${PV} == "9999" ]] && git-r3_src_unpack + [[ ${PV} != "9999" ]] && default +} + +PATCHES=( + "${DISTDIR}/${QMAIL_LARGE_DNS}" +) + +src_prepare() { + if ! use vanilla; 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 + use highvolume && PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" ) + + if use qmail-spp; then + if use ssl; then + PATCHES+=( "${DISTDIR}/${PN}-1.08-tls-spp.patch" ) + else + PATCHES+=( "${DISTDIR}/${PN}-1.08-spp.patch" ) + fi + fi + fi + + default + + qmail_src_postunpack + + if ! use authcram; then + einfo "Disabled CRAM_MD5 support" + sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die + else + einfo "Enabled CRAM_MD5 support" + fi + + ht_fix_file Makefile* +} + +src_compile() { + qmail_src_compile NROFF=true + emake qmail-send.service + use qmail-spp && qmail_spp_src_compile +} + +src_install() { + qmail_src_install + systemd_dounit "${S}"/qmail-send.service +} + +src_test() { + emake test +} + +pkg_postinst() { + qmail_queue_setup + qmail_rootmail_fixup + qmail_tcprules_build + + qmail_config_notice + qmail_supervise_config_notice + elog + elog "If you are looking for documentation, check those links:" + elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail" + elog " -- qmail/vpopmail Virtual Mail Hosting System Guide" + elog "http://www.lifewithqmail.com/" + elog " -- Life with qmail" + elog +} + +pkg_preinst() { + qmail_tcprules_fixup +} + +pkg_config() { + # avoid some weird locale problems + export LC_ALL=C + + qmail_config_fast + qmail_tcprules_config + qmail_tcprules_build + + use ssl && qmail_ssl_generate +} diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild index 393242d48caa..207bd50aa156 100644 --- a/mail-mta/notqmail/notqmail-9999.ebuild +++ b/mail-mta/notqmail/notqmail-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -GENQMAIL_PV=20191010 +GENQMAIL_PV=20200817 QMAIL_SPP_PV=0.42 QMAIL_TLS_PV=20200107 -- cgit v1.2.3-65-gdbad