svn commit: r399298 - in head/mail/rspamd: . files

[Vsevolod Stakhov]

Author: vsevolod
Date: Wed Oct 14 21:04:07 2015
New Revision: 399298
URL: https://svnweb.freebsd.org/changeset/ports/399298

Log:
  Fix _SC_GETPW_R_SIZE_MAX usage.

Added:
  head/mail/rspamd/files/patch-src-libutil-addr.c   (contents, props changed)
Modified:
  head/mail/rspamd/Makefile

Modified: head/mail/rspamd/Makefile
==============================================================================
--- head/mail/rspamd/Makefile	Wed Oct 14 20:58:46 2015	(r399297)
+++ head/mail/rspamd/Makefile	Wed Oct 14 21:04:07 2015	(r399298)
@@ -2,7 +2,7 @@
 
 PORTNAME=	rspamd
 PORTVERSION=	1.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://rspamd.com/downloads/
 

Added: head/mail/rspamd/files/patch-src-libutil-addr.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/rspamd/files/patch-src-libutil-addr.c	Wed Oct 14 21:04:07 2015	(r399298)
@@ -0,0 +1,30 @@
+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) {