From 01b252f4adbea667b1949cd7a2ecf9a18aae7808 Mon Sep 17 00:00:00 2001 From: jakob Date: Thu, 28 May 2009 18:08:49 +0000 Subject: [PATCH] update to stunnel v4.27 --- security/stunnel/Makefile | 6 +++--- security/stunnel/distinfo | 10 +++++----- security/stunnel/patches/patch-Makefile_in | 8 ++++---- security/stunnel/patches/patch-tools_Makefile_in | 8 ++++---- .../stunnel/patches/patch-tools_stunnel_conf-sample_in | 10 +++++----- security/stunnel/pkg/PLIST | 6 +++--- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index dce83826be1..0cf7f8f5b72 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.50 2008/09/22 19:20:01 jakob Exp $ +# $OpenBSD: Makefile,v 1.51 2009/05/28 18:08:49 jakob Exp $ COMMENT= SSL encryption wrapper for standard network daemons -VERSION= 4.26 +VERSION= 4.27 DISTNAME= stunnel-${VERSION} PKGNAME= ${DISTNAME} CATEGORIES= security @@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c crypto pthread ssl util wrap z +WANTLIB= c crypto ssl util wrap z HOMEPAGE= http://www.stunnel.org/ diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo index b40269ab736..d10cd71c386 100644 --- a/security/stunnel/distinfo +++ b/security/stunnel/distinfo @@ -1,5 +1,5 @@ -MD5 (stunnel-4.26.tar.gz) = D2cGVA++AAUTlA9IYGmEBQ== -RMD160 (stunnel-4.26.tar.gz) = CeD2A1epC2b2ah9M2hsEhywIfQ0= -SHA1 (stunnel-4.26.tar.gz) = HJ9d1rIfNUw1bNkQCJmpCoMGjGg= -SHA256 (stunnel-4.26.tar.gz) = 6eZ5UHLoT6Axpn/l3jAwAUAx8thOyFsm1uGzPItoa9M= -SIZE (stunnel-4.26.tar.gz) = 531804 +MD5 (stunnel-4.27.tar.gz) = PGVdgVV29QBGocKHRLiGgQ== +RMD160 (stunnel-4.27.tar.gz) = oL603/vEDFxEUq92eEDW+nA4aMk= +SHA1 (stunnel-4.27.tar.gz) = La9S+wkG3p/FvWonDmIOkxYDT9Q= +SHA256 (stunnel-4.27.tar.gz) = wmCmVEo5w8/1libKa8fBQIfcTU+rlcbN3X3d2B34fPs= +SIZE (stunnel-4.27.tar.gz) = 538604 diff --git a/security/stunnel/patches/patch-Makefile_in b/security/stunnel/patches/patch-Makefile_in index e308e23f965..c9c578a4e7d 100644 --- a/security/stunnel/patches/patch-Makefile_in +++ b/security/stunnel/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.5 2008/05/14 21:06:15 jakob Exp $ ---- Makefile.in.orig Thu Nov 1 18:45:14 2007 -+++ Makefile.in Mon Mar 31 23:59:45 2008 -@@ -186,7 +186,7 @@ sharedstatedir = @sharedstatedir@ +$OpenBSD: patch-Makefile_in,v 1.6 2009/05/28 18:08:49 jakob Exp $ +--- Makefile.in.orig Thu Feb 26 20:01:03 2009 ++++ Makefile.in Sun May 17 00:55:49 2009 +@@ -188,7 +188,7 @@ sharedstatedir = @sharedstatedir@ ssldir = @ssldir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ diff --git a/security/stunnel/patches/patch-tools_Makefile_in b/security/stunnel/patches/patch-tools_Makefile_in index 04e474344b7..4cb40350ea9 100644 --- a/security/stunnel/patches/patch-tools_Makefile_in +++ b/security/stunnel/patches/patch-tools_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-tools_Makefile_in,v 1.6 2008/05/14 21:06:15 jakob Exp $ ---- tools/Makefile.in.orig Thu Nov 1 18:45:14 2007 -+++ tools/Makefile.in Mon Mar 31 23:59:14 2008 -@@ -173,7 +173,7 @@ examplesdir = $(docdir)/examples +$OpenBSD: patch-tools_Makefile_in,v 1.7 2009/05/28 18:08:49 jakob Exp $ +--- tools/Makefile.in.orig Thu Feb 26 20:01:03 2009 ++++ tools/Makefile.in Sun May 17 00:55:49 2009 +@@ -175,7 +175,7 @@ examplesdir = $(docdir)/examples examples_DATA = ca.html ca.pl importCA.html importCA.sh script.sh \ stunnel.spec stunnel.init diff --git a/security/stunnel/patches/patch-tools_stunnel_conf-sample_in b/security/stunnel/patches/patch-tools_stunnel_conf-sample_in index 2743094087a..0f29acd0e91 100644 --- a/security/stunnel/patches/patch-tools_stunnel_conf-sample_in +++ b/security/stunnel/patches/patch-tools_stunnel_conf-sample_in @@ -1,7 +1,7 @@ ---- tools/stunnel.conf-sample.in.orig Thu Aug 31 21:02:30 2006 -+++ tools/stunnel.conf-sample.in Wed Sep 27 16:40:43 2006 +--- tools/stunnel.conf-sample.in.orig Thu Apr 16 11:10:09 2009 ++++ tools/stunnel.conf-sample.in Sun May 17 00:58:19 2009 @@ -3,18 +3,17 @@ - ; Please make sure you understand them (especially the effect of chroot jail) + ; Please make sure you understand them (especially the effect of the chroot jail) ; Certificate/key is needed in server mode and optional in client mode -cert = @prefix@/etc/stunnel/mail.pem @@ -16,7 +16,7 @@ -chroot = @prefix@/var/lib/stunnel/ -setuid = nobody -setgid = @DEFAULT_GROUP@ --; PID is created inside chroot jail +-; PID is created inside the chroot jail -pid = /stunnel.pid +chroot = /var/stunnel/ +setuid = _stunnel @@ -30,7 +30,7 @@ ;CApath = /certs ; It's often easier to use CAfile -;CAfile = @prefix@/etc/stunnel/certs.pem -+;CAfile = @sysconfdir@/ssl/certs.pem ++;CAfile = @sysconfdir@/ssl/cert.pem ; Don't forget to c_rehash CRLpath ; CRLpath is located inside chroot jail ;CRLpath = /crls diff --git a/security/stunnel/pkg/PLIST b/security/stunnel/pkg/PLIST index 5dfd19428f7..27f21e9ce6a 100644 --- a/security/stunnel/pkg/PLIST +++ b/security/stunnel/pkg/PLIST @@ -1,12 +1,12 @@ -@comment $OpenBSD: PLIST,v 1.8 2004/11/28 16:32:28 alek Exp $ +@comment $OpenBSD: PLIST,v 1.9 2009/05/28 18:08:49 jakob Exp $ @newgroup _stunnel:528 @newuser _stunnel:528:_stunnel:daemon:stunnel account:/var/stunnel:/sbin/nologin @man man/man8/stunnel.8 -sbin/stunnel +@bin sbin/stunnel share/examples/stunnel/ @sample ${SYSCONFDIR}/stunnel/ share/examples/stunnel/stunnel.conf-sample @sample ${SYSCONFDIR}/stunnel/stunnel.conf @sample /var/stunnel/ -@extra /var/run/stunnel.pid @extraunexec rm -rf /var/stunnel +@extra /var/run/stunnel.pid