>Number:         13484
>Category:       pkg
>Synopsis:       update for stunnel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Jul 16 04:07:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Martti Kuparinen
>Release:        1.5W
>Organization:
>Environment:
System: NetBSD dhcp39 1.5W NetBSD 1.5W (KAYAK) #1: Thu Jul 12 11:28:06 CEST 2001 root@dhcp39:/usr/src/sys/arch/i386/compile/KAYAK i386
Architecture: i386
Machine: i386
>Description:

Update the stunnel package to the latest version. Changes:

* Serious bug resulting in random transfer() hangs fixed. 
* Separate file descriptors are used for inetd mode. 
* -f (foreground) logs are now stamped with time. 
* New ./configure option: --with-tcp-wrappers by Brian Hatch. 
* pop3 protocol client support (-n pop3) by Martin Germann. 
* nntp protocol client support (-n nntp) by Martin Germann. 
* RFC 2487 (smtp STARTTLS) client mode support. 
* Transparency support for Tru64 added. 
* Some #includes for AIX added.

Note: I had to move the libwrap tests in configure.in to the
      end of file or normal functions like getopt weren't found...

>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/stunnel/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile	2001/06/20 13:44:12	1.16
+++ Makefile	2001/07/16 11:05:28
@@ -1,24 +1,28 @@
 # $NetBSD: Makefile,v 1.16 2001/06/20 13:44:12 wiz Exp $
 #
 
-DISTNAME=		stunnel-3.14
+DISTNAME=		stunnel-3.15
 CATEGORIES=		security
-MASTER_SITES=		http://www.stunnel.org/download/stunnel/src/
+MASTER_SITES=		ftp://stunnel.mirt.net/stunnel/ \
+			http://www.stunnel.org/download/stunnel/src/
 
 MAINTAINER=		martin@NetBSD.ORG
 HOMEPAGE=		http://www.stunnel.org/
 COMMENT=		Universal SSL tunnel
 
 BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
-DEPENDS+=		pth>=1.3.5:../../devel/pth
 
+USE_BUILDLINK_ONLY=	# defined
 USE_SSL=		# defined
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE} \
 			--with-cert-dir="${SSLCERTS}" \
-			--with-pem-dir="${SSLCERTS}"
+			--with-pem-dir="${SSLCERTS}" \
+			--with-tcp-wrappers
 
 pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
+	cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf
 
+.include "../../security/openssl/buildlink.mk"
+.include "../../devel/pth/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/stunnel/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	2001/06/20 13:44:12	1.3
+++ distinfo	2001/07/16 11:05:28
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.3 2001/06/20 13:44:12 wiz Exp $
 
-SHA1 (stunnel-3.14.tar.gz) = f1e713fa9a8c595da9f597c4b920fea63b0973bc
-Size (stunnel-3.14.tar.gz) = 115584 bytes
+SHA1 (stunnel-3.15.tar.gz) = a8edd56287efe917b622582a607f2f0acf06ec42
+Size (stunnel-3.15.tar.gz) = 120633 bytes
 SHA1 (patch-aa) = 9ef36b68a7689e9130da6b11f21a9ff9e6fcda90
-SHA1 (patch-ab) = 149634d07a6eb3245645d77ceb38d70b6fd1a504
+SHA1 (patch-ab) = 3cbca4aac137fa3cb13a91ebc623530bc0c27b58
 SHA1 (patch-ac) = 9246c0855f0fa12f79d00f7729c54c9b1703bdb9
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/security/stunnel/patches/patch-ab,v
retrieving revision 1.4
diff -u -r1.4 patch-ab
--- patch-ab	2001/01/22 13:30:36	1.4
+++ patch-ab	2001/07/16 11:05:28
@@ -1,25 +1,46 @@
 $NetBSD: patch-ab,v 1.4 2001/01/22 13:30:36 martin Exp $
 
---- configure.in.orig	Thu Dec 21 19:12:46 2000
-+++ configure.in	Mon Jan 22 14:14:10 2001
-@@ -134,12 +134,14 @@
+--- configure.in.orig	Sun Jul 15 14:43:33 2001
++++ configure.in	Mon Jul 16 12:58:53 2001
+@@ -107,37 +107,6 @@
+ 	AC_DEFINE_UNQUOTED(RANDOM_FILE, "$RANDOM_FILE")
+ fi
  
