X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=stunnel.spec;h=e8a9b266ad0f6f2f508a9396b4e4a1a3f6811d70;hb=37bc7467b7e5a3002e73ed696398c1ff5ecde628;hp=bf6a440defaaf5744c47300c4bb2e4ca8ac63538;hpb=cbf63ccb32608bfaa719de5ed484c76fb219a662;p=packages%2Fstunnel.git

diff --git a/stunnel.spec b/stunnel.spec
index bf6a440..e8a9b26 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,29 +1,31 @@
+#
+# Conditional build:
+%bcond_without	systemd	# systemd socket activation support
+
 Summary:	Universal SSL tunnel
 Summary(pl.UTF-8):	Uniwersalne narzędzie do bezpiecznego tunelowania
 Name:		stunnel
-Version:	4.21
+Version:	5.53
 Release:	1
-License:	GPL v2
+License:	GPL v2+ with OpenSSL exception
 Group:		Networking/Daemons
-Source0:	ftp://stunnel.mirt.net/stunnel/%{name}-%{version}.tar.gz
-# Source0-md5:	1eaec5228979beca4d548f453304e311
+Source0:	ftp://ftp.stunnel.org/stunnel/%{name}-%{version}.tar.gz
+# Source0-md5:	5d072fd915f4cde106525cf549bced39
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.inet
-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}-libwrap_srv_name_log.patch
-Patch5:		%{name}-config.patch
+Source4:	%{name}.tmpfiles
+Patch0:		%{name}-config.patch
+Patch1:		stunnel-libwrap_srv_name_log.patch
 URL:		http://www.stunnel.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2.0
 BuildRequires:	libwrap-devel
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	openssl-tools >= 0.9.7d
 BuildRequires:	rpmbuild(macros) >= 1.268
+%{?with_systemd:BuildRequires:	systemd-devel}
 Requires(postun):	/sbin/ldconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
@@ -82,36 +84,35 @@ stunnel działający jako usługa inetd.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+	--disable-silent-rules \
+	%{!?with_systemd:--disable-systemd}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig/rc-inetd},%{_mandir}/{pl,fr}/man8,%{_var}/run/stunnel}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig/rc-inetd},%{_mandir}/{pl,fr}/man8,%{_var}/run/stunnel} \
+	$RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
 %{__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
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man8/stunnel.pl.8 $RPM_BUILD_ROOT%{_mandir}/pl/man8/stunnel.8
+%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/stunnel/stunnel.conf-sample $RPM_BUILD_ROOT%{_sysconfdir}/stunnel/stunnel.conf
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/stunnel
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/stunnel
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/stunnel
+install %{SOURCE4} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{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
@@ -150,17 +151,16 @@ fi
 %files
 %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
-%doc src/stunnel.exe tools/{ca.*,importCA.*}
-%doc %lang(fr) doc/stunnel.fr.html
+%doc AUTHORS BUGS COPYING CREDITS ChangeLog NEWS PORTS README TODO doc/en/* doc/stunnel.html tools/{ca.*,importCA.*}
 %doc %lang(pl) doc/pl/* doc/stunnel.pl.html
-%attr(750,stunnel,stunnel) %{_var}/run/stunnel
+%attr(755,root,root) %{_bindir}/stunnel
+%attr(755,root,root) %{_bindir}/stunnel3
 %dir %{_sysconfdir}/stunnel
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/stunnel/stunnel.conf
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man8/*
-%lang(fr) %{_mandir}/fr/man8/*
-%lang(pl) %{_mandir}/pl/man8/*
+%attr(750,stunnel,stunnel) %{_var}/run/stunnel
+%{systemdtmpfilesdir}/%{name}.conf
+%{_mandir}/man8/stunnel.8*
+%lang(pl) %{_mandir}/pl/man8/stunnel.8*
 
 %files standalone
 %defattr(644,root,root,755)