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

New upstream release 5.18.

Browse Source 
- Finally deleted the patch stunnel-5-sample.patch as upstream
  has merged those changes.
- Fixes patches as per new code changes.
- Fixed systemd service file related changes.
This commit is contained in:
Avesh Agarwal 2015-06-22 11:42:07 -04:00
parent e9b7489796
commit 8bc9a92e3a
7 changed files with 42 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -87,3 +87,6 @@ stunnel-4.33.tar.gz.asc
/stunnel-5.17.tar.gz /stunnel-5.17.tar.gz
/stunnel-5.17.tar.gz.asc /stunnel-5.17.tar.gz.asc
/stunnel-5.17.tar.gz.sha256 /stunnel-5.17.tar.gz.sha256
/stunnel-5.18.tar.gz
/stunnel-5.18.tar.gz.asc
/stunnel-5.18.tar.gz.sha256

6
sources
View File

@ -1,3 +1,3 @@
e70f001ee190105c5a10a74f4bd54901 stunnel-5.17.tar.gz 04f90ffbb65ffa289a5b1db2c52950f5 stunnel-5.18.tar.gz
8a493fe8e5652ab4fb253ab52a4d5b6b stunnel-5.17.tar.gz.asc e30445a50b06763cb17e3c2c1a578850 stunnel-5.18.tar.gz.asc
196f2ef36e10eb6c578d119bcf6c47c2 stunnel-5.17.tar.gz.sha256 6c4b983ca3a2927ae3d9eb9e2f0b8a90 stunnel-5.18.tar.gz.sha256

32
stunnel-5-authpriv.patch
View File

