 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.24 2015/09/13 21:55:15 leot Exp $
+# $NetBSD: Makefile,v 1.25 2017/02/12 01:01:19 mef Exp $
-DISTNAME=	dante-1.4.1
+DISTNAME=	dante-1.4.2
 CATEGORIES=	net security
 MASTER_SITES=	http://www.inet.no/dante/files/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.inet.no/dante/
 COMMENT=	BSD-licensed socks 4/5 proxy suite
 LICENSE=	modified-bsd
 CONFLICTS=	socks4-[0-9]*
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-socks-conf=${PKG_SYSCONFDIR}/socks.conf

 @@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2015/11/04 00:34:56 agc Exp $
+$NetBSD: distinfo,v 1.16 2017/02/12 01:01:19 mef Exp $
-SHA1 (dante-1.4.1.tar.gz) = 17ded4322d78b7b031da23cd4e03dbb14f397d71
+SHA1 (dante-1.4.2.tar.gz) = 671c4df0f0689620c8e7cfe43bae3d7f89c8cc4e
-RMD160 (dante-1.4.1.tar.gz) = b01a09375f45d226ffc564ca0d26e0285721fda3
+RMD160 (dante-1.4.2.tar.gz) = 8d48b6efa0d551215943c31dc140a0dccac950b9
-SHA512 (dante-1.4.1.tar.gz) = 1c8e2966ba68c8584fb99ff76ae1d9c8dfe669c7e5e61c7e6e7f87295d1280c3e7849491a6369ce27795040f951dcc11f4f2b3d7e46c54219594c89315d0487e
+SHA512 (dante-1.4.2.tar.gz) = 38d4e3086f851fac78e2dbe7f928eba3b8bf1fb9219c42d929b9e1ea324882b0ae583dc59964a2772af4202dfc977387c6f723b320b5abbbe70e1990cd94f53b
-Size (dante-1.4.1.tar.gz) = 1284288 bytes
+Size (dante-1.4.2.tar.gz) = 1307254 bytes
 SHA1 (patch-aa) = a201b0ec844a2dd610cd4bfb5ffce2f37132fc77
-SHA1 (patch-ab) = baedbd12c4b77031e58167a0ecba2f286a504822
+SHA1 (patch-ab) = 77890d2eab9f2e487c571c5c3a1b7f181918f382
-SHA1 (patch-dlib_Makefile.in) = cb3af4c1549a6581698b3702fb7af58352c7683a
+SHA1 (patch-dlib_Makefile.in) = ac3f8687b9437fec2306a92c8ce91c57df79de0f

 @@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.10 2015/09/13 21:55:15 leot Exp $
+$NetBSD: patch-ab,v 1.11 2017/02/12 01:01:19 mef Exp $
 o Delete the -Werror flag in order to recognise the type of sa_len:
     In function ‘main’:
     warning: variable ‘sa_len_ptr’ set but not used [-Wunused-but-set-variable] uint8_t *sa_len_ptr;
 o Add support for DragonFly BSD
 --- configure.orig	2014-09-03 14:52:29.000000000 +0000
 +++ configure
 @@ -12804,8 +12804,6 @@ if test x"${debug_enabled}" = xt; then
  else
      #autoconf_compflags is set to "-g -O2" with GCC
 @@ -17,44 +17,26 @@ o Add support for DragonFly BSD
 -    CFLAGS="$CFLAGS${CFLAGS:+ }$autoconf_compflags"
      case $COMPTYPE in
  	gcc)
 @@ -15424,7 +15422,7 @@ if test x"${have_sa_len}" != x; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sa_len type" >&5
  $as_echo_n "checking for sa_len type... " >&6; }
     oCFLAGS="$CFLAGS"
 -   CFLAGS="$CFLAGS${CFLAGS:+ }$FAILWARN"
 +   CFLAGS="$CFLAGS${CFLAGS:+ }"
     unset sa_len_type_found
     for type in uint8_t "unsigned char"; do
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21835,7 +21833,7 @@ keyword="no-route"
  keycnt=0
  for keyval in ${ERRNO_NOROUTE}; do
      for errno in $ERRNOVALS; do
 -	if test x"$keyval" == x"$errno"; then
 +	if test x"$keyval" = x"$errno"; then
  	    echo "   { \"$keyword\",	$errno	}," >>$ERRNOSRC
  	    keycnt=`expr $keycnt + 1`
  	fi
