diff --git a/.cvsignore b/.cvsignore
index db26870..840ec95 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-stunnel-4.26.tar.gz
-stunnel-4.26.tar.gz.asc
+stunnel-4.27.tar.gz
+stunnel-4.27.tar.gz.asc
diff --git a/sources b/sources
index 128e85f..51deb09 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0f6706540fbe000513940f4860698405 stunnel-4.26.tar.gz
-a20f1fafdbfe58c60367618935702ff0 stunnel-4.26.tar.gz.asc
+3c655d815576f50046a1c28744b88681 stunnel-4.27.tar.gz
+1219d667d1a1306f392d180587c6b50e stunnel-4.27.tar.gz.asc
diff --git a/stunnel-4.08-authpriv.patch b/stunnel-4.27-authpriv.patch
similarity index 58%
rename from stunnel-4.08-authpriv.patch
rename to stunnel-4.27-authpriv.patch
index bea24fc..f43de55 100644
--- a/stunnel-4.08-authpriv.patch
+++ b/stunnel-4.27-authpriv.patch
@@ -1,7 +1,20 @@
Change the default log facility from LOG_DAEMON to LOG_AUTHPRIV.
---- stunnel-4.08/doc/stunnel.pod 2005-01-22 11:42:30.000000000 -0500
-+++ stunnel-4.08/doc/stunnel.pod 2005-03-15 17:07:32.714670692 -0500
-@@ -186,7 +186,7 @@
+diff -urN stunnel/doc/stunnel.html stunnel-4.27/doc/stunnel.html
+--- stunnel/doc/stunnel.html 2009-04-16 11:17:26.000000000 +0200
++++ stunnel-4.27/doc/stunnel.html 2009-04-16 18:09:06.000000000 +0200
+@@ -189,7 +189,7 @@
+ info (6), or debug (7). All logs for the specified level and
+ all levels numerically less than it will be shown. Use debug = debug or
+ debug = 7 for greatest debugging output. The default is notice (5).
+-The syslog facility 'daemon' will be used unless a facility name is supplied.
++
The syslog facility 'authpriv' will be used unless a facility name is supplied.
+ (Facilities are not supported on Win32.)
+ Case is ignored for both facilities and levels.
+
+diff -urN stunnel/doc/stunnel.pod stunnel-4.27/doc/stunnel.pod
+--- stunnel/doc/stunnel.pod 2009-04-16 10:38:41.000000000 +0200
++++ stunnel-4.27/doc/stunnel.pod 2009-04-16 18:08:49.000000000 +0200
+@@ -139,7 +139,7 @@
all levels numerically less than it will be shown. Use B or
B for greatest debugging output. The default is notice (5).
@@ -10,9 +23,10 @@ Change the default log facility from LOG_DAEMON to LOG_AUTHPRIV.
(Facilities are not supported on Win32.)
Case is ignored for both facilities and levels.
---- stunnel-4.08/doc/stunnel.8 2005-01-22 11:42:31.000000000 -0500
-+++ stunnel-4.08/doc/stunnel.8 2005-03-15 17:07:32.715670561 -0500
-@@ -269,7 +269,7 @@
+diff -urN stunnel/doc/stunnel.8 stunnel-4.27/doc/stunnel.8
+--- stunnel/doc/stunnel.8 2009-04-16 11:17:25.000000000 +0200
++++ stunnel-4.27/doc/stunnel.8 2009-04-16 18:08:49.000000000 +0200
+@@ -226,7 +226,7 @@
all levels numerically less than it will be shown. Use \fBdebug = debug\fR or
\&\fBdebug = 7\fR for greatest debugging output. The default is notice (5).
.Sp
@@ -21,20 +35,10 @@ Change the default log facility from LOG_DAEMON to LOG_AUTHPRIV.
(Facilities are not supported on Win32.)
.Sp
Case is ignored for both facilities and levels.
---- stunnel-4.08/doc/stunnel.html 2005-01-22 11:42:31.000000000 -0500
-+++ stunnel-4.08/doc/stunnel.html 2005-03-15 17:08:57.859551451 -0500
-@@ -270,7 +270,7 @@
- debug = 7 for greatest debugging output. The default is notice (5).
-
-
--The syslog facility 'daemon' will be used unless a facility name is supplied.
-+
The syslog facility 'authpriv' will be used unless a facility name is supplied.
- (Facilities are not supported on Win32.)
-
-
---- stunnel-4.08/src/options.c 2005-02-15 14:08:28.000000000 -0500
-+++ stunnel-4.08/src/options.c 2005-03-15 17:07:32.713670823 -0500
-@@ -269,8 +269,12 @@
+diff -urN stunnel/src/options.c stunnel-4.27/src/options.c
+--- stunnel/src/options.c 2009-04-16 10:49:20.000000000 +0200
++++ stunnel-4.27/src/options.c 2009-04-16 18:08:49.000000000 +0200
+@@ -136,8 +136,12 @@
case CMD_INIT:
options.debug_level=5;
#if !defined (USE_WIN32) && !defined (__vms)
diff --git a/stunnel-4.18-sample.patch b/stunnel-4.27-sample.patch
similarity index 76%
rename from stunnel-4.18-sample.patch
rename to stunnel-4.27-sample.patch
index b2d3c2a..05dac46 100644
--- a/stunnel-4.18-sample.patch
+++ b/stunnel-4.27-sample.patch
@@ -1,9 +1,10 @@
You shouldn't use the sample as-is, but people do.
---- stunnel-4.18/tools/stunnel.conf-sample.in.sample 2006-08-31 21:02:30.000000000 +0200
-+++ stunnel-4.18/tools/stunnel.conf-sample.in 2006-10-25 02:20:02.000000000 +0200
+diff -urN stunnel/tools/stunnel.conf-sample.in stunnel-4.27/tools/stunnel.conf-sample.in
+--- stunnel/tools/stunnel.conf-sample.in 2009-04-16 11:10:09.000000000 +0200
++++ stunnel-4.27/tools/stunnel.conf-sample.in 2009-04-16 18:14:02.000000000 +0200
@@ -3,14 +3,14 @@
- ; 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
@@ -19,14 +20,14 @@ You shouldn't use the sample as-is, but people do.
+chroot = @localstatedir@/run/stunnel/
setuid = nobody
setgid = @DEFAULT_GROUP@
- ; PID is created inside chroot jail
+ ; PID is created inside the chroot jail
@@ -30,12 +30,13 @@
; CApath is located inside chroot jail
;CApath = /certs
; It's often easier to use CAfile
-;CAfile = @prefix@/etc/stunnel/certs.pem
+;CAfile = @sysconfdir@/stunnel/certs.pem
-+;CAfile = @datadir@/ssl/certs/ca-bundle.crt
++;CAfile = @sysconfdir@/pki/tls/certs/ca-bundle.crt
; Don't forget to c_rehash CRLpath
; CRLpath is located inside chroot jail
;CRLpath = /crls
diff --git a/stunnel.spec b/stunnel.spec
index 737a853..ae36c90 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,7 +1,7 @@
Summary: An SSL-encrypting socket wrapper
Name: stunnel
-Version: 4.26
-Release: 3
+Version: 4.27
+Release: 1
License: GPLv2
Group: Applications/Internet
URL: http://stunnel.mirt.net/
@@ -12,8 +12,8 @@ Source3: sfinger.xinetd
Source4: stunnel-sfinger.conf
Source5: pop3-redirect.xinetd
Source6: stunnel-pop3s-client.conf
-Patch0: stunnel-4.08-authpriv.patch
-Patch1: stunnel-4.18-sample.patch
+Patch0: stunnel-4.27-authpriv.patch
+Patch1: stunnel-4.27-sample.patch
Buildroot: %{_tmppath}/stunnel-root
# util-linux is needed for rename
BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
@@ -30,8 +30,6 @@ in conjunction with imapd to create an SSL secure IMAP server.
iconv -f iso-8859-1 -t utf-8 < doc/stunnel.fr.8 > doc/stunnel.fr.8_
mv doc/stunnel.fr.8_ doc/stunnel.fr.8
-iconv -f iso-8859-2 -t utf-8 < doc/stunnel.pl.8 > doc/stunnel.pl.8_
-mv doc/stunnel.pl.8_ doc/stunnel.pl.8
%build
CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
@@ -81,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_sysconfdir}/stunnel/*
%changelog
+* Thu Apr 16 2009 Miloslav Trmač - 4.27-1
+- Update to stunnel-4.27.
+
* Wed Feb 25 2009 Fedora Release Engineering - 4.26-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild