Page MenuHomeFreeBSD
Files F133278244

D26165.id77513.diff
No OneTemporary
Actions

D26165.id77513.diff
View Options

Index: head/sysutils/debootstrap/Makefile
===================================================================
--- head/sysutils/debootstrap/Makefile
+++ head/sysutils/debootstrap/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= debootstrap
-PORTVERSION= 1.0.115
-PORTREVISION= 1
+PORTVERSION= 1.0.123
CATEGORIES= sysutils
MASTER_SITES= DEBIAN/pool/main/d/${PORTNAME}
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -17,7 +16,7 @@
RUN_DEPENDS= wget:ftp/wget \
bash:shells/bash
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC= ${WRKDIR}/${PORTNAME}
NO_BUILD= yes
NO_ARCH= yes
USES= gmake perl5
Index: head/sysutils/debootstrap/distinfo
===================================================================
--- head/sysutils/debootstrap/distinfo
+++ head/sysutils/debootstrap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565566198
-SHA256 (debootstrap_1.0.115.tar.gz) = e4811165e02b027feb6a299aa354bcecc351ba273db9f56b072e246ff2b1d4e8
-SIZE (debootstrap_1.0.115.tar.gz) = 75691
+TIMESTAMP = 1598191216
+SHA256 (debootstrap_1.0.123.tar.gz) = 5e5a8147ecdd6be0eea5ac4d6ed8192cc653e93f744dd3306c9b1cc51d6ca328
+SIZE (debootstrap_1.0.123.tar.gz) = 78175
Index: head/sysutils/debootstrap/files/patch-scripts-bionic
===================================================================
--- head/sysutils/debootstrap/files/patch-scripts-bionic
+++ head/sysutils/debootstrap/files/patch-scripts-bionic
@@ -1,16 +0,0 @@
---- scripts/bionic.orig 2020-07-08 20:51:17.590645000 +0100
-+++ scripts/bionic 2020-07-08 20:51:28.786509000 +0100
-@@ -249,10 +249,13 @@ echo \"Warning: Fake initctl called, doing nothing\""
-
- info CONFBASE "Configuring the base system..."
-
-+ # This step sometimes fails due to some missing functionality in Linuxulator. Just ignore it.
-+ set +e
- smallyes '' |
- (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be re-attempted up to five times." "" \
- dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) |
- dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING
-+ set -e
- fi
-
- if [ -x "$TARGET/sbin/initctl.REAL" ]; then
Index: head/sysutils/debootstrap/files/patch-scripts-gutsy
===================================================================
--- head/sysutils/debootstrap/files/patch-scripts-gutsy
+++ head/sysutils/debootstrap/files/patch-scripts-gutsy
@@ -0,0 +1,16 @@
+--- scripts/gutsy.orig 2020-07-08 20:51:17.590645000 +0100
++++ scripts/gutsy 2020-07-08 20:51:28.786509000 +0100
+@@ -249,10 +249,13 @@ echo \"Warning: Fake initctl called, doing nothing\""
+
+ info CONFBASE "Configuring the base system..."
+
++ # This step sometimes fails due to some missing functionality in Linuxulator. Just ignore it.
++ set +e
+ smallyes '' |
+ (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be re-attempted up to five times." "" \
+ dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) |
+ dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING
++ set -e
+ fi
+
+ if [ -x "$TARGET/sbin/initctl.REAL" ]; then
Index: head/sysutils/debootstrap/pkg-plist
===================================================================
--- head/sysutils/debootstrap/pkg-plist
+++ head/sysutils/debootstrap/pkg-plist
@@ -2,13 +2,17 @@
man/man8/debootstrap.8.gz
%%DATADIR%%/functions
%%DATADIR%%/scripts/aequorea
+%%DATADIR%%/scripts/amber
%%DATADIR%%/scripts/artful
+%%DATADIR%%/scripts/ascii
%%DATADIR%%/scripts/bartholomea
+%%DATADIR%%/scripts/beowulf
%%DATADIR%%/scripts/bionic
%%DATADIR%%/scripts/bookworm
%%DATADIR%%/scripts/breezy
%%DATADIR%%/scripts/bullseye
%%DATADIR%%/scripts/buster
+%%DATADIR%%/scripts/ceres
%%DATADIR%%/scripts/chromodoris
%%DATADIR%%/scripts/cosmic
%%DATADIR%%/scripts/dapper
@@ -20,6 +24,7 @@
%%DATADIR%%/scripts/etch
%%DATADIR%%/scripts/etch-m68k
%%DATADIR%%/scripts/feisty
+%%DATADIR%%/scripts/focal
%%DATADIR%%/scripts/gutsy
%%DATADIR%%/scripts/hardy
%%DATADIR%%/scripts/hoary

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 25, 1:52 PM (7 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24149835
Default Alt Text
D26165.id77513.diff (4 KB)

Event Timeline