@ -1,7 +1,7 @@
diff -urNp stunnel-5.15/doc/stunnel.8 stunnel-5.15-patched/doc/stunnel.8 diff -urNp stunnel-5.18/doc/stunnel.8 stunnel-5.18-patch/doc/stunnel.8
--- stunnel-5.15/doc/stunnel.8 2015-04-16 05:49:52.000000000 -0400 --- stunnel-5.18/doc/stunnel.8 2015-06-11 05:22:15.000000000 -0400
+++ stunnel-5.15-patched/doc/stunnel.8 2015-04-27 10:34:34.504034442 -0400 +++ stunnel-5.18-patch/doc/stunnel.8 2015-06-22 11:20:26.816469375 -0400
@@ -209,7 +209,7 @@ info (6), or debug (7). All logs for th @@ -207,7 +207,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-5.15/doc/stunnel.8 stunnel-5.15-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-5.15/doc/stunnel.html stunnel-5.15-patched/doc/stunnel.html diff -urNp stunnel-5.18/doc/stunnel.html stunnel-5.18-patch/doc/stunnel.html
--- stunnel-5.15/doc/stunnel.html 2015-04-16 05:49:52.000000000 -0400 --- stunnel-5.18/doc/stunnel.html 2015-06-08 08:48:58.000000000 -0400
+++ stunnel-5.15-patched/doc/stunnel.html 2015-04-27 10:34:34.504034442 -0400 +++ stunnel-5.18-patch/doc/stunnel.html 2015-06-22 11:20:45.868248769 -0400
@@ -214,7 +214,7 @@ @@ -212,7 +212,7 @@
<p>Level is a one of the syslog level names or numbers emerg (0), alert (1), crit (2), err (3), warning (4), notice (5), info (6), or debug (7). All logs for the specified level and all levels numerically less than it will be shown. Use <i>debug = debug</i> or <i>debug = 7</i> for greatest debugging output. The default is notice (5).</p> <p>Level is a one of the syslog level names or numbers emerg (0), alert (1), crit (2), err (3), warning (4), notice (5), info (6), or debug (7). All logs for the specified level and all levels numerically less than it will be shown. Use <i>debug = debug</i> or <i>debug = 7</i> for greatest debugging output. The default is notice (5).</p>
@ -22,10 +22,10 @@ diff -urNp stunnel-5.15/doc/stunnel.html stunnel-5.15-patched/doc/stunnel.html
<p>Case is ignored for both facilities and levels.</p> <p>Case is ignored for both facilities and levels.</p>
diff -urNp stunnel-5.15/doc/stunnel.pod stunnel-5.15-patched/doc/stunnel.pod diff -urNp stunnel-5.18/doc/stunnel.pod stunnel-5.18-patch/doc/stunnel.pod
--- stunnel-5.15/doc/stunnel.pod 2015-04-16 05:49:52.000000000 -0400 --- stunnel-5.18/doc/stunnel.pod 2015-06-08 08:48:57.000000000 -0400
+++ stunnel-5.15-patched/doc/stunnel.pod 2015-04-27 10:34:34.505034430 -0400 +++ stunnel-5.18-patch/doc/stunnel.pod 2015-06-22 11:21:12.353942083 -0400
@@ -197,7 +197,7 @@ info (6), or debug (7). All logs for th @@ -195,7 +195,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.15/doc/stunnel.pod stunnel-5.15-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-5.15/src/options.c stunnel-5.15-patched/src/options.c diff -urNp stunnel-5.18/src/options.c stunnel-5.18-patch/src/options.c
--- stunnel-5.15/src/options.c 2015-04-16 05:49:52.000000000 -0400 --- stunnel-5.18/src/options.c 2015-06-01 10:25:32.000000000 -0400
+++ stunnel-5.15-patched/src/options.c 2015-04-27 10:34:34.505034430 -0400 +++ stunnel-5.18-patch/src/options.c 2015-06-22 11:22:28.066065390 -0400
@@ -470,8 +470,12 @@ NOEXPORT char *parse_global_option(CMD c @@ -587,8 +587,12 @@ NOEXPORT char *parse_global_option(CMD c
case CMD_BEGIN: case CMD_BEGIN:
new_service_options.log_level=LOG_NOTICE; new_service_options.log_level=LOG_NOTICE;
#if !defined (USE_WIN32) && !defined (__vms) #if !defined (USE_WIN32) && !defined (__vms)

53
stunnel-5-sample.patch
View File

@ -1,53 +0,0 @@
diff -urNp stunnel-5.15/tools/stunnel.conf-sample.in stunnel-5.15-patched/tools/stunnel.conf-sample.in
--- stunnel-5.15/tools/stunnel.conf-sample.in 2015-04-16 08:22:14.000000000 -0400
+++ stunnel-5.15-patched/tools/stunnel.conf-sample.in 2015-04-27 11:23:41.958154436 -0400
@@ -12,7 +12,7 @@
;setgid = @DEFAULT_GROUP@
; PID file is created inside the chroot jail (if enabled)
-;pid = @prefix@/var/run/stunnel.pid
+;pid = @localstatedir@/run/stunnel.pid
; Debugging stuff (may be useful for troubleshooting)
;foreground = yes
@@ -68,34 +68,34 @@ checkHost = smtp.gmail.com
;[pop3s]
;accept = 995
;connect = 110
-;cert = @prefix@/etc/stunnel/stunnel.pem
+;cert = @sysconfdir@/stunnel/stunnel.pem
;[imaps]
;accept = 993
;connect = 143
-;cert = @prefix@/etc/stunnel/stunnel.pem
+;cert = @sysconfdir@/stunnel/stunnel.pem
;[ssmtp]
;accept = 465
;connect = 25
-;cert = @prefix@/etc/stunnel/stunnel.pem
+;cert = @sysconfdir@/stunnel/stunnel.pem
; TLS front-end to a web server
;[https]
;accept = 443
;connect = 80
-;cert = @prefix@/etc/stunnel/stunnel.pem
+;cert = @sysconfdir@/stunnel/stunnel.pem
; "TIMEOUTclose = 0" is a workaround for a design flaw in Microsoft SChannel
; Microsoft implementations do not use TLS close-notify alert and thus they
; are vulnerable to truncation attacks
;TIMEOUTclose = 0
; Remote shell protected with PSK-authenticated TLS
-; Create "@prefix@/etc/stunnel/secrets.txt" containing IDENTITY:KEY pairs
+; Create "@sysconfdir@/stunnel/secrets.txt" containing IDENTITY:KEY pairs
;[shell]
;accept = 1337
;exec = /bin/sh
;execArgs = sh -i
-;PSKsecrets = @prefix@/etc/stunnel/secrets.txt
+;PSKsecrets = @sysconfdir@/stunnel/secrets.txt
; vim:ft=dosini

8
stunnel-configure-ac.patch
View File

@ -1,7 +1,7 @@
diff -urNp stunnel-5.10/configure.ac stunnel-5.10-patch/configure.ac diff -urNp stunnel-5.18/configure.ac stunnel-5.18-patch/configure.ac
--- stunnel-5.10/configure.ac 2015-01-20 09:30:22.000000000 -0500 --- stunnel-5.18/configure.ac 2015-06-01 10:25:32.000000000 -0400
+++ stunnel-5.10-patch/configure.ac 2015-01-28 13:50:46.282363420 -0500 +++ stunnel-5.18-patch/configure.ac 2015-06-22 11:34:50.244471487 -0400
@@ -273,7 +273,7 @@ AC_ARG_ENABLE(fips, @@ -274,7 +274,7 @@ AC_ARG_ENABLE(fips,
[ --disable-fips disable OpenSSL FIPS support], [ --disable-fips disable OpenSSL FIPS support],
[ [
case "$enableval" in case "$enableval" in

8
stunnel-systemd-service.patch
View File

@ -1,6 +1,6 @@
diff -urNp stunnel-5.10/tools/stunnel.service.in stunnel-5.10-patch/tools/stunnel.service.in diff -urNp stunnel-5.18/tools/stunnel.service.in stunnel-5.18-patch/tools/stunnel.service.in
--- stunnel-5.10/tools/stunnel.service.in 2011-05-02 18:07:34.000000000 -0400 --- stunnel-5.18/tools/stunnel.service.in 2015-06-01 10:25:32.000000000 -0400
+++ stunnel-5.10-patch/tools/stunnel.service.in 2015-01-28 13:50:29.051578380 -0500 +++ stunnel-5.18-patch/tools/stunnel.service.in 2015-06-22 11:30:49.156263119 -0400
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
[Unit] [Unit]
Description=SSL tunnel for network daemons Description=SSL tunnel for network daemons
@ -8,7 +8,7 @@ diff -urNp stunnel-5.10/tools/stunnel.service.in stunnel-5.10-patch/tools/stunne
+After=syslog.target network.target +After=syslog.target network.target
[Service] [Service]
ExecStart=@prefix@/bin/stunnel ExecStart=@bindir@/stunnel
Type=forking Type=forking
+PrivateTmp=true +PrivateTmp=true

19
stunnel.spec
View File

@ -1,7 +1,7 @@
Summary: An SSL-encrypting socket wrapper Summary: An SSL-encrypting socket wrapper
Name: stunnel Name: stunnel
Version: 5.17 Version: 5.18
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Group: Applications/Internet Group: Applications/Internet
URL: http://www.stunnel.org/ URL: http://www.stunnel.org/
@ -14,9 +14,8 @@ Source4: stunnel-sfinger.conf
Source5: pop3-redirect.xinetd Source5: pop3-redirect.xinetd
Source6: stunnel-pop3s-client.conf Source6: stunnel-pop3s-client.conf
Patch0: stunnel-5-authpriv.patch Patch0: stunnel-5-authpriv.patch
Patch1: stunnel-5-sample.patch Patch1: stunnel-systemd-service.patch
Patch2: stunnel-systemd-service.patch Patch2: stunnel-configure-ac.patch
Patch3: stunnel-configure-ac.patch
# util-linux is needed for rename # util-linux is needed for rename
BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
BuildRequires: autoconf automake BuildRequires: autoconf automake
@ -39,9 +38,8 @@ in conjunction with imapd to create an SSL secure IMAP server.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .authpriv %patch0 -p1 -b .authpriv
%patch1 -p1 -b .sample %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%build %build
autoreconf autoreconf
@ -111,6 +109,13 @@ cp $RPM_BUILD_ROOT%{_datadir}/doc/stunnel/examples/%{name}.service $RPM_BUILD_RO
%endif %endif
%changelog %changelog
* Mon Jun 22 2015 Avesh Agarwal <avagarwa@redhat.com> - 5.18-1
- New upstream release 5.18.
- Finally deleted the patch stunnel-5-sample.patch as upstream
has merged those changes.
- Fixes patches as per new code changes.
- Fixed systemd service file related changes.
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.17-2 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild