gentoo auto-resync : 03:12:2023 - 22:56:25

5 files changed, 45 insertions, 2 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index fed5d7b6c767..42026ff332b2 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index f1c691384ede..3bb321dec28b 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -3,6 +3,7 @@ AUX rspamd-3.6-fix-tests.patch 1015 BLAKE2B 7295d40e5ede063593df174c00f6ddcf2869
 AUX rspamd-3.6-memleak-fix.patch 1128 BLAKE2B d186839ceee2e7b050c53cef6ad2456595275f9bcb5bf4447a21feba51888d18fc03b6b21b05d8d4c4c55f5f3a1c9237559330afd0526c21b20e6b33d27dc543 SHA512 ba02cfc1a4132d4c58568fd4977fcdf9b364d7f49ad4553f583abdee6fcb1c12122653a8d7b33e5fd6a63f0c51a0a4d78f8929aa71fde4d907d4c5f2935e61e4
 AUX rspamd-3.6-unbundle-lua.patch 1767 BLAKE2B 0a4a8aeb251618f103f87d66d5d0613c7a3eaa86acaaacfd7023fe8bd8ba8c43abb6b9ad2b20a87166cf7cd855555ec8d9fac0907cce9462d06cf0706ffa6eff SHA512 6413dbc6864046cd6951f8e5720d46f7e158636f9c9b5fc76636f2c55e6df7982aef46ae144e031677230159faf54cf501c12bef147b11fd339f29cd0bc437d4
 AUX rspamd-3.6-unbundle-snowball.patch 741 BLAKE2B 9ff27c5434eb15808ae81775bcef8591010872737badf91aba28ecdd784158780f4b74774bb1f2c1581758be733040893a59926b8f5e3135fd7d166fd05ea63b SHA512 924599202e9b7cfddf17bc983053c01e771af791a7ae2f3d9248809d97779d5bfc15ac6f212892b5eedbc98132779ae5d6519279ee2231cef99be97a2c9d8a3b
+AUX rspamd-3.7.4-no-hyperscan.patch 1505 BLAKE2B a72bfc6d6e4bafe57e748e965abefea28b97df5d449010b3b227ef1550ad923549c1409123a4084f4532e44cb1ae483d4ca34b12b71447e0ad8229846d7f9e8b SHA512 71f63250209bb558b48b34a1dc15a4d6865953aadc6ab062d8e43574b479788c3e1d06d79aece3cc7276cadf6b68885cec21aa07271c2b782ec32ee3d1af733a
 AUX rspamd-r1.logrotate 305 BLAKE2B 58e816e54fd0a7e977dd2f6dcf97617c188888ffea66769ef60ce799f980e2814221734fee7b47c93790a5bbfecbb2f315f93c84bec9dd29b0f80c15e1b9e349 SHA512 0515d31a890058194106d9b8960d77909914986e73619dede751be2efb9592a41f90f15599310b5d6d027c3a203df412c8379ade7df09ecdfd4dcf43bfff4fa7
 AUX rspamd-r7.init 1357 BLAKE2B 90227e0980397a256e6136cac4a4a4d143130d82a211bfd4894d5f8deb85113e0b219e6453257d548ec3d80de24241e6ecfc2b0a4178cb344c8c6549d96e549b SHA512 89a079d32b7d8c5a037c7bb2ab6825624ce89ea4b25893bcf6f49befc0c7b924b51d48b30bf61c4b3ea5bc3ccbaba16664c7df52236debda0bdb58f1adf8867a
 AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb2696bfb32b70c31ceeaded873f06c759a471d534fb872656907e73ee095150fae384de4df6e9946 SHA512 753011de167af9261cc67676357aadf34d0b160d343a20d5efe8b3389e8a604775b7a6abbaad3174acae7df5579b52b4ba8a0a714419084befedfa96a3a8a9b1
