Modernize Bongo overlay packages

.gitignore

@@ -0,0 +1 @@
+/metadata/md5-cache/

dev-libs/log4c/Manifest

@@ -1,5 +1,6 @@
-AUX log4c-socket.patch 35592 BLAKE2B 1c0cc7e1bbabd34a02fcbc7da6317772a37394219754fb2b25fdafa427c7c0c6e40c1f60ef955fd047f17f5bf95ea9fde4794ece4e8e1f9d4415f37f2a6a3f8f SHA512 54c86d315c5ee49162a876b137c807d4c07c1af9e0ef11f26187bfece0dcb6f6281dcd09701cc4da9b03d357d6fbe85831fb56fd43b5adf9e71736a1a37ffa0f
+AUX log4c-1.2.4-format-security.patch 387 BLAKE2B f37945c5a59f05dc142cb288ad412918d58f6624ef4345832fb7a41eae54185f2d72280574418c333dde02288c1e23d6f8ce7502b05b34ea063cc47b0a29b76d SHA512 8ef8eb5a3ad7ac193f89018f6be3f371d655607685a59d05c31e64eb7be89f422dfc73e027050c8252dc0d0ec9fcdbb93b1e6b2e5ac777ba0e64bb9e9e9987b4
+AUX log4c-socket.patch.gz 8775 BLAKE2B 4e12dee2c27ac09dbf03a1bbfea7595430062e4e8f9db2b98e2fdae418f40cfc9af9f881ac61f2f65e8edf29268915b1442acef43bbaf1ee33d792e47a9e57c0 SHA512 4e017956a95813a0ab2bd4cce35a167b302490b595958d146a8c2be185c26d57e9143d1d290195c1bd94dd35a8a585b175d8bcae4065fd11dba904a469b47a87
 DIST log4c-1.2.4.tar.gz 559789 BLAKE2B a685fafb8ac117f47063e77bdbef09d187da464daa9eac7df726d9f65e225b45205ff5ac118e9466a682866d920afadc635192ee14a8fa8598fb7d7f6da6d33f SHA512 bd66029183b545de6b46b803e128735c5b57af0ca7f8a0a1f1655565920778993362e3187ffbe9b4b5e85dbf4c700b7d1f1dd4d1a636bcb20bfdb71fc73d37ca
-EBUILD log4c-1.2.4.ebuild 1135 BLAKE2B bdb04ea5b99d911c3e64ee596fd704904add3c5faa42815b1bd912e3a248e51375b229641764c00e5b5bdcb63fcee8e9a9acc5c8393563149811480464df9002 SHA512 247da22d52e22cc0f9c9a930dc5798fe675a6ae668bbc6bdf97ff227c41d23830fc033a0265851eb9fd804c2aa555044ab480a07433ba45c562cf1608e3090e5
+EBUILD log4c-1.2.4.ebuild 1221 BLAKE2B 0137a8b22924aebd754aaea57a230c2ba1a33d0a77bb560b96f881dd0f29c54293732952ba08652af5f8d4f8277aa21ebfedb781c81e59704d7fc1c78cac5202 SHA512 d5b72f87fbecab42009616e96941ae4a10e67f50d7e49da629150c2ec092d636861dc0a66b6a3f1ed8f4f61dcbe993801dd22131358104527dcf7a6c2cc8fb12
 MISC ChangeLog 817 BLAKE2B 18d6a96421609a21169fbe2a4d6737d73140a629dfdd0a36805e474263bbaad77c7c9e2b47811184f0b5da2ed4f0a3de577b0ef5e0fbc3a634457ec6866847c4 SHA512 f6e0caebf861e601eb2b5c503d651a63869f5e862881a026da8cc5ebeb6c06c4ec38d3cd754585523a9ff50ff03b2dde2907a2648c9cf69104735b388b260758
-MISC metadata.xml 505 BLAKE2B a834408238278fda83342c87452757e76f4f50ea72d7aae5ddb2577023992d0a985cdac6f3eea35b687124a83528fccce832a688c688c8f1424605476a39ddc4 SHA512 1140257ff2eaa385c9831c68b4668385767d762917f006d06cc4e9db72e6c6f9e05177dab405fa525352c1c6428733ce113f13887c0f939dc91e62e27b910ca0
+MISC metadata.xml 576 BLAKE2B 9ae985003c9829d49b46f0e18ba6ab4776c0a30bef6a7438e1e29e39675f1ba3a51d411b8b3c70e7c121acaeabee4bc74253385c4c0adb7e52556d8254e41dbf SHA512 f5941ba1c31c05ef29b392256502d2b9272363e3fad0862fa5dedc03aea394ef87c022f84871699dca33c2414dc8f121af741b39429d790dcd9c5d188b02c574

