- start upgradinf to 3.22 (security fixes)

[packages/stunnel.git] / stunnel.spec

diff --git a/stunnel.spec b/stunnel.spec
index 45a5d941a21e63e524ef65dc9bda0c11472f815d..9f6bc3f9e46eabfaf07b3d57c6affd9c8a12be1c 100644 (file)
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,20 +1,22 @@
 Summary:       Universal SSL tunnel
 Summary(pl):   Uniwersalne narzêdzie do bezpiecznego tunelowania
 Name:          stunnel
-Version:       3.14
-Release:       2
+Version:       3.22
+Release:       1
 License:       GPL
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
 Group(pl):     Sieciowe/Serwery
-Source0:       http://www.stunnel.org/download/stunnel/src/%{name}-%{version}.tar.gz
+Source0:       ftp://stunnel.mirt.net/stunnel/%{name}-%{version}.tar.gz
 Patch1:                %{name}-DESTDIR.patch
-Patch2:                %{name}-fixargs.patch
-Patch3:                %{name}-gethostbyname_is_in_libc_aka_no_libnsl.patch
-Patch4:                %{name}-piddir.patch
-Patch5:                %{name}-gen-cert.patch
+Patch2:                %{name}-gethostbyname_is_in_libc_aka_no_libnsl.patch
+Patch3:                %{name}-piddir.patch
+Patch4:                %{name}-gen-cert.patch
+Patch5:                %{name}-conf.patch
+Patch6:                %{name}-authpriv.patch
 URL:           http://www.stunnel.org/
 BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: openssl-devel >= 0.9.6a
 BuildRequires: openssl-tools >= 0.9.6a
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,15 +39,15 @@ pop3s lub https.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p0
+#%patch1 -p1
+#%patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
+#%patch4 -p1
+#%patch5 -p1
+%patch6 -p1
 
 %build
 autoconf
-CFLAGS="%{rpmcflags} -DHAVE_GETOPT"
 %configure \
        --with-pem-dir=%{_certdir}
        
@@ -58,18 +60,18 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        certdir=$RPM_BUILD_ROOT/%{_certdir}
        
-gzip -9nf FAQ HISTORY README BUGS 
-
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+gzip -9nf BUGS CREDITS FAQ HISTORY README TODO doc/english/transproxy.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post   -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
-%doc {FAQ,HISTORY,README,BUGS}.gz 
-%doc %lang(pl) doc.polish/*
+%doc *.gz doc/english/*.gz doc/english/*.html
+%doc %lang(pl) doc/polish/*
 %doc stunnel.exe
 %config(noreplace) %verify(not size mtime md5) %attr(600,root,root) %{_certdir}/stunnel.pem
 %attr(755,root,root) %{_sbindir}/*