Merge branch 'master' of github.com:dylanaraps/kiss-experiment

2024-07-07 16:32:28 +00:00 · 2019-07-06 09:51:39 +03:00 · 2019-07-06 09:51:39 +03:00 · c753432ad9
commit c753432ad9
parent a313b63c82 f53c853a41
31 changed files with 57 additions and 35 deletions
--- a/core/busybox/build
+++ b/core/busybox/build
@ -10,8 +10,6 @@ cp -a _install/. "$1"
 install -Dm755 acpid.run "$1/etc/sv/acpid/run"
 install -Dm755 crond.run "$1/etc/sv/crond/run"
 install -Dm755 syslogd.run "$1/etc/sv/syslogd/run"
-install -Dm755 udhcpc.run "$1/etc/sv/udhcpc/run"
 ln -s /run/runit/supervise.acpid "$1/etc/sv/acpid/supervise"
 ln -s /run/runit/supervise.crond "$1/etc/sv/crond/supervise"
 ln -s /run/runit/supervise.syslogd "$1/etc/sv/syslogd/supervise"
-ln -s /run/runit/supervise.udhcpc "$1/etc/sv/udhcpc/supervise"
--- a/core/busybox/checksums
+++ b/core/busybox/checksums
@ -3,4 +3,3 @@
 6c3eb5cf839c7a31c337df0cd8388b397e1415ffa7a63e9678552c9c63dd869f  acpid.run
 814dea14ac612125e97dcc1d619219b2c9dfc14850bf48d858421fb2c98eca12  crond.run
 4a5981f4b0d791fe9b84b0b2e01ae905f6565c8245b3cd603e6decf34ddad71a  syslogd.run
-58574c81fba16d1c50972b9b6df23615ff31a4034c30c51585cb97000fb66f76  udhcpc.run
--- a/core/busybox/files/udhcpc.run
+++ b/core/busybox/files/udhcpc.run
@ -1,2 +0,0 @@
-#!/bin/sh
-exec udhcpc -f 1>&2
--- a/core/busybox/sources
+++ b/core/busybox/sources
@ -3,4 +3,3 @@ files/.config
 files/acpid.run
 files/crond.run
 files/syslogd.run
-files/udhcpc.run
--- a/core/busybox/version
+++ b/core/busybox/version
@ -1 +1 @@
-1.30.1 3
+1.30.1 4
--- a/core/curl/checksums
+++ b/core/curl/checksums
@ -1 +1 @@
-2f2f13fa34d44aa29cb444077ad7dc4dc6d189584ad552e0aaeb06e608af6001  curl-7.64.0.tar.xz
+f6c22074877f235aebc7c53057dbc7ee82358f8ae58bfb767e955c18c859a77a  curl-7.65.1.tar.xz
--- a/core/curl/sources
+++ b/core/curl/sources
@ -1 +1 @@
-https://curl.haxx.se/download/curl-7.64.0.tar.xz
+https://curl.haxx.se/download/curl-7.65.1.tar.xz
--- a/core/curl/version
+++ b/core/curl/version
@ -1 +1 @@
-7.64.0 1
+7.65.1 1
--- a/core/gcc/checksums
+++ b/core/gcc/checksums
@ -1,2 +1,2 @@
-64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c  gcc-8.3.0.tar.xz
+79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0  gcc-9.1.0.tar.xz
 765614b3396d70bca3fa0ae4a813632486c6dca320e2bd13c8c39dca52be4a4c  c99
--- a/core/gcc/sources
+++ b/core/gcc/sources
@ -1,2 +1,2 @@
-https://gcc.gnu.org/pub/gcc/releases/gcc-8.3.0/gcc-8.3.0.tar.xz gcc
+https://gcc.gnu.org/pub/gcc/releases/gcc-9.1.0/gcc-9.1.0.tar.xz gcc
 files/c99
--- a/core/gcc/version
+++ b/core/gcc/version
@ -1 +1 @@
-8.3.0 1
+9.1.0 1
--- a/core/git/checksums
+++ b/core/git/checksums
@ -1,2 +1,2 @@
-8ccb1ce743ee991d91697e163c47c11be4bf81efbdd9fb0b4a7ad77cc0020d28  git-2.21.0.tar.xz
+159e4b599f8af4612e70b666600a3139541f8bacc18124daf2cbe8d1b934f29f  git-2.22.0.tar.xz
 d2cd72aa92876460858add3bcf319de814ea82059aeeab00f3cf2299e5977eb9  config.mak
--- a/core/git/sources
+++ b/core/git/sources
@ -1,2 +1,2 @@
-https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.21.0.tar.xz
+https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.22.0.tar.xz
 files/config.mak
--- a/core/git/version
+++ b/core/git/version
@ -1 +1 @@
-2.21.0 1
+2.22.0 1
--- a/core/libressl/build
+++ b/core/libressl/build
@ -1,5 +1,7 @@
 #!/bin/sh -e

+patch -p0 < getprogname-musl.patch
+
 ./configure \
    --prefix=/usr \
    --sysconfdir=/etc
