aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/abuild/APKBUILD6
-rw-r--r--main/acf-openldap/APKBUILD4
-rw-r--r--main/aconf/APKBUILD4
-rw-r--r--main/akms/APKBUILD35
-rw-r--r--main/akms/akms.post-install5
-rw-r--r--main/akms/akms.pre-deinstall11
-rw-r--r--main/akms/akms.pre-install5
-rw-r--r--main/akms/akms.trigger24
-rw-r--r--main/akms/modules-load.conf1
-rw-r--r--main/alpine-base/APKBUILD2
-rw-r--r--main/alpine-conf/0001-update-kernel-Make-path-for-tmpdir-changeable-via-cl.patch64
-rw-r--r--main/alpine-conf/APKBUILD8
-rw-r--r--main/alpine-make-rootfs/APKBUILD6
-rw-r--r--main/alsa-lib/APKBUILD6
-rw-r--r--main/alsa-utils/APKBUILD6
-rw-r--r--main/amavis/APKBUILD10
-rw-r--r--main/apache2-mod-wsgi/APKBUILD10
-rw-r--r--main/apache2/APKBUILD9
-rw-r--r--main/apk-cron/APKBUILD4
-rw-r--r--main/apk-tools/APKBUILD8
-rw-r--r--main/apk-tools/_apk44
-rw-r--r--main/apr-util/APKBUILD2
-rw-r--r--main/arm-trusted-firmware/APKBUILD12
-rw-r--r--main/arm-trusted-firmware/rk3399-baudrate.patch23
-rw-r--r--main/arpon/APKBUILD4
-rw-r--r--main/arpwatch/APKBUILD6
-rw-r--r--main/asciidoctor/APKBUILD6
-rw-r--r--main/atop/APKBUILD10
-rw-r--r--main/atop/fix-limits-on-ppc64le.patch10
-rw-r--r--main/audit/APKBUILD4
-rw-r--r--main/automake/0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch70
-rw-r--r--main/automake/APKBUILD8
-rw-r--r--main/avahi-ui/APKBUILD2
-rw-r--r--main/awall/APKBUILD12
-rw-r--r--main/axel/APKBUILD8
-rw-r--r--main/bacula/APKBUILD24
-rw-r--r--main/bash/APKBUILD10
-rw-r--r--main/bctoolbox/APKBUILD10
-rw-r--r--main/bctoolbox/cmake-bcunit-fix.patch19
-rw-r--r--main/bearssl/APKBUILD16
-rw-r--r--main/bearssl/libbearssl.pc9
-rw-r--r--main/bind/APKBUILD10
-rw-r--r--main/bind/bind-9.16.20-map-format-fix.patch8
-rw-r--r--main/binutils/APKBUILD12
-rw-r--r--main/bluez/APKBUILD7
-rw-r--r--main/boost1.76/0001-revert-cease-dependence-on-range.patch49
-rw-r--r--main/boost1.76/APKBUILD196
-rw-r--r--main/boost1.76/boost-1.57.0-python-abi_letters.patch62
-rw-r--r--main/boost1.76/boost-1.57.0-python-libpython_dep.patch13
-rw-r--r--main/boost1.76/build-undefine-statx-syscall.patch17
-rw-r--r--main/boost1.77/APKBUILD4
-rw-r--r--main/boost1.77/python-3.10.patch49
-rw-r--r--main/brotli/APKBUILD2
-rw-r--r--main/btrfs-progs/APKBUILD4
-rw-r--r--main/busybox-initscripts/APKBUILD15
-rw-r--r--main/busybox-initscripts/ide_links23
-rw-r--r--main/busybox-initscripts/mdev.conf21
-rw-r--r--main/busybox-initscripts/persistent-storage68
-rw-r--r--main/busybox-initscripts/usbdisk_link34
-rw-r--r--main/busybox-initscripts/xvd_links12
-rw-r--r--main/busybox/0001-ash-add-built-in-BB_ASH_VERSION-variable.patch29
-rw-r--r--main/busybox/0001-avoid-redefined-warnings-when-building-with-utmps.patch16
-rw-r--r--main/busybox/0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch88
-rw-r--r--main/busybox/0001-pgrep-add-support-for-matching-against-UID-and-RUID.patch138
-rw-r--r--main/busybox/0001-rev-correct-output-for-long-input-lines.patch91
-rw-r--r--main/busybox/0002-cpio-add-support-for-renumber-inodes-like-GNU-cpio.patch129
-rw-r--r--main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch10
-rw-r--r--main/busybox/APKBUILD57
-rw-r--r--main/busybox/busybox.post-upgrade5
-rw-r--r--main/busybox/busyboxconfig78
-rw-r--r--main/busybox/busyboxconfig-extras56
-rw-r--r--main/c-ares/APKBUILD4
-rw-r--r--main/ca-certificates/APKBUILD19
-rw-r--r--main/ccache/APKBUILD27
-rw-r--r--main/ccache/ioctl.patch17
-rw-r--r--main/cgdb/APKBUILD8
-rw-r--r--main/checkbashisms/APKBUILD13
-rw-r--r--main/chrony/APKBUILD4
-rw-r--r--main/cifs-utils/APKBUILD4
-rw-r--r--main/cjson/APKBUILD10
-rw-r--r--main/ckbcomp/APKBUILD4
-rw-r--r--main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch86
-rw-r--r--main/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch17
-rw-r--r--main/clang/APKBUILD11
-rw-r--r--main/clucene/APKBUILD4
-rw-r--r--main/cmocka/APKBUILD4
-rw-r--r--main/compiler-rt/APKBUILD90
-rw-r--r--main/compiler-rt/aarch64-ucontext.patch13
-rw-r--r--main/compiler-rt/disable-sanitizer-common.patch12
-rw-r--r--main/compiler-rt/fix-arch-detection-for-ppc64le.patch26
-rw-r--r--main/compiler-rt/fuzzer-size_t-musl.patch28
-rw-r--r--main/compiler-rt/replace-size_t-std-size-t.patch139
-rw-r--r--main/compiler-rt/sanitizer-ppc64-musl.patch37
-rw-r--r--main/compiler-rt/sanitizer-supported-arch.patch15
-rw-r--r--main/compiler-rt/sanitizer-x86_64-execinfo.patch17
-rw-r--r--main/compiler-rt/xray-ppc64-musl.patch63
-rw-r--r--main/conky/APKBUILD4
-rw-r--r--main/coreutils/APKBUILD4
-rw-r--r--main/coreutils/fix-chmod-exit-code.patch49
-rw-r--r--main/cryptsetup/APKBUILD8
-rw-r--r--main/ctags/APKBUILD4
-rw-r--r--main/cups/APKBUILD12
-rw-r--r--main/cups/cups-no-export-ssllibs.patch20
-rw-r--r--main/cups/cups-nostrip.patch42
-rw-r--r--main/cups/default-config-no-gssapi.patch4
-rw-r--r--main/curl/APKBUILD4
-rw-r--r--main/cython/APKBUILD10
-rw-r--r--main/cython/cython-test-fix.patch23
-rw-r--r--main/czmq/APKBUILD4
-rw-r--r--main/d-feet/APKBUILD2
-rw-r--r--main/dahdi-linux-lts/APKBUILD2
-rw-r--r--main/dbus/APKBUILD39
-rw-r--r--main/dbus/dbus.confd7
-rw-r--r--main/dbus/dbus.initd21
-rw-r--r--main/dconf/APKBUILD2
-rw-r--r--main/ddate/APKBUILD4
-rw-r--r--main/dhcp/APKBUILD2
-rw-r--r--main/dhcpcd/APKBUILD4
-rw-r--r--main/dialog/APKBUILD4
-rw-r--r--main/distcc/APKBUILD4
-rw-r--r--main/distcc/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch65
-rw-r--r--main/dmvpn/APKBUILD4
-rw-r--r--main/doas/APKBUILD2
-rwxr-xr-xmain/doas/doas.post-install10
-rwxr-xr-xmain/doas/doas.post-upgrade15
-rw-r--r--main/docbook-xsl/APKBUILD15
-rw-r--r--main/docbook-xsl/f6c5eefbca775e312afebf576a6990344a0b1b69.patch56
-rw-r--r--main/dosfstools/APKBUILD3
-rw-r--r--main/dovecot/APKBUILD16
-rw-r--r--main/doxygen/APKBUILD4
-rw-r--r--main/drbd-utils/APKBUILD4
-rw-r--r--main/dtc/APKBUILD4
-rw-r--r--main/dtc/pylibfdt-fix-with-Python-3.10.patch58
-rw-r--r--main/e2fsprogs/APKBUILD6
-rw-r--r--main/efi-mkkeys/APKBUILD20
-rw-r--r--main/efi-mkuki/APKBUILD26
-rw-r--r--main/elinks/APKBUILD41
-rw-r--r--main/elinks/elinks-0.12pre6-openssl11.patch73
-rw-r--r--main/elinks/musl-va_copy.patch18
-rw-r--r--main/elinks/ssl-Make-RAND_egd-optional.patch35
-rw-r--r--main/ell/APKBUILD4
-rw-r--r--main/encfs/APKBUILD4
-rw-r--r--main/etckeeper/APKBUILD8
-rw-r--r--main/ethtool/APKBUILD4
-rw-r--r--main/eudev/APKBUILD21
-rw-r--r--main/execline/APKBUILD4
-rw-r--r--main/expat/APKBUILD13
-rw-r--r--main/fail2ban/APKBUILD4
-rw-r--r--main/fail2ban/python-3.10.patch77
-rw-r--r--main/fish/APKBUILD6
-rw-r--r--main/fish/drop-failed-tests.patch15
-rw-r--r--main/fontconfig/APKBUILD2
-rw-r--r--main/freeradius/APKBUILD2
-rw-r--r--main/freeswitch/0002-FS-verto-bswap_64.patch12
-rw-r--r--main/freeswitch/APKBUILD70
-rw-r--r--main/freeswitch/explicit-darwin-macro.patch15
-rw-r--r--main/freeswitch/fix-undeclared-function-s390x.patch21
-rw-r--r--main/freeswitch/modules.conf4
-rw-r--r--main/freeswitch/python-3.10.patch22
-rw-r--r--main/freetdm/APKBUILD49
-rw-r--r--main/freetdm/remove-werr.patch44
-rw-r--r--main/freetds/APKBUILD6
-rw-r--r--main/freetype/APKBUILD4
-rw-r--r--main/fribidi/APKBUILD17
-rw-r--r--main/gawk/APKBUILD8
-rw-r--r--main/gcc/0001-posix_memalign.patch6
-rw-r--r--main/gcc/0002-gcc-poison-system-directories.patch40
-rw-r--r--main/gcc/0003-specs-turn-on-Wl-z-now-by-default.patch (renamed from main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch)23
-rw-r--r--main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch12
-rw-r--r--main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch55
-rw-r--r--main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch10
-rw-r--r--main/gcc/0007-Enable-Wtrampolines-by-default.patch8
-rw-r--r--main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch16
-rw-r--r--main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch10
-rw-r--r--main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch8
-rw-r--r--main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch8
-rw-r--r--main/gcc/0012-libitm-disable-FORTIFY.patch6
-rw-r--r--main/gcc/0013-libgcc_s.patch14
-rw-r--r--main/gcc/0014-nopie.patch12
-rw-r--r--main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch4
-rw-r--r--main/gcc/0016-dlang-update-zlib-binding.patch4
-rw-r--r--main/gcc/0017-dlang-use-libucontext-on-mips64.patch24
-rw-r--r--main/gcc/0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch (renamed from main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch)27
-rw-r--r--main/gcc/0019-ada-fix-shared-linking.patch (renamed from main/gcc/0018-ada-fix-shared-linking.patch)6
-rw-r--r--main/gcc/0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch (renamed from main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch)6
-rw-r--r--main/gcc/0021-add-fortify-headers-paths.patch (renamed from main/gcc/0020-add-fortify-headers-paths.patch)6
-rw-r--r--main/gcc/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch (renamed from main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch)8
-rw-r--r--main/gcc/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch (renamed from main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch)14
-rw-r--r--main/gcc/0024-mips64-disable-multilib-support.patch (renamed from main/gcc/0023-Pure-64-bit-MIPS.patch)13
-rw-r--r--main/gcc/0025-aarch64-disable-multilib-support.patch26
-rw-r--r--main/gcc/0026-s390x-disable-multilib-support.patch25
-rw-r--r--main/gcc/0027-ppc64-le-disable-multilib-support.patch (renamed from main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch)62
-rw-r--r--main/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch48
-rw-r--r--main/gcc/0028-x86_64-disable-multilib-support.patch26
-rw-r--r--main/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch30
-rw-r--r--main/gcc/0029-riscv-disable-multilib-support.patch74
-rw-r--r--main/gcc/0030-always-build-libgcc_eh.a.patch (renamed from main/gcc/0025-always-build-libgcc_eh.a.patch)12
-rw-r--r--main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch29
-rw-r--r--main/gcc/0031-ada-libgnarl-compatibility-for-musl.patch (renamed from main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch)26
-rw-r--r--main/gcc/0032-ada-musl-support-fixes.patch (renamed from main/gcc/0027-ada-musl-support-fixes.patch)50
-rw-r--r--main/gcc/0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch (renamed from main/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch)4
-rw-r--r--main/gcc/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch37
-rw-r--r--main/gcc/0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch27
-rw-r--r--main/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch30
-rw-r--r--main/gcc/0035-gcc-go-signal-34-is-special-on-musl-libc.patch (renamed from main/gcc/0034-gcc-go-signal-34-is-special-on-musl-libc.patch)6
-rw-r--r--main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch6
-rw-r--r--main/gcc/0037-gcc-go-link-to-libucontext.patch8
-rw-r--r--main/gcc/0038-Use-generic-errstr.go-implementation-on-musl.patch (renamed from main/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch)4
-rw-r--r--main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch26
-rw-r--r--main/gcc/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch53
-rw-r--r--main/gcc/0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch (renamed from main/gcc/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch)66
-rw-r--r--main/gcc/0040-configure-fix-detection-of-atomic-builtins-in-libato.patch (renamed from main/gcc/0042-configure-fix-detection-of-atomic-builtins-in-libato.patch)6
-rw-r--r--main/gcc/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch84
-rw-r--r--main/gcc/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch80
-rw-r--r--main/gcc/0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch106
-rw-r--r--main/gcc/0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch (renamed from main/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch)35
-rw-r--r--main/gcc/0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch98
-rw-r--r--main/gcc/0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch58
-rw-r--r--main/gcc/0047-gdc-unconditionally-link-libgphobos-against-libucont.patch27
-rw-r--r--main/gcc/APKBUILD174
-rw-r--r--main/gcr/APKBUILD48
-rw-r--r--main/gcr/fix-build-without-systemd.patch28
-rw-r--r--main/gcr/fix-meson-invalid-kw-argument.patch61
-rw-r--r--main/gdb/APKBUILD4
-rw-r--r--main/gdbm/APKBUILD6
-rw-r--r--main/gettext/APKBUILD2
-rw-r--r--main/ghostscript/9.55.0-typo.patch11
-rw-r--r--main/ghostscript/APKBUILD15
-rw-r--r--main/ghostscript/CVE-2021-3781.patch232
-rw-r--r--main/git/APKBUILD6
-rw-r--r--main/glib/APKBUILD6
-rw-r--r--main/glslang/APKBUILD6
-rw-r--r--main/glu/APKBUILD19
-rw-r--r--main/gnupg/APKBUILD6
-rw-r--r--main/gnupg/fix-i18n.patch2
-rw-r--r--main/goaccess/APKBUILD4
-rw-r--r--main/gobject-introspection/APKBUILD2
-rw-r--r--main/gpsd/APKBUILD2
-rw-r--r--main/graphite2/APKBUILD6
-rw-r--r--main/graphviz/APKBUILD2
-rw-r--r--main/grub/0009-fix-kernel-version-detection.patch64
-rw-r--r--main/grub/APKBUILD4
-rw-r--r--main/gstreamer/APKBUILD50
-rw-r--r--main/gtest/APKBUILD25
-rw-r--r--main/gtest/gtest-1.8.1-libversion.patch29
-rw-r--r--main/gtest/gtest-1.8.1-null-pointer.patch17
-rw-r--r--main/guile/APKBUILD10
-rw-r--r--main/gummiboot/APKBUILD5
-rw-r--r--main/haproxy/APKBUILD6
-rw-r--r--main/harfbuzz/APKBUILD6
-rw-r--r--main/haserl/APKBUILD6
-rw-r--r--main/haveged/APKBUILD4
-rw-r--r--main/hostapd/APKBUILD40
-rw-r--r--main/htop/APKBUILD4
-rw-r--r--main/hylafax/APKBUILD6
-rw-r--r--main/hylafax/libtiff-42-compatibility.patch2
-rw-r--r--main/hylafaxplus/APKBUILD8
-rw-r--r--main/hylafaxplus/config-files-default-extension.patch26
-rw-r--r--main/hylafaxplus/dont-ship-xferfaxlog-file.patch38
-rw-r--r--main/hylafaxplus/hylafaxplus.initd5
-rw-r--r--main/hypermail/APKBUILD2
-rw-r--r--main/icu/APKBUILD8
-rw-r--r--main/imlib2/0001-ICO-loader-Fix-compilation-on-big-endian-architectur.patch36
-rw-r--r--main/imlib2/APKBUILD8
-rw-r--r--main/in-sync/APKBUILD4
-rw-r--r--main/iproute2/APKBUILD84
-rw-r--r--main/ipset/APKBUILD4
-rw-r--r--main/iso-codes/APKBUILD4
-rw-r--r--main/jack/APKBUILD16
-rw-r--r--main/jack/increase-api-version.patch16
-rw-r--r--main/json-c/APKBUILD4
-rw-r--r--main/jwhois/APKBUILD4
-rw-r--r--main/kamailio/APKBUILD8
-rw-r--r--main/kamailio/fix-openldap-2.5-symbol-conflict.patch46
-rw-r--r--main/kernel-hooks/APKBUILD20
-rw-r--r--main/kernel-hooks/README13
-rw-r--r--main/kernel-hooks/kernel-hooks.trigger50
-rw-r--r--main/knot/APKBUILD60
-rw-r--r--main/knot/knot.post-upgrade8
-rw-r--r--main/krb5/APKBUILD4
-rw-r--r--main/ldapvi/APKBUILD2
-rw-r--r--main/ldb/APKBUILD6
-rw-r--r--main/leveldb/APKBUILD4
-rw-r--r--main/libarchive/APKBUILD2
-rw-r--r--main/libax25/APKBUILD40
-rw-r--r--main/libax25/musl.patch10
-rw-r--r--main/libcap/APKBUILD15
-rw-r--r--main/libcbor/APKBUILD4
-rw-r--r--main/libdrm/APKBUILD4
-rw-r--r--main/libeconf/APKBUILD6
-rw-r--r--main/libfido2/APKBUILD4
-rw-r--r--main/libical/APKBUILD8
-rw-r--r--main/libjpeg-turbo/APKBUILD8
-rw-r--r--main/libks/APKBUILD34
-rw-r--r--main/libks/disable-failing-tests.patch21
-rw-r--r--main/libnftnl/APKBUILD13
-rw-r--r--main/libretls/APKBUILD6
-rw-r--r--main/librsync/APKBUILD4
-rw-r--r--main/librtlsdr/APKBUILD4
-rw-r--r--main/libseccomp/APKBUILD2
-rw-r--r--main/libspf2/APKBUILD7
-rw-r--r--main/libsrtp/APKBUILD34
-rw-r--r--main/libtasn1/APKBUILD4
-rw-r--r--main/libunwind/APKBUILD18
-rw-r--r--main/libunwind/fix-ppc64-libdir.patch11
-rw-r--r--main/libusb-compat/APKBUILD3
-rw-r--r--main/libutempter/APKBUILD2
-rw-r--r--main/libuv/APKBUILD9
-rw-r--r--main/libwebsockets/APKBUILD4
-rw-r--r--main/libx11/APKBUILD6
-rw-r--r--main/libxml2/APKBUILD4
-rw-r--r--main/libxml2/whitespace-when-serializing-empty-html-documents.patch43
-rw-r--r--main/lighttpd/APKBUILD44
-rw-r--r--main/lighttpd/lighttpd.conf8
-rw-r--r--main/linux-firmware/APKBUILD4
-rw-r--r--main/linux-lts/0001-powerpc-config-defang-gcc-check-for-stack-protector-.patch (renamed from main/linux-lts/0002-powerpc-config-defang-gcc-check-for-stack-protector-.patch)25
-rw-r--r--main/linux-lts/0007-pci-hotplug-declare-IDT-bridge-as-hotpluggabl-bridge.patch25
-rw-r--r--main/linux-lts/0008-pci-spr2803-quirk-to-fix-class-ID.patch39
-rw-r--r--main/linux-lts/APKBUILD47
-rw-r--r--main/linux-lts/ampere-mt-jade.patch600
-rw-r--r--main/linux-lts/config-lts.aarch641048
-rw-r--r--main/linux-lts/config-lts.armv7930
-rw-r--r--main/linux-lts/config-lts.mips643644
-rw-r--r--main/linux-lts/config-lts.ppc64le487
-rw-r--r--main/linux-lts/config-lts.s390x315
-rw-r--r--main/linux-lts/config-lts.x86935
-rw-r--r--main/linux-lts/config-lts.x86_641002
-rw-r--r--main/linux-lts/config-virt.aarch64577
-rw-r--r--main/linux-lts/config-virt.armv7484
-rw-r--r--main/linux-lts/config-virt.ppc64le386
-rw-r--r--main/linux-lts/config-virt.x86421
-rw-r--r--main/linux-lts/config-virt.x86_64517
-rw-r--r--main/linux-lts/vmlinux-zstd.patch18
-rw-r--r--main/linux-rpi/APKBUILD12
-rw-r--r--main/llvm12/APKBUILD2
-rw-r--r--main/logrotate/APKBUILD4
-rw-r--r--main/logrotate/logrotate.conf3
-rw-r--r--main/lsyncd/APKBUILD4
-rw-r--r--main/lttng-ust/APKBUILD16
-rw-r--r--main/lua-asn1/APKBUILD4
-rw-r--r--main/lua-ldap/APKBUILD4
-rw-r--r--main/lua-lzmq/APKBUILD4
-rw-r--r--main/lua-microlight/APKBUILD10
-rw-r--r--main/lua-schema/APKBUILD34
-rw-r--r--main/lua-yaml/APKBUILD4
-rw-r--r--main/lua5.1/APKBUILD2
-rw-r--r--main/lua5.3/APKBUILD2
-rw-r--r--main/lz4/APKBUILD13
-rw-r--r--main/lz4/CVE-2021-3520.patch22
-rw-r--r--main/man-pages-posix/APKBUILD31
-rw-r--r--main/man-pages/APKBUILD17
-rw-r--r--main/mariadb-connector-c/APKBUILD10
-rw-r--r--main/mariadb/APKBUILD5
-rw-r--r--main/mbedtls/APKBUILD8
-rw-r--r--main/memcached/APKBUILD4
-rw-r--r--main/mesa/APKBUILD17
-rw-r--r--main/mesa/disable-rgb10-by-default.patch8
-rw-r--r--main/meson/APKBUILD8
-rw-r--r--main/mkinitfs/APKBUILD6
-rw-r--r--main/mksh/APKBUILD4
-rw-r--r--main/monit/APKBUILD6
-rw-r--r--main/mosquitto/APKBUILD8
-rw-r--r--main/mpg123/APKBUILD4
-rw-r--r--main/mtools/APKBUILD4
-rw-r--r--main/nagios-plugins/APKBUILD6
-rw-r--r--main/nano/APKBUILD4
-rw-r--r--main/ncurses/APKBUILD10
-rw-r--r--main/net-snmp/APKBUILD6
-rw-r--r--main/net-snmp/snmpd.confd16
-rw-r--r--main/net-snmp/snmpd.initd10
-rw-r--r--main/newt/APKBUILD15
-rw-r--r--main/nfs-utils/APKBUILD2
-rw-r--r--main/nftables/APKBUILD9
-rw-r--r--main/nginx/APKBUILD12
-rw-r--r--main/nodejs/APKBUILD30
-rw-r--r--main/nodejs/link-with-libatomic-on-mips32.patch28
-rw-r--r--main/npm/APKBUILD16
-rw-r--r--main/npm/dont-check-for-last-version.patch2
-rw-r--r--main/npm/make-dont-install-deps.patch2
-rw-r--r--main/npm/reproducible-documentation-build.patch6
-rw-r--r--main/npm/smoke-tests-npm-location.patch8
-rw-r--r--main/nrpe/APKBUILD3
-rw-r--r--main/nspr/APKBUILD4
-rw-r--r--main/nss-pam-ldapd/APKBUILD4
-rw-r--r--main/openjpeg/APKBUILD4
-rw-r--r--main/openldap/APKBUILD310
-rw-r--r--main/openldap/fix-lloadd-tests.patch71
-rw-r--r--main/openldap/fix-manpages.patch12
-rw-r--r--main/openldap/lloadd.conf49
-rw-r--r--main/openldap/lloadd.confd19
-rw-r--r--main/openldap/lloadd.initd46
-rw-r--r--main/openldap/openldap-2.4.11-libldap_r.patch2
l---------main/openldap/openldap-lloadd.pre-install1
-rw-r--r--main/openldap/openldap-mqtt-overlay.patch4
-rw-r--r--main/openldap/openldap.pre-upgrade24
-rw-r--r--main/openntpd/APKBUILD2
-rw-r--r--main/openobex/APKBUILD4
-rw-r--r--main/openrc/APKBUILD37
-rw-r--r--main/opensp/APKBUILD49
-rw-r--r--main/opensp/removed-failing-tests.patch52
-rw-r--r--main/openssh/APKBUILD62
-rw-r--r--main/openssh/avoid-redefined-warnings-when-building-with-utmps.patch16
-rw-r--r--main/openssl/APKBUILD36
-rw-r--r--main/openssl/man-section.patch51
-rw-r--r--main/openssl/ppc64.patch (renamed from main/openssl1.1-compat/ppc64.patch)0
-rw-r--r--main/openssl1.1-compat/man-section.patch54
-rw-r--r--main/openssl3/APKBUILD (renamed from main/openssl1.1-compat/APKBUILD)42
-rw-r--r--main/openssl3/man-section.patch31
-rw-r--r--main/openvpn-auth-ldap/APKBUILD2
-rw-r--r--main/openvpn/APKBUILD8
-rw-r--r--main/ortp/APKBUILD6
-rw-r--r--main/parallel/APKBUILD4
-rw-r--r--main/pcre2/APKBUILD6
-rw-r--r--main/pcsc-lite/APKBUILD4
-rw-r--r--main/perl-datetime-locale/APKBUILD6
-rw-r--r--main/perl-http-message/APKBUILD6
-rw-r--r--main/perl-io-socket-inet6/APKBUILD8
-rw-r--r--main/perl-io-socket-ssl/APKBUILD4
-rw-r--r--main/perl-json/APKBUILD10
-rw-r--r--main/perl-libwww/APKBUILD4
-rw-r--r--main/perl-mozilla-ca/APKBUILD8
-rw-r--r--main/perl-mro-compat/APKBUILD8
-rw-r--r--main/perl-net-dns/APKBUILD4
-rw-r--r--main/perl-path-tiny/APKBUILD4
-rw-r--r--main/perl-scope-upper/APKBUILD8
-rw-r--r--main/perl-term-table/APKBUILD8
-rw-r--r--main/perl-test2-suite/APKBUILD4
-rw-r--r--main/perl-try-tiny/APKBUILD8
-rw-r--r--main/perl-uri/APKBUILD6
-rw-r--r--main/pgpool/APKBUILD7
-rw-r--r--main/po4a/APKBUILD4
-rw-r--r--main/poppler/APKBUILD18
-rw-r--r--main/postfix/APKBUILD7
-rw-r--r--main/postgresql-bdr-extension/APKBUILD36
-rw-r--r--main/postgresql-bdr/APKBUILD146
-rw-r--r--main/postgresql-bdr/initdb.patch18
-rw-r--r--main/postgresql-bdr/pgbdr-restore.confd16
-rw-r--r--main/postgresql-bdr/pgbdr-restore.initd36
-rw-r--r--main/postgresql-bdr/postgresql-bdr-osxflags.patch11
-rw-r--r--main/postgresql-bdr/postgresql-bdr.confd55
-rw-r--r--main/postgresql-bdr/postgresql-bdr.initd150
-rw-r--r--main/postgresql-bdr/postgresql-bdr.pre-install10
-rw-r--r--main/postgresql-bdr/postgresql-bdr.pre-upgrade32
-rw-r--r--main/postgresql-common/APKBUILD38
-rw-r--r--main/postgresql-common/pg_versions216
-rw-r--r--main/postgresql-common/postgresql-common.pre-deinstall5
-rw-r--r--main/postgresql-common/postgresql-common.pre-install (renamed from main/postgresql/postgresql.pre-install)2
-rw-r--r--main/postgresql-common/postgresql-common.trigger72
-rw-r--r--main/postgresql-common/postgresql.confd (renamed from main/postgresql/postgresql.confd)15
-rw-r--r--main/postgresql-common/postgresql.initd (renamed from main/postgresql/postgresql.initd)25
-rw-r--r--main/postgresql/0001-jit-Don-t-use-host-specific-CPU-or-features.patch27
-rw-r--r--main/postgresql/APKBUILD393
-rw-r--r--main/postgresql/make-split-headers.patch24
-rw-r--r--main/postgresql/pg-restore.confd16
-rw-r--r--main/postgresql/pg-restore.initd36
-rw-r--r--main/postgresql/postgresql-contrib.post-upgrade16
-rw-r--r--main/postgresql/postgresql.post-upgrade14
-rw-r--r--main/postgresql/postgresql.pre-upgrade32
-rw-r--r--main/postgresql13/APKBUILD489
-rw-r--r--main/postgresql13/czech-snowball-stemmer.patch1064
-rw-r--r--main/postgresql13/disable-broken-tests.patch (renamed from main/postgresql/disable-broken-tests.patch)0
-rw-r--r--main/postgresql13/disable-html-docs.patch38
-rw-r--r--main/postgresql13/disable-test-collate.icu.utf8.patch20
-rw-r--r--main/postgresql13/external-libpq.patch.txt41
-rw-r--r--main/postgresql13/initdb.patch14
-rw-r--r--main/postgresql13/jit-datalayout-mismatch-on-s390x.patch100
-rw-r--r--main/postgresql13/libpgport-pkglibdir.patch.txt84
-rw-r--r--main/postgresql13/make-split-headers.patch50
-rw-r--r--main/postgresql13/per-version-dirs.patch69
-rw-r--r--main/postgresql13/perl-rpath.patch (renamed from main/postgresql/perl-rpath.patch)0
-rw-r--r--main/postgresql13/pg_config-add-major-version.patch49
-rw-r--r--main/postgresql13/pltcl_create_tables.sql (renamed from main/postgresql/pltcl_create_tables.sql)0
-rw-r--r--main/postgresql13/postgresql13.post-install12
-rw-r--r--main/postgresql13/postgresql13.pre-deinstall35
-rw-r--r--main/postgresql13/remove-libecpg_compat.patch (renamed from main/postgresql/remove-libecpg_compat.patch)0
-rw-r--r--main/postgresql13/unix_socket_directories.patch (renamed from main/postgresql/unix_socket_directories.patch)0
-rw-r--r--main/postgresql14/APKBUILD530
-rw-r--r--main/postgresql14/czech-snowball-stemmer.patch (renamed from main/postgresql/czech-snowball-stemmer.patch)0
-rw-r--r--main/postgresql14/disable-broken-tests.patch119
-rw-r--r--main/postgresql14/disable-html-docs.patch38
-rw-r--r--main/postgresql14/disable-test-collate.icu.utf8.patch (renamed from main/postgresql/disable-test-collate.icu.utf8.patch)0
-rw-r--r--main/postgresql14/external-libpq.patch.txt41
-rw-r--r--main/postgresql14/initdb.patch (renamed from main/postgresql/initdb.patch)0
-rw-r--r--main/postgresql14/jit-datalayout-mismatch-on-s390x-and-x86.patch111
-rw-r--r--main/postgresql14/libpgport-pkglibdir.patch.txt84
-rw-r--r--main/postgresql14/make-split-headers.patch50
-rw-r--r--main/postgresql14/per-version-dirs.patch69
-rw-r--r--main/postgresql14/perl-rpath.patch22
-rw-r--r--main/postgresql14/pg_config-add-major-version.patch49
-rw-r--r--main/postgresql14/pltcl_create_tables.sql13
-rw-r--r--main/postgresql14/postgresql14.post-install12
-rw-r--r--main/postgresql14/postgresql14.pre-deinstall35
-rw-r--r--main/postgresql14/remove-libecpg_compat.patch18
-rw-r--r--main/postgresql14/unix_socket_directories.patch29
-rw-r--r--main/privoxy/APKBUILD13
-rw-r--r--main/procps/APKBUILD4
-rw-r--r--main/pspg/APKBUILD4
-rw-r--r--main/pssh/APKBUILD2
-rw-r--r--main/py3-alabaster/APKBUILD2
-rw-r--r--main/py3-appdirs/APKBUILD2
-rw-r--r--main/py3-asn1/APKBUILD2
-rw-r--r--main/py3-asn1crypto/APKBUILD2
-rw-r--r--main/py3-atomicwrites/APKBUILD2
-rw-r--r--main/py3-attrs/APKBUILD2
-rw-r--r--main/py3-babel/APKBUILD10
-rw-r--r--main/py3-bcrypt/APKBUILD2
-rw-r--r--main/py3-cairo/APKBUILD2
-rw-r--r--main/py3-certifi/APKBUILD10
-rw-r--r--main/py3-cffi/APKBUILD2
-rw-r--r--main/py3-chardet/APKBUILD2
-rw-r--r--main/py3-charset-normalizer/APKBUILD2
-rw-r--r--main/py3-coverage/APKBUILD2
-rw-r--r--main/py3-cparser/APKBUILD2
-rw-r--r--main/py3-dbus/APKBUILD2
-rw-r--r--main/py3-distlib/APKBUILD6
-rw-r--r--main/py3-dnspython/APKBUILD2
-rw-r--r--main/py3-docutils/APKBUILD2
-rw-r--r--main/py3-elftools/APKBUILD2
-rw-r--r--main/py3-extras/APKBUILD2
-rw-r--r--main/py3-filelock/APKBUILD12
-rw-r--r--main/py3-fixtures/APKBUILD2
-rw-r--r--main/py3-funcsigs/APKBUILD2
-rw-r--r--main/py3-future/APKBUILD2
-rw-r--r--main/py3-gobject3/APKBUILD2
-rw-r--r--main/py3-hypothesis/APKBUILD4
-rw-r--r--main/py3-idna/APKBUILD7
-rw-r--r--main/py3-imagesize/APKBUILD8
-rw-r--r--main/py3-iniconfig/APKBUILD2
-rw-r--r--main/py3-iso8601/APKBUILD30
-rw-r--r--main/py3-jinja2/APKBUILD4
-rw-r--r--main/py3-lxc/APKBUILD2
-rw-r--r--main/py3-lxml/APKBUILD38
-rw-r--r--main/py3-mako/APKBUILD2
-rw-r--r--main/py3-markdown/APKBUILD2
-rw-r--r--main/py3-markupsafe/APKBUILD2
-rw-r--r--main/py3-meld3/APKBUILD2
-rw-r--r--main/py3-mimeparse/APKBUILD2
-rw-r--r--main/py3-mock/APKBUILD2
-rw-r--r--main/py3-monotonic/APKBUILD2
-rw-r--r--main/py3-more-itertools/APKBUILD6
-rw-r--r--main/py3-olefile/APKBUILD2
-rw-r--r--main/py3-ordered-set/APKBUILD2
-rw-r--r--main/py3-packaging/APKBUILD14
-rw-r--r--main/py3-parsing/APKBUILD2
-rw-r--r--main/py3-pbr/APKBUILD8
-rw-r--r--main/py3-pexpect/APKBUILD2
-rw-r--r--main/py3-pillow/APKBUILD4
-rw-r--r--main/py3-pluggy/APKBUILD2
-rw-r--r--main/py3-ply/APKBUILD2
-rw-r--r--main/py3-pretend/APKBUILD2
-rw-r--r--main/py3-ptyprocess/APKBUILD2
-rw-r--r--main/py3-py/APKBUILD2
-rw-r--r--main/py3-pygments/APKBUILD6
-rw-r--r--main/py3-pynacl/APKBUILD10
-rw-r--r--main/py3-pytest-timeout/APKBUILD33
-rw-r--r--main/py3-pytest/APKBUILD2
-rw-r--r--main/py3-requests/APKBUILD8
-rw-r--r--main/py3-setuptools/APKBUILD2
-rw-r--r--main/py3-six/APKBUILD2
-rw-r--r--main/py3-snowballstemmer/APKBUILD2
-rw-r--r--main/py3-sortedcontainers/APKBUILD2
-rw-r--r--main/py3-sphinx/APKBUILD12
-rw-r--r--main/py3-sphinx_rtd_theme/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-applehelp/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-devhelp/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-htmlhelp/APKBUILD11
-rw-r--r--main/py3-sphinxcontrib-jsmath/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-qthelp/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-serializinghtml/APKBUILD11
-rw-r--r--main/py3-sphinxcontrib-websupport/APKBUILD2
-rw-r--r--main/py3-tappy/APKBUILD2
-rw-r--r--main/py3-testtools/APKBUILD2
-rw-r--r--main/py3-toml/APKBUILD2
-rw-r--r--main/py3-tz/APKBUILD2
-rw-r--r--main/py3-urllib3/APKBUILD4
-rw-r--r--main/py3-virtualenv/APKBUILD6
-rw-r--r--main/py3-virtualenv/sysconfig.patch210
-rw-r--r--main/py3-wcag-contrast-ratio/APKBUILD30
-rw-r--r--main/py3-wcwidth/APKBUILD2
-rw-r--r--main/py3-wheel/APKBUILD2
-rw-r--r--main/py3-yaml/APKBUILD2
-rw-r--r--main/python3/APKBUILD17
-rw-r--r--main/python3/bpo-43112.patch211
-rw-r--r--main/python3/custom-bluetooth-h-path.patch51
-rw-r--r--main/python3/mpdecimal-2.5.1.patch33
-rw-r--r--main/rabbitmq-c/APKBUILD12
-rw-r--r--main/raspberrypi-bootloader/APKBUILD18
-rw-r--r--main/raspberrypi/APKBUILD4
-rw-r--r--main/rdiff-backup/APKBUILD2
-rw-r--r--main/restool/APKBUILD27
-rw-r--r--main/restool/no-manpage.patch10
-rw-r--r--main/rpcsvc-proto/APKBUILD6
-rw-r--r--main/rsync/APKBUILD7
-rw-r--r--main/rsyslog/APKBUILD4
-rw-r--r--main/rsyslog/rsyslog.logrotate1
-rw-r--r--main/ruby-augeas/APKBUILD4
-rw-r--r--main/ruby-bundler/APKBUILD4
-rw-r--r--main/ruby-minitest/APKBUILD6
-rw-r--r--main/ruby-rake/APKBUILD12
-rw-r--r--main/ruby-rake/gemspec.patch12
-rw-r--r--main/ruby-rbs/APKBUILD6
-rw-r--r--main/ruby-rbs/gemspec.patch7
-rw-r--r--main/ruby-typeprof/APKBUILD4
-rw-r--r--main/ruby/APKBUILD34
-rw-r--r--main/s6-dns/APKBUILD6
-rw-r--r--main/s6-linux-init/APKBUILD4
-rw-r--r--main/s6-linux-utils/APKBUILD4
-rw-r--r--main/s6-networking/APKBUILD4
-rw-r--r--main/s6-portable-utils/APKBUILD4
-rw-r--r--main/s6-rc/APKBUILD6
-rw-r--r--main/s6/APKBUILD4
-rw-r--r--main/samba/APKBUILD18
-rw-r--r--main/samba/samba-bgqd-include-signal-h.patch4
-rw-r--r--main/scdoc/APKBUILD15
-rw-r--r--main/scons/APKBUILD2
-rw-r--r--main/screen/APKBUILD2
-rw-r--r--main/seabios/0003-vgasrc-ignore-.node.gnu.property-binutils-2.36-suppo.patch39
-rw-r--r--main/seabios/APKBUILD8
-rw-r--r--main/secureboot-hook/APKBUILD28
-rw-r--r--main/secureboot-hook/secureboot-hook.post-install16
-rw-r--r--main/secureboot-hook/secureboot-hook.pre-deinstall11
-rw-r--r--main/secureboot-hook/secureboot.conf42
-rw-r--r--main/secureboot-hook/secureboot.hook98
-rw-r--r--main/skalibs/APKBUILD9
-rw-r--r--main/snappy/APKBUILD46
-rw-r--r--main/snappy/cmakelists.patch10
-rw-r--r--main/snappy/fix-inline.patch13
-rw-r--r--main/snappy/optimize-mips-s390x.patch80
-rw-r--r--main/snappy/rtti.patch56
-rw-r--r--main/socat/APKBUILD12
-rw-r--r--main/sofia-sip/APKBUILD6
-rw-r--r--main/speedtest-cli/APKBUILD2
-rw-r--r--main/spirv-headers/APKBUILD4
-rw-r--r--main/spirv-tools/APKBUILD4
-rw-r--r--main/sqlite-tcl/APKBUILD6
-rw-r--r--main/sqlite/APKBUILD9
-rw-r--r--main/squashfs-tools/0001-unsquashfs-use-squashfs_closedir-to-delete-directory.patch129
-rw-r--r--main/squashfs-tools/0002-unsquashfs-dynamically-allocate-name.patch102
-rw-r--r--main/squashfs-tools/0003-unsquashfs-use-linked-list-to-store-directory-names.patch320
-rw-r--r--main/squashfs-tools/0004-Unsquashfs-additional-write-outside-destination-dire.patch320
-rw-r--r--main/squashfs-tools/0005-Unsquashfs-Add-makefile-entry-for-unsquash-12.o.patch26
-rw-r--r--main/squashfs-tools/APKBUILD22
-rw-r--r--main/squashfs-tools/fix-compat.patch4
-rw-r--r--main/squid/APKBUILD9
-rw-r--r--main/static-routing/APKBUILD4
-rw-r--r--main/strace/APKBUILD4
-rw-r--r--main/subunit/APKBUILD2
-rw-r--r--main/subversion/APKBUILD10
-rw-r--r--main/subversion/fix-use-after-free.patch41
-rw-r--r--main/sudo/APKBUILD72
-rw-r--r--main/supervisor/APKBUILD2
-rw-r--r--main/swig/APKBUILD2
-rw-r--r--main/sysklogd/APKBUILD4
-rw-r--r--main/syslog-ng/APKBUILD2
-rw-r--r--main/talloc/APKBUILD2
-rw-r--r--main/tdb/APKBUILD2
-rw-r--r--main/tevent/APKBUILD7
-rw-r--r--main/tevent/python-3.10.patch34
-rw-r--r--main/tig/APKBUILD4
-rw-r--r--main/tree/0001-remove-03-cflag.patch25
-rw-r--r--main/tree/APKBUILD20
-rw-r--r--main/tunnel/APKBUILD4
-rw-r--r--main/u-boot/APKBUILD49
-rw-r--r--main/u-boot/fix-tools-build.patch17
-rw-r--r--main/u-boot/mkimage-struc-tstat.st_size-may-not-be-long.patch45
-rwxr-xr-xmain/u-boot/update-u-boot7
-rw-r--r--main/unbound/APKBUILD10
-rw-r--r--main/util-linux/APKBUILD196
-rw-r--r--main/util-linux/utmps.patch103
-rw-r--r--main/utmps/APKBUILD37
-rw-r--r--main/utmps/setup-utmp44
-rw-r--r--main/utmps/utmp-init.initd32
-rw-r--r--main/utmps/utmpd.initd18
-rw-r--r--main/utmps/wtmpd.initd22
-rw-r--r--main/utmps/wtmpd.logrotate6
-rw-r--r--main/uwsgi/APKBUILD12
-rw-r--r--main/vala/APKBUILD4
-rw-r--r--main/valgrind/APKBUILD15
-rw-r--r--main/valgrind/arm.patch11
-rw-r--r--main/varnish/0001-r02451-fix.patch9
-rw-r--r--main/varnish/APKBUILD42
-rw-r--r--main/vde2/APKBUILD2
-rw-r--r--main/vim/APKBUILD48
-rw-r--r--main/wayland-protocols/APKBUILD6
-rw-r--r--main/wayland/APKBUILD34
-rw-r--r--main/wpa_supplicant/APKBUILD14
-rw-r--r--main/wpa_supplicant/CVE-2019-16275.patch73
-rw-r--r--main/wpa_supplicant/CVE-2021-0326.patch37
-rw-r--r--main/wpa_supplicant/CVE-2021-27803.patch50
-rw-r--r--main/xcb-proto/APKBUILD2
-rw-r--r--main/xen/APKBUILD66
-rw-r--r--main/xen/qemu-xen-time64.patch43
-rw-r--r--main/xtables-addons-lts/APKBUILD2
-rw-r--r--main/yajl/APKBUILD4
-rw-r--r--main/zfs-lts/4900-ppc-get-user-workaround.patch60
-rw-r--r--main/zfs-lts/APKBUILD11
-rw-r--r--main/zfs-rpi/APKBUILD8
-rw-r--r--main/zfs/APKBUILD9
-rw-r--r--main/zfs/test-mmap_seek.patch11
-rw-r--r--main/zmap/APKBUILD4
-rw-r--r--main/zstd/APKBUILD20
701 files changed, 16018 insertions, 12887 deletions
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 4e5181c5c0..07cfdad867 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=abuild
-pkgver=3.9.0_rc2
+pkgver=3.9.0
_ver=${pkgver%_git*}
-pkgrel=1
+pkgrel=0
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch="all"
@@ -84,5 +84,5 @@ _rootbld() {
}
sha512sums="
-a90daf72cd1f1c5fb31d998786fd418355e2ff03ab1f3c6b9bf0d1a0b94538f34d37d405de8615d596f866e31adaad14662eee93d5342ee41bf1ee898dc7d915 abuild-3.9.0_rc2.tar.xz
+b9f24d9d6f8f4eef320a5dbcc3ff94af64332d6034da306b237541e447839f4debc19eb2b937150166f53c63f9c9e518420cb54092c1f946f1c294c0464c521f abuild-3.9.0.tar.xz
"
diff --git a/main/acf-openldap/APKBUILD b/main/acf-openldap/APKBUILD
index fd7954cad8..75215e0289 100644
--- a/main/acf-openldap/APKBUILD
+++ b/main/acf-openldap/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
pkgname=acf-openldap
pkgver=1.0.1
-pkgrel=7
+pkgrel=8
pkgdesc="ACF module for OpenLDAP"
url="https://gitlab.alpinelinux.org/acf/acf-openldap"
arch="noarch"
license="GPL-2.0-only"
options="!check" # no test suite
-depends="acf-core openldap openldap-back-bdb"
+depends="acf-core openldap openldap-back-mdb"
source="https://gitlab.alpinelinux.org/acf/acf-openldap/-/archive/v$pkgver/acf-openldap-v$pkgver.tar.gz"
builddir="$srcdir/$pkgname-v$pkgver"
diff --git a/main/aconf/APKBUILD b/main/aconf/APKBUILD
index ecc1db71bd..cd3e537b63 100644
--- a/main/aconf/APKBUILD
+++ b/main/aconf/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
pkgname=aconf
pkgver=0.8.1
pkgrel=1
diff --git a/main/akms/APKBUILD b/main/akms/APKBUILD
new file mode 100644
index 0000000000..a2eb726d00
--- /dev/null
+++ b/main/akms/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=akms
+pkgver=0.2.0
+pkgrel=0
+pkgdesc="Alpine Kernel Module Support"
+url="https://github.com/jirutka/akms"
+arch="noarch"
+license="MIT"
+depends="bubblewrap cmd:depmod kernel-hooks"
+makedepends="asciidoctor"
+triggers="$pkgname.trigger=/usr/src/*"
+install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-deinstall"
+subpackages="$pkgname-doc"
+source="https://github.com/jirutka/akms/archive/v$pkgver/$pkgname-$pkgver.tar.gz
+ modules-load.conf
+ "
+builddir="$srcdir/$pkgname-$pkgver"
+options="!check" # no tests provided
+
+build() {
+ make build
+}
+
+package() {
+ make install DESTDIR="$pkgdir" prefix=/usr
+
+ # See https://github.com/jirutka/akms/issues/5
+ install -Dm644 "$srcdir"/modules-load.conf "$pkgdir"/usr/lib/modules-load.d/$pkgname.conf
+}
+
+sha512sums="
+dd07b18d17f681ca2866dde7ec70996e430be939dca1a2c745133db0211d117ec183ef611d13a4131709eced96186194f4f1dd97c6a40e92fb040e3aefe24768 akms-0.2.0.tar.gz
+e61ebacae17e4e6b9ec39c0673d46c7764cba7f1378208341688f201c396a1599f8a518ce0849f36da0de2710391014f45d90ab09f6b36a579970d1672b0d71d modules-load.conf
+"
diff --git a/main/akms/akms.post-install b/main/akms/akms.post-install
new file mode 100644
index 0000000000..c3c925fe4c
--- /dev/null
+++ b/main/akms/akms.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+ln -s /usr/share/kernel-hooks.d/akms.hook /etc/kernel-hooks.d/20-akms.hook
+
+exit 0
diff --git a/main/akms/akms.pre-deinstall b/main/akms/akms.pre-deinstall
new file mode 100644
index 0000000000..83c5f600ab
--- /dev/null
+++ b/main/akms/akms.pre-deinstall
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+HOOK_FILE='/usr/share/kernel-hooks.d/akms.hook'
+
+for link in /etc/kernel-hooks.d/*; do
+ if [ "$(readlink -f "$link")" = "$HOOK_FILE" ]; then
+ rm "$link"
+ fi
+done
+
+exit 0
diff --git a/main/akms/akms.pre-install b/main/akms/akms.pre-install
new file mode 100644
index 0000000000..a3d89eeea1
--- /dev/null
+++ b/main/akms/akms.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+adduser -S -D -H -h /var/lib/akms -s /bin/sh -G nogroup -g 'added by package akms' akms 2>/dev/null
+
+exit 0
diff --git a/main/akms/akms.trigger b/main/akms/akms.trigger
new file mode 100644
index 0000000000..63ddb6d203
--- /dev/null
+++ b/main/akms/akms.trigger
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+CFG_FILE='/etc/akms.conf'
+
+if ! [ -f "$CFG_FILE" ]; then
+ echo "$CFG_FILE does not exist, skipping akms trigger" >&2
+ exit 0
+fi
+
+. "$CFG_FILE"
+
+case "$disable_trigger" in
+ yes | true | 1) exit 0;;
+esac
+
+for srcdir in "$@"; do
+ [ -f "$srcdir"/AKMBUILD ] || continue
+ akms install "$srcdir"
+done
+
+# Triggers exiting with non-zero status cause headaches. APK marks the
+# corresponding package and the world as broken and starts exiting with
+# status 1 even after e.g. successful installation of a new package.
+exit 0
diff --git a/main/akms/modules-load.conf b/main/akms/modules-load.conf
new file mode 100644
index 0000000000..08047cf6e0
--- /dev/null
+++ b/main/akms/modules-load.conf
@@ -0,0 +1 @@
+overlay
diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD
index 2992992554..65c3702e8e 100644
--- a/main/alpine-base/APKBUILD
+++ b/main/alpine-base/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-base
-pkgver=3.15.0_alpha20210804
+pkgver=3.15.0
pkgrel=0
pkgdesc="Meta package for minimal alpine base"
url="https://alpinelinux.org"
diff --git a/main/alpine-conf/0001-update-kernel-Make-path-for-tmpdir-changeable-via-cl.patch b/main/alpine-conf/0001-update-kernel-Make-path-for-tmpdir-changeable-via-cl.patch
deleted file mode 100644
index f2b33e2205..0000000000
--- a/main/alpine-conf/0001-update-kernel-Make-path-for-tmpdir-changeable-via-cl.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 661f3b90f29f96a733aaff62ff0ca899ed34234d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dennis=20G=C3=BCnnewig?= <dev@fedux.org>
-Date: Sun, 30 May 2021 15:16:17 +0200
-Subject: [PATCH] update-kernel: Make path for tmpdir changeable via cli flag
-
-On a Raspberry Pi 3B+ the memory is limited. Updating a kernel might be not possible due to "out of space" situations. This MR adds a flag to mitigate the problem for users facing this issue.
----
- update-kernel.in | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/update-kernel.in b/update-kernel.in
-index dce5006..51fed76 100644
---- a/update-kernel.in
-+++ b/update-kernel.in
-@@ -31,6 +31,7 @@ REPOSITORIES_FILE=/etc/apk/repositories
- KEYS_DIR=/etc/apk/keys
- SIGNALS="HUP INT TERM"
- TMPDIR=
-+TMPDIR_PATH="/tmp"
- features=
- modloopfw=
-
-@@ -55,6 +56,7 @@ usage() {
- -F|--feature <feature> Enable initfs feature
- -p|--package <package> Additional module or firmware package
- -s|--modloopsign Sign modloop with abuild key
-+ -t|--tmpdir <directory> Choose different (non RAM) temporary directory for build files etc.
- -v|--verbose Verbose output
- -k|--apk-pubkey <key> Include given key in initramfs
- -K|--hostkeys Include host keys in initramfs
-@@ -68,8 +70,8 @@ usage() {
- }
-
- QUIET_OPT="--quiet"
--OPTS=$(getopt -l arch:,build-dir:,flavor:,feature:,modloopfw:,help,package:,modloopsign,verbose,apk-pubkey:,hostkeys,compression:,media,repositories-file:,keys-dir: \
-- -n $SCRIPT -o a:b:f:F:hp:svk:KC:Md: -- "$@") || usage 1
-+OPTS=$(getopt -l arch:,build-dir:,flavor:,feature:,modloopfw:,help,package:,modloopsign,tmpdir:,verbose,apk-pubkey:,hostkeys,compression:,media,repositories-file:,keys-dir: \
-+ -n $SCRIPT -o a:b:f:F:hp:st:vk:KC:Md: -- "$@") || usage 1
-
- eval set -- "$OPTS"
- while :; do
-@@ -105,6 +107,10 @@ while :; do
- -s|--modloopsign)
- MODLOOPSIGN=1
- ;;
-+ -t|--tmpdir)
-+ shift
-+ TMPDIR_PATH="$1"
-+ ;;
- -v|--verbose)
- QUIET_OPT=
- ;;
-@@ -218,7 +224,7 @@ fi
-
- [ "$ARCH" ] || ARCH=$(apk --print-arch)
-
--TMPDIR=$(mktemp -d /tmp/$SCRIPT.XXXXXX)
-+TMPDIR=$(mktemp -d "$TMPDIR_PATH/$SCRIPT.XXXXXX")
- ROOT=$TMPDIR/root
- BOOT=$ROOT/boot
-
---
-2.31.1
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 4eeb08f652..d53b9cdfff 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,14 +1,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
-pkgver=3.12.0
-pkgrel=1
+pkgver=3.13.0
+pkgrel=0
pkgdesc="Alpine configuration management scripts"
url="https://git.alpinelinux.org/alpine-conf/about"
arch="all"
license="MIT"
depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3"
source="https://gitlab.alpinelinux.org/alpine/alpine-conf/-/archive/$pkgver/alpine-conf-$pkgver.tar.gz
- 0001-update-kernel-Make-path-for-tmpdir-changeable-via-cl.patch
"
builddir="$srcdir"/$pkgname-$pkgver
@@ -26,6 +25,5 @@ package() {
}
sha512sums="
-e776e79677a89d2538896fdf63eb37ee7bd2179cd8e4205df4b0577fa54cf9b3aceeda191eaad14cb51323e7d10c67bfd63c481f88766872c5c6ef229e9ab53c alpine-conf-3.12.0.tar.gz
-7c9c78f134853d56ef65900f89d2cf5da2a333700c70caacaa650577865935ecefd3467f221f9ec3deac0a108edbbfbd52e7f1c5f66d468dac7770d59ca4bf5b 0001-update-kernel-Make-path-for-tmpdir-changeable-via-cl.patch
+ad5c26bc4b1cd0e5f3083340469d7748dc2a5e97cb6d5e9cd87cdff36633d64732d59b577ea23202aa5b75da4ca65f07682d2b3387e7529717f169d8718824cc alpine-conf-3.13.0.tar.gz
"
diff --git a/main/alpine-make-rootfs/APKBUILD b/main/alpine-make-rootfs/APKBUILD
index 1914a65b31..f0d18ef361 100644
--- a/main/alpine-make-rootfs/APKBUILD
+++ b/main/alpine-make-rootfs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=alpine-make-rootfs
-pkgver=0.5.1
+pkgver=0.6.0
pkgrel=0
pkgdesc="Make customized Alpine Linux rootfs (base image) for containers"
url="https://github.com/alpinelinux/alpine-make-rootfs"
@@ -17,4 +17,6 @@ package() {
make install DESTDIR="$pkgdir" PREFIX=/usr
}
-sha512sums="d2c98c3fc69b4f61d798714711b668da7abafb111846a0a8d4cbcf1003a2b677a18ad9cfa3565a0f2cb0a74a2f30f485786310a8e09ff942037bf60d88bf3245 alpine-make-rootfs-0.5.1.tar.gz"
+sha512sums="
+2ea723071c469318006a0e5d8fcc22f7cd9ebfb6ebc271e20951f5999a1521811f12850dfcd91533cd3f6572eafaa6b001112a32c8f6c00fd626f9aa1e9a372b alpine-make-rootfs-0.6.0.tar.gz
+"
diff --git a/main/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD
index a5f63cf157..496426969d 100644
--- a/main/alsa-lib/APKBUILD
+++ b/main/alsa-lib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alsa-lib
-pkgver=1.2.5.1
-pkgrel=1
+pkgver=1.2.6.1
+pkgrel=0
pkgdesc="Advanced Linux Sound Architecture (ALSA) library"
url="https://alsa-project.org/"
arch="all"
@@ -38,7 +38,7 @@ package() {
}
sha512sums="
-01998ffa449e925ff552c13aea47f9540903afdc533086067c78dcaba4d239c347180d3d28bb0000e6d19b7779c7249fcc77a30057930ca22d18ba55e163fa1c alsa-lib-1.2.5.1.tar.bz2
+70e539cf092b5d43e00e4134d8a3e184f0dc34312823e4b58a574320cbf06cb7369bc3251ecb1858033756a7a8c35d36faa8da48d49f6efe0cec905784adbd45 alsa-lib-1.2.6.1.tar.bz2
e15318431fe2d5bd1e42ef793f223e3e5995890d7befe6daa3d7456ccf5cb2f51eb79171539cecae13032a9b8a798ea35e04c89b27c7ef9567e2c03fb8db4512 remove-test.patch
f980d153c2f179e2f8fd90180d19250e5a5e12388f31d86a233d89be72ae7e96b944a8f435f0a11c6140378ac38eaa937175e1c100395ec4f635a9a6a4b1ae25 fix-PATH_MAX-on-ppc64le.patch
"
diff --git a/main/alsa-utils/APKBUILD b/main/alsa-utils/APKBUILD
index fc001dde11..e83ac12060 100644
--- a/main/alsa-utils/APKBUILD
+++ b/main/alsa-utils/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alsa-utils
-pkgver=1.2.5.1
-pkgrel=2
+pkgver=1.2.6
+pkgrel=0
pkgdesc="Advanced Linux Sound Architecture (ALSA) utilities"
url="https://alsa-project.org/"
arch="all"
@@ -41,7 +41,7 @@ alsaconf() {
}
sha512sums="
-bbafeb9189ec5802965c4e69cf6e7cd4c132ffb77b57f164d6585649890f96edd052c72697171fd629b39e12f78648fea634468df34c1a80255227ca397907bf alsa-utils-1.2.5.1.tar.bz2
+6842f0f4c2f7cc5ac3ba94736ee259d9988b5d3e0d2b522f858d712e16938d2845fa9ef64f4aa60222b8ef6738e053f9113a5ea24a197f2c0d6c4dbd70030f5e alsa-utils-1.2.6.tar.bz2
f04155e1e391c7f36d44422c8e769bf9370117f6bbea6c0664e9858f7a676cc958e4260e4b4d226e71d0716f6be4e6fdd60f1d07cb7e9922fff378ceec01c47d alsaconf.patch
c66959a4a1a24a727c9c91a455caa5fa093c523d17a563b56ec2449a02ff30c83683db555006954b1fe571446cf4a117cc41de8c8b869a6e875d386595b3cc1f alsa.initd
d7e212e9f624b09168117b46c66289204a23915adf0d1b0c9ae258049430397b8f2d86d3b5f7e3087151948a031c4eab863e8195a6c7b1276704e9cba9c2d2a7 alsa.confd
diff --git a/main/amavis/APKBUILD b/main/amavis/APKBUILD
index 6e51cce902..02abe30078 100644
--- a/main/amavis/APKBUILD
+++ b/main/amavis/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=amavis
-pkgver=2.12.1
-pkgrel=2
+pkgver=2.12.2
+pkgrel=0
pkgdesc="High-performance interface between mailer (MTA) and content checkers"
url="https://gitlab.com/amavis/amavis"
arch="noarch !x86" # perl-db
@@ -49,7 +49,9 @@ package() {
install -Dm644 "$srcdir"/amavisd.confd "$pkgdir"/etc/conf.d/amavisd
}
-sha512sums="33bcc8606e142ed390cb368a7c640f96b70ecd1c8473e7d19f3125f89afde7a044981b9e3704c722c54472f88b2e4e54c89bab19bc28ceb89561aeb8ede04c8e amavis-v2.12.1.tar.gz
+sha512sums="
+7ef5ba670b530bf19352ba8aebd57a171e32d90adffc0b248b93a39f740fe4bb8ddf1d5ecdd46d0c9e1b4ca1a9ff0a9e86e73900e73a1a2cac514656c3a7db01 amavis-v2.12.2.tar.gz
6a9dd16a6b52f3d1fbd16887f29ccceddc58e88a02e681f23c1fe54b7e24feea5089d52813f4f3e87d9242daf79d2b2ea1e7c451d83d7de943403e71dc61c4e5 amavisd.initd
a5ce3583c34197f335372728cf92da23bae2cd7a9ae48daff6eaadbf66fbd5be6bb8b480b0fce1ea2b3a662b0a54d1d2f1f277d2f9a06d9630b57fa5d7ac2635 amavisd.confd
-87f9c4489fb377e6e1315edcef75940b1a61a30c418106c1ef48eef4f425746333c550b270e0e6727fe89a68239f673f24392d81a53157ad487d3d2da1e95b4c amavisd-conf.patch"
+87f9c4489fb377e6e1315edcef75940b1a61a30c418106c1ef48eef4f425746333c550b270e0e6727fe89a68239f673f24392d81a53157ad487d3d2da1e95b4c amavisd-conf.patch
+"
diff --git a/main/apache2-mod-wsgi/APKBUILD b/main/apache2-mod-wsgi/APKBUILD
index 86f60a086e..bba5063a27 100644
--- a/main/apache2-mod-wsgi/APKBUILD
+++ b/main/apache2-mod-wsgi/APKBUILD
@@ -2,8 +2,8 @@
# Maintainer: Matt Smith <mcs@darkregion.net>
pkgname=apache2-mod-wsgi
_realname=mod_wsgi
-pkgver=4.7.1
-pkgrel=1
+pkgver=4.9.0
+pkgrel=0
pkgdesc="Python WSGI Module for Apache2"
url="https://github.com/GrahamDumpleton/mod_wsgi"
arch="all"
@@ -32,5 +32,7 @@ package() {
"$pkgdir"/usr/share/doc/$pkgname/LICENSE
}
-sha512sums="cbb5ec53d55e47a83f2b0630527c6a52b48ef21d5d2c18adcb875fc455795b39b3c93f4a86dfbf9738c0bd554d86cc4912cc9ff83c428af302ab94a61f66b5b4 apache2-mod-wsgi-4.7.1.tar.gz
-5b36a458bd3539e58ea61ec405c4f5c5e0001a644263b0e1f8421a5c7fc7884b6df1355674a9d9b610780b5e9db6ce66d0ae1bbc0e512ecb027c3757209152c8 apache2-mod-wsgi.apache2.conf"
+sha512sums="
+9dc34d431171321094a9713444895d9754eff4e69ad1e86c8d3cd77bc1ca0a4c10b697e7f8cf14902d6bfaf205c8842e62fa944bb38f66f1c54fd36af95a09d6 apache2-mod-wsgi-4.9.0.tar.gz
+5b36a458bd3539e58ea61ec405c4f5c5e0001a644263b0e1f8421a5c7fc7884b6df1355674a9d9b610780b5e9db6ce66d0ae1bbc0e512ecb027c3757209152c8 apache2-mod-wsgi.apache2.conf
+"
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index 4f5099ccc3..1e47daae52 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
# Contributor: Valery Kartel <valery.kartel@gmail.com>
pkgname=apache2
_pkgreal=httpd
-pkgver=2.4.51
+pkgver=2.4.52
pkgrel=0
pkgdesc="A high performance Unix-based HTTP server"
url="https://httpd.apache.org/"
@@ -51,6 +51,9 @@ options="suid"
builddir="$srcdir"/$_pkgreal-$pkgver
# secfixes:
+# 2.4.52-r0:
+# - CVE-2021-44224
+# - CVE-2021-44790
# 2.4.51-r0:
# - CVE-2021-42013
# 2.4.50-r0:
@@ -378,7 +381,7 @@ _lua() {
_load_mods
}
sha512sums="
-9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66 httpd-2.4.51.tar.bz2
+97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2
8e62b101f90c67babe864bcb74f711656180b011df3fd4b541dc766b980b72aa409e86debf3559a55be359471c1cad81b8779ef3a55add8d368229fc7e9544fc apache2.confd
18e8859c7d99c4483792a5fd20127873aad8fa396cafbdb6f2c4253451ffe7a1093a3859ce719375e0769739c93704c88897bd087c63e1ef585e26dcc1f5dd9b apache2.logrotate
81a2d2a297d8049ba1b021b879ec863767149e056d9bdb2ac8acf63572b254935ec96c2e1580eba86639ea56433eec5c41341e4f1501f9072745dccdb3602701 apache2.initd
diff --git a/main/apk-cron/APKBUILD b/main/apk-cron/APKBUILD
index 8d9788d949..dfa933a839 100644
--- a/main/apk-cron/APKBUILD
+++ b/main/apk-cron/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
pkgname=apk-cron
pkgver=1.0
pkgrel=3
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 6bd813c552..26744eea6b 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
-pkgver=2.12.7
-pkgrel=3
+pkgver=2.12.9
+pkgrel=1
pkgdesc="Alpine Package Keeper - package manager for alpine"
arch="all"
url="https://gitlab.alpinelinux.org/alpine/apk-tools"
@@ -86,6 +86,6 @@ luaapk() {
}
sha512sums="
-1297bb969a4d27164b38e64f4d2c00b00758d8d83c7ba658eeddccdd549dc6ba8f26a60a9e71c88f4bca87b2746a8fb4b7bb41e0096cf459e1b841203f903681 apk-tools-v2.12.7.tar.gz
-102e6d01a984fb7a84c9432f797e4d8d2c90e9570dd26208b8485569ab471ea88a2cc81eabd3b3f7e4c9685a37afc458dec172a65b03c19c78a7efb598c54f45 _apk
+2e299e50c5ca8733f04fad971247146ff4bebb697c3589e4692c9a940ede89432dd9fea48004dc947cb493db1206a336ac0ad1e876b02683183d69b4a127d1c6 apk-tools-v2.12.9.tar.gz
+48d5437bb8e76b56f972430ac95f1f408687dd2734ff3e69192140abe8f301154329d9cbef0c17da86ac8d825f32bc818376bdfb672bf44adbfa5e21c957d5ec _apk
"
diff --git a/main/apk-tools/_apk b/main/apk-tools/_apk
index d00105c012..0ce54d74de 100644
--- a/main/apk-tools/_apk
+++ b/main/apk-tools/_apk
@@ -12,7 +12,7 @@ function _apk {
"(-V --version)"{-V,--version}"[Print program version and exit]"
"(-X --repository)"{-X,--repository}"[Specify additional package repository]:repository:_host"
"--allow-untrusted[Install packages with untrusted signature or no signature]"
- "--arch[Temporarily override architecture]:arch:(armhf mips64 s390x x86_64 x86 aarch64 ppc64le armv7)"
+ "--arch[Temporarily override architecture]:arch:(armhf mips64 s390x x86_64 x86 aarch64 ppc64le armv7 riscv64)"
"--cache-dir[Temporarily override the cache directory]:directory:_dir_list"
"--cache-max-age[Maximum age for index in cache before it's refreshed]:minutes"
"--force-binary-stdout[Continue even if binary data will be printed to the terminal]"
@@ -104,6 +104,7 @@ function _apk {
"list:List packages matching a pattern or other criteria"
"dot:Render dependencies as graphviz graphs"
"policy:Show repository policy for packages"
+ "search:Search for packages by name or description"
"index:Create repository index file from packages"
"fetch:Download packages from global repositories to a local directory"
"manifest:Show checksums of package contents"
@@ -125,13 +126,14 @@ function _apk {
$upgrade_opt \
"--initdb[Initialize a new package database]" \
"(-t --virtual)"{-t,--virtual}"[Create virtual package with given dependencies]" \
+ "--no-chown[Do not change file owner or group]" \
"*:package:_apk_packages"
)
;;
(del)
completion_spec+=(
$commit_opts \
- "--rdepeds[Recursively delete all top-level reverse dependencies]" \
+ "(-r --rdepends)"{-r,--rdepends}"[Recursively delete all top-level reverse dependencies]" \
"*:installed package:_apk_installed_pkgs"
)
;;
@@ -172,15 +174,16 @@ function _apk {
"(-d --description)"{-d,--descripton}"[Print the package description]" \
"(-e --installed)"{-e,--installed}"[Check package installed status]" \
"(-L --contents)"{-L,--contents}"[List files included in the package]" \
- "(-i --install-if)"{-i,--install-if}"[List the package's install_if rule]" \
- "(-I --rinstall-if)"{-I,--rinstall-if}"[List other packages whose install_if rules refer to this package]" \
+ "(-P --provides)"{-P,--provides}"[List what the package provides]" \
"(-r --rdepends)"{-r,--rdepends}"[List reverse dependencies of the package]" \
"(-R --depends)"{-R,--depends}"[List the dependencies of the package]" \
"(-s --size)"{-s,--size}"[Print the package's installed size]" \
"(-w --webpage)"{-w,--webpage}"[Print the URL for the package's upstream webpage]" \
"(-W --who-owns)"{-W,--who-owns}"[Print the package which owns the specified file]:file:_files" \
+ "(-i --install-if)"{-i,--install-if}"[List the package's install_if rule]" \
"--license[Print the package SPDX license identifier]" \
"--replaces[List the other packages for which this package is marked as a replacement]" \
+ "(-I --rinstall-if)"{-I,--rinstall-if}"[List other packages whose install_if rules refer to this package]" \
"--triggers[Print active triggers for the package]" \
"*:package:_apk_packages"
)
@@ -190,7 +193,7 @@ function _apk {
"(-I --installed)"{-I,--installed}"[Consider only installed packages]" \
"(-O --orphaned)"{-O,--orphaned}"[Consider only orphaned packages]" \
"(-a --available)"{-a,--available}"[Consider only available packages]" \
- "(-u --upgradeable)"{-u,--upgradeable}"[Consider only upgradable packages]" \
+ "(-u --upgradable --upgradeable)"{-u,--upgradable,--upgradeable}"[Consider only upgradable packages]" \
"(-o --origin)"{-o,--origin}"[List packages by origin]" \
"(-d --depends)"{-d,--depends}"[List packages by dependency]" \
"(-P --providers)"{-P,--providers}"[List packages by provider]" \
@@ -209,6 +212,7 @@ function _apk {
"(-o --output)"{-o,--output}"[Output generated index to file]:output:_files" \
"(-x --index)"{-x,--index}"[Read an existing index to speed up the creation of the new index]" \
"--no-warnings[Disable warnings about missing dependencies]" \
+ "--rewrite-arch[Set all package's architecture to arch]:arch:(armhf mips64 s390x x86_64 x86 aarch64 ppc64le armv7 riscv64)" \
"*:package:_apk_packages"
)
;;
@@ -219,20 +223,44 @@ function _apk {
"(-r --recursive)"{-r,--recursive}"[Fetch packages and all of their dependencies]" \
"(-s --stdout)"{-s,--stdout}"[Dump the .apk file(s) to stdout]" \
"--simulate[Simulate the requested operation without making any changes]" \
+ "--url[Print the full URL for downloaded packages]" \
"*:package:_apk_packages"
)
;;
(manifest) completion_spec+=("*:package:_apk_packages");;
(verify) completion_spec+=("*:package:_apk_packages");;
- (audit) completion_spec+=("*:files:_files");;
+ (audit)
+ completion_spec+=(
+ "--backup[Audit configuration files only (default)]" \
+ "--check-permissions[Check file permissions too]" \
+ "--packages[Print only the packages with changed files]" \
+ "--system[Audit all system files]" \
+ "(-r --recursive)"{-r,--recursive}"[Descent into directories and audit them as well]" \
+ "*:files:_files"
+ )
+ ;;
(version)
completion_spec+=(
- "-a[Consider packages from all repository tags]" \
- "-l[Limit to packages with output matching given operand]:operand" \
+ "(-a --all)"{-a,--all}"[Consider packages from all repository tags]" \
+ "(-c --check)"{-c,--check}"[Check versions for validity]:*: " \
+ "(-I --indexes)"{-I,--indexes}"[Print the version and description for each repository's index]:*: " \
+ "(-l --limit)"{-l,--limit}"[Limit to packages with output matching given operand]:operand:('>' '=' '<' '>=' '<=')" \
+ "(-t --test)"{-t,--test}"[Compare two version strings]:*: " \
"*:package:_apk_packages"
)
;;
(policy) completion_spec+=("*:package:_apk_packages");;
+ (search)
+ completion_spec+=(
+ "(-a --all)"{-a,--all}"[Print all matching package versions]" \
+ "(-d --description)"{-d,--description}"[Search in description as well]" \
+ "(-e -x --exact)"{-e,-x,--exact}"[Match package names exactly]" \
+ "--has-origin[Match by package origin]" \
+ "(-o --origin)"{-o,--origin}"[Print base package name]" \
+ "(-r --rdepends)"{-r,--rdepends}"[Print reverse dependencies]" \
+ "*:package:_apk_packages"
+ )
+ ;;
esac
_arguments -C -s $completion_spec && ret=0
diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD
index 9e4e25ce38..265e51151a 100644
--- a/main/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apr-util
pkgver=1.6.1
-pkgrel=10
+pkgrel=11
pkgdesc="The Apache Portable Runtime Utility Library"
url="http://apr.apache.org/"
arch="all"
diff --git a/main/arm-trusted-firmware/APKBUILD b/main/arm-trusted-firmware/APKBUILD
index a7354ff000..1b8c4a2fd3 100644
--- a/main/arm-trusted-firmware/APKBUILD
+++ b/main/arm-trusted-firmware/APKBUILD
@@ -2,15 +2,14 @@
# Contributor: Maxim Karasev <begs@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=arm-trusted-firmware
-pkgver=2.5
-pkgrel=3
+pkgver=2.6
+pkgrel=0
pkgdesc="ARM Trusted Firmware-A (TF-A)"
url="https://github.com/ARM-software/arm-trusted-firmware"
arch="aarch64"
license="BSD-3-Clause"
-makedepends="dtc openssl1.1-compat-dev"
-source="https://github.com/ARM-software/arm-trusted-firmware/archive/v$pkgver/arm-trusted-firmware-v$pkgver.tar.gz
- rk3399-baudrate.patch"
+makedepends="dtc"
+source="https://github.com/ARM-software/arm-trusted-firmware/archive/v$pkgver/arm-trusted-firmware-v$pkgver.tar.gz"
options="!check" # No tests
_plats="sun50i_a64 sun50i_h6"
@@ -30,6 +29,5 @@ package() {
}
sha512sums="
-3c99f1d849c3c536e8e2e4838ee48a1a431f0bef35eaf27eb14f9caebde71a577589b10efbbd7db49bed3b9763bed46583d0b26e72f61fcd0d34cc46ff684846 arm-trusted-firmware-v2.5.tar.gz
-86d8c60157145ab05e9b870aad11d2acaf2137ba00bf71419f8a54a4fd2b1906c19bc8bfeccc735344d1dcf11ba81bd9396bfd8854cdb972a72503b632d1e900 rk3399-baudrate.patch
+8b20964b1b672898268e27424984af0ef9e95b38f426370ed4b802f67fc204db5f467886707dce77e4560548e01777a6c36d4eb801842c7d1f2ff6ca5d9b7dd1 arm-trusted-firmware-v2.6.tar.gz
"
diff --git a/main/arm-trusted-firmware/rk3399-baudrate.patch b/main/arm-trusted-firmware/rk3399-baudrate.patch
deleted file mode 100644
index 8b133d5496..0000000000
--- a/main/arm-trusted-firmware/rk3399-baudrate.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From b3fc3a853b8357afd3a010a765072d27f640f5e8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
-Date: Sat, 14 Sep 2019 11:09:01 +0100
-Subject: [PATCH] Increase BAUD_RATE to 1500000, so that it matches U-Boot and
- kernel.
-
----
- plat/rockchip/rk3399/rk3399_def.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plat/rockchip/rk3399/rk3399_def.h b/plat/rockchip/rk3399/rk3399_def.h
-index ba83242e..8d6ecfbe 100644
---- a/plat/rockchip/rk3399/rk3399_def.h
-+++ b/plat/rockchip/rk3399/rk3399_def.h
-@@ -17,7 +17,7 @@
- /**************************************************************************
- * UART related constants
- **************************************************************************/
--#define RK3399_BAUDRATE 115200
-+#define RK3399_BAUDRATE 1500000
- #define RK3399_UART_CLOCK 24000000
-
- /******************************************************************************
diff --git a/main/arpon/APKBUILD b/main/arpon/APKBUILD
index 45eb4d722a..772636a463 100644
--- a/main/arpon/APKBUILD
+++ b/main/arpon/APKBUILD
@@ -3,7 +3,7 @@
pkgname=arpon
pkgver=3.0
_realver=3.0-ng
-pkgrel=4
+pkgrel=5
pkgdesc="Arp handler inspectiON is a handler daemon with tools to handle all ARP aspects"
url="http://arpon.sourceforge.net/"
arch="all"
@@ -22,7 +22,7 @@ builddir="$srcdir"/ArpON-$_realver
build() {
cmake -B build . \
-DCMAKE_C_FLAGS="$CFLAGS" \
- -DCMAKE_BUILD_TYPE=None
+ -DCMAKE_BUILD_TYPE=MinSizeRel
make -C build
}
diff --git a/main/arpwatch/APKBUILD b/main/arpwatch/APKBUILD
index 2c64257c23..deff86dc18 100644
--- a/main/arpwatch/APKBUILD
+++ b/main/arpwatch/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=arpwatch
-pkgver=3.1
-pkgrel=1
+pkgver=3.2
+pkgrel=0
pkgdesc="Ethernet monitoring program"
url="https://www-nrg.ee.lbl.gov/"
arch="all"
@@ -55,7 +55,7 @@ package() {
}
sha512sums="
-2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282 arpwatch-3.1.tar.gz
+0a028e770e73f8ff2e926da5ab58e067c05908924a60cfc52c5fb7d57a0f36d3087f6cedb4a8b39b66ce85a4f6a12a594e7e74fd044331e5f346bcc9add99585 arpwatch-3.2.tar.gz
854f6361bf02586516db4f50afdee729c047cd788985f72f475e592e0e744c24d7d765f0391d733dbf417048c26b6d43c00eb63c58e6798bdb2366b93cbfe03a arpwatch.confd
83fc559aecd82cefd430104df23fc7680ac14d2c27f74d4543585382166e16a65563e00122281e886278993a9ca574daa5b2b2100884369c3a3146a66b68a0f7 arpwatch.initd
b537220b7a19f7f28d1b60cfea6ef2e4d0c852ac83907fdd2515e467c3d16529b0c5a25ee653536e674c63d47a00709fc89fd6085efc5ba4a12f392df5ae5788 22_alpine_bihourly_script.patch
diff --git a/main/asciidoctor/APKBUILD b/main/asciidoctor/APKBUILD
index c5de7d3d92..ab62dc6898 100644
--- a/main/asciidoctor/APKBUILD
+++ b/main/asciidoctor/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Seung Soo Mun <hamletmun@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=asciidoctor
-pkgver=2.0.16
-pkgrel=1
+pkgver=2.0.17
+pkgrel=0
pkgdesc="Converter for AsciiDoc to HTML5, DocBook 5 (or 4.5) and other formats"
url="https://rubygems.org/gems/$pkgname"
arch="noarch"
@@ -34,5 +34,5 @@ package() {
}
sha512sums="
-2e164a0d24374e0c5461926c865c8900d3fb3f27606af5aac1a0a5f53102ca758f6421a113a9bb100fe7dba2e1accec04ca6ca16670e4b85e373f729bdaba6cd asciidoctor-2.0.16.gem
+41ebc833c7b8bded5704034c7fcf7d2f26643a24de24eda57db1a0ac94976e775bf0f093f46faaa99c5007c61af325aa5b02e5321159a88daac3397800adbd03 asciidoctor-2.0.17.gem
"
diff --git a/main/atop/APKBUILD b/main/atop/APKBUILD
index 69e6231a32..7084d21610 100644
--- a/main/atop/APKBUILD
+++ b/main/atop/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=atop
-pkgver=2.6.0
+pkgver=2.7.1
pkgrel=0
pkgdesc="Resource-specific view of processes"
url="https://www.atoptool.nl/"
@@ -11,7 +11,6 @@ subpackages="$pkgname-doc"
source="https://www.atoptool.nl/download/atop-$pkgver.tar.gz
atop-daily-bb.patch
atop-include-macros.patch
- fix-limits-on-ppc64le.patch
atop.initd
"
options="suid"
@@ -45,8 +44,9 @@ package() {
}
-sha512sums="8d4e2ae56a63738fc615f294d1f4e27cd9eab20acaf5d36c82d87390f96d38cf28cab0a00507459c3ce6e535294a442c4546e0cf732bad253cb518a14cdf5e88 atop-2.6.0.tar.gz
+sha512sums="
+f5013dbc25b86f07c9892555705bb3db2eeb949478f53e6e5545308b0c7c173c4c7a8ed0eae1f173e075210f81fceee09d7a9d90de76c4f011e38ad4a76b780b atop-2.7.1.tar.gz
664225450074962aac0e13484c9b2feaf08620bbe1e0f9c5dc1b02f1ecd315224cd04df53134f2d107210fc9223a64d8885ae70d33d0663c2335fa6d46f6ddfd atop-daily-bb.patch
f30c9e6051332af8c8cafcd881f89a0e2d2a8e1d84eee8ac0c8c6b58f3ae3431fcf9c40dea6d03e271f8969802de449d33b4323c13045bdb38a539732c81a8b6 atop-include-macros.patch
-87cc78832774299227d435643551d099c3d88babb13049fe71e170e1220204a26be9ab570a59eccc90c9cb4faabd371e1c031063c70cb20a0c4620566c906425 fix-limits-on-ppc64le.patch
-172c9d367b936427ccbbbd1140c7808ec8ffe3194b3557ba024820dac8fa68c9919f7dc34d332e91283fde64d731db7bdbfee3c2d6caad3cd291e0f1c227cb03 atop.initd"
+172c9d367b936427ccbbbd1140c7808ec8ffe3194b3557ba024820dac8fa68c9919f7dc34d332e91283fde64d731db7bdbfee3c2d6caad3cd291e0f1c227cb03 atop.initd
+"
diff --git a/main/atop/fix-limits-on-ppc64le.patch b/main/atop/fix-limits-on-ppc64le.patch
deleted file mode 100644
index 82e3547d91..0000000000
--- a/main/atop/fix-limits-on-ppc64le.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/photosyst.c 2020-12-25 13:13:46.569591017 +0000
-+++ b/photosyst.c 2020-12-25 13:13:52.399619155 +0000
-@@ -165,6 +165,7 @@
- #include <dirent.h>
- #include <sys/ioctl.h>
- #include <sys/sysmacros.h>
-+#include <limits.h>
-
- #define SCALINGMAXCPU 8 // threshold for scaling info per CPU
-
diff --git a/main/audit/APKBUILD b/main/audit/APKBUILD
index 56c58146b3..29e20b52a0 100644
--- a/main/audit/APKBUILD
+++ b/main/audit/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Dermot Bradley <dermot_bradley@yahoo.com>
# Maintainer: Tycho Andersen <tycho@docker.com>
pkgname=audit
-pkgver=3.0.5
+pkgver=3.0.6
pkgrel=0
pkgdesc="User space tools for 2.6 kernel auditing"
url="https://people.redhat.com/sgrubb/audit/"
@@ -63,7 +63,7 @@ static() {
}
sha512sums="
-147b8aab7801ac286d8d634736b90b94cf497c5d3a6142f521e527dec9b989ed884caf0ac08aa533635276da46e78a65b14ebf165cd847a8500e29a2829a890d audit-3.0.5.tar.gz
+74734e1b1fddea086db9c5dc8c4b7817917fdf17bc7ca4e5b440aae975484d020a17c3f485f6a37b6b150a307d809e50d559d31a8cbd6f1e554933719551bcd1 audit-3.0.6.tar.gz
f3f2c4ee745e99877c981d889c5cbb0379d073a9b7634c1480ae603a21a13045f9978b51f8cb53c8d0ba414d249bb859af7bca7e302c464b3fc3c6463ecca762 0003-all-get-rid-of-strndupa.patch
6a0e1fb81d7defe6ad84da447a55e1e0b90299fcbd1ca679934a1dfa1a211986ea4642a1c69abe0619120b64b16546a41fa028f55f27c79819d896178aac6df7 0004-fix-path-in-au-remote-conf.patch
b3d7ceba02b6b4406222c3b142fcfdf2b612dc52eebc490cfd121d696e4ef7c6cc5e27813d67937c464ed4c3cd283de9ccfcb75e63405a447523fa4641e79da3 auditd.initd
diff --git a/main/automake/0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch b/main/automake/0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch
deleted file mode 100644
index 9923474f4c..0000000000
--- a/main/automake/0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 3009ad094f5807c512e79224a8acee5a81a736b0 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Sun, 29 Aug 2021 13:02:33 +0200
-Subject: [PATCH] automake: add install dep on install-libLTLIBRARIES to all
- targets
-
-A Makefile.am like
-
- bin_PROGRAMS =
- lib_LTLIBRARIES = library1.la
- pkglib_LTLIBRARIES = library2.la
- library2_LIBADD = library1.la
-
-produces, in Makefile.in,
-
- install-binPROGRAMS: install-libLTLIBRARIES
-
-but no
-
- install-pkglibLTLIBRARIES: install-libLTLIBRARIES
-
-therefore potentially breaking `make install -j`. Rectify this by
-depending on install-libLTLIBRARIES not just for bin_PROGRAMS, but
-all PROGRAMS and LTLIBRARIES.
-
-Signed-off-by: Jan Engelhardt <jengelh@inai.de>
----
- bin/automake.in | 25 +++++++++++++++++++------
- 1 file changed, 19 insertions(+), 6 deletions(-)
-
-diff --git a/bin/automake.in b/bin/automake.in
-index f04f5d5f5..30babd607 100644
---- a/bin/automake.in
-+++ b/bin/automake.in
-@@ -8042,13 +8042,26 @@ sub generate_makefile
- handle_all ($makefile);
-
- # FIXME: Gross!
-- if (var ('lib_LTLIBRARIES') && var ('bin_PROGRAMS'))
-+ my $have_lt1 = !!var("lib_LTLIBRARIES");
-+ my $have_lt2 = !!var("nobase_lib_LTLIBRARIES");
-+ for my $var (variables("PROGRAMS"), variables("LTLIBRARIES"))
- {
-- $output_rules .= "install-binPROGRAMS: install-libLTLIBRARIES\n\n";
-- }
-- if (var ('nobase_lib_LTLIBRARIES') && var ('bin_PROGRAMS'))
-- {
-- $output_rules .= "install-binPROGRAMS: install-nobase_libLTLIBRARIES\n\n";
-+ if ($var->name eq "lib_LTLIBRARIES"
-+ || $var->name eq "nobase_lib_LTLIBRARIES"
-+ || substr($var->name, 0, 7) eq "noinst_")
-+ {
-+ next;
-+ }
-+ my $shortname = $var->name;
-+ $shortname =~ tr{_}{}d;
-+ if ($have_lt1)
-+ {
-+ $output_rules .= "install-$shortname: install-libLTLIBRARIES\n\n";
-+ }
-+ if ($have_lt2)
-+ {
-+ $output_rules .= "install-$shortname: install-nobase_libLTLIBRARIES\n\n";
-+ }
- }
-
- handle_install;
---
-2.33.0
-
diff --git a/main/automake/APKBUILD b/main/automake/APKBUILD
index b046b621f7..31ab53d03c 100644
--- a/main/automake/APKBUILD
+++ b/main/automake/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=automake
-pkgver=1.16.4
-pkgrel=1
+pkgver=1.16.5
+pkgrel=0
pkgdesc="GNU tool for automatically creating Makefiles"
url="https://www.gnu.org/software/automake"
arch="noarch"
@@ -10,7 +10,6 @@ depends="perl"
makedepends="autoconf"
subpackages="$pkgname-doc"
source="https://ftp.gnu.org/gnu/automake/automake-$pkgver.tar.xz
- 0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch
"
# many tests have bashisms
@@ -33,6 +32,5 @@ package() {
}
sha512sums="
-5a8883657e73b75bfa1ee59ab04af6bf4d43f390ab62fb7a9e8e2ac66159dfe4947b2ac7bc1028afffe6a09d88f388339500e03f6cdfa1226985be45ec033246 automake-1.16.4.tar.xz
-ff5fc38987afd00076f32f42bb58f5cffca8de246f8354321f2c8564e1465b9f5d373b4fe6a54f18962c8850717a2d955bdab50ea59068f1ab285da18035b7fd 0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch
+3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88 automake-1.16.5.tar.xz
"
diff --git a/main/avahi-ui/APKBUILD b/main/avahi-ui/APKBUILD
index dd85f7069c..7011a3c558 100644
--- a/main/avahi-ui/APKBUILD
+++ b/main/avahi-ui/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=avahi-ui
pkgver=0.8
-pkgrel=1
+pkgrel=2
pkgdesc="Gtk user interface library for Avahi"
url="https://www.avahi.org/"
arch="all"
diff --git a/main/awall/APKBUILD b/main/awall/APKBUILD
index 4358af12d0..80742b20cc 100644
--- a/main/awall/APKBUILD
+++ b/main/awall/APKBUILD
@@ -1,7 +1,7 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
pkgname=awall
-pkgver=1.10.1
+pkgver=1.11.1
pkgrel=0
pkgdesc="Alpine Wall"
url="https://gitlab.alpinelinux.org/alpine/awall"
@@ -10,8 +10,8 @@ arch="noarch"
license="GPL-2.0-only"
replaces="awall-nat"
depends="drill ip6tables ipset iptables lua$_luaver lua$_luaver-alt-getopt
- lua$_luaver-cjson lua$_luaver-pc lua$_luaver-posix lua$_luaver-stringy
- lua$_luaver-lyaml xtables-addons"
+ lua$_luaver-cjson lua$_luaver-pc lua$_luaver-posix lua$_luaver-schema
+ lua$_luaver-stringy lua$_luaver-lyaml xtables-addons"
subpackages="$pkgname-masquerade $pkgname-policies"
triggers="$pkgname.trigger=/usr/share/awall"
source="$url/-/archive/v$pkgver/awall-v$pkgver.tar.bz2
@@ -51,7 +51,7 @@ policies() {
}
sha512sums="
-0105eda3429526e4c5af84617ecccdecb5044024b830adb005746981ca7924deacc13e211751fa8d57ac1eb6fd6aca2270348c8ee1806ceb459ef9a7acf2697e awall-v1.10.1.tar.bz2
+5f23bbe324e5f0618b92b1658487d925ff92624914295e8bb46a757c554f963643f611c5362c15d8feb05da7745de934def3b00aa68fe396a868541a8943dfce awall-v1.11.1.tar.bz2
e83ea3281c298092530e45fa5b62f6f85b9e5109b11e109799465ea832608294c7d9c4c3f5b0f321dfc0e82040daf3a17d066e9dea65cb0dbae2c453ea9e62cd awall-init
1cd4b7fa5fc6c9ac6667dff5cc00d96a3cc42aaccafe3c5562d3dcfd9f22ddec9cfe5a9339fee8001b67ccb8e8b81c9417f39a461e5052af9bf74a2753559bf7 setup-firewall
"
diff --git a/main/axel/APKBUILD b/main/axel/APKBUILD
index 3f2ee25250..46a783dc03 100644
--- a/main/axel/APKBUILD
+++ b/main/axel/APKBUILD
@@ -1,8 +1,8 @@
# Contributor:
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=axel
-pkgver=2.17.10
-pkgrel=2
+pkgver=2.17.11
+pkgrel=0
pkgdesc="A multiple-connection concurrent downloader"
url="https://github.com/axel-download-accelerator/axel"
arch="all"
@@ -32,4 +32,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="f102ae742940d123364de49f01fe97cc146afc32adfb3776437a53ffef14fcca0c5926c39d6ac338fe2bd368529d18b0c885b694de48f7cb0e6d0195d2339437 axel-2.17.10.tar.xz"
+sha512sums="
+111e8b3bbb70e717bee8b3c318c18d0121776301c609c0894376a371238dd839f5dae7edda6738d2b89296fd4b6ac1083399acf62308eaa479b6d70b080e65a1 axel-2.17.11.tar.xz
+"
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index 0bb20c11ac..91a391c1b8 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -5,7 +5,7 @@ pkgver=9.6.7
pkgrel=2
pkgdesc="Enterprise ready, network based backup program"
url="https://www.bacula.org"
-#arch="all"
+arch="all"
license="AGPL-3.0-or-later WITH OpenSSL-Exception"
makedepends="autoconf automake libtool mariadb-connector-c-dev ncurses-dev openssl1.1-compat-dev libpq-dev
sqlite-dev zlib-dev lzo-dev acl-dev"
@@ -23,22 +23,10 @@ source="https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkg
bacula-7.4.0-path-mounted.patch
"
options="!check" #no test suite provided
-builddir="$srcdir/$pkgname-$pkgver"
_bworkdir="/var/lib/$pkgname"
-prepare () {
- default_prepare
-
- cd "$builddir"/autoconf
- autoconf
- autoreconf -fi
- cp configure ../
-}
-
build() {
- cd "$builddir"
-
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -73,8 +61,6 @@ build() {
}
package() {
- cd "$builddir"
-
make DESTDIR="$pkgdir" install
local daemon; for daemon in dir sd fd; do
@@ -134,16 +120,8 @@ mysql() {
pgsql() {
pkgdesc="Bacula PGSQL backend"
depends="$pkgname"
- pkgusers="postgres"
_mv_backend postgresql
-
- local file
- for file in create_postgresql_database make_postgresql_tables \
- grant_postgresql_privileges
- do
- chown postgres "$subpkgdir"/etc/$pkgname/scripts/$file
- done
}
sqlite() {
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index d5e511822a..f25bd7e993 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: TBK <alpine@jjtc.eu>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bash
-pkgver=5.1.8
+pkgver=5.1.16
_patchlevel=${pkgver##*.}
_myver=${pkgver%.*}
_patchbase=${_myver/./}
@@ -101,4 +101,12 @@ fa83d894fe874a05b9a7d47b8bca8e5b7f4067221d82e8b1af616d17725592c3737c621f2a8ad3c9
b9b6e3d71f7b7718e2e8598ec8e337dcc675571fb233c29e5230ebf14eab2249204531f2fe8c4d1459c5fed10acb679048588d1e457e98dbc00ffc4d2cd227e3 bash51-006
e4ebdc47e780ddc2588ecdfcfe00cb618039c7044e250ab2b836b0735c461ebacd15beaf2145e277c70b7f51cded55bd8dde7757df810f33f8dae306ee5ba571 bash51-007
97f9558a08a66cc9da62c285bf9118b39328e25ed3b9277728e0539b1ac0adef176a090e39cd96dc03d6fd900d8155bd58040cb3390a09f637bab1de8af3faf6 bash51-008
+2d3c65162ec4e5c3dfeb439891950ef2c43973a84122fcdf6b56c388466c7e671dbc9b236d2253f01411b668c365855263995dbacb8e6f9e9dbcb7e6c2cc518c bash51-009
+aac4a0b72b559566334f1029c52754f4c98185af99e09436e401d83ab81bab7882d0d8050674b30f171733f3628157777a264566e927e93db2ea5a18d26630f1 bash51-010
+bb9e47a570bb9758c365831f9650b9379b60862b8cef572edc3cd833df96ebb8b9612de474bdc2a03ff4efc2275f871d55962295385e38f3658874488e974b81 bash51-011
+59819914b6821d9f4af0aade7b9b7ea92368c2b8eb8407cea11dfeee7208905dd06bdef7a049d7b1c4fac41c44d9a130b95a061957a9649050b37471b3044cf1 bash51-012
+67535155f49a7f54f151e62aba9274f82d01f33a1a1a7e5efd1aa0d63ba2d078765f0b5e22cb24db7132eff2d8c5852a3688298baa5217b8b6e159aae065d748 bash51-013
+f658ab7ef01ba1d26f735e24b23bf35687e15b0d5d20f90da233d000745a55bdba142c11e9fba52e3b84470ec625fab60cc74cd6be533d990496a3795c658e88 bash51-014
+fd4bc85f942a3a16c545f7e951a24f620ff2d884640dea6e05f305aaf88ed41862bfb05eea2258881608de696f9dc7a0fe3bebb51a011f50b720ea7a66699184 bash51-015
+020b3f3db77ca603a27a3423323538db5c9844be17ee428cf7cda80bebdcc715d30eab6c95773541cb8d14f3ad9e6142bf0adcda0e745ee638242508cc0ab05f bash51-016
"
diff --git a/main/bctoolbox/APKBUILD b/main/bctoolbox/APKBUILD
index 7e64e51228..53a23222fe 100644
--- a/main/bctoolbox/APKBUILD
+++ b/main/bctoolbox/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=bctoolbox
-pkgver=5.0.23
+pkgver=5.0.66
pkgrel=0
pkgdesc="Utilities library used by Belledonne Communications softwares like belle-sip, mediastreamer2 and linphone"
url="https://github.com/BelledonneCommunications/bctoolbox"
@@ -10,12 +10,11 @@ license="GPL-2.0-or-later"
options="!check" # bcunit not available
makedepends="cmake mbedtls-dev"
subpackages="$pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/BelledonneCommunications/bctoolbox/archive/$pkgver.tar.gz
- cmake-bcunit-fix.patch"
+source="$pkgname-$pkgver.tar.gz::https://github.com/BelledonneCommunications/bctoolbox/archive/$pkgver.tar.gz"
build() {
cmake \
- -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_MODULE_PATH=/usr/lib/cmake \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -47,6 +46,5 @@ dev() {
}
sha512sums="
-efb5c4390e3ad0a602be8b2f2c53f3d4541075c09d6b5c4d812c22be7e4416c02229135b54ffb6411e931a379fb14ae7e91e50a70b75032e246e8e4457d62870 bctoolbox-5.0.23.tar.gz
-466d2a7aa33952c8086c698030af0addc79373aa31104cbe6133d352682439ae5c30055ea4f162cc9b6b9fc54bf3dea0ddcff78e0042e7ce43833d82b9487116 cmake-bcunit-fix.patch
+4918b778a18e311e9b477574859db92a3d88b2ffb8c85081918688bf3bc104ed16bd5a5f5609d4137b3f3009ce485121fa999703d25b4867175aa1c34eb29d9f bctoolbox-5.0.66.tar.gz
"
diff --git a/main/bctoolbox/cmake-bcunit-fix.patch b/main/bctoolbox/cmake-bcunit-fix.patch
deleted file mode 100644
index af279ebe43..0000000000
--- a/main/bctoolbox/cmake-bcunit-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6828b3f..b41262f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -106,14 +106,9 @@ if(POLARSSL_FOUND)
- endif()
-
- if(ENABLE_TESTS_COMPONENT)
-- find_package(BcUnit CONFIG REQUIRED)
-- cmake_push_check_state(RESET)
-- list(APPEND CMAKE_REQUIRED_INCLUDES ${BCUNIT_INCLUDE_DIRS})
-- list(APPEND CMAKE_REQUIRED_LIBRARIES ${BCUNIT_LIBRARIES})
- check_symbol_exists("CU_get_suite" "BCUnit/BCUnit.h" HAVE_CU_GET_SUITE)
- check_symbol_exists("CU_curses_run_tests" "BCUnit/BCUnit.h" HAVE_CU_CURSES)
- check_symbol_exists("CU_set_trace_handler" "BCUnit/Util.h" HAVE_CU_SET_TRACE_HANDLER)
-- cmake_pop_check_state()
- set(TESTER_REQUIRES_PRIVATE "bcunit")
- endif()
-
diff --git a/main/bearssl/APKBUILD b/main/bearssl/APKBUILD
index 305432c088..d1223377dd 100644
--- a/main/bearssl/APKBUILD
+++ b/main/bearssl/APKBUILD
@@ -2,13 +2,17 @@
# Contributor: Laurent Bercot <ska-devel@skarnet.org>
pkgname=bearssl
pkgver=0.6
-pkgrel=0
+pkgrel=2
pkgdesc="The BearSSL implementation of the SSL/TLS protocol"
url="https://bearssl.org/"
arch="all"
license="MIT"
subpackages="$pkgname-dev"
-source="https://bearssl.org/$pkgname-$pkgver.tar.gz bearssl-brssl-dynamic.patch"
+source="
+ https://bearssl.org/$pkgname-$pkgver.tar.gz
+ bearssl-brssl-dynamic.patch
+ libbearssl.pc
+"
builddir="$srcdir/$pkgname-$pkgver"
build() {
@@ -31,6 +35,7 @@ package() {
cp -f "$builddir/build/libbearssl.so.$pkgver" "$pkgdir/lib/"
ln -sf "libbearssl.so.$pkgver" "$pkgdir/lib/libbearssl.so.${pkgver%%.*}"
ln -sf "libbearssl.so.${pkgver%%.*}" "$pkgdir/lib/libbearssl.so"
+ install -D -m644 "$srcdir"/libbearssl.pc "$pkgdir"/usr/lib/pkgconfig/libbearssl.pc
}
check() {
@@ -39,5 +44,8 @@ check() {
./testcrypto all
}
-sha512sums="f9ed25683cfc6c4abe7f1203a2b82ed101ee4c9e0f9ab60755b6a09c8d1e8e4f64d413624e7bb9c4b0033f909a2e4568a1d916cc6ce4736222900691e1f8359a bearssl-0.6.tar.gz
-f5fe047862eb355a662ccb1b95c2ca4a870ac0f8d3f4cada5396d2f6a6635647db53fbeb038f9a7651b84d6cda32b6415ce0f69a8da92636d3b3b76578114d5c bearssl-brssl-dynamic.patch"
+sha512sums="
+f9ed25683cfc6c4abe7f1203a2b82ed101ee4c9e0f9ab60755b6a09c8d1e8e4f64d413624e7bb9c4b0033f909a2e4568a1d916cc6ce4736222900691e1f8359a bearssl-0.6.tar.gz
+f5fe047862eb355a662ccb1b95c2ca4a870ac0f8d3f4cada5396d2f6a6635647db53fbeb038f9a7651b84d6cda32b6415ce0f69a8da92636d3b3b76578114d5c bearssl-brssl-dynamic.patch
+d9cb508709909522a19142a2d8fc988fcb1f33796ace4e21908070925ec402c73fd0778a170a50d3d89bab1263e40a40401a9e593cb4f2a8e314fc52f9965696 libbearssl.pc
+"
diff --git a/main/bearssl/libbearssl.pc b/main/bearssl/libbearssl.pc
new file mode 100644
index 0000000000..5a2849c55b
--- /dev/null
+++ b/main/bearssl/libbearssl.pc
@@ -0,0 +1,9 @@
+prefix=/usr
+exec_prefix=${prefix}
+includedir=${prefix}/include
+libdir=${prefix}/lib
+Name: libbearssl
+Version: 0.6
+Description: The BearSSL implementation of the SSL/TLS protocol
+Cflags: -I${includedir}
+Libs: -L${libdir} -lbearssl
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index cb9b574c71..e96cdc6865 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -5,12 +5,12 @@
# Contributor: ungleich <alpinelinux@ungleich.ch>
# Maintainer:
pkgname=bind
-pkgver=9.16.20
+pkgver=9.16.24
_ver=${pkgver%_p*}
_p=${pkgver#*_p}
_major=${pkgver%%.*}
[ "$_p" != "$pkgver" ] && _ver="$_ver-P$_p"
-pkgrel=3
+pkgrel=0
pkgdesc="The ISC DNS server"
url="https://www.isc.org/"
arch="all"
@@ -64,10 +64,11 @@ source="
named.conf.recursive
127.zone
localhost.zone
- bind-9.16.20-map-format-fix.patch
"
# secfixes:
+# 9.16.22-r0:
+# - CVE-2021-25219
# 9.16.20-r0:
# - CVE-2021-25218
# 9.16.15-r0:
@@ -281,7 +282,7 @@ _gpgfingerprints="
"
sha512sums="
-bd4ffcc2589ca8f1ac228576ec11e86f317d5a78d7964a0a7ae70b2fa38831d5bd65c2e8c35d8190502de7139f85d8b080b3b8ee968811a8df78e5761781525d bind-9.16.20.tar.xz
+a982bcad8c517dbcb81e768486e1a8b92e495efcf45c4961170c3bc7fac837903605dcd05cfb9b9e1074599b90be1b9c3dbca4162ede0a32fe4c3405ad92816b bind-9.16.24.tar.xz
2b32d1e7f62cd1e01bb4fdd92d15460bc14761b933d5acc463a91f5ecd4773d7477c757c5dd2738e8e433693592cf3f623ffc142241861c91848f01aa84640d6 bind.plugindir.patch
7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch
53db80f7ee4902f42fb1d0bc959242bcb6f20d95256bda99ce2c206af8b4703c7f72bb26d026c633f70451b84a37c3946b210951e34dd5d6620b181cd0183de4 named.initd
@@ -290,5 +291,4 @@ d2f61d02d7829af51faf14fbe2bafe8bc90087e6b6697c6275a269ebbddcaa14a234fff5c41da793
3aba9763cfaf0880a89fd01202f41406b465547296ce91373eb999ea7719040bc1ac4e47b0de025a8060f693d3d88774a20d09a43fa7ac6aa43989b58b5ee8fe named.conf.recursive
eed9886717539399518e011ae5eae6335aed4fae019e1def088c5be26bdc896c99c07adf84ee61babafa31d31ff3b028263d1c88d2eee17ecf4c95a9d77d524c 127.zone
340e86472a2c2746fe585c0aa5f079d3a9b46e828c1f53d48026533a169b7f77ded7d0a13d291d6962607bb9481456e6fa69df1834603e7555332615fb998f0b localhost.zone
-d9224712ee2c6f6d0ff483ed253497548935fe35f45e5bdf26c9bd25c6234adde00727df7eb49fbfbfb34aad9d9fa0f112e900804794ad90a5cd8a64e9db61c6 bind-9.16.20-map-format-fix.patch
"
diff --git a/main/bind/bind-9.16.20-map-format-fix.patch b/main/bind/bind-9.16.20-map-format-fix.patch
deleted file mode 100644
index f6e3c9b378..0000000000
--- a/main/bind/bind-9.16.20-map-format-fix.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/lib/dns/mapapi
-+++ b/lib/dns/mapapi
-@@ -13,4 +13,4 @@
- # Whenever releasing a new major release of BIND9, set this value
- # back to 1.0 when releasing the first alpha. Map files are *never*
- # compatible across major releases.
--MAPAPI=2.0
-+MAPAPI=3.0
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index fa65f83000..16efeb3708 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=binutils
-pkgver=2.37
-pkgrel=3
+pkgver=2.37 # XXX: remove man page workaround in prepare() on upgrade
+pkgrel=4
pkgdesc="Tools necessary to build programs"
url="https://www.gnu.org/software/binutils/"
makedepends_build="bison flex texinfo"
@@ -43,6 +43,14 @@ fi
# 2.28-r1:
# - CVE-2017-7614
+prepare() {
+ default_prepare
+
+ # Remove existing empty man pages to force them to be regenerated.
+ # Workaround for https://gitlab.alpinelinux.org/alpine/aports/-/issues/13034
+ find "$builddir" -name '[a-z]*\.[0-9]*' -empty -delete
+}
+
build() {
local _sysroot=/
local _cross_configure="--enable-install-libiberty --enable-shared"
diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD
index 711729bc36..d9359d770a 100644
--- a/main/bluez/APKBUILD
+++ b/main/bluez/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bluez
-pkgver=5.62
+pkgver=5.63
pkgrel=0
pkgdesc="Tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
@@ -187,7 +187,7 @@ openrc() {
}
sha512sums="
-8fb0b81e1d929d3eee3d70f457ce75dbcff4c2a8a728247fc950bbe11e84d83582345bfd433d2e2df7b5588eb0e42f286658a83c7332be84819d9df49a5707e8 bluez-5.62.tar.xz
+1b8ce7b1bd9611873c27a762a60df580edeefe5424e8733a2067b9afb1a47915f9319849bc1eeee148f5b1f33977b7975e05867e8dbdf73d33cd68e6b99ca75b bluez-5.63.tar.xz
e1d64fac673cceb657684b1bc5c36ff6d05f7cc5832d940863129adacd5b8ade1315b14df039a61f061950ac99e155266530efe2d2d35ea3c145b0469698a726 bluetooth.initd
8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd
a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd
@@ -202,5 +202,4 @@ ac635f9bca0e983835940572eb1b96ad70cf60fb84d5b0fde38c76ea6d1b13ef7d9adf81468b9fed
118d55183860f395fc4bdc93efffb13902ebf7388cad722b9061cd2860d404333e500af521741c3d92c0f8a161f6810348fbeb6682e49c372383f417aed8c76a fix-endianness.patch
641e425333d269833eed624edec0e29cba04bb0ff6570f6afda178a164fc2bb77456fa88957fe49f36000d3601ac00bb7ba089400977c1577e9c226e74baa3d6 musl.patch
9c57bb1abf1b4927441a2a25c3c2599b0da82850e6b945d09e824e25be7c7efa99e54999cf5b799a1093303202badf08833cc4ccb36203901dfa516031ea8eb0 test-mesh-crypto.patch
-2e92639512c11e69d3c47e222a012b4f58fa7727d18b3639130e8fe91654773b1205ddbe650efe49a26ec41a64d39ddba2806503272e09252c51d194e3ced33d fix-musl.patch
-"
+2e92639512c11e69d3c47e222a012b4f58fa7727d18b3639130e8fe91654773b1205ddbe650efe49a26ec41a64d39ddba2806503272e09252c51d194e3ced33d fix-musl.patch"
diff --git a/main/boost1.76/0001-revert-cease-dependence-on-range.patch b/main/boost1.76/0001-revert-cease-dependence-on-range.patch
deleted file mode 100644
index a6002074ab..0000000000
--- a/main/boost1.76/0001-revert-cease-dependence-on-range.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001
-From: Oliver Kowalke <oliver.kowalke@gmail.com>
-Date: Sun, 1 Dec 2019 20:40:28 +0100
-Subject: [PATCH] Revert "Cease dependence on Range"
-
-This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db.
-
-see #44 (One test fails to compile after boostorg/coroutine submodule updated)
----
- boost/coroutine/asymmetric_coroutine.hpp | 12 +++---------
- 1 file changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp
-index ea96981..640896f 100644
---- a/boost/coroutine/asymmetric_coroutine.hpp
-+++ b/boost/coroutine/asymmetric_coroutine.hpp
-@@ -14,6 +14,7 @@
- #include <boost/assert.hpp>
- #include <boost/config.hpp>
- #include <boost/move/move.hpp>
-+#include <boost/range.hpp>
- #include <boost/throw_exception.hpp>
- #include <boost/utility/explicit_operator_bool.hpp>
-
-@@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c)
-
- }
-
--// forward declaration of Boost.Range traits to break dependency on it
--template<typename C, typename Enabler>
--struct range_mutable_iterator;
--
--template<typename C, typename Enabler>
--struct range_const_iterator;
--
- template< typename Arg >
--struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void >
-+struct range_mutable_iterator< coroutines::push_coroutine< Arg > >
- { typedef typename coroutines::push_coroutine< Arg >::iterator type; };
-
- template< typename R >
--struct range_mutable_iterator< coroutines::pull_coroutine< R >, void >
-+struct range_mutable_iterator< coroutines::pull_coroutine< R > >
- { typedef typename coroutines::pull_coroutine< R >::iterator type; };
-
- }
---
-2.24.1
-
diff --git a/main/boost1.76/APKBUILD b/main/boost1.76/APKBUILD
deleted file mode 100644
index 63cae391b1..0000000000
--- a/main/boost1.76/APKBUILD
+++ /dev/null
@@ -1,196 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=boost1.76
-pkgver=1.76.0
-_pkgver="${pkgver//./_}"
-pkgrel=2
-pkgdesc="Free peer-reviewed portable C++ source libraries"
-url="https://www.boost.org/"
-arch="all"
-license="custom"
-depends="$pkgname-libs"
-depends_dev="$pkgname linux-headers bzip2-dev icu-dev xz-dev zlib-dev"
-makedepends="$depends_dev python3-dev>=3.8 flex bison"
-subpackages="
- $pkgname-static
- $pkgname-dev
- $pkgname-doc
- boost-dev:_dev
- "
-source="https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/boost_$_pkgver.tar.bz2
- boost-1.57.0-python-abi_letters.patch
- boost-1.57.0-python-libpython_dep.patch
- 0001-revert-cease-dependence-on-range.patch
- build-undefine-statx-syscall.patch
- "
-builddir="$srcdir/boost_$_pkgver"
-
-_enginedir="tools/build/src/engine"
-_bjam="$builddir"/$_enginedir/b2
-
-_libs="
- atomic
- chrono
- container
- context
- contract
- coroutine
- date_time
- fiber
- filesystem
- graph
- iostreams
- locale
- log_setup
- log
- math
- prg_exec_monitor
- program_options
- python3
- random
- regex
- serialization
- stacktrace_basic
- stacktrace_noop
- system
- thread
- timer
- type_erasure
- unit_test_framework
- wave
- wserialization
- json
- nowide
- "
-for _lib in $_libs; do
- subpackages="$subpackages $pkgname-${_lib}:_boostlib"
-done; unset -v _lib
-subpackages="$subpackages $pkgname-libs"
-
-_set_options() {
- [ -n "$PY3_VERSION" ] || PY3_VERSION="$(_pyversion python3)"
-
- local _options_python="${PY2_VERSION:+$PY2_VERSION,}$PY3_VERSION"
- [ -z "$_options_python" ] || _options_python="python=$_options_python"
-
- _options="
- --user-config=\"$builddir/user-config.jam\"
- --prefix=\"$pkgdir/usr\"
- release
- $_options_python
- toolset=gcc
- debug-symbols=off
- threading=multi
- runtime-link=shared
- link=shared,static
- cflags=-fno-strict-aliasing
- --layout=system
- -q
- -j${JOBS:-2}
- $_options_carch
- "
-}
-
-prepare() {
- default_prepare
-
- _set_options
- local abiflags="$(python3-config --abiflags)"
-
- # create user-config.jam
- cat > user-config.jam <<-__EOF__
-
- using gcc : : $CC : <cxxflags>"$CXXFLAGS" <linkflags>"$LDFLAGS" ;
- using python : ${PY3_VERSION:+$PY3_VERSION }: /usr/bin/python3 : ${PY3_VERSION:+/usr/include/python${PY3_VERSION}$abiflags }: : : : ${abiflags:+$abiflags };
-
- __EOF__
-}
-
-build() {
- export BOOST_ROOT="$builddir"
-
- msg "Building bjam"
- cd "$builddir"/$_enginedir
- CC= ./build.sh gcc
-
- msg "Building bcp"
- cd "$builddir"/tools/bcp
- "$_bjam" -j${JOBS:-2}
-
- msg "Building boost"
- cd "$builddir"
- _set_options
- "$_bjam" $_options
-}
-
-check() {
- cd "$builddir"/tools/build/test
-
- PATH="${_bjam%/*}:$PATH" python3 test_all.py --default-bjam
-}
-
-package() {
- export BOOST_ROOT="$builddir"
- _set_options
-
- install -Dm755 "$_bjam" \
- "$pkgdir"/usr/bin/b2
- ln -s b2 "$pkgdir"/usr/bin/bjam # old name for b2 binary
-
- install -Dm755 dist/bin/bcp "$pkgdir"/usr/bin/bcp
-
- install -Dm644 LICENSE_1_0.txt \
- "$pkgdir"/usr/share/licenses/$pkgname/LICENSE_1_0.txt
-
- "$pkgdir"/usr/bin/bjam $_options \
- --includedir="$pkgdir"/usr/include \
- --libdir="$pkgdir"/usr/lib \
- install
-}
-
-static() {
- pkgdesc="Boost static libraries"
- depends="$depends_static"
-
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/lib*.a "$subpkgdir"/usr/lib/
-}
-
-_boostlib() {
- local name="${subpkgname#$pkgname-}"
- pkgdesc="Boost $name shared library"
- depends="$depends__boostlib"
-
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libboost_$name*.so.[0-9]* "$subpkgdir"/usr/lib/
-}
-
-libs() {
- default_libs
-
- pkgdesc="Boost shared libraries"
- depends="$depends_libs"
- local _pkg; for _pkg in $origsubpackages; do
- case "$_pkg" in
- *:_boostlib) depends="$depends ${_pkg%%:*}" ;;
- esac
- done
-
- mkdir -p "$subpkgdir"
- rmdir "$pkgdir"/usr/lib >/dev/null 2>&1 || :
-}
-
-_dev() {
- # This makes boost-dev be a metapackage that depends on boostX.Y-dev
- mkdir -p "$subpkgdir"
- depends="$pkgname-dev=$pkgver-r$pkgrel"
-}
-
-_pyversion() {
- "$1" -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))'
-}
-
-sha512sums="5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429 boost_1_76_0.tar.bz2
-d96d4d37394a31764ed817d0bc4a99cffa68a75ff1ecfd4417b9e1e5ae2c31a96ed24f948c6f2758ffdac01328d2402c4cf0d33a37107e4f5f721e636daebd66 boost-1.57.0-python-abi_letters.patch
-132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02 boost-1.57.0-python-libpython_dep.patch
-9b53d2fe2dddd592e43db03c26fadd6c07d4c45a980ae4c775b7a914346a3914f6e0c3ef42dad5e2ea4568afb86c9967e09444ff609cfba1e1d39f4980b22ad6 0001-revert-cease-dependence-on-range.patch
-debb898a9d2295a4480a32bec69a77c6e8d5dc094b0be39df1f1afc3a0f610fe916c59be1304bc904ad74440f93a224e4b138c60a5f0253143c9eb5db973cd2b build-undefine-statx-syscall.patch"
diff --git a/main/boost1.76/boost-1.57.0-python-abi_letters.patch b/main/boost1.76/boost-1.57.0-python-abi_letters.patch
deleted file mode 100644
index 7df3ee7047..0000000000
--- a/main/boost1.76/boost-1.57.0-python-abi_letters.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- boost_1_57_0/tools/build/src/tools/python.jam 2013-05-21 06:14:18.000000000 +0200
-+++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413877 +0200
-@@ -94,7 +94,7 @@ feature.feature pythonpath : : free opti
- # using python : 2.3 : /usr/local/bin/python ;
- #
- rule init ( version ? : cmd-or-prefix ? : includes * : libraries ?
-- : condition * : extension-suffix ? )
-+ : condition * : extension-suffix ? : abi-letters ? )
- {
- project.push-current $(.project) ;
-
-@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ?
- }
- }
-
-- configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) ;
-+ configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) : $(abi-letters) ;
-
- project.pop-current ;
- }
-@@ -653,7 +653,7 @@ local rule system-library-dependencies (
-
- # Declare a target to represent Python's library.
- #
--local rule declare-libpython-target ( version ? : requirements * )
-+local rule declare-libpython-target ( version ? : requirements * : abi-letters ? )
- {
- # Compute the representation of Python version in the name of Python's
- # library file.
-@@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve
- }
-
- # Declare it.
-- lib python.lib : : <name>python$(lib-version) $(requirements) ;
-+ lib python.lib : : <name>python$(lib-version)$(abi-letters) $(requirements) ;
- }
-
-
- # Implementation of init.
- local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
-- condition * : extension-suffix ? )
-+ condition * : extension-suffix ? : abi-letters ? )
- {
- local prefix ;
- local exec-prefix ;
-@@ -699,6 +699,7 @@ local rule configure ( version ? : cmd-o
- extension-suffix ?= _d ;
- }
- extension-suffix ?= "" ;
-+ abi-letters ?= "" ;
-
- # Normalize and dissect any version number.
- local major-minor ;
-@@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o
- }
- else
- {
-- declare-libpython-target $(version) : $(target-requirements) ;
-+ declare-libpython-target $(version) : $(target-requirements) : $(abi-letters) ;
-
- # This is an evil hack. On, Windows, when Python is embedded, nothing
- # seems to set up sys.path to include Python's standard library
diff --git a/main/boost1.76/boost-1.57.0-python-libpython_dep.patch b/main/boost1.76/boost-1.57.0-python-libpython_dep.patch
deleted file mode 100644
index 57bfc26774..0000000000
--- a/main/boost1.76/boost-1.57.0-python-libpython_dep.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: boost_1_57_0/tools/build/src/tools/python.jam
-===================================================================
---- boost_1_57_0/tools/build/src/tools/python.jam (revision 50406)
-+++ boost_1_57_0/tools/build/src/tools/python.jam (working copy)
-@@ -994,7 +994,7 @@
- else
- {
- alias python_for_extensions
-- :
-+ : python
- : $(target-requirements)
- :
- : $(usage-requirements)
diff --git a/main/boost1.76/build-undefine-statx-syscall.patch b/main/boost1.76/build-undefine-statx-syscall.patch
deleted file mode 100644
index 4b984f0b34..0000000000
--- a/main/boost1.76/build-undefine-statx-syscall.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: The way the statx function is defined is broken, and does not fall
-back in case the syscall is not present, which is the case for mips64, which
-runs Linux 4.9.
-Upstream: rejected
-URL: https://github.com/boostorg/filesystem/issues/173
-diff --git a/libs/filesystem/build/Jamfile.v2 b/libs/filesystem/build/Jamfile.v2
-index 132641a32..76547eb92 100644
---- a/libs/filesystem/build/Jamfile.v2
-+++ b/libs/filesystem/build/Jamfile.v2
-@@ -54,7 +54,6 @@ project boost/filesystem
- [ check-target-builds ../config//has_stat_st_birthtimensec "has stat::st_birthtimensec" : <define>BOOST_FILESYSTEM_HAS_STAT_ST_BIRTHTIMENSEC ]
- [ check-target-builds ../config//has_stat_st_birthtimespec "has stat::st_birthtimespec" : <define>BOOST_FILESYSTEM_HAS_STAT_ST_BIRTHTIMESPEC ]
- [ check-target-builds ../config//has_statx "has statx" : <define>BOOST_FILESYSTEM_HAS_STATX ]
-- [ check-target-builds ../config//has_statx_syscall "has statx syscall" : <define>BOOST_FILESYSTEM_HAS_STATX_SYSCALL ]
- <conditional>@select-windows-crypto-api
- : source-location ../src
- : usage-requirements # pass these requirement to dependents (i.e. users)
diff --git a/main/boost1.77/APKBUILD b/main/boost1.77/APKBUILD
index 3f11dede9e..1032de5933 100644
--- a/main/boost1.77/APKBUILD
+++ b/main/boost1.77/APKBUILD
@@ -2,7 +2,7 @@
pkgname=boost1.77
pkgver=1.77.0
_pkgver="${pkgver//./_}"
-pkgrel=1
+pkgrel=3
pkgdesc="Free peer-reviewed portable C++ source libraries"
url="https://www.boost.org/"
arch="all"
@@ -20,6 +20,7 @@ source="https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/boost_
boost-1.57.0-python-abi_letters.patch
boost-1.57.0-python-libpython_dep.patch
0001-revert-cease-dependence-on-range.patch
+ python-3.10.patch
"
builddir="$srcdir/boost_$_pkgver"
@@ -222,4 +223,5 @@ sha512sums="
d96d4d37394a31764ed817d0bc4a99cffa68a75ff1ecfd4417b9e1e5ae2c31a96ed24f948c6f2758ffdac01328d2402c4cf0d33a37107e4f5f721e636daebd66 boost-1.57.0-python-abi_letters.patch
132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02 boost-1.57.0-python-libpython_dep.patch
9b53d2fe2dddd592e43db03c26fadd6c07d4c45a980ae4c775b7a914346a3914f6e0c3ef42dad5e2ea4568afb86c9967e09444ff609cfba1e1d39f4980b22ad6 0001-revert-cease-dependence-on-range.patch
+1d84ee5fecd7a8c2491b997fa1b9031195642c8d4946bb391f5a52c84f1fefd2cf4bb64a90601cbbd4fa1795d7a86f8cf78f4124fdbb1619b07ed31aa20e00bf python-3.10.patch
"
diff --git a/main/boost1.77/python-3.10.patch b/main/boost1.77/python-3.10.patch
new file mode 100644
index 0000000000..2e1d5e3431
--- /dev/null
+++ b/main/boost1.77/python-3.10.patch
@@ -0,0 +1,49 @@
+From e193f080c7d209516ac9b712fa0c50bb08026fa2 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@lge.com>
+Date: Tue, 19 Oct 2021 12:24:31 +0000
+Subject: [PATCH] BoostConfig.cmake: allow searching for python310
+
+* accept double digits in Python3_VERSION_MINOR
+
+* if someone is using e.g.:
+ find_package(Python3 REQUIRED)
+ find_package(Boost REQUIRED python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
+
+ with python-3.10 then it currently fails with:
+
+ -- Found PythonLibs: /usr/lib/libpython3.10.so (found version "3.10.0")
+ -- Found Python3: -native/usr/bin/python3-native/python3 (found version "3.10.0") found components: Interpreter
+ CMake Error at /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:141 (find_package):
+ Could not find a package configuration file provided by "boost_python310"
+ (requested version 1.77.0) with any of the following names:
+
+ boost_python310Config.cmake
+ boost_python310-config.cmake
+
+ Add the installation prefix of "boost_python310" to CMAKE_PREFIX_PATH or
+ set "boost_python310_DIR" to a directory containing one of the above files.
+ If "boost_python310" provides a separate development package or SDK, be
+ sure it has been installed.
+ Call Stack (most recent call first):
+ /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:258 (boost_find_component)
+ /usr/share/cmake-3.21/Modules/FindBoost.cmake:594 (find_package)
+ CMakeLists.txt:18 (find_package)
+
+Signed-off-by: Martin Jansa <martin.jansa@lge.com>
+---
+ BoostConfig.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/BoostConfig.cmake b/BoostConfig.cmake
+index fd17821..5dffa58 100644
+--- a/tools/boost_install/BoostConfig.cmake
++++ b/tools/boost_install/BoostConfig.cmake
+@@ -113,7 +113,7 @@ macro(boost_find_component comp required quiet)
+ set(_BOOST_REQUIRED REQUIRED)
+ endif()
+
+- if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9])$")
++ if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9][0-9]?)$")
+
+ # handle pythonXY and numpyXY versioned components for compatibility
+
diff --git a/main/brotli/APKBUILD b/main/brotli/APKBUILD
index 6805d652cd..d371e0f7bc 100644
--- a/main/brotli/APKBUILD
+++ b/main/brotli/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: prspkt <prspkt@protonmail.com>
pkgname=brotli
pkgver=1.0.9
-pkgrel=5
+pkgrel=6
pkgdesc="Generic lossless compressor"
url="https://github.com/google/brotli"
arch="all"
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index 4fa734e51f..298d4129da 100644
--- a/main/btrfs-progs/APKBUILD
+++ b/main/btrfs-progs/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=btrfs-progs
-pkgver=5.14.2
+pkgver=5.16
pkgrel=0
pkgdesc="BTRFS filesystem utilities"
url="https://btrfs.wiki.kernel.org"
@@ -71,5 +71,5 @@ extra() {
}
sha512sums="
-dc1a73e49dd94ccd8128c197d99f112977b16350d22bc0ca32247211314a3fec66de73827305bf24ef8e0571fc890f00378d0ec3a82988f0ee54f5db10f6578c btrfs-progs-v5.14.2.tar.xz
+3ba557134b19f1abb6c63bf3e2092852f92e988677c4bcf9421c824824b87565ae5cc0e5bca0370be81766a8c8fbda21dfb443dcd159f705f31e70b6bf19aa63 btrfs-progs-v5.16.tar.xz
"
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index f86833cabc..84bea82d4c 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox-initscripts
-pkgver=3.3
-pkgrel=1
+pkgver=4.0
+pkgrel=5
pkgdesc="Init scripts for busybox daemons"
url="https://git.alpinelinux.org/aports/tree/main/busybox-initscripts"
arch="noarch"
@@ -16,8 +16,7 @@ replaces="alpine-baselayout openntpd"
source="acpid.initd crond.initd dnsd.initd httpd.initd inetd.initd klogd.initd
mdev.initd ntpd.initd rdate.initd syslog.initd udhcpd.initd loadkmap.initd
watchdog.initd crond.confd klogd.confd ntpd.confd rdate.confd syslog.confd
- watchdog.confd loadkmap.confd mdev.conf dvbdev ide_links usbdev usbdisk_link
- xvd_links
+ watchdog.confd loadkmap.confd mdev.conf dvbdev usbdev persistent-storage
"
package() {
@@ -33,7 +32,7 @@ package() {
install -m644 "$srcdir"/$i "$pkgdir"/etc/conf.d/${i%.*} || return 1
done
install -m644 mdev.conf "$pkgdir"/etc
- install -m755 dvbdev ide_links usbdev usbdisk_link xvd_links "$pkgdir"/lib/mdev/
+ install -m755 dvbdev usbdev persistent-storage "$pkgdir"/lib/mdev/
# poweroff script for acpid
cat >"$pkgdir"/etc/acpi/PWRF/00000080 <<EOF
@@ -64,10 +63,8 @@ b0ba67585f39d83320ed6de183d7463a0e163807b9f3dc6f0baa212236056f22aeb2c5399dfdcd54
bf8173ee33a5d2b61cbdbc1b070e599a17a21e5433a0d8aa9beef71e4ac831304076af8e7e58dc594cdee61562329793afdc57af91e5496bf5fffb9b734a3d9c syslog.confd
359af0a4a1841dd6557eaf3e71d39f0d7a2687bad6a8fc6ef436eccf72a40f85c6400a3b7880c7f64d8e460b6af8a0ff3dd5ffc3a4b1aa8eb0d8f7eaf99ee3e4 watchdog.confd
acbba3385fb2c416362eb9176f24146b617a2e394ee0e00b9eff89350f82468a5ab8396f4f52b0aaf03d341ac6150c73182e808fa3f29a2dc71c69271cdfb811 loadkmap.confd
-085a5a722183a0d5d99c3027efe3a213a009fb8adf4d0aaba85b6d54f180302505ca35a59369ed8601546ee70cd637c271558ad1a9bb731738b3a33ea03ac906 mdev.conf
+634fa067629febcdd8ba9516fbaafddd5be2d38ac37bff9eccfacce0fcf3b259426c12ff967b179bd93b2962401a4a2f15709d32da0623bd078688b8611817cd mdev.conf
ebd82f935da2ca89097234dd8a8f47e179a423652c151123a1f3343f3e1e7bfaba2b8800380e988d4e8f4294545d3a9ab6708ae2e77c5b108b5f091bbce8f94a dvbdev
-0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec ide_links
b2dcf0ded9264334d79fbbb05dd12d649dc3119a060db5893f0e8aeca2141323961c3ba4c822a0ffb00dba848742d5cb374dc77e776b57cecde352a3e8e30f8a usbdev
-392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 usbdisk_link
-5db6fa8bbb2d891212187c598cd8703277b3fcb95b5dba6628f7128eb48cc7c1bf4c53885e9d870999c8c95d2fe9cd27609b523596dc553c31b6f72a452a0118 xvd_links
+0f54666072a8ee32965cc1b5205a6d35bc2ba6655f298c37ba9ccd72949fa7c41b1e540ec91f41b11f4b261ace614cdcc42dccf390bf0a22698d0ba499feae39 persistent-storage
"
diff --git a/main/busybox-initscripts/ide_links b/main/busybox-initscripts/ide_links
deleted file mode 100644
index be0c95aa9c..0000000000
--- a/main/busybox-initscripts/ide_links
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-[ -f /proc/ide/$MDEV/media ] || exit
-
-media=`cat /proc/ide/$MDEV/media`
-for i in $media $media[0-9]* ; do
- if [ "`readlink $i 2>/dev/null`" = $MDEV ] ; then
- LINK=$i
- break
- fi
-done
-
-# link exist, remove if necessary and exit
-if [ "$LINK" ] ; then
- [ "$ACTION" = remove ] && rm $LINK
- exit
-fi
-
-# create a link
-num=`ls $media[0-9]* 2>/dev/null | wc -l`
-ln -sf $MDEV "$media`echo $num`"
-[ -e "$media" ] || ln -sf $MDEV "$media"
-
diff --git a/main/busybox-initscripts/mdev.conf b/main/busybox-initscripts/mdev.conf
index e59c3ec26f..903786fd00 100644
--- a/main/busybox-initscripts/mdev.conf
+++ b/main/busybox-initscripts/mdev.conf
@@ -36,8 +36,17 @@ kvm root:kvm 660
# ram.*
ram([0-9]*) root:disk 0660 >rd/%1
loop([0-9]+) root:disk 0660 >loop/%1
-sd[a-z].* root:disk 0660 */lib/mdev/usbdisk_link
-hd[a-z][0-9]* root:disk 0660 */lib/mdev/ide_links
+
+# persistent storage
+dasd.* root:disk 0660 */lib/mdev/persistent-storage
+mmcblk.* root:disk 0660 */lib/mdev/persistent-storage
+nbd.* root:disk 0660 */lib/mdev/persistent-storage
+nvme.* root:disk 0660 */lib/mdev/persistent-storage
+sd[a-z].* root:disk 0660 */lib/mdev/persistent-storage
+sr[0-9]+ root:cdrom 0660 */lib/mdev/persistent-storage
+vd[a-z].* root:disk 0660 */lib/mdev/persistent-storage
+xvd[a-z].* root:disk 0660 */lib/mdev/persistent-storage
+
md[0-9] root:disk 0660
tty root:tty 0666
@@ -51,6 +60,7 @@ vcsa[0-9]* root:tty 0660
# rpi bluetooth
#ttyAMA0 root:tty 660 @btattach -B /dev/$MDEV -P bcm -S 115200 -N &
+ttyACM[0-9] root:dialout 0660 @ln -sf $MDEV modem
ttyUSB[0-9] root:dialout 0660 @ln -sf $MDEV modem
ttyLTM[0-9] root:dialout 0660 @ln -sf $MDEV modem
ttySHSF[0-9] root:dialout 0660 @ln -sf $MDEV modem
@@ -78,7 +88,7 @@ sequencer.* root:audio 0660 >sound/
SUBSYSTEM=sound;.* root:audio 0660
# virtio-ports
-SUBSYSTEM=virtio-ports;vport.* root:root 0600 @mkdir -p virtio-ports; ln -s ../$MDEV virtio-ports/$(cat /sys/class/virtio-ports/$MDEV/name)
+SUBSYSTEM=virtio-ports;vport.* root:root 0600 @mkdir -p virtio-ports; ln -sf ../$MDEV virtio-ports/$(cat /sys/class/virtio-ports/$MDEV/name)
# misc stuff
agpgart root:root 0660 >misc/
@@ -120,10 +130,5 @@ ida/(.*) root:disk 0660 =ida/%1
rd!(.*) root:disk 0660 =rd/%1
rd/(.*) root:disk 0660 =rd/%1
-sr0 root:cdrom 0660 @ln -sf $MDEV cdrom
-
-# xen stuff
-xvd[a-z] root:root 0660 */lib/mdev/xvd_links
-
# fallback for any!device -> any/device
(.*)!(.*) root:root 0660 =%1/%2
diff --git a/main/busybox-initscripts/persistent-storage b/main/busybox-initscripts/persistent-storage
new file mode 100644
index 0000000000..ea68948294
--- /dev/null
+++ b/main/busybox-initscripts/persistent-storage
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+symlink_action() {
+ case "$ACTION" in
+ add) ln -sf "$1" "$2";;
+ remove) rm -f "$2";;
+ esac
+}
+
+# cdrom symlink
+case "$MDEV" in
+ sr*|xvd*)
+ caps="$(cat /sys/block/$MDEV/capability 2>/dev/null)"
+ if [ $(( 0x${caps:-0} & 8 )) -gt 0 ]; then
+ symlink_action $MDEV cdrom
+ fi
+esac
+
+# by-id symlinks
+mkdir -p disk/by-id
+
+partition=$(cat /sys/class/block/$MDEV/partition 2>/dev/null)
+case "$partition" in
+ [0-9]*) partsuffix="-part$partition";;
+esac
+
+wwid=$(cat /sys/class/block/$MDEV/wwid 2>/dev/null)
+: ${wwid:=$(cat /sys/class/block/$MDEV/device/wwid 2>/dev/null)}
+
+if [ -n "$wwid" ]; then
+ case "$MDEV" in
+ nvme*) symlink_action ../../$MDEV disk/by-id/nvme-${wwid}${partsuffix};;
+ esac
+ case "$wwid" in
+ naa.*) symlink_action ../../$MDEV disk/by-id/wwn-0x${wwid#naa.};;
+ esac
+fi
+
+serial=$(sed -E -e 's/^\s+//' -e 's/\s+$//' -e 's/ /_/g' \
+ /sys/class/block/$MDEV/device/serial 2>/dev/null)
+
+model=$(sed -E -e 's/^\s+//' -e 's/\s+$//' -e 's/ /_/g' \
+ /sys/class/block/$MDEV/device/model 2>/dev/null)
+
+if [ -n "$serial" ] && [ -n "$model" ]; then
+ case "$MDEV" in
+ nvme*) symlink_action ../../$MDEV disk/by-id/nvme-${model}_${serial}${partsuffix};;
+ esac
+fi
+
+# virtio-blk
+if [ -n "$serial" ]; then
+ case "$MDEV" in
+ vd*) symlink_action ../../$MDEV disk/by-id/virtio-${serial}${partsuffix};;
+ esac
+fi
+
+# by-uuid, by-partuuid
+eval $(blkid /dev/$MDEV | cut -d: -f2-)
+if [ -n "$UUID" ]; then
+ mkdir -p disk/by-uuid
+ symlink_action ../../$MDEV disk/by-uuid/$UUID
+fi
+if [ -n "$PARTUUID" ]; then
+ mkdir -p disk/by-partuuid
+ symlink_action ../../$MDEV disk/by-partuuid/$PARTUUID
+fi
+
diff --git a/main/busybox-initscripts/usbdisk_link b/main/busybox-initscripts/usbdisk_link
deleted file mode 100644
index 750242bb5c..0000000000
--- a/main/busybox-initscripts/usbdisk_link
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# NOTE: since mdev -s only provide $MDEV, don't depend on any hotplug vars.
-
-current=$(readlink usbdisk)
-
-if [ "$current" = "$MDEV" ] && [ "$ACTION" = "remove" ]; then
- rm -f usbdisk usba1
-fi
-[ -n "$current" ] && exit
-
-if [ -e /sys/block/$MDEV ]; then
- SYSDEV=$(readlink -f /sys/block/$MDEV/device)
- # if /sys device path contains '/usb[0-9]' then we assume its usb
- # also, if its an usb without partitions we require FAT
- if [ "${SYSDEV##*/usb[0-9]}" != "$SYSDEV" ]; then
- # do not create link if there is not FAT
- dd if=/dev/$MDEV bs=512 count=1 2>/dev/null | strings | grep FAT >/dev/null || exit 0
-
- ln -sf $MDEV usbdisk
- # keep this for compat. people have it in fstab
- ln -sf $MDEV usba1
- fi
-
-elif [ -e /sys/block/*/$MDEV ] ; then
- PARENT=$(dirname /sys/block/*/$MDEV)
- SYSDEV=$(readlink -f $PARENT/device)
- if [ "${SYSDEV##*/usb[0-9]}" != "$SYSDEV" ]; then
- ln -sf $MDEV usbdisk
- # keep this for compat. people have it in fstab
- ln -sf $MDEV usba1
- fi
-fi
-
diff --git a/main/busybox-initscripts/xvd_links b/main/busybox-initscripts/xvd_links
deleted file mode 100644
index 8874d86916..0000000000
--- a/main/busybox-initscripts/xvd_links
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-[ -f /sys/block/$MDEV/capability ] || exit
-
-caps="0x`cat /sys/block/$MDEV/capability`"
-
-if [ $(($caps & 8)) -gt 0 ]; then
- case $ACTION in
- add|"") ln -sf $MDEV cdrom ;;
- remove) [ "`readlink cdrom 2>/dev/null`" = $MDEV ] && rm -f cdrom ;;
- esac
-fi
diff --git a/main/busybox/0001-ash-add-built-in-BB_ASH_VERSION-variable.patch b/main/busybox/0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
index f7f901f6ad..d8f5ea008d 100644
--- a/main/busybox/0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
+++ b/main/busybox/0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
@@ -1,4 +1,4 @@
-From cf95fcc20717e4c0906109b13565fdd06d874ee0 Mon Sep 17 00:00:00 2001
+From df5fffa062ebc46bd13d65c84a4abca6ae1c614d Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Wed, 10 Mar 2021 23:38:57 -0700
Subject: [PATCH] ash: add built-in $BB_ASH_VERSION variable
@@ -19,11 +19,11 @@ varinit_data 360 384 +24
Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
---
- shell/ash.c | 26 +++++++++++++++++++-------
- 1 file changed, 19 insertions(+), 7 deletions(-)
+ shell/ash.c | 28 ++++++++++++++++++++--------
+ 1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/shell/ash.c b/shell/ash.c
-index 6a16833b1..b8525dd57 100644
+index 827643808..5f8f41ee9 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -153,6 +153,14 @@
@@ -41,7 +41,7 @@ index 6a16833b1..b8525dd57 100644
//config:endif # ash options
//applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP))
-@@ -2109,6 +2117,9 @@ static const struct {
+@@ -2138,6 +2146,9 @@ static const struct {
{ VSTRFIXED|VTEXTFIXED , "PS1=$ " , NULL },
{ VSTRFIXED|VTEXTFIXED , "PS2=> " , NULL },
{ VSTRFIXED|VTEXTFIXED , "PS4=+ " , NULL },
@@ -51,7 +51,7 @@ index 6a16833b1..b8525dd57 100644
#if ENABLE_ASH_GETOPTS
{ VSTRFIXED|VTEXTFIXED , defoptindvar, getoptsreset },
#endif
-@@ -2159,18 +2170,19 @@ extern struct globals_var *BB_GLOBAL_CONST ash_ptr_to_globals_var;
+@@ -2197,19 +2208,20 @@ extern struct globals_var *BB_GLOBAL_CONST ash_ptr_to_globals_var;
#define vps1 varinit[VAR_OFFSET1 + 2]
#define vps2 varinit[VAR_OFFSET1 + 3]
#define vps4 varinit[VAR_OFFSET1 + 4]
@@ -62,22 +62,21 @@ index 6a16833b1..b8525dd57 100644
#endif
-#define VAR_OFFSET2 (VAR_OFFSET1 + ENABLE_ASH_GETOPTS)
-#define vlineno varinit[VAR_OFFSET2 + 5]
+-#define vfuncname varinit[VAR_OFFSET2 + 6]
+#define VAR_OFFSET3 (VAR_OFFSET2 + ENABLE_ASH_GETOPTS)
+#define vlineno varinit[VAR_OFFSET3 + 5]
++#define vfuncname varinit[VAR_OFFSET3 + 6]
#if ENABLE_ASH_RANDOM_SUPPORT
--# define vrandom varinit[VAR_OFFSET2 + 6]
-+# define vrandom varinit[VAR_OFFSET3 + 6]
+-# define vrandom varinit[VAR_OFFSET2 + 7]
++# define vrandom varinit[VAR_OFFSET3 + 7]
#endif
-#define VAR_OFFSET3 (VAR_OFFSET2 + ENABLE_ASH_RANDOM_SUPPORT)
+#define VAR_OFFSET4 (VAR_OFFSET2 + ENABLE_ASH_RANDOM_SUPPORT)
#if BASH_EPOCH_VARS
--# define vepochs varinit[VAR_OFFSET3 + 6]
--# define vepochr varinit[VAR_OFFSET3 + 7]
-+# define vepochs varinit[VAR_OFFSET4 + 6]
-+# define vepochr varinit[VAR_OFFSET4 + 7]
+-# define vepochs varinit[VAR_OFFSET3 + 7]
+-# define vepochr varinit[VAR_OFFSET3 + 8]
++# define vepochs varinit[VAR_OFFSET4 + 7]
++# define vepochr varinit[VAR_OFFSET4 + 8]
#endif
#define INIT_G_var() do { \
unsigned i; \
---
-2.30.2
-
diff --git a/main/busybox/0001-avoid-redefined-warnings-when-building-with-utmps.patch b/main/busybox/0001-avoid-redefined-warnings-when-building-with-utmps.patch
new file mode 100644
index 0000000000..246e9b079c
--- /dev/null
+++ b/main/busybox/0001-avoid-redefined-warnings-when-building-with-utmps.patch
@@ -0,0 +1,16 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Mon, 06 Sep 2021 23:13:05 +0200
+Subject: [PATCH] Avoid redefined warnings when building with utmps
+
+--- a/include/libbb.h
++++ b/include/libbb.h
+@@ -107,6 +107,9 @@
+ # define _PATH_UTMPX _PATH_UTMP
+ # else
+ # if !defined(__FreeBSD__)
++/* _PATH_UTMP and _PATH_WTMP are defined both in paths.h and utmps/utmp.h. */
++# undef _PATH_UTMP
++# undef _PATH_WTMP
+ # include <utmp.h>
+ # else
+ # define _PATH_UTMPX "/var/run/utx.active"
diff --git a/main/busybox/0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch b/main/busybox/0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch
deleted file mode 100644
index a9b0b8fd7a..0000000000
--- a/main/busybox/0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 808d176a4da607ed3187d58605d089b373694ba2 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Mon, 28 Jun 2021 07:09:25 -0600
-Subject: [PATCH 1/2] cpio: add support for --ignore-devno like GNU cpio
-
-The --ignore-devno option is used to set device numbers to (0, 0).
-This can be useful in verifying whether a CPIO archive is reproducible.
-
-function old new delta
-cpio_o 922 961 +39
-.rodata 78407 78422 +15
-bbconfig_config_bz2 6161 6167 +6
-packed_usage 25770 25764 -6
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 3/1 up/down: 60/-6) Total: 54 bytes
-
-Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
----
- archival/cpio.c | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/archival/cpio.c b/archival/cpio.c
-index d84f6937d..4d386d38d 100644
---- a/archival/cpio.c
-+++ b/archival/cpio.c
-@@ -38,6 +38,13 @@
- //config: depends on FEATURE_CPIO_O
- //config: help
- //config: Passthrough mode. Rarely used.
-+//config:
-+//config:config FEATURE_CPIO_IGNORE_DEVNO
-+//config: bool "Support --ignore-devno like GNU cpio"
-+//config: default y
-+//config: depends on FEATURE_CPIO_O && LONG_OPTS
-+//config: help
-+//config: Optionally ignore device numbers when creating archives.
-
- //applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
-
-@@ -75,6 +82,9 @@
- //usage: "\n -R USER[:GRP] Set owner of created files"
- //usage: "\n -L Dereference symlinks"
- //usage: "\n -0 Input is separated by NULs"
-+//usage: IF_FEATURE_CPIO_IGNORE_DEVNO(
-+//usage: "\n --ignore-devno"
-+//usage: )
-
- /* GNU cpio 2.9 --help (abridged):
-
-@@ -162,11 +172,13 @@ enum {
- IF_FEATURE_CPIO_P(OPTBIT_PASSTHROUGH,)
- IF_LONG_OPTS( OPTBIT_QUIET ,)
- IF_LONG_OPTS( OPTBIT_2STDOUT ,)
-+ IF_FEATURE_CPIO_IGNORE_DEVNO(OPTBIT_IGNORE_DEVNO,)
- OPT_CREATE = IF_FEATURE_CPIO_O((1 << OPTBIT_CREATE )) + 0,
- OPT_FORMAT = IF_FEATURE_CPIO_O((1 << OPTBIT_FORMAT )) + 0,
- OPT_PASSTHROUGH = IF_FEATURE_CPIO_P((1 << OPTBIT_PASSTHROUGH)) + 0,
- OPT_QUIET = IF_LONG_OPTS( (1 << OPTBIT_QUIET )) + 0,
- OPT_2STDOUT = IF_LONG_OPTS( (1 << OPTBIT_2STDOUT )) + 0,
-+ OPT_IGNORE_DEVNO = IF_FEATURE_CPIO_IGNORE_DEVNO((1 << OPTBIT_IGNORE_DEVNO)) + 0,
- };
-
- #define OPTION_STR "it0uvdmLF:R:"
-@@ -304,6 +316,11 @@ static NOINLINE int cpio_o(void)
- }
- }
-
-+#if ENABLE_FEATURE_CPIO_IGNORE_DEVNO
-+ if (option_mask32 & OPT_IGNORE_DEVNO)
-+ st.st_dev = st.st_rdev = 0;
-+#endif
-+
- bytes += printf("070701"
- "%08X%08X%08X%08X%08X%08X%08X"
- "%08X%08X%08X%08X" /* GNU cpio uses uppercase hex */
-@@ -379,6 +396,9 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
- "null\0" No_argument "0"
- "quiet\0" No_argument "\xff"
- "to-stdout\0" No_argument "\xfe"
-+#if ENABLE_FEATURE_CPIO_IGNORE_DEVNO
-+ "ignore-devno\0" No_argument "\xfd"
-+#endif
- ;
- #endif
-
---
-2.32.0
-
diff --git a/main/busybox/0001-pgrep-add-support-for-matching-against-UID-and-RUID.patch b/main/busybox/0001-pgrep-add-support-for-matching-against-UID-and-RUID.patch
new file mode 100644
index 0000000000..7abfb09b76
--- /dev/null
+++ b/main/busybox/0001-pgrep-add-support-for-matching-against-UID-and-RUID.patch
@@ -0,0 +1,138 @@
+From 648255c510f9a3f668651842b58798f07ad4c64a Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Mon, 22 Nov 2021 18:33:02 -0600
+Subject: [PATCH] pgrep: add support for matching against UID and RUID
+
+This is standard functionality on every other pgrep implementation I
+found, namely the ones in Illumos, FreeBSD, Linux procps, and macOS.
+
+Additionally, real world scripts like pipewire-session are dependent
+on it being present.
+
+function old new delta
+pgrep_main 818 1007 +189
+packed_usage 26001 26032 +31
+.rodata 78544 78548 +4
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 3/0 up/down: 224/0) Total: 224 bytes
+
+Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
+---
+ procps/pgrep.c | 37 +++++++++++++++++++++++++++++++++----
+ 1 file changed, 33 insertions(+), 4 deletions(-)
+
+diff --git a/procps/pgrep.c b/procps/pgrep.c
+index 6d25c247e..6a12ac23b 100644
+--- a/procps/pgrep.c
++++ b/procps/pgrep.c
+@@ -42,6 +42,8 @@
+ //usage: "\n -x Match whole name (not substring)"
+ //usage: "\n -s Match session ID (0 for current)"
+ //usage: "\n -P Match parent process ID"
++//usage: "\n -u EUID Match against effective UID"
++//usage: "\n -U UID Match against UID"
+ //usage:
+ //usage:#define pkill_trivial_usage
+ //usage: "[-l|-SIGNAL] [-xfvno] [-s SID|-P PPID|PATTERN]"
+@@ -55,6 +57,8 @@
+ //usage: "\n -v Negate the match"
+ //usage: "\n -n Signal the newest process only"
+ //usage: "\n -o Signal the oldest process only"
++//usage: "\n -u EUID Match against effective UID"
++//usage: "\n -U UID Match against UID"
+
+ #include "libbb.h"
+ #include "xregex.h"
+@@ -64,7 +68,7 @@
+ #define pkill (ENABLE_PKILL && (!ENABLE_PGREP || applet_name[1] == 'k'))
+
+ enum {
+- /* "vlafxons:+P:+" */
++ /* "vlafxonu:U:s:+P:+" */
+ OPTBIT_V = 0, /* must be first, we need OPT_INVERT = 0/1 */
+ OPTBIT_L,
+ OPTBIT_A,
+@@ -72,6 +76,8 @@ enum {
+ OPTBIT_X,
+ OPTBIT_O,
+ OPTBIT_N,
++ OPTBIT_U,
++ OPTBIT_UL,
+ OPTBIT_S,
+ OPTBIT_P,
+ };
+@@ -85,6 +91,8 @@ enum {
+ #define OPT_LAST (opt & (1 << OPTBIT_N))
+ #define OPT_SID (opt & (1 << OPTBIT_S))
+ #define OPT_PPID (opt & (1 << OPTBIT_P))
++#define OPT_EUID (opt & (1 << OPTBIT_UL))
++#define OPT_RUID (opt & (1 << OPTBIT_U))
+
+ static void act(unsigned pid, char *cmd, int signo)
+ {
+@@ -105,7 +113,8 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
+ unsigned opt;
+ int scan_mask;
+ int matched_pid;
+- int sid2match, ppid2match;
++ int sid2match, ppid2match, uid2match, euid2match;
++ char *uid_arg = NULL, *euid_arg = NULL;
+ char *cmd_last;
+ procps_status_t *proc;
+ /* These are initialized to 0 */
+@@ -131,7 +140,9 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
+ /* Parse remaining options */
+ ppid2match = -1;
+ sid2match = -1;
+- opt = getopt32(argv, "vlafxons:+P:+", &sid2match, &ppid2match);
++ uid2match = -1;
++ euid2match = -1;
++ opt = getopt32(argv, "vlafxonu:U:s:+P:+", &euid_arg, &uid_arg, &sid2match, &ppid2match);
+ argv += optind;
+
+ if (pkill && OPT_LIST) { /* -l: print the whole signal list */
+@@ -147,8 +158,18 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
+ if (OPT_FULL)
+ scan_mask |= PSSCAN_ARGVN;
+
++ if (euid_arg) {
++ scan_mask |= PSSCAN_UIDGID;
++ euid2match = get_ug_id(euid_arg, xuname2uid);
++ }
++
++ if (uid_arg) {
++ scan_mask |= PSSCAN_RUIDGID;
++ uid2match = get_ug_id(uid_arg, xuname2uid);
++ }
++
+ /* One pattern is required, if no -s and no -P */
+- if ((sid2match & ppid2match) < 0 && (!argv[0] || argv[1]))
++ if ((sid2match & ppid2match) < 0 && uid2match < 0 && euid2match < 0 && (!argv[0] || argv[1]))
+ bb_show_usage();
+
+ if (argv[0])
+@@ -170,6 +191,10 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
+ continue;
+ if (sid2match >= 0 && sid2match != proc->sid)
+ continue;
++ if (euid2match >= 0 && euid2match != proc->uid)
++ continue;
++ if (uid2match >= 0 && uid2match != proc->ruid)
++ continue;
+ }
+
+ cmdlen = -1;
+@@ -202,6 +227,10 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
+ goto got_it;
+ if (sid2match >= 0 && sid2match != proc->sid)
+ goto got_it;
++ if (euid2match >= 0 && euid2match != proc->uid)
++ goto got_it;
++ if (uid2match >= 0 && uid2match != proc->ruid)
++ goto got_it;
+ }
+
+ match = !argv[0]; /* if no PATTERN, then it's a match, else... */
+--
+2.34.0
+
diff --git a/main/busybox/0001-rev-correct-output-for-long-input-lines.patch b/main/busybox/0001-rev-correct-output-for-long-input-lines.patch
deleted file mode 100644
index ba40a2f0a2..0000000000
--- a/main/busybox/0001-rev-correct-output-for-long-input-lines.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 4357569fdc7bc482dea0ef0bff57a70e7f06523c Mon Sep 17 00:00:00 2001
-From: Ron Yorston <rmy@pobox.com>
-Date: Sat, 21 Aug 2021 09:36:27 +0100
-Subject: rev: correct output for long input lines
-
-The input buffer is initialised to a reasonable size and extended
-if necessary. When this happened the offset into the buffer wasn't
-reset to zero so subsequent lines were appended to the long line.
-
-Fix this and add some tests.
-
-function old new delta
-rev_main 377 368 -9
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-9) Total: -9 bytes
-
-Signed-off-by: Ron Yorston <rmy@pobox.com>
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- testsuite/rev.tests | 46 ++++++++++++++++++++++++++++++++++++++++++++++
- util-linux/rev.c | 1 +
- 2 files changed, 47 insertions(+)
- create mode 100755 testsuite/rev.tests
-
-diff --git a/testsuite/rev.tests b/testsuite/rev.tests
-new file mode 100755
-index 000000000..dd65dcd3b
---- /dev/null
-+++ b/testsuite/rev.tests
-@@ -0,0 +1,46 @@
-+#!/bin/sh
-+# Copyright 2021 by Ron Yorston
-+# Licensed under GPLv2, see file LICENSE in this source tree.
-+
-+. ./testing.sh
-+
-+# testing "test name" "commands" "expected result" "file input" "stdin"
-+
-+testing "rev works" \
-+ "rev input" \
-+"\
-+1 enil
-+
-+3 enil
-+" \
-+ "line 1\n\nline 3\n" \
-+ ""
-+
-+testing "rev file with missing newline" \
-+ "rev input" \
-+"\
-+1 enil
-+
-+3 enil" \
-+ "line 1\n\nline 3" \
-+ ""
-+
-+testing "rev file with NUL character" \
-+ "rev input" \
-+"\
-+nil
-+3 enil
-+" \
-+ "lin\000e 1\n\nline 3\n" \
-+ ""
-+
-+testing "rev file with long line" \
-+ "rev input" \
-+"\
-++--------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------
-+cba
-+" \
-+ "---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+--------------+\nabc\n" \
-+ ""
-+
-+exit $FAILCOUNT
-diff --git a/util-linux/rev.c b/util-linux/rev.c
-index d439b4da8..63b005c67 100644
---- a/util-linux/rev.c
-+++ b/util-linux/rev.c
-@@ -109,6 +109,7 @@ int rev_main(int argc UNUSED_PARAM, char **argv)
- strrev(buf, strlen(buf));
- #endif
- fputs_stdout(buf);
-+ pos = 0;
- }
- fclose(fp);
- } while (*argv);
---
-cgit v1.2.3
-
diff --git a/main/busybox/0002-cpio-add-support-for-renumber-inodes-like-GNU-cpio.patch b/main/busybox/0002-cpio-add-support-for-renumber-inodes-like-GNU-cpio.patch
deleted file mode 100644
index 9febb66dd4..0000000000
--- a/main/busybox/0002-cpio-add-support-for-renumber-inodes-like-GNU-cpio.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 67240ede641cdda29ef74a373bc9f5aa8a18f4e8 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Mon, 28 Jun 2021 08:23:09 -0600
-Subject: [PATCH 2/2] cpio: add support for --renumber-inodes like GNU cpio
-
-The --renumber-inodes option renumbers the inodes starting from 1,
-so that the sequence of inodes is always stable. This helps with
-reproducibility.
-
-function old new delta
-cpio_o 961 1045 +84
-.rodata 78422 78440 +18
-bbconfig_config_bz2 6168 6164 -4
-packed_usage 25764 25756 -8
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 2/2 up/down: 102/-12) Total: 90 bytes
-
-Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
----
- archival/cpio.c | 32 ++++++++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
-
-diff --git a/archival/cpio.c b/archival/cpio.c
-index 4d386d38d..14f0b5b84 100644
---- a/archival/cpio.c
-+++ b/archival/cpio.c
-@@ -45,6 +45,13 @@
- //config: depends on FEATURE_CPIO_O && LONG_OPTS
- //config: help
- //config: Optionally ignore device numbers when creating archives.
-+//config:
-+//config:config FEATURE_CPIO_RENUMBER_INODES
-+//config: bool "Support --renumber-inodes like GNU cpio"
-+//config: default y
-+//config: depends on FEATURE_CPIO_O && LONG_OPTS
-+//config: help
-+//config: Optionally renumber inodes when creating archives.
-
- //applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
-
-@@ -85,6 +92,9 @@
- //usage: IF_FEATURE_CPIO_IGNORE_DEVNO(
- //usage: "\n --ignore-devno"
- //usage: )
-+//usage: IF_FEATURE_CPIO_RENUMBER_INODES(
-+//usage: "\n --renumber-inodes"
-+//usage: )
-
- /* GNU cpio 2.9 --help (abridged):
-
-@@ -173,18 +183,21 @@ enum {
- IF_LONG_OPTS( OPTBIT_QUIET ,)
- IF_LONG_OPTS( OPTBIT_2STDOUT ,)
- IF_FEATURE_CPIO_IGNORE_DEVNO(OPTBIT_IGNORE_DEVNO,)
-+ IF_FEATURE_CPIO_RENUMBER_INODES(OPTBIT_RENUMBER_INODES,)
- OPT_CREATE = IF_FEATURE_CPIO_O((1 << OPTBIT_CREATE )) + 0,
- OPT_FORMAT = IF_FEATURE_CPIO_O((1 << OPTBIT_FORMAT )) + 0,
- OPT_PASSTHROUGH = IF_FEATURE_CPIO_P((1 << OPTBIT_PASSTHROUGH)) + 0,
- OPT_QUIET = IF_LONG_OPTS( (1 << OPTBIT_QUIET )) + 0,
- OPT_2STDOUT = IF_LONG_OPTS( (1 << OPTBIT_2STDOUT )) + 0,
- OPT_IGNORE_DEVNO = IF_FEATURE_CPIO_IGNORE_DEVNO((1 << OPTBIT_IGNORE_DEVNO)) + 0,
-+ OPT_RENUMBER_INODES = IF_FEATURE_CPIO_RENUMBER_INODES((1 << OPTBIT_RENUMBER_INODES)) + 0,
- };
-
- #define OPTION_STR "it0uvdmLF:R:"
-
- struct globals {
- struct bb_uidgid_t owner_ugid;
-+ ino_t next_inode;
- } FIX_ALIASING;
- #define G (*(struct globals*)bb_common_bufsiz1)
- void BUG_cpio_globals_too_big(void);
-@@ -218,6 +231,9 @@ static NOINLINE int cpio_o(void)
- struct inodes_s *next;
- struct name_s *names;
- struct stat st;
-+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
-+ ino_t mapped_inode;
-+#endif
- };
-
- struct inodes_s *links = NULL;
-@@ -272,6 +288,10 @@ static NOINLINE int cpio_o(void)
- l = xzalloc(sizeof(*l));
- l->st = st;
- l->next = links;
-+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
-+ if (option_mask32 & OPT_RENUMBER_INODES)
-+ l->mapped_inode = ++G.next_inode;
-+#endif
- links = l;
- break;
- }
-@@ -290,6 +310,11 @@ static NOINLINE int cpio_o(void)
- free(line);
- continue;
- }
-+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
-+ else if (option_mask32 & OPT_RENUMBER_INODES) {
-+ st.st_ino = ++G.next_inode;
-+ }
-+#endif
- } else { /* line == NULL: EOF */
- next_link:
- if (links) {
-@@ -297,6 +322,10 @@ static NOINLINE int cpio_o(void)
- st = links->st;
- name = links->names->name;
- links->names = links->names->next;
-+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
-+ if (links->mapped_inode)
-+ st.st_ino = links->mapped_inode;
-+#endif
- /* GNU cpio is reported to emit file data
- * only for the last instance. Mimic that. */
- if (links->names == NULL)
-@@ -398,6 +427,9 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
- "to-stdout\0" No_argument "\xfe"
- #if ENABLE_FEATURE_CPIO_IGNORE_DEVNO
- "ignore-devno\0" No_argument "\xfd"
-+#endif
-+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
-+ "renumber-inodes\0" No_argument "\xfc"
- #endif
- ;
- #endif
---
-2.32.0
-
diff --git a/main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch b/main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
index 964db5df6a..2ca4bcd36d 100644
--- a/main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
+++ b/main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
@@ -1,4 +1,4 @@
-From 3f44fe588d0d68ff5897928b65c0749505937d8d Mon Sep 17 00:00:00 2001
+From 97d4a0ffc6f58813fd91e5728d474b984f29b9a6 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 27 Dec 2016 20:46:59 +0100
Subject: [PATCH] app location for cpio, vi and lspci
@@ -11,12 +11,12 @@ Adjust location to where alpine linux installs them
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/archival/cpio.c b/archival/cpio.c
-index d84f6937d..29e7d396a 100644
+index 7149782d7..ee80efd9f 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
-@@ -39,7 +39,7 @@
+@@ -53,7 +53,7 @@
//config: help
- //config: Passthrough mode. Rarely used.
+ //config: Optionally renumber inodes when creating archives.
-//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_CPIO(APPLET(cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
@@ -24,7 +24,7 @@ index d84f6937d..29e7d396a 100644
//kbuild:lib-$(CONFIG_CPIO) += cpio.o
diff --git a/editors/vi.c b/editors/vi.c
-index 3e1bd0820..774da291f 100644
+index 3dbe5b471..b29c16098 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -176,7 +176,7 @@
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 71b0c9e79e..7a8b36c545 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -3,14 +3,22 @@
# Contributor: Michal Artazov <michal@artazov.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
-pkgver=1.34.1
-pkgrel=2
+pkgver=1.35.0
+pkgrel=1
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
license="GPL-2.0-only"
makedepends_build="perl"
-makedepends_host="linux-headers openssl1.1-compat-dev libretls-dev"
+# skalibs-static is needed for utmps-static
+makedepends_host="
+ linux-headers
+ openssl1.1-compat-dev
+ libretls-dev
+ utmps-dev
+ utmps-static
+ skalibs-static
+ "
makedepends="$makedepends_build $makedepends_host"
checkdepends="zip"
provides="/bin/sh"
@@ -21,8 +29,6 @@ options="suid !check"
replaces="busybox-initscripts" # move of default.script
triggers="busybox.trigger=/bin:/usr/bin:/sbin:/usr/sbin:/lib/modules/*"
source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
- 0001-rev-correct-output-for-long-input-lines.patch
-
0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
0001-properly-fix-wget-https-support.patch
@@ -39,8 +45,9 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
- 0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch
- 0002-cpio-add-support-for-renumber-inodes-like-GNU-cpio.patch
+ 0001-pgrep-add-support-for-matching-against-UID-and-RUID.patch
+
+ 0001-avoid-redefined-warnings-when-building-with-utmps.patch
acpid.logrotate
busyboxconfig
@@ -52,6 +59,18 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
"
# secfixes:
+# 1.34.0-r0:
+# - CVE-2021-42374
+# - CVE-2021-42375
+# - CVE-2021-42378
+# - CVE-2021-42379
+# - CVE-2021-42380
+# - CVE-2021-42381
+# - CVE-2021-42382
+# - CVE-2021-42383
+# - CVE-2021-42384
+# - CVE-2021-42385
+# - CVE-2021-42386
# 1.33.0-r5:
# - CVE-2021-28831
# 1.30.1-r2:
@@ -64,6 +83,10 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
# - CVE-2017-16544
# - CVE-2017-15873
# - CVE-2017-15874
+# 0:
+# - CVE-2021-42373
+# - CVE-2021-42376
+# - CVE-2021-42377
_staticdir="$srcdir"/build-static
@@ -98,7 +121,10 @@ build() {
-e "s/CONFIG_EXTRA_COMPAT=y/CONFIG_EXTRA_COMPAT=n/" \
.config
make -C "$builddir" O="$PWD" silentoldconfig
- make
+ # NOTE: Defining CONFIG_EXTRA_LDLIBS in .config doesn't work, the second -l is ignored.
+ make \
+ CONFIG_EXTRA_CFLAGS="$(pkg-config --cflags --static utmps)" \
+ CONFIG_EXTRA_LDLIBS="$(pkg-config --libs --static utmps)"
# build dynamic (extras)
cd "$_dyndir_extras"
@@ -229,14 +255,13 @@ ifupdown() {
}
sha512sums="
-fb7e53a56c07b1098a12ee7232ad5401b147816648a0619b3b5358fdcf0915cfbb054500c0e0dd4acb3bc0a93a584b62bc5448e1f16b28004f58b39518a13b9d busybox-1.34.1.tar.bz2
-054e766429887e610c4a17846f495b7099bb419217f5fcc0dce0ed62b8740c2d4ee53b12a609b1830c26ac2af1eca9beb6140063b7d2665939f99f8664dfcc05 0001-rev-correct-output-for-long-input-lines.patch
+62b2e718b6669271380445ed6db249618d777a4e8d5e6d879fa39ffee43887b6a2e93ceef874c615c565ad492deb772b03a19b7475c403202741579fb151e16a busybox-1.35.0.tar.bz2
ead3403578c071c2216de17ab0543984c1f1509c12c062f03af49141547c3ea21356f3e8f0f0695550f05a41a1379dd73fc3cc18dcd78addbb411f247351e353 0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
a2787a3ecaf6746dadef62166e8ee6ecaa166147e5ad8b917c5838536057c875bab5f9cf40c3e05eba74d575484ac662929ac3799d58432d3a99ac46f364f302 0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
1efe1c4894ae983fed5ac848125f8603f157b9d91c952c53f4192b48d3e50967e05559851148397b583f34fb02d480393547904b4635e4248248be567ab268ea 0001-properly-fix-wget-https-support.patch
d8694293edc8cd55cecafeb902f03c01af318e13966f399365cf792b840793891ac086bb67ef83e7a5a2e01b246497a6c6511cb6a856834f6672dee4bca76896 0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
8c34dd5ce9a6e84279fa6494cbae0b254778976f341af1d0ccc2a3afb405fb22d374e9623ea83d1500da77c7463db2ed5218d2c9f49350a21114bd0bb17fd87d 0003-ash-exec-busybox.static.patch
-a8fc2ccced4054f5eff6ea00389906a543a1716202b19ab71fda1de0e6860c8377ed3c306ffb9efabe9fb16779a306da6770b871229f6bd1d725a84fdaa03fef 0004-app-location-for-cpio-vi-and-lspci.patch
+f9745497abd4d04621f089c62d9f2104c30d54f342125f597292253f2974d385c5f4a46e7d87a5d1b641b11b34ba5221183dd5dad1e3bbe74a787fb8d6a994b7 0004-app-location-for-cpio-vi-and-lspci.patch
f12916e70f7cc1ef4f6d85d09b9a496a52a494e6318029fdce9a9c812ab5c7b2a046c33b66834127bf809f243c91a53c3c5e27efca026a96fe6b03421de26e60 0005-udhcpc-set-default-discover-retries-to-5.patch
89215c328a46afc686c458a133dd88dcda817586df60eb041a694715e73dc78a297fc0f9a92e8ee7d0a39ce7f6053a6b8e38f3ee078ff90ed13fac2608510105 0006-ping-make-ping-work-without-root-privileges.patch
7873b98c676a92faea61511d50c1efac1220354d20afd53de19e2c8f1472559cb333b9dd4e0d6432616d8c5f59885f1503c448c86a912e8031c9bfed628c2db1 0007-fbsplash-support-console-switching.patch
@@ -244,12 +269,12 @@ f12916e70f7cc1ef4f6d85d09b9a496a52a494e6318029fdce9a9c812ab5c7b2a046c33b66834127
df02adb3e3cd3349cc8d070911e3392164cb2e30bd72cae7ceaa974b2db6f958fdcedf809abc7b4bee37c729a4d20abf127f615b0e238a667d572137abe6a79e 0009-depmod-support-generating-kmod-binary-index-files.patch
ecbe5c890d966f09280c7eb534109f785c68e292765f17ed7ff62fcc61d20f61443c4155add0a1ebfb67ce8564e104c1aa22a8ef0400e119b0bca2bca3671f2d 0010-Add-flag-for-not-following-symlinks-when-recursing.patch
3ae5ecf3ea66c8d98762432026806fdb67b13a28075c6a3cb6e811a34ef89c2f0ed651946003aaad97fb4b7f74d132af3c394c114b7a72e1d20b319b739c5a6e 0012-udhcpc-Don-t-background-if-n-is-given.patch
-d12246f1134bbd3993462d27172c4739cc601b251d57ce8e088745773afa965551236e8cb8b9013dfc142fd055e369a771d86c7c54615c89bd30393400bfa390 0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
-6f8fa4ec190d64d6c3d5377994be933885ed0b40361c99ca35881684db3b1b79664d6eab56a389df290b9f6c4db502c617ec8e4ffa6d5284bd41cea1f478b26c 0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch
-97109be04445b7b887c402b7072c1da57212ef11f2eca6d34c24d5a4e3b2866ee79aca7a0ca41043726293d9bed1b2fa8aab100501569f00b8670c280a87a01c 0002-cpio-add-support-for-renumber-inodes-like-GNU-cpio.patch
+6d100fe44da2b97c2cbdda253d0504b487212d195144d9315cddbe8c51d18fae3745701923b170b40e35f54b592f94f02cadbffd9cb716661c12a7f1da022763 0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
+e33dbc27d77c4636f4852d5d5216ef60a9a4343484e4559e391c13c813bf65c782b889914eff2e1f038d74cf02cb0d23824ebbb1044b5f8c86260d5a1bbc4e4d 0001-pgrep-add-support-for-matching-against-UID-and-RUID.patch
+2640698e5108434991a8491fcc508bd991d2111b14bb6957385393a36603e1d81fdf826ad7b150d487d2a924630ee54c0fc4f979214e90feca9ba7d2fd96a865 0001-avoid-redefined-warnings-when-building-with-utmps.patch
aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate
-e6549c9d5dbd272fe26b3e1347c84e31dbca3c57f141a345504a334c6f92016f3a3e43f3ee6777d5e382b8e6c8aeb095e11110b96c1aa2dee6c358df72c57ec4 busyboxconfig
-2471879bca825af30ab3342e0c3635499f98eeed69ec2353b01c6cea1b07fee8b6f8bd4746fd2944039aa32acdec1e0c93c344a788f2f5ba4056db6182af4c02 busyboxconfig-extras
+a820037a4c74ce18efe5b7f56f18992a5f1bf2d9f729ff5d5f540ee29f88db527724d5c81ccc6a9327d6d905ac4ed0488b10aa7e45184732e1273dc426eaae3c busyboxconfig
+9dc49c5ff0750cd713f49ee566a19e705e6b68e360a82e2c99b15a5271c7e8a5c47aaf399a03828befbe4e9ccbebb3de766cc0cfc1672848a939b5ae97b44aa1 busyboxconfig-extras
0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c
6321c1d96d8938a3b5eab21731de289ede136fff550f98127c509452bfb17769ccf94b118491f7b81d3c60e1bbb3e80bb07186e4ce07e29724a52f0daba9b218 dad.if-up
646ad9aefe3596d0170d92c8506ca1846e43b5b83cbef97ae565f15ffa7b14665a8c7061bc69c608c043f834c134c5d63f042509f8999031e89163508a868e46 ssl_client.c
diff --git a/main/busybox/busybox.post-upgrade b/main/busybox/busybox.post-upgrade
index f5ec35cf8e..b478cbe0cb 100644
--- a/main/busybox/busybox.post-upgrade
+++ b/main/busybox/busybox.post-upgrade
@@ -7,6 +7,9 @@
# symlinks that does not exist in the busybox applets list.
# - use stat to find the target of those symlinks printed as:
# '/path/to/symlink' -> '/path/to/target'
+# The "2>/dev/null" is used to stop "can't stat" warnings appearing on
+# the console for each new command added by the new version of the
+# busybox package.
# - use awk to print the symlinks that points to '/bin/busybox'
# - use sed to strip the leading and training ' chars
# - finally pass the list to rm for removing the symlinks that points to
@@ -14,7 +17,7 @@
cd /
( find bin sbin usr/bin usr/sbin -maxdepth 1 -type l; busybox --list-all) \
| sort | uniq -u \
- | xargs -r stat -c "%N" \
+ | xargs -r stat -c "%N" 2>/dev/null \
| awk "\$3 == \"'/bin/busybox'\" {print \$1}" \
| sed "s/^'//; s/'$//" \
| xargs -r rm
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index 579da5cdbf..7b6369c45c 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.34.0
-# Sat Aug 21 11:29:32 2021
+# Busybox version: 1.35.0
+# Wed Dec 29 18:18:16 2021
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -19,8 +19,8 @@ CONFIG_FEATURE_COMPRESS_USAGE=y
CONFIG_LFS=y
# CONFIG_PAM is not set
CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_UTMP is not set
-# CONFIG_FEATURE_WTMP is not set
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
CONFIG_FEATURE_PIDFILE=y
CONFIG_PID_FILE_PATH="/var/run"
CONFIG_BUSYBOX=y
@@ -94,9 +94,12 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SMALL=0
CONFIG_SHA3_SMALL=0
-CONFIG_FEATURE_FAST_TOP=y
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-# CONFIG_FEATURE_ETC_SERVICES is not set
+CONFIG_FEATURE_NON_POSIX_CP=y
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_USE_SENDFILE=y
+CONFIG_FEATURE_COPYBUF_KB=64
+CONFIG_MONOTONIC_SYSCALL=y
+# CONFIG_IOCTL_HEX2STR_ERROR is not set
CONFIG_FEATURE_EDITING=y
CONFIG_FEATURE_EDITING_MAX_LEN=2048
CONFIG_FEATURE_EDITING_VI=y
@@ -120,14 +123,6 @@ CONFIG_UNICODE_WIDE_WCHARS=y
# CONFIG_UNICODE_BIDI_SUPPORT is not set
# CONFIG_UNICODE_NEUTRAL_TABLE is not set
CONFIG_UNICODE_PRESERVE_BROKEN=y
-CONFIG_FEATURE_NON_POSIX_CP=y
-# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
-CONFIG_FEATURE_USE_SENDFILE=y
-CONFIG_FEATURE_COPYBUF_KB=64
-CONFIG_FEATURE_SKIP_ROOTFS=y
-CONFIG_MONOTONIC_SYSCALL=y
-# CONFIG_IOCTL_HEX2STR_ERROR is not set
-CONFIG_FEATURE_HWIB=y
#
# Applets
@@ -199,6 +194,22 @@ CONFIG_FEATURE_LZMA_FAST=y
#
# Coreutils
#
+CONFIG_FEATURE_VERBOSE=y
+
+#
+# Common options for date and touch
+#
+CONFIG_FEATURE_TIMEZONE=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
CONFIG_BASENAME=y
CONFIG_CAT=y
CONFIG_FEATURE_CATN=y
@@ -227,6 +238,7 @@ CONFIG_FEATURE_DD_IBS_OBS=y
CONFIG_FEATURE_DD_STATUS=y
CONFIG_DF=y
CONFIG_FEATURE_DF_FANCY=y
+CONFIG_FEATURE_SKIP_ROOTFS=y
CONFIG_DIRNAME=y
CONFIG_DOS2UNIX=y
CONFIG_UNIX2DOS=y
@@ -339,28 +351,13 @@ CONFIG_BASE64=y
CONFIG_UUENCODE=y
CONFIG_WC=y
CONFIG_FEATURE_WC_LARGE=y
-# CONFIG_WHO is not set
+CONFIG_WHO=y
# CONFIG_W is not set
# CONFIG_USERS is not set
CONFIG_WHOAMI=y
CONFIG_YES=y
#
-# Common options
-#
-CONFIG_FEATURE_VERBOSE=y
-
-#
-# Common options for cp and mv
-#
-CONFIG_FEATURE_PRESERVE_HARDLINKS=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
# Console Utilities
#
CONFIG_CHVT=y
@@ -450,7 +447,11 @@ CONFIG_FEATURE_ALLOW_EXEC=y
CONFIG_FIND=y
CONFIG_FEATURE_FIND_PRINT0=y
CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_ATIME=y
+CONFIG_FEATURE_FIND_CTIME=y
CONFIG_FEATURE_FIND_MMIN=y
+# CONFIG_FEATURE_FIND_AMIN is not set
+# CONFIG_FEATURE_FIND_CMIN is not set
CONFIG_FEATURE_FIND_PERM=y
CONFIG_FEATURE_FIND_TYPE=y
CONFIG_FEATURE_FIND_EXECUTABLE=y
@@ -458,6 +459,7 @@ CONFIG_FEATURE_FIND_XDEV=y
CONFIG_FEATURE_FIND_MAXDEPTH=y
CONFIG_FEATURE_FIND_NEWER=y
CONFIG_FEATURE_FIND_INUM=y
+# CONFIG_FEATURE_FIND_SAMEFILE is not set
CONFIG_FEATURE_FIND_EXEC=y
CONFIG_FEATURE_FIND_EXEC_PLUS=y
CONFIG_FEATURE_FIND_USER=y
@@ -637,7 +639,7 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
CONFIG_IONICE=y
CONFIG_IPCRM=y
CONFIG_IPCS=y
-# CONFIG_LAST is not set
+CONFIG_LAST=y
# CONFIG_FEATURE_LAST_FANCY is not set
CONFIG_LOSETUP=y
# CONFIG_LSPCI is not set
@@ -854,6 +856,9 @@ CONFIG_FEATURE_IPV6=y
CONFIG_FEATURE_UNIX_LOCAL=y
# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
CONFIG_VERBOSE_RESOLUTION_ERRORS=y
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+# CONFIG_FEATURE_ETC_SERVICES is not set
+CONFIG_FEATURE_HWIB=y
# CONFIG_FEATURE_TLS_SHA1 is not set
CONFIG_ARP=y
CONFIG_ARPING=y
@@ -872,6 +877,7 @@ CONFIG_ETHER_WAKE=y
CONFIG_HOSTNAME=y
CONFIG_DNSDOMAINNAME=y
# CONFIG_HTTPD is not set
+CONFIG_FEATURE_HTTPD_PORT_DEFAULT=0
# CONFIG_FEATURE_HTTPD_RANGES is not set
# CONFIG_FEATURE_HTTPD_SETUID is not set
# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
@@ -964,6 +970,7 @@ CONFIG_SLATTACH=y
# CONFIG_FEATURE_TELNET_WIDTH is not set
# CONFIG_TELNETD is not set
# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0
# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
# CONFIG_TFTP is not set
# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
@@ -1028,17 +1035,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R"
#
# Mail Utilities
#
+CONFIG_FEATURE_MIME_CHARSET="us-ascii"
CONFIG_MAKEMIME=y
# CONFIG_POPMAILDIR is not set
# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
CONFIG_REFORMIME=y
CONFIG_FEATURE_REFORMIME_COMPAT=y
CONFIG_SENDMAIL=y
-CONFIG_FEATURE_MIME_CHARSET="us-ascii"
#
# Process Utilities
#
+CONFIG_FEATURE_FAST_TOP=y
+CONFIG_FEATURE_SHOW_THREADS=y
CONFIG_FREE=y
CONFIG_FUSER=y
CONFIG_IOSTAT=y
@@ -1075,9 +1084,8 @@ CONFIG_FEATURE_TOP_SMP_CPU=y
CONFIG_FEATURE_TOP_SMP_PROCESS=y
CONFIG_FEATURE_TOPMEM=y
CONFIG_UPTIME=y
-# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
+CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y
CONFIG_WATCH=y
-CONFIG_FEATURE_SHOW_THREADS=y
#
# Runit Utilities
diff --git a/main/busybox/busyboxconfig-extras b/main/busybox/busyboxconfig-extras
index 998b660723..34ed93e6ae 100644
--- a/main/busybox/busyboxconfig-extras
+++ b/main/busybox/busyboxconfig-extras
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.34.0
-# Sat Aug 21 11:30:37 2021
+# Busybox version: 1.35.0
+# Wed Dec 29 18:19:30 2021
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -94,9 +94,12 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SMALL=1
CONFIG_SHA3_SMALL=1
-# CONFIG_FEATURE_FAST_TOP is not set
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-# CONFIG_FEATURE_ETC_SERVICES is not set
+# CONFIG_FEATURE_NON_POSIX_CP is not set
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+# CONFIG_FEATURE_USE_SENDFILE is not set
+CONFIG_FEATURE_COPYBUF_KB=4
+# CONFIG_MONOTONIC_SYSCALL is not set
+# CONFIG_IOCTL_HEX2STR_ERROR is not set
# CONFIG_FEATURE_EDITING is not set
CONFIG_FEATURE_EDITING_MAX_LEN=0
# CONFIG_FEATURE_EDITING_VI is not set
@@ -120,14 +123,6 @@ CONFIG_LAST_SUPPORTED_WCHAR=0
# CONFIG_UNICODE_BIDI_SUPPORT is not set
# CONFIG_UNICODE_NEUTRAL_TABLE is not set
# CONFIG_UNICODE_PRESERVE_BROKEN is not set
-# CONFIG_FEATURE_NON_POSIX_CP is not set
-# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
-# CONFIG_FEATURE_USE_SENDFILE is not set
-CONFIG_FEATURE_COPYBUF_KB=4
-# CONFIG_FEATURE_SKIP_ROOTFS is not set
-# CONFIG_MONOTONIC_SYSCALL is not set
-# CONFIG_IOCTL_HEX2STR_ERROR is not set
-# CONFIG_FEATURE_HWIB is not set
#
# Applets
@@ -199,6 +194,14 @@ CONFIG_GZIP_FAST=0
#
# Coreutils
#
+# CONFIG_FEATURE_VERBOSE is not set
+
+#
+# Common options for date and touch
+#
+# CONFIG_FEATURE_TIMEZONE is not set
+# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
+# CONFIG_FEATURE_HUMAN_READABLE is not set
# CONFIG_BASENAME is not set
# CONFIG_CAT is not set
# CONFIG_FEATURE_CATN is not set
@@ -227,6 +230,7 @@ CONFIG_GZIP_FAST=0
# CONFIG_FEATURE_DD_STATUS is not set
# CONFIG_DF is not set
# CONFIG_FEATURE_DF_FANCY is not set
+# CONFIG_FEATURE_SKIP_ROOTFS is not set
# CONFIG_DIRNAME is not set
# CONFIG_DOS2UNIX is not set
# CONFIG_UNIX2DOS is not set
@@ -342,13 +346,6 @@ CONFIG_BB_ARCH=y
# CONFIG_YES is not set
#
-# Common options
-#
-# CONFIG_FEATURE_VERBOSE is not set
-# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
-# CONFIG_FEATURE_HUMAN_READABLE is not set
-
-#
# Console Utilities
#
# CONFIG_CHVT is not set
@@ -434,7 +431,11 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0
# CONFIG_FIND is not set
# CONFIG_FEATURE_FIND_PRINT0 is not set
# CONFIG_FEATURE_FIND_MTIME is not set
+# CONFIG_FEATURE_FIND_ATIME is not set
+# CONFIG_FEATURE_FIND_CTIME is not set
# CONFIG_FEATURE_FIND_MMIN is not set
+# CONFIG_FEATURE_FIND_AMIN is not set
+# CONFIG_FEATURE_FIND_CMIN is not set
# CONFIG_FEATURE_FIND_PERM is not set
# CONFIG_FEATURE_FIND_TYPE is not set
# CONFIG_FEATURE_FIND_EXECUTABLE is not set
@@ -442,6 +443,7 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0
# CONFIG_FEATURE_FIND_MAXDEPTH is not set
# CONFIG_FEATURE_FIND_NEWER is not set
# CONFIG_FEATURE_FIND_INUM is not set
+# CONFIG_FEATURE_FIND_SAMEFILE is not set
# CONFIG_FEATURE_FIND_EXEC is not set
# CONFIG_FEATURE_FIND_EXEC_PLUS is not set
# CONFIG_FEATURE_FIND_USER is not set
@@ -830,6 +832,9 @@ CONFIG_FEATURE_IPV6=y
CONFIG_FEATURE_UNIX_LOCAL=y
CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
CONFIG_VERBOSE_RESOLUTION_ERRORS=y
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+# CONFIG_FEATURE_ETC_SERVICES is not set
+# CONFIG_FEATURE_HWIB is not set
# CONFIG_FEATURE_TLS_SHA1 is not set
# CONFIG_ARP is not set
# CONFIG_ARPING is not set
@@ -848,6 +853,7 @@ CONFIG_FTPPUT=y
# CONFIG_HOSTNAME is not set
# CONFIG_DNSDOMAINNAME is not set
CONFIG_HTTPD=y
+CONFIG_FEATURE_HTTPD_PORT_DEFAULT=80
CONFIG_FEATURE_HTTPD_RANGES=y
CONFIG_FEATURE_HTTPD_SETUID=y
CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
@@ -940,6 +946,7 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y
CONFIG_FEATURE_TELNET_WIDTH=y
CONFIG_TELNETD=y
CONFIG_FEATURE_TELNETD_STANDALONE=y
+CONFIG_FEATURE_TELNETD_PORT_DEFAULT=23
CONFIG_FEATURE_TELNETD_INETD_WAIT=y
CONFIG_TFTP=y
CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
@@ -986,13 +993,13 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT=""
#
# Common options for DHCP applets
#
-CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0"
+CONFIG_UDHCPC_DEFAULT_INTERFACE=""
# CONFIG_FEATURE_UDHCP_PORT is not set
CONFIG_UDHCP_DEBUG=0
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
CONFIG_FEATURE_UDHCP_RFC3397=y
CONFIG_FEATURE_UDHCP_8021Q=y
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R"
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
#
# Print Utilities
@@ -1004,17 +1011,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R"
#
# Mail Utilities
#
+CONFIG_FEATURE_MIME_CHARSET=""
# CONFIG_MAKEMIME is not set
# CONFIG_POPMAILDIR is not set
# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
# CONFIG_REFORMIME is not set
# CONFIG_FEATURE_REFORMIME_COMPAT is not set
# CONFIG_SENDMAIL is not set
-CONFIG_FEATURE_MIME_CHARSET=""
#
# Process Utilities
#
+# CONFIG_FEATURE_FAST_TOP is not set
+# CONFIG_FEATURE_SHOW_THREADS is not set
# CONFIG_FREE is not set
# CONFIG_FUSER is not set
# CONFIG_IOSTAT is not set
@@ -1053,7 +1062,6 @@ CONFIG_FEATURE_MIME_CHARSET=""
# CONFIG_UPTIME is not set
# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
# CONFIG_WATCH is not set
-# CONFIG_FEATURE_SHOW_THREADS is not set
#
# Runit Utilities
diff --git a/main/c-ares/APKBUILD b/main/c-ares/APKBUILD
index 5977622f51..adf9d6de25 100644
--- a/main/c-ares/APKBUILD
+++ b/main/c-ares/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=c-ares
-pkgver=1.17.2
+pkgver=1.18.1
pkgrel=0
pkgdesc="An asynchronously DNS/names resolver library"
url="https://c-ares.haxx.se/"
@@ -41,5 +41,5 @@ package() {
}
sha512sums="
-f625e0ef8508af6475d3e83b51ab29be8a4878e2a87e7f518bea046b76a74bfde7043ca6ec2a9e714c898ab9e5d4a5a678c3347a9f9eb68980438f7ca8ae3fc8 c-ares-1.17.2.tar.gz
+1276ec0799916019f8c0af6b55a139701bd15e0ca4a00811d07963893978bc96c107b980f0fd49f81aa70bc8b3b8cd671195ba357c390772d4c2c5643c50c5a5 c-ares-1.18.1.tar.gz
"
diff --git a/main/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD
index 6a4d7ab8d6..9d6e2cbcf7 100644
--- a/main/ca-certificates/APKBUILD
+++ b/main/ca-certificates/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ca-certificates
-pkgver=20191127
-pkgrel=7
+pkgver=20211220
+pkgrel=0
pkgdesc="Common CA certificates PEM files from Mozilla"
url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/"
arch="all"
@@ -16,16 +16,10 @@ replaces="libcrypto1.0 openssl openssl1.0"
options="!fhs !check"
triggers="ca-certificates.trigger=/usr/share/ca-certificates:/usr/local/share/ca-certificates:/etc/ssl/certs:/etc/ca-certificates/update.d"
install="$pkgname.post-deinstall"
-source="https://gitlab.alpinelinux.org/alpine/ca-certificates/-/archive/$pkgver/ca-certificates-$pkgver.tar.bz2
- 0001-update-ca-fix-compiler-warning.patch
- 0002-replace-python-script-with-perl-script.patch
- 0003-update-ca-insert-newline-between-certs.patch
- "
+source="https://gitlab.alpinelinux.org/alpine/ca-certificates/-/archive/$pkgver/ca-certificates-$pkgver.tar.bz2"
build() {
make
- # remove expired cert (https://gitlab.alpinelinux.org/alpine/aports/issues/11607)
- rm AddTrust_External_Root.crt
}
package() {
@@ -70,7 +64,6 @@ bundle() {
"$subpkgdir"/etc/ssl/cert.pem
}
-sha512sums="05e3a11efd80ea88eb81774e084febe4b8d1fa48f01f49e5ed3d469e10a2769260a264faed42ea3a0b725659cda1cc4a67ce5575fe04cdff9dc1c08207911c9b ca-certificates-20191127.tar.bz2
-aafe6d9047380fc403792fbf27146dc9c0532ef401e6eb9bd8b533c110f902cad0a66701cf3563ad625d07ae54619e9f2f3091ec14772b92e178dbed142ecd97 0001-update-ca-fix-compiler-warning.patch
-4d9c71b9ea0596f5efaa188f244b7ab587f96c218bb6fed01f11e34c553909f65bbe660156f8300be9511ae50614661c5dcd3b493ac146a8e888f62fc52bd9d4 0002-replace-python-script-with-perl-script.patch
-051b5d78916ee7389dfbd4e8871aab720415bd6e9ee0313dba770fc40ee7c68ac67d7918f2503458a3218e3bfc10691b5e379b65269106fde02c7e7a36eb7595 0003-update-ca-insert-newline-between-certs.patch"
+sha512sums="
+6b486384c80b29632939a28524acfeeedc60f5df44da86bc16ce79f3cf2ff464455e963ebeb410c3072829b9083215961b32c18673ff77b211652d4c1e870799 ca-certificates-20211220.tar.bz2
+"
diff --git a/main/ccache/APKBUILD b/main/ccache/APKBUILD
index ac6e40e029..1de923bdd7 100644
--- a/main/ccache/APKBUILD
+++ b/main/ccache/APKBUILD
@@ -1,32 +1,30 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ccache
-pkgver=4.3
-pkgrel=0
+pkgver=4.4.2
+pkgrel=1
pkgdesc="fast C/C++ compiler cache"
-options="!check" # fails on builders, passes on CI
url="https://ccache.dev/"
arch="all"
license="GPL-3.0-or-later"
-makedepends="cmake zstd-dev asciidoc perl"
-checkdepends="bash"
+makedepends="cmake zstd-dev hiredis-dev asciidoctor perl linux-headers"
+checkdepends="bash util-linux-misc python3 redis"
subpackages="$pkgname-doc"
-source="https://github.com/ccache/ccache/releases/download/v$pkgver/ccache-$pkgver.tar.xz"
-
-case $CARCH in
-ppc64le) ;; # https://github.com/ccache/ccache/issues/820
-*) makedepends="$makedepends linux-headers" ;;
-esac
+source="https://github.com/ccache/ccache/releases/download/v$pkgver/ccache-$pkgver.tar.xz
+ ioctl.patch"
build() {
cmake -B build \
- -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr
cmake --build build
}
check() {
- make -C build test
+ case $CARCH in
+ armhf) echo "SKIP make -C build test on $CARCH" ;;
+ *) make -C build test ;;
+ esac
}
package() {
@@ -43,5 +41,6 @@ package() {
}
sha512sums="
-ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f ccache-4.3.tar.xz
+afcec4806b1e307ec16006ecd9e39eb69fc1376407877f024c882926725d41f2b08eccdcfb3efd8dac9e481d07f9c08c043b8cea5ea563a0f49b2f587325e4a7 ccache-4.4.2.tar.xz
+785ce34305a3bb6c24117341157356c2bd2272eca9d58fa20acd14a023abe6f784c88d9c55656d2f37320392bb73a61c52cd8b6bd9ac7c5316c8ed187dd6f5fb ioctl.patch
"
diff --git a/main/ccache/ioctl.patch b/main/ccache/ioctl.patch
new file mode 100644
index 0000000000..256e54155c
--- /dev/null
+++ b/main/ccache/ioctl.patch
@@ -0,0 +1,17 @@
+musl uses an `int` instead of a `unsigend long` for the ioctl function
+prototype, contrary to glibc, since POSIX mandates the former. This
+causes a spurious error on ppc64le which can be silenced by casting to
+int explicitly.
+
+See https://www.openwall.com/lists/musl/2020/01/20/2
+
+--- ccache-4.4.2.orig/src/Util.cpp 2021-09-28 21:39:22.000000000 +0200
++++ ccache-4.4.2/src/Util.cpp 2021-11-05 16:16:59.972620042 +0100
+@@ -253,7 +253,7 @@ clone_file(const std::string& src, const
+ }
+ }
+
+- if (ioctl(*dest_fd, FICLONE, *src_fd) != 0) {
++ if (ioctl(*dest_fd, (int)FICLONE, *src_fd) != 0) {
+ throw core::Error(strerror(errno));
+ }
diff --git a/main/cgdb/APKBUILD b/main/cgdb/APKBUILD
index 70fa7dc269..13465c1943 100644
--- a/main/cgdb/APKBUILD
+++ b/main/cgdb/APKBUILD
@@ -1,12 +1,12 @@
# Contributor: Harry
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cgdb
-pkgver=0.7.1
+pkgver=0.8.0
pkgrel=0
pkgdesc="The Curses Debugger"
arch="all"
license="GPL-2.0"
-url="http://cgdb.sourceforge.net/"
+url="https://cgdb.github.io/"
depends="gdb"
makedepends="flex bison texinfo help2man ncurses-dev readline-dev"
source="http://cgdb.me/files/cgdb-$pkgver.tar.gz"
@@ -38,4 +38,6 @@ package() {
mv "$pkgdir"/usr/share/cgdb "$pkgdir"/usr/share/doc/
}
-sha512sums="34f1fa53cfc9fbf7a2603db169e8338c0bf32200ed7a63e9944951f446e295e49f4ff3c5d0998a4c70bc872376263e1469d7e518becc13b4959f66495d5b9521 cgdb-0.7.1.tar.gz"
+sha512sums="
+0f53798707f20508a8ea564d5ed3f82e223edf4b246468c9a99c929c043b2b2eb333e96395b66672a38da1e517efb7c7dec011a29ea774d873ddf81fb56e4d9a cgdb-0.8.0.tar.gz
+"
diff --git a/main/checkbashisms/APKBUILD b/main/checkbashisms/APKBUILD
index 6d4e28f334..b93086f688 100644
--- a/main/checkbashisms/APKBUILD
+++ b/main/checkbashisms/APKBUILD
@@ -1,13 +1,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=checkbashisms
-pkgver=2.21.4
+pkgver=2.21.7
pkgrel=0
pkgdesc="Check shell scripts for POXIX compliance"
url="https://tracker.debian.org/pkg/devscripts"
arch="noarch"
license="GPL-2.0-or-later"
depends="perl"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-bash-completion"
source="http://cdn.debian.net/debian/pool/main/d/devscripts/devscripts_$pkgver.tar.xz"
builddir="$srcdir/devscripts-$pkgver/scripts"
@@ -24,10 +24,13 @@ prepare() {
}
package() {
- install -D -m755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
- install -D -m755 "$pkgname".1 "$pkgdir/usr/share/man/man1/$pkgname".1
+ install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
+ install -Dm644 "$pkgname".1 \
+ "$pkgdir/usr/share/man/man1/$pkgname".1
+ install -Dm644 "$pkgname".bash_completion \
+ $pkgdir/usr/share/bash-completion/completions/"$pkgname"
}
sha512sums="
-99250737cabc24bbd21e20de7c787e182492e15cad4288226ed497349cbf3dd45927e1c501d73341e48dfd14ee2285c8cca8ac3b2145c2f02ce4d04ddb881e50 devscripts_2.21.4.tar.xz
+a64ee9529b3c013cdd1e203c44dc577ddfa0a3ae2a19ba1af1c0e33950af49b0adcf2fff9c075467af5b897cb40645ffedd357d68636762d135c21d7a865a745 devscripts_2.21.7.tar.xz
"
diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD
index 8dec5648e9..1b2791e0c7 100644
--- a/main/chrony/APKBUILD
+++ b/main/chrony/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=chrony
-pkgver=4.1
+pkgver=4.2
pkgrel=0
pkgdesc="NTP client and server programs"
url="https://chrony.tuxfamily.org"
@@ -80,7 +80,7 @@ package() {
}
sha512sums="
-5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f chrony-4.1.tar.gz
+7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d chrony-4.2.tar.gz
067d47224a8c075ec8f63ffc58e65b030fdf228a72c4f03d50a2f2c17414da65bb5d27c7c2e4ba99e909f452041db83eaebe3c9e34c0c8fce18e05ebb489735e fix-tests.patch
b26581ed32680585edea5b8163a0062a87f648394c0f363c77a7d01a36608fcf4d005d9e6ab179ed2827b8a08f598f7bad4801bb5e135cad5107eb77fb19b247 max_resolve_interval.patch
c1ce577ed1af9f3d88a6a2880a4834ae0c6a7f45870d9396d2aacd7716eb8de346ce458e1a45fdd48b1e8b8f5cd3afcba9534ac47fedb517604c9d910a342fac chronyd.confd
diff --git a/main/cifs-utils/APKBUILD b/main/cifs-utils/APKBUILD
index ef5f32ab84..63782052fd 100644
--- a/main/cifs-utils/APKBUILD
+++ b/main/cifs-utils/APKBUILD
@@ -17,8 +17,8 @@ source="https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-$pkgver.tar.b
options="suid"
# secfixes:
-# 6.11-r0:
-# - CVE-2020-14342 (Not affected, requires --with-systemd)
+# 0:
+# - CVE-2020-14342 # requires --with-systemd
prepare() {
default_prepare
diff --git a/main/cjson/APKBUILD b/main/cjson/APKBUILD
index 9fbdcb0837..ce429c2615 100644
--- a/main/cjson/APKBUILD
+++ b/main/cjson/APKBUILD
@@ -1,13 +1,13 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer:
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=cjson
pkgver=1.7.15
-pkgrel=0
+pkgrel=3
pkgdesc="Lighweight JSON parser in C"
url="https://github.com/DaveGamble/cJSON"
arch="all"
license="MIT"
-makedepends="cmake"
+makedepends="cmake samurai"
subpackages="$pkgname-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/DaveGamble/cJSON/archive/v$pkgver.tar.gz"
builddir="$srcdir/cJSON-$pkgver"
@@ -16,11 +16,11 @@ build() {
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- cmake -B build \
+ cmake -B build -G Ninja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
- -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_C_FLAGS="$CFLAGS" \
$CMAKE_CROSSOPTS
cmake --build build
diff --git a/main/ckbcomp/APKBUILD b/main/ckbcomp/APKBUILD
index 57505b252e..1cb70d4bd6 100644
--- a/main/ckbcomp/APKBUILD
+++ b/main/ckbcomp/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ckbcomp
-pkgver=1.205
+pkgver=1.207
pkgrel=0
pkgdesc="Compile a XKB keyboard description to a keymap"
url="https://packages.debian.org/sid/console-setup"
@@ -18,5 +18,5 @@ package() {
}
sha512sums="
-757643f040542fda2903ffaa35a311c6c572b4c1e9c6c169a032e85a360bfe7d64e66ad66fba988515a4c1004ae4ecb45a40fba5c0a9eec6bd58abc1e0624b15 console-setup_1.205.tar.xz
+0652b43c2488246e5bf7fac7ad5dc7986ba0ae832ae2179d2ade14da0412639f9055216e6a5e73a7a7c682d4e606441bf3a24dd5dbce0c3b0aff8416571587e5 console-setup_1.207.tar.xz
"
diff --git a/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch b/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
deleted file mode 100644
index 674486cbe0..0000000000
--- a/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Based on original patchset from Jakub Jirutka <jakub@jirutka.cz>
-Updated by Eric Molitor <eric@molitor.org>
-Updated by Natanael Copa <ncopa@alpinelinux.org>
-Updated by omni <omni+alpine@hack.org>
-
-diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp
-index f8f3623..9c8c748 100644
---- a/lib/Driver/ToolChains/Linux.cpp
-+++ b/lib/Driver/ToolChains/Linux.cpp
-@@ -833,6 +833,13 @@ bool Linux::isPIEDefault() const {
- return Generic_ELF::IsMathErrnoDefault();
- }
-
-+unsigned Linux::GetDefaultStackProtectorLevel(bool KernelOrKext) const {
-+ StringRef VendorName = Linux::getTriple().getVendorName();
-+ if (VendorName.compare("alpine") == 0)
-+ return 2;
-+ return Generic_ELF::GetDefaultStackProtectorLevel(KernelOrKext);
-+}
-+
- SanitizerMask Linux::getSupportedSanitizers() const {
- const bool IsX86 = getTriple().getArch() == llvm::Triple::x86;
- const bool IsX86_64 = getTriple().getArch() == llvm::Triple::x86_64;
-diff --git a/lib/Driver/ToolChains/Linux.h b/lib/Driver/ToolChains/Linux.h
-index 22dbbec..ba0d558 100644
---- a/lib/Driver/ToolChains/Linux.h
-+++ b/lib/Driver/ToolChains/Linux.h
-@@ -38,6 +38,7 @@
- CXXStdlibType GetDefaultCXXStdlibType() const override;
- bool isPIEDefault() const override;
- bool isNoExecStackDefault() const override;
-+ unsigned GetDefaultStackProtectorLevel(bool KernelOrKext) const override;
- bool IsMathErrnoDefault() const override;
- SanitizerMask getSupportedSanitizers() const override;
- void addProfileRTLibs(const llvm::opt::ArgList &Args,
-diff --git a/test/Driver/fsanitize.c b/test/Driver/fsanitize.c
-index 304e759..29ead22 100644
---- a/test/Driver/fsanitize.c
-+++ b/test/Driver/fsanitize.c
-@@ -662,18 +662,17 @@
- // RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
- // NOSP-NOT: "-fsanitize=safe-stack"
-
--// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
-+// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
- // RUN: %clang -target x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN
- // RUN: %clang -target x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
- // RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP
--// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
--// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
-+// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
-+// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
- // RUN: %clang -target i386-contiki-unknown -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
- // NO-SP-NOT: stack-protector
- // NO-SP: "-fsanitize=safe-stack"
- // SP-ASAN: error: invalid argument '-fsanitize=safe-stack' not allowed with '-fsanitize=address'
- // SP: "-fsanitize=safe-stack"
--// SP: -stack-protector
- // NO-SP-NOT: stack-protector
-
- // RUN: %clang -target powerpc64-unknown-linux-gnu -fsanitize=memory %s -### 2>&1 | FileCheck %s -check-prefix=CHECK-SANM
-diff --git a/test/Driver/stack-protector.c b/test/Driver/stack-protector.c
-index a3e40b5..60ec2a8 100644
---- a/test/Driver/stack-protector.c
-+++ b/test/Driver/stack-protector.c
-@@ -24,6 +24,20 @@
- // SSP-ALL: "-stack-protector" "3"
- // SSP-ALL-NOT: "-stack-protector-buffer-size"
-
-+// RUN: %clang -target x86_64-alpine-linux-musl -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE
-+// ALPINE: "-stack-protector" "2"
-+
-+// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_SPS
-+// ALPINE_SPS: "-stack-protector" "2"
-+
-+// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_ALL
-+// ALPINE_ALL: "-stack-protector" "3"
-+// ALPINE_ALL-NOT: "-stack-protector-buffer-size"
-+
-+// RUN: %clang -target x86_64-alpine-linux-musl -fno-stack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_NOSSP
-+// ALPINE_NOSSP-NOT: "-stack-protector"
-+// ALPINE_NOSSP-NOT: "-stack-protector-buffer-size"
-+
- // RUN: %clang -target x86_64-scei-ps4 -### %s 2>&1 | FileCheck %s -check-prefix=SSP-PS4
- // RUN: %clang -target x86_64-scei-ps4 -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=SSP-PS4
- // SSP-PS4: "-stack-protector" "2"
diff --git a/main/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch b/main/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
index 939a50dd09..f2895ce76b 100644
--- a/main/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+++ b/main/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
@@ -32,18 +32,6 @@ Updated by omni <omni+alpine@hack.org>
bool IsMathErrnoDefault() const override;
SanitizerMask getSupportedSanitizers() const override;
void addProfileRTLibs(const llvm::opt::ArgList &Args,
---- a/lib/Driver/ToolChains/Linux.cpp
-+++ b/lib/Driver/ToolChains/Linux.cpp
-@@ -832,8 +832,7 @@
- }
-
- bool Linux::isPIEDefault() const {
-- return (getTriple().isAndroid() && !getTriple().isAndroidVersionLT(16)) ||
-- getTriple().isMusl() || getSanitizerArgs().requiresPIE();
-+ return Generic_ELF::IsMathErrnoDefault();
- }
-
- bool Linux::isNoExecStackDefault() const {
--- a/test/Driver/fsanitize.c
+++ b/test/Driver/fsanitize.c
@@ -667,18 +667,17 @@
@@ -91,8 +79,3 @@ Updated by omni <omni+alpine@hack.org>
// RUN: %clang -target armv7k-apple-watchos2.0 -### %s 2>&1 | FileCheck %s -check-prefix=SSP_WATCHOS
// RUN: %clang -ffreestanding -target armv7k-apple-watchos2.0 -### %s 2>&1 | FileCheck %s -check-prefix=SSP_WATCHOS
// SSP_WATCHOS: "-stack-protector" "1"
-@@ -53,3 +67,4 @@
- // RUN: %clang -ffreestanding -target x86_64-apple-darwin10 -mmacosx-version-min=10.6 -### %s 2>&1 | FileCheck %s -check-prefix=SSP_MACOSX_10_6_KERNEL
- // SSP_MACOSX_10_6_KERNEL: "-stack-protector" "1"
-
-+// SP: -stack-protector
diff --git a/main/clang/APKBUILD b/main/clang/APKBUILD
index ed020d26fe..bdc5c50fa2 100644
--- a/main/clang/APKBUILD
+++ b/main/clang/APKBUILD
@@ -6,7 +6,7 @@
pkgname=clang
# Note: Update together with llvm.
pkgver=12.0.1
-pkgrel=0
+pkgrel=2
_llvmver=${pkgver%%.*}
pkgdesc="A C language family front-end for LLVM"
arch="all"
@@ -15,9 +15,6 @@ license="Apache-2.0"
options="!check" # fail to build
makedepends="
cmake
- isl-dev
- libedit-dev
- libexecinfo-dev
libxml2-dev
libxml2-utils
llvm$_llvmver-dev
@@ -177,8 +174,10 @@ python() {
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
}
-sha512sums="405011f0974b239427ca87c65e7485709c77705a9b7d51d679fe2abec79865f8c51c7ab085b4e6bf7aa4d0eade4b1438d88dd5feb56b434dc5d718ebf5715efa clang-12.0.1.src.tar.xz
+sha512sums="
+405011f0974b239427ca87c65e7485709c77705a9b7d51d679fe2abec79865f8c51c7ab085b4e6bf7aa4d0eade4b1438d88dd5feb56b434dc5d718ebf5715efa clang-12.0.1.src.tar.xz
be4975c81c83f98deb5f6e0cc170fb6740bc46396d5bd8f25b55270ed874bb099b6d6f0e413617396f5ab67182314735580f44be1913d9be44ae288cf8c4fd7c clang-tools-extra-12.0.1.src.tar.xz
90d61072676b283192fd24804cce7b246acfee418c68c42cc299db6a0605a7d1b5460d5817ea4ea715d94fa6d067dc445673b3949133c1f05957448b9738cc84 10-add-musl-triples.patch
+264dc8fd9f5d8675427ec984e1e381ff6a235f70006e8385430efc92d528914cb39a81eac79a75713ea8d7abfb83529e5935cb7fa275db469cc490c5fe5c7876 30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
32add4879375d47a0a6055bc45073dc1bfd06a823e59f62cc8c5cdf762393e39a923b3c5b432972f84c294773585c684f623a8ede43a8044de4f3fe9d89e40cb 40-fix-ld-name-on-x86.patch
-46c7419b02f0755d12d4577b18b5a959393937622b67de10806c38c81d01c7b53606a78fdf031cb6a244365c3f8e216f06376f3636c2a2eb460b2a1f9d39d324 30-Enable-stack-protector-by-default-for-Alpine-Linux.patch"
+"
diff --git a/main/clucene/APKBUILD b/main/clucene/APKBUILD
index 639ff5b405..393b9fbe65 100644
--- a/main/clucene/APKBUILD
+++ b/main/clucene/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=clucene
pkgver=2.3.3.4
-pkgrel=10
+pkgrel=11
pkgdesc="A C++ port of Lucene"
url="http://www.sourceforge.net/projects/clucene"
arch="all"
@@ -30,7 +30,7 @@ prepare() {
build() {
cd "$_builddir"
- cmake . -DCMAKE_BUILD_TYPE=None \
+ cmake . -DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_CONTRIBS_LIB=BOOL:ON \
-DLIB_DESTINATION:PATH=/usr/lib \
diff --git a/main/cmocka/APKBUILD b/main/cmocka/APKBUILD
index 575f24d574..3ee25dc51a 100644
--- a/main/cmocka/APKBUILD
+++ b/main/cmocka/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=cmocka
pkgver=1.1.5
-pkgrel=1
+pkgrel=2
pkgdesc="An elegant unit testing framework for C with support for mock objects"
url="https://cmocka.org/"
arch="all"
@@ -32,7 +32,7 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
- -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DUNIT_TESTING=ON
make
diff --git a/main/compiler-rt/APKBUILD b/main/compiler-rt/APKBUILD
index bc1c288559..5b067aca76 100644
--- a/main/compiler-rt/APKBUILD
+++ b/main/compiler-rt/APKBUILD
@@ -1,42 +1,61 @@
-# Contributor Eric Molitor <eric@molitor.org>
-# Contributor Travis Tilley <ttilley@gmail.com>
+# Contributor: Eric Molitor <eric@molitor.org>
+# Contributor: Travis Tilley <ttilley@gmail.com>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=compiler-rt
# Note: Update together with llvm.
pkgver=12.0.1
-pkgrel=1
+pkgrel=2
_llvmver=${pkgver%%.*}
pkgdesc="LLVM compiler-rt runtime libraries"
arch="all"
url="https://llvm.org/"
license="Apache-2.0"
makedepends="
+ clang
cmake
+ libexecinfo-dev
linux-headers
- clang
llvm-dev>=$_llvmver
llvm-static>=$_llvmver
- samurai
python3
+ samurai
"
checkdepends="gtest-dev llvm-test-utils>=$_llvmver"
-subpackages="$pkgname-static"
-options="!check" # Doesn't seem to work with linux ld: /lib/ld-musl-x86_64.so.1: cannot load --version: No such file or directory
+provides="$pkgname-static=$pkgver-r$pkgrel" # for backward compatibility (Alpine <3.16)
source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/compiler-rt-$pkgver.src.tar.xz
https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz
- disable-sanitizer-common.patch
- replace-size_t-std-size-t.patch"
-
+ fuzzer-size_t-musl.patch
+ fix-arch-detection-for-ppc64le.patch
+ xray-ppc64-musl.patch
+
+ sanitizer-supported-arch.patch
+ aarch64-ucontext.patch
+ sanitizer-x86_64-execinfo.patch
+ sanitizer-ppc64-musl.patch
+ "
builddir="$srcdir/$pkgname-$pkgver.src"
+options="!check" # tests fail to build
-build() {
- mkdir -p "$builddir"/build
- cd "$builddir"/build
+case "$CARCH" in
+ # Sanitizers are broken on other arches.
+ # Keep in sync with sanitizer-supported-arch.patch.
+ aarch64 | ppc64le | x86_64) _build_sanitizers='ON';;
+ *) _build_sanitizers='OFF';;
+esac
+prepare() {
+ default_prepare
+
+ sed -i 's|/usr/bin/env python$|/usr/bin/python3|' \
+ lib/hwasan/scripts/hwasan_symbolize
+}
+
+build() {
# compiler-rt uses llvm intrinsic types for testing
# and therefore requires clang
# It also needs LLVM source for testing purposes
- cmake .. \
+ cmake -G Ninja -B build -Wno-dev \
-DCMAKE_C_COMPILER=clang \
-DCMAKE_CXX_COMPILER=clang++ \
-DCMAKE_BUILD_TYPE=MinSizeRel \
@@ -44,38 +63,31 @@ build() {
-DCMAKE_CXX_FLAGS_MINSIZEREL_INIT="$CXXFLAGS" \
-DCMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT="$LDFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCOMPILER_RT_INCLUDE_TESTS=ON \
- -DCOMPILER_RT_BUILD_SANITIZERS=OFF \
- -DCOMPILER_RT_BUILD_XRAY=OFF \
+ -DCOMPILER_RT_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \
+ -DCOMPILER_RT_BUILD_SANITIZERS=$_build_sanitizers \
+ -DCOMPILER_RT_BUILD_XRAY=ON \
+ -DCOMPILER_RT_INSTALL_PATH="/usr/lib/clang/$pkgver" \
-DLLVM_EXTERNAL_LIT="/usr/bin/lit" \
- -DLLVM_MAIN_SRC_DIR="$srcdir/llvm-$pkgver.src" \
- -G Ninja
- ninja
+ -DLLVM_MAIN_SRC_DIR="$srcdir/llvm-$pkgver.src"
+ cmake --build build
}
check() {
- cd "$builddir"/build
- # remove test that does not work with PaX kernel
- rm ../test/builtins/Unit/enable_execute_stack_test.c \
- ../test/builtins/Unit/clear_cache_test.c
- ninja check-compiler-rt
+ ninja -C build check-compiler-rt
}
package() {
- cd "$builddir"/build
-
- DESTDIR="$pkgdir" ninja install
-
- cd "$pkgdir"
-
- mkdir -p usr/lib/clang/$pkgver/lib
- case "$CARCH" in
- ppc64le | s390x) ;;
- *) mv usr/lib/linux usr/lib/clang/$pkgver/lib;;
- esac
+ DESTDIR="$pkgdir" cmake --install build
}
-sha512sums="708780aa47ef289a9700eb76c17cc1f3bab19b8245174e612b5f684c48448030263a72eeef1021b10bdffa6ace2df489adcbba9e7a790ccbcd5fe72056f63f92 compiler-rt-12.0.1.src.tar.xz
+sha512sums="
+708780aa47ef289a9700eb76c17cc1f3bab19b8245174e612b5f684c48448030263a72eeef1021b10bdffa6ace2df489adcbba9e7a790ccbcd5fe72056f63f92 compiler-rt-12.0.1.src.tar.xz
ff674afb4c8eea699a4756f1bb463f15098a7fa354c733de83c024f8f0cf238cd5f19ae3ec446831c7109235e293e2bf31d8562567ede163c8ec53af7306ba0f llvm-12.0.1.src.tar.xz
-b099dac8ab1da41a3bd12df1ceb2ff6a46e41a82db31f3444fdca1de1e0565131a612cd375e721f894a7da2df1a90a99b53c983b45914d18a8ee6f99a3ec563f disable-sanitizer-common.patch
-78181b4ea227f30c1c06d12059cf0746bd0ed430f5e2e9752eaa4d59bebc7ee5e3a78df167ff0fdf68562609e5f3ee8ab8a10fa76f42c9f0d5a6836853add6e7 replace-size_t-std-size-t.patch"
+1770e3c641dd7e6787471183ea2ace4543e2d4cf51df9612a28966d7414ef7f73b16fd46cec07a347c56a0c68c715659e554841aedf003b53c0997b2b6872936 fuzzer-size_t-musl.patch
+6b1b9b3f7bc2dc70f64f7e096b4b7b657f788271161721c4a49a7a7a86aeff5787b8bd3239666d7d1efa686429e1246588e6d4bac1c765f305d38349965c169a fix-arch-detection-for-ppc64le.patch
+8ed6746474f135ebf77a0888957126ef3a5ded97551632198cf15659104d792487920324b74569dfc46140d26f0a268e2378d6f8878c1c9013b8e6f199eeb3b7 xray-ppc64-musl.patch
+014951fa69792814f41cc5b3b412c2d3dcd9d1396d98a2b44eb304b13f238246fad94eb7ecd7c159788b7d3e4a1119f25a4dc2c33bc9330dd8800c6e1a586b43 sanitizer-supported-arch.patch
+cc109c684f30842043a2e4991ef0bea626bd0ea8108bbe41cd3fc8610fec70e2ae0b17763a7ba1868c97fe2b1d32d6042ed19a833a3444908d601f0c26cedb67 aarch64-ucontext.patch
+48d30e4f726949dbb5f3d3deb9b91dc1a73ab88f71534728233219327e1973619648690abd6e2f5fad041790dfc4d1db9aa9a58fa8f4c22160db80a6dd2a204e sanitizer-x86_64-execinfo.patch
+24064718e4bd48e2b57c9de94c2fe975f4ec9ae9bd635d542c06bc5d4c59e25a9bdaabbaf5cb5a5f3c9819d01c7a15b2e70aa7679d5bc1e7a52033e6f0bb107e sanitizer-ppc64-musl.patch
+"
diff --git a/main/compiler-rt/aarch64-ucontext.patch b/main/compiler-rt/aarch64-ucontext.patch
new file mode 100644
index 0000000000..8db80675e8
--- /dev/null
+++ b/main/compiler-rt/aarch64-ucontext.patch
@@ -0,0 +1,13 @@
+Patch-Source: https://github.com/void-linux/void-packages/blob/c907a54de30ad0b19fbf9f37d5b67cabe5c7744d/srcpkgs/llvm12/patches/compiler-rt-aarch64-ucontext.patch
+
+--- a/lib/sanitizer_common/sanitizer_linux.cpp
++++ b/lib/sanitizer_common/sanitizer_linux.cpp
+@@ -1799,7 +1799,7 @@
+
+ static bool Aarch64GetESR(ucontext_t *ucontext, u64 *esr) {
+ static const u32 kEsrMagic = 0x45535201;
+- u8 *aux = ucontext->uc_mcontext.__reserved;
++ u8 *aux = reinterpret_cast<u8 *>(ucontext->uc_mcontext.__reserved);
+ while (true) {
+ _aarch64_ctx *ctx = (_aarch64_ctx *)aux;
+ if (ctx->size == 0) break;
diff --git a/main/compiler-rt/disable-sanitizer-common.patch b/main/compiler-rt/disable-sanitizer-common.patch
deleted file mode 100644
index 0036c3acc0..0000000000
--- a/main/compiler-rt/disable-sanitizer-common.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Sanitizer code appears broken on arm and 32bit x86
---- a/cmake/config-ix.cmake
-+++ b/cmake/config-ix.cmake
-@@ -649,7 +649,7 @@
- (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|Fuchsia|SunOS" OR
- (OS_NAME MATCHES "Windows" AND NOT CYGWIN AND
- (NOT MINGW OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"))))
-- set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)
-+ set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)
- else()
- set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)
- endif()
diff --git a/main/compiler-rt/fix-arch-detection-for-ppc64le.patch b/main/compiler-rt/fix-arch-detection-for-ppc64le.patch
new file mode 100644
index 0000000000..c0bf709d44
--- /dev/null
+++ b/main/compiler-rt/fix-arch-detection-for-ppc64le.patch
@@ -0,0 +1,26 @@
+Patch-Source: https://src.fedoraproject.org/rpms/compiler-rt/blob/f35/f/0001-Fix-compiler-rt-arch-detection-for-ppc64le.patch
+From 72191190adea8e861e9a383b83799e7472b80e30 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Thu, 23 Sep 2021 18:06:41 -0700
+Subject: [PATCH] Fix compiler-rt arch detection for ppc64le
+
+---
+ compiler-rt/cmake/base-config-ix.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake
+index c11342e68813..3ca9dc0f5515 100644
+--- a/cmake/base-config-ix.cmake
++++ b/cmake/base-config-ix.cmake
+@@ -204,7 +204,7 @@ macro(test_targets)
+ test_target_arch(x86_64 "" "")
+ endif()
+ endif()
+- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "powerpc64le")
++ elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "powerpc64le|ppc64le")
+ test_target_arch(powerpc64le "" "-m64")
+ elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "powerpc")
+ if(CMAKE_SYSTEM_NAME MATCHES "AIX")
+--
+2.27.0
+
diff --git a/main/compiler-rt/fuzzer-size_t-musl.patch b/main/compiler-rt/fuzzer-size_t-musl.patch
new file mode 100644
index 0000000000..efc9d34aca
--- /dev/null
+++ b/main/compiler-rt/fuzzer-size_t-musl.patch
@@ -0,0 +1,28 @@
+Patch-Source: https://github.com/llvm/llvm-project/commit/60e32a1f34e9ea60155a98bbe6ee5ec2a383efa3
+From 60e32a1f34e9ea60155a98bbe6ee5ec2a383efa3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 13 Jun 2021 12:32:07 -0700
+Subject: [PATCH] [fuzzer] Fix build on musl
+
+cstddef is needed for size_t definition.
+(Multiple headers can provide size_t but none of them exists.)
+
+Reviewed By: MaskRay
+
+Differential Revision: https://reviews.llvm.org/D96213
+---
+ compiler-rt/lib/fuzzer/FuzzerInterceptors.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/compiler-rt/lib/fuzzer/FuzzerInterceptors.cpp b/compiler-rt/lib/fuzzer/FuzzerInterceptors.cpp
+index b87798603fda5..d5b0a42fd3fb4 100644
+--- a/lib/fuzzer/FuzzerInterceptors.cpp
++++ b/lib/fuzzer/FuzzerInterceptors.cpp
+@@ -25,6 +25,7 @@
+ }
+
+ #include <cassert>
++#include <cstddef> // for size_t
+ #include <cstdint>
+ #include <dlfcn.h> // for dlsym()
+
diff --git a/main/compiler-rt/replace-size_t-std-size-t.patch b/main/compiler-rt/replace-size_t-std-size-t.patch
deleted file mode 100644
index d18d91fb9f..0000000000
--- a/main/compiler-rt/replace-size_t-std-size-t.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- a/lib/fuzzer/FuzzerInterceptors.cpp
-+++ b/lib/fuzzer/FuzzerInterceptors.cpp
-@@ -59,8 +59,8 @@
- }
-
- static int internal_strcmp_strncmp(const char *s1, const char *s2, bool strncmp,
-- size_t n) {
-- size_t i = 0;
-+ std::size_t n) {
-+ std::size_t i = 0;
- while (true) {
- if (strncmp) {
- if (i == n)
-@@ -79,7 +79,7 @@
- return 0;
- }
-
--static int internal_strncmp(const char *s1, const char *s2, size_t n) {
-+static int internal_strncmp(const char *s1, const char *s2, std::size_t n) {
- return internal_strcmp_strncmp(s1, s2, true, n);
- }
-
-@@ -87,17 +87,17 @@
- return internal_strcmp_strncmp(s1, s2, false, 0);
- }
-
--static int internal_memcmp(const void *s1, const void *s2, size_t n) {
-+static int internal_memcmp(const void *s1, const void *s2, std::size_t n) {
- const uint8_t *t1 = static_cast<const uint8_t *>(s1);
- const uint8_t *t2 = static_cast<const uint8_t *>(s2);
-- for (size_t i = 0; i < n; ++i, ++t1, ++t2)
-+ for (std::size_t i = 0; i < n; ++i, ++t1, ++t2)
- if (*t1 != *t2)
- return *t1 < *t2 ? -1 : 1;
- return 0;
- }
-
--static size_t internal_strlen(const char *s) {
-- size_t i = 0;
-+static std::size_t internal_strlen(const char *s) {
-+ std::size_t i = 0;
- while (s[i])
- i++;
- return i;
-@@ -105,11 +105,11 @@
-
- static char *internal_strstr(const char *haystack, const char *needle) {
- // This is O(N^2), but we are not using it in hot places.
-- size_t len1 = internal_strlen(haystack);
-- size_t len2 = internal_strlen(needle);
-+ std::size_t len1 = internal_strlen(haystack);
-+ std::size_t len2 = internal_strlen(needle);
- if (len1 < len2)
- return nullptr;
-- for (size_t pos = 0; pos <= len1 - len2; pos++) {
-+ for (std::size_t pos = 0; pos <= len1 - len2; pos++) {
- if (internal_memcmp(haystack + pos, needle, len2) == 0)
- return const_cast<char *>(haystack) + pos;
- }
-@@ -121,11 +121,11 @@
- // Weak hooks forward-declared to avoid dependency on
- // <sanitizer/common_interface_defs.h>.
- void __sanitizer_weak_hook_memcmp(void *called_pc, const void *s1,
-- const void *s2, size_t n, int result);
-+ const void *s2, std::size_t n, int result);
- void __sanitizer_weak_hook_strncmp(void *called_pc, const char *s1,
-- const char *s2, size_t n, int result);
-+ const char *s2, std::size_t n, int result);
- void __sanitizer_weak_hook_strncasecmp(void *called_pc, const char *s1,
-- const char *s2, size_t n, int result);
-+ const char *s2, std::size_t n, int result);
- void __sanitizer_weak_hook_strcmp(void *called_pc, const char *s1,
- const char *s2, int result);
- void __sanitizer_weak_hook_strcasecmp(void *called_pc, const char *s1,
-@@ -134,20 +134,20 @@
- const char *s2, char *result);
- void __sanitizer_weak_hook_strcasestr(void *called_pc, const char *s1,
- const char *s2, char *result);
--void __sanitizer_weak_hook_memmem(void *called_pc, const void *s1, size_t len1,
-- const void *s2, size_t len2, void *result);
-+void __sanitizer_weak_hook_memmem(void *called_pc, const void *s1, std::size_t len1,
-+ const void *s2, std::size_t len2, void *result);
-
--DEFINE_REAL(int, bcmp, const void *, const void *, size_t)
--DEFINE_REAL(int, memcmp, const void *, const void *, size_t)
--DEFINE_REAL(int, strncmp, const char *, const char *, size_t)
-+DEFINE_REAL(int, bcmp, const void *, const void *, std::size_t)
-+DEFINE_REAL(int, memcmp, const void *, const void *, std::size_t)
-+DEFINE_REAL(int, strncmp, const char *, const char *, std::size_t)
- DEFINE_REAL(int, strcmp, const char *, const char *)
--DEFINE_REAL(int, strncasecmp, const char *, const char *, size_t)
-+DEFINE_REAL(int, strncasecmp, const char *, const char *, std::size_t)
- DEFINE_REAL(int, strcasecmp, const char *, const char *)
- DEFINE_REAL(char *, strstr, const char *, const char *)
- DEFINE_REAL(char *, strcasestr, const char *, const char *)
--DEFINE_REAL(void *, memmem, const void *, size_t, const void *, size_t)
-+DEFINE_REAL(void *, memmem, const void *, std::size_t, const void *, std::size_t)
-
--ATTRIBUTE_INTERFACE int bcmp(const char *s1, const char *s2, size_t n) {
-+ATTRIBUTE_INTERFACE int bcmp(const char *s1, const char *s2, std::size_t n) {
- if (!FuzzerInited)
- return internal_memcmp(s1, s2, n);
- int result = REAL(bcmp)(s1, s2, n);
-@@ -155,7 +155,7 @@
- return result;
- }
-
--ATTRIBUTE_INTERFACE int memcmp(const void *s1, const void *s2, size_t n) {
-+ATTRIBUTE_INTERFACE int memcmp(const void *s1, const void *s2, std::size_t n) {
- if (!FuzzerInited)
- return internal_memcmp(s1, s2, n);
- int result = REAL(memcmp)(s1, s2, n);
-@@ -163,7 +163,7 @@
- return result;
- }
-
--ATTRIBUTE_INTERFACE int strncmp(const char *s1, const char *s2, size_t n) {
-+ATTRIBUTE_INTERFACE int strncmp(const char *s1, const char *s2, std::size_t n) {
- if (!FuzzerInited)
- return internal_strncmp(s1, s2, n);
- int result = REAL(strncmp)(s1, s2, n);
-@@ -179,7 +179,7 @@
- return result;
- }
-
--ATTRIBUTE_INTERFACE int strncasecmp(const char *s1, const char *s2, size_t n) {
-+ATTRIBUTE_INTERFACE int strncasecmp(const char *s1, const char *s2, std::size_t n) {
- ensureFuzzerInited();
- int result = REAL(strncasecmp)(s1, s2, n);
- __sanitizer_weak_hook_strncasecmp(GET_CALLER_PC(), s1, s2, n, result);
-@@ -209,7 +209,7 @@
- }
-
- ATTRIBUTE_INTERFACE
--void *memmem(const void *s1, size_t len1, const void *s2, size_t len2) {
-+void *memmem(const void *s1, std::size_t len1, const void *s2, std::size_t len2) {
- ensureFuzzerInited();
- void *result = REAL(memmem)(s1, len1, s2, len2);
- __sanitizer_weak_hook_memmem(GET_CALLER_PC(), s1, len1, s2, len2, result);
diff --git a/main/compiler-rt/sanitizer-ppc64-musl.patch b/main/compiler-rt/sanitizer-ppc64-musl.patch
new file mode 100644
index 0000000000..a4d1d38ed7
--- /dev/null
+++ b/main/compiler-rt/sanitizer-ppc64-musl.patch
@@ -0,0 +1,37 @@
+Patch-Source: https://github.com/void-linux/void-packages/blob/c907a54de30ad0b19fbf9f37d5b67cabe5c7744d/srcpkgs/llvm12/patches/compiler-rt-sanitizer-ppc64-musl.patch
+
+--- a/lib/sanitizer_common/sanitizer_linux.cpp
++++ b/lib/sanitizer_common/sanitizer_linux.cpp
+@@ -74,6 +74,10 @@
+ #include <sys/utsname.h>
+ #endif
+
++#if SANITIZER_LINUX && defined(__powerpc__)
++#include <asm/ptrace.h>
++#endif
++
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ #include <sys/personality.h>
+ #endif
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -92,7 +92,7 @@
+ # include <utime.h>
+ # include <sys/ptrace.h>
+ #if defined(__mips64) || defined(__aarch64__) || defined(__arm__) || \
+- SANITIZER_RISCV64
++ defined(__powerpc__) || SANITIZER_RISCV64
+ # include <asm/ptrace.h>
+ # ifdef __arm__
+ typedef struct user_fpregs elf_fpregset_t;
+--- a/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp
++++ b/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp
+@@ -31,7 +31,7 @@
+ #include <sys/types.h> // for pid_t
+ #include <sys/uio.h> // for iovec
+ #include <elf.h> // for NT_PRSTATUS
+-#if (defined(__aarch64__) || SANITIZER_RISCV64) && !SANITIZER_ANDROID
++#if (defined(__aarch64__) || defined(__powerpc__) || SANITIZER_RISCV64) && !SANITIZER_ANDROID
+ // GLIBC 2.20+ sys/user does not include asm/ptrace.h
+ # include <asm/ptrace.h>
+ #endif
diff --git a/main/compiler-rt/sanitizer-supported-arch.patch b/main/compiler-rt/sanitizer-supported-arch.patch
new file mode 100644
index 0000000000..bbb51c4781
--- /dev/null
+++ b/main/compiler-rt/sanitizer-supported-arch.patch
@@ -0,0 +1,15 @@
+Sanitizer code is broken on armhf, armv7, s390x, x86, and probably riscv64,
+i.e. enable it only on x86_64, aarch64, and ppc64le.
+
+--- a/cmake/config-ix.cmake
++++ b/cmake/config-ix.cmake
+@@ -295,8 +295,7 @@
+ set(X86_64 x86_64 x86_64h)
+ endif()
+
+-set(ALL_SANITIZER_COMMON_SUPPORTED_ARCH ${X86} ${X86_64} ${PPC64} ${RISCV64}
+- ${ARM32} ${ARM64} ${MIPS32} ${MIPS64} ${S390X} ${SPARC} ${SPARCV9})
++set(ALL_SANITIZER_COMMON_SUPPORTED_ARCH ${X86_64} ${PPC64} ${ARM64})
+ set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${RISCV64}
+ ${MIPS32} ${MIPS64} ${PPC64} ${S390X} ${SPARC} ${SPARCV9})
+ set(ALL_CRT_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${RISCV32} ${RISCV64} ${VE})
diff --git a/main/compiler-rt/sanitizer-x86_64-execinfo.patch b/main/compiler-rt/sanitizer-x86_64-execinfo.patch
new file mode 100644
index 0000000000..e83bcdf360
--- /dev/null
+++ b/main/compiler-rt/sanitizer-x86_64-execinfo.patch
@@ -0,0 +1,17 @@
+Some sanitizers needs backtrace on x86_64
+
+This has been ported from https://github.com/void-linux/void-packages/blob/c907a54de30ad0b19fbf9f37d5b67cabe5c7744d/srcpkgs/llvm12/template#L126
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -424,6 +424,10 @@
+ append_list_if(COMPILER_RT_HAS_NODEFAULTLIBS_FLAG -nodefaultlibs SANITIZER_COMMON_LINK_FLAGS)
+ append_list_if(COMPILER_RT_HAS_Z_TEXT -Wl,-z,text SANITIZER_COMMON_LINK_FLAGS)
+
++if("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "x86_64")
++ list(APPEND SANITIZER_COMMON_LINK_LIBS execinfo)
++endif()
++
+ if (COMPILER_RT_USE_BUILTINS_LIBRARY)
+ string(REPLACE "-Wl,-z,defs" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+ else()
diff --git a/main/compiler-rt/xray-ppc64-musl.patch b/main/compiler-rt/xray-ppc64-musl.patch
new file mode 100644
index 0000000000..d1c55ba195
--- /dev/null
+++ b/main/compiler-rt/xray-ppc64-musl.patch
@@ -0,0 +1,63 @@
+Patch-Source: https://github.com/void-linux/void-packages/blob/c907a54de30ad0b19fbf9f37d5b67cabe5c7744d/srcpkgs/llvm12/patches/compiler-rt-xray-ppc64-musl.patch
+--- a/lib/xray/xray_powerpc64.inc
++++ b/lib/xray/xray_powerpc64.inc
+@@ -12,7 +12,13 @@
+
+ #include <cstdint>
+ #include <mutex>
++#ifdef __GLIBC__
+ #include <sys/platform/ppc.h>
++#else
++#include <cctype>
++#include <cstring>
++#include <cstdlib>
++#endif
+
+ #include "xray_defs.h"
+
+@@ -20,13 +26,45 @@ namespace __xray {
+
+ ALWAYS_INLINE uint64_t readTSC(uint8_t &CPU) XRAY_NEVER_INSTRUMENT {
+ CPU = 0;
++#ifdef __GLIBC__
+ return __ppc_get_timebase();
++#else
++ return __builtin_ppc_get_timebase();
++#endif
+ }
+
+ inline uint64_t getTSCFrequency() XRAY_NEVER_INSTRUMENT {
+ static std::mutex M;
+ std::lock_guard<std::mutex> Guard(M);
++#ifdef __GLIBC__
+ return __ppc_get_timebase_freq();
++#else
++ /* FIXME: a less dirty implementation? */
++ static uint64_t base;
++ if (!base) {
++ FILE *f = fopen("/proc/cpuinfo", "rb");
++ if (f) {
++ ssize_t nr;
++ /* virtually always big enough to hold the line */
++ char buf[512];
++ while (fgets(buf, sizeof(buf), f)) {
++ char *ret = strstr(buf, "timebase");
++ if (!ret) {
++ continue;
++ }
++ ret += sizeof("timebase") - 1;
++ ret = strchr(ret, ':');
++ if (!ret) {
++ continue;
++ }
++ base = strtoul(ret + 1, nullptr, 10);
++ break;
++ }
++ fclose(f);
++ }
++ }
++ return base;
++#endif
+ }
+
+ inline bool probeRequiredCPUFeatures() XRAY_NEVER_INSTRUMENT {
diff --git a/main/conky/APKBUILD b/main/conky/APKBUILD
index db9c92da60..bebff925af 100644
--- a/main/conky/APKBUILD
+++ b/main/conky/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=conky
pkgver=1.12.2
-pkgrel=0
+pkgrel=1
pkgdesc="An advanced, highly configurable system monitor for X based on torsmo"
url="http://conky.sourceforge.net/"
arch="all"
@@ -23,7 +23,7 @@ prepare() {
build() {
cmake . \
-DRELEASE=ON \
- -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_CURL=ON \
-DBUILD_XDBE=ON \
diff --git a/main/coreutils/APKBUILD b/main/coreutils/APKBUILD
index 4f888be8aa..c48ba6e74a 100644
--- a/main/coreutils/APKBUILD
+++ b/main/coreutils/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=coreutils
pkgver=9.0
-pkgrel=2
+pkgrel=3
pkgdesc="The basic file, shell and text manipulation utilities"
url="https://www.gnu.org/software/coreutils/"
arch="all"
@@ -68,5 +68,5 @@ check() {
sha512sums="
9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03 coreutils-9.0.tar.xz
-9f86dacb9c429bb0873e68f3e7b185ac8fa54f801dd00e532b01719a919e5c22ec706c58a4da4196f68f46fcd5589afc09028680ad34f89d1c16eae6e679aeca fix-chmod-exit-code.patch
+1ab7c4c7596efffb6b28a816b3d66da270bc0ec35bcbc8b49f5dd08d3d3000a67bb203e955510aabfec214c6b6470ac325063873134c58859c6af2433a4617b3 fix-chmod-exit-code.patch
"
diff --git a/main/coreutils/fix-chmod-exit-code.patch b/main/coreutils/fix-chmod-exit-code.patch
index 42237ad677..f00138ed00 100644
--- a/main/coreutils/fix-chmod-exit-code.patch
+++ b/main/coreutils/fix-chmod-exit-code.patch
@@ -57,55 +57,6 @@ index 37b04f500..57ac47f33 100644
}
/* Recursively change the modes of the specified FILES (the last entry
-diff --git a/tests/chmod/ignore-symlink.sh b/tests/chmod/ignore-symlink.sh
-new file mode 100755
-index 000000000..5ce3de816
---- /dev/null
-+++ b/tests/chmod/ignore-symlink.sh
-@@ -0,0 +1,31 @@
-+#!/bin/sh
-+# Test for proper exit code of chmod on a processed symlink.
-+
-+# Copyright (C) 2021 Free Software Foundation, Inc.
-+
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program. If not, see <https://www.gnu.org/licenses/>.
-+
-+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-+print_ver_ chmod
-+
-+mkdir dir || framework_failure_
-+touch dir/f || framework_failure_
-+ln -s f dir/l || framework_failure_
-+
-+# This operation ignores symlinks but should succeed.
-+chmod u+w -R dir 2> out || fail=1
-+
-+compare /dev/null out || fail=1
-+
-+Exit $fail
-diff --git a/tests/local.mk b/tests/local.mk
-index 228d0e368..b5b893fb7 100644
---- a/tests/local.mk
-+++ b/tests/local.mk
-@@ -456,6 +456,7 @@ all_tests = \
- tests/chmod/c-option.sh \
- tests/chmod/equal-x.sh \
- tests/chmod/equals.sh \
-+ tests/chmod/ignore-symlink.sh \
- tests/chmod/inaccessible.sh \
- tests/chmod/octal.sh \
- tests/chmod/setgid.sh \
--
cgit v1.2.1
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index 28da200842..4a0dbb4d23 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -1,13 +1,13 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cryptsetup
-pkgver=2.4.1 # XXX: remove automake/autoconf when upgrading to 2.5.0
+pkgver=2.4.3
pkgrel=0
pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
url="https://gitlab.com/cryptsetup/cryptsetup"
arch="all"
license="GPL-2.0-or-later WITH OpenSSL-Exception"
-makedepends_build="automake autoconf bash coreutils"
+makedepends_build="bash coreutils"
makedepends_host="lvm2-dev openssl1.1-compat-dev popt-dev util-linux-dev
json-c-dev argon2-dev"
makedepends="$makedepends_build $makedepends_host"
@@ -21,6 +21,8 @@ source="https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/cryptset
"
# secfixes:
+# 2.4.3-r0:
+# - CVE-2021-4122
# 2.3.4-r0:
# - CVE-2020-14382
@@ -66,7 +68,7 @@ libs() {
}
sha512sums="
-b12589181e48c8ae7e95fa7d0642caa479a0000c76ac4c2f9dcacb9319512f0c079d037c6fe596639481a62b6290dd7d0bf826ac5e096c526435a8241386fe0e cryptsetup-2.4.1.tar.gz
+a6c8a33e62853fd5757239b5ec3529bd7d994c6d70db65188b7bd121ee59347a89b57f72d5ebdf521027f5a00951db2fb8acfcbbf1902e8697b006c4fe13c9f2 cryptsetup-2.4.3.tar.gz
a3ca3e648749136ee724692b61488cd855f118eb93435942c2b04964a34fe49d0f0da4ef64cd2531c1c0f650e77808cf5d802789fd7664398248ead668bb35e5 dmcrypt.initd
74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 dmcrypt.confd
529187851def5fbc08e995eba90d3f013f1cf8469dcb9344f83d1e3c73c71467ca4ed62c8282ec27ebfa30ccc33653fdd1aea8d1d80e1ac4293d51865c9a6200 flush-stdout.patch
diff --git a/main/ctags/APKBUILD b/main/ctags/APKBUILD
index 279a39e700..6aa1ca2c53 100644
--- a/main/ctags/APKBUILD
+++ b/main/ctags/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=ctags
-pkgver=5.9.20211010.0
+pkgver=5.9.20220109.0
_realver="p$pkgver"
pkgrel=0
pkgdesc="Generator of tags for all types of C/C++ languages"
@@ -51,6 +51,6 @@ package() {
}
sha512sums="
-c3a417682d9e95b98724c758e91b5ef0a3551aad09745681b2fdcafb92b8c2871094144853c7fbeb62aac3c6fd3d88e290a328079c0ec5f8db1277f20dd85fed ctags-5.9.20211010.0.tar.gz
+14fd409712630690b31a2acae580d76507fda3627d48c00be16f94da8e7a9460e68190b861c9734b6d43ac2c116d59a427d52909b2e24337d3948f58853f8972 ctags-5.9.20220109.0.tar.gz
185b0647ddaba90ae386c40d75cd8cf8613a89b4d1d0d0905eb78ba3afad57cf273ab2d826053e49d22278f9d3cec97780c8f15aef13c7582658ca24708abf14 disable-check-genfile.patch
"
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index 6326795468..ccd7be62b7 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cups
-pkgver=2.3.3
-pkgrel=4
+pkgver=2.4.0
+pkgrel=0
pkgdesc="The CUPS Printing System"
url="https://www.cups.org/"
arch="all"
@@ -133,10 +133,10 @@ _mv() {
}
sha512sums="
-5a43ef98f83c1783221155c01de940f3679023251709931ef28572c7b00620b36252afe894e86f2f08a527008dc2c95dc8af4129f0ab28a28663be8d3ccc3418 cups-2.3.3.tar.gz
+09a99efbc47a8afbb5c76ff8b0949248439eaf79c8c278dd39018e8c5480d235fb6df8d4ce8230051e0bb5c661295b3b514966d19a55c6e0d0407bff9626af64 cups-2.4.0.tar.gz
cf64211da59e79285f99d437c02fdd7db462855fb2920ec9563ba47bd8a9e5cbd10555094940ceedeb41ac805c4f0ddb9147481470112a11a76220d0298aef79 cups.logrotate
2c2683f755a220166b3a1653fdd1a6daa9718c8f0bbdff2e2d5e61d1133306260d63a83d3ff41619b5cf84c4913fae5822b79553e2822858f38fa3613f4c7082 cupsd.initd
-7a8cd9ac33b0dd4627c72df4275db8ccd7cf8e201bce3833719b42f532f526bb347b842e3ea1ef0d61855b5c6e1088b5d20b68942f2c2c0acf504d8d9728efd3 cups-no-export-ssllibs.patch
-f9f465c0a0125e15d969e4992e94657277211045b393247808b028ba5f8e010f753b750b7a01e4272da03188955866cbe6db1970fc865f883e8377a7e432ba65 cups-nostrip.patch
-ac1ec4453d6a4b641d40089c77d3b776963d90efb092851c8d93deceb6068b111dee71171967ffb7ad0f5adb424398a43f51feb7d5d9734287cfb9e419efaa93 default-config-no-gssapi.patch
+148eb01f0861e1cd0861a174a5c5262c49b079b27b972b4e90656b9b9357ec710e861604c30e897818f550e9c1cdcefcd8c8bc955ba4a333902a74cdd8dfb5a6 cups-no-export-ssllibs.patch
+7b2f1212b009d4e005eaf4fc288413bde57aff4ca664173202163e8f18be1ddc72c26ec84576a4850d63b08c6ce5948d57c77e81c4f4c85032d7ef7530b1eb81 cups-nostrip.patch
+c492f5e20a1bb73cf6bed86d0343659e839df4003aa1409bf608dd3ff05694d1e06ba26fd3786385d2c96dd668485dcef6cfee7f908416a2b125a8e30e82e670 default-config-no-gssapi.patch
"
diff --git a/main/cups/cups-no-export-ssllibs.patch b/main/cups/cups-no-export-ssllibs.patch
index e227bd1823..652fd6ad36 100644
--- a/main/cups/cups-no-export-ssllibs.patch
+++ b/main/cups/cups-no-export-ssllibs.patch
@@ -1,12 +1,10 @@
-diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4
---- cups-1.6.2/config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200
-+++ cups-1.6.2/config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200
-@@ -180,7 +180,7 @@
- AC_SUBST(SSLFLAGS)
- AC_SUBST(SSLLIBS)
+diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-tls.m4
+--- cups-1.6.2/config-scripts/cups-tls.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200
++++ cups-1.6.2/config-scripts/cups-tls.m4 2011-05-23 17:47:27.000000000 +0200
+@@ -107,5 +107,5 @@
+ AC_SUBST([TLSFLAGS])
+ AC_SUBST([TLSLIBS])
--EXPORT_SSLLIBS="$SSLLIBS"
-+EXPORT_SSLLIBS=""
- AC_SUBST(EXPORT_SSLLIBS)
-
- dnl
+-EXPORT_TLSLIBS="$TLSLIBS"
++EXPORT_TLSLIBS=""
+ AC_SUBST([EXPORT_TLSLIBS])
diff --git a/main/cups/cups-nostrip.patch b/main/cups/cups-nostrip.patch
index 62b3ce2344..f689368e77 100644
--- a/main/cups/cups-nostrip.patch
+++ b/main/cups/cups-nostrip.patch
@@ -1,29 +1,28 @@
diff -ru a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
--- a/config-scripts/cups-compiler.m4 2020-04-27 14:04:29.000000000 -0400
+++ b/config-scripts/cups-compiler.m4 2021-08-06 20:53:29.316010169 -0400
-@@ -9,9 +9,6 @@
+@@ -11,9 +11,6 @@
dnl Clear the debugging and non-shared library options unless the user asks
dnl for them...
-INSTALL_STRIP=""
-AC_SUBST(INSTALL_STRIP)
-
- AC_ARG_WITH(optim, [ --with-optim set optimization flags ],
- OPTIM="$withval",
- OPTIM="")
-@@ -25,8 +22,6 @@
- dnl For debugging, keep symbols, otherwise strip them...
- if test x$enable_debug = xyes -a "x$OPTIM" = x; then
- OPTIM="-g"
--else
-- INSTALL_STRIP="-s"
- fi
+ AC_ARG_WITH([optim], AS_HELP_STRING([--with-optim], [set optimization flags]), [
+ OPTIM="$withval"
+ ], [
+@@ -31,7 +28,6 @@
+ AS_IF([test x$enable_debug = xyes -a "x$OPTIM" = x], [
+ OPTIM="-g"
+ ], [
+- INSTALL_STRIP="-s"
+ ])
dnl Debug printfs can slow things down, so provide a separate option for that
diff -ru a/configure b/configure
--- a/configure 2020-04-27 14:04:29.000000000 -0400
+++ b/configure 2021-08-06 20:54:01.585892266 -0400
-@@ -694,7 +694,6 @@
+@@ -726,7 +726,6 @@
ARCHFLAGS
UNITTESTS
OPTIM
@@ -31,7 +30,7 @@ diff -ru a/configure b/configure
LIBTOOL_INSTALL
LIBTOOL_CXX
LIBTOOL_CC
-@@ -6662,7 +6661,6 @@
+@@ -7902,7 +7901,6 @@
@@ -39,19 +38,21 @@ diff -ru a/configure b/configure
-@@ -6698,8 +6696,6 @@
+@@ -7956,10 +7954,6 @@
+
+ OPTIM="-g"
- if test x$enable_debug = xyes -a "x$OPTIM" = x; then
- OPTIM="-g"
--else
-- INSTALL_STRIP="-s"
+-else $as_nop
+-
+- INSTALL_STRIP="-s"
+-
fi
- if test x$enable_debug_printfs = xyes; then
+ if test x$enable_debug_printfs = xyes
diff -ru a/Makedefs.in b/Makedefs.in
--- a/Makedefs.in 2020-04-27 14:04:29.000000000 -0400
+++ b/Makedefs.in 2021-08-06 20:53:42.565961754 -0400
-@@ -45,12 +45,12 @@
+@@ -46,12 +46,12 @@
# Installation programs...
#
@@ -65,4 +66,3 @@ diff -ru a/Makedefs.in b/Makedefs.in
+INSTALL_LIB = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
INSTALL_MAN = $(INSTALL) -c -m 444
INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
-
diff --git a/main/cups/default-config-no-gssapi.patch b/main/cups/default-config-no-gssapi.patch
index d35772e29f..54c75bce20 100644
--- a/main/cups/default-config-no-gssapi.patch
+++ b/main/cups/default-config-no-gssapi.patch
@@ -3,7 +3,7 @@ Reason: Sets config defaults for Alpine
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
-@@ -145,12 +145,12 @@
+@@ -154,12 +154,12 @@
# Job-related operations must be done by the owner or an administrator...
<Limit Create-Job Print-Job Print-URI Validate-Job>
@@ -18,7 +18,7 @@ Reason: Sets config defaults for Alpine
Require user @OWNER @SYSTEM
Order deny,allow
</Limit>
-@@ -171,7 +171,7 @@
+@@ -180,7 +180,7 @@
# Only the owner or an administrator can cancel or authenticate a job...
<Limit Cancel-Job CUPS-Authenticate-Job>
diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD
index 5cc761cff1..0ec23beb57 100644
--- a/main/curl/APKBUILD
+++ b/main/curl/APKBUILD
@@ -8,7 +8,7 @@
# this aport from arch=all WILL be reverted.
pkgname=curl
-pkgver=7.79.1
+pkgver=7.81.0
pkgrel=0
pkgdesc="URL retrival utility and library"
url="https://curl.se/"
@@ -164,5 +164,5 @@ static() {
}
sha512sums="
-1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d curl-7.79.1.tar.xz
+38355aaee38db04bb2babdc5fd7a88284580c836d15df754f42b104997dd344b7841be8e53b4fc91aea31db170a7d6967c4976833eb4bfe0d265c7275c4800df curl-7.81.0.tar.xz
"
diff --git a/main/cython/APKBUILD b/main/cython/APKBUILD
index e098d9c9cb..8fdabff4f0 100644
--- a/main/cython/APKBUILD
+++ b/main/cython/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Oleg Titov <oleg.titov@gmail.com>
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=cython
-pkgver=0.29.23
-pkgrel=0
+pkgver=0.29.24
+pkgrel=1
pkgdesc="Cython is an optimising static compiler for both the Python & the extended Cython programming languages."
url="https://cython.org/"
arch="all"
@@ -11,7 +11,8 @@ license="Apache-2.0"
makedepends="py3-setuptools python3-dev"
depends="python3"
subpackages="cython-doc"
-source="cython-$pkgver.tar.gz::https://github.com/cython/cython/archive/$pkgver.tar.gz"
+source="cython-$pkgver.tar.gz::https://github.com/cython/cython/archive/$pkgver.tar.gz
+cython-test-fix.patch"
# compatible fix for removing dev subpkg from apkbuild
# cython is not a library but a compiler and does not need a dev subpackage
@@ -33,5 +34,6 @@ package() {
}
sha512sums="
-093b7a1d5c68f6e2d2b9b8adb9ac99e8967ddd0a66c0513a78e88bd55d96533dd8352b2478554fb53bf32a72d730967fb08ccb2eaa462da68f86891dceb4925a cython-0.29.23.tar.gz
+387a827f3cb7428248019744e3ed606a133d98ac882b83624d24ae0fdf8a8f2334978555d7d84e5cc4adaf715c541fef64e45bcbdda85ca33473c21f99360be8 cython-0.29.24.tar.gz
+6a924351d54636edf5c65309c285a7298a6b25d28a81812c636fd16901471b4d9522f271ec28c2e03c0a48fa926aa52bfbe60bf4cb80073d7837b81828a7220c cython-test-fix.patch
"
diff --git a/main/cython/cython-test-fix.patch b/main/cython/cython-test-fix.patch
new file mode 100644
index 0000000000..58ddce13c3
--- /dev/null
+++ b/main/cython/cython-test-fix.patch
@@ -0,0 +1,23 @@
+From 9bc0abecb3a08ea13313200a51f1ee26a65e5be3 Mon Sep 17 00:00:00 2001
+From: Stefan Behnel <stefan_ml@behnel.de>
+Date: Sat, 3 Apr 2021 08:23:44 +0200
+Subject: [PATCH] Make a helper function in a C++ test correctly propagate
+ exceptions so that it won't have to spit out compiler warnings.
+
+---
+ tests/run/cpp_stl_conversion.pyx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/run/cpp_stl_conversion.pyx b/tests/run/cpp_stl_conversion.pyx
+index 5278c677ae..ccebc700ee 100644
+--- a/tests/run/cpp_stl_conversion.pyx
++++ b/tests/run/cpp_stl_conversion.pyx
+@@ -15,7 +15,7 @@ py_set = set
+ py_xrange = xrange
+ py_unicode = unicode
+
+-cdef string add_strings(string a, string b):
++cdef string add_strings(string a, string b) except *:
+ return a + b
+
+ def normalize(bytes b):
diff --git a/main/czmq/APKBUILD b/main/czmq/APKBUILD
index f007ea70ac..49ddff9a95 100644
--- a/main/czmq/APKBUILD
+++ b/main/czmq/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=czmq
pkgver=4.2.1
-pkgrel=0
+pkgrel=1
pkgdesc="High-level C binding for ZeroMQ"
url="http://czmq.zeromq.org/"
arch="all !s390x" # zproxy test timeouts on s390x
@@ -21,7 +21,7 @@ build() {
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
cmake -B build \
- -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_VERBOSE_MAKEFILE=ON \
$CMAKE_CROSSOPTS .
diff --git a/main/d-feet/APKBUILD b/main/d-feet/APKBUILD
index 1077f26714..8985c4f9fb 100644
--- a/main/d-feet/APKBUILD
+++ b/main/d-feet/APKBUILD
@@ -3,7 +3,7 @@
pkgname=d-feet
pkgver=0.3.16
_v=${pkgver%.*}
-pkgrel=0
+pkgrel=1
pkgdesc="powerful D-Bus Debugger"
options="!check" # Testsuite loops infinitely
url="https://wiki.gnome.org/action/show/Apps/DFeet"
diff --git a/main/dahdi-linux-lts/APKBUILD b/main/dahdi-linux-lts/APKBUILD
index d50185c6ba..52615a1bfe 100644
--- a/main/dahdi-linux-lts/APKBUILD
+++ b/main/dahdi-linux-lts/APKBUILD
@@ -9,7 +9,7 @@ _rel=0
_flavor=${FLAVOR:-lts}
_kpkg=linux-$_flavor
-_kver=5.10.75
+_kver=5.15.15
_krel=0
_kpkgver="$_kver-r$_krel"
diff --git a/main/dbus/APKBUILD b/main/dbus/APKBUILD
index c1a9a270c7..bd70047468 100644
--- a/main/dbus/APKBUILD
+++ b/main/dbus/APKBUILD
@@ -1,31 +1,35 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dbus
pkgver=1.12.20
-pkgrel=2
+pkgrel=4
pkgdesc="Freedesktop.org message bus system"
-options="!check" # Introduces circular dependency with xorg-server (xvfb-run -> xvfb)
url="https://www.freedesktop.org/Software/dbus"
-pkggroups="messagebus"
arch="all"
license="AFL-2.1 OR GPL-2.0-or-later"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-x11 $pkgname-openrc"
-triggers="$pkgname.trigger=/usr/share/dbus-1/system.d"
depends_dev="util-linux-dev"
makedepends="$depends_dev
- autoconf automake libtool autoconf-archive
+ autoconf
+ autoconf-archive
+ automake
expat-dev
glib-dev
libsm-dev
+ libtool
libx11-dev
xmlto
"
checkdepends="xvfb-run"
+pkggroups="messagebus"
install="$pkgname.pre-install $pkgname.post-install"
+triggers="$pkgname.trigger=/usr/share/dbus-1/system.d"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-x11 $pkgname-openrc"
source="https://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz
0001-_dbus_generate_random_bytes-use-getrandom-2.patch
avoid-opendir-between-fork-exec.patch
$pkgname.initd
+ $pkgname.confd
"
+options="!check" # introduces circular dependency with xorg-server (xvfb-run -> xvfb)
# secfixes:
# 1.12.18-r0:
@@ -39,7 +43,6 @@ prepare() {
}
build() {
- cd "$srcdir"/$pkgname-$pkgver
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -48,7 +51,7 @@ build() {
--localstatedir=/var \
--with-xml=expat \
--with-dbus-user=messagebus \
- --with-system-pid-file=/var/run/dbus.pid \
+ --with-system-pid-file=/run/dbus/dbus.pid \
--disable-verbose-mode \
--disable-static \
--enable-inotify \
@@ -67,27 +70,31 @@ check() {
}
package() {
- cd "$srcdir"/$pkgname-$pkgver
make -j1 DESTDIR="$pkgdir" install
- install -Dm755 "$srcdir"/dbus.initd "$pkgdir"/etc/init.d/dbus
rm -rf "$pkgdir"/usr/lib/systemd
+
+ install -Dm755 "$srcdir"/dbus.initd "$pkgdir"/etc/init.d/dbus
+ install -Dm644 "$srcdir"/dbus.confd "$pkgdir"/etc/conf.d/dbus
}
libs() {
pkgdesc="D-BUS access libraries"
replaces="dbus"
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/
+
+ amove usr/lib/lib*.so.*
}
x11() {
pkgdesc="X11 add-ons for D-BUS"
depends="dbus=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/dbus-launch "$subpkgdir"/usr/bin/
+
+ amove usr/bin/dbus-launch
}
-sha512sums="0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056 dbus-1.12.20.tar.gz
+sha512sums="
+0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056 dbus-1.12.20.tar.gz
3db35499361e84d8e2469b88b033f49813b179188ac25f1841a989988c352af398a56dfd94383813626c6dfd032194f7a9fcdba001ccc3e005e7cd22dae7a7ed 0001-_dbus_generate_random_bytes-use-getrandom-2.patch
cdd01f51882be4f388515441237aa6318888db6e88a4d980bafbf9b790945e4d959c6633d6d002274c0a617ac919f9355ba628c9b502b355f73fed602f997791 avoid-opendir-between-fork-exec.patch
-4c6beba2382416e60a3adfa85ef843d90d93ca5f38c23f573e058ffca6d4fc3850d11d40938c74383bba61599569b7fdfb1fcf3b9d2f1463e6b2e2cc81097c84 dbus.initd"
+0db5c0804b5aa19c8d7e517b1c6d11b9b52d96477d4d26769c01a31765491ff12897b5634455ee57d978ea30e2d71c5df5ed3eecd5435983d8ab1128ff516315 dbus.initd
+3f063efa672a900ed04bc7224ba31b3ced91bb98ae096a3ce12552a0b6e2c38ddb445edb4876518f9be4140a5d901dc62080e95aab4346d89dbf329ebec33cb3 dbus.confd
+"
diff --git a/main/dbus/dbus.confd b/main/dbus/dbus.confd
new file mode 100644
index 0000000000..0454047545
--- /dev/null
+++ b/main/dbus/dbus.confd
@@ -0,0 +1,7 @@
+# Configuration for /etc/init.d/dbus
+
+# Additional arguments to pass to dbus-daemon.
+#command_args=
+
+# Uncomment to use process supervisor.
+#supervisor=supervise-daemon
diff --git a/main/dbus/dbus.initd b/main/dbus/dbus.initd
index 2fbd3e5464..f3f44da50a 100644
--- a/main/dbus/dbus.initd
+++ b/main/dbus/dbus.initd
@@ -1,32 +1,27 @@
#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-supervisor=supervise-daemon
-
name="System Message Bus"
description="D-Bus System Message Bus"
-command="/usr/bin/dbus-daemon"
-command_args="--system"
-command_args_foreground="--nofork"
-
extra_started_commands="reload"
+command="/usr/bin/dbus-daemon"
+command_args="--system --nofork --nopidfile --syslog-only ${command_args:-}"
+command_background="yes"
+pidfile="/run/$RC_SVCNAME.pid"
+
depend() {
need localmount
after bootmisc
}
start_pre() {
- /usr/bin/dbus-uuidgen --ensure=/etc/machine-id
+ checkpath -d -m755 -o root:messagebus /run/dbus || return 1
- # We need to test if /var/run/dbus exists, since script will fail if it does not
- [ -e /var/run/dbus ] || mkdir /var/run/dbus
+ /usr/bin/dbus-uuidgen --ensure=/etc/machine-id
}
stop_post() {
- [ ! -S /var/run/dbus/system_bus_socket ] || rm -f /var/run/dbus/system_bus_socket
+ [ ! -S /run/dbus/system_bus_socket ] || rm -f /run/dbus/system_bus_socket
}
reload() {
diff --git a/main/dconf/APKBUILD b/main/dconf/APKBUILD
index 3f386bb648..54e64f27f6 100644
--- a/main/dconf/APKBUILD
+++ b/main/dconf/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=dconf
pkgver=0.40.0
-pkgrel=0
+pkgrel=1
pkgdesc="low-level configuration system"
url="https://wiki.gnome.org/Projects/dconf"
arch="all"
diff --git a/main/ddate/APKBUILD b/main/ddate/APKBUILD
index 20541104b6..974dbd8b56 100644
--- a/main/ddate/APKBUILD
+++ b/main/ddate/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Johannes Matheis <jomat+alpinebuild@jmt.gr>
pkgname=ddate
pkgver=0.2.2
-pkgrel=1
+pkgrel=2
pkgdesc="Convert Gregorian dates to Discordian dates"
url="https://github.com/bo0ts/ddate"
arch="all"
@@ -13,7 +13,7 @@ source="ddate-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
build() {
cmake -B build . \
- -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr
make -C build
}
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 34fab799e1..692528421b 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -2,7 +2,7 @@
pkgname=dhcp
pkgver=4.4.2_p1
_realver=${pkgver/_p/-P}
-pkgrel=0
+pkgrel=1
pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
url="https://www.isc.org/"
arch="all"
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index 9a0ef8ad38..269a068ca9 100644
--- a/main/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dhcpcd
-pkgver=9.4.0
+pkgver=9.4.1
pkgrel=0
pkgdesc="RFC2131 compliant DHCP client"
url="https://roy.marples.name/projects/dhcpcd"
@@ -44,7 +44,7 @@ package() {
}
sha512sums="
-e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f dhcpcd-9.4.0.tar.xz
+530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45 dhcpcd-9.4.1.tar.xz
692b2c8c75166fabd512a7cc69c650f9391e0f682ce9cbe1771bfa44e82dcf09e322c46493c45ca75000f479d3cddde306754ba31d28a798a15e2b79a56045f0 busybox-logger.patch
1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch
dc3b30295dbe5310526443736e60ccc53621d465d512639e8ea20efe598037ff33730e46964e4e7bc32d4ce88aaecf3b9bb9a4ceab892d8bff3423e0374ccae1 dhcpcd.initd
diff --git a/main/dialog/APKBUILD b/main/dialog/APKBUILD
index 18327bde82..9e1d1fb9e9 100644
--- a/main/dialog/APKBUILD
+++ b/main/dialog/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dialog
-pkgver=1.3.20210621
+pkgver=1.3.20211214
_pkgver=${pkgver%.*}-${pkgver##*.}
pkgrel=0
pkgdesc="Script interpreter providing curses widgets"
@@ -39,5 +39,5 @@ static() {
}
sha512sums="
-bde13aaf215127d143aa0d37989e0bacb6bc23f007681aeff27683efa01a483106710ff756358e396c23e4c1f0355cd8a2b3bb362ae1c3a1a997e00835d53c2b dialog-1.3-20210621.tgz
+b76e7e1fc333550a9cc351e37e7121e98f48b2a1f78e8c0c528e2126db16ae14c4c5da088bc611cb12020836e75dd2a1d875561fe5eec6589c104252d4aa7626 dialog-1.3-20211214.tgz
"
diff --git a/main/distcc/APKBUILD b/main/distcc/APKBUILD
index 5a73dc9f83..b8c2882a81 100644
--- a/main/distcc/APKBUILD
+++ b/main/distcc/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=distcc
pkgver=3.4
-pkgrel=0
+pkgrel=2
pkgdesc="Ddistributed C, C++, Obj C compiler"
url="https://github.com/distcc/distcc"
arch="all"
@@ -15,6 +15,7 @@ subpackages="$pkgname-doc $pkgname-pump"
source="https://github.com/distcc/distcc/releases/download/v$pkgver/distcc-$pkgver.tar.gz
distcc-hardened.patch
gcc-10.patch
+ dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
distccd.initd
distccd.confd
"
@@ -68,6 +69,7 @@ sha512sums="
de09329fdfa25e08a9b9529190ddaa9ceccb34c8655692edb86f367a8db4a71b750c6e928cb8e5a670f51fbbc02fd1c8524f72e01b3ebaacc1106dc676d18eef distcc-3.4.tar.gz
b53a0d6038504917fd41f549da4f5addaff6ebd198a5d9d3ee8d4654f843aab375da4017b40efe24b9d4c9881719030485e4f56724690ba271fb52dc48249a44 distcc-hardened.patch
4e55e0acda58e6f273c74e9d617de1a121debf820e915cf8aeb4d80907d427a058466bb2fd9126602aea7f861fd5fa1c2bede15e2a512923bc61e3ef163430d4 gcc-10.patch
+9bc411107021d5f621304a73b0bfdec387d1b33121a325503cf4c9c4046924338ee1b4ef093b517249c3df31cf69cd9f19377df2edd6e81be1dac50a5bd0f3d5 dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
3c58be08242de09f76876b20a0c6643a3a76a088c356484cb091253b7e4dddb20008d071d8e5d1a66acbc5bfe4d8a59284a6d7f225ca2006e8a8b3c698e71026 distccd.initd
fbb12522e489243475c735e055a72a19b176f1ad736dc810e1f085d8d9d79460ac7590a92bb9563f8b316437f67f6ca729330253f007d06011144a66fede5465 distccd.confd
"
diff --git a/main/distcc/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch b/main/distcc/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
new file mode 100644
index 0000000000..5d0a86d2f1
--- /dev/null
+++ b/main/distcc/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
@@ -0,0 +1,65 @@
+commit 879b71d6e95673e58d33f6c3c341a893ee307161
+Author: Alexey Sheplyakov <asheplyakov@yandex.ru>
+Date: Sat Jul 10 22:18:14 2021 +0400
+
+ dcc_gcc_rewrite_fqn: avoid heap corruption
+
+ On ALT Linux I've run into the following bug:
+
+ distcc gcc -Wall -std=gnu89 -I. -O2 -o hello.o -c hello.c
+ free(): invalid next size (fast)
+ Aborted (core dumped)
+
+ Apparently dcc_gcc_rewrite writes beyond the allocated memory:
+
+ valgrind --leak-check=full -v ./distcc gcc -Wall -std=gnu89 -I. -O2 -o hello.o -c hello.c
+
+ ==11382== ERROR SUMMARY: 53 errors from 5 contexts (suppressed: 0 from 0)
+ ==11382==
+ ==11382== 1 errors in context 1 of 5:
+ ==11382== Invalid write of size 1
+ ==11382== at 0x4C349D8: strcat (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+ ==11382== by 0x10D165: dcc_gcc_rewrite_fqn (compile.c:611)
+ ==11382== by 0x10D4B4: dcc_build_somewhere (compile.c:725)
+ ==11382== by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014)
+ ==11382== by 0x10E380: main (distcc.c:352)
+ ==11382== Address 0x544e828 is 1 bytes after a block of size 23 alloc'd
+ ==11382== at 0x4C31B0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+ ==11382== by 0x10D087: dcc_gcc_rewrite_fqn (compile.c:588)
+ ==11382== by 0x10D4B4: dcc_build_somewhere (compile.c:725)
+ ==11382== by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014)
+ ==11382== by 0x10E380: main (distcc.c:352)
+ ==11382==
+ ==11382==
+ ==11382== 1 errors in context 2 of 5:
+ ==11382== Invalid write of size 1
+ ==11382== at 0x4C349C8: strcat (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+ ==11382== by 0x10D165: dcc_gcc_rewrite_fqn (compile.c:611)
+ ==11382== by 0x10D4B4: dcc_build_somewhere (compile.c:725)
+ ==11382== by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014)
+ ==11382== by 0x10E380: main (distcc.c:352)
+ ==11382== Address 0x544e827 is 0 bytes after a block of size 23 alloc'd
+ ==11382== at 0x4C31B0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+ ==11382== by 0x10D087: dcc_gcc_rewrite_fqn (compile.c:588)
+ ==11382== by 0x10D4B4: dcc_build_somewhere (compile.c:725)
+ ==11382== by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014)
+ ==11382== by 0x10E380: main (distcc.c:352)
+
+ and ALT Linux' hardened glibc does not quite like that.
+ Correctly compute the `newcmd_len` to avoid the problem.
+
+ ALTBUG: #40425
+
+diff --git a/src/compile.c b/src/compile.c
+index 34964566fdd6..26d7d1821501 100644
+--- a/src/compile.c
++++ b/src/compile.c
+@@ -584,7 +584,7 @@ static int dcc_gcc_rewrite_fqn(char **argv)
+ return -ENOENT;
+
+
+- newcmd_len = strlen(target_with_vendor) + 1 + strlen(argv[0] + 1);
++ newcmd_len = strlen(target_with_vendor) + 1 + strlen(argv[0]) + 1;
+ newcmd = malloc(newcmd_len);
+ if (!newcmd)
+ return -ENOMEM;
diff --git a/main/dmvpn/APKBUILD b/main/dmvpn/APKBUILD
index 0da7361278..64c4fb894f 100644
--- a/main/dmvpn/APKBUILD
+++ b/main/dmvpn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
pkgname=dmvpn
pkgver=1.4.0
pkgrel=0
diff --git a/main/doas/APKBUILD b/main/doas/APKBUILD
index 9b5f49fc77..73b8a9948e 100644
--- a/main/doas/APKBUILD
+++ b/main/doas/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=doas
pkgver=6.8.1
-pkgrel=6
+pkgrel=7
pkgdesc="OpenBSD's temporary privilege escalation tool"
url="https://github.com/Duncaen/OpenDoas"
arch="all"
diff --git a/main/doas/doas.post-install b/main/doas/doas.post-install
index 46518437c2..26a63aa225 100755
--- a/main/doas/doas.post-install
+++ b/main/doas/doas.post-install
@@ -1,6 +1,6 @@
#!/bin/sh
-[ -d /etc/doas.d ] || mkdir /etc/doas.d
+[ -d /etc/doas.d ] || install -d -m 0750 /etc/doas.d
[ -e /etc/doas.d/doas.conf ] && exit 0
cat << _EOF_ >/etc/doas.d/doas.conf
@@ -9,11 +9,13 @@ cat << _EOF_ >/etc/doas.d/doas.conf
# previous location, /etc/doas.conf, automatically.
_EOF_
-[ -e /etc/doas.conf ] && cat /etc/doas.conf >> /etc/doas.d/doas.conf
-[ -e /etc/doas.conf ] || cat << _EOF_ >> /etc/doas.d/doas.conf
+if [ -f /etc/doas.conf ]; then
+ cat /etc/doas.conf >> /etc/doas.d/doas.conf
+ cat << _EOF_ >> /etc/doas.d/doas.conf
# Please see /usr/share/doc/doas/doas.conf.example in the doas-doc
# package for configuration examples.
_EOF_
+fi
# install compatibility symlink
rm -f /etc/doas.conf
@@ -27,4 +29,4 @@ cat << _EOF_ >&2
* /etc/doas.d/doas.conf and a symlink was installed in its
* place. For more information about the new doas configuration
* directory, consult doas.d(5).
-_EOF_ \ No newline at end of file
+_EOF_
diff --git a/main/doas/doas.post-upgrade b/main/doas/doas.post-upgrade
index 46518437c2..731b3511ca 100755
--- a/main/doas/doas.post-upgrade
+++ b/main/doas/doas.post-upgrade
@@ -1,6 +1,11 @@
#!/bin/sh
-[ -d /etc/doas.d ] || mkdir /etc/doas.d
+[ -d /etc/doas.d ] || install -d -m 0750 /etc/doas.d
+# fix perms when upgrading from 6.8.1-r6
+if [ -d /etc/doas.d ] && [ "$(stat -c "%a" /etc/doas.d)" = "755" ]; then
+ chmod 0750 /etc/doas.d
+fi
+
[ -e /etc/doas.d/doas.conf ] && exit 0
cat << _EOF_ >/etc/doas.d/doas.conf
@@ -9,11 +14,13 @@ cat << _EOF_ >/etc/doas.d/doas.conf
# previous location, /etc/doas.conf, automatically.
_EOF_
-[ -e /etc/doas.conf ] && cat /etc/doas.conf >> /etc/doas.d/doas.conf
-[ -e /etc/doas.conf ] || cat << _EOF_ >> /etc/doas.d/doas.conf
+if [ -f /etc/doas.conf ]; then
+ cat /etc/doas.conf >> /etc/doas.d/doas.conf
+ cat << _EOF_ >> /etc/doas.d/doas.conf
# Please see /usr/share/doc/doas/doas.conf.example in the doas-doc
# package for configuration examples.
_EOF_
+fi
# install compatibility symlink
rm -f /etc/doas.conf
@@ -27,4 +34,4 @@ cat << _EOF_ >&2
* /etc/doas.d/doas.conf and a symlink was installed in its
* place. For more information about the new doas configuration
* directory, consult doas.d(5).
-_EOF_ \ No newline at end of file
+_EOF_
diff --git a/main/docbook-xsl/APKBUILD b/main/docbook-xsl/APKBUILD
index ced50c06e3..b32f7eaef6 100644
--- a/main/docbook-xsl/APKBUILD
+++ b/main/docbook-xsl/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=docbook-xsl
pkgver=1.79.2
-pkgrel=3
+pkgrel=4
pkgdesc="XML stylesheets for Docbook-xml transformations."
url="https://docbook.org/"
arch="noarch"
@@ -11,14 +11,10 @@ options="!check"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
source="https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F$pkgver/docbook-xsl-$pkgver.tar.gz
765567_non-recursive_string_subst.patch
+ f6c5eefbca775e312afebf576a6990344a0b1b69.patch
"
-build() {
- return 0
-}
-
package() {
- cd "$srcdir"/$pkgname-$pkgver
local _dest dir f
_dest="$pkgdir"/usr/share/xml/docbook/xsl-stylesheets-$pkgver
@@ -42,5 +38,8 @@ package() {
"$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-sha512sums="cd375e7a2339bcd9d24936b370c4371b351cab7c8a79044e785d0300dab75bed5a5c9b9076d4fba32d39b22535edfc6f449a7b1086139ad8bf54eab844b9434e docbook-xsl-1.79.2.tar.gz
-3199de6b5a61ed25defa50a55fa3d138b60e1f5e4c2e3b9a14e169099189794adc3ac079fa3f62debc682f4840c6dadff40f8bd5a07fdba34fe1016ce885b9e2 765567_non-recursive_string_subst.patch"
+sha512sums="
+cd375e7a2339bcd9d24936b370c4371b351cab7c8a79044e785d0300dab75bed5a5c9b9076d4fba32d39b22535edfc6f449a7b1086139ad8bf54eab844b9434e docbook-xsl-1.79.2.tar.gz
+3199de6b5a61ed25defa50a55fa3d138b60e1f5e4c2e3b9a14e169099189794adc3ac079fa3f62debc682f4840c6dadff40f8bd5a07fdba34fe1016ce885b9e2 765567_non-recursive_string_subst.patch
+ba7b6fef55673c4d6efd6f956cc82172f44476a87b5dc0a82348ab4f1b55e043503843f31c21ca74254724d77d28696c427bc64e59e8aafebb7961420ad5fd9f f6c5eefbca775e312afebf576a6990344a0b1b69.patch
+"
diff --git a/main/docbook-xsl/f6c5eefbca775e312afebf576a6990344a0b1b69.patch b/main/docbook-xsl/f6c5eefbca775e312afebf576a6990344a0b1b69.patch
new file mode 100644
index 0000000000..f39e8150bb
--- /dev/null
+++ b/main/docbook-xsl/f6c5eefbca775e312afebf576a6990344a0b1b69.patch
@@ -0,0 +1,56 @@
+--- a/common/common.xsl
++++ b/common/common.xsl
+@@ -68,7 +68,6 @@ d:subjectset d:substeps d:synopfragment d:table d:tbody d:textobject d:tfoot d:t
+ d:thead d:tip d:toc d:tocchap d:toclevel1 d:toclevel2 d:toclevel3 d:toclevel4
+ d:toclevel5 d:tocpart d:topic d:varargs d:variablelist d:varlistentry d:videodata
+ d:videoobject d:void d:warning d:subjectset
+-
+ d:classsynopsis
+ d:constructorsynopsis
+ d:destructorsynopsis
+@@ -81,6 +80,45 @@ d:oointerface
+ d:simplemsgentry
+ d:manvolnum
+ "/>
++<xsl:strip-space elements="
++abstract affiliation anchor answer appendix area areaset areaspec
++artheader article audiodata audioobject author authorblurb authorgroup
++beginpage bibliodiv biblioentry bibliography biblioset blockquote book
++bookinfo callout calloutlist caption caution chapter
++citerefentry cmdsynopsis co collab colophon colspec confgroup
++copyright dedication docinfo editor entrytbl epigraph equation
++example figure footnote footnoteref formalpara funcprototype
++funcsynopsis glossary glossdef glossdiv glossentry glosslist graphicco
++group highlights imagedata imageobject imageobjectco important index
++indexdiv indexentry indexterm info informalequation informalexample
++informalfigure informaltable inlineequation inlinemediaobject
++itemizedlist itermset keycombo keywordset legalnotice listitem lot
++mediaobject mediaobjectco menuchoice msg msgentry msgexplan msginfo
++msgmain msgrel msgset msgsub msgtext note objectinfo
++orderedlist othercredit part partintro preface printhistory procedure
++programlistingco publisher qandadiv qandaentry qandaset question
++refentry reference refmeta refnamediv refsection refsect1 refsect1info refsect2
++refsect2info refsect3 refsect3info refsynopsisdiv refsynopsisdivinfo
++revhistory revision row sbr screenco screenshot sect1 sect1info sect2
++sect2info sect3 sect3info sect4 sect4info sect5 sect5info section
++sectioninfo seglistitem segmentedlist seriesinfo set setindex setinfo
++shortcut sidebar simplelist simplesect spanspec step subject
++subjectset substeps synopfragment table tbody textobject tfoot tgroup
++thead tip toc tocchap toclevel1 toclevel2 toclevel3 toclevel4
++toclevel5 tocpart topic varargs variablelist varlistentry videodata
++videoobject void warning subjectset
++classsynopsis
++constructorsynopsis
++destructorsynopsis
++fieldsynopsis
++methodparam
++methodsynopsis
++ooclass
++ooexception
++oointerface
++simplemsgentry
++manvolnum
++"/>
+ <!-- ====================================================================== -->
+
+ <doc:template name="is.component" xmlns="">
diff --git a/main/dosfstools/APKBUILD b/main/dosfstools/APKBUILD
index e56b121a9c..50c4839107 100644
--- a/main/dosfstools/APKBUILD
+++ b/main/dosfstools/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dosfstools
pkgver=4.2
-pkgrel=0
+pkgrel=1
pkgdesc="DOS filesystem utilities"
url="https://github.com/dosfstools/dosfstools"
arch="all"
@@ -20,6 +20,7 @@ build() {
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
+ --sbindir=/sbin \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var \
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 14cccb7545..ba8f2cc8a5 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -4,10 +4,13 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dovecot
-pkgver=2.3.16
-_pkgverminor=${pkgver%.*}
-pkgrel=2
-_pigeonholever=0.5.16
+pkgver=2.3.17.1
+case "$pkgver" in
+ *.*.*.*) _pkgverminor=${pkgver%.*.*};;
+ *.*.*) _pkgverminor=${pkgver%.*};;
+esac
+pkgrel=0
+_pigeonholever=0.5.17.1
pkgdesc="IMAP and POP3 server"
url="https://www.dovecot.org/"
arch="all"
@@ -240,6 +243,7 @@ _sieve() {
_find usr/bin sieve
_find usr/lib/dovecot sieve
_find usr/lib/dovecot pigeonhole
+ _find usr/libexec/dovecot managesieve
_find etc/dovecot/ sieve
}
@@ -334,8 +338,8 @@ _submv() {
}
sha512sums="
-31a9d352c7ead466d65ee0535b1fbd9138e35235f1ebfeedc4eef54cba450663c59708d162eaf0712af1c40f23526ac86aab2eece8cefde3edf690127472fd1e dovecot-2.3.16.tar.gz
-880e00654eab85cc41b27ac470cce6011991e3cdb005642f495c2297fd9492bfb2b6b4ef63c88c2ac10bec870ad69b8bee6b11dd1bc5099e16c3cc2857312543 dovecot-2.3-pigeonhole-0.5.16.tar.gz
+976aa4f68e86f401e5766017e1702740d5b03892aff98f31f9ef0c6d242311d0f4b50d7faa426306bf1c902d7fc6d021438977bc887fa66ee360b069ec32ad79 dovecot-2.3.17.1.tar.gz
+632a963d90a3fa052f314360d59ff25274d80952307ab5dd9193a2713ebf686500a7b2559b56f04b07e0a261066eed9b8525b14197f3be51728af09acb76e894 dovecot-2.3-pigeonhole-0.5.17.1.tar.gz
fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a skip-iconv-check.patch
794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5 split-protocols.patch
0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07 default-config.patch
diff --git a/main/doxygen/APKBUILD b/main/doxygen/APKBUILD
index ca09568515..9071d0b9e2 100644
--- a/main/doxygen/APKBUILD
+++ b/main/doxygen/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=doxygen
pkgver=1.9.2
-pkgrel=1
+pkgrel=2
pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
url="https://www.doxygen.nl/"
arch="all"
@@ -18,7 +18,7 @@ build() {
cmake -B build \
-DGIT_EXECUTABLE=/bin/false \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
-Dbuild_xmlparser=ON .
make -C build
}
diff --git a/main/drbd-utils/APKBUILD b/main/drbd-utils/APKBUILD
index 8bb89b16f8..44d021c2e4 100644
--- a/main/drbd-utils/APKBUILD
+++ b/main/drbd-utils/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=drbd-utils
-pkgver=9.19.0
+pkgver=9.19.1
pkgrel=0
pkgdesc="Network-based RAID 1"
url="https://www.drbd.org"
@@ -61,7 +61,7 @@ bashcomp() {
}
sha512sums="
-e2dd2205a2e0b2c82ad7430146919a34cad6d5636ff9e6c229c0ab073b31f2bd02ae20027b2ec9fc5e42c52c3447f2bd671f647b4336eaf5b93d0a4029ca75b5 drbd-utils-9.19.0.tar.gz
+65d8f5802c541781895c59a5f631b222746b21615049e53f77d6c36a7255c51fe5d062984174ab8578d64af104fe9d66df5ae185ba50a8c38813c12a69fceb22 drbd-utils-9.19.1.tar.gz
562ae8eee03148666fb6e6e700c1eb9086f6901e176ea6cd007e3ac4e39d1cdaf967064de74dc1ad620155996dc7011bd0e2abd1c9595ff9bf5f4413673726f3 drbdsetup-permissions.patch
dc9d825019803ab5cf66d14b0b67b9d3f42cabac2aee07228176b9ff73dacc74e413f2c9ed0fe22a8217ff502c80b891950d1d4fb51df56d9c8e51e7c1fc1cc6 fix-drbdsetup_events2.c.patch
f61a833dc5eea79000a7dd85e83ae10e284109c76b5d59974ed69f92dbab6c389d6d20f7ea374b7c066519c6d1d816ed27b48dbaee6b91fb9754974acf52f46e drbd.initd
diff --git a/main/dtc/APKBUILD b/main/dtc/APKBUILD
index 4b7c228f81..a5ac44f1fe 100644
--- a/main/dtc/APKBUILD
+++ b/main/dtc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dtc
pkgver=1.6.1
-pkgrel=0
+pkgrel=1
pkgdesc="Device Tree Compiler"
url="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/"
arch="all"
@@ -11,6 +11,7 @@ checkdepends="coreutils"
subpackages="$pkgname-dev libfdt py3-libfdt:py3_libfdt"
source="https://kernel.org/pub/software/utils/dtc/dtc-$pkgver.tar.xz
install-pylibfdt-to-destdir.patch
+ pylibfdt-fix-with-Python-3.10.patch
"
prepare() {
@@ -45,4 +46,5 @@ py3_libfdt() {
sha512sums="
26cd351ddca411ab96b93ac3e763f817f9f8a80ca66a8707e1077f771ed8e7e04c01f321ab8ab27b2f9826d9d438483fe3156401493bfd29cef3cc71a1414568 dtc-1.6.1.tar.xz
1c43dfae8d15861c4f0170f0df9ba63d197ab3be50e39fe5748e547074c52dc7b042ca5e9c64d3d4bb0a8e8cde8df7e71660cde93e9512923405c38debcaa01c install-pylibfdt-to-destdir.patch
+1c7d2b5f7dcb8aed38a1b685e3be30497988933c2149a169b20fb2df53c44b8584cfdb9bad695a5d357598e33bf85cddb38397477862d46e2de69e46fc53556a pylibfdt-fix-with-Python-3.10.patch
"
diff --git a/main/dtc/pylibfdt-fix-with-Python-3.10.patch b/main/dtc/pylibfdt-fix-with-Python-3.10.patch
new file mode 100644
index 0000000000..c6b9298d84
--- /dev/null
+++ b/main/dtc/pylibfdt-fix-with-Python-3.10.patch
@@ -0,0 +1,58 @@
+From 383e148b70a47ab15f97a19bb999d54f9c3e810f Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Thu, 11 Nov 2021 16:05:36 +0000
+Subject: pylibfdt: fix with Python 3.10
+
+Since Python 2.5 the argument parsing functions when parsing expressions
+such as s# (string plus length) expect the length to be an int or a
+ssize_t, depending on whether PY_SSIZE_T_CLEAN is defined or not.
+
+Python 3.8 deprecated the use of int, and with Python 3.10 this symbol
+must be defined and ssize_t used[1].
+
+Define the magic symbol when building the extension, and cast the ints
+from the libfdt API to ssize_t as appropriate.
+
+[1] https://docs.python.org/3.10/whatsnew/3.10.html#id2
+
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+Message-Id: <20211111160536.2516573-1-ross.burton@arm.com>
+[dwg: Adjust for new location of setup.py]
+Tested-by: Rob Herring <robh@kernel.org>
+Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
+---
+ pylibfdt/libfdt.i | 4 ++--
+ setup.py | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/pylibfdt/libfdt.i b/pylibfdt/libfdt.i
+index 51ee801..075ef70 100644
+--- a/pylibfdt/libfdt.i
++++ b/pylibfdt/libfdt.i
+@@ -1044,9 +1044,9 @@ typedef uint32_t fdt32_t;
+ $result = Py_None;
+ else
+ %#if PY_VERSION_HEX >= 0x03000000
+- $result = Py_BuildValue("y#", $1, *arg4);
++ $result = Py_BuildValue("y#", $1, (Py_ssize_t)*arg4);
+ %#else
+- $result = Py_BuildValue("s#", $1, *arg4);
++ $result = Py_BuildValue("s#", $1, (Py_ssize_t)*arg4);
+ %#endif
+ }
+
+diff --git a/setup.py b/setup.py
+index 4b07be9..0a0daf1 100755
+--- a/pylibfdt/setup.py
++++ b/pylibfdt/setup.py
+@@ -42,6 +42,7 @@ top_builddir = get_top_builddir()
+ libfdt_module = Extension(
+ '_libfdt',
+ sources=[os.path.join(srcdir, 'libfdt.i')],
++ define_macros=[('PY_SSIZE_T_CLEAN', None)],
+ include_dirs=[os.path.join(srcdir, '../libfdt')],
+ libraries=['fdt'],
+ library_dirs=[os.path.join(top_builddir, 'libfdt')],
+--
+cgit 1.2.3-1.el7
+
diff --git a/main/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD
index 4bdb23ad0b..97e4130203 100644
--- a/main/e2fsprogs/APKBUILD
+++ b/main/e2fsprogs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=e2fsprogs
-pkgver=1.46.4
+pkgver=1.46.5
pkgrel=0
pkgdesc="Standard Ext2/3/4 filesystem utilities"
url="http://e2fsprogs.sourceforge.net"
@@ -9,7 +9,7 @@ arch="all"
license="GPL-2.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND MIT"
depends_dev="util-linux-dev gawk"
makedepends="$depends_dev linux-headers"
-checkdepends="diffutils perl"
+checkdepends="diffutils perl coreutils"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc libcom_err $pkgname-libs $pkgname-extra"
source="$pkgname-$pkgver.tar.gz::https://github.com/tytso/e2fsprogs/archive/v$pkgver.tar.gz
"
@@ -101,5 +101,5 @@ static() {
}
sha512sums="
-ea1a489581e62037ddb20e35e8da75eb2569bf0c7f65c76d123bb0f3c80d2b0e03ce9bfddc254602e3b01b3efc4128216b8390c89184e6841b47d19ab2977fbc e2fsprogs-1.46.4.tar.gz
+9e21e27b8be86b891cfc5f8c963c398e27f476d5663d6313ae48dc5d3c95f4f4ac95a9f37e971ac1dd0b8beb05b1f83b510027731e3aa906135ea21e99bea9b8 e2fsprogs-1.46.5.tar.gz
"
diff --git a/main/efi-mkkeys/APKBUILD b/main/efi-mkkeys/APKBUILD
new file mode 100644
index 0000000000..a10d5cdc34
--- /dev/null
+++ b/main/efi-mkkeys/APKBUILD
@@ -0,0 +1,20 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=efi-mkkeys
+pkgver=0.1.0
+pkgrel=0
+pkgdesc="Script to easily generate self-signed UEFI keys for Secure Boot"
+url="https://github.com/jirutka/efi-mkkeys"
+arch="noarch !armhf !s390x !ppc64le !mips !mips64 !riscv64" # limited by efitools
+license="MIT"
+depends="efitools cmd:openssl cmd:uuidgen"
+source="https://github.com/jirutka/efi-mkkeys/archive/v$pkgver/efi-mkkeys-$pkgver.tar.gz"
+options="!check" # no tests provided
+
+package() {
+ make install DESTDIR="$pkgdir" prefix=/usr
+}
+
+sha512sums="
+81ef5751b3f8deaa5b702bfc3fb6240fb32d8e91dbf02cf501187d30effbcd2159629a952a0eb024b1049c231cc2bfcc1ab41addc671d97d8542dd583808eb68 efi-mkkeys-0.1.0.tar.gz
+"
diff --git a/main/efi-mkuki/APKBUILD b/main/efi-mkuki/APKBUILD
new file mode 100644
index 0000000000..a979520a25
--- /dev/null
+++ b/main/efi-mkuki/APKBUILD
@@ -0,0 +1,26 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=efi-mkuki
+pkgver=0.1.0
+pkgrel=0
+pkgdesc="EFI Unified Kernel Image Maker"
+url="https://github.com/jirutka/efi-mkuki"
+arch="noarch"
+license="MIT"
+depends="cmd:objcopy"
+source="https://github.com/jirutka/efi-mkuki/archive/v$pkgver/efi-mkuki-$pkgver.tar.gz"
+options="!check" # no tests provided
+
+case "$CARCH" in
+ # Gummiboot is currently not available for other architectures.
+ # The user has to obtain EFI stubs themselves.
+ x86*) depends="$depends gummiboot-efistub"
+esac
+
+package() {
+ make install DESTDIR="$pkgdir" prefix=/usr
+}
+
+sha512sums="
+a6745832bb0b8e1af18c70431f26d778ebd097aab14a17e87ccef4fc95170229238fed308bdc4bea4bf3589bebd8e5d21933912704c33afa9fdaf03c13a84bd3 efi-mkuki-0.1.0.tar.gz
+"
diff --git a/main/elinks/APKBUILD b/main/elinks/APKBUILD
index 647e33b368..23faf39f13 100644
--- a/main/elinks/APKBUILD
+++ b/main/elinks/APKBUILD
@@ -1,32 +1,23 @@
+# Contributor: Dmitry Zakharchenko <dmitz@disroot.org>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=elinks
-pkgver=0.13
-_ver=${pkgver/_/}
-pkgrel=8
-pkgdesc="a text mode web browser"
+pkgver=0.15.0
+pkgrel=0
+pkgdesc="Advanced and well-established feature-rich text mode web browser"
url="http://elinks.or.cz/"
arch="all"
-license="GPL"
-depends=
-makedepends="bzip2-dev zlib-dev openssl1.1-compat-dev expat-dev gettext-dev"
-install=
+license="GPL-2.0"
+makedepends="automake autoconf zlib-dev bzip2-dev openssl-dev expat-dev gettext-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://dev.alpinelinux.org/archive/elinks/elinks-$pkgver.tar.bz2
- musl-va_copy.patch
- ssl-Make-RAND_egd-optional.patch
- elinks-0.12pre6-openssl11.patch
- "
-
-builddir="$srcdir"/elinks-0.13-20150624
+source="$pkgname-$pkgver.tgz::https://github.com/rkd77/elinks/archive/v$pkgver.tar.gz"
prepare() {
default_prepare
- update_config_sub
+ autoreconf -fi
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -34,20 +25,20 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --without-included-gettext
+ --without-included-gettext \
+ --enable-256-colors \
+ --enable-html-highlight \
+ --with-zlib
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
- rm -rf "$pkgdir"/usr/lib/charset.alias
- rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
+ rm "$pkgdir"/usr/lib/charset.alias
#fix conflict with gettext
rm "$pkgdir"/usr/share/locale/locale.alias
}
-sha512sums="9dd7fb674ab914fccaf64b889f6fe3431f95abe1ae76f1df6155fbc89623ec921a4de5f30e896e94c77161c4b4638a29ec19b8e1fe4cbdebdc4666be024f8ed9 elinks-0.13.tar.bz2
-56378b4744783e8a07c5e92f3f75cdb7edf7b26881eb033789d71612c3971b3a3c5ada5f02ec422391242cbceb64ff31a2be68298608ed6448c37056d6dedf40 musl-va_copy.patch
-df3254ff429540cca66849e03cd6245bd3e82897225ba3bfea9a41ab222c0041e60c61784a9fd6f819b360b6168b6375a5455a97786ab656b24a8e1b4b96bda3 ssl-Make-RAND_egd-optional.patch
-85e7a4e560a87ba641a04e3fce918cd0a2b52bd13b162f15950e4bb7d19a511f984d0891e3df1784cc8bb77a53f6c7ed6ffe56d7707d6b32a6676e21725893b9 elinks-0.12pre6-openssl11.patch"
+sha512sums="
+e54f8ffe20577d7b82498ddeeb1fe3b10c3e4c88e01a84ea70fbf0f4689e0b44b7c7f17fe8a439ec2bb1fba817acfef9a47f2c93a55bf90af4018ac81f674c17 elinks-0.15.0.tgz
+"
diff --git a/main/elinks/elinks-0.12pre6-openssl11.patch b/main/elinks/elinks-0.12pre6-openssl11.patch
deleted file mode 100644
index 29c4ef6bcb..0000000000
--- a/main/elinks/elinks-0.12pre6-openssl11.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From d83c0edf4c6ae42359ff856d7a879ecba5769595 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Fri, 17 Feb 2017 16:51:41 +0100
-Subject: [PATCH 1/2] fix compatibility with OpenSSL 1.1
-
----
- src/network/ssl/socket.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/network/ssl/socket.c b/src/network/ssl/socket.c
-index c9e2be4..467fc48 100644
---- a/src/network/ssl/socket.c
-+++ b/src/network/ssl/socket.c
-@@ -83,7 +83,7 @@ static void
- ssl_set_no_tls(struct socket *socket)
- {
- #ifdef CONFIG_OPENSSL
-- ((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1;
-+ SSL_set_options((ssl_t *) socket->ssl, SSL_OP_NO_TLSv1);
- #elif defined(CONFIG_GNUTLS)
- {
- /* GnuTLS does not support SSLv2 because it is "insecure".
-@@ -419,7 +419,7 @@ ssl_connect(struct socket *socket)
- (SSL *) socket->ssl,
- client_cert);
- #else
-- SSL_CTX *ctx = ((SSL *) socket->ssl)->ctx;
-+ SSL_CTX *ctx = SSL_get_SSL_CTX((SSL *) socket->ssl);
-
- SSL_CTX_use_certificate_chain_file(ctx, client_cert);
- SSL_CTX_use_PrivateKey_file(ctx, client_cert,
---
-2.7.4
-
-
-From ec952cc5b79973bee73fcfc813159d40c22b7228 Mon Sep 17 00:00:00 2001
-From: Tomas Mraz <tmraz@fedoraproject.org>
-Date: Fri, 17 Feb 2017 16:44:11 +0100
-Subject: [PATCH 2/2] drop disablement of TLS1.0 on second attempt to connect
-
-It would not work correctly anyway and the code does not build
-with OpenSSL-1.1.0.
----
- src/network/ssl/socket.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/network/ssl/socket.c b/src/network/ssl/socket.c
-index 467fc48..b981c1e 100644
---- a/src/network/ssl/socket.c
-+++ b/src/network/ssl/socket.c
-@@ -82,6 +82,11 @@
- static void
- ssl_set_no_tls(struct socket *socket)
- {
-+#if 0
-+/* This implements the insecure renegotiation, which should not be used.
-+ * The code also would not work on current Fedora (>= Fedora 23) anyway,
-+ * because it would just switch off TLS 1.0 keeping TLS 1.1 and 1.2 enabled.
-+ */
- #ifdef CONFIG_OPENSSL
- SSL_set_options((ssl_t *) socket->ssl, SSL_OP_NO_TLSv1);
- #elif defined(CONFIG_GNUTLS)
-@@ -96,6 +101,7 @@ ssl_set_no_tls(struct socket *socket)
- gnutls_protocol_set_priority(*(ssl_t *) socket->ssl, protocol_priority);
- }
- #endif
-+#endif
- }
-
- #ifdef USE_OPENSSL
---
-2.7.4
-
diff --git a/main/elinks/musl-va_copy.patch b/main/elinks/musl-va_copy.patch
deleted file mode 100644
index 5074d1e203..0000000000
--- a/main/elinks/musl-va_copy.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./src/util/snprintf.h.orig
-+++ ./src/util/snprintf.h
-@@ -12,10 +12,14 @@
- /* XXX: This is not quite the best place for it, perhaps. But do we have
- * a better one now? --pasky */
- #ifndef VA_COPY
-+#ifdef va_copy
-+#define VA_COPY va_copy
-+#else
- #ifdef HAVE_VA_COPY
- #define VA_COPY(dest, src) __va_copy(dest, src)
- #else
- #define VA_COPY(dest, src) (dest) = (src)
-+#endif
- #endif
- #endif
-
-
diff --git a/main/elinks/ssl-Make-RAND_egd-optional.patch b/main/elinks/ssl-Make-RAND_egd-optional.patch
deleted file mode 100644
index aa56928fe7..0000000000
--- a/main/elinks/ssl-Make-RAND_egd-optional.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4357901b04ed582df55873532c6c22e671512af3 Mon Sep 17 00:00:00 2001
-From: Kylie McClain <somasis@exherbo.org>
-Date: Tue, 29 Dec 2015 15:11:52 -0500
-Subject: [PATCH] ssl: Make RAND_egd optional
-
-Fixes compilation with LibreSSL.
----
- src/network/ssl/ssl.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/network/ssl/ssl.c b/src/network/ssl/ssl.c
-index 693ac37..5ed5754 100644
---- a/src/network/ssl/ssl.c
-+++ b/src/network/ssl/ssl.c
-@@ -84,11 +84,16 @@ init_openssl(struct module *module)
- * cannot initialize the PRNG and so every attempt to use SSL fails.
- * It's actually an OpenSSL FAQ, and according to them, it's up to the
- * application coders to seed the RNG. -- William Yodlowsky */
-- if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) {
-+ RAND_file_name(f_randfile, sizeof(f_randfile));
-+#ifdef HAVE_RAND_EGD
-+ if (RAND_egd(f_randfile) < 0) {
- /* Not an EGD, so read and write to it */
-+#endif
- if (RAND_load_file(f_randfile, -1))
- RAND_write_file(f_randfile);
-+#ifdef HAVE_RAND_EGD
- }
-+#endif
-
- SSLeay_add_ssl_algorithms();
- context = SSL_CTX_new(SSLv23_client_method());
---
-2.6.4
-
diff --git a/main/ell/APKBUILD b/main/ell/APKBUILD
index 07525a9976..bdcb9d1a71 100644
--- a/main/ell/APKBUILD
+++ b/main/ell/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Milan P. Stanić <mps@arvanta.net>
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=ell
-pkgver=0.44
+pkgver=0.47
pkgrel=0
pkgdesc="Linux library for embedded development"
url="https://01.org/ell"
@@ -38,5 +38,5 @@ package() {
}
sha512sums="
-0d663b437852c99e11e448335466fb96d7093858a626b84ee2eb9bacfa7b703dc9f22d273256e6db007bdf213d5d2fb3c0824960840ad7e0ea1c5139de8496e1 ell-0.44.tar.gz
+71efb51ed1431d331623037e58ff0f1df460209fd6b77a2581c499bca7d5b00c19d6161dc22c7ca11b5f8d67076cc576a07043219d73becdac2eb450774b9c9b ell-0.47.tar.gz
"
diff --git a/main/encfs/APKBUILD b/main/encfs/APKBUILD
index bbd9ca95e0..b6a838291e 100644
--- a/main/encfs/APKBUILD
+++ b/main/encfs/APKBUILD
@@ -3,7 +3,7 @@
pkgname=encfs
pkgver=1.9.5
_ver=${pkgver/_/-}
-pkgrel=12
+pkgrel=13
pkgdesc="EncFS provides an encrypted filesystem in user-space"
url="https://vgough.github.io/encfs/"
arch="all"
@@ -28,7 +28,7 @@ build() {
-DINSTALL_LIBENCFS=ON \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_SHARED_LIBS=True \
- -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
$CMAKE_CROSSOPTS
diff --git a/main/etckeeper/APKBUILD b/main/etckeeper/APKBUILD
index e781df001c..6cb20c31a7 100644
--- a/main/etckeeper/APKBUILD
+++ b/main/etckeeper/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Henrik Riomar <henrik.riomar@gmail.com>
# Maintainer: Henrik Riomar <henrik.riomar@gmail.com>
pkgname=etckeeper
-pkgver=1.18.16
+pkgver=1.18.17
pkgrel=0
pkgdesc="Store /etc in git."
url="http://etckeeper.branchable.com"
@@ -65,6 +65,8 @@ package() {
"$pkgdir"/etc/apk/commit_hooks.d/"$pkgname"
}
-sha512sums="48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07 etckeeper-1.18.16.tar.gz
+sha512sums="
+6e75d0f38c8d27ba290ab6e1a51d50ca7a736c958da7a1edb792a5c7f1eedd4848adbb43571425f127bf2c5fe39d5b7887968b09178ca5385ec0abeaeb6cfa00 etckeeper-1.18.17.tar.gz
d0ff88615359e8b03da5f9162a7bae3f32c06891a8899096025283d77e950dd72280c6c19b8eb8a4cde08742c6ca715cd32c37c16e8bbf2d030e9fd16a1fc940 apk-commit_hook
-471c1f8f2cce94248f679e56e2bfc4ac384d9b6944d4023a2ebdd3d197f95d335f4ccc0d3d946a68513d3cc5638189fa8e04923f097605435fd3e4f01c60e1c2 etckeeper.cron"
+471c1f8f2cce94248f679e56e2bfc4ac384d9b6944d4023a2ebdd3d197f95d335f4ccc0d3d946a68513d3cc5638189fa8e04923f097605435fd3e4f01c60e1c2 etckeeper.cron
+"
diff --git a/main/ethtool/APKBUILD b/main/ethtool/APKBUILD
index 0bcc3b3e1b..da1f4b75f6 100644
--- a/main/ethtool/APKBUILD
+++ b/main/ethtool/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ethtool
-pkgver=5.14
+pkgver=5.15
pkgrel=0
pkgdesc="Utility for controlling network drivers and hardware"
url="https://mirrors.edge.kernel.org/pub/software/network/ethtool/"
@@ -38,5 +38,5 @@ bashcomp() {
}
sha512sums="
-880c4b6d5f83c25cabc6101222a5abf5f7e5e6501165ba5cdb420da242c351d7c32c1cffacfa1bcf0c4655434d89c64d39f0809af0d38f626a0a78f92ec68f87 ethtool-5.14.tar.xz
+28147468a92c179217b459907a3257ee4f2d2ed028cb87b074f1c7ca6eb91aca81c8a9f5c7fe74e81d16a516e6e7eb20137bf7a15b5479fd82a327c64954da12 ethtool-5.15.tar.xz
"
diff --git a/main/eudev/APKBUILD b/main/eudev/APKBUILD
index 7f42247c11..a161ebba57 100644
--- a/main/eudev/APKBUILD
+++ b/main/eudev/APKBUILD
@@ -1,10 +1,12 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=eudev
-pkgver=3.2.10
-pkgrel=1
-pkgdesc="OpenRC compatible fork of systemd-udev"
-url="https://wiki.gentoo.org/wiki/Project:Eudev"
+pkgver=3.2.11
+_pkgver=${pkgver/_pre/-pre}
+pkgrel=0
+pkgdesc="init system agnostic fork of systemd-udev"
+url="https://github.com/eudev-project/eudev"
arch="all"
license="GPL-2.0-only"
depends="udev-init-scripts"
@@ -17,12 +19,13 @@ checkdepends="tree xz perl"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc
$pkgname-netifnames::noarch $pkgname-rule-generator::noarch"
triggers="eudev.trigger=/lib/udev/rules.d:/usr/lib/udev/rules.d"
-source="https://dev.gentoo.org/~blueness/eudev/eudev-$pkgver.tar.gz
+source="https://github.com/eudev-project/eudev/releases/download/v$_pkgver/eudev-$_pkgver.tar.gz
default-rules.patch
load-fbcon.patch
udev-postmount.initd
setup-udev
"
+builddir="$srcdir"/"$pkgname"-"$_pkgver"
[ "$CARCH" = "riscv64" ] && options="$options textrels"
@@ -103,8 +106,10 @@ generator() {
"$subpkgdir"/lib/udev/rule_generator.functions
}
-sha512sums="d0a076d8a54e9d4ca9ca48cf885d082965144b322950d351b7ead4a5035c2dad6fd66b7f137d7281982876c3c50330cdd5e599788f23e1369388181dd178941d eudev-3.2.10.tar.gz
+sha512sums="
+2be64e24f0af30b010d0929287f5053dff908ec5ce45817304869027ce7c4ba1e31babc0f5fabd712cd301c697bcb7c2afe297a8855e96042fec6a087a786311 eudev-3.2.11.tar.gz
683e3c26ca4f058303f8db7d4977e436d728386ee6866719c4f11ff31db27572d3f486f51d3173310e1ec2cf995fa4c396f2415bdf45dabdd80e6e55e798a314 default-rules.patch
ff5928fd555e095d9f3234dd004ac4c5925405d308777e9b018e8e03112cd109935b51d75a3bc4a2a1018eb486e8a5e5ef6ee978860002a8fff93b116e9721f5 load-fbcon.patch
8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88 udev-postmount.initd
-4e57349a9516d495a6eb6dd437e179c1f990b437c4e671667f64d4361fcd827a2172e4ca120fbd324ca29e9acc65a361cd22a75b8dd8437389cc19ba62198f83 setup-udev"
+4e57349a9516d495a6eb6dd437e179c1f990b437c4e671667f64d4361fcd827a2172e4ca120fbd324ca29e9acc65a361cd22a75b8dd8437389cc19ba62198f83 setup-udev
+"
diff --git a/main/execline/APKBUILD b/main/execline/APKBUILD
index 2641d8b808..f22786e8c2 100644
--- a/main/execline/APKBUILD
+++ b/main/execline/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
# Contributor: John Regan <john@jrjrtech.com>
pkgname=execline
-pkgver=2.8.1.0
+pkgver=2.8.2.0
pkgrel=0
pkgdesc="A small scripting language, to be used in place of a shell in non-interactive scripts."
url="http://skarnet.org/software/$pkgname/"
@@ -38,5 +38,5 @@ static() {
}
sha512sums="
-4e20ff5cd82941914a639abe2481efd93a7ada6d2431b65813793cc7801463179bc1c58ee73e889747038c859e5fd6e7e668b758fa1785da03e549547ca3c94c execline-2.8.1.0.tar.gz
+9a2c21fbddfc4bce69857fa906fcbb7b17b0cd1009a33a9f3bbcce69ff443af82704d74b792e2d4393eb6d7de9888a5bc74ff208c31485d3398b0dea07368a15 execline-2.8.2.0.tar.gz
"
diff --git a/main/expat/APKBUILD b/main/expat/APKBUILD
index 5efd260fbd..fd4bde80fc 100644
--- a/main/expat/APKBUILD
+++ b/main/expat/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=expat
-pkgver=2.4.1
+pkgver=2.4.3
pkgrel=0
pkgdesc="XML Parser library written in C"
url="http://www.libexpat.org/"
@@ -11,6 +11,15 @@ source="https://downloads.sourceforge.net/project/expat/expat/$pkgver/expat-$pkg
subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
# secfixes:
+# 2.4.3-r0:
+# - CVE-2021-45960
+# - CVE-2021-46143
+# - CVE-2022-22822
+# - CVE-2022-22823
+# - CVE-2022-22824
+# - CVE-2022-22825
+# - CVE-2022-22826
+# - CVE-2022-22827
# 2.2.7-r1:
# - CVE-2019-15903
# 2.2.7-r0:
@@ -37,5 +46,5 @@ package() {
}
sha512sums="
-b24e19c3f91e0f3d1ad3b08a810b8874e272ddfc6d4fd8f79c14c13eddf410648343b9f69fba2ce165be46c143cecf8d66cf446b4930da42f92def555ecd3408 expat-2.4.1.tar.bz2
+1a77580c10d8cd1eb2c9224697cb73cdad742c1b6cf716d987379d01bb1f66240c315c298f5295f120cf44445521ccb7cdd39db1e743f164b919245a35a9468e expat-2.4.3.tar.bz2
"
diff --git a/main/fail2ban/APKBUILD b/main/fail2ban/APKBUILD
index 321f717925..f91d8fc63d 100644
--- a/main/fail2ban/APKBUILD
+++ b/main/fail2ban/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fail2ban
pkgver=0.11.2
-pkgrel=0
+pkgrel=1
pkgdesc="Scans log files for login failures then updates iptables to reject originating ip address"
url="https://www.fail2ban.org/"
arch="noarch"
@@ -13,6 +13,7 @@ makedepends="python3-dev py3-setuptools bash"
subpackages="$pkgname-tests $pkgname-doc $pkgname-openrc"
source="$pkgname-$pkgver.tar.gz::https://github.com/fail2ban/fail2ban/archive/$pkgver.tar.gz
$pkgname-747d468-fix-tests.patch::https://github.com/fail2ban/fail2ban/commit/747d4683221b5584f9663695fb48145689b42ceb.patch
+ python-3.10.patch
fail2ban.confd
fail2ban.logrotate
alpine-ssh.jaild
@@ -69,6 +70,7 @@ tests() {
sha512sums="
46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97 fail2ban-0.11.2.tar.gz
5c0748c048031d88bc8fd2519bf99a35437b78a08fa942dbccdd2c0e4e9125560a847a8f1dc4414691c922dff558acff988492250be6a1f443a139b0e3762898 fail2ban-747d468-fix-tests.patch
+acd8f1f97233ed02012b166c62e8dc67b89729b82f0fcd81c871d0e425633f617404390b8301e6b22ef3ddf137f604a47aae7880a9f4ba6601b8d0ffe52b4f85 python-3.10.patch
1e7581dd04e7777d6fd5c40cc842a7ec5f4e6a0374673d020d89dd61bf4093d48934844bee89bcac9084f9ae44f3beb66e714cf3c2763d79c3e8feb790c5e43b fail2ban.confd
ee1c229db970239ebc707cd484a650fcf2347c70b411728ee2a4a35a72f4118cfccecf2a221275603320e0332efcc16e4979201933cec1aef1c5d5a082fc4940 fail2ban.logrotate
84915967ae1276f1e14a5813680ee2ebf081af1ff452a688ae5f9ac3363f4aff90e39f8e6456b5c33d5699917d28a16308797095fd1ef9bb1fbcb46d4cea3def alpine-ssh.jaild
diff --git a/main/fail2ban/python-3.10.patch b/main/fail2ban/python-3.10.patch
new file mode 100644
index 0000000000..53a3227d9b
--- /dev/null
+++ b/main/fail2ban/python-3.10.patch
@@ -0,0 +1,77 @@
+From 2b6bb2c1bed8f7009631e8f8c306fa3160324a49 Mon Sep 17 00:00:00 2001
+From: "Sergey G. Brester" <serg.brester@sebres.de>
+Date: Mon, 8 Feb 2021 17:19:24 +0100
+Subject: [PATCH] follow bpo-37324: :ref:`collections-abstract-base-classes`
+ moved to the :mod:`collections.abc` module
+
+(since 3.10-alpha.5 `MutableMapping` is missing in collections module)
+---
+ fail2ban/server/action.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/fail2ban/server/action.py b/fail2ban/server/action.py
+index 3bc48fe046..f0f1e6f59a 100644
+--- a/fail2ban/server/action.py
++++ b/fail2ban/server/action.py
+@@ -30,7 +30,10 @@
+ import threading
+ import time
+ from abc import ABCMeta
+-from collections import MutableMapping
++try:
++ from collections.abc import MutableMapping
++except ImportError:
++ from collections import MutableMapping
+
+ from .failregex import mapTag2Opt
+ from .ipdns import DNSUtils
+From 42dee38ad2ac5c3f23bdf297d824022923270dd9 Mon Sep 17 00:00:00 2001
+From: "Sergey G. Brester" <serg.brester@sebres.de>
+Date: Mon, 8 Feb 2021 17:25:45 +0100
+Subject: [PATCH] amend for `Mapping`
+
+---
+ fail2ban/server/actions.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/fail2ban/server/actions.py b/fail2ban/server/actions.py
+index b7b95b445a..897d907c1a 100644
+--- a/fail2ban/server/actions.py
++++ b/fail2ban/server/actions.py
+@@ -28,7 +28,10 @@
+ import os
+ import sys
+ import time
+-from collections import Mapping
++try:
++ from collections.abc import Mapping
++except ImportError:
++ from collections import Mapping
+ try:
+ from collections import OrderedDict
+ except ImportError:
+From 9f1d1f4fbd0804695a976beb191f2c49a2739834 Mon Sep 17 00:00:00 2001
+From: "Sergey G. Brester" <serg.brester@sebres.de>
+Date: Mon, 8 Feb 2021 17:35:59 +0100
+Subject: [PATCH] amend for `Mapping` (jails)
+
+---
+ fail2ban/server/jails.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/fail2ban/server/jails.py b/fail2ban/server/jails.py
+index 972a8c4bd2..27e12ddf65 100644
+--- a/fail2ban/server/jails.py
++++ b/fail2ban/server/jails.py
+@@ -22,7 +22,10 @@
+ __license__ = "GPL"
+
+ from threading import Lock
+-from collections import Mapping
++try:
++ from collections.abc import Mapping
++except ImportError:
++ from collections import Mapping
+
+ from ..exceptions import DuplicateJailException, UnknownJailException
+ from .jail import Jail
diff --git a/main/fish/APKBUILD b/main/fish/APKBUILD
index 2824b76eef..862bb88371 100644
--- a/main/fish/APKBUILD
+++ b/main/fish/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=fish
pkgver=3.3.1
-pkgrel=1
+pkgrel=2
pkgdesc="Modern interactive commandline shell"
url="https://fishshell.com/"
arch="all"
@@ -16,6 +16,7 @@ install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools::noarch"
source="https://github.com/fish-shell/fish-shell/releases/download/$pkgver/fish-$pkgver.tar.xz
README.alpine
+ drop-failed-tests.patch
"
# temp allow textrels on riscv64
@@ -26,7 +27,7 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
- -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DBUILD_DOCS=TRUE
cmake --build build
@@ -80,4 +81,5 @@ tools() {
sha512sums="
fc50ca44fab3f2d942284d4f714150f7ccf1e49c73da36f8d4ae4a33a9b3280f98bed15848839f5d443b4274fd0ff90174bafa6a8e9a4da226dda63d7766a660 fish-3.3.1.tar.xz
c28cef48e3d9cde4956d36192dc221e63eca89282a937e2683578ac0958d98a9c54420aea4f1d91d516f5ee2c74589a75865a973305421e1ad0a9e70854dff4f README.alpine
+f52e61200be5fa736aec6a9c366b8595761f95051e8b2c6bd7cfdda971e65f96289ba1134af3b858accdb744e1689332477bfb528096d8cf01dac44305773ad2 drop-failed-tests.patch
"
diff --git a/main/fish/drop-failed-tests.patch b/main/fish/drop-failed-tests.patch
new file mode 100644
index 0000000000..fb67362517
--- /dev/null
+++ b/main/fish/drop-failed-tests.patch
@@ -0,0 +1,15 @@
+these fail with new libpcre, removed upstream in a different patch that doesn't apply
+https://github.com/fish-shell/fish-shell/commit/ec8844d834cc9fe626e9fc326c6f5410341d532a
+
+---
+--- a/src/fish_tests.cpp
++++ b/src/fish_tests.cpp
+@@ -5723,8 +5723,6 @@
+ {{L"string", L"match", L"-r", L"-a", L"a*", L"b", 0}, STATUS_CMD_OK, L"\n\n"},
+ {{L"string", L"match", L"-r", L"foo\\Kbar", L"foobar", 0}, STATUS_CMD_OK, L"bar\n"},
+ {{L"string", L"match", L"-r", L"(foo)\\Kbar", L"foobar", 0}, STATUS_CMD_OK, L"bar\nfoo\n"},
+- {{L"string", L"match", L"-r", L"(?=ab\\K)", L"ab", 0}, STATUS_CMD_OK, L"\n"},
+- {{L"string", L"match", L"-r", L"(?=ab\\K)..(?=cd\\K)", L"abcd", 0}, STATUS_CMD_OK, L"\n"},
+
+ {{L"string", L"replace", 0}, STATUS_INVALID_ARGS, L""},
+ {{L"string", L"replace", L"", 0}, STATUS_INVALID_ARGS, L""},
diff --git a/main/fontconfig/APKBUILD b/main/fontconfig/APKBUILD
index 7300cb6a0d..36080c24b9 100644
--- a/main/fontconfig/APKBUILD
+++ b/main/fontconfig/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fontconfig
pkgver=2.13.1
-pkgrel=4
+pkgrel=5
pkgdesc="Library for configuring and customizing font access"
url="https://www.freedesktop.org/wiki/Software/fontconfig"
arch="all"
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index 43cc278e84..a6534db2cf 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -5,7 +5,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=freeradius
pkgver=3.0.25
-pkgrel=0
+pkgrel=2
pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
url="https://freeradius.org/"
arch="all"
diff --git a/main/freeswitch/0002-FS-verto-bswap_64.patch b/main/freeswitch/0002-FS-verto-bswap_64.patch
deleted file mode 100644
index 0cee934c79..0000000000
--- a/main/freeswitch/0002-FS-verto-bswap_64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/mod/endpoints/mod_verto/ws.h
-+++ b/src/mod/endpoints/mod_verto/ws.h
-@@ -36,6 +36,9 @@
- ((x>>40) & 0x000000000000FF00) | \
- (x<<56)
- #endif
-+#ifndef __bswap_64
-+#include <byteswap.h>
-+#endif
- #ifdef _MSC_VER
- #ifndef strncasecmp
- #define strncasecmp _strnicmp \ No newline at end of file
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 547567d0b2..c0edabd411 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -1,36 +1,32 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
# Contributor: Michael Mason <ms13sp@gmail.com>
# Contributor: Cameron Banta <cbanta@gmail.com>
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
pkgname=freeswitch
-pkgver=1.10.6
-pkgrel=2
+pkgver=1.10.7
+pkgrel=1
pkgdesc="A communications platform written in C from the ground up"
-url="http://www.freeswitch.org"
+url="https://www.freeswitch.org/"
arch="all"
license="MPL-1.1"
makedepends="
+ apr-dev
bash
bsd-compat-headers
coreutils
curl-dev
diffutils
- flac-dev
flite-dev
- gdbm-dev
- gnutls-dev
ilbc-dev
lame-dev
ldns-dev
libedit-dev
- libexecinfo-dev
libjpeg-turbo-dev
- libogg-dev
- libpri-dev
+ libks-dev
openssl1.1-compat-dev
libpq-dev
libshout-dev
libsndfile-dev
- libvorbis-dev
linux-headers
lua5.3-dev
mpg123-dev
@@ -40,10 +36,12 @@ makedepends="
pcre-dev
perl-dev
portaudio-dev
+ python3-dev
sngtc_client-dev
speex-dev
speexdsp-dev
sqlite-dev
+ libsrtp-dev
tiff-dev
unixodbc-dev
util-linux-dev
@@ -62,17 +60,19 @@ _freeswitch_group=freeswitch
pkgusers="$_freeswitch_user"
pkggroups="$_freeswitch_group"
subpackages="$pkgname-static $pkgname-dev $pkgname-flite $pkgname-timezones::noarch
- $pkgname-sample-config:conf:noarch $pkgname-freetdm $pkgname-sangoma
- $pkgname-snmp $pkgname-pgsql $pkgname-perl $pkgname-perlesl
+ $pkgname-sample-config:conf:noarch $pkgname-sangoma
+ $pkgname-snmp $pkgname-pgsql $pkgname-python3 $pkgname-perl $pkgname-perlesl
$pkgname-openrc $pkgname-dbg"
source="https://files.freeswitch.org/freeswitch-releases/freeswitch-$pkgver.-release.tar.xz
- 0002-FS-verto-bswap_64.patch
configure-lua53.patch
include-lua53.patch
getlib.patch
libvpx-fix-arm-float-abi.patch
disable-Werror.patch
+ explicit-darwin-macro.patch
+ fix-undeclared-function-s390x.patch
+ python-3.10.patch
modules.conf
freeswitch.confd
freeswitch.initd
@@ -80,6 +80,14 @@ source="https://files.freeswitch.org/freeswitch-releases/freeswitch-$pkgver.-rel
builddir="$srcdir/$pkgname-$pkgver.-release"
+# secfixes:
+# 1.10.7-r0:
+# - CVE-2021-37624
+# - CVE-2021-41105
+# - CVE-2021-41145
+# - CVE-2021-41157
+# - CVE-2021-41158
+
prepare() {
default_prepare
autoreconf -vif
@@ -100,16 +108,13 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--with-devrandom=/dev/urandom \
- --with-libpri \
+ --with-python3 \
--disable-debug \
--enable-core-pgsql-support \
--enable-system-lua \
--enable-system-xmlrpc-c
- # build libvpx with -j1, fails to find headers otherwise
make libs/libvpx/libvpx.a
- # build freetdm with -lexecinfo
- make -C libs/freetdm LIBS="-lexecinfo"
# first build libfreeswitch (in parallel)
make src/include/switch_version.h src/include/switch_swigable_cpp.h
make libfreeswitch.la
@@ -142,12 +147,11 @@ package() {
_mv_mod() {
local moddir=usr/lib/freeswitch/mod i=
mkdir -p "$subpkgdir"/$moddir
- for i in $@; do
+ for i in "$@"; do
mv "$pkgdir"/$moddir/$i.so "$subpkgdir"/$moddir/
done
}
-
flite() {
pkgdesc="Freeswitch Text To Speech Module"
install=
@@ -161,14 +165,6 @@ flite() {
# mod_say_th mod_say_he
}
-freetdm() {
- pkgdesc="Freeswitch FreeTDM Module"
- install=
- _mv_mod mod_freetdm ftmod_analog ftmod_analog_em ftmod_libpri \
- ftmod_skel ftmod_zt
- mv "$pkgdir"/usr/lib/libfreetdm.so* "$subpkgdir"/usr/lib/
-}
-
sangoma() {
pkgdesc="Freeswitch Sangoma Media Transcode Codec Module"
install=
@@ -209,8 +205,14 @@ perlesl() {
mv "$pkgdir"/usr/lib/perl5/* "$subpkgdir"/usr/lib/perl5
}
+python3() {
+ pkgdesc="Freeswitch Python3 module"
+ install=
+ _mv_mod mod_python3
+}
+
conf() {
- pkgdesc="Freeswitch sample configureation"
+ pkgdesc="Freeswitch sample configuration"
depends="freeswitch-timezones"
install=
mkdir -p "$subpkgdir"/etc/freeswitch
@@ -222,13 +224,17 @@ conf() {
mkdir -p "$pkgdir"/etc/freeswitch/scripts
}
-sha512sums="1bb518cca959df73859d3e7a5980a5a98ffa3d092d1100fc5d2cce83da649fc6499feaa88d4ea0196149353f9af231ef8e4aeb089959c1ea75c0f98175c599c6 freeswitch-1.10.6.-release.tar.xz
-5f93150e1acd632df98bc3bed5613fb1e45180ae4096dcfee5c060da213c8355339260eaf5758cd77c785f6d84cf0661650a872ec574b586ab19803d4f6955f8 0002-FS-verto-bswap_64.patch
+sha512sums="
+9c0b29f8e631c5e7d073cb2a70c53ffb16780029e462e6171651a54d9f2a2c73f6c871c8bea9e7715ddb40cd7005d73c5931e6a8af33eeb5a01aa7c8a83dda5b freeswitch-1.10.7.-release.tar.xz
222e3510790de29e29428c70325eb1d4e7852eb4315ee546f137293868bd71acf89e7c85c5ca9d0eb708090c9eef91878a8e12c1b9d5cc99a68fecbd42ad962f configure-lua53.patch
c1960f3c7acf729468b819f7f15d66a251c3967b2784bce18c7755b333156e687c55fdc1aceda588ceb1bf9638e2fd4a31a169b00b15c5040cf1001c3c73913b include-lua53.patch
4ceb48f64d2bc26a02cc0846276506241bfd30c156422b0a1d608fd172c099feb5c121a763652e9a45046dcdd0ba0eb71eab240e0c6ce2ad63ff781719e135a4 getlib.patch
98a53f289c3647cafd05b6f847da0504a838a6e06545c133c10fb058c2d941e6bccf2820f44649fc25f94a4a5b7c1280eaee91098e8110f96ed3342c1cb4346c libvpx-fix-arm-float-abi.patch
16e9208fca7f0a1985dd01ec38ddabb6a79da83ad6ab004bb66de528ac45f02fadaddc50a9f228e1aa38fae213fa5af0ca858b7af629b67a7d654339f813a68c disable-Werror.patch
-ceeb2bb37fac580483000daff327a4c005d42b7eabdba4671ed2b0e78cddda8a42ae76e42bdf4a1b2e42874c4709887bcee9cb08a4c1dafcfeaec21e467726bf modules.conf
+7c2fa472a3abb5d735902e9a8f1fc6e9c9053955d453216313dd47a263af290cf1f3a92d7297a380e9bbaa17fddc1aacd55c8a72228d2335a9a7bf4ef01aef6c explicit-darwin-macro.patch
+d91350af634d3e6fd6a460d3b861ab0e7289c206d3200bcd7cb5ef9536df1ac9181f7e84462132c5bc8d72329e2e8683aa99ab399fd58324cd85f0280b424874 fix-undeclared-function-s390x.patch
+4739be0c1c6783ace2bd10f7573b1ca86be013d21a7f973b5fd348c98fb9ed1a548baacee6bb65b7501251106c8dbd7266997f8699d2d7070a2bd7efe145b866 python-3.10.patch
+e495f955bdfd89259d8c907a7159e15bf17bd5933b0a643fba08f022583b518758b2a6ff301b79a24c099352bb39d4724f779dfc76eb924c103d2cb160fc2aa9 modules.conf
a585f6411185a26206137a1ad97a06fd6c73e80c5439e9be45eabfa70e7a83120169ba882971fcd328436c8e0242cbd664170b80754ea2846021689baf1f1595 freeswitch.confd
-643d0a2e43f5d3bf3b99fcb6f6422302cb4b74a95eccf844eafb100b15aa9856b4ff41f112d6637255c2e9e2bec9fedc9a9215dfff214dfb83b52eae16b71dca freeswitch.initd"
+643d0a2e43f5d3bf3b99fcb6f6422302cb4b74a95eccf844eafb100b15aa9856b4ff41f112d6637255c2e9e2bec9fedc9a9215dfff214dfb83b52eae16b71dca freeswitch.initd
+"
diff --git a/main/freeswitch/explicit-darwin-macro.patch b/main/freeswitch/explicit-darwin-macro.patch
new file mode 100644
index 0000000000..7da441c4d5
--- /dev/null
+++ b/main/freeswitch/explicit-darwin-macro.patch
@@ -0,0 +1,15 @@
+diff --git a/libs/apr/include/apr_general.h b/libs/apr/include/apr_general.h
+index 3a95628..42eec83 100644
+--- a/libs/apr/include/apr_general.h
++++ b/libs/apr/include/apr_general.h
+@@ -29,10 +29,6 @@
+ #include "apr_pools.h"
+ #include "apr_errno.h"
+
+-#if !defined(_ANSI_SOURCE) && defined(_DARWIN_C_SOURCE)
+-#define NSIG __DARWIN_NSIG
+-#endif
+-
+ #if APR_HAVE_SIGNAL_H
+ #include <signal.h>
+ #endif
diff --git a/main/freeswitch/fix-undeclared-function-s390x.patch b/main/freeswitch/fix-undeclared-function-s390x.patch
new file mode 100644
index 0000000000..b04672a203
--- /dev/null
+++ b/main/freeswitch/fix-undeclared-function-s390x.patch
@@ -0,0 +1,21 @@
+From 68039d344d8e826e8b403c9cd0284fd07b4495ac Mon Sep 17 00:00:00 2001
+From: Dragos Oancea <dragos@signalwire.com>
+Date: Tue, 26 Oct 2021 08:42:58 +0000
+Subject: [PATCH] [core] fix build SWITCH_BYTE_ORDER == __BIG_ENDIAN
+
+---
+ src/switch_rtp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+index 1880bbb..843ee81 100644
+--- a/src/switch_rtp.c
++++ b/src/switch_rtp.c
+@@ -2155,7 +2155,7 @@ static void switch_send_rtcp_event(switch_rtp_t *rtp_session ,struct switch_rtcp
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value);
+ snprintf(header, sizeof(header), "Source-Lost");
+ #if SWITCH_BYTE_ORDER == __BIG_ENDIAN
+- tmpLost = report->lost; /* signed 24bit will extended signess to int32_t automatically */
++ tmpLost = rtcp_report_block->lost; /* signed 24bit will extended signess to int32_t automatically */
+ #else
+ tmpLost = ntohl(rtcp_report_block->lost)>>8;
+ tmpLost = tmpLost | ((tmpLost & 0x00800000) ? 0xff000000 : 0x00000000); /* ...and signess compensation */
diff --git a/main/freeswitch/modules.conf b/main/freeswitch/modules.conf
index 294f4dba2c..03d0a8ebc8 100644
--- a/main/freeswitch/modules.conf
+++ b/main/freeswitch/modules.conf
@@ -133,7 +133,7 @@ formats/mod_tone_stream
languages/mod_lua
#languages/mod_managed
languages/mod_perl
-#languages/mod_python
+languages/mod_python3
#languages/mod_v8
#languages/mod_yaml
loggers/mod_console
@@ -168,7 +168,5 @@ xml_int/mod_xml_curl
xml_int/mod_xml_rpc
xml_int/mod_xml_scgi
-../../libs/freetdm/mod_freetdm
-
## Experimental Modules (don't cry if they're broken)
#../../contrib/mod/xml_int/mod_xml_odbc
diff --git a/main/freeswitch/python-3.10.patch b/main/freeswitch/python-3.10.patch
new file mode 100644
index 0000000000..2d1d01fd5f
--- /dev/null
+++ b/main/freeswitch/python-3.10.patch
@@ -0,0 +1,22 @@
+diff --git a/configure.ac b/configure.ac
+index 990a59db2a..57a187aa11 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1765,7 +1765,7 @@ then
+
+ AC_MSG_CHECKING([for python distutils])
+ python_result="`$PYTHON -c 'import distutils;' 2>&1`"
+- if test -z "$python_result" ; then
++ if test $? -eq 0; then
+ python_has_distutils="yes"
+ else
+ python_has_distutils="no"
+@@ -1886,7 +1886,7 @@ then
+
+ AC_MSG_CHECKING([for python3 distutils])
+ python3_result="`$PYTHON3 -c 'import distutils;' 2>&1`"
+- if test -z "$python3_result" ; then
++ if test $? -eq 0 ; then
+ python3_has_distutils="yes"
+ else
+ python3_has_distutils="no"
diff --git a/main/freetdm/APKBUILD b/main/freetdm/APKBUILD
new file mode 100644
index 0000000000..6b737467df
--- /dev/null
+++ b/main/freetdm/APKBUILD
@@ -0,0 +1,49 @@
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
+pkgname=freetdm
+# upstream does not tag a release
+# the pkgver is the commit date
+pkgver=0_git20210830
+_commitid=8918ee1c3637cad0f9d41a402d26d3aa076fc202
+pkgrel=1
+pkgdesc="FreeTDM Endpoint Module "
+url="https://github.com/freeswitch/freetdm"
+arch="all"
+license="BSD-3-Clause"
+makedepends="libtool automake autoconf
+freeswitch-dev gsm-dev libpri-dev libpcap-dev zlib-dev
+python3-dev"
+checkdepends="gzip"
+subpackages="$pkgname-dev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/freeswitch/freetdm/archive/$_commitid.tar.gz
+remove-werr.patch"
+builddir="$srcdir"/$pkgname-$_commitid
+
+prepare() {
+ default_prepare
+ sh bootstrap
+}
+
+build() {
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-libpri \
+ --with-modinstdir=/usr/lib/freeswitch
+ make
+}
+
+check() {
+ make check
+}
+
+package() {
+ mkdir -p "$pkgdir"/etc/freeswitch/autoload_configs
+ echo '<load module="mod_freetdm"/>' >> "$pkgdir"/etc/freeswitch/autoload_configs/modules.conf.xml
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+059dd7c78a2fa08d79f9e4b9301ac4a0c8ccad9c32359e7c25f4fe5bdff33f9d146be746968baeb03b2c8702c33dbb962fc192f7fd20c8f8d2b5dbb81f2ecb77 freetdm-0_git20210830.tar.gz
+9bbf829370a374c9e09b1bfc02be158695213f4e62d116ee25960f5d05a5a52a8b7956e1def6795686e054f9d03aa270e345930a3401025450a23fb381ac4450 remove-werr.patch
+"
diff --git a/main/freetdm/remove-werr.patch b/main/freetdm/remove-werr.patch
new file mode 100644
index 0000000000..1aee35c0a2
--- /dev/null
+++ b/main/freetdm/remove-werr.patch
@@ -0,0 +1,44 @@
+diff --git a/configure.ac b/configure.ac
+index aefebab..8b5041d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,7 +88,7 @@ AC_ARG_ENABLE([enable_64],
+
+ case "${ax_cv_c_compiler_vendor}" in
+ gnu)
+- COMP_VENDOR_CFLAGS="-ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -O0"
++ COMP_VENDOR_CFLAGS="-ffast-math -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -O0"
+ ;;
+ sun)
+ COMP_VENDOR_CFLAGS="-xc99=all -mt -xCC -xvpara"
+@@ -97,7 +97,7 @@ sun)
+ fi
+ ;;
+ *)
+- COMP_VENDOR_COMPAT_CFLAGS="-Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes"
++ COMP_VENDOR_COMPAT_CFLAGS="-Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes"
+ COMP_VENDOR_CFLAGS="-std=c99 $COMP_VENDOR_COMPAT_CFLAGS"
+ ;;
+ esac
+diff --git a/mod_freetdm/CMakeLists.txt b/mod_freetdm/CMakeLists.txt
+index 25847e7..7c7505a 100644
+--- a/mod_freetdm/CMakeLists.txt
++++ b/mod_freetdm/CMakeLists.txt
+@@ -5,7 +5,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+ PROJECT(mod_freetdm)
+
+ IF(NOT DEFINED WIN32)
+- ADD_DEFINITIONS(-g -O2 -ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -O0 -g -ggdb -DPACKAGE_NAME=\"freetdm\" -DPACKAGE_TARNAME=\"freetdm\" -DPACKAGE_VERSION=\"pre-alpha\" -DPACKAGE_STRING=\"freetdm\ pre-alpha\" -DPACKAGE_BUGREPORT=\"bugs@freeswitch.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"libfreetdm\" -DVERSION=\"0.1\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_LIBDL=1 -DHAVE_LIBPTHREAD=1 -DHAVE_LIBM=1 -DSIZEOF_LONG=8 -DHAVE_NETINET_SCTP_H=1 -DHAVE_NETDB_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_GETHOSTBYNAME_R=1) # -DDEBUG=/\*\*/)
++ ADD_DEFINITIONS(-g -O2 -ffast-math -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -O0 -g -ggdb -DPACKAGE_NAME=\"freetdm\" -DPACKAGE_TARNAME=\"freetdm\" -DPACKAGE_VERSION=\"pre-alpha\" -DPACKAGE_STRING=\"freetdm\ pre-alpha\" -DPACKAGE_BUGREPORT=\"bugs@freeswitch.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"libfreetdm\" -DVERSION=\"0.1\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_LIBDL=1 -DHAVE_LIBPTHREAD=1 -DHAVE_LIBM=1 -DSIZEOF_LONG=8 -DHAVE_NETINET_SCTP_H=1 -DHAVE_NETDB_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_GETHOSTBYNAME_R=1) # -DDEBUG=/\*\*/)
+ ENDIF(NOT DEFINED WIN32)
+
+ # includes
+@@ -19,7 +19,7 @@ INCLUDE_DIRECTORIES(${mod_freetdm_INCLUDES})
+
+ LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/..)
+ ADD_LIBRARY(${PROJECT_NAME} SHARED mod_freetdm.c)
+-TARGET_LINK_LIBRARIES(${PROJECT_NAME} freetdm -fPIC -Werror -fvisibility=hidden)
++TARGET_LINK_LIBRARIES(${PROJECT_NAME} freetdm -fPIC -fvisibility=hidden)
+
+ IF(DEFINED WIN32)
+ SET(EXT lib)
diff --git a/main/freetds/APKBUILD b/main/freetds/APKBUILD
index 8bc97e3749..6ca571cd09 100644
--- a/main/freetds/APKBUILD
+++ b/main/freetds/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=freetds
-pkgver=1.3.3
-pkgrel=2
+pkgver=1.3.6
+pkgrel=0
pkgdesc="Tabular Datastream Library"
url="https://www.freetds.org/"
arch="all"
@@ -39,6 +39,6 @@ package() {
}
sha512sums="
-889ed65e091f848112eb26a203f39de5998749540a40b7988ba0f3c56309cc49dc9c87f3eac3d27e6e568964f8ff72592feea4d10d5c73bd9f9f696dc82513a2 freetds-1.3.3.tar.bz2
+37f6408b85dade5944b4d0f48400d85b1048374469c91955749630d680911760edb2f952104b2c7450cb55696d3a3616293f87ab9ac66e218c0c6504f3fa66e3 freetds-1.3.6.tar.bz2
9ca126d9316cf48fa5f9572b5aa9122eb114033627ab75f6715bce0260d70c6a7bb8a71ecb1e209a4f83416332d10942c7aaf02a5249948cf1cec6a1a457a236 fix-includes.patch
"
diff --git a/main/freetype/APKBUILD b/main/freetype/APKBUILD
index 9f51580ac9..540db70cfd 100644
--- a/main/freetype/APKBUILD
+++ b/main/freetype/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=freetype
-pkgver=2.11.0
+pkgver=2.11.1
pkgrel=0
pkgdesc="TrueType font rendering library"
url="https://www.freetype.org/"
@@ -52,7 +52,7 @@ package() {
}
sha512sums="
-bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d freetype-2.11.0.tar.xz
+0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08 freetype-2.11.1.tar.xz
580fe59acddfd41966e387bdb6a88336b8bc119cc3d60d8689be20c96fb0dd07c5138ea31f6cb9c854f497ecb41c3adc49eb3ec16a34b2e010e8294851770763 0001-Enable-table-validation-modules.patch
72883fa203fd2552a7b1b8c39b4aaa68d407c62c289236031cd0fa1c8cdc6ad38e90d3b53f8ee682064986d09c9455961f4941c80566b150d15d5539a716c190 subpixel.patch
"
diff --git a/main/fribidi/APKBUILD b/main/fribidi/APKBUILD
index 96b36a9446..8323819071 100644
--- a/main/fribidi/APKBUILD
+++ b/main/fribidi/APKBUILD
@@ -1,11 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fribidi
pkgver=1.0.11
-pkgrel=0
+pkgrel=1
pkgdesc="Free Implementation of the Unicode Bidirectional Algorithm"
url="https://github.com/fribidi/fribidi"
arch="all"
license="LGPL-2.0-or-later"
+makedepends="meson"
subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
source="https://github.com/fribidi/fribidi/releases/download/v$pkgver/fribidi-$pkgver.tar.xz"
@@ -14,20 +15,18 @@ source="https://github.com/fribidi/fribidi/releases/download/v$pkgver/fribidi-$p
# - CVE-2019-18397
build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --enable-static
- make
+ abuild-meson \
+ -Ddefault_library=both \
+ . output
+ meson compile ${JOBS:+-j ${JOBS}} -C output
}
check() {
- make check
+ meson test --no-rebuild -v -C output
}
package() {
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
sha512sums="
diff --git a/main/gawk/APKBUILD b/main/gawk/APKBUILD
index a6f690d55b..97f60b585f 100644
--- a/main/gawk/APKBUILD
+++ b/main/gawk/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: TBK <alpine@jjtc.eu>
pkgname=gawk
-pkgver=5.1.0
+pkgver=5.1.1
pkgrel=0
pkgdesc="GNU awk pattern-matching language"
url="https://www.gnu.org/software/gawk/gawk.html"
@@ -47,5 +47,7 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="971e6a7617eb051d587984f64be2ff830e49eb60721c3401e8944401e3c3a7cd3334f0334b6e28bfc9283aaff15d83b0933f1fd77b0f8c7059068fa3f94c3cb4 gawk-5.1.0.tar.xz
-5bbb175da2d93c9c1d422a4e5a2c2400486c0204929ac6771bf2c2effbee37b84ef9441821a47e1fdc4a337e3cb8ad92cb67d473822876ea790dd373822d4dbd echild-strerror.patch"
+sha512sums="
+794538fff03fdb9a8527a6898b26383d01988e8f8456f8d48131676387669a8bb3e706fa1a17f6b6316ddba0ebe653c24ad5dd769f357de509d6ec25f3ff1a43 gawk-5.1.1.tar.xz
+5bbb175da2d93c9c1d422a4e5a2c2400486c0204929ac6771bf2c2effbee37b84ef9441821a47e1fdc4a337e3cb8ad92cb67d473822876ea790dd373822d4dbd echild-strerror.patch
+"
diff --git a/main/gcc/0001-posix_memalign.patch b/main/gcc/0001-posix_memalign.patch
index d5d8e98a88..a2d35354f4 100644
--- a/main/gcc/0001-posix_memalign.patch
+++ b/main/gcc/0001-posix_memalign.patch
@@ -1,4 +1,4 @@
-From 3d818cf1e0a28d094ea415f6748fd1b7285519fc Mon Sep 17 00:00:00 2001
+From e289226f5f16db14ca549efb41ca82accfe7ea8a Mon Sep 17 00:00:00 2001
From: Szabolcs Nagy <nsz@port70.net>
Date: Fri, 26 Jan 2018 20:32:50 +0000
Subject: [PATCH] posix_memalign
@@ -8,7 +8,7 @@ Subject: [PATCH] posix_memalign
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index 87344d9383f..ece428df487 100644
+index 1b0bfe37852..d7b2b19bb3c 100644
--- a/gcc/config/i386/pmm_malloc.h
+++ b/gcc/config/i386/pmm_malloc.h
@@ -27,12 +27,13 @@
@@ -38,5 +38,5 @@ index 87344d9383f..ece428df487 100644
else
return NULL;
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0002-gcc-poison-system-directories.patch b/main/gcc/0002-gcc-poison-system-directories.patch
index 867ba512c0..73b93df7b5 100644
--- a/main/gcc/0002-gcc-poison-system-directories.patch
+++ b/main/gcc/0002-gcc-poison-system-directories.patch
@@ -1,4 +1,4 @@
-From 6fcb950659e4382067ff4b297547b178f0697a08 Mon Sep 17 00:00:00 2001
+From 48be81c9accb55c3c5ee683c84fa1f908bb18764 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 08:59:00 +0400
Subject: [PATCH] gcc: poison-system-directories
@@ -26,10 +26,10 @@ Upstream-Status: Pending
7 files changed, 68 insertions(+)
diff --git a/gcc/common.opt b/gcc/common.opt
-index ec5235c3a41..ca942863064 100644
+index a75b44ee47e..d15105a73f3 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
-@@ -682,6 +682,10 @@ Wreturn-local-addr
+@@ -683,6 +683,10 @@ Wreturn-local-addr
Common Var(warn_return_local_addr) Init(1) Warning
Warn about returning a pointer/reference to a local or temporary variable.
@@ -41,10 +41,10 @@ index ec5235c3a41..ca942863064 100644
Common Var(warn_shadow) Warning
Warn when one variable shadows another. Same as -Wshadow=global.
diff --git a/gcc/config.in b/gcc/config.in
-index 364eba47737..9551c0dfdf9 100644
+index 2de5a463315..059c818c895 100644
--- a/gcc/config.in
+++ b/gcc/config.in
-@@ -224,6 +224,12 @@
+@@ -218,6 +218,12 @@
#endif
@@ -58,18 +58,18 @@ index 364eba47737..9551c0dfdf9 100644
optimizer and back end) to be checked for dynamic type safety at runtime.
This is quite expensive. */
diff --git a/gcc/configure b/gcc/configure
-index 84e0ea21054..3bb7b5b318a 100755
+index 708328e1670..4b977e313b5 100755
--- a/gcc/configure
+++ b/gcc/configure
-@@ -1010,6 +1010,7 @@ with_system_zlib
- enable_maintainer_mode
+@@ -1020,6 +1020,7 @@ enable_maintainer_mode
enable_link_mutex
+ enable_link_serialization
enable_version_specific_runtime_libs
+enable_poison_system_directories
enable_plugin
enable_host_shared
enable_libquadmath_support
-@@ -1766,6 +1767,8 @@ Optional Features:
+@@ -1782,6 +1783,8 @@ Optional Features:
--enable-version-specific-runtime-libs
specify that runtime libraries should be installed
in a compiler-specific directory
@@ -78,7 +78,7 @@ index 84e0ea21054..3bb7b5b318a 100755
--enable-plugin enable plugin support
--enable-host-shared build host code as shared libraries
--disable-libquadmath-support
-@@ -30276,6 +30279,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+@@ -31790,6 +31793,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
fi
@@ -99,10 +99,10 @@ index 84e0ea21054..3bb7b5b318a 100755
diff --git a/gcc/configure.ac b/gcc/configure.ac
-index d068618bd8f..44ea4725620 100644
+index df1c9cc3200..5461bab88a9 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
-@@ -6608,6 +6608,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+@@ -7311,6 +7311,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
[specify that runtime libraries should be
installed in a compiler-specific directory])])
@@ -120,10 +120,10 @@ index d068618bd8f..44ea4725620 100644
AC_SUBST(subdirs)
AC_SUBST(srcdir)
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 6d3cfcc664e..9d9a4b78ffd 100644
+index 5a4b3c6c234..9d1126e9751 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
-@@ -348,6 +348,7 @@ Objective-C and Objective-C++ Dialects}.
+@@ -369,6 +369,7 @@ Objective-C and Objective-C++ Dialects}.
-Wpacked -Wno-packed-bitfield-compat -Wpacked-not-aligned -Wpadded @gol
-Wparentheses -Wno-pedantic-ms-format @gol
-Wpointer-arith -Wno-pointer-compare -Wno-pointer-to-int-cast @gol
@@ -131,7 +131,7 @@ index 6d3cfcc664e..9d9a4b78ffd 100644
-Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls @gol
-Wrestrict -Wno-return-local-addr -Wreturn-type @gol
-Wno-scalar-storage-order -Wsequence-point @gol
-@@ -6927,6 +6928,14 @@ made up of data only and thus requires no special treatment. But, for
+@@ -7727,6 +7728,14 @@ made up of data only and thus requires no special treatment. But, for
most targets, it is made up of code and thus requires the stack to be
made executable in order for the program to work properly.
@@ -147,10 +147,10 @@ index 6d3cfcc664e..9d9a4b78ffd 100644
@opindex Wfloat-equal
@opindex Wno-float-equal
diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 9f790db0daf..b2200c5185a 100644
+index 8ba410c9e17..a83ba34ac4b 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
-@@ -1041,6 +1041,8 @@ proper position among the other output files. */
+@@ -1152,6 +1152,8 @@ proper position among the other output files. */
"%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
"%X %{o*} %{e*} %{N} %{n} %{r}\
%{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
@@ -160,7 +160,7 @@ index 9f790db0daf..b2200c5185a 100644
VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
%{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
diff --git a/gcc/incpath.c b/gcc/incpath.c
-index 8a2bda00f80..9098ab044ab 100644
+index 446d280321d..fbfc0ce03b8 100644
--- a/gcc/incpath.c
+++ b/gcc/incpath.c
@@ -26,6 +26,7 @@
@@ -171,7 +171,7 @@ index 8a2bda00f80..9098ab044ab 100644
/* Microsoft Windows does not natively support inodes.
VMS has non-numeric inodes. */
-@@ -393,6 +394,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
+@@ -395,6 +396,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
}
fprintf (stderr, _("End of search list.\n"));
}
@@ -199,5 +199,5 @@ index 8a2bda00f80..9098ab044ab 100644
/* Use given -I paths for #include "..." but not #include <...>, and
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch b/main/gcc/0003-specs-turn-on-Wl-z-now-by-default.patch
index a9e012d580..303d7cb198 100644
--- a/main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+++ b/main/gcc/0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -1,39 +1,44 @@
-From 8e72eea50b282e77163cc3c907170a9da8a638e3 Mon Sep 17 00:00:00 2001
+From 767b97ca271e82601a435015190fd15bfb28ae12 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:45:49 +0000
-Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
+Subject: [PATCH] specs: turn on -Wl,-z,now by default
+Previously, we also used to turn on -z relro here, but we now build
+binutils with --enable-relro, which is functionally equivalent.
+
+Binutils does not appear to have a similar option for enabling -z
+now by default.
---
gcc/doc/invoke.texi | 3 +++
gcc/gcc.c | 1 +
2 files changed, 4 insertions(+)
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 9d9a4b78ffd..129dc5b11f3 100644
+index 9d1126e9751..4b8335bbd1f 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
-@@ -14666,6 +14666,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -15920,6 +15920,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
linker. When using the GNU linker, you can also get the same effect with
@option{-Wl,-Map=output.map}.
+NOTE: In Alpine Linux, for LDFLAGS, the option
-+@option{-Wl,-z,relro,now} is used. To disable, use @option{-Wl,-z,norelro}.
++@option{-Wl,-z,now} is used. To disable, use @option{-Wl,-z,nonow}.
+
@item -u @var{symbol}
@opindex u
Pretend the symbol @var{symbol} is undefined, to force linking of
diff --git a/gcc/gcc.c b/gcc/gcc.c
-index b2200c5185a..625c9ab7902 100644
+index a83ba34ac4b..faf9ce76b3d 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
-@@ -1039,6 +1039,7 @@ proper position among the other output files. */
+@@ -1150,6 +1150,7 @@ proper position among the other output files. */
"%{flto|flto=*:%<fcompare-debug*} \
%{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
"%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
-+ "-z relro -z now " \
++ "-z now " \
"%X %{o*} %{e*} %{N} %{n} %{r}\
%{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
%{Wno-poison-system-directories:--no-poison-system-directories} \
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch b/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
index e0fb1a662c..ad5c8948bd 100644
--- a/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+++ b/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
@@ -1,4 +1,4 @@
-From 43d2fb2068739661a61ded0a1124e98947773831 Mon Sep 17 00:00:00 2001
+From b8abbd503d1be992bf1d204f0e6de5260fcdf533 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:46:22 +0000
Subject: [PATCH] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC,
@@ -10,10 +10,10 @@ Subject: [PATCH] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC,
2 files changed, 10 insertions(+)
diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
-index db91a36794a..ed976c71404 100644
+index 9f993c4aff2..7db314195ff 100644
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/gcc/c-family/c-cppbuiltin.c
-@@ -1385,6 +1385,10 @@ c_cpp_builtins (cpp_reader *pfile)
+@@ -1421,6 +1421,10 @@ c_cpp_builtins (cpp_reader *pfile)
builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
@@ -25,10 +25,10 @@ index db91a36794a..ed976c71404 100644
if (flag_gnu89_inline)
cpp_define (pfile, "__GNUC_GNU_INLINE__");
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 129dc5b11f3..1b7ef0c68c6 100644
+index 4b8335bbd1f..833164e0a2b 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
-@@ -9231,6 +9231,12 @@ also turns on the following optimization flags:
+@@ -10224,6 +10224,12 @@ also turns on the following optimization flags:
Please note the warning under @option{-fgcse} about
invoking @option{-O2} on programs that use computed gotos.
@@ -42,5 +42,5 @@ index 129dc5b11f3..1b7ef0c68c6 100644
@opindex O3
Optimize yet more. @option{-O3} turns on all optimizations specified
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch b/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
index 19193a6368..1e04567368 100644
--- a/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+++ b/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
@@ -1,4 +1,4 @@
-From ae3a276ae169a782fc114655343afef6bbc1a3ae Mon Sep 17 00:00:00 2001
+From 1837896f54bd318788c1ba6dbd19c3efe147ba20 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:46:56 +0000
Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
@@ -22,7 +22,7 @@ Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
14 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index e587e2e9ad6..1d1017aa523 100644
+index 7f2529a2a1d..b097e1688aa 100644
--- a/gcc/config/aarch64/aarch64-linux.h
+++ b/gcc/config/aarch64/aarch64-linux.h
@@ -35,6 +35,7 @@
@@ -34,7 +34,7 @@ index e587e2e9ad6..1d1017aa523 100644
%{shared:-shared} \
%{symbolic:-Bsymbolic} \
diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
-index e25fcac3c59..22b2f7b0d14 100644
+index c1dae8ca2cf..a87dc740171 100644
--- a/gcc/config/alpha/linux-elf.h
+++ b/gcc/config/alpha/linux-elf.h
@@ -37,7 +37,7 @@ along with GCC; see the file COPYING3. If not see
@@ -47,7 +47,7 @@ index e25fcac3c59..22b2f7b0d14 100644
%{shared:-shared} \
%{!shared: \
diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
-index 0ec3aa53189..f8bda84de2a 100644
+index 0c1c4e70b6b..8b581afacdd 100644
--- a/gcc/config/arm/linux-elf.h
+++ b/gcc/config/arm/linux-elf.h
@@ -70,6 +70,7 @@
@@ -59,16 +59,19 @@ index 0ec3aa53189..f8bda84de2a 100644
SUBTARGET_EXTRA_LINK_SPEC
diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index ff2e880b1fa..7f30c363e4a 100644
+index 5ebbf42a13d..902378e1bad 100644
--- a/gcc/config/gnu-user.h
+++ b/gcc/config/gnu-user.h
-@@ -136,17 +136,17 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#define LIBASAN_EARLY_SPEC "%{!shared:libasan_preinit%O%s} " \
"%{static-libasan:%{!shared:" \
LD_STATIC_OPTION " --whole-archive -lasan --no-whole-archive " \
- LD_DYNAMIC_OPTION "}}%{!static-libasan:-lasan}"
+ LD_DYNAMIC_OPTION "}}%{!static-libasan:%{!fuse-ld=gold:--push-state} --no-as-needed -lasan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #undef LIBTSAN_EARLY_SPEC
+ #undef LIBHWASAN_EARLY_SPEC
+ #define LIBHWASAN_EARLY_SPEC "%{static-libhwasan:%{!shared:" \
+ LD_STATIC_OPTION " --whole-archive -lhwasan --no-whole-archive " \
+@@ -145,12 +145,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \
"%{static-libtsan:%{!shared:" \
LD_STATIC_OPTION " --whole-archive -ltsan --no-whole-archive " \
@@ -84,10 +87,10 @@ index ff2e880b1fa..7f30c363e4a 100644
#undef TARGET_F951_OPTIONS
diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index ae4aa844f02..54b91c0492a 100644
+index a23e7ab3eb7..12ac8cb93a9 100644
--- a/gcc/config/i386/gnu-user.h
+++ b/gcc/config/i386/gnu-user.h
-@@ -74,7 +74,7 @@ along with GCC; see the file COPYING3. If not see
+@@ -68,7 +68,7 @@ along with GCC; see the file COPYING3. If not see
{ "link_emulation", GNU_USER_LINK_EMULATION },\
{ "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
@@ -97,7 +100,7 @@ index ae4aa844f02..54b91c0492a 100644
%{!static: \
%{!static-pie: \
diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index 785c68220b8..21dd66b412a 100644
+index f3e25b1412a..712b0f1c30e 100644
--- a/gcc/config/i386/gnu-user64.h
+++ b/gcc/config/i386/gnu-user64.h
@@ -56,6 +56,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
@@ -109,7 +112,7 @@ index 785c68220b8..21dd66b412a 100644
%{!shared: \
%{!static: \
diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
-index ee38e218aec..0325971d818 100644
+index ac40c3dfd3f..6e19e25c35a 100644
--- a/gcc/config/ia64/linux.h
+++ b/gcc/config/ia64/linux.h
@@ -58,7 +58,7 @@ do { \
@@ -122,7 +125,7 @@ index ee38e218aec..0325971d818 100644
%{!shared: \
%{!static: \
diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index 5d0782100bb..4be5fbb2191 100644
+index a390bcece83..be0ee289367 100644
--- a/gcc/config/mips/gnu-user.h
+++ b/gcc/config/mips/gnu-user.h
@@ -55,6 +55,7 @@ along with GCC; see the file COPYING3. If not see
@@ -134,7 +137,7 @@ index 5d0782100bb..4be5fbb2191 100644
%{!static: \
%{rdynamic:-export-dynamic} \
diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 4afef7c228c..ba1a6e60e05 100644
+index fce5b896e6e..ee29979dd34 100644
--- a/gcc/config/riscv/linux.h
+++ b/gcc/config/riscv/linux.h
@@ -58,6 +58,7 @@ along with GCC; see the file COPYING3. If not see
@@ -142,14 +145,14 @@ index 4afef7c228c..ba1a6e60e05 100644
#define LINK_SPEC "\
+-as-needed \
- -melf" XLEN_SPEC "lriscv" LD_EMUL_SUFFIX " \
+ -melf" XLEN_SPEC DEFAULT_ENDIAN_SPEC "riscv" LD_EMUL_SUFFIX " \
%{mno-relax:--no-relax} \
- %{shared} \
+ %{mbig-endian:-EB} \
diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
-index 2ded3301282..a1e44ddcc0d 100644
+index e3f2cd254f6..43499ed29cf 100644
--- a/gcc/config/rs6000/linux64.h
+++ b/gcc/config/rs6000/linux64.h
-@@ -457,13 +457,13 @@ extern int dot_symbols;
+@@ -374,13 +374,13 @@ extern int dot_symbols;
" -m elf64ppc")
#endif
@@ -166,7 +169,7 @@ index 2ded3301282..a1e44ddcc0d 100644
%{rdynamic:-export-dynamic} \
-dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index 9ade72114e9..9490b84a153 100644
+index 510abe169c5..3c1f3a8ec5d 100644
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -789,7 +789,7 @@ GNU_USER_TARGET_CC1_SPEC
@@ -179,7 +182,7 @@ index 9ade72114e9..9490b84a153 100644
-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
-index 6919b468f06..56d52d41b31 100644
+index daa48fdfc2b..2fcfc5d770f 100644
--- a/gcc/config/s390/linux.h
+++ b/gcc/config/s390/linux.h
@@ -82,7 +82,7 @@ along with GCC; see the file COPYING3. If not see
@@ -192,7 +195,7 @@ index 6919b468f06..56d52d41b31 100644
%{!shared: \
%{static:-static} \
diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
-index 63853e60c03..de6d8675456 100644
+index 2550d7ee8f0..7596d0b2757 100644
--- a/gcc/config/sparc/linux.h
+++ b/gcc/config/sparc/linux.h
@@ -81,7 +81,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
@@ -205,10 +208,10 @@ index 63853e60c03..de6d8675456 100644
%{!shared: \
%{!static: \
diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 625c9ab7902..7aec9d3a016 100644
+index faf9ce76b3d..1ad5da6d769 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
-@@ -695,8 +695,11 @@ proper position among the other output files. */
+@@ -737,8 +737,11 @@ proper position among the other output files. */
#ifdef LIBASAN_EARLY_SPEC
#define LIBASAN_SPEC STATIC_LIBASAN_LIBS
#elif defined(HAVE_LD_STATIC_DYNAMIC)
@@ -222,7 +225,7 @@ index 625c9ab7902..7aec9d3a016 100644
STATIC_LIBASAN_LIBS
#else
#define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -713,8 +716,11 @@ proper position among the other output files. */
+@@ -773,8 +776,11 @@ proper position among the other output files. */
#ifdef LIBTSAN_EARLY_SPEC
#define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
#elif defined(HAVE_LD_STATIC_DYNAMIC)
@@ -236,7 +239,7 @@ index 625c9ab7902..7aec9d3a016 100644
STATIC_LIBTSAN_LIBS
#else
#define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -731,8 +737,11 @@ proper position among the other output files. */
+@@ -791,8 +797,11 @@ proper position among the other output files. */
#ifdef LIBLSAN_EARLY_SPEC
#define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
#elif defined(HAVE_LD_STATIC_DYNAMIC)
@@ -250,7 +253,7 @@ index 625c9ab7902..7aec9d3a016 100644
STATIC_LIBLSAN_LIBS
#else
#define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -747,8 +756,11 @@ proper position among the other output files. */
+@@ -807,8 +816,11 @@ proper position among the other output files. */
#define STATIC_LIBUBSAN_LIBS \
" %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
#ifdef HAVE_LD_STATIC_DYNAMIC
@@ -265,5 +268,5 @@ index 625c9ab7902..7aec9d3a016 100644
#else
#define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch b/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch
index 705622a43c..02186b03f6 100644
--- a/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch
+++ b/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch
@@ -1,4 +1,4 @@
-From fe4ed38e850c9965482a28e16857dc4a451bbfc6 Mon Sep 17 00:00:00 2001
+From 1ba693868db68bef5178fd797c9e7d2cc4128182 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:47:43 +0000
Subject: [PATCH] Enable -Wformat and -Wformat-security by default.
@@ -8,10 +8,10 @@ Subject: [PATCH] Enable -Wformat and -Wformat-security by default.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
-index c49da99d395..93f25319005 100644
+index 2005b783c68..c5c6af427cc 100644
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
-@@ -599,7 +599,7 @@ Warn about function calls with format strings that write past the end
+@@ -637,7 +637,7 @@ Warn about function calls with format strings that write past the end
of the destination region. Same as -Wformat-overflow=1.
Wformat-security
@@ -20,7 +20,7 @@ index c49da99d395..93f25319005 100644
Warn about possible security problems with format functions.
Wformat-signedness
-@@ -620,7 +620,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
+@@ -658,7 +658,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
Warn about zero-length formats.
Wformat=
@@ -30,5 +30,5 @@ index c49da99d395..93f25319005 100644
Wformat-overflow=
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0007-Enable-Wtrampolines-by-default.patch b/main/gcc/0007-Enable-Wtrampolines-by-default.patch
index 56b894794e..ce5da3df86 100644
--- a/main/gcc/0007-Enable-Wtrampolines-by-default.patch
+++ b/main/gcc/0007-Enable-Wtrampolines-by-default.patch
@@ -1,4 +1,4 @@
-From 937c028663fa21fe9694a5725d1e96f3dbfb93fd Mon Sep 17 00:00:00 2001
+From eb2f1f7d7c503959279a7317af7b9a7625eecc6e Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:48:24 +0000
Subject: [PATCH] Enable -Wtrampolines by default.
@@ -8,10 +8,10 @@ Subject: [PATCH] Enable -Wtrampolines by default.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gcc/common.opt b/gcc/common.opt
-index ca942863064..0a0ab6195ee 100644
+index d15105a73f3..29f9504cb68 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
-@@ -774,7 +774,7 @@ Common Var(warn_system_headers) Warning
+@@ -775,7 +775,7 @@ Common Var(warn_system_headers) Warning
Do not suppress warnings from system headers.
Wtrampolines
@@ -21,5 +21,5 @@ index ca942863064..0a0ab6195ee 100644
Wtype-limits
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch b/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
index c597ae410a..79bca264b8 100644
--- a/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+++ b/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
@@ -1,4 +1,4 @@
-From 43813024350c27cf11fc07dcd3d7a02f752bd0c7 Mon Sep 17 00:00:00 2001
+From 7a4086e83e3abbf2c20b7211e2a2c0bf00f25ff8 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:49:40 +0000
Subject: [PATCH] Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
@@ -10,10 +10,10 @@ Subject: [PATCH] Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 7aec9d3a016..daeb4d0c8ea 100644
+index 1ad5da6d769..99314032ec2 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
-@@ -886,6 +886,12 @@ proper position among the other output files. */
+@@ -989,6 +989,12 @@ proper position among the other output files. */
#define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
#endif
@@ -26,20 +26,20 @@ index 7aec9d3a016..daeb4d0c8ea 100644
#ifndef LINK_SSP_SPEC
#ifdef TARGET_LIBC_PROVIDES_SSP
#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1170,7 +1176,7 @@ static const char *cc1_options =
+@@ -1288,7 +1294,7 @@ static const char *cc1_options =
%{-version:--version}\
%{-help=*:--help=%*}\
- %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
+ %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %w%b.s}}}\
- %{fsyntax-only:-o %j} %{-param*}\
+ %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
%{coverage:-fprofile-arcs -ftest-coverage}\
%{fprofile-arcs|fprofile-generate*|coverage:\
%{!fprofile-update=single:\
diff --git a/gcc/params.opt b/gcc/params.opt
-index 4aec480798b..eaecfab37ad 100644
+index 8ba281b4cfa..bab39cdf8a2 100644
--- a/gcc/params.opt
+++ b/gcc/params.opt
-@@ -853,7 +853,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
+@@ -946,7 +946,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
The maximum number of SSA_NAME assignments to follow in determining a value.
-param=ssp-buffer-size=
@@ -49,5 +49,5 @@ index 4aec480798b..eaecfab37ad 100644
-param=stack-clash-protection-guard-size=
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch b/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
index 13d742cb27..03e07f63fa 100644
--- a/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+++ b/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
@@ -1,4 +1,4 @@
-From 506bda71fad5e51ffe5d1cfbf408f56a5e67afed Mon Sep 17 00:00:00 2001
+From 1c38cbf1f75066c3acc145f449f1fbd0b5de7968 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:50:33 +0000
Subject: [PATCH] Ensure that msgfmt doesn't encounter problems during gcc
@@ -26,7 +26,7 @@ https://bugs.gentoo.org/295480
2 files changed, 2 insertions(+)
diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
-index a9391d8d167..f7eee24dc8c 100644
+index ab716ff04ea..e595268d9fc 100644
--- a/libstdc++-v3/po/Makefile.am
+++ b/libstdc++-v3/po/Makefile.am
@@ -38,6 +38,7 @@ MSGFMT = msgfmt
@@ -38,10 +38,10 @@ index a9391d8d167..f7eee24dc8c 100644
all-local: all-local-$(USE_NLS)
diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
-index a0f84b0cfa0..ab24a47a2fd 100644
+index 8edd2e05639..63f61fcf96f 100644
--- a/libstdc++-v3/po/Makefile.in
+++ b/libstdc++-v3/po/Makefile.in
-@@ -548,6 +548,7 @@ uninstall-am:
+@@ -553,6 +553,7 @@ uninstall-am:
.po.mo:
@@ -50,5 +50,5 @@ index a0f84b0cfa0..ab24a47a2fd 100644
all-local: all-local-$(USE_NLS)
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch b/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
index fb802d8306..9bc3cdc53e 100644
--- a/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+++ b/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
@@ -1,4 +1,4 @@
-From 311daa31ea5f1f0b410c58aeda7c2c4635ec0e2b Mon Sep 17 00:00:00 2001
+From e4c844ce0c1c355c2d1cf6a6e1595030b8ce2a5e Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:52:07 +0000
Subject: [PATCH] Don't declare asprintf if defined as a macro.
@@ -8,10 +8,10 @@ Subject: [PATCH] Don't declare asprintf if defined as a macro.
1 file changed, 3 insertions(+)
diff --git a/include/libiberty.h b/include/libiberty.h
-index 141cb886a85..fa0e78eb62f 100644
+index f4c0fe11d6f..cf4b1043e4d 100644
--- a/include/libiberty.h
+++ b/include/libiberty.h
-@@ -645,8 +645,11 @@ extern int pwait (int, int *, int);
+@@ -652,8 +652,11 @@ extern void *bsearch_r (const void *, const void *,
/* Like sprintf but provides a pointer to malloc'd storage, which must
be freed by the caller. */
@@ -24,5 +24,5 @@ index 141cb886a85..fa0e78eb62f 100644
/* Like asprintf but allocates memory without fail. This works like
xmalloc. */
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch b/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch
index 6a1b2c049f..90017bb408 100644
--- a/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch
+++ b/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch
@@ -1,4 +1,4 @@
-From 2146e96bc76ef7d1e6796f991b880ebd0302afa4 Mon Sep 17 00:00:00 2001
+From 79309ae34db26104ec85f6af31a4a8133142fe6d Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:53:00 +0000
Subject: [PATCH] libiberty: copy PIC objects during build process
@@ -8,10 +8,10 @@ Subject: [PATCH] libiberty: copy PIC objects during build process
1 file changed, 1 insertion(+)
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index d6b302e02fd..fd39928546f 100644
+index 4f1213b983b..d0224649d30 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
-@@ -263,6 +263,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
+@@ -264,6 +264,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
$(AR) $(AR_FLAGS) $(TARGETLIB) \
$(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
$(RANLIB) $(TARGETLIB); \
@@ -20,5 +20,5 @@ index d6b302e02fd..fd39928546f 100644
else true; fi
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0012-libitm-disable-FORTIFY.patch b/main/gcc/0012-libitm-disable-FORTIFY.patch
index c445b880ce..361ba11de7 100644
--- a/main/gcc/0012-libitm-disable-FORTIFY.patch
+++ b/main/gcc/0012-libitm-disable-FORTIFY.patch
@@ -1,4 +1,4 @@
-From e3b5b8fc0ad9c7bf33930632060385fd340aafb7 Mon Sep 17 00:00:00 2001
+From fdf5ef3d1e61625cb96647d5bdc4ca0a32d287ec Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:53:36 +0000
Subject: [PATCH] libitm: disable FORTIFY
@@ -8,7 +8,7 @@ Subject: [PATCH] libitm: disable FORTIFY
1 file changed, 10 insertions(+)
diff --git a/libitm/configure.tgt b/libitm/configure.tgt
-index d1beb5c9ec8..c2b50b95c01 100644
+index a3d84896cc5..ecb281d5919 100644
--- a/libitm/configure.tgt
+++ b/libitm/configure.tgt
@@ -47,6 +47,16 @@ if test "$gcc_cv_have_tls" = yes ; then
@@ -29,5 +29,5 @@ index d1beb5c9ec8..c2b50b95c01 100644
# work out any special compilation flags as necessary.
case "${target_cpu}" in
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0013-libgcc_s.patch b/main/gcc/0013-libgcc_s.patch
index d73992690b..1a7788a8b6 100644
--- a/main/gcc/0013-libgcc_s.patch
+++ b/main/gcc/0013-libgcc_s.patch
@@ -1,4 +1,4 @@
-From 75c269d1783e1b83d9bc4f6c826f10f63a0f51a5 Mon Sep 17 00:00:00 2001
+From 9442d683845f63b931374ff81a7d08a31f992135 Mon Sep 17 00:00:00 2001
From: Szabolcs Nagy <nsz@port70.net>
Date: Sat, 24 Oct 2015 20:09:53 +0000
Subject: [PATCH] libgcc_s
@@ -10,10 +10,10 @@ Subject: [PATCH] libgcc_s
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c
-index 47d52550e5e..9cb8cc7950e 100644
+index 16765718cc3..4a855b791b9 100644
--- a/gcc/config/i386/i386-expand.c
+++ b/gcc/config/i386/i386-expand.c
-@@ -10976,10 +10976,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
+@@ -11063,10 +11063,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
{
case IX86_BUILTIN_CPU_INIT:
{
@@ -27,11 +27,11 @@ index 47d52550e5e..9cb8cc7950e 100644
return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
}
diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
-index 83301a1445f..89fdc7eb587 100644
+index ef463848f9d..1a3de052c80 100644
--- a/libgcc/config/i386/cpuinfo.c
+++ b/libgcc/config/i386/cpuinfo.c
-@@ -516,7 +516,7 @@ __cpu_indicator_init (void)
- return 0;
+@@ -63,7 +63,7 @@ __cpu_indicator_init (void)
+ __cpu_features2);
}
-#if defined SHARED && defined USE_ELF_SYMVER
@@ -53,5 +53,5 @@ index 8506a635790..564296f788e 100644
+HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0014-nopie.patch b/main/gcc/0014-nopie.patch
index 6978e28c8a..743a6c0680 100644
--- a/main/gcc/0014-nopie.patch
+++ b/main/gcc/0014-nopie.patch
@@ -1,4 +1,4 @@
-From 94df93e5a0241488343d6002912dfbd680df8aba Mon Sep 17 00:00:00 2001
+From 7a3e354de1ab87e992bfdaf858677ca140b80732 Mon Sep 17 00:00:00 2001
From: Szabolcs Nagy <nsz@port70.net>
Date: Sat, 7 Nov 2015 02:08:05 +0000
Subject: [PATCH] nopie
@@ -9,10 +9,10 @@ Subject: [PATCH] nopie
2 files changed, 40 insertions(+)
diff --git a/gcc/configure b/gcc/configure
-index 3bb7b5b318a..1632337439c 100755
+index 4b977e313b5..592e81e40f6 100755
--- a/gcc/configure
+++ b/gcc/configure
-@@ -30784,6 +30784,33 @@ fi
+@@ -32300,6 +32300,33 @@ fi
$as_echo "$gcc_cv_no_pie" >&6; }
if test "$gcc_cv_no_pie" = "yes"; then
NO_PIE_FLAG="-no-pie"
@@ -47,10 +47,10 @@ index 3bb7b5b318a..1632337439c 100755
diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 44ea4725620..6e4d4092af7 100644
+index 5461bab88a9..1577529ffb7 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
-@@ -6866,6 +6866,19 @@ AC_CACHE_CHECK([for -no-pie option],
+@@ -7571,6 +7571,19 @@ AC_CACHE_CHECK([for -no-pie option],
LDFLAGS="$saved_LDFLAGS"])
if test "$gcc_cv_no_pie" = "yes"; then
NO_PIE_FLAG="-no-pie"
@@ -71,5 +71,5 @@ index 44ea4725620..6e4d4092af7 100644
AC_SUBST([NO_PIE_FLAG])
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch b/main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
index 9260509c1c..01943c62ee 100644
--- a/main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+++ b/main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
@@ -1,4 +1,4 @@
-From ac79c17450c4e3a84ad884583ae80f5949f7ffc0 Mon Sep 17 00:00:00 2001
+From 9a5417a787c2ba197c0a3002ea7423488bedab0a Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:57:09 +0000
Subject: [PATCH] libffi: use __linux__ instead of __gnu_linux__ for musl
@@ -21,5 +21,5 @@ index 721ff00ea43..22a699c6340 100644
with both write and execute permission. Code compiled when this
option is defined will attempt to map such pages once, but if it
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0016-dlang-update-zlib-binding.patch b/main/gcc/0016-dlang-update-zlib-binding.patch
index c299a04e8c..8e10d5e947 100644
--- a/main/gcc/0016-dlang-update-zlib-binding.patch
+++ b/main/gcc/0016-dlang-update-zlib-binding.patch
@@ -1,4 +1,4 @@
-From ebd9bb4708ce923785eec4d3760536cdd4051e0a Mon Sep 17 00:00:00 2001
+From ecc537cc597fba87f00d3128fddd5f2a17e7d222 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:57:51 +0000
Subject: [PATCH] dlang: update zlib binding
@@ -421,5 +421,5 @@ index e6cce240fd5..bd2fe37ebec 100644
}
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0017-dlang-use-libucontext-on-mips64.patch b/main/gcc/0017-dlang-use-libucontext-on-mips64.patch
new file mode 100644
index 0000000000..c9db29c481
--- /dev/null
+++ b/main/gcc/0017-dlang-use-libucontext-on-mips64.patch
@@ -0,0 +1,24 @@
+From 273edfbf9845a349cec0643c23fff5a740c76f78 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:18:32 +0000
+Subject: [PATCH] dlang: use libucontext on mips64
+
+---
+ libphobos/configure.tgt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
+index 0643daeb613..b74d9fb3f25 100644
+--- a/libphobos/configure.tgt
++++ b/libphobos/configure.tgt
+@@ -38,6 +38,7 @@ case "${target}" in
+ ;;
+ mips*-*-linux*)
+ LIBPHOBOS_SUPPORTED=yes
++ LIBDRUNTIME_NEEDS_UCONTEXT=yes
+ ;;
+ power*-*-freebsd*)
+ LIBPHOBOS_SUPPORTED=yes
+--
+2.34.1
+
diff --git a/main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch b/main/gcc/0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
index 0345b3e9bd..41ddd5f504 100644
--- a/main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+++ b/main/gcc/0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
@@ -1,30 +1,17 @@
-From 3e29fbd28d442a79b56610c515e9b45933244ae8 Mon Sep 17 00:00:00 2001
+From 602c9c669e8270f51b8c9c07c3b8840d3cc5d5e4 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:58:22 +0000
-Subject: [PATCH] dlang: fix fcntl on mips, add libucontext dep
+Date: Thu, 6 Jan 2022 03:19:12 +0000
+Subject: [PATCH] dlang: libdruntime: define fcntl.h constants for mips64
---
- libphobos/configure.tgt | 1 +
libphobos/libdruntime/core/sys/posix/fcntl.d | 15 +++++++++++++++
- 2 files changed, 16 insertions(+)
+ 1 file changed, 15 insertions(+)
-diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
-index 94e42bf5509..73f2e4b7f01 100644
---- a/libphobos/configure.tgt
-+++ b/libphobos/configure.tgt
-@@ -35,6 +35,7 @@ case "${target}" in
- ;;
- mips*-*-linux*)
- LIBPHOBOS_SUPPORTED=yes
-+ LIBDRUNTIME_NEEDS_UCONTEXT=yes
- ;;
- power*-*-linux*)
- LIBPHOBOS_SUPPORTED=yes
diff --git a/libphobos/libdruntime/core/sys/posix/fcntl.d b/libphobos/libdruntime/core/sys/posix/fcntl.d
-index 9febcff849b..cb34e2108bd 100644
+index 59df921ba41..9ee9f943948 100644
--- a/libphobos/libdruntime/core/sys/posix/fcntl.d
+++ b/libphobos/libdruntime/core/sys/posix/fcntl.d
-@@ -870,6 +870,21 @@ else version (CRuntime_Musl)
+@@ -871,6 +871,21 @@ else version (CRuntime_Musl)
F_SETLKW = 7,
}
}
@@ -47,5 +34,5 @@ index 9febcff849b..cb34e2108bd 100644
static assert(0, "Platform not supported");
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0018-ada-fix-shared-linking.patch b/main/gcc/0019-ada-fix-shared-linking.patch
index e20a219c94..b05bea0288 100644
--- a/main/gcc/0018-ada-fix-shared-linking.patch
+++ b/main/gcc/0019-ada-fix-shared-linking.patch
@@ -1,4 +1,4 @@
-From 61ee4e71b7c6495afb6b5d71a3c3c3aef7e30bb7 Mon Sep 17 00:00:00 2001
+From 94f4f85904f1c042e4d0c0ac855143129d58fdbd Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:59:16 +0000
Subject: [PATCH] ada: fix shared linking
@@ -8,7 +8,7 @@ Subject: [PATCH] ada: fix shared linking
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gcc/ada/link.c b/gcc/ada/link.c
-index 02c413a412f..f0e52a87d6e 100644
+index 5cd5ef64f56..1c611a82cab 100644
--- a/gcc/ada/link.c
+++ b/gcc/ada/link.c
@@ -107,9 +107,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
@@ -38,5 +38,5 @@ index 02c413a412f..f0e52a87d6e 100644
unsigned char __gnat_objlist_file_supported = 1;
const char *__gnat_object_library_extension = ".a";
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch b/main/gcc/0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
index d21cee2df0..7794fda291 100644
--- a/main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+++ b/main/gcc/0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
@@ -1,4 +1,4 @@
-From 891ef65973d5e72ccad2c55834c0d0371e7427a7 Mon Sep 17 00:00:00 2001
+From dac504eb0d50d751ac558efaf84d37716e9ee05b Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:59:43 +0000
Subject: [PATCH] build: fix CXXFLAGS_FOR_BUILD passing
@@ -8,7 +8,7 @@ Subject: [PATCH] build: fix CXXFLAGS_FOR_BUILD passing
1 file changed, 1 insertion(+)
diff --git a/Makefile.in b/Makefile.in
-index 36e369df6e7..63627db68cf 100644
+index 047be0255e2..426949aa91c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -170,6 +170,7 @@ BUILD_EXPORTS = \
@@ -20,5 +20,5 @@ index 36e369df6e7..63627db68cf 100644
# This is the list of directories to built for the host system.
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0020-add-fortify-headers-paths.patch b/main/gcc/0021-add-fortify-headers-paths.patch
index f62bc7fba9..6715f0954b 100644
--- a/main/gcc/0020-add-fortify-headers-paths.patch
+++ b/main/gcc/0021-add-fortify-headers-paths.patch
@@ -1,4 +1,4 @@
-From 17174b70ba34434fe93901d8a97f0890ece0fa5f Mon Sep 17 00:00:00 2001
+From 5cc67e1262c1641aefa6da1e31bc759ecd1becbd Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 07:01:06 +0000
Subject: [PATCH] add fortify-headers paths
@@ -8,7 +8,7 @@ Subject: [PATCH] add fortify-headers paths
1 file changed, 2 insertions(+)
diff --git a/gcc/config/linux.h b/gcc/config/linux.h
-index 95654bcdb5a..d88df8f154a 100644
+index 4e1db60fced..7fcf402b416 100644
--- a/gcc/config/linux.h
+++ b/gcc/config/linux.h
@@ -167,6 +167,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
@@ -21,5 +21,5 @@ index 95654bcdb5a..d88df8f154a 100644
{ NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
#else
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch b/main/gcc/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
index 72694522ec..a9abc77454 100644
--- a/main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+++ b/main/gcc/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
@@ -1,4 +1,4 @@
-From 4c063fda21dc47d87d000995c8fbce46031eb5db Mon Sep 17 00:00:00 2001
+From 154f797756e8098f33fa16799749b4cd827dd81c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Fri, 21 Aug 2020 07:03:00 +0000
Subject: [PATCH] Alpine musl package provides libssp_nonshared.a. We link to
@@ -13,10 +13,10 @@ Subject: [PATCH] Alpine musl package provides libssp_nonshared.a. We link to
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gcc/gcc.c b/gcc/gcc.c
-index daeb4d0c8ea..6920bec0fa0 100644
+index 99314032ec2..6e91767efe8 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
-@@ -894,8 +894,7 @@ proper position among the other output files. */
+@@ -997,8 +997,7 @@ proper position among the other output files. */
#ifndef LINK_SSP_SPEC
#ifdef TARGET_LIBC_PROVIDES_SSP
@@ -27,5 +27,5 @@ index daeb4d0c8ea..6920bec0fa0 100644
#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
"|fstack-protector-strong|fstack-protector-explicit" \
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch b/main/gcc/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
index 3461c54104..6181a97d27 100644
--- a/main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+++ b/main/gcc/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
@@ -1,4 +1,4 @@
-From 613210b82caaafb36d7fe39514fa0c5adb363df8 Mon Sep 17 00:00:00 2001
+From a025b2325486bcba0cdf82a0468013961fe7cb99 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 07:03:42 +0000
Subject: [PATCH] DP: Use --push-state/--pop-state for gold as well when
@@ -9,10 +9,10 @@ Subject: [PATCH] DP: Use --push-state/--pop-state for gold as well when
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 6920bec0fa0..40e07354b3d 100644
+index 6e91767efe8..22dbbf85850 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
-@@ -696,10 +696,10 @@ proper position among the other output files. */
+@@ -738,10 +738,10 @@ proper position among the other output files. */
#define LIBASAN_SPEC STATIC_LIBASAN_LIBS
#elif defined(HAVE_LD_STATIC_DYNAMIC)
#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
@@ -25,7 +25,7 @@ index 6920bec0fa0..40e07354b3d 100644
STATIC_LIBASAN_LIBS
#else
#define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -717,10 +717,10 @@ proper position among the other output files. */
+@@ -777,10 +777,10 @@ proper position among the other output files. */
#define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
#elif defined(HAVE_LD_STATIC_DYNAMIC)
#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
@@ -38,7 +38,7 @@ index 6920bec0fa0..40e07354b3d 100644
STATIC_LIBTSAN_LIBS
#else
#define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -738,10 +738,10 @@ proper position among the other output files. */
+@@ -798,10 +798,10 @@ proper position among the other output files. */
#define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
#elif defined(HAVE_LD_STATIC_DYNAMIC)
#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
@@ -51,7 +51,7 @@ index 6920bec0fa0..40e07354b3d 100644
STATIC_LIBLSAN_LIBS
#else
#define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -757,10 +757,10 @@ proper position among the other output files. */
+@@ -817,10 +817,10 @@ proper position among the other output files. */
" %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
#ifdef HAVE_LD_STATIC_DYNAMIC
#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
@@ -65,5 +65,5 @@ index 6920bec0fa0..40e07354b3d 100644
#else
#define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0023-Pure-64-bit-MIPS.patch b/main/gcc/0024-mips64-disable-multilib-support.patch
index cf51a6635b..c6af51a2e9 100644
--- a/main/gcc/0023-Pure-64-bit-MIPS.patch
+++ b/main/gcc/0024-mips64-disable-multilib-support.patch
@@ -1,18 +1,19 @@
-From ca9cae44a1a3b74a48d1370d077e1aea6d36d37f Mon Sep 17 00:00:00 2001
+From da8359d60789065ad866b0d5e3efa03d69829851 Mon Sep 17 00:00:00 2001
From: Nils Andreas Svee <me@lochnair.net>
Date: Thu, 21 Dec 2017 03:14:33 +0100
-Subject: [PATCH] Pure 64-bit MIPS
+Subject: [PATCH] mips64: disable multilib support
+multilib is not supported by Alpine GCC
---
gcc/config/mips/mips.h | 8 ++++----
gcc/config/mips/t-linux64 | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
-index 3ce0c19a29a..b9920b49167 100644
+index 47aac9d3d61..4ad81059a86 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
-@@ -3424,11 +3424,11 @@ struct GTY(()) machine_function {
+@@ -3425,11 +3425,11 @@ struct GTY(()) machine_function {
/* If we are *not* using multilibs and the default ABI is not ABI_32 we
need to change these from /lib and /usr/lib. */
#if MIPS_ABI_DEFAULT == ABI_N32
@@ -29,7 +30,7 @@ index 3ce0c19a29a..b9920b49167 100644
/* Load store bonding is not supported by micromips and fix_24k. The
diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64
-index ceb58d3b5f3..8116e23ebba 100644
+index 130e1f04707..a64ac2bbb5b 100644
--- a/gcc/config/mips/t-linux64
+++ b/gcc/config/mips/t-linux64
@@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64
@@ -43,5 +44,5 @@ index ceb58d3b5f3..8116e23ebba 100644
+ ../lib32 \
+ ../lib
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0025-aarch64-disable-multilib-support.patch b/main/gcc/0025-aarch64-disable-multilib-support.patch
new file mode 100644
index 0000000000..602638e8fb
--- /dev/null
+++ b/main/gcc/0025-aarch64-disable-multilib-support.patch
@@ -0,0 +1,26 @@
+From 56a29e6c843999581b043b9a826853f90a2fd1e8 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:12:55 +0000
+Subject: [PATCH] aarch64: disable multilib support
+
+multilib is unsupported on Alpine GCC
+---
+ gcc/config/aarch64/t-aarch64-linux | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
+index 241b0ef20b6..18e63b34d8b 100644
+--- a/gcc/config/aarch64/t-aarch64-linux
++++ b/gcc/config/aarch64/t-aarch64-linux
+@@ -22,7 +22,7 @@ LIB1ASMSRC = aarch64/lib1funcs.asm
+ LIB1ASMFUNCS = _aarch64_sync_cache_range
+
+ AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
+-MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
++MULTILIB_OSDIRNAMES = mabi.lp64=../lib
+ MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
+
+ MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
+--
+2.34.1
+
diff --git a/main/gcc/0026-s390x-disable-multilib-support.patch b/main/gcc/0026-s390x-disable-multilib-support.patch
new file mode 100644
index 0000000000..80da2732e9
--- /dev/null
+++ b/main/gcc/0026-s390x-disable-multilib-support.patch
@@ -0,0 +1,25 @@
+From 2886563232a0c829e29a4a8d0e1d83392e134aef Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:13:59 +0000
+Subject: [PATCH] s390x: disable multilib support
+
+multilib is not supported on Alpine GCC at present
+---
+ gcc/config/s390/t-linux64 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64
+index cc6ab367072..7f498ee1cdc 100644
+--- a/gcc/config/s390/t-linux64
++++ b/gcc/config/s390/t-linux64
+@@ -7,5 +7,5 @@
+
+ MULTILIB_OPTIONS = m64/m31
+ MULTILIB_DIRNAMES = 64 32
+-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
+-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
++MULTILIB_OSDIRNAMES = m64=../lib
++MULTILIB_OSDIRNAMES+= m32=../lib32
+--
+2.34.1
+
diff --git a/main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch b/main/gcc/0027-ppc64-le-disable-multilib-support.patch
index 636e55fff3..f60b64a9eb 100644
--- a/main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch
+++ b/main/gcc/0027-ppc64-le-disable-multilib-support.patch
@@ -1,44 +1,16 @@
-From bc154c0c49b06871a9d206dc7010f14d8aeaf1f9 Mon Sep 17 00:00:00 2001
+From 88e39c0c4bc64a5734fdd6f255b62fd8711d73bb Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:04:40 +0000
-Subject: [PATCH] use pure 64-bit configuration where appropriate
+Date: Thu, 6 Jan 2022 03:14:33 +0000
+Subject: [PATCH] ppc64[le]: disable multilib support
+multilib is not presently supported on Alpine GCC
---
- gcc/config/aarch64/t-aarch64-linux | 2 +-
- gcc/config/i386/t-linux64 | 4 ++--
- gcc/config/rs6000/t-linux | 6 ++++--
- gcc/config/rs6000/t-linux64 | 4 ++--
- gcc/config/rs6000/t-linux64bele | 4 ++--
- gcc/config/rs6000/t-linux64lebe | 4 ++--
- gcc/config/s390/t-linux64 | 4 ++--
- 7 files changed, 15 insertions(+), 13 deletions(-)
+ gcc/config/rs6000/t-linux | 6 ++++--
+ gcc/config/rs6000/t-linux64 | 4 ++--
+ gcc/config/rs6000/t-linux64bele | 4 ++--
+ gcc/config/rs6000/t-linux64lebe | 4 ++--
+ 4 files changed, 10 insertions(+), 8 deletions(-)
-diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
-index 83e59e33b85..6ec56fdf6a8 100644
---- a/gcc/config/aarch64/t-aarch64-linux
-+++ b/gcc/config/aarch64/t-aarch64-linux
-@@ -22,7 +22,7 @@ LIB1ASMSRC = aarch64/lib1funcs.asm
- LIB1ASMFUNCS = _aarch64_sync_cache_range
-
- AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
--MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
-+MULTILIB_OSDIRNAMES = mabi.lp64=../lib
- MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
-
- MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
-diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
-index 1171e218578..256f8c079ba 100644
---- a/gcc/config/i386/t-linux64
-+++ b/gcc/config/i386/t-linux64
-@@ -33,6 +33,6 @@
- comma=,
- MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
index aeb7440c492..ab14c455d8d 100644
--- a/gcc/config/rs6000/t-linux
@@ -64,7 +36,7 @@ index aeb7440c492..ab14c455d8d 100644
endif
diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
-index 264a7e27524..d1e460811cc 100644
+index e11a118cb5f..df81dc04a32 100644
--- a/gcc/config/rs6000/t-linux64
+++ b/gcc/config/rs6000/t-linux64
@@ -28,8 +28,8 @@
@@ -104,18 +76,6 @@ index 2e63bdb9fc9..c6e1c5db65d 100644
+MULTILIB_OSDIRNAMES := m64=../lib
+MULTILIB_OSDIRNAMES += m32=../lib32
MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN}
-diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64
-index cc6ab367072..7f498ee1cdc 100644
---- a/gcc/config/s390/t-linux64
-+++ b/gcc/config/s390/t-linux64
-@@ -7,5 +7,5 @@
-
- MULTILIB_OPTIONS = m64/m31
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
--MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch b/main/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
deleted file mode 100644
index b1657fad12..0000000000
--- a/main/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 546f3c4e5efed3ed0054d7639763a373dce62139 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Sun, 30 Aug 2020 17:58:08 +0200
-Subject: [PATCH] gcc-go: Use _off_t type instead of _loff_t
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken from Adélie Linux.
----
- libgo/go/syscall/libcall_linux.go | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go
-index 88286c07b6e..f8f5cfb5011 100644
---- a/libgo/go/syscall/libcall_linux.go
-+++ b/libgo/go/syscall/libcall_linux.go
-@@ -206,19 +206,19 @@ func Gettid() (tid int) {
- //sys Setxattr(path string, attr string, data []byte, flags int) (err error)
- //setxattr(path *byte, name *byte, value *byte, size Size_t, flags _C_int) _C_int
-
--//sys splice(rfd int, roff *_loff_t, wfd int, woff *_loff_t, len int, flags int) (n int64, err error)
--//splice(rfd _C_int, roff *_loff_t, wfd _C_int, woff *_loff_t, len Size_t, flags _C_uint) Ssize_t
-+//sys splice(rfd int, roff *_off_t, wfd int, woff *_off_t, len int, flags int) (n int64, err error)
-+//splice(rfd _C_int, roff *_off_t, wfd _C_int, woff *_off_t, len Size_t, flags _C_uint) Ssize_t
- func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-- var lroff _loff_t
-- var plroff *_loff_t
-+ var lroff _off_t
-+ var plroff *_off_t
- if roff != nil {
-- lroff = _loff_t(*roff)
-+ lroff = _off_t(*roff)
- plroff = &lroff
- }
-- var lwoff _loff_t
-- var plwoff *_loff_t
-+ var lwoff _off_t
-+ var plwoff *_off_t
- if woff != nil {
-- lwoff = _loff_t(*woff)
-+ lwoff = _off_t(*woff)
- plwoff = &lwoff
- }
- n, err = splice(rfd, plroff, wfd, plwoff, len, flags)
---
-2.33.1
-
diff --git a/main/gcc/0028-x86_64-disable-multilib-support.patch b/main/gcc/0028-x86_64-disable-multilib-support.patch
new file mode 100644
index 0000000000..1afe3c382e
--- /dev/null
+++ b/main/gcc/0028-x86_64-disable-multilib-support.patch
@@ -0,0 +1,26 @@
+From 2df8f5e7bfe077f5bdb1506d971644c471af4a06 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:14:54 +0000
+Subject: [PATCH] x86_64: disable multilib support
+
+multilib is not presently supported on Alpine GCC
+---
+ gcc/config/i386/t-linux64 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
+index d288b093522..2949033aa04 100644
+--- a/gcc/config/i386/t-linux64
++++ b/gcc/config/i386/t-linux64
+@@ -33,6 +33,6 @@
+ comma=,
+ MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
+ MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
+-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
+-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
++MULTILIB_OSDIRNAMES = m64=../lib
++MULTILIB_OSDIRNAMES+= m32=../lib32
+ MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
+--
+2.34.1
+
diff --git a/main/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch b/main/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch
deleted file mode 100644
index e4982fb669..0000000000
--- a/main/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 739b3a500ab6c7926364767c9d6125d8a83e5a10 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Sun, 30 Aug 2020 17:58:21 +0200
-Subject: [PATCH] gcc-go: Don't include sys/user.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken from Adélie Linux.
----
- libgo/sysinfo.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
-index 0692fd41eb7..c8d987358d9 100644
---- a/libgo/sysinfo.c
-+++ b/libgo/sysinfo.c
-@@ -73,9 +73,6 @@
- #include <sys/times.h>
- #include <sys/wait.h>
- #include <sys/un.h>
--#if defined(HAVE_SYS_USER_H)
--#include <sys/user.h>
--#endif
- #if defined(HAVE_SYS_UTSNAME_H)
- #include <sys/utsname.h>
- #endif
---
-2.33.1
-
diff --git a/main/gcc/0029-riscv-disable-multilib-support.patch b/main/gcc/0029-riscv-disable-multilib-support.patch
new file mode 100644
index 0000000000..7e9600e0b6
--- /dev/null
+++ b/main/gcc/0029-riscv-disable-multilib-support.patch
@@ -0,0 +1,74 @@
+From f45e75200cdebab7c23960d3ccebec862e269557 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Mon, 3 Jan 2022 07:14:48 +0100
+Subject: [PATCH] riscv: disable multilib support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From the musl wiki [1]:
+
+ musl does not support sharing an include directory between archs
+ […], and thus is not compatible with GCC-style multilib. It is
+ recommended that distributions build GCC with multilib disabled,
+ and use library directories named lib, not lib64 or lib32.
+
+For this reason, we patch existing GCC configuration files (gcc/config)
+to pin MULTILIB_OSDIRNAMES to lib, there is also a corresponding GCC
+upstream bug about this issue [2]. Avoiding the use of lib64 and lib32
+directories is a bit more difficult on the RISC-V architecture. This is
+due to the fact that the default RISC-V configuration does not only use
+the lib64 and lib32 directories but also subdirectories within these
+directories for different RISC-V ABIs (e.g. lp64d, lp64, …) [3].
+
+This patch aligns the RISC-V configuration with other architectures by
+pinning MULTILIB_OSDIRNAMES to lib for rv64gc (our default RISC-V
+-march). Furthermore, this patch removes the ABI-specific startfile
+prefix spec. Since both of these impact the default LIBRARY_PATH [4]
+this patch thereby aligns the default RISC-V LIBRARY_PATH with that from
+other Alpine architectures and thereby fixes #13369 [5].
+
+Incidentally, this also fixes gccgo on riscv64, as without this patch
+gccgo is otherwise not able to find the *.gox files for the Go standard
+library.
+
+[1]: https://wiki.musl-libc.org/guidelines-for-distributions.html#Multilib/multi_arch
+[2]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90077
+[3]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103889#c14
+[4]: https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/gcc.c;h=d4c8746b0aa322286decf92aa72a12f0a393b655;hb=HEAD#l9122
+[5]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13369
+---
+ gcc/config/riscv/linux.h | 6 ------
+ gcc/config/riscv/t-linux | 7 +++++--
+ 2 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
+index ee29979dd34..fe8a82d6702 100644
+--- a/gcc/config/riscv/linux.h
++++ b/gcc/config/riscv/linux.h
+@@ -71,9 +71,3 @@ along with GCC; see the file COPYING3. If not see
+ %{static:-static}}"
+
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+-
+-#define STARTFILE_PREFIX_SPEC \
+- "/lib" XLEN_SPEC "/" ABI_SPEC "/ " \
+- "/usr/lib" XLEN_SPEC "/" ABI_SPEC "/ " \
+- "/lib/ " \
+- "/usr/lib/ "
+diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux
+index 216d2776a18..1a8a863853e 100644
+--- a/gcc/config/riscv/t-linux
++++ b/gcc/config/riscv/t-linux
+@@ -1,3 +1,6 @@
+-# Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/
+-MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
++MULTILIB_OPTIONS := march=rv64gc
++MULTILIB_DIRNAMES := rv64gc
++
++MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib,$(MULTILIB_DIRNAMES)))
+ MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
++MULTILIB_MATCHES := march?rv64gc=march?rv64imafdc
+--
+2.34.1
+
diff --git a/main/gcc/0025-always-build-libgcc_eh.a.patch b/main/gcc/0030-always-build-libgcc_eh.a.patch
index 8bbef2c50e..ba2f17ced3 100644
--- a/main/gcc/0025-always-build-libgcc_eh.a.patch
+++ b/main/gcc/0030-always-build-libgcc_eh.a.patch
@@ -1,4 +1,4 @@
-From fd531b1754dfa64791342c8e76001a509b3646ca Mon Sep 17 00:00:00 2001
+From 97972b0c9ef7b7f6b7ca87e2bbae6cb4e3adff51 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 07:05:41 +0000
Subject: [PATCH] always build libgcc_eh.a
@@ -10,10 +10,10 @@ highly inspired by:
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
-index 851e7657d07..99ec513a1a6 100644
+index 2c8be561eb5..c557750b1b3 100644
--- a/libgcc/Makefile.in
+++ b/libgcc/Makefile.in
-@@ -956,8 +956,9 @@ ifneq ($(LIBUNWIND),)
+@@ -957,8 +957,9 @@ ifneq ($(LIBUNWIND),)
all: libunwind.a
endif
@@ -24,7 +24,7 @@ index 851e7657d07..99ec513a1a6 100644
ifneq ($(LIBUNWIND),)
all: libunwind$(SHLIB_EXT)
libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
-@@ -1159,10 +1160,6 @@ install-libunwind:
+@@ -1160,10 +1161,6 @@ install-libunwind:
install-shared:
$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
@@ -35,7 +35,7 @@ index 851e7657d07..99ec513a1a6 100644
$(subst @multilib_dir@,$(MULTIDIR),$(subst \
@shlib_base_name@,libgcc_s,$(subst \
@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -1179,6 +1176,10 @@ ifeq ($(enable_gcov),yes)
+@@ -1180,6 +1177,10 @@ ifeq ($(enable_gcov),yes)
$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
endif
@@ -47,5 +47,5 @@ index 851e7657d07..99ec513a1a6 100644
for file in $$parts; do \
rm -f $(DESTDIR)$(inst_libdir)/$$file; \
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch b/main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
deleted file mode 100644
index 5eed9f1352..0000000000
--- a/main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b61aaf8df1ea8a6cb3f0ff2954c8580806bf43f4 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Sun, 30 Aug 2020 17:59:22 +0200
-Subject: [PATCH] gcc-go: Fix ucontext_t on PPC64
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken from Adélie Linux.
----
- libgo/runtime/go-signal.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
-index b429fdb2403..fd1c885f043 100644
---- a/libgo/runtime/go-signal.c
-+++ b/libgo/runtime/go-signal.c
-@@ -224,7 +224,7 @@ getSiginfo(siginfo_t *info, void *context __attribute__((unused)))
- #elif defined(__alpha__) && defined(__linux__)
- ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.sc_pc;
- #elif defined(__PPC__) && defined(__linux__)
-- ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip;
-+ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gp_regs[32];
- #elif defined(__PPC__) && defined(_AIX)
- ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
- #elif defined(__aarch64__) && defined(__linux__)
---
-2.33.1
-
diff --git a/main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch b/main/gcc/0031-ada-libgnarl-compatibility-for-musl.patch
index d0b2b94b47..27ddfcc633 100644
--- a/main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch
+++ b/main/gcc/0031-ada-libgnarl-compatibility-for-musl.patch
@@ -1,4 +1,4 @@
-From 53958c5c47d20094e2d5b5d1376b45058241d3b4 Mon Sep 17 00:00:00 2001
+From 62e3ecf4d1216fb0daf9b12db3f4310170a80f8f Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 07:06:30 +0000
Subject: [PATCH] ada: libgnarl compatibility for musl
@@ -9,10 +9,10 @@ Subject: [PATCH] ada: libgnarl compatibility for musl
2 files changed, 3 insertions(+), 61 deletions(-)
diff --git a/gcc/ada/libgnarl/s-osinte__linux.ads b/gcc/ada/libgnarl/s-osinte__linux.ads
-index ef449af33d1..bd7312e6686 100644
+index 2272f83d68d..1d78456544a 100644
--- a/gcc/ada/libgnarl/s-osinte__linux.ads
+++ b/gcc/ada/libgnarl/s-osinte__linux.ads
-@@ -399,12 +399,6 @@ package System.OS_Interface is
+@@ -401,12 +401,6 @@ package System.OS_Interface is
PTHREAD_RWLOCK_PREFER_WRITER_NP : constant := 1;
PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP : constant := 2;
@@ -25,7 +25,7 @@ index ef449af33d1..bd7312e6686 100644
function pthread_rwlock_init
(mutex : access pthread_rwlock_t;
attr : access pthread_rwlockattr_t) return int;
-@@ -466,11 +460,6 @@ package System.OS_Interface is
+@@ -468,11 +462,6 @@ package System.OS_Interface is
protocol : int) return int;
pragma Import (C, pthread_mutexattr_setprotocol);
@@ -38,10 +38,10 @@ index ef449af33d1..bd7312e6686 100644
sched_priority : int; -- scheduling priority
end record;
diff --git a/gcc/ada/libgnarl/s-taprop__linux.adb b/gcc/ada/libgnarl/s-taprop__linux.adb
-index c45559e5ba0..0b0f173e7d4 100644
+index 757a6cdfdad..82df94f6a00 100644
--- a/gcc/ada/libgnarl/s-taprop__linux.adb
+++ b/gcc/ada/libgnarl/s-taprop__linux.adb
-@@ -202,9 +202,6 @@ package body System.Task_Primitives.Operations is
+@@ -198,9 +198,6 @@ package body System.Task_Primitives.Operations is
pragma Import
(C, GNAT_pthread_condattr_setup, "__gnat_pthread_condattr_setup");
@@ -51,7 +51,7 @@ index c45559e5ba0..0b0f173e7d4 100644
-- We do not have pragma Linker_Options ("-lcap"); here, because this
-- library is not present on many Linux systems. 'libcap' is the Linux
-- "capabilities" library, called by __gnat_has_cap_sys_nice.
-@@ -214,38 +211,6 @@ package body System.Task_Primitives.Operations is
+@@ -210,38 +207,6 @@ package body System.Task_Primitives.Operations is
-- Convert Ada priority to Linux priority. Priorities are 1 .. 99 on
-- GNU/Linux, so we map 0 .. 98 to 1 .. 99.
@@ -84,13 +84,13 @@ index c45559e5ba0..0b0f173e7d4 100644
- return Ceiling_Support;
- end Get_Ceiling_Support;
-
-- pragma Warnings (Off, "non-static call not allowed in preelaborated unit");
+- pragma Warnings (Off, "non-preelaborable call not allowed*");
- Ceiling_Support : constant Boolean := Get_Ceiling_Support;
-- pragma Warnings (On, "non-static call not allowed in preelaborated unit");
+- pragma Warnings (On, "non-preelaborable call not allowed*");
-- True if the locking policy is Ceiling_Locking, and the current process
-- has permission to use this policy. The process has permission if it is
-- running as 'root', or if the capability was set by the setcap command,
-@@ -348,7 +313,9 @@ package body System.Task_Primitives.Operations is
+@@ -344,7 +309,9 @@ package body System.Task_Primitives.Operations is
-- Init_Mutex --
----------------
@@ -100,7 +100,7 @@ index c45559e5ba0..0b0f173e7d4 100644
Mutex_Attr : aliased pthread_mutexattr_t;
Result, Result_2 : C.int;
-@@ -360,16 +327,7 @@ package body System.Task_Primitives.Operations is
+@@ -356,16 +323,7 @@ package body System.Task_Primitives.Operations is
return Result;
end if;
@@ -118,7 +118,7 @@ index c45559e5ba0..0b0f173e7d4 100644
Result := pthread_mutexattr_setprotocol
(Mutex_Attr'Access, PTHREAD_PRIO_INHERIT);
pragma Assert (Result = 0);
-@@ -409,11 +367,6 @@ package body System.Task_Primitives.Operations is
+@@ -405,11 +363,6 @@ package body System.Task_Primitives.Operations is
Result := pthread_rwlockattr_init (RWlock_Attr'Access);
pragma Assert (Result = 0);
@@ -131,5 +131,5 @@ index c45559e5ba0..0b0f173e7d4 100644
pragma Assert (Result in 0 | ENOMEM);
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0027-ada-musl-support-fixes.patch b/main/gcc/0032-ada-musl-support-fixes.patch
index 34f143b68a..5c8951f8af 100644
--- a/main/gcc/0027-ada-musl-support-fixes.patch
+++ b/main/gcc/0032-ada-musl-support-fixes.patch
@@ -1,4 +1,4 @@
-From f55ddf45b97fc7f827349c3ffe0375353ae6bf59 Mon Sep 17 00:00:00 2001
+From a259508e9e3eb1dd5ebd160ac4600cb948d850fc Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 07:07:48 +0000
Subject: [PATCH] ada: musl support fixes
@@ -11,10 +11,10 @@ Subject: [PATCH] ada: musl support fixes
4 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
-index 55ff9b0f3d5..0fadf4e4b79 100644
+index 987eff0abba..03c8bc6f496 100644
--- a/gcc/ada/Makefile.rtl
+++ b/gcc/ada/Makefile.rtl
-@@ -1533,7 +1533,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
+@@ -1748,7 +1748,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
s-intman.adb<libgnarl/s-intman__posix.adb \
s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
$(TRASYM_DWARF_UNIX_PAIRS) \
@@ -23,16 +23,16 @@ index 55ff9b0f3d5..0fadf4e4b79 100644
a-exetim.adb<libgnarl/a-exetim__posix.adb \
a-exetim.ads<libgnarl/a-exetim__default.ads \
s-linux.ads<libgnarl/s-linux.ads \
-@@ -2083,7 +2083,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
- s-osinte.adb<libgnarl/s-osinte__posix.adb \
- s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
+@@ -2355,7 +2355,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+ s-tasinf.adb<libgnarl/s-tasinf__linux.adb \
+ s-taspri.ads<libgnarl/s-taspri__posix.ads \
$(TRASYM_DWARF_UNIX_PAIRS) \
- s-tsmona.adb<libgnat/s-tsmona__linux.adb \
+ s-tsmona.adb<libgnat/s-tsmona.adb \
$(ATOMICS_TARGET_PAIRS) \
$(ATOMICS_BUILTINS_TARGET_PAIRS) \
system.ads<libgnat/system-linux-ppc.ads
-@@ -2112,7 +2112,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2386,7 +2386,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
endif
# ARM linux, GNU eabi
@@ -41,7 +41,7 @@ index 55ff9b0f3d5..0fadf4e4b79 100644
LIBGNAT_TARGET_PAIRS = \
a-intnam.ads<libgnarl/a-intnam__linux.ads \
s-inmaop.adb<libgnarl/s-inmaop__posix.adb \
-@@ -2305,7 +2305,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
+@@ -2597,7 +2597,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \
$(TRASYM_DWARF_UNIX_PAIRS) \
@@ -49,8 +49,8 @@ index 55ff9b0f3d5..0fadf4e4b79 100644
+ s-tsmona.adb<libgnat/s-tsmona.adb \
$(ATOMICS_TARGET_PAIRS) \
$(ATOMICS_BUILTINS_TARGET_PAIRS) \
- system.ads<libgnat/system-linux-ia64.ads
-@@ -2401,7 +2401,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
+ $(GNATRTL_128BIT_PAIRS) \
+@@ -2699,7 +2699,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
s-taspri.ads<libgnarl/s-taspri__posix.ads \
$(TRASYM_DWARF_UNIX_PAIRS) \
@@ -58,24 +58,24 @@ index 55ff9b0f3d5..0fadf4e4b79 100644
+ s-tsmona.adb<libgnat/s-tsmona.adb \
$(ATOMICS_TARGET_PAIRS) \
$(X86_64_TARGET_PAIRS) \
- system.ads<libgnat/system-linux-x86.ads
+ $(GNATRTL_128BIT_PAIRS) \
diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 595abf87d65..00858c24f53 100644
+index 2e54e69643a..e7e6507e2e0 100644
--- a/gcc/ada/adaint.c
+++ b/gcc/ada/adaint.c
-@@ -90,6 +90,11 @@
+@@ -91,6 +91,11 @@
#include <sys/param.h>
#include <sys/pstat.h>
#endif
+
-+#if defined (linux)
++#if defined (linux) || defined(__linux__)
+#define _GNU_SOURCE 1
+#include <sched.h>
+#endif
#ifdef __PikeOS__
#define __BSD_VISIBLE 1
-@@ -3308,7 +3313,6 @@ __gnat_lwp_self (void)
+@@ -3442,7 +3447,6 @@ __gnat_lwp_self (void)
#endif
#if defined (__linux__)
@@ -83,7 +83,7 @@ index 595abf87d65..00858c24f53 100644
/* glibc versions earlier than 2.7 do not define the routines to handle
dynamically allocated CPU sets. For these targets, we use the static
-@@ -3318,7 +3322,7 @@ __gnat_lwp_self (void)
+@@ -3452,7 +3456,7 @@ __gnat_lwp_self (void)
/* Dynamic cpu sets */
@@ -92,7 +92,7 @@ index 595abf87d65..00858c24f53 100644
__gnat_cpu_alloc (size_t count)
{
return CPU_ALLOC (count);
-@@ -3331,33 +3335,33 @@ __gnat_cpu_alloc_size (size_t count)
+@@ -3465,33 +3469,33 @@ __gnat_cpu_alloc_size (size_t count)
}
void
@@ -134,7 +134,7 @@ index 595abf87d65..00858c24f53 100644
}
size_t
-@@ -3367,23 +3371,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
+@@ -3501,23 +3505,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
}
void
@@ -164,10 +164,10 @@ index 595abf87d65..00858c24f53 100644
#endif /* !CPU_ALLOC */
#endif /* __linux__ */
diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 311e240dfcc..1c4d0050103 100644
+index 85997b9ba68..fd10e5b5589 100644
--- a/gcc/ada/adaint.h
+++ b/gcc/ada/adaint.h
-@@ -316,13 +316,11 @@ extern void *__gnat_lwp_self (void);
+@@ -325,13 +325,11 @@ extern void *__gnat_lwp_self (void);
/* Routines for interface to required CPU set primitives */
@@ -186,10 +186,10 @@ index 311e240dfcc..1c4d0050103 100644
#if defined (_WIN32)
diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index af4417fab90..bab6bf3ca87 100644
+index ec9db3a6a4c..6f92e50dd67 100644
--- a/gcc/ada/terminals.c
+++ b/gcc/ada/terminals.c
-@@ -1145,7 +1145,7 @@ __gnat_setup_winsize (void *desc, int rows, int columns)
+@@ -1132,7 +1132,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
/* POSIX does not specify how to open the master side of a terminal.Several
methods are available (system specific):
1- using a cloning device (USE_CLONE_DEVICE)
@@ -198,7 +198,7 @@ index af4417fab90..bab6bf3ca87 100644
3- openpty (USE_OPENPTY)
When using the cloning device method, the macro USE_CLONE_DEVICE should
-@@ -1159,7 +1159,7 @@ __gnat_setup_winsize (void *desc, int rows, int columns)
+@@ -1146,7 +1146,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
#if defined (__APPLE__) || defined (BSD)
#define USE_OPENPTY
#elif defined (__linux__)
@@ -207,7 +207,7 @@ index af4417fab90..bab6bf3ca87 100644
#elif defined (__sun__)
#define USE_CLONE_DEVICE "/dev/ptmx"
#elif defined (_AIX)
-@@ -1208,8 +1208,8 @@ allocate_pty_desc (pty_desc **desc) {
+@@ -1195,8 +1195,8 @@ allocate_pty_desc (pty_desc **desc) {
int master_fd = -1;
char *slave_name = NULL;
@@ -219,5 +219,5 @@ index af4417fab90..bab6bf3ca87 100644
status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
#elif defined (USE_CLONE_DEVICE)
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch b/main/gcc/0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
index 3e77b574f2..67e4c8ef42 100644
--- a/main/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+++ b/main/gcc/0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
@@ -1,4 +1,4 @@
-From 9bda07868553de7c877f504b9abce312abce4e92 Mon Sep 17 00:00:00 2001
+From eec75a34ecc5074ed5857a8a2964d5a1e8fe5a66 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 30 Aug 2020 17:59:45 +0200
Subject: [PATCH] gcc-go: Fix handling of signal 34 on musl
@@ -39,5 +39,5 @@ index 11e4ec436bd..fe866eacb27 100644
if test "${GOOS}" = "aix"; then
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch b/main/gcc/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
deleted file mode 100644
index 66149e295d..0000000000
--- a/main/gcc/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e937f85b212f2e44101042489d387a249df3ba8e Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Sun, 30 Aug 2020 18:02:28 +0200
-Subject: [PATCH] gcc-go: Fix st_{a,m,c}tim fields in generated sysinfo.go
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There are more than one st_{a,m,c}tim fields in struct stat on time64 machines.
-
-Run the Go-isation on all of them.
-
-Taken from Adélie Linux.
----
- libgo/mksysinfo.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index bd2ba32cba1..972e2c379bc 100755
---- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -510,9 +510,9 @@ fi | sed -e 's/type _stat64/type Stat_t/' \
- -e 's/st_size/Size/' \
- -e 's/st_blksize/Blksize/' \
- -e 's/st_blocks/Blocks/' \
-- -e 's/st_atim/Atim/' \
-- -e 's/st_mtim/Mtim/' \
-- -e 's/st_ctim/Ctim/' \
-+ -e 's/st_atim/Atim/g' \
-+ -e 's/st_mtim/Mtim/g' \
-+ -e 's/st_ctim/Ctim/g' \
- -e 's/\([^a-zA-Z0-9_]\)_timeval\([^a-zA-Z0-9_]\)/\1Timeval\2/g' \
- -e 's/\([^a-zA-Z0-9_]\)_timespec_t\([^a-zA-Z0-9_]\)/\1Timespec\2/g' \
- -e 's/\([^a-zA-Z0-9_]\)_st_timespec_t\([^a-zA-Z0-9_]\)/\1StTimespec\2/g' \
---
-2.33.1
-
diff --git a/main/gcc/0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch b/main/gcc/0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
new file mode 100644
index 0000000000..26624c39a2
--- /dev/null
+++ b/main/gcc/0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
@@ -0,0 +1,27 @@
+From dfd96cebf29a04f8a89587deb7469274cd206382 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 25 Nov 2021 01:47:03 +0000
+Subject: [PATCH] There are more than one st_{a,m,c}tim fields in struct stat
+ on time64 machines.
+
+Run the Go-isation on all of them.
+---
+ libgo/mksysinfo.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
+index 0c52ea5d71a..6fef104cc1c 100755
+--- a/libgo/mksysinfo.sh
++++ b/libgo/mksysinfo.sh
+@@ -510,7 +510,7 @@ fi
+
+ # For historical reasons Go uses the suffix "timespec" instead of "tim" for
+ # stat_t's time fields on NetBSD.
+-st_times='-e s/st_atim/Atim/ -e s/st_mtim/Mtim/ -e s/st_ctim/Ctim/'
++st_times='-e s/st_atim/Atim/g -e s/st_mtim/Mtim/g -e s/st_ctim/Ctim/g'
+ if test "${GOOS}" = "netbsd"; then
+ st_times='-e s/st_atim/Atimespec/ -e s/st_mtim/Mtimespec/ -e s/st_ctim/Ctimespec/'
+ fi
+--
+2.34.1
+
diff --git a/main/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch b/main/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
deleted file mode 100644
index 5deafc16e5..0000000000
--- a/main/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d8e7e867a98058cfdd1f03ddfb18786687f85c88 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 30 Aug 2020 19:26:53 +0200
-Subject: [PATCH] gcc-go: Prefer _off_t over _off64_t
-
-musl does not seem to have _off64_t.
----
- libgo/mksysinfo.sh | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 972e2c379bc..8d6da15f983 100755
---- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -379,11 +379,7 @@ fi
- # Some basic types.
- echo 'type Size_t _size_t' >> ${OUT}
- echo "type Ssize_t _ssize_t" >> ${OUT}
--if grep '^const _HAVE_OFF64_T = ' gen-sysinfo.go > /dev/null 2>&1; then
-- echo "type Offset_t _off64_t" >> ${OUT}
--else
-- echo "type Offset_t _off_t" >> ${OUT}
--fi
-+echo "type Offset_t _off_t" >> ${OUT}
- echo "type Mode_t _mode_t" >> ${OUT}
- echo "type Pid_t _pid_t" >> ${OUT}
- echo "type Uid_t _uid_t" >> ${OUT}
---
-2.33.1
-
diff --git a/main/gcc/0034-gcc-go-signal-34-is-special-on-musl-libc.patch b/main/gcc/0035-gcc-go-signal-34-is-special-on-musl-libc.patch
index f13e864e01..049ed4043d 100644
--- a/main/gcc/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
+++ b/main/gcc/0035-gcc-go-signal-34-is-special-on-musl-libc.patch
@@ -1,4 +1,4 @@
-From e01c6f439a22f683f953ddeaec4f02fb190d152e Mon Sep 17 00:00:00 2001
+From 54aca66b0640f56b7b0473ebd08ec8e9c8edb78e Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 30 Aug 2020 18:03:03 +0200
Subject: [PATCH] gcc-go: signal 34 is special on musl libc
@@ -12,7 +12,7 @@ Taken from Adélie Linux.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libgo/go/runtime/signal_gccgo.go b/libgo/go/runtime/signal_gccgo.go
-index c555712a03c..9e228580d37 100644
+index 2eece687e35..e86490ce203 100644
--- a/libgo/go/runtime/signal_gccgo.go
+++ b/libgo/go/runtime/signal_gccgo.go
@@ -106,7 +106,7 @@ func getsig(i uint32) uintptr {
@@ -25,5 +25,5 @@ index c555712a03c..9e228580d37 100644
}
throw("sigaction read failure")
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch b/main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
index ac8cae8e00..519dfbccba 100644
--- a/main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+++ b/main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
@@ -1,4 +1,4 @@
-From e4b21cb1e140c22a5183ebf0158bff2b655b15d6 Mon Sep 17 00:00:00 2001
+From c61dfe08fa888a93fd1d65484a79dc4dd4260c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Sun, 30 Aug 2020 19:27:51 +0200
Subject: [PATCH] gcc-go: undef SETCONTEXT_CLOBBERS_TLS in proc.c
@@ -8,7 +8,7 @@ Subject: [PATCH] gcc-go: undef SETCONTEXT_CLOBBERS_TLS in proc.c
1 file changed, 4 insertions(+)
diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
-index 6f7d2e27996..5afd7902497 100644
+index 38bf7a6b255..e50403b5a75 100644
--- a/libgo/runtime/proc.c
+++ b/libgo/runtime/proc.c
@@ -66,6 +66,10 @@ static void gscanstack(G*);
@@ -23,5 +23,5 @@ index 6f7d2e27996..5afd7902497 100644
static inline void
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0037-gcc-go-link-to-libucontext.patch b/main/gcc/0037-gcc-go-link-to-libucontext.patch
index cc4353804d..111d00d817 100644
--- a/main/gcc/0037-gcc-go-link-to-libucontext.patch
+++ b/main/gcc/0037-gcc-go-link-to-libucontext.patch
@@ -1,4 +1,4 @@
-From a69b517d61fccb5698fcdb3261386ce85ac84b5f Mon Sep 17 00:00:00 2001
+From 9e7be29ad618d48740f42c98ba93e8367341b63f Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 31 Aug 2020 08:59:40 +0200
Subject: [PATCH] gcc-go: link to libucontext
@@ -8,10 +8,10 @@ Subject: [PATCH] gcc-go: link to libucontext
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
-index 63627db68cf..c7f1f84d683 100644
+index 426949aa91c..f97db1ef569 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -48823,7 +48823,7 @@ configure-target-libgo:
+@@ -50331,7 +50331,7 @@ configure-target-libgo:
esac; \
module_srcdir=libgo; \
rm -f no-such-file || : ; \
@@ -21,5 +21,5 @@ index 63627db68cf..c7f1f84d683 100644
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch b/main/gcc/0038-Use-generic-errstr.go-implementation-on-musl.patch
index 55af247a89..0c901dbfba 100644
--- a/main/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch
+++ b/main/gcc/0038-Use-generic-errstr.go-implementation-on-musl.patch
@@ -1,4 +1,4 @@
-From c96c9ead4baed0a69f7e4843e199958610c5deba Mon Sep 17 00:00:00 2001
+From f9defb064cdd5565d308df5d61f6881ea601e276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Mon, 19 Apr 2021 07:21:41 +0200
Subject: [PATCH] Use generic errstr.go implementation on musl
@@ -44,5 +44,5 @@ index 5b19e6f202d..8dc60172186 100644
package syscall
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch b/main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
deleted file mode 100644
index bcdb82d917..0000000000
--- a/main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a68edec2c2adcd43c04f06acaa70b7c23fcbc124 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 31 Aug 2020 20:26:56 +0200
-Subject: [PATCH] gcc-go: Disable printing of unaccessible ppc64 struct members
-
-These struct members do not seem to exist on musl.
----
- libgo/runtime/go-signal.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
-index fd1c885f043..e845e453332 100644
---- a/libgo/runtime/go-signal.c
-+++ b/libgo/runtime/go-signal.c
-@@ -333,7 +333,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u
- runtime_printf("sp %X\n", m->sc_regs[30]);
- runtime_printf("pc %X\n", m->sc_pc);
- }
--#elif defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__linux__)
-+#elif defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__GLIBC__)
- {
- mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
- int i;
---
-2.33.1
-
diff --git a/main/gcc/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch b/main/gcc/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
deleted file mode 100644
index 8b2460cce7..0000000000
--- a/main/gcc/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From fae37346b1fc708e9e54f960c8532deab3afec7d Mon Sep 17 00:00:00 2001
-From: Geod24 <pro.mathias.lang@gmail.com>
-Date: Mon, 16 Nov 2020 18:40:46 +0100
-Subject: [PATCH] CRuntime_Musl: Support v1.2.0 for 32 bits
-
-As explained in the comment, `time_t` on Musl is now always 64 bits,
-but used to be 32 bits on 32 bits systems.
----
- .../libdruntime/core/sys/posix/sys/types.d | 25 ++++++++++++++++++-
- 1 file changed, 24 insertions(+), 1 deletion(-)
-
-diff --git a/libphobos/libdruntime/core/sys/posix/sys/types.d b/libphobos/libdruntime/core/sys/posix/sys/types.d
-index 451c8b4fccc..ca654fbe424 100644
---- a/libphobos/libdruntime/core/sys/posix/sys/types.d
-+++ b/libphobos/libdruntime/core/sys/posix/sys/types.d
-@@ -139,10 +139,33 @@ else version (CRuntime_Musl)
- alias int pid_t;
- alias uint uid_t;
- alias uint gid_t;
-+
-+ /**
-+ * Musl versions before v1.2.0 (up to v1.1.24) had different
-+ * definitions for `time_t` for 32 bits.
-+ * This was changed to always be 64 bits in v1.2.0:
-+ * https://musl.libc.org/time64.html
-+ * This change was only for 32 bits system and
-+ * didn't affect 64 bits systems
-+ *
-+ * To check previous definitions, `grep` for `time_t` in `arch/`,
-+ * and the result should be (in v1.1.24):
-+ * ---
-+ * // arch/riscv64/bits/alltypes.h.in:20:TYPEDEF long time_t;
-+ * // arch/s390x/bits/alltypes.h.in:17:TYPEDEF long time_t;
-+ * // arch/sh/bits/alltypes.h.in:21:TYPEDEF long time_t;
-+ * ---
-+ *
-+ * In order to be compatible with old versions of Musl,
-+ * one can recompile druntime with `CRuntime_Musl_Pre_Time64`.
-+ */
- version (D_X32)
- alias long time_t;
-- else
-+ else version (CRuntime_Musl_Pre_Time64)
- alias c_long time_t;
-+ else
-+ alias long time_t;
-+
- alias c_long clock_t;
- alias c_ulong pthread_t;
- version (D_LP64)
---
-2.33.1
-
diff --git a/main/gcc/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch b/main/gcc/0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
index c7012b0c49..ea25b12e0d 100644
--- a/main/gcc/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+++ b/main/gcc/0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
@@ -1,4 +1,4 @@
-From 4785de483dcba1896da1014ddb1a8505ac559a15 Mon Sep 17 00:00:00 2001
+From c25b1e409bd20c7a1c47063e36c75f0dcca0b410 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 9 Dec 2020 16:07:26 +0000
Subject: [PATCH] configure: Add --enable-autolink-libatomic, use in
@@ -9,16 +9,16 @@ This fixes issues with RISC-V.
Makefile.in | 1 +
gcc/config.in | 6 ++++++
gcc/config/gnu-user.h | 12 +++++++++++-
- gcc/configure | 34 ++++++++++++++++++++++++++++++++--
- gcc/configure.ac | 23 ++++++++++++++++++++++-
+ gcc/configure | 34 +++++++++++++++++++++++++++++++---
+ gcc/configure.ac | 22 +++++++++++++++++++++-
gcc/doc/install.texi | 8 ++++++++
gcc/doc/tm.texi | 8 +++++++-
gcc/doc/tm.texi.in | 8 +++++++-
gcc/gcc.c | 12 +++++++++++-
- 9 files changed, 105 insertions(+), 7 deletions(-)
+ 9 files changed, 103 insertions(+), 8 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index c7f1f84d683..cb3983ca547 100644
+index f97db1ef569..7e577ed3dbb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -222,6 +222,7 @@ HOST_EXPORTS = \
@@ -30,7 +30,7 @@ index c7f1f84d683..cb3983ca547 100644
GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
GMPINC="$(HOST_GMPINC)"; export GMPINC; \
diff --git a/gcc/config.in b/gcc/config.in
-index 9551c0dfdf9..c8ca910df8a 100644
+index 059c818c895..2a560417440 100644
--- a/gcc/config.in
+++ b/gcc/config.in
@@ -106,6 +106,12 @@
@@ -47,7 +47,7 @@ index 9551c0dfdf9..c8ca910df8a 100644
format instead of DPD */
#ifndef USED_FOR_TARGET
diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index 7f30c363e4a..246698bfea5 100644
+index 902378e1bad..daf7727a01a 100644
--- a/gcc/config/gnu-user.h
+++ b/gcc/config/gnu-user.h
@@ -109,8 +109,18 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
@@ -71,18 +71,18 @@ index 7f30c363e4a..246698bfea5 100644
#undef LINK_GCC_C_SEQUENCE_SPEC
diff --git a/gcc/configure b/gcc/configure
-index 1632337439c..77de20dcc23 100755
+index 592e81e40f6..8672298f23f 100755
--- a/gcc/configure
+++ b/gcc/configure
-@@ -969,6 +969,7 @@ with_documentation_root_url
- with_changes_root_url
+@@ -978,6 +978,7 @@ with_changes_root_url
enable_languages
with_multilib_list
+ with_multilib_generator
+enable_autolink_libatomic
with_zstd
with_zstd_include
with_zstd_lib
-@@ -1695,6 +1696,9 @@ Optional Features:
+@@ -1707,6 +1708,9 @@ Optional Features:
--disable-shared don't provide a shared libgcc
--disable-gcov don't provide libgcov and related host tools
--enable-languages=LIST specify which front-ends to build
@@ -92,10 +92,18 @@ index 1632337439c..77de20dcc23 100755
--disable-rpath do not hardcode runtime library paths
--enable-sjlj-exceptions
arrange to use setjmp/longjmp exception handling
-@@ -8009,6 +8013,33 @@ else
+@@ -8070,7 +8074,6 @@ else
fi
+-
+ # Check whether --with-multilib-generator was given.
+ if test "${with_multilib_generator+set}" = set; then :
+ withval=$with_multilib_generator; :
+@@ -8078,6 +8081,32 @@ else
+ with_multilib_generator=default
+ fi
+
+# If libatomic is available, whether it should be linked automatically
+# Check whether --enable-autolink-libatomic was given.
+if test "${enable_autolink_libatomic+set}" = set; then :
@@ -122,31 +130,30 @@ index 1632337439c..77de20dcc23 100755
+ fi
+fi
+
-+
+
# -------------------------
# Checks for other programs
- # -------------------------
-@@ -19131,7 +19162,7 @@ else
+@@ -19501,7 +19530,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 19131 "configure"
+-#line 19501 "configure"
+#line 19158 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -32267,4 +32298,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+@@ -34068,4 +34097,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-
diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 6e4d4092af7..205f7d5e137 100644
+index 1577529ffb7..e96691f69ba 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
-@@ -1110,6 +1110,28 @@ AC_ARG_WITH(multilib-list,
+@@ -1149,6 +1149,27 @@ AC_ARG_WITH(multilib-generator,
:,
- with_multilib_list=default)
+ with_multilib_generator=default)
+# If libatomic is available, whether it should be linked automatically
+AC_ARG_ENABLE(autolink-libatomic,
@@ -169,20 +176,19 @@ index 6e4d4092af7..205f7d5e137 100644
+ fi
+fi
+
-+
# -------------------------
# Checks for other programs
# -------------------------
-@@ -6945,4 +6967,3 @@ done
+@@ -7729,4 +7750,3 @@ done
],
[subdirs='$subdirs'])
AC_OUTPUT
-
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
-index 7d98ec4190a..a58d5a05be2 100644
+index 4c38244ae58..4a544e6a4ee 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
-@@ -2169,6 +2169,14 @@ files, but these changed header paths may conflict with some compilation
+@@ -2213,6 +2213,14 @@ files, but these changed header paths may conflict with some compilation
environments. Enabled by default, and may be disabled using
@option{--disable-canonical-system-headers}.
@@ -198,7 +204,7 @@ index 7d98ec4190a..a58d5a05be2 100644
Tell GCC that when the GNU C Library (glibc) is used on the target it
will be version @var{major}.@var{minor} or later. Normally this can
diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
-index fcb7245e95c..67b485e8d0c 100644
+index b370bc76b25..acc78273983 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
@@ -217,7 +223,7 @@ index fcb7245e95c..67b485e8d0c 100644
@defmac POST_LINK_SPEC
diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
-index c17209daa51..3ec63f6d091 100644
+index 2974dae2701..80e003a38ce 100644
--- a/gcc/doc/tm.texi.in
+++ b/gcc/doc/tm.texi.in
@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
@@ -236,11 +242,11 @@ index c17209daa51..3ec63f6d091 100644
@defmac POST_LINK_SPEC
diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 40e07354b3d..81bd50b4d7c 100644
+index 22dbbf85850..90aa576037a 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
-@@ -877,13 +877,23 @@ proper position among the other output files. */
- # define ASM_DEBUG_SPEC ""
+@@ -980,13 +980,23 @@ proper position among the other output files. */
+ # define ASM_DEBUG_OPTION_SPEC ""
#endif
+#if !defined(LINK_LIBATOMIC_SPEC) && defined(ENABLE_AUTOLINK_LIBATOMIC)
@@ -265,5 +271,5 @@ index 40e07354b3d..81bd50b4d7c 100644
#ifdef ENABLE_DEFAULT_SSP
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0042-configure-fix-detection-of-atomic-builtins-in-libato.patch b/main/gcc/0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
index f5da835e7f..51acc5a617 100644
--- a/main/gcc/0042-configure-fix-detection-of-atomic-builtins-in-libato.patch
+++ b/main/gcc/0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
@@ -1,4 +1,4 @@
-From df182f44e2e25e6c7ad70f7e90f246e2c8a1006b Mon Sep 17 00:00:00 2001
+From 0282e9fc31d4245f0c562ac42fa7c900363c2c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Sun, 29 Aug 2021 09:45:27 +0200
Subject: [PATCH] configure: fix detection of atomic builtins in libatomic
@@ -22,7 +22,7 @@ See:
1 file changed, 20 insertions(+)
diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
-index 5dd0926d207..0b57a801e23 100644
+index 670b0d72cfe..38c2cd9345f 100644
--- a/libatomic/configure.tgt
+++ b/libatomic/configure.tgt
@@ -30,6 +30,26 @@
@@ -53,5 +53,5 @@ index 5dd0926d207..0b57a801e23 100644
alpha*)
# fenv.c needs this option to generate inexact exceptions.
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch b/main/gcc/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
new file mode 100644
index 0000000000..35de9a0606
--- /dev/null
+++ b/main/gcc/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
@@ -0,0 +1,84 @@
+From eab088e3a76ce23cf2365351c59707e2dd0aa599 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Sun, 28 Nov 2021 00:54:37 +0100
+Subject: [PATCH] libgo: Recognize off64_t and loff_t definitions of musl libc
+
+Without this patch, both off64_t and loff_t are not recognized by
+-fdump-go-spec which causes a variety Go-related compilation errors on
+musl libc since the gcc-go frontend expects both off64_t and loff_t to
+be present.
+
+Also make sure that autoconf recognizes support for loff_t on musl, by
+compiling the relevant feature test code with -D_GNU_SOURCE and making
+it include fcntl.h which defines loff_t on musl.
+---
+ libgo/configure | 4 +++-
+ libgo/configure.ac | 4 +++-
+ libgo/sysinfo.c | 21 +++++++++++++++++++++
+ 3 files changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/libgo/configure b/libgo/configure
+index 70f64c974fd..69d15839e8c 100755
+--- a/libgo/configure
++++ b/libgo/configure
+@@ -15546,7 +15546,9 @@ _ACEOF
+
+ fi
+
+-ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
++CFLAGS_hold=$CFLAGS
++CFLAGS="$CFLAGS -D_GNU_SOURCE"
++ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "#include <fcntl.h>"
+ if test "x$ac_cv_type_loff_t" = xyes; then :
+
+ cat >>confdefs.h <<_ACEOF
+diff --git a/libgo/configure.ac b/libgo/configure.ac
+index ebab9d9de3e..a3d9d309aba 100644
+--- a/libgo/configure.ac
++++ b/libgo/configure.ac
+@@ -602,7 +602,9 @@ AC_STRUCT_DIRENT_D_TYPE
+
+ AC_CHECK_FUNCS(accept4 dup3 epoll_create1 faccessat fallocate fchmodat fchownat futimesat getxattr inotify_add_watch inotify_init inotify_init1 inotify_rm_watch listxattr mkdirat mknodat open64 openat pipe2 removexattr renameat setxattr sync_file_range splice syscall tee unlinkat unshare utimensat)
+ AC_TYPE_OFF_T
+-AC_CHECK_TYPES([loff_t])
++CFLAGS_hold=$CFLAGS
++CFLAGS="$CFLAGS -D_GNU_SOURCE" # musl does not define loff_t without this
++AC_CHECK_TYPES([loff_t], [], [], [[#include <fcntl.h>]])
+
+ LIBS_hold="$LIBS"
+ LIBS="$LIBS -lm"
+diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
+index 8ce061e2f5f..b85add15a7b 100644
+--- a/libgo/sysinfo.c
++++ b/libgo/sysinfo.c
+@@ -343,6 +343,27 @@ enum {
+ #endif
+ };
+
++// musl libc has both off64_t and loff_t. However, both of these types
++// are defined as CPP macros, not as C typedefs. Unfortunately, the GCC
++// -fdump-go-spec option, which is responsible for generating type
++// definitions for Go based on this file, only recognizes types defined
++// through typedefs.
++//
++// For this reason, we check here if either off64_t or loff_t are
++// defined as CPP macros and if so, we redefine them using a C typedef.
++#if defined(HAVE_OFF64_T) && defined(off64_t)
++typedef off64_t __musl_off64_t;
++#undef off64_t
++typedef __musl_off64_t off64_t;
++#endif
++
++// See comment regarding musl libc above.
++#if defined(HAVE_LOFF_T) && defined(loff_t)
++typedef loff_t __musl_loff_t;
++#undef loff_t
++typedef __musl_loff_t loff_t;
++#endif
++
+ // SIOCGIFMTU can't be added in the above enum as it might
+ // be signed in some OSes.
+ #ifdef SIOCGIFMTU
+--
+2.34.1
+
diff --git a/main/gcc/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch b/main/gcc/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
new file mode 100644
index 0000000000..d18d101636
--- /dev/null
+++ b/main/gcc/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
@@ -0,0 +1,80 @@
+From cad142fc0fa5fa52c886ad8807cc62b34e5f1540 Mon Sep 17 00:00:00 2001
+From: Alex McGrath <amk@amk.ie>
+Date: Wed, 13 Oct 2021 23:24:27 +0100
+Subject: [PATCH] Fix attempt to use poisoned calloc error in libgccjit
+
+This moves usages of pthread.h to above any usage of system.h as it
+included #pragma GCC poison calloc
+---
+ gcc/jit/jit-playback.c | 4 ++--
+ gcc/jit/jit-recording.c | 4 ++--
+ gcc/jit/libgccjit.c | 3 ++-
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
+index cee9daa8220..a5600084933 100644
+--- a/gcc/jit/jit-playback.c
++++ b/gcc/jit/jit-playback.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3. If not see
+ <http://www.gnu.org/licenses/>. */
+
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -41,8 +43,6 @@ along with GCC; see the file COPYING3. If not see
+ #include "diagnostic.h"
+ #include "stmt.h"
+
+-#include <pthread.h>
+-
+ #include "jit-playback.h"
+ #include "jit-result.h"
+ #include "jit-builtins.h"
+diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c
+index 117ff70114c..d2634a546b1 100644
+--- a/gcc/jit/jit-recording.c
++++ b/gcc/jit/jit-recording.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3. If not see
+ <http://www.gnu.org/licenses/>. */
+
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -25,8 +27,6 @@ along with GCC; see the file COPYING3. If not see
+ #include "pretty-print.h"
+ #include "toplev.h"
+
+-#include <pthread.h>
+-
+ #include "jit-builtins.h"
+ #include "jit-recording.h"
+ #include "jit-playback.h"
+diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c
+index 0cc650f9810..2f44481eeb0 100644
+--- a/gcc/jit/libgccjit.c
++++ b/gcc/jit/libgccjit.c
+@@ -18,13 +18,14 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3. If not see
+ <http://www.gnu.org/licenses/>. */
+
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+ #include "timevar.h"
+ #include "typed-splay-tree.h"
+ #include "cppbuiltin.h"
+-#include <pthread.h>
+
+ #include "libgccjit.h"
+ #include "jit-recording.h"
+--
+2.34.1
+
diff --git a/main/gcc/0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch b/main/gcc/0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
new file mode 100644
index 0000000000..c5fb547941
--- /dev/null
+++ b/main/gcc/0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
@@ -0,0 +1,106 @@
+From 4ede09cec9f5df24d0d24e7d82b07a9a0ffccdda Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Thu, 25 Nov 2021 17:44:04 +0100
+Subject: [PATCH] stddef.h: add support for musl typedef macro guards
+
+The stddef.h header checks/sets various hardcoded toolchain/os specific
+macro guards to prevent redefining types such as ptrdiff_t, wchar_t, or
+size_t. However, without this patch, the file does not check/set the
+typedef macro guards for musl libc. This causes types such as size_t to
+be defined twice for files which include both musl's stddef.h as well as
+GCC's ginclude/stddef.h. This is, for example, the case for
+libgo/sysinfo.c. If libgo/sysinfo.c has multiple typedefs for size_t
+this confuses -fdump-go-spec and causes size_t not to be included in the
+generated type definitions thereby causing a gcc-go compilation failure
+on musl with the following error message:
+
+ sysinfo.go:7765:13: error: use of undefined type '_size_t'
+ 7765 | type Size_t _size_t
+ | ^
+ libcall_posix.go:49:35: error: non-integer len argument in make
+ 49 | b := make([]byte, len)
+ |
+
+This commit fixes this issue by ensuring that ptrdiff_t, wchar_t, and size_t
+are only defined once in the pre-processed libgo/sysinfo.c file by enhancing
+gcc/ginclude/stddef.h with musl-specific typedef macro guards.
+---
+ gcc/ginclude/stddef.h | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h
+index 66619fe43b1..50d710a5ab9 100644
+--- a/gcc/ginclude/stddef.h
++++ b/gcc/ginclude/stddef.h
+@@ -128,6 +128,7 @@ _TYPE_wchar_t;
+ #ifndef ___int_ptrdiff_t_h
+ #ifndef _GCC_PTRDIFF_T
+ #ifndef _PTRDIFF_T_DECLARED /* DragonFly */
++#ifndef __DEFINED_ptrdiff_t /* musl libc */
+ #define _PTRDIFF_T
+ #define _T_PTRDIFF_
+ #define _T_PTRDIFF
+@@ -137,10 +138,12 @@ _TYPE_wchar_t;
+ #define ___int_ptrdiff_t_h
+ #define _GCC_PTRDIFF_T
+ #define _PTRDIFF_T_DECLARED
++#define __DEFINED_ptrdiff_t
+ #ifndef __PTRDIFF_TYPE__
+ #define __PTRDIFF_TYPE__ long int
+ #endif
+ typedef __PTRDIFF_TYPE__ ptrdiff_t;
++#endif /* __DEFINED_ptrdiff_t */
+ #endif /* _PTRDIFF_T_DECLARED */
+ #endif /* _GCC_PTRDIFF_T */
+ #endif /* ___int_ptrdiff_t_h */
+@@ -174,6 +177,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
+ #ifndef _SIZE_T_DEFINED
+ #ifndef _BSD_SIZE_T_DEFINED_ /* Darwin */
+ #ifndef _SIZE_T_DECLARED /* FreeBSD 5 */
++#ifndef __DEFINED_size_t /* musl libc */
+ #ifndef ___int_size_t_h
+ #ifndef _GCC_SIZE_T
+ #ifndef _SIZET_
+@@ -191,6 +195,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
+ #define _SIZE_T_DEFINED
+ #define _BSD_SIZE_T_DEFINED_ /* Darwin */
+ #define _SIZE_T_DECLARED /* FreeBSD 5 */
++#define __DEFINED_size_t /* musl libc */
+ #define ___int_size_t_h
+ #define _GCC_SIZE_T
+ #define _SIZET_
+@@ -215,6 +220,7 @@ typedef long ssize_t;
+ #endif /* _SIZET_ */
+ #endif /* _GCC_SIZE_T */
+ #endif /* ___int_size_t_h */
++#endif /* __DEFINED_size_t */
+ #endif /* _SIZE_T_DECLARED */
+ #endif /* _BSD_SIZE_T_DEFINED_ */
+ #endif /* _SIZE_T_DEFINED */
+@@ -251,6 +257,7 @@ typedef long ssize_t;
+ #ifndef _BSD_WCHAR_T_DEFINED_ /* Darwin */
+ #ifndef _BSD_RUNE_T_DEFINED_ /* Darwin */
+ #ifndef _WCHAR_T_DECLARED /* FreeBSD 5 */
++#ifndef __DEFINED_wchar_t /* musl libc */
+ #ifndef _WCHAR_T_DEFINED_
+ #ifndef _WCHAR_T_DEFINED
+ #ifndef _WCHAR_T_H
+@@ -272,6 +279,7 @@ typedef long ssize_t;
+ #define __INT_WCHAR_T_H
+ #define _GCC_WCHAR_T
+ #define _WCHAR_T_DECLARED
++#define __DEFINED_wchar_t
+
+ /* On BSD/386 1.1, at least, machine/ansi.h defines _BSD_WCHAR_T_
+ instead of _WCHAR_T_, and _BSD_RUNE_T_ (which, unlike the other
+@@ -326,6 +334,7 @@ typedef __WCHAR_TYPE__ wchar_t;
+ #endif
+ #endif
+ #endif
++#endif /* __DEFINED_wchar_t */
+ #endif /* _WCHAR_T_DECLARED */
+ #endif /* _BSD_RUNE_T_DEFINED_ */
+ #endif
+--
+2.34.1
+
diff --git a/main/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch b/main/gcc/0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
index c282b5a339..474847badd 100644
--- a/main/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+++ b/main/gcc/0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
@@ -1,18 +1,43 @@
-From 38af7ff7a56fb1b917e7432341614b2604e6721c Mon Sep 17 00:00:00 2001
+From 61fc6a52f3fc5fe6c66dc2dd0fa222ba1349d7e5 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Sun, 30 Aug 2020 18:01:03 +0200
+Date: Sun, 30 Aug 2020 18:33:49 +0200
Subject: [PATCH] gcc-go: Use int64 type as offset argument for mmap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
-Taken from Adélie Linux.
+Without this patch, Go run-time memory allocation fails on 32-bit architectures:
+
+ fatal error: runtime: cannot allocate memory
+ runtime stack:
+ runtime.dopanic__m
+ :0
+ runtime.throw
+ :0
+ :0
+ :0
+ runtime.systemstack
+ :0
+ runtime.addrRanges.init
+ :0
+ runtime.pageAlloc.init
+ :0
+ runtime.mheap.init
+ :0
+ runtime.schedinit
+ :0
+ :0
+ :0
+
+Taken from Adélie Linux [1].
+
+[1]: https://git.adelielinux.org/adelie/packages/-/commit/63b5fb12c3d75e460799c672bbbdd5d29c3cc33c
---
libgo/go/runtime/mem_gccgo.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go
-index ba38ebaa9ab..3c9e5ce9461 100644
+index fa3389d857e..57bed97c710 100644
--- a/libgo/go/runtime/mem_gccgo.go
+++ b/libgo/go/runtime/mem_gccgo.go
@@ -15,7 +15,7 @@ import (
@@ -34,5 +59,5 @@ index ba38ebaa9ab..3c9e5ce9461 100644
if uintptr(p) == _MAP_FAILED {
return nil, errno()
--
-2.33.1
+2.34.1
diff --git a/main/gcc/0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch b/main/gcc/0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
new file mode 100644
index 0000000000..41cafe41d8
--- /dev/null
+++ b/main/gcc/0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
@@ -0,0 +1,98 @@
+From 30e4c9be8d17c7806beaca9e78f6aff6ebae6463 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Wed, 15 Dec 2021 00:14:19 +0100
+Subject: [PATCH] Disable -fsplit-stack support on non-glibc targets
+
+The -fsplit-stack option requires the pthread_t TCB definition in the
+libc to provide certain struct fields at specific hardcoded offsets. As
+far as I know, only glibc provides these fields at the required offsets.
+Most notably, musl libc does not have these fields. However, since gcc
+accesses the fields using a fixed offset this does not cause a
+compile-time error but instead results in a silent memory corruption at
+run-time. For example, on s390x libgcc's __stack_split_initialize CTOR
+will overwrite the cancel field in the pthread_t TCB on musl.
+
+The -fsplit-stack option is used within the gcc code base by gcc-go by
+default. On musl based systems with split-stack support (e.g. s390x or
+x86) this causes Go programs compiled with gcc-go to misbehave at
+run-time.
+
+This patch fixes gcc-go on musl by disabling -fsplit-stack in gcc itself
+since it is not supported on non-glibc targets anyhow. This is achieved
+by checking if TARGET_GLIBC_MAJOR is defined to a non-zero value (it
+defaults to zero on non-glibc systems). The check has been added for x86
+and s390x, the rs6000 config already checks for TARGET_GLIBC_MAJOR. With
+this patch applied, the gcc-go configure script will detect that
+-fsplit-stack support is not available and will not use it.
+
+This patch has been tested on Alpine Linux Edge on the s390x
+architecture by bootstrapping Google's Go implementation with gcc-go.
+
+See https://www.openwall.com/lists/musl/2012/10/16/12
+---
+ gcc/common/config/s390/s390-common.c | 9 ++++++++-
+ gcc/config/i386/gnu-user-common.h | 5 +++--
+ gcc/config/i386/gnu.h | 6 +++++-
+ 3 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/gcc/common/config/s390/s390-common.c b/gcc/common/config/s390/s390-common.c
+index b6bc8501742..afbd8d3fe66 100644
+--- a/gcc/common/config/s390/s390-common.c
++++ b/gcc/common/config/s390/s390-common.c
+@@ -116,13 +116,20 @@ s390_handle_option (struct gcc_options *opts ATTRIBUTE_UNUSED,
+
+ /* -fsplit-stack uses a field in the TCB, available with glibc-2.23.
+ We don't verify it, since earlier versions just have padding at
+- its place, which works just as well. */
++ its place, which works just as well. For other libc implementations
++ we disable the feature entirely to avoid corrupting the TCB. */
+
+ static bool
+ s390_supports_split_stack (bool report ATTRIBUTE_UNUSED,
+ struct gcc_options *opts ATTRIBUTE_UNUSED)
+ {
++#if TARGET_GLIBC_MAJOR
+ return true;
++#else
++ if (report)
++ error("%<-fsplit-stack%> currently only supported on GNU/Linux");
++ return false;
++#endif
+ }
+
+ #undef TARGET_DEFAULT_TARGET_FLAGS
+diff --git a/gcc/config/i386/gnu-user-common.h b/gcc/config/i386/gnu-user-common.h
+index 00226f5a455..554e146dbbe 100644
+--- a/gcc/config/i386/gnu-user-common.h
++++ b/gcc/config/i386/gnu-user-common.h
+@@ -66,7 +66,8 @@ along with GCC; see the file COPYING3. If not see
+ #define STACK_CHECK_STATIC_BUILTIN 1
+
+ /* We only build the -fsplit-stack support in libgcc if the
+- assembler has full support for the CFI directives. */
+-#if HAVE_GAS_CFI_PERSONALITY_DIRECTIVE
++ assembler has full support for the CFI directives and
++ uses glibc. */
++#if HAVE_GAS_CFI_PERSONALITY_DIRECTIVE && TARGET_GLIBC_MAJOR
+ #define TARGET_CAN_SPLIT_STACK
+ #endif
+diff --git a/gcc/config/i386/gnu.h b/gcc/config/i386/gnu.h
+index 25fbc07f58c..895a7369816 100644
+--- a/gcc/config/i386/gnu.h
++++ b/gcc/config/i386/gnu.h
+@@ -35,7 +35,11 @@ along with GCC. If not, see <http://www.gnu.org/licenses/>.
+ crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
+ #endif
+
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++/* -fsplit-stack uses a field in the TCB at a fixed offset. This
++ field is only available for glibc. Disable -fsplit-stack for
++ other libc implementation to avoid silent TCB corruptions. */
++
++#if defined (TARGET_LIBC_PROVIDES_SSP) && TARGET_GLIBC_MAJOR
+
+ /* i386 glibc provides __stack_chk_guard in %gs:0x14. */
+ #define TARGET_THREAD_SSP_OFFSET 0x14
+--
+2.34.1
+
diff --git a/main/gcc/0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch b/main/gcc/0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
new file mode 100644
index 0000000000..c91ebf8dd9
--- /dev/null
+++ b/main/gcc/0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
@@ -0,0 +1,58 @@
+From c1408c2e323bf724db3bb8b1523e4cf5848c7e63 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren@soeren-tempel.net>
+Date: Sun, 2 Jan 2022 01:07:03 +0100
+Subject: [PATCH] libgo: include asm/ptrace.h for pt_regs definition on PowerPC
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Both glibc and musl libc declare pt_regs as an incomplete type. This
+type has to be completed by inclusion of another header. On Linux, the
+asm/ptrace.h header file provides this type definition. Without
+including this header file, it is not possible to access the regs member
+of the mcontext_t struct as done in libgo/runtime/go-signal.c. On glibc,
+other headers (e.g. sys/user.h) include asm/ptrace.h but on musl
+asm/ptrace.h is not included by other headers and thus the
+aforementioned files do not compile without an explicit include of
+asm/ptrace.h:
+
+ libgo/runtime/go-signal.c: In function 'getSiginfo':
+ libgo/runtime/go-signal.c:227:63: error: invalid use of undefined type 'struct pt_regs'
+ 227 | ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip;
+ |
+
+Instead of including the asm/ptrace.h header conditionally on PowerPC
+only it would alternatively also be possible to include it
+unconditionally.
+
+See also:
+
+* https://git.musl-libc.org/cgit/musl/commit/?id=c2518a8efb6507f1b41c3b12e03b06f8f2317a1f
+* https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d57cb31910ca5c200e4172276749a7f8bd17ae3c
+* https://github.com/kaniini/libucontext/issues/36
+
+Signed-off-by: Sören Tempel <soeren@soeren-tempel.net>
+---
+ libgo/runtime/go-signal.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
+index d30d1603adc..fc01e04e4a1 100644
+--- a/libgo/runtime/go-signal.c
++++ b/libgo/runtime/go-signal.c
+@@ -10,6 +10,12 @@
+ #include <sys/time.h>
+ #include <ucontext.h>
+
++// On PowerPC, ucontext.h uses a pt_regs struct as an incomplete
++// type. This type must be completed by including asm/ptrace.h.
++#ifdef __PPC__
++#include <asm/ptrace.h>
++#endif
++
+ #include "runtime.h"
+
+ #ifndef SA_RESTART
+--
+2.34.1
+
diff --git a/main/gcc/0047-gdc-unconditionally-link-libgphobos-against-libucont.patch b/main/gcc/0047-gdc-unconditionally-link-libgphobos-against-libucont.patch
new file mode 100644
index 0000000000..63963ba3b3
--- /dev/null
+++ b/main/gcc/0047-gdc-unconditionally-link-libgphobos-against-libucont.patch
@@ -0,0 +1,27 @@
+From 7b7f146c0dd01fde892ed5b5f40850bdacd7431b Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Mon, 17 Jan 2022 16:31:09 +0000
+Subject: [PATCH] gdc: unconditionally link libgphobos against libucontext
+
+from: Mathias LANG <pro.mathias.lang@gmail.com>
+ref: alpine/aports#13422
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 7e577ed3dbb..da40b61a8c5 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -51248,7 +51248,7 @@ configure-target-libphobos:
+ esac; \
+ module_srcdir=libphobos; \
+ rm -f no-such-file || : ; \
+- CONFIG_SITE=no-such-file $(SHELL) \
++ CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
+ $$s/$$module_srcdir/configure \
+ --srcdir=$${topdir}/$$module_srcdir \
+ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+--
+2.34.1
+
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 2bf627a60e..b270dedc68 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -1,8 +1,9 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=gcc
-_pkgbase=10.3.1
-pkgver=10.3.1_git20211027
+_pkgbase=11.2.1
+pkgver=11.2.1_git20220117
[ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
[ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
@@ -27,6 +28,7 @@ replaces="libstdc++ binutils"
: "${LANG_GO:=true}"
: "${LANG_FORTRAN:=true}"
: "${LANG_ADA:=true}"
+: "${LANG_JIT:=true}"
_libgomp=true
_libgcc=true
@@ -46,6 +48,7 @@ if [ "$CHOST" != "$CTARGET" ]; then
LANG_GO=false
LANG_FORTRAN=false
LANG_D=false
+ LANG_JIT=false
_libgomp=false
_libatomic=false
_libitm=false
@@ -83,6 +86,7 @@ elif [ "$CBUILD" != "$CHOST" ]; then
LANG_GO=false
LANG_FORTRAN=false
LANG_D=false
+ LANG_JIT=false
STRIP_FOR_TARGET=${CROSS_COMPILE}strip
_builddir="$srcdir/build-cross-native"
@@ -162,6 +166,10 @@ if $LANG_ADA; then
[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
fi
+if $LANG_JIT; then
+ subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
+ _languages="$_languages,jit"
+fi
makedepends="$makedepends_build $makedepends_host"
# when using upstream releases, use this URI template
@@ -174,7 +182,7 @@ makedepends="$makedepends_build $makedepends_host"
source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
0001-posix_memalign.patch
0002-gcc-poison-system-directories.patch
- 0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+ 0003-specs-turn-on-Wl-z-now-by-default.patch
0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
0006-Enable-Wformat-and-Wformat-security-by-default.patch
@@ -188,32 +196,37 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
0014-nopie.patch
0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
0016-dlang-update-zlib-binding.patch
- 0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
- 0018-ada-fix-shared-linking.patch
- 0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
- 0020-add-fortify-headers-paths.patch
- 0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
- 0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
- 0023-Pure-64-bit-MIPS.patch
- 0024-use-pure-64-bit-configuration-where-appropriate.patch
- 0025-always-build-libgcc_eh.a.patch
- 0026-ada-libgnarl-compatibility-for-musl.patch
- 0027-ada-musl-support-fixes.patch
- 0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
- 0029-gcc-go-Don-t-include-sys-user.h.patch
- 0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
- 0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
- 0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
- 0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
- 0034-gcc-go-signal-34-is-special-on-musl-libc.patch
- 0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
+ 0017-dlang-use-libucontext-on-mips64.patch
+ 0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
+ 0019-ada-fix-shared-linking.patch
+ 0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+ 0021-add-fortify-headers-paths.patch
+ 0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+ 0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+ 0024-mips64-disable-multilib-support.patch
+ 0025-aarch64-disable-multilib-support.patch
+ 0026-s390x-disable-multilib-support.patch
+ 0027-ppc64-le-disable-multilib-support.patch
+ 0028-x86_64-disable-multilib-support.patch
+ 0029-riscv-disable-multilib-support.patch
+ 0030-always-build-libgcc_eh.a.patch
+ 0031-ada-libgnarl-compatibility-for-musl.patch
+ 0032-ada-musl-support-fixes.patch
+ 0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+ 0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+ 0035-gcc-go-signal-34-is-special-on-musl-libc.patch
0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
0037-gcc-go-link-to-libucontext.patch
- 0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
- 0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
- 0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
- 0041-Use-generic-errstr.go-implementation-on-musl.patch
- 0042-configure-fix-detection-of-atomic-builtins-in-libato.patch
+ 0038-Use-generic-errstr.go-implementation-on-musl.patch
+ 0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+ 0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
+ 0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+ 0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+ 0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+ 0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+ 0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
+ 0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
+ 0047-gdc-unconditionally-link-libgphobos-against-libucont.patch
"
# we build out-of-tree
@@ -251,6 +264,7 @@ build() {
local _cross_configure=
local _bootstrap_configure=
local _symvers=
+ local _jit_configure=
cd "$_gccdir"
@@ -295,6 +309,8 @@ build() {
*) _bootstrap_configure="--enable-shared --enable-threads --enable-tls" ;;
esac
+ $LANG_JIT && _jit_configure="--enable-host-shared"
+
$_libgomp || _bootstrap_configure="$_bootstrap_configure --disable-libgomp"
$_libatomic || _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
$_libitm || _bootstrap_configure="$_bootstrap_configure --disable-libitm"
@@ -342,6 +358,7 @@ build() {
$_libc_configure \
$_cross_configure \
$_bootstrap_configure \
+ $_jit_configure \
--with-system-zlib \
$_hash_style_configure
make
@@ -489,6 +506,18 @@ gpp() {
mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/
}
+jit() {
+ pkgdesc="GCC JIT Library"
+ depends=
+ amove usr/lib/libgccjit.so*
+}
+
+jitdev() {
+ pkgdesc="GCC JIT Library (development files)"
+ depends="libgccjit"
+ amove usr/include/libgccjit*.h
+}
+
libobjc() {
pkgdesc="GNU Objective-C runtime"
replaces="objc"
@@ -662,47 +691,52 @@ gnat() {
}
sha512sums="
-2cba43a26debf22fde6442fcc446b7a84ca18bc4281cee1f1f1b50c254eee2615360982d0502df63ed39d7e739e4715373bae75f1c9f226378c7d617478062d9 gcc-10.3.1_git20211027.tar.xz
-a098a33a9d5a0360341c41aec036bce9463a5b67046b19fb2f5bcecfb5fe2aeb58dbd087ec4f8831c503ce57445a7ecd45e500f11476f24d2f441b46cbb99d9c 0001-posix_memalign.patch
-a8da4611f43c0a1641b6f01c230aa706bd8e65ad367acea35051ab7ea821fb4622647c2ceadb6ec7c67388c9af70d06f3c134caa1af47c8542309898e9cd96ba 0002-gcc-poison-system-directories.patch
-e1b5858902dc719bef17d4d6704d66a9662173af57948240282a43b138633932216fa549ea73c54b377aeee4b2658650e756766493a2f2f30e26756b8f9b43da 0003-Turn-on-Wl-z-relro-z-now-by-default.patch
-ef6bcc83e17253f403029f23eae7f0075e41fbe8ec6d391545e32b77b0f5c0cb100a2d56be592ef14cb396a48c7c4a195ad211fd761bdd84d95db7f53e7f5e51 0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-93023be3c1ce4a2b19f5d1ed0a074a5a93daf74329fb59d8e01cfafe69018053e48f842ecdcd61f58526ba213fac99c6cc6cde30b603897a74972f1c51347596 0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-4f6f1f3aef017841dd42a131b686b55c777769aa23d4483660f6c852ab441b6d8eac2ee41c9f83cb62a31988851a57a303fe00a96c9e9f47017e67d2eb73c714 0006-Enable-Wformat-and-Wformat-security-by-default.patch
-5cf49b9be154e3f7f077ccb0737606018af5a660a35041ba0d6192082f7db423e7621874cf66af16e525670a75e7d555e0ddb44d2e5b664635267928497b9d09 0007-Enable-Wtrampolines-by-default.patch
-3af183d717288f8aa0b5206bae906b553448f723380932d2da1dc41d56db730c192ef4ec424cd4eba2052acf1b2c5f35f1a7b608fc17fb8100c4c0e1d27d5e1f 0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-e92cd9e054601bcb6a16966ae378cb3d3ce0b584c0a179996faa3921fb60668298d200d923dc7ca419bd39c4077c55d57d9703252a0728410dc04d427c0206e8 0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-8d094d1e8f90cf44f307ef1e8257138ff61b47aabf58b9ec78080e3ad202de31319436b04f6eff33af5bbf983a0814bb2b9d8b1c8dfdcfaafd48eef414f07b1a 0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-dd06807fb9d02c6de37cb44f17ffea2c86d4f22aabf441ab015e8613f9f37068113d52cd00d57365d53b145799f6affdc008b6d8d0a7daebf500e82debc4f53f 0011-libiberty-copy-PIC-objects-during-build-process.patch
-6d9fe75cbb488e0ac6d85bddb4f6f06fa3424889d225d4c25352555dbd5aed7db0be6d276b6214380f3c8bff37e31a1a56da40066a090a46d727a5f68b9f92a8 0012-libitm-disable-FORTIFY.patch
-ccdacf75756dda9af59a7355a87645d39231e9bf6e9a2f1fa8b6351ca0466dccecaa97a263e67c7a95d71176b31ad6d991f665ef5b855d7134e28ba7a8d30c5f 0013-libgcc_s.patch
-5304f689f1016f0df3bfa580c2a8c72ac936faaaf4edd614eebbc9f1ffad40fe2e306cd46c079f4acb407b56335a4414a462001dcc9ef111afc034f1de4b956b 0014-nopie.patch
-3dec2f23a0b6e4ef183cb9ec8550ac2f59873dad3758dd25eac82c9bd10573c83cf429333b584613e272bd6b20825f164ae015902d93cd996d604d0af6e59220 0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
-51c6ac1b3788a4a925873109e243b5cfbf081825b1890a05d1106ab1d73aead60863d80707b52dcfe75ccfe2ece7ae29a68338bb6a4142bc47d2678a10f60fb8 0016-dlang-update-zlib-binding.patch
-c2d32cd3b4765924d30e96216d5482b006fb9a56a281cc10177d09d04b545c77e81f201cc0218cec5345a2672aa69452236576f57ffdedea37d942db3eca7b33 0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
-64836685eeb4c87a6f014f20eabe98e212b8082100827a0a3c25d8f0c8e8aa69594bbce0229d7b73fce06ab899030068f64388fa999ecd2914209c4ce7deb902 0018-ada-fix-shared-linking.patch
-e85463e664371e19ac49c4f603c18e2676b395c847fe1fc9969339533d6f9f929e54038a64636ad594f5b3ff53b8fe513b504e06644f5647581aa6b301c3a27e 0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-c7e0eb5f426c613f025fe26af82dd16c7be06b944a4eea642440e2b010d3e8455658ec453ca82333823dc7a52c9bf039b2edcf0f3be6e141bf69618c449b0792 0020-add-fortify-headers-paths.patch
-fa2489368639203189f2ac5fd433cc4fb25c356dd21f560043aa7e2e3a94cbf13df3bd48cc9b2eb472876236f0bb807efa6b06506c2f5b51f71567e54004b430 0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-bf693daf2fcf497c8a804eed2d039d42b2e95725f584d87bc3d9d5fc057693fbfb9b76fb4818399664014497b6dd9055df32e2e7ea29182eb0078cc76dc14839 0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-3c339f40bf3d9059fb5ab14ddde239996d4aebe36e5eb10feecd2ba93ef3e88d56c78f719308458cac74175fd604d7125956568d68c49dbe011c6f8cb6c98c33 0023-Pure-64-bit-MIPS.patch
-43fb576d041698ecaa2f640d6dda8511408d0967d4dd26d597400aa307d0bf9f9a224d8d4d841703453be21c6a321485b84ba0200ae69e260ea043e71a57c0d2 0024-use-pure-64-bit-configuration-where-appropriate.patch
-4aab3f2319a926e25af6f4219001f2f0c250da7ff66bfc7a70c26c6489fffbd52232ec8104e79fb64dfe97e50c8914d333f44eb493629aa0014aa392e3585382 0025-always-build-libgcc_eh.a.patch
-2af7eaf89af20ba945fa8b64592f310632e75afef09f417d6c6efd49f3b9e4624f6659512dcdc077ebc2c38684fcf979a9b4a501e3a414902db2c44bc105eb4c 0026-ada-libgnarl-compatibility-for-musl.patch
-5ef42aa075b048592c6e22417dab5d07f78a7c13914fa1aa9e9c47f53b71bbbf27d3982201a74816b1347cd123048dd669b7c8da4ad4e481d915f67a3ae0f754 0027-ada-musl-support-fixes.patch
-9fbcb2addffa042e4791b715e156402d03b8f3703356d0b9570526df7b5b311595c1b772e5295328f56e05efc7f99e22f5e5b48c5ffb9bf71ebc56afe5321d11 0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
-88aa25ead0706b775a4ab4d31a2319cfdbb094490798f87f8272a74228683d6a295b42f9af7c57a646ea17b8d393e8b2e52bb57d10e0527c3fbfcad6e1c5e159 0029-gcc-go-Don-t-include-sys-user.h.patch
-9f38276188ae56d037b99df4a068fc71c94b5d17341d4131ef1252c42352a5029768ffdb4a8d12ef92bfd30b5d5f7a3c440ed91d334c85dc66b837d6d23897a9 0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
-de6fac26c37ee3d5e55129620f6793d80e74db1d922e545591d3d2a1eabb0cd9a6f2f918800a1177a79a9aaea49263ee7b126ccd1a05ecab3f90304f1ce4db68 0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-0c48d1acca7f33e796de0bd520f727ccc498530c86aa56e1bb1ceb68f2b751f2b265a5cd86ce142213906a4fbc4667e3d5bad07fb8613989ed6a77a7aaa11a29 0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-bebd27d21d8b64011b3752fdc9ca03ebcda52ba452aae074a484ed204eac6056ac8ea46cb4413de810e0c3df05a4ccfbb2033582497426447f9c06bd784fbc56 0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
-dfec489d78a0921cdd9a6a1b35a14566f565413e2f4f0467db37f0650e28be9482111bdfe93274280594ddac9c5ef7f50a9d0443c4f9393f71ef7195d1dd8166 0034-gcc-go-signal-34-is-special-on-musl-libc.patch
-89ac788b3a49ce46cf852e5396c9bac99155059700a07736794773291e43dd07c3693999e115e683fc6df110b2081c6d93226b31cced0eff905b58855ff986ce 0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
-1473f977f2fc259a8d7abc29d554b0b44fb7d65b5e5cdddf1601505ba2cb3aa2f86e13691e8bdbe2f93c7ae866a6702ef7764adff8c535ccf2f6abf6f2e377dc 0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
-89c40e32ec0f02d294f4bc576c652b976d63ff8ab4dca9f3a7533bca40e3c267e8a4b02ff5099bf7534174d68e21044c38a9141cc7a9399573bab6fc4fb7ac8d 0037-gcc-go-link-to-libucontext.patch
-2742b50a629835577de5f3ac4a764770fd7a6f42e0e0da5d35673cecf4d24a2d1d4227f3f03745001947c5b69dae72fe0584941257333f916c4db3d240bcbbfa 0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-70987dea8cbee832660d8a27e3ebf7b072974e6e8f5112c1365a6a4c84830bdff8342c7a4933486f5f4becabb81a89c46e3c3cde5602e172206c59965cdd5f3f 0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
-3963bac9cd0f8c442599a5e983f033798266e20e9f7ba72c023724e0917a0ae750856d15e0e9a527f6f60e735ddfa66f8f3e300de47e54cad6c440ddc0403081 0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-9f82ce02f355ae38952d17512fc962886f485e06d9ae2ef57f13ccc3f7b298d7e9921f8867b86d7d1fee442df887ba4ee3983521bfa91248872110a1b6c070aa 0041-Use-generic-errstr.go-implementation-on-musl.patch
-40168210e381c329a7ff3e332dedadfa0c60e9da3251c29e660aeeae478da5c5988dc9144a9e6be178202d1d15e2dfa273f5034a861054786ef7cfd4f56c2745 0042-configure-fix-detection-of-atomic-builtins-in-libato.patch
+e756307338258432bd8dfc41cf27440117bca4cd7a3a80a7009eb06d06004ade0a61eefd773969ed6578afadef96b4813d41961faf8a43c28d0af77a388fea7d gcc-11.2.1_git20220117.tar.xz
+7e5d342e302b376c729e17998d3fdbb8397ed9330c44e0335c4a7319c010bb8d1680c45f37d9eb96d67f99d052290fe943aa818799307271a846a50232db0aa0 0001-posix_memalign.patch
+fe147a13e8e460a8ec6df26b7bed67455d55bd6ca238fc52f04095bb8151ec54c85bb048a90fa0ed4f42f97caacd158dec0b3651f32ecac3ce39c53e18aa3747 0002-gcc-poison-system-directories.patch
+6d8d6335ae657a65fea2bfed74c1da41208ae8849bd156622425c691d45d29a3e42ad419284ca70630c10cb14a458322dbcefc23ee87f24b85fdd0bb28bedc61 0003-specs-turn-on-Wl-z-now-by-default.patch
+122e99feaa5954aea8f9bf9157b1d486725ea6643727eee440ab818d4a69c817eca6ac5ece3952687e53ca92781c3d00b5ae3e6fb20c71880377ff1b9c72650b 0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+dc98a6f99dbaee44b1fb1ecdb5eb924a9636d705dc556d1a760611b0d38c215b9e33a9cd13f5307d2d3c16f86ebe8e9f700ecffc05cf9739554f57f3d953da0b 0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+f55372e68065c31020a8afb5bb0b341a155f59887c8723151e3d2842f1a93842e86dc91a3860661762fbba6de340ba75727ad87e04b177975428f5d4010016d3 0006-Enable-Wformat-and-Wformat-security-by-default.patch
+f599d8c0e65782938a1fb31d40720f31c9f0acb4fa7a34b3dd732dc0ead211447e8f9d153dd527471acea0508bdf625056a2128ab43f247080068bc54b711e85 0007-Enable-Wtrampolines-by-default.patch
+2a1f0c8f1a956e63aa4f61154a883aa510d619d5c5e3acedac2b19d0996d97e35f30e47fa7dca90f24fc8b6133860c91b43379afcf57fcf677c3490e7320cf2f 0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+140cbba61b82069d153416be4b0ac6164280f2a8f9c96f122175dba0c1ba6ea7aaba3c32db38e580c1caed4a94d4f2a22972f021ca82c3a609b8287f53d40a23 0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+39bad14674b741e4745b6e1a6e3f34af9c37b8b8258cc2b260ac3833e61480aebded0afc33ae45c7c126b4b5debfb01439a02521d4b299781bab0532736f462c 0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+ffe5fd575cce27ba84b05a1cc37df8b3f5fa5c879fe4214054b6b441b85df974ac6f56d45eedcdeb81a4aa7db3418977e7acc50b05343ded15049d9d40da4f83 0011-libiberty-copy-PIC-objects-during-build-process.patch
+07a38d9233f1541cb3ba9c64b1ed8078c37fabeee46c4fb223171416105091cf8ec388b1dc7db4496b2da62c4198534de379e0f99490ff8cfb5cf9e508b0188c 0012-libitm-disable-FORTIFY.patch
+a42cf4072d23010b55be2d87e8a345dcc9cc09e3a655c8624d231659647d776053381f245a86214d1a11f3bc607248d08881e014d51e3920fb5659656d4b70e6 0013-libgcc_s.patch
+8b30699003a32f81ab9db6091570ad473e3a7269b2e4a1a1c0381c09031cc360ad8189f4f1cf7805a683e72b190752d5b7667626c5e4d8dd6ccf1741e7c53d6a 0014-nopie.patch
+cfe8a7a8060022d4210cacdac6a863ca1d9ab0f8e68c93928cace8d5219bb2cea6fa8aa78ec3217df51c44ff0b3814e3a6d5bce22375ff67da749d385e3d3f5d 0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+511ab327571ad82f58acf94d9ec40c7b0920a1b163ff1aecce185281fb6121624bf2c1cdc6761bc794601882d0973fffb4664031315f0eab2623acc5ad40621a 0016-dlang-update-zlib-binding.patch
+49b8d10142e1cd5a01235cab5560d87d32a8c6c4f05e14db521eee1809128b038695e49dc5a61876e35a34845b2241c0169cb58fc0011dab62af2b0e6b185ca5 0017-dlang-use-libucontext-on-mips64.patch
+b092da7ac532fcb7b931d27eb0175374adb9f4a16e782c4f803af9cf073457b074f0c1fe0065a03f8432f2d422fa4e0ebe760d849d8f614337e33f3f027bb714 0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
+6604a8653b660655baa0ed844326f49a6535e12934bc196acadf19fbcb83a37ea455e3a1fc60d529d62a672e5fbe97524b278eaa8fb3e25fb4a6ba362ef9ca91 0019-ada-fix-shared-linking.patch
+37b534d4c9fbc340e5df790e85b8997986db100fd86ea1b27b912ef5fd0ce5f6b248e468ffbd03e0a543906f57dcffe33d3975c63dcda95efac6713ed03c1606 0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+1c8be5fa094ad499a021e983d9f29a9e4375e03e0633c789aebc0ee7af0d33c4a1ac952257e3a807f17b7393d110657bd149459e0526a56b4f6380e09d3c4eec 0021-add-fortify-headers-paths.patch
+ba1d19e92e85551d8581a9eef6c103e1aee2ed47af8f6261d1c26c5d26b7a4b94cc98a6a22936f0d6ef868f3ebf77ed9cb5e8f3147a33c7270810084c47e22a7 0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+d1aa039a04a69a2b08ec44a54541c90b66be6b19d24a1060c587ec72e40adb1e8c33e2a5036f8c1f9b43a062c373b094e57f4bbb1225220c1527218661e5d9b6 0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+d5468649da2e973bc7ce389dd9797e0b3bb2acf93b3f17e0dcd9cf70b79fb81dc0268d0989693e72821a13376c134c648942cad6b8633f6615ac57573153e879 0024-mips64-disable-multilib-support.patch
+198a369b7bc67431cd11b3bc179a97349640864b3397d09932002ccea9e3c06cdd93671587ec43cf59aef66fc42649afb2939e08fa0d7354accd3554ede21dd7 0025-aarch64-disable-multilib-support.patch
+967b238f8740c6622613645a04415e7fd1a366fe46252ba49271be59b1396eb8ab73211516fda51c2b71f306b195e5527e065a58ef34f14984dbecacae38981c 0026-s390x-disable-multilib-support.patch
+7fff62eda6c6b0214825cb2ca29e5f8957b5b3fafdd3e3c2d1ab9036d0d1a62e002b8fca2db750152593ff08aba15ecf281f5a8b1aee662107969f0fd07de3a1 0027-ppc64-le-disable-multilib-support.patch
+ee883dd8775eaaf486cb926ec301d53a89043074917afb84fe2d639ff7fa5bb0497c204509f447f9920ddb09dcd73c179056b3790a13b145cc46dff451484b36 0028-x86_64-disable-multilib-support.patch
+b1ab2f7a6bbf659b0b37eec3bfbf1f85e017ca1d4382816ce8f0c6db6c3a5328c9ace8ca4c1716e715d6d076eb5e9e3bd6212299ddae7a13776f93dfc26ff1cc 0029-riscv-disable-multilib-support.patch
+1990d2e5d38f338b7beb888490cacfb0020a9c836402400f6b828341f946ff65bdc77b872f470fdfeaaff3e933396baace3233d3bf21fad76f999c0ce916d8f5 0030-always-build-libgcc_eh.a.patch
+0e7db3d9ab218122beecf663fe2cef236ca02538bc465f002a3fbde295d2d90e75b6b95942cd9018f72a466ecf149fa6d785999c75862d409ba10f6dce5a969a 0031-ada-libgnarl-compatibility-for-musl.patch
+1c4cdbecffa8a46b5fc21b886a03c8d7447d90b0c44f13438f431b02f66583894166c4798df9d71c45006df43d3808748f52be18317197eab629b7630cdbe5ec 0032-ada-musl-support-fixes.patch
+bb0f762bbfde7f38d1e82b2a443e3b8e662460bbe797f6260e51172d12a32c502d7b98c5d738f36da16d47a38bc739231fd5a76222159f5c50c034929da5b6e3 0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+fe5817651c3a1d981da6e4f34302d9345db5dcfe4e48feb1ef303620ab4f145ac758c80e40ec4ed442c445d6a1b087d175fa16d0e88c419aaa7e627cd884e369 0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+61225c94843c8fc89cdc84c4e04e9c5f3c113e3ec893d2e4be2935697851a29501cb8a2c8272a7ebe3b5fce110b061579b58439dfcb40a85224eba0f53ab082b 0035-gcc-go-signal-34-is-special-on-musl-libc.patch
+b4898ff728edef81b7553aa619ce4036256abad907e7c3e00b027a7552cd84fd79048021d29bfaa18a4f75b73f6207e4da63e010d01eb906f6db12cfdd88cb67 0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+715e21327c3264f81503116a86a8f725590e58be3249632d4e4c7f81ee3e82c86ec2745329acf8f413c234fc8b3a0e0a02cbfe6d0ea625486caaa3cc8a93951f 0037-gcc-go-link-to-libucontext.patch
+2e7588d07594e7e84e797bcdf2d6983c6f33a4303374643d23b56d595160c61d8777495c52a3739d99bd50b7b8c06749f1462dbc05a4076b23a4344438ce887e 0038-Use-generic-errstr.go-implementation-on-musl.patch
+766aa0b11ff8270ee5850ae4167bc2b84ec2c98d8f68e8e0f2a474f2ac27c3b45c7208afbe4d2051a526691107ec00d8258264d40cf5fc086ad40f63acd5630d 0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+7f79cd3bc3b345ad8b5d3d9494db285d5d1da57f4c1fb1f57aafe21d9a2f9c091ec1da9a64550d6bf7473f92adf7d249dfdb255c31f54ef2d0829b47e854d471 0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
+f5b20eef9db3a60a7a0f3214a92fdd5ab7a158ce7d36bfef002a469d39f1fedc1531250bde80d56c640066a22145ca0707f4b2ae779d19e18954db1cf45102cd 0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+ecb6a3836226fc43e72cee0fe1d59dcdc435e0eaf66378e31d1b6e8109572674c553a954a3409d733fea213ceb9dde8804b97f5802d1f5bc6c8f89c19f81558f 0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+9e6a5942b9b23df83aa453fa1440a3c90861f4760c8fb0481d24efa9c68c9bdf6bfc211877000221a7c663a907f01d26ce0798825b6bc0b82c1549279144e223 0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+e9cd07f298fff1539e835b7cf440c17acf5fbe2ab4b468e645634e0005bdc45992b25de41d5766a9884beeceb8e92231f5e93967c801e96442327db6d4e6f987 0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+2776ffba938a293c7589483684a2c75991fb500918899c2853efa61a7e8295a5dcd192085730c835c6fd51afcee4d84d8c4883ba71230a8d4ceb65691940e13a 0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
+51edccd279c70628d8b34db74e2667de75482ed659f1a5f57407f433af89163d9b6b47986467a59d534e2177f872e5de90c95ede1dc8f1b2829fbe57590d8f4d 0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
+43b67d2970dcf65d90149ff2ea4f7264f7e01267f3152b0a244850e4f8a6e43da117015dc75dfd30c6428f7088d3cf4b6703f8735f0430959f128ce53de0b821 0047-gdc-unconditionally-link-libgphobos-against-libucont.patch
"
diff --git a/main/gcr/APKBUILD b/main/gcr/APKBUILD
index 3f8b3b23be..c87290e8b3 100644
--- a/main/gcr/APKBUILD
+++ b/main/gcr/APKBUILD
@@ -2,24 +2,43 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gcr
-pkgver=3.40.0
+pkgver=3.41.0
pkgrel=0
pkgdesc="library for bits of crypto UI and parsing"
-options="!check" # Testsuite requires community/xvfb-run
url="https://wiki.gnome.org/Projects/CryptoGlue"
arch="all"
license="LGPL-2.0-or-later"
-makedepends="glib-dev gtk+3.0-dev libgcrypt-dev p11-kit-dev
- gobject-introspection-dev libxslt vala meson gtk-doc"
+makedepends="
+ glib-dev
+ gobject-introspection-dev
+ gtk+3.0-dev
+ libgcrypt-dev
+ libsecret-dev
+ libxslt
+ meson gtk-doc
+ openssh-client
+ p11-kit-dev
+ vala
+ "
checkdepends="xvfb-run dbus-x11"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-base"
+subpackages="
+ $pkgname-dev
+ $pkgname-doc
+ $pkgname-lang
+ $pkgname-base
+ "
source="https://download.gnome.org/sources/gcr/${pkgver%.*}/gcr-$pkgver.tar.xz
+ fix-build-without-systemd.patch
+ fix-meson-invalid-kw-argument.patch
dont-run-gpg-tests.patch
- fix-64-bit-time_t-32-bit.patch"
+ fix-64-bit-time_t-32-bit.patch
+ "
+options="!check" # testsuite requires community/xvfb-run
build() {
abuild-meson \
-Dgpg_path=/usr/bin/gpg2 \
+ -Dsystemd=disabled \
output
meson compile ${JOBS:+-j ${JOBS}} -C output
}
@@ -33,14 +52,17 @@ package() {
}
base() {
- depends=""
pkgdesc="$pkgdesc (base libraries)"
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libgck-1.so.* \
- "$pkgdir"/usr/lib/libgcr-base-3.so.* \
- "$subpkgdir"/usr/lib
+ depends=""
+
+ amove usr/lib/libgck-1.so.*
+ amove usr/lib/libgcr-base-3.so.*
}
-sha512sums="7118608e7bef7d0cf2eea33cb3286b7f9c3622a38892ce88cf33ed453d343cc33e070831e7b4d0c5cdb43c2e57b3f0b91c7cbd6aa8463982d3af8844b59bcb81 gcr-3.40.0.tar.xz
+sha512sums="
+455acc40ed77feeb35f9845b00229f468b322b7eda0b1b5abb0153f0a6ba29f3d0364df22225143f4caf130254a1258b3c7f934370e5142f2f64e1c3084b6f6e gcr-3.41.0.tar.xz
+29827b87272c152d98a131ab328b8711223b1d13f5057476cfdee295a46d8a4f49daf3081d67b3a59cb48700329baf2ea49b0742b4b619afb2e6d01ce785f186 fix-build-without-systemd.patch
+939e49b23747989a532cc41be6cd6d504e88f69852897f15419f3109a1b799edd7dabe9e1e98d2582dd78de6530109c101b7e0b754fc8d3a07f098dca0c6ce0d fix-meson-invalid-kw-argument.patch
e4fc2248497e7103980e9baf9444505649ee93c657c7a82c042ae62d7c54b2764ad7bc9780467ceda5e53a23fa11dc4957898929c7d7f995d9d0d205d18d5eb7 dont-run-gpg-tests.patch
-579b229d6f310ed035974a92a65804deae7b047cf6109e259844ecdc75df32653a2c9f9dcddba9092da335f44d07d5d82056ae0cf5775057bdb9be5b52e29bcc fix-64-bit-time_t-32-bit.patch"
+579b229d6f310ed035974a92a65804deae7b047cf6109e259844ecdc75df32653a2c9f9dcddba9092da335f44d07d5d82056ae0cf5775057bdb9be5b52e29bcc fix-64-bit-time_t-32-bit.patch
+"
diff --git a/main/gcr/fix-build-without-systemd.patch b/main/gcr/fix-build-without-systemd.patch
new file mode 100644
index 0000000000..16baa06366
--- /dev/null
+++ b/main/gcr/fix-build-without-systemd.patch
@@ -0,0 +1,28 @@
+From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Sun, 24 Oct 2021 10:26:03 +0200
+Patch-Source: https://gitlab.gnome.org/GNOME/gcr/-/commit/96e76ee482dad2a0d71f9a5a5a6558d272d538ca
+Subject: [PATCH] Unbreak build without systemd.
+
+This fixes the check for WITH_SYSTEMD and prevents a fatal error:
+'systemd/sd-daemon.h' file not found when building with systemd disabled.
+---
+ gcr/gcr-ssh-agent-service.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c
+index 3b5a4ca..b7e8928 100644
+--- a/gcr/gcr-ssh-agent-service.c
++++ b/gcr/gcr-ssh-agent-service.c
+@@ -39,7 +39,7 @@
+ #include <glib/gstdio.h>
+ #include <gcr/gcr-base.h>
+
+-#ifdef WITH_SYSTEMD
++#if WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
+ #endif
+
+--
+GitLab
+
diff --git a/main/gcr/fix-meson-invalid-kw-argument.patch b/main/gcr/fix-meson-invalid-kw-argument.patch
new file mode 100644
index 0000000000..9c097deeba
--- /dev/null
+++ b/main/gcr/fix-meson-invalid-kw-argument.patch
@@ -0,0 +1,61 @@
+Patch-Source: https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81
+
+From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Wed, 12 Jan 2022 00:24:20 +0100
+Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir
+
+This argument has been removed in Meson 0.61.0:
+
+ gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages"
+
+https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de:
+
+> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it.
+
+Fixes #89
+---
+ gck/meson.build | 1 -
+ gcr/meson.build | 1 -
+ ui/meson.build | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/gck/meson.build b/gck/meson.build
+index 756b486..a21a1e9 100644
+--- a/gck/meson.build
++++ b/gck/meson.build
+@@ -131,7 +131,6 @@ if get_option('introspection')
+ sources: gck_gir_sources,
+ namespace: 'Gck',
+ nsversion: '@0@'.format(gck_major_version),
+- packages: gck_deps,
+ export_packages: 'gck-@0@'.format(gck_major_version),
+ includes: [ 'GObject-2.0', 'Gio-2.0' ],
+ header: 'gck/gck.h',
+diff --git a/gcr/meson.build b/gcr/meson.build
+index 2233a44..c83641b 100644
+--- a/gcr/meson.build
++++ b/gcr/meson.build
+@@ -190,7 +190,6 @@ if get_option('introspection')
+ sources: [ gcr_base_public_sources, gcr_base_headers ],
+ namespace: 'Gcr',
+ nsversion: '@0@'.format(gcr_major_version),
+- packages: gcr_base_deps,
+ export_packages: 'gcr-base-@0@'.format(gcr_major_version),
+ includes: [
+ 'GObject-2.0',
+diff --git a/ui/meson.build b/ui/meson.build
+index e656ea2..32ee057 100644
+--- a/ui/meson.build
++++ b/ui/meson.build
+@@ -152,7 +152,6 @@ if get_option('introspection')
+ export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
+ identifier_prefix: 'Gcr',
+ symbol_prefix: 'gcr',
+- packages: gcr_ui_deps,
+ includes: [
+ 'GObject-2.0',
+ 'Gio-2.0',
+--
+GitLab
+
diff --git a/main/gdb/APKBUILD b/main/gdb/APKBUILD
index dd3079f859..fb1eb4890f 100644
--- a/main/gdb/APKBUILD
+++ b/main/gdb/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gdb
-pkgver=11.1
+pkgver=11.2
pkgrel=0
pkgdesc="The GNU Debugger"
url="https://www.gnu.org/software/gdb/"
@@ -76,7 +76,7 @@ multiarch() {
}
sha512sums="
-c40bf970e2f7c2107b29c5aa6a7150daa709d75ddadb73ac20742419d4637d158e3063a4c6ff6e47fae8ca8e1d36253973f85ea15445d004be6d5d7a2dd9bd46 gdb-11.1.tar.xz
+07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz
70e7d04e4d72461436da503b5bfa370c5779e03245c521f30e9779d5ff37dbb2d708b05f2afb27f43ad9defc44df4bd979d72f777e744851fdbf156295e1cc9f s390x-use-elf-gdb_fpregset_t.patch
04911f87904b62dd7662435f9182b20485afb29ddb3d6398a9d31fef13495f7b70639c77fdae3a40e2775e270d7cd40d0cfd7ddf832372b506808d33c8301e01 ppc-musl.patch
ab554899bbb2aa98261fd1b6beb4a71ed7c713a714bddd3fa7ec875258e39bd5474dc96a11accb4dadd316f3834f215e8395d3b373bf3affd122dc5b4a8fe710 ppc-ptregs.patch
diff --git a/main/gdbm/APKBUILD b/main/gdbm/APKBUILD
index 80939fbb06..1d4d767664 100644
--- a/main/gdbm/APKBUILD
+++ b/main/gdbm/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gdbm
-pkgver=1.20
-pkgrel=2
+pkgver=1.22
+pkgrel=0
pkgdesc="GNU dbm is a set of database routines that use extensible hashing"
url="https://www.gnu.org/software/gdbm/"
arch="all"
@@ -46,5 +46,5 @@ tools() {
}
sha512sums="
-5f2fbd4318259e5b879ea2bff09e22defbb4e566ebbe11c44ac5b5369fd00745d7ed9f72ec1206153027eba245c4ee4a515a8ec6d67f84ec477483e72753590b gdbm-1.20.tar.gz
+67461fc4f41e825d0134175ff99c913ccb4aa7ea3d0f64f32bdedbc7677b3ecabd2c525ac6b2ee47a9561e002e4224e492b72088d57bb4862a1f8c089521ec51 gdbm-1.22.tar.gz
"
diff --git a/main/gettext/APKBUILD b/main/gettext/APKBUILD
index 7dc5644c9a..8f64d84525 100644
--- a/main/gettext/APKBUILD
+++ b/main/gettext/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=gettext
pkgver=0.21
-pkgrel=0
+pkgrel=1
pkgdesc="GNU locale utilities"
url="https://www.gnu.org/software/gettext/gettext.html"
arch="all"
diff --git a/main/ghostscript/9.55.0-typo.patch b/main/ghostscript/9.55.0-typo.patch
new file mode 100644
index 0000000000..fe34d0ac33
--- /dev/null
+++ b/main/ghostscript/9.55.0-typo.patch
@@ -0,0 +1,11 @@
+--- a/base/gsicc_lcms2.c 2021-09-27 03:44:02.000000000 -0400
++++ b/base/gsicc_lcms2.c 2021-09-29 16:15:42.137145100 -0400
+@@ -462,7 +462,7 @@ int
+ gscms_transform_color(gx_device *dev, gsicc_link_t *icclink, void *inputcolor,
+ void *outputcolor, int num_bytes)
+ {
+- return gscms_transformm_color_const(dev, icclink, inputcolor, outputcolor, num_bytes);
++ return gscms_transform_color_const(dev, icclink, inputcolor, outputcolor, num_bytes);
+ }
+
+ int
diff --git a/main/ghostscript/APKBUILD b/main/ghostscript/APKBUILD
index 163864c6bd..25bf756b4f 100644
--- a/main/ghostscript/APKBUILD
+++ b/main/ghostscript/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Cameron Banta <cbanta@gmail.com>
# Maintainer: Cameron Banta <cbanta@gmail.com>
pkgname=ghostscript
-pkgver=9.54.0
-pkgrel=1
+pkgver=9.55.0
+pkgrel=0
pkgdesc="An interpreter for the PostScript language and for PDF"
url="https://ghostscript.com/"
arch="all"
@@ -13,9 +13,9 @@ makedepends="autoconf automake libjpeg-turbo-dev libpng-dev expat-dev
cups-dev libtool jbig2dec-dev openjpeg-dev"
subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-gtk"
source="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${pkgver//./}/ghostscript-$pkgver.tar.gz
- CVE-2021-3781.patch
ghostscript-system-zlib.patch
fix-sprintf.patch
+ 9.55.0-typo.patch
"
# secfixes:
@@ -112,7 +112,7 @@ build() {
--host=$CHOST \
--prefix=/usr \
--enable-shared \
- --disable-static \
+ --disable-static
make
cd "$builddir"
@@ -127,11 +127,10 @@ build() {
--infodir=/usr/share/info \
--docdir=/usr/share/doc/"$pkgname" \
--enable-dynamic \
- --disable-static \
--with-system-libtiff \
--with-ijs \
--with-jbig2dec \
- --without-omni \
+ --without-libpaper \
--enable-gtk \
--with-drivers=ALL \
--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
@@ -159,8 +158,8 @@ gtk() {
}
sha512sums="
-93cfac3a754d4a7fa94112f3e04ba2ae633c40bb924734db72229096aac2f07c95877737f37f2bfef6be1b1d074af79e75cde3d589ea102def7f4654403e4804 ghostscript-9.54.0.tar.gz
-26a625518b18433309ccf404cbe90e2240a75091ae8c38d197d5dce5e1ac7e3df73be83683b64de2d38f429ffa45cb3eda9ecf9388e40094a1ca84328457a8f4 CVE-2021-3781.patch
+3646b7981dced443559ba97c74c08463139e86a5479661e4dcd217c51e3f8e766da9cf4d7889a98ba3c079a17e9e5b452cc765b633e0720deab2337e77efdd09 ghostscript-9.55.0.tar.gz
70721e3a335afa5e21d4e6cf919119010bd4544a03ab8f53f5325c173902221ad9b88c118b4bfeee80b3e1956bcdbaf4c53f64ae7fb81f5ba57dbc956750c482 ghostscript-system-zlib.patch
beefcf395f7f828e1b81c088022c08a506e218f27535b9de01e0f0edf7979b435316c318fa676771630f6ad16ff1ab059cd68aa128ed97e5a9f2f3fa840200c4 fix-sprintf.patch
+b98641ece8e40fda3d8b7abc73c8907830446fb7bf36958606e1f31e5eb8ef74b829712a6115440417232dbd9da1364c5e1149515cca2e48f97dfcc85c5251a8 9.55.0-typo.patch
"
diff --git a/main/ghostscript/CVE-2021-3781.patch b/main/ghostscript/CVE-2021-3781.patch
deleted file mode 100644
index 5c0f6bcb4e..0000000000
--- a/main/ghostscript/CVE-2021-3781.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-From a9bd3dec9fde03327a4a2c69dad1036bf9632e20 Mon Sep 17 00:00:00 2001
-From: Chris Liddell <chris.liddell@artifex.com>
-Date: Tue, 7 Sep 2021 20:36:12 +0100
-Subject: [PATCH] Bug 704342: Include device specifier strings in access
- validation
-
-for the "%pipe%", %handle%" and %printer% io devices.
-
-We previously validated only the part after the "%pipe%" Postscript device
-specifier, but this proved insufficient.
-
-This rebuilds the original file name string, and validates it complete. The
-slight complication for "%pipe%" is it can be reached implicitly using
-"|" so we have to check both prefixes.
-
-Addresses CVE-2021-3781
----
- base/gdevpipe.c | 22 +++++++++++++++-
- base/gp_mshdl.c | 11 +++++++-
- base/gp_msprn.c | 10 ++++++-
- base/gp_os2pr.c | 13 +++++++++-
- base/gslibctx.c | 69 ++++++++++---------------------------------------
- 5 files changed, 65 insertions(+), 60 deletions(-)
-
-diff --git a/base/gdevpipe.c b/base/gdevpipe.c
-index 96d71f5d8..5bdc485be 100644
---- a/base/gdevpipe.c
-+++ b/base/gdevpipe.c
-@@ -72,8 +72,28 @@ pipe_fopen(gx_io_device * iodev, const char *fname, const char *access,
- #else
- gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
- gs_fs_list_t *fs = ctx->core->fs;
-+ /* The pipe device can be reached in two ways, explicltly with %pipe%
-+ or implicitly with "|", so we have to check for both
-+ */
-+ char f[gp_file_name_sizeof];
-+ const char *pipestr = "|";
-+ const size_t pipestrlen = strlen(pipestr);
-+ const size_t preflen = strlen(iodev->dname);
-+ const size_t nlen = strlen(fname);
-+ int code1;
-+
-+ if (preflen + nlen >= gp_file_name_sizeof)
-+ return_error(gs_error_invalidaccess);
-+
-+ memcpy(f, iodev->dname, preflen);
-+ memcpy(f + preflen, fname, nlen + 1);
-+
-+ code1 = gp_validate_path(mem, f, access);
-+
-+ memcpy(f, pipestr, pipestrlen);
-+ memcpy(f + pipestrlen, fname, nlen + 1);
-
-- if (gp_validate_path(mem, fname, access) != 0)
-+ if (code1 != 0 && gp_validate_path(mem, f, access) != 0 )
- return gs_error_invalidfileaccess;
-
- /*
-diff --git a/base/gp_mshdl.c b/base/gp_mshdl.c
-index 2b964ed74..8d87ceadc 100644
---- a/base/gp_mshdl.c
-+++ b/base/gp_mshdl.c
-@@ -95,8 +95,17 @@ mswin_handle_fopen(gx_io_device * iodev, const char *fname, const char *access,
- long hfile; /* Correct for Win32, may be wrong for Win64 */
- gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
- gs_fs_list_t *fs = ctx->core->fs;
-+ char f[gp_file_name_sizeof];
-+ const size_t preflen = strlen(iodev->dname);
-+ const size_t nlen = strlen(fname);
-
-- if (gp_validate_path(mem, fname, access) != 0)
-+ if (preflen + nlen >= gp_file_name_sizeof)
-+ return_error(gs_error_invalidaccess);
-+
-+ memcpy(f, iodev->dname, preflen);
-+ memcpy(f + preflen, fname, nlen + 1);
-+
-+ if (gp_validate_path(mem, f, access) != 0)
- return gs_error_invalidfileaccess;
-
- /* First we try the open_handle method. */
-diff --git a/base/gp_msprn.c b/base/gp_msprn.c
-index ed4827968..746a974f7 100644
---- a/base/gp_msprn.c
-+++ b/base/gp_msprn.c
-@@ -168,8 +168,16 @@ mswin_printer_fopen(gx_io_device * iodev, const char *fname, const char *access,
- uintptr_t *ptid = &((tid_t *)(iodev->state))->tid;
- gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
- gs_fs_list_t *fs = ctx->core->fs;
-+ const size_t preflen = strlen(iodev->dname);
-+ const size_t nlen = strlen(fname);
-
-- if (gp_validate_path(mem, fname, access) != 0)
-+ if (preflen + nlen >= gp_file_name_sizeof)
-+ return_error(gs_error_invalidaccess);
-+
-+ memcpy(pname, iodev->dname, preflen);
-+ memcpy(pname + preflen, fname, nlen + 1);
-+
-+ if (gp_validate_path(mem, pname, access) != 0)
- return gs_error_invalidfileaccess;
-
- /* First we try the open_printer method. */
-diff --git a/base/gp_os2pr.c b/base/gp_os2pr.c
-index f852c71fc..ba54cde66 100644
---- a/base/gp_os2pr.c
-+++ b/base/gp_os2pr.c
-@@ -107,9 +107,20 @@ os2_printer_fopen(gx_io_device * iodev, const char *fname, const char *access,
- FILE ** pfile, char *rfname, uint rnamelen)
- {
- os2_printer_t *pr = (os2_printer_t *)iodev->state;
-- char driver_name[256];
-+ char driver_name[gp_file_name_sizeof];
- gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
- gs_fs_list_t *fs = ctx->core->fs;
-+ const size_t preflen = strlen(iodev->dname);
-+ const int size_t = strlen(fname);
-+
-+ if (preflen + nlen >= gp_file_name_sizeof)
-+ return_error(gs_error_invalidaccess);
-+
-+ memcpy(driver_name, iodev->dname, preflen);
-+ memcpy(driver_name + preflen, fname, nlen + 1);
-+
-+ if (gp_validate_path(mem, driver_name, access) != 0)
-+ return gs_error_invalidfileaccess;
-
- /* First we try the open_printer method. */
- /* Note that the loop condition here ensures we don't
-diff --git a/base/gslibctx.c b/base/gslibctx.c
-index 6dfed6cd5..318039fad 100644
---- a/base/gslibctx.c
-+++ b/base/gslibctx.c
-@@ -655,82 +655,39 @@ rewrite_percent_specifiers(char *s)
- int
- gs_add_outputfile_control_path(gs_memory_t *mem, const char *fname)
- {
-- char *fp, f[gp_file_name_sizeof];
-- const int pipe = 124; /* ASCII code for '|' */
-- const int len = strlen(fname);
-- int i, code;
-+ char f[gp_file_name_sizeof];
-+ int code;
-
- /* Be sure the string copy will fit */
-- if (len >= gp_file_name_sizeof)
-+ if (strlen(fname) >= gp_file_name_sizeof)
- return gs_error_rangecheck;
- strcpy(f, fname);
-- fp = f;
- /* Try to rewrite any %d (or similar) in the string */
- rewrite_percent_specifiers(f);
-- for (i = 0; i < len; i++) {
-- if (f[i] == pipe) {
-- fp = &f[i + 1];
-- /* Because we potentially have to check file permissions at two levels
-- for the output file (gx_device_open_output_file and the low level
-- fopen API, if we're using a pipe, we have to add both the full string,
-- (including the '|', and just the command to which we pipe - since at
-- the pipe_fopen(), the leading '|' has been stripped.
-- */
-- code = gs_add_control_path(mem, gs_permit_file_writing, f);
-- if (code < 0)
-- return code;
-- code = gs_add_control_path(mem, gs_permit_file_control, f);
-- if (code < 0)
-- return code;
-- break;
-- }
-- if (!IS_WHITESPACE(f[i]))
-- break;
-- }
-- code = gs_add_control_path(mem, gs_permit_file_control, fp);
-+
-+ code = gs_add_control_path(mem, gs_permit_file_control, f);
- if (code < 0)
- return code;
-- return gs_add_control_path(mem, gs_permit_file_writing, fp);
-+ return gs_add_control_path(mem, gs_permit_file_writing, f);
- }
-
- int
- gs_remove_outputfile_control_path(gs_memory_t *mem, const char *fname)
- {
-- char *fp, f[gp_file_name_sizeof];
-- const int pipe = 124; /* ASCII code for '|' */
-- const int len = strlen(fname);
-- int i, code;
-+ char f[gp_file_name_sizeof];
-+ int code;
-
- /* Be sure the string copy will fit */
-- if (len >= gp_file_name_sizeof)
-+ if (strlen(fname) >= gp_file_name_sizeof)
- return gs_error_rangecheck;
- strcpy(f, fname);
-- fp = f;
- /* Try to rewrite any %d (or similar) in the string */
-- for (i = 0; i < len; i++) {
-- if (f[i] == pipe) {
-- fp = &f[i + 1];
-- /* Because we potentially have to check file permissions at two levels
-- for the output file (gx_device_open_output_file and the low level
-- fopen API, if we're using a pipe, we have to add both the full string,
-- (including the '|', and just the command to which we pipe - since at
-- the pipe_fopen(), the leading '|' has been stripped.
-- */
-- code = gs_remove_control_path(mem, gs_permit_file_writing, f);
-- if (code < 0)
-- return code;
-- code = gs_remove_control_path(mem, gs_permit_file_control, f);
-- if (code < 0)
-- return code;
-- break;
-- }
-- if (!IS_WHITESPACE(f[i]))
-- break;
-- }
-- code = gs_remove_control_path(mem, gs_permit_file_control, fp);
-+ rewrite_percent_specifiers(f);
-+
-+ code = gs_remove_control_path(mem, gs_permit_file_control, f);
- if (code < 0)
- return code;
-- return gs_remove_control_path(mem, gs_permit_file_writing, fp);
-+ return gs_remove_control_path(mem, gs_permit_file_writing, f);
- }
-
- int
---
-2.17.1
-
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index fed7d43949..97a730a3a0 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -29,8 +29,8 @@
# - CVE-2021-29468
pkgname=git
-pkgver=2.33.1
-pkgrel=0
+pkgver=2.34.1
+pkgrel=1
pkgdesc="Distributed version control system"
url="https://www.git-scm.com/"
arch="all"
@@ -295,7 +295,7 @@ _perl_config() {
}
sha512sums="
-16d417183232e1057bea754d59cdf4bbacc5f1527d1de6ee04cdd293a2512bfa7208e20f6130816605528b59cb1bc3188c5bddf1a42c1413095ee74e44dd2f91 git-2.33.1.tar.xz
+a1a8e9e6f64b1da25508fbd2f783564dcdbe181fb5ff1ebab3bdac6db6094e18acc334479a1abf22ac17ce4f733cc3e10a664db9ab234cd523735a3f027b42db git-2.34.1.tar.xz
89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd
fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd
be5d568fc5b8b84c9afb97b31e471e41f32ccfe188eba0588ea0ef98b2d96c2ce4b2c1a3d70e88205aa4f6667f850b3f32c13bbb149ecddbf670344c162a4e25 fix-t4219-with-sticky-bit.patch
diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD
index 8af7d07c7e..c5026d691c 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -3,8 +3,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=glib
-pkgver=2.70.0
-pkgrel=1
+pkgver=2.70.1
+pkgrel=0
pkgdesc="Common C routines used by Gtk+ and other libs"
url="https://developer.gnome.org/glib/"
arch="all"
@@ -67,7 +67,7 @@ static() {
}
sha512sums="
-fd3fcaebd34aebe0e63f9dc915b2df026a3f88a5c2254e9f17beea0a59ab0ac563976fca54eb57bd2f7af183c4ae76fb86f05951216bf4159d258b5e7b29696f glib-2.70.0.tar.xz
+639317c98ab72ad853608ab4d395484daff135c0222556c51ca93fd8533c5759db14478beda964e4feb02bb2737a46a4eda25063f98a9c6ba6ae4bc5d74bf5e1 glib-2.70.1.tar.xz
32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch
744239ea2afb47e15d5d0214c37d7c798edac53797ca3ac14d515aee4cc3999ef9716ba744c64c40198fb259edc922559f77c9051104a568fc8ee4fc790810b1 deprecated-no-warn.patch
64aa4dff14d68989fd7152ebf48aa6e8aa043f0b1c3a18193249dce9b506fe089008f21c0aa58b262e4dee8504407ea4788331ae22ba64b12fa5af5a9de174d6 musl-libintl.patch
diff --git a/main/glslang/APKBUILD b/main/glslang/APKBUILD
index 575b26bbab..e8916da39b 100644
--- a/main/glslang/APKBUILD
+++ b/main/glslang/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=glslang
pkgver=11.6.0
-pkgrel=0
+pkgrel=1
pkgdesc="Khronos reference front-end for GLSL, ESSL, and sample SPIR-V generator"
url="https://github.com/KhronosGroup/glslang"
arch="all"
@@ -24,7 +24,7 @@ build() {
-GNinja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DBUILD_SHARED_LIBS=ON \
$CMAKE_CROSSOPTS ..
@@ -36,7 +36,7 @@ build() {
-GNinja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DBUILD_SHARED_LIBS=OFF \
diff --git a/main/glu/APKBUILD b/main/glu/APKBUILD
index 62b3960dfa..f76bb5ec5b 100644
--- a/main/glu/APKBUILD
+++ b/main/glu/APKBUILD
@@ -1,31 +1,28 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=glu
pkgver=9.0.2
-pkgrel=0
+pkgrel=1
pkgdesc="Mesa OpenGL Utility library"
url="https://cgit.freedesktop.org/mesa/glu/"
arch="all"
options="!check" # No test suite.
license="SGI-B-1.1 AND SGI-B-2.0"
depends_dev="mesa-dev"
-makedepends="$depends_dev"
+makedepends="$depends_dev cmake meson"
replaces="mesa-glu"
subpackages="$pkgname-dev"
source="https://mesa.freedesktop.org/archive/glu/glu-$pkgver.tar.xz"
build() {
- cd "$builddir"
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --disable-static
- make
+ abuild-meson \
+ -D default_library=shared \
+ -D gl_provider=osmesa \
+ . output
+ meson compile ${JOBS:+-j ${JOBS}} -C output
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
sha512sums="
diff --git a/main/gnupg/APKBUILD b/main/gnupg/APKBUILD
index b0719a6c03..672027df0f 100644
--- a/main/gnupg/APKBUILD
+++ b/main/gnupg/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gnupg
-pkgver=2.2.31
+pkgver=2.2.33
_ver=${pkgver/_beta/-beta}
pkgrel=0
pkgdesc="GNU Privacy Guard 2 - meta package for full GnuPG suite"
@@ -230,7 +230,7 @@ utils() {
}
sha512sums="
-2f6fa200e08d6b8993b482e5825bea6083afc8686c4e1ae80386b36ae49e1c2d73066c508edaa359a7794cb26ba7a00f81555a906fa422d1117e41415cfa2fea gnupg-2.2.31.tar.bz2
+0e6382ebb78425dc81b280a3b453111fb4a764b3fb0565ac09ac24cec2ecd571079617e263d9fce077ba6ce8d202fb43425b51c26f9ec6e8c61706a1ca5f8c78 gnupg-2.2.33.tar.bz2
c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7 0001-Include-sys-select.h-for-FD_SETSIZE.patch
0e2aef4ae5c43c43efe2c914534d73f8f7068b49b5826b1f999296c30395497c4af121e4e99152ff7b43dcf56d1792cd46aea5158ca48597d6e0fca6d7358711 0010-avoid-beta-warning.patch
18004e52925b1f03e67a29a3d43b39e8119cf3426cdad4136824b932ad906ac499b4ceb3d7573177a9f16410d3b80c8f0e4bcdc54dd284f3f803a2cef609ad01 0020-avoid-regenerating-defsincdate-use-shipped-file.patch
@@ -244,6 +244,6 @@ c4488de65913167a77fbc1c8d3a8867d15171c6021490e443ca0faddcb2109fff23f7f49c9a8922d
462af7b1e530e00d3870062666ef427d6df57ee8358b043c06fb8b7b54e50891fc8a49beeaabe45d1822d222ffc47da624798ceb8889a02e38ce85612453bb8b 0340-gpg-prefer-sha512-and-sha384-in-personal-digest.patch
0e4d5d29de5279bda4e8b69334c664068404e697ad9e62868389ef1d97bc1a18d80e834d2d2e8147e0f537a81e6f3b360f18e1a958304a2cc2659c29e68c517a 0410-make-gpg-zip-use-tar-from-path.patch
ac2199f2b49af1c0211ff6f7e441f0f7779d6101c2136f2d7cab0001d260598e4f2f07111aa478dd210a05385daa1f6aec77d9b0de3e379371433b0c82035855 0420-gpg-drop-import-clean-from-default-keyserver-import-options.patch
-b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b fix-i18n.patch
+28cba87121c66b1bbc90bb0f3ca8c69ff19376243854577a4d24afa4a3d4a4b8a952a3a7bbecc200058b6f722cfcd4fc72d5630c822f78ef3fc819f972798e34 fix-i18n.patch
4bfb9742279c2d1c872d63cd4bcb01f6a2a13d94618eff954d3a37451fa870a9bb29687330854ee47e8876d6e60dc81cb2569c3931beaefacda33db23c464402 60-scdaemon.rules
"
diff --git a/main/gnupg/fix-i18n.patch b/main/gnupg/fix-i18n.patch
index 00d71dd5cf..90fc03382f 100644
--- a/main/gnupg/fix-i18n.patch
+++ b/main/gnupg/fix-i18n.patch
@@ -7,6 +7,6 @@
-# ifdef ENABLE_NLS
setlocale (LC_ALL, "" );
+# ifdef ENABLE_NLS
- bindtextdomain (PACKAGE_GT, LOCALEDIR);
+ bindtextdomain (PACKAGE_GT, gnupg_localedir ());
textdomain (PACKAGE_GT);
# endif
diff --git a/main/goaccess/APKBUILD b/main/goaccess/APKBUILD
index 2ad3604e6a..3543662788 100644
--- a/main/goaccess/APKBUILD
+++ b/main/goaccess/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=goaccess
-pkgver=1.5.2
+pkgver=1.5.4
pkgrel=0
pkgdesc="Real-time web log analyzer and interactive viewer"
options="!check" # no test suite
@@ -31,5 +31,5 @@ package() {
}
sha512sums="
-11b59dc009ccb280e05e08135b02a3dee8b9d052803daaa7e85dc47623bd2621009aed540e83c00810bbc30e4688bcf5fadf2b7aae259175d2b0e87b7226c0d8 goaccess-1.5.2.tar.gz
+0436d00a85056d69a5981f6c67832f1324b67b45b72b36f1f5a16e81bfc309b1c96e45020785d08244b3b329eb9417f55be31442ca3a28c2d22f9a8ecf2bf781 goaccess-1.5.4.tar.gz
"
diff --git a/main/gobject-introspection/APKBUILD b/main/gobject-introspection/APKBUILD
index a99a535387..f903216730 100644
--- a/main/gobject-introspection/APKBUILD
+++ b/main/gobject-introspection/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gobject-introspection
pkgver=1.70.0
-pkgrel=1
+pkgrel=2
pkgdesc="Introspection system for GObject-based libraries"
url="https://wiki.gnome.org/action/show/Projects/GObjectIntrospection"
arch="all"
diff --git a/main/gpsd/APKBUILD b/main/gpsd/APKBUILD
index e24e4b12d9..b65971f8f8 100644
--- a/main/gpsd/APKBUILD
+++ b/main/gpsd/APKBUILD
@@ -6,7 +6,7 @@
pkgname=gpsd
pkgver=3.23
-pkgrel=0
+pkgrel=1
pkgdesc="GPS daemon"
arch="all"
url="http://catb.org/gpsd/"
diff --git a/main/graphite2/APKBUILD b/main/graphite2/APKBUILD
index 8de9bf6ca6..e48501210c 100644
--- a/main/graphite2/APKBUILD
+++ b/main/graphite2/APKBUILD
@@ -3,7 +3,7 @@
pkgname=graphite2
_realname=${pkgname/2/}
pkgver=1.3.14
-pkgrel=0
+pkgrel=1
pkgdesc="reimplementation of the SIL Graphite text processing engine"
options="!check" # Testsuite requires graphite 1
url="https://graphite.sil.org/"
@@ -27,7 +27,7 @@ build() {
cmake -G "Unix Makefiles" .. \
-DCMAKE_C_FLAGS:STRING="$CFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE:STRING=None \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DGRAPHITE2_COMPARE_RENDERER=OFF \
-DGRAPHITE2_NFILEFACE=ON
make
@@ -38,7 +38,7 @@ build() {
cmake -G "Unix Makefiles" .. \
-DCMAKE_C_FLAGS:STRING="$CFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE:STRING=None \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DGRAPHITE2_COMPARE_RENDERER=OFF \
-DGRAPHITE2_NFILEFACE=ON \
-DBUILD_SHARED_LIBS=OFF
diff --git a/main/graphviz/APKBUILD b/main/graphviz/APKBUILD
index 58cf3e364e..5a8ed5dd70 100644
--- a/main/graphviz/APKBUILD
+++ b/main/graphviz/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=graphviz
pkgver=2.49.3
-pkgrel=0
+pkgrel=1
pkgdesc="Graph Visualization Tools"
url="https://www.graphviz.org/"
arch="all"
diff --git a/main/grub/0009-fix-kernel-version-detection.patch b/main/grub/0009-fix-kernel-version-detection.patch
new file mode 100644
index 0000000000..f0141b8d01
--- /dev/null
+++ b/main/grub/0009-fix-kernel-version-detection.patch
@@ -0,0 +1,64 @@
+From: Dermot Bradley <dermot_bradley@yahoo.com>
+Date: Fri, 29 Oct 2021 18:51 +0100
+Subject: Fix grub-mkconfig detection of linux-edge-virt
+
+grub-mkconfig does not correctly handle the linux-edge-virt package
+when creating /boot/grub.grub.cfg. The 10_linux and 20_linux_xen
+files determine the "version" of the kernel using a regex pattern
+that does not correctly handle the presence of 2 "-" characters.
+
+As a result, when using the linux-edge-virt package grub-mkconfig
+incorrectly believes the version is "virt" rather than "edge-virt"
+and it searches for /boot/initramfs-edge which does not exist,
+resulting in no "initrd" line being placed in the grub.cfg to point
+to the initramfs.
+
+This issue does not appear with the linux-lts, linux-virt, linux-edge
+packages as their kernel and initramfs files only have a single "-"
+in their filenames.
+
+This is likely to be an Alpine-specific Grub issue as many/most other
+Linux distros include the actual kernel numeric version as part of
+the initramfs filenames (as, unlike Alpine they support multiple
+kernels being simultaneously installed and so need to distinguish
+between them).
+
+This fix simply changes the regex pattern to remove everything prior
+to, and including, the first "-" symbol, so leaving "lts", "edge",
+"edge-virt", or "virt" as appropriate.
+
+---
+
+diff -aur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -201,7 +201,7 @@
+ basename=`basename $linux`
+ dirname=`dirname $linux`
+ rel_dirname=`make_system_path_relative_to_its_root $dirname`
+- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
++ version=`echo $basename | sed -e "s,^[^-]*-,,g"`
+ alt_version=`echo $version | sed -e "s,\.old$,,g"`
+ linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+
+diff -aur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
+--- a/util/grub.d/20_linux_xen.in
++++ b/util/grub.d/20_linux_xen.in
+@@ -181,7 +181,7 @@
+ for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
+ if grub_file_is_not_garbage "$i"; then
+ basename=$(basename $i)
+- version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
++ version=$(echo $basename | sed -e "s,^[^-]*-,,g")
+ dirname=$(dirname $i)
+ config=
+ for j in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
+@@ -275,7 +275,7 @@
+ basename=`basename $linux`
+ dirname=`dirname $linux`
+ rel_dirname=`make_system_path_relative_to_its_root $dirname`
+- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
++ version=`echo $basename | sed -e "s,^[^-]*-,,g"`
+ alt_version=`echo $version | sed -e "s,\.old$,,g"`
+ linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+
diff --git a/main/grub/APKBUILD b/main/grub/APKBUILD
index 91455e0534..b3c6351eb2 100644
--- a/main/grub/APKBUILD
+++ b/main/grub/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=grub
pkgver=2.06
-pkgrel=1
+pkgrel=2
pkgdesc="Bootloader with support for Linux, Multiboot and more"
url="https://www.gnu.org/software/grub/"
arch="all !s390x"
@@ -50,6 +50,7 @@ source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz
0006-RISC-V-Update-image-header.patch
0007-RISC-V-Use-common-linux-loader.patch
0008-fix-build-error-in-binutils-2.36.patch
+ 0009-fix-kernel-version-detection.patch
"
prepare() {
@@ -254,4 +255,5 @@ aa2fbabeab2e8f517128f0d81d3c76eba18b24518b616d4574ffaaec7d4765e02b5b118caf04da1e
4901c964278ab8a46901b905efef4562aa4942d6c37be052db9536d4779ecea6a0cf68fcc97fe6ef2b39c54cd598d4f8351cf3e27c3dacff888549bdc35deee3 0006-RISC-V-Update-image-header.patch
721c9d7aefd9d9fdd4fe92c229122c3311e75266a9419a12f5f77536099070a232b6c4ff3c33ab5a2cb6f7f917ae0d6510b09045d2f035f87c65b4dd7f09d3ee 0007-RISC-V-Use-common-linux-loader.patch
8c35663ef72683bd23c18e75134a0ddb1bb9a7c053ed87691e2ac5c9765fdf802761a6ad54f8bdc7999679d9cc5ebea9c01f1c0f615ac90505f7a398129d157b 0008-fix-build-error-in-binutils-2.36.patch
+d4432a36286f0ad7d3527d34e20daf9fbef24d6037171582ae3ccdd51668ffe422b87d984f107a9b4dcf019b89ac76dd322d64e42bbfa64bb6789d3d897fc1f2 0009-fix-kernel-version-detection.patch
"
diff --git a/main/gstreamer/APKBUILD b/main/gstreamer/APKBUILD
index aaa03c73ab..788e7f414f 100644
--- a/main/gstreamer/APKBUILD
+++ b/main/gstreamer/APKBUILD
@@ -1,17 +1,30 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gstreamer
pkgver=1.18.5
-pkgrel=0
+pkgrel=1
pkgdesc="GStreamer streaming media framework"
url="https://gstreamer.freedesktop.org"
arch="all"
license="LGPL-2.0-or-later"
replaces="gstreamer1"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-lang"
depends_dev="libxml2-dev"
-makedepends="$depends_dev bison flex glib-dev gobject-introspection-dev
- libcap-dev meson perl"
+makedepends="$depends_dev
+ bison
+ flex
+ glib-dev
+ gobject-introspection-dev
+ libcap-dev
+ meson
+ perl
+ "
+subpackages="
+ $pkgname-dev
+ $pkgname-doc
+ $pkgname-tools
+ $pkgname-lang
+ "
source="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$pkgver.tar.xz"
+options="!check" # FIXME: two tests fail
# secfixes:
# 1.18.4-r0:
@@ -29,16 +42,25 @@ build() {
meson compile ${JOBS:+-j ${JOBS}} -C output
}
+check() {
+ meson test --no-rebuild -v -C output
+}
+
package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
-tools() {
- pkgdesc="Tools for GStreamer streaming media framework"
- # gst-feedback needs this
- depends="pkgconfig"
- mkdir -p "$subpkgdir"/usr/
- mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+dev() {
+ default_dev
+
+ # Support for debugging.
+ amove usr/share/gdb
+ amove usr/share/gstreamer-*/gdb
+
+ # Unit test libraries.
+ amove usr/bin/gst-tester-*
+ amove usr/lib/libgstcheck-*.so.*
+ amove usr/lib/girepository-1.0/GstCheck-*.typelib
}
doc() {
@@ -46,6 +68,14 @@ doc() {
replaces="${pkgname}1-doc"
}
+tools() {
+ pkgdesc="Tools for GStreamer streaming media framework"
+ # gst-feedback needs this
+ depends="pkgconfig"
+
+ amove usr/bin
+}
+
sha512sums="
b0bec94e8fe419610fda750618684c25ad8cbbc50e05b6767eb6a5ca81f0f1dc43a1e8a35d255334c9fe63308a67e94763686cf585b9cf09ebbf754ead074293 gstreamer-1.18.5.tar.xz
"
diff --git a/main/gtest/APKBUILD b/main/gtest/APKBUILD
index 3ad0de0619..9b113714f1 100644
--- a/main/gtest/APKBUILD
+++ b/main/gtest/APKBUILD
@@ -1,44 +1,43 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=gtest
pkgver=1.11.0
-pkgrel=0
+pkgrel=3
pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit)"
url="https://github.com/google/googletest"
arch="all"
-options="!check" # googletest-death-test-test hangs
license="BSD-3-Clause"
-depends_dev="${pkgname}=$pkgver-r${pkgrel} gmock=$pkgver-r${pkgrel} cmake"
-makedepends="$depends_dev python3-dev"
+depends_dev="$pkgname=$pkgver-r$pkgrel gmock=$pkgver-r$pkgrel cmake"
+makedepends="$depends_dev python3-dev samurai"
subpackages="$pkgname-dev gmock"
-source="$pkgname-$pkgver.tar.gz::https://github.com/google/googletest/archive/release-$pkgver.tar.gz
- gtest-1.8.1-libversion.patch
- gtest-1.8.1-null-pointer.patch" # https://src.fedoraproject.org/rpms/gtest/tree/master
+source="$pkgname-$pkgver.tar.gz::https://github.com/google/googletest/archive/release-$pkgver.tar.gz"
builddir="$srcdir"/googletest-release-$pkgver
prepare() {
+ default_prepare
+
# fixup version as they are never correct
sed -E "s|(GOOGLETEST_VERSION) [0-9\\.]+|\\1 ${pkgver}|" -i CMakeLists.txt
}
build() {
- cmake -B build . \
- -DCMAKE_BUILD_TYPE=None \
+ cmake -B build -G Ninja \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=ON \
-DPYTHON_EXECUTABLE=python3 \
-Dgtest_build_tests=ON \
-DBUILD_GMOCK=ON
- make -C build
+ cmake --build build
}
check() {
- make -C build test
+ cmake --build build --target test
}
package() {
- make -C build DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" cmake --build build --target install
find "$pkgdir" -name '*.pump' -print -delete
}
@@ -50,6 +49,4 @@ gmock() {
sha512sums="
6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28 gtest-1.11.0.tar.gz
-fd53e4a703c39cf4f1bc2eec2fac6c567e583d5e5a2ab4b52700ead77caf4f4903c4d32b8b25b983c5f650fc2b1e835fdf124b04a971705f42a707a42b34a99e gtest-1.8.1-libversion.patch
-afa75f975d8aed453c901245dae753939958d8b72e3e5c52995efe7980f44de4fd1ea08f1b0a4cc927443d858de0a1fe34a919512ce05ae443bfb9600b08f029 gtest-1.8.1-null-pointer.patch
"
diff --git a/main/gtest/gtest-1.8.1-libversion.patch b/main/gtest/gtest-1.8.1-libversion.patch
deleted file mode 100644
index 08904c1749..0000000000
--- a/main/gtest/gtest-1.8.1-libversion.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
-index 8a8de1f..3d86a59 100644
---- a/googlemock/CMakeLists.txt
-+++ b/googlemock/CMakeLists.txt
-@@ -109,8 +109,10 @@ if (MSVC)
- else()
- cxx_library(gmock "${cxx_strict}" src/gmock-all.cc)
- target_link_libraries(gmock PUBLIC gtest)
-+ set_target_properties(gmock PROPERTIES VERSION ${GOOGLETEST_VERSION})
- cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc)
- target_link_libraries(gmock_main PUBLIC gmock)
-+ set_target_properties(gmock_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
- endif()
- # If the CMake version supports it, attach header directory information
- # to the targets for when we are part of a parent build (ie being pulled
-diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
-index 9ee7940..8099130 100644
---- a/googletest/CMakeLists.txt
-+++ b/googletest/CMakeLists.txt
-@@ -131,7 +131,9 @@ endif()
- # are used for other targets, to ensure that gtest can be compiled by a user
- # aggressive about warnings.
- cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
-+set_target_properties(gtest PROPERTIES VERSION ${GOOGLETEST_VERSION})
- cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
-+set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
- # If the CMake version supports it, attach header directory information
- # to the targets for when we are part of a parent build (ie being pulled
- # in via add_subdirectory() rather than being a standalone build).
diff --git a/main/gtest/gtest-1.8.1-null-pointer.patch b/main/gtest/gtest-1.8.1-null-pointer.patch
deleted file mode 100644
index d062baca40..0000000000
--- a/main/gtest/gtest-1.8.1-null-pointer.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
-index 96b07c6..4af3e5a 100644
---- a/googletest/src/gtest.cc
-+++ b/googletest/src/gtest.cc
-@@ -2693,10 +2693,12 @@ void TestInfo::Run() {
- test->Run();
- }
-
-+ if (test != NULL) {
- // Deletes the test object.
- impl->os_stack_trace_getter()->UponLeavingGTest();
- internal::HandleExceptionsInMethodIfSupported(
- test, &Test::DeleteSelf_, "the test fixture's destructor");
-+ }
-
- result_.set_elapsed_time(internal::GetTimeInMillis() - start);
-
diff --git a/main/guile/APKBUILD b/main/guile/APKBUILD
index 23d24de948..58de939015 100644
--- a/main/guile/APKBUILD
+++ b/main/guile/APKBUILD
@@ -5,8 +5,8 @@
# reverted at any time, at the core team's discretion.
pkgname=guile
-pkgver=3.0.6
-pkgrel=1
+pkgver=3.0.7
+pkgrel=0
pkgdesc="portable, embeddable Scheme implementation written in C"
url="https://www.gnu.org/software/guile/"
arch="all"
@@ -44,5 +44,7 @@ doc() {
license="GFDL-1.3-or-later"
}
-sha512sums="bf12c480288f9e7c54beecae69c3a00b77d903370ce3f0a9a0f16536963d3c1773f5de1fb031662829160d0d8fc29264a1e4b8b1419a04ffc26a07d33b1b934b guile-3.0.6.tar.gz
-54a9fe0fa2ea83da7ae61f96612e3e653ec80f60ab41d1995dc44bd05c7ff68cc4fab36a655e8835c4ab1cf0966765a299ef2d73cb9f69d3ef955e6aeaa8062d 0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch"
+sha512sums="
+d7b159e109fd4a08231ef9b961376e71c2872f08d47d82896d96ccac250f5677b35be9a8ce3b9a758bd2ed78d6451e4fdd844408a1baf684256d9bfa09999f3f guile-3.0.7.tar.gz
+54a9fe0fa2ea83da7ae61f96612e3e653ec80f60ab41d1995dc44bd05c7ff68cc4fab36a655e8835c4ab1cf0966765a299ef2d73cb9f69d3ef955e6aeaa8062d 0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
+"
diff --git a/main/gummiboot/APKBUILD b/main/gummiboot/APKBUILD
index 22b5c55d34..9a10fd5d1f 100644
--- a/main/gummiboot/APKBUILD
+++ b/main/gummiboot/APKBUILD
@@ -1,10 +1,10 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gummiboot
pkgver=48.1
-pkgrel=1
+pkgrel=2
pkgdesc="Simple EFI Boot Manager"
url="http://freedesktop.org/wiki/Software/gummiboot"
-arch="x86 x86_64"
+arch="x86 x86_64 aarch64"
license="LGPL-2.0-or-later"
depends="$pkgname-efistub=$pkgver-r$pkgrel"
makedepends="util-linux-dev gnu-efi-dev autoconf automake docbook-xsl libxslt"
@@ -35,6 +35,7 @@ package() {
efistub() {
pkgdesc="Linux UEFI stub from the gummiboot project"
+ depends=
amove usr/lib/gummiboot/*.efi.stub
}
diff --git a/main/haproxy/APKBUILD b/main/haproxy/APKBUILD
index 1c6a96496e..35508d1813 100644
--- a/main/haproxy/APKBUILD
+++ b/main/haproxy/APKBUILD
@@ -4,9 +4,9 @@
pkgname=haproxy
# NOTE: Upgrade only to LTS versions announced on upstream site url!
# Using LTS versions is easier to keep it in good shape for stable releases
-pkgver=2.4.7
+pkgver=2.4.12
_pkgmajorver=${pkgver%.*}
-pkgrel=1
+pkgrel=0
pkgdesc="A TCP/HTTP reverse proxy for high availability environments"
url="https://www.haproxy.org/"
arch="all"
@@ -59,7 +59,7 @@ package() {
}
sha512sums="
-7ad8e9bd506d6f5919ff9ea97b08a4ec283bf580baefc7945632ea5a88a73081bb3d82586855efc7b7b9194558f12823c26b7a7498ac08c3efc158ea6583ec9f haproxy-2.4.7.tar.gz
+bb5cf9894cab051f96c067203842e7d6277bc02c825061e483b7678ca6e70d01fc3f6d57e9cc9243b57feac97967b09467e463c7dd7ab44700a7af2087a559b6 haproxy-2.4.12.tar.gz
f766b2e9f9e2e4d236e571e7d7dfc59e864d5e6e7fe8008275d4ad9665e3b519e2ae9833c1c2f41f7af12cfd2c1b17a7620caa80426086fd4020dc5527465854 haproxy-openssl-3.patch
4aa8fc812079baf1d17cf9484a9b44568c3dd94f35243a57a4a7868e7f88146a4e94c80ea8ab86f1b08a524567e269a3ec119b67fc679f6bd0d9f1c70ce4f080 haproxy.initd
26bc8f8ac504fcbaec113ecbb9bb59b9da47dc8834779ebbb2870a8cadf2ee7561b3a811f01e619358a98c6c7768e8fdd90ab447098c05b82e788c8212c4c41f haproxy.cfg
diff --git a/main/harfbuzz/APKBUILD b/main/harfbuzz/APKBUILD
index e2f0ac6e4d..804d04ac16 100644
--- a/main/harfbuzz/APKBUILD
+++ b/main/harfbuzz/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpinelinux@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=harfbuzz
-pkgver=3.0.0
-pkgrel=1
+pkgver=3.2.0
+pkgrel=0
pkgdesc="Text shaping library"
url="https://freedesktop.org/wiki/Software/HarfBuzz"
arch="all"
@@ -58,5 +58,5 @@ utils() {
}
sha512sums="
-69999ad86bde56ef689392a521143b6ad14b6719860772c3d4c343358997049a48c79e8f302fe0a7f3b0d930b476ddf440def874a1269b50ae79d020bcd073b5 harfbuzz-3.0.0.tar.gz
+5d8c629416c0bc557b83e8d9d731d41b9e8ee3abc74590e65ed6ca67d74d3a440d038134313f17a7b1b14ef0fc1ecf8bb87113fdcf5f0c8d3dc3d2eeb9b08c18 harfbuzz-3.2.0.tar.gz
"
diff --git a/main/haserl/APKBUILD b/main/haserl/APKBUILD
index a27937baeb..dc1cc712be 100644
--- a/main/haserl/APKBUILD
+++ b/main/haserl/APKBUILD
@@ -1,9 +1,9 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.3 5.2 5.1"
-_defaultlua="5.3"
+_luaversions="5.4 5.3 5.2 5.1"
+_defaultlua="5.4"
pkgname=haserl
pkgver=0.9.36
-pkgrel=0
+pkgrel=1
pkgdesc="Html And Shell Embedded Report Language"
url="http://haserl.sourceforge.net/"
arch="all"
diff --git a/main/haveged/APKBUILD b/main/haveged/APKBUILD
index 481118877c..62f2d549f7 100644
--- a/main/haveged/APKBUILD
+++ b/main/haveged/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Danilo Godec <danilo.godec@agenda.si>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=haveged
-pkgver=1.9.15
+pkgver=1.9.17
pkgrel=0
pkgdesc="Entropy harvesting daemon using CPU timings"
url="https://www.issihosts.com/haveged/"
@@ -45,7 +45,7 @@ package() {
}
sha512sums="
-405fe15e3711de503d4d28f5f67fc9f393da03eb80d2a5f6167c3539fda4f11f7e7b8e795a6770d6dfa3273ee887133898c1ca4b41d80c62e1997d8796f4325e haveged-1.9.15.tar.gz
+0db4fc287dc80b6d7fbe6e1b4a6fb73bcab9db6604b437ac127f4fb4aeef64867d7bb90b24b4286e5e46e85db8e85f4b5fc15f189a8fe1f071ec79c9b5f24095 haveged-1.9.17.tar.gz
99dfe4e40b99041a34cfff8539d6148c88413d2fadc2ab8db7edda95f8c84e21b61643de51855d70f0f6d20bbe1f46fc8198bfd5d512099545fad74d1c7132b6 haveged.initd
c2dcaf151d314500c9147b97ce08bb65c902431ac1c60e76072f5237164fa4ff4aa9115eba9329fffb14add7759e4d9acc894bcf49dcc4ea37339a01c2aa1ed7 haveged.confd
"
diff --git a/main/hostapd/APKBUILD b/main/hostapd/APKBUILD
index 9ff3343d0b..438ee1f6b8 100644
--- a/main/hostapd/APKBUILD
+++ b/main/hostapd/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=hostapd
pkgver=2.9
-pkgrel=5
+pkgrel=6
pkgdesc="daemon for wireless software access points"
url="https://w1.fi/hostapd/"
arch="all"
-license="custom"
+license="BSD-3-Clause"
makedepends="openssl1.1-compat-dev libnl3-dev linux-headers"
subpackages="$pkgname-doc $pkgname-openrc"
-source="https://w1.fi/releases/$pkgname-$pkgver.tar.gz
+source="https://w1.fi/releases/hostapd-$pkgver.tar.gz
$pkgname.initd
$pkgname.confd
CVE-2019-16275.patch
@@ -42,8 +42,6 @@ builddir="$srcdir"/$pkgname-$pkgver/hostapd
# - CVE-2017-13088
prepare() {
- local conf="$builddir/.config"
-
# This is required because our builddir is the hostapd/ directory
# inside the extracted archive, while patches mostly apply against
# the src/ directory that is in the same directory as the hostapd/
@@ -59,21 +57,23 @@ prepare() {
hostapd.conf
# toolchain setup
- sed \
- -e '/^#CONFIG_DRIVER_NL80211=y/s/^#//' \
- -e '/^#CONFIG_RADIUS_SERVER=y/s/^#//' \
- -e '/^#CONFIG_DRIVER_WIRED=y/s/^#//' \
- -e '/^#CONFIG_DRIVER_NONE=y/s/^#//' \
- -e '/^#CONFIG_IEEE80211N=y/s/^#//' \
- -e '/^#CONFIG_IEEE80211R=y/s/^#//' \
- -e '/^#CONFIG_IEEE80211AC=y/s/^#//' \
- -e '/^#CONFIG_FULL_DYNAMIC_VLAN=y/s/^#//' \
- -e '/^#CONFIG_LIBNL32=y/s/^#//' \
- -e '/^#CONFIG_ACS=y/s/^#//' \
- defconfig >> .config
- echo "CC ?= ${CC:-gcc}" >> .config
- echo "CFLAGS += -I/usr/include/libnl3" >> .config
- echo "LIBS += -L/usr/lib" >> .config
+ {
+ sed \
+ -e '/^#CONFIG_DRIVER_NL80211=y/s/^#//' \
+ -e '/^#CONFIG_RADIUS_SERVER=y/s/^#//' \
+ -e '/^#CONFIG_DRIVER_WIRED=y/s/^#//' \
+ -e '/^#CONFIG_DRIVER_NONE=y/s/^#//' \
+ -e '/^#CONFIG_IEEE80211N=y/s/^#//' \
+ -e '/^#CONFIG_IEEE80211R=y/s/^#//' \
+ -e '/^#CONFIG_IEEE80211AC=y/s/^#//' \
+ -e '/^#CONFIG_FULL_DYNAMIC_VLAN=y/s/^#//' \
+ -e '/^#CONFIG_LIBNL32=y/s/^#//' \
+ -e '/^#CONFIG_ACS=y/s/^#//' \
+ defconfig
+ echo "CC ?= ${CC:-gcc}"
+ echo "CFLAGS += -I/usr/include/libnl3"
+ echo "LIBS += -L/usr/lib"
+ } >> '.config'
}
build() {
diff --git a/main/htop/APKBUILD b/main/htop/APKBUILD
index 869b549084..9532388aee 100644
--- a/main/htop/APKBUILD
+++ b/main/htop/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=htop
-pkgver=3.1.1
+pkgver=3.1.2
pkgrel=0
pkgdesc="Interactive process viewer"
url="https://htop.dev/"
@@ -35,5 +35,5 @@ package() {
}
sha512sums="
-5e4ec9b5fdf4583c8a345dcc2fe9395737e3a6e8dd8e6547800b959be084b9d57ae30bf891f79a25f6bf99ec0b6eb7eaba8bc851072c5a550de70df4178dc07d htop-3.1.1.tar.gz
+7e08b820042e480ca61137ff24b468804b49b95c1bbedaf82029dd79d29c2c541c5211284ec075692203788bbb868a9d4326ffd24c68419e22eec13ae5012700 htop-3.1.2.tar.gz
"
diff --git a/main/hylafax/APKBUILD b/main/hylafax/APKBUILD
index 466f6092ce..50f52ac6d7 100644
--- a/main/hylafax/APKBUILD
+++ b/main/hylafax/APKBUILD
@@ -5,11 +5,11 @@ pkgver=6.0.7
pkgrel=3
pkgdesc="Sends and receives faxes"
url="http://www.hylafax.org/"
-#arch="all"
+arch="all"
license="MIT"
#depends on gcc for libgcc_s.so, it's scripts are hardcoded to bash
depends="ghostscript bash tiff-tools"
-makedepends="zlib-dev tiff-dev<4.3 gettext-dev"
+makedepends="zlib-dev tiff-dev<4.4 gettext-dev"
subpackages="$pkgname-doc $pkgname-lang"
source="ftp://ftp.hylafax.org/source/hylafax-$pkgver.tar.gz
$pkgname.initd
@@ -95,5 +95,5 @@ fc57feb416772a7a4bfaf5c3c76a0c2254ead2f63a72b3dfa465444327d440345a0402b7c7dad14f
012e204ee7f86804c8cb249f6c53452b7a36b7140aa4d8f61c5c63cfe1fdfb84c42be46b1e39ca37766d9fcb209db7d96a32a01108d1e66a8f7df28e72167ce0 hylafax.initd
3c07726cc9d7351dceb80a46354c6626e54b033b0f434c1db01db2a3b3ab5e9084d551dd23cae3ab40806f27aa5fa0a5b70c43a6b7802356871c0b343baa2376 hylafax.confd
f97c805a62dfcb57f85f614b6eb28bd6b58e0582ce4f9aa5166337a46d453ea038a098223d879d120f51454008a5e8ed2fa60ba6e8be12af7b7d5a4927c51471 hylafax-charset.patch
-24d1c326d7f2cd426b9f94355478cf9dfc77bcb610d43003834a74e656ac588ed0e5549ab1504a17d4771eeabb6f4ad43ee473f067b3a98ff343b7032dedbd77 libtiff-42-compatibility.patch
+9c099f4f67cc9d310e54d9ffb862b7639b9805c515fc939ba243154e5adcd1fea691ad2af42c10fed8df336d3a04c187023c24f79c9922139c410fb558b75ed1 libtiff-42-compatibility.patch
"
diff --git a/main/hylafax/libtiff-42-compatibility.patch b/main/hylafax/libtiff-42-compatibility.patch
index 6297a4498f..34e5dd221c 100644
--- a/main/hylafax/libtiff-42-compatibility.patch
+++ b/main/hylafax/libtiff-42-compatibility.patch
@@ -7,7 +7,7 @@ index 8f591b554c..849e0ef355 100755
tiff_bytecount_t="uint32"
;;
- 4.[0]) tiff_runlen_t="uint32"
-+ 4.[012]) tiff_runlen_t="uint32"
++ 4.[0123]) tiff_runlen_t="uint32"
tiff_offset_t="uint64"
tiff_bytecount_t="uint64"
echo '#define TIFFHeader TIFFHeaderClassic'
diff --git a/main/hylafaxplus/APKBUILD b/main/hylafaxplus/APKBUILD
index 2ce60b20af..85d941a965 100644
--- a/main/hylafaxplus/APKBUILD
+++ b/main/hylafaxplus/APKBUILD
@@ -3,7 +3,7 @@
pkgname=hylafaxplus
_pkgname=hylafax
pkgver=7.0.4
-pkgrel=2
+pkgrel=5
pkgdesc="Making the Premier Open-Source Fax Management System Even Better"
url="http://hylafax.sourceforge.net"
arch="all"
@@ -20,6 +20,8 @@ source="https://downloads.sourceforge.net/hylafax/$_pkgname-$pkgver.tar.gz
common-functions-busybox-awk.patch
no-locale.patch
utf8-dictionary.patch
+ dont-ship-xferfaxlog-file.patch
+ config-files-default-extension.patch
"
builddir="$srcdir"/$_pkgname-$pkgver
@@ -101,9 +103,11 @@ package() {
sha512sums="
e4ccb22c93d74a3b03f876998a9330db091ef1f60e78fb2dc4d38367188e4ad75b89de07c2f0eb477051df0136961cf79c4a5ce3cfe5d9370d631afdeec858a2 hylafax-7.0.4.tar.gz
-63f032b4b39dfb03380815a1a6290c5c4338761af8fecc0e55cf6f60bcbcb02e90780659e283d35911504c07d3e7492d19a2b1c08140d2e8f314649872b301f4 hylafaxplus.initd
+ae9de1dbf53ef64acd8b03515c5cd840c12596921edb8c45a333eb7a69e911ec3a449a9f0201c5c73d54d9f01c4696f1accacf1e83137737341a5913f0725b16 hylafaxplus.initd
a2117eddc8f0ff70a23a90f2001dcb88c5bddee46ffa021d6d1701cc5cfc3bcb0362ead2b1b1ce2b288992728053c5947466d08916649f45e7dfb1876576e50f hylafaxplus.confd
41ae2055a7781d83fc275aafe18ced0fe75ba79d3ad7d5096eabaeae3a514b564723185dd33820268577174f6c53bfcfddb30922ba50754b15c5c3b0abbec837 common-functions-busybox-awk.patch
4a1243daff9904e6395c3e28aa4a78a74de99f5aa9dbf5055a3781acfcd9b1b3db42b1569409b27e3ef9b0e55272dc99122436a79a08c9a1c140c2547c5a2c15 no-locale.patch
f5f1e33897a91b8297311c033d50e7ea2f9088568264a5b9224285066a504da8cc4296f973dd0a70e09abca538cef26964c6181f4f67f76400783d0697f05e61 utf8-dictionary.patch
+56a747d0592a4f7caa90b4bbf2f7f01a8000e80bea0f33a4d15af87315789cc3ca0b6031312db6d7a93ac4f4d16abe540331ef841c4911b291f0af30e41c8e8f dont-ship-xferfaxlog-file.patch
+49bd5e1f590c59de1a96cafa96f3ce5ba0afbacbf08f026682f5be56e4405f95a06df6acef5429a158652b967a446c7c976274729342608527ccbc035979f0b1 config-files-default-extension.patch
"
diff --git a/main/hylafaxplus/config-files-default-extension.patch b/main/hylafaxplus/config-files-default-extension.patch
new file mode 100644
index 0000000000..74d872181e
--- /dev/null
+++ b/