aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--THANKS1
-rw-r--r--debian/changelog14
-rw-r--r--pbuilder-buildpackage-funcs2
-rw-r--r--pbuilder.826
-rw-r--r--pbuilderrc.52
6 files changed, 45 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index a58e472..9d623de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2002-10-29 Junichi Uekawa <dancer@debian.org>
+ * pbuilderrc.5: update
+
+ * pbuilder.8: update documentation slightly.
+
+ * THANKS: update thanks file.
+
+ * pbuilder-buildpackage-funcs: LOGNAME is set to BUILDUSERNAME, and
+ Create shadow entry for inside chroot on fakerooting as well.
+ Reported by: Robert Bihlmeyer <robbe@orcus.priv.at>
+
* pbuilder-buildpackage: Changed to work with trap instead of other
kludgy alternatives.
diff --git a/THANKS b/THANKS
index 9fdff23..deb8755 100644
--- a/THANKS
+++ b/THANKS
@@ -14,6 +14,7 @@ Eric Van Buggenhaut <Eric.VanBuggenhaut@AdValvas.be>
Henrique de Moraes Holschuh <hmh@debian.org>
David Schmitt <david@schmitt.edv-bus.at>
ranty@debian.org
+Robert Bihlmeyer <robbe@orcus.priv.at>
I thank them all!
diff --git a/debian/changelog b/debian/changelog
index 92995ac..8701c51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+pbuilder (0.47) unstable; urgency=low
+
+ * use "trap" for trapping error in pbuilder-buildpackage routine.
+ It might break some error conditions.
+ * LOGNAME=BUILDUSERNAME. (closes: #166682)
+ thanks: robbe@orcus.priv.at
+ * create shadow entry for user inside chroot (closes: #166683)
+ thanks: robbe@orcus.priv.at
+ * I've updated documentation to hopefully clarify the situation, if
+ you have better text for the documentation, shout! (closes: #165438)
+ thanks: Steve M. Robbins.
+
+ -- Junichi Uekawa <dancer@debian.org> Tue, 29 Oct 2002 15:18:38 +0900
+
pbuilder (0.46) unstable; urgency=low
* Fix wrong BASEBUILDPLACE in uml-mode. (closes: #166194)
diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs
index ee9f973..c0c8832 100644
--- a/pbuilder-buildpackage-funcs
+++ b/pbuilder-buildpackage-funcs
@@ -64,6 +64,8 @@ function createbuilduser () {
if [ -n "$SUTOUSER" ]; then
echo "$BUILDUSERNAME:x:$BUILDUSERID:$BUILDUSERID:,,,:/tmp/buildd:/bin/sh" >> $BUILDPLACE/etc/passwd
echo "$BUILDUSERNAME:*:$BUILDUSERID:" >> $BUILDPLACE/etc/group
+ echo "$BUILDUSERNAME:!:::::::" >> $BUILDPLACE/etc/shadow
export HOME="/tmp/buildd"
+ export LOGNAME="${BUILDUSERNAME}"
fi
}
diff --git a/pbuilder.8 b/pbuilder.8
index cef5f5e..e5bbdd6 100644
--- a/pbuilder.8
+++ b/pbuilder.8
@@ -31,10 +31,13 @@ for the specified distribution.
Also, by specifying the
.B "--override-config"
option, it is possible to install a new apt-line using
-the given options for the base.tgz.
-To switch the distribution, use the
-.B "--distribution"
-option along with this.
+the given options and settings in the configuration file
+for the base.tgz.
+
+For example, to switch the distribution of an existing
+base.tgz to woody, specify the
+.B "--distribution woody --override-config"
+options to update.
.TP
.B "build"
@@ -150,9 +153,12 @@ Specifies the distribution used. Currently the supported values are
and
.B "woody".
-The distribution switch only happens when
-.B "--override-config"
-option is set.
+This option is only effective when
+.B "pbuilder create"
+or when
+.B "pbuilder update"
+is specified with
+.B "--override-config"
.TP
.BI "--removepackages [" "packages to remove" "]"
@@ -307,8 +313,10 @@ values that is not specified in
.B "/etc/pbuilderrc."
.TP
.I "${HOME}/.pbuilderrc"
-The personal configuration file for pbuilder.
-.SH BUGS
+The personal configuration file for pbuilder, which overrides
+settings set in other configuration files.
+
+.SH "BUGS"
This program is starting to have too many options already.
.SH "AUTHOR"
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index 9843b0d..c94fecb 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -116,7 +116,7 @@ be copied over to after the building.
Specify the default distribution to use.
This option only affects when doing
.B "pbuilder create"
-except for when
+or when
.B "--override-config"
is specified for
.B "pbuilder update"