diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/changelog pbuilder-0.215+nmu4ubuntu1~ppa1/debian/changelog --- pbuilder-0.223~ubuntu14.04.1/debian/changelog 2016-11-02 15:25:59.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/changelog 2015-07-12 09:34:29.000000000 +0000 @@ -1,365 +1,25 @@ -pbuilder (0.223~ubuntu14.04.1) trusty; urgency=medium +pbuilder (0.215+nmu4ubuntu1~ppa1) trusty; urgency=medium - * No-change backport to trusty + * Rebuild for Trusty. - -- Donk donk Wed, 02 Nov 2016 16:25:59 +0100 + -- Fabio Fantoni Sun, 12 Jul 2015 11:33:12 +0200 -pbuilder (0.223) unstable; urgency=medium +pbuilder (0.215+nmu4ubuntu1) wily; urgency=low - * debian/control: - + Drop explicit build dependency on dpkg-dev. - + Drop version restriction from ldp-docbook-xsl build-dep. - + Use https in Vcs-Git. - * modules: - + Add a blank line before changelog entries for binNMUs. - Thanks to Andreas Beckmann for noticing. - + Remove reference of pbuilder-uml from an error message. - * pbuilderrc.5: - + Document BINNMU_MAINTAINER option. Closes: #810737 - * debian/pbuilder.config: - + Stop trying to parse and sometimes overwrite user conf silently. - Now if /etc/pbuilderrc already exists, we won't try to do anything, - unless explicitly asked so. Closes: #810967 - * loadconfig: - + Stop complaining about deprecated DEBEMAIL, that caused too noise in - false positive contexts. Closes: #810715 - * buildpackage: - + Fix check for ignored options to not warn when there is nothing to warn. - * checkparams: - + Print at debug level the command line used. - * Remove pbuilder-uml. - It's usually broken and anyway unmaintained, and not really used either. - * Remove the pbuilder-selftest script from the sources - - -- Mattia Rizzolo Sun, 24 Jan 2016 17:39:24 +0000 - -pbuilder (0.222) unstable; urgency=medium - - [ Christopher Baines ] - * buildpackage: - + factor out a export_additional_buildresults() function. - + export additional buildresults if the package build fails. Closes: #806650 - - [ Mattia Rizzolo ] - * buildpackage: - + say something more human whene the specified .dsc file is not found. - + output a warning when there are options after the .dsc file (which will - be ignored). Closes: #669873 - * modules: - + make log.d actually work (was not used before). - + add two apt options that make sure that packages that are only recommended - or suggested by still installed packages are also autoremoved. This means - APT::AutoRemove::SuggestsImportant=false and - APT::AutoRemove::RecommendsImportant=false. - Thanks to Johannes Schauer for the suggestion. - * pdebuild: - + further improvments to the regex to clean up DEBUILDOPTS. - Thanks to Ondřej Surý for the patch. Closes: #782150 - * satisfydepends: - + add support for Build-Depends-Arch and Build-Conflicts-Arch. - Closes: #802557 - * conf: formally deprecate DEBEMAIL, it has been a noop since some releases. - * pbuilder-apt-config: ubuntu ports now has s390x, add it here too. - * debian/control: remove Junichi, Loïc and Matt from uploaders. - Thanks for all your work till now, and come back whenever you want! - * debian/copyright: - + add myself. - + update years of Junichi and Loïc entries. - - -- Mattia Rizzolo Fri, 08 Jan 2016 17:57:37 +0000 - -pbuilder (0.221.3) unstable; urgency=medium - - * debian/tests/build-procenv: be sure there is a deb-src line in - /etc/apt/sources.list - * pbuilder-satisfydepends-aptitude: set XDG_CACHE_HOME=/root while calling - aptitude, to avoid it putting stuff in BUILDDIR. This is due to a changed - behaviour in aptitude. Closes: #807487 - - -- Mattia Rizzolo Wed, 09 Dec 2015 18:39:33 +0000 - -pbuilder (0.221.2) unstable; urgency=medium - - * pbuilder: correctly empty and then recopy the chroot's /etc/resolv.conf - only during the build process. Closes: #806386 - * pbuilderrc: - + remove the --keyring option from DEBOOTSTRAPOPTS. This is not really - needed and made harder for derivatives to derivate. Closes: #751282 - + add --force-check-gpg to DEBOOTSTRAPOPTS: this makes debootstrap fail if - the keyring is not available. - * debian/tests/build-procenv: workaround apt 1.1 and ci.debian.net bad - interaction by passing `-o APT::Sandbox::User=root` to apt invocation. - * debian/control: - + use my @debian.org email address. - + stop suggesting pbuilder-uml. - * debian/rules: add a ubuntu (and derivatives) only stanza to tweak some - files at build time: - + change the URL of the default archive in pbuilderrc and documentation. - + set the default DISTRIBUTION to xenial. - - -- Mattia Rizzolo Tue, 08 Dec 2015 10:24:26 +0000 - -pbuilder (0.221.1) unstable; urgency=medium - - * pbuilder-apt-config: update the hardcoded list of releases/architectures of - ubuntu and debian. This fixes autopkgtest when run on ppc64el. - * create: load hooks before trying to execute them. Closes: #806187 - * pdebuild-internal: revert back to plain log() instead of log.{i,e}(). - * buildpackage: move the binNMU() function from modules to buildpackage-funcs, - where it fits better. - * runhooks: move (un)loadhooks() and executehooks() to pbuilder-modules. - Merging the file means the hooks can use functions from the modules and - viceversa safely; otherwise we would need both the scripts to source the - other and this is not supported in bash. - Thanks to Holger to notice this broke with the last release. - - -- Mattia Rizzolo Wed, 25 Nov 2015 23:56:26 +0000 - -pbuilder (0.221) unstable; urgency=medium - - [ Reiner Herrmann ] - * doc/Makefile: make the build reproducible by using a fixed temp dir to - build the pdf. Closes: #804729 - - [ Luca Falavigna ] - * add binNMU support. Closes: #683848 - - [ Andreas Beckmann ] - * add "binary-only=yes" mark to the binNMU changelog. - * only set Changed-By to --binnmu-maintainer in .changes do not override - Maintainer. - - [ Mattia Rizzolo ] - * debian/control: - + Add dependency on dpkg-dev >= 1.7.0 due to `dpkg-parsechangelog -S` - * {create,update}: consider APTGETOPT also when running apt-get update. - Closes: #608636 - * make the output level configurable through LOGLEVEL (--loglevel) - valid values are D/I/W/E. Closes: #490184 - * pbuilder: - + add an (undocumented) --help operation. Exit 0 if the help was requested. - + clean: use `rm -f` when removing APTCACHE/*, so we don't fail when there - is nothing in it. Closes: #607607 - + update: correctly detect if debdelta is available. Closes: #805392 - + build: umount as the very last option, due keeping the bindmounts while - executing the hooks. Closes: #805552 - * pdebuild: - + make debsign work if only a source build was perfomed and only - _source.changes is available. Closes: #804905 - Thanks to Marcin Kulisz for the original patch. - * modules: - + add 3 log.{i,w,e}() functions to be used instead of log(). - - also use them instead of plain log() everywhere in the code. - + mainly style improvments to binNMU(). - + short the --help output and point to the manual pages instead. - + copy /etc/resolv.conf from the host only when USENETWORK=yes. - Closes: #753944 - * checkparams: - + override "experimental" DISTRIBUTION only in the create and update target. - * docs: - + add an empty POT file in the documentation directory, to ease the work of - translators. Closes: #629947 - * t: - + testlib: add a expect_stderr(), to explicitly test stderr. - + pbuilder-modules: also test the expected stderr from log(). - * debian/tests/build-procenv: use archive.ubuntu.com for amd64/i386 and - ports.ubuntu.com for everything else to fix autopkgtests on ubuntu. - - -- Mattia Rizzolo Tue, 24 Nov 2015 14:04:30 +0000 - -pbuilder (0.220) unstable; urgency=medium - - [ Ritesh Raj Sarraf ] - * Add debdelta support, enable optionally via pbuilderrc or the command line. - Closes: #602711 - - [ Guido Günther ] - * B20aupkgtest: Don't quote path to autopkg test dir, otherwise we're not - expanding the "*". Closes: #802379 - - [ Gianfranco Costamagna ] - * Update translations. - * update po during dh-clean. - - [ Mattia Rizzolo ] - * debian packaging: - + add a closes: in a old changelog entry, I wasn't aware of that bug. - + drop dependencies on essential packages, since they are available since - squeeze: coreutils, debianutils. - + debian/control: let pbuilder-uml replace pbuilder (= 0.217) so it is - able to take over a file wrongly placed on pbuilder due to #800416. - Closes: #800769 - + debian/tests: add an autopkgtest running the unit tests. - + debian/pbuilder-test: remove, fully replaced by autopkgtest. - - Those tests were meant to be run with a pbuilder hook after the build. - Autopkgtest is a way more powerful test environment. - + debian/pbuilder.config: fix detection of mirror through - /etc/apt/sources.list.d/* at install time. - Thanks to jre for the patch. Closes: 772062 - * tests: - + move all tests under a t/ directory. - + t/test_pbuilder-apt-config: remove temporary file at the end of the test. - * hooks: - + unhooks: let unloadhooks don't fail if there are no hooks loaded. - This way we can call it also when hooks are not actually loaded or two - times in a row without fear the result. - + always load hooks just after extracting the build place, and unload them - when cleaning up. - + add hook type H: they run just after unpacking the chroot, for every - target. Closes: #800757 - + add hook type I: it runs after successfully build a package, after - copying back the build results. Closes: #652527 - * configuration: - + new config: BUILD_HOME: set the value of HOME while building. - Default it to /nonexistent to prevent builds from writing to /home. - This reverts what was done for #170762. Closes: #441052 - * buildpackage: - + only override HOME during dpkg-buildpackage invocation. - * pdebuild: - + debuild-internal: carry on PATH when calling dpkg-buildpackage. - Thanks to Matthias Förste for the patch. - Closes: #716680 - + hack dpkg-buildpackage command to remove possible '-g' or '-G' when - building the source package, and also consider the case when those flags - are surrounded by quotes. - - Thanks to Guido Günther for the first patch. - - Thanks to Tomasz Buchert for the better regex. - - Closes: #802800 - * modules: - + mountproc(): mount correctly selinux: bindmount from the host, and in the - same place (/sys/fs/selinux >= wheezy, /selinux < wheezy). - Thanks to ChangZhuo Chen (陳昌倬) for the patch. - Closes: #734193, #734454 - * uml: - + stop networking before quitting, so that it can exit properly. - Thanks to Paul TBBle Hampson for the patch. - Closes: #416918 - * Make the debdelta implementation more rubost and document the new options - in the manpages. - * Switch all instances of cdn.debian.net to httpredir.debian.org. - Closes: #774468 - * Use relative sources where possible, thanks to Gianfranco Costamagna for - the hint. - - -- Mattia Rizzolo Tue, 10 Nov 2015 14:40:24 +0000 - -pbuilder (0.219) unstable; urgency=medium - - * p-satisfydepends-classic: remove wrong quotes from get_dep_op_and_ver() - invocations. Thanks to Daniel Schepler for the bug - and the initial investigation. Closes: #800628 - - -- Mattia Rizzolo Fri, 02 Oct 2015 12:07:58 +0000 - -pbuilder (0.218) unstable; urgency=low - - * stop installing all the tests (so, pbuilder-selftest is not anymore). - Users are not supposed to be interested in running tests that much... - * move to use dh_install. The way we previously used dh_movefiles is not - safe to use with `dpkg-buildpackage -A`, as with a real source-only upload, - since it would end up in files belonging to pbuilder-uml in the pbuilder - binary. Closes: #800416 - - -- Mattia Rizzolo Tue, 29 Sep 2015 09:49:55 +0000 - -pbuilder (0.217) unstable; urgency=low - - * upload to unstable. - * documentation changes: - + pbuilderrc.5: specify that quotes are needed around COMPONENTS when - listing multiple entries. Closes: #659583; LP: #609106 - + pbuilderrc.5: packages in EXTRAPACKAGES are not installed during build, - but they are during update. Update manpage accordingly. LP: #1307909 - + pbuilderr.8: make even more clear that --architecture is just passed to - debootstrap. Closes: #434113 - + example hooks: keep /tmp/buildd as a fallback option in case BUILDDIR is - not setted. - + add a new example hook B20autopkgtest to automatically run DEP8 tests - when available. Thanks to Christoph Berg and Michael Prokop for writing - the initial script. Closes: #750137 - * buildpackage: - + unset DISPLAY just before the build, othewise there is software that - tries to connect to a X server. Closes: #589687; LP: #816556 - * modules: - + remove the /tmp/buildd symlink if it points to the current BUILDDIR - before repacking and just after unpacking. Closes: #797351 - + allow copying the local configuration from a defined directory, instead - of the system /etc. New configuration variable: CONFDIR. Closes: #580086 - * fix a whole bunch of warning from shellcheck. Thanks to Herbert Parentes - Fortes Neto for the initial patch-set in #753966. - - -- Mattia Rizzolo Thu, 24 Sep 2015 08:26:53 +0000 - -pbuilder (0.216) experimental; urgency=medium - - * Debian packaging: - + Add a "basic" DEP-8 tests. Closes: #705917 - Thanks to James Hunt for the initial patch. - + Move to the debehelper 'dh' sequencer. - + debehlper compat level 7 → 9. - + debian/control: - - Add myself to the uploaders. - - Bump Standards-Version to 3.9.6. No changes needed. - - Canonize Vcs-{Browser,Git} field. - + Use pbuilder.maintscript for /etc/bash_completion.d/pbuilder removal. - Thanks to Andreas Beckmann for the patch. - + Switch to httpredir.debian.org as default mirror. Closes: #790564 - Thanks to Michael Prokop for the patch. - * pdebuild: - + pass -d to dpkg-buildpackage while building the source package - Closes: #786690 - * pbuilder-unshare-wrapper: - + fix typo. Closes: #772290 - + unset the http_proxy variable, as that can lead to programs looking for - unreachable machines. Thanks to Thorsten Glaser for the - idea. Closes: #780587 - * pbuilder-buildpackage: - + Remove the -e parameter from the dpkg-buildpackage invocation - Closes: #567484 - + Allow .dsc files to lack a newline between the Files: line and the - signature. Closes: #741617 - + Change default BUILDDIR to /build. Closes: 693952, 789404 - * dependecy satisfiers: - + Handle comments in debian/control. Closes: #603881. - Thanks to Eric Pozharski for the initial patch and to Matt Palmer for - finalizing it. - + Allow blank lines above the first paragraph Closes: #694404 - + Fix a case where a "strictly earlier" reletionship was considered a - build profile (and as a result the build-dep vanished). Closes: #791991 - * pbuilderrc: - + Deprecate the PKGNAME_LOGFILE_EXTENTION conf entry in favour of - PKGNAME_LOGFILE_EXTENSION to fix the typo. Closes: #693458 - + Parametrize the build directory using the new conf option BUILDDIR. - * Stop providing empty /usr/share/doc/pbuilder/examples/workaround - * Add support for hurd. Closes: #753801, #755441 - Thanks to Gabriele Giacone for the patch. - * pbuilder-modules: - + Stop downloading translations of package descriptions. They are a waste - of bandwidth and time, really useless in a build chroots. Thanks to - Paul Wise for the suggestion. Closes: #749961 - + Copy /etc/mailname from the host, instead of writing it after the - `hostname -f` output. Closes: #637627 - + Make BUILDDIR available to hooks, so they can know where the source and - the built packages are. - + Add a symlink from /tmp/buildd to the current BUILDD to avoid too many - breakages. This change will go away someday, so please update your - scripts to use BUILDDIR. The link will be created only if /tmp/buildd is - an empty directory (what everybody should have now) or a non-existing - (new chroot created from this version). - Thanks to Helmut for the idea. - * documentation: - + ex/D65various-compiler-support: manage the different version of clang-X.Y - Thanks to Sylvestre Ledru for the patch. Closes: #748251 - + Use BUILDDIR instead of hardcoding /tmp/buildd on hooks examples. - + pbuilder.8: remove architecture examples for --architecture. It simply - supports whatever debootstrap support, no point in listing them. - Thanks to Reiner Herrmann for poiting this out. - + Explain that the documentation is work in progress and as such incomplete - and outdated. - + Finish German translation and refresh translations files. - Thanks to Reiner Herrmann . + * Merge from Debian unstable (LP #1469735). Remaining changes: + - Added basic DEP-8 autopkgtest + - debian/control: Recommend aptitude since it's needed by + pbuilder-satisfydepends + - pbuilderrc, debian/pbuilder.config: Set default archive mirror + to "archive.ubuntu.com/ubuntu". + - debian/rules: install temporary locale so man page tests don't + cause FTBFS. + - Add build-dependency on locales, which was always used but + appears to have previously been preinstalled in the build chroots. + - Remove --keyring override from default pbuilderrc + - Set default distribution to "wily" - -- Mattia Rizzolo Wed, 26 Aug 2015 12:56:57 +0000 + -- Scott Howard Tue, 07 Jul 2015 14:53:39 -0400 pbuilder (0.215+nmu4) unstable; urgency=low @@ -435,6 +95,99 @@ -- Thorsten Glaser Thu, 22 May 2014 20:37:51 +0200 +pbuilder (0.215ubuntu12) wily; urgency=medium + + * pbuilderrc: Set default distribution to "wily" + + -- Hans Joachim Desserud Sat, 27 Jun 2015 13:18:57 +0200 + +pbuilder (0.215ubuntu11) vivid; urgency=medium + + * pbuilderrc: Set default distribution to "vivid" + + -- Hans Joachim Desserud Sat, 28 Feb 2015 16:40:27 +0100 + +pbuilder (0.215ubuntu10) utopic; urgency=medium + + * Remove --keyring override from default pbuilderrc (LP: #599695) + + -- Phillip Susi Wed, 11 Jun 2014 13:37:37 -0400 + +pbuilder (0.215ubuntu9) utopic; urgency=medium + + * pbuilderrc: Set default distribution to "utopic" (lp: #1316423) + + -- B. Clausius Sun, 25 May 2014 09:14:44 +0200 + +pbuilder (0.215ubuntu8) utopic; urgency=medium + + * debian/tests/control: Updated Depends to allow more capable procenv to be + built. + + -- James Hunt Wed, 04 Jun 2014 11:27:10 +0200 + +pbuilder (0.215ubuntu7) trusty; urgency=medium + + * debian/tests/control: build-depend on libcap-dev since procenv 0.33 now + uses that. + + -- James Hunt Tue, 18 Mar 2014 13:57:11 +0100 + +pbuilder (0.215ubuntu6) trusty; urgency=medium + + * debian/tests/build_procenv: Use first remote url from sources.list + rather than hard-coding the set of architectures that use particular + ubuntu archives (since the latter strategy does not require + maintenance). + * debian/tests/control: + - Depend on haveged for entropy. + - Add architecture-specific depends on libnuma1 for the test package that + is built (procenv). + + -- James Hunt Wed, 05 Mar 2014 14:40:22 +0100 + +pbuilder (0.215ubuntu5) trusty; urgency=medium + + * Add build-dependency on locales, which was always used but appears to + have previously been preinstalled in the build chroots. + + -- Steve Langasek Wed, 05 Mar 2014 03:54:08 +0000 + +pbuilder (0.215ubuntu4) trusty; urgency=medium + + * debian/tests/build_procenv: on Ubuntu, select the correct archive mirror + for the build architecture. + + -- Steve Langasek Tue, 04 Mar 2014 17:07:16 -0800 + +pbuilder (0.215ubuntu3) trusty; urgency=low + + * debian/tests/build_procenv: Add component universe for Ubuntu to make + procenv buildable (LP: #1247420) + + -- Jean-Baptiste Lallement Sun, 03 Nov 2013 18:46:58 +0100 + +pbuilder (0.215ubuntu2) saucy; urgency=low + + * Fix typo in pbuilderrc + + -- Jonathan Riddell Fri, 16 Aug 2013 10:57:52 +0100 + +pbuilder (0.215ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - pbuilderrc, debian/pbuilder.config: Set default archive mirror to + "archive.ubuntu.com/ubuntu". + - pbuilderrc: Set default keyring to the Ubuntu one. + - pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS + - debian/rules: install temporary locale so man page tests don't cause + FTBFS. + - Added basic DEP-8 autopkgtest + - debian/control: Recommend aptitude since it's needed by pbuilder-satisfydepends + * pbuilderrc: Set default distribution to "saucy" + + -- Jackson Doak Fri, 16 Aug 2013 08:14:54 +1000 + pbuilder (0.215) unstable; urgency=low * Do not try to use /dev/shm if /run/shm is not present. (closes: #702811, #702102) @@ -453,6 +206,32 @@ -- Junichi Uekawa Sat, 02 Mar 2013 16:47:04 +0900 +pbuilder (0.213ubuntu3) saucy; urgency=low + + * Recommend aptitude since it's needed by pbuilder-satisfydepends + + -- Jonathan Riddell Tue, 04 Jun 2013 15:58:28 +0100 + +pbuilder (0.213ubuntu2) saucy; urgency=low + + * Added basic DEP-8 autopkgtest. + + -- James Hunt Mon, 27 May 2013 10:14:45 +0200 + +pbuilder (0.213ubuntu1) raring; urgency=low + + * Merge from Debian unstable (LP: #1075347, LP: #1060101) + Remaining changes: + - pbuilderrc, debian/pbuilder.config: Set default archive mirror to + "archive.ubuntu.com/ubuntu". + - pbuilderrc: Set default keyring to the Ubuntu one. + - pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS + - debian/rules: install temporary locale so man page tests don't cause + FTBFS. + * pbuilderrc: Set default distribution to "quantal" + + -- Maarten Bezemer Mon, 05 Nov 2012 23:27:25 +0100 + pbuilder (0.213) unstable; urgency=low [ Beatrice Torracca ] @@ -503,11 +282,25 @@ * pbuilder: Auto completion is missing --allow-untrusted flag (closes: #664323) - * Show current time in create / update operations too. + * Show current time in create / update operations too. (closes: #613854) -- Junichi Uekawa Fri, 30 Mar 2012 03:44:30 +0900 +pbuilder (0.208ubuntu1) precise; urgency=low + + * Merge from Debian unstable (LP: #952938) + Remaining changes: + - pbuilderrc, debian/pbuilder.config: Set default archive mirror to + "archive.ubuntu.com/ubuntu". + - pbuilderrc: Set default distribution to "precise" and the default + keyring to the Ubuntu one. + - pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS + - debian/rules: install temporary locale so man page tests don't cause + FTBFS. + + -- Maarten Bezemer Wed, 14 Mar 2012 14:54:09 +0100 + pbuilder (0.208) unstable; urgency=low [ Guido Günther ] @@ -543,6 +336,28 @@ -- Junichi Uekawa Sat, 10 Mar 2012 09:40:35 +0900 +pbuilder (0.206ubuntu2) precise; urgency=low + + * Auto complete flags and required file/directory names (Closes: #933339) + + -- Maarten Bezemer Sun, 19 Feb 2012 22:30:48 +0100 + +pbuilder (0.206ubuntu1) precise; urgency=low + + * Merge from Debian testing. (LP: #931936, LP: #788768) + Remaining changes: + - pbuilderrc, debian/pbuilder.config: Set default archive mirror to + "archive.ubuntu.com/ubuntu". + - pbuilderrc: Set default distribution to "precise" and the default + keyring to the Ubuntu one. + - pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS + - debian/rules: install temporary locale so man page tests don't cause + FTBFS. + - Auto complete filenames not working when not adding -- to the command + - Add directories to filename auto completion + + -- Maarten Bezemer Tue, 14 Feb 2012 10:45:14 +0100 + pbuilder (0.206) unstable; urgency=low [ Matthew Palmer ] @@ -580,6 +395,29 @@ -- Junichi Uekawa Sun, 25 Dec 2011 16:22:00 +0900 +pbuilder (0.204ubuntu2) precise; urgency=low + + * Auto complete filenames not working when not adding -- to the command + (Closes: #659581, LP: #770529) + * Add directories to filename auto completion + + -- Maarten Bezemer Sun, 12 Feb 2012 15:19:43 +0100 + +pbuilder (0.204ubuntu1) precise; urgency=low + + * Merge from Debian testing. Remaining changes: + - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set + default archive mirror to "archive.ubuntu.com/ubuntu". + - pbuilderrc: Set default distribution to "precise" and the default + keyring to the Ubuntu one. + - pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS + - debian/rules: install temporary locale so man page tests don't cause + FTBFS. + - pbuilder-buildpackage: use env PATH=$PATH when calling + dpkg-source and dpkg-buildpackage + + -- Michael Vogt Tue, 20 Dec 2011 10:02:44 +0100 + pbuilder (0.204) unstable; urgency=low [ Slavko ] @@ -659,6 +497,33 @@ -- Thorsten Glaser Thu, 26 May 2011 20:49:04 +0000 +pbuilder (0.199+nmu3ubuntu3) oneiric; urgency=low + + * pbuilder: + - Rename the /run script from --execute to /runscript (LP: #811016). + + -- Alberto Milone Wed, 05 Oct 2011 12:31:52 +0100 + +pbuilder (0.199+nmu3ubuntu2) oneiric; urgency=low + + * Apply patch from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606687 + (Matthew Palmer) so ccache and icecc work again (LP: #826031) + + -- Philip Muškovac Wed, 07 Sep 2011 10:51:21 +0100 + +pbuilder (0.199+nmu3ubuntu1) oneiric; urgency=low + + * Merge from debian unstable (LP: #776279), remaining changes: + - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set + default archive mirror to "archive.ubuntu.com/ubuntu". + - pbuilderrc: Set default distribution to "oneiric" and the default + keyring to the Ubuntu one. + - pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS + - debian/rules: install temporary locale so man page tests don't cause + FTBFS. + + -- Lorenzo De Liso Tue, 03 May 2011 12:20:24 +0200 + pbuilder (0.199+nmu3) unstable; urgency=low * Non-Maintainer Upload. @@ -679,16 +544,58 @@ -- Emilio Pozuelo Monfort Sat, 19 Feb 2011 19:02:34 +0000 +pbuilder (0.199+nmu1ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set + default archive mirror to "archive.ubuntu.com/ubuntu". + - pbuilderrc: Set default distribution to "natty" and the default keyring + to the Ubuntu one. + - pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS + - debian/rules: install temporary locale so man page tests don't cause + FTBFS. + + -- Marc Deslauriers Thu, 06 Jan 2011 08:29:47 -0500 + pbuilder (0.199+nmu1) unstable; urgency=low * Non-Maintainer Upload. - + * pbuilder-modules: don't clean $BUILDPLACE if another directory has been bind-mounted under it; patch by Matthew Palmer. (closes: #542915) -- Steve M. Robbins Tue, 28 Dec 2010 10:19:37 -0600 +pbuilder (0.199ubuntu4) natty; urgency=low + + * debian/rules: properly clean up temporary locale directory. + + -- Marc Deslauriers Tue, 23 Nov 2010 12:56:07 -0500 + +pbuilder (0.199ubuntu3) natty; urgency=low + + * debian/rules: install temporary locale so man page tests don't cause + FTBFS. + + -- Marc Deslauriers Tue, 23 Nov 2010 11:22:24 -0500 + +pbuilder (0.199ubuntu2) natty; urgency=low + + * pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS (LP: #671126) + + -- Alex Chiang Thu, 04 Nov 2010 13:23:04 -0600 + +pbuilder (0.199ubuntu1) natty; urgency=low + + * Merge with Debian; remaining changes: + - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set + default archive mirror to "archive.ubuntu.com/ubuntu". + - pbuilderrc: Set default distribution to "natty" and the default keyring + to the Ubuntu one. + + -- Loïc Minier Wed, 13 Oct 2010 19:14:46 +0200 + pbuilder (0.199) unstable; urgency=low * add a more useful message for pbuilder-runhooks when hookdir cannot @@ -699,6 +606,24 @@ -- Junichi Uekawa Mon, 05 Jul 2010 22:35:40 +0900 +pbuilder (0.198ubuntu2) maverick; urgency=low + + * pbuilderrc: Use /usr/share/keyrings/ubuntu-archive-keyring.gpg by default + instead of debian-archive-keyring.gpg; this should really be set on a + per-distro way since it breaks creation of Debian chroots from Ubuntu and + vice-versa; LP: #599394. + + -- Loïc Minier Mon, 28 Jun 2010 21:56:54 +0200 + +pbuilder (0.198ubuntu1) maverick; urgency=low + + * Merge from debian unstable; LP: #597980. Remaining changes: + - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set + default archive mirror to "archive.ubuntu.com/ubuntu". + - pbuilderrc: Set default distribution to "maverick". + + -- Bhavani Shankar Fri, 25 Jun 2010 13:06:57 +0530 + pbuilder (0.198) unstable; urgency=low * add --keyring option as default parameter to DEBOOTSTRAPOPTS @@ -741,7 +666,7 @@ * Rework Makefile entirely. * Use paragraphs in debian/NEWS file instead of bullet points. * pbuilder-selftest: new command to run the tests which are now installed. - + [ Junichi Uekawa ] * [INTL:da] Danish translation of the debconf templates pbuilder (closes: 583676) @@ -755,6 +680,21 @@ -- Junichi Uekawa Wed, 23 Jun 2010 07:21:11 +0900 +pbuilder (0.196ubuntu2) maverick; urgency=low + + * Update the default dist to maverick. + + -- Loïc Minier Sat, 08 May 2010 13:54:39 +0200 + +pbuilder (0.196ubuntu1) lucid; urgency=low + + * Merge with Debian unstable (lp: #502135). Remaining changes: + - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set + default archive mirror to "archive.ubuntu.com". + - pbuilderrc: Set default distribution to "lucid". + + -- Michael Bienia Sat, 02 Jan 2010 14:30:46 +0100 + pbuilder (0.196) unstable; urgency=low [ Loïc Minier ] @@ -839,6 +779,29 @@ -- Junichi Uekawa Sun, 29 Nov 2009 18:25:40 +0900 +pbuilder (0.192ubuntu1) lucid; urgency=low + + * Merge from debian testing, remaining changes: + - debian/control, pbuilderrc: Prefer debootstrap over cdebootstrap. + - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set + default archive mirror to "archive.ubuntu.com". + - pbuilderrc: + + Set default distribution to "lucid". + + Set Ubuntu components, but comment them out, so that it still defaults + to "main". + + Use "sudo -E" for PBUILDERROOTCMD. (LP #175776, Debian #361362) + - pbuilder-satisfydepends-gdebi: gdebi needs to be called from outside the + chroot as the .dsc file isn't copied yet into the chroot. + (Debian #472407, LP #242449). + - pbuilder-buildpackage, pbuilder.8, pbuilder-checkparams, + pbuilder-modules: Add support for building twice in a row. + (Debian #493538) + - pbuilder-satisfydepends-checkparams: + Re-add the CHROOT variable which got lost during the merge. + It's needed for pbuilder-satisfydepends-gdebi to work (lp: #384284). + + -- Michael Vogt Wed, 25 Nov 2009 11:37:25 +0100 + pbuilder (0.192) unstable; urgency=low * quote-escape debemail so that email with space can be handled @@ -862,6 +825,29 @@ -- Junichi Uekawa Tue, 25 Aug 2009 22:24:03 +0900 +pbuilder (0.189ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #402255 + - debian/control, pbuilderrc: Prefer debootstrap over cdebootstrap. + - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set + default archive mirror to "archive.ubuntu.com". + - pbuilderrc: + + Set default distribution to "karmic". + + Set Ubuntu components, but comment them out, so that it still defaults + to "main". + + Use "sudo -E" for PBUILDERROOTCMD. (LP #175776, Debian #361362) + - pbuilder-satisfydepends-gdebi: gdebi needs to be called from outside the + chroot as the .dsc file isn't copied yet into the chroot. + (Debian #472407, LP #242449). + - pbuilder-buildpackage, pbuilder.8, pbuilder-checkparams, + pbuilder-modules: Add support for building twice in a row. + (Debian #493538) + - pbuilder-satisfydepends-checkparams: + Re-add the CHROOT variable which got lost during the merge. + It's needed for pbuilder-satisfydepends-gdebi to work (lp: #384284). + + -- Bhavani Shankar Wed, 22 Jul 2009 13:42:01 +0530 + pbuilder (0.189) unstable; urgency=low [ Junichi Uekawa ] @@ -884,13 +870,41 @@ [ Junichi Uekawa ] * add a note that debian/changelog should not be edited. * Declare bashisms explicit in buildall script. (closes: #530157) - + [ Loïc Minier ] * Call apt-get autoremove on upgrades: (closes: #322649) * Drop useless -o APT::Get::AutomaticRemove=true -- Junichi Uekawa Sun, 31 May 2009 10:44:05 +0900 +pbuilder (0.187ubuntu2) karmic; urgency=low + + * pbuilder-satisfydepends-checkparams: + Re-add the CHROOT variable which got lost during the merge. + It's needed for pbuilder-satisfydepends-gdebi to work (lp: #384284). + + -- Michael Bienia Sat, 06 Jun 2009 16:03:23 +0200 + +pbuilder (0.187ubuntu1) karmic; urgency=low + + * Merge with Debian unstable; remaining Ubuntu changes: + - debian/control, pbuilderrc: Prefer debootstrap over cdebootstrap. + - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set + default archive mirror to "archive.ubuntu.com". + - pbuilderrc: + + Set default distribution to "karmic". + + Set Ubuntu components, but comment them out, so that it still defaults + to "main". + + Use "sudo -E" for PBUILDERROOTCMD. (LP #175776, Debian #361362) + - pbuilder-satisfydepends-gdebi: gdebi needs to be called from outside the + chroot as the .dsc file isn't copied yet into the chroot. + (Debian #472407, LP #242449). + - pbuilder-buildpackage, pbuilder.8, pbuilder-checkparams, + pbuilder-modules: Add support for building twice in a row. + (Debian #493538) + + -- Martin Pitt Mon, 04 May 2009 12:49:29 +0200 + pbuilder (0.187) unstable; urgency=low [ Junichi Uekawa ] @@ -952,6 +966,35 @@ -- Junichi Uekawa Thu, 27 Nov 2008 21:22:11 +0900 +pbuilder (0.183ubuntu1) jaunty; urgency=low + + * Merge with Debian unstable. Remaining Ubuntu changes: + - debian/control: Prefer debootstrap over cdebootstrap. + - debian/control: Demote cowdancer from Recommends to Suggests. This fits + Suggests semantics. (Forwarded to Debian #504594) + - debian/doc-base: Fix section. (Forwarded to Debian #504596) + - pbuilderrc: + + Set default archive to "archive.ubuntu.com". + + Set default distribution to "jaunty". + + Set Ubuntu components, but comment them out, so that it still defaults + to "main". + + Use debootstrap rather than cdebootstrap. + + Use "sudo -E" for PBUILDERROOTCMD. (LP #175776, Debian #361362) + - debian/pbuilder.config: add explanation header on new install that the + new /etc/pbuilderrc uses the default values from + /usr/share/pbuilder/pbuilderrc. (Forwarded to Debian #504599) + - debian/pbuilder.templates, debian/pbuilder.config: Use Ubuntu mirror by + default. + - pbuilder-satisfydepends-checkparams, pbuilder-satisfydepends-gdebi: Fix + pbuilder-satisfydepends-gdebi: gdebi needs to be called from outside the + chroot as the .dsc file isn't copied yet into the chroot. + (Debian #472407, LP #242449). + - pbuilder-buildpackage, pbuilder.8, pbuilder-checkparams, + pbuilder-modules: Add support for building twice in a row. + (Debian #493538) + + -- Martin Pitt Wed, 05 Nov 2008 15:29:10 +0100 + pbuilder (0.183) unstable; urgency=low [ Junichi Uekawa ] @@ -992,6 +1035,81 @@ -- Junichi Uekawa Tue, 12 Aug 2008 01:56:28 +0900 +pbuilder (0.181ubuntu7) intrepid; urgency=low + + * Demote cowdancer from Recommends to Suggests. This fits Suggests + semantics, and avoids pulling in qemu, bochs, gcc-3.4, and other stuff + into main. + + -- Martin Pitt Fri, 17 Oct 2008 10:20:45 +0200 + +pbuilder (0.181ubuntu6) intrepid; urgency=low + + * Fix: correctly handle multiple --debbuildopts (LP: #278213). + + -- TJ Sat, 4 Oct 2008 18:30:00 +0200 + +pbuilder (0.181ubuntu5) intrepid; urgency=low + + * Fix condition that makes build twice in a row the default behavior. + (LP: #258808) + + -- Nicolas Valcárcel Mon, 18 Aug 2008 00:54:57 -0500 + +pbuilder (0.181ubuntu4) intrepid; urgency=low + + [ Nicolas Valcárcel ] + * Make pbuilder lintian clean (LP: #254305): + - Edit debian/rules to not ignore make clean errors + - Modified Standars version + - Update debconf templates + - Modified doc-base Section to Debian according to new schema + - Added interpreter to pbuildd/hookdir/A10dpkg-l.sh due lintian error + * Added --twice build option (LP: #196008) + - Edited manpage with the new option + - Added option information on built-in help message + + [ Michael Vogt ] + * Added gdebi-core to Suggests (LP: #131153) + + -- Nicolas Valcárcel Sun, 03 Aug 2008 23:23:48 -0400 + +pbuilder (0.181ubuntu3) intrepid; urgency=low + + * Fix pbuilder-satisfydepends-gdebi: + gdebi needs to be called from outside the chroot as the .dsc file isn't + copied yet into the chroot (Closes: #472407, LP: #242449). + + -- Michael Bienia Mon, 23 Jun 2008 21:17:53 +0200 + +pbuilder (0.181ubuntu2) intrepid; urgency=low + + * debian/rules: s/ -a/ -s/ to fix FTBFS on powerpc (LP: #184218) + + -- Daniel Hahler Fri, 20 Jun 2008 11:01:15 +0100 + +pbuilder (0.181ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + * debian/control: + - Prefer debootstrap over cdebootstrap. + - Remove rootstrap build-dependency. + * pbuilderrc: + - Set default archive to "archive.ubuntu.com". + - Set default distribution to "intrepid". + - Set Ubuntu components. + - Don't create a buildd variant by default. + - Use debootstrap rather than cdebootstrap. + - pbuilderrc: use "sudo -E" for PBUILDERROOTCMD (LP: #175776) + * pdebuild: Move "$@" to end of "arg chain" for PDEBUILD_BUILDER + calls, so that "--buildresult" option gets passed to pbuilder + (LP: #129586) + * debian/pbuilder.config: + - add explaination header on new install that the new /etc/pbuilderrc + uses the default values from /usr/share/pbuilder/pbuilderrc + + -- Michael Vogt Thu, 29 May 2008 10:51:09 +0200 + pbuilder (0.181) unstable; urgency=low [ Esko Arajärvi ] @@ -1089,11 +1207,49 @@ -- Junichi Uekawa Wed, 26 Dec 2007 20:53:24 +0900 +pbuilder (0.176ubuntu2) hardy; urgency=low + + [ Daniel Hahler ] + * pbuilderrc: use "sudo -E" for PBUILDERROOTCMD (LP: #175776) + * pbuilder-satisfydepends-gdebi: add "--force-yes" to apt-get call + (LP: #123068) + * pdebuild: Move "$@" to end of "arg chain" for PDEBUILD_BUILDER + calls, so that "--buildresult" option gets passed to pbuilder + (LP: #129586) + + -- Michael Vogt Fri, 29 Feb 2008 12:49:35 +0100 + +pbuilder (0.176ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + * debian/control: + - Prefer debootstrap over cdebootstrap. + - DebianMaintainerField. + - Remove rootstrap build-dependency. + - add missing po4a build-dep + * Makefile: + - Addded pbuilder-satisfydepends-gdebi + * pbuilder-buildpackage-funcs: + - always pass --chroot to the pbuilder-satisfydepends (needed for + pbuilder-satisfydepends-gdebi) + * pbuilderrc: + - Set default archive to "archive.ubuntu.com". + - Set default distribution to "hardy". + - Set Ubuntu components. + - Don't create a buildd variant by default. + - Use debootstrap rather than cdebootstrap. + * pbuilder-satisfydepends-gdebi: + - added alternative b-d resolver that should should speed up b-d + resolution quite a bit. + * Support for specifying components is now included in Debian. + + -- Michael Vogt Thu, 29 Nov 2007 10:16:12 +0100 + pbuilder (0.176) unstable; urgency=low [ Loic Minier ] - * Do not install recommends in pbuilder-satisfydepends-aptitude. - explicitly add -o APT::Install-Recommends=false + * Do not install recommends in pbuilder-satisfydepends-aptitude. + explicitly add -o APT::Install-Recommends=false [ Junichi Uekawa ] * Create /etc/apt/apt.conf.d just in case it doesn't exist. (Closes: @@ -1115,6 +1271,38 @@ -- Junichi Uekawa Wed, 21 Nov 2007 19:22:00 +0900 +pbuilder (0.174ubuntu2) hardy; urgency=low + + * Fix sed for pdebuild-internal to stop matching Original-Maintainer + field as an output file name. + + -- John Dong Sat, 27 Oct 2007 15:30:13 -0400 + +pbuilder (0.174ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + * debian/control: + - Prefer debootstrap over cdebootstrap. + - DebianMaintainerField. + - Remove rootstrap build-dependency. + * Makefile: + - Addded pbuilder-satisfydepends-gdebi + * pbuilder-buildpackage-funcs: + - always pass --chroot to the pbuilder-satisfydepends (needed for + pbuilder-satisfydepends-gdebi) + * pbuilderrc: + - Set default archive to "archive.ubuntu.com". + - Set default distribution to "hardy". + - Set Ubuntu components. + - Don't create a buildd variant by default. + - Use debootstrap rather than cdebootstrap. + * pbuilder-satisfydepends-gdebi: + - added alternative b-d resolver that should should speed up b-d + resolution quite a bit. + * Support for specifying components is now included in Debian. + + -- Adrien Cunin Sat, 27 Oct 2007 13:58:41 +0200 + pbuilder (0.174) unstable; urgency=low [ Junichi Uekawa ] @@ -1131,6 +1319,34 @@ -- Junichi Uekawa Thu, 25 Oct 2007 20:18:09 +0900 +pbuilder (0.173ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + * debian/control: + - Prefer debootstrap over cdebootstrap. + - DebianMaintainerField. + - Remove rootstrap build-dependency. + * Makefile: + - Addded pbuilder-satisfydepends-gdebi + * pbuilder-buildpackage-funcs: + - always pass --chroot to the pbuilder-satisfydepends (needed for + pbuilder-satisfydepends-gdebi) + * pbuilder-modules: + - Add support for multiple components. + * pbuilderrc: + - Set default archive to "archive.ubuntu.com". + - Set default distribution to "gutsy". + - Add comment about components. + - Don't create a buildd variant by default. + - Use debootstrap rather than cdebootstrap. + * pbuilderrc.5: + - Document support for multiple components. + * pbuilder-satisfydepends-gdebi: + - added alternative b-d resolver that should should speed up b-d + resolution quite a bit. + + -- Soren Hansen Fri, 19 Oct 2007 17:55:29 +0200 + pbuilder (0.173) unstable; urgency=low * documentation update: add svn-buildpackage example. @@ -1190,11 +1406,11 @@ * List amd64 in pbuilder-uml's Architectures; thanks Mattia Dongili. [ Junichi Uekawa ] - * pdebuild-internal now runs hooks A, B, C, and D. (closes: #342613) + * pdebuild-internal now runs hooks A, B, C, and D. (closes: #342613) * run dpkg-architecture inside chroot for pbuilder-satisfydepends-{aptitude,experimental} also. * build pbuilder-uml for amd64. - * C10shell, C11screen: install vim and less, and cd to the source + * C10shell, C11screen: install vim and less, and cd to the source directory per default. Much useful. * pbuilder-doc.xml: review documentation. * install PDF documentation. @@ -1213,7 +1429,7 @@ * fix man pages to have reference to pbuilder-doc.html, and fix home page address to point to alioth. * update debian/copyright - * fix C10shell script to work with the new 'tee' log mode. + * fix C10shell script to work with the new 'tee' log mode. (add '2> /dev/tty') (Closes: #426380) -- Junichi Uekawa Mon, 28 May 2007 22:47:21 +0900 @@ -1226,7 +1442,7 @@ * Documentation/pbuilder.xml: Improve documentation wordings. add more pbuilder-test documentation. * Use 'tee' to show output even in logged mode. - * trap SIGHUP as well as exit, and reorganize code around the change. + * trap SIGHUP as well as exit, and reorganize code around the change. (Closes: #425454) * Improve log file support thanks to request from Russ Allbery (Closes: #424717). @@ -1240,7 +1456,7 @@ * shut up lintian: specify debian/compat (4) instead of DH_COMPAT in debian/rules * shut up lintian about binnmuability. Use {source:Version} instead of Source-Version, according to http://wiki.debian.org/binNMU - + [ Loic Minier ] * Tune aptitude opts in pbuilder-satisfydepends-aptitude to handle complex dependencies in experimental, to support unsigned APT repositories, and to @@ -1260,7 +1476,7 @@ * remove CVS Id banners since they have no meaning on git trees. * pbuilder-uml: do not build for amd64, dependencies are not satisfied (yet). * pdebuild.1, pbuilder.8: --debbuildopts, --debootstrapopts documentation update. - + [ Loic Minier ] * New pbuilder-satisfydepends-aptitude resolver based on aptitude; based on an idea by Mike Hommey; closes: #337015. @@ -1435,7 +1651,7 @@ * fix pdebuild --help output (closes: #367133) * Support for new style architecture specifications (closes: #363193) Thanks to Peter Eisentraut for patch. - The support is currently disabled, until dpkg maintainers clarify the + The support is currently disabled, until dpkg maintainers clarify the situation. * pbuilder-doc.xml: update documentation to add an example snippet for using locally built packages from pbuilder. @@ -1466,7 +1682,7 @@ pbuilder (0.150) unstable; urgency=low - * chown logfiles so that logfiles are not owned by root all the time + * chown logfiles so that logfiles are not owned by root all the time (Closes: #341553). * Bug fix: "[changes default behavior] Fix logfile name to have .log appended if using --pkg-logfile", thanks to Christian Hammers @@ -1569,7 +1785,7 @@ * pbuilder-doc.xml: Document ccache support in FAQ (Closes: #178350). * Bug fix: "/usr/share/doc/pbuilder/examples/B90linda missing --force-yes option", thanks to qfunk (Closes: #340715). - Note: --allow-unauthenticated is probably a better option here, but + Note: --allow-unauthenticated is probably a better option here, but apt-get in sarge does not support it, we will revisit it after etch. * debconf compatibility level 4 * Bug fix: "pbuilder-buildpackage-funcs check for createbuilduser for @@ -1603,15 +1819,15 @@ - Document amd64-i386 usage in FAQ. (closes: #332737) - typo fix - document /etc/mtab inside chroot is a symbollic link. - + * update TODO file. - + * allow debootstrap or cdebootstrap as dependency. - check for debootstrap installation, and output meaningful error. This is a follow-up to (#323843, #324648) rationale: debootstrap has some more features and cdebootstrap, sometimes; and cdebootstrap is not ported to all architectures. - + [Matt Kraai] * If /proc is mounted, create a symbolic link from /etc/mtab to /proc/mounts. @@ -1632,7 +1848,7 @@ [Matt Kraai] * Don't add redundant group, passwd, and shadow entries for the build user. - + [Junichi Uekawa] * Document that --debug option preserves build place. If the following fails, the build directory will remain intact: @@ -1655,16 +1871,16 @@ * Change "exec" to "execute" in the description of the --save-after-exec option. [Junichi Uekawa] - * Change maintainers field to point to pbuilder-maint mailing list, and + * Change maintainers field to point to pbuilder-maint mailing list, and switch to using uploaders field. -- Junichi Uekawa Sat, 1 Oct 2005 13:27:44 +0900 pbuilder (0.132) unstable; urgency=low - * suppress warnings from find; it wants -maxdepth before any other + * suppress warnings from find; it wants -maxdepth before any other argument. (closes: #330848) - * Documentation update patch from Osamu Aoki to clarify about + * Documentation update patch from Osamu Aoki to clarify about configuration file priorities and issues associated with it. (closes: #325318) @@ -1673,8 +1889,8 @@ pbuilder (0.131) unstable; urgency=low * Document that pbuilder applies options from left-to-right. (closes: #324620) - * Document updates on pbuilder move to alioth; it's now - available in + * Document updates on pbuilder move to alioth; it's now + available in http://pbuilder.alioth.debian.org/ http://alioth.debian.org/projects/pbuilder @@ -1682,12 +1898,12 @@ pbuilder (0.130) unstable; urgency=low - * depend on cdebootstrap, and suggest debootstrap. You may alternatively use + * depend on cdebootstrap, and suggest debootstrap. You may alternatively use debootstrap, but the default is cdebootstrap. (closes: #323843, #324648) * cowdancer support improvement -- now passes testsuite. * Standards-version: 3.6.2 - * SHELL=/bin/bash is now exported in default configuration; + * SHELL=/bin/bash is now exported in default configuration; since setting that to 'zsh' and others will not always work inside the chroot (closes: #325184) @@ -1706,9 +1922,9 @@ - default pbuilderrc uses cdebootstrap - testsuite now tests both cdebootstrap and debootstrap - Depends on debootstrap or cdebootstrap. - * Initial support for --internal-chrootexec: + * Initial support for --internal-chrootexec: It is now possible to specify for example '--internal-chrootexec "chroot $BUILDPLACE cow-shell "'. - + -- Junichi Uekawa Wed, 17 Aug 2005 09:40:27 +0900 pbuilder (0.128) unstable; urgency=low @@ -1716,10 +1932,10 @@ * Add example framework to test package inside chroot - B92test-pkg - add debian/pbuilder-test/ directory to test pbuilder itself. - * Documentation/pbuilder-doc.xml: + * Documentation/pbuilder-doc.xml: - add reference on directory structure on pbuilder. - Add note on pbuilder-test - * Support '--distribution experimental'. + * Support '--distribution experimental'. "pbuilder: Please add support for experimental", thanks to Emanuele Rocca (Closes: #308813). and also support working with new apt-get by using --force-yes. @@ -1727,7 +1943,7 @@ * Feature enhancement: "pbuilder: Clean apt cache ", thanks to Daniel Schepler implement --autocleanaptcache option. (Closes: #185227). - * pdebuild now checks for unsupported command-line options. + * pdebuild now checks for unsupported command-line options. Bug fix: "pbuilder: pdebuild does not warn about --basetgz or --distribution", thanks to Matt Kraai (Closes: #305944). * man pages fixup: add \% for non-hyphenation (closes: #310656) @@ -1745,17 +1961,17 @@ pbuilder (0.127) unstable; urgency=low * pdebuild.1, pdebuild-user-mode-linux.1: --debsign-k requires key-id. - * save apt cache after running B hook in build target; so that + * save apt cache after running B hook in build target; so that we don't keep redownloading lintian/linda . (closes: #296999) -- Junichi Uekawa Fri, 22 Apr 2005 07:38:16 +0900 pbuilder (0.126) unstable; urgency=low - * Documentation/pbuilder-doc.xml: + * Documentation/pbuilder-doc.xml: Add documentation on why source.changes file is generated. Add documentation on what options are available for sponsoring. - * Add --debsign-k option to pdebuild to allow specifying the keyid + * Add --debsign-k option to pdebuild to allow specifying the keyid for signing the package; for sponsoring. (closes: #304849) -- Junichi Uekawa Sat, 16 Apr 2005 13:39:04 +0900 @@ -1779,7 +1995,7 @@ * save aptcache on pbuilder login/exec. (closes: #271600) * support --aptcache option. (closes: #295766) * clean build directory for pbuilder-uml. (closes: #297100) - * document save-after-login/exec flags in pbuilder --help output. + * document save-after-login/exec flags in pbuilder --help output. (closes: #296672) -- Junichi Uekawa Fri, 4 Mar 2005 13:34:51 +0900 @@ -1826,12 +2042,12 @@ pbuilder (0.118) unstable; urgency=low * --debbuildopts behavior change for pdebuild: - It is now: pdebuild --debbuildopts "xxx" + It is now: pdebuild --debbuildopts "xxx" It was: pdebuild --debbuildopts "xxx" -- --debbuildopts "xxx" (for internal pdebuild mode) pdebuild --debbuildopts "xxx" (for non-internal pdebuild mode) (closes: #278999) * pbuilder: --save-after-login, --save-after-exec options added. - NOTE: pbuilder-UML already has --uml-login-nocow option, which is + NOTE: pbuilder-UML already has --uml-login-nocow option, which is equivalent to this new feature. (closes: #275970, #275016) * buildresult dir creation is done after pkgname-logfile creation. @@ -1844,14 +2060,14 @@ pbuilder (0.117) unstable; urgency=HIGH - * Remove pbuilder-user-mode-linux package for the time being, until + * Remove pbuilder-user-mode-linux package for the time being, until such time that user-mode-linux package is properly restored into Debian. (closes: #276992) - - this is a task specially done for sarge release; to create a package + - this is a task specially done for sarge release; to create a package which does create pbuilder-uml, copy the files and rebuild: debian/rules-uml -> debian/rules debian/control-uml -> debian/control - + -- Junichi Uekawa Wed, 20 Oct 2004 08:15:40 +0900 pbuilder (0.116) unstable; urgency=low @@ -1860,7 +2076,7 @@ * Fix bugs reported by madduck * UML: versioned depends on user-mode-linux is removed, now depends on user-mode-linux so that packages with 'Provides:' can be used (closes: #275544) * 'pbuilder debuild' is implemented (closes: #275110) - * update docs on PS1 and 'debian_chroot' environmental variable introduced in newer bash package (closes: #275466) + * update docs on PS1 and 'debian_chroot' environmental variable introduced in newer bash package (closes: #275466) * Add notes on what cannot be bind-mounted (closes: #275113) * hook to pbuilder update (closes: #275016, #272353) @@ -1925,13 +2141,13 @@ pbuilder (0.107) unstable; urgency=low - * Document that pdebuild accepts pbuilder options as pdebuild + * Document that pdebuild accepts pbuilder options as pdebuild options but ignores them, in the manual page. (Closes: #255005). * Feature request, '--uml-login-nocow' : "pbuilder-uml: How about a "muckwith" option, login without cowdevice", from Paul Hampson (Closes: #251482). * Feature: Do not hardcodes rootstrap image size argument", thanks to Mike Markley (Closes: #252800). - * UML: Fix error message when --buildresult specified wrong directory + * UML: Fix error message when --buildresult specified wrong directory -- Junichi Uekawa Sat, 19 Jun 2004 11:27:10 +0900 @@ -1966,11 +2182,11 @@ * Implement --variant=buildd support, thanks for Daniel Schepler for the work on debootstrap side. - Note that this change does not affect user-mode-linux, since + Note that this change does not affect user-mode-linux, since user-mode-linux version uses rootstrap (closes: #154528) - require debootstrap version 0.2.29 or later - current unstable/sarge doesn't install, see #244227 for a debootstrap + current unstable/sarge doesn't install, see #244227 for a debootstrap workaround. * remove references to non-free and contrib from default apt.conf entry. If anyone has problems with this set-up, shout. But it's already configurable. @@ -1981,11 +2197,11 @@ pbuilder (0.101) unstable; urgency=low * Update documentation, minor fix in documentation. - * Add libc6 upgrade workaround script. - add + * Add libc6 upgrade workaround script. + add "--hookdir /usr/share/doc/pbuilder/examples/libc6workaround" for update command-line, until libc6 bug230008 is fixed. - + -- Junichi Uekawa Sat, 13 Mar 2004 12:00:59 +0900 pbuilder (0.100) unstable; urgency=low @@ -1999,7 +2215,7 @@ pbuilder (0.99) unstable; urgency=low - * Documentation update: + * Documentation update: - note apt-proxy is useful for caching the apt archives. - pbuilder create failure due to debootstrap needs to be fixed in debootstrap script side. * Fix B91dpkg-i to fix typo in script to get names of packages properly. @@ -2011,7 +2227,7 @@ pbuilder (0.98) unstable; urgency=low - * use dpkg-buildpackage in pdebuild-internal rather than debuild, and do not try to + * use dpkg-buildpackage in pdebuild-internal rather than debuild, and do not try to gpg-sign inside the chroot, which will always fail. * Document --use-pdebuild-internal in the documentation. @@ -2022,9 +2238,9 @@ * update installtest script * allow multiple --bindmounts option to be specified for multiple bind-mount operation. - * Support pdebuild which does not run debian/rules clean outside of - chroot. Set 'USE_PDEBUILD_INTERNAL=yes' to use it, or - --use-pdebuild-internal. It will not be the default yet, because + * Support pdebuild which does not run debian/rules clean outside of + chroot. Set 'USE_PDEBUILD_INTERNAL=yes' to use it, or + --use-pdebuild-internal. It will not be the default yet, because it changes the manner of operation drastically. - "pdebuild builds source package outside chroot" by Matt Kraai (Closes: #211230). @@ -2035,15 +2251,15 @@ pbuilder (0.96) unstable; urgency=low - * Update documentation + * Update documentation - Using debconf inside pbuilder. - Note in FAQ that /dev/null error comes from 'nodev' mount option. (closes: #223868) - - Note that execute_installtest.sh can be used for light-weight + - Note that execute_installtest.sh can be used for light-weight mass-install testing. * pbuilder execute: now passes on command-line arguments to the script. * pbuilder-user-mode-linux execute: ditto. - * examples/execute_installtest.sh: Tries to 'apt-get install' a package + * examples/execute_installtest.sh: Tries to 'apt-get install' a package and sees if it does install. * examples/execute_paramtest.sh: Just dumps the parameter. * pbuilder --debug option added, to do some kind of debugging when @@ -2066,7 +2282,7 @@ * pdebuild-user-mode-linux: support --configfile as pdebuild does. * Bug fix: "pbuilder: Trying to unmount dev/pts when not mounted", thanks to Chris Halls (Closes: #219941). - Reordered mount order so that /dev/pts and /dev mounts can be + Reordered mount order so that /dev/pts and /dev mounts can be specified at the same time. It might not be the real problem, but this seems like one big problem, at least. * Bug fix: "pbuilder: Error message: W: execute priv not set on file @@ -2077,9 +2293,9 @@ pbuilder (0.93) unstable; urgency=low - * Change pdebuild behavior: pass on --configfile option from + * Change pdebuild behavior: pass on --configfile option from pdebuild to pbuilder. - This is in response to: + This is in response to: "pbuilder: BUILDRESULT doesn't work in --configfile file", thanks to Brian May (Closes: #217748). @@ -2097,7 +2313,7 @@ pbuilder (0.91) unstable; urgency=low * Document --bindmounts option better. - * add suggestion to bindmounts option in the manual page, where it + * add suggestion to bindmounts option in the manual page, where it documented the dangers of bind-mounting. (Closes: #214290). @@ -2134,10 +2350,10 @@ M. Ucko (Closes: #203584). * create policy-rc.d inside chroot if it does not exist, to fix "start-stop-daemon should not start any daemon inside chroot" - (Closes: #165430) - * Testsuite is added to the source tree, to get some kind of automatic + (Closes: #165430) + * Testsuite is added to the source tree, to get some kind of automatic regression testing. - + -- Junichi Uekawa Wed, 24 Sep 2003 08:07:34 +0900 pbuilder (0.86) unstable; urgency=low @@ -2159,7 +2375,7 @@ pbuilder (0.84) unstable; urgency=low * README.Debian: update very outdated parts. - * change use of chown, supply group info when available. + * change use of chown, supply group info when available. Subject: BUILDRESULTUID and BUILDRESULTGID no longer work as numeric values From: Kenneth Pronovici (closes: #207392) @@ -2192,7 +2408,7 @@ /etc/mtab will be written to, if root runs pbuilder-user-mode-linux. * "pbuilder-user-mode-linux create" will run properly when --distribution is unset. - * Update documentation that user-mode-linux requires user to be in uml-net + * Update documentation that user-mode-linux requires user to be in uml-net group. -- Junichi Uekawa Fri, 15 Aug 2003 18:50:17 +0900 @@ -2206,7 +2422,7 @@ pbuilder (0.79) unstable; urgency=low - * Remove reference to lv from source code, it was only for debugging + * Remove reference to lv from source code, it was only for debugging purposes. (closes: #203732) * Mount / rw for user-mode-linux. From: Daniel Schepler @@ -2235,14 +2451,14 @@ pbuilder (0.76) unstable; urgency=low - * Read config file in pbuilder-user-mode-linux specified by + * Read config file in pbuilder-user-mode-linux specified by --configfile. Should indirectly address bugs on parameter parsing and config files (closes: #188273) * Update documentation FAQ section. - note that the warning message about LOGNAME being unset is currently safe. (closes: #187924) - - Document that it is not a good idea to conflict against an essential + - Document that it is not a good idea to conflict against an essential package and pbuilder doesn't particularly support it. (closes: #169223) - Document "Invalid cross-device link" and how to fix it (closes: #200103) * Update some manual pages to reflect the changes. @@ -2251,7 +2467,7 @@ pbuilder (0.75) unstable; urgency=low - * Update documentation to note that --configfile is useful for + * Update documentation to note that --configfile is useful for specifying distribution. * Update manual page to make it clear that --othermirror etc options are only really useful for pbuilder update and create. @@ -2262,16 +2478,16 @@ pbuilder (0.74) unstable; urgency=low * Support very old .dsc files which do not have Format: lines - (closes: #189691) + (closes: #189691) thanks Daniel Schepler -- Junichi Uekawa Sun, 20 Apr 2003 22:05:00 +0900 pbuilder (0.73) unstable; urgency=low - * versioned dependency on rootstrap 0.3.9-1 which handles newer + * versioned dependency on rootstrap 0.3.9-1 which handles newer user-mode-linux. - * Fix ordering of running D hooks; D hooks should be ran before + * Fix ordering of running D hooks; D hooks should be ran before checking build-dependency. Apparently broken since 0.67 -- Junichi Uekawa Sun, 20 Apr 2003 01:56:17 +0900 @@ -2286,7 +2502,7 @@ pbuilder (0.71) unstable; urgency=low * UML: Do not try to umount, it's going to kernel-panic anyway. - - this fixes the problem of 'cannot umount because daemons are using + - this fixes the problem of 'cannot umount because daemons are using /proc' -- Junichi Uekawa Tue, 8 Apr 2003 22:50:43 +0900 @@ -2322,15 +2538,15 @@ from suggestion of Barak Pearlmutter * fix typo in pbuilder.8 manual page (closes: #184049) from Tommaso Moroni - * make the code work with GNU readlink, which errors out when + * make the code work with GNU readlink, which errors out when "readlink -f " is called with non-existing filename. (closes: #183492, #184116) * Fix X hooks and rename them to E, and document them. They are ran after update/create. * unset LOGNAME for root-build cases, it was only fixed on - fakeroot builds. + fakeroot builds. thanks Barak Pearlmutter (closes: #183862) - * Apply patch from Daniel Schepler , + * Apply patch from Daniel Schepler , to support --preserve-buildplace (closes: #183605) -- Junichi Uekawa Mon, 10 Mar 2003 23:03:58 +0900 @@ -2356,7 +2572,7 @@ * Apply patch from Daniel Schepler , to improve speed of build-dep satisfying routine. (closes: #178552) - * UML: match hostname of UML to the host hostname, so that + * UML: match hostname of UML to the host hostname, so that "hostname -f " will reliably work. * use cp -p in copydsc (closes: #177839) @@ -2371,7 +2587,7 @@ pbuilder (0.62) unstable; urgency=low - * Do not rely on shell globbing for apt archive cache. + * Do not rely on shell globbing for apt archive cache. (closes: #176872), reported by "Michel Dänzer" . -- Junichi Uekawa Thu, 16 Jan 2003 16:14:31 +0900 @@ -2379,8 +2595,8 @@ pbuilder (0.61) unstable; urgency=low * UML: set hostname inside UML. - * UML: Add (almost) enough features to pbuilder-user-mode-linux - so that it can be ran from within pbuildd, and can be used as + * UML: Add (almost) enough features to pbuilder-user-mode-linux + so that it can be ran from within pbuildd, and can be used as an alternative to pbuilder - set exitcode according to pbuilder exit code. thanks to mdz for his hint. (closes: #175983) @@ -2429,19 +2645,19 @@ pbuilder (0.57) unstable; urgency=low * A new year release. - * Add an example pbuildd script for people who want to waste their CPU + * Add an example pbuildd script for people who want to waste their CPU cycles. * README.Debian: document pbuilder-doc.html. * pbuilder-doc.xml: New documentation in DocBook format. * Build-Depends-Indep on documentation. - + -- Junichi Uekawa Thu, 2 Jan 2003 14:51:19 +0900 pbuilder (0.56) unstable; urgency=low * Try using copy-on-write image in pbuilder-user-mode-linux. - * Add verbose output for compare-versions portions to make it explicit that - what version does not satisfy what version, so that it is more + * Add verbose output for compare-versions portions to make it explicit that + what version does not satisfy what version, so that it is more obvious. -- Junichi Uekawa Mon, 23 Dec 2002 22:11:01 +0900 @@ -2457,7 +2673,7 @@ pbuilder (0.54) unstable; urgency=low - * Fixed ordering of messages so that concurrent-building experience is + * Fixed ordering of messages so that concurrent-building experience is better. * Do not lock while extracting, it is not needed. (closes: #173038) @@ -2469,15 +2685,15 @@ * update README, to fix mistakes in text. (closes: #172905) * Standards-version: 3.5.8. * add an example of running dpkg -i after successful build, - and running bash when unsuccessful. + and running bash when unsuccessful. * fix D10tmp script. - + -- Junichi Uekawa Fri, 13 Dec 2002 21:53:14 +0900 pbuilder (0.52) unstable; urgency=low * Clarify pbuilder.8 documentation on the timing of hook "A". - * --auto-debsign option, to debsign the resulting package. + * --auto-debsign option, to debsign the resulting package. (closes: #165511), requested from Andrew Lau * --pkgname-logfile option, to allow creation of log files based on package name and version. (closes: #157791), requested from Michael Banck @@ -2517,7 +2733,7 @@ * Version-deps parser changed slightly. * unset LOGNAME. * Fix problems with DEBEMAIL and other things, that was discussed on -devel. - People are starting to upload packages using pbuilder, without testing. + People are starting to upload packages using pbuilder, without testing. I don't like that trend very much, but I really cannot stop them. -- Junichi Uekawa Wed, 30 Oct 2002 21:04:28 +0900 @@ -2547,7 +2763,7 @@ * hack HOME to the fakerooted user when fakerooting, to hopefully fool GNUStep builds, etc. - * Standards-Version: 3.5.7. + * Standards-Version: 3.5.7. * Build-dep on debhelper 4.1.0 or greater, which removed usr/doc symlink. * fix failure cases when initial *dsc file is invalid. * change pbuilder-uml to be i386 only. @@ -2584,11 +2800,11 @@ * Prevent kill from going wild :P (closes: #163358) Thanks for Daniel Kobras for noticing shell quoting problem * Update AUTHORS, and THANKS, and TODO files. - + -- Junichi Uekawa Sat, 5 Oct 2002 13:41:40 +0900 pbuilder (0.40) unstable; urgency=low - + * Add support for BUILDRESULTUID and BUILDRESULTGID so that UID and GID for build results can be specified. * Fix minor glitch with copying /etc files into the chroot @@ -2642,14 +2858,14 @@ pbuilder (0.34) unstable; urgency=low - * examples weren't installed. Thanks for noting that, + * examples weren't installed. Thanks for noting that, Chris Halls. (closes: #153868) -- Junichi Uekawa Tue, 23 Jul 2002 21:40:20 +0900 pbuilder (0.33) unstable; urgency=low - * Update documentation for pbuilder.8, and pbuilderrc.5 + * Update documentation for pbuilder.8, and pbuilderrc.5 * Remove spurious message pointed out by Jochen Voss. (closes: #152175) -- Junichi Uekawa Wed, 17 Jul 2002 15:45:50 +0900 @@ -2671,7 +2887,7 @@ pbuilder (0.30) unstable; urgency=low - * Check the .dsc parsing routine, which seems to get broken by some packages + * Check the .dsc parsing routine, which seems to get broken by some packages which contain the url: field. -- Junichi Uekawa Tue, 14 May 2002 12:18:31 +0900 @@ -2732,23 +2948,23 @@ pbuilder (0.24) unstable; urgency=low * hooks support is in place for build target now. Read pbuilder.1 - for details. Adding C00bash, which contains a line calling + for details. Adding C00bash, which contains a line calling #!/bin/bash bash < /dev/tty - will allow running bash inside the chroot. (closes: #134757) + will allow running bash inside the chroot. (closes: #134757) -- Junichi Uekawa Sun, 24 Feb 2002 20:37:35 +0900 pbuilder (0.23) unstable; urgency=low - * Cache is updated even when Build-Dep processing routine fails. + * Cache is updated even when Build-Dep processing routine fails. reported by Mark Brown (closes: #129053) * Fix update target to remove packages specified in REMOVEPACKAGES. - * Support building as non-root user, and using fakeroot inside - the chroot. + * Support building as non-root user, and using fakeroot inside + the chroot. * EXTRAPACKAGES takes effect within the build target. - * handle ( < Tue, 12 Feb 2002 01:03:53 +0900 @@ -2778,7 +2994,7 @@ * Accept "Noninteractive" like "noninteractive" as value of DEBIAN_FRONTEND, for compatibility with other (broken?) software. * Changed the dpkg-buildpackage -S invocation inside pdebuild. - It should be more friendly for dpkg-buildpackage and its intentions, and + It should be more friendly for dpkg-buildpackage and its intentions, and mostly backward compatible behavior. * added build-time logging data to pbuilder-buildpackage. @@ -2787,10 +3003,10 @@ pbuilder (0.20) unstable; urgency=low * "Really addressing some bugs" - * --othermirror option fixed. Thanks go to kov@debian.org for + * --othermirror option fixed. Thanks go to kov@debian.org for pointing that out (closes: #131726). - * --aptconfdir option. It is now possible to specify - --aptconfdir /etc/apt to use the system configs. + * --aptconfdir option. It is now possible to specify + --aptconfdir /etc/apt to use the system configs. (closes: #116115) * some minor fixes. * banner for version info is given in build target. @@ -2799,7 +3015,7 @@ pbuilder (0.19) unstable; urgency=low - * "I know that the debootstrap version in sid doesn't work. + * "I know that the debootstrap version in sid doesn't work. You need to fix the mistakes in debootstrap." release * Improved "pbuilder update/create/build" temp file cleaning process, so that in most cases it will be cleaned. In some conditions, temp @@ -2813,10 +3029,10 @@ pbuilder (0.18) unstable; urgency=low - * New version, "Trying to address some wishlists" + * New version, "Trying to address some wishlists" * Added usr/share/pbuilder/pbuilderrc for default configuration. * Apply $@ -> "$@" fix from Daniel Kobras. - * Apply the patch from Daniel Kobras for specifying options to + * Apply the patch from Daniel Kobras for specifying options to dpkg-buildpacakge invocation in pbuilder-buildpacakge. It should be possible to build binary-only uploads etc. (closes: #129221) @@ -2825,7 +3041,7 @@ pbuilder (0.17) unstable; urgency=low - * new version, "Documentation updates and cosmetic fixes". + * new version, "Documentation updates and cosmetic fixes". * pbuilder.1, pbuilderrc.5: update to document problem with file:/ URLs if specified as mirrorsite (pbuilder is about chroots) * debian/TODO: updated - notes on apt-move archives, and other things. @@ -2842,7 +3058,7 @@ pbuilder (0.16) unstable; urgency=low * pbuilder-modules: Fixed a typo, which made it to create a broken - sources.list if MIRRORSITE was not specified. + sources.list if MIRRORSITE was not specified. * pbuilder-modules: Shuffled the orderings so that OTHERMIRROR takes the priority. @@ -2902,16 +3118,16 @@ pbuilder (0.11) unstable; urgency=low * Fixing some minor glitch. pdebuild should be calling dpkg-buildpackage with -us -uc. - * changed pdebuild logic in obtaining version number, from using + * changed pdebuild logic in obtaining version number, from using grep/cut to sed. - * fixed build-conflicts logic. It failed when build-conflicted target did not + * fixed build-conflicts logic. It failed when build-conflicted target did not already exist inside chroot. * README.Debian is updated. - * Added a nonexistent package to Build-Conflicts of debian/control, so that + * Added a nonexistent package to Build-Conflicts of debian/control, so that it will be possible to catch such possible error. - * patch from fbiere@abacom.com, fixes build-dependency with + * patch from fbiere@abacom.com, fixes build-dependency with OR conditions. It used to try out all. (closes: #119541) - * Redundant "case" removed from pbuilder-createbasetgz. + * Redundant "case" removed from pbuilder-createbasetgz. (it was introduced in 0.10). Thanks go to Steve for pointing this out. (closes: #12057) @@ -2949,7 +3165,7 @@ * A new command "pdebuild" is introduced. It can be invoked from a Debian source tree, and builds the package within a chroot after gaining root privilages appropriately. - * added recommends: for fakeroot and sudo, since pdebuild requires + * added recommends: for fakeroot and sudo, since pdebuild requires them. -- Junichi Uekawa Sat, 3 Nov 2001 23:56:12 +0900 @@ -3027,7 +3243,7 @@ Please be warned, if you are upgrading, that "lilo" might be left on your chroot, which could potentially cause nasty damage. * added /var/cache/pbuilder/aptcache directory - * A bug with .dsc file parser which caused some annoying error messages + * A bug with .dsc file parser which caused some annoying error messages has been fixed. -- Junichi Uekawa Mon, 24 Sep 2001 00:12:47 +0900 @@ -3044,7 +3260,7 @@ * Updating notes on upstream page * moving routines around in arch-dep checker... hoping not to have broken anything. - * Handles provides: in build dependency, parsing apt-cache showpkg + * Handles provides: in build dependency, parsing apt-cache showpkg output for reverse-dependency, and randomly installing one of the available packages. * Now it seems to be able to build (or satisfy the build dependency of) @@ -3066,7 +3282,7 @@ * added login target to pbuilder, to allow for easy debugging. * fixed typo in apt-line generation * added an or-sign for build-dependency internal checker, and moving - over fully to the internal checker. Build dep checker does not support + over fully to the internal checker. Build dep checker does not support a Build depends with an or sign and a machine specification. Also it ignores the version preference. * change priority to extra, because it depends on an extra package. @@ -3090,3 +3306,4 @@ * Initial Release. -- Junichi Uekawa Mon, 27 Aug 2001 18:50:06 +0900 + diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/compat pbuilder-0.215+nmu4ubuntu1~ppa1/debian/compat --- pbuilder-0.223~ubuntu14.04.1/debian/compat 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/compat 2015-06-22 08:05:23.000000000 +0000 @@ -1 +1 @@ -9 +7 diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/control pbuilder-0.215+nmu4ubuntu1~ppa1/debian/control --- pbuilder-0.223~ubuntu14.04.1/debian/control 2016-01-24 17:44:26.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/control 2015-07-10 14:24:41.000000000 +0000 @@ -1,44 +1,53 @@ Source: pbuilder Section: devel Priority: extra -Maintainer: Debian pbuilder maintenance team -Uploaders: Mattia Rizzolo -Build-Depends: dblatex, - debconf | debconf-2.0, - debhelper (>= 9), +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian pbuilder maintenance team +Uploaders: Junichi Uekawa , + Loïc Minier , + Matt Kraai +Build-Depends: debhelper (>= 7), docbook-xsl, - ldp-docbook-xsl, + ldp-docbook-xsl (>= 0.0.20040321-0.1), + xsltproc, + dpkg-dev (>= 1.13.19), + dblatex, + debconf|debconf-2.0, po-debconf, po4a, - xsltproc -Standards-Version: 3.9.6 -Vcs-Git: https://anonscm.debian.org/git/pbuilder/pbuilder.git -Vcs-Browser: https://anonscm.debian.org/cgit/pbuilder/pbuilder.git -Testsuite: autopkgtest + locales +Standards-Version: 3.9.1 +XS-Debian-Vcs-Git: git://git.debian.org/git/pbuilder/pbuilder.git +XS-Debian-Vcs-Browser: http://git.debian.org/?p=pbuilder/pbuilder.git +XS-Testsuite: autopkgtest Package: pbuilder Architecture: all Multi-Arch: foreign -Depends: debootstrap | cdebootstrap, - dpkg-dev (>= 1.17.0), +Depends: coreutils (>= 4.5.8-1), + debootstrap | cdebootstrap, + dpkg-dev, + debianutils (>= 1.13.1), wget, ${misc:Depends} -Recommends: devscripts, - fakeroot, +Recommends: fakeroot, net-tools | iproute2, - sudo -Suggests: cowdancer, - gdebi-core + sudo, + devscripts, + aptitude +Suggests: pbuilder-uml, + gdebi-core, + cowdancer Homepage: http://pbuilder.alioth.debian.org Description: personal package builder for Debian packages pbuilder constructs a chroot system, and builds a package inside the - chroot. - It is an ideal system to use to check + chroot. + It is an ideal system to use to check that a package has correct build-dependencies. It uses apt extensively, and a local mirror, or a fast connection to a Debian mirror is ideal, but not necessary. . - "pbuilder create" uses debootstrap to create a chroot image. + "pbuilder create" uses debootstrap to create a chroot image. . "pbuilder update" updates the image to the current state of testing/unstable/whatever @@ -48,3 +57,26 @@ . pdebuild is a wrapper for Debian Developers, to allow running pbuilder just like "debuild", as a normal user. + +Package: pbuilder-uml +Architecture: i386 amd64 +Depends: rootstrap (>= 0.3.9-1), + user-mode-linux, + pbuilder (= ${source:Version}), + ${misc:Depends} +Description: user-mode-linux version of pbuilder + pbuilder-uml uses a User-mode-linux system, and builds Debian packages + inside the UML image. It is an ideal system to use to check + that a package has correct build-dependencies. + It uses apt extensively, and a local mirror, or a fast connection + to a Debian mirror is ideal, but not necessary. + . + Requires user-mode-linux to function correctly + . + "pbuilder-user-mode-linux create" uses rootstrap to create UML image + . + "pbuilder-user-mode-linux update" updates the image to the current state of + testing/unstable/whatever + . + "pbuilder-user-mode-linux build" takes a *.dsc file and builds a binary + in the UML diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/copyright pbuilder-0.215+nmu4ubuntu1~ppa1/debian/copyright --- pbuilder-0.223~ubuntu14.04.1/debian/copyright 2015-12-20 16:00:48.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/copyright 2015-06-22 16:04:04.000000000 +0000 @@ -3,9 +3,8 @@ Upstream-Contact: Junichi Uekawa Files: * -Copyright: 2001-2009 Junichi Uekawa - 2007-2010 Loïc Minier - 2015 Mattia Rizzolo +Copyright: Copyright 2001-2007 Junichi Uekawa + Copyright (C) 2010 Loïc Minier License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/dirs pbuilder-0.215+nmu4ubuntu1~ppa1/debian/dirs --- pbuilder-0.223~ubuntu14.04.1/debian/dirs 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/dirs 2015-06-22 08:05:23.000000000 +0000 @@ -0,0 +1,8 @@ +usr/bin +usr/sbin +usr/lib/pbuilder +var/cache/pbuilder +var/cache/pbuilder/result +var/cache/pbuilder/aptcache +var/cache/pbuilder/build +var/cache/pbuilder/ccache diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/doc-base pbuilder-0.215+nmu4ubuntu1~ppa1/debian/doc-base --- pbuilder-0.223~ubuntu14.04.1/debian/doc-base 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/doc-base 2015-06-22 08:05:23.000000000 +0000 @@ -0,0 +1,12 @@ +Document: pbuilder +Title: pbuilder user's manual +Author: Junichi Uekawa +Abstract: This manual documents pbuilder for users +Section: Debian + +Format: HTML +Index: /usr/share/doc/pbuilder/pbuilder-doc.html +Files: /usr/share/doc/pbuilder/pbuilder-doc.html + +Format: PDF +Files: /usr/share/doc/pbuilder/pbuilder-doc.pdf diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/docs pbuilder-0.215+nmu4ubuntu1~ppa1/debian/docs --- pbuilder-0.223~ubuntu14.04.1/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/docs 2015-06-22 08:05:23.000000000 +0000 @@ -0,0 +1,4 @@ +README +AUTHORS +THANKS +debian/TODO diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/gbp.conf pbuilder-0.215+nmu4ubuntu1~ppa1/debian/gbp.conf --- pbuilder-0.223~ubuntu14.04.1/debian/gbp.conf 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -[dch] -id-length = 0 diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/NEWS pbuilder-0.215+nmu4ubuntu1~ppa1/debian/NEWS --- pbuilder-0.223~ubuntu14.04.1/debian/NEWS 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/NEWS 2015-06-22 08:05:23.000000000 +0000 @@ -1,17 +1,3 @@ -pbuilder (0.216) experimental; urgency=medium - - The default build directory has been moved from /tmp/buildd to /build. - This both prevents tempering with /tmp (which is normally world-writable, and - as such a user could create the directory before pbuilder and thus owning it, - and then it could temper with the build process). See #789404 for more info. - Also this align pbuilder's behaviour to sbuild's making produced builds more - similar (and thus helping the reproducible builds effort). - - Please update your hook scripts to use the new directory or change it back - (discouraged) by setting the BUILDDIR configure option. - - -- Mattia Rizzolo Wed, 26 Aug 2015 12:56:57 +0000 - pbuilder (0.207) unstable; urgency=low The default configuration will now only install trusted packages. This diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.config pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.config --- pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.config 2016-01-14 21:35:12.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.config 2015-07-10 14:24:41.000000000 +0000 @@ -22,16 +22,20 @@ # if there is a custom file, then we shouldn't touch it if [ -f "$CONFFILE" ] ; then - # the file is already there, we won't update it unless the user - # explicitly asks us so. - db_input low pbuilder/rewrite || [ $? = 30 ] - db_go + CURRENTMIRROR=$(grep -E "^[ ]*MIRRORSITE=" "$CONFFILE" | sed 's#MIRRORSITE=##g') + if [ "$CURRENTMIRROR" ] ; then + db_input low pbuilder/rewrite || [ $? = 30 ] + db_go - db_get pbuilder/rewrite - [ "$RET" = "true" ] || exit 0 + db_get pbuilder/rewrite + [ "$RET" = "true" ] || exit 0 - # make sure latter calls do not overwrite stuff silently - db_set pbuilder/rewrite "false" + # make sure latter calls do not overwrite stuff silently + db_set pbuilder/rewrite "false" + else + # no MIRRORSITE line found in the pbuilderrc file + echo "MIRRORSITE=$PLACEHOLDER" >> "$CONFFILE" + fi else cat < "$CONFFILE" # this is your configuration file for pbuilder. @@ -56,9 +60,7 @@ SRCLISTDIR=/etc/apt/sources.list.d MIRRORSITE=$( ( [ -f /etc/apt/sources.list ] && cat /etc/apt/sources.list || true ; - for FILE in $(ls $SRCLISTDIR/*.list 2>/dev/null); do - [ ! -f "$FILE" ] || cat "$FILE"; - done || true ) \ + [ -f $SRCLISTDIR/*.sources.list ] && cat $SRCLISTDIR/*.sources.list || true ) \ | grep -E '^deb[[:space:]]+(ftp|http):' | head -n 1 | awk '{print $2;}' ) while [ -z "$MIRRORSITE" ] ; do @@ -68,7 +70,7 @@ # if the interface is non-interactive, still set a valid mirror if [ $RETCODE = 30 ] ; then - MIRRORSITE="http://httpredir.debian.org/debian" + MIRRORSITE="http://archive.ubuntu.com/ubuntu" else db_get pbuilder/mirrorsite MIRRORSITE="$RET" diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.dirs pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.dirs --- pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.dirs 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -var/cache/pbuilder/aptcache -var/cache/pbuilder/build -var/cache/pbuilder/ccache -var/cache/pbuilder/result diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.doc-base pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.doc-base --- pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.doc-base 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.doc-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Document: pbuilder -Title: pbuilder user's manual -Author: Junichi Uekawa -Abstract: This manual documents pbuilder for users -Section: Debian - -Format: HTML -Index: /usr/share/doc/pbuilder/pbuilder-doc.html -Files: /usr/share/doc/pbuilder/pbuilder-doc.html - -Format: PDF -Files: /usr/share/doc/pbuilder/pbuilder-doc.pdf diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.docs pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.docs --- pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.docs 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -AUTHORS -README -THANKS -debian/TODO diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.maintscript pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.maintscript --- pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.maintscript 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.maintscript 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -rm_conffile /etc/bash_completion.d/pbuilder 0.215+nmu4~ diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.manpages pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.manpages --- pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.manpages 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -debuild-pbuilder.1 -pbuilder.8 -pbuilderrc.5 -pdebuild.1 diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.postinst pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.postinst --- pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.postinst 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.postinst 2015-06-22 16:04:04.000000000 +0000 @@ -2,5 +2,8 @@ set -e . /usr/share/debconf/confmodule +dpkg-maintscript-helper rm_conffile \ + /etc/bash_completion.d/pbuilder 0.215+nmu4~ pbuilder -- "$@" + #DEBHELPER# exit 0 diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.postrm pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.postrm --- pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.postrm 2015-10-11 23:36:18.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.postrm 2015-06-22 16:04:04.000000000 +0000 @@ -9,5 +9,8 @@ fi fi +dpkg-maintscript-helper rm_conffile \ + /etc/bash_completion.d/pbuilder 0.215+nmu4~ pbuilder -- "$@" + #DEBHELPER# exit 0 diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.preinst pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.preinst --- pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.preinst 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.preinst 2015-06-22 16:04:04.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh +set -e + +dpkg-maintscript-helper rm_conffile \ + /etc/bash_completion.d/pbuilder 0.215+nmu4~ pbuilder -- "$@" + +#DEBHELPER# diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.templates pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.templates --- pbuilder-0.223~ubuntu14.04.1/debian/pbuilder.templates 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder.templates 2015-07-10 14:24:41.000000000 +0000 @@ -7,7 +7,7 @@ this information. If this attempt fails, you will be prompted again to insert some valid mirror information. . - Here is a valid mirror example: http://httpredir.debian.org/debian + Here is a valid mirror example: http://archive.ubuntu.com/ubuntu Template: pbuilder/nomirror Type: error diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/pbuilder-test/00_prepinstall pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder-test/00_prepinstall --- pbuilder-0.223~ubuntu14.04.1/debian/pbuilder-test/00_prepinstall 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder-test/00_prepinstall 2015-06-22 08:05:23.000000000 +0000 @@ -0,0 +1,4 @@ +#!/bin/bash +# Prepare and install packages used in the tests. + +apt-get install -y sudo diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/pbuilder-test/01_pbuilder_create pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder-test/01_pbuilder_create --- pbuilder-0.223~ubuntu14.04.1/debian/pbuilder-test/01_pbuilder_create 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder-test/01_pbuilder_create 2015-06-22 08:05:23.000000000 +0000 @@ -0,0 +1,3 @@ +#!/bin/bash +env -u COWDANCER_REUSE -u COWDANCER_ILISTFILE -u LD_PRELOAD \ + pbuilder create --distribution sid --debootstrap debootstrap diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/pbuilder-test/02_pbuilder_update pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder-test/02_pbuilder_update --- pbuilder-0.223~ubuntu14.04.1/debian/pbuilder-test/02_pbuilder_update 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder-test/02_pbuilder_update 2015-06-22 08:05:23.000000000 +0000 @@ -0,0 +1,4 @@ +#!/bin/bash +env -u COWDANCER_REUSE -u COWDANCER_ILISTFILE -u LD_PRELOAD \ +pbuilder update + diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/pbuilder-test/03_pbuilder_build pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder-test/03_pbuilder_build --- pbuilder-0.223~ubuntu14.04.1/debian/pbuilder-test/03_pbuilder_build 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder-test/03_pbuilder_build 2015-06-22 08:05:23.000000000 +0000 @@ -0,0 +1,12 @@ +#!/bin/bash + +mkdir /tmp/test-work +cd /tmp/test-work +cp /etc/apt/sources.list{,-} +sed 's/#deb-src/deb-src/' < /etc/apt/sources.list- > /etc/apt/sources.list +apt-get update +apt-get source dsh +env -u COWDANCER_REUSE -u COWDANCER_ILISTFILE -u LD_PRELOAD \ +pbuilder build dsh*dsc +cd dsh*/ +pdebuild diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/pbuilder-uml.files pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder-uml.files --- pbuilder-0.223~ubuntu14.04.1/debian/pbuilder-uml.files 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/pbuilder-uml.files 2015-06-22 08:05:23.000000000 +0000 @@ -0,0 +1,6 @@ +etc/pbuilder/pbuilder-uml.conf +usr/share/pbuilder/pbuilder-uml.conf +usr/bin/pbuilder-user-mode-linux +usr/bin/pdebuild-user-mode-linux +usr/lib/pbuilder/pbuilder-uml-checkparams +usr/lib/pbuilder/pdebuild-uml-checkparams \ No newline at end of file diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/ca.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/ca.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/ca.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/ca.po 2015-06-22 08:05:23.000000000 +0000 @@ -13,7 +13,6 @@ "PO-Revision-Date: 2008-05-11 17:03+0200\n" "Last-Translator: Jordà Polo \n" "Language-Team: Català \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -45,8 +44,8 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -msgstr "Un exemple de rèplica vàlida seria: http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "Un exemple de rèplica vàlida seria: http://cdn.debian.net/debian" #. Type: error #. Description diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/cs.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/cs.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/cs.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/cs.po 2015-06-22 08:05:23.000000000 +0000 @@ -11,7 +11,6 @@ "PO-Revision-Date: 2008-05-17 13:43+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" -"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -36,14 +35,14 @@ "information. If this attempt fails, you will be prompted again to insert " "some valid mirror information." msgstr "" -"Ponecháte-li pole prázdné, zkusím tuto informaci zjistit sám. Pokud se to " -"gnepovede, budete znovu dotázáni na zadání platného zrcadla." +"Ponecháte-li pole prázdné, zkusím tuto informaci zjistit sám. Pokud se to g" +"nepovede, budete znovu dotázáni na zadání platného zrcadla." #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -msgstr "Příklad platného zrcadla: http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "Příklad platného zrcadla: http://cdn.debian.net/debian" #. Type: error #. Description diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/da.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/da.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/da.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/da.po 2015-06-22 08:05:23.000000000 +0000 @@ -43,8 +43,8 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -msgstr "Her er et gyldigt spejleksempel: http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "Her er et gyldigt spejleksempel: http://cdn.debian.net/debian" #. Type: error #. Description diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/de.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/de.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/de.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/de.po 2015-06-22 08:05:23.000000000 +0000 @@ -10,7 +10,6 @@ "PO-Revision-Date: 2008-04-03 21:52+0200\n" "Last-Translator: Helge Kreutzmann \n" "Language-Team: de \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" @@ -43,10 +42,9 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" msgstr "" -"Ein Beispiel fr einen gltigen Spiegelserver: http://httpredir.debian.org/" -"debian" +"Ein Beispiel fr einen gltigen Spiegelserver: http://cdn.debian.net/debian" #. Type: error #. Description diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/es.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/es.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/es.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/es.po 2015-06-22 08:05:23.000000000 +0000 @@ -61,8 +61,8 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -msgstr "He aquí un ejemplo de una réplica válida: http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "He aquí un ejemplo de una réplica válida: http://cdn.debian.net/debian" #. Type: error #. Description diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/eu.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/eu.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/eu.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/eu.po 2015-06-22 08:05:23.000000000 +0000 @@ -11,7 +11,6 @@ "PO-Revision-Date: 2008-05-17 21:46+0200\n" "Last-Translator: xabier bilbao \n" "Language-Team: basque \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -27,8 +26,7 @@ #. Description #: ../pbuilder.templates:1001 msgid "Please enter the default mirror you want to be used by pbuilder." -msgstr "" -"Sartu mesedez pbuilder-ek lehenetsi gisa erabiltzea nahi duzun ispilu-gunea." +msgstr "Sartu mesedez pbuilder-ek lehenetsi gisa erabiltzea nahi duzun ispilu-gunea." #. Type: string #. Description @@ -38,16 +36,15 @@ "information. If this attempt fails, you will be prompted again to insert " "some valid mirror information." msgstr "" -"Eremu hau hutsik uzten baduzu, informazio hau automatikoki atzemateko saio " -"bat egingo da. Saio honek huts egiten baldin badu, berriro eskatuko zaizu " -"baliozko ispilu baten informazioa sartzeko." +"Eremu hau hutsik uzten baduzu, informazio hau automatikoki atzemateko " +"saio bat egingo da. Saio honek huts egiten baldin badu, berriro " +"eskatuko zaizu baliozko ispilu baten informazioa sartzeko." #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -msgstr "" -"Hau da baliozko ispilu baten adibidea: http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "Hau da baliozko ispilu baten adibidea: http://cdn.debian.net/debian" #. Type: error #. Description @@ -87,3 +84,4 @@ "Zure sistemak pbuilder konfigurazioa baduela dirudi. Aurrera jarraituz gero, " "baliteke pbuilder-en konfigurazio osoa edo zati bat baztertzea edo " "gainidaztea." + diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/fi.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/fi.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/fi.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/fi.po 2015-06-22 08:05:23.000000000 +0000 @@ -6,7 +6,6 @@ "PO-Revision-Date: 2008-05-20 22:26+0200\n" "Last-Translator: Esko Arajärvi \n" "Language-Team: Finnish \n" -"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -28,20 +27,14 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "" -"If you leave this field blank, there will be one attempt to autodetect this " -"information. If this attempt fails, you will be prompted again to insert " -"some valid mirror information." -msgstr "" -"Jos tämä kenttä jätetään tyhjäksi, yritetään tieto löytää kerran " -"automaattisesti. Jos tämä epäonnistuu, pyydetään kelvollista peiliä " -"uudelleen." +msgid "If you leave this field blank, there will be one attempt to autodetect this information. If this attempt fails, you will be prompted again to insert some valid mirror information." +msgstr "Jos tämä kenttä jätetään tyhjäksi, yritetään tieto löytää kerran automaattisesti. Jos tämä epäonnistuu, pyydetään kelvollista peiliä uudelleen." #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -msgstr "Esimerkki kelvollisesta peilistä: http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "Esimerkki kelvollisesta peilistä: http://cdn.debian.net/debian" #. Type: error #. Description @@ -52,9 +45,7 @@ #. Type: error #. Description #: ../pbuilder.templates:2001 -msgid "" -"Mirror information detection failed and the user provided no mirror " -"information." +msgid "Mirror information detection failed and the user provided no mirror information." msgstr "Peilitietojen etsintä epäonnistui, eikä käyttäjä antanut peilitietoja." #. Type: error @@ -72,9 +63,6 @@ #. Type: boolean #. Description #: ../pbuilder.templates:3001 -msgid "" -"Your system seems to have already pbuilder configuration. Proceeding might " -"discard or overwrite part or the entire pbuilder's configuration." -msgstr "" -"Järjestelmässä on jo pbuilder-asetukset. Jatkaminen saattaa hävittää tai " -"kirjoittaa yli osan tai kaikki pbuilderin aiemmista asetuksista." +msgid "Your system seems to have already pbuilder configuration. Proceeding might discard or overwrite part or the entire pbuilder's configuration." +msgstr "Järjestelmässä on jo pbuilder-asetukset. Jatkaminen saattaa hävittää tai kirjoittaa yli osan tai kaikki pbuilderin aiemmista asetuksista." + diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/fr.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/fr.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/fr.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/fr.po 2015-06-22 08:05:23.000000000 +0000 @@ -12,7 +12,6 @@ "PO-Revision-Date: 2008-04-01 11:59+0100\n" "Last-Translator: Fakhry Ezzat \n" "Language-Team: French \n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -44,8 +43,8 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -msgstr "Exemple de miroir valable : http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "Exemple de miroir valable : http://cdn.debian.net/debian" #. Type: error #. Description diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/gl.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/gl.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/gl.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/gl.po 2015-06-22 08:05:23.000000000 +0000 @@ -10,7 +10,6 @@ "PO-Revision-Date: 2008-05-13 20:51+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" -"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -42,9 +41,8 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -msgstr "" -"Velaquí un exemplo dunha réplica válida: http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "Velaquí un exemplo dunha réplica válida: http://cdn.debian.net/debian" #. Type: error #. Description diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/it.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/it.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/it.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/it.po 2015-06-22 08:05:23.000000000 +0000 @@ -45,8 +45,8 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -msgstr "Ecco un esempio di mirror valido: http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "Ecco un esempio di mirror valido: http://cdn.debian.net/debian" #. Type: error #. Description diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/ja.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/ja.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/ja.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/ja.po 2015-06-22 08:05:23.000000000 +0000 @@ -12,7 +12,6 @@ "PO-Revision-Date: 2008-03-07 00:13+0900\n" "Last-Translator: Junichi Uekawa \n" "Language-Team: Japanese \n" -"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -36,15 +35,13 @@ "If you leave this field blank, there will be one attempt to autodetect this " "information. If this attempt fails, you will be prompted again to insert " "some valid mirror information." -msgstr "" -"このフィールドを空白にするとこの情報を自動認識しようとします。もしそれが失敗" -"したら正しいミラーの情報を入力するように求められます。" +msgstr "このフィールドを空白にするとこの情報を自動認識しようとします。もしそれが失敗したら正しいミラーの情報を入力するように求められます。" #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -msgstr "正しいミラーの例としては： http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "正しいミラーの例としては： http://cdn.debian.net/debian" #. Type: error #. Description @@ -78,6 +75,4 @@ msgid "" "Your system seems to have already pbuilder configuration. Proceeding might " "discard or overwrite part or the entire pbuilder's configuration." -msgstr "" -"システムにはpbuilderの設定がすでに存在します。このまま進めると一部か全体の設" -"定を上書きしてしまう可能性があります。" +msgstr "システムにはpbuilderの設定がすでに存在します。このまま進めると一部か全体の設定を上書きしてしまう可能性があります。" diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/nl.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/nl.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/nl.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/nl.po 2015-06-22 08:05:23.000000000 +0000 @@ -11,10 +11,10 @@ "PO-Revision-Date: 2011-06-14 08:34+0200\n" "Last-Translator: Jeroen Schot \n" "Language-Team: Debian l10n Dutch \n" -"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nl\n" #. Type: string #. Description @@ -43,7 +43,7 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" msgstr "" "Dit is een geldig voorbeeld van een spiegelserver: http://cdn.debian.net/" "debian" diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/pt_BR.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/pt_BR.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/pt_BR.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/pt_BR.po 2015-06-22 08:05:23.000000000 +0000 @@ -47,9 +47,9 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" msgstr "" -"Este é um exemplo válido de espelho de rede: http://httpredir.debian.org/debian" +"Este é um exemplo válido de espelho de rede: http://cdn.debian.net/debian" #. Type: error #. Description diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/pt.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/pt.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/pt.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/pt.po 2015-06-22 08:05:23.000000000 +0000 @@ -11,7 +11,6 @@ "PO-Revision-Date: 2008-03-30 22:28+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" -"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -27,9 +26,7 @@ #. Description #: ../pbuilder.templates:1001 msgid "Please enter the default mirror you want to be used by pbuilder." -msgstr "" -"Por favor indique o mirror pré-definido que deseja que seja usado pelo " -"pbuilder." +msgstr "Por favor indique o mirror pré-definido que deseja que seja usado pelo pbuilder." #. Type: string #. Description @@ -40,15 +37,14 @@ "some valid mirror information." msgstr "" "Se deixar este campo vazio, irá ser feita uma tentativa de autodetectar esta " -"informação. Se esta tentativa falhar, você será de novo questionado a " -"indicar informação de algum mirror válido." +"informação. Se esta tentativa falhar, você será de novo questionado a indicar " +"informação de algum mirror válido." #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -msgstr "" -"Aqui está um exemplo de mirror válido: http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "Aqui está um exemplo de mirror válido: http://cdn.debian.net/debian" #. Type: error #. Description @@ -87,3 +83,4 @@ msgstr "" "O seu sistema parece já ter uma configuração de pbuider. Prosseguir poderá " "anular ou sobreescrever partes ou toda a configuração do pbuilder." + diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/ro.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/ro.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/ro.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/ro.po 2015-06-22 08:05:23.000000000 +0000 @@ -13,12 +13,10 @@ "PO-Revision-Date: 2008-03-06 22:19+0200\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: Romanian \n" -"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " -"20)) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n" "X-Generator: KBabel 1.11.4\n" #. Type: string @@ -31,8 +29,7 @@ #. Description #: ../pbuilder.templates:1001 msgid "Please enter the default mirror you want to be used by pbuilder." -msgstr "" -"Introduceți saitul-oglindă implicit pe care doriți să-l folosească pbuilder." +msgstr "Introduceți saitul-oglindă implicit pe care doriți să-l folosească pbuilder." #. Type: string #. Description @@ -49,9 +46,9 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -msgstr "" -"Iată un exemplu valid de sait-oglindă: http://httpredir.debian.org/debian" +#| msgid "Here is a valid mirror example: http://ftp.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "Iată un exemplu valid de sait-oglindă: http://cdn.debian.net/debian" #. Type: error #. Description @@ -91,3 +88,4 @@ "Sistemul pare să aibă deja o configurație pentru pbuilder. Continuarea cu " "această acțiune ar putea duce la ștergerea sau suprascrierea parțială sau " "totală a fișierului de configurare aparținând lui pbuilder." + diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/ru.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/ru.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/ru.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/ru.po 2015-06-22 08:05:23.000000000 +0000 @@ -11,13 +11,11 @@ "PO-Revision-Date: 2008-05-18 09:10+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" -"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: string #. Description @@ -29,8 +27,7 @@ #. Description #: ../pbuilder.templates:1001 msgid "Please enter the default mirror you want to be used by pbuilder." -msgstr "" -"Укажите сервер-зеркало, который будет использовать pbuilder по умолчанию." +msgstr "Укажите сервер-зеркало, который будет использовать pbuilder по умолчанию." #. Type: string #. Description @@ -47,8 +44,8 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -msgstr "Пример задания сервера-зеркала: http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "Пример задания сервера-зеркала: http://cdn.debian.net/debian" #. Type: error #. Description @@ -63,8 +60,8 @@ "Mirror information detection failed and the user provided no mirror " "information." msgstr "" -"Не удалось определить сервер-зеркало и пользователь также не ввёл эту " -"информацию." +"Не удалось определить сервер-зеркало и пользователь также " +"не ввёл эту информацию." #. Type: error #. Description @@ -85,5 +82,7 @@ "Your system seems to have already pbuilder configuration. Proceeding might " "discard or overwrite part or the entire pbuilder's configuration." msgstr "" -"Кажется, что в вашей системе уже выполнена настройка pbuilder. Продолжение " -"работы может стереть или изменить часть или всю настройку pbuilder." +"Кажется, что в вашей системе уже выполнена настройка pbuilder. " +"Продолжение работы может стереть или изменить часть или всю " +"настройку pbuilder." + diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/sk.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/sk.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/sk.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/sk.po 2015-06-22 08:05:23.000000000 +0000 @@ -13,10 +13,10 @@ "PO-Revision-Date: 2011-10-30 15:27+0100\n" "Last-Translator: Slavko \n" "Language-Team: slovenčina \n" -"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-POFile-SpellExtra: autotedekciu cdn pbuilder net debian\n" @@ -47,8 +47,8 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -msgstr "Tu je príklad platného zrkadla: http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "Tu je príklad platného zrkadla: http://cdn.debian.net/debian" #. Type: error #. Description diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/sr@latin.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/sr@latin.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/sr@latin.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/sr@latin.po 2015-06-22 08:05:23.000000000 +0000 @@ -10,7 +10,6 @@ "PO-Revision-Date: 011-07-24 HO:MI+ZONE\n" "Last-Translator: Zlatan Todoric \n" "Language-Team: Soon to come\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,9 +24,7 @@ #. Description #: ../pbuilder.templates:1001 msgid "Please enter the default mirror you want to be used by pbuilder." -msgstr "" -"Molivamo vas unesite podrazumijevanu internet lokaciju koju će koristiti " -"pbuilder." +msgstr "Molivamo vas unesite podrazumijevanu internet lokaciju koju će koristiti pbuilder." #. Type: string #. Description @@ -37,17 +34,14 @@ "information. If this attempt fails, you will be prompted again to insert " "some valid mirror information." msgstr "" -"Ako ovu opciju ostavite nepopunjenu, biće jedan pokušaj da se automatski " -"otkrijeova informacija. Ako ovaj pokušaj ne uspije, bićete ponovo upitani da " -"unesetevalidnu informaciju o internet lokaciji" - +"Ako ovu opciju ostavite nepopunjenu, biće jedan pokušaj da se automatski otkrije" +"ova informacija. Ako ovaj pokušaj ne uspije, bićete ponovo upitani da unesete" +"validnu informaciju o internet lokaciji" #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -msgstr "" -"Ovdje je primjer validne internet lokacije: http://httpredir.debian.org/" -"debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "Ovdje je primjer validne internet lokacije: http://cdn.debian.net/debian" #. Type: error #. Description @@ -62,9 +56,8 @@ "Mirror information detection failed and the user provided no mirror " "information." msgstr "" -"Pronalazak informacije o internet lokaciji je bezuspješno i korisnik " -"nijeunio informaciju o internet lokaciji." - +"Pronalazak informacije o internet lokaciji je bezuspješno i korisnik nije" +"unio informaciju o internet lokaciji." #. Type: error #. Description #: ../pbuilder.templates:2001 @@ -84,5 +77,5 @@ "Your system seems to have already pbuilder configuration. Proceeding might " "discard or overwrite part or the entire pbuilder's configuration." msgstr "" -"Vaš sistem pokazuje da već ima pbuilder podešavanja. Nastavljanjem može " -"odbacitiili zamijeniti dijelove ili čitavo pbuilder podešavanje." +"Vaš sistem pokazuje da već ima pbuilder podešavanja. Nastavljanjem može odbaciti" +"ili zamijeniti dijelove ili čitavo pbuilder podešavanje." diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/sr.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/sr.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/sr.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/sr.po 2015-06-22 08:05:23.000000000 +0000 @@ -10,7 +10,6 @@ "PO-Revision-Date: 2011-07-24 00:01+0100\n" "Last-Translator: Zlatan Todoric \n" "Language-Team: Soon to come\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,9 +24,7 @@ #. Description #: ../pbuilder.templates:1001 msgid "Please enter the default mirror you want to be used by pbuilder." -msgstr "" -"Моливамо вас унесите подразумијевану интернет локацију коју ће користити " -"pbuilder." +msgstr "Моливамо вас унесите подразумијевану интернет локацију коју ће користити pbuilder." #. Type: string #. Description @@ -37,17 +34,14 @@ "information. If this attempt fails, you will be prompted again to insert " "some valid mirror information." msgstr "" -"Ако ову опцију оставите непопуњену, биће један покушај да се аутоматски " -"откријеова информација. Ако овај покушај не успије, бићете поново упитани да " -"унесетевалидну информацију о интернет локацији." - +"Ако ову опцију оставите непопуњену, биће један покушај да се аутоматски открије" +"ова информација. Ако овај покушај не успије, бићете поново упитани да унесете" +"валидну информацију о интернет локацији." #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -msgstr "" -"Овдје је примјер валидне интернет локације: http://httpredir.debian.org/" -"debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "Овдје је примјер валидне интернет локације: http://cdn.debian.net/debian" #. Type: error #. Description @@ -62,9 +56,8 @@ "Mirror information detection failed and the user provided no mirror " "information." msgstr "" -"Проналазак информације о интернет локацији безуспјешно и корисник нијеунио " -"информацију о интернет локацији." - +"Проналазак информације о интернет локацији безуспјешно и корисник није" +"унио информацију о интернет локацији." #. Type: error #. Description #: ../pbuilder.templates:2001 @@ -84,5 +77,5 @@ "Your system seems to have already pbuilder configuration. Proceeding might " "discard or overwrite part or the entire pbuilder's configuration." msgstr "" -"Ваш систем показује да већ има pbuilder подешавања. Настављањем може " -"одбацитиили замијенити дијелове или читаво pbuilder подешавање." +"Ваш систем показује да већ има pbuilder подешавања. Настављањем може одбацити" +"или замијенити дијелове или читаво pbuilder подешавање." diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/sv.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/sv.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/sv.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/sv.po 2015-06-22 08:05:23.000000000 +0000 @@ -11,7 +11,6 @@ "PO-Revision-Date: 2008-11-22 22:25+0100\n" "Last-Translator: Martin Bagge \n" "Language-Team: swedish \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -44,9 +43,8 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -msgstr "" -"Exempelvis kan denna spegel användas: http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "Exempelvis kan denna spegel användas: http://cdn.debian.net/debian" #. Type: error #. Description diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/templates.pot pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/templates.pot --- pbuilder-0.223~ubuntu14.04.1/debian/po/templates.pot 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/templates.pot 2015-06-22 08:05:23.000000000 +0000 @@ -40,7 +40,7 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" msgstr "" #. Type: error diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/po/tr.po pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/tr.po --- pbuilder-0.223~ubuntu14.04.1/debian/po/tr.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/po/tr.po 2015-06-22 16:04:04.000000000 +0000 @@ -11,11 +11,11 @@ "PO-Revision-Date: 2014-08-01 17:11+0200\n" "Last-Translator: Mert Dirik \n" "Language-Team: Debian L10n Turkish \n" -"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.4\n" +"Language: tr\n" #. Type: string #. Description @@ -46,7 +46,7 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" msgstr "Geçerli bir yansı örneği şu şekildedir: http://http.debian.net/debian" #. Type: error diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/rules pbuilder-0.215+nmu4ubuntu1~ppa1/debian/rules --- pbuilder-0.223~ubuntu14.04.1/debian/rules 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/rules 2015-07-10 14:24:41.000000000 +0000 @@ -1,21 +1,65 @@ #!/usr/bin/make -f -export DH_VERBOSE=1 -%: - dh $@ +LOCALE_PATH := debian/tmplocale +LOCALE_NAME := en_US +LOCALE_CHARSET := UTF-8 -override_dh_clean: -ifneq ($(shell dpkg-vendor --derives-from ubuntu && echo true),true) - debconf-updatepo -else - sed "s#http://httpredir.debian.org/debian#http://archive.ubuntu.com/ubuntu#g" -i debian/po/* -r - sed "s#http://httpredir.debian.org/debian#http://archive.ubuntu.com/ubuntu#g" -i debian/pbuilder.templates - sed "s#http://httpredir.debian.org/debian#http://archive.ubuntu.com/ubuntu#g" -i debian/pbuilder.config - sed "s#http://httpredir.debian.org/debian#http://archive.ubuntu.com/ubuntu#g" -i pbuilderrc - sed "s/#DISTRIBUTION=sid/DISTRIBUTION=xenial/" -i pbuilderrc -endif +build: build-stamp +build-stamp: + dh_testdir + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + rm -rf $(LOCALE_PATH) + $(MAKE) clean dh_clean -override_dh_compress: - dh_compress -X.pdf +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + mkdir -p $(LOCALE_PATH) + localedef -i $(LOCALE_NAME) -c -f $(LOCALE_CHARSET) \ + -A /usr/share/locale/locale.alias --quiet \ + $(LOCALE_PATH)/$(LOCALE_NAME).$(LOCALE_CHARSET) + LOCPATH=$(LOCALE_PATH) LC_ALL=$(LOCALE_NAME).$(LOCALE_CHARSET) $(MAKE) check +endif + $(MAKE) install DESTDIR=$(CURDIR)/debian/pbuilder + dh_movefiles -ppbuilder-uml --sourcedir=debian/pbuilder + +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdocs -i + dh_installman pbuilder.8 pbuilderrc.5 pdebuild.1 debuild-pbuilder.1 + dh_installchangelogs -i + dh_installdebconf + dh_link -i + dh_compress -i -X.pdf + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build install + dh_testdir -s + dh_testroot -s + dh_installdocs -s + dh_installman -ppbuilder-uml pbuilder-user-mode-linux.1 pbuilder-uml.conf.5 pdebuild-user-mode-linux.1 + dh_installchangelogs -s + dh_link -s + dh_compress -s -X.pdf + dh_fixperms -s + dh_installdeb -s + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/tests/build_procenv pbuilder-0.215+nmu4ubuntu1~ppa1/debian/tests/build_procenv --- pbuilder-0.223~ubuntu14.04.1/debian/tests/build_procenv 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/tests/build_procenv 2015-07-10 14:24:41.000000000 +0000 @@ -0,0 +1,124 @@ +#!/bin/sh +set -e + +#--------------------------------------------------------------------- +# DEP-8 test for sbuild. +# +# Creates a sbuild chroot, builds a package, installs the resulting +# .deb, then runs the command provided by the .deb. +#--------------------------------------------------------------------- + +die() +{ + msg="$*" + echo "ERROR: $msg" >&2 + exit 1 +} + +# The package we'll ask sbuild to build (we know its buildable since +# it's already in the archive :-) +# +# The advantage of choosing this particular package being that it runs +# *itself* at the end of its build, which has the nice side-effect of +# exposing the full sbuild environment to those perusing the autopkgtest +# logs. +pkg=procenv +components="" + +dir=/var/cache/pbuilder/result + +# Avoid conflict with ADT +unset TMPDIR + +distro=$(lsb_release --id --short|tr '[A-Z]' '[a-z]' || :) +[ -z "$distro" ] && die "cannot establish distribution" + +host_release=$(lsb_release --codename --short || :) +[ -z "$host_release" ] && die "cannot establish release running on host" + +if [ "$distro" = ubuntu ] +then + # Build chroot for latest release. + release=$(distro-info --devel) + components="main universe" +elif [ "$distro" = debian ] +then + # Build chroot for latest stable release since + # sid may not be buildable on a particular day. + release=$(distro-info --stable) + components="main" +else + die "need to know where archive is for distro '$distro'" +fi + +# XXX: try to establish the correct archive to use. We used to hard-code +# the main debian+ubuntu archive urls. But that strategy is not reliable for +# Ubuntu atleast where some architectures are only available on +# http://ports.ubuntu.com/. However, we wish to avoid having to maintain +# a list of architectures for ports.ubuntu.com, hence this simple +# strategy - use the first remote entry in sources.list +url=$(grep -v "[ ]*#" /etc/apt/sources.list|grep http|head -1|awk '{print $2}') + +[ -z "$url" ] && die "cannot establish archive to use" + +# Have to redirect stderr to avoid ADT thinking the test has failed +# (the return code is still being checked, so this seems reasonable). +echo "INFO: Creating pbuilder buildd chroot for release '$release' from url '$url'" +pbuilder --create --debug \ + --distribution "$release" \ + --components "$components" \ + --mirror "$url" \ + --debootstrapopts --variant=buildd 2>&1 + +if [ ! -d "$dir" ] +then + echo "ERROR: cannot find directory $dir" >&2 + exit 1 +fi + +# Use '--download-only' to avoid unpack which generates a +# signature warning to stderr, causing this test to fail. +# Take care to download the package version for the release we will +# create the chroot for. +echo "INFO: Downloading source for package '$pkg' release '$release'" +apt-get source --download-only "$pkg/$release" + +dsc=$(ls ${pkg}*.dsc) + +echo "INFO: Building package '$pkg' for release '$release' from '$dsc'" +pbuilder --build --debug "$dsc" 2>&1 + +arch=$(dpkg --print-architecture 2>/dev/null) +[ -z "$arch" ] && die "cannot establish architecture" + +pkg_and_version=$(echo "$dsc"|sed 's/\.dsc$//g') +deb=${dir}/${pkg_and_version}_${arch}.deb + +# Do what we can to check if the .deb looks usable (since we may not +# be able to install it to test it properly) +echo "INFO: Listing information on '$deb'" +dpkg --info "$deb" + +echo "INFO: Listing contents of '$deb'" +dpkg --contents "$deb" + +extract="$ADTTMP/extract" +echo "INFO: Extracting '$deb' to '$extract'" +dpkg --extract "$deb" "$extract" + +if [ "$release" = "$host_release" ] +then + echo "INFO: Installing package '$pkg' from '$deb'" + dpkg -i "$deb" + + # run the command to prove the build worked but also to expose the + # auto-package-test environment used for this test. + cmd=$pkg + echo "INFO: Showing AutoPkgTest environment by running '$cmd' from package '$pkg'" + "$cmd" +else + echo "INFO: Not installing package '$pkg' as host release ('$host_release')" + echo "INFO: differs to release package is built for ('$release')" +fi + +echo "INFO: SUCCESS" diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/tests/build-procenv pbuilder-0.215+nmu4ubuntu1~ppa1/debian/tests/build-procenv --- pbuilder-0.223~ubuntu14.04.1/debian/tests/build-procenv 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/tests/build-procenv 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ -#!/bin/sh -set -e - -#--------------------------------------------------------------------- -# Creates a sbuild chroot, builds a package, installs the resulting -# .deb, then runs the command provided by the .deb. -#--------------------------------------------------------------------- - -die() -{ - msg="$*" - echo "ERROR: $msg" >&2 - exit 1 -} - -# The package we'll ask pbuilder to build (we know its buildable since -# it's already in the archive :-)) -# -# The advantage of choosing this particular package being that it runs -# *itself* at the end of its build. -pkg=procenv - -resultdir=/var/cache/pbuilder/result - -# Avoid conflict with ADT -unset TMPDIR - -distro=$(lsb_release --id --short|tr '[A-Z]' '[a-z]' || :) -[ -z "$distro" ] && die "cannot establish distribution" -arch=$(dpkg --print-architecture 2>/dev/null) -[ -z "$arch" ] && die "cannot establish architecture" -host_release=$(lsb_release --codename --short || :) -[ -z "$host_release" ] && die "cannot establish release running on host" - -if [ "$distro" = debian ] ; then - release=$(distro-info --testing) - components="main" - mirror="http://httpredir.debian.org/debian" - keyring="/usr/share/keyrings/debian-archive-keyring.gpg" -elif [ "$distro" = ubuntu ] ; then - case "$arch" in - amd64|i386) mirror="http://archive.ubuntu.com/ubuntu" ;; - *) mirror="http://ports.ubuntu.com" ;; - esac - release=$(distro-info --devel) - components="main universe" - keyring="/usr/share/keyrings/ubuntu-archive-keyring.gpg" -else - die "need to know where archive is for distro '$distro' on arch '$arch'" -fi - -# Have to redirect stderr to avoid ADT thinking the test has failed -# (the return code is still being checked, so this seems reasonable). -echo "INFO: Creating pbuilder chroot for release '$release'" -echo "+ pbuilder --create --debug --distribution '$release' --components '$components' --debootstrapopts --keyring='$keyring' --mirror '$mirror'" -pbuilder --create --debug \ - --distribution "$release" \ - --components "$components" \ - --debootstrapopts --keyring="$keyring" \ - --mirror "$mirror" 2>&1 - -if [ ! -d "$resultdir" ] ; then - die "cannot find directory $resultdir" -fi - -# Use '--download-only' to avoid unpack which generates a -# signature warning to stderr, causing this test to fail. -echo "INFO: Adding deb-src line in /etc/apt/sources.list for the '$release' release" -echo "deb-src $mirror $release $components" > /etc/apt/sources.list -apt-get -o APT::Sandbox::User=root update -echo "INFO: Downloading source for package '$pkg' release '$release'" -apt-get -o APT::Sandbox::User=root source --download-only "$pkg/$release" - -dsc=$(ls ${pkg}*.dsc) - -echo "INFO: Building package '$pkg' for release '$release' from '$dsc'" -pbuilder --build --debug "$dsc" 2>&1 - -pkg_and_version=$(echo "$dsc"|sed 's/\.dsc$//g') -deb=${resultdir}/${pkg_and_version}_${arch}.deb - -# Do what we can to check if the .deb looks usable (since we may not -# be able to install it to test it properly) -echo "INFO: Listing information on '$deb'" -dpkg --info "$deb" - -echo "INFO: Listing contents of '$deb'" -dpkg --contents "$deb" - -extract="$ADTTMP/extract" -echo "INFO: Extracting '$deb' to '$extract'" -dpkg --extract "$deb" "$extract" - -echo "INFO: Trying to install package '$pkg' from '$deb'" -echo "INFO: (this might not succeed, that's not a bug)" -if dpkg -i "$deb" 2>&1 ; then - # run the command to prove the build worked but also to expose the - # auto-package-test environment used for this test. - cmd=$pkg - echo "INFO: Showing AutoPkgTest environment by running '$cmd' from package '$pkg'" - "$cmd" -else - echo "INFO: The install step failed. This can be expected if the host release is different than our target." - echo "host release: $host_release" - echo "target release: $release" -fi - -echo "INFO: SUCCESS" diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/tests/control pbuilder-0.215+nmu4ubuntu1~ppa1/debian/tests/control --- pbuilder-0.223~ubuntu14.04.1/debian/tests/control 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/tests/control 2015-07-10 14:24:41.000000000 +0000 @@ -1,7 +1,5 @@ -Tests: unit-tests -Depends: @ -Restrictions: allow-stderr - -Tests: build-procenv -Depends: @, debian-keyring, distro-info, lsb-release, ubuntu-archive-keyring | ubuntu-keyring +Tests: build_procenv +Depends: @, debian-keyring, distro-info, lsb-release, haveged, + libnuma-dev [linux-i386 linux-amd64 linux-ia64 linux-mips linux-mipsel linux-powerpc linux-ppc64 linux-ppc64el linux-x32], + libcap-dev [linux-any], libselinux1-dev, libapparmor-dev Restrictions: needs-root diff -Nru pbuilder-0.223~ubuntu14.04.1/debian/tests/unit-tests pbuilder-0.215+nmu4ubuntu1~ppa1/debian/tests/unit-tests --- pbuilder-0.223~ubuntu14.04.1/debian/tests/unit-tests 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/debian/tests/unit-tests 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -#!/bin/sh - -set -e - -if [ -z "$TMPDIR" ]; then - if [ -n "$ADTTMP" ]; then - TMPDIR="$ADTTMP" - else - TMPDIR="$(mktemp -d --tmpdir=/tmp pbuilder-unit-tests-XXXXXXXXXX)" - fi -fi - -cp t/* "$TMPDIR" -export PBUILDER_TEST_VERBOSE="yes" -"$TMPDIR"/runtests.sh - -rm -r $TMPDIR diff -Nru pbuilder-0.223~ubuntu14.04.1/Documentation/Makefile pbuilder-0.215+nmu4ubuntu1~ppa1/Documentation/Makefile --- pbuilder-0.223~ubuntu14.04.1/Documentation/Makefile 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/Documentation/Makefile 2015-06-22 08:05:23.000000000 +0000 @@ -9,11 +9,10 @@ # the main XML file which is source to all documents MASTERXML=pbuilder-doc.xml -MASTERPOT=pbuilder-doc.po HTMLDOCS= pbuilder-doc.html pbuilder-doc.ja.html pbuilder-doc.fr.html pbuilder-doc.de.html ALIOTH_FILEHOSTING:=alioth.debian.org -all: $(MASTERPOT) $(HTMLDOCS) +all: $(HTMLDOCS) %.html: %.xml pbuilder-doc.xsl xsltproc pbuilder-doc.xsl $< > $@.tmp @@ -27,16 +26,13 @@ %.pdf: %.xml # requires dblatex package. - dblatex --tmpdir=docbuild $< + dblatex $< install: $(HTMLDOCS) pbuilder-doc.pdf install -d -m 755 -o root -g root $(DESTDIR)/usr/share/doc/pbuilder/ install -m 644 -o root -g root $(HTMLDOCS) $(DESTDIR)/usr/share/doc/pbuilder/ install -m 644 -o root -g root pbuilder-doc.pdf $(DESTDIR)/usr/share/doc/pbuilder/ -$(MASTERPOT): - po4a-gettextize -f docbook -m $(MASTERXML) -p $(MASTERPOT) - preview: pbuilder-doc.html mozilla-firefox -remote "openfile($(PWD)/$<)" @@ -45,9 +41,6 @@ clean: rm -fv \ - pbuilder-doc.de.po~ \ - pbuilder-doc.fr.po~ \ - pbuilder-doc.ja.po~ \ pbuilder-doc.pdf \ pbuilder-doc.glo \ pbuilder-doc.idx \ diff -Nru pbuilder-0.223~ubuntu14.04.1/Documentation/pbuilder-doc.de.po pbuilder-0.215+nmu4ubuntu1~ppa1/Documentation/pbuilder-doc.de.po --- pbuilder-0.223~ubuntu14.04.1/Documentation/pbuilder-doc.de.po 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/Documentation/pbuilder-doc.de.po 2015-06-22 08:05:23.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: pbuilder 0.199+nmu4\n" "Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n" -"POT-Creation-Date: 2015-08-17 15:33+0000\n" -"PO-Revision-Date: 2015-08-17 15:28+0000\n" +"POT-Creation-Date: 2013-03-02 16:37+0900\n" +"PO-Revision-Date: 2011-08-01 19:11+0100\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" "Language: de\n" @@ -44,11 +44,8 @@ #. type: Content of: #: pbuilder-doc.xml:11 -msgid "" -"This documentation is work in progress, it might be incomplete and outdated" -msgstr "" -"Diese Dokumentation ist noch in Bearbeitung und möglicherweise unvollständig " -"oder nicht mehr aktuell." +msgid "documentation in progress" +msgstr "Dokumentation in Entwicklung" #. type: Content of: #: pbuilder-doc.xml:14 @@ -3046,13 +3043,9 @@ #: pbuilder-doc.xml:1508 msgid "" "Current implementation of ccache support has several bugs, that CCACHEDIR " -"must be owned by the pbuilder build user, and parallel runs of pbuilder are " +"must be owned by the pbuilder build user, and parallel runs of pbuilder is " "not supported. Therefore it is not enabled by default." msgstr "" -"Die aktuelle Implementierung der ccache-Unterstützung hat einige Fehler, " -"nämlich dass CCACHEDIR dem pbuilder Builduser gehören muss und dass das " -"parallele Ausführen von pbuilder nicht unterstützt wird. Deshalb ist es " -"standardmäßig nicht eingeschaltet." #. type: Content of: #: pbuilder-doc.xml:1516 diff -Nru pbuilder-0.223~ubuntu14.04.1/Documentation/pbuilder-doc.fr.po pbuilder-0.215+nmu4ubuntu1~ppa1/Documentation/pbuilder-doc.fr.po --- pbuilder-0.223~ubuntu14.04.1/Documentation/pbuilder-doc.fr.po 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/Documentation/pbuilder-doc.fr.po 2015-07-10 14:24:41.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pbuilder-0.171\n" -"POT-Creation-Date: 2015-08-17 15:33+0000\n" +"POT-Creation-Date: 2013-03-02 16:37+0900\n" "PO-Revision-Date: 2008-05-07 00:28+0200\n" "Last-Translator: Vincent Bernat <bernat@luffy.cx>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -42,11 +42,11 @@ msgid "Usage and operations" msgstr "Mode d'emploi" +# type: Content of: <book><bookinfo><releaseinfo> #. type: Content of: <book><bookinfo><releaseinfo> #: pbuilder-doc.xml:11 -msgid "" -"This documentation is work in progress, it might be incomplete and outdated" -msgstr "" +msgid "documentation in progress" +msgstr "documentation en construction" #. type: Content of: <book><bookinfo><authorgroup><author><firstname> #: pbuilder-doc.xml:14 @@ -1041,8 +1041,8 @@ "Il est possible d'utiliser user-mode-linux en invoquant <command>pbuilder-" "user-mode-linux</command> plutôt que <command>pbuilder</command>. " "<command>pbuilder-user-mode-linux</command> ne nécessite pas les privilèges " -"du super-utilisateur et utilise la méthode <foreignphrase>copy-on-write " -"(COW)</foreignphrase> ce qui la rend plus rapide que le traditionnel " +"du super-utilisateur et utilise la méthode <foreignphrase>copy-on-write (COW)" +"</foreignphrase> ce qui la rend plus rapide que le traditionnel " "<command>pbuilder</command>." # type: Content of: <book><chapter><para> @@ -3191,7 +3191,7 @@ #: pbuilder-doc.xml:1508 msgid "" "Current implementation of ccache support has several bugs, that CCACHEDIR " -"must be owned by the pbuilder build user, and parallel runs of pbuilder are " +"must be owned by the pbuilder build user, and parallel runs of pbuilder is " "not supported. Therefore it is not enabled by default." msgstr "" @@ -3786,6 +3786,128 @@ "instantanés LVM, cowloop ou cowdancer permettront sans doute d'améliorer " "cette situation." +# type: Content of: <book><chapter><sect1><para> +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:123 +msgid "" +"<command>pbuilder update</command> will update the base.tgz. It will " +"extract the chroot, invoke <command>apt-get update</command> and " +"<command>apt-get dist-upgrade</command> inside the chroot, and then recreate " +"the base.tgz (the base tar-ball.)" +msgstr "" +"<command>pbuilder update</command> permet de mettre à jour le fichier base." +"tgz. Le contenu de ce dernier sera extrait, <command>apt-get update</" +"command> et <command>apt-get dist-upgrade</command> seront invoqués à " +"l'intérieur de l'environnement obtenu et le fichier base.tgz sera recréé." + +# type: Content of: <book><chapter><sect1><para> +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:271 +msgid "" +"<command>pbuilder</command> requires full root privilege when it is " +"satisfying the build-dependencies, but most packages do not need root " +"privilege to build, or even refused to build when they are built as root. " +"<command>pbuilder </command> can create a user which is only used inside " +"<command>pbuilder </command> and use that user id when building, and use the " +"<command>fakeroot</command> command when root privilege is required." +msgstr "" +"<command>pbuilder</command> nécessite les privilèges du super-utilisateur " +"pour satisfaire les dépendances de compilation mais la plupart des paquets " +"n'ont pas besoin de ces privilèges pour se construire, voire peuvent refuser " +"de se construire. <command>pbuilder</command> peut créer un utilisateur qui " +"sera utilisé uniquement pour <command>pbuilder</command> et effectuer la " +"construction des paquets sous cette identité. <command>fakeroot</command> " +"sera utilisé lorsque les privilèges du super-utilisateur seront requis." + +# type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> +#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> +#: pbuilder-doc.xml:426 +msgid "" +"Automatic install-remove-upgrade-remove-install-purge-upgrade-purge test-" +"suite (distributed as an example, <filename>B91dpkg-i</filename>), or just " +"check that everything installs somewhat (<filename>execute_installtest.sh</" +"filename>)." +msgstr "" +"Tester automatiquement la séquence install-remove-upgrade-remove-install-" +"purge-upgrade-purge test-suite (un exemple est fourni : <filename>B91dpkg-i</" +"filename>) ou juste vérifier que quelque chose est effectivement installé " +"(<filename>execute_installtest.sh</filename>)." + +# type: Content of: <book><chapter><sect1><para> +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:442 +#, fuzzy +msgid "" +"To use B92test-pkg script, first, add it to your hook directory. " +"<placeholder type=\"footnote\" id=\"0\"/>. The test files are shell scripts " +"placed in <filename>debian/pbuilder-test/NN_name</filename> (where NN is " +"number) following run-parts standard<placeholder type=\"footnote\" id=\"1\"/" +"> for file names. After a successful build, packages are first tested for " +"installation and removal, and then each test is ran inside the chroot. The " +"current directory is the top directory of the source-code. This means you " +"can expect to be able to use ./debian/ directory from inside your scripts." +msgstr "" +"</footnote> pour les noms de fichiers. Après une construction réussie, les " +"paquets sont d'abord testés en les installant et en les retirant puis chaque " +"test est exécuté dans l'image de base. Le répertoire courant est le " +"répertoire contenant les sources. Cela signifie que vous pouvez vous " +"attendre à pouvoir utiliser le répertoire ./debian/ depuis vos scripts." + +# type: Content of: <book><chapter><sect1><para> +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:463 +msgid "" +"Example scripts for use with pbuilder-test can be found in <filename>/usr/" +"share/doc/pbuilder/examples/pbuilder-test</filename>" +msgstr "" +"Des scripts d'exemples pour pbuilder-test ont été placés dans <filename>/usr/" +"share/doc/pbuilder/examples/pbuilder-test</filename>" + +# type: Content of: <book><chapter><sect1><para> +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:788 +msgid "" +"It is possible to invoke a shell session after a build failure. Example " +"hook script are provided as <filename>C10shell</filename> and " +"<filename>C11screen</filename> scripts. C10shell script will start bash " +"inside chroot, and C11screen script will start GNU screen inside the chroot." +msgstr "" +"Il est possible d'obtenir un shell après un problème de construction. Des " +"crochets d'exemple sont fournis sous les noms <filename>C10shell</filename> " +"et <filename>C11screen</filename>. Le script C10shell lancera bash dans " +"l'environnement de base tandis que C11screen utilisera GNU screen." + +# type: Content of: <book><chapter><title> +#. type: Content of: <book><chapter><title> +#: pbuilder-doc.xml:1409 +msgid "Experimental or wish-list features of pbuilder" +msgstr "Fonctionnalités expérimentales ou souhaitées de pbuilder" + +# type: Content of: <book><chapter><sect1><para> +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:1417 +msgid "" +"LVM2 has a useful snapshot function that features Copy-on-write images. " +"That could be used for <command>pbuilder</command> just as it can be used " +"for the user-mode-linux <command>pbuilder</command> port. lvmpbuilder " +"script in the examples directory implements such port. The scripts and " +"documentation can be found under <filename>/usr/share/doc/pbuilder/examples/" +"lvmpbuilder/</filename>" +msgstr "" +"LVM2 permet de créer des instantanés sous forme d'images « Copy-on-write ». " +"Cette fonctionnalité peut être utilisée aussi bien pour <command>pbuilder</" +"command> que pour le port pour user-mode-linux. Le script lvmpbuilder dans " +"le répertoire des exemples exploite une telle fonctionnalité. Les scripts et " +"la documentation associée se trouvent dans <filename>/usr/share/doc/pbuilder/" +"examples/lvmpbuilder/</filename>" + +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> +#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> +#: pbuilder-doc.xml:1612 +#, fuzzy +msgid "<filename>/run</filename>" +msgstr "Lien symbolique vers <filename>/proc/mounts</filename>." + # type: Content of: <book><chapter><sect1><title> #~ msgid "How to use ccache" #~ msgstr "Comment utiliser ccache" diff -Nru pbuilder-0.223~ubuntu14.04.1/Documentation/pbuilder-doc.ja.po pbuilder-0.215+nmu4ubuntu1~ppa1/Documentation/pbuilder-doc.ja.po --- pbuilder-0.223~ubuntu14.04.1/Documentation/pbuilder-doc.ja.po 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/Documentation/pbuilder-doc.ja.po 2015-07-10 14:24:41.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xxx\n" -"POT-Creation-Date: 2015-08-17 15:33+0000\n" +"POT-Creation-Date: 2013-03-02 16:37+0900\n" "PO-Revision-Date: 2008-06-27 15:35+0900\n" "Last-Translator: Junichi Uekawa <dancer@debian.org>\n" "Language-Team: Junichi Uekawa <dancer@debian.org>\n" @@ -44,11 +44,11 @@ msgid "Usage and operations" msgstr "利用と操作方法について" +# type: Content of: <book><bookinfo><releaseinfo> #. type: Content of: <book><bookinfo><releaseinfo> #: pbuilder-doc.xml:11 -msgid "" -"This documentation is work in progress, it might be incomplete and outdated" -msgstr "" +msgid "documentation in progress" +msgstr "草稿" #. type: Content of: <book><bookinfo><authorgroup><author><firstname> #: pbuilder-doc.xml:14 @@ -2721,7 +2721,7 @@ #: pbuilder-doc.xml:1508 msgid "" "Current implementation of ccache support has several bugs, that CCACHEDIR " -"must be owned by the pbuilder build user, and parallel runs of pbuilder are " +"must be owned by the pbuilder build user, and parallel runs of pbuilder is " "not supported. Therefore it is not enabled by default." msgstr "" @@ -3196,6 +3196,109 @@ "cowloop, or cowdancer is hoped to improve the situation somewhat." msgstr "" +# type: Content of: <book><chapter><sect1><para> +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:123 +msgid "" +"<command>pbuilder update</command> will update the base.tgz. It will " +"extract the chroot, invoke <command>apt-get update</command> and " +"<command>apt-get dist-upgrade</command> inside the chroot, and then recreate " +"the base.tgz (the base tar-ball.)" +msgstr "" +"<command>pbuilder update</command> コマンドが base.tgz を更新します。 chroot " +"を展開し、 <command>apt-get update</command> と <command>apt-get dist-" +"upgrade</command> を chroot 内部で実行し、base.tgz （ベースの tar 玉） を作成" +"します。" + +# type: Content of: <book><chapter><sect1><para> +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:271 +msgid "" +"<command>pbuilder</command> requires full root privilege when it is " +"satisfying the build-dependencies, but most packages do not need root " +"privilege to build, or even refused to build when they are built as root. " +"<command>pbuilder </command> can create a user which is only used inside " +"<command>pbuilder </command> and use that user id when building, and use the " +"<command>fakeroot</command> command when root privilege is required." +msgstr "" +"<command>pbuilder</command> は依存関係を充足させる際には root 権限を必要とし" +"ます、しかしほとんどのパッケージはビルド時に root 権限を必要とはせず、rootで" +"はビルドできないパッケージも一部存在します。<command>pbuilder </command> は " +"<command>pbuilder </command> 内部専用のユーザを作成し、そのユーザIDを利用して" +"ビルドを実行することができます。root権限が必要な時には<command>fakeroot</" +"command> コマンドを利用します。" + +# type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> +#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> +#: pbuilder-doc.xml:426 +msgid "" +"Automatic install-remove-upgrade-remove-install-purge-upgrade-purge test-" +"suite (distributed as an example, <filename>B91dpkg-i</filename>), or just " +"check that everything installs somewhat (<filename>execute_installtest.sh</" +"filename>)." +msgstr "" +"自動的にインストール・アップグレード・削除・インストール・パージ・アップグ" +"レード・パージするようなテスト(例として、<filename>B91dpkg-i</filename>が配布" +"されています)、もしくは全部インストールできることを確認する" +"(<filename>execute_installtest.sh</filename>)。" + +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:442 +msgid "" +"To use B92test-pkg script, first, add it to your hook directory. " +"<placeholder type=\"footnote\" id=\"0\"/>. The test files are shell scripts " +"placed in <filename>debian/pbuilder-test/NN_name</filename> (where NN is " +"number) following run-parts standard<placeholder type=\"footnote\" id=\"1\"/" +"> for file names. After a successful build, packages are first tested for " +"installation and removal, and then each test is ran inside the chroot. The " +"current directory is the top directory of the source-code. This means you " +"can expect to be able to use ./debian/ directory from inside your scripts." +msgstr "" + +# type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:463 +msgid "" +"Example scripts for use with pbuilder-test can be found in <filename>/usr/" +"share/doc/pbuilder/examples/pbuilder-test</filename>" +msgstr "" +"pbuilder-test を利用するスクリプト例は <filename>/usr/share/doc/pbuilder/" +"examples/pbuilder-test</filename>以下に配布されている。" + +# type: Content of: <book><chapter><sect1><para> +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:788 +msgid "" +"It is possible to invoke a shell session after a build failure. Example " +"hook script are provided as <filename>C10shell</filename> and " +"<filename>C11screen</filename> scripts. C10shell script will start bash " +"inside chroot, and C11screen script will start GNU screen inside the chroot." +msgstr "" + +# type: Content of: <book><chapter><title> +#. type: Content of: <book><chapter><title> +#: pbuilder-doc.xml:1409 +msgid "Experimental or wish-list features of pbuilder" +msgstr "実験的な pbuilder の wish-list 的な機能" + +# type: Content of: <book><chapter><sect1><para> +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:1417 +msgid "" +"LVM2 has a useful snapshot function that features Copy-on-write images. " +"That could be used for <command>pbuilder</command> just as it can be used " +"for the user-mode-linux <command>pbuilder</command> port. lvmpbuilder " +"script in the examples directory implements such port. The scripts and " +"documentation can be found under <filename>/usr/share/doc/pbuilder/examples/" +"lvmpbuilder/</filename>" +msgstr "" + +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> +#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> +#: pbuilder-doc.xml:1612 +msgid "<filename>/run</filename>" +msgstr "<filename>/run</filename>" + # type: Content of: <book><bookinfo><date> #~ msgid "2007-5-27" #~ msgstr "2007年5月27日" diff -Nru pbuilder-0.223~ubuntu14.04.1/Documentation/pbuilder-doc.po pbuilder-0.215+nmu4ubuntu1~ppa1/Documentation/pbuilder-doc.po --- pbuilder-0.223~ubuntu14.04.1/Documentation/pbuilder-doc.po 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/Documentation/pbuilder-doc.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,2653 +0,0 @@ -# SOME DESCRIPTIVE TITLE -# Copyright (C) YEAR Free Software Foundation, Inc. -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2015-11-15 15:32+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#. type: Attribute 'xml:lang' of: <book> -#: pbuilder-doc.xml:5 -msgid "en" -msgstr "" - -#. type: Content of: <book><bookinfo> -#: pbuilder-doc.xml:7 -msgid "<date>2007-5-27</date>" -msgstr "" - -#. type: Content of: <book><bookinfo><title> -#: pbuilder-doc.xml:8 -msgid "pbuilder User's Manual" -msgstr "" - -#. type: Content of: <book><bookinfo> -#: pbuilder-doc.xml:9 -msgid "<abbrev>pbuilder-doc</abbrev>" -msgstr "" - -#. type: Content of: <book><bookinfo><subtitle> -#: pbuilder-doc.xml:10 -msgid "Usage and operations" -msgstr "" - -#. type: Content of: <book><bookinfo><releaseinfo> -#: pbuilder-doc.xml:11 -msgid "This documentation is work in progress, it might be incomplete and outdated" -msgstr "" - -#. type: Content of: <book><bookinfo><authorgroup><author><firstname> -#: pbuilder-doc.xml:14 -msgid "Junichi" -msgstr "" - -#. type: Content of: <book><bookinfo><authorgroup><author><surname> -#: pbuilder-doc.xml:15 -msgid "Uekawa" -msgstr "" - -#. type: Content of: <book><chapter><title> -#: pbuilder-doc.xml:22 -msgid "Introducing pbuilder" -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:24 -msgid "Aims of pbuilder" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:26 -msgid "" -"<command>pbuilder</command> stands for Personal Builder, and it is an " -"automatic Debian Package Building system for personal development " -"workstation environments. <command>pbuilder</command> aims to be an " -"easy-to-setup system for auto-building Debian packages inside a clean-room " -"environment, so that it is possible to verify that a package can be built on " -"most Debian installations. The clean-room environment is achieved through " -"the use of a base chroot image, so that only minimal packages will be " -"installed inside the chroot." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:40 -msgid "" -"The Debian distribution consists of free software accompanied with source. " -"The source code within Debian's \"main\" section must build within Debian " -"\"main\", with only the explicitly specified build-dependencies installed." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:48 -msgid "" -"The primary aim of <command>pbuilder</command> is different from other " -"auto-building systems in Debian in that its aim is not to try to build as " -"many packages as possible. It does not try to guess what a package needs, " -"and in most cases it tries the worst choice of all if there is a choice to " -"be made." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:56 -msgid "" -"In this way, <command>pbuilder</command> tries to ensure that packages " -"tested against <command>pbuilder</command> will build properly in most " -"Debian installations, hopefully resulting in a good overall Debian " -"source-buildability." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:63 -msgid "" -"The goal of making Debian buildable from source is somewhat accomplished, " -"and has seen good progress. In the past age of Debian 3.0, there were many " -"problems when building from source. More recent versions of Debian is much " -"better." -msgstr "" - -#. type: Content of: <book><chapter><title> -#: pbuilder-doc.xml:71 -msgid "Using pbuilder" -msgstr "" - -#. type: Content of: <book><chapter><para> -#: pbuilder-doc.xml:73 -msgid "" -"There are several simple commands for operation. <command>pbuilder " -"create</command>, <command>pbuilder update</command>, and <command>pbuilder " -"build</command> commands are the typical commands used. Let us look at the " -"commands one by one." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:80 -msgid "Creating a base chroot image tar-ball" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:82 -msgid "" -"<command>pbuilder create</command> will create a base chroot image tar-ball " -"(base.tgz). All other commands will operate on the resulting base.tgz If " -"the Debian release to be created within chroot is not going to be \"sid\" " -"(which is the default), the distribution code-name needs to be specified " -"with the <command><option>--distribution</option></command> command-line " -"option." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><footnote><para> -#: pbuilder-doc.xml:94 -msgid "debootstrap or cdebootstrap can be chosen" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:93 -msgid "" -"<command>debootstrap</command> <placeholder type=\"footnote\" id=\"0\"/> is " -"used to create the bare minimum Debian installation, and then " -"build-essential packages are installed on top of the minimum installation " -"using <command>apt-get</command> inside the chroot." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><footnote><para> -#: pbuilder-doc.xml:109 -msgid "" -"The mirror site should preferably be a local mirror or a cache server, so as " -"not to overload the public mirrors with a lot of access. Use of tools such " -"as apt-proxy would be advisable." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:103 -msgid "" -"For fuller documentation of command-line options, see the pbuilder.8 manual " -"page. Some configuration will be required for " -"<filename>/etc/pbuilderrc</filename> for the mirror site <placeholder " -"type=\"footnote\" id=\"0\"/> to use, and proxy configuration may be required " -"to allow access through HTTP. See the pbuilderrc.5 manual page for details." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:122 -msgid "Updating the base.tgz" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:123 -msgid "" -"<command>pbuilder update</command> will update the base.tgz. It will " -"extract the chroot, invoke <command>apt-get update</command> and " -"<command>apt-get dist-upgrade</command> inside the chroot, and then recreate " -"the base.tgz (the base tar-ball)." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><footnote><para> -#: pbuilder-doc.xml:135 -msgid "" -"Only upgrading is supported. Debian does not generally support downgrading " -"(yet?)." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:130 -msgid "" -"It is possible to switch the distribution which the base.tgz is targeted at " -"at this point. Specify <command><option>--distribution " -"<parameter>sid</parameter></option> " -"<option>--override-config</option></command> to change the distribution to " -"sid. <placeholder type=\"footnote\" id=\"0\"/>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:140 pbuilder-doc.xml:172 -msgid "" -"For fuller documentation of command-line options, see the pbuilder.8 manual " -"page" -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:145 -msgid "Building a package using the base.tgz" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:147 -msgid "" -"To build a package inside the chroot, invoke <command>pbuilder build " -"<option>whatever.dsc</option></command>. <command>pbuilder</command> will " -"extract the base.tgz to a temporary working directory, enter the directory " -"with chroot, satisfy the build-dependencies inside chroot, and build the " -"package. The built packages will be moved to a directory specified with the " -"<command><option>--buildresult</option></command> command-line option." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:160 -msgid "" -"The <command><option>--basetgz</option></command> option can be used to " -"specify which base.tgz to use." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:164 -msgid "" -"<command>pbuilder</command> will extract a fresh base chroot image from " -"base.tgz. (base.tgz is created with <command>pbuilder create</command>, and " -"updated with <command>pbuilder update</command>). The chroot is populated " -"with build-dependencies by parsing debian/control and invoking " -"<command>apt-get</command>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:177 -msgid "Facilitating Debian Developers' typing, pdebuild" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:179 -msgid "" -"<command>pdebuild</command> is a little wrapper script that does the most " -"frequent of all tasks. A Debian Developer may try to do " -"<command>debuild</command>, and build a package, inside a Debian source " -"directory. <command>pdebuild</command> will allow similar control, and " -"allow package to be built inside the chroot, to check that the current " -"source tree will build happily inside the chroot." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:189 -msgid "" -"<command>pdebuild</command> calls <command>dpkg-source</command> to build " -"the source packages, and then invokes <command>pbuilder</command> on the " -"resulting source package. However, unlike debuild, the resulting deb files " -"will be found in the <command><option>--buildresult</option></command> " -"directory." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:197 -msgid "See the pdebuild.1 manual page for more details." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:200 -msgid "" -"There is a slightly different mode of operation available in " -"<command>pdebuild</command> since version 0.97. <command>pdebuild</command> " -"usually runs <command>debian/rules clean</command> outside of the chroot; " -"however, it is possible to change the behavior to run it inside the chroot " -"with the <command><option>--use-pdebuild-internal</option></command>. It " -"will try to bind mount the working directory inside chroot, and run " -"<command>dpkg-buildpackage</command> inside. It has the following " -"characteristics, and is not yet the default mode of operation." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:214 -msgid "" -"Satisfies build-dependency inside the chroot before creating source " -"package. (which is a good point that default <command>pdebuild</command> " -"could not do)." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:219 -msgid "The working directory is modified from inside the chroot." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:223 -msgid "" -"Building with <command>pdebuild</command> does not guarantee that it works " -"with <command>pbuilder</command>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:227 -msgid "" -"If making the source package fails, the session using the chroot is wasted " -"(chroot creation takes a bit of time, which should be improved with " -"cowdancer)." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:232 -msgid "" -"Does not work in the same manner as it used to; for example, " -"<command><option>--buildresult</option></command> does not have any effect." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:237 -msgid "The build inside chroot is ran with the current user outside chroot." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:243 -msgid "Configuration Files" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:245 -msgid "" -"It is possible to specify all settings by command-line options. However, for " -"typing convenience, it is possible to use a configuration file." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:250 -msgid "" -"<filename>/etc/pbuilderrc</filename> and " -"<filename>${HOME}/.pbuilderrc</filename> are read in when " -"<command>pbuilder</command> is invoked. The possible options are documented " -"in the pbuilderrc.5 manual page." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:257 -msgid "" -"It is useful to use <option>--configfile</option> option to load up a preset " -"configuration file when switching between configuration files for different " -"distributions." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:262 -msgid "" -"Please note <filename>${HOME}/.pbuilderrc</filename> supersede system " -"settings. Caveats is that if you have some configuration, you may need to " -"tweak the configuration to work with new versions of pbuilder when " -"upgrading." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:269 -msgid "Building packages as non-root inside the chroot" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:271 -msgid "" -"<command>pbuilder</command> requires full root privilege when it is " -"satisfying the build-dependencies, but most packages do not need root " -"privilege to build, or even refused to build when they are built as root. " -"<command>pbuilder</command> can create a user which is only used inside " -"<command>pbuilder</command> and use that user id when building, and use the " -"<command>fakeroot</command> command when root privilege is required." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:280 -msgid "" -"BUILDUSERID configuration option should be set to a value for a user id that " -"does not already exist on the system, so that it is more difficult for " -"packages that are being built with <command>pbuilder</command> to affect the " -"environment outside the chroot. When BUILDUSERNAME configuration option is " -"also set, <command>pbuilder</command> will use the specified user name and " -"fakeroot for building packages, instead of running as root inside chroot." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:289 -msgid "" -"Even when using the fakerooting method, <command>pbuilder</command> will run " -"with root privilege when it is required. For example, when installing " -"packages to the chroot, <command>pbuilder</command> will run under root " -"privilege." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:295 -msgid "" -"To be able to invoke <command>pbuilder</command> without being root, you " -"need to use user-mode-linux, as explained in <xref " -"linkend=\"pbuilder-uml\"/>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:301 -msgid "Using pbuilder for back-porting" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:303 -msgid "" -"<command>pbuilder</command> can be used for back-porting software from the " -"latest Debian distribution to the older stable distribution, by using a " -"chroot that contains an image of the older distribution, and building " -"packages inside the chroot. There are several points to consider, and due " -"to the following reasons, automatic back-porting is usually not possible, " -"and manual interaction is required:" -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:314 -msgid "" -"The package from the unstable distribution may depend on packages or " -"versions of packages which are only available in unstable. Thus, it may not " -"be possible to satisfy Build-Depends: on stable (without additional " -"backporting work)." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:321 -msgid "" -"The stable distribution may have bugs that have been fixed in unstable which " -"need to be worked around." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:324 -msgid "" -"The package in the unstable distribution may have problems building even on " -"unstable." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:330 -msgid "Mass-building packages" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:332 -msgid "" -"<command>pbuilder</command> can be automated, because its operations are " -"non-interactive. It is possible to run <command>pbuilder</command> through " -"multiple packages non-interactively. Several such scripts are known to " -"exist. Junichi Uekawa has been running such a script since 2001, and has " -"been filing bugs on packages that fail the test of " -"<command>pbuilder</command>. There were several problems with auto-building:" -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:343 -msgid "" -"Build-Dependencies need to install non-interactively, but some packages are " -"so broken that they cannot install without interaction (like postgresql)." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:348 -msgid "" -"When a library package breaks, or gcc/gcj/g++ breaks, or even bison, a large " -"number of build failures are reported. (gcj-3.0 which had no \"javac\", " -"bison which got more strict, etc.)" -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:354 -msgid "Some people were quite hostile against build failure reports." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:358 -msgid "" -"Most of the initial bugs have been resolved in the " -"<command>pbuilder</command> sweep done around 2002, but these transitional " -"problems which affect a large portion of Debian Archive do arise from time " -"to time. Regression tests have their values." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:364 -msgid "" -"A script that was used by Junichi Uekawa in the initial run is now included " -"in the <command>pbuilder</command> distribution, as " -"<command>pbuildd.sh</command>. It is available in " -"<filename>/usr/share/doc/pbuilder/examples/pbuildd/</filename> and its " -"configuration is in <filename>/etc/pbuilder/pbuildd-config.sh</filename>. " -"It should be easy enough to set up for people who are used to " -"<command>pbuilder</command>. It has been running for quite a while, and it " -"should be possible to set the application up on your system also. This " -"version of the code is not the most tested, but should function as a " -"starter." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:374 -msgid "To set up pbuildd, there are some points to be aware of." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:378 -msgid "" -"A file <filename>./avoidlist</filename> needs to be available with the list " -"of packages to avoid building." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:381 -msgid "" -"It will try building anything, even packages which are not aimed for your " -"architecture." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:385 -msgid "" -"Because you are running random build scripts, it is better to use the " -"fakeroot option of <command>pbuilder</command>, to avoid running the build " -"under root privilege." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:390 -msgid "" -"Because not all builds are guaranteed to finish in a finite time, setting a " -"timeout is probably necessary, or pbuildd may stall with a bad build." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:396 -msgid "" -"Some packages require a lot of disk space, around 2GB seems to be sufficient " -"for the largest packages for the time being. If you find otherwise, please " -"inform the maintainer of this documentation." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:404 -msgid "Auto-backporting scripts" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:406 -msgid "" -"There are some people who use <command>pbuilder</command> to automatically " -"back-port a subset of packages to the stable distribution." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:410 -msgid "" -"I would like some information on how people are doing it, I would appreciate " -"any feedback or information on how you are doing, or any examples." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:416 -msgid "Using pbuilder for automated testing of packages" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:418 -msgid "" -"<command>pbuilder</command> can be used for automated testing of packages. " -"It has the feature of allowing hooks to be placed, and these hooks can try " -"to install packages inside the chroot, or run them, or whatever else that " -"can be done. Some known tests and ideas:" -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:426 -msgid "" -"Automatic install-remove-install-purge-upgrade-remove-upgrade-purge " -"test-suite (distributed as an example, <filename>B91dpkg-i</filename>), or " -"just check that everything installs somewhat " -"(<filename>execute_installtest.sh</filename>)." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:431 -msgid "" -"Automatically running lintian (distributed as an example in " -"<filename>/usr/share/doc/pbuilder/examples/B90lintian</filename>)." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:435 -msgid "" -"Automatic debian-test of the package? The debian-test package has been " -"removed from Debian. A <command>pbuilder</command> implementation can be " -"found as debian/pbuilder-test directory, implemented through B92test-pkg " -"script." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><footnote><para> -#: pbuilder-doc.xml:444 -msgid "" -"It is possible to specify <command>--hookdir " -"/usr/share/doc/pbuilder/examples</command> command-line option to include " -"all example hooks as well." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><footnote><para> -#: pbuilder-doc.xml:452 -msgid "See run-parts(8). For example, no '.' in file names!" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:442 -msgid "" -"To use B92test-pkg script, first, add it to your hook directory. " -"<placeholder type=\"footnote\" id=\"0\"/>. The test files are shell scripts " -"placed in <filename>debian/pbuilder-test/NN_name</filename> (where NN is a " -"number) following run-parts standard<placeholder type=\"footnote\" " -"id=\"1\"/> for file names. After a successful build, packages are first " -"tested for installation and removal, and then each test is ran inside the " -"chroot. The current directory is the top directory of the source-code. " -"This means you can expect to be able to use ./debian/ directory from inside " -"your scripts." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:463 -msgid "" -"Example scripts for use with pbuilder-test can be found in " -"<filename>/usr/share/doc/pbuilder/examples/pbuilder-test</filename>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:468 -msgid "Using pbuilder for testing builds with alternate compilers" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><screen> -#: pbuilder-doc.xml:484 -#, no-wrap -msgid "" -"EXTRAPACKAGES=\"pentium-builder gcc-3.2 g++-3.2\"\n" -"export DEBIAN_BUILDARCH=athlon\n" -"export DEBIAN_BUILDGCCVER=3.2" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:470 -msgid "" -"Most packages are compiled with <command>gcc</command> or " -"<command>g++</command> and using the default compiler version, which was gcc " -"2.95 for Debian GNU/Linux 3.0 (i386). However, Debian 3.0 was distributed " -"with other compilers, under package names such as <command>gcc-3.2</command> " -"for gcc compiler version 3.2. It was therefore possible to try compiling " -"packages against different compiler versions. " -"<command>pentium-builder</command> provides an infrastructure for using a " -"different compiler for building packages than the default gcc, by providing " -"a wrapper script called gcc which calls the real gcc. To use " -"<command>pentium-builder</command> in <command>pbuilder</command>, it is " -"possible to set up the following in the configuration: <placeholder " -"type=\"screen\" id=\"0\"/>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:489 -msgid "" -"It will instruct <command>pbuilder</command> to install the " -"<command>pentium-builder</command> package and also the GCC 3.2 compiler " -"packages inside the chroot, and set the environment variables required for " -"<command>pentium-builder</command> to function." -msgstr "" - -#. type: Content of: <book><chapter><title> -#: pbuilder-doc.xml:497 -msgid "Using User-mode-linux with pbuilder" -msgstr "" - -#. type: Content of: <book><chapter><para> -#: pbuilder-doc.xml:499 -msgid "" -"It is possible to use user-mode-linux by invoking " -"<command>pbuilder-user-mode-linux</command> instead of " -"<command>pbuilder</command>. <command>pbuilder-user-mode-linux</command> " -"doesn't require root privileges, and it uses the copy-on-write (COW) disk " -"access method of <command>User-mode-linux</command> which typically makes it " -"much faster than the traditional <command>pbuilder</command>." -msgstr "" - -#. type: Content of: <book><chapter><para> -#: pbuilder-doc.xml:509 -msgid "" -"<command>User-mode-linux</command> is a somewhat less proven platform than " -"the standard Unix tools which <command>pbuilder</command> relies on " -"(<command>chroot</command>, <command>tar</command>, and " -"<command>gzip</command>) but mature enough to support " -"<command>pbuilder-user-mode-linux</command> since its version 0.59. And " -"since then, <command>pbuilder-user-mode-linux</command> has seen a rapid " -"evolution." -msgstr "" - -#. type: Content of: <book><chapter><para> -#: pbuilder-doc.xml:520 -msgid "" -"The configuration of <command>pbuilder-user-mode-linux</command> goes in " -"three steps:" -msgstr "" - -#. type: Content of: <book><chapter><para><itemizedlist><listitem><para> -#: pbuilder-doc.xml:524 -msgid "Configuration of user-mode-linux" -msgstr "" - -#. type: Content of: <book><chapter><para><itemizedlist><listitem><para> -#: pbuilder-doc.xml:527 -msgid "Configuration of rootstrap" -msgstr "" - -#. type: Content of: <book><chapter><para><itemizedlist><listitem><para> -#: pbuilder-doc.xml:530 -msgid "Configuration of pbuilder-uml" -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:535 -msgid "Configuring user-mode-linux" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:537 -msgid "" -"user-mode-linux isn't completely trivial to set up. It would probably be " -"useful to acquaint yourself with it a bit before attempting to use " -"<command>rootstrap</command> or " -"<command>pbuilder-user-mode-linux</command>. For details, read " -"<filename>/usr/share/doc/uml-utilities/README.Debian</filename> and the " -"<command>user-mode-linux</command> documentation. (It's in a separate " -"package, user-mode-linux-doc.)" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:547 -msgid "" -"<command>user-mode-linux</command> requires the user to be in the uml-net " -"group in order to configure the network unless you are using slirp." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:552 -msgid "" -"If you compile your own kernel, you may want to verify that you enable " -"TUN/TAP support, and you might want to consider the SKAS patch." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:558 -msgid "Configuring rootstrap" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:560 -msgid "" -"<command>rootstrap</command> is a wrapper around debootstrap. It creates a " -"Debian disk image for use with UML. To configure rootstrap, there are " -"several requirements." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:567 -msgid "Install the rootstrap package." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para><screen> -#: pbuilder-doc.xml:573 -#, no-wrap -msgid "adduser dancer uml-net" -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:571 -msgid "" -"TUN/TAP only: add the user to the uml-net group to allow access to the " -"network <placeholder type=\"screen\" id=\"0\"/>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:577 -msgid "" -"TUN/TAP only: Check that the kernel supports the TUN/TAP interface, or " -"recompile the kernel if necessary." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para><screen> -#: pbuilder-doc.xml:588 -#, no-wrap -msgid "" -"transport=tuntap\n" -"interface=eth0\n" -"gateway=192.168.1.1\n" -"mirror=http://192.168.1.2:8081/debian\n" -"host=192.168.1.198\n" -"uml=192.168.1.199\n" -"netmask=255.255.255.0" -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:583 -msgid "" -"Set up <filename>/etc/rootstrap/rootstrap.conf</filename>. For example, if " -"the current host is 192.168.1.2, changing following entries to something " -"like this seems to work. <placeholder type=\"screen\" id=\"0\"/> Some " -"experimentation with configuration and running <command>rootstrap " -"~/test.uml</command> to actually test it would be handy." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:600 -msgid "" -"Using slirp requires less configuration. The default configuration comes " -"with a working example." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:607 -msgid "Configuring pbuilder-uml" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:609 -msgid "The following needs to happen:" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><itemizedlist><listitem><para> -#: pbuilder-doc.xml:612 -msgid "Install the pbuilder-uml package." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><itemizedlist><listitem><para><screen> -#: pbuilder-doc.xml:620 -#, no-wrap -msgid "" -"MY_ETH0=tuntap,,,192.168.1.198\n" -"UML_IP=192.168.1.199\n" -"UML_NETMASK=255.255.255.0\n" -"UML_NETWORK=192.168.1.0\n" -"UML_BROADCAST=255.255.255.255\n" -"UML_GATEWAY=192.168.1.1\n" -"PBUILDER_UML_IMAGE=\"/home/dancer/uml-image\"" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><itemizedlist><listitem><para> -#: pbuilder-doc.xml:616 -msgid "" -"Set up the configuration file " -"<filename>/etc/pbuilder/pbuilder-uml.conf</filename> in the following " -"manner. It will be different for slirp. <placeholder type=\"screen\" " -"id=\"0\"/> Also, it needs to match the rootstrap configuration." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><itemizedlist><listitem><para> -#: pbuilder-doc.xml:632 -msgid "" -"Make sure BUILDPLACE is writable by the user. Change BUILDPLACE in the " -"configuration file to a place where the user has access." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><itemizedlist><listitem><para> -#: pbuilder-doc.xml:638 -msgid "" -"Run <command>pbuilder-user-mode-linux <option>create --distribution " -"sid</option></command> to create the image." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><itemizedlist><listitem><para> -#: pbuilder-doc.xml:641 -msgid "Try running <command>pbuilder-user-mode-linux build</command>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:647 -msgid "Considerations for running pbuilder-user-mode-linux" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:649 -msgid "" -"<command>pbuilder-user-mode-linux</command> emulates most of " -"<command>pbuilder</command>, but there are some differences." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:655 -msgid "" -"<command>pbuilder-user-mode-linux</command> does not support all options of " -"<command>pbuilder</command> properly yet. This is a problem, and will be " -"addressed as specific areas are discovered." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:662 -msgid "" -"/tmp is handled differently inside " -"<command>pbuilder-user-mode-linux</command>. In " -"<command>pbuilder-user-mode-linux</command>, <filename>/tmp</filename> is " -"mounted as tmpfs inside UML, so accessing files under " -"<filename>/tmp</filename> from outside user-mode-linux does not work. It " -"affects options like <command><option>--configfile</option></command>, and " -"when trying to build packages placed under <filename>/tmp</filename>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:676 -msgid "Parallel running of pbuilder-user-mode-linux" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:678 -msgid "" -"To run <command>pbuilder-user-mode-linux</command> in parallel on a system, " -"there are a few things to bear in mind." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:683 -msgid "" -"The create and update methods must not be run when a build is in progress, " -"or the COW file will be invalidated." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para><screen> -#: pbuilder-doc.xml:694 -#, no-wrap -msgid "" -"for IP in 102 103 104 105; do\n" -" xterm -e pbuilder-user-mode-linux build --uml-ip 192.168.0.$IP \\\n" -" 20030107/whizzytex_1.1.1-1.dsc &\n" -"done" -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: pbuilder-doc.xml:688 -msgid "" -"If you are not using slirp, user-mode-linux processes which are running in " -"parallel need to have different IP addresses. Just trying to run the " -"<command>pbuilder-user-mode-linux</command> several times will result in " -"failure to access the network. But something like the following will work: " -"<placeholder type=\"screen\" id=\"0\"/> When using slirp, this problem does " -"not exist." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:704 -msgid "" -"Using pbuilder-user-mode-linux as a wrapper script to start up a virtual " -"machine" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:706 -msgid "" -"It is possible to use <command>pbuilder-user-mode-linux</command> for other " -"uses than just building Debian packages. <command>pbuilder-user-mode-linux " -"<option>login</option></command> will let a user use a shell inside the " -"user-mode-linux <command>pbuilder</command> base image, and " -"<command>pbuilder-user-mode-linux <option>execute</option></command> will " -"allow the user to execute a script inside the image." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:717 -msgid "" -"You can use the script to install ssh and add a new user, so that it is " -"possible to access inside the user-mode-linux through ssh." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:721 -msgid "" -"Note that it is not possible to use a script from <filename>/tmp</filename> " -"due to the way <command>pbuilder-user-mode-linux</command> mounts a tmpfs at " -"<filename>/tmp</filename>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:727 -msgid "" -"The following example script may be useful in starting a sshd inside " -"user-mode-linux." -msgstr "" - -#. type: Content of: <book><chapter><sect1><screen> -#: pbuilder-doc.xml:731 -#, no-wrap -msgid "" -"#!/bin/bash\n" -"\n" -"apt-get install -y ssh xbase-clients xterm\n" -"echo \"enter root password\"\n" -"passwd\n" -"cp /etc/ssh/sshd_config{,-}\n" -"sed 's/X11Forwarding.*/X11Forwarding yes/' /etc/ssh/sshd_config- > " -"/etc/ssh/sshd_config\n" -"\n" -"/etc/init.d/ssh restart\n" -"ifconfig\n" -"echo \"Hit enter to finish\"\n" -"read" -msgstr "" - -#. type: Content of: <book><chapter><title> -#: pbuilder-doc.xml:746 -msgid "Frequently asked questions" -msgstr "" - -#. type: Content of: <book><chapter><para> -#: pbuilder-doc.xml:749 -msgid "" -"Here, known problems and frequently asked questions are documented. This " -"portion was initially available in README.Debian file, but moved here." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:754 -msgid "pbuilder create fails" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:756 -msgid "" -"It often happens that <command>pbuilder</command> cannot create the latest " -"chroot. Try upgrading <command>pbuilder</command> and debootstrap. It is " -"currently only possible to create software that handles the past. Future " -"prediction is a feature which may be added later after we have become " -"comfortable with the past." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:763 -msgid "" -"There are people who occasionally back port debootstrap to stable versions; " -"hunt for them." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:767 -msgid "" -"When there are errors with the debootstrap phase, the debootstrap script " -"needs to be fixed. <command>pbuilder</command> does not provide a way to " -"work around debootstrap." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:773 -msgid "Directories that cannot be bind-mounted" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:775 -msgid "" -"Because of the way <command>pbuilder</command> works, there are several " -"directories which cannot be bind-mounted when running " -"<command>pbuilder</command>. The directories include " -"<filename>/tmp</filename>, <filename>/var/cache/pbuilder</filename>, and " -"system directories such as <filename>/etc</filename> and " -"<filename>/usr</filename>. The recommendation is to use directories under " -"the user's home directory for bind-mounts." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:786 -msgid "Logging in to pbuilder to investigate build failure" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:788 -msgid "" -"It is possible to invoke a shell session after a build failure. Example " -"hook scripts are provided as <filename>C10shell</filename> and " -"<filename>C11screen</filename> scripts. C10shell script will start bash " -"inside chroot, and C11screen script will start GNU screen inside the chroot." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:797 -msgid "Logging in to pbuilder to modify the environment" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:799 -msgid "" -"It is sometimes necessary to modify the chroot environment. " -"<command>login</command> will remove the contents of the chroot after " -"logout. It is possible to invoke a shell using hook scripts. " -"<command>pbuilder update</command> executes 'E' scripts, and a sample for " -"invoking a shell is provided as <filename>C10shell</filename>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><screen> -#: pbuilder-doc.xml:807 -#, no-wrap -msgid "" -"$ mkdir ~/loginhooks\n" -"$ cp C10shell ~/loginhooks/E10shell\n" -"$ sudo pbuilder update --hookdir ~/loginhooks/E10shell" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:811 -msgid "" -"It is also possible to add <option>--save-after-exec</option> and/or " -"<option>--save-after-login</option> options to the <command>pbuilder " -"login</command> session to accomplish the goal. It is possible to add the " -"<option>--uml-login-nocow</option> option to " -"<command>pbuilder-user-mode-linux <option>login</option></command> session " -"as well." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:821 -msgid "Setting BUILDRESULTUID for sudo sessions" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><screen> -#: pbuilder-doc.xml:824 -#, no-wrap -msgid "BUILDRESULTUID=$SUDO_UID" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:823 -msgid "" -"It is possible to set <placeholder type=\"screen\" id=\"0\"/> in pbuilderrc " -"to set the proper BUILDRESULTUID when using <command>sudo</command>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:829 -msgid "Notes on usage of $TMPDIR" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:831 -msgid "" -"If you are setting $TMPDIR to an unusual value, of other than " -"<filename>/tmp</filename>, you will find that some errors may occur inside " -"the chroot, such as <command>dpkg-source</command> failing." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><screen> -#: pbuilder-doc.xml:837 -#, no-wrap -msgid "export TMPDIR=/tmp" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:835 -msgid "" -"There are two options, you may install a hook to create that directory, or " -"set <placeholder type=\"screen\" id=\"0\"/> in pbuilderrc. Take your pick." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:841 -msgid "" -"An example script is provided as <filename>examples/D10tmp</filename> with " -"<command>pbuilder</command>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:846 -msgid "" -"Creating a shortcut for running <command>pbuilder</command> with a specific " -"distribution" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:848 -msgid "" -"When working with multiple chroots, it would be nice to work with scripts " -"that reduce the amount of typing. An example script " -"<filename>pbuilder-distribution.sh</filename> is provided as an example. " -"Invoking the script as <filename>pbuilder-squeeze</filename> will invoke " -"<command>pbuilder</command> with a squeeze chroot." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:857 -msgid "" -"Using environmental variables for running <command>pbuilder</command> for " -"specific distribution" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><footnote><para> -#: pbuilder-doc.xml:861 -msgid "This part of the documentation contributed by Andres Mejia" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><footnote><para> -#: pbuilder-doc.xml:863 -msgid "" -"This example was taken from a wiki (<ulink " -"url=\"https://wiki.ubuntu.com/PbuilderHowto\">https://wiki.ubuntu.com/PbuilderHowto</ulink>)." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:860 -msgid "" -"This section<placeholder type=\"footnote\" id=\"0\"/> describes briefly a " -"way to setup and use multiple pbuilder setups by creating a pbuilderrc " -"configuration in your home path (<filename>$HOME/.pbuilderrc</filename>) " -"and using the variable \"DIST\" when running pbuilder or pdebuild." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:871 -msgid "First, setup <filename>$HOME/.pbuilderrc</filename> to look like:" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><screen> -#: pbuilder-doc.xml:874 -#, no-wrap -msgid "" -"if [ -n \"${DIST}\" ]; then\n" -" BASETGZ=\"`dirname $BASETGZ`/$DIST-base.tgz\"\n" -" DISTRIBUTION=\"$DIST\"\n" -" BUILDRESULT=\"/var/cache/pbuilder/$DIST/result/\"\n" -" APTCACHE=\"/var/cache/pbuilder/$DIST/aptcache/\"\n" -"fi\n" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:873 pbuilder-doc.xml:889 pbuilder-doc.xml:930 pbuilder-doc.xml:936 pbuilder-doc.xml:951 pbuilder-doc.xml:1039 pbuilder-doc.xml:1190 pbuilder-doc.xml:1442 pbuilder-doc.xml:1453 -msgid "<placeholder type=\"screen\" id=\"0\"/>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:881 -msgid "" -"Then, whenever you wish to use pbuilder for a particular distro, assign a " -"value to \"DIST\" that is one of the distros available for Debian or any " -"Debian based distro you happen to be running (i.e. whatever is found under " -"/usr/lib/debootstrap/scripts)." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:887 -msgid "Here's some examples on running pbuilder or pdebuild:" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><screen> -#: pbuilder-doc.xml:890 -#, no-wrap -msgid "" -"DIST=gutsy sudo pbuilder create\n" -"\n" -"DIST=sid sudo pbuilder create --mirror http://http.us.debian.org/debian\n" -"\n" -"DIST=gutsy sudo pbuilder create \\\n" -" --othermirror \"deb http://archive.ubuntu.com/ubuntu gutsy universe " -"\\\n" -" multiverse\"\n" -"\n" -"DIST=gutsy sudo pbuilder update\n" -"\n" -"DIST=sid sudo pbuilder update --override-config --mirror \\\n" -"http://http.us.debian.org/debian \\\n" -"--othermirror \"deb http://http.us.debian.org/debian sid contrib " -"non-free\"\n" -"\n" -"DIST=gutsy pdebuild\n" -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:908 -msgid "Using special apt sources lists, and local packages" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:910 -msgid "" -"If you have some very specialized requirements on your apt setup inside " -"<command>pbuilder</command>, it is possible to specify that through the " -"<command><option>--othermirror</option></command> option. Try something " -"like: <command><option>--othermirror \"deb http://local/mirror stable " -"main|deb-src http://local/source/repository ./\"</option></command>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:919 -msgid "" -"To use the local file system instead of HTTP, it is necessary to do " -"bind-mounting. <command><option>--bindmounts</option></command> is a " -"command-line option useful for such cases." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:925 -msgid "" -"It might be convenient to use your built packages from inside the chroot. " -"It is possible to automate the task with the following configuration. " -"First, set up pbuilderrc to bindmount your build results directory." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><screen> -#: pbuilder-doc.xml:930 -#, no-wrap -msgid "BINDMOUNTS=\"/var/cache/pbuilder/result\"" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:933 -msgid "Then, add the following hook" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><screen> -#: pbuilder-doc.xml:937 -#, no-wrap -msgid "" -"# cat /var/cache/pbuilder/hooks/D70results\n" -"#!/bin/sh\n" -"cd /var/cache/pbuilder/result/\n" -"/usr/bin/dpkg-scanpackages . /dev/null > " -"/var/cache/pbuilder/result/Packages\n" -"/usr/bin/apt-get update" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:944 -msgid "" -"This way, you can use <filename>deb " -"file:/var/cache/pbuilder/result</filename>" -msgstr "" - -#. from http://ubuntuforums.org/archive/index.php/t-696820.html -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:947 -msgid "To add new apt-key inside chroot:" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><screen> -#: pbuilder-doc.xml:952 -#, no-wrap -msgid "" -"sudo pbuilder --login --save-after-login\n" -"# apt-key add - <<EOF\n" -"...public key goes here...\n" -"EOF\n" -"# logout\n" -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:960 -msgid "" -"How to get pbuilder to run apt-get update before trying to satisfy " -"build-dependency" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:962 -msgid "" -"You can use hook scripts for this. D scripts are run before satisfying " -"build-dependency." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:966 -msgid "" -"<ulink url=\"http://lists.debian.org/debian-devel/2006/05/msg00550.html\"> " -"This snippet comes from Ondrej Sury. </ulink>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:972 -msgid "Different bash prompts inside pbuilder login" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:974 -msgid "" -"To make distinguishing bash prompts inside <command>pbuilder</command> " -"easier, it is possible to set environment variables such as PS1 inside " -"<filename>pbuilderrc</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><footnote><para> -#: pbuilder-doc.xml:985 -msgid "Versions of bash from and before Debian 3.0" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:980 -msgid "" -"With versions of bash more recent than 2.05b-2-15, the value of the " -"debian_chroot variable, if set, is included in the value of PS1 (the Bash " -"prompt) inside the chroot. In prior versions of bash,<placeholder " -"type=\"footnote\" id=\"0\"/> setting PS1 in pbuilderrc worked." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:989 -msgid "example of debian_chroot" -msgstr "" - -#. type: Content of: <book><chapter><sect1><screen> -#: pbuilder-doc.xml:991 -#, no-wrap -msgid "\texport debian_chroot=\"pbuild$$\"" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:992 -msgid "example of PS1" -msgstr "" - -#. type: Content of: <book><chapter><sect1><screen> -#: pbuilder-doc.xml:994 -#, no-wrap -msgid "\texport PS1=\"pbuild chroot 32165 # \"" -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:997 -msgid "Creating a chroot reminder" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:999 -msgid "" -"Bash prompts will help you remember that you are inside a chroot. There are " -"other cases where you may want other signs of being inside a chroot. Check " -"out the <filename>examples/F90chrootmemo</filename> hook script. It will " -"create a file called <filename>/CHROOT</filename> inside your chroot." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1008 -msgid "Using /var/cache/apt/archives for the package cache" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1010 -msgid "" -"For the help of low-bandwidth systems, it is possible to use " -"<filename>/var/cache/apt/archives</filename> as the package cache. Just " -"specify it instead of the default " -"<filename>/var/cache/pbuilder/aptcache</filename>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1016 -msgid "" -"It is however not possible to do so currently with the user-mode-linux " -"version of <command>pbuilder</command>, because " -"<filename>/var/cache/apt/archives</filename> is usually only writable by " -"root." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1022 -msgid "" -"Use of dedicated tools such as apt-proxy is recommended, since caching of " -"packages would benefit the system outside the scope of " -"<command>pbuilder</command>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1028 -msgid "pbuilder back ported to stable Debian releases" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1030 -msgid "Currently stable back port of pbuilder is available at backports.org." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1034 -msgid "Warning about LOGNAME not being defined" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1036 -msgid "" -"You might see a lot of warning messages when running " -"<command>pbuilder</command>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><screen> -#: pbuilder-doc.xml:1040 -#, no-wrap -msgid "" -"\tdpkg-genchanges: warning: no utmp entry available and LOGNAME not defined; " -"using uid of process (1234)" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1043 -msgid "" -"It is currently safe to ignore this warning message. Please report back if " -"you find any problem with having LOGNAME unset. Setting LOGNAME caused a " -"few problems when invoking <command>chroot</command>. For example, dpkg " -"requires getpwnam to succeed inside chroot, which means LOGNAME and the " -"related user information have to be set up inside chroot." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1052 -msgid "Cannot Build-conflict against an essential package" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1054 -msgid "" -"<command>pbuilder</command> does not currently allow Build-Conflicts against " -"essential packages. It should be obvious that essential packages should not " -"be removed from a working Debian system, and a source package should not try " -"to force removal of such packages on people building the package." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1063 -msgid "Avoiding the \"ln: Invalid cross-device link\" message" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><screen> -#: pbuilder-doc.xml:1069 pbuilder-doc.xml:1202 -#, no-wrap -msgid "APTCACHEHARDLINK=no" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1065 -msgid "" -"By default, <command>pbuilder</command> uses hard links to manage the " -"<command>pbuilder</command> package cache. It is not possible to make hard " -"links across different devices; and thus this error will occur, depending on " -"your set up. If this happens, set <placeholder type=\"screen\" id=\"0\"/> " -"in your pbuilderrc file. Note that packages in <command>APTCACHE</command> " -"will be copied into chroot local cache, so plan for enough space on " -"<command>BUILDPLACE</command> device." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1077 -msgid "Using fakechroot" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1079 -msgid "" -"It is possible to use <command>fakechroot</command> instead of being root to " -"run <command>pbuilder</command>; however, several things make this " -"impractical. <command>fakechroot</command> overrides library loads and " -"tries to override default libc functions when providing the functionality of " -"virtual <command>chroot</command>. However, some binaries do no use libc to " -"function, or override the overriding provided by " -"<command>fakechroot</command>. One example is <command>ldd</command>. " -"Inside <command>fakechroot</command>, <command>ldd</command> will check the " -"library dependency outside of the chroot, which is not the expected " -"behavior." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1093 -msgid "" -"To work around the problem, debootstrap has a <option>--variant " -"fakechroot</option> option. Use that, so that ldd and ldconfig are " -"overridden." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1098 -msgid "" -"Make sure you have set your LD_PRELOAD path correctly, as described in the " -"fakechroot manpage." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1103 -msgid "Using debconf inside pbuilder sessions" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1105 -msgid "" -"To use debconf inside <command>pbuilder</command>, setting DEBIAN_FRONTEND " -"to <quote>readline</quote> in <filename>pbuilderrc</filename> should work. " -"Setting it to <quote>dialog</quote> should also work, but make sure whiptail " -"or dialog is installed inside the chroot." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1112 -msgid "nodev mount options hinder pbuilder activity" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1114 -msgid "" -"If you see messages such as this when building a chroot, you are mounting " -"the file system with the nodev option." -msgstr "" - -#. type: Content of: <book><chapter><sect1><screen> -#: pbuilder-doc.xml:1118 -#, no-wrap -msgid "\t/var/lib/dpkg/info/base-files.postinst: /dev/null: Permission denied" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1120 -msgid "" -"You will also have problems if you mount the file system with the noexec " -"option, or nosuid. Make sure you do not have these flags set when mounting " -"the file system for <filename>/var/cache/pbuilder</filename> or $BUILDPLACE." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1126 -msgid "This is not a problem when using <command>user-mode-linux</command>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1129 -msgid "" -"See <ulink url=\"http://bugs.debian.org/316135\"> 316135 </ulink> for " -"example." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1135 -msgid "pbuilder is slow" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1137 -msgid "" -"<command>pbuilder</command> is often slow. The slowest part of " -"<command>pbuilder</command> is extracting the tar.gz every time " -"<command>pbuilder</command> is invoked. That can be avoided by using " -"<command>pbuilder-user-mode-linux</command>. " -"<command>pbuilder-user-mode-linux</command> uses COW file system, and thus " -"does not need to clean up and recreate the root file system." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1146 -msgid "" -"<command>pbuilder-user-mode-linux</command> is slower in executing the " -"actual build system, due to the usual <command>user-mode-linux</command> " -"overhead for system calls. It is more friendly to the hard drive." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1152 -msgid "" -"<command>pbuilder</command> with cowdancer is also an alternative that " -"improves speed of pbuilder startup." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1157 -msgid "Using pdebuild to sponsor package" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1159 -msgid "" -"To sign a package marking for sponsorship, it is possible to " -"use<command><option> --auto-debsign</option></command> and " -"<command><option>--debsign-k</option></command> options of " -"<command>pdebuild</command>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><screen> -#: pbuilder-doc.xml:1165 -#, no-wrap -msgid "" -"\t<command>pdebuild <option>--auto-debsign </option> <option>--debsign-k " -"</option><parameter>XXXXXXXX</parameter></command>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1168 -msgid "Why is there a source.changes file in ../?" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1170 -msgid "" -"When running <command>pdebuild</command>, <command>pbuilder</command> will " -"run dpkg-buildpackage to create a Debian source package to pass it on to " -"<command>pbuilder</command>. File named XXXX_YYY_source.changes is what " -"remains from that process. It is harmless unless you try to upload it to " -"the Debian archive." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1176 -msgid "" -"This behavior is different when running through " -"<option>--use-pdebuild-internal</option>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1180 -msgid "amd64 and i386-mode" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1182 -msgid "" -"amd64 architectures are capable of running binaries in i386 mode. It is " -"possible to use <command>pbuilder</command> to run packages, using " -"<command>linux32</command> and <command>debootstrap " -"<option>--arch</option></command> option. Specifically, a command-line " -"option like the following will work." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><screen> -#: pbuilder-doc.xml:1191 -#, no-wrap -msgid "" -"<command>pbuilder create --distribution sid --debootstrapopts --arch " -"--debootstrapopts i386 \\\n" -" --basetgz /var/cache/pbuilder/base-i386.tgz --mirror " -"http://ftp.jp.debian.org/debian</command>\n" -"<command>linux32 pbuilder build --basetgz " -"/var/cache/pbuilder/base-i386.tgz</command>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1197 -msgid "Using tmpfs for buildplace" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1199 -msgid "" -"To improve speed of operation, it is possible to use tmpfs for pbuilder " -"build location. Mount tmpfs to " -"<filename>/var/cache/pbuilder/build</filename>, and set <placeholder " -"type=\"screen\" id=\"0\"/>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1206 -msgid "Using svn-buildpackage together with pbuilder" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><footnote><para> -#: pbuilder-doc.xml:1211 -msgid "" -"<ulink url=\"http://upsilon.cc/~zack/blog/posts/2007/09/svn-cowbuilder/\"> " -"Zack has posted an example on his blog. </ulink>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1208 -msgid "" -"pdebuild command can be used with svn-buildpackage --svn-builder " -"command-line option. <placeholder type=\"footnote\" id=\"0\"/>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><screen> -#: pbuilder-doc.xml:1217 -#, no-wrap -msgid "" -"alias svn-cowbuilder=\"svn-buildpackage --svn-builder='pdebuild --pbuilder " -"cowbuilder\"" -msgstr "" - -#. type: Content of: <book><chapter><title> -#: pbuilder-doc.xml:1224 -msgid "Troubleshooting and development" -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1226 -msgid "Reporting bugs" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1228 -msgid "" -"To report bugs, it would be important to have a log of what's going wrong. " -"Most of the time, adding a <command><option>--debug</option></command> " -"option and re-running the session should do the trick. Please send the log " -"of such session along with your problem to ease the debugging process." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1237 -msgid "Mailing list" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1239 -msgid "" -"There is a mailing list for <command>pbuilder</command> on alioth " -"(pbuilder-maint@lists.alioth.debian.org). You can subscribe through the " -"alioth web interface. <ulink " -"url=\"http://alioth.debian.org/mail/?group_id=30778\"> " -"http://alioth.debian.org/mail/?group_id=30778</ulink>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1247 -msgid "IRC Channel" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1249 -msgid "" -"For coordination and communication, IRC channel #pbuilder on irc.oftc.net is " -"used. Please log your intent there when you are going to start doing some " -"changes and committing some change." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1256 -msgid "Information for pbuilder developers" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1258 -msgid "" -"This section tries to document current development practices and how things " -"generally operate in development." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1262 -msgid "" -"<command>pbuilder</command> is co-maintained with resources provided by " -"Alioth. There is an Alioth project page at <ulink " -"url=\"http://alioth.debian.org/projects/pbuilder\"> " -"http://alioth.debian.org/projects/pbuilder</ulink>. Home page is also " -"available, at <ulink url=\"http://pbuilder.alioth.debian.org/\"> " -"http://alioth.debian.org/projects/pbuilder</ulink> which shows this text. " -"git repository is available through http, git, or (if you have an account on " -"alioth, ) ssh." -msgstr "" - -#. type: Content of: <book><chapter><sect1><screen> -#: pbuilder-doc.xml:1276 -#, no-wrap -msgid "" -"git-clone git://git.debian.org/git/pbuilder/pbuilder.git\n" -"git-clone http://git.debian.org/git/pbuilder/pbuilder.git\n" -"git-clone ssh://git.debian.org/git/pbuilder/pbuilder.git" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1280 -msgid "" -"Git commit message should have the first one line describing what the commit " -"does, formatted in the way debian/changelog is formatted because it is " -"copied verbatim to changelog via git-dch. The second line is empty, and the " -"rest should describe the background and extra information related to " -"implementation of the commit." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1288 -msgid "" -"Test-suites are available in <filename>./testsuite/</filename> directory. " -"Changes are expected not to break the test-suites. " -"<filename>./run-test.sh</filename> is a basic test-suite, which puts a " -"summary in <filename>run-test.log</filename>, and " -"<filename>run-test-cdebootstrap.log</filename>. " -"<filename>./run-test-regression.sh</filename> is a regression test-suite, " -"which puts the result in <filename>run-test-regression.log</filename>. " -"Currently, run-test.sh is ran automatically daily to ensure that pbuilder is " -"working." -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><title> -#: pbuilder-doc.xml:1297 -msgid "Directory structure of the testsuite" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><thead><row><entry> -#: pbuilder-doc.xml:1303 pbuilder-doc.xml:1526 pbuilder-doc.xml:1595 -msgid "Directory" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><thead><row><entry> -#: pbuilder-doc.xml:1304 pbuilder-doc.xml:1527 pbuilder-doc.xml:1596 -msgid "Meaning" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1309 -msgid "<filename>./testsuite/</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1310 -msgid "Directory for testsuite" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1313 -msgid "<filename>./testsuite/run-test.sh</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1314 -msgid "" -"Daily regression test to test against Debian Archive changes breaking " -"pbuilder." -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1317 -msgid "<filename>./testsuite/run-test.log</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1318 -msgid "A summary of testsuite" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1321 -msgid "<filename>./testsuite/normal/</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1322 -msgid "Directory for testsuite results of running pbuilder with debootstrap" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1325 -msgid "<filename>./testsuite/cdebootstrap/</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1326 -msgid "Directory for testsuite results of running pbuilder with cdebootstrap" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1329 -msgid "<filename>./testsuite/run-regression.sh</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1330 -msgid "" -"Regression testsuite, ran every time change is made to pbuilder to make sure " -"there is no regression." -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1333 -msgid "<filename>./testsuite/run-regression.log</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1334 -msgid "Summary of test result" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1337 -msgid "<filename>./testsuite/regression/BugID-*.sh</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1338 -msgid "Regression tests, exit 0 for success, exit 1 for failure" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1341 -msgid "<filename>./testsuite/regression/BugID-*</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1342 -msgid "Files used for the regression testsuite." -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1345 -msgid "<filename>./testsuite/regression/log/BugID-*.sh.log</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1346 -msgid "" -"Output of the regression test, output from the script is redirected by " -"run-regression.sh" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1352 -msgid "" -"When making changes, changes should be documented in the Git commit log. " -"git-dch will generate debian/changelog from the commit log. Make the first " -"line of your commit log meaningful, and add any bug-closing information " -"available. debian/changelog should not be edited directly unless when " -"releasing a new version." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1360 -msgid "" -"A TODO file is available in <filename>debian/TODO</filename>. It's mostly " -"not well-maintained, but hopefully it will be more up-to-date when people " -"start using it. emacs todoo-mode is used in editing the file." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1366 -msgid "" -"When releasing a new version of <command>pbuilder</command>, the version is " -"tagged with the git tag X.XXX (version number). This is done with " -"<command>./git-tag.sh</command> script available in the source tree." -msgstr "" - -#. type: Content of: <book><chapter><title> -#: pbuilder-doc.xml:1374 -msgid "Other uses of pbuilder" -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1376 -msgid "Using pbuilder for small experiments" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1378 -msgid "" -"There are cases when some small experimenting is required, and you do not " -"want to damage the main system, like when installing experimental library " -"packages, or compiling with experimental compilers. For such cases, the " -"<command>pbuilder login</command> command is available." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1385 -msgid "" -"<command>pbuilder login </command> is a debugging feature for " -"<command>pbuilder</command> itself, but it also allows users to have a " -"temporary chroot." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1389 -msgid "" -"Note that the chroot is cleaned after logging out of the shell, and mounting " -"file systems inside it is considered harmful." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1394 -msgid "Running little programs inside the chroot" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1396 -msgid "" -"To facilitate using <command>pbuilder</command> for other uses, " -"<command>pbuilder execute</command> is available. <command>pbuilder execute " -"</command> will take a script specified in the command-line argument, and " -"invoke the script inside the chroot." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1403 -msgid "" -"The script can be useful for sequences of operations such as installing ssh " -"and adding a new user inside the chroot." -msgstr "" - -#. type: Content of: <book><chapter><title> -#: pbuilder-doc.xml:1409 -msgid "Experimental or wishlist features of pbuilder" -msgstr "" - -#. type: Content of: <book><chapter><para> -#: pbuilder-doc.xml:1411 -msgid "" -"There are some advanced features, above that of the basic feature of " -"<command>pbuilder</command>, for some specific purposes." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1415 -msgid "Using LVM" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1417 -msgid "" -"LVM2 has a useful snapshot function that features Copy-on-write images. " -"That could be used for <command>pbuilder</command> just as it can be used " -"for the user-mode-linux <command>pbuilder</command> port. lvmpbuilder " -"script in the examples directory implements such port. The scripts and " -"documentation can be found under " -"<filename>/usr/share/doc/pbuilder/examples/lvmpbuilder/</filename>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1426 -msgid "Using cowdancer" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1428 -msgid "" -"<command>cowdancer</command> allows copy-on-write semantics on file system " -"using hard links and hard-link-breaking-on-write tricks. " -"<command>pbuilder</command> using <command>cowdancer</command> seems to be " -"much faster and it is one ideal point for improvement. " -"<command>cowbuilder</command>, a wrapper for <command>pbuilder</command> for " -"using <command>cowdancer</command> is available from " -"<command>cowdancer</command> package since 0.14" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1439 -msgid "Example command-lines for cowbuilder look like the following." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><screen> -#: pbuilder-doc.xml:1443 -#, no-wrap -msgid "" -"# cowbuilder --create --distribution sid\n" -"# cowbuilder --update --distribution sid\n" -"# cowbuilder --build XXX.dsc" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1448 -msgid "" -"It is also possible to use cowdancer with pdebuild command. Specify with " -"command-line option <option>--pbuilder</option> or set it in " -"PDEBUILD_PBUILDER configuration option." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><screen> -#: pbuilder-doc.xml:1454 -#, no-wrap -msgid "$ pdebuild --pbuilder cowbuilder" -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1458 -msgid "Using pbuilder without tar.gz" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1460 -msgid "" -"The <command><option>--no-targz</option></command> option of " -"<command>pbuilder</command> will allow usage of <command>pbuilder</command> " -"in a different way from conventional usage. It will try to use an existing " -"chroot, and will not try to clean up after working on it. It is an " -"operation mode more like <command>sbuild</command>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para><screen> -#: pbuilder-doc.xml:1474 -#, no-wrap -msgid "" -"# pbuilder create --distribution lenny --no-targz --basetgz /chroot/lenny\n" -"# pbuilder create --distribution squeeze --no-targz --basetgz " -"/chroot/squeeze\n" -"# pbuilder create --distribution sid --no-targz --basetgz /chroot/sid" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1471 -msgid "" -"It should be possible to create base chroot images for " -"<command>dchroot</command> with the following commands: <placeholder " -"type=\"screen\" id=\"0\"/>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1480 -msgid "Using pbuilder in a vserver" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1482 -msgid "" -"It is possible to use <command>pbuilder</command> in a vserver environment. " -"This requires either vserver-patches in version 2.1.1-rc14 or higher, or a " -"Linux kernel version 2.6.16 or higher." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1487 -msgid "" -"To use <command>pbuilder</command> in a vserver, you need to set the " -"<command>secure_mount</command> <command>CAPS</command> in the " -"<command>ccapabilities</command> of this vserver." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1493 -msgid "Usage of ccache" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1495 -msgid "" -"It is possible to use C compiler cache <command>ccache</command> to speed up " -"repeated builds of the same package (or packages that compile the same files " -"multiple times for some reason). Using <command>ccache</command> can speed " -"up repeated building of large packages dramatically, at the cost of some " -"disk space and bookkeeping." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1503 -msgid "" -"To enable usage of <command>ccache</command> with " -"<command>pbuilder</command>, you should set CCACHEDIR in your pbuilderrc " -"file." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1508 -msgid "" -"Current implementation of ccache support has several bugs, that CCACHEDIR " -"must be owned by the pbuilder build user, and parallel runs of pbuilder are " -"not supported. Therefore it is not enabled by default." -msgstr "" - -#. type: Content of: <book><chapter><title> -#: pbuilder-doc.xml:1516 -msgid "Reference materials" -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1518 -msgid "Directory structure outside the chroot" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><title> -#: pbuilder-doc.xml:1520 -msgid "Directory Structure outside the chroot" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1532 -msgid "<filename>/etc/pbuilderrc</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1533 -msgid "configuration file" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1536 -msgid "<filename>/usr/share/pbuilder/pbuilderrc</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1537 -msgid "Default configuration" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1540 -msgid "<filename>/var/cache/pbuilder/base.tgz</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1541 -msgid "" -"Default location pbuilder uses for base.tgz, the tar-ball containing a basic " -"Debian installation with only the build-essential packages." -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1546 -msgid "<filename>/var/cache/pbuilder/build/PID/</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1547 -msgid "Default location pbuilder uses for chroot" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1550 -msgid "<filename>/var/cache/pbuilder/aptcache</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1551 -msgid "" -"Default location <command>pbuilder</command> will use as apt cache, to store " -"deb packages required during <command>pbuilder</command> build." -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1554 pbuilder-doc.xml:1638 -msgid "<filename>/var/cache/pbuilder/ccache</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1555 -msgid "Default location <command>pbuilder</command> will use as cache location" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1559 -msgid "<filename>/var/cache/pbuilder/result</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1560 -msgid "" -"Default location <command>pbuilder</command> puts the deb files and other " -"files created after build" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1563 -msgid "<filename>/var/cache/pbuilder/pbuilder-umlresult</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1564 -msgid "" -"Default location <command>pbuilder-user-mode-linux</command> puts the deb " -"files and other files created after build" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1567 -msgid "<filename>/var/cache/pbuilder/pbuilder-mnt</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1568 -msgid "" -"Default location <command>pbuilder-user-mode-linux</command> uses for " -"mounting the COW file system, for chrooting." -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1571 -msgid "<filename>/tmp</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1572 -msgid "<command>pbuilder-user-mode-linux</command> will mount tmpfs for work." -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1575 -msgid "<filename>${HOME}/tmp/PID.cow</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1576 -msgid "" -"<command>pbuilder-user-mode-linux</command> use this directory for location " -"of COW file system." -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1579 -msgid "<filename>${HOME}/uml-image</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1580 -msgid "" -"<command>pbuilder-user-mode-linux</command> use this directory for " -"user-mode-linux full disk image." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1587 -msgid "Directory structure inside the chroot" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><title> -#: pbuilder-doc.xml:1589 -msgid "Directory Structure inside the chroot" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1601 -msgid "<filename>/etc/mtab</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1603 -msgid "symlink to <filename>/proc/mounts</filename>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1607 -msgid "<filename>/tmp/buildd</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1608 -msgid "" -"Default place used in <command>pbuilder</command> to place the Debian " -"package to be processed. " -"<filename>/tmp/buildd/packagename-version/</filename> will be the root " -"directory of the package being processed. HOME environment variable is set " -"to this value inside chroot by pbuilder-buildpackage. " -"<option>--inputfile</option> will place files here." -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1618 -msgid "<filename>/runscript</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1619 -msgid "" -"The script passed as an argument to <command>pbuilder</command> execute is " -"passed on." -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1625 -msgid "<filename>/tmp/hooks</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1627 -msgid "The location of hooks." -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1631 -msgid "<filename>/var/cache/apt/archives</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1633 -msgid "" -"<command>pbuilder</command> copies the content of this directory to and from " -"the aptcache directory of outside chroot." -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1640 -msgid "<command>pbuilder</command> bind-mounts this directory for use by ccache." -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1645 -msgid "<filename>/tmp/XXXX</filename>" -msgstr "" - -#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> -#: pbuilder-doc.xml:1646 -msgid "" -"<command>pbuilder-user-mode-linux</command> uses a script in " -"<filename>/tmp</filename> to bootstrap into user-mode-linux" -msgstr "" - -#. type: Content of: <book><chapter><title> -#: pbuilder-doc.xml:1656 -msgid "Minor archaeological details" -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1658 -msgid "Documentation history" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1660 -msgid "" -"This document was started on 28 Dec 2002 by Junichi Uekawa, trying to " -"document what is known about <command>pbuilder</command>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1665 -msgid "" -"This documentation is available from the <command>pbuilder</command> source " -"tar-ball, and from the git repository of <command>pbuilder</command> " -"(web-based access is possible). A copy of this documentation can be found " -"on the <ulink " -"url=\"http://pbuilder.alioth.debian.org/pbuilder-doc.html\">Alioth project " -"page for pbuilder</ulink>. <ulink " -"url=\"http://pbuilder.alioth.debian.org/pbuilder-doc.pdf\">There is also a " -"PDF version</ulink>. The homepage for <command>pbuilder</command> is <ulink " -"url=\"http://pbuilder.alioth.debian.org/\"> " -"http://pbuilder.alioth.debian.org/ </ulink> hosted by alioth project." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1676 -msgid "" -"Documentation is written using DocBook XML, with emacs PSGML mode, and using " -"wysidocbookxml for live previewing." -msgstr "" - -#. type: Content of: <book><chapter><sect1><title> -#: pbuilder-doc.xml:1682 -msgid "Possibly inaccurate Background History of pbuilder" -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: pbuilder-doc.xml:1684 -msgid "" -"The following is a most possibly inaccurate account of how " -"<command>pbuilder</command> came to happen, and other attempts to make " -"something like <command>pbuilder</command> happen. This part of the " -"document was originally in the AUTHORS file, to give credit to those who " -"existed before <command>pbuilder</command>." -msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><title> -#: pbuilder-doc.xml:1691 -msgid "The Time Before pbuilder" -msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><para> -#: pbuilder-doc.xml:1693 -msgid "" -"There was once dbuild, which was a shell script to build Debian packages " -"from source. Lars Wirzenius wrote that script, and it was good, short, and " -"simple (probably). There was nothing like build-depends then (I think), and " -"it was simple. It could have been improved, I could only find references " -"and no actual source." -msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><para> -#: pbuilder-doc.xml:1700 -msgid "" -"debbuild was probably written by James Troup. I don't know it because I have " -"never seen the actual code, I could only find some references to it on the " -"net, and mailing list logs." -msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><para> -#: pbuilder-doc.xml:1705 -msgid "" -"sbuild is a perl script to build Debian packages from source. It parses " -"Build-Depends, and performs other miscellaneous checks, and has a lot of " -"hacks to actually get things building, including a table of what package to " -"use when virtual packages are specified (does it do that still?). It " -"supports the use of a local database for packages which do not have " -"build-dependencies. It was written by Ronan Hodek, and I think it was " -"patched and fixed and extended by several people. It is part of wanna-build, " -"and used extensively in the Debian buildd system. I think it was maintained " -"mostly by Ryan Murray." -msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><title> -#: pbuilder-doc.xml:1719 -msgid "Birth of pbuilder" -msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><para> -#: pbuilder-doc.xml:1721 -msgid "" -"wanna-build (sbuild) was (at the time of year 2001) quite difficult to set " -"up, and it was never a Debian package. dbuild was something that predated " -"Build-Depends." -msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><para> -#: pbuilder-doc.xml:1726 -msgid "" -"Building packages from source using Build-Depends information within a " -"chroot sounded trivial; and <command>pbuilder</command> was born. It was " -"initially a shell script with only a few lines, which called debootstrap and " -"chroot and dpkg-buildpackage in the same run, but soon, it was decided that " -"that's too slow." -msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><para> -#: pbuilder-doc.xml:1734 -msgid "" -"Yes, and it took almost an year to get things somewhat right, and in the " -"middle of the process, Debian 3.0 was released. Yay. Debian 3.0 wasn't " -"completely buildable with <command>pbuilder</command>, but the amount of " -"packages which are not buildable is steadily decreasing (I hope)." -msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><title> -#: pbuilder-doc.xml:1743 -msgid "And the second year of its life" -msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><para> -#: pbuilder-doc.xml:1745 -msgid "" -"Someone wanted <command>pbuilder</command> to not run as root, and as " -"User-mode-linux has become more useful as time passed, I've started " -"experimenting with <command>pbuilder-user-mode-linux</command>. " -"<command>pbuilder-user-mode-linux</command> has not stayed functional as " -"much as I would have liked, and bootstrapping " -"<command>user-mode-linux</command> environment has been pretty hard, due to " -"the quality of user-mode-linux code or packaging at that time, which kept on " -"breaking network support in one way or the other." -msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><title> -#: pbuilder-doc.xml:1758 -msgid "Fifth year of pbuilder" -msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><para> -#: pbuilder-doc.xml:1760 -msgid "" -"<command>pbuilder</command> is now widely adopted as a 'almost standard' " -"tool for testing packages, and building packages in a pristine environment. " -"There are other similar tools that do similar tasks, but they do not share " -"the exact same goal. To commemorate this fact, <command>pbuilder</command> " -"is now co-maintained with several people." -msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><para> -#: pbuilder-doc.xml:1768 -msgid "" -"<command>sbuild</command> is now a well-maintained Debian package within " -"Debian, and with <command>pbuilder</command> being such a slow monster, some " -"people prefer the approach of sbuild. Development to use LVM-snapshots, " -"cowloop, or cowdancer is hoped to improve the situation somewhat." -msgstr "" diff -Nru pbuilder-0.223~ubuntu14.04.1/Documentation/pbuilder-doc.xml pbuilder-0.215+nmu4ubuntu1~ppa1/Documentation/pbuilder-doc.xml --- pbuilder-0.223~ubuntu14.04.1/Documentation/pbuilder-doc.xml 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/Documentation/pbuilder-doc.xml 2015-06-22 08:05:23.000000000 +0000 @@ -8,7 +8,7 @@ <title>pbuilder User's Manual pbuilder-doc Usage and operations - This documentation is work in progress, it might be incomplete and outdated + documentation in progress Junichi @@ -1507,7 +1507,7 @@ Current implementation of ccache support has several bugs, that CCACHEDIR must be owned by the pbuilder build user, and - parallel runs of pbuilder are not supported. Therefore it is + parallel runs of pbuilder is not supported. Therefore it is not enabled by default. diff -Nru pbuilder-0.223~ubuntu14.04.1/examples/B20autopkgtest pbuilder-0.215+nmu4ubuntu1~ppa1/examples/B20autopkgtest --- pbuilder-0.223~ubuntu14.04.1/examples/B20autopkgtest 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/examples/B20autopkgtest 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -#!/bin/sh -# Copyright © 2012 Christoph Berg -# © 2013 Michael Prokop -# © 2015 Mattia Rizzolo -# -# This file is part of pbuilder -- personal Debian package builder -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - -BUILDDIR="${BUILDDIR:-/tmp/buildd}" - -if [ "${ADT:-}" = "skip" ]; then - echo "Skipping autopkgtests as requested (ADT is set to 'skip')" - exit 0 -fi - -if [ "${ADT:-}" = "external" ]; then - echo "Skipping internal autopkgtests as external testing was requested via ADT variable" - exit 0 -fi - -set -ex - -cd "$BUILDDIR"/*/debian/.. - -if [ ! -f debian/tests/control ]; then - echo "Package does not have autopkgtest support, debian/tests/control is missing" - exit 0 -fi - -if [ ! -f debian/files ]; then - echo "Package source is not built, debian/files is missing" >&2 - exit 1 -fi - -if [ -n "${ADT_OPTIONS:-}" ] ; then - echo "*** Using provided ADT_OPTIONS $ADT_OPTIONS ***" -fi - -# try to launch adt-run in a new PID namespace so several testsuites can run -# in parallel, newpid exists in jessie and newer only though -unset newpid_name -if ! apt-cache policy newpid | grep -q 'newpid:' ; then - echo "The newpid package doesn't seem to be available, not considering for installation" -else - echo "The newpid package seems to be available, considering for installation" - newpid_name='newpid' -fi - -# runner/adt-run uses apt-utils's apt-ftparchive and -# pbuilder's pbuilder-satisfydepends-classic -apt-get install -y autopkgtest apt-utils pbuilder $newpid_name - -# since autopkgtest 3.16 the --tmp-dir option is gone, make sure -# we've --output-dir available though before using it -if adt-run --help | grep -q -- --output-dir 2>/dev/null ; then - OUTPUT_OPTION='--output-dir' -else - OUTPUT_OPTION='--tmp-dir' -fi - -mkdir -p "$BUILDDIR/autopkgtest.out" - -$newpid_name adt-run \ - ${OUTPUT_OPTION} "$BUILDDIR/autopkgtest.out" \ - --summary "$BUILDDIR/autopkgtest.summary" \ - "$BUILDDIR"/*.deb \ - --built-tree "${PWD}" \ - ${ADT_OPTIONS:-} --- adt-virt-null || EXIT=$? - -# collect autopkgtest output in a single file so pbuilder automatically copies it -tar -caf "$BUILDDIR/autopkgtest.tar.gz" "$BUILDDIR/autopkgtest.out" - -case ${EXIT:-0} in - 2|4|6|8) # let adtsummary_tap report the failure - exit 0 - ;; - *) - exit ${EXIT:-0} - ;; -esac diff -Nru pbuilder-0.223~ubuntu14.04.1/examples/B90lintian pbuilder-0.215+nmu4ubuntu1~ppa1/examples/B90lintian --- pbuilder-0.223~ubuntu14.04.1/examples/B90lintian 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/examples/B90lintian 2015-06-22 08:05:23.000000000 +0000 @@ -2,8 +2,6 @@ set -e -BUILDDIR="${BUILDDIR:-/tmp/buildd}" - install_packages() { apt-get -y "${APTGETOPT[@]}" install "$@" } @@ -12,9 +10,9 @@ echo "+++ lintian output +++" -su -c "lintian -I --show-overrides "$BUILDDIR"/*.changes" - pbuilder +su -c "lintian -I --show-overrides /tmp/buildd/*.changes" - pbuilder # use this version if you don't want lintian to fail the build -#su -c "lintian -I --show-overrides "$BUILDDIR"/*.changes; :" - pbuilder +#su -c "lintian -I --show-overrides /tmp/buildd/*.changes; :" - pbuilder echo "+++ end of lintian output +++" diff -Nru pbuilder-0.223~ubuntu14.04.1/examples/B90list-missing pbuilder-0.215+nmu4ubuntu1~ppa1/examples/B90list-missing --- pbuilder-0.223~ubuntu14.04.1/examples/B90list-missing 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/examples/B90list-missing 2015-06-22 08:05:23.000000000 +0000 @@ -5,9 +5,8 @@ # Depends on CDBS module in debian/rules: # include /usr/share/cdbs/1/rules/utils.mk -BUILDDIR="${BUILDDIR:-/tmp/buildd}" echo "I: checking for missing files." -cd "$BUILDDIR"/*/debian +cd /tmp/buildd/*/debian cd .. fakeroot debian/rules list-missing #EOF diff -Nru pbuilder-0.223~ubuntu14.04.1/examples/B91debc pbuilder-0.215+nmu4ubuntu1~ppa1/examples/B91debc --- pbuilder-0.223~ubuntu14.04.1/examples/B91debc 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/examples/B91debc 2015-06-22 08:05:23.000000000 +0000 @@ -3,9 +3,8 @@ # # 343894: a script to run debc command, contributed from q-funk. -BUILDDIR="${BUILDDIR:-/tmp/buildd}" apt-get install -y "${APTGETOPT[@]}" devscripts -cd "$BUILDDIR"/*/debian +cd /tmp/buildd/*/debian cd .. debc #EOF diff -Nru pbuilder-0.223~ubuntu14.04.1/examples/B91dpkg-i pbuilder-0.215+nmu4ubuntu1~ppa1/examples/B91dpkg-i --- pbuilder-0.223~ubuntu14.04.1/examples/B91dpkg-i 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/examples/B91dpkg-i 2015-06-22 08:05:23.000000000 +0000 @@ -6,24 +6,23 @@ echo "Trying to install resulting packages and test upgrades" set -ex -BUILDDIR="${BUILDDIR:-/tmp/buildd}" -PKGNAMES=$(cd "$BUILDDIR" && ls -1 *.deb | sed 's/_.*$//' ) +PKGNAMES=$(cd /tmp/buildd && ls -1 *.deb | sed 's/_.*$//' ) # install-remove check -dpkg -i "$BUILDDIR"/*.deb +dpkg -i /tmp/buildd/*.deb dpkg --remove $PKGNAMES # install-purge check -dpkg -i "$BUILDDIR"/*.deb +dpkg -i /tmp/buildd/*.deb dpkg --purge $PKGNAMES # upgrade-remove check apt-get install -y "${APTGETOPT[@]}" $PKGNAMES || true -dpkg -i "$BUILDDIR"/*.deb +dpkg -i /tmp/buildd/*.deb dpkg --remove $PKGNAMES # upgrade-purge check apt-get install -y "${APTGETOPT[@]}" $PKGNAMES || true -dpkg -i "$BUILDDIR"/*.deb +dpkg -i /tmp/buildd/*.deb dpkg --purge $PKGNAMES diff -Nru pbuilder-0.223~ubuntu14.04.1/examples/B92test-pkg pbuilder-0.215+nmu4ubuntu1~ppa1/examples/B92test-pkg --- pbuilder-0.223~ubuntu14.04.1/examples/B92test-pkg 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/examples/B92test-pkg 2015-06-22 08:05:23.000000000 +0000 @@ -7,19 +7,17 @@ # set -e -BUILDDIR="${BUILDDIR:-/tmp/buildd}" - echo "Installing the prerequisites" -for PKG in $(ls "$BUILDDIR"/*.deb | sed -e's,.*/,,;s,_.*,,' ); do +for PKG in $(ls /tmp/buildd/*.deb | sed -e's,.*/,,;s,_.*,,' ); do apt-get install -y --force-yes "$PKG" || true apt-get remove -y "$PKG" || true done # ignore the failures since they are not the prime interest -dpkg -i "$BUILDDIR"/*.deb || true +dpkg -i /tmp/buildd/*.deb || true apt-get install -y -f --force-yes -if chmod a+x "$BUILDDIR"/*/debian/pbuilder-test/*; then +if chmod a+x /tmp/buildd/*/debian/pbuilder-test/*; then : else echo "W: no pbuilder-test script found, skipping" @@ -32,9 +30,9 @@ EXIT_CODE=0 # The current directory is the top of the source-tree. -cd "$BUILDDIR"/*/debian/.. +cd /tmp/buildd/*/debian/.. -for SCRIPT in $(run-parts --test "$BUILDDIR"/*/debian/pbuilder-test) ; do +for SCRIPT in $(run-parts --test /tmp/buildd/*/debian/pbuilder-test) ; do echo "--- BEGIN test: ${SCRIPT##*/}" if "${SCRIPT}"; then echo SUCCESS diff -Nru pbuilder-0.223~ubuntu14.04.1/examples/C10shell pbuilder-0.215+nmu4ubuntu1~ppa1/examples/C10shell --- pbuilder-0.223~ubuntu14.04.1/examples/C10shell 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/examples/C10shell 2015-06-22 08:05:23.000000000 +0000 @@ -2,7 +2,6 @@ # example file to be used with --hookdir # # invoke shell if build fails. -BUILDDIR="${BUILDDIR:-/tmp/buildd}" apt-get install -y "${APTGETOPT[@]}" vim less -cd "$BUILDDIR"/*/debian/.. +cd /tmp/buildd/*/debian/.. /bin/bash < /dev/tty > /dev/tty 2> /dev/tty diff -Nru pbuilder-0.223~ubuntu14.04.1/examples/C11screen pbuilder-0.215+nmu4ubuntu1~ppa1/examples/C11screen --- pbuilder-0.223~ubuntu14.04.1/examples/C11screen 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/examples/C11screen 2015-06-22 08:05:23.000000000 +0000 @@ -4,7 +4,6 @@ # invoke GNU screen if build fails. export debian_chroot="pbuilder" -BUILDDIR="${BUILDDIR:-/tmp/buildd}" apt-get install -y "${APTGETOPT[@]}" screen vim less -cd "$BUILDDIR/*/debian/.." +cd /tmp/buildd/*/debian/.. screen /dev/tty 2> /dev/tty diff -Nru pbuilder-0.223~ubuntu14.04.1/examples/D65various-compiler-support pbuilder-0.215+nmu4ubuntu1~ppa1/examples/D65various-compiler-support --- pbuilder-0.223~ubuntu14.04.1/examples/D65various-compiler-support 2015-11-12 19:52:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/examples/D65various-compiler-support 2015-06-22 08:05:23.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # # pbuilder hook script: choose optional compiler rather than default one -# +# # Sometimes we want to choose other compiler than default, because of improving # code to conform to standard, check compiler quality or so. This script will # ease it. Try enable hook script and set "CHOOSE_COMPILER" variables as clang, @@ -18,37 +18,31 @@ # check whether we are asked to change the compiler. case "${CHOOSE_COMPILER}" in clang) - newcc=/usr/bin/"${CHOOSE_COMPILER}" - newcxx=/usr/bin/"${CHOOSE_COMPILER}"++ - ;; - clang-*) - use_clang_version=$(echo ${CHOOSE_COMPILER} | sed -e s/clang-//) - clang_package=clang-"${use_clang_version}" - newcc=/usr/bin/clang-"${use_clang_version}" - newcxx=/usr/bin/clang++-"${use_clang_version}" - ;; + newcc=/usr/bin/"${CHOOSE_COMPILER}" + newcxx=/usr/bin/"${CHOOSE_COMPILER}"++ + ;; gcc-*) use_gcc_version=$(echo ${CHOOSE_COMPILER} | sed -e s/gcc-//) - gxx_package=g++-"${use_gcc_version}" - newcc=/usr/bin/"${CHOOSE_COMPILER}" - newcxx=/usr/bin/g++-"${use_gcc_version}" - ;; + gxx_package=g++-"${use_gcc_version}" + newcc=/usr/bin/"${CHOOSE_COMPILER}" + newcxx=/usr/bin/g++-"${use_gcc_version}" + ;; tcc) - newcc=/usr/bin/"${CHOOSE_COMPILER}" - newcxx=/bin/false - not_gcc_compat=1 - ;; + newcc=/usr/bin/"${CHOOSE_COMPILER}" + newcxx=/bin/false + not_gcc_compat=1 + ;; pcc) - newcc=/usr/bin/"${CHOOSE_COMPILER}" - newcxx=/bin/false - not_gcc_compat=1 - ;; + newcc=/usr/bin/"${CHOOSE_COMPILER}" + newcxx=/bin/false + not_gcc_compat=1 + ;; *) - exit 0 - ;; + exit 0 + ;; esac -apt-get -y install "${CHOOSE_COMPILER}" ${gxx_package} ${clang_package} +apt-get -y install "${CHOOSE_COMPILER}" ${gxx_package} if [ ! -x /usr/bin/"${CHOOSE_COMPILER}" ]; then echo >&2 "E: Package ${CHOOSE_COMPILER} does not contain compiler driver?" @@ -60,9 +54,9 @@ if [ -z "${not_gcc_compat}" ]; then ( - cd /usr/bin - ln -sf "$newcc" gcc - ln -sf "$newcxx" g++ + cd /usr/bin + ln -sf "$newcc" gcc + ln -sf "$newcxx" g++ ) else rm -f /usr/bin/gcc /usr/bin/g++ diff -Nru pbuilder-0.223~ubuntu14.04.1/Makefile pbuilder-0.215+nmu4ubuntu1~ppa1/Makefile --- pbuilder-0.223~ubuntu14.04.1/Makefile 2016-01-24 13:58:13.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/Makefile 2015-06-22 16:04:04.000000000 +0000 @@ -28,12 +28,16 @@ ALLDIRS += PBUILDERCONF PBUILDERCONFDIR := $(SYSCONFDIR)/pbuilder PBUILDERCONF_DATA += \ + pbuilder-uml.conf \ $(NULL) +CHECK_SCRIPTS += pbuilder-uml.conf ALLDIRS += BIN BIN_SCRIPTS += \ debuild-pbuilder \ + pbuilder-user-mode-linux \ pdebuild \ + pdebuild-user-mode-linux \ $(NULL) ALLDIRS += PKGLIB @@ -52,10 +56,21 @@ pbuilder-satisfydepends-experimental \ pbuilder-satisfydepends-funcs \ pbuilder-satisfydepends-gdebi \ + pbuilder-selftest \ + pbuilder-uml-checkparams \ pbuilder-unshare-wrapper \ pbuilder-updatebuildenv \ pdebuild-checkparams \ pdebuild-internal \ + pdebuild-uml-checkparams \ + testlib.sh \ + test_pbuilder-apt-config \ + test_pbuilder-checkparams \ + test_pbuilder-modules \ + test_pbuilder-satisfydepends-checkparams \ + test_pbuilder-satisfydepends-classic \ + test_pbuilder-satisfydepends-funcs \ + test_testlib.sh \ $(NULL) ALLDIRS += SBIN @@ -83,7 +98,6 @@ examples/F90chrootmemo \ examples/B90list-missing \ examples/B91debc \ - examples/B20autopkgtest \ examples/execute_installtest.sh \ examples/execute_paramtest.sh \ examples/pbuilder-distribution.sh \ @@ -131,12 +145,19 @@ examples/rebuild/getlist \ $(NULL) +ALLDIRS += EXAMPLE_WORKAROUND +EXAMPLE_WORKAROUNDDIR := $(EXAMPLEDIR)/workaround +EXAMPLE_WORKAROUND_SCRIPTS += \ + $(NULL) + ALLDIRS += PKGDATA PKGDATA_DATA += \ pbuilderrc \ + pbuilder-uml.conf \ $(NULL) CHECK_SCRIPTS += \ pbuilderrc \ + pbuilder-uml.conf \ $(NULL) NOINST_MANPAGES += \ @@ -161,7 +182,7 @@ $(foreach script,$(CHECK_SCRIPTS),bash -n $(script)$(newline)) $(foreach mp,$(CHECK_MANPAGES),LANG=C MANWIDTH=80 man --warnings -l $(mp) >/dev/null$(newline)) # unit tests. - $(foreach test,$(wildcard ./t/test_*),$(test)$(newline)) + $(foreach test,$(wildcard ./test_*),$(test)$(newline)) full-check: # system tests that might take long. @@ -188,6 +209,7 @@ install: $(foreach d,$(ALLDIRS),$(call install_dir_impl,$(d))) $(INSTALL_DIRECTORY) $(DESTDIR)/var/cache/pbuilder/pbuilder-mnt + $(INSTALL_DIRECTORY) $(DESTDIR)/var/cache/pbuilder/pbuilder-umlresult # install -aptitude flavour as the default satisfydepends ln -sf pbuilder-satisfydepends-aptitude $(PKGLIBDIR)/pbuilder-satisfydepends $(MAKE) -C pbuildd $@ diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder --- pbuilder-0.223~ubuntu14.04.1/pbuilder 2015-12-20 16:06:43.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder 2015-06-22 08:05:23.000000000 +0000 @@ -1,7 +1,6 @@ #! /bin/bash # pbuilder -- personal Debian package builder -# Copyright © 2001-2007 Junichi Uekawa -# 2015 Mattia Rizzolo +# Copyright (C) 2001-2007 Junichi Uekawa # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +15,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -############################################################################### + +# pbuilder by Junichi Uekawa 2001 Aug 25 set -e @@ -42,27 +42,29 @@ shift; . /usr/lib/pbuilder/pbuilder-checkparams if [ -n "$BASEBUILDPLACE" ]; then - log.i "Cleaning [$BASEBUILDPLACE]" + log "I: Cleaning [$BASEBUILDPLACE]" clean_subdirectories "$BASEBUILDPLACE" || true fi if [ -n "$APTCACHE" ]; then - log.i "Cleaning [$APTCACHE]" - rm -f "$APTCACHE"/* || true + log "I: Cleaning [$APTCACHE]" + rm "$APTCACHE"/* || true fi ;; --login|login) shift . /usr/lib/pbuilder/pbuilder-checkparams + . /usr/lib/pbuilder/pbuilder-runhooks extractbuildplace trap umountproc_cleanbuildplace_trap exit sighup - copyinputfile "${BUILDPLACE}$BUILDDIR" + copyinputfile "${BUILDPLACE}/tmp/buildd" + loadhooks recover_aptcache trap saveaptcache_umountproc_cleanbuildplace_trap exit sighup if [ "${INTERNAL_BUILD_UML}" = "yes" ]; then - log.i "entering the shell" + log "I: entering the shell" else - log.i "entering the shell + log "I: entering the shell File extracted to: $BUILDPLACE " fi @@ -77,10 +79,11 @@ # saving the place afterwards if [ "${SAVE_AFTER_LOGIN}" = "yes" ]; then if [ "${INTERNAL_BUILD_UML}" = "yes" ]; then - log.e "Invalid combination of internal-build-uml and save-after-login flags" + log "E: Invalid combination of internal-build-uml and save-after-login flags" exit 1 else - log.i "Saving the results, modifications to this session will persist" + log "I: Saving the results, modifications to this session will persist" + unloadhooks umountproc trap cleanbuildplace_trap exit sighup ${CHROOTEXEC} /usr/bin/apt-get clean || true @@ -98,16 +101,18 @@ # try to execute arbitrary program. shift . /usr/lib/pbuilder/pbuilder-checkparams + . /usr/lib/pbuilder/pbuilder-runhooks EXECPROGRAM="$1" shift if [ ! -f "${EXECPROGRAM}" ]; then - log.e "Command line parameter [$EXECPROGRAM] does not exist" + log "E: Command line parameter [$EXECPROGRAM] does not exist" exit 1; fi; extractbuildplace trap umountproc_cleanbuildplace_trap exit sighup - copyinputfile "${BUILDPLACE}$BUILDDIR" + copyinputfile "${BUILDPLACE}/tmp/buildd" + loadhooks recover_aptcache trap saveaptcache_umountproc_cleanbuildplace_trap exit sighup @@ -125,9 +130,10 @@ # saving the place afterwards if [ "${SAVE_AFTER_LOGIN}" = "yes" ]; then if [ "${INTERNAL_BUILD_UML}" = "yes" ]; then - log.e "Invalid combination of internal-build-uml and save-after-login flags" + log "E: Invalid combination of internal-build-uml and save-after-login flags" else - log.i "Saving the results, modifications to this session will persist" + log "I: Saving the results, modifications to this session will persist" + unloadhooks umountproc trap cleanbuildplace_trap exit sighup ${CHROOTEXEC} /usr/bin/apt-get clean || true @@ -144,29 +150,25 @@ --dumpconfig|dumpconfig) shift . /usr/lib/pbuilder/pbuilder-checkparams + . /usr/lib/pbuilder/pbuilder-runhooks extractbuildplace trap umountproc_cleanbuildplace_trap exit sighup + loadhooks executehooks "F" - log.i "start dump config" - log.i "set" + log "I: start dump config" + log "I: set" set; - log.i "env" + log "I: env" env; - log.i "end dump config" + log "I: end dump config" ;; --debuild|debuild) shift "$0" execute "$@" /usr/lib/pbuilder/pdebuild-internal ;; - --help|help) - . /usr/lib/pbuilder/pbuilder-modules - showhelp - exit 0 - ;; *) . /usr/lib/pbuilder/pbuilder-modules showhelp - exit 1 ;; esac diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder.8 pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder.8 --- pbuilder-0.223~ubuntu14.04.1/pbuilder.8 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder.8 2015-06-22 08:05:23.000000000 +0000 @@ -190,8 +190,11 @@ .TP .BI "\-\-architecture [" "architecture" "]" -Specifies the architecture to use when creating the chroot, defaults to the -system one. The supported values are the ones debootstrap supports. +Specifies the architecture used. The supported values are the ones debootstrap +supports. +.B "i386" +or +.B "amd64". .TP .BI "\-\-components [" "components" "]" @@ -228,13 +231,6 @@ if you want caching to be turned off. .TP -.BI "\-\-debdelta -This option is used in the -.B "\-\-update" -target, and enable the use of debdelta (if it is already installed, otherwise -will be installed the first time this option is used). - -.TP .BI "\-\-configfile [" "configuration file to load" "]" Additional configuration file to read after all other configuration files have been read. @@ -326,16 +322,6 @@ .B "--create" target. -.B "H" -is executed just after unpacking the chroot, mounting proc and any bind mount -specified in BINDMOUNTS. It's executed for every target that requires the -unpacked chroot. It's useful if you want to dynamically change the chroot guts -before anything starts using it. - -.B "I" -is executed after build system finishes building, successfully, after copying -back the build results. - \" End of hookdir description .TP @@ -356,18 +342,6 @@ and the standard output. .TP -.BI "\-\-loglevel " "I" -Specify how much output you want from pbuilder, valid values are -.BR E -(errors only), -.BR W -(errors and warnings), -.BR I -(errors, warnings and informational) and -.BR D -(everything including some debug messages). - -.TP .BI "\-\-binary\-arch" Specify to build architecture specific targets instead of all targets. @@ -379,21 +353,6 @@ .B "\-\-debbuildopts -B" .TP -.BI "\-\-bin\-nmu [" "changelog message" "]" -Specify to build a binary-NMU instead of a standard package. -This option takes the changelog message to pass to the binary-NMU package as parameter. - -.TP -.BI "\-\-bin\-nmu\-maintainer [" "maintainer" "]" -Specify the maintainer name and email address to be displayed in the changes file. -If no maintainer is provided, it defaults to the last uploader. - -.TP -.BI "\-\-bin\-nmu\-version [" "version number" "]" -Specify the number to append to the version in the binary-NMU package. -If no number is provided, it defaults to 1. - -.TP .BI "\-\-bindmounts " "bind-mount-points" Bind-mount the specified directories to inside the chroot. .I "bind-mount-points" @@ -517,7 +476,7 @@ target. The file extension is specified by -.B "PKGNAME_LOGFILE_EXTENSION" +.B "PKGNAME_LOGFILE_EXTENTION" in .B "pbuilderrc" @@ -564,7 +523,7 @@ .BI "\-\-compressprog" Program to use for compression and decompression of the base.tgz. The default is to use gzip, and any program that can be used for -the \-\-use\-compress-program option of tar can be given. +the --use-compress-program option of tar can be given. If set to "pigz", compression and decompression is gzip compatible but will use all available CPUs. diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-apt-config pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-apt-config --- pbuilder-0.223~ubuntu14.04.1/pbuilder-apt-config 2015-12-20 15:44:40.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-apt-config 2015-06-22 08:05:23.000000000 +0000 @@ -59,15 +59,15 @@ etch|lenny|squeeze|sid|oldstable|stable|testing|unstable|experimental) echo "debian" ;; - buzz|rex|bo|hamm|slink|potato|woody|sarge|etch|lenny|squeeze|wheezy|jessie|stretch|buster) + buzz|rex|bo|hamm|slink|potato|woody|sarge|etch|lenny|squeeze) echo "debian-archive" ;; - lucid|precise|trusty|vivid|wily|xenial) + dapper|hardy|intrepid|jaunty|karmic|lucid) case "$arch" in amd64|i386) echo "ubuntu" ;; - arm64|armel|armhf|hppa|ia64|lpia|powerpc|ppc64el|s390x|sparc) + armel|armhf|hppa|ia64|lpia|powerpc|sparc) echo "ubuntu-ports" ;; *) @@ -75,7 +75,7 @@ ;; esac ;; - warty|hoary|breezy|edgy|feisty|gutsy|dapper|hardy|intrepid|jaunty|karmic|maverick|natty|oneiric|quantal|raring|saucy|utopic) + warty|hoary|breezy|edgy|feisty|gutsy) echo "ubuntu-old" ;; *) @@ -225,12 +225,12 @@ esac } -getopt_output="$(getopt -o "" -l help,with-sources::,arch:,components:,archive:,mirror:,mirror-map:,suite:,pockets:,profile: -n "$self" -s sh -- "$@")" +getopt_output="`getopt -o "" -l help,with-sources::,arch:,components:,archive:,mirror:,mirror-map:,suite:,pockets:,profile: -n "$self" -s sh -- "$@"`" eval set -- "$getopt_output" with_sources="disabled" -arch="$(dpkg --print-architecture)" +arch="`dpkg --print-architecture`" components="main" archive="" mirror="" @@ -324,8 +324,8 @@ if [ -n "$profile" ]; then base_dist="${profile%%/*}" base_dist="${base_dist%%-*}" - base_archive="$(guess_dist_arch_archive "$base_dist" "$arch")" - base_mirror="$(get_archive_url "$mirror_map" "$base_archive")" + base_archive="`guess_dist_arch_archive "$base_dist" "$arch"`" + base_mirror="`get_archive_url "$mirror_map" "$base_archive"`" case "$base_archive" in debian|debian-archive) case "$profile" in @@ -336,7 +336,7 @@ ;; *-proposed-updates/volatile) archive="debian-volatile" - mirror="$(get_archive_url "$mirror_map" "$archive")" + mirror="`get_archive_url "$mirror_map" "$archive"`" volatile_dist="$base_dist/volatile" add_output_sources "$with_sources" "$base_mirror" "$base_dist" "$components" add_output_sources "$with_sources" "$mirror" "$volatile_dist" "$components" @@ -347,7 +347,7 @@ die "Unknown Debian Volatile based profile=$profile" fi archive="debian-volatile" - mirror="$(get_archive_url "$mirror_map" "$archive")" + mirror="`get_archive_url "$mirror_map" "$archive"`" volatile_dist=${profile%-sloppy} add_output_sources "$with_sources" "$base_mirror" "$base_dist" "$components" add_output_sources "$with_sources" "$mirror" "$volatile_dist" "$components" @@ -360,7 +360,7 @@ die "Unknown Backports.org based profile=$profile" fi archive="backports.org" - mirror="$(get_archive_url "$mirror_map" "$archive")" + mirror="`get_archive_url "$mirror_map" "$archive"`" add_output_sources "$with_sources" "$base_mirror" "$base_dist" "$components" add_output_sources "$with_sources" "$mirror" "$profile" "$components" ;; @@ -369,7 +369,7 @@ die "Unknown Debian Security based profile=$profile" fi archive="debian-security" - mirror="$(get_archive_url "$mirror_map" "$archive")" + mirror="`get_archive_url "$mirror_map" "$archive"`" add_output_sources "$with_sources" "$base_mirror" "$base_dist" "$components" add_output_sources "$with_sources" "$mirror" "$profile" "$components" ;; @@ -421,7 +421,7 @@ done if [ "$has_security" = "yes" ]; then archive="ubuntu-security" - mirror="$(get_archive_url "$mirror_map" "$archive")" + mirror="`get_archive_url "$mirror_map" "$archive"`" if [ "$mirror" != "$base_mirror" ]; then add_output_sources "$with_sources" "$mirror" "$base_dist-security" "$components" fi @@ -438,9 +438,9 @@ if [ -n "$suite" ]; then if [ -z "$mirror" ]; then if [ -z "$archive" ]; then - archive="$(guess_dist_arch_archive "$suite" "$arch")" + archive="`guess_dist_arch_archive "$suite" "$arch"`" fi - mirror="$(get_archive_url "$mirror_map" "$archive")" + mirror="`get_archive_url "$mirror_map" "$archive"`" fi add_output_sources "$with_sources" "$mirror" "$suite" "$components" for pocket in $pockets; do @@ -448,12 +448,13 @@ done # NB: archive might be empty; best effort to try to guess it if [ -z "$archive" ]; then - archive="$(guess_dist_arch_archive "$suite" "$arch")" 2>/dev/null || true + archive="`guess_dist_arch_archive "$suite" "$arch"`" 2>/dev/null || true fi set_debootstrap_suite "$archive" "$suite" debootstrap_mirror="$mirror" fi +command="$1" case $1 in apt-sources) echo "$sources" diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-buildpackage pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-buildpackage --- pbuilder-0.223~ubuntu14.04.1/pbuilder-buildpackage 2016-01-18 18:09:17.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-buildpackage 2015-06-22 08:05:23.000000000 +0000 @@ -1,7 +1,6 @@ #! /bin/bash # pbuilder -- personal Debian package builder -# Copyright © 2001-2007 Junichi Uekawa -# 2015 Mattia Rizzolo +# Copyright (C) 2001-2007 Junichi Uekawa # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,25 +15,21 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -############################################################################### export LANG=C export LC_ALL=C set -e -. "${BASH_SOURCE%/*}/pbuilder-checkparams" -. "${BASH_SOURCE%/*}/pbuilder-buildpackage-funcs" +. /usr/lib/pbuilder/pbuilder-checkparams +. /usr/lib/pbuilder/pbuilder-runhooks +. /usr/lib/pbuilder/pbuilder-buildpackage-funcs PACKAGENAME="$1" if [ ! -f "$PACKAGENAME" ]; then - log.e "Source package [$PACKAGENAME] does not exist" + log "E: Command line parameter [$PACKAGENAME] does not exist" exit 1; fi; -shift -if [ -n "$*" ]; then - log.w "The following options specified after the .dsc will be ignored: [$@]" -fi if [ -n "$BUILDUSERNAME" -a -n "$BUILDUSERID" ]; then # Command to SU to user. @@ -45,7 +40,7 @@ SUTOUSER="LD_PRELOAD= LOGNAME=$BUILDUSERNAME USER=$BUILDUSERNAME /sbin/start-stop-daemon --start --pidfile /dev/null --chuid $BUILDUSERNAME --startas /bin/sh" DEBBUILDOPTS="${DEBBUILDOPTS:+$DEBBUILDOPTS }-rfakeroot" EXTRAPACKAGES="${EXTRAPACKAGES} fakeroot" - log.i "using fakeroot in build." + log "I: using fakeroot in build." else # run the build in root BUILDUSERID=0 @@ -55,25 +50,25 @@ UNSHARE= case $USENETWORK in - yes) - if [ "$DEB_BUILD_ARCH_OS" = "linux" ]; then - # omit the warning when running on kFreeBSD or Hurd - log.w "pbuilder: network will not be disabled during build!" - fi - ;; - *) - if /usr/bin/unshare -n -- /usr/lib/pbuilder/pbuilder-unshare-wrapper true; then - USENETWORK=no - UNSHARE="/usr/bin/unshare -n -- /usr/lib/pbuilder/pbuilder-unshare-wrapper" - log.i "pbuilder: network access will be disabled during build" - else - USENETWORK=yes - if [ "$DEB_BUILD_ARCH_OS" = "linux" ]; then - log.w "pbuilder: unshare CLONE_NEWNET not available" - fi - log.i "pbuilder: network access is available during build!" - fi - ;; +yes) + if [ "$DEB_BUILD_ARCH_OS" = "linux" ]; then + # omit the warning when running on kFreeBSD or Hurd + log "W: pbuilder: network will not be disabled during build!" + fi + ;; +*) + if /usr/bin/unshare -n -- /usr/lib/pbuilder/pbuilder-unshare-wrapper true; then + USENETWORK=no + UNSHARE="/usr/bin/unshare -n -- /usr/lib/pbuilder/pbuilder-unshare-wrapper" + log "I: pbuilder: network access will be disabled during build" + else + USENETWORK=yes + if [ "$DEB_BUILD_ARCH_OS" = "linux" ]; then + log "W: pbuilder: unshare CLONE_NEWNET not available" + fi + log "I: pbuilder: network access is available during build!" + fi + ;; esac @@ -81,29 +76,32 @@ BUILDRESULTUID="${BUILDRESULTUID:-${SUDO_UID:-0}}" BUILDRESULTGID="${BUILDRESULTGID:-${SUDO_GID:-0}}" +export HOME="/tmp/buildd" + echobacktime extractbuildplace trap umountproc_cleanbuildplace_trap exit sighup sigpipe +loadhooks if [ ! -d "${BUILDRESULT}" ]; then if [ -n "${BUILDRESULT}" ] ; then - mkdir -p "${BUILDRESULT}" + mkdir -p "${BUILDRESULT}" fi if [ -d "${BUILDRESULT}" ]; then - log.i "created buildresult dir: ${BUILDRESULT}" + log "I: created buildresult dir: ${BUILDRESULT}" else - log.e "failed creating buildresult dir: ${BUILDRESULT}" - exit 1 + log "E: failed creating buildresult dir: ${BUILDRESULT}" + exit 1 fi fi if [ -z "${PBUILDER_BUILD_LOGFILE}" ]; then if [ "${PKGNAME_LOGFILE}" = "yes" ]; then - PBUILDER_BUILD_LOGFILE="${BUILDRESULT}/$(basename "${PACKAGENAME}" .dsc)${PKGNAME_LOGFILE_EXTENSION}" - exec > >(tee "${PBUILDER_BUILD_LOGFILE}") 2>&1 - PBUILDER_BUILD_LOGFILE=$(readlink -f "${PBUILDER_BUILD_LOGFILE}") - log.i "Using pkgname logfile" - echobacktime + PBUILDER_BUILD_LOGFILE="${BUILDRESULT}/"$(basename "${PACKAGENAME}" .dsc)"${PKGNAME_LOGFILE_EXTENTION}" + exec > >(tee "${PBUILDER_BUILD_LOGFILE}") 2>&1 + PBUILDER_BUILD_LOGFILE=$(readlink -f "${PBUILDER_BUILD_LOGFILE}") + log "I: Using pkgname logfile" + echobacktime fi fi @@ -119,82 +117,63 @@ CCACHE_ENV= setup_ccache SUTOUSER="$CCACHE_ENV $SUTOUSER" -log.i "Installing the build-deps" +log "I: Installing the build-deps" executehooks "D" trap saveaptcache_umountproc_cleanbuildplace_trap exit sighup sigpipe checkbuilddep "$PACKAGENAME" save_aptcache trap umountproc_cleanbuildplace_trap exit sighup sigpipe -log.i "Copying source file" -copydsc "$PACKAGENAME" "${BUILDPLACE}$BUILDDIR" -copyinputfile "${BUILDPLACE}$BUILDDIR" +log "I: Copying source file" +copydsc "$PACKAGENAME" "$BUILDPLACE/tmp/buildd" +copyinputfile "$BUILDPLACE/tmp/buildd" -log.i "Extracting source" -if echo "chown $BUILDUSERNAME:$BUILDUSERNAME $BUILDDIR $BUILDDIR/*" | $CHROOTEXEC /bin/bash; then +log "I: Extracting source" +if echo "chown $BUILDUSERNAME:$BUILDUSERNAME /tmp/buildd /tmp/buildd/*" | $CHROOTEXEC /bin/bash; then : # success else - log.e "pbuilder: Failed chowning to $BUILDUSERNAME:$BUILDUSERNAME" + log "E: pbuilder: Failed chowning to $BUILDUSERNAME:$BUILDUSERNAME" exit 1; fi -if echo "( cd $BUILDDIR; env PATH=\"$PATH\" /usr/bin/dpkg-source -x $(basename "$PACKAGENAME") )" | $UNSHARE $CHROOTEXEC env $SUTOUSER ; then +if echo "( cd tmp/buildd; env PATH=\"$PATH\" /usr/bin/dpkg-source -x $(basename $PACKAGENAME) )" | $UNSHARE $CHROOTEXEC env $SUTOUSER ; then : # success else - log.e "pbuilder: Failed extracting the source" + log "E: pbuilder: Failed extracting the source" exit 1; fi -binNMU - -log.i "Building the package" +log "I: Building the package" executehooks "A" -DPKG_COMMANDLINE="env PATH=\"$PATH\" HOME=\"$BUILD_HOME\" dpkg-buildpackage -us -uc $DEBBUILDOPTS" - -# https://launchpad.net/bugs/816556 -unset DISPLAY - -if [ "$USENETWORK" = "no" ]; then - # empty /etc/resolv.conf, so software trying to resolv addresses even when - # no network is possible doesn't choke. - echo > "$BUILDPLACE/etc/resolv.conf" -fi +DPKG_COMMANDLINE="env PATH=\"$PATH\" dpkg-buildpackage -us -uc ${DEBEMAIL:+\"-e$DEBEMAIL\"} $DEBBUILDOPTS" ( : Build process if [ -n "$TWICE" ]; then DPKG_COMMANDLINE="$DPKG_COMMANDLINE && $DPKG_COMMANDLINE" fi - DPKG_COMMANDLINE="cd ${BUILDDIR}/*/ && $DPKG_COMMANDLINE" - log.i "Running $DPKG_COMMANDLINE" + DPKG_COMMANDLINE="cd tmp/buildd/*/ && $DPKG_COMMANDLINE" + log "I: Running $DPKG_COMMANDLINE" echo "$DPKG_COMMANDLINE" | $UNSHARE $CHROOTEXEC env $SUTOUSER ) & BUILD_PID=$! if [ -n "${TIMEOUT_TIME}" ]; then - ( - : Timeout process - sleep "${TIMEOUT_TIME}" - log.i "Terminating build process due to timeout " - kill "${BUILD_PID}" || true + ( + : Timeout process + sleep "${TIMEOUT_TIME}" + log "I: Terminating build process due to timeout " + kill ${BUILD_PID} || true ) & # timeout process - KILL_WAIT_PID="kill $! || true; echo \"I: Terminate timeout process\"; " + KILL_WAIT_PID="kill "$!" || true; echo \"I: Terminate timeout process\"; " else KILL_WAIT_PID="" fi -if ! wait "${BUILD_PID}"; then +if ! wait ${BUILD_PID}; then trap umountproc_cleanbuildplace_trap exit sighup sigpipe eval "${KILL_WAIT_PID}" - if [ "$USENETWORK" = "no" ]; then - copy_local_configuration resolv.conf - fi - log.e "Failed autobuilding of package" - if [ -d "${BUILDRESULT}" ]; then - export_additional_buildresults - else - log.e "BUILDRESULT=[$BUILDRESULT] is not a directory." - fi + log "E: Failed autobuilding of package" executehooks "C" exit 1; else @@ -202,31 +181,28 @@ # build was successful fi -if [ "$USENETWORK" = "no" ]; then - copy_local_configuration resolv.conf -fi - +trap umountproc_cleanbuildplace_trap exit sighup sigpipe executehooks "B" +save_aptcache +trap cleanbuildplace_trap exit sighup sigpipe +umountproc if [ -d "${BUILDRESULT}" ]; then - chown "${BUILDRESULTUID}:${BUILDRESULTGID}" "${BUILDPLACE}$BUILDDIR/"* - chgrp "${BUILDRESULTGID}" "${BUILDPLACE}$BUILDDIR/"* - for FILE in "${BUILDPLACE}$BUILDDIR"/*; do - if [ -f "${FILE}" ]; then - cp -p "${FILE}" "${BUILDRESULT}" || true - fi + chown "${BUILDRESULTUID}:${BUILDRESULTGID}" "${BUILDPLACE}"/tmp/buildd/* + chgrp "${BUILDRESULTGID}" "${BUILDPLACE}"/tmp/buildd/* + for FILE in "${BUILDPLACE}"/tmp/buildd/*; do + if [ -f "${FILE}" ]; then + cp -p ${FILE} "${BUILDRESULT}" || true + fi + done + for FILE in "${ADDITIONAL_BUILDRESULTS[@]}"; do + log "I: Trying to save additional result ${FILE}" + cp -a "${BUILDPLACE}/tmp/buildd/"*"/${FILE}" "${BUILDRESULT}" || true done - export_additional_buildresults - executehooks "I" else - log.e "BUILDRESULT=[$BUILDRESULT] is not a directory." + log "E: BUILDRESULT=[$BUILDRESULT] is not a directory." fi -# final cleanup -trap umountproc_cleanbuildplace_trap exit sighup sigpipe -save_aptcache -trap cleanbuildplace_trap exit sighup sigpipe -umountproc : cleanbuildplace trap - exit sighup sigpipe diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-buildpackage-funcs pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-buildpackage-funcs --- pbuilder-0.223~ubuntu14.04.1/pbuilder-buildpackage-funcs 2016-01-11 19:51:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-buildpackage-funcs 2015-06-22 08:05:23.000000000 +0000 @@ -1,7 +1,6 @@ #! /bin/bash # pbuilder -- personal Debian package builder -# Copyright © 2001-2007 Junichi Uekawa -# 2015 Mattia Rizzolo +# Copyright (C) 2001,2002,2005-2007 Junichi Uekawa # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,30 +15,17 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -############################################################################### # functions local to pbuilder-buildpackage -getdscfiles () { - local DSCFILE="$1" - local DSCFILES=() - DSCFILES+=("$DSCFILE") - DSCFILES+=("$(cat "$DSCFILE" | - awk 'BEGIN{p=0} - ! /^[ \t]/ {p=0} - /^Files:/ {p=1} - ! /^[ \t]*/ {p=0} - /^ / {if (p){print "'$(dirname "$DSCFILE")'/" $3}}' | - tr '\n' ' ' | sed -e 's/[[:space:]]*$//')") - # ↑↑↑ because we are really picky (and we have picky tests...) - echo "${DSCFILES[@]}" -} - function copydsc () { - local DSCFILE=$(getdscfiles "$1") + local DSCFILE="$1" local TARGET="$2" - for FILE in ${DSCFILE[@]} ; do - log.i "copying [$FILE]" + for FILE in \ + "$DSCFILE" \ + $(cat "$DSCFILE" | \ + awk 'BEGIN{p=0} /^$/ {p=0} /^.*:/ {p=0} {if (p){print "'$(dirname "$DSCFILE")'/" $3}} /^Files:/{p=1}' ) ; do + log "I: copying [$FILE]" cp -p "$FILE" "$TARGET" done } @@ -48,133 +34,80 @@ # call satisfydepends local BUILDOPT="--binary-all" case "${BINARY_ARCH}" in - binary) BUILDOPT="--binary-arch";; - *) ;; + yes) BUILDOPT="--binary-arch";; + *) ;; esac if "$PBUILDERSATISFYDEPENDSCMD" --control "$1" --chroot "${BUILDPLACE}" --internal-chrootexec "${CHROOTEXEC}" "${BUILDOPT}" "${PBUILDERSATISFYDEPENDSOPT[@]}"; then - : + : else - # If asked to preserve the build place, and pbuilder-satisfydepends - # didn't taint it, then don't clean it when exiting. - if [ $? -eq 2 -a "${PRESERVE_BUILDPLACE}" = "yes" ]; then - trap umountproc_trap exit sighup - fi - log.e "pbuilder-satisfydepends failed." - exit 2 + # If asked to preserve the build place, and pbuilder-satisfydepends + # didn't taint it, then don't clean it when exiting. + if [ $? -eq 2 -a "${PRESERVE_BUILDPLACE}" = "yes" ]; then + trap umountproc_trap exit sighup + fi + log "E: pbuilder-satisfydepends failed." + exit 2 fi # install extra packages to the chroot if [ -n "$EXTRAPACKAGES" ]; then - $CHROOTEXEC usr/bin/apt-get -q -y "${APTGETOPT[@]}" install ${EXTRAPACKAGES} + $CHROOTEXEC usr/bin/apt-get -q -y "${APTGETOPT[@]}" install ${EXTRAPACKAGES} fi } function showbuildbanner () { # show some banners for building - log.i "pbuilder-buildpackage/"$(dpkg --print-architecture) - log.i "$1" + log "I: pbuilder-buildpackage/"$(dpkg --print-architecture) + log "I: $1" } function cowprotect () { # a hack for cowdancer, used when a file is edited in-place; # Copy the file to create a new i-node so that hardlinked original is intact for A in "$@"; do - if readlink -f "$A" > /dev/null; then - A=$(readlink -f "$A") - mv "$A" "$A"~ - cp -a "$A"~ "$A" - rm -f "$A"~ - fi + if readlink -f "$A" > /dev/null; then + A=$(readlink -f "$A") + mv "$A" "$A"~ + cp -a "$A"~ "$A" + rm -f "$A"~ + fi done } function createbuilduser () { # create the build user, if it is necessary and specified. if [ -n "$BUILDUSERNAME" -a -n "$BUILDUSERID" ]; then - if [ -e $BUILDPLACE/etc/shadow ]; then p='x'; else p='*'; fi - if [ -e $BUILDPLACE/etc/gshadow ]; then g='x'; else g='*'; fi - if ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/passwd; then - cowprotect $BUILDPLACE/etc/passwd - echo "$BUILDUSERNAME:$p:$BUILDUSERID:$BUILDUSERID:,,,:$BUILD_HOME:/bin/sh" >> $BUILDPLACE/etc/passwd - fi - if ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/group; then - cowprotect $BUILDPLACE/etc/group - echo "$BUILDUSERNAME:$g:$BUILDUSERID:" >> $BUILDPLACE/etc/group - fi - if [ -e $BUILDPLACE/etc/shadow ] && ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/shadow; then - cowprotect $BUILDPLACE/etc/shadow - echo "$BUILDUSERNAME:!:::::::" >> $BUILDPLACE/etc/shadow - fi - if [ -e $BUILDPLACE/etc/gshadow ] && ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/gshadow; then - cowprotect $BUILDPLACE/etc/gshadow - echo "$BUILDUSERNAME:!::" >> $BUILDPLACE/etc/gshadow - fi - unset LOGNAME || true + if [ -e $BUILDPLACE/etc/shadow ]; then p='x'; else p='*'; fi + if [ -e $BUILDPLACE/etc/gshadow ]; then g='x'; else g='*'; fi + if ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/passwd; then + cowprotect $BUILDPLACE/etc/passwd + echo "$BUILDUSERNAME:$p:$BUILDUSERID:$BUILDUSERID:,,,:/tmp/buildd:/bin/sh" >> $BUILDPLACE/etc/passwd + fi + if ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/group; then + cowprotect $BUILDPLACE/etc/group + echo "$BUILDUSERNAME:$g:$BUILDUSERID:" >> $BUILDPLACE/etc/group + fi + if [ -e $BUILDPLACE/etc/shadow ] && ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/shadow; then + cowprotect $BUILDPLACE/etc/shadow + echo "$BUILDUSERNAME:!:::::::" >> $BUILDPLACE/etc/shadow + fi + if [ -e $BUILDPLACE/etc/gshadow ] && ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/gshadow; then + cowprotect $BUILDPLACE/etc/gshadow + echo "$BUILDUSERNAME:!::" >> $BUILDPLACE/etc/gshadow + fi + unset LOGNAME || true else - unset LOGNAME || true + unset LOGNAME || true fi } function setup_ccache() { if [ -n "$CCACHEDIR" ]; then - log.i "Setting up ccache" + log "I: Setting up ccache" if ! [ -d "$BUILDPLACE/$CCACHEDIR" ]; then mkdir -p "$BUILDPLACE/$CCACHEDIR" fi chown -R $BUILDUSERID:$BUILDUSERID "$BUILDPLACE/$CCACHEDIR" - CCACHE_ENV="CCACHE_DIR=$CCACHEDIR" - unset CCACHE_DIR - fi -} - -function binNMU() { - if [ "$BIN_NMU" == "no" ]; then - return - fi - if [ -z "$BINNMU_MESSAGE" ]; then - log.e "No changelog message provided for binNMU entry." - exit 1 - fi - if [ -z "$BINNMU_VERSION" ]; then - log.w "No version provided for binNMU entry, fall back to 1." - BINNMU_VERSION=1 - fi - log.i "Doing a binNMU, version $BINNMU_VERSION to '$BINNMU_MESSAGE'" - local cl=$(ls "$BUILDPLACE"/"$BUILDDIR"/*/debian/changelog) - local tmpcl=$(mktemp pbuilder.tmpchangelog.XXXXXXXXXXX) - if [ ! -f "$cl" ]; then - log.e "Cannot open debian/changelog for binNMU version handling." - exit 1 - fi - mv "$cl" "$tmpcl" - local package=$(dpkg-parsechangelog -l "$tmpcl" -c 1 --show-field Source) - local version=$(dpkg-parsechangelog -l "$tmpcl" -c 1 --show-field Version) - local arch=$($CHROOTEXEC dpkg-architecture -qDEB_HOST_ARCH) - local date=$(date -R) - if [ -z "$BINNMU_MAINTAINER" ]; then - log.w "No maintainer provided for binNMU entry, fall back to last uploader." - BINNMU_MAINTAINER=$(dpkg-parsechangelog -l $tmpcl -c 1 --show-field Maintainer) - fi - if [ -z "$DISTRIBUTION" ]; then - log.w "No distribution provided, using the field from the last upload" - DISTRIBUTION=$(dpkg-parsechangelog -l "$tmpcl" -c 1 --show-field Distribution) + CCACHE_ENV="CCACHE_DIR=$CCACHEDIR" + unset CCACHE_DIR fi - DEBBUILDOPTS="${DEBBUILDOPTS} -e\"$BINNMU_MAINTAINER\"" - cat > "$cl" << EOF -$package ($version+b$BINNMU_VERSION) $DISTRIBUTION; urgency=low, binary-only=yes - - * Binary-only non-maintainer upload for $arch; no source changes. - * $BINNMU_MESSAGE - - -- $BINNMU_MAINTAINER $date - -EOF - cat "$tmpcl" >> "$cl" - rm "$tmpcl" -} - -function export_additional_buildresults() { - for FILE in "${ADDITIONAL_BUILDRESULTS[@]}"; do - log.i "Trying to save additional result ${FILE}" - cp -a "${BUILDPLACE}$BUILDDIR/"*"/${FILE}" "${BUILDRESULT}" || true - done } diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-checkparams pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-checkparams --- pbuilder-0.223~ubuntu14.04.1/pbuilder-checkparams 2016-01-20 02:43:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-checkparams 2015-06-22 08:05:23.000000000 +0000 @@ -22,7 +22,6 @@ # pbuilder-uml calls uml-checkparams. export PBUILDER_PKGLIBDIR="${PBUILDER_PKGLIBDIR:-$PBUILDER_ROOT/usr/lib/pbuilder}" -CMDLINE="$@" . "$PBUILDER_PKGLIBDIR"/pbuilder-loadconfig . "$PBUILDER_PKGLIBDIR"/pbuilder-modules @@ -33,8 +32,7 @@ CHROOTEXEC="" OVERRIDE_APTLINES="no" OVERRIDE_APTLINES_WARN="" # set this if --override-config option should be set. -BINARY_ARCH="any" # can be one of 'any', 'all', 'binary' -BIN_NMU="no" +BINARY_ARCH="no" PBUILDER_BUILD_LOGFILE= PRESERVE_BUILDPLACE="no" unset EXTRA_CONFIGFILE || true @@ -51,7 +49,7 @@ touch "$2";; esac if [ ! -f "$2" ]; then - log.e "File $2 does not exist" + log "E: File $2 does not exist" exit 1 fi BASETGZ=$(readlink -f "$2"); @@ -59,7 +57,7 @@ ;; --buildplace) if [ ! -d "$2" ] ; then - log.e "Directory $2 does not exist" + log "E: Directory $2 does not exist" exit 1 fi BUILDPLACE=$(readlink -f "$2"); @@ -99,7 +97,7 @@ BUILDRESULT=$(readlink -f "$2"); else BUILDRESULT="$2" - log.w "Build-result Directory $2 does not exist" + log "W: Build-result Directory $2 does not exist" # warn, but make it progress. fi else @@ -118,7 +116,7 @@ if [ -d "$2" ]; then APTCACHE=$(readlink -f "$2"); else - log.e "Directory $2 does not exist" + log "E: Directory $2 does not exist" exit 1 fi else @@ -134,22 +132,12 @@ REMOVEPACKAGES="$2"; shift; shift; ;; - --loglevel) - LOGLEVEL="$2" - shift; shift; - ;; --configfile) if [ ! -f "$2" ]; then - log.e "Config file $2 does not exist" + log "E: Config file $2 does not exist" exit 1 fi . "$2"; - # deprecated in v0.216 - if [ -n "$PKGNAME_LOGFILE_EXTENTION" ] ; then - echo "W: The configuration option PKGNAME_LOGFILE_EXTENTION is deprecated in favour of PKGNAME_LOGFILE_EXTENSION. Though, while you have the former set it'll take precedence over the latter." - echo "W: PKGNAME_LOGFILE_EXTENTION will be removed at some point, please update your config!" - PKGNAME_LOGFILE_EXTENSION="$PKGNAME_LOGFILE_EXTENTION" - fi EXTRA_CONFIGFILE[${#EXTRA_CONFIGFILE[@]}]="$2"; shift; shift; ;; @@ -164,11 +152,6 @@ --debemail) DEBEMAIL="$2"; shift; shift; - # deprecated in v0.222 - if [ -n "$DEBEMAIL" ]; then - echo "W: The configuration option DEBEMAIL is deprecated. Please pass the required options to DEBBUILDOPTS (--debbuildopts command line flag) instead." - echo "W: DEBEMAIL='$DEBEMAIL' is ignored!" - fi ;; --debbuildopts) # append to DEBBUILDOPTS or reset to empty if $2 isn't set @@ -176,7 +159,7 @@ shift; shift; ;; --logfile) - log.i "Logging to $2" + log "I: Logging to $2" exec > >(tee "$2") 2>&1 PBUILDER_BUILD_LOGFILE=$(readlink -f "$2") shift; shift; @@ -195,34 +178,17 @@ ;; --help) showhelp - exit 0 ;; --override-config) OVERRIDE_APTLINES="yes" shift; ;; --binary-arch) - BINARY_ARCH="binary" + BINARY_ARCH="yes" # XXX this might be overwriten by --debbuildopts "" DEBBUILDOPTS="${DEBBUILDOPTS} -B" shift; ;; - --bin-nmu) - BIN_NMU="yes" - BINARY_ARCH="binary" - # XXX this might be overwriten by --debbuildopts "" - DEBBUILDOPTS="${DEBBUILDOPTS} -B" - BINNMU_MESSAGE="$2" - shift; shift; - ;; - --bin-nmu-maintainer) - BINNMU_MAINTAINER="$2" - shift; shift; - ;; - --bin-nmu-version) - BINNMU_VERSION="$2" - shift; shift; - ;; --preserve-buildplace) PRESERVE_BUILDPLACE="yes" shift; @@ -245,10 +211,6 @@ ALLOWUNTRUSTED=yes; shift; ;; - --debdelta) - DEBDELTA=yes; - shift; - ;; --keyring) APTKEYRINGS[${#APTKEYRINGS[@]}]="$2"; shift; shift; @@ -259,7 +221,7 @@ ;; --inputfile) if [ ! -f "$2" ]; then - log.e "Input file $2 does not exist" + log "E: Input file $2 does not exist" exit 1 fi INPUTFILE[${#INPUTFILE[@]}]="$2"; @@ -283,13 +245,13 @@ ;; --no-targz) # specify this option if I am running in no-targz mode - log.i "Running in no-targz mode" + log "I: Running in no-targz mode" INTERNAL_BUILD_UML="yes" shift; ;; --internal-build-uml) # specify this option if I am running inside UML. - log.i "Running in pbuilder-user-mode-linux mode" + log "I: Running in pbuilder-user-mode-linux mode" INTERNAL_BUILD_UML="yes" IGNORE_UMOUNT="no" shift; @@ -303,7 +265,7 @@ break; ;; --*) - log.e "Unknown option [$1] was specified " + log "E: Unknown option [$1] was specified " exit 1; ;; *) @@ -312,8 +274,6 @@ esac done -log.d "cmdline: ${PBCURRENTCOMMANDLINEOPERATION} ${CMDLINE}" - BUILDPLACE=${BUILDPLACE?"Build root directory is not defined"} # the default is to add a PID in the buildplace specified in the config file. @@ -325,45 +285,30 @@ CHROOTEXEC="chroot $BUILDPLACE " fi -# sanity check of LOGLEVEL -case "$LOGLEVEL" in - D|I|W|E) ;; - *) # use log() instead of log.e() to override the buggy LOGLEVEL - log "E: A non-valid LOGLEVEL has been specified: '${LOGLEVEL}'." - log "E: Valid values are D, I, W, E" - exit 1 - ;; -esac - # handle 'experimental' specially. -- required for raw pbuilder (create/update) only. -case "$PBCURRENTCOMMANDLINEOPERATION" in - --update|update|--create|create) - if [ "$DISTRIBUTION" = "experimental" ]; then - DISTRIBUTION="sid" - EXPERIMENTAL="true" - else - EXPERIMENTAL="" - fi - ;; - *) EXPERIMENTAL="" ;; -esac - +if [ "$DISTRIBUTION" = "experimental" ]; then + DISTRIBUTION="sid" + EXPERIMENTAL="true" +else + EXPERIMENTAL= +fi case "$PBCURRENTCOMMANDLINEOPERATION" in --login|login|--execute|execute|--pdebuild|pdebuild) - # don't do anything if it is "login", or pdebuild - ;; + # don't do anything if it is "login", or pdebuild + ;; *) - # line from kobras@debian.org - if [ "$DEBIAN_FRONTEND" = "noninteractive" -o "$DEBIAN_FRONTEND" = "Noninteractive" ]; then - exec < /dev/null - # set variables used in the upgrade option. - FORCE_CONFNEW[0]='-o' - FORCE_CONFNEW[1]='DPkg::Options::=--force-confnew' - else - unset FORCE_CONFNEW || true - fi - ;; +# line from kobras@debian.org + if [ "$DEBIAN_FRONTEND" = "noninteractive" -o "$DEBIAN_FRONTEND" = "Noninteractive" ]; then + exec < /dev/null + + # set variables used in the upgrade option. + FORCE_CONFNEW[0]='-o' + FORCE_CONFNEW[1]='DPkg::Options::=--force-confnew' + else + unset FORCE_CONFNEW || true + fi + ;; esac if [ -n "$CCACHEDIR" ]; then diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-createbuildenv pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-createbuildenv --- pbuilder-0.223~ubuntu14.04.1/pbuilder-createbuildenv 2016-01-05 16:47:41.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-createbuildenv 2015-06-22 08:05:23.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/bash +# Creating the build environment with debootstrap. # pbuilder -- personal Debian package builder -# Copyright © 2001-2007 Junichi Uekawa -# 2015 Mattia Rizzolo +# Copyright (C) 2001-2003,2005-2007 Junichi Uekawa # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,16 +16,17 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -############################################################################### + set -e -. "${BASH_SOURCE%/*}/pbuilder-checkparams" +. /usr/lib/pbuilder/pbuilder-checkparams +. /usr/lib/pbuilder/pbuilder-runhooks if [ -z "$DISTRIBUTION" ]; then DISTRIBUTION=sid fi -log.i "Distribution is $DISTRIBUTION." +log "I: Distribution is $DISTRIBUTION." if [ "${PBUILDER_DEBUGMODE}" = "yes" ]; then TRAP="echo ignoring trap " @@ -39,64 +40,64 @@ # first clean it. cleanbuildplace -log.i "Building the build environment" +log "I: Building the build environment" mkdir -p "$BUILDPLACE" if [ ! -d "$BUILDPLACE" ]; then - log.e "Could not make directory [$BUILDPLACE]" + log "E: Could not make directory [$BUILDPLACE]" exit 1 fi $TRAP cleanbuildplace exit -log.i "running $DEBOOTSTRAP" +log "I: running $DEBOOTSTRAP" unset DEBOOTSTRAPSCRIPT if [ -n "$HOOKDIR" ]; then if [ -f "$HOOKDIR/$DISTRIBUTION" ]; then DEBOOTSTRAPSCRIPT=$(readlink -f "$HOOKDIR")"/$DISTRIBUTION" - log.i "Applying user distribution dist build script $DEBOOTSTRAPSCRIPT" + log "I: Applying user distribution dist build script $DEBOOTSTRAPSCRIPT" fi fi if which "${DEBOOTSTRAP}"; then : # debootstrap exists else - log.e "${DEBOOTSTRAP} does not exist, install or change DEBOOTSTRAP option" + log "E: ${DEBOOTSTRAP} does not exist, install or change DEBOOTSTRAP option" exit 1 fi # FIXME if the end-user passes another --include= to debootstrap in # DEBOOTSTRAPOPTS, it will override the --include=apt one and apt might not be # installed -if ! ( "${DEBOOTSTRAP}" \ - ${ARCHITECTURE:+--arch=$ARCHITECTURE} \ +if ! ( cd "$BUILDPLACE" && \ + "${DEBOOTSTRAP}" ${ARCHITECTURE:+--arch=$ARCHITECTURE} \ --include=apt \ "${DEBOOTSTRAPOPTS[@]}" \ "$DISTRIBUTION" \ - "$BUILDPLACE" \ + . \ "$MIRRORSITE" \ $DEBOOTSTRAPSCRIPT ) ; then - log.e "$DEBOOTSTRAP failed" + log "E: $DEBOOTSTRAP failed" exit 1 fi -log.i "debootstrap finished" +log "I: debootstrap finished" +loadhooks -mkdir -p "${BUILDPLACE}$BUILDDIR" +mkdir -p "$BUILDPLACE/tmp/buildd" copy_local_configuration installaptlines add_additional_aptkeyrings -loadhooks executehooks "G" -log.i "Refreshing the base.tgz " -log.i "upgrading packages" +log "I: Refreshing the base.tgz " +log "I: upgrading packages" mountproc $TRAP umountproc_cleanbuildplace_trap exit sighup -$CHROOTEXEC /usr/bin/apt-get -q "${APTGETOPT[@]}" update +$CHROOTEXEC /usr/bin/apt-get -q update -case "$(readlink -e "$PBUILDERSATISFYDEPENDSCMD")" in +case "`readlink -e "$PBUILDERSATISFYDEPENDSCMD"`" in *-aptitude) EXTRAPACKAGES="$EXTRAPACKAGES aptitude" ;; @@ -127,6 +128,7 @@ save_aptcache executehooks "E" +unloadhooks umountproc $CHROOTEXEC /usr/bin/apt-get clean || true $TRAP cleanbuildplace_trap exit sighup diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-loadconfig pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-loadconfig --- pbuilder-0.223~ubuntu14.04.1/pbuilder-loadconfig 2016-01-16 17:43:46.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-loadconfig 2015-06-22 08:05:23.000000000 +0000 @@ -30,10 +30,4 @@ # log() is not available echo "W: $RCFILE does not exist" >&2 fi - # deprecated in v0.216 - if [ -n "$PKGNAME_LOGFILE_EXTENTION" ] ; then - echo "W: The configuration option PKGNAME_LOGFILE_EXTENTION is deprecated in favour of PKGNAME_LOGFILE_EXTENSION. Though, while you have the former set it'll take precedence over the latter." - echo "W: PKGNAME_LOGFILE_EXTENTION will be removed at some point, please update your config!" - PKGNAME_LOGFILE_EXTENSION="$PKGNAME_LOGFILE_EXTENTION" - fi done diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-modules pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-modules --- pbuilder-0.223~ubuntu14.04.1/pbuilder-modules 2016-01-24 17:40:12.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-modules 2015-06-22 16:04:04.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/bash +# common modules for pbuilder. # pbuilder -- personal Debian package builder -# Copyright © 2001-2009 Junichi Uekawa -# 2015 Mattia Rizzolo +# Copyright (C) 2001-2009 Junichi Uekawa # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,11 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -############################################################################### - -# common modules for pbuilder. -hooks=tmp/hooks function showhelp () { cat <&2 - ;; - "W: "*) - echo "$*" >&2 - ;; - "I: "*) - echo "$*" - ;; - "D: "*) - echo "$*" - ;; - *) - echo "malformed log message: $*" - exit 1 - ;; - esac -} - -log.e() { - case "$LOGLEVEL" in - D|I|W|E) log "E: $*" ;; - esac -} -log.w() { - case "$LOGLEVEL" in - D|I|W) log "W: $*" ;; - esac -} -log.i() { - case "$LOGLEVEL" in - D|I) log "I: $*" ;; - esac -} -log.d() { - case "$LOGLEVEL" in - D) log "D: $*" ;; + "E: "*) + echo "$*" >&2 + ;; + "W: "*) + echo "$*" >&2 + ;; + "I: "*) + echo "$*" + ;; + *) + echo "malformed log message: $*" + exit 1 + ;; esac } @@ -145,41 +128,40 @@ local mountpoint mountpoint="$1" if ! [ -e "$BUILDPLACE/$mountpoint" ]; then - log.w "$mountpoint doesn't exist" + log "W: $mountpoint doesn't exist" return 1 fi if ! [ -d "$BUILDPLACE/$mountpoint" ]; then - log.w "$mountpoint isn't a directory" + log "W: $mountpoint isn't a directory" return 1 fi if [ -r "$BUILDPLACE/proc/mounts" ] && \ - grep -q "^[^ ]* $mountpoint " "$BUILDPLACE/proc/mounts"; then - log.w "$mountpoint is mounted according to build place's /proc/mounts" + grep -q "^[^ ]* $mountpoint " "$BUILDPLACE/proc/mounts"; then + log "W: $mountpoint is mounted according to build place's /proc/mounts" return 1 fi if [ -r "/proc/mounts" ] && \ - grep -q "^[^ ]* $BUILDPLACE/$mountpoint " "/proc/mounts"; then - log.w "$mountpoint is mounted according to system's /proc/mounts" + grep -q "^[^ ]* $BUILDPLACE/$mountpoint " "/proc/mounts"; then + log "W: $mountpoint is mounted according to system's /proc/mounts" return 1 fi if ! is_empty_dir "$BUILDPLACE/$mountpoint"; then - log.w "$mountpoint not empty" + log "W: $mountpoint not empty" return 1 fi return 0 } function umount_one () { - DEB_BUILD_ARCH_OS=$(dpkg-architecture -qDEB_BUILD_ARCH_OS) if [ "${IGNORE_UMOUNT}" = "yes" ]; then - # support ignore umount option. - log.i "ignoring umount of $1 filesystem" - return + # support ignore umount option. + log "I: ignoring umount of $1 filesystem" + return fi - log.i "unmounting $1 filesystem" + log "I: unmounting $1 filesystem" local UMOUNT_OUTPUT if ! UMOUNT_OUTPUT="$(LC_ALL=C umount "$BUILDPLACE/$1" 2>&1)"; then - log.w "Could not unmount $1: $UMOUNT_OUTPUT" + log "W: Could not unmount $1: $UMOUNT_OUTPUT" local ignore_umount_error="no" case $UMOUNT_OUTPUT in "umount: "*": not found"|"umount:"*": not mounted") @@ -187,7 +169,7 @@ if seems_truly_unmounted "$1"; then ignore_umount_error="yes" else - log.w "Tried ignoring error in unmount, but sanity check failed: $1 might still be mounted" + log "W: Tried ignoring error in unmount, but sanity check failed: $1 might still be mounted" fi ;; *) @@ -195,11 +177,11 @@ ;; esac if [ "$ignore_umount_error" != "yes" ]; then - log.w "Retrying to unmount $1 in 5s" - sleep 5s - while ! umount "$BUILDPLACE/$1"; do - sleep 5s - cat < /dev/null || true - mounted[${#mounted[@]}]="$BUILDPLACE/proc" + log "I: mounting /proc filesystem" + mkdir -p $BUILDPLACE/proc + PROCFS="proc" + if [ "$DEB_BUILD_ARCH_OS" = "kfreebsd" ]; then + PROCFS="linprocfs" + fi + mount -t $PROCFS /proc "$BUILDPLACE/proc" + ln -s ../proc/mounts $BUILDPLACE/etc/mtab 2> /dev/null || true + mounted[${#mounted[@]}]="$BUILDPLACE/proc" fi if [ "$USEDEVFS" = "yes" ]; then - log.i "mounting /dev filesystem" - mkdir -p "$BUILDPLACE/dev" || true - mount -t devfs /dev "$BUILDPLACE/dev" - mounted[${#mounted[@]}]="$BUILDPLACE/dev" + log "I: mounting /dev filesystem" + mkdir -p $BUILDPLACE/dev || true + mount -t devfs /dev "$BUILDPLACE/dev" + mounted[${#mounted[@]}]="$BUILDPLACE/dev" fi if [ "$DEB_BUILD_ARCH_OS" = "linux" ] && [ "$USERUNSHM" = "yes" ]; then - log.i "mounting /run/shm filesystem" - mkdir -p "$BUILDPLACE/run/shm" || true - mount -t tmpfs tmpfs "$BUILDPLACE/run/shm" - mounted[${#mounted[@]}]="$BUILDPLACE/run/shm" + log "I: mounting /run/shm filesystem" + mkdir -p $BUILDPLACE/run/shm || true + mount -t tmpfs tmpfs "$BUILDPLACE/run/shm" + mounted[${#mounted[@]}]="$BUILDPLACE/run/shm" fi if [ "$DEB_BUILD_ARCH_OS" = "linux" ] && [ "$USEDEVPTS" = "yes" ]; then - log.i "mounting /dev/pts filesystem" - mkdir -p "$BUILDPLACE/dev/pts" || true - TTYGRP=5 - TTYMODE=620 - [ -f /etc/default/devpts ] && . /etc/default/devpts - mount -t devpts none "$BUILDPLACE/dev/pts" -onoexec,nosuid,gid=$TTYGRP,mode=$TTYMODE - mounted[${#mounted[@]}]="$BUILDPLACE/dev/pts" + log "I: mounting /dev/pts filesystem" + mkdir -p $BUILDPLACE/dev/pts || true + TTYGRP=5 + TTYMODE=620 + [ -f /etc/default/devpts ] && . /etc/default/devpts + mount -t devpts none "$BUILDPLACE/dev/pts" -onoexec,nosuid,gid=$TTYGRP,mode=$TTYMODE + mounted[${#mounted[@]}]="$BUILDPLACE/dev/pts" fi if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then - log.i "mounting selinux filesystem" - local SELINUX="$(grep -m 1 ^selinuxfs /proc/mounts | cut -d ' ' -f 2)" - mkdir -p "$BUILDPLACE/$SELINUX" - mount --bind "$SELINUX" "$BUILDPLACE/$SELINUX" - mount -o remount,ro,bind "$BUILDPLACE/$SELINUX" - mounted[${#mounted[@]}]="$BUILDPLACE/$SELINUX" - fi - if [ "$DEB_BUILD_ARCH_OS" = "hurd" ]; then - # /dev and /servers might have already been mounted at - # debootstrap chroot creation - mount -t firmlink /dev "$BUILDPLACE/dev" || true - mounted[${#mounted[@]}]="$BUILDPLACE/dev" - mount -t firmlink /servers "$BUILDPLACE/servers" || true - mounted[${#mounted[@]}]="$BUILDPLACE/servers" + log "I: mounting selinux filesystem" + mkdir -p $BUILDPLACE/selinux + mount -t selinuxfs /selinux "$BUILDPLACE/selinux" + mounted[${#mounted[@]}]="$BUILDPLACE/selinux" fi MOUNTPARAMS="-obind" [ "$DEB_BUILD_ARCH_OS" = "kfreebsd" ] && MOUNTPARAMS="-t nullfs" for mnt in $BINDMOUNTS; do - log.i "Mounting $mnt" - if mkdir -p "$BUILDPLACE/$mnt" && - mount $MOUNTPARAMS "$mnt" "$BUILDPLACE/$mnt"; then - # successful. - mounted[${#mounted[@]}]="$mnt" - else - # this part of code is the only part which is supposed to fail. - # When unsuccessful, backtrack / umount and abort. - if [ -n "${mounted[*]}" ]; then - log.i "error recovery: umount successfully mounted mount-points: ${mounted[@]}" - for umnt in "${mounted[@]}"; do - log.i "umounting $umnt" - umount "$umnt" - done - fi - exit 1 - fi + log "I: Mounting $mnt" + if mkdir -p "$BUILDPLACE/$mnt" && + mount $MOUNTPARAMS "$mnt" "$BUILDPLACE/$mnt"; then + # successful. + mounted[${#mounted[@]}]="$mnt" + else + # this part of code is the only part which is supposed to fail. + # When unsuccessful, backtrack / umount and abort. + if [ -n "${mounted[*]}" ]; then + log "I: error recovery: umount successfully mounted mount-points: ${mounted[@]}" + for umnt in "${mounted[@]}"; do + log "I: umounting $umnt" + umount "$umnt" + done + fi + exit 1 + fi done if [ -f "$BUILDPLACE/usr/sbin/policy-rc.d" ]; then - log.i "policy-rc.d already exists" + log "I: policy-rc.d already exists" else - log.i "installing dummy policy-rc.d" - echo "\ + log "I: installing dummy policy-rc.d" + echo "\ #!/bin/sh while true; do -case \"\$1\" in +case "\$1" in -*) shift ;; makedev) exit 0;; x11-common) exit 0;; @@ -360,22 +316,22 @@ esac done -" > "$BUILDPLACE/usr/sbin/policy-rc.d" - chmod a+x "$BUILDPLACE/usr/sbin/policy-rc.d" +" > "$BUILDPLACE/usr/sbin/policy-rc.d" + chmod a+x "$BUILDPLACE/usr/sbin/policy-rc.d" fi } ## function to clean subdirs, use instead of rm -r function clean_subdirectories () { if [ -z "$1" ]; then - log.e "Fatal internal error in clean_subdirectories" + log "E: Fatal internal error in clean_subdirectories" exit 1; fi if [ ! -d "$1" ]; then - log.w "directory $1 does not exist in clean_subdirectories" + log "W: directory $1 does not exist in clean_subdirectories" return; fi - log.i "removing directory $1 and its subdirectories" + log "I: removing directory $1 and its subdirectories" find "$1" -xdev \( \! -type d \) -print0 |xargs -0 rm -f find "$1" -xdev -depth -type d -print0 | \ (xargs -0 rmdir || true) @@ -383,9 +339,8 @@ function cleanbuildplace () { if [ "$?" -ne 0 ]; then - log.w "Aborting with an error"; + log "W: Aborting with an error"; fi - unloadhooks if [ "${INTERNAL_BUILD_UML}" != "yes" ]; then if [ -d "$BUILDPLACE" ]; then # A directory on the same partition as $BUILDPLACE, bind-mounted @@ -398,20 +353,20 @@ # The readlink -f is a simple way to canonicalize the path for # $BUILDPLACE (no dirty double slashes for *us*), so it matches # what will be in the output of mount. - if mount |grep -q -F " $(readlink -f "$BUILDPLACE")/"; then - log.e "Something is still mounted under ${BUILDPLACE}; unmount and remove ${BUILDPLACE} manually" + if mount |grep -q -F " $(readlink -f $BUILDPLACE)/"; then + log "E: Something is still mounted under ${BUILDPLACE}; unmount and remove ${BUILDPLACE} manually" else - log.i "cleaning the build env " + log "I: cleaning the build env " clean_subdirectories "$BUILDPLACE" fi - fi; + fi; fi } function umountproc_cleanbuildplace () { # rolling back to abort. if [ "$?" -ne 0 ]; then - log.w "Aborting with an error"; + log "W: Aborting with an error"; fi umountproc cleanbuildplace @@ -424,71 +379,56 @@ } function installaptlines (){ - log.i "Installing apt-lines" + log "I: Installing apt-lines" rm -f "$BUILDPLACE"/etc/apt/sources.list if [ -z "$DISTRIBUTION" ]; then - log.e "Distribution not specified, please specify" - exit 1 + log "E: Distribution not specified, please specify" + exit 1 fi - if [ -n "$OTHERMIRROR" ]; then - echo "$OTHERMIRROR" | tr "|" "\n" >> "$BUILDPLACE"/etc/apt/sources.list + if [ -n "$OTHERMIRROR" ]; then + echo "$OTHERMIRROR" | tr "|" "\n" >> "$BUILDPLACE"/etc/apt/sources.list fi if [ -n "$MIRRORSITE" ] ; then - cat >> "$BUILDPLACE"/etc/apt/sources.list << EOF + cat >> "$BUILDPLACE"/etc/apt/sources.list << EOF deb $MIRRORSITE $DISTRIBUTION $COMPONENTS #deb-src $MIRRORSITE $DISTRIBUTION $COMPONENTS EOF fi if [ -n "$APTCONFDIR" ]; then - log.i "Copy " "$APTCONFDIR"/* " to chroot" - cp -a "$APTCONFDIR/"* "$BUILDPLACE"/etc/apt + log "I: Copy " "$APTCONFDIR"/* " to chroot" + cp -a "$APTCONFDIR/"* "$BUILDPLACE"/etc/apt fi if [ ! -d "$BUILDPLACE"/etc/apt/apt.conf.d ]; then - log.i "Create /etc/apt/apt.conf.d/ inside chroot" - mkdir "$BUILDPLACE"/etc/apt/apt.conf.d + log "I: Create /etc/apt/apt.conf.d/ inside chroot" + mkdir "$BUILDPLACE"/etc/apt/apt.conf.d fi # configure /etc/apt.conf.d/15pbuilder cat > "$BUILDPLACE"/etc/apt/apt.conf.d/15pbuilder <> "$BUILDPLACE"/etc/apt/sources.list - echo "#deb-src $MIRRORSITE experimental main" >> "$BUILDPLACE"/etc/apt/sources.list - fi - cat >> "$BUILDPLACE"/etc/apt/apt.conf.d/15pbuilder <> "$BUILDPLACE"/etc/apt/sources.list + echo "#deb-src $MIRRORSITE experimental main" >> "$BUILDPLACE"/etc/apt/sources.list + fi + cat >> "$BUILDPLACE"/etc/apt/apt.conf.d/15pbuilder < to create your base tarball yet?" - exit 1 - fi - if ! (cd "$BUILDPLACE" && tar -x --use-compress-program "$COMPRESSPROG" -p -f "$BASETGZ"); then - log.e "failed to extract $BASETGZ to $BUILDPLACE" - exit 1 - fi + cleanbuildplace + log "I: Building the build Environment" + if ! mkdir -p "$BUILDPLACE"; then + log "E: failed to build the directory to chroot" + exit 1 + fi + log "I: extracting base tarball [${BASETGZ}]" + if [ ! -f "$BASETGZ" ]; then + log "E: failed to find $BASETGZ, have you done to create your base tarball yet?" + exit 1 + fi + if ! (cd "$BUILDPLACE" && tar -x --use-compress-program "$COMPRESSPROG" -p -f "$BASETGZ"); then + log "E: failed to extract $BASETGZ to $BUILDPLACE" + exit 1 + fi + log "I: creating local configuration" + hostname -f > "$BUILDPLACE/etc/mailname" fi copy_local_configuration - loadhooks # installaptlines may fail with exit 1, do it earlier than mountproc. if [ "$OVERRIDE_APTLINES" = "yes" ]; then - installaptlines + installaptlines else # Warn if override config is not set - if [ "$OVERRIDE_APTLINES_WARN" = "yes" ]; then - log.w "--override-config is not set; not updating apt.conf Read the manpage for details." - fi + if [ "$OVERRIDE_APTLINES_WARN" = "yes" ]; then + log "W: --override-config is not set; not updating apt.conf Read the manpage for details." + fi fi mountproc - # FIXME maybe add more checks here? - actually it's not even really needed, - # since it's created at chroot creation time too. - mkdir -p "${BUILDPLACE}${BUILDDIR}" - # XXX added in 0.216, to be deprecated in the future - # Add a compatibility symlink from the old BUILDDIR (/tmp/buildd) to the new - # one, if different. (Yes, people should just fix their scripts to use - # BUILDDIR, please file a bug if you need that variable to also be available - # elsewhere other than hook script; given that, I won't do too fancy checks) - if [ "$BUILDDIR" != '/tmp/buildd' ]; then - if [ -h "$BUILDPLACE/tmp/buildd" ] && [ "$(readlink -f "$BUILDPLACE/tmp/buildd")" = "${BUILDPLACE}$BUILDDIR" ]; then - rm "$BUILDPLACE/tmp/buildd" - fi - if [ -d "$BUILDPLACE/tmp/buildd" ] && [ ! -h "$BUILDPLACE/tmp/buildd" ]; then - if [ ! "$(ls -A "$BUILDPLACE/tmp/buildd" 2>&1)" ]; then - # empty /tmp/buildd, let's change it to a symlink to BUILDDIR - rmdir "$BUILDPLACE/tmp/buildd" - ln -rs "${BUILDPLACE}$BUILDDIR" "$BUILDPLACE/tmp/buildd" - else - log.w "Could not create compatibility symlink because /tmp/buildd is not empty" - fi - elif [ ! -e "$BUILDPLACE/tmp/buildd" ]; then - ln -rs "${BUILDPLACE}$BUILDDIR" "$BUILDPLACE/tmp/buildd" - else - log.w "Could not create compatibility symlink because /tmp/buildd exists and it is not a directory" - fi - fi - executehooks "H" + mkdir -p "$BUILDPLACE/tmp/buildd" } function echobacktime () { - log.i "Current time: $(date)" - log.i "pbuilder-time-stamp: $(date +%s)" + log "I: Current time: $(date)" + log "I: pbuilder-time-stamp: $(date +%s)" } function recover_aptcache() { local doit # recover the aptcache archive if [ -n "$APTCACHE" ]; then - if [ "$APTCACHEHARDLINK" = "yes" ]; then - doit=ln - else - doit=cp - fi - log.i "Obtaining the cached apt archive contents" - find "$APTCACHE" -maxdepth 1 -name \*.deb | \ - while read A ; do - $doit "$A" "$BUILDPLACE/var/cache/apt/archives/" || true - done + if [ "$APTCACHEHARDLINK" = "yes" ]; then + doit=ln + else + doit=cp + fi + log "I: Obtaining the cached apt archive contents" + find "$APTCACHE" -maxdepth 1 -name \*.deb | \ + while read A ; do + $doit "$A" "$BUILDPLACE/var/cache/apt/archives/" || true + done fi } @@ -582,46 +497,41 @@ # it is safe to call this function several times. local doit if [ -n "$APTCACHE" ]; then - log.i "Copying back the cached apt archive contents" - mkdir -p "$APTCACHE" ; - if [ "$APTCACHEHARDLINK" = "yes" ]; then - doit=ln - else - doit=cp - fi - find "$BUILDPLACE/var/cache/apt/archives/" -maxdepth 1 -name \*.deb | \ - while read A ;do - if [ ! -f "$APTCACHE/$(basename "$A")" -a -f "$A" ]; then - log.i "new cache content '$(basename "$A")' added" - $doit "$A" "$APTCACHE/" || true - fi - done + log "I: Copying back the cached apt archive contents" + mkdir -p "$APTCACHE" ; + if [ "$APTCACHEHARDLINK" = "yes" ]; then + doit=ln + else + doit=cp + fi + find "$BUILDPLACE/var/cache/apt/archives/" -maxdepth 1 -name \*.deb | \ + while read A ;do + if [ ! -f "$APTCACHE/"$(basename "$A") -a -f "$A" ]; then + log "I: new cache content "$(basename "$A")" added" + $doit "$A" "$APTCACHE/" || true + fi + done fi } function create_basetgz() { - # don't pack the hooks in - unloadhooks # create base.tgz - ( - if ! cd "$BUILDPLACE"; then - log.e "unexpected error in chdir to $BUILDPLACE" - exit 1; - fi - while test -f "${BASETGZ}.tmp"; do - log.i "Someone else has lock over ${BASETGZ}.tmp, waiting" - sleep 10s - done - log.i "creating base tarball [${BASETGZ}]" - if [ -h "$BUILDPLACE/tmp/buildd" ] && [ "$(readlink -f "$BUILDPLACE/tmp/buildd")" = "${BUILDPLACE}$BUILDDIR" ]; then - rm "$BUILDPLACE/tmp/buildd" - fi - if ! tar -c --use-compress-program "$COMPRESSPROG" -f "${BASETGZ}.tmp" ./* ; then - log.e "failed building base tarball" - rm -f "${BASETGZ}.tmp" - exit 1; - fi - mv "${BASETGZ}.tmp" "${BASETGZ}" + ( + if ! cd "$BUILDPLACE"; then + log "E: unexpected error in chdir to $BUILDPLACE" + exit 1; + fi + while test -f "${BASETGZ}.tmp"; do + log "I: Someone else has lock over ${BASETGZ}.tmp, waiting" + sleep 10s + done + log "I: creating base tarball [${BASETGZ}]" + if ! tar -c --use-compress-program "$COMPRESSPROG" -f "${BASETGZ}.tmp" * ; then + log "E: failed building base tarball" + rm -f "${BASETGZ}.tmp" + exit 1; + fi + mv "${BASETGZ}.tmp" "${BASETGZ}" ) } @@ -629,12 +539,12 @@ # copy files to inside chroot, copy all files specified by INPUTFILE[] parameter. TARGETDIR="$1" if [ -z "$TARGETDIR" ]; then - log.e "Unexpected error in copyinputfile" - exit 1x + log "E: Unexpected error in copyinputfile" + exit 1x fi if [ -n "$INPUTFILE" ]; then - log.i "copy ${INPUTFILE[*]} to target directory" - cp "${INPUTFILE[@]}" "${TARGETDIR}" + log "I: copy ${INPUTFILE[*]} to target directory" + cp "${INPUTFILE[@]}" "${TARGETDIR}" fi } @@ -676,14 +586,14 @@ local target_dir="$2" # For testability, make cp overridable. local cp="${3:-cp}" - + # $PWD should end with non-'/', so dirname should give us the parent dir. local parent_dir=$(dirname "$PWD") if [ "${parent_dir}" != "${target_dir}" ]; then - "$cp" -a "$source_file" "$target_dir" + "$cp" -a "$source_file" "$target_dir" else - log.i "file ${source_file} is already in target, not copying." + log "I: file ${source_file} is already in target, not copying." fi } @@ -691,83 +601,11 @@ # To support package verification inside the repository we may have to import # additional keys. for KEY in "${APTKEYRINGS[@]}"; do - log.i "adding apt key file ${KEY}." - $CHROOTEXEC /usr/bin/apt-key add - < "${KEY}" > /dev/null + log "I: adding apt key file ${KEY}." + $CHROOTEXEC /usr/bin/apt-key add - < "${KEY}" > /dev/null done } - -#========================================================================== -# hooks stuff - -function loadhooks () { - if [ -z "$HOOKDIR" ]; then - return ; - fi - if [ -d "$BUILDPLACE/$hooks" ]; then - rm -rf "$BUILDPLACE/$hooks" - fi - if [ -d "$HOOKDIR" ]; then - mkdir -p "$BUILDPLACE/$hooks" - if ! cp -aL "$HOOKDIR/"* "$BUILDPLACE/$hooks"; then - log.w "no hooks found in the hookdir '$HOOKDIR'" - fi - else - log.w "hookdir $HOOKDIR does not exist, skipping" - fi -} - -function unloadhooks () { - if [ -z "$HOOKDIR" ]; then - return ; - fi - rm -rf "$BUILDPLACE/$hooks" -} - -function executehooks () { - # Execute every script found in the chroot'd target directory. - # We only test whether a file is executable since we have no idea what - # the user had put in their chroots. If they want PL/1 and ADA on the - # chroot or they have decided to use emacslisp for everything, it's their - # problem. - local prefix="$1" - if [ -z "$HOOKDIR" ]; then - return - fi - for fn in "$BUILDPLACE/$hooks/$prefix"[0-9][0-9]* ; do - case "$fn" in - "$BUILDPLACE/$hooks/$prefix"'[0-9][0-9]*') - log.w "no hooks of type ${prefix} found -- ignoring" - ;; - *~) - log.w "skipping an editor backup file $fn" - ;; - *.bak) - log.w "skipping a backup file $fn" - ;; - *) - if [ -x "$fn" ]; then - log.i "user script $fn starting" - BUILDDIR="$BUILDDIR" \ - $CHROOTEXEC "/$hooks/$(basename "$fn")" - log.i "user script $fn finished" - else - if [ -f "$fn" ]; then - filetype=$(basename "$fn" ) - log.w "execute priv not set on file $filetype, not executing." - else - # Should it reach here ? This case should be caught in the above case. - log.w "no hooks of type ${prefix} found -- internal error in logic" - fi - fi - ;; - esac - done -} - -#========================================================================== - - #Setting environmental variables that are really required: #required for some packages to install... export LANG=C diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilderrc pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilderrc --- pbuilder-0.223~ubuntu14.04.1/pbuilderrc 2016-01-08 16:58:45.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilderrc 2015-07-10 14:24:41.000000000 +0000 @@ -1,25 +1,10 @@ # pbuilder defaults; edit /etc/pbuilderrc to override these and see # pbuilderrc.5 for documentation - -# Set how much output you want from pbuilder, valid values are -# E => errors only -# W => errors and warnings -# I => errors, warnings and informational -# D => all of the above and debug messages -LOGLEVEL=I - BASETGZ=/var/cache/pbuilder/base.tgz #EXTRAPACKAGES="" #export DEBIAN_BUILDARCH=athlon -BUILDPLACE=/var/cache/pbuilder/build -# directory inside the chroot where the build happens. See #789404 -BUILDDIR=/build -# what be used as value for HOME during builds. See #441052 -# The default value prevents builds to write on HOME, which is prevented on -# Debian buildds too. You can set it to $BUILDDIR to get a working HOME, if -# you need to. -BUILD_HOME=/nonexistent -MIRRORSITE=http://httpredir.debian.org/debian +BUILDPLACE=/var/cache/pbuilder/build/ +MIRRORSITE=http://archive.ubuntu.com/ubuntu #OTHERMIRROR="deb http://www.home.com/updates/ ./" #export http_proxy=http://your-proxy:8080/ USEPROC=yes @@ -30,7 +15,7 @@ BUILDRESULT=/var/cache/pbuilder/result/ # specifying the distribution forces the distribution on "pbuilder update" -#DISTRIBUTION=sid +DISTRIBUTION=wily # specifying the architecture passes --arch= to debootstrap; the default is # to use the architecture of the host #ARCHITECTURE=`dpkg --print-architecture` @@ -38,7 +23,7 @@ # components on Debian use "main contrib non-free" and on Ubuntu "main # restricted universe multiverse" COMPONENTS="main" -#specify the cache for APT +#specify the cache for APT APTCACHE="/var/cache/pbuilder/aptcache/" APTCACHEHARDLINK="yes" REMOVEPACKAGES="" @@ -51,6 +36,8 @@ # make debconf not interact with user export DEBIAN_FRONTEND="noninteractive" +DEBEMAIL="" + #for pbuilder debuild BUILDSOURCEROOTCMD="fakeroot" PBUILDERROOTCMD="sudo -E" @@ -84,10 +71,6 @@ # Option to pass to aptitude always. export APTITUDEOPT=() -# Whether to use debdelta or not. If "yes" debdelta will be installed in the -# chroot -DEBDELTA=no - #Command-line option passed on to dpkg-buildpackage. #DEBBUILDOPTS="-IXXX -iXXX" DEBBUILDOPTS="" @@ -106,7 +89,6 @@ # Set the debootstrap variant to 'buildd' type. DEBOOTSTRAPOPTS=( '--variant=buildd' - '--force-check-gpg' ) # or unset it to make it not a buildd type. # unset DEBOOTSTRAPOPTS @@ -126,7 +108,7 @@ DEBOOTSTRAP="debootstrap" # default file extension for pkgname-logfile -PKGNAME_LOGFILE_EXTENSION="_$(dpkg --print-architecture).build" +PKGNAME_LOGFILE_EXTENTION="_$(dpkg --print-architecture).build" # default PKGNAME_LOGFILE PKGNAME_LOGFILE="" @@ -136,9 +118,3 @@ #default COMPRESSPROG COMPRESSPROG="gzip" - -# pbuilder copies some configuration files (like /etc/hosts or /etc/hostname) -# from the host system into the chroot. If the directory specified here -# exists and contains one of the copied files (without the leading /etc) that -# file will be copied from here instead of the system one -CONFDIR="/etc/pbuilder/conf_files" diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilderrc.5 pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilderrc.5 --- pbuilder-0.223~ubuntu14.04.1/pbuilderrc.5 2016-01-14 17:07:23.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilderrc.5 2015-06-22 08:05:23.000000000 +0000 @@ -65,16 +65,6 @@ BINDMOUNTS="/home /mnt/test" .EE .TP -.BI "BUILDDIR=" "/build" -The directory inside the chroot where the build happens. This will also be the -.B HOME -of the build user. - -Attention! Some directories \(em such as -.B /tmp -\(em are not safe to use since they can be world-writable, and external user can -temper with the build process. -.TP .BI "BUILDPLACE=" "/var/cache/pbuilder/build/" The default place which the chroot is constructed. .B pbuilder @@ -154,7 +144,7 @@ .TP .BI "COMPONENTS=" "main" Specify the default distribution components to use. -This option is space-delimited, use quotes when listing multiple components. +This option is space-delimited. This option only affects when doing .B "pbuilder create" or when @@ -166,7 +156,7 @@ .BI "COMPRESSPROG=" "gzip" Program to use for compression and decompression of the base.tgz. The default is to use gzip, and any program that can be used for -the \-\-use\-compress\-program option of tar can be given. +the --use-compress-program option of tar can be given. If set to "pigz", compression and decompression is gzip compatible but will use all available CPUs. @@ -216,6 +206,19 @@ and .B "debootstrap" .TP +.BI "DEBEMAIL=" "Maintainer Name " +If this was specified, +.B dpkg\-buildpackage +command will be passed with the necessary sponsorship option +.B "\-mMaintainer Name " +on building. +Overridden with +.B "\-\-debemail" +command-line option. +The default configuration for +.B pbuilder +is empty for this value. +.TP .BI "export DEBIAN_FRONTEND=" "noninteractive" Sets interactiveness of pbuilder run. Setting this value to blank will cause the @@ -239,7 +242,7 @@ .BR "pbuilder create" "." This is a space-delimited list. Also this is installed on -.B "pbuilder update" +.B "pbuilder build" .TP .BI "HOOKDIR=" "/usr/lib/pbuilder/hooks" Specifies the default location for the user hooks @@ -256,17 +259,6 @@ For details, see .B "pbuilder(8)" .TP -.BI "LOGLEVEL=" "I" -Specify how much output you want from pbuilder, valid values are -.BR E -(errors only), -.BR W -(errors and warnings), -.BR I -(errors, warnings and informational) and -.BR D -(everything including some debug messages). -.TP .BI "MIRRORSITE=" "http://www.jp.debian.org/debian" Specify the mirror site which contains the main Debian distribution. @@ -307,7 +299,7 @@ and .B "cowbuilder" .TP -.BI "PKGNAME_LOGFILE_EXTENSION=" "_$(dpkg \-\-print\-architecture).build" +.BI "PKGNAME_LOGFILE_EXTENTION=" ".build" The extension of filename used in pkgname\-logfile option. .TP .BI "PKGNAME_LOGFILE=" "yes" @@ -366,11 +358,6 @@ Extra flags to give to aptitude. .TP -.BI "DEBDELTA=" "no" -Enable use of debdelta to download the needed updated in the chroot, if -debdelta is already installed. - -.TP .BI "REMOVEPACKAGES=" "lilo" Specify the packages to be removed on creation of .B base.tgz @@ -428,33 +415,6 @@ .TP .BI "ADDITIONAL_BUILDRESULTS=""" Array of additional files to copy out of the build area. -.TP -.BI "CONFDIR=" "/etc/pbuilder/conf_files" -.B pbuilder -copies some configuration files (like -.B /etc/hosts -or -.BR /etc/hostname ) -from the host system into the chroot. If the directory specified here -exists and contains one of the copied files (without the leading /etc) that -file will be copied from here instead of the system one. -.TP -.BI "BUILD_HOME=" "/nonexistent" -Set the what the -.B HOME -environment variable points to during the builds. It defaults to a non-existing -directory to prevent builds from writing to HOME, which is reserved to users. -If you need a working HOME you can set it to -.B $BUILDDIR -instead. -.TP -.BI "BINNMU_MAINTAINER=" "" -Set the value of the maintainer name and email in the changelog during binNMU. -Such value is then copied to the Changed-By field of the .changes file. Can be -set at run time with the -.B --bin-nmu-maintainer -command line option. - .SH "AUTHOR" Initial coding, and main maintenance is done by diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-runhooks pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-runhooks --- pbuilder-0.223~ubuntu14.04.1/pbuilder-runhooks 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-runhooks 2015-06-22 08:05:23.000000000 +0000 @@ -1,9 +1,109 @@ #! /bin/bash +#========================================================================== +# Execute any hooks required for this segment +# +# Title: pbuilder-runhooks +# Description User hooks for pbuilder package +# Programmed by: Dale Amon -# This file was merged with pbuilder-modules. -# We can't delete it since it's referenced in pdebuild-internal, and since we -# can't assure the same pbuilder version outside and inside the chroot we have -# to be backward-compatible. -# Otherwise running an old pbuilder with a newer chroot would break badly. +# $HOOKDIR is set in /etc/pbuilderrc and contains a list of executable +# programs or scripts. The type is only limited by what you expect will +# be available in your chrooted environment after debootstrap has done +# an initial install. The functions must be named in the format: +# . Currently only X is defined; +# scripts prefixed with X will be run just before the chroot environment +# is exited and the base.tgz file is created or updated. -. "${BASH_SOURCE%/*}/pbuilder-modules" +# $BUILDPLACE is as used in pbuilder. When already inside chroot, this +# routine can be called with $BUILDPLACE='' (from pdebuild-internal) + +# TODO: * Are there any other executable backup types we should +# filtered besides *~ and *.bak? +# +#========================================================================== + +hooks=tmp/hooks + +#========================================================================== +# Set up fresh chroot'd hooks tmp script directory +# + +function loadhooks () { + if [ -z "$HOOKDIR" ]; then + return ; + fi + if [ -d "$BUILDPLACE/$hooks" ]; then + rm -rf "$BUILDPLACE/$hooks" + fi + if [ -d "$HOOKDIR" ]; then + mkdir -p "$BUILDPLACE/$hooks" + if ! cp -aL "$HOOKDIR/"* "$BUILDPLACE/$hooks"; then + log "W: no hooks found in the hookdir '$HOOKDIR'" + fi + else + log "W: hookdir $HOOKDIR does not exist, skipping" + fi +} + +#-------------------------------------------------------------------------- +# Tidy up after ourselves. (Anything we leave behind ends up in base.tgz) +# + +function unloadhooks () { + if [ -z "$HOOKDIR" ]; then + return ; + fi + if [ -d "$BUILDPLACE/$hooks" ]; then + rm -rf "$BUILDPLACE/$hooks" + else + log "E: Logic failure in hook handling. Directory $BUILDPLACE/$hooks should exist but it does not." + fi +} + +#-------------------------------------------------------------------------- +# Execute every script found in the chroot'd target directory. We only +# test for whether a file is executable because we have no idea what +# the user had put in their dist. If they want PL/1 and ADA on the base +# dist or have decided to use emacslisp for everything, it's their +# problem. +# +# Args: Required prefix on hook fn name +# Returns: none +# + +function executehooks () { + local prefix="$1" + if [ -z "$HOOKDIR" ]; then + return ; + fi + for fn in "$BUILDPLACE/$hooks/$prefix"[0-9][0-9]* ; do + case "$fn" in + "$BUILDPLACE/$hooks/$prefix"'[0-9][0-9]*') + log "W: no hooks of type ${prefix} found -- ignoring" + ;; + *~) + log "W: skipping an editor backup file $fn" + ;; + *.bak) + log "W: skipping a backup file $fn" + ;; + *) + if [ -x "$fn" ]; then + log "I: user script $fn starting" + $CHROOTEXEC "/$hooks/"$(basename "$fn") + log "I: user script $fn finished" + else + if [ -f "$fn" ]; then + filetype=$(basename "$fn" ) + log "W: execute priv not set on file $filetype, not executing." + else + # Should it reach here ? This case should be caught in the above case. + log "W: no hooks of type ${prefix} found -- internal error in logic" + fi + fi + ;; + esac + done +} + +#-------------------------------------------------------------------------- diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-satisfydepends-aptitude pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-satisfydepends-aptitude --- pbuilder-0.223~ubuntu14.04.1/pbuilder-satisfydepends-aptitude 2015-12-10 01:31:32.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-satisfydepends-aptitude 2015-06-22 16:04:04.000000000 +0000 @@ -62,7 +62,7 @@ --force-depends \ --force-conflicts \ -i "$BUILD_DEP_DEB_DIR/pbuilder-satisfydepends-dummy.deb" || true - $CHROOTEXEC env XDG_CACHE_HOME=/root aptitude \ + $CHROOTEXEC aptitude \ -y \ --without-recommends -o APT::Install-Recommends=false \ "${APTITUDEOPT[@]}" \ diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-satisfydepends-checkparams pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-satisfydepends-checkparams --- pbuilder-0.223~ubuntu14.04.1/pbuilder-satisfydepends-checkparams 2016-01-05 17:45:06.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-satisfydepends-checkparams 2015-06-22 08:05:23.000000000 +0000 @@ -22,7 +22,7 @@ DEBIAN_CONTROL=debian/control CHROOT="" CHROOTEXEC="" -BINARY_ARCH="any" +BINARY_ARCH="no" FORCEVERSION="" CONTINUE_FAIL="no" CHROOTEXEC_AFTER_INTERNAL_CHROOTEXEC=no @@ -58,11 +58,11 @@ ;; --binary-all) - BINARY_ARCH="any" + BINARY_ARCH="no" shift ;; --binary-arch) - BINARY_ARCH="binary" + BINARY_ARCH="yes" shift ;; --continue-fail) diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-satisfydepends-classic pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-satisfydepends-classic --- pbuilder-0.223~ubuntu14.04.1/pbuilder-satisfydepends-classic 2015-11-13 11:24:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-satisfydepends-classic 2015-06-22 16:04:04.000000000 +0000 @@ -90,7 +90,7 @@ fi if echo "$INSTALLPKG" | grep -q '('; then #echo "Debug: $INSTALLPKG" - if ! checkbuilddep_versiondeps "$CURRENTREALPKGNAME" $(get_dep_op_and_ver "$INSTALLPKG"); then + if ! checkbuilddep_versiondeps "$CURRENTREALPKGNAME" `get_dep_op_and_ver "$INSTALLPKG"`; then echo " -> Does not satisfy version, not trying" continue fi @@ -167,7 +167,7 @@ fi if echo "$INSTALLPKG" | grep -q '('; then # this package has version-conflicts - if ! checkbuilddep_versiondeps "$CURRENTREALPKGNAME" $(get_dep_op_and_ver "$INSTALLPKG"); then + if ! checkbuilddep_versiondeps "$CURRENTREALPKGNAME" `get_dep_op_and_ver "$INSTALLPKG"`; then echo "I: Satisfies version, not trying" continue fi @@ -175,7 +175,7 @@ # if package exists, remove it. if $CHROOTEXEC /usr/bin/dpkg -s "$CURRENTREALPKGNAME" 2>&1 | grep -q ^Package:; then - if ! $CHROOTEXEC /usr/bin/apt-get -y remove "$CURRENTREALPKGNAME" ; then + if ! $CHROOTEXEC /usr/bin/apt-get -y remove $CURRENTREALPKGNAME ; then echo "E: Could not satisfy build-conflicts" >&2 exit 1 fi diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-satisfydepends-experimental pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-satisfydepends-experimental --- pbuilder-0.223~ubuntu14.04.1/pbuilder-satisfydepends-experimental 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-satisfydepends-experimental 2015-06-22 08:05:23.000000000 +0000 @@ -25,7 +25,7 @@ set -e -. "${BASH_SOURCE%/*}/pbuilder-satisfydepends-funcs" +. /usr/lib/pbuilder/pbuilder-satisfydepends-funcs # Use this function to fulfill the dependency (almost) function checkbuilddep_internal () { @@ -191,5 +191,5 @@ EOF } -. "${BASH_SOURCE%/*}/pbuilder-satisfydepends-checkparams" +. /usr/lib/pbuilder/pbuilder-satisfydepends-checkparams diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-satisfydepends-funcs pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-satisfydepends-funcs --- pbuilder-0.223~ubuntu14.04.1/pbuilder-satisfydepends-funcs 2016-01-08 15:13:05.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-satisfydepends-funcs 2015-06-22 16:04:04.000000000 +0000 @@ -1,8 +1,7 @@ -#! /bin/bash +#!/bin/bash # pbuilder -- personal Debian package builder -# Copyright © 2001-2007 Junichi Uekawa -# 2007 Loïc Minier -# 2015 Mattia Rizzolo +# Copyright (C) 2001,2002,2003,2005-2007 Junichi Uekawa +# Copyright (C) 2007 Loïc Minier # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,19 +16,18 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -############################################################################### - +# # module to satisfy build dependencies; common functions package_versions() { - local PACKAGE="$1" - LC_ALL=C $CHROOTEXEC /usr/bin/apt-cache show "$PACKAGE" | sed -n 's/^Version: //p' + local PACKAGE="$1" + LC_ALL=C $CHROOTEXEC /usr/bin/apt-cache show "$PACKAGE" | sed -n 's/^Version: //p' } candidate_version() { - local PACKAGE="$1" - LC_ALL=C $CHROOTEXEC apt-cache policy "$PACKAGE" | sed -n 's/ *Candidate: //p' + local PACKAGE="$1" + LC_ALL=C $CHROOTEXEC apt-cache policy "$PACKAGE" | sed -n 's/ *Candidate: //p' } checkbuilddep_versiondeps() { @@ -39,13 +37,13 @@ local PACKAGEVERSIONS=$( package_versions "$PACKAGE" | xargs) # no versioned provides. if [ "${FORCEVERSION}" = "yes" ]; then - return 0; + return 0; fi for PACKAGEVERSION in $PACKAGEVERSIONS ; do - if dpkg --compare-versions "$PACKAGEVERSION" "$COMPARESTRING" "$DEPSVERSION"; then - # satisfies depends - return 0; - fi + if dpkg --compare-versions "$PACKAGEVERSION" "$COMPARESTRING" "$DEPSVERSION"; then + # satisfies depends + return 0; + fi done echo " Tried versions: $PACKAGEVERSIONS" # cannot satisfy depends @@ -63,17 +61,6 @@ /^$/ d b pgploop } -: leadloop -/^[ \t]*$/ { - n - /^$/ d - b leadloop -} -/^#/ { - n - /^$/ d - b leadloop -} /^$/q d : store @@ -111,48 +98,22 @@ get_build_deps() { local output - output="$(get_source_control_field "Build-Depends")" + output="`get_source_control_field "Build-Depends"`" output="${output%, }" - case "$BINARY_ARCH" in - any) - output="${output:+$output, }$(get_source_control_field "Build-Depends-Indep")" - output="${output%, }" - output="${output:+$output, }$(get_source_control_field "Build-Depends-Arch")" - output="${output%, }" - ;; - binary) - output="${output:+$output, }$(get_source_control_field "Build-Depends-Arch")" - output="${output%, }" - ;; - all) - output="${output:+$output, }$(get_source_control_field "Build-Depends-Indep")" - output="${output%, }" - ;; - esac + if [ "$BINARY_ARCH" = no ]; then + output="${output:+$output, }`get_source_control_field "Build-Depends-Indep"`" + output="${output%, }" + fi echo "$output" } get_build_conflicts() { local output - output="$(get_source_control_field "Build-Conflicts")" - output="${output%, }" - case "$BINARY_ARCH" in - any) - output="${output:+$output, }$(get_source_control_field "Build-Conflicts-Indep")" - output="${output%, }" - output="${output:+$output, }$(get_source_control_field "Build-Conflicts-Arch")" - output="${output%, }" - ;; - binary) - output="${output:+$output, }$(get_source_control_field "Build-Conflicts-Arch")" - output="${output%, }" - ;; - all) - output="${output:+$output, }$(get_source_control_field "Build-Conflicts-Indep")" - output="${output%, }" - ;; - esac + output="`get_source_control_field "Build-Conflicts"`" + if [ "$BINARY_ARCH" = no ]; then + output="${output:+$output, }`get_source_control_field "Build-Conflicts-Indep"`" + fi echo "$output" } @@ -231,20 +192,20 @@ # Use 'dpkg-architecture' to support architecture wildcards. for d in $DEP_ARCHES; do if echo "$d" | grep -q '!'; then - d="$(echo "$d" | sed 's/!//')" - if dpkg-architecture -a"$ARCH" -i"$d" -f; then + d="$(echo $d | sed 's/!//')" + if dpkg-architecture -a$ARCH -i$d -f; then IGNORE_IT="yes" fi else - if dpkg-architecture -a"$ARCH" -i"$d" -f; then + if dpkg-architecture -a$ARCH -i$d -f; then USE_IT="yes" fi INCLUDE="yes" fi done if [ $IGNORE_IT ] && [ $USE_IT ]; then - printf "W: inconsistent arch restriction on %s: " "$PKG" >&2 - printf "%s depedency\n" "$DEP_ARCHES" >&2 + printf "W: inconsistent arch restriction on $PKG: " >&2 + printf "$DEP_ARCHES depedency\n" >&2 fi if [ $IGNORE_IT ] || ( [ $INCLUDE ] && [ ! $USE_IT ] ); then return 0 @@ -263,10 +224,6 @@ local PROFILE local NEGATED local FOUND - if [ "$DEP_RESTRICTIONS" = "$INSTALLPKG" ]; then - # there is not a build profile, rather it's a version costraint - return 1 - fi IFS=';' read -ra RESTRLISTS <<< "$DEP_RESTRICTIONS" for restrlist in "${RESTRLISTS[@]}"; do SEEN_PROFILE="yes" @@ -301,50 +258,50 @@ checkbuilddep_provides() { local PACKAGENAME="$1" # PROVIDED needs to be used outside of this function. - PROVIDED=$($CHROOTEXEC /usr/bin/apt-cache showpkg "$PACKAGENAME" \ - | awk '{p=0}/^Reverse Provides:/,/^$/{p=1}{if(p && ($0 !~ "Reverse Provides:")){PACKAGE=$1}} END{print PACKAGE}') + PROVIDED=$($CHROOTEXEC /usr/bin/apt-cache showpkg $PACKAGENAME \ + | awk '{p=0}/^Reverse Provides:/,/^$/{p=1}{if(p && ($0 !~ "Reverse Provides:")){PACKAGE=$1}} END{print PACKAGE}') } # returns either "package=version", to append to an apt-get install line, or # package versioneddep_to_aptcmd() { - local INSTALLPKG="$1" + local INSTALLPKG="$1" - local PACKAGE - local PACKAGE_WITHVERSION - local PACKAGEVERSIONS - local CANDIDATE_VERSION - local COMPARESTRING - local DEPSVERSION - - PACKAGE="$(echo "$INSTALLPKG" | sed -e 's/^[/]*//' -e 's/[[/(].*//')" - PACKAGE_WITHVERSION="$PACKAGE" - - # if not versionned, we skip directly to outputting $PACKAGE - if echo "$INSTALLPKG" | grep '[(]' > /dev/null; then - # package versions returned by APT, in reversed order - PACKAGEVERSIONS="$( package_versions "$PACKAGE" | tac | xargs )" - CANDIDATE_VERSION="$( candidate_version "$PACKAGE" )" - - COMPARESTRING="$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*( *\(<<\|<=\|>=\|=\|<\|>>\|>\) *\(.*\)).*$/\1/')" - DEPSVERSION="$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*( *\(<<\|<=\|>=\|=\|<\|>>\|>\) *\(.*\)).*$/\2/')" - # if strictly versionned, we skip to outputting that version - if [ "=" = "$COMPARESTRING" ]; then - PACKAGE_WITHVERSION="$PACKAGE=$DEPSVERSION" - else - # try the candidate version, then all available versions (asc) - for VERSION in $CANDIDATE_VERSION $PACKAGEVERSIONS; do - if dpkg --compare-versions "$VERSION" "$COMPARESTRING" "$DEPSVERSION"; then - if [ "$VERSION" != "$CANDIDATE_VERSION" ]; then - PACKAGE_WITHVERSION="$PACKAGE=$VERSION" - fi - break; - fi - done - fi - fi + local PACKAGE + local PACKAGE_WITHVERSION + local PACKAGEVERSIONS + local CANDIDATE_VERSION + local COMPARESTRING + local DEPSVERSION + + PACKAGE="$(echo "$INSTALLPKG" | sed -e 's/^[/]*//' -e 's/[[/(].*//')" + PACKAGE_WITHVERSION="$PACKAGE" + + # if not versionned, we skip directly to outputting $PACKAGE + if echo "$INSTALLPKG" | grep '[(]' > /dev/null; then + # package versions returned by APT, in reversed order + PACKAGEVERSIONS="$( package_versions "$PACKAGE" | tac | xargs )" + CANDIDATE_VERSION="$( candidate_version "$PACKAGE" )" + + COMPARESTRING="$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*( *\(<<\|<=\|>=\|=\|<\|>>\|>\) *\(.*\)).*$/\1/')" + DEPSVERSION="$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*( *\(<<\|<=\|>=\|=\|<\|>>\|>\) *\(.*\)).*$/\2/')" + # if strictly versionned, we skip to outputting that version + if [ "=" = "$COMPARESTRING" ]; then + PACKAGE_WITHVERSION="$PACKAGE=$DEPSVERSION" + else + # try the candidate version, then all available versions (asc) + for VERSION in $CANDIDATE_VERSION $PACKAGEVERSIONS; do + if dpkg --compare-versions "$VERSION" "$COMPARESTRING" "$DEPSVERSION"; then + if [ $VERSION != $CANDIDATE_VERSION ]; then + PACKAGE_WITHVERSION="$PACKAGE=$VERSION" + fi + break; + fi + done + fi + fi - echo "$PACKAGE_WITHVERSION" + echo "$PACKAGE_WITHVERSION" } print_help() { diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-satisfydepends-gdebi pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-satisfydepends-gdebi --- pbuilder-0.223~ubuntu14.04.1/pbuilder-satisfydepends-gdebi 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-satisfydepends-gdebi 2015-06-22 08:05:23.000000000 +0000 @@ -30,13 +30,13 @@ NO_RECOMMENDS="" if VERSION=$(/usr/bin/gdebi --version 2>/dev/null); then - if dpkg --compare-versions "$VERSION" ge 0.3.9; then + if dpkg --compare-versions $VERSION ge 0.3.9; then NO_RECOMMENDS="-o APT::Install-Recommends=false" fi fi - INSTALL=$(/usr/bin/gdebi --quiet --root "$CHROOT" --apt-line "$NO_RECOMMENDS" "$DEBIAN_CONTROL") + INSTALL=$(/usr/bin/gdebi --quiet --root $CHROOT --apt-line $NO_RECOMMENDS $DEBIAN_CONTROL) $CHROOTEXEC /usr/bin/apt-get install -y "${APTGETOPT[@]}" $INSTALL } -. "${BASH_SOURCE%/*}/pbuilder-satisfydepends-checkparams" +. /usr/lib/pbuilder/pbuilder-satisfydepends-checkparams diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-selftest pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-selftest --- pbuilder-0.223~ubuntu14.04.1/pbuilder-selftest 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-selftest 2015-06-22 08:05:23.000000000 +0000 @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +if [ -n "$PBUILDER_CHECKOUT" ]; then + PBUILDER_TESTS_DIR="$PBUILDER_CHECKOUT" +else + PBUILDER_PKGLIBDIR="${PBUILDER_PKGLIBDIR:-$PBUILDER_ROOT/usr/lib/pbuilder}" + PBUILDER_TESTS_DIR="$PBUILDER_PKGLIBDIR" +fi + +for t in "$PBUILDER_TESTS_DIR"/test_*; do + "$t" +done diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-uml-checkparams pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-uml-checkparams --- pbuilder-0.223~ubuntu14.04.1/pbuilder-uml-checkparams 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-uml-checkparams 2015-06-22 08:05:23.000000000 +0000 @@ -0,0 +1,145 @@ +#! /bin/bash +# pbuilder-user-mode-linux -- personal Debian package builder +# Copyright (C) 2004-2007 Junichi Uekawa +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +# load and check params. +# requires +# . /usr/lib/pbuilder/pbuilder-loadconfig + +for SYSTEM_CONFIG in \ + /usr/share/pbuilder/pbuilder-uml.conf \ + /etc/pbuilder/pbuilder-uml.conf \ + ${HOME}/.pbuilderrc \ + ${HOME}/.pbuilder-umlrc; do + if [ -f ${SYSTEM_CONFIG} ]; then + . ${SYSTEM_CONFIG} + fi +done + + +PBUILDER_COW="" +UML_EXTRAOPT= +UML_DEBUGMODE= +UML_EXECUTE_EXTRAOPT= +UML_LOGIN_NOCOW= + +while [ -n "$1" ] ; do + case "$1" in + # pbuilder UML options + --eth0) + MY_ETH0="$2"; + shift; shift; + ;; + --uml-ip) + UML_IP="$2"; + shift; shift; + ;; + --uml-netmask) + UML_NETMASK="$2"; + shift; shift; + ;; + --uml-network) + UML_NETWORK="$2"; + shift; shift; + ;; + --uml-broadcast) + UML_BROADCAST="$2"; + shift; shift; + ;; + --uml-gateway) + UML_GATEWAY="$2"; + shift; shift; + ;; + --uml-image) + PBUILDER_UML_IMAGE="$2"; + shift; shift; + ;; + --mount-tmpfs) + UML_MOUNT_TMPFS="$2"; + shift; shift; + ;; + --uml-mem) + UML_MEM="$2"; + shift; shift; + ;; + --uml-hostname) + UML_HOSTNAME="$2"; + shift; shift; + ;; + --uml-debugmode) + UML_DEBUGMODE="set -x"; + shift;; + --distribution) + UML_DISTRIBUTION="$2"; + shift; shift; + ;; + --uml-login-nocow) + UML_LOGIN_NOCOW=yes; + shift; + ;; + #things that can be passed through without options + --override-config|--binary-arch) + UML_EXTRAOPT="${UML_EXTRAOPT} $1" + shift;; + --configfile) + UML_EXTRAOPT="${UML_EXTRAOPT} $1 $2" + . "$2" + shift; shift;; + #things that can be passed through with options + --timeout|--http-proxy|--hookdir|--aptconfdir|--bindmounts|--mirror|--othermirror) + UML_EXTRAOPT="${UML_EXTRAOPT} $1 $2" + shift; shift;; + --buildresult) + # ignore buildresult + if [ -d "$2" ]; then + UML_BUILDRESULT=$(readlink -f "$2") + else + echo "E: Directory $2 does not exist" >&2 + exit 1 + fi + shift; shift;; + --buildplace) + if [ -d "$2" ]; then + BUILDPLACE=$(readlink -f "$2") + else + echo "E: Directory $2 does not exist" >&2 + exit 1 + fi + shift; shift;; + --logfile) + exec > "$2" 2>&1 + PBUILDER_BUILD_LOGFILE=$(readlink -f "$2") + shift;shift;; + --) + shift; + break; + ;; + --*) + echo "Error: Unknown option [$1] was specified " >&2 + exit 1; + ;; + *) + break; + ;; + esac +done + +if ! touch "${BUILDPLACE}/touch" ; then + echo "E: Cannot touch BUILDPLACE/touch, check BUILDPLACE" >&2 + exit 1 +fi diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-uml.conf pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-uml.conf --- pbuilder-0.223~ubuntu14.04.1/pbuilder-uml.conf 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-uml.conf 2015-06-22 08:05:23.000000000 +0000 @@ -0,0 +1,18 @@ +#documented in pbuilder-uml.conf.5 + +MY_ETH0=tuntap,,,192.168.0.2 +UML_IP=192.168.0.3 +UML_NETMASK=255.255.255.0 +UML_NETWORK=192.168.0.0 +UML_BROADCAST=255.255.255.255 +UML_GATEWAY=192.168.0.1 +PBUILDER_UML_IMAGE="${HOME}/uml-image" +UML_MOUNT_TMPFS="no" +BUILDPLACE="${HOME}/tmp/" +UML_MEM=128M +UML_HOSTNAME=$(hostname) +UML_BUILDRESULT= +ROOTSTRAP_IMAGESIZE=1000 +APTCACHEHARDLINK=no + + diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-uml.conf.5 pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-uml.conf.5 --- pbuilder-0.223~ubuntu14.04.1/pbuilder-uml.conf.5 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-uml.conf.5 2015-06-22 08:05:23.000000000 +0000 @@ -0,0 +1,111 @@ +.TH "pbuilder-uml.conf" 5 "2003 Jan 8" "Debian" "pbuilder" +.SH NAME +pbuilder-uml.conf \- configuration file for user-mode-linux port of pbuilder +.SH DESCRIPTION +.B "/etc/pbuilder/pbuilder-uml.conf" +contains default values used in +.B pbuilder-user-mode-linux +program invocation. + +.SH "FORMAT" +.TP +.BI "MY_ETH0=" "tuntap,,,192.168.0.2" +Configures ethernet setting used for booting linux. +See how rootstrap boots your system, and copy that. + +Specify +.B "--eth0=slirp,12345,/usr/bin/slirp-fullbolt" +to use the slirp connection. + +.TP +.BI "UML_IP=" "192.168.0.3" +IP address to use for guest OS. + +This can be set to +.B "dhcp" +for obtaining IP address through DHCP. + +.TP +.BI "UML_NETMASK" "=255.255.255.0" +Guest OS netmask + +.TP +.BI "UML_NETWORK" "=192.168.0.0" +Guest OS network + +.TP +.BI "UML_BROADCAST" "=255.255.255.255" +Guest OS broadcast + +.TP +.BI "UML_GATEWAY" "=192.168.0.1" +Guest OS gateway + +.TP +.BI "PBUILDER_UML_IMAGE=" "${HOME}/uml-image" +Guest OS file system image. + +.TP +.BI "UML_MOUNT_TMPFS=" "no" +Whether to mount tmpfs inside the guest image. +This is probably mostly useless. + +.TP +.BI "BUILDPLACE=" "${HOME}/tmp/" +The location which build will take place. +.B pbuilder-user-mode-linux +will place temporary COW files to there. +The user running UML needs to be able to access that directory. + +.TP +.BI "UML_MEM=" "128" +The amount of memory allowed for UML. +Give more value to here. + +.TP +.BI "UML_HOSTNAME=" "uml-host" +The hostname for the UML. + +The hostname should be available in +.B /etc/hosts +so that +.B "hostname -f " +will be able to return the FQDN. + +.TP +.BI "UML_BUILDRESULT=" "/directory/of/build/result" +The directory where build result of pbuilder-user-mode-linux +is stored. + +.TP +.BI "ROOTSTRAP_IMAGESIZE=" "size-in-megabytes" +The size, in MB, of the disk iamge to create. Defaults to 1000. + +.SH "NOTES" + +It is advised to set +.B "APTCACHEHARDLINK" +to +.I no +in +.BR "~/.pbuilderrc" . +see +.B "pbuilderrc(5)" +for details. + +.SH "AUTHOR" +Initial coding, and main maintenance is done by +Junichi Uekawa . + +The homepage is available at +.B "\%http://pbuilder.alioth.debian.org" + + +.SH "FILES" +.I "/etc/pbuilder/pbuilder-uml.conf, ${HOME}/.pbuilderrc" +.SH "SEE ALSO" +.BR "/usr/share/doc/pbuilder/pbuilder-doc.html" ", " +.BR "pbuilder-user-mode-linux" "(1), " +.BR "pbuilder" "(8), " +.BR "pbuilderrc" "(5), " +.BR "pdebuild" "(1)" diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-unshare-wrapper pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-unshare-wrapper --- pbuilder-0.223~ubuntu14.04.1/pbuilder-unshare-wrapper 2015-11-13 11:24:21.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-unshare-wrapper 2015-06-22 08:05:23.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh die() { - echo >&2 E: "$2" returned error code "$1" + echo >&@ E: $2 returned error code $1 echo >&2 N: Could not set up the loopback interface. exit 1 } @@ -18,7 +18,4 @@ exit 1 fi -# having this variable set could cause programs looking for unreachable machines -unset http_proxy - exec "$@" diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-updatebuildenv pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-updatebuildenv --- pbuilder-0.223~ubuntu14.04.1/pbuilder-updatebuildenv 2016-01-05 16:47:41.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-updatebuildenv 2015-06-22 08:05:23.000000000 +0000 @@ -1,7 +1,6 @@ #! /bin/bash # pbuilder -- personal Debian package builder -# Copyright © 2001-2007 Junichi Uekawa -# 2015 Mattia Rizzolo +# Copyright (C) 2001-2003,2005-2007 Junichi Uekawa # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,14 +15,14 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -############################################################################### set -e -. "${BASH_SOURCE%/*}/pbuilder-checkparams" +. /usr/lib/pbuilder/pbuilder-checkparams +. /usr/lib/pbuilder/pbuilder-runhooks if [ -n "$DISTRIBUTION" ] && [ "$OVERRIDE_APTLINES" = "yes" ]; then - log.i "Upgrading for distribution $DISTRIBUTION" + log "I: Upgrading for distribution $DISTRIBUTION" fi if [ "${PBUILDER_DEBUGMODE}" = "yes" ]; then TRAP="echo ignoring trap " @@ -37,13 +36,12 @@ extractbuildplace $TRAP umountproc_cleanbuildplace_trap exit sighup -log.i "Refreshing the base.tgz " -log.i "upgrading packages" -$CHROOTEXEC /usr/bin/apt-get -q "${APTGETOPT[@]}" update +loadhooks +log "I: Refreshing the base.tgz " +log "I: upgrading packages" +$CHROOTEXEC /usr/bin/apt-get -q update - -# automatically add packages needed for optional features to the chroot -case "$(readlink -e "$PBUILDERSATISFYDEPENDSCMD")" in +case "`readlink -e "$PBUILDERSATISFYDEPENDSCMD"`" in *-aptitude) EXTRAPACKAGES="$EXTRAPACKAGES aptitude" ;; @@ -58,12 +56,6 @@ EXTRAPACKAGES="$EXTRAPACKAGES ccache-" fi -if [ "$DEBDELTA" = "yes" ]; then - EXTRAPACKAGES="$EXTRAPACKAGES debdelta python-apt xdelta3" -else - EXTRAPACKAGES="$EXTRAPACKAGES debdelta-" -fi - if [ -n "$REMOVEPACKAGES" ]; then # FIXME this wont work if the packages have some reverse dependencies; # apt-get can also remove package, either with apt-get remove or purge, or @@ -74,19 +66,6 @@ recover_aptcache $TRAP saveaptcache_umountproc_cleanbuildplace_trap exit sighup -if [ "$DEBDELTA" = "yes" ]; then - if $CHROOTEXEC which debdelta-upgrade > /dev/null 2>&1 ; then - log.i "Using debdelta-upgrade for available deltas" - if $CHROOTEXEC debdelta-upgrade ; then - : - else - log.w "debdelta failed, continue and use plain apt to update the system" - fi - else - log.w "debdelta is enabled but not (yet) installed, not using it" - fi -fi - $CHROOTEXEC /usr/bin/apt-get -q -y "${APTGETOPT[@]}" "${FORCE_CONFNEW[@]}" dist-upgrade # autoremove: Ignore error in case of etch because apt in etch doesn't # support autoremove. TODO: Do not ignore error when etch is no longer @@ -96,23 +75,18 @@ build-essential \ dpkg-dev \ $EXTRAPACKAGES -# debdelta dependencies are broken (#545831) -if [ "$DEBDELTA" = "yes" ]; then - $CHROOTEXEC apt-mark auto python-apt xdelta3 -fi - save_aptcache add_additional_aptkeyrings # optionally auto-clean apt-cache if [ "${AUTOCLEANAPTCACHE}" = "yes" -a -n "$APTCACHE" ]; then - log.i "Cleaning the cached apt archive" + log "I: Cleaning the cached apt archive" $CHROOTEXEC /usr/bin/apt-get autoclean || true find "$APTCACHE/" -maxdepth 1 -name \*.deb | \ while read A; do - if [ ! -f "$BUILDPLACE/var/cache/apt/archives/$(basename "$A")" -a \ + if [ ! -f "$BUILDPLACE/var/cache/apt/archives/"$(basename "$A") -a \ -f "$A" ]; then - log.i "obsolete cache content "$(basename "$A")" removed" + log "I: obsolete cache content "$(basename "$A")" removed" rm -f "$A" || true fi done @@ -120,6 +94,7 @@ $TRAP umountproc_cleanbuildplace_trap exit sighup executehooks "E" +unloadhooks umountproc $CHROOTEXEC /usr/bin/apt-get clean || true diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-user-mode-linux pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-user-mode-linux --- pbuilder-0.223~ubuntu14.04.1/pbuilder-user-mode-linux 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-user-mode-linux 2015-06-22 08:05:23.000000000 +0000 @@ -0,0 +1,247 @@ +#! /bin/bash +# pbuilder user-mode-linux hack. +# +# pbuilder -- personal Debian package builder +# Copyright (C) 2001-2007 Junichi Uekawa +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# + +set -e + +function cleanup_function_trap () { + rm -f ${INSIDE_PBUILDER} + ${EXTRACLEANUP} +} + +. /usr/lib/pbuilder/pbuilder-loadconfig + +OPERATION="$1" +shift; +. /usr/lib/pbuilder/pbuilder-uml-checkparams + +function usecow () { + PBUILDER_COWFILENAME="${BUILDPLACE}/$$.cow" + PBUILDER_COW="${PBUILDER_COWFILENAME}," + if ! touch "${PBUILDER_COWFILENAME}"; then + log "E: Cannot write-access to the COW file, check buildplace" + exit 1; + fi + rm -f "${PBUILDER_COWFILENAME}" +} + +function cleancow () { + # clean the cow file + rm -f "${PBUILDER_COWFILENAME}" +} + +function operate_uml () { + # opeartes on UML, and runs pbuilder $1 + # use this script file to bootstrap the pbuilder inside the UML + INSIDE_PBUILDER=$(tempfile) + trap cleanup_function_trap exit sighup + UML_CHROOT_MOUNTPOINT=/var/cache/pbuilder/pbuilder-mnt + UML_CHROOT_BUILDRESULTMOUNTDIR=/var/cache/pbuilder/pbuilder-umlresult +#The following script is ran inside UML as soon as it is started. + + cat < ${INSIDE_PBUILDER} +#! /bin/bash + +### +### BEGIN CODE EXECUTED INSIDE User-mode-linux +### +### note that ${VARIABLE}s are evaluated outside of user-mode-linux. +### while \${VARIABLE}s are evaluated inside of user-mode-linux. + +${UML_DEBUGMODE} + +mount -t proc /proc /proc +mount -t tmpfs /tmp /tmp + +# create devices +mount -t tmpfs tmpfs /dev +mknod /dev/ubdb b 98 16 +#if ! fsck -p /dev/ubdb; then +# echo "W: Failed to fsck /dev/ubdb" +#fi +if ! mount -t ext2 /dev/ubdb ${UML_CHROOT_MOUNTPOINT}; then + echo "E: Cannot mount /dev/ubdb, is UML root image accessible as current user?" >&2 + exit 1 +fi +mount --bind ${UML_CHROOT_MOUNTPOINT}/dev /dev + +# mount /lib/modules on the hostfs +kernel_modules=\$(sed -ne 's\$.*/lib/modules.*hostfs.*defaults,ro,\([^[:space:]]*\).*\$\1\$p' ${UML_CHROOT_MOUNTPOINT}/etc/fstab) +if [ -n "\${kernel_modules}" ] ; then + echo " -> Mount /lib/modules on the host \${kernel_modules}" + mount -t hostfs -o ro,\${kernel_modules} hostfs /lib/modules +fi + +export LOGNAME="${LOGNAME}" +export HOME="${HOME}" +hostname "${UML_HOSTNAME}" +if [ "${UML_MOUNT_TMPFS}" = "yes" ]; then + mount -t tmpfs ${UML_CHROOT_MOUNTPOINT}/tmp ${UML_CHROOT_MOUNTPOINT}/tmp +else + # clean up tmp before playing with it. + rm -rf ${UML_CHROOT_MOUNTPOINT}/tmp + mkdir ${UML_CHROOT_MOUNTPOINT}/tmp + chmod 1777 ${UML_CHROOT_MOUNTPOINT}/tmp +fi + +if [ "${UML_IP}" != 'dhcp' ]; then + cat < ${UML_CHROOT_MOUNTPOINT}/etc/network/interfaces +auto lo +iface lo inet loopback + +# The first network card - this entry was created during the Debian installation +auto eth0 +iface eth0 inet static + address $UML_IP + netmask $UML_NETMASK + network $UML_NETWORK + broadcast $UML_BROADCAST + gateway $UML_GATEWAY + +IP +fi + +cat < ${UML_CHROOT_MOUNTPOINT}/tmp/chrootshell +#! /bin/bash +${UML_DEBUGMODE} +# the shell executed inside chroot inside UML + echo Starting network inside the chroot + mount -t proc /proc /proc + /etc/init.d/networking stop + /etc/init.d/networking start + umount /proc +SHELL +chmod a+x ${UML_CHROOT_MOUNTPOINT}/tmp/chrootshell +chroot ${UML_CHROOT_MOUNTPOINT} /tmp/chrootshell + +#some variables need to be set from outside values, possibly +export PATH="$PATH" +export TMPDIR=/tmp +unset EXTRAOPT || true +declare -a EXTRAOPT +if [ -n "${UML_DISTRIBUTION}" ]; then + EXTRAOPT[0]="--distribution" + EXTRAOPT[1]="${UML_DISTRIBUTION}" +fi +if [ -z "${UML_BUILDRESULT}" ]; then + BUILDRESULT= +else + echo " -> Mount build result dir outside UML [${UML_BUILDRESULT}] as [${UML_CHROOT_BUILDRESULTMOUNTDIR}]" + BUILDRESULT=${UML_CHROOT_BUILDRESULTMOUNTDIR} + mkdir -p ${UML_CHROOT_BUILDRESULTMOUNTDIR} || true + mount -t hostfs none "${UML_CHROOT_BUILDRESULTMOUNTDIR}" -o "${UML_BUILDRESULT}" +fi +pbuilder "$1" ${UML_EXTRAOPT} \${EXTRAOPT[@]} --buildresult "\${BUILDRESULT}" --buildplace "${UML_CHROOT_MOUNTPOINT}" --internal-build-uml ${UML_DEBUGMODE:+--debug} ${BUILDING_DSC_FILE} ${UML_EXECUTE_EXTRAOPT} +echo \$? > /proc/exitcode + +if [ -n "\${kernel_modules}" ] ; then + umount /lib/modules +fi +umount /dev +umount ${UML_CHROOT_MOUNTPOINT} +/sbin/halt -d -f + +### +### END CODE EXECUTED INSIDE User-mode-linux +### +EOF + + chmod a+x ${INSIDE_PBUILDER} + + if [ $( id -u ) = 0 ]; then + echo "W: You are uid=0. Don't run UML as uid=0, it's not supported." >&2 + fi + + echo Invoking: "linux mem=${UML_MEM} eth0=${MY_ETH0} con0=fd:0,fd:1 con=pty root=/dev/root rootflags=/ rootfstype=hostfs ubd1=${PBUILDER_COW}${PBUILDER_UML_IMAGE} init=${INSIDE_PBUILDER} rw" + if linux mem=${UML_MEM} eth0=${MY_ETH0} con0=fd:0,fd:1 con=pty root=/dev/root rootflags=/ rootfstype=hostfs ubd1="${PBUILDER_COW}${PBUILDER_UML_IMAGE}" devfs=mount init=${INSIDE_PBUILDER} rw ; then + UML_EXITCODE=$? + echo " -> Successful exit from user-mode linux" + else + UML_EXITCODE=$? + echo " -> Exit code ${UML_EXITCODE}" + fi +} + + + + +BUILDING_DSC_FILE=$(readlink -f "$1") || true # ignore failure here +EXTRACLEANUP= +UML_EXITCODE=1 +case "${OPERATION}" in + build) + usecow + EXTRACLEANUP=cleancow + operate_uml build + ;; + update) + operate_uml update + ;; + login) + if [ "${UML_LOGIN_NOCOW}" = "yes" ]; then + echo " -> Not using COW filesystem for login session, modifications to this session will persist" + else + usecow + EXTRACLEANUP=cleancow + fi + operate_uml login + ;; + execute) + if [ "${UML_LOGIN_NOCOW}" = "yes" ]; then + echo " -> Not using COW filesystem for login session, modifications to this session will persist" + else + usecow + EXTRACLEANUP=cleancow + fi + shift; + UML_EXECUTE_EXTRAOPT="${UML_EXECUTE_EXTRAOPT} $@" + operate_uml execute + ;; + dumpconfig) + echo " -> start dump outside of UML" + echo " -> set" + set; + echo " -> env" + env; + echo " -> end dump outside of UML" + usecow + EXTRACLEANUP=cleancow + operate_uml dumpconfig + ;; + create) + if [ -n "${UML_DISTRIBUTION}" ]; then + if [ ! -d ~/.pbuilder-user-mode-linux ]; then + mkdir ~/.pbuilder-user-mode-linux + fi + sed "s/dist=.*/dist=${UML_DISTRIBUTION}/" /etc/rootstrap/rootstrap.conf > ~/.pbuilder-user-mode-linux/rootstrap.conf + if [ -f rootstrap.conf ]; then + sed "s/dist=.*/dist=${UML_DISTRIBUTION}/" rootstrap.conf > ~/.pbuilder-user-mode-linux/rootstrap.conf + fi + cd ~/.pbuilder-user-mode-linux + fi + rootstrap -s ${ROOTSTRAP_IMAGESIZE:=1000} ${PBUILDER_UML_IMAGE} + operate_uml update + ;; + *) + echo "Error: Unknown option [${OPERATION}] was specified " >&2 + ;; +esac + +exit ${UML_EXITCODE} diff -Nru pbuilder-0.223~ubuntu14.04.1/pbuilder-user-mode-linux.1 pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-user-mode-linux.1 --- pbuilder-0.223~ubuntu14.04.1/pbuilder-user-mode-linux.1 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pbuilder-user-mode-linux.1 2015-06-22 08:05:23.000000000 +0000 @@ -0,0 +1,281 @@ +.TH "pbuilder\-user\-mode\-linux" 1 "2005 Jun 12" "Debian" "pbuilder" +.SH NAME +pbuilder\-user\-mode\-linux \- personal package builder in UML +.SH SYNOPSIS +.BI "pbuilder\-user\-mode\-linux create [" "options" "]" +.PP +.BI "pbuilder\-user\-mode\-linux update [" "options" "]" +.PP +.BI "pbuilder\-user\-mode\-linux build [" "options" "] " ".dsc-file" +.PP +.BI "pbuilder\-user\-mode\-linux execute [" "options" "] " "script" +.PP +.BI "pbuilder-user\-mode\-linux login [" "options" "]" +.SH DESCRIPTION +Front end program to the +.B "pbuilder" +suite of programs, used for creating and maintaining user-mode-linux environment +and building Debian package within the user-mode-linux virtual machine +environment. + +Unlike +.B "pbuilder", +.B "pbuilder\-user\-mode\-linux" +does not require root privilege to run. +It should be ran under a normal user. + +.SH "OPTIONS" +.TP +.B "create" +Creates a user-mode-linux root image +for the specified distribution using +.B rootstrap +software + +.TP +.B "update" +Updates the +user-mode-linux root image +for the specified distribution. +Also, by specifying the +.B "\-\-distribution" +option, it is possible to switch the distribution. +Specify a dummy distribution value +even for custom apt config files. + +.TP +.B "build" +Builds the package specified by +.I ".dsc-file" +within the user-mode-linux environment. + +.TP +.B "login" +Invokes shell within UML. + +.TP +.B "dumpconfig" +dumps configuration information about user-mode-linux, used for debugging. + +.TP +.B "execute" +Invokes a command or script inside UML. +.B "execute" +will copy the specified file into the UML system, +and run it. + +The remaining command-line arguments are passed on to the script. + +.TP +.BI "\-\-uml\-image [" "UML image" "]" +Specify the UML image to use. + +.TP +.BI "\-\-eth0 [" "uml option for eth0" "]" +Specify this option as parameter to UML. + +Specify +.B "\-\-eth0=slirp,12345,/usr/bin/slirp\-fullbolt" +to use the slirp connection. + +.TP +.BI "\-\-uml\-ip [" "IP inside UML" "]" +Specify this to set the IP inside UML. + +This can be set to +.B "dhcp" +for obtaining IP address through DHCP. + +.TP +.BI "\-\-uml\-netmask [" "netmask" "]" +The netmask. + +.TP +.BI "\-\-uml\-network [" "network" "]" +The network address. + +.TP +.BI "\-\-uml\-broadcast [" "broadcast" "]" +The broadcast address. + +.TP +.BI "\-\-uml\-gateway [" "gateway" "]" +The gateway address. + +.TP +.BI "\-\-mount\-tmpfs [" "yes" "]" +Specify whether to mount tmpfs inside UML chroot. + +.TP +.BI "\-\-uml\-hostname [" "uml-host" "]" +The hostname inside uml. + +.TP +.BI "\-\-distribution [" "sid" "]" +Specify the distribution. +see pbuilder(8) + +.TP +.BI "\-\-binary-arch" +Specify only to build binary-arch targets. +see pbuilder(8) + +.TP +.BI "\-\-timeout " "timeouttime" +Timeout build after specified time. +see pbuilder(8) + +.TP +.BI "\-\-configfile " "config file to read" +Makes pbuilder to read the config file inside UML. +pbuilder-user-mode-linux itself would be affected by the contents of the +config file. + +.TP +.BI "\-\-hookdir " "location of hooks" +Makes pbuilder use the specified hookdir inside UML. + +.TP +.BI "\-\-aptconfdir " "apt configuretion directory" +Makes pbuilder to use specified apt configuration directory instead of +other settings. See pbuilder(8) + +.TP +.BI "\-\-override\-config" +Specify this option along with +.B \-\-distribution +to switch distribution using +.B "pbuilder\-user\-mode\-linux update" + +.TP +.BI "\-\-logfile " "logfilename" +Specify this option to make the output go to +.I logfilename +as well as standard output. + +.TP +.BI "\-\-buildresult " "/dir/to/build/result" +The directory where build result is placed to + +.TP +.BI "\-\-uml\-debugmode" +Enable tracing of shell scripts used by pbuilder\-user\-mode\-linux. + +.TP +.BI "\-\-bindmounts " "/dir/to/bind-mount" +Bind-mount the directory inside the chroot inside the user-mode-linux. + +.TP +.BI "\-\-buildplace " "place-to-put-COW-file" +Specify the directory to place the COW file. +The user needs to be able to access that directory, +and the directory must exist. + +.TP +.BI "\-\-uml\-login\-nocow" +Do not use COW filesystem when using +.B "pbuilder\-user\-mode\-linux login" +so that changes made in the log in session will persist. + +Effective in +.B login +and +.B exec +options. + +\" copied from pbuilder.8 + +.TP +.BI "\-\-mirror [" "mirror location" "]" +Specifies the URL of Debian mirror to be +specified in +.B "sources.list" +inside the chroot. +This option is only valid when distribution is being specified, for +update and build targets. +The format is something like: +.I "http://http.us.debian.org/debian" +which should point to your favourite mirror. + +This option can optionally be omitted, and left blank, +in which case, this part is skipped. + +Note that these URLs specified to pbuilder will be used from within +the chroot, and specifying +.B "file:/somewhere/" +will most probably fail. + +.TP +.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 ./" + +The deb lines here are the ones that will appear at the top of the +.B "sources.list" +inside the chroot. +Be sure to follow the syntax rules of +.BR "sources.list" "(5)." +These lines appear at the beginning of the +constructed sources file, so this is the place to list your +.B "local" +mirror sites; apt will then use them in preference to the ones +listed in +.B "\-\-mirror". + +These options are only valid when +.B "\-\-override\-config" +option is specified in +.B "update" +target, or when +.B "pbuilder create" +is being called. + +\" copied from pbuilder.8 + +.SH "NOTES" +For +.B build +and +.B login +targets, +.B pbuilder\-user\-mode\-linux +will try to use COW devices. + +Inside user-mode-linux, pbuilder-user-mode-linux will mount +tmpfs as +.B /tmp +to avoid temporary file race conditions with outside of UML. +This may cause problems trying to use files in /tmp directory. + +.SH "FILES" +.TP +.I "/etc/pbuilderrc" +The system-wide configuration file for pbuilder. +.TP +.I "/usr/share/pbuilder/pbuilderrc" +The default settings for pbuilder, used as fallback for all +values that is not specified in +.B "/etc/pbuilderrc." +.TP +.B "/etc/pbuilder/pbuilder\-uml.conf" +System-wide configuration file for pbuilder-uml, +it will take priority over pbuilder configurations. +.TP +.B "/usr/share/pbuilder/pbuilder\-uml.conf" +Software-default configuration file for pbuilder-uml. +.TP +.B "${HOME}/.pbuilderrc" +User-default configuration file. +.SH "SEE ALSO" +.BR "/usr/share/doc/pbuilder/pbuilder-doc.html" ", " +.BR "pdebuild" "(1), " +.BR "pbuilder" "(8), " +.BR "rootstrap" "(1), " +.BR "linux" "(1), " +.BR "pbuilderrc" "(5), " +.BR "pbuilder\-uml.conf" "(5)" + + + diff -Nru pbuilder-0.223~ubuntu14.04.1/pdebuild pbuilder-0.215+nmu4ubuntu1~ppa1/pdebuild --- pbuilder-0.223~ubuntu14.04.1/pdebuild 2016-01-05 16:44:37.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pdebuild 2015-06-22 08:05:23.000000000 +0000 @@ -1,7 +1,6 @@ #! /bin/bash # pbuilder -- personal Debian package builder -# Copyright © 2001-2007 Junichi Uekawa -# 2015 Mattia Rizzolo +# Copyright (C) 2001-2007 Junichi Uekawa # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -############################################################################### - set -e export PBCURRENTCOMMANDLINEOPERATION="pdebuild" @@ -28,7 +25,7 @@ done if test ! -d ./debian; then - log.e "Cannot find ./debian dir" + log "E: Cannot find ./debian dir" exit 1 fi; @@ -36,7 +33,6 @@ PKG_VERSION=$(dpkg-parsechangelog|sed -n 's/^Version: \(.*:\|\)//p') ARCHITECTURE="${ARCHITECTURE:-$(dpkg-architecture -qDEB_HOST_ARCH)}" CHANGES="${PKG_SOURCENAME}_${PKG_VERSION}_${ARCHITECTURE}.changes" -SOURCE_CHANGES="${PKG_SOURCENAME}_${PKG_VERSION}_source.changes" if [ -z "${PBUILDER_BUILD_LOGFILE}" ]; then PBUILDER_BUILD_LOGFILE="../${PKG_SOURCENAME}_${PKG_VERSION}_${ARCHITECTURE}.build" @@ -68,20 +64,19 @@ done conditional_cp_a ../${CHANGES} "${BUILDRESULT}" for files in "${ADDITIONAL_BUILDRESULTS[@]}"; do - log.i "Trying to save additional result ${files}" + log "I: Trying to save additional result ${files}" conditional_cp_a "${files}" "${BUILDRESULT}" || true done else - log.e "BUILDRESULT=[$BUILDRESULT] is not a directory." + log "E: BUILDRESULT=[$BUILDRESULT] is not a directory." exit 1 fi else if ! dpkg-checkbuilddeps -B ; then - log.w "Unmet build-dependency in source" + log "W: Unmet build-dependency in source" fi - echo "dpkg-buildpackage -S -d -us -uc -r${BUILDSOURCEROOTCMD} $DEBBUILDOPTS" | \ - perl -pe 's/(^|\s|=|'\'')-[AbBFgG]('\''|\s|$)/$1$2/g' | \ - perl -pe 's/(^|\s|=)['\'']['\''](\s|$)/$1$2/g' | \ + echo "dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} $DEBBUILDOPTS" | \ + perl -pe 's/(^|\s)-[AbBF](\s|$)/$1$2/g' | \ /bin/bash ${PBUILDERROOTCMD} \ ${PDEBUILD_PBUILDER} \ @@ -98,15 +93,8 @@ if [ "${AUTO_DEBSIGN}" = "yes" ]; then unset DEBSIGN_PARAM || true if [ -n "${DEBSIGN_KEYID}" ]; then - DEBSIGN_PARAM[1]="-k${DEBSIGN_KEYID}" - fi - if [ -f "${BUILDRESULT}/${CHANGES}" ]; then - DEBSIGN_PARAM[2]="${BUILDRESULT}/${CHANGES}" - elif [ -f "${BUILDRESULT}/${SOURCE_CHANGES}" ]; then - DEBSIGN_PARAM[2]="${BUILDRESULT}/${SOURCE_CHANGES}" - else - log.e "the .changes file can't be found, debsing not done" - exit 1 + DEBSIGN_PARAM[1]="-k${DEBSIGN_KEYID}" fi + DEBSIGN_PARAM[2]="${BUILDRESULT}/${CHANGES}" debsign "${DEBSIGN_PARAM[@]}" fi diff -Nru pbuilder-0.223~ubuntu14.04.1/pdebuild-checkparams pbuilder-0.215+nmu4ubuntu1~ppa1/pdebuild-checkparams --- pbuilder-0.223~ubuntu14.04.1/pdebuild-checkparams 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pdebuild-checkparams 2015-06-22 08:05:23.000000000 +0000 @@ -33,7 +33,7 @@ BUILDRESULT=$(readlink -f "$2"); else BUILDRESULT="$2" - log.w "Build-result Directory $2 does not exist" + log "W: Build-result Directory $2 does not exist" # warn, but make it progress. fi else @@ -47,7 +47,7 @@ ;; --configfile) if [ ! -f "$2" ]; then - log.e "Config file $2 does not exist" + log "E: Config file $2 does not exist" exit 1 fi . "$2"; @@ -89,26 +89,25 @@ shift; ;; --logfile) - log.i "Logging to $2" + log "I: Logging to $2" PBUILDER_BUILD_LOGFILE=$(readlink -f $2) exec > >(tee "$2") 2>&1 shift; shift; ;; --pbuilder) - log.i "using $2 as pbuilder" + log "I: using $2 as pbuilder" PDEBUILD_PBUILDER="$2" shift; shift; ;; --help) showhelp - exit 0 ;; --) # end of processing for this shift; break; ;; --*) - log.e "Unknown option [$1] was specified " + log "E: Unknown option [$1] was specified " exit 1; ;; *) diff -Nru pbuilder-0.223~ubuntu14.04.1/pdebuild-internal pbuilder-0.215+nmu4ubuntu1~ppa1/pdebuild-internal --- pbuilder-0.223~ubuntu14.04.1/pdebuild-internal 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/pdebuild-internal 2015-06-22 08:05:23.000000000 +0000 @@ -39,9 +39,6 @@ shift; # dummy function that does enough, real one is defined elsewhere. -# We don't deal with LOGLEVEL here, though. -# We can't just source the modules and use log.{i,w,e} since we don't know if -# the pbuilder version inside the chroot is new enough. function log() { echo "$*" } @@ -124,7 +121,7 @@ # do build with that user. # $DEBBUILDOPTS is evaluated inside the su and chroot. export DEBBUILDOPTS -CMD="env PATH=$PATH /usr/bin/dpkg-buildpackage -rfakeroot -us -uc "'${DEBBUILDOPTS}' +CMD="/usr/bin/dpkg-buildpackage -rfakeroot -us -uc "'${DEBBUILDOPTS}' echo "I: Running $CMD" # This command should be ran with current directory as bind-mounted # package source directory diff -Nru pbuilder-0.223~ubuntu14.04.1/t/runtests.sh pbuilder-0.215+nmu4ubuntu1~ppa1/t/runtests.sh --- pbuilder-0.223~ubuntu14.04.1/t/runtests.sh 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/t/runtests.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -#/bin/bash - -set -e - -cd $(dirname $0) -for t in test_*; do - ./"$t" -done diff -Nru pbuilder-0.223~ubuntu14.04.1/t/testlib.sh pbuilder-0.215+nmu4ubuntu1~ppa1/t/testlib.sh --- pbuilder-0.223~ubuntu14.04.1/t/testlib.sh 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/t/testlib.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,171 +0,0 @@ -#!/bin/bash -# 2008 Junichi Uekawa - -set -e - -# library for functional unit-testing in bash. - -# WARNING: this file locates files differently from the other pbuilder -# functions: -# - if PBUILDER_CHECKOUT is set, it is assumed that testlib.sh is sourced from -# a pbuilder checkout (e.g. from the upstream Makefile or Debian build) -# - otherwise, PBUILDER_TEST_ROOT or PBUILDER_TEST_*DIR should be used to -# locate files instead of PBUILDER_ROOT and PBUILDER_*DIR since -# testlib_setup_env() overrides these vars to run the other pbuilder modules -# with a fake environment - -# if this is set, use pbuilder files from this location; otherwise, use -# installed files (from PBUILDER_TEST_ROOT, which is a copy of PBUILDER_ROOT) -PBUILDER_CHECKOUT="${PBUILDER_CHECKOUT:-}" - -if [ -z "$PBUILDER_CHECKOUT" ]; then - # these currently don't need to be exported - PBUILDER_TEST_ROOT="${PBUILDER_ROOT:-}" - PBUILDER_TEST_PKGLIBDIR="${PBUILDER_PKGLIBDIR:-$PBUILDER_ROOT/usr/lib/pbuilder}" - PBUILDER_TEST_PKGDATADIR="${PBUILDER_PKGDATADIR:-$PBUILDER_ROOT/usr/share/pbuilder}" -fi - -# set PBUILDER_TEST_VERBOSE to get the full output of tests - -TESTLIB_FAILS=0 -TESTLIB_TESTS=0 - -testlib_echo() { - case "$1" in - OK) - shift - if [ -n "$PBUILDER_TEST_VERBOSE" ]; then - echo "[OK]" "$@" >&2 - fi - ;; - FAIL) - shift - echo "[FAIL]" "$@" >&2 - TESTLIB_FAILS=$(($TESTLIB_FAILS + 1)) - ;; - esac - TESTLIB_TESTS=$(($TESTLIB_TESTS + 1)) -} - -testlib_summary() { - echo "$0: Ran $TESTLIB_TESTS tests and $(($TESTLIB_TESTS - $TESTLIB_FAILS)) succeeded, $TESTLIB_FAILS failed" - if [ $TESTLIB_FAILS != 0 ]; then - echo '=================' - echo 'Testsuite FAILED!' - echo " $0" - echo '=================' - return 1 - fi - return 0 -} - -# Create fake installed tree with basic config files. Make sure you trap test -# script exit to call testlib_cleanup_env. Optional arg is location of the -# pbuilder checkout to copy files from. -# this is where the env actually lives -testlib_env_root="" -testlib_setup_env() { - local abs_pbuilder_checkout r - - if [ -n "$testlib_env_root" ]; then - echo "testlib_setup_env called twice without testlib_cleanup_env" >&2 - testlib_cleanup_env - exit 1 - fi - - if [ -n "$PBUILDER_CHECKOUT" ]; then - abs_pbuilder_checkout="`cd $PBUILDER_CHECKOUT; pwd`" - fi - - # backup env vars - testlib_env_oldhome="$HOME" - testlib_env_oldroot="$PBUILDER_ROOT" - - testlib_env_root="`mktemp -dt`" - # brevity - r="$testlib_env_root" - - mkdir "$r"/etc - touch "$r"/etc/pbuilderrc - mkdir -p "$r"/usr/share/pbuilder - if [ -n "$PBUILDER_CHECKOUT" ]; then - cp "$PBUILDER_CHECKOUT"/pbuilderrc "$r"/usr/share/pbuilder - else - cp "$PBUILDER_TEST_PKGDATADIR"/pbuilderrc "$r"/usr/share/pbuilder - fi - mkdir -p "$r"/usr/lib - if [ -n "$PBUILDER_CHECKOUT" ]; then - ln -s "$abs_pbuilder_checkout" "$r"/usr/lib/pbuilder - else - ln -s "$PBUILDER_TEST_PKGLIBDIR" "$r"/usr/lib/pbuilder - fi - export PBUILDER_ROOT="$r" - # when running the testsuite within pbuilder, these env vars will have been - # set by regular pbuilder commands, so we need to unset them as to allow - # their default values to be recomputed relative to PBUILDER_ROOT - unset PBUILDER_PKGLIBDIR PBUILDER_PKGDATADIR PBUILDER_SYSCONFDIR - - mkdir "$r"/home - touch "$r"/home/.pbuilderrc - export HOME="$r"/home -} - -# Reverse the effect of testlib_setup_env. Setup a trap handler in your tests -# on this function if you call testlib_setup_env. -testlib_cleanup_env() { - if [ -z "$testlib_env_root" ]; then - # nothing to do - return - fi - rm -rf "$testlib_env_root" - export PBUILDER_ROOT="$testlib_env_oldroot" - export HOME="$testlib_env_oldhome" - testlib_env_root="" -} - -expect_success() { - # run the test in subshell; successful commands should not output anything - # to stderr but may send output to stdout - if (if [ -z "$PBUILDER_TEST_VERBOSE" ]; then exec >/dev/null; fi; "$@"); then - testlib_echo "OK" "$1" - else - testlib_echo "FAIL" "$1" - fi -} - -expect_fail() { - # run the test in subshell; failed commands may output anything to stdout - # and stderr - if (if [ -z "$PBUILDER_TEST_VERBOSE" ]; then exec >/dev/null 2>&1; fi; "$@"); then - testlib_echo "FAIL" "$1" - else - testlib_echo "OK" "$1" - fi -} - -expect_output() { - # run the test in subshell - local val result - val="$1" - shift - result="`"$@" 2>&1`" || true - if [ "$result" = "$val" ]; then - testlib_echo "OK" "$1" - else - testlib_echo "FAIL" "$1" "expected [$val] but got [$result]" - fi -} - -expect_stderr() { - # we need to use 2 subshells, one which discards the stdout, and the other - # that redirects stderr to stdout so that it can be saved to the variable - local val result - val="$1" - shift - result="$( { "$@" >/dev/null; } 2>&1)" || true - if [ "$result" = "$val" ]; then - testlib_echo "OK" "$1" - else - testlib_echo "FAIL" "$1" "expected [$val] but got [$result]" - fi -} diff -Nru pbuilder-0.223~ubuntu14.04.1/t/test_pbuilder-apt-config pbuilder-0.215+nmu4ubuntu1~ppa1/t/test_pbuilder-apt-config --- pbuilder-0.223~ubuntu14.04.1/t/test_pbuilder-apt-config 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/t/test_pbuilder-apt-config 1970-01-01 00:00:00.000000000 +0000 @@ -1,185 +0,0 @@ -#!/bin/bash - -set -e - -self="$(basename "$0")" - -TD="$(dirname "$0")" -if [ -n "$PBUILDER_CHECKOUT" ]; then - . "$TD/testlib.sh" - PBUILDER_APT_CONFIG="$PBUILDER_CHECKOUT/pbuilder-apt-config" -else - . "$TD/testlib.sh" - PBUILDER_APT_CONFIG="$PBUILDER_TEST_PKGLIBDIR/pbuilder-apt-config" -fi - -mirror_map="" - -cleanup() { - if [ -n "$mirror_map" ]; then - rm -f "$mirror_map" - fi -} - -mirror_map="$(mktemp -t "$self.XXXXXXXXXX")" -cat >"$mirror_map" < -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . -# On Debian systems, the full text of the GNU General Public -# License version 2 can be found in the file -# `/usr/share/common-licenses/GPL-2'. - - -# testsuite to test pbuilder-satisfydepends-funcs. - -TD="$(dirname "$0")" -if [ -n "$PBUILDER_CHECKOUT" ]; then - . "$TD/testlib.sh" - . "$PBUILDER_CHECKOUT/pbuilder-buildpackage-funcs" -else - . "$TD/testlib.sh" - . "$PBUILDER_TEST_PKGLIBDIR/pbuilder-buildpackage-funcs" -fi - -DEBIAN_CONTROL="" - -cleanup() { - if [ -n "$DEBIAN_CONTROL" ]; then - rm -f "$DEBIAN_CONTROL" - fi -} - -test_getdscfilesNormal () { - - cat > "$DEBIAN_CONTROL" << EOF ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -Format: 3.0 (quilt) -Source: libeatmydata -Binary: eatmydata, libeatmydata1 -Architecture: any all -Version: 82-6 -Maintainer: Modestas Vainius -Uploaders: Mattia Rizzolo -Homepage: https://launchpad.net/libeatmydata -Standards-Version: 3.9.6 -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/libeatmydata.git -Vcs-Git: git://anonscm.debian.org/collab-maint/libeatmydata.git -Build-Depends: autotools-dev, debhelper (>= 9), strace [!hurd-any !kfreebsd-any] -Package-List: - eatmydata deb utils optional arch=all - libeatmydata1 deb utils optional arch=any -Checksums-Sha1: - c8d3cd2d9a872302c8a1494813565639bd4c2aa8 407977 libeatmydata_82.orig.tar.gz - 4a76697591072662acee1e25d7f86c1f6ac503dd 43484 libeatmydata_82-6.debian.tar.xz -Checksums-Sha256: - 0b675f58069f912727cee5eb75f9ff1a6a8300fe7e3fe4fc6bdd03b7c2c15b29 407977 libeatmydata_82.orig.tar.gz - 3b5aede6617ed161211aee6f421d6af3c1ae22a4f4d11dc6545138359d7eea2c 43484 libeatmydata_82-6.debian.tar.xz -Files: - 56a4d342f209ab75a9ee360236e3e5bc 407977 libeatmydata_82.orig.tar.gz - 06c197d3d4142b546e836d72fbe4b895 43484 libeatmydata_82-6.debian.tar.xz - ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.12 (GNU/Linux) - -iD8DBQFUfLA320zMSyow1ykRAkRxAJ4zYyuUByiYq31sxbrB902PybqADwCfd/Gd -SPXUusVdt4obPwG2sauWLlc= -=e9Vj ------END PGP SIGNATURE----- -EOF - getdscfiles "$DEBIAN_CONTROL" -} - -test_getdscfilesWithoutNL () { - - cat > "$DEBIAN_CONTROL" << EOF ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -Format: 3.0 (quilt) -Source: golang-xmpp-dev -Binary: golang-xmpp-dev -Architecture: all -Version: 0.0~git20140304-1 -Maintainer: Jacob Appelbaum -Homepage: https://www.github.com/agl/xmpp -Standards-Version: 3.9.5 -Build-Depends: debhelper (>= 9) -Package-List: - golang-xmpp-dev deb devel extra -Checksums-Sha1: - 2175fd06e8fcf9787044036837f21b7e6c3d2ceb 10040 golang-xmpp-dev_0.0~git20140304.orig.tar.gz - 72b5180710909e30208627bd77dd899751475309 2208 golang-xmpp-dev_0.0~git20140304-1.debian.tar.xz -Checksums-Sha256: - 41805d983433423eb967628c43f033a19f6c8363c3d40a5931a5eb28f4e9133c 10040 golang-xmpp-dev_0.0~git20140304.orig.tar.gz - 54f49f52c2c1399c8262afc582e1ce38ef99cd4d95cd06f9350a91960176a925 2208 golang-xmpp-dev_0.0~git20140304-1.debian.tar.xz -Files: - a00613a2e965c11c9713268c25486a1b 10040 golang-xmpp-dev_0.0~git20140304.orig.tar.gz - e5bc6c49ca86922344531418dee9e5dd 2208 golang-xmpp-dev_0.0~git20140304-1.debian.tar.xz ------BEGIN PGP SIGNATURE----- - -iQGVAwUBUxYUR1kMfZESRfeDAQgvCwv8CM7a+LcQQnk5Gil3jHHlr4EO6NvuDMpW -4+yviAFZCmOVq3poUKYpojNNtIBPSGh2+POEOZu+6h1rQxQpPeiqrIteS4pMhR7s -bptUqqAbRH/Yy9pcmPOf+yDeeGAr/xaga9vvankdn60Q5D7Xk85Bhl6a3KucCwGA -h5s/ywDXZVOtjqywoB+zR5Jd2kuhjJUUdnUxTvVrw+rZXaKcwgAM1zUv6Tqkdkij -NRJFW5p17c1gg0v7KvWcCJoNcF5Mn1avnTF7OhZm5ODreM9kgpcd+8yuG3n6j/Ey -o4E6p2Tf5wTQ2t44OaU1uu8+0mjPhDxfEjGKcdThWQyrqO0hkGAfLkubLGRB4EZo -dcWK+KNxOR5HzgQGJw+rEGn/x7kcQtdDeXn3EsHeAhJscicdbJW9nCM47+PLM7Pn -B3WfTzfwrzVC/IcSM1303chIW0dfsMTCP0ubFZOqoMMflSKRPiJ3vPvJFFzmrS31 -M4EDxlS+nvAHZbzQ49QGnU/dMocDzvAH -=XSwB ------END PGP SIGNATURE----- -EOF - getdscfiles "$DEBIAN_CONTROL" - -} - -trap cleanup sigpipe sighup exit - -# FIXME move to build dir also because we have to hardoce /tmp/ on the result below -DEBIAN_CONTROL="$(tempfile)" - -expect_output "$DEBIAN_CONTROL /tmp/libeatmydata_82.orig.tar.gz /tmp/libeatmydata_82-6.debian.tar.xz" test_getdscfilesNormal -expect_output "$DEBIAN_CONTROL /tmp/golang-xmpp-dev_0.0~git20140304.orig.tar.gz /tmp/golang-xmpp-dev_0.0~git20140304-1.debian.tar.xz" test_getdscfilesWithoutNL - -testlib_summary diff -Nru pbuilder-0.223~ubuntu14.04.1/t/test_pbuilder-checkparams pbuilder-0.215+nmu4ubuntu1~ppa1/t/test_pbuilder-checkparams --- pbuilder-0.223~ubuntu14.04.1/t/test_pbuilder-checkparams 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/t/test_pbuilder-checkparams 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -#!/bin/bash - -# testsuite for pbuilder-checkparams - -TD="$(dirname "$0")" -if [ -n "$PBUILDER_CHECKOUT" ]; then - . "$TD/testlib.sh" - PBUILDER_CHECKPARAMS="$PBUILDER_CHECKOUT/pbuilder-checkparams" -else - . "$TD/testlib.sh" - PBUILDER_CHECKPARAMS="$PBUILDER_TEST_PKGLIBDIR/pbuilder-checkparams" -fi - -# setup a fake installed environment -trap testlib_cleanup_env sigpipe sighup exit -testlib_setup_env - -test_debuildopts() { - . "$PBUILDER_CHECKPARAMS" - echo "$DEBBUILDOPTS" -} - -expect_output "" \ - test_debuildopts foo.dsc -expect_output "" \ - test_debuildopts --debbuildopts "" foo.dsc -expect_output "-v1.0 -efoo" \ - test_debuildopts --debbuildopts "-v1.0 -efoo" foo.dsc -expect_output "-v1.0 -efoo" \ - test_debuildopts --debbuildopts -v1.0 --debbuildopts -efoo foo.dsc -expect_output "-efoo" \ - test_debuildopts --debbuildopts -v1.0 --debbuildopts "" --debbuildopts -efoo foo.dsc - -testlib_summary diff -Nru pbuilder-0.223~ubuntu14.04.1/t/test_pbuilder-modules pbuilder-0.215+nmu4ubuntu1~ppa1/t/test_pbuilder-modules --- pbuilder-0.223~ubuntu14.04.1/t/test_pbuilder-modules 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/t/test_pbuilder-modules 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -#!/bin/bash - -TD="$(dirname "$0")" -LOGLEVEL=I -if [ -n "$PBUILDER_CHECKOUT" ]; then - . "$TD/testlib.sh" - . "$PBUILDER_CHECKOUT/pbuilder-modules" -else - . "$TD/testlib.sh" - . "$PBUILDER_TEST_PKGLIBDIR/pbuilder-modules" -fi - -function test_information() { - log "I: test" - log "W: warning" - log "E: error" -} -expect_output "I: test -W: warning -E: error" test_information -expect_stderr "W: warning -E: error" test_information - -function test_log() { - log.d "debug" # this should not be printed in LOGLEVEL=I (the default) - log.i "info" - log.w "warn" - log.e "error" -} -expect_output "I: info -W: warn -E: error" test_log -expect_stderr "W: warn -E: error" test_log - -# test the non-copy case -function test_conditional_cp_a() { - ( - TEMPDIR=$(mktemp -d) - cd "${TEMPDIR}" - touch "hoge" - outdir=$(readlink -f "${TEMPDIR}/..") - conditional_cp_a "hoge" "${outdir}" echo - ) -} -expect_output "I: file hoge is already in target, not copying." \ - test_conditional_cp_a - -# test the copy case. -function test_conditional_cp_a_copy() { - ( - cd /tmp - outdir=/something-else - conditional_cp_a "hoge" "${outdir}" echo - ) -} -expect_output "-a hoge /something-else" test_conditional_cp_a_copy - -testlib_summary diff -Nru pbuilder-0.223~ubuntu14.04.1/t/test_pbuilder-satisfydepends-checkparams pbuilder-0.215+nmu4ubuntu1~ppa1/t/test_pbuilder-satisfydepends-checkparams --- pbuilder-0.223~ubuntu14.04.1/t/test_pbuilder-satisfydepends-checkparams 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/t/test_pbuilder-satisfydepends-checkparams 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -#!/bin/bash - -TD="$(dirname "$0")" -if [ -n "$PBUILDER_CHECKOUT" ]; then - . "$TD/testlib.sh" - PBUILDER_SATISFYDEPENDS_CHECKPARAMS="$PBUILDER_CHECKOUT/pbuilder-satisfydepends-checkparams" -else - . "$TD/testlib.sh" - PBUILDER_SATISFYDEPENDS_CHECKPARAMS="$PBUILDER_TEST_PKGLIBDIR/pbuilder-satisfydepends-checkparams" -fi - -# testsuite to test pbuilder-satisfydepends-checkparams. - -# mock function -checkbuilddep_internal() { - : # do nothing function -} - -test_chrootexec2() { - set -- --internal-chrootexec 'chroot /tmp-hoge ' --chroot /tmp - . "$PBUILDER_SATISFYDEPENDS_CHECKPARAMS" -} -expect_fail test_chrootexec2 - -test_chrootexec1() { - set -- --chroot /tmp --internal-chrootexec 'chroot /tmp-hoge ' - . "$PBUILDER_SATISFYDEPENDS_CHECKPARAMS" -} -expect_success test_chrootexec1 - -test_chrootexec_echo() { - set -- --echo --chroot /tmp - . "$PBUILDER_SATISFYDEPENDS_CHECKPARAMS" -} -expect_fail test_chrootexec_echo - -test_chrootexec_echo2() { - set -- --chroot /tmp --echo - . "$PBUILDER_SATISFYDEPENDS_CHECKPARAMS" - echo $CHROOTEXEC -} -expect_output "echo chroot /tmp" test_chrootexec_echo2 - -test_chrootexec_expect() { - set -- --chroot /tmp --internal-chrootexec 'chroot /tmp-hoge ' - . "$PBUILDER_SATISFYDEPENDS_CHECKPARAMS" - echo $CHROOTEXEC -} -expect_output "chroot /tmp-hoge" test_chrootexec_expect - -testlib_summary diff -Nru pbuilder-0.223~ubuntu14.04.1/t/test_pbuilder-satisfydepends-classic pbuilder-0.215+nmu4ubuntu1~ppa1/t/test_pbuilder-satisfydepends-classic --- pbuilder-0.223~ubuntu14.04.1/t/test_pbuilder-satisfydepends-classic 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/t/test_pbuilder-satisfydepends-classic 1970-01-01 00:00:00.000000000 +0000 @@ -1,116 +0,0 @@ -#!/bin/bash -#for flavour in aptitude classic experimental gdebi; do -# (. ./pbuilder-satisfydepends-"$flavour") -#done - -TD="$(dirname "$0")" -if [ -n "$PBUILDER_CHECKOUT" ]; then - . "$TD/testlib.sh" - PBUILDER_SATISFYDEPENDS_CLASSIC="$PBUILDER_CHECKOUT/pbuilder-satisfydepends-classic" -else - . "$TD/testlib.sh" - PBUILDER_SATISFYDEPENDS_CLASSIC="$PBUILDER_TEST_PKGLIBDIR/pbuilder-satisfydepends-classic" -fi - -DEBIAN_CONTROL="" - -cleanup() { - if [ -n "$DEBIAN_CONTROL" ]; then - rm -f "$DEBIAN_CONTROL" - fi - testlib_cleanup_env -} - -trap cleanup sigpipe sighup exit - -# setup a fake installed environment -testlib_setup_env - -if [ -n "$PBUILDER_CHECKOUT" ]; then - PBUILDER_SATISFYDEPENDS_CLASSIC="$PBUILDER_CHECKOUT/pbuilder-satisfydepends-classic" -else - export PBUILDER_PKGLIBDIR="${PBUILDER_PKGLIBDIR:-$PBUILDER_ROOT/usr/lib/pbuilder}" - PBUILDER_SATISFYDEPENDS_CLASSIC="$PBUILDER_PKGLIBDIR/pbuilder-satisfydepends-classic" -fi - -set -- --echo --control "$DEBIAN_CONTROL" -# this is just to source the functions -. "$PBUILDER_SATISFYDEPENDS_CLASSIC" >/dev/null 2>&1 || true - -DEBIAN_CONTROL="`mktemp -t`" -cat >"$DEBIAN_CONTROL" <= 5.0.0), gnome-pkg-tools, autotools-dev, cdbs, libglib2.0-dev (>= 2.12), libgtk2.0-dev (>= 2.10), libgnome2-dev (>= 2.16.0), libgnomeui-dev (>= 2.16.0), libglade2-dev, libgnomevfs2-dev (>= 2.9.2), libgconf2-dev, libxft-dev, libperl-dev, python-dev, tcl8.4-dev, libxml-parser-perl, libdbus-glib-1-dev (>= 0.60), libtool, scrollkeeper, libgnutls-dev, libnotify-dev (>= 0.3.2-0), libsexy-dev (>= 0.1.7), gnome-doc-utils, libssl-dev (>= 0.9.8b-1), liblaunchpad-integration-dev - -EOF - -test_split_deps() { - get_build_deps | split_deps -} - -expect_output "debhelper/(>=/5.0.0) -gnome-pkg-tools -autotools-dev -cdbs -libglib2.0-dev/(>=/2.12) -libgtk2.0-dev/(>=/2.10) -libgnome2-dev/(>=/2.16.0) -libgnomeui-dev/(>=/2.16.0) -libglade2-dev -libgnomevfs2-dev/(>=/2.9.2) -libgconf2-dev -libxft-dev -libperl-dev -python-dev -tcl8.4-dev -libxml-parser-perl -libdbus-glib-1-dev/(>=/0.60) -libtool -scrollkeeper -libgnutls-dev -libnotify-dev/(>=/0.3.2-0) -libsexy-dev/(>=/0.1.7) -gnome-doc-utils -libssl-dev/(>=/0.9.8b-1) -liblaunchpad-integration-dev" test_split_deps - -expect_output "foo -bar" split_alternates "foo | bar" - -expect_output "debhelper -gnome-pkg-tools -autotools-dev -cdbs -libglib2.0-dev -libgtk2.0-dev -libgnome2-dev -libgnomeui-dev -libglade2-dev -libgnomevfs2-dev -libgconf2-dev -libxft-dev -libperl-dev -python-dev -tcl8.4-dev -libxml-parser-perl -libdbus-glib-1-dev -libtool -scrollkeeper -libgnutls-dev -libnotify-dev -libsexy-dev -gnome-doc-utils -libssl-dev -liblaunchpad-integration-dev" get_pkg_name "`test_split_deps`" - -expect_output ">= 5.0.0 ->= 2.12 ->= 2.10 ->= 2.16.0 ->= 2.16.0 ->= 2.9.2 ->= 0.60 ->= 0.3.2-0 ->= 0.1.7 ->= 0.9.8b-1" get_dep_op_and_ver "`test_split_deps`" - -testlib_summary diff -Nru pbuilder-0.223~ubuntu14.04.1/t/test_pbuilder-satisfydepends-funcs pbuilder-0.215+nmu4ubuntu1~ppa1/t/test_pbuilder-satisfydepends-funcs --- pbuilder-0.223~ubuntu14.04.1/t/test_pbuilder-satisfydepends-funcs 2016-01-08 15:08:31.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/t/test_pbuilder-satisfydepends-funcs 1970-01-01 00:00:00.000000000 +0000 @@ -1,207 +0,0 @@ -#!/bin/bash - -# testsuite to test pbuilder-satisfydepends-funcs. - -TD="$(dirname "$0")" -if [ -n "$PBUILDER_CHECKOUT" ]; then - . "$TD/testlib.sh" - . "$PBUILDER_CHECKOUT/pbuilder-satisfydepends-funcs" -else - . "$TD/testlib.sh" - . "$PBUILDER_TEST_PKGLIBDIR/pbuilder-satisfydepends-funcs" -fi - -DEBIAN_CONTROL="" - -cleanup() { - if [ -n "$DEBIAN_CONTROL" ]; then - rm -f "$DEBIAN_CONTROL" - fi -} - -test_get_build_deps() { - local BINARY_ARCH - - BINARY_ARCH="$1" - - cat <"$DEBIAN_CONTROL" -Source: amule -XXXX: -Build-Depends: - autotools-dev ( >= 1.2 ) , - debhelper , - quilt(<<12:0), -## - libwxgtk2.8-dev -Build-Depends-Indep: test [ amd64 i386 ], test1, - test2[!i386 ! amd64], test3 | - test4, test5 -Misc: test -Build-Depends-Arch: foo1, foo2 , foo3 (<< 12.23.34-5), - bar4 [!amd64] , foobar [i386], gnagna [ !s390x ] - -Build-Depends: wrong build depends, line -Description: test - other things - wow -EOF - get_build_deps -} - -test_get_build_deps_dsc() { - cat <"$DEBIAN_CONTROL" ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -Format: 1.0 -Source: hello-debhelper -Build-Depends: debhelper (>= 7) -Checksums-Sha1: - fcbf0264928900adf03a7797474375e1a6fa3836 499638 hello-debhelper_2.4.orig.tar.gz - 0ea70eb46b4c90a8dbefbe60bebe4b9f9abb2733 5308 hello-debhelper_2.4-3.diff.gz - - ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iQEcBAEBCAAGBQJKml74AAoJEEHOfwufG4sysC4H/26EikyIgIqRuSXMiykc1hmd -97id9nWl+QzgCpUEg/+uDqEW+Bl6291FstGvzTFCwmB5JjH9ErH1LsyG1OLXbFUb -H89Em7qkl4o2ACTh255oM7FhVweof3UEaLCZMH+HZVVpHXNpEnhrfDvpTBbPGjUi ------END PGP SIGNATURE----- -EOF - get_build_deps -} - -test_get_parsed_build_deps_dsc() { - local ARCH="amd64" - local BINARY_ARCH="any" - - cat > "$DEBIAN_CONTROL" << EOF -Format: 3.0 (quilt) -Source: haskell-concrete-typerep -Binary: libghc-concrete-typerep-dev, libghc-concrete-typerep-prof, libghc-concrete-typerep-doc -Architecture: any all -Version: 0.1.0.2-4 -Maintainer: Debian Haskell Group -Uploaders: Masayuki Hatta (mhatta) -Homepage: http://hackage.haskell.org/package/concrete-typerep -Standards-Version: 3.9.3 -Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-concrete-typerep -Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-concrete-typerep -Build-Depends: debhelper (>= 9), haskell-devscripts (>= 0.9), cdbs, ghc, ghc-prof, libghc-hashable-dev (<< 1.3), libghc-hashable-prof (<< 1.3) -Build-Depends-Indep: ghc-doc, libghc-hashable-doc (<< 1.3) -Package-List: - libghc-concrete-typerep-dev deb haskell extra arch=any - libghc-concrete-typerep-doc deb doc extra arch=all - libghc-concrete-typerep-prof deb haskell extra arch=any -Checksums-Sha1: - 7dc356eef28c83f606b792e3d39b68a04c1a6d98 3159 haskell-concrete-typerep_0.1.0.2.orig.tar.gz - a5b34d7dd7f1ef42b0afad86140efcd6997d09c1 2272 haskell-concrete-typerep_0.1.0.2-4.debian.tar.xz -Checksums-Sha256: - f72a41d9d8315528c7b0e13bf61e6122c7d236cb529c207cfb431cf272439e1f 3159 haskell-concrete-typerep_0.1.0.2.orig.tar.gz - 09dcedfef76799dcb3c6a9e22bc22711050cc56769614bdbf61b426579ce10e5 2272 haskell-concrete-typerep_0.1.0.2-4.debian.tar.xz -Files: - 5638a296661fb65145dfbc062cfa53db 3159 haskell-concrete-typerep_0.1.0.2.orig.tar.gz - 706754d44fac13c25e1ee8dd89180c53 2272 haskell-concrete-typerep_0.1.0.2-4.debian.tar.xz -EOF - get_build_deps | filter_arch_deps "$ARCH" | filter_restriction_deps "$DEB_BUILD_PROFILES" -} - -test_get_source_control_field_with_comments() { - cat <"$DEBIAN_CONTROL" -# This is a comment - -# So is this, but with a blank line above me -Format: 1.0 -Source: something-funny -Build-Depends: debhelper, something-else - -EOF - get_source_control_field "Source" -} - -trap cleanup sigpipe sighup exit - -# TODO move to build dir -DEBIAN_CONTROL="$(tempfile)" - -expect_output "autotools-dev (>= 1.2), debhelper, quilt (<< 12:0), libwxgtk2.8-dev, test [amd64 i386], test1, test2 [!i386 !amd64], test3 | test4, test5, foo1, foo2, foo3 (<< 12.23.34-5), bar4 [!amd64], foobar [i386], gnagna [!s390x]" \ - test_get_build_deps "any" -expect_output "autotools-dev (>= 1.2), debhelper, quilt (<< 12:0), libwxgtk2.8-dev, foo1, foo2, foo3 (<< 12.23.34-5), bar4 [!amd64], foobar [i386], gnagna [!s390x]" \ - test_get_build_deps "binary" -expect_output "autotools-dev (>= 1.2), debhelper, quilt (<< 12:0), libwxgtk2.8-dev, test [amd64 i386], test1, test2 [!i386 !amd64], test3 | test4, test5" \ - test_get_build_deps "all" - - -expect_fail checkbuilddep_archdeps "foo [amd64]" "amd64" -expect_success checkbuilddep_archdeps "foo [i386]" "amd64" -expect_fail checkbuilddep_archdeps "foo [i386 amd64]" "amd64" -expect_success checkbuilddep_archdeps "foo [!amd64]" "amd64" -expect_success checkbuilddep_archdeps "foo [!i386 !amd64]" "amd64" - -test_filter_arch_deps() { - echo "$1" | filter_arch_deps "$2" -} - -expect_output "foo" test_filter_arch_deps "foo" "amd64" -expect_output "foo" test_filter_arch_deps "foo [amd64]" "amd64" -expect_output "bar, foo" test_filter_arch_deps "bar, foo [amd64]" "amd64" -expect_output "bar | foo" test_filter_arch_deps "bar | foo [amd64]" "amd64" -expect_output "bar" test_filter_arch_deps "bar | foo [amd64]" "i386" - -expect_fail checkbuilddep_restrictiondeps "foo " "" -expect_success checkbuilddep_restrictiondeps "foo " "stage1" -expect_fail checkbuilddep_restrictiondeps "foo " "notest" -expect_success checkbuilddep_restrictiondeps "foo " "stage1 notest" - -expect_success checkbuilddep_restrictiondeps "foo " "" -expect_fail checkbuilddep_restrictiondeps "foo " "stage1" -expect_success checkbuilddep_restrictiondeps "foo " "notest" -expect_fail checkbuilddep_restrictiondeps "foo " "stage1 notest" - -expect_fail checkbuilddep_restrictiondeps "foo " "" -expect_success checkbuilddep_restrictiondeps "foo " "stage1" -expect_success checkbuilddep_restrictiondeps "foo " "notest" -expect_success checkbuilddep_restrictiondeps "foo " "stage1 notest" - -expect_success checkbuilddep_restrictiondeps "foo " "" -expect_success checkbuilddep_restrictiondeps "foo " "stage1" -expect_success checkbuilddep_restrictiondeps "foo " "notest" -expect_fail checkbuilddep_restrictiondeps "foo " "stage1 notest" - -expect_success checkbuilddep_restrictiondeps "foo " "" -expect_success checkbuilddep_restrictiondeps "foo " "stage1" -expect_fail checkbuilddep_restrictiondeps "foo " "notest" -expect_success checkbuilddep_restrictiondeps "foo " "stage1 notest" - -expect_success checkbuilddep_restrictiondeps "foo " "" -expect_fail checkbuilddep_restrictiondeps "foo " "stage1" -expect_success checkbuilddep_restrictiondeps "foo " "notest" -expect_success checkbuilddep_restrictiondeps "foo " "stage1 notest" - -test_filter_restriction_deps() { - echo "$1" | filter_restriction_deps "$2" -} - -expect_output "foo" test_filter_restriction_deps "foo " "" -expect_output "" test_filter_restriction_deps "foo " "stage1" -expect_output "foo" test_filter_restriction_deps "foo " "stage1" -expect_output "bar, foo" test_filter_restriction_deps "bar, foo " "stage1" -expect_output "bar | foo" test_filter_restriction_deps "bar | foo " "stage1" -expect_output "bar" test_filter_restriction_deps "bar | foo " "stage1" - -test_filter_arch_restriction_deps() { - echo "$1" | filter_arch_deps "$2" | filter_restriction_deps "$3" -} - -expect_output "foo" test_filter_arch_restriction_deps "foo [amd64] " "amd64" "" -expect_output "" test_filter_arch_restriction_deps "foo [amd64] " "amd64" "" -expect_output "foo" test_filter_arch_restriction_deps "foo [amd64] " "amd64" "" -expect_output "" test_filter_arch_restriction_deps "foo [i386] " "amd64" "stage1" - -expect_output "debhelper (>= 7)" test_get_build_deps_dsc -expect_output "debhelper (>= 9), haskell-devscripts (>= 0.9), cdbs, ghc, ghc-prof, libghc-hashable-dev (<< 1.3), libghc-hashable-prof (<< 1.3), ghc-doc, libghc-hashable-doc (<< 1.3)" test_get_parsed_build_deps_dsc - -expect_output "something-funny" test_get_source_control_field_with_comments - -testlib_summary diff -Nru pbuilder-0.223~ubuntu14.04.1/t/test_testlib.sh pbuilder-0.215+nmu4ubuntu1~ppa1/t/test_testlib.sh --- pbuilder-0.223~ubuntu14.04.1/t/test_testlib.sh 2015-12-10 01:45:02.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/t/test_testlib.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -#!/bin/bash -# testsuite for testlib - -TD="$(dirname "$0")" -if [ -n "$PBUILDER_CHECKOUT" ]; then - . "$TD/testlib.sh" - . "$PBUILDER_CHECKOUT/pbuilder-modules" -else - . "$TD/testlib.sh" - . "$PBUILDER_TEST_PKGLIBDIR/pbuilder-modules" -fi - -test_success() { - exit 0 -} - -test_fail() { - exit 1 -} - -test_options() { - echo "$@" - exit 1 -} - -test_output() { - echo "$@" -} - -expect_success test_success -expect_fail test_fail -expect_fail test_options "hello world" -expect_output "foo bar" test_output "foo" "bar" -testlib_summary diff -Nru pbuilder-0.223~ubuntu14.04.1/testlib.sh pbuilder-0.215+nmu4ubuntu1~ppa1/testlib.sh --- pbuilder-0.223~ubuntu14.04.1/testlib.sh 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/testlib.sh 2015-06-22 08:05:23.000000000 +0000 @@ -0,0 +1,158 @@ +#!/bin/bash +# 2008 Junichi Uekawa + +set -e + +# library for functional unit-testing in bash. + +# WARNING: this file locates files differently from the other pbuilder +# functions: +# - if PBUILDER_CHECKOUT is set, it is assumed that testlib.sh is sourced from +# a pbuilder checkout (e.g. from the upstream Makefile or Debian build) +# - otherwise, PBUILDER_TEST_ROOT or PBUILDER_TEST_*DIR should be used to +# locate files instead of PBUILDER_ROOT and PBUILDER_*DIR since +# testlib_setup_env() overrides these vars to run the other pbuilder modules +# with a fake environment + +# if this is set, use pbuilder files from this location; otherwise, use +# installed files (from PBUILDER_TEST_ROOT, which is a copy of PBUILDER_ROOT) +PBUILDER_CHECKOUT="${PBUILDER_CHECKOUT:-}" + +if [ -z "$PBUILDER_CHECKOUT" ]; then + # these currently don't need to be exported + PBUILDER_TEST_ROOT="${PBUILDER_ROOT:-}" + PBUILDER_TEST_PKGLIBDIR="${PBUILDER_PKGLIBDIR:-$PBUILDER_ROOT/usr/lib/pbuilder}" + PBUILDER_TEST_PKGDATADIR="${PBUILDER_PKGDATADIR:-$PBUILDER_ROOT/usr/share/pbuilder}" +fi + +# set PBUILDER_TEST_VERBOSE to get the full output of tests + +TESTLIB_FAILS=0 +TESTLIB_TESTS=0 + +testlib_echo() { + case "$1" in + OK) + shift + if [ -n "$PBUILDER_TEST_VERBOSE" ]; then + echo "[OK]" "$@" >&2 + fi + ;; + FAIL) + shift + echo "[FAIL]" "$@" >&2 + TESTLIB_FAILS=$(($TESTLIB_FAILS + 1)) + ;; + esac + TESTLIB_TESTS=$(($TESTLIB_TESTS + 1)) +} + +testlib_summary() { + echo "$0: Ran $TESTLIB_TESTS tests and $(($TESTLIB_TESTS - $TESTLIB_FAILS)) succeeded, $TESTLIB_FAILS failed" + if [ $TESTLIB_FAILS != 0 ]; then + echo '=================' + echo 'Testsuite FAILED!' + echo " $0" + echo '=================' + return 1 + fi + return 0 +} + +# Create fake installed tree with basic config files. Make sure you trap test +# script exit to call testlib_cleanup_env. Optional arg is location of the +# pbuilder checkout to copy files from. +# this is where the env actually lives +testlib_env_root="" +testlib_setup_env() { + local abs_pbuilder_checkout r + + if [ -n "$testlib_env_root" ]; then + echo "testlib_setup_env called twice without testlib_cleanup_env" >&2 + testlib_cleanup_env + exit 1 + fi + + if [ -n "$PBUILDER_CHECKOUT" ]; then + abs_pbuilder_checkout="`cd $PBUILDER_CHECKOUT; pwd`" + fi + + # backup env vars + testlib_env_oldhome="$HOME" + testlib_env_oldroot="$PBUILDER_ROOT" + + testlib_env_root="`mktemp -dt`" + # brevity + r="$testlib_env_root" + + mkdir "$r"/etc + touch "$r"/etc/pbuilderrc + mkdir -p "$r"/usr/share/pbuilder + if [ -n "$PBUILDER_CHECKOUT" ]; then + cp "$PBUILDER_CHECKOUT"/pbuilderrc "$r"/usr/share/pbuilder + else + cp "$PBUILDER_TEST_PKGDATADIR"/pbuilderrc "$r"/usr/share/pbuilder + fi + mkdir -p "$r"/usr/lib + if [ -n "$PBUILDER_CHECKOUT" ]; then + ln -s "$abs_pbuilder_checkout" "$r"/usr/lib/pbuilder + else + ln -s "$PBUILDER_TEST_PKGLIBDIR" "$r"/usr/lib/pbuilder + fi + export PBUILDER_ROOT="$r" + # when running the testsuite within pbuilder, these env vars will have been + # set by regular pbuilder commands, so we need to unset them as to allow + # their default values to be recomputed relative to PBUILDER_ROOT + unset PBUILDER_PKGLIBDIR PBUILDER_PKGDATADIR PBUILDER_SYSCONFDIR + + mkdir "$r"/home + touch "$r"/home/.pbuilderrc + export HOME="$r"/home +} + +# Reverse the effect of testlib_setup_env. Setup a trap handler in your tests +# on this function if you call testlib_setup_env. +testlib_cleanup_env() { + if [ -z "$testlib_env_root" ]; then + # nothing to do + return + fi + rm -rf "$testlib_env_root" + export PBUILDER_ROOT="$testlib_env_oldroot" + export HOME="$testlib_env_oldhome" + testlib_env_root="" +} + +expect_success() { + # run the test in subshell; successful commands should not output anything + # to stderr but may send output to stdout + if (if [ -z "$PBUILDER_TEST_VERBOSE" ]; then exec >/dev/null; fi; "$@"); then + testlib_echo "OK" "$1" + else + testlib_echo "FAIL" "$1" + fi +} + +expect_fail() { + # run the test in subshell; failed commands may output anything to stdout + # and stderr + if (if [ -z "$PBUILDER_TEST_VERBOSE" ]; then exec >/dev/null 2>&1; fi; "$@"); then + testlib_echo "FAIL" "$1" + else + testlib_echo "OK" "$1" + fi +} + +expect_output() { + # run the test in subshell + local val result + val="$1" + shift + result="`"$@" 2>&1`" || true + if [ "$result" = "$val" ]; then + testlib_echo "OK" "$1" + else + testlib_echo "FAIL" "$1" "expected [$val] but got [$result]" + fi +} + diff -Nru pbuilder-0.223~ubuntu14.04.1/test_pbuilder-apt-config pbuilder-0.215+nmu4ubuntu1~ppa1/test_pbuilder-apt-config --- pbuilder-0.223~ubuntu14.04.1/test_pbuilder-apt-config 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/test_pbuilder-apt-config 2015-06-22 08:05:23.000000000 +0000 @@ -0,0 +1,191 @@ +#!/bin/bash + +set -e + +self="$(basename "$0")" + +# if this is set, use pbuilder files from this location; otherwise, use +# installed files (from PBUILDER_TEST_ROOT, which is a copy of PBUILDER_ROOT) +PBUILDER_CHECKOUT="${PBUILDER_CHECKOUT:-}" + +if [ -n "$PBUILDER_CHECKOUT" ]; then + . "$PBUILDER_CHECKOUT/testlib.sh" + + PBUILDER_APT_CONFIG="$PBUILDER_CHECKOUT/pbuilder-apt-config" +else + # these currently don't need to be exported + PBUILDER_TEST_ROOT="${PBUILDER_ROOT:-}" + PBUILDER_TEST_PKGLIBDIR="${PBUILDER_PKGLIBDIR:-$PBUILDER_ROOT/usr/lib/pbuilder}" + . "$PBUILDER_TEST_PKGLIBDIR/testlib.sh" + + PBUILDER_APT_CONFIG="$PBUILDER_TEST_PKGLIBDIR/pbuilder-apt-config" +fi + +mirror_map="" + +cleanup() { + if [ -n "$mirror_map" ]; then + rm -f "$mirror_map" + fi +} + +mirror_map="$(mktemp -t "$self.XXXXXXXXXX")" +cat >"$mirror_map" </dev/null 2>&1 || true + +DEBIAN_CONTROL="`mktemp -t`" +cat >"$DEBIAN_CONTROL" <= 5.0.0), gnome-pkg-tools, autotools-dev, cdbs, libglib2.0-dev (>= 2.12), libgtk2.0-dev (>= 2.10), libgnome2-dev (>= 2.16.0), libgnomeui-dev (>= 2.16.0), libglade2-dev, libgnomevfs2-dev (>= 2.9.2), libgconf2-dev, libxft-dev, libperl-dev, python-dev, tcl8.4-dev, libxml-parser-perl, libdbus-glib-1-dev (>= 0.60), libtool, scrollkeeper, libgnutls-dev, libnotify-dev (>= 0.3.2-0), libsexy-dev (>= 0.1.7), gnome-doc-utils, libssl-dev (>= 0.9.8b-1), liblaunchpad-integration-dev + +EOF + +test_split_deps() { + get_build_deps | split_deps +} + +expect_output "debhelper/(>=/5.0.0) +gnome-pkg-tools +autotools-dev +cdbs +libglib2.0-dev/(>=/2.12) +libgtk2.0-dev/(>=/2.10) +libgnome2-dev/(>=/2.16.0) +libgnomeui-dev/(>=/2.16.0) +libglade2-dev +libgnomevfs2-dev/(>=/2.9.2) +libgconf2-dev +libxft-dev +libperl-dev +python-dev +tcl8.4-dev +libxml-parser-perl +libdbus-glib-1-dev/(>=/0.60) +libtool +scrollkeeper +libgnutls-dev +libnotify-dev/(>=/0.3.2-0) +libsexy-dev/(>=/0.1.7) +gnome-doc-utils +libssl-dev/(>=/0.9.8b-1) +liblaunchpad-integration-dev" test_split_deps + +expect_output "foo +bar" split_alternates "foo | bar" + +expect_output "debhelper +gnome-pkg-tools +autotools-dev +cdbs +libglib2.0-dev +libgtk2.0-dev +libgnome2-dev +libgnomeui-dev +libglade2-dev +libgnomevfs2-dev +libgconf2-dev +libxft-dev +libperl-dev +python-dev +tcl8.4-dev +libxml-parser-perl +libdbus-glib-1-dev +libtool +scrollkeeper +libgnutls-dev +libnotify-dev +libsexy-dev +gnome-doc-utils +libssl-dev +liblaunchpad-integration-dev" get_pkg_name "`test_split_deps`" + +expect_output ">= 5.0.0 +>= 2.12 +>= 2.10 +>= 2.16.0 +>= 2.16.0 +>= 2.9.2 +>= 0.60 +>= 0.3.2-0 +>= 0.1.7 +>= 0.9.8b-1" get_dep_op_and_ver "`test_split_deps`" + +testlib_summary diff -Nru pbuilder-0.223~ubuntu14.04.1/test_pbuilder-satisfydepends-funcs pbuilder-0.215+nmu4ubuntu1~ppa1/test_pbuilder-satisfydepends-funcs --- pbuilder-0.223~ubuntu14.04.1/test_pbuilder-satisfydepends-funcs 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/test_pbuilder-satisfydepends-funcs 2015-06-22 16:04:04.000000000 +0000 @@ -0,0 +1,155 @@ +#!/bin/bash + +# testsuite to test pbuilder-satisfydepends-funcs. + +if [ -n "$PBUILDER_CHECKOUT" ]; then + . "$PBUILDER_CHECKOUT/testlib.sh" + + . "$PBUILDER_CHECKOUT/pbuilder-satisfydepends-funcs" +else + # these currently don't need to be exported + PBUILDER_TEST_ROOT="${PBUILDER_ROOT:-}" + PBUILDER_TEST_PKGLIBDIR="${PBUILDER_PKGLIBDIR:-$PBUILDER_ROOT/usr/lib/pbuilder}" + . "$PBUILDER_TEST_PKGLIBDIR/testlib.sh" + + . "$PBUILDER_TEST_PKGLIBDIR/pbuilder-satisfydepends-funcs" +fi + +DEBIAN_CONTROL="" + +cleanup() { + if [ -n "$DEBIAN_CONTROL" ]; then + rm -f "$DEBIAN_CONTROL" + fi +} + +test_get_build_deps() { + local BINARY_ARCH + + BINARY_ARCH="$1" + + cat <"$DEBIAN_CONTROL" +Source: amule +XXXX: +Build-Depends: + autotools-dev ( >= 1.2 ) , + debhelper , + quilt(<<12:0), +## + libwxgtk2.8-dev +Build-Depends-Indep: test [ amd64 i386 ], test1, + test2[!i386 ! amd64], test3 | + test4, test5 +Misc: test + +Build-Depends: wrong build depends, line +Description: test + other things + wow +EOF + get_build_deps +} + +test_get_build_deps_dsc() { + cat <"$DEBIAN_CONTROL" +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +Format: 1.0 +Source: hello-debhelper +Build-Depends: debhelper (>= 7) +Checksums-Sha1: + fcbf0264928900adf03a7797474375e1a6fa3836 499638 hello-debhelper_2.4.orig.tar.gz + 0ea70eb46b4c90a8dbefbe60bebe4b9f9abb2733 5308 hello-debhelper_2.4-3.diff.gz + + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQEcBAEBCAAGBQJKml74AAoJEEHOfwufG4sysC4H/26EikyIgIqRuSXMiykc1hmd +97id9nWl+QzgCpUEg/+uDqEW+Bl6291FstGvzTFCwmB5JjH9ErH1LsyG1OLXbFUb +H89Em7qkl4o2ACTh255oM7FhVweof3UEaLCZMH+HZVVpHXNpEnhrfDvpTBbPGjUi +-----END PGP SIGNATURE----- +EOF + get_build_deps +} + +trap cleanup sigpipe sighup exit + +# TODO move to build dir +DEBIAN_CONTROL="$(tempfile)" + +expect_output "autotools-dev (>= 1.2), debhelper, quilt (<< 12:0), libwxgtk2.8-dev, test [amd64 i386], test1, test2 [!i386 !amd64], test3 | test4, test5" \ + test_get_build_deps "no" +expect_output "autotools-dev (>= 1.2), debhelper, quilt (<< 12:0), libwxgtk2.8-dev" \ + test_get_build_deps "yes" + +expect_fail checkbuilddep_archdeps "foo [amd64]" "amd64" +expect_success checkbuilddep_archdeps "foo [i386]" "amd64" +expect_fail checkbuilddep_archdeps "foo [i386 amd64]" "amd64" +expect_success checkbuilddep_archdeps "foo [!amd64]" "amd64" +expect_success checkbuilddep_archdeps "foo [!i386 !amd64]" "amd64" + +test_filter_arch_deps() { + echo "$1" | filter_arch_deps "$2" +} + +expect_output "foo" test_filter_arch_deps "foo" "amd64" +expect_output "foo" test_filter_arch_deps "foo [amd64]" "amd64" +expect_output "bar, foo" test_filter_arch_deps "bar, foo [amd64]" "amd64" +expect_output "bar | foo" test_filter_arch_deps "bar | foo [amd64]" "amd64" +expect_output "bar" test_filter_arch_deps "bar | foo [amd64]" "i386" + +expect_fail checkbuilddep_restrictiondeps "foo " "" +expect_success checkbuilddep_restrictiondeps "foo " "stage1" +expect_fail checkbuilddep_restrictiondeps "foo " "notest" +expect_success checkbuilddep_restrictiondeps "foo " "stage1 notest" + +expect_success checkbuilddep_restrictiondeps "foo " "" +expect_fail checkbuilddep_restrictiondeps "foo " "stage1" +expect_success checkbuilddep_restrictiondeps "foo " "notest" +expect_fail checkbuilddep_restrictiondeps "foo " "stage1 notest" + +expect_fail checkbuilddep_restrictiondeps "foo " "" +expect_success checkbuilddep_restrictiondeps "foo " "stage1" +expect_success checkbuilddep_restrictiondeps "foo " "notest" +expect_success checkbuilddep_restrictiondeps "foo " "stage1 notest" + +expect_success checkbuilddep_restrictiondeps "foo " "" +expect_success checkbuilddep_restrictiondeps "foo " "stage1" +expect_success checkbuilddep_restrictiondeps "foo " "notest" +expect_fail checkbuilddep_restrictiondeps "foo " "stage1 notest" + +expect_success checkbuilddep_restrictiondeps "foo " "" +expect_success checkbuilddep_restrictiondeps "foo " "stage1" +expect_fail checkbuilddep_restrictiondeps "foo " "notest" +expect_success checkbuilddep_restrictiondeps "foo " "stage1 notest" + +expect_success checkbuilddep_restrictiondeps "foo " "" +expect_fail checkbuilddep_restrictiondeps "foo " "stage1" +expect_success checkbuilddep_restrictiondeps "foo " "notest" +expect_success checkbuilddep_restrictiondeps "foo " "stage1 notest" + +test_filter_restriction_deps() { + echo "$1" | filter_restriction_deps "$2" +} + +expect_output "foo" test_filter_restriction_deps "foo " "" +expect_output "" test_filter_restriction_deps "foo " "stage1" +expect_output "foo" test_filter_restriction_deps "foo " "stage1" +expect_output "bar, foo" test_filter_restriction_deps "bar, foo " "stage1" +expect_output "bar | foo" test_filter_restriction_deps "bar | foo " "stage1" +expect_output "bar" test_filter_restriction_deps "bar | foo " "stage1" + +test_filter_arch_restriction_deps() { + echo "$1" | filter_arch_deps "$2" | filter_restriction_deps "$3" +} + +expect_output "foo" test_filter_arch_restriction_deps "foo [amd64] " "amd64" "" +expect_output "" test_filter_arch_restriction_deps "foo [amd64] " "amd64" "" +expect_output "foo" test_filter_arch_restriction_deps "foo [amd64] " "amd64" "" +expect_output "" test_filter_arch_restriction_deps "foo [i386] " "amd64" "stage1" + +expect_output "debhelper (>= 7)" test_get_build_deps_dsc + +testlib_summary diff -Nru pbuilder-0.223~ubuntu14.04.1/test_testlib.sh pbuilder-0.215+nmu4ubuntu1~ppa1/test_testlib.sh --- pbuilder-0.223~ubuntu14.04.1/test_testlib.sh 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.215+nmu4ubuntu1~ppa1/test_testlib.sh 2015-06-22 08:05:23.000000000 +0000 @@ -0,0 +1,34 @@ +#!/bin/bash +# testsuite for testlib + +if [ -n "$PBUILDER_CHECKOUT" ]; then + . "$PBUILDER_CHECKOUT/testlib.sh" +else + # these currently don't need to be exported + PBUILDER_TEST_ROOT="${PBUILDER_ROOT:-}" + PBUILDER_TEST_PKGLIBDIR="${PBUILDER_PKGLIBDIR:-$PBUILDER_ROOT/usr/lib/pbuilder}" + . "$PBUILDER_TEST_PKGLIBDIR/testlib.sh" +fi + +test_success() { + exit 0 +} + +test_fail() { + exit 1 +} + +test_options() { + echo "$@" + exit 1 +} + +test_output() { + echo "$@" +} + +expect_success test_success +expect_fail test_fail +expect_fail test_options "hello world" +expect_output "foo bar" test_output "foo" "bar" +testlib_summary