From a9891dce25ab4fb640b0c8e036595ee3370ceb51 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Fri, 1 Jan 2021 16:23:25 +0300 Subject: busybox: bump to 1.33.0 --- core/busybox/checksums | 8 ++++---- core/busybox/files/.config | 13 +++++++++---- core/busybox/files/.config-suid | 13 +++++++++---- core/busybox/patches/modprobe-kernel-version.patch | 16 ++++++++-------- core/busybox/sources | 2 +- core/busybox/version | 2 +- 6 files changed, 32 insertions(+), 22 deletions(-) diff --git a/core/busybox/checksums b/core/busybox/checksums index 44caba97..1168bb9d 100644 --- a/core/busybox/checksums +++ b/core/busybox/checksums @@ -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 diff --git a/core/busybox/files/.config b/core/busybox/files/.config index ae496d8e..ecf6c334 100644 --- a/core/busybox/files/.config +++ b/core/busybox/files/.config @@ -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 diff --git a/core/busybox/files/.config-suid b/core/busybox/files/.config-suid index 2489211d..b4e6730a 100644 --- a/core/busybox/files/.config-suid +++ b/core/busybox/files/.config-suid @@ -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 diff --git a/core/busybox/patches/modprobe-kernel-version.patch b/core/busybox/patches/modprobe-kernel-version.patch index 2d4274ad..fb9b1859 100644 --- a/core/busybox/patches/modprobe-kernel-version.patch +++ b/core/busybox/patches/modprobe-kernel-version.patch @@ -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) { diff --git a/core/busybox/sources b/core/busybox/sources index 98daae7b..25b78974 100644 --- a/core/busybox/sources +++ b/core/busybox/sources @@ -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 diff --git a/core/busybox/version b/core/busybox/version index b9c04f8c..311e9969 100644 --- a/core/busybox/version +++ b/core/busybox/version @@ -1 +1 @@ -1.32.0 1 +1.33.0 1 -- cgit v1.2.3 From 526fa67129a6857312cf5fe28254ea17749bd5f7 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Fri, 1 Jan 2021 16:24:00 +0300 Subject: dhcpcd: bump to 9.4.0 --- extra/dhcpcd/checksums | 2 +- extra/dhcpcd/sources | 2 +- extra/dhcpcd/version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extra/dhcpcd/checksums b/extra/dhcpcd/checksums index 8a6ad7fc..49db6548 100644 --- a/extra/dhcpcd/checksums +++ b/extra/dhcpcd/checksums @@ -1,2 +1,2 @@ -fbea5d223e9c2837ea98757d1242db708a42d2e18b12050f9684424390833df4 dhcpcd-9.3.4.tar.gz +9d4165ea6a272f5aba55d421ff0fd88ac0bcfd13845b889b2b9291ea9cfa0031 dhcpcd-9.4.0.tar.gz 533714c2f3edcd70e47822cb880d8e8ffdba673b10452ea808037ec2714a375c dhcpcd.run diff --git a/extra/dhcpcd/sources b/extra/dhcpcd/sources index 3dd3c809..f5f44a0f 100644 --- a/extra/dhcpcd/sources +++ b/extra/dhcpcd/sources @@ -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 diff --git a/extra/dhcpcd/version b/extra/dhcpcd/version index 42192e33..53139a71 100644 --- a/extra/dhcpcd/version +++ b/extra/dhcpcd/version @@ -1 +1 @@ -9.3.4 1 +9.4.0 1 -- cgit v1.2.3 From fc844e534dc4f8f85bd2682170482caa74eb868d Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Fri, 1 Jan 2021 16:24:49 +0300 Subject: git: bump to 2.30.0 --- core/git/checksums | 4 ++-- core/git/sources | 4 ++-- core/git/version | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/git/checksums b/core/git/checksums index 2afd3bab..cd087747 100644 --- a/core/git/checksums +++ b/core/git/checksums @@ -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 diff --git a/core/git/sources b/core/git/sources index 9e78d19c..8e34154c 100644 --- a/core/git/sources +++ b/core/git/sources @@ -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 diff --git a/core/git/version b/core/git/version index 5ca29645..57191ebc 100644 --- a/core/git/version +++ b/core/git/version @@ -1 +1 @@ -2.29.2 1 +2.30.0 1 -- cgit v1.2.3 From 64fec5537767ccb6b84dd2a990eb60b435eeeb90 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Fri, 1 Jan 2021 16:31:17 +0300 Subject: freetype-harfbuzz: bump to 2.10.4+2.7.4 --- extra/freetype-harfbuzz/checksums | 4 ++-- extra/freetype-harfbuzz/sources | 4 ++-- extra/freetype-harfbuzz/version | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extra/freetype-harfbuzz/checksums b/extra/freetype-harfbuzz/checksums index be070b42..2a2d63c4 100644 --- a/extra/freetype-harfbuzz/checksums +++ b/extra/freetype-harfbuzz/checksums @@ -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 diff --git a/extra/freetype-harfbuzz/sources b/extra/freetype-harfbuzz/sources index 8516dc55..cb35a879 100644 --- a/extra/freetype-harfbuzz/sources +++ b/extra/freetype-harfbuzz/sources @@ -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 diff --git a/extra/freetype-harfbuzz/version b/extra/freetype-harfbuzz/version index 8744e2a2..5e087c3c 100644 --- a/extra/freetype-harfbuzz/version +++ b/extra/freetype-harfbuzz/version @@ -1 +1 @@ -2.10.2+2.7.3 1 +2.10.4+2.7.4 1 -- cgit v1.2.3 From f6602306560cdde1a6710d134e69ae09e110b61b Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Fri, 1 Jan 2021 16:51:43 +0300 Subject: harfbuzz-icu: bump to 2.7.4 --- extra/harfbuzz-icu/checksums | 2 +- extra/harfbuzz-icu/sources | 2 +- extra/harfbuzz-icu/version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extra/harfbuzz-icu/checksums b/extra/harfbuzz-icu/checksums index 33ab11b5..51a72952 100644 --- a/extra/harfbuzz-icu/checksums +++ b/extra/harfbuzz-icu/checksums @@ -1 +1 @@ -be01bc2c3f1e8902f31b432131280cdfdf6780b72c2389dd63cfab908f6213f3 2.7.3.tar.gz +daff8a4003ac420a8550760ed303ce33b310c8ea17b7f15b307d1969cabcebcb 2.7.4.tar.gz diff --git a/extra/harfbuzz-icu/sources b/extra/harfbuzz-icu/sources index 0896b244..0c3694d9 100644 --- a/extra/harfbuzz-icu/sources +++ b/extra/harfbuzz-icu/sources @@ -1 +1 @@ -https://github.com/harfbuzz/harfbuzz/archive/2.7.3.tar.gz +https://github.com/harfbuzz/harfbuzz/archive/2.7.4.tar.gz diff --git a/extra/harfbuzz-icu/version b/extra/harfbuzz-icu/version index 0e087dce..27146e36 100644 --- a/extra/harfbuzz-icu/version +++ b/extra/harfbuzz-icu/version @@ -1 +1 @@ -2.7.3 1 +2.7.4 1 -- cgit v1.2.3 From ad6a08016eb298d1ecc33972bbb3f8cf33ce3214 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Fri, 1 Jan 2021 17:24:18 +0300 Subject: libarchive: bump to 3.5.1 --- extra/libarchive/build | 5 ++++- extra/libarchive/checksums | 2 +- extra/libarchive/sources | 2 +- extra/libarchive/version | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/extra/libarchive/build b/extra/libarchive/build index 6e30984c..d069befd 100755 --- a/extra/libarchive/build +++ b/extra/libarchive/build @@ -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" diff --git a/extra/libarchive/checksums b/extra/libarchive/checksums index 4405fe42..fb2b78cb 100644 --- a/extra/libarchive/checksums +++ b/extra/libarchive/checksums @@ -1 +1 @@ -245bff9d17e78986bf9716eb887e3bc731d7fd8e5d04efebb8bb1e1c39a3a354 libarchive-3.5.0.tar.xz +0e17d3a8d0b206018693b27f08029b598f6ef03600c2b5d10c94ce58692e299b libarchive-3.5.1.tar.xz diff --git a/extra/libarchive/sources b/extra/libarchive/sources index e78bf42d..294adc8c 100644 --- a/extra/libarchive/sources +++ b/extra/libarchive/sources @@ -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 diff --git a/extra/libarchive/version b/extra/libarchive/version index ad1efe9a..591d5e43 100644 --- a/extra/libarchive/version +++ b/extra/libarchive/version @@ -1 +1 @@ -3.5.0 1 +3.5.1 1 -- cgit v1.2.3 From 2cb00d1b3393cd913eb5eacad713277635d73014 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Fri, 1 Jan 2021 17:25:51 +0300 Subject: linux-headers: bump to 5.10.4 --- core/linux-headers/checksums | 2 +- core/linux-headers/sources | 2 +- core/linux-headers/version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/linux-headers/checksums b/core/linux-headers/checksums index 777d35b0..c5415de6 100644 --- a/core/linux-headers/checksums +++ b/core/linux-headers/checksums @@ -1 +1 @@ -3b84e13abae26af17ebccc4d7212f5843a991127a73a320848d5c6942ef781a2 linux-5.10.2.tar.xz +904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec linux-5.10.4.tar.xz diff --git a/core/linux-headers/sources b/core/linux-headers/sources index efb5af0d..f7941a36 100644 --- a/core/linux-headers/sources +++ b/core/linux-headers/sources @@ -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 diff --git a/core/linux-headers/version b/core/linux-headers/version index e9ed34a6..3f7bb522 100644 --- a/core/linux-headers/version +++ b/core/linux-headers/version @@ -1 +1 @@ -5.10.2 1 +5.10.4 1 -- cgit v1.2.3 From 3e0371f0693ffebe31f7b93913f1e1456430baba Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Fri, 1 Jan 2021 22:15:26 +0300 Subject: shared-mime-info: bump to 2.1 --- extra/shared-mime-info/build | 11 ++++------- extra/shared-mime-info/checksums | 2 +- extra/shared-mime-info/post-install | 4 ++++ extra/shared-mime-info/sources | 2 +- extra/shared-mime-info/version | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/extra/shared-mime-info/build b/extra/shared-mime-info/build index d69c0330..c2b41d9d 100755 --- a/extra/shared-mime-info/build +++ b/extra/shared-mime-info/build @@ -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. diff --git a/extra/shared-mime-info/checksums b/extra/shared-mime-info/checksums index 2a502c63..7b8bf18b 100644 --- a/extra/shared-mime-info/checksums +++ b/extra/shared-mime-info/checksums @@ -1 +1 @@ -23c1cb7919f31cf97aeb5225548f75705f706aa5cc7d1c4c503364bcc8681e06 shared-mime-info-2.0.tar.xz +b2d40cfcdd84e835d0f2c9107b3f3e77e9cf912f858171fe779946da634e8563 shared-mime-info-2.1.tar.xz diff --git a/extra/shared-mime-info/post-install b/extra/shared-mime-info/post-install index e9dffaad..646ccda3 100755 --- a/extra/shared-mime-info/post-install +++ b/extra/shared-mime-info/post-install @@ -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 diff --git a/extra/shared-mime-info/sources b/extra/shared-mime-info/sources index a865d4d3..858173cd 100644 --- a/extra/shared-mime-info/sources +++ b/extra/shared-mime-info/sources @@ -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 diff --git a/extra/shared-mime-info/version b/extra/shared-mime-info/version index 8c676773..1fedb862 100644 --- a/extra/shared-mime-info/version +++ b/extra/shared-mime-info/version @@ -1 +1 @@ -2.0 1 +2.1 1 -- cgit v1.2.3 From 291967935394b463e3ec9242cadaa2030456b303 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Sat, 2 Jan 2021 00:38:29 +0300 Subject: go: remove bash dependency --- extra/go/build | 7 +++- extra/go/checksums | 1 + extra/go/depends | 1 - extra/go/patches/no-bash.patch | 86 ++++++++++++++++++++++++++++++++++++++++++ extra/go/sources | 1 + 5 files changed, 93 insertions(+), 3 deletions(-) delete mode 100644 extra/go/depends create mode 100644 extra/go/patches/no-bash.patch diff --git a/extra/go/build b/extra/go/build index bb6ce565..c051bc2d 100755 --- a/extra/go/build +++ b/extra/go/build @@ -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" diff --git a/extra/go/checksums b/extra/go/checksums index 61b37873..d225b66f 100644 --- a/extra/go/checksums +++ b/extra/go/checksums @@ -1,2 +1,3 @@ 890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817 go1.15.6.src.tar.gz f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52 go1.4-bootstrap-20171003.tar.gz +4166a929288658d8fb2978bab24c1b5a0a8b8996122058c97e207da79db75b92 no-bash.patch diff --git a/extra/go/depends b/extra/go/depends deleted file mode 100644 index 82a3ccad..00000000 --- a/extra/go/depends +++ /dev/null @@ -1 +0,0 @@ -bash make diff --git a/extra/go/patches/no-bash.patch b/extra/go/patches/no-bash.patch new file mode 100644 index 00000000..a1130c0b --- /dev/null +++ b/extra/go/patches/no-bash.patch @@ -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. diff --git a/extra/go/sources b/extra/go/sources index ebcc0562..9de4bc5c 100644 --- a/extra/go/sources +++ b/extra/go/sources @@ -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 -- cgit v1.2.3 From 8224ddac223b3e994b99a6338a492e26157e1aaa Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Sat, 2 Jan 2021 03:16:37 +0300 Subject: meta: update license years --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 0203dc93..15a04627 100644 --- a/LICENSE +++ b/LICENSE @@ -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 -- cgit v1.2.3 From c1677297e7977cfa5f5ecae32a752839591ed78a Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Sat, 2 Jan 2021 03:17:34 +0300 Subject: tzdata: bump to 2020f --- extra/tzdata/checksums | 2 +- extra/tzdata/sources | 2 +- extra/tzdata/version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extra/tzdata/checksums b/extra/tzdata/checksums index 341b6dde..f44b905a 100644 --- a/extra/tzdata/checksums +++ b/extra/tzdata/checksums @@ -1 +1 @@ -5a8d69e9d998156bcebb5b7eabf7c2541b2ba39740b3e838a04fd6b8e67c5d35 2020e.tar.gz +e53b70c3ed8597a081e2c12ec049802433b5e022d3d20db4e8bda80d760d7cee 2020f.tar.gz diff --git a/extra/tzdata/sources b/extra/tzdata/sources index 3f9358ca..d802c18f 100644 --- a/extra/tzdata/sources +++ b/extra/tzdata/sources @@ -1 +1 @@ -https://github.com/eggert/tz/archive/2020e.tar.gz +https://github.com/eggert/tz/archive/2020f.tar.gz diff --git a/extra/tzdata/version b/extra/tzdata/version index beeb22a4..7241ed22 100644 --- a/extra/tzdata/version +++ b/extra/tzdata/version @@ -1 +1 @@ -2020e 1 +2020f 1 -- cgit v1.2.3