New ebuild + patches for rspamd-3.0. The 2.x patches fails on 3.0 - converted to the best of my abilities. Added dependcy on dev-libs/libfmt:0/7 Reproducible: Always Builds and runs for me. mail ~ # emerge -pva rspamd These are the packages that would be merged, in order: Calculating dependencies... done! [ebuild R ] mail-filter/rspamd-3.0::local USE="jemalloc pcre2 -blas -jit" CPU_FLAGS_X86="ssse3" LUA_SINGLE_TARGET="lua5-1 -lua5-3 -luajit" 0 KiB mail ~ # emerge --info Portage 3.0.20 (python 3.9.6-final-0, default/linux/amd64/17.1/no-multilib/hardened, gcc-11.2.0, glibc-2.33-r1, 5.10.58 x86_64) ================================================================= System uname: Linux-5.10.58-x86_64-AMD_GX-412TC_SOC-with-glibc2.33 KiB Mem: 4018144 total, 484352 free KiB Swap: 6291452 total, 6288124 free Timestamp of repository gentoo: Fri, 20 Aug 2021 06:00:01 +0000 Head commit of repository gentoo: 6700b067233b859ace3457f6fa37cc9a1e2c38a6 sh bash 5.1_p8 ld GNU ld (Gentoo 2.35.2 p1) 2.35.2 distcc 3.4 x86_64-pc-linux-gnu [enabled] app-shells/bash: 5.1_p8::gentoo dev-lang/perl: 5.34.0::gentoo dev-lang/python: 3.9.6_p1::gentoo dev-util/cmake: 3.20.5::gentoo sys-apps/baselayout: 2.7::gentoo sys-apps/openrc: 0.42.1-r1::gentoo sys-apps/sandbox: 2.24::gentoo sys-devel/autoconf: 2.69-r5::gentoo sys-devel/automake: 1.16.3-r1::gentoo sys-devel/binutils: 2.35.2::gentoo sys-devel/gcc: 11.2.0::gentoo sys-devel/gcc-config: 2.4::gentoo sys-devel/libtool: 2.4.6-r6::gentoo sys-devel/make: 4.3::gentoo sys-kernel/linux-headers: 5.10::gentoo (virtual/os-headers) sys-libs/glibc: 2.33-r1::gentoo Repositories: local location: /var/db/repos/local sync-type: rsync sync-uri: rsync://rsync.vlh.dk/vlh-portage masters: gentoo priority: -1 sync-rsync-extra-opts: sync-rsync-verify-metamanifest: no gentoo location: /var/db/repos/gentoo sync-type: rsync sync-uri: rsync://rsync.vlh.dk/gentoo-portage priority: 1 sync-rsync-extra-opts: sync-rsync-verify-max-age: 24 sync-rsync-verify-jobs: 1 sync-rsync-verify-metamanifest: no ACCEPT_KEYWORDS="amd64" ACCEPT_LICENSE="@FREE" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-fgraphite-identity -floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block -flto=4 -fuse-linker-plugin -fno-fat-lto-objects -O2 -pipe -fomit-frame-pointer -march=btver2 -mmmx -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -mpclmul -mpopcnt -mabm -mbmi -mavx -msse4.2 -msse4.1 -mlzcnt -mrdrnd -mf16c -mprfchw -mfxsr -mxsave -mxsaveopt --param=l1-cache-size=32 --param=l1-cache-line-size=64 --param=l2-cache-size=2048 -mtune=btver2 -ftree-vectorize" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/share/gnupg/qualified.txt /var/spool/munin-async/.ssh" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo" CXXFLAGS="-fgraphite-identity -floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block -flto=4 -fuse-linker-plugin -fno-fat-lto-objects -O2 -pipe -fomit-frame-pointer -march=btver2 -mmmx -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -mpclmul -mpopcnt -mabm -mbmi -mavx -msse4.2 -msse4.1 -mlzcnt -mrdrnd -mf16c -mprfchw -mfxsr -mxsave -mxsaveopt --param=l1-cache-size=32 --param=l1-cache-line-size=64 --param=l2-cache-size=2048 -mtune=btver2 -ftree-vectorize -flifetime-dse=1" DISTDIR="/var/cache/distfiles" ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR" FCFLAGS="-fgraphite-identity -floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block -flto=4 -fuse-linker-plugin -fno-fat-lto-objects -O2 -pipe -fomit-frame-pointer -march=btver2 -mmmx -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -mpclmul -mpopcnt -mabm -mbmi -mavx -msse4.2 -msse4.1 -mlzcnt -mrdrnd -mf16c -mprfchw -mfxsr -mxsave -mxsaveopt --param=l1-cache-size=32 --param=l1-cache-line-size=64 --param=l2-cache-size=2048 -mtune=btver2 -ftree-vectorize" FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs config-protect-if-modified distcc distlocks ebuild-locks fixlafiles getbinpkg ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr" FFLAGS="-fgraphite-identity -floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block -flto=4 -fuse-linker-plugin -fno-fat-lto-objects -O2 -pipe -fomit-frame-pointer -march=btver2 -mmmx -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -mpclmul -mpopcnt -mabm -mbmi -mavx -msse4.2 -msse4.1 -mlzcnt -mrdrnd -mf16c -mprfchw -mfxsr -mxsave -mxsaveopt --param=l1-cache-size=32 --param=l1-cache-line-size=64 --param=l2-cache-size=2048 -mtune=btver2 -ftree-vectorize" GENTOO_MIRRORS="http://ftp-stud.hs-esslingen.de/pub/Mirrors/gentoo/ ftp://ftp.snt.utwente.nl/pub/os/linux/gentoo http://ftp.halifax.rwth-aachen.de/gentoo/ http://linux.rz.ruhr-uni-bochum.de/download/gentoo-mirror/ http://mirror.netcologne.de/gentoo/" INSTALL_MASK="/lib/systemd /usr/lib/systemd /etc/systemd" LANG="en_US.utf8" LDFLAGS="-Wl,-O1 -Wl,--as-needed -fgraphite-identity -floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block -flto=4 -fuse-linker-plugin -fno-fat-lto-objects -O2 -pipe -fomit-frame-pointer -march=btver2 -mmmx -msse -msse2 -msse3 -mssse3 -msse4a -mcx16 -msahf -mmovbe -maes -mpclmul -mpopcnt -mabm -mbmi -mavx -msse4.2 -msse4.1 -mlzcnt -mrdrnd -mf16c -mprfchw -mfxsr -mxsave -mxsaveopt --param=l1-cache-size=32 --param=l1-cache-line-size=64 --param=l2-cache-size=2048 -mtune=btver2 -ftree-vectorize -flifetime-dse=1" LINGUAS="da en" MAKEOPTS="-j16 -l8" PKGDIR="/var/cache/binpkgs" PORTAGE_BINHOST="http://binhost.vlh.dk/packages" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git" PORTAGE_TMPDIR="/var/tmp" USE="acl amd64 berkdb bzip2 caps crypt dovecot-sasl exif gd geoip2 gnutls graphite hardened iconv idn imap ipv6 leaps-timezone libglvnd libtirpc lto mysql mysqli ncurses nls nptl openmp pam pcre pgo pie pps readline sasl seccomp sieve sockets split-usr ssl ssp syslog udev unicode usb vtv xattr xml xtpax zlib zstd" ABI_X86="64" ADA_TARGET="gnat_2018" CPU_FLAGS_X86="aes avx f16c mmx mmxext pclmul popcnt sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3" ELIBC="glibc" GRUB_PLATFORMS="pc" INPUT_DEVICES="libinput" KERNEL="linux" L10N="da en-US" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" PHP_TARGETS="php7-3 php7-4" PYTHON_SINGLE_TARGET="python3_9" PYTHON_TARGETS="python3_9" RUBY_TARGETS="ruby26" USERLAND="GNU" Unset: CC, CPPFLAGS, CTARGET, CXX, EMERGE_DEFAULT_OPTS, LC_ALL, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, RUSTFLAGS
Created attachment 734668 [details] rspamd-3.0.ebuild
Created attachment 734671 [details, diff] rspamd-3.0-cmake-lua-version.patch
Created attachment 734674 [details, diff] rspamd-3.0-unbundle-lua.patch
Created attachment 734677 [details, diff] rspamd-3.0-unbundle-snowball.patch
Created attachment 734680 [details, diff] rspamd-3.0-unbundle-zstd.patch
Ideally, could you attach it as a git am-able patch? But in any case, with the GCO signoff if you agree (Signed-off-by: Real Name <email>)
(In reply to Sam James from comment #6) > Ideally, could you attach it as a git am-able patch? But in any case, with > the GCO signoff if you agree (Signed-off-by: Real Name <email>) Sorry - not really sure, not used to do patches.... and no experience with git. And GCO signoff - what/where/how?
This ebuild needs more touch, we can use -DSYSTEM_ZSTD=ON now instead of unbundle-zstd patch for example and there is more stuff. I plan to do version bump PR today.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9545e21cc8b4178834e21537b9ff74f9c1032412 commit 9545e21cc8b4178834e21537b9ff74f9c1032412 Author: Petr Vaněk <arkamar@atlas.cz> AuthorDate: 2021-08-21 20:50:40 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2021-08-22 02:49:01 +0000 mail-filter/rspamd: add 3.0 - Use new -DSYSTEM_ZSTD=ON instead of unbundle patch - Apply patch for -DSYSTEM_FMT=ON, it is already merged in upstream - Make the src_test work Closes: https://bugs.gentoo.org/809308 Signed-off-by: Petr Vaněk <arkamar@atlas.cz> Signed-off-by: Sam James <sam@gentoo.org> mail-filter/rspamd/Manifest | 1 + .../files/rspamd-3.0-cmake-lua-version.patch | 64 +++++++++++ .../rspamd/files/rspamd-3.0-system-libfmt.patch | 48 ++++++++ mail-filter/rspamd/rspamd-3.0.ebuild | 123 +++++++++++++++++++++ 4 files changed, 236 insertions(+)
