- no // in paths, other cosmetics

[packages/stunnel.git] / stunnel.spec

diff --git a/stunnel.spec b/stunnel.spec
index 44aa14a2dad07b0b4f3ebc5acee4efe7e40ab374..09f6209b651c1c0de67273635a3fa854a2bb5646 100644 (file)
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,26 +1,29 @@
+# TODO:
+# - fix /var/run/stunnel ownership (nobody must NOT own any files!)
 Summary:       Universal SSL tunnel
 Summary(pl):   Uniwersalne narzêdzie do bezpiecznego tunelowania
 Name:          stunnel
-Version:       3.20
-Release:       1
-License:       GPL
+Version:       4.04
+Release:       0.9
+License:       GPL v2
 Group:         Networking/Daemons
-Group(de):     Netzwerkwesen/Server
-Group(pl):     Sieciowe/Serwery
 Source0:       ftp://stunnel.mirt.net/stunnel/%{name}-%{version}.tar.gz
-Patch1:                %{name}-DESTDIR.patch
-Patch2:                %{name}-gethostbyname_is_in_libc_aka_no_libnsl.patch
-Patch3:                %{name}-piddir.patch
-Patch4:                %{name}-gen-cert.patch
+# Source0-md5: 2fcdf0311a0ab8a3223293c706a84e97
+Source1:       %{name}.init
+Source2:       %{name}.sysconfig
+Patch0:                %{name}-gethostbyname_is_in_libc_aka_no_libnsl.patch
+Patch1:                %{name}-authpriv.patch
+Patch2:                %{name}-ac_fixes.patch
+Patch3:                %{name}-am.patch
+Patch4:                %{name}-getgrnam.patch
 URL:           http://www.stunnel.org/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: openssl-devel >= 0.9.6a
-BuildRequires: openssl-tools >= 0.9.6a
+BuildRequires: libtool
+BuildRequires: openssl-devel >= 0.9.7
+BuildRequires: openssl-tools >= 0.9.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _certdir        /var/lib/stunnel
-
 %description
 The stunnel program is designed to work as SSL encryption wrapper
 between remote client and local (inetd-startable) or remote server.
@@ -37,44 +40,51 @@ pop3s lub https.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
 %build
-aclocal
-automake -a -c
-autoheader
-autoconf
-CFLAGS="%{rpmcflags} -DHAVE_GETOPT"
-%configure \
-       --with-pem-dir=%{_certdir}
-       
+rm -f missing
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+%configure
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},%{_mandir}/pl/man8,%{_var}/run/stunnel}
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       certdir=$RPM_BUILD_ROOT/%{_certdir}
-       
-gzip -9nf FAQ HISTORY README BUGS 
+       DESTDIR=$RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+mv -f $RPM_BUILD_ROOT%{_mandir}/man8/stunnel.pl.8* $RPM_BUILD_ROOT%{_mandir}/pl/man8
+
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/stunnel
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/stunnel
 
 %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 stunnel.exe
-%config(noreplace) %verify(not size mtime md5) %attr(600,root,root) %{_certdir}/stunnel.pem
+# note: this COPYING contains general information not GPL text
+%doc AUTHORS BUGS COPYING CREDITS ChangeLog NEWS PORTS README TODO doc/en/* doc/stunnel.html
+%doc src/stunnel.exe  tools/{ca.*,importCA.*}
+%doc %lang(pl) doc/pl/* doc/stunnel.pl.html
+%dir /etc/stunnel
+%attr(754,root,root) /etc/rc.d/init.d/stunnel
+%attr(600,root,root) /etc/sysconfig/stunnel
+%attr(700,nobody,nobody) %{_var}/run/stunnel
+%config(noreplace) %verify(not size mtime md5) /etc/stunnel/*
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_libdir}/*
-%dir /var/run/stunnel
 %{_mandir}/man8/*
+%lang(pl) %{_mandir}/pl/man8/*