From 3919ac00191f11dd3bc38e2d26195a3e397abd86 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Sat, 18 Jul 2026 17:57:07 +0200
Subject: [PATCH] Require explicit Bongo configuration migration

---
 mail-mta/bongo/Manifest          |  4 ++--
 mail-mta/bongo/bongo-9999.ebuild | 21 +++++++++------------
 mail-mta/bongo/files/bongo.init  |  4 ++++
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/mail-mta/bongo/Manifest b/mail-mta/bongo/Manifest
index f48ebb9..9a2906b 100644
--- a/mail-mta/bongo/Manifest
+++ b/mail-mta/bongo/Manifest
@@ -7,10 +7,10 @@ AUX bongo-gentoo-1.patch 809 BLAKE2B facc54604f439e991998795a229e34c3ed3004c6aa3
 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 88 BLAKE2B 350a1b39b495af63a9cd0bc3a8a4dcb26338e9b1b9740c7291a35c8b76382fce5ac01d63017bd242d0b67c2ae641648c3f21fa77650dd9be76e1f76ccf5ab79f SHA512 bc27be507174fd2e41547147777bb0120d76f0491e10f34b1d5a9e8be732a9286b94fac882d1bc3f39dcff9d313d289e376df4edc829d54f39567950324eff64
-AUX bongo.init 420 BLAKE2B 266febda3f33404b4ab58d6cfc8764e36a3d4ae5b9317165ec5ad9b020884766329854bd2bd952113503676751517dd1f3ba4a07df0f9ed60eccfd009baecb3e SHA512 8220a04243f56eeeded263cf8ffcc93b88a47fcede9a23bea9b808a4fd308f9a08291ecfebd5da4c08f4b67041e3da938ff6e976c7cfdc8b3da86b51cb54f1c3
+AUX bongo.init 524 BLAKE2B 832c5240553de08f2aa8ccb2cd4a1f517202357ef918f9331c1efed75dd2c1485442b1824564c5b67bbab099592429d98f9104d5c796aaed5db98fc3601a3280 SHA512 555e00eab889de6ef05986e754dda0b3e3af84f85e601b891c950b4a4d6684cc23413debca00fbed1ca1c4be85fc0fa55156db3d715cfb1dbc8eb9389a336572
 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 3827 BLAKE2B 91e57859515e04d4270fe7c37210c02711473fe7ae5cd79bae689f3bc20e4456e20969a994b8ec4335e108beb0fe9ce93cddba113da03fc8f3536c373ec116da SHA512 72121ba3cc26a2826ea05f779d52e9346cfe54cbc34b6edb44b52e72d2364835b632c39a9bebff538c17c960e9df79179a348027e8f5f167c81b78e0fc334277
+EBUILD bongo-9999.ebuild 3829 BLAKE2B 6b76492131b6ddcfab8999414aa88f36c8a6fd3c95112fdd3ac2d7d10efae7fd7b71be64b22d6445145981d6a01ad0ec7ab59c484a7184b3b7ca530895689208 SHA512 b8e8b6ccf506d03c802d1969138327ae89fafb1dfc6b66b316864a7b092e820f7fb370c699b5bdc36fb583c2a0f06c2eaf404e8198ba4fe50464c2b88a03eb6e
 MISC ChangeLog 1707 BLAKE2B 9668b8a388b560b09f0f49ee8c14e1d67690b0ae98fb5eafe257ee72f25b065c344284f40d5719b9c111e74d6ed578406447f0d15af0347f4e6472f50f361ba4 SHA512 9f1fd1ca681cc63b09dabd9cb285d1eb2b564cb79c3e2c1d0b18af8092040dd8bf67e37b69da8557ee5cf1b4bdabd64336951f1dc67e9c4ac97acb5790f312db
 MISC metadata.xml 818 BLAKE2B 956e4e155b231625b9e306587644ac9d0e29aa41a9e00ebe8d463fbb9a1baf1098ccb169816aedc0eb1c24484166a80df43d02cc7b7e16fb6356569ac6a83913 SHA512 27b9a939e45c151aca4ccad5c536bf369892ebff76ca99ab959c24a72f42c3de90085aa774cd27db02d72a77cde91bbce77db54cc6cdb7e86cc04f58f4bd8cf9
diff --git a/mail-mta/bongo/bongo-9999.ebuild b/mail-mta/bongo/bongo-9999.ebuild
index 71a4257..f23c9eb 100644
--- a/mail-mta/bongo/bongo-9999.ebuild
+++ b/mail-mta/bongo/bongo-9999.ebuild
@@ -119,20 +119,17 @@ pkg_postinst() {
 	tmpfiles_process bongo.conf
 
 	local config_dir="${EROOT%/}/etc/bongo"
-	local legacy_web="${config_dir}/bongo-web.json"
-	local web_config="${config_dir}/web"
-	if [[ -f ${legacy_web} ]]; then
-		if cp -p -- "${legacy_web}" "${web_config}"; then
-			rm -f -- "${legacy_web}" "${config_dir}"/._cfg????_bongo-web.json
-			elog "Migrated /etc/bongo/bongo-web.json to /etc/bongo/web."
-		else
-			ewarn "Could not migrate ${legacy_web}; keeping the legacy file."
-		fi
+	if [[ -e ${config_dir}/bongo-web.json || -e ${config_dir}/web ||
+	      -e ${config_dir}/bongo.conf ]]; then
+		ewarn "A pre-0.7 Bongo configuration was found."
+		ewarn "Run 'bongo-admin migrate' explicitly while the old Store is reachable,"
+		ewarn "then restart Bongo after reviewing the generated configuration."
+		ewarn "The package does not move or activate historical files automatically."
 	fi
 
-	elog "Bongo must be set up."
+	elog "A new Bongo installation must be set up."
 	elog "Please run:"
-	elog "  /usr/sbin/bongo-config install"
+	elog "  /usr/sbin/bongo-setup"
 	elog ""
 	elog "For more information, run:"
 	elog "  /usr/sbin/bongo-config --help"
@@ -152,5 +149,5 @@ pkg_postinst() {
 
 pkg_config() {
 	einfo "Setting up Bongo..."
-	/usr/sbin/bongo-config install || die "bongo-config install failed"
+	/usr/sbin/bongo-setup || die "bongo-setup failed"
 }
diff --git a/mail-mta/bongo/files/bongo.init b/mail-mta/bongo/files/bongo.init
index 9555f4f..bdc9083 100644
--- a/mail-mta/bongo/files/bongo.init
+++ b/mail-mta/bongo/files/bongo.init
@@ -16,4 +16,8 @@ start_stop_daemon_args="--make-pidfile"
 
 start_pre() {
 	checkpath --directory --mode 0750 --owner bongo:bongo /run/bongo
+	/usr/sbin/bongo-admin config check || {
+		eerror "Bongo configuration validation failed"
+		return 1
+	}
 }