gentoo resync : 22.05.2021

3 files changed, 3 insertions, 254 deletions

diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index c0dfe411bd05..2257c354edfc 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -15,6 +15,5 @@ AUX vpopmail-double-free.patch 399 BLAKE2B ac2d7ad9b8b3e9cf25fbd973c7e42e48c1107
 AUX vpopmail-lazy.patch 323 BLAKE2B c35a878e2aa69a9ba0e108fdf4f0f8de85965588acc8d2c3fecb1d152e2f0e9585d78b9ce5b2314735de8b70710687e0a75358ef3029dd96eaa704941df00bd7 SHA512 794ef15920ac565073d871a946df53395afb0630d561343f4d164af3287d1665e115ad42d7a2218306cedb5dc795b10d9c15852b69fd649854ddb0c18dc0b2dd
 AUX vpopmail-vpgsql.patch 2668 BLAKE2B 0f69aa8642d15d740e0e5944a438854fde240831176ae2152cc805809e5a87ecd8ce5c6791f4c4e53d2027393d158e28e9dbec49d0efd7c4c2d50c9eeb4cf10d SHA512 9f02f9f9ab186791fe071ee5cb27334144727e81f0bbd6b8f5ce472368f892f5396a225c6c1af9d5b7a66bf66e7be50aef146d7635132fab9d91f265b68af1d9
 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab
