pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/pbulk-base pbulk-base-0.48: Fix pbulk-scan on...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6bd951ac2ca5
branches:  trunk
changeset: 631838:6bd951ac2ca5
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Mar 14 09:45:31 2014 +0000

description:
pbulk-base-0.48: Fix pbulk-scan on OSX.

On OSX pbulk-scan can fail to bind with EADDRNOTAVAIL due to sin_zero being
used uninitialised.  Ensure the sockaddr_in is cleared before use.

diffstat:

 pkgtools/pbulk-base/Makefile             |  4 ++--
 pkgtools/pbulk/files/pbulk/lib/netaddr.c |  3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r f4855d0fcff2 -r 6bd951ac2ca5 pkgtools/pbulk-base/Makefile
--- a/pkgtools/pbulk-base/Makefile      Fri Mar 14 09:45:17 2014 +0000
+++ b/pkgtools/pbulk-base/Makefile      Fri Mar 14 09:45:31 2014 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2013/09/10 14:38:51 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2014/03/14 09:45:31 jperkin Exp $
 
-DISTNAME=      pbulk-base-0.47
+DISTNAME=      pbulk-base-0.48
 COMMENT=       Core components of the modular bulk build framework
 
 .include "../../pkgtools/pbulk/Makefile.common"
diff -r f4855d0fcff2 -r 6bd951ac2ca5 pkgtools/pbulk/files/pbulk/lib/netaddr.c
--- a/pkgtools/pbulk/files/pbulk/lib/netaddr.c  Fri Mar 14 09:45:17 2014 +0000
+++ b/pkgtools/pbulk/files/pbulk/lib/netaddr.c  Fri Mar 14 09:45:31 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netaddr.c,v 1.7 2008/02/21 14:40:43 tnn Exp $ */
+/* $NetBSD: netaddr.c,v 1.8 2014/03/14 09:45:31 jperkin Exp $ */
 
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
@@ -68,6 +68,7 @@
        tmp = strtoul(str, &port_end, 10);
        if (*str == '\0' || *port_end != '\0' || errno != 0 || tmp > 0xfffful)
                return -1;
+       memset(addr, 0, sizeof(struct sockaddr_in));
        addr->sin_port = htons((in_port_t)tmp);
        addr->sin_addr = in;
 #if !defined(__sun) && !defined(__hpux) && !defined(__INTERIX) && \



Home | Main Index | Thread Index | Old Index