diff --git a/mail-mta/netqmail/metadata.xml b/mail-mta/netqmail/metadata.xml index 820d3ed012224..ca38d08ccf205 100644 --- a/mail-mta/netqmail/metadata.xml +++ b/mail-mta/netqmail/metadata.xml @@ -10,7 +10,6 @@ Proxy Maintainers - Enable AUTHCRAM support Generate SSL certificates daily instead of hourly Prepare netqmail for high volume servers diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild b/mail-mta/netqmail/netqmail-1.06-r14.ebuild index f779b272749f1..70a541a281a1e 100644 --- a/mail-mta/netqmail/netqmail-1.06-r14.ebuild +++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild @@ -41,7 +41,7 @@ SRC_URI="http://qmail.org/${P}.tar.gz LICENSE="public-domain" SLOT="0" KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc64 ~s390 sparc x86" -IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla" +IUSE="gencertdaily highvolume pop3 qmail-spp ssl vanilla" REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )" RESTRICT="test" @@ -65,7 +65,6 @@ RDEPEND="${DEPEND} sys-apps/ucspi-tcp virtual/checkpassword virtual/daemontools - authcram? ( >=net-mail/cmd5checkpw-0.30 ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim @@ -134,12 +133,8 @@ src_prepare() { 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 + einfo "Disabled CRAM_MD5 support" + sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die ht_fix_file Makefile* } diff --git a/mail-mta/netqmail/netqmail-1.06-r16.ebuild b/mail-mta/netqmail/netqmail-1.06-r16.ebuild index ba4d2c5d1026e..97130b5fa0e5c 100644 --- a/mail-mta/netqmail/netqmail-1.06-r16.ebuild +++ b/mail-mta/netqmail/netqmail-1.06-r16.ebuild @@ -41,7 +41,7 @@ SRC_URI="http://qmail.org/${P}.tar.gz LICENSE="public-domain" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~s390 ~sparc ~x86" -IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla" +IUSE="gencertdaily highvolume pop3 qmail-spp ssl vanilla" REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )" RESTRICT="test" @@ -63,7 +63,6 @@ DEPEND=" " RDEPEND="${DEPEND} sys-apps/ucspi-tcp - authcram? ( >=net-mail/cmd5checkpw-0.30 ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim @@ -135,12 +134,8 @@ src_prepare() { 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 + einfo "Disabled CRAM_MD5 support" + sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die ht_fix_file Makefile* } diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 2ee6ff976613f..fd25e0163eb26 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -341,10 +341,6 @@ net-libs/gssdp man # Needs long-EOL dev-lang/spidermonkey:60 (which also needs python:2.7). media-libs/coin javascript -# Michał Górny (2022-11-19) -# Requires packages masked for removal. -mail-mta/netqmail authcram - # Matt Turner (2022-11-16) # gnome-music and gnome-photos have not been ported to libsoup:3.0, while # other non-slotted dependencies have been.