- updated sf URL

[packages/rssh.git] / rssh.spec

diff --git a/rssh.spec b/rssh.spec
index 3ab0246f056c6bb3e5c501044777ecda43cbc526..5c62292a79dde3c13adc698ce70fb1ec9be2fdd8 100644 (file)
--- a/rssh.spec
+++ b/rssh.spec
@@ -1,52 +1,73 @@
 Summary:       A restricted shell for assigning scp- or sftp-only access
-Summary(pl):   Okrojona pow³oka daj±ca dostêp tylko do scp i sftp
+Summary(pl.UTF-8):     Okrojona powłoka dająca dostęp tylko do scp i/lub sftp
 Name:          rssh
-Version:       1.0.3
+Version:       2.3.4
 Release:       1
 License:       BSD-like
 Group:         Applications/Shells
-Source0:       http://www.pizzashack.org/rssh/src/%{name}-%{version}.tar.gz
+Source0:       http://downloads.sourceforge.net/rssh/%{name}-%{version}.tar.gz
+# Source0-md5: 5211f5fe206704f813a3cec61f487042
+Patch0:                %{name}-userbuild.patch
+Patch1:                %{name}-mkchroot.patch
+Patch2:                %{name}-rsync-protocol.patch
 URL:           http://www.pizzashack.org/rssh/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: glibc-static
-Requires:      openssh-server
+BuildRequires: openssh-clients >= 3.5p1
+Requires(post):        grep
+Requires(preun):       sed >= 4.0
+Conflicts:     openssh-server < 3.5p1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _bindir         /bin
+%undefine      with_ccache
 
 %description
 rssh is a small shell that provides the ability for system
 administrators to give specific users access to a given system via scp
 or sftp only.
 
-%description -l pl
-rssh jest ma³ym shellem, który pozwala administratorowi ograniczyæ
-dostêp na danym koncie tylko do scp i/lub sftp.
+%description -l pl.UTF-8
+rssh jest małym shellem, który pozwala administratorowi ograniczyć
+dostęp na danym koncie tylko do scp i/lub sftp.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1
+%patch2 -p1
 
 %build
+%{__aclocal}
+%{__automake}
+%{__autoconf}
 %configure \
        --with-scp=/usr/bin/scp \
-       --with-sftp-server=/usr/lib/openssh/sftp-server
+       --with-sftp-server=/usr/%{_lib}/openssh/sftp-server
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/bin
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+        DESTDIR=$RPM_BUILD_ROOT
 
-ln -sf /bin/rssh $RPM_BUILD_ROOT/bin/scpsh
-ln -sf /bin/rssh $RPM_BUILD_ROOT/bin/sftpsh
+%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/rssh.conf{.default,}
+ln -sf rssh $RPM_BUILD_ROOT%{_bindir}/scpsh
+ln -sf rssh $RPM_BUILD_ROOT%{_bindir}/sftpsh
+
+# legacy
+ln -s %{_bindir}/%{name} $RPM_BUILD_ROOT/bin/%{name}
+ln -s %{_bindir}/scpsh $RPM_BUILD_ROOT/bin/scpsh
+ln -s %{_bindir}/sftpsh $RPM_BUILD_ROOT/bin/sftpsh
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 if [ ! -f /etc/shells ]; then
+       umask 022
        echo "%{_bindir}/%{name}" > /etc/shells
        echo "%{_bindir}/scpsh" >> /etc/shells
        echo "%{_bindir}/sftpsh" >> /etc/shells
@@ -64,14 +85,25 @@ fi
 
 %preun
 if [ "$1" = "0" ]; then
-       grep -v %{_bindir}/%{name} /etc/shells | grep -v %{_bindir}/scpsh | grep -v %{_bindir}/sftpsh > /etc/shells.new
-       mv -f /etc/shells.new /etc/shells
+       %{__sed} -i -e '/^%(echo %{_bindir} | sed -e 's,/,\\/,g')\/\(%{name}\|scpsh\|sftpsh\)$/d' /etc/shells
 fi
 
+%triggerpostun -- %{name} < 2.3.2-0.6
+# make compat symlinks, the symlinks are discarded using %ghost on package uninstall
+ln -sf %{_bindir}/%{name} /bin/%{name}
+ln -sf %{_bindir}/scpsh /bin/scpsh
+ln -sf %{_bindir}/sftpsh /bin/sftpsh
+
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
-%attr(711,root,root) %{_bindir}/%{name}
+%doc AUTHORS ChangeLog README CHROOT SECURITY mkchroot.sh
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rssh.conf
+%attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/scpsh
 %attr(755,root,root) %{_bindir}/sftpsh
-%{_mandir}/man1/*.1*
+%attr(4755,root,root) %{_libexecdir}/rssh_chroot_helper
+%{_mandir}/man?/*
+# legacy
+%ghost /bin/%{name}
+%ghost /bin/scpsh
+%ghost /bin/sftpsh