[packages/stunnel] - updated to 5.14 - updated authpriv,libwrap_srv_name_log,config patches - removed obsolete ac_fixes
qboosh
qboosh at pld-linux.org
Sat Apr 4 09:54:25 CEST 2015
commit 1c6cf200744c02a6151a40d333f39af097ff019d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Apr 4 09:55:44 2015 +0200
- updated to 5.14
- updated authpriv,libwrap_srv_name_log,config patches
- removed obsolete ac_fixes patch
stunnel-ac_fixes.patch | 11 -----------
stunnel-authpriv.patch | 15 +++++++--------
stunnel-config.patch | 32 ++++++++++++++++----------------
stunnel-libwrap_srv_name_log.patch | 12 ++++++------
stunnel.spec | 14 ++++----------
5 files changed, 33 insertions(+), 51 deletions(-)
---
diff --git a/stunnel.spec b/stunnel.spec
index a70b36b..76e83e8 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,18 +1,17 @@
Summary: Universal SSL tunnel
Summary(pl.UTF-8): Uniwersalne narzędzie do bezpiecznego tunelowania
Name: stunnel
-Version: 5.05
+Version: 5.14
Release: 1
License: GPL v2+ with OpenSSL exception
Group: Networking/Daemons
Source0: ftp://ftp.stunnel.org/stunnel/%{name}-%{version}.tar.gz
-# Source0-md5: 39e2e678eb5572c9d86ae391db5da30b
+# Source0-md5: e716501960dc6856d80f92547298f724
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.inet
Source4: %{name}.tmpfiles
Patch0: %{name}-authpriv.patch
-Patch1: %{name}-ac_fixes.patch
Patch2: %{name}-am.patch
Patch3: %{name}-libwrap_srv_name_log.patch
Patch4: %{name}-config.patch
@@ -81,7 +80,6 @@ stunnel działający jako usługa inetd.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
@@ -102,7 +100,6 @@ install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig/rc-inetd},%{_mandir}/{pl,
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-mv -f $RPM_BUILD_ROOT%{_mandir}/man8/stunnel.fr.8 $RPM_BUILD_ROOT%{_mandir}/fr/man8/stunnel.8
mv -f $RPM_BUILD_ROOT%{_mandir}/man8/stunnel.pl.8 $RPM_BUILD_ROOT%{_mandir}/pl/man8/stunnel.8
mv -f $RPM_BUILD_ROOT%{_sysconfdir}/stunnel/stunnel.conf-sample $RPM_BUILD_ROOT%{_sysconfdir}/stunnel/stunnel.conf
@@ -111,9 +108,8 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/stunnel
install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/stunnel
install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
-rm -rf $RPM_BUILD_ROOT%{_libdir}/stunnel
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/stunnel/stunnel.pem
-rm -rf $RPM_BUILD_ROOT%{_docdir}/stunnel
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/stunnel
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/stunnel
%clean
rm -rf $RPM_BUILD_ROOT
@@ -153,7 +149,6 @@ fi
%defattr(644,root,root,755)
# note: this COPYING contains general information not GPL text
%doc AUTHORS BUGS COPYING CREDITS ChangeLog NEWS PORTS README TODO doc/en/* doc/stunnel.html tools/{ca.*,importCA.*}
-%doc %lang(fr) doc/stunnel.fr.html
%doc %lang(pl) doc/pl/* doc/stunnel.pl.html
%attr(755,root,root) %{_bindir}/stunnel
%attr(755,root,root) %{_bindir}/stunnel3
@@ -162,7 +157,6 @@ fi
%attr(750,stunnel,stunnel) %{_var}/run/stunnel
/usr/lib/tmpfiles.d/%{name}.conf
%{_mandir}/man8/stunnel.8*
-%lang(fr) %{_mandir}/fr/man8/stunnel.8*
%lang(pl) %{_mandir}/pl/man8/stunnel.8*
%files standalone
diff --git a/stunnel-ac_fixes.patch b/stunnel-ac_fixes.patch
deleted file mode 100644
index 92d3d29..0000000
--- a/stunnel-ac_fixes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -burN stunnel-4.06.orig/configure.ac stunnel-4.06/configure.ac
---- stunnel-4.06.orig/configure.ac 2004-12-26 18:33:15.124066152 +0100
-+++ stunnel-4.06/configure.ac 2004-12-26 18:34:28.262947352 +0100
-@@ -33,6 +33,7 @@
- AC_CHECK_SIZEOF(unsigned short)
- AC_CHECK_SIZEOF(unsigned int)
- AC_CHECK_SIZEOF(unsigned long)
-+AC_CHECK_SIZEOF(unsigned long long)
-
- AC_MSG_NOTICE([**************************************** PTY device files])
- AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(HAVE_DEV_PTMX))
diff --git a/stunnel-authpriv.patch b/stunnel-authpriv.patch
index cd220f8..e8cc3e3 100644
--- a/stunnel-authpriv.patch
+++ b/stunnel-authpriv.patch
@@ -10,15 +10,14 @@ diff -ur stunnel-4.30/doc/stunnel.8 stunnel-4.30.new/doc/stunnel.8
(Facilities are not supported on Win32.)
.Sp
Case is ignored for both facilities and levels.
-diff -ur stunnel-4.30/src/options.c stunnel-4.30.new/src/options.c
---- stunnel-4.30/src/options.c 2010-01-21 11:52:43.000000000 +0100
-+++ stunnel-4.30.new/src/options.c 2010-01-21 15:13:50.470432283 +0100
-@@ -139,7 +139,7 @@
- case CMD_INIT:
- new_global_options.debug_level=LOG_NOTICE;
+--- stunnel-5.14/src/options.c.orig 2015-04-04 07:44:40.423354083 +0200
++++ stunnel-5.14/src/options.c 2015-04-04 07:56:59.416671995 +0200
+@@ -470,7 +470,7 @@
+ case CMD_BEGIN:
+ new_service_options.log_level=LOG_NOTICE;
#if !defined (USE_WIN32) && !defined (__vms)
-- new_global_options.facility=LOG_DAEMON;
-+ new_global_options.facility=LOG_AUTHPRIV;
+- new_global_options.log_facility=LOG_DAEMON;
++ new_global_options.log_facility=LOG_AUTHPRIV;
#endif
break;
case CMD_EXEC:
diff --git a/stunnel-config.patch b/stunnel-config.patch
index 9fce8f0..66a3971 100644
--- a/stunnel-config.patch
+++ b/stunnel-config.patch
@@ -1,11 +1,11 @@
---- stunnel-4.40/tools/stunnel.conf-sample.in.orig 2011-07-07 16:47:37.000000000 +0000
-+++ stunnel-4.40/tools/stunnel.conf-sample.in 2011-07-24 09:40:54.658924150 +0000
-@@ -11,11 +11,11 @@
- ; Chroot conflicts with configuration file reload and many other features
+--- stunnel-5.14/tools/stunnel.conf-sample.in.orig 2015-01-02 15:29:55.000000000 +0100
++++ stunnel-5.14/tools/stunnel.conf-sample.in 2015-04-04 08:16:03.346648179 +0200
+@@ -12,11 +12,11 @@
+ ; Remember also to update the logrotate configuration.
;chroot = @prefix@/var/lib/stunnel/
; Chroot jail can be escaped if setuid option is not used
--setuid = nobody
--setgid = @DEFAULT_GROUP@
+-;setuid = nobody
+-;setgid = @DEFAULT_GROUP@
+setuid = stunnel
+setgid = stunnel
@@ -15,8 +15,8 @@
; Debugging stuff (may be useful for troubleshooting)
;debug = 7
-@@ -25,8 +25,8 @@
- ; *****************************************************************************
+@@ -27,8 +27,8 @@
+ ; **************************************************************************
; Certificate/key is needed in server mode and optional in client mode
-cert = @prefix@/etc/stunnel/mail.pem
@@ -26,7 +26,7 @@
; Authentication stuff needs to be configured to prevent MITM attacks
; It is not enabled by default!
-@@ -35,12 +35,12 @@
+@@ -37,12 +37,12 @@
; CApath is located inside chroot jail
;CApath = /certs
; It's often easier to use CAfile
@@ -39,11 +39,11 @@
-;CRLfile = @prefix@/etc/stunnel/crls.pem
+CRLfile = /etc/stunnel/crls.pem
- ; Disable support for insecure SSLv2 protocol
- options = NO_SSLv2
-@@ -54,17 +54,17 @@
- ; * Service Definitions (remove all services for inetd mode) *
- ; *****************************************************************************
+ ; Enable support for the insecure SSLv2 protocol
+ ;options = -NO_SSLv2
+@@ -61,17 +61,17 @@
+
+ ; Example SSL server mode services
-[pop3s]
-accept = 995
@@ -68,5 +68,5 @@
+;accept = 465
+;connect = 25
- ;[https]
- ;accept = 443
+ ; Example SSL client mode services
+
diff --git a/stunnel-libwrap_srv_name_log.patch b/stunnel-libwrap_srv_name_log.patch
index cfb2a2f..e9ccb25 100644
--- a/stunnel-libwrap_srv_name_log.patch
+++ b/stunnel-libwrap_srv_name_log.patch
@@ -1,12 +1,12 @@
---- stunnel-4.46/src/client.c.orig 2011-11-04 10:58:06.000000000 +0100
-+++ stunnel-4.46/src/client.c 2011-11-06 06:54:08.073382056 +0100
-@@ -858,8 +858,8 @@
+--- stunnel-5.14/src/client.c.orig 2015-04-04 08:02:22.369998614 +0200
++++ stunnel-5.14/src/client.c 2015-04-04 08:05:08.149995161 +0200
+@@ -1039,8 +1039,8 @@
+ while(*user==' ') /* skip leading spaces */
++user;
if(strcmp(user, c->opt->username)) {
- safestring(user);
-- s_log(LOG_WARNING, "Connection from %s REFUSED by IDENT (user %s)",
+- s_log(LOG_WARNING, "Connection from %s REFUSED by IDENT (user \"%s\")",
- accepted_address, user);
-+ s_log(LOG_WARNING, "Connection to service %s from %s REFUSED by IDENT (user %s)",
++ s_log(LOG_WARNING, "Connection to service %s from %s REFUSED by IDENT (user \"%s\")",
+ c->opt->servname, accepted_address, user);
str_free(line);
longjmp(c->err, 1);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/stunnel.git/commitdiff/1c6cf200744c02a6151a40d333f39af097ff019d
More information about the pld-cvs-commit
mailing list