- updated to 4.46

- updated am,libwrap_srv_name_log patches
- stunnel.exe no longer in source tarball - dropped from doc

Changed files:
    stunnel-am.patch -> 1.7
    stunnel-libwrap_srv_name_log.patch -> 1.8
    stunnel.spec -> 1.125

diff --git a/stunnel-am.patch b/stunnel-am.patch
index 882a3d673028bfe08c73726c1da43c70259144cb..f4e00f441e9a7ceb1c1865b4170f8781120b2a32 100644 (file)
--- a/stunnel-am.patch
+++ b/stunnel-am.patch
@@ -1,11 +1,11 @@
---- stunnel-4.10/tools/Makefile.am.orig        2005-03-26 21:38:01.000000000 +0100
-+++ stunnel-4.10/tools/Makefile.am     2005-05-11 13:30:00.000000000 +0200
+--- stunnel-4.46/tools/Makefile.am.orig        2011-10-21 18:13:23.000000000 +0200
++++ stunnel-4.46/tools/Makefile.am     2011-11-06 06:51:03.223375866 +0100
 @@ -20,7 +20,7 @@
                else \
                        RND=""; \
                fi; \
--              $(openssl) req -new -x509 -days 365 $$RND \
-+              echo -e "\n\n\n\n\n\n" | $(openssl) req -new -x509 -days 365 $$RND \
+-              $(OPENSSL) req -new -x509 -days 365 $$RND \
++              printf '\n\n\n\n\n\n' | $(OPENSSL) req -new -x509 -days 365 $$RND \
                        -config $(srcdir)/stunnel.cnf \
                        -out stunnel.pem -keyout stunnel.pem; \
-               $(openssl) gendh $$RND 1024 >> stunnel.pem; \
+               $(OPENSSL) gendh $$RND 1024 >> stunnel.pem; \

diff --git a/stunnel-libwrap_srv_name_log.patch b/stunnel-libwrap_srv_name_log.patch
index 8e49b8185dd269481db7e82565c72ab3529e8e9f..cfb2a2fd938f97b747dbab77ab1f13f43c299627 100644 (file)
--- a/stunnel-libwrap_srv_name_log.patch
+++ b/stunnel-libwrap_srv_name_log.patch
@@ -1,13 +1,13 @@
---- stunnel-4.36/src/client.c.orig     2011-05-02 18:12:53.000000000 +0200
-+++ stunnel-4.36/src/client.c  2011-05-03 15:14:06.900264158 +0200
-@@ -844,8 +844,8 @@
+--- stunnel-4.46/src/client.c.orig     2011-11-04 10:58:06.000000000 +0100
++++ stunnel-4.46/src/client.c  2011-11-06 06:54:08.073382056 +0100
+@@ -858,8 +858,8 @@
          ++user;
      if(strcmp(user, c->opt->username)) {
          safestring(user);
 -        s_log(LOG_WARNING, "Connection from %s REFUSED by IDENT (user %s)",
--            c->accepted_address, user);
+-            accepted_address, user);
 +        s_log(LOG_WARNING, "Connection to service %s from %s REFUSED by IDENT (user %s)",
-+            c->opt->servname, c->accepted_address, user);
++            c->opt->servname, accepted_address, user);
          str_free(line);
          longjmp(c->err, 1);
      }

diff --git a/stunnel.spec b/stunnel.spec
index 968031eb7b7e3d6ece6a56539ef4ec11f3345121..7db4de01b449d5649dccc121d7b0eab970afbb15 100644 (file)
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,12 +1,12 @@
 Summary:       Universal SSL tunnel
 Summary(pl.UTF-8):     Uniwersalne narzędzie do bezpiecznego tunelowania
 Name:          stunnel
-Version:       4.44
+Version:       4.46
 Release:       1
 License:       GPL v2+ with OpenSSL exception
 Group:         Networking/Daemons
 Source0:       ftp://ftp.stunnel.org/stunnel/%{name}-%{version}.tar.gz
-# Source0-md5: c9dd51fc02b913ce5bf7b3fc12f9cb4a
+# Source0-md5: 978030ff42f087ec26eb8a095ab69994
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.inet
@@ -151,8 +151,7 @@ fi
 %files
 %defattr(644,root,root,755)
 # note: this COPYING contains general information not GPL text
-%doc AUTHORS BUGS COPYING CREDITS ChangeLog NEWS PORTS README TODO doc/en/* doc/stunnel.html
-%doc src/stunnel.exe tools/{ca.*,importCA.*}
+%doc AUTHORS BUGS COPYING CREDITS ChangeLog NEWS PORTS README TODO doc/en/* doc/stunnel.html tools/{ca.*,importCA.*}
 %doc %lang(fr) doc/stunnel.fr.html
 %doc %lang(pl) doc/pl/* doc/stunnel.pl.html
 %attr(755,root,root) %{_bindir}/stunnel