From f09e6461f3924b02a7cfbf108a797896c9aa6625 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 22 Feb 2020 18:46:25 -0800 Subject: [PATCH] debootstrap: update to 1.0.118 Added _GNU_SOURCE define to fix compilation warning. Added patch to fix uclient-fetch as it does not support -nv. Signed-off-by: Rosen Penev --- admin/debootstrap/Makefile | 4 ++-- admin/debootstrap/files/pkgdetails.c | 1 + admin/debootstrap/patches/010-no-nvswitch.patch | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 admin/debootstrap/patches/010-no-nvswitch.patch diff --git a/admin/debootstrap/Makefile b/admin/debootstrap/Makefile index f6cbca238a..af8ae2de0d 100644 --- a/admin/debootstrap/Makefile +++ b/admin/debootstrap/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=debootstrap -PKG_VERSION:=1.0.116 +PKG_VERSION:=1.0.118 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-udeb_$(PKG_VERSION)_all.udeb PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/d/debootstrap -PKG_HASH:=2325cbad6fac19cec7db34cff8fc06f9d9781862621b6e91f10549cf7c7c66af +PKG_HASH:=fad9b7968676c1f4a680e2b07c2b2859f5513ea94425ad3247189eb81bdb51a6 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=Unique diff --git a/admin/debootstrap/files/pkgdetails.c b/admin/debootstrap/files/pkgdetails.c index 99ee1900aa..7de6731dda 100644 --- a/admin/debootstrap/files/pkgdetails.c +++ b/admin/debootstrap/files/pkgdetails.c @@ -1,3 +1,4 @@ +#define _GNU_SOURCE #include #include #include diff --git a/admin/debootstrap/patches/010-no-nvswitch.patch b/admin/debootstrap/patches/010-no-nvswitch.patch new file mode 100644 index 0000000000..d288dccbb9 --- /dev/null +++ b/admin/debootstrap/patches/010-no-nvswitch.patch @@ -0,0 +1,10 @@ +--- a/usr/share/debootstrap/functions ++++ b/usr/share/debootstrap/functions +@@ -77,7 +77,6 @@ progress_next () { + } + + wgetprogress () { +- [ ! "$VERBOSE" ] && NVSWITCH="-nv" + local ret=0 + if [ "$USE_DEBIANINSTALLER_INTERACTION" ] && [ "$PROGRESS_NEXT" ]; then + # The exit status of a pipeline is that of the last command in