gentoo auto-resync : 08:06:2023 - 21:46:30

7 files changed, 116 insertions, 20 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index c3a0144869b7..6f33b8763222 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index 0293572b7211..01970013dfe1 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -1,11 +1,13 @@
 AUX README.gentoo 1652 BLAKE2B beb9d27ac8de471d4ac8a3c4f626e7005d471477943b424b2603fe9ec92a6910bf0102c472e2d17dc1217d4bd6c286cd50da5d9b5fc6bd23c436cec8c0a84afd SHA512 0af8a295ce85260ca559f6491e8b7e318125b4f424639877a5744d0906023ccbd63c18b59f7fdb60da7994df9c3f62cef10a5db0ee940aa12c2382e33340f0a2
 AUX dbmail-3.2.3-fno-common.patch 310 BLAKE2B 1166b001939b200e43b2dd048413e55bd53c9c385f93b40e95ee8306d3386eb365ee30c7ba26c853cc81ca231fd4d4551886f6760697ed40e1cdefd5617ecef3 SHA512 32f2524fdf0e6bf59bc0138d2fb62edad00c6700740fc21281de29dd3b455136bde4072ccf5017425cd417c5408498b688ee453f53166aa80eccba20382d736d
-AUX dbmail-imapd.initd 867 BLAKE2B 4b9c20f1bc99f13b8c133eee63e78e213debb206bde0f35e361edfe9b6068d1e0c97aad95e1d1743caa554d22fb23f6ebb2fc15adfb093ea9947262cb90d2ba5 SHA512 40fb4197f54c9890884a8b15c56f9eb4ff4d74eca114d678abea156fe9bc404b0860b79da7f4e3cc5d26d0d96dcee91049c28698b5496a3d2e6b7d409bcc9cbd
-AUX dbmail-lmtpd.initd 867 BLAKE2B d8829e2b7856d0ccfe6e52aceae59a0811aac70759e4f5f9998e3ed714b235aa0ec3bfa775d3a01ee8b49336f6e20e5fb3eae675d8389fff1862db56f7ed8a0d SHA512 4ced920476580ecfa968c4b0a438b98063aa55a108c2b27b728e76d4c08b58ba5e3295256b5e66f16edd7d247acd2f8bf91262dd49c0a8058dd6132e0473c641
-AUX dbmail-pop3d.initd 867 BLAKE2B 2d24bbe482c28fab0884377bbd47fe7a859313d8c8b20a939692c12942e8dd313067a0304016c8293c5ccce876bbeb533e4bbacfe04f893959821791d7b4d6dd SHA512 e12d73d56fae8852a9926badcb00ae4d83a990d700741bc8ad238bfa302a9f58087efb6e59ee3925230fa001be3004f48fe61e7b17d09cad51a836edc7a15bb2
-AUX dbmail-timsieved.initd 930 BLAKE2B 4eb24e608540d994d75c8aea44aa8128e603fd9c64c4a8205c9581cc521e4a0ca75391796d4a9b369cdcbe74636cdaf55c00408c14b7cc9ec4ad4db307445909 SHA512 7f66fa4b77a638e803f1763809da66bd26f54b435f8e4cff3304d4b4e62d1510485c1af943046489a8c37b3b93a8b6cf4901feefa9f1f38dcdaa313211f19fa0
+AUX dbmail-imapd.initd 865 BLAKE2B 91559b221dca0efb06c14c3b3b4f4fdeb40125694319c69610f56c0db44f33d4d173c21b1ac84961f57b5dc232d0e4be7c711cde667f52e3dae68abc75b05341 SHA512 e41e86a332d8862ea52b8884fc855985ba78ca060114943db70c4fe085f327fe160d8c41a8c4c1126f887d5250cc65ee2756d8e85e4d63a9bbc9dd307f2678a9
+AUX dbmail-lmtpd.initd 865 BLAKE2B ad7b7aa8257bb7eaf221c73fdaf76b0e1d57c3156511ce7666f9211a8a3f04be2723003bcfbad109a033ba647905381f028105b9cf0f05b386ed3c808aeda7ce SHA512 ae6e83cda8e19b6e995783008732b6b005ae6732238d73dad784a1eb28ebdc542bddcec2cad48570231c535db5325983afaef2387a4bbd067030157694453d86
+AUX dbmail-pop3d.initd 865 BLAKE2B ec5469bd57f8f2fff498999bf655923d2554f7142957da538f7951fbf8279a560234502b9fe42a4e26db23033875244bb5c80686bf9cdfd1759ca4a2ad3936a8 SHA512 bbdde37c66269b0e1815e6e80551f043f703884424cdebe8f04238e377292478dd4981c86c08a2a30ab1d458d10bc50ffd415ddd94062d725e13a2ac4bb1665e
+AUX dbmail-timsieved.initd 928 BLAKE2B 821d60be820e8a89887cd95c3fe2d35b02f4db184ea5c1e92fc4f6c68a54c89cfcf72e05a1859228ebd47af5ce7ba5bfe2d9abd61e70166d9383bfa9f1d8afe2 SHA512 68c3ffe47410b335f665578ee6be7259089650e0132329793dc286264e7a0c367e9d8474fd7097bc99ec8556ea59433dce804b8f48bdaecb7d1aae1de61655f7
 DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fcb01cb8100cfbd0464f1342f934c099ca52fd857e05fc82b97227155e9dcfc987d6c9b5c37e7daf21b167c9841 SHA512 29cc89830278f2ff28a4221fc81d4ff13cc371fbca7fb51d5376e9243234220b552cb4b6ec035c150e6cfa178435c4f36b9ce132fc02334bc6cdeb1a41c8ed85
 DIST dbmail-3.2.5.tar.gz 2463966 BLAKE2B f4099c6f869dbb041d7eccdf20f3a34d36918237cc0386c71a1d339da8651b9301e676b25201856038045bb9590f880353c6ccafd57330f9cf48382c1b4c603c SHA512 6b0d7e1f6f7449869db1e094ffce9e1ef315c60784ea5ae5f814f2cf9a18c358b4c5d107a420c7317961ffa343fc59c9083789177514aee96523927688f276a0
