- up to 4.05

Changed files:
    stunnel-am.patch -> 1.3
    stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch -> 1.5
    stunnel.spec -> 1.67

diff --git a/stunnel-am.patch b/stunnel-am.patch
index c0aed03aa332d6256ad6dff2be3fbdeba8902dbd..932fc8620379490b4d693e22b8ec2cb834d99c7f 100644 (file)
--- a/stunnel-am.patch
+++ b/stunnel-am.patch
@@ -1,8 +1,8 @@
 --- stunnel-4.04/src/Makefile.am.orig  Sun Jan 12 19:16:35 2003
 +++ stunnel-4.04/src/Makefile.am       Sun Jan 12 19:17:30 2003
-@@ -18,26 +18,8 @@
- libstunnel_la_SOURCES = $(shared_sources)
- libstunnel_la_LDFLAGS = -avoid-version
+@@ -21,26 +21,8 @@
+ # Red Hat "by design" bug #82369
+ INCLUDES = -I/usr/kerberos/include
  
 -# Win32 executable
 -
@@ -10,7 +10,7 @@
 -EXTRA_PROGRAMS = stunnel.exe
 -stunnel_exe_SOURCES =  $(common_headers) $(common_sources) $(win32_sources)
 -
--OPENSSLDIR=/usr/src/openssl-0.9.7
+-OPENSSLDIR=/usr/src/openssl-0.9.7c
 -WINCFLAGS=-O2 -Wall -I$(OPENSSLDIR)/outinc \
 -      -DUSE_WIN32=1 -DHAVE_OPENSSL=1 -DVERSION=\"@VERSION@\"
 -WINLIBS=-L$(OPENSSLDIR)/out -leay32 -lssl32 -lwsock32 -lgdi32 -mwindows
@@ -38,12 +38,3 @@
                -config $(srcdir)/stunnel.cnf -out stunnel.pem -keyout stunnel.pem; \
        test $(USE_DH) -eq 0 || $(openssl) gendh $$RND 512 >> stunnel.pem
        $(openssl) x509 -subject -dates -fingerprint -noout \
-@@ -23,7 +23,7 @@
-               -in stunnel.pem
- 
- install-data-hook:
--      chmod 0600 $(confdir)/stunnel.pem
-+      chmod 0600 $(DESTDIR)$(confdir)/stunnel.pem
- 
- clean-local:
-       -rm -f stunnel.rnd

diff --git a/stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch b/stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch
index d97fe64098c43dab99787f769e045ed7ce6a33a8..3fab9b08553173070f8948a0706f3a662d891c97 100644 (file)
--- a/stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch
+++ b/stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch
@@ -1,9 +1,9 @@
 --- stunnel-4.04/configure.ac.orig     Sun Jan 12 18:23:14 2003
 +++ stunnel-4.04/configure.ac  Sun Jan 12 18:23:25 2003
-@@ -105,7 +105,7 @@
- AC_DEFINE_UNQUOTED(HOST, "$host")
- 
+@@ -107,7 +107,7 @@
  dnl Checks for standard libraries.
+ AC_CHECK_LIB(dl, dlopen)
+ AC_CHECK_LIB(dld, shl_load)
 -AC_CHECK_LIB(nsl, gethostbyname)
 +AC_CHECK_FUNC(gethostbyname, [], AC_CHECK_LIB(nsl, gethostbyname))
  AC_CHECK_LIB(socket, socket)

diff --git a/stunnel.spec b/stunnel.spec
index dd3178e65fe49a468419d55b8ad18b2fd75caeb7..e0e9b2f2427586fb61a662069bc15fbbe811748c 100644 (file)
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -3,12 +3,12 @@
 Summary:       Universal SSL tunnel
 Summary(pl):   Uniwersalne narzêdzie do bezpiecznego tunelowania
 Name:          stunnel
-Version:       4.04
-Release:       0.9
+Version:       4.05
+Release:       1
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       ftp://stunnel.mirt.net/stunnel/%{name}-%{version}.tar.gz
-# Source0-md5: 2fcdf0311a0ab8a3223293c706a84e97
+# Source0-md5: e28a03cf694a43a7f144ec3d5c064456
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Patch0:                %{name}-gethostbyname_is_in_libc_aka_no_libnsl.patch
@@ -20,8 +20,8 @@ URL:          http://www.stunnel.org/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
-BuildRequires: openssl-devel >= 0.9.7c
-BuildRequires: openssl-tools >= 0.9.7c
+#BuildRequires:        openssl-devel >= 0.9.7c
+#BuildRequires:        openssl-tools >= 0.9.7c
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description