~carbslinux/repository

3ef23b9962195c9ed482b3a3aba52222cccdb2ab — Cem Keylan 1 year, 8 months ago ac7e7ff + c167729 helpers
Merge branch 'master' into helpers
M LICENSE => LICENSE +1 -1
@@ 1,6 1,6 @@
The MIT License (MIT)

Copyright (c) 2019-2020 Cem Keylan
Copyright (c) 2019-2021 Cem Keylan
Copyright (c) 2019 Dylan Araps

Permission is hereby granted, free of charge, to any person obtaining a copy

M core/busybox/checksums => core/busybox/checksums +4 -4
@@ 1,6 1,6 @@
c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689  busybox-1.32.0.tar.bz2
bebffb7d56289cb006ba8c52b7351d1bdaf60845a8c092f184c9297cdf7ffd98  .config
b3dc5a78ec33af72e54e2689d9205c249a91115166a77db6989c176b5c112ed9  .config-suid
d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd  busybox-1.33.0.tar.bz2
4b6e42049ce4cf78b109741917aa5f44b9daf8ada37860cdc8af6b21a59faf2c  .config
4e6932d1b5fd50758b7c1d94783897782d8f04fefa4daa8245a9252600f6cb8c  .config-suid
ebd61afac770d3d9cae5c411f44002496fb18b28cf7b77520072a3909852246e  acpid.run
814dea14ac612125e97dcc1d619219b2c9dfc14850bf48d858421fb2c98eca12  crond.run
c8b3502bf493336542247683f8d291753130141e5b20ecfda7077936751e83a7  inittab


@@ 11,7 11,7 @@ af4c302ed9ae6fa1cd8aa51c6f94de11550625e6f1dc0b138605e3429214d082  mdev.conf
2c6012579f669ea790785bb522a879a2005aad0d7977f96863918d3ed3cb03dd  ntp.conf
8ce7d65bc9a6da2003bd4dfd89aa355fd8f24fc1fafc37400400f7ac10958caf  udhcpc.script
8d84b1719dca2a751c09072c20cd782a3c47f119a68d35316f89d851daf67b88  fsck-resolve-uuid.patch
0f54301a73af461e8066bc805b48d991cfed513d08a2f036e015b19f97cb424a  modprobe-kernel-version.patch
e31be17d2e058c0bde645f12b38dd6d5a22f8751204304a2df994fc7e523ae9c  modprobe-kernel-version.patch
09c2f601fec4e5c10664c22f787dafb9424efe219bf826727c356da90dfd60d5  adduser-no-setgid.patch
f0e17fefc0af6b10205d72b242b6ef7481a58ff07726c62890ebc5893b96a396  install-fix-chown.patch
68e0c7d5e96902d3b890e89d9b018ae11d53ed3104bfedd624a1485df58b11cb  print-unicode.patch

M core/busybox/files/.config => core/busybox/files/.config +9 -4
@@ 1,7 1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.32.0
# Sat Jun 27 23:39:25 2020
# Busybox version: 1.33.0
# Fri Jan  1 16:14:15 2021
#
CONFIG_HAVE_DOT_CONFIG=y



@@ 36,7 36,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
# CONFIG_FEATURE_CLEAN_UP is not set
CONFIG_FEATURE_SYSLOG_INFO=y
CONFIG_FEATURE_SYSLOG=y
CONFIG_PLATFORM_LINUX=y

#
# Build Options


@@ 55,6 54,7 @@ CONFIG_EXTRA_LDFLAGS=""
CONFIG_EXTRA_LDLIBS=""
CONFIG_USE_PORTABLE_CODE=y
CONFIG_STACK_OPTIMIZATION_386=y
CONFIG_STATIC_LIBGCC=y

#
# Installation Options ("make install" behavior)


@@ 331,6 331,7 @@ CONFIG_UNIQ=y
CONFIG_UNLINK=y
CONFIG_USLEEP=y
CONFIG_UUDECODE=y
CONFIG_BASE32=y
CONFIG_BASE64=y
CONFIG_UUENCODE=y
CONFIG_WC=y