@@ -22633,7 +22631,7 @@ keyword="foo"
  keycnt=0
  for keyval in ${ERRNO_foo}; do
      for errno in $GAIERRVALS; do
 -	if test x"$keyval" == x"$errno"; then
 +	if test x"$keyval" = x"$errno"; then
  	    echo "   { \"$keyword\",	$errno	}," >>$ERRNOSRC
  	    keycnt=`expr $keycnt + 1`
  	fi
 @@ -24719,8 +24717,13 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
  #include <netdb.h>
  #include <unistd.h>
 +#if defined(__DragonFly__)
  struct hostent *
  gethostbyaddr( const char *, int, int
 +#else
 +struct hostent *
 +gethostbyaddr( const char *, socklen_t, int
 +#endif
  );
  int

 @@ -1,27 +1,27 @@
-$NetBSD: patch-dlib_Makefile.in,v 1.1 2015/09/13 21:55:15 leot Exp $
+$NetBSD: patch-dlib_Makefile.in,v 1.2 2017/02/12 01:01:19 mef Exp $
 o Do not use ssp(3) when compiling interposition.c:
     interposition.c:1616:1: error: redefinition of 'read'
      read(d, buf, nbytes)
+     ^
     In file included from /usr/include/ssp/stdio.h:34:0,
                      from /usr/include/stdio.h:597,
                      from ../include/osdep.h:158,
                      from ../include/common.h:56,
                      from interposition.c:47:
     /usr/include/ssp/unistd.h:39:1: note: previous definition of 'read' was here
      __ssp_redirect0(ssize_t, read, (int __fd, void *__buf, size_t __len), \
+     ^
---- dlib/Makefile.in.orig	2014-09-03 14:52:38.000000000 +0000
+--- dlib/Makefile.in.orig	2017-02-03 23:17:27.000000000 +0900
-+++ dlib/Makefile.in
++++ dlib/Makefile.in	2017-02-12 09:45:51.954887981 +0900
-@@ -508,7 +508,7 @@ distclean-compile:
+@@ -592,7 +592,7 @@ distclean-compile:
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
  libdsocks_la-interposition.lo: interposition.c
 -@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libdsocks_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdsocks_la-interposition.lo -MD -MP -MF $(DEPDIR)/libdsocks_la-interposition.Tpo -c -o libdsocks_la-interposition.lo `test -f 'interposition.c' || echo '$(srcdir)/'`interposition.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libdsocks_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS:S/-D_FORTIFY_SOURCE=2//) $(AM_CFLAGS) $(CFLAGS) -MT libdsocks_la-interposition.lo -MD -MP -MF $(DEPDIR)/libdsocks_la-interposition.Tpo -c -o libdsocks_la-interposition.lo `test -f 'interposition.c' || echo '$(srcdir)/'`interposition.c
++	@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libdsocks_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS:S/-D_FORTIFY_SOURCE=2//) $(AM_CFLAGS) $(CFLAGS) -MT libdsocks_la-interposition.lo -MD -MP -MF $(DEPDIR)/libdsocks_la-interposition.Tpo -c -o libdsocks_la-interposition.lo `test -f 'interposition.c' || cho '$(srcdir)/'`interposition.c
  @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdsocks_la-interposition.Tpo $(DEPDIR)/libdsocks_la-interposition.Plo
- @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='interposition.c' object='libdsocks_la-interposition.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interposition.c' object='libdsocks_la-interposition.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@