dev-libs/log4c/files/log4c-1.2.4-format-security.patch

@@ -0,0 +1,13 @@
+--- a/examples/helloworld1/mylog.h
++++ b/examples/helloworld1/mylog.h
+@@ -39,9 +39,9 @@
+ 
+ static LOG4C_INLINE void mylog_msg(char *catName,int a_priority, char *msg){
+ #ifndef WITHOUT_LOG4C
+-	log4c_category_log(log4c_category_get(catName), a_priority, msg);
++	log4c_category_log(log4c_category_get(catName), a_priority, "%s", msg);
+ #else
+-	printf(msg);
++	printf("%s", msg);
+ #endif
+ }

dev-libs/log4c/log4c-1.2.4.ebuild

@@ -5,9 +5,9 @@ EAPI=8
 
 inherit autotools
 
-DESCRIPTION="Log4c is a library of C for flexible logging to files, syslog and other destinations"
-HOMEPAGE="http://log4c.sourceforge.net/"
-SRC_URI="mirror://sourceforge/log4c/${P}.tar.gz"
+DESCRIPTION="C library for flexible logging to files, syslog, and other destinations"
+HOMEPAGE="https://log4c.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/log4c/log4c/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -18,13 +18,13 @@ RDEPEND="media-gfx/graphviz
 	expat? ( dev-libs/expat )"
 
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+	doc? ( app-text/doxygen )"
 
