Subject: [alpine-aports] [PATCH] testing/rspamd: upgrade to 1.4.3

From: Valery Kartel <[email-masked]>
Date: Wed, 25 Jan 2017 00:19:28 +0200

---
 testing/rspamd/APKBUILD                   | 21 ++++++------
 testing/rspamd/CMakeLists-fix-armhf.patch | 53 -------------------------------
 2 files changed, 9 insertions(+), 65 deletions(-)
 delete mode 100644 testing/rspamd/CMakeLists-fix-armhf.patch

diff --git a/testing/rspamd/APKBUILD b/testing/rspamd/APKBUILD
index 726efe3f1c..5640973c4c 100644
--- a/testing/rspamd/APKBUILD
+++ b/testing/rspamd/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Valery Kartel <[email-masked]>
 # Contributor: Nathan Angelacos <[email-masked]>
 pkgname=rspamd
-pkgver=1.4.2
+pkgver=1.4.3
 pkgrel=0
 pkgdesc="Fast, free and open-source spam filtering system"
 url="https://rspamd.com"
@@ -22,7 +22,7 @@ source="https://rspamd.com/downloads/$pkgname-$pkgver.tar.xz
 	$pkgname.confd
 	config.patch
 	cmakelists.patch
-	CMakeLists-fix-armhf.patch"
+	"
 builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
