summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleksandr Natalenko2017-05-24 20:04:26 +0200
committerOleksandr Natalenko2017-05-24 20:04:26 +0200
commit207d6bbd846326e26ac28f93ae2473ffcd07a89d (patch)
tree9a28441a52660cbed2290b7f3e135a26820b806c
parent7e431a2efc9274f2923e82c5c471a6671c099dac (diff)
downloadaur-207d6bbd846326e26ac28f93ae2473ffcd07a89d.tar.gz
update to v1.5.8-2
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD12
-rw-r--r--fixes-1.5.8.diff25
3 files changed, 39 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 89cda9d8b2c5..1d959fd67541 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue May 23 19:27:01 UTC 2017
+# Wed May 24 18:04:08 UTC 2017
pkgbase = rspamd
pkgdesc = Fast, free and open-source spam filtering system.
pkgver = 1.5.8
- pkgrel = 1
+ pkgrel = 2
url = https://rspamd.com
install = rspamd.install
arch = x86_64
@@ -86,9 +86,11 @@ pkgbase = rspamd
source = rspamd-1.5.8.tar.gz::https://github.com/vstakhov/rspamd/archive/1.5.8.tar.gz
source = rspamd.tmpfile
source = rspamd.sysuser
+ source = fixes-1.5.8.diff
sha256sums = 1c414396e02df52b3a31914cad51a4ca8f9947af619db7221b98c9aa04907668
sha256sums = f89edae5436a3c14e58210fb5c1d5bdd2f8a6f98c03dbc150ea9ff1a3fcfe441
sha256sums = 59646874a5036f3f26cac2898a2f60713fe6147b3c60ee964494f07b6acc313f
+ sha256sums = b235caf3312156b2939d87cdadd8f6fc60aa328f600117672fbf2d466de95560
pkgname = rspamd
diff --git a/PKGBUILD b/PKGBUILD
index 354e46e721dd..7a7b670c9627 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Former maintainer: Andrew Lewis <nerf@judo.za.org>
pkgname=rspamd
pkgver=1.5.8
-pkgrel=1
+pkgrel=2
epoch=
pkgdesc="Fast, free and open-source spam filtering system."
arch=('x86_64' 'i686' 'mips64el')
@@ -79,11 +79,19 @@ install="rspamd.install"
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/vstakhov/${pkgname}/archive/${pkgver}.tar.gz"
"${pkgname}.tmpfile"
"${pkgname}.sysuser"
+ "fixes-${pkgver}.diff"
)
sha256sums=('1c414396e02df52b3a31914cad51a4ca8f9947af619db7221b98c9aa04907668'
'f89edae5436a3c14e58210fb5c1d5bdd2f8a6f98c03dbc150ea9ff1a3fcfe441'
- '59646874a5036f3f26cac2898a2f60713fe6147b3c60ee964494f07b6acc313f')
+ '59646874a5036f3f26cac2898a2f60713fe6147b3c60ee964494f07b6acc313f'
+ 'b235caf3312156b2939d87cdadd8f6fc60aa328f600117672fbf2d466de95560')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -Np1 <../fixes-${pkgver}.diff
+}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/fixes-1.5.8.diff b/fixes-1.5.8.diff
new file mode 100644
index 000000000000..f70d5c47e684
--- /dev/null
+++ b/fixes-1.5.8.diff
@@ -0,0 +1,25 @@
+diff --git a/src/libutil/addr.c b/src/libutil/addr.c
+index 54988cf4..6253dc16 100644
+--- a/src/libutil/addr.c
++++ b/src/libutil/addr.c
+@@ -280,6 +280,11 @@ rspamd_accept_from_socket (gint sock, rspamd_inet_addr_t **target,
+ sizeof (struct in6_addr));
+ }
+ }
++ else {
++ addr = rspamd_inet_addr_create (AF_INET6);
++ memcpy (&addr->u.in.addr.s6.sin6_addr, &su.s6.sin6_addr,
++ sizeof (struct in6_addr));
++ }
+
+ }
+ else {
+@@ -287,8 +292,6 @@ rspamd_accept_from_socket (gint sock, rspamd_inet_addr_t **target,
+ addr->slen = len;
+
+ if (addr->af == AF_UNIX) {
+- addr->u.un = g_slice_alloc0 (sizeof (*addr->u.un));
+- /* Get name from the listening socket */
+ len = sizeof (su);
+
+ if (getsockname (sock, &su.sa, &len) != -1) {