@@ -10,7 +11,7 @@ AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4ab
 DIST rspamd-3.6.tar.gz 5843907 BLAKE2B 2ccb3e65a14624d48540bd3e2d034fec0dd89cd75032ade3ca74ded09cee6ed67f670c31035b18583b850cc4efeb21b44f97ec2c35d518a49b0c4e6f0eb8c90f SHA512 d99e2a60eec94eb39902454a8041eeb76f673c9f784849128766323a218d6c419755e0f8819e2a6921ca08c6a7d63660dc87bc911f808fb4a67d29e8fbfc571b
 DIST rspamd-3.7.4.tar.gz 5903754 BLAKE2B d13b3451b4a6a7c5e8644ba57196190065edda2fc48e7245ef7e0094cb90838760cc124a2cf8d0b4b7519c7583284f6883fbcd4bf3a6489496b5e52234a36c21 SHA512 a82696957417f7197b59e614012176626b4fdf1464ed38ce57552c8a02fe2e426504e0b0780ab4f36d208a11ae4d1921bacee52341c8a906b4ab19c1719fd116
 EBUILD rspamd-3.6-r1.ebuild 3664 BLAKE2B f38c683a2727f207d6d22c746f059d8d3d34033fb03b16ae473a42fc18f0de1e2785305ebb59cb1ac6fea282b0b23b88832950a6d152d472f24c90a447e549df SHA512 d09d7775afa19372cdf743c2f810658af624ee428acf98130a0bd74e209b15bfe79a82f32ada966d4dad065bfe070730444a4a34ca9621cc43e019792e6f603c
-EBUILD rspamd-3.7.4-r1.ebuild 3773 BLAKE2B 55835dccc1e923bceff0df464b683e4ff9dce16e22166435055ffd142b6beabcbb992f47bac439a4ea775a3c1fa52e6c12e554cc9ca594c691b6413bfd23da35 SHA512 c188bb2effea81372b4e767e52a2f0762ccb9d9401ec42dbb451bbc1cd52db499be85c61434dd1c1bbe128c0c6c489c01f33845cac906b0bb049e7a676ad6358
-EBUILD rspamd-3.7.4.ebuild 3804 BLAKE2B d7d9aea10d91a9f32bf104e9286e29e641b3c0d0899db87c38a6c4f95f2862bf1fbcf4e2f79ed80ded98480e7dfff5124ae181048a0efee28f6419c18de812af SHA512 a6025be23a5f378437feea8f02253fc10df950834eef6477d256a81ee3a817b99122dc1ef90fb206bf98554d03cf5bf634d04dbc324e433c996ff4c4726b95b7
+EBUILD rspamd-3.7.4-r1.ebuild 3821 BLAKE2B 13fdda81d9b87279b3d92b20fd0175b3008a13516911b7cf914bca89a1b7f3fb8b3ad0574dc6bf6d43bd52e8f3d0967c228ad1cf6e1417d7c396041c070c0609 SHA512 5174a0af107d763d8955b867a1d356b15ec660fa810a1c957c77eb208972caecd5838976cd59e2113f5e6e870483f77ee42ead7f9746a3b8192e42acb0356511
+EBUILD rspamd-3.7.4.ebuild 3852 BLAKE2B b864dc5f33403b81404a87c64794d9ee6792c87b0db354cd771dc222fa0c4ed8c5a5c3f3614784a7417fe71140af0eb093032ab8eb4c8010474fe27964daf3f5 SHA512 c0b62e12854cb6e03440cf12077fe95fa8aa583082927db52674db0d86e0c3477b2f1a4a69f91196dc8a3bc90e6fa4332f49221863e2233472ef0fedbd78c97f
 EBUILD rspamd-9999.ebuild 3261 BLAKE2B b98d31b7705fbb803101dc27b9d546f629aaa3817fc09277287437c084b4148a6c064bdc4edf13613a964e02a060bf0cbee74b75062265b5a264a78a2cfadcf1 SHA512 a978d765efa61421a27c8b603a70b3b83508e6135f8662a3bc661cd2544ef86ecef7f3ae785ee256c94bbefaf1f26719fb0f978f309f91bac64d3e239b6a6b83
 MISC metadata.xml 481 BLAKE2B e0eca393f0dfb4a53e1ea8c68c4daab3d2ac874f674de4468870ae826909f05e6576ca6a3fab0d87482ca21a53c85b51c346bee297e9ce9181acdce5f94b9e29 SHA512 d084bbf11c5ab839f6b6072cb574fa12966e7075ee7dbcd9829acfc458f81b09b34b38bc90baedc2c3b48b2f8c9531005d2f688994714c864a992a2b30ff7619
