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

New upstream realease 5.04

Browse Source 
- Updates local patches so that they apply cleanly to
  avoud hunk errors
This commit is contained in:
Avesh Agarwal 2014-09-22 15:59:00 -04:00
parent 2552e7126f
commit f6a8a9321c
6 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -46,3 +46,6 @@ stunnel-4.33.tar.gz.asc
/stunnel-5.03.tar.gz /stunnel-5.03.tar.gz
/stunnel-5.03.tar.gz.asc /stunnel-5.03.tar.gz.asc
/stunnel-5.03.tar.gz.sha256 /stunnel-5.03.tar.gz.sha256
/stunnel-5.04.tar.gz
/stunnel-5.04.tar.gz.asc
/stunnel-5.04.tar.gz.sha256

6
sources
View File

@ -1,3 +1,3 @@
ee43ef72038e0437400f712837cefee4 stunnel-5.03.tar.gz 53ac78cedabb00ec09564cbd20eaa7c8 stunnel-5.04.tar.gz
812ec5db2d55dac2be6203c20295ade9 stunnel-5.03.tar.gz.asc 878029cddc35587cd7111bde7daad722 stunnel-5.04.tar.gz.asc
31169ec91094ef962534a4d79d8ebfca stunnel-5.03.tar.gz.sha256 75f4bed7b12707c68e1e22c22e1d42a1 stunnel-5.04.tar.gz.sha256

26
stunnel-5-authpriv.patch
View File

