aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/acf-amavisd-new/APKBUILD2
-rw-r--r--main/acf-ipsec-tools/APKBUILD17
-rw-r--r--main/ack/APKBUILD4
-rw-r--r--main/acpica/APKBUILD6
-rw-r--r--main/alpine-base/APKBUILD2
-rw-r--r--main/alpine-mirrors/APKBUILD45
-rw-r--r--main/alpine-mirrors/mirrors.yaml143
-rw-r--r--main/alsa-lib/APKBUILD8
-rw-r--r--main/amavis/APKBUILD4
-rw-r--r--main/amavisd-milter/APKBUILD16
-rw-r--r--main/ansible/APKBUILD5
-rw-r--r--main/apache-mod-auth-kerb/APKBUILD8
-rw-r--r--main/apache-mod-auth-kerb/krb5-1.18-fix.patch35
-rw-r--r--main/apache2/APKBUILD8
-rw-r--r--main/apk-tools/0001-build-make-soname-explicit-and-simplify-and-fix-sona.patch67
-rw-r--r--main/apk-tools/0002-fix-repository-short-option-to-be-X-as-before.patch27
-rw-r--r--main/apk-tools/APKBUILD33
-rw-r--r--main/apr-util/APKBUILD24
-rw-r--r--main/arpwatch/APKBUILD27
-rw-r--r--main/asciidoc/APKBUILD4
-rw-r--r--main/aspell-de/APKBUILD12
-rw-r--r--main/asterisk/APKBUILD4
-rw-r--r--main/at-spi2-atk/APKBUILD19
-rw-r--r--main/at-spi2-core/APKBUILD14
-rw-r--r--main/atk/APKBUILD12
-rw-r--r--main/avahi-ui/APKBUILD2
-rw-r--r--main/avahi/APKBUILD2
-rw-r--r--main/avfs/APKBUILD4
-rw-r--r--main/awall/APKBUILD8
-rw-r--r--main/bacula/APKBUILD4
-rw-r--r--main/bash-completion/APKBUILD9
-rw-r--r--main/bash/APKBUILD5
-rw-r--r--main/bats/APKBUILD4
-rw-r--r--main/bind/APKBUILD29
-rw-r--r--main/binutils/APKBUILD6
-rw-r--r--main/bison/APKBUILD17
-rw-r--r--main/bmd-tools/APKBUILD18
-rw-r--r--main/bridge-utils/APKBUILD14
-rw-r--r--main/brotli/838.patch49
-rw-r--r--main/brotli/APKBUILD10
-rw-r--r--main/busybox/0001-Revert-ash-jobs-Only-clear-gotsigchld-when-waiting-f.patch212
-rw-r--r--main/busybox/APKBUILD20
-rw-r--r--main/busybox/busyboxconfig-extras4
-rw-r--r--main/byacc/APKBUILD4
-rw-r--r--main/ccache/APKBUILD5
-rw-r--r--main/cdparanoia/APKBUILD2
-rw-r--r--main/cdrkit/APKBUILD47
-rw-r--r--main/chrony/APKBUILD17
-rw-r--r--main/chrony/fix-util-unit-test-for-NTP-era-split.patch38
-rw-r--r--main/cifs-utils/APKBUILD10
-rw-r--r--main/cjdns/0001-seccomp-handle-__NR_clock_gettime64-when-appropriate.patch31
-rw-r--r--main/cjdns/APKBUILD6
-rw-r--r--main/ckbcomp/APKBUILD6
-rw-r--r--main/clamav/APKBUILD27
-rwxr-xr-xmain/clamav/clamd.initd7
-rw-r--r--main/clamav/freshclam.initd5
-rw-r--r--main/clang/APKBUILD8
-rw-r--r--main/cmake/APKBUILD16
-rw-r--r--main/compiler-rt/APKBUILD6
-rw-r--r--main/conky/APKBUILD11
-rw-r--r--main/consolekit2/0001-busybox-reboot-and-poweroff-support.patch40
-rw-r--r--main/consolekit2/APKBUILD44
-rw-r--r--main/consolekit2/pam-foreground-compat.ck17
-rw-r--r--main/coova-chilli/APKBUILD10
-rw-r--r--main/cracklib/APKBUILD9
-rw-r--r--main/cracklib/cracklib.trigger2
-rw-r--r--main/cracklib/fix-trigger-warning.patch39
-rw-r--r--main/cryptsetup/APKBUILD8
-rw-r--r--main/ctags/APKBUILD6
-rw-r--r--main/cups/APKBUILD4
-rw-r--r--main/curl/APKBUILD8
-rw-r--r--main/cvechecker/APKBUILD15
-rw-r--r--main/cyrus-sasl/APKBUILD35
-rw-r--r--main/cython/APKBUILD4
-rw-r--r--main/d-feet/APKBUILD13
-rw-r--r--main/dahdi-linux-lts/APKBUILD2
-rw-r--r--main/datefudge/APKBUILD6
-rw-r--r--main/datefudge/musl.patch11
-rw-r--r--main/dbus/APKBUILD4
-rw-r--r--main/dbus/avoid-opendir-between-fork-exec.patch18
-rw-r--r--main/dconf/APKBUILD14
-rw-r--r--main/dnsmasq/APKBUILD6
-rw-r--r--main/dnstop/APKBUILD4
-rw-r--r--main/dovecot/APKBUILD21
-rw-r--r--main/dovecot/fix-oauth2-jwt.c.patch55
-rw-r--r--main/doxygen/APKBUILD6
-rw-r--r--main/doxygen/doxygen-1.8.14-install.patch30
-rw-r--r--main/dpkg/0001-t-command-Fix-test_command_exec-program-invocation.patch33
-rw-r--r--main/dpkg/APKBUILD40
-rw-r--r--main/dpkg/time_t.patch95
-rw-r--r--main/drbd-lts/APKBUILD2
-rw-r--r--main/elfutils/APKBUILD7
-rw-r--r--main/ell/APKBUILD6
-rw-r--r--main/espeak/APKBUILD10
-rw-r--r--main/ethtool/APKBUILD5
-rw-r--r--main/f2fs-tools/APKBUILD17
-rw-r--r--main/fail2ban/APKBUILD7
-rw-r--r--main/fail2ban/fail2ban.logrotate2
-rw-r--r--main/fcgiwrap/APKBUILD6
-rw-r--r--main/fcgiwrap/fcgiwrap.initd1
-rw-r--r--main/fcgiwrap/fcgiwrap.pre-install2
-rw-r--r--main/fetchmail/APKBUILD6
-rw-r--r--main/fish/APKBUILD5
-rw-r--r--main/font-misc-ethiopic/APKBUILD33
-rw-r--r--main/fping/APKBUILD10
-rw-r--r--main/freeradius/APKBUILD4
-rw-r--r--main/freeradius/radiusd.initd6
-rw-r--r--main/freeswitch/APKBUILD10
-rw-r--r--main/freeswitch/modules.conf54
-rw-r--r--main/freetds/APKBUILD4
-rw-r--r--main/fribidi/APKBUILD4
-rw-r--r--main/fsarchiver/APKBUILD4
-rw-r--r--main/fuse3/APKBUILD16
-rw-r--r--main/gcc/0001-posix_memalign.patch (renamed from main/gcc/0002-posix_memalign.patch)8
-rw-r--r--main/gcc/0002-gcc-poison-system-directories.patch (renamed from main/gcc/0003-gcc-poison-system-directories.patch)65
-rw-r--r--main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch39
-rw-r--r--main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch (renamed from main/gcc/003_all_default-fortify-source.patch)52
-rw-r--r--main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch (renamed from main/gcc/005_all_default-as-needed.patch)383
-rw-r--r--main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch (renamed from main/gcc/011_all_default-warn-format-security.patch)26
-rw-r--r--main/gcc/0007-Enable-Wtrampolines-by-default.patch25
-rw-r--r--main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch53
-rw-r--r--main/gcc/0008-s390x-muslldso.patch26
-rw-r--r--main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch (renamed from main/gcc/020_all_msgfmt-libstdc++-link.patch)29
-rw-r--r--main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch28
-rw-r--r--main/gcc/0010-ldbl128-config.patch76
-rw-r--r--main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch24
-rw-r--r--main/gcc/0012-libitm-disable-FORTIFY.patch (renamed from main/gcc/053_all_libitm-no-fortify-source.patch)20
-rw-r--r--main/gcc/0012-static-pie.patch107
-rw-r--r--main/gcc/0013-libgcc_s.patch (renamed from main/gcc/203-libgcc_s.patch)28
-rw-r--r--main/gcc/0014-nopie.patch (renamed from main/gcc/205-nopie.patch)14
-rw-r--r--main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch25
-rw-r--r--main/gcc/0016-dlang-update-zlib-binding.patch (renamed from main/gcc/404-dlang-zlib.patch)28
-rw-r--r--main/gcc/0016-invalid_tls_model.patch29
-rw-r--r--main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch51
-rw-r--r--main/gcc/0018-ada-fix-shared-linking.patch (renamed from main/gcc/ada-shared.patch)26
-rw-r--r--main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch24
-rw-r--r--main/gcc/0020-libstdc-futex-add-time64-compatibility.patch32
-rw-r--r--main/gcc/0021-add-fortify-headers-paths.patch25
-rw-r--r--main/gcc/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch31
-rw-r--r--main/gcc/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch (renamed from main/gcc/gcc-as-needed-gold.patch)25
-rw-r--r--main/gcc/0024-Pure-64-bit-MIPS.patch (renamed from main/gcc/gcc-pure64-mips.patch)12
-rw-r--r--main/gcc/0025-use-pure-64-bit-configuration-where-appropriate.patch (renamed from main/gcc/gcc-pure64.patch)100
-rw-r--r--main/gcc/0026-always-build-libgcc_eh.a.patch (renamed from main/gcc/libgcc-always-build-gcceh.a.patch)32
-rw-r--r--main/gcc/0027-ada-libgnarl-compatibility-for-musl.patch (renamed from main/gcc/libgnarl-musl.patch)41
-rw-r--r--main/gcc/0028-ada-musl-support-fixes.patch (renamed from main/gcc/ada-musl.patch)137
-rw-r--r--main/gcc/0029-c-Fix-bogus-vector-initialisation-error-PR96377.patch520
-rw-r--r--main/gcc/002_all_default-relro.patch33
-rw-r--r--main/gcc/0030-rs6000-ICE-when-using-an-MMA-type-as-a-function-para.patch157
-rw-r--r--main/gcc/0031-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch45
-rw-r--r--main/gcc/0032-gcc-go-Don-t-include-sys-user.h.patch27
-rw-r--r--main/gcc/0033-gcc-go-Fix-ucontext_t-on-PPC64.patch26
-rw-r--r--main/gcc/0034-gcc-go-Fix-handling-of-signal-34-on-musl.patch40
-rw-r--r--main/gcc/0035-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch35
-rw-r--r--main/gcc/0036-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch34
-rw-r--r--main/gcc/0037-gcc-go-signal-34-is-special-on-musl-libc.patch26
-rw-r--r--main/gcc/0038-gcc-go-Prefer-_off_t-over-_off64_t.patch27
-rw-r--r--main/gcc/0039-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch24
-rw-r--r--main/gcc/0040-gcc-go-link-to-libucontext.patch22
-rw-r--r--main/gcc/0041-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch23
-rw-r--r--main/gcc/012_all_default-warn-trampolines.patch13
-rw-r--r--main/gcc/013_all_default-ssp-fix.patch38
-rw-r--r--main/gcc/050_all_libiberty-asprintf.patch18
-rw-r--r--main/gcc/051_all_libiberty-pic.patch10
-rw-r--r--main/gcc/090_all_pr55930-dependency-tracking.patch18
-rw-r--r--main/gcc/320-libffi-gnulinux.patch13
-rw-r--r--main/gcc/400-dlang-phobos.patch1216
-rw-r--r--main/gcc/401-dlang-32bits.patch25
-rw-r--r--main/gcc/402-dlang-stat.patch448
-rw-r--r--main/gcc/403-dlang-ibmz.patch137
-rw-r--r--main/gcc/405-dlang-mips.patch34
-rw-r--r--main/gcc/406-dlang-fix-interface-visibility.patch22
-rw-r--r--main/gcc/APKBUILD197
-rw-r--r--main/gcc/fix-cxxflags-passing.patch10
-rw-r--r--main/gcc/futex-time64.patch21
-rw-r--r--main/gcc/gcc-4.9-musl-fortify.patch11
-rw-r--r--main/gcc/gcc-6.1-musl-libssp.patch20
-rw-r--r--main/gcr/APKBUILD24
-rw-r--r--main/gcr/fix-64-bit-time_t-32-bit.patch14
-rw-r--r--main/gdbm/APKBUILD20
-rw-r--r--main/gdbm/gcc-10.patch17
-rw-r--r--main/gdk-pixbuf/APKBUILD8
-rw-r--r--main/ghostscript-fonts/APKBUILD2
-rw-r--r--main/ghostscript/APKBUILD33
-rw-r--r--main/git/APKBUILD9
-rw-r--r--main/gitolite/APKBUILD4
-rw-r--r--main/glib/APKBUILD21
-rw-r--r--main/glib/mips-disable-memory-barrier.patch11
-rw-r--r--main/glib/mips-disable-some-gio-test-resources.patch11
-rw-r--r--main/glib/musl-libintl.patch19
-rw-r--r--main/glslang/APKBUILD11
-rw-r--r--main/gnokii/APKBUILD4
-rw-r--r--main/gnupg/APKBUILD6
-rw-r--r--main/gnupg/gnupg-scdaemon.pre-install2
-rw-r--r--main/gnutls/APKBUILD6
-rw-r--r--main/gobject-introspection/APKBUILD25
-rw-r--r--main/gobject-introspection/musl-time64.patch41
-rw-r--r--main/gphoto2/APKBUILD11
-rw-r--r--main/gphoto2/FlashpixVersion.patch18
-rw-r--r--main/gpsd/APKBUILD8
-rw-r--r--main/graphviz/APKBUILD3
-rw-r--r--main/groff/APKBUILD6
-rw-r--r--main/gst-plugins-base/APKBUILD11
-rw-r--r--main/gstreamer/APKBUILD11
-rw-r--r--main/gtk+3.0/APKBUILD17
-rw-r--r--main/gzip/APKBUILD15
-rw-r--r--main/haproxy/APKBUILD12
-rw-r--r--main/haproxy/haproxy.initd16
-rw-r--r--main/harfbuzz/APKBUILD17
-rw-r--r--main/haveged/APKBUILD4
-rw-r--r--main/heimdal/APKBUILD17
-rw-r--r--main/highlight/APKBUILD4
-rw-r--r--main/hiredis/APKBUILD20
-rw-r--r--main/hiredis/musl-test.patch11
-rw-r--r--main/hostapd/APKBUILD2
-rw-r--r--main/htop/APKBUILD21
-rw-r--r--main/htop/fix-python-path.patch8
-rw-r--r--main/hwids/APKBUILD4
-rw-r--r--main/hylafaxplus/APKBUILD11
-rw-r--r--main/hypermail/APKBUILD2
-rw-r--r--main/icecast/APKBUILD22
-rw-r--r--main/icon-naming-utils/APKBUILD7
-rw-r--r--main/icu/APKBUILD4
-rw-r--r--main/ifupdown-ng/APKBUILD75
-rw-r--r--main/ifupdown/APKBUILD28
-rw-r--r--main/imlib2/APKBUILD12
-rw-r--r--main/imlib2/fix-s390x.patch16
-rw-r--r--main/installkernel/APKBUILD3
-rw-r--r--main/iperf3/APKBUILD4
-rw-r--r--main/iproute2/APKBUILD41
-rw-r--r--main/ipsec-tools/20-grekey-support.patch786
-rw-r--r--main/ipsec-tools/50-reverse-connect.patch197
-rw-r--r--main/ipsec-tools/70-defer-isakmp-ident-handling.patch179
-rw-r--r--main/ipsec-tools/75-racoonctl-rcvbuf.patch33
-rw-r--r--main/ipsec-tools/90-dead-on-initial-contact.patch11
-rw-r--r--main/ipsec-tools/APKBUILD75
-rw-r--r--main/ipsec-tools/disable-Werror.patch40
-rw-r--r--main/ipsec-tools/fix-yywrap.patch23
-rw-r--r--main/ipsec-tools/ipsec-tools-openssl-1.1.patch1085
-rw-r--r--main/ipsec-tools/musl-cdefs.patch156
-rw-r--r--main/ipsec-tools/racoon.confd20
-rw-r--r--main/ipsec-tools/racoon.initd60
-rw-r--r--main/iptables/APKBUILD8
-rw-r--r--main/iptables/ebtables.confd2
-rw-r--r--main/iptables/ebtables.initd7
-rw-r--r--main/iptables/iptables.initd3
-rw-r--r--main/iputils/APKBUILD14
-rw-r--r--main/ircii/APKBUILD6
-rw-r--r--main/irqbalance/APKBUILD10
-rw-r--r--main/irssi/APKBUILD2
-rw-r--r--main/iw/APKBUILD4
-rw-r--r--main/jbig2dec/APKBUILD6
-rw-r--r--main/json-c/APKBUILD13
-rw-r--r--main/jwhois/APKBUILD2
-rw-r--r--main/kamailio/APKBUILD59
-rw-r--r--main/kbd/0001-libkbdfile-Check-compression-suffix-even-if-the-suff.patch68
-rw-r--r--main/kbd/0001-libkeymap-Fix-the-compatibility-with-the-busybox-s-l.patch31
-rw-r--r--main/kbd/APKBUILD34
-rw-r--r--main/kbd/fix-tests.patch41
-rw-r--r--main/keyutils/APKBUILD8
-rw-r--r--main/knock/APKBUILD6
-rw-r--r--main/knot/APKBUILD13
-rw-r--r--main/lame/APKBUILD5
-rw-r--r--main/ldb/APKBUILD4
-rw-r--r--main/less/APKBUILD9
-rw-r--r--main/lftp/APKBUILD4
-rw-r--r--main/libcap-ng/APKBUILD17
-rw-r--r--main/libcap-ng/fix-includes.patch11
-rw-r--r--main/libcap/APKBUILD19
-rw-r--r--main/libdnet/APKBUILD10
-rw-r--r--main/libdrm/APKBUILD17
-rw-r--r--main/libdv/APKBUILD2
-rw-r--r--main/libeconf/APKBUILD27
-rw-r--r--main/libedit/APKBUILD6
-rw-r--r--main/libevdev/APKBUILD15
-rw-r--r--main/libevent/APKBUILD6
-rw-r--r--main/libgcrypt/APKBUILD4
-rw-r--r--main/libgpg-error/APKBUILD4
-rw-r--r--main/libical/APKBUILD7
-rw-r--r--main/libinput/APKBUILD24
-rw-r--r--main/liblogging/APKBUILD4
-rw-r--r--main/libmaxminddb/APKBUILD15
-rw-r--r--main/libmnl/APKBUILD25
-rw-r--r--main/libmnl/musl-fix-headers.patch13
-rw-r--r--main/libnetfilter_cthelper/APKBUILD2
-rw-r--r--main/libnetfilter_cttimeout/APKBUILD2
-rw-r--r--main/libnice/APKBUILD10
-rw-r--r--main/librelp/APKBUILD6
-rw-r--r--main/libressl/APKBUILD16
-rw-r--r--main/libseccomp/APKBUILD15
-rw-r--r--main/libseccomp/fix-performace-regression.patch361
-rw-r--r--main/libsecret/APKBUILD13
-rw-r--r--main/libsndfile/APKBUILD44
-rw-r--r--main/libsndfile/CVE-2017-12562.patch88
-rw-r--r--main/libsndfile/CVE-2017-17456_CVE-2017-17457_CVE-2018-19661_CVE-2018-19662.patch88
-rw-r--r--main/libsndfile/CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch64
-rw-r--r--main/libsndfile/CVE-2017-8362.patch50
-rw-r--r--main/libsndfile/CVE-2018-13139.patch31
-rw-r--r--main/libsndfile/CVE-2018-19758.patch13
-rw-r--r--main/libsndfile/fix-rf64-varargs-bug.patch30
-rw-r--r--main/libuv/APKBUILD21
-rw-r--r--main/libva-glx/APKBUILD15
-rw-r--r--main/libva-intel-driver/APKBUILD6
-rw-r--r--main/libva/APKBUILD15
-rw-r--r--main/libvdpau/APKBUILD13
-rw-r--r--main/libvirt/APKBUILD199
-rw-r--r--main/libvirt/libvirt.confd27
-rw-r--r--main/libvirt/libvirt.initd88
-rwxr-xr-xmain/libvirt/libvirt.post-install5
-rw-r--r--main/libvirt/musl-fix-includes.patch12
-rw-r--r--main/libvirt/stderr-fix.patch13
-rw-r--r--main/libvirt/virtlockd.initd25
-rw-r--r--main/libvirt/virtlogd.initd24
-rw-r--r--main/libvorbis/APKBUILD2
-rw-r--r--main/libwebsockets/0001-test-apps-dont-build-extension-support-if-LWS_WITHOU.patch76
-rw-r--r--main/libwebsockets/APKBUILD16
-rw-r--r--main/libx11/APKBUILD8
-rw-r--r--main/libxdamage/APKBUILD8
-rw-r--r--main/libxkbcommon/APKBUILD28
-rw-r--r--main/libxml2/APKBUILD9
-rw-r--r--main/libxml2/CVE-2020-24977.patch40
-rw-r--r--main/libxrandr/APKBUILD10
-rw-r--r--main/links/APKBUILD6
-rw-r--r--main/linux-firmware/APKBUILD22
-rw-r--r--main/linux-headers/APKBUILD10
-rw-r--r--main/linux-headers/include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch19
-rw-r--r--main/linux-lts/0001-arm64-dts-lx2160a-add-lx2160acex7-device-tree-build.patch25
-rw-r--r--main/linux-lts/0001-arm64-dts-lx2160a-add-mdio-device-tree-nodes.patch48
-rw-r--r--main/linux-lts/0002-arm64-dts-lx2160a-add-lx2160acex7-device-tree.patch223
-rw-r--r--main/linux-lts/0005-arm64-dts-lx2160a-cex7-add-ltc3882-support.patch37
-rw-r--r--main/linux-lts/0006-arm64-dts-lx2160a-cex7-add-on-module-eeproms.patch52
-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/APKBUILD45
-rw-r--r--main/linux-lts/config-lts.aarch6491
-rw-r--r--main/linux-lts/config-lts.armv73
-rw-r--r--main/linux-lts/config-lts.mips2
-rw-r--r--main/linux-lts/config-lts.mips642
-rw-r--r--main/linux-lts/config-lts.ppc64le5
-rw-r--r--main/linux-lts/config-lts.s390x3
-rw-r--r--main/linux-lts/config-lts.x865
-rw-r--r--main/linux-lts/config-lts.x86_648
-rw-r--r--main/linux-lts/config-virt.aarch644
-rw-r--r--main/linux-lts/config-virt.armv73
-rw-r--r--main/linux-lts/config-virt.ppc64le3
-rw-r--r--main/linux-lts/config-virt.x864
-rw-r--r--main/linux-lts/config-virt.x86_644
-rw-r--r--main/linux-pam/0001-avoid-opendir-since-it-may-be-called-during-fork-exe.patch34
-rw-r--r--main/linux-pam/0adbaeb273da1d45213134aa271e95987103281c.patch74
-rw-r--r--main/linux-pam/APKBUILD24
-rw-r--r--main/linux-pam/c9593778a6133bf29eb2f47c24cc6d2f5d729fc8.patch275
-rw-r--r--main/linux-pam/fix-compat.patch21
-rw-r--r--main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch10
-rw-r--r--main/linux-pam/musl-fix-pam_exec.patch35
-rw-r--r--main/linux-pam/musl-fix_uint.patch285
-rw-r--r--main/linux-pam/system-login.pamd6
-rw-r--r--main/linux-rpi/APKBUILD20
-rw-r--r--main/linux-rpi/config-changes-rpi.armhf3
-rw-r--r--main/llvm10/APKBUILD15
-rw-r--r--main/lm-sensors/APKBUILD4
-rw-r--r--main/lmdb/APKBUILD6
-rw-r--r--main/logrotate/APKBUILD4
-rw-r--r--main/lua-discount/APKBUILD8
-rw-r--r--main/lua-evdev/APKBUILD6
-rw-r--r--main/lua-evdev/time64.patch12
-rw-r--r--main/lua-expat/APKBUILD2
-rw-r--r--main/lua-lyaml/APKBUILD4
-rw-r--r--main/lua-ossl/APKBUILD6
-rw-r--r--main/lua-rex/APKBUILD31
-rw-r--r--main/lua-sql/APKBUILD6
-rw-r--r--main/luajit/20-src-lib_string.patch30
-rw-r--r--main/luajit/APKBUILD8
-rw-r--r--main/lutok/APKBUILD12
-rw-r--r--main/lvm2/APKBUILD54
-rw-r--r--main/lxc/APKBUILD4
-rw-r--r--main/man-pages/APKBUILD4
-rw-r--r--main/mandoc/APKBUILD6
-rw-r--r--main/mariadb/APKBUILD30
-rw-r--r--main/mariadb/pcre.cmake.patch15
-rw-r--r--main/mc/APKBUILD8
-rw-r--r--main/memcached/APKBUILD4
-rw-r--r--main/mercurial/APKBUILD4
-rw-r--r--main/mesa/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch38
-rw-r--r--main/mesa/APKBUILD26
-rw-r--r--main/mesa/add-use-elf-tls.patch16
-rw-r--r--main/mesa/missing-dep-on-sha1_h.patch13
-rw-r--r--main/meson/APKBUILD8
-rw-r--r--main/mg/APKBUILD4
-rw-r--r--main/mini_httpd/APKBUILD4
-rw-r--r--main/mosh/APKBUILD2
-rw-r--r--main/mosquitto/APKBUILD6
-rw-r--r--main/mozjs60/0001-silence-sandbox-violations.patch30
-rw-r--r--main/mozjs60/APKBUILD80
-rw-r--r--main/mozjs60/big-endian.patch166
-rw-r--r--main/mozjs60/fix-musl-build.patch16
-rw-r--r--main/mozjs60/fix-soname-lib.patch30
-rw-r--r--main/mpg123/APKBUILD7
-rw-r--r--main/msmtp/APKBUILD45
-rw-r--r--main/msmtp/msmtp.confd5
-rwxr-xr-xmain/msmtp/msmtp.initd10
-rw-r--r--main/multipath-tools/APKBUILD8
-rw-r--r--main/musl/0001-add-thumb2-support-to-arm-assembler-memcpy.patch68
-rw-r--r--main/musl/0001-make-h_errno-thread-local.patch47
-rw-r--r--main/musl/0001-reorder-thread-list-unlink-in-pthread_exit-after-all.patch56
-rw-r--r--main/musl/0001-report-res_query-failures-including-nxdomain-nodata-.patch50
-rw-r--r--main/musl/0001-restore-h_errno-ABI-compatibility-with-ancient-binar.patch37
-rw-r--r--main/musl/0002-don-t-use-libc.threads_minus_1-as-relaxed-atomic-for.patch78
-rw-r--r--main/musl/0003-cut-down-size-of-some-libc-struct-members.patch30
-rw-r--r--main/musl/0004-restore-lock-skipping-for-processes-that-return-to-s.patch101
-rw-r--r--main/musl/APKBUILD49
-rw-r--r--main/musl/add-missing-case-mapping-between-U-03F3-and-U-037F.patch27
-rw-r--r--main/musl/fix-cacosh-results-for-arguments-with-negative-imagi.patch60
-rw-r--r--main/musl/fix-errno-for-posix_openpt-with-no-free-ptys-availab.patch28
-rw-r--r--main/musl/fix-incorrect-results-for-catanf-and-catanl-with-som.patch87
-rw-r--r--main/musl/fix-remaining-direct-use-of-stat-syscalls-outside.patch118
-rw-r--r--main/musl/fix-return-value-of-ungetc-when-argument-is-outside-.patch31
-rw-r--r--main/musl/fix-wcwidth-wrongly-returning-0-for-most-of-planes-4.patch28
-rw-r--r--main/musl/handle-aux-at_base.patch3
-rw-r--r--main/musl/improve-strerror-speed.patch101
-rw-r--r--main/musl/ppc-pt_regs.patch38
-rw-r--r--main/musl/ppc64-fpregset_t.patch31
-rw-r--r--main/musl/set-AD-bit-in-dns-queries-suppress-for-internal-use.patch67
-rw-r--r--main/nagios/APKBUILD39
-rw-r--r--main/nano/APKBUILD6
-rw-r--r--main/ncurses/APKBUILD6
-rw-r--r--main/nfdump/APKBUILD4
-rw-r--r--main/nfs-utils/0001-nfs-utils-print-time-in-64-bit.patch83
-rw-r--r--main/nfs-utils/APKBUILD10
-rw-r--r--main/nfs-utils/musl-time64.patch51
-rw-r--r--main/nginx/APKBUILD23
-rw-r--r--main/nginx/nchan~gcc-10.patch59
-rw-r--r--main/ngrep/APKBUILD12
-rw-r--r--main/nodejs/APKBUILD9
-rw-r--r--main/nsd/APKBUILD4
-rw-r--r--main/nspr/APKBUILD4
-rw-r--r--main/nss/APKBUILD23
-rw-r--r--main/oidentd/APKBUILD6
-rw-r--r--main/open-iscsi/APKBUILD6
-rw-r--r--main/openjpeg/APKBUILD14
-rw-r--r--main/openjpeg/CVE-2019-12973.patch152
-rw-r--r--main/openjpeg/CVE-2020-15389.patch39
-rw-r--r--main/openldap/APKBUILD28
-rw-r--r--main/openldap/configs.patch117
-rw-r--r--main/openrc/0012-gcc-10.patch48
-rw-r--r--main/openrc/APKBUILD7
-rw-r--r--main/openrc/firstboot.initd2
-rw-r--r--main/openresolv/APKBUILD6
-rw-r--r--main/openssh/APKBUILD7
-rw-r--r--main/openssl/APKBUILD4
-rw-r--r--main/opus/APKBUILD17
-rw-r--r--main/orc/APKBUILD25
-rw-r--r--main/p11-kit/APKBUILD16
-rw-r--r--main/pango/APKBUILD14
-rw-r--r--main/parallel/APKBUILD4
-rw-r--r--main/patch/APKBUILD1
-rw-r--r--main/patchutils/APKBUILD33
-rw-r--r--main/pcre/APKBUILD2
-rw-r--r--main/perdition/APKBUILD19
-rw-r--r--main/perl-apache-logformat-compiler/APKBUILD2
-rw-r--r--main/perl-apache-session/APKBUILD2
-rw-r--r--main/perl-archive-zip/APKBUILD2
-rw-r--r--main/perl-astro-suntime/APKBUILD2
-rw-r--r--main/perl-async-mergepoint/APKBUILD2
-rw-r--r--main/perl-authen-sasl/APKBUILD2
-rw-r--r--main/perl-b-hooks-endofscope/APKBUILD2
-rw-r--r--main/perl-boolean/APKBUILD2
-rw-r--r--main/perl-business-hours/APKBUILD2
-rw-r--r--main/perl-cache-cache/APKBUILD2
-rw-r--r--main/perl-cache-simple-timedexpiry/APKBUILD2
-rw-r--r--main/perl-canary-stability/APKBUILD2
-rw-r--r--main/perl-capture-tiny/APKBUILD2
-rw-r--r--main/perl-carp-clan/APKBUILD2
-rw-r--r--main/perl-carp/APKBUILD19
-rw-r--r--main/perl-cgi-emulate-psgi/APKBUILD2
-rw-r--r--main/perl-cgi-fast/APKBUILD2
-rw-r--r--main/perl-cgi-psgi/APKBUILD2
-rw-r--r--main/perl-cgi-session/APKBUILD2
-rw-r--r--main/perl-cgi/APKBUILD6
-rw-r--r--main/perl-class-accessor-chained/APKBUILD2
-rw-r--r--main/perl-class-accessor/APKBUILD2
-rw-r--r--main/perl-class-container/APKBUILD2
-rw-r--r--main/perl-class-data-inheritable/APKBUILD2
-rw-r--r--main/perl-class-inspector/APKBUILD2
-rw-r--r--main/perl-class-load/APKBUILD2
-rw-r--r--main/perl-class-method-modifiers/APKBUILD2
-rw-r--r--main/perl-class-mix/APKBUILD2
-rw-r--r--main/perl-class-returnvalue/APKBUILD2
-rw-r--r--main/perl-class-singleton/APKBUILD2
-rw-r--r--main/perl-class-tiny/APKBUILD15
-rw-r--r--main/perl-clone/APKBUILD2
-rw-r--r--main/perl-common-sense/APKBUILD2
-rw-r--r--main/perl-compress-raw-bzip2/APKBUILD4
-rw-r--r--main/perl-compress-raw-zlib/APKBUILD10
-rw-r--r--main/perl-config-grammar/APKBUILD2
-rw-r--r--main/perl-config-inifiles/APKBUILD2
-rw-r--r--main/perl-control-x10/APKBUILD2
-rw-r--r--main/perl-convert-asn1/APKBUILD2
-rw-r--r--main/perl-convert-binhex/APKBUILD2
-rw-r--r--main/perl-convert-color/APKBUILD2
-rw-r--r--main/perl-convert-tnef/APKBUILD2
-rw-r--r--main/perl-convert-uulib/APKBUILD2
-rw-r--r--main/perl-cpan-meta-check/APKBUILD2
-rw-r--r--main/perl-cpanel-json-xs/APKBUILD6
-rw-r--r--main/perl-cps/APKBUILD2
-rw-r--r--main/perl-crypt-des/APKBUILD2
-rw-r--r--main/perl-crypt-eksblowfish/APKBUILD2
-rw-r--r--main/perl-crypt-openssl-guess/APKBUILD2
-rw-r--r--main/perl-crypt-openssl-random/APKBUILD2
-rw-r--r--main/perl-crypt-openssl-rsa/APKBUILD2
-rw-r--r--main/perl-crypt-rijndael/APKBUILD2
-rw-r--r--main/perl-crypt-ssleay/APKBUILD2
-rw-r--r--main/perl-crypt-x509/APKBUILD2
-rw-r--r--main/perl-css-minifier-xs/APKBUILD2
-rw-r--r--main/perl-css-squish/APKBUILD2
-rw-r--r--main/perl-data-guid/APKBUILD2
-rw-r--r--main/perl-data-hexdump/APKBUILD2
-rw-r--r--main/perl-data-optlist/APKBUILD2
-rw-r--r--main/perl-data-page-pageset/APKBUILD2
-rw-r--r--main/perl-data-page/APKBUILD2
-rw-r--r--main/perl-data-uuid/APKBUILD2
-rw-r--r--main/perl-date-format/APKBUILD4
-rw-r--r--main/perl-datetime-format-mail/APKBUILD2
-rw-r--r--main/perl-datetime-format-w3cdtf/APKBUILD2
-rw-r--r--main/perl-datetime-locale/APKBUILD9
-rw-r--r--main/perl-datetime-timezone/APKBUILD2
-rw-r--r--main/perl-datetime/APKBUILD2
-rw-r--r--main/perl-db/APKBUILD8
-rw-r--r--main/perl-db_file/APKBUILD7
-rw-r--r--main/perl-dbd-mysql/APKBUILD2
-rw-r--r--main/perl-dbd-odbc/APKBUILD2
-rw-r--r--main/perl-dbd-pg/APKBUILD6
-rw-r--r--main/perl-dbd-sqlite/APKBUILD6
-rw-r--r--main/perl-dbi/APKBUILD7
-rw-r--r--main/perl-dbix-dbschema/APKBUILD2
-rw-r--r--main/perl-dbix-searchbuilder/APKBUILD12
-rw-r--r--main/perl-devel-checkbin/APKBUILD2
-rw-r--r--main/perl-devel-checklib/APKBUILD2
-rw-r--r--main/perl-devel-globaldestruction/APKBUILD2
-rw-r--r--main/perl-devel-overloadinfo/APKBUILD2
-rw-r--r--main/perl-devel-stacktrace-ashtml/APKBUILD2
-rw-r--r--main/perl-devel-stacktrace/APKBUILD2
-rw-r--r--main/perl-devel-symdump/APKBUILD2
-rw-r--r--main/perl-device-serialport/APKBUILD2
-rw-r--r--main/perl-digest-hmac/APKBUILD2
-rw-r--r--main/perl-digest-md5/APKBUILD2
-rw-r--r--main/perl-digest-sha1/APKBUILD2
-rw-r--r--main/perl-dist-checkconflicts/APKBUILD2
-rw-r--r--main/perl-email-address-list/APKBUILD2
-rw-r--r--main/perl-email-address/APKBUILD2
-rw-r--r--main/perl-email-date-format/APKBUILD2
-rw-r--r--main/perl-encode-hanextra/APKBUILD2
-rw-r--r--main/perl-encode-locale/APKBUILD2
-rw-r--r--main/perl-encode/APKBUILD6
-rw-r--r--main/perl-error/APKBUILD2
-rw-r--r--main/perl-eval-closure/APKBUILD2
-rw-r--r--main/perl-exception-class/APKBUILD2
-rw-r--r--main/perl-exporter-tiny/APKBUILD2
-rw-r--r--main/perl-exporter/APKBUILD2
-rw-r--r--main/perl-extutils-cchecker/APKBUILD2
-rw-r--r--main/perl-extutils-config/APKBUILD2
-rw-r--r--main/perl-extutils-helpers/APKBUILD2
-rw-r--r--main/perl-extutils-installpaths/APKBUILD2
-rw-r--r--main/perl-extutils-pkgconfig/APKBUILD2
-rw-r--r--main/perl-fcgi-procmanager/APKBUILD2
-rw-r--r--main/perl-fcgi/APKBUILD2
-rw-r--r--main/perl-file-copy-recursive/APKBUILD2
-rw-r--r--main/perl-file-listing/APKBUILD2
-rw-r--r--main/perl-file-next/APKBUILD2
-rw-r--r--main/perl-file-remove/APKBUILD2
-rw-r--r--main/perl-file-rsync/APKBUILD11
-rw-r--r--main/perl-file-sharedir-install/APKBUILD2
-rw-r--r--main/perl-file-sharedir/APKBUILD2
-rw-r--r--main/perl-file-slurp-tiny/APKBUILD2
-rw-r--r--main/perl-file-slurp/APKBUILD7
-rw-r--r--main/perl-file-slurper/APKBUILD2
-rw-r--r--main/perl-file-tail/APKBUILD2
-rw-r--r--main/perl-file-temp/APKBUILD2
-rw-r--r--main/perl-file-which/APKBUILD2
-rw-r--r--main/perl-filesys-notify-simple/APKBUILD2
-rw-r--r--main/perl-font-afm/APKBUILD2
-rw-r--r--main/perl-future/APKBUILD2
-rw-r--r--main/perl-gd/APKBUILD13
-rw-r--r--main/perl-gdgraph/APKBUILD2
-rw-r--r--main/perl-gdtextutil/APKBUILD2
-rw-r--r--main/perl-getopt-long/APKBUILD4
-rw-r--r--main/perl-hash-multivalue/APKBUILD2
-rw-r--r--main/perl-heap/APKBUILD2
-rw-r--r--main/perl-html-formatter/APKBUILD2
-rw-r--r--main/perl-html-formattext-withlinks-andtables/APKBUILD2
-rw-r--r--main/perl-html-formattext-withlinks/APKBUILD2
-rw-r--r--main/perl-html-mason-psgihandler/APKBUILD39
-rw-r--r--main/perl-html-mason/APKBUILD2
-rw-r--r--main/perl-html-parser/APKBUILD24
-rw-r--r--main/perl-html-quoted/APKBUILD2
-rw-r--r--main/perl-html-rewriteattributes/APKBUILD2
-rw-r--r--main/perl-html-scrubber/APKBUILD2
-rw-r--r--main/perl-html-tagset/APKBUILD2
-rw-r--r--main/perl-html-tree/APKBUILD2
-rw-r--r--main/perl-http-body/APKBUILD2
-rw-r--r--main/perl-http-cookies/APKBUILD2
-rw-r--r--main/perl-http-daemon/APKBUILD2
-rw-r--r--main/perl-http-date/APKBUILD2
-rw-r--r--main/perl-http-message/APKBUILD8
-rw-r--r--main/perl-http-negotiate/APKBUILD2
-rw-r--r--main/perl-importer/APKBUILD20
-rw-r--r--main/perl-inline-c/APKBUILD2
-rw-r--r--main/perl-inline/APKBUILD2
-rw-r--r--main/perl-io-async/APKBUILD8
-rw-r--r--main/perl-io-captureoutput/APKBUILD2
-rw-r--r--main/perl-io-compress/APKBUILD47
-rw-r--r--main/perl-io-html/APKBUILD2
-rw-r--r--main/perl-io-multiplex/APKBUILD2
-rw-r--r--main/perl-io-socket-inet6/APKBUILD2
-rw-r--r--main/perl-io-socket-ssl/APKBUILD2
-rw-r--r--main/perl-io-stringy/APKBUILD2
-rw-r--r--main/perl-io-tty/APKBUILD2
-rw-r--r--main/perl-io/APKBUILD2
-rw-r--r--main/perl-ipc-run3/APKBUILD2
-rw-r--r--main/perl-ipc-sharelite/APKBUILD2
-rw-r--r--main/perl-ipc-system-simple/APKBUILD2
-rw-r--r--main/perl-javascript-minifier-xs/APKBUILD2
-rw-r--r--main/perl-javascript-minifier/APKBUILD2
-rw-r--r--main/perl-json-maybexs/APKBUILD2
-rw-r--r--main/perl-json/APKBUILD2
-rw-r--r--main/perl-ldap/APKBUILD2
-rw-r--r--main/perl-libwww/APKBUILD4
-rw-r--r--main/perl-list-allutils/APKBUILD6
-rw-r--r--main/perl-list-moreutils-xs/APKBUILD2
-rw-r--r--main/perl-list-moreutils/APKBUILD2
-rw-r--r--main/perl-list-someutils-xs/APKBUILD2
-rw-r--r--main/perl-list-someutils/APKBUILD2
-rw-r--r--main/perl-list-utilsby/APKBUILD2
-rw-r--r--main/perl-locale-maketext-fuzzy/APKBUILD2
-rw-r--r--main/perl-locale-maketext-lexicon/APKBUILD2
-rw-r--r--main/perl-log-any/APKBUILD2
-rw-r--r--main/perl-log-dispatch/APKBUILD32
-rw-r--r--main/perl-lwp-mediatypes/APKBUILD2
-rw-r--r--main/perl-lwp-useragent-determined/APKBUILD2
-rw-r--r--main/perl-mail-authenticationresults/APKBUILD2
-rw-r--r--main/perl-mail-dkim/APKBUILD12
-rw-r--r--main/perl-mail-domainkeys/APKBUILD2
-rw-r--r--main/perl-mail-imapclient/APKBUILD2
-rw-r--r--main/perl-mail-spf/APKBUILD2
-rw-r--r--main/perl-mailtools/APKBUILD2
-rw-r--r--main/perl-math-round/APKBUILD2
-rw-r--r--main/perl-metrics-any/APKBUILD35
-rw-r--r--main/perl-mime-base64/APKBUILD2
-rw-r--r--main/perl-mime-lite/APKBUILD2
-rw-r--r--main/perl-mime-tools/APKBUILD2
-rw-r--r--main/perl-mime-types/APKBUILD2
-rw-r--r--main/perl-module-build-tiny/APKBUILD2
-rw-r--r--main/perl-module-build/APKBUILD2
-rw-r--r--main/perl-module-implementation/APKBUILD2
-rw-r--r--main/perl-module-install/APKBUILD2
-rw-r--r--main/perl-module-metadata/APKBUILD2
-rw-r--r--main/perl-module-pluggable/APKBUILD2
-rw-r--r--main/perl-module-refresh/APKBUILD2
-rw-r--r--main/perl-module-runtime/APKBUILD2
-rw-r--r--main/perl-module-scandeps/APKBUILD24
-rw-r--r--main/perl-module-util/APKBUILD2
-rw-r--r--main/perl-module-versions-report/APKBUILD2
-rw-r--r--main/perl-mozilla-ca/APKBUILD2
-rw-r--r--main/perl-mro-compat/APKBUILD2
-rw-r--r--main/perl-namespace-autoclean/APKBUILD2
-rw-r--r--main/perl-namespace-clean/APKBUILD2
-rw-r--r--main/perl-net-async-http/APKBUILD28
-rw-r--r--main/perl-net-cidr-lite/APKBUILD2
-rw-r--r--main/perl-net-cidr/APKBUILD2
-rw-r--r--main/perl-net-dns-resolver-mock/APKBUILD2
-rw-r--r--main/perl-net-dns-resolver-programmable/APKBUILD2
-rw-r--r--main/perl-net-dns/APKBUILD6
-rw-r--r--main/perl-net-http/APKBUILD2
-rw-r--r--main/perl-net-ip/APKBUILD2
-rw-r--r--main/perl-net-libidn/APKBUILD2
-rw-r--r--main/perl-net-openssh/APKBUILD2
-rw-r--r--main/perl-net-rblclient/APKBUILD2
-rw-r--r--main/perl-net-server/APKBUILD2
-rw-r--r--main/perl-net-smtp-ssl/APKBUILD2
-rw-r--r--main/perl-net-smtp-tls-butmaintained/APKBUILD2
-rw-r--r--main/perl-net-snmp/APKBUILD2
-rw-r--r--main/perl-net-snpp/APKBUILD2
-rw-r--r--main/perl-net-ssleay/APKBUILD2
-rw-r--r--main/perl-net-telnet/APKBUILD2
-rw-r--r--main/perl-netaddr-ip/APKBUILD2
-rw-r--r--main/perl-package-anon/APKBUILD2
-rw-r--r--main/perl-package-deprecationmanager/APKBUILD2
-rw-r--r--main/perl-package-stash-xs/APKBUILD2
-rw-r--r--main/perl-package-stash/APKBUILD2
-rw-r--r--main/perl-params-classify/APKBUILD2
-rw-r--r--main/perl-params-util/APKBUILD2
-rw-r--r--main/perl-params-validate/APKBUILD2
-rw-r--r--main/perl-params-validationcompiler/APKBUILD2
-rw-r--r--main/perl-parse-recdescent/APKBUILD2
-rw-r--r--main/perl-parse-syslog/APKBUILD2
-rw-r--r--main/perl-parse-yapp/APKBUILD2
-rw-r--r--main/perl-path-class/APKBUILD2
-rw-r--r--main/perl-path-tiny/APKBUILD2
-rw-r--r--main/perl-pathtools/APKBUILD2
-rw-r--r--main/perl-php-serialization/APKBUILD2
-rw-r--r--main/perl-plack/APKBUILD42
-rw-r--r--main/perl-pod-coverage/APKBUILD25
-rw-r--r--main/perl-pod-parser/APKBUILD35
-rw-r--r--main/perl-posix-strftime-compiler/APKBUILD2
-rw-r--r--main/perl-probe-perl/APKBUILD2
-rw-r--r--main/perl-proc-wait3/APKBUILD2
-rw-r--r--main/perl-protocol-websocket/APKBUILD2
-rw-r--r--main/perl-regexp-common/APKBUILD2
-rw-r--r--main/perl-regexp-ipv6/APKBUILD2
-rw-r--r--main/perl-role-basic/APKBUILD2
-rw-r--r--main/perl-role-tiny/APKBUILD2
-rw-r--r--main/perl-scalar-list-utils/APKBUILD2
-rw-r--r--main/perl-scope-guard/APKBUILD2
-rw-r--r--main/perl-scope-upper/APKBUILD2
-rw-r--r--main/perl-server-starter/APKBUILD2
-rw-r--r--main/perl-set-intspan/APKBUILD2
-rw-r--r--main/perl-snmp-session/APKBUILD2
-rw-r--r--main/perl-socket-getaddrinfo/APKBUILD2
-rw-r--r--main/perl-socket/APKBUILD11
-rw-r--r--main/perl-socket6/APKBUILD2
-rw-r--r--main/perl-specio/APKBUILD2
-rw-r--r--main/perl-stream-buffered/APKBUILD2
-rw-r--r--main/perl-string-shellquote/APKBUILD2
-rw-r--r--main/perl-struct-dumb/APKBUILD2
-rw-r--r--main/perl-sub-exporter-progressive/APKBUILD2
-rw-r--r--main/perl-sub-exporter/APKBUILD2
-rw-r--r--main/perl-sub-identify/APKBUILD2
-rw-r--r--main/perl-sub-info/APKBUILD2
-rw-r--r--main/perl-sub-install/APKBUILD2
-rw-r--r--main/perl-sub-name/APKBUILD2
-rw-r--r--main/perl-sub-quote/APKBUILD2
-rw-r--r--main/perl-sub-uplevel/APKBUILD2
-rw-r--r--main/perl-super/APKBUILD2
-rw-r--r--main/perl-switch/APKBUILD2
-rw-r--r--main/perl-symbol-global-name/APKBUILD2
-rw-r--r--main/perl-sys-hostname-long/APKBUILD2
-rw-r--r--main/perl-sys-mmap/APKBUILD2
-rw-r--r--main/perl-term-readkey/APKBUILD2
-rw-r--r--main/perl-term-table/APKBUILD2
-rw-r--r--main/perl-test-cpan-meta/APKBUILD2
-rw-r--r--main/perl-test-deep/APKBUILD2
-rw-r--r--main/perl-test-eol/APKBUILD2
-rw-r--r--main/perl-test-exception/APKBUILD2
-rw-r--r--main/perl-test-failwarnings/APKBUILD2
-rw-r--r--main/perl-test-fatal/APKBUILD17
-rw-r--r--main/perl-test-file-sharedir/APKBUILD2
-rw-r--r--main/perl-test-harness/APKBUILD2
-rw-r--r--main/perl-test-identity/APKBUILD2
-rw-r--r--main/perl-test-leaktrace/APKBUILD2
-rw-r--r--main/perl-test-longstring/APKBUILD2
-rw-r--r--main/perl-test-manifest/APKBUILD2
-rw-r--r--main/perl-test-metrics-any/APKBUILD34
-rw-r--r--main/perl-test-mockmodule/APKBUILD6
-rw-r--r--main/perl-test-mockobject/APKBUILD2
-rw-r--r--main/perl-test-mockrandom/APKBUILD2
-rw-r--r--main/perl-test-mocktime/APKBUILD2
-rw-r--r--main/perl-test-needs/APKBUILD2
-rw-r--r--main/perl-test-notabs/APKBUILD2
-rw-r--r--main/perl-test-nowarnings/APKBUILD2
-rw-r--r--main/perl-test-number-delta/APKBUILD2
-rw-r--r--main/perl-test-output/APKBUILD2
-rw-r--r--main/perl-test-pod-coverage/APKBUILD2
-rw-r--r--main/perl-test-pod/APKBUILD2
-rw-r--r--main/perl-test-refcount/APKBUILD2
-rw-r--r--main/perl-test-requires/APKBUILD2
-rw-r--r--main/perl-test-requiresinternet/APKBUILD2
-rw-r--r--main/perl-test-script/APKBUILD2
-rw-r--r--main/perl-test-sharedfork/APKBUILD2
-rw-r--r--main/perl-test-simple/APKBUILD6
-rw-r--r--main/perl-test-taint/APKBUILD2
-rw-r--r--main/perl-test-tcp/APKBUILD2
-rw-r--r--main/perl-test-warn/APKBUILD2
-rw-r--r--main/perl-test-warnings/APKBUILD2
-rw-r--r--main/perl-test-without-module/APKBUILD2
-rw-r--r--main/perl-test-without/APKBUILD2
-rw-r--r--main/perl-test2-plugin-nowarnings/APKBUILD7
-rw-r--r--main/perl-test2-suite/APKBUILD6
-rw-r--r--main/perl-text-autoformat/APKBUILD2
-rw-r--r--main/perl-text-csv/APKBUILD2
-rw-r--r--main/perl-text-password-pronounceable/APKBUILD2
-rw-r--r--main/perl-text-reform/APKBUILD2
-rw-r--r--main/perl-text-soundex/APKBUILD2
-rw-r--r--main/perl-text-vfile-asdata/APKBUILD2
-rw-r--r--main/perl-text-wikiformat/APKBUILD2
-rw-r--r--main/perl-text-wrapper/APKBUILD2
-rw-r--r--main/perl-time-hires/APKBUILD11
-rw-r--r--main/perl-time-parsedate/APKBUILD2
-rw-r--r--main/perl-timedate/APKBUILD2
-rw-r--r--main/perl-tree-dag_node/APKBUILD2
-rw-r--r--main/perl-try-tiny/APKBUILD2
-rw-r--r--main/perl-type-tiny/APKBUILD6
-rw-r--r--main/perl-universal-can/APKBUILD2
-rw-r--r--main/perl-universal-isa/APKBUILD2
-rw-r--r--main/perl-universal-require/APKBUILD2
-rw-r--r--main/perl-unix-syslog/APKBUILD2
-rw-r--r--main/perl-uri/APKBUILD2
-rw-r--r--main/perl-variable-magic/APKBUILD2
-rw-r--r--main/perl-want/APKBUILD2
-rw-r--r--main/perl-www-robotrules/APKBUILD2
-rw-r--r--main/perl-x10/APKBUILD2
-rw-r--r--main/perl-xml-namespacesupport/APKBUILD2
-rw-r--r--main/perl-xml-parser/APKBUILD2
-rw-r--r--main/perl-xml-rss/APKBUILD2
-rw-r--r--main/perl-xml-sax-base/APKBUILD2
-rw-r--r--main/perl-xml-sax/APKBUILD2
-rw-r--r--main/perl-xml-simple/APKBUILD2
-rw-r--r--main/perl-xml-xpath/APKBUILD2
-rw-r--r--main/perl-yaml-libyaml/APKBUILD2
-rw-r--r--main/perl-yaml-syck/APKBUILD2
-rw-r--r--main/perl-yaml-tiny/APKBUILD2
-rw-r--r--main/perl-yaml/APKBUILD2
-rw-r--r--main/perl/APKBUILD10
-rw-r--r--main/perl/musl-stack-size.patch16
-rw-r--r--main/pgpool/APKBUILD4
-rw-r--r--main/pgtcl/APKBUILD4
-rw-r--r--main/pixman/APKBUILD11
-rw-r--r--main/pm-utils/APKBUILD7
-rw-r--r--main/pmacct/APKBUILD4
-rw-r--r--main/po4a/APKBUILD4
-rw-r--r--main/polkit/APKBUILD77
-rw-r--r--main/polkit/alpine-polkit.pam7
-rw-r--r--main/polkit/make-innetgr-optional.patch252
-rw-r--r--main/polkit/polkit.initd12
-rw-r--r--main/polkit/polkit.pre-install6
l---------main/polkit/polkit.pre-upgrade1
-rw-r--r--main/poppler/APKBUILD4
-rw-r--r--main/postfix/APKBUILD23
-rw-r--r--main/postfix/lmdb-default.patch27
-rw-r--r--main/postgresql-bdr/APKBUILD4
-rw-r--r--main/postgresql-bdr/postgresql-bdr.initd4
-rw-r--r--main/postgresql/APKBUILD9
-rw-r--r--main/postgrey/APKBUILD2
-rw-r--r--main/protobuf-c/APKBUILD2
-rw-r--r--main/protobuf/APKBUILD6
-rw-r--r--main/pspg/APKBUILD9
-rw-r--r--main/pspg/fix-musl.patch11
-rw-r--r--main/putty/APKBUILD2
-rw-r--r--main/py3-asn1crypto/APKBUILD10
-rw-r--r--main/py3-attrs/APKBUILD6
-rw-r--r--main/py3-bcrypt/APKBUILD6
-rw-r--r--main/py3-certifi/APKBUILD4
-rw-r--r--main/py3-cffi/APKBUILD8
-rw-r--r--main/py3-coverage/APKBUILD29
-rw-r--r--main/py3-distlib/APKBUILD11
-rw-r--r--main/py3-django-contact-form/APKBUILD25
-rw-r--r--main/py3-django-djblets/APKBUILD26
-rw-r--r--main/py3-django-extra-views/APKBUILD32
-rw-r--r--main/py3-django-haystack/APKBUILD29
-rw-r--r--main/py3-django-phonenumber-field/APKBUILD31
-rw-r--r--main/py3-django-pipeline/APKBUILD29
-rw-r--r--main/py3-django-registration/APKBUILD25
-rw-r--r--main/py3-django-sorl-thumbnail/APKBUILD30
-rw-r--r--main/py3-django-tables2/APKBUILD25
-rw-r--r--main/py3-django-treebeard/APKBUILD32
-rw-r--r--main/py3-django-widget-tweaks/APKBUILD29
-rw-r--r--main/py3-django/APKBUILD72
-rw-r--r--main/py3-dnspython/APKBUILD15
-rw-r--r--main/py3-docutils/APKBUILD6
-rw-r--r--main/py3-gobject3/APKBUILD19
-rw-r--r--main/py3-iniconfig/APKBUILD28
-rw-r--r--main/py3-markdown/APKBUILD32
-rw-r--r--main/py3-ordered-set/APKBUILD4
-rw-r--r--main/py3-packaging/APKBUILD1
-rw-r--r--main/py3-paramiko/APKBUILD4
-rw-r--r--main/py3-parsing/APKBUILD5
-rw-r--r--main/py3-pbr/APKBUILD6
-rw-r--r--main/py3-phonenumbers/APKBUILD4
-rw-r--r--main/py3-pycryptodome/APKBUILD27
-rw-r--r--main/py3-pygments/APKBUILD4
-rw-r--r--main/py3-pytest/APKBUILD8
-rw-r--r--main/py3-requests/APKBUILD17
-rw-r--r--main/py3-requests/certs.patch14
-rw-r--r--main/py3-requests/dont-depend-on-certifi.patch17
-rw-r--r--main/py3-setuptools/APKBUILD4
-rw-r--r--main/py3-simplejson/APKBUILD6
-rw-r--r--main/py3-sphinx/APKBUILD4
-rw-r--r--main/py3-tox/APKBUILD4
-rw-r--r--main/py3-urllib3/APKBUILD4
-rw-r--r--main/py3-virtualenv/APKBUILD4
-rw-r--r--main/py3-wheel/APKBUILD6
-rw-r--r--main/python2/APKBUILD144
-rw-r--r--main/python2/musl-find_library.patch45
-rw-r--r--main/python2/unchecked-ioctl.patch11
-rw-r--r--main/python3/APKBUILD12
-rw-r--r--main/quagga/0001-nhrpd-change-ipsec-SA-count-to-32-bit.patch28
-rw-r--r--main/quagga/APKBUILD4
-rw-r--r--main/raspberrypi-bootloader/APKBUILD11
-rw-r--r--main/raspberrypi/APKBUILD41
-rw-r--r--main/rdesktop/APKBUILD2
-rw-r--r--main/rdiff-backup/APKBUILD4
-rw-r--r--main/redis/APKBUILD2
-rw-r--r--main/rhash/APKBUILD6
-rw-r--r--main/rp-pppoe/APKBUILD4
-rw-r--r--main/rsync/APKBUILD19
-rw-r--r--main/rsyslog/APKBUILD8
-rw-r--r--main/rsyslog/rsyslog.conf9
-rw-r--r--main/ruby/APKBUILD19
-rw-r--r--main/s390-tools/0101-zipl-dont-optimize-size.patch28
-rw-r--r--main/s390-tools/APKBUILD23
-rw-r--r--main/s390-tools/argz.patch16
-rw-r--r--main/samba/APKBUILD14
-rw-r--r--main/scdoc/APKBUILD31
-rw-r--r--main/sdl/APKBUILD1
-rw-r--r--main/shorewall6/APKBUILD4
-rw-r--r--main/smokeping/APKBUILD3
-rw-r--r--main/snmptt/APKBUILD18
-rw-r--r--main/spamassassin/APKBUILD4
-rw-r--r--main/spawn-fcgi/APKBUILD4
-rw-r--r--main/spice-protocol/APKBUILD10
-rw-r--r--main/spice/APKBUILD13
-rw-r--r--main/sqlite-tcl/APKBUILD4
-rw-r--r--main/sqlite/APKBUILD5
-rw-r--r--main/sqsh/APKBUILD31
-rw-r--r--main/sqsh/datetime.patch16
-rw-r--r--main/sqsh/freetds-1.2.patch25
-rw-r--r--main/squid/APKBUILD8
-rw-r--r--main/sshfs/APKBUILD12
-rw-r--r--main/sshguard/APKBUILD18
-rw-r--r--main/sshguard/sshguard.confd25
-rw-r--r--main/sshguard/sshguard.initd26
-rw-r--r--main/strace/APKBUILD4
-rw-r--r--main/strongswan/0001-file-logger-Set-owner-group-of-log-file.patch62
-rw-r--r--main/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch104
-rw-r--r--main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch31
-rw-r--r--main/strongswan/APKBUILD18
-rw-r--r--main/sudo/APKBUILD5
-rw-r--r--main/syslog-ng/APKBUILD6
-rw-r--r--main/syslog-ng/syslog-ng.conf2
-rw-r--r--main/termrec/APKBUILD18
-rw-r--r--main/tftp-hpa/APKBUILD18
-rw-r--r--main/ttf-cantarell/APKBUILD9
-rw-r--r--main/ttf-droid/APKBUILD4
-rw-r--r--main/txt2man/APKBUILD27
-rw-r--r--main/txt2man/makefile.patch23
-rw-r--r--main/u-boot/APKBUILD4
-rw-r--r--main/udev-init-scripts/0001-init.d-style-fixes.patch167
-rw-r--r--main/udev-init-scripts/0002-udev-settle-fix-timeout-argument-quoting.patch27
-rw-r--r--main/udev-init-scripts/0003-udev-settle-do-not-require-udev.patch31
-rw-r--r--main/udev-init-scripts/APKBUILD16
-rw-r--r--main/umurmur/APKBUILD42
-rw-r--r--main/umurmur/umurmur.confd1
-rw-r--r--main/unbound/APKBUILD10
-rw-r--r--main/unifont/APKBUILD4
-rw-r--r--main/unixodbc/APKBUILD8
-rw-r--r--main/unzip/APKBUILD4
-rw-r--r--main/unzip/unzip-6.0-heap-overflow-infloop.patch2
-rw-r--r--main/util-linux/APKBUILD10
-rw-r--r--main/uvncrepeater/APKBUILD18
-rw-r--r--main/uwsgi/APKBUILD10
-rw-r--r--main/uwsgi/close-fd.patch28
-rw-r--r--main/vala/APKBUILD6
-rw-r--r--main/vanessa_adt/APKBUILD28
-rw-r--r--main/vanessa_logger/APKBUILD32
-rw-r--r--main/vim/APKBUILD4
-rw-r--r--main/wpa_supplicant/APKBUILD18
-rw-r--r--main/wpa_supplicant/config92
-rw-r--r--main/wpa_supplicant/wpa_cli.initd9
-rw-r--r--main/xen/APKBUILD90
-rw-r--r--main/xen/drop-test.py.patch1230
-rw-r--r--main/xen/gcc10-arm64-force-inline-atomics.patch42
-rw-r--r--main/xen/gcc10-etherboot-enum.patch40
-rw-r--r--main/xen/py3-compat.patch472
-rw-r--r--main/xen/qemu-xen-time64.patch43
-rw-r--r--main/xen/xen-fd-is-file.c62
-rw-r--r--main/xen/xen-hotplug-lockfd.patch24
-rw-r--r--main/xen/xsa320-4.13-1.patch117
-rw-r--r--main/xen/xsa320-4.13-2.patch179
-rw-r--r--main/xen/xsa333.patch39
-rw-r--r--main/xen/xsa334.patch51
-rw-r--r--main/xen/xsa335-qemu.patch84
-rw-r--r--main/xen/xsa336.patch283
-rw-r--r--main/xen/xsa337-1.patch87
-rw-r--r--main/xen/xsa337-2.patch184
-rw-r--r--main/xen/xsa338.patch42
-rw-r--r--main/xen/xsa339.patch76
-rw-r--r--main/xen/xsa340.patch65
-rw-r--r--main/xen/xsa342.patch152
-rw-r--r--main/xen/xsa343-1.patch199
-rw-r--r--main/xen/xsa343-2.patch295
-rw-r--r--main/xen/xsa343-3.patch392
-rw-r--r--main/xen/xsa344-1.patch137
-rw-r--r--main/xen/xsa344-2.patch210
-rw-r--r--main/xf86-input-synaptics/APKBUILD8
-rw-r--r--main/xf86-input-synaptics/time64.patch28
-rw-r--r--main/xf86-video-vesa/APKBUILD9
-rw-r--r--main/xfsprogs/APKBUILD6
-rw-r--r--main/xorg-server/0001-compiler.h-ensure-IOPortBase-is-declared-extern-on-m.patch29
-rw-r--r--main/xorg-server/APKBUILD30
-rw-r--r--main/xorg-server/e50c85f4ebf559a3bac4817b41074c43d4691779.patch31
-rw-r--r--main/xorgproto/APKBUILD13
-rw-r--r--main/xtables-addons-lts/APKBUILD2
-rw-r--r--main/zeromq/APKBUILD6
-rw-r--r--main/zfs-lts/APKBUILD2
-rw-r--r--main/zonenotify/APKBUILD13
992 files changed, 10154 insertions, 15460 deletions
diff --git a/main/acf-amavisd-new/APKBUILD b/main/acf-amavisd-new/APKBUILD
index 3f59f4bc4f..d8daa58b5b 100644
--- a/main/acf-amavisd-new/APKBUILD
+++ b/main/acf-amavisd-new/APKBUILD
@@ -5,7 +5,7 @@ pkgver=0.4.0
pkgrel=3
pkgdesc="ACF module for amavis"
url="https://git.alpinelinux.org/cgit/acf/acf-amavisd-new"
-arch="noarch"
+arch="noarch !x86" # amavis
license="GPL-2.0"
depends="acf-core amavis"
source="https://dev.alpinelinux.org/archive/acf-amavisd-new/acf-amavisd-new-$pkgver.tar.xz"
diff --git a/main/acf-ipsec-tools/APKBUILD b/main/acf-ipsec-tools/APKBUILD
deleted file mode 100644
index cd451584d6..0000000000
--- a/main/acf-ipsec-tools/APKBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Contributor: Ted Trask <ttrask01@yahoo.com>
-# Maintainer: Ted Trask <ttrask01@yahoo.com>
-pkgname=acf-ipsec-tools
-pkgver=0.12.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for ipsec-tools"
-url="https://git.alpinelinux.org/cgit/acf/acf-ipsec-tools"
-arch="noarch"
-license="GPL-2.0"
-depends="acf-core ipsec-tools"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-sha512sums="b224ff68d68fac8c3b4f9c27063ef2bf708a271860624724a3c09a98df51baf40af8f0d67feab1592b1ca0fbf27220fc57b17aaaa969df5b5c41374094b8e973 acf-ipsec-tools-0.12.0.tar.xz"
diff --git a/main/ack/APKBUILD b/main/ack/APKBUILD
index 374c6241a5..60b3231f6c 100644
--- a/main/ack/APKBUILD
+++ b/main/ack/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ack
-pkgver=3.3.1
+pkgver=3.4.0
pkgrel=0
pkgdesc="A Perl-powered replacement for grep"
url="https://beyondgrep.com/"
@@ -28,4 +28,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="7f0a5cc55b331f69877d186699e2fab64a196b0ea0fd148699b7be5f9a7bb2850ecf9e45dc026325af8407a37f719faf3f3e314c43e48d575b3685087461addd ack-v3.3.1.tar.gz"
+sha512sums="cc8de5a784f63a8f48b9548e930972578866d0fcc520febc6002d1ce4f9b55aabb0c8e87860586a668d94b5091c66194c05a07c584fe30fad2c5d786aee95db5 ack-v3.4.0.tar.gz"
diff --git a/main/acpica/APKBUILD b/main/acpica/APKBUILD
index 000d955752..c28a3ac3a8 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=20200528
+pkgver=20200717
pkgrel=0
pkgdesc="ACPI Component Architecture utilities"
url="https://www.acpica.org"
@@ -10,7 +10,7 @@ license="GPL-2.0-only OR BSD-3-Clause OR Intel-ACPI"
makedepends="flex bison"
subpackages="iasl"
options="!check"
-source="https://acpica.org/sites/acpica/files/acpica-unix-$pkgver.tar.gz
+source="acpica-unix-$pkgver.tar.gz::https://acpica.org/sites/acpica/files/acpica-unix-$pkgver.tar_0.gz
disable-werror.patch
"
@@ -29,5 +29,5 @@ iasl() {
mv "$pkgdir"/usr/bin/iasl "$subpkgdir"/usr/bin/
}
-sha512sums="41caf05ed2c526ee9e0b2dadac403f7def7e76a52829b42b80a93f7b1f493da3fcce6d250221a5dcbf40113f3e4587e649e041b7cde9a4003c71f9f3a2f38718 acpica-unix-20200528.tar.gz
+sha512sums="16de55b97a3b478dd2dd44fcbe51b871c7cc6174d337939b873bcbc871bee10487a796aa86abaa7b54ff6b75279cdbf9ec48e19f6baaea4290daf1ad56bdbc46 acpica-unix-20200717.tar.gz
1f5049568d612d4debf3690e0d918d8d56abbed14ade7b2e6282eba17b25934b695d1a9fe10f99469efe8d4382c4546481d0579afdf5cdb9695fcdc93559fbab disable-werror.patch"
diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD
index b899fbd293..f4ea1627cf 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.13.0_alpha20200626
+pkgver=3.13.0_alpha20200917
pkgrel=0
pkgdesc="Meta package for minimal alpine base"
url="https://alpinelinux.org"
diff --git a/main/alpine-mirrors/APKBUILD b/main/alpine-mirrors/APKBUILD
deleted file mode 100644
index 787a95c4c3..0000000000
--- a/main/alpine-mirrors/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Matt Smith <mcs@darkregion.net>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=alpine-mirrors
-pkgver=3.5.10
-pkgrel=0
-pkgdesc="List of Alpine Linux Mirrors"
-url="https://alpinelinux.org/"
-arch="noarch"
-license="MIT"
-depends=""
-checkdepends="curl"
-install=""
-subpackages=""
-source="mirrors.yaml"
-
-build() {
- cd "$srcdir"
- awk '$1 == "-" && $2 ~ /^http:/ {print $2}' mirrors.yaml > MIRRORS.txt
-}
-
-check() {
- cd "$srcdir"
- local failed=""
- for i in $(cat MIRRORS.txt); do
- msg "testing $i"
- curl --head --connect-timeout 10 $i >/dev/null \
- || failed="$failed $i"
- done
- if [ -n "$failed" ]; then
- error "Following mirrors failed:"
- for i in $failed; do
- echo $i
- done
- return 1
- fi
-}
-
-package() {
- install -D -m644 "$srcdir"/mirrors.yaml \
- "$pkgdir"/usr/share/alpine-mirrors/mirrors.yaml || return 1
- install -D -m644 "$srcdir"/MIRRORS.txt \
- "$pkgdir"/usr/share/alpine-mirrors/MIRRORS.txt || return 1
-}
-
-sha512sums="0117a788555557a3383f0a053ad473c91152b69247e68747ea6fb955b1b874b306280449b6dc2b2ea9f6e3e4da406adb63863b8da0ccca99800413d737eacc94 mirrors.yaml"
diff --git a/main/alpine-mirrors/mirrors.yaml b/main/alpine-mirrors/mirrors.yaml
deleted file mode 100644
index 9760b2f787..0000000000
--- a/main/alpine-mirrors/mirrors.yaml
+++ /dev/null
@@ -1,143 +0,0 @@
----
-- name: dl-cdn.alpinelinux.org
- location: GeoDNS
- urls:
- - http://dl-cdn.alpinelinux.org/alpine/
-- name: nl.alpinelinux.org
- location: Europe, Netherlands
- bandwidth: 100 Mbit/s
- urls:
- - http://nl.alpinelinux.org/alpine/
-- name: uk.alpinelinux.org
- location: Maidenhead, United Kingdom
- bandwidth: 1 Gbps
- urls:
- - http://uk.alpinelinux.org/alpine/
- - https://uk.alpinelinux.org/alpine/
-- name: dl-2.alpinelinux.org
- urls:
- - http://dl-2.alpinelinux.org/alpine/
-- name: dl-3.alpinelinux.org
- urls:
- - http://dl-3.alpinelinux.org/alpine/
-- name: dl-4.alpinelinux.org
- urls:
- - http://dl-4.alpinelinux.org/alpine/
-- name: dl-5.alpinelinux.org
- urls:
- - http://dl-5.alpinelinux.org/alpine/
-- name: dl-8.alpinelinux.org
- urls:
- - http://dl-8.alpinelinux.org/alpine/
-- name: mirror.yandex.ru
- urls:
- - http://mirror.yandex.ru/mirrors/alpine/
-- name: mirrors.gigenet.com
- urls:
- - http://mirrors.gigenet.com/alpinelinux/
-- name: mirror1.hs-esslingen.de
- urls:
- - http://mirror1.hs-esslingen.de/pub/Mirrors/alpine/
-- name: leaseweb
- location: GeoDNS
- urls:
- - http://mirror.leaseweb.com/alpine/
- - rsync://mirror.leaseweb.com/alpine/
-- name: FIT CTU in Prague
- location: Europe, Czech Republic
- urls:
- - https://mirror.fit.cvut.cz/alpine/
- - http://mirror.fit.cvut.cz/alpine/
-- name: alpine.mirror.far.fi
- location: Helsinki, Finland
- urls:
- - http://alpine.mirror.far.fi/
-- name: Triple
- location: Amsterdam, The Netherlands
- urls:
- - http://alpine.mirror.wearetriple.com/
- - https://alpine.mirror.wearetriple.com/
- - rsync://alpine.mirror.wearetriple.com/alpine/
- bandwidth: 10Gbit/s
- contact: mirror@wearetriple.com
-- name: Clarkson Open Source Institute
- location: Potsdam, NY, USA
- urls:
- - http://mirror.clarkson.edu/alpine/
- bandwidth: 1Gbit/s
- contact: lannonbr@clarkson.edu
-- name: Centro de Computação Eletrônica, Universidade de São Paulo
- location: South America, Brazil, São Paulo
- urls:
- - http://linorg.usp.br/AlpineLinux/
- - rsync://linorg.usp.br/AlpineLinux/
- contact: linorg@usp.br
-- name: Department of Computer Science and Engineering, Yuan Ze University
- location: Asia, Taiwan
- urls:
- - ftp://ftp.yzu.edu.tw/Linux/alpine/
- - http://ftp.yzu.edu.tw/Linux/alpine/
- - https://ftp.yzu.edu.tw/Linux/alpine/
- - rsync://ftp.yzu.edu.tw/Linux/alpine/
- bandwidth: 1Gbit/s
- contact: hsu@peterdavehello.org
-- name: AARNet
- location: Australia
- urls:
- - http://mirror.aarnet.edu.au/pub/alpine
- contact: mirror@aarnet.edu.au
-- name: mirror.csclub.uwaterloo.ca
- location: Waterloo, Ontario, Canada
- bandwidth: 10Gbit/s
- urls:
- - ftp://mirror.csclub.uwaterloo.ca/alpine
- - http://mirror.csclub.uwaterloo.ca/alpine
- - https://mirror.csclub.uwaterloo.ca/alpine
- - rsync://mirror.csclub.uwaterloo.ca/alpine
-- name: ftp.acc.umu.se
- location: Umeå, Sweden
- bandwidth: 20Gbit/s
- urls:
- - http://ftp.acc.umu.se/mirror/alpinelinux.org
- - https://ftp.acc.umu.se/mirror/alpinelinux.org
- - rsync://ftp.acc.umu.se/mirror/alpinelinux.org
-- name: ftp.halifax.rwth-aachen.de
- location: Aachen, Germany
- bandwidth: 20Gbit/s
- urls:
- - http://ftp.halifax.rwth-aachen.de/alpine
- - https://ftp.halifax.rwth-aachen.de/alpine
- - rsync://ftp.halifax.rwth-aachen.de/alpine
-- name: Síminn hf
- location: Reykjavik, Iceland
- country: is
- urls:
- - http://speglar.siminn.is/alpine
- - https://speglar.siminn.is/alpine
- - rsync://speglar.siminn.is/alpine
-- name: dotsrc at Aalborg University
- location: Aalborg, Denmark
- bandwidth: 10Gbit/s
- urls:
- - http://mirrors.dotsrc.org/alpine
- - https://mirrors.dotsrc.org/alpine
- - rsync://mirrors.dotsrc.org/alpine
-- name: WIDE Project Tsukuba NOC
- location: Tsukuba, Japan
- bandwidth: 1Gbit/s
- urls:
- - http://ftp.tsukuba.wide.ad.jp/Linux/alpine
- - rsync://ftp.tsukuba.wide.ad.jp/alpine
-- name: RISE
- location: Philippines
- urls:
- - http://mirror.rise.ph/alpine
- - ftp://mirror.rise.ph/alpine
-- name: Neostrada B.V.
- location: Europe, Netherlands
- bandwidth: 100Mbit/s
- urls:
- - http://mirror.neostrada.nl/alpine/
- - https://mirror.neostrada.nl/alpine/
- - ftp://mirror.neostrada.nl/alpine/
- - rsync://mirror.neostrada.nl/alpine/
diff --git a/main/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD
index 5095a5c49c..4d8a008bb1 100644
--- a/main/alsa-lib/APKBUILD
+++ b/main/alsa-lib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alsa-lib
-pkgver=1.2.3.1
-pkgrel=0
+pkgver=1.2.3.2
+pkgrel=1
pkgdesc="Advanced Linux Sound Architecture (ALSA) library"
url="http://www.alsa-project.org"
arch="all"
@@ -25,6 +25,8 @@ build() {
--disable-dependency-tracking \
--without-versioned
make
+ rm -rf "$builddir"/include/sound/*
+ printf "all:\ncheck:\ninstall:\n" > "$builddir"/include/sound/Makefile
}
check() {
@@ -35,5 +37,5 @@ package() {
make -j1 DESTDIR="$pkgdir" install
}
-sha512sums="ed0a81371117a91a5024f3bef5a881ffa9521399eab5e016924669a3f1eba2d6a02efa284b160089bc581717d39d15325ebb2faf162e4d3dabe4c29785a5fb58 alsa-lib-1.2.3.1.tar.bz2
+sha512sums="1fbc6360fda841bd9ca488739bdc9f4142c1b4a07ff767f48f1e160e3d4dff914aed422c97088e238b5e77d7e30aa79ff72569c3348a4cf4a412e1e4bce0bf2a alsa-lib-1.2.3.2.tar.bz2
e15318431fe2d5bd1e42ef793f223e3e5995890d7befe6daa3d7456ccf5cb2f51eb79171539cecae13032a9b8a798ea35e04c89b27c7ef9567e2c03fb8db4512 remove-test.patch"
diff --git a/main/amavis/APKBUILD b/main/amavis/APKBUILD
index f512a4e735..46ffce33fc 100644
--- a/main/amavis/APKBUILD
+++ b/main/amavis/APKBUILD
@@ -5,12 +5,12 @@ pkgver=2.12.0
pkgrel=0
pkgdesc="High-performance interface between mailer (MTA) and content checkers"
url="https://gitlab.com/amavis/amavis"
-arch="noarch"
+arch="noarch !x86" # perl-db
license="GPL-2.0-or-later BSD"
provides="amavisd-new=$pkgver-r$pkgrel"
depends="sed file perl perl-archive-zip perl-carp perl-convert-tnef
perl-compress-raw-zlib perl-convert-uulib perl-digest-md5 perl-io
- perl-exporter perl-io-compress perl-io-stringy perl-mime-tools
+ perl-exporter perl-io-stringy perl-mime-tools
perl-mailtools perl-socket perl-net-libidn perl-net-server
perl-time-hires perl-unix-syslog perl-db perl-mail-dkim
perl-io-socket-inet6
diff --git a/main/amavisd-milter/APKBUILD b/main/amavisd-milter/APKBUILD
index b20c46fbe6..80c8e019a3 100644
--- a/main/amavisd-milter/APKBUILD
+++ b/main/amavisd-milter/APKBUILD
@@ -1,21 +1,21 @@
# Contributor: Elias Werberich <elias@werberich.de>
-# Maintainer:
+# Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting>
pkgname=amavisd-milter
-pkgver=1.6.1
-pkgrel=2
+pkgver=1.7.0
+pkgrel=0
pkgdesc="sendmail milter for amavisd-new using the AM.PDP protocol"
url="http://amavisd-milter.sourceforge.net/"
-arch="all"
-license="BSD"
+arch="all !x86" #amavis isn't build for x86
+license="BSD-3-Clause"
depends="amavis libmilter"
makedepends="libmilter-dev"
subpackages="$pkgname-doc"
source="
- https://downloads.sourceforge.net/amavisd-milter/amavisd-milter/amavisd-milter-1.6.1/amavisd-milter-1.6.1.tar.gz
+ https://github.com/prehor/amavisd-milter/releases/download/$pkgver/amavisd-milter-$pkgver.tar.gz
amavisd-milter.initd
amavisd-milter.confd
"
-builddir="$srcdir/${pkgname}-${pkgver}"
+builddir="$srcdir/$pkgname-$pkgver"
build() {
cd "$builddir"
@@ -42,6 +42,6 @@ package() {
install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
-sha512sums="28f505a8e130e67decc6c6ff8526f82db24b1b27a11e69f1a112e3e6103f303d333743c2ceaf12bad86979c987cde64f41afb4794c1ca1222cf11a2c3b03c8a5 amavisd-milter-1.6.1.tar.gz
+sha512sums="52fdfe4acdd94e387de63d93aa3347dce46e7e16b8ab51679c7bbfc4f6faba160de5ca55aae141cbd06f3d9d1122dea67fdd67562dd5b8314055f7f6071545af amavisd-milter-1.7.0.tar.gz
3e45a8766f6b5bbb089bcb508efe99d17f107d544b2d50d12437a6b7103e2ce143eef9c6ecc0e2a9ced37b153d122e1eb8f171e4000e4e56a7f2a210587c2d68 amavisd-milter.initd
f44ab528c65050e23a2e78dafd937dae5bc73bd83ff780d7a193d47744674f3991c9d1ae99c4fb8ce1762c50ed6ca5fb604eb2c4cf69fe2e27e8a4076b6f2eec amavisd-milter.confd"
diff --git a/main/ansible/APKBUILD b/main/ansible/APKBUILD
index b096cbc0e2..128d36d6eb 100644
--- a/main/ansible/APKBUILD
+++ b/main/ansible/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Takuya Noguchi <takninnovationresearch@gmail.com>
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=ansible
-pkgver=2.9.9
+pkgver=2.9.11
pkgrel=0
pkgdesc="A configuration-management, deployment, task-execution, and multinode orchestration framework"
url="https://ansible.com/"
@@ -28,7 +28,6 @@ source="$pkgname-$pkgver.tar.gz::https://releases.ansible.com/ansible/ansible-$p
# - CVE-2020-10691
# 2.9.6-r0:
# - CVE-2020-1737
-# - CVE-2020-1739
# 2.9.3-r0:
# - CVE-2019-14904
# - CVE-2019-14905
@@ -63,6 +62,6 @@ package() {
install -m644 README.rst "$pkgdir"/usr/share/doc/$pkgname
}
-sha512sums="327c5ece277096f71f10fec2b33a8d2c94ee59b0e22b15bb5ca449da2331b8158239bdbc8e3afd093af358a787f410c7c2e0942010de65a8d9c8719cf83e4abd ansible-2.9.9.tar.gz
+sha512sums="b157a5cfb5ba7cb651c7afc0dc92cfe3b8f9eebd06de6d7a1e4917ffca3c542c5207c8e1820acc5be840190c8754f111e2501304ad7e64867247e5b973aec81e ansible-2.9.11.tar.gz
f44f1492495abe092cd9f91669ccfee65748f43663571361de97c3b1c5c1219d355aa7236179decb73446376018fa81aace7eaeb8c10a83d3cf4e006508533dd add-lxc-container_shell-option.patch
d6aa6827acee61d857444a00364f9b057a216a0a6f5217f353e8b8e0118db7aee54b7578a3fb31cb43bfa8e0709db8d43dcdb819eb28a457a692359887dad115 0001-new-module-lbu.patch"
diff --git a/main/apache-mod-auth-kerb/APKBUILD b/main/apache-mod-auth-kerb/APKBUILD
index 9856332950..9cc1751f06 100644
--- a/main/apache-mod-auth-kerb/APKBUILD
+++ b/main/apache-mod-auth-kerb/APKBUILD
@@ -1,9 +1,9 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=apache-mod-auth-kerb
_pkgname=mod_auth_kerb
pkgver=5.4
-pkgrel=6
+pkgrel=7
pkgdesc="A Kerberos authentication module for the Apache Http Server"
url="https://sourceforge.net/projects/modauthkerb/"
arch="all"
@@ -14,6 +14,7 @@ makedepends="apache2-dev krb5-dev"
source="https://downloads.sourceforge.net/project/modauthkerb/mod_auth_kerb/mod_auth_kerb-$pkgver/mod_auth_kerb-$pkgver.tar.gz
mod_auth_kerb-5.4-httpd24.patch
mod_auth_kerb_compile.patch
+ krb5-1.18-fix.patch
mod-auth-kerb.conf
"
builddir="$srcdir"/$_pkgname-$pkgver
@@ -39,4 +40,5 @@ package() {
sha512sums="93fdf0e43af1c24e8c8204d09240b708747068ef99dd8d21b45cb4d132d31e6d582d49ea5e23b905f55cb0d4a20b1ecb58de1bcbfdad1d016e536fc622b63214 mod_auth_kerb-5.4.tar.gz
fb7c8b18adce99c1bd200a8c1dd7794d0ecee49aa6308180b03537be160ea4426150f1421be9e2462f036296fbd220aa823a2689023899c66817baea8416aad9 mod_auth_kerb-5.4-httpd24.patch
f8fd9cce15593592995a53374a7dbbf6171c4f5e9e82d5bf59953fcfa6fa81cf6890ec4c9ddc2e0963060ea34e98b590f037b1f0274c284085350e6bc4792748 mod_auth_kerb_compile.patch
+f375dd027eb4b2094a39d321379dade5449a6daac0306eae9bc517344df4e5e65b59ba7b84617df328b00141740da5e515d3f20a448100ee1d95aab9f60e1152 krb5-1.18-fix.patch
b6cfa12dbfd37f98de4d5b23f16462efbfa394d4e9dd6a15772aa18fbec0704c3d9f6e5d242d501a8f1c3091abf893de261115ee54ea31d9d9e0a4d1724473a4 mod-auth-kerb.conf"
diff --git a/main/apache-mod-auth-kerb/krb5-1.18-fix.patch b/main/apache-mod-auth-kerb/krb5-1.18-fix.patch
new file mode 100644
index 0000000000..304a35b90f
--- /dev/null
+++ b/main/apache-mod-auth-kerb/krb5-1.18-fix.patch
@@ -0,0 +1,35 @@
+--- ./src/mod_auth_kerb.c.org 2020-08-10 17:36:11.563228638 +0200
++++ ./src/mod_auth_kerb.c 2020-08-10 17:53:14.641734908 +0200
+@@ -2070,12 +2070,11 @@
+ ret = krb5_init_context(&context);
+ if (ret)
+ return 0;
+-
+- ret = krb5_rc_resolve_full(context, &id, "none:");
++extern krb5_error_code
++ k5_rc_resolve(krb5_context context, const char *name, krb5_rcache *rc_out);
++ ret = k5_rc_resolve(context, "none:", &id);
+ found = (ret == 0);
+
+- if (ret == 0)
+- krb5_rc_destroy(context, id);
+ krb5_free_context(context);
+
+ return found;
+
+diff -ruN mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c mod_auth_kerb-5.4/src/mod_auth_kerb.c
+--- mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c 2018-12-12 16:59:43.762013269 +0100
++++ mod_auth_kerb-5.4/src/mod_auth_kerb.c 2018-12-12 16:59:59.151945123 +0100
+@@ -799,11 +799,9 @@
+ "failed to verify krb5 credentials: %s",
+ krb5_get_err_text(context, ret));
+ krb5_kt_end_seq_get(context, keytab, &cursor);
+- krb5_kt_close(context, keytab);
+ goto end;
+ }
+ krb5_kt_end_seq_get(context, keytab, &cursor);
+- krb5_kt_close(context, keytab);
+ }
+ else {
+ if ((ret = verify_krb5_init_creds(r, context, &creds, server, keytab))) {
+
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index 612926b3ac..0d20af53dc 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
pkgname=apache2
_pkgreal=httpd
-pkgver=2.4.43
+pkgver=2.4.46
pkgrel=0
pkgdesc="A high performance Unix-based HTTP server"
url="https://httpd.apache.org/"
@@ -50,6 +50,10 @@ options="suid"
builddir="$srcdir"/$_pkgreal-$pkgver
# secfixes:
+# 2.4.46-r0:
+# - CVE-2020-9490
+# - CVE-2020-11984
+# - CVE-2020-11993
# 2.4.43-r0:
# - CVE-2020-1927
# - CVE-2020-1934
@@ -342,7 +346,7 @@ _lua() {
"$subpkgdir"/usr/lib/apache2/
_load_mods
}
-sha512sums="16cfeecc8f6fab6eca478065a384bdf1872f7ac42206b0bc2bcac6c0d9c576f392c07107201f39e0601dec1bbafcb33d66153544de4d87d79b9a52094d334b64 httpd-2.4.43.tar.bz2
+sha512sums="5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13 httpd-2.4.46.tar.bz2
8e62b101f90c67babe864bcb74f711656180b011df3fd4b541dc766b980b72aa409e86debf3559a55be359471c1cad81b8779ef3a55add8d368229fc7e9544fc apache2.confd
18e8859c7d99c4483792a5fd20127873aad8fa396cafbdb6f2c4253451ffe7a1093a3859ce719375e0769739c93704c88897bd087c63e1ef585e26dcc1f5dd9b apache2.logrotate
81a2d2a297d8049ba1b021b879ec863767149e056d9bdb2ac8acf63572b254935ec96c2e1580eba86639ea56433eec5c41341e4f1501f9072745dccdb3602701 apache2.initd
diff --git a/main/apk-tools/0001-build-make-soname-explicit-and-simplify-and-fix-sona.patch b/main/apk-tools/0001-build-make-soname-explicit-and-simplify-and-fix-sona.patch
new file mode 100644
index 0000000000..528cf2f7aa
--- /dev/null
+++ b/main/apk-tools/0001-build-make-soname-explicit-and-simplify-and-fix-sona.patch
@@ -0,0 +1,67 @@
+From 2408ad4f9576727bfe24493b01b7609d4b6230e8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Tue, 25 Aug 2020 15:35:46 +0300
+Subject: [PATCH] build: make soname explicit and simplify and fix soname link
+
+---
+ src/Makefile | 28 ++++++++++------------------
+ 1 file changed, 10 insertions(+), 18 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 606d2ff..186823f 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -16,26 +16,25 @@ ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib)
+ ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib)
+
+ # Dynamic library
+-libapk.so.$(VERSION)-objs := \
++libapk_soname := 3.12.0
++libapk_so := $(obj)/libapk.so.$(libapk_soname)
++libapk.so.$(libapk_soname)-objs := \
+ common.o database.o package.o commit.o solver.o \
+ version.o atom.o blob.o hash.o print.o \
+ io.o io_url.o io_gunzip.o io_archive.o
+
+-libapk.so.$(VERSION)-libs := libfetch/libfetch.a
++libapk.so.$(libapk_soname)-libs := libfetch/libfetch.a
+
+-libapk_soname := $(VERSION)
+-shlibs-y += libapk.so.$(VERSION)
+-LDFLAGS_libapk.so.$(VERSION) += -Wl,-soname,libapk.so.$(libapk_soname)
++shlibs-y += libapk.so.$(libapk_soname)
++LDFLAGS_libapk.so.$(libapk_soname) += -Wl,-soname,libapk.so.$(libapk_soname)
+
+-libapk_so := $(obj)/libapk.so.$(VERSION)
+ install-libapk_so := $(INSTALLDIR) $(DESTDIR)$(LIBDIR) && \
+- $(INSTALL) $(libapk_so) $(DESTDIR)$(LIBDIR)/libapk.so.$(VERSION) && \
+- $(INSTALL) $(obj)/libapk.so.$(libapk_soname) $(DESTDIR)$(LIBDIR) && \
+- $(INSTALL) $(obj)/libapk.so $(DESTDIR)$(LIBDIR)
++ $(INSTALL) $(libapk_so) $(DESTDIR)$(LIBDIR) && \
++ $(LN) libapk.so.$(libapk_soname) $(DESTDIR)$(LIBDIR)/libapk.so
+
+ # Static library
+-libapk.a-objs := $(libapk.so.$(VERSION)-objs)
+-libapk.a-libs := $(libapk.so.$(VERSION)-libs)
++libapk.a-objs := $(libapk.so.$(libapk_soname)-objs)
++libapk.a-libs := $(libapk.so.$(libapk_soname)-libs)
+
+ libs-y += libapk.a
+ libapk_a := $(obj)/libapk.a
+@@ -117,13 +116,6 @@ $(obj)/apk-test: $(libapk_so)
+
+ $(obj)/apk.so: $(libapk_so)
+
+-ifneq ($(libapk_soname), $(VERSION))
+-generate-y += libapk.so.$(libapk_soname)
+-
+-$(obj)/libapk.so.$(libapk_soname):
+- $(LN) libapk.so.$(VERSION) $(obj)/libapk.so.$(libapk_soname)
+-endif
+-
+ generate-y += libapk.so
+
+ $(obj)/libapk.so:
+--
+2.28.0
+
diff --git a/main/apk-tools/0002-fix-repository-short-option-to-be-X-as-before.patch b/main/apk-tools/0002-fix-repository-short-option-to-be-X-as-before.patch
new file mode 100644
index 0000000000..7319569010
--- /dev/null
+++ b/main/apk-tools/0002-fix-repository-short-option-to-be-X-as-before.patch
@@ -0,0 +1,27 @@
+From fb0109fdb199436979af71b3d8f973dbbf4fb906 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Wed, 26 Aug 2020 23:03:48 +0300
+Subject: [PATCH] fix --repository short option to be -X as before
+
+unintentional regression from commit edb45ae464
+fixes #10707
+---
+ src/apk.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/apk.c b/src/apk.c
+index a315edc..4aba0a6 100644
+--- a/src/apk.c
++++ b/src/apk.c
+@@ -97,7 +97,7 @@ static struct apk_repository_list *apk_repository_new(const char *url)
+ OPT(OPT_GLOBAL_purge, "purge") \
+ OPT(OPT_GLOBAL_quiet, APK_OPT_SH("q") "quiet") \
+ OPT(OPT_GLOBAL_repositories_file, APK_OPT_ARG "repositories-file") \
+- OPT(OPT_GLOBAL_repository, APK_OPT_ARG APK_OPT_SH("x") "repository") \
++ OPT(OPT_GLOBAL_repository, APK_OPT_ARG APK_OPT_SH("X") "repository") \
+ OPT(OPT_GLOBAL_root, APK_OPT_ARG APK_OPT_SH("p") "root") \
+ OPT(OPT_GLOBAL_update_cache, APK_OPT_SH("U") "update-cache") \
+ OPT(OPT_GLOBAL_verbose, APK_OPT_SH("v") "verbose") \
+--
+2.28.0
+
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 3198c59aab..fac25ece46 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,32 +1,33 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
-pkgver=2.10.5
-pkgrel=1
+pkgver=2.12.0_rc1
+pkgrel=2
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-static"
-makedepends_build="openssl"
+subpackages="$pkgname-dev $pkgname-static $pkgname-doc"
+# 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="$makedepends_build $makedepends_host"
if [ "$CBUILD" = "$CHOST" ]; then
subpackages="$subpackages lua5.3-apk:luaapk"
makedepends="$makedepends lua5.3-dev"
fi
-source="https://dev.alpinelinux.org/archive/apk-tools/apk-tools-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/alpine/$pkgname/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz
+ 0001-build-make-soname-explicit-and-simplify-and-fix-sona.patch
+ 0002-fix-repository-short-option-to-be-X-as-before.patch
+ "
+builddir="$srcdir/$pkgname-v$pkgver"
prepare() {
default_prepare
sed -i -e 's:-Werror::' Make.rules
echo "FULL_VERSION=$pkgver-r$pkgrel" > config.mk
- if [ "$CBUILD" = "$CHOST" ]; then
- echo "LUAAPK=YesPlease" >> config.mk
- else
- echo "LUAAPK=" >> config.mk
- fi
- echo "export LUAAPK" >> config.mk
}
build() {
@@ -44,13 +45,13 @@ package() {
"$pkgdir"/var/cache/misc \
"$pkgdir"/etc/apk/keys \
"$pkgdir"/etc/apk/protected_paths.d
- # the shipped README is empty
- rm -r "$pkgdir"/usr/share/
+
+ rm -r "$pkgdir"/usr/share/doc
}
static() {
pkgdesc="Alpine Package Keeper - static binary"
- install -Dm755 "$srcdir"/$pkgname-$pkgver/src/apk.static \
+ install -Dm755 "$builddir"/src/apk.static \
"$subpkgdir"/sbin/apk.static
# lets sign the static binary so it can be vefified from distros
@@ -74,4 +75,6 @@ luaapk() {
mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/
}
-sha512sums="0f85ec7c734f2ffc671007fa029f3c96eacfb196c45e465e33aa65c32a6fbcd7523153b6441fdf826a5b4d2e66de02d338620474d333c28cb1ce0233f1120495 apk-tools-2.10.5.tar.xz"
+sha512sums="27afe59207fc642aff2e86f75520a52c78d7748ca9f10f3d74f2bca163c1e9741c51d0657d1b46a65fd14255b23c3a0cbc913712708ef5809667ac7990c84063 apk-tools-v2.12.0_rc1.tar.gz
+7b4fb78e1722212d31418e2fd72b2023339cebf9041f0071eac4df2cd7364218b338b703247a8246f5b781c28640a2b9a569f83f9c920fa5a9de64616e7b9edf 0001-build-make-soname-explicit-and-simplify-and-fix-sona.patch
+af2babedba583058da62e01651c167afaa6633eb59489a2afe349d700803f127330ad89d3762ab71dd81065728d2263ef6e971732d73ae07c2273ddfc3e16033 0002-fix-repository-short-option-to-be-X-as-before.patch"
diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD
index 6175754d03..656bf1bf37 100644
--- a/main/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
@@ -1,49 +1,42 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apr-util
pkgver=1.6.1
-pkgrel=6
+pkgrel=7
pkgdesc="The Apache Portable Runtime Utility Library"
url="http://apr.apache.org/"
arch="all"
license="Apache-2.0"
-depends=
-subpackages="$pkgname-dev $pkgname-dbm_db $pkgname-dbd_pgsql $pkgname-dbd_mysql
+subpackages="$pkgname-dev $pkgname-dbd_pgsql $pkgname-dbd_mysql
$pkgname-dbd_sqlite3 $pkgname-ldap"
-
-depends_dev="expat-dev apr-dev openldap-dev sqlite-dev postgresql-dev
- db-dev openssl-dev mariadb-dev"
-makedepends="$depends_dev bash chrpath openssl"
-source="https://www.apache.org/dist/apr/$pkgname-$pkgver.tar.bz2
+depends_dev="expat-dev openldap-dev sqlite-dev postgresql-dev
+ openssl-dev mariadb-dev"
+makedepends="$depends_dev apr-dev bash chrpath openssl"
+source="https://www.apache.org/dist/apr/apr-util-$pkgver.tar.bz2
musl-fix-testsuite.patch"
-builddir="$srcdir/$pkgname-$pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--with-apr=/usr \
--with-ldap \
- --with-dbm=db53 \
--with-pgsql \
--with-mysql \
--with-sqlite3 \
- --with-berkeley-db \
--with-crypto \
--with-openssl \
--without-sqlite2 \
- --without-gdbm
+ --without-berkeley-db \
+ --with-dbm=ndbm
make
}
check() {
- cd "$builddir"
make -j1 check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm "$pkgdir"/usr/lib/*.exp
chrpath -d "$pkgdir"/usr/lib/*.so.*
@@ -57,7 +50,6 @@ _mv_mod() {
mv "$pkgdir"/$_moddir/apr_$1*.so "$subpkgdir"/$_moddir/
}
-dbm_db() { _mv_mod dbm_db "Berkley DB"; }
dbd_pgsql() { _mv_mod dbd_pgsql "PostgreSQL"; }
dbd_mysql() { _mv_mod dbd_mysql "MySQL"; }
dbd_sqlite3() { _mv_mod dbd_sqlite "SQLite3"; }
diff --git a/main/arpwatch/APKBUILD b/main/arpwatch/APKBUILD
index 4cdd89fe8b..9d8bc8cf24 100644
--- a/main/arpwatch/APKBUILD
+++ b/main/arpwatch/APKBUILD
@@ -2,17 +2,17 @@
# Maintainer: Francesco Colista <francesco.colista@gmail.com>
pkgname=arpwatch
pkgver=2.1a15
-pkgrel=16
+pkgrel=17
pkgdesc="Ethernet monitoring program"
url="http://www-nrg.ee.lbl.gov/"
arch="all"
-license="BSD"
+license="BSD-4-Clause-Shortened"
pkgusers="arpwatch"
makedepends="libpcap-dev"
install="$pkgname.pre-install"
options="!check" # No test suite.
-subpackages="$pkgname-ethercodes"
-source="ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz
+subpackages="$pkgname-ethercodes $pkgname-doc"
+source="ftp://ftp.ee.lbl.gov/arpwatch-$pkgver.tar.gz
arpwatch.confd
arpwatch.initd
01_all_arpwatch-2.1a15-manpages.patch
@@ -38,16 +38,14 @@ source="ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz
21_all_arpwatch-2.1a15-pid-filename.patch
22_alpine_bihourly_script.patch
"
-
-builddir="$srcdir/$pkgname-$pkgver"
-
prepare() {
+ chmod -R u+rwX "$builddir"
default_prepare
update_config_sub
+ sed -i'' -e 's/-o bin -g bin //g' Makefile.in
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -59,7 +57,6 @@ build() {
}
package() {
- cd "$builddir"
#make install command wouldn't create directory
mkdir -p "$pkgdir"/usr/sbin/
make -j1 DESTDIR="$pkgdir" install
@@ -83,8 +80,16 @@ ethercodes() {
done
}
-
-
+doc() {
+ cd "$builddir"
+ install -d "$subpkgdir"/usr/share/man/man8
+ make DESTDIR="$subpkgdir" install-man
+ gzip "$subpkgdir"/usr/share/man/man8/*.8
+ install -d "$subpkgdir"/usr/share/doc/$pkgname
+ for f in CHANGES INSTALL README; do
+ install -m644 $f "$subpkgdir"/usr/share/doc/$pkgname/
+ done
+}
sha512sums="f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90 arpwatch-2.1a15.tar.gz
854f6361bf02586516db4f50afdee729c047cd788985f72f475e592e0e744c24d7d765f0391d733dbf417048c26b6d43c00eb63c58e6798bdb2366b93cbfe03a arpwatch.confd
diff --git a/main/asciidoc/APKBUILD b/main/asciidoc/APKBUILD
index 676bc20c9a..776818275b 100644
--- a/main/asciidoc/APKBUILD
+++ b/main/asciidoc/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=asciidoc
-pkgver=9.0.1
+pkgver=9.0.2
pkgrel=0
pkgdesc="Text based documentation"
url="http://asciidoc.org/"
@@ -36,4 +36,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6906d8fbfd8fad9dd6971f0671f4f0c88e59424710c25b2b1374a1fb8a80dad7a537edba19d9731c8f0f9096624cdfdd25e0b952e312fd36faac105f748fb105 asciidoc-9.0.1.tar.gz"
+sha512sums="ea8f64ce54d2f1aa38eceb3c1c9be17b388776de58038f3b888ac5ebed76337fa2779e43eb7f47174adf0a0446ee808dbd1e4f8f7e1d7db99db7c4c8584d5624 asciidoc-9.0.2.tar.gz"
diff --git a/main/aspell-de/APKBUILD b/main/aspell-de/APKBUILD
index c43f2283f5..7f94b3789d 100644
--- a/main/aspell-de/APKBUILD
+++ b/main/aspell-de/APKBUILD
@@ -1,9 +1,9 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=aspell-de
-pkgver=20030222
-pkgrel=1
+pkgver=20161207
+pkgrel=0
_lang=${pkgname##*-}
-_name=${pkgname%%-*}6-$_lang-$pkgver-1
+_name=${pkgname%%-*}6-$_lang-$pkgver-7-0
pkgdesc="German dictionary for aspell"
url="http://aspell.net/"
arch="noarch"
@@ -13,16 +13,14 @@ makedepends="aspell-dev"
source="https://ftp.gnu.org/gnu/aspell/dict/$_lang/$_name.tar.bz2"
builddir="$srcdir"/$_name
-build () {
- cd "$builddir"
+build() {
./configure
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -D -m644 Copyright "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
-sha512sums="2005b56938565b11b761ace31006c1accfd32d401685cc5676cc4d85406bedda81b1df062949359f1bd6972073d3713204d87c7f81d9535fa956cdf130dd8db6 aspell6-de-20030222-1.tar.bz2"
+sha512sums="ec29fa49d4e0303d6ceb78da3884ac54ddf34205895f30a95bce0db66f74472b423980200acf01efb1fa40380d6ea6351a58656400af35772266f8a54b1bbec8 aspell6-de-20161207-7-0.tar.bz2"
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 615fbb7fd5..39c3cf2b4a 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Timo Teras <timo.teras@iki.fi>
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=asterisk
-pkgver=16.11.0
+pkgver=16.12.0
pkgrel=0
pkgdesc="Asterisk: A Module Open Source PBX System"
pkgusers="asterisk"
@@ -174,7 +174,7 @@ sound_en() {
chown -R asterisk:asterisk "$subpkgdir"/var/*/asterisk
}
-sha512sums="1b138c6a4ac442504d05c1f9a327cdc1396669a328f86678252fe578dc0e3cccf5b4d7856937862f7cc531a0618e3b7e6eebc041ab435efe676cd89e6d877ee6 asterisk-16.11.0.tar.gz
+sha512sums="1fc41b92d070efd4a7ea5db1a36c83bdb6dbbe7d9b5087b0a887ba3d6875e81ba1b71a79b216138b242f0349a176baf6745480ff6fb7ed47c62dda4b09b6a891 asterisk-16.12.0.tar.gz
aacef3f4796fb1abd33266998b53909cb4b36e7cc5ad2f7bac68bdc43e9a9072d9a4e2e7e681bddfa31f3d04575eb248afe6ea95da780c67e4829c1e22adfe1b asterisk-addon-mp3-r201.patch.gz
771237ba6d42ab62d914f2702234b23fd0bc8c22f2aa33b0e745c9170163c8046f6d48ecb299faab3d6fb397f1aa046421083c3cc88510c9779861c522f357dd 10-musl-mutex-init.patch
0fae11b42894ab3d405bc50e9275b9084712b482fbf9b4259ea938667fc5cbe413655f3ff83da0f607151bb2b6e49c2f741b5ada6944dbb478f076ef8d86380a 20-musl-astmm-fix.patch
diff --git a/main/at-spi2-atk/APKBUILD b/main/at-spi2-atk/APKBUILD
index 9028296735..480186c24d 100644
--- a/main/at-spi2-atk/APKBUILD
+++ b/main/at-spi2-atk/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=at-spi2-atk
-pkgver=2.34.2
-pkgrel=1
+pkgver=2.38.0
+pkgrel=0
pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
url="https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/"
arch="all"
@@ -15,21 +15,16 @@ subpackages="$pkgname-dev"
source="https://download.gnome.org/sources/at-spi2-atk/${pkgver%.*}/at-spi2-atk-$pkgver.tar.xz"
build() {
- meson \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --buildtype=plain \
- . output
- ninja -C output
+ abuild-meson . output
+ meson compile ${JOBS:+-j ${JOBS}} -C output
}
check() {
- ninja -C output test
+ meson test --no-rebuild -v -C output
}
package() {
- DESTDIR="$pkgdir" ninja -C output install
+ DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
-sha512sums="59e7ad5c944748ca00af8b0a9df03c9ffbc6afae6e65c25a2566a9e2a30e66724c4492076be1730c2894c636f82c795c533669572584d8d5675f68b349ad16c4 at-spi2-atk-2.34.2.tar.xz"
+sha512sums="2f40ecbc55b0fbaa57ade952a75583bc8fbfde234cce9248489e9ae06e0597d98c2f4c77d8279758dec29da97e06cde5708d30a1238d91bebd023b2320f38528 at-spi2-atk-2.38.0.tar.xz"
diff --git a/main/at-spi2-core/APKBUILD b/main/at-spi2-core/APKBUILD
index c4e56654b1..6773389348 100644
--- a/main/at-spi2-core/APKBUILD
+++ b/main/at-spi2-core/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=at-spi2-core
-pkgver=2.36.0
-pkgrel=1
+pkgver=2.38.0
+pkgrel=0
pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
url="https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/"
arch="all"
@@ -13,20 +13,18 @@ subpackages="$pkgname-dbg $pkgname-dev $pkgname-lang $pkgname-doc"
source="https://download.gnome.org/sources/at-spi2-core/${pkgver%.*}/at-spi2-core-$pkgver.tar.xz"
build() {
- meson \
- --buildtype=plain \
- --prefix=/usr \
+ abuild-meson \
-Dx11=yes \
-Dintrospection=yes \
-Ddocs=true \
-Ddbus_daemon=/usr/bin/dbus-daemon \
. build
- ninja -C build
+ meson compile ${JOBS:+-j ${JOBS}} -C build
}
package() {
- DESTDIR="$pkgdir" ninja -C build install
+ DESTDIR="$pkgdir" meson install --no-rebuild -C build
rm -rf "$pkgdir"/usr/lib/systemd
}
-sha512sums="f45d7e68bfcd9b93cebc47e30febce1ae6a4d9df2fbc9d5bdc25babb123c922d0f9a229485770b2f6ed386178144c20486fa3e46195041ea65a54ab019b1cbb6 at-spi2-core-2.36.0.tar.xz"
+sha512sums="3a1eb27cff6e0dd03119b4f8361a3b6037b26c511e80e2d003d1d5c41fede6d49eb5e0ac1ee45cfb4f3ca8e53292a7e2da67df80be28e77014775e41777a96c1 at-spi2-core-2.38.0.tar.xz"
diff --git a/main/atk/APKBUILD b/main/atk/APKBUILD
index 8d8d00ea7f..abf7d04498 100644
--- a/main/atk/APKBUILD
+++ b/main/atk/APKBUILD
@@ -12,22 +12,18 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://download.gnome.org/sources/atk/${pkgver%.*}/atk-$pkgver.tar.xz"
build() {
- meson \
- --prefix=/usr \
- --buildtype=plain \
- --sysconfdir=/etc \
- --buildtype=plain \
+ abuild-meson \
-Ddocs=true \
output .
- ninja -C output
+ meson compile ${JOBS:+-j ${JOBS}} -C output
}
check() {
- ninja -C output test
+ meson test --no-rebuild -v -C output
}
package() {
- DESTDIR="$pkgdir" ninja -C output install
+ DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
sha512sums="d0f18204eaf96511e8448e3dfbc4b6953a7cf8b816151fb7caf5592cf578572b1cdb16836fe2157b11e3ad018ef171f1ca1bfdf255bb31bb455716d7519fd634 atk-2.36.0.tar.xz"
diff --git a/main/avahi-ui/APKBUILD b/main/avahi-ui/APKBUILD
index 7f6794b0f2..bc2848d5c0 100644
--- a/main/avahi-ui/APKBUILD
+++ b/main/avahi-ui/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=avahi-ui
pkgver=0.7
-pkgrel=2
+pkgrel=3
pkgdesc="Gtk user interface library for Avahi"
url="http://www.avahi.org/"
arch="all"
diff --git a/main/avahi/APKBUILD b/main/avahi/APKBUILD
index 2651e43e26..63b6f80e98 100644
--- a/main/avahi/APKBUILD
+++ b/main/avahi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=avahi
pkgver=0.8
-pkgrel=0
+pkgrel=1
pkgdesc="A multicast/unicast DNS-SD framework"
url="https://www.avahi.org/"
arch="all"
diff --git a/main/avfs/APKBUILD b/main/avfs/APKBUILD
index 80f567e486..0560f39566 100644
--- a/main/avfs/APKBUILD
+++ b/main/avfs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: V.Krishn <vkrishn4@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=avfs
-pkgver=1.1.2
+pkgver=1.1.3
pkgrel=0
pkgdesc="A Virtual File System for looking into archives"
url="http://avf.sourceforge.net/"
@@ -37,5 +37,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="f54a82ed4f7f9abba3e9f02c76d3bf8693d8136010e7c628dbd82b960ea32d654f63c6e9d1237ee4bd794014a56d0cebcd4f4c3d29be8d00536fd676db3262b1 avfs-1.1.2.tar.bz2
+sha512sums="8e87655cbdb64f0cbbcc399142957ea9e04a998953cc64def9c8bb338b46abffc85a35e09b5fa52bb9ddcf56e27c4f62503050d32c8201eaad61c54e22bdd005 avfs-1.1.3.tar.bz2
281d36f65652a265781e305647a4c1c8f03b851ba458a0b7d9f36119f5489f3b16337019da2b8521695c9bb5cee7ee01ef0a040453c27e1f82f51d858f4940b5 fix-PATH_MAX.patch"
diff --git a/main/awall/APKBUILD b/main/awall/APKBUILD
index 8aef15a0fb..f24a644703 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>
pkgname=awall
-pkgver=1.8.0
+pkgver=1.8.1
pkgrel=0
pkgdesc="Alpine Wall"
url="https://gitlab.alpinelinux.org/alpine/awall"
@@ -11,7 +11,7 @@ license="GPL-2.0"
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
- xtables-addons"
+ 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
@@ -26,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make LUA_VERSION=$_luaver check
}
package() {
- cd "$builddir"
make "ROOT_DIR=$pkgdir" LUA_VERSION=$_luaver install
install -D "$srcdir"/awall-init "$pkgdir"/usr/libexec/awall-init
}
@@ -53,6 +51,6 @@ policies() {
install -D "$srcdir"/setup-firewall "$subpkgdir"/usr/sbin/setup-firewall
}
-sha512sums="49b7d4847b3b1913daf74ed731459d9d74f283b33d62fa5a8864ae68b1e405c61aceaa2646bff6e9846f512298d7fe543979623adc9f5e8d613e63d04d22ff57 awall-v1.8.0.tar.bz2
+sha512sums="d2e8063218ab6a0181c617fd1c44c96a326b54b15bb2c42714a500e6273660bbb1804a8f40d8f1d4138d3902a98c7f8930b441888d5e934042423c7f4277f800 awall-v1.8.1.tar.bz2
e83ea3281c298092530e45fa5b62f6f85b9e5109b11e109799465ea832608294c7d9c4c3f5b0f321dfc0e82040daf3a17d066e9dea65cb0dbae2c453ea9e62cd awall-init
1cd4b7fa5fc6c9ac6667dff5cc00d96a3cc42aaccafe3c5562d3dcfd9f22ddec9cfe5a9339fee8001b67ccb8e8b81c9417f39a461e5052af9bf74a2753559bf7 setup-firewall"
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index 023fd2b790..0787c5a04d 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=bacula
-pkgver=9.6.5
+pkgver=9.6.6
pkgrel=0
pkgdesc="Enterprise ready, network based backup program"
url="https://www.bacula.org"
@@ -174,7 +174,7 @@ client() {
install -d -o $pkgname -g $pkgname "$subpkgdir"/$_bworkdir
}
-sha512sums="4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70 bacula-9.6.5.tar.gz
+sha512sums="1b669bbf1e54f40e0426603601a4751c42101985de901f951a68add7644971d48615b3089c65fafd444c762c3d82b67cafdcae9636e8a19af8fd94ae631c315a bacula-9.6.6.tar.gz
bb954bb94bffa68ba80872046782a73012487291f019fb8d7ff77fc7f4325e25bee88612b3279b4db7d3c2002ac7448ffabcda62da7bab54642a7413904abc91 bacula-dir.initd
0505b9a74520af6982d5df4390525976f8e009e641d0acfe8f24b2ec9f155166a65eecbabee9ff70ffe188d523effa64f958acd8f657410b1c002a6d736e8aee bacula-sd.initd
91a53cb566cfd91b42a319bd6ff9947047cae187c6ec198767853d1a0253667d6c2c58f0e72ed43a7b9f40b76e705cafde7a1d6ac86577fa0f64f44b031dec11 bacula-fd.initd
diff --git a/main/bash-completion/APKBUILD b/main/bash-completion/APKBUILD
index 755e3fc95b..4d66dcd3a7 100644
--- a/main/bash-completion/APKBUILD
+++ b/main/bash-completion/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
# Maintainer: Lucas Ramage <ramage.lucas@openmailbox.org>
pkgname=bash-completion
-pkgver=2.10
+pkgver=2.11
pkgrel=0
pkgdesc="Command-line tab-completion for bash"
options="!check" # 7 Tests fail
@@ -14,7 +14,6 @@ makedepends="autoconf automake bc grep iputils musl-utils procps psmisc sed usbu
checkdepends="py3-pexpect py3-pytest"
subpackages="$pkgname-doc"
source="https://github.com/scop/bash-completion/releases/download/$pkgver/bash-completion-$pkgver.tar.xz"
-builddir="$srcdir"/$pkgname-$pkgver
# Provided with util-linux and networkmanager:
_conflicting="
@@ -39,7 +38,6 @@ _conflicting="
"
prepare() {
- cd "$builddir"
default_prepare
# ifup/down tests are still failing
@@ -51,7 +49,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -63,7 +60,6 @@ build() {
}
check() {
- cd "$builddir"
mkdir ./bin
ln -sf "$(command -v pytest-3)" ./bin/pytest
export PATH="${PATH}:$PWD/bin"
@@ -71,7 +67,6 @@ check() {
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
@@ -84,4 +79,4 @@ package() {
done
}
-sha512sums="d434e0e48b25328e8c6b43ed64e58f56459186434754ee972795edd031ce1864038b53926b218fe06e5b3882682db4dec5101b3124362c0137101d3fa6d87cd7 bash-completion-2.10.tar.xz"
+sha512sums="41585f730b5114d397831ba36d10d05643c6a6179e746ddc49aa1cbef61ea5525fd2f09b2e474adee14e647f99df8d5983ee48e29a59d8a30e1daf7fb1837e06 bash-completion-2.11.tar.xz"
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index cdeff0e885..78f1e38134 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: TBK <alpine@jjtc.eu>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bash
-pkgver=5.0.17
+pkgver=5.0.18
_patchlevel=${pkgver##*.}
_myver=${pkgver%.*}
_patchbase=${_myver/./}
@@ -110,4 +110,5 @@ cbf51bb242edf36289bd483b47c9451132c12f341f494212c0e5d969cd06a3c1c4d121295f3bacb1
e8f65be24b425ecaf66672eb4271e0efac2f495f882aeb559d60b52359a468b51852ed7aeeea0ab77cf648a48c9d37f2a00e263d06d29e9fa75b67a648399d91 bash50-014
3a1a552d1f03dec9ed41be8d8c319fb3cbd01df9978ab25a7b37322913014beca6703980f342ea908250b666d72db95402d7b8219ffdd3df717acb36ed4b72b9 bash50-015
dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa bash50-016
-d4a4b2746a106a7e78f7df2467cfd4ca486ab36b3e6e97eb9d47ede728033b1246bc1b60edc271cdb49df998af196619b09e598c0da1b425f05455237e256b65 bash50-017"
+d4a4b2746a106a7e78f7df2467cfd4ca486ab36b3e6e97eb9d47ede728033b1246bc1b60edc271cdb49df998af196619b09e598c0da1b425f05455237e256b65 bash50-017
+cfbad36b1805ad76cb21d9136843171d794e57383318a014522e2d35905cf262d6721615f0a79972cacc45152de636977c957cbbad08ccb52f96de40b09bba5c bash50-018"
diff --git a/main/bats/APKBUILD b/main/bats/APKBUILD
index c022da9b7a..8d1ea735bf 100644
--- a/main/bats/APKBUILD
+++ b/main/bats/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Jose-Luis Rivas <ghostbar@riseup.net>
pkgname=bats
-pkgver=1.2.0
+pkgver=1.2.1
pkgrel=0
pkgdesc="Bash Automated Testing System"
url="https://github.com/bats-core/bats-core"
@@ -18,4 +18,4 @@ check() {
package() {
./install.sh "$pkgdir"/usr
}
-sha512sums="54072dc4bd59e62252ed5ec662c748957401e662ffbdabc61f99bc0e6b51b4d845832cd41b3688c92e99399a860101437ed39eddccf0da5d48c6064b95ab020c bats-1.2.0.zip"
+sha512sums="bd7a334a558471f691552e18362ed55882e3cdb4dbbb5ebd2c0cc5f40bbd09a4a44b8e91d0d8ce51059a84c745b30c533f3e8444c6588ab355865340a98c079b bats-1.2.1.zip"
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index 8c2e17c30e..09935857c9 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -5,14 +5,14 @@
# Contributor: ungleich <alpinelinux@ungleich.ch>
# Maintainer:
pkgname=bind
-pkgver=9.14.12
+pkgver=9.16.7
_ver=${pkgver%_p*}
_p=${pkgver#*_p}
_major=${pkgver%%.*}
[ "$_p" != "$pkgver" ] && _ver="$_ver-P$_p"
pkgrel=0
pkgdesc="The ISC DNS server"
-url="https://www.isc.org"
+url="https://www.isc.org/"
arch="all"
license="MPL-2.0"
pkgusers="named"
@@ -30,6 +30,7 @@ makedepends="
json-c-dev
krb5-dev
libcap-dev
+ libuv-dev
libxml2-dev
linux-headers
openldap-dev
@@ -47,7 +48,7 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc
$pkgname-plugins $pkgname-tools
"
source="
- https://downloads.isc.org/isc/${pkgname}$_major/$_ver/$pkgname-$_ver.tar.gz
+ https://downloads.isc.org/isc/${pkgname}$_major/$_ver/$pkgname-$_ver.tar.xz
bind.plugindir.patch
bind.so_bsdcompat.patch
named.initd
@@ -59,6 +60,15 @@ source="
"
# secfixes:
+# 9.16.6-r0:
+# - CVE-2020-8620
+# - CVE-2020-8621
+# - CVE-2020-8622
+# - CVE-2020-8623
+# - CVE-2020-8624
+# 9.16.4-r0:
+# - CVE-2020-8618
+# - CVE-2020-8619
# 9.14.12-r0:
# - CVE-2020-8616
# - CVE-2020-8617
@@ -96,7 +106,7 @@ source="
prepare() {
default_prepare
# Adjusting PATHs in manpages
- for i in bin/named/named.8 bin/check/named-checkconf.8 bin/rndc/rndc.8; do
+ for i in bin/named/named.rst bin/check/named-checkconf.rst bin/rndc/rndc.rst; do
sed -i \
-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
@@ -106,7 +116,7 @@ prepare() {
}
build() {
- ### http://bugs.gentoo.org/show_bug.cgi?id=227333
+ ### https://bugs.gentoo.org/show_bug.cgi?id=227333
export CFLAGS="$CFLAGS -D_GNU_SOURCE"
./configure \
@@ -169,13 +179,6 @@ package() {
ln -s named.ca root.cache
}
-dev() {
- default_dev
-
- mkdir -p "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/isc-config.sh "$subpkgdir"/usr/bin/
-}
-
_py3() {
pkgdesc="A module allowing rndc commands to be sent from Python programs"
depends="$_py3deps"
@@ -250,7 +253,7 @@ gpgfingerprints="
BE0E 9748 B718 253A 28BB 89FF F1B1 1BF0 5CF0 2E57
"
-sha512sums="f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf bind-9.14.12.tar.gz
+sha512sums="176c84657e8a7b10a7ca93c939ca6a7fcdefb22f9200c3f01be59bcd8990dee27b8dc0970299225bcbe0f1aa8f49a67c80c4a9853895ffbcd685adb9674e7768 bind-9.16.7.tar.xz
2b32d1e7f62cd1e01bb4fdd92d15460bc14761b933d5acc463a91f5ecd4773d7477c757c5dd2738e8e433693592cf3f623ffc142241861c91848f01aa84640d6 bind.plugindir.patch
7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch
53db80f7ee4902f42fb1d0bc959242bcb6f20d95256bda99ce2c206af8b4703c7f72bb26d026c633f70451b84a37c3946b210951e34dd5d6620b181cd0183de4 named.initd
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index ab2c4ed588..839c45c88c 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=binutils
-pkgver=2.34
-pkgrel=1
+pkgver=2.35.1
+pkgrel=0
pkgdesc="Tools necessary to build programs"
url="https://www.gnu.org/software/binutils/"
makedepends_build="bison flex texinfo"
@@ -110,7 +110,7 @@ gold() {
mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
}
-sha512sums="2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd binutils-2.34.tar.xz
+sha512sums="94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb binutils-2.35.1.tar.xz
ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49 binutils-ld-fix-static-linking.patch
f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f gold-mips.patch
314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d ld-bfd-mips.patch"
diff --git a/main/bison/APKBUILD b/main/bison/APKBUILD
index 43dad81555..7e83fb52d3 100644
--- a/main/bison/APKBUILD
+++ b/main/bison/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bison
-pkgver=3.6.4
+pkgver=3.7.2
pkgrel=0
pkgdesc="The GNU general-purpose parser generator"
arch="all"
@@ -14,7 +14,16 @@ checkdepends="bison flex"
source="https://ftp.gnu.org/gnu/bison/bison-$pkgver.tar.xz"
subpackages="$pkgname-doc"
+# secfixes:
+# 3.7.2-r0:
+# - CVE-2020-24240
+# - CVE-2020-24979
+# - CVE-2020-24980
+
build() {
+ # builders keep failing when -jN == nproc
+ export MAKEFLAGS="$MAKEFLAGS -j$((JOBS<4 ? JOBS : 4))"
+
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -22,11 +31,11 @@ build() {
--datadir=/usr/share \
--infodir=/usr/share/info \
--mandir=/usr/share/man
- make -j1
+ make
}
check() {
- make -j1 check
+ make check
}
package() {
@@ -35,4 +44,4 @@ package() {
rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
}
-sha512sums="041cd87f4ca6b012031719a49aa81e62d3c0817c6364289732e6a3cb9a0762498760e0f2ce84c03ca9e9b74eb74bdffd1b8b86d2b4a6e4a0d8c8a4b864b672dc bison-3.6.4.tar.xz"
+sha512sums="42eb501c246e9b4b24cb212c8da538b11b1944b997314105e67f88f22d73b7d00cf19b21e086aa7523630a2a24e1fd70a89d85a7e3003783990e08d31f711a27 bison-3.7.2.tar.xz"
diff --git a/main/bmd-tools/APKBUILD b/main/bmd-tools/APKBUILD
index 50364e3169..482eb62e9a 100644
--- a/main/bmd-tools/APKBUILD
+++ b/main/bmd-tools/APKBUILD
@@ -1,39 +1,29 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=bmd-tools
pkgver=1.0.2
-pkgrel=0
+pkgrel=2
pkgdesc="Tools for Blackmagic USB video encoders"
url="https://github.com/fabled/bmd-tools"
arch="all"
-license="GPL-2.0"
-depends=""
+license="MIT"
makedepends="libusb-dev"
-install=""
-subpackages=""
source="bmd-tools-$pkgver.tar.gz::https://github.com/fabled/bmd-tools/archive/v$pkgver.tar.gz
bmd-streamer.initd
bmd-streamer.confd
"
-builddir="$srcdir"/$pkgname-$pkgver
-
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
-
mkdir -p "$pkgdir"/usr/bin
install -s -m755 bmd-streamer bmd-extractfw \
"$pkgdir"/usr/bin
- install -m755 -D "$srcdir"/bmd-streamer.initd \
- "$pkgdir"/etc/init.d/bmd-streamer
- install -m755 -D "$srcdir"/bmd-streamer.confd \
- "$pkgdir"/etc/conf.d/bmd-streamer
+ install -Dm755 "$srcdir"/bmd-streamer.initd "$pkgdir"/etc/init.d/bmd-streamer
+ install -Dm644 "$srcdir"/bmd-streamer.confd "$pkgdir"/etc/conf.d/bmd-streamer
}
sha512sums="bcd6375c23541ef65e8cdf9222c94c4d90bf43976524987c0464b8570533efad15f955eac83e60651bc7295493f5f6f4322ac7a326df747ca88b626ad7654265 bmd-tools-1.0.2.tar.gz
diff --git a/main/bridge-utils/APKBUILD b/main/bridge-utils/APKBUILD
index 890bd41840..de77c9f2b4 100644
--- a/main/bridge-utils/APKBUILD
+++ b/main/bridge-utils/APKBUILD
@@ -1,24 +1,20 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bridge-utils
-pkgver=1.6
+pkgver=1.7
pkgrel=0
pkgdesc="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
-url="https://www.kernel.org/pub/linux/utils/net/bridge-utils/"
+url="https://wiki.linuxfoundation.org/networking/bridge/"
arch="all"
license="GPL-2.0-or-later"
subpackages="$pkgname-doc"
-depends=""
makedepends="autoconf linux-headers"
-source="https://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz"
-builddir="$srcdir"/$pkgname-$pkgver
-
+source="https://kernel.org/pub/linux/kernel/people/shemminger/bridge-utils/bridge-utils-$pkgver.tar.xz"
prepare() {
default_prepare
autoconf
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +23,10 @@ build() {
--libdir=/usr/lib \
--includedir=/usr/include
make
- test -x brctl/brctl
}
package() {
- cd "$builddir"
make install DESTDIR="$pkgdir"
}
-sha512sums="b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02 bridge-utils-1.6.tar.xz"
+sha512sums="e9bc27bddcc8cb644a7e02da615e262b42c8600e5aefa5f02771882be9e8a50b33e533b8711c8591be3397b323c10056103e611f620b92f344ce6f59d603d301 bridge-utils-1.7.tar.xz"
diff --git a/main/brotli/838.patch b/main/brotli/838.patch
new file mode 100644
index 0000000000..b3a100a662
--- /dev/null
+++ b/main/brotli/838.patch
@@ -0,0 +1,49 @@
+Upstream: Yes
+Reason: Fixes #11948
+From 092446fafb4bfb81738853b7c7f76b293cd92a80 Mon Sep 17 00:00:00 2001
+From: Evgenii Kliuchnikov <eustas.ru@gmail.com>
+Date: Wed, 2 Sep 2020 10:49:49 +0200
+Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)"
+
+This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
+---
+ scripts/libbrotlicommon.pc.in | 2 +-
+ scripts/libbrotlidec.pc.in | 2 +-
+ scripts/libbrotlienc.pc.in | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
+index 10ca969e..2a8cf7a3 100644
+--- a/scripts/libbrotlicommon.pc.in
++++ b/scripts/libbrotlicommon.pc.in
+@@ -7,5 +7,5 @@ Name: libbrotlicommon
+ URL: https://github.com/google/brotli
+ Description: Brotli common dictionary library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlicommon
++Libs: -L${libdir} -lbrotlicommon
+ Cflags: -I${includedir}
+diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
+index e7c3124f..6f8ef2e4 100644
+--- a/scripts/libbrotlidec.pc.in
++++ b/scripts/libbrotlidec.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlidec
+ URL: https://github.com/google/brotli
+ Description: Brotli decoder library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlidec
++Libs: -L${libdir} -lbrotlidec
+ Requires.private: libbrotlicommon >= 1.0.2
+ Cflags: -I${includedir}
+diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
+index 4dd0811b..2098afe2 100644
+--- a/scripts/libbrotlienc.pc.in
++++ b/scripts/libbrotlienc.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlienc
+ URL: https://github.com/google/brotli
+ Description: Brotli encoder library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlienc
++Libs: -L${libdir} -lbrotlienc
+ Requires.private: libbrotlicommon >= 1.0.2
+ Cflags: -I${includedir}
diff --git a/main/brotli/APKBUILD b/main/brotli/APKBUILD
index e7944f2b24..48f8df3462 100644
--- a/main/brotli/APKBUILD
+++ b/main/brotli/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: prspkt <prspkt@protonmail.com>
# Maintainer: prspkt <prspkt@protonmail.com>
pkgname=brotli
-pkgver=1.0.7
-pkgrel=5
+pkgver=1.0.9
+pkgrel=1
pkgdesc="Generic lossless compressor"
url="https://github.com/google/brotli"
arch="all"
@@ -12,6 +12,7 @@ subpackages="$pkgname-doc $pkgname-static $pkgname-dev $pkgname-libs py3-$pkgnam
source="$pkgname-$pkgver.tar.gz::https://github.com/google/brotli/archive/v$pkgver.tar.gz
optimize-mips-s390x.patch
build-tool-against-shared-lib.patch
+ 838.patch
"
prepare() {
@@ -50,6 +51,7 @@ py3() {
python3 setup.py install --prefix=/usr --root="$subpkgdir"
}
-sha512sums="a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a brotli-1.0.7.tar.gz
+sha512sums="b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5 brotli-1.0.9.tar.gz
59e934578ce23b703f8f25f56578f8e9fd1466a9844b6f67b542acd6496df352548e3762697dc3851cfd0f8e1bad170bfdaa3e8a87c901fe81e2f3042e3aee84 optimize-mips-s390x.patch
-f4a7653a0f7ef69f059d7f744a48c7731c8e66f977ce2e66cd106f697e82aa1f005923898d216a3d8be143b2dc8db1927c09daedb981818e752640a333d75fbc build-tool-against-shared-lib.patch"
+f4a7653a0f7ef69f059d7f744a48c7731c8e66f977ce2e66cd106f697e82aa1f005923898d216a3d8be143b2dc8db1927c09daedb981818e752640a333d75fbc build-tool-against-shared-lib.patch
+58ef677595f0db80b7d1353e42603cc30ef9b0b9530927f731ee31ac60ad9a3b2aac960a5cd100f8b10e547c9534e1ebf78c53550b52eed6fb3b7fb853317d20 838.patch"
diff --git a/main/busybox/0001-Revert-ash-jobs-Only-clear-gotsigchld-when-waiting-f.patch b/main/busybox/0001-Revert-ash-jobs-Only-clear-gotsigchld-when-waiting-f.patch
new file mode 100644
index 0000000000..69c55e1605
--- /dev/null
+++ b/main/busybox/0001-Revert-ash-jobs-Only-clear-gotsigchld-when-waiting-f.patch
@@ -0,0 +1,212 @@
+From e1ac00f597fa3f10dd1fe0e45bd9694e961ac248 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Mon, 27 Jul 2020 10:59:18 +0000
+Subject: [PATCH] Revert "ash: jobs: Only clear gotsigchld when waiting for
+ everything"
+
+This reverts commit 47eb979404735b9528538968cb5eaac7355a0c5a.
+---
+ shell/ash.c | 122 ++++++++++++++++++++++++++++------------------------
+ 1 file changed, 66 insertions(+), 56 deletions(-)
+
+diff --git a/shell/ash.c b/shell/ash.c
+index ecb9b132b..2214557a8 100644
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -3795,6 +3795,8 @@ static struct job *jobtab; //5
+ static unsigned njobs; //4
+ /* current job */
+ static struct job *curjob; //lots
++/* number of presumed living untracked jobs */
++static int jobless; //4
+
+ #if 0
+ /* Bash has a feature: it restores termios after a successful wait for
+@@ -4325,7 +4327,7 @@ wait_block_or_sig(int *status)
+ #endif
+
+ static int
+-waitone(int block, struct job *job)
++dowait(int block, struct job *job)
+ {
+ int pid;
+ int status;
+@@ -4426,6 +4428,10 @@ waitone(int block, struct job *job)
+ goto out;
+ }
+ /* The process wasn't found in job list */
++#if JOBS
++ if (!WIFSTOPPED(status))
++ jobless--;
++#endif
+ out:
+ INT_ON;
+
+@@ -4450,20 +4456,6 @@ waitone(int block, struct job *job)
+ return pid;
+ }
+
+-static int
+-dowait(int block, struct job *jp)
+-{
+- int pid = block == DOWAIT_NONBLOCK ? got_sigchld : 1;
+-
+- while (jp ? jp->state == JOBRUNNING : pid > 0) {
+- if (!jp)
+- got_sigchld = 0;
+- pid = waitone(block, jp);
+- }
+-
+- return pid;
+-}
+-
+ #if JOBS
+ static void
+ showjob(struct job *jp, int mode)
+@@ -4552,7 +4544,8 @@ showjobs(int mode)
+ TRACE(("showjobs(0x%x) called\n", mode));
+
+ /* Handle all finished jobs */
+- dowait(DOWAIT_NONBLOCK, NULL);
++ while (dowait(DOWAIT_NONBLOCK, NULL) > 0)
++ continue;
+
+ for (jp = curjob; jp; jp = jp->prev_job) {
+ if (!(mode & SHOW_CHANGED) || jp->changed) {
+@@ -4669,10 +4662,10 @@ waitcmd(int argc UNUSED_PARAM, char **argv)
+ #else
+ dowait(DOWAIT_BLOCK_OR_SIG, NULL);
+ #endif
+- /* if child sends us a signal *and immediately exits*,
+- * dowait() returns pid > 0. Check this case,
+- * not "if (dowait() < 0)"!
+- */
++ /* if child sends us a signal *and immediately exits*,
++ * dowait() returns pid > 0. Check this case,
++ * not "if (dowait() < 0)"!
++ */
+ if (pending_sig)
+ goto sigout;
+ #if BASH_WAIT_N
+@@ -4708,9 +4701,11 @@ waitcmd(int argc UNUSED_PARAM, char **argv)
+ job = getjob(*argv, 0);
+ }
+ /* loop until process terminated or stopped */
+- dowait(DOWAIT_BLOCK_OR_SIG, NULL);
+- if (pending_sig)
+- goto sigout;
++ while (job->state == JOBRUNNING) {
++ dowait(DOWAIT_BLOCK_OR_SIG, NULL);
++ if (pending_sig)
++ goto sigout;
++ }
+ job->waited = 1;
+ retval = getstatus(job);
+ repeat: ;
+@@ -5262,6 +5257,7 @@ forkchild(struct job *jp, union node *n, int mode)
+ #endif
+ for (jp = curjob; jp; jp = jp->prev_job)
+ freejob(jp);
++ jobless = 0;
+ }
+
+ /* Called after fork(), in parent */
+@@ -5272,8 +5268,13 @@ static void
+ forkparent(struct job *jp, union node *n, int mode, pid_t pid)
+ {
+ TRACE(("In parent shell: child = %d\n", pid));
+- if (!jp) /* jp is NULL when called by openhere() for heredoc support */
++ if (!jp) {
++ /* jp is NULL when called by openhere() for heredoc support */
++ while (jobless && dowait(DOWAIT_NONBLOCK, NULL) > 0)
++ continue;
++ jobless++;
+ return;
++ }
+ #if JOBS
+ if (mode != FORK_NOJOB && jp->jobctl) {
+ int pgrp;
+@@ -5352,39 +5353,48 @@ waitforjob(struct job *jp)
+
+ TRACE(("waitforjob(%%%d) called\n", jp ? jobno(jp) : 0));
+
+- /* In non-interactive shells, we _can_ get
+- * a keyboard signal here and be EINTRed, but we just loop
+- * inside dowait(), waiting for command to complete.
+- *
+- * man bash:
+- * "If bash is waiting for a command to complete and receives
+- * a signal for which a trap has been set, the trap
+- * will not be executed until the command completes."
+- *
+- * Reality is that even if trap is not set, bash
+- * will not act on the signal until command completes.
+- * Try this. sleep5intoff.c:
+- * #include <signal.h>
+- * #include <unistd.h>
+- * int main() {
+- * sigset_t set;
+- * sigemptyset(&set);
+- * sigaddset(&set, SIGINT);
+- * sigaddset(&set, SIGQUIT);
+- * sigprocmask(SIG_BLOCK, &set, NULL);
+- * sleep(5);
+- * return 0;
+- * }
+- * $ bash -c './sleep5intoff; echo hi'
+- * ^C^C^C^C <--- pressing ^C once a second
+- * $ _
+- * $ bash -c './sleep5intoff; echo hi'
+- * ^\^\^\^\hi <--- pressing ^\ (SIGQUIT)
+- * $ _
+- */
+- dowait(jp ? DOWAIT_BLOCK : DOWAIT_NONBLOCK, jp);
+- if (!jp)
++ if (!jp) {
++ int pid = got_sigchld;
++
++ while (pid > 0)
++ pid = dowait(DOWAIT_NONBLOCK, NULL);
++
+ return exitstatus;
++ }
++
++ while (jp->state == JOBRUNNING) {
++ /* In non-interactive shells, we _can_ get
++ * a keyboard signal here and be EINTRed,
++ * but we just loop back, waiting for command to complete.
++ *
++ * man bash:
++ * "If bash is waiting for a command to complete and receives
++ * a signal for which a trap has been set, the trap
++ * will not be executed until the command completes."
++ *
++ * Reality is that even if trap is not set, bash
++ * will not act on the signal until command completes.
++ * Try this. sleep5intoff.c:
++ * #include <signal.h>
++ * #include <unistd.h>
++ * int main() {
++ * sigset_t set;
++ * sigemptyset(&set);
++ * sigaddset(&set, SIGINT);
++ * sigaddset(&set, SIGQUIT);
++ * sigprocmask(SIG_BLOCK, &set, NULL);
++ * sleep(5);
++ * return 0;
++ * }
++ * $ bash -c './sleep5intoff; echo hi'
++ * ^C^C^C^C <--- pressing ^C once a second
++ * $ _
++ * $ bash -c './sleep5intoff; echo hi'
++ * ^\^\^\^\hi <--- pressing ^\ (SIGQUIT)
++ * $ _
++ */
++ dowait(DOWAIT_BLOCK, jp);
++ }
+
+ st = getstatus(jp);
+ #if JOBS
+--
+2.27.0
+
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index a361497b81..49a1fd7088 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,9 +1,10 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Contributor: Oliver Smith <ollieparanoid@postmarketos.org>
+# Contributor: Michal Artazov <michal@artazov.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
pkgver=1.32.0
-pkgrel=0
+pkgrel=3
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
@@ -15,7 +16,7 @@ checkdepends="zip"
provides="/bin/sh"
install="$pkgname.post-install $pkgname.post-upgrade
$pkgname-extras.post-install $pkgname-extras.pre-deinstall"
-subpackages="$pkgname-static $pkgname-doc $pkgname-suid $pkgname-extras ssl_client"
+subpackages="$pkgname-static $pkgname-doc $pkgname-suid $pkgname-extras ssl_client $pkgname-ifupdown"
options="suid !check"
replaces="busybox-initscripts" # move of default.script
triggers="busybox.trigger=/bin:/usr/bin:/sbin:/usr/sbin:/lib/modules/*"
@@ -33,6 +34,7 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
0009-depmod-support-generating-kmod-binary-index-files.patch
0010-Add-flag-for-not-following-symlinks-when-recursing.patch
0012-udhcpc-Don-t-background-if-n-is-given.patch
+ 0001-Revert-ash-jobs-Only-clear-gotsigchld-when-waiting-f.patch
acpid.logrotate
busyboxconfig
@@ -44,11 +46,11 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
"
# secfixes:
-# 1.30.1-r2:
-# - CVE-2019-5747
# 1.29.3-r10:
# - CVE-2018-20679
# - CVE-2019-5747
+# 1.28.3-r2:
+# - CVE-2018-1000500
# 1.27.2-r4:
# - CVE-2017-16544
# - CVE-2017-15873
@@ -209,6 +211,13 @@ ssl_client() {
"$subpkgdir"/usr/bin/ssl_client
}
+ifupdown() {
+ pkgdesc="placeholder package for busybox ifupdown"
+ provides="ifupdown-any"
+ provider_priority=200
+ mkdir -p "$subpkgdir"
+}
+
sha512sums="1b1227af69a97e820e28f5f1c62413e4e179202ab525725ea0b1afe9b9f9a5f00e5e32f4603e804ba1596b0fedd60d60457a6d2b8fcedfab45b6e049caeb319b busybox-1.32.0.tar.bz2
ead3403578c071c2216de17ab0543984c1f1509c12c062f03af49141547c3ea21356f3e8f0f0695550f05a41a1379dd73fc3cc18dcd78addbb411f247351e353 0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
@@ -224,9 +233,10 @@ e4be12a1453a306a58c4ea59cd8a0bf1f261514ae090ea962ac6f7609dc1e9dab0d4d8d351d7adf4
df02adb3e3cd3349cc8d070911e3392164cb2e30bd72cae7ceaa974b2db6f958fdcedf809abc7b4bee37c729a4d20abf127f615b0e238a667d572137abe6a79e 0009-depmod-support-generating-kmod-binary-index-files.patch
3b13ba6bd9b697e48864cb5376849c1ac95b30650e3e27605cc05edf4fdc1ecbb4c4503d4fe9012a581bcd660f6bb44d644575cf437d30423614cb83ee92c22c 0010-Add-flag-for-not-following-symlinks-when-recursing.patch
4d043999ffbf6875e6b28ffdb43a36dd5d37d51e862ed7d89c6007e38cdda056292c5322a3ac3189fd489bf3ad1cce7b20508a96aee55c09f09354e1c3f5f5fe 0012-udhcpc-Don-t-background-if-n-is-given.patch
+0121eb37ee6ace28802f39eddd3c758f459a5228882af57d362ecc49788e0aa068956913b5f78e7e91c15668286c95ea49f2aef28dc156b085524d616b8fe053 0001-Revert-ash-jobs-Only-clear-gotsigchld-when-waiting-f.patch
aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate
aef1c2efcf92375b8adeedfb805597442f3e888e72ca540af50e6001e88128952804b74b80de408a8b46b26a8257867e6219d6c6d74b9726ae24eff737b84992 busyboxconfig
-770d6c14a65ac2319081505f892519ffd46c228fd8e5e0b7908780fa162420851e86f4be514fd3aa152338ef6dac8743a3454acb988e46ba616ec11c00a00860 busyboxconfig-extras
+931e628184a25ae29760f7853c15c570dfb33075af167346e9662b9c7c5829e834ec81027bb10526c376261d229152bb096eb741cea0a5c0e3c614dd2c9d287e busyboxconfig-extras
0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c
b993ce589685d5d1f806153d0b7f71657f2d37556654ec60884130a40f09acc4944a13e0a4d02914000bedd779e5a35da08c760fed5f7ca5b601243aff7ba2c9 dad.if-up
646ad9aefe3596d0170d92c8506ca1846e43b5b83cbef97ae565f15ffa7b14665a8c7061bc69c608c043f834c134c5d63f042509f8999031e89163508a868e46 ssl_client.c
diff --git a/main/busybox/busyboxconfig-extras b/main/busybox/busyboxconfig-extras
index 877c9253c1..3b1d516724 100644
--- a/main/busybox/busyboxconfig-extras
+++ b/main/busybox/busyboxconfig-extras
@@ -21,8 +21,8 @@ CONFIG_LFS=y
CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_UTMP is not set
# CONFIG_FEATURE_WTMP is not set
-# CONFIG_FEATURE_PIDFILE is not set
-CONFIG_PID_FILE_PATH=""
+CONFIG_FEATURE_PIDFILE=y
+CONFIG_PID_FILE_PATH="/var/run"
CONFIG_BUSYBOX=y
# CONFIG_FEATURE_SHOW_SCRIPT is not set
CONFIG_FEATURE_INSTALLER=y
diff --git a/main/byacc/APKBUILD b/main/byacc/APKBUILD
index 29a8e7f2a2..feeb5bd79e 100644
--- a/main/byacc/APKBUILD
+++ b/main/byacc/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
pkgname=byacc
-pkgver=20200330
+pkgver=20200910
pkgrel=0
pkgdesc="The Berkeley Yacc general-purpose parser generator"
url="https://invisible-island.net/byacc/byacc.html"
@@ -29,4 +29,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="df8cc1aa550d633ab547a13a4f091d8c940a9a67b52dc5ecacad5b005fd54c3ceb1269593068c1a7949049e85b6e6eea20cffbbf4b408e049fde75c0ffe51f07 byacc-20200330.tgz"
+sha512sums="491bbde2d5b0fdf2ad57bec5080112ad7c12ce3830b5e14f2289092aad1addae6edd4698368a9c8d69219a95ae5fa47eb32a95a2625841915297972591bebea3 byacc-20200910.tgz"
diff --git a/main/ccache/APKBUILD b/main/ccache/APKBUILD
index 6d0681ce53..12b4bf7ca5 100644
--- a/main/ccache/APKBUILD
+++ b/main/ccache/APKBUILD
@@ -1,8 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ccache
-pkgver=3.7.10
-_pkgver=$pkgver
+pkgver=3.7.11
pkgrel=0
pkgdesc="A fast C/C++ compiler cache"
url="https://ccache.dev/"
@@ -46,4 +45,4 @@ package() {
done
}
-sha512sums="64b0d42af7fd2dfdda65668b04dbd16807a22324e336e61f6c6a91c00110fb535c7ac9062a9c14c924a7ddaf42247f69a43d83dd0fd187ce3b0737158b5bb8fc ccache-3.7.10.tar.xz"
+sha512sums="47b71b3ab4b89bf9b6f6d15941c22d2207b369922f51f9a8fbf4e86554325053dccce669e1c1ed3c0019a7e0a3d610f399e52d3fee68b56111aa7c1b24132c11 ccache-3.7.11.tar.xz"
diff --git a/main/cdparanoia/APKBUILD b/main/cdparanoia/APKBUILD
index 919b9720b6..5afc0c0b67 100644
--- a/main/cdparanoia/APKBUILD
+++ b/main/cdparanoia/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cdparanoia
pkgver=10.2
-pkgrel=8
+pkgrel=9
pkgdesc="An audio CD extraction application"
url="http://www.xiph.org/paranoia"
arch="all"
diff --git a/main/cdrkit/APKBUILD b/main/cdrkit/APKBUILD
deleted file mode 100644
index 2815925003..0000000000
--- a/main/cdrkit/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=cdrkit
-pkgver=1.1.11
-pkgrel=2
-pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction"
-url="http://cdrkit.org/"
-arch="all"
-options="!check" # No test suite.
-license="GPL-2.0"
-depends="file bzip2"
-makedepends="cmake libcap-dev bzip2-dev zlib-dev"
-subpackages="$pkgname-doc"
-source="https://dev.alpinelinux.org/archive/cdrkit/$pkgname-$pkgver.tar.gz"
-
-prepare() {
- cd "$builddir"
- # disable rcmd, it is security risk and not implemented in musl
- sed -i include/xconfig.h.in -e "s/#define HAVE_RCMD 1/#undef HAVE_RCMD/g"
- default_prepare
-}
-
-build() {
- cd "$builddir"
- case "$CLIBC" in
- musl) export CFLAGS="$CFLAGS -D__THROW=''" ;;
- esac
- make
-}
-
-package() {
- cd "$builddir"
- make PREFIX="$pkgdir/usr" install
- cd "$pkgdir/usr/bin"
- ln -s wodim cdrecord
- ln -s readom readcd
- ln -s genisoimage mkisofs
- ln -s genisoimage mkhybrid
- ln -s icedax cdda2wav
- cd "$pkgdir/usr/share/man/man1"
- ln -s wodim.1 cdrecord.1
- ln -s readom.1 readcd.1
- ln -s genisoimage.1 mkisofs.1
- ln -s genisoimage.1 mkhybrid.1
- ln -s icedax.1 cdda2wav.1
-}
-
-sha512sums="e5afcd2cb68d39aeff680a0d5b0a7877f94cf6de111b3cb7388261c665fbd3209ce98a20a01911875af7d6b832a156801b1fa46a4481f7c8ba60b22eac0a5b05 cdrkit-1.1.11.tar.gz"
diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD
index 47d2030379..66cdfbaa41 100644
--- a/main/chrony/APKBUILD
+++ b/main/chrony/APKBUILD
@@ -2,11 +2,9 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=chrony
-pkgver=3.5
-pkgrel=2
-_ver=${pkgver/_/-}
+pkgver=3.5.1
+pkgrel=1
pkgdesc="NTP client and server programs"
-options="!check" # line 82 of test/unit/util.c fails on all arches
url="https://chrony.tuxfamily.org"
pkgusers="$pkgname"
pkggroups="$pkgname"
@@ -16,7 +14,8 @@ install="$pkgname.pre-install $pkgname.pre-upgrade"
makedepends="asciidoctor libcap-dev texinfo"
checkdepends="bash"
subpackages="$pkgname-doc $pkgname-openrc"
-source="https://download.tuxfamily.org/chrony/chrony-$_ver.tar.gz
+source="https://download.tuxfamily.org/chrony/chrony-$pkgver.tar.gz
+ fix-util-unit-test-for-NTP-era-split.patch
fix-tests.patch
max_resolve_interval.patch
@@ -25,6 +24,11 @@ source="https://download.tuxfamily.org/chrony/chrony-$_ver.tar.gz
chrony.conf
timepps.h
"
+
+# secfixes:
+# 3.5.1-r0:
+# - CVE-2020-14367
+
prepare() {
default_prepare
@@ -77,7 +81,8 @@ package() {
touch "$pkgdir"/var/lib/chrony/chrony.drift
}
-sha512sums="c4f6376a44d71b6ac2b6d86e3d6fb4348642faeef7f3f3a4d6431627b5645efcc868b005cc398c8292bc3b63a1161fbd1a042c6ac2a0595843f908fe32eed90c chrony-3.5.tar.gz
+sha512sums="489cf614bfb2c1e024343af1316c339b287ed5c7b6cec15b44ef3d90512036fb1da3fd627d291a193c59d9c5c095afa66c529eeb6fd0c1bbc8256ed8873b7984 chrony-3.5.1.tar.gz
+de2cde80fcd7ae1f064420b1b01e739b53a3d4ecc38afd832ff9911a4a4ae4bbc455ecb23a815d55e893069e7926b8ae2006cc0194d69387ccc3efee7043df7a fix-util-unit-test-for-NTP-era-split.patch
067d47224a8c075ec8f63ffc58e65b030fdf228a72c4f03d50a2f2c17414da65bb5d27c7c2e4ba99e909f452041db83eaebe3c9e34c0c8fce18e05ebb489735e fix-tests.patch
b26581ed32680585edea5b8163a0062a87f648394c0f363c77a7d01a36608fcf4d005d9e6ab179ed2827b8a08f598f7bad4801bb5e135cad5107eb77fb19b247 max_resolve_interval.patch
0490770cc214b4ccf76470420e0b33e6c41ad16344d6503973a28346b002e2cee441e9ae982be1a8f21696da26f436f2ce36a5201e9628becb83bad3487d9170 chronyd.confd
diff --git a/main/chrony/fix-util-unit-test-for-NTP-era-split.patch b/main/chrony/fix-util-unit-test-for-NTP-era-split.patch
new file mode 100644
index 0000000000..28a6545d5f
--- /dev/null
+++ b/main/chrony/fix-util-unit-test-for-NTP-era-split.patch
@@ -0,0 +1,38 @@
+From 2d9eb5b6fa5225a7300c8eed95712969249900fb Mon Sep 17 00:00:00 2001
+From: Miroslav Lichvar <mlichvar@redhat.com>
+Date: Fri, 3 Jan 2020 11:25:55 +0100
+Subject: [PATCH] test: fix util unit test for NTP era split
+
+The current default NTP era split passed the Unix epoch (~50 years ago),
+which means the epoch converted to an NTP timestamp and back ends up in
+the next NTP era (year 2106).
+
+Fix the test to take into account the era split.
+---
+ test/unit/util.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/test/unit/util.c b/test/unit/util.c
+index f4d9f33..af9e90c 100644
+--- a/test/unit/util.c
++++ b/test/unit/util.c
+@@ -100,11 +100,19 @@ void test_unit(void) {
+ ntp_ts.hi = htonl(JAN_1970);
+ ntp_ts.lo = 0xffffffff;
+ UTI_Ntp64ToTimespec(&ntp_ts, &ts);
++#if defined(HAVE_LONG_TIME_T) && NTP_ERA_SPLIT > 0
++ TEST_CHECK(ts.tv_sec == 0x100000000LL * (1 + (NTP_ERA_SPLIT - 1) / 0x100000000LL));
++#else
+ TEST_CHECK(ts.tv_sec == 0);
++#endif
+ TEST_CHECK(ts.tv_nsec == 999999999);
+
+ UTI_AddDoubleToTimespec(&ts, 1e-9, &ts);
++#if defined(HAVE_LONG_TIME_T) && NTP_ERA_SPLIT > 0
++ TEST_CHECK(ts.tv_sec == 1 + 0x100000000LL * (1 + (NTP_ERA_SPLIT - 1) / 0x100000000LL));
++#else
+ TEST_CHECK(ts.tv_sec == 1);
++#endif
+ TEST_CHECK(ts.tv_nsec == 0);
+
+ ntp_fuzz.hi = 0;
diff --git a/main/cifs-utils/APKBUILD b/main/cifs-utils/APKBUILD
index df7ee1e804..2642d36255 100644
--- a/main/cifs-utils/APKBUILD
+++ b/main/cifs-utils/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=cifs-utils
-pkgver=6.10
-pkgrel=1
+pkgver=6.11
+pkgrel=0
pkgdesc="CIFS filesystem user-space tools"
url="https://wiki.samba.org/index.php/LinuxCIFS_utils"
arch="all"
@@ -16,6 +16,10 @@ source="https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-$pkgver.tar.b
path-install.patch"
options="suid"
+# secfixes:
+# 6.11-r0:
+# - CVE-2020-14342 (Not affected, requires --with-systemd)
+
prepare() {
default_prepare
autoreconf -i
@@ -40,7 +44,7 @@ package() {
chmod +s $pkgdir/sbin/mount.cifs
}
-sha512sums="e19ca69b7948f01c1fd6a4ed069e00511588b903a5b8b0dc35ac1e00743170b9ca180b747c47d56cfacf273b296da21df60e1957404f26ebf2ba80bfa7e275cc cifs-utils-6.10.tar.bz2
+sha512sums="064c0ac75572fb44908390508462e4fdfe0686751149fd8b656a209dd961a5a24a7d9774c38c0e72fa5f9875b43aea7bf2de038c4e4a63a11664e71d9003100e cifs-utils-6.11.tar.bz2
99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch
2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch
2c44eab140eec13f4e6c36c1fd3d0961af01baa867b16011fb2241718eb1c785660bd874dc845213161e058341cee6fd5fdb7487b7f7731cf1886fd73597924d path-install.patch"
diff --git a/main/cjdns/0001-seccomp-handle-__NR_clock_gettime64-when-appropriate.patch b/main/cjdns/0001-seccomp-handle-__NR_clock_gettime64-when-appropriate.patch
new file mode 100644
index 0000000000..c220b94ad4
--- /dev/null
+++ b/main/cjdns/0001-seccomp-handle-__NR_clock_gettime64-when-appropriate.patch
@@ -0,0 +1,31 @@
+From 6821900ac6bcb722ff5220ee1ea1152a22f2e148 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 22 Jul 2020 03:12:04 -0600
+Subject: [PATCH] seccomp: handle __NR_clock_gettime64 when appropriate
+
+---
+ util/Seccomp.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/util/Seccomp.c b/util/Seccomp.c
+index c2f87e93..eb6609aa 100644
+--- a/util/Seccomp.c
++++ b/util/Seccomp.c
+@@ -262,7 +262,13 @@ static Er_DEFUN(struct sock_fprog* mkFilter(struct Allocator* alloc))
+ // older versions need system calls for getting the time.
+ // i686 glibc-2.18's time() uses __NR_time
+ // Raspberry Pi and BeagleBone Black don't provide __NR_time
+- IFEQ(__NR_clock_gettime, success),
++ // 32-bit systems with 64-bit time_t use __NR_clock_gettime64
++ #ifdef __NR_clock_gettime64
++ IFEQ(__NR_clock_gettime64, success),
++ #endif
++ #ifdef __NR_clock_gettime
++ IFEQ(__NR_clock_gettime, success),
++ #endif
+ #ifdef __NR_time
+ IFEQ(__NR_time, success),
+ #endif
+--
+2.27.0
+
diff --git a/main/cjdns/APKBUILD b/main/cjdns/APKBUILD
index 7ab62ebf39..daafa31343 100644
--- a/main/cjdns/APKBUILD
+++ b/main/cjdns/APKBUILD
@@ -12,7 +12,8 @@ makedepends="nodejs python3 linux-headers libseccomp-dev"
install="$pkgname.post-install"
subpackages="$pkgname-doc $pkgname-openrc"
source="$pkgname-$pkgver.tar.gz::https://github.com/cjdelisle/cjdns/archive/cjdns-v$pkgver.tar.gz
- no-march-flag.patch"
+ no-march-flag.patch
+ 0001-seccomp-handle-__NR_clock_gettime64-when-appropriate.patch"
builddir="$srcdir/$pkgname-$pkgname-v$pkgver"
@@ -44,4 +45,5 @@ package() {
}
sha512sums="db103e70e3d9f5e4958dcbeed51df358450f9489b6573f9b9eddc1839ee2051fe5180eede894b465e92915fabcb4cb64ce08a41c06450f14de75943879633f25 cjdns-20.7.tar.gz
-0c487a46609b75408d83cee954fc49f47997f0e9ee2bb8f64c3edc7e67273e5e90b4b2028847e09faa4bd1310b82f1a86fa7d0d0c42f18510cc9dcd4bccb8808 no-march-flag.patch"
+0c487a46609b75408d83cee954fc49f47997f0e9ee2bb8f64c3edc7e67273e5e90b4b2028847e09faa4bd1310b82f1a86fa7d0d0c42f18510cc9dcd4bccb8808 no-march-flag.patch
+33f78eed9ee8d417c8f055a1dc5e0c38ebaee2e7a87a6218ac9e58cefb9a5498821c10a68c2ced4fe4a3c19df22bdae97217db5da70ec253adb343a0b9111802 0001-seccomp-handle-__NR_clock_gettime64-when-appropriate.patch"
diff --git a/main/ckbcomp/APKBUILD b/main/ckbcomp/APKBUILD
index 7b2080a5f6..b822fa6aee 100644
--- a/main/ckbcomp/APKBUILD
+++ b/main/ckbcomp/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ckbcomp
-pkgver=1.195
+pkgver=1.196
pkgrel=0
pkgdesc="Compile a XKB keyboard description to a keymap"
url="http://anonscm.debian.org/cgit/d-i/console-setup.git"
@@ -10,11 +10,11 @@ depends="perl"
options="!check"
subpackages="$pkgname-doc"
source="http://ftp.debian.org/debian/pool/main/c/console-setup/console-setup_$pkgver.tar.xz"
-builddir="$srcdir"/console-setup
+builddir="$srcdir"/console-setup-$pkgver
package() {
install -D -m755 Keyboard/$pkgname $pkgdir/usr/bin/$pkgname
install -D -m644 man/$pkgname.1 $pkgdir/usr/share/man/man1/$pkgname.1
}
-sha512sums="f9ee8df45cfb78dea12b1ba3020e32f245dd940bc1d22801849f673f4448853c0ebadb6944a92b462e3e56c59ee13fd6d2130c260a1a406e1bb1c72e9902c04d console-setup_1.195.tar.xz"
+sha512sums="f100cdf2226cdad94c595ca269e65155b52ec23996f2fee8d4916f7a414c7a6f70ae51e9ba2d3c7ae4a93a8830ee2e3eb2f1d09c636f49005d54d52ec674e938 console-setup_1.196.tar.xz"
diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index ffde264aff..049f1a2b4d 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=clamav
-pkgver=0.102.3
+pkgver=0.103.0
pkgrel=0
pkgusers="clamav"
pkggroups="clamav"
@@ -18,7 +18,7 @@ install="freshclam.pre-install
makedepends="ncurses-dev zlib-dev bzip2-dev pcre-dev linux-headers $depends_dev
libmilter-dev fts-dev curl-dev autoconf automake libtool"
subpackages="$pkgname-doc $pkgname-dev $pkgname-libunrar $pkgname-libs
- $pkgname-daemon $pkgname-scanner $pkgname-db::noarch freshclam
+ $pkgname-daemon $pkgname-clamdscan $pkgname-scanner $pkgname-db::noarch freshclam
$pkgname-daemon-openrc:daemon_rc:noarch freshclam-openrc:freshclam_rc:noarch
$pkgname-milter"
source="https://www.clamav.net/downloads/production/clamav-$pkgver.tar.gz
@@ -32,11 +32,12 @@ source="https://www.clamav.net/downloads/production/clamav-$pkgver.tar.gz
# secfixes:
+# 0.102.4-r0:
+# - CVE-2020-3350
+# - CVE-2020-3481
# 0.102.3-r0:
# - CVE-2020-3327
# - CVE-2020-3341
-# 0.102.2-r0:
-# - CVE-2020-3123
# 0.102.1-r0:
# - CVE-2020-3123
# 0.102.0-r0:
@@ -198,10 +199,18 @@ scanner() {
"$subpkgdir"/usr/bin/
}
+clamdscan() {
+ pkgdesc="ClamAV daemon client"
+ depends="openssl"
+ mkdir -p "$subpkgdir"/usr/bin/
+ mv "$pkgdir"/usr/bin/clamdscan \
+ "$subpkgdir"/usr/bin/
+}
+
daemon() {
pkgdesc="ClamAV daemon scanner"
replaces="clamav"
- depends="freshclam"
+ depends="freshclam $pkgname-clamdscan"
mkdir -p "$subpkgdir"/usr/bin \
"$subpkgdir"/usr/sbin \
"$subpkgdir"/etc/clamav
@@ -214,8 +223,6 @@ daemon() {
"$subpkgdir"/usr/sbin/
mv "$pkgdir"/usr/bin/clamdtop \
"$subpkgdir"/usr/bin/
- mv "$pkgdir"/usr/bin/clamdscan \
- "$subpkgdir"/usr/bin/
mv "$pkgdir"/etc/clamav/clamd.conf.sample \
"$subpkgdir"/etc/clamav/clamd.conf
install -m644 -D "$srcdir"/clamd.logrotate \
@@ -245,10 +252,10 @@ milter() {
"$subpkgdir"/etc/clamav/clamav-milter.conf
}
-sha512sums="d239718814b303fb0f1655d9bdaf3675d888eea57e786d927eafabb7b6f58cd7f5fb7dc149511c2af6f800dcc919f2e1d6954110d45b9e16619c632e8d2b37f2 clamav-0.102.3.tar.gz
-ed81be79bf9a25eec071312252121cc76c96838407377b75077bf94922055f1de99f327982ac4dccd5be85003baa95385e5d002fabab32bb851bb30178475edd clamd.initd
+sha512sums="e0712ed3c068dc8dab1d31b7cbc19cd69c62875fdcf314abb28e6f42660daf162a3aae69e0a008919e7b809675b68d35f79d3cb98379442bcbc6f5c8ee4313bf clamav-0.103.0.tar.gz
+d886d810de66e8da800384c1e8192f7da4352402ffc3b33cfbca93d81a2235d8c902ca9d436b9be70f00740b4555e1efbf09bf9f84059095a1a297b27581cd20 clamd.initd
59c561b3dcb0b616b647cd8e4ebc46a2cc5e7144c8c7ea0054cc1c3021d1da8f67e4dad5c083c3fe712ed887aaabfca91b538f4759537e7c4c9ab71ba4fd5794 clamd.confd
-00daed8afb67a6e4a29893340246c8840cce970dd9103d26557ecdd26ef60b12551d2291c214fc657faaaa339484052079347411b0cad65e3a33ece56d57cf16 freshclam.initd
+6f0c615b89f0f0d2f0e9f965f025b9ac8c81b2168fa6727dc8a47222abd780f9b656732f289d6061a20126b16126a975d50e8b3b8ff131f55dd8803da8be5dec freshclam.initd
ba181fe1abaac7b898ccb40b0713455aa3c9d5e25ad21d687b6cac09b0105b9e376526e7c776a44636234d8db819709d8d6a6cc76119bc3e98b637b1a3f26c08 freshclam.confd
3ae493dd1610a819402c015f6b8c0f080f926b72dc43d2bded60030bf6a55040e4b88e0f64d3aae299dc1133d7e1b89855e7346b4665a64e8b82592f7b75cf6a clamd.logrotate
30cff378bc28c76b795e00c92ae5ee623f3abe4a19bed61dd8403c96e72658bb02b7f040d26a6258104af754464d25ea7d9646918c4b47d2ba9a8cbf4687056c freshclam.logrotate"
diff --git a/main/clamav/clamd.initd b/main/clamav/clamd.initd
index 5511a5666d..c38868a5c4 100755
--- a/main/clamav/clamd.initd
+++ b/main/clamav/clamd.initd
@@ -76,9 +76,10 @@ logfix() {
local clamav_user=`awk '$1 == "User" { print $2 }' $CONF`
if [ -n "${logfile}" ] && [ -n "${clamav_user}" ]; then
if [ ! -f "${logfile}" ]; then
- touch ${logfile}
+ checkpath -Fm 0640 -o ${clamav_user} ${logfile}
+ else
+ chmod 640 ${logfile}
+ chown ${clamav_user} ${logfile}
fi
- chown ${clamav_user} ${logfile}
- chmod 640 ${logfile}
fi
}
diff --git a/main/clamav/freshclam.initd b/main/clamav/freshclam.initd
index 279b529066..6589da0bca 100644
--- a/main/clamav/freshclam.initd
+++ b/main/clamav/freshclam.initd
@@ -45,9 +45,10 @@ logfix() {
local freshclam_user=$(awk '$1 == "DatabaseOwner" { print $2 }' $CONF)
if [ -n "${logfile}" -a -n "${clamav_user}" ]; then
if [ ! -f "${logfile}" ]; then
- touch ${logfile}
+ checkpath -fm 0640 ${logfile}
+ else
+ chmod 640 ${logfile}
fi
chown ${freshclam_user} ${logfile}
- chmod 640 ${logfile}
fi
}
diff --git a/main/clang/APKBUILD b/main/clang/APKBUILD
index c05cde053f..dd491ff703 100644
--- a/main/clang/APKBUILD
+++ b/main/clang/APKBUILD
@@ -4,8 +4,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=clang
# Note: Update together with llvm.
-pkgver=10.0.0
-pkgrel=3
+pkgver=10.0.1
+pkgrel=0
_llvmver=${pkgver%%.*}
pkgdesc="A C language family front-end for LLVM"
arch="all"
@@ -156,8 +156,8 @@ python() {
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
}
-sha512sums="b1cccc13c46abcda3d689f51d486fa613ecec40c581c72d8b15951715100a2b8fb24370161601e6716cdba5a784337439e99ec2f0766f988e9cce92de6d775da clang-10.0.0.src.tar.xz
-33b6019e64e9ac94bd7c000b77a4a927602a2705baa9b370e392a56b53fe09c8dad1ff7d583892729e9eb291440433ad7d71df768a96d927e4dbc1988fc01d99 clang-tools-extra-10.0.0.src.tar.xz
+sha512sums="c6712d491ce5e166ef72724cf855d742d88da825ffc25585612d7f2eb7770343e3ae48fa78e0af3e5d5efdde3a9686a7361dac3b546a4378de22448ea6e4026c clang-10.0.1.src.tar.xz
+7833197fd1f6d65e8f1fa1c169844a40e8b64f6a5cff984b29333d92527dcef532749907df2ea35b20643898baa0f49bb64b03e4ef54f9a3c4dd77bf1750a634 clang-tools-extra-10.0.1.src.tar.xz
533558863dc7247202b2a739e1bd2d81a99a16be329370cb734d338284b5408ecd14fe78ac836aaf922e377334b7a3ebef532cf8395d91aafe346bf71eb8b7fc 10-add-musl-triples.patch
a8557c5a26774bf98548b9fe77cd54a1b0591bc75beffcb5fbd070986ba954d82255dddbcfcc884c07c3f433b1428c2a6ce649c3a158f4352f30e7057872335b 20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
c7f34b425b0dcea9752eeb7ff3d3a33af9cc45740fd3e77d52e4d610c5fd3daaa4d59138a255b057ef886915615a77ec1e6a447f3818b4b2724129c0ba354932 30-fix-python-shebangs.patch
diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD
index 79b2930dc9..baf9e40b0e 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.17.3
+pkgver=3.18.3
pkgrel=0
pkgdesc="Cross-platform, open-source make system"
url="https://www.cmake.org/"
@@ -11,7 +11,7 @@ makedepends="bzip2-dev curl-dev expat-dev libarchive-dev linux-headers
libuv-dev ncurses-dev rhash-dev xz-dev zlib-dev"
options="!check"
checkdepends="file musl-utils"
-subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch
+subpackages="$pkgname-doc $pkgname-bash-completion
"
case $pkgver in
*.*.*.*) _v=v${pkgver%.*.*};;
@@ -56,14 +56,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-bashcomp() {
- depends=""
- pkgdesc="Bash completions for $pkgname"
- install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
- mkdir -p "$subpkgdir"/usr/share/bash-completion
- mv "$pkgdir"/usr/share/cmake/completions \
- "$subpkgdir"/usr/share/bash-completion/
-}
-
-sha512sums="13479bd48ef8a8c95277a62b4f42e63152a5979292a98b5456022ca42ad3963cad75e917cc8b92a8485dbf5a2b59cde3fdc90fd9abdb806bc97c8570d03c1c69 cmake-3.17.3.tar.gz"
+sha512sums="28c0c310b6cd8117d4a8b9ad60064b22b00bdc170303b190994e9a3d4fe83fbd9cae6c8f36da62faf6c356b5acf430c78878f19210386ec26844b56334d3941e cmake-3.18.3.tar.gz"
diff --git a/main/compiler-rt/APKBUILD b/main/compiler-rt/APKBUILD
index 55467b4717..910418b77b 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=10.0.0
+pkgver=10.0.1
pkgrel=0
_llvmver=${pkgver%%.*}
pkgdesc="LLVM compiler-rt runtime libraries"
@@ -72,5 +72,5 @@ package() {
esac
}
-sha512sums="c4a25d1e922a051c78255aec9fd525acbbcaa62cc53161ed6979b21a0d91301d3c2c07ca1b6460f1c4d6656c29373ff0c20d5496955ed0a0b26d7eebbf159ec4 compiler-rt-10.0.0.src.tar.xz
-7dc961aacee3a01ecc002ff2b688a2ef50661856d2abd5ecc90566ffcad7566e4976736cd339ea96592e452cd5a17aaceba9712b2effec805661cca8ff020ee7 llvm-10.0.0.src.tar.xz"
+sha512sums="a1d2e3f5ad529a04f87059903b31fc3c9803cd86f44aed1aebd87ce7e423d8dd2b6776be12e85a0374a6215f581420438d224c130aad5e6355920af32c02aa7b compiler-rt-10.0.1.src.tar.xz
+cf34d037c1684d09e7e38d5fc131714eac93c78353d6186b2f806a8fb22dcae0f4748ce22d6faf178c95cfcf20bdc3fa7c5238518a154b3112781f5ab70edaa4 llvm-10.0.1.src.tar.xz"
diff --git a/main/conky/APKBUILD b/main/conky/APKBUILD
index 11635a1bf2..063ab2ad52 100644
--- a/main/conky/APKBUILD
+++ b/main/conky/APKBUILD
@@ -1,25 +1,23 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=conky
-pkgver=1.11.5
-pkgrel=1
+pkgver=1.11.6
+pkgrel=0
pkgdesc="An advanced, highly configurable system monitor for X based on torsmo"
url="http://conky.sourceforge.net/"
arch="all"
license="custom"
makedepends="alsa-lib-dev libxml2-dev curl-dev wireless-tools-dev
libxft-dev glib-dev libxdamage-dev libxext-dev imlib2-dev lua5.3-dev
- cairo-dev tolua++ ncurses-dev linux-headers cmake gawk libxinerama-dev"
+ cairo-dev tolua++ ncurses-dev linux-headers cmake gawk libxinerama-dev"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/brndnmtthws/conky/archive/v$pkgver.tar.gz"
prepare() {
- cd "$builddir"
sed -i -e '32 iinclude(CheckIncludeFile)' CMakeLists.txt
default_prepare
}
build() {
- cd "$builddir"
cmake . \
-DRELEASE=ON \
-DCMAKE_BUILD_TYPE=None \
@@ -36,9 +34,8 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
}
-sha512sums="71ba02acc879dad3c240ed9a38635cb2d30e3c9ac849012ff3db53f8143c28d6cc9e502816834b0a073f7486bded7cea002b58c3bb8e189e542afb1070bb84be conky-1.11.5.tar.gz"
+sha512sums="f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a conky-1.11.6.tar.gz"
diff --git a/main/consolekit2/0001-busybox-reboot-and-poweroff-support.patch b/main/consolekit2/0001-busybox-reboot-and-poweroff-support.patch
deleted file mode 100644
index 2db9f032bd..0000000000
--- a/main/consolekit2/0001-busybox-reboot-and-poweroff-support.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5e557dd212657f7e75a0c4bd70d11ca06ccb3f84 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 4 Apr 2011 18:46:25 +0000
-Subject: [PATCH] busybox reboot and poweroff support
-
----
- tools/linux/ck-system-restart | 3 +++
- tools/linux/ck-system-stop | 3 +++
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/tools/linux/ck-system-restart b/tools/linux/ck-system-restart
-index 8e0664e..5cabb3d 100755
---- a/tools/linux/ck-system-restart
-+++ b/tools/linux/ck-system-restart
-@@ -7,6 +7,9 @@ if [ -x "/sbin/shutdown" ] ; then
- elif [ -x "/usr/sbin/shutdown" ] ; then
- /usr/sbin/shutdown -r now
- exit $?
-+elif [ -x "/sbin/reboot" ]; then
-+ /sbin/reboot
-+ exit $?
- else
- exit 1
- fi
-diff --git a/tools/linux/ck-system-stop b/tools/linux/ck-system-stop
-index e26bca3..a0be3ac 100755
---- a/tools/linux/ck-system-stop
-+++ b/tools/linux/ck-system-stop
-@@ -7,6 +7,9 @@ if [ -x "/sbin/shutdown" ] ; then
- elif [ -x "/usr/sbin/shutdown" ] ; then
- /usr/sbin/shutdown -h now
- exit $?
-+elif [ -x "/sbin/poweroff" ] ; then
-+ /sbin/poweroff
-+ exit $?
- else
- exit 1
- fi
---
-1.7.4.2
diff --git a/main/consolekit2/APKBUILD b/main/consolekit2/APKBUILD
deleted file mode 100644
index 9dfbc55fbb..0000000000
--- a/main/consolekit2/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Bart Ribbers <bribbers@disroot.org>
-# Maintainer: Bart Ribbers <bribbers@disroot.org>
-pkgbase=ConsoleKit2
-pkgname=consolekit2
-pkgver=1.2.1
-pkgrel=1
-pkgdesc="A framework for defining and tracking users, login sessions, and seats"
-provides="consolekit=$pkgver"
-replaces=consolekit
-arch=all
-url="https://consolekit2.github.io/ConsoleKit2"
-license=GPL2
-depends="polkit eudev"
-makedepends="git automake autoconf gettext-dev glib-dev zlib-dev libxslt-dev
- polkit-dev eudev-dev libdrm-dev libnih-dev libtool xorg-server-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz
- 0001-busybox-reboot-and-poweroff-support.patch
- pam-foreground-compat.ck"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-builddir="$srcdir"/$pkgbase-$pkgver
-options="!check" #no testsuite provided
-
-prepare() {
- default_prepare
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd "$builddir"
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --disable-static
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
- install -m 755 "$srcdir"/pam-foreground-compat.ck \
- "$pkgdir"/usr/lib/ConsoleKit/run-session.d/
-}
-sha512sums="b62a43b2748b9302b86847a3c4c84f931d7df9fef028dffbad091dd7b176c57109adec65e49f9f8a3c5e5e03a5d9b29f8b96e3328f9b9bfb32fd767fceecde81 consolekit2-1.2.1.tar.gz
-ec0c88e640afac0561c84131d63fa8c9e2e29611b789ae5c163cd11465b22017602d88dc853866624f57bce2ee466ab63af075d083a9ba6e87327ad8d0a0769f 0001-busybox-reboot-and-poweroff-support.patch
-3b114fbbe74cfba0bfd4dad0eb1b85d08b4979a998980c1cbcd7f44b8a16b0ceca224680d4f4a1644cd24698f8817e5e8bdfcdc4ead87a122d0e323142f47910 pam-foreground-compat.ck"
diff --git a/main/consolekit2/pam-foreground-compat.ck b/main/consolekit2/pam-foreground-compat.ck
deleted file mode 100644
index c9255503c4..0000000000
--- a/main/consolekit2/pam-foreground-compat.ck
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-TAGDIR=/var/run/console
-
-[ -n "$CK_SESSION_USER_UID" ] || exit 1
-[ "$CK_SESSION_IS_LOCAL" = "true" ] || exit 0
-
-TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`"
-
-if [ "$1" = "session_added" ]; then
- mkdir -p "$TAGDIR"
- echo "$CK_SESSION_ID" >> "$TAGFILE"
-fi
-
-if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then
- sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE"
- [ -s "$TAGFILE" ] || rm -f "$TAGFILE"
-fi
diff --git a/main/coova-chilli/APKBUILD b/main/coova-chilli/APKBUILD
index bb5d2854f8..4c19b696f5 100644
--- a/main/coova-chilli/APKBUILD
+++ b/main/coova-chilli/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=coova-chilli
pkgver=1.4
-pkgrel=2
+pkgrel=3
pkgdesc="CoovaChilli is an open source access controller for wireless LAN"
url="http://www.coova.org/"
arch="all"
@@ -70,10 +70,10 @@ check() {
package() {
make DESTDIR="$pkgdir" install
- install -D -m755 "$srcdir"/chilli.initd $pkgdir/etc/init.d/chilli
- install -D -m755 "$srcdir"/chilli.confd $pkgdir/etc/conf.d/chilli
- mkdir -p $pkgdir/var/run/chilli
- chown -R $pkgusers:$pkggroups $pkgdir/var/run/chilli
+
+ install -Dm755 "$srcdir"/chilli.initd "$pkgdir"/etc/init.d/chilli
+ install -Dm644 "$srcdir"/chilli.confd "$pkgdir"/etc/conf.d/chilli
+ install -d -o $pkgusers -g $pkggroups "$pkgdir"/var/run/chilli
}
sha512sums="2ee31731c59af0f4282255a76ef045e9f37dc85da6d18a374154ae5cc690dc485acae2d83372bf48d9326db53292603d69b0093e845b4d08b26d2586455590c5 coova-chilli-1.4.tar.gz
diff --git a/main/cracklib/APKBUILD b/main/cracklib/APKBUILD
index ce595e25f5..814eebe04b 100644
--- a/main/cracklib/APKBUILD
+++ b/main/cracklib/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=cracklib
pkgver=2.9.7
-pkgrel=2
+pkgrel=4
pkgdesc="A library used to enforce strong passwords"
url="https://github.com/cracklib/cracklib"
arch="all"
@@ -11,7 +11,9 @@ triggers="$pkgname.trigger=/usr/share/cracklib"
makedepends="zlib-dev"
subpackages="$pkgname-dev $pkgname-words::noarch"
source="https://github.com/cracklib/cracklib/releases/download/v$pkgver/cracklib-$pkgver.tar.bz2
- https://github.com/cracklib/cracklib/releases/download/v$pkgver/cracklib-words-$pkgver.gz"
+ https://github.com/cracklib/cracklib/releases/download/v$pkgver/cracklib-words-$pkgver.gz
+ fix-trigger-warning.patch
+ "
# secfixes:
# 2.9.7-r0:
@@ -53,4 +55,5 @@ words() {
}
sha512sums="f6bf65ac092ba46ff78ddbc115692260fb76dc71219cd679d2ea935ebfb9e709fbb30259a7406743ed00dbdc415335b3ac9d9fcba1d204ea36d5eb96bf1333a2 cracklib-2.9.7.tar.bz2
-1fa34b0a2e16d6906982b248f1757bf5bf8154d8d7e8bab94a4ac25080c41434d3828a2c8dd5065e9be586f36480ab70375f09e0bb64eb495d96a460619e2bae cracklib-words-2.9.7.gz"
+1fa34b0a2e16d6906982b248f1757bf5bf8154d8d7e8bab94a4ac25080c41434d3828a2c8dd5065e9be586f36480ab70375f09e0bb64eb495d96a460619e2bae cracklib-words-2.9.7.gz
+f9cececd7ba4636bc5d2b9b2acf7c40563a32c1725f6bdcc0f7604ecc4c8cb31656972bfb17a302427bb17b5b8be24c44fd3fd9e1a891745c02f3243e0087216 fix-trigger-warning.patch"
diff --git a/main/cracklib/cracklib.trigger b/main/cracklib/cracklib.trigger
index 4aa0da2104..0ac0d3840a 100644
--- a/main/cracklib/cracklib.trigger
+++ b/main/cracklib/cracklib.trigger
@@ -1,3 +1,3 @@
#!/bin/sh
-create-cracklib-dict /usr/share/cracklib/*.gz
+create-cracklib-dict /usr/share/cracklib/*.gz >/dev/null
diff --git a/main/cracklib/fix-trigger-warning.patch b/main/cracklib/fix-trigger-warning.patch
new file mode 100644
index 0000000000..21ec638b27
--- /dev/null
+++ b/main/cracklib/fix-trigger-warning.patch
@@ -0,0 +1,39 @@
+From: Dermot Bradley <dermot_bradley@yahoo.com>
+Date: Sat, 12 Sep 2020 20:03 +0100
+Subject: [PATCH] cracklib: prevent "line out of order" warnings
+
+Workaround for handling excessively long lines in cracklib-words.gz file.
+Ensure that all lines read from any words files are truncated to 1023
+characters as the cracklib-packer utility (run by the Alpine package trigger)
+breaks up long lines on this boundary and processes them separately as if
+they were seperate lines and it can potentially generate "line out of order"
+warnings.
+
+It also ignores blank lines in word files, this prevents "skipping line"
+warnings when blank lines are encountered.
+
+Upstream PR 33 has been raised with this fix.
+
+---
+
+--- a/util/cracklib-format
++++ b/util/cracklib-format
+@@ -3,8 +3,17 @@
+ # This preprocesses a set of word lists into a suitable form for input
+ # into cracklib-packer
+ #
++# Truncates lines longer than 1022 characters long as cracklib-packer
++# does not handle them correctly.
++#
++# The last part of the pipeline uses 'grep -v' to remove any blank
++# lines (possibly introduced by earlier parts of the pipeline) as
++# cracklib-packer will generate "skipping line" warnings otherwise.
++#
+ gzip -cdf "$@" |
+- grep -v '^\(#\|$\)' |
++ grep -a -v '^#' |
+ tr '[A-Z]' '[a-z]' |
+ tr -cd '\012[a-z][0-9]' |
++ cut -c 1-1022 |
++ grep -v '^$' |
+ env LC_ALL=C sort -u
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index 63bbd92104..935ba88012 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cryptsetup
-pkgver=2.3.3
+pkgver=2.3.4
pkgrel=0
pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
url="https://gitlab.com/cryptsetup/cryptsetup"
@@ -18,6 +18,10 @@ source="https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/cryptset
dmcrypt.initd
"
+# secfixes:
+# 2.3.4-r0:
+# - CVE-2020-14382
+
build() {
./configure \
--build="$CBUILD" \
@@ -55,7 +59,7 @@ libs() {
mv "$pkgdir"/lib "$subpkgdir"/
}
-sha512sums="0dbcc68fa72caff19082eb00815a62498caf28f37d73bafa9212125500be9386ce322c2f63cc5ff1808de7c1ca983872c9122b7a12dfe360580a6d096dcbc1ed cryptsetup-2.3.3.tar.gz
+sha512sums="a0a4981ca7294d6f0568bc9465e78ee1781ad73fe77e8daa0bbe67693534f02d3510e6fba9f76749b90ce7533bc9ac96dd27b73d733f8051e9560a3b4196ca3c cryptsetup-2.3.4.tar.gz
dc896fdb7697d01443a168819f01af02db00a9de75589f062a1ebbfc0bc185b6d2109b18352309c41b818e3ad89609dcea3660d6f3cda890de825f053f94de97 flush-stdout.patch
74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 dmcrypt.confd
81dad61cdecf1dc529b26eb3cdc15979a582c876b01268f88e7a71c8fae6911137c03bfa63fee64e064e5fb31f673610be27ecab9fc432229f13e7040698bd5c dmcrypt.initd"
diff --git a/main/ctags/APKBUILD b/main/ctags/APKBUILD
index 224189947d..52071e43dc 100644
--- a/main/ctags/APKBUILD
+++ b/main/ctags/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=ctags
-pkgver=0_git20200205
-_commit=0d0ef5f0ce5914f809bb25781c51b6fd3136108a
+pkgver=0_git20200815
+_commit=b74397560c8f68205a74fc5b34205c911e948459
pkgrel=0
pkgdesc="Generator of tags for all types of C/C++ languages"
url="https://ctags.io/"
@@ -49,4 +49,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="eac10b0cbaf78ed3cf41ee9182b57e6ef1636ffe08820683df412a57556069c62ec9b17be04b47cc3565cc954ca81dbad48a793b550c5501deb2783879d2cb50 ctags-0_git20200205.tar.gz"
+sha512sums="ac7ef3c0a23f907f7c4dc5a962af67bcc1675b6db39fb6cccff9a70652e60b7bb3802d0acfbd04f952ded87ea786a1f42f661930b301f905b2a682d356dc33eb ctags-0_git20200815.tar.gz"
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index be7db3bc5b..f9779bac47 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cups
pkgver=2.3.3
-pkgrel=0
+pkgrel=1
pkgdesc="The CUPS Printing System"
url="https://www.cups.org/"
arch="all"
license="GPL-2.0-only"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs ipptool $pkgname-client
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-libs ipptool $pkgname-client
$pkgname-lang $pkgname-openrc $pkgname-dbg"
depends_dev="libgcrypt-dev gnutls-dev zlib-dev"
makedepends="$depends_dev libpaper-dev dbus-dev libjpeg-turbo-dev avahi-dev
diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD
index 3e1ff702b7..92c73c421e 100644
--- a/main/curl/APKBUILD
+++ b/main/curl/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=curl
-pkgver=7.71.1
+pkgver=7.72.0
pkgrel=0
pkgdesc="URL retrival utility and library"
url="https://curl.haxx.se/"
@@ -11,13 +11,15 @@ arch="all"
license="MIT"
depends="ca-certificates"
depends_dev="openssl-dev nghttp2-dev zlib-dev brotli-dev"
-checkdepends="python3"
+checkdepends="nghttp2 python3"
makedepends="$depends_dev autoconf automake groff libtool perl"
subpackages="$pkgname-dbg $pkgname-static $pkgname-doc $pkgname-dev libcurl"
source="https://curl.haxx.se/download/curl-$pkgver.tar.xz
"
# secfixes:
+# 7.72.0-r0:
+# - CVE-2020-8231
# 7.71.0-r0:
# - CVE-2020-8169
# - CVE-2020-8177
@@ -132,4 +134,4 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
}
-sha512sums="631e0ee8562e5029fe022bfab4222836a3e6d666e82e2bfbd78311fe5985105218a36d1ea68c93472fc57a12b713957a3bcca6e385eda4e58a47ca8d5d50265b curl-7.71.1.tar.xz"
+sha512sums="e5025a32eac6108ccb13d1fcce9c2de28b3a6d6e9a258a647c4be45d71718f75653e1ccd477ef5f29242a15588255c4ef43fe47bf9908b938b6769fccfaac107 curl-7.72.0.tar.xz"
diff --git a/main/cvechecker/APKBUILD b/main/cvechecker/APKBUILD
index 328a549333..9db7fb5814 100644
--- a/main/cvechecker/APKBUILD
+++ b/main/cvechecker/APKBUILD
@@ -2,20 +2,20 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=cvechecker
-pkgver=3.9
-pkgrel=2
+pkgver=4.0
+pkgrel=0
pkgdesc="A local CVE checker tool"
url="https://github.com/sjvermeu/cvechecker/wiki"
arch="all"
license="GPL-3.0"
depends="gawk wget libxslt"
makedepends="libconfig-dev sqlite-dev mariadb-connector-c-dev
- argp-standalone autoconf automake"
+ argp-standalone autoconf automake libbsd-dev"
install="$pkgname.pre-install $pkgname.post-install"
subpackages="$pkgname-doc"
pkggroups="$pkgname"
-source="$pkgname-$pkgver.tar.gz::https://github.com/sjvermeu/$pkgname/archive/v$pkgver.tar.gz"
-builddir="$srcdir"/$pkgname-$pkgver
+source="$pkgname-$pkgver.zip::https://github.com/sjvermeu/cvechecker/archive/cvechecker-$pkgver.zip"
+builddir="$srcdir"/$pkgname-$pkgname-$pkgver
prepare() {
default_prepare
@@ -27,7 +27,6 @@ prepare() {
}
build() {
- cd "$builddir"
export LIBS="-largp"
./configure \
--build=$CBUILD \
@@ -41,16 +40,14 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
mkdir -p "$pkgdir"/var/cvechecker &>/dev/null
chgrp -R $pkggroups "$pkgdir"/var/cvechecker/* &>/dev/null
chmod -R g+w "$pkgdir"/var/cvechecker &>/dev/null
}
-sha512sums="35fc8501bb56ebe8ef0f38bc8ea91f9446c06901c83ba16488acaa0c71ed446d3337637f1f44bc82c01e1b3f255630f33b13d25e04d85fca5df3a7a5bcf66606 cvechecker-3.9.tar.gz"
+sha512sums="f2c4e8ca5cbeed00b543b64e9173c64bd7d423e4cdda0731e7e79a85b81468f066bbd9903c630b58342c24e19c11b8a6b9f4c7fafe109c129d6b0baadb65aeb2 cvechecker-4.0.zip"
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 3dfc0afe03..b38e05d353 100644
--- a/main/cyrus-sasl/APKBUILD
+++ b/main/cyrus-sasl/APKBUILD
@@ -2,13 +2,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cyrus-sasl
pkgver=2.1.27
-pkgrel=6
+pkgrel=9
pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
url="https://www.cyrusimap.org/sasl/"
arch="all"
license="custom"
options="!check" # No test suite.
subpackages="
+ $pkgname-static
$pkgname-dev
$pkgname-doc
$pkgname-openrc
@@ -19,15 +20,15 @@ subpackages="
$pkgname-ntlm:_plugin
$pkgname-crammd5:_plugin
$pkgname-digestmd5:_plugin
- $pkgname-plain:_plugin
$pkgname-login:_plugin
"
# use heimdal to avoid circular dep: cyrus-sasl -> krb5 -> openldap -> cyrus-sasl
makedepends="
- db-dev
+ gdbm-dev
openssl-dev
heimdal-dev
py3-sphinx
+ sqlite-dev
automake
autoconf
@@ -50,8 +51,12 @@ source="https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-$pk
# - CVE-2013-4122
-build() {
+prepare() {
+ default_prepare
autoreconf -vif
+}
+
+build() {
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -69,10 +74,11 @@ build() {
--with-gss_impl=heimdal \
--enable-gssapi \
--with-rc4 \
- --with-dblib=berkeley \
+ --with-dblib=gdbm \
--with-saslauthd=/run/saslauthd \
--without-pwcheck \
--with-devrandom=/dev/urandom \
+ --with-sqlite \
--enable-anon \
--enable-cram \
--enable-digest \
@@ -87,35 +93,28 @@ build() {
package() {
make -j1 DESTDIR="$pkgdir" install
- mkdir -p "$pkgdir"/etc/sasl2
install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
install -Dm755 "$srcdir"/saslauthd.initd "$pkgdir"/etc/init.d/saslauthd
}
-static() {
- pkgdesc="Static libraires for $pkgname"
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
-}
-
_plugin() {
depends=
local plugin=${subpkgname/$pkgname-/}
replaces="libsasl"
pkgdesc="Cyrus SASL plugin for $plugin"
- mkdir -p "$subpkgdir"/usr/lib/sasl2
- mv "$pkgdir"/usr/lib/sasl2/lib$plugin.so* "$subpkgdir"/usr/lib/sasl2/
+ amove usr/lib/sasl2/lib$plugin.so*
}
libsasl() {
depends=
pkgdesc="Cyrus Simple Authentication and Security Layer (SASL) library"
- mkdir -p "$subpkgdir"/usr/lib/sasl2 "$subpkgdir"/etc/sasl2
+ replaces="cyrus-sasl-plain"
+
local lib=
- for lib in anonymous sasldb; do
- mv "$pkgdir"/usr/lib/sasl2/*${lib}*.so* "$subpkgdir"/usr/lib/sasl2/
+ for lib in anonymous sasldb plain; do
+ amove usr/lib/sasl2/*$lib*.so*
done
- mv "$pkgdir"/usr/lib/libsasl*.so.* "$subpkgdir"/usr/lib/
+ amove usr/lib/libsasl*.so.*
}
sha512sums="d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b cyrus-sasl-2.1.27.tar.gz
diff --git a/main/cython/APKBUILD b/main/cython/APKBUILD
index 66dbb93a5b..f158ef9e38 100644
--- a/main/cython/APKBUILD
+++ b/main/cython/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Oleg Titov <oleg.titov@gmail.com>
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=cython
-pkgver=0.29.20
+pkgver=0.29.21
pkgrel=0
pkgdesc="Cython is an optimising static compiler for both the Python & the extended Cython programming languages."
url="https://cython.org/"
@@ -31,4 +31,4 @@ package() {
install -Dm 644 README.rst "$pkgdir/usr/share/doc/cython/readme.rst"
}
-sha512sums="5bd0506abf8e0a823316e697db021e1e12296fecef2165ea4b84fa595554ebcdcf2688cb675c77e0e1567ab44ed502757b5eb4ea55b84505ae350f70e4d90ecc cython-0.29.20.tar.gz"
+sha512sums="2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679 cython-0.29.21.tar.gz"
diff --git a/main/d-feet/APKBUILD b/main/d-feet/APKBUILD
index b4281ffdbc..f77b5cfabc 100644
--- a/main/d-feet/APKBUILD
+++ b/main/d-feet/APKBUILD
@@ -20,23 +20,18 @@ makedepends="
source="https://download.gnome.org/sources/d-feet/$_v/d-feet-$pkgver.tar.xz"
build() {
- cd "$builddir"
- meson \
- --prefix=/usr \
- --buildtype=plain \
+ abuild-meson \
-Dtests=false \
output
- ninja -C output
+ meson compile ${JOBS:+-j ${JOBS}} -C output
}
check() {
- cd "$builddir"
- ninja -C output test
+ meson test --no-rebuild -v -C output
}
package() {
- cd "$builddir"
- DESTDIR="$pkgdir" ninja -C output install
+ DESTDIR="$pkgdir" meson install --no-rebuild -C output
# Fix on musl
sed -i 's|locale.textdomain("d-feet")||' "$pkgdir"/usr/bin/d-feet
diff --git a/main/dahdi-linux-lts/APKBUILD b/main/dahdi-linux-lts/APKBUILD
index 55eec70693..7c9b73aa28 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.4.50
+_kver=5.4.67
_krel=0
_kpkgver="$_kver-r$_krel"
diff --git a/main/datefudge/APKBUILD b/main/datefudge/APKBUILD
index 3db36e62a4..9ed6f292ad 100644
--- a/main/datefudge/APKBUILD
+++ b/main/datefudge/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Simon Frankenberger <simon-alpine@fraho.eu>
# Maintainer: Simon Frankenberger <simon-alpine@fraho.eu>
pkgname=datefudge
-pkgver=1.23
+pkgver=1.24
pkgrel=0
pkgdesc="Tool to fake the system date"
url="https://packages.debian.org/sid/datefudge"
@@ -11,7 +11,6 @@ depends="coreutils"
checkdepends="perl"
subpackages="$pkgname-doc"
source="http://deb.debian.org/debian/pool/main/d/datefudge/datefudge_$pkgver.tar.xz
- musl.patch
"
build() {
@@ -29,5 +28,4 @@ package() {
-C "$builddir" install
}
-sha512sums="9b5d5f531b3f1a5ece96fbc421726c0b7edad5709ab46cb2deb201f9f6eeed2e33b7590e221e33473edb6dbdaaf46cbef0bd4be4fbd592e8efec18a343503f71 datefudge_1.23.tar.xz
-e8b004957276f1162f9d686f03593cdd64455a35764e34aeac72d419b6ac071fb044405c73999283fcb9abff312225f81039553801cfaa1165bbbfc80705d44b musl.patch"
+sha512sums="cd548a7e8ff10189e101fa339b2845cdd19a59354e43b02cf47e466855ec192dc2084951f7663a94da56a580dd24524047651d8bcb41aa478fe94b24dffaedeb datefudge_1.24.tar.xz"
diff --git a/main/datefudge/musl.patch b/main/datefudge/musl.patch
deleted file mode 100644
index 95b8d07540..0000000000
--- a/main/datefudge/musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- old/datefudge.c
-+++ new/datefudge.c
-@@ -78,7 +78,7 @@
- return 0;
- }
-
--int gettimeofday(struct timeval *x, struct timezone *y) {
-+int gettimeofday(struct timeval *__restrict x, void *__restrict y) {
- return __gettimeofday(x,y);
- }
-
diff --git a/main/dbus/APKBUILD b/main/dbus/APKBUILD
index 6aa3dc86ad..c938624b40 100644
--- a/main/dbus/APKBUILD
+++ b/main/dbus/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dbus
pkgver=1.12.20
-pkgrel=0
+pkgrel=1
pkgdesc="Freedesktop.org message bus system"
options="!check" # Introduces circular dependency with xorg-server (xvfb-run -> xvfb)
url="https://www.freedesktop.org/Software/dbus"
@@ -23,6 +23,7 @@ checkdepends="xvfb-run"
install="$pkgname.pre-install $pkgname.post-install"
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
"
@@ -88,4 +89,5 @@ x11() {
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"
diff --git a/main/dbus/avoid-opendir-between-fork-exec.patch b/main/dbus/avoid-opendir-between-fork-exec.patch
new file mode 100644
index 0000000000..44b03fbd5b
--- /dev/null
+++ b/main/dbus/avoid-opendir-between-fork-exec.patch
@@ -0,0 +1,18 @@
+Author: Rasmus Thomsen <oss@cogitri.dev>
+Upstream: No
+Reason: The code inside the `#ifdef __linux__` calls opendir. This can
+lead to deadlocks when act_on_fds_3_and_up is called between fork&exec since
+opendir mallocs which isn't async signal safe
+diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
+index 0288dbc9..e585136f 100644
+--- a/dbus/dbus-sysdeps-unix.c
++++ b/dbus/dbus-sysdeps-unix.c
+@@ -4742,7 +4742,7 @@ act_on_fds_3_and_up (void (*func) (int fd))
+ {
+ int maxfds, i;
+
+-#ifdef __linux__
++#if defined(__linux__) && defined(__GLIBC__)
+ DIR *d;
+
+ /* On Linux we can optimize this a bit if /proc is available. If it
diff --git a/main/dconf/APKBUILD b/main/dconf/APKBUILD
index f6a2562429..dbe2d82224 100644
--- a/main/dconf/APKBUILD
+++ b/main/dconf/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=dconf
-pkgver=0.36.0
+pkgver=0.38.0
pkgrel=0
pkgdesc="A low-level configuration system."
url="https://wiki.gnome.org/Projects/dconf"
@@ -14,12 +14,8 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz"
build() {
- meson \
- --prefix=/usr \
- --localstatedir=/var \
- --buildtype=plain \
- . output
- ninja -C output
+ abuild-meson . output
+ meson compile ${JOBS:+-j ${JOBS}} -C output
}
check() {
@@ -27,7 +23,7 @@ check() {
}
package() {
- DESTDIR="$pkgdir" ninja -C output install
+ DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
bashcomp() {
@@ -38,4 +34,4 @@ bashcomp() {
mv "$pkgdir"/usr/share/bash-completion "$subpkgdir"/usr/share
}
-sha512sums="fed0b4ac13dfeff3bbe428a5c25408a0f13610219e561841a3af75cf18f9c630c385989b700c081b79ab53c00bdecf43c7c94979312c047faefbda4b2653d40d dconf-0.36.0.tar.xz"
+sha512sums="795f723f34a8406a06323870f8425ca579bbc751c1661db02e170532f6a2653aee749cbb84ad4d7e5a84a07c0caf2662a868b34b6f0d383361c0ff1ad9aed355 dconf-0.38.0.tar.xz"
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index e97806aa4b..3a0bdbbf31 100644
--- a/main/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
@@ -16,8 +16,8 @@
# - CVE-2017-14496
#
pkgname=dnsmasq
-pkgver=2.81
-pkgrel=1
+pkgver=2.82
+pkgrel=0
pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server"
url="http://www.thekelleys.org.uk/dnsmasq/"
arch="all"
@@ -69,7 +69,7 @@ dnssec() {
cp -r "$pkgdir"/etc "$subpkgdir"/etc
}
-sha512sums="70194f273d1e760d1f33635f4df2fb55ef846189d0c56582534e73e296cd8580959f7675623a0d67ca2438fa81655c8d51afdd2e42bb489aa78861314fc1bd7f dnsmasq-2.81.tar.gz
+sha512sums="bbd12c53e844709e28be141d6270539e3cc6428b5575cd94f1e6dd167c074a9794a25bcea73b0ebeeed48a80a8b158793002d250a63693be4bfbabb9584b1bd8 dnsmasq-2.82.tar.gz
a7d64a838d10f4f69e0f2178cf66f0b3725901696e30df9e8e3e09f2afd7c86e9d95af64d2b63ef66f18b8a637397b7015573938df9ad961e2b36c391c3ac579 dnsmasq.initd
9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 dnsmasq.confd
01e9e235e667abda07675009fb1947547863e0bb0256393c5a415978e2a49c1007585c7f0b51e8decce79c05e6f2ced3f400b11343feaa4de9b2e524f74a1ee3 uncomment-conf-dir.patch"
diff --git a/main/dnstop/APKBUILD b/main/dnstop/APKBUILD
index 5c4c9278f6..1a1d2ce5ef 100644
--- a/main/dnstop/APKBUILD
+++ b/main/dnstop/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=dnstop
pkgver=20140915
-pkgrel=3
+pkgrel=4
pkgdesc="A DNS traffic capture utility"
url="http://dns.measurement-factory.com/tools/dnstop/"
arch="all"
-license="BSD"
+license="BSD-3-Clause"
depends=""
depends_dev=""
makedepends="libpcap-dev ncurses-dev"
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 10bfccf28e..b7cca0f284 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -4,10 +4,11 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dovecot
-pkgver=2.3.10.1
-_pkgvermajor=2.3
+pkgver=2.3.11.3
+_pkgverminor=${pkgver%.*}
+_pkgvermajor=${_pkgverminor%.*}
pkgrel=0
-_pigeonholever=0.5.10
+_pigeonholever=0.5.11
_pigeonholevermajor=${_pigeonholever%.*}
pkgdesc="IMAP and POP3 server"
url="https://www.dovecot.org/"
@@ -55,16 +56,21 @@ subpackages="
$pkgname-fts-lucene:_fts_lucene
"
source="https://www.dovecot.org/releases/$_pkgvermajor/dovecot-$pkgver.tar.gz
- https://pigeonhole.dovecot.org/releases/$_pkgvermajor/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever.tar.gz
+ https://pigeonhole.dovecot.org/releases/$_pkgvermajor/$pkgname-$_pkgverminor-pigeonhole-$_pigeonholever.tar.gz
skip-iconv-check.patch
split-protocols.patch
default-config.patch
+ fix-oauth2-jwt.c.patch
dovecot.logrotate
dovecot.initd
"
-_builddir_pigeonhole="$srcdir/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever"
+_builddir_pigeonhole="$srcdir/$pkgname-$_pkgverminor-pigeonhole-$_pigeonholever"
# secfixes:
+# 2.3.11.3-r0:
+# - CVE-2020-12100
+# - CVE-2020-12673
+# - CVE-2020-12674
# 2.3.10.1-r0:
# - CVE-2020-10957
# - CVE-2020-10958
@@ -305,10 +311,11 @@ _submv() {
done
}
-sha512sums="5c07436a3e861993f241caa2c60f035c533c5fceb5c8540c1717d31bedd54b82299f7ea11bfee12c72d4d33985d93a7130c4f56877864a7ad21cf7373a29cc06 dovecot-2.3.10.1.tar.gz
-f3d380edba4d25d20ee52db21d2965e3a6b229924e9a04fbf45cfe32e1d25448977ee41b12ba41ad8cf8b795f19bb1dbef1d7d09e775598d782123268f61dc8b dovecot-2.3-pigeonhole-0.5.10.tar.gz
+sha512sums="d83e52a7faab918a8e6f6257acc5936b81733c10489affd042c3a043cb842db060286cba9978be378e4958e9ac2e60b55ce289d7f3a88df08e7637e4785e23bb dovecot-2.3.11.3.tar.gz
+ef65b49092fec736258cd793f4f338cd7838c0e6e23922f6df36b428089e88ff236b8e67a7f31ee9c7e4d587a60a1533fde45d689fa9563fbfd4224bee3d2536 dovecot-2.3.11-pigeonhole-0.5.11.tar.gz
fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a skip-iconv-check.patch
794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5 split-protocols.patch
0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07 default-config.patch
+7f428b0f14323a5dda00aef93f4835c2c38a7b780a939a47f759d31df4636e86055f95d17e2358cb37a2704ea022dfad602c7ed4568cba644347f20fd1e15e3b fix-oauth2-jwt.c.patch
9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0 dovecot.logrotate
d91951b81150d7a3ef6a674c0dc7b012f538164dac4b9d27a6801d31da6813b764995a438f69b6a680463e1b60a3b4f2959654f68e565fe116ea60312d5e5e70 dovecot.initd"
diff --git a/main/dovecot/fix-oauth2-jwt.c.patch b/main/dovecot/fix-oauth2-jwt.c.patch
new file mode 100644
index 0000000000..b3755f6993
--- /dev/null
+++ b/main/dovecot/fix-oauth2-jwt.c.patch
@@ -0,0 +1,55 @@
+From 42c37d2473116bf4a7fcafcaf94de83947fe80bc Mon Sep 17 00:00:00 2001
+From: Aki Tuomi <aki.tuomi@open-xchange.com>
+Date: Thu, 13 Aug 2020 20:01:41 +0300
+Subject: [PATCH] oauth2-jwt: Use int64_t instead time_t for portability
+
+
+diff --git a/src/lib-oauth2/oauth2-jwt.c b/src/lib-oauth2/oauth2-jwt.c
+index a68875e57..0adf612d9 100644
+--- a/src/lib-oauth2/oauth2-jwt.c
++++ b/src/lib-oauth2/oauth2-jwt.c
+@@ -31,18 +31,25 @@ static const char *get_field(const struct json_tree *tree, const char *key)
+ }
+
+ static int get_time_field(const struct json_tree *tree, const char *key,
+- long *value_r)
++ int64_t *value_r)
+ {
++ time_t tvalue;
+ const char *value = get_field(tree, key);
+ int tz_offset ATTR_UNUSED;
+ if (value == NULL)
+ return 0;
+- if ((str_to_long(value, value_r) < 0 &&
+- !iso8601_date_parse((const unsigned char*)value, strlen(value),
+- value_r, &tz_offset)) ||
+- *value_r < 0)
+- return -1;
+- return 1;
++ if (str_to_int64(value, value_r) == 0) {
++ if (*value_r < 0)
++ return -1;
++ return 1;
++ } else if (iso8601_date_parse((const unsigned char*)value, strlen(value),
++ &tvalue, &tz_offset)) {
++ if (tvalue < 0)
++ return -1;
++ *value_r = tvalue;
++ return 1;
++ }
++ return -1;
+ }
+
+ static int oauth2_lookup_hmac_key(const struct oauth2_settings *set,
+@@ -283,9 +290,9 @@ oauth2_jwt_body_process(const struct oauth2_settings *set, const char *alg, cons
+ const char *sub = get_field(tree, "sub");
+
+ int ret;
+- long t0 = time(NULL);
++ int64_t t0 = time(NULL);
+ /* default IAT and NBF to now */
+- long iat, nbf, exp;
++ int64_t iat, nbf, exp;
+ int tz_offset ATTR_UNUSED;
+
+ if (sub == NULL) {
diff --git a/main/doxygen/APKBUILD b/main/doxygen/APKBUILD
index 17f2d1cb15..4320849638 100644
--- a/main/doxygen/APKBUILD
+++ b/main/doxygen/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=doxygen
-pkgver=1.8.18
+pkgver=1.8.20
pkgrel=0
pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
url="http://www.doxygen.nl/"
@@ -9,7 +9,6 @@ license="GPL-2.0-or-later"
checkdepends="libxml2-utils"
makedepends="flex bison coreutils perl python3 cmake"
source="http://doxygen.nl/files/doxygen-$pkgver.src.tar.gz
- doxygen-1.8.14-install.patch
"
build() {
@@ -31,5 +30,4 @@ package() {
make -C build DESTDIR="$pkgdir" install
}
-sha512sums="8a75b78db5b49c891342a40b452cae045aa4e317add12ba85a4759081dba5dab11f1a95a576df16d4f275c69a6e9ee1b8f8739c1bf8348f5b4578b1c41e2a32c doxygen-1.8.18.src.tar.gz
-a11ece43c640ffed707240f726b2005e103294e0351d7c3b6dd46ecc9bc0341b56c4bfb4e4daead3683129a1f332f283c578258aa1f611ec5a57c4da3bff8a21 doxygen-1.8.14-install.patch"
+sha512sums="65d104d25061ee59199c74c0328f59fbeaf14f0dade755187ebd43f59008adfef243d4da448b71ae04dc325b848f9bdd109eb20e6f6092f3ed19862426d060cf doxygen-1.8.20.src.tar.gz"
diff --git a/main/doxygen/doxygen-1.8.14-install.patch b/main/doxygen/doxygen-1.8.14-install.patch
deleted file mode 100644
index 748b0be77f..0000000000
--- a/main/doxygen/doxygen-1.8.14-install.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -upr doxygen-1.8.17.orig/doc/CMakeLists.txt doxygen-1.8.17/doc/CMakeLists.txt
---- doxygen-1.8.17.orig/doc/CMakeLists.txt 2020-01-05 16:37:34.415645891 +0100
-+++ doxygen-1.8.17/doc/CMakeLists.txt 2020-01-05 16:38:10.395666071 +0100
-@@ -209,22 +209,22 @@ install(FILES
- "${PROJECT_BINARY_DIR}/man/doxywizard.1"
- "${PROJECT_BINARY_DIR}/man/doxysearch.1"
- "${PROJECT_BINARY_DIR}/man/doxyindexer.1"
-- DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
-+ DESTINATION ${CMAKE_INSTALL_MANDIR}
- )
-
- install(FILES
- "${PROJECT_BINARY_DIR}/latex/doxygen_manual.pdf"
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+ DESTINATION "${DOC_INSTALL_DIR}"
- )
-
- if (build_doc_chm)
- install(FILES
- "${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm"
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+ DESTINATION "${DOC_INSTALL_DIR}"
- )
- endif ()
-
- install(DIRECTORY
- "${PROJECT_BINARY_DIR}/html"
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+ DESTINATION "${DOC_INSTALL_DIR}"
- )
diff --git a/main/dpkg/0001-t-command-Fix-test_command_exec-program-invocation.patch b/main/dpkg/0001-t-command-Fix-test_command_exec-program-invocation.patch
new file mode 100644
index 0000000000..faee94d17e
--- /dev/null
+++ b/main/dpkg/0001-t-command-Fix-test_command_exec-program-invocation.patch
@@ -0,0 +1,33 @@
+From d57373153f86770bda9298b69a2ada8ce676769c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Thu, 27 Aug 2020 21:43:40 +0200
+Subject: [PATCH] t-command: Fix test_command_exec program invocation
+
+From exec(3):
+
+ The argument arg0 should point to a filename string that is
+ associated with the process being started by one of the exec
+ functions.
+
+Unfortunately, this test sets arg0 to the string "arg 0" this causes the
+busybox multicall binary on Alpine Linux to assume that the applet "arg
+0" (instead of true) should be executed. However, as such an applet does
+not exist, the tests fails. This commit fixes the failing test by
+setting arg0 correctly (as other parts of the dpkg codebase using the
+command API do too).
+---
+ lib/dpkg/t/t-command.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/dpkg/t/t-command.c b/lib/dpkg/t/t-command.c
+index 099884560..aeed7a1f2 100644
+--- a/lib/dpkg/t/t-command.c
++++ b/lib/dpkg/t/t-command.c
+@@ -170,6 +170,7 @@ test_command_exec(void)
+
+ command_init(&cmd, "true", "exec test");
+
++ command_add_arg(&cmd, "true");
+ command_add_arg(&cmd, "arg 0");
+ command_add_arg(&cmd, "arg 1");
+
diff --git a/main/dpkg/APKBUILD b/main/dpkg/APKBUILD
index d2a3355763..ad4cc74005 100644
--- a/main/dpkg/APKBUILD
+++ b/main/dpkg/APKBUILD
@@ -1,16 +1,36 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dpkg
-pkgver=1.20.3
-pkgrel=0
+pkgver=1.20.5
+pkgrel=2
pkgdesc="The Debian Package Manager"
-url="https://packages.debian.org/dpkg"
+url="https://wiki.debian.org/Teams/Dpkg"
arch="all"
license="GPL-2.0-or-later BSD-2-Clause"
depends="tar"
-options="!check"
+checkdepends="gzip xz coreutils"
makedepends="bzip2-dev linux-headers perl zlib-dev po4a"
-subpackages="$pkgname-doc $pkgname-dev"
-source="https://deb.debian.org/debian/pool/main/d/dpkg/dpkg_$pkgver.tar.xz"
+subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
+source="https://deb.debian.org/debian/pool/main/d/dpkg/dpkg_$pkgver.tar.xz
+ 0001-t-command-Fix-test_command_exec-program-invocation.patch
+ time_t.patch"
+
+prepare() {
+ default_prepare
+
+ # On the builders /home/buildozer has S_ISGID set this is
+ # inherited in $srcdir and causes some dpkg test to end up with
+ # a permission mismatch. To fix this remove the S_ISGID from
+ # $srcdir.
+ chmod -R g-s "$srcdir"
+
+ # This test fails with:
+ #
+ # dpkg-checkbuilddeps: error: Unmet build dependencies: build-essential:native
+ #
+ # Probably unfixable as we don't have a build-essential dpkg package.
+ sed -i "$builddir"/scripts/Makefile.in \
+ -e '/dpkg_buildpackage\.t/d'
+}
build() {
./configure \
@@ -29,6 +49,10 @@ build() {
make
}
+check() {
+ make check
+}
+
package() {
make DESTDIR="$pkgdir" install
@@ -66,4 +90,6 @@ dev() {
mv "$pkgdir"/usr/share/perl* "$subpkgdir"/usr/share/
}
-sha512sums="5893ae34efc6f9d54e47fc403487c79233501666968681b827bbabbf39b1401cb7064f8fe8797708ed32bb37345dbb78a1daac04c6dc7064f2811265f3a4e82c dpkg_1.20.3.tar.xz"
+sha512sums="6b3789c25c81022181b87a28ca9baa4a463a68940a871568c699a2a30e3b4ce705835ed6a171ac8c5902e377200b31cc0be1e03cbd7d35c4eaf92c7300d9227f dpkg_1.20.5.tar.xz
+059875c06146382f1e4a339860c558a71393a43bf9e6580c0a2211c629cc9be1b4fd12c900b002f833a241ad9a339f138b458b60664da06db5b32db1c6490b2f 0001-t-command-Fix-test_command_exec-program-invocation.patch
+4eb01daac6d1079bcac1450b52c0d052de2c2f0341feafb4b5e2b23b7c191c9ce21d2e8e3b9ea917f8f81162229c4575bbf62f1d1f38da21b7dfd1fe80569bce time_t.patch"
diff --git a/main/dpkg/time_t.patch b/main/dpkg/time_t.patch
new file mode 100644
index 0000000000..a47675654e
--- /dev/null
+++ b/main/dpkg/time_t.patch
@@ -0,0 +1,95 @@
+musl 1.2 switched from 32-bit time_t to 64-bit time_t on 32-bit arches.
+Unfourtunatly, the dpkg code assumes that time_t is a long int (or long
+unsigned int in some place). As a dirty workaround use PRId64 instead.
+
+See also: http://musl.libc.org/time64.html
+
+diff -upr dpkg-1.20.5.orig/dpkg-deb/build.c dpkg-1.20.5/dpkg-deb/build.c
+--- dpkg-1.20.5.orig/dpkg-deb/build.c 2020-06-27 20:24:28.000000000 +0200
++++ dpkg-1.20.5/dpkg-deb/build.c 2020-08-27 23:00:05.501645000 +0200
+@@ -38,6 +38,7 @@
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <inttypes.h>
+
+ #include <dpkg/i18n.h>
+ #include <dpkg/c-ctype.h>
+@@ -457,7 +458,7 @@ tarball_pack(const char *dir, filenames_
+ if (chdir(dir))
+ ohshite(_("failed to chdir to '%.255s'"), dir);
+
+- snprintf(mtime, sizeof(mtime), "@%ld", options->timestamp);
++ snprintf(mtime, sizeof(mtime), "@%" PRId64, options->timestamp);
+
+ command_init(&cmd, TAR, "tar -cf");
+ command_add_args(&cmd, "tar", "-cf", "-", "--format=gnu",
+diff -upr dpkg-1.20.5.orig/lib/dpkg/perf.h dpkg-1.20.5/lib/dpkg/perf.h
+--- dpkg-1.20.5.orig/lib/dpkg/perf.h 2019-11-27 14:39:09.000000000 +0100
++++ dpkg-1.20.5/lib/dpkg/perf.h 2020-08-27 23:00:58.851649314 +0200
+@@ -24,6 +24,7 @@
+
+ #include <config.h>
+ #include <compat.h>
++#include <inttypes.h>
+
+ #include <time.h>
+ #include <stdio.h>
+@@ -50,7 +51,7 @@ perf_ts_mark_print(const char *str)
+
+ clock_gettime(CLOCK_MONOTONIC, &ts);
+
+- printf("%lu.%.9lu: %s\n", ts.tv_sec, ts.tv_nsec, str);
++ printf("%" PRId64 ".%.9lu: %s\n", ts.tv_sec, ts.tv_nsec, str);
+ }
+
+ static void
+@@ -60,7 +61,7 @@ perf_ts_slot_print(struct perf_slot *ps,
+
+ perf_ts_sub(&ps->t_end, &ps->t_ini, &t_res);
+
+- printf("%lu.%.9lu: %s (%lu.%.9lu sec)\n",
++ printf("%" PRId64 ".%.9lu: %s (%lu.%.9lu sec)\n",
+ ps->t_end.tv_sec, ps->t_end.tv_nsec,
+ str, t_res.tv_sec, t_res.tv_nsec);
+ }
+diff -upr dpkg-1.20.5.orig/lib/dpkg/pkg-format.c dpkg-1.20.5/lib/dpkg/pkg-format.c
+--- dpkg-1.20.5.orig/lib/dpkg/pkg-format.c 2020-06-02 04:51:37.000000000 +0200
++++ dpkg-1.20.5/lib/dpkg/pkg-format.c 2020-08-27 23:01:24.044984684 +0200
+@@ -31,6 +31,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <inttypes.h>
+
+ #include <dpkg/i18n.h>
+ #include <dpkg/error.h>
+@@ -299,7 +300,7 @@ virt_fsys_last_modified(struct varbuf *v
+ pkgbin_name_const(pkg, pkgbin, pnaw_nonambig));
+ }
+
+- varbuf_printf(vb, "%ld", st.st_mtime);
++ varbuf_printf(vb, "%" PRId64, st.st_mtime);
+ }
+
+ /*
+diff -upr dpkg-1.20.5.orig/lib/dpkg/t/c-tarextract.c dpkg-1.20.5/lib/dpkg/t/c-tarextract.c
+--- dpkg-1.20.5.orig/lib/dpkg/t/c-tarextract.c 2020-06-02 04:51:37.000000000 +0200
++++ dpkg-1.20.5/lib/dpkg/t/c-tarextract.c 2020-08-27 23:01:53.108320365 +0200
+@@ -31,6 +31,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <inttypes.h>
+
+ #include <dpkg/ehandle.h>
+ #include <dpkg/fdio.h>
+@@ -65,7 +66,7 @@ tar_object_skip(struct tar_archive *tar,
+ static int
+ tar_object(struct tar_archive *tar, struct tar_entry *te)
+ {
+- printf("%s mode=%o time=%ld.%.9d uid=%d gid=%d", te->name,
++ printf("%s mode=%o time=%" PRId64 ".%.9d uid=%d gid=%d", te->name,
+ te->stat.mode, te->mtime, 0, te->stat.uid, te->stat.gid);
+ if (te->stat.uname)
+ printf(" uname=%s", te->stat.uname);
diff --git a/main/drbd-lts/APKBUILD b/main/drbd-lts/APKBUILD
index a76c28f309..dc2a37d7d8 100644
--- a/main/drbd-lts/APKBUILD
+++ b/main/drbd-lts/APKBUILD
@@ -8,7 +8,7 @@ _rel=0
_flavor=${FLAVOR:-lts}
_kpkg=linux-$_flavor
-_kver=5.4.50
+_kver=5.4.67
_krel=0
_kabi="$_kver-$_krel-$_flavor"
_kpkgver="$_kver-r$_krel"
diff --git a/main/elfutils/APKBUILD b/main/elfutils/APKBUILD
index 68b09ac8be..6ace31775e 100644
--- a/main/elfutils/APKBUILD
+++ b/main/elfutils/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=elfutils
-pkgver=0.180
+pkgver=0.181
pkgrel=0
-pkgdesc="A collection of utilities and DSOs to handle ELF files and DWARF data"
+pkgdesc="Utilities and DSOs to handle ELF files and DWARF data"
url="http://elfutils.org/"
arch="all"
license="GPL-3.0-or-later and (GPL-2.0-or-later or LGPL-3.0-or-later)"
@@ -72,6 +72,7 @@ build() {
--program-prefix=eu- \
--enable-deterministic-archives \
--disable-nls \
+ --disable-libdebuginfod \
--disable-debuginfod
# for now we only build libelf
make
@@ -91,7 +92,7 @@ libelf() {
mv "$pkgdir"/usr/lib/*-*.so "$subpkgdir"/usr/lib/
}
-sha512sums="62e96035ccfe8928baca2285decbe8b8703a2daa956df81ece18fecf643272fb68955806b3e807a514141a7a9bf44520bf09461672aa580bd6807485fb604d25 elfutils-0.180.tar.bz2
+sha512sums="d565541d5817f409dc89ebb1ee593366f69c371a1531308eeb67ff934b14a0fab0c9009fd7c23240efbaa1b4e04edac5c425e47d80e3e66ba03dcaf000afea36 elfutils-0.181.tar.bz2
8b650bc78cea66f30f0ff66357005890ac8a1b04a8dcc50209cb10a4b4c5ede849505cb68463beca8316ace0fbd53bbc484cfb597805b55616f3b3fc2b864e9a error.h
c3676b0b8b40d6e437f5d88c0d658dc0829ec97d1955e4bbf96f4cff9ee9001b8f2f06174450ae7aa5858b91c7905bdbd49073b561c346416132338a9c94731b fix-aarch64_fregs.patch
b9ba55e1b56a8abf694b6d02f022d9a3a0ae6ab53a8c4a71e49552e32411ef410d3a7512fbd1a729696bc2046ac11586829816f0fa3b8226ee77c9dc4b741e58 fix-uninitialized.patch
diff --git a/main/ell/APKBUILD b/main/ell/APKBUILD
index b88f14ba3b..5130371daa 100644
--- a/main/ell/APKBUILD
+++ b/main/ell/APKBUILD
@@ -1,11 +1,11 @@
# Contributor: Milan P. Stanić <mps@arvanta.net>
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=ell
-pkgver=0.32
+pkgver=0.33
pkgrel=0
pkgdesc="Linux library for embedded development"
url="https://01.org/ell"
-arch="all"
+arch="all !mips !mips64 !s390x" # FAIL: unit/test-dhcp6
license="GPL-2.0-only"
makedepends="glib-dev linux-headers"
checkdepends="dbus"
@@ -32,4 +32,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="f9b7d4198504fb9d8d0faafc23e3870d78c34cbcb22286be5658c10062e14fc502ca43c34b89d8b3941357361e881f4ce0cbbbbfb3a83c15bdfe32c2213b189f ell-0.32.tar.gz"
+sha512sums="ce4f91bd53d2606b71297505cb5f94048024da4a27ba74cd36685565344637f4a0b72e67465ff464f2d55485361f50ce5a9f2eda8da55a3ed9d7b0d6e27d3508 ell-0.33.tar.gz"
diff --git a/main/espeak/APKBUILD b/main/espeak/APKBUILD
index 4929ad128a..3ba76b958c 100644
--- a/main/espeak/APKBUILD
+++ b/main/espeak/APKBUILD
@@ -1,14 +1,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=espeak
pkgver=1.48.04
-pkgrel=1
+pkgrel=2
pkgdesc="Speech synthesizer for English and other languages"
url="http://espeak.sourceforge.net/"
arch="all"
license="GPL-3.0"
subpackages="$pkgname-dev"
-depends=
-makedepends=
+makedepends="portaudio-dev"
source="https://downloads.sourceforge.net/project/espeak/espeak/espeak-${pkgver%.*}/espeak-$pkgver-source.zip
fix-narrowing.patch
"
@@ -17,12 +16,13 @@ builddir="$srcdir"/$pkgname-$pkgver-source
build() {
cd "$builddir"/src
- make AUDIO=none || return 1
+ cp portaudio19.h portaudio.h
+ make
}
package() {
cd "$builddir"/src
- make AUDIO=none DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
}
sha512sums="f0759e6ace2604c8cbb19e8c3fd4b106edf4dcece247a6677f6b734af7746c35a367126edfbe585396c98f6c54f07e25d64bfab35e258e64f09bd2c0833247fa espeak-1.48.04-source.zip
diff --git a/main/ethtool/APKBUILD b/main/ethtool/APKBUILD
index 94c3b33327..1001b8a05b 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.7
+pkgver=5.8
pkgrel=0
pkgdesc="Utility for controlling network drivers and hardware"
url="https://mirrors.edge.kernel.org/pub/software/network/ethtool/"
@@ -10,6 +10,7 @@ license="GPL-2.0-only"
makedepends="linux-headers libmnl-dev"
subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
source="https://www.kernel.org/pub/software/network/ethtool/ethtool-$pkgver.tar.xz"
+[ "$CARCH" = "s390x" ] && options="!check" # failing tests but we need it anyway
build() {
./configure \
@@ -36,4 +37,4 @@ bashcomp() {
amove usr/share/bash-completion/completions
}
-sha512sums="195e24c48201412e0eaad7d7ca4e530c3a8cf50f3518cfe49d299fd091cf9198007c5d23be95109c735ceb2ccad37ac9f2e9cde0fb36ea426ab17b1dd064d4a9 ethtool-5.7.tar.xz"
+sha512sums="5eada909f82573ad93bc5476e6f8d50f68ce2c9948558877eb6ace8dc17aee895b2f27343592f5f23eaef0e0fc70b5f776f76e75d9614bab305a2819ca82370e ethtool-5.8.tar.xz"
diff --git a/main/f2fs-tools/APKBUILD b/main/f2fs-tools/APKBUILD
index 18d0955533..372b36f326 100644
--- a/main/f2fs-tools/APKBUILD
+++ b/main/f2fs-tools/APKBUILD
@@ -1,29 +1,23 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=f2fs-tools
-pkgver=1.13.0
+pkgver=1.14.0
pkgrel=0
pkgdesc="Tools for the Flash-Friendly File System (F2FS)"
url="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git"
arch="all"
license="GPL-2.0-or-later LGPL-2.1-or-later"
-depends=""
-depends_dev=""
-makedepends="$depends_dev automake autoconf bsd-compat-headers
+makedepends="automake autoconf bsd-compat-headers
libtool util-linux-dev linux-headers"
-install=""
-subpackages="$pkgname-doc $pkgname-dev $pkgname-libs"
-source="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/$pkgname-$pkgver.tar.gz
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs"
+source="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-$pkgver.tar.gz
"
-builddir="$srcdir/$pkgname-$pkgver"
prepare() {
default_prepare
- cd "$builddir"
./autogen.sh
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,9 +26,8 @@ build() {
}
package() {
- cd "$builddir"
make install DESTDIR="$pkgdir"
install -D -m644 mkfs/f2fs_format_utils.h "$pkgdir"/usr/include/
}
-sha512sums="fd920a19e8705a65395809aeef55791c5678ed31c026cdf41fc173e0dbcacdef1db7e0e184ec1aae8637b1784e2ad6e0207583e918255483fe43c73f89bd7f7f f2fs-tools-1.13.0.tar.gz"
+sha512sums="951b74178f99722550e73f331be066f124f6ee6022710f6b47ae47390b978b08f12a7f2a268d82ca69a32bf440cd3ce3adddc8a4c49c32df83da87e7f659f98d f2fs-tools-1.14.0.tar.gz"
diff --git a/main/fail2ban/APKBUILD b/main/fail2ban/APKBUILD
index 3b7d25b051..8267d0c39c 100644
--- a/main/fail2ban/APKBUILD
+++ b/main/fail2ban/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fail2ban
pkgver=0.11.1
-pkgrel=2
+pkgrel=4
pkgdesc="Scans log files for login failures then updates iptables to reject originating ip address"
url="https://www.fail2ban.org"
arch="noarch !s390x" # test failures
@@ -48,13 +48,16 @@ package() {
"$pkgdir"/etc/fail2ban/filter.d/alpine-sshd-ddos.conf
chmod o+r "$pkgdir"/usr/lib/python3*/site-packages/fail2ban*.egg-info/*
+
+ install -Dm644 -t "$pkgdir"/usr/share/man/man1 man/*.1
+ install -Dm644 -t "$pkgdir"/usr/share/man/man5 man/*.5
}
sha512sums="019b088aa6375f98742ed101ef6f65adabca3324444d71d5b8597a8d1d22fa76b9f503660f0498643fe24a3b8e4368de916072a1ab77b8e2ea3eda41c3e0c8c6 fail2ban-0.11.1.tar.gz
2d57fe7a7e3d1889dfa00ac33f5071069ed62f5fc0edb1e1827aedc47fae3a36d19c568b1721ba3a8e117f4ba6b3756d11942f2320b42864d45203f45761c7b6 ec37b1942c4da76f7a0f71efe81bea6835466648.patch
a4dbbcde8ba98368905e06a2d526c662f9087931bc1dab02dd85138d7fcd7d724cfdcee074b454f85def76f1a33d10f0c3b062d9bd777fd52ad73ea45df1dcc8 0001-amend-to-f3dbc9dda10e52610e3de26f538b5581fd905505-ch.patch
1e7581dd04e7777d6fd5c40cc842a7ec5f4e6a0374673d020d89dd61bf4093d48934844bee89bcac9084f9ae44f3beb66e714cf3c2763d79c3e8feb790c5e43b fail2ban.confd
-4ff9dd2793f42e414d83676104f47966f781b9e042e90dbc839d4e6b27faee08ebea2231b178d1d41084fa6c59aa62689bdb713977096d8b235a33e73268ccc5 fail2ban.logrotate
+ee1c229db970239ebc707cd484a650fcf2347c70b411728ee2a4a35a72f4118cfccecf2a221275603320e0332efcc16e4979201933cec1aef1c5d5a082fc4940 fail2ban.logrotate
84915967ae1276f1e14a5813680ee2ebf081af1ff452a688ae5f9ac3363f4aff90e39f8e6456b5c33d5699917d28a16308797095fd1ef9bb1fbcb46d4cea3def alpine-ssh.jaild
3e8e08d5e349e857b51ce34a9d968f16661b34e1cec06bec0aa9a32723bbe9be5a9890dd479331a9cc860821d33b1bf3b8e995182e319dead5a3d434b1816304 alpine-sshd.filterd
36a81b771be0b36fe0dfb5ee4c72c9cb5b504e110618a8eb6f0f241b4e57d92df01dc5cc04b6b68d5bc6a5e6d68de1000092770285d7a328e5937e50b4b226a3 alpine-sshd-ddos.filterd"
diff --git a/main/fail2ban/fail2ban.logrotate b/main/fail2ban/fail2ban.logrotate
index f635c3ddde..351bc40feb 100644
--- a/main/fail2ban/fail2ban.logrotate
+++ b/main/fail2ban/fail2ban.logrotate
@@ -4,7 +4,7 @@
missingok
compress
postrotate
- /usr/bin/fail2ban-client set logtarget /var/log/fail2ban.log 1>/dev/null || true
+ /usr/bin/fail2ban-client flushlogs 1>/dev/null || true
chown :wheel /var/log/fail2ban.log
chmod 640 /var/log/fail2ban.log
endscript
diff --git a/main/fcgiwrap/APKBUILD b/main/fcgiwrap/APKBUILD
index 21bd32e606..ec5214f2ac 100644
--- a/main/fcgiwrap/APKBUILD
+++ b/main/fcgiwrap/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fcgiwrap
pkgver=1.1.0
-pkgrel=3
+pkgrel=5
pkgdesc="Simple server for running CGI applications over FastCGI"
url="https://github.com/gnosek/fcgiwrap"
arch="all"
@@ -12,7 +12,7 @@ pkggroups="www-data"
install="$pkgname.pre-install"
makedepends="$depends_dev autoconf libtool automake fcgi-dev"
subpackages="$pkgname-doc $pkgname-openrc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/gnosek/$pkgname/archive/$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/gnosek/fcgiwrap/archive/$pkgver.tar.gz
$pkgname.initd
$pkgname.confd"
@@ -37,5 +37,5 @@ package() {
}
sha512sums="b8d35762d1d3c94a67602290b0092f0c38cffbbcd3dbc16597abf8b92172909b04450c238de2e430e841a17dd47fdd48d6a001f77539966980ef1af61e447ddc fcgiwrap-1.1.0.tar.gz
-0dbf5f4387e5dc5de6e9bd6d98247e175f1a7943fe1d04ea916881b1269fd0b62abfafac91f8c0dd2f4dc9c71118195ba9dd7cf9bb5e3d93e6e711ec7d770453 fcgiwrap.initd
+e6111da1089df43f8656e598edf4e658cd2d70e6066833a2c7a465229723e1edce144cf214bd8f771298d54948b8128012c4ce4d509c9d9307a54e8ef90ff2d8 fcgiwrap.initd
893e9afa92c20c9d0dab68fffc806a1be1f2e28a7e73bbb497316386a9ee083be4bad68a90f660e489311a9812a512b50fb0edb8b9c49b12f6cd266ba53b01a6 fcgiwrap.confd"
diff --git a/main/fcgiwrap/fcgiwrap.initd b/main/fcgiwrap/fcgiwrap.initd
index 353e51f393..2d2e05d8e5 100644
--- a/main/fcgiwrap/fcgiwrap.initd
+++ b/main/fcgiwrap/fcgiwrap.initd
@@ -29,6 +29,7 @@ start() {
ebegin "Starting ${name}"
start-stop-daemon --exec ${command} \
--background \
+ -k 0002 \
-u ${user} -g ${group} \
--start -- ${command_args}
eend $?
diff --git a/main/fcgiwrap/fcgiwrap.pre-install b/main/fcgiwrap/fcgiwrap.pre-install
index cdd114e0ec..ec2ba415e5 100644
--- a/main/fcgiwrap/fcgiwrap.pre-install
+++ b/main/fcgiwrap/fcgiwrap.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
adduser -S -D -H -h /var/run/fcgiwrap -s /sbin/nologin -G www-data \
fcgiwrap 2>/dev/null
exit 0
diff --git a/main/fetchmail/APKBUILD b/main/fetchmail/APKBUILD
index 19c6d6b795..83438f28ff 100644
--- a/main/fetchmail/APKBUILD
+++ b/main/fetchmail/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fetchmail
-pkgver=6.4.6
-pkgrel=1
+pkgver=6.4.8
+pkgrel=0
pkgdesc="A remote-mail retrieval and forwarding utility"
url="https://www.fetchmail.info/"
arch="all"
@@ -63,6 +63,6 @@ fetchmailconf() {
}
-sha512sums="0101c79039c754b55e94181fb6c51f07782e581123e25ac72a99c2abe8f3ac4af3e97b12bab50813fb9300179b921c80d0bc60f528ad73c914ad266e29fb6513 fetchmail-6.4.6.tar.xz
+sha512sums="c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987 fetchmail-6.4.8.tar.xz
9520ec6616f4004d091b1c908d3ea38e104ad8f6595959a3cd3ef7544d05e3b75854631289e167ead08479250d04584d3f1855668a7a0ebd16a1ee9106f3b0b3 fetchmail.initd
6f031ec6bd4a3ae53cd04fbd8470f4d10bd46ca29cabffa634a6801aa2e7707169855fbc045ced3c9a69523e694511a3f076b611678143e49339c8ccac98074e fetchmail.confd"
diff --git a/main/fish/APKBUILD b/main/fish/APKBUILD
index 700e844d1a..b8c167cbe6 100644
--- a/main/fish/APKBUILD
+++ b/main/fish/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Leo <thinkabit.ukim@gmail.com>
pkgname=fish
pkgver=3.1.2
-pkgrel=0
+pkgrel=1
pkgdesc="Modern interactive commandline shell"
url="http://www.fishshell.com"
arch="all"
@@ -49,6 +49,9 @@ package() {
mkdir -p "$pkgdir"/usr/lib
mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib
+
+ # https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/10159#note_101679
+ rm "$pkgdir"/usr/share/fish/completions/rustup.fish
}
doc() {
diff --git a/main/font-misc-ethiopic/APKBUILD b/main/font-misc-ethiopic/APKBUILD
index a1685b29e6..a914c339c9 100644
--- a/main/font-misc-ethiopic/APKBUILD
+++ b/main/font-misc-ethiopic/APKBUILD
@@ -1,42 +1,29 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-misc-ethiopic
-pkgver=1.0.3
+pkgver=1.0.4
pkgrel=0
pkgdesc="X.org misc ethiopic fonts"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
arch="noarch"
-license="custom"
+license="MIT"
depends="encodings font-alias mkfontscale mkfontdir fontconfig"
makedepends="font-util-dev bdftopcf"
-install=
source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
- cd "$_builddir"
- update_config_sub || return 1
-}
-
build() {
- cd "$_builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
- --with-mapfiles=/usr/share/fonts/util \
- --with-fontdir=/usr/share/fonts/ethiopic \
- || return 1
- make || return 1
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --with-fontrootdir=/usr/share/fonts
+ make
}
package() {
- cd "$_builddir"
- make -j1 DESTDIR="$pkgdir" \
- FCCACHE=: \
- MKFONTDIR=: \
- MKFONTSCALE=: \
- install || return 1
+ make DESTDIR="$pkgdir" FCCACHE=: MKFONTDIR=: MKFONTSCALE=: install
}
-sha512sums="b3e3f7462f37216796730a894761c7d60d5ede0f51351997e6c3c92e3136c788a2710690f482d05ed1396a4b6be452e1f871febc7e5b7a1a67e43bcc1ec7c77d font-misc-ethiopic-1.0.3.tar.bz2"
+sha512sums="4fed9ff3782746898c56dac199e9ca89356f4967779937049b9ff4ffad202317c023859f92d44b371dfa5485d5368ccad648e64b12cde0ed21f7d4aee5affcd5 font-misc-ethiopic-1.0.4.tar.bz2"
diff --git a/main/fping/APKBUILD b/main/fping/APKBUILD
index e2dfa2e60f..c4f317ddd6 100644
--- a/main/fping/APKBUILD
+++ b/main/fping/APKBUILD
@@ -1,17 +1,16 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fping
-pkgver=4.2
+pkgver=5.0
pkgrel=0
pkgdesc="A utility to ping multiple hosts at once"
-url="http://fping.org/"
+url="https://fping.org/"
arch="all"
license="MIT"
subpackages="$pkgname-doc"
-source="http://fping.org/dist/fping-$pkgver.tar.gz"
+source="https://fping.org/dist/fping-$pkgver.tar.gz"
options="suid !check" # No testsuite
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -22,9 +21,8 @@ build() {
}
package() {
- cd "$builddir"
make install DESTDIR="$pkgdir"
chmod 4755 "$pkgdir"/usr/sbin/fping*
}
-sha512sums="2bab34dae539d942eb5e436802e6f74d57c04aa4b782f9adbd6c27830209fdb47707131f20ed966012bcec3d253c9bb3df9033a60b55bfe560af6bb1f572ee8a fping-4.2.tar.gz"
+sha512sums="c843f7bb7c4e3289c4dd9eb8ae2ab93a363316c0000aac9187f79580a3d2505df179f2e0ae9e0a791c74bfc9e17c476874f8e122dfa6ad74930498c4e02d0de3 fping-5.0.tar.gz"
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index 0d864e7f50..56dadcd126 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -5,7 +5,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=freeradius
pkgver=3.0.21
-pkgrel=3
+pkgrel=5
pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
url="https://freeradius.org/"
arch="all"
@@ -385,7 +385,7 @@ _enable_mod() {
sha512sums="85af1c305e99a56400b04be5c966900e7df8beb7b54626d6aa0cb300dc124817e43b424f9b27d86966bb76cca87dce741812ed8d681a568c7d7b63b3b53a9dfa freeradius-server-3.0.21.tar.gz
c3ae1ee6bd7743f883310612ba2c20c6ff7f288fedc308735df05b097ecb2f7fa4d1679b844e262757808978c7bb2d7630b99e4b87ce6d6ba7f84013f9c49f1d freeradius.logrotated
bb3df1fa2c9ed95514ae090e0f6619c4e3280f424c4351bc79f5254bf1a327fa7d27e5fe3add5ab8d9e5ba3792c9553bd9a0481fe9c5bc34945ce46627ef2638 radiusd.confd
-a66ab5d3f1c86450e9c50aa8be10a40fb4118467670048773ad8c80b5f3fb958dd3addc6ef245289d93ce2b184ce2c9882a8a2585d4a134d55c2326c9559f558 radiusd.initd
+6b17bfd4151e341917c9b44a60862c24da87ff35f4094a4ec4e27756d44a0fdba3a7c6dca7c82f5e234100e033ae3b286983005ddd9fa8964e0f76bacaa212ee radiusd.initd
9f6a4f76fd06e81cfcfe4536f1f8be494634b07e548a6f7e651e5501aded24b030ed7d57dbdc867ae0eb39ee4a090234c4122a89bed84c13733c77de36b9c2cf setup-freeradius.in
5f940e200aa39b2fbbfaf5b24f2ad99869fa75bb7e2008876940ea96cb9dbc7f2b27dd1672aa56cdb5243faabdcbc38875594dd8792af965987183c0aa2aefd1 print-var.mk
c49e5eec7497fccde5fd09dba1ea9b846e57bc88015bd81640aa531fb5c9b449f37136f42c85fe1d7940c5963aed664b85da28442b388c9fb8cc27873df03b2d musl-fix-headers.patch
diff --git a/main/freeradius/radiusd.initd b/main/freeradius/radiusd.initd
index 5e3a0b4e34..a1ad43aa82 100644
--- a/main/freeradius/radiusd.initd
+++ b/main/freeradius/radiusd.initd
@@ -1,4 +1,5 @@
#!/sbin/openrc-run
+supervisor=supervise-daemon
name="FreeRADIUS"
description_checkconfig="Check configuration"
@@ -13,9 +14,6 @@ cfgname="${cfgfile##*/}"
command="/usr/sbin/radiusd"
# RADIUSD_OPTS is for backward compatibility only
command_args="-f -d ${cfgfile%/*} -n ${cfgname%.conf} ${command_args:-$RADIUSD_OPTS}"
-command_background="yes"
-pidfile="/run/$RC_SVCNAME.pid"
-
required_files="$cfgfile"
depend() {
@@ -38,6 +36,6 @@ checkconfig() {
reload () {
ebegin "Reloading $name"
- start-stop-daemon --signal HUP --pidfile "$pidfile"
+ $supervisor ${command##*\/} --signal HUP
eend $?
}
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 46bf887814..a471ff586a 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Cameron Banta <cbanta@gmail.com>
pkgname=freeswitch
pkgver=1.10.3
-pkgrel=0
+pkgrel=3
pkgdesc="A communications platform written in C from the ground up"
url="http://www.freeswitch.org"
arch="all"
@@ -51,7 +51,9 @@ makedepends="
xmlrpc-c-dev
yasm
zlib-dev
- autoconf automake libtool
+ autoconf
+ automake
+ libtool
"
install="$pkgname.pre-install $pkgname.pre-upgrade"
_freeswitch_user=freeswitch
@@ -130,7 +132,7 @@ package() {
"$pkgdir"/etc/init.d/$pkgname
install -m644 -D "$srcdir"/$pkgname.confd \
"$pkgdir"/etc/conf.d/$pkgname
- chown -R $FREESWITCH_USER:$FREESWITCH_GROUP "$pkgdir"/var/*/freeswitch
+ chown -R $_freeswitch_user:$_freeswitch_group "$pkgdir"/var/*/freeswitch
# install perlesl module
cd "$builddir"/libs/esl
@@ -228,6 +230,6 @@ c1960f3c7acf729468b819f7f15d66a251c3967b2784bce18c7755b333156e687c55fdc1aceda588
4ceb48f64d2bc26a02cc0846276506241bfd30c156422b0a1d608fd172c099feb5c121a763652e9a45046dcdd0ba0eb71eab240e0c6ce2ad63ff781719e135a4 getlib.patch
98a53f289c3647cafd05b6f847da0504a838a6e06545c133c10fb058c2d941e6bccf2820f44649fc25f94a4a5b7c1280eaee91098e8110f96ed3342c1cb4346c libvpx-fix-arm-float-abi.patch
16e9208fca7f0a1985dd01ec38ddabb6a79da83ad6ab004bb66de528ac45f02fadaddc50a9f228e1aa38fae213fa5af0ca858b7af629b67a7d654339f813a68c disable-Werror.patch
-eb8949d6cc8f441e94355dfc74928d944c0c763cd438b450186b53044f3999fbef83006d191d3dcd48a0f57d4b7642fd35ac987e942febbe74418b10b78e16a8 modules.conf
+ceeb2bb37fac580483000daff327a4c005d42b7eabdba4671ed2b0e78cddda8a42ae76e42bdf4a1b2e42874c4709887bcee9cb08a4c1dafcfeaec21e467726bf modules.conf
a585f6411185a26206137a1ad97a06fd6c73e80c5439e9be45eabfa70e7a83120169ba882971fcd328436c8e0242cbd664170b80754ea2846021689baf1f1595 freeswitch.confd
643d0a2e43f5d3bf3b99fcb6f6422302cb4b74a95eccf844eafb100b15aa9856b4ff41f112d6637255c2e9e2bec9fedc9a9215dfff214dfb83b52eae16b71dca freeswitch.initd"
diff --git a/main/freeswitch/modules.conf b/main/freeswitch/modules.conf
index bf3ca84793..294f4dba2c 100644
--- a/main/freeswitch/modules.conf
+++ b/main/freeswitch/modules.conf
@@ -1,5 +1,7 @@
#applications/mod_abstraction
+#applications/mod_av
applications/mod_avmd
+#applications/mod_bert
applications/mod_blacklist
applications/mod_callcenter
#applications/mod_cidlookup
@@ -7,6 +9,7 @@ applications/mod_cluechoo
applications/mod_commands
applications/mod_conference
applications/mod_curl
+#applications/mod_cv
applications/mod_db
applications/mod_directory
applications/mod_distributor
@@ -20,29 +23,38 @@ applications/mod_fifo
#applications/mod_fsk
#applications/mod_fsv
applications/mod_hash
+#applications/mod_hiredis
applications/mod_httapi
applications/mod_http_cache
#applications/mod_ladspa
#applications/mod_lcr
#applications/mod_memcache
#applications/mod_mongo
+#applications/mod_mp4
+#applications/mod_mp4v2
#applications/mod_nibblebill
+#applications/mod_oreka
#applications/mod_osp
+#applications/mod_prefix
+#applications/mod_rad_auth
applications/mod_redis
#applications/mod_rss
+#applications/mod_signalwire
applications/mod_sms
+#applications/mod_sms_flowroute
#applications/mod_snapshot
-#applications/mod_snipe_hunt
#applications/mod_snom
+#applications/mod_sonar
#applications/mod_soundtouch
applications/mod_spandsp
applications/mod_spy
#applications/mod_stress
+#applications/mod_translate
applications/mod_valet_parking
+#applications/mod_video_filter
#applications/mod_vmd
applications/mod_voicemail
applications/mod_voicemail_ivr
-#applications/mod_random
#asr_tts/mod_cepstral
asr_tts/mod_flite
#asr_tts/mod_pocketsphinx
@@ -50,29 +62,33 @@ asr_tts/mod_flite
#asr_tts/mod_unimrcp
codecs/mod_amr
#codecs/mod_amrwb
+codecs/mod_b64
#codecs/mod_bv
-#codecs/mod_celt
+#codecs/mod_clearmode
#codecs/mod_codec2
#codecs/mod_com_g729
#codecs/mod_dahdi_codec
codecs/mod_g723_1
codecs/mod_g729
codecs/mod_h26x
-#codecs/mod_vpx
codecs/mod_ilbc
#codecs/mod_isac
+#codecs/mod_mp4v
codecs/mod_opus
codecs/mod_sangoma_codec
#codecs/mod_silk
#codecs/mod_siren
+#codecs/mod_theora
+#databases/mod_mariadb
+databases/mod_pgsql
dialplans/mod_dialplan_asterisk
#dialplans/mod_dialplan_directory
dialplans/mod_dialplan_xml
#directories/mod_ldap
#endpoints/mod_alsa
endpoints/mod_dingaling
+#endpoints/mod_gsmopen
#endpoints/mod_h323
-#endpoints/mod_html5
#endpoints/mod_khomp
endpoints/mod_loopback
#endpoints/mod_opal
@@ -80,20 +96,27 @@ endpoints/mod_portaudio
endpoints/mod_rtc
endpoints/mod_rtmp
endpoints/mod_skinny
-#endpoints/mod_skypopen
endpoints/mod_sofia
endpoints/mod_verto
+#event_handlers/mod_amqp
event_handlers/mod_cdr_csv
-event_handlers/mod_json_cdr
#event_handlers/mod_cdr_mongodb
event_handlers/mod_cdr_pg_csv
event_handlers/mod_cdr_sqlite
#event_handlers/mod_erlang_event
#event_handlers/mod_event_multicast
event_handlers/mod_event_socket
-#event_handlers/mod_event_zmq
+#event_handlers/mod_fail2ban
+#event_handlers/mod_format_cdr
+event_handlers/mod_json_cdr
#event_handlers/mod_radius_cdr
+#event_handlers/mod_odbc_cdr
+#event_handlers/mod_kazoo
+#event_handlers/mod_rayo
+#event_handlers/mod_smpp
event_handlers/mod_snmp
+#event_handlers/mod_event_zmq
+#formats/mod_imagick
formats/mod_local_stream
formats/mod_native_file
formats/mod_png
@@ -101,28 +124,39 @@ formats/mod_png
formats/mod_shell_stream
formats/mod_shout
formats/mod_sndfile
+#formats/mod_ssml
formats/mod_tone_stream
#formats/mod_vlc
+#formats/mod_opusfile
+#languages/mod_basic
#languages/mod_java
languages/mod_lua
#languages/mod_managed
languages/mod_perl
#languages/mod_python
-#languages/mod_spidermonkey
+#languages/mod_v8
#languages/mod_yaml
loggers/mod_console
+#loggers/mod_graylog2
loggers/mod_logfile
loggers/mod_syslog
+#loggers/mod_raven
say/mod_say_de
say/mod_say_en
say/mod_say_es
+say/mod_say_es_ar
+say/mod_say_fa
say/mod_say_fr
say/mod_say_he
+say/mod_say_hr
say/mod_say_hu
say/mod_say_it
+say/mod_say_ja
say/mod_say_nl
+say/mod_say_pl
say/mod_say_pt
say/mod_say_ru
+say/mod_say_sv
say/mod_say_th
say/mod_say_zh
#timers/mod_posix_timer
@@ -130,11 +164,11 @@ timers/mod_timerfd
xml_int/mod_xml_cdr
xml_int/mod_xml_curl
#xml_int/mod_xml_ldap
+#xml_int/mod_xml_radius
xml_int/mod_xml_rpc
xml_int/mod_xml_scgi
../../libs/freetdm/mod_freetdm
-#../../libs/openzap/mod_openzap
## Experimental Modules (don't cry if they're broken)
#../../contrib/mod/xml_int/mod_xml_odbc
diff --git a/main/freetds/APKBUILD b/main/freetds/APKBUILD
index 1c99cd0dc0..c2104818d0 100644
--- a/main/freetds/APKBUILD
+++ b/main/freetds/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=freetds
-pkgver=1.1.42
+pkgver=1.2.4
pkgrel=0
pkgdesc="Tabular Datastream Library"
url="https://www.freetds.org/"
@@ -38,5 +38,5 @@ package() {
make -j1 DESTDIR="$pkgdir" install
}
-sha512sums="a5ee2d7d04d596a0e4f6a2b8767178deaa508d36429ab991d7fbdff78e6f2c64e02d5b2e79edb3911ffe42bded3561a966b482c4cfea00771813ec5922c794c3 freetds-1.1.42.tar.bz2
+sha512sums="511d21f590c699b1a1a0aa4f16cfefe5c28600f1dcceee86ef6a2b08b923bebff6b7b96ca4171ad286c6e96cb8836414845b63d0b664283b02c2e5f98edf5598 freetds-1.2.4.tar.bz2
9ca126d9316cf48fa5f9572b5aa9122eb114033627ab75f6715bce0260d70c6a7bb8a71ecb1e209a4f83416332d10942c7aaf02a5249948cf1cec6a1a457a236 fix-includes.patch"
diff --git a/main/fribidi/APKBUILD b/main/fribidi/APKBUILD
index 4450f6d5e1..a8bc91a18c 100644
--- a/main/fribidi/APKBUILD
+++ b/main/fribidi/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fribidi
-pkgver=1.0.9
+pkgver=1.0.10
pkgrel=0
pkgdesc="Free Implementation of the Unicode Bidirectional Algorithm"
url="https://github.com/fribidi/fribidi"
@@ -30,4 +30,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="e66989830941172fa003c8b9376719282fa1039592a1e158e975cab81ce8dcb2755453c64906a8464c047f9e9154e012d9bd37256b1f463e235648a13e4601ed fribidi-1.0.9.tar.xz"
+sha512sums="cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360 fribidi-1.0.10.tar.xz"
diff --git a/main/fsarchiver/APKBUILD b/main/fsarchiver/APKBUILD
index c1832b1218..dfc92d5ab0 100644
--- a/main/fsarchiver/APKBUILD
+++ b/main/fsarchiver/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=fsarchiver
pkgver=0.8.5
-pkgrel=1
+pkgrel=2
pkgdesc="Safe and flexible file-system backup and deployment tool"
options="!check" # No testsuite
arch="all"
-url="http://www.fsarchiver.org/"
+url="https://www.fsarchiver.org/"
license="GPL-2.0-only"
makedepends="linux-headers attr-dev bzip2-dev e2fsprogs-dev lz4-dev lzo-dev
xz-dev libgcrypt-dev zlib-dev zstd-dev"
diff --git a/main/fuse3/APKBUILD b/main/fuse3/APKBUILD
index d3527585fd..44a6f39674 100644
--- a/main/fuse3/APKBUILD
+++ b/main/fuse3/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fuse3
_pkgname=fuse
-pkgver=3.9.2
+pkgver=3.9.3
pkgrel=0
pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface"
url="https://github.com/libfuse/libfuse"
@@ -25,14 +25,8 @@ builddir="$srcdir"/$_pkgname-$pkgver
# - CVE-2018-10906
build() {
- meson \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --localstatedir=/var \
- --buildtype=plain \
- . output
- ninja -C output
+ abuild-meson . output
+ meson compile ${JOBS:+-j ${JOBS}} -C output
}
check() {
@@ -40,7 +34,7 @@ check() {
}
package() {
- DESTDIR="$pkgdir" ninja -C output install
+ DESTDIR="$pkgdir" meson install --no-rebuild -C output
rm -r "$pkgdir"/dev "$pkgdir"/etc/init.d
install -Dm755 "$srcdir"/fuse.initd "$pkgdir"/etc/init.d/fuse
@@ -70,6 +64,6 @@ _openrc() {
install_if="openrc fuse-common=$pkgver-r$pkgrel"
}
-sha512sums="47795d2e0431c93ff36609247016a5ddfa631e4dcdc56cb579030bdb78497e3fa2db28b0cbadd0848024be39381c54f8441de28b0af51f8b800519e76c7af9ed fuse-3.9.2.tar.xz
+sha512sums="e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26 fuse-3.9.3.tar.xz
1a9e1d1e8a7b0778ffde328e4322c73b5d57ec98d52767c846d755cce861ab27989823a75b6c5f994432ddb77fa351dfa4a8f948c9467c5f7d5f471e4608358b fix-realpath.patch
7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 fuse.initd"
diff --git a/main/gcc/0002-posix_memalign.patch b/main/gcc/0001-posix_memalign.patch
index 874f49b9b0..afb68c1858 100644
--- a/main/gcc/0002-posix_memalign.patch
+++ b/main/gcc/0001-posix_memalign.patch
@@ -1,14 +1,14 @@
-From 65eb86f3e110998d30489df009d44b4bc1043adc Mon Sep 17 00:00:00 2001
+From 399f9e74a691ca6272d460d72d1b47afcad84752 Mon Sep 17 00:00:00 2001
From: Szabolcs Nagy <nsz@port70.net>
Date: Fri, 26 Jan 2018 20:32:50 +0000
-Subject: [PATCH 02/12] posix_memalign
+Subject: [PATCH 01/30] posix_memalign
---
gcc/config/i386/pmm_malloc.h | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index ffbb7f82cf5..b0b890d2403 100644
+index 87344d9383f..ece428df487 100644
--- a/gcc/config/i386/pmm_malloc.h
+++ b/gcc/config/i386/pmm_malloc.h
@@ -27,12 +27,13 @@
@@ -38,5 +38,5 @@ index ffbb7f82cf5..b0b890d2403 100644
else
return NULL;
--
-2.17.1
+2.27.0
diff --git a/main/gcc/0003-gcc-poison-system-directories.patch b/main/gcc/0002-gcc-poison-system-directories.patch
index 0d6d964d3e..e388dd1be2 100644
--- a/main/gcc/0003-gcc-poison-system-directories.patch
+++ b/main/gcc/0002-gcc-poison-system-directories.patch
@@ -1,11 +1,20 @@
-From 48c670d2678e0323d88eb72205e039f393cabe05 Mon Sep 17 00:00:00 2001
+From 0e993b1b9a33910193862d76facf34bdbe58ed01 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 03/39] gcc: poison-system-directories
+Subject: [PATCH 02/30] gcc: poison-system-directories
+Add /sw/include and /opt/include based on the original
+zecke-no-host-includes.patch patch. The original patch checked for
+/usr/include, /sw/include and /opt/include and then triggered a failure and
+aborted.
+
+Instead, we add the two missing items to the current scan. If the user
+wants this to be a failure, they can add "-Werror=poison-system-directories".
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Inappropriate [distribution: codesourcery]
+Upstream-Status: Pending
---
gcc/common.opt | 4 ++++
gcc/config.in | 6 ++++++
@@ -13,14 +22,14 @@ Upstream-Status: Inappropriate [distribution: codesourcery]
gcc/configure.ac | 10 ++++++++++
gcc/doc/invoke.texi | 9 +++++++++
gcc/gcc.c | 2 ++
- gcc/incpath.c | 19 +++++++++++++++++++
- 7 files changed, 66 insertions(+)
+ gcc/incpath.c | 21 +++++++++++++++++++++
+ 7 files changed, 68 insertions(+)
diff --git a/gcc/common.opt b/gcc/common.opt
-index d6ef85928f3..7b29efe3882 100644
+index 3ec7743eae8..d3c3e51dcb0 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
-@@ -679,6 +679,10 @@ Wreturn-local-addr
+@@ -682,6 +682,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.
@@ -32,10 +41,10 @@ index d6ef85928f3..7b29efe3882 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 5bccb408016..1c784a8276b 100644
+index 364eba47737..9551c0dfdf9 100644
--- a/gcc/config.in
+++ b/gcc/config.in
-@@ -194,6 +194,12 @@
+@@ -224,6 +224,12 @@
#endif
@@ -49,10 +58,10 @@ index 5bccb408016..1c784a8276b 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 5c345ce0fd7..cafd05fd150 100755
+index eb6061c1631..90e3be864f8 100755
--- a/gcc/configure
+++ b/gcc/configure
-@@ -953,6 +953,7 @@ with_system_zlib
+@@ -1010,6 +1010,7 @@ with_system_zlib
enable_maintainer_mode
enable_link_mutex
enable_version_specific_runtime_libs
@@ -60,7 +69,7 @@ index 5c345ce0fd7..cafd05fd150 100755
enable_plugin
enable_host_shared
enable_libquadmath_support
-@@ -1696,6 +1697,8 @@ Optional Features:
+@@ -1766,6 +1767,8 @@ Optional Features:
--enable-version-specific-runtime-libs
specify that runtime libraries should be installed
in a compiler-specific directory
@@ -69,7 +78,7 @@ index 5c345ce0fd7..cafd05fd150 100755
--enable-plugin enable plugin support
--enable-host-shared build host code as shared libraries
--disable-libquadmath-support
-@@ -29715,6 +29718,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+@@ -30266,6 +30269,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
fi
@@ -90,10 +99,10 @@ index 5c345ce0fd7..cafd05fd150 100755
diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 65dbf1f2f80..dd5b38195ce 100644
+index 715fcba0482..f42006e5476 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
-@@ -6341,6 +6341,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+@@ -6600,6 +6600,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
[specify that runtime libraries should be
installed in a compiler-specific directory])])
@@ -111,18 +120,18 @@ index 65dbf1f2f80..dd5b38195ce 100644
AC_SUBST(subdirs)
AC_SUBST(srcdir)
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 255149fcfb8..cb71b60fe3c 100644
+index a2794a67d1e..dfed8fd25a8 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
-@@ -303,6 +303,7 @@ Objective-C and Objective-C++ Dialects}.
- -Wpacked -Wpacked-bitfield-compat -Wpacked-not-aligned -Wpadded @gol
+@@ -348,6 +348,7 @@ Objective-C and Objective-C++ Dialects}.
+ -Wpacked -Wno-packed-bitfield-compat -Wpacked-not-aligned -Wpadded @gol
-Wparentheses -Wno-pedantic-ms-format @gol
- -Wplacement-new -Wplacement-new=@var{n} @gol
+ -Wpointer-arith -Wno-pointer-compare -Wno-pointer-to-int-cast @gol
+-Wno-poison-system-directories @gol
- -Wpointer-arith -Wpointer-compare -Wno-pointer-to-int-cast @gol
- -Wno-pragmas -Wredundant-decls -Wrestrict -Wno-return-local-addr @gol
- -Wreturn-type -Wsequence-point -Wshadow -Wno-shadow-ivar @gol
-@@ -5712,6 +5713,14 @@ made up of data only and thus requires no special treatment. But, for
+ -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls @gol
+ -Wrestrict -Wno-return-local-addr -Wreturn-type @gol
+ -Wno-scalar-storage-order -Wsequence-point @gol
+@@ -6924,6 +6925,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.
@@ -138,11 +147,11 @@ index 255149fcfb8..cb71b60fe3c 100644
@opindex Wfloat-equal
@opindex Wno-float-equal
diff --git a/gcc/gcc.c b/gcc/gcc.c
-index a716f708259..02b3cd39fc2 100644
+index 9f790db0daf..b2200c5185a 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
-@@ -1061,6 +1060,8 @@
- "-z relro -z now " \
+@@ -1041,6 +1041,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}}} \
+ %{Wno-poison-system-directories:--no-poison-system-directories} \
@@ -151,7 +160,7 @@ index a716f708259..02b3cd39fc2 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 b11c6a57939..e3b7a21966f 100644
+index 8a2bda00f80..9098ab044ab 100644
--- a/gcc/incpath.c
+++ b/gcc/incpath.c
@@ -26,6 +26,7 @@
@@ -190,5 +199,5 @@ index b11c6a57939..e3b7a21966f 100644
/* Use given -I paths for #include "..." but not #include <...>, and
--
-2.17.0
+2.27.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
new file mode 100644
index 0000000000..511636e522
--- /dev/null
+++ b/main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
@@ -0,0 +1,39 @@
+From a35a55940c3402f8ebb510ec7d8bc67e85051277 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:45:49 +0000
+Subject: [PATCH 03/30] Turn on -Wl,-z,relro,-z,now by default.
+
+---
+ gcc/doc/invoke.texi | 3 +++
+ gcc/gcc.c | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index dfed8fd25a8..ca56d52cb05 100644
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -14638,6 +14638,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+ linker. When using the GNU linker, you can also get the same effect with
+ @option{-Wl,-Map=output.map}.
+
++NOTE: In Alpine Linux, for LDFLAGS, the option
++@option{-Wl,-z,relro,now} is used. To disable, use @option{-Wl,-z,norelro}.
++
+ @item -u @var{symbol}
+ @opindex u
+ Pretend the symbol @var{symbol} is undefined, to force linking of
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index b2200c5185a..625c9ab7902 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -1039,6 +1039,7 @@ proper position among the other output files. */
+ "%{flto|flto=*:%<fcompare-debug*} \
+ %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
+ "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
++ "-z relro -z now " \
+ "%X %{o*} %{e*} %{N} %{n} %{r}\
+ %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
+ %{Wno-poison-system-directories:--no-poison-system-directories} \
+--
+2.27.0
+
diff --git a/main/gcc/003_all_default-fortify-source.patch b/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
index 6ca8033430..d2b4233184 100644
--- a/main/gcc/003_all_default-fortify-source.patch
+++ b/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
@@ -1,16 +1,34 @@
-# DP: Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC, ObjC++,
-# DP: if the optimization level is > 0
+From d2865d0a184ef59be8893dd34edf5037c4bf48f7 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:46:22 +0000
+Subject: [PATCH 04/30] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
+ ObjC, ObjC++, if the optimization level is > 0
---
- gcc/doc/invoke.texi | 6 ++++++
- gcc/c-family/c-cppbuiltin.c | 3 +
- 2 files changed, 9 insertions(+), 0 deletions(-)
+ gcc/c-family/c-cppbuiltin.c | 4 ++++
+ gcc/doc/invoke.texi | 6 ++++++
+ 2 files changed, 10 insertions(+)
-Index: b/gcc/doc/invoke.texi
-===================================================================
+diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
+index db91a36794a..ed976c71404 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)
+ builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
+ builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
+
++ /* Fortify Source enabled by default for optimization levels > 0 */
++ if (optimize)
++ builtin_define_with_int_value ("_FORTIFY_SOURCE", 2);
++
+ /* Misc. */
+ if (flag_gnu89_inline)
+ cpp_define (pfile, "__GNUC_GNU_INLINE__");
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index ca56d52cb05..f5d5a1d1542 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
-@@ -7840,6 +7840,12 @@ also turns on the following optimization
+@@ -9228,6 +9228,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.
@@ -23,18 +41,6 @@ Index: b/gcc/doc/invoke.texi
@item -O3
@opindex O3
Optimize yet more. @option{-O3} turns on all optimizations specified
-Index: b/gcc/c-family/c-cppbuiltin.c
-===================================================================
---- a/gcc/c-family/c-cppbuiltin.c
-+++ b/gcc/c-family/c-cppbuiltin.c
-@@ -1176,6 +1176,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);
-
-+ /* Fortify Source enabled by default for optimization levels > 0 */
-+ if (optimize)
-+ builtin_define_with_int_value ("_FORTIFY_SOURCE", 2);
-+
- /* Misc. */
- if (flag_gnu89_inline)
- cpp_define (pfile, "__GNUC_GNU_INLINE__");
+--
+2.27.0
+
diff --git a/main/gcc/005_all_default-as-needed.patch b/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
index 2eced0f06c..41206fa9f8 100644
--- a/main/gcc/005_all_default-as-needed.patch
+++ b/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
@@ -1,71 +1,68 @@
-# DP: On linux targets pass --as-needed by default to the linker, but always
-# DP: link the sanitizer libraries with --no-as-needed.
+From 872e0a15a2b74cd6b6ba58e2e7e1605543ea36bd Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:46:56 +0000
+Subject: [PATCH 05/30] On linux targets pass --as-needed by default to the
+ linker, but always link the sanitizer libraries with --no-as-needed.
-Index: b/gcc/gcc.c
-===================================================================
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -692,8 +692,11 @@ proper position among the other output f
- #ifdef LIBASAN_EARLY_SPEC
- #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION \
-- "} -lasan %{static-libasan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
-+ " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+ " -lasan " \
-+ " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
-+ " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- STATIC_LIBASAN_LIBS
- #else
- #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -710,8 +713,11 @@ proper position among the other output f
- #ifdef LIBTSAN_EARLY_SPEC
- #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION \
-- "} -ltsan %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
-+ " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+ " -ltsan " \
-+ " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
-+ " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- STATIC_LIBTSAN_LIBS
- #else
- #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -728,8 +734,11 @@ proper position among the other output f
- #ifdef LIBLSAN_EARLY_SPEC
- #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION \
-- "} -llsan %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
-+ " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+ " -llsan " \
-+ " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
-+ " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- STATIC_LIBLSAN_LIBS
- #else
- #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -744,8 +753,11 @@ proper position among the other output f
- #define STATIC_LIBUBSAN_LIBS \
- " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
- #ifdef HAVE_LD_STATIC_DYNAMIC
--#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION \
-- "} -lubsan %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
-+ " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+ " -lubsan " \
-+ " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
-+ " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- STATIC_LIBUBSAN_LIBS
- #else
- #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
-Index: b/gcc/config/gnu-user.h
-===================================================================
+---
+ gcc/config/aarch64/aarch64-linux.h | 1 +
+ gcc/config/alpha/linux-elf.h | 2 +-
+ gcc/config/arm/linux-elf.h | 1 +
+ gcc/config/gnu-user.h | 6 +++---
+ gcc/config/i386/gnu-user.h | 2 +-
+ gcc/config/i386/gnu-user64.h | 1 +
+ gcc/config/ia64/linux.h | 2 +-
+ gcc/config/mips/gnu-user.h | 1 +
+ gcc/config/riscv/linux.h | 1 +
+ gcc/config/rs6000/linux64.h | 4 ++--
+ gcc/config/rs6000/sysv4.h | 2 +-
+ gcc/config/s390/linux.h | 2 +-
+ gcc/config/sparc/linux.h | 2 +-
+ gcc/gcc.c | 28 ++++++++++++++++++++--------
+ 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
+--- a/gcc/config/aarch64/aarch64-linux.h
++++ b/gcc/config/aarch64/aarch64-linux.h
+@@ -35,6 +35,7 @@
+ #define CPP_SPEC "%{pthread:-D_REENTRANT}"
+
+ #define LINUX_TARGET_LINK_SPEC "%{h*} \
++ --as-needed \
+ %{static:-Bstatic} \
+ %{shared:-shared} \
+ %{symbolic:-Bsymbolic} \
+diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
+index e25fcac3c59..22b2f7b0d14 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
+
+ #define ELF_DYNAMIC_LINKER GNU_USER_DYNAMIC_LINKER
+
+-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
++#define LINK_SPEC "-m elf64alpha --as-needed %{G*} %{relax:-relax} \
+ %{O*:-O3} %{!O*:-O1} \
+ %{shared:-shared} \
+ %{!shared: \
+diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
+index 0ec3aa53189..f8bda84de2a 100644
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
+@@ -70,6 +70,7 @@
+ %{rdynamic:-export-dynamic} \
+ %{!shared:-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \
+ -X \
++ --as-needed \
+ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
+ SUBTARGET_EXTRA_LINK_SPEC
+
+diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
+index ff2e880b1fa..7f30c363e4a 100644
--- a/gcc/config/gnu-user.h
+++ b/gcc/config/gnu-user.h
-@@ -161,15 +161,15 @@ see the files COPYING3 and COPYING.RUNTI
+@@ -136,17 +136,17 @@ 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 " \
@@ -84,20 +81,35 @@ Index: b/gcc/config/gnu-user.h
- LD_DYNAMIC_OPTION "}}%{!static-liblsan:-llsan}"
+ LD_DYNAMIC_OPTION "}}%{!static-liblsan:%{!fuse-ld=gold:--push-state} --no-as-needed -llsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
#endif
-Index: b/gcc/config/aarch64/aarch64-linux.h
-===================================================================
---- a/gcc/config/aarch64/aarch64-linux.h
-+++ b/gcc/config/aarch64/aarch64-linux.h
-@@ -35,6 +35,7 @@
- #define CPP_SPEC "%{pthread:-D_REENTRANT}"
- #define LINUX_TARGET_LINK_SPEC "%{h*} \
-+ --as-needed \
- %{static:-Bstatic} \
- %{shared:-shared} \
- %{symbolic:-Bsymbolic} \
-Index: b/gcc/config/ia64/linux.h
-===================================================================
+ #undef TARGET_F951_OPTIONS
+diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
+index ae4aa844f02..54b91c0492a 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
+ { "link_emulation", GNU_USER_LINK_EMULATION },\
+ { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
+
+-#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
++#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) --as-needed %{shared:-shared} \
+ %{!shared: \
+ %{!static: \
+ %{!static-pie: \
+diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
+index 785c68220b8..21dd66b412a 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
+ "%{" SPEC_64 ":-m " GNU_USER_LINK_EMULATION64 "} \
+ %{" SPEC_32 ":-m " GNU_USER_LINK_EMULATION32 "} \
+ %{" SPEC_X32 ":-m " GNU_USER_LINK_EMULATIONX32 "} \
++ --as-needed \
+ %{shared:-shared} \
+ %{!shared: \
+ %{!static: \
+diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
+index ee38e218aec..0325971d818 100644
--- a/gcc/config/ia64/linux.h
+++ b/gcc/config/ia64/linux.h
@@ -58,7 +58,7 @@ do { \
@@ -109,37 +121,35 @@ Index: b/gcc/config/ia64/linux.h
%{shared:-shared} \
%{!shared: \
%{!static: \
-Index: b/gcc/config/sparc/linux.h
-===================================================================
---- a/gcc/config/sparc/linux.h
-+++ b/gcc/config/sparc/linux.h
-@@ -86,7 +86,7 @@ extern const char *host_detect_local_cpu
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --as-needed %{shared:-shared} \
- %{!mno-relax:%{!r:-relax}} \
+diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
+index 5d0782100bb..4be5fbb2191 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
+ #undef GNU_USER_TARGET_LINK_SPEC
+ #define GNU_USER_TARGET_LINK_SPEC "\
+ %{G*} %{EB} %{EL} %{mips*} %{shared} \
++ -as-needed \
%{!shared: \
%{!static: \
-Index: b/gcc/config/s390/linux.h
-===================================================================
---- a/gcc/config/s390/linux.h
-+++ b/gcc/config/s390/linux.h
-@@ -78,7 +78,7 @@ along with GCC; see the file COPYING3.
+ %{rdynamic:-export-dynamic} \
+diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
+index 4afef7c228c..ba1a6e60e05 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
+ "%{mabi=ilp32:_ilp32}"
- #undef LINK_SPEC
- #define LINK_SPEC \
-- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --as-needed \
- %{shared:-shared} \
- %{!shared: \
- %{static:-static} \
-Index: b/gcc/config/rs6000/linux64.h
-===================================================================
+ #define LINK_SPEC "\
++-as-needed \
+ -melf" XLEN_SPEC "lriscv" LD_EMUL_SUFFIX " \
+ %{mno-relax:--no-relax} \
+ %{shared} \
+diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
+index 2ded3301282..a1e44ddcc0d 100644
--- a/gcc/config/rs6000/linux64.h
+++ b/gcc/config/rs6000/linux64.h
-@@ -490,13 +490,13 @@ extern int dot_symbols;
+@@ -457,13 +457,13 @@ extern int dot_symbols;
" -m elf64ppc")
#endif
@@ -155,90 +165,105 @@ Index: b/gcc/config/rs6000/linux64.h
%{!static-pie: \
%{rdynamic:-export-dynamic} \
-dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
-Index: b/gcc/config/rs6000/sysv4.h
-===================================================================
+diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
+index 9ade72114e9..9490b84a153 100644
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
-@@ -811,7 +811,7 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
- MUSL_DYNAMIC_LINKER)
+@@ -789,7 +789,7 @@ GNU_USER_TARGET_CC1_SPEC
+ #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
+ #endif
-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --as-needed %{!shared: %{!static: \
%{rdynamic:-export-dynamic} \
-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
-Index: b/gcc/config/i386/gnu-user64.h
-===================================================================
---- a/gcc/config/i386/gnu-user64.h
-+++ b/gcc/config/i386/gnu-user64.h
-@@ -56,6 +56,7 @@
- "%{" SPEC_64 ":-m " GNU_USER_LINK_EMULATION64 "} \
- %{" SPEC_32 ":-m " GNU_USER_LINK_EMULATION32 "} \
- %{" SPEC_X32 ":-m " GNU_USER_LINK_EMULATIONX32 "} \
-+ --as-needed \
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
-Index: b/gcc/config/i386/gnu-user.h
-===================================================================
---- 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.
- { "link_emulation", GNU_USER_LINK_EMULATION },\
- { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
-
--#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) --as-needed %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{!static-pie: \
-Index: b/gcc/config/alpha/linux-elf.h
-===================================================================
---- 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.
-
- #define ELF_DYNAMIC_LINKER GNU_USER_DYNAMIC_LINKER
+diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
+index 6919b468f06..56d52d41b31 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
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
-+#define LINK_SPEC "-m elf64alpha --as-needed %{G*} %{relax:-relax} \
- %{O*:-O3} %{!O*:-O1} \
- %{shared:-shared} \
- %{!shared: \
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -70,6 +70,7 @@
- %{rdynamic:-export-dynamic} \
- %{!shared:-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \
- -X \
-+ --as-needed \
- %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
- SUBTARGET_EXTRA_LINK_SPEC
+ #undef LINK_SPEC
+ #define LINK_SPEC \
+- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
++ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --as-needed \
+ %{shared:-shared} \
+ %{!shared: \
+ %{static:-static} \
+diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
+index 81201e67a2f..6477d7ec52e 100644
+--- a/gcc/config/sparc/linux.h
++++ b/gcc/config/sparc/linux.h
+@@ -87,7 +87,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-Index: b/gcc/config/mips/gnu-user.h
-===================================================================
---- 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.
- #undef GNU_USER_TARGET_LINK_SPEC
- #define GNU_USER_TARGET_LINK_SPEC "\
- %{G*} %{EB} %{EL} %{mips*} %{shared} \
-+ -as-needed \
+ #undef LINK_SPEC
+-#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
++#define LINK_SPEC "-m elf32_sparc --as-needed %{shared:-shared} \
+ %{!mno-relax:%{!r:-relax}} \
%{!shared: \
%{!static: \
- %{rdynamic:-export-dynamic} \
-Index: b/gcc/config/riscv/linux.h
-===================================================================
---- a/gcc/config/riscv/linux.h
-+++ b/gcc/config/riscv/linux.h
-@@ -58,6 +58,7 @@
- "%{mabi=ilp32:_ilp32}"
-
- #define LINK_SPEC "\
-+-as-needed \
- -melf" XLEN_SPEC "lriscv" LD_EMUL_SUFFIX " \
- %{mno-relax:--no-relax} \
- %{shared} \
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 625c9ab7902..7aec9d3a016 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -695,8 +695,11 @@ proper position among the other output files. */
+ #ifdef LIBASAN_EARLY_SPEC
+ #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
+ #elif defined(HAVE_LD_STATIC_DYNAMIC)
+-#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION \
+- "} -lasan %{static-libasan:" LD_DYNAMIC_OPTION "}" \
++#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
++ " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
++ " -lasan " \
++ " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
++ " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
+ STATIC_LIBASAN_LIBS
+ #else
+ #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
+@@ -713,8 +716,11 @@ proper position among the other output files. */
+ #ifdef LIBTSAN_EARLY_SPEC
+ #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
+ #elif defined(HAVE_LD_STATIC_DYNAMIC)
+-#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION \
+- "} -ltsan %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
++#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
++ " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
++ " -ltsan " \
++ " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
++ " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
+ STATIC_LIBTSAN_LIBS
+ #else
+ #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
+@@ -731,8 +737,11 @@ proper position among the other output files. */
+ #ifdef LIBLSAN_EARLY_SPEC
+ #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
+ #elif defined(HAVE_LD_STATIC_DYNAMIC)
+-#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION \
+- "} -llsan %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
++#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
++ " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
++ " -llsan " \
++ " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
++ " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
+ STATIC_LIBLSAN_LIBS
+ #else
+ #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
+@@ -747,8 +756,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
+-#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION \
+- "} -lubsan %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
++#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
++ " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
++ " -lubsan " \
++ " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
++ " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
+ STATIC_LIBUBSAN_LIBS
+ #else
+ #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
+--
+2.27.0
+
diff --git a/main/gcc/011_all_default-warn-format-security.patch b/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch
index f809abd9e7..37ab133e9a 100644
--- a/main/gcc/011_all_default-warn-format-security.patch
+++ b/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch
@@ -1,9 +1,18 @@
-Enable -Wformat and -Wformat-security by default.
+From 5e20872b8cc916cb457c63c6cd970c4fcba47bbb Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:47:43 +0000
+Subject: [PATCH 06/30] Enable -Wformat and -Wformat-security by default.
---- a/gcc/c-family/c.opt 2016-03-23 18:51:56.000000000 +0100
-+++ b/gcc/c-family/c.opt 2016-04-28 23:45:54.063351272 +0200
-@@ -459,7 +459,7 @@ C ObjC C++ ObjC++ Var(warn_format_nonlit
- Warn about format strings that are not literals.
+---
+ gcc/c-family/c.opt | 4 ++--
+ 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
+--- 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
+ of the destination region. Same as -Wformat-overflow=1.
Wformat-security
-C ObjC C++ ObjC++ Var(warn_format_security) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
@@ -11,7 +20,7 @@ Enable -Wformat and -Wformat-security by default.
Warn about possible security problems with format functions.
Wformat-signedness
-@@ -475,7 +475,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_l
+@@ -620,7 +620,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
Warn about zero-length formats.
Wformat=
@@ -19,4 +28,7 @@ Enable -Wformat and -Wformat-security by default.
+C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
Warn about printf/scanf/strftime/strfmon format string anomalies.
- Wignored-qualifiers
+ Wformat-overflow=
+--
+2.27.0
+
diff --git a/main/gcc/0007-Enable-Wtrampolines-by-default.patch b/main/gcc/0007-Enable-Wtrampolines-by-default.patch
new file mode 100644
index 0000000000..31a7faa037
--- /dev/null
+++ b/main/gcc/0007-Enable-Wtrampolines-by-default.patch
@@ -0,0 +1,25 @@
+From 1bcf7e30226852db956becebaffdfe2738923423 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:48:24 +0000
+Subject: [PATCH 07/30] Enable -Wtrampolines by default.
+
+---
+ gcc/common.opt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/common.opt b/gcc/common.opt
+index d3c3e51dcb0..7b68397c232 100644
+--- a/gcc/common.opt
++++ b/gcc/common.opt
+@@ -774,7 +774,7 @@ Common Var(warn_system_headers) Warning
+ Do not suppress warnings from system headers.
+
+ Wtrampolines
+-Common Var(warn_trampolines) Warning
++Common Var(warn_trampolines) Init(1) Warning
+ Warn whenever a trampoline is generated.
+
+ Wtype-limits
+--
+2.27.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
new file mode 100644
index 0000000000..0b3ce1a781
--- /dev/null
+++ b/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
@@ -0,0 +1,53 @@
+From 23fd86ff34670873dd294bd87b93f45c3624903a Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:49:40 +0000
+Subject: [PATCH 08/30] Disable ssp on -nostdlib, -nodefaultlibs and
+ -ffreestanding Change the buffer size.
+
+---
+ gcc/gcc.c | 8 +++++++-
+ gcc/params.opt | 2 +-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 7aec9d3a016..daeb4d0c8ea 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -886,6 +886,12 @@ proper position among the other output files. */
+ #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
+ #endif
+
++#ifdef ENABLE_DEFAULT_SSP
++#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} "
++#else
++#define NO_SSP_SPEC ""
++#endif
++
+ #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 =
+ %{-version:--version}\
+ %{-help=*:--help=%*}\
+ %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %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
+--- 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
+ The maximum number of SSA_NAME assignments to follow in determining a value.
+
+ -param=ssp-buffer-size=
+-Common Joined UInteger Var(param_ssp_buffer_size) Init(8) IntegerRange(1, 65536) Param Optimization
++Common Joined UInteger Var(param_ssp_buffer_size) Init(4) IntegerRange(1, 65536) Param Optimization
+ The lower bound for a buffer to be considered for stack smashing protection.
+
+ -param=stack-clash-protection-guard-size=
+--
+2.27.0
+
diff --git a/main/gcc/0008-s390x-muslldso.patch b/main/gcc/0008-s390x-muslldso.patch
deleted file mode 100644
index 64833f308f..0000000000
--- a/main/gcc/0008-s390x-muslldso.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b693804c8dba92fea7beee98f0aa520853a0532b Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Thu, 22 Dec 2016 11:22:28 +0000
-Subject: [PATCH 08/12] s390x muslldso
-
----
- gcc/config/s390/linux.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
-index 525c17c2c9f..2d4f4a0654e 100644
---- a/gcc/config/s390/linux.h
-+++ b/gcc/config/s390/linux.h
-@@ -76,6 +76,9 @@ along with GCC; see the file COPYING3. If not see
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
- #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
-
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-s390.so.1"
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-s390x.so.1"
-+
- #undef LINK_SPEC
- #define LINK_SPEC \
- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
---
-2.17.1
-
diff --git a/main/gcc/020_all_msgfmt-libstdc++-link.patch b/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
index a70ea50a07..0e059262e6 100644
--- a/main/gcc/020_all_msgfmt-libstdc++-link.patch
+++ b/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
@@ -1,4 +1,8 @@
-Ensure that msgfmt doesn't encounter problems during gcc bootstrapping.
+From d27d7936ecd9f357a3c6ee05e6548f8a68fdd4b7 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:50:33 +0000
+Subject: [PATCH 09/30] Ensure that msgfmt doesn't encounter problems during
+ gcc bootstrapping.
Solves error messages like the following:
@@ -16,10 +20,16 @@ library path, will make it work as expected here.
References:
https://bugs.gentoo.org/372377
https://bugs.gentoo.org/295480
+---
+ libstdc++-v3/po/Makefile.am | 1 +
+ libstdc++-v3/po/Makefile.in | 1 +
+ 2 files changed, 2 insertions(+)
---- gcc-4.1.2.orig/libstdc++-v3/po/Makefile.am
-+++ gcc-4.1.2/libstdc++-v3/po/Makefile.am
-@@ -39,6 +39,7 @@ MSGFMT = msgfmt
+diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
+index a9391d8d167..f7eee24dc8c 100644
+--- a/libstdc++-v3/po/Makefile.am
++++ b/libstdc++-v3/po/Makefile.am
+@@ -38,6 +38,7 @@ MSGFMT = msgfmt
EXTRA_DIST = string_literals.cc POTFILES.in $(PACKAGE).pot $(LOCALE_IN)
.po.mo:
@@ -27,9 +37,11 @@ https://bugs.gentoo.org/295480
$(MSGFMT) -o $@ $<
all-local: all-local-$(USE_NLS)
---- gcc-4.1.2.orig/libstdc++-v3/po/Makefile.in
-+++ gcc-4.1.2/libstdc++-v3/po/Makefile.in
-@@ -419,6 +419,7 @@ uninstall-am: uninstall-info-am
+diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
+index a0f84b0cfa0..ab24a47a2fd 100644
+--- a/libstdc++-v3/po/Makefile.in
++++ b/libstdc++-v3/po/Makefile.in
+@@ -548,6 +548,7 @@ uninstall-am:
.po.mo:
@@ -37,3 +49,6 @@ https://bugs.gentoo.org/295480
$(MSGFMT) -o $@ $<
all-local: all-local-$(USE_NLS)
+--
+2.27.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
new file mode 100644
index 0000000000..d85b7c593b
--- /dev/null
+++ b/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
@@ -0,0 +1,28 @@
+From 2ec258d6d31e2c0c614c5086acee84a87768a67c Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:52:07 +0000
+Subject: [PATCH 10/30] Don't declare asprintf if defined as a macro.
+
+---
+ include/libiberty.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/include/libiberty.h b/include/libiberty.h
+index 141cb886a85..fa0e78eb62f 100644
+--- a/include/libiberty.h
++++ b/include/libiberty.h
+@@ -645,8 +645,11 @@ extern int pwait (int, int *, int);
+ /* Like sprintf but provides a pointer to malloc'd storage, which must
+ be freed by the caller. */
+
++/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL. */
++#ifndef asprintf
+ extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
+ #endif
++#endif
+
+ /* Like asprintf but allocates memory without fail. This works like
+ xmalloc. */
+--
+2.27.0
+
diff --git a/main/gcc/0010-ldbl128-config.patch b/main/gcc/0010-ldbl128-config.patch
deleted file mode 100644
index b5a1010528..0000000000
--- a/main/gcc/0010-ldbl128-config.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 47467f3ab0fb2f2fcede81060fe8bb339d0909eb Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Wed, 28 Feb 2018 00:54:05 +0000
-Subject: [PATCH 10/12] ldbl128 config
-
----
- gcc/configure | 13 +++++++++++++
- gcc/configure.ac | 16 ++++++++++++++--
- 2 files changed, 27 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/configure b/gcc/configure
-index 6121e163259..07ff8597d48 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -29309,6 +29309,15 @@ if test "${with_long_double_128+set}" = set; then :
- withval=$with_long_double_128; gcc_cv_target_ldbl128="$with_long_double_128"
- else
-
-+ case "$target" in
-+ s390*-*-linux-musl*)
-+ gcc_cv_target_ldbl128=yes
-+ ;;
-+ powerpc*-*-linux-musl*)
-+ gcc_cv_target_ldbl128=no
-+ ;;
-+ *)
-+
- if test $glibc_version_major -gt 2 \
- || ( test $glibc_version_major -eq 2 && test $glibc_version_minor -ge 4 ); then :
- gcc_cv_target_ldbl128=yes
-@@ -29320,6 +29329,10 @@ else
- && gcc_cv_target_ldbl128=yes
-
- fi
-+
-+ ;;
-+ esac
-+
- fi
-
- ;;
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index b066cc609e1..6c15ed898c0 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -5971,13 +5971,25 @@ case "$target" in
- AC_ARG_WITH(long-double-128,
- [AS_HELP_STRING([--with-long-double-128],
- [use 128-bit long double by default])],
-- gcc_cv_target_ldbl128="$with_long_double_128",
-+ gcc_cv_target_ldbl128="$with_long_double_128", [
-+ case "$target" in
-+ s390*-*-linux-musl*)
-+ gcc_cv_target_ldbl128=yes
-+ ;;
-+ powerpc*-*-linux-musl*)
-+ gcc_cv_target_ldbl128=no
-+ ;;
-+ *)]
- [GCC_GLIBC_VERSION_GTE_IFELSE([2], [4], [gcc_cv_target_ldbl128=yes], [
- [gcc_cv_target_ldbl128=no
- grep '^[ ]*#[ ]*define[ ][ ]*__LONG_DOUBLE_MATH_OPTIONAL' \
- $target_header_dir/bits/wordsize.h > /dev/null 2>&1 \
- && gcc_cv_target_ldbl128=yes
-- ]])])
-+ ]])]
-+ [
-+ ;;
-+ esac
-+ ])
- ;;
- esac
- if test x$gcc_cv_target_ldbl128 = xyes; then
---
-2.17.1
-
diff --git a/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch b/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch
new file mode 100644
index 0000000000..770cad5461
--- /dev/null
+++ b/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch
@@ -0,0 +1,24 @@
+From 4f6fd2272f57620da399d0f841fce12b9db3b2d1 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:53:00 +0000
+Subject: [PATCH 11/30] libiberty: copy PIC objects during build process
+
+---
+ libiberty/Makefile.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
+index d6b302e02fd..fd39928546f 100644
+--- a/libiberty/Makefile.in
++++ b/libiberty/Makefile.in
+@@ -263,6 +263,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
+ $(AR) $(AR_FLAGS) $(TARGETLIB) \
+ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
+ $(RANLIB) $(TARGETLIB); \
++ cp $(TARGETLIB) ../ ; \
+ cd ..; \
+ else true; fi
+
+--
+2.27.0
+
diff --git a/main/gcc/053_all_libitm-no-fortify-source.patch b/main/gcc/0012-libitm-disable-FORTIFY.patch
index 5ab15afc37..169361398e 100644
--- a/main/gcc/053_all_libitm-no-fortify-source.patch
+++ b/main/gcc/0012-libitm-disable-FORTIFY.patch
@@ -1,14 +1,17 @@
-https://bugs.gentoo.org/508852
-https://gcc.gnu.org/PR61164
+From cef5e0336cfdf4afd0e01fa9e562f686b234697a Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:53:36 +0000
+Subject: [PATCH 12/30] libitm: disable FORTIFY
-2014-04-27 Magnus Granberg <zorry@gentoo.org>
-
- #508852
- * libitm/configure.tgt: Disable FORTIFY
+---
+ libitm/configure.tgt | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+diff --git a/libitm/configure.tgt b/libitm/configure.tgt
+index 04109160e91..107b957ece3 100644
--- a/libitm/configure.tgt
+++ b/libitm/configure.tgt
-@@ -43,6 +43,16 @@ if test "$gcc_cv_have_tls" = yes ; then
+@@ -46,6 +46,16 @@ if test "$gcc_cv_have_tls" = yes ; then
esac
fi
@@ -25,3 +28,6 @@ https://gcc.gnu.org/PR61164
# Map the target cpu to an ARCH sub-directory. At the same time,
# work out any special compilation flags as necessary.
case "${target_cpu}" in
+--
+2.27.0
+
diff --git a/main/gcc/0012-static-pie.patch b/main/gcc/0012-static-pie.patch
deleted file mode 100644
index d7cfcb7815..0000000000
--- a/main/gcc/0012-static-pie.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From a4aa319f7c19e564dced3daeb7222c9315af936c Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Sat, 18 Aug 2018 23:58:45 +0000
-Subject: [PATCH 12/12] static-pie
-
-in gcc-8 -static means static non-pie, even if -pie or -static-pie
-are specified, -static-pie can be used to build static pie.
-
-in musl toolchains -static -pie always meant static pie, so this
-patch fixes the link specs accordingly, the new -static-pie is just
-an alias to -static -pie.
----
- gcc/common.opt | 4 ++--
- gcc/config/gnu-user.h | 12 +++++-------
- gcc/config/rs6000/sysv4.h | 11 +++++------
- gcc/gcc.c | 6 +++---
- 4 files changed, 15 insertions(+), 18 deletions(-)
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index b52ef0b38c8..0ce5857e01d 100644
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -3197,11 +3197,11 @@ Driver
-
- no-pie
- Driver RejectNegative Negative(shared)
--Don't create a dynamically linked position independent executable.
-+Don't create a position independent executable.
-
- pie
- Driver RejectNegative Negative(no-pie)
--Create a dynamically linked position independent executable.
-+Create a position independent executable.
-
- static-pie
- Driver RejectNegative Negative(pie)
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index 8620de3e42d..235328a2642 100644
---- a/gcc/config/gnu-user.h
-+++ b/gcc/config/gnu-user.h
-@@ -51,13 +51,12 @@
- #define GNU_USER_TARGET_STARTFILE_SPEC \
- "%{shared:; \
- pg|p|profile:%{static-pie:grcrt1.o%s;:gcrt1.o%s}; \
-- static:crt1.o%s; \
-- static-pie:rcrt1.o%s; \
-+ static|static-pie:%{" PIE_SPEC ":rcrt1.o%s;:crt1.o%s}; \
- " PIE_SPEC ":Scrt1.o%s; \
- :crt1.o%s} " \
- GNU_USER_TARGET_CRTI " \
-- %{static:crtbeginT.o%s; \
-- shared|static-pie|" PIE_SPEC ":crtbeginS.o%s; \
-+ %{shared|" PIE_SPEC ":crtbeginS.o%s; \
-+ static:crtbeginT.o%s; \
- :crtbegin.o%s} \
- %{fvtable-verify=none:%s; \
- fvtable-verify=preinit:vtv_start_preinit.o%s; \
-@@ -76,8 +75,7 @@
- "%{fvtable-verify=none:%s; \
- fvtable-verify=preinit:vtv_end_preinit.o%s; \
- fvtable-verify=std:vtv_end.o%s} \
-- %{static:crtend.o%s; \
-- shared|static-pie|" PIE_SPEC ":crtendS.o%s; \
-+ %{shared|" PIE_SPEC ":crtendS.o%s; \
- :crtend.o%s} " \
- GNU_USER_TARGET_CRTN " " \
- CRTOFFLOADEND
-@@ -133,7 +131,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
- #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC
-
- #if defined(HAVE_LD_EH_FRAME_HDR)
--#define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} "
-+#define LINK_EH_SPEC "%{!static|" PIE_SPEC ":--eh-frame-hdr} "
- #endif
-
- #undef LINK_GCC_C_SEQUENCE_SPEC
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index eb1610ba8b0..87560afb03c 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -900,7 +900,7 @@ proper position among the other output files. */
- #define NO_FPIE_AND_FPIC_SPEC NO_FPIE_SPEC "|" NO_FPIC_SPEC
- #define FPIE_OR_FPIC_SPEC NO_FPIE_AND_FPIC_SPEC ":;"
- #else
--#define PIE_SPEC "pie"
-+#define PIE_SPEC "pie|static-pie"
- #define FPIE1_SPEC "fpie"
- #define NO_FPIE1_SPEC FPIE1_SPEC ":;"
- #define FPIE2_SPEC "fPIE"
-@@ -924,12 +924,12 @@ proper position among the other output files. */
- #ifndef LINK_PIE_SPEC
- #ifdef HAVE_LD_PIE
- #ifndef LD_PIE_SPEC
--#define LD_PIE_SPEC "-pie"
-+#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic}"
- #endif
- #else
- #define LD_PIE_SPEC ""
- #endif
--#define LINK_PIE_SPEC "%{static|shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} "
-+#define LINK_PIE_SPEC "%{shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} "
- #endif
-
- #ifndef LINK_BUILDID_SPEC
---
-2.17.1
-
diff --git a/main/gcc/203-libgcc_s.patch b/main/gcc/0013-libgcc_s.patch
index f8cab7d194..f04d7f7c08 100644
--- a/main/gcc/203-libgcc_s.patch
+++ b/main/gcc/0013-libgcc_s.patch
@@ -1,19 +1,19 @@
-From 9e3eab51e518018d9d99b3123598b1e2322a6af3 Mon Sep 17 00:00:00 2001
+From d31721459e363e49dfe0a7797300864d9cef92f0 Mon Sep 17 00:00:00 2001
From: Szabolcs Nagy <nsz@port70.net>
Date: Sat, 24 Oct 2015 20:09:53 +0000
-Subject: [PATCH 3/6] libgcc_s
+Subject: [PATCH 13/30] libgcc_s
---
- gcc/config/i386/i386.c | 4 ++--
- libgcc/config/i386/cpuinfo.c | 6 +++---
- libgcc/config/i386/t-linux | 2 +-
+ gcc/config/i386/i386-expand.c | 4 ++--
+ libgcc/config/i386/cpuinfo.c | 6 +++---
+ libgcc/config/i386/t-linux | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
-diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
-index 3d044e8..82523e1 100644
---- a/gcc/config/i386/i386.c
-+++ b/gcc/config/i386/i386.c
-@@ -40269,10 +40269,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
+diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c
+index 6c759b01edf..8cf0e069e1c 100644
+--- a/gcc/config/i386/i386-expand.c
++++ b/gcc/config/i386/i386-expand.c
+@@ -10948,10 +10948,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
{
case IX86_BUILTIN_CPU_INIT:
{
@@ -27,10 +27,10 @@ index 3d044e8..82523e1 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 8c2248d..6c82f15 100644
+index cf5f0884bb4..ed0381e7744 100644
--- a/libgcc/config/i386/cpuinfo.c
+++ b/libgcc/config/i386/cpuinfo.c
-@@ -485,7 +485,7 @@ __cpu_indicator_init (void)
+@@ -510,7 +510,7 @@ __cpu_indicator_init (void)
return 0;
}
@@ -42,7 +42,7 @@ index 8c2248d..6c82f15 100644
+ __attribute__ ((weak, alias ("__cpu_indicator_init")));
#endif
diff --git a/libgcc/config/i386/t-linux b/libgcc/config/i386/t-linux
-index 11bb46e..4f47f7b 100644
+index 8506a635790..564296f788e 100644
--- a/libgcc/config/i386/t-linux
+++ b/libgcc/config/i386/t-linux
@@ -3,5 +3,5 @@
@@ -53,5 +53,5 @@ index 11bb46e..4f47f7b 100644
+HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
--
-2.8.1
+2.27.0
diff --git a/main/gcc/205-nopie.patch b/main/gcc/0014-nopie.patch
index e3da94d105..0860319376 100644
--- a/main/gcc/205-nopie.patch
+++ b/main/gcc/0014-nopie.patch
@@ -1,7 +1,7 @@
-From b6015aca9c9cc83739fd0ed637a835119b2c4e34 Mon Sep 17 00:00:00 2001
+From f64f853eae3b390adbbc9b74a336d93918e6dca4 Mon Sep 17 00:00:00 2001
From: Szabolcs Nagy <nsz@port70.net>
Date: Sat, 7 Nov 2015 02:08:05 +0000
-Subject: [PATCH 5/6] nopie
+Subject: [PATCH 14/30] nopie
---
gcc/configure | 27 +++++++++++++++++++++++++++
@@ -9,10 +9,10 @@ Subject: [PATCH 5/6] nopie
2 files changed, 40 insertions(+)
diff --git a/gcc/configure b/gcc/configure
-index 1c6e340..7e8b5d6 100755
+index 90e3be864f8..951a093b459 100755
--- a/gcc/configure
+++ b/gcc/configure
-@@ -29390,6 +29390,33 @@ fi
+@@ -30774,6 +30774,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 1c6e340..7e8b5d6 100755
diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 6c1dcd9..0ca7647 100644
+index f42006e5476..fe392298016 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
-@@ -6098,6 +6098,19 @@ AC_CACHE_CHECK([for -no-pie option],
+@@ -6858,6 +6858,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 6c1dcd9..0ca7647 100644
AC_SUBST([NO_PIE_FLAG])
--
-2.8.1
+2.27.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
new file mode 100644
index 0000000000..8f007668f8
--- /dev/null
+++ b/main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
@@ -0,0 +1,25 @@
+From 37dace030c1402a8e6734a0fc59e18717ce1a2ef Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:57:09 +0000
+Subject: [PATCH 15/30] libffi: use __linux__ instead of __gnu_linux__ for musl
+
+---
+ libffi/src/closures.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libffi/src/closures.c b/libffi/src/closures.c
+index 721ff00ea43..22a699c6340 100644
+--- a/libffi/src/closures.c
++++ b/libffi/src/closures.c
+@@ -34,7 +34,7 @@
+ #include <ffi_common.h>
+
+ #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE
+-# if __gnu_linux__ && !defined(__ANDROID__)
++# if __linux__ && !defined(__ANDROID__)
+ /* This macro indicates it may be forbidden to map anonymous memory
+ with both write and execute permission. Code compiled when this
+ option is defined will attempt to map such pages once, but if it
+--
+2.27.0
+
diff --git a/main/gcc/404-dlang-zlib.patch b/main/gcc/0016-dlang-update-zlib-binding.patch
index 4c453258dc..9204db8a88 100644
--- a/main/gcc/404-dlang-zlib.patch
+++ b/main/gcc/0016-dlang-update-zlib-binding.patch
@@ -1,6 +1,16 @@
-diff -Nurp a/libphobos/src/std/zlib.d b/libphobos/src/std/zlib.d
---- a/libphobos/src/std/zlib.d 2020-01-01 00:00:00.000000000 +0900
-+++ b/libphobos/src/std/zlib.d 2020-01-01 00:00:00.000000000 +0900
+From 7fc386a2e629e859968da4eb4d0ff4983cb3b76f Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:57:51 +0000
+Subject: [PATCH 16/30] dlang: update zlib binding
+
+---
+ libphobos/src/std/zlib.d | 266 ++++++++++++++++++++++++++++-----------
+ 1 file changed, 196 insertions(+), 70 deletions(-)
+
+diff --git a/libphobos/src/std/zlib.d b/libphobos/src/std/zlib.d
+index e6cce240fd5..bd2fe37ebec 100644
+--- a/libphobos/src/std/zlib.d
++++ b/libphobos/src/std/zlib.d
@@ -1,7 +1,7 @@
// Written in the D programming language.
@@ -62,7 +72,7 @@ diff -Nurp a/libphobos/src/std/zlib.d b/libphobos/src/std/zlib.d
*
* See_Also:
* $(LINK http://en.wikipedia.org/wiki/Adler-32)
-@@ -147,7 +152,7 @@ uint adler32(uint adler, const(void)[] b
+@@ -147,7 +152,7 @@ uint adler32(uint adler, const(void)[] buf)
* buf = buffer containing input data
*
* Returns:
@@ -89,7 +99,7 @@ diff -Nurp a/libphobos/src/std/zlib.d b/libphobos/src/std/zlib.d
auto err = etc.c.zlib.compress2(destbuf.ptr, &destlen, cast(ubyte *) srcbuf.ptr, srcbuf.length, level);
if (err)
{
-@@ -276,7 +282,7 @@ void[] uncompress(const(void)[] srcbuf,
+@@ -276,7 +282,7 @@ void[] uncompress(const(void)[] srcbuf, size_t destlen = 0u, int winbits = 15)
throw new ZlibException(err);
}
}
@@ -172,7 +182,7 @@ diff -Nurp a/libphobos/src/std/zlib.d b/libphobos/src/std/zlib.d
if (!inited)
{
@@ -598,26 +607,152 @@ class UnCompress
-
+
if (!destbufsize)
destbufsize = to!uint(buf.length) * 2;
- destbuf = new ubyte[zs.avail_in * 2 + destbufsize];
@@ -334,7 +344,7 @@ diff -Nurp a/libphobos/src/std/zlib.d b/libphobos/src/std/zlib.d
/**
* Decompress and return any remaining data.
* The returned data should be appended to that returned by uncompress().
-@@ -626,48 +761,39 @@ class UnCompress
+@@ -626,49 +761,40 @@ class UnCompress
void[] flush()
in
{
@@ -409,3 +419,7 @@ diff -Nurp a/libphobos/src/std/zlib.d b/libphobos/src/std/zlib.d
+ assert(decompressor.empty, "The UnCompressor reports not being done");
}
}
+
+--
+2.27.0
+
diff --git a/main/gcc/0016-invalid_tls_model.patch b/main/gcc/0016-invalid_tls_model.patch
deleted file mode 100644
index c387f3eb00..0000000000
--- a/main/gcc/0016-invalid_tls_model.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fixes errors such as:
-
-GEGL-Message: 16:04:13.794: Module '/usr/lib/gegl-0.4/raw-load.so' load error: Error relocating /usr/lib/libgomp.so.1: __cxa_finalize: initial-exec TLS resolves to dynamic definition in /usr/lib/libgomp.so.1
-
---- a/libgomp/configure.tgt 2018-11-08 18:13:04.000000000 +0100
-+++ b/libgomp/configure.tgt 2019-06-29 20:06:31.972950350 +0200
-@@ -10,23 +10,6 @@
- # XCFLAGS Add extra compile flags to use.
- # XLDFLAGS Add extra link flags to use.
-
--# Optimize TLS usage by avoiding the overhead of dynamic allocation.
--if test $gcc_cv_have_tls = yes ; then
-- case "${target}" in
--
-- *-*-k*bsd*-gnu*)
-- ;;
--
-- *-*-linux* | *-*-gnu*)
-- XCFLAGS="${XCFLAGS} -ftls-model=initial-exec -DUSING_INITIAL_EXEC_TLS"
-- ;;
--
-- *-*-rtems*)
-- XCFLAGS="${XCFLAGS} -ftls-model=local-exec"
-- ;;
-- esac
--fi
--
- # Since we require POSIX threads, assume a POSIX system by default.
- config_path="posix"
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
new file mode 100644
index 0000000000..7b11d6bae9
--- /dev/null
+++ b/main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
@@ -0,0 +1,51 @@
+From ef5f7880cff27a2b92952ce53a207d5dd896923b Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:58:22 +0000
+Subject: [PATCH 17/30] dlang: fix fcntl on mips, add libucontext dep
+
+---
+ libphobos/configure.tgt | 1 +
+ libphobos/libdruntime/core/sys/posix/fcntl.d | 15 +++++++++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
+index 94e42bf5509..73f2e4b7f01 100644
+--- a/libphobos/configure.tgt
++++ b/libphobos/configure.tgt
+@@ -35,6 +35,7 @@ case "${target}" in
+ ;;
+ mips*-*-linux*)
+ LIBPHOBOS_SUPPORTED=yes
++ LIBDRUNTIME_NEEDS_UCONTEXT=yes
+ ;;
+ power*-*-linux*)
+ LIBPHOBOS_SUPPORTED=yes
+diff --git a/libphobos/libdruntime/core/sys/posix/fcntl.d b/libphobos/libdruntime/core/sys/posix/fcntl.d
+index 9febcff849b..cb34e2108bd 100644
+--- a/libphobos/libdruntime/core/sys/posix/fcntl.d
++++ b/libphobos/libdruntime/core/sys/posix/fcntl.d
+@@ -870,6 +870,21 @@ else version (CRuntime_Musl)
+ F_SETLKW = 7,
+ }
+ }
++ else version (MIPS_Any)
++ {
++ enum
++ {
++ O_DIRECTORY = 0x010000, // octal 0200000
++ O_NOFOLLOW = 0x020000, // octal 0400000
++ O_DIRECT = 0x008000, // octal 0100000
++ O_LARGEFILE = 0x002000, // octal 0020000
++ O_TMPFILE = 0x410000, // octal 020200000
++
++ F_GETLK = 33,
++ F_SETLK = 34,
++ F_SETLKW = 35,
++ }
++ }
+ else
+ static assert(0, "Platform not supported");
+
+--
+2.27.0
+
diff --git a/main/gcc/ada-shared.patch b/main/gcc/0018-ada-fix-shared-linking.patch
index 6f1c16aff9..1fc9b372ba 100644
--- a/main/gcc/ada-shared.patch
+++ b/main/gcc/0018-ada-fix-shared-linking.patch
@@ -1,10 +1,19 @@
-Index: b/gcc/ada/link.c
-===================================================================
+From b675e0383262d6d702f5b732e4459d3e2c2a4891 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:59:16 +0000
+Subject: [PATCH 18/30] ada: fix shared linking
+
+---
+ gcc/ada/link.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/gcc/ada/link.c b/gcc/ada/link.c
+index 02c413a412f..f0e52a87d6e 100644
--- a/gcc/ada/link.c
+++ b/gcc/ada/link.c
-@@ -105,9 +105,9 @@
-
- #elif defined (__FreeBSD__)
+@@ -107,9 +107,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
+ || defined (__NetBSD__) || defined (__OpenBSD__) \
+ || defined (__QNX__)
const char *__gnat_object_file_option = "-Wl,@";
-const char *__gnat_run_path_option = "-Wl,-rpath,";
-char __gnat_shared_libgnat_default = STATIC;
@@ -15,9 +24,9 @@ Index: b/gcc/ada/link.c
int __gnat_link_max = 8192;
unsigned char __gnat_objlist_file_supported = 1;
const char *__gnat_object_library_extension = ".a";
-@@ -127,9 +127,9 @@
+@@ -129,9 +129,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
- #elif defined (linux) || defined(__GLIBC__)
+ #elif defined (__linux__) || defined (__GLIBC__)
const char *__gnat_object_file_option = "-Wl,@";
-const char *__gnat_run_path_option = "-Wl,-rpath,";
-char __gnat_shared_libgnat_default = STATIC;
@@ -28,3 +37,6 @@ Index: b/gcc/ada/link.c
int __gnat_link_max = 8192;
unsigned char __gnat_objlist_file_supported = 1;
const char *__gnat_object_library_extension = ".a";
+--
+2.27.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
new file mode 100644
index 0000000000..591f9ffa3e
--- /dev/null
+++ b/main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
@@ -0,0 +1,24 @@
+From 0ea91dd6f8d856d5b589c2a3e95469fea06e7094 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:59:43 +0000
+Subject: [PATCH 19/30] build: fix CXXFLAGS_FOR_BUILD passing
+
+---
+ Makefile.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.in b/Makefile.in
+index 36e369df6e7..63627db68cf 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -170,6 +170,7 @@ BUILD_EXPORTS = \
+ # built for the build system to override those in BASE_FLAGS_TO_PASS.
+ EXTRA_BUILD_FLAGS = \
+ CFLAGS="$(CFLAGS_FOR_BUILD)" \
++ CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
+ LDFLAGS="$(LDFLAGS_FOR_BUILD)"
+
+ # This is the list of directories to built for the host system.
+--
+2.27.0
+
diff --git a/main/gcc/0020-libstdc-futex-add-time64-compatibility.patch b/main/gcc/0020-libstdc-futex-add-time64-compatibility.patch
new file mode 100644
index 0000000000..73d7f07307
--- /dev/null
+++ b/main/gcc/0020-libstdc-futex-add-time64-compatibility.patch
@@ -0,0 +1,32 @@
+From 9684a815e1cbe854383c3c511e1d84d43c46ec94 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 07:00:17 +0000
+Subject: [PATCH 20/30] libstdc++: futex: add time64 compatibility
+
+---
+ libstdc++-v3/src/c++11/futex.cc | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/libstdc++-v3/src/c++11/futex.cc b/libstdc++-v3/src/c++11/futex.cc
+index c9de11a7ec7..7be702dbeda 100644
+--- a/libstdc++-v3/src/c++11/futex.cc
++++ b/libstdc++-v3/src/c++11/futex.cc
+@@ -61,7 +61,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+ struct timeval tv;
+ gettimeofday (&tv, NULL);
+ // Convert the absolute timeout value to a relative timeout
++#if defined(SYS_futex_time64)
++ struct
++ {
++ long tv_sec;
++ long tv_nsec;
++ } rt;
++#else
+ struct timespec rt;
++#endif
+ rt.tv_sec = __s.count() - tv.tv_sec;
+ rt.tv_nsec = __ns.count() - tv.tv_usec * 1000;
+ if (rt.tv_nsec < 0)
+--
+2.27.0
+
diff --git a/main/gcc/0021-add-fortify-headers-paths.patch b/main/gcc/0021-add-fortify-headers-paths.patch
new file mode 100644
index 0000000000..81e26a47e0
--- /dev/null
+++ b/main/gcc/0021-add-fortify-headers-paths.patch
@@ -0,0 +1,25 @@
+From a0708ec975c01b049d254dc51179898966bf8a52 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 07:01:06 +0000
+Subject: [PATCH 21/30] add fortify-headers paths
+
+---
+ gcc/config/linux.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gcc/config/linux.h b/gcc/config/linux.h
+index 95654bcdb5a..d88df8f154a 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
+
+ #ifdef NATIVE_SYSTEM_HEADER_DIR
+ #define INCLUDE_DEFAULTS_MUSL_NATIVE \
++ { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 2 }, \
++ { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 0 }, \
+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \
+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
+ #else
+--
+2.27.0
+
diff --git a/main/gcc/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch b/main/gcc/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
new file mode 100644
index 0000000000..a93b372e93
--- /dev/null
+++ b/main/gcc/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
@@ -0,0 +1,31 @@
+From 740342a0e4b0b3af498964440918abba1a27ba33 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 22/30] Alpine musl package provides libssp_nonshared.a. We
+ link to it unconditionally, as otherwise we get link failures if some objects
+ are -fstack-protector built and final link happens with -fno-stack-protector.
+ This seems to be the common case when bootstrapping gcc, the piepatches do
+ not seem to fully fix the crosstoolchain and bootstrap sequence wrt.
+ stack-protector flag usage.
+
+---
+ gcc/gcc.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index daeb4d0c8ea..6920bec0fa0 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -894,8 +894,7 @@ proper position among the other output files. */
+
+ #ifndef LINK_SSP_SPEC
+ #ifdef TARGET_LIBC_PROVIDES_SSP
+-#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
+- "|fstack-protector-strong|fstack-protector-explicit:}"
++#define LINK_SSP_SPEC "-lssp_nonshared"
+ #else
+ #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
+ "|fstack-protector-strong|fstack-protector-explicit" \
+--
+2.27.0
+
diff --git a/main/gcc/gcc-as-needed-gold.patch b/main/gcc/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
index e22e59bce0..4717d74162 100644
--- a/main/gcc/gcc-as-needed-gold.patch
+++ b/main/gcc/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
@@ -1,10 +1,18 @@
-# DP: Use --push-state/--pop-state for gold as well when linking libtsan.
+From 775adf35d6f34f61947fc28a2bdbfa7e881c40d5 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 07:03:42 +0000
+Subject: [PATCH 23/30] DP: Use --push-state/--pop-state for gold as well when
+ linking libtsan.
-Index: b/gcc/gcc.c
-===================================================================
+---
+ gcc/gcc.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 6920bec0fa0..40e07354b3d 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
-@@ -693,10 +693,10 @@ proper position among the other output f
+@@ -696,10 +696,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 "}" \
@@ -17,7 +25,7 @@ Index: b/gcc/gcc.c
STATIC_LIBASAN_LIBS
#else
#define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -714,10 +714,10 @@ proper position among the other output f
+@@ -717,10 +717,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 "}" \
@@ -30,7 +38,7 @@ Index: b/gcc/gcc.c
STATIC_LIBTSAN_LIBS
#else
#define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -735,10 +735,10 @@ proper position among the other output f
+@@ -738,10 +738,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 "}" \
@@ -43,7 +51,7 @@ Index: b/gcc/gcc.c
STATIC_LIBLSAN_LIBS
#else
#define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -754,10 +754,10 @@ proper position among the other output f
+@@ -757,10 +757,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 "}" \
@@ -56,3 +64,6 @@ Index: b/gcc/gcc.c
STATIC_LIBUBSAN_LIBS
#else
#define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
+--
+2.27.0
+
diff --git a/main/gcc/gcc-pure64-mips.patch b/main/gcc/0024-Pure-64-bit-MIPS.patch
index d78f283810..95cefb3dd3 100644
--- a/main/gcc/gcc-pure64-mips.patch
+++ b/main/gcc/0024-Pure-64-bit-MIPS.patch
@@ -1,7 +1,7 @@
-From b8c4e45d052adc247341066f748421743704b481 Mon Sep 17 00:00:00 2001
+From 717090cf538f765db1730956c512a43f2d52a802 Mon Sep 17 00:00:00 2001
From: Nils Andreas Svee <me@lochnair.net>
Date: Thu, 21 Dec 2017 03:14:33 +0100
-Subject: [PATCH] Pure 64-bit MIPS
+Subject: [PATCH 24/30] Pure 64-bit MIPS
---
gcc/config/mips/mips.h | 8 ++++----
@@ -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 803ab98e7..afd74752f 100644
+index 3ce0c19a29a..b9920b49167 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
-@@ -3330,11 +3330,11 @@ struct GTY(()) machine_function {
+@@ -3424,11 +3424,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 803ab98e7..afd74752f 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 16c8adf85..bb46204db 100644
+index ceb58d3b5f3..8116e23ebba 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 16c8adf85..bb46204db 100644
+ ../lib32 \
+ ../lib
--
-2.15.1
+2.27.0
diff --git a/main/gcc/gcc-pure64.patch b/main/gcc/0025-use-pure-64-bit-configuration-where-appropriate.patch
index 2c350fe5ad..8e2db4831c 100644
--- a/main/gcc/gcc-pure64.patch
+++ b/main/gcc/0025-use-pure-64-bit-configuration-where-appropriate.patch
@@ -1,17 +1,23 @@
---- ./gcc/config/i386/t-linux64.orig 2013-01-14 16:32:37.000000000 +0000
-+++ ./gcc/config/i386/t-linux64 2013-04-22 06:12:32.984439677 +0000
-@@ -34,6 +34,6 @@
- comma=,
- MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
---- ./gcc/config/aarch64/t-aarch64-linux.orig
-+++ ./gcc/config/aarch64/t-aarch64-linux
-@@ -22,7 +22,7 @@
+From f73cf8d2f8f4eee71fc2ba850672e69f509a4486 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 07:04:40 +0000
+Subject: [PATCH 25/30] use pure 64-bit configuration where appropriate
+
+---
+ gcc/config/aarch64/t-aarch64-linux | 2 +-
+ gcc/config/i386/t-linux64 | 4 ++--
+ gcc/config/rs6000/t-linux | 6 ++++--
+ gcc/config/rs6000/t-linux64 | 4 ++--
+ gcc/config/rs6000/t-linux64bele | 4 ++--
+ gcc/config/rs6000/t-linux64lebe | 4 ++--
+ gcc/config/s390/t-linux64 | 4 ++--
+ 7 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
+index 83e59e33b85..6ec56fdf6a8 100644
+--- a/gcc/config/aarch64/t-aarch64-linux
++++ b/gcc/config/aarch64/t-aarch64-linux
+@@ -22,7 +22,7 @@ LIB1ASMSRC = aarch64/lib1funcs.asm
LIB1ASMFUNCS = _aarch64_sync_cache_range
AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
@@ -19,19 +25,24 @@
+MULTILIB_OSDIRNAMES = mabi.lp64=../lib
MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
- MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32
---- ./gcc/config/s390/t-linux64.orig
-+++ ./gcc/config/s390/t-linux64
-@@ -7,5 +7,5 @@
- MULTILIB_OPTIONS = m64/m31
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
--MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
+ MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
+diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
+index 1171e218578..256f8c079ba 100644
+--- a/gcc/config/i386/t-linux64
++++ b/gcc/config/i386/t-linux64
+@@ -33,6 +33,6 @@
+ comma=,
+ MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
+ MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
+-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
+-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
+MULTILIB_OSDIRNAMES = m64=../lib
+MULTILIB_OSDIRNAMES+= m32=../lib32
-
---- ./gcc/config/rs6000/t-linux.orig
-+++ ./gcc/config/rs6000/t-linux
+ MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
+diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
+index aeb7440c492..ab14c455d8d 100644
+--- a/gcc/config/rs6000/t-linux
++++ b/gcc/config/rs6000/t-linux
@@ -2,7 +2,8 @@
# or soft-float.
ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
@@ -40,9 +51,9 @@
+MULTILIB_OSDIRNAMES := m64=../lib
+MULTILIB_OSDIRNAMES += m32=../lib32
else
- ifneq (,$(findstring spe,$(target)))
- MULTIARCH_DIRNAME := powerpc-linux-gnuspe$(if $(findstring 8548,$(with_cpu)),,v1)
-@@ -14,7 +15,8 @@
+ MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu)
+ endif
+@@ -10,7 +11,8 @@ ifneq (,$(findstring powerpcle,$(target)))
MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))
endif
ifneq (,$(findstring powerpc64le,$(target)))
@@ -52,8 +63,10 @@
endif
endif
---- ./gcc/config/rs6000/t-linux64.orig
-+++ ./gcc/config/rs6000/t-linux64
+diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
+index 264a7e27524..d1e460811cc 100644
+--- a/gcc/config/rs6000/t-linux64
++++ b/gcc/config/rs6000/t-linux64
@@ -28,8 +28,8 @@
MULTILIB_OPTIONS := m64/m32
MULTILIB_DIRNAMES := 64 32
@@ -65,8 +78,10 @@
rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
$(COMPILE) $<
---- ./gcc/config/rs6000/t-linux64bele.orig
-+++ ./gcc/config/rs6000/t-linux64bele
+diff --git a/gcc/config/rs6000/t-linux64bele b/gcc/config/rs6000/t-linux64bele
+index 97c1ee6fb4d..08d72639cb6 100644
+--- a/gcc/config/rs6000/t-linux64bele
++++ b/gcc/config/rs6000/t-linux64bele
@@ -2,6 +2,6 @@
MULTILIB_OPTIONS += mlittle
@@ -76,8 +91,10 @@
+MULTILIB_OSDIRNAMES = m64=../lib
+MULTILIB_OSDIRNAMES+= m32=../lib32
MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN}
---- ./gcc/config/rs6000/t-linux64lebe.orig
-+++ ./gcc/config/rs6000/t-linux64lebe
+diff --git a/gcc/config/rs6000/t-linux64lebe b/gcc/config/rs6000/t-linux64lebe
+index 2e63bdb9fc9..c6e1c5db65d 100644
+--- a/gcc/config/rs6000/t-linux64lebe
++++ b/gcc/config/rs6000/t-linux64lebe
@@ -2,6 +2,6 @@
MULTILIB_OPTIONS += mbig
@@ -87,3 +104,18 @@
+MULTILIB_OSDIRNAMES := m64=../lib
+MULTILIB_OSDIRNAMES += m32=../lib32
MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN}
+diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64
+index cc6ab367072..7f498ee1cdc 100644
+--- a/gcc/config/s390/t-linux64
++++ b/gcc/config/s390/t-linux64
+@@ -7,5 +7,5 @@
+
+ MULTILIB_OPTIONS = m64/m31
+ MULTILIB_DIRNAMES = 64 32
+-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
+-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
++MULTILIB_OSDIRNAMES = m64=../lib
++MULTILIB_OSDIRNAMES+= m32=../lib32
+--
+2.27.0
+
diff --git a/main/gcc/libgcc-always-build-gcceh.a.patch b/main/gcc/0026-always-build-libgcc_eh.a.patch
index 74ae897304..b41f8e9ed1 100644
--- a/main/gcc/libgcc-always-build-gcceh.a.patch
+++ b/main/gcc/0026-always-build-libgcc_eh.a.patch
@@ -1,11 +1,20 @@
-Highly inspired by:
+From 8472f6d0037dcd19c44b1e95d95fbf937b3823e6 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 07:05:41 +0000
+Subject: [PATCH 26/30] always build libgcc_eh.a
+
+highly inspired by:
http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
+---
+ libgcc/Makefile.in | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
-diff -durN gcc-4.6.0.orig/libgcc/Makefile.in gcc-4.6.0/libgcc/Makefile.in
---- gcc-4.6.0.orig/libgcc/Makefile.in 2011-01-26 05:19:58.000000000 +0100
-+++ gcc-4.6.0/libgcc/Makefile.in 2011-09-12 18:17:12.743718974 +0200
-@@ -772,8 +772,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
+diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
+index 851e7657d07..99ec513a1a6 100644
+--- a/libgcc/Makefile.in
++++ b/libgcc/Makefile.in
+@@ -956,8 +956,9 @@ ifneq ($(LIBUNWIND),)
+ all: libunwind.a
endif
+all: libgcc_eh.a
@@ -14,8 +23,8 @@ diff -durN gcc-4.6.0.orig/libgcc/Makefile.in gcc-4.6.0/libgcc/Makefile.in
+all: libgcc_s$(SHLIB_EXT)
ifneq ($(LIBUNWIND),)
all: libunwind$(SHLIB_EXT)
- endif
-@@ -950,10 +951,6 @@
+ libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
+@@ -1159,10 +1160,6 @@ install-libunwind:
install-shared:
$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
@@ -26,9 +35,9 @@ diff -durN gcc-4.6.0.orig/libgcc/Makefile.in gcc-4.6.0/libgcc/Makefile.in
$(subst @multilib_dir@,$(MULTIDIR),$(subst \
@shlib_base_name@,libgcc_s,$(subst \
@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -968,6 +965,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
+@@ -1179,6 +1176,10 @@ ifeq ($(enable_gcov),yes)
$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
+ endif
+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
@@ -37,3 +46,6 @@ diff -durN gcc-4.6.0.orig/libgcc/Makefile.in gcc-4.6.0/libgcc/Makefile.in
parts="$(INSTALL_PARTS)"; \
for file in $$parts; do \
rm -f $(DESTDIR)$(inst_libdir)/$$file; \
+--
+2.27.0
+
diff --git a/main/gcc/libgnarl-musl.patch b/main/gcc/0027-ada-libgnarl-compatibility-for-musl.patch
index 7e35cda682..f44caa24c3 100644
--- a/main/gcc/libgnarl-musl.patch
+++ b/main/gcc/0027-ada-libgnarl-compatibility-for-musl.patch
@@ -1,7 +1,18 @@
-diff -rup gcc-8.2.0/gcc/ada/libgnarl/s-osinte__linux.ads gcc-8.2.0-new/gcc/ada/libgnarl/s-osinte__linux.ads
---- gcc-8.2.0/gcc/ada/libgnarl/s-osinte__linux.ads 2018-01-11 00:55:25.000000000 -0800
-+++ gcc-8.2.0-new/gcc/ada/libgnarl/s-osinte__linux.ads 2018-11-01 16:16:23.372452951 -0700
-@@ -394,12 +394,6 @@ package System.OS_Interface is
+From 4e1b3a26f558e7693853d3600ee677705e67406c Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 07:06:30 +0000
+Subject: [PATCH 27/30] ada: libgnarl compatibility for musl
+
+---
+ gcc/ada/libgnarl/s-osinte__linux.ads | 11 ------
+ gcc/ada/libgnarl/s-taprop__linux.adb | 53 ++--------------------------
+ 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 80cb2b2a793..701b7a3aeab 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
PTHREAD_RWLOCK_PREFER_WRITER_NP : constant := 1;
PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP : constant := 2;
@@ -14,7 +25,7 @@ diff -rup gcc-8.2.0/gcc/ada/libgnarl/s-osinte__linux.ads gcc-8.2.0-new/gcc/ada/l
function pthread_rwlock_init
(mutex : access pthread_rwlock_t;
attr : access pthread_rwlockattr_t) return int;
-@@ -464,11 +458,6 @@ package System.OS_Interface is
+@@ -466,11 +460,6 @@ package System.OS_Interface is
protocol : int) return int;
pragma Import (C, pthread_mutexattr_setprotocol);
@@ -26,10 +37,11 @@ diff -rup gcc-8.2.0/gcc/ada/libgnarl/s-osinte__linux.ads gcc-8.2.0-new/gcc/ada/l
type struct_sched_param is record
sched_priority : int; -- scheduling priority
end record;
-diff -rup gcc-8.2.0/gcc/ada/libgnarl/s-taprop__linux.adb gcc-8.2.0-new/gcc/ada/libgnarl/s-taprop__linux.adb
---- gcc-8.2.0/gcc/ada/libgnarl/s-taprop__linux.adb 2018-01-11 00:55:25.000000000 -0800
-+++ gcc-8.2.0-new/gcc/ada/libgnarl/s-taprop__linux.adb 2018-11-13 11:28:36.433964449 -0800
-@@ -202,9 +202,6 @@ package body System.Task_Primitives.Oper
+diff --git a/gcc/ada/libgnarl/s-taprop__linux.adb b/gcc/ada/libgnarl/s-taprop__linux.adb
+index c45559e5ba0..0b0f173e7d4 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
pragma Import
(C, GNAT_pthread_condattr_setup, "__gnat_pthread_condattr_setup");
@@ -39,7 +51,7 @@ diff -rup gcc-8.2.0/gcc/ada/libgnarl/s-taprop__linux.adb gcc-8.2.0-new/gcc/ada/l
-- 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.Oper
+@@ -214,38 +211,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.
@@ -78,7 +90,7 @@ diff -rup gcc-8.2.0/gcc/ada/libgnarl/s-taprop__linux.adb gcc-8.2.0-new/gcc/ada/l
-- 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.Oper
+@@ -348,7 +313,9 @@ package body System.Task_Primitives.Operations is
-- Init_Mutex --
----------------
@@ -88,7 +100,7 @@ diff -rup gcc-8.2.0/gcc/ada/libgnarl/s-taprop__linux.adb gcc-8.2.0-new/gcc/ada/l
Mutex_Attr : aliased pthread_mutexattr_t;
Result, Result_2 : C.int;
-@@ -360,16 +327,7 @@ package body System.Task_Primitives.Oper
+@@ -360,16 +327,7 @@ package body System.Task_Primitives.Operations is
return Result;
end if;
@@ -106,7 +118,7 @@ diff -rup gcc-8.2.0/gcc/ada/libgnarl/s-taprop__linux.adb gcc-8.2.0-new/gcc/ada/l
Result := pthread_mutexattr_setprotocol
(Mutex_Attr'Access, PTHREAD_PRIO_INHERIT);
pragma Assert (Result = 0);
-@@ -409,11 +367,6 @@ package body System.Task_Primitives.Oper
+@@ -409,11 +367,6 @@ package body System.Task_Primitives.Operations is
Result := pthread_rwlockattr_init (RWlock_Attr'Access);
pragma Assert (Result = 0);
@@ -118,3 +130,6 @@ diff -rup gcc-8.2.0/gcc/ada/libgnarl/s-taprop__linux.adb gcc-8.2.0-new/gcc/ada/l
Result := pthread_rwlock_init (L.RW'Access, RWlock_Attr'Access);
pragma Assert (Result in 0 | ENOMEM);
+--
+2.27.0
+
diff --git a/main/gcc/ada-musl.patch b/main/gcc/0028-ada-musl-support-fixes.patch
index 1487f4a57d..8eb13422c3 100644
--- a/main/gcc/ada-musl.patch
+++ b/main/gcc/0028-ada-musl-support-fixes.patch
@@ -1,8 +1,69 @@
+From 5e3d7d2f1e2448b6c5eb207f9251c437629e43bc Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 07:07:48 +0000
+Subject: [PATCH 28/30] ada: musl support fixes
+
+---
+ gcc/ada/Makefile.rtl | 10 +++++-----
+ gcc/ada/adaint.c | 34 +++++++++++++++++++---------------
+ gcc/ada/adaint.h | 10 ++++------
+ gcc/ada/terminals.c | 8 ++++----
+ 4 files changed, 32 insertions(+), 30 deletions(-)
+
+diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
+index 55ff9b0f3d5..0fadf4e4b79 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))),)
+ s-intman.adb<libgnarl/s-intman__posix.adb \
+ s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
+ $(TRASYM_DWARF_UNIX_PAIRS) \
+- s-tsmona.adb<libgnat/s-tsmona__linux.adb \
++ s-tsmona.adb<libgnat/s-tsmona.adb \
+ 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 \
+ $(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))),)
+ endif
+
+ # ARM linux, GNU eabi
+-ifeq ($(strip $(filter-out arm% linux-gnueabi%,$(target_cpu) $(target_os))),)
++ifeq ($(strip $(filter-out arm% linux-gnueabi% linux-musleabi% linux-muslgnueabi%,$(target_cpu) $(target_os))),)
+ 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))),)
+ s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
+ s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.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-ia64.ads
+@@ -2401,7 +2401,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) \
+- s-tsmona.adb<libgnat/s-tsmona__linux.adb \
++ s-tsmona.adb<libgnat/s-tsmona.adb \
+ $(ATOMICS_TARGET_PAIRS) \
+ $(X86_64_TARGET_PAIRS) \
+ system.ads<libgnat/system-linux-x86.ads
diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 3b0aea9..ee0bb69 100644
+index 595abf87d65..00858c24f53 100644
--- a/gcc/ada/adaint.c
+++ b/gcc/ada/adaint.c
-@@ -76,6 +76,11 @@
+@@ -90,6 +90,11 @@
#include <sys/param.h>
#include <sys/pstat.h>
#endif
@@ -14,7 +75,7 @@ index 3b0aea9..ee0bb69 100644
#ifdef __PikeOS__
#define __BSD_VISIBLE 1
-@@ -3255,7 +3260,6 @@ __gnat_lwp_self (void)
+@@ -3308,7 +3313,6 @@ __gnat_lwp_self (void)
#endif
#if defined (__linux__)
@@ -22,7 +83,7 @@ index 3b0aea9..ee0bb69 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
-@@ -3265,7 +3269,7 @@ __gnat_lwp_self (void)
+@@ -3318,7 +3322,7 @@ __gnat_lwp_self (void)
/* Dynamic cpu sets */
@@ -31,7 +92,7 @@ index 3b0aea9..ee0bb69 100644
__gnat_cpu_alloc (size_t count)
{
return CPU_ALLOC (count);
-@@ -3278,33 +3282,33 @@ __gnat_cpu_alloc_size (size_t count)
+@@ -3331,33 +3335,33 @@ __gnat_cpu_alloc_size (size_t count)
}
void
@@ -73,7 +134,7 @@ index 3b0aea9..ee0bb69 100644
}
size_t
-@@ -3314,23 +3318,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
+@@ -3367,23 +3371,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
}
void
@@ -103,7 +164,7 @@ index 3b0aea9..ee0bb69 100644
#endif /* !CPU_ALLOC */
#endif /* __linux__ */
diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 0d12f7e..a063b47 100644
+index 311e240dfcc..1c4d0050103 100644
--- a/gcc/ada/adaint.h
+++ b/gcc/ada/adaint.h
@@ -316,13 +316,11 @@ extern void *__gnat_lwp_self (void);
@@ -124,56 +185,11 @@ index 0d12f7e..a063b47 100644
#endif
#if defined (_WIN32)
---- a/gcc/ada/Makefile.rtl 2019-05-14 21:18:45.217455681 +0200
-+++ b/gcc/ada/Makefile.rtl 2019-05-14 21:21:30.686464218 +0200
-@@ -1521,7 +1521,7 @@
- s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
- $(TRASYM_DWARF_UNIX_PAIRS) \
- g-sercom.adb<libgnat/g-sercom__linux.adb \
-- s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+ s-tsmona.adb<libgnat/s-tsmona.adb \
- a-exetim.adb<libgnarl/a-exetim__posix.adb \
- a-exetim.ads<libgnarl/a-exetim__default.ads \
- s-linux.ads<libgnarl/s-linux.ads \
-@@ -2073,7 +2073,7 @@
- s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
- g-sercom.adb<libgnat/g-sercom__linux.adb \
- $(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
-@@ -2102,7 +2102,7 @@
- endif
-
- # ARM linux, GNU eabi
--ifeq ($(strip $(filter-out arm% linux-gnueabi%,$(target_cpu) $(target_os))),)
-+ifeq ($(strip $(filter-out arm% linux-gnueabi% linux-musleabi% linux-muslgnueabi%,$(target_cpu) $(target_os))),)
- LIBGNAT_TARGET_PAIRS = \
- a-intnam.ads<libgnarl/a-intnam__linux.ads \
- s-inmaop.adb<libgnarl/s-inmaop__posix.adb \
-@@ -2297,7 +2297,7 @@
- s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \
- g-sercom.adb<libgnat/g-sercom__linux.adb \
- $(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-ia64.ads
-@@ -2394,7 +2394,7 @@
- s-taspri.ads<libgnarl/s-taspri__posix.ads \
- g-sercom.adb<libgnat/g-sercom__linux.adb \
- $(TRASYM_DWARF_UNIX_PAIRS) \
-- s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+ s-tsmona.adb<libgnat/s-tsmona.adb \
- $(ATOMICS_TARGET_PAIRS) \
- $(X86_64_TARGET_PAIRS) \
- system.ads<libgnat/system-linux-x86.ads
---- a/gcc/ada/terminals.c 2019-01-08 10:54:04.000000000 +0100
-+++ b/gcc/ada/terminals.c 2019-05-15 13:14:09.935742526 +0200
-@@ -1136,7 +1136,7 @@
+diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
+index af4417fab90..bab6bf3ca87 100644
+--- a/gcc/ada/terminals.c
++++ b/gcc/ada/terminals.c
+@@ -1145,7 +1145,7 @@ __gnat_setup_winsize (void *desc, int rows, int columns)
/* 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)
@@ -182,7 +198,7 @@ index 0d12f7e..a063b47 100644
3- openpty (USE_OPENPTY)
When using the cloning device method, the macro USE_CLONE_DEVICE should
-@@ -1150,7 +1150,7 @@
+@@ -1159,7 +1159,7 @@ __gnat_setup_winsize (void *desc, int rows, int columns)
#if defined (__APPLE__) || defined (BSD)
#define USE_OPENPTY
#elif defined (__linux__)
@@ -191,7 +207,7 @@ index 0d12f7e..a063b47 100644
#elif defined (__sun__)
#define USE_CLONE_DEVICE "/dev/ptmx"
#elif defined (_AIX)
-@@ -1199,8 +1199,8 @@
+@@ -1208,8 +1208,8 @@ allocate_pty_desc (pty_desc **desc) {
int master_fd = -1;
char *slave_name = NULL;
@@ -202,3 +218,6 @@ index 0d12f7e..a063b47 100644
#elif defined (USE_OPENPTY)
status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
#elif defined (USE_CLONE_DEVICE)
+--
+2.27.0
+
diff --git a/main/gcc/0029-c-Fix-bogus-vector-initialisation-error-PR96377.patch b/main/gcc/0029-c-Fix-bogus-vector-initialisation-error-PR96377.patch
new file mode 100644
index 0000000000..13500dafe4
--- /dev/null
+++ b/main/gcc/0029-c-Fix-bogus-vector-initialisation-error-PR96377.patch
@@ -0,0 +1,520 @@
+From d6599f89ba558ec2a68d4bc4af15cf3513218054 Mon Sep 17 00:00:00 2001
+From: Richard Sandiford <richard.sandiford@arm.com>
+Date: Mon, 3 Aug 2020 09:48:36 +0100
+Subject: [PATCH 29/30] c: Fix bogus vector initialisation error [PR96377]
+
+One of the problems in this PR was that if we had:
+
+ vector_type1 array[] = { vector_value1 };
+
+process_init_element would only treat vector_value1 as initialising
+a vector_type1 if they had the same TYPE_MAIN_VARIANT. This has
+several problems:
+
+(1) It gives confusing error messages if the vector types are
+ incompatible. (Tested by gcc.dg/pr96377-1.c.)
+
+(2) It means that we reject code that should be valid with
+ -flax-vector-conversions. (Tested by gcc.dg/pr96377-2.c.)
+
+(3) On arm and aarch64 targets, it means that we reject some
+ initializers that mix Advanced SIMD and standard GNU vectors.
+ These vectors have traditionally had different TYPE_MAIN_VARIANTs
+ because they have different mangling schemes. (Tested by
+ gcc.dg/pr96377-[3-6].c.)
+
+(4) It means that we reject SVE initializers that should be valid.
+ (Tested by gcc.target/aarch64/sve/gnu_vectors_[34].c.)
+
+(5) After r11-1741-g:31427b974ed7b7dd54e2 we reject:
+
+ arm_neon_type1 array[] = { k ^ arm_neon_value1 };
+
+ because applying the binary operator to arm_neon_value1 strips
+ the "Advanced SIMD type" attributes that were added in that patch.
+ Stripping the attributes is problematic for other reasons though,
+ so that still needs to be fixed separately.
+
+g++.target/aarch64/sve/gnu_vectors_[34].C already pass.
+
+gcc/c/
+ PR c/96377
+ * c-typeck.c (process_init_element): Split test for whether to
+ recurse into a record, union or array into...
+ (initialize_elementwise_p): ...this new function. Don't recurse
+ into a vector type if the initialization value is also a vector.
+
+gcc/testsuite/
+ PR c/96377
+ * gcc.dg/pr96377-1.c: New test.
+ * gcc.dg/pr96377-2.c: Likewise.
+ * gcc.dg/pr96377-3.c: Likewise.
+ * gcc.dg/pr96377-4.c: Likewise.
+ * gcc.dg/pr96377-5.c: Likewise.
+ * gcc.dg/pr96377-6.c: Likewise.
+ * gcc.target/aarch64/pr96377-1.c: Likewise.
+ * gcc.target/aarch64/sve/acle/general-c/gnu_vectors_3.c: Likewise.
+ * gcc.target/aarch64/sve/acle/general-c/gnu_vectors_4.c: Likewise.
+ * g++.target/aarch64/sve/acle/general-c++/gnu_vectors_3.C: Likewise.
+ * g++.target/aarch64/sve/acle/general-c++/gnu_vectors_4.C: Likewise.
+
+(cherry picked from commit 7d599ad27b9bcf5165f87710f1abc64bbabd06ae)
+---
+ gcc/c/c-typeck.c | 59 ++++++++++++++-----
+ .../sve/acle/general-c++/gnu_vectors_3.C | 15 +++++
+ .../sve/acle/general-c++/gnu_vectors_4.C | 15 +++++
+ gcc/testsuite/gcc.dg/pr96377-1.c | 32 ++++++++++
+ gcc/testsuite/gcc.dg/pr96377-2.c | 31 ++++++++++
+ gcc/testsuite/gcc.dg/pr96377-3.c | 33 +++++++++++
+ gcc/testsuite/gcc.dg/pr96377-4.c | 32 ++++++++++
+ gcc/testsuite/gcc.dg/pr96377-5.c | 33 +++++++++++
+ gcc/testsuite/gcc.dg/pr96377-6.c | 32 ++++++++++
+ gcc/testsuite/gcc.target/aarch64/pr96377-1.c | 20 +++++++
+ .../sve/acle/general-c/gnu_vectors_3.c | 15 +++++
+ .../sve/acle/general-c/gnu_vectors_4.c | 15 +++++
+ 12 files changed, 317 insertions(+), 15 deletions(-)
+ create mode 100644 gcc/testsuite/g++.target/aarch64/sve/acle/general-c++/gnu_vectors_3.C
+ create mode 100644 gcc/testsuite/g++.target/aarch64/sve/acle/general-c++/gnu_vectors_4.C
+ create mode 100644 gcc/testsuite/gcc.dg/pr96377-1.c
+ create mode 100644 gcc/testsuite/gcc.dg/pr96377-2.c
+ create mode 100644 gcc/testsuite/gcc.dg/pr96377-3.c
+ create mode 100644 gcc/testsuite/gcc.dg/pr96377-4.c
+ create mode 100644 gcc/testsuite/gcc.dg/pr96377-5.c
+ create mode 100644 gcc/testsuite/gcc.dg/pr96377-6.c
+ create mode 100644 gcc/testsuite/gcc.target/aarch64/pr96377-1.c
+ create mode 100644 gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/gnu_vectors_3.c
+ create mode 100644 gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/gnu_vectors_4.c
+
+diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
+index eb4b641e6bb..58762f10a93 100644
+--- a/gcc/c/c-typeck.c
++++ b/gcc/c/c-typeck.c
+@@ -9910,6 +9910,47 @@ output_pending_init_elements (int all, struct obstack * braced_init_obstack)
+ goto retry;
+ }
+
++/* Expression VALUE coincides with the start of type TYPE in a braced
++ initializer. Return true if we should treat VALUE as initializing
++ the first element of TYPE, false if we should treat it as initializing
++ TYPE as a whole.
++
++ If the initializer is clearly invalid, the question becomes:
++ which choice gives the best error message? */
++
++static bool
++initialize_elementwise_p (tree type, tree value)
++{
++ if (type == error_mark_node || value == error_mark_node)
++ return false;
++
++ gcc_checking_assert (TYPE_MAIN_VARIANT (type) == type);
++
++ tree value_type = TREE_TYPE (value);
++ if (value_type == error_mark_node)
++ return false;
++
++ /* GNU vectors can be initialized elementwise. However, treat any
++ kind of vector value as initializing the vector type as a whole,
++ regardless of whether the value is a GNU vector. Such initializers
++ are valid if and only if they would have been valid in a non-braced
++ initializer like:
++
++ TYPE foo = VALUE;
++
++ so recursing into the vector type would be at best confusing or at
++ worst wrong. For example, when -flax-vector-conversions is in effect,
++ it's possible to initialize a V8HI from a V4SI, even though the vectors
++ have different element types and different numbers of elements. */
++ if (gnu_vector_type_p (type))
++ return !VECTOR_TYPE_P (value_type);
++
++ if (AGGREGATE_TYPE_P (type))
++ return type != TYPE_MAIN_VARIANT (value_type);
++
++ return false;
++}
++
+ /* Add one non-braced element to the current constructor level.
+ This adjusts the current position within the constructor's type.
+ This may also start or terminate implicit levels
+@@ -10089,11 +10130,7 @@ process_init_element (location_t loc, struct c_expr value, bool implicit,
+ /* Otherwise, if we have come to a subaggregate,
+ and we don't have an element of its type, push into it. */
+ else if (value.value != NULL_TREE
+- && value.value != error_mark_node
+- && TYPE_MAIN_VARIANT (TREE_TYPE (value.value)) != fieldtype
+- && (fieldcode == RECORD_TYPE || fieldcode == ARRAY_TYPE
+- || fieldcode == UNION_TYPE
+- || gnu_vector_type_p (fieldtype)))
++ && initialize_elementwise_p (fieldtype, value.value))
+ {
+ push_init_level (loc, 1, braced_init_obstack);
+ continue;
+@@ -10181,11 +10218,7 @@ process_init_element (location_t loc, struct c_expr value, bool implicit,
+ /* Otherwise, if we have come to a subaggregate,
+ and we don't have an element of its type, push into it. */
+ else if (value.value != NULL_TREE
+- && value.value != error_mark_node
+- && TYPE_MAIN_VARIANT (TREE_TYPE (value.value)) != fieldtype
+- && (fieldcode == RECORD_TYPE || fieldcode == ARRAY_TYPE
+- || fieldcode == UNION_TYPE
+- || gnu_vector_type_p (fieldtype)))
++ && initialize_elementwise_p (fieldtype, value.value))
+ {
+ push_init_level (loc, 1, braced_init_obstack);
+ continue;
+@@ -10224,11 +10257,7 @@ process_init_element (location_t loc, struct c_expr value, bool implicit,
+ /* Otherwise, if we have come to a subaggregate,
+ and we don't have an element of its type, push into it. */
+ else if (value.value != NULL_TREE
+- && value.value != error_mark_node
+- && TYPE_MAIN_VARIANT (TREE_TYPE (value.value)) != elttype
+- && (eltcode == RECORD_TYPE || eltcode == ARRAY_TYPE
+- || eltcode == UNION_TYPE
+- || gnu_vector_type_p (elttype)))
++ && initialize_elementwise_p (elttype, value.value))
+ {
+ push_init_level (loc, 1, braced_init_obstack);
+ continue;
+diff --git a/gcc/testsuite/g++.target/aarch64/sve/acle/general-c++/gnu_vectors_3.C b/gcc/testsuite/g++.target/aarch64/sve/acle/general-c++/gnu_vectors_3.C
+new file mode 100644
+index 00000000000..e607d58d726
+--- /dev/null
++++ b/gcc/testsuite/g++.target/aarch64/sve/acle/general-c++/gnu_vectors_3.C
+@@ -0,0 +1,15 @@
++/* { dg-options "-msve-vector-bits=256" } */
++
++#include <arm_sve.h>
++
++typedef uint8_t gnu_uint8_t __attribute__ ((vector_size (32)));
++typedef int8_t gnu_int8_t __attribute__ ((vector_size (32)));
++
++void
++f (svuint8_t sve_u1, svint8_t sve_s1,
++ gnu_uint8_t gnu_u1, gnu_int8_t gnu_s1)
++{
++ gnu_uint8_t arr1[] = { gnu_u1, sve_u1 };
++ gnu_uint8_t arr2[] = { gnu_s1 }; // { dg-error "cannot convert" }
++ gnu_uint8_t arr3[] = { sve_s1 }; // { dg-error "cannot convert" }
++}
+diff --git a/gcc/testsuite/g++.target/aarch64/sve/acle/general-c++/gnu_vectors_4.C b/gcc/testsuite/g++.target/aarch64/sve/acle/general-c++/gnu_vectors_4.C
+new file mode 100644
+index 00000000000..ac4e0d12ff8
+--- /dev/null
++++ b/gcc/testsuite/g++.target/aarch64/sve/acle/general-c++/gnu_vectors_4.C
+@@ -0,0 +1,15 @@
++/* { dg-options "-msve-vector-bits=256 -flax-vector-conversions" } */
++
++#include <arm_sve.h>
++
++typedef uint8_t gnu_uint8_t __attribute__ ((vector_size (32)));
++typedef int8_t gnu_int8_t __attribute__ ((vector_size (32)));
++
++void
++f (svuint8_t sve_u1, svint8_t sve_s1,
++ gnu_uint8_t gnu_u1, gnu_int8_t gnu_s1)
++{
++ gnu_uint8_t arr1[] = { gnu_u1, sve_u1 };
++ gnu_uint8_t arr2[] = { gnu_s1 };
++ gnu_uint8_t arr3[] = { sve_s1 };
++}
+diff --git a/gcc/testsuite/gcc.dg/pr96377-1.c b/gcc/testsuite/gcc.dg/pr96377-1.c
+new file mode 100644
+index 00000000000..2bf3f816331
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/pr96377-1.c
+@@ -0,0 +1,32 @@
++/* { dg-options "-fno-lax-vector-conversions" } */
++/* { dg-message "use '-flax-vector-conversions' to permit conversions" "" { target *-*-* } 0 } */
++
++typedef int v4si __attribute__((vector_size(16)));
++typedef short v8hi __attribute__((vector_size(16)));
++
++struct s { v8hi x; v4si y; };
++union u1 { v8hi x; v4si y; };
++union u2 { v4si s; v8hi y; };
++
++void
++foo (v4si i, v8hi h)
++{
++ struct s x1 = { i, i }; // { dg-error "incompatible types when initializing type '__vector" }
++ struct s x2 = { h, h }; // { dg-error "incompatible types" }
++ struct s x3 = { i, h }; // { dg-error "incompatible types" }
++ struct s x4 = { h, i };
++
++ union u1 y1 = { i }; // { dg-error "incompatible types" }
++ union u1 y2 = { h };
++ union u2 y3 = { i };
++ union u2 y4 = { h }; // { dg-error "incompatible types" }
++
++ v4si z1[] = { i, i };
++ v4si z2[] = { i, h }; // { dg-error "incompatible types" }
++ v4si z3[] = { h, i }; // { dg-error "incompatible types" }
++ v4si z4[] = { h, h }; // { dg-error "incompatible types" }
++ v8hi z5[] = { i, i }; // { dg-error "incompatible types" }
++ v8hi z6[] = { i, h }; // { dg-error "incompatible types" }
++ v8hi z7[] = { h, i }; // { dg-error "incompatible types" }
++ v8hi z8[] = { h, h };
++}
+diff --git a/gcc/testsuite/gcc.dg/pr96377-2.c b/gcc/testsuite/gcc.dg/pr96377-2.c
+new file mode 100644
+index 00000000000..f58b06d9076
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/pr96377-2.c
+@@ -0,0 +1,31 @@
++/* { dg-options "-flax-vector-conversions" } */
++
++typedef int v4si __attribute__((vector_size(16)));
++typedef short v8hi __attribute__((vector_size(16)));
++
++struct s { v8hi x; v4si y; };
++union u1 { v8hi x; v4si y; };
++union u2 { v4si s; v8hi y; };
++
++void
++foo (v4si i, v8hi h)
++{
++ struct s x1 = { i, i };
++ struct s x2 = { h, h };
++ struct s x3 = { i, h };
++ struct s x4 = { h, i };
++
++ union u1 y1 = { i };
++ union u1 y2 = { h };
++ union u2 y3 = { i };
++ union u2 y4 = { h };
++
++ v4si z1[] = { i, i };
++ v4si z2[] = { i, h };
++ v4si z3[] = { h, i };
++ v4si z4[] = { h, h };
++ v8hi z5[] = { i, i };
++ v8hi z6[] = { i, h };
++ v8hi z7[] = { h, i };
++ v8hi z8[] = { h, h };
++}
+diff --git a/gcc/testsuite/gcc.dg/pr96377-3.c b/gcc/testsuite/gcc.dg/pr96377-3.c
+new file mode 100644
+index 00000000000..66dce01f277
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/pr96377-3.c
+@@ -0,0 +1,33 @@
++/* { dg-do compile { target aarch64*-*-* } } */
++/* { dg-options "-fno-lax-vector-conversions" } */
++/* { dg-message "use '-flax-vector-conversions' to permit conversions" "" { target *-*-* } 0 } */
++
++typedef int v4si __attribute__((vector_size(16)));
++typedef short v8hi __attribute__((vector_size(16)));
++
++struct s { v8hi x; v4si y; };
++union u1 { v8hi x; v4si y; };
++union u2 { v4si s; v8hi y; };
++
++void
++foo (__Int32x4_t i, __Int16x8_t h)
++{
++ struct s x1 = { i, i }; // { dg-error "incompatible types when initializing type '__vector" }
++ struct s x2 = { h, h }; // { dg-error "incompatible types" }
++ struct s x3 = { i, h }; // { dg-error "incompatible types" }
++ struct s x4 = { h, i };
++
++ union u1 y1 = { i }; // { dg-error "incompatible types" }
++ union u1 y2 = { h };
++ union u2 y3 = { i };
++ union u2 y4 = { h }; // { dg-error "incompatible types" }
++
++ v4si z1[] = { i, i };
++ v4si z2[] = { i, h }; // { dg-error "incompatible types" }
++ v4si z3[] = { h, i }; // { dg-error "incompatible types" }
++ v4si z4[] = { h, h }; // { dg-error "incompatible types" }
++ v8hi z5[] = { i, i }; // { dg-error "incompatible types" }
++ v8hi z6[] = { i, h }; // { dg-error "incompatible types" }
++ v8hi z7[] = { h, i }; // { dg-error "incompatible types" }
++ v8hi z8[] = { h, h };
++}
+diff --git a/gcc/testsuite/gcc.dg/pr96377-4.c b/gcc/testsuite/gcc.dg/pr96377-4.c
+new file mode 100644
+index 00000000000..f7aaf490031
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/pr96377-4.c
+@@ -0,0 +1,32 @@
++/* { dg-do compile { target aarch64*-*-* } } */
++/* { dg-options "-flax-vector-conversions" } */
++
++typedef int v4si __attribute__((vector_size(16)));
++typedef short v8hi __attribute__((vector_size(16)));
++
++struct s { v8hi x; v4si y; };
++union u1 { v8hi x; v4si y; };
++union u2 { v4si s; v8hi y; };
++
++void
++foo (__Int32x4_t i, __Int16x8_t h)
++{
++ struct s x1 = { i, i };
++ struct s x2 = { h, h };
++ struct s x3 = { i, h };
++ struct s x4 = { h, i };
++
++ union u1 y1 = { i };
++ union u1 y2 = { h };
++ union u2 y3 = { i };
++ union u2 y4 = { h };
++
++ v4si z1[] = { i, i };
++ v4si z2[] = { i, h };
++ v4si z3[] = { h, i };
++ v4si z4[] = { h, h };
++ v8hi z5[] = { i, i };
++ v8hi z6[] = { i, h };
++ v8hi z7[] = { h, i };
++ v8hi z8[] = { h, h };
++}
+diff --git a/gcc/testsuite/gcc.dg/pr96377-5.c b/gcc/testsuite/gcc.dg/pr96377-5.c
+new file mode 100644
+index 00000000000..3d0c24befa6
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/pr96377-5.c
+@@ -0,0 +1,33 @@
++/* { dg-do compile { target aarch64*-*-* } } */
++/* { dg-options "-fno-lax-vector-conversions" } */
++/* { dg-message "use '-flax-vector-conversions' to permit conversions" "" { target *-*-* } 0 } */
++
++typedef int v4si __attribute__((vector_size(16)));
++typedef short v8hi __attribute__((vector_size(16)));
++
++struct s { __Int16x8_t x; __Int32x4_t y; };
++union u1 { __Int16x8_t x; __Int32x4_t y; };
++union u2 { __Int32x4_t s; __Int16x8_t y; };
++
++void
++foo (v4si i, v8hi h)
++{
++ struct s x1 = { i, i }; // { dg-error "incompatible types when initializing type '__Int16x8_t" }
++ struct s x2 = { h, h }; // { dg-error "incompatible types" }
++ struct s x3 = { i, h }; // { dg-error "incompatible types" }
++ struct s x4 = { h, i };
++
++ union u1 y1 = { i }; // { dg-error "incompatible types" }
++ union u1 y2 = { h };
++ union u2 y3 = { i };
++ union u2 y4 = { h }; // { dg-error "incompatible types" }
++
++ v4si z1[] = { i, i };
++ v4si z2[] = { i, h }; // { dg-error "incompatible types" }
++ v4si z3[] = { h, i }; // { dg-error "incompatible types" }
++ v4si z4[] = { h, h }; // { dg-error "incompatible types" }
++ v8hi z5[] = { i, i }; // { dg-error "incompatible types" }
++ v8hi z6[] = { i, h }; // { dg-error "incompatible types" }
++ v8hi z7[] = { h, i }; // { dg-error "incompatible types" }
++ v8hi z8[] = { h, h };
++}
+diff --git a/gcc/testsuite/gcc.dg/pr96377-6.c b/gcc/testsuite/gcc.dg/pr96377-6.c
+new file mode 100644
+index 00000000000..165327fa292
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/pr96377-6.c
+@@ -0,0 +1,32 @@
++/* { dg-do compile { target aarch64*-*-* } } */
++/* { dg-options "-flax-vector-conversions" } */
++
++typedef int v4si __attribute__((vector_size(16)));
++typedef short v8hi __attribute__((vector_size(16)));
++
++struct s { __Int16x8_t x; __Int32x4_t y; };
++union u1 { __Int16x8_t x; __Int32x4_t y; };
++union u2 { __Int32x4_t s; __Int16x8_t y; };
++
++void
++foo (v4si i, v8hi h)
++{
++ struct s x1 = { i, i };
++ struct s x2 = { h, h };
++ struct s x3 = { i, h };
++ struct s x4 = { h, i };
++
++ union u1 y1 = { i };
++ union u1 y2 = { h };
++ union u2 y3 = { i };
++ union u2 y4 = { h };
++
++ v4si z1[] = { i, i };
++ v4si z2[] = { i, h };
++ v4si z3[] = { h, i };
++ v4si z4[] = { h, h };
++ v8hi z5[] = { i, i };
++ v8hi z6[] = { i, h };
++ v8hi z7[] = { h, i };
++ v8hi z8[] = { h, h };
++}
+diff --git a/gcc/testsuite/gcc.target/aarch64/pr96377-1.c b/gcc/testsuite/gcc.target/aarch64/pr96377-1.c
+new file mode 100644
+index 00000000000..51e3e36edfc
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/aarch64/pr96377-1.c
+@@ -0,0 +1,20 @@
++/* { dg-options "" } */
++
++#include <arm_neon.h>
++
++struct aegis128_state {
++ uint8x16_t v[5];
++};
++
++void foo(const void *key, const void *iv, const void *const0, const void *const1)
++{
++ uint8x16_t k = vld1q_u8(key);
++ uint8x16_t kiv = k ^ vld1q_u8(iv);
++ struct aegis128_state st = {{
++ kiv,
++ vld1q_u8(const1),
++ vld1q_u8(const0),
++ k ^ vld1q_u8(const0),
++ k ^ vld1q_u8(const1),
++ }};
++}
+diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/gnu_vectors_3.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/gnu_vectors_3.c
+new file mode 100644
+index 00000000000..0f1a2b0e46b
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/gnu_vectors_3.c
+@@ -0,0 +1,15 @@
++/* { dg-options "-msve-vector-bits=256" } */
++
++#include <arm_sve.h>
++
++typedef uint8_t gnu_uint8_t __attribute__ ((vector_size (32)));
++typedef int8_t gnu_int8_t __attribute__ ((vector_size (32)));
++
++void
++f (svuint8_t sve_u1, svint8_t sve_s1,
++ gnu_uint8_t gnu_u1, gnu_int8_t gnu_s1)
++{
++ gnu_uint8_t arr1[] = { gnu_u1, sve_u1 };
++ gnu_uint8_t arr2[] = { gnu_s1 }; // { dg-error "incompatible types" }
++ gnu_uint8_t arr3[] = { sve_s1 }; // { dg-error "incompatible types" }
++}
+diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/gnu_vectors_4.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/gnu_vectors_4.c
+new file mode 100644
+index 00000000000..ac4e0d12ff8
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/gnu_vectors_4.c
+@@ -0,0 +1,15 @@
++/* { dg-options "-msve-vector-bits=256 -flax-vector-conversions" } */
++
++#include <arm_sve.h>
++
++typedef uint8_t gnu_uint8_t __attribute__ ((vector_size (32)));
++typedef int8_t gnu_int8_t __attribute__ ((vector_size (32)));
++
++void
++f (svuint8_t sve_u1, svint8_t sve_s1,
++ gnu_uint8_t gnu_u1, gnu_int8_t gnu_s1)
++{
++ gnu_uint8_t arr1[] = { gnu_u1, sve_u1 };
++ gnu_uint8_t arr2[] = { gnu_s1 };
++ gnu_uint8_t arr3[] = { sve_s1 };
++}
+--
+2.27.0
+
diff --git a/main/gcc/002_all_default-relro.patch b/main/gcc/002_all_default-relro.patch
deleted file mode 100644
index c461017dc6..0000000000
--- a/main/gcc/002_all_default-relro.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# Turn on -Wl,-z,relro,-z,now by default.
-
----
- gcc/doc/invoke.texi | 3 +++
- gcc/gcc.c | 1 +
- 2 files changed, 4 insertions(+), 0 deletions(-)
-
-Index: b/gcc/doc/invoke.texi
-===================================================================
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -11424,6 +11424,9 @@ For example, @option{-Wl,-Map,output.map
- linker. When using the GNU linker, you can also get the same effect with
- @option{-Wl,-Map=output.map}.
-
-+NOTE: In Alpine Linux, for LDFLAGS, the option
-+@option{-Wl,-z,relro,now} is used. To disable, use @option{-Wl,-z,norelro}.
-+
- @item -u @var{symbol}
- @opindex u
- Pretend the symbol @var{symbol} is undefined, to force linking of
-Index: b/gcc/gcc.c
-===================================================================
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -890,6 +890,7 @@ proper position among the other output f
- "%{flto|flto=*:%<fcompare-debug*} \
- %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
- "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
-+ "-z relro -z now " \
- "%X %{o*} %{e*} %{N} %{n} %{r}\
- %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}} " VTABLE_VERIFICATION_SPEC " \
- %{static:} %{L*} %(mfwrap) %(link_libgcc) " SANITIZER_EARLY_SPEC " %o\
diff --git a/main/gcc/0030-rs6000-ICE-when-using-an-MMA-type-as-a-function-para.patch b/main/gcc/0030-rs6000-ICE-when-using-an-MMA-type-as-a-function-para.patch
new file mode 100644
index 0000000000..8543681f6f
--- /dev/null
+++ b/main/gcc/0030-rs6000-ICE-when-using-an-MMA-type-as-a-function-para.patch
@@ -0,0 +1,157 @@
+From 773021143288f5bf0dca1e3ee1f908f580f6fd9c Mon Sep 17 00:00:00 2001
+From: Peter Bergner <bergner@linux.ibm.com>
+Date: Thu, 13 Aug 2020 13:40:39 -0500
+Subject: [PATCH 30/30] rs6000: ICE when using an MMA type as a function param
+ or return value [PR96506]
+
+PR96506 shows a problem where we ICE on illegal usage, namely using MMA
+types for function arguments and return values. The solution is to flag
+these illegal usages as errors early, before we ICE.
+
+2020-08-13 Peter Bergner <bergner@linux.ibm.com>
+
+gcc/
+ PR target/96506
+ * config/rs6000/rs6000-call.c (rs6000_promote_function_mode): Disallow
+ MMA types as return values.
+ (rs6000_function_arg): Disallow MMA types as function arguments.
+
+gcc/testsuite/
+ PR target/96506
+ * gcc.target/powerpc/pr96506.c: New test.
+
+(cherry picked from commit 0ad7e730c142ef6cd0ddc1491a89a7f330caa887)
+---
+ gcc/config/rs6000/rs6000-call.c | 34 ++++++++++-
+ gcc/testsuite/gcc.target/powerpc/pr96506.c | 66 ++++++++++++++++++++++
+ 2 files changed, 99 insertions(+), 1 deletion(-)
+ create mode 100644 gcc/testsuite/gcc.target/powerpc/pr96506.c
+
+diff --git a/gcc/config/rs6000/rs6000-call.c b/gcc/config/rs6000/rs6000-call.c
+index 243601e90c1..37566780e54 100644
+--- a/gcc/config/rs6000/rs6000-call.c
++++ b/gcc/config/rs6000/rs6000-call.c
+@@ -6076,8 +6076,30 @@ machine_mode
+ rs6000_promote_function_mode (const_tree type ATTRIBUTE_UNUSED,
+ machine_mode mode,
+ int *punsignedp ATTRIBUTE_UNUSED,
+- const_tree, int)
++ const_tree, int for_return)
+ {
++ /* Warning: this is a static local variable and not always NULL!
++ This function is called multiple times for the same function
++ and return value. PREV_FUNC is used to keep track of the
++ first time we encounter a function's return value in order
++ to not report an error with that return value multiple times. */
++ static struct function *prev_func = NULL;
++
++ /* We do not allow MMA types being used as return values. Only report
++ the invalid return value usage the first time we encounter it. */
++ if (for_return
++ && prev_func != cfun
++ && (mode == POImode || mode == PXImode))
++ {
++ /* Record we have now handled function CFUN, so the next time we
++ are called, we do not re-report the same error. */
++ prev_func = cfun;
++ if (TYPE_CANONICAL (type) != NULL_TREE)
++ type = TYPE_CANONICAL (type);
++ error ("invalid use of MMA type %qs as a function return value",
++ IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (type))));
++ }
++
+ PROMOTE_MODE (mode, *punsignedp, type);
+
+ return mode;
+@@ -7028,6 +7050,16 @@ rs6000_function_arg (cumulative_args_t cum_v, const function_arg_info &arg)
+ machine_mode elt_mode;
+ int n_elts;
+
++ /* We do not allow MMA types being used as function arguments. */
++ if (mode == POImode || mode == PXImode)
++ {
++ if (TYPE_CANONICAL (type) != NULL_TREE)
++ type = TYPE_CANONICAL (type);
++ error ("invalid use of MMA operand of type %qs as a function parameter",
++ IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (type))));
++ return NULL_RTX;
++ }
++
+ /* Return a marker to indicate whether CR1 needs to set or clear the
+ bit that V.4 uses to say fp args were passed in registers.
+ Assume that we don't need the marker for software floating point,
+diff --git a/gcc/testsuite/gcc.target/powerpc/pr96506.c b/gcc/testsuite/gcc.target/powerpc/pr96506.c
+new file mode 100644
+index 00000000000..b1b40c5a5c8
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/powerpc/pr96506.c
+@@ -0,0 +1,66 @@
++/* PR target/96506 */
++/* { dg-do compile } */
++/* { dg-require-effective-target power10_ok } */
++/* { dg-options "-mdejagnu-cpu=power10 -O2" } */
++
++extern void bar0();
++extern void bar1();
++extern void bar2();
++extern void bar3();
++
++typedef __vector_pair vpair_t;
++typedef __vector_quad vquad_t;
++
++/* Verify we flag errors on the following. */
++
++void
++foo0 (void)
++{
++ __vector_pair v;
++ bar0 (v); /* { dg-error "invalid use of MMA operand of type .__vector_pair. as a function parameter" } */
++}
++
++void
++foo1 (void)
++{
++ vpair_t v;
++ bar1 (v); /* { dg-error "invalid use of MMA operand of type .__vector_pair. as a function parameter" } */
++}
++
++void
++foo2 (void)
++{
++ __vector_quad v;
++ bar2 (v); /* { dg-error "invalid use of MMA operand of type .__vector_quad. as a function parameter" } */
++}
++
++void
++foo3 (void)
++{
++ vquad_t v;
++ bar3 (v); /* { dg-error "invalid use of MMA operand of type .__vector_quad. as a function parameter" } */
++}
++
++__vector_pair
++foo4 (__vector_pair *src) /* { dg-error "invalid use of MMA type .__vector_pair. as a function return value" } */
++{
++ return *src;
++}
++
++vpair_t
++foo5 (vpair_t *src) /* { dg-error "invalid use of MMA type .__vector_pair. as a function return value" } */
++{
++ return *src;
++}
++
++__vector_quad
++foo6 (__vector_quad *src) /* { dg-error "invalid use of MMA type .__vector_quad. as a function return value" } */
++{
++ return *src;
++}
++
++vquad_t
++foo7 (vquad_t *src) /* { dg-error "invalid use of MMA type .__vector_quad. as a function return value" } */
++{
++ return *src;
++}
+--
+2.27.0
+
diff --git a/main/gcc/0031-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch b/main/gcc/0031-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
new file mode 100644
index 0000000000..6c1eb03b96
--- /dev/null
+++ b/main/gcc/0031-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
@@ -0,0 +1,45 @@
+From 756d3163d2ee3ee21ad815ab6dfebe58e8c32965 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)
diff --git a/main/gcc/0032-gcc-go-Don-t-include-sys-user.h.patch b/main/gcc/0032-gcc-go-Don-t-include-sys-user.h.patch
new file mode 100644
index 0000000000..897dd6ec31
--- /dev/null
+++ b/main/gcc/0032-gcc-go-Don-t-include-sys-user.h.patch
@@ -0,0 +1,27 @@
+From ba9db3417c93a42dbf994e7c18c021f5542aa354 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
diff --git a/main/gcc/0033-gcc-go-Fix-ucontext_t-on-PPC64.patch b/main/gcc/0033-gcc-go-Fix-ucontext_t-on-PPC64.patch
new file mode 100644
index 0000000000..4584a3595d
--- /dev/null
+++ b/main/gcc/0033-gcc-go-Fix-ucontext_t-on-PPC64.patch
@@ -0,0 +1,26 @@
+From a2da9c892a6b29a8067f20fda2d8a5e9a7b5193e Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Sun, 30 Aug 2020 17:59:22 +0200
+Subject: [PATCH] gcc-go: Fix ucontext_t on PPC64
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Taken from Adélie Linux.
+---
+ libgo/runtime/go-signal.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
+index b429fdb2403..fd1c885f043 100644
+--- a/libgo/runtime/go-signal.c
++++ b/libgo/runtime/go-signal.c
+@@ -224,7 +224,7 @@ getSiginfo(siginfo_t *info, void *context __attribute__((unused)))
+ #elif defined(__alpha__) && defined(__linux__)
+ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.sc_pc;
+ #elif defined(__PPC__) && defined(__linux__)
+- ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip;
++ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gp_regs[32];
+ #elif defined(__PPC__) && defined(_AIX)
+ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
+ #elif defined(__aarch64__) && defined(__linux__)
diff --git a/main/gcc/0034-gcc-go-Fix-handling-of-signal-34-on-musl.patch b/main/gcc/0034-gcc-go-Fix-handling-of-signal-34-on-musl.patch
new file mode 100644
index 0000000000..528bbb3c21
--- /dev/null
+++ b/main/gcc/0034-gcc-go-Fix-handling-of-signal-34-on-musl.patch
@@ -0,0 +1,40 @@
+From 1d0cd9bbbef7d1bd3f42ad493db8d08b539cba60 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
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Taken from Adélie Linux.
+---
+ libgo/mksigtab.sh | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libgo/mksigtab.sh b/libgo/mksigtab.sh
+index 11e4ec436bd..fe866eacb27 100644
+--- a/libgo/mksigtab.sh
++++ b/libgo/mksigtab.sh
+@@ -82,7 +82,7 @@ checksig _SIGPWR '{_SigNotify, "SIGPWR: power failure restart"}'
+ checksig _SIGEMT '{_SigThrow, "SIGEMT: emulate instruction executed"}'
+ checksig _SIGINFO '{_SigNotify, "SIGINFO: status request from keyboard"}'
+ checksig _SIGTHR '{_SigNotify, "SIGTHR: reserved"}'
+-checksig _SIGPOLL '{_SigNotify, "SIGPOLL: pollable event occurred"}'
++#checksig _SIGPOLL '{_SigNotify, "SIGPOLL: pollable event occurred"}'
+ checksig _SIGWAITING '{_SigNotify, "SIGWAITING: reserved signal no longer used by"}'
+ checksig _SIGLWP '{_SigNotify, "SIGLWP: reserved signal no longer used by"}'
+ checksig _SIGFREEZE '{_SigNotify, "SIGFREEZE: special signal used by CPR"}'
+@@ -95,10 +95,12 @@ checksig _SIGLOST ' {_SigNotify, "SIGLOST: resource lost (Sun); server died (G
+
+ # Special handling of signals 32 and 33 on GNU/Linux systems,
+ # because they are special to glibc.
++# Signal 34 is additionally special to Linux systems with musl.
+ if test "${GOOS}" = "linux"; then
+- SIGLIST=$SIGLIST"_32__33_"
++ SIGLIST=$SIGLIST"_32__33__34_"
+ echo ' 32: {_SigSetStack + _SigUnblock, "signal 32"}, /* SIGCANCEL; see issue 6997 */'
+ echo ' 33: {_SigSetStack + _SigUnblock, "signal 33"}, /* SIGSETXID; see issues 3871, 9400, 12498 */'
++ echo ' 34: {_SigSetStack + _SigUnblock, "signal 34"}, /* see issue 30062 */'
+ fi
+
+ if test "${GOOS}" = "aix"; then
diff --git a/main/gcc/0035-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch b/main/gcc/0035-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
new file mode 100644
index 0000000000..683242458b
--- /dev/null
+++ b/main/gcc/0035-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
@@ -0,0 +1,35 @@
+From 956c8cc94e7aa487eb142905c319487d94dc621d 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()
diff --git a/main/gcc/0036-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch b/main/gcc/0036-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
new file mode 100644
index 0000000000..aa68491354
--- /dev/null
+++ b/main/gcc/0036-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
@@ -0,0 +1,34 @@
+From c3a80843b7502ec2bfb5f1e5b514658c5f9dd884 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' \
diff --git a/main/gcc/0037-gcc-go-signal-34-is-special-on-musl-libc.patch b/main/gcc/0037-gcc-go-signal-34-is-special-on-musl-libc.patch
new file mode 100644
index 0000000000..89228cf8b5
--- /dev/null
+++ b/main/gcc/0037-gcc-go-signal-34-is-special-on-musl-libc.patch
@@ -0,0 +1,26 @@
+From 75e274b0819c9a77ca121113301d353f7aa91740 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
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Taken from Adélie Linux.
+---
+ libgo/go/runtime/signal_gccgo.go | 2 +-
+ 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
+--- a/libgo/go/runtime/signal_gccgo.go
++++ b/libgo/go/runtime/signal_gccgo.go
+@@ -106,7 +106,7 @@ func getsig(i uint32) uintptr {
+ if sigaction(i, nil, &sa) < 0 {
+ // On GNU/Linux glibc rejects attempts to call
+ // sigaction with signal 32 (SIGCANCEL) or 33 (SIGSETXID).
+- if GOOS == "linux" && (i == 32 || i == 33) {
++ if GOOS == "linux" && (i == 32 || i == 33 || i == 34) {
+ return _SIG_DFL
+ }
+ throw("sigaction read failure")
diff --git a/main/gcc/0038-gcc-go-Prefer-_off_t-over-_off64_t.patch b/main/gcc/0038-gcc-go-Prefer-_off_t-over-_off64_t.patch
new file mode 100644
index 0000000000..3c21fedaf1
--- /dev/null
+++ b/main/gcc/0038-gcc-go-Prefer-_off_t-over-_off64_t.patch
@@ -0,0 +1,27 @@
+From ff096af4402ab87a61eb3979b47246a3a1b4fa38 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}
diff --git a/main/gcc/0039-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch b/main/gcc/0039-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
new file mode 100644
index 0000000000..30995e582b
--- /dev/null
+++ b/main/gcc/0039-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
@@ -0,0 +1,24 @@
+From 56dc7cac03987e95915032161ff0f7d5a8b8bf36 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
+
+---
+ libgo/runtime/proc.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
+index 274ce01c0bf..92a540bdde9 100644
+--- a/libgo/runtime/proc.c
++++ b/libgo/runtime/proc.c
+@@ -66,6 +66,10 @@ static void gscanstack(G*);
+
+ __thread G *g __asm__(GOSYM_PREFIX "runtime.g");
+
++/* libucontext does not seem to support tlsbase, undef the macro
++ * here to make sure we define initcontext and fixcontext as dummies. */
++#undef SETCONTEXT_CLOBBERS_TLS
++
+ #ifndef SETCONTEXT_CLOBBERS_TLS
+
+ static inline void
diff --git a/main/gcc/0040-gcc-go-link-to-libucontext.patch b/main/gcc/0040-gcc-go-link-to-libucontext.patch
new file mode 100644
index 0000000000..de59e07f67
--- /dev/null
+++ b/main/gcc/0040-gcc-go-link-to-libucontext.patch
@@ -0,0 +1,22 @@
+From ead76eced040b588f9374646a188ba21abab2049 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
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 63627db68cf..c7f1f84d683 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -48823,7 +48823,7 @@ configure-target-libgo:
+ esac; \
+ module_srcdir=libgo; \
+ rm -f no-such-file || : ; \
+- CONFIG_SITE=no-such-file $(SHELL) \
++ CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
+ $$s/$$module_srcdir/configure \
+ --srcdir=$${topdir}/$$module_srcdir \
+ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
diff --git a/main/gcc/0041-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch b/main/gcc/0041-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
new file mode 100644
index 0000000000..406a74d006
--- /dev/null
+++ b/main/gcc/0041-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
@@ -0,0 +1,23 @@
+From 3f5ee6a593215fbd40975d801ff37cf81a3fced3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Mon, 31 Aug 2020 20:26:56 +0200
+Subject: [PATCH] gcc-go: Disable printing of unaccessible ppc64 struct members
+
+These struct members do not seem to exist on musl.
+---
+ libgo/runtime/go-signal.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
+index fd1c885f043..e845e453332 100644
+--- a/libgo/runtime/go-signal.c
++++ b/libgo/runtime/go-signal.c
+@@ -333,7 +333,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u
+ runtime_printf("sp %X\n", m->sc_regs[30]);
+ runtime_printf("pc %X\n", m->sc_pc);
+ }
+-#elif defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__linux__)
++#elif defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__GLIBC__)
+ {
+ mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
+ int i;
diff --git a/main/gcc/012_all_default-warn-trampolines.patch b/main/gcc/012_all_default-warn-trampolines.patch
deleted file mode 100644
index 7a644cb1e1..0000000000
--- a/main/gcc/012_all_default-warn-trampolines.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Enable -Wtrampolines by default.
-
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -712,7 +712,7 @@ Common Var(warn_system_headers) Warning
- Do not suppress warnings from system headers.
-
- Wtrampolines
--Common Var(warn_trampolines) Warning
-+Common Var(warn_trampolines) Init(1) Warning
- Warn whenever a trampoline is generated.
-
- Wtype-limits
diff --git a/main/gcc/013_all_default-ssp-fix.patch b/main/gcc/013_all_default-ssp-fix.patch
deleted file mode 100644
index d2deac760b..0000000000
--- a/main/gcc/013_all_default-ssp-fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
-Change the buffer size.
-
---- a/gcc/gcc.c 2017-07-04 09:15:57.740793000 +0200
-+++ b/gcc/gcc.c 2018-03-02 13:58:44.387741114 +0100
-@@ -857,6 +857,12 @@ proper position among the other output f
- #define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G"
- #endif
-
-+#ifdef ENABLE_DEFAULT_SSP
-+#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} "
-+#else
-+#define NO_SSP_SPEC ""
-+#endif
-+
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1131,7 +1148,7 @@ static const char *cc1_options =
- %{-version:--version}\
- %{-help=*:--help=%*}\
- %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %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=singel:\
---- a/gcc/params.def 2016-03-30 09:47:40.000000000 +0200
-+++ b/gcc/params.def 2016-09-19 12:56:58.443179039 +0200
-@@ -673,7 +673,7 @@ DEFPARAM (PARAM_INTEGER_SHARE_LIMIT,
- DEFPARAM (PARAM_SSP_BUFFER_SIZE,
- "ssp-buffer-size",
- "The lower bound for a buffer to be considered for stack smashing protection.",
-- 8, 1, 0)
-+ 4, 1, 0)
-
- DEFPARAM (PARAM_MIN_SIZE_FOR_STACK_SHARING,
- "min-size-for-stack-sharing",
diff --git a/main/gcc/050_all_libiberty-asprintf.patch b/main/gcc/050_all_libiberty-asprintf.patch
deleted file mode 100644
index bee0c4c237..0000000000
--- a/main/gcc/050_all_libiberty-asprintf.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-2008-07-25 Magnus Granberg <zorry@ume.nu>
-
- * include/libiberty.h (asprintf): Don't declare if defined as a macro
-
---- a/include/libiberty.h
-+++ b/include/libiberty.h
-@@ -609,8 +609,11 @@ extern int pwait (int, int *, int);
- /* Like sprintf but provides a pointer to malloc'd storage, which must
- be freed by the caller. */
-
-+/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL. */
-+#ifndef asprintf
- extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
- #endif
-+#endif
-
- #if !HAVE_DECL_VASPRINTF
- /* Like vsprintf but provides a pointer to malloc'd storage, which
diff --git a/main/gcc/051_all_libiberty-pic.patch b/main/gcc/051_all_libiberty-pic.patch
deleted file mode 100644
index b6160a7307..0000000000
--- a/main/gcc/051_all_libiberty-pic.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libiberty/Makefile.in
-+++ b/libiberty/Makefile.in
-@@ -246,6 +246,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
- $(AR) $(AR_FLAGS) $(TARGETLIB) \
- $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- $(RANLIB) $(TARGETLIB); \
-+ cp $(TARGETLIB) ../ ; \
- cd ..; \
- else true; fi
-
diff --git a/main/gcc/090_all_pr55930-dependency-tracking.patch b/main/gcc/090_all_pr55930-dependency-tracking.patch
deleted file mode 100644
index a8743e08c4..0000000000
--- a/main/gcc/090_all_pr55930-dependency-tracking.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-libatomic build failure if configured with --disable-dependency-tracking
-load_n.c:115:1: fatal error: opening dependency file .deps/load_1_.lo.Ppo: No such file or directory
-
-https://bugs.gentoo.org/463463
-http://gcc.gnu.org/PR55930
-
---- a/libatomic/Makefile.in
-+++ b/libatomic/Makefile.in
-@@ -298,7 +298,8 @@ PAT_N = $(word 2,$(PAT_SPLIT))
- PAT_S = $(word 3,$(PAT_SPLIT))
- IFUNC_DEF = -DIFUNC_ALT=$(PAT_S)
- IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS))
--M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
-+@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
-+@AMDEP_FALSE@M_DEPS =
- M_SIZE = -DN=$(PAT_N)
- M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
- M_FILE = $(PAT_BASE)_n.c
diff --git a/main/gcc/320-libffi-gnulinux.patch b/main/gcc/320-libffi-gnulinux.patch
deleted file mode 100644
index b3b4fc9317..0000000000
--- a/main/gcc/320-libffi-gnulinux.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libffi/closures.c.orig b/libffi/closures.c
-index 721ff00..22a699c 100644
---- a/libffi/src/closures.c.orig
-+++ b/libffi/src/closures.c
-@@ -34,7 +34,7 @@
- #include <ffi_common.h>
-
- #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE
--# if __gnu_linux__ && !defined(__ANDROID__)
-+# if __linux__ && !defined(__ANDROID__)
- /* This macro indicates it may be forbidden to map anonymous memory
- with both write and execute permission. Code compiled when this
- option is defined will attempt to map such pages once, but if it
diff --git a/main/gcc/400-dlang-phobos.patch b/main/gcc/400-dlang-phobos.patch
deleted file mode 100644
index 7e434e7858..0000000000
--- a/main/gcc/400-dlang-phobos.patch
+++ /dev/null
@@ -1,1216 +0,0 @@
-diff -Nurp a/libphobos/libdruntime/core/stdc/fenv.d b/libphobos/libdruntime/core/stdc/fenv.d
---- a/libphobos/libdruntime/core/stdc/fenv.d 2019-10-28 06:37:30.000000000 +0900
-+++ b/libphobos/libdruntime/core/stdc/fenv.d 2019-10-28 08:08:09.000000000 +0900
-@@ -375,7 +375,44 @@ else version (Solaris)
- }
- else version (CRuntime_Musl)
- {
-- version (X86_64)
-+ version (AArch64)
-+ {
-+ struct fenv_t
-+ {
-+ uint __fpcr;
-+ uint __fpsr;
-+ }
-+ alias uint fexcept_t;
-+ }
-+ else version (ARM)
-+ {
-+ import core.stdc.config : c_ulong;
-+
-+ struct fenv_t
-+ {
-+ c_ulong __cw;
-+ }
-+ alias c_ulong fexcept_t;
-+ }
-+ else version (IBMZ_Any)
-+ {
-+ alias uint fenv_t;
-+ alias uint fexcept_t;
-+ }
-+ else version (MIPS_Any)
-+ {
-+ struct fenv_t
-+ {
-+ uint __cw;
-+ }
-+ alias ushort fexcept_t;
-+ }
-+ else version (PPC_Any)
-+ {
-+ alias double fenv_t;
-+ alias uint fexcept_t;
-+ }
-+ else version (X86_Any)
- {
- struct fenv_t
- {
-@@ -391,7 +428,8 @@ else version (CRuntime_Musl)
- uint __data_offset;
- ushort __data_selector;
- ushort __unused5;
-- uint __mxcsr;
-+ version (X86_64)
-+ uint __mxcsr;
- }
- alias ushort fexcept_t;
- }
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/dirent.d b/libphobos/libdruntime/core/sys/posix/dirent.d
---- a/libphobos/libdruntime/core/sys/posix/dirent.d 2019-10-28 06:37:30.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/dirent.d 2019-10-28 08:08:09.000000000 +0900
-@@ -506,7 +506,7 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--
-+ int readdir_r(DIR*, dirent*, dirent**);
- }
- else version (CRuntime_UClibc)
- {
-@@ -591,6 +591,8 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+ void seekdir(DIR*, c_long);
-+ c_long telldir(DIR*);
- }
- else version (CRuntime_UClibc)
- {
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/pthread.d b/libphobos/libdruntime/core/sys/posix/pthread.d
---- a/libphobos/libdruntime/core/sys/posix/pthread.d 2019-10-28 06:37:30.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/pthread.d 2019-10-28 08:08:09.000000000 +0900
-@@ -854,7 +854,15 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+ enum PTHREAD_BARRIER_SERIAL_THREAD = -1;
-
-+ int pthread_barrier_destroy(pthread_barrier_t*);
-+ int pthread_barrier_init(pthread_barrier_t*, in pthread_barrierattr_t*, uint);
-+ int pthread_barrier_wait(pthread_barrier_t*);
-+ int pthread_barrierattr_destroy(pthread_barrierattr_t*);
-+ int pthread_barrierattr_getpshared(in pthread_barrierattr_t*, int*);
-+ int pthread_barrierattr_init(pthread_barrierattr_t*);
-+ int pthread_barrierattr_setpshared(pthread_barrierattr_t*, int);
- }
- else version (CRuntime_UClibc)
- {
-@@ -880,6 +888,55 @@ else
- int pthread_condattr_getclock(in pthread_condattr_t*, clockid_t*);
- int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
- */
-+version (CRuntime_Glibc)
-+{
-+ int pthread_condattr_getclock(in pthread_condattr_t*, clockid_t*);
-+ int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
-+}
-+else version (FreeBSD)
-+{
-+ int pthread_condattr_getclock(in pthread_condattr_t*, clockid_t*);
-+ int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
-+}
-+else version (DragonFlyBSD)
-+{
-+ int pthread_condattr_getclock(in pthread_condattr_t*, clockid_t*);
-+ int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
-+}
-+else version (NetBSD)
-+{
-+ int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
-+}
-+else version (OpenBSD)
-+{
-+ int pthread_condattr_getclock(in pthread_condattr_t*, clockid_t*);
-+ int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
-+}
-+else version (Darwin)
-+{
-+}
-+else version (Solaris)
-+{
-+ int pthread_condattr_getclock(in pthread_condattr_t*, clockid_t*);
-+ int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
-+}
-+else version (CRuntime_Bionic)
-+{
-+}
-+else version (CRuntime_Musl)
-+{
-+ int pthread_condattr_getclock(in pthread_condattr_t*, clockid_t*);
-+ int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
-+}
-+else version (CRuntime_UClibc)
-+{
-+ int pthread_condattr_getclock(in pthread_condattr_t*, clockid_t*);
-+ int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
-+}
-+else
-+{
-+ static assert(false, "Unsupported platform");
-+}
-
- //
- // Spinlock (SPI)
-@@ -948,7 +1005,11 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--
-+ int pthread_spin_destroy(pthread_spinlock_t*);
-+ int pthread_spin_init(pthread_spinlock_t*, int);
-+ int pthread_spin_lock(pthread_spinlock_t*);
-+ int pthread_spin_trylock(pthread_spinlock_t*);
-+ int pthread_spin_unlock(pthread_spinlock_t*);
- }
- else version (CRuntime_UClibc)
- {
-@@ -1187,7 +1248,7 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--
-+ int pthread_getcpuclockid(pthread_t, clockid_t*);
- }
- else version (CRuntime_UClibc)
- {
-@@ -1256,7 +1317,9 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--
-+ int pthread_mutex_timedlock(pthread_mutex_t*, in timespec*);
-+ int pthread_rwlock_timedrdlock(pthread_rwlock_t*, in timespec*);
-+ int pthread_rwlock_timedwrlock(pthread_rwlock_t*, in timespec*);
- }
- else version (CRuntime_UClibc)
- {
-@@ -1693,7 +1756,12 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--
-+ int pthread_condattr_getpshared(pthread_condattr_t*, int*);
-+ int pthread_condattr_setpshared(pthread_condattr_t*, int);
-+ int pthread_mutexattr_getpshared(pthread_mutexattr_t*, int*);
-+ int pthread_mutexattr_setpshared(pthread_mutexattr_t*, int);
-+ int pthread_rwlockattr_getpshared(pthread_rwlockattr_t*, int*);
-+ int pthread_rwlockattr_setpshared(pthread_rwlockattr_t*, int);
- }
- else version (CRuntime_UClibc)
- {
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/pwd.d b/libphobos/libdruntime/core/sys/posix/pwd.d
---- a/libphobos/libdruntime/core/sys/posix/pwd.d 2019-10-28 06:37:30.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/pwd.d 2019-10-28 08:08:09.000000000 +0900
-@@ -172,7 +172,8 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-- struct passwd {
-+ struct passwd
-+ {
- char *pw_name;
- char *pw_passwd;
- uid_t pw_uid;
-@@ -257,6 +258,8 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+ int getpwnam_r(in char*, passwd*, char*, size_t, passwd**);
-+ int getpwuid_r(uid_t, passwd*, char*, size_t, passwd**);
- }
- else version (CRuntime_UClibc)
- {
-@@ -325,8 +328,9 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-- int getpwnam_r(in char*, passwd*, char*, size_t, passwd**);
-- int getpwuid_r(uid_t, passwd*, char*, size_t, passwd**);
-+ void endpwent();
-+ passwd* getpwent();
-+ void setpwent();
- }
- else version (CRuntime_UClibc)
- {
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/signal.d b/libphobos/libdruntime/core/sys/posix/signal.d
---- a/libphobos/libdruntime/core/sys/posix/signal.d 2019-10-28 07:12:22.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/signal.d 2019-10-28 08:08:09.000000000 +0900
-@@ -1136,55 +1136,57 @@ else version (NetBSD)
- enum SIG_UNBLOCK = 2;
- enum SIG_SETMASK = 3;
-
-- union sigval_t {
-- int sival_int;
-- void *sival_ptr;
-- };
-- struct _rt{
-- pid_t _pid;
-- uid_t _uid;
-- sigval_t _value;
-- };
-- struct _child{
-- pid_t _pid;
-- uid_t _uid;
-- int _status;
-- clock_t _utime;
-- clock_t _stime;
-- };
-- struct _fault{
-- void *_addr;
-- int _trap;
-- int _trap2;
-- int _trap3;
-- };
-- struct _poll{
-- long _band;
-- int _fd;
-- };
-- union _reason{
-- _rt rt;
-- _child child;
-- _fault fault;
-- _poll poll;
-- };
-- struct _ksiginfo {
-+ union sigval_t
-+ {
-+ int sival_int;
-+ void* sival_ptr;
-+ }
-+
-+ struct _ksiginfo
-+ {
- int _signo;
- int _code;
- int _errno;
--/+#ifdef _LP64
-- /* In _LP64 the union starts on an 8-byte boundary. */
-- int _pad;
--#endif+/
-- _reason reason;
-- };
-+ version (D_LP64)
-+ int _pad;
-
-+ union reason_t
-+ {
-+ struct rt_t
-+ {
-+ pid_t _pid;
-+ uid_t _uid;
-+ sigval_t _value;
-+ } rt_t _rt;
-+ struct child_t
-+ {
-+ pid_t _pid;
-+ uid_t _uid;
-+ int _status;
-+ clock_t _utime;
-+ clock_t _stime;
-+ } child_t _child;
-+ struct fault_t
-+ {
-+ void* _addr;
-+ int _trap;
-+ int _trap2;
-+ int _trap3;
-+ } fault_t fault;
-+ struct poll_t
-+ {
-+ c_long _band;
-+ int _fd;
-+ } poll_t _poll;
-+ }
-+ reason_t _reason;
-+ }
-
- union siginfo_t
- {
-- ubyte[128] si_pad;/* Total size; for future expansion */
-+ ubyte[128] si_pad;
- _ksiginfo _info;
-- @property ref c_long si_band() return { return _info.reason.poll._band; }
-+ @property ref c_long si_band() return { return _info._reason._poll._band; }
- }
-
- enum SI_USER = 0;
-@@ -1589,27 +1591,53 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-- struct sigset_t {
-- ulong[128/long.sizeof] __bits;
-+ struct sigset_t
-+ {
-+ c_ulong[128/c_long.sizeof] __bits;
- }
-
-- enum SIG_BLOCK = 0;
-- enum SIG_UNBLOCK = 1;
-- enum SIG_SETMASK = 2;
-+ version (MIPS_Any)
-+ {
-+ enum SIG_BLOCK = 1;
-+ enum SIG_UNBLOCK = 2;
-+ enum SIG_SETMASK = 3;
-+ }
-+ else
-+ {
-+ enum SIG_BLOCK = 0;
-+ enum SIG_UNBLOCK = 1;
-+ enum SIG_SETMASK = 2;
-+ }
-
-- struct siginfo_t {
-- int si_signo, si_errno, si_code;
-- union __si_fields_t {
-- char[128 - 2*int.sizeof - long.sizeof] __pad = 0;
-- struct __si_common_t {
-- union __first_t {
-- struct __piduid_t {
-+ struct siginfo_t
-+ {
-+ int si_signo;
-+ version (MIPS_Any) // __SI_SWAP_ERRNO_CODE
-+ {
-+ int si_code;
-+ int si_errno;
-+ }
-+ else
-+ {
-+ int si_errno;
-+ int si_code;
-+ }
-+ union __si_fields_t
-+ {
-+ char[128 - 2*int.sizeof - c_long.sizeof] __pad = 0;
-+ struct __si_common_t
-+ {
-+ union __first_t
-+ {
-+ struct __piduid_t
-+ {
- pid_t si_pid;
- uid_t si_uid;
- }
- __piduid_t __piduid;
-
-- struct __timer_t {
-+ struct __timer_t
-+ {
- int si_timerid;
- int si_overrun;
- }
-@@ -1617,11 +1645,14 @@ else version (CRuntime_Musl)
- }
- __first_t __first;
-
-- union __second_t {
-+ union __second_t
-+ {
- sigval si_value;
-- struct __sigchld_t {
-+ struct __sigchld_t
-+ {
- int si_status;
-- clock_t si_utime, si_stime;
-+ clock_t si_utime;
-+ clock_t si_stime;
- }
- __sigchld_t __sigchld;
- }
-@@ -1629,11 +1660,14 @@ else version (CRuntime_Musl)
- }
- __si_common_t __si_common;
-
-- struct __sigfault_t {
-+ struct __sigfault_t
-+ {
- void *si_addr;
- short si_addr_lsb;
-- union __first_t {
-- struct __addr_bnd_t {
-+ union __first_t
-+ {
-+ struct __addr_bnd_t
-+ {
- void *si_lower;
- void *si_upper;
- }
-@@ -1644,13 +1678,15 @@ else version (CRuntime_Musl)
- }
- __sigfault_t __sigfault;
-
-- struct __sigpoll_t {
-- long si_band;
-+ struct __sigpoll_t
-+ {
-+ c_long si_band;
- int si_fd;
- }
- __sigpoll_t __sigpoll;
-
-- struct __sigsys_t {
-+ struct __sigsys_t
-+ {
- void *si_call_addr;
- int si_syscall;
- uint si_arch;
-@@ -3030,7 +3066,177 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-- enum SA_RESTART = 0x10000000;
-+ version (MIPS_Any)
-+ {
-+ enum SIGPOLL = 22;
-+ enum SIGPROF = 29;
-+ enum SIGSYS = 12;
-+ enum SIGTRAP = 5;
-+ enum SIGVTALRM = 28;
-+ enum SIGXCPU = 30;
-+ enum SIGXFSZ = 31;
-+
-+ enum SA_ONSTACK = 0x08000000;
-+ enum SA_RESETHAND = 0x80000000;
-+ enum SA_RESTART = 0x10000000;
-+ enum SA_SIGINFO = 8;
-+ enum SA_NOCLDWAIT = 0x10000;
-+ enum SA_NODEFER = 0x40000000;
-+ }
-+ else
-+ {
-+ enum SIGPOLL = 29;
-+ enum SIGPROF = 27;
-+ enum SIGSYS = 31;
-+ enum SIGTRAP = 5;
-+ enum SIGVTALRM = 26;
-+ enum SIGXCPU = 24;
-+ enum SIGXFSZ = 25;
-+
-+ enum SA_ONSTACK = 0x08000000;
-+ enum SA_RESETHAND = 0x80000000;
-+ enum SA_RESTART = 0x10000000;
-+ enum SA_SIGINFO = 4;
-+ enum SA_NOCLDWAIT = 2;
-+ enum SA_NODEFER = 0x40000000;
-+ }
-+
-+ enum SS_ONSTACK = 1;
-+ enum SS_DISABLE = 2;
-+
-+ version (ARM)
-+ {
-+ enum MINSIGSTKSZ = 2048;
-+ enum SIGSTKSZ = 8192;
-+ }
-+ else version (AArch64)
-+ {
-+ enum MINSIGSTKSZ = 6144;
-+ enum SIGSTKSZ = 12288;
-+ }
-+ else version (IBMZ_Any)
-+ {
-+ enum MINSIGSTKSZ = 4096;
-+ enum SIGSTKSZ = 10240;
-+ }
-+ else version (MIPS_Any)
-+ {
-+ enum MINSIGSTKSZ = 2048;
-+ enum SIGSTKSZ = 8192;
-+ }
-+ else version (PPC_Any)
-+ {
-+ enum MINSIGSTKSZ = 4096;
-+ enum SIGSTKSZ = 10240;
-+ }
-+ else version (X86_Any)
-+ {
-+ enum MINSIGSTKSZ = 2048;
-+ enum SIGSTKSZ = 8192;
-+ }
-+ else
-+ static assert(0, "unimplemented");
-+
-+ //ucontext_t (defined in core.sys.posix.ucontext)
-+ //mcontext_t (defined in core.sys.posix.ucontext)
-+
-+ version (MIPS_Any)
-+ {
-+ struct stack_t
-+ {
-+ void* ss_sp;
-+ size_t ss_size;
-+ int ss_flags;
-+ }
-+ }
-+ else
-+ {
-+ struct stack_t
-+ {
-+ void* ss_sp;
-+ int ss_flags;
-+ size_t ss_size;
-+ }
-+ }
-+
-+ enum
-+ {
-+ ILL_ILLOPC = 1,
-+ ILL_ILLOPN,
-+ ILL_ILLADR,
-+ ILL_ILLTRP,
-+ ILL_PRVOPC,
-+ ILL_PRVREG,
-+ ILL_COPROC,
-+ ILL_BADSTK
-+ }
-+
-+ enum
-+ {
-+ FPE_INTDIV = 1,
-+ FPE_INTOVF,
-+ FPE_FLTDIV,
-+ FPE_FLTOVF,
-+ FPE_FLTUND,
-+ FPE_FLTRES,
-+ FPE_FLTINV,
-+ FPE_FLTSUB
-+ }
-+
-+ enum
-+ {
-+ SEGV_MAPERR = 1,
-+ SEGV_ACCERR
-+ }
-+
-+ enum
-+ {
-+ BUS_ADRALN = 1,
-+ BUS_ADRERR,
-+ BUS_OBJERR
-+ }
-+
-+ enum
-+ {
-+ TRAP_BRKPT = 1,
-+ TRAP_TRACE
-+ }
-+
-+ enum
-+ {
-+ CLD_EXITED = 1,
-+ CLD_KILLED,
-+ CLD_DUMPED,
-+ CLD_TRAPPED,
-+ CLD_STOPPED,
-+ CLD_CONTINUED
-+ }
-+
-+ enum
-+ {
-+ POLL_IN = 1,
-+ POLL_OUT,
-+ POLL_MSG,
-+ POLL_ERR,
-+ POLL_PRI,
-+ POLL_HUP
-+ }
-+
-+ sigfn_t bsd_signal(int sig, sigfn_t func);
-+ sigfn_t sigset(int sig, sigfn_t func);
-+
-+ nothrow:
-+ @nogc:
-+ sigfn_t2 bsd_signal(int sig, sigfn_t2 func);
-+ sigfn_t2 sigset(int sig, sigfn_t2 func);
-+
-+ int killpg(pid_t, int);
-+ int sigaltstack(const scope stack_t*, stack_t*);
-+ int sighold(int);
-+ int sigignore(int);
-+ int siginterrupt(int, int);
-+ int sigpause(int);
-+ int sigrelse(int);
- }
- else version (CRuntime_UClibc)
- {
-@@ -3483,7 +3689,7 @@ else version (CRuntime_Musl)
- int sigev_notify;
- void function(sigval) sigev_notify_function;
- pthread_attr_t *sigev_notify_attributes;
-- char[56 - 3 * long.sizeof] __pad = void;
-+ char[56 - 3 * c_long.sizeof] __pad = void;
- }
- }
- else version (CRuntime_UClibc)
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/sys/mman.d b/libphobos/libdruntime/core/sys/posix/sys/mman.d
---- a/libphobos/libdruntime/core/sys/posix/sys/mman.d 2019-10-28 07:12:22.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/sys/mman.d 2019-10-28 08:08:09.000000000 +0900
-@@ -128,6 +128,15 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+ enum
-+ {
-+ POSIX_MADV_NORMAL = 0,
-+ POSIX_MADV_RANDOM = 1,
-+ POSIX_MADV_SEQUENTIAL = 2,
-+ POSIX_MADV_WILLNEED = 3,
-+ POSIX_MADV_DONTNEED = 4,
-+ }
-+ int posix_madvise(void *, size_t, int);
- }
- else version (CRuntime_UClibc)
- {
-@@ -611,6 +620,14 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+ enum
-+ {
-+ MCL_CURRENT = 1,
-+ MCL_FUTURE = 2,
-+ }
-+
-+ int mlockall(int);
-+ int munlockall();
- }
- else version (CRuntime_UClibc)
- {
-@@ -674,6 +691,8 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+ int mlock(in void*, size_t);
-+ int munlock(in void*, size_t);
- }
- else version (CRuntime_UClibc)
- {
-@@ -776,6 +795,8 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+ int shm_open(in char*, int, mode_t);
-+ int shm_unlink(in char*);
- }
- else version (CRuntime_UClibc)
- {
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/sys/socket.d b/libphobos/libdruntime/core/sys/posix/sys/socket.d
---- a/libphobos/libdruntime/core/sys/posix/sys/socket.d 2019-10-28 07:12:22.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/sys/socket.d 2019-10-28 08:08:09.000000000 +0900
-@@ -1755,10 +1755,10 @@ else version (CRuntime_Musl)
- c_ulong __ss_align;
- }
-
-- enum {
-+ enum
-+ {
- SOCK_STREAM = 1,
- SOCK_DGRAM = 2,
-- SOCK_RAW = 3,
- SOCK_RDM = 4,
- SOCK_SEQPACKET = 5,
- SOCK_DCCP = 6,
-@@ -2187,6 +2187,10 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+ enum
-+ {
-+ SOCK_RAW = 3
-+ }
- }
- else version (CRuntime_UClibc)
- {
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/sys/types.d b/libphobos/libdruntime/core/sys/posix/sys/types.d
---- a/libphobos/libdruntime/core/sys/posix/sys/types.d 2019-10-28 07:12:22.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/sys/types.d 2019-10-28 08:07:51.000000000 +0900
-@@ -112,20 +112,25 @@ version (CRuntime_Glibc)
- }
- else version (CRuntime_Musl)
- {
-- alias long blksize_t;
-- alias ulong nlink_t;
-- alias long dev_t;
-- alias long blkcnt_t;
-- alias ulong ino_t;
-- alias long off_t;
-- alias long _Addr;
-- alias int pid_t;
-- alias uint uid_t;
-- alias uint gid_t;
-- alias long time_t;
-- alias long clock_t;
-- alias ulong pthread_t;
-- alias _Addr ssize_t;
-+ alias c_long blksize_t;
-+ alias c_ulong nlink_t;
-+ alias long dev_t;
-+ alias long blkcnt_t;
-+ alias ulong ino_t;
-+ alias long off_t;
-+ alias int pid_t;
-+ alias uint uid_t;
-+ alias uint gid_t;
-+ version (D_X32)
-+ alias long time_t;
-+ else
-+ alias c_long time_t;
-+ alias c_long clock_t;
-+ alias c_ulong pthread_t;
-+ version (D_LP64)
-+ alias c_long ssize_t;
-+ else
-+ alias int ssize_t;
- }
- else version (Darwin)
- {
-@@ -420,7 +425,10 @@ else version (CRuntime_Musl)
- }
- alias uint mode_t;
- alias uint id_t;
-- alias long suseconds_t;
-+ version (D_X32)
-+ alias long susseconds_t;
-+ else
-+ alias c_long suseconds_t;
- }
- else version (CRuntime_UClibc)
- {
-@@ -723,40 +746,77 @@ version (CRuntime_Glibc)
- }
- else version (CRuntime_Musl)
- {
-- version (X86_64) {
-+ version (D_LP64)
-+ {
- union pthread_attr_t
- {
- int[14] __i;
- ulong[7] __s;
- }
-+
- union pthread_cond_t
- {
- int[12] __i;
- void*[6] __p;
- }
-+
- union pthread_mutex_t
- {
- int[10] __i;
- void*[5] __p;
- }
-+
- union pthread_rwlock_t
- {
- int[14] __i;
- void*[7] __p;
- }
-- struct pthread_rwlockattr_t
-+ }
-+ else
-+ {
-+ union pthread_attr_t
-+ {
-+ int[9] __i;
-+ uint[9] __s;
-+ }
-+
-+ union pthread_cond_t
-+ {
-+ int[12] __i;
-+ void*[12] __p;
-+ }
-+
-+ union pthread_mutex_t
- {
-- uint[2] __attr;
-+ int[6] __i;
-+ void*[6] __p;
-+ }
-+
-+ union pthread_rwlock_t
-+ {
-+ int[8] __i;
-+ void*[8] __p;
- }
-- alias uint pthread_key_t;
-- alias uint pthread_condattr_t;
-- alias uint pthread_mutexattr_t;
-- alias int pthread_once_t;
- }
-- else
-+
-+ struct pthread_rwlockattr_t
- {
-- static assert (false, "Architecture unsupported");
-+ uint[2] __attr;
- }
-+
-+ alias uint pthread_key_t;
-+
-+ struct pthread_condattr_t
-+ {
-+ uint __attr;
-+ }
-+
-+ struct pthread_mutexattr_t
-+ {
-+ uint __attr;
-+ }
-+
-+ alias int pthread_once_t;
- }
- else version (Darwin)
- {
-@@ -1300,6 +1360,27 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+ version (D_LP64)
-+ {
-+ union pthread_barrier_t
-+ {
-+ int[8] __i;
-+ void*[4] __p;
-+ }
-+ }
-+ else
-+ {
-+ union pthread_barrier_t
-+ {
-+ int[5] __i;
-+ void*[5] __p;
-+ }
-+ }
-+
-+ struct pthread_barrierattr_t
-+ {
-+ uint __attr;
-+ }
- }
- else version (CRuntime_UClibc)
- {
-@@ -1351,6 +1432,10 @@ else version (CRuntime_UClibc)
- {
- alias int pthread_spinlock_t; // volatile
- }
-+else version (CRuntime_Musl)
-+{
-+ alias int pthread_spinlock_t;
-+}
-
- //
- // Timer (TMR)
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/sys/wait.d b/libphobos/libdruntime/core/sys/posix/sys/wait.d
---- a/libphobos/libdruntime/core/sys/posix/sys/wait.d 2019-10-28 07:12:22.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/sys/wait.d 2019-10-28 08:08:09.000000000 +0900
-@@ -362,6 +362,19 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+ enum WEXITED = 4;
-+ enum WSTOPPED = 2;
-+ enum WCONTINUED = 8;
-+ enum WNOWAIT = 0x01000000;
-+
-+ enum idtype_t
-+ {
-+ P_ALL,
-+ P_PID,
-+ P_PGID
-+ }
-+
-+ int waitid(idtype_t, id_t, siginfo_t*, int);
- }
- else version (CRuntime_UClibc)
- {
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/ucontext.d b/libphobos/libdruntime/core/sys/posix/ucontext.d
---- a/libphobos/libdruntime/core/sys/posix/ucontext.d 2019-10-28 07:12:22.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/ucontext.d 2019-10-28 08:08:09.000000000 +0900
-@@ -23,6 +23,10 @@ extern (C):
- nothrow:
- @nogc:
-
-+version (MIPS32) version = MIPS_Any;
-+version (MIPS64) version = MIPS_Any;
-+version (PPC) version = PPC_Any;
-+version (PPC64) version = PPC_Any;
- version (RISCV32) version = RISCV_Any;
- version (RISCV64) version = RISCV_Any;
- version (S390) version = IBMZ_Any;
-@@ -770,6 +774,139 @@ version (CRuntime_Glibc)
- else
- static assert(0, "unimplemented");
- }
-+else version (CRuntime_Musl)
-+{
-+ version (AArch64)
-+ {
-+ struct mcontext_t
-+ {
-+ real[18+256] __regs;
-+ }
-+
-+ struct ucontext_t
-+ {
-+ c_ulong uc_flags;
-+ ucontext_t* uc_link;
-+ stack_t uc_stack;
-+ sigset_t uc_sigmask;
-+ mcontext_t uc_mcontext;
-+ }
-+ }
-+ else version (ARM)
-+ {
-+ struct mcontext_t
-+ {
-+ c_ulong[21] __regs;
-+ }
-+
-+ struct ucontext_t
-+ {
-+ c_ulong uc_flags;
-+ ucontext_t* uc_link;
-+ stack_t uc_stack;
-+ mcontext_t uc_mcontext;
-+ sigset_t uc_sigmask;
-+ ulong[64] uc_regspace;
-+ }
-+ }
-+ else version (IBMZ_Any)
-+ {
-+ struct mcontext_t
-+ {
-+ c_ulong[18] __regs1;
-+ uint[18] __regs2;
-+ double[16] __regs3;
-+ }
-+
-+ struct ucontext_t
-+ {
-+ c_ulong uc_flags;
-+ ucontext_t* uc_link;
-+ stack_t uc_stack;
-+ mcontext_t uc_mcontext;
-+ sigset_t uc_sigmask;
-+ }
-+ }
-+ else version (MIPS_Any)
-+ {
-+ version (MIPS_N32)
-+ {
-+ struct mcontext_t
-+ {
-+ ulong[32] __mc1;
-+ double[32] __mc2;
-+ ulong[9] __mc3;
-+ uint[4] __mc4;
-+ }
-+ }
-+ else version (MIPS64)
-+ {
-+ struct mcontext_t
-+ {
-+ ulong[32] __mc1;
-+ double[32] __mc2;
-+ ulong[9] __mc3;
-+ uint[4] __mc4;
-+ }
-+ }
-+ else
-+ {
-+ struct mcontext_t
-+ {
-+ uint[2] __mc1;
-+ ulong[65] __mc2;
-+ uint[5] __mc3;
-+ ulong[2] __mc4;
-+ uint[6] __mc5;
-+ }
-+ }
-+
-+ struct ucontext_t
-+ {
-+ c_ulong uc_flags;
-+ ucontext_t* uc_link;
-+ stack_t uc_stack;
-+ mcontext_t uc_mcontext;
-+ sigset_t uc_sigmask;
-+ }
-+ }
-+ else version (X86)
-+ {
-+ struct mcontext_t
-+ {
-+ uint[22] __space;
-+ }
-+
-+ struct ucontext_t
-+ {
-+ c_ulong uc_flags;
-+ ucontext_t* uc_link;
-+ stack_t uc_stack;
-+ mcontext_t uc_mcontext;
-+ sigset_t uc_sigmask;
-+ c_ulong[28] __fpregs_mem;
-+ }
-+ }
-+ else version (X86_64)
-+ {
-+ struct mcontext_t
-+ {
-+ ulong[32] __space;
-+ }
-+
-+ struct ucontext_t
-+ {
-+ c_ulong uc_flags;
-+ ucontext_t* uc_link;
-+ stack_t uc_stack;
-+ mcontext_t uc_mcontext;
-+ sigset_t uc_sigmask;
-+ ulong[64] __fpregs_mem;
-+ }
-+ }
-+ else
-+ static assert(0, "unimplemented");
-+}
- else version (FreeBSD)
- {
- // <machine/ucontext.h>
-diff -Nurp a/libphobos/src/std/experimental/allocator/building_blocks/region.d b/libphobos/src/std/experimental/allocator/building_blocks/region.d
---- a/libphobos/src/std/experimental/allocator/building_blocks/region.d 2019-10-28 07:23:27.000000000 +0900
-+++ b/libphobos/src/std/experimental/allocator/building_blocks/region.d 2019-10-28 08:08:09.000000000 +0900
-@@ -580,6 +580,12 @@ struct InSituRegion(size_t size, size_t
- assert(a.length == 2001);
- }
-
-+version(CRuntime_Musl)
-+{
-+ // sbrk and brk are disabled in Musl:
-+ // https://git.musl-libc.org/cgit/musl/commit/?id=7a995fe706e519a4f55399776ef0df9596101f93
-+ // https://git.musl-libc.org/cgit/musl/commit/?id=863d628d93ea341b6a32661a1654320ce69f6a07
-+} else:
- private extern(C) void* sbrk(long);
- private extern(C) int brk(shared void*);
-
-diff -Nurp a/libphobos/src/std/socket.d b/libphobos/src/std/socket.d
---- a/libphobos/src/std/socket.d 2019-10-28 07:23:27.000000000 +0900
-+++ b/libphobos/src/std/socket.d 2019-10-28 08:08:09.000000000 +0900
-@@ -163,47 +163,7 @@ string formatSocketError(int err) @trust
- {
- cs = strerror_r(err, buf.ptr, buf.length);
- }
-- else version (OSX)
-- {
-- auto errs = strerror_r(err, buf.ptr, buf.length);
-- if (errs == 0)
-- cs = buf.ptr;
-- else
-- return "Socket error " ~ to!string(err);
-- }
-- else version (FreeBSD)
-- {
-- auto errs = strerror_r(err, buf.ptr, buf.length);
-- if (errs == 0)
-- cs = buf.ptr;
-- else
-- return "Socket error " ~ to!string(err);
-- }
-- else version (NetBSD)
-- {
-- auto errs = strerror_r(err, buf.ptr, buf.length);
-- if (errs == 0)
-- cs = buf.ptr;
-- else
-- return "Socket error " ~ to!string(err);
-- }
-- else version (DragonFlyBSD)
-- {
-- auto errs = strerror_r(err, buf.ptr, buf.length);
-- if (errs == 0)
-- cs = buf.ptr;
-- else
-- return "Socket error " ~ to!string(err);
-- }
-- else version (Solaris)
-- {
-- auto errs = strerror_r(err, buf.ptr, buf.length);
-- if (errs == 0)
-- cs = buf.ptr;
-- else
-- return "Socket error " ~ to!string(err);
-- }
-- else version (CRuntime_Bionic)
-+ else
- {
- auto errs = strerror_r(err, buf.ptr, buf.length);
- if (errs == 0)
-@@ -211,8 +171,6 @@ string formatSocketError(int err) @trust
- else
- return "Socket error " ~ to!string(err);
- }
-- else
-- static assert(0);
-
- auto len = strlen(cs);
-
-diff -Nurp a/libphobos/src/std/stdio.d b/libphobos/src/std/stdio.d
---- a/libphobos/src/std/stdio.d 2019-10-28 07:23:27.000000000 +0900
-+++ b/libphobos/src/std/stdio.d 2019-10-28 08:08:09.000000000 +0900
-@@ -44,38 +44,38 @@ version (CRuntime_Glibc)
- version = GCC_IO;
- version = HAS_GETDELIM;
- }
--
--version (OSX)
-+else version (CRuntime_Bionic)
- {
- version = GENERIC_IO;
- version = HAS_GETDELIM;
- }
--
--version (FreeBSD)
-+else version (CRuntime_Musl)
- {
- version = GENERIC_IO;
- version = HAS_GETDELIM;
- }
-
--version (NetBSD)
-+version (OSX)
- {
- version = GENERIC_IO;
- version = HAS_GETDELIM;
- }
--
--version (DragonFlyBSD)
-+else version (FreeBSD)
- {
- version = GENERIC_IO;
- version = HAS_GETDELIM;
- }
--
--version (Solaris)
-+else version (NetBSD)
- {
- version = GENERIC_IO;
-- version = NO_GETDELIM;
-+ version = HAS_GETDELIM;
- }
--
--version (CRuntime_Bionic)
-+else version (DragonFlyBSD)
-+{
-+ version = GENERIC_IO;
-+ version = HAS_GETDELIM;
-+}
-+else version (Solaris)
- {
- version = GENERIC_IO;
- version = NO_GETDELIM;
diff --git a/main/gcc/401-dlang-32bits.patch b/main/gcc/401-dlang-32bits.patch
deleted file mode 100644
index 6072546f7b..0000000000
--- a/main/gcc/401-dlang-32bits.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/libphobos/libdruntime/core/sys/posix/config.d 2019-10-29 15:54:05.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/config.d 2019-10-29 15:54:08.000000000 +0900
-@@ -67,15 +67,21 @@ version (CRuntime_Glibc)
- }
- else version (CRuntime_Musl)
- {
-+ // off_t is always 64 bits on Musl
- enum _FILE_OFFSET_BITS = 64;
-
-+ // Not present in Musl sources
- enum __REDIRECT = false;
-
-+ // Those three are irrelevant for Musl as it always uses 64 bits off_t
- enum __USE_FILE_OFFSET64 = _FILE_OFFSET_BITS == 64;
- enum __USE_LARGEFILE = __USE_FILE_OFFSET64 && !__REDIRECT;
- enum __USE_LARGEFILE64 = __USE_FILE_OFFSET64 && !__REDIRECT;
-
-- enum __WORDSIZE=64;
-+ version (D_LP64)
-+ enum __WORDSIZE = 64;
-+ else
-+ enum __WORDSIZE = 32;
- }
- else version (CRuntime_UClibc)
- {
diff --git a/main/gcc/402-dlang-stat.patch b/main/gcc/402-dlang-stat.patch
deleted file mode 100644
index faf4ed731f..0000000000
--- a/main/gcc/402-dlang-stat.patch
+++ /dev/null
@@ -1,448 +0,0 @@
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/fcntl.d b/libphobos/libdruntime/core/sys/posix/fcntl.d
---- a/libphobos/libdruntime/core/sys/posix/fcntl.d 2020-01-01 00:00:00.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/fcntl.d 2020-01-01 00:00:00.000000000 +0900
-@@ -779,7 +779,102 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-- enum {
-+ version (X86_64)
-+ {
-+ enum
-+ {
-+ O_DIRECTORY = 0x010000, // octal 0200000
-+ O_NOFOLLOW = 0x020000, // octal 0400000
-+ O_DIRECT = 0x004000, // octal 040000
-+ O_LARGEFILE = 0,
-+ O_TMPFILE = 0x410000, // octal 020200000
-+
-+ F_GETLK = 5,
-+ F_SETLK = 6,
-+ F_SETLKW = 7,
-+ }
-+ }
-+ // Note: Definitions for i386 are in arch/generic/bits/fcntl.h
-+ else version (X86)
-+ {
-+ enum
-+ {
-+ O_DIRECTORY = 0x010000, // octal 0200000
-+ O_NOFOLLOW = 0x020000, // octal 0400000
-+ O_DIRECT = 0x004000, // octal 040000
-+ O_LARGEFILE = 0x008000, // octal 0100000
-+ O_TMPFILE = 0x410000, // octal 020200000
-+
-+ F_GETLK = 12,
-+ F_SETLK = 13,
-+ F_SETLKW = 14,
-+ }
-+ }
-+ else version (ARM)
-+ {
-+ enum
-+ {
-+ O_DIRECTORY = 0x004000, // octal 040000
-+ O_NOFOLLOW = 0x008000, // octal 0100000
-+ O_DIRECT = 0x010000, // octal 0200000
-+ O_LARGEFILE = 0x020000, // octal 0400000
-+ O_TMPFILE = 0x404000, // octal 020040000
-+
-+ F_GETLK = 12,
-+ F_SETLK = 13,
-+ F_SETLKW = 14,
-+ }
-+ }
-+ else version (AArch64)
-+ {
-+ enum
-+ {
-+ O_DIRECTORY = 0x004000, // octal 040000
-+ O_NOFOLLOW = 0x008000, // octal 0100000
-+ O_DIRECT = 0x010000, // octal 0200000
-+ O_LARGEFILE = 0x020000, // octal 0400000
-+ O_TMPFILE = 0x404000, // octal 020040000
-+
-+ F_GETLK = 5,
-+ F_SETLK = 6,
-+ F_SETLKW = 7,
-+ }
-+ }
-+ else version (SystemZ)
-+ {
-+ enum
-+ {
-+ O_DIRECTORY = 0x010000, // octal 0200000
-+ O_NOFOLLOW = 0x020000, // octal 0400000
-+ O_DIRECT = 0x004000, // octal 040000
-+ O_LARGEFILE = 0x008000, // octal 0100000
-+ O_TMPFILE = 0x410000, // octal 020200000
-+
-+ F_GETLK = 5,
-+ F_SETLK = 6,
-+ F_SETLKW = 7,
-+ }
-+ }
-+ else version (PPC64)
-+ {
-+ enum
-+ {
-+ O_DIRECTORY = 0x004000, // octal 040000
-+ O_NOFOLLOW = 0x008000, // octal 0100000
-+ O_DIRECT = 0x020000, // octal 0400000
-+ O_LARGEFILE = 0x010000, // octal 0200000
-+ O_TMPFILE = 0x410000, // octal 020200000
-+
-+ F_GETLK = 5,
-+ F_SETLK = 6,
-+ F_SETLKW = 7,
-+ }
-+ }
-+ else
-+ static assert(0, "Platform not supported");
-+
-+ enum
-+ {
- O_CREAT = 0x40, // octal 0100
- O_EXCL = 0x80, // octal 0200
- O_NOCTTY = 0x100, // octal 0400
-@@ -790,16 +885,11 @@ else version (CRuntime_Musl)
- O_DSYNC = 0x1000, // octal 010000
- O_SYNC = 0x101000, // octal 04010000
- O_RSYNC = O_SYNC,
-- O_DIRECTORY = 0x10000,
-- O_NOFOLLOW = 0x20000,
- O_CLOEXEC = 0x80000,
-
- O_ASYNC = 0x2000,
-- O_DIRECT = 0x4000,
-- O_LARGEFILE = 0,
- O_NOATIME = 0x40000,
- O_PATH = 0x200000,
-- O_TMPFILE = 0x410000,
- O_NDELAY = O_NONBLOCK,
- O_SEARCH = O_PATH,
- O_EXEC = O_PATH,
-@@ -809,19 +899,19 @@ else version (CRuntime_Musl)
- O_WRONLY = 01,
- O_RDWR = 02,
- }
-- enum {
-+ enum
-+ {
- F_DUPFD = 0,
- F_GETFD = 1,
- F_SETFD = 2,
- F_GETFL = 3,
- F_SETFL = 4,
-- F_GETLK = 5,
-- F_SETLK = 6,
-- F_SETLKW = 7,
-+ // F_GETLK, F_SETLK, F_SETLKW are arch-specific
- F_SETOWN = 8,
- F_GETOWN = 9,
- }
-- enum {
-+ enum
-+ {
- F_RDLCK = 0,
- F_WRLCK = 1,
- F_UNLCK = 2,
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/semaphore.d b/libphobos/libdruntime/core/sys/posix/semaphore.d
---- a/libphobos/libdruntime/core/sys/posix/semaphore.d 2020-01-01 00:00:00.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/semaphore.d 2020-01-01 00:00:00.000000000 +0900
-@@ -143,8 +143,10 @@ else version (CRuntime_Bionic)
- else version (CRuntime_Musl)
- {
- struct sem_t {
-- int[4*long.sizeof/int.sizeof] __val;
-+ int[4*c_long.sizeof/int.sizeof] __val;
- }
-+
-+ enum SEM_FAILED = (sem_t*).init;
- }
- else version (CRuntime_UClibc)
- {
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/sys/stat.d b/libphobos/libdruntime/core/sys/posix/sys/stat.d
---- a/libphobos/libdruntime/core/sys/posix/sys/stat.d 2020-01-01 00:00:00.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/sys/stat.d 2020-01-01 00:00:00.000000000 +0900
-@@ -1587,31 +1587,225 @@ else version (CRuntime_Musl)
- S_ISGID = 0x400, // octal 02000
- S_ISVTX = 0x200, // octal 01000
- }
-- struct stat_t {
-- dev_t st_dev;
-- ino_t st_ino;
-- nlink_t st_nlink;
--
-- mode_t st_mode;
-- uid_t st_uid;
-- gid_t st_gid;
-- uint __pad0;
-- dev_t st_rdev;
-- off_t st_size;
-- blksize_t st_blksize;
-- blkcnt_t st_blocks;
--
-- timespec st_atim;
-- timespec st_mtim;
-- timespec st_ctim;
-- extern(D) @safe @property inout pure nothrow
-- {
-- ref inout(time_t) st_atime() return { return st_atim.tv_sec; }
-- ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; }
-- ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; }
-+ version (ARM)
-+ {
-+ struct stat_t
-+ {
-+ dev_t st_dev;
-+ int __st_dev_padding;
-+ c_long __st_ino_truncated;
-+ mode_t st_mode;
-+ nlink_t st_nlink;
-+
-+ uid_t st_uid;
-+ gid_t st_gid;
-+ dev_t st_rdev;
-+ int __st_rdev_padding;
-+ off_t st_size;
-+ blksize_t st_blksize;
-+ blkcnt_t st_blocks;
-+
-+ timespec st_atim;
-+ timespec st_mtim;
-+ timespec st_ctim;
-+ ino_t st_ino;
-+
-+ extern(D) @safe @property inout pure nothrow
-+ {
-+ ref inout(time_t) st_atime() return { return st_atim.tv_sec; }
-+ ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; }
-+ ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; }
-+ }
-+ }
-+ }
-+ else version (AArch64)
-+ {
-+ struct stat_t
-+ {
-+ dev_t st_dev;
-+ ino_t st_ino;
-+ mode_t st_mode;
-+ nlink_t st_nlink;
-+
-+ uid_t st_uid;
-+ gid_t st_gid;
-+ dev_t st_rdev;
-+ c_ulong __pad;
-+ off_t st_size;
-+ blksize_t st_blksize;
-+ int __pad2;
-+ blkcnt_t st_blocks;
-+
-+ timespec st_atim;
-+ timespec st_mtim;
-+ timespec st_ctim;
-+ uint[2] __unused;
-+
-+ extern(D) @safe @property inout pure nothrow
-+ {
-+ ref inout(time_t) st_atime() return { return st_atim.tv_sec; }
-+ ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; }
-+ ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; }
-+ }
-+ }
-+ }
-+ else version (X86_64)
-+ {
-+ struct stat_t
-+ {
-+ dev_t st_dev;
-+ ino_t st_ino;
-+ nlink_t st_nlink;
-+
-+ mode_t st_mode;
-+ uid_t st_uid;
-+ gid_t st_gid;
-+ uint __pad0;
-+ dev_t st_rdev;
-+ off_t st_size;
-+ blksize_t st_blksize;
-+ blkcnt_t st_blocks;
-+
-+ timespec st_atim;
-+ timespec st_mtim;
-+ timespec st_ctim;
-+
-+ c_long[3] __unused;
-+
-+ extern(D) @safe @property inout pure nothrow
-+ {
-+ ref inout(time_t) st_atime() return { return st_atim.tv_sec; }
-+ ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; }
-+ ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; }
-+ }
-+ }
-+ }
-+ else version (X86)
-+ {
-+ struct stat_t
-+ {
-+ dev_t st_dev;
-+ int __st_dev_padding;
-+ c_long __st_ino_truncated;
-+ mode_t st_mode;
-+ nlink_t st_nlink;
-+
-+ uid_t st_uid;
-+ gid_t st_gid;
-+ dev_t st_rdev;
-+ int __st_rdev_padding;
-+ off_t st_size;
-+ blksize_t st_blksize;
-+ blkcnt_t st_blocks;
-+
-+ timespec st_atim;
-+ timespec st_mtim;
-+ timespec st_ctim;
-+ ino_t st_ino;
-+
-+ extern(D) @safe @property inout pure nothrow
-+ {
-+ ref inout(time_t) st_atime() return { return st_atim.tv_sec; }
-+ ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; }
-+ ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; }
-+ }
- }
-- long[3] __unused;
- }
-+ else version (MIPS64)
-+ {
-+ struct stat_t
-+ {
-+ dev_t st_dev;
-+ int[3] __pad1;
-+ ino_t st_ino;
-+ mode_t st_mode;
-+ nlink_t st_nlink;
-+
-+ uid_t st_uid;
-+ gid_t st_gid;
-+ dev_t st_rdev;
-+ uint[2] __pad2;
-+ off_t st_size;
-+ int __pad3;
-+
-+ timespec st_atim;
-+ timespec st_mtim;
-+ timespec st_ctim;
-+ blksize_t st_blksize;
-+ uint __pad4;
-+ blkcnt_t st_blocks;
-+ int[14] __pad5;
-+
-+ extern(D) @safe @property inout pure nothrow
-+ {
-+ ref inout(time_t) st_atime() return { return st_atim.tv_sec; }
-+ ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; }
-+ ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; }
-+ }
-+ }
-+ }
-+ else version (PPC64)
-+ {
-+ struct stat_t
-+ {
-+ dev_t st_dev;
-+ ino_t st_ino;
-+ nlink_t st_nlink;
-+ mode_t st_mode;
-+
-+ uid_t st_uid;
-+ gid_t st_gid;
-+ dev_t st_rdev;
-+ off_t st_size;
-+ blksize_t st_blksize;
-+ blkcnt_t st_blocks;
-+
-+ timespec st_atim;
-+ timespec st_mtim;
-+ timespec st_ctim;
-+ c_ulong[3] __unused;
-+
-+ extern(D) @safe @property inout pure nothrow
-+ {
-+ ref inout(time_t) st_atime() return { return st_atim.tv_sec; }
-+ ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; }
-+ ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; }
-+ }
-+ }
-+ }
-+ else version (SystemZ)
-+ {
-+ struct stat_t
-+ {
-+ dev_t st_dev;
-+ ino_t st_ino;
-+ nlink_t st_nlink;
-+ mode_t st_mode;
-+
-+ uid_t st_uid;
-+ gid_t st_gid;
-+ dev_t st_rdev;
-+ off_t st_size;
-+
-+ timespec st_atim;
-+ timespec st_mtim;
-+ timespec st_ctim;
-+
-+ blksize_t st_blksize;
-+ blkcnt_t st_blocks;
-+ c_ulong[3] __unused;
-+
-+ extern(D) @safe @property inout pure nothrow
-+ {
-+ ref inout(time_t) st_atime() return { return st_atim.tv_sec; }
-+ ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; }
-+ ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; }
-+ }
-+ }
-+ }
-+ else
-+ static assert("Unsupported platform");
-+
- private
- {
- extern (D) bool S_ISTYPE( mode_t mode, uint mask )
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/sys/types.d b/libphobos/libdruntime/core/sys/posix/sys/types.d
---- a/libphobos/libdruntime/core/sys/posix/sys/types.d 2020-01-08 00:00:00.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/sys/types.d 2020-01-08 00:00:00.000000000 +0900
-@@ -112,8 +112,26 @@ version (CRuntime_Glibc)
- }
- else version (CRuntime_Musl)
- {
-- alias c_long blksize_t;
-- alias c_ulong nlink_t;
-+ version (AArch64)
-+ {
-+ alias int blksize_t;
-+ alias uint nlink_t;
-+ }
-+ else version (MIPS64)
-+ {
-+ alias c_long blksize_t;
-+ alias uint nlink_t;
-+ }
-+ else version (RISCV64)
-+ {
-+ alias int blksize_t;
-+ alias uint nlink_t;
-+ }
-+ else
-+ {
-+ alias c_long blksize_t;
-+ alias c_ulong nlink_t;
-+ }
- alias long dev_t;
- alias long blkcnt_t;
- alias ulong ino_t;
diff --git a/main/gcc/403-dlang-ibmz.patch b/main/gcc/403-dlang-ibmz.patch
deleted file mode 100644
index f6f9a2ce0c..0000000000
--- a/main/gcc/403-dlang-ibmz.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -Nurp a/libphobos/libdruntime/gcc/sections/elf_shared.d b/libphobos/libdruntime/gcc/sections/elf_shared.d
---- a/libphobos/libdruntime/gcc/sections/elf_shared.d 2020-01-01 00:00:00.000000000 +0900
-+++ b/libphobos/libdruntime/gcc/sections/elf_shared.d 2020-01-01 00:00:00.000000000 +0900
-@@ -1084,7 +1084,9 @@ void[] getTLSRange(size_t mod, size_t sz) nothrow @nogc
-
- // base offset
- auto ti = tls_index(mod, 0);
-- version (IBMZ_Any)
-+ version (CRuntime_Musl)
-+ return (__tls_get_addr(&ti)-TLS_DTV_OFFSET)[0 .. sz];
-+ else version (IBMZ_Any)
- {
- auto idx = cast(void *)__tls_get_addr_internal(&ti)
- + cast(ulong)__builtin_thread_pointer();
-diff -Nurp a/libphobos/configure.ac b/libphobos/configure.ac
---- a/libphobos/configure.ac 2020-01-01 00:00:00.000000000 +0900
-+++ b/libphobos/configure.ac 2020-01-01 00:00:00.000000000 +0900
-@@ -140,6 +140,14 @@ case ${host} in
- esac
- AC_MSG_RESULT($LIBPHOBOS_SUPPORTED)
-
-+AC_MSG_CHECKING([if target needs to link in swapcontext])
-+AC_MSG_RESULT($LIBDRUNTIME_NEEDS_UCONTEXT)
-+AS_IF([test "x$LIBDRUNTIME_NEEDS_UCONTEXT" = xyes], [
-+ AC_SEARCH_LIBS([swapcontext], [c ucontext], [], [
-+ AC_MSG_ERROR([[can't find library providing swapcontext]])
-+ ])
-+])
-+
- # Decide if it's usable.
- case $LIBPHOBOS_SUPPORTED:$enable_libphobos in
- *:no) use_libphobos=no ;;
-diff -Nurp a/libphobos/configure.tgt b/libphobos/configure.tgt
---- a/libphobos/configure.tgt 2020-01-01 00:00:00.000000000 +0900
-+++ b/libphobos/configure.tgt 2020-01-01 00:00:00.000000000 +0900
-@@ -22,6 +22,13 @@
- # Disable the libphobos or libdruntime components on untested or known
- # broken systems. More targets shall be added after testing.
- LIBPHOBOS_SUPPORTED=no
-+
-+# Check if we require 'ucontext' or if we have a custom solution.
-+# Most platform uses a custom assembly solution for context switches,
-+# see `core.thread` and grep for `AsmExternal`.
-+# Definitions are in config/ARCH/
-+LIBPHOBOS_NEEDS_UCONTEXT=no
-+
- case "${target}" in
- aarch64*-*-linux*)
- LIBPHOBOS_SUPPORTED=yes
-@@ -37,6 +44,7 @@ case "${target}" in
- ;;
- s390*-linux*)
- LIBPHOBOS_SUPPORTED=yes
-+ LIBDRUNTIME_NEEDS_UCONTEXT=yes
- ;;
- x86_64-*-kfreebsd*-gnu | i?86-*-kfreebsd*-gnu)
- LIBPHOBOS_SUPPORTED=yes
-diff -Nurp a/libphobos/configure b/libphobos/configure
---- a/libphobos/configure 2020-01-01 00:00:00.000000000 +0900
-+++ b/libphobos/configure 2020-01-01 00:00:00.000000000 +0900
-@@ -13955,6 +13955,76 @@ esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBPHOBOS_SUPPORTED" >&5
- $as_echo "$LIBPHOBOS_SUPPORTED" >&6; }
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if target needs to link in swapcontext" >&5
-+$as_echo_n "checking if target needs to link in swapcontext... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBDRUNTIME_NEEDS_UCONTEXT" >&5
-+$as_echo "$LIBDRUNTIME_NEEDS_UCONTEXT" >&6; }
-+if test "x$LIBDRUNTIME_NEEDS_UCONTEXT" = xyes; then :
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing swapcontext" >&5
-+$as_echo_n "checking for library containing swapcontext... " >&6; }
-+if ${ac_cv_search_swapcontext+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char swapcontext ();
-+int
-+main ()
-+{
-+return swapcontext ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+for ac_lib in '' c ucontext; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_search_swapcontext=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext
-+ if ${ac_cv_search_swapcontext+:} false; then :
-+ break
-+fi
-+done
-+if ${ac_cv_search_swapcontext+:} false; then :
-+
-+else
-+ ac_cv_search_swapcontext=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_swapcontext" >&5
-+$as_echo "$ac_cv_search_swapcontext" >&6; }
-+ac_res=$ac_cv_search_swapcontext
-+if test "$ac_res" != no; then :
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+else
-+
-+ as_fn_error $? "can't find library providing swapcontext" "$LINENO" 5
-+
-+fi
-+
-+
-+fi
-+
-+
- # Decide if it's usable.
- case $LIBPHOBOS_SUPPORTED:$enable_libphobos in
- *:no) use_libphobos=no ;;
diff --git a/main/gcc/405-dlang-mips.patch b/main/gcc/405-dlang-mips.patch
deleted file mode 100644
index 1b222a0d43..0000000000
--- a/main/gcc/405-dlang-mips.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- gcc-9.3.0.orig/libphobos/libdruntime/core/sys/posix/fcntl.d
-+++ gcc-9.3.0/libphobos/libdruntime/core/sys/posix/fcntl.d
-@@ -870,6 +870,21 @@
- F_SETLKW = 7,
- }
- }
-+ else version (MIPS_Any)
-+ {
-+ enum
-+ {
-+ O_DIRECTORY = 0x010000, // octal 0200000
-+ O_NOFOLLOW = 0x020000, // octal 0400000
-+ O_DIRECT = 0x008000, // octal 0100000
-+ O_LARGEFILE = 0x002000, // octal 0020000
-+ O_TMPFILE = 0x410000, // octal 020200000
-+
-+ F_GETLK = 33,
-+ F_SETLK = 34,
-+ F_SETLKW = 35,
-+ }
-+ }
- else
- static assert(0, "Platform not supported");
-
---- gcc-9.3.0.orig/libphobos/configure.tgt
-+++ gcc-9.3.0/libphobos/configure.tgt
-@@ -38,6 +38,7 @@
- ;;
- mips*-*-linux*)
- LIBPHOBOS_SUPPORTED=yes
-+ LIBDRUNTIME_NEEDS_UCONTEXT=yes
- ;;
- riscv*-*-linux*)
- LIBPHOBOS_SUPPORTED=yes
diff --git a/main/gcc/406-dlang-fix-interface-visibility.patch b/main/gcc/406-dlang-fix-interface-visibility.patch
deleted file mode 100644
index b4d690e015..0000000000
--- a/main/gcc/406-dlang-fix-interface-visibility.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream: Yes, https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92216 and
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95184
-Reason: GDC produced errors about duplicate symbols when the same interface
-was implemented by two classes in the same project.
-diff --git a/gcc/d/decl.cc b/gcc/d/decl.cc
-index 3824060..7afb1aa 100644 (file)
---- a/gcc/d/decl.cc
-+++ b/gcc/d/decl.cc
-@@ -1803,8 +1803,11 @@ make_thunk (FuncDeclaration *decl, int offset)
-
- DECL_CONTEXT (thunk) = d_decl_context (decl);
-
-- /* Thunks inherit the public access of the function they are targetting. */
-- TREE_PUBLIC (thunk) = TREE_PUBLIC (function);
-+ /* Thunks inherit the public access of the function they are targetting.
-+ When the function is outside the current compilation unit however, then the
-+ thunk must be kept private to not conflict. */
-+ TREE_PUBLIC (thunk) = TREE_PUBLIC (function) && !DECL_EXTERNAL (function);
-+
- DECL_EXTERNAL (thunk) = 0;
-
- /* Thunks are always addressable. */
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index d1c028ed52..754283b371 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gcc
-pkgver=9.3.0
+pkgver=10.2.0
[ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
[ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
pkgname="$pkgname$_target"
-pkgrel=3
+pkgrel=5
pkgdesc="The GNU Compiler Collection"
url="https://gcc.gnu.org"
arch="all"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later LGPL-2.1-or-later"
_gccrel=$pkgver-r$pkgrel
depends="binutils$_target isl"
makedepends_build="gcc$_cross g++$_cross paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
-makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev !gettext-dev"
+makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev !gettext-dev libucontext-dev"
subpackages=" "
[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"
replaces="libstdc++ binutils"
@@ -93,9 +93,6 @@ fi
# See libphobos/configure.tgt in GCC sources for supported targets
[ "$CARCH" = ppc64le ] && LANG_D=false
-# Go needs {set,make,swap}context, unimplemented in musl
-[ "$CTARGET_LIBC" = musl ] && LANG_GO=false
-
# libitm has TEXTRELs in ARM build, so disable for now
case "$CTARGET_ARCH" in
arm*) _libitm=false ;;
@@ -150,50 +147,47 @@ fi
makedepends="$makedepends_build $makedepends_host"
source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
- 002_all_default-relro.patch
- 003_all_default-fortify-source.patch
- 005_all_default-as-needed.patch
- gcc-as-needed-gold.patch
- 011_all_default-warn-format-security.patch
- 012_all_default-warn-trampolines.patch
- 013_all_default-ssp-fix.patch
- 020_all_msgfmt-libstdc++-link.patch
- 050_all_libiberty-asprintf.patch
- 051_all_libiberty-pic.patch
- 053_all_libitm-no-fortify-source.patch
- 090_all_pr55930-dependency-tracking.patch
- 0003-gcc-poison-system-directories.patch
-
- 203-libgcc_s.patch
- 205-nopie.patch
- 0002-posix_memalign.patch
- 0008-s390x-muslldso.patch
- 0010-ldbl128-config.patch
- 0012-static-pie.patch
-
- libgcc-always-build-gcceh.a.patch
- gcc-4.9-musl-fortify.patch
- gcc-6.1-musl-libssp.patch
- gcc-pure64.patch
- futex-time64.patch
-
- fix-cxxflags-passing.patch
- ada-shared.patch
- ada-musl.patch
- libgnarl-musl.patch
-
- 320-libffi-gnulinux.patch
-
- gcc-pure64-mips.patch
- 0016-invalid_tls_model.patch
-
- 400-dlang-phobos.patch
- 401-dlang-32bits.patch
- 402-dlang-stat.patch
- 403-dlang-ibmz.patch
- 404-dlang-zlib.patch
- 405-dlang-mips.patch
- 406-dlang-fix-interface-visibility.patch
+ 0001-posix_memalign.patch
+ 0002-gcc-poison-system-directories.patch
+ 0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+ 0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+ 0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+ 0006-Enable-Wformat-and-Wformat-security-by-default.patch
+ 0007-Enable-Wtrampolines-by-default.patch
+ 0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+ 0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+ 0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+ 0011-libiberty-copy-PIC-objects-during-build-process.patch
+ 0012-libitm-disable-FORTIFY.patch
+ 0013-libgcc_s.patch
+ 0014-nopie.patch
+ 0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+ 0016-dlang-update-zlib-binding.patch
+ 0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+ 0018-ada-fix-shared-linking.patch
+ 0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+ 0020-libstdc-futex-add-time64-compatibility.patch
+ 0021-add-fortify-headers-paths.patch
+ 0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+ 0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+ 0024-Pure-64-bit-MIPS.patch
+ 0025-use-pure-64-bit-configuration-where-appropriate.patch
+ 0026-always-build-libgcc_eh.a.patch
+ 0027-ada-libgnarl-compatibility-for-musl.patch
+ 0028-ada-musl-support-fixes.patch
+ 0029-c-Fix-bogus-vector-initialisation-error-PR96377.patch
+ 0030-rs6000-ICE-when-using-an-MMA-type-as-a-function-para.patch
+ 0031-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+ 0032-gcc-go-Don-t-include-sys-user.h.patch
+ 0033-gcc-go-Fix-ucontext_t-on-PPC64.patch
+ 0034-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+ 0035-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+ 0036-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
+ 0037-gcc-go-signal-34-is-special-on-musl-libc.patch
+ 0038-gcc-go-Prefer-_off_t-over-_off64_t.patch
+ 0039-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+ 0040-gcc-go-link-to-libucontext.patch
+ 0041-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
"
# gcc-4.8-build-args.patch
@@ -296,6 +290,8 @@ build() {
echo " hash_style_configure=$_hash_style_configure"
echo ""
+ export CFLAGS="$CFLAGS -O2"
+
mkdir -p "$_builddir"
cd "$_builddir"
"$_gccdir"/configure --prefix=/usr \
@@ -480,8 +476,10 @@ objc() {
replaces="gcc"
depends="libc-dev gcc=$_gccrel libobjc=$_gccrel"
- mkdir -p "$subpkgdir"/$_gcclibdir/include \
+ mkdir -p "$subpkgdir/$_gcclibexec" \
+ "$subpkgdir"/$_gcclibdir/include \
"$subpkgdir"/usr/lib
+ mv "$pkgdir/$_gcclibexec/cc1obj" "$subpkgdir/$_gcclibexec/"
mv "$pkgdir"/$_gcclibdir/include/objc "$subpkgdir"/$_gcclibdir/include/
mv "$pkgdir"/usr/lib/libobjc.so "$pkgdir"/usr/lib/libobjc.a \
"$subpkgdir"/usr/lib/
@@ -518,15 +516,19 @@ gdc() {
depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
depends="$depends libucontext-dev"
- mkdir -p "$subpkgdir"/$_gcclibdir/include/d/ \
+ mkdir -p "$subpkgdir/$_gcclibexec" \
+ "$subpkgdir"/$_gcclibdir/include/d/ \
"$subpkgdir"/usr/lib \
"$subpkgdir"/usr/bin
# Copy: The installed '.d' files, the static lib, the binary itself
# The shared libs are part of 'libgphobos' so one can run program
# without installing the compiler
+ mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
+ mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
+ mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
}
@@ -541,17 +543,24 @@ libgo() {
go() {
pkgdesc="Go support for GCC"
- depends="gcc=$_gccrel libgo=$_gccrel"
+ depends="gcc=$_gccrel libgo=$_gccrel !go"
mkdir -p "$subpkgdir"/$_gcclibexec \
"$subpkgdir"/usr/lib \
"$subpkgdir"/usr/bin
mv "$pkgdir"/usr/lib/go "$subpkgdir"/usr/lib/
mv "$pkgdir"/usr/bin/*gccgo "$subpkgdir"/usr/bin/
+ mv "$pkgdir"/usr/bin/*go "$subpkgdir"/usr/bin
+ mv "$pkgdir"/usr/bin/*gofmt "$subpkgdir"/usr/bin
mv "$pkgdir"/$_gcclibexec/go1 "$subpkgdir"/$_gcclibexec/
+ mv "$pkgdir"/$_gcclibexec/cgo "$subpkgdir"/$_gcclibexec/
+ mv "$pkgdir"/$_gcclibexec/buildid "$subpkgdir"/$_gcclibexec/
+ mv "$pkgdir"/$_gcclibexec/test2json "$subpkgdir"/$_gcclibexec/
+ mv "$pkgdir"/$_gcclibexec/vet "$subpkgdir"/$_gcclibexec/
mv "$pkgdir"/usr/lib/libgo.a \
"$pkgdir"/usr/lib/libgo.so \
"$pkgdir"/usr/lib/libgobegin.a \
+ "$pkgdir"/usr/lib/libgolibbegin.a \
"$subpkgdir"/usr/lib/
}
@@ -591,6 +600,7 @@ gfortran() {
"$pkgdir"/usr/lib/libquadmath.so \
"$subpkgdir"/usr/lib/
fi
+ mv "$pkgdir"/$_gcclibdir/finclude "$subpkgdir"/$_gcclibdir/
mv "$pkgdir"/$_gcclibexec/f951 "$subpkgdir"/$_gcclibexec
mv "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir
}
@@ -617,42 +627,45 @@ gnat() {
mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/
}
-sha512sums="4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de gcc-9.3.0.tar.xz
-e36e95b81489163abd6fe9d58f7867bdca43e61143afacbfb17f4698c0b16ec5fd0061d8fab7b2ae615540bebd721c2e2227f80401b4e7fc253da9da62e6b513 002_all_default-relro.patch
-f86466c62b8291fac46f9c250c7ad8fa5ab7b1cce2504442fd07ddc4543665b317ae28951f244e39aba29aeaf3fff252ec4f6a147aa16adb2b7aed747dd89188 003_all_default-fortify-source.patch
-5e4794d1caddb1050d8935ae5a53ba275b653ad2c9954df89a8c47ac694e6139011829f440eb7e5b24fd57ea25daf25ac83f317871841a78ffb74d167d6f8bf9 005_all_default-as-needed.patch
-6c9a5068f6eea8a85d297a3555b1d2333ffd4b9ddbfb7560a3e643f8577603871ca123373ef7f96e894225291d88f7bf575c7f8386bcfdd1dabcd7ba12598b65 gcc-as-needed-gold.patch
-e026bf9f73ee254528423c6cabdfd7794960c567161581b7d4b7c61c45027e12a6efef79662d4288b9cbaecb4798f01af6a5b4a13b766c2d501444ac1846fd43 011_all_default-warn-format-security.patch
-37de4cc9061bfe1963e6e6570e1a6bbfd58204bf90e0eef819882599a9a80ea28f3eb815c20c1f173dc25d4bd9971b7c7f7f9512d6f8f91f04de1e1175114d4d 012_all_default-warn-trampolines.patch
-38a0fedeac3eebe4a6a957792ba520225cf42663c96a171cd168fdb6c91ffa9a56b80351f8238c5d03b78d3ae2a6539a54481fe4848b4a395e2c87f2ff7adc08 013_all_default-ssp-fix.patch
-d35a3ac7e13a4446921a90e1ff3eec1079840c845f9d523c868e24ae21f94cf69ba041de5341ebef96432a6f57598e223381d4286e8fb8baaa25906707f29fbd 020_all_msgfmt-libstdc++-link.patch
-840070a3c423e6206aaa6e63e1d9a0fcd6efd53626cd1240a193f0b60aa5d84216acc4a2a4fa8bce74549b07e6a316b01d638f20cea13dc62473491a302fb3d6 050_all_libiberty-asprintf.patch
-0a0bc72b9366158f5d23fff1928e756fdd212433bac6ab1f00d632f241382820db8db5d475ddf11ea020eaf7e2e71b12fb9b1c3c870cf84adf6c2b16f15aabca 051_all_libiberty-pic.patch
-e7a2eb1b1870e199d6fd753d065781575656fa12baa264f96c5d179689d88c31b8a3f92a5dae96088c05e96aa2bda138364ad7dbcc79e1819a102f192cbb7bab 053_all_libitm-no-fortify-source.patch
-4a328d1e1a56c20166307edcfa322068915784d9c08025b7f81cf69714da48fc266b6d34f77b9135c2f10da830d9df408276a1b78d1fd218637c2823506593c2 090_all_pr55930-dependency-tracking.patch
-707b30c141778fbcb1e37ebb42873cd7971de232a1298f78bbd834fa74d411b7b49cecfe4f247316d7c785da792f95f26ea6d824cd322a8f87b29537af3f77f3 0003-gcc-poison-system-directories.patch
-d1c2d7ff7f673375dc7cd84ae9d8515853b5af6390c70bb763412c012101344e4ee1ce155151ce3fb6ba2b80af7ed42d697dbe1bf6fd6e7b2b9087a378c47c37 203-libgcc_s.patch
-98473bcaa77903a223ca9b0d2087c0921b287a2816d308cc32c8fe009e6cbf5dd1ae7fba27794ab8d9c09e117fe534413d91a464d1218474fc123ce0adfdc2c1 205-nopie.patch
-6d84354e6df96d5ea244eb3bb5f044781796b88040b11c78fb6ee509e5aac19d46e0e92ca836e98e6495d9751f52439833b748efc419e4f5d5301fb549c4dcc9 0002-posix_memalign.patch
-7f434a7350c9b06d0ae7cc18a569d813238483afa34b0801d112844a0dfe6164ae36b0416955fd4da7a8caa54672247f319a8ec7ce4b6a97a5f4e17ec083112a 0008-s390x-muslldso.patch
-66085c5555e6b91b6874d1782d5a1dc0ab1792889f9400f48cde9483f82b51b9e3a5de1efbba21a19fc5e664334f2188d0c2bc988d42335efa26118b3c85cc7f 0010-ldbl128-config.patch
-d91c5eba37166cf34ca38e03808e3960c091b3627008a0c68c127cdf52e3827f8cfbe478ababe64c3cbb4d5eb8ed6230a21a74b6908549e05e08646de09df37c 0012-static-pie.patch
-d08d7ead2de0429e5c9055d5b029ec2be9a8c821d22cecaf9b51f633652c493333f98963d9267fa2fa63850c50ae5eefd5f59e5910ec10d20044dac082182a8b libgcc-always-build-gcceh.a.patch
-600fe5098dc54edaa9808fd5717af9dec058953f9ad37d49cfba1db4f7e9a7a8f02019342f75157fc575946fa693259422184de27b7ecc8386d9f3ecc0f7cc5d gcc-4.9-musl-fortify.patch
-dbe0ee917fc7668571722364ab7c806731e3a31e8bfa30b4941b28b16b877d2a32b4a3897ef533399a28f82d43cac9b28e92de0493f0e779046db56584e07fa4 gcc-6.1-musl-libssp.patch
-fa62556719449caec6b2b434355bfbcaa5ae55ffe017b3e1f827f66a2aae21b79c571ee7a4ce723ea69169bc3a6447e73650991a200cc372adf2f102677518d7 gcc-pure64.patch
-5b12af738349a22346589e53e7ab7d37a065b7f4c756aab4c1cc1b4753cdf9ad1bf198f4e4783ae10232df63da0855591bab2452b50ac96a08905972d93c1b0e futex-time64.patch
-35d6d59f0b7b968f282f56767c9e0823a7bdc5aa0d450aca50fbd802649a7ca608b47671244a3faa208a9b0d6832cabb5a22724157dc817b2c0ad63d09f93282 fix-cxxflags-passing.patch
-3f5bc334d9f73d06f5f7c876738d02356acdd08958bea0e4d2095ebf15c2c2ec4e411abdae0297505ae9a1699ca01b17338e853184e84663203b192b0d35fc19 ada-shared.patch
-cceeac95f47ea8664e1c16c5ebecb472b5aaa56040e943c1b97c7873b50e3a2bf972d9f743d342a2444a3bb711a0720d2446fded43892c5e05bdeefd478b0cd1 ada-musl.patch
-a1f7750bc7b8b7d916a5dee34fcc736bd4fb249c96538b547d495794e6cfd49356aa3974506a15074b4cb58edd5d7e2868607c902dd003e8c464d5066fd4a575 libgnarl-musl.patch
-f4ef08454e28c8732db69115e4998ec153399e8d229dd27f923dbdcf57b68128a65640d026cc7f45b58ba8764ab1eb575d4eb6d6dfc550a87a183f8b94e76181 320-libffi-gnulinux.patch
-86be3338cc9c33089608bc4c5e3b7918c4e500a345c338f361b18c342119a6ed69af5495d72950de7106d760f003528b46ad14795e805f8a3331e206dcb234e3 gcc-pure64-mips.patch
-17e0faeef742d32d57a070d983480367dd28cd28d47a8966ce327afdff3a38ea76803a833c90aff7d3a93aa66dae76c9be47b2408500913b40571af25b85aca7 0016-invalid_tls_model.patch
-38772c5b0905455a44c43d6ef7e5f140530006e2bde9f5ffd6b569c7cf9633992515f666b486d7a78c30ab8da99b92b2775c90fde47821ae542ef1c49dc405df 400-dlang-phobos.patch
-84bdbdfcb972161765b81220ea2e80e83c32f3ab27596b77eb451d8cac4bd6312210df468581c2b0e1363f5e3b31654e369c47ae84c907f3b54a1786d7c17830 401-dlang-32bits.patch
-9d73f21eaa2458d28a144dd0e5478ed52763a4d8bbf62084b607db52bce1e2242f773c853fc34e6aae2d53c4124948139954627064e850e9dabaddaef5cb9d69 402-dlang-stat.patch
-fd056014d0c6f627108d7387bfe46b5fb66786a16fa964da55b0442658b1c8e9e903c641a9e3233000ef37691e32ea4fef22029ab5eba217ccbc8bd5941e81ae 403-dlang-ibmz.patch
-ddb3ca26b5e55f6d376036c2ed87959770bfb72d1175d0dba332f705edf6817806d53765c838ff670472a16ab175bd1ce88946c19d83f9d5e53ff2b4d3558dfb 404-dlang-zlib.patch
-3f40f796f50d49ea0a185d3454c79606fb5f90ed48c030fe25c1df8c4a72ba7cae37dccdb260cf737beb3e921dc2ddad68effbe446dbf220a07d0158b9b9ca8d 405-dlang-mips.patch
-c226bb5c60ae5071549e5ec3ab44dc87b244615ba520973b1d4c50a2b6d3fd941c4e5e8e1f85cad28093ee8627d20415114524b593ad3a9b24998328d3f3ea72 406-dlang-fix-interface-visibility.patch"
+sha512sums="42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e gcc-10.2.0.tar.xz
+ee2d344e912ebaddf71d53ff674ca7ea7837ee65f982a8f088339fd05261e441aace6087f7f936d32b502bff7e375094f48cb90562ab7734c57e1750d3fe2029 0001-posix_memalign.patch
+deaf3ba25614df18b2b9b04244bcc9278c16d98f6fdeac17f7e2c0567be7c2836ab6d21fc9d8f779c672022d25fc278327d6d0d637bc200fadbb8d913ef95581 0002-gcc-poison-system-directories.patch
+eb80ea94e008e33b97c8c0d47e74d639897a13357abbd130e9bff4ae30349b8f788acbaf4caa61f23022a86841c431b8bb639c536aab548dc735470a7c7ccfcf 0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+6cbc39dd24f7b4316b6e69940bf7c9f3ae889e8156f9c7dd72c8335e55a2a44d6fade37954296451b588bf8fc065514d4916ad527042b8f9a86d6e0d706e3c9c 0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+e8c75aef864e5852fc78bfd7949232fc58b40a743d7c04a122ee6e021ee99f72edcff6efbf74e0eedc9405faf81d01208867b0571c4dc8cb44b9a03d1d25fbde 0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+d5b3d40e1c4828d16684137487f64bf0b4b892fabc403f975f37d481a22647f923a3524a12714898937abdfbf875411e50b522134535f8d1852f103310aef5a3 0006-Enable-Wformat-and-Wformat-security-by-default.patch
+e568a17fb3348964c0d21e7d67ffeae4f2f0dfd3f2986aaf9cec86c685c13f0c830dfc019b6bd7fe58b8635e5b8fca7ad992a92210f2be285b8cac6467c33a78 0007-Enable-Wtrampolines-by-default.patch
+fd47150c72138d47a9faafe8586e84456e09a4ca0ed1ba9be7b5b2a351b1ca2d17b238beaa42c88888402d181933ff68cef0a91f0c3bd26d374706cf71726bbd 0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+820be83d93ff5b8d8fc69cdeccec0c6ac2544ee6cce43ae35e6829222791733a1c0b2232fb5a7ad93ab9e6cd677f077d01a4f9dec7aa9c38b013f74aa6c74fc3 0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+5be4c0ad27e3b86c06dcaefe34ee1271cb53ded3de9802bc1a8571497240ca870e22534f77adb52dc4556eb4861b94a6c9a39cf6a2e84ef62ee88a04a4a01868 0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+5024309e549b7e4a94f2af8bd727144bd27cf8b7cdcbb537a30f3dac28543697c214438da7af491e43cb90daac46344b7b0466729d5c4209ca8a3a0d5a7d027c 0011-libi