@@ -100,30 +100,27 @@ fuzzy() {
 
 utils() {
 	depends="perl"
-	pkgdesc="$pkgdesc (utils)"
+	pkgdesc="$pkgdesc (utilities)"
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/${pkgname}_stats "$subpkgdir"/usr/bin/${pkgname}-stats
 	mv "$pkgdir"/usr/bin/${pkgname}-redirector "$subpkgdir"/usr/bin
 }
 
-md5sums="b6177ed765bd758cc6b051f8fea2a3d1  rspamd-1.4.2.tar.xz
+md5sums="a64e00b906b7f3590e855be50106f99f  rspamd-1.4.3.tar.xz
 c152c6a90f6ae9e5a7a1d137dfbc0305  rspamd.logrotated
 0656acc12dcce7cba232857a848d0390  rspamd.initd
 ab12f33ad8e12a7437fb5ea4a9c92eef  rspamd.confd
 ff0bf4f1b1447ca401865369f91418f1  config.patch
-83f76787389649af63ea921f81cf35b3  cmakelists.patch
-8d0c4f4b9a7e0b20eaa8ac148371dc8b  CMakeLists-fix-armhf.patch"
-sha256sums="d106f98a632ffc5cbc5e7482067d568db7687a2ffb078f97f528f9202f90a5a1  rspamd-1.4.2.tar.xz
+83f76787389649af63ea921f81cf35b3  cmakelists.patch"
+sha256sums="144cddc25ce8d8519b289d2c00d34b37c931f3c7293e2b0d16c408680021a1bf  rspamd-1.4.3.tar.xz
 6c5e79e9052d957f3d0d634b2ae7a56bbc0901a5d6946dc991c92f19a72fce97  rspamd.logrotated
 5bcf68a72e0582859799cd335a14d48914e5291f4087327b3b42562ef64e2958  rspamd.initd
 fceba39a20755d48ef3838f7daa92ed9686a118c0a26f06bfe72cc7c15b2e384  rspamd.confd
 7e0adb4a2e7e8f806fc5fdae0c37e6948ed56e9d46d4eed0c681806decb90e49  config.patch
-d4bc7851bb32b49be98e3964aa9195033b586da27f7f3afa5ce12dfbeadd96b0  cmakelists.patch
-2cde427fcdc543fe85ce1a409a047dba3c53fd57d1f1d54fcdf86392d87209e0  CMakeLists-fix-armhf.patch"
-sha512sums="7a2c9c736d6612088eb8d48e313feec310c740263aa3a5e30b1ae88937ecf088de533589a8ef783e238fe3dc5e579592220bd86ea0e45672bd3fc06c52f96782  rspamd-1.4.2.tar.xz
+d4bc7851bb32b49be98e3964aa9195033b586da27f7f3afa5ce12dfbeadd96b0  cmakelists.patch"
+sha512sums="bae86953d881be446f049384cc8bf8451b04619b461a7e2d571407d5af5f2547af8bc9db578e84190e8c55d01f9e32ea1d29e998daa2bbb2fac431ed50df27ca  rspamd-1.4.3.tar.xz
 2efe28575c40d1fba84b189bb872860e744400db80dce2f6330be6c6287fb3f46e6511284729b957488bf40bcb9b0952e26df9934f5f138334bd2766075c45cb  rspamd.logrotated
 e240983c2fd91d8061b17e35e83a75c56ac2c3625dbe07b83a2e89e3dbf69b57c675d01772b93968aa6b22d150d54d366f2fb4a0c6551b3cfdedc77d82e28652  rspamd.initd
 1320a752cbefe021079b3ed23e312231c39fc600baba7d8440c3e8bdd33ed673c8831b44a0c76788a8d905469e81088adf26cf245c09b4c2c4fdce7ff4219ee7  rspamd.confd
 2089429e6f44f8204f31c87c565cdd7abcd51b3146397ba1b2fb23b1be6faf46fd8ec36718f194a3fc38ac1d38d7be9010a84ac4b49d7e1597706699538c607a  config.patch
-99593c10ffb04c71a4c83c7522b41f12465a9862283685bbc2fff464fd84fcf8b4bc4a892419d31332c01f805c69dd7730f537c60248b92fee35acdc6633a644  cmakelists.patch
-bfdbefcff938f961c31852f7843b2e04ea8aa2bc0da0887b59b88d33e1f0ed9d38670e91be17157b70aafa70a65215878064c20eb9a16c223df44552b98d26fc  CMakeLists-fix-armhf.patch"
+99593c10ffb04c71a4c83c7522b41f12465a9862283685bbc2fff464fd84fcf8b4bc4a892419d31332c01f805c69dd7730f537c60248b92fee35acdc6633a644  cmakelists.patch"
diff --git a/testing/rspamd/CMakeLists-fix-armhf.patch b/testing/rspamd/CMakeLists-fix-armhf.patch
deleted file mode 100644
index 88b6a99c78..0000000000
--- a/testing/rspamd/CMakeLists-fix-armhf.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 0c7d5f32de56ee254c4b1abc63e7c3709afd1cb2 Mon Sep 17 00:00:00 2001
-From: Vsevolod Stakhov <[email-masked]>
-Date: Sat, 10 Dec 2016 13:21:24 +0000
-Subject: [PATCH] [Minor] Try to fix build on non x86 architectures
-
----
- src/libcryptobox/CMakeLists.txt | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/libcryptobox/CMakeLists.txt b/src/libcryptobox/CMakeLists.txt
-index 637bfde..0ca8a2f 100644
---- a/src/libcryptobox/CMakeLists.txt
-+++ b/src/libcryptobox/CMakeLists.txt
-@@ -32,12 +32,12 @@ SET(ASM_CODE "
- 	")
- ASM_OP(HAVE_DOLLARMACRO "dollar macro convention")
- 
--IF(NOT HAVE_SLASHMACRO AND NOT HAVE_DOLLARMACRO)
--	MESSAGE(FATAL_ERROR "Your assembler cannot compile macros, please check your CMakeFiles/CMakeError.log")
--ENDIF()
--
- # For now we support only x86_64 architecture with optimizations
- IF("${ARCH}" STREQUAL "x86_64")
-+	IF(NOT HAVE_SLASHMACRO AND NOT HAVE_DOLLARMACRO)
-+		MESSAGE(FATAL_ERROR "Your assembler cannot compile macros, please check your CMakeFiles/CMakeError.log")
-+	ENDIF()
-+
- 	SET(ASM_CODE "vpaddq %ymm0, %ymm0, %ymm0")
- 	ASM_OP(HAVE_AVX2 "avx2")
- 	SET(ASM_CODE "vpaddq %xmm0, %xmm0, %xmm0")
-From 4e5fae43635e824e1b48f10af0bea7dccee0412d Mon Sep 17 00:00:00 2001
-From: Vsevolod Stakhov <[email-masked]>
-Date: Sat, 10 Dec 2016 14:29:22 +0000
-Subject: [PATCH] [Minor] Leftover for i386
-
----
- src/libcryptobox/CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/libcryptobox/CMakeLists.txt b/src/libcryptobox/CMakeLists.txt
-index 0ca8a2f..aef9c9d 100644
---- a/src/libcryptobox/CMakeLists.txt
-+++ b/src/libcryptobox/CMakeLists.txt
-@@ -61,6 +61,9 @@ IF("${ARCH}" STREQUAL "x86_64")
- 
- 	SET(BLAKE2SRC ${BLAKE2SRC} ${CMAKE_CURRENT_SOURCE_DIR}/blake2/x86-64.S)
- ELSEIF("${ARCH}" STREQUAL "i386")
-+	IF(NOT HAVE_SLASHMACRO AND NOT HAVE_DOLLARMACRO)
-+		MESSAGE(FATAL_ERROR "Your assembler cannot compile macros, please check your CMakeFiles/CMakeError.log")
-+	ENDIF()
- 	SET(POLYSRC ${POLYSRC} ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/ref-32.c)
- 	SET(CURVESRC ${CURVESRC} ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519-donna.c)
- 	SET(BLAKE2SRC ${BLAKE2SRC} ${CMAKE_CURRENT_SOURCE_DIR}/blake2/x86-32.S)
-- 
2.11.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---