gentoo resync : 14.12.2020

8 files changed, 157 insertions, 147 deletions

diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index b6270ef03979..5e1ee7e4ec3f 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -1,8 +1,9 @@
-AUX dbmail-imapd.initd 1543 BLAKE2B 2c657fa6db5b0c6eeecac392a9e54474d54b605ceb510ef8e9c637f9a25b0060e9c111307cc21515bd640503021e9c59841428ba90c5745ca114031972a073bc SHA512 31b7dcb5a1af0aa5a8244371a2f81619c2191a7755340768e1aad694fde7876e4ad7040d0758dafd0a332eefd24b790a83e8ba95f13fe5d1d2e09ef7551d41cc
-AUX dbmail-lmtpd.initd 1543 BLAKE2B 1f84b793603f3c6ebe55abb073dcc53cd6d27769cb01eb2033c151686774b047da442eaddc480333a2a6ed9c8f8928cdf545a4a6b6c810aa0d3e0ece748a7621 SHA512 c79f50c56538643b3203d238cc5ef6f4c407951ff3279ba15b695479f7667be8120ded07daa55c1d01409a2921d5579ffa47cd612cba08f558bc5ba84f5809b7
-AUX dbmail-pop3d.initd 1543 BLAKE2B e33d3d5612ad4739998b8cd55b1493ea0d77d5ca29cf30f72c70b4717016db816f8a5812562a8b754eb0eb7e6487ebf911d4ed7e5d35dfe9d15e6047da3b9552 SHA512 6b1d3f10caf0afb5d5e41e95055368f11c2864204eafa94d22c93ba9f765419e69bb5e9a03d497d1e9a00d0c6a31c823be1449590331d24d6eb02d1f194a4941
-AUX dbmail-timsieved.initd 1558 BLAKE2B 79990327315d5f61262f519f9236910fc1043cca49f0f1d7e388b0156cd1909c9fc64c99154aa5d1020696e9d47dc2f634f352d1fa501c47999420bdc8118b9b SHA512 e9192c17772e208e5a57e185d970b605941dcb2472347858d2da45493084e666840dd13a4ee7c74ffce8eca975116fb8d78b0474bfe022089c859dd54a6e139e
+AUX dbmail-3.2.3-fno-common.patch 310 BLAKE2B 1166b001939b200e43b2dd048413e55bd53c9c385f93b40e95ee8306d3386eb365ee30c7ba26c853cc81ca231fd4d4551886f6760697ed40e1cdefd5617ecef3 SHA512 32f2524fdf0e6bf59bc0138d2fb62edad00c6700740fc21281de29dd3b455136bde4072ccf5017425cd417c5408498b688ee453f53166aa80eccba20382d736d
+AUX dbmail-imapd.initd 1539 BLAKE2B a05e964172d58063b2fa4addb83c38bca5859e5a092b5672026a7c2641cc5edd63eb2c3b1cad2c8b7ba2ab15e7a7b812417fdec2e01531087b0a8a32bd929b62 SHA512 d7246dd7db8a6e85298cdcd191b525fcd76b3d7526f0c3ad084628651ce54d599fed3313693c8607c79d4ab79580a0bc30f6a0f9e5b814f30d5a4bd92719719d
+AUX dbmail-lmtpd.initd 1539 BLAKE2B 6864a82613a8ad4f0cd72322d1383086ebd9f17443ea6534c655e47ce4452cf013a150f3e137df432eb380fb0eb31f05ef0ad6a8c50a076020aefa0b49a9da58 SHA512 5497841698749158c78bf1ef365aabf642370a301bb74b334972ca95d85f16c508cd88d56a41c675f9ad448bc762b5134e09a408ca9d2f40d68abeb83b1ee7d8
+AUX dbmail-pop3d.initd 1539 BLAKE2B 9b74cb310b832bf3cd37bcbb6a25969221792d7694d711e98bfdcb0c9898ce8d68974bd9c221957c7915bc73dba89ac8887961af388c88d44ae1ce17337a0551 SHA512 5968a31db02d6e48adc5ec26527e2ce8fdd0abf78754b911bcb588fa3414598ef0b4dc2ef44220049b015aaa5b0efeaf2be2ff3171562ff82e46d36e2d32d59e
+AUX dbmail-timsieved.initd 1554 BLAKE2B b082e00fc491c768fda2afce07bc30c087a7bf927f8cb16e79d60609932fa09e1052acfd39526cb7fb256c5c44cbcdbe6ac94f59f3b12330fe6e51648fa2aae7 SHA512 2340916c1f6abb0ccfbc98f0cd91a042035c0ff6751bee944e6b9227c14bb829152f22763bc87244b6718e4c3df44de6892b1961923a54eef5724ba9befbc34b
 DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fcb01cb8100cfbd0464f1342f934c099ca52fd857e05fc82b97227155e9dcfc987d6c9b5c37e7daf21b167c9841 SHA512 29cc89830278f2ff28a4221fc81d4ff13cc371fbca7fb51d5376e9243234220b552cb4b6ec035c150e6cfa178435c4f36b9ce132fc02334bc6cdeb1a41c8ed85
 EBUILD dbmail-3.2.3-r1.ebuild 4680 BLAKE2B 97cf83e0334b3c9f595bdaf535b5033c2e98be7343631e3b6942d8ed83e540e77c03ca2aa60f1941ee6179dd51cf571554ec40bf9a969f28c920c2f3cf19fd34 SHA512 a6735361b215507ab298b9c7d1f701f10e90b9a6e79c5b73b7e0a4e11d630ddcd40de89d318359b0ad3cb84ebe270942290563b1b5dc87a60ede08a6da95f155