-
-rc_prepare() {
-eapply ${FILESDIR}/log4c-socket.patch
-eautoreconf
-eapply_user
+src_prepare() {
+	eapply "${FILESDIR}/log4c-socket.patch.gz"
+	eapply "${FILESDIR}/log4c-1.2.4-format-security.patch"
+	eautoreconf
+	eapply_user
 }
 
 src_configure() {

dev-libs/log4c/metadata.xml

@@ -12,4 +12,7 @@
 <use>
 <flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
 </use>
+<upstream>
+<remote-id type="sourceforge">log4c</remote-id>
+</upstream>
 </pkgmetadata>

mail-mta/bongo/Manifest

@@ -5,11 +5,12 @@ AUX bongo-FORTIFY-1.patch 781 BLAKE2B 86103298bdb604509b454f66121745aa61c22a6df7
 AUX bongo-arm-asm-1.patch 1425 BLAKE2B 84940dad7b9e9d36b132f436bdfe5cc4aea18cd5d9ce05da5742201199f3f7546b79ef8323fcd8669798c738bfb656629621d1c17e86b83206e274645a8496f7 SHA512 4c55332ab5881278f4b7e9220696d0c780bcd0af8ac14cdbcba66e1e4a516e1344c60df69486fd7224d6c5a2e6298e3c692e21dc5ed9491af137316567366df4
 AUX bongo-gentoo-1.patch 809 BLAKE2B facc54604f439e991998795a229e34c3ed3004c6aa31bf8af7ce7724ae3974117a25e5444c11258c59b75eefddd06756a55f9e248375bcdf2f828b739482e7d5 SHA512 939a0abc64e741d86e805a9011721bac05425a4446216bdfb89841d15da17501699f99254ff11a1db34280baf44449653b834349798a2e4d0ecd489b795830e6
 AUX bongo-return_value-1.patch 1061 BLAKE2B 842f74e4415189fdd37765681eb23d4d026a5dc5b194daaed6124d3c50f37f5a6980f4b8484cc6e3abe290dbb8dfbeb3dd82aab9824dfe682c31f9dcb07761b7 SHA512 ce92f5dbc27e78c9dac992222b111072d160ca6652e03a435acaeedb1ab2cb2484e11f32ef160b326521734a61fd4e0406ff3e7be26ea4e174973cc44359d7ec
+AUX bongo-security-hardening.patch 2198 BLAKE2B 716d4c65c8bd793b625af62c715efc49a23520805588b1bea887cbb6159e44081f3d825fb482b5474dd42a304ed35c0dc191eec6946fab7bcfd05bb6f847f855 SHA512 fb651e20dba5ada4baf27bb005ab040b47d2b5b4df2a7c847b50be335480e465b9a576226bac7fe1a2b35f305f05285f709271531ee3f49ecf0114cbdbdba874
 AUX bongo.conf.d 319 BLAKE2B b490af0e0c4673dcb31a9c3ca7292aeaf381105400b954d1457992121643b98f79b2626c4ec71ef2a0ba9a0af1ca2d0517c7b4c30699ff93c47a797c2f54b74c SHA512 2fb3dc879d7a6c96c28eba3c4e2163f79d74b09ad8ad565d8f078d66a6bef0826ca00623d4ec9117b2ebcd363c5f184393c6cf1c051bf5f9db9d6426290693b2
 AUX bongo.init 795 BLAKE2B b094d1b850d1bbea7680da38216fb6819cbc7df3e675a47e2561adce1837d6fba85d1c9206c04712e5e5b68942d9f099bcd52092b4f17000a0f540e93f2c7499 SHA512 fa8129ad5969187ca36d7edaa56d83aceb480fd5241fdae22b041242d6c98ead46fd79e15efc9ec102e88dcddba19f650dbd9ef8619ab4cb4b0b4a629a0760d9
 AUX mailer.conf 301 BLAKE2B 6c285d7a4acc2fd73990d112c95604dd1bd4ac28c9e296767f2521dc3b1b92c765a5972c51de46d70110aa723b395759289a587d0fd88d7a2aa1a8a9911be397 SHA512 ee02584838312730277150605206c6963035e958f7c2c3327d882cbadc343a21fd2fa2ddd9af43021cc6573f27080f2dd574c9aca6b294efa3d720966751cf47
 DIST bongo-0.6.1.tar.gz 2488587 BLAKE2B fdb3596a751e8bc859796019f144b47b23e23e85c265b91d5b34c88da3171d23b90b313a202ecd53c9226490fbc0458d122af1520ef0e23f0b5fcc42fdfb9932 SHA512 27aadcc8cb45a5541c343b8c0871e35d1555f2170e68edebd9a13ccc9c5beeab4c32817c569950d4cf28f6f2f11dbe0a6d7d31172c15cef548c8ac471fe54aac
-EBUILD bongo-0.6.1.ebuild 2475 BLAKE2B 35b6b3adc79eb1a057550e0edbf2818380f958e6e641fc900fe1aa456e4c72b308292f065a44df1500020326a4d26a8e605eeacb82427acf34b306850f1864ac SHA512 6464c25f49b8a6f530befec469dcbc9fc32c258147910ef74f4fe08c635284745d4fa2ee02ed62b1313c504acfe86e516d058542a8205b35aa37b005d094ed81
-EBUILD bongo-9999.ebuild 2419 BLAKE2B b7223351b732bd38185989d93bdc215bc4f890f773adac249a65050327066318668826fc11d4fe1a6c61f7b7e245dfdf5f32b062a495a596cc648d05b5aec1c2 SHA512 641993fc50a1f11867de2339721238da75842a3546c1998b7210750a87d0faf70ae90276c0be08bf106862f282d2f79b837327356c28d1103df282540b09d4e5
+EBUILD bongo-0.6.1.ebuild 2258 BLAKE2B 642e63ce229d0c14005fce1f50bbc85869e8226fb298531dfc728500f805aeab499862634ad0bd25d9497857ef498bdb33951fbad6fda69cadfbe1b220446972 SHA512 b736649b12389afc10c60e13677704fe73eb3fe4bd3070091aabd99e05088ecf1522c1d307c078ae4e92cb5069edb11a811294254b4d46d143fbed040c23a603
+EBUILD bongo-9999.ebuild 2773 BLAKE2B 1355ab93edb7e2662829ae02783d8383e29ea0767911c5f3fc54b670960fd740b2a461bf81fa9b3950aa31215387ef838d225aab0c4613c5aca503798a2be89c SHA512 6a304911fcfd9e1f1c1a4c3491d406c6be91cc000f0b60f07741829aa2226ee6637bd9cefc77222106e6dd5032657855afb9a6b7fdfec21cc6dd4008e3a71603
 MISC ChangeLog 1707 BLAKE2B 9668b8a388b560b09f0f49ee8c14e1d67690b0ae98fb5eafe257ee72f25b065c344284f40d5719b9c111e74d6ed578406447f0d15af0347f4e6472f50f361ba4 SHA512 9f1fd1ca681cc63b09dabd9cb285d1eb2b564cb79c3e2c1d0b18af8092040dd8bf67e37b69da8557ee5cf1b4bdabd64336951f1dc67e9c4ac97acb5790f312db
-MISC metadata.xml 411 BLAKE2B 6bd76e3591b8a2d88277f9ebfbd5951a7458a266adf5818533a1d829a770db62e1de41a4cb4f29206ed5eb381c6f4bfdc04973c4c65bd72496b7e31b6c85880f SHA512 df1f54923628bff824dc8835c96902bd07d4462472b9b8f356abb0b9b81875d78fa96e511290739ecc5423eadc8b2579a65b2f31f9c2c6a73c8d3413c0603d98
+MISC metadata.xml 723 BLAKE2B 17cb505b0c5bcd8fb1d82fa09f300fa1cf8c0abc19de378c6471b4d74b32588a11e2e31d629c44f9543ad59bfd9c83fc707d1cfd30d9faf9ac71ecc31fce5ba7 SHA512 7407c3a6a51062eda4a201c93ff5fb868cbacae47f1c50562daea6d6fbfb2884918b4fb86ca8bd731042ef0f1c26817af8a09215a6b09aceb22444904e65ec07

mail-mta/bongo/bongo-0.6.1.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{11..15} )
 
 inherit cmake python-single-r1
 
@@ -19,88 +19,86 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="strip"
 
 DEPEND="
-    acct-group/bongo
-    acct-user/bongo
-    dev-db/sqlite:3
-    dev-db/unixODBC
-    dev-libs/glib:2
-    dev-libs/gmime:2.6
-    dev-libs/libgcrypt
-    dev-libs/libical
-    dev-libs/log4c
-    net-libs/gnutls
-    net-misc/curl
-    net-nds/openldap
+	acct-group/bongo
+	acct-user/bongo
+	dev-db/sqlite:3
+	dev-db/unixODBC
+	dev-libs/glib:2
+	dev-libs/gmime:2.6
+	dev-libs/libgcrypt
+	dev-libs/libical
+	dev-libs/log4c
+	net-libs/gnutls
+	net-misc/curl
+	net-nds/openldap
 "
 RDEPEND="
-    ${DEPEND}
-    ${PYTHON_DEPS}
-    >=net-mail/mailbase-0.00
-    !net-mail/mailwrapper
-    virtual/logger
-    $(python_gen_cond_dep '
+	${DEPEND}
+	${PYTHON_DEPS}
+	>=net-mail/mailbase-0.00
+	virtual/logger
+	$(python_gen_cond_dep '
 	dev-python/lxml[${PYTHON_USEDEP}]
-    ')
+	')
 "
-BDEPEND="${RDEPEND}"
 
 PATCHES=(
-    "${FILESDIR}"/bongo-FORTIFY-1.patch
-    "${FILESDIR}"/bongo-0.6.0-missing_link-1.patch
-    "${FILESDIR}"/bongo-0.6.0-uninitialized-1.patch
-    "${FILESDIR}"/bongo-return_value-1.patch
-    "${FILESDIR}"/bongo-gentoo-1.patch
+	"${FILESDIR}"/bongo-FORTIFY-1.patch
+	"${FILESDIR}"/bongo-0.6.0-missing_link-1.patch
+	"${FILESDIR}"/bongo-0.6.0-uninitialized-1.patch
+	"${FILESDIR}"/bongo-return_value-1.patch
+	"${FILESDIR}"/bongo-gentoo-1.patch
+	"${FILESDIR}"/bongo-security-hardening.patch
 )
 
 src_configure() {
-    local mycmakeargs=(
+	local mycmakeargs=(
 	-DBONGO_USER=bongo
 	-DCMAKE_BUILD_TYPE=Release
 	-DDEBUG=OFF
-    )
+	)
 
-    cmake_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-    cmake_src_install
+	cmake_src_install
 
-    newinitd "${FILESDIR}"/bongo.init bongo
-    newconfd "${FILESDIR}"/bongo.conf.d bongo
-    newenvd "${FILESDIR}"/70bongo 70bongo
+	newinitd "${FILESDIR}"/bongo.init bongo
+	newconfd "${FILESDIR}"/bongo.conf.d bongo
+	newenvd "${FILESDIR}"/70bongo 70bongo
 
-    keepdir /var/lib/bongo
-    fowners bongo:bongo /var/lib/bongo
-    fperms 0770 /var/lib/bongo
+	keepdir /var/lib/bongo
+	fowners bongo:bongo /var/lib/bongo
+	fperms 0770 /var/lib/bongo
 
-    keepdir /var/run/bongo
-    fowners bongo:bongo /var/run/bongo
-    fperms 0770 /var/run/bongo
+	keepdir /var/run/bongo
+	fowners bongo:bongo /var/run/bongo
+	fperms 0770 /var/run/bongo
 
-    dosym bongo-sendmail /usr/sbin/sendmail
-    dosym ../sbin/bongo-sendmail /usr/bin/sendmail
-    dosym ../sbin/bongo-sendmail /usr/lib/sendmail
-    dosym bongo-sendmail /usr/sbin/mailq
-    dosym bongo-sendmail /usr/sbin/newaliases
+	dosym bongo-sendmail /usr/sbin/sendmail
+	dosym ../sbin/bongo-sendmail /usr/lib/sendmail
+	dosym bongo-sendmail /usr/sbin/mailq
+	dosym bongo-sendmail /usr/sbin/newaliases
 }
 
 pkg_postinst() {
-    elog "Bongo must be set up."
-    elog "Please run:"
-    elog "  /usr/sbin/bongo-config install"
-    elog ""
-    elog "For more information, run:"
-    elog "  /usr/sbin/bongo-config --help"
-    elog ""
-    elog "After setup, start the service with:"
-    elog "  /etc/init.d/bongo start"
-    elog ""
-    elog "Default login settings:"
-    elog "  username: admin"
-    elog "  password: bongo"
+	elog "Bongo must be set up."
+	elog "Please run:"
+	elog "  /usr/sbin/bongo-config install"
+	elog ""
+	elog "For more information, run:"
+	elog "  /usr/sbin/bongo-config --help"
+	elog ""
+	elog "After setup, start the service with:"
+	elog "  /etc/init.d/bongo start"
+	elog ""
+	elog "Default login settings:"
+	elog "  username: admin"
+	elog "  password: bongo"
 }
 
 pkg_config() {
-    einfo "Setting up Bongo..."
-    /usr/sbin/bongo-config install || die "bongo-config install failed"
+	einfo "Setting up Bongo..."
+	/usr/sbin/bongo-config install || die "bongo-config install failed"
 }

mail-mta/bongo/bongo-9999.ebuild

@@ -3,104 +3,122 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{11..15} )
 
-inherit cmake git-r3 python-single-r1
+inherit cmake flag-o-matic git-r3 python-single-r1 systemd
 
-EGIT_REPO_URI="https://github.com/bongo-project/bongo.git"
+EGIT_REPO_URI="https://gitea.disconnected-by-peer.at/geos_one/bongo.git"
+EGIT_BRANCH="master"
 
 DESCRIPTION="Calendar and webmail application with its own MTA"
-HOMEPAGE="https://bongo-project.org/"
+HOMEPAGE="https://gitea.disconnected-by-peer.at/geos_one/bongo"
 
 LICENSE="LGPL-2"
 SLOT="0"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="strip"
+IUSE="+debug sanitize test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	sanitize? ( debug )
+"
+RESTRICT="
+	debug? ( strip )
+	!test? ( test )
+"
 
 DEPEND="
-    acct-group/bongo
-    acct-user/bongo
-    dev-db/sqlite:3
-    dev-db/unixODBC
-    dev-libs/glib:2
-    dev-libs/gmime:2.6
-    dev-libs/libgcrypt
-    dev-libs/libical
-    dev-libs/log4c
-    net-libs/gnutls
-    net-misc/curl
-    net-nds/openldap
+	${PYTHON_DEPS}
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/gmime:2.6
+	dev-libs/libgcrypt
+	dev-libs/libical
+	dev-libs/cyrus-sasl[ssl]
+	mail-filter/libspf2
+	mail-filter/libsrs2
+	mail-filter/opendkim
+	mail-filter/opendmarc
+	net-libs/gnutls:=
+	net-libs/libpsl
+	net-mail/mailutils
+	net-misc/curl[ssl]
+	$(python_gen_cond_dep '
+		dev-python/nh3[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/vobject[${PYTHON_USEDEP}]
+	')
 "
 RDEPEND="
-    ${DEPEND}
-    ${PYTHON_DEPS}
-    >=net-mail/mailbase-0.00
-    !net-mail/mailwrapper
-    virtual/logger
-    $(python_gen_cond_dep '
-	dev-python/lxml[${PYTHON_USEDEP}]
-    ')
+	${DEPEND}
+	acct-group/bongo
+	acct-user/bongo
+	>=net-mail/mailbase-0.00
+	virtual/logger
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
 "
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
-    "${FILESDIR}"/bongo-FORTIFY-1.patch
-    "${FILESDIR}"/bongo-0.6.0-missing_link-1.patch
-    "${FILESDIR}"/bongo-0.6.0-uninitialized-1.patch
-    "${FILESDIR}"/bongo-return_value-1.patch
-    "${FILESDIR}"/bongo-gentoo-1.patch
-)
 
 src_configure() {
-    local mycmakeargs=(
-	-DBONGO_USER=bongo
-	-DCMAKE_BUILD_TYPE=Release
-	-DDEBUG=OFF
-    )
+	if use sanitize; then
+		append-flags -fsanitize=address,undefined -fno-omit-frame-pointer
+		append-ldflags -fsanitize=address,undefined
+	fi
 
-    cmake_src_configure
+	local mycmakeargs=(
+		-DBONGO_CONFIG_DIR="${EPREFIX}/etc/bongo"
+		-DBONGO_STATE_DIR="${EPREFIX}/var/lib/bongo"
+		-DBONGO_USER=bongo
+		-DBUILD_TESTING=$(usex test)
+		-DCMAKE_BUILD_TYPE=$(usex debug Debug RelWithDebInfo)
+		-DDEBUG=$(usex debug)
+		-DLIB_DIR_NAME=$(get_libdir)
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
+		-DSYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
+	)
+
+	cmake_src_configure
 }
 
 src_install() {
-    cmake_src_install
+	cmake_src_install
 
-    newinitd "${FILESDIR}"/bongo.init bongo
-    newconfd "${FILESDIR}"/bongo.conf.d bongo
-    newenvd "${FILESDIR}"/70bongo 70bongo
+	newinitd "${FILESDIR}"/bongo.init bongo
+	newconfd "${FILESDIR}"/bongo.conf.d bongo
+	newenvd "${FILESDIR}"/70bongo 70bongo
 
-    keepdir /var/lib/bongo
-    fowners bongo:bongo /var/lib/bongo
-    fperms 0770 /var/lib/bongo
+	keepdir /var/lib/bongo
+	fowners bongo:bongo /var/lib/bongo
+	fperms 0770 /var/lib/bongo
 
-    keepdir /var/run/bongo
-    fowners bongo:bongo /var/run/bongo
-    fperms 0770 /var/run/bongo
+	keepdir /var/run/bongo
+	fowners bongo:bongo /var/run/bongo
+	fperms 0770 /var/run/bongo
 
-    dosym bongo-sendmail /usr/sbin/sendmail
-    dosym ../sbin/bongo-sendmail /usr/bin/sendmail
-    dosym ../sbin/bongo-sendmail /usr/lib/sendmail
-    dosym bongo-sendmail /usr/sbin/mailq
-    dosym bongo-sendmail /usr/sbin/newaliases
+	dosym bongo-sendmail /usr/sbin/sendmail
+	dosym ../sbin/bongo-sendmail /usr/lib/sendmail
+	dosym bongo-sendmail /usr/sbin/mailq
+	dosym bongo-sendmail /usr/sbin/newaliases
 }
 
 pkg_postinst() {
-    elog "Bongo must be set up."
-    elog "Please run:"
-    elog "  /usr/sbin/bongo-config install"
-    elog ""
-    elog "For more information, run:"
-    elog "  /usr/sbin/bongo-config --help"
-    elog ""
-    elog "After setup, start the service with:"
-    elog "  /etc/init.d/bongo start"
-    elog ""
-    elog "Default login settings:"
-    elog "  username: admin"
-    elog "  password: bongo"
+	elog "Bongo must be set up."
+	elog "Please run:"
+	elog "  /usr/sbin/bongo-config install"
+	elog ""
+	elog "For more information, run:"
+	elog "  /usr/sbin/bongo-config --help"
+	elog ""
+	elog "After setup, start the service with:"
+	elog "  /etc/init.d/bongo start"
+	elog ""
+	elog "Default login settings:"
+	elog "  username: admin"
+	elog "  password: bongo"
 }
 
 pkg_config() {
-    einfo "Setting up Bongo..."
-    /usr/sbin/bongo-config install || die "bongo-config install failed"
+	einfo "Setting up Bongo..."
+	/usr/sbin/bongo-config install || die "bongo-config install failed"
 }

mail-mta/bongo/files/bongo-security-hardening.patch

@@ -0,0 +1,62 @@
+--- a/src/libs/mdb-file/mdbfile.c
++++ b/src/libs/mdb-file/mdbfile.c
+@@ -181,7 +181,8 @@ MDBFILELogMessage(const unsigned char *Format, ...)
+         XplWaitOnLocalSemaphore(MDBFile.log.sem);
+ 
+         va_start(arguments, Format);
+-        vsprintf(MDBFile.log.buffer, Format, arguments);
++        vsnprintf((char *)MDBFile.log.buffer, MDBFile.log.bufferSize,
++                  (const char *)Format, arguments);
+         va_end(arguments);
+ 
+         length = strlen(MDBFile.log.buffer);
+--- a/src/libs/mdb-xldap/mdbldap.c
++++ b/src/libs/mdb-xldap/mdbldap.c
+@@ -3756,8 +3756,9 @@ MDBLDAPInit(MDBDriverInitStruct *Init)
+             */
+         } else {
+             char *err = "Parameter 'baseDn' required for MDB LDAP Init";
+-            sprintf((char *)(Init->Error), err);
+-            Log(LOG_ERROR, err);
++            snprintf((char *)Init->Error, sizeof(Init->Error), "%s", err);
++            Init->Error[sizeof(Init->Error) - 1] = '\0';
++            Log(LOG_ERROR, "%s", err);
+             result = FALSE;
+         }
+     }
+--- a/src/libs/python/bongo/admin/ManagedSlapd.py
++++ b/src/libs/python/bongo/admin/ManagedSlapd.py
+@@ -7,5 +7,6 @@
+ import os
+ import pwd
++import subprocess
+ import random
+ import sha
+ 
+@@ -172,9 +173,23 @@ userpassword: %(userpw)s
+ 
+         os.close(fd)
+ 
+-        os.system("ldapadd -h 127.0.0.1 -p %d -x -D %s -w %s -f %s" %
+-                  (self.port, self.rootdn, self.password, tmpname))
+-        os.unlink(tmpname)
++        pwfd, pwname = tempfile.mkstemp(".password")
++        try:
++            os.fchmod(pwfd, 0o600)
++            os.write(pwfd, self.password)
++            os.close(pwfd)
++            pwfd = None
++            subprocess.check_call([
++                "ldapadd", "-h", "127.0.0.1", "-p", str(self.port),
++                "-x", "-D", self.rootdn, "-y", pwname, "-f", tmpname
++            ])
++        finally:
++            if pwfd is not None:
++                os.close(pwfd)
++            if os.path.exists(pwname):
++                os.unlink(pwname)
++            if os.path.exists(tmpname):
++                os.unlink(tmpname)
+ 
+     def writeSlapdConf(self, file, writeRootpw=True):
+         ldapdir = "%s/ldap" % Xpl.DEFAULT_STATE_DIR

mail-mta/bongo/metadata.xml

@@ -9,4 +9,11 @@
     <email>mario.fetka+linamh@gmail.com</email>
     <name>Geos One Linamh Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">bongo-project/bongo</remote-id>
+  </upstream>
+  <use>
+    <flag name="debug">Build with Bongo's debugging infrastructure and full debug information.</flag>
+    <flag name="sanitize">Enable AddressSanitizer and UndefinedBehaviorSanitizer instrumentation.</flag>
+  </use>
 </pkgmetadata>

profiles/categories

@@ -1 +0,0 @@
-cross-avr

profiles/thirdpartymirrors

@@ -1 +0,0 @@
-kernel		http://www.kernel.org/pub http://lame.lut.fi

virtual/mda/Manifest

@@ -1,3 +1,3 @@
-EBUILD mda-0.ebuild 663 BLAKE2B 59130eae41c1da5fbd881f042900b9fccb6aee243ccf8aabf248205930129d26ec3d718177442484ec37f8a0ed5684a28b15f866a4194a7ecc9db7fb759513ca SHA512 bf4b05e96ca12c9be9dde758f6bac1c88ea279de39d60a327935560514d87aa39f8f89178185062d8cf7576fb5aca2bb1ccaaf32ea86cc89d90cc6424aa062f5
+EBUILD mda-0.ebuild 527 BLAKE2B 2f89d332c0b11645095b025c1da1850254b4004e6356b2813a33d9b051415ae594edb56f5f92264af0d03a65ffe96d0baf85372c95897b9da32d4fc2fee5ada2 SHA512 a103492cdba7917420cb4599ee0cb459939345173d935e3b8349e77357ad9a415dcdcd9177673be6b4ebc2a1269ff1b2f4b5ca03ff33814600378a2f17766363
 MISC ChangeLog 723 BLAKE2B b83b3c2d7961b17000d62405303a68c9ae026dd6847c048f54f97926817458044ec776533404a7840dc1a9a8f338cab7fcbe81c74468a9883ed9758dd8871990 SHA512 48b58f8b0f16a71aacfe89eca8659027eae467c24d3bb818171e9020cea7d152b2f390066b1db100c7b5a8186dacd8d9d2e0f32c5655d84e3184fbb9d05dacde
-MISC metadata.xml 181 BLAKE2B 52c31858712370e2d11fedde8b19af9f29dc1558e30a1a9f009af435f392fa252920d0d9e4a9fd1ad1e8d2df4f22d9319d12c84811c49c1c4e3b0f38997c7a94 SHA512 626c6bf4a11b2b07419d60ae64c3495b8d4b432ebefa8f7c1960d548753c4c752b57a16eaa6967867eabbaba9404b19bc340407e75dfc6e89345f8189475653e
+MISC metadata.xml 275 BLAKE2B 41b1f60071bf1344d143a1aeccaeca087a7e350c4f0298d172823d75c7faf339d899441ee84f4056b323141fb89276fa94cca9123edea165d86b5ecad6e6a286 SHA512 a8d21e3e3e29675f9958b69e6ab4f78a0433d7bcecb7c3b50b13b2236d821dc16af26fd035665edecb9a03990d6a162da1f78f3c124b3c9503cc985a34c4018e

virtual/mda/mda-0.ebuild

@@ -2,26 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/virtual/mda/mda-0.ebuild,v 1.5 2011/04/24 06:38:28 eras Exp $
 
-EAPI=3
+EAPI=8
 
 DESCRIPTION="Virtual for Message Delivery Agents"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # mail-mta/citadel is from sunrise
-RDEPEND="|| (	mail-filter/procmail
-				mail-filter/maildrop
-				mail-mta/postfix
-				mail-mta/courier
-				mail-mta/mini-qmail
-				mail-mta/netqmail
-				mail-mta/qmail-ldap
-				mail-mta/citadel
-				mail-mta/bongo )"
+RDEPEND="|| (
+	mail-filter/procmail
+	mail-filter/maildrop
+	mail-mta/postfix
+	mail-mta/courier
+	mail-mta/netqmail
+	mail-mta/bongo
+)"

