+

+	* pbuilderrc.5: update manpage to document the vars.
+
+	* pbuilder-buildpackage (BUILD_PID): preserve file permissions
+	on copying the result.
+	(BUILDRESULTUID,BUILDRESULTGID): define UID and GID.
+	chown and chgrp to the user ID after build.

4 files changed, 35 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 0be558b..25fd8b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-09-29  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilderrc.5: update manpage to document the vars.
+
+	* pbuilder-buildpackage (BUILD_PID): preserve file permissions 
+	on copying the result.
+	(BUILDRESULTUID,BUILDRESULTGID): define UID and GID.
+	chown and chgrp to the user ID after build.
+
 2002-09-25  Junichi Uekawa  <dancer@debian.org>
 
 	* pbuilder-runhooks (hooks): do not error out if there are no hooks in the hookdir.
diff --git a/debian/changelog b/debian/changelog
index ffd09b7..e3db797 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pbuilder (0.41) unstable; urgency=low
+
+  * Add support for BUILDRESULTUID and BUILDRESULTGID
+  so that UID and GID for build results can be specified.
+
+ -- Junichi Uekawa <dancer@debian.org>  Sun, 29 Sep 2002 16:48:52 +0900
+
 pbuilder (0.40) unstable; urgency=low
 
   * Fix minor glitch with copying /etc files into the chroot
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 10cde90..00521c4 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -110,10 +110,16 @@ executehooks "B"
 trap cleanbuildplace exit
 umountproc
 
-if [ -n "$BUILDRESULT" ]; then
-    mkdir -p "$BUILDRESULT"
-    if [ -d "$BUILDRESULT" ]; then
-	cp "$BUILDPLACE"/tmp/buildd/* "$BUILDRESULT" 2>/dev/null || true
+if [ -n "${BUILDRESULT}" ]; then
+    mkdir -p "${BUILDRESULT}"
+    if [ -d "${BUILDRESULT}" ]; then
+	if [ -n "${BUILDRESULTUID}" ]; then
+	    chown "${BUILDRESULTUID}" "${BUILDPLACE}"/tmp/buildd/*
+	fi
+	if [ -n "${BUILDRESULTGID}" ]; then
+	    chgrp "${BUILDRESULTGID}" "${BUILDPLACE}"/tmp/buildd/*
+	fi
+	cp -p "${BUILDPLACE}"/tmp/buildd/* "${BUILDRESULT}" 2>/dev/null || true
     else
 	echo "E: BUILDRESULT=[$BUILDRESULT] is not a directory." >&2
     fi
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index 383cf09..21ef6f5 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -244,6 +244,15 @@ do not work.
 .BI "USEDEVFS=" "no"
 Whether to use DEVFS or not.
 
+.TP
+.BI "BUILDRESULTUID="
+.TP
+.BI "BUILDRESULTGID="
+Set the UID and GID of the files built as result.
+They probably need to be set to numeric UID values,
+so that it works the same inside the chroot and outside the 
+chroot.
+
 .SH "AUTHOR"
 Initial coding, and main maintenance is done by 
 Junichi Uekawa <dancer@debian.org>.