commit fakeroot changes, fakeroot does not work. su refuses to

change to user...

6 files changed, 42 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 739eb89..0b9378d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-02-16  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilder-buildpackage: fix ordering, to make the passwd creation work
+	-rfakeroot added to DEBBUILDOPTS automatically.
+	some more typos fixed.
+	very much fixo.
+
+	* pbuilderrc: added fakeroot to default extrapackages
+
+	* pbuilderrc.5: added notes.
+
 2002-02-15  Junichi Uekawa  <dancer@debian.org>
 
 	* pbuilder.1: document updated, noting of minor details of 
diff --git a/debian/changelog b/debian/changelog
index 56abde7..97bbe5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +6,11 @@ pbuilder (0.23) unstable; urgency=low
     (please test)
   * Fix update target to remove packages specified in REMOVEPACKAGES.
   * Support building as non-root user, and using fakeroot inside 
-    the chroot. (please test)
+    the chroot. (please test) -- can't do.
   * EXTRAPACKAGES takes effect within the build target. (please test)
+  * Make adding fakeroot inside the chroot the default.
 
- -- Junichi Uekawa <dancer@debian.org>  Fri, 15 Feb 2002 21:23:22 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Sat, 16 Feb 2002 20:58:10 +0900
 
 pbuilder (0.22) unstable; urgency=low
 
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 65fcb86..7b231e2 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -194,8 +194,11 @@ function saveaptcache_umountproc_cleanbuildplace () {
 
 function createbuilduser () {
     # create the build user
-    echo "$BUILDUSERNAME:x:$BUILDUSERID::/tmp/buildd:/bin/sh" >> $BUILDPLACE/etc/passwd
-    echo "$BUILDUSERNAME:x:$BUILDUSERID:" >> $BUILDPLACE/etc/group
+    if [ -n "$SUTOUSER" ]; then
+	echo "$BUILDUSERNAME:x:$BUILDUSERID:$BUILDUSERID:,,,:/tmp/buildd:/bin/sh" >> $BUILDPLACE/etc/passwd
+	echo "$BUILDUSERNAME:x:$BUILDUSERID:" >> $BUILDPLACE/etc/group
+	cat $BUILDPLACE/etc/passwd
+    fi
 }
 
 . /usr/lib/pbuilder/pbuilder-checkparams
@@ -203,7 +206,8 @@ function createbuilduser () {
 PACKAGENAME="$1"
 CHROOTEXEC="chroot $BUILDPLACE "
 if [ -n "$BUILDUSERNAME" -a -n "$BUILDUSERID" ]; then
-    SUTOUSER="su - $BUILDUSERNAME -- "
+    SUTOUSER="HOME=/tmp/buildd su - $BUILDUSERNAME -- "
+    DEBBUILDOPTS="$DEBBUILDOPTS -rfakeroot"
     echo "I: using fakeroot in build."
 else
     # run the build in root
@@ -218,8 +222,8 @@ fi;
 
 showbuildbanner
 echobacktime
-createbuilduser
 extractbuildplace 
+createbuilduser
 
 echo Copying source file
 copydsc "$PACKAGENAME" "$BUILDPLACE/tmp/buildd"
@@ -245,7 +249,7 @@ if [ -z "$DEBEMAIL" ]; then
 	exit 1;    
     fi
 else
-    if ! $CHROOTEXEC /bin/bash -c "cd tmp/buildd/*/;  dpkg-buildpackage -us -uc  \"-m$DEBEMAIL\" $DEBBUILDOPTS"; then
+    if ! $CHROOTEXEC /bin/bash -c "cd tmp/buildd/*/;  $SUTOUSER dpkg-buildpackage -us -uc  \"-m$DEBEMAIL\" $DEBBUILDOPTS"; then
 	echo "pbuilder: Failed autobuilding of package" >&2
 	umountproc_cleanbuildplace
 	exit 1;    
diff --git a/pbuilder.1 b/pbuilder.1
index 958a74c..1ced086 100644
--- a/pbuilder.1
+++ b/pbuilder.1
@@ -162,9 +162,13 @@ which is
 .B build-essential
 by default.
 This is used in 
-.B build
+.B "build"
+and 
+.B "create"
 and 
-.B create
+.B "update"
+
+The packages should be specified as a space-delimited list.
 
 .TP
 .BI "--configfile [" "configuration file to load" "]"
diff --git a/pbuilderrc b/pbuilderrc
index 1fd7ff0..9dbdd49 100755
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -4,6 +4,7 @@
 
 BASETGZ=/var/cache/pbuilder/base.tgz
 #EXTRAPACKAGES=gcc3.0-athlon-builder
+EXTRAPACKAGES="fakeroot"
 #export DEBIAN_BUILDARCH=athlon
 BUILDPLACE=/var/cache/pbuilder/build/
 MIRRORSITE=http://www.jp.debian.org/debian
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index 85688b2..85763ea 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -88,6 +88,14 @@ be copied over to after the building.
 .TP
 .BI "DISTRIBUTION=" "woody"
 Specify the default distribution to use.
+This option affects 
+.B "create" 
+and 
+.B "update"
+but not 
+.B "build"
+nor 
+.B "login"
 
 .TP
 .BI "APTCACHE=" "/var/cache/pbuilder/aptcache"
@@ -159,7 +167,6 @@ This option is used on invocation of
 in 
 .B "pdebuild"
 
-
 .TP
 .BI "BUILDUSERID=" "1234"
 The uid to be used inside chroot.
@@ -173,6 +180,10 @@ pbuilder.
 
 Note that this will require fakeroot to be installed within
 the chroot.
+And 
+.B "-rfakeroot"
+will be added to
+.B "DEBBUILDOPTS"
 
 .TP
 .BI "APTCONFDIR=" "/etc/apt"