From 301d2bf64dd2bfa317f1ad450b17c79ffb66866388b1054084bc4d57f75afa9d Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Wed, 2 Feb 2011 12:42:10 +0000 Subject: [PATCH] Accepting request 49433 from devel:libraries:c_c++ ok OBS-URL: https://build.opensuse.org/request/show/49433 OBS-URL: https://build.opensuse.org/package/show/security:Stunnel/stunnel?expand=0&rev=37 --- execargs.patch | 23 ----------------------- no_ticket.patch | 22 ---------------------- openssl097d.patch | 36 ------------------------------------ stunnel-4.28.tar.gz | 3 --- stunnel-4.28.tar.gz.asc | 7 ------- stunnel-4.28.tar.gz.sha1 | 1 - stunnel-4.34.tar.bz2 | 3 +++ stunnel.changes | 30 ++++++++++++++++++++++++++++++ stunnel.spec | 10 +++------- 9 files changed, 36 insertions(+), 99 deletions(-) delete mode 100644 execargs.patch delete mode 100644 no_ticket.patch delete mode 100644 openssl097d.patch delete mode 100644 stunnel-4.28.tar.gz delete mode 100644 stunnel-4.28.tar.gz.asc delete mode 100644 stunnel-4.28.tar.gz.sha1 create mode 100644 stunnel-4.34.tar.bz2 diff --git a/execargs.patch b/execargs.patch deleted file mode 100644 index 542a622..0000000 --- a/execargs.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- src/options.old 2009-11-13 15:44:54.000000000 +0100 -+++ src/options.c 2009-11-13 15:58:44.000000000 +0100 -@@ -793,6 +793,11 @@ - break; - section->option.program=1; - section->execname=stralloc(arg); -+ if(!section->execargs) { -+ section->execargs=calloc(2, sizeof(char *)); -+ section->execargs[0]=section->execname; -+ section->execargs[1]=NULL; /* to show that it's null-terminated */ -+ } - return NULL; /* OK */ - case CMD_DEFAULT: - break; -@@ -1603,7 +1608,7 @@ - while(*ptr && isspace((unsigned char)*ptr)) - *ptr++='\0'; - } -- retval[i]=NULL; -+ retval[i]=NULL; /* to show that it's null-terminated */ - return retval; - } - #endif diff --git a/no_ticket.patch b/no_ticket.patch deleted file mode 100644 index e9e0914..0000000 --- a/no_ticket.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/options.old 2009-11-13 09:29:16.000000000 +0100 -+++ src/options.c 2009-11-13 09:26:38.000000000 +0100 -@@ -1136,7 +1136,9 @@ - if(strcasecmp(opt, "sessiond")) - break; - section->option.sessiond=1; -+#ifdef SSL_OP_NO_TICKET - section->ssl_options|=SSL_OP_NO_TICKET; -+#endif - if(!name2addrlist(§ion->sessiond_addr, arg, DEFAULT_LOOPBACK)) - return "Failed to resolve sessiond server address"; - return NULL; /* OK */ -@@ -1706,7 +1708,9 @@ - {"DONT_INSERT_EMPTY_FRAGMENTS", SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS}, - {"NO_QUERY_MTU", SSL_OP_NO_QUERY_MTU}, - {"COOKIE_EXCHANGE", SSL_OP_COOKIE_EXCHANGE}, -+#ifdef SSL_OP_NO_TICKET - {"NO_TICKET", SSL_OP_NO_TICKET}, -+#endif - {"NO_SESSION_RESUMPTION_ON_RENEGOTIATION", - SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION}, - #ifdef SSL_OP_NO_COMPRESSION diff --git a/openssl097d.patch b/openssl097d.patch deleted file mode 100644 index c0e06ee..0000000 --- a/openssl097d.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- src/options.c.orig 2009-10-01 09:52:52.000000000 +0200 -+++ src/options.c 2009-11-27 11:24:43.998850503 +0100 -@@ -1136,7 +1136,9 @@ - if(strcasecmp(opt, "sessiond")) - break; - section->option.sessiond=1; -+#ifdef SSL_OP_NO_TICKET - section->ssl_options|=SSL_OP_NO_TICKET; -+#endif - if(!name2addrlist(§ion->sessiond_addr, arg, DEFAULT_LOOPBACK)) - return "Failed to resolve sessiond server address"; - return NULL; /* OK */ -@@ -1704,15 +1706,23 @@ - {"TLS_D5_BUG", SSL_OP_TLS_D5_BUG}, - {"TLS_BLOCK_PADDING_BUG", SSL_OP_TLS_BLOCK_PADDING_BUG}, - {"DONT_INSERT_EMPTY_FRAGMENTS", SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS}, -+#ifdef SSL_OP_NO_QUERY_MTU - {"NO_QUERY_MTU", SSL_OP_NO_QUERY_MTU}, -+#endif -+#ifdef SSL_OP_COOKIE_EXCHANGE - {"COOKIE_EXCHANGE", SSL_OP_COOKIE_EXCHANGE}, -+#endif -+#ifdef SSL_OP_NO_TICKET - {"NO_TICKET", SSL_OP_NO_TICKET}, -+#endif - {"NO_SESSION_RESUMPTION_ON_RENEGOTIATION", - SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION}, - #ifdef SSL_OP_NO_COMPRESSION - {"NO_COMPRESSION", SSL_OP_NO_COMPRESSION}, - #endif -+#ifdef SSL_OP_SINGLE_ECDH_USE - {"SINGLE_ECDH_USE", SSL_OP_SINGLE_ECDH_USE}, -+#endif - {"SINGLE_DH_USE", SSL_OP_SINGLE_DH_USE}, - {"EPHEMERAL_RSA", SSL_OP_EPHEMERAL_RSA}, - {"CIPHER_SERVER_PREFERENCE", SSL_OP_CIPHER_SERVER_PREFERENCE}, diff --git a/stunnel-4.28.tar.gz b/stunnel-4.28.tar.gz deleted file mode 100644 index 434a5b8..0000000 --- a/stunnel-4.28.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9be98fb1aa5e96e44095df267d89b776aa539e6dce90dd0d54db675e9a95cd80 -size 543008 diff --git a/stunnel-4.28.tar.gz.asc b/stunnel-4.28.tar.gz.asc deleted file mode 100644 index f330ddd..0000000 --- a/stunnel-4.28.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iD8DBQBK9yxE/NU+nXTHMtERArdZAJ9jqBNY2thmkiQYUUtX8KKSi7k2mgCfeKGM -aegr9+rToWNsY8Whwg8fyFs= -=o6KF ------END PGP SIGNATURE----- diff --git a/stunnel-4.28.tar.gz.sha1 b/stunnel-4.28.tar.gz.sha1 deleted file mode 100644 index 7bfa5a1..0000000 --- a/stunnel-4.28.tar.gz.sha1 +++ /dev/null @@ -1 +0,0 @@ -868cba9ec56ed6a02c8ecfa2a87614b4d433611b stunnel-4.28.tar.gz diff --git a/stunnel-4.34.tar.bz2 b/stunnel-4.34.tar.bz2 new file mode 100644 index 0000000..627a0b2 --- /dev/null +++ b/stunnel-4.34.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e82dcbd4e4b3179813952b2cd3960fdfc1c813ebab99f0c64f6109888ad803fa +size 430120 diff --git a/stunnel.changes b/stunnel.changes index e4d0617..a709cc9 100644 --- a/stunnel.changes +++ b/stunnel.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Tue Sep 28 23:06:16 CEST 2010 - dmueller@suse.de + +- update to 4.34: + - Added ECC support with a new service-level "curve" option. + - DH support is now enabled by default. + - Added support for OpenSSL builds with some algorithms disabled. + - ./configure modified to support cross-compilation. + - Implemented fixes in user interface to enter engine PIN. + - Fixed a transfer() loop issue on socket errors. + - Fixed missing WIN32 taskbar icon while displaying a global option error. + - Inetd mode fixed. + - New service-level "libwrap" option for run-time control whether + /etc/hosts.allow and /etc/hosts.deny are used for access control. + Disabling libwrap significantly increases performance of stunnel. + - Win32 DLLs for OpenSSL 0.9.8m. + - Fixed a transfer() loop issue with SSLv2 connections. + - Fixed a "setsockopt IP_TRANSPARENT" warning with "local" option. + - Logging subsystem bugfixes and cleanup. + - Installer bugfixes for Vista and later versions of Windows. + - FIPS mode can be enabled/disabled at runtime. + - Log file reopen on USR1 signal was added. + - Some regression issues introduced in 4.30 were fixed. + - Graceful configuration reload with HUP signal on Unix + and with GUI on Windows. + - A serious bug in asynchronous shutdown code fixed. + - Data alignment updated in libwrap.c. + - Polish manual encoding fixed. + - Notes on compression implementation in OpenSSL added to the manual. + ------------------------------------------------------------------- Fri Nov 27 11:11:59 CET 2009 - vetter@physik.uni-wuerzburg.de diff --git a/stunnel.spec b/stunnel.spec index b15e446..abf6dfd 100644 --- a/stunnel.spec +++ b/stunnel.spec @@ -19,7 +19,7 @@ BuildRequires: gcc-c++ tcp_wrappers %endif Summary: Universal SSL Tunnel License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) -Version: 4.28 +Version: 4.34 Release: 1.1 Group: Productivity/Networking/Security URL: http://www.stunnel.org/ @@ -27,13 +27,11 @@ Autoreqprov: on %if %{?suse_version:%suse_version}%{?!suse_version:0} > 800 PreReq: /usr/sbin/useradd fileutils textutils %insserv_prereq %fillup_prereq %endif -Source: http://www.stunnel.org/download/stunnel/src/%{name}-%{version}.tar.gz +Source: http://www.stunnel.org/download/stunnel/src/%{name}-%{version}.tar.bz2 Source1: stunnel.conf Source2: stunnel.README Source3: sysconfig.syslog-stunnel Source4: stunnel.rc -Patch1: execargs.patch -Patch2: openssl097d.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define VENDOR SUSE @@ -50,8 +48,6 @@ without any changes to the program code. %prep %setup -q -%patch1 -%patch2 %build #autoreconf -fi @@ -106,7 +102,7 @@ system_user=-r %post %{fillup_and_insserv -f} %{fillup_only -ans syslog stunnel} -%run_ldconfig +/sbin/ldconfig if ! test -s etc/stunnel/stunnel.conf; then cp -p usr/share/doc/packages/stunnel/stunnel.conf-sample etc/stunnel/stunnel.conf echo copying default config file to /etc/stunnel/stunnel.conf