diff options
Diffstat (limited to 'system')
66 files changed, 448 insertions, 773 deletions
diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD index 22eeeba55..4cda8968f 100644 --- a/system/adelie-base/APKBUILD +++ b/system/adelie-base/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=adelie-base pkgver=0.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="The Adélie Linux Base System" url="https://www.adelielinux.org/" arch="noarch" @@ -94,6 +94,7 @@ devkit() { } docs() { + depends="" pkgdesc="Metapackage that will magically install all documentation for your system" mkdir -p "$subpkgdir" return 0 diff --git a/system/apk-tools/APKBUILD b/system/apk-tools/APKBUILD index 746468fab..40dfcb272 100644 --- a/system/apk-tools/APKBUILD +++ b/system/apk-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> pkgname=apk-tools -pkgver=2.10.1 +pkgver=2.10.3 pkgrel=0 pkgdesc="Alpine Package Keeper - package manager" url="https://git.alpinelinux.org/cgit/apk-tools/" @@ -13,6 +13,7 @@ makedepends_host="zlib-dev openssl openssl-dev linux-headers" makedepends="$makedepends_build $makedepends_host" subpackages="$pkgname-static" source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz + pmmx.patch " prepare() { @@ -66,4 +67,5 @@ static() { "$subpkgdir"/sbin/apk.static } -sha512sums="f994dba20b9ba7ee0ad4cbd9d137f65b814851f348f0d5eb75eb60c7d6a21f88648b472239e14298eaf1348c517de00652432e7f8c8abd54565914c7d49e3cd3 apk-tools-2.10.1.tar.xz" +sha512sums="1b190cfd04c69369bd4f2b708d4df0f8cf2937e1580c95138fd2c2257e7604d015deaca10a9fe0da6742981caadb6b067c15e417a1951866f781b8a5c71c98ee apk-tools-2.10.3.tar.xz +746d00ce2af554a25db7ecea2b0a4d8f7399d2560efb6bf59ea144012d0163d3e0bad84c799bd706e8be6c0a543d4e35728d6beb269fddbbea626384009129cb pmmx.patch" diff --git a/system/apk-tools/pmmx.patch b/system/apk-tools/pmmx.patch new file mode 100644 index 000000000..1b19edc94 --- /dev/null +++ b/system/apk-tools/pmmx.patch @@ -0,0 +1,11 @@ +--- apk-tools-2.10.1/src/apk_defines.h.old 2018-09-10 08:04:03.000000000 +0000 ++++ apk-tools-2.10.1/src/apk_defines.h 2019-01-04 03:31:41.900000000 +0000 +@@ -88,7 +88,7 @@ + #if defined(__x86_64__) + #define APK_DEFAULT_ARCH "x86_64" + #elif defined(__i386__) +-#define APK_DEFAULT_ARCH "x86" ++#define APK_DEFAULT_ARCH "pmmx" + #elif defined(__powerpc__) && !defined(__powerpc64__) + #define APK_DEFAULT_ARCH "ppc" + #elif defined(__powerpc64__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ diff --git a/system/bison/APKBUILD b/system/bison/APKBUILD index 921a1fdf3..a0a27f08f 100644 --- a/system/bison/APKBUILD +++ b/system/bison/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bison pkgver=3.1 -pkgrel=0 +pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch="all" [ -n "$BOOTSTRAP" ] && options="!check" @@ -11,6 +11,7 @@ url="https://www.gnu.org/software/bison/bison.html" depends="m4" checkdepends="bison flex" makedepends="perl" +provider_priority=1 subpackages="$pkgname-doc $pkgname-lang" source="ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz" diff --git a/system/bsd-compat-headers/APKBUILD b/system/bsd-compat-headers/APKBUILD new file mode 100644 index 000000000..f7f5036c0 --- /dev/null +++ b/system/bsd-compat-headers/APKBUILD @@ -0,0 +1,31 @@ +# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> +pkgname=bsd-compat-headers +pkgver=0.7.1 +pkgrel=1 +pkgdesc="Compatibility files for building BSD software" +url=" " +arch="noarch" +options="!check" # Just header files. +license="BSD-2-Clause AND BSD-3-Clause" +depends="" +makedepends="" +subpackages="" +source="sys-cdefs.h + sys-queue.h + sys-tree.h + " + +package() { + mkdir -p "$pkgdir" + case "$CLIBC" in + musl) + install -D "$srcdir"/sys-cdefs.h "$pkgdir"/usr/include/sys/cdefs.h + install -D "$srcdir"/sys-queue.h "$pkgdir"/usr/include/sys/queue.h + install -D "$srcdir"/sys-tree.h "$pkgdir"/usr/include/sys/tree.h + ;; + esac +} + +sha512sums="8c3fddd73b696a38e633953715c79c47703739be27ee085fc6c960a57b6746ca05bf6406f7e6126cc1a13204254fd5830afb566624e1f298f4d6b58216013c28 sys-cdefs.h +2f0d5e6e4dc3350285cf17009265dddcbe12431c111868eea39bc8cb038ab7c1f2acacbb21735c4e9d4a1fd106a8fc0f8611ea33987d4faba37dde5ce6da0750 sys-queue.h +07cb70f2f0ddb31e23dd913c6f561fc9885667c5803fdf3a559676c99d08834b4104589bacb5d17b4a0b379c68c81a1cf3173832b3da33a7b936fa7b93706844 sys-tree.h" diff --git a/system/libc-dev/sys-cdefs.h b/system/bsd-compat-headers/sys-cdefs.h index 209a623c0..209a623c0 100644 --- a/system/libc-dev/sys-cdefs.h +++ b/system/bsd-compat-headers/sys-cdefs.h diff --git a/system/libc-dev/sys-queue.h b/system/bsd-compat-headers/sys-queue.h index a38499a26..a38499a26 100644 --- a/system/libc-dev/sys-queue.h +++ b/system/bsd-compat-headers/sys-queue.h diff --git a/system/libc-dev/sys-tree.h b/system/bsd-compat-headers/sys-tree.h index eaea56aae..eaea56aae 100644 --- a/system/libc-dev/sys-tree.h +++ b/system/bsd-compat-headers/sys-tree.h diff --git a/system/build-tools/APKBUILD b/system/build-tools/APKBUILD index 39495ec5b..e5ff48c72 100644 --- a/system/build-tools/APKBUILD +++ b/system/build-tools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=build-tools pkgver=1.0 -pkgrel=7 +pkgrel=8 pkgdesc="Meta-package for user development utilities" url="https://adelielinux.org/" arch="noarch" @@ -11,7 +11,7 @@ depends="bash gettext-tiny gettext-tiny-dev binutils gcc g++ make diffutils patch - fortify-headers linux-headers + linux-headers mawk sed bzip2 gzip unzip xz abuild" diff --git a/system/byacc/APKBUILD b/system/byacc/APKBUILD index 42affc3bd..ff756eb4a 100644 --- a/system/byacc/APKBUILD +++ b/system/byacc/APKBUILD @@ -4,7 +4,7 @@ pkgname=byacc pkgver=20180609 pkgrel=2 pkgdesc="The Berkeley Yacc general-purpose parser generator" -url="http://invisible-island.net/byacc/byacc.html" +url="https://invisible-island.net/byacc/byacc.html" arch="all" options="!checkroot" license="Public-Domain" diff --git a/system/ca-certificates/APKBUILD b/system/ca-certificates/APKBUILD index 1d7bfbd6f..3dab0f01b 100644 --- a/system/ca-certificates/APKBUILD +++ b/system/ca-certificates/APKBUILD @@ -3,13 +3,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ca-certificates pkgver=20180411 -pkgrel=0 +pkgrel=1 pkgdesc="CA root certificates" url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/" arch="all" options="!fhs !check" license="MPL-2.0 GPL-2.0+" -depends="" +depends="debianutils" makedepends_build="python3" makedepends_host="openssl-dev" subpackages="$pkgname-doc" @@ -21,6 +21,7 @@ source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz" build() { cd "$builddir" + export CFLAGS="$CFLAGS -DSYMLINK_MAX=PATH_MAX" make } diff --git a/system/easy-kernel/0502-muqss-smt-fix.patch b/system/easy-kernel/0502-muqss-smt-fix.patch new file mode 100644 index 000000000..090b176a4 --- /dev/null +++ b/system/easy-kernel/0502-muqss-smt-fix.patch @@ -0,0 +1,14 @@ +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 3e20840fd..2a3903b73 100644 --- a/system/easy-kernel/APKBUILD +++ b/system/easy-kernel/APKBUILD @@ -15,8 +15,11 @@ install="" provides="easy-kernel=$pkgver-r$pkgrel" subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules $_pkgname-src-$pkgver-mc$pkgrel:src linux-headers:headers" -source="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz - https://distfiles.adelielinux.org/source/linux-4.14-mc$pkgrel.patch.xz +_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 @@ -27,22 +30,30 @@ source="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz kernel.h uapi-ether.patch " -builddir="$srcdir/linux-4.14" +builddir="$srcdir/linux-${_pkgminver}" prepare() { - default_prepare cd "$srcdir" - cat linux-4.14-mc$pkgrel.patch.xz | unxz -> linux-4.14-mc$pkgrel.patch - cd "$builddir" - patch -Np1 <../linux-4.14-mc$pkgrel.patch + cat linux-${_pkgminver}-mc$pkgrel.patch.xz | unxz -> linux-${_pkgminver}-mc$pkgrel.patch + patch -Np1 -d "$builddir" <linux-${_pkgminver}-mc$pkgrel.patch + default_prepare cd "$srcdir" - cp config-$CARCH linux-4.14/.config - cp -pr linux-4.14 linux-src + cp config-$CARCH linux-${_pkgminver}/.config + cp -pr linux-${_pkgminver} linux-src } build() { cd "$builddir" make LDFLAGS="" + + cd "$srcdir/linux-src" + make LDFLAGS="" modules_prepare clean + cp "$builddir/Module.symvers" . + + # Kernel bug: crtsavres.o is required to build modules, but modules_prepare doesn't create it. + if [ $CARCH = ppc ]; then + cp "$builddir/arch/powerpc/lib/crtsavres.o" arch/powerpc/lib/ + fi } package() { @@ -106,13 +117,15 @@ src() { mkdir -p "$subpkgdir"/usr/src mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel } + sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz bfe606f208894cc572fb98f323e26956c69b4f75febd4a9b500514cbb2aa70bddb2aba05b3f16a5fe52535236b215335f73974324065f80643265f17f281faa6 linux-4.14-mc13.patch.xz +6ede43cf169e79d8a08f7a9d79bb4bdf15618ec450b42a67a53a75bc5f5cb4d5a8c82d2b95c27a80567999876d103091bc104104f0494ca34707b5ccae5da725 0502-muqss-smt-fix.patch e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch cfa1c2b523875967c42bfd8fcfeeb80b1c4c9887c4399b4767f0ac0525769a9e8c5cddaec831e1adfa546ac2d66f68ef23dc594a286532f4b9890401efd75c67 config-ppc64 1112f6c3fcfd7fdc0ef4d5e85df5d3adea430a9c7b4c2b34508a215f7ba14c863ccd7a5e17f13ed46c518bafec30cfb3ced70c465137c14ef5fc998b6cbcca1f config-ppc -d72613826070cfab9cea882419c13985109200b387bd96614628e5eadb25f8da8b64c4844e345b724c29f7e6cf0619c649e536cb6cfe552a878d3a977cbb31fe config-x86_64 -40402578479993f78310459dcba783c806e0d2ebf6ad54854ffa338d3332f718ea4e8cf2c2f542584e1672504074122bba70a7ef918be7926f4a97abc20416d3 config-pmmx +1c5b4365da04a85ac994f123847cc69df0eda772e88b12914cd1e16ea9be62de2a46106f0f0b736f0e7bee746017d49f5671d1277793b5d383258f3d40b562f6 config-x86_64 +69c737ecb6968ca567dfb52335a8a89e147c0b01f92b1e5239bd6d806c10cd7d4225f3cc8a703249020669d3e785df0c1350afda158b0e6c8e70b4805532f07e config-pmmx 231c346e601c1d032a03d6cb19ed3d6e0f538f84d6c9980e3f47236ba9dc3f076ea23f91d68813b7d5c9eea40200f69cef31697f89f514112c09c5762ab2c48a config-aarch64 64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch fdd94b9de7b374f1812dec0f9971c05f5e52177ca4a16c8071daa620c18265b38f656f528e7045a24f30af01f05e53e54546fb0a9e93773cf191866e87de505d kernel.h diff --git a/system/easy-kernel/config-pmmx b/system/easy-kernel/config-pmmx index 1484fc1b2..6af94b96d 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.19-mc4 Kernel Configuration +# Linux/x86 4.14.88-mc13 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -231,6 +231,7 @@ CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLUB_CPU_PARTIAL=y CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_PROFILING=y +CONFIG_HOTPLUG_SMT=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y @@ -267,6 +268,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y @@ -416,7 +418,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y CONFIG_X86_MPPARSE=y CONFIG_X86_BIGSMP=y # CONFIG_GOLDFISH is not set -CONFIG_RETPOLINE=n +# CONFIG_RETPOLINE is not set # CONFIG_INTEL_RDT is not set CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_GOLDFISH is not set @@ -499,7 +501,6 @@ 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 @@ -4161,8 +4162,8 @@ CONFIG_DRM_VGEM=m CONFIG_DRM_VMWGFX=m # CONFIG_DRM_VMWGFX_FBCON is not set CONFIG_DRM_GMA500=m -# CONFIG_DRM_GMA600 is not set -# CONFIG_DRM_GMA3600 is not set +CONFIG_DRM_GMA600=y +CONFIG_DRM_GMA3600=y CONFIG_DRM_UDL=m CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m @@ -5774,7 +5775,6 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -CONFIG_HAVE_ARCH_KMEMCHECK=y # # Debug Lockups and Hangs @@ -6025,7 +6025,6 @@ CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_SALSA20 is not set -# CONFIG_CRYPTO_SALSA20_586 is not set # CONFIG_CRYPTO_CHACHA20 is not set # CONFIG_CRYPTO_SEED is not set # CONFIG_CRYPTO_SERPENT is not set diff --git a/system/easy-kernel/config-x86_64 b/system/easy-kernel/config-x86_64 index ba0b3beeb..0724f35f7 100644 --- a/system/easy-kernel/config-x86_64 +++ b/system/easy-kernel/config-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.33-mc6 Kernel Configuration +# Linux/x86 4.14.88-mc13 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -243,6 +243,7 @@ CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLUB_CPU_PARTIAL=y CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_PROFILING=y +CONFIG_HOTPLUG_SMT=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y @@ -279,6 +280,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y @@ -315,7 +317,6 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8 CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y CONFIG_HAVE_COPY_THREAD_TLS=y CONFIG_HAVE_STACK_VALIDATION=y -CONFIG_HAVE_RELIABLE_STACKTRACE=y # CONFIG_HAVE_ARCH_HASH is not set # CONFIG_ISA_BUS_API is not set CONFIG_OLD_SIGSUSPEND3=y @@ -440,7 +441,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y # CONFIG_X86_X2APIC is not set CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set -CONFIG_RETPOLINE=n +# CONFIG_RETPOLINE is not set # CONFIG_INTEL_RDT is not set CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_VSMP is not set @@ -514,7 +515,6 @@ 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 @@ -4538,8 +4538,8 @@ CONFIG_DRM_VGEM=m CONFIG_DRM_VMWGFX=m # CONFIG_DRM_VMWGFX_FBCON is not set CONFIG_DRM_GMA500=m -# CONFIG_DRM_GMA600 is not set -# CONFIG_DRM_GMA3600 is not set +CONFIG_DRM_GMA600=y +CONFIG_DRM_GMA3600=y CONFIG_DRM_UDL=m CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m @@ -6229,7 +6229,7 @@ CONFIG_UNUSED_SYMBOLS=y # CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_SECTION_MISMATCH_WARN_ONLY=y CONFIG_FRAME_POINTER=y -CONFIG_STACK_VALIDATION=n +# CONFIG_STACK_VALIDATION is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0 @@ -6583,7 +6583,6 @@ CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_SALSA20 is not set -# CONFIG_CRYPTO_SALSA20_X86_64 is not set # CONFIG_CRYPTO_CHACHA20 is not set # CONFIG_CRYPTO_CHACHA20_X86_64 is not set # CONFIG_CRYPTO_SEED is not set diff --git a/system/ed/APKBUILD b/system/ed/APKBUILD index b47e03f7a..38acc491c 100644 --- a/system/ed/APKBUILD +++ b/system/ed/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=ed -pkgver=1.14.2 -pkgrel=2 +pkgver=1.15 +pkgrel=0 pkgdesc="GNU ed is a line-oriented text editor. It is used to create, display, modify and otherwise manipulate text files" url="https://www.gnu.org/software/ed/" arch="all" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="653bcb89788b2d18c726336fb6f17678ac031fe6ea03a93ff248886a075c867ba5423d5471401e44cbdcce3b4cb766b621ca7b70d76881f5044ec3412767b11f ed-1.14.2.tar.lz" +sha512sums="27a16db41e88626b9718b1868f2fc629b609e436aca2450846f87492c61bf60cec3db0c54ff9a421d9bcbf59fe91a8c672aee5772e1b1eec8a365f227c30ecba ed-1.15.tar.lz" diff --git a/system/fortify-headers/APKBUILD b/system/fortify-headers/APKBUILD deleted file mode 100644 index 33ee4e317..000000000 --- a/system/fortify-headers/APKBUILD +++ /dev/null @@ -1,18 +0,0 @@ -# Contributor: Timo Teräs <timo.teras@iki.fi> -# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> -pkgname=fortify-headers -pkgver=1.0 -pkgrel=0 -pkgdesc="libc-agnostic implementation of FORTIFY_SOURCE" -url="https://git.2f30.org/fortify-headers/" -arch="noarch" -options="!check" # No test suite. -license="0BSD" -source="https://dl.2f30.org/releases/$pkgname-$pkgver.tar.gz" - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" PREFIX=/usr install -} - -sha512sums="085a725da9a6da0eea732ee77e3a3dc7d3c96bc3344172523db5f1e35391492910a050c15c560912115b2db916c2d6fa37e409e997c53399ee4fee912c5513e8 fortify-headers-1.0.tar.gz" diff --git a/system/fortify-headers/extension-cpp-fix.patch b/system/fortify-headers/extension-cpp-fix.patch deleted file mode 100644 index fc7bbb5f8..000000000 --- a/system/fortify-headers/extension-cpp-fix.patch +++ /dev/null @@ -1,175 +0,0 @@ -From a29bd89353a05454e2545d52124f9a1a61b4e3e3 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Sat, 23 Jun 2018 17:57:48 -0500 -Subject: [PATCH] Don't use __extension__ in C++ code - -A few important notes: - -* __extension__ is a GNU C "alternate" keyword, not a C++ keyword.[1] - -* __extension__ is designed to work on "expressions"; it does work on - #include_next in C mode, but it has no effect in C++ mode; the - warning will still appear, if enabled, even with __extension__ - preceding #include_next. This is because #include_next is not - considered an expression in C++, so the compiler attaches - __extension__ to the first expression of the header. - -All of this leads us to a build failure while building at least all -Mozilla software. Moz has an alternate -isystem dir searched before -/usr/include that overrides some headers, including <features.h>. The -first statement in each of these headers is a #pragma, and since -__extension__ is looking for an expression, and #pragma is a "null" -expression, we end up with the following error: - -dist/system_wrappers/features.h:1:9: error: '#pragma' is not allowed here - -Since __extension__ has no effect on #include_next in C++ mode anyway, -and since it can cause breakage, this commit omits __extension__ in C++ -mode. - -[1]: https://gcc.gnu.org/onlinedocs/gcc-6.4.0/gcc/Alternate-Keywords.html ---- - include/poll.h | 2 ++ - include/stdio.h | 2 ++ - include/stdlib.h | 4 ++++ - include/string.h | 2 ++ - include/sys/select.h | 2 ++ - include/sys/socket.h | 2 ++ - include/unistd.h | 2 ++ - include/wchar.h | 8 ++++++++ - 8 files changed, 24 insertions(+) - -diff --git a/include/poll.h b/include/poll.h -index 7b42866..24691f1 100644 ---- a/include/poll.h -+++ b/include/poll.h -@@ -16,7 +16,9 @@ - #ifndef _FORTIFY_POLL_H - #define _FORTIFY_POLL_H - -+#ifndef __cplusplus - __extension__ -+#endif - #include_next <poll.h> - - #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 -diff --git a/include/stdio.h b/include/stdio.h -index b67f9ce..a965184 100644 ---- a/include/stdio.h -+++ b/include/stdio.h -@@ -16,7 +16,9 @@ - #ifndef _FORTIFY_STDIO_H - #define _FORTIFY_STDIO_H - -+#ifndef __cplusplus - __extension__ -+#endif - #include_next <stdio.h> - - #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 -diff --git a/include/stdlib.h b/include/stdlib.h -index 7ff5746..ef70995 100644 ---- a/include/stdlib.h -+++ b/include/stdlib.h -@@ -16,12 +16,16 @@ - #ifndef _FORTIFY_STDLIB_H - #define _FORTIFY_STDLIB_H - -+#ifndef __cplusplus - __extension__ -+#endif - #include_next <stdlib.h> - - #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 - #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) -+#ifndef __cplusplus - __extension__ -+#endif - #include_next <limits.h> - #endif - -diff --git a/include/string.h b/include/string.h -index ff237b0..43c7485 100644 ---- a/include/string.h -+++ b/include/string.h -@@ -16,7 +16,9 @@ - #ifndef _FORTIFY_STRING_H - #define _FORTIFY_STRING_H - -+#ifndef __cplusplus - __extension__ -+#endif - #include_next <string.h> - - #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 -diff --git a/include/sys/select.h b/include/sys/select.h -index e4e398f..bcee8be 100644 ---- a/include/sys/select.h -+++ b/include/sys/select.h -@@ -16,7 +16,9 @@ - #ifndef _FORTIFY_SYS_SELECT_H - #define _FORTIFY_SYS_SELECT_H - -+#ifndef __cplusplus - __extension__ -+#endif - #include_next <sys/select.h> - - #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 -diff --git a/include/sys/socket.h b/include/sys/socket.h -index 7d3f023..ad6ab2d 100644 ---- a/include/sys/socket.h -+++ b/include/sys/socket.h -@@ -16,7 +16,9 @@ - #ifndef _FORTIFY_SYS_SOCKET_H - #define _FORTIFY_SYS_SOCKET_H - -+#ifndef __cplusplus - __extension__ -+#endif - #include_next <sys/socket.h> - - #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 -diff --git a/include/unistd.h b/include/unistd.h -index d3ab246..71dda84 100644 ---- a/include/unistd.h -+++ b/include/unistd.h -@@ -16,7 +16,9 @@ - #ifndef _FORTIFY_UNISTD_H - #define _FORTIFY_UNISTD_H - -+#ifndef __cplusplus - __extension__ -+#endif - #include_next <unistd.h> - - #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 -diff --git a/include/wchar.h b/include/wchar.h -index 7394598..3cb6f92 100644 ---- a/include/wchar.h -+++ b/include/wchar.h -@@ -16,13 +16,21 @@ - #ifndef _FORTIFY_WCHAR_H - #define _FORTIFY_WCHAR_H - -+#ifndef __cplusplus - __extension__ -+#endif - #include_next <limits.h> -+#ifndef __cplusplus - __extension__ -+#endif - #include_next <stdlib.h> -+#ifndef __cplusplus - __extension__ -+#endif - #include_next <string.h> -+#ifndef __cplusplus - __extension__ -+#endif - #include_next <wchar.h> - - #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 --- -2.15.0 - diff --git a/system/gdb/APKBUILD b/system/gdb/APKBUILD index b038ca23f..021848629 100644 --- a/system/gdb/APKBUILD +++ b/system/gdb/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gdb pkgver=8.2 -pkgrel=0 +pkgrel=1 pkgdesc="The GNU Debugger" url="https://www.sourceware.org/gdb/" arch="all" @@ -17,6 +17,7 @@ source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz ppc-musl.patch ppc-ptregs.patch remove-extraneous-include.patch + stopcode-lock.patch " build() { @@ -60,4 +61,5 @@ sha512sums="11cc481bebc51eb6db73249ecb62b8c07455cf3db169f4860b3a83114849fbd2b586 986e68275f7692f39b5d8aedeb9f9e88f0e5bebb3f8c7f104933c525d35ca54fc90e18698c1e3e1009e8a188e5e70d6f252cb39e4c75e37db7bf479017e0da32 s390x-use-elf-gdb_fpregset_t.patch 04911f87904b62dd7662435f9182b20485afb29ddb3d6398a9d31fef13495f7b70639c77fdae3a40e2775e270d7cd40d0cfd7ddf832372b506808d33c8301e01 ppc-musl.patch b75e1c1ee503a1948a7d5b8d90427b5c7d38ded69978056cee0adca222771a5c95ed1ac73127fcae7b795ea94296344eee5fca47e4cd04b418c164a756fb0933 ppc-ptregs.patch -3ff31774ba78c1208415289566b901debd815da8b53acefe4a0785e7b2bbcff39585a556d44ff2f7d8d639ebc047620b96e72573acae376d8f23aa98dd1fe286 remove-extraneous-include.patch" +3ff31774ba78c1208415289566b901debd815da8b53acefe4a0785e7b2bbcff39585a556d44ff2f7d8d639ebc047620b96e72573acae376d8f23aa98dd1fe286 remove-extraneous-include.patch +720d6cbc71d5d4f5cc8955b18a76661688534d409e2beb53e9e2d2322a303fa622e622b583e1f6c50cf3f32b8abe4f5320a6885e7680769c92ef5bb09ef59d1d stopcode-lock.patch" diff --git a/system/gdb/stopcode-lock.patch b/system/gdb/stopcode-lock.patch new file mode 100644 index 000000000..6a4e3d855 --- /dev/null +++ b/system/gdb/stopcode-lock.patch @@ -0,0 +1,75 @@ +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/libc-dev/APKBUILD b/system/libc-dev/APKBUILD deleted file mode 100644 index 4ead3c13b..000000000 --- a/system/libc-dev/APKBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: William Pitcock <nenolod@dereferenced.org> -pkgname=libc-dev -pkgver=0.7.1 -pkgrel=0 -pkgdesc="Meta package to pull in correct libc" -url="http://alpinelinux.org" -arch="noarch" -license="BSD-2-Clause AND BSD-3-Clause" -makedepends_build=" " -makedepends_host=" " -makedepends="$makedepends_build $makedepends_host" -depends="$CLIBC-dev" -subpackages="libc-utils:utils bsd-compat-headers:bsdcompat" -source="sys-cdefs.h - sys-queue.h - sys-tree.h - " - -prepare() { - mkdir -p "$builddir" - cd "$builddir" -} - -build() { - return 0 -} - -check() { - return 0 -} - -package() { - mkdir -p "$pkgdir" -} - -utils() { - depends="$CLIBC-utils" - - mkdir -p "$subpkgdir" -} - -bsdcompat() { - pkgdesc="BSD compatibility headers (cdefs, queue, tree)" - depends="" - - mkdir -p "$subpkgdir" - case "$CLIBC" in - musl) - install -D "$srcdir"/sys-cdefs.h "$subpkgdir"/usr/include/sys/cdefs.h - install -D "$srcdir"/sys-queue.h "$subpkgdir"/usr/include/sys/queue.h - install -D "$srcdir"/sys-tree.h "$subpkgdir"/usr/include/sys/tree.h - ;; - esac -} - -sha512sums="8c3fddd73b696a38e633953715c79c47703739be27ee085fc6c960a57b6746ca05bf6406f7e6126cc1a13204254fd5830afb566624e1f298f4d6b58216013c28 sys-cdefs.h -2f0d5e6e4dc3350285cf17009265dddcbe12431c111868eea39bc8cb038ab7c1f2acacbb21735c4e9d4a1fd106a8fc0f8611ea33987d4faba37dde5ce6da0750 sys-queue.h -07cb70f2f0ddb31e23dd913c6f561fc9885667c5803fdf3a559676c99d08834b4104589bacb5d17b4a0b379c68c81a1cf3173832b3da33a7b936fa7b93706844 sys-tree.h" diff --git a/system/man-db/APKBUILD b/system/man-db/APKBUILD index e8b60b75f..0e0aa9724 100644 --- a/system/man-db/APKBUILD +++ b/system/man-db/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=man-db pkgver=2.8.4 -pkgrel=0 +pkgrel=1 pkgdesc="The man command and related utilities for examining on-line help files" url="http://www.nongnu.org/man-db/" arch="all" diff --git a/system/man-db/man-db.trigger b/system/man-db/man-db.trigger index fb76aa38c..f9de5961c 100644 --- a/system/man-db/man-db.trigger +++ b/system/man-db/man-db.trigger @@ -1,3 +1,3 @@ #!/bin/sh -exec /usr/bin/mandb /usr/share/man +exec /usr/bin/mandb /usr/share/man >/dev/null diff --git a/system/musl/2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch b/system/musl/2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch deleted file mode 100644 index b39664dac..000000000 --- a/system/musl/2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 58dec23397e3fcc4300cc03839ce5e508389abbc Mon Sep 17 00:00:00 2001 -From: William Pitcock <nenolod@dereferenced.org> -Date: Thu, 22 Jun 2017 22:04:51 +0000 -Subject: [PATCH] pthread internals: increase DEFAULT_GUARD_SIZE to 2 pages - instead of 1 page. - -This is intended to be a proactive mitigation against any bugs similar to CVE-2017-1000366. - -Signed-off-by: William Pitcock <nenolod@dereferenced.org> ---- - src/internal/pthread_impl.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h -index ae0ab1c5..ad4ea3fa 100644 ---- a/src/internal/pthread_impl.h -+++ b/src/internal/pthread_impl.h -@@ -146,7 +146,7 @@ void __block_app_sigs(void *); - void __restore_sigs(void *); - - #define DEFAULT_STACK_SIZE 81920 --#define DEFAULT_GUARD_SIZE 4096 -+#define DEFAULT_GUARD_SIZE 8192 - - #define __ATTRP_C11_THREAD ((void*)(uintptr_t)-1) - --- -2.13.0 - diff --git a/system/musl/APKBUILD b/system/musl/APKBUILD index dbbfe640c..bffa25154 100644 --- a/system/musl/APKBUILD +++ b/system/musl/APKBUILD @@ -1,16 +1,14 @@ -# Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=musl -pkgver=1.1.20 -pkgrel=5 +pkgver=1.1.21 +pkgrel=3 pkgdesc="System library (libc) implementation" url="http://www.musl-libc.org/" arch="all" options="!check" license="MIT" depends="" -depends_dev="!uclibc-dev" -makedepends="$depends_dev" +makedepends="" subpackages="$pkgname-dev" case "$BOOTSTRAP" in nocc) pkgname="musl-dev" @@ -25,14 +23,10 @@ nolibc) ;; esac source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz amalgamation.patch - 2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch 3001-make-real-lastlog-h.patch handle-aux-at_base.patch - fix-file-locking-race.patch - dcngettext-null-deref.patch - getaddrinfo-regression.patch - ppc64-atomic.patch - dynamic-binary-stack-size.patch + fgetspent_r.patch + gettext-preserve-errno.patch ldconfig getent.c @@ -103,8 +97,14 @@ package() { rm "$pkgdir"/usr/include/utmpx.h # utmps } +dev() { + provides="libc-dev=$pkgver-r$pkgrel" + default_dev +} + utils() { depends="!uclibc-utils scanelf" + provides="libc-utils=$pkgver-r$pkgrel" replaces="libiconv uclibc-utils" license="BSD-2-Clause AND GPL-2.0+" @@ -119,16 +119,12 @@ utils() { install -D -m755 "$srcdir"/ldconfig "$subpkgdir"/sbin } -sha512sums="d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d musl-1.1.20.tar.gz +sha512sums="fa6c4cc012626c5e517e0e10926fc845e3aa5f863ffaceeb38ac5b9ce0af631a37f6b94f470997db09aa0d5e03f4f28a2db83484b0f98481bea2239c1989d363 musl-1.1.21.tar.gz 3162b778101a46d9fb3a38927e3c4969781ccdabb9bb72de10d48ea31691215ecba605faee945ed86144a7e31fc948c31c2fee2881dc07897be3e82b6c6ff1e6 amalgamation.patch -2c8e1dde1834238097b2ee8a7bfb53471a0d9cff4a5e38b55f048b567deff1cdd47c170d0578a67b1a039f95a6c5fbb8cff369c75b6a3e4d7ed171e8e86ebb8c 2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch 88ae443dbb8e0a4368235bdc3a1c5c7b718495afa75e06deb8e01becc76cb1f0d6964589e2204fc749c9c1b3190b8b9ac1ae2c0099cab8e2ce3ec877103d4332 3001-make-real-lastlog-h.patch 6a7ff16d95b5d1be77e0a0fbb245491817db192176496a57b22ab037637d97a185ea0b0d19da687da66c2a2f5578e4343d230f399d49fe377d8f008410974238 handle-aux-at_base.patch -b967339d9048161583523e847be91779adb0e16cc225d6ff85ef51748269b2dab08a0b8e558ad01469135837a9df76a59bf9a31791dd4063d75bc5efe6e94861 fix-file-locking-race.patch -a08d1b170356beea333ace1da12f8a8399ca80c5d9c32ff2fcd8562537a670214f566e4b1219a11b32129078e22fbf7009bb277b7de8550a89352a64b3b5090d dcngettext-null-deref.patch -e3953a3a73ef11696dd3eb216e18b152ae35198d8bff686d157e27bc90fb558f9a0be518025a90534e9afd6ea1bf731ffdb6fcb202bb9368f2c8eec7ca886141 getaddrinfo-regression.patch -aae9110eccb8cd7dcd3c957fcb01ed524598f79f7fa1a16b9993af40793545d1ec211e7e6aeabe7af7715d94cc26a473ea0acf6d6e66019bf65f03d4b8e24a4b ppc64-atomic.patch -654f76c96ed0e69e19b1a20569e83751bb207a8c181b26742f505638095dde3f4dd3f785deb92c49a603bd15cd8d4932129f567de8cd2edffdd8551c4dfd6976 dynamic-binary-stack-size.patch +ded41235148930f8cf781538f7d63ecb0c65ea4e8ce792565f3649ee2523592a76b2a166785f0b145fc79f5852fd1fb1729a7a09110b3b8f85cba3912e790807 fgetspent_r.patch +db180e437b8b7582e4d2baf06b592b88a9f6e5a8f18b7afa81d7a707240a774273778f8fec1c5cbea2a137e00cca49ff08fe762c871be20c70b50104b7e8e1e1 gettext-preserve-errno.patch cce2f1eeb61e55674469c26871a573cce61d739c3defe9c8f56f2b774f6ba5435849ad542a6714120efddc98c297098e9c98a1a424ac593df2243d4aa479f9a9 ldconfig 378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413 getent.c 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf iconv.c" diff --git a/system/musl/__stack_chk_fail_local.c b/system/musl/__stack_chk_fail_local.c deleted file mode 100644 index 2b403a6e0..000000000 --- a/system/musl/__stack_chk_fail_local.c +++ /dev/null @@ -1,2 +0,0 @@ -extern void __stack_chk_fail(void); -void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); } diff --git a/system/musl/dcngettext-null-deref.patch b/system/musl/dcngettext-null-deref.patch deleted file mode 100644 index bcc385e86..000000000 --- a/system/musl/dcngettext-null-deref.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 017e67ddde79fa2b6187a5e56b1e92bafc7c4cd2 Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Fri, 14 Sep 2018 13:00:41 -0400 -Subject: drop lazy plural forms init in dcngettext - -there is no good reason to wait to find and process the plural rules -for a translated message file until a gettext form requesting plural -rule processing is used. it just imposes additional synchronization, -here in the form of clunky use of atomics. - -it looks like there may also have been a race condition where nplurals -could be seen without plural_rule being seen, possibly leading to null -pointer dereference. if so, this commit fixes it. ---- - src/locale/dcngettext.c | 35 +++++++++++++++++------------------ - 1 file changed, 17 insertions(+), 18 deletions(-) - -diff --git a/src/locale/dcngettext.c b/src/locale/dcngettext.c -index 7fbe7196..8b891d00 100644 ---- a/src/locale/dcngettext.c -+++ b/src/locale/dcngettext.c -@@ -100,8 +100,8 @@ struct msgcat { - struct msgcat *next; - const void *map; - size_t map_size; -- void *volatile plural_rule; -- volatile int nplurals; -+ const char *plural_rule; -+ int nplurals; - struct binding *binding; - const struct __locale_map *lm; - int cat; -@@ -200,20 +200,7 @@ notrans: - p->lm = lm; - p->map = map; - p->map_size = map_size; -- do { -- old_cats = cats; -- p->next = old_cats; -- } while (a_cas_p(&cats, old_cats, p) != old_cats); -- } -- -- const char *trans = __mo_lookup(p->map, p->map_size, msgid1); -- if (!trans) goto notrans; -- -- /* Non-plural-processing gettext forms pass a null pointer as -- * msgid2 to request that dcngettext suppress plural processing. */ -- if (!msgid2) return (char *)trans; - -- if (!p->plural_rule) { - const char *rule = "n!=1;"; - unsigned long np = 2; - const char *r = __mo_lookup(p->map, p->map_size, ""); -@@ -237,10 +224,22 @@ notrans: - rule = r+7; - } - } -- a_store(&p->nplurals, np); -- a_cas_p(&p->plural_rule, 0, (void *)rule); -+ p->nplurals = np; -+ p->plural_rule = rule; -+ -+ do { -+ old_cats = cats; -+ p->next = old_cats; -+ } while (a_cas_p(&cats, old_cats, p) != old_cats); - } -- if (p->nplurals) { -+ -+ const char *trans = __mo_lookup(p->map, p->map_size, msgid1); -+ if (!trans) goto notrans; -+ -+ /* Non-plural-processing gettext forms pass a null pointer as -+ * msgid2 to request that dcngettext suppress plural processing. */ -+ -+ if (msgid2 && p->nplurals) { - unsigned long plural = __pleval(p->plural_rule, n); - if (plural > p->nplurals) goto notrans; - while (plural--) { --- -cgit v1.2.1 - diff --git a/system/musl/dynamic-binary-stack-size.patch b/system/musl/dynamic-binary-stack-size.patch deleted file mode 100644 index e2e3f12d3..000000000 --- a/system/musl/dynamic-binary-stack-size.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 7b3348a98c139b4b4238384e52d4b0eb237e4833 Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Tue, 18 Sep 2018 23:54:18 -0400 -Subject: support setting of default thread stack size via PT_GNU_STACK header - -this facilitates building software that assumes a large default stack -size without any patching to call pthread_setattr_default_np or -pthread_attr_setstacksize at each thread creation site, using just -LDFLAGS. - -normally the PT_GNU_STACK header is used only to reflect whether -executable stack is desired, but with GNU ld at least, passing --Wl,-z,stack-size=N will set a size on the program header. with this -patch, that size will be incorporated into the default stack size -(subject to increase-only rule and DEFAULT_STACK_MAX limit). - -both static and dynamic linking honor the program header. for dynamic -linking, all libraries loaded at program start, including preloaded -ones, are considered. dlopened libraries are not considered, for -several reasons. extra logic would be needed to defer processing until -the load of the new library is commited, synchronization woud be -needed since other threads may be running concurrently, and the -effectiveness woud be limited since the larger size would not apply to -threads that already existed at the time of dlopen. programs that will -dlopen code expecting a large stack need to declare the requirement -themselves, or pthread_setattr_default_np can be used. ---- - ldso/dynlink.c | 12 ++++++++++++ - src/env/__init_tls.c | 5 +++++ - 2 files changed, 17 insertions(+) - -diff --git a/ldso/dynlink.c b/ldso/dynlink.c -index e4829c3a..3ecbddfa 100644 ---- a/ldso/dynlink.c -+++ b/ldso/dynlink.c -@@ -22,6 +22,7 @@ - #include "dynlink.h" - - static void error(const char *, ...); -+extern size_t __default_stacksize; - - #define MAXP2(a,b) (-(-(a)&-(b))) - #define ALIGN(x,y) ((x)+(y)-1 & -(y)) -@@ -609,6 +610,12 @@ static void *map_library(int fd, struct dso *dso) - } else if (ph->p_type == PT_GNU_RELRO) { - dso->relro_start = ph->p_vaddr & -PAGE_SIZE; - dso->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE; -+ } else if (ph->p_type == PT_GNU_STACK) { -+ if (!runtime && ph->p_memsz > __default_stacksize) { -+ __default_stacksize = -+ ph->p_memsz < (8<<20) ? -+ ph->p_memsz : (8<<20); -+ } - } - if (ph->p_type != PT_LOAD) continue; - nsegs++; -@@ -1238,6 +1245,12 @@ static void kernel_mapped_dso(struct dso *p) - } else if (ph->p_type == PT_GNU_RELRO) { - p->relro_start = ph->p_vaddr & -PAGE_SIZE; - p->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE; -+ } else if (ph->p_type == PT_GNU_STACK) { -+ if (!runtime && ph->p_memsz > __default_stacksize) { -+ __default_stacksize = -+ ph->p_memsz < (8<<20) ? -+ ph->p_memsz : (8<<20); -+ } - } - if (ph->p_type != PT_LOAD) continue; - if (ph->p_vaddr < min_addr) -diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c -index e0224243..96d0e284 100644 ---- a/src/env/__init_tls.c -+++ b/src/env/__init_tls.c -@@ -8,6 +8,8 @@ - #include "atomic.h" - #include "syscall.h" - -+extern size_t __default_stacksize; -+ - int __init_tp(void *p) - { - pthread_t td = p; -@@ -90,6 +91,11 @@ static void static_init_tls(size_t *aux) - base = (size_t)_DYNAMIC - phdr->p_vaddr; - if (phdr->p_type == PT_TLS) - tls_phdr = phdr; -+ if (phdr->p_type == PT_GNU_STACK && -+ phdr->p_memsz > __default_stacksize) -+ __default_stacksize = -+ phdr->p_memsz < (8<<20) ? -+ phdr->p_memsz : (8<<20); - } - - if (tls_phdr) { --- -cgit v1.2.1 - diff --git a/system/musl/fgetspent_r.patch b/system/musl/fgetspent_r.patch new file mode 100644 index 000000000..360aa8fe1 --- /dev/null +++ b/system/musl/fgetspent_r.patch @@ -0,0 +1,65 @@ +From 3489f9e5ef055c80464252fe640fead8aeb1068e Mon Sep 17 00:00:00 2001 +From: Markus Wichmann <nullplan@gmx.net> +Date: Sun, 20 Jan 2019 16:31:34 +0100 +Subject: [PATCH 5/5] Add fgetspent_r(). + +Interface was defined by glibc, and seems to have been adopted by +Solaris. Some freedesktop software appears to require it, and it adds +little bloat. + +Added without feature test macros, since no other interface in shadow.h +requires it, even the ones documented to have required it in the past. +--- + include/shadow.h | 1 + + src/passwd/fgetspent_r.c | 27 +++++++++++++++++++++++++++ + 2 files changed, 28 insertions(+) + create mode 100644 src/passwd/fgetspent_r.c + +diff --git a/include/shadow.h b/include/shadow.h +index 2b1be413..4edc90db 100644 +--- a/include/shadow.h ++++ b/include/shadow.h +@@ -33,6 +33,7 @@ int putspent(const struct spwd *, FILE *); + + struct spwd *getspnam(const char *); + int getspnam_r(const char *, struct spwd *, char *, size_t, struct spwd **); ++int fgetspent_r(FILE *f, struct spwd* sp, char *line, size_t size, struct spwd **spret); + + int lckpwdf(void); + int ulckpwdf(void); +diff --git a/src/passwd/fgetspent_r.c b/src/passwd/fgetspent_r.c +new file mode 100644 +index 00000000..643637de +--- /dev/null ++++ b/src/passwd/fgetspent_r.c +@@ -0,0 +1,27 @@ ++#include "pwf.h" ++#include <pthread.h> ++#include <limits.h> ++#include <stdio.h> ++ ++int fgetspent_r(FILE *f, struct spwd *sp, char *line, size_t size, struct spwd **spret) ++{ ++ int res = EIO; ++ int cs; ++ *spret = 0; ++ if (size > INT_MAX) ++ size = INT_MAX; //2GB ought to be enough for anyone ++ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); ++ if (!fgets(line, size, f)) ++ goto out; ++ res = ERANGE; ++ if (line[strlen(line) - 1] != '\n') ++ goto out; ++ res = EILSEQ; ++ if ( __parsespent(line, sp) < 0) ++ goto out; ++ *spret = sp; ++ res = 0; ++out: ++ pthread_setcancelstate(cs, 0); ++ return res; ++} +-- +2.19.1 + diff --git a/system/musl/fix-file-locking-race.patch b/system/musl/fix-file-locking-race.patch deleted file mode 100644 index 2ef91390a..000000000 --- a/system/musl/fix-file-locking-race.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0db393d3a77bb9f300a356c6a5484fc2dddb161d Mon Sep 17 00:00:00 2001 -From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> -Date: Tue, 18 Sep 2018 10:03:27 +0300 -Subject: fix race condition in file locking - -The condition occurs when -- thread #1 is holding the lock -- thread #2 is waiting for it on __futexwait -- thread #1 is about to release the lock and performs a_swap -- thread #3 enters the __lockfile function and manages to grab the lock - before thread #1 calls __wake, resetting the MAYBE_WAITERS flag -- thread #1 calls __wake -- thread #2 wakes up but goes again to __futexwait as the lock is - held by thread #3 -- thread #3 releases the lock but does not call __wake as the - MAYBE_WAITERS flag is not set - -This condition results in thread #2 not being woken up. This patch fixes -the problem by making the woken up thread ensure that the flag is -properly set before going to sleep again. - -Mainainer's note: This fixes a regression introduced in commit -c21f750727515602a9e84f2a190ee8a0a2aeb2a1. ---- - src/stdio/__lockfile.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/stdio/__lockfile.c b/src/stdio/__lockfile.c -index 2ff75d8a..0dcb2a42 100644 ---- a/src/stdio/__lockfile.c -+++ b/src/stdio/__lockfile.c -@@ -8,13 +8,13 @@ int __lockfile(FILE *f) - int owner = f->lock, tid = __pthread_self()->tid; - if ((owner & ~MAYBE_WAITERS) == tid) - return 0; -- for (;;) { -- owner = a_cas(&f->lock, 0, tid); -- if (!owner) return 1; -- if (a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner) break; -+ owner = a_cas(&f->lock, 0, tid); -+ if (!owner) return 1; -+ while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) { -+ if ((owner & MAYBE_WAITERS) || -+ a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner) -+ __futexwait(&f->lock, owner|MAYBE_WAITERS, 1); - } -- while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) -- __futexwait(&f->lock, owner, 1); - return 1; - } - --- -cgit v1.2.1 - diff --git a/system/musl/getaddrinfo-regression.patch b/system/musl/getaddrinfo-regression.patch deleted file mode 100644 index 28d4558b8..000000000 --- a/system/musl/getaddrinfo-regression.patch +++ /dev/null @@ -1,51 +0,0 @@ -From f381c118b2d4f7d914481d3cdc830ce41369b002 Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Wed, 19 Sep 2018 18:03:22 -0400 -Subject: fix getaddrinfo regression with AI_ADDRCONFIG on some configurations - -despite not being documented to do so in the standard or Linux -documentation, attempts to udp connect to 127.0.0.1 or ::1 generate -EADDRNOTAVAIL when the loopback device is not configured and there is -no default route for IPv6. this caused getaddrinfo with AI_ADDRCONFIG -to fail with EAI_SYSTEM and EADDRNOTAVAIL on some no-IPv6 -configurations, rather than the intended behavior of detecting IPv6 as -unsuppported and producing IPv4-only results. - -previously, only EAFNOSUPPORT was treated as unavailability of the -address family being probed. instead, treat all errors related to -inability to get an address or route as conclusive that the family -being probed is unsupported, and only fail with EAI_SYSTEM on other -errors. - -further improvements may be desirable, such as reporting EAI_AGAIN -instead of EAI_SYSTEM for errors which are expected to be transient, -but this patch should suffice to fix the serious regression. ---- - src/network/getaddrinfo.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c -index ba26847a..e33bfa28 100644 ---- a/src/network/getaddrinfo.c -+++ b/src/network/getaddrinfo.c -@@ -76,7 +76,16 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru - close(s); - if (!r) continue; - } -- if (errno != EAFNOSUPPORT) return EAI_SYSTEM; -+ switch (errno) { -+ case EADDRNOTAVAIL: -+ case EAFNOSUPPORT: -+ case EHOSTUNREACH: -+ case ENETDOWN: -+ case ENETUNREACH: -+ break; -+ default: -+ return EAI_SYSTEM; -+ } - if (family == tf[i]) return EAI_NONAME; - family = tf[1-i]; - } --- -cgit v1.2.1 - diff --git a/system/musl/gettext-preserve-errno.patch b/system/musl/gettext-preserve-errno.patch new file mode 100644 index 000000000..c55df3e21 --- /dev/null +++ b/system/musl/gettext-preserve-errno.patch @@ -0,0 +1,28 @@ +diff --git a/src/locale/dcngettext.c b/src/locale/dcngettext.c +index 8b891d00..4c304393 100644 +--- a/src/locale/dcngettext.c ++++ b/src/locale/dcngettext.c +@@ -122,6 +122,7 @@ char *dcngettext(const char *domainname, const char *msgid1, const char *msgid2, + const struct __locale_map *lm; + size_t domlen; + struct binding *q; ++ int old_errno = errno; + + if ((unsigned)category >= LC_ALL) goto notrans; + +@@ -138,6 +139,7 @@ char *dcngettext(const char *domainname, const char *msgid1, const char *msgid2, + lm = loc->cat[category]; + if (!lm) { + notrans: ++ errno = old_errno; + return (char *) ((n == 1) ? msgid1 : msgid2); + } + +@@ -250,6 +252,7 @@ notrans: + trans += l+1; + } + } ++ errno = old_errno; + return (char *)trans; + } + diff --git a/system/musl/ppc64-atomic.patch b/system/musl/ppc64-atomic.patch deleted file mode 100644 index 6e96a9048..000000000 --- a/system/musl/ppc64-atomic.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 12817793301398241b6cb00c740f0d3ca41076e9 Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Fri, 14 Sep 2018 10:47:16 -0400 -Subject: fix broken atomic store on powerpc[64] - -in our memory model, all atomics are supposed to be full barriers; -stores are not release-only. this is important because store is used -as an unlock operation in places where it needs to acquire the waiter -count to determine if a futex wake is needed. at least in the -malloc-internal locks, but possibly elsewhere, soft deadlocks from -missing futex wake (breakable by poking the threads to restart the -syscall, e.g. by attaching a tracer) were reported to occur. - -once the malloc lock is replaced with Jens Gustedt's new lock -implementation (see commit 47d0bcd4762f223364e5b58d5a381aaa0cbd7c38), -malloc will not be affected by the issue, but it's not clear that -other uses won't be. reducing the strength of the ordering properties -required from a_store would require a thorough analysis of how it's -used. - -to fix the problem, I'm removing the powerpc[64]-specific a_store -definition; now, the top-level atomic.h will implement a_store using -a_barrier on both sides of the store. - -it's not clear to me yet whether there might be issues with the other -atomics. it's possible that a_post_llsc needs to be replaced with a -full barrier to guarantee the formal semanics we want, but either way -I think the difference is unlikely to impact the way we use them. ---- - arch/powerpc/atomic_arch.h | 8 -------- - arch/powerpc64/atomic_arch.h | 8 -------- - 2 files changed, 16 deletions(-) - -diff --git a/arch/powerpc/atomic_arch.h b/arch/powerpc/atomic_arch.h -index 5b65cde7..c2673919 100644 ---- a/arch/powerpc/atomic_arch.h -+++ b/arch/powerpc/atomic_arch.h -@@ -30,14 +30,6 @@ static inline void a_post_llsc() - __asm__ __volatile__ ("isync" : : : "memory"); - } - --#define a_store a_store --static inline void a_store(volatile int *p, int v) --{ -- a_pre_llsc(); -- *p = v; -- a_post_llsc(); --} -- - #define a_clz_32 a_clz_32 - static inline int a_clz_32(uint32_t x) - { -diff --git a/arch/powerpc64/atomic_arch.h b/arch/powerpc64/atomic_arch.h -index 17cababd..2bed82be 100644 ---- a/arch/powerpc64/atomic_arch.h -+++ b/arch/powerpc64/atomic_arch.h -@@ -48,14 +48,6 @@ static inline void a_post_llsc() - __asm__ __volatile__ ("isync" : : : "memory"); - } - --#define a_store a_store --static inline void a_store(volatile int *p, int v) --{ -- a_pre_llsc(); -- *p = v; -- a_post_llsc(); --} -- - #define a_crash a_crash - static inline void a_crash() - { --- -cgit v1.2.1 - diff --git a/system/nspr/APKBUILD b/system/nspr/APKBUILD index a6da52de1..bf0c907e8 100644 --- a/system/nspr/APKBUILD +++ b/system/nspr/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nspr pkgver=4.20 -pkgrel=0 +pkgrel=1 pkgdesc="Netscape Portable Runtime" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" arch="all" @@ -14,6 +14,7 @@ makedepends="autoconf automake" subpackages="$pkgname-dev" source="http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$pkgver/src/nspr-$pkgver.tar.gz fix-getproto.patch + stacksize.patch " prepare() { @@ -61,4 +62,5 @@ package() { } sha512sums="22fdf7627f450b0594ebccaee170098e1a8cd0f429fd44816f1322756002ced3d69cf686c3f69f7cb30b8132d3605a9fce5457ab99d0002e6af11a3408a5c949 nspr-4.20.tar.gz -ee654f609a90b9a95c1901ad1d56cdef7cce8bca9efc092198607944f142f8fec924b13219ca6663facd0f0d59b671b8b3de58ab3449c4c863d42e2937f02184 fix-getproto.patch" +ee654f609a90b9a95c1901ad1d56cdef7cce8bca9efc092198607944f142f8fec924b13219ca6663facd0f0d59b671b8b3de58ab3449c4c863d42e2937f02184 fix-getproto.patch +1f694fc151f6578080449e3aa999c520486bbe117b8237150966ec43092db4156e81412ac889045e0c0c3bf65d459af5bdc1cf19c9fa3dab120405a60732f15a stacksize.patch" diff --git a/system/nspr/stacksize.patch b/system/nspr/stacksize.patch new file mode 100644 index 000000000..c2fcecd68 --- /dev/null +++ b/system/nspr/stacksize.patch @@ -0,0 +1,22 @@ +set a minimum stack size on ppc64 to prevent crashes + +Firefox, a user of nspr, attempts to set a stack size of 32k in its +JS watchdog, which the pthreads impl doesn't like and fails. + +Coincidentally, nspr here is compiled with debug on, which means it has +assertions turned on; under normal circumstances, those would be disabled, +the stack size set call would fail and everything would fall back on the +default 2M stacksize, but it would still be wrong - therefore, establish +a minimum, just like for aarch64. + +--- nspr-4.20/nspr/pr/include/md/_linux.h.old 2018-08-28 12:42:28.000000000 +0000 ++++ nspr-4.20/nspr/pr/include/md/_linux.h 2019-02-18 17:35:30.380000000 +0000 +@@ -71,7 +71,7 @@ + #define _MD_DEFAULT_STACK_SIZE 65536L + #define _MD_MMAP_FLAGS MAP_PRIVATE + +-#if defined(__aarch64__) || defined(__mips__) ++#if defined(__aarch64__) || defined(__mips__) || defined(__powerpc64__) + #define _MD_MINIMUM_STACK_SIZE 0x20000 + #endif + diff --git a/system/openrc/APKBUILD b/system/openrc/APKBUILD index a252385b5..dac0cec8d 100644 --- a/system/openrc/APKBUILD +++ b/system/openrc/APKBUILD @@ -4,7 +4,7 @@ pkgver=0.24.1 _ver=${pkgver/_git*/} pkgrel=6 pkgdesc="OpenRC manages the services, startup and shutdown of a host" -url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git" +url="https://github.com/OpenRC/openrc" arch="all" license="BSD-2-Clause" depends="psmisc /sbin/init" diff --git a/system/openssh/APKBUILD b/system/openssh/APKBUILD index 4394eb5c2..145fc5c86 100644 --- a/system/openssh/APKBUILD +++ b/system/openssh/APKBUILD @@ -4,7 +4,7 @@ pkgname=openssh pkgver=7.9_p1 _myver=${pkgver%_*}${pkgver#*_} -pkgrel=0 +pkgrel=2 pkgdesc="Port of OpenBSD's free SSH release" url="http://www.openssh.org/portable.html" arch="all" @@ -20,12 +20,13 @@ subpackages="$pkgname-doc $pkgname-client $pkgname-keysign $pkgname-sftp-server:sftp - $pkgname-server-common:server_common:noarch $pkgname-server + $pkgname-openrc " source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz bsd-compatible-realpath.patch + CVE-2018-20685.patch disable-forwarding-by-default.patch fix-utmpx.patch openssh7.4-peaktput.patch @@ -36,6 +37,8 @@ source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar sshd.confd " # secfixes: +# 7.9_p1-r2: +# - CVE-2018-20685 # 7.9_p1: # - CVE-2018-15473 # 7.7_p1: @@ -131,30 +134,26 @@ sftp() { "$subpkgdir"/usr/lib/ssh/ } -server_common() { - pkgdesc="OpenSSH server configuration files" - depends="" - for i in etc/ssh/sshd_config \ - etc/init.d/sshd \ - etc/conf.d/sshd; do - - install -d "$subpkgdir"/${i%/*} - mv "$pkgdir"/$i \ - "$subpkgdir"/${i%/*}/ - - done -} - server() { pkgdesc="OpenSSH server" - depends="openssh-keygen openssh-server-common" + depends="openssh-keygen" + replaces="openssh-server-common" cd "$builddir" install -d "$subpkgdir"/usr/sbin + install -d "$subpkgdir"/etc/ssh mv "$pkgdir"/usr/sbin/sshd "$subpkgdir"/usr/sbin/ + mv "$pkgdir"/etc/ssh/sshd_config "$subpkgdir"/etc/ssh/ +} + +openrc() { + default_openrc + depends="openssh-server" + install_if="openssh-server=$pkgver-r$pkgrel openrc" } sha512sums="0412c9c429c9287f0794023951469c8e6ec833cdb55821bfa0300dd90d0879ff60484f620cffd93372641ab69bf0b032c2d700ccc680950892725fb631b7708e openssh-7.9p1.tar.gz f2b8daa537ea3f32754a4485492cc6eb3f40133ed46c0a5a29a89e4bcf8583d82d891d94bf2e5eb1c916fa68ec094abf4e6cd641e9737a6c05053808012b3a73 bsd-compatible-realpath.patch +b8907d3d6ebceeca15f6bc97551a7613c68df5c31e4e76d43b7c0bd9ad42dedcabc20a2cc5404b89f40850a4765b24892bde50eab1db55c96ad5cf23bb1f8d04 CVE-2018-20685.patch 8df35d72224cd255eb0685d2c707b24e5eb24f0fdd67ca6cc0f615bdbd3eeeea2d18674a6af0c6dab74c2d8247e2370d0b755a84c99f766a431bc50c40b557de disable-forwarding-by-default.patch 0c1e832cec420bc7b57558041d2288912a438db97050b87f6a57e94a2741a374cc5d141fe352968b0d1ba6accaff965794463fe9169d136678a8915a60d2f0b7 fix-utmpx.patch 398096a89aa104abeff31aa043ac406a6348e0fdd4d313b7888ee0b931d38fd71fc21bceee46145e88f03bc27e00890e068442faee2d33f86cfbc04d58ffa4b6 openssh7.4-peaktput.patch diff --git a/system/openssh/CVE-2018-20685.patch b/system/openssh/CVE-2018-20685.patch new file mode 100644 index 000000000..f2f1ecfc5 --- /dev/null +++ b/system/openssh/CVE-2018-20685.patch @@ -0,0 +1,33 @@ +From 6010c0303a422a9c5fa8860c061bf7105eb7f8b2 Mon Sep 17 00:00:00 2001 +From: "djm@openbsd.org" <djm@openbsd.org> +Date: Fri, 16 Nov 2018 03:03:10 +0000 +Subject: [PATCH] upstream: disallow empty incoming filename or ones that refer + to the + +current directory; based on report/patch from Harry Sintonen + +OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9 +--- + scp.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/scp.c b/scp.c +index 60682c687..4f3fdcd3d 100644 +--- a/scp.c ++++ b/scp.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */ ++/* $OpenBSD: scp.c,v 1.198 2018/11/16 03:03:10 djm Exp $ */ + /* + * scp - secure remote copy. This is basically patched BSD rcp which + * uses ssh to do the data transfer (instead of using rcmd). +@@ -1106,7 +1106,8 @@ sink(int argc, char **argv) + SCREWUP("size out of range"); + size = (off_t)ull; + +- if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) { ++ if (*cp == '\0' || strchr(cp, '/') != NULL || ++ strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) { + run_err("error: unexpected filename: %s", cp); + exit(1); + } diff --git a/system/perl-cpanel-json-xs/APKBUILD b/system/perl-cpanel-json-xs/APKBUILD index 76e9a74a9..3792720b6 100644 --- a/system/perl-cpanel-json-xs/APKBUILD +++ b/system/perl-cpanel-json-xs/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-cpanel-json-xs _pkgreal=Cpanel-JSON-XS -pkgver=4.08 +pkgver=4.09 pkgrel=0 pkgdesc="cPanel's fork of JSON::XS, fast and correct serialising" url="https://metacpan.org/release/Cpanel-JSON-XS" @@ -40,4 +40,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="7236923791b244e022cea00f3c8697905a8187edddaf0b197ee6f8a4afe958c42ea37f655e0db8e4c66a07427b7888e68ae1dc08849ef7cbb518155b2d9c65f5 Cpanel-JSON-XS-4.08.tar.gz" +sha512sums="9d0771129a473b696bcfd502303a88e8e97f0dc2cf2b97003328edf72182400b8c07a2f5cf120f102c32a04118d4530f3d7da369c9b063554d2cfc0feddbb6aa Cpanel-JSON-XS-4.09.tar.gz" diff --git a/system/perl-dbd-sqlite/APKBUILD b/system/perl-dbd-sqlite/APKBUILD index de26fcf57..066b7b4b8 100644 --- a/system/perl-dbd-sqlite/APKBUILD +++ b/system/perl-dbd-sqlite/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-dbd-sqlite _pkgname=DBD-SQLite -pkgver=1.60 +pkgver=1.62 pkgrel=0 pkgdesc="Perl DBI SQLite module" url="https://metacpan.org/release/DBD-SQLite" @@ -40,5 +40,5 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="b5fd203898815ada13ec04477fa0ad90ec2f53761d9b1ed7cce7d06a674e31d3810e745658aea150a3a58fc18adb889e5e50e795e8575318ab4cc757c1ff1c9e DBD-SQLite-1.60.tar.gz +sha512sums="b452a6245deb0dcc5906167f6ff14d55d70b4f05a1e8113c41810a34f9b75263c2d43f88bb909d872004795ec7d9f4ed93b68ffb5639be7dad9e44e0c8e8439f DBD-SQLite-1.62.tar.gz 00961932f9f89d9b46e6134150c2628aadd4cfa7159cb1604de023fedc919087fbf982b72fd51610e1ca390234cd939e74430b270131d0b30cedb97ba6203b49 perl-DBD-SQLite-bz543982.patch" diff --git a/system/perl-encode-eucjpascii/APKBUILD b/system/perl-encode-eucjpascii/APKBUILD index a1febaadb..9e174dc10 100644 --- a/system/perl-encode-eucjpascii/APKBUILD +++ b/system/perl-encode-eucjpascii/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-encode-eucjpascii pkgver=0.03 pkgrel=0 diff --git a/system/perl-encode-hanextra/APKBUILD b/system/perl-encode-hanextra/APKBUILD index e82241be9..dce57db59 100644 --- a/system/perl-encode-hanextra/APKBUILD +++ b/system/perl-encode-hanextra/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-encode-hanextra pkgver=0.23 pkgrel=0 diff --git a/system/perl-encode-iso2022/APKBUILD b/system/perl-encode-iso2022/APKBUILD index 0c10974b1..2c0321813 100644 --- a/system/perl-encode-iso2022/APKBUILD +++ b/system/perl-encode-iso2022/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-encode-iso2022 pkgver=0.04 pkgrel=0 diff --git a/system/perl-encode-jisx0213/APKBUILD b/system/perl-encode-jisx0213/APKBUILD index 64dbf52f3..b5fe8f8f3 100644 --- a/system/perl-encode-jisx0213/APKBUILD +++ b/system/perl-encode-jisx0213/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-encode-jisx0213 pkgver=0.04 pkgrel=0 diff --git a/system/perl-json/APKBUILD b/system/perl-json/APKBUILD index 1c6b4fdea..68819a602 100644 --- a/system/perl-json/APKBUILD +++ b/system/perl-json/APKBUILD @@ -1,7 +1,8 @@ -# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com> +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-json _pkgreal=JSON -pkgver=2.97001 +pkgver=4.01 pkgrel=0 pkgdesc="Perl module implementing a JSON encoder/decoder" url="https://metacpan.org/release/JSON" @@ -31,4 +32,4 @@ package() { find "$pkgdir" -name .packlist -delete } -sha512sums="42fe08c1d7b8f689592a28c17dd7853a90c4236e64a9be175a635af005da48e06c436e80dac905893e2232ca8efee3832f6ad51992fd4ca851f8f0fd796860df JSON-2.97001.tar.gz" +sha512sums="95d38b994fc0452ad2a111cf640e0860f028039fa19c636b0c8facfd9a42851ec7f1917a2bef6a2b27d0990513329f6051ad7b85ecbe02b755200762c7331088 JSON-4.01.tar.gz" diff --git a/system/perl-mime-charset/APKBUILD b/system/perl-mime-charset/APKBUILD index 7adb38810..0d4541a3f 100644 --- a/system/perl-mime-charset/APKBUILD +++ b/system/perl-mime-charset/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-mime-charset pkgver=1.012.2 pkgrel=0 diff --git a/system/perl-module-build/APKBUILD b/system/perl-module-build/APKBUILD index dffb1853d..ddc802076 100644 --- a/system/perl-module-build/APKBUILD +++ b/system/perl-module-build/APKBUILD @@ -1,6 +1,6 @@ # Automatically generated by apkbuild-cpan, template 1 # Contributor: Francesco Colista <fcolista@alpinelinux.org> -# Maintainer: +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-module-build _pkgreal=Module-Build pkgver=0.4224 diff --git a/system/perl-module-scandeps/APKBUILD b/system/perl-module-scandeps/APKBUILD index 776899508..e94e31579 100644 --- a/system/perl-module-scandeps/APKBUILD +++ b/system/perl-module-scandeps/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-module-scandeps _pkgreal=Module-ScanDeps -pkgver=1.26 +pkgver=1.27 pkgrel=0 pkgdesc="Recursively scan Perl code for dependencies" url="https://metacpan.org/release/Module-ScanDeps" @@ -42,4 +42,4 @@ check() { make test } -sha512sums="b4b54813f55b82c20073ede9be90ab3680a636c3c8743ae03ccd0d7a26097f3d05b3e55d8b0d7d414e4156eaa686dc6eec0541ebe6c89a5c896dcd98845eb10f Module-ScanDeps-1.26.tar.gz" +sha512sums="ab5625f497a9dc9133960c7c9a5867f27f6f0061fa954225cfc53fda39d9b657743ee66a7a96cc1485bba57532fc0447c3b245dd81cf6e6c39522fdd2e308411 Module-ScanDeps-1.27.tar.gz" diff --git a/system/perl-pod2-base/APKBUILD b/system/perl-pod2-base/APKBUILD index 9d19f9e5c..28d409678 100644 --- a/system/perl-pod2-base/APKBUILD +++ b/system/perl-pod2-base/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-pod2-base pkgver=0.043 pkgrel=0 diff --git a/system/perl-sgmls/APKBUILD b/system/perl-sgmls/APKBUILD index 111830823..110fdbd99 100644 --- a/system/perl-sgmls/APKBUILD +++ b/system/perl-sgmls/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-sgmls pkgver=1.1 pkgrel=0 diff --git a/system/perl-test-needs/APKBUILD b/system/perl-test-needs/APKBUILD index 1c2e096c3..ef283c065 100644 --- a/system/perl-test-needs/APKBUILD +++ b/system/perl-test-needs/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-needs pkgver=0.002005 pkgrel=0 diff --git a/system/perl-test-pod/APKBUILD b/system/perl-test-pod/APKBUILD index 639ccdbd3..e2c3ae3c3 100644 --- a/system/perl-test-pod/APKBUILD +++ b/system/perl-test-pod/APKBUILD @@ -1,6 +1,6 @@ -# Automatically generated by apkbuild-cpan, template 1 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-pod _pkgreal=Test-Pod pkgver=1.52 diff --git a/system/perl-test-simple/APKBUILD b/system/perl-test-simple/APKBUILD index 6b0514b39..ac80247c5 100644 --- a/system/perl-test-simple/APKBUILD +++ b/system/perl-test-simple/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-simple _pkgreal=Test-Simple -pkgver=1.302141 +pkgver=1.302162 pkgrel=0 pkgdesc="Basic utilities for writing Perl tests" url="https://metacpan.org/release/Test-Simple" @@ -47,4 +47,4 @@ doc() { replaces="perl-doc" } -sha512sums="3560308cc62441c4b4214b002a9c98cd9e0191fcf655295031b58f5ed6f43c26def278fb2669bca0c6fa1e803c2feb90a8700f840bd91cddd649573ad896e261 Test-Simple-1.302141.tar.gz" +sha512sums="1e8ac18986f4e8ae44f385a4db025adc714dd355b8590472392468a8865a2a21d0a30484c196f4cb31fcb1fcff85e7e06f8402931d8f9b04fea4139399aad116 Test-Simple-1.302162.tar.gz" diff --git a/system/perl-unicode-linebreak/APKBUILD b/system/perl-unicode-linebreak/APKBUILD index c981c7e78..cea969562 100644 --- a/system/perl-unicode-linebreak/APKBUILD +++ b/system/perl-unicode-linebreak/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-unicode-linebreak -pkgver=2018.003 +pkgver=2019.001 _univer=8.0.0 # update this and unicode.org URLs if sombok is ever updated pkgrel=0 pkgdesc="Perl implementation of the UAX#14 Unicode line-breaking algorithm" @@ -39,6 +39,6 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="37fa931978e1f88667b13ef25eb3b2414a6b055f03fec5925b3605e06026f06af332179e07f35d58f61924f43f305a5bc5ef1d76a61e1d56568abf60c9bf8fc7 Unicode-LineBreak-2018.003.tar.gz +sha512sums="2d285f928db2ed32aefa741629ce9f9bee82e69c247eaa2c9145fdb4e9bae4441bf822e108cbffc3955369539474c3299f0a8f69026a5f9686aa8458a1d87f27 Unicode-LineBreak-2019.001.tar.gz cc5a4fa7d53c127f749d0c45582f55f391ffdcfa2f2c91c41cb0a4f71e566f1657d4653a6a251c6ae4f769420701df6e0cf184e55413c602cbc5191f9dc99201 GraphemeBreakTest.txt d2ffb02fb4d402e6a90937743721692c008b78045e295bd77bcdfcabc99fb1fdbfb0b4679b410bce4487eba115a7ef2e6d6bb03b0a47a7220fa4308eafbac74e LineBreakTest.txt" diff --git a/system/perl-uri/APKBUILD b/system/perl-uri/APKBUILD index 5909ad364..9d8fe204e 100644 --- a/system/perl-uri/APKBUILD +++ b/system/perl-uri/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-uri -pkgver=1.74 +pkgver=1.76 pkgrel=0 pkgdesc="Perl library for URI manipulation" url="https://metacpan.org/release/URI" @@ -11,8 +11,8 @@ depends="perl" makedepends="$depends" checkdepends="perl-test-needs" subpackages="$pkgname-doc" -provides="perl-uri-escape" -source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/URI-$pkgver.tar.gz" +provides="perl-uri-escape=$pkgver-r$pkgrel" +source="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/URI-$pkgver.tar.gz" builddir="$srcdir/URI-$pkgver" build() { @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="b537bd09c355989a2bb1919e2c228cf189e57f993add4246fa482d8ee5ec814266c6fb3229befce2f294456ee784a819d9a54013c43a2ad41b5d8914fabf046b URI-1.74.tar.gz" +sha512sums="1fcb02692bdf5f223c2878569615d153b3c4c5adc04c33aee23f3f015e08b4895b03536ef3a8c7cb7a334c2faa056e5e46c805d56d810704cba63d96136e0a83 URI-1.76.tar.gz" diff --git a/system/perl/APKBUILD b/system/perl/APKBUILD index 5f4410851..be47ade30 100644 --- a/system/perl/APKBUILD +++ b/system/perl/APKBUILD @@ -1,6 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Contributor: Valery Kartel <valery.kartel@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> # Proxy-For: solar pkgname=perl pkgver=5.26.3 diff --git a/system/ruby/APKBUILD b/system/ruby/APKBUILD index 87ba80226..1ed293793 100644 --- a/system/ruby/APKBUILD +++ b/system/ruby/APKBUILD @@ -28,13 +28,13 @@ pkgname=ruby pkgver=2.5.3 _abiver="${pkgver%.*}.0" -pkgrel=0 +pkgrel=1 pkgdesc="An object-oriented language for quick and easy programming" url="http://www.ruby-lang.org/" arch="all" license="Ruby AND BSD-2-Clause" depends="ca-certificates" -depends_dev="gmp-dev" +depends_dev="ruby=$pkgver-r$pkgrel gmp-dev" makedepends="$depends_dev zlib-dev openssl-dev db-dev libedit-dev libffi-dev coreutils yaml-dev linux-headers autoconf" install="$pkgname.post-upgrade" diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index dd8c20f8b..5c7ec31a1 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6 -pkgver=2.7.2.1 +pkgver=2.7.2.2 pkgrel=0 pkgdesc="skarnet.org's small & secure supervision software suite" url="https://skarnet.org/software/$pkgname/" @@ -42,5 +42,5 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="dcf032b812ce955c2276af36aa93138debcfa9e429e79af7b8da4f1e98b21e7b658564024c713fef45ffee03704d78f7618ad4b890de0bd3defa51b4689d3790 s6-2.7.2.1.tar.gz -bad19965aa8ea138cdf5688db9ae05fc7ce2111ac0945b5b0e78cda55ad290602f28ac8b52aae395ca5e857f32e9be4d6df882286b362ba7008a52b29472ff1e s6-svscanboot" +sha512sums="ed7b9fbc73e9947e56ad641459c04ff210fb801c8cfdbb5f0a00bdecbe1f5969ae73a6b52b048cd6617c88308f3a7bfd0ed98a48e78b1b5ba90b96e95845d165 s6-2.7.2.2.tar.gz +9c29bc9eee6d5ab502a5a86bb043ebd21e085022efc506a330ae5ab0eadf7038d0a3dc8e025d78d9610cf7ec0ca031887f755486c4cb4e571090ea3a9c1806ac s6-svscanboot" diff --git a/system/s6/s6-svscanboot b/system/s6/s6-svscanboot index 8fa8ec5d5..32eb5f290 100644 --- a/system/s6/s6-svscanboot +++ b/system/s6/s6-svscanboot @@ -12,14 +12,19 @@ umask 022 if { rm -rf /run/service /run/services } if { mkdir -p -m 0755 /run/service/.s6-svscan /run/service/s6-svscan-log } -if { ln -sf /bin/false /run/service/.s6-svscan/crash } +if +{ + redirfd -w 1 /run/service/.s6-svscan/crash + heredoc 0 "#!/bin/execlineb -P\nfalse\n" + cat +} if { redirfd -w 1 /run/service/.s6-svscan/finish heredoc 0 "#!/bin/execlineb -P\ns6-svc -X -- \"/run/service/s6-svscan-log\"\n" cat } -if { chmod 0755 /run/service/.s6-svscan/finish } +if { cd /run/service/.s6-svscan chmod 0755 crash finish } # Directory for the catch-all logger to store its logs diff --git a/system/sed/APKBUILD b/system/sed/APKBUILD index 39ba12368..bd20a4f6b 100644 --- a/system/sed/APKBUILD +++ b/system/sed/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=sed -pkgver=4.5 +pkgver=4.7 pkgrel=0 pkgdesc="GNU stream editor" url="http://www.gnu.org/software/sed" @@ -44,6 +44,6 @@ package() { rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true } -sha512sums="f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196 sed-4.5.tar.xz +sha512sums="e0be5db4cdf8226b34aaa9071bc5ae0eafde1c52227cee3512eea7fe2520d6c5cebf15266aa5c4adffbb51bf125c140a15644e28d57759893c12823ea9bbf4fb sed-4.7.tar.xz aeb55f85a5c724f0dacbf2f39e0f99ae4c66159115b00aa36d65f234f87e52e660878cb18b772a494349632dfa1b616b9306a4cafe87e91182ea8936c308506a disable-mbrtowc-test.patch 8dc38bbd731885c69e83d2ed45d5df28542d9401f196295871135aa157d48ac77f1f926afcaab3ee0098ab0eb6232efc4664060177c3bf109a3e673f5adf9b85 gnulib-tests-dont-require-gpg-passphrase.patch" diff --git a/system/util-linux/APKBUILD b/system/util-linux/APKBUILD index 350ffe057..138d6f402 100644 --- a/system/util-linux/APKBUILD +++ b/system/util-linux/APKBUILD @@ -9,7 +9,7 @@ case $pkgver in *.*) _v=$pkgver;; esac -pkgrel=0 +pkgrel=1 pkgdesc="Official Linux system management utilities" url="http://git.kernel.org/cgit/utils/util-linux/util-linux.git" arch="all" @@ -43,8 +43,8 @@ prepare() { build() { cd "$builddir" - # login utils are provided by shadow (with PAM) or busybox (no PAM) --nenolod - ./configure \ + # login utils are provided by shadow + LIBS="-lutmps -lskarnet" ./configure \ --build=$CBUILD \ --host=$CHOST \ --with-sysroot=$CBUILDROOT \ @@ -54,7 +54,6 @@ build() { --disable-tls \ --disable-kill \ --disable-login \ - --disable-last \ --disable-sulogin \ --disable-su \ --without-python diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD index 2306b8be3..91bb18b19 100644 --- a/system/utmps/APKBUILD +++ b/system/utmps/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=utmps -pkgver=0.0.1.3 +pkgver=0.0.2.0 pkgrel=2 pkgdesc="A secure utmp/wtmp implementation" url="https://skarnet.org/software/$pkgname/" @@ -46,6 +46,6 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="ec6135e56858f4bb81ca8c5015e605bc1ecc809ef10565207335a86ccee250683fde7c1df999649b6055ef2df900a70cd3d2f9f1066e066c6871a0cfe2785824 utmps-0.0.1.3.tar.gz +sha512sums="5fffb86f68475f3eadf8da53e3ae40284040cceb644f453218a5fd9e1be081920b5c787283e2578a60922e2feb75c94a7430034a658f7399645fc3bcc9afa28f utmps-0.0.2.0.tar.gz 525d43e3eced30c564e5390fc715b6caa1ae2b6515a9e3bf01263ff3fb9379bd6908ed302d0d50b6568ac36ed44d272dcc44a683f9ae34d586d8ad17023ed6b1 utmpd.run 93e4fae527ada9381e0b0a7ad5de9079e8d88959abd74fa5c0710c30c6153832abb010b57ddf83055ca34c032e7e5c9c1eedceb2f122a11ab20837ab66dcf5e2 wtmpd.run" diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD index 2f64f96d8..9c75b2621 100644 --- a/system/vim/APKBUILD +++ b/system/vim/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vim -pkgver=8.1.0606 +pkgver=8.1.0952 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -17,6 +17,7 @@ makedepends_host="acl-dev ncurses-dev" subpackages="$pkgname-doc ${pkgname}diff::noarch" source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz vimrc + no-default-mouse.patch " builddir="$srcdir/$pkgname-$pkgver" @@ -80,5 +81,6 @@ vimdiff() { mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin } -sha512sums="df02717611d7b2f54f3b60ff9f73259a6ff3228b841d7d2d429fa0eedd98ce0a140a6a3839b50bd67ce5724d86f816042d6cbb0930fd040d30216f98f2d7e6ec vim-8.1.0606.tar.gz -3a6c9bc187a6f45fd78e91dcc44d4d661c1ae1f2655e3a66bb36245ad1dc41e8d0e6061ec3aee6d323f96058b4a5501a87e3327e539cfd026f68cf81d455d721 vimrc" +sha512sums="485d839901b3d1fc8efcc035991d5f34849f6d05d9c556dcf5b2918cd01e7f7b490cd0a7eb976c7577adb41962dceea4552474103f0b3c7807311d07f8158bd1 vim-8.1.0952.tar.gz +12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8 vimrc +16026a3ed3e080b3f8281948579ab678e9acd724ad594463279712fbf1024bcd923155a133bd08118848d2c6cdf11c69489d85b1c7438f60b4c279094714d181 no-default-mouse.patch" diff --git a/system/vim/no-default-mouse.patch b/system/vim/no-default-mouse.patch new file mode 100644 index 000000000..c34b9cae7 --- /dev/null +++ b/system/vim/no-default-mouse.patch @@ -0,0 +1,16 @@ +diff -Nurd vim-8.1.0712/runtime/defaults.vim vim-8.1.0712.new/runtime/defaults.vim +--- vim-8.1.0712/runtime/defaults.vim 2019-01-09 16:02:43.000000000 -0600 ++++ vim-8.1.0712.new/runtime/defaults.vim 2019-01-27 01:18:04.196123398 -0600 +@@ -73,12 +73,6 @@ + " Revert with ":iunmap <C-U>". + inoremap <C-U> <C-G>u<C-U> + +-" In many terminal emulators the mouse works just fine. By enabling it you +-" can position the cursor, Visually select and scroll with the mouse. +-if has('mouse') +- set mouse=a +-endif +- + " Switch syntax highlighting on when the terminal has colors or when using the + " GUI (which always has colors). + if &t_Co > 2 || has("gui_running") diff --git a/system/vim/vimrc b/system/vim/vimrc index 66b72282c..df08a4866 100644 --- a/system/vim/vimrc +++ b/system/vim/vimrc @@ -4,8 +4,6 @@ set ai " Always set auto-indenting on set history=50 " keep 50 lines of command history set ruler " Show the cursor position all the time -set mouse="" " Use Vim 7 default of no mouse movements by default - " Don't use Ex mode, use Q for formatting map Q gq diff --git a/system/zip/APKBUILD b/system/zip/APKBUILD index 401ce74e3..98e60671b 100644 --- a/system/zip/APKBUILD +++ b/system/zip/APKBUILD @@ -4,7 +4,7 @@ pkgname=zip pkgver=3.0 pkgrel=5 pkgdesc="Creates PKZIP-compatible .zip files" -url="http://www.info-zip.org/pub/infozip/Zip.html" +url="http://infozip.sourceforge.net/" arch="all" options="!check" # No test suite. license="Info-ZIP" |