From: Thorsten Glaser

tags 620730 + patch pending
tags 626431 + patch pending
tags 627086 + patch pending
tags 603420 + patch pending
tags 601250 + patch pending
tags 603881 = unreproducible
tags 400848 = unreproducible
tags 622624 = unreproducible
thanks

Dear Junichi, Matt and others,

I’ve prepared an NMU for pbuilder (versioned as 0.199+nmu4) and uploaded
it to Debian unstable, with a two-day delay as per devref §5.11.1 since
this fixes an RC bug older than seven days. The debdiff is attached; it
closes five bugs. I’m also tagging three other bugs as unreproducible as
pbuilder itself (obviously) doesn’t FTBFS on my system and the test pak-
kage I used didn’t exhibit problems with either comment blocks or hori-
zontal tabulator characters in the control file. I’m also attaching the
test package (absolutely minimal, but that’s what you get).

I mostly used patches from the bugs closed as baseline for my changes,
but did a bit more usually. I’m a heavy user of cowbuilder, because on
m68k there’s currently no buildd and cowbuilder is all I know (and love,
really… someone should make a buildd flavour that uses cowbuilder in-
stead of sbuild, if it goes by my will).

Cheers.

6 files changed, 58 insertions, 39 deletions

diff --git a/Documentation/pbuilder-doc.xml b/Documentation/pbuilder-doc.xml
index 419ee23..d8b9b6f 100644
--- a/Documentation/pbuilder-doc.xml
+++ b/Documentation/pbuilder-doc.xml
@@ -1609,7 +1609,7 @@ cache location</entry>
 	      </entry>
 	    </row>
 	    <row>
-	      <entry><filename>/run</filename></entry> 
+	      <entry><filename>/runscript</filename></entry> 
 	      <entry>The
 	      script passed as an argument to
 	      <command>pbuilder</command> execute is passed on.
