Author: glen Date: Sat Nov 8 12:44:49 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - update chroot files - fix build on amd64 - use lua for /etc/shells edit where possible
---- Files affected: SPECS: scponly.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/scponly.spec diff -u SPECS/scponly.spec:1.16 SPECS/scponly.spec:1.17 --- SPECS/scponly.spec:1.16 Fri Nov 7 21:26:26 2008 +++ SPECS/scponly.spec Sat Nov 8 13:44:43 2008 @@ -28,23 +28,21 @@ URL: http://sublimation.org/scponly/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: rpmbuild(macros) >= 1.462 %if %{with chroot} # These are for building chroot jail package BuildRequires: coreutils BuildRequires: fakeroot BuildRequires: openssh-clients BuildRequires: openssh-server -%endif BuildRequires: rsync -Requires(post,preun): grep +%endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%if %{with chroot} # better destination? -%define _datadir /usr/lib/%{name} +%define _datadir %{_libdir}/%{name} %define _noautoprovfiles %{_datadir} %define _noautoreqfiles %{_datadir} -%endif %description scponly is an alternative 'shell' (of sorts) for system administrators @@ -76,10 +74,10 @@ %package chroot Summary: Chroot capable scponly Summary(pl.UTF-8): scponly wykonujące chroot -Group: Applications/Shells License: BSD-like +Group: Applications/Shells # + No idea due packaging system libraries -Requires(post,preun): grep +Requires(post): grep %description chroot This package contains suid binary for scponly. As the scponly is @@ -103,12 +101,13 @@ %patch3 -p1 %build +cp -f /usr/share/automake/config.sub . %{__aclocal} %{__autoconf} %configure \ --bindir=%{_sbindir} \ --enable-rsync-compat \ - --with-sftp-server=%{_prefix}/%{_lib}/openssh/sftp-server \ + --with-sftp-server=%{_libdir}/openssh/sftp-server \ %{?with_chroot:--enable-chrooted-binary} \ %{__make} @@ -136,55 +135,40 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -umask 022 -if [ ! -f /etc/shells ]; then - echo '%{_sbindir}/%{name}' > /etc/shells -else - if ! grep -q '^%{_sbindir}/%{name}$' /etc/shells; then - echo '%{_sbindir}/%{name}' >> /etc/shells - fi -fi +%post -p <lua> +%lua_add_etc_shells %{_sbindir}/%{name} -%preun -umask 022 -if [ "$1" = "0" ]; then - grep -v '^%{_sbindir}/%{name}$' /etc/shells > /etc/shells.new - mv -f /etc/shells.new /etc/shells -fi +%preun -p <lua> +if arg[2] == 0 then + %lua_remove_etc_shells %{_sbindir}/%{name} +end -%if %{with chroot} %post chroot umask 022 if [ ! -f /etc/shells ]; then - echo '%{_sbindir}/%{name}c' > /etc/shells + echo '%{_sbindir}/scponlyc' > /etc/shells else - if ! grep -q '^%{_sbindir}/%{name}c$' /etc/shells; then - echo '%{_sbindir}/%{name}c' >> /etc/shells +if ! grep -q '^%{_sbindir}/scponlyc$' /etc/shells; then + echo '%{_sbindir}/scponlyc' >> /etc/shells fi fi # build ld.so.ccache -ldconfig -X -r %{_datadir} +/sbin/ldconfig -X -r %{_datadir} -%preun chroot -umask 022 -if [ "$1" = "0" ]; then - grep -v '^%{_sbindir}/%{name}c$' /etc/shells > /etc/shells.new - mv -f /etc/shells.new /etc/shells -fi -%endif +%preun -p <lua> chroot +if arg[2] == 0 then + %lua_remove_etc_shells %{_sbindir}/scponlyc +end -%triggerpostun -- scponly < 4.0-1.5 -umask 022 -grep -v '^/bin/scponly$' /etc/shells > /etc/shells.new -mv -f /etc/shells.new /etc/shells +%triggerpostun -p <lua> -- scponly < 4.0-1.5 +%lua_remove_etc_shells /bin/scponly %files %defattr(644,root,root,755) %doc AUTHOR CHANGELOG CONTRIB INSTALL README TODO %dir %{_sysconfdir}/%{name} -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/* +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/debuglevel %attr(755,root,root) %{_sbindir}/%{name} %{_mandir}/man?/* # old compat symlink @@ -203,32 +187,22 @@ %dir %{_datadir} %dir %{_datadir}/bin -%attr(755,root,root) %{_datadir}/bin/chgrp -%attr(755,root,root) %{_datadir}/bin/chmod -%attr(755,root,root) %{_datadir}/bin/chown -%attr(755,root,root) %{_datadir}/bin/echo %attr(755,root,root) %{_datadir}/bin/id -%attr(755,root,root) %{_datadir}/bin/ln -%attr(755,root,root) %{_datadir}/bin/ls -%attr(755,root,root) %{_datadir}/bin/mkdir -%attr(755,root,root) %{_datadir}/bin/mv +%attr(755,root,root) %{_datadir}/bin/echo %attr(755,root,root) %{_datadir}/bin/pwd -%attr(755,root,root) %{_datadir}/bin/rm -%attr(755,root,root) %{_datadir}/bin/rmdir %dir %{_datadir}/%{_lib} -%attr(755,root,root) %{_datadir}/%{_lib}/ld-linux.so.* +%attr(755,root,root) %{_datadir}/lib/ld-linux.so.* %attr(755,root,root) %{_datadir}/%{_lib}/lib*.so.* +%dir %{_datadir}/%{_lib}/tls +%attr(755,root,root) %{_datadir}/%{_lib}/tls/lib*.so.* %dir %{_datadir}/usr %dir %{_datadir}/usr/bin %attr(755,root,root) %{_datadir}/usr/bin/groups -%attr(755,root,root) %{_datadir}/usr/bin/scp %attr(755,root,root) %{_datadir}/usr/bin/rsync %dir %{_datadir}/usr/%{_lib} -%attr(755,root,root) %{_datadir}/usr/%{_lib}/lib*.so.* -%attr(755,root,root) %{_datadir}/usr/%{_lib}/lib*.so %dir %{_datadir}/usr/%{_lib}/openssh %attr(755,root,root) %{_datadir}/usr/%{_lib}/openssh/sftp-server %endif @@ -239,6 +213,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.17 2008/11/08 12:44:43 glen +- update chroot files +- fix build on amd64 +- use lua for /etc/shells edit where possible + Revision 1.16 2008/11/07 20:26:26 qboosh - unified sf URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/scponly.spec?r1=1.16&r2=1.17&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
