Pullup ticket #5212 - requested by he
comms/conserver8: bugfix

Revisions pulled up:
- comms/conserver8/Makefile                                     1.22-1.24
- comms/conserver8/distinfo                                     1.11
- comms/conserver8/options.mk                                   1.5
- comms/conserver8/patches/patch-aa                             1.3
- comms/conserver8/patches/patch-ab                             1.2
- comms/conserver8/patches/patch-conserver_access.c             1.1
- comms/conserver8/patches/patch-conserver_consent.c            1.1

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Wed Jan 18 09:54:51 UTC 2017

   Modified Files:
   	pkgsrc/comms/conserver8: Makefile distinfo
   	pkgsrc/comms/conserver8/patches: patch-aa patch-ab
   Added Files:
   	pkgsrc/comms/conserver8/patches: patch-conserver_access.c
   	    patch-conserver_consent.c

   Log Message:
   Add two patches so that this at least semi-works when the inet6
   option is used:

   * Use correct sockaddr length when doing getnameinfo() for inet6,
     so we avoid an early return with "permanent failure" from getnameinfo()
   * Use temp variables for walking the address lists so that we avoid trying
     freeaddrinfo(NULL) and getting SEGV

   This still isn't fully baked and backward compatible: with the
   inet6 option turned on, on NetBSD the conserver process only opens
   an inet6 server socket and no longer serves an inet socket (a
   Linuxism, I suspect), making it troublesome to interoperate with
   older versions of conserver or installations on hosts without IPv6
   connectivity.

   PKGREVISION bumped.

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Fri Feb 10 10:35:06 UTC 2017

   Modified Files:
   	pkgsrc/comms/conserver8: Makefile options.mk

   Log Message:
   Don't enable the inet6 option on the various BSDs, since their stack
   require separate inet6 and inet sockets, and conserver as of 8.2.1
   doesn't do that.
   Bump PKGREVISION.

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Fri Feb 10 10:38:42 UTC 2017

   Modified Files:
   	pkgsrc/comms/conserver8: Makefile

   Log Message:
   Um, need bsd.prefs.mk before testing ${OPSYS}.


(bsiegert)

$NetBSD: patch-conserver_access.c,v 1.1.2.2 2017/02/15 19:39:10 bsiegert Exp $

Make sure to use correct sockaddr length when doing getnameinfo().

--- conserver/access.c.orig	2017-01-18 09:20:03.000000000 +0000
+++ conserver/access.c
@@ -150,6 +150,7 @@ AccType(INADDR_STYPE *addr, char **peern
     so = sizeof(*addr);
 
 #if USE_IPV6
+    so = sizeof(struct sockaddr_in6);
     error =
 	getnameinfo((struct sockaddr *)addr, so, ipaddr, sizeof(ipaddr),
 		    NULL, 0, NI_NUMERICHOST);

$NetBSD: patch-conserver_consent.c,v 1.1.2.2 2017/02/15 19:39:10 bsiegert Exp $

Print strerror() on failure.
Use scratch variables for walking address info list, so that
we don't end up trying to freeaddrinfo(NULL).

--- conserver/consent.c.orig	2015-06-02 17:17:45.000000000 +0000
+++ conserver/consent.c
@@ -919,13 +919,16 @@ ConsInit(CONSENT *pCE)
 				     rp->ai_addrlen)) == 0)
 			    goto success;
 		      fail:
+			error = errno;
 			close(cofile);
+		    } else {
+			error = errno;
 		    }
 		    rp = rp->ai_next;
 		}
 
-		Error("[%s]: Unable to connect to %s:%s", pCE->server,
-		      host, serv);
+		Error("[%s]: Unable to connect to %s:%s %s", pCE->server,
+		      host, serv, strerror(error));
 		ConsDown(pCE, FLAGTRUE, FLAGTRUE);
 		return;
 	      success:
@@ -1252,7 +1255,7 @@ AddrsMatch(char *addr1, char *addr2)
 {
 #if USE_IPV6
     int error, ret = 0;
-    struct addrinfo *ai1, *ai2, hints;
+    struct addrinfo *ai1, *aip1, *ai2, *aip2, hints;
 #else
     /* so, since we might use inet_addr, we're going to use
      * (in_addr_t)(-1) as a sign of an invalid ip address.
@@ -1290,17 +1293,17 @@ AddrsMatch(char *addr1, char *addr2)
 	goto done;
     }
 
-    for (; ai1 != NULL; ai1 = ai1->ai_next) {
-	for (; ai2 != NULL; ai2 = ai2->ai_next) {
-	    if (ai1->ai_addr->sa_family != ai2->ai_addr->sa_family)
+    for (aip1 = ai1; aip1 != NULL; aip1 = aip1->ai_next) {
+	for (aip2 = ai2; aip2 != NULL; aip2 = aip2->ai_next) {
+	    if (aip1->ai_addr->sa_family != aip2->ai_addr->sa_family)
 		continue;
 
 	    if (
 # if HAVE_MEMCMP
-		   memcmp(&ai1->ai_addr, &ai2->ai_addr,
+		   memcmp(&aip1->ai_addr, &aip2->ai_addr,
 			  sizeof(struct sockaddr_storage))
 # else
-		   bcmp(&ai1->ai_addr, &ai2->ai_addr,
+		   bcmp(&aip1->ai_addr, &aip2->ai_addr,
 			sizeof(struct sockaddr_storage))
 # endif
 		   == 0) {
@@ -1311,8 +1314,10 @@ AddrsMatch(char *addr1, char *addr2)
     }
 
   done:
-    freeaddrinfo(ai1);
-    freeaddrinfo(ai2);
+    if (ai1)
+	freeaddrinfo(ai1);
+    if (ai2)
+	freeaddrinfo(ai2);
     Msg("compare %s and %s returns %d", addr1, addr2, ret);
     return ret;
 #else