From 6060423439eea688ef1a86da03c4254468c789c5 Mon Sep 17 00:00:00 2001
From: Miloslav Trmac <mitr@fedoraproject.org>
Date: Tue, 12 Jul 2005 09:30:02 +0000
Subject: [PATCH] - Update to stunnel-4.11 - Update Certificate-Creation for
 /etc/pki

---
 .cvsignore           |  4 ++--
 Certificate-Creation |  2 +-
 sources              |  4 ++--
 stunnel.spec         | 12 +++++++-----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 9149844..7c013bc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-stunnel-4.10.tar.gz
-stunnel-4.10.tar.gz.asc
+stunnel-4.11.tar.gz
+stunnel-4.11.tar.gz.asc
diff --git a/Certificate-Creation b/Certificate-Creation
index a33cbb2..16d86f9 100644
--- a/Certificate-Creation
+++ b/Certificate-Creation
@@ -1,6 +1,6 @@
 To generate a key and self signed certificate, execute the following commands:
 
-cd /usr/share/ssl/certs
+cd /etc/pki/tls/certs
 make stunnel.pem
 
 Note that by default, the file containing the key and certificate has its
diff --git a/sources b/sources
index 26b7e9a..cb7a1b5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9de7a62a44083114779ca4e109d70776  stunnel-4.10.tar.gz
-fc12dd911fb82f7e6bd2befe6c279a18  stunnel-4.10.tar.gz.asc
+253c50435d4d81cba6f19ca34266e6dc  stunnel-4.11.tar.gz
+a8674e178ef42330dea442a72f258518  stunnel-4.11.tar.gz.asc
diff --git a/stunnel.spec b/stunnel.spec
index d64c86c..14f0f36 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper.
 Name: stunnel
-Version: 4.10
-Release: 2
+Version: 4.11
+Release: 1
 License: GPL
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/ 
@@ -15,7 +15,6 @@ Source6: pop3-redirect.xinetd
 Source7: stunnel-pop3s-client.conf
 Patch0: stunnel-4.08-authpriv.patch
 Patch1: stunnel-4.08-sample.patch
-Patch2: stunnel-4.10-inetd.patch
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers, util-linux
@@ -29,7 +28,6 @@ in conjunction with imapd to create an SSL secure IMAP server.
 %setup -q
 %patch0 -p1 -b .authpriv
 %patch1 -p1 -b .sample
-%patch2 -p1 -b .inetd
 
 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
@@ -42,7 +40,7 @@ if pkg-config openssl ; then
 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`";
 	LDFLAGS="`pkg-config --libs-only-L openssl`"; export LDFLAGS
 fi
-%configure --with-tcp-wrappers
+%configure
 make LDADD="-pie -Wl,-z,defs,-z,relro"
 
 %install
@@ -87,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Tue Jul 12 2005 Miloslav Trmac <mitr@redhat.com> - 4.11-1
+- Update to stunnel-4.11
+- Update Certificate-Creation for /etc/pki
+
 * Wed Jun  1 2005 Miloslav Trmac <mitr@redhat.com> - 4.10-2
 - Fix inetd mode
 - Remove unnecessary Requires: and BuildRequires: