Date: Saturday, October 12, 2019 @ 15:06:45 Author: alucryd Revision: 515239
upgpkg: rspamd 2.0-1 Modified: rspamd/trunk/PKGBUILD ----------+ PKGBUILD | 57 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-10-12 14:54:58 UTC (rev 515238) +++ PKGBUILD 2019-10-12 15:06:45 UTC (rev 515239) @@ -4,8 +4,8 @@ # Contributor: mezcal pkgname=rspamd -pkgver=1.9.4 -pkgrel=3 +pkgver=2.0 +pkgrel=1 epoch= pkgdesc='Fast, free and open-source spam filtering system' arch=(x86_64) @@ -18,6 +18,7 @@ icu jemalloc libevent + libsodium luajit openblas openssl @@ -32,19 +33,20 @@ ragel ) backup=( - etc/logrotate.d/rspamd - etc/rspamd/2tld.inc etc/rspamd/actions.conf etc/rspamd/cgp.inc etc/rspamd/common.conf etc/rspamd/composites.conf - etc/rspamd/dmarc_whitelist.inc etc/rspamd/groups.conf etc/rspamd/logging.inc - etc/rspamd/maillist.inc + etc/rspamd/maps.d/dmarc_whitelist.inc + etc/rspamd/maps.d/maillist.inc + etc/rspamd/maps.d/mid.inc + etc/rspamd/maps.d/mime_types.inc + etc/rspamd/maps.d/redirectors.inc + etc/rspamd/maps.d/spf_dkim_whitelist.inc + etc/rspamd/maps.d/surbl-whitelist.inc etc/rspamd/metrics.conf - etc/rspamd/mid.inc - etc/rspamd/mime_types.inc etc/rspamd/modules.conf etc/rspamd/modules.d/antivirus.conf etc/rspamd/modules.d/arc.conf @@ -64,7 +66,6 @@ etc/rspamd/modules.d/greylist.conf etc/rspamd/modules.d/hfilter.conf etc/rspamd/modules.d/history_redis.conf - etc/rspamd/modules.d/ip_score.conf etc/rspamd/modules.d/maillist.conf etc/rspamd/modules.d/metadata_exporter.conf etc/rspamd/modules.d/metric_exporter.conf @@ -75,6 +76,7 @@ etc/rspamd/modules.d/mx_check.conf etc/rspamd/modules.d/neural.conf etc/rspamd/modules.d/once_received.conf + etc/rspamd/modules.d/p0f.conf etc/rspamd/modules.d/phishing.conf etc/rspamd/modules.d/ratelimit.conf etc/rspamd/modules.d/rbl.conf @@ -89,11 +91,8 @@ etc/rspamd/modules.d/surbl.conf etc/rspamd/modules.d/trie.conf etc/rspamd/modules.d/url_redirector.conf - etc/rspamd/modules.d/url_reputation.conf - etc/rspamd/modules.d/url_tags.conf etc/rspamd/modules.d/whitelist.conf etc/rspamd/options.inc - etc/rspamd/redirectors.inc etc/rspamd/rspamd.conf etc/rspamd/scores.d/fuzzy_group.conf etc/rspamd/scores.d/headers_group.conf @@ -108,9 +107,7 @@ etc/rspamd/scores.d/surbl_group.conf etc/rspamd/scores.d/whitelist_group.conf etc/rspamd/settings.conf - etc/rspamd/spf_dkim_whitelist.inc etc/rspamd/statistic.conf - etc/rspamd/surbl-whitelist.inc etc/rspamd/worker-controller.inc etc/rspamd/worker-fuzzy.inc etc/rspamd/worker-normal.inc @@ -118,16 +115,24 @@ ) install=rspamd.install source=( - git+https://github.com/rspamd/rspamd.git#tag=${pkgver} + git+https://github.com/rspamd/rspamd.git#tag=8d31adb5cb9f6d908c345fb08a04826526589f91 rspamd.tmpfiles rspamd.sysusers rspamd.logrotate ) -sha256sums=('SKIP' - '4ee186f046d9ca22168a7e31dcf02cc7cd09ea60fb82ae60144b78fdd846a9a5' - 'cd76079124ad65419d9339165ac517af6834fb507e67b45720c66246159c402b' - '91edb06d8413f5c1237a6072c576a2701e64a4d4ac30f7a2c043f639d37a532b') +sha256sums=( + SKIP + 4ee186f046d9ca22168a7e31dcf02cc7cd09ea60fb82ae60144b78fdd846a9a5 + cd76079124ad65419d9339165ac517af6834fb507e67b45720c66246159c402b + 91edb06d8413f5c1237a6072c576a2701e64a4d4ac30f7a2c043f639d37a532b +) +pkgver() { + cd rspamd + + git describe --tags +} + prepare() { if [[ -d build ]]; then rm -rf build @@ -136,8 +141,8 @@ cd rspamd - git cherry-pick -n f24be0299381702d7fa5ad4695f1c5debfad78a9 sed 's/_rspamd/rspamd/g' -i rspamd.service + git cherry-pick -n 42a4b088c79eb86aa44cd44ce7d19c862e5289b9 } build() { @@ -160,14 +165,14 @@ } package() { - cd build + cd build - DESTDIR="${pkgdir}" cmake --build . --target install + DESTDIR="${pkgdir}" cmake --build . --target install - install -Dm 644 ../rspamd/LICENSE.md -t "${pkgdir}"/usr/share/licenses/rspamd - install -Dm 644 ../rspamd.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/rspamd.conf - install -Dm 644 ../rspamd.sysusers "${pkgdir}"/usr/lib/sysusers.d/rspamd.conf - install -Dm 644 ../rspamd.logrotate "${pkgdir}"/etc/logrotate.d/rspamd + install -Dm 644 ../rspamd/LICENSE.md -t "${pkgdir}"/usr/share/licenses/rspamd + install -Dm 644 ../rspamd.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/rspamd.conf + install -Dm 644 ../rspamd.sysusers "${pkgdir}"/usr/lib/sysusers.d/rspamd.conf + install -Dm 644 ../rspamd.logrotate "${pkgdir}"/etc/logrotate.d/rspamd } # vim: set ts=2 sw=2 et:
