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

New upstream release 5.30

Browse Source 
- Add generic stunnel@.service provided by Štefan Gurský (#1195742)
This commit is contained in:
Tomas Mraz 2016-02-03 17:32:45 +01:00
parent 8bc9a92e3a
commit 0132657974
5 changed files with 52 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -90,3 +90,5 @@ stunnel-4.33.tar.gz.asc
/stunnel-5.18.tar.gz
/stunnel-5.18.tar.gz.asc
/stunnel-5.18.tar.gz.sha256
/stunnel-5.30.tar.gz
/stunnel-5.30.tar.gz.asc

5
sources
View File

@ -1,3 +1,2 @@
04f90ffbb65ffa289a5b1db2c52950f5 stunnel-5.18.tar.gz
e30445a50b06763cb17e3c2c1a578850 stunnel-5.18.tar.gz.asc
6c4b983ca3a2927ae3d9eb9e2f0b8a90 stunnel-5.18.tar.gz.sha256
7bbf27296a83c0b752f6bb6d1b750b19 stunnel-5.30.tar.gz
9c96dabbb4b3742a6de51a23cb75fa1c stunnel-5.30.tar.gz.asc

48
stunnel-5-authpriv.patch → stunnel-5.30-authpriv.patch
View File

@ -1,30 +1,18 @@
diff -urNp stunnel-5.18/doc/stunnel.8 stunnel-5.18-patch/doc/stunnel.8
--- stunnel-5.18/doc/stunnel.8 2015-06-11 05:22:15.000000000 -0400
+++ stunnel-5.18-patch/doc/stunnel.8 2015-06-22 11:20:26.816469375 -0400
@@ -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
\&\fIdebug = 7\fR for greatest debugging output. The default is notice (5).
.Sp
-The syslog facility 'daemon' will be used unless a facility name is supplied.
+The syslog facility 'authpriv' will be used unless a facility name is supplied.
(Facilities are not supported on Win32.)
.Sp
Case is ignored for both facilities and levels.
diff -urNp stunnel-5.18/doc/stunnel.html stunnel-5.18-patch/doc/stunnel.html
--- stunnel-5.18/doc/stunnel.html 2015-06-08 08:48:58.000000000 -0400
+++ stunnel-5.18-patch/doc/stunnel.html 2015-06-22 11:20:45.868248769 -0400
@@ -212,7 +212,7 @@
diff -up stunnel-5.30/doc/stunnel.html.in.authpriv stunnel-5.30/doc/stunnel.html.in
--- stunnel-5.30/doc/stunnel.html.in.authpriv 2015-12-05 22:53:08.000000000 +0100
+++ stunnel-5.30/doc/stunnel.html.in 2016-02-03 16:39:02.259239765 +0100
@@ -246,7 +246,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 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>The syslog facility &#39;daemon&#39; will be used unless a facility name is supplied. (Facilities are not supported on Win32.)</p>
+<p>The syslog facility &#39;authpriv&#39; will be used unless a facility name is supplied. (Facilities are not supported on Win32.)</p>
<p>Case is ignored for both facilities and levels.</p>
diff -urNp stunnel-5.18/doc/stunnel.pod stunnel-5.18-patch/doc/stunnel.pod
--- stunnel-5.18/doc/stunnel.pod 2015-06-08 08:48:57.000000000 -0400
+++ stunnel-5.18-patch/doc/stunnel.pod 2015-06-22 11:21:12.353942083 -0400
diff -up stunnel-5.30/doc/stunnel.pod.in.authpriv stunnel-5.30/doc/stunnel.pod.in
--- stunnel-5.30/doc/stunnel.pod.in.authpriv 2015-12-05 22:52:36.000000000 +0100
+++ stunnel-5.30/doc/stunnel.pod.in 2016-02-03 16:39:20.123338658 +0100
@@ -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
I<debug = 7> for greatest debugging output. The default is notice (5).
@ -34,10 +22,22 @@ diff -urNp stunnel-5.18/doc/stunnel.pod stunnel-5.18-patch/doc/stunnel.pod
(Facilities are not supported on Win32.)
Case is ignored for both facilities and levels.
diff -urNp stunnel-5.18/src/options.c stunnel-5.18-patch/src/options.c
--- stunnel-5.18/src/options.c 2015-06-01 10:25:32.000000000 -0400
+++ stunnel-5.18-patch/src/options.c 2015-06-22 11:22:28.066065390 -0400
@@ -587,8 +587,12 @@ NOEXPORT char *parse_global_option(CMD c
diff -up stunnel-5.30/doc/stunnel.8.in.authpriv stunnel-5.30/doc/stunnel.8.in
--- stunnel-5.30/doc/stunnel.8.in.authpriv 2015-12-05 22:53:08.000000000 +0100
+++ stunnel-5.30/doc/stunnel.8.in 2016-02-03 16:38:31.199067820 +0100
@@ -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
\&\fIdebug = 7\fR for greatest debugging output. The default is notice (5).
.Sp
-The syslog facility 'daemon' will be used unless a facility name is supplied.
+The syslog facility 'authpriv' will be used unless a facility name is supplied.
(Facilities are not supported on Win32.)
.Sp
Case is ignored for both facilities and levels.
diff -up stunnel-5.30/src/options.c.authpriv stunnel-5.30/src/options.c
--- stunnel-5.30/src/options.c.authpriv 2016-01-15 17:45:23.000000000 +0100
+++ stunnel-5.30/src/options.c 2016-02-03 15:07:56.309333700 +0100
@@ -610,8 +610,12 @@ NOEXPORT char *parse_global_option(CMD c
case CMD_BEGIN:
new_service_options.log_level=LOG_NOTICE;
#if !defined (USE_WIN32) && !defined (__vms)

23
stunnel.spec
View File

@ -1,19 +1,19 @@
Summary: An SSL-encrypting socket wrapper
Name: stunnel
Version: 5.18
Version: 5.30
Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.stunnel.org/
Source0: https://www.stunnel.org/downloads/stunnel-%{version}.tar.gz
Source1: https://www.stunnel.org/downloads/stunnel-%{version}.tar.gz.asc
Source7: https://www.stunnel.org/downloads/stunnel-%{version}.tar.gz.sha256
Source2: Certificate-Creation
Source3: sfinger.xinetd
Source4: stunnel-sfinger.conf
Source5: pop3-redirect.xinetd
Source6: stunnel-pop3s-client.conf
Patch0: stunnel-5-authpriv.patch
Source7: stunnel@.service
Patch0: stunnel-5.30-authpriv.patch
Patch1: stunnel-systemd-service.patch
Patch2: stunnel-configure-ac.patch
# util-linux is needed for rename
@ -24,10 +24,10 @@ BuildRequires: autoconf automake
BuildRequires: perl-podlators
%endif
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
BuildRequires: systemd, systemd-devel
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
BuildRequires: systemd-units
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
%endif
%description
@ -68,10 +68,10 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} srpm-docs
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
cp $RPM_BUILD_ROOT%{_datadir}/doc/stunnel/examples/%{name}.service $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
cp %{SOURCE7} $RPM_BUILD_ROOT%{_unitdir}/%{name}@.service
%endif
%files
%defattr(-,root,root)
%doc AUTHORS BUGS ChangeLog COPY* CREDITS PORTS README TODO
%doc tools/stunnel.conf-sample
%doc srpm-docs/*
@ -83,12 +83,11 @@ cp $RPM_BUILD_ROOT%{_datadir}/doc/stunnel/examples/%{name}.service $RPM_BUILD_RO
%{_libdir}/stunnel
%exclude %{_libdir}/stunnel/libstunnel.la
%{_mandir}/man8/stunnel.8*
#%lang(fr) %{_mandir}/fr/man8/stunnel.8*
%lang(pl) %{_mandir}/pl/man8/stunnel.8*
%dir %{_sysconfdir}/%{name}
%exclude %{_sysconfdir}/stunnel/*
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
%{_unitdir}/%{name}.service
%{_unitdir}/%{name}*.service
%endif
%post
@ -109,6 +108,10 @@ cp $RPM_BUILD_ROOT%{_datadir}/doc/stunnel/examples/%{name}.service $RPM_BUILD_RO
%endif
%changelog
* Wed Feb 3 2016 Tomáš Mráz <tmraz@redhat.com> - 5.30-1
- New upstream release 5.30
- Add generic stunnel@.service provided by Štefan Gurský (#1195742)
* 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

11
stunnel@.service Normal file
View File

@ -0,0 +1,11 @@
[Unit]
Description=SSL tunnel for %I
After=syslog.target network.target
[Service]
ExecStart=/usr/bin/stunnel /etc/stunnel/%i.conf
Type=forking
PrivateTmp=true
[Install]
WantedBy=multi-user.target