diff --git a/debian/changelog b/debian/changelog
index bd107f6..a73cc50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+pbuilder (0.199+nmu4) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Rename the /run script from --execute to /runscript; not using
+    mktemp for consistency with the documentation. (Closes: #627086)
+  * Handle architecture wildcards with more than one architecture.
+    (Closes: #620730) (Closes: #626431)
+  * Fix pbuilderrc(5) formatting. (Closes: #603420)
+  * Fix pbuilder-satisfydepends-classic output, including better line
+    breaks and hyphen-used-as-minus-sign lintian. (Closes: #601250)
+  * Please lintian: add debian/source/format.
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Thu, 26 May 2011 20:49:04 +0000
+
 pbuilder (0.199+nmu3) unstable; urgency=low
 
   * Non-Maintainer Upload.
diff --git a/pbuilder b/pbuilder
index 8a092f8..d816183 100755
--- a/pbuilder
+++ b/pbuilder
@@ -116,11 +116,11 @@ File extracted to: $BUILDPLACE
 	recover_aptcache
 	trap saveaptcache_umountproc_cleanbuildplace_trap exit sighup
 
-	RUNNAME="$BUILDPLACE/run"
+	RUNNAME="$BUILDPLACE/runscript"
 	cat "$EXECPROGRAM" > "$RUNNAME"
 	chmod a+x "$RUNNAME"
 	executehooks "F"
-	( ${CHROOTEXEC} /run "$@" )
+	( ${CHROOTEXEC} /runscript "$@" )
 	RET=$?
 	rm -f "$RUNNAME"
 
diff --git a/pbuilder-satisfydepends-classic b/pbuilder-satisfydepends-classic
index 20f481a..12d3107 100755
--- a/pbuilder-satisfydepends-classic
+++ b/pbuilder-satisfydepends-classic
@@ -70,7 +70,7 @@ checkbuilddep_internal() {
     local APTFLAG="-o APT::Install-Recommends=false"
     echo " -> Attempting to parse the build-deps "
     for INSTALLPKGMULTI in $(get_build_deps | split_deps); do
-      echo " -> Considering build-dep$(echo "$INSTALLPKGMULTI" | tr "/" " " )"
+      echo " -> Considering build-dep $(echo "$INSTALLPKGMULTI" | tr "/" " ")"
       SATISFIED="no"
       for INSTALLPKG in $(split_alternates "$INSTALLPKGMULTI"); do
 	CURRENTREALPKGNAME=$(get_pkg_name "$INSTALLPKG")
diff --git a/pbuilder-satisfydepends-funcs b/pbuilder-satisfydepends-funcs
index 64436a0..bace59d 100755
--- a/pbuilder-satisfydepends-funcs
+++ b/pbuilder-satisfydepends-funcs
@@ -122,7 +122,7 @@ checkbuilddep_archdeps() {
     local INSTALLPKG="$1"
     local ARCH="$2"
     # architectures listed between [ and ] for this dep
-    local DEP_ARCHES="$(echo "$INSTALLPKG" | sed 's/.*\[\(.*\)\].*/\1/')"
+    local DEP_ARCHES="$(echo "$INSTALLPKG" | sed -e 's/.*\[\(.*\)\].*/\1/' -e 'y|/| |')"
     local PKG="$(echo "$INSTALLPKG" | cut -d ' ' -f 1)"
     local USE_IT
     local IGNORE_IT
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index e6123d6..301b007 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -33,7 +33,7 @@ allowing the usual configuration options
 to take effect.
 Setting this variable overrides other options.
 .TP
-.BI "ARCHITECTURE=" "`dpkg --print-architecture`"
+.BI "ARCHITECTURE=" "`dpkg \-\-print\-architecture`"
 Specify the default distribution to use.
 This option only affects when doing
 .B "pbuilder create"
@@ -52,12 +52,13 @@ will invoke debsign command after building.
 Specifies the default location for the archived
 chroot image to be created and used.
 This is overridden with the option
-.BR "--basetgz" "."
+.BR "\-\-basetgz" "."
 .TP
 .BI "BINDMOUNTS=" "directories-to-bind-mount"
 When this value is set, pbuilder will mount these directories using
 bind-mount. Do not bind-mount
 .B "/"
+.br
 An Example:
 
 .EX
@@ -88,10 +89,11 @@ Specify the default directory which the build result will
 be copied over to after the building.
 
 Unlike
-.B "--buildresult"
+.B "\-\-buildresult"
 command-line option.
 The path is not canonicalized, so you should specify a full-path,
-not a relative path..TP
+not a relative path.
+.TP
 .BI "CCACHEDIR=" "/var/cache/pbuilder/ccache"
 Specifies where ccache will keep its cached compiler output.
 If this is specified, ccache will be installed upon pbuilder create or
@@ -100,7 +102,8 @@ CCACHEDIR will be bind-mounted in the chroot, and CCACHE_DIR will be
 set to CCACHEDIR.  Note that files in CCACHEDIR are chowned to
 BUILDUSERID (1234 by default).
 .TP
-.BI "BUILDRESULTUID=".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,
@@ -117,7 +120,7 @@ The default value is
 .BI "BUILDSOURCEROOTCMD=" "fakeroot"
 This option is used on invocation of fakeroot
 for
-.B "dpkg-buildpackage"
+.B "dpkg\-buildpackage"
 in
 .B "pdebuild"
 .TP
@@ -135,7 +138,7 @@ pbuilder.
 Note that this will require fakeroot to be installed within
 the chroot, and fakeroot will automatically be installed.
 And
-.B "-rfakeroot"
+.B "\-rfakeroot"
 will be added to
 .B "DEBBUILDOPTS"
 .TP
@@ -145,10 +148,11 @@ This option is space-delimited.
 This option only affects when doing
 .B "pbuilder create"
 or when
-.B "--override-config"
+.B "\-\-override\-config"
 is specified for
 .B "pbuilder update"
-option..TP
+option.
+.TP
 .BI "export http_proxy=" "http://your-proxy:8080/"
 Defines the proxy for http connection.
 .TP
@@ -159,16 +163,16 @@ This trick can be used for other environmental variables as well.
 .TP
 .BI "DEBBUILDOPTS=" ""
 The options given here will be passed on to
-.BR dpkg-buildpackage .
+.BR dpkg\-buildpackage .
 This can be useful e.g. for binary-only builds. The command-line option
-.B "--debbuildopts" will be appended to any contents specified here but
+.B "\-\-debbuildopts" will be appended to any contents specified here but
 may also be used to reset the list of options.
 
 The default value is to build source and binary package.
 .TP
-.BI "DEBOOTSTRAPOPTS=" "( '--variant=buildd' )"
+.BI "DEBOOTSTRAPOPTS=" "( '\-\-variant=buildd' )"
 When this option is set to
-.B "--variant=buildd"
+.B "\-\-variant=buildd"
 .B "pbuilder"
 will invoke
 .B "$DEBOOTSTRAP"
@@ -188,12 +192,12 @@ and
 .TP
 .BI "DEBEMAIL=" "Maintainer Name <Mail@Address>"
 If this was specified,
-.B dpkg-buildpackage
+.B dpkg\-buildpackage
 command will be passed with the necessary sponsorship option
-.B "-mMaintainer Name <Mail@Address>"
+.B "\-mMaintainer Name <Mail@Address>"
 on building.
 Overridden with
-.B "--debemail"
+.B "\-\-debemail"
 command-line option.
 The default configuration for
 .B pbuilder
@@ -211,7 +215,7 @@ Specify the default distribution to use.
 This option only affects when doing
 .B "pbuilder create"
 or when
-.B "--override-config"
+.B "\-\-override\-config"
 is specified for
 .B "pbuilder update"
 option.
@@ -228,7 +232,7 @@ Also this is installed on
 Specifies the default location for the user hooks
 directory.
 This is overridden with the option
-.BR "--hookdir" "."
+.BR "\-\-hookdir" "."
 
 If this is specified, hooks are searched for in
 the chroot, when running
@@ -251,8 +255,9 @@ the chroot.
 .BI "OTHERMIRROR=" "deb http://xxx/xxx/ ./ " "[|" " other deb lines... " "]"
 The lines which is added to the sources.list, delimited with
 .B "|"
-Like
-.B "deb http://local/mirror stable main|deb file:/usr/local/mirror ./"
+Like:
+.br
+.B "deb http://local/mirror sid main|deb file:/usr/local/mirror ./"
 
 The deb lines here are the ones that will appear at the top of the
 .B "sources.list"
@@ -268,7 +273,7 @@ listed in
 
 To make changes on mirror site effective on
 .B update
-.B "--override-config"
+.B "\-\-override\-config"
 needs to be specified.
 .TP
 .BI "PDEBUILD_PBUILDER=" "pbuilder"
@@ -279,26 +284,26 @@ and
 .B "cowbuilder"
 .TP
 .BI "PKGNAME_LOGFILE_EXTENTION=" ".build"
-The extension of filename used in pkgname-logfile option.
+The extension of filename used in pkgname\-logfile option.
 .TP
 .BI "PKGNAME_LOGFILE=" "yes"
 Always run with
-.B "--pkgname-logfile"
+.B "\-\-pkgname\-logfile"
 option, and create a logfile named after the package name.
 .TP
-.BI "PBUILDERROOTCMD=" "sudo -E"
+.BI "PBUILDERROOTCMD=" "sudo \-E"
 This option is used on invocation of
 .B "pbuilder build"
 in
 .B "pdebuild"
 .TP
-.BI "PBUILDERSATISFYDEPENDSCMD=" "/usr/lib/pbuilder/pbuilder-satisfydepends"
+.BI "PBUILDERSATISFYDEPENDSCMD=" "/usr/lib/pbuilder/pbuilder\-satisfydepends"
 This option is used by various parts of pbuilder to satisfy
 (i.e. install) the build-dependencies of a package.  There are four
 implementations:
 
 The "experimental" implementation,
-"pbuilder-satisfydepends-experimental", which might be useful to pull
+"pbuilder\-satisfydepends\-experimental", which might be useful to pull
 packages from experimental or from repositories with a low APT Pin
 Priority.
 
@@ -316,14 +321,14 @@ used until 0.172.
 
 The default is now "aptitude".
 .TP
-.BI "PBUILDERSATISFYDEPENDSOPT=" "('--check-key')"
-Array of flags to give to pbuilder-satisfydepends.
-Specifying --check-key here will try to verify key signatures.
+.BI "PBUILDERSATISFYDEPENDSOPT=" "('\-\-check\-key')"
+Array of flags to give to pbuilder\-satisfydepends.
+Specifying \-\-check\-key here will try to verify key signatures.
 
 .TP
-.BI "APTGETOPT=" "('--force-yes')"
-Extra flags to give to apt-get.
-Default is --force-yes, which will skip key verification of packages
+.BI "APTGETOPT=" "('\-\-force\-yes')"
+Extra flags to give to apt\-get.
+Default is \-\-force\-yes, which will skip key verification of packages
 to be installed. Unset if you want to enable key verification.
 
 .TP
@@ -352,7 +357,7 @@ being mounted.
 .BI "USE_PDEBUILD_INTERNAL=" "yes"
 When this option is set to
 .I yes
-.B "pdebuild-internal"
+.B "pdebuild\-internal"
 implementation of
 .B pdebuild
 is used.
@@ -376,7 +381,7 @@ The homepage is available at
 .SH "FILES"
 .I "/etc/pbuilderrc, $HOME/.pbuilderrc"
 .SH "SEE ALSO"
-.BR "/usr/share/doc/pbuilder/pbuilder-doc.html" ", "
+.BR "/usr/share/doc/pbuilder/pbuilder\-doc.html" ", "
 .BR "cowbuilder" "(8), "
 .BR "pbuilder" "(8), "
 .BR "pdebuild" "(1)"