diff options
| author | Valery Kartel <valery.kartel@gmail.com> | 2016-12-30 01:51:16 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-01-07 17:25:41 +0100 |
| commit | 7ddddff30cd81e03a5e12e36f4aa76c114a965a9 (patch) | |
| tree | dadb18154b59ac814ee4bfbd89eb9f840c0c04e8 | |
| parent | d1567cd92565fde357952208fce53e91fad7b291 (diff) | |
testing/rspamd: upgrade to 1.4.1
| -rw-r--r-- | testing/rspamd/APKBUILD | 33 | ||||
| -rw-r--r-- | testing/rspamd/cmakelists.patch | 10 | ||||
| -rw-r--r-- | testing/rspamd/rspamd.confd | 4 | ||||
| -rw-r--r-- | testing/rspamd/rspamd.pre-install | 2 |
4 files changed, 29 insertions, 20 deletions
diff --git a/testing/rspamd/APKBUILD b/testing/rspamd/APKBUILD index 54fba8e8e16..802d928e55e 100644 --- a/testing/rspamd/APKBUILD +++ b/testing/rspamd/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Contributor: Nathan Angelacos <nangel@alpinelinux.org> pkgname=rspamd -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=0 pkgdesc="Fast, free and open-source spam filtering system" url="https://rspamd.com" @@ -11,10 +11,8 @@ license="BSD" pkgusers="rspamd" pkggroups="rspamd" depends="" -depends_dev="" -makedepends="$depends_dev cmake ragel perl - lua-dev glib-dev pcre-dev gmime-dev libevent-dev sqlite-dev - libressl-dev file-dev curl-dev" +makedepends="cmake ragel perl lua-dev glib-dev pcre-dev gmime-dev + libevent-dev sqlite-dev libressl-dev file-dev curl-dev" install="$pkgname.pre-install" subpackages="$pkgname-doc $pkgname-controller::noarch $pkgname-client $pkgname-fuzzy::noarch $pkgname-utils::noarch" @@ -23,9 +21,9 @@ source="https://rspamd.com/downloads/$pkgname-$pkgver.tar.xz $pkgname.initd $pkgname.confd config.patch + cmakelists.patch " - -builddir="$srcdir"/$pkgname-$pkgver +builddir="$srcdir/$pkgname-$pkgver" build() { cd "$builddir" @@ -108,18 +106,21 @@ utils() { mv "$pkgdir"/usr/bin/${pkgname}-redirector "$subpkgdir"/usr/bin } -md5sums="923b0d5fae691916feb243d61d48609f rspamd-1.4.0.tar.xz +md5sums="e17039309da0039aab8e966692705437 rspamd-1.4.1.tar.xz c152c6a90f6ae9e5a7a1d137dfbc0305 rspamd.logrotated 0656acc12dcce7cba232857a848d0390 rspamd.initd -ecfea2a25b95727ae91c04001fbd3e46 rspamd.confd -ff0bf4f1b1447ca401865369f91418f1 config.patch" -sha256sums="30c9acf93bdcc6c009524c8b2770931475929c6c9e948faa90d7412306055a1c rspamd-1.4.0.tar.xz +ab12f33ad8e12a7437fb5ea4a9c92eef rspamd.confd +ff0bf4f1b1447ca401865369f91418f1 config.patch +83f76787389649af63ea921f81cf35b3 cmakelists.patch" +sha256sums="11e39e4b44a85feaf546696d28a72ffc32e35c01a028a251d5175ba58343eb28 rspamd-1.4.1.tar.xz 6c5e79e9052d957f3d0d634b2ae7a56bbc0901a5d6946dc991c92f19a72fce97 rspamd.logrotated 5bcf68a72e0582859799cd335a14d48914e5291f4087327b3b42562ef64e2958 rspamd.initd -82be6a663af2e2333b0dfbbbfd05a9ff3d02e05c7e506235b1b0dbd9d0b72972 rspamd.confd -7e0adb4a2e7e8f806fc5fdae0c37e6948ed56e9d46d4eed0c681806decb90e49 config.patch" -sha512sums="39bfccee070b829f3ea5019ebde0020a850abf7fe92f7e5bb5b9212088d4c98544e6f55228984d3422c09c31f356b209237da6a6eb9c18e3feb7940429de663a rspamd-1.4.0.tar.xz +fceba39a20755d48ef3838f7daa92ed9686a118c0a26f06bfe72cc7c15b2e384 rspamd.confd +7e0adb4a2e7e8f806fc5fdae0c37e6948ed56e9d46d4eed0c681806decb90e49 config.patch +d4bc7851bb32b49be98e3964aa9195033b586da27f7f3afa5ce12dfbeadd96b0 cmakelists.patch" +sha512sums="bc3be3f20a9692a5d188d9a254ad459dba4ca01ae3c917689943be7eed85e17ab638e0d0b9f4dd574864b4f39eb7a728b7b0ecf3088727a92dfb99a2df4a5a6d rspamd-1.4.1.tar.xz 2efe28575c40d1fba84b189bb872860e744400db80dce2f6330be6c6287fb3f46e6511284729b957488bf40bcb9b0952e26df9934f5f138334bd2766075c45cb rspamd.logrotated e240983c2fd91d8061b17e35e83a75c56ac2c3625dbe07b83a2e89e3dbf69b57c675d01772b93968aa6b22d150d54d366f2fb4a0c6551b3cfdedc77d82e28652 rspamd.initd -0b73b159cec9a4a1d337fbb429814f78da23b55f72c9fb8a777ab5f06634206a4f9b25e587f8dbfa7c3242ac5501ebcc90b9a0e926adfd37e14a12ac4607fa62 rspamd.confd -2089429e6f44f8204f31c87c565cdd7abcd51b3146397ba1b2fb23b1be6faf46fd8ec36718f194a3fc38ac1d38d7be9010a84ac4b49d7e1597706699538c607a config.patch" +1320a752cbefe021079b3ed23e312231c39fc600baba7d8440c3e8bdd33ed673c8831b44a0c76788a8d905469e81088adf26cf245c09b4c2c4fdce7ff4219ee7 rspamd.confd +2089429e6f44f8204f31c87c565cdd7abcd51b3146397ba1b2fb23b1be6faf46fd8ec36718f194a3fc38ac1d38d7be9010a84ac4b49d7e1597706699538c607a config.patch +99593c10ffb04c71a4c83c7522b41f12465a9862283685bbc2fff464fd84fcf8b4bc4a892419d31332c01f805c69dd7730f537c60248b92fee35acdc6633a644 cmakelists.patch" diff --git a/testing/rspamd/cmakelists.patch b/testing/rspamd/cmakelists.patch new file mode 100644 index 00000000000..8bf93568676 --- /dev/null +++ b/testing/rspamd/cmakelists.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -572,7 +572,6 @@ + LIST(APPEND CMAKE_REQUIRED_LIBRARIES rt) + LIST(APPEND CMAKE_REQUIRED_LIBRARIES dl) + LIST(APPEND CMAKE_REQUIRED_LIBRARIES resolv) +- LIST(APPEND CMAKE_REQUIRED_LIBRARIES nsl) + MESSAGE(STATUS "Configuring for Linux") + IF(EXISTS "/etc/debian_version") + SET(LINUX_START_SCRIPT "rspamd_debian.in") diff --git a/testing/rspamd/rspamd.confd b/testing/rspamd/rspamd.confd index 541ffff82da..9b2cc4b34ff 100644 --- a/testing/rspamd/rspamd.confd +++ b/testing/rspamd/rspamd.confd @@ -1,7 +1,5 @@ -# User to run rspamd workers +# User and group to run rspamd workers #user=rspamd - -# Group to run rspamd workers #group=rspamd # Main config file diff --git a/testing/rspamd/rspamd.pre-install b/testing/rspamd/rspamd.pre-install index b37dcf34227..ea132040312 100644 --- a/testing/rspamd/rspamd.pre-install +++ b/testing/rspamd/rspamd.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S rspamd 2>/dev/null -adduser -S -D -H -h /var/lib/rspamd -s /bin/false -G rspamd -g rspamd rspamd 2>/dev/null +adduser -S -D -H -h /var/lib/rspamd -s /sbin/nologin -G rspamd -g rspamd rspamd 2>/dev/null exit 0 |