-# 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: 4.04
-Release: 0.9
+Version: 4.07
+Release: 0.1
License: GPL v2
Group: Networking/Daemons
Source0: ftp://stunnel.mirt.net/stunnel/%{name}-%{version}.tar.gz
-# Source0-md5: 2fcdf0311a0ab8a3223293c706a84e97
+# Source0-md5: 7d53af550a1c2e01e146b936e58b8860
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
URL: http://www.stunnel.org/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
-BuildRequires: openssl-devel >= 0.9.7
-BuildRequires: openssl-tools >= 0.9.7
+BuildRequires: libwrap-devel
+BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: openssl-tools >= 0.9.7d
+BuildRequires: rpmbuild(macros) >= 1.202
+PreReq: rc-scripts
+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)
%description
%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
-pop3s lub https.
+pop3s lub HTTPS.
+
+%package standalone
+Summary: stunnel acts as standalone server
+Summary(pl): stunnel dzia³aj±cy jako samodzielny serwer
+Group: Networking/Daemons
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-inetd
+
+%description standalone
+stunnel acts as standalone server.
+
+%description standalone -l pl
+stunnel dzia³aj±cy jako samodzielny serwer.
+
+%package inetd
+Summary: stunnel acts as inetd service
+Summary(pl): stunnel dzia³aj±cy jako us³uga inetd
+Group: Networking/Daemons
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-standalone
+
+%description inetd
+stunnel acts as inetd service.
+
+%description inetd -l pl
+stunnel dzia³aj±cy jako us³uga inetd.
%prep
%setup -q
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
%build
-rm -f missing
-%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__automake}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},%{_mandir}/pl/man8,%{_var}/run/stunnel}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig/rc-inetd},%{_mandir}/{pl,fr}/man8,%{_var}/run/stunnel}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-mv -f $RPM_BUILD_ROOT%{_mandir}/man8/stunnel.pl.8* $RPM_BUILD_ROOT%{_mandir}/pl/man8
+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
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
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%pre
+%groupadd -g 130 stunnel
+%useradd -u 130 -d /var/run/stunnel -s /bin/false -c "stunnel User" -g stunnel stunnel
+
+%postun
+if [ "$1" = "0" ]; then
+ %userremove stunnel
+ %groupremove stunnel
+fi
+
+%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
+
+%preun standalone
+if [ "$1" = "0" ]; then
+ if [ -f /var/lock/subsys/stunnel ]; then
+ /etc/rc.d/init.d/stunnel stop 1>&2
+ fi
+ /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
+
+%postun inetd
+if [ "$1" = "0" -a -f /var/lock/subsys/rc-inetd ]; then
+ /etc/rc.d/init.d/rc-inetd reload 1>&2
+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 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 %lang(fr) doc/stunnel.fr.html
%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(750,stunnel,stunnel) %{_var}/run/stunnel
+%dir %{_sysconfdir}/stunnel
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/stunnel/stunnel.conf
%attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_libdir}/*
%{_mandir}/man8/*
+%lang(fr) %{_mandir}/fr/man8/*
%lang(pl) %{_mandir}/pl/man8/*
+
+%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
+
+%files inetd
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/rc-inetd/stunnel
projects / packages / stunnel.git / blobdiff