Author: glen Date: Tue Jul 25 05:49:16 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 2.3.2 (security fixes) - moved programs to /usr (due scp dependency), safe trigger included
---- Files affected: SPECS: rssh.spec (1.40 -> 1.41) ---- Diffs: ================================================================ Index: SPECS/rssh.spec diff -u SPECS/rssh.spec:1.40 SPECS/rssh.spec:1.41 --- SPECS/rssh.spec:1.40 Fri Dec 30 19:13:23 2005 +++ SPECS/rssh.spec Tue Jul 25 07:49:11 2006 @@ -1,27 +1,25 @@ # $Revision$, $Date$ -# TODO -# - no need to have have the shell in /bin, as it needs running sshd -# to work, which itself needs /usr to be mounted. for nice trigger -# see cvsspam.spec or scponly.spec Summary: A restricted shell for assigning scp- or sftp-only access Summary(pl): Okrojona powłoka dająca dostęp tylko do scp i/lub sftp Name: rssh -Version: 2.3.1 -Release: 2 +Version: 2.3.2 +Release: 1 License: BSD-like Group: Applications/Shells Source0: http://dl.sourceforge.net/rssh/%{name}-%{version}.tar.gz -# Source0-md5: 29e98453a9d9926af97c5386620e7841 +# Source0-md5: 65712f2c06ff5fc6fc783bc8c2e4e1ba Patch0: %{name}-userbuild.patch Patch1: %{name}-mkchroot.patch URL: http://www.pizzashack.org/rssh/ BuildRequires: autoconf BuildRequires: automake 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 @@ -49,6 +47,7 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/bin %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -56,12 +55,17 @@ 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 -umask 022 if [ ! -f /etc/shells ]; then + umask 022 echo "%{_bindir}/%{name}" > /etc/shells echo "%{_bindir}/scpsh" >> /etc/shells echo "%{_bindir}/sftpsh" >> /etc/shells @@ -78,21 +82,29 @@ fi %preun -umask 022 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 +# make compat symlink, the symlink is discarded using %ghost on package uninstall +%triggerpostun -- %{name} < 2.3.2-0.6 +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 README CHROOT SECURITY mkchroot.sh -%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/rssh.conf +%attr(644,root,root) %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 %attr(4755,root,root) %{_libdir}/rssh_chroot_helper %{_mandir}/man?/* +# legacy +%ghost /bin/%{name} +%ghost /bin/scpsh +%ghost /bin/sftpsh %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -100,6 +112,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.41 2006/07/25 05:49:11 glen +- up to 2.3.2 (security fixes) +- moved programs to /usr (due scp dependency), safe trigger included + Revision 1.40 2005/12/30 18:13:23 lukasz - SECURITY up to 2.3.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rssh.spec?r1=1.40&r2=1.41&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