-EBUILD vpopmail-5.4.33-r6.ebuild 7516 BLAKE2B 568a2f25393c132211dc351c7704c4767b272dbcf4ed7e90823b46e2bf5899d1fad283e3dabb352c85d648b9289da0c09c317eb48dba137df490f13db6b22c7e SHA512 6c31b1653290c10d3892c984c4b7bc287d771664914c11b0b07a024c92dfc93fe5454b4d4f3e8f27ba40ff1ddfb58fc9561a4cf9609ba6916b11badbceb9c523
-EBUILD vpopmail-5.4.33-r7.ebuild 7587 BLAKE2B e7ed4efe7efc7c12dfed3b16dd6dc93c6cb77aa4f771fb4ca8e2526c689240f5740a4eb689665ecd8ce5cf85b81fbd6c3be070bdfb933dfa0fff260697e17849 SHA512 dc8019fd250e05985762b26d87d1af4b333a331929a6706f9648d4a347cde48c3d4c274c621c8bc8125b7924a2515c50d01928e6cc04fa3294140ed213301c83
+EBUILD vpopmail-5.4.33-r7.ebuild 7581 BLAKE2B 902160dfa9cdcce24270508ada8a266f5304bd47af73655c10ac305d081860a2c750fdd2c73783d9b1e1bb75f0c3abd3d6bbcf58865ec275ad7be7cb98dbebde SHA512 380158bc3dfc7bf34d96e7f2438fc3d24ed5e288114607cabbc762639255ee154a1f9b4cca852a788fb11e58b06fb5c1b54812b2cec1c4b53cffd4eb5ae2e5e7
 MISC metadata.xml 828 BLAKE2B 4c54578d11e0a74817c10edd0ea3314aad1f53703367a4baa89f0c5b53a1b9df6753452db9e2da7f2fa2771b91713c40b02cf93535890671eaff8fcd12b11718 SHA512 43330581de8b5c94a5240f70a6f78117808c4b6deef386daf68d531cfaf3e29888ed1c3c70f0560d22a7569f0c29dce4eb9f63676528783a9cf6f7b275f2eb4a
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
deleted file mode 100644
index 73511f611bc7..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools fixheadtails qmail
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
-REQUIRED_USE="mysql? ( !postgres )"
-
-DEPEND="
-	acct-group/vpopmail
-	acct-user/vpopmail
-	virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( <dev-db/postgresql-9999:=[server] )
-	spamassassin? ( mail-filter/spamassassin )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	"${FILESDIR}"/${PN}-lazy.patch
-	"${FILESDIR}"/${PN}-vpgsql.patch
-	"${FILESDIR}"/${PN}-double-free.patch
-	"${FILESDIR}"/${PN}-5.4.33-vdelivermail-add-static.patch
-	"${FILESDIR}"/${PN}-5.4.33-fix-those-vfork-instances-that-do-more-than-exec.patch
-	"${FILESDIR}"/${PN}-5.4.33-remove-unneeded-forward-declaration.patch
-	"${FILESDIR}"/${PN}-5.4.33-clean-up-calling-maildrop.patch
-	"${FILESDIR}"/${PN}-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch
-	"${FILESDIR}"/${PN}-5.4.33-strncat.patch
-	"${FILESDIR}"/${PN}-5.4.33-unistd.patch
-	"${FILESDIR}"/${PN}-5.4.33-check-crypt-return-value-for-NULL.patch
-	"${FILESDIR}"/${PN}-5.4.33-use-proper-printf-format-strings.patch
-)
-DOCS=(
-	ChangeLog
-	doc/.
-)
-HTML_DOCS=(
-	doc_html/.
-	man_html/.
-)
-
-VPOP_HOME="/var/vpopmail"
-
-pkg_setup() {
-	upgradewarning
-}
-
-src_prepare() {
-	default
-
-	echo 'install-recursive: install-exec-am' \
-		>>"${S}"/Makefile.am || die
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	# automake/autoconf
-	mv "${S}"/configure.{in,ac} || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
-		configure.ac || die
-
-	# _FORTIFY_SOURCE
-	sed -i \
-		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
-		vlistlib.c || die
-
-	eautoreconf
-	ht_fix_file cdb/Makefile
-}
-
-src_configure() {
-	local -a authopts
-	if use mysql; then
-		incdir=$(mysql_config --variable=pkgincludedir || die)
-		libdir=$(mysql_config --variable=pkglibdir || die)
-		authopts+=( "--enable-auth-module=mysql"
-			"--enable-incdir=${incdir}"
-			"--enable-libdir=${libdir}"
-			"--enable-sql-logging"
-			"--enable-valias"
-			"--disable-mysql-replication"
-			"--enable-mysql-limits"
-		)
-	elif use postgres; then
-		libdir=$(pg_config --libdir || die)
-		incdir=$(pg_config --pkgincludedir || die)
-		authopts+=( "--enable-auth-module=pgsql"
-			"--enable-incdir=${incdir}"
-			"--enable-libdir=${libdir}"
-			"--enable-sql-logging"
-			"--enable-valias"
-		)
-	else
-		authopts+=( "--enable-auth-module=cdb" )
-	fi
-
-	econf ${authopts[@]} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
-		$(use_enable spamassassin)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into "${VPOP_HOME}"
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	mv doc/doc_html/ doc/man_html/ . || die
-	einstalldocs
-	rm -r "${D}/${VPOP_HOME}"/doc || die
-
-	# create /etc/vpopmail.conf
-	if use mysql; then
-		insinto /etc
-		newins "${D}${VPOP_HOME}"/etc/vpopmail.mysql vpopmail.conf
-		dosym ../../../etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
-
-		sed 's/^[^#]/# &/' -i "${D}"/etc/vpopmail.conf || die
-		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf || die
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
-		echo '# Write DB' >> "${D}"/etc/vpopmail.conf || die
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
-
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	insinto "${VPOP_HOME}"/etc
-	doins vusagec.conf
-	dosym .."${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
-	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf || die
-
-	einfo "Installing env.d entry"
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "  vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-		elog
-	fi
-
-	# do this for good measure
-	if [[ -e /etc/vpopmail.conf ]]; then
-		chmod 640 /etc/vpopmail.conf || die
-		chown root:vpopmail /etc/vpopmail.conf || die
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	if has_version "<=net-mail/vpopmail-5.2.1-r8"; then
-		ewarn
-		ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-		ewarn "The internal structure of the mail storage has changed for"
-		ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-		ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-		ewarn "to upgrade your system! (It can do conversions both ways)."
-		ewarn "You should be able to run it right away without any changes."
-		ewarn
-	fi
-
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-	elog
-
-	if use mysql; then
-		if has_version "<=net-mail/vpopmail-5.4.17"; then
-			elog
-			elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-			elog "MySQL tables, please see the UPGRADE file in the documentation!"
-			elog
-		fi
-	fi
-
-	ewarn
-	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
-	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
-	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
-	ewarn "Otherwise mail delivery WILL BREAK"
-	ewarn
-}
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
index ce3584c722a0..b5f30d5092db 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"