@ -1,6 +1,6 @@
diff -urNp stunnel-5.00-patched/doc/stunnel.8 stunnel-5.00-current/doc/stunnel.8 diff -urNp stunnel-5.04-patched/doc/stunnel.8 stunnel-5.04-current/doc/stunnel.8
--- stunnel-5.00-patched/doc/stunnel.8 2014-03-07 14:04:50.015418514 -0500 --- stunnel-5.04-patched/doc/stunnel.8 2014-09-16 16:31:54.000000000 -0400
+++ stunnel-5.00-current/doc/stunnel.8 2014-03-07 14:05:27.243448245 -0500 +++ stunnel-5.04-current/doc/stunnel.8 2014-09-22 15:44:27.897393109 -0400
@@ -190,7 +190,7 @@ info (6), or debug (7). All logs for th @@ -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 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). \&\fIdebug = 7\fR for greatest debugging output. The default is notice (5).
@ -10,9 +10,9 @@ diff -urNp stunnel-5.00-patched/doc/stunnel.8 stunnel-5.00-current/doc/stunnel.8
(Facilities are not supported on Win32.) (Facilities are not supported on Win32.)
.Sp .Sp
Case is ignored for both facilities and levels. Case is ignored for both facilities and levels.
diff -urNp stunnel-5.00-patched/doc/stunnel.html stunnel-5.00-current/doc/stunnel.html diff -urNp stunnel-5.04-patched/doc/stunnel.html stunnel-5.04-current/doc/stunnel.html
--- stunnel-5.00-patched/doc/stunnel.html 2014-03-07 14:04:50.014418534 -0500 --- stunnel-5.04-patched/doc/stunnel.html 2014-09-16 16:31:54.000000000 -0400
+++ stunnel-5.00-current/doc/stunnel.html 2014-03-07 14:05:27.244448247 -0500 +++ stunnel-5.04-current/doc/stunnel.html 2014-09-22 15:44:27.898393096 -0400
@@ -224,7 +224,7 @@ emerg (0), alert (1), crit (2), err (3), @@ -224,7 +224,7 @@ emerg (0), alert (1), crit (2), err (3),
info (6), or debug (7). All logs for the specified level and 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 all levels numerically less than it will be shown. Use <em>debug = debug</em> or
@ -22,9 +22,9 @@ diff -urNp stunnel-5.00-patched/doc/stunnel.html stunnel-5.00-current/doc/stunne
(Facilities are not supported on Win32.)</p> (Facilities are not supported on Win32.)</p>
<p>Case is ignored for both facilities and levels.</p> <p>Case is ignored for both facilities and levels.</p>
</dd> </dd>
diff -urNp stunnel-5.00-patched/doc/stunnel.pod stunnel-5.00-current/doc/stunnel.pod diff -urNp stunnel-5.04-patched/doc/stunnel.pod stunnel-5.04-current/doc/stunnel.pod
--- stunnel-5.00-patched/doc/stunnel.pod 2014-03-07 14:04:50.014418534 -0500 --- stunnel-5.04-patched/doc/stunnel.pod 2014-09-16 08:15:58.000000000 -0400
+++ stunnel-5.00-current/doc/stunnel.pod 2014-03-07 14:05:27.245448251 -0500 +++ stunnel-5.04-current/doc/stunnel.pod 2014-09-22 15:44:27.899393083 -0400
@@ -184,7 +184,7 @@ info (6), or debug (7). All logs for th @@ -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 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). I<debug = 7> for greatest debugging output. The default is notice (5).
@ -34,10 +34,10 @@ diff -urNp stunnel-5.00-patched/doc/stunnel.pod stunnel-5.00-current/doc/stunnel
(Facilities are not supported on Win32.) (Facilities are not supported on Win32.)
Case is ignored for both facilities and levels. Case is ignored for both facilities and levels.
diff -urNp stunnel-5.00-patched/src/options.c stunnel-5.00-current/src/options.c diff -urNp stunnel-5.04-patched/src/options.c stunnel-5.04-current/src/options.c
--- stunnel-5.00-patched/src/options.c 2014-03-07 14:04:50.019418416 -0500 --- stunnel-5.04-patched/src/options.c 2014-09-20 15:03:10.000000000 -0400
+++ stunnel-5.00-current/src/options.c 2014-03-07 14:05:27.246448261 -0500 +++ stunnel-5.04-current/src/options.c 2014-09-22 15:44:27.901393056 -0400
@@ -185,8 +185,12 @@ NOEXPORT char *parse_global_option(CMD c @@ -371,8 +371,12 @@ NOEXPORT char *parse_global_option(CMD c
case CMD_BEGIN: case CMD_BEGIN:
new_global_options.debug_level=LOG_NOTICE; new_global_options.debug_level=LOG_NOTICE;
#if !defined (USE_WIN32) && !defined (__vms) #if !defined (USE_WIN32) && !defined (__vms)

6
stunnel-5-sample.patch
View File

@ -1,6 +1,6 @@
diff -urNp stunnel-5.02-patched/tools/stunnel.conf-sample.in stunnel-5.02-current/tools/stunnel.conf-sample.in diff -urNp stunnel-5.04-patched/tools/stunnel.conf-sample.in stunnel-5.04-current/tools/stunnel.conf-sample.in
--- stunnel-5.02-patched/tools/stunnel.conf-sample.in 2014-07-14 13:12:23.093008573 -0400 --- stunnel-5.04-patched/tools/stunnel.conf-sample.in 2014-05-08 04:31:52.000000000 -0400
+++ stunnel-5.02-current/tools/stunnel.conf-sample.in 2014-07-14 13:22:38.431698073 -0400 +++ stunnel-5.04-current/tools/stunnel.conf-sample.in 2014-09-22 15:44:33.959312856 -0400
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
; A copy of some devices and system files is needed within the chroot jail ; A copy of some devices and system files is needed within the chroot jail

6
stunnel-systemd-service.patch
View File

@ -1,6 +1,6 @@
diff -urNp stunnel-5.01-patched/tools/stunnel.service.in stunnel-5.01-current/tools/stunnel.service.in diff -urNp stunnel-5.04-patched/tools/stunnel.service.in stunnel-5.04-current/tools/stunnel.service.in
--- stunnel-5.01-patched/tools/stunnel.service.in 2011-05-02 18:07:34.000000000 -0400 --- stunnel-5.04-patched/tools/stunnel.service.in 2011-05-02 18:07:34.000000000 -0400
+++ stunnel-5.01-current/tools/stunnel.service.in 2014-04-28 22:41:20.842510005 -0400 +++ stunnel-5.04-current/tools/stunnel.service.in 2014-09-22 15:44:38.760249303 -0400
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
[Unit] [Unit]
Description=SSL tunnel for network daemons Description=SSL tunnel for network daemons

7
stunnel.spec
View File

@ -1,6 +1,6 @@
Summary: An SSL-encrypting socket wrapper Summary: An SSL-encrypting socket wrapper
Name: stunnel Name: stunnel
Version: 5.03 Version: 5.04
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Group: Applications/Internet Group: Applications/Internet
@ -113,6 +113,11 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Mon Sep 22 2014 Avesh Agarwal <avagarwa@redhat.com> - 5.04-1
- New upstream realease 5.04
- Updates local patches so that they apply cleanly to
avoud hunk errors
* Thu Aug 28 2014 Avesh Agarwal <avagarwa@redhat.com> - 5.03-1 * Thu Aug 28 2014 Avesh Agarwal <avagarwa@redhat.com> - 5.03-1
- New upstream realease 5.03 - New upstream realease 5.03