diff --git a/mail-filter/rspamd/files/rspamd-3.7.4-no-hyperscan.patch b/mail-filter/rspamd/files/rspamd-3.7.4-no-hyperscan.patch
new file mode 100644
index 000000000000..76353b703f21
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.7.4-no-hyperscan.patch
@@ -0,0 +1,38 @@
+From d907a95ac2e2cad6f7f65c4323f031f7931ae18b Mon Sep 17 00:00:00 2001
+From: Vsevolod Stakhov <vsevolod@rspamd.com>
+Date: Wed, 15 Nov 2023 13:43:05 +0000
+Subject: [PATCH] [Minor] Fix build with no hyperscan
+
+Upstream-issue: https://github.com/rspamd/rspamd/issues/4701
+Upstream-issue: https://github.com/rspamd/rspamd/issues/4702
+
+diff --git a/src/libserver/rspamd_control.c b/src/libserver/rspamd_control.c
+index 986a4a2ea..69af0597f 100644
+--- a/src/libserver/rspamd_control.c
++++ b/src/libserver/rspamd_control.c
+@@ -922,6 +922,7 @@ rspamd_srv_handler(EV_P_ ev_io *w, int revents)
+ 				}
+ 				break;
+ 			case RSPAMD_SRV_HYPERSCAN_LOADED:
++#ifdef WITH_HYPERSCAN
+ 				/* Load RE cache to provide it for new forks */
+ 				if (rspamd_re_cache_is_hs_loaded(rspamd_main->cfg->re_cache) != RSPAMD_HYPERSCAN_LOADED_FULL ||
+ 					cmd.cmd.hs_loaded.forced) {
+@@ -932,7 +933,9 @@ rspamd_srv_handler(EV_P_ ev_io *w, int revents)
+ 				}
+ 
+ 				/* After getting this notice, we can clean up old hyperscan files */
++
+ 				rspamd_hyperscan_notice_loaded();
++
+ 				msg_info_main("received hyperscan cache loaded from %s",
+ 							  cmd.cmd.hs_loaded.cache_dir);
+ 
+@@ -945,6 +948,7 @@ rspamd_srv_handler(EV_P_ ev_io *w, int revents)
+ 				wcmd.cmd.hs_loaded.forced = cmd.cmd.hs_loaded.forced;
+ 				rspamd_control_broadcast_cmd(rspamd_main, &wcmd, rfd,
+ 											 rspamd_control_ignore_io_handler, NULL, worker->pid);
++#endif
+ 				break;
+ 			case RSPAMD_SRV_MONITORED_CHANGE:
+ 				/* Broadcast command to all workers */
diff --git a/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild b/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild
index 476878d10a51..d25c1a699699 100644
--- a/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild
@@ -71,6 +71,8 @@ PATCHES=(
 	"${FILESDIR}/rspamd-3.6-cmake-lua-version.patch"
 	"${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
 	"${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
+
+	"${FILESDIR}/${P}-no-hyperscan.patch" #917512
 )
 
 src_prepare() {
diff --git a/mail-filter/rspamd/rspamd-3.7.4.ebuild b/mail-filter/rspamd/rspamd-3.7.4.ebuild
index ad8d2656579e..8ae0aff0c482 100644
--- a/mail-filter/rspamd/rspamd-3.7.4.ebuild
+++ b/mail-filter/rspamd/rspamd-3.7.4.ebuild
@@ -71,6 +71,8 @@ PATCHES=(
 	"${FILESDIR}/rspamd-3.6-cmake-lua-version.patch"
 	"${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
 	"${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
+
+	"${FILESDIR}/${P}-no-hyperscan.patch" #917512
 )
 
 src_prepare() {