+#
+# 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: 5.14
-Release: 2
+Version: 5.53
+Release: 1
License: GPL v2+ with OpenSSL exception
Group: Networking/Daemons
Source0: ftp://ftp.stunnel.org/stunnel/%{name}-%{version}.tar.gz
-# Source0-md5: e716501960dc6856d80f92547298f724
+# Source0-md5: 5d072fd915f4cde106525cf549bced39
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.inet
Source4: %{name}.tmpfiles
-Patch0: %{name}-authpriv.patch
-Patch2: %{name}-am.patch
-Patch3: %{name}-libwrap_srv_name_log.patch
-Patch4: %{name}-config.patch
+Patch0: %{name}-config.patch
+Patch1: stunnel-libwrap_srv_name_log.patch
URL: http://www.stunnel.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
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
%prep
%setup -q
%patch0 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch1 -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} \
- $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+ $RPM_BUILD_ROOT%{systemdtmpfilesdir}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-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/usr/lib/tmpfiles.d/%{name}.conf
+install %{SOURCE4} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/stunnel
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/stunnel
%dir %{_sysconfdir}/stunnel
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/stunnel/stunnel.conf
%attr(750,stunnel,stunnel) %{_var}/run/stunnel
-/usr/lib/tmpfiles.d/%{name}.conf
+%{systemdtmpfilesdir}/%{name}.conf
%{_mandir}/man8/stunnel.8*
%lang(pl) %{_mandir}/pl/man8/stunnel.8*