- update to 4.08

- build stunnel as a PIE
This commit is contained in:
Nalin Dahyabhai 2005-03-16 20:45:02 +00:00
parent 69033c4312
commit e5d9f7c1de
2 changed files with 60 additions and 6 deletions

View File

@ -0,0 +1,49 @@
Change the default log facility from LOG_DAEMON to LOG_AUTHPRIV.
--- stunnel-4.08/doc/stunnel.pod 2005-01-22 11:42:30.000000000 -0500
+++ stunnel-4.08/doc/stunnel.pod 2005-03-15 17:07:32.714670692 -0500
@@ -186,7 +186,7 @@
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).
-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.)
Case is ignored for both facilities and levels.
--- stunnel-4.08/doc/stunnel.8 2005-01-22 11:42:31.000000000 -0500
+++ stunnel-4.08/doc/stunnel.8 2005-03-15 17:07:32.715670561 -0500
@@ -269,7 +269,7 @@
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).
.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.
--- stunnel-4.08/doc/stunnel.html 2005-01-22 11:42:31.000000000 -0500
+++ stunnel-4.08/doc/stunnel.html 2005-03-15 17:08:57.859551451 -0500
@@ -270,7 +270,7 @@
<strong>debug = 7</strong> for greatest debugging output. The default is notice (5).</p>
</dd>
<dd>
-<p>The syslog facility 'daemon' will be used unless a facility name is supplied.
+<p>The syslog facility 'authpriv' will be used unless a facility name is supplied.
(Facilities are not supported on Win32.)</p>
</dd>
<dd>
--- stunnel-4.08/src/options.c 2005-02-15 14:08:28.000000000 -0500
+++ stunnel-4.08/src/options.c 2005-03-15 17:07:32.713670823 -0500
@@ -269,8 +269,12 @@
case CMD_INIT:
options.debug_level=5;
#if !defined (USE_WIN32) && !defined (__vms)
+#if defined(LOG_AUTHPRIV)
+ options.facility=LOG_AUTHPRIV;
+#else
options.facility=LOG_DAEMON;
#endif
+#endif
break;
case CMD_EXEC:
if(strcasecmp(opt, "debug"))

View File

@ -1,7 +1,7 @@
Summary: An SSL-encrypting socket wrapper.
Name: stunnel
Version: 4.05
Release: 4
Version: 4.08
Release: 1
License: GPL
Group: Applications/Internet
URL: http://stunnel.mirt.net/
@ -13,9 +13,9 @@ Source4: sfinger.xinetd
Source5: stunnel-sfinger.conf
Source6: pop3-redirect.xinetd
Source7: stunnel-pop3s-client.conf
Patch0: stunnel-4.02-authpriv.patch
Patch0: stunnel-4.08-authpriv.patch
Patch1: stunnel-4.05-nopem.patch
Patch2: stunnel-4.05-sample.patch
Patch2: stunnel-4.08-sample.patch
Buildroot: %{_tmppath}/stunnel-root
BuildPrereq: automake14, autoconf, openssl-devel, perl, pkgconfig,
BuildPrereq: tcp_wrappers, /usr/share/dict/words
@ -48,9 +48,9 @@ if pkg-config openssl ; then
CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags openssl`"; export CFLAGS
LDFLAGS="`pkg-config --libs-only-L openssl`"; export LDFLAGS
fi
%configure --with-tcp-wrappers
%configure --with-tcp-wrappers --with-pic
export tagname=CC
make LIBTOOL=%{_bindir}/libtool
make LIBTOOL=%{_bindir}/libtool LDADD=-pie
%install
rm -rf $RPM_BUILD_ROOT
@ -90,9 +90,14 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/stunnel.8*
%{_mandir}/*/man8/stunnel.8*
%{_sbindir}/stunnel
%{_sbindir}/stunnel3
%dir %{_sysconfdir}/%{name}
%changelog
* Wed Mar 16 2005 Nalin Dahyabhai <nalin@redhat.com> 4.08-1
- update to 4.08
- build stunnel as a PIE binary
* Mon Nov 22 2004 Miloslav Trmac <mitr@redhat.com> - 4.05-4
- Convert man pages to UTF-8