virtual/mda/metadata.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
-<herd>qmail</herd>
+  <maintainer type="person">
+    <email>mario.fetka@gmail.com</email>
+    <description>Primary maintainer</description>
+  </maintainer>
 </pkgmetadata>
-

virtual/mta/Manifest

@@ -1,3 +1,3 @@
-EBUILD mta-1.ebuild 967 BLAKE2B ff551f013d59b257e9194966f25bd783e818bb8741620ced0ef2fa09ca0de25ee4baed9e06d13a5e5eedc45aceae9004d3d05413f4b6485221f1e7ece7001df6 SHA512 a073372c28f883b07248ce1119f92808948de1aa5a6830ee2c6ce822c11651a07de87346ef16eec25ae383d2d338b4474a7f88f435b2b9dce4cbe5794757a0c8
+EBUILD mta-1.ebuild 671 BLAKE2B 77ee1f8a34b85da5a654dd789fd357f764c891807adad06e8b58ecb4d1373a0a0866e51cbe54f5ca38ab5baa35ad5a08ddffe5514446c6ca4a2f244db0d785ae SHA512 12eb8ad93379161aa6893420748bbe882620b1e34cae33ff1d9c7d31c399eb6b3b670bab1818f32b3a8463676d540b8defd1a90c07652c55b744b849f67993b8
 MISC ChangeLog 1514 BLAKE2B 2f50d4a74bcd762beded2d4b9cc5c7d689d877ca6273fba9a1960413accd068b7bae37ab3416c52c9992e197e8f58088cbccd134f7b288d41118ddb394794dbd SHA512 90a973cc598cfbda99b3044c03b4fe42cc3cb223e7c6053e5f821441fa6e0fb01fa3ff89a82d560e5571026e44b8475eadbade6593ffee4195010ce3c81ef557
