git: 100487855b12 - main - sysutils/debootstrap: Update to 1.0.128+nmu2+deb12u2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 10 Jan 2026 22:55:27 UTC
The branch main has been updated by dtxdf:
URL: https://cgit.FreeBSD.org/ports/commit/?id=100487855b12bde80a15783ddda3c0d594d027ba
commit 100487855b12bde80a15783ddda3c0d594d027ba
Author: Petteri Valkonen <petteri.valkonen@iki.fi>
AuthorDate: 2025-08-27 14:33:37 +0000
Commit: Jesús Daniel Colmenares Oviedo <dtxdf@FreeBSD.org>
CommitDate: 2026-01-10 22:53:45 +0000
sysutils/debootstrap: Update to 1.0.128+nmu2+deb12u2
- This version fixes a problem where debootstrap would fail to
install the previously removed usr-is-merged package on
Trixie/Sid: E: Couldn't find these debs: usr-is-merged
- Depend on devel/pcre2 instead of devel/pcre:
- devel/pcre doesn't support the E switch.
- devel/pcre is EOLed by upstream.
- Fix "Failed to take /etc/passwd lock: Invalid argument" error.
- Pet portfmt.
PR: 289349
Approved by: nc@ (maintainer-timeout)
---
sysutils/debootstrap/Makefile | 11 ++++++-----
sysutils/debootstrap/distinfo | 6 +++---
sysutils/debootstrap/files/patch-functions | 14 +++++++-------
sysutils/debootstrap/files/patch-scripts_debian-common | 9 ++++++---
4 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/sysutils/debootstrap/Makefile b/sysutils/debootstrap/Makefile
index 331caf5869d6..3ce842903a5d 100644
--- a/sysutils/debootstrap/Makefile
+++ b/sysutils/debootstrap/Makefile
@@ -1,9 +1,9 @@
PORTNAME= debootstrap
PORTVERSION= ${DEB_VERSION}n${DEB_NMU}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= DEBIAN
-DISTNAME= ${PORTNAME}_${DEB_VERSION}+nmu${DEB_NMU}
+DISTNAME= ${PORTNAME}_${DEB_VERSION}+nmu${DEB_NMU}+${DEB_REVISION}
MAINTAINER= nc@FreeBSD.org
COMMENT= Install Debian or Ubuntu base system into a directory
@@ -12,12 +12,12 @@ WWW= https://wiki.debian.org/Debootstrap
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/debian/copyright
-RUN_DEPENDS= wget:ftp/wget \
+RUN_DEPENDS= ${LOCALBASE}/share/keyrings/ubuntu-archive-keyring.gpg:security/ubuntu-keyring \
bash:shells/bash \
- pcregrep:devel/pcre \
gpgv2:security/gnupg \
gtar:archivers/gtar \
- ${LOCALBASE}/share/keyrings/ubuntu-archive-keyring.gpg:security/ubuntu-keyring
+ pcre2grep:devel/pcre2 \
+ wget:ftp/wget
USES= gmake perl5
USE_PERL5= run
@@ -31,6 +31,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
# native package doesn't play well with our versioning
DEB_VERSION= 1.0.128
DEB_NMU= 2
+DEB_REVISION= deb12u2
post-patch:
@${REINPLACE_CMD} \
diff --git a/sysutils/debootstrap/distinfo b/sysutils/debootstrap/distinfo
index 54933414c156..05c2a782e36a 100644
--- a/sysutils/debootstrap/distinfo
+++ b/sysutils/debootstrap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1677148183
-SHA256 (debootstrap_1.0.128+nmu2.tar.gz) = 528523228d93a31c9e0cd4eb932977ea8ceec2bfbf8db1103bec2397cc7434fa
-SIZE (debootstrap_1.0.128+nmu2.tar.gz) = 82266
+TIMESTAMP = 1756305131
+SHA256 (debootstrap_1.0.128+nmu2+deb12u2.tar.gz) = c5ff2803461978d1b5fd965ae64ea5aabef94c3126793a58e8f9a4a92c00db96
+SIZE (debootstrap_1.0.128+nmu2+deb12u2.tar.gz) = 86623
diff --git a/sysutils/debootstrap/files/patch-functions b/sysutils/debootstrap/files/patch-functions
index 1fbffa87489c..f79f29c1e5d6 100644
--- a/sysutils/debootstrap/files/patch-functions
+++ b/sysutils/debootstrap/files/patch-functions
@@ -1,4 +1,4 @@
---- functions.orig 2022-10-18 22:48:32 UTC
+--- functions.orig 2024-12-29 18:30:24 UTC
+++ functions
@@ -658,7 +658,7 @@ download_release_sig () {
info RELEASESIG "Checking Release signature"
@@ -36,32 +36,32 @@
else
error 1 UNPACKCMDUNVL "Extracting %s requires the %s command, which is not available" "$pkg" "$cat_cmd"
fi
-@@ -1515,7 +1515,7 @@ while (read STDIN, $x, 1) {
+@@ -1614,7 +1614,7 @@ while (read STDIN, $x, 1) {
}' "$@"
elif [ "$1" = "GETDEPS" ]; then
local pkgdest="$2"; shift; shift
-LC_ALL=C grep "$gropt" '^$|^Package:|^Depends:|^Pre-Depends:' $pkgdest | perl -e '
-+LC_ALL=C pcregrep '^$|^Package:|^Depends:|^Pre-Depends:' $pkgdest | perl -e '
++LC_ALL=C pcre2grep '^$|^Package:|^Depends:|^Pre-Depends:' $pkgdest | perl -e '
%seen = map { $_ => 1 } @ARGV;
while (<STDIN>) {
if (/^Package: (.*)$/) {
-@@ -1543,13 +1543,13 @@ while (<STDIN>) {
+@@ -1642,13 +1642,13 @@ while (<STDIN>) {
local m="$2"
local p="$3"
shift; shift; shift
- LC_ALL=C grep "$gropt" '^$|^Architecture:|^Filename:|^MD5sum:|^Package:|^Priority:|^SHA256:|^Size:|^Version:|^Depends:|^Pre-Depends:' "$p" | pkgdetails_field 1 Package: "$m" "$@"
-+ LC_ALL=C pcregrep '^$|^Architecture:|^Filename:|^MD5sum:|^Package:|^Priority:|^SHA256:|^Size:|^Version:|^Depends:|^Pre-Depends:' "$p" | pkgdetails_field 1 Package: "$m" "$@"
++ LC_ALL=C pcre2grep '^$|^Architecture:|^Filename:|^MD5sum:|^Package:|^Priority:|^SHA256:|^Size:|^Version:|^Depends:|^Pre-Depends:' "$p" | pkgdetails_field 1 Package: "$m" "$@"
elif [ "$1" = "FIELD" ]; then
local f="$2"
local m="$3"
local p="$4"
shift; shift; shift; shift
- LC_ALL=C grep "$gropt" '^$|^Package:|^Priority:' "$p" | pkgdetails_field 0 "$f" "$m" "$@"
-+ LC_ALL=C pcregrep '^$|^Package:|^Priority:' "$p" | pkgdetails_field 0 "$f" "$m" "$@"
++ LC_ALL=C pcre2grep '^$|^Package:|^Priority:' "$p" | pkgdetails_field 0 "$f" "$m" "$@"
elif [ "$1" = "STANZAS" ]; then
local pkgdest="$2"; shift; shift
perl -e '
-@@ -1706,7 +1706,7 @@ read_gpg_status () {
+@@ -1805,7 +1805,7 @@ read_gpg_status () {
elif [ "$unkkey" ]; then
error 1 UNKNOWNRELSIG "Release signed by unknown key (key id %s)\n The specified keyring $KEYRING may be incorrect or out of date.\n You can find the latest Debian release key at https://ftp-master.debian.org/keys.html" "$unkkey"
else
diff --git a/sysutils/debootstrap/files/patch-scripts_debian-common b/sysutils/debootstrap/files/patch-scripts_debian-common
index 0eb7c31d2064..6424f188f2f6 100644
--- a/sysutils/debootstrap/files/patch-scripts_debian-common
+++ b/sysutils/debootstrap/files/patch-scripts_debian-common
@@ -1,6 +1,6 @@
---- scripts/debian-common.orig 2023-02-08 17:55:01 UTC
+--- scripts/debian-common.orig 2025-08-27 14:48:00 UTC
+++ scripts/debian-common
-@@ -215,10 +215,21 @@ echo \"Warning: Fake start-stop-daemon called, doing n
+@@ -220,10 +220,24 @@ echo \"Warning: Fake start-stop-daemon called, doing n
predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps")
# XXX: progress is tricky due to how dpkg_progress works
# -- cjwatson 2009-07-29
@@ -16,13 +16,16 @@
+ warning FREEBSD_00 "Applying FreeBSD-specific workaround..."
+ # ... for "Failed to mount /etc/machine-id: Bad address" with Focal.
+ in_target truncate -s0 /var/lib/dpkg/info/systemd.postinst
++ # Fix "Failed to take /etc/passwd lock: Invalid argument" error
++ # See: https://github.com/microsoft/WSL/issues/10397#issuecomment-1780132430
++ in_target ln -sf /bin/echo /bin/systemd-sysusers
+ in_target dpkg --configure systemd
+ fi
+ set -e
done
if [ -n "$base" ]; then
-@@ -237,6 +248,12 @@ echo \"Warning: Fake start-stop-daemon called, doing n
+@@ -242,6 +256,12 @@ echo \"Warning: Fake start-stop-daemon called, doing n
mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
rm -f "$TARGET/usr/sbin/policy-rc.d"