--- a/core/libressl/checksums
+++ b/core/libressl/checksums
@ -1 +1,2 @@
-39e4dd856694dc10d564201e4549c46d2431601a2b10f3422507e24ccc8f62f8  libressl-2.9.1.tar.gz
+c4c78167fae325b47aebd8beb54b6041d6f6a56b3743f4bd5d79b15642f9d5d4  libressl-2.9.2.tar.gz
+b532a1587c6ba73f905db5021a4c6032d821b2e8b94155f762df250f8a6de811  getprogname-musl.patch
--- a/core/libressl/patches/getprogname-musl.patch
+++ b/core/libressl/patches/getprogname-musl.patch
@ -0,0 +1,28 @@
+From a747aacc23607c993cc481378782b2c7dd5bc53b Mon Sep 17 00:00:00 2001
+From: Ishimoto Shinobu <47295761+protonesso@users.noreply.github.com>
+Date: Tue, 21 May 2019 22:41:05 +0900
+Subject: [PATCH 1/4] avoid glibc
+
+cause problems on musl systems
+---
+ crypto/compat/getprogname_linux.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/crypto/compat/getprogname_linux.c b/crypto/compat/getprogname_linux.c
+index 2c89743..4e7e31f 100644
+--- crypto/compat/getprogname_linux.c
+++ crypto/compat/getprogname_linux.c
+@@ -26,9 +26,7 @@ getprogname(void)
+ #if defined(__ANDROID_API__) && __ANDROID_API__ < 21
+ 	extern const char *__progname;
+ 	return __progname;
+-#elif defined(__GLIBC__)
+-	return program_invocation_short_name;
+ #else
+-#error "Cannot emulate getprogname"
+	return program_invocation_short_name;
+ #endif
+ }
+-- 
+2.21.0
+
--- a/core/libressl/sources
+++ b/core/libressl/sources
@ -1 +1,2 @@
-https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.9.1.tar.gz
+https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.9.2.tar.gz
+patches/getprogname-musl.patch
--- a/core/libressl/version
+++ b/core/libressl/version
@ -1 +1 @@
-2.9.1 1
+2.9.2 1
--- a/core/linux-headers/checksums
+++ b/core/linux-headers/checksums
@ -1,2 +1 @@
-43bfea3a6b24b4e5f63190409a199bee8cb93dbea01c52ad7f017078ebdf7c9b  linux-5.0.2.tar.xz
-2715d463b92bd629da579661e3a2a19c0b87f31083bc60b7e33c380293fe10a4  patch-5.0.2.xz
+8a3e55be3e788700836db6f75875b4d3b824a581d1eacfc2fcd29ed4e727ba3e  linux-5.1.16.tar.xz
--- a/core/linux-headers/sources
+++ b/core/linux-headers/sources
@ -1,2 +1 @@
-https://kernel.org/pub/linux/kernel/v5.x/linux-5.0.2.tar.xz
-https://kernel.org/pub/linux/kernel/v5.x/patch-5.0.2.xz
+https://kernel.org/pub/linux/kernel/v5.x/linux-5.1.16.tar.xz
--- a/core/linux-headers/version
+++ b/core/linux-headers/version
@ -1 +1 @@
-5.0.2 1
+5.1.16 1
--- a/core/linux/checksums
+++ b/core/linux/checksums
@ -1,2 +1 @@
-43bfea3a6b24b4e5f63190409a199bee8cb93dbea01c52ad7f017078ebdf7c9b  linux-5.0.2.tar.xz
-2715d463b92bd629da579661e3a2a19c0b87f31083bc60b7e33c380293fe10a4  patch-5.0.2.xz
+8a3e55be3e788700836db6f75875b4d3b824a581d1eacfc2fcd29ed4e727ba3e  linux-5.1.16.tar.xz
--- a/core/linux/sources
+++ b/core/linux/sources
@ -1,2 +1 @@
-https://kernel.org/pub/linux/kernel/v5.x/linux-5.0.2.tar.xz
-https://kernel.org/pub/linux/kernel/v5.x/patch-5.0.2.xz
+https://kernel.org/pub/linux/kernel/v5.x/linux-5.1.16.tar.xz
--- a/core/linux/version
+++ b/core/linux/version
@ -1 +1 @@
-5.0.2 2
+5.1.16 1
--- a/core/perl/checksums
+++ b/core/perl/checksums
@ -1 +1 @@
-3ebf85fe65df2ee165b22596540b7d5d42f84d4b72d84834f74e2e0b8956c347  perl-5.28.1.tar.gz
+851213c754d98ccff042caa40ba7a796b2cee88c5325f121be5cbb61bbf975f2  perl-5.30.0.tar.gz
--- a/core/perl/sources
+++ b/core/perl/sources
@ -1 +1 @@
-https://www.cpan.org/src/5.0/perl-5.28.1.tar.gz
+https://www.cpan.org/src/5.0/perl-5.30.0.tar.gz
--- a/core/perl/version
+++ b/core/perl/version
@ -1 +1 @@
-5.28.1 1
+5.30.0 1
--- a/core/pkgconf/checksums
+++ b/core/pkgconf/checksums
@ -1 +1 @@
-7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f  pkgconf-0.9.12.tar.bz2
+22b9ee38438901f9d60f180e5182821180854fa738fd071f593ea26a81da208c  pkgconf-1.6.1.tar.xz
--- a/core/pkgconf/sources
+++ b/core/pkgconf/sources
@ -1 +1 @@
-https://distfiles.dereferenced.org/pkgconf/pkgconf-0.9.12.tar.bz2
+https://distfiles.dereferenced.org/pkgconf/pkgconf-1.6.1.tar.xz
--- a/core/pkgconf/version
+++ b/core/pkgconf/version
@ -1 +1 @@
-0.9.12 1
+1.6.1 1
 @ -1 +1 @@
 .30.1 3
 .30.1 4
 @ -1 +1 @@
 .64.0 1
 .65.1 1
 @ -1 +1 @@
 .3.0 1
 .1.0 1
 @ -1 +1 @@
 .21.0 1
 .22.0 1
 @ -1 +1 @@
 .9.1 1
 .9.2 1
 @ -1 +1 @@
 .0.2 1
 .1.16 1
 @ -1 +1 @@
 .0.2 2
 .1.16 1
 @ -1 +1 @@
 .28.1 1
 .30.0 1
 @ -1 +1 @@
 .9.12 1
 .6.1 1