- New upstream realease 4.30
- Updated authpriv and sample patches for the new release
This commit is contained in:
avesh agarwal
parent
66a8720362
commit
4e0e9ddbae
@ -2,3 +2,5 @@ stunnel-4.27.tar.gz
|
||||
stunnel-4.27.tar.gz.asc
|
||||
stunnel-4.29.tar.gz
|
||||
stunnel-4.29.tar.gz.asc
|
||||
stunnel-4.30.tar.gz
|
||||
stunnel-4.30.tar.gz.asc
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
14dc3f8412947f0548975cbce74d6863 stunnel-4.29.tar.gz
|
||||
655172db10aa297e2085009af22797fb stunnel-4.29.tar.gz.asc
|
||||
3b171b8d3ac24a45c06cd280fe649bce stunnel-4.30.tar.gz
|
||||
c2a9f6ffdce5b64a1f1ae00c0fa21c73 stunnel-4.30.tar.gz.asc
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
diff -urNp stunnel-4.29-orig/tools/stunnel.conf-sample.in stunnel-4.29/tools/stunnel.conf-sample.in
|
||||
--- stunnel-4.29-orig/tools/stunnel.conf-sample.in 2009-11-08 14:40:24.000000000 -0500
|
||||
+++ stunnel-4.29/tools/stunnel.conf-sample.in 2009-12-09 16:51:38.000000000 -0500
|
||||
@@ -3,14 +3,14 @@
|
||||
; Please make sure you understand them (especially the effect of the chroot jail)
|
||||
|
||||
; Certificate/key is needed in server mode and optional in client mode
|
||||
-cert = @prefix@/etc/stunnel/mail.pem
|
||||
-;key = @prefix@/etc/stunnel/mail.pem
|
||||
+cert = @sysconfdir@/etc/stunnel/mail.pem
|
||||
+;key = @sysconfdir@/etc/stunnel/mail.pem
|
||||
|
||||
; Protocol version (all, SSLv2, SSLv3, TLSv1)
|
||||
sslVersion = SSLv3
|
||||
|
||||
; Some security enhancements for UNIX systems - comment them out on Win32
|
||||
-chroot = @prefix@/var/lib/stunnel/
|
||||
+chroot = @localstatedir@/var/lib/stunnel/
|
||||
setuid = nobody
|
||||
setgid = @DEFAULT_GROUP@
|
||||
; PID is created inside the chroot jail
|
||||
@@ -30,12 +30,13 @@ socket = r:TCP_NODELAY=1
|
||||
; CApath is located inside chroot jail
|
||||
;CApath = /certs
|
||||
; It's often easier to use CAfile
|
||||
-;CAfile = @prefix@/etc/stunnel/certs.pem
|
||||
+;CAfile = @sysconfdir@/etc/stunnel/certs.pem
|
||||
+;CAfile = @sysconfdir@/pki/tls/certs/ca-bundle.crt
|
||||
; Don't forget to c_rehash CRLpath
|
||||
; CRLpath is located inside chroot jail
|
||||
;CRLpath = /crls
|
||||
; Alternatively you can use CRLfile
|
||||
-;CRLfile = @prefix@/etc/stunnel/crls.pem
|
||||
+;CRLfile = @sysconfdir@/etc/stunnel/crls.pem
|
||||
|
||||
; Some debugging stuff useful for troubleshooting
|
||||
;debug = 7
|
||||
@ -1,6 +1,6 @@
|
||||
diff -urNp stunnel-4.29-orig/doc/stunnel.8 stunnel-4.29/doc/stunnel.8
|
||||
--- stunnel-4.29-orig/doc/stunnel.8 2009-11-20 15:50:52.000000000 -0500
|
||||
+++ stunnel-4.29/doc/stunnel.8 2009-12-09 16:44:25.000000000 -0500
|
||||
diff -urNp stunnel-4.30-orig/doc/stunnel.8 stunnel-4.30/doc/stunnel.8
|
||||
--- stunnel-4.30-orig/doc/stunnel.8 2010-01-21 06:26:39.000000000 -0500
|
||||
+++ stunnel-4.30/doc/stunnel.8 2010-01-26 14:43:46.000000000 -0500
|
||||
@@ -169,7 +169,7 @@ info (6), or debug (7). All logs for th
|
||||
all levels numerically less than it will be shown. Use \fBdebug = debug\fR or
|
||||
\&\fBdebug = 7\fR for greatest debugging output. The default is notice (5).
|
||||
@ -10,10 +10,10 @@ diff -urNp stunnel-4.29-orig/doc/stunnel.8 stunnel-4.29/doc/stunnel.8
|
||||
(Facilities are not supported on Win32.)
|
||||
.Sp
|
||||
Case is ignored for both facilities and levels.
|
||||
diff -urNp stunnel-4.29-orig/doc/stunnel.html stunnel-4.29/doc/stunnel.html
|
||||
--- stunnel-4.29-orig/doc/stunnel.html 2009-11-20 15:50:52.000000000 -0500
|
||||
+++ stunnel-4.29/doc/stunnel.html 2009-12-09 16:43:09.000000000 -0500
|
||||
@@ -192,7 +192,7 @@ emerg (0), alert (1), crit (2), err (3),
|
||||
diff -urNp stunnel-4.30-orig/doc/stunnel.html stunnel-4.30/doc/stunnel.html
|
||||
--- stunnel-4.30-orig/doc/stunnel.html 2010-01-21 06:26:39.000000000 -0500
|
||||
+++ stunnel-4.30/doc/stunnel.html 2010-01-26 14:43:46.000000000 -0500
|
||||
@@ -193,7 +193,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 <strong>debug = debug</strong> or
|
||||
<strong>debug = 7</strong> for greatest debugging output. The default is notice (5).</p>
|
||||
@ -22,9 +22,9 @@ diff -urNp stunnel-4.29-orig/doc/stunnel.html stunnel-4.29/doc/stunnel.html
|
||||
(Facilities are not supported on Win32.)</p>
|
||||
<p>Case is ignored for both facilities and levels.</p>
|
||||
</dd>
|
||||
diff -urNp stunnel-4.29-orig/doc/stunnel.pod stunnel-4.29/doc/stunnel.pod
|
||||
--- stunnel-4.29-orig/doc/stunnel.pod 2009-11-20 15:48:33.000000000 -0500
|
||||
+++ stunnel-4.29/doc/stunnel.pod 2009-12-09 16:43:52.000000000 -0500
|
||||
diff -urNp stunnel-4.30-orig/doc/stunnel.pod stunnel-4.30/doc/stunnel.pod
|
||||
--- stunnel-4.30-orig/doc/stunnel.pod 2010-01-21 06:26:37.000000000 -0500
|
||||
+++ stunnel-4.30/doc/stunnel.pod 2010-01-26 14:43:46.000000000 -0500
|
||||
@@ -144,7 +144,7 @@ info (6), or debug (7). All logs for th
|
||||
all levels numerically less than it will be shown. Use B<debug = debug> or
|
||||
B<debug = 7> for greatest debugging output. The default is notice (5).
|
||||
@ -34,17 +34,17 @@ diff -urNp stunnel-4.29-orig/doc/stunnel.pod stunnel-4.29/doc/stunnel.pod
|
||||
(Facilities are not supported on Win32.)
|
||||
|
||||
Case is ignored for both facilities and levels.
|
||||
diff -urNp stunnel-4.29-orig/src/options.c stunnel-4.29/src/options.c
|
||||
--- stunnel-4.29-orig/src/options.c 2009-11-20 15:55:12.000000000 -0500
|
||||
+++ stunnel-4.29/src/options.c 2009-12-09 16:45:57.000000000 -0500
|
||||
@@ -136,8 +136,12 @@ static char *global_options(CMD cmd, cha
|
||||
diff -urNp stunnel-4.30-orig/src/options.c stunnel-4.30/src/options.c
|
||||
--- stunnel-4.30-orig/src/options.c 2010-01-21 05:52:43.000000000 -0500
|
||||
+++ stunnel-4.30/src/options.c 2010-01-26 14:49:32.000000000 -0500
|
||||
@@ -139,8 +139,12 @@ static char *parse_global_option(CMD cmd
|
||||
case CMD_INIT:
|
||||
options.debug_level=5;
|
||||
new_global_options.debug_level=LOG_NOTICE;
|
||||
#if !defined (USE_WIN32) && !defined (__vms)
|
||||
+#if defined(LOG_AUTHPRIV)
|
||||
+ options.facility=LOG_AUTHPRIV;
|
||||
+ new_global_options.facility=LOG_AUTHPRIV;
|
||||
+#else
|
||||
options.facility=LOG_DAEMON;
|
||||
new_global_options.facility=LOG_DAEMON;
|
||||
#endif
|
||||
+#endif
|
||||
break;
|
||||
38
stunnel-4.30-sample.patch
Normal file
38
stunnel-4.30-sample.patch
Normal file
@ -0,0 +1,38 @@
|
||||
diff -urNp stunnel-4.30-orig/tools/stunnel.conf-sample.in stunnel-4.30/tools/stunnel.conf-sample.in
|
||||
--- stunnel-4.30-orig/tools/stunnel.conf-sample.in 2010-01-18 08:17:49.000000000 -0500
|
||||
+++ stunnel-4.30/tools/stunnel.conf-sample.in 2010-01-26 14:59:41.000000000 -0500
|
||||
@@ -4,15 +4,15 @@
|
||||
; please read the manual and make sure you understand them
|
||||
|
||||
; certificate/key is needed in server mode and optional in client mode
|
||||
-cert = @prefix@/etc/stunnel/mail.pem
|
||||
-;key = @prefix@/etc/stunnel/mail.pem
|
||||
+cert = @sysconfdir@/stunnel/mail.crt
|
||||
+;key = @sysconfdir@/stunnel/mail.key
|
||||
|
||||
; protocol version (all, SSLv2, SSLv3, TLSv1)
|
||||
sslVersion = SSLv3
|
||||
|
||||
; security enhancements for UNIX systems - comment them out on Win32
|
||||
; for chroot a copy of some devices and files is needed within the jail
|
||||
-chroot = @prefix@/var/lib/stunnel/
|
||||
+chroot = @localstatedir@/run/stunnel/
|
||||
setuid = nobody
|
||||
setgid = @DEFAULT_GROUP@
|
||||
; PID is created inside the chroot jail
|
||||
@@ -33,12 +33,13 @@ socket = r:TCP_NODELAY=1
|
||||
; CApath is located inside chroot jail
|
||||
;CApath = /certs
|
||||
; it's often easier to use CAfile
|
||||
-;CAfile = @prefix@/etc/stunnel/certs.pem
|
||||
+;CAfile = @sysconfdir@/stunnel/certs.pem
|
||||
+;CAfile = @sysconfdir@/pki/tls/certs/ca-bundle.crt
|
||||
; don't forget to c_rehash CRLpath
|
||||
; CRLpath is located inside chroot jail
|
||||
;CRLpath = /crls
|
||||
; alternatively CRLfile can be used
|
||||
-;CRLfile = @prefix@/etc/stunnel/crls.pem
|
||||
+;CRLfile = @sysconfdir@/stunnel/crls.pem
|
||||
|
||||
; debugging stuff (may useful for troubleshooting)
|
||||
;debug = 7
|
||||
14
stunnel.spec
14
stunnel.spec
@ -1,6 +1,6 @@
|
||||
Summary: An SSL-encrypting socket wrapper
|
||||
Name: stunnel
|
||||
Version: 4.29
|
||||
Version: 4.30
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2
|
||||
Group: Applications/Internet
|
||||
@ -12,9 +12,8 @@ Source3: sfinger.xinetd
|
||||
Source4: stunnel-sfinger.conf
|
||||
Source5: pop3-redirect.xinetd
|
||||
Source6: stunnel-pop3s-client.conf
|
||||
Patch0: stunnel-4.29-authpriv.patch
|
||||
Patch1: stunnel-4.29-sample.patch
|
||||
#Patch2: stunnel-4.27-aliasing.patch
|
||||
Patch0: stunnel-4.30-authpriv.patch
|
||||
Patch1: stunnel-4.30-sample.patch
|
||||
Buildroot: %{_tmppath}/stunnel-root
|
||||
# util-linux is needed for rename
|
||||
BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
|
||||
@ -28,7 +27,6 @@ in conjunction with imapd to create an SSL secure IMAP server.
|
||||
%setup -q
|
||||
%patch0 -p1 -b .authpriv
|
||||
%patch1 -p1 -b .sample
|
||||
#%patch2 -p1 -b .aliasing
|
||||
|
||||
iconv -f iso-8859-1 -t utf-8 < doc/stunnel.fr.8 > doc/stunnel.fr.8_
|
||||
mv doc/stunnel.fr.8_ doc/stunnel.fr.8
|
||||
@ -81,7 +79,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%exclude %{_sysconfdir}/stunnel/*
|
||||
|
||||
%changelog
|
||||
* Tue Dec 09 2009 Avesh Agrwal <avagarwa@redhat.com> - 4.29-1
|
||||
* Tue Jan 26 2010 Avesh Agarwal <avagarwa@redhat.com> - 4.30-1
|
||||
- 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
|
||||
- New upstream realease 4.29
|
||||
- Updated authpriv and sample patches for the new release
|
||||
- Modified spec file to include dist tag
|
||||
|
||||
Loading…
Reference in New Issue
Block a user