- dnl Check for libwrap library.
- AC_MSG_CHECKING([for hosts_access in -lwrap])
-+wrap_LIB=
- saved_LIBS="$LIBS"
- LIBS="-lwrap $saved_LIBS"
- AC_TRY_LINK([int hosts_access(); int allow_severity, deny_severity;],
- [hosts_access()],
--[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LIBWRAP)],
--[AC_MSG_RESULT(no)]; LIBS="$saved_LIBS")
-+[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LIBWRAP) wrap_LIB="-lwrap"],
-+[AC_MSG_RESULT(no)])
-+LIBS="$saved_LIBS"
- 
- dnl Add SSL includes and libraries
- CFLAGS="$CFLAGS -I$ssldir/include"
-@@ -161,7 +163,7 @@
+-dnl Check for libwrap library.
+-AC_MSG_CHECKING(whether to use the libwrap library)
+-AC_ARG_WITH(tcp-wrappers,
+-[  --with-tcp-wrappers     Use the libwrap library],
+-  [
+-    if test "$withval" = "yes"; then
+-      AC_MSG_RESULT(yes)
+-      AC_MSG_CHECKING([for hosts_access in -lwrap])
+-      LIBS="-lwrap $LIBS"
+-      AC_TRY_LINK([int hosts_access(); int allow_severity, deny_severity;],
+-        [hosts_access()],
+-        [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LIBWRAP)],
+-	[AC_MSG_RESULT(not found); exit 1])
+-    else
+-      AC_MSG_RESULT(no)
+-    fi
+-  ],
+-  [
+-    AC_MSG_RESULT((default))
+-    AC_MSG_CHECKING([for hosts_access in -lwrap])
+-    saved_LIBS="$LIBS"
+-    LIBS="-lwrap $saved_LIBS"
+-    AC_TRY_LINK([int hosts_access(); int allow_severity, deny_severity;],
+-      [hosts_access()],
+-      [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LIBWRAP)],
+-      [AC_MSG_RESULT(no); LIBS="$saved_LIBS"])
+-       
+-  ]
+-)
+-
+-
+ dnl Use SSL certificate defaults?
+ AC_ARG_ENABLE(ssllib-cs,
+ [  --enable-ssllib-cs      Use the default SSL library cert verify sources],
+@@ -182,7 +151,7 @@
  # AC_HEADER_DIRENT
  # AC_HEADER_STDC
  # AC_HEADER_SYS_WAIT
@@ -28,12 +49,40 @@
  
  # dnl Checks for typedefs, structures, and compiler characteristics.
  # AC_C_CONST
-@@ -179,6 +181,8 @@
+@@ -200,6 +169,36 @@
  AC_CHECK_SIZEOF(unsigned int)
  AC_CHECK_SIZEOF(unsigned long)
  AC_CHECK_SIZEOF(unsigned long long)
 +
-+LIBS="$LIBS $wrap_LIB"
++dnl Check for libwrap library.
++AC_MSG_CHECKING(whether to use the libwrap library)
++AC_ARG_WITH(tcp-wrappers,
++[  --with-tcp-wrappers     Use the libwrap library],
++  [
++    if test "$withval" = "yes"; then
++      AC_MSG_RESULT(yes)
++      AC_MSG_CHECKING([for hosts_access in -lwrap])
++      LIBS="-lwrap $LIBS"
++      AC_TRY_LINK([int hosts_access(); int allow_severity, deny_severity;],
++        [hosts_access()],
++        [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LIBWRAP)],
++	[AC_MSG_RESULT(not found); exit 1])
++    else
++      AC_MSG_RESULT(no)
++    fi
++  ],
++  [
++    AC_MSG_RESULT((default))
++    AC_MSG_CHECKING([for hosts_access in -lwrap])
++    saved_LIBS="$LIBS"
++    LIBS="-lwrap $saved_LIBS"
++    AC_TRY_LINK([int hosts_access(); int allow_severity, deny_severity;],
++      [hosts_access()],
++      [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LIBWRAP)],
++      [AC_MSG_RESULT(no); LIBS="$saved_LIBS"])
++       
++  ]
++)
  
  AC_OUTPUT(Makefile)
  
>Release-Note:
>Audit-Trail:
>Unformatted: