gentoo resync : 10.11.2019

3 files changed, 70 insertions, 3 deletions

diff --git a/net-mail/cmd5checkpw/Manifest b/net-mail/cmd5checkpw/Manifest
index 490d781c7e65..afded25afe7e 100644
--- a/net-mail/cmd5checkpw/Manifest
+++ b/net-mail/cmd5checkpw/Manifest
@@ -1,6 +1,8 @@
 AUX euid_030.diff 1107 BLAKE2B 558ad9c23f2e4c48b22b0ccf520537a6eaad28592105ede409b691bc8078645f2b7028730d1267e0951b1df54b35cf644ffe8655105ba7779cdd8274c2fea7a6 SHA512 648ded406e4818ba50597b010cedfae6436e3bbcf0c0e9a982b9656211fea7533dbc759434bade78f4df63e64231529ce4713bdf504244f3fe2e93c8bb5f995f
 AUX poppasswd 84 BLAKE2B 0388cd039e50beb308e8791c3b490ca305bb6288f5971ed624fea1d80a8be916aeb1f99059b42aaeb948a7a4614a7746a74e7904703a9eb7824e3e98c1a4c05e SHA512 74eb9764b4c9fd251e9bb408d3ace9bcc30f9d638963cd5f385ee6c2c839f1de51b7f55c81d5e0111b568a308eea08185c8bcc965decf36a963b78bf4aea8671
 AUX reloc.diff 2330 BLAKE2B bee7735ac6f8d5039bd0c87056ae3fbaf100118d3292297dce311faff1fb0555d5b08543a9ce79347f953bfeef5c6b6585edd5474c538a2323d3e47048444b26 SHA512 e18cab4bb02b2bac945d1857f70d6f5faa2296205f09c228d87d16dffb43de129a59ef0054dd6c54f1db7448b47f46a385dc81ffe769dc87d182d81031920369
+DIST cmd5checkpw-0.30.tar.gz 25812 BLAKE2B d1ef48edd2ff0d88823656915a04a8f0893840a49022ed977c6d178cf70d179c44504512ad44d94ae33d48e523ae8cb98ff7b87357b6c8deee761ae9df163bc5 SHA512 c54792769097ac7e8a11c6a140a9eefdb090bad4a0336be9543549a232e4faa72f08baea7e746b9743e01ce40c0f7402f4584c53b5eedb3f2d1e457d1c8a45d5
 DIST cmd5checkpw-030_tgz.bin 25812 BLAKE2B d1ef48edd2ff0d88823656915a04a8f0893840a49022ed977c6d178cf70d179c44504512ad44d94ae33d48e523ae8cb98ff7b87357b6c8deee761ae9df163bc5 SHA512 c54792769097ac7e8a11c6a140a9eefdb090bad4a0336be9543549a232e4faa72f08baea7e746b9743e01ce40c0f7402f4584c53b5eedb3f2d1e457d1c8a45d5
-EBUILD cmd5checkpw-0.30-r1.ebuild 1681 BLAKE2B 05e02a28616bab7b30e6c0d3ea9c666c4bee8a7f6a211274b4d4a8d677893d70847f750b3a46be9d27104efe06571a308b45d37246d4f69201ffec15c9ef46a2 SHA512 c0cc5a4c0d9f5d41cf94855bba5c9c39986879d84a37d9a084c980f5fcbdae432d7a38f67a24e20418590a6f39db315c3c8f5657f59de4540e177db1f59f6ef2
+EBUILD cmd5checkpw-0.30-r1.ebuild 1683 BLAKE2B c14b9ee36f4c5be4eab365975648f0e2286e028c64862c917d8ba18805645104f6102f0853200a5b3ad3fb7905c264054a41573dafbe6c748005844e72a57674 SHA512 46834f85d4131762e680c3743680516ac3d832f60cd8dfaa69318221eebc912a4072241d98e62f76a70af8eb94ca96819229e468a633d34ed735bd9d6efe54ea
+EBUILD cmd5checkpw-0.30-r2.ebuild 1480 BLAKE2B a58f49cd3c7c30f5af0b7899f2f6237b395fdeda13c5b62a17376ff4ecbe1a936ddce3a693913dadd49a0bf36a4d7dbd26c2ac116c039f152d427a7f9bfdec63 SHA512 3c173271e13db3cf9709feb1c6b3023a8ea71662e2ea7fd31f80f9a4eaf5486d04f71c16c3dd7a2a500148aa7ecf52fa78058a44e257bf56b807d31f6210efc4
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
index 69b9d8a9a79b..a2ac986f5a2e 100644
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
@@ -8,8 +8,8 @@ inherit eutils fixheadtails user
 MY_VER="030"
 
 DESCRIPTION="A checkpassword compatible authentication program that used CRAM-MD5 authentication mode"
-SRC_URI="http://www.fehcom.de/qmail/auth/${PN}-${MY_VER}_tgz.bin"
-HOMEPAGE="http://www.fehcom.de/qmail/smtpauth.html"
+SRC_URI="https://www.fehcom.de/qmail/auth/${PN}-${MY_VER}_tgz.bin"
+HOMEPAGE="https://www.fehcom.de/qmail/smtpauth.html"
 
 LICENSE="public-domain RSA"
 SLOT="0"
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
new file mode 100644
index 000000000000..3a0b96995a45
--- /dev/null
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fixheadtails
+
+MY_VER=$(ver_rs 1- "")
+
+DESCRIPTION="A checkpassword compatible authentication program that used CRAM-MD5 authentication mode"
+SRC_URI="https://www.fehcom.de/qmail/auth/${PN}-${MY_VER}_tgz.bin -> ${P}.tar.gz"
+HOMEPAGE="https://www.fehcom.de/qmail/smtpauth.html"
+
+LICENSE="public-domain RSA"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="acct-user/cmd5checkpw"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if has_version "<net-mail/cmd5checkpw-0.30"; then
+		ewarn
+		ewarn "this version is in NO WAY COMPATIBLE with cmd5checkpw-0.2x"
+		ewarn "it actually receives the authentication credentials"
+		ewarn "in a different order then the old implementation"
+		ewarn "see bug #100693 for details"
+		ewarn "this version IS needed by >=qmail-1.03-r16"
+		ewarn
+	fi
+}
+
+PATCHES=(
+	"${FILESDIR}"/euid_${MY_VER}.diff
+	"${FILESDIR}"/reloc.diff
+)
+
+src_prepare() {
+	default
+
+	ht_fix_file Makefile
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -o cmd5checkpw"
+}
+
+src_install() {
+	insinto /etc
+	insopts -m 400 -o cmd5checkpw
+	doins "${FILESDIR}"/poppasswd
+
+	exeinto /usr/bin
+	exeopts -o cmd5checkpw -m 4755
+	doexe cmd5checkpw
+
+	doman cmd5checkpw.8
+	einstalldocs
+}
+
+pkg_postinst() {
+	chmod 400 "${EROOT}"/etc/poppasswd || die
+	chown cmd5checkpw "${EROOT}"/etc/poppasswd || die
+}