From 9ad2905c88a8d7931f4e14577f3ac6025f7ca21d Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 16 Jul 2026 23:23:47 +0200 Subject: [PATCH] Fix Bongo live package QA --- mail-mta/bongo/Manifest | 6 ++-- mail-mta/bongo/bongo-9999.ebuild | 32 +++++++++++------ mail-mta/bongo/files/bongo.conf.d | 7 ++-- mail-mta/bongo/files/bongo.init | 34 ++++++------------- virtual/mta/Manifest | 2 +- virtual/mta/{mta-1.ebuild => mta-1-r3.ebuild} | 6 ++-- 6 files changed, 40 insertions(+), 47 deletions(-) rename virtual/mta/{mta-1.ebuild => mta-1-r3.ebuild} (74%) diff --git a/mail-mta/bongo/Manifest b/mail-mta/bongo/Manifest index 0de1630..7ad4ff9 100644 --- a/mail-mta/bongo/Manifest +++ b/mail-mta/bongo/Manifest @@ -6,11 +6,11 @@ AUX bongo-arm-asm-1.patch 1425 BLAKE2B 84940dad7b9e9d36b132f436bdfe5cc4aea18cd5d 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 bongo.conf.d 88 BLAKE2B 350a1b39b495af63a9cd0bc3a8a4dcb26338e9b1b9740c7291a35c8b76382fce5ac01d63017bd242d0b67c2ae641648c3f21fa77650dd9be76e1f76ccf5ab79f SHA512 bc27be507174fd2e41547147777bb0120d76f0491e10f34b1d5a9e8be732a9286b94fac882d1bc3f39dcff9d313d289e376df4edc829d54f39567950324eff64 +AUX bongo.init 420 BLAKE2B 266febda3f33404b4ab58d6cfc8764e36a3d4ae5b9317165ec5ad9b020884766329854bd2bd952113503676751517dd1f3ba4a07df0f9ed60eccfd009baecb3e SHA512 8220a04243f56eeeded263cf8ffcc93b88a47fcede9a23bea9b808a4fd308f9a08291ecfebd5da4c08f4b67041e3da938ff6e976c7cfdc8b3da86b51cb54f1c3 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 2258 BLAKE2B 642e63ce229d0c14005fce1f50bbc85869e8226fb298531dfc728500f805aeab499862634ad0bd25d9497857ef498bdb33951fbad6fda69cadfbe1b220446972 SHA512 b736649b12389afc10c60e13677704fe73eb3fe4bd3070091aabd99e05088ecf1522c1d307c078ae4e92cb5069edb11a811294254b4d46d143fbed040c23a603 -EBUILD bongo-9999.ebuild 2773 BLAKE2B 1355ab93edb7e2662829ae02783d8383e29ea0767911c5f3fc54b670960fd740b2a461bf81fa9b3950aa31215387ef838d225aab0c4613c5aca503798a2be89c SHA512 6a304911fcfd9e1f1c1a4c3491d406c6be91cc000f0b60f07741829aa2226ee6637bd9cefc77222106e6dd5032657855afb9a6b7fdfec21cc6dd4008e3a71603 +EBUILD bongo-9999.ebuild 2984 BLAKE2B 954254dbbe5506e2e86ccef0b1d9f261e7a7c54b45e487dd65507fcd8bd543d99e4996d36ca7b5ab7c928924789ba5a1d78f86a85a0a6c861b705704d82b404d SHA512 41dbce3f2998c50d3f35a2be205489ad0e7e05b7f68f0ecf0298ee067ff8cec8ad778532118d6f424d38c3df867c460c504fac3178822a9c68086c8ebe18f666 MISC ChangeLog 1707 BLAKE2B 9668b8a388b560b09f0f49ee8c14e1d67690b0ae98fb5eafe257ee72f25b065c344284f40d5719b9c111e74d6ed578406447f0d15af0347f4e6472f50f361ba4 SHA512 9f1fd1ca681cc63b09dabd9cb285d1eb2b564cb79c3e2c1d0b18af8092040dd8bf67e37b69da8557ee5cf1b4bdabd64336951f1dc67e9c4ac97acb5790f312db MISC metadata.xml 723 BLAKE2B 17cb505b0c5bcd8fb1d82fa09f300fa1cf8c0abc19de378c6471b4d74b32588a11e2e31d629c44f9543ad59bfd9c83fc707d1cfd30d9faf9ac71ecc31fce5ba7 SHA512 7407c3a6a51062eda4a201c93ff5fb868cbacae47f1c50562daea6d6fbfb2884918b4fb86ca8bd731042ef0f1c26817af8a09215a6b09aceb22444904e65ec07 diff --git a/mail-mta/bongo/bongo-9999.ebuild b/mail-mta/bongo/bongo-9999.ebuild index d4bb69f..e0f4196 100644 --- a/mail-mta/bongo/bongo-9999.ebuild +++ b/mail-mta/bongo/bongo-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..15} ) -inherit cmake flag-o-matic git-r3 python-single-r1 systemd +inherit cmake flag-o-matic git-r3 python-single-r1 systemd tmpfiles EGIT_REPO_URI="https://gitea.disconnected-by-peer.at/geos_one/bongo.git" EGIT_BRANCH="master" @@ -50,6 +50,17 @@ DEPEND=" " RDEPEND=" ${DEPEND} + !mail-mta/courier + !mail-mta/esmtp + !mail-mta/exim + !mail-mta/msmtp[mta(+)] + !mail-mta/netqmail + !mail-mta/notqmail + !mail-mta/nullmailer + !mail-mta/opensmtpd[mta(+)] + !mail-mta/postfix + !mail-mta/sendmail + !mail-mta/ssmtp[mta(+)] acct-group/bongo acct-user/bongo >=net-mail/mailbase-0.00 @@ -65,15 +76,16 @@ src_configure() { append-flags -fsanitize=address,undefined -fno-omit-frame-pointer append-ldflags -fsanitize=address,undefined fi + CMAKE_BUILD_TYPE=$(usex debug Debug RelWithDebInfo) 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) + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" -DSYSCONF_INSTALL_DIR="${EPREFIX}/etc" -DSYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)" ) @@ -88,13 +100,7 @@ src_install() { 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/run/bongo - fowners bongo:bongo /var/run/bongo - fperms 0770 /var/run/bongo + python_optimize dosym bongo-sendmail /usr/sbin/sendmail dosym ../sbin/bongo-sendmail /usr/lib/sendmail @@ -103,6 +109,8 @@ src_install() { } pkg_postinst() { + tmpfiles_process bongo.conf + elog "Bongo must be set up." elog "Please run:" elog " /usr/sbin/bongo-config install" @@ -110,8 +118,10 @@ pkg_postinst() { 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 "After setup, start Bongo with:" + elog " rc-service bongo start" + elog "or:" + elog " systemctl enable --now bongo.service" elog "" elog "Default login settings:" elog " username: admin" diff --git a/mail-mta/bongo/files/bongo.conf.d b/mail-mta/bongo/files/bongo.conf.d index 40098d5..2bf288e 100644 --- a/mail-mta/bongo/files/bongo.conf.d +++ b/mail-mta/bongo/files/bongo.conf.d @@ -1,7 +1,4 @@ # /etc/conf.d/bongo -# Set to "standalone" when you want bongo to run it's own limited webserver. -# This is needed if you plan to use bongo either on it's own or with any -# non-Apache web server or simple proxy. -# Set to anything else if you plan to use the mod_python interface for Apache. -BONGO_WEB_MODE="standalone" +# Extra arguments passed to bongo-manager. +BONGO_MANAGER_ARGS="-k" diff --git a/mail-mta/bongo/files/bongo.init b/mail-mta/bongo/files/bongo.init index 14e8ae2..9555f4f 100644 --- a/mail-mta/bongo/files/bongo.init +++ b/mail-mta/bongo/files/bongo.init @@ -1,31 +1,19 @@ -#!/sbin/runscript +#!/sbin/openrc-run depend() { - need net - use logger dns antivirus + need net + use logger dns antivirus after apache2 lighttpd spamd provide mta } -start() { - ebegin "Starting bongo" - start-stop-daemon --start --quiet \ - --exec /usr/sbin/bongo-manager -- -d &> /dev/null - if [[ ${BONGO_WEB_MODE} == 'standalone' ]] ; then - start-stop-daemon --start --quiet --background --make-pidfile \ - --pidfile /var/run/bongo/bongo-standalone.pid \ - --exec /usr/bin/python \ - --startas /usr/sbin/bongo-standalone &> /dev/null - fi - eend $? -} +description="Bongo mail and calendar server" +command="/usr/sbin/bongo-manager" +command_args="${BONGO_MANAGER_ARGS:--k}" +command_background="yes" +pidfile="/run/bongo/bongo-manager.pid" +start_stop_daemon_args="--make-pidfile" -stop() { - ebegin "Stopping bongo" - if [[ ${BONGO_WEB_MODE} == 'standalone' ]] ; then - start-stop-daemon --stop \ - --pidfile /var/run/bongo/bongo-standalone.pid - fi - start-stop-daemon --stop --name bongo-manager &> /dev/null - eend $? +start_pre() { + checkpath --directory --mode 0750 --owner bongo:bongo /run/bongo } diff --git a/virtual/mta/Manifest b/virtual/mta/Manifest index 66797e1..d63babf 100644 --- a/virtual/mta/Manifest +++ b/virtual/mta/Manifest @@ -1,3 +1,3 @@ -EBUILD mta-1.ebuild 671 BLAKE2B 77ee1f8a34b85da5a654dd789fd357f764c891807adad06e8b58ecb4d1373a0a0866e51cbe54f5ca38ab5baa35ad5a08ddffe5514446c6ca4a2f244db0d785ae SHA512 12eb8ad93379161aa6893420748bbe882620b1e34cae33ff1d9c7d31c399eb6b3b670bab1818f32b3a8463676d540b8defd1a90c07652c55b744b849f67993b8 +EBUILD mta-1-r3.ebuild 535 BLAKE2B 9341149821a88ccdcaada191c5fe0b237684665cbe63005f6571b69a9749a92b9bc95df383bbced2622aa2f3db1d530a56d13c54e1c3ef6f76541ceaf1b839c6 SHA512 4dc34c7f0d37e9a8a5e922f77c4f97526140c370186c7f027718796fcd78368cc05313e51db777f6269f746f0abc304caef8162630f3cc36f6e107c50ff9d9c9 MISC ChangeLog 1514 BLAKE2B 2f50d4a74bcd762beded2d4b9cc5c7d689d877ca6273fba9a1960413accd068b7bae37ab3416c52c9992e197e8f58088cbccd134f7b288d41118ddb394794dbd SHA512 90a973cc598cfbda99b3044c03b4fe42cc3cb223e7c6053e5f821441fa6e0fb01fa3ff89a82d560e5571026e44b8475eadbade6593ffee4195010ce3c81ef557 MISC metadata.xml 275 BLAKE2B 41b1f60071bf1344d143a1aeccaeca087a7e350c4f0298d172823d75c7faf339d899441ee84f4056b323141fb89276fa94cca9123edea165d86b5ecad6e6a286 SHA512 a8d21e3e3e29675f9958b69e6ab4f78a0433d7bcecb7c3b50b13b2236d821dc16af26fd035665edecb9a03990d6a162da1f78f3c124b3c9503cc985a34c4018e diff --git a/virtual/mta/mta-1.ebuild b/virtual/mta/mta-1-r3.ebuild similarity index 74% rename from virtual/mta/mta-1.ebuild rename to virtual/mta/mta-1-r3.ebuild index 992b407..0b44c2d 100644 --- a/virtual/mta/mta-1.ebuild +++ b/virtual/mta/mta-1-r3.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2026 Gentoo Authors # 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=8 @@ -8,8 +7,8 @@ DESCRIPTION="Virtual for Message Transfer Agents" SLOT="0" 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/bongo mail-mta/nullmailer mail-mta/msmtp[mta] mail-mta/ssmtp[mta] @@ -21,5 +20,4 @@ RDEPEND="|| ( mail-mta/postfix mail-mta/sendmail mail-mta/opensmtpd[mta] - mail-mta/bongo )"