pkg/47369: update pkgsrc/mail/milter-greylist to 4.4.1 and use bison instead of yacc to build on solaris

[richard.palo%baou.fr@localhost]

>Number:         47369
>Category:       pkg
>Synopsis:       update pkgsrc/mail/milter-greylist to 4.4.1 and use bison 
>instead of yacc to build on solaris
>Confidential:   no
>Severity:       critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Dec 27 08:35:00 +0000 2012
>Originator:     Richard PALO
>Release:        pkgsrc trunk
>Organization:
>Environment:
SunOS devzoneX 5.11 oi_151a7 i86pc i386 i86pc Solaris

>Description:
couldn't get milter-greylist to build due to multiply defined symbols using 
yacc, but bison seems to work fine.
Took advantage to update to 4.4.1 at the same time.
>How-To-Repeat:

>Fix:
cvs diff below:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/milter-greylist/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- Makefile    16 Dec 2012 01:52:21 -0000      1.55
+++ Makefile    27 Dec 2012 08:32:22 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.55 2012/12/16 01:52:21 obache Exp $
 
-DISTNAME=      milter-greylist-4.2.7
-PKGREVISION=   2
+DISTNAME=      milter-greylist-4.4.1
+PKGREVISION=   
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.espci.fr/pub/milter-greylist/
 EXTRACT_SUFX=  .tgz
@@ -17,7 +17,7 @@ MAKE_JOBS_SAFE=               no
 GNU_CONFIGURE=         YES
 BUILD_TARGET=          milter-greylist
 
-USE_TOOLS=             yacc lex
+USE_TOOLS=             bison lex
 
 RCD_SCRIPTS=           milter-greylist
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/milter-greylist/distinfo,v
retrieving revision 1.32
diff -u -p -r1.32 distinfo
--- distinfo    12 Mar 2012 13:17:22 -0000      1.32
+++ distinfo    27 Dec 2012 08:32:22 -0000
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.32 2012/03/12 13:17:22 fhajny Exp $
 
-SHA1 (milter-greylist-4.2.7.tgz) = 560d823b0d4fd25fba6f100ca3073b8e6c89edc2
-RMD160 (milter-greylist-4.2.7.tgz) = a0f9b01bb625b1ab125a681822ec516b8adc627a
-Size (milter-greylist-4.2.7.tgz) = 213919 bytes
+SHA1 (milter-greylist-4.4.1.tgz) = 4ed61d7f76e88266ce21096d08191c23b281bf74
+RMD160 (milter-greylist-4.4.1.tgz) = 17daad46bd5f5e1e5f62cec74d293b2599d8c147
+Size (milter-greylist-4.4.1.tgz) = 229401 bytes
 SHA1 (patch-aa) = f884ba7efce512f51b6e5593255c4f7fdd468333
-SHA1 (patch-p0f.c) = 9bda4dff42473466548ca649580ba603bc96d389
-SHA1 (patch-spamd.c) = 4cc2804c1177d79bd36b58e34a469fa3d7c92233
+SHA1 (patch-p0f.c) = 8ab34ffae47ab53c2c1cb3e5aa05bf872074f49b
+SHA1 (patch-spamd.c) = 7347c4bc4115df743e489ba4221d3d0c50e9d1ef
Index: patches/patch-p0f.c
===================================================================
RCS file: /cvsroot/pkgsrc/mail/milter-greylist/patches/patch-p0f.c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-p0f.c
--- patches/patch-p0f.c 12 Mar 2012 13:17:22 -0000      1.1
+++ patches/patch-p0f.c 27 Dec 2012 08:32:22 -0000
@@ -62,7 +62,7 @@ $NetBSD: patch-p0f.c,v 1.1 2012/03/12 13
  {
 -      struct sockaddr_un sun;
 +      struct sockaddr_un s_un;
-       int p0fsock;
+       int p0fsock = -1;
  
        if (!conf.c_p0fsock[0])
 @@ -280,11 +280,11 @@ p0f_connect(void)
Index: patches/patch-spamd.c
===================================================================
RCS file: /cvsroot/pkgsrc/mail/milter-greylist/patches/patch-spamd.c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-spamd.c
--- patches/patch-spamd.c       12 Mar 2012 13:17:22 -0000      1.1
+++ patches/patch-spamd.c       27 Dec 2012 08:32:22 -0000
@@ -1,10 +1,20 @@
-$NetBSD: patch-spamd.c,v 1.1 2012/03/12 13:17:22 fhajny Exp $
+$NetBSD$
 
 Rename 'sun' to 's_un' to avoid a conflict on SunOS
-
---- spamd.c.orig       2010-06-22 02:13:41.000000000 +0000
+and include <strings.h> if present
+--- spamd.c.orig       2012-02-24 02:25:46.000000000 +0000
 +++ spamd.c
-@@ -422,19 +422,19 @@ static int
+@@ -44,6 +44,9 @@ __RCSID("$Id: spamd.c,v 1.22 2012/02/24
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <string.h>
++#ifdef HAVE_STRINGS_H
++#include <strings.h>            /* bzero, ... */
++#endif
+ #include <unistd.h>
+ #include <netdb.h>
+ #include <sys/types.h>
+@@ -436,12 +439,12 @@ static int
  spamd_unix_socket(path)
        char *path;
  {
@@ -21,8 +31,9 @@ Rename 'sun' to 's_un' to avoid a confli
  
        if ((sock = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
                mg_log(LOG_ERR, "spamd socket failed: %s", strerror(errno));
-               return -1;
-       }
+@@ -450,7 +453,7 @@ spamd_unix_socket(path)
+ 
+       SET_CLOEXEC(sock);
  
 -      if (connect(sock, (struct sockaddr*) &sun, sizeof(sun))) {
 +      if (connect(sock, (struct sockaddr*) &s_un, sizeof(s_un))) {