| 1 |
commit: 6323b87561e9cea97fa219c349485e4e2fc8a9b3 |
| 2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
| 3 |
AuthorDate: Thu Oct 8 18:34:52 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 8 19:39:37 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6323b875 |
| 7 |
|
| 8 |
mail-filter/rspamd: use bundled hiredis, bug #747274 |
| 9 |
|
| 10 |
System hiredis makes the rspamd subprocesses segfault periodically. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/747274 |
| 13 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 14 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/17852 |
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
.../rspamd/files/rspamd-2.6-unbundle-hiredis.patch | 93 ---------------------- |
| 19 |
.../{rspamd-2.6.ebuild => rspamd-2.6-r1.ebuild} | 4 +- |
| 20 |
mail-filter/rspamd/rspamd-9999.ebuild | 4 +- |
| 21 |
3 files changed, 2 insertions(+), 99 deletions(-) |
| 22 |
|
| 23 |
diff --git a/mail-filter/rspamd/files/rspamd-2.6-unbundle-hiredis.patch b/mail-filter/rspamd/files/rspamd-2.6-unbundle-hiredis.patch |
| 24 |
deleted file mode 100644 |
| 25 |
index 875009da41a..00000000000 |
| 26 |
--- a/mail-filter/rspamd/files/rspamd-2.6-unbundle-hiredis.patch |
| 27 |
+++ /dev/null |
| 28 |
@@ -1,93 +0,0 @@ |
| 29 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 30 |
-index 0afb5feff..966173075 100644 |
| 31 |
---- a/CMakeLists.txt |
| 32 |
-+++ b/CMakeLists.txt |
| 33 |
-@@ -170,6 +170,8 @@ ELSE() |
| 34 |
- ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3) |
| 35 |
- ENDIF() |
| 36 |
- |
| 37 |
-+ProcessPackage(HIREDIS LIBRARY hiredis INCLUDE hiredis.h |
| 38 |
-+ ROOT ${HIREDIS_ROOT_DIR} MODULES hiredis) |
| 39 |
- ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h |
| 40 |
- ROOT ${ZSTD_ROOT_DIR} MODULES libzstd) |
| 41 |
- ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite |
| 42 |
-@@ -555,9 +557,7 @@ ENDIF(NOT DESTDIR) |
| 43 |
- |
| 44 |
- |
| 45 |
- ################################ SUBDIRS SECTION ########################### |
| 46 |
--ADD_SUBDIRECTORY(contrib/hiredis) |
| 47 |
- SET(WITH_HIREDIS 1) |
| 48 |
--INCLUDE_DIRECTORIES(BEFORE "${CMAKE_SOURCE_DIR}/contrib/hiredis") |
| 49 |
- |
| 50 |
- LIST(APPEND RSPAMD_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}") |
| 51 |
- IF(HAVE_FETCH_H) |
| 52 |
-@@ -604,7 +604,6 @@ ENDIF() |
| 53 |
- IF (ENABLE_SNOWBALL MATCHES "ON") |
| 54 |
- LIST(APPEND RSPAMD_REQUIRED_LIBRARIES stemmer) |
| 55 |
- ENDIF() |
| 56 |
--LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-hiredis) |
| 57 |
- |
| 58 |
- LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-actrie) |
| 59 |
- LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-t1ha) |
| 60 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 61 |
-index e0e2edd58..4908013da 100644 |
| 62 |
---- a/src/CMakeLists.txt |
| 63 |
-+++ b/src/CMakeLists.txt |
| 64 |
-@@ -190,7 +190,6 @@ ENDIF() |
| 65 |
- IF (ENABLE_SNOWBALL MATCHES "ON") |
| 66 |
- TARGET_LINK_LIBRARIES(rspamd-server stemmer) |
| 67 |
- ENDIF() |
| 68 |
--TARGET_LINK_LIBRARIES(rspamd-server rspamd-hiredis) |
| 69 |
- |
| 70 |
- IF (ENABLE_FANN MATCHES "ON") |
| 71 |
- TARGET_LINK_LIBRARIES(rspamd-server fann) |
| 72 |
-diff --git a/src/libserver/fuzzy_backend/fuzzy_backend_redis.c b/src/libserver/fuzzy_backend/fuzzy_backend_redis.c |
| 73 |
-index d1e3e7532..882acdf6a 100644 |
| 74 |
---- a/src/libserver/fuzzy_backend/fuzzy_backend_redis.c |
| 75 |
-+++ b/src/libserver/fuzzy_backend/fuzzy_backend_redis.c |
| 76 |
-@@ -22,8 +22,8 @@ |
| 77 |
- #include "cryptobox.h" |
| 78 |
- #include "str_util.h" |
| 79 |
- #include "upstream.h" |
| 80 |
--#include "contrib/hiredis/hiredis.h" |
| 81 |
--#include "contrib/hiredis/async.h" |
| 82 |
-+#include <hiredis.h> |
| 83 |
-+#include <async.h> |
| 84 |
- #include "lua/lua_common.h" |
| 85 |
- |
| 86 |
- #define REDIS_DEFAULT_PORT 6379 |
| 87 |
-diff --git a/src/libserver/redis_pool.c b/src/libserver/redis_pool.c |
| 88 |
-index 7e835013c..fccf189e1 100644 |
| 89 |
---- a/src/libserver/redis_pool.c |
| 90 |
-+++ b/src/libserver/redis_pool.c |
| 91 |
-@@ -18,9 +18,9 @@ |
| 92 |
- #include "contrib/libev/ev.h" |
| 93 |
- #include "redis_pool.h" |
| 94 |
- #include "cfg_file.h" |
| 95 |
--#include "contrib/hiredis/hiredis.h" |
| 96 |
--#include "contrib/hiredis/async.h" |
| 97 |
--#include "contrib/hiredis/adapters/libev.h" |
| 98 |
-+#include <hiredis.h> |
| 99 |
-+#include <async.h> |
| 100 |
-+#include <adapters/libev.h> |
| 101 |
- #include "cryptobox.h" |
| 102 |
- #include "logger.h" |
| 103 |
- |
| 104 |
-diff --git a/src/lua/lua_redis.c b/src/lua/lua_redis.c |
| 105 |
-index f9dbbdd13..b885a8b61 100644 |
| 106 |
---- a/src/lua/lua_redis.c |
| 107 |
-+++ b/src/lua/lua_redis.c |
| 108 |
-@@ -17,8 +17,8 @@ |
| 109 |
- #include "lua_thread_pool.h" |
| 110 |
- #include "utlist.h" |
| 111 |
- |
| 112 |
--#include "contrib/hiredis/hiredis.h" |
| 113 |
--#include "contrib/hiredis/async.h" |
| 114 |
-+#include <hiredis.h> |
| 115 |
-+#include <async.h> |
| 116 |
- |
| 117 |
- #define REDIS_DEFAULT_TIMEOUT 1.0 |
| 118 |
- |
| 119 |
--- |
| 120 |
-2.25.3 |
| 121 |
- |
| 122 |
|
| 123 |
diff --git a/mail-filter/rspamd/rspamd-2.6.ebuild b/mail-filter/rspamd/rspamd-2.6-r1.ebuild |
| 124 |
similarity index 95% |
| 125 |
rename from mail-filter/rspamd/rspamd-2.6.ebuild |
| 126 |
rename to mail-filter/rspamd/rspamd-2.6-r1.ebuild |
| 127 |
index 4c166ee4b01..1488b0696d2 100644 |
| 128 |
--- a/mail-filter/rspamd/rspamd-2.6.ebuild |
| 129 |
+++ b/mail-filter/rspamd/rspamd-2.6-r1.ebuild |
| 130 |
@@ -25,7 +25,6 @@ RDEPEND=" |
| 131 |
app-arch/zstd |
| 132 |
dev-db/sqlite:3 |
| 133 |
dev-libs/glib:2 |
| 134 |
- dev-libs/hiredis:= |
| 135 |
dev-libs/icu:= |
| 136 |
dev-libs/libev |
| 137 |
dev-libs/libsodium |
| 138 |
@@ -61,13 +60,12 @@ PATCHES=( |
| 139 |
"${FILESDIR}/rspamd-2.6-unbundle-lua.patch" |
| 140 |
"${FILESDIR}/rspamd-2.6-unbundle-zstd.patch" |
| 141 |
"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" |
| 142 |
- "${FILESDIR}/rspamd-2.6-unbundle-hiredis.patch" |
| 143 |
) |
| 144 |
|
| 145 |
src_prepare() { |
| 146 |
cmake_src_prepare |
| 147 |
|
| 148 |
- rm -vrf contrib/{hiredis,lua-{bit,lpeg},snowball,zstd} || die |
| 149 |
+ rm -vrf contrib/{lua-{bit,lpeg},snowball,zstd} || die |
| 150 |
|
| 151 |
sed -i -e 's/User=_rspamd/User=rspamd/g' \ |
| 152 |
rspamd.service \ |
| 153 |
|
| 154 |
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild |
| 155 |
index 4c166ee4b01..1488b0696d2 100644 |
| 156 |
--- a/mail-filter/rspamd/rspamd-9999.ebuild |
| 157 |
+++ b/mail-filter/rspamd/rspamd-9999.ebuild |
| 158 |
@@ -25,7 +25,6 @@ RDEPEND=" |
| 159 |
app-arch/zstd |
| 160 |
dev-db/sqlite:3 |
| 161 |
dev-libs/glib:2 |
| 162 |
- dev-libs/hiredis:= |
| 163 |
dev-libs/icu:= |
| 164 |
dev-libs/libev |
| 165 |
dev-libs/libsodium |
| 166 |
@@ -61,13 +60,12 @@ PATCHES=( |
| 167 |
"${FILESDIR}/rspamd-2.6-unbundle-lua.patch" |
| 168 |
"${FILESDIR}/rspamd-2.6-unbundle-zstd.patch" |
| 169 |
"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" |
| 170 |
- "${FILESDIR}/rspamd-2.6-unbundle-hiredis.patch" |
| 171 |
) |
| 172 |
|
| 173 |
src_prepare() { |
| 174 |
cmake_src_prepare |
| 175 |
|
| 176 |
- rm -vrf contrib/{hiredis,lua-{bit,lpeg},snowball,zstd} || die |
| 177 |
+ rm -vrf contrib/{lua-{bit,lpeg},snowball,zstd} || die |
| 178 |
|
| 179 |
sed -i -e 's/User=_rspamd/User=rspamd/g' \ |
| 180 |
rspamd.service \ |
Archives