Bug#627086: pbuilder: diff for NMU version 0.199+nmu4
Thorsten Glaser
tg at mirbsd.de
Thu May 26 21:08:37 UTC 2011
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA384
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.
//mirabilos
- --
I believe no one can invent an algorithm. One just happens to hit upon it
when God enlightens him. Or only God invents algorithms, we merely copy them.
If you don't believe in God, just consider God as Nature if you won't deny
existence. -- Coywolf Qi Hunt
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MirBSD)
iQIVAwUBTd7A/Xa1NLLpkAfgAQlWfQ/+LBSpx3E2TIbR68uHpVUYBdlzocMS0pGm
6a1aL3EPXfSe/Z20ikbMmXUQ2O7AV3imLgxb1bgkQsWMTDWalvma6gXN5jVzX/Sr
upB0MOhCqC6cCj3vmpXXdAH45cnk0unYSbC7FIwgYqFlrOIPn9thU0YzRlTKpM6O
0Hkc3gZ2GsTWNVMVMzl27z3ptxN0NPuyEEQhInYiVt+bLbQSosVGgAmrKEYTf9dV
qp3fG35ZiXG3RCLDWdAAq138+2SFtIGM1DNkTT9XiwUtMwnkqrqrl327BZJBxbs4
wmdU3kDg72rCu07tZDa8pFbamb0TEoZKDu6lHAuig4OGXXmUh60xthbAR+VRk4+j
QuPklRXCOw0mOvNCtcTqeD2qKfzZ+RyOsOQmteayrym0ozUjzk5meeFUgcKDHAHN
r9KfAxfuy9+QwVpNoAp+rc/cB6kmwjEgOQSJJpcmOEq3rorng3ybWTDFL//q/sMU
Edg3gwuWoCQjR59GTdmMnRoUOq6nA2jUvxZK/m3rhQTfXXd7wO1IiAxYNnGzKDOV
u1lVGxU4XCApcaB0gAEefKzEOKBhtLUqd6PWjVbcDbQrDTfblIOsResoKoUQF68y
o2Fjx6M3OPYOMvwq7cdO2P37Euzm1CNg4SSry3KyZSdT9lo2onbIhYGd9wds0HGt
9LO14P1nmXI=
=7BsQ
-----END PGP SIGNATURE-----
-------------- next part --------------
diff -Nru pbuilder-0.199+nmu3/Documentation/pbuilder-doc.xml pbuilder-0.199+nmu4/Documentation/pbuilder-doc.xml
--- pbuilder-0.199+nmu3/Documentation/pbuilder-doc.xml 2010-01-03 02:38:09.000000000 +0000
+++ pbuilder-0.199+nmu4/Documentation/pbuilder-doc.xml 2011-05-26 20:25:29.000000000 +0000
@@ -1609,7 +1609,7 @@
</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 -Nru pbuilder-0.199+nmu3/debian/changelog pbuilder-0.199+nmu4/debian/changelog
--- pbuilder-0.199+nmu3/debian/changelog 2011-04-08 23:36:25.000000000 +0000
+++ pbuilder-0.199+nmu4/debian/changelog 2011-05-26 20:50:36.000000000 +0000
@@ -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 at mirbsd.de> Thu, 26 May 2011 20:49:04 +0000
+
pbuilder (0.199+nmu3) unstable; urgency=low
* Non-Maintainer Upload.
diff -Nru pbuilder-0.199+nmu3/debian/source/format pbuilder-0.199+nmu4/debian/source/format
--- pbuilder-0.199+nmu3/debian/source/format 1970-01-01 00:00:00.000000000 +0000
+++ pbuilder-0.199+nmu4/debian/source/format 2011-05-26 20:42:24.000000000 +0000
@@ -0,0 +1 @@
+1.0
diff -Nru pbuilder-0.199+nmu3/pbuilder pbuilder-0.199+nmu4/pbuilder
--- pbuilder-0.199+nmu3/pbuilder 2009-03-07 01:28:51.000000000 +0000
+++ pbuilder-0.199+nmu4/pbuilder 2011-05-26 20:26:07.000000000 +0000
@@ -116,11 +116,11 @@
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 -Nru pbuilder-0.199+nmu3/pbuilder-satisfydepends-classic pbuilder-0.199+nmu4/pbuilder-satisfydepends-classic
--- pbuilder-0.199+nmu3/pbuilder-satisfydepends-classic 2010-07-05 13:09:29.000000000 +0000
+++ pbuilder-0.199+nmu4/pbuilder-satisfydepends-classic 2011-05-26 20:42:05.000000000 +0000
@@ -70,7 +70,7 @@
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 -Nru pbuilder-0.199+nmu3/pbuilder-satisfydepends-funcs pbuilder-0.199+nmu4/pbuilder-satisfydepends-funcs
--- pbuilder-0.199+nmu3/pbuilder-satisfydepends-funcs 2011-02-19 18:16:44.000000000 +0000
+++ pbuilder-0.199+nmu4/pbuilder-satisfydepends-funcs 2011-05-26 20:29:14.000000000 +0000
@@ -122,7 +122,7 @@
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 -Nru pbuilder-0.199+nmu3/pbuilderrc.5 pbuilder-0.199+nmu4/pbuilderrc.5
--- pbuilder-0.199+nmu3/pbuilderrc.5 2010-07-05 13:14:03.000000000 +0000
+++ pbuilder-0.199+nmu4/pbuilderrc.5 2011-05-26 20:48:32.000000000 +0000
@@ -33,7 +33,7 @@
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 @@
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 @@
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 @@
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 @@
.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 @@
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 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 @@
.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 @@
.TP
.BI "DEBEMAIL=" "Maintainer Name <Mail at Address>"
If this was specified,
-.B dpkg-buildpackage
+.B dpkg\-buildpackage
command will be passed with the necessary sponsorship option
-.B "-mMaintainer Name <Mail at Address>"
+.B "\-mMaintainer Name <Mail at Address>"
on building.
Overridden with
-.B "--debemail"
+.B "\-\-debemail"
command-line option.
The default configuration for
.B pbuilder
@@ -211,7 +215,7 @@
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 @@
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 @@
.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 @@
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 @@
.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 @@
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 @@
.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 @@
.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)"
-------------- next part --------------
Format: 1.0
Source: tstpkg
Binary: tstpkg
Architecture: all
Version: 1
Maintainer: Thorsten Glaser <tg at mirbsd.de>
Build-Depends: mksh [amd64 i386], cvs [!amd64 !i386], xz-lzma (>= 5~), less
Checksums-Sha1:
66e78da3fbeba3b8d34bb3794661615e3962239d 688 tstpkg_1.tar.gz
Checksums-Sha256:
78ba1e566aae2718027c6ece68c2effa2cb1c67bd06dd6ce3bffa66e299f183a 688 tstpkg_1.tar.gz
Files:
ad3f6a5d9b2fde8689fa27a25127ce80 688 tstpkg_1.tar.gz
-------------- next part --------------
A non-text attachment was scrubbed...
Name: tstpkg_1.tar.gz
Type: application/octet-stream
Size: 688 bytes
Desc:
URL: <http://lists.alioth.debian.org/pipermail/pbuilder-maint/attachments/20110526/871e1b74/attachment-0015.obj>
More information about the Pbuilder-maint
mailing list