-MISC metadata.xml 181 BLAKE2B 52c31858712370e2d11fedde8b19af9f29dc1558e30a1a9f009af435f392fa252920d0d9e4a9fd1ad1e8d2df4f22d9319d12c84811c49c1c4e3b0f38997c7a94 SHA512 626c6bf4a11b2b07419d60ae64c3495b8d4b432ebefa8f7c1960d548753c4c752b57a16eaa6967867eabbaba9404b19bc340407e75dfc6e89345f8189475653e
+MISC metadata.xml 275 BLAKE2B 41b1f60071bf1344d143a1aeccaeca087a7e350c4f0298d172823d75c7faf339d899441ee84f4056b323141fb89276fa94cca9123edea165d86b5ecad6e6a286 SHA512 a8d21e3e3e29675f9958b69e6ab4f78a0433d7bcecb7c3b50b13b2236d821dc16af26fd035665edecb9a03990d6a162da1f78f3c124b3c9503cc985a34c4018e

virtual/mta/metadata.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
-<herd>qmail</herd>
+  <maintainer type="person">
+    <email>mario.fetka@gmail.com</email>
+    <description>Primary maintainer</description>
+  </maintainer>
 </pkgmetadata>
-

virtual/mta/mta-1.ebuild

@@ -2,31 +2,24 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/virtual/mta/mta-1.ebuild,v 1.4 2013/03/17 23:43:28 zx2c4 Exp $
 
-EAPI=4
+EAPI=8
 
 DESCRIPTION="Virtual for Message Transfer Agents"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # mail-mta/citadel is from sunrise
-RDEPEND="|| (	mail-mta/nullmailer
-				mail-mta/msmtp[mta]
-				mail-mta/ssmtp[mta]
-				mail-mta/courier
-				mail-mta/esmtp
-				mail-mta/exim
-				mail-mta/mini-qmail
-				mail-mta/netqmail
-				mail-mta/postfix
-				mail-mta/qmail-ldap
-				mail-mta/sendmail
-				mail-mta/opensmtpd
-				mail-mta/citadel[-postfix]
-				mail-mta/bongo )"
+RDEPEND="|| (
+	mail-mta/nullmailer
+	mail-mta/msmtp[mta]
+	mail-mta/ssmtp[mta]
+	mail-mta/courier
+	mail-mta/esmtp
+	mail-mta/exim
+	mail-mta/netqmail
+	mail-mta/notqmail
+	mail-mta/postfix
+	mail-mta/sendmail
+	mail-mta/opensmtpd[mta]
+	mail-mta/bongo
+)"