debootstrap: update to 1.0.143

Update to latest upstream release.

Highlights of changes since 1.0.128:
 * Added support for Debian 13 (trixie)
 * Added support for many new Ubuntu releases (jammy through plucky)
 * Improvements to keyring handling
 * Various bug fixes and cleanups

Drop PKG_REAL_VERSION and the now-redundant PKG_BUILD_DIR override:
upstream and downstream versions match, so use PKG_VERSION directly
in PKG_SOURCE.

Link: https://salsa.debian.org/installer-team/debootstrap/-/blob/1.0.143/debian/changelog
Signed-off-by: Daniel Golle <redacted>

diff --git a/admin/debootstrap/Makefile b/admin/debootstrap/Makefile
index 8bd3b47edad4a3fde638decfc902228298ac890c..b2fc1954634dae2997b960d554db30681f6fcef7 100644 (file)
--- a/admin/debootstrap/Makefile
+++ b/admin/debootstrap/Makefile
@@ -9,20 +9,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=debootstrap
-PKG_REAL_VERSION:=1.0.128+nmu2+deb12u1
-PKG_VERSION:=1.0.128.2~deb121
-PKG_RELEASE:=2
+PKG_VERSION:=1.0.143
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-udeb_$(PKG_REAL_VERSION)_all.udeb
+PKG_SOURCE:=$(PKG_NAME)-udeb_$(PKG_VERSION)_all.udeb
 PKG_SOURCE_URL:=@DEBIAN/pool/main/d/debootstrap
-PKG_HASH:=4fa4ec7c144ed047c47d0d8eb9b91b56eaa9b2db2b52510777abbabf5965d268
+PKG_HASH:=40a9a7af1a4908112b617c9a85901fb8eba1df535965eb4225522c010564693f
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=Unique
 PKG_LICENSE_FILES:=debian/copyright
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_REAL_VERSION)
-
 UNPACK_CMD=ar -p "$(DL_DIR)/$(PKG_SOURCE)" data.tar.xz | xzcat | tar -C $(1) -xf -
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/admin/debootstrap/patches/010-no-nvswitch.patch b/admin/debootstrap/patches/010-no-nvswitch.patch
index 698126a5fe972e07da9b1ea7138af17bd2685fb6..386a56b9529071b72d7c39eb98eff349d4148731 100644 (file)
--- a/admin/debootstrap/patches/010-no-nvswitch.patch
+++ b/admin/debootstrap/patches/010-no-nvswitch.patch
@@ -1,6 +1,6 @@
 --- a/usr/share/debootstrap/functions
 +++ b/usr/share/debootstrap/functions
-@@ -78,7 +78,6 @@ progress_next () {
+@@ -81,7 +81,6 @@ progress_next () {
  }
  
  wgetprogress () {