rpms/scponly/FC-5 scponly-install.patch, NONE, 1.1 scponly.spec, 1.5, 1.6

[Toshio Ernie Kuratomi (toshio)]

Author: toshio

Update of /cvs/extras/rpms/scponly/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32633

Modified Files:
	scponly.spec 
Added Files:
	scponly-install.patch 
Log Message:
- --enable-chrooted-binary creates a binary that will operate in a chroot
  environment.  It does not manage creation and updating of a chroot jail.
  This is the user's responsibility.
- Patch the Makefile.in to support install as a non-root user.


scponly-install.patch:

--- NEW FILE scponly-install.patch ---
Index: scponly-4.6/Makefile.in
===================================================================
--- scponly-4.6.orig/Makefile.in
+++ scponly-4.6/Makefile.in
@@ -38,14 +38,14 @@ install: scponly debuglevel scponly.8
 	${INSTALL} -d ${DESTDIR}${bindir}
 	${INSTALL} -d ${DESTDIR}${mandir}/man8
 	${INSTALL} -d ${DESTDIR}${CONFDIR}
-	${INSTALL} -o 0 -g 0 scponly ${DESTDIR}${bindir}/scponly
-	${INSTALL} -o 0 -g 0 -m 0644 scponly.8 ${DESTDIR}${mandir}/man8/scponly.8
-	${INSTALL} -o 0 -g 0 -m 0644 debuglevel ${DESTDIR}${DEBUGFILE}
+	${INSTALL} scponly ${DESTDIR}${bindir}/scponly
+	${INSTALL} -m 0644 scponly.8 ${DESTDIR}${mandir}/man8/scponly.8
+	${INSTALL} -m 0644 debuglevel ${DESTDIR}${DEBUGFILE}
 	if test "x${CHROOTED_NAME}" != "x"; then			\
 		${INSTALL} -d ${DESTDIR}${sbindir};				\
 		rm -f ${DESTDIR}${sbindir}/${CHROOTED_NAME};			\
 		cp scponly ${CHROOTED_NAME};				\
-		${INSTALL} -o 0 -g 0 -m 4755 ${CHROOTED_NAME} ${DESTDIR}${sbindir}/${CHROOTED_NAME};	\
+		${INSTALL} -m 4755 ${CHROOTED_NAME} ${DESTDIR}${sbindir}/${CHROOTED_NAME};	\
 	fi
 
 debuglevel:


Index: scponly.spec
===================================================================
RCS file: /cvs/extras/rpms/scponly/FC-5/scponly.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scponly.spec	19 Mar 2006 21:04:22 -0000	1.5
+++ scponly.spec	27 Jun 2006 08:21:44 -0000	1.6
@@ -1,11 +1,12 @@
 Summary: Restricted shell for ssh based file services
 Name: scponly
 Version: 4.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://sublimation.org/scponly/
 Source: http://sublimation.org/scponly/scponly-%{version}.tgz
+Patch0: scponly-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 # Checks only for location of binaries
@@ -21,9 +22,11 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%configure --enable-scp-compat --enable-rsync-compat --enable-winscp-compat
+%configure --enable-scp-compat --enable-rsync-compat --enable-winscp-compat \
+	--enable-chrooted-binary
 %{__make} %{?_smp_mflags} \
 	OPTS="%{optflags}"
 
@@ -32,20 +35,27 @@
 
 # 
 sed -i "s|%{_prefix}/local/|%{_prefix}/|g" scponly.8* INSTALL README
-%{__install} -Dp -m0755 scponly %{buildroot}%{_bindir}/scponly
-%{__install} -Dp -m0644 scponly.8 %{buildroot}%{_mandir}/man8/scponly.8
+make install DESTDIR=%{buildroot}
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files 
 %defattr(0644, root, root, 0755)
-%doc AUTHOR CHANGELOG CONTRIB COPYING INSTALL README TODO
+%doc AUTHOR CHANGELOG CONTRIB COPYING INSTALL README TODO BUILDING-JAILS.TXT
 %defattr(-, root, root, 0755)
 %doc %{_mandir}/man8/scponly.8*
 %{_bindir}/scponly
+%{_sbindir}/scponlyc
+%{_sysconfdir}/scponly/
 
 %changelog
+* Sun Jun 25 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 4.6-4
+- --enable-chrooted-binary creates a binary that will operate in a chroot
+  environment.  It does not manage creation and updating of a chroot jail.
+  This is the user's responsibility.
+- Patch the Makefile.in to support install as a non-root user.
+
 * Sun Mar 19 2006 Warren Togami <wtogami at redhat.com> - 4.6-3
 - --enable-winscp-compat seems necessary
 - --enable-rsync-compat seems useful too