update to stunnel v4.27

This commit is contained in:
jakob 2009-05-28 18:08:49 +00:00
parent 5e4f454231
commit 01b252f4ad
6 changed files with 24 additions and 24 deletions

View File

@ -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 COMMENT= SSL encryption wrapper for standard network daemons
VERSION= 4.26 VERSION= 4.27
DISTNAME= stunnel-${VERSION} DISTNAME= stunnel-${VERSION}
PKGNAME= ${DISTNAME} PKGNAME= ${DISTNAME}
CATEGORIES= security CATEGORIES= security
@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= 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/ HOMEPAGE= http://www.stunnel.org/

View File

@ -1,5 +1,5 @@
MD5 (stunnel-4.26.tar.gz) = D2cGVA++AAUTlA9IYGmEBQ== MD5 (stunnel-4.27.tar.gz) = PGVdgVV29QBGocKHRLiGgQ==
RMD160 (stunnel-4.26.tar.gz) = CeD2A1epC2b2ah9M2hsEhywIfQ0= RMD160 (stunnel-4.27.tar.gz) = oL603/vEDFxEUq92eEDW+nA4aMk=
SHA1 (stunnel-4.26.tar.gz) = HJ9d1rIfNUw1bNkQCJmpCoMGjGg= SHA1 (stunnel-4.27.tar.gz) = La9S+wkG3p/FvWonDmIOkxYDT9Q=
SHA256 (stunnel-4.26.tar.gz) = 6eZ5UHLoT6Axpn/l3jAwAUAx8thOyFsm1uGzPItoa9M= SHA256 (stunnel-4.27.tar.gz) = wmCmVEo5w8/1libKa8fBQIfcTU+rlcbN3X3d2B34fPs=
SIZE (stunnel-4.26.tar.gz) = 531804 SIZE (stunnel-4.27.tar.gz) = 538604

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.5 2008/05/14 21:06:15 jakob Exp $ $OpenBSD: patch-Makefile_in,v 1.6 2009/05/28 18:08:49 jakob Exp $
--- Makefile.in.orig Thu Nov 1 18:45:14 2007 --- Makefile.in.orig Thu Feb 26 20:01:03 2009
+++ Makefile.in Mon Mar 31 23:59:45 2008 +++ Makefile.in Sun May 17 00:55:49 2009
@@ -186,7 +186,7 @@ sharedstatedir = @sharedstatedir@ @@ -188,7 +188,7 @@ sharedstatedir = @sharedstatedir@
ssldir = @ssldir@ ssldir = @ssldir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tools_Makefile_in,v 1.6 2008/05/14 21:06:15 jakob Exp $ $OpenBSD: patch-tools_Makefile_in,v 1.7 2009/05/28 18:08:49 jakob Exp $
--- tools/Makefile.in.orig Thu Nov 1 18:45:14 2007 --- tools/Makefile.in.orig Thu Feb 26 20:01:03 2009
+++ tools/Makefile.in Mon Mar 31 23:59:14 2008 +++ tools/Makefile.in Sun May 17 00:55:49 2009
@@ -173,7 +173,7 @@ examplesdir = $(docdir)/examples @@ -175,7 +175,7 @@ examplesdir = $(docdir)/examples
examples_DATA = ca.html ca.pl importCA.html importCA.sh script.sh \ examples_DATA = ca.html ca.pl importCA.html importCA.sh script.sh \
stunnel.spec stunnel.init stunnel.spec stunnel.init

View File

@ -1,7 +1,7 @@
--- tools/stunnel.conf-sample.in.orig Thu Aug 31 21:02:30 2006 --- tools/stunnel.conf-sample.in.orig Thu Apr 16 11:10:09 2009
+++ tools/stunnel.conf-sample.in Wed Sep 27 16:40:43 2006 +++ tools/stunnel.conf-sample.in Sun May 17 00:58:19 2009
@@ -3,18 +3,17 @@ @@ -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 ; Certificate/key is needed in server mode and optional in client mode
-cert = @prefix@/etc/stunnel/mail.pem -cert = @prefix@/etc/stunnel/mail.pem
@ -16,7 +16,7 @@
-chroot = @prefix@/var/lib/stunnel/ -chroot = @prefix@/var/lib/stunnel/
-setuid = nobody -setuid = nobody
-setgid = @DEFAULT_GROUP@ -setgid = @DEFAULT_GROUP@
-; PID is created inside chroot jail -; PID is created inside the chroot jail
-pid = /stunnel.pid -pid = /stunnel.pid
+chroot = /var/stunnel/ +chroot = /var/stunnel/
+setuid = _stunnel +setuid = _stunnel
@ -30,7 +30,7 @@
;CApath = /certs ;CApath = /certs
; It's often easier to use CAfile ; It's often easier to use CAfile
-;CAfile = @prefix@/etc/stunnel/certs.pem -;CAfile = @prefix@/etc/stunnel/certs.pem
+;CAfile = @sysconfdir@/ssl/certs.pem +;CAfile = @sysconfdir@/ssl/cert.pem
; Don't forget to c_rehash CRLpath ; Don't forget to c_rehash CRLpath
; CRLpath is located inside chroot jail ; CRLpath is located inside chroot jail
;CRLpath = /crls ;CRLpath = /crls

View File

@ -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 @newgroup _stunnel:528
@newuser _stunnel:528:_stunnel:daemon:stunnel account:/var/stunnel:/sbin/nologin @newuser _stunnel:528:_stunnel:daemon:stunnel account:/var/stunnel:/sbin/nologin
@man man/man8/stunnel.8 @man man/man8/stunnel.8
sbin/stunnel @bin sbin/stunnel
share/examples/stunnel/ share/examples/stunnel/
@sample ${SYSCONFDIR}/stunnel/ @sample ${SYSCONFDIR}/stunnel/
share/examples/stunnel/stunnel.conf-sample share/examples/stunnel/stunnel.conf-sample
@sample ${SYSCONFDIR}/stunnel/stunnel.conf @sample ${SYSCONFDIR}/stunnel/stunnel.conf
@sample /var/stunnel/ @sample /var/stunnel/
@extra /var/run/stunnel.pid
@extraunexec rm -rf /var/stunnel @extraunexec rm -rf /var/stunnel
@extra /var/run/stunnel.pid