+DIST dbmail-3.3.1.tar.gz 2523029 BLAKE2B fd7bd7b6a40772c8c309b2bc9cf3cd907a8b885367fe6b1c23bdd1f4d6281b7f8878caf481171ec4ad71f2644f516100da5c6ee7dfa0d4d7139725a3181a8ef5 SHA512 d0324d79d4871cc46ce3bbc5c0d8c2f587d57f262a878f685b776d8e1b4a58a67e5a0f0cf0f48c939dc3424f8a44dd78e929ea2588ab10d0246a10b3ee5c55c5
 EBUILD dbmail-3.2.3-r5.ebuild 4005 BLAKE2B f39773fa94f3af0d031a8fa7c7666aa91ac9de95a55314b8e82356168f2896264cd4fe15aaeca2311a0e981cc1aafb3d792d07a1d8bb9feb536000ab608488cb SHA512 92379e527e1215bf40c3c16db02a25977d680c638dc7fba5ec074c0a0b24a7d8ec3a39acaae1cf5566f646bb6272b4e88ab9780e36d8e510a457bc04c2c8fab0
 EBUILD dbmail-3.2.5-r2.ebuild 2492 BLAKE2B de0e331eed68d1a5c5b75f393e5a9571b49b73a8eccd095d7af67b7edf2503da0e528e38ad586ab9ce285f70646d464cd05521d72388c994d587ea7ec73414cd SHA512 50522c2f81760878f374c7a91a98c50ecb0f77f58fdee9249f45d4c6a90ccf0f1d94a1a7eae31c680a938341dcbcc2225adb099853f88f23620c21f7fc77d026
+EBUILD dbmail-3.3.1.ebuild 2492 BLAKE2B dff01115e899b6f5ced89c908771c8f5af00a64aa06e871f37e82cf9d8d6b88c2100ac5d7e9405fef9130995778576d21652a889b0f3342e7597b99d8d8e5d0a SHA512 1c62f36cb59f8b275b251a2685bfdbd51a123bba0b9db2b247c23a37afd8fcc4cc1c6093f3743e37f984fc4828cc0c38adf6ad1fbc1697ec471c03f5c2a64393
 MISC metadata.xml 571 BLAKE2B 68a2a0a6d1b2cb2837c7589125f4895269d60588760a43d7b275619b5e7a01cd4625f754da41a7a377673d09ae097f53144d62c451a316a5cf1f786ee18ac74e SHA512 b3e72b2de1aa541129542f907b0a3b332402bd7f3d5d1029c36769834eae1e9e5f67fdedc40d024630d93fe766c5f346eb7e6e366b443a82a8a5bc12f1ace7e6
