rpms/stunnel
7
0
Fork 0
Code Issues Pull Requests Releases Activity

New upstream realease 5.00

Browse Source 
- Updated local patches.
- Fix for CVE-2014-0016
- Fixed changelog date errors
- Fixes rhbz #1006819
This commit is contained in:
Avesh Agarwal 2014-03-07 14:24:19 -05:00
parent 56a00b5c9a
commit 1ff588bc09
5 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -34,3 +34,6 @@ stunnel-4.33.tar.gz.asc
/stunnel-4.56.tar.gz
/stunnel-4.56.tar.gz.asc
/stunnel-4.56.tar.gz.sha256
/stunnel-5.00.tar.gz
/stunnel-5.00.tar.gz.asc
/stunnel-5.00.tar.gz.sha256

6
sources
View File

@ -1,3 +1,3 @@
ac4c4a30bd7a55b6687cbd62d864054c stunnel-4.56.tar.gz
d68c7dd65d515c678cdde15bbf0ce344 stunnel-4.56.tar.gz.asc
edd00caa66ee2d158a727c60c8843028 stunnel-4.56.tar.gz.sha256
4f00fd0faf99e3c9cf258a19dd83d14a stunnel-5.00.tar.gz
00ee8a92a8645c88a80e634ac79dfc03 stunnel-5.00.tar.gz.asc
ccd2e73c4cbb078c66d98244684e6698 stunnel-5.00.tar.gz.sha256

26
stunnel-4-authpriv.patch → stunnel-5-authpriv.patch
View File

