Refresh patches

17 files changed, 71 insertions, 59 deletions

diff --git a/debian/patches/0001-Use-obs-build-in-locations-and-executable-names.patch b/debian/patches/0001-Use-obs-build-in-locations-and-executable-names.patch
index 52757d2..e9d60ad 100644
--- a/debian/patches/0001-Use-obs-build-in-locations-and-executable-names.patch
+++ b/debian/patches/0001-Use-obs-build-in-locations-and-executable-names.patch
@@ -1,21 +1,18 @@
-From: =?utf-8?b?SMOpY3RvciBPcsOzbiBNYXJ0w61uZXo=?= <zumbi@debian.org>
+From: Héctor Orón Martínez <zumbi@debian.org>
 Date: Mon, 5 Mar 2018 01:01:07 +0100
-Subject: Use obs-build in locations and executable names
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-  instead of just build.
+Subject: Use obs-build in locations and executable names instead of just build.
 
 Signed-off-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
 Signed-off-by: Héctor Orón Martínez <zumbi@debian.org>
 Forwarded: not-needed, Debian-specific
 Last-Update: 2018-08-30
 ---
- Makefile | 13 +++++++------
+ Makefile | 12 ++++++------
  build    |  6 +++---
- 2 files changed, 10 insertions(+), 9 deletions(-)
+ 2 files changed, 9 insertions(+), 9 deletions(-)
 
+diff --git a/Makefile b/Makefile
+index 9d450e8..5243e71 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,7 +1,7 @@
@@ -27,7 +24,7 @@ Last-Update: 2018-08-30
  
  INITVM_ARCH=$(shell bash -c '. common_functions ; build_host_arch; echo $$BUILD_INITVM_ARCH')
  