@@ 623,7 624,6 @@ CONFIG_FINDFS=y
CONFIG_GETOPT=y
CONFIG_FEATURE_GETOPT_LONG=y
# CONFIG_HEXDUMP is not set
# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
# CONFIG_HD is not set
# CONFIG_XXD is not set
# CONFIG_HWCLOCK is not set


@@ 715,6 715,7 @@ CONFIG_VOLUMEID=y
CONFIG_FEATURE_VOLUMEID_BCACHE=y
CONFIG_FEATURE_VOLUMEID_BTRFS=y
CONFIG_FEATURE_VOLUMEID_CRAMFS=y
CONFIG_FEATURE_VOLUMEID_EROFS=y
CONFIG_FEATURE_VOLUMEID_EXFAT=y
CONFIG_FEATURE_VOLUMEID_EXT=y
CONFIG_FEATURE_VOLUMEID_F2FS=y


@@ 874,6 875,10 @@ CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
CONFIG_FEATURE_HTTPD_PROXY=y
CONFIG_FEATURE_HTTPD_GZIP=y
CONFIG_FEATURE_HTTPD_ETAG=y
CONFIG_FEATURE_HTTPD_LAST_MODIFIED=y
CONFIG_FEATURE_HTTPD_DATE=y
# CONFIG_FEATURE_HTTPD_ACL_IP is not set
CONFIG_IFCONFIG=y
CONFIG_FEATURE_IFCONFIG_STATUS=y
CONFIG_FEATURE_IFCONFIG_SLIP=y

M core/busybox/files/.config-suid => core/busybox/files/.config-suid +9 -4
@@ 1,7 1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.32.0
# Sat Jun 27 23:40:13 2020
# Busybox version: 1.33.0
# Fri Jan  1 16:17:16 2021
#
CONFIG_HAVE_DOT_CONFIG=y



@@ 36,7 36,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
# CONFIG_FEATURE_CLEAN_UP is not set
CONFIG_FEATURE_SYSLOG_INFO=y
CONFIG_FEATURE_SYSLOG=y
CONFIG_PLATFORM_LINUX=y

#
# Build Options


@@ 55,6 54,7 @@ CONFIG_EXTRA_LDFLAGS=""
CONFIG_EXTRA_LDLIBS=""
# CONFIG_USE_PORTABLE_CODE is not set
# CONFIG_STACK_OPTIMIZATION_386 is not set
CONFIG_STATIC_LIBGCC=y

#
# Installation Options ("make install" behavior)


@@ 327,6 327,7 @@ CONFIG_UNAME_OSNAME=""
# CONFIG_UNLINK is not set
# CONFIG_USLEEP is not set
# CONFIG_UUDECODE is not set
# CONFIG_BASE32 is not set
# CONFIG_BASE64 is not set
# CONFIG_UUENCODE is not set
# CONFIG_WC is not set


@@ 607,7 608,6 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
# CONFIG_GETOPT is not set
# CONFIG_FEATURE_GETOPT_LONG is not set
# CONFIG_HEXDUMP is not set
# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
# CONFIG_HD is not set
# CONFIG_XXD is not set
# CONFIG_HWCLOCK is not set


@@ 691,6 691,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
# CONFIG_FEATURE_VOLUMEID_BCACHE is not set
# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
# CONFIG_FEATURE_VOLUMEID_EROFS is not set
# CONFIG_FEATURE_VOLUMEID_EXFAT is not set
# CONFIG_FEATURE_VOLUMEID_EXT is not set
# CONFIG_FEATURE_VOLUMEID_F2FS is not set


@@ 850,6 851,10 @@ CONFIG_FEATURE_LESS_MAXLINES=0
# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
# CONFIG_FEATURE_HTTPD_PROXY is not set
# CONFIG_FEATURE_HTTPD_GZIP is not set
# CONFIG_FEATURE_HTTPD_ETAG is not set
# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set
# CONFIG_FEATURE_HTTPD_DATE is not set
# CONFIG_FEATURE_HTTPD_ACL_IP is not set
# CONFIG_IFCONFIG is not set
# CONFIG_FEATURE_IFCONFIG_STATUS is not set
# CONFIG_FEATURE_IFCONFIG_SLIP is not set

