Author: qboosh Date: Sun Nov 6 06:52:05 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 4.46
- updated am,libwrap_srv_name_log patches
- stunnel.exe no longer in source tarball - dropped from doc
---- Files affected:
packages/stunnel:
stunnel-am.patch (1.6 -> 1.7) , stunnel-libwrap_srv_name_log.patch (1.7 ->
1.8) , stunnel.spec (1.124 -> 1.125)
---- Diffs:
================================================================
Index: packages/stunnel/stunnel-am.patch
diff -u packages/stunnel/stunnel-am.patch:1.6
packages/stunnel/stunnel-am.patch:1.7
--- packages/stunnel/stunnel-am.patch:1.6 Sat Jul 9 09:50:00 2011
+++ packages/stunnel/stunnel-am.patch Sun Nov 6 07:52:00 2011
@@ -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; \
================================================================
Index: packages/stunnel/stunnel-libwrap_srv_name_log.patch
diff -u packages/stunnel/stunnel-libwrap_srv_name_log.patch:1.7
packages/stunnel/stunnel-libwrap_srv_name_log.patch:1.8
--- packages/stunnel/stunnel-libwrap_srv_name_log.patch:1.7 Sat Jul 2
01:31:28 2011
+++ packages/stunnel/stunnel-libwrap_srv_name_log.patch Sun Nov 6 07:52:00 2011
@@ -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);
}
================================================================
Index: packages/stunnel/stunnel.spec
diff -u packages/stunnel/stunnel.spec:1.124 packages/stunnel/stunnel.spec:1.125
--- packages/stunnel/stunnel.spec:1.124 Sun Sep 18 15:27:34 2011
+++ packages/stunnel/stunnel.spec Sun Nov 6 07:52:00 2011
@@ -2,12 +2,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
@@ -152,8 +152,7 @@
%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
@@ -180,6 +179,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.125 2011/11/06 06:52:00 qboosh
+- updated to 4.46
+- updated am,libwrap_srv_name_log patches
+- stunnel.exe no longer in source tarball - dropped from doc
+
Revision 1.124 2011/09/18 13:27:34 areq
- 4.44
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/stunnel/stunnel-am.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/stunnel/stunnel-libwrap_srv_name_log.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/stunnel/stunnel.spec?r1=1.124&r2=1.125&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
