kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update to 1.0.6

Browse source
This commit is contained in:
Vsevolod Stakhov 2015-10-16 13:16:30 +00:00
parent 49c2717eb9
commit 5de187a867
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=399466
4 changed files with 3 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mail/rspamd/Makefile
View file

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= rspamd
PORTVERSION= 1.0.5
PORTREVISION= 2
PORTVERSION= 1.0.6
CATEGORIES= mail
MASTER_SITES= http://rspamd.com/downloads/

4
mail/rspamd/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (rspamd-1.0.5.tar.xz) = 0a020e572515c276ef82352dea4a698e22552c941d3c4c3c379e1f3a163a11df
SIZE (rspamd-1.0.5.tar.xz) = 1159360
SHA256 (rspamd-1.0.6.tar.xz) = 95ba042c5e539406d13aafee2af4b42fe277a1c7201f1498215bfcc8b63557ac
SIZE (rspamd-1.0.6.tar.xz) = 1160492

36
mail/rspamd/files/patch-src-libcryptobox-CMakeLists.txt
View file

@ -1,36 +0,0 @@
diff --git a/src/libcryptobox/CMakeLists.txt b/src/libcryptobox/CMakeLists.txt
index 80e922f..ccdfba2 100644
--- src/libcryptobox/CMakeLists.txt
+++ src/libcryptobox/CMakeLists.txt
@@ -9,6 +9,9 @@ SET(POLYSRC ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/poly1305.c)
SET(SIPHASHSRC ${CMAKE_CURRENT_SOURCE_DIR}/siphash/siphash.c
${CMAKE_CURRENT_SOURCE_DIR}/siphash/ref.c)
+SET(CURVESRC ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/ref.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519.c)
+
# For now we support only x86_64 architecture with optimizations
IF(${ARCH} STREQUAL "x86_64")
SET(ASM_CODE "vpaddq %ymm0, %ymm0, %ymm0")
@@ -41,19 +44,14 @@ IF(${ARCH} STREQUAL "x86_64")
ASM_OP(HAVE_DOLLARMACRO "dollar macro convention")
SET(POLYSRC ${POLYSRC} ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/ref-64.c)
+ SET(CURVESRC ${CURVESRC} ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519-donna-c64.c)
ELSEIF(${ARCH} STREQUAL "i386")
SET(POLYSRC ${POLYSRC} ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/ref-32.c)
-
+ SET(CURVESRC ${CURVESRC} ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519-donna.c)
ELSE()
- SET(CURVESRC ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/ref.c)
SET(POLYSRC ${POLYSRC} ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/ref-32.c)
ENDIF()
-SET(CURVESRC ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519-donna-c64.c
- ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519-donna.c
- ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/ref.c
- ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519.c)
-
IF(HAVE_AVX2)
SET(CHACHASRC ${CHACHASRC} ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/avx2.S)
SET(POLYSRC ${POLYSRC} ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/avx2.S)

30
mail/rspamd/files/patch-src-libutil-addr.c
View file

@ -1,30 +0,0 @@
diff --git a/src/libutil/addr.c b/src/libutil/addr.c
index 5958e9e..7d0d5fe 100644
--- src/libutil/addr.c
+++ src/libutil/addr.c
@@ -279,7 +279,7 @@ static gboolean
rspamd_parse_unix_path (rspamd_inet_addr_t **target, const char *src)
{
gchar **tokens, **cur_tok, *p, *pwbuf;
- gint pwlen;
+ glong pwlen;
struct passwd pw, *ppw;
struct group gr, *pgr;
rspamd_inet_addr_t *addr;
@@ -299,8 +299,15 @@ rspamd_parse_unix_path (rspamd_inet_addr_t **target, const char *src)
addr->u.un->group = (gid_t)-1;
cur_tok = &tokens[1];
+#ifdef _SC_GETPW_R_SIZE_MAX
pwlen = sysconf (_SC_GETPW_R_SIZE_MAX);
- g_assert (pwlen > 0);
+ if (pwlen <= 0) {
+ pwlen = 8192;
+ }
+#else
+ pwlen = 8192;
+#endif
+
pwbuf = g_alloca (pwlen);
while (*cur_tok) {