M core/busybox/patches/modprobe-kernel-version.patch => core/busybox/patches/modprobe-kernel-version.patch +8 -8
@@ 1,8 1,8 @@
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 0a372a049..ecb29a8fd 100644
index c334186b8..ff08b256f 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -111,7 +111,7 @@
@@ -110,7 +110,7 @@
 //usage:       "   from the command line\n"
 //usage:
 //usage:#define modprobe_trivial_usage


@@ 11,7 11,7 @@ index 0a372a049..ecb29a8fd 100644
 //usage:	" MODULE" IF_FEATURE_CMDLINE_MODULE_OPTIONS(" [SYMBOL=VALUE]...")
 //usage:#define modprobe_full_usage "\n\n"
 //usage:       "	-a	Load multiple MODULEs"
@@ -121,6 +121,7 @@
@@ -120,6 +120,7 @@
 //usage:     "\n	-v	Verbose"
 //usage:     "\n	-s	Log to syslog"
 //usage:     "\n	-D	Show dependencies"


@@ 19,7 19,7 @@ index 0a372a049..ecb29a8fd 100644
 //usage:	IF_FEATURE_MODPROBE_BLACKLIST(
 //usage:     "\n	-b	Apply blacklist to module names too"
 //usage:	)
@@ -131,7 +132,7 @@
@@ -130,7 +131,7 @@
  * Note2: -b is always accepted, but if !FEATURE_MODPROBE_BLACKLIST,
  * it is a no-op.
  */


@@ 28,7 28,7 @@ index 0a372a049..ecb29a8fd 100644
 /* -a and -D _are_ in fact compatible */
 #define MODPROBE_COMPLEMENTARY "q-v:v-q:l--arD:r--alD:a--lr:D--rl"
 //#define MODPROBE_OPTS  "acd:lnrt:C:b"
