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 <redacted>

diff --git a/admin/debootstrap/Makefile b/admin/debootstrap/Makefile
index f6cbca238ad40065c1556aefb973846668f7245c..af8ae2de0d8dd5f5e32ccfab3ea386ed339e7110 100644 (file)
--- 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 <daniel@makrotopia.org>
 PKG_LICENSE:=Unique

diff --git a/admin/debootstrap/files/pkgdetails.c b/admin/debootstrap/files/pkgdetails.c
index 99ee1900aab6670937ba59066c8a269d19071202..7de6731dda98215b02ca605188a6fe3b1b73ed06 100644 (file)
--- a/admin/debootstrap/files/pkgdetails.c
+++ b/admin/debootstrap/files/pkgdetails.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/admin/debootstrap/patches/010-no-nvswitch.patch b/admin/debootstrap/patches/010-no-nvswitch.patch
new file mode 100644 (file)
index 0000000..d288dcc
--- /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