New upstream realease 4.50
Updated local patches
This commit is contained in:
parent
b570a112a6
commit
e97a2aa685
3
.gitignore
vendored
3
.gitignore
vendored
@ -16,3 +16,6 @@ stunnel-4.33.tar.gz.asc
|
|||||||
/stunnel-4.44.tar.gz
|
/stunnel-4.44.tar.gz
|
||||||
/stunnel-4.44.tar.gz.asc
|
/stunnel-4.44.tar.gz.asc
|
||||||
/stunnel-4.44.tar.gz.sha256
|
/stunnel-4.44.tar.gz.sha256
|
||||||
|
/stunnel-4.50.tar.gz
|
||||||
|
/stunnel-4.50.tar.gz.asc
|
||||||
|
/stunnel-4.50.tar.gz.sha256
|
||||||
|
6
sources
6
sources
@ -1,3 +1,3 @@
|
|||||||
c9dd51fc02b913ce5bf7b3fc12f9cb4a stunnel-4.44.tar.gz
|
d68b4565294496a8bdf23c728a679f53 stunnel-4.50.tar.gz
|
||||||
e86fc2578e5304ae5a7b586ce170f843 stunnel-4.44.tar.gz.asc
|
ea9e85daef0cc96ce21649901b3514f7 stunnel-4.50.tar.gz.asc
|
||||||
66997c52850f47f0f2bc8a40a228799b stunnel-4.44.tar.gz.sha256
|
0b901f3d914ba59f76333e70a282a993 stunnel-4.50.tar.gz.sha256
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
diff -urNp stunnel-4.44/doc/stunnel.8 stunnel-4.44-patched/doc/stunnel.8
|
diff -urNp stunnel-4.50/doc/stunnel.8 stunnel-4.50-patched/doc/stunnel.8
|
||||||
--- stunnel-4.44/doc/stunnel.8 2011-09-07 16:21:06.000000000 -0400
|
--- stunnel-4.50/doc/stunnel.8 2011-11-28 16:04:45.000000000 -0500
|
||||||
+++ stunnel-4.44-patched/doc/stunnel.8 2011-09-20 16:36:06.839020567 -0400
|
+++ stunnel-4.50-patched/doc/stunnel.8 2012-01-03 10:41:22.532321571 -0500
|
||||||
@@ -168,7 +168,7 @@ info (6), or debug (7). All logs for th
|
@@ -176,7 +176,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).
|
||||||
.Sp
|
.Sp
|
||||||
@ -10,10 +10,10 @@ diff -urNp stunnel-4.44/doc/stunnel.8 stunnel-4.44-patched/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-4.44/doc/stunnel.html stunnel-4.44-patched/doc/stunnel.html
|
diff -urNp stunnel-4.50/doc/stunnel.html stunnel-4.50-patched/doc/stunnel.html
|
||||||
--- stunnel-4.44/doc/stunnel.html 2011-09-07 16:21:07.000000000 -0400
|
--- stunnel-4.50/doc/stunnel.html 2011-11-28 16:04:47.000000000 -0500
|
||||||
+++ stunnel-4.44-patched/doc/stunnel.html 2011-09-20 16:36:06.840020566 -0400
|
+++ stunnel-4.50-patched/doc/stunnel.html 2012-01-03 10:41:22.532321571 -0500
|
||||||
@@ -196,7 +196,7 @@ emerg (0), alert (1), crit (2), err (3),
|
@@ -211,7 +211,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
|
||||||
<em>debug = 7</em> for greatest debugging output. The default is notice (5).</p>
|
<em>debug = 7</em> for greatest debugging output. The default is notice (5).</p>
|
||||||
@ -22,10 +22,10 @@ diff -urNp stunnel-4.44/doc/stunnel.html stunnel-4.44-patched/doc/stunnel.html
|
|||||||
(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-4.44/doc/stunnel.pod stunnel-4.44-patched/doc/stunnel.pod
|
diff -urNp stunnel-4.50/doc/stunnel.pod stunnel-4.50-patched/doc/stunnel.pod
|
||||||
--- stunnel-4.44/doc/stunnel.pod 2011-09-07 16:19:39.000000000 -0400
|
--- stunnel-4.50/doc/stunnel.pod 2011-11-28 16:04:26.000000000 -0500
|
||||||
+++ stunnel-4.44-patched/doc/stunnel.pod 2011-09-20 16:36:06.845020561 -0400
|
+++ stunnel-4.50-patched/doc/stunnel.pod 2012-01-03 10:41:22.533321572 -0500
|
||||||
@@ -136,7 +136,7 @@ info (6), or debug (7). All logs for th
|
@@ -150,7 +150,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-4.44/doc/stunnel.pod stunnel-4.44-patched/doc/stunnel.pod
|
|||||||
(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-4.44/src/options.c stunnel-4.44-patched/src/options.c
|
diff -urNp stunnel-4.50/src/options.c stunnel-4.50-patched/src/options.c
|
||||||
--- stunnel-4.44/src/options.c 2011-09-10 12:44:16.000000000 -0400
|
--- stunnel-4.50/src/options.c 2011-11-24 05:54:49.000000000 -0500
|
||||||
+++ stunnel-4.44-patched/src/options.c 2011-09-20 16:36:06.846020561 -0400
|
+++ stunnel-4.50-patched/src/options.c 2012-01-03 10:41:22.535321572 -0500
|
||||||
@@ -142,8 +142,12 @@ static char *parse_global_option(CMD cmd
|
@@ -157,8 +157,12 @@ static char *parse_global_option(CMD cmd
|
||||||
case CMD_INIT:
|
case CMD_INIT:
|
||||||
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)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
diff -urNp stunnel-4.44/tools/stunnel.conf-sample.in stunnel-4.44-patched/tools/stunnel.conf-sample.in
|
diff -urNp stunnel-4.50/tools/stunnel.conf-sample.in stunnel-4.50-patched/tools/stunnel.conf-sample.in
|
||||||
--- stunnel-4.44/tools/stunnel.conf-sample.in 2011-07-24 01:51:56.000000000 -0400
|
--- stunnel-4.50/tools/stunnel.conf-sample.in 2011-11-22 17:20:37.000000000 -0500
|
||||||
+++ stunnel-4.44-patched/tools/stunnel.conf-sample.in 2011-09-20 16:39:07.580888462 -0400
|
+++ stunnel-4.50-patched/tools/stunnel.conf-sample.in 2012-01-03 10:41:32.344325275 -0500
|
||||||
@@ -8,7 +8,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
|
||||||
; Chroot conflicts with configuration file reload and many other features
|
; Chroot conflicts with configuration file reload and many other features
|
||||||
@ -10,8 +10,8 @@ diff -urNp stunnel-4.44/tools/stunnel.conf-sample.in stunnel-4.44-patched/tools/
|
|||||||
; Chroot jail can be escaped if setuid option is not used
|
; Chroot jail can be escaped if setuid option is not used
|
||||||
setuid = nobody
|
setuid = nobody
|
||||||
setgid = @DEFAULT_GROUP@
|
setgid = @DEFAULT_GROUP@
|
||||||
@@ -25,8 +25,8 @@ pid = /stunnel.pid
|
@@ -26,8 +26,8 @@ pid = /stunnel.pid
|
||||||
; *****************************************************************************
|
; **************************************************************************
|
||||||
|
|
||||||
; Certificate/key is needed in server mode and optional in client mode
|
; Certificate/key is needed in server mode and optional in client mode
|
||||||
-cert = @prefix@/etc/stunnel/mail.pem
|
-cert = @prefix@/etc/stunnel/mail.pem
|
||||||
@ -21,7 +21,7 @@ diff -urNp stunnel-4.44/tools/stunnel.conf-sample.in stunnel-4.44-patched/tools/
|
|||||||
|
|
||||||
; Authentication stuff needs to be configured to prevent MITM attacks
|
; Authentication stuff needs to be configured to prevent MITM attacks
|
||||||
; It is not enabled by default!
|
; It is not enabled by default!
|
||||||
@@ -35,12 +35,13 @@ cert = @prefix@/etc/stunnel/mail.pem
|
@@ -36,12 +36,13 @@ cert = @prefix@/etc/stunnel/mail.pem
|
||||||
; CApath is located inside chroot jail
|
; CApath is located inside chroot jail
|
||||||
;CApath = /certs
|
;CApath = /certs
|
||||||
; It's often easier to use CAfile
|
; It's often easier to use CAfile
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Summary: An SSL-encrypting socket wrapper
|
Summary: An SSL-encrypting socket wrapper
|
||||||
Name: stunnel
|
Name: stunnel
|
||||||
Version: 4.44
|
Version: 4.50
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Group: Applications/Internet
|
Group: Applications/Internet
|
||||||
@ -79,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%exclude %{_sysconfdir}/stunnel/*
|
%exclude %{_sysconfdir}/stunnel/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 3 2012 Avesh Agarwal <avagarwa@redhat.com> - 4.50-1
|
||||||
|
- New upstream realease 4.50
|
||||||
|
- Updated local patches
|
||||||
|
|
||||||
* Tue Sep 20 2011 Avesh Agarwal <avagarwa@redhat.com> - 4.44-1
|
* Tue Sep 20 2011 Avesh Agarwal <avagarwa@redhat.com> - 4.44-1
|
||||||
- New upstream realease 4.44
|
- New upstream realease 4.44
|
||||||
- Updated local patches
|
- Updated local patches
|
||||||
|
Loading…
Reference in New Issue
Block a user