gentoo auto-resync : 07:08:2023 - 21:25:57

4 files changed, 41 insertions, 1 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 78a7557bffd0..5fe7d4b22cce 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 85aa863980c9..423d7a209214 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -3,6 +3,7 @@ AUX rspamd-3.0-cmake-lua-version.patch 1444 BLAKE2B b44ada90d1d4d59f000ab75a5d28
 AUX rspamd-3.2-unbundle-lua.patch 1749 BLAKE2B 5cab7403c2a2db85e224fddb5ce13196e10eb0a1abb4bed85a7112b8864f9635e04ba763783811a337d6d9bd87ce68250c9201c0339bb596f95f322efaa6e733 SHA512 649a02af6682e1e76f4be677d61a93d5c78997bda6fd13982791744747c185f53d7a4261b24222bc0dd626319da0632828a590806ec7b305595297164e89407a
 AUX rspamd-3.6-cmake-lua-version.patch 2030 BLAKE2B 0c40d69e90acd031446c93965fbb8074aca7c383c92f2b14048d3ca3c6dcb8dbde8a662fa5a5a2bc5364e129588baac7657f6f8e5e3263f368d5c9f47d36c7b2 SHA512 5de0ae00fdc7ba556f6d3a2ccb6889776b608d850021612fc1f34955d96d9056ff067408acf47e0b4b7d42877606ab6b13b23e9be2c2cdf1304ca20b4965c733
 AUX rspamd-3.6-fix-tests.patch 1015 BLAKE2B 7295d40e5ede063593df174c00f6ddcf286965cb079312f5601cf6a222a1157fae055cf9e14e8359dd7858af859fab1ad42682e34f1fcd30ec827ebd107777d2 SHA512 a72f7f2af0f2a6f74f25eb7cbd609f40e009b516ff0e71af708cae14f8a7db40c0084542ef62a3ede402d182c6c4d8b9303a9ed843401f0f4cf11959dbabe4b1
+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-r1.logrotate 305 BLAKE2B 58e816e54fd0a7e977dd2f6dcf97617c188888ffea66769ef60ce799f980e2814221734fee7b47c93790a5bbfecbb2f315f93c84bec9dd29b0f80c15e1b9e349 SHA512 0515d31a890058194106d9b8960d77909914986e73619dede751be2efb9592a41f90f15599310b5d6d027c3a203df412c8379ade7df09ecdfd4dcf43bfff4fa7
@@ -12,6 +13,6 @@ AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4ab
 DIST rspamd-3.5.tar.gz 5806722 BLAKE2B 547cd9bb26942dc584d1f4b164e61bdb15505a56399fa19b358b7d7525ee983acc8d5ae1fdb3de340e3461a03aedbb48266fd81404c1f4a2e8fc5bd6735d9a62 SHA512 39c87d5dfd9ae1fc7709e19967eac5e7c7dc83fa070dfebbb7ab5411d7d50d6e6f10248ada717cf1cb3f6ff6c5bfb4d31fd87e1a7e1b2e5f876f6be7b5705623
 DIST rspamd-3.6.tar.gz 5843907 BLAKE2B 2ccb3e65a14624d48540bd3e2d034fec0dd89cd75032ade3ca74ded09cee6ed67f670c31035b18583b850cc4efeb21b44f97ec2c35d518a49b0c4e6f0eb8c90f SHA512 d99e2a60eec94eb39902454a8041eeb76f673c9f784849128766323a218d6c419755e0f8819e2a6921ca08c6a7d63660dc87bc911f808fb4a67d29e8fbfc571b
 EBUILD rspamd-3.5-r1.ebuild 3794 BLAKE2B 715366013f8ec70da9eb03d1adec32772ad20272915765fe57909e9b39c065d1dc80bf5d86764db394cae9963e3a4b40aae6b180ab2ee72576d6d92601a872cc SHA512 6e01e65d9a9873a6c966017092c975437f010cbf1010bab7330b7ce7faf5c53db730c849d118b7b292ce1761812bca76877271554326b346bd9b00f7c0430412