-@@ -92,11 +92,11 @@
+@@ -92,11 +92,11 @@ install:
  	install -m644 *.pm $(DESTDIR)$(pkglibdir)
  	install -m644 configs/* $(DESTDIR)$(pkglibdir)/configs
  	install -m644 baselibs_configs/* $(DESTDIR)$(pkglibdir)/baselibs_configs
@@ -44,9 +41,11 @@ Last-Update: 2018-08-30
  	ln -sf $(pkglibdir)/unrpm $(DESTDIR)$(bindir)/unrpm
  	ln -s baselibs_configs/baselibs_global.conf $(DESTDIR)$(pkglibdir)/baselibs_global.conf
  	ln -s baselibs_configs/baselibs_global-deb.conf $(DESTDIR)$(pkglibdir)/baselibs_global-deb.conf
+diff --git a/build b/build
+index 236cf16..d583b00 100755
 --- a/build
 +++ b/build
-@@ -36,8 +36,8 @@
+@@ -36,8 +36,8 @@ BUILD_CONF=/etc/build.conf
  test -e "$BUILD_CONF" && BUILD_DIR=/usr/lib/build
  
  test -z "$BUILD_DIR" -a -e /.build/build.data -a -z "$BUILD_IGNORE_2ND_STAGE" && BUILD_DIR=/.build
@@ -57,7 +56,7 @@ Last-Update: 2018-08-30
  test -z "$CONFIG_DIR" && CONFIG_DIR="$BUILD_DIR/configs"
  
  export BUILD_ARCH BUILD_HOST_ARCH BUILD_ROOT BUILD_RPMS BUILD_DIR BUILD_DEBUG
-@@ -111,7 +111,7 @@
+@@ -111,7 +111,7 @@ PKG_CCACHE=
  DLNOSIGNATURE=
  BUILD_FLAVOR=
  OBS_PACKAGE=
diff --git a/debian/patches/0003-HACK-make-glibc-build.patch b/debian/patches/0002-HACK-make-glibc-build.patch
index dbae19d..78b5345 100644
--- a/debian/patches/0003-HACK-make-glibc-build.patch
+++ b/debian/patches/0002-HACK-make-glibc-build.patch
@@ -1,12 +1,6 @@
-From: =?utf-8?b?SMOpY3RvciBPcsOzbiBNYXJ0w61uZXo=?= <zumbi@debian.org>
+From: Héctor Orón Martínez <zumbi@debian.org>
 Date: Mon, 5 Mar 2018 01:15:10 +0100
 Subject: HACK: make glibc build
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-See:
-  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=844420
 
 Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
 Signed-off-by: Héctor Orón Martínez <zumbi@debian.org>
@@ -17,9 +11,11 @@ Last-Update: 2018-08-30
  build-recipe-debootstrap | 5 +++++
  1 file changed, 5 insertions(+)
 
+diff --git a/build-recipe-debootstrap b/build-recipe-debootstrap
+index b18b6da..1334df5 100644
 --- a/build-recipe-debootstrap
 +++ b/build-recipe-debootstrap
-@@ -75,6 +75,11 @@
+@@ -75,6 +75,11 @@ recipe_build_debootstrap() {
          cp $BUILD_ROOT/etc/hosts $BUILD_ROOT/$myroot/etc/hosts
      fi
  
diff --git a/debian/patches/0005-dsc-keep-everything.patch b/debian/patches/0003-dsc-keep-everything.patch
index 02b7fc6..4ab117e 100644
--- a/debian/patches/0005-dsc-keep-everything.patch
+++ b/debian/patches/0003-dsc-keep-everything.patch
@@ -1,9 +1,6 @@
-From: =?utf-8?b?SMOpY3RvciBPcsOzbiBNYXJ0w61uZXo=?= <zumbi@debian.org>
+From: Héctor Orón Martínez <zumbi@debian.org>
 Date: Mon, 5 Mar 2018 01:24:07 +0100
 Subject: dsc: keep everything
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
 
 Debian package build dependencies allow for direct or indirect build
 cycles, when doing a full distribution build in OBS this means keeping
@@ -20,9 +17,11 @@ Last-Update: 2018-08-30
  Build.pm | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
+diff --git a/Build.pm b/Build.pm
+index 024b728..31e7b3c 100644
 --- a/Build.pm
 +++ b/Build.pm
-@@ -632,7 +632,9 @@
+@@ -632,7 +632,9 @@ sub get_build {
      @directdepsend = grep {!/^-/} splice(@directdepsend, @deps + 1);
    }
    my @extra = (@{$config->{'required'}}, @{$config->{'support'}});
diff --git a/debian/patches/build-recipe-dsc-don-t-rebuild-the-source-package.patch b/debian/patches/0004-build-recipe-dsc-don-t-rebuild-the-source-package.patch
index 9ac0908..f652cae 100644
--- a/debian/patches/build-recipe-dsc-don-t-rebuild-the-source-package.patch
+++ b/debian/patches/0004-build-recipe-dsc-don-t-rebuild-the-source-package.patch
@@ -14,7 +14,7 @@ Last-Update: 2018-08-30
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build-recipe-dsc b/build-recipe-dsc
-index 79cfc66..c104890 100644
+index d748c4e..9243776 100644
 --- a/build-recipe-dsc
 +++ b/build-recipe-dsc
 @@ -95,7 +95,7 @@ dsc_build() {
diff --git a/debian/patches/Log-the-version-number-during-startup.patch b/debian/patches/0005-Log-the-version-number-during-startup.patch
index f5975f4..194bba8 100644
--- a/debian/patches/Log-the-version-number-during-startup.patch
+++ b/debian/patches/0005-Log-the-version-number-during-startup.patch
@@ -14,9 +14,11 @@ Forwarded: https://github.com/openSUSE/obs-build/pull/497
  init_buildsystem |  2 ++
  4 files changed, 17 insertions(+), 1 deletion(-)
 
+diff --git a/Makefile b/Makefile
+index 5243e71..2b3a6d4 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -20,13 +20,22 @@
+@@ -20,13 +20,22 @@ sysconfdir=/etc
  DESTDIR=
  
  all:
@@ -40,7 +42,7 @@ Forwarded: https://github.com/openSUSE/obs-build/pull/497
  	install -m755 -d \
  	    $(DESTDIR)$(pkglibdir)/configs \
  	    $(DESTDIR)$(pkglibdir)/baselibs_configs \
-@@ -90,6 +99,7 @@
+@@ -90,6 +99,7 @@ install:
  	install -m644 build-recipe build-recipe-* $(DESTDIR)$(pkglibdir)
  	install -m644 build-pkg build-pkg-* $(DESTDIR)$(pkglibdir)
  	install -m644 *.pm $(DESTDIR)$(pkglibdir)
@@ -48,9 +50,11 @@ Forwarded: https://github.com/openSUSE/obs-build/pull/497
  	install -m644 configs/* $(DESTDIR)$(pkglibdir)/configs
  	install -m644 baselibs_configs/* $(DESTDIR)$(pkglibdir)/baselibs_configs
  	install -d $(DESTDIR)$(man1dir)
+diff --git a/build b/build
+index d583b00..8081156 100755
 --- a/build
 +++ b/build
-@@ -128,6 +128,7 @@
+@@ -128,6 +128,7 @@ umask 022
  
  echo_help () {
      cat << EOT
@@ -58,7 +62,7 @@ Forwarded: https://github.com/openSUSE/obs-build/pull/497
  
  Some comments for build
  -----------------------
-@@ -1266,6 +1267,7 @@
+@@ -1266,6 +1267,7 @@ for RECIPEFILE in "${RECIPEFILES[@]}" ; do
      if test -z "$RUNNING_IN_VM" ; then
  	echo
  	echo "$HOST started \"build $RECIPEFILE\" at `date --utc`."
@@ -66,6 +70,8 @@ Forwarded: https://github.com/openSUSE/obs-build/pull/497
  	echo
  	test -n "$REASON" && echo "$REASON"
  	echo
+diff --git a/common_functions b/common_functions
+index 506747c..04f22e2 100755
 --- a/common_functions
 +++ b/common_functions
 @@ -20,6 +20,8 @@
@@ -77,9 +83,11 @@ Forwarded: https://github.com/openSUSE/obs-build/pull/497
  build_host_arch() {
      : ${BUILD_HOST_ARCH:=`uname -m`}
      # the linux kernel only knows armv7l, armv7hl is a userland definition
+diff --git a/init_buildsystem b/init_buildsystem
+index a2fe05a..d362bc7 100755
 --- a/init_buildsystem
 +++ b/init_buildsystem
-@@ -509,6 +509,8 @@
+@@ -509,6 +509,8 @@ getcachedir() {
      done
  }
  
diff --git a/debian/patches/debootstrap-Print-the-exact-command-we-re-going-to-run.patch b/debian/patches/0006-debootstrap-Print-the-exact-command-we-re-going-to-r.patch
index fe9b9a7..ed31e71 100644
--- a/debian/patches/debootstrap-Print-the-exact-command-we-re-going-to-run.patch
+++ b/debian/patches/0006-debootstrap-Print-the-exact-command-we-re-going-to-r.patch
@@ -17,10 +17,10 @@ Forwarded: https://github.com/openSUSE/obs-build/pull/497
  build-recipe-debootstrap | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: obs-build/build-recipe-debootstrap
-===================================================================
---- obs-build.orig/build-recipe-debootstrap
-+++ obs-build/build-recipe-debootstrap
+diff --git a/build-recipe-debootstrap b/build-recipe-debootstrap
+index 1334df5..cd0bc61 100644
+--- a/build-recipe-debootstrap
++++ b/build-recipe-debootstrap
 @@ -55,7 +55,7 @@ recipe_build_debootstrap() {
      fi
  
diff --git a/debian/patches/deb-Show-version-of-each-package-that-we-preinstall.patch b/debian/patches/0007-deb-Show-version-of-each-package-that-we-preinstall.patch
index 5d21ad5..e6fafd6 100644
--- a/debian/patches/deb-Show-version-of-each-package-that-we-preinstall.patch
+++ b/debian/patches/0007-deb-Show-version-of-each-package-that-we-preinstall.patch
@@ -11,9 +11,11 @@ Forwarded: https://github.com/openSUSE/obs-build/pull/497
  build-pkg-deb | 1 +
  1 file changed, 1 insertion(+)
 
+diff --git a/build-pkg-deb b/build-pkg-deb
+index 46f5f91..c5c6db0 100644
 --- a/build-pkg-deb
 +++ b/build-pkg-deb
-@@ -146,6 +146,7 @@
+@@ -146,6 +146,7 @@ pkg_preinstall_deb() {
      elif test -f "control.tar.xz" -a ! -L "control.tar.xz" ; then
  	$TAR -C "$BUILD_INIT_CACHE/scripts/control" -J -f control.tar.xz
      fi
diff --git a/debian/patches/build-recipe-dsc-List-contents-of-build-results.patch b/debian/patches/0008-build-recipe-dsc-List-contents-of-build-results.patch
index a69d950..18d53fd 100644
--- a/debian/patches/build-recipe-dsc-List-contents-of-build-results.patch
+++ b/debian/patches/0008-build-recipe-dsc-List-contents-of-build-results.patch
@@ -12,9 +12,11 @@ Forwarded: https://github.com/openSUSE/obs-build/pull/497
  build-recipe-dsc | 33 +++++++++++++++++++++++++++++++++
  1 file changed, 33 insertions(+)
 
+diff --git a/build-recipe-dsc b/build-recipe-dsc
+index 9243776..c4fe3e2 100644
 --- a/build-recipe-dsc
 +++ b/build-recipe-dsc
-@@ -86,6 +86,8 @@
+@@ -86,6 +86,8 @@ EOF
  
  dsc_build() {
      local buildroot=$1
@@ -23,7 +25,7 @@ Forwarded: https://github.com/openSUSE/obs-build/pull/497
  
      DSC_BUILD_OPTIONS=
      if test -n "$BUILD_JOBS" ; then
-@@ -103,6 +105,37 @@
+@@ -103,6 +105,37 @@ dsc_build() {
      fi
  
      chroot $buildroot su -c "export DEB_BUILD_OPTIONS=${DSC_BUILD_OPTIONS} ; cd $TOPDIR/BUILD && $DSC_BUILD_CMD" - $BUILD_USER < /dev/null && BUILD_SUCCEEDED=true
diff --git a/debian/patches/build-recipe-dsc-Show-information-about-the-build-chroot.patch b/debian/patches/0009-build-recipe-dsc-Show-information-about-the-build-ch.patch
index eebaed5..4e3db88 100644
--- a/debian/patches/build-recipe-dsc-Show-information-about-the-build-chroot.patch
+++ b/debian/patches/0009-build-recipe-dsc-Show-information-about-the-build-ch.patch
@@ -12,7 +12,7 @@ Forwarded: https://github.com/openSUSE/obs-build/pull/497
  1 file changed, 25 insertions(+)
 
 diff --git a/build-recipe-dsc b/build-recipe-dsc
-index 3bf145e..86a5016 100644
+index c4fe3e2..428a737 100644
 --- a/build-recipe-dsc
 +++ b/build-recipe-dsc
 @@ -89,6 +89,31 @@ dsc_build() {
diff --git a/debian/patches/Add-a-new-changelog-entry-for-debian-packages.patch b/debian/patches/0010-Add-a-new-changelog-entry-for-debian-packages.patch
index 51b1a9d..54cfbc1 100644
--- a/debian/patches/Add-a-new-changelog-entry-for-debian-packages.patch
+++ b/debian/patches/0010-Add-a-new-changelog-entry-for-debian-packages.patch
@@ -17,7 +17,7 @@ Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
  1 file changed, 18 insertions(+), 3 deletions(-)
 
 diff --git a/build-recipe-dsc b/build-recipe-dsc
-index dcd168e..d74778e 100644
+index 428a737..b6f998b 100644
 --- a/build-recipe-dsc
 +++ b/build-recipe-dsc
 @@ -70,15 +70,30 @@ recipe_prepare_dsc() {
diff --git a/debian/patches/python3-openstack-console.patch b/debian/patches/0011-Use-Python-3-for-the-openstack-console.patch
index d590cf2..fffb455 100644
--- a/debian/patches/python3-openstack-console.patch
+++ b/debian/patches/0011-Use-Python-3-for-the-openstack-console.patch
@@ -2,9 +2,15 @@ From: Andrej Shadura <andrew.shadura@collabora.co.uk>
 Date: Thu, 6 Aug 2020 10:48:57 +0200
 Subject: Use Python 3 for the openstack console
 
+---
+ build-vm-openstack | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build-vm-openstack b/build-vm-openstack
+index 19ddc4e..5090437 100644
 --- a/build-vm-openstack
 +++ b/build-vm-openstack
-@@ -271,7 +271,7 @@
+@@ -271,7 +271,7 @@ vm_startup_openstack() {
          sleep 1
      done
  
diff --git a/debian/patches/fallback-stable-dist.patch b/debian/patches/0012-Fallback-to-stable-if-lsb-reports-a-non-supported-di.patch
index 463e680..463e680 100644
--- a/debian/patches/fallback-stable-dist.patch
+++ b/debian/patches/0012-Fallback-to-stable-if-lsb-reports-a-non-supported-di.patch
diff --git a/debian/patches/Force-locale-to-C.UTF-8.patch b/debian/patches/0013-Force-locale-to-C.UTF-8.patch
index 4b6c75f..4b6c75f 100644
--- a/debian/patches/Force-locale-to-C.UTF-8.patch
+++ b/debian/patches/0013-Force-locale-to-C.UTF-8.patch
diff --git a/debian/patches/Force-the-local-timezone-to-be-UTC.patch b/debian/patches/0014-Force-the-local-timezone-to-be-UTC.patch
index f5269a4..f5269a4 100644
--- a/debian/patches/Force-the-local-timezone-to-be-UTC.patch
+++ b/debian/patches/0014-Force-the-local-timezone-to-be-UTC.patch
diff --git a/debian/patches/Unset-TERM-to-prevent-unexpectedly-colorized-output-from-.patch b/debian/patches/0015-Unset-TERM-to-prevent-unexpectedly-colorized-output-.patch
index cf3ad45..cf3ad45 100644
--- a/debian/patches/Unset-TERM-to-prevent-unexpectedly-colorized-output-from-.patch
+++ b/debian/patches/0015-Unset-TERM-to-prevent-unexpectedly-colorized-output-.patch
diff --git a/debian/patches/init_buildsystem-Move-hostname-ip-entry-to-the-end-of-etc.patch b/debian/patches/0016-init_buildsystem-Move-hostname-ip-entry-to-the-end-o.patch
index cf3b633..9afb991 100644
--- a/debian/patches/init_buildsystem-Move-hostname-ip-entry-to-the-end-of-etc.patch
+++ b/debian/patches/0016-init_buildsystem-Move-hostname-ip-entry-to-the-end-o.patch
@@ -18,10 +18,10 @@ Bug-Debian: https://bugs.debian.org/990278
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/init_buildsystem b/init_buildsystem
-index d83296d..7d855ad 100755
+index d362bc7..e172de6 100755
 --- a/init_buildsystem
 +++ b/init_buildsystem
-@@ -1079,11 +1079,7 @@ fi
+@@ -1169,11 +1169,7 @@ fi
  test -e $BUILD_ROOT/.build/init_buildsystem.data || HOST=`hostname`
  test -e $BUILD_ROOT/etc/hosts || echo "127.0.0.1 localhost" > $BUILD_ROOT/etc/hosts
  if ! grep -F "127.0.0.1 $HOST" $BUILD_ROOT/etc/hosts > /dev/null ; then
@@ -33,4 +33,4 @@ index d83296d..7d855ad 100755
 +    echo "127.0.0.1 $HOST" >> $BUILD_ROOT/etc/hosts
  fi
  
- # XXX: still needed?
+ rm -f $BUILD_ROOT/.rpmmacros $BUILD_ROOT/root/.rpmmacros
diff --git a/debian/patches/series b/debian/patches/series
index 36e12ce..1d465c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,16 +1,16 @@
 0001-Use-obs-build-in-locations-and-executable-names.patch
-0003-HACK-make-glibc-build.patch
-0005-dsc-keep-everything.patch
-build-recipe-dsc-don-t-rebuild-the-source-package.patch
-Log-the-version-number-during-startup.patch
-debootstrap-Print-the-exact-command-we-re-going-to-run.patch
-deb-Show-version-of-each-package-that-we-preinstall.patch
-build-recipe-dsc-List-contents-of-build-results.patch
-build-recipe-dsc-Show-information-about-the-build-chroot.patch
-Add-a-new-changelog-entry-for-debian-packages.patch
-python3-openstack-console.patch
-fallback-stable-dist.patch
-Force-locale-to-C.UTF-8.patch
-Force-the-local-timezone-to-be-UTC.patch
-Unset-TERM-to-prevent-unexpectedly-colorized-output-from-.patch
-init_buildsystem-Move-hostname-ip-entry-to-the-end-of-etc.patch
+0002-HACK-make-glibc-build.patch
+0003-dsc-keep-everything.patch
+0004-build-recipe-dsc-don-t-rebuild-the-source-package.patch
+0005-Log-the-version-number-during-startup.patch
+0006-debootstrap-Print-the-exact-command-we-re-going-to-r.patch
+0007-deb-Show-version-of-each-package-that-we-preinstall.patch
+0008-build-recipe-dsc-List-contents-of-build-results.patch
+0009-build-recipe-dsc-Show-information-about-the-build-ch.patch
+0010-Add-a-new-changelog-entry-for-debian-packages.patch
+0011-Use-Python-3-for-the-openstack-console.patch
+0012-Fallback-to-stable-if-lsb-reports-a-non-supported-di.patch
+0013-Force-locale-to-C.UTF-8.patch
+0014-Force-the-local-timezone-to-be-UTC.patch
+0015-Unset-TERM-to-prevent-unexpectedly-colorized-output-.patch
+0016-init_buildsystem-Move-hostname-ip-entry-to-the-end-o.patch