From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 3 May 2011 13:20:23 +0000 (+0000)
Subject: - updated to 4.36
X-Git-Tag: auto/th/stunnel-4_38-1~1
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=010d13fd8b4e51cabdcfe06932e03dde4a1f8e95;p=packages%2Fstunnel.git

- updated to 4.36
- updated libwrap_srv_name_log patch

Changed files:
    stunnel-libwrap_srv_name_log.patch -> 1.6
    stunnel.spec -> 1.119
---

diff --git a/stunnel-libwrap_srv_name_log.patch b/stunnel-libwrap_srv_name_log.patch
index 785d3dc..be0dee2 100644
--- a/stunnel-libwrap_srv_name_log.patch
+++ b/stunnel-libwrap_srv_name_log.patch
@@ -1,13 +1,13 @@
---- stunnel-4.21/src/client.c.orig       2007-10-05 20:30:00.000000000 +0000
-+++ stunnel-4.21/src/client.c    2007-10-28 11:48:46.794934653 +0000
-@@ -776,8 +776,8 @@
-     c->fd=-1; /* avoid double close on cleanup */
-     if(strcmp(name, c->opt->username)) {
-         safestring(name);
+--- 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 @@
+         ++user;
+     if(strcmp(user, c->opt->username)) {
+         safestring(user);
 -        s_log(LOG_WARNING, "Connection from %s REFUSED by IDENT (user %s)",
--            c->accepted_address, name);
+-            c->accepted_address, user);
 +        s_log(LOG_WARNING, "Connection to service %s from %s REFUSED by IDENT (user %s)",
-+            c->opt->servname, c->accepted_address, name);
++            c->opt->servname, c->accepted_address, user);
          longjmp(c->err, 1);
      }
      s_log(LOG_INFO, "IDENT authentication passed");
diff --git a/stunnel.spec b/stunnel.spec
index 3c974d9..ebbb946 100644
--- 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.35
+Version:	4.36
 Release:	1
-License:	GPL v2+
+License:	GPL v2+ with OpenSSL exception
 Group:		Networking/Daemons
 Source0:	ftp://ftp.stunnel.org/stunnel/%{name}-%{version}.tar.gz
-# Source0-md5:	2c8e153caee9d954fb7d00980968b50d
+# Source0-md5:	600a09b03798424842b24548ca1e4235
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.inet
@@ -17,9 +17,9 @@ Patch3:		%{name}-am.patch
 Patch4:		%{name}-libwrap_srv_name_log.patch
 Patch5:		%{name}-config.patch
 URL:		http://www.stunnel.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2.0
 BuildRequires:	libwrap-devel
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	openssl-tools >= 0.9.7d
@@ -155,13 +155,14 @@ fi
 %doc src/stunnel.exe tools/{ca.*,importCA.*}
 %doc %lang(fr) doc/stunnel.fr.html
 %doc %lang(pl) doc/pl/* doc/stunnel.pl.html
-%attr(750,stunnel,stunnel) %{_var}/run/stunnel
+%attr(755,root,root) %{_bindir}/stunnel
+%attr(755,root,root) %{_bindir}/stunnel3
 %dir %{_sysconfdir}/stunnel
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/stunnel/stunnel.conf
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man8/*
-%lang(fr) %{_mandir}/fr/man8/*
-%lang(pl) %{_mandir}/pl/man8/*
+%attr(750,stunnel,stunnel) %{_var}/run/stunnel
+%{_mandir}/man8/stunnel.8*
+%lang(fr) %{_mandir}/fr/man8/stunnel.8*
+%lang(pl) %{_mandir}/pl/man8/stunnel.8*
 
 %files standalone
 %defattr(644,root,root,755)