diff options
Diffstat (limited to 'mail-filter')
-rw-r--r-- | mail-filter/Manifest.gz | bin | 8707 -> 8703 bytes | |||
-rw-r--r-- | mail-filter/libmilter/Manifest | 2 | ||||
-rw-r--r-- | mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild | 2 | ||||
-rw-r--r-- | mail-filter/rspamd/Manifest | 10 | ||||
-rw-r--r-- | mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch | 128 | ||||
-rw-r--r-- | mail-filter/rspamd/files/rspamd-3.0-cmake-lua-version.patch (renamed from mail-filter/rspamd/files/rspamd-2.6-cmake-lua-version.patch) | 44 | ||||
-rw-r--r-- | mail-filter/rspamd/files/rspamd-3.0-system-libfmt.patch | 48 | ||||
-rw-r--r-- | mail-filter/rspamd/rspamd-3.0.ebuild (renamed from mail-filter/rspamd/rspamd-2.6-r102.ebuild) | 26 | ||||
-rw-r--r-- | mail-filter/rspamd/rspamd-9999.ebuild | 21 |
9 files changed, 118 insertions, 163 deletions
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz Binary files differindex 2d3d1838c069..d9d05b702ccd 100644 --- a/mail-filter/Manifest.gz +++ b/mail-filter/Manifest.gz diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest index d2671855f3d8..3ff03f16b363 100644 --- a/mail-filter/libmilter/Manifest +++ b/mail-filter/libmilter/Manifest @@ -11,7 +11,7 @@ DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2 DIST sendmail.8.17.1.tar.gz 2284027 BLAKE2B 4cbbc2bb536a48ea27994721e9dfefff7739ef1c825bbc0397202e600d8dad8f9a2572a777204693cf9630f767865d50566f0827be6b52be41c1e25532cb394c SHA512 ae42343fb06c09f2db5d919d602afc4241914387dfdae0f15e0967dda3be25bf1d3a4637b57266763679646a3cea6aa07e6453266fd9b7358c1a09ec2b627a15 EBUILD libmilter-1.0.2.ebuild 1903 BLAKE2B 1623fdd49f8cbe33bfb2f197d3fb18b6e107734e6a2ddd8b5e8fe2795d5d199a6dd9afb7d9f89ec739f05c9504bd67082c90e7a3bf2c4039ceff9c7fc4d0fdfd SHA512 af0dd4f1051f90235abd91cbc7e39939c5079487c7ade83d82fb25b39e5d5f802e06c0be2fee82d7bf07bf44ff95ff17dd40d71935d6457fbdccb5cdacb032b0 -EBUILD libmilter-1.0.2_p1-r2.ebuild 2222 BLAKE2B f2ac06a33e4ad53c4c8e503d2801ae6401731e24c820f9933a89bbd74b6e7f14303be5e10b34eb224a38b8dca104b925b1eda5fd0ebea09e4dedb2088d217554 SHA512 394e15dca1bb8a8ad09b3cdd454588eeb5f40cc9b34fcad600bc171578678adc10d81bda70d7afe9f40b8e10a571f55c1da1700367ce913f3750d38d91b7bbe2 +EBUILD libmilter-1.0.2_p1-r2.ebuild 2215 BLAKE2B e34ec8367a7a3077566dde4671c1fd72ad1883f5ed2d2e3921a7fd91fbc7a8f9f5518152f895c5157c946dd4a5d5491c4306bf880fd1ca478cc788dc0d3d053c SHA512 588fb4abf1450fdb6be2eacb0b2af4e8995525660b7a36d110e870c6e3b57d8a8d8fcb5aefe3e2f940fa2dbcffa8052a089396eedc808baa25e4cb46fde69841 EBUILD libmilter-1.0.2_p1.ebuild 2214 BLAKE2B 8452d0976b146f92d7a8684986c5ef8e9dceecbc504806b3b53e2778d982d8a51bf4e440fbbe04dbd3392386fd5b1afdc62106e4e5d0faf3e863215a9b9622e8 SHA512 128027206c5978e49ccec7469ef14b1a67f977478b8182dec00a478671dafb0599a7a3a8338f2d8c2077ec806209faa6cc51070c6bfe70164d5fc344a4fc0013 EBUILD libmilter-1.0.2_p2.ebuild 2589 BLAKE2B 00e621f39053d177496959a7fb2fe77f472f633b10dee23c91ec22baea0e4a0fcf33bc43050579f06d7c71e5f86e11a6758afda3d005adad95bde8c851a61b10 SHA512 f73dfe2f656fe328bdc570fee09d9658c7dcdd1c6cf31835388ea410bb972d8e02eb49f30073d756236b4162fb3ef2a70bae67ee31a5c3c7e228ebc256d819b0 MISC metadata.xml 241 BLAKE2B 7e817e3e8547331152f2d3378fe5681d02cccc2ec04dfbe21833282edc6c826a93b9493110f5f0afd05edbbbb84a1a185db7e17d154399aabd1e70ab044c3ecd SHA512 bec8ce3a2140871a48e34ad88eeefd1bf05b2d6508e2a5ca4c406aa0ca2729b0b827ae02dd4fd707630894e1c8fc367cdb9840b791ad8ee596d067d40c36aa42 diff --git a/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild b/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild index 924c4295b379..9646d468dabf 100644 --- a/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild +++ b/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/sendmail-${SENDMAIL_VER}" LICENSE="Sendmail" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" IUSE="ipv6 poll" RDEPEND="!<mail-mta/sendmail-8.16.1" diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index 4a5577340849..2491065dab11 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -1,16 +1,16 @@ AUX rspamd-2.5-unbundle-snowball.patch 758 BLAKE2B 4e419c4e70d5726309c17ca759b8917feb2d52842cde06453821a8b1964ed8165a5f3536ab917a8362b44b40858d1660ae7c7887fee513e9e6fb681d24589255 SHA512 5257921bdeb5febef99feebd03d291aad009a6b8a44c325305532bae7aec35456042b4813338f175c4a59aa80cce3178118d9e1e4bc5a500f42e5364c06a4dda -AUX rspamd-2.6-cmake-lua-version.patch 954 BLAKE2B f0d815908763af100ceb9c79d394ff9616eeceabcc2363609d6fcbc29fea407cfa33640a0ded204047e848cbc93abd1c25372145bb567515ee92ebc227b87422 SHA512 9e8df1f2815e58463d06b16fe8a1a39b344ba30c18392e6f8827d65adf0bbe923da56febbea591efbabc2c5f733a63ace06a4baacf218229dd8dc345315e1511 AUX rspamd-2.6-unbundle-lua.patch 1344 BLAKE2B 0d5e07043f5bff29ef484e7708cd3b0fda36e500c6846772c6299fd43499e46c0f453c873c89a82a48b7402e6cbb5cd2d20f4547d831d490ceac99f0aecc7926 SHA512 1c95ce0b6cca05671d3dee9b373dfaf0be1dae45702b5e1165c482141b8b87c367bd5cfbf482309c00872468b379a2a82034d6983ec219e6ef18ae50d4ce48a2 -AUX rspamd-2.6-unbundle-zstd.patch 4085 BLAKE2B aba3487956b3a92296adffc748775ef88dfbbd8595fde5c50e33e67a9d6d517e8f73dc22a288aee73b4131b8c49f84968b9e6aa5c697c7e7a0a68b7f938cac38 SHA512 9c9a2ac7bd25fdc9dd2ae6aebd18a1a88358b5de0f2b7bb63b7af5c405125e0517df0869e6007f79c87d5f650395589f543581c189b91d1cbc1e8ab76c2df0ee AUX rspamd-2.7-cmake-lua-version.patch 1121 BLAKE2B 7fa15211805ebd90655eb696cb39d59215315fa55e2e286555f05c505af629119fa0e851dc2a7dd00779e06610d20e590cd57e08aca8557c752c3ab1bfc49bd3 SHA512 2977a94e4e2878a4148e292bc36f605df850145e011e8ef4c35d590ff203327c457c3856a8033d527428bf23673f54807acb912fb171c0550195b3cbf605cb6f AUX rspamd-2.7-unbundle-zstd.patch 4047 BLAKE2B 2a93a17980915a5dc12e20f89922d2e58a73df555ba41c7e8e39a65ccb507673d900fee4b25f1539a7cf516fcf92e1ecacfc5eb1f0c154830700e2ca95acef8b SHA512 ae589dcecfb15980ec94924d1a5c4e27d8a297fa11ae8c9c40ca4b8fb523039df1f8ee193c936b30b4c6e1fc31b301ce07fb08645778defefe3351ea6df43dd9 +AUX rspamd-3.0-cmake-lua-version.patch 1444 BLAKE2B b44ada90d1d4d59f000ab75a5d28545902235c85ccab3408eefb8f034bec0c86f6a62678cc5632c7db61b19e7cc1afff2b92a8f1493c64fbe831b3eca3836322 SHA512 f382af60698dd23e69469d6dfaf3c18cef0f413b22918725aec5dd09ee3f8c339d3a6ce92f46ebca89690ce57cab3295ab3093b502af7bce4ce5576c7fd3de9a +AUX rspamd-3.0-system-libfmt.patch 1860 BLAKE2B 50754cbcc3bf687fb0274af69d5985b3da2278444819c43d7b51ee11b97776eb49e303f0d606538dd67295efb1e66d0265cc44ad8882a482c01b7733cfc46228 SHA512 6d64681d4ba6f6e93dc2f021041e0cb72309e369daaeb93f42ff9ee34ce6a9ea05db4a7ff21948788717d18d89287d2c0a9454a60b3f9bb9f72dab5be60ce7b2 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 AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8 -DIST rspamd-2.6.tar.gz 5079444 BLAKE2B acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372 SHA512 79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a DIST rspamd-2.7.tar.gz 5126227 BLAKE2B 70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930 SHA512 8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7 -EBUILD rspamd-2.6-r102.ebuild 2678 BLAKE2B 043739d93a7efa4696d8b17676fdda23edeaa3531901018101de0f2e6e86fa52023aad25bcb34ed517f497aa0cd2e56dedcf36d2a9dc11db0ce79976a340e176 SHA512 c50ae90d349c5b002f0e44af063c5539f6b20c3b35c0595c5e4e1a4493ae709235bcb620844811be9469627be55c0d4dfccb899eaafe3725c9f1e764249fa294 +DIST rspamd-3.0.tar.gz 5535659 BLAKE2B 605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa SHA512 1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4 EBUILD rspamd-2.7-r102.ebuild 2678 BLAKE2B 22cbf33c83da07e9dd087d8350efe5a900fb9bce2b9d0da7ee9380259bddc09a8263f279f019ce52f463bea8ef6bfbbf08828dfc98f07f376b039680ae5614b2 SHA512 767b03d9fb333edf5d4854e20392e4bd585de4f8adcc125dfaa3bd0c102dd2dc46431eae5e2dd7d5d3bdd945343312fe3464872b75236fa0c031ae13237dd8f3 -EBUILD rspamd-9999.ebuild 2680 BLAKE2B e881d40635fedb395eb2579f88ffb617264049b162f675ae4c8ffdcff81106c147302fdf3b5cc959fee00bbd2fde95104800a20a3c6a57996e03fdd10792d243 SHA512 7c185029e5a1de614fd7a207331909093a261a4fd5ecc4af37e37f44683d4721c0ddfceac4beba7bcbaea7d365023cb0c1299a1b3b8dd2d7e1bb6ab462cc8b77 +EBUILD rspamd-3.0.ebuild 2845 BLAKE2B 1189974898087b675103d9aa84506c391fe4809ddb2b5b0f68ed0bf8f3d971a6068d251aecbd853a1c94811467eec809e27b66b3864ca0628cd4725094e12a78 SHA512 484dbdce9fe79ed25474b0fcfdcc01459564b9d01e1fecaf5345ccfe5100fef0d3bf7d4bf10ceffa396757c5308e5f3a06bc1cdae1f718b2262d0affb7585b8d +EBUILD rspamd-9999.ebuild 2813 BLAKE2B 33ce7c32935fd0799dc00723d239cf1a05ffef2f37f2bf734047b1bac8b365ce174e04232c8f68688006e7774e02b8ef010fd2d8d179898eb32593d2fb6cd1f9 SHA512 8070cc687811f657b6cd7d0853cfae544b40b179d4eea0e1ad1bed288b449f731fa26bb0cf6093e6e42e324f7a5969eb84178106ed5cdad801ef0ae1d7bd25d2 MISC metadata.xml 683 BLAKE2B 88aae3128d411106650ed6fc0558c5b36419fffc01a6c09a0b23e85bdc6f4a02fa8f086f794dec814a78e40956f0ca3256de5700574ff4547309b868869fbb16 SHA512 a0367a901b8294cab8e725dce17ce5e9c9195aa9a62a1b5925b213875e5706509973d9d7bd2ee3057ee9892a05132f868f81cf2a0193f9fdc5eb9235c09093aa diff --git a/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch b/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch deleted file mode 100644 index 1a7f4453c86f..000000000000 --- a/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 90caf4048..e2e5d182c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -198,6 +198,8 @@ ELSE() - ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3) - ENDIF() - -+ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h -+ ROOT ${ZSTD_ROOT_DIR} MODULES libzstd) - ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite - ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite) - ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h -@@ -615,7 +617,6 @@ ADD_SUBDIRECTORY(contrib/http-parser) - ADD_SUBDIRECTORY(contrib/fpconv) - ADD_SUBDIRECTORY(contrib/lc-btrie) - ADD_SUBDIRECTORY(contrib/libottery) --ADD_SUBDIRECTORY(contrib/zstd) - IF(ENABLE_SNOWBALL MATCHES "ON") - ADD_SUBDIRECTORY(contrib/snowball) - SET(WITH_SNOWBALL 1) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 54b2e4083..e0e2edd58 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -181,7 +181,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser) - TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv) - TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb) - TARGET_LINK_LIBRARIES(rspamd-server lcbtrie) --TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd) - TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8) - - IF (ENABLE_CLANG_PLUGIN MATCHES "ON") -diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c -index bcb25672e..48ca58e94 100644 ---- a/src/client/rspamdclient.c -+++ b/src/client/rspamdclient.c -@@ -19,7 +19,7 @@ - #include "libserver/http/http_private.h" - #include "libserver/protocol_internal.h" - #include "unix-std.h" --#include "contrib/zstd/zstd.h" -+#include <zstd.h> - - #ifdef HAVE_FETCH_H - #include <fetch.h> -diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c -index 78e3fc79f..40110c693 100644 ---- a/src/libserver/cfg_utils.c -+++ b/src/libserver/cfg_utils.c -@@ -36,8 +36,7 @@ - #include "contrib/libottery/ottery.h" - #include "contrib/fastutf8/fastutf8.h" - --#define ZSTD_STATIC_LINKING_ONLY --#include "contrib/zstd/zstd.h" -+#include <zstd.h> - - #ifdef HAVE_OPENSSL - #include <openssl/rand.h> -diff --git a/src/libserver/maps/map.c b/src/libserver/maps/map.c -index 8b9f522b2..8cf03ffd6 100644 ---- a/src/libserver/maps/map.c -+++ b/src/libserver/maps/map.c -@@ -23,7 +23,7 @@ - #include "libserver/http/http_connection.h" - #include "libserver/http/http_private.h" - #include "rspamd.h" --#include "contrib/zstd/zstd.h" -+#include <zstd.h> - #include "contrib/libev/ev.h" - #include "contrib/uthash/utlist.h" - -diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c -index 9d1276064..6f0a66fb8 100644 ---- a/src/libserver/protocol.c -+++ b/src/libserver/protocol.c -@@ -21,7 +21,7 @@ - #include "worker_private.h" - #include "libserver/cfg_file_private.h" - #include "libmime/scan_result_private.h" --#include "contrib/zstd/zstd.h" -+#include <zstd.h> - #include "lua/lua_common.h" - #include "unix-std.h" - #include "protocol_internal.h" -diff --git a/src/libserver/task.c b/src/libserver/task.c -index 53da0dae6..6538abdbf 100644 ---- a/src/libserver/task.c -+++ b/src/libserver/task.c -@@ -25,7 +25,7 @@ - #include "stat_api.h" - #include "unix-std.h" - #include "utlist.h" --#include "contrib/zstd/zstd.h" -+#include <zstd.h> - #include "libserver/mempool_vars_internal.h" - #include "libserver/cfg_file_private.h" - #include "libmime/lang_detection.h" -diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c -index 0787736d5..21474317a 100644 ---- a/src/lua/lua_util.c -+++ b/src/lua/lua_util.c -@@ -17,7 +17,7 @@ - #include "html.h" - #include "tokenizers/tokenizers.h" - #include "unix-std.h" --#include "contrib/zstd/zstd.h" -+#include <zstd.h> - #include "contrib/uthash/utlist.h" - #include "libmime/email_addr.h" - #include "libmime/content_type.h" -diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c -index 4ed8cfab7..5f8808e40 100644 ---- a/src/rspamd_proxy.c -+++ b/src/rspamd_proxy.c -@@ -36,7 +36,7 @@ - #include "libserver/milter.h" - #include "libserver/milter_internal.h" - #include "libmime/lang_detection.h" --#include "contrib/zstd/zstd.h" -+#include <zstd.h> - - #include <math.h> - --- -2.26.2 - diff --git a/mail-filter/rspamd/files/rspamd-2.6-cmake-lua-version.patch b/mail-filter/rspamd/files/rspamd-3.0-cmake-lua-version.patch index 141b13dfa8af..55665b887c3b 100644 --- a/mail-filter/rspamd/files/rspamd-2.6-cmake-lua-version.patch +++ b/mail-filter/rspamd/files/rspamd-3.0-cmake-lua-version.patch @@ -1,10 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b53793008..5d092d654 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -139,40 +139,8 @@ +@@ -147,55 +147,8 @@ IF(ENABLE_LUAJIT MATCHES "ON") ELSE(ENABLE_LUAJIT MATCHES "ON") ProcessPackage(LIBLUA LIBRARY "lua" - "lua-5.3" +- LIB_SUFFIXES "lua5.3" - INCLUDE lua.h INCLUDE_SUFFIXES - "include/lua-5.3" - "include/lua5.3" @@ -16,29 +19,46 @@ - - IF (NOT WITH_LIBLUA) - ProcessPackage(LIBLUA LIBRARY "lua" -- "lua-5.2" +- "lua-5.4" +- LIB_SUFFIXES "lua5.4" - INCLUDE lua.h INCLUDE_SUFFIXES -- "include/lua-5.2" -- "include/lua5.2" -- "include/lua52" +- "include/lua-5.4" +- "include/lua5.4" +- "include/lua54" - "include/lua" - ROOT ${LUA_ROOT} -- MODULES lua52 +- MODULES lua54 - OPTIONAL) -- - IF (NOT WITH_LIBLUA) - ProcessPackage(LIBLUA LIBRARY "lua" -- "lua-5.1" +- "lua-5.2" +- LIB_SUFFIXES "lua5.2" - INCLUDE lua.h INCLUDE_SUFFIXES -- "include/lua-5.1" -- "include/lua5.1" -- "include/lua51" +- "include/lua-5.2" +- "include/lua5.2" +- "include/lua52" - "include/lua" - ROOT ${LUA_ROOT} -- MODULES lua51) +- MODULES lua52 +- OPTIONAL) +- +- IF (NOT WITH_LIBLUA) +- ProcessPackage(LIBLUA LIBRARY "lua" +- "lua-5.1" +- INCLUDE lua.h INCLUDE_SUFFIXES +- "include/lua-5.1" +- "include/lua5.1" +- "include/lua51" +- "include/lua" +- ROOT ${LUA_ROOT} +- MODULES lua51) +- ENDIF() - ENDIF() - ENDIF() + MODULES lua) ENDIF(ENABLE_LUAJIT MATCHES "ON") IF(ENABLE_JEMALLOC MATCHES "ON" AND NOT SANITIZE) +-- +2.26.3 + diff --git a/mail-filter/rspamd/files/rspamd-3.0-system-libfmt.patch b/mail-filter/rspamd/files/rspamd-3.0-system-libfmt.patch new file mode 100644 index 000000000000..a6439b465e92 --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-3.0-system-libfmt.patch @@ -0,0 +1,48 @@ +From 309bb213cffb23e6bee98157b53cf5db31f97ef9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz> +Date: Sat, 21 Aug 2021 11:24:35 +0200 +Subject: [PATCH] Add SYSTEM_FMT cmake option + +This gives packagers option to use system version of fmt rather than +bundled one. It is disabled by default. +--- + +Merged-to-upstream: https://github.com/rspamd/rspamd/pull/3855 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2c38758f3..fc4175677 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,6 +58,7 @@ OPTION(ENABLE_LIBUNWIND "Use libunwind to print crash traces [default: OFF]" + OPTION(ENABLE_LUA_TRACE "Trace all Lua C API invocations [default: OFF]" OFF) + OPTION(ENABLE_LUA_REPL "Enables Lua repl (requires C++11 compiler) [default: ON]" ON) + OPTION(SYSTEM_ZSTD "Use system zstd instead of bundled one [default: OFF]" OFF) ++OPTION(SYSTEM_FMT "Use system fmt instead of bundled one [defalut: OFF]" OFF) + + ############################# INCLUDE SECTION ############################################# + +@@ -117,7 +118,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/" + "${CMAKE_SOURCE_DIR}/contrib/lc-btrie" + "${CMAKE_SOURCE_DIR}/contrib/lua-lpeg" + "${CMAKE_SOURCE_DIR}/contrib/frozen/include" +- "${CMAKE_SOURCE_DIR}/contrib/fmt/include" + "${CMAKE_SOURCE_DIR}/contrib/doctest" + "${CMAKE_SOURCE_DIR}/contrib/fu2/include" + "${CMAKE_BINARY_DIR}/src" #Stored in the binary dir +@@ -650,7 +650,12 @@ ADD_SUBDIRECTORY(contrib/libev) + ADD_SUBDIRECTORY(contrib/kann) + ADD_SUBDIRECTORY(contrib/fastutf8) + ADD_SUBDIRECTORY(contrib/google-ced) +-ADD_SUBDIRECTORY(contrib/fmt) ++IF(SYSTEM_FMT MATCHES "OFF") ++ ADD_SUBDIRECTORY(contrib/fmt) ++ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/contrib/fmt/include") ++ELSE() ++ find_package(fmt) ++ENDIF() + ADD_SUBDIRECTORY(contrib/doctest) + + IF (NOT WITH_LUAJIT) +-- +2.31.1 + diff --git a/mail-filter/rspamd/rspamd-2.6-r102.ebuild b/mail-filter/rspamd/rspamd-3.0.ebuild index fc005db11e85..1a472d6db57b 100644 --- a/mail-filter/rspamd/rspamd-2.6-r102.ebuild +++ b/mail-filter/rspamd/rspamd-3.0.ebuild @@ -12,17 +12,20 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 x86" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Rapid spam filtering system" HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd" LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB" SLOT="0" -IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2" +IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 test" +RESTRICT="!test? ( test )" +# A part of tests use ffi luajit extension REQUIRED_USE="${LUA_REQUIRED_USE} - jit? ( lua_single_target_luajit )" + jit? ( lua_single_target_luajit ) + test? ( lua_single_target_luajit )" RDEPEND="${LUA_DEPS} $(lua_gen_cond_dep ' @@ -35,6 +38,7 @@ RDEPEND="${LUA_DEPS} dev-libs/glib:2 dev-libs/icu:= dev-libs/libev + dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/snowball-stemmer sys-apps/file @@ -54,16 +58,16 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/rspamd-2.6-cmake-lua-version.patch" - "${FILESDIR}/rspamd-2.6-unbundle-lua.patch" - "${FILESDIR}/rspamd-2.6-unbundle-zstd.patch" - "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" + "${FILESDIR}/${P}-cmake-lua-version.patch" + "${FILESDIR}/${P}-system-libfmt.patch" + "${FILESDIR}/${PN}-2.6-unbundle-lua.patch" + "${FILESDIR}/${PN}-2.5-unbundle-snowball.patch" ) src_prepare() { cmake_src_prepare - rm -vrf contrib/{lua-bit,snowball,zstd} || die + rm -vrf contrib/{fmt,lua-bit,snowball,zstd} || die sed -i -e 's/User=_rspamd/User=rspamd/g' \ rspamd.service \ @@ -76,6 +80,10 @@ src_configure() { -DRUNDIR=/var/run/rspamd -DDBDIR=/var/lib/rspamd -DLOGDIR=/var/log/rspamd + + -DSYSTEM_FMT=ON + -DSYSTEM_ZSTD=ON + -DENABLE_BLAS=$(usex blas ON OFF) -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) @@ -86,7 +94,7 @@ src_configure() { } src_test() { - cmake_src_test + cmake_build run-test } src_install() { diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild index a78a8bfb768c..ebf109b74cd2 100644 --- a/mail-filter/rspamd/rspamd-9999.ebuild +++ b/mail-filter/rspamd/rspamd-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit cmake lua-single pax-utils systemd tmpfiles @@ -19,10 +19,13 @@ DESCRIPTION="Rapid spam filtering system" HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd" LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB" SLOT="0" -IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2" +IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 test" +RESTRICT="!test? ( test )" +# A part of tests use ffi luajit extension REQUIRED_USE="${LUA_REQUIRED_USE} - jit? ( lua_single_target_luajit )" + jit? ( lua_single_target_luajit ) + test? ( lua_single_target_luajit )" RDEPEND="${LUA_DEPS} $(lua_gen_cond_dep ' @@ -35,6 +38,7 @@ RDEPEND="${LUA_DEPS} dev-libs/glib:2 dev-libs/icu:= dev-libs/libev + dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/snowball-stemmer sys-apps/file @@ -54,16 +58,15 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/rspamd-2.7-cmake-lua-version.patch" + "${FILESDIR}/rspamd-3.0-cmake-lua-version.patch" "${FILESDIR}/rspamd-2.6-unbundle-lua.patch" - "${FILESDIR}/rspamd-2.7-unbundle-zstd.patch" "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" ) src_prepare() { cmake_src_prepare - rm -vrf contrib/{lua-bit,snowball,zstd} || die + rm -vrf contrib/{fmt,lua-bit,snowball,zstd} || die sed -i -e 's/User=_rspamd/User=rspamd/g' \ rspamd.service \ @@ -76,6 +79,10 @@ src_configure() { -DRUNDIR=/var/run/rspamd -DDBDIR=/var/lib/rspamd -DLOGDIR=/var/log/rspamd + + -DSYSTEM_FMT=ON + -DSYSTEM_ZSTD=ON + -DENABLE_BLAS=$(usex blas ON OFF) -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) @@ -86,7 +93,7 @@ src_configure() { } src_test() { - cmake_src_test + cmake_build run-test } src_install() { |