mail-filter/rspamd: use bundled hiredis, bug #747274

System hiredis makes the rspamd subprocesses segfault periodically. Closes: https://bugs.gentoo.org/747274 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Petr Vaněk <[email protected]> Closes: gentoo#17852 Signed-off-by: Sam James <[email protected]>
johu · Oct 8, 2020 · 6323b87 · 6323b87
1 parent 28745d2
commit 6323b87
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 99 deletions.
diff --git a/mail-filter/rspamd/files/rspamd-2.6-unbundle-hiredis.patch b/mail-filter/rspamd/files/rspamd-2.6-unbundle-hiredis.patch
diff --git a/mail-filter/rspamd/rspamd-2.6.ebuild → mail-filter/rspamd/rspamd-2.6-r1.ebuild b/mail-filter/rspamd/rspamd-2.6.ebuild → mail-filter/rspamd/rspamd-2.6-r1.ebuild
@@ -25,7 +25,6 @@ RDEPEND="
  app-arch/zstd
  dev-db/sqlite:3
  dev-libs/glib:2
- dev-libs/hiredis:=
  dev-libs/icu:=
  dev-libs/libev
  dev-libs/libsodium
@@ -61,13 +60,12 @@ PATCHES=(
  "${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
  "${FILESDIR}/rspamd-2.6-unbundle-zstd.patch"
  "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
- "${FILESDIR}/rspamd-2.6-unbundle-hiredis.patch"
 )
 
 src_prepare() {
  cmake_src_prepare
 
- rm -vrf contrib/{hiredis,lua-{bit,lpeg},snowball,zstd} || die
+ rm -vrf contrib/{lua-{bit,lpeg},snowball,zstd} || die
 
  sed -i -e 's/User=_rspamd/User=rspamd/g' \
  rspamd.service \

diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -25,7 +25,6 @@ RDEPEND="
  app-arch/zstd
  dev-db/sqlite:3
  dev-libs/glib:2
- dev-libs/hiredis:=
  dev-libs/icu:=
  dev-libs/libev
  dev-libs/libsodium
@@ -61,13 +60,12 @@ PATCHES=(
  "${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
  "${FILESDIR}/rspamd-2.6-unbundle-zstd.patch"
  "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
- "${FILESDIR}/rspamd-2.6-unbundle-hiredis.patch"
 )
 
 src_prepare() {
  cmake_src_prepare
 
- rm -vrf contrib/{hiredis,lua-{bit,lpeg},snowball,zstd} || die
+ rm -vrf contrib/{lua-{bit,lpeg},snowball,zstd} || die
 
  sed -i -e 's/User=_rspamd/User=rspamd/g' \
  rspamd.service \