- 4.16

Changed files:
    stunnel-config.patch -> 1.4
    stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch -> 1.8
    stunnel.spec -> 1.96

diff --git a/stunnel-config.patch b/stunnel-config.patch
index 5b5298574563b1a330ec82827a826b1f6098d7e1..57e47672927fed5fc72c0ec8b97d58d3e3d16f7a 100644 (file)
--- a/stunnel-config.patch
+++ b/stunnel-config.patch
@@ -1,6 +1,6 @@
---- stunnel-4.15/tools/stunnel.conf-sample.in.orig     2006-01-07 14:58:50.000000000 +0100
-+++ stunnel-4.15/tools/stunnel.conf-sample.in  2006-04-01 23:31:04.987918000 +0200
-@@ -3,15 +3,16 @@
+--- stunnel-4.16/tools/stunnel.conf-sample.in.orig     2006-08-31 19:02:30.000000000 +0000
++++ stunnel-4.16/tools/stunnel.conf-sample.in  2006-09-02 12:08:51.776623500 +0000
+@@ -3,18 +3,18 @@
  ; Please make sure you understand them (especially the effect of chroot jail)
  
  ; Certificate/key is needed in server mode and optional in client mode
@@ -9,21 +9,38 @@
 +cert = /etc/stunnel/mail.pem
 +;key = /etc/stunnel/mail.pem
  
+ ; Protocol version (all, SSLv2, SSLv3, TLSv1)
+ sslVersion = SSLv3
+ 
  ; Some security enhancements for UNIX systems - comment them out on Win32
 -chroot = @prefix@/var/lib/stunnel/
 -setuid = nobody
--setgid = nogroup
-+;chroot = @prefix@/var/lib/stunnel/
+-setgid = @DEFAULT_GROUP@
++;chroot = /var/lib/stunnel/
 +setuid = stunnel
 +setgid = stunnel
  ; PID is created inside chroot jail
 -pid = /stunnel.pid
-+;pid = /stunnel.pid
 +pid = /var/run/stunnel/stunnel.pid
  
  ; Some performance tunings
  socket = l:TCP_NODELAY=1
-@@ -43,17 +44,17 @@
+@@ -30,12 +30,12 @@
+ ; CApath is located inside chroot jail
+ ;CApath = /certs
+ ; It's often easier to use CAfile
+-;CAfile = @prefix@/etc/stunnel/certs.pem
++;CAfile = /etc/stunnel/certs.pem
+ ; Don't forget to c_rehash CRLpath
+ ; CRLpath is located inside chroot jail
+ ;CRLpath = /crls
+ ; Alternatively you can use CRLfile
+-;CRLfile = @prefix@/etc/stunnel/crls.pem
++;CRLfile = /etc/stunnel/crls.pem
+ 
+ ; Some debugging stuff useful for troubleshooting
+ ;debug = 7
+@@ -46,17 +46,17 @@
  
  ; Service-level configuration
  

diff --git a/stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch b/stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch
index dd655f99026e57b281a6f3b5e7d754b1ea5b777f..baa9ea8968cda89dee9a22314e17f90c99ef7300 100644 (file)
--- a/stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch
+++ b/stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch
@@ -1,13 +1,11 @@
---- stunnel-4.14/configure.ac.orig     2006-01-24 13:27:15.000000000 +0100
-+++ stunnel-4.14/configure.ac  2006-01-24 13:28:56.000000000 +0100
-@@ -41,9 +41,9 @@
- 
+--- stunnel-4.16/configure.ac.orig     2006-08-19 20:28:14.000000000 +0000
++++ stunnel-4.16/configure.ac  2006-09-02 12:00:10.916071750 +0000
+@@ -91,8 +91,8 @@
  AC_MSG_NOTICE([**************************************** libraries])
  # Checks for standard libraries
--AC_CHECK_LIB(nsl, gethostbyname)
+ AC_SEARCH_LIBS(gethostbyname, nsl)
 -AC_CHECK_LIB(socket, socket)
 -AC_CHECK_LIB(util, openpty)
-+AC_SEARCH_LIBS(gethostbyname, nsl)
 +AC_SEARCH_LIBS(socket, socket)
 +AC_SEARCH_LIBS(openpty, util)
  # Checks for dynamic loader and zlib needed by OpenSSL

diff --git a/stunnel.spec b/stunnel.spec
index d1f596a9ec5d44ed1ff662723b88822001a3c928..8b5e8bff82bb6130626f45a74db183630d74f084 100644 (file)
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,12 +1,12 @@
 Summary:       Universal SSL tunnel
 Summary(pl):   Uniwersalne narzêdzie do bezpiecznego tunelowania
 Name:          stunnel
-Version:       4.15
+Version:       4.16
 Release:       1
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       ftp://stunnel.mirt.net/stunnel/%{name}-%{version}.tar.gz
-# Source0-md5: 2c00153ad099a5f9c5609e8d1dbbe470
+# Source0-md5: 8ea5cae3eeaacc0271b766506b4b9d4a
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.inet
@@ -14,9 +14,8 @@ Patch0:               %{name}-gethostbyname_is_in_libc_aka_no_libnsl.patch
 Patch1:                %{name}-authpriv.patch
 Patch2:                %{name}-ac_fixes.patch
 Patch3:                %{name}-am.patch
-Patch4:                %{name}-Makefile.patch
-Patch5:                %{name}-libwrap_srv_name_log.patch
-Patch6:                %{name}-config.patch
+Patch4:                %{name}-libwrap_srv_name_log.patch
+Patch5:                %{name}-config.patch
 URL:           http://www.stunnel.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -85,9 +84,8 @@ stunnel dzia
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p0
+%patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 %{__aclocal}