mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-04 20:06:43 +02:00
testing/rmilter version bump to 1.9.2
refreshed patch files no man pages in upstream source; removed -doc package
This commit is contained in:
Nathan Angelacos
Natanael Copa
parent
b127113bd5
commit
8542dcd91c
@ -1,7 +1,8 @@
|
||||
# Maintainer: Valery Kartel <valery.kartel@gmail.com>
|
||||
# Contributor: Valery Kartel <valery.kartel@gmail.com>
|
||||
# Contributor: Nathan Angelacos <nangel@alpinelinux.org>
|
||||
pkgname=rmilter
|
||||
pkgver=1.7.5
|
||||
pkgver=1.9.2
|
||||
pkgrel=1
|
||||
pkgdesc="Rspamd mail filter"
|
||||
url="https://rspamd.com"
|
||||
@ -12,9 +13,9 @@ pkggroups="rmilter"
|
||||
depends=""
|
||||
depends_dev=""
|
||||
makedepends="$depends_dev cmake bison flex bsd-compat-headers
|
||||
openssl-dev pcre-dev libmilter-dev opendkim-dev hiredis-dev"
|
||||
openssl-dev pcre-dev libmilter-dev opendkim-dev hiredis-dev
|
||||
glib-dev"
|
||||
install="$pkgname.pre-install"
|
||||
subpackages="$pkgname-doc"
|
||||
source="$pkgname-$pkgver.tar.gz::https://github.com/vstakhov/$pkgname/archive/$pkgver.tar.gz
|
||||
$pkgname.conf
|
||||
$pkgname.confd
|
||||
@ -43,21 +44,21 @@ package() {
|
||||
install -Dm644 "$srcdir"/$pkgname.conf "$pkgdir"/etc/$pkgname/$pkgname.conf
|
||||
}
|
||||
|
||||
md5sums="4fd0be3aaf4a5cc2cea997dce8ddb475 rmilter-1.7.5.tar.gz
|
||||
md5sums="c64ad097d79b8bc4efe8fba15b72e6b6 rmilter-1.9.2.tar.gz
|
||||
74b3a71b9e14d548f9bbade386cdacae rmilter.conf
|
||||
e159e4461b765b487f72c05b3d504a9c rmilter.confd
|
||||
a3fa9ba78d3392716d04f27e40e40ac8 rmilter.initd
|
||||
9fe7aea93e81b7e36020f186c5b9288d config_dir.patch
|
||||
388470c71ad9d98088e2338a7b7066b7 system_hiredis.patch"
|
||||
sha256sums="34cf0b6c38dac9b11d6aacd0d093fdf3544d76543cd1aad2b1342e1024768e27 rmilter-1.7.5.tar.gz
|
||||
e4f3e1ea90401b8d55e6a381af05b994 config_dir.patch
|
||||
e5d20803b01b6d47e81a700bd12aa529 system_hiredis.patch"
|
||||
sha256sums="3e44977c39ece541c90ff1075b58847f44d310aa9d4ee49bc2df96e1ee4fb39f rmilter-1.9.2.tar.gz
|
||||
65f602b802766ff71807ca5537c2c17b400e0dfd915223ddeb306db074162019 rmilter.conf
|
||||
fad2d6baea215c3b31750e8128efe557a27024974eca2ff359b8fa921acb9076 rmilter.confd
|
||||
ce592d80851b0a52138bfa97f70c3e98a21555daa9e8a9f3966b7cafca1acc3c rmilter.initd
|
||||
863d36c15386e8927775fd368fdba4b234bbab83bfbd6a156f328b356880a91b config_dir.patch
|
||||
49d964572ba4660bf4a9893eca5ed90b20a64ed02258d99e43687aeed6222852 system_hiredis.patch"
|
||||
sha512sums="4cf76e330e55e5f8542c7a27d18cd593ad2b2f1c0bd45bf3787bce7b1cbfe77752bcff7b6558b89105d034a7f2e31f7805fe2b4bf5b1bb408b18c10646ad0aa8 rmilter-1.7.5.tar.gz
|
||||
1aa29ce0a638356d4ebd75757a2094f9db20ad3895867e3676d5ae1129352760 config_dir.patch
|
||||
12d5050e60bb8c2cd1e5468a65d2f447e83f6bd49c8cac92c54e4cd40ed47e45 system_hiredis.patch"
|
||||
sha512sums="4938515d18d4cff363266348cbd00b85690f889cb479a0e2fb61fa74e1e0deb3e78ec06132537ae001ccec375d0bab10af77c4a4c6fb248dc7f9f929c5a57eb9 rmilter-1.9.2.tar.gz
|
||||
4b577dbe63277dd932be74fad78989366056e3d0b7945af17906da17f685b19d0c58078398277ece4cff6304af8e20f45e61d196c86f933c7c5857efdecbdd81 rmilter.conf
|
||||
d222bcf307e89f110efed524c2d708d3512d4400235091de0250d1f60358f65871667112bdad61bbcd948a9abdb8a46d8c3952cf78585cfb59fcf94f15849062 rmilter.confd
|
||||
2ec3eb3fece210867001cf3a799336c77dfec7dd770442852a14b337205893aaefe24999ca5c0d92706bf8e9f1c8a192282e5c48b7bde2e591b03f721560e6e3 rmilter.initd
|
||||
cd6cd168e0d0d14d62a74e59be7eebff4951f14f017e1b5e688aff78f5f119729c067074e9d12518fe8b4699aaa4c6a78de8c19226b91316844c636ab667fc8e config_dir.patch
|
||||
536d35c2a8797f375f8dc77eb86c2012712ba7a4861f33513c795ef1d902f5db83383a0033e486bac02a5631e012aff96b600216119ab71ffce510a17880c554 system_hiredis.patch"
|
||||
6ac3a1d73e52c156b60cabaabceea6e01c7e5f2dce78a557ccce24127440a8fea713b2465ecdd29486c4283afb6dee723cbcb476f1789bcd3876dd6c6aa5ebd1 config_dir.patch
|
||||
14ddca01c495cc4fa1467deb682f049d91586f0d670c596ee1e1c7c40ba12ca58c40e29ca1d18abb4d19387b668caaf627e2cdd35b172f3ca85f6bfe8fe8295a system_hiredis.patch"
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
--- old/include/cfg_file.h
|
||||
+++ new/include/cfg_file.h
|
||||
@@ -43,6 +43,12 @@
|
||||
diff --git a/src/cfg_file.h b/src/cfg_file.h
|
||||
index a298493..ee87148 100644
|
||||
--- a/src/cfg_file.h
|
||||
+++ b/src/cfg_file.h
|
||||
@@ -39,6 +39,12 @@
|
||||
#include <dkim.h>
|
||||
#endif
|
||||
|
||||
@ -13,9 +15,11 @@
|
||||
#define COND_CONNECT_FLAG 0x1
|
||||
#define COND_HELO_FLAG 0x2
|
||||
#define COND_ENVFROM_FLAG 0x4
|
||||
--- old/src/main.c
|
||||
+++ new/src/main.c
|
||||
@@ -208,7 +208,7 @@
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index 67c1667..b3990a8 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -259,7 +259,7 @@ main(int argc, char *argv[])
|
||||
init_defaults (cfg);
|
||||
|
||||
if (cfg_file == NULL) {
|
||||
|
||||
@ -1,28 +1,30 @@
|
||||
--- old/CMakeLists.txt
|
||||
+++ new/CMakeLists.txt
|
||||
@@ -245,6 +245,8 @@
|
||||
ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
|
||||
ProcessPackage(LIBMILTER LIBRARY milter INCLUDE mfapi.h INCLUDE_SUFFIXES include/libmilter
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ae4dbc4..216b177 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -367,6 +367,8 @@ ProcessPackage(LIBMILTER LIBRARY milter INCLUDE mfapi.h INCLUDE_SUFFIXES include
|
||||
LIB_SUFFIXES lib/libmilter ROOT ${LIBMILTER_ROOT_DIR} MODULES libmilter)
|
||||
ProcessPackage(PCRE LIBRARY pcre INCLUDE pcre.h INCLUDE_SUFFIXES include/pcre
|
||||
ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
|
||||
+ProcessPackage(LIBHIREDIS LIBRARY hiredis INCLUDE hiredis.h INCLUDE_SUFFIXES include/hiredis
|
||||
+ LIB_SUFFIXES lib/libhiredis ROOT ${LIBHIREDIS_ROOT_DIR} MODULES libhiredis)
|
||||
|
||||
IF(ENABLE_DKIM MATCHES "ON")
|
||||
SET(WITH_DKIM 1)
|
||||
@@ -363,8 +365,6 @@
|
||||
CHECK_SYMBOL_EXISTS(MAP_NOCORE sys/mman.h HAVE_MMAP_NOCORE)
|
||||
+ LIB_SUFFIXES lib/libhiredis ROOT ${LIBHIREDIS_ROOT_DIR} MODULES libhiredis)
|
||||
ProcessPackage(GLIB2 LIBRARY glib-2.0 INCLUDE glib.h
|
||||
INCLUDE_SUFFIXES include/glib
|
||||
ROOT ${GLIB_ROOT_DIR} MODULES glib-2.0>=2.28)
|
||||
@@ -388,8 +390,6 @@ IF(ENABLE_MEMCACHED MATCHES "ON")
|
||||
ENDIF()
|
||||
|
||||
################################ SOURCES SECTION ###########################
|
||||
-ADD_SUBDIRECTORY(hiredis)
|
||||
-INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/hiredis")
|
||||
|
||||
SET(RMILTERSRC
|
||||
compat/blake2b-ref.c
|
||||
@@ -394,7 +394,6 @@
|
||||
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/contrib/lc-btrie")
|
||||
ADD_SUBDIRECTORY(contrib/libucl)
|
||||
ADD_SUBDIRECTORY(contrib/http-parser)
|
||||
@@ -419,7 +419,6 @@ CONFIGURE_FILE(config.h.in config.h)
|
||||
ADD_EXECUTABLE(rmilter ${RMILTERSRC})
|
||||
SET_TARGET_PROPERTIES(rmilter PROPERTIES LINKER_LANGUAGE C)
|
||||
TARGET_LINK_LIBRARIES(rmilter ${RMILTER_REQUIRED_LIBRARIES})
|
||||
-TARGET_LINK_LIBRARIES(rmilter rmilter-hiredis)
|
||||
|
||||
##################### INSTALLATION ##########################################
|
||||
|
||||
TARGET_LINK_LIBRARIES(rmilter ucl)
|
||||
TARGET_LINK_LIBRARIES(rmilter xxhash)
|
||||
TARGET_LINK_LIBRARIES(rmilter rmilter-http-parser)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user