aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/abuild/APKBUILD10
-rw-r--r--main/acf-openldap/APKBUILD4
-rw-r--r--main/aconf/APKBUILD4
-rw-r--r--main/acpica/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/APKBUILD4
-rw-r--r--main/alpine-keys/APKBUILD18
-rw-r--r--main/alpine-keys/alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub14
-rw-r--r--main/alpine-keys/alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub14
-rw-r--r--main/alpine-keys/alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub14
-rw-r--r--main/alpine-keys/alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub14
-rw-r--r--main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub14
-rw-r--r--main/alpine-keys/alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub14
-rw-r--r--main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub14
-rw-r--r--main/alpine-keys/alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub14
-rw-r--r--main/alpine-make-rootfs/APKBUILD6
-rw-r--r--main/amavis/APKBUILD10
-rw-r--r--main/amavisd-milter/APKBUILD10
-rw-r--r--main/apache2/APKBUILD21
-rw-r--r--main/apk-cron/APKBUILD4
-rw-r--r--main/apk-tools/APKBUILD9
-rw-r--r--main/apr-util/APKBUILD4
-rw-r--r--main/arm-trusted-firmware/APKBUILD4
-rw-r--r--main/asciidoc/APKBUILD6
-rw-r--r--main/asciidoctor/APKBUILD2
-rw-r--r--main/asterisk/APKBUILD10
-rw-r--r--main/at-spi2-core/APKBUILD4
-rw-r--r--main/attr/APKBUILD4
-rw-r--r--main/audit/APKBUILD4
-rw-r--r--main/awall/APKBUILD12
-rw-r--r--main/axel/APKBUILD4
-rw-r--r--main/bacula/APKBUILD4
-rw-r--r--main/bats/APKBUILD4
-rw-r--r--main/bctoolbox/APKBUILD8
-rw-r--r--main/bctoolbox/cmake-bcunit-fix.patch19
-rw-r--r--main/bind/APKBUILD12
-rw-r--r--main/bind/bind-9.16.20-map-format-fix.patch8
-rw-r--r--main/binutils/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch65
-rw-r--r--main/binutils/APKBUILD22
-rw-r--r--main/binutils/CVE-2021-3487.patch72
-rw-r--r--main/binutils/bfd-close-file-desriptor-if-there-is-no-archive-fd.patch234
-rw-r--r--main/binutils/defang-no-split.patch38
-rw-r--r--main/bluez/APKBUILD14
-rw-r--r--main/boost1.75/APKBUILD193
-rw-r--r--main/boost1.75/boost-context-mips-softfloat.patch72
-rw-r--r--main/boost1.75/build-undefine-statx-syscall.patch17
-rw-r--r--main/boost1.76/0001-revert-cease-dependence-on-range.patch49
-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/0001-revert-cease-dependence-on-range.patch (renamed from main/boost1.75/0001-revert-cease-dependence-on-range.patch)0
-rw-r--r--main/boost1.77/APKBUILD (renamed from main/boost1.76/APKBUILD)14
-rw-r--r--main/boost1.77/boost-1.57.0-python-abi_letters.patch (renamed from main/boost1.75/boost-1.57.0-python-abi_letters.patch)0
-rw-r--r--main/boost1.77/boost-1.57.0-python-libpython_dep.patch (renamed from main/boost1.75/boost-1.57.0-python-libpython_dep.patch)0
-rw-r--r--main/botan/APKBUILD14
-rw-r--r--main/botan/CVE-2021-40529.patch132
-rw-r--r--main/botan/dl-exponents.patch304
-rw-r--r--main/btrfs-progs/APKBUILD6
-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-regressions-in-process-substitution.patch80
-rw-r--r--main/busybox/0001-pgrep-add-support-for-matching-against-UID-and-RUID.patch138
-rw-r--r--main/busybox/APKBUILD31
-rw-r--r--main/c-ares/APKBUILD4
-rw-r--r--main/ca-certificates/APKBUILD4
-rw-r--r--main/ccache/APKBUILD13
-rw-r--r--main/ccache/ioctl.patch19
-rw-r--r--main/cgit/APKBUILD4
-rw-r--r--main/charybdis/APKBUILD4
-rw-r--r--main/checkbashisms/APKBUILD4
-rw-r--r--main/cifs-utils/APKBUILD12
-rw-r--r--main/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch (renamed from main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch)78
-rw-r--r--main/clang/APKBUILD17
-rw-r--r--main/clucene/APKBUILD2
-rw-r--r--main/cmake/APKBUILD4
-rw-r--r--main/compiler-rt/APKBUILD13
-rw-r--r--main/compiler-rt/disable-sanitizer-common.patch12
-rw-r--r--main/compiler-rt/replace-size_t-std-size-t.patch139
-rw-r--r--main/coreutils/APKBUILD18
-rw-r--r--main/coreutils/fix-chmod-exit-code.patch111
-rw-r--r--main/coreutils/ls.patch25
-rw-r--r--main/cryptsetup/APKBUILD6
-rw-r--r--main/ctags/APKBUILD8
-rw-r--r--main/ctags/disable-check-genfile.patch19
-rw-r--r--main/curl/APKBUILD5
-rw-r--r--main/cython/APKBUILD12
-rw-r--r--main/cython/cython-test-fix.patch23
-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/dhcp/APKBUILD2
-rw-r--r--main/dhcpcd/APKBUILD4
-rw-r--r--main/dialog/APKBUILD4
-rw-r--r--main/diffutils/APKBUILD3
-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/APKBUILD14
-rw-r--r--main/drbd-utils/APKBUILD6
-rw-r--r--main/efi-mkkeys/APKBUILD20
-rw-r--r--main/efi-mkuki/APKBUILD26
-rw-r--r--main/efitools/APKBUILD4
-rw-r--r--main/eggdrop/APKBUILD11
-rw-r--r--main/elinks/APKBUILD4
-rw-r--r--main/ell/APKBUILD4
-rw-r--r--main/email/APKBUILD4
-rw-r--r--main/encfs/APKBUILD4
-rw-r--r--main/ethtool/APKBUILD4
-rw-r--r--main/eudev/APKBUILD21
-rw-r--r--main/execline/APKBUILD8
-rw-r--r--main/file/APKBUILD15
-rw-r--r--main/file/file-5.40-magic-unsigned.patch147
-rw-r--r--main/file/file-5.40-magic-xzip.patch37
-rw-r--r--main/freeradius/APKBUILD27
-rw-r--r--main/freeradius/default-config.patch10
-rw-r--r--main/freeradius/fix-request_running-segfault.patch23
-rw-r--r--main/freeradius/freeradius.logrotated10
-rw-r--r--main/freeradius/radacct-rotate87
-rw-r--r--main/freeradius/radacct-rotate.conf26
-rw-r--r--main/freeradius/radacct-rotate.crond10
-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/freetdm/APKBUILD49
-rw-r--r--main/freetdm/remove-werr.patch44
-rw-r--r--main/fribidi/APKBUILD6
-rw-r--r--main/gawk/APKBUILD8
-rw-r--r--main/gc/APKBUILD15
-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-Turn-on-Wl-z-relro-z-now-by-default.patch12
-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-fix-fcntl-on-mips-add-libucontext-dep.patch12
-rw-r--r--main/gcc/0018-ada-fix-shared-linking.patch6
-rw-r--r--main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch6
-rw-r--r--main/gcc/0020-add-fortify-headers-paths.patch6
-rw-r--r--main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch8
-rw-r--r--main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch14
-rw-r--r--main/gcc/0023-Pure-64-bit-MIPS.patch10
-rw-r--r--main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch10
-rw-r--r--main/gcc/0025-always-build-libgcc_eh.a.patch12
-rw-r--r--main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch26
-rw-r--r--main/gcc/0027-ada-musl-support-fixes.patch50
-rw-r--r--main/gcc/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch (renamed from main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch)6
-rw-r--r--main/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch48
-rw-r--r--main/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch30
-rw-r--r--main/gcc/0029-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/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch27
-rw-r--r--main/gcc/0031-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/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch38
-rw-r--r--main/gcc/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch (renamed from main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch)6
-rw-r--r--main/gcc/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch37
-rw-r--r--main/gcc/0033-gcc-go-link-to-libucontext.patch (renamed from main/gcc/0037-gcc-go-link-to-libucontext.patch)8
-rw-r--r--main/gcc/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch (renamed from main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch)8
-rw-r--r--main/gcc/0035-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/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch30
-rw-r--r--main/gcc/0036-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/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch (renamed from main/gcc/0042-configure-fix-detection-of-atomic-builtins-in-libato.patch)7
-rw-r--r--main/gcc/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch84
-rw-r--r--main/gcc/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch53
-rw-r--r--main/gcc/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch80
-rw-r--r--main/gcc/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch106
-rw-r--r--main/gcc/APKBUILD118
-rw-r--r--main/gdb/APKBUILD11
-rw-r--r--main/gdbm/APKBUILD6
-rw-r--r--main/ghi/APKBUILD4
-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/APKBUILD41
-rw-r--r--main/glib/APKBUILD4
-rw-r--r--main/glslang/APKBUILD5
-rw-r--r--main/gnats/APKBUILD41
-rw-r--r--main/gnats/gnats.pre-install6
-rw-r--r--main/gnats/no-werror.patch13
-rw-r--r--main/gnokii/APKBUILD2
-rw-r--r--main/gnupg/APKBUILD8
-rw-r--r--main/goaccess/APKBUILD4
-rw-r--r--main/gobject-introspection/APKBUILD2
-rw-r--r--main/graphviz/0001-clone-nameclash.patch20
-rw-r--r--main/graphviz/APKBUILD6
-rw-r--r--main/grub/0008-fix-build-error-in-binutils-2.36.patch44
-rw-r--r--main/grub/0009-fix-kernel-version-detection.patch64
-rw-r--r--main/grub/APKBUILD6
-rw-r--r--main/gsm/APKBUILD4
-rw-r--r--main/gtk-doc/APKBUILD4
-rw-r--r--main/guile/APKBUILD2
-rw-r--r--main/gummiboot/APKBUILD5
-rw-r--r--main/gvpe/APKBUILD4
-rw-r--r--main/haproxy/APKBUILD8
-rw-r--r--main/harfbuzz/APKBUILD4
-rw-r--r--main/haveged/APKBUILD12
-rw-r--r--main/haveged/double-the-sample-size-used-in-the-entest.patch24
-rw-r--r--main/highlight/APKBUILD2
-rw-r--r--main/hiredis/APKBUILD8
-rw-r--r--main/hostapd/APKBUILD4
-rw-r--r--main/htop/APKBUILD8
-rw-r--r--main/hylafax/APKBUILD4
-rw-r--r--main/hylafax/libtiff-42-compatibility.patch2
-rw-r--r--main/hylafaxplus/APKBUILD10
-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/APKBUILD16
-rw-r--r--main/imlib2/APKBUILD4
-rw-r--r--main/in-sync/APKBUILD4
-rw-r--r--main/iproute2/APKBUILD4
-rw-r--r--main/ipset/APKBUILD4
-rw-r--r--main/irssi/APKBUILD4
-rw-r--r--main/isl/APKBUILD2
-rw-r--r--main/isl22/APKBUILD2
-rw-r--r--main/iso-codes/APKBUILD4
-rw-r--r--main/itstool/APKBUILD10
-rw-r--r--main/jack/APKBUILD16
-rw-r--r--main/jack/increase-api-version.patch16
-rw-r--r--main/jitterentropy-library/02-use-proper-pointer-dereferencing.patch26
-rw-r--r--main/jitterentropy-library/03-fix-execution-flow-and-args-order.patch44
-rw-r--r--main/jitterentropy-library/04-c11-asm-correction.patch21
-rw-r--r--main/jitterentropy-library/05-gcd-sensible-max.patch37
-rw-r--r--main/jitterentropy-library/06-fix-memory-size.patch42
-rwxr-xr-xmain/jitterentropy-library/APKBUILD14
-rw-r--r--main/jwhois/APKBUILD4
-rw-r--r--main/kamailio/APKBUILD12
-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/kmod/APKBUILD4
-rw-r--r--main/knot/APKBUILD62
-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/APKBUILD4
-rw-r--r--main/lftp/APKBUILD4
-rw-r--r--main/libasr/APKBUILD4
-rw-r--r--main/libatomic_ops/APKBUILD6
-rw-r--r--main/libbsd/APKBUILD4
-rw-r--r--main/libcap/APKBUILD4
-rw-r--r--main/libdrm/APKBUILD4
-rw-r--r--main/libeconf/APKBUILD4
-rw-r--r--main/libffi/APKBUILD33
-rw-r--r--main/libical/APKBUILD20
-rw-r--r--main/libimagequant/APKBUILD4
-rw-r--r--main/libisoburn/APKBUILD4
-rw-r--r--main/libisofs/APKBUILD4
-rw-r--r--main/libjpeg-turbo/APKBUILD4
-rw-r--r--main/libks/APKBUILD34
-rw-r--r--main/libks/disable-failing-tests.patch21
-rw-r--r--main/libnftnl/APKBUILD15
-rw-r--r--main/librelp/APKBUILD10
-rw-r--r--main/libretls/APKBUILD6
-rw-r--r--main/libseccomp/APKBUILD14
-rw-r--r--main/libseccomp/tests-11-basic-errors-support-older-kernels.patch108
-rw-r--r--main/libspf2/APKBUILD7
-rw-r--r--main/libsrtp/APKBUILD38
-rw-r--r--main/libssh2/APKBUILD5
-rw-r--r--main/libtasn1/APKBUILD4
-rw-r--r--main/libunwind/APKBUILD14
-rw-r--r--main/libunwind/fix-ppc64-libdir.patch11
-rw-r--r--main/libutempter/APKBUILD2
-rw-r--r--main/libwebsockets/APKBUILD6
-rw-r--r--main/libxml2/APKBUILD4
-rw-r--r--main/libxml2/whitespace-when-serializing-empty-html-documents.patch43
-rw-r--r--main/lighttpd/APKBUILD37
-rw-r--r--main/lighttpd/lighttpd.conf8
-rw-r--r--main/links/APKBUILD8
-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/APKBUILD49
-rw-r--r--main/linux-lts/ampere-mt-jade.patch600
-rw-r--r--main/linux-lts/config-lts.aarch641042
-rw-r--r--main/linux-lts/config-lts.armv7920
-rw-r--r--main/linux-lts/config-lts.mips643644
-rw-r--r--main/linux-lts/config-lts.ppc64le482
-rw-r--r--main/linux-lts/config-lts.s390x314
-rw-r--r--main/linux-lts/config-lts.x86930
-rw-r--r--main/linux-lts/config-lts.x86_641002
-rw-r--r--main/linux-lts/config-virt.aarch64573
-rw-r--r--main/linux-lts/config-virt.armv7483
-rw-r--r--main/linux-lts/config-virt.ppc64le382
-rw-r--r--main/linux-lts/config-virt.x86417
-rw-r--r--main/linux-lts/config-virt.x86_64513
-rw-r--r--main/linux-lts/vmlinux-zstd.patch18
-rw-r--r--main/linux-octeon/APKBUILD4
-rw-r--r--main/linux-rpi/APKBUILD12
-rw-r--r--main/llvm10/APKBUILD2
-rw-r--r--main/llvm11/APKBUILD7
-rw-r--r--main/llvm12/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch22
-rw-r--r--main/llvm12/APKBUILD290
-rw-r--r--main/llvm12/fix-LLVMConfig-cmake-install-prefix.patch24
-rw-r--r--main/llvm12/fix-memory-mf_exec-on-aarch64.patch25
-rw-r--r--main/lua-asn1/APKBUILD4
-rw-r--r--main/lua-cqueues/APKBUILD4
-rw-r--r--main/lua-dbi/APKBUILD2
-rw-r--r--main/lua-ldap/APKBUILD4
-rw-r--r--main/lua-microlight/APKBUILD10
-rw-r--r--main/lua-resty-core/APKBUILD8
-rw-r--r--main/lua-schema/APKBUILD34
-rw-r--r--main/lua-sec/APKBUILD4
-rw-r--r--main/lua-sql/APKBUILD2
-rw-r--r--main/lua5.1/APKBUILD2
-rw-r--r--main/lua5.3/APKBUILD2
-rw-r--r--main/lvm2/APKBUILD8
-rw-r--r--main/lxc/APKBUILD8
-rw-r--r--main/lynx/APKBUILD4
-rw-r--r--main/mandoc/APKBUILD19
-rw-r--r--main/mandoc/fix-tbl-null-pointer.patch27
-rw-r--r--main/mandoc/mandoc_configure.patch12
-rw-r--r--main/mandoc/outdated-warn-disable.patch19
-rw-r--r--main/mandoc/shared-libmandoc.patch64
-rw-r--r--main/mandoc/simplify-compat.patch275
-rw-r--r--main/memcached/APKBUILD11
-rw-r--r--main/memcached/fix-bsd-headers.patch22
-rw-r--r--main/mesa/APKBUILD15
-rw-r--r--main/meson/APKBUILD4
-rw-r--r--main/mini_httpd/APKBUILD4
-rw-r--r--main/mkinitfs/APKBUILD6
-rw-r--r--main/mksh/APKBUILD4
-rw-r--r--main/monit/APKBUILD4
-rw-r--r--main/mosh/APKBUILD4
-rw-r--r--main/mosquitto/APKBUILD27
-rw-r--r--main/mpg123/APKBUILD8
-rw-r--r--main/mtd-utils/APKBUILD4
-rw-r--r--main/mtools/APKBUILD4
-rw-r--r--main/musl/APKBUILD4
-rw-r--r--main/musl/qsort_r.patch213
-rw-r--r--main/nagios-plugins/APKBUILD8
-rw-r--r--main/nano/APKBUILD6
-rw-r--r--main/ncurses/APKBUILD4
-rw-r--r--main/neon/APKBUILD10
-rw-r--r--main/newt/APKBUILD15
-rw-r--r--main/nfs-utils/APKBUILD2
-rw-r--r--main/nftables/APKBUILD7
-rw-r--r--main/nghttp2/APKBUILD6
-rw-r--r--main/nginx/APKBUILD51
-rw-r--r--main/ngircd/APKBUILD4
-rw-r--r--main/nmap/APKBUILD4
-rw-r--r--main/nodejs/APKBUILD26
-rw-r--r--main/nodejs/link-with-libatomic-on-mips32.patch28
-rw-r--r--main/npm/APKBUILD6
-rw-r--r--main/npm/smoke-tests-npm-location.patch8
-rw-r--r--main/nrpe/APKBUILD5
-rw-r--r--main/nsd/APKBUILD10
-rw-r--r--main/nsd/openssl3.patch85
-rw-r--r--main/nss-pam-ldapd/APKBUILD4
-rw-r--r--main/open-iscsi/APKBUILD4
-rw-r--r--main/open-isns/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/openrc/0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch6
-rw-r--r--main/openrc/0002-fsck-don-t-add-C0-to-busybox-fsck.patch6
-rw-r--r--main/openrc/0003-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch7
-rw-r--r--main/openrc/0004-make-consolefont-service-compatible-with-busyboxs-se.patch6
-rw-r--r--main/openrc/0005-Support-early-loading-of-keymap-if-kbd-is-installed.patch6
-rw-r--r--main/openrc/0006-Add-support-for-starting-services-in-a-specified-VRF.patch6
-rw-r--r--main/openrc/0007-Clean-up-staticroute-config-remove-irrelevant-parts-.patch8
-rw-r--r--main/openrc/0008-bootmisc-switch-wipe_tmp-setting-to-no-by-default.patch44
-rw-r--r--main/openrc/APKBUILD31
-rw-r--r--main/opensp/APKBUILD49
-rw-r--r--main/opensp/removed-failing-tests.patch52
-rw-r--r--main/openssh/APKBUILD9
-rw-r--r--main/openssl/APKBUILD31
-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)35
-rw-r--r--main/openssl3/man-section.patch31
-rw-r--r--main/openvpn-auth-ldap/APKBUILD2
-rw-r--r--main/openvpn/APKBUILD6
-rw-r--r--main/ortp/APKBUILD4
-rw-r--r--main/p11-kit/APKBUILD2
-rw-r--r--main/pam-pgsql/APKBUILD2
-rw-r--r--main/parallel/APKBUILD4
-rw-r--r--main/partimage/APKBUILD4
-rw-r--r--main/pax-utils/APKBUILD3
-rw-r--r--main/pcre2/APKBUILD6
-rw-r--r--main/pcsc-lite/APKBUILD44
-rw-r--r--main/perdition/APKBUILD4
-rw-r--r--main/perl-b-hooks-endofscope/APKBUILD29
-rw-r--r--main/perl-convert-asn1/APKBUILD4
-rw-r--r--main/perl-cpanel-json-xs/APKBUILD8
-rw-r--r--main/perl-crypt-openssl-random/APKBUILD4
-rw-r--r--main/perl-crypt-openssl-rsa/APKBUILD4
-rw-r--r--main/perl-crypt-ssleay/APKBUILD4
-rw-r--r--main/perl-datetime-locale/APKBUILD6
-rw-r--r--main/perl-datetime-timezone/APKBUILD11
-rw-r--r--main/perl-dbd-pg/APKBUILD2
-rw-r--r--main/perl-encode/APKBUILD4
-rw-r--r--main/perl-http-message/APKBUILD6
-rw-r--r--main/perl-libwww/APKBUILD4
-rw-r--r--main/perl-mozilla-ca/APKBUILD8
-rw-r--r--main/perl-net-ssleay/APKBUILD4
-rw-r--r--main/perl-path-tiny/APKBUILD6
-rw-r--r--main/perl-scalar-list-utils/APKBUILD4
-rw-r--r--main/perl-test-simple/APKBUILD10
-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/APKBUILD11
-rw-r--r--main/pgtcl/APKBUILD2
-rw-r--r--main/pmacct/APKBUILD2
-rw-r--r--main/po4a/APKBUILD6
-rw-r--r--main/poppler/APKBUILD4
-rw-r--r--main/portaudio/APKBUILD47
-rw-r--r--main/portaudio/portaudio-audacity.patch100
-rw-r--r--main/postfix/APKBUILD8
-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/APKBUILD320
-rw-r--r--main/postgresql/conf-unix_socket_directories.patch14
-rw-r--r--main/postgresql/pg-restore.confd16
-rw-r--r--main/postgresql/pg-restore.initd36
-rw-r--r--main/postgresql/pgcrypto-22e1943f13b66df22ea4f8d15836411ba259263a.patch41
-rw-r--r--main/postgresql/pgcrypto-318df802355924015d4d8f21859bc0ef7a348970.patch41
-rw-r--r--main/postgresql/pgcrypto-72bbff4cd6eaf55239ccef79cec61766b5f8f1d2.patch1308
-rw-r--r--main/postgresql/postgresql-contrib.post-upgrade16
-rw-r--r--main/postgresql/postgresql.pre-upgrade32
-rw-r--r--main/postgresql13/APKBUILD489
-rw-r--r--main/postgresql13/czech-snowball-stemmer.patch (renamed from main/postgresql/czech-snowball-stemmer.patch)0
-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.patch (renamed from main/postgresql/disable-test-collate.icu.utf8.patch)0
-rw-r--r--main/postgresql13/external-libpq.patch.txt41
-rw-r--r--main/postgresql13/initdb.patch (renamed from main/postgresql/initdb.patch)0
-rw-r--r--main/postgresql13/jit-Don-t-use-host-specific-CPU-or-features.patch27
-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.patch18
-rw-r--r--main/postgresql13/unix_socket_directories.patch29
-rw-r--r--main/postgresql14/APKBUILD530
-rw-r--r--main/postgresql14/czech-snowball-stemmer.patch1064
-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.patch20
-rw-r--r--main/postgresql14/external-libpq.patch.txt41
-rw-r--r--main/postgresql14/initdb.patch14
-rw-r--r--main/postgresql14/jit-Don-t-use-host-specific-CPU-or-features.patch27
-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/ppp/APKBUILD4
-rw-r--r--main/protobuf-c/APKBUILD8
-rw-r--r--main/protobuf/APKBUILD14
-rw-r--r--main/protobuf/musl-fix.patch22
-rw-r--r--main/protobuf/ruby-fix-cflags.patch4
-rw-r--r--main/protobuf/skip-failing-tests.patch37
-rw-r--r--main/protobuf/trim-rakefile.patch28
-rw-r--r--main/pspg/APKBUILD6
-rw-r--r--main/psqlodbc/APKBUILD2
-rw-r--r--main/py3-attrs/APKBUILD10
-rw-r--r--main/py3-babel/APKBUILD12
-rw-r--r--main/py3-bcrypt/APKBUILD2
-rw-r--r--main/py3-cffi/APKBUILD2
-rw-r--r--main/py3-charset-normalizer/APKBUILD31
-rw-r--r--main/py3-distlib/APKBUILD4
-rw-r--r--main/py3-gobject3/APKBUILD2
-rw-r--r--main/py3-hypothesis/APKBUILD4
-rw-r--r--main/py3-idna/APKBUILD4
-rw-r--r--main/py3-iso8601/APKBUILD30
-rw-r--r--main/py3-more-itertools/APKBUILD4
-rw-r--r--main/py3-packaging/APKBUILD16
-rw-r--r--main/py3-pbr/APKBUILD6
-rw-r--r--main/py3-pillow/APKBUILD17
-rw-r--r--main/py3-pynacl/APKBUILD2
-rw-r--r--main/py3-requests/0002-allow-idna-3.patch15
-rw-r--r--main/py3-requests/APKBUILD25
-rw-r--r--main/py3-six/APKBUILD8
-rw-r--r--main/py3-sphinx/APKBUILD10
-rw-r--r--main/py3-sphinxcontrib-htmlhelp/APKBUILD13
-rw-r--r--main/py3-sphinxcontrib-serializinghtml/APKBUILD13
-rw-r--r--main/py3-urllib3/APKBUILD4
-rw-r--r--main/python3/APKBUILD4
-rw-r--r--main/python3/gnu-fallback-soabi.patch33
-rw-r--r--main/raspberrypi-bootloader/APKBUILD4
-rw-r--r--main/rdiff-backup/0003-fix-version.patch11
-rw-r--r--main/rdiff-backup/APKBUILD16
-rw-r--r--main/redis/APKBUILD13
-rw-r--r--main/rhash/APKBUILD4
-rw-r--r--main/rng-tools/01-fix-warning.patch26
-rw-r--r--main/rng-tools/02-onecpu.patch204
-rw-r--r--main/rng-tools/03-fix-pthread-setaffinity-call.patch (renamed from main/rng-tools/01-fix-pthread-setaffinity-call.patch)22
-rw-r--r--main/rng-tools/04-jitter-termination-sigs.patch33
-rw-r--r--main/rng-tools/05-jitter-shutdown-fix.patch27
-rw-r--r--main/rng-tools/06-musl-pthread-setaffinity-fix.patch21
-rw-r--r--main/rng-tools/07-use-jent_entropy_init_ex.patch70
-rw-r--r--main/rng-tools/08-correct-entflags.patch17
-rw-r--r--main/rng-tools/APKBUILD54
-rw-r--r--main/rng-tools/rngd-extra.confd24
-rw-r--r--main/rng-tools/rngd-extra.confd-arm111
-rw-r--r--main/rng-tools/rngd-extra.initd10
-rw-r--r--main/rng-tools/rngd.confd18
-rw-r--r--main/rng-tools/rngd.confd-arm93
-rw-r--r--main/rng-tools/rngd.initd6
-rw-r--r--main/rsync/APKBUILD7
-rw-r--r--main/rsyslog/APKBUILD2
-rw-r--r--main/rtapd/APKBUILD2
-rw-r--r--main/rtnppd/APKBUILD2
-rw-r--r--main/ruby-augeas/APKBUILD78
-rw-r--r--main/ruby-bundler/APKBUILD9
-rw-r--r--main/ruby-minitest/APKBUILD66
-rw-r--r--main/ruby-minitest/gemspec.patch15
-rw-r--r--main/ruby-power_assert/APKBUILD62
-rw-r--r--main/ruby-power_assert/gemspec.patch23
-rw-r--r--main/ruby-rake/APKBUILD58
-rw-r--r--main/ruby-rbs/APKBUILD62
-rw-r--r--main/ruby-rbs/gemspec.patch14
-rw-r--r--main/ruby-rexml/APKBUILD56
-rw-r--r--main/ruby-rss/APKBUILD58
-rw-r--r--main/ruby-rss/gemspec.patch17
-rw-r--r--main/ruby-test-unit/APKBUILD54
-rw-r--r--main/ruby-test-unit/gemspec.patch15
-rw-r--r--main/ruby-typeprof/APKBUILD57
-rw-r--r--main/ruby-typeprof/gemspec.patch13
-rw-r--r--main/ruby/APKBUILD247
-rw-r--r--main/ruby/dont-install-bundled-gems.patch20
-rw-r--r--main/ruby/fix-get_main_stack.patch4
-rw-r--r--main/ruby/get-ruby_nonempty_memcpy-to-have-c-linkage.patch31
-rw-r--r--main/ruby/rubygems-avoid-platform-specific-gems.patch31
-rw-r--r--main/ruby/test_insns-lower-recursion-depth.patch2
-rw-r--r--main/s6-dns/APKBUILD11
-rw-r--r--main/s6-linux-init/APKBUILD6
-rw-r--r--main/s6-linux-utils/APKBUILD8
-rw-r--r--main/s6-networking/APKBUILD10
-rw-r--r--main/s6-portable-utils/APKBUILD8
-rw-r--r--main/s6-rc/APKBUILD8
-rw-r--r--main/s6/APKBUILD10
-rw-r--r--main/s6/s6.trigger2
-rw-r--r--main/samba/APKBUILD33
-rw-r--r--main/samba/samba-bgqd-include-signal-h.patch13
-rw-r--r--main/samba/vfs_btrfs_14790.patch45
-rw-r--r--main/sbsigntool/APKBUILD4
-rw-r--r--main/scdoc/APKBUILD15
-rw-r--r--main/seabios/0003-vgasrc-ignore-.node.gnu.property-binutils-2.36-suppo.patch39
-rw-r--r--main/seabios/APKBUILD10
-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/serf/APKBUILD4
-rw-r--r--main/sipp/APKBUILD4
-rw-r--r--main/sipsak/APKBUILD4
-rw-r--r--main/skalibs/APKBUILD8
-rw-r--r--main/smokeping/APKBUILD4
-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/sngtc_client/APKBUILD4
-rw-r--r--main/socat/APKBUILD14
-rw-r--r--main/sofia-sip/APKBUILD6
-rw-r--r--main/source-highlight/APKBUILD4
-rw-r--r--main/spamassassin/APKBUILD14
-rw-r--r--main/spamassassin/taint.patch27
-rw-r--r--main/sqlite-tcl/APKBUILD4
-rw-r--r--main/sqlite/APKBUILD7
-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/APKBUILD13
-rw-r--r--main/ssmtp/APKBUILD4
-rw-r--r--main/static-routing/APKBUILD4
-rw-r--r--main/strongswan/APKBUILD15
-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/swig/APKBUILD2
-rw-r--r--main/tarsnap/APKBUILD4
-rw-r--r--main/tcl-tls/APKBUILD4
-rw-r--r--main/tcpdump/APKBUILD4
-rw-r--r--main/tcpflow/APKBUILD4
-rw-r--r--main/thin-provisioning-tools/APKBUILD2
-rw-r--r--main/tinc/APKBUILD4
-rw-r--r--main/tiny-ec2-bootstrap/APKBUILD10
-rw-r--r--main/tolua++/APKBUILD21
-rw-r--r--main/tunnel/APKBUILD4
-rw-r--r--main/tzdata/APKBUILD12
-rw-r--r--main/u-boot/APKBUILD19
-rw-r--r--main/u-boot/hifive-unmatched-ramdisk.patch19
-rwxr-xr-xmain/u-boot/update-u-boot7
-rw-r--r--main/ulogd/APKBUILD2
-rw-r--r--main/umurmur/APKBUILD4
-rw-r--r--main/unrar/APKBUILD31
-rw-r--r--main/unrar/makefile.patch30
-rw-r--r--main/util-linux/APKBUILD8
-rw-r--r--main/utmps/APKBUILD10
-rw-r--r--main/uwsgi/APKBUILD4
-rw-r--r--main/vala/APKBUILD6
-rw-r--r--main/valgrind/APKBUILD10
-rw-r--r--main/varnish/0001-r02451-fix.patch9
-rw-r--r--main/varnish/APKBUILD42
-rw-r--r--main/vde2/APKBUILD4
-rw-r--r--main/vim/APKBUILD18
-rw-r--r--main/wayland-protocols/APKBUILD4
-rw-r--r--main/wayland/APKBUILD2
-rw-r--r--main/wget/APKBUILD4
-rw-r--r--main/wpa_supplicant/APKBUILD4
-rw-r--r--main/xen/APKBUILD23
-rw-r--r--main/xen/xsa386.patch29
-rw-r--r--main/xen/xsa388-4.15-1.patch174
-rw-r--r--main/xen/xsa388-4.15-2.patch36
-rw-r--r--main/xen/xsa389-4.15.patch182
-rw-r--r--main/xen/xsa390.patch46
-rw-r--r--main/xkeyboard-config/APKBUILD4
-rw-r--r--main/xtables-addons-lts/APKBUILD2
-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/APKBUILD6
-rw-r--r--main/zfs/APKBUILD10
-rw-r--r--main/zmap/APKBUILD2
684 files changed, 17989 insertions, 13681 deletions
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index b614116d27..07cfdad867 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=abuild
-pkgver=3.8.0_rc4
+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"
@@ -12,8 +12,8 @@ depends="fakeroot scanelf openssl apk-tools>=2.0.7-r1 libc-utils
if [ "$CBUILD" = "$CHOST" ]; then
depends="$depends curl"
fi
-makedepends_build="pkgconfig"
-makedepends_host="openssl-dev zlib-dev"
+makedepends_build="pkgconfig scdoc"
+makedepends_host="openssl1.1-compat-dev zlib-dev"
makedepends="$makedepends_host $makedepends_build"
checkdepends="bats"
install="$pkgname.pre-install $pkgname.pre-upgrade"
@@ -84,5 +84,5 @@ _rootbld() {
}
sha512sums="
-687c21c233570b1e06f1298b24d5bcbf5925dfb9e9e00d0fb1626a7e0983dc6c2079cba96408033210b562c1cf08c2cd149379b22f86e0a255e2dde1c6886d48 abuild-3.8.0_rc4.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/acpica/APKBUILD b/main/acpica/APKBUILD
index f652e83f66..4129ae6ed5 100644
--- a/main/acpica/APKBUILD
+++ b/main/acpica/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Roger Pau Monne <roger.pau@entel.upc.edu>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=acpica
-pkgver=20210730
+pkgver=20210930
pkgrel=0
pkgdesc="ACPI Component Architecture utilities"
url="https://www.acpica.org"
@@ -30,6 +30,6 @@ iasl() {
}
sha512sums="
-d180cca695175880a29e580e653a9bbeca4863423c06155e50ef687c2690b737017abf1d4af6a8f9acec896c959c26665a6aff8f87db95e36924123995284f22 acpica-unix-20210730.tar.gz
+b02470bdda891eb7ca556ec4eee3387f80535b43b213f61e68e3913f4f8173dbf4c2dadaf28ad181ecc76171d40175d5ea5734dbc1237b3c3d2fba3072314c9e acpica-unix-20210930.tar.gz
1f5049568d612d4debf3690e0d918d8d56abbed14ade7b2e6282eba17b25934b695d1a9fe10f99469efe8d4382c4546481d0579afdf5cdb9695fcdc93559fbab disable-werror.patch
"
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/APKBUILD b/main/alpine-conf/APKBUILD
index 9ac1993327..d53b9cdfff 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
-pkgver=3.12.0
+pkgver=3.13.0
pkgrel=0
pkgdesc="Alpine configuration management scripts"
url="https://git.alpinelinux.org/alpine-conf/about"
@@ -25,5 +25,5 @@ package() {
}
sha512sums="
-e776e79677a89d2538896fdf63eb37ee7bd2179cd8e4205df4b0577fa54cf9b3aceeda191eaad14cb51323e7d10c67bfd63c481f88766872c5c6ef229e9ab53c alpine-conf-3.12.0.tar.gz
+ad5c26bc4b1cd0e5f3083340469d7748dc2a5e97cb6d5e9cd87cdff36633d64732d59b577ea23202aa5b75da4ca65f07682d2b3387e7529717f169d8718824cc alpine-conf-3.13.0.tar.gz
"
diff --git a/main/alpine-keys/APKBUILD b/main/alpine-keys/APKBUILD
index ac8cf49f95..ecb2c7ffb1 100644
--- a/main/alpine-keys/APKBUILD
+++ b/main/alpine-keys/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-keys
-pkgver=2.3
+pkgver=2.4
pkgrel=1
pkgdesc="Public keys for Alpine Linux packages"
url="https://alpinelinux.org"
@@ -12,19 +12,27 @@ options="!check" # No testsuite
_arch_keys="
aarch64:alpine-devel@lists.alpinelinux.org-58199dcc.rsa.pub
+ aarch64:alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
armhf,armv7:alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub
+ armv7:alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
+ armhf:alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub
x86:alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
+ x86:alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub
x86,x86_64:alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
x86_64:alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
+ x86_64:alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub
ppc64le:alpine-devel@lists.alpinelinux.org-58cbb476.rsa.pub
+ ppc64le:alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub
s390x:alpine-devel@lists.alpinelinux.org-58e4f17d.rsa.pub
+ s390x:alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub
mips64:alpine-devel@lists.alpinelinux.org-5e69ca50.rsa.pub
riscv64:alpine-devel@lists.alpinelinux.org-60ac2099.rsa.pub
+ riscv64:alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub
"
for _i in $_arch_keys; do
@@ -99,12 +107,20 @@ package() {
sha512sums="
e4f9e314f8e506fba2cb3e599c6412a036ec37ce3a54990fc7d80a821d8728f40ee3b4aa8a15218d50341fa785d9ddf7c7471f45018c6a2065ab13664a1aa9e9 alpine-devel@lists.alpinelinux.org-58199dcc.rsa.pub
+51a5ec21283fe218809b2325202e1f8c9b2551705db48254b9d48a04f4ed0075de51e9886c4704647ffb309fd32d9850d14013848a53038039e85011251fe1cc alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
698fda502f70365a852de3c10636eadfc4f70a7a00f096581119aef665e248b787004ceef63f4c8cb18c6f88d18b8b1bd6b3c5d260e79e6d73a3cc09537b196e alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub
+a98095a626f2dcbda73ffd8873ba2d609ee1d881f5da13b0eb3469ddd58b06440b4b0b2f791b037c88073e9a17c6dfc62dc1a4c8491bed871524d772ef04ad24 alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
+7aa5526a88519ae91f997bf914a9bd3d230b21c011587f155ce22c4bb94b70181b28590027eb555d96d1122dffb8242c1fb044228e99b4e9b7650fcf6f5121c7 alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub
e18e65ee911eb1f8ea869f758e8f2c94cf2ac254ee7ab90a3de1d47b94a547c2066214abf710da21910ebedc0153d05fd4fe579cc5ce24f46e0cfd29a02b1a68 alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
+b89d825e6af73687339848817791b294e2404162e2e069d9212d76d4ee53d6216eb75421a07b02f9778ef57dbb27962b2436247264eea1a1d882967ca0c18724 alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub
2d4064cbe09ff958493ec86bcb925af9b7517825d1d9d8d00f2986201ad5952f986fea83d1e2c177e92130700bafa8c0bff61411b3cdb59a41e460ed719580a6 alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
721134f289ab1e7dde9158359906017daee40983199fe55f28206c8cdc46b8fcf177a36f270ce374b0eba5dbe01f68cbb3e385ae78a54bb0a2ed1e83a4d820a5 alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
+8b9c2208c904c9f34d9d01d3d68b224208530e684265df214deb8c9e6b4b19633aa48a405e673249c9e93a8ee194a336e951cd82a4e27e5e66e85fdc5e0d495e alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub
bb5a3df8fac14a62d5936fb3722873fa6a121219b703cba955eb77de38c4384aeaf378fb9321a655e255f0be761e894e309b3789867279c1524dab6300cd8ef1 alpine-devel@lists.alpinelinux.org-58cbb476.rsa.pub
+bad4da65221150a5d4cc6f63981e4dd203d40844d32e82c17f346eee5350e460e32d28f0e231a2b78d326ec32b898eec597d3787dae47dcacc9a9776d19fb4a1 alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub
0666389ca53121453578cd4bef5fd06e159e291164b3e3233e7d6521604f8bebd30caeef1663adcd5309e07278833402c8a92c33294ec0c5cada24dc47c8cc98 alpine-devel@lists.alpinelinux.org-58e4f17d.rsa.pub
+83fc29066f6073418ecf01176ce24c1c0e788508f3083a97691706e2c78323e53448060fb0d2abb8118a759570f1f0db9d39953c63fe26fe06da2be05dff393c alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub
66ce9677e9c2a7961d5d7bc5b162ed3114a7aef6d01181073c1f42a9934966eecded2ec09deb210f5a389d434d1641ba35fe3abdd5246b2e97d5a5b26a945c5c alpine-devel@lists.alpinelinux.org-5e69ca50.rsa.pub
34514100e502f449dcabe0aa550232c3330ed2f0b789b977eb228d4ac86afc93479474ac005914992a3b47c18ee3eb32ca27ccd0d392700a8f11f47d64a78969 alpine-devel@lists.alpinelinux.org-60ac2099.rsa.pub
+7cea57204a50d72bddff201c509ccbf06773d87062a3ead0a206cc6e4a00e0960f52d21f7cee7aaec6a4abba7a697e2e2e7f630fa1ccef7ee2c33908fca18998 alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub
"
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub
new file mode 100644
index 0000000000..f2165aebad
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAutQkua2CAig4VFSJ7v54
+ALyu/J1WB3oni7qwCZD3veURw7HxpNAj9hR+S5N/pNeZgubQvJWyaPuQDm7PTs1+
+tFGiYNfAsiibX6Rv0wci3M+z2XEVAeR9Vzg6v4qoofDyoTbovn2LztaNEjTkB+oK
+tlvpNhg1zhou0jDVYFniEXvzjckxswHVb8cT0OMTKHALyLPrPOJzVtM9C1ew2Nnc
+3848xLiApMu3NBk0JqfcS3Bo5Y2b1FRVBvdt+2gFoKZix1MnZdAEZ8xQzL/a0YS5
+Hd0wj5+EEKHfOd3A75uPa/WQmA+o0cBFfrzm69QDcSJSwGpzWrD1ScH3AK8nWvoj
+v7e9gukK/9yl1b4fQQ00vttwJPSgm9EnfPHLAtgXkRloI27H6/PuLoNvSAMQwuCD
+hQRlyGLPBETKkHeodfLoULjhDi1K2gKJTMhtbnUcAA7nEphkMhPWkBpgFdrH+5z4
+Lxy+3ek0cqcI7K68EtrffU8jtUj9LFTUC8dERaIBs7NgQ/LfDbDfGh9g6qVj1hZl
+k9aaIPTm/xsi8v3u+0qaq7KzIBc9s59JOoA8TlpOaYdVgSQhHHLBaahOuAigH+VI
+isbC9vmqsThF2QdDtQt37keuqoda2E6sL7PUvIyVXDRfwX7uMDjlzTxHTymvq2Ck
+htBqojBnThmjJQFgZXocHG8CAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub
new file mode 100644
index 0000000000..aa63d81d66
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlEyxkHggKCXC2Wf5Mzx4
+nZLFZvU2bgcA3exfNPO/g1YunKfQY+Jg4fr6tJUUTZ3XZUrhmLNWvpvSwDS19ZmC
+IXOu0+V94aNgnhMsk9rr59I8qcbsQGIBoHzuAl8NzZCgdbEXkiY90w1skUw8J57z
+qCsMBydAueMXuWqF5nGtYbi5vHwK42PffpiZ7G5Kjwn8nYMW5IZdL6ZnMEVJUWC9
+I4waeKg0yskczYDmZUEAtrn3laX9677ToCpiKrvmZYjlGl0BaGp3cxggP2xaDbUq
+qfFxWNgvUAb3pXD09JM6Mt6HSIJaFc9vQbrKB9KT515y763j5CC2KUsilszKi3mB
+HYe5PoebdjS7D1Oh+tRqfegU2IImzSwW3iwA7PJvefFuc/kNIijfS/gH/cAqAK6z
+bhdOtE/zc7TtqW2Wn5Y03jIZdtm12CxSxwgtCF1NPyEWyIxAQUX9ACb3M0FAZ61n
+fpPrvwTaIIxxZ01L3IzPLpbc44x/DhJIEU+iDt6IMTrHOphD9MCG4631eIdB0H1b
+6zbNX1CXTsafqHRFV9XmYYIeOMggmd90s3xIbEujA6HKNP/gwzO6CDJ+nHFDEqoF
+SkxRdTkEqjTjVKieURW7Swv7zpfu5PrsrrkyGnsRrBJJzXlm2FOOxnbI2iSL1B5F
+rO5kbUxFeZUIDq+7Yv4kLWcCAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub
new file mode 100644
index 0000000000..59c330e9f7
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnC+bR4bHf/L6QdU4puhQ
+gl1MHePszRC38bzvVFDUJsmCaMCL2suCs2A2yxAgGb9pu9AJYLAmxQC4mM3jNqhg
+/E7yuaBbek3O02zN/ctvflJ250wZCy+z0ZGIp1ak6pu1j14IwHokl9j36zNfGtfv
+ADVOcdpWITFFlPqwq1qt/H3UsKVmtiF3BNWWTeUEQwKvlU8ymxgS99yn0+4OPyNT
+L3EUeS+NQJtDS01unau0t7LnjUXn+XIneWny8bIYOQCuVR6s/gpIGuhBaUqwaJOw
+7jkJZYF2Ij7uPb4b5/R3vX2FfxxqEHqssFSg8FFUNTZz3qNZs0CRVyfA972g9WkJ
+hPfn31pQYil4QGRibCMIeU27YAEjXoqfJKEPh4UWMQsQLrEfdGfb8VgwrPbniGfU
+L3jKJR3VAafL9330iawzVQDlIlwGl6u77gEXMl9K0pfazunYhAp+BMP+9ot5ckK+
+osmrqj11qMESsAj083GeFdfV3pXEIwUytaB0AKEht9DbqUfiE/oeZ/LAXgySMtVC
+sbC4ESmgVeY2xSBIJdDyUap7FR49GGrw0W49NUv9gRgQtGGaNVQQO9oGL2PBC41P
+iWF9GLoX30HIz1P8PF/cZvicSSPkQf2Z6TV+t0ebdGNS5DjapdnCrq8m9Z0pyKsQ
+uxAL2a7zX8l5i1CZh1ycUGsCAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub
new file mode 100644
index 0000000000..915bc566b7
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0MfCDrhODRCIxR9Dep1s
+eXafh5CE5BrF4WbCgCsevyPIdvTeyIaW4vmO3bbG4VzhogDZju+R3IQYFuhoXP5v
+Y+zYJGnwrgz3r5wYAvPnLEs1+dtDKYOgJXQj+wLJBW1mzRDL8FoRXOe5iRmn1EFS
+wZ1DoUvyu7/J5r0itKicZp3QKED6YoilXed+1vnS4Sk0mzN4smuMR9eO1mMCqNp9
+9KTfRDHTbakIHwasECCXCp50uXdoW6ig/xUAFanpm9LtK6jctNDbXDhQmgvAaLXZ
+LvFqoaYJ/CvWkyYCgL6qxvMvVmPoRv7OPcyni4xR/WgWa0MSaEWjgPx3+yj9fiMA
+1S02pFWFDOr5OUF/O4YhFJvUCOtVsUPPfA/Lj6faL0h5QI9mQhy5Zb9TTaS9jB6p
+Lw7u0dJlrjFedk8KTJdFCcaGYHP6kNPnOxMylcB/5WcztXZVQD5WpCicGNBxCGMm
+W64SgrV7M07gQfL/32QLsdqPUf0i8hoVD8wfQ3EpbQzv6Fk1Cn90bZqZafg8XWGY
+wddhkXk7egrr23Djv37V2okjzdqoyLBYBxMz63qQzFoAVv5VoY2NDTbXYUYytOvG
+GJ1afYDRVWrExCech1mX5ZVUB1br6WM+psFLJFoBFl6mDmiYt0vMYBddKISsvwLl
+IJQkzDwtXzT2cSjoj3T5QekCAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub
new file mode 100644
index 0000000000..1e49d24690
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvaaoSLab+IluixwKV5Od
+0gib2YurjPatGIbn5Ov2DLUFYiebj2oJINXJSwUOO+4WcuHFEqiL/1rya+k5hLZt
+hnPL1tn6QD4rESznvGSasRCQNT2vS/oyZbTYJRyAtFkEYLlq0t3S3xBxxHWuvIf0
+qVxVNYpQWyM3N9RIeYBR/euXKJXileSHk/uq1I5wTC0XBIHWcthczGN0m9wBEiWS
+0m3cnPk4q0Ea8mUJ91Rqob19qETz6VbSPYYpZk3qOycjKosuwcuzoMpwU8KRiMFd
+5LHtX0Hx85ghGsWDVtS0c0+aJa4lOMGvJCAOvDfqvODv7gKlCXUpgumGpLdTmaZ8
+1RwqspAe3IqBcdKTqRD4m2mSg23nVx2FAY3cjFvZQtfooT7q1ItRV5RgH6FhQSl7
++6YIMJ1Bf8AAlLdRLpg+doOUGcEn+pkDiHFgI8ylH1LKyFKw+eXaAml/7DaWZk1d
+dqggwhXOhc/UUZFQuQQ8A8zpA13PcbC05XxN2hyP93tCEtyynMLVPtrRwDnHxFKa
+qKzs3rMDXPSXRn3ZZTdKH3069ApkEjQdpcwUh+EmJ1Ve/5cdtzT6kKWCjKBFZP/s
+91MlRrX2BTRdHaU5QJkUheUtakwxuHrdah2F94lRmsnQlpPr2YseJu6sIE+Dnx4M
+CfhdVbQL2w54R645nlnohu8CAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
new file mode 100644
index 0000000000..bb15efe96d
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq0BFD1D4lIxQcsqEpQzU
+pNCYM3aP1V/fxxVdT4DWvSI53JHTwHQamKdMWtEXetWVbP5zSROniYKFXd/xrD9X
+0jiGHey3lEtylXRIPxe5s+wXoCmNLcJVnvTcDtwx/ne2NLHxp76lyc25At+6RgE6
+ADjLVuoD7M4IFDkAsd8UQ8zM0Dww9SylIk/wgV3ZkifecvgUQRagrNUdUjR56EBZ
+raQrev4hhzOgwelT0kXCu3snbUuNY/lU53CoTzfBJ5UfEJ5pMw1ij6X0r5S9IVsy
+KLWH1hiO0NzU2c8ViUYCly4Fe9xMTFc6u2dy/dxf6FwERfGzETQxqZvSfrRX+GLj
+/QZAXiPg5178hT/m0Y3z5IGenIC/80Z9NCi+byF1WuJlzKjDcF/TU72zk0+PNM/H
+Kuppf3JT4DyjiVzNC5YoWJT2QRMS9KLP5iKCSThwVceEEg5HfhQBRT9M6KIcFLSs
+mFjx9kNEEmc1E8hl5IR3+3Ry8G5/bTIIruz14jgeY9u5jhL8Vyyvo41jgt9sLHR1
+/J1TxKfkgksYev7PoX6/ZzJ1ksWKZY5NFoDXTNYUgzFUTOoEaOg3BAQKadb3Qbbq
+XIrxmPBdgrn9QI7NCgfnAY3Tb4EEjs3ON/BNyEhUENcXOH6I1NbcuBQ7g9P73kE4
+VORdoc8MdJ5eoKBpO8Ww8HECAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
new file mode 100644
index 0000000000..0ecbccc2e4
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyduVzi1mWm+lYo2Tqt/0
+XkCIWrDNP1QBMVPrE0/ZlU2bCGSoo2Z9FHQKz/mTyMRlhNqTfhJ5qU3U9XlyGOPJ
+piM+b91g26pnpXJ2Q2kOypSgOMOPA4cQ42PkHBEqhuzssfj9t7x47ppS94bboh46
+xLSDRff/NAbtwTpvhStV3URYkxFG++cKGGa5MPXBrxIp+iZf9GnuxVdST5PGiVGP
+ODL/b69sPJQNbJHVquqUTOh5Ry8uuD2WZuXfKf7/C0jC/ie9m2+0CttNu9tMciGM
+EyKG1/Xhk5iIWO43m4SrrT2WkFlcZ1z2JSf9Pjm4C2+HovYpihwwdM/OdP8Xmsnr
+DzVB4YvQiW+IHBjStHVuyiZWc+JsgEPJzisNY0Wyc/kNyNtqVKpX6dRhMLanLmy+
+f53cCSI05KPQAcGj6tdL+D60uKDkt+FsDa0BTAobZ31OsFVid0vCXtsbplNhW1IF
+HwsGXBTVcfXg44RLyL8Lk/2dQxDHNHzAUslJXzPxaHBLmt++2COa2EI1iWlvtznk
+Ok9WP8SOAIj+xdqoiHcC4j72BOVVgiITIJNHrbppZCq6qPR+fgXmXa+sDcGh30m6
+9Wpbr28kLMSHiENCWTdsFij+NQTd5S47H7XTROHnalYDuF1RpS+DpQidT5tUimaT
+JZDr++FjKrnnijbyNF8b98UCAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub
new file mode 100644
index 0000000000..ceffa3ace9
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnpUpyWDWjlUk3smlWeA0
+lIMW+oJ38t92CRLHH3IqRhyECBRW0d0aRGtq7TY8PmxjjvBZrxTNDpJT6KUk4LRm
+a6A6IuAI7QnNK8SJqM0DLzlpygd7GJf8ZL9SoHSH+gFsYF67Cpooz/YDqWrlN7Vw
+tO00s0B+eXy+PCXYU7VSfuWFGK8TGEv6HfGMALLjhqMManyvfp8hz3ubN1rK3c8C
+US/ilRh1qckdbtPvoDPhSbTDmfU1g/EfRSIEXBrIMLg9ka/XB9PvWRrekrppnQzP
+hP9YE3x/wbFc5QqQWiRCYyQl/rgIMOXvIxhkfe8H5n1Et4VAorkpEAXdsfN8KSVv
+LSMazVlLp9GYq5SUpqYX3KnxdWBgN7BJoZ4sltsTpHQ/34SXWfu3UmyUveWj7wp0
+x9hwsPirVI00EEea9AbP7NM2rAyu6ukcm4m6ATd2DZJIViq2es6m60AE6SMCmrQF
+wmk4H/kdQgeAELVfGOm2VyJ3z69fQuywz7xu27S6zTKi05Qlnohxol4wVb6OB7qG
+LPRtK9ObgzRo/OPumyXqlzAi/Yvyd1ZQk8labZps3e16bQp8+pVPiumWioMFJDWV
+GZjCmyMSU8V6MB6njbgLHoyg2LCukCAeSjbPGGGYhnKLm1AKSoJh3IpZuqcKCk5C
+8CM1S15HxV78s9dFntEqIokCAwEAAQ==
+-----END PUBLIC KEY-----
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/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/amavisd-milter/APKBUILD b/main/amavisd-milter/APKBUILD
index eafffd3740..45299851b6 100644
--- a/main/amavisd-milter/APKBUILD
+++ b/main/amavisd-milter/APKBUILD
@@ -2,23 +2,21 @@
# Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting>
pkgname=amavisd-milter
pkgver=1.7.1
-pkgrel=1
+pkgrel=2
pkgdesc="sendmail milter for amavisd-new using the AM.PDP protocol"
url="https://github.com/prehor/amavisd-milter"
arch="all !x86" #amavis isn't build for x86
license="BSD-3-Clause"
-depends="amavis libmilter"
+depends="amavis"
makedepends="libmilter-dev"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
source="
https://github.com/prehor/amavisd-milter/releases/download/$pkgver/amavisd-milter-$pkgver.tar.gz
amavisd-milter.initd
amavisd-milter.confd
"
-builddir="$srcdir/$pkgname-$pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index 5171fbda5a..ca585576cf 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -1,9 +1,9 @@
-# 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.48
-pkgrel=2
+pkgver=2.4.51
+pkgrel=1
pkgdesc="A high performance Unix-based HTTP server"
url="https://httpd.apache.org/"
arch="all"
@@ -27,7 +27,7 @@ subpackages="$pkgname-ctl
$pkgname-ssl
$pkgname-utils
$pkgname-webdav"
-source="https://archive.apache.org/dist/$_pkgreal/$_pkgreal-$pkgver.tar.bz2
+source="https://dlcdn.apache.org/$_pkgreal/$_pkgreal-$pkgver.tar.bz2
apache2.confd
apache2.logrotate
apache2.initd
@@ -51,6 +51,17 @@ options="suid"
builddir="$srcdir"/$_pkgreal-$pkgver
# secfixes:
+# 2.4.51-r0:
+# - CVE-2021-42013
+# 2.4.50-r0:
+# - CVE-2021-41524
+# - CVE-2021-41773
+# 2.4.49-r0:
+# - CVE-2021-40438
+# - CVE-2021-39275
+# - CVE-2021-36160
+# - CVE-2021-34798
+# - CVE-2021-33193
# 2.4.48-r0:
# - CVE-2019-17657
# - CVE-2020-13938
@@ -367,7 +378,7 @@ _lua() {
_load_mods
}
sha512sums="
-6c250626f1e7d10428a92d984fd48ff841effcc8705f7816ab71b681bbd51d0012ad158dcd13763fe7d630311f2de258b27574603140d648be42796ab8326724 httpd-2.4.48.tar.bz2
+9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66 httpd-2.4.51.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 599afbdcb5..6bd813c552 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,23 +1,26 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
pkgver=2.12.7
-pkgrel=1
+pkgrel=3
pkgdesc="Alpine Package Keeper - package manager for alpine"
arch="all"
url="https://gitlab.alpinelinux.org/alpine/apk-tools"
license="GPL-2.0-only"
-subpackages="$pkgname-dev $pkgname-static $pkgname-doc $pkgname-zsh-completion"
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-static $pkgname-doc $pkgname-zsh-completion"
# Musl 1.2 introduced new ABI for time64 => upgrading apk-tools
# while staying on musl <1.2 causes missing symbols
depends="musl>=1.2"
makedepends_build="openssl lua5.3 lua5.3-lzlib scdoc"
-makedepends_host="zlib-dev openssl-dev zlib-static openssl-libs-static linux-headers"
+makedepends_host="zlib-dev openssl1.1-compat-dev zlib-static openssl1.1-compat-libs-static linux-headers"
makedepends="$makedepends_build $makedepends_host"
_lua="no"
if [ "$CBUILD" = "$CHOST" ]; then
_lua="lua5.3"
subpackages="$subpackages $_lua-apk:luaapk"
makedepends="$makedepends $_lua-dev"
+
+ # ca-certificates-bundle needed for https certificate validation
+ depends="$depends ca-certificates-bundle"
fi
source="https://gitlab.alpinelinux.org/alpine/$pkgname/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz
_apk
diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD
index fc6efbe259..265e51151a 100644
--- a/main/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apr-util
pkgver=1.6.1
-pkgrel=9
+pkgrel=11
pkgdesc="The Apache Portable Runtime Utility Library"
url="http://apr.apache.org/"
arch="all"
license="Apache-2.0"
subpackages="$pkgname-dev $pkgname-dbd_pgsql $pkgname-dbd_mysql
$pkgname-dbd_sqlite3 $pkgname-ldap"
-depends_dev="expat-dev openldap-dev sqlite-dev postgresql-dev
+depends_dev="expat-dev openldap-dev sqlite-dev libpq-dev
openssl1.1-compat-dev mariadb-dev"
makedepends="$depends_dev apr-dev bash chrpath openssl"
source="https://www.apache.org/dist/apr/apr-util-$pkgver.tar.bz2
diff --git a/main/arm-trusted-firmware/APKBUILD b/main/arm-trusted-firmware/APKBUILD
index 3532ddcfbb..a7354ff000 100644
--- a/main/arm-trusted-firmware/APKBUILD
+++ b/main/arm-trusted-firmware/APKBUILD
@@ -3,12 +3,12 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=arm-trusted-firmware
pkgver=2.5
-pkgrel=1
+pkgrel=3
pkgdesc="ARM Trusted Firmware-A (TF-A)"
url="https://github.com/ARM-software/arm-trusted-firmware"
arch="aarch64"
license="BSD-3-Clause"
-makedepends="dtc openssl-dev gcc-arm-none-eabi"
+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"
options="!check" # No tests
diff --git a/main/asciidoc/APKBUILD b/main/asciidoc/APKBUILD
index 2a6e892c78..9aafab2c19 100644
--- a/main/asciidoc/APKBUILD
+++ b/main/asciidoc/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=asciidoc
-pkgver=9.1.0
+pkgver=9.1.1
pkgrel=0
pkgdesc="Text based documentation"
url="https://asciidoc.org/"
@@ -40,4 +40,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="c4565cfb30a8789ed64b7b9293019a6528eb93341ab109c9a6cb4985bf4a65117516e03b84340eb84ea07981650f50f52c0ae85eba2956fcbde23e46b3cf228e asciidoc-9.1.0.tar.gz"
+sha512sums="
+444de69e3b87af984327873d5be1162157db5f7fb353e1fbbd24b4938ce0238fd474a67c9d3461fb7b069e7b029c63fbaf1ba8dd9cf7b91fbfa81e5429db404c asciidoc-9.1.1.tar.gz
+"
diff --git a/main/asciidoctor/APKBUILD b/main/asciidoctor/APKBUILD
index f139c3661a..c5de7d3d92 100644
--- a/main/asciidoctor/APKBUILD
+++ b/main/asciidoctor/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=asciidoctor
pkgver=2.0.16
-pkgrel=0
+pkgrel=1
pkgdesc="Converter for AsciiDoc to HTML5, DocBook 5 (or 4.5) and other formats"
url="https://rubygems.org/gems/$pkgname"
arch="noarch"
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index c06db3c38b..80dc4cecdd 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=asterisk
pkgver=18.2.2
-pkgrel=4
+pkgrel=5
pkgdesc="Modular Open Source PBX System"
pkgusers="asterisk"
pkggroups="asterisk"
@@ -39,7 +39,7 @@ makedepends="
opusfile-dev
pjproject-dev
popt-dev
- postgresql-dev
+ libpq-dev
spandsp-dev
speexdsp-dev
speex-dev
@@ -59,10 +59,12 @@ subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc
$pkgname-speex $pkgname-opus $pkgname-alsa $pkgname-cdr-mysql:cdr_mysql
$pkgname-openrc"
+# Using commit from https://github.com/traud/asterisk-opus/commits/asterisk-13.7
+_opus_commit=90e8780faccc79e68c07775c6ab2fe1ffaccfa08
_download="https://downloads.asterisk.org/pub/telephony/asterisk/releases"
source="$_download/asterisk-$pkgver.tar.gz
https://dev.alpinelinux.org/~tteras/asterisk-addon-mp3-r201.patch.gz
- https://github.com/traud/asterisk-opus/archive/asterisk-13.7.tar.gz
+ asterisk-13.7-$_opus_commit.tar.gz::https://github.com/traud/asterisk-opus/archive/$_opus_commit.tar.gz
10-musl-mutex-init.patch
20-musl-astmm-fix.patch
30-asterisk-mariadb.patch
@@ -238,7 +240,7 @@ sound_en() {
sha512sums="
e15fe3c7f46d49991bcb6f6f565f15e4af0d658b4cd6b091079209dd95a8027858effdc2f2314d72ed46a73cdebc089d3c27d5cf8db50d2d21f3c317a8a4a546 asterisk-18.2.2.tar.gz
aacef3f4796fb1abd33266998b53909cb4b36e7cc5ad2f7bac68bdc43e9a9072d9a4e2e7e681bddfa31f3d04575eb248afe6ea95da780c67e4829c1e22adfe1b asterisk-addon-mp3-r201.patch.gz
-156fa77b2864c439fbdfd4be302657dc8264bfc1d5a8f3647a9a5184f5c8651913038dc917db0d2d396dc173d6f1491065a7c81e25b2a67e1bea22c79f5b640e asterisk-13.7.tar.gz
+69d82b878728f99b7bf7e862025cbc01aa5b6b9332a5372059ea89a788c66fd351f1103989b3573a7a4ba9ff533f3ee2ff5d88de938440e05d6246e41a882306 asterisk-13.7-90e8780faccc79e68c07775c6ab2fe1ffaccfa08.tar.gz
771237ba6d42ab62d914f2702234b23fd0bc8c22f2aa33b0e745c9170163c8046f6d48ecb299faab3d6fb397f1aa046421083c3cc88510c9779861c522f357dd 10-musl-mutex-init.patch
0fae11b42894ab3d405bc50e9275b9084712b482fbf9b4259ea938667fc5cbe413655f3ff83da0f607151bb2b6e49c2f741b5ada6944dbb478f076ef8d86380a 20-musl-astmm-fix.patch
616de74bdd3c4a6e899128c73e31f5ff219095d2afe321f85a51f518ec2e9dac9b63396eed8e2568c295f1beb90f9a506c72d28211a973b35185bfffd24af37e 30-asterisk-mariadb.patch
diff --git a/main/at-spi2-core/APKBUILD b/main/at-spi2-core/APKBUILD
index b48ee4deaf..3a811bfadd 100644
--- a/main/at-spi2-core/APKBUILD
+++ b/main/at-spi2-core/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=at-spi2-core
-pkgver=2.40.3
+pkgver=2.42.0
pkgrel=0
pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
url="https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/"
@@ -28,5 +28,5 @@ package() {
}
sha512sums="
-85adf3da0a369d7f3481646a495a9c4c3337da3ae6a20ce8c924f8621d3d6ed1d9461bfac0e821dfe86e4ad6b930e4fd65d24c26401cbea644ef4951e5dda5ce at-spi2-core-2.40.3.tar.xz
+befcab94b3aa99471723238d9666fc6667041b058a2bac3b012cfa15a91950996431296f33c921764e0ec4ffd0cc41ebe00be461a8460d6f4d2bafff19a38e10 at-spi2-core-2.42.0.tar.xz
"
diff --git a/main/attr/APKBUILD b/main/attr/APKBUILD
index c56e5ecb9d..60ce2f2c18 100644
--- a/main/attr/APKBUILD
+++ b/main/attr/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=attr
pkgver=2.5.1
-pkgrel=0
+pkgrel=1
pkgdesc="utilities for managing filesystem extended attributes"
options="checkroot !check" # attr.test fails with no error message
url="https://savannah.nongnu.org/projects/attr"
@@ -28,7 +28,7 @@ build() {
--libexecdir=/usr/lib \
--includedir=/usr/include \
--mandir=/usr/share/man \
- --docdir=/usr/share/doc \
+ --docdir=/usr/share/doc/attr \
--datadir=/usr/share \
--disable-nls \
--disable-static
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/awall/APKBUILD b/main/awall/APKBUILD
index 013c1709b3..c0cfe597d2 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.0
+pkgver=1.11.0
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="
-ef846cf04221d0c6474992d1a31465693988afbdd18d02652566abe704b282674044b6c818d9c35fdc6aa456a5e04fdba00154969a716e20e935b9cd5027ec52 awall-v1.10.0.tar.bz2
+7d72ded795dfa3a4705b7d906cbdbd48521c4d1cc448ea7a2f83a81906314ea4cf78d7430eb13a06bfafaf994839aa727c53286f7a9aceb4ae1309d51bdfb46c awall-v1.11.0.tar.bz2
e83ea3281c298092530e45fa5b62f6f85b9e5109b11e109799465ea832608294c7d9c4c3f5b0f321dfc0e82040daf3a17d066e9dea65cb0dbae2c453ea9e62cd awall-init
1cd4b7fa5fc6c9ac6667dff5cc00d96a3cc42aaccafe3c5562d3dcfd9f22ddec9cfe5a9339fee8001b67ccb8e8b81c9417f39a461e5052af9bf74a2753559bf7 setup-firewall
"
diff --git a/main/axel/APKBUILD b/main/axel/APKBUILD
index 5fbda1de91..3f2ee25250 100644
--- a/main/axel/APKBUILD
+++ b/main/axel/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=axel
pkgver=2.17.10
-pkgrel=1
+pkgrel=2
pkgdesc="A multiple-connection concurrent downloader"
url="https://github.com/axel-download-accelerator/axel"
arch="all"
options="!check" # has no checks
license="GPL-2.0-or-later WITH OpenSSL-Exception"
-makedepends="openssl-dev"
+makedepends="openssl1.1-compat-dev"
subpackages="$pkgname-doc"
source="$url/releases/download/v$pkgver/axel-$pkgver.tar.xz"
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index 578120e2b6..0bb20c11ac 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="Enterprise ready, network based backup program"
url="https://www.bacula.org"
#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 postgresql-dev
- sqlite-dev zlib-dev lzo-dev acl-dev postgresql"
+makedepends="autoconf automake libtool mariadb-connector-c-dev ncurses-dev openssl1.1-compat-dev libpq-dev
+ sqlite-dev zlib-dev lzo-dev acl-dev"
install="$pkgname.pre-install $pkgname.post-upgrade"
subpackages="$pkgname-doc $pkgname-mysql $pkgname-pgsql $pkgname-sqlite
$pkgname-client-openrc:client_openrc $pkgname-client $pkgname-libs
diff --git a/main/bats/APKBUILD b/main/bats/APKBUILD
index 2920281f41..39d28860cd 100644
--- a/main/bats/APKBUILD
+++ b/main/bats/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Jose-Luis Rivas <ghostbar@riseup.net>
pkgname=bats
-pkgver=1.4.1
+pkgver=1.5.0
pkgrel=0
pkgdesc="Bash Automated Testing System"
options="!check" # Test passes CI/locally, fails on builders
@@ -20,5 +20,5 @@ package() {
./install.sh "$pkgdir"/usr
}
sha512sums="
-c8d7cb2c088a8bfbe5fa639be6b5d0eeb89f273dea4bbc0a004e0f62f43222418b002c20f229be69b84f0e94bab5bf9a0d10d7bb1acde33a373fb79ab9ac4c83 bats-1.4.1.zip
+4e0b4adbc6ae7d40cbeb353d856dd919485838f9ee1eca5fb6747bcdd7b88f4eda673005ab735e104c9e8c5740cd2357b955e31b3769cb1c2561564e7369179d bats-1.5.0.zip
"
diff --git a/main/bctoolbox/APKBUILD b/main/bctoolbox/APKBUILD
index b6ecac9c8d..295725da6e 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.18
+pkgver=5.0.55
pkgrel=0
pkgdesc="Utilities library used by Belledonne Communications softwares like belle-sip, mediastreamer2 and linphone"
url="https://github.com/BelledonneCommunications/bctoolbox"
@@ -10,8 +10,7 @@ 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 \
@@ -47,6 +46,5 @@ dev() {
}
sha512sums="
-a9ad056b75369921718db2ae746dd708981767e68947352f7b874591253a620626abf9036a3abef084c0da67fe03b03949b71d42ed250712395c4ef7c66baecb bctoolbox-5.0.18.tar.gz
-466d2a7aa33952c8086c698030af0addc79373aa31104cbe6133d352682439ae5c30055ea4f162cc9b6b9fc54bf3dea0ddcff78e0042e7ce43833d82b9487116 cmake-bcunit-fix.patch
+d03dad7c038b59048a4d43f2b3aa33e4f0493b1abc3537ac338cef3cf3d17034876ba11e8e036a1ae8bc802ecb8a7a37facf95d2f44d756f8194512e7771ceda bctoolbox-5.0.55.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/bind/APKBUILD b/main/bind/APKBUILD
index 4ed51c79be..1f2603b187 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.22
_ver=${pkgver%_p*}
_p=${pkgver#*_p}
_major=${pkgver%%.*}
[ "$_p" != "$pkgver" ] && _ver="$_ver-P$_p"
-pkgrel=2
+pkgrel=4
pkgdesc="The ISC DNS server"
url="https://www.isc.org/"
arch="all"
@@ -34,7 +34,7 @@ makedepends="
libxml2-dev
linux-headers
openldap-dev
- openssl-dev
+ openssl1.1-compat-dev
perl
protobuf-c-dev
$_py3deps
@@ -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
+586fb4d5a656d6539033dcdfdd230b36465a2d2e6ada651c1f1548d062a9050e7a962af87e2a56931fe24c65586d29012d4a041dcddbb28f42b4d01fe291d9d1 bind-9.16.22.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/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch b/main/binutils/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
index 5de937f4fc..6e1fa7731c 100644
--- a/main/binutils/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+++ b/main/binutils/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
@@ -1,39 +1,24 @@
-From b1faf99f3e546df2cd302bb1ad36a2078224fe8b Mon Sep 17 00:00:00 2001
+From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 30 Oct 2020 16:59:48 -0600
+Date: Tue, 21 Sep 2021 14:53:13 +0000
Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
libraries"
+This revert is needed to avoid wrongly tagging objects with the incompatible
+IBM long double ABI, which is not supported by musl and will result in
+linking errors if used.
+
This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
---
- bfd/ChangeLog | 6 ------
- bfd/elf32-tic6x.c | 3 ---
- ld/ChangeLog | 6 ------
- ld/ldlang.c | 9 ++++-----
- 4 files changed, 4 insertions(+), 20 deletions(-)
+ bfd/elf32-tic6x.c | 3 ---
+ ld/ldlang.c | 10 ++++------
+ 2 files changed, 4 insertions(+), 9 deletions(-)
-diff --git a/bfd/ChangeLog b/bfd/ChangeLog
-index 9fac12538a..b5461494e8 100644
---- a/bfd/ChangeLog
-+++ b/bfd/ChangeLog
-@@ -1422,12 +1422,6 @@
- accessing root.u.def of symbols. Also check root.u.def.section
- is non-NULL. Reverse tests so as to make the logic positive.
-
--2020-05-01 Alan Modra <amodra@gmail.com>
--
-- PR 25882
-- * elf32-tic6x.c (elf32_tic6x_merge_attributes): Don't transfer
-- Tag_ABI_PIC or Tag_ABI_PID from dynamic objects to the output.
--
- 2020-05-01 Alan Modra <amodra@gmail.com>
-
- PR 25882
diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
-index b8b916bfd3..91bb6a10b1 100644
+index 5754f3cb860..3ad1d612749 100644
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
-@@ -3748,9 +3748,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
+@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
case Tag_ABI_PIC:
case Tag_ABI_PID:
@@ -43,36 +28,20 @@ index b8b916bfd3..91bb6a10b1 100644
if (out_attr[i].i > in_attr[i].i)
out_attr[i].i = in_attr[i].i;
break;
-diff --git a/ld/ChangeLog b/ld/ChangeLog
-index 4eec7d2977..b93452f70c 100644
---- a/ld/ChangeLog
-+++ b/ld/ChangeLog
-@@ -1319,12 +1319,6 @@
- * testsuite/ld-aarch64/farcall-group.d: New test driver.
- * testsuite/ld-aarch64/aarch64-elf.exp: Run the new test.
-
--2020-05-01 Alan Modra <amodra@gmail.com>
--
-- PR 25882
-- * ldlang.c (lang_check): Call bfd_merge_private_bfd_data for
-- shared libraries.
--
- 2020-05-01 Alan Modra <amodra@gmail.com>
-
- * po/BLD-POTFILES.in: Regenerate.
diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 9977195074..173d8ec349 100644
+index 37b64c89ee1..f13beaef9d9 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
-@@ -6972,12 +6972,11 @@ lang_check (void)
+@@ -7071,13 +7071,11 @@ lang_check (void)
bfd_printable_name (input_bfd), input_bfd,
bfd_printable_name (link_info.output_bfd));
}
-
- /* If the input bfd has no contents, it shouldn't set the
- private data of the output bfd. */
-- else if ((input_bfd->flags & DYNAMIC) != 0
-- || bfd_count_sections (input_bfd) != 0)
+- else if (!file->flags.just_syms
+- && ((input_bfd->flags & DYNAMIC) != 0
+- || bfd_count_sections (input_bfd) != 0))
+ else if (bfd_count_sections (input_bfd))
{
+ /* If the input bfd has no contents, it shouldn't set the
@@ -82,5 +51,5 @@ index 9977195074..173d8ec349 100644
/* If we aren't supposed to warn about mismatched input
--
-2.29.2
+2.33.0
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index 79c74bfe8b..fa65f83000 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -1,7 +1,8 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=binutils
-pkgver=2.35.2
-pkgrel=2
+pkgver=2.37
+pkgrel=3
pkgdesc="Tools necessary to build programs"
url="https://www.gnu.org/software/binutils/"
makedepends_build="bison flex texinfo"
@@ -15,8 +16,9 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
gold-mips.patch
ld-bfd-mips.patch
0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
- CVE-2021-3487.patch
binutils-mips-disable-assert.patch
+ bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
+ defang-no-split.patch
"
builddir="$srcdir/$pkgname-$pkgver"
@@ -46,10 +48,12 @@ build() {
local _cross_configure="--enable-install-libiberty --enable-shared"
local _arch_configure=""
local _gold_configure="--disable-gold"
+ local _plugin_configure="--enable-plugins"
if [ "$CHOST" != "$CTARGET" ]; then
_sysroot="$CBUILDROOT"
_cross_configure="--disable-install-libiberty"
+ _plugin_configure="--disable-plugins"
fi
if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
@@ -82,7 +86,7 @@ build() {
--enable-ld=default \
$_gold_configure \
--enable-64-bit-bfd \
- --enable-plugins \
+ $_plugin_configure \
--enable-relro \
--enable-deterministic-archives \
$_cross_configure \
@@ -107,6 +111,7 @@ package() {
# with the native tools, or other cross tools
rm -r "${pkgdir:?}"/usr/share
rm -f "$pkgdir"/usr/lib/libiberty.a
+ rm -r "${pkgdir:?}"/usr/lib/bfd-plugins
fi
}
@@ -129,11 +134,12 @@ gold() {
}
sha512sums="
-9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz
+5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz
ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49 binutils-ld-fix-static-linking.patch
f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f gold-mips.patch
314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d ld-bfd-mips.patch
-642c617db6c6e491f78f053d60f3aa369bad7bf8c1bc7ce267de6cf8fddf6c0d4cf63ce8c8f6e2f225dedbce7cb930d8e87e168fd8f72ca0837c77266ee2b5f8 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-b08384ed124a74ad3a424db370c107230f09a54378502ca4385deb738f7cf799857f2af0db52709c7eeab8fa6c0a3d972f891396cce1e2834a21f67682fc4355 CVE-2021-3487.patch
+70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f binutils-mips-disable-assert.patch
+10a0074583d2cc4598710c7e434ba7088da074b105f4f5e951fc61af7150ad62adf60a7c98f6fd13b1771f169e45a5a1ef618240c6893d3f0f3d93fd768a03c6 bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
+4652f092c9376f0cb7fd6c72cb37ff7c15c1c6e3408fac79329b7f41a7925c98eb35989a9a040682130988a36401901d6d95afa44f0ce50caa85ee478db6bf03 defang-no-split.patch
"
diff --git a/main/binutils/CVE-2021-3487.patch b/main/binutils/CVE-2021-3487.patch
deleted file mode 100644
index db99ae73d9..0000000000
--- a/main/binutils/CVE-2021-3487.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 647cebce12a6b0a26960220caff96ff38978cf24 Mon Sep 17 00:00:00 2001
-From: Nick Clifton <nickc@redhat.com>
-Date: Thu, 26 Nov 2020 17:08:33 +0000
-Subject: [PATCH] Prevent a memory allocation failure when parsing corrupt
- DWARF debug sections.
-
- PR 26946
- * dwarf2.c (read_section): Check for debug sections with excessive
- sizes.
-
-diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
-index 977bf43a6a1..8bbfc81d3e7 100644
---- a/bfd/dwarf2.c
-+++ b/bfd/dwarf2.c
-@@ -531,22 +531,24 @@ read_section (bfd * abfd,
- bfd_byte ** section_buffer,
- bfd_size_type * section_size)
- {
-- asection *msec;
- const char *section_name = sec->uncompressed_name;
- bfd_byte *contents = *section_buffer;
-- bfd_size_type amt;
-
- /* The section may have already been read. */
- if (contents == NULL)
- {
-+ bfd_size_type amt;
-+ asection *msec;
-+ ufile_ptr filesize;
-+
- msec = bfd_get_section_by_name (abfd, section_name);
-- if (! msec)
-+ if (msec == NULL)
- {
- section_name = sec->compressed_name;
- if (section_name != NULL)
- msec = bfd_get_section_by_name (abfd, section_name);
- }
-- if (! msec)
-+ if (msec == NULL)
- {
- _bfd_error_handler (_("DWARF error: can't find %s section."),
- sec->uncompressed_name);
-@@ -554,12 +556,23 @@ read_section (bfd * abfd,
- return FALSE;
- }
-
-- *section_size = msec->rawsize ? msec->rawsize : msec->size;
-+ amt = bfd_get_section_limit_octets (abfd, msec);
-+ filesize = bfd_get_file_size (abfd);
-+ if (amt >= filesize)
-+ {
-+ /* PR 26946 */
-+ _bfd_error_handler (_("DWARF error: section %s is larger than its filesize! (0x%lx vs 0x%lx)"),
-+ section_name, (long) amt, (long) filesize);
-+ bfd_set_error (bfd_error_bad_value);
-+ return FALSE;
-+ }
-+ *section_size = amt;
- /* Paranoia - alloc one extra so that we can make sure a string
- section is NUL terminated. */
-- amt = *section_size + 1;
-+ amt += 1;
- if (amt == 0)
- {
-+ /* Paranoia - this should never happen. */
- bfd_set_error (bfd_error_no_memory);
- return FALSE;
- }
---
-2.27.0
-
diff --git a/main/binutils/bfd-close-file-desriptor-if-there-is-no-archive-fd.patch b/main/binutils/bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
new file mode 100644
index 0000000000..357d0f9701
--- /dev/null
+++ b/main/binutils/bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
@@ -0,0 +1,234 @@
+Upstream: yes
+URL: https://sourceware.org/bugzilla/show_bug.cgi?id=28138
+From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Mon, 26 Jul 2021 05:59:55 -0700
+Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd
+
+Close the file descriptor if there is no archive plugin file descriptor
+to avoid running out of file descriptors on thin archives with many
+archive members.
+
+bfd/
+
+ PR ld/28138
+ * plugin.c (bfd_plugin_close_file_descriptor): Close the file
+ descriptor there is no archive plugin file descriptor.
+
+ld/
+
+ PR ld/28138
+ * testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for
+ native build.
+
+ PR ld/28138
+ * testsuite/ld-plugin/lto.exp: Run ld/28138 tests.
+ * testsuite/ld-plugin/pr28138.c: New file.
+ * testsuite/ld-plugin/pr28138-1.c: Likewise.
+ * testsuite/ld-plugin/pr28138-2.c: Likewise.
+ * testsuite/ld-plugin/pr28138-3.c: Likewise.
+ * testsuite/ld-plugin/pr28138-4.c: Likewise.
+ * testsuite/ld-plugin/pr28138-5.c: Likewise.
+ * testsuite/ld-plugin/pr28138-6.c: Likewise.
+ * testsuite/ld-plugin/pr28138-7.c: Likewise.
+
+(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742)
+(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2)
+---
+ bfd/plugin.c | 8 +++++++
+ ld/testsuite/ld-plugin/lto.exp | 34 ++++++++++++++++++++++++++++++
+ ld/testsuite/ld-plugin/pr28138-1.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-2.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-3.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-4.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-5.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-6.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-7.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138.c | 20 ++++++++++++++++++
+ 10 files changed, 104 insertions(+)
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138.c
+
+diff --git a/bfd/plugin.c b/bfd/plugin.c
+index 6cfa2b66470..3bab8febe88 100644
+--- a/bfd/plugin.c
++++ b/bfd/plugin.c
+@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd)
+ && !bfd_is_thin_archive (abfd->my_archive))
+ abfd = abfd->my_archive;
+
++ /* Close the file descriptor if there is no archive plugin file
++ descriptor. */
++ if (abfd->archive_plugin_fd == -1)
++ {
++ close (fd);
++ return;
++ }
++
+ abfd->archive_plugin_fd_open_count--;
+ /* Dup the archive plugin file descriptor for later use, which
+ will be closed by _bfd_archive_close_and_cleanup. */
+diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
+index def69e43ab3..999d911ce6a 100644
+--- a/ld/testsuite/ld-plugin/lto.exp
++++ b/ld/testsuite/ld-plugin/lto.exp
+@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } {
+ }
+ }
+
++run_cc_link_tests [list \
++ [list \
++ "Build pr28138.a" \
++ "-T" "" \
++ {pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \
++ pr28138-6.c pr28138-7.c} {} "pr28138.a" \
++ ] \
++ [list \
++ "Build pr28138.o" \
++ "" "" \
++ {pr28138.c} {} \
++ ] \
++]
++
++set exec_output [run_host_cmd "sh" \
++ "-c \"ulimit -n 20; \
++ $CC -Btmpdir/ld -o tmpdir/pr28138 \
++ tmpdir/pr28138.o tmpdir/pr28138.a\""]
++set exec_output [prune_warnings $exec_output]
++if [string match "" $exec_output] then {
++ if { [isnative] } {
++ set exec_output [run_host_cmd "tmpdir/pr28138" ""]
++ if [string match "PASS" $exec_output] then {
++ pass "PR ld/28138"
++ } else {
++ fail "PR ld/28138"
++ }
++ } else {
++ pass "PR ld/28138"
++ }
++} else {
++ fail "PR ld/28138"
++}
++
+ set testname "Build liblto-11.a"
+ remote_file host delete "tmpdir/liblto-11.a"
+ set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
+diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c
+new file mode 100644
+index 00000000000..51d119e1642
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-1.c
+@@ -0,0 +1,6 @@
++extern int a0(void);
++int
++a1(void)
++{
++ return 1 + a0();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c
+new file mode 100644
+index 00000000000..1120cd797e9
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-2.c
+@@ -0,0 +1,6 @@
++extern int a1(void);
++int
++a2(void)
++{
++ return 1 + a1();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c
+new file mode 100644
+index 00000000000..ec464947ee6
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-3.c
+@@ -0,0 +1,6 @@
++extern int a2(void);
++int
++a3(void)
++{
++ return 1 + a2();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c
+new file mode 100644
+index 00000000000..475701b2c5c
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-4.c
+@@ -0,0 +1,6 @@
++extern int a3(void);
++int
++a4(void)
++{
++ return 1 + a3();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c
+new file mode 100644
+index 00000000000..e24f86c363e
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-5.c
+@@ -0,0 +1,6 @@
++extern int a4(void);
++int
++a5(void)
++{
++ return 1 + a4();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c
+new file mode 100644
+index 00000000000..b5b938bdb21
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-6.c
+@@ -0,0 +1,6 @@
++extern int a5(void);
++int
++a6(void)
++{
++ return 1 + a5();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c
+new file mode 100644
+index 00000000000..4ef75bf0f0c
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-7.c
+@@ -0,0 +1,6 @@
++extern int a6(void);
++int
++a7(void)
++{
++ return 1 + a6();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c
+new file mode 100644
+index 00000000000..68252c9f382
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138.c
+@@ -0,0 +1,20 @@
++#include <stdio.h>
++
++extern int a7(void);
++
++int
++a0(void)
++{
++ return 0;
++}
++
++int
++main()
++{
++ if (a7() == 7)
++ {
++ printf ("PASS\n");
++ return 0;
++ }
++ return 1;
++}
+--
+2.27.0
+
diff --git a/main/binutils/defang-no-split.patch b/main/binutils/defang-no-split.patch
new file mode 100644
index 0000000000..cea68edc5d
--- /dev/null
+++ b/main/binutils/defang-no-split.patch
@@ -0,0 +1,38 @@
+From 2dad02b6d46eef438cbd14d8511487b056628a38 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <siarheit@google.com>
+Date: Mon, 26 Jul 2021 22:51:18 +0100
+Subject: [PATCH 1/1] texi2pod.pl: add no-op --no-split option support
+ [PR28144]
+
+Change 2faf902da ("generate single html manual page by default")
+added use of --no-split option to makeinfo. binutils reuses
+makeinfo options for texi2pod.pl wrapper. Unsupported option
+led to silent manpage truncation.
+
+The change adds no-op option support.
+
+etc/
+ PR 28144
+ * texi2pod.pl: Handle no-op --no-split option.
+
+(cherry picked from commit 96a7037cd8573cf065aa6b12baca68696f96d9ca)
+---
+ etc/texi2pod.pl | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/etc/texi2pod.pl b/etc/texi2pod.pl
+index 11f70d156be..dcf2b437640 100644
+--- a/etc/texi2pod.pl
++++ b/etc/texi2pod.pl
+@@ -59,6 +59,8 @@ while ($_ = shift) {
+ $flag = shift;
+ }
+ push (@ipath, $flag);
++ } elsif (/^--no-split$/) {
++ # ignore option for makeinfo compatibility
+ } elsif (/^-/) {
+ usage();
+ } else {
+--
+2.27.0
+
diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD
index e94262ac2d..711729bc36 100644
--- a/main/bluez/APKBUILD
+++ b/main/bluez/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bluez
-pkgver=5.60
-pkgrel=3
+pkgver=5.62
+pkgrel=0
pkgdesc="Tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
arch="all"
@@ -47,8 +47,8 @@ source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz
"
case "$CARCH" in
-# crypto tests assume little-endian
-mips*) options="!check";;
+ # crypto tests assume little-endian
+ mips*) options="!check";;
esac
# secfixes:
@@ -57,6 +57,7 @@ esac
prepare() {
default_prepare
+
autoreconf -vif
}
@@ -155,6 +156,9 @@ plugins() {
pkgdesc="Bluez plugins (PS3 Sixaxis controller)"
cd "$builddir"
make DESTDIR="$subpkgdir" install-pluginLTLIBRARIES
+
+ # These are installed but should not be part of this package
+ rm $subpkgdir/usr/lib/libbluetooth.so*
}
openrc() {
@@ -183,7 +187,7 @@ openrc() {
}
sha512sums="
-069e054360b4ab72f1daa033572f0fd822fb0f47e52069f4f3dcdfecfa312b9a5366cc04967e639aef39b980c0e1007389f1ee757e7c3bae43a5e66f8ed21a6b bluez-5.60.tar.xz
+8fb0b81e1d929d3eee3d70f457ce75dbcff4c2a8a728247fc950bbe11e84d83582345bfd433d2e2df7b5588eb0e42f286658a83c7332be84819d9df49a5707e8 bluez-5.62.tar.xz
e1d64fac673cceb657684b1bc5c36ff6d05f7cc5832d940863129adacd5b8ade1315b14df039a61f061950ac99e155266530efe2d2d35ea3c145b0469698a726 bluetooth.initd
8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd
a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd
diff --git a/main/boost1.75/APKBUILD b/main/boost1.75/APKBUILD
deleted file mode 100644
index 92da12900c..0000000000
--- a/main/boost1.75/APKBUILD
+++ /dev/null
@@ -1,193 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=boost1.75
-pkgver=1.75.0
-_pkgver="${pkgver//./_}"
-pkgrel=8
-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
- "
-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
- boost-context-mips-softfloat.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 || :
-}
-
-_pyversion() {
- "$1" -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))'
-}
-
-sha512sums="
-d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a boost_1_75_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
-1ace57c256017a99f84cdd32fedca0ade12b1666edf3c8e2465e6f01a95ee978b9eea010917787997d81ad7832f06dd25ff392d6a83cb12398e546d5b9eceadd boost-context-mips-softfloat.patch
-debb898a9d2295a4480a32bec69a77c6e8d5dc094b0be39df1f1afc3a0f610fe916c59be1304bc904ad74440f93a224e4b138c60a5f0253143c9eb5db973cd2b build-undefine-statx-syscall.patch
-"
diff --git a/main/boost1.75/boost-context-mips-softfloat.patch b/main/boost1.75/boost-context-mips-softfloat.patch
deleted file mode 100644
index 38e2b52b09..0000000000
--- a/main/boost1.75/boost-context-mips-softfloat.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -urN boost_1_72_0.orig/libs/context/src/asm/jump_mips64_n64_elf_gas.S boost_1_72_0/libs/context/src/asm/jump_mips64_n64_elf_gas.S
---- boost_1_72_0.orig/libs/context/src/asm/jump_mips64_n64_elf_gas.S 2021-01-15 02:29:42.053471423 -0700
-+++ boost_1_72_0/libs/context/src/asm/jump_mips64_n64_elf_gas.S 2021-01-15 02:31:15.297335652 -0700
-@@ -67,7 +67,7 @@
- sd $ra, 144($sp) # save RA
- sd $ra, 152($sp) # save RA as PC
-
--
-+#ifdef __mips_hard_float
- s.d $f24, 0($sp) # save F24
- s.d $f25, 8($sp) # save F25
- s.d $f26, 16($sp) # save F26
-@@ -76,6 +76,7 @@
- s.d $f29, 40($sp) # save F29
- s.d $f30, 48($sp) # save F30
- s.d $f31, 56($sp) # save F31
-+#endif
-
- # store SP (pointing to old context-data) in v0 as return
- move $v0, $sp
-@@ -83,6 +84,7 @@
- # get SP (pointing to new context-data) from a0 param
- move $sp, $a0
-
-+#ifdef __mips_hard_float
- l.d $f24, 0($sp) # restore F24
- l.d $f25, 8($sp) # restore F25
- l.d $f26, 16($sp) # restore F26
-@@ -91,6 +93,7 @@
- l.d $f29, 40($sp) # restore F29
- l.d $f30, 48($sp) # restore F30
- l.d $f31, 56($sp) # restore F31
-+#endif
-
- ld $s0, 64($sp) # restore S0
- ld $s1, 72($sp) # restore S1
-diff -urN boost_1_72_0.orig/libs/context/src/asm/ontop_mips64_n64_elf_gas.S boost_1_72_0/libs/context/src/asm/ontop_mips64_n64_elf_gas.S
---- boost_1_72_0.orig/libs/context/src/asm/ontop_mips64_n64_elf_gas.S 2021-01-15 02:29:42.056804776 -0700
-+++ boost_1_72_0/libs/context/src/asm/ontop_mips64_n64_elf_gas.S 2021-01-15 02:31:48.294188377 -0700
-@@ -67,7 +67,7 @@
- sd $ra, 144($sp) # save RA
- sd $ra, 152($sp) # save RA as PC
-
--
-+#ifdef __mips_hard_float
- s.d $f24, 0($sp) # save F24
- s.d $f25, 8($sp) # save F25
- s.d $f26, 16($sp) # save F26
-@@ -76,6 +76,7 @@
- s.d $f29, 40($sp) # save F29
- s.d $f30, 48($sp) # save F30
- s.d $f31, 56($sp) # save F31
-+#endif
-
- # store SP (pointing to context-data) in t0
- move $t0, $sp
-@@ -83,6 +84,7 @@
- # restore SP (pointing to context-data) from a0
- move $sp, $a0
-
-+#ifdef __mips_hard_float
- l.d $f24, 0($sp) # restore F24
- l.d $f25, 8($sp) # restore F25
- l.d $f26, 16($sp) # restore F26
-@@ -91,6 +93,7 @@
- l.d $f29, 40($sp) # restore F29
- l.d $f30, 48($sp) # restore F30
- l.d $f31, 56($sp) # restore F31
-+#endif
-
- ld $s0, 64($sp) # restore S0
- ld $s1, 72($sp) # restore S1
diff --git a/main/boost1.75/build-undefine-statx-syscall.patch b/main/boost1.75/build-undefine-statx-syscall.patch
deleted file mode 100644
index 4b984f0b34..0000000000
--- a/main/boost1.75/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.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/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.75/0001-revert-cease-dependence-on-range.patch b/main/boost1.77/0001-revert-cease-dependence-on-range.patch
index a6002074ab..a6002074ab 100644
--- a/main/boost1.75/0001-revert-cease-dependence-on-range.patch
+++ b/main/boost1.77/0001-revert-cease-dependence-on-range.patch
diff --git a/main/boost1.76/APKBUILD b/main/boost1.77/APKBUILD
index 42d42f2a81..3f11dede9e 100644
--- a/main/boost1.76/APKBUILD
+++ b/main/boost1.77/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=boost1.76
-pkgver=1.76.0
+pkgname=boost1.77
+pkgver=1.77.0
_pkgver="${pkgver//./_}"
-pkgrel=0
+pkgrel=1
pkgdesc="Free peer-reviewed portable C++ source libraries"
url="https://www.boost.org/"
arch="all"
-license="custom"
+license="BSL-1.0"
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"
@@ -20,7 +20,6 @@ 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
- build-undefine-statx-syscall.patch
"
builddir="$srcdir/boost_$_pkgver"
@@ -218,8 +217,9 @@ _pyversion() {
"$1" -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))'
}
-sha512sums="5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429 boost_1_76_0.tar.bz2
+sha512sums="
+39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f boost_1_77_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.75/boost-1.57.0-python-abi_letters.patch b/main/boost1.77/boost-1.57.0-python-abi_letters.patch
index 7df3ee7047..7df3ee7047 100644
--- a/main/boost1.75/boost-1.57.0-python-abi_letters.patch
+++ b/main/boost1.77/boost-1.57.0-python-abi_letters.patch
diff --git a/main/boost1.75/boost-1.57.0-python-libpython_dep.patch b/main/boost1.77/boost-1.57.0-python-libpython_dep.patch
index 57bfc26774..57bfc26774 100644
--- a/main/boost1.75/boost-1.57.0-python-libpython_dep.patch
+++ b/main/boost1.77/boost-1.57.0-python-libpython_dep.patch
diff --git a/main/botan/APKBUILD b/main/botan/APKBUILD
index 9d6fc3c8a5..3332e06e3e 100644
--- a/main/botan/APKBUILD
+++ b/main/botan/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=botan
pkgver=2.18.1
-pkgrel=1
+pkgrel=4
pkgdesc="Crypto and TLS for C++11"
url="https://botan.randombit.net/"
arch="all"
@@ -10,10 +10,14 @@ license="BSD-2-Clause"
depends_dev="boost-dev bzip2-dev openssl1.1-compat-dev sqlite-dev xz-dev zlib-dev"
makedepends="$depends_dev python3"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-source="https://botan.randombit.net/releases/Botan-$pkgver.tar.xz"
+source="https://botan.randombit.net/releases/Botan-$pkgver.tar.xz
+ dl-exponents.patch
+ CVE-2021-40529.patch"
builddir="$srcdir/Botan-$pkgver"
# secfixes:
+# 2.18.1-r3:
+# - CVE-2021-40529
# 2.17.3-r0:
# - CVE-2021-24115
# 2.9.0-r0:
@@ -57,4 +61,8 @@ package() {
rm -rf "$pkgdir"/usr/lib/python*
}
-sha512sums="2f11d1ab703d977a2d64504d2a2489ce56109a2a6c46c0dc7c8db428470ce511bcc0160f70baedad29237abd5e1622f2c155ea58c4dec4d3ae57ee7b350415c3 Botan-2.18.1.tar.xz"
+sha512sums="
+2f11d1ab703d977a2d64504d2a2489ce56109a2a6c46c0dc7c8db428470ce511bcc0160f70baedad29237abd5e1622f2c155ea58c4dec4d3ae57ee7b350415c3 Botan-2.18.1.tar.xz
+e0d5e2c07d1ea66def33cbf8d64ba87eeb46c10ff0c14a54bc518b87a668a74a184e18b89440a2ef4b78ddf97cb4e2b02f1a70b4bbf705170715e353b2abbddb dl-exponents.patch
+fd5d29ea98de0f0ddc63340270f118a2a633e740d604cf030780fdca46a87733654c38c01f933bb607f92cbb3750250a1af6ef9fe26fec601bbe8c9f079a6660 CVE-2021-40529.patch
+"
diff --git a/main/botan/CVE-2021-40529.patch b/main/botan/CVE-2021-40529.patch
new file mode 100644
index 0000000000..c864ef5838
--- /dev/null
+++ b/main/botan/CVE-2021-40529.patch
@@ -0,0 +1,132 @@
+From 9a23e4e3bc3966340531f2ff608fa9d33b5185a2 Mon Sep 17 00:00:00 2001
+From: Jack Lloyd <jack@randombit.net>
+Date: Tue, 3 Aug 2021 18:20:29 -0400
+Subject: [PATCH] Avoid using short exponents with ElGamal
+
+Some off-brand PGP implementation generates keys where p - 1 is
+smooth, as a result short exponents can leak enough information about
+k to allow decryption.
+---
+ src/lib/pubkey/elgamal/elgamal.cpp | 8 +++-
+ src/tests/data/pubkey/elgamal_decrypt.vec | 45 +++++++++++++++++++++++
+ src/tests/data/pubkey/elgamal_encrypt.vec | 17 ++++++---
+ 3 files changed, 62 insertions(+), 8 deletions(-)
+
+diff --git a/src/lib/pubkey/elgamal/elgamal.cpp b/src/lib/pubkey/elgamal/elgamal.cpp
+index b3ec6df2cb..0e33c2ca5f 100644
+--- a/src/lib/pubkey/elgamal/elgamal.cpp
++++ b/src/lib/pubkey/elgamal/elgamal.cpp
+@@ -113,8 +113,12 @@ ElGamal_Encryption_Operation::raw_encrypt(const uint8_t msg[], size_t msg_len,
+ if(m >= m_group.get_p())
+ throw Invalid_Argument("ElGamal encryption: Input is too large");
+
+- const size_t k_bits = m_group.exponent_bits();
+- const BigInt k(rng, k_bits);
++ /*
++ Some ElGamal implementations foolishly use prime fields where p - 1 is
++ smooth, as a result it is unsafe to use short exponents.
++ */
++ const size_t k_bits = m_group.p_bits() - 1;
++ const BigInt k(rng, k_bits, false);
+
+ const BigInt a = m_group.power_g_p(k, k_bits);
+ const BigInt b = m_group.multiply_mod_p(m, monty_execute(*m_monty_y_p, k, k_bits));
+diff --git a/src/tests/data/pubkey/elgamal_decrypt.vec b/src/tests/data/pubkey/elgamal_decrypt.vec
+index f676be50e7..a9d9dd1679 100644
+--- a/src/tests/data/pubkey/elgamal_decrypt.vec
++++ b/src/tests/data/pubkey/elgamal_decrypt.vec
+@@ -58,3 +58,48 @@ G = 4956716650468111499852968442558584961751486202697832959709919208796153871740
+ X = 4304232149632055597449717737864742436448127103739097
+ Msg = F73BB7E5C8A5619380
+ Ciphertext = C9881464A37749949D66D75CD9B7A8ACAD33DD1FAC7561F684E9CB5343D2ED15969D7EDB4135518B50F0FEC9A9559C1D5E44DAB42C14BBDE2D2711EA4D02D7F27D1A9BCFEC9E8B73FA64BA3C54707FDDE7D5BE695E17FB9D259FB576FD4E57D66C8F727DC236E2A6E9FD01709D34B8D09F7DD3890F003EBE616042B4E0A8A00F6C3F34DE7E002FE72A84AF8D014D64E8CD08B9B56CC3A6BBE6F966B92105A92C5ABF4F2BF735670622F6213FE9739FAD65692E1C0EBF708A47E18600A22972A5A3DA0F22D11C581D46F734151A083FF757E961351EB183B467A859FBB9ED1DAC396FA405701FD6E3A62EB126E93648C3C6DFA9C4DBF3C005880F4799F66B310E
++
++P = 0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF
++G = 0x02
++X = 0xCC13EE3533858E0F0024FFC935DC5BD297DEC9385AC8EF7E
++Msg = 1C
++Ciphertext = D73F6E5CEF558B92C924FEC2329774ACD75E7CEA04D2485F07920EF4E5B86E361E23E42AB6F3A97F5B1F46218BF3C00E93A2EA981B8BB48EDD020A3F96D61FDA0F3E4D26F5538B2179B7D7E333CE78414F18E6CD0AE74C3F44FBFAC9121A3A6CF80C85E89280F9BC476078F9FD686A6500590B1AD75616C0A92BC73838A6D4437368304638242BCD628A72EA432FE7C1892922136B3C19B39990980185328E5BBD35DE42549819C8E301348320BA80602E751172D9ACAA8E0B67FB97996310BC0C14B9E40626FE54138851E4BC4CA4CB2F0A1F3D3F042556A4942B2B03B4C2F75E50260365865FEE0050DAC3604E78708715549FF878F1B337D6ABF8B695462F
++
++P = 0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA237327FFFFFFFFFFFFFFFF
++G = 0x02
++X = 0x8D81343C4994DAF21AD0E6CB88C74F55529925EC953381470B72B3C8
++Msg = 7F0CCACA157707BF03
++Ciphertext = 2EDE1A9F975FCAF943AEEB51EB37EAEDF54C4D939D0DCF7C80874A3BF8601B511685B1FDE52E07D8894EA647C50E480DE7A48ACADD89F79EEB9411234507CE6AB8503BD47B284134E301A78BD7FAC8D8B15A5D1424B820FF3FE1F363FC88FF510183165F52EE022A55EC43D4DD75763297C13F9EE3BCD579ADBA6800348F0C6240F49744B385737926A770EDF67257E7F5654C478C614700B6D2D671A13B28006C11C499BEB29658EF10C3E2EEC390A972372EBF733BA6EE5F4D600AAE1DDDC87EFA6D9FB05CBC995F82C3EF47CF862715E17DF7CC948846E849661D5C82C6A120610D90BB2D373D189A0BF13175F551326ECACF2D349A4BD2D265FDAC716E4B0A5D850E7EDA92CF9F8863BF1CD31C3888BFD81500DA4C615575EE8FA27615EF8E4B9D23A53852B236057E15DA7FC5827668A7B8AA699D3F79201567F4F0DAF7D89919906486A66ABA689FFD9E3BB5F0D1C677CCC12EA29BBFE1083C4FC349EE7E236BC8DC02DEE063E7F7C7B719E3176739D55196A2B7E6C3AA2A543135AB8F
++
++P = 0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AACAA68FFFFFFFFFFFFFFFF
++G = 0x02
++X = 0xA9F666E685F4F0BAFFF22C407B28461591CBF43F8DA1A8C3B1510BB6AA3BCD6C
++Msg = D830F02AA1AE9328CF3F2C6CB7D86875
++Ciphertext = E8AC61EE6EA9DCBEDF5DD10247240E0FF3A6D1B1D2C9832A73C5EF2F96FB23C6FA571F9E407089ADAB459086B4331DBCBB3E5FC69B996748131D0D499EFF4F3654CEF8ED3C14C97C4985E5E0D6E0714E789F9D926CB26A23ACB52D6308CDB3C4DBF92F7A701513B133A0512A0CC16E13BCC7F983BC181C71A42252D48B113BAB4B861430AC6157E3043BD861C44D0804CCBB0B9D5BA599650DABE9FA7BF286EB08A97D11D5F88CB0157A4522E2C9F4EF53EB9D7679974C5AD86554EED49736D0D7B39461B92C73CBBEBAD8E92A6501293AE9A5BF0FBDA11BC743E032F78740F96F8CD71D30EA0F17F42181783C908A6008E339620CCB80226E9CDD7E5D50DEF9310DF03C971955CCF70557C9816049C2137CB7554998BD90B81AD549E9B65347E4BC798039BF05929DED052EE816EA3A87014B0D25E2E279B7736446201F52E542AA6E494BDC6D02A9A0479E1F90D5F3898A36AF7BA03E8F0BCBBF891A1C1B0B300EA664349E765EA331841ABC7963012C623318EF9B681711461ECC83EDC88722DE5E16FF1AB57B23F285CC5E75F6FCB46EEC9F919D1C089E7C045535E64A97F16662DF9CEFFB0E6C9C6402A43E47D1D073A5555A470E2451809234ABFD463A013D70288BA4A093E51FCED6A434886ED70490D63DFD809F27A773CDAC3D848A21C2937CA194C4FFBF8E50C05AEB3A530A7AB8B39B91A72EA45034A2FF8F16B1
++
++P = 0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFCE0FD108E4B82D120A93AD2CAFFFFFFFFFFFFFFFF
++G = 0x02
++X = 0x981606068AE29B5B86E6F1E4E578010E43E1DBCB12504857CA6CDFC77913EFF0B3F563E1DDB40934B4F33099A6BF8EE8
++Msg = 0E738AF35B6AE8951E5C3BF8EB
++Ciphertext = 659C8E28BF6A26E5D55386E437F2B66282EB9F9ECA54522D8A1FDE6BC6C4D65E5412D030BDC9833F93E3653B7B58FFD66A2EBFB8AAF1F7BBB52C3CD43E08DDB3D2C73E26EEA988EEF9CFDC9C59872B4D2454A1F500911B4D3BD3EED99107FAF39D97A3302166AD5B0381ECAB769953406DD3FEB502D23587D9CF2C89F93FE6A73167E3734CD0676EE95F7C43A558A56E7B0264A6084875D1E7F2312FA7BA7145AAA5921F904EDDC7A6EC823C57AFE323E4368CD7D47CAF2F8A94D6D3117A8BE92BAF6F0392A20C7FCFE381789755B7B47B9C5496382FF26533EA7F911472F02E2F9E29CAC9CFF4AEB90C36E55A1AF5D0259B195E2824C7F6B40299D8A0858E162B3D9392E323F62B48DA629089902F16D01D1AB3DCFBAAB46F1E74ECA6560B3A97E85E9B88B8F11AA83F78E8E542B8A3B4C0E7B47220594979BC7DD12E97238EB4B91D23A8F2D5362CB8B08C1F07B3461AD0968FB3053F60ECC2B3C0E900A0A7C2924C3FA79CCB43B33B336B807C6F4B83A7AE0112BD72A13822E3CD0B2E2AF7717F2CB21BE02D8DB0EB3BCCF66836BD83C828C221569EFCAA53124D206CB51D3718BC1511799DEA0558DD6FDBFB06B3D96BAC451FE71A4244BD3CD6826BF27EA3CC7782C17DCAF52EAA944CEA734D011145F10A4132A271349A8BF1ED0D7F7EF2ABC7031475B4397574F8A7EC4F5480D85CF0CA1F7C69097A2A009FFD4927AA769FD821F64741812FE5DB996ECAD3265CE93DBA7B40532A2133FB8EE5066A0C5F91C7E0F3902B6CEA39D5BB4B59B2993B5DAA2B61FF589BF45613D1EF36D5F7D959E8255C0010EC439AAE1C9B682BAC92C2883ED279CD8C644A301150879EB8D37B217B36447CBAC37C132C0278AA8CB38A8596392E3A3CAA91573370ED44DF46311EEE878B63F947F2A28930133D343737502623D0C7D3EA5D8D8123D7963C70AD30CC865BCD68F96C1A13A3484AB4EF3828CE338BF8E087F2300B777D556974D5E23FAFD55AB54353BCA31BEC13003AC7258510578F96B8F1E2254E91768A78CF9FCC6D8CFB0493701D523F75EC25B37B623B5A73A28009DBC169A084E95D
++
++P = 0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199FFFFFFFFFFFFFFFF
++G = 0x02
++X = 0xB73A80EB48DB4DF3108BE1345281A1B39B4373BFE71CB4DA9F3594A94C525E2E288F06089F61C1D29D6A99EA775C05D6
++Msg = D413DAC9D341361F17EDCE1C46A04D343424251B
++Ciphertext = 085E76D450C7FF0B2DB59D41D12596AD1B0D8AF877F5C63416D2B355ED137A5AEAB3B75AC4CBFB5168F37EC02724EA057ED5B9AAF0C40D5469FB9E068C7E090C6EB411CDFBC9A500294E2433A9F879F52F8359B0865128A76801B7C4E22D5A3A6279F755291ECC9454AC3C1F1395DA5FA8E25CD951FCBF9B569EED304B3B82B0198913FAFD0B9A3ED32A64B0E394F96C153D25FBFEF92ECB38F79F2DE12570A041C8B4E8ADB998D6A559BC9640EBA8B61A6D0387CF0CA621B6C3F60D464DE7D27D5347F79CABD09533219DD2CDA8BAB74E886E206409A94054CCF3EBBA570C33FE456BD6B0BEB564F406AF49400550AE01A21A68126C90E0B8295CB7F9C2F4C790D8B0FEFD1FC6BFF40A00737AF9EDA25A1BF00E7FEC8CE776C3D24C61EBF48049CE5B27E024B796566BA670090BAB1A6015C01DB57DFDDAD61240F151C61BC80C3BA320050D1E537D501611627531E41793C3468B87F28BF2281CE996957901BE6CE41FAB0F88467ECBC0DE6C5F60AB5A1AF21A9528B0E8BABAD56FA23F2AD3CBC521A8D54047F15F58FC9C5CD4BB322A0838EDAC053415CFED87FD0756FBFF6B052D385C2EED6FD4686E024F7175A9840DF7E74740FF368DA4DAEB879D7C0D265D51809BD6EC6A66717498A4998D0232586CA4C5F7858EBEC824821CDBD1133DA557612A398EA8F9AC959A39381FCF1D727D08136CAFC4D72E9A945043E6DE2C67F6B55C21B7EDBFDCEA2B63CF9A5BB931DFE76CA2BE5D3D964AA2C348E6DFBA4FFC4D5E463105E243BD20AF38531A70BE1DD4930F998E28C3182665507700976BC14438452179747E623B2E5328A3ED5925FA526AE897ACF67059D76D159CB31D85F03589A4874AB11A7E2BB680FCEF7A4CEBFD98B0DC18BC1AF838524107E3264C2FDACF883ED2701CF3306E83CB8E75F5ED148F3377A77474D47522596F50DADEFC149A91C619F4A9366771681CAE1A82AA57BB038E0180BD38C4323928E63FA890B85009B1A25C022AEE8DB4D7F4E34260677A22B3BC7F24089E98FC484B93EC95ED68D9D56B2F6DDBCE73AB844F5CBBD908E51651517F6920DC42F41B874EEB9DA244C4485D2A931C7A76E99D490E6B3D4AE44484CAE4B784A0773782D2B9CFB4D893E79D35CF4282CB9A70EA53700F49F6F47F374161D0B820690D2C99E3A2602B31E659E64E5D4D4BD111C73FD5AF47412748091E272947A307309F3732E04FA848AACC312ADD0323F09F7947788D9F2BC55BDB7DDDD1FE664C5C9E861F6052F8F94084927116CAB24C6B11FEE69ADD2BCED4CC7EF330519D287531861A75E0F00CA8E52CBE9B77E8F840168937222D5851C84195DD4E698AB8BB558A05026EBC09520A1B1F0BC44F699478A69E1C1384F37F16102DE90ED960CEFFD9EA299FB79D416F3AF6CCD1A022895CFE032AC65978486998E3714A56E3DBAE
++
++# Generated by Golang x/crypto
++P = 0xB10B8F96A080E01DDE92DE5EAE5D54EC52C99FBCFB06A3C69A6A9DCA52D23B616073E28675A23D189838EF1E2EE652C013ECB4AEA906112324975C3CD49B83BFACCBDD7D90C4BD7098488E9C219A73724EFFD6FAE5644738FAA31A4FF55BCCC0A151AF5F0DC8B4BD45BF37DF365C1A65E68CFDA76D4DA708DF1FB2BC2E4A4371
++G = 0xA4D1CBD5C3FD34126765A442EFB99905F8104DD258AC507FD6406CFF14266D31266FEA1E5C41564B777E690F5504F213160217B4B01B886A5E91547F9E2749F4D7FBD7D3B9A92EE1909D0D2263F80A76A6A24C087A091F531DBF0A0169B6A28AD662A4D18E73AFA32D779D5918D08BC8858F4DCEF97C2A24855E6EEB22B3B2E5
++X = 0x626adfc4696e5dee7f95f24077c8377b1df439cb76ab82134fe4a48b673e565a
++Msg = 0244454144424545464445414442454546444541444245454644454144424545464445414442454546444541444245454644454144424545464445414442454546444541444245454644454144424545464445414442454546444541444245454644454144424545464445414442454500476F207465737420766563746F72
++Ciphertext = 0F0AF27EB240927497A4245E592BDA1AA12420054AA406080420E92FCEDA12A3DCBF1CDEDA86A87029DF05C8D2435DF91A53BF65164375C302C19773C88677E88C36C3BBC408DFAD0672C1A56E5CDB8932AE11DD250F3DC31CB601582CC10C2E4BD26149AA5519AEDC7619C35B6F920B53B3AAEF728B06F37D08250B14C7AA0E291F233A5F5A6EE2333C9839C7C654C21669795B5C1415F92AFFBD24273403160AFE1DF058F554085283E0D5D8C487CBD4F7EFFBAE620C67F285CE4DD83FB1A00733B5BF9CA22A33039A7A15169757EFECC36A15F67609707C751F88FB5E70861BDE09A72A6B4558EA2841792BC86EC523DF23094D4B55663527EAB70D182CA9
++
++[EME-PKCS1-v1_5]
++# Same as above test from Go but with PKCS1 padding removed
++P = 0xB10B8F96A080E01DDE92DE5EAE5D54EC52C99FBCFB06A3C69A6A9DCA52D23B616073E28675A23D189838EF1E2EE652C013ECB4AEA906112324975C3CD49B83BFACCBDD7D90C4BD7098488E9C219A73724EFFD6FAE5644738FAA31A4FF55BCCC0A151AF5F0DC8B4BD45BF37DF365C1A65E68CFDA76D4DA708DF1FB2BC2E4A4371
++G = 0xA4D1CBD5C3FD34126765A442EFB99905F8104DD258AC507FD6406CFF14266D31266FEA1E5C41564B777E690F5504F213160217B4B01B886A5E91547F9E2749F4D7FBD7D3B9A92EE1909D0D2263F80A76A6A24C087A091F531DBF0A0169B6A28AD662A4D18E73AFA32D779D5918D08BC8858F4DCEF97C2A24855E6EEB22B3B2E5
++X = 0x626adfc4696e5dee7f95f24077c8377b1df439cb76ab82134fe4a48b673e565a
++Msg = 476F207465737420766563746F72
++Ciphertext = 0F0AF27EB240927497A4245E592BDA1AA12420054AA406080420E92FCEDA12A3DCBF1CDEDA86A87029DF05C8D2435DF91A53BF65164375C302C19773C88677E88C36C3BBC408DFAD0672C1A56E5CDB8932AE11DD250F3DC31CB601582CC10C2E4BD26149AA5519AEDC7619C35B6F920B53B3AAEF728B06F37D08250B14C7AA0E291F233A5F5A6EE2333C9839C7C654C21669795B5C1415F92AFFBD24273403160AFE1DF058F554085283E0D5D8C487CBD4F7EFFBAE620C67F285CE4DD83FB1A00733B5BF9CA22A33039A7A15169757EFECC36A15F67609707C751F88FB5E70861BDE09A72A6B4558EA2841792BC86EC523DF23094D4B55663527EAB70D182CA9
+diff --git a/src/tests/data/pubkey/elgamal_encrypt.vec b/src/tests/data/pubkey/elgamal_encrypt.vec
+index 059eb1668d..92e8690549 100644
+--- a/src/tests/data/pubkey/elgamal_encrypt.vec
++++ b/src/tests/data/pubkey/elgamal_encrypt.vec
+@@ -3,30 +3,35 @@
+ Group = modp/ietf/1024
+ Secret = 0xCC13EE3533858E0F0024FFC935DC5BD297DEC9385AC8EF7E
+ Msg = 1C
+-Nonce = EEE23AAA149AF29E18EF8D66AD8D4BACB72076BAE583A297
++Nonce = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000EEE23AAA149AF29E18EF8D66AD8D4BACB72076BAE583A297
+ Ciphertext = D73F6E5CEF558B92C924FEC2329774ACD75E7CEA04D2485F07920EF4E5B86E361E23E42AB6F3A97F5B1F46218BF3C00E93A2EA981B8BB48EDD020A3F96D61FDA0F3E4D26F5538B2179B7D7E333CE78414F18E6CD0AE74C3F44FBFAC9121A3A6CF80C85E89280F9BC476078F9FD686A6500590B1AD75616C0A92BC73838A6D4437368304638242BCD628A72EA432FE7C1892922136B3C19B39990980185328E5BBD35DE42549819C8E301348320BA80602E751172D9ACAA8E0B67FB97996310BC0C14B9E40626FE54138851E4BC4CA4CB2F0A1F3D3F042556A4942B2B03B4C2F75E50260365865FEE0050DAC3604E78708715549FF878F1B337D6ABF8B695462F
+
++Group = modp/ietf/1024
++Secret = 0xCC13EE3533858E0F0024FFC935DC5BD297DEC9385AC8EF7E
++Msg = 1C
++Nonce = D0F937A84865734C37877CBBD731D9A378EA8644B5C4D9A65B2C81C46F1014364F3593C6B9DFF25E0741EFB6C3E033522D66A6DA1C6B7666E8C15112BFAB850C38177C30CC05449B1A7D0D11EDD555997C57840D319279E5C80A51DC15F8103B820C5C870432DC14B70A12207EF749C835825C63B05B2E1A8FE36F0264D5B13D
++Ciphertext = B1F5602B7E72A8B3B5932EE86F303A14D764BAD54BF37902F0AA4C2592E04D3BB70F6CAAD3287B613D48C4D735E776F212BB26D46F53699B08194A0105239C588A2678EDC7476DF68B6C60F83E8DE47BA3477E17B3AD72D96F41FC1066089940F99ED6C0C8E9E77F322D986FDC4C718451E2CFBA51DCE13741C78AF81878EC6D4155741BFDD369A9DB4C9619E3753E0E80BD39A9B788481FB82ABA9A26FEF1B7619F9FC524B5D64DA2E3B23F8E8C0922754EB56A495DBD4F31B2DD3F9DC76A2EAB4D94F957F4E3776F423B85A8CDB343787AAFF00C95AFC297875DFF49EC9C886A5D550E1130A6CCC25E4A1C2D078C3B98586FFFD3C87EABC3FDC13A15AD4666
++
+ Group = modp/ietf/1536
+ Secret = 0x8D81343C4994DAF21AD0E6CB88C74F55529925EC953381470B72B3C8
+ Msg = 7F0CCACA157707BF03
+-Nonce = F0A0844B268ECEABA04827E7CE9F960119E0053CFBA00ADA47604857
++Nonce = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000F0A0844B268ECEABA04827E7CE9F960119E0053CFBA00ADA47604857
+ Ciphertext = 2EDE1A9F975FCAF943AEEB51EB37EAEDF54C4D939D0DCF7C80874A3BF8601B511685B1FDE52E07D8894EA647C50E480DE7A48ACADD89F79EEB9411234507CE6AB8503BD47B284134E301A78BD7FAC8D8B15A5D1424B820FF3FE1F363FC88FF510183165F52EE022A55EC43D4DD75763297C13F9EE3BCD579ADBA6800348F0C6240F49744B385737926A770EDF67257E7F5654C478C614700B6D2D671A13B28006C11C499BEB29658EF10C3E2EEC390A972372EBF733BA6EE5F4D600AAE1DDDC87EFA6D9FB05CBC995F82C3EF47CF862715E17DF7CC948846E849661D5C82C6A120610D90BB2D373D189A0BF13175F551326ECACF2D349A4BD2D265FDAC716E4B0A5D850E7EDA92CF9F8863BF1CD31C3888BFD81500DA4C615575EE8FA27615EF8E4B9D23A53852B236057E15DA7FC5827668A7B8AA699D3F79201567F4F0DAF7D89919906486A66ABA689FFD9E3BB5F0D1C677CCC12EA29BBFE1083C4FC349EE7E236BC8DC02DEE063E7F7C7B719E3176739D55196A2B7E6C3AA2A543135AB8F
+
+ Group = modp/ietf/2048
+ Secret = 0xA9F666E685F4F0BAFFF22C407B28461591CBF43F8DA1A8C3B1510BB6AA3BCD6C
+ Msg = D830F02AA1AE9328CF3F2C6CB7D86875
+-Nonce = DFA4E0979DADE5A620C4B9ED87C205F34D7AE739761BCDD060A9EC530E066538
++Nonce = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000DFA4E0979DADE5A620C4B9ED87C205F34D7AE739761BCDD060A9EC530E066538
+ Ciphertext = E8AC61EE6EA9DCBEDF5DD10247240E0FF3A6D1B1D2C9832A73C5EF2F96FB23C6FA571F9E407089ADAB459086B4331DBCBB3E5FC69B996748131D0D499EFF4F3654CEF8ED3C14C97C4985E5E0D6E0714E789F9D926CB26A23ACB52D6308CDB3C4DBF92F7A701513B133A0512A0CC16E13BCC7F983BC181C71A42252D48B113BAB4B861430AC6157E3043BD861C44D0804CCBB0B9D5BA599650DABE9FA7BF286EB08A97D11D5F88CB0157A4522E2C9F4EF53EB9D7679974C5AD86554EED49736D0D7B39461B92C73CBBEBAD8E92A6501293AE9A5BF0FBDA11BC743E032F78740F96F8CD71D30EA0F17F42181783C908A6008E339620CCB80226E9CDD7E5D50DEF9310DF03C971955CCF70557C9816049C2137CB7554998BD90B81AD549E9B65347E4BC798039BF05929DED052EE816EA3A87014B0D25E2E279B7736446201F52E542AA6E494BDC6D02A9A0479E1F90D5F3898A36AF7BA03E8F0BCBBF891A1C1B0B300EA664349E765EA331841ABC7963012C623318EF9B681711461ECC83EDC88722DE5E16FF1AB57B23F285CC5E75F6FCB46EEC9F919D1C089E7C045535E64A97F16662DF9CEFFB0E6C9C6402A43E47D1D073A5555A470E2451809234ABFD463A013D70288BA4A093E51FCED6A434886ED70490D63DFD809F27A773CDAC3D848A21C2937CA194C4FFBF8E50C05AEB3A530A7AB8B39B91A72EA45034A2FF8F16B1
+
+ Group = modp/ietf/3072
+ Secret = 0x981606068AE29B5B86E6F1E4E578010E43E1DBCB12504857CA6CDFC77913EFF0B3F563E1DDB40934B4F33099A6BF8EE8
+ Msg = 0E738AF35B6AE8951E5C3BF8EB
+-Nonce = F53B7EF9224D33392AE79CA3816755F066A2B15689B157FBA588CD5C247EFC9050DB2F84FA40C12E3493230D94D89306
++Nonce = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000F53B7EF9224D33392AE79CA3816755F066A2B15689B157FBA588CD5C247EFC9050DB2F84FA40C12E3493230D94D89306
+ Ciphertext = 659C8E28BF6A26E5D55386E437F2B66282EB9F9ECA54522D8A1FDE6BC6C4D65E5412D030BDC9833F93E3653B7B58FFD66A2EBFB8AAF1F7BBB52C3CD43E08DDB3D2C73E26EEA988EEF9CFDC9C59872B4D2454A1F500911B4D3BD3EED99107FAF39D97A3302166AD5B0381ECAB769953406DD3FEB502D23587D9CF2C89F93FE6A73167E3734CD0676EE95F7C43A558A56E7B0264A6084875D1E7F2312FA7BA7145AAA5921F904EDDC7A6EC823C57AFE323E4368CD7D47CAF2F8A94D6D3117A8BE92BAF6F0392A20C7FCFE381789755B7B47B9C5496382FF26533EA7F911472F02E2F9E29CAC9CFF4AEB90C36E55A1AF5D0259B195E2824C7F6B40299D8A0858E162B3D9392E323F62B48DA629089902F16D01D1AB3DCFBAAB46F1E74ECA6560B3A97E85E9B88B8F11AA83F78E8E542B8A3B4C0E7B47220594979BC7DD12E97238EB4B91D23A8F2D5362CB8B08C1F07B3461AD0968FB3053F60ECC2B3C0E900A0A7C2924C3FA79CCB43B33B336B807C6F4B83A7AE0112BD72A13822E3CD0B2E2AF7717F2CB21BE02D8DB0EB3BCCF66836BD83C828C221569EFCAA53124D206CB51D3718BC1511799DEA0558DD6FDBFB06B3D96BAC451FE71A4244BD3CD6826BF27EA3CC7782C17DCAF52EAA944CEA734D011145F10A4132A271349A8BF1ED0D7F7EF2ABC7031475B4397574F8A7EC4F5480D85CF0CA1F7C69097A2A009FFD4927AA769FD821F64741812FE5DB996ECAD3265CE93DBA7B40532A2133FB8EE5066A0C5F91C7E0F3902B6CEA39D5BB4B59B2993B5DAA2B61FF589BF45613D1EF36D5F7D959E8255C0010EC439AAE1C9B682BAC92C2883ED279CD8C644A301150879EB8D37B217B36447CBAC37C132C0278AA8CB38A8596392E3A3CAA91573370ED44DF46311EEE878B63F947F2A28930133D343737502623D0C7D3EA5D8D8123D7963C70AD30CC865BCD68F96C1A13A3484AB4EF3828CE338BF8E087F2300B777D556974D5E23FAFD55AB54353BCA31BEC13003AC7258510578F96B8F1E2254E91768A78CF9FCC6D8CFB0493701D523F75EC25B37B623B5A73A28009DBC169A084E95D
+
+ Group = modp/ietf/4096
+ Secret = 0xB73A80EB48DB4DF3108BE1345281A1B39B4373BFE71CB4DA9F3594A94C525E2E288F06089F61C1D29D6A99EA775C05D6
+ Msg = D413DAC9D341361F17EDCE1C46A04D343424251B
+-Nonce = B9AFD0F2F97C677BD3088B032696E7928DD62AD20912367113CFE5ABEEB7B4DFAD22E30442B04571CDC683D9971DE257
++Nonce = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B9AFD0F2F97C677BD3088B032696E7928DD62AD20912367113CFE5ABEEB7B4DFAD22E30442B04571CDC683D9971DE257
+ Ciphertext = 085E76D450C7FF0B2DB59D41D12596AD1B0D8AF877F5C63416D2B355ED137A5AEAB3B75AC4CBFB5168F37EC02724EA057ED5B9AAF0C40D5469FB9E068C7E090C6EB411CDFBC9A500294E2433A9F879F52F8359B0865128A76801B7C4E22D5A3A6279F755291ECC9454AC3C1F1395DA5FA8E25CD951FCBF9B569EED304B3B82B0198913FAFD0B9A3ED32A64B0E394F96C153D25FBFEF92ECB38F79F2DE12570A041C8B4E8ADB998D6A559BC9640EBA8B61A6D0387CF0CA621B6C3F60D464DE7D27D5347F79CABD09533219DD2CDA8BAB74E886E206409A94054CCF3EBBA570C33FE456BD6B0BEB564F406AF49400550AE01A21A68126C90E0B8295CB7F9C2F4C790D8B0FEFD1FC6BFF40A00737AF9EDA25A1BF00E7FEC8CE776C3D24C61EBF48049CE5B27E024B796566BA670090BAB1A6015C01DB57DFDDAD61240F151C61BC80C3BA320050D1E537D501611627531E41793C3468B87F28BF2281CE996957901BE6CE41FAB0F88467ECBC0DE6C5F60AB5A1AF21A9528B0E8BABAD56FA23F2AD3CBC521A8D54047F15F58FC9C5CD4BB322A0838EDAC053415CFED87FD0756FBFF6B052D385C2EED6FD4686E024F7175A9840DF7E74740FF368DA4DAEB879D7C0D265D51809BD6EC6A66717498A4998D0232586CA4C5F7858EBEC824821CDBD1133DA557612A398EA8F9AC959A39381FCF1D727D08136CAFC4D72E9A945043E6DE2C67F6B55C21B7EDBFDCEA2B63CF9A5BB931DFE76CA2BE5D3D964AA2C348E6DFBA4FFC4D5E463105E243BD20AF38531A70BE1DD4930F998E28C3182665507700976BC14438452179747E623B2E5328A3ED5925FA526AE897ACF67059D76D159CB31D85F03589A4874AB11A7E2BB680FCEF7A4CEBFD98B0DC18BC1AF838524107E3264C2FDACF883ED2701CF3306E83CB8E75F5ED148F3377A77474D47522596F50DADEFC149A91C619F4A9366771681CAE1A82AA57BB038E0180BD38C4323928E63FA890B85009B1A25C022AEE8DB4D7F4E34260677A22B3BC7F24089E98FC484B93EC95ED68D9D56B2F6DDBCE73AB844F5CBBD908E51651517F6920DC42F41B874EEB9DA244C4485D2A931C7A76E99D490E6B3D4AE44484CAE4B784A0773782D2B9CFB4D893E79D35CF4282CB9A70EA53700F49F6F47F374161D0B820690D2C99E3A2602B31E659E64E5D4D4BD111C73FD5AF47412748091E272947A307309F3732E04FA848AACC312ADD0323F09F7947788D9F2BC55BDB7DDDD1FE664C5C9E861F6052F8F94084927116CAB24C6B11FEE69ADD2BCED4CC7EF330519D287531861A75E0F00CA8E52CBE9B77E8F840168937222D5851C84195DD4E698AB8BB558A05026EBC09520A1B1F0BC44F699478A69E1C1384F37F16102DE90ED960CEFFD9EA299FB79D416F3AF6CCD1A022895CFE032AC65978486998E3714A56E3DBAE
+-
diff --git a/main/botan/dl-exponents.patch b/main/botan/dl-exponents.patch
new file mode 100644
index 0000000000..28c5e06b81
--- /dev/null
+++ b/main/botan/dl-exponents.patch
@@ -0,0 +1,304 @@
+From 9258696e147894e45d0422fd65a34193fba76211 Mon Sep 17 00:00:00 2001
+From: Jack Lloyd <jack@randombit.net>
+Date: Mon, 14 Dec 2020 07:15:20 -0500
+Subject: [PATCH] New sizes for DL exponents
+
+Avoid using a formula for this and instead just bucket into a few very
+rough sizes. In all cases (except very large keys) this results in
+using a somewhat larger exponent.
+---
+ src/lib/pubkey/workfactor.cpp | 23 +++++++------
+ src/scripts/test_cli.py | 4 +--
+ .../{elgamal.vec => elgamal_decrypt.vec} | 10 ------
+ src/tests/data/pubkey/elgamal_encrypt.vec | 32 ++++++++++++++++++
+ src/tests/data/pubkey/workfactor.vec | 18 ++++++----
+ src/tests/{test_elg.cpp => test_elgamal.cpp} | 33 +++++++++++++++----
+ src/tests/test_workfactor.cpp | 2 +-
+ 7 files changed, 86 insertions(+), 36 deletions(-)
+ rename src/tests/data/pubkey/{elgamal.vec => elgamal_decrypt.vec} (95%)
+ create mode 100644 src/tests/data/pubkey/elgamal_encrypt.vec
+ rename src/tests/{test_elg.cpp => test_elgamal.cpp} (54%)
+
+diff --git a/src/lib/pubkey/workfactor.cpp b/src/lib/pubkey/workfactor.cpp
+index cd0a83e5ce..13760351ea 100644
+--- a/src/lib/pubkey/workfactor.cpp
++++ b/src/lib/pubkey/workfactor.cpp
+@@ -51,16 +51,19 @@ size_t dl_work_factor(size_t bits)
+
+ size_t dl_exponent_size(size_t bits)
+ {
+- /*
+- This uses a slightly tweaked version of the standard work factor
+- function above. It assumes k is 1 (thus overestimating the strength
+- of the prime group by 5-6 bits), and always returns at least 128 bits
+- (this only matters for very small primes).
+- */
+- const size_t min_workfactor = 64;
+- const double log2_k = 0;
+-
+- return 2 * std::max<size_t>(min_workfactor, nfs_workfactor(bits, log2_k));
++ if(bits == 0)
++ return 0;
++ if(bits <= 256)
++ return bits - 1;
++ if(bits <= 1024)
++ return 192;
++ if(bits <= 1536)
++ return 224;
++ if(bits <= 2048)
++ return 256;
++ if(bits <= 4096)
++ return 384;
++ return 512;
+ }
+
+ }
+diff --git a/src/scripts/test_cli.py b/src/scripts/test_cli.py
+index 7fb46feab4..5fc2f04e84 100755
+--- a/src/scripts/test_cli.py
++++ b/src/scripts/test_cli.py
+@@ -278,7 +278,7 @@ def cli_gen_dl_group_tests(_tmp_dir):
+ mFvAZ/8wal0=
+ -----END X9.42 DH PARAMETERS-----"""
+
+- test_cli("gen_dl_group", "--pbits=1043", pem)
++ test_cli("gen_dl_group", ["--pbits=1043", "--qbits=174"], pem)
+
+ dsa_grp = """-----BEGIN DSA PARAMETERS-----
+ MIIBHgKBgQCyP1vosC/axliM2hmJ9EOSdd1zBkuzMP25CYD8PFkRVrPLr1ClSUtn
+@@ -679,7 +679,7 @@ def cli_pk_workfactor_tests(_tmp_dir):
+ test_cli("pk_workfactor", "2048", "111")
+ test_cli("pk_workfactor", ["--type=rsa", "512"], "58")
+ test_cli("pk_workfactor", ["--type=dl", "512"], "58")
+- test_cli("pk_workfactor", ["--type=dl_exp", "512"], "128")
++ test_cli("pk_workfactor", ["--type=dl_exp", "512"], "192")
+
+ def cli_dl_group_info_tests(_tmp_dir):
+
+diff --git a/src/tests/data/pubkey/elgamal.vec b/src/tests/data/pubkey/elgamal_decrypt.vec
+similarity index 95%
+rename from src/tests/data/pubkey/elgamal.vec
+rename to src/tests/data/pubkey/elgamal_decrypt.vec
+index 5cfbacdeee..f676be50e7 100644
+--- a/src/tests/data/pubkey/elgamal.vec
++++ b/src/tests/data/pubkey/elgamal_decrypt.vec
+@@ -3,68 +3,58 @@ P = 1365501321293735349225077112267598047546199828869335521691442858164229618266
+ G = 13
+ X = 1510837665211600837455333225484573368412905214721958306259132011740929687444
+ Msg = 02AD1D776D591520E4D8BEF8B21CC2F54FB4EB788E52ECEBE13564435DA66284D51A6A6696E615EF599786CE4CBEFAFF066E0A1CD8868454EB5CE0CA99241B29E1D1492CF2712C2C101B3F3779034683AD8271098C2E3FBAA83901A97D9645FA5815AF79F4F638ECBE09020003F434D708914899C668F34830E70F4CAF0803
+-Nonce = 0A5842A8D0C1B07E5DE6FD3E0C6B1108523D4D35417F
+ Ciphertext = 5B99F58B48F3D473327075F2FF4EEA3C8C1FEB0B241F042864610D6FC512A81F431A965724195DB71C3B84B6B9F1DFAE0DAE60E7CDA957703D10FCCDA45CDD0EF8C8F76AA4F51F3EDAD8E5085B97D69523A3EAC89D67CDFDDCF0A30491A98BE2FD6C5E69C3A2C95300B9DB4EDF2111E7613EF7B2CA430D0CFFBDECF6A7BE592A853B404B6910C48A0204ED3430691E766FBAF21A428B9F833C5932C053C616EEB59850150A22331A8FB5AF2065B595E4F08881B1DB7CB85A28A33F4449890739679CCAA431A9205210995BEA68759B475BE4183A975C9D042FBBEDF589AB6AF017D7523B2CC90CD63526BC584F1E9EF42ABAAA9238987D7F73B94E323C6AADFD
+
+ P = 1541287358797997024335652872773425159872421808416662301794871595911973385718041854467851087853175356350298847849929853669980047096240555092681165983790725605204837589691602540741068782404825906414885161661820441988899240406981724303
+ G = 5
+ X = 1344717445208905302019700797220481877896877304443340806021921711564
+ Msg = 02C1ED6A171875F055809F12BC61829961CC740935C6DCC468FA663E8D1A7DE9E0555E3EA99476436743FC5C76D3E041055FAEB7641907F8E2F1F94061B22E72B7CD39EDD7A6367828CCDC000301CEA7D91CB1E8A3E20DC85FAA23EF6D08E6
+-Nonce = F42F854C10C9DD14A6712594A31326A1FD2CF5
+ Ciphertext = 9E47FB001BDDB12F2D8E0FA5501A7EAC1B185FDFC7D2FF3E4461B0D75D626F5156DEDD4D25F13C6C1F5F9A1F916058045705F5E82F748E9B6F0DC95D572B8DC2770159092EECA13946F0522FE2A859705009B615818A1B4F98E8DD38CF00DE746ABD5F3852D93F8D9299DE18EB763F11E41A8B9660C5F056538EED431BB8E2199D9012F50C7FBEF5AAD35ECCD7F141CD9AC6553315A2699D6718F50EBDCEAE62A11ACC466E8533EDBAF13C15B5532B323EBF283B108F892DBFCEA21231DFD548
+
+ P = 13232376895198612407547930718267435757728527029623408872245156039757713029036368719146452186041204237350521785240337048752071462798273003935646236777459223
+ G = 11629401773565540073100961473632977008134185076958364415809981826641612629974728305105606061133984394938666464842000720534465163992699133277631369246002549
+ X = 175607362627753240470186183617696577774
+ Msg = 47E586A7E7D98C116A6F553F652E57BF
+-Nonce = BEF5E7EFAA76C52A8ECEE604EDAFD31B
+ Ciphertext = CD70DE085B0C586B4E64097EA3AB4CE0B60A71B0F640FE4468F4F940412EDBDD9035EEC602530CFF81B2CDC35805264A866E4689DDBADC3438575B6337118BB23A5AB7710F85F2A4E1E0DBEC5652FEF73C868747ECB7043BA08241A0879A2DC588D3EC14ED552E62B1B111646FF4DFA9050754240A46A840EA5EB1D97712F2BB
+
+ P = 13232376895198612407547930718267435757728527029623408872245156039757713029036368719146452186041204237350521785240337048752071462798273003935646236777459223
+ G = 11629401773565540073100961473632977008134185076958364415809981826641612629974728305105606061133984394938666464842000720534465163992699133277631369246002549
+ X = 226260657342880764984259695048075261500
+ Msg = 74BC8D009250F4CD2E08BC556EE01449
+-Nonce = A2951BE393736E39E9D209FE978C7546
+ Ciphertext = 6D6ED1C6E519C628CACC7981A5BBE487F6E013B26448D711911698CEEAA4F746182A716602183A746FC35B022BD7B27EF079F7164309653D148D0CE91907FF6C4A9001A0CCA2A0A163F3F93200C2E40A957919CB84AC35B928E026F1827E6D4A9B986B592BE39861538414D5EA6980248FD3C3C0CDEE372F392D5AC46DB8EEFB
+
+ P = 13232376895198612407547930718267435757728527029623408872245156039757713029036368719146452186041204237350521785240337048752071462798273003935646236777459223
+ G = 11629401773565540073100961473632977008134185076958364415809981826641612629974728305105606061133984394938666464842000720534465163992699133277631369246002549
+ X = 190989497955271245954961490592364802400
+ Msg = 01AFE1A93EDB9CD3E3715523C952478D
+-Nonce = 9500DDCD404618F64A2063BC19941A6E
+ Ciphertext = 0636C3F1C63C54CAB4B48B6EF0ECBFF00BA6AB70DF4DB6266D0785351B37279D41D957D16CAB48C64035DCB2A1CD75BAC298C8ECAE8057D87071EADAA5DA6E2B69B5F353B5753F7E24DA81ABAD40059CD73CFA6E78CAB1C7DA418D55E5DBD42FA4F2B876A25B4AF63588C80E0DB11E8BAB1531960E951C08C1A68C8FAE0DA87C
+
+ P = 1418488780399624169246918906980830188668962659968489177172519612007411971965075884911751185624649475197807409457369163882960326663412481439463507475025544888587052733646843233033458377686354235239579046252542291754237282749312023983
+ G = 1351977104923085061876231022324913317418268765766371251774974499254352282996737121345129752664271877383194755574993089982460597274051441610498438524702048238124542105329402087161253933648442955133245175046317041420863434958965806440
+ X = 5693645782587047029911723275175292231768316497
+ Msg = 58E72BD0F04B11
+-Nonce = EF07721FF6B28A8A3B4EBC95C16B13A83649B7
+ Ciphertext = C7B6ACADBBCFD3A34EDA31CE9CA7F7889FBB2DF5C6C25793EB974591BF0EDE93637B6A95E8075BDB2A987039D92487665465C98AAD0C123FA00BB9736170E78069AA32DFBEB07099A0B7D439AA807A2D3D6F9F913EBC673F9F8CD5D3C0E9DD0D988EAC4D8204928C2DA8ECD1FA3A598FCBFFEF5017DB8542D123CF69E8C92EB956F10DC995AE6B6564967D5C12A07BA35607C54CC3F10A36FF3603DD7CC1490664610002977CE8C4A4EFFBD1421C902D4D8DFF81D014E1AB55F239E0F2FD28AB
+
+ P = 1418488780399624169246918906980830188668962659968489177172519612007411971965075884911751185624649475197807409457369163882960326663412481439463507475025544888587052733646843233033458377686354235239579046252542291754237282749312023983
+ G = 1351977104923085061876231022324913317418268765766371251774974499254352282996737121345129752664271877383194755574993089982460597274051441610498438524702048238124542105329402087161253933648442955133245175046317041420863434958965806440
+ X = 4008521039270359712424267366152273661245582878
+ Msg = C37AA41207A357DBCCFBE93DC45C5BD91D29FD29CBA29B26AC437A9B560C3BEA
+-Nonce = A36338E4D7815E6A4B178E951BEF073C6D5A7F
+ Ciphertext = D824C94623313298600CC20203F8A40006CAFCFC8F883C99AC09DBAE4B95E6DB9FB5737E24D9D7E39B603893076BC81A2BC0C0D608B32B353972B57066535DAAC49E3F7F2A0E243618EEE01C5AB3AFAE1D55E3A1DB33CF713E5187AD51D55144B1A108354ECA651E55F85F253FE73C1C15FA5EDDDA47467BD0425F09E3C4156548E71896659C618B84FD72BA176E2DEEECD8B15F2C05F870697EA464B88273742BD6ECBA5164424F34EBB9E13E31683A16712901818C7E5F502720FBCB075EA1
+
+ P = 1418488780399624169246918906980830188668962659968489177172519612007411971965075884911751185624649475197807409457369163882960326663412481439463507475025544888587052733646843233033458377686354235239579046252542291754237282749312023983
+ G = 1351977104923085061876231022324913317418268765766371251774974499254352282996737121345129752664271877383194755574993089982460597274051441610498438524702048238124542105329402087161253933648442955133245175046317041420863434958965806440
+ X = 5316253934868425065538718034591876558413406625
+ Msg = 36FDC0501B44AF
+-Nonce = 832BC01DB63F958D47B6962AEAA74C0831A6AB
+ Ciphertext = 62E46CDF100BADF4419215256BEC8427DD0388D1B60B5A8675532C0934351BA0036AF58032AB6C4DB829F1A0C8217FBF2CB9C10A5C60FF285919BCAF238E89FBAA4771CAD13D4A69AB2C1FFF0A44D2F9287F1E70D58210AE859074B3969EE800A9D1507BA48582BD1E03CC234B0CB11408BE0932763EDC99CA4BEC6E496A452237F920972C629714EA2F1FF212460C23B66DB56BC73E94743D32D2CD3536A17A136F56D7F7C24E3B8F102F48BBB21633279D3E584E71DC37B436104CA69A6BB3
+
+ P = 178011905478542266528237562450159990145232156369120674273274450314442865788737020770612695252123463079567156784778466449970650770920727857050009668388144034129745221171818506047231150039301079959358067395348717066319802262019714966524135060945913707594956514672855690606794135837542707371727429551343320695239
+ G = 49567166504681114998529684425585849617514862026978329597099192087961538717407709177883083441369264146939535263894140299406849834767828526204179623557679393249247253593623658376992386256295047165071989556654741504656225128772294708626157371448610928885819291350567633953878147205134001752476855481804967677085
+ X = 3756315909532643155590215634844150624450334340186095
+ Msg = DF72B687F62AFEA3A51195EE876E4C87708F7ABB8D2D5DD72B68256DAC6D
+-Nonce = 0B333C9C486C5F3A96F37D00133ADD18113376C9BE76
+ Ciphertext = 4156CF437A39C415B212AAA34C9AACAFA3F3113F53BB75E0BD3D759089E21754EF89B4BA1A8B37E5EDA13F8A2F87D16F03F3B6FE19A5CF799B17D83F7B5E9A225F324AAD7D46E80A1DAFCA337A3F500930A7831D1F3785763EB9A6994063CED033177E1CA2770B751B3053C1445ADFEAED790E49E4685A05B9563D1EF32BD321971D541B525D648EA7C8741D8FA7E46293D46A0F4345BE73EA4FAF1E4C16BCBE11C53BA0FCBA2975BD37F11FE5ADA8731CAED3C403EA6E43AE47ADAA7E28433404AD3ADE6AA8E12BFC374BADAAFB167F3AAF91DC6F8398003E5F8528E8D4773F800D48C8EDDAEDD72A3870E97679F946CE27FB692BC11677757A28F3899A3DA8
+
+ P = 178011905478542266528237562450159990145232156369120674273274450314442865788737020770612695252123463079567156784778466449970650770920727857050009668388144034129745221171818506047231150039301079959358067395348717066319802262019714966524135060945913707594956514672855690606794135837542707371727429551343320695239
+ G = 49567166504681114998529684425585849617514862026978329597099192087961538717407709177883083441369264146939535263894140299406849834767828526204179623557679393249247253593623658376992386256295047165071989556654741504656225128772294708626157371448610928885819291350567633953878147205134001752476855481804967677085
+ X = 4304232149632055597449717737864742436448127103739097
+ Msg = F73BB7E5C8A5619380
+-Nonce = 0AD9527B09EAD1E59B4A1CAF58C861B69A856AB8AA80
+ Ciphertext = C9881464A37749949D66D75CD9B7A8ACAD33DD1FAC7561F684E9CB5343D2ED15969D7EDB4135518B50F0FEC9A9559C1D5E44DAB42C14BBDE2D2711EA4D02D7F27D1A9BCFEC9E8B73FA64BA3C54707FDDE7D5BE695E17FB9D259FB576FD4E57D66C8F727DC236E2A6E9FD01709D34B8D09F7DD3890F003EBE616042B4E0A8A00F6C3F34DE7E002FE72A84AF8D014D64E8CD08B9B56CC3A6BBE6F966B92105A92C5ABF4F2BF735670622F6213FE9739FAD65692E1C0EBF708A47E18600A22972A5A3DA0F22D11C581D46F734151A083FF757E961351EB183B467A859FBB9ED1DAC396FA405701FD6E3A62EB126E93648C3C6DFA9C4DBF3C005880F4799F66B310E
+diff --git a/src/tests/data/pubkey/elgamal_encrypt.vec b/src/tests/data/pubkey/elgamal_encrypt.vec
+new file mode 100644
+index 0000000000..059eb1668d
+--- /dev/null
++++ b/src/tests/data/pubkey/elgamal_encrypt.vec
+@@ -0,0 +1,32 @@
++# These were generated by Botan and not checked against other implementations
++
++Group = modp/ietf/1024
++Secret = 0xCC13EE3533858E0F0024FFC935DC5BD297DEC9385AC8EF7E
++Msg = 1C
++Nonce = EEE23AAA149AF29E18EF8D66AD8D4BACB72076BAE583A297
++Ciphertext = D73F6E5CEF558B92C924FEC2329774ACD75E7CEA04D2485F07920EF4E5B86E361E23E42AB6F3A97F5B1F46218BF3C00E93A2EA981B8BB48EDD020A3F96D61FDA0F3E4D26F5538B2179B7D7E333CE78414F18E6CD0AE74C3F44FBFAC9121A3A6CF80C85E89280F9BC476078F9FD686A6500590B1AD75616C0A92BC73838A6D4437368304638242BCD628A72EA432FE7C1892922136B3C19B39990980185328E5BBD35DE42549819C8E301348320BA80602E751172D9ACAA8E0B67FB97996310BC0C14B9E40626FE54138851E4BC4CA4CB2F0A1F3D3F042556A4942B2B03B4C2F75E50260365865FEE0050DAC3604E78708715549FF878F1B337D6ABF8B695462F
++
++Group = modp/ietf/1536
++Secret = 0x8D81343C4994DAF21AD0E6CB88C74F55529925EC953381470B72B3C8
++Msg = 7F0CCACA157707BF03
++Nonce = F0A0844B268ECEABA04827E7CE9F960119E0053CFBA00ADA47604857
++Ciphertext = 2EDE1A9F975FCAF943AEEB51EB37EAEDF54C4D939D0DCF7C80874A3BF8601B511685B1FDE52E07D8894EA647C50E480DE7A48ACADD89F79EEB9411234507CE6AB8503BD47B284134E301A78BD7FAC8D8B15A5D1424B820FF3FE1F363FC88FF510183165F52EE022A55EC43D4DD75763297C13F9EE3BCD579ADBA6800348F0C6240F49744B385737926A770EDF67257E7F5654C478C614700B6D2D671A13B28006C11C499BEB29658EF10C3E2EEC390A972372EBF733BA6EE5F4D600AAE1DDDC87EFA6D9FB05CBC995F82C3EF47CF862715E17DF7CC948846E849661D5C82C6A120610D90BB2D373D189A0BF13175F551326ECACF2D349A4BD2D265FDAC716E4B0A5D850E7EDA92CF9F8863BF1CD31C3888BFD81500DA4C615575EE8FA27615EF8E4B9D23A53852B236057E15DA7FC5827668A7B8AA699D3F79201567F4F0DAF7D89919906486A66ABA689FFD9E3BB5F0D1C677CCC12EA29BBFE1083C4FC349EE7E236BC8DC02DEE063E7F7C7B719E3176739D55196A2B7E6C3AA2A543135AB8F
++
++Group = modp/ietf/2048
++Secret = 0xA9F666E685F4F0BAFFF22C407B28461591CBF43F8DA1A8C3B1510BB6AA3BCD6C
++Msg = D830F02AA1AE9328CF3F2C6CB7D86875
++Nonce = DFA4E0979DADE5A620C4B9ED87C205F34D7AE739761BCDD060A9EC530E066538
++Ciphertext = E8AC61EE6EA9DCBEDF5DD10247240E0FF3A6D1B1D2C9832A73C5EF2F96FB23C6FA571F9E407089ADAB459086B4331DBCBB3E5FC69B996748131D0D499EFF4F3654CEF8ED3C14C97C4985E5E0D6E0714E789F9D926CB26A23ACB52D6308CDB3C4DBF92F7A701513B133A0512A0CC16E13BCC7F983BC181C71A42252D48B113BAB4B861430AC6157E3043BD861C44D0804CCBB0B9D5BA599650DABE9FA7BF286EB08A97D11D5F88CB0157A4522E2C9F4EF53EB9D7679974C5AD86554EED49736D0D7B39461B92C73CBBEBAD8E92A6501293AE9A5BF0FBDA11BC743E032F78740F96F8CD71D30EA0F17F42181783C908A6008E339620CCB80226E9CDD7E5D50DEF9310DF03C971955CCF70557C9816049C2137CB7554998BD90B81AD549E9B65347E4BC798039BF05929DED052EE816EA3A87014B0D25E2E279B7736446201F52E542AA6E494BDC6D02A9A0479E1F90D5F3898A36AF7BA03E8F0BCBBF891A1C1B0B300EA664349E765EA331841ABC7963012C623318EF9B681711461ECC83EDC88722DE5E16FF1AB57B23F285CC5E75F6FCB46EEC9F919D1C089E7C045535E64A97F16662DF9CEFFB0E6C9C6402A43E47D1D073A5555A470E2451809234ABFD463A013D70288BA4A093E51FCED6A434886ED70490D63DFD809F27A773CDAC3D848A21C2937CA194C4FFBF8E50C05AEB3A530A7AB8B39B91A72EA45034A2FF8F16B1
++
++Group = modp/ietf/3072
++Secret = 0x981606068AE29B5B86E6F1E4E578010E43E1DBCB12504857CA6CDFC77913EFF0B3F563E1DDB40934B4F33099A6BF8EE8
++Msg = 0E738AF35B6AE8951E5C3BF8EB
++Nonce = F53B7EF9224D33392AE79CA3816755F066A2B15689B157FBA588CD5C247EFC9050DB2F84FA40C12E3493230D94D89306
++Ciphertext = 659C8E28BF6A26E5D55386E437F2B66282EB9F9ECA54522D8A1FDE6BC6C4D65E5412D030BDC9833F93E3653B7B58FFD66A2EBFB8AAF1F7BBB52C3CD43E08DDB3D2C73E26EEA988EEF9CFDC9C59872B4D2454A1F500911B4D3BD3EED99107FAF39D97A3302166AD5B0381ECAB769953406DD3FEB502D23587D9CF2C89F93FE6A73167E3734CD0676EE95F7C43A558A56E7B0264A6084875D1E7F2312FA7BA7145AAA5921F904EDDC7A6EC823C57AFE323E4368CD7D47CAF2F8A94D6D3117A8BE92BAF6F0392A20C7FCFE381789755B7B47B9C5496382FF26533EA7F911472F02E2F9E29CAC9CFF4AEB90C36E55A1AF5D0259B195E2824C7F6B40299D8A0858E162B3D9392E323F62B48DA629089902F16D01D1AB3DCFBAAB46F1E74ECA6560B3A97E85E9B88B8F11AA83F78E8E542B8A3B4C0E7B47220594979BC7DD12E97238EB4B91D23A8F2D5362CB8B08C1F07B3461AD0968FB3053F60ECC2B3C0E900A0A7C2924C3FA79CCB43B33B336B807C6F4B83A7AE0112BD72A13822E3CD0B2E2AF7717F2CB21BE02D8DB0EB3BCCF66836BD83C828C221569EFCAA53124D206CB51D3718BC1511799DEA0558DD6FDBFB06B3D96BAC451FE71A4244BD3CD6826BF27EA3CC7782C17DCAF52EAA944CEA734D011145F10A4132A271349A8BF1ED0D7F7EF2ABC7031475B4397574F8A7EC4F5480D85CF0CA1F7C69097A2A009FFD4927AA769FD821F64741812FE5DB996ECAD3265CE93DBA7B40532A2133FB8EE5066A0C5F91C7E0F3902B6CEA39D5BB4B59B2993B5DAA2B61FF589BF45613D1EF36D5F7D959E8255C0010EC439AAE1C9B682BAC92C2883ED279CD8C644A301150879EB8D37B217B36447CBAC37C132C0278AA8CB38A8596392E3A3CAA91573370ED44DF46311EEE878B63F947F2A28930133D343737502623D0C7D3EA5D8D8123D7963C70AD30CC865BCD68F96C1A13A3484AB4EF3828CE338BF8E087F2300B777D556974D5E23FAFD55AB54353BCA31BEC13003AC7258510578F96B8F1E2254E91768A78CF9FCC6D8CFB0493701D523F75EC25B37B623B5A73A28009DBC169A084E95D
++
++Group = modp/ietf/4096
++Secret = 0xB73A80EB48DB4DF3108BE1345281A1B39B4373BFE71CB4DA9F3594A94C525E2E288F06089F61C1D29D6A99EA775C05D6
++Msg = D413DAC9D341361F17EDCE1C46A04D343424251B
++Nonce = B9AFD0F2F97C677BD3088B032696E7928DD62AD20912367113CFE5ABEEB7B4DFAD22E30442B04571CDC683D9971DE257
++Ciphertext = 085E76D450C7FF0B2DB59D41D12596AD1B0D8AF877F5C63416D2B355ED137A5AEAB3B75AC4CBFB5168F37EC02724EA057ED5B9AAF0C40D5469FB9E068C7E090C6EB411CDFBC9A500294E2433A9F879F52F8359B0865128A76801B7C4E22D5A3A6279F755291ECC9454AC3C1F1395DA5FA8E25CD951FCBF9B569EED304B3B82B0198913FAFD0B9A3ED32A64B0E394F96C153D25FBFEF92ECB38F79F2DE12570A041C8B4E8ADB998D6A559BC9640EBA8B61A6D0387CF0CA621B6C3F60D464DE7D27D5347F79CABD09533219DD2CDA8BAB74E886E206409A94054CCF3EBBA570C33FE456BD6B0BEB564F406AF49400550AE01A21A68126C90E0B8295CB7F9C2F4C790D8B0FEFD1FC6BFF40A00737AF9EDA25A1BF00E7FEC8CE776C3D24C61EBF48049CE5B27E024B796566BA670090BAB1A6015C01DB57DFDDAD61240F151C61BC80C3BA320050D1E537D501611627531E41793C3468B87F28BF2281CE996957901BE6CE41FAB0F88467ECBC0DE6C5F60AB5A1AF21A9528B0E8BABAD56FA23F2AD3CBC521A8D54047F15F58FC9C5CD4BB322A0838EDAC053415CFED87FD0756FBFF6B052D385C2EED6FD4686E024F7175A9840DF7E74740FF368DA4DAEB879D7C0D265D51809BD6EC6A66717498A4998D0232586CA4C5F7858EBEC824821CDBD1133DA557612A398EA8F9AC959A39381FCF1D727D08136CAFC4D72E9A945043E6DE2C67F6B55C21B7EDBFDCEA2B63CF9A5BB931DFE76CA2BE5D3D964AA2C348E6DFBA4FFC4D5E463105E243BD20AF38531A70BE1DD4930F998E28C3182665507700976BC14438452179747E623B2E5328A3ED5925FA526AE897ACF67059D76D159CB31D85F03589A4874AB11A7E2BB680FCEF7A4CEBFD98B0DC18BC1AF838524107E3264C2FDACF883ED2701CF3306E83CB8E75F5ED148F3377A77474D47522596F50DADEFC149A91C619F4A9366771681CAE1A82AA57BB038E0180BD38C4323928E63FA890B85009B1A25C022AEE8DB4D7F4E34260677A22B3BC7F24089E98FC484B93EC95ED68D9D56B2F6DDBCE73AB844F5CBBD908E51651517F6920DC42F41B874EEB9DA244C4485D2A931C7A76E99D490E6B3D4AE44484CAE4B784A0773782D2B9CFB4D893E79D35CF4282CB9A70EA53700F49F6F47F374161D0B820690D2C99E3A2602B31E659E64E5D4D4BD111C73FD5AF47412748091E272947A307309F3732E04FA848AACC312ADD0323F09F7947788D9F2BC55BDB7DDDD1FE664C5C9E861F6052F8F94084927116CAB24C6B11FEE69ADD2BCED4CC7EF330519D287531861A75E0F00CA8E52CBE9B77E8F840168937222D5851C84195DD4E698AB8BB558A05026EBC09520A1B1F0BC44F699478A69E1C1384F37F16102DE90ED960CEFFD9EA299FB79D416F3AF6CCD1A022895CFE032AC65978486998E3714A56E3DBAE
++
+diff --git a/src/tests/data/pubkey/workfactor.vec b/src/tests/data/pubkey/workfactor.vec
+index 7d8999da84..1b7fa70235 100644
+--- a/src/tests/data/pubkey/workfactor.vec
++++ b/src/tests/data/pubkey/workfactor.vec
+@@ -24,20 +24,26 @@ ParamSize = 14400
+ Workfactor = 256
+
+ [DL_Exponent_Size]
++ParamSize = 192
++Workfactor = 191
++
++ParamSize = 512
++Workfactor = 192
++
+ ParamSize = 1024
+-Workfactor = 86
++Workfactor = 192
+
+ ParamSize = 1536
+-Workfactor = 103
++Workfactor = 224
+
+ ParamSize = 2048
+-Workfactor = 116
++Workfactor = 256
+
+ ParamSize = 3072
+-Workfactor = 138
++Workfactor = 384
+
+ ParamSize = 4096
+-Workfactor = 156
++Workfactor = 384
+
+ ParamSize = 8192
+-Workfactor = 208
++Workfactor = 512
+diff --git a/src/tests/test_elg.cpp b/src/tests/test_elgamal.cpp
+similarity index 54%
+rename from src/tests/test_elg.cpp
+rename to src/tests/test_elgamal.cpp
+index 6a6bdb8b54..cb69657251 100644
+--- a/src/tests/test_elg.cpp
++++ b/src/tests/test_elgamal.cpp
+@@ -1,5 +1,5 @@
+ /*
+-* (C) 2014,2015 Jack Lloyd
++* (C) 2014,2015,2020 Jack Lloyd
+ *
+ * Botan is released under the Simplified BSD License (see license.txt)
+ */
+@@ -17,15 +17,33 @@ namespace {
+
+ #if defined(BOTAN_HAS_ELGAMAL)
+
+-class ElGamal_KAT_Tests final : public PK_Encryption_Decryption_Test
++class ElGamal_Encrypt_Tests final : public PK_Encryption_Decryption_Test
+ {
+ public:
+- ElGamal_KAT_Tests()
++ ElGamal_Encrypt_Tests()
+ : PK_Encryption_Decryption_Test(
+ "ElGamal",
+- "pubkey/elgamal.vec",
+- "P,G,X,Msg,Nonce,Ciphertext",
+- "Padding") {}
++ "pubkey/elgamal_encrypt.vec",
++ "Group,Padding,Secret,Nonce,Msg,Ciphertext") {}
++
++ std::unique_ptr<Botan::Private_Key> load_private_key(const VarMap& vars) override
++ {
++ const Botan::BigInt x = vars.get_req_bn("Secret");
++ const Botan::DL_Group grp(vars.get_req_str("Group"));
++
++ std::unique_ptr<Botan::Private_Key> key(new Botan::ElGamal_PrivateKey(Test::rng(), grp, x));
++ return key;
++ }
++ };
++
++class ElGamal_Decrypt_Tests final : public PK_Decryption_Test
++ {
++ public:
++ ElGamal_Decrypt_Tests()
++ : PK_Decryption_Test(
++ "ElGamal",
++ "pubkey/elgamal_decrypt.vec",
++ "P,G,X,Msg,Ciphertext") {}
+
+ std::unique_ptr<Botan::Private_Key> load_private_key(const VarMap& vars) override
+ {
+@@ -53,7 +71,8 @@ class ElGamal_Keygen_Tests final : public PK_Key_Generation_Test
+ }
+ };
+
+-BOTAN_REGISTER_TEST("pubkey", "elgamal_encrypt", ElGamal_KAT_Tests);
++BOTAN_REGISTER_TEST("pubkey", "elgamal_encrypt", ElGamal_Encrypt_Tests);
++BOTAN_REGISTER_TEST("pubkey", "elgamal_decrypt", ElGamal_Decrypt_Tests);
+ BOTAN_REGISTER_TEST("pubkey", "elgamal_keygen", ElGamal_Keygen_Tests);
+
+ #endif
+diff --git a/src/tests/test_workfactor.cpp b/src/tests/test_workfactor.cpp
+index fe61f80e46..8c11869c73 100644
+--- a/src/tests/test_workfactor.cpp
++++ b/src/tests/test_workfactor.cpp
+@@ -34,7 +34,7 @@ class PK_Workfactor_Tests final : public Text_Based_Test
+ }
+ else if(type == "DL_Exponent_Size")
+ {
+- output = Botan::dl_exponent_size(param_size) / 2;
++ output = Botan::dl_exponent_size(param_size);
+ }
+
+ Test::Result result(type + " work factor calculation");
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index d69b835702..844dee1f3f 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
+pkgver=5.15.1
pkgrel=0
pkgdesc="BTRFS filesystem utilities"
url="https://btrfs.wiki.kernel.org"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later LGPL-3.0-or-later"
depends_dev="linux-headers"
makedepends="$depends_dev acl-dev asciidoc attr-dev autoconf automake
e2fsprogs-dev libtool lzo-dev py3-setuptools python3-dev util-linux-dev
- xmlto zlib-dev zstd-dev"
+ xmlto zlib-dev zstd-dev eudev-dev"
subpackages="$pkgname-doc $pkgname-static $pkgname-dev
$pkgname-bash-completion
py3-$pkgname:py3 $pkgname-libs $pkgname-extra"
@@ -71,5 +71,5 @@ extra() {
}
sha512sums="
-153dc24e24cb68e2522bad94873de4e24b106fe160fbea924e132728a908219f22baacbdd224a4d1f93179ebcb265bfef6ae7e92e486f538cd40ecdc46b98efd btrfs-progs-v5.14.tar.xz
+68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549 btrfs-progs-v5.15.1.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-regressions-in-process-substitution.patch b/main/busybox/0001-ash-regressions-in-process-substitution.patch
deleted file mode 100644
index 98fdba7917..0000000000
--- a/main/busybox/0001-ash-regressions-in-process-substitution.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From dab3c63da581f0d3d58e3ea1a620474eb5dad0ee Mon Sep 17 00:00:00 2001
-From: Ron Yorston <rmy@pobox.com>
-Date: Mon, 30 Aug 2021 20:31:42 +0100
-Subject: [PATCH] ash: regressions in process substitution
-
-Stacy Harper reports that this script:
-
- test() { . /tmp/bb_test; }
- echo "export TEST=foo" >/tmp/bb_test
- test 2>/dev/null
- echo "$TEST"
-
-correctly prints 'foo' in BusyBox 1.33 but hangs in 1.34.
-
-Bisection suggested the problem was caused by commit a1b0d3856 (ash: add
-process substitution in bash-compatibility mode). Removing the call to
-unwindredir() in cmdloop() introduced in that commit makes the script
-work again.
-
-Additionally, these examples of process substitution:
-
- while true; do cat <(echo hi); done
- f() { while true; do cat <(echo hi); done }
- f
-
-result in running out of file descriptors. This is a regression from
-v5 of the process substitution patch caused by changes to evalcommand()
-not being transferred to v6.
-
-function old new delta
-static.pushredir - 99 +99
-evalcommand 1729 1750 +21
-exitreset 69 86 +17
-cmdloop 372 365 -7
-unwindredir 28 - -28
-pushredir 112 - -112
-------------------------------------------------------------------------------
-(add/remove: 1/2 grow/shrink: 2/1 up/down: 137/-147) Total: -10 bytes
-
-Signed-off-by: Ron Yorston <rmy@pobox.com>
----
- shell/ash.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/shell/ash.c b/shell/ash.c
-index b5947147a..53c140930 100644
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -10278,6 +10278,9 @@ evalcommand(union node *cmd, int flags)
-
- /* First expand the arguments. */
- TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
-+#if BASH_PROCESS_SUBST
-+ redir_stop = redirlist;
-+#endif
- file_stop = g_parsefile;
- back_exitstatus = 0;
-
-@@ -10356,7 +10359,11 @@ evalcommand(union node *cmd, int flags)
- lastarg = nargv[-1];
-
- expredir(cmd->ncmd.redirect);
-+#if !BASH_PROCESS_SUBST
- redir_stop = pushredir(cmd->ncmd.redirect);
-+#else
-+ pushredir(cmd->ncmd.redirect);
-+#endif
- preverrout_fd = 2;
- if (BASH_XTRACEFD && xflag) {
- /* NB: bash closes fd == $BASH_XTRACEFD when it is changed.
-@@ -13476,9 +13483,6 @@ cmdloop(int top)
- #if JOBS
- if (doing_jobctl)
- showjobs(SHOW_CHANGED|SHOW_STDERR);
--#endif
--#if BASH_PROCESS_SUBST
-- unwindredir(NULL);
- #endif
- inter = 0;
- if (iflag && top) {
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/APKBUILD b/main/busybox/APKBUILD
index bfeb1b45ff..ba2e285f0f 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -3,14 +3,14 @@
# Contributor: Michal Artazov <michal@artazov.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
-pkgver=1.34.0
-pkgrel=5
+pkgver=1.34.1
+pkgrel=3
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 openssl-dev libretls-dev"
+makedepends_host="linux-headers openssl1.1-compat-dev libretls-dev"
makedepends="$makedepends_build $makedepends_host"
checkdepends="zip"
provides="/bin/sh"
@@ -22,7 +22,6 @@ 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-ash-regressions-in-process-substitution.patch
0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
@@ -43,6 +42,8 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
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
+
acpid.logrotate
busyboxconfig
busyboxconfig-extras
@@ -53,6 +54,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:
@@ -65,6 +78,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
@@ -216,7 +233,7 @@ ssl_client() {
pkgdesc="EXternal ssl_client for busybox wget"
local _sslver=$(pkg-config --modversion libssl)
# automatically pull in if both busybox and libssl is installed
- install_if="$pkgname=$pkgver-r$pkgrel libssl${_sslver%.*.*}"
+ install_if="$pkgname=$pkgver-r$pkgrel libssl${_sslver%.*}"
mkdir -p "$subpkgdir"/usr/bin
install -m755 "$_dyndir"/ssl_client \
"$subpkgdir"/usr/bin/ssl_client
@@ -230,9 +247,8 @@ ifupdown() {
}
sha512sums="
-c57231e6d5dea8f2f5429673e9ea392a0f4b752731ec1f4903da8ca786914cda3065d80deeb28fb27d77848c892d587adf3b3150218d27cd87c5ece43de1b35a busybox-1.34.0.tar.bz2
+fb7e53a56c07b1098a12ee7232ad5401b147816648a0619b3b5358fdcf0915cfbb054500c0e0dd4acb3bc0a93a584b62bc5448e1f16b28004f58b39518a13b9d busybox-1.34.1.tar.bz2
054e766429887e610c4a17846f495b7099bb419217f5fcc0dce0ed62b8740c2d4ee53b12a609b1830c26ac2af1eca9beb6140063b7d2665939f99f8664dfcc05 0001-rev-correct-output-for-long-input-lines.patch
-61ee8a497ab53ef2cac88eb51929fb0b483930eabb8d015b5fea30eb21257b314b2fe9ec871d6c8b4208964eb1d8329c8db7039297e31618cf555dde65c2db8a 0001-ash-regressions-in-process-substitution.patch
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
@@ -249,6 +265,7 @@ ecbe5c890d966f09280c7eb534109f785c68e292765f17ed7ff62fcc61d20f61443c4155add0a1eb
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
+e33dbc27d77c4636f4852d5d5216ef60a9a4343484e4559e391c13c813bf65c782b889914eff2e1f038d74cf02cb0d23824ebbb1044b5f8c86260d5a1bbc4e4d 0001-pgrep-add-support-for-matching-against-UID-and-RUID.patch
aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate
e6549c9d5dbd272fe26b3e1347c84e31dbca3c57f141a345504a334c6f92016f3a3e43f3ee6777d5e382b8e6c8aeb095e11110b96c1aa2dee6c358df72c57ec4 busyboxconfig
2471879bca825af30ab3342e0c3635499f98eeed69ec2353b01c6cea1b07fee8b6f8bd4746fd2944039aa32acdec1e0c93c344a788f2f5ba4056db6182af4c02 busyboxconfig-extras
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 fb0185e474..6a4d7ab8d6 100644
--- a/main/ca-certificates/APKBUILD
+++ b/main/ca-certificates/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ca-certificates
pkgver=20191127
-pkgrel=6
+pkgrel=7
pkgdesc="Common CA certificates PEM files from Mozilla"
url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/"
arch="all"
# There is a GPL-2.0-or-later script inside the source but it is not shipped
license="MPL-2.0 AND MIT"
makedepends_build="perl"
-makedepends_host="openssl-dev"
+makedepends_host="openssl1.1-compat-dev"
subpackages="$pkgname-doc $pkgname-bundle"
# c_rehash is either in libcrypto1.0 or openssl depending on package, grr. replace both of them
replaces="libcrypto1.0 openssl openssl1.0"
diff --git a/main/ccache/APKBUILD b/main/ccache/APKBUILD
index ac6e40e029..494d1581e7 100644
--- a/main/ccache/APKBUILD
+++ b/main/ccache/APKBUILD
@@ -2,21 +2,17 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ccache
pkgver=4.3
-pkgrel=0
+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"
+makedepends="cmake zstd-dev asciidoc perl linux-headers"
checkdepends="bash"
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 \
@@ -44,4 +40,5 @@ package() {
sha512sums="
ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f ccache-4.3.tar.xz
+7780c932beeb4ae4965a1f7c8f235fa586aa65ae4768599834e441447c84be29fbf5915cbb500333b0a239a2e7552d76717f88d1f1a341ca121a9c8772518ef1 ioctl.patch
"
diff --git a/main/ccache/ioctl.patch b/main/ccache/ioctl.patch
new file mode 100644
index 0000000000..d2aac62b32
--- /dev/null
+++ b/main/ccache/ioctl.patch
@@ -0,0 +1,19 @@
+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
+
+diff -upr ccache-4.3.orig/src/Util.cpp ccache-4.3/src/Util.cpp
+--- ccache-4.3.orig/src/Util.cpp 2021-10-26 20:08:52.043967336 +0200
++++ ccache-4.3/src/Util.cpp 2021-10-26 20:09:08.797534622 +0200
+@@ -246,7 +246,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 Error(strerror(errno));
+ }
+
diff --git a/main/cgit/APKBUILD b/main/cgit/APKBUILD
index fc3c9c0eaf..930ead579d 100644
--- a/main/cgit/APKBUILD
+++ b/main/cgit/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cgit
pkgver=1.2.3
-pkgrel=1
+pkgrel=2
_gitver=2.25.1
pkgdesc="A fast webinterface for git"
url="https://git.zx2c4.com/cgit/"
arch="all"
license="GPL-2.0-only"
-makedepends="openssl-dev zlib-dev lua5.3-dev asciidoc"
+makedepends="openssl1.1-compat-dev zlib-dev lua5.3-dev asciidoc"
subpackages="$pkgname-doc"
source="http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz
https://www.kernel.org/pub/software/scm/git/git-$_gitver.tar.gz
diff --git a/main/charybdis/APKBUILD b/main/charybdis/APKBUILD
index 30ab935d33..1e1d7284ab 100644
--- a/main/charybdis/APKBUILD
+++ b/main/charybdis/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=charybdis
pkgver=4.1.2
-pkgrel=3
+pkgrel=4
pkgdesc="A highly-scalable IRCv3-compliant IRC daemon"
url="https://github.com/charybdis-ircd/charybdis"
arch="all"
license="GPL-2.0-or-later"
pkgusers="ircd"
makedepends="automake autoconf libtool
- bison flex openssl-dev zlib-dev file
+ bison flex openssl1.1-compat-dev zlib-dev file
sqlite-dev libltdl"
install="$pkgname.pre-install"
subpackages="$pkgname-openrc"
diff --git a/main/checkbashisms/APKBUILD b/main/checkbashisms/APKBUILD
index bfa337689c..6d4e28f334 100644
--- a/main/checkbashisms/APKBUILD
+++ b/main/checkbashisms/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=checkbashisms
-pkgver=2.21.2
+pkgver=2.21.4
pkgrel=0
pkgdesc="Check shell scripts for POXIX compliance"
url="https://tracker.debian.org/pkg/devscripts"
@@ -29,5 +29,5 @@ package() {
}
sha512sums="
-a6765d807dc0c2ef7a3d8c59e1262bfe7542c3ca52cda3c1910af253925cb105a9d1bf272c76a86f0b3cdda9c8a4e2d29a660437f73087dd70ee8a444bbedb01 devscripts_2.21.2.tar.xz
+99250737cabc24bbd21e20de7c787e182492e15cad4288226ed497349cbf3dd45927e1c501d73341e48dfd14ee2285c8cca8ac3b2145c2f02ce4d04ddb881e50 devscripts_2.21.4.tar.xz
"
diff --git a/main/cifs-utils/APKBUILD b/main/cifs-utils/APKBUILD
index 7caf96d1fb..63782052fd 100644
--- a/main/cifs-utils/APKBUILD
+++ b/main/cifs-utils/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=cifs-utils
-pkgver=6.13
+pkgver=6.14
pkgrel=0
pkgdesc="CIFS filesystem user-space tools"
url="https://wiki.samba.org/index.php/LinuxCIFS_utils"
@@ -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
@@ -44,6 +44,8 @@ package() {
chmod +s $pkgdir/sbin/mount.cifs
}
-sha512sums="1337ac4b69f0c3e8d0241eb608207ba81dfa35f84c661649d25da78637882c4d73467b0f632be0bd120362e0b786e40eb340bffcf21c8a09629c441100fd10de cifs-utils-6.13.tar.bz2
+sha512sums="
+dd875e110988f84ac766900426e1a75c043607de1f24b87e95cd942f2f58561e1133d16466f02863643c8395fc0160df4050636d1ce0db005f2e52a592c7f0ab cifs-utils-6.14.tar.bz2
99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch
-2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch"
+2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch
+"
diff --git a/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch b/main/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
index 674486cbe0..939a50dd09 100644
--- a/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+++ b/main/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
@@ -3,41 +3,50 @@ 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 @@
+@@ -11,6 +11,7 @@
+
+ #include "Gnu.h"
+ #include "clang/Driver/ToolChain.h"
++#include "clang/Basic/LangOptions.h"
+
+ namespace clang {
+ namespace driver {
+@@ -38,6 +39,18 @@
CXXStdlibType GetDefaultCXXStdlibType() const override;
bool isPIEDefault() const override;
bool isNoExecStackDefault() const override;
-+ unsigned GetDefaultStackProtectorLevel(bool KernelOrKext) const override;
++
++ LangOptions::StackProtectorMode
++ GetDefaultStackProtectorLevel(bool KernelOrKext) const override {
++ StringRef VendorName = Linux::getTriple().getVendorName();
++ if (VendorName.compare("alpine") == 0)
++ return LangOptions::SSPStrong;
++
++ return LangOptions::SSPOff;
++ }
++
++
++
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/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
-@@ -662,18 +662,17 @@
+@@ -667,18 +667,17 @@
// RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
// NOSP-NOT: "-fsanitize=safe-stack"
@@ -59,13 +68,11 @@ index 304e759..29ead22 100644
// 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"
+@@ -35,6 +35,20 @@
+
+ // Test default stack protector values for Darwin platforms
+// RUN: %clang -target x86_64-alpine-linux-musl -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE
+// ALPINE: "-stack-protector" "2"
@@ -81,6 +88,11 @@ index a3e40b5..60ec2a8 100644
+// 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"
+ // 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 e4324f8602..88d3ddc913 100644
--- a/main/clang/APKBUILD
+++ b/main/clang/APKBUILD
@@ -5,8 +5,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=clang
# Note: Update together with llvm.
-pkgver=11.1.0
-pkgrel=2
+pkgver=12.0.1
+pkgrel=0
_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
@@ -37,7 +34,7 @@ subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs
source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-$pkgver.src.tar.xz
https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-tools-extra-$pkgver.src.tar.xz
10-add-musl-triples.patch
- 20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+ 30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
40-fix-ld-name-on-x86.patch
"
builddir="$srcdir/clang-$pkgver.src"
@@ -177,8 +174,8 @@ python() {
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
}
-sha512sums="f4bb7e4ded61f2c489e01310432d8e062eba992d992ed65ca2e69a7c20eb5d0c90e81968baaa71c01ac9d96f814a2dcca4ef8f8bfac4cef6d7907ecece097dac clang-11.1.0.src.tar.xz
-b629b8b8c0a3390bb6cd2ce609242a6f97feea9509145a2eb5566d09359cee56fc510f21f5f8d1508ff5d612ecb9176572e6358c01cd8590fc799898c34873b6 clang-tools-extra-11.1.0.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
-80af662d9e02f6164ffc1ab70e652b27d7aea3d738d045a87369dd3287506a8eb6a7f5918afb5651b21dcedccde64c8a148bc1cadcacedb1ca532de8c1401dfb 20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
-32add4879375d47a0a6055bc45073dc1bfd06a823e59f62cc8c5cdf762393e39a923b3c5b432972f84c294773585c684f623a8ede43a8044de4f3fe9d89e40cb 40-fix-ld-name-on-x86.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 1d18a00993..639ff5b405 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=9
+pkgrel=10
pkgdesc="A C++ port of Lucene"
url="http://www.sourceforge.net/projects/clucene"
arch="all"
diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD
index 026e75e69d..6d89f25a57 100644
--- a/main/cmake/APKBUILD
+++ b/main/cmake/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cmake
-pkgver=3.21.2
+pkgver=3.21.3
pkgrel=0
pkgdesc="Cross-platform, open-source make system"
url="https://www.cmake.org/"
@@ -57,5 +57,5 @@ package() {
make DESTDIR="$pkgdir" install
}
sha512sums="
-75649404564aaa6175a8c66ab19a10318066dbb667806c287e3cb125ac4c16c1629c160e355bcc50864a38d5488b1f7d1bc77acc602f5f3edd5f68691ae5080d cmake-3.21.2.tar.gz
+0571b78443906c5ad51fb0fafbd32d565caf628cc150b1190802cb819e8497c108ea6b7ecaa03133df2dbbceb730696d24b4df38468c92088c769ce4076d9e9f cmake-3.21.3.tar.gz
"
diff --git a/main/compiler-rt/APKBUILD b/main/compiler-rt/APKBUILD
index ab8b349e58..bc1c288559 100644
--- a/main/compiler-rt/APKBUILD
+++ b/main/compiler-rt/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=compiler-rt
# Note: Update together with llvm.
-pkgver=11.1.0
+pkgver=12.0.1
pkgrel=1
_llvmver=${pkgver%%.*}
pkgdesc="LLVM compiler-rt runtime libraries"
@@ -23,7 +23,10 @@ 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
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"
+ 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"
+
builddir="$srcdir/$pkgname-$pkgver.src"
build() {
@@ -72,5 +75,7 @@ package() {
esac
}
-sha512sums="9b0b259cc43d5e4d20200676be153de81b485b3fdf065623ff71c7e1894ec5c8ed9d99c1416f70246ab0f417cbba6d1d4af9f3769e2e6577400681a791346231 compiler-rt-11.1.0.src.tar.xz
-07bf9973384151a18d5cc2892103e5f28a88c632e8e49662fde56d123632f2ed1b3710fa7a87b6b821955d0ec44160ff36f2aa4f233e389e14d628e9bf8dc764 llvm-11.1.0.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"
diff --git a/main/compiler-rt/disable-sanitizer-common.patch b/main/compiler-rt/disable-sanitizer-common.patch
new file mode 100644
index 0000000000..0036c3acc0
--- /dev/null
+++ b/main/compiler-rt/disable-sanitizer-common.patch
@@ -0,0 +1,12 @@
+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/replace-size_t-std-size-t.patch b/main/compiler-rt/replace-size_t-std-size-t.patch
new file mode 100644
index 0000000000..d18d91fb9f
--- /dev/null
+++ b/main/compiler-rt/replace-size_t-std-size-t.patch
@@ -0,0 +1,139 @@
+--- 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/coreutils/APKBUILD b/main/coreutils/APKBUILD
index 10aa518ab0..4f888be8aa 100644
--- a/main/coreutils/APKBUILD
+++ b/main/coreutils/APKBUILD
@@ -2,17 +2,17 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=coreutils
-pkgver=8.32
+pkgver=9.0
pkgrel=2
pkgdesc="The basic file, shell and text manipulation utilities"
url="https://www.gnu.org/software/coreutils/"
arch="all"
license="GPL-3.0-or-later"
-makedepends="bash acl-dev attr-dev utmps-dev perl"
+makedepends="bash acl-dev attr-dev utmps-dev perl automake autoconf"
subpackages="$pkgname-doc"
install="$pkgname.post-deinstall"
source="https://ftp.gnu.org/gnu/coreutils/coreutils-$pkgver.tar.xz
- ls.patch
+ fix-chmod-exit-code.patch
"
options="!check"
@@ -21,7 +21,7 @@ options="!check"
# - CVE-2017-18018
build() {
- CFLAGS="-I/usr/include/utmps" LIBS="-lutmps -lskarnet -lrt" ./configure \
+ CFLAGS="$CFLAGS -I/usr/include/utmps" LIBS="-lutmps -lskarnet -lrt" ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
@@ -29,7 +29,6 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--disable-nls \
- --without-gmp \
--enable-no-install-program=hostname,su,kill,uptime \
--enable-single-binary=symlinks
make
@@ -57,6 +56,9 @@ package() {
# chroot lives in /usr/sbin with busybox
rm "$pkgdir"/usr/bin/chroot
ln -s ../bin/coreutils "$pkgdir"/usr/sbin/chroot
+
+ # resolve conflict between shadow and coreutils for cmd:groups
+ rm "$pkgdir"/usr/bin/groups
}
# XXX - some gnulib tests broken, find a way to patch out gnulib tests
@@ -64,5 +66,7 @@ check() {
make check
}
-sha512sums="1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145 coreutils-8.32.tar.xz
-2742d74c45bdb52c524d415fb0787ed63164aec2c22980a1c46b40b7db2f0911008161b1219d5b571cc25de274bacc20c8be3f651906967a032a3ac9859cffce ls.patch"
+sha512sums="
+9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03 coreutils-9.0.tar.xz
+9f86dacb9c429bb0873e68f3e7b185ac8fa54f801dd00e532b01719a919e5c22ec706c58a4da4196f68f46fcd5589afc09028680ad34f89d1c16eae6e679aeca fix-chmod-exit-code.patch
+"
diff --git a/main/coreutils/fix-chmod-exit-code.patch b/main/coreutils/fix-chmod-exit-code.patch
new file mode 100644
index 0000000000..42237ad677
--- /dev/null
+++ b/main/coreutils/fix-chmod-exit-code.patch
@@ -0,0 +1,111 @@
+From e8b56ebd536e82b15542a00c888109471936bfda Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Fri, 24 Sep 2021 20:57:41 +0100
+Subject: chmod: fix exit status when ignoring symlinks
+
+* src/chmod.c: Reorder enum so CH_NOT_APPLIED
+can be treated as a non error.
+* tests/chmod/ignore-symlink.sh: A new test.
+* tests/local.mk: Reference the new test.
+* NEWS: Mention the bug fix.
+Fixes https://bugs.gnu.org/50784
+---
+ NEWS | 6 ++++++
+ src/chmod.c | 4 ++--
+ tests/chmod/ignore-symlink.sh | 31 +++++++++++++++++++++++++++++++
+ tests/local.mk | 1 +
+ 4 files changed, 40 insertions(+), 2 deletions(-)
+ create mode 100755 tests/chmod/ignore-symlink.sh
+
+diff --git a/NEWS b/NEWS
+index a1470a7d7..1cb3c28a1 100644
+--- a/NEWS
++++ b/NEWS
+@@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*-
+
+ * Noteworthy changes in release ?.? (????-??-??) [?]
+
++** Bug fixes
++
++ chmod -R no longer exits with error status when encountering symlinks.
++ All files would be processed correctly, but the exit status was incorrect.
++ [bug introduced in coreutils-9.0]
++
+
+ * Noteworthy changes in release 9.0 (2021-09-24) [stable]
+
+diff --git a/src/chmod.c b/src/chmod.c
+index 37b04f500..57ac47f33 100644
+--- a/src/chmod.c
++++ b/src/chmod.c
+@@ -44,8 +44,8 @@ struct change_status
+ enum
+ {
+ CH_NO_STAT,
+- CH_NOT_APPLIED,
+ CH_FAILED,
++ CH_NOT_APPLIED,
+ CH_NO_CHANGE_REQUESTED,
+ CH_SUCCEEDED
+ }
+@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent)
+ if ( ! recurse)
+ fts_set (fts, ent, FTS_SKIP);
+
+- return CH_NO_CHANGE_REQUESTED <= ch.status;
++ return CH_NOT_APPLIED <= ch.status;
+ }
+
+ /* 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/coreutils/ls.patch b/main/coreutils/ls.patch
deleted file mode 100644
index 0e2057caec..0000000000
--- a/main/coreutils/ls.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-../src/ls.c: In function 'print_dir':
-
-../src/ls.c:3026:24: error: 'SYS_getdents' undeclared (first use in this function); did you mean 'SYS_getdents64'?
-
- 3026 | if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1
-
- | ^~~~~~~~~~~~
-
- | SYS_getdents64
-
-../src/ls.c:3026:24: note: each undeclared identifier is reported only once for each function it appears in
-
-diff --git a/src/ls.c b/src/ls.c
-index 24b9832..64ecf40 100644
---- a/src/ls.c
-+++ b/src/ls.c
-@@ -3018,7 +3018,7 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
- if (errno != EOVERFLOW)
- break;
- }
--#ifdef __linux__
-+#if defined(__linux__) && defined(__x86_64__)
- else if (! found_any_entries)
- {
- /* If readdir finds no directory entries at all, not even "." or
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index 28da200842..8f7a7c8d94 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.2
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"
@@ -66,7 +66,7 @@ libs() {
}
sha512sums="
-b12589181e48c8ae7e95fa7d0642caa479a0000c76ac4c2f9dcacb9319512f0c079d037c6fe596639481a62b6290dd7d0bf826ac5e096c526435a8241386fe0e cryptsetup-2.4.1.tar.gz
+e5d5d089809a13a68af1ec70969463c4e3f360bc6a89ac983823bce4bb608c3722de484caa1081ace4a6b725934d7f6bc3802037f29bca986a6165ad1d3617b6 cryptsetup-2.4.2.tar.gz
a3ca3e648749136ee724692b61488cd855f118eb93435942c2b04964a34fe49d0f0da4ef64cd2531c1c0f650e77808cf5d802789fd7664398248ead668bb35e5 dmcrypt.initd
74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 dmcrypt.confd
529187851def5fbc08e995eba90d3f013f1cf8469dcb9344f83d1e3c73c71467ca4ed62c8282ec27ebfa30ccc33653fdd1aea8d1d80e1ac4293d51865c9a6200 flush-stdout.patch
diff --git a/main/ctags/APKBUILD b/main/ctags/APKBUILD
index 81ad8e4195..138c17b1fc 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.20210829.0
+pkgver=5.9.20211107.0
_realver="p$pkgver"
pkgrel=0
pkgdesc="Generator of tags for all types of C/C++ languages"
@@ -12,7 +12,8 @@ license="GPL-2.0-or-later"
checkdepends="diffutils python3"
makedepends="autoconf automake pkgconf py3-docutils"
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/universal-ctags/ctags/archive/$_realver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/universal-ctags/ctags/archive/$_realver.tar.gz
+ disable-check-genfile.patch"
builddir="$srcdir"/$pkgname-$_realver
# secfixes:
@@ -50,5 +51,6 @@ package() {
}
sha512sums="
-3f1875e310efdc8f5d231ec61768d9a4e6d128ae1f321403e0605052daa3a8f41e1a3c5a42b75ae916ddae06944a0917c27104a87c01e115b7d8f9db9e1e06ee ctags-5.9.20210829.0.tar.gz
+6900b39d54eee26e832d078acf2eee4db6132d1128ef3bdf5220efbc32da1e7e8f7f45208cc083469b28e4c5d79d7ade486efb8bc02503080eece82990faebdd ctags-5.9.20211107.0.tar.gz
+185b0647ddaba90ae386c40d75cd8cf8613a89b4d1d0d0905eb78ba3afad57cf273ab2d826053e49d22278f9d3cec97780c8f15aef13c7582658ca24708abf14 disable-check-genfile.patch
"
diff --git a/main/ctags/disable-check-genfile.patch b/main/ctags/disable-check-genfile.patch
new file mode 100644
index 0000000000..1135411ffb
--- /dev/null
+++ b/main/ctags/disable-check-genfile.patch
@@ -0,0 +1,19 @@
+The check-genfile target only works when run from inside a Git
+repository. Since we build ctags from a tagged tarball and not from the
+Git repository, invoking `git diff` fails with a usage error and causes
+`make check` to fail.
+
+This should be reported upstream.
+
+diff -upr a/makefiles/testing.mak b/makefiles/testing.mak
+--- a/makefiles/testing.mak 2021-10-02 15:48:41.000000000 +0200
++++ b/makefiles/testing.mak 2021-10-10 12:07:32.081801888 +0200
+@@ -5,7 +5,7 @@ EXTRA_DIST += misc/units misc/units.py m
+ EXTRA_DIST += misc/tlib misc/mini-geany.expected
+ MAN_TEST_TMPDIR = ManTest
+
+-check: tmain units tlib man-test check-genfile
++check: tmain units tlib man-test
+
+ # We may use CLEANFILES, DISTCLEANFILES, or etc.
+ # clean-tlib and clean-gcov are not included
diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD
index 3c89e8d21c..4422481f24 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.0
+pkgver=7.80.0
pkgrel=0
pkgdesc="URL retrival utility and library"
url="https://curl.se/"
@@ -22,6 +22,7 @@ makedepends_build="autoconf automake groff libtool perl"
subpackages="$pkgname-dbg $pkgname-static $pkgname-doc $pkgname-dev libcurl"
source="https://curl.se/download/curl-$pkgver.tar.xz"
options="net" # Required for running tests
+[ -n "$BOOTSTRAP" ] && options="$options !check" # remove python3 dependency
# secfixes:
# 7.79.0-r0:
@@ -163,5 +164,5 @@ static() {
}
sha512sums="
-68bccba61f18de9f94c311b0d92cfa6572bb7e55e8773917c13b25203164a5a9f4ef6b8ad84a14d3d5dcb286271bf18c3dd84c4ca353866763c726f9defce808 curl-7.79.0.tar.xz
+e04ddd74b0d5b3607a29bcf5d379d83a01c7dffa4ad3e2f25d8c85a3df7dbdb0625b0df1f04f02351695674502828e0e17e8b46c889cbf1e43f86d6e6dd716ab curl-7.80.0.tar.xz
"
diff --git a/main/cython/APKBUILD b/main/cython/APKBUILD
index 36c118f954..4c875a64f6 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.22
-pkgrel=2
+pkgver=0.29.24
+pkgrel=0
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
@@ -32,4 +33,7 @@ package() {
install -Dm 644 README.rst "$pkgdir/usr/share/doc/cython/readme.rst"
}
-sha512sums="b7f22112678f159bf1d0ad5fe4f7c103e96f240bab4d9dc07edd7c2f66a9887b9af72b32f1d5886361b48d428bc2b9499d3c5b59ce5af1068f20a26549783dd6 cython-0.29.22.tar.gz"
+sha512sums="
+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/dahdi-linux-lts/APKBUILD b/main/dahdi-linux-lts/APKBUILD
index ea601bed27..a721cb97d9 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.66
+_kver=5.15.6
_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/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..d8ec9d8e49 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.20211107
_pkgver=${pkgver%.*}-${pkgver##*.}
pkgrel=0
pkgdesc="Script interpreter providing curses widgets"
@@ -39,5 +39,5 @@ static() {
}
sha512sums="
-bde13aaf215127d143aa0d37989e0bacb6bc23f007681aeff27683efa01a483106710ff756358e396c23e4c1f0355cd8a2b3bb362ae1c3a1a997e00835d53c2b dialog-1.3-20210621.tgz
+a6626092692ca61209f67caa7c5dec91f637e3ff002488a0e117ec80ce8fdf0ef50d3b11f67d84d8abb06145347a100de76223fb4b1f971a755c28de1be860ac dialog-1.3-20211107.tgz
"
diff --git a/main/diffutils/APKBUILD b/main/diffutils/APKBUILD
index 544ce2d6f4..fe0cfc392c 100644
--- a/main/diffutils/APKBUILD
+++ b/main/diffutils/APKBUILD
@@ -8,6 +8,9 @@ url="https://www.gnu.org/software/diffutils/"
arch="all"
license="GPL-3.0-or-later"
checkdepends="coreutils perl"
+# cyclic dependency during bootstrap:
+# m4 -> diffutils -> coreutils -> bash -> flex -> bison -> m4
+[ -n "$BOOTSTRAP" ] && options="$options !check"
source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz
skip-test-presue-output-tty.patch
"
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 513259dd54..113f774019 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -4,10 +4,10 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dovecot
-pkgver=2.3.16
+pkgver=2.3.17
_pkgverminor=${pkgver%.*}
-pkgrel=1
-_pigeonholever=0.5.16
+pkgrel=2
+_pigeonholever=0.5.17
pkgdesc="IMAP and POP3 server"
url="https://www.dovecot.org/"
arch="all"
@@ -24,14 +24,15 @@ makedepends="
expat-dev
gettext-dev
heimdal-dev
+ icu-dev
libcap-dev
+ libpq-dev
libsodium-dev
libtool
linux-headers
mariadb-connector-c-dev
openldap-dev
openssl1.1-compat-dev
- postgresql-dev
sqlite-dev
zlib-dev
"
@@ -239,6 +240,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
}
@@ -333,8 +335,8 @@ _submv() {
}
sha512sums="
-31a9d352c7ead466d65ee0535b1fbd9138e35235f1ebfeedc4eef54cba450663c59708d162eaf0712af1c40f23526ac86aab2eece8cefde3edf690127472fd1e dovecot-2.3.16.tar.gz
-880e00654eab85cc41b27ac470cce6011991e3cdb005642f495c2297fd9492bfb2b6b4ef63c88c2ac10bec870ad69b8bee6b11dd1bc5099e16c3cc2857312543 dovecot-2.3-pigeonhole-0.5.16.tar.gz
+5b45d0f2f8af5cf095aff35f8e6a74bbbfd153b6e4596510eade671507d77476544e3a012087b4d4432c0399601f29a49cdf8b34249438f440031c8d027d1cd3 dovecot-2.3.17.tar.gz
+c4bf69504ec22de53bfeffb55fc95438fb0f648390ca6e6485f652e2e74a34cd7508390bb595b958cbabc53f0e20fbc42e163b2682dc65159fae2acafbd94bad dovecot-2.3-pigeonhole-0.5.17.tar.gz
fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a skip-iconv-check.patch
794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5 split-protocols.patch
0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07 default-config.patch
diff --git a/main/drbd-utils/APKBUILD b/main/drbd-utils/APKBUILD
index a6e5735ef9..8bb89b16f8 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.18.0
+pkgver=9.19.0
pkgrel=0
pkgdesc="Network-based RAID 1"
url="https://www.drbd.org"
@@ -13,7 +13,7 @@ options="!check" # no tests provided
provides="drbd=$pkgver-r$pkgrel"
subpackages="$pkgname-doc $pkgname-pacemaker::noarch
$pkgname-bash-completion:bashcomp:noarch $pkgname-openrc"
-source="https://www.linbit.com/downloads/drbd/utils/drbd-utils-$pkgver.tar.gz
+source="https://pkg.linbit.com//downloads/drbd/utils/drbd-utils-$pkgver.tar.gz
drbdsetup-permissions.patch
fix-drbdsetup_events2.c.patch
drbd.initd
@@ -61,7 +61,7 @@ bashcomp() {
}
sha512sums="
-1bbd3c5f744b1b2c76c1b5638efaf75de1b000ec74c5c54fa004bfc362db56a7e147a4b222a6781d0a81cd58accbb8147c28d19be9419b37f461bb90800625e9 drbd-utils-9.18.0.tar.gz
+e2dd2205a2e0b2c82ad7430146919a34cad6d5636ff9e6c229c0ab073b31f2bd02ae20027b2ec9fc5e42c52c3447f2bd671f647b4336eaf5b93d0a4029ca75b5 drbd-utils-9.19.0.tar.gz
562ae8eee03148666fb6e6e700c1eb9086f6901e176ea6cd007e3ac4e39d1cdaf967064de74dc1ad620155996dc7011bd0e2abd1c9595ff9bf5f4413673726f3 drbdsetup-permissions.patch
dc9d825019803ab5cf66d14b0b67b9d3f42cabac2aee07228176b9ff73dacc74e413f2c9ed0fe22a8217ff502c80b891950d1d4fb51df56d9c8e51e7c1fc1cc6 fix-drbdsetup_events2.c.patch
f61a833dc5eea79000a7dd85e83ae10e284109c76b5d59974ed69f92dbab6c389d6d20f7ea374b7c066519c6d1d816ed27b48dbaee6b91fb9754974acf52f46e drbd.initd
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/efitools/APKBUILD b/main/efitools/APKBUILD
index 75d5065e37..d2ff29fcea 100644
--- a/main/efitools/APKBUILD
+++ b/main/efitools/APKBUILD
@@ -3,12 +3,12 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=efitools
pkgver=1.9.2
-pkgrel=3
+pkgrel=4
pkgdesc="EFI tools"
url="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"
# riscv64: fails to build
# others: limited by sbsigntool
-#arch="all !armhf !s390x !ppc64le !mips !mips64 !riscv64"
+arch="all !armhf !s390x !ppc64le !mips !mips64 !riscv64"
license="(GPL-2.0-only AND LGPL-2.1-or-later) WITH OpenSSL-Exception"
makedepends="gnu-efi-dev openssl1.1-compat-dev perl-file-slurp help2man sbsigntool"
subpackages="$pkgname-doc"
diff --git a/main/eggdrop/APKBUILD b/main/eggdrop/APKBUILD
index 99c73fefc3..6d63c4fd8c 100644
--- a/main/eggdrop/APKBUILD
+++ b/main/eggdrop/APKBUILD
@@ -1,14 +1,13 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=eggdrop
pkgver=1.8.4
-pkgrel=2
+pkgrel=4
pkgdesc="World's most popular Open Source IRC bot"
url="https://eggheads.org/"
arch="all"
license='GPL-2.0-or-later'
options="!check" # No test suite
-depends="tcl"
-makedepends="openssl-dev tcl-dev !bind-libs"
+makedepends="openssl1.1-compat-dev tcl-dev !bind-libs"
subpackages="$pkgname-doc $pkgname-logs2html $pkgname-gseen"
source="$pkgname-$pkgver.tar.gz::https://github.com/eggheads/eggdrop/archive/v$pkgver.tar.gz
eggdrop-langdir.patch
@@ -106,8 +105,10 @@ gseen() {
cp src/mod/gseen.mod/README "$subpkgdir"/usr/share/eggdrop/gseen/
}
-sha512sums="80239a015f518cadc251bfc5edcf08715b9200a70eb0df7edf0efc113f320a7e407ab1fee96322fc6ec923781aa94f5a947c458e935e8a3714fb86cbcc02cb04 eggdrop-1.8.4.tar.gz
+sha512sums="
+80239a015f518cadc251bfc5edcf08715b9200a70eb0df7edf0efc113f320a7e407ab1fee96322fc6ec923781aa94f5a947c458e935e8a3714fb86cbcc02cb04 eggdrop-1.8.4.tar.gz
d8e8655fed028030bc3cfe28207a289d0efbc412c7e01170a4d0bb31200f7ea93df310f19e83b485013ca5d4264694b4956252663cb3a63c3d5e4cc31346e0fe eggdrop-langdir.patch
be173d94a953c4dc5b178950d06ce894deda60c3ddb8195c836797d45fbbcc9fba3bc3d3f34c96226464fdd327093a5d15bbc2b7924d18f845738c1a4dd64a3b logs2html.mod.patch
7879b998880deb1943c41569e243f9f1a50df23982d82d942af6c111e7fac0fb8a8444c84980645ba15b71dd69c8db2dab6f90bcb7a4292306011c7bcfc03d0d gseen.mod.patch
-7966d4d42994e44a0e571b89f1c66cb41f672d75e6ced7051d1ece23d8c209059c3565b41de950bf9c907701ce7a5e33a215b637587075ed300a002a58eda503 utf8.patch"
+7966d4d42994e44a0e571b89f1c66cb41f672d75e6ced7051d1ece23d8c209059c3565b41de950bf9c907701ce7a5e33a215b637587075ed300a002a58eda503 utf8.patch
+"
diff --git a/main/elinks/APKBUILD b/main/elinks/APKBUILD
index 89dd60f519..647e33b368 100644
--- a/main/elinks/APKBUILD
+++ b/main/elinks/APKBUILD
@@ -3,13 +3,13 @@
pkgname=elinks
pkgver=0.13
_ver=${pkgver/_/}
-pkgrel=7
+pkgrel=8
pkgdesc="a text mode web browser"
url="http://elinks.or.cz/"
arch="all"
license="GPL"
depends=
-makedepends="bzip2-dev zlib-dev openssl-dev expat-dev gettext-dev"
+makedepends="bzip2-dev zlib-dev openssl1.1-compat-dev expat-dev gettext-dev"
install=
subpackages="$pkgname-doc $pkgname-lang"
source="https://dev.alpinelinux.org/archive/elinks/elinks-$pkgver.tar.bz2
diff --git a/main/ell/APKBUILD b/main/ell/APKBUILD
index 07525a9976..d15b99170c 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.46
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
+f5154c5ac1aafc509b8064fa44838c6a4fb3cf3cc01b2d4dd86cfe099378a4bcc47cbe942b7dfe5b73e611c176b8c4b9eabb2e409d78b956884d5b1d38003425 ell-0.46.tar.gz
"
diff --git a/main/email/APKBUILD b/main/email/APKBUILD
index e31747f481..579aefb7c2 100644
--- a/main/email/APKBUILD
+++ b/main/email/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=email
pkgver=3.1.4
-pkgrel=10
+pkgrel=11
pkgdesc="command line SMTP client that's simple"
options="!check" # No testsuite
url="http://www.cleancode.org/projects/email"
arch="all"
license="GPL-2.0-or-later"
depends="openssl"
-makedepends="openssl-dev"
+makedepends="openssl1.1-compat-dev"
subpackages="$pkgname-doc"
source="https://dev.alpinelinux.org/archive/email/email-$pkgver.tar.gz"
builddir="$srcdir/$pkgname-3.1.3" # Release was made with the wrong tarball name
diff --git a/main/encfs/APKBUILD b/main/encfs/APKBUILD
index b036d76eba..bbd9ca95e0 100644
--- a/main/encfs/APKBUILD
+++ b/main/encfs/APKBUILD
@@ -3,12 +3,12 @@
pkgname=encfs
pkgver=1.9.5
_ver=${pkgver/_/-}
-pkgrel=10
+pkgrel=12
pkgdesc="EncFS provides an encrypted filesystem in user-space"
url="https://vgough.github.io/encfs/"
arch="all"
license="GPL-3.0-only"
-makedepends="rlog-dev openssl-dev fuse-dev boost-dev
+makedepends="rlog-dev openssl1.1-compat-dev fuse-dev boost-dev
libtool gettext-dev cmake tinyxml2-dev perl"
subpackages="$pkgname-doc $pkgname-lang $pkgname-libs"
source="$pkgname-$_ver.tar.gz::https://github.com/vgough/encfs/archive/v$_ver.tar.gz"
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..fa3b26efee 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_pre1
+_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="
+9ab36d147c2aadc82b1debb167921490fb84fdf23ce012274fb9b5f15a21ea6daa97f6c822e4fbca301414007516034c59489e4fdf393c275843bf73f68d6434 eudev-3.2.11-pre1.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 55271db629..2641d8b808 100644
--- a/main/execline/APKBUILD
+++ b/main/execline/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
# Contributor: John Regan <john@jrjrtech.com>
pkgname=execline
-pkgver=2.8.0.1
+pkgver=2.8.1.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/"
arch="all"
license="ISC"
options="!check"
-makedepends="skalibs-dev"
+makedepends="skalibs-dev>=2.11"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
source="https://skarnet.org/software/execline/execline-$pkgver.tar.gz"
@@ -37,4 +37,6 @@ static() {
rmdir -p "$pkgdir"/usr/lib || :
}
-sha512sums="280c2524d510af0e7913961505cd5bd5eb65528918ad50c638592403b569939e5357d59cd05ddbabbf5e5c2c908fd9fb2218ded16413d62bea4c984582032c08 execline-2.8.0.1.tar.gz"
+sha512sums="
+4e20ff5cd82941914a639abe2481efd93a7ada6d2431b65813793cc7801463179bc1c58ee73e889747038c859e5fd6e7e668b758fa1785da03e549547ca3c94c execline-2.8.1.0.tar.gz
+"
diff --git a/main/file/APKBUILD b/main/file/APKBUILD
index dc95111fc9..271cb267d8 100644
--- a/main/file/APKBUILD
+++ b/main/file/APKBUILD
@@ -1,18 +1,15 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=file
-pkgver=5.40
-pkgrel=1
+pkgver=5.41
+pkgrel=0
pkgdesc="File type identification utility"
url="https://www.darwinsys.com/file/"
arch="all"
license="BSD-2-Clause"
makedepends="autoconf libtool automake"
subpackages="$pkgname-dev $pkgname-doc libmagic"
-source="$pkgname-$pkgver.tar.gz::https://github.com/file/file/archive/FILE${pkgver/./_}.tar.gz
- file-5.40-magic-unsigned.patch
- file-5.40-magic-xzip.patch
- "
+source="$pkgname-$pkgver.tar.gz::https://github.com/file/file/archive/FILE${pkgver/./_}.tar.gz"
builddir="$srcdir/$pkgname-FILE${pkgver/./_}"
# secfixes:
@@ -49,6 +46,6 @@ libmagic() {
mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr
}
-sha512sums="d76bfe5326e1b40368e055c2e049a24b4ffdbd727371f4f3aa1dd3f53787d16b88550b3cc71ecf02151e2fb3e567eb2598e4707badab8c391eb71113c2dcc319 file-5.40.tar.gz
-2337fb72b94e0220e40da0d758d2a6f1592725a323080dcbf7a4ca6f37caebacc684f9fe04662624320519553bf74db704aa2922892953bb9b487eb07e95ff8f file-5.40-magic-unsigned.patch
-4e9e64c1ac0e7e95a113577a32be0fe2f2c2d9acbbe323622c2409d2e1b9f9a6cb3e8572569bbef156ca06c6470ee7db38d2579582622f224919eb37243319e5 file-5.40-magic-xzip.patch"
+sha512sums="
+efa94eec7f33b6d63e6a835987e83300accc2d81b6ea04e7bc031e4224594f96905bb5ffa8b0b3a5143084a8f5659349dffca9c78d9f444c1fd9b723ecb0c973 file-5.41.tar.gz
+"
diff --git a/main/file/file-5.40-magic-unsigned.patch b/main/file/file-5.40-magic-unsigned.patch
deleted file mode 100644
index aff1c80a42..0000000000
--- a/main/file/file-5.40-magic-unsigned.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From f06015040e7ffb3be21bb7622f9f8291b749aaf9 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Sun, 4 Apr 2021 17:46:17 +0000
-Subject: [PATCH] Fix regression after unsigned/signed printing changes by
- making types unsigned (Richard W.M. Jones)
-
----
- magic/Magdir/filesystems | 54 +++++++++++++++++++--------------------
- magic/Magdir/linux | 30 +++++++++++-----------
- tests/Makefile.am | 1 +
- tests/ext4.result | 1 +
- tests/ext4.testfile | Bin 0 -> 2048 bytes
- 5 files changed, 44 insertions(+), 42 deletions(-)
- create mode 100644 tests/ext4.result
- create mode 100644 tests/ext4.testfile
-
-diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
-index 0cb45cbfe..81966d6cc 100644
---- a/magic/Magdir/filesystems
-+++ b/magic/Magdir/filesystems
-@@ -1,5 +1,5 @@
- #------------------------------------------------------------------------------
--# $File: filesystems,v 1.140 2021/02/23 00:51:10 christos Exp $
-+# $File: filesystems,v 1.141 2021/04/04 17:46:17 christos Exp $
- # filesystems: file(1) magic for different filesystems
- #
- 0 name partid
-@@ -1739,12 +1739,12 @@
- >>>0x464 lelong >0x0000007 ext4 filesystem data
- # else large INCOMPAT?
- >>0x460 lelong >0x000003f ext4 filesystem data
-->0x468 belong x \b, UUID=%08x
-->0x46c beshort x \b-%04x
-->0x46e beshort x \b-%04x
-->0x470 beshort x \b-%04x
-->0x472 belong x \b-%08x
-->0x476 beshort x \b%04x
-+>0x468 ubelong x \b, UUID=%08x
-+>0x46c ubeshort x \b-%04x
-+>0x46e ubeshort x \b-%04x
-+>0x470 ubeshort x \b-%04x
-+>0x472 ubelong x \b-%08x
-+>0x476 ubeshort x \b%04x
- >0x478 string >0 \b, volume name "%s"
- # General flags for any ext* fs
- >0x460 lelong &0x0000004 (needs journal recovery)
-@@ -1767,12 +1767,12 @@
-
- # f2fs filesystem - Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
- 0x400 lelong 0xF2F52010 F2FS filesystem
-->0x46c belong x \b, UUID=%08x
-->0x470 beshort x \b-%04x
-->0x472 beshort x \b-%04x
-->0x474 beshort x \b-%04x
-->0x476 belong x \b-%08x
-->0x47a beshort x \b%04x
-+>0x46c ubelong x \b, UUID=%08x
-+>0x470 ubeshort x \b-%04x
-+>0x472 ubeshort x \b-%04x
-+>0x474 ubeshort x \b-%04x
-+>0x476 ubelong x \b-%08x
-+>0x47a ubeshort x \b%04x
- >0x147c lestring16 x \b, volume name "%s"
-
- # Minix filesystems - Juan Cespedes <cespedes@debian.org>
-@@ -2296,20 +2296,20 @@
- >>0x10060 string >\0 lockproto %s)
-
- # Russell Coker <russell@coker.com.au>
--0x10040 string _BHRfS_M BTRFS Filesystem
-->0x1012b string >\0 label "%s",
-->0x10090 lelong x sectorsize %d,
-->0x10094 lelong x nodesize %d,
-->0x10098 lelong x leafsize %d,
-->0x10020 belong x UUID=%08x-
-->0x10024 beshort x \b%04x-
-->0x10026 beshort x \b%04x-
-->0x10028 beshort x \b%04x-
-->0x1002a beshort x \b%04x
-->0x1002c belong x \b%08x,
-->0x10078 lequad x %lld/
-->0x10070 lequad x \b%lld bytes used,
-->0x10088 lequad x %lld devices
-+0x10040 string _BHRfS_M BTRFS Filesystem
-+>0x1012b string >\0 label "%s",
-+>0x10090 lelong x sectorsize %d,
-+>0x10094 lelong x nodesize %d,
-+>0x10098 lelong x leafsize %d,
-+>0x10020 ubelong x UUID=%08x-
-+>0x10024 ubeshort x \b%04x-
-+>0x10026 ubeshort x \b%04x-
-+>0x10028 ubeshort x \b%04x-
-+>0x1002a ubeshort x \b%04x
-+>0x1002c ubelong x \b%08x,
-+>0x10078 lequad x %lld/
-+>0x10070 lequad x \b%lld bytes used,
-+>0x10088 lequad x %lld devices
-
- # dvdisaster's .ecc
- # From: "Nelson A. de Oliveira" <naoliv@gmail.com>
-diff --git a/magic/Magdir/linux b/magic/Magdir/linux
-index 693cef6f5..f25243e20 100644
---- a/magic/Magdir/linux
-+++ b/magic/Magdir/linux
-@@ -1,6 +1,6 @@
-
- #------------------------------------------------------------------------------
--# $File: linux,v 1.77 2021/02/24 23:05:02 christos Exp $
-+# $File: linux,v 1.78 2021/04/04 17:46:17 christos Exp $
- # linux: file(1) magic for Linux files
- #
- # Values for Linux/i386 binaries, from Daniel Quinlan <quinlan@yggdrasil.com>
-@@ -83,20 +83,20 @@
-
- # format v1, supported since 1998
- 0 name linux-swap
-->0x400 lelong 1 little endian, version %u,
-->>0x404 lelong x size %u pages,
-->>0x408 lelong x %u bad pages,
-->0x400 belong 1 big endian, version %u,
-->>0x404 belong x size %u pages,
-->>0x408 belong x %u bad pages,
-->0x41c string \0 no label,
-->0x41c string >\0 LABEL=%s,
-->0x40c belong x UUID=%08x
-->0x410 beshort x \b-%04x
-->0x412 beshort x \b-%04x
-->0x414 beshort x \b-%04x
-->0x416 belong x \b-%08x
-->0x41a beshort x \b%04x
-+>0x400 lelong 1 little endian, version %u,
-+>>0x404 lelong x size %u pages,
-+>>0x408 lelong x %u bad pages,
-+>0x400 belong 1 big endian, version %u,
-+>>0x404 belong x size %u pages,
-+>>0x408 belong x %u bad pages,
-+>0x41c string \0 no label,
-+>0x41c string >\0 LABEL=%s,
-+>0x40c ubelong x UUID=%08x
-+>0x410 ubeshort x \b-%04x
-+>0x412 ubeshort x \b-%04x
-+>0x414 ubeshort x \b-%04x
-+>0x416 ubelong x \b-%08x
-+>0x41a ubeshort x \b%04x
-
- 0xff6 string SWAPSPACE2 Linux swap file, 4k page size,
- >0 use linux-swap
diff --git a/main/file/file-5.40-magic-xzip.patch b/main/file/file-5.40-magic-xzip.patch
deleted file mode 100644
index e4fed0421f..0000000000
--- a/main/file/file-5.40-magic-xzip.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9b0459afab309a82aa4e46f73a4e50dd641f3d39 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 19 Apr 2021 17:01:45 +0000
-Subject: [PATCH] PR/257: cuihao: put attributes inside the xz magic.
-
----
- magic/Magdir/compress | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/magic/Magdir/compress b/magic/Magdir/compress
-index 64d11a736..41a65738f 100644
---- a/magic/Magdir/compress
-+++ b/magic/Magdir/compress
-@@ -1,5 +1,5 @@
- #------------------------------------------------------------------------------
--# $File: compress,v 1.80 2021/03/15 17:49:24 christos Exp $
-+# $File: compress,v 1.81 2021/04/19 17:01:45 christos Exp $
- # compress: file(1) magic for pure-compression formats (no archives)
- #
- # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
-@@ -265,14 +265,13 @@
-
- # http://tukaani.org/xz/xz-file-format.txt
- 0 ustring \xFD7zXZ\x00 XZ compressed data, checksum
-+!:strength * 2
-+!:mime application/x-xz
- >7 byte&0xf 0x0 NONE
- >7 byte&0xf 0x1 CRC32
- >7 byte&0xf 0x4 CRC64
- >7 byte&0xf 0xa SHA-256
-
--!:strength * 2
--!:mime application/x-xz
--
- # https://github.com/ckolivas/lrzip/blob/master/doc/magic.header.txt
- 0 string LRZI LRZIP compressed data
- >4 byte x - version %d
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index 54511e7ea7..60b64a3dec 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -4,8 +4,8 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=freeradius
-pkgver=3.0.23
-pkgrel=2
+pkgver=3.0.25
+pkgrel=1
pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
url="https://freeradius.org/"
arch="all"
@@ -20,6 +20,7 @@ makedepends="
json-c-dev
krb5-dev
libpcap-dev
+ libpq-dev
libtool
linux-headers
linux-pam-dev
@@ -28,7 +29,6 @@ makedepends="
openldap-dev
openssl1.1-compat-dev
perl-dev
- postgresql-dev
python3-dev
readline-dev
sqlite-dev
@@ -69,13 +69,15 @@ source="ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-$pkgver.tar.gz
radiusd.initd
setup-freeradius.in
print-var.mk
+ radacct-rotate
+ radacct-rotate.conf
+ radacct-rotate.crond
musl-fix-headers.patch
fix-scopeid.patch
default-config.patch
remove-eap-from-default-mods.patch
readme-setup-script.patch
- fix-request_running-segfault.patch
dont-install-test-tools.patch
"
builddir="$srcdir/$pkgname-server-$pkgver"
@@ -167,6 +169,10 @@ package() {
install -m644 -D "$srcdir"/$pkgname.logrotated "$pkgdir"/etc/logrotate.d/$pkgname
install -m755 -D setup-freeradius "$pkgdir"/usr/sbin/setup-freeradius
+ install -m755 -D "$srcdir"/radacct-rotate -t "$pkgdir"/usr/bin/
+ install -m644 -D "$srcdir"/radacct-rotate.conf -t "$pkgdir"/etc/raddb/
+ install -m755 -D "$srcdir"/radacct-rotate.crond "$pkgdir"/etc/periodic/daily/radacct-rotate
+
# Install misses to create this
mkdir -p "$pkgdir"/$_radmodsconfdir/sql/ippool-dhcp/postgresql
@@ -369,6 +375,9 @@ utils() {
replaces="freeradius-radclient"
amove usr/bin/*
+
+ mkdir -p "$pkgdir"/usr/bin
+ mv "$subpkgdir"/usr/bin/radacct-rotate "$pkgdir"/usr/bin/
}
_mvdb() {
@@ -382,17 +391,19 @@ _enable_mod() {
}
sha512sums="
-8ba2825d026c9639b15f45afaf4e26a33efec565b485890f6fef9f103a2eafc3a078c4ac404456688d203ccbe5adf5862d7129d64f396e1aa0e71a17d17c4f21 freeradius-server-3.0.23.tar.gz
-c3ae1ee6bd7743f883310612ba2c20c6ff7f288fedc308735df05b097ecb2f7fa4d1679b844e262757808978c7bb2d7630b99e4b87ce6d6ba7f84013f9c49f1d freeradius.logrotated
+30a2125f1b823acb3c6f32158e327f4d49503b11e4d9cde64f12ba6e94cbd02d52d7b947d2d68f66f4c71374dcd2435f06e2067404515cd27a610dcd316127a3 freeradius-server-3.0.25.tar.gz
+52ecccd479bb22c80d5cc298d9d1c12bd2d1a9d80e1265ba032201f3942370910fa78f3bb429031d91bc89712fa2127f16cd68814489cbc99d174fbf5789875f freeradius.logrotated
bb3df1fa2c9ed95514ae090e0f6619c4e3280f424c4351bc79f5254bf1a327fa7d27e5fe3add5ab8d9e5ba3792c9553bd9a0481fe9c5bc34945ce46627ef2638 radiusd.confd
5a8579f06e905117c67f87f0833d0760e81e64f97de7672ecee45775733fae05763edb91c472e313bf58523c713f86815e47cc39c841f4c141aa59a5930113c6 radiusd.initd
9f6a4f76fd06e81cfcfe4536f1f8be494634b07e548a6f7e651e5501aded24b030ed7d57dbdc867ae0eb39ee4a090234c4122a89bed84c13733c77de36b9c2cf setup-freeradius.in
5f940e200aa39b2fbbfaf5b24f2ad99869fa75bb7e2008876940ea96cb9dbc7f2b27dd1672aa56cdb5243faabdcbc38875594dd8792af965987183c0aa2aefd1 print-var.mk
+4fbd774618d41a28a5874fd5bd96ccf6ab5ea38e4a97b1671bd51f6d07476985629dabc0a7300b3287bd223c62496c930bc555bb617739d6383afd5d55c97501 radacct-rotate
+2cecaae9bf9dd88f7c4344f2b08977c46d4831e733b82adcf6cf9553c1a77363dac9f1784f9eb9cf93d46c3da10a10d548a1071cdb0cd49e1319a62b7d5a357b radacct-rotate.conf
+52c477b4d13009bc3776ed889feeb4b1ea8d85bb97b0031b1d2d4c04e6466fcb4e9a16e556e861e7ec56acb54624bea39d73d44802535aa39d3dc84580d95775 radacct-rotate.crond
c49e5eec7497fccde5fd09dba1ea9b846e57bc88015bd81640aa531fb5c9b449f37136f42c85fe1d7940c5963aed664b85da28442b388c9fb8cc27873df03b2d musl-fix-headers.patch
41d478c0e40ff82fc36232964037c1ab8ffca9fdbb7dca02ed49319906e751c133b5d7bc7773c645cec6d9d39d1de69cba25e8d59afa8d6662563dd17f35f234 fix-scopeid.patch
-1eabdb7d8954331e7bf3c002dafd496289c8b67526d0fa07b11cf129c41c3f9a3beae241e911b6b9ea3f86bbdeaabf158bfbf502a8cd1da80cd194515af671eb default-config.patch
+caf85ffb96e08ad8314fe72aac052948b2461f94bb21e20ea34925534ee1ef682284457318d50df813ba167a8cb4b520c5a0f38d86de21cd56e8391f299a5dd6 default-config.patch
f96b7b2e0fc614cb8b70bd500933538e98e05b58718af931a62bc7ba2307600cf8c2a8a99de856ad2e18101dd5bfe95c50ee34de20eef21ba0ad795577a6619b remove-eap-from-default-mods.patch
55e179d5e6b31d289c2da7f907e494a6a6f5900483fdff8d3bb25ee15a583b8705942eca1f0d5390e91376966e66e457dce9b2cf1a1f61c8eac6d8fb825404dd readme-setup-script.patch
-7ddf75901f635216b0d972c14631334a8138e0dbb021685bb6b3a996f38d232b84146c621dae541b00f6149fa401e835d1579bbacd27fad72a80bacd4391b404 fix-request_running-segfault.patch
908c4408ab6538ddd96577e47d5e509b19e227e144655eaa0fd7569ddadbe5b2298e6599b8370847b3bcb5e788067b163b0cb66e1b3afa4d83dc3f724e058674 dont-install-test-tools.patch
"
diff --git a/main/freeradius/default-config.patch b/main/freeradius/default-config.patch
index 16d0bde28c..1c31e19e5c 100644
--- a/main/freeradius/default-config.patch
+++ b/main/freeradius/default-config.patch
@@ -1,7 +1,13 @@
From f37bee486aca3de86b594770f0b2b3ff8e96596a Mon Sep 17 00:00:00 2001
-From: Leonardo Arena <rnalrd@alpinelinux.org>
+From: Jakub Jirutka <jakub@jirutka.cz>
Date: Tue, 18 May 2021 14:10:00 +0000
-Subject: [PATCH] default config
+Subject: [PATCH] Adjust default config
+
+- Fix default location of db_dir and run_dir.
+- Remove pidfile - this is handled by OpenRC.
+- Change default sqlite db path to a reasonable location.
+- Change default cui sqlite location to $db_dir/.
+- Change default cache paths to /var/cache/radiusd.
---
raddb/mods-available/cui | 2 +-
diff --git a/main/freeradius/fix-request_running-segfault.patch b/main/freeradius/fix-request_running-segfault.patch
deleted file mode 100644
index d1ca890302..0000000000
--- a/main/freeradius/fix-request_running-segfault.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 30ffd2174ec0acd1c5b4b4988d522c24d80a1049 Mon Sep 17 00:00:00 2001
-From: "Alan T. DeKok" <aland@freeradius.org>
-Date: Wed, 20 Nov 2019 08:30:42 -0500
-Subject: [PATCH] home_server may be NULL if proxying fails
-
----
- src/main/process.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/main/process.c b/src/main/process.c
-index 78c6d8a9e5..c8b3af24e2 100644
---- a/src/main/process.c
-+++ b/src/main/process.c
-@@ -1642,7 +1642,8 @@ static void request_running(REQUEST *request, int action)
- * handler.
- */
- if (request_proxy(request) < 0) {
-- if (request->home_server && request->home_server->server) goto req_finished;
-+ if (!request->home_server ||
-+ (request->home_server && request->home_server->server)) goto req_finished;
-
- (void) setup_post_proxy_fail(request);
- process_proxy_reply(request, NULL);
diff --git a/main/freeradius/freeradius.logrotated b/main/freeradius/freeradius.logrotated
index 1975caee75..4b6d9455ba 100644
--- a/main/freeradius/freeradius.logrotated
+++ b/main/freeradius/freeradius.logrotated
@@ -18,13 +18,6 @@
su radius radius
}
-# There are different detail-rotating strategies you can use. One is
-# to write to a single detail file per IP and use the rotate config
-# below. Another is to write to a daily detail file per IP with:
-# detailfile = ${radacctdir}/%{Client-IP-Address}/%Y%m%d-detail
-# (or similar) in radiusd.conf, without rotation. If you go with the
-# second technique, you will need another cron job that removes old
-# detail files. You do not need to comment out the below for method #2.
/var/log/radius/radacct/*/detail {
missingok
compress
@@ -32,3 +25,6 @@
nocreate
su radius radius
}
+
+# NOTE: Files in /var/log/radius/radacct/*/ with "-YYYYMMDD" suffix are
+# compressed and later removed by script radacct-rotate executed daily by cron.
diff --git a/main/freeradius/radacct-rotate b/main/freeradius/radacct-rotate
new file mode 100644
index 0000000000..5dc03458c3
--- /dev/null
+++ b/main/freeradius/radacct-rotate
@@ -0,0 +1,87 @@
+#!/bin/sh
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2021 Jakub Jirutka <jakub@jirutka.cz>
+#---help---
+# Usage: radacct-rotate [options]
+#
+# Compress and later remove old FreeRADIUS' radacct log files with "-YYYYMMDD"
+# suffix. This script is provided by the freeradius package in Alpine Linux.
+#
+# Options:
+# -C FILE Location of radacct-rotate config file (defaults to
+# /etc/raddb/radacct-rotate.conf).
+#
+# -c DAYS Compress files older than DAYS (overrides option
+# compress_after_days from the config).
+#
+# -r DAYS Remove compressed files older than DAYS (overrides
+# option remove_after_days from the config).
+#
+# -d Run in dry-run mode (only print what would be done).
+#
+# -h Show this message and exit.
+#---help---
+set -eu
+
+readonly PROGNAME='radacct-rotate'
+# Y Y Y Y m m d d
+readonly DATE_GLOB='[1-9][0-9][0-9][0-9][0-1][0-9][0-3][0-9]'
+readonly HELP_TAG='#---help---'
+
+# Defaults
+CONFIG='/etc/raddb/radacct-rotate.conf'
+DRY_RUN=false
+radacct_dir='/var/log/radius/radacct'
+compress_cmd='gzip -9'
+compress_ext='.gz'
+compress_after_days=2
+remove_after_days=180
+
+while getopts ':C:c:dr:h' OPT; do
+ case "$OPT" in
+ C) CONFIG=$OPTARG;;
+ c) COMPRESS_AFTER_DAYS=$OPTARG;;
+ d) DRY_RUN=true;;
+ r) REMOVE_AFTER_DAYS=$OPTARG;;
+ h) sed -n "/^$HELP_TAG/,/^$HELP_TAG/{/^$HELP_TAG/d; s/^# \\?//; p;}" "$0"; exit 0;;
+ \?) echo "$PROGNAME: invalid option: -$OPTARG (see '$PROGNAME -h')" >&2; exit 100;;
+ esac
+done
+
+readonly CONFIG COMPRESS_AFTER_DAYS DRY_RUN REMOVE_AFTER_DAYS
+
+sh -n "$CONFIG" || exit 100
+. "$CONFIG"
+
+compress_after_days=${COMPRESS_AFTER_DAYS:-$compress_after_days}
+remove_after_days=${REMOVE_AFTER_DAYS:-$remove_after_days}
+
+
+find_compressible() {
+ find "$radacct_dir" -type f -name "*-$DATE_GLOB" -mtime "+$compress_after_days" "$@"
+}
+
+find_deletable() {
+ find "$radacct_dir" -type f -name "*-${DATE_GLOB}${compress_ext}" -mtime "+$remove_after_days" "$@"
+}
+
+check_number() {
+ case "$1" in
+ ''|*[!0-9]*) echo "$PROGNAME: option '$2' must be a number, but given: '$1'" >&2; exit 100;;
+ esac
+}
+check_number "$compress_after_days" 'compress_after_days'
+check_number "$remove_after_days" 'remove_after_days'
+
+rc=0
+if $DRY_RUN; then
+ find_compressible -exec echo $compress_cmd {} \; || rc=111
+ find_deletable -exec echo rm {} \; || rc=111
+else
+ for path in $(find_compressible -print); do
+ $compress_cmd "$path" >&2 && touch -ct "${path##*-}0000" "$path".* || rc=111
+ done
+ find_deletable -exec rm '{}' \; >&2 || rc=111
+fi
+
+exit $rc
diff --git a/main/freeradius/radacct-rotate.conf b/main/freeradius/radacct-rotate.conf
new file mode 100644
index 0000000000..4f9003a701
--- /dev/null
+++ b/main/freeradius/radacct-rotate.conf
@@ -0,0 +1,26 @@
+# Configuration file for radacct-rotate
+#
+# Script radacct-rotate compresses and removes old log files with suffix
+# "-YYYYMMDD" (e.g. detail-20210921) found in /var/log/radius/radacct/*/.
+#
+# The age of the files is determined by their time of last modification
+# (see stat(1)). When the file is compressed, its modification time is set
+# to the date encoded in the file name.
+
+# Set to "yes" to disable cron script /etc/periodic/daily/radacct-rotate.
+#cron_disabled=no
+
+# Compress files older than specified number of days.
+#compress_after_days=3
+
+# Remove files older than specified number of days.
+#remove_after_days=180
+
+# Location of the radacct directory.
+#radacct_dir="/var/log/radius/radacct"
+
+# Specifies which command (and arguments) to use to compress files.
+# It must produce compressed file with ${compress_ext} extension and remove
+# the original file.
+#compress_cmd="gzip -9"
+#compress_ext=".gz"
diff --git a/main/freeradius/radacct-rotate.crond b/main/freeradius/radacct-rotate.crond
new file mode 100644
index 0000000000..69a21df96f
--- /dev/null
+++ b/main/freeradius/radacct-rotate.crond
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+: ${RADACCT_ROTATE_CONFIG:="/etc/raddb/radacct-rotate.conf"}
+
+/bin/sh -n "$RADACCT_ROTATE_CONFIG" 2>/dev/null || exit 0
+
+. "$RADACCT_ROTATE_CONFIG"
+[ "$cron_disabled" = yes ] && exit 0
+
+exec /usr/bin/radacct-rotate
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 c2b13d8649..45c0766dae 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -1,35 +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=0
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
@@ -39,11 +36,12 @@ makedepends="
pcre-dev
perl-dev
portaudio-dev
- postgresql-dev
+ python3-dev
sngtc_client-dev
speex-dev
speexdsp-dev
sqlite-dev
+ libsrtp-dev
tiff-dev
unixodbc-dev
util-linux-dev
@@ -62,17 +60,18 @@ _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
modules.conf
freeswitch.confd
freeswitch.initd
@@ -80,6 +79,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 +107,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 +146,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 +164,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 +204,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 +223,16 @@ 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
+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/freetdm/APKBUILD b/main/freetdm/APKBUILD
new file mode 100644
index 0000000000..9e55b5a500
--- /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=0
+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/fribidi/APKBUILD b/main/fribidi/APKBUILD
index a8bc91a18c..96b36a9446 100644
--- a/main/fribidi/APKBUILD
+++ b/main/fribidi/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fribidi
-pkgver=1.0.10
+pkgver=1.0.11
pkgrel=0
pkgdesc="Free Implementation of the Unicode Bidirectional Algorithm"
url="https://github.com/fribidi/fribidi"
@@ -30,4 +30,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360 fribidi-1.0.10.tar.xz"
+sha512sums="
+6afde86784de06759f18235ccb44f23261a975f7cce0021b16755065a6a8ed84d7d5fb7fdcaadd691b48011efb4bfc2ee67555e5133a294a418cca1a0c85476c fribidi-1.0.11.tar.xz
+"
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/gc/APKBUILD b/main/gc/APKBUILD
index d8699c1ac0..bbf6967ae4 100644
--- a/main/gc/APKBUILD
+++ b/main/gc/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gc
-pkgver=8.0.4
-pkgrel=5
-pkgdesc="A garbage collector for C and C++"
+pkgver=8.0.6
+pkgrel=0
+pkgdesc="garbage collector for C and C++"
url="https://hboehm.info/gc/"
arch="all"
license="custom:GPL-like"
makedepends="linux-headers"
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc libgc++:libgccpp"
-source="http://hboehm.info/gc/gc_source/gc-$pkgver.tar.gz
+source="https://github.com/ivmai/bdwgc/releases/download/v$pkgver/gc-$pkgver.tar.gz
0001-Fix-gctest-with-musl-libc-on-s390x.patch
data_start_riscv64.patch
"
@@ -32,7 +32,6 @@ build() {
}
check() {
- # two FAILs due to grsecurity
make check
}
@@ -45,6 +44,8 @@ libgccpp() {
mv "$pkgdir"/usr/lib/libgccpp.* "$subpkgdir"/usr/lib/
}
-sha512sums="57ccca15c6e50048d306a30de06c1a844f36103a84c2d1c17cbccbbc0001e17915488baec79737449982da99ce5d14ce527176afae9ae153cbbb5a19d986366e gc-8.0.4.tar.gz
+sha512sums="
+2ea25003d585118e3ac0e12be9240e8195db511c6e94949f20453dc3cb771380bd5b956c04243b2a8ce31508587aa32de4f0f10a813577e6dbe8367688b7614e gc-8.0.6.tar.gz
0441dfe85b36e9e80b9135d62d56e5e9b67c6db1f927480dd3cf5048765f3a2ab51a45eaa0068066af97ce0398333890fff2f84cd01fec476655f34e0325bc13 0001-Fix-gctest-with-musl-libc-on-s390x.patch
-0348e224e0daeedafbd0776eca3e020ac7b6587ec208b4fd8101b220d7c02521650555740931715c700f36802917427ccdd120051906818085cfb3590dd103b4 data_start_riscv64.patch"
+0348e224e0daeedafbd0776eca3e020ac7b6587ec208b4fd8101b220d7c02521650555740931715c700f36802917427ccdd120051906818085cfb3590dd103b4 data_start_riscv64.patch
+"
diff --git a/main/gcc/0001-posix_memalign.patch b/main/gcc/0001-posix_memalign.patch
index 50d489dffe..f41493c816 100644
--- a/main/gcc/0001-posix_memalign.patch
+++ b/main/gcc/0001-posix_memalign.patch
@@ -1,4 +1,4 @@
-From 0f6c64b962bb3bf75f15aec350a9d6f8997fa814 Mon Sep 17 00:00:00 2001
+From a858e4eb74d68ef1cf7a30d6a60fb32c621267c6 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.31.1
+2.34.0
diff --git a/main/gcc/0002-gcc-poison-system-directories.patch b/main/gcc/0002-gcc-poison-system-directories.patch
index 44a79d25b5..a3c61fb0dd 100644
--- a/main/gcc/0002-gcc-poison-system-directories.patch
+++ b/main/gcc/0002-gcc-poison-system-directories.patch
@@ -1,4 +1,4 @@
-From 2f5ca6e3850401c628c5cc18cd606134e8b29113 Mon Sep 17 00:00:00 2001
+From 6317101c9bb0616db0b919ed945466c4161ea7f1 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 8fe9c91fd7c..17b878e4b4e 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 8fe9c91fd7c..17b878e4b4e 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 8fe9c91fd7c..17b878e4b4e 100755
diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 84dceb8074a..bf64ffbe46f 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 84dceb8074a..bf64ffbe46f 100644
AC_SUBST(subdirs)
AC_SUBST(srcdir)
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index eabeec944e7..cd31b522e42 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 eabeec944e7..cd31b522e42 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
-@@ -6926,6 +6927,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 eabeec944e7..cd31b522e42 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.31.1
+2.34.0
diff --git a/main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch b/main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
index 334d17e7ee..5f45aeadbd 100644
--- a/main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+++ b/main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
@@ -1,4 +1,4 @@
-From ef512b8fcf9c7628267ff2dbb127aa094f6754f3 Mon Sep 17 00:00:00 2001
+From c23602c67fd4ca33eb1f819f28f03eef50905265 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.
@@ -9,10 +9,10 @@ Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
2 files changed, 4 insertions(+)
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index cd31b522e42..17d371ef432 100644
+index 9d1126e9751..46e45274859 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
-@@ -14663,6 +14663,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}.
@@ -23,10 +23,10 @@ index cd31b522e42..17d371ef432 100644
@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..8c15de433ee 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 \
@@ -35,5 +35,5 @@ index b2200c5185a..625c9ab7902 100644
%{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
%{Wno-poison-system-directories:--no-poison-system-directories} \
--
-2.31.1
+2.34.0
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 4b87403e93..833f9d5718 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 3c848f2fbde81db336ec97d9be7a5a4a05015eef Mon Sep 17 00:00:00 2001
+From abb8ccb0dcd381e9daeb43be2d32afd0ab7c83c5 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 17d371ef432..fe793ac08db 100644
+index 46e45274859..1b4a698a191 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
-@@ -9230,6 +9230,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 17d371ef432..fe793ac08db 100644
@opindex O3
Optimize yet more. @option{-O3} turns on all optimizations specified
--
-2.31.1
+2.34.0
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 db843a4492..9f927abbdb 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 3a2f4efa70110f6d11fd4c6a8e11559c6ef720f1 Mon Sep 17 00:00:00 2001
+From 22071923bf903a7bf851d1e59dcc1d07c6b0e876 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 8c15de433ee..be1508e5abe 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.31.1
+2.34.0
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 aca0075a91..d8843fd180 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 44b1a01cbe3932122112f38e06a21b1c9efad568 Mon Sep 17 00:00:00 2001
+From 622ce6893c48eaa87beb7399ecb73bdadc9b7b84 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.31.1
+2.34.0
diff --git a/main/gcc/0007-Enable-Wtrampolines-by-default.patch b/main/gcc/0007-Enable-Wtrampolines-by-default.patch
index 515d5e0bad..cbfe46c495 100644
--- a/main/gcc/0007-Enable-Wtrampolines-by-default.patch
+++ b/main/gcc/0007-Enable-Wtrampolines-by-default.patch
@@ -1,4 +1,4 @@
-From 5679adc04a200e3a1a8dd77466eb79d03da8bf8a Mon Sep 17 00:00:00 2001
+From ad29ab28462968097dad017f03c4db40f4d83174 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.31.1
+2.34.0
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 9530fae51c..39dc6400fa 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 0bff64690e937297abc75eee5a2916fdd314b054 Mon Sep 17 00:00:00 2001
+From 0fd84cfeabaf572f5f901fa7d13298286d84992b 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 be1508e5abe..e495b222095 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.31.1
+2.34.0
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 c4cd1fe2c5..5093eefc97 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 27863679bde671cdd354cba398ef71a956873e6a Mon Sep 17 00:00:00 2001
+From b788f9a685522fdd615c2c9aa7feab974c6d6b09 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.31.1
+2.34.0
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 4fbd367b8e..1e76275442 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 953779008f2caa78c55f80c2d6096bf627080016 Mon Sep 17 00:00:00 2001
+From 1f2c3d7a0d1c35cb8281c5d97eb8ecfe2987e8b3 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.31.1
+2.34.0
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 0e8f83fe9e..4022561e95 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 b43185f44ed438267db101fbe41361001c4e8a94 Mon Sep 17 00:00:00 2001
+From a110462c21bc26c6c3c8d3265d3f146d1b9bddae 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.31.1
+2.34.0
diff --git a/main/gcc/0012-libitm-disable-FORTIFY.patch b/main/gcc/0012-libitm-disable-FORTIFY.patch
index 0f262f22a6..b118ad486e 100644
--- a/main/gcc/0012-libitm-disable-FORTIFY.patch
+++ b/main/gcc/0012-libitm-disable-FORTIFY.patch
@@ -1,4 +1,4 @@
-From 10f38bef9af2e3d6a32253ca18d5ae0123e25e1b Mon Sep 17 00:00:00 2001
+From e0ad9c8c39f35a47c6a4c34ae161d768bf2f6fcc 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.31.1
+2.34.0
diff --git a/main/gcc/0013-libgcc_s.patch b/main/gcc/0013-libgcc_s.patch
index 55692211b0..4e1631d678 100644
--- a/main/gcc/0013-libgcc_s.patch
+++ b/main/gcc/0013-libgcc_s.patch
@@ -1,4 +1,4 @@
-From 3614b3586d4a0f75e454943895977a9df1b734d5 Mon Sep 17 00:00:00 2001
+From 57309d5900d3bc974b9a3efff34fdc601014b386 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.31.1
+2.34.0
diff --git a/main/gcc/0014-nopie.patch b/main/gcc/0014-nopie.patch
index 1ca5745697..a51d4c6934 100644
--- a/main/gcc/0014-nopie.patch
+++ b/main/gcc/0014-nopie.patch
@@ -1,4 +1,4 @@
-From 8e58f9aa5b86dc92e5a1fa71e40e499739473894 Mon Sep 17 00:00:00 2001
+From d10ec6f4bea9d3f07d3ada43da129a4b5812fd65 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 17b878e4b4e..808570b6c99 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 17b878e4b4e..808570b6c99 100755
diff --git a/gcc/configure.ac b/gcc/configure.ac
-index bf64ffbe46f..9c2571de709 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 bf64ffbe46f..9c2571de709 100644
AC_SUBST([NO_PIE_FLAG])
--
-2.31.1
+2.34.0
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 b36fa1ea20..699e09562b 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 c5ee6bb497f640877be668428292487eb026d79e Mon Sep 17 00:00:00 2001
+From 2640a3cf5ecfaf532448baa66ea138c3ef02dec1 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.31.1
+2.34.0
diff --git a/main/gcc/0016-dlang-update-zlib-binding.patch b/main/gcc/0016-dlang-update-zlib-binding.patch
index 8a99d5c548..37d4117aa2 100644
--- a/main/gcc/0016-dlang-update-zlib-binding.patch
+++ b/main/gcc/0016-dlang-update-zlib-binding.patch
@@ -1,4 +1,4 @@
-From b2e1bf216169f470ced86f1f3e95c89debf606cd Mon Sep 17 00:00:00 2001
+From 60d97064fb53a99c6189f9cb81824a70d435d2d1 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.31.1
+2.34.0
diff --git a/main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch b/main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
index b10008fae7..0b05c3564b 100644
--- a/main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+++ b/main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
@@ -1,4 +1,4 @@
-From 76c7eb27b9dfe96f2f1db4fa6f29ce28715ad2a4 Mon Sep 17 00:00:00 2001
+From 8524e44401fa57f6bdf78f39fb60cbb76046d256 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
@@ -9,10 +9,10 @@ Subject: [PATCH] dlang: fix fcntl on mips, add libucontext dep
2 files changed, 16 insertions(+)
diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
-index 94e42bf5509..73f2e4b7f01 100644
+index 88c027d0c28..48ef12aaa5e 100644
--- a/libphobos/configure.tgt
+++ b/libphobos/configure.tgt
-@@ -35,6 +35,7 @@ case "${target}" in
+@@ -38,6 +38,7 @@ case "${target}" in
;;
mips*-*-linux*)
LIBPHOBOS_SUPPORTED=yes
@@ -21,10 +21,10 @@ index 94e42bf5509..73f2e4b7f01 100644
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 +47,5 @@ index 9febcff849b..cb34e2108bd 100644
static assert(0, "Platform not supported");
--
-2.31.1
+2.34.0
diff --git a/main/gcc/0018-ada-fix-shared-linking.patch b/main/gcc/0018-ada-fix-shared-linking.patch
index 83cd1d573f..cbed48d662 100644
--- a/main/gcc/0018-ada-fix-shared-linking.patch
+++ b/main/gcc/0018-ada-fix-shared-linking.patch
@@ -1,4 +1,4 @@
-From 95fee2cfb1a6a32b7e671861b58ee93978ba16b8 Mon Sep 17 00:00:00 2001
+From 03810f135f7106da0b9fef6c60c9def8b1891940 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.31.1
+2.34.0
diff --git a/main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch b/main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
index 34c2da12d7..dbb474047d 100644
--- a/main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+++ b/main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
@@ -1,4 +1,4 @@
-From aa0311c59892d7fbc4ffa9e2f0520391521cc4dd Mon Sep 17 00:00:00 2001
+From b0eafa664f78c3d3f5d9bf38ece54777119c8e6e 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.31.1
+2.34.0
diff --git a/main/gcc/0020-add-fortify-headers-paths.patch b/main/gcc/0020-add-fortify-headers-paths.patch
index f445401740..62c748eb84 100644
--- a/main/gcc/0020-add-fortify-headers-paths.patch
+++ b/main/gcc/0020-add-fortify-headers-paths.patch
@@ -1,4 +1,4 @@
-From 39e86416709d3d34f46da7cd7b8a3e5a8f0ff7cd Mon Sep 17 00:00:00 2001
+From 8dda8a6e1bd6f49f687f9b6725e704eaa0b25873 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.31.1
+2.34.0
diff --git a/main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch b/main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
index 073d56f5eb..ff2c2be4b8 100644
--- a/main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+++ b/main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
@@ -1,4 +1,4 @@
-From c6b54651688cf062ae48ca3402d6d2e08b70ceed Mon Sep 17 00:00:00 2001
+From 06a8b9fd165032afd96facc5c4e608bfe09ecbea 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 e495b222095..ab8866f409f 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.31.1
+2.34.0
diff --git a/main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch b/main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
index 684041c55d..198f477605 100644
--- a/main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+++ b/main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
@@ -1,4 +1,4 @@
-From 4841bee243517cd52504f97ea934f44bc0c1fd5c Mon Sep 17 00:00:00 2001
+From c279684da1a93b3009c24b7236e2a58c3eb2fe9c 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 ab8866f409f..5093e8bbfd2 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.31.1
+2.34.0
diff --git a/main/gcc/0023-Pure-64-bit-MIPS.patch b/main/gcc/0023-Pure-64-bit-MIPS.patch
index c8f9c98afc..60571ddaab 100644
--- a/main/gcc/0023-Pure-64-bit-MIPS.patch
+++ b/main/gcc/0023-Pure-64-bit-MIPS.patch
@@ -1,4 +1,4 @@
-From 720c0d7094d27b6cbfe9669c4f65e2021debcb07 Mon Sep 17 00:00:00 2001
+From 249a08b7257fa09d572933142cc9146c92f38dd2 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
@@ -9,10 +9,10 @@ Subject: [PATCH] Pure 64-bit MIPS
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 +29,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 +43,5 @@ index ceb58d3b5f3..8116e23ebba 100644
+ ../lib32 \
+ ../lib
--
-2.31.1
+2.34.0
diff --git a/main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch b/main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch
index eb592dc90a..917e89344a 100644
--- a/main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch
+++ b/main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch
@@ -1,4 +1,4 @@
-From c60bb23972769f687dcac689ddf00f88e46b8bb7 Mon Sep 17 00:00:00 2001
+From 0c9502cb5db1f2898b531cfb1d3b733490045845 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
@@ -14,7 +14,7 @@ Subject: [PATCH] use pure 64-bit configuration where appropriate
7 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
-index 83e59e33b85..6ec56fdf6a8 100644
+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
@@ -27,7 +27,7 @@ index 83e59e33b85..6ec56fdf6a8 100644
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
+index d288b093522..2949033aa04 100644
--- a/gcc/config/i386/t-linux64
+++ b/gcc/config/i386/t-linux64
@@ -33,6 +33,6 @@
@@ -64,7 +64,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 @@
@@ -117,5 +117,5 @@ index cc6ab367072..7f498ee1cdc 100644
+MULTILIB_OSDIRNAMES = m64=../lib
+MULTILIB_OSDIRNAMES+= m32=../lib32
--
-2.31.1
+2.34.0
diff --git a/main/gcc/0025-always-build-libgcc_eh.a.patch b/main/gcc/0025-always-build-libgcc_eh.a.patch
index 65324abd5f..bf8e0dc208 100644
--- a/main/gcc/0025-always-build-libgcc_eh.a.patch
+++ b/main/gcc/0025-always-build-libgcc_eh.a.patch
@@ -1,4 +1,4 @@
-From 00917df4274ea2fb33b08c963a97cf1b28f59dd3 Mon Sep 17 00:00:00 2001
+From 338f65b9c13e8aaacf146e0fe2400566766f02e4 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.31.1
+2.34.0
diff --git a/main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch b/main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch
index fa1a70cc81..3e6e8b394f 100644
--- a/main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch
+++ b/main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch
@@ -1,4 +1,4 @@
-From 03cdaf39fa80b75c731b9d226c52a7ae04707d46 Mon Sep 17 00:00:00 2001
+From 0703d9ad84cd92f8a08787a85536a98b3830bba0 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.31.1
+2.34.0
diff --git a/main/gcc/0027-ada-musl-support-fixes.patch b/main/gcc/0027-ada-musl-support-fixes.patch
index 0f4ef64922..3a7075f963 100644
--- a/main/gcc/0027-ada-musl-support-fixes.patch
+++ b/main/gcc/0027-ada-musl-support-fixes.patch
@@ -1,4 +1,4 @@
-From 21692d89e7876dcaecea3e3c961c6504be4a83e9 Mon Sep 17 00:00:00 2001
+From 0b879c9a3ef83b3b08a0d72bfe89816d52489408 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.31.1
+2.34.0
diff --git a/main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch b/main/gcc/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
index 37fa5225fe..e684c26e60 100644
--- a/main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
+++ b/main/gcc/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
@@ -1,4 +1,4 @@
-From f1503cf97b5a5c6f9466145f5eb1ed3b5f200119 Mon Sep 17 00:00:00 2001
+From abfd239e7f28b8076ae28e5dbb31fc7f39bfa5d7 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
@@ -12,7 +12,7 @@ Taken from Adélie Linux.
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
+index d30d1603adc..57f6824eb9e 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)))
@@ -25,5 +25,5 @@ index b429fdb2403..fd1c885f043 100644
ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
#elif defined(__aarch64__) && defined(__linux__)
--
-2.31.1
+2.34.0
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 2932ce7cbb..0000000000
--- a/main/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1852ae06e733180f090b58c267bde8fb9501a41e 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.31.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 5f2cb2d712..0000000000
--- a/main/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 40322de36043aaa3cbb98d7f01037f53fc1b5a98 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.31.1
-
diff --git a/main/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch b/main/gcc/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
index dca704348b..30af572565 100644
--- a/main/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+++ b/main/gcc/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
@@ -1,4 +1,4 @@
-From fc950e32b9ebc2bae09604ebe630df6df454151d Mon Sep 17 00:00:00 2001
+From 098c0bca8bd1f47e94c8368406973019bbe9bf55 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.31.1
+2.34.0
diff --git a/main/gcc/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch b/main/gcc/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
new file mode 100644
index 0000000000..60ce845ebf
--- /dev/null
+++ b/main/gcc/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
@@ -0,0 +1,27 @@
+From 7ba79053336c8666d3f137ef106696926d3f7b31 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.0
+
diff --git a/main/gcc/0034-gcc-go-signal-34-is-special-on-musl-libc.patch b/main/gcc/0031-gcc-go-signal-34-is-special-on-musl-libc.patch
index 921bf3f6cc..4c7bad8e6c 100644
--- a/main/gcc/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
+++ b/main/gcc/0031-gcc-go-signal-34-is-special-on-musl-libc.patch
@@ -1,4 +1,4 @@
-From dd1465b56f76ada5c7383ebd98ef02311a3b907c Mon Sep 17 00:00:00 2001
+From 18ba9309687431399aabe54c0b758f69b01253e0 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.31.1
+2.34.0
diff --git a/main/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch b/main/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
deleted file mode 100644
index 918d6b0744..0000000000
--- a/main/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3be2284d92c560204e9eddb20db56d57fe584360 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Sun, 30 Aug 2020 18:01:03 +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.
----
- 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
---- a/libgo/go/runtime/mem_gccgo.go
-+++ b/libgo/go/runtime/mem_gccgo.go
-@@ -15,7 +15,7 @@ import (
- //go:linkname sysFree
-
- //extern mmap
--func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
-+func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) unsafe.Pointer
-
- //extern munmap
- func munmap(addr unsafe.Pointer, length uintptr) int32
-@@ -37,7 +37,7 @@ func init() {
- }
- }
-
--func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
-+func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) (unsafe.Pointer, int) {
- p := sysMmap(addr, n, prot, flags, fd, off)
- if uintptr(p) == _MAP_FAILED {
- return nil, errno()
---
-2.31.1
-
diff --git a/main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch b/main/gcc/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
index 0e17708b76..5be5b32e6a 100644
--- a/main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+++ b/main/gcc/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
@@ -1,4 +1,4 @@
-From 79d8ab42aefb1d3c5f794f51df643ab040c30e30 Mon Sep 17 00:00:00 2001
+From 1be822dcf1f9ffdba5c6508cef0374585e48cb18 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.31.1
+2.34.0
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 a21113b547..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 a2b54c20297bb92212bf86b492e9a62d9f23e0b0 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.31.1
-
diff --git a/main/gcc/0037-gcc-go-link-to-libucontext.patch b/main/gcc/0033-gcc-go-link-to-libucontext.patch
index b81d8bf98a..283d562d97 100644
--- a/main/gcc/0037-gcc-go-link-to-libucontext.patch
+++ b/main/gcc/0033-gcc-go-link-to-libucontext.patch
@@ -1,4 +1,4 @@
-From d42de24395e4f07cf6412896d4cd8c7f83a9b875 Mon Sep 17 00:00:00 2001
+From 2fa393cd8ae6b25539cc7bd9998c603a3b33bc6e 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.31.1
+2.34.0
diff --git a/main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch b/main/gcc/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
index 15acfdb4a8..bd58761035 100644
--- a/main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+++ b/main/gcc/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
@@ -1,4 +1,4 @@
-From 570cd2b596daf12e8dfe1a444fe405a7c26fc2bc Mon Sep 17 00:00:00 2001
+From e94c28d8ee1876ddc9ae02a7a0cb1578e529260b 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
@@ -9,10 +9,10 @@ These struct members do not seem to exist on musl.
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
+index 57f6824eb9e..fd03db420d4 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
+@@ -335,7 +335,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);
}
@@ -22,5 +22,5 @@ index fd1c885f043..e845e453332 100644
mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
int i;
--
-2.31.1
+2.34.0
diff --git a/main/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch b/main/gcc/0035-Use-generic-errstr.go-implementation-on-musl.patch
index 222513d656..e6bcfa9a0d 100644
--- a/main/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch
+++ b/main/gcc/0035-Use-generic-errstr.go-implementation-on-musl.patch
@@ -1,4 +1,4 @@
-From 70d70a1106b31ab840dbf5361312af221a2d5f04 Mon Sep 17 00:00:00 2001
+From 23f7ad8b28284017c4f63e944bcb0321eb205e8a 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.31.1
+2.34.0
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 abb3f3f9a4..0000000000
--- a/main/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 382d4516db8a7c183e9d7b5ec16a9bc175523ac9 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.31.1
-
diff --git a/main/gcc/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch b/main/gcc/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
index 4727c37ebe..1895dd258e 100644
--- a/main/gcc/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+++ b/main/gcc/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
@@ -1,4 +1,4 @@
-From 8ac36878ba8714afeac6f439632de8bacb2e72e3 Mon Sep 17 00:00:00 2001
+From 7e123432a35fcaa25de85b4940daabcd70c1a6bd 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 808570b6c99..6c1e95e0444 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 808570b6c99..6c1e95e0444 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 808570b6c99..6c1e95e0444 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 9c2571de709..52fd6d8fe06 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 9c2571de709..52fd6d8fe06 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 5093e8bbfd2..1871b5ab6eb 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.31.1
+2.34.0
diff --git a/main/gcc/0042-configure-fix-detection-of-atomic-builtins-in-libato.patch b/main/gcc/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
index 2063f441a6..163b3ca3c2 100644
--- a/main/gcc/0042-configure-fix-detection-of-atomic-builtins-in-libato.patch
+++ b/main/gcc/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
@@ -1,4 +1,4 @@
-From d046a3d12daeada0fb0f44beb201057d85af4a2c Mon Sep 17 00:00:00 2001
+From cb2472c05592e4a1b5f826d761d0ef221c0c9664 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 @@
@@ -52,3 +52,6 @@ index 5dd0926d207..0b57a801e23 100644
case "${target_cpu}" in
alpha*)
# fenv.c needs this option to generate inexact exceptions.
+--
+2.34.0
+
diff --git a/main/gcc/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch b/main/gcc/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
new file mode 100644
index 0000000000..8f5df6b69e
--- /dev/null
+++ b/main/gcc/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
@@ -0,0 +1,84 @@
+From 45b24f2bf7fa1b2b9d597bd065b6522f8d87cd3e 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.0
+
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 80ff192a20..0000000000
--- a/main/gcc/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 10b79a025a54354368c6f349c17682b1e8487907 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.31.1
-
diff --git a/main/gcc/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch b/main/gcc/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
new file mode 100644
index 0000000000..f43cfb4ac9
--- /dev/null
+++ b/main/gcc/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
@@ -0,0 +1,80 @@
+From 0b7a57f08abff72f8dd1f67de995c502e798513c 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 50db23df159..1d42f057a84 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.0
+
diff --git a/main/gcc/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch b/main/gcc/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
new file mode 100644
index 0000000000..c22f7f43f3
--- /dev/null
+++ b/main/gcc/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
@@ -0,0 +1,106 @@
+From 5a76cf60df5c9ba274f1d0dcd79fc0cbad9d0fe0 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.0
+
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 6eeda88da9..064c42161a 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=gcc
-_pkgbase=10.3.1
-pkgver=10.3.1_git20210625
+_pkgbase=11.2.1
+pkgver=11.2.1_git20211128
[ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
[ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
pkgname="$pkgname$_target"
-pkgrel=1
+pkgrel=0
pkgdesc="The GNU Compiler Collection"
url="https://gcc.gnu.org"
arch="all"
@@ -199,21 +199,19 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
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
- 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
+ 0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
+ 0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+ 0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+ 0031-gcc-go-signal-34-is-special-on-musl-libc.patch
+ 0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+ 0033-gcc-go-link-to-libucontext.patch
+ 0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+ 0035-Use-generic-errstr.go-implementation-on-musl.patch
+ 0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+ 0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
+ 0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+ 0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+ 0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
"
# we build out-of-tree
@@ -662,47 +660,45 @@ gnat() {
}
sha512sums="
-e3381e4511fff63f388b0898669f83eae82334c7833dac3a0d4e3a3241d4154400681b7c934253b2e773922cb91b33d586888ff6c1e00c8be96bf708c9247178 gcc-10.3.1_git20210625.tar.xz
-1d5788a2bede9ecdf2597a836fecaadd78ce4f5742838edbf5ef1091bc6fa73d2e43d862a5ccdcb45d404c49fc943a8110ba470608b2b4da165dbdcae00818ca 0001-posix_memalign.patch
-997b75b108cb95c47eecce8aabb60490bd07d4a0c4bd90d449dcef9f85319ab529fbb19b381fa984e7c73232cbe4e33d0e45a1677ff620dbaa14590518f4ce4b 0002-gcc-poison-system-directories.patch
-01623bd69b69bb4690511e0c8b00afddf816eb0040647de7140a588b75cd5ca8f4a087a52793092a8d8e9a95fee546562bc2ebf80141dafc9754ec3a0bde2cd1 0003-Turn-on-Wl-z-relro-z-now-by-default.patch
-bbf01f6f857d981d6d82859268c1c7392e277b3943332f47650ff758b791c5711b9d7cfe1c11ed2770dda77a42105433f0da9e974638aad1e263b29c0ee2cbf2 0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-b9e03d6f18861269d356a686438b848fa294cc1c9ac6ad972b89c64e92cb99a25cf8a0513344d18ee41698825b5d8ea9a23cac6f96c933e03f8e20afdd285516 0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-d9389c82d7075debade8d1b43ab6bd4a087a8bcdc6d1a812923ca80eefe6e45498e552b7a088780e74fd08d679cb83cf94973157ed78d78090594ca4c41eb816 0006-Enable-Wformat-and-Wformat-security-by-default.patch
-2a9727a9b6ec7dd05ade8be3e686d82b5702ab9b6185812f72afce627179b8438505b37b5dd3705a751ba600a5a246de69e23e81bf09faeb7680496f2e5803ab 0007-Enable-Wtrampolines-by-default.patch
-c8828ef94d4be1ee8979f41ad2fb5d956fd17e7509c0d3df6f88e75d6faf253b9bea8eaa2cf00ee925e0fafabb4823fbfc125d018dd1b19911ee982a3d073002 0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-c150051ffb049ffd6a92b85265dbd9d763044468259220332f196f234031dcbada00bf9fea4be77bac712c0fd554d58ba5bdaa61e437f4678edeb7bdc30bf0db 0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-68d59c2f2714ab41a90e3ea512187f3da8d5d7bd05d07c1fafb2d78681ec772698a5ff4303e98302230a69a3fc1f56bb5d32d58d1ae95dd33e20850d9e02dd79 0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-5059d3207f4abbab13b7b4aa1a9aa40b3fe519dd4a378e049553c13582787faada4f9e79cfee51e291c5ad88947d763217b15356730fecb8eebdde6fd4f285c1 0011-libiberty-copy-PIC-objects-during-build-process.patch
-18d6d84b08f4949f510c5c3899451fba08a68e0b1fde381a7df6d117e7493e9093839e660a1293ae4f1a5194b3200b65e89dbb61d6f60e09b292f4452e9f1411 0012-libitm-disable-FORTIFY.patch
-55165e4955ce7a881b80701a543d61253252011c21dfc86ab7fa8a49a105b708d2452b588bc631423cdb5dd0f454d877283635a40485684762ec2ad3a103c911 0013-libgcc_s.patch
-2e7af3e31f46a44cedeed949730a3c10f573b0d5071e3d6606444a40c9d1ebc5331d46d5e9955473d12bc84de118e3a84c15d0f70019e3a71c671d016dd7203c 0014-nopie.patch
-ae86e9dba038e1fcf536bf35fbb0b7f0f113cc5ced4d4507d3c4b8a9f1b59a7e039b4162df7dedf19730ffa7c4e546aa5704c160879cda005123b45a505c0993 0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
-f4002aecd5a53547479c2869c0cf9b7b281d9c1f96f41c6959e81fc3af590a00530389647c0acc2e6f0df2f8bb4d185c9cdcd740487b124e0676b74cc9a3e6be 0016-dlang-update-zlib-binding.patch
-d280ac5c6675c063ca671e267c8789181e4b13de65c4248bdac702e0c1daa40089df277858f8740d8e182ee7773ac0518777e1625f20dcb96dbf3d9975ddd571 0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
-53ae0411ae86da64953b0e26bce171a222205697644428248cb2becd394e463a40496d4d06af587bfedcbeb8b323ecae4284d5f91a7c7b30b9053adad0b78a86 0018-ada-fix-shared-linking.patch
-37cf7167c1e7e387abaf91acc46d0c751d07f4d427a937d0efac3a479dd5f6a88f632c183462fb1ff4e0145474228960a98721f711c2176c9425a5f33649634d 0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-48e38d2d86843bbfaffc51288bb33d25478d32ab9832684da4066a487a92a6ef24ad6381feac2fb8a7905c5f3000709c3b10cf37f9be70685e1f9c70c63c4363 0020-add-fortify-headers-paths.patch
-fcee4fb2d8317490144404b6d6c632607e57a01591b69cb90d9119fc7b5446b59027e403cd65e6bf18dccee127dc5fda96c5a7b43adc14671b85ecd4303da2dd 0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-cedd53c2dd61c4ead859242ecbdac4ac674424ad68eda3326741187d187ff90d6b6e3e88f9b65ceb2e97d914eb38ae62670ac4b08cbaa3728129739fa8fa7f27 0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-fc7684b25163a43a2d97df0614b2d1c8da81a5a80169cbe853aefd442d8413d5d0717772bad1c87ca6e8eff6e26f8aa5f340cebf635ef44192227227e167f08c 0023-Pure-64-bit-MIPS.patch
-cdd42fe4a48cee11a23086aaaf9f9c8b55de69987cee88a39a3316878e064066511b5e9e9b98267a27af5042c1fdfcfaadeb5a3ac81fab4102c9b9e261b17410 0024-use-pure-64-bit-configuration-where-appropriate.patch
-79f1ab0e29bd3fc7e72d8c59cd380a2b50b6e4b872d5101d4f1ed1ac00368716e3b12b2d54bcbfa60a89104418811034c5a560ffb1de5712bbe590f16f74d2b5 0025-always-build-libgcc_eh.a.patch
-073eda8d12299723b2f4d190cfcbe467b529936d580240b1180d0c37286c9b5ab26d8aa99f8b59ce2e195ac46da708d84ad8b9a2f0946398b91448b590e9cae4 0026-ada-libgnarl-compatibility-for-musl.patch
-3cb3f153f67d10171b3bc9cb8f7acafb611f2f221dec2a6129cab63f9cb97bd3b9c0e512e9d70f985cc139859d64b266fe71504eb0ca2ce5ab59ca82445e4b14 0027-ada-musl-support-fixes.patch
-e8d8e7b2f39d706c7aed4b9e6b5f166482e317b2b68e9250880cd864932e0e69d9b595eaa9e10e573f88207697489cf89aa968d2e0a9aa3d92c44717c9f6e9f8 0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
-674a0599e9e0f450bbb924513a4a6ee1dfde0848d47110ce1415782b6f848335197bb86798063aae5626d01ee892c993762dec83c729052c536d97d6b86999f0 0029-gcc-go-Don-t-include-sys-user.h.patch
-8714dde37beda68d901ad6c50c208c3fd3dab81951898535a964348c6b45bd2896b1386302061fedeccf29228ba9d5e788657e550d3680c6562c024b6b135ea3 0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
-e5c9bc4825f5adefe1eeee80dc24a05cc6224b20c5a4e36e1d3b74255ab1d2b1dda0f90915a208ce7d09a22853e1782aedb3c57729a4e650eb13a2c1f9bc0482 0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-578d2adbdf036a1764143340fb63055b0f23cdfc75c79a91813194c0dd346900d36c5db334ea341ea29c51dd62e94618ce49db422603284bb565260d0ee2d4c6 0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-3e06a22fcda856bdde6d77d2ef11b0a60b5a99b3c8dc4a7919a4c4f3fc01b86f94f141b58df8129d739f9cc1b116ebf8b4e6d82d58e6c5c38eccb677c5f4c0aa 0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
-5c4edc35d40b759d08dc3b536be5a20be727e5a37ea2755f0416de932d2c641661d4e197f24c3128f9fe79daa08f80528d925676920ff03ca0f8127ff13a9ea6 0034-gcc-go-signal-34-is-special-on-musl-libc.patch
-41ccc997352859f0c023c4b49f8a8f3d505727163db8ba9795d26c0ba89a004b232ea685da7cd6f210272641e107a09c398578ae3e0e6e065982912555f0d2bb 0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
-c70b599de8698ea2b6ed865f5ca503a55ce1590c4d30af5af4c36d4fce1d42f19d347f44d6e62fbe84bebeeaac9c90d74bb9e17e2b7bc66d8e8988e98f81cac3 0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
-19ccab17f5ba7c02643a1ea85f3690554d3142e3bdd7a68d663a74381336f74007d1ef053fe4e78acc3154ee6f59606de5fbe54dac9efa72291ace76902b2856 0037-gcc-go-link-to-libucontext.patch
-b92ea62f8ffc7471dabbc8a6f770fc141702d4900f6eb4808a8b0c46042434617185366d93b491220e4f079827239b3849d078acd4389a360f6ef7fddf2ab249 0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-1f54ea2ed780964da3238bd98b63719d68585ac97bd312211797dabec3fc7c54b60af9f7ffc490355c898ed42c0a2745e6486bfc0577b9adee88ee1fb35bf2d1 0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
-7e02eaf9e0261a2942cbc4db626cc6d67955bdfdc9036d505f1e3a4b3fa03993de403b58173137ca98db3365df28db234bf70ae76a74a463c39887a40780c2a7 0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-99ecfd0beeb8dfcd95ef84b3ad8fb43402edb87ac6b0591c7a8bd986b9e163e1b8ce2c5773ee3cbf1264dc40912b7312f450e6dde4ab8a6cf28b02541de7ce84 0041-Use-generic-errstr.go-implementation-on-musl.patch
-b02237276f70e09c56d3826232076c1b5a7b23e47fb8f896edf50c85b9dae7dde6800b2bd7d153777c60845bef2390c6a99526fd86167b156a69a71e61c5d133 0042-configure-fix-detection-of-atomic-builtins-in-libato.patch
+99c25b0cf5ae57806e3ecc76977c4b177e60660a289117506061243d3b492c76392cc47ba1165a04b1d46b932c1492db045edb29eab5460774be90243e984f22 gcc-11.2.1_git20211128.tar.xz
+a1b8ae8ba40ed0e384484590ca7c9328f922f6237c883d7a78ad16a5110f522280c577ede7ee65163ca8b9e2cb02d5eefa343d8a60a8d6a64d2fc3496b01b80a 0001-posix_memalign.patch
+79ad02ec110f485bc19364459f94d16556b4e178a029a538b9a448ce356950fcad99674d711edb012d8a28b4e39a865370dec1a12c86d6fd91160acf80135ee3 0002-gcc-poison-system-directories.patch
+fd8819d4b7ef3f3d32bd09f049098f04f7503556b65f1f85c91cd7f724770b3b8f16af580774e518310be83462070551cdc8ef78963e73760849de26d8a107f7 0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+eeca973fb0f6a82203358cb8ce15cac256315e0e22ad00b579b73a3bb093da306f62d59f86f7f3d3c0194370dff6ee4b0a01026153a29933437b3c3ed758c34e 0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+faa5bd16cb5d4c898dd1c7f9b88a12e1549d2f643c13cfe0413fdf8dccf9ce48489415de4f3786df86d9ca305fbeba650b4f9f2440f9800297bcd9fa5624f714 0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+371ebf3a572fb1dce7756bde18dd116e3cff9c110c80e05e46d6d01a3b7545f28ec6e65a062226bfa1b4b3da8ab436835d03f5a14b33ada1a250c726ce8c45e4 0006-Enable-Wformat-and-Wformat-security-by-default.patch
+ed48ccf5733d0f988cc1838c3f5f8466e21b92390af8679e79447699fd8fae51cd2091233d15f77b44412f09f1b8266d68d1da669c6f9b409f4808fbb1e9a2ed 0007-Enable-Wtrampolines-by-default.patch
+9481738fb87f7c453569ba88aa7629d773d5d88185e67a412e3b06422868da0719b3d98f11f29f21a7e9948a6d598c34a7e9806bb60428734a3de724984f9de0 0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+47650d47faa0d896179b11513171b10547b6a374a574cfdf923816c46adf643dda61abac56bd3ce971acccd9b2843b28b8fac8cc46e92e9f325a275113413771 0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+4470ecbcfb1dbdcf5157d94178229b7e4f24c997a92f48b688f0850454bdf19ea1525d1ebbc541d5da203408e2d5d577ca9a769db8501ead4e4888fde21fb2ef 0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+c324b0cfc83f90f65ffe2b09ced8248d907f8d3c7120491f1311601d76f1729e8728177b0b57db691c7b917265bf1e0c33f08a3f1360fc26f75aec057262e0d2 0011-libiberty-copy-PIC-objects-during-build-process.patch
+3a7ccaa7ef78a55b3d327c4c2e3474bc904192cc8d9f62ab4658ed75887301f5069af823aa9d01560a5047fe95c89ee0c1f98745722441d27ba544870af56c7c 0012-libitm-disable-FORTIFY.patch
+68442827a2335c40e9ea1979b64e026634497f076c21a8a9f11bf09f612ec72625c72e16ff6d50da659d0d5c49a7df266be4e99b2af3712fe84238b926ad14b2 0013-libgcc_s.patch
+b34a972b39f4b55d11ed2bfaa17181a353e721424f31c35892a0a7d16a680d017856d4679b1bcd6ebdee304d3e15aae5f545a59c5a5abf0e48d094e8fef52ae0 0014-nopie.patch
+03574bbbb8cc76ab3303862e68d19898b6b1971cbea0d8e3f8d0bef47c33376bc8d37d0a3aee9783e6f04ca3857fa6cfc054b24fafe5eed51a75215e61dde9ea 0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+5233ae40bf0e42f8c9cd379f776c6a5af11bf986c0e09b3032e02e5c4f257d12d8f2c27739775b48bd07fcf6c4062086465864b1ca11983126752fd46b85c658 0016-dlang-update-zlib-binding.patch
+627a24e669e408165c4b63c9a4e0a980373a4b801286f7b6e6a3a4c335e0c9160d164d23701c90170217ad333d0403b1aef7738ac90c4ed9f832d27c0eb4cd38 0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+482a8556fa7bf2ca14782ccce01465211ad476b83c3087668298d6078b32e1eae2138c0ea236c4b191f57171bc6ce64d51cac2dfea4f33d69283f12ecec9e9c6 0018-ada-fix-shared-linking.patch
+8fe388c533b687542aacda86c1ca04290a53123050e2700867895005aa34ec0b23f2c394c5710b1b87e85442fb976c47a95d10360984da13a82a3ff5307996d5 0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+563d17f07468d412b46b012cff37d1c4acdee2bd1046b7ac817c1b35034c167e252a6067dd34b418770d3b0c170f8ae14a4ee9b2ab0df1b8b7d2581afec83731 0020-add-fortify-headers-paths.patch
+49ba07e45442651cd9610ca339035deb19d73744850149722c6da9a0e1b5081ab27e8e88f45e836de2a432770dcd7fd2073bc5379679921175a68627e9a0941f 0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+a6d88c765aded0dcd0ecc0bf68a9ad3e4d0bb8f2fe1f7b1245db068d5cee154aec8c3bed47390d60b10809c224fbbafb5f36225a46fc6c8f143bd8317fa2d062 0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+40fb955eaa10d2536acf99a716aed68cb587e94bdde8260581b2ba7026a9698058495f0b040a3909096b4102565b1c704c70e3b870e239366450df10d73a201c 0023-Pure-64-bit-MIPS.patch
+5ff7f3836a4ae7729bbe8fffe97956eeebb6cd40657214423e79a9ec42e85654491cb73fdb263ff70d4e37e14f42370f2a90ba2c97411c5ec4b2d967c6d70a85 0024-use-pure-64-bit-configuration-where-appropriate.patch
+e45369759649d0680b7c39512e20a5424706d2e7711d14076d893850105daba8b9bb5094db962813859d225e70e018a5667155d92827a918674961015f13eb95 0025-always-build-libgcc_eh.a.patch
+a16387cda58085fce4413db099e18c089d3e2f6603ba4d3add07fd4d31f3d254c91611ad4b8ee36135a364f12e0897bfd6d5998b95c0f431ca8b79d142f26958 0026-ada-libgnarl-compatibility-for-musl.patch
+3467decc5a090d82497a6b029ec6e34aac3876fadd23db2a3af385017e5cd992f82cf11b928e6b461248b60990fa50a469017a4646954f63974572c3a6fcaaec 0027-ada-musl-support-fixes.patch
+9960b164c608c47f35de2bf624cfe8782984e8d3ed23a72a456284e3082620f95501299b3e9e26b0f8c0d0796c68c353584bb5c48e85b101010abe29a46ccf5d 0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
+c89f234df9a37cfe0c0d9ca891febe57b3ae0eb01416edaeb5d66738d3f5dcf5e62eedfa12a22e56aaef7cd833ecb9b85e72ae3636ef2dd0c6ec8654609ba3fe 0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+df6447febdecabacadaeb9925830ee531a860ddd5a1970ff42f608a798eccce81e8beaa5caf2f121411c55361af1ca4e8352552f21809b4fcaffda36e870c69c 0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+5220d075b3882e235cbc5e00b22d5a314d986a078ef7242bc777b32e00891f65fa887ed4557aa5d5c712c4e8ab49d56560cfe2489e36fb02843f1ff892b0fcf7 0031-gcc-go-signal-34-is-special-on-musl-libc.patch
+09f5fc4fadf1e60a3766ad33bfaf8c1ce73cdaacb41734d31fb78583e9fcdb5ca7650c3e03c01c8c3239a81d6ed849f39d17e0a31a672cb15c7138ce58c82c1b 0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+c0abc9a985a195612d9bd9d12ea7a18e5717723d23790a90610f03881f9dcf54911332be002cb79043575db3b2f82099ff927d7f761050a063601fbe2e04e8f1 0033-gcc-go-link-to-libucontext.patch
+d5722d15a3dd9669ee4da062a3e0a0a2049772f10224f7da615eb4093e5f24bca4372078c9282a457cba649b12c4f1180ec7523584410e5cba555f4612740186 0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+afb7d25f10f23e3ac634a10424f43e9ebe737d4aec9d067c2ad42c1144d08208271f206cdf54582b97a15a0900e5d426ea2940850b9e67abbd2b03f5a30a1793 0035-Use-generic-errstr.go-implementation-on-musl.patch
+ca185b3e0644dab6a87bf524042c72069ffda0cde578e803bd59a9c5e40ba4d7d6f0be49836bc3aa622a4367606bdc71a6b90fcc2c377e045bbdbe1fb5ce6730 0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+11f93cd928881264b2a2a78dd52001980dca26cb22d2207a3ff286d63deca81468daa649762ff27f1a6475c0334bc3135b7bb080ce1b152b0f1a1e8f81287c5f 0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
+7541d57f7c04571b3d60a2e40038245b33e68c4b53373f64d2827d106349546834f06eb77227194f950b570e15f4fe9e259238458d5be8f10c41c56404f7cfff 0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+2c5edf9e3fe6822a322c1dc75218062afb56799c304aa583c4e1e80136c6262cbd9bb950843f167b40639c6623a33a0475990c4452e03307af434dc8760d437d 0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+8e44678fc77094a2c0cbc78575759ee51d50ea53189cf4d651c8501eb1b46210bb6d5969b81f5f63532914320971e7a1e2e80b32cb679ab41af86f21742b4c19 0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
"
diff --git a/main/gdb/APKBUILD b/main/gdb/APKBUILD
index 3521064282..dd3079f859 100644
--- a/main/gdb/APKBUILD
+++ b/main/gdb/APKBUILD
@@ -1,14 +1,15 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gdb
-pkgver=10.2
+pkgver=11.1
pkgrel=0
pkgdesc="The GNU Debugger"
url="https://www.gnu.org/software/gdb/"
arch="all"
license="GPL-3.0-or-later LGPL-3.0-or-later"
makedepends="ncurses-dev expat-dev texinfo readline-dev python3-dev
- zlib-dev autoconf automake libtool linux-headers perl"
+ zlib-dev autoconf automake libtool linux-headers perl gmp-dev"
options="!check"
+[ "$CARCH" = "riscv64" ] && options="$options textrels"
subpackages="$pkgname-doc $pkgname-multiarch"
source="https://ftp.gnu.org/gnu/gdb/gdb-$pkgver.tar.xz
s390x-use-elf-gdb_fpregset_t.patch
@@ -74,8 +75,10 @@ multiarch() {
"$subpkgdir"/usr/bin/gdb-multiarch
}
-sha512sums="3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz
+sha512sums="
+c40bf970e2f7c2107b29c5aa6a7150daa709d75ddadb73ac20742419d4637d158e3063a4c6ff6e47fae8ca8e1d36253973f85ea15445d004be6d5d7a2dd9bd46 gdb-11.1.tar.xz
70e7d04e4d72461436da503b5bfa370c5779e03245c521f30e9779d5ff37dbb2d708b05f2afb27f43ad9defc44df4bd979d72f777e744851fdbf156295e1cc9f s390x-use-elf-gdb_fpregset_t.patch
04911f87904b62dd7662435f9182b20485afb29ddb3d6398a9d31fef13495f7b70639c77fdae3a40e2775e270d7cd40d0cfd7ddf832372b506808d33c8301e01 ppc-musl.patch
ab554899bbb2aa98261fd1b6beb4a71ed7c713a714bddd3fa7ec875258e39bd5474dc96a11accb4dadd316f3834f215e8395d3b373bf3affd122dc5b4a8fe710 ppc-ptregs.patch
-58aacc7cdc119eab729a3c5a5521f6a0db41c6a5bc2d09d6e32cbdd071d85dd1a31b5e6559616f8da1237c5b79ad9e04aab485211e957b4d1ca752c0c5ad660b musl-signals.patch"
+58aacc7cdc119eab729a3c5a5521f6a0db41c6a5bc2d09d6e32cbdd071d85dd1a31b5e6559616f8da1237c5b79ad9e04aab485211e957b4d1ca752c0c5ad660b musl-signals.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/ghi/APKBUILD b/main/ghi/APKBUILD
index 76c1aa78c6..830c8ccaaa 100644
--- a/main/ghi/APKBUILD
+++ b/main/ghi/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com>
pkgname=ghi
pkgver=1.2.0
-pkgrel=5
+pkgrel=6
pkgdesc="GitHub Issues on the command line"
url="https://github.com/stephencelis/ghi"
arch="noarch"
license="MIT"
-depends="ruby ruby-json ncurses less"
+depends="ruby ncurses less"
options="!check"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/stephencelis/ghi/archive/$pkgver.tar.gz"
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 932d9cddf0..0d89fee112 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -29,18 +29,17 @@
# - CVE-2021-29468
pkgname=git
-pkgver=2.33.0
-pkgrel=2
+pkgver=2.34.1
+pkgrel=0
pkgdesc="Distributed version control system"
url="https://www.git-scm.com/"
arch="all"
license="GPL-2.0-or-later"
# we need tcl and tk to be built before git due to git-gui and gitk
-makedepends="zlib-dev openssl1.1-compat-dev curl-dev expat-dev perl-dev python3-dev
- pcre2-dev asciidoc xmlto perl-error tcl tk"
+makedepends="zlib-dev openssl1.1-compat-dev curl-dev expat-dev perl-dev
+ pcre2-dev xmlto perl-error"
# note that order matters
subpackages="$pkgname-dbg
- $pkgname-doc
$pkgname-bash-completion
perl-$pkgname-svn:_perl_git_svn:noarch
perl-$pkgname:_perl_git:noarch
@@ -48,15 +47,11 @@ subpackages="$pkgname-dbg
$pkgname-email
$pkgname-fast-import:_fast_import
$pkgname-cvs::noarch
- $pkgname-p4::noarch
$pkgname-daemon
$pkgname-daemon-openrc:daemon_openrc
$pkgname-gitweb::noarch
$pkgname-subtree::noarch
- $pkgname-subtree-doc:subtree_doc:noarch
$pkgname-perl:_git_perl:noarch
- $pkgname-gui::noarch
- $pkgname-gitk::noarch
$pkgname-diff-highlight:diff_highlight:noarch
"
source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz
@@ -67,6 +62,17 @@ source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz
_gitcoredir=/usr/libexec/git-core
+if [ -z "$BOOTSTRAP" ]; then
+ makedepends="$makedepends asciidoc python3-dev tcl tk"
+ subpackages="$subpackages
+ $pkgname-doc
+ $pkgname-p4::noarch
+ $pkgname-gui::noarch
+ $pkgname-gitk::noarch
+ $pkgname-subtree-doc:subtree_doc:noarch
+ "
+fi
+
prepare() {
default_prepare
@@ -80,6 +86,13 @@ prepare() {
ICONV_OMITS_BOM=Yes
PYTHON_PATH=/usr/bin/python3
EOF
+
+ if [ -n "$BOOTSTRAP" ]; then
+ cat >> config.mak <<-EOF
+ NO_PYTHON=YesPlease
+ NO_TCLTK=YesPlease
+ EOF
+ fi
}
build() {
@@ -93,9 +106,15 @@ check() {
}
package() {
+ local install_man
+ install_man=install-man
+ if [ -n "$BOOTSTRAP" ]; then
+ install_man=""
+ fi
+
make prefix=/usr DESTDIR="$pkgdir" INSTALLDIRS=vendor \
perllibdir=$(_perl_config vendorlib) \
- install install-man
+ install $install_man
mkdir -p "$pkgdir"/var/git
@@ -276,7 +295,7 @@ _perl_config() {
}
sha512sums="
-1abbcdf9ff640c95934b6a78341baa76ac3a5838c4751f513f334fdf5a3760c730e309f05ad16ffec115896e3e0c750c116683f6a787d92757ee9d916a346bfd git-2.33.0.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 8f9ee62c44..c5026d691c 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=glib
-pkgver=2.70.0
+pkgver=2.70.1
pkgrel=0
pkgdesc="Common C routines used by Gtk+ and other libs"
url="https://developer.gnome.org/glib/"
@@ -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 a24e31c3f5..575b26bbab 100644
--- a/main/glslang/APKBUILD
+++ b/main/glslang/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer:
pkgname=glslang
-pkgver=11.5.0
+pkgver=11.6.0
pkgrel=0
pkgdesc="Khronos reference front-end for GLSL, ESSL, and sample SPIR-V generator"
url="https://github.com/KhronosGroup/glslang"
@@ -26,7 +26,6 @@ build() {
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
- -DCMAKE_C_FLAGS="$CFLAGS" \
-DBUILD_SHARED_LIBS=ON \
$CMAKE_CROSSOPTS ..
ninja
@@ -63,5 +62,5 @@ package() {
}
sha512sums="
-c7c94fa8bfb899cc5899f3c1f54c7a4aaa24968fdccdf628c5a1e0ecc2ed624c5c31e2ae6820f2dac02fa85b827c186f76c7d3dd77cf68a5ada2194d6bfcbfc1 glslang-11.5.0.tar.gz
+f7c1affdb4923758f9ff5cae894c40ca86e723850a6265d9c13f996311451bd84c70a178d8d6c0961dcee39c19d724f02d19a21ee6f67f1bb4cdbc618fdc12cf glslang-11.6.0.tar.gz
"
diff --git a/main/gnats/APKBUILD b/main/gnats/APKBUILD
deleted file mode 100644
index 1afb2da432..0000000000
--- a/main/gnats/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gnats
-pkgver=4.2.0
-pkgrel=5
-pkgdesc="The GNU Bug Tracking System"
-url="https://www.gnu.org/software/gnats/"
-arch="" # Fails to build with gcc-10
-license="GPL-3.0"
-depends="postfix"
-makedepends="texinfo"
-install=
-source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz
- no-werror.patch
- "
-subpackages="$pkgname-doc"
-pkgusers="gnats"
-pkggroups="gnats"
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --sharedstatedir=/var/lib \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- || return 1
-
- make -j1 || return 1
-}
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir/" install
- rm -f "$pkgdir"/gnats.el
-}
-
-sha512sums="650faa87206889912e27a27daba4c86292fac90250a88e7e6272cc8488fc19dfd6098bdd450553cd6c2c1d446072a8da9395f1ce7b1cd284596994ce53744152 gnats-4.2.0.tar.gz
-f37cbc05bcf4fe37226e95ca84162ffa9ca92da3e30907dbbde67805aa0ab6210724a954a9106f4522c0adcaf936919beb11afb7d477142491be09c9da0ee38d no-werror.patch"
diff --git a/main/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
deleted file mode 100644
index 7e46b87e62..0000000000
--- a/main/gnats/gnats.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S gnats 2>/dev/null
-adduser -S -D -h /var/lib/gnatsdb -G gnats -g gnats gnats 2>/dev/null
-
-exit 0
diff --git a/main/gnats/no-werror.patch b/main/gnats/no-werror.patch
deleted file mode 100644
index e7d4d14e5e..0000000000
--- a/main/gnats/no-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure b/configure
-index dfacf87..c3bdb3a 100755
---- a/configure
-+++ b/configure
-@@ -6722,7 +6722,7 @@ fi
-
-
- if test "x$GCC" = "xyes" ; then
-- GCC_CFLAGS="-ansi -Werror -Wall"
-+ GCC_CFLAGS="-ansi -Wall"
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wextra" >&5
- $as_echo_n "checking whether C compiler accepts -Wextra... " >&6; }
diff --git a/main/gnokii/APKBUILD b/main/gnokii/APKBUILD
index b2b7e76141..3f91366cea 100644
--- a/main/gnokii/APKBUILD
+++ b/main/gnokii/APKBUILD
@@ -12,7 +12,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-smsd
$pkgname-smsd-sqlite:sqlite $pkgname-lang"
makedepends="mariadb-connector-c-dev intltool libusb-compat-dev libxpm-dev
- bluez-dev libical-dev postgresql-dev sqlite-dev
+ bluez-dev libical-dev libpq-dev sqlite-dev
autoconf automake libtool gettext-dev"
source="http://www.gnokii.org/download/gnokii/gnokii-$pkgver.tar.bz2
gnokii.patch
diff --git a/main/gnupg/APKBUILD b/main/gnupg/APKBUILD
index 1c165521e3..0e411a239c 100644
--- a/main/gnupg/APKBUILD
+++ b/main/gnupg/APKBUILD
@@ -2,9 +2,9 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gnupg
-pkgver=2.2.29
+pkgver=2.2.31
_ver=${pkgver/_beta/-beta}
-pkgrel=5
+pkgrel=1
pkgdesc="GNU Privacy Guard 2 - meta package for full GnuPG suite"
url="https://www.gnupg.org/"
arch="all"
@@ -70,7 +70,7 @@ source="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$_ver.tar.bz2
"
# secfixes:
-# 2.2.13-r0:
+# 2.2.23-r0:
# - CVE-2020-25125
# 2.2.18-r0:
# - CVE-2019-14855
@@ -230,7 +230,7 @@ utils() {
}
sha512sums="
-12645e230fc6aa4811420ef33def6baa590e847ecdf7e5f8b96eb49122e6406cbdba4595d0b52fa26700d5d5def67acb4ed7dfe7f778e496d4d21ccbef3c476b gnupg-2.2.29.tar.bz2
+2f6fa200e08d6b8993b482e5825bea6083afc8686c4e1ae80386b36ae49e1c2d73066c508edaa359a7794cb26ba7a00f81555a906fa422d1117e41415cfa2fea gnupg-2.2.31.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
diff --git a/main/goaccess/APKBUILD b/main/goaccess/APKBUILD
index 9fd7b9a4ce..df3b97617b 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.1
+pkgver=1.5.3
pkgrel=0
pkgdesc="Real-time web log analyzer and interactive viewer"
options="!check" # no test suite
@@ -31,5 +31,5 @@ package() {
}
sha512sums="
-aefdc8a61d85d7f8148857c6873b4589eb2f1d3f5b4986a97d0d4223c1d30da23d5fc8e6ba3cbdf41654072b299036fbcbae397d1934a95d1d26931e7f2f5d9a goaccess-1.5.1.tar.gz
+4681298e6f97661211a3b7450801c42a0b7c94b2c895b2f91b1a22b8520a957f70ee28e73bc489fc30fb1e358ab1e1d85bfd0c3f06b19ca6345e53970306c91a goaccess-1.5.3.tar.gz
"
diff --git a/main/gobject-introspection/APKBUILD b/main/gobject-introspection/APKBUILD
index 5042bbfc4a..a99a535387 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=0
+pkgrel=1
pkgdesc="Introspection system for GObject-based libraries"
url="https://wiki.gnome.org/action/show/Projects/GObjectIntrospection"
arch="all"
diff --git a/main/graphviz/0001-clone-nameclash.patch b/main/graphviz/0001-clone-nameclash.patch
index 6222238d8d..51eecf6659 100644
--- a/main/graphviz/0001-clone-nameclash.patch
+++ b/main/graphviz/0001-clone-nameclash.patch
@@ -14,7 +14,7 @@ diff --git a/lib/gvpr/actions.c b/lib/gvpr/actions.c
index 05bfcd1..b3b4a60 100644
--- a/lib/gvpr/actions.c
+++ b/lib/gvpr/actions.c
-@@ -380,7 +380,7 @@ Agraph_t *cloneG(Agraph_t * g, char* name)
+@@ -367,7 +367,7 @@ Agraph_t *cloneG(Agraph_t * g, char* name)
* graph. Otherwise, create a clone subgraph of g.
* Assume obj != NULL.
*/
@@ -23,7 +23,7 @@ index 05bfcd1..b3b4a60 100644
{
Agobj_t *nobj = 0;
Agedge_t *e;
-@@ -415,8 +415,8 @@ Agobj_t *clone(Agraph_t * g, Agobj_t * obj)
+@@ -402,8 +402,8 @@ Agobj_t *clone(Agraph_t * g, Agobj_t * obj)
case AGINEDGE:
case AGOUTEDGE:
e = (Agedge_t *) obj;
@@ -38,8 +38,8 @@ diff --git a/lib/gvpr/actions.h b/lib/gvpr/actions.h
index 5c62a3b..4223c52 100644
--- a/lib/gvpr/actions.h
+++ b/lib/gvpr/actions.h
-@@ -22,7 +22,7 @@ extern "C" {
- #include "expr.h"
+@@ -19,7 +19,7 @@
+ #include <expr/expr.h>
extern void nodeInduce(Agraph_t * selected);
- extern Agobj_t *clone(Agraph_t * g, Agobj_t * obj);
@@ -51,20 +51,20 @@ diff --git a/lib/gvpr/compile.c b/lib/gvpr/compile.c
index c157572..0914210 100644
--- a/lib/gvpr/compile.c
+++ b/lib/gvpr/compile.c
-@@ -1087,7 +1087,7 @@ getval(Expr_t * pgm, Exnode_t * node, Exid_t * sym, Exref_t * ref,
+@@ -1152,7 +1152,7 @@
error(ERROR_WARNING, "NULL object passed to clone()");
v.integer = 0;
} else
-- v.integer = PTR2INT(clone(gp, objp));
-+ v.integer = PTR2INT(cloneO(gp, objp));
+- v.integer = ptr2int(clone(gp, objp));
++ v.integer = ptr2int(cloneO(gp, objp));
break;
case F_cloneG:
- gp = INT2PTR(Agraph_t *, args[0].integer);
+ gp = int2ptr(args[0].integer);
diff --git a/lib/gvpr/gvpr.c b/lib/gvpr/gvpr.c
index 0d47d70..9a1bfd1 100644
--- a/lib/gvpr/gvpr.c
+++ b/lib/gvpr/gvpr.c
-@@ -803,7 +803,7 @@ addOutputGraph (Gpr_t* state, gvpropts* uopts)
+@@ -837,7 +837,7 @@ addOutputGraph (Gpr_t* state, gvpropts* uopts)
Agraph_t* g = state->outgraph;
if ((agroot(g) == state->curgraph) && !uopts->ingraphs)
@@ -73,7 +73,7 @@ index 0d47d70..9a1bfd1 100644
uopts->n_outgraphs++;
uopts->outgraphs = oldof(uopts->outgraphs,Agraph_t*,uopts->n_outgraphs,0);
-@@ -988,7 +988,7 @@ int gvpr (int argc, char *argv[], gvpropts * uopts)
+@@ -1031,7 +1031,7 @@ int gvpr (int argc, char *argv[], gvpropts * uopts)
/* begin graph */
if (incoreGraphs && (opts->compflags & CLONE))
diff --git a/main/graphviz/APKBUILD b/main/graphviz/APKBUILD
index fea5eef3c3..58cf3e364e 100644
--- a/main/graphviz/APKBUILD
+++ b/main/graphviz/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=graphviz
-pkgver=2.49.0
+pkgver=2.49.3
pkgrel=0
pkgdesc="Graph Visualization Tools"
url="https://www.graphviz.org/"
@@ -117,6 +117,6 @@ graphs() {
}
sha512sums="
-ab7372c4bf66ca078333252545911867108f5d9368988176fb4a8c449ba1ff094fae4c80af18567fa12303d46e2c205ab8f8043c2c21dcd2af58b55455c00faf graphviz-2.49.0.tar.gz
-aa4cbc341906a949a6bf78cadd96c437d6bcc90369941fe03519aa4447731ecbf6063a0dd0366d3e7aaadf22b69e4bcab3f8632a7da7a01f8e08a3be05c2bc5d 0001-clone-nameclash.patch
+7bd7f30a61311599b44b6ada1c24bf510f42115fc12210ccbe987d1cb495b6d23ef83cb39c6a01a11cd68f11af5ba015f5e78fb01c754e4ba646ab6143b0c508 graphviz-2.49.3.tar.gz
+5a6feef04c79be1d019d3abc297d0084de2e3aed88d03ca3adc547b712e3f70ea4d6d945431bdbed1e1c72663b052e75f2b4e76453f9d9d24dfcfa26d06e2794 0001-clone-nameclash.patch
"
diff --git a/main/grub/0008-fix-build-error-in-binutils-2.36.patch b/main/grub/0008-fix-build-error-in-binutils-2.36.patch
new file mode 100644
index 0000000000..5cb327003a
--- /dev/null
+++ b/main/grub/0008-fix-build-error-in-binutils-2.36.patch
@@ -0,0 +1,44 @@
+From 5cea201f288246488e2189c49d969d00ebec2898 Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang@suse.com>
+Date: Fri, 19 Feb 2021 17:40:43 +0800
+Subject: [PATCH] Fix build error in binutils 2.36
+
+The build fails in binutils 2.36
+
+[ 520s] cat kernel_syms.lst > syminfo.lst.new
+[ 520s] /usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/bin/ld: section .note.gnu.property VMA [0000000000400158,0000000000400187] overlaps section .bss VMA [000000000000f000,000000000041e1af]
+
+It is caused by assembler now generates the GNU property notes section
+by default. Use the assmbler option -mx86-used-note=no to disable the
+section from being generated to workaround the ensuing linker issue.
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+---
+ configure.ac | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index fa8f74bb9..38ee5f579 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -836,6 +836,20 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p
+ TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow"
+ fi
+
++if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ); then
++ AC_CACHE_CHECK([whether -Wa,-mx86-used-note works], [grub_cv_cc_mx86_used_note], [
++ CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no -Werror"
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
++ [grub_cv_cc_mx86_used_note=yes],
++ [grub_cv_cc_mx86_used_note=no])
++ ])
++
++ if test "x$grub_cv_cc_mx86_used_note" = xyes; then
++ TARGET_CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no"
++ TARGET_CCASFLAGS="$TARGET_CCASFLAGS -Wa,-mx86-used-note=no"
++ fi
++fi
++
+ # GRUB doesn't use float or doubles at all. Yet some toolchains may decide
+ # that floats are a good fit to run instead of what's written in the code.
+ # Given that floating point unit is disabled (if present to begin with)
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 21423674f8..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=0
+pkgrel=2
pkgdesc="Bootloader with support for Linux, Multiboot and more"
url="https://www.gnu.org/software/grub/"
arch="all !s390x"
@@ -49,6 +49,8 @@ source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz
0005-loader-Move-arm64-linux-loader-to-common-code.patch
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() {
@@ -252,4 +254,6 @@ aa2fbabeab2e8f517128f0d81d3c76eba18b24518b616d4574ffaaec7d4765e02b5b118caf04da1e
74b2bf8e9da604c5ca60ed13e389e48ceb4eeea1669b8ac720cdc452a4450676fe4bb961a63d31603bcdc9fe15ab6a8cb74b9ff97b6d7d85f1aaba24b1e9e244 0005-loader-Move-arm64-linux-loader-to-common-code.patch
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/gsm/APKBUILD b/main/gsm/APKBUILD
index 302306c5c1..428d78a8a4 100644
--- a/main/gsm/APKBUILD
+++ b/main/gsm/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gsm
pkgver=1.0.19
-pkgrel=0
+pkgrel=1
_soname=1.0.12
pkgdesc="Shared libraries for GSM speech compressor"
url="http://www.quut.com/gsm/"
@@ -33,7 +33,7 @@ package() {
"$pkgdir"/usr/share/man/man1 \
"$pkgdir"/usr/share/man/man3
- make install \
+ make -j1 install \
INSTALL_ROOT="$pkgdir"/usr \
GSM_INSTALL_INC="$pkgdir"/usr/include/gsm \
GSM_INSTALL_LIB="$pkgdir"/usr/lib
diff --git a/main/gtk-doc/APKBUILD b/main/gtk-doc/APKBUILD
index fecc7077ea..75ff02d482 100644
--- a/main/gtk-doc/APKBUILD
+++ b/main/gtk-doc/APKBUILD
@@ -1,9 +1,9 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gtk-doc
pkgver=1.33.2
-pkgrel=1
+pkgrel=2
pkgdesc="Documentation tool for public library API"
-url="https://www.gtk.org/gtk-doc/"
+url="https://wiki.gnome.org/DocumentationProject/GtkDoc"
arch="noarch"
license="GPL-2.0-or-later AND GFDL-1.1-or-later"
depends="docbook-xsl python3 py3-six pkgconf glib-dev py3-pygments"
diff --git a/main/guile/APKBUILD b/main/guile/APKBUILD
index 279a43d4dd..23d24de948 100644
--- a/main/guile/APKBUILD
+++ b/main/guile/APKBUILD
@@ -6,7 +6,7 @@
pkgname=guile
pkgver=3.0.6
-pkgrel=0
+pkgrel=1
pkgdesc="portable, embeddable Scheme implementation written in C"
url="https://www.gnu.org/software/guile/"
arch="all"
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/gvpe/APKBUILD b/main/gvpe/APKBUILD
index 381a48c9c5..c69b851805 100644
--- a/main/gvpe/APKBUILD
+++ b/main/gvpe/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gvpe
pkgver=3.1
-pkgrel=1
+pkgrel=2
pkgdesc="GNU Virtual Private Ethernet"
url="http://software.schmorp.de/pkg/gvpe.html"
arch="all"
license="GPL-2.0"
depends=""
-makedepends="openssl-dev libev-dev zlib-dev gmp-dev linux-headers"
+makedepends="openssl1.1-compat-dev libev-dev zlib-dev gmp-dev linux-headers"
source="https://ftp.gnu.org/gnu/$pkgname/${pkgname}-${pkgver}.tar.gz
compile-fix.patch
musl-getopt_long.patch
diff --git a/main/haproxy/APKBUILD b/main/haproxy/APKBUILD
index 997e1d85cf..13d762c8d6 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.4
+pkgver=2.4.9
_pkgmajorver=${pkgver%.*}
-pkgrel=2
+pkgrel=0
pkgdesc="A TCP/HTTP reverse proxy for high availability environments"
url="https://www.haproxy.org/"
arch="all"
@@ -14,7 +14,7 @@ license="(GPL-2.0-or-later AND GPL-2.1-or-later) WITH OpenSSL-Exception"
_luaver=5.4
options="!check textrels" # FIXME: depends on vtest
# riscv64 build reports textrels
-makedepends="pcre-dev openssl-dev linux-headers lua$_luaver-dev zlib-dev"
+makedepends="pcre-dev openssl1.1-compat-dev linux-headers lua$_luaver-dev zlib-dev"
install="haproxy.pre-install haproxy.pre-upgrade"
subpackages="$pkgname-doc $pkgname-openrc"
source="https://www.haproxy.org/download/$_pkgmajorver/src/haproxy-$pkgver.tar.gz
@@ -59,7 +59,7 @@ package() {
}
sha512sums="
-a8987e8342fdbec7e48de09a4391a67e77e05493260e0e561e8c185b6457b8e1086cc45ce04ebf3365699c008dff81667490e2fe99c33c0ac3c7513df8ae025c haproxy-2.4.4.tar.gz
+52ee14898ee92b0c13b1788e1178251c00d7ddaffaf862b8ad9400261674420db4b4d4611565ae1508d288fc6f03b1fd4d0207570793ad53a615113f9774cd3d haproxy-2.4.9.tar.gz
f766b2e9f9e2e4d236e571e7d7dfc59e864d5e6e7fe8008275d4ad9665e3b519e2ae9833c1c2f41f7af12cfd2c1b17a7620caa80426086fd4020dc5527465854 haproxy-openssl-3.patch
4aa8fc812079baf1d17cf9484a9b44568c3dd94f35243a57a4a7868e7f88146a4e94c80ea8ab86f1b08a524567e269a3ec119b67fc679f6bd0d9f1c70ce4f080 haproxy.initd
26bc8f8ac504fcbaec113ecbb9bb59b9da47dc8834779ebbb2870a8cadf2ee7561b3a811f01e619358a98c6c7768e8fdd90ab447098c05b82e788c8212c4c41f haproxy.cfg
diff --git a/main/harfbuzz/APKBUILD b/main/harfbuzz/APKBUILD
index fa868a9e30..1147cf410b 100644
--- a/main/harfbuzz/APKBUILD
+++ b/main/harfbuzz/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpinelinux@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=harfbuzz
-pkgver=3.0.0
+pkgver=3.1.2
pkgrel=0
pkgdesc="Text shaping library"
url="https://freedesktop.org/wiki/Software/HarfBuzz"
@@ -58,5 +58,5 @@ utils() {
}
sha512sums="
-69999ad86bde56ef689392a521143b6ad14b6719860772c3d4c343358997049a48c79e8f302fe0a7f3b0d930b476ddf440def874a1269b50ae79d020bcd073b5 harfbuzz-3.0.0.tar.gz
+4d1093904bd450c6d65130b3d7198c07cfc5cce9a5d234fcb14bae1101b28e697ba42cb455217f863d8d5c83830784f716ae59a2dbb38e88156677213bdb4799 harfbuzz-3.1.2.tar.gz
"
diff --git a/main/haveged/APKBUILD b/main/haveged/APKBUILD
index 06fbc5ca12..481118877c 100644
--- a/main/haveged/APKBUILD
+++ b/main/haveged/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Danilo Godec <danilo.godec@agenda.si>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=haveged
-pkgver=1.9.14
-pkgrel=1
+pkgver=1.9.15
+pkgrel=0
pkgdesc="Entropy harvesting daemon using CPU timings"
url="https://www.issihosts.com/haveged/"
arch="all"
@@ -11,7 +11,6 @@ license="GPL-3.0-or-later"
subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
makedepends="autoconf automake libtool linux-headers"
source="$pkgname-$pkgver.tar.gz::https://github.com/jirka-h/haveged/archive/v$pkgver.tar.gz
- double-the-sample-size-used-in-the-entest.patch
haveged.initd
haveged.confd"
@@ -45,7 +44,8 @@ package() {
"$pkgdir"/etc/conf.d/haveged
}
-sha512sums="bdb6d9de667298d32b474bcbdd5f90c12b870b154b86f8817948de787d378b428bf823234f20129666bd1abced2f154643b5999e43975969f6bba87124650924 haveged-1.9.14.tar.gz
-e977a6487df29a0e7de07ef3ef6546776ee9671cc8ac02868800351c6461be4d0d2e05cf40c5bc54742c00d5fe1878027959ab598d96be4f81a9eb4969fce08d double-the-sample-size-used-in-the-entest.patch
+sha512sums="
+405fe15e3711de503d4d28f5f67fc9f393da03eb80d2a5f6167c3539fda4f11f7e7b8e795a6770d6dfa3273ee887133898c1ca4b41d80c62e1997d8796f4325e haveged-1.9.15.tar.gz
99dfe4e40b99041a34cfff8539d6148c88413d2fadc2ab8db7edda95f8c84e21b61643de51855d70f0f6d20bbe1f46fc8198bfd5d512099545fad74d1c7132b6 haveged.initd
-c2dcaf151d314500c9147b97ce08bb65c902431ac1c60e76072f5237164fa4ff4aa9115eba9329fffb14add7759e4d9acc894bcf49dcc4ea37339a01c2aa1ed7 haveged.confd"
+c2dcaf151d314500c9147b97ce08bb65c902431ac1c60e76072f5237164fa4ff4aa9115eba9329fffb14add7759e4d9acc894bcf49dcc4ea37339a01c2aa1ed7 haveged.confd
+"
diff --git a/main/haveged/double-the-sample-size-used-in-the-entest.patch b/main/haveged/double-the-sample-size-used-in-the-entest.patch
deleted file mode 100644
index 673566f94c..0000000000
--- a/main/haveged/double-the-sample-size-used-in-the-entest.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 55eb83a7d6c29667a4035df487b5417529fc8518 Mon Sep 17 00:00:00 2001
-From: Henrik Riomar <henrik.riomar@gmail.com>
-Date: Mon, 8 Apr 2019 22:42:05 +0200
-Subject: [PATCH] double the sample size used in the entest
-
----
- ent/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ent/Makefile.am b/ent/Makefile.am
-index 265504c..4782377 100644
---- a/ent/Makefile.am
-+++ b/ent/Makefile.am
-@@ -17,6 +17,6 @@ MAINTAINERCLEANFILES = Makefile.in
- if ENABLE_ENT_TEST
- check-local:
- ./entest -t ${srcdir}/entitle.gif
-- ../src/haveged -n 16384k -v 1 $*
-+ ../src/haveged -n 32768k -v 1 $*
- ./entest -vf sample
- endif
---
-2.21.0
-
diff --git a/main/highlight/APKBUILD b/main/highlight/APKBUILD
index 7d6eaf8bb9..6cc5041f25 100644
--- a/main/highlight/APKBUILD
+++ b/main/highlight/APKBUILD
@@ -3,7 +3,7 @@
_luaver=5.4
pkgname=highlight
pkgver=4.1
-pkgrel=0
+pkgrel=1
pkgdesc="Fast and flexible source code highlighter"
url="http://www.andre-simon.de/doku/highlight/highlight.html"
arch="all !mips !mips64" # Segfault during build
diff --git a/main/hiredis/APKBUILD b/main/hiredis/APKBUILD
index 7d805d693c..0ce5992e46 100644
--- a/main/hiredis/APKBUILD
+++ b/main/hiredis/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Eivind Uggedal <eu@eju.no>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=hiredis
-pkgver=1.0.0
-pkgrel=2
+pkgver=1.0.2
+pkgrel=0
pkgdesc="Minimalistic C client library for Redis"
url="https://github.com/redis/hiredis"
arch="all"
@@ -41,4 +41,6 @@ ssl() {
amove usr/lib/libhiredis_ssl.so*
}
-sha512sums="eb56201121eecdbfc8d42e8c2c141ae77bea248eeb36687ac6835c9b2404f5475beb351c4d8539d552db4d88e933bb2bd5b73f165e62b130bb11aeff39928e69 hiredis-1.0.0.tar.gz"
+sha512sums="
+86497a1c21869bbe535378885eee6dbd594ef96325966511a3513f81e501af0f5ac7fed864f3230372f3ac7a23c05bad477fa5aa90b9747c9fb1408028174f9b hiredis-1.0.2.tar.gz
+"
diff --git a/main/hostapd/APKBUILD b/main/hostapd/APKBUILD
index eca88f8d78..9ff3343d0b 100644
--- a/main/hostapd/APKBUILD
+++ b/main/hostapd/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=hostapd
pkgver=2.9
-pkgrel=4
+pkgrel=5
pkgdesc="daemon for wireless software access points"
url="https://w1.fi/hostapd/"
arch="all"
license="custom"
-makedepends="openssl-dev libnl3-dev linux-headers"
+makedepends="openssl1.1-compat-dev libnl3-dev linux-headers"
subpackages="$pkgname-doc $pkgname-openrc"
source="https://w1.fi/releases/$pkgname-$pkgver.tar.gz
$pkgname.initd
diff --git a/main/htop/APKBUILD b/main/htop/APKBUILD
index ae06d40154..9532388aee 100644
--- a/main/htop/APKBUILD
+++ b/main/htop/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=htop
-pkgver=3.0.5
-pkgrel=2
+pkgver=3.1.2
+pkgrel=0
pkgdesc="Interactive process viewer"
url="https://htop.dev/"
arch="all"
@@ -34,4 +34,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="7dae83ceff6b3f30e69c30c9559dbb3bf69281df006c6a26e4e2c49dd5a147e05ed7bafeeac8ec5bedc8ba670470100cc128209a92654858f98df09a9394594f htop-3.0.5.tar.gz"
+sha512sums="
+7e08b820042e480ca61137ff24b468804b49b95c1bbedaf82029dd79d29c2c541c5211284ec075692203788bbb868a9d4326ffd24c68419e22eec13ae5012700 htop-3.1.2.tar.gz
+"
diff --git a/main/hylafax/APKBUILD b/main/hylafax/APKBUILD
index bc7136b4da..50f52ac6d7 100644
--- a/main/hylafax/APKBUILD
+++ b/main/hylafax/APKBUILD
@@ -9,7 +9,7 @@ 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 fe3ac931c0..85d941a965 100644
--- a/main/hylafaxplus/APKBUILD
+++ b/main/hylafaxplus/APKBUILD
@@ -3,14 +3,14 @@
pkgname=hylafaxplus
_pkgname=hylafax
pkgver=7.0.4
-pkgrel=0
+pkgrel=5
pkgdesc="Making the Premier Open-Source Fax Management System Even Better"
url="http://hylafax.sourceforge.net"
arch="all"
license="MIT"
# check/test not supported from upstream
options="!check"
-depends="ghostscript bash tiff-tools !$_pkgname"
+depends="ghostscript bash tiff-tools findutils !$_pkgname"
makedepends="zlib-dev tiff-dev gettext-dev openldap-dev lcms2-dev
libffi-dev jbig2dec-dev sed readline-dev"
subpackages="$pkgname-dbg $pkgname-doc $pkgname-lang $pkgname-openrc"
@@ -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/main/hylafaxplus/config-files-default-extension.patch
@@ -0,0 +1,26 @@
+diff --git a/etc/Makefile.in b/etc/Makefile.in
+index 22aa277..f451d01 100644
+--- a/etc/Makefile.in
++++ b/etc/Makefile.in
+@@ -87,7 +87,7 @@ install: default
+ -src ${SRCDIR}/faxsetup.$$i -O faxsetup.$$i; \
+ done
+ ${PUTSERVER} -root ${INSTALLROOT} -F ${SBIN} -m 755 -src probemodem.sh -O probemodem
+- ${PUTSAMPLE} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 600 -o hosts.hfaxd
++ ${PUTSAMPLE} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 600 -o hosts.hfaxd.default
+ for i in ${DIALRULES}; do \
+ ${PUTSERVER} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 444 -src ${SRCDIR}/$$i \
+ -idb "config(update)" -O $$i; \
+diff --git a/hfaxd/Makefile.in b/hfaxd/Makefile.in
+index 90fdcfe..982cd81 100644
+--- a/hfaxd/Makefile.in
++++ b/hfaxd/Makefile.in
+@@ -98,7 +98,7 @@ install: default
+ ${INSTALL} -root ${INSTALLROOT} -F ${LIBEXEC} -u root -m 755 \
+ -idb ${PRODUCT}.sw.server -O hfaxd
+ ${INSTALL} -root ${INSTALLROOT} -F ${LIBDATA} -m 644 -idb ${PRODUCT}.sw.server \
+- -idb "config(noupdate)" -src ${SRCDIR}/hfaxd.conf -O hfaxd.conf
++ -idb "config(noupdate)" -src ${SRCDIR}/hfaxd.conf -O hfaxd.conf.default
+
+ uninstall::
+ ${RM} -f ${LIBEXEC}/hfaxd
diff --git a/main/hylafaxplus/dont-ship-xferfaxlog-file.patch b/main/hylafaxplus/dont-ship-xferfaxlog-file.patch
new file mode 100644
index 0000000000..bf5c09dcaa
--- /dev/null
+++ b/main/hylafaxplus/dont-ship-xferfaxlog-file.patch
@@ -0,0 +1,38 @@
+diff --git a/etc/Makefile.in b/etc/Makefile.in
+index c5f647a..22aa277 100644
+--- a/etc/Makefile.in
++++ b/etc/Makefile.in
+@@ -56,7 +56,7 @@ DIALRULES=dialrules \
+ dialrules.ext \
+ dialrules.world \
+ dialrules.uk
+-TARGETS = config.fax hosts.hfaxd xferfaxlog lockname ondelay
++TARGETS = config.fax hosts.hfaxd lockname ondelay
+
+ default all::
+ @${MAKE} targets
+@@ -68,8 +68,6 @@ targets: ${TARGETS}
+ hosts.hfaxd:
+ ${ECHO} "localhost" >hosts.hfaxd
+ ${ECHO} "127.0.0.1" >>hosts.hfaxd
+-xferfaxlog:
+- ${ECHO} >xferfaxlog
+ config.fax:
+ ${ECHO} on >config.fax
+ lockname: ${SRCDIR}/lockname.c
+@@ -89,7 +87,6 @@ install: default
+ -src ${SRCDIR}/faxsetup.$$i -O faxsetup.$$i; \
+ done
+ ${PUTSERVER} -root ${INSTALLROOT} -F ${SBIN} -m 755 -src probemodem.sh -O probemodem
+- ${PUTSAMPLE} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 644 -o xferfaxlog
+ ${PUTSAMPLE} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 600 -o hosts.hfaxd
+ for i in ${DIALRULES}; do \
+ ${PUTSERVER} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 444 -src ${SRCDIR}/$$i \
+@@ -108,7 +105,6 @@ uninstall::
+ ${RM} -f ${SBIN}/faxsetup.$$i; \
+ done
+ ${RM} -f ${SBIN}/probemodem
+- ${RM} -f ${SPOOL}/etc/xferfaxlog
+ ${RM} -f ${SPOOL}/etc/hosts.hfaxd
+ for i in ${DIALRULES}; do \
+ ${RM} -f ${SPOOL}/etc/$$i; \
diff --git a/main/hylafaxplus/hylafaxplus.initd b/main/hylafaxplus/hylafaxplus.initd
index fe29a58358..c3ac4c4d9c 100644
--- a/main/hylafaxplus/hylafaxplus.initd
+++ b/main/hylafaxplus/hylafaxplus.initd
@@ -25,6 +25,11 @@ checkconfig() {
return 1
fi
+ if [ ! -f $SPOOL/lib/hfaxd.conf ] ; then
+ eerror "No $SPOOL/lib/hfaxd.conf file found. Rename and modify the hfaxd.conf.default"
+ return 1
+ fi
+
if [ ! -f $SPOOL/etc/setup.cache ] ; then
eerror "No $SPOOL/etc/setup.cache file found. Use faxsetup command"
return 1
diff --git a/main/hypermail/APKBUILD b/main/hypermail/APKBUILD
index 5faf53dab2..2f95ec2d44 100644
--- a/main/hypermail/APKBUILD
+++ b/main/hypermail/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=hypermail
pkgver=2.3.0
-pkgrel=5
+pkgrel=6
pkgdesc="Mail Archiver"
url="http://www.hypermail-project.org"
arch="all"
diff --git a/main/icu/APKBUILD b/main/icu/APKBUILD
index af61c144ba..65253095a1 100644
--- a/main/icu/APKBUILD
+++ b/main/icu/APKBUILD
@@ -1,13 +1,13 @@
# Contributor: Sergey Lukin <sergej.lukin@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
#
-# TODO: After 3.13 is released, change data-packaging to "archive" and split
+# TODO: After 3.15 is released, change data-packaging to "archive" and split
# data into multiple variants (English-only, all, ...).
pkgname=icu
-pkgver=67.1
-pkgrel=2
+pkgver=69.1
+pkgrel=1
pkgdesc="International Components for Unicode library"
-url="http://site.icu-project.org/"
+url="https://icu.unicode.org/"
arch="all"
license="MIT ICU Unicode-TOU"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-data::noarch"
@@ -17,6 +17,8 @@ source="https://github.com/unicode-org/icu/releases/download/release-${pkgver//.
builddir="$srcdir"/icu/source
# secfixes:
+# 66.1-r0:
+# - CVE-2020-21913
# 65.1-r1:
# - CVE-2020-10531
# 57.1-r1:
@@ -27,7 +29,7 @@ builddir="$srcdir"/icu/source
# - CVE-2017-7867
# - CVE-2017-7868
-# Failing tests on ARMv7
+# Tests segfaults on ARMv7
case "$CARCH" in
armv7) options="!check";;
esac
@@ -76,4 +78,6 @@ data() {
"$subpkgdir"/usr/share/icu/$pkgver/icudt${majorver}l.dat
}
-sha512sums="4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8 icu4c-67_1-src.tgz"
+sha512sums="
+d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7 icu4c-69_1-src.tgz
+"
diff --git a/main/imlib2/APKBUILD b/main/imlib2/APKBUILD
index 6953014187..b4c5dbf2a6 100644
--- a/main/imlib2/APKBUILD
+++ b/main/imlib2/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=imlib2
-pkgver=1.7.3
+pkgver=1.7.4
pkgrel=0
pkgdesc="Image manipulation library"
url="https://sourceforge.net/projects/enlightenment"
@@ -43,5 +43,5 @@ package() {
}
sha512sums="
-6accb10539eae878711742a52496875c1df66926a5f49f3d36b0eefbd73e21821c1bebc6ad50c099374dcf0959227924ad64de5a15f90c4105b11d029f4dc67a imlib2-1.7.3.tar.gz
+478379a09e254469f991b12679e5d00c271447d4ac671b286176f97ae716722b53ea48c4c2ed065c81d4df99e075669c9a506a59781ef735d60ed89351f00218 imlib2-1.7.4.tar.gz
"
diff --git a/main/in-sync/APKBUILD b/main/in-sync/APKBUILD
index 491ea40fb4..7a741e286d 100644
--- a/main/in-sync/APKBUILD
+++ b/main/in-sync/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=in-sync
pkgver=1.0
pkgrel=0
diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD
index 1aee2d9873..30c06ca064 100644
--- a/main/iproute2/APKBUILD
+++ b/main/iproute2/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=iproute2
-pkgver=5.14.0
+pkgver=5.15.0
pkgrel=0
pkgdesc="IP Routing Utilities"
options="!check" # Requires namespaces support and root
@@ -78,5 +78,5 @@ bashcomp() {
}
sha512sums="
-e2b9b0a2c3e6fc4c67cb50b0a9bf710e749648b83369a49bf905edd7e519d76c50c2cc818bb63cc605c409c66075d4d371f2371796e5f7a8f9d04101b80ef75c iproute2-5.14.0.tar.xz
+e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22 iproute2-5.15.0.tar.xz
"
diff --git a/main/ipset/APKBUILD b/main/ipset/APKBUILD
index d8ce9bea86..aac8f195e7 100644
--- a/main/ipset/APKBUILD
+++ b/main/ipset/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=ipset
pkgver=7.15
pkgrel=0
diff --git a/main/irssi/APKBUILD b/main/irssi/APKBUILD
index 81a3e51ae0..ee1a561aeb 100644
--- a/main/irssi/APKBUILD
+++ b/main/irssi/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=irssi
pkgver=1.2.3
-pkgrel=2
+pkgrel=3
pkgdesc="Modular textUI IRC client with IPv6 support"
url="https://irssi.org/"
arch="all"
license="GPL-2.0-or-later WITH OpenSSL-Exception"
-makedepends="glib-dev openssl-dev ncurses-dev perl-dev automake autoconf libtool libotr-dev"
+makedepends="glib-dev openssl1.1-compat-dev ncurses-dev perl-dev automake autoconf libtool libotr-dev"
subpackages="$pkgname-doc $pkgname-dev $pkgname-proxy $pkgname-perl $pkgname-otr"
source="https://github.com/irssi/irssi/releases/download/$pkgver/irssi-$pkgver.tar.xz
"
diff --git a/main/isl/APKBUILD b/main/isl/APKBUILD
index 12817e756c..d94b7f2270 100644
--- a/main/isl/APKBUILD
+++ b/main/isl/APKBUILD
@@ -12,7 +12,7 @@ makedepends_host="$depends_dev"
makedepends="$makedepends_host"
replaces="cloog"
subpackages=""
-source="http://isl.gforge.inria.fr/isl-$pkgver.tar.bz2"
+source="https://libisl.sourceforge.io/isl-$pkgver.tar.bz2"
builddir="$srcdir"/$pkgname-$pkgver
diff --git a/main/isl22/APKBUILD b/main/isl22/APKBUILD
index 889025f8da..a1327d7f89 100644
--- a/main/isl22/APKBUILD
+++ b/main/isl22/APKBUILD
@@ -17,7 +17,7 @@ depends_dev="gmp-dev"
makedepends_host="$depends_dev"
makedepends="$makedepends_host"
subpackages="isl-dev:_dev"
-source="http://isl.gforge.inria.fr/isl-$pkgver.tar.bz2"
+source="https://libisl.sourceforge.io/isl-$pkgver.tar.bz2"
builddir="$srcdir"/isl-$pkgver
diff --git a/main/iso-codes/APKBUILD b/main/iso-codes/APKBUILD
index 71f31934fa..805cf7f381 100644
--- a/main/iso-codes/APKBUILD
+++ b/main/iso-codes/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=iso-codes
-pkgver=4.7.0
+pkgver=4.8.0
pkgrel=0
pkgdesc="ISO codes and their translations"
url="https://salsa.debian.org/iso-codes-team/iso-codes"
@@ -27,5 +27,5 @@ package() {
}
sha512sums="
-c4116b3bf1617f9706d66237355715fbf4c373c37915038da77d683a9f2bb1ae2f71e6524e2ad7819160c49229f65d4a79f65d51272023142960f57f78b95eef iso-codes_4.7.0.orig.tar.xz
+fec0684ec14e23b1736286120835dd23677049eb5d597efb8526984e667dfdfceb9a23caecf6a34d687c285fd3ed1ad2f5a942d59190a37735bec2c92ab449f7 iso-codes_4.8.0.orig.tar.xz
"
diff --git a/main/itstool/APKBUILD b/main/itstool/APKBUILD
index 69e78abafe..5d6b0de9bb 100644
--- a/main/itstool/APKBUILD
+++ b/main/itstool/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=itstool
-pkgver=2.0.6
-pkgrel=1
+pkgver=2.0.7
+pkgrel=0
pkgdesc="ITS-based XML translation tool"
url="http://itstool.org/"
arch="noarch"
@@ -40,5 +40,7 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="900889d7c668eb87b516334702c926f1195e105a3568bc66c6bbc2b7e94302f6ae394a7de293dc516d11bca04fb1a25d150da06901c74df1a3714bdeb0a9cd03 itstool-2.0.6.tar.gz
-a47ab86ee0ea7b8fa8329649cda28db91e106ffdc695836e55f274b406759e3945835dbaf32230a30f2afaf482aff0ef205a12d722a19a6ab874c8f33413df9a fix-segfault.patch"
+sha512sums="
+03f16486336add31d24e74554fcb22f5ec00e0db63f890fb94d4a4561048b7aecaadd86d9ab7489a1b5f7adf180ce1b27131db928488e4e6ffe9444eee38a2e9 itstool-2.0.7.tar.gz
+a47ab86ee0ea7b8fa8329649cda28db91e106ffdc695836e55f274b406759e3945835dbaf32230a30f2afaf482aff0ef205a12d722a19a6ab874c8f33413df9a fix-segfault.patch
+"
diff --git a/main/jack/APKBUILD b/main/jack/APKBUILD
index c18537415d..7e69d561f1 100644
--- a/main/jack/APKBUILD
+++ b/main/jack/APKBUILD
@@ -1,19 +1,19 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=jack
-_realname=jack2
pkgver=1.9.19
-pkgrel=0
+pkgrel=2
pkgdesc="The Jack Audio Connection Kit"
-url="http://www.jackaudio.org"
+url="https://www.jackaudio.org/"
arch="all"
license="GPL-2.0 GPL-2.0-or-later LGPL-2.0-or-later"
makedepends="$depends_dev alsa-lib-dev dbus-dev expat-dev libsamplerate-dev
libsndfile-dev ncurses-dev readline-dev python3 linux-headers"
subpackages="$pkgname-dev $pkgname-doc $pkgname-dbus $pkgname-example-clients:_clients"
-source="$pkgname-$pkgver.tar.gz::https://github.com/jackaudio/jack2/archive/v$pkgver.tar.gz
+source="https://github.com/jackaudio/jack2/archive/v$pkgver/jack2-v$pkgver.tar.gz
fix-execinfo.patch
+ increase-api-version.patch
"
-builddir="$srcdir"/$_realname-$pkgver
+builddir="$srcdir/jack2-$pkgver"
options="!check" # no real tests provided
prepare() {
@@ -23,7 +23,6 @@ prepare() {
build() {
./waf configure \
- -j1 \
--prefix=/usr \
--mandir=/usr/share/man/man1 \
--libdir=/usr/lib \
@@ -31,7 +30,7 @@ build() {
--alsa \
--classic
- ./waf build -j${JOBS:-2} -v
+ ./waf build -v
}
package() {
@@ -52,6 +51,7 @@ _clients() {
}
sha512sums="
-d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d jack-1.9.19.tar.gz
+d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d jack2-v1.9.19.tar.gz
b5abec7e67485d1c13f399b5961539177dd35d21c5dd95e0aa767adb0f5b1e588e9ca2f9b29cc4d66fc039311ff7eacc4cf21f6700ef0a2c8de99b63cb00f84d fix-execinfo.patch
+d187d6a5e4e5c748d4f5eccf66a76249a4eb7135c22e32ca40eb2ea806ec6877074d8ba91c9cc106ae8e62ada6afda248fa48ebb147c720576ab092904993f51 increase-api-version.patch
"
diff --git a/main/jack/increase-api-version.patch b/main/jack/increase-api-version.patch
new file mode 100644
index 0000000000..78b07efe55
--- /dev/null
+++ b/main/jack/increase-api-version.patch
@@ -0,0 +1,16 @@
+jack's low API version (so:libjack.so.0.1.0) makes apk prefer pipewire-jack over jack
+We don't want this, users need to explicitly tell users they prefer pipewire-jack, so we increase the API version here to be always higher than pipewire-jack
+
+diff --git a/wscript b/wscript
+index e0d32c8d..2c0a7123 100644
+--- a/wscript
++++ b/wscript
+@@ -13,7 +13,7 @@ from waflib.Build import BuildContext, CleanContext, InstallContext, UninstallCo
+
+ VERSION='1.9.20'
+ APPNAME='jack'
+-JACK_API_VERSION = '0.1.0'
++JACK_API_VERSION = '0.999.0'
+
+ # these variables are mandatory ('/' are converted automatically)
+ top = '.'
diff --git a/main/jitterentropy-library/02-use-proper-pointer-dereferencing.patch b/main/jitterentropy-library/02-use-proper-pointer-dereferencing.patch
new file mode 100644
index 0000000000..fd4c852bfb
--- /dev/null
+++ b/main/jitterentropy-library/02-use-proper-pointer-dereferencing.patch
@@ -0,0 +1,26 @@
+Patch already in upstream master:
+
+JENT: use proper pointer dereferencing
+
+Signed-off-by: Stephan Mueller <smueller@chronox.de>
+
+---
+
+diff -aur a/jitterentropy-base-user.h b/jitterentropy-base-user.h
+--- a/jitterentropy-base-user.h
++++ b/jitterentropy-base-user.h
+@@ -290,12 +290,12 @@
+ ext = strstr(buf, "K");
+ if (ext) {
+ shift = 10;
+- ext = '\0';
++ *ext = '\0';
+ } else {
+ ext = strstr(buf, "M");
+ if (ext) {
+ shift = 20;
+- ext = '\0';
++ *ext = '\0';
+ }
+ }
+
diff --git a/main/jitterentropy-library/03-fix-execution-flow-and-args-order.patch b/main/jitterentropy-library/03-fix-execution-flow-and-args-order.patch
new file mode 100644
index 0000000000..a759441ac0
--- /dev/null
+++ b/main/jitterentropy-library/03-fix-execution-flow-and-args-order.patch
@@ -0,0 +1,44 @@
+Patch already in upstream master:
+
+Fix an execution flow and an arguments order
+
+A value of "ret" is always 0 after the first "if (ret)" in
+jent_entropy_init_ex(). This means jent_time_entropy_init()
+in the third "if (ret && ..." is not called if
+JENT_FORCE_INTERNAL_TIMER is set in "flags" and so
+"ret = jent_time_entropy_init()" in the second "if" is skipped.
+Fix this by assigning an initial non-zero value to "ret".
+
+Also fix an arguments ordering in jent_notime_enable().
+
+Signed-off-by: Vladis Dronov <vdronov@redhat.com>
+Signed-off-by: Stephan Mueller <smueller@chronox.de>
+
+---
+
+diff -aur a/src/jitterentropy-base.c b/src/jitterentropy-base.c
+--- a/src/jitterentropy-base.c
++++ b/src/jitterentropy-base.c
+@@ -710,6 +710,8 @@
+ if (ret)
+ return ret;
+
++ ret = ENOTIME;
++
+ /* Test without internal timer unless caller does not want it */
+ if (!(flags & JENT_FORCE_INTERNAL_TIMER))
+ ret = jent_time_entropy_init(osr,
+diff -aur a/src/jitterentropy-timer.c b/src/jitterentropy-timer.c
+--- a/src/jitterentropy-timer.c
++++ b/src/jitterentropy-timer.c
+@@ -202,8 +202,8 @@
+ if (jent_force_internal_timer || (flags & JENT_FORCE_INTERNAL_TIMER)) {
+ /* Self test not run yet */
+ if (!jent_force_internal_timer &&
+- jent_time_entropy_init(flags | JENT_FORCE_INTERNAL_TIMER,
+- ec->osr))
++ jent_time_entropy_init(ec->osr,
++ flags | JENT_FORCE_INTERNAL_TIMER))
+ return EHEALTH;
+
+ ec->enable_notime = 1;
diff --git a/main/jitterentropy-library/04-c11-asm-correction.patch b/main/jitterentropy-library/04-c11-asm-correction.patch
new file mode 100644
index 0000000000..a4a57dd20a
--- /dev/null
+++ b/main/jitterentropy-library/04-c11-asm-correction.patch
@@ -0,0 +1,21 @@
+Patch already in upstream master:
+
+JENT: C11 - use __asm__
+C11 requires the use of __asm__ instead of asm.
+
+Signed-off-by: Stephan Mueller <smueller@chronox.de>
+
+---
+
+diff -aur a/jitterentropy-base-user.h b/jitterentropy-base-user.h
+--- a/jitterentropy-base-user.h
++++ b/jitterentropy-base-user.h
+@@ -103,7 +103,7 @@
+ static inline void jent_get_nstime(uint64_t *out)
+ {
+ DECLARE_ARGS(val, low, high);
+- asm volatile("rdtsc" : EAX_EDX_RET(val, low, high));
++ __asm__ volatile("rdtsc" : EAX_EDX_RET(val, low, high));
+ *out = EAX_EDX_VAL(val, low, high);
+ }
+
diff --git a/main/jitterentropy-library/05-gcd-sensible-max.patch b/main/jitterentropy-library/05-gcd-sensible-max.patch
new file mode 100644
index 0000000000..8b626dc87f
--- /dev/null
+++ b/main/jitterentropy-library/05-gcd-sensible-max.patch
@@ -0,0 +1,37 @@
+Patch already in upstream master:
+
+JENT: GCD - use a sensible max
+On some systems like an EPYC, the GCD is observed to be larger than 100.
+As there is no reason to not allow larger GCD values, let us simply
+allow it.
+
+Signed-off-by: Stephan Mueller <smueller@chronox.de>
+
+---
+
+diff -aur a/src/jitterentropy-gcd.c b/src/jitterentropy-gcd.c
+--- a/src/jitterentropy-gcd.c
++++ b/src/jitterentropy-gcd.c
+@@ -36,6 +36,7 @@
+ /* Make a greater a than or equal b. */
+ if (a < b) {
+ uint64_t c = a;
++
+ a = b;
+ b = c;
+ }
+@@ -113,12 +114,8 @@
+ goto out;
+ }
+
+- /*
+- * Ensure that we have variations in the time stamp below 100 for at
+- * least 10% of all checks -- on some platforms, the counter increments
+- * in multiples of 100, but not always
+- */
+- if (running_gcd >= 100) {
++ /* Set a sensible maximum value. */
++ if (running_gcd >= UINT32_MAX / 2) {
+ ret = ECOARSETIME;
+ goto out;
+ }
diff --git a/main/jitterentropy-library/06-fix-memory-size.patch b/main/jitterentropy-library/06-fix-memory-size.patch
new file mode 100644
index 0000000000..b6a2b4c7f0
--- /dev/null
+++ b/main/jitterentropy-library/06-fix-memory-size.patch
@@ -0,0 +1,42 @@
+Patch already in upstream master:
+
+JENT: fix memory size in error code path
+The caller is allowed to specify the code size used for the memory
+access. Thus the error code path should observe it as well to ensure it
+only zeroizes the memory that was allocated.
+
+Reported-by: Jordan Day <jday@teradici.com>
+Signed-off-by: Stephan Mueller <smueller@chronox.de>
+
+---
+
+diff -aur a/src/jitterentropy-base.c b/src/jitterentropy-base.c
+--- a/src/jitterentropy-base.c
++++ b/src/jitterentropy-base.c
+@@ -379,6 +379,7 @@
+ *jent_entropy_collector_alloc_internal(unsigned int osr, unsigned int flags)
+ {
+ struct rand_data *entropy_collector;
++ uint32_t memsize = 0;
+
+ /*
+ * Requesting disabling and forcing of internal timer
+@@ -405,8 +406,7 @@
+ return NULL;
+
+ if (!(flags & JENT_DISABLE_MEMORY_ACCESS)) {
+- uint32_t memsize = jent_memsize(flags);
+-
++ memsize = jent_memsize(flags);
+ entropy_collector->mem = (unsigned char *)jent_zalloc(memsize);
+
+ #ifdef JENT_RANDOM_MEMACCESS
+@@ -469,7 +469,7 @@
+
+ err:
+ if (entropy_collector->mem != NULL)
+- jent_zfree(entropy_collector->mem, JENT_MEMORY_SIZE);
++ jent_zfree(entropy_collector->mem, memsize);
+ jent_zfree(entropy_collector, sizeof(struct rand_data));
+ return NULL;
+ }
diff --git a/main/jitterentropy-library/APKBUILD b/main/jitterentropy-library/APKBUILD
index 8f75975afa..17be73badb 100755
--- a/main/jitterentropy-library/APKBUILD
+++ b/main/jitterentropy-library/APKBUILD
@@ -9,7 +9,7 @@ pkgname=jitterentropy-library
# time and potentially upgrading jitterentropy-library alone could break
# rng-tools' jitter functionality).
#
-pkgver=3.1.0
+pkgver=3.3.0
pkgrel=0
pkgdesc="Jitterentropy library"
url="http://www.chronox.de/jent.html"
@@ -19,6 +19,11 @@ subpackages="$pkgname-dev $pkgname-doc"
options="!check" # There are no testcases
source="$pkgname-$pkgver.tar.gz::https://github.com/smuellerDD/jitterentropy-library/archive/v$pkgver.tar.gz
01-disable-gcc-optimisation.patch
+ 02-use-proper-pointer-dereferencing.patch
+ 03-fix-execution-flow-and-args-order.patch
+ 04-c11-asm-correction.patch
+ 05-gcd-sensible-max.patch
+ 06-fix-memory-size.patch
"
build() {
@@ -30,6 +35,11 @@ package() {
}
sha512sums="
-0c21de6b9bb9a5e24c553ae46dd096d6bf2bd1bc22a94746cf12082ee17ec4f7b2206afb16799fdf00f32d694e4b9f9604876b571b1ed093ef0fc32143f3556b jitterentropy-library-3.1.0.tar.gz
+1c7956fbacf8accb401f4ff3cc5674f384ef33a5f907c181ea358f2ca9e7c6b46ad1465743100fc0157c47a970c383e84029688bfa0a844e1e10675c1355993c jitterentropy-library-3.3.0.tar.gz
0a71265b503a1ce9758cb4e2bf8c806e1c427be80567fb530168e50e3aa324569edeba42dcb7dc3c7a147f1a0e360479b4af52cea2dd548b1096939f4f5b8aa6 01-disable-gcc-optimisation.patch
+3e67f94f4a06c1e9301b15eb3233468389ebbfb771437b389b8e8ff04ff84f09fe0297f8b3bb33c315362b556871612d084918b19cb2d8cd49d8595a89a5fc87 02-use-proper-pointer-dereferencing.patch
+3a7881605791502b58c10b79f17366fd127c5aaa0884ce65682b090fbdec4739770d2915df037aa85143339018e3fd3eeca2a2cc194a002cb208d49d84d4ee50 03-fix-execution-flow-and-args-order.patch
+411f875c6a451ce452f25b7f84699b3a9e9707e182ae9276e7ef0072d7cd956b4e9d957a784b3696c1beb29845ba9c2f5dbd85fd2a7db4237d9b67b57b62a04e 04-c11-asm-correction.patch
+bec9cdae68e6c7bdedff121bac4082e3346ff08355be12b7d412603ecdb96344b90b27e9045264558eb9eb0bd7cc90e777805100e031e481aaa92d70134859f5 05-gcd-sensible-max.patch
+acb49f317506f7cf4a11f1c40fb01d0f27e6a8440fa09e26114457340fb8143e3e93b06165005eb703be8398d579bf88dce00e3554c7a4e6f229075a21891e32 06-fix-memory-size.patch
"
diff --git a/main/jwhois/APKBUILD b/main/jwhois/APKBUILD
index 10a4643714..e69cb8438e 100644
--- a/main/jwhois/APKBUILD
+++ b/main/jwhois/APKBUILD
@@ -1,7 +1,7 @@
-# Maintainer:
+# Maintainer:
pkgname=jwhois
pkgver=4.0
-pkgrel=5
+pkgrel=6
pkgdesc="WHOIS/RWHOIS client"
url="https://www.gnu.org/software/jwhois/"
license="GPL"
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 52492db0b0..55066b0429 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -4,8 +4,8 @@
# Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
pkgname=kamailio
-pkgver=5.5.1
-pkgrel=2
+pkgver=5.5.2
+pkgrel=0
# If building from a git snapshot, specify the gitcommit
# If building a proper release, leave gitcommit blank or commented
@@ -24,7 +24,7 @@ arch="all"
license="GPL-2.0-or-later"
depends="gawk"
makedepends="bison flex freeradius-client-dev expat-dev
- lksctp-tools-dev perl-dev postgresql-dev python3-dev
+ lksctp-tools-dev perl-dev libpq-dev python3-dev
pcre-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev
confuse-dev ncurses-dev sqlite-dev lua-dev openldap-dev openssl1.1-compat-dev
net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev
@@ -33,6 +33,7 @@ makedepends="bison flex freeradius-client-dev expat-dev
# These are in testing / community - can't enable for kamailio in main
# librdkafka-dev dnssec-tools-dev
source="kamailio-${pkgver}$_suffix.tar.gz::https://github.com/kamailio/kamailio/archive/$_gitcommit.tar.gz
+ fix-openldap-2.5-symbol-conflict.patch
kamailio.initd
"
@@ -300,7 +301,7 @@ package() {
_mv_mod() {
local moddir=usr/lib/kamailio/modules i=
mkdir -p "$subpkgdir"/$moddir
- for i in $@; do
+ for i in "$@"; do
mv "$pkgdir"/$moddir/$i.so "$subpkgdir"/$moddir/
done
}
@@ -555,6 +556,7 @@ sipdump() {
}
sha512sums="
-2f5fc35e771dd522e113205d6c464f457d90b7e45fd826f035eba9a580af79c8c2326f7472ed69a380640bab06959844b9096534bdda166f1b4c3f916b876458 kamailio-5.5.1.tar.gz
+5f887453c9c00acff855505d9b567c200242791686aeacb2477065136d5edcfc76c4cab55078d36e6b76294246343c412dd9959219f1eff57ffe239550de7a37 kamailio-5.5.2.tar.gz
+50d055c62fc9ba2248b5883e316d5f91930ef74906314cc9d2e3379168f0967173e5474c9915c81edb1174035f33f7fa570e80d99c9bd27aa9ef38c0b155a76c fix-openldap-2.5-symbol-conflict.patch
0c87bfb78481568c03e603049eb8597a90d24ae2941fc81694181b2326fa9db89fbddaaa3cf08c7bc2f5fa0e7ffac4cf4e2d010d08c4faa6cf6df98593432539 kamailio.initd
"
diff --git a/main/kamailio/fix-openldap-2.5-symbol-conflict.patch b/main/kamailio/fix-openldap-2.5-symbol-conflict.patch
new file mode 100644
index 0000000000..766616f31b
--- /dev/null
+++ b/main/kamailio/fix-openldap-2.5-symbol-conflict.patch
@@ -0,0 +1,46 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sun, 31 Oct 2021 21:23:35 +0100
+Subject: [PATCH] Fix symbol conflict with OpenLDAP 2.5+
+
+ In file included from ldap_connect.c:34:
+ ldap_connect.h:34:12: error: conflicting types for 'ldap_connect'
+ 34 | extern int ldap_connect(char *_ld_name);
+ | ^~~~~~~~~~~~
+ In file included from ldap_connect.c:32:
+ /usr/include/ldap.h:1555:1: note: previous declaration of 'ldap_connect' was here
+ 1555 | ldap_connect( LDAP *ld );
+ | ^~~~~~~~~~~~
+
+--- a/src/modules/ldap/ldap_connect.c
++++ b/src/modules/ldap/ldap_connect.c
+@@ -185,7 +185,7 @@
+ return 0;
+ }
+
+-int ldap_connect(char *_ld_name)
++int kam_ldap_connect(char *_ld_name)
+ {
+ return ldap_connect_ex(_ld_name, L_DBG);
+ }
+--- a/src/modules/ldap/ldap_connect.h
++++ b/src/modules/ldap/ldap_connect.h
+@@ -31,7 +31,7 @@
+ #include "../../core/str.h"
+ #include "../../core/dprint.h"
+
+-extern int ldap_connect(char *_ld_name);
++extern int kam_ldap_connect(char *_ld_name);
+ extern int ldap_disconnect(char *_ld_name);
+ extern int ldap_reconnect(char *_ld_name);
+ extern int ldap_get_vendor_version(char **_version);
+--- a/src/modules/ldap/ldap_mod.c
++++ b/src/modules/ldap/ldap_mod.c
+@@ -167,7 +167,7 @@
+ return -1;
+ }
+
+- if(ldap_connect(ld_name) != 0) {
++ if(kam_ldap_connect(ld_name) != 0) {
+ LM_ERR("[%s]: failed to connect to LDAP host(s)\n", ld_name);
+ ldap_disconnect(ld_name);
+ return -1;
diff --git a/main/kernel-hooks/APKBUILD b/main/kernel-hooks/APKBUILD
new file mode 100644
index 0000000000..3497f64e9f
--- /dev/null
+++ b/main/kernel-hooks/APKBUILD
@@ -0,0 +1,20 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=kernel-hooks
+pkgver=0.2
+pkgrel=0
+pkgdesc="Run user-provided hooks when /lib/modules/* is updated"
+url="https://gitlab.alpinelinux.org/alpine/aports/"
+arch="noarch"
+license="MIT"
+triggers="$pkgname.trigger=/lib/modules/*"
+source="README"
+options="!check" # no tests
+
+package() {
+ install -D -m644 "$srcdir"/README "$pkgdir"/etc/kernel-hooks.d/README
+}
+
+sha512sums="
+757a49dc238ce69210219ad7db9a6ebcd14d696d29d1e52dd57d8ce891aac5218aedbb95d1c73bb60f782d586c837ac100cd347b01c64116c41aa873ac7ff67d README
+"
diff --git a/main/kernel-hooks/README b/main/kernel-hooks/README
new file mode 100644
index 0000000000..4c908dbdde
--- /dev/null
+++ b/main/kernel-hooks/README
@@ -0,0 +1,13 @@
+Executable scripts found in this directory are executed by the kernel-hooks
+package trigger after any kernel package or package providing kernel modules
+is (re)installed, upgraded or removed.
+
+Scripts are executed sequentially in alphabetic order with the following
+arguments: <kernel-flavor> <new-version> [<old-version>].
+
+<*-version> is a version of kernel package in the same format as in 'uname -r',
+without the flavor (e.g. 5.10.51-0).
+
+<new-version> is empty string if the kernel is removed.
+<old-version> is empty string if the kernel is (re)installed or any package
+providing modules for this kernel is installed, upgraded or removed.
diff --git a/main/kernel-hooks/kernel-hooks.trigger b/main/kernel-hooks/kernel-hooks.trigger
new file mode 100644
index 0000000000..5d05d3f54e
--- /dev/null
+++ b/main/kernel-hooks/kernel-hooks.trigger
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+PROGNAME='kernel-hooks'
+HOOKS_DIR='/etc/kernel-hooks.d'
+
+[ -d $HOOKS_DIR ] || exit 0
+
+flavors_vers=
+for path in "$@"; do
+ name="${path##*/}"
+
+ case "$name" in
+ [0-9]*-[0-9]*-*) ;; # go on
+ *) echo "$PROGNAME: ERROR: invalid kernel version: $name!" >&2; exit 1;;
+ esac
+
+ flavor=${name#*-}; flavor=${flavor#*-}
+ ver=${name%-$flavor}
+ flavors_vers="$flavors_vers $flavor:$ver"
+done
+
+for flavor in $(printf '%s\n' $flavors_vers | sort | cut -d: -f1 | uniq); do
+ relfile=/usr/share/kernel/$flavor/kernel.release
+
+ new_ver=
+ old_ver=
+ for fv in $flavors_vers; do
+ [ "${fv%:*}" = "$flavor" ] || continue
+ ver=${fv#*:}
+
+ [ "$(cat "$relfile" 2>/dev/null)" = "$ver-$flavor" ] \
+ && new_ver=$ver \
+ || old_ver=$ver
+ done
+
+ for hook in $HOOKS_DIR/*; do
+ [ -x "$hook" ] || continue
+ name=${hook##*/}
+
+ echo "$PROGNAME: executing hook $name ($flavor, $new_ver, $old_ver)" >&2
+
+ $hook "$flavor" "$new_ver" "$old_ver" \
+ || echo "$PROGNAME: ERROR: hook $name failed" >&2
+ done
+done
+
+# Triggers exiting with a non-zero status cause headaches. APK marks the
+# corresponding package and the world as broken. Consequently, it exists with
+# status 1 even after e.g. successful installation of a new package.
+exit 0
diff --git a/main/kmod/APKBUILD b/main/kmod/APKBUILD
index 36c0f43f66..5425544b20 100644
--- a/main/kmod/APKBUILD
+++ b/main/kmod/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=kmod
pkgver=29
-pkgrel=1
+pkgrel=2
pkgdesc="Linux kernel module management utilities"
url="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary"
arch="all"
@@ -10,7 +10,7 @@ options="!check" # https://bugs.gentoo.org/408915#c3
license="GPL-2.0-or-later"
# gnu sed is needed for symlink
makedepends_build="sed libxslt"
-makedepends_host="$depends_dev zlib-dev xz-dev zstd-dev openssl-dev"
+makedepends_host="$depends_dev zlib-dev xz-dev zstd-dev openssl1.1-compat-dev"
makedepends="$makedepends_build $makedepends_host"