diff --git a/net-mail/dbmail/dbmail-3.3.1.ebuild b/net-mail/dbmail/dbmail-3.3.1.ebuild
new file mode 100644
index 000000000000..21017546539e
--- /dev/null
+++ b/net-mail/dbmail/dbmail-3.3.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd readme.gentoo-r1
+
+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="+doc jemalloc ldap sieve ssl static systemd"
+
+DEPEND="dev-db/libzdb
+	sieve? ( >=mail-filter/libsieve-2.2.1 )
+	ldap? ( >=net-nds/openldap-2.3.33:= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	elibc_musl? ( sys-libs/queue-standalone )
+	app-text/asciidoc
+	app-text/xmlto
+	app-crypt/mhash
+	sys-libs/zlib
+	dev-libs/gmime:3.0
+	>=dev-libs/glib-2.16
+	dev-libs/libevent:=
+	virtual/libcrypt:=
+	ssl? (
+		dev-libs/openssl:=
+	)"
+RDEPEND="${DEPEND}
+	acct-group/dbmail
+	acct-user/dbmail"
+DEPEND+=" elibc_musl? ( sys-libs/queue-standalone )"
+DOCS=( AUTHORS README.md INSTALL THANKS UPGRADING )
+
+README_GENTOO_SUFFIX=""
+
+src_prepare() {
+	sed -i -e "s:nobody:dbmail: ; s:nogroup:dbmail: ; s:/var/run:/run/dbmail:" dbmail.conf || die
+	# 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
+
+	default
+}
+
+src_configure() {
+	econf \
+		--enable-manpages \
+		--sysconfdir=/etc/dbmail \
+		$(use_enable doc manpages) \
+		$(use_enable static) \
+		$(use_enable systemd) \
+		$(use_with jemalloc) \
+		$(use_with sieve) \
+		$(use_with ldap auth-ldap)
+}
+
+src_install() {
+	emake DESTDIR="${D}" SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
+	einstalldocs
+
+	docompress -x /usr/share/doc/${PF}/sql
+	dodoc -r sql
+	dodoc -r test-scripts
+	dodoc -r contrib
+	## TODO: install other contrib stuff
+
+	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 "${S}/dbmail.schema"
+	fi
+
+	keepdir /var/lib/dbmail
+	fperms 750 /var/lib/dbmail
+	fowners dbmail:dbmail /var/lib/dbmail
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-mail/dbmail/files/dbmail-imapd.initd b/net-mail/dbmail/files/dbmail-imapd.initd
index c2925f9ecb0e..6243ab25bf69 100644
--- a/net-mail/dbmail/files/dbmail-imapd.initd
+++ b/net-mail/dbmail/files/dbmail-imapd.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 #
 
 BIN_DIR=/usr/sbin
@@ -37,12 +37,11 @@ start() {
 		--name dbmail-imapd \
 		-- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1
 	eend $?
-}	
+}
 
 stop() {
 	ebegin "Stopping DBMail IMAP daemon"
 	    start-stop-daemon --stop --quiet --retry 5 \
 		--pidfile ${PIDFILE}
 	eend $?
-}	
-
+}
diff --git a/net-mail/dbmail/files/dbmail-lmtpd.initd b/net-mail/dbmail/files/dbmail-lmtpd.initd
index 083d0e6b8a8c..fab6a7734376 100644
--- a/net-mail/dbmail/files/dbmail-lmtpd.initd
+++ b/net-mail/dbmail/files/dbmail-lmtpd.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 #
 
 BIN_DIR=/usr/sbin
@@ -37,12 +37,11 @@ start() {
 		--name dbmail-lmtpd \
 		-- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1
 	eend $?
-}	
+}
 
 stop() {
 	ebegin "Stopping DBMail LMTP daemon"
 	    start-stop-daemon --stop --quiet --retry 5 \
 		--pidfile ${PIDFILE}
 	eend $?
-}	
-
+}
diff --git a/net-mail/dbmail/files/dbmail-pop3d.initd b/net-mail/dbmail/files/dbmail-pop3d.initd
index 16c4d371f2ec..a091b5cf357d 100644
--- a/net-mail/dbmail/files/dbmail-pop3d.initd
+++ b/net-mail/dbmail/files/dbmail-pop3d.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 #
 
 BIN_DIR=/usr/sbin
@@ -37,12 +37,11 @@ start() {
 		--name dbmail-pop3d \
 		-- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1
 	eend $?
-}	
+}
 
 stop() {
 	ebegin "Stopping DBMail POP3 daemon"
 	    start-stop-daemon --stop --quiet --retry 5 \
 		--pidfile ${PIDFILE}
 	eend $?
-}	
-
+}
diff --git a/net-mail/dbmail/files/dbmail-timsieved.initd b/net-mail/dbmail/files/dbmail-timsieved.initd
index 657bfd586663..652641e6639b 100644
--- a/net-mail/dbmail/files/dbmail-timsieved.initd
+++ b/net-mail/dbmail/files/dbmail-timsieved.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 #
 # chkconfig: - 91 35
 # description: Starts and stops dbmail-timsieved
@@ -40,12 +40,11 @@ start() {
 		--exec /usr/sbin/dbmail-timsieved \
 		-- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1
 	eend $?
-}	
+}
 
 stop() {
 	ebegin "Stopping DBMail SIEVE daemon"
 	    start-stop-daemon --stop --quiet --retry 5 \
 		--pidfile ${PIDFILE}
 	eend $?
-}	
-
+}