- cosmetics, remove empty files, added CHROOT, SECURITY and mkchroot.sh

- rel 2

Changed files:
    rssh-mkchroot.patch -> 1.1
    rssh.spec -> 1.26

diff --git a/rssh-mkchroot.patch b/rssh-mkchroot.patch
new file mode 100644 (file)
index 0000000..0d304ac
--- /dev/null
+++ b/rssh-mkchroot.patch
@@ -0,0 +1,18 @@
+--- mkchroot.sh-orig   2004-07-21 20:47:06.000000000 +0000
++++ mkchroot.sh        2004-07-21 20:55:15.000000000 +0000
+@@ -96,11 +96,11 @@
+ # copy SSH files
+ 
+ scp_path="/usr/bin/scp"
+-sftp_server_path="/usr/libexec/openssh/sftp-server"
+-rssh_path="/usr/bin/rssh"
+-chroot_helper_path="/usr/libexec/rssh_chroot_helper"
++sftp_server_path="/usr/lib/openssh/sftp-server"
++rssh_path="/bin/rssh"
++chroot_helper_path="/usr/lib/rssh_chroot_helper"
+ 
+-for jail_path in `dirname "$jail_dir$scp_path"` `dirname "$jail_dir$sftp_server_path"` `dirname "$jail_dir$chroot_helper_path"`; do
++for jail_path in `dirname "$jail_dir$scp_path"` `dirname "$jail_dir$sftp_server_path"` `dirname "$jail_dir$chroot_helper_path"` `dirname "$jail_dir$rssh_path"`; do
+ 
+       echo "setting up $jail_path"
+ 

diff --git a/rssh.spec b/rssh.spec
index 46126817cf5511f908a23c8911f008d02b87c1a5..23d65788c4a54926f273aeba67306f7bddf1696b 100644 (file)
--- a/rssh.spec
+++ b/rssh.spec
@@ -2,12 +2,13 @@ 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
 Name:          rssh
 Version:       2.2.1
-Release:       1
+Release:       2
 License:       BSD-like
 Group:         Applications/Shells
 Source0:       http://www.pizzashack.org/rssh/src/%{name}-%{version}.tar.gz
 # Source0-md5: 2d427ee7f4ea46b075fa0ab3f39b4089
 Patch0:                %{name}-userbuild.patch
+Patch1:                %{name}-mkchroot.patch
 URL:           http://rssh.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -29,6 +30,7 @@ dost
 %prep
 %setup -q
 %patch0 -p1
+%patch1
 
 %build
 %{__aclocal}
@@ -79,7 +81,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS ChangeLog README CHROOT SECURITY mkchroot.sh
 %attr(644,root,root) %config(noreplace) %verify(not size mtime md5) /etc/rssh.conf
 %attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/scpsh