-EBUILD rspamd-3.6.ebuild 3575 BLAKE2B b3f5e9fad1522309077e5bbdaa4daa73363290fb6bbc2b7699b97f2afc88a8b9a07962a6edc4ee28de655f6165f8ce5c5c413b5d16a95f800a72419d46d326b5 SHA512 7ba3dabe8c9cbbeb4a12583a944f4b0fc63a07ec83eaf4c4b83011a90e498221b3f9e2bff4de6fec383d34b8f7513dffedba510ee80f849ea72a4f1a820b2d77
+EBUILD rspamd-3.6-r1.ebuild 3666 BLAKE2B 14efc1cc4cc332f7476f995fbd7c6d2d02624e76b622485a68730fa1fa4160f5a8af11ada6f501d382d3aa5a0b00704866421a47bfdf96bdf97befd032e298f2 SHA512 ac0981861a8c70bb0d7a89ffc5b8dc58c5c128aba7a85f6e46da2d1fe8d8c971b3fccccee620cad1fb639440d5d55fc3b276adcb1986867a1cc67d1ed7712ad3
 EBUILD rspamd-9999.ebuild 3016 BLAKE2B 91609c8fdce0395face7e1b9c82fc5c66597c56f36d2d378d352f14b62089daf366c49225d932076cfd29e1de597e9316638580c1095993dba36d9d00021de92 SHA512 1ee04859280ba1eb679e018b039b13e2aa2f437d5b2fca66524b8785f2065fcda87b2b1ee8e26860ef4666b91f2d72590f018ea3f3b49f60817acf8110e9b797
 MISC metadata.xml 554 BLAKE2B 65f4d0c5cd49f3caad6aeb0ab37bbba43505faf800491ebfa9af8366511bb46243a1ec873d7944cbe77dbb554beef8318a76f98dd4be69407b7befa3272a69b0 SHA512 d9a82aed6a7c63dad8727be080458c165e5c5f4a3ae87330c82447bc21d87c6c10730d0622fecbc5d255ca97312992c4f45c219ad8edcf2a9f4a386a79265d22
diff --git a/mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch b/mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch
new file mode 100644
index 000000000000..f372b79de7c7
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch
@@ -0,0 +1,36 @@
+From ffbab4fbf218514845b8e5209aec044621b1f460 Mon Sep 17 00:00:00 2001
+From: Vsevolod Stakhov <vsevolod@rspamd.com>
+Date: Sun, 6 Aug 2023 18:33:37 +0100
+Subject: [PATCH] [CritFix] Fix leak in `gzip` function
+
+Upstream-Issue: https://github.com/rspamd/rspamd/issues/4564
+
+diff --git a/src/libutil/util.c b/src/libutil/util.c
+index 4be7cc620..deba3e807 100644
+--- a/src/libutil/util.c
++++ b/src/libutil/util.c
+@@ -2231,6 +2231,7 @@ rspamd_fstring_gzip(rspamd_fstring_t **in)
+ 	strm.avail_out = sizeof(temp) > buf->allocated ? buf->allocated : sizeof(temp);
+ 	ret = deflate(&strm, Z_FINISH);
+ 	if (ret == Z_STREAM_ERROR) {
++		deflateEnd(&strm);
+ 		return FALSE;
+ 	}
+ 
+@@ -2247,6 +2248,8 @@ rspamd_fstring_gzip(rspamd_fstring_t **in)
+ 		if (ret != Z_BUF_ERROR || strm.avail_in == 0) {
+ 			buf->len = strm.next_out - (unsigned char *) buf->str;
+ 			*in = buf;
++			deflateEnd(&strm);
++
+ 			return ret == Z_STREAM_END;
+ 		}
+ 	}
+@@ -2267,6 +2270,7 @@ rspamd_fstring_gzip(rspamd_fstring_t **in)
+ 	g_free(hold);
+ 	buf->len = strm.next_out - (unsigned char *) buf->str;
+ 	*in = buf;
++	deflateEnd(&strm);
+ 
+ 	return ret == Z_STREAM_END;
+ }
diff --git a/mail-filter/rspamd/rspamd-3.6.ebuild b/mail-filter/rspamd/rspamd-3.6-r1.ebuild
index fb768118313d..dba607175345 100644
--- a/mail-filter/rspamd/rspamd-3.6.ebuild
+++ b/mail-filter/rspamd/rspamd-3.6-r1.ebuild
@@ -72,6 +72,9 @@ PATCHES=(
 	"${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
 	"${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
 	"${FILESDIR}/rspamd-3.6-fix-tests.patch"
+
+	# see https://github.com/rspamd/rspamd/issues/4564
+	"${FILESDIR}/${P}-memleak-fix.patch"
 )
 
 src_prepare() {