-EBUILD dbmail-3.2.3-r2.ebuild 4782 BLAKE2B d8f242f55ea4d9400e79d7d6c3ab3c8b91cb782b99c413c87358c53ad57edadb801fe71335ac7fbf14a7705972ae015b94ef8670f15a63ccbfa5a38f5efb95b2 SHA512 bc68b548a4ff3cfb0e10eac6da813fce88bf61a01854045797deac3e120384f3e08662fb0ade81bbe9bd70eb7b5c16d2262e84a726236dcd50f6068a4bf99717
+EBUILD dbmail-3.2.3-r3.ebuild 4002 BLAKE2B 0d922a30976d78f3d894bc5bd99a041b13fe64fdbe2a49d0f44787ec23abbbcd481524e8cfd14eff6e72c1a6926de6844d87cd0de0f047e97744c9d83e45615a SHA512 ab2fc9bd14893d0246109290c58df39174e45f5e47d9a6371b8c1ec054cfb2af2934291f1d1371f0c5b928ecfbc9b466f371c68437c48e9f75351c54b308409a
 MISC metadata.xml 570 BLAKE2B 5f2c04c5edfeba1166114d6b3d103abf9acd2bf312a359b4d25fc622b482b75b8660d2b3c48239a6cd8f87ed63bc591e9495346af944c8b853c74123ac67fb22 SHA512 b993fc2d7954a9afe0a5c53f84e3791a78c033abd64f3d279a54c34053bbe344ba4d0aa4456c9aca5ef9b2131db08698fecb717f5d7f130c501d659ec8fd59a8