@ -1,6 +1,6 @@
diff -urNp stunnel-4.56-patched/doc/stunnel.8 stunnel-4.56-current/doc/stunnel.8
--- stunnel-4.56-patched/doc/stunnel.8 2013-03-28 14:38:34.921698500 -0400
+++ stunnel-4.56-current/doc/stunnel.8 2013-03-28 14:39:09.676668676 -0400
diff -urNp stunnel-5.00-patched/doc/stunnel.8 stunnel-5.00-current/doc/stunnel.8
--- stunnel-5.00-patched/doc/stunnel.8 2014-03-07 14:04:50.015418514 -0500
+++ stunnel-5.00-current/doc/stunnel.8 2014-03-07 14:05:27.243448245 -0500
@@ -190,7 +190,7 @@ info (6), or debug (7). All logs for th
all levels numerically less than it will be shown. Use \fIdebug = debug\fR or
\&\fIdebug = 7\fR for greatest debugging output. The default is notice (5).
@ -10,9 +10,9 @@ diff -urNp stunnel-4.56-patched/doc/stunnel.8 stunnel-4.56-current/doc/stunnel.8
(Facilities are not supported on Win32.)
.Sp
Case is ignored for both facilities and levels.
diff -urNp stunnel-4.56-patched/doc/stunnel.html stunnel-4.56-current/doc/stunnel.html
--- stunnel-4.56-patched/doc/stunnel.html 2013-03-28 14:38:34.960698467 -0400
+++ stunnel-4.56-current/doc/stunnel.html 2013-03-28 14:39:09.678668674 -0400
diff -urNp stunnel-5.00-patched/doc/stunnel.html stunnel-5.00-current/doc/stunnel.html
--- stunnel-5.00-patched/doc/stunnel.html 2014-03-07 14:04:50.014418534 -0500
+++ stunnel-5.00-current/doc/stunnel.html 2014-03-07 14:05:27.244448247 -0500
@@ -224,7 +224,7 @@ emerg (0), alert (1), crit (2), err (3),
info (6), or debug (7). All logs for the specified level and
all levels numerically less than it will be shown. Use <em>debug = debug</em> or
@ -22,9 +22,9 @@ diff -urNp stunnel-4.56-patched/doc/stunnel.html stunnel-4.56-current/doc/stunne
(Facilities are not supported on Win32.)</p>
<p>Case is ignored for both facilities and levels.</p>
</dd>
diff -urNp stunnel-4.56-patched/doc/stunnel.pod stunnel-4.56-current/doc/stunnel.pod
--- stunnel-4.56-patched/doc/stunnel.pod 2013-03-28 14:38:34.959698468 -0400
+++ stunnel-4.56-current/doc/stunnel.pod 2013-03-28 14:39:09.678668674 -0400
diff -urNp stunnel-5.00-patched/doc/stunnel.pod stunnel-5.00-current/doc/stunnel.pod
--- stunnel-5.00-patched/doc/stunnel.pod 2014-03-07 14:04:50.014418534 -0500
+++ stunnel-5.00-current/doc/stunnel.pod 2014-03-07 14:05:27.245448251 -0500
@@ -184,7 +184,7 @@ info (6), or debug (7). All logs for th
all levels numerically less than it will be shown. Use I<debug = debug> or
I<debug = 7> for greatest debugging output. The default is notice (5).
@ -34,10 +34,10 @@ diff -urNp stunnel-4.56-patched/doc/stunnel.pod stunnel-4.56-current/doc/stunnel
(Facilities are not supported on Win32.)
Case is ignored for both facilities and levels.
diff -urNp stunnel-4.56-patched/src/options.c stunnel-4.56-current/src/options.c
--- stunnel-4.56-patched/src/options.c 2013-03-28 14:38:34.919698502 -0400
+++ stunnel-4.56-current/src/options.c 2013-03-28 14:39:09.680668671 -0400
@@ -185,8 +185,12 @@ static char *parse_global_option(CMD cmd
diff -urNp stunnel-5.00-patched/src/options.c stunnel-5.00-current/src/options.c
--- stunnel-5.00-patched/src/options.c 2014-03-07 14:04:50.019418416 -0500
+++ stunnel-5.00-current/src/options.c 2014-03-07 14:05:27.246448261 -0500
@@ -185,8 +185,12 @@ NOEXPORT char *parse_global_option(CMD c
case CMD_BEGIN:
new_global_options.debug_level=LOG_NOTICE;
#if !defined (USE_WIN32) && !defined (__vms)

6
stunnel-4-sample.patch → stunnel-5-sample.patch
View File

@ -1,6 +1,6 @@
diff -urNp stunnel-4.56-patched/tools/stunnel.conf-sample.in stunnel-4.56-current/tools/stunnel.conf-sample.in
--- stunnel-4.56-patched/tools/stunnel.conf-sample.in 2013-03-28 14:38:34.992698440 -0400
+++ stunnel-4.56-current/tools/stunnel.conf-sample.in 2013-03-28 14:40:31.423595815 -0400
diff -urNp stunnel-5.00-patched/tools/stunnel.conf-sample.in stunnel-5.00-current/tools/stunnel.conf-sample.in
--- stunnel-5.00-patched/tools/stunnel.conf-sample.in 2014-03-07 14:04:50.015418514 -0500
+++ stunnel-5.00-current/tools/stunnel.conf-sample.in 2014-03-07 14:06:45.501516446 -0500
@@ -9,7 +9,7 @@
; A copy of some devices and system files is needed within the chroot jail

21
stunnel.spec
View File

@ -1,7 +1,7 @@
Summary: An SSL-encrypting socket wrapper
Name: stunnel
Version: 4.56
Release: 3%{?dist}
Version: 5.00
Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.stunnel.org/
@ -13,8 +13,8 @@ Source3: sfinger.xinetd
Source4: stunnel-sfinger.conf
Source5: pop3-redirect.xinetd
Source6: stunnel-pop3s-client.conf
Patch0: stunnel-4-authpriv.patch
Patch1: stunnel-4-sample.patch
Patch0: stunnel-5-authpriv.patch
Patch1: stunnel-5-sample.patch
Buildroot: %{_tmppath}/stunnel-root
# util-linux is needed for rename
BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
@ -84,6 +84,13 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_sysconfdir}/stunnel/*
%changelog
* Fri Mar 7 2014 Avesh Agarwal <avagarwa@redhat.com> - 5.00-1
- New upstream realease 5.00
- Updated local patches.
- Fix for CVE-2014-0016
- Fixed changelog date errors
- Fixes rhbz #1006819
* Mon Aug 5 2013 Avesh Agarwal <avagarwa@redhat.com> - 4.56-3
- Ftp mirrors for NA does not work, so changing source code
URLs to the correct ones.
@ -97,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT
- Fixed upstream URL in spec file.
- Sourced URL of sha256 hash file in spec file.
* Mon Mar 26 2013 Avesh Agarwal <avagarwa@redhat.com> - 4.55-2
* Tue Mar 26 2013 Avesh Agarwal <avagarwa@redhat.com> - 4.55-2
- Resolves: 927841
* Mon Mar 4 2013 Avesh Agarwal <avagarwa@redhat.com> - 4.55-1
@ -179,7 +186,7 @@ rm -rf $RPM_BUILD_ROOT
- New upstream realease 4.30
- Updated authpriv and sample patches for the new release
* Tue Dec 09 2009 Avesh Agarwal <avagarwa@redhat.com> - 4.29-1
* Wed Dec 09 2009 Avesh Agarwal <avagarwa@redhat.com> - 4.29-1
- New upstream realease 4.29
- Updated authpriv and sample patches for the new release
- Modified spec file to include dist tag
@ -465,7 +472,7 @@ rm -rf $RPM_BUILD_ROOT
* Sat Oct 30 1999 Bernhard Rosenkraenzer <bero@redhat.com>
- Modify spec file to match Red Hat standards
* Fri Aug 12 1999 Damien Miller <damien@ibs.com.au>
* Thu Aug 12 1999 Damien Miller <damien@ibs.com.au>
- Updated to 3.4a
- Patched for OpenSSL 0.9.4
- Cleaned up files section