summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmish2020-09-26 08:59:20 +0530
committerAmish2020-09-26 08:59:20 +0530
commitf63628fc598ea9110d7be8ba8e703fbe61608b96 (patch)
tree439abf189e5016ee1512e58d2db8b0c25fe4760a
parent4bdfb946d95254609727519553a0156bb77e2873 (diff)
downloadaur-milter-greylist.tar.gz
Update to 4.6.4
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD7
-rw-r--r--milter-greylist-4.6.3-geoip2.patch38
3 files changed, 5 insertions, 48 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 586072c30e3..5c60d015d34 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = milter-greylist
pkgdesc = A stand-alone milter written in C that implements the greylist filtering method.
- pkgver = 4.6.3
+ pkgver = 4.6.4
pkgrel = 1
url = http://hcpnet.free.fr/milter-greylist/
arch = x86_64
@@ -10,13 +10,11 @@ pkgbase = milter-greylist
depends = libspf2
depends = opendkim
backup = etc/mail/greylist.conf
- source = http://ftp.espci.fr/pub/milter-greylist/milter-greylist-4.6.3.tgz
+ source = http://ftp.espci.fr/pub/milter-greylist/milter-greylist-4.6.4.tgz
source = milter-greylist-4.5.11-warning.patch
- source = milter-greylist-4.6.3-geoip2.patch
source = milter-greylist.service
- md5sums = 7fdd068c456001454a82e0b9c7171927
+ md5sums = def021c0ff43e4c3f1ae2f8bb997ceac
md5sums = 0901deb488277f8fed50158cffb726a2
- md5sums = 186b62e3cf1d27a693aebf2c4af0b148
md5sums = 51665e97390bf7df11bb509bfb57544b
pkgname = milter-greylist
diff --git a/PKGBUILD b/PKGBUILD
index 9de9022b437..1bf8f37bc05 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Amish <contact at via dot aur>
# Contributor: Steven Hiscocks <steven[at]hiscocks[dot]me[dot]uk>
pkgname=milter-greylist
-pkgver=4.6.3
+pkgver=4.6.4
pkgrel=1
pkgdesc="A stand-alone milter written in C that implements the greylist filtering method."
url="http://hcpnet.free.fr/milter-greylist/"
@@ -12,17 +12,14 @@ makedepends=('libmilter')
backup=('etc/mail/greylist.conf')
source=("http://ftp.espci.fr/pub/${pkgname}/${pkgname}-${pkgver}.tgz"
'milter-greylist-4.5.11-warning.patch'
- 'milter-greylist-4.6.3-geoip2.patch'
"${pkgname}.service")
-md5sums=('7fdd068c456001454a82e0b9c7171927'
+md5sums=('def021c0ff43e4c3f1ae2f8bb997ceac'
'0901deb488277f8fed50158cffb726a2'
- '186b62e3cf1d27a693aebf2c4af0b148'
'51665e97390bf7df11bb509bfb57544b')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p0 < ../milter-greylist-4.5.11-warning.patch
- patch -p0 < ../milter-greylist-4.6.3-geoip2.patch
}
build() {
diff --git a/milter-greylist-4.6.3-geoip2.patch b/milter-greylist-4.6.3-geoip2.patch
deleted file mode 100644
index 9fd1c6d2255..00000000000
--- a/milter-greylist-4.6.3-geoip2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- geoip2.c
-+++ geoip2.c
-@@ -59,7 +59,7 @@ __RCSID("$Id");
- #include <maxminddb.h>
-
- static MMDB_s mmdb;
--static MMDB_s *geoip2_handle = &mmdb;
-+static MMDB_s *geoip2_handle = NULL;
- static char geoip2_database[MAXPATHLEN + 1];
- static pthread_rwlock_t geoip2_lock;
-
-@@ -88,11 +88,13 @@ geoip2_set_db(name)
- strncpy(geoip2_database, name, MAXPATHLEN);
- geoip2_database[MAXPATHLEN] = '\0';
-
-+ geoip2_handle = &mmdb;
- int status = MMDB_open(geoip2_database, MMDB_MODE_MMAP, geoip2_handle);
- if (status != MMDB_SUCCESS) {
- mg_log(LOG_WARNING,
- "Geoip2 database \"%s\" cannot be used",
- geoip2_database);
-+ geoip2_handle = NULL;
- return;
- }
- }
-@@ -123,6 +125,12 @@ geoip2_set_ccode(priv)
- int gai_error, mmdb_error;
- MMDB_lookup_result_s result;
-
-+ if (geoip2_handle == NULL) {
-+ mg_log(LOG_DEBUG, "GeoIP2 is not available");
-+ priv->priv_ccode = NULL;
-+ return;
-+ }
-+
- if (iptostring(SA(&priv->priv_addr),
- priv->priv_addrlen, ipstr, sizeof(ipstr)) == NULL) {
- mg_log(LOG_DEBUG, "Geoip2 iptostring failed");