@@ -147,7 +148,8 @@ enum {
@@ -146,7 +147,8 @@ enum {
 	//OPT_VERONLY    = (INSMOD_OPT_UNUSED << x), /* V */
 	//OPT_CONFIGFILE = (INSMOD_OPT_UNUSED << x), /* C */
 	OPT_SHOW_DEPS    = (INSMOD_OPT_UNUSED << 3), /* D */


@@ 38,7 38,7 @@ index 0a372a049..ecb29a8fd 100644
 };
 #if ENABLE_LONG_OPTS
 static const char modprobe_longopts[] ALIGN1 =
@@ -560,6 +562,7 @@ int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -557,6 +559,7 @@ int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int modprobe_main(int argc UNUSED_PARAM, char **argv)
 {
 	int rc;


@@ 46,7 46,7 @@ index 0a372a049..ecb29a8fd 100644
 	unsigned opt;
 	struct module_entry *me;
 
@@ -567,13 +570,20 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
@@ -564,13 +567,20 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
 
 	opt = getopt32long(argv, "^" INSMOD_OPTS MODPROBE_OPTS "\0" MODPROBE_COMPLEMENTARY,
 			modprobe_longopts


@@ 68,4 68,4 @@ index 0a372a049..ecb29a8fd 100644
-	uname(&G.uts);
 	xchdir(G.uts.release);
 
 	if (opt & OPT_LIST_ONLY) {
\ No newline at end of file
 	if (opt & OPT_LIST_ONLY) {

M core/busybox/sources => core/busybox/sources +1 -1
@@ 1,4 1,4 @@
https://busybox.net/downloads/busybox-1.32.0.tar.bz2
https://busybox.net/downloads/busybox-1.33.0.tar.bz2
files/.config
files/.config-suid
files/acpid.run

M core/busybox/version => core/busybox/version +1 -1
@@ 1,1 1,1 @@
1.32.0 1
1.33.0 1

M core/git/checksums => core/git/checksums +2 -2
@@ 1,2 1,2 @@
f2fc436ebe657821a1360bcd1e5f4896049610082419143d60f6fa13c2f607c1  git-2.29.2.tar.xz
e2d44a2a30b9d43a770262f1328b77df2f532f16c2dcd235655e5c9bd39bd792  git-manpages-2.29.2.tar.xz
55735021109565721af805af382c45cce73c3cfaa59daad22443d1477d334d19  git-2.30.0.tar.xz
7b2b8405d5bdd149e3891617053de37f7e8d5a5b3834317a5af9f30ccc93cf76  git-manpages-2.30.0.tar.xz

M core/git/sources => core/git/sources +2 -2
@@ 1,2 1,2 @@
https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.29.2.tar.xz
https://www.kernel.org/pub/software/scm/git/git-manpages-2.29.2.tar.xz
https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.30.0.tar.xz
https://www.kernel.org/pub/software/scm/git/git-manpages-2.30.0.tar.xz

M core/git/version => core/git/version +1 -1
@@ 1,1 1,1 @@
2.29.2 1
2.30.0 1

M core/linux-headers/checksums => core/linux-headers/checksums +1 -1
@@ 1,1 1,1 @@
3b84e13abae26af17ebccc4d7212f5843a991127a73a320848d5c6942ef781a2  linux-5.10.2.tar.xz
904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec  linux-5.10.4.tar.xz

M core/linux-headers/sources => core/linux-headers/sources +1 -1
@@ 1,1 1,1 @@
https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.2.tar.xz
https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.4.tar.xz

M core/linux-headers/version => core/linux-headers/version +1 -1
@@ 1,1 1,1 @@
5.10.2 1
5.10.4 1

M extra/dhcpcd/checksums => extra/dhcpcd/checksums +1 -1
@@ 1,2 1,2 @@
fbea5d223e9c2837ea98757d1242db708a42d2e18b12050f9684424390833df4  dhcpcd-9.3.4.tar.gz
9d4165ea6a272f5aba55d421ff0fd88ac0bcfd13845b889b2b9291ea9cfa0031  dhcpcd-9.4.0.tar.gz
533714c2f3edcd70e47822cb880d8e8ffdba673b10452ea808037ec2714a375c  dhcpcd.run

M extra/dhcpcd/sources => extra/dhcpcd/sources +1 -1
@@ 1,2 1,2 @@
https://github.com/rsmarples/dhcpcd/archive/dhcpcd-9.3.4.tar.gz
https://github.com/rsmarples/dhcpcd/archive/dhcpcd-9.4.0.tar.gz
files/dhcpcd.run

M extra/dhcpcd/version => extra/dhcpcd/version +1 -1
@@ 1,1 1,1 @@
9.3.4 1
9.4.0 1

M extra/freetype-harfbuzz/checksums => extra/freetype-harfbuzz/checksums +2 -2
@@ 1,2 1,2 @@
1543d61025d2e6312e0a1c563652555f17378a204a61e99928c9fcef030a2d8b  freetype-2.10.2.tar.xz
be01bc2c3f1e8902f31b432131280cdfdf6780b72c2389dd63cfab908f6213f3  2.7.3.tar.gz
86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784  freetype-2.10.4.tar.xz
daff8a4003ac420a8550760ed303ce33b310c8ea17b7f15b307d1969cabcebcb  2.7.4.tar.gz

M extra/freetype-harfbuzz/sources => extra/freetype-harfbuzz/sources +2 -2
@@ 1,2 1,2 @@
https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.2.tar.xz freetype
https://github.com/harfbuzz/harfbuzz/archive/2.7.3.tar.gz harfbuzz
https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.4.tar.xz freetype
https://github.com/harfbuzz/harfbuzz/archive/2.7.4.tar.gz harfbuzz

M extra/freetype-harfbuzz/version => extra/freetype-harfbuzz/version +1 -1
@@ 1,1 1,1 @@
2.10.2+2.7.3 1
2.10.4+2.7.4 1

M extra/go/build => extra/go/build +5 -2
@@ 1,5 1,8 @@
#!/bin/sh -e

# Remove bash as a make dependency
patch -p1 < no-bash.patch

# Disable stripping of binaries.
# This breaks Go.
:> nostrip


@@ 15,7 18,7 @@ export GO_LDFLAGS="-w -s"
    mkdir -p lib/go-bootstrap

    cd "$GOROOT/src"
    bash ./make.bash
    ./make.bash
    cd ..
    cp -a bin pkg src ../lib/go-bootstrap
    cd ..


@@ 33,7 36,7 @@ export GOROOT=$PWD/go-current

(
    cd "$GOROOT/src"
    bash make.bash --no-clean -v
    ./make.bash --no-clean -v
)

cd "$GOROOT"

M extra/go/checksums => extra/go/checksums +1 -0
@@ 1,2 1,3 @@
890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817  go1.15.6.src.tar.gz
f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52  go1.4-bootstrap-20171003.tar.gz
4166a929288658d8fb2978bab24c1b5a0a8b8996122058c97e207da79db75b92  no-bash.patch

D extra/go/depends => extra/go/depends +0 -1
@@ 1,1 0,0 @@
bash make

A extra/go/patches/no-bash.patch => extra/go/patches/no-bash.patch +86 -0
@@ 0,0 1,86 @@
diff -ur a/go-current/src/make.bash b/go-current/src/make.bash
--- a/go-current/src/make.bash	2020-12-03 20:32:44.000000000 +0300
+++ b/go-current/src/make.bash	2021-01-02 00:36:42.692155781 +0300
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 # Copyright 2009 The Go Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
@@ -106,7 +106,7 @@
 # so loop through the possible selinux mount points.
 for se_mount in /selinux /sys/fs/selinux
 do
-	if [ -d $se_mount -a -f $se_mount/booleans/allow_execstack -a -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+	if [ -d $se_mount ] && [ -f $se_mount/booleans/allow_execstack ] && [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
 		if ! cat $se_mount/booleans/allow_execstack | grep -c '^1 1$' >> /dev/null ; then
 			echo "WARNING: the default SELinux policy on, at least, Fedora 12 breaks "
 			echo "Go. You can enable the features that Go needs via the following "
@@ -154,14 +154,14 @@
 
 export GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:-$HOME/go1.4}
 export GOROOT="$(cd .. && pwd)"
-IFS=$'\n'; for go_exe in $(type -ap go); do
+for go_exe in $(command -v go); do
 	if [ ! -x "$GOROOT_BOOTSTRAP/bin/go" ]; then
 		goroot=$(GOROOT='' GOOS='' GOARCH='' "$go_exe" env GOROOT)
 		if [ "$goroot" != "$GOROOT" ]; then
 			GOROOT_BOOTSTRAP=$goroot
 		fi
 	fi
-done; unset IFS
+done
 GOROOT_BOOTSTRAP_VERSION=$($GOROOT_BOOTSTRAP/bin/go version | sed 's/go version //')
 echo "Building Go cmd/dist using $GOROOT_BOOTSTRAP. ($GOROOT_BOOTSTRAP_VERSION)"
 if $verbose; then
diff -ur a/go1.4-bootstrap/src/make.bash b/go1.4-bootstrap/src/make.bash
--- a/go1.4-bootstrap/src/make.bash	2017-11-22 04:33:58.000000000 +0300
+++ b/go1.4-bootstrap/src/make.bash	2021-01-02 00:11:00.448427915 +0300
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 # Copyright 2009 The Go Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
@@ -82,7 +82,7 @@
 # so loop through the possible selinux mount points.
 for se_mount in /selinux /sys/fs/selinux
 do
-	if [ -d $se_mount -a -f $se_mount/booleans/allow_execstack -a -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+	if [ -d $se_mount ] && [ -f $se_mount/booleans/allow_execstack ] [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
 		if ! cat $se_mount/booleans/allow_execstack | grep -c '^1 1$' >> /dev/null ; then
 			echo "WARNING: the default SELinux policy on, at least, Fedora 12 breaks "
 			echo "Go. You can enable the features that Go needs via the following "
@@ -102,7 +102,7 @@
 # Test for debian/kFreeBSD.
 # cmd/dist will detect kFreeBSD as freebsd/$GOARCH, but we need to
 # disable cgo manually.
-if [ "$(uname -s)" == "GNU/kFreeBSD" ]; then
+if [ "$(uname -s)" = "GNU/kFreeBSD" ]; then
         export CGO_ENABLED=0
 fi
 
@@ -122,12 +122,12 @@
 386) mflag=-m32;;
 amd64) mflag=-m64;;
 esac
-if [ "$(uname)" == "Darwin" ]; then
+if [ "$(uname)" = "Darwin" ]; then
 	# golang.org/issue/5261
 	mflag="$mflag -mmacosx-version-min=10.6"
 fi
 # if gcc does not exist and $CC is not set, try clang if available.
-if [ -z "$CC" -a -z "$(type -t gcc)" -a -n "$(type -t clang)" ]; then
+if [ -z "$CC" ] && ! command -v gcc >/dev/null && command -v clang; then
 	export CC=clang CXX=clang++
 fi
 ${CC:-gcc} $mflag -O2 -Wall -Werror -o cmd/dist/dist -Icmd/dist "$DEFGOROOT" cmd/dist/*.c
@@ -162,7 +162,7 @@
 "$GOTOOLDIR"/go_bootstrap clean -i std
 echo
 
-if [ "$GOHOSTARCH" != "$GOARCH" -o "$GOHOSTOS" != "$GOOS" ]; then
+if [ "$GOHOSTARCH" != "$GOARCH" ] || [ "$GOHOSTOS" != "$GOOS" ]; then
 	echo "# Building packages and commands for host, $GOHOSTOS/$GOHOSTARCH."
 	# CC_FOR_TARGET is recorded as the default compiler for the go tool. When building for the host, however,
 	# use the host compiler, CC, from `cmd/dist/dist env` instead.

M extra/go/sources => extra/go/sources +1 -0
@@ 1,2 1,3 @@
https://golang.org/dl/go1.15.6.src.tar.gz go-current
https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz go1.4-bootstrap
patches/no-bash.patch

M extra/harfbuzz-icu/checksums => extra/harfbuzz-icu/checksums +1 -1
@@ 1,1 1,1 @@
be01bc2c3f1e8902f31b432131280cdfdf6780b72c2389dd63cfab908f6213f3  2.7.3.tar.gz
daff8a4003ac420a8550760ed303ce33b310c8ea17b7f15b307d1969cabcebcb  2.7.4.tar.gz

M extra/harfbuzz-icu/sources => extra/harfbuzz-icu/sources +1 -1
@@ 1,1 1,1 @@
https://github.com/harfbuzz/harfbuzz/archive/2.7.3.tar.gz
https://github.com/harfbuzz/harfbuzz/archive/2.7.4.tar.gz

M extra/harfbuzz-icu/version => extra/harfbuzz-icu/version +1 -1
@@ 1,1 1,1 @@
2.7.3 1
2.7.4 1

M extra/libarchive/build => extra/libarchive/build +4 -1
@@ 7,7 7,10 @@
    --without-xml2 \
    --without-expat

make
# Link binaries statically
make bsdtar_LDFLAGS=-all-static \
     bsdcat_LDFLAGS=-all-static \
     bsdcpio_LDFLAGS=-all-static
make DESTDIR="$1" install

ln -s bsdcat  "$1/usr/bin/cat"

M extra/libarchive/checksums => extra/libarchive/checksums +1 -1
@@ 1,1 1,1 @@
245bff9d17e78986bf9716eb887e3bc731d7fd8e5d04efebb8bb1e1c39a3a354  libarchive-3.5.0.tar.xz
0e17d3a8d0b206018693b27f08029b598f6ef03600c2b5d10c94ce58692e299b  libarchive-3.5.1.tar.xz

M extra/libarchive/sources => extra/libarchive/sources +1 -1
@@ 1,1 1,1 @@
https://github.com/libarchive/libarchive/releases/download/v3.5.0/libarchive-3.5.0.tar.xz
https://github.com/libarchive/libarchive/releases/download/3.5.1/libarchive-3.5.1.tar.xz

M extra/libarchive/version => extra/libarchive/version +1 -1
@@ 1,1 1,1 @@
3.5.0 1
3.5.1 1

M extra/shared-mime-info/build => extra/shared-mime-info/build +4 -7
@@ 3,9 3,6 @@
# We bypass the build system entirely as it has
# a mandatory dependency on gettext.

# Grab the package version.
read -r version _ < "${0%/*}/version"

mkdir -p "$1/usr/share/mime/packages" \
         "$1/usr/share/pkgconfig" \
         "$1/usr/bin"


@@ 15,7 12,7 @@ sed -e 's/_comment/comment/g' data/freedesktop.org.xml.in \
    > "$1/usr/share/mime/packages/freedesktop.org.xml"

# Replace markers in the file.
sed -e 's|@prefix@|/usr|' -e "s|@VERSION@|$version|" shared-mime-info.pc.in \
sed -e 's|@prefix@|/usr|' -e "s|@VERSION@|$2|" shared-mime-info.pc.in \
    > "$1/usr/share/pkgconfig/shared-mime-info.pc"

# Define our own config.h statically.


@@ 37,12 34,12 @@ cat << EOF > src/config.h
#define PACKAGE "shared-mime-info"
#define PACKAGE_BUGREPORT ""
#define PACKAGE_NAME "shared-mime-info"
#define PACKAGE_STRING "shared-mime-info $version"
#define PACKAGE_STRING "shared-mime-info $2"
#define PACKAGE_TARNAME "shared-mime-info"
#define PACKAGE_URL ""
#define PACKAGE_VERSION "$version"
#define PACKAGE_VERSION "$2"
#define STDC_HEADERS 1
#define VERSION "$version"
#define VERSION "$2"
EOF

# Fix config.h include.

M extra/shared-mime-info/checksums => extra/shared-mime-info/checksums +1 -1
@@ 1,1 1,1 @@
23c1cb7919f31cf97aeb5225548f75705f706aa5cc7d1c4c503364bcc8681e06  shared-mime-info-2.0.tar.xz
b2d40cfcdd84e835d0f2c9107b3f3e77e9cf912f858171fe779946da634e8563  shared-mime-info-2.1.tar.xz

M extra/shared-mime-info/post-install => extra/shared-mime-info/post-install +4 -0
@@ 1,3 1,7 @@
#!/bin/sh -e

printf '\033[1;33mNOTE:\033[m \033[1m%s\n      %s\n      %s\033[m\n' \
    "Please be patient this might take really long, especially during updates." \
    "It might seem to be stuck, but it most probably isn't. The wait can" \
    "be up to 10 minutes."
update-mime-database -V /usr/share/mime

M extra/shared-mime-info/sources => extra/shared-mime-info/sources +1 -1
@@ 1,1 1,1 @@
https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0440063a2e6823a4b1a6fb2f2af8350f/shared-mime-info-2.0.tar.xz
https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-2.1.tar.xz

M extra/shared-mime-info/version => extra/shared-mime-info/version +1 -1
@@ 1,1 1,1 @@
2.0 1
2.1 1

M extra/tzdata/checksums => extra/tzdata/checksums +1 -1
@@ 1,1 1,1 @@
5a8d69e9d998156bcebb5b7eabf7c2541b2ba39740b3e838a04fd6b8e67c5d35  2020e.tar.gz
e53b70c3ed8597a081e2c12ec049802433b5e022d3d20db4e8bda80d760d7cee  2020f.tar.gz

M extra/tzdata/sources => extra/tzdata/sources +1 -1
@@ 1,1 1,1 @@
https://github.com/eggert/tz/archive/2020e.tar.gz
https://github.com/eggert/tz/archive/2020f.tar.gz

M extra/tzdata/version => extra/tzdata/version +1 -1
@@ 1,1 1,1 @@
2020e 1
2020f 1