Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pbuilder for openSUSE:Factory checked in at 2022-05-05 23:07:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pbuilder (Old) and /work/SRC/openSUSE:Factory/.pbuilder.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pbuilder" Thu May 5 23:07:03 2022 rev:13 rq:975105 version:0.231 Changes: -------- --- /work/SRC/openSUSE:Factory/pbuilder/pbuilder.changes 2014-08-27 07:46:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pbuilder.new.1538/pbuilder.changes 2022-05-05 23:07:42.901656287 +0200 @@ -1,0 +2,57 @@ +Wed May 4 08:53:02 UTC 2022 - Ferdinand Thiessen <[email protected]> + +- Update to 0.231 + * Set the debconf value for man-db/auto-update to false to save + time in the package installing phase. + * pdebuild: With --auto-debsign try to sign both _${arch}.changes + and _source.changes if available. + * buildpackage: Allow resolving the local hostname too. + * bash-completion: Add --binary-indep to the completion. + * pbuilderrc: Default to SOURCE_ONLY_CHANGES=yes. + * satisfydepends-funcs: Fix parsing of build profiles when there + is a << version restriction before the build profile marker. + * autopkgtest: + * Replace deprecated ADTTMP variable with AUTOPKGTEST_TMP. + * Properly use of `tr` to lowercase strings. + * Only delete the temporary directory when not running through + autopkgtest. + * Stop explicitly requiring the archive signing key, since that is very + likely to already be installed anyway. +- Update to 0.230 + * createbuildenv: + * Only try to print debootstrap.log if the file really exists. + * Properly handle the case of a disabled internal cache. + * Use packages from APTCACHE during debootstrap. + * buildpackage-funcs: Fix whitespace handling in .dsc paths. + * modules: Always call `systemctl stop` if using systemd's cgroups, + preventing stray slices from being left behind. + * buildpackage-funcs: + * While setting up the cross-build env, only look at installed bin:gcc, + not all available ones. + * Print a useful error if GCC version detection fails. + * Handle minor GCC versions and unversioned GCC dependencies. + * checkparams: Use systemd-escape(1) to escape the package name + in the slice name. + * Add a --no-source-only-changes option to override a configured + SOURCE_ONLY_CHANGES=yes. Closes: #904716 + * Add more information in the slice name and scope description + to ease the life of those running many pbuilder instances. +- Update to 0.229 + * pbuilder-modules: make bind mounts private on Linux. + * modules: Support bind-mounting files. + * satisfydepends-funcs: + * Normalize restriction formulae. + * Handle / separator for spaces from -classic. + *createbuildenv: + * Print a tail of debootstrap.log when debootstrap fails + * buildpackage: + * Ignore the R?? field if the installed dpkg is too old to appropriately + deal with it. + * Add support for Rules-Requires-Root. + When R??:no fakeroot is not installed in the chroot. +- Drop bash-completion-have.patch, fixed upstream +- Drop pbuilderrc.patch, test-suite.patch +- Rebased bash-completion-extglob.patch, pbuilder-ppc.patch, + pdebuild-double-checkbuilddeps.patch + +------------------------------------------------------------------- Old: ---- bash-completion-have.patch pbuilder_0.215.tar.gz pbuilderrc.patch test-suite.patch New: ---- pbuilder_0.231.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pbuilder.spec ++++++ --- /var/tmp/diff_new_pack.uoaYtx/_old 2022-05-05 23:07:43.385656892 +0200 +++ /var/tmp/diff_new_pack.uoaYtx/_new 2022-05-05 23:07:43.389656897 +0200 @@ -1,7 +1,7 @@ # # spec file for package pbuilder # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2012 Frank Lichtenheld <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -13,30 +13,29 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: pbuilder -Version: 0.215 +Version: 0.231 Release: 0 Summary: Personal package builder for .deb packages -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Tools/Building -Url: http://pbuilder.alioth.debian.org -Source0: http://ftp.de.debian.org/debian/pool/main/p/pbuilder/%{name}_%{version}.tar.gz +URL: https://pbuilder-team.pages.debian.net/pbuilder +Source0: http://deb.debian.org/debian/pool/main/p/pbuilder/pbuilder_%{version}.tar.xz Patch0: Makefile.patch -Patch1: pbuilderrc.patch -Patch2: pdebuild-double-checkbuilddeps.patch -Patch3: bash-completion-have.patch -Patch4: bash-completion-extglob.patch -Patch5: test-suite.patch -Patch6: pbuilder-ppc.patch +Patch1: pdebuild-double-checkbuilddeps.patch +Patch2: bash-completion-extglob.patch +Patch3: pbuilder-ppc.patch Requires: debootstrap Requires: dpkg Requires: wget %if 0%{?suse_version} -Recommends: deb fakeroot sudo +Recommends: deb +Recommends: fakeroot +Recommends: sudo %endif BuildRequires: dpkg BuildRequires: man @@ -64,59 +63,46 @@ Junichi Uekawa %prep -%setup +%setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build -%{__make} %{?jobs:-j%jobs} +%make_build %install -%{__make} install DESTDIR=%{?buildroot} +%make_install -mv %{buildroot}/etc/bash_completion.d/pbuilder{,.sh} +mkdir -p %{buildroot}/%{_defaultdocdir} +mv %{buildroot}/usr/share/doc/pbuilder %{buildroot}/%{_defaultdocdir} -for man in debuild-pbuilder.1 pbuilder.8 pbuilderrc.5 pbuilder-uml.conf.5 pbuilder-user-mode-linux.1 pdebuild.1 pdebuild-user-mode-linux.1; do +for man in debuild-pbuilder.1 pbuilderrc.5 pbuilder.8 pdebuild.1; do category=${man: -1} install -D -m644 $man %{buildroot}%{_mandir}/man$category/$man gzip -9 %{buildroot}%{_mandir}/man$category/$man done -for doc in ChangeLog README COPYING AUTHORS THANKS; do - install -D -m644 $doc %{buildroot}%{_defaultdocdir}/%{name}/$doc -done - -if [ "%{buildroot}/usr/share/doc/pbuilder" != "%{buildroot}%{_defaultdocdir}/%{name}" ]; then - mv %{buildroot}/usr/share/doc/pbuilder/* %{buildroot}%{_defaultdocdir}/%{name}/ -fi - for dir in build result aptcache ccache; do install -d %buildroot/var/cache/pbuilder/$dir done -%clean -rm -rf $RPM_BUILD_ROOT - %check %{__make} check %files -%defattr(-,root,root,0755) -%doc %{_defaultdocdir}/%{name}/ -%config /etc/bash_completion.d/pbuilder.sh -%config /etc/pbuilder -%{_mandir}/man1/* -%{_mandir}/man5/* -%{_mandir}/man8/* +%license COPYING AUTHORS +%doc ChangeLog README THANKS +%doc %{_defaultdocdir}/%{name}/examples +%dir /etc/pbuilder +%config /etc/pbuilder/buildd-config.sh +%{_mandir}/man?/* /usr/sbin/* /usr/bin/* /usr/lib/pbuilder /usr/share/pbuilder /var/cache/pbuilder +%{_datadir}/bash-completion/completions/%{name} %changelog ++++++ Makefile.patch ++++++ --- /var/tmp/diff_new_pack.uoaYtx/_old 2022-05-05 23:07:43.417656932 +0200 +++ /var/tmp/diff_new_pack.uoaYtx/_new 2022-05-05 23:07:43.421656937 +0200 @@ -1,34 +1,26 @@ -diff -ur pbuilder-0.199+nmu1.orig/Makefile pbuilder-0.199+nmu1/Makefile ---- pbuilder-0.199+nmu1.orig/Makefile 2010-01-31 04:52:57.000000000 +0100 -+++ pbuilder-0.199+nmu1/Makefile 2011-01-26 16:58:28.000000000 +0100 -@@ -178,7 +178,7 @@ +diff -Nur pbuilder-0.231/Makefile new/Makefile +--- pbuilder-0.231/Makefile 2018-11-23 11:51:49.000000000 +0100 ++++ new/Makefile 2022-05-04 11:08:27.273634062 +0200 +@@ -154,7 +154,6 @@ all: $(MAKE) -C pbuildd $@ - $(MAKE) -C Documentation $@ -+# $(MAKE) -C Documentation $@ check: export PBUILDER_CHECKOUT := $(CURDIR) check: -@@ -214,5 +214,5 @@ +@@ -175,7 +174,6 @@ + testsuite/testbuild2 \ + testsuite/regression/work + $(MAKE) -C pbuildd $@ +- $(MAKE) -C Documentation $@ + + TAGS: + etags pbuilder-* pbuilder +@@ -192,5 +190,4 @@ # install -aptitude flavour as the default satisfydepends ln -sf pbuilder-satisfydepends-aptitude $(PKGLIBDIR)/pbuilder-satisfydepends $(MAKE) -C pbuildd $@ - $(MAKE) -C Documentation $@ -+# $(MAKE) -C Documentation $@ -Nur in pbuilder-0.199+nmu1: Makefile.patch. -diff -ur pbuilder-0.199+nmu1.orig/pbuildd/Makefile pbuilder-0.199+nmu1/pbuildd/Makefile ---- pbuilder-0.199+nmu1.orig/pbuildd/Makefile 2010-01-31 04:52:57.000000000 +0100 -+++ pbuilder-0.199+nmu1/pbuildd/Makefile 2011-01-26 16:52:43.000000000 +0100 -@@ -9,6 +9,6 @@ - install -d $(DESTDIR)$(PBUILDDDIR) - install -d $(DESTDIR)$(PBUILDDDIR)/hookdir - install -d $(DESTDIR)/var/cache/pbuilder/pbuildd -- install -m 755 -o root -g root buildd.sh $(DESTDIR)$(PBUILDDDIR) -- install -m 644 -o root -g root buildd-config.sh $(DESTDIR)/etc/pbuilder/ -- install -m 755 -o root -g root hookdir/A10dpkg-l.sh $(DESTDIR)$(PBUILDDDIR)/hookdir -+ install -m 755 buildd.sh $(DESTDIR)$(PBUILDDDIR) -+ install -m 644 buildd-config.sh $(DESTDIR)/etc/pbuilder/ -+ install -m 755 hookdir/A10dpkg-l.sh $(DESTDIR)$(PBUILDDDIR)/hookdir ++++++ bash-completion-extglob.patch ++++++ --- /var/tmp/diff_new_pack.uoaYtx/_old 2022-05-05 23:07:43.433656952 +0200 +++ /var/tmp/diff_new_pack.uoaYtx/_new 2022-05-05 23:07:43.433656952 +0200 @@ -1,9 +1,8 @@ -Index: pbuilder-0.210/bash_completion.d/pbuilder -=================================================================== ---- pbuilder-0.210.orig/bash_completion.d/pbuilder -+++ pbuilder-0.210/bash_completion.d/pbuilder -@@ -61,11 +61,12 @@ _pbuilder() - --compressprog --debootstrapopts --save-after-login --save-after-exec \ +diff -Nur pbuilder-0.231/bash_completion.d/pbuilder new/bash_completion.d/pbuilder +--- pbuilder-0.231/bash_completion.d/pbuilder 2020-02-15 17:49:39.000000000 +0100 ++++ new/bash_completion.d/pbuilder 2022-05-04 12:26:13.339197900 +0200 +@@ -61,11 +61,12 @@ + --compressprog --debootstrapopts --save-after-login --save-after-exec --debootstrap' \ -- "$cur" ) ) - if [[ $prev = @(--aptcache|--hookdir) ]]; then ++++++ pbuilder-ppc.patch ++++++ --- /var/tmp/diff_new_pack.uoaYtx/_old 2022-05-05 23:07:43.445656967 +0200 +++ /var/tmp/diff_new_pack.uoaYtx/_new 2022-05-05 23:07:43.449656972 +0200 @@ -1,13 +1,12 @@ -Index: pbuilder-0.211/pbuilder-apt-config -=================================================================== ---- pbuilder-0.211.orig/pbuilder-apt-config -+++ pbuilder-0.211/pbuilder-apt-config -@@ -67,7 +67,7 @@ guess_dist_arch_archive() { +diff -Nur pbuilder-0.231/pbuilder-apt-config new/pbuilder-apt-config +--- pbuilder-0.231/pbuilder-apt-config 2019-03-15 15:29:22.000000000 +0100 ++++ new/pbuilder-apt-config 2022-05-04 12:31:14.112668307 +0200 +@@ -67,7 +67,7 @@ amd64|i386) echo "ubuntu" ;; -- armel|armhf|hppa|ia64|lpia|powerpc|sparc) -+ armel|armhf|hppa|ia64|lpia|powerpc|sparc|ppc|ppc64|ppc64el|arm64) +- arm64|armel|armhf|hppa|ia64|lpia|powerpc|ppc64el|s390x|sparc) ++ arm64|armel|armhf|hppa|ia64|lpia|powerpc|ppc64el|s390x|sparc|ppc|ppc64) echo "ubuntu-ports" ;; *) ++++++ pdebuild-double-checkbuilddeps.patch ++++++ --- /var/tmp/diff_new_pack.uoaYtx/_old 2022-05-05 23:07:43.461656986 +0200 +++ /var/tmp/diff_new_pack.uoaYtx/_new 2022-05-05 23:07:43.465656992 +0200 @@ -3,18 +3,17 @@ this hardcoded one (important on rpm systems which will surely fail the check). -Index: pbuilder-0.208/pdebuild -=================================================================== ---- pbuilder-0.208.orig/pdebuild -+++ pbuilder-0.208/pdebuild -@@ -72,9 +72,6 @@ if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' - exit 1 +diff -Nur pbuilder-0.231/pdebuild new/pdebuild +--- pbuilder-0.231/pdebuild 2019-11-12 15:50:10.000000000 +0100 ++++ new/pdebuild 2022-05-04 12:35:30.069919618 +0200 +@@ -79,9 +79,6 @@ + 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 -us -uc -r${BUILDSOURCEROOTCMD} $DEBBUILDOPTS" | \ - perl -pe 's/(^|\s)-[AbBF](\s|$)/$1$2/g' | \ - /bin/bash + # get_changes_options/get_source_options single-quote each element, so an + # eval is needed to reverse that. + SOURCE_OPTIONS=$(get_source_options)
