- Update to stunnel-4.26.

.cvsignore

@@ -1,2 +1,2 @@
-stunnel-4.25.tar.gz
-stunnel-4.25.tar.gz.asc
+stunnel-4.26.tar.gz
+stunnel-4.26.tar.gz.asc

sources

@@ -1,2 +1,2 @@
-7f00799f43910c0362df0e69c65965aa  stunnel-4.25.tar.gz
-6b2ba26735b81014fbbaf1982b132084  stunnel-4.25.tar.gz.asc
+0f6706540fbe000513940f4860698405  stunnel-4.26.tar.gz
+a20f1fafdbfe58c60367618935702ff0  stunnel-4.26.tar.gz.asc

stunnel-4.25-EAI_SERVICE.patch

@@ -1,17 +0,0 @@
-diff -up stunnel-4.25/src/resolver.c~ stunnel-4.25/src/resolver.c
---- stunnel-4.25/src/resolver.c~	2008-03-26 20:09:48.000000000 +0100
-+++ stunnel-4.25/src/resolver.c	2008-06-08 06:43:43.000000000 +0200
-@@ -124,8 +124,11 @@ int hostport2addrlist(SOCKADDR_LIST *add
- 
-     err=getaddrinfo(hostname, portname, &hints, &res);
-     if(err) {
--        s_log(LOG_ERR, "Error resolving '%s': %s",
--            hostname, s_gai_strerror(err));
-+        if(err == EAI_SERVICE)
-+	    s_log(LOG_ERR, "Unknown TCP service '%s'", portname);
-+	else
-+	    s_log(LOG_ERR, "Error resolving '%s': %s",
-+		hostname, s_gai_strerror(err));
-         if(res)
-             freeaddrinfo(res);
-         return 0; /* Error */

stunnel.spec

@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
-Version: 4.25
-Release: 2
+Version: 4.26
+Release: 1
 License: GPLv2
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -14,7 +14,6 @@ Source5: pop3-redirect.xinetd
 Source6: stunnel-pop3s-client.conf
 Patch0: stunnel-4.08-authpriv.patch
 Patch1: stunnel-4.18-sample.patch
-Patch2: stunnel-4.25-EAI_SERVICE.patch
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
@@ -28,7 +27,6 @@ in conjunction with imapd to create an SSL secure IMAP server.
 %setup -q
 %patch0 -p1 -b .authpriv
 %patch1 -p1 -b .sample
-%patch2 -p1 -b .EAI_SERVICE
 
 iconv -f iso-8859-1 -t utf-8 < doc/stunnel.fr.8 > doc/stunnel.fr.8_
 mv doc/stunnel.fr.8_ doc/stunnel.fr.8
@@ -83,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Mon Sep 22 2008 Miloslav Trmač <mitr@redhat.com> - 4.26-1
+- Update to stunnel-4.26.
+
 * Sun Jun  8 2008 Miloslav Trmač <mitr@redhat.com> - 4.25-2
 - Use a clearer error message if the service name is unknown in "accept"
   Resolves: #450344