stunnel 4.15

This commit is contained in:
jakob 2006-03-23 15:49:53 +00:00
parent 899661bc71
commit 57417add32
6 changed files with 28 additions and 31 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.40 2005/11/17 02:50:55 naddy Exp $
# $OpenBSD: Makefile,v 1.41 2006/03/23 15:49:53 jakob Exp $
COMMENT= "SSL encryption wrapper for standard network daemons"
VERSION= 4.14
VERSION= 4.15
DISTNAME= stunnel-${VERSION}
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}
CATEGORIES= security
MAINTAINER= Jakob Schlyter <jakob@openbsd.org>

View File

@ -1,4 +1,4 @@
MD5 (stunnel-4.14.tar.gz) = 0969cc4868dfd75f22792ecccc9ec555
RMD160 (stunnel-4.14.tar.gz) = ece1c26dcddf6546e428fcc626a45c06f4757d67
SHA1 (stunnel-4.14.tar.gz) = b2edb3a2473367f2a9f04a877adcb332483a5267
SIZE (stunnel-4.14.tar.gz) = 488512
MD5 (stunnel-4.15.tar.gz) = 2c00153ad099a5f9c5609e8d1dbbe470
RMD160 (stunnel-4.15.tar.gz) = a8d5c9d3fb24d0518975cbb347729f5eba3d3f12
SHA1 (stunnel-4.15.tar.gz) = 735406c1ca94904581158a434214e1f6568539d0
SIZE (stunnel-4.15.tar.gz) = 497103

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.2 2004/12/27 08:24:44 jakob Exp $
--- Makefile.in.orig Sun Dec 26 00:36:52 2004
+++ Makefile.in Mon Dec 27 09:10:31 2004
@@ -180,7 +180,7 @@ sharedstatedir = @sharedstatedir@
$OpenBSD: patch-Makefile_in,v 1.3 2006/03/23 15:49:53 jakob Exp $
--- Makefile.in.orig Mon Mar 6 21:52:41 2006
+++ Makefile.in Thu Mar 23 16:38:57 2006
@@ -179,7 +179,7 @@ sharedstatedir = @sharedstatedir@
ssldir = @ssldir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = src doc tools
+SUBDIRS = src doc
# extra_src = src/gui.c src/resources.rc src/stunnel.ico src/stunnel.exe
# extra_doc = doc/stunnel.pod doc/stunnel.8 doc/stunnel.html doc/en doc/pl
EXTRA_DIST = PORTS BUGS COPYRIGHT.GPL CREDITS INSTALL.W32 INSTALL.WCE
docdir = $(datadir)/doc/stunnel
doc_DATA = AUTHORS BUGS ChangeLog COPYING COPYRIGHT.GPL CREDITS \

View File

@ -1,6 +1,6 @@
--- src/stunnel.c.orig Sun Dec 26 00:05:31 2004
+++ src/stunnel.c Mon Dec 27 09:09:38 2004
@@ -169,8 +169,8 @@ static void daemon_loop(void) {
--- src/stunnel.c.orig Fri Mar 10 22:22:06 2006
+++ src/stunnel.c Thu Mar 23 16:29:20 2006
@@ -153,8 +153,8 @@ static void daemon_loop(void) {
#if !defined (USE_WIN32) && !defined (__vms)
if(!(options.option.foreground))
daemonize();

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tools_Makefile_in,v 1.3 2004/12/27 08:24:44 jakob Exp $
--- tools/Makefile.in.orig Sun Dec 26 00:36:52 2004
+++ tools/Makefile.in Mon Dec 27 09:11:07 2004
@@ -169,7 +169,7 @@ examplesdir = $(docdir)/examples
$OpenBSD: patch-tools_Makefile_in,v 1.4 2006/03/23 15:49:53 jakob Exp $
--- tools/Makefile.in.orig Mon Mar 6 22:02:39 2006
+++ tools/Makefile.in Thu Mar 23 16:29:20 2006
@@ -167,7 +167,7 @@ examplesdir = $(docdir)/examples
examples_DATA = ca.html ca.pl importCA.html importCA.sh script.sh \
stunnel.spec stunnel.init

View File

@ -1,19 +1,16 @@
--- tools/stunnel.conf-sample.in.orig Thu Sep 22 10:11:48 2005
+++ tools/stunnel.conf-sample.in Sat Oct 22 19:45:44 2005
@@ -1,17 +1,18 @@
; Sample stunnel configuration file by Michal Trojnara 2002-2005
+# Modified for OpenBSD by Michael Schubert 2003
; Some options used here may not be adequate for your particular configuration
--- tools/stunnel.conf-sample.in.orig Sat Jan 7 14:58:50 2006
+++ tools/stunnel.conf-sample.in Thu Mar 23 16:43:58 2006
@@ -3,15 +3,15 @@
; Please make sure you understand them (especially the effect of chroot jail)
; Certificate/key is needed in server mode and optional in client mode
-cert = @prefix@/etc/stunnel/mail.pem
-;key = @prefix@/etc/stunnel/mail.pem
+cert = @sysconfdir@/ssl/private/stunnel.pem
+;key = @sysconfdir@/ssl/etc/mail.pem
+cert = @sysconfdir@/ssl/stunnel.pem
+;key = @sysconfdir@/ssl/private/stunnel.key
; Some security enhancements for UNIX systems - comment them out on Win32
-chroot = @prefix@/var/stunnel/
-chroot = @prefix@/var/lib/stunnel/
-setuid = nobody
-setgid = nogroup
+chroot = /var/stunnel/
@ -25,7 +22,7 @@
; Some performance tunings
socket = l:TCP_NODELAY=1
@@ -27,12 +28,12 @@
@@ -27,12 +27,12 @@ socket = r:TCP_NODELAY=1
; CApath is located inside chroot jail
;CApath = /certs
; It's often easier to use CAfile