Summary: Universal SSL tunnel
-Summary(pl): Uniwersalne narzêdzie do bezpiecznego tunelowania
+Summary(pl.UTF-8): Uniwersalne narzędzie do bezpiecznego tunelowania
Name: stunnel
-Version: 4.05
-Release: 4
-License: GPL v2
+Version: 5.05
+Release: 1
+License: GPL v2+ with OpenSSL exception
Group: Networking/Daemons
-Source0: ftp://stunnel.mirt.net/stunnel/%{name}-%{version}.tar.gz
-# Source0-md5: e28a03cf694a43a7f144ec3d5c064456
+Source0: ftp://ftp.stunnel.org/stunnel/%{name}-%{version}.tar.gz
+# Source0-md5: 39e2e678eb5572c9d86ae391db5da30b
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}-getgrnam.patch
-Patch5: %{name}-libwrap_srv_name_log.patch
-Patch6: %{name}-config.patch
+Source4: %{name}.tmpfiles
+Patch0: %{name}-authpriv.patch
+Patch1: %{name}-ac_fixes.patch
+Patch2: %{name}-am.patch
+Patch3: %{name}-libwrap_srv_name_log.patch
+Patch4: %{name}-config.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.159
-PreReq: rc-scripts
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires(postun): /sbin/ldconfig
+Requires(postun): /usr/sbin/groupdel
+Requires(postun): /usr/sbin/userdel
Requires(pre): /bin/id
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
-Requires(postun): /usr/sbin/groupdel
-Requires(postun): /usr/sbin/userdel
-Requires(post,preun): /sbin/chkconfig
Provides: group(stunnel)
Provides: user(stunnel)
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
commonly used inetd daemons like POP-2, POP-3 and IMAP servers without
any changes in the programs' code.
-%description -l pl
-Stunnel umo¿liwia stawianie silnie kodowanych tuneli pomiêdzy serwerem
-a komputerem klienta. Przy jego u¿yciu mo¿na ³atwo zrealizowaæ us³ugi
+%description -l pl.UTF-8
+Stunnel umożliwia stawianie silnie kodowanych tuneli pomiędzy serwerem
+a komputerem klienta. Przy jego użyciu można łatwo zrealizować usługi
pop3s lub HTTPS.
%package standalone
-Summary: stunnel acts as standalone server
-Summary(pl): stunnel dzia³aj±cy jako samodzielny serwer
+Summary: stunnel acts as standalone server
+Summary(pl.UTF-8): stunnel działający jako samodzielny serwer
Group: Networking/Daemons
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-inetd
+Requires(post,preun): /sbin/chkconfig
+Requires: %{name} = %{version}-%{release}
+Requires: rc-scripts
+Obsoletes: stunnel-inetd
%description standalone
stunnel acts as standalone server.
-%description standalone -l pl
-stunnel dzia³aj±cy jako samodzielny serwer.
+%description standalone -l pl.UTF-8
+stunnel działający jako samodzielny serwer.
-%package inetd
+%package inetd
Summary: stunnel acts as inetd service
-Summary(pl): stunnel dzia³aj±cy jako us³uga inetd
+Summary(pl.UTF-8): stunnel działający jako usługa inetd
Group: Networking/Daemons
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-standalone
+Requires: %{name} = %{version}-%{release}
+Requires: rc-inetd
+Obsoletes: stunnel-standalone
%description inetd
stunnel acts as inetd service.
-%description standalone -l pl
-stunnel dzia³aj±cy jako us³uga inetd.
+%description inetd -l pl.UTF-8
+stunnel działający jako usługa inetd.
%prep
%setup -q
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%build
+%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__automake}
%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/usr/lib/tmpfiles.d
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
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
+
+rm -rf $RPM_BUILD_ROOT%{_libdir}/stunnel
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/stunnel/stunnel.pem
+rm -rf $RPM_BUILD_ROOT%{_docdir}/stunnel
%clean
rm -rf $RPM_BUILD_ROOT
%pre
-if [ -n "`/usr/bin/getgid stunnel`" ]; then
- if [ "`/usr/bin/getgid stunnel`" != "130" ]; then
- echo "Error: group stunnel doesn't have gid=130. Correct this before installing stunnel." 1>&2
- exit 1
- fi
-else
- /usr/sbin/groupadd -g 130 stunnel 1>&2
-fi
-if [ -n "`/bin/id -u stunnel 2>/dev/null`" ]; then
- if [ "`/bin/id -u stunnel`" != "130" ]; then
- echo "Error: user stunnel doesn't have uid=130. Correct this before installing stunnel." 1>&2
- exit 1
- fi
-else
- /usr/sbin/useradd -u 130 -d /var/run/stunnel -s /bin/false \
- -c "stunnel User" -g stunnel stunnel 1>&2
-fi
+%groupadd -g 130 stunnel
+%useradd -u 130 -d /var/run/stunnel -s /bin/false -c "stunnel User" -g stunnel stunnel
+
+%post -p /sbin/ldconfig
-%postun
+%postun
+/sbin/ldconfig
if [ "$1" = "0" ]; then
%userremove stunnel
%groupremove stunnel
%post standalone
/sbin/chkconfig --add stunnel
-if [ -f /var/lock/subsys/stunnel ]; then
- /etc/rc.d/init.d/stunnel restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/stunnel start\" to start stunnel daemon."
-fi
+%service stunnel restart "stunnel daemon"
%preun standalone
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/stunnel ]; then
- /etc/rc.d/init.d/stunnel stop 1>&2
- fi
+ %service stunnel stop
/sbin/chkconfig --del stunnel
fi
%post inetd
-if [ -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd restart 1>&2
-else
- echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
-fi
+%service -q rc-inetd reload
%postun inetd
-if [ "$1" = "0" -a -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd reload 1>&2
+if [ "$1" = "0" ]; then
+ %service -q rc-inetd reload
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.*} tools/stunnel.pem
+%doc AUTHORS BUGS COPYING CREDITS ChangeLog NEWS PORTS README TODO doc/en/* doc/stunnel.html tools/{ca.*,importCA.*}
%doc %lang(fr) doc/stunnel.fr.html
%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 size mtime md5) %{_sysconfdir}/stunnel/stunnel.conf
-%attr(755,root,root) %{_sbindir}/*
-%{_mandir}/man8/*
-%lang(fr) %{_mandir}/fr/man8/*
-%lang(pl) %{_mandir}/pl/man8/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/stunnel/stunnel.conf
+%attr(750,stunnel,stunnel) %{_var}/run/stunnel
+/usr/lib/tmpfiles.d/%{name}.conf
+%{_mandir}/man8/stunnel.8*
+%lang(fr) %{_mandir}/fr/man8/stunnel.8*
+%lang(pl) %{_mandir}/pl/man8/stunnel.8*
%files standalone
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/stunnel
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/stunnel
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/stunnel
%files inetd
%defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/rc-inetd/stunnel
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/stunnel