SOURCES: scponly-DESTDIR.patch, scponly-setup_chroot.patch - updat...

[qboosh]

Author: qboosh                       Date: Wed Apr 11 11:50:32 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 4.6

---- Files affected:
SOURCES:
   scponly-DESTDIR.patch (1.1 -> 1.2) , scponly-setup_chroot.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/scponly-DESTDIR.patch
diff -u SOURCES/scponly-DESTDIR.patch:1.1 SOURCES/scponly-DESTDIR.patch:1.2
--- SOURCES/scponly-DESTDIR.patch:1.1	Tue Dec 28 13:02:11 2004
+++ SOURCES/scponly-DESTDIR.patch	Wed Apr 11 13:50:27 2007
@@ -1,29 +1,21 @@
---- ./Makefile.in.org	Thu Nov 20 07:04:53 2003
-+++ ./Makefile.in	Tue Dec 28 12:47:26 2004
-@@ -35,17 +35,17 @@
- 	${CC} ${CFLAGS} ${DEFS} -o $@ -c $<
- 
- install: scponly debuglevel scponly.8
--	${INSTALL} -d ${bindir}
--	${INSTALL} -d ${mandir}/man8
--	${INSTALL} -d ${CONFDIR}
--	${INSTALL} -o 0 -g 0 scponly ${bindir}/scponly
--	${INSTALL} -o 0 -g 0 -m 0644 scponly.8 ${mandir}/man8/scponly.8
--	${INSTALL} -o 0 -g 0 -m 0644 debuglevel ${DEBUGFILE}
-+	${INSTALL} -d ${DESTDIR}${bindir}
-+	${INSTALL} -d ${DESTDIR}${mandir}/man8
-+	${INSTALL} -d ${DESTDIR}${CONFDIR}
+--- scponly-4.6/Makefile.in.orig	2005-03-18 09:40:44.000000000 +0100
++++ scponly-4.6/Makefile.in	2007-04-11 12:44:38.064394317 +0200
+@@ -38,14 +38,14 @@
+ 	${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} scponly.8 ${DESTDIR}${mandir}/man8/scponly.8
-+	${INSTALL} debuglevel ${DESTDIR}${DEBUGFILE}
++	${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 ${sbindir};				\
--		rm -f ${sbindir}/${CHROOTED_NAME};			\
-+		${INSTALL} -d ${DESTDIR}${sbindir};			\
-+		rm -f ${DESTDIR}${sbindir}/${CHROOTED_NAME};		\
+ 		${INSTALL} -d ${DESTDIR}${sbindir};				\
+ 		rm -f ${DESTDIR}${sbindir}/${CHROOTED_NAME};			\
  		cp scponly ${CHROOTED_NAME};				\
--		${INSTALL} -o 0 -g 0 -m 4755 ${CHROOTED_NAME} ${sbindir}/${CHROOTED_NAME};	\
-+		${INSTALL} ${CHROOTED_NAME} ${DESTDIR}${sbindir}/${CHROOTED_NAME};	\
+-		${INSTALL} -o 0 -g 0 -m 4755 ${CHROOTED_NAME} ${DESTDIR}${sbindir}/${CHROOTED_NAME};	\
++		${INSTALL} -m 755 ${CHROOTED_NAME} ${DESTDIR}${sbindir}/${CHROOTED_NAME};	\
  	fi
  
  debuglevel:

================================================================
Index: SOURCES/scponly-setup_chroot.patch
diff -u SOURCES/scponly-setup_chroot.patch:1.1 SOURCES/scponly-setup_chroot.patch:1.2
--- SOURCES/scponly-setup_chroot.patch:1.1	Thu Feb  3 13:33:29 2005
+++ SOURCES/scponly-setup_chroot.patch	Wed Apr 11 13:50:27 2007
@@ -1,5 +1,5 @@
---- scponly-4.0/setup_chroot.sh.in	2005-02-03 03:42:19.000000000 +0200
-+++ scponly-4.0.fixed/setup_chroot.sh.in	2005-02-03 03:43:43.000000000 +0200
+--- scponly-4.6/setup_chroot.sh.in.orig	2006-01-31 00:11:31.000000000 +0100
++++ scponly-4.6/setup_chroot.sh.in	2007-04-11 12:42:36.897489409 +0200
 @@ -14,11 +14,8 @@
  getwd ( ) {
  	query="$1"
@@ -25,19 +25,23 @@
  defaultwriteabledir="incoming"
  
  osname=`uname -s | tr ' ' '_'`
-@@ -125,10 +122,7 @@
- 
+@@ -137,14 +134,11 @@
  targetuser=`getwd "Username to install" "$defaultusername"`
+ fi
  username_collision=`id $targetuser > /dev/null 2> /dev/null; echo $?`
 -if [ $username_collision -eq 0 ] ; then
 -	fail "the user $targetuser already exists.  please remove this user and their home directory and try again."
 -fi 
+ 
+ if [ "$1" != "" ] ; then
+ 	targetdir=$1
+ else
 -targetdir=`getwd "home directory you wish to set for this user" "$defaulthomedirprefix/$targetuser"`
 +targetdir=`getwd "home directory you wish to set for this user" "$defaulthomedirprefix"`
- writeabledir=`getwd "name of the writeable subdirectory" "$defaultwriteabledir"`
+ fi
  
- #
-@@ -177,18 +171,6 @@
+ if [ "$3" != "" ] ; then
+@@ -199,18 +193,6 @@
  	done
  fi
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/scponly-DESTDIR.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/scponly-setup_chroot.patch?r1=1.1&r2=1.2&f=u