From 3f1a16ec6addcbdb05d035c148d5aaa9b178fa0c Mon Sep 17 00:00:00 2001
From: jakob <jakob@openbsd.org>
Date: Tue, 15 Jul 2008 08:33:49 +0000
Subject: [PATCH] upgrade stunnel to v4.25

---
 security/stunnel/Makefile                    |  4 ++--
 security/stunnel/distinfo                    | 10 +++++-----
 security/stunnel/patches/patch-src_stunnel_c | 15 +++++++++------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index ac4504c0404..f7f31fe19ec 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.48 2008/05/20 20:25:36 jakob Exp $
+# $OpenBSD: Makefile,v 1.49 2008/07/15 08:33:49 jakob Exp $
 
 COMMENT=	SSL encryption wrapper for standard network daemons
 
-VERSION=	4.24
+VERSION=	4.25
 DISTNAME=	stunnel-${VERSION}
 PKGNAME=	${DISTNAME}
 CATEGORIES=	security
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index 0311f29c7b8..7d571fdce12 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,5 +1,5 @@
-MD5 (stunnel-4.24.tar.gz) = 8u6pfy5R9SS0rdkH/64Hew==
-RMD160 (stunnel-4.24.tar.gz) = o5e6XdUdUiTyRYlI75heB4Xvj7s=
-SHA1 (stunnel-4.24.tar.gz) = 7G20CAGZ0R4CC3gNoPHMN9N9kjM=
-SHA256 (stunnel-4.24.tar.gz) = 0SqQelvl6h+9vsRltcPy+ilyobONklpTZJLti1ELUe0=
-SIZE (stunnel-4.24.tar.gz) = 531714
+MD5 (stunnel-4.25.tar.gz) = fwB5n0ORDANi3w5pxlllqg==
+RMD160 (stunnel-4.25.tar.gz) = 3LmWLlJz5p9a6u1r9wlJWql7qlI=
+SHA1 (stunnel-4.25.tar.gz) = /G1h+tmW91DHbqYnxd2feJrw6vY=
+SHA256 (stunnel-4.25.tar.gz) = nJZqGBJK0sKHc/4Ja3ZwcTIL2wfbafSA3zbLyoAGlIA=
+SIZE (stunnel-4.25.tar.gz) = 532343
diff --git a/security/stunnel/patches/patch-src_stunnel_c b/security/stunnel/patches/patch-src_stunnel_c
index fc1f5693bd3..253625e202c 100644
--- a/security/stunnel/patches/patch-src_stunnel_c
+++ b/security/stunnel/patches/patch-src_stunnel_c
@@ -1,12 +1,15 @@
---- src/stunnel.c.orig	Thu Mar 27 09:27:07 2008
-+++ src/stunnel.c	Mon Mar 31 23:59:14 2008
-@@ -171,8 +171,8 @@ static void daemon_loop(void) {
+--- src/stunnel.c.orig	Wed May 21 13:33:33 2008
++++ src/stunnel.c	Mon Jun  2 16:50:52 2008
+@@ -169,11 +169,11 @@ static void daemon_loop(void) {
  #if !defined (USE_WIN32) && !defined (__vms) && !defined(USE_OS2)
      if(!(options.option.foreground))
          daemonize();
--    drop_privileges();
-     create_pid();
-+    drop_privileges();
++    create_pid();
+     drop_privileges();
+ #ifdef USE_LIBWRAP
+     libwrap_init(LIBWRAP_CLIENTS); /* spawn LIBWRAP_CLIENTS processes */
+ #endif /* USE_LIBWRAP */
+-    create_pid();
  #endif /* !defined USE_WIN32 && !defined (__vms) */
      /* create exec+connect services */
      for(opt=local_options.next; opt; opt=opt->next) {