From: areq <areq@pld-linux.org>
Date: Sun, 28 Oct 2007 14:07:34 +0000 (+0000)
Subject: - 4.21
X-Git-Tag: auto/th/stunnel-4_21-1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=cbf63ccb32608bfaa719de5ed484c76fb219a662;hp=835b466fdf49a93b859bc2179462502739f0791c;p=packages%2Fstunnel.git

- 4.21

Changed files:
    stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch -> 1.9
    stunnel-libwrap_srv_name_log.patch -> 1.5
    stunnel.inet -> 1.3
    stunnel.spec -> 1.103
---

diff --git a/stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch b/stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch
index baa9ea8..ffc7333 100644
--- 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.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])
+--- stunnel-4.21/configure.ac.orig   2007-08-08 22:43:10.000000000 +0000
++++ stunnel-4.21/configure.ac        2007-10-28 11:44:32.424648485 +0000
+@@ -92,8 +92,8 @@
  # Checks for standard libraries
  AC_SEARCH_LIBS(gethostbyname, nsl)
+ AC_SEARCH_LIBS(yp_get_default_domain, nsl)
 -AC_CHECK_LIB(socket, socket)
 -AC_CHECK_LIB(util, openpty)
 +AC_SEARCH_LIBS(socket, socket)
diff --git a/stunnel-libwrap_srv_name_log.patch b/stunnel-libwrap_srv_name_log.patch
index 1d52288..785d3dc 100644
--- a/stunnel-libwrap_srv_name_log.patch
+++ b/stunnel-libwrap_srv_name_log.patch
@@ -1,13 +1,13 @@
---- stunnel-4.14/src/client.c.orig	2005-10-24 20:00:56.000000000 +0200
-+++ stunnel-4.14/src/client.c	2006-01-24 13:31:39.000000000 +0100
-@@ -735,8 +735,8 @@
-     }
- 
-     if(!result) {
--        s_log(LOG_WARNING, "Connection from %s REFUSED by libwrap",
--            c->accepted_address);
-+        s_log(LOG_WARNING, "Connection to service %s from %s REFUSED by libwrap",
-+            c->opt->servname, c->accepted_address);
-         s_log(LOG_DEBUG, "See hosts_access(5) manual for details");
-         return -1; /* FAILED */
+--- 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);
+-        s_log(LOG_WARNING, "Connection from %s REFUSED by IDENT (user %s)",
+-            c->accepted_address, name);
++        s_log(LOG_WARNING, "Connection to service %s from %s REFUSED by IDENT (user %s)",
++            c->opt->servname, c->accepted_address, name);
+         longjmp(c->err, 1);
      }
+     s_log(LOG_INFO, "IDENT authentication passed");
diff --git a/stunnel.inet b/stunnel.inet
index 7561e3b..2af7971 100644
--- a/stunnel.inet
+++ b/stunnel.inet
@@ -5,5 +5,5 @@ PORT=6666
 FLAGS=nowait
 USER=root
 SERVER=tcpd
-DAEMON=/usr/sbin/stunnel
+DAEMON=/usr/bin/stunnel
 DAEMONARGS="/etc/stunnel/stunnel.conf"
diff --git a/stunnel.spec b/stunnel.spec
index ab90e5b..bf6a440 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.20
+Version:	4.21
 Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	ftp://stunnel.mirt.net/stunnel/%{name}-%{version}.tar.gz
-# Source0-md5:	cf9940395d3503018f721c962528d2ec
+# Source0-md5:	1eaec5228979beca4d548f453304e311
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.inet
@@ -109,7 +109,7 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/stunnel
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/stunnel
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/stunnel
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/libstunnel.la
+rm -rf $RPM_BUILD_ROOT%{_libdir}/stunnel
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/stunnel/stunnel.pem
 rm -rf $RPM_BUILD_ROOT%{_docdir}/stunnel
 
@@ -157,8 +157,7 @@ fi
 %attr(750,stunnel,stunnel) %{_var}/run/stunnel
 %dir %{_sysconfdir}/stunnel
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/stunnel/stunnel.conf
-%attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_libdir}/libstunnel.so
+%attr(755,root,root) %{_bindir}/*
 %{_mandir}/man8/*
 %lang(fr) %{_mandir}/fr/man8/*
 %lang(pl) %{_mandir}/pl/man8/*