diff --git a/net-mail/dbmail/dbmail-3.2.3-r2.ebuild b/net-mail/dbmail/dbmail-3.2.3-r2.ebuild
deleted file mode 100644
index 2875f819a206..000000000000
--- a/net-mail/dbmail/dbmail-3.2.3-r2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd versionator user
-
-DESCRIPTION="Fast and scalable sql based email services"
-HOMEPAGE="http://www.dbmail.org/"
-SRC_URI="http://www.dbmail.org/download/$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap libressl sieve ssl static"
-
-DEPEND="dev-db/libzdb
-	sieve? ( >=mail-filter/libsieve-2.2.1 )
-	ldap? ( >=net-nds/openldap-2.3.33 )
-	app-text/asciidoc
-	app-text/xmlto
-	app-crypt/mhash
-	sys-libs/zlib
-	dev-libs/gmime:2.6
-	>=dev-libs/glib-2.16
-	dev-libs/libevent
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup dbmail
-	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
-}
-
-src_configure() {
-	econf \
-		--enable-manpages \
-		--enable-systemd \
-		--sysconfdir=/etc/dbmail \
-		$(use_enable static) \
-		$(use_with sieve) \
-		$(use_with ldap auth-ldap)
-}
-
-src_install() {
-	emake DESTDIR="${D}" SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
-	DOCS=( AUTHORS README.md INSTALL THANKS UPGRADING )
-	einstalldocs
-
-	docompress -x /usr/share/doc/${PF}/sql
-	dodoc -r sql
-	dodoc -r test-scripts
-	dodoc -r contrib
-	## TODO: install other contrib stuff
-
-	sed -i -e "s:nobody:dbmail:" dbmail.conf || die
-	sed -i -e "s:nogroup:dbmail:" dbmail.conf || die
-	sed -i -e "s:/var/run:/run/dbmail:" dbmail.conf || die
-
-	insinto /etc/dbmail
-	newins dbmail.conf dbmail.conf.dist
-
-	# change config path to our default and use the conf.d and init.d files from the contrib dir
-	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail || die
-	#sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail || die
-	#sed -i -e "s:/var/run:/var/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail || die
-	#newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
-	#newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
-	# use custom init scripts until updated in upstream contrib
-	newinitd "${FILESDIR}/dbmail-imapd.initd" dbmail-imapd
-	newinitd "${FILESDIR}/dbmail-lmtpd.initd" dbmail-lmtpd
-	newinitd "${FILESDIR}/dbmail-pop3d.initd" dbmail-pop3d
-	newinitd "${FILESDIR}/dbmail-timsieved.initd" dbmail-timsieved
-	sed -i -e "s:/var/run:/run:" "${D}"/etc/init.d/dbmail-* || die
-
-	dobin contrib/mailbox2dbmail/mailbox2dbmail
-	doman contrib/mailbox2dbmail/mailbox2dbmail.1
-
-	# ldap schema
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/dbmail.schema"
-	fi
-
-	keepdir /var/lib/dbmail
-	fperms 750 /var/lib/dbmail
-	fowners dbmail:dbmail /var/lib/dbmail
-	# create this through init-scripts instead of at install time (bug #455002)
-	#keepdir /run/dbmail
-	#fowners dbmail:dbmail /run/dbmail
-}
-
-pkg_postinst() {
-	elog "Please read the INSTALL file in /usr/share/doc/${PF}/"
-	elog "for remaining instructions on setting up dbmail users and "
-	elog "for finishing configuration to connect to your MTA and "
-	elog "to connect to your db."
-	echo
-	elog "DBMail requires either SQLite, PostgreSQL or MySQL."
-	elog "Database schemes can be found in /usr/share/doc/${PF}/"
-	elog "You will also want to follow the installation instructions"
-	elog "on setting up the maintenance program to delete old messages."
-	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
-	echo
-	elog "For regular maintenance, add this to crontab:"
-	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
-	echo
-	elog "Please make sure to run etc-update."
-	elog "If you get an error message about plugins not found"
-	elog "please add the library_directory configuration switch to"
-	elog "dbmail.conf and set it to the correct path"
-	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
-	elog "A sample can be found in dbmail.conf.dist after etc-update."
-	echo
-	elog "We are now using the init script from upstream."
-	elog "Please edit /etc/conf.d/dbmail to set which services to start"
-	elog "and delete /etc/init.d/dbmail-* when you are done. (don't"
-	elog "forget to rc-update del dbmail-* first)"
-	echo
-	elog "Changed pid directory to /run/dbmail (see"
-	elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
-	echo
-	ewarn "The database config has changed to support libzdb db URI"
-	ewarn "Please check the documentation (or Bug #479664)"
-	echo
-	ewarn "The database schema has changed since 3.0.x make sure"
-	ewarn "to run the migration script"
-	echo
-	ewarn "Please be aware, that the single init-script for all services"
-	ewarn "has been replaced with seperate init scripts for the individual services."
-	ewarn "Make sure to add dbmail-(imapd|lmtpd|pop3d|timsieved) using rc-update"
-	ewarn "and remove dbmail if you want to take advantage of this change."
-	echo
-}
diff --git a/net-mail/dbmail/dbmail-3.2.3-r3.ebuild b/net-mail/dbmail/dbmail-3.2.3-r3.ebuild
new file mode 100644
index 000000000000..39d811d7e7c9
--- /dev/null
+++ b/net-mail/dbmail/dbmail-3.2.3-r3.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1 systemd
+
+DESCRIPTION="Fast and scalable sql based email services"
+HOMEPAGE="https://www.dbmail.org/"
+SRC_URI="https://github.com/dbmail/dbmail/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap libressl sieve ssl"
+
+RDEPEND="
+	acct-group/dbmail
+	acct-user/dbmail
+	app-text/asciidoc
+	app-crypt/mhash
+	app-text/xmlto
+	dev-db/libzdb
+	>=dev-libs/glib-2.16
+	dev-libs/gmime:2.6
+	dev-libs/libevent
+	sys-libs/zlib
+	ldap? ( >=net-nds/openldap-2.3.33 )
+	sieve? ( >=mail-filter/libsieve-2.2.1 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+DOC_CONTENTS="Please read the INSTALL file in /usr/share/doc/${PF}/
+for remaining instructions on setting up dbmail users and
+for finishing configuration to connect to your MTA and
+to connect to your db.
+DBMail requires either SQLite, PostgreSQL or MySQL.
+Database schemes can be found in /usr/share/doc/${PF}/
+You will also want to follow the installation instructions
+on setting up the maintenance program to delete old messages.
+Don't forget to edit /etc/dbmail/dbmail.conf as well.
+For regular maintenance, add this to crontab:
+0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1
+Please make sure to run etc-update.
+If you get an error message about plugins not found
+please add the library_directory configuration switch to
+dbmail.conf and set it to the correct path
+(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)
+A sample can be found in dbmail.conf.dist after etc-update.
+We are now using the init script from upstream.
+Please edit /etc/conf.d/dbmail to set which services to start
+and delete /etc/init.d/dbmail-* when you are done. (don't
+forget to rc-update del dbmail-* first)
+Changed pid directory to /run/dbmail (see
+http://www.dbmail.org/mantis/view.php?id=949 for details)
+The database config has changed to support libzdb db URI
+Please check the documentation (or Bug #479664)
+The database schema has changed since 3.0.x make sure
+to run the migration script
+Please be aware, that the single init-script for all services
+has been replaced with seperate init scripts for the individual services.
+Make sure to add dbmail-(imapd|lmtpd|pop3d|timsieved) using rc-update
+and remove dbmail if you want to take advantage of this change."
+
+src_prepare() {
+	default
+
+	# change config path to our default and use the conf.d and init.d files from the contrib dir
+	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail || die
+
+	sed -i \
+		-e "s:nobody:dbmail:" \
+		-e "s:nogroup:dbmail:" \
+		-e "s:/var/run:/run/dbmail:" \
+		dbmail.conf || die
+}
+
+src_configure() {
+	econf \
+		--enable-manpages \
+		--enable-systemd \
+		--sysconfdir=/etc/dbmail \
+		--disable-static \
+		$(use_with sieve) \
+		$(use_with ldap auth-ldap)
+}
+
+src_install() {
+	emake DESTDIR="${D}" SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
+	einstalldocs
+	dodoc UPGRADING
+
+	docompress -x /usr/share/doc/${PF}/sql
+	dodoc -r sql
+	dodoc -r test-scripts
+	dodoc -r contrib
+
+	insinto /etc/dbmail
+	newins dbmail.conf dbmail.conf.dist
+
+	# use custom init scripts until updated in upstream contrib
+	newinitd "${FILESDIR}/dbmail-imapd.initd" dbmail-imapd
+	newinitd "${FILESDIR}/dbmail-lmtpd.initd" dbmail-lmtpd
+	newinitd "${FILESDIR}/dbmail-pop3d.initd" dbmail-pop3d
+	newinitd "${FILESDIR}/dbmail-timsieved.initd" dbmail-timsieved
+
+	dobin contrib/mailbox2dbmail/mailbox2dbmail
+	doman contrib/mailbox2dbmail/mailbox2dbmail.1
+
+	# ldap schema
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins dbmail.schema
+	fi
+
+	keepdir /var/lib/dbmail
+	fperms 750 /var/lib/dbmail
+	fowners dbmail:dbmail /var/lib/dbmail
+
+	readme.gentoo_create_doc
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-mail/dbmail/files/dbmail-3.2.3-fno-common.patch b/net-mail/dbmail/files/dbmail-3.2.3-fno-common.patch
new file mode 100644
index 000000000000..3a6948bc0e39
--- /dev/null
+++ b/net-mail/dbmail/files/dbmail-3.2.3-fno-common.patch
@@ -0,0 +1,14 @@
+Taken from: https://github.com/dbmail/dbmail/pull/64
+Author: Chris Mayo <aklhfex@gmail.com>
+
+--- a/src/dm_tls.c
++++ b/src/dm_tls.c
+@@ -31,7 +31,7 @@
+ #define THIS_MODULE "tls"
+ 
+ 
+-SSL_CTX *tls_context;
++extern SSL_CTX *tls_context;
+ 
+ /* Create the initial SSL context structure */
+ SSL_CTX *tls_init(void) {
diff --git a/net-mail/dbmail/files/dbmail-imapd.initd b/net-mail/dbmail/files/dbmail-imapd.initd
index 9914f6a58bf3..f2e16dff1706 100644
--- a/net-mail/dbmail/files/dbmail-imapd.initd
+++ b/net-mail/dbmail/files/dbmail-imapd.initd
@@ -8,7 +8,7 @@
 PROGRAM=dbmail-imapd
 
 BIN_DIR=/usr/sbin
-PID_DIR=/var/run/dbmail
+PID_DIR=/run/dbmail
 PID=pid
 
 # Where is the dbmail.conf file located?
diff --git a/net-mail/dbmail/files/dbmail-lmtpd.initd b/net-mail/dbmail/files/dbmail-lmtpd.initd
index 68e41c34e247..7062098fb7b7 100644
--- a/net-mail/dbmail/files/dbmail-lmtpd.initd
+++ b/net-mail/dbmail/files/dbmail-lmtpd.initd
@@ -8,7 +8,7 @@
 PROGRAM=dbmail-lmtpd
 
 BIN_DIR=/usr/sbin
-PID_DIR=/var/run/dbmail
+PID_DIR=/run/dbmail
 PID=pid
 
 # Where is the dbmail.conf file located?
diff --git a/net-mail/dbmail/files/dbmail-pop3d.initd b/net-mail/dbmail/files/dbmail-pop3d.initd
index 6629a9a610af..156c030be37b 100644
--- a/net-mail/dbmail/files/dbmail-pop3d.initd
+++ b/net-mail/dbmail/files/dbmail-pop3d.initd
@@ -8,7 +8,7 @@
 PROGRAM=dbmail-pop3d
 
 BIN_DIR=/usr/sbin
-PID_DIR=/var/run/dbmail
+PID_DIR=/run/dbmail
 PID=pid
 
 # Where is the dbmail.conf file located?
diff --git a/net-mail/dbmail/files/dbmail-timsieved.initd b/net-mail/dbmail/files/dbmail-timsieved.initd
index fdd809c5485c..c5402bdf876e 100644
--- a/net-mail/dbmail/files/dbmail-timsieved.initd
+++ b/net-mail/dbmail/files/dbmail-timsieved.initd
@@ -8,7 +8,7 @@
 PROGRAM=dbmail-timsieved
 
 BIN_DIR=/usr/sbin
-PID_DIR=/var/run/dbmail
+PID_DIR=/run/dbmail
 PID=pid
 
 # Where is the dbmail.conf file located?