Bug#857475: unblock: pbuilder/0.228.6 (pre-approval)

2017-03-12 Thread Niels Thykier 
Control: tags -1 confirmed moreinfo

Mattia Rizzolo:
> package: release.debian.org
> user: release.debian@packages.debian.org
> usertags: unblock
> x-debbugs-cc: pbuilder-ma...@lists.alioth.debian.org
> 
> We pbuilder maintainers would like to fix #841935 for good, so James did
> some great work and testing to fix it.  I also cofirm that all my tests
> went well.
> While on it I'd like to slip in some very other minor changes.
> See the attached debdiff for the details.
> 
> TIA.
> 

Please go ahead and remove the moreinfo tag once the upload has been
completed (and built if necessary).

Thanks,
~Niels

Bug#857475: unblock: pbuilder/0.228.6 (pre-approval)

2017-03-11 Thread Mattia Rizzolo 
package: release.debian.org
user: release.debian@packages.debian.org
usertags: unblock
x-debbugs-cc: pbuilder-ma...@lists.alioth.debian.org

We pbuilder maintainers would like to fix #841935 for good, so James did
some great work and testing to fix it.  I also cofirm that all my tests
went well.
While on it I'd like to slip in some very other minor changes.
See the attached debdiff for the details.

TIA.

-- 
regards,
Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540  .''`.
more about me:  https://mapreri.org : :'  :
Launchpad user: https://launchpad.net/~mapreri  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-
diffstat for pbuilder-0.228.5 pbuilder-0.228.5+

 debian/NEWS  |4 +---
 debian/changelog |   23 +++
 debian/control   |1 +
 pbuilder-checkparams |2 +-
 pbuilder-modules |   38 +-
 pbuilder.8   |3 ++-
 pbuilderrc.5 |   38 ++
 7 files changed, 87 insertions(+), 22 deletions(-)

diff -Nru pbuilder-0.228.5/debian/changelog pbuilder-0.228.5+/debian/changelog
--- pbuilder-0.228.5/debian/changelog   2017-03-02 17:16:19.0 +0100
+++ pbuilder-0.228.5+/debian/changelog  2017-03-10 14:33:53.0 +0100
@@ -1,3 +1,26 @@
+pbuilder (0.228.5+) UNRELEASED; urgency=medium
+
+  [ James Clarke ]
+  * modules: Use a new /dev/pts instance inside the chroot.
+This allows for better isolation as the build process is no longer able
+to see the host's PTYs, other than the controlling terminal (if there is
+one).  By using a new instance, we can also control the permissions of
+/dev/pts/ptmx, ensuring that the build process is always able to create
+new PTYs, even if the host's has the default 000 mode.
+Thanks to Simon McVittie  for the thorough investigation.
+Closes: #841935
+
+  [ Mattia Rizzolo ]
+  * pbuilderrc.5:
++ Update the details about the currently available dependency resolvers.
+  * debian/NEWS:
++ Remove changes reverted in successive fixup uploads.
+  * checkparams:
++ Make --extrapackages cumulative.  Specifying --extrapackages multiple
+  times will now add packages to the list.
+
+ -- Mattia Rizzolo   Fri, 10 Mar 2017 14:33:53 +0100
+
 pbuilder (0.228.5) unstable; urgency=medium
 
   [ Thorsten Glaser ]
diff -Nru pbuilder-0.228.5/debian/control pbuilder-0.228.5+/debian/control
--- pbuilder-0.228.5/debian/control 2017-01-24 00:51:09.0 +0100
+++ pbuilder-0.228.5+/debian/control2017-03-10 14:05:32.0 +0100
@@ -25,6 +25,7 @@
 Depends:
  debootstrap | cdebootstrap,
  dpkg-dev (>= 1.17.0),
+ util-linux (>= 2.26.2-4) | initscripts (<< 2.88dsf-59.1),
  wget,
  ${misc:Depends},
 Recommends:
diff -Nru pbuilder-0.228.5/debian/NEWS pbuilder-0.228.5+/debian/NEWS
--- pbuilder-0.228.5/debian/NEWS2017-01-18 12:34:59.0 +0100
+++ pbuilder-0.228.5+/debian/NEWS   2017-03-10 14:28:34.0 +0100
@@ -10,9 +10,7 @@
   in pbuilder, such as bind-mounting /dev/shm from the host, to avoid
   situations like over-mounting.
 
-  Pdebuild now uses dpkg-source directly to generate the dsc to pass to
-  pbuilder rather than dpkg-buildpackage -S, therefore DEBBUILDOPTS no
-  longer affect this.  It will also no longer generate a source changes file
+  Pdebuild  will no longer generate a source changes file
   if BUILDRESULT is the parent directory, since the dsc will be overwritten
   when copying back the build results, possibly invalidating the previous
   changes file; please use pbuilder's new --source-only-changes option.
diff -Nru pbuilder-0.228.5/pbuilder.8 pbuilder-0.228.5+/pbuilder.8
--- pbuilder-0.228.5/pbuilder.8 2017-01-15 18:04:50.0 +0100
+++ pbuilder-0.228.5+/pbuilder.82017-03-10 14:28:36.0 +0100
@@ -638,7 +638,8 @@
 and
 .BR "update" .
 
-The packages should be specified as a space-delimited list.
+The packages should be specified as a space-delimited list, or by specifying
+\-\-extrapcakges multiple times.
 
 .TP
 .BI "\-\-debemail [" "maintainer-name " "]"
diff -Nru pbuilder-0.228.5/pbuilder-checkparams 
pbuilder-0.228.5+/pbuilder-checkparams
--- pbuilder-0.228.5/pbuilder-checkparams   2017-01-15 18:04:50.0 
+0100
+++ pbuilder-0.228.5+/pbuilder-checkparams  2017-03-10 14:28:36.0 
+0100
@@ -170,7 +170,7 @@
 shift; shift;
 ;;
 --extrapackages)
-EXTRAPACKAGES="$2";
+EXTRAPACKAGES="${EXTRAPACKAGES:+$EXTRAPACKAGES }$2";
 shift; shift;
 ;;
 --hookdir)
diff -Nru pbuilder-0.228.5/pbuilder-modules pbuilder-0.228.5+/pbuilder-modules
--- pbuilder-0.228.5/pbuilder-modules   2017-02-05 16:38:30.0 +0100
+++ pbuilder-0.228.5+/pbuilder-modules  2017-03-10 14:05:32.0 +0100
@@ -276,6 +276,12 @@
 umount_one