- Update to stunnel-4.14

- Override changed default pid file location, keep it in
    %{_localstatedir}/run
This commit is contained in:
Miloslav Trmac 2005-11-03 00:37:24 +00:00
parent 8b3fda5813
commit ce91c89829
3 changed files with 16 additions and 6 deletions

View File

@ -1,2 +1,2 @@
stunnel-4.13.tar.gz stunnel-4.14.tar.gz
stunnel-4.13.tar.gz.asc stunnel-4.14.tar.gz.asc

View File

@ -1,2 +1,2 @@
d06383b49d8da71ca0b7f46caff90bde stunnel-4.13.tar.gz 0969cc4868dfd75f22792ecccc9ec555 stunnel-4.14.tar.gz
1decffa51589673d8eaf2befdaa0fad9 stunnel-4.13.tar.gz.asc 99e54fa6cb263ffd29be7a02f4e9b536 stunnel-4.14.tar.gz.asc

View File

@ -1,6 +1,6 @@
Summary: An SSL-encrypting socket wrapper. Summary: An SSL-encrypting socket wrapper.
Name: stunnel Name: stunnel
Version: 4.13 Version: 4.14
Release: 1 Release: 1
License: GPL License: GPL
Group: Applications/Internet Group: Applications/Internet
@ -15,9 +15,12 @@ Source6: pop3-redirect.xinetd
Source7: stunnel-pop3s-client.conf Source7: stunnel-pop3s-client.conf
Patch0: stunnel-4.08-authpriv.patch Patch0: stunnel-4.08-authpriv.patch
Patch1: stunnel-4.12-sample.patch Patch1: stunnel-4.12-sample.patch
Patch2: stunnel-4.14-am_.patch
Buildroot: %{_tmppath}/stunnel-root Buildroot: %{_tmppath}/stunnel-root
# util-linux is needed for rename # util-linux is needed for rename
BuildRequires: openssl-devel, pkgconfig, tcp_wrappers, util-linux BuildRequires: openssl-devel, pkgconfig, tcp_wrappers, util-linux
# For stunnel-4.14-am_.patch
BuildRequires: autoconf, automake, libtool
%description %description
Stunnel is a socket wrapper which can provide SSL (Secure Sockets Stunnel is a socket wrapper which can provide SSL (Secure Sockets
@ -28,6 +31,7 @@ in conjunction with imapd to create an SSL secure IMAP server.
%setup -q %setup -q
%patch0 -p1 -b .authpriv %patch0 -p1 -b .authpriv
%patch1 -p1 -b .sample %patch1 -p1 -b .sample
%patch2 -p1 -b .am_
iconv -f iso-8859-1 -t utf-8 < doc/stunnel.fr.8 > doc/stunnel.fr.8_ 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 mv doc/stunnel.fr.8_ doc/stunnel.fr.8
@ -35,12 +39,14 @@ iconv -f iso-8859-2 -t utf-8 < doc/stunnel.pl.8 > doc/stunnel.pl.8_
mv doc/stunnel.pl.8_ doc/stunnel.pl.8 mv doc/stunnel.pl.8_ doc/stunnel.pl.8
%build %build
autoreconf -f # For stunnel-4.14-am_.patch
CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
if pkg-config openssl ; then if pkg-config openssl ; then
CFLAGS="$CFLAGS `pkg-config --cflags openssl`"; CFLAGS="$CFLAGS `pkg-config --cflags openssl`";
LDFLAGS="`pkg-config --libs-only-L openssl`"; export LDFLAGS LDFLAGS="`pkg-config --libs-only-L openssl`"; export LDFLAGS
fi fi
%configure --enable-ipv6 %configure --enable-ipv6 \
CPPFLAGS="-UPIDFILE -DPIDFILE='\"%{_localstatedir}/run/stunnel.pid\"'"
make LDADD="-pie -Wl,-z,defs,-z,relro" make LDADD="-pie -Wl,-z,defs,-z,relro"
%install %install
@ -85,6 +91,10 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_sysconfdir}/stunnel/* %exclude %{_sysconfdir}/stunnel/*
%changelog %changelog
* Thu Nov 3 2005 Miloslav Trmac <mitr@redhat.com> - 4.14-1
- Update to stunnel-4.14
- Override changed default pid file location, keep it in %{_localstatedir}/run
* Sat Oct 22 2005 Miloslav Trmac <mitr@redhat.com> - 4.13-1 * Sat Oct 22 2005 Miloslav Trmac <mitr@redhat.com> - 4.13-1
- Update to stunnel-4.13 - Update to stunnel-4.13