diff options
Diffstat (limited to 'system')
28 files changed, 140 insertions, 502 deletions
diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD index 7e4693246..ff09dbd2f 100644 --- a/system/abuild/APKBUILD +++ b/system/abuild/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=abuild pkgver=3.3.1 -pkgrel=0 +pkgrel=1 pkgdesc="Script to build APK packages" url="https://code.foxkit.us/adelie/aports" arch="all" @@ -18,9 +18,15 @@ install="$pkgname.pre-install $pkgname.pre-upgrade" subpackages="abuild-rootbld:_rootbld:noarch $pkgname-doc" options="suid !check" pkggroups="abuild" -source="https://distfiles.adelielinux.org/source/abuild-$pkgver+adelie.tar.xz" +source="https://distfiles.adelielinux.org/source/abuild-$pkgver+adelie.tar.xz + keyhole.patch + " builddir="$srcdir/$pkgname-$pkgver+adelie" +# secfixes: +# 3.3.1-r1: +# - CVE-2019-12875 + prepare() { default_prepare @@ -53,4 +59,5 @@ _rootbld() { mkdir -p "$subpkgdir" } -sha512sums="c358f84d198527eeeac1a1aacc101174e18f9f34f692b12a4e4deb6b32d5f3ebdc703c90de6a6f81f195a81eebb90a11f9bfea13ef5db531d9b5d5ae6ecd6a66 abuild-3.3.1+adelie.tar.xz" +sha512sums="c358f84d198527eeeac1a1aacc101174e18f9f34f692b12a4e4deb6b32d5f3ebdc703c90de6a6f81f195a81eebb90a11f9bfea13ef5db531d9b5d5ae6ecd6a66 abuild-3.3.1+adelie.tar.xz +757d750d4b5c88bf00774b64f2b93a9461e03f284d9423dc58c581e1309f276628de3114fcb510afd7c3cd55ceb721c1278e42756977c97ebe2597207805318d keyhole.patch" diff --git a/system/abuild/keyhole.patch b/system/abuild/keyhole.patch new file mode 100644 index 000000000..206bd6c2e --- /dev/null +++ b/system/abuild/keyhole.patch @@ -0,0 +1,72 @@ +From 4f90ce92778d0ee302e288def75591b96a397c8b Mon Sep 17 00:00:00 2001 +From: Max Rees <maxcrees@me.com> +Date: Thu, 13 Jun 2019 23:19:54 -0400 +Subject: [PATCH] abuild-sudo: don't allow --keys-dir + +Not allowing --allow-untrusted is obviously a good idea, but it can be +trivially bypassed if --keys-dir is allowed: + +$ abuild-apk add foo-1-r0.apk +ERROR: foo-1-r0.apk: UNTRUSTED signature +$ abuild-apk --allow-untrusted add foo-1-r0.apk +abuild-apk: --allow-untrusted: not allowed option +$ cp -rp /etc/apk/keys /tmp/keys +$ cp untrusted.pub /tmp/keys +$ abuild-apk --keys-dir /tmp/keys add foo-1-r0.apk +(1/1) Installing foo (1-r0) +OK: 4319 MiB in 806 packages + +If both --allow-untrusted and --keys-dir are not allowed, then it should +no longer be possible for an unprivileged member of the abuild group to +add an untrusted package. + +$ abuild-apk --keys-dir /tmp/keys add foo-1-r0.apk +abuild-apk: --keys-dir: not allowed option +--- + abuild-sudo.c | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +diff --git a/abuild-sudo.c b/abuild-sudo.c +index 80ceb8d7dd..12d64f13fd 100644 +--- a/abuild-sudo.c ++++ b/abuild-sudo.c +@@ -32,6 +32,12 @@ static const char* valid_cmds[] = { + NULL + }; + ++static const char* invalid_opts[] = { ++ "--allow-untrusted", ++ "--keys-dir", ++ NULL, ++}; ++ + const char *get_command_path(const char *cmd) + { + const char *p; +@@ -46,6 +52,14 @@ const char *get_command_path(const char *cmd) + return NULL; + } + ++void check_option(const char *opt) ++{ ++ int i; ++ for (i = 0; invalid_opts[i] != NULL; i++) ++ if (strcmp(opt, invalid_opts[i]) == 0) ++ errx(1, "%s: not allowed option", opt); ++} ++ + int is_in_group(gid_t group) + { + int ngroups_max = sysconf(_SC_NGROUPS_MAX) + 1; +@@ -105,10 +119,8 @@ int main(int argc, const char *argv[]) + if (path == NULL) + errx(1, "%s: Not a valid subcommand", cmd); + +- /* we dont allow --allow-untrusted option */ + for (i = 1; i < argc; i++) +- if (strcmp(argv[i], "--allow-untrusted") == 0) +- errx(1, "%s: not allowed option", "--allow-untrusted"); ++ check_option(argv[i]); + + argv[0] = path; + /* set our uid to root so bbsuid --install works */ diff --git a/system/bc/APKBUILD b/system/bc/APKBUILD index 9b3f34b01..fc3f33d75 100644 --- a/system/bc/APKBUILD +++ b/system/bc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bc -pkgver=2.0.0 +pkgver=2.0.3 pkgrel=0 pkgdesc="An arbitrary precision numeric processing language (calculator)" url="https://github.com/gavinhoward/bc" @@ -26,4 +26,4 @@ package() { make install } -sha512sums="183cec17ed5020e673abb886eb1f391f8a97ac37a67ca63bb00d8b4c8e52ba0e502f7f813d5b4abf650b0fd0dc74a7e8a7a752faf8a47bd7a8014fd4703bca05 bc-2.0.0.tar.xz" +sha512sums="1eabc44a33c08e1cc20c7112843e18544860dc8621cf655c2453858d64b720cada4835ab6142110f296c4d6ad82e77725e603fd11b84b61b073efccc9f6a1c45 bc-2.0.3.tar.xz" diff --git a/system/cmake/APKBUILD b/system/cmake/APKBUILD index 5fb979ffe..8473fb2a6 100644 --- a/system/cmake/APKBUILD +++ b/system/cmake/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cmake -pkgver=3.14.3 +pkgver=3.14.5 pkgrel=0 pkgdesc="Cross-platform build system" url="https://cmake.org" @@ -51,4 +51,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e257a96334f21f2b2f17e8d43aa32c2b069d13194604393c5ac9d3da193000d5328181c6cf861696186d022aba57679ee2d08073d8a7112727746b2b145a47e2 cmake-3.14.3.tar.gz" +sha512sums="9acd2de17db86052801194cac570bfc104320c249b83058aa59554b42c3d5af9c9293d1c069f3fe8512a80103d511186d840168cbc190ce9584ca99cb9b11e46 cmake-3.14.5.tar.gz" diff --git a/system/easy-kernel-power8-64k/APKBUILD b/system/easy-kernel-power8-64k/APKBUILD index 267c3bbcb..2dd9118a9 100644 --- a/system/easy-kernel-power8-64k/APKBUILD +++ b/system/easy-kernel-power8-64k/APKBUILD @@ -3,8 +3,8 @@ # KEEP THIS IN SYNC with the other easy-kernel packages. _kflavour=-power8-64k _pkgname=easy-kernel$_kflavour -pkgver=4.14.88 -pkgrel=13 +pkgver=4.14.127 +pkgrel=14 pkgname=$_pkgname-$pkgver-mc$pkgrel pkgdesc="The Linux kernel, packaged for POWER8 and POWER9 computers (with 64K page size)" url="https://kernel.org/" @@ -23,8 +23,6 @@ source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgmin https://distfiles.adelielinux.org/source/linux-${_pkgminver}-mc$pkgrel.patch.xz ast-endianness.patch config-ppc64 - futex-cmpxchg.patch - ppc64-epapr-gcc8.patch " builddir="$srcdir/linux-${_pkgminver}" @@ -91,8 +89,6 @@ src() { } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -bfe606f208894cc572fb98f323e26956c69b4f75febd4a9b500514cbb2aa70bddb2aba05b3f16a5fe52535236b215335f73974324065f80643265f17f281faa6 linux-4.14-mc13.patch.xz +48e0a55cf5b91d0a7e91f950b60afeedc624d7c063b481ce8a13b6362db717171daaeabfaa2de4d9e47b22ef808a6a095b240a61f2b790738d4f6b08aaac9738 linux-4.14-mc14.patch.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch -85bbbd98e7158213c05463832f133d3f359976e90cbb173c6037e404e9652f1c88ef30ea63bd86b5b2102c0f63023742fa0f915a54b9690c0d97e92432a52b6d config-ppc64 -64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch -0df4e823e19e8fc379b5ad66192eb3e890daa3dac8d7a9ebbab4cf3c60ce9f15fcc25a54b86b341db53db3d78c928ca5f55933e12eee75680e705cca8a7bdff4 ppc64-epapr-gcc8.patch" +bbc4301d1d737250f3539594ceccc29cc212947f47f1c9b50a9598977820f03750d9136e4ae9a0a6a3ec49b04d2ee14cb9c11ba99ac6a418f737843ce4b6ee93 config-ppc64" diff --git a/system/easy-kernel-power8-64k/config-ppc64 b/system/easy-kernel-power8-64k/config-ppc64 index 5cdaeeca6..cb2f07c03 100644 --- a/system/easy-kernel-power8-64k/config-ppc64 +++ b/system/easy-kernel-power8-64k/config-ppc64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.14.88-mc13 Kernel Configuration +# Linux/powerpc 4.14.127-mc14 Kernel Configuration # CONFIG_PPC64=y @@ -53,6 +53,7 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_HAS_DMA_SET_COHERENT_MASK=y CONFIG_PPC=y +CONFIG_PPC_BARRIER_NOSPEC=y # CONFIG_GENERIC_CSUM is not set CONFIG_EARLY_PRINTK=y CONFIG_PANIC_TIMEOUT=180 @@ -2055,6 +2056,7 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_N_GSM is not set # CONFIG_TRACE_SINK is not set # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -2105,7 +2107,6 @@ CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_VIRTIO=m CONFIG_HW_RANDOM_PSERIES=m CONFIG_HW_RANDOM_POWERNV=m -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set CONFIG_RAW_DRIVER=y CONFIG_MAX_RAW_DEVS=256 @@ -4002,6 +4003,7 @@ CONFIG_SUNRPC_GSS=y # CONFIG_CEPH_FS is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_UPCALL is not set # CONFIG_CIFS_XATTR is not set diff --git a/system/easy-kernel-power8-64k/futex-cmpxchg.patch b/system/easy-kernel-power8-64k/futex-cmpxchg.patch deleted file mode 100644 index 9e2aabfb7..000000000 --- a/system/easy-kernel-power8-64k/futex-cmpxchg.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig -index 9f2b75f..d75d8ea 100644 ---- a/arch/powerpc/Kconfig -+++ b/arch/powerpc/Kconfig -@@ -190,6 +190,7 @@ config PPC - select HAVE_FTRACE_MCOUNT_RECORD - select HAVE_FUNCTION_GRAPH_TRACER - select HAVE_FUNCTION_TRACER -+ select HAVE_FUTEX_CMPXCHG if FUTEX - select HAVE_GCC_PLUGINS - select HAVE_GENERIC_GUP - select HAVE_HW_BREAKPOINT if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx) diff --git a/system/easy-kernel-power8-64k/ppc64-epapr-gcc8.patch b/system/easy-kernel-power8-64k/ppc64-epapr-gcc8.patch deleted file mode 100644 index 192e83845..000000000 --- a/system/easy-kernel-power8-64k/ppc64-epapr-gcc8.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 186b8f1587c79c2fa04bfa392fdf084443e398c1 Mon Sep 17 00:00:00 2001 -From: Seth Forshee <seth.forshee@canonical.com> -Date: Thu, 28 Sep 2017 09:33:39 -0400 -Subject: powerpc: Always initialize input array when calling epapr_hypercall() - -Several callers to epapr_hypercall() pass an uninitialized stack -allocated array for the input arguments, presumably because they -have no input arguments. However this can produce errors like -this one - - arch/powerpc/include/asm/epapr_hcalls.h:470:42: error: 'in' may be used uninitialized in this function [-Werror=maybe-uninitialized] - unsigned long register r3 asm("r3") = in[0]; - ~~^~~ - -Fix callers to this function to always zero-initialize the input -arguments array to prevent this. - -Signed-off-by: Seth Forshee <seth.forshee@canonical.com> -Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> ---- - arch/powerpc/include/asm/epapr_hcalls.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/arch/powerpc/include/asm/epapr_hcalls.h b/arch/powerpc/include/asm/epapr_hcalls.h -index 334459ad145b..90863245df53 100644 ---- a/arch/powerpc/include/asm/epapr_hcalls.h -+++ b/arch/powerpc/include/asm/epapr_hcalls.h -@@ -508,7 +508,7 @@ static unsigned long epapr_hypercall(unsigned long *in, - - static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - unsigned long r; - -@@ -520,7 +520,7 @@ static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2) - - static inline long epapr_hypercall0(unsigned int nr) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - return epapr_hypercall(in, out, nr); -@@ -528,7 +528,7 @@ static inline long epapr_hypercall0(unsigned int nr) - - static inline long epapr_hypercall1(unsigned int nr, unsigned long p1) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - in[0] = p1; -@@ -538,7 +538,7 @@ static inline long epapr_hypercall1(unsigned int nr, unsigned long p1) - static inline long epapr_hypercall2(unsigned int nr, unsigned long p1, - unsigned long p2) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - in[0] = p1; -@@ -549,7 +549,7 @@ static inline long epapr_hypercall2(unsigned int nr, unsigned long p1, - static inline long epapr_hypercall3(unsigned int nr, unsigned long p1, - unsigned long p2, unsigned long p3) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - in[0] = p1; -@@ -562,7 +562,7 @@ static inline long epapr_hypercall4(unsigned int nr, unsigned long p1, - unsigned long p2, unsigned long p3, - unsigned long p4) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - in[0] = p1; --- -cgit 1.2-0.3.lf.el7 - diff --git a/system/easy-kernel-power8/APKBUILD b/system/easy-kernel-power8/APKBUILD index fbaec6134..abcbbdc7a 100644 --- a/system/easy-kernel-power8/APKBUILD +++ b/system/easy-kernel-power8/APKBUILD @@ -3,8 +3,8 @@ # KEEP THIS IN SYNC with the other easy-kernel packages. _kflavour=-power8 _pkgname=easy-kernel$_kflavour -pkgver=4.14.88 -pkgrel=13 +pkgver=4.14.127 +pkgrel=14 pkgname=$_pkgname-$pkgver-mc$pkgrel pkgdesc="The Linux kernel, packaged for POWER8 and POWER9 computers" url="https://kernel.org/" @@ -23,8 +23,6 @@ source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgmin https://distfiles.adelielinux.org/source/linux-${_pkgminver}-mc$pkgrel.patch.xz ast-endianness.patch config-ppc64 - futex-cmpxchg.patch - ppc64-epapr-gcc8.patch " builddir="$srcdir/linux-${_pkgminver}" @@ -91,8 +89,6 @@ src() { } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -bfe606f208894cc572fb98f323e26956c69b4f75febd4a9b500514cbb2aa70bddb2aba05b3f16a5fe52535236b215335f73974324065f80643265f17f281faa6 linux-4.14-mc13.patch.xz +48e0a55cf5b91d0a7e91f950b60afeedc624d7c063b481ce8a13b6362db717171daaeabfaa2de4d9e47b22ef808a6a095b240a61f2b790738d4f6b08aaac9738 linux-4.14-mc14.patch.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch -eae009c8ca87041d3daa000c406196564ff4773186fa69fb3d85f63739093f6ef1cd42dc441561cf6af64ae8a375fc747fbb82a13f389a98b50d066cc6613e4f config-ppc64 -64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch -0df4e823e19e8fc379b5ad66192eb3e890daa3dac8d7a9ebbab4cf3c60ce9f15fcc25a54b86b341db53db3d78c928ca5f55933e12eee75680e705cca8a7bdff4 ppc64-epapr-gcc8.patch" +2e2c4873ef3ecbb4f593c3e6771f5ba3fa80a12c5feda9129044eb94209a26ed093cc78ffda01455acf80860e7c3e8aa353c08f1b3ba2addd46f9772370e7b5c config-ppc64" diff --git a/system/easy-kernel-power8/config-ppc64 b/system/easy-kernel-power8/config-ppc64 index a25fdbec3..48cf1c915 100644 --- a/system/easy-kernel-power8/config-ppc64 +++ b/system/easy-kernel-power8/config-ppc64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.14.88-mc13 Kernel Configuration +# Linux/powerpc 4.14.127-mc14 Kernel Configuration # CONFIG_PPC64=y @@ -53,6 +53,7 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_HAS_DMA_SET_COHERENT_MASK=y CONFIG_PPC=y +CONFIG_PPC_BARRIER_NOSPEC=y # CONFIG_GENERIC_CSUM is not set CONFIG_EARLY_PRINTK=y CONFIG_PANIC_TIMEOUT=180 @@ -2054,6 +2055,7 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_N_GSM is not set # CONFIG_TRACE_SINK is not set # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -2104,7 +2106,6 @@ CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_VIRTIO=m CONFIG_HW_RANDOM_PSERIES=m CONFIG_HW_RANDOM_POWERNV=m -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set CONFIG_RAW_DRIVER=y CONFIG_MAX_RAW_DEVS=256 @@ -4001,6 +4002,7 @@ CONFIG_SUNRPC_GSS=y # CONFIG_CEPH_FS is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_UPCALL is not set # CONFIG_CIFS_XATTR is not set diff --git a/system/easy-kernel-power8/futex-cmpxchg.patch b/system/easy-kernel-power8/futex-cmpxchg.patch deleted file mode 100644 index 9e2aabfb7..000000000 --- a/system/easy-kernel-power8/futex-cmpxchg.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig -index 9f2b75f..d75d8ea 100644 ---- a/arch/powerpc/Kconfig -+++ b/arch/powerpc/Kconfig -@@ -190,6 +190,7 @@ config PPC - select HAVE_FTRACE_MCOUNT_RECORD - select HAVE_FUNCTION_GRAPH_TRACER - select HAVE_FUNCTION_TRACER -+ select HAVE_FUTEX_CMPXCHG if FUTEX - select HAVE_GCC_PLUGINS - select HAVE_GENERIC_GUP - select HAVE_HW_BREAKPOINT if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx) diff --git a/system/easy-kernel-power8/ppc64-epapr-gcc8.patch b/system/easy-kernel-power8/ppc64-epapr-gcc8.patch deleted file mode 100644 index 192e83845..000000000 --- a/system/easy-kernel-power8/ppc64-epapr-gcc8.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 186b8f1587c79c2fa04bfa392fdf084443e398c1 Mon Sep 17 00:00:00 2001 -From: Seth Forshee <seth.forshee@canonical.com> -Date: Thu, 28 Sep 2017 09:33:39 -0400 -Subject: powerpc: Always initialize input array when calling epapr_hypercall() - -Several callers to epapr_hypercall() pass an uninitialized stack -allocated array for the input arguments, presumably because they -have no input arguments. However this can produce errors like -this one - - arch/powerpc/include/asm/epapr_hcalls.h:470:42: error: 'in' may be used uninitialized in this function [-Werror=maybe-uninitialized] - unsigned long register r3 asm("r3") = in[0]; - ~~^~~ - -Fix callers to this function to always zero-initialize the input -arguments array to prevent this. - -Signed-off-by: Seth Forshee <seth.forshee@canonical.com> -Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> ---- - arch/powerpc/include/asm/epapr_hcalls.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/arch/powerpc/include/asm/epapr_hcalls.h b/arch/powerpc/include/asm/epapr_hcalls.h -index 334459ad145b..90863245df53 100644 ---- a/arch/powerpc/include/asm/epapr_hcalls.h -+++ b/arch/powerpc/include/asm/epapr_hcalls.h -@@ -508,7 +508,7 @@ static unsigned long epapr_hypercall(unsigned long *in, - - static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - unsigned long r; - -@@ -520,7 +520,7 @@ static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2) - - static inline long epapr_hypercall0(unsigned int nr) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - return epapr_hypercall(in, out, nr); -@@ -528,7 +528,7 @@ static inline long epapr_hypercall0(unsigned int nr) - - static inline long epapr_hypercall1(unsigned int nr, unsigned long p1) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - in[0] = p1; -@@ -538,7 +538,7 @@ static inline long epapr_hypercall1(unsigned int nr, unsigned long p1) - static inline long epapr_hypercall2(unsigned int nr, unsigned long p1, - unsigned long p2) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - in[0] = p1; -@@ -549,7 +549,7 @@ static inline long epapr_hypercall2(unsigned int nr, unsigned long p1, - static inline long epapr_hypercall3(unsigned int nr, unsigned long p1, - unsigned long p2, unsigned long p3) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - in[0] = p1; -@@ -562,7 +562,7 @@ static inline long epapr_hypercall4(unsigned int nr, unsigned long p1, - unsigned long p2, unsigned long p3, - unsigned long p4) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - in[0] = p1; --- -cgit 1.2-0.3.lf.el7 - diff --git a/system/easy-kernel/0502-muqss-smt-fix.patch b/system/easy-kernel/0502-muqss-smt-fix.patch deleted file mode 100644 index 090b176a4..000000000 --- a/system/easy-kernel/0502-muqss-smt-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur --no-dereference linux-4.14-mc13/kernel/sched/MuQSS.c linux-4.14-muqss-resync/kernel/sched/MuQSS.c ---- linux-4.14-mc13/kernel/sched/MuQSS.c 2018-12-17 13:58:41.877371296 +1100 -+++ linux-4.14-muqss-resync/kernel/sched/MuQSS.c 2018-12-27 21:35:04.897927669 +1100 -@@ -188,6 +188,10 @@ - struct rq *uprq; - #endif /* CONFIG_SMP */ - -+#ifdef CONFIG_SCHED_SMT /* This fixes a regression as of 4.14.84 and 4.19.7 which breaks the kernel build if either SMP or MuQSS is enabled */ -+DEFINE_STATIC_KEY_FALSE(sched_smt_present); -+#endif -+ - #include "stats.h" - - #ifndef prepare_arch_switch diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD index 8180307f5..d0b90aafb 100644 --- a/system/easy-kernel/APKBUILD +++ b/system/easy-kernel/APKBUILD @@ -3,8 +3,8 @@ # KEEP THIS IN SYNC with the other easy-kernel packages. _kflavour="" _pkgname=easy-kernel$_kflavour -pkgver=4.14.88 -pkgrel=13 +pkgver=4.14.127 +pkgrel=14 pkgname=$_pkgname-$pkgver-mc$pkgrel pkgdesc="The Linux kernel, packaged for your convenience" url="https://kernel.org/" @@ -21,7 +21,6 @@ _pkgmajver=${pkgver%%.*} _pkgminver=${pkgver%.*} source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgminver}.tar.xz https://distfiles.adelielinux.org/source/linux-${_pkgminver}-mc$pkgrel.patch.xz - 0502-muqss-smt-fix.patch ast-endianness.patch config-ppc64 config-ppc @@ -30,10 +29,7 @@ source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgmin config-aarch64 config-sparc64 config-m68k - futex-cmpxchg.patch kernel.h - ppc64-epapr-gcc8.patch - uapi-ether.patch " builddir="$srcdir/linux-${_pkgminver}" @@ -133,17 +129,13 @@ src() { } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -bfe606f208894cc572fb98f323e26956c69b4f75febd4a9b500514cbb2aa70bddb2aba05b3f16a5fe52535236b215335f73974324065f80643265f17f281faa6 linux-4.14-mc13.patch.xz -6ede43cf169e79d8a08f7a9d79bb4bdf15618ec450b42a67a53a75bc5f5cb4d5a8c82d2b95c27a80567999876d103091bc104104f0494ca34707b5ccae5da725 0502-muqss-smt-fix.patch +61eda169a4bd195202f1cf82a6d7c8ff10e420cfa1ad67ab8346ed868e154196e9c13002bf4849d6afe6d7115bcd139c6bb395791446ec2f69aa2adebfdf675f linux-4.14-mc14.patch.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch -19be54c3f635cca893b668987e5db6931e48ea8ee55fe8ba2fc9103f3f116346f2227d3dadb9fbf13b3444c7085e5db5785d3161a1544d37254403ca90bc757a config-ppc64 -e9ad73259f2138c1c1506c1627b8f42a525505a1d16ca4cdc1dad4a381a462d9946f2a8191c40ee18fe5010fb8465316d665f60231fb79f0be9cc064eeb82b60 config-ppc -124baf02726630f8ad3c066cdcb5b0273b6c0ce796af70a0913cb447cd452f4dde34b2070c5fe87c312cbe019cb1c1b334ae3049f429cfb3bcdec7267aba89fd config-x86_64 -bb7debbed592c27fd6aceeeab0f92fb878740b34f3c65b7968008c3209924d0daf484509572d350ce2ec757d3a541c50812b30c1a8c3010eaeeac5e560546927 config-pmmx -20d0e09d339d534ce93c156e1e2c630da2bc55e88467481b8e89074773a3ebabba76503a05c51ad07ffa0219953b49f5849f0d9839bfe040dc006506c8adb3bb config-aarch64 -d9e6780c03ce82c7de63e3571d4b1530a2c078db86efb904281b497dae5e46c80696a85f6c82470e47eaafedaf4942c88e910b266dc7ea0be77b8bca25cafe9c config-sparc64 -3fcd139fae7835f8aeea89430e4fda8d93b803abdfeb937f07ce5437362340337849f56e40614e20dc21aa23d522c4702194054e4f6114b3b94685e3a98f0d19 config-m68k -64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch -fdd94b9de7b374f1812dec0f9971c05f5e52177ca4a16c8071daa620c18265b38f656f528e7045a24f30af01f05e53e54546fb0a9e93773cf191866e87de505d kernel.h -0df4e823e19e8fc379b5ad66192eb3e890daa3dac8d7a9ebbab4cf3c60ce9f15fcc25a54b86b341db53db3d78c928ca5f55933e12eee75680e705cca8a7bdff4 ppc64-epapr-gcc8.patch -af093e91e8c8371629948e2e574f8764078564bc027ba5b2f87886f8827d9a63ba7a43717552fe7e3cc9212b2fd55b8633b12900c3d8cdc6c035d52b389c39e5 uapi-ether.patch" +5566ca7a3070183650688b02a52ba7d72f835929ec273cb5c38fd37671c0c8d08f96ac3b59a994b94078498fb421fca3f5c069168812d1d6cf0e0c79b6232d39 config-ppc64 +e959b84a16af211e2c2e91d098ba8132e11204ae8a3f6d0823b0df169f955865dbe804fe0a6e9ed22b3079ac5e6e3609f90fea84450f405dbb704d016d70519d config-ppc +9cb39964bbeadd2406e8d25b76f9dccede048a73f79164fdd3d235625932b71f826d568c7532ebb6a3dd8724e514b9be97ed070b261a78dd9ce9311def76e622 config-x86_64 +db716a4ffa6d33cddfef43fb882009f44c5e08188576a7ee8893b6402eb1d29a0694d561634f119fe66b9db3047b4b1f53cd6c05835217f4aef33ddb729dbafb config-pmmx +39539f67496ab23397e46f6c8ff618d2fe5e057bd17b577fc59c60061cda6b71c5ddbef293287d00a8c37994f7c20e532b69a7493ee3fb3e13a4b8f1874b2c1f config-aarch64 +e18f7818b67b9aa5acfcfc5a59836c5b115bf56f7e003bedd425403574276ad17613e8a6518f011c956c46fa71331c662eea9746a6f014c4c9c6b8f3487f3460 config-sparc64 +6594f07d9d741c37ced99ce1bd9a9c10f0fb2f1a44e64da318d9350a8f6bb69b004382bd66e1a08baf8e581e7eeffb37488cfb6002ab61b0e7c8474afcae1a29 config-m68k +fdd94b9de7b374f1812dec0f9971c05f5e52177ca4a16c8071daa620c18265b38f656f528e7045a24f30af01f05e53e54546fb0a9e93773cf191866e87de505d kernel.h" diff --git a/system/easy-kernel/config-aarch64 b/system/easy-kernel/config-aarch64 index ee1bdcf38..953b40ad5 100644 --- a/system/easy-kernel/config-aarch64 +++ b/system/easy-kernel/config-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.88-mc13 Kernel Configuration +# Linux/arm64 4.14.127-mc14 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -1690,6 +1690,7 @@ CONFIG_NET_CORE=y CONFIG_MACVLAN=m CONFIG_MACVTAP=m # CONFIG_VXLAN is not set +# CONFIG_GTP is not set # CONFIG_MACSEC is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -2277,6 +2278,7 @@ CONFIG_LEGACY_PTY_COUNT=16 # CONFIG_NOZOMI is not set # CONFIG_N_GSM is not set # CONFIG_TRACE_SINK is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # @@ -2371,7 +2373,6 @@ CONFIG_HW_RANDOM_XGENE=m CONFIG_HW_RANDOM_MESON=m CONFIG_HW_RANDOM_CAVIUM=m CONFIG_HW_RANDOM_MTK=m -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # diff --git a/system/easy-kernel/config-m68k b/system/easy-kernel/config-m68k index 3724a789e..3ca687fc5 100644 --- a/system/easy-kernel/config-m68k +++ b/system/easy-kernel/config-m68k @@ -1404,6 +1404,7 @@ CONFIG_UNIX98_PTYS=y # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_N_GSM is not set # CONFIG_TRACE_SINK is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -2165,6 +2166,7 @@ CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_CEPH_FS is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_UPCALL is not set # CONFIG_CIFS_XATTR is not set diff --git a/system/easy-kernel/config-pmmx b/system/easy-kernel/config-pmmx index de5054211..733df6808 100644 --- a/system/easy-kernel/config-pmmx +++ b/system/easy-kernel/config-pmmx @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.88-mc13 Kernel Configuration +# Linux/x86 4.14.127-mc14 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -507,6 +507,7 @@ CONFIG_HPET_EMULATE_RTC=y CONFIG_DMI=y CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y +CONFIG_SMT_NICE=y CONFIG_SCHED_MC=y CONFIG_SCHED_MC_PRIO=y # CONFIG_PREEMPT_NONE is not set @@ -2852,6 +2853,7 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_NOZOMI is not set # CONFIG_N_GSM is not set # CONFIG_TRACE_SINK is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -2924,7 +2926,6 @@ CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=m # CONFIG_DTLK is not set -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_SONYPI is not set @@ -5695,6 +5696,7 @@ CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_CEPH_FS is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_UPCALL is not set # CONFIG_CIFS_XATTR is not set diff --git a/system/easy-kernel/config-ppc b/system/easy-kernel/config-ppc index 8ae4b0701..029a61bde 100644 --- a/system/easy-kernel/config-ppc +++ b/system/easy-kernel/config-ppc @@ -2311,6 +2311,7 @@ CONFIG_UNIX98_PTYS=y # CONFIG_N_GSM is not set # CONFIG_TRACE_SINK is not set # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -4438,6 +4439,7 @@ CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_CEPH_FS is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_UPCALL is not set # CONFIG_CIFS_XATTR is not set diff --git a/system/easy-kernel/config-ppc64 b/system/easy-kernel/config-ppc64 index aeb5734d8..c8927c076 100644 --- a/system/easy-kernel/config-ppc64 +++ b/system/easy-kernel/config-ppc64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.14.88-mc13 Kernel Configuration +# Linux/powerpc 4.14.127-mc14 Kernel Configuration # CONFIG_PPC64=y @@ -53,6 +53,7 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_HAS_DMA_SET_COHERENT_MASK=y CONFIG_PPC=y +CONFIG_PPC_BARRIER_NOSPEC=y # CONFIG_GENERIC_CSUM is not set CONFIG_EARLY_PRINTK=y CONFIG_PANIC_TIMEOUT=180 @@ -2098,6 +2099,7 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_N_GSM is not set # CONFIG_TRACE_SINK is not set # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -2148,7 +2150,6 @@ CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_VIRTIO=m CONFIG_HW_RANDOM_PSERIES=m CONFIG_HW_RANDOM_POWERNV=m -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set CONFIG_RAW_DRIVER=y CONFIG_MAX_RAW_DEVS=256 @@ -4053,6 +4054,7 @@ CONFIG_SUNRPC_GSS=y # CONFIG_CEPH_FS is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_UPCALL is not set # CONFIG_CIFS_XATTR is not set diff --git a/system/easy-kernel/config-sparc64 b/system/easy-kernel/config-sparc64 index dc3f89cf4..980b3264a 100644 --- a/system/easy-kernel/config-sparc64 +++ b/system/easy-kernel/config-sparc64 @@ -1821,6 +1821,7 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_N_GSM is not set # CONFIG_TRACE_SINK is not set # CONFIG_VCC is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -3753,6 +3754,7 @@ CONFIG_SUNRPC_GSS=y # CONFIG_CEPH_FS is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_UPCALL is not set # CONFIG_CIFS_XATTR is not set diff --git a/system/easy-kernel/config-x86_64 b/system/easy-kernel/config-x86_64 index e529492d7..83e9c4e1b 100644 --- a/system/easy-kernel/config-x86_64 +++ b/system/easy-kernel/config-x86_64 @@ -518,6 +518,7 @@ CONFIG_IOMMU_HELPER=y # CONFIG_MAXSMP is not set CONFIG_NR_CPUS=64 CONFIG_SCHED_SMT=y +CONFIG_SMT_NICE=y CONFIG_SCHED_MC=y CONFIG_SCHED_MC_PRIO=y # CONFIG_PREEMPT_NONE is not set @@ -3196,6 +3197,7 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_NOZOMI is not set # CONFIG_N_GSM is not set # CONFIG_TRACE_SINK is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -6147,6 +6149,7 @@ CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_UPCALL is not set # CONFIG_CIFS_XATTR is not set diff --git a/system/easy-kernel/futex-cmpxchg.patch b/system/easy-kernel/futex-cmpxchg.patch deleted file mode 100644 index 9e2aabfb7..000000000 --- a/system/easy-kernel/futex-cmpxchg.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig -index 9f2b75f..d75d8ea 100644 ---- a/arch/powerpc/Kconfig -+++ b/arch/powerpc/Kconfig -@@ -190,6 +190,7 @@ config PPC - select HAVE_FTRACE_MCOUNT_RECORD - select HAVE_FUNCTION_GRAPH_TRACER - select HAVE_FUNCTION_TRACER -+ select HAVE_FUTEX_CMPXCHG if FUTEX - select HAVE_GCC_PLUGINS - select HAVE_GENERIC_GUP - select HAVE_HW_BREAKPOINT if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx) diff --git a/system/easy-kernel/ppc64-epapr-gcc8.patch b/system/easy-kernel/ppc64-epapr-gcc8.patch deleted file mode 100644 index 192e83845..000000000 --- a/system/easy-kernel/ppc64-epapr-gcc8.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 186b8f1587c79c2fa04bfa392fdf084443e398c1 Mon Sep 17 00:00:00 2001 -From: Seth Forshee <seth.forshee@canonical.com> -Date: Thu, 28 Sep 2017 09:33:39 -0400 -Subject: powerpc: Always initialize input array when calling epapr_hypercall() - -Several callers to epapr_hypercall() pass an uninitialized stack -allocated array for the input arguments, presumably because they -have no input arguments. However this can produce errors like -this one - - arch/powerpc/include/asm/epapr_hcalls.h:470:42: error: 'in' may be used uninitialized in this function [-Werror=maybe-uninitialized] - unsigned long register r3 asm("r3") = in[0]; - ~~^~~ - -Fix callers to this function to always zero-initialize the input -arguments array to prevent this. - -Signed-off-by: Seth Forshee <seth.forshee@canonical.com> -Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> ---- - arch/powerpc/include/asm/epapr_hcalls.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/arch/powerpc/include/asm/epapr_hcalls.h b/arch/powerpc/include/asm/epapr_hcalls.h -index 334459ad145b..90863245df53 100644 ---- a/arch/powerpc/include/asm/epapr_hcalls.h -+++ b/arch/powerpc/include/asm/epapr_hcalls.h -@@ -508,7 +508,7 @@ static unsigned long epapr_hypercall(unsigned long *in, - - static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - unsigned long r; - -@@ -520,7 +520,7 @@ static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2) - - static inline long epapr_hypercall0(unsigned int nr) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - return epapr_hypercall(in, out, nr); -@@ -528,7 +528,7 @@ static inline long epapr_hypercall0(unsigned int nr) - - static inline long epapr_hypercall1(unsigned int nr, unsigned long p1) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - in[0] = p1; -@@ -538,7 +538,7 @@ static inline long epapr_hypercall1(unsigned int nr, unsigned long p1) - static inline long epapr_hypercall2(unsigned int nr, unsigned long p1, - unsigned long p2) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - in[0] = p1; -@@ -549,7 +549,7 @@ static inline long epapr_hypercall2(unsigned int nr, unsigned long p1, - static inline long epapr_hypercall3(unsigned int nr, unsigned long p1, - unsigned long p2, unsigned long p3) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - in[0] = p1; -@@ -562,7 +562,7 @@ static inline long epapr_hypercall4(unsigned int nr, unsigned long p1, - unsigned long p2, unsigned long p3, - unsigned long p4) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - in[0] = p1; --- -cgit 1.2-0.3.lf.el7 - diff --git a/system/easy-kernel/uapi-ether.patch b/system/easy-kernel/uapi-ether.patch deleted file mode 100644 index 480b78e57..000000000 --- a/system/easy-kernel/uapi-ether.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 6926e041a8920c8ec27e4e155efa760aa01551fd Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens <hauke@hauke-m.de> -Date: Wed, 3 Jan 2018 23:14:21 +0100 -Subject: [PATCH] uapi/if_ether.h: prevent redefinition of struct ethhdr - -Musl provides its own ethhdr struct definition. Add a guard to prevent -its definition of the appropriate musl header has already been included. - -glibc does not implement this header, but when glibc will implement this -they can just define __UAPI_DEF_ETHHDR 0 to make it work with the -kernel. - -Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - include/uapi/linux/if_ether.h | 3 +++ - include/uapi/linux/libc-compat.h | 6 ++++++ - 2 files changed, 9 insertions(+) - -diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h -index 3ee3bf7c85262..144de4d2f385e 100644 ---- a/include/uapi/linux/if_ether.h -+++ b/include/uapi/linux/if_ether.h -@@ -23,6 +23,7 @@ - #define _UAPI_LINUX_IF_ETHER_H - - #include <linux/types.h> -+#include <linux/libc-compat.h> - - /* - * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble -@@ -149,11 +150,13 @@ - * This is an Ethernet frame header. - */ - -+#if __UAPI_DEF_ETHHDR - struct ethhdr { - unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ - unsigned char h_source[ETH_ALEN]; /* source ether addr */ - __be16 h_proto; /* packet type ID field */ - } __attribute__((packed)); -+#endif - - - #endif /* _UAPI_LINUX_IF_ETHER_H */ -diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h -index 8254c937c9f45..fc29efaa918cb 100644 ---- a/include/uapi/linux/libc-compat.h -+++ b/include/uapi/linux/libc-compat.h -@@ -264,4 +264,10 @@ - - #endif /* __GLIBC__ */ - -+/* Definitions for if_ether.h */ -+/* allow libcs like musl to deactivate this, glibc does not implement this. */ -+#ifndef __UAPI_DEF_ETHHDR -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ - #endif /* _UAPI_LIBC_COMPAT_H */ diff --git a/system/gdb/APKBUILD b/system/gdb/APKBUILD index a8ce6acfd..71030a769 100644 --- a/system/gdb/APKBUILD +++ b/system/gdb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gdb -pkgver=8.2.1 +pkgver=8.3 pkgrel=0 pkgdesc="The GNU Debugger" url="https://www.sourceware.org/gdb/" @@ -17,7 +17,6 @@ source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz ppc-musl.patch ppc-ptregs.patch remove-extraneous-include.patch - stopcode-lock.patch arm64.patch " @@ -53,10 +52,9 @@ package() { rm -rf "$pkgdir"/usr/lib } -sha512sums="2aa81cfd389bb48c35d7d9f95cc10e88b4f7ad4597bdde0f8f1fd312f60f10d9fb2cc6e5a9355227d89ff328f7feb0fc411a69394560cafeb9fa75d35d896d11 gdb-8.2.1.tar.xz +sha512sums="47ac074d20a09a3fac8f4a41dce0a0cbe6ef702f7dc21ba8b7d650d306128dcae481e9a16bf65e596b3a541dc82ae57c02bcbb786d551b4ef3e2917b9b6f0ae1 gdb-8.3.tar.xz 986e68275f7692f39b5d8aedeb9f9e88f0e5bebb3f8c7f104933c525d35ca54fc90e18698c1e3e1009e8a188e5e70d6f252cb39e4c75e37db7bf479017e0da32 s390x-use-elf-gdb_fpregset_t.patch 04911f87904b62dd7662435f9182b20485afb29ddb3d6398a9d31fef13495f7b70639c77fdae3a40e2775e270d7cd40d0cfd7ddf832372b506808d33c8301e01 ppc-musl.patch b75e1c1ee503a1948a7d5b8d90427b5c7d38ded69978056cee0adca222771a5c95ed1ac73127fcae7b795ea94296344eee5fca47e4cd04b418c164a756fb0933 ppc-ptregs.patch 3ff31774ba78c1208415289566b901debd815da8b53acefe4a0785e7b2bbcff39585a556d44ff2f7d8d639ebc047620b96e72573acae376d8f23aa98dd1fe286 remove-extraneous-include.patch -720d6cbc71d5d4f5cc8955b18a76661688534d409e2beb53e9e2d2322a303fa622e622b583e1f6c50cf3f32b8abe4f5320a6885e7680769c92ef5bb09ef59d1d stopcode-lock.patch -8bba2fdf6a53ed61cad2c1ec58e19014818d2481531008c024a0d863ea0bf7c466592cfee7e1bee56262df44cc557573a7f472b3fa8afcb46fe0220192e86091 arm64.patch" +f7beecfcd9c642930dec36d7b02d5a875bcdf07b5fad82a4ef3443332c0f60706d5b48c6ae8bb68bdec0398d3c32ef35e2478dcfb1eb7806b2699cfa2df29e01 arm64.patch" diff --git a/system/gdb/arm64.patch b/system/gdb/arm64.patch index a718a8c6a..c8c9c29cb 100644 --- a/system/gdb/arm64.patch +++ b/system/gdb/arm64.patch @@ -9,12 +9,8 @@ provide the same headers as the kernel or musl. --- a/gdb/nat/aarch64-sve-linux-ptrace.h +++ b/gdb/nat/aarch64-sve-linux-ptrace.h -@@ -20,12 +20,12 @@ - #ifndef AARCH64_SVE_LINUX_PTRACE_H - #define AARCH64_SVE_LINUX_PTRACE_H - --#include <asm/sigcontext.h> -+#include <signal.h> +@@ -23,9 +23,9 @@ + #include <signal.h> #include <sys/utsname.h> #include <sys/ptrace.h> #include <asm/ptrace.h> diff --git a/system/gdb/stopcode-lock.patch b/system/gdb/stopcode-lock.patch deleted file mode 100644 index 6a4e3d855..000000000 --- a/system/gdb/stopcode-lock.patch +++ /dev/null @@ -1,75 +0,0 @@ -From: Andrew Burgess <andrew.burgess@embecosm.com> -Date: Tue, 3 Jul 2018 18:02:48 +0000 (+0100) -Subject: gdb: Avoid using W_STOPCODE(0) as this is ambiguous on MIPS -X-Git-Tag: users/ARM/embedded-binutils-master-2018q4~1172 -X-Git-Url: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff_plain;h=953473375500a809fbb3eca3efa4dbb670c3a32f - -gdb: Avoid using W_STOPCODE(0) as this is ambiguous on MIPS - -The MIPS target supports 127 signals, and this can create an ambiguity -in process wait statuses. A status value of 0x007f could potentially -indicate a process that has exited with signal 127, or a process that -has stopped with signal 0. - -In uClibc-ng the interpretation of 0x007f is that the process has -exited with signal 127 rather than stopped with signal 0, and so, -WIFSTOPPED (W_STOPCODE (0)) will be false rather than true as it would -be on most other platforms. - -Given that it's pretty easy to avoid using W_STOPCODE (0), lets do that. - -gdb/ChangeLog: - - * linux-nat.c (linux_nat_target::follow_fork): Avoid using - 'W_STOPCODE (0)' as this could be ambiguous. ---- - -diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c -index 86d3dfd..d2c88ad 100644 ---- a/gdb/linux-nat.c -+++ b/gdb/linux-nat.c -@@ -445,7 +445,6 @@ linux_nat_target::follow_fork (int follow_child, int detach_fork) - if (!follow_child) - { - struct lwp_info *child_lp = NULL; -- int status = W_STOPCODE (0); - int has_vforked; - ptid_t parent_ptid, child_ptid; - int parent_pid, child_pid; -@@ -465,6 +464,8 @@ linux_nat_target::follow_fork (int follow_child, int detach_fork) - /* Detach new forked process? */ - if (detach_fork) - { -+ int child_stop_signal = 0; -+ bool detach_child = true; - struct cleanup *old_chain = make_cleanup (delete_lwp_cleanup, - child_lp); - -@@ -484,18 +485,24 @@ linux_nat_target::follow_fork (int follow_child, int detach_fork) - if (!gdbarch_software_single_step_p (target_thread_architecture - (parent_ptid))) - { -+ int status; -+ - linux_disable_event_reporting (child_pid); - if (ptrace (PTRACE_SINGLESTEP, child_pid, 0, 0) < 0) - perror_with_name (_("Couldn't do single step")); - if (my_waitpid (child_pid, &status, 0) < 0) - perror_with_name (_("Couldn't wait vfork process")); -+ else -+ { -+ detach_child = WIFSTOPPED (status); -+ child_stop_signal = WSTOPSIG (status); -+ } - } - -- if (WIFSTOPPED (status)) -+ if (detach_child) - { -- int signo; -+ int signo = child_stop_signal; - -- signo = WSTOPSIG (status); - if (signo != 0 - && !signal_pass_state (gdb_signal_from_host (signo))) - signo = 0; diff --git a/system/git/APKBUILD b/system/git/APKBUILD index e931dce98..7be66948f 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=git -pkgver=2.21.0 +pkgver=2.22.0 pkgrel=0 pkgdesc="A distributed version control system" url="https://www.git-scm.com/" @@ -164,7 +164,7 @@ subtree_doc() { gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1 } -sha512sums="83f57c3950a07f6773a3aea66611d22daba0e5599e5d8f0751a16f6fdbeab0f3844d942a39a5642051212df99d1d4513253c36829b1454b4f0977cc6026fd973 git-2.21.0.tar.xz +sha512sums="75b3dcac36f80281effcd099944de34050a35f3599ce42f86ce60455b6c952039fb0f6438d296e0cc9c0651d4a17f467780dc475669227d3c98ddefe91723d42 git-2.22.0.tar.xz 315e4666c425b31a7f7a447e777cbf2a1050feac9b4d4b8a61c05248024e790d4d18f3336faf2a2c68584e05e8194c22a09e1caba1352cfec194e0bc01277a6c dont-test-other-encodings.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd" |