summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap2
-rw-r--r--exlibs/cargo.exlib19
-rw-r--r--exlibs/llvm-project.exlib19
-rw-r--r--exlibs/php-pecl.exlib10
-rw-r--r--exlibs/postgresql.exlib14
-rw-r--r--exlibs/qmake.exlib30
-rw-r--r--metadata/news/2020-12-05-perl-update/2020-12-05-perl-update.en.txt26
-rw-r--r--metadata/options/descriptions/contrib_modules.conf16
-rw-r--r--metadata/options/descriptions/php_abis.conf1
-rw-r--r--metadata/options/descriptions/providers.conf3
-rw-r--r--metadata/repository_mask.conf110
-rw-r--r--packages/app-admin/eclectic-llvm/eclectic-llvm-0-r1.exheres-0 (renamed from packages/app-admin/eclectic-llvm/eclectic-llvm-0.exheres-0)18
-rw-r--r--packages/app-admin/sudo/sudo-1.9.5_p1.exheres-0 (renamed from packages/app-admin/sudo/sudo-1.9.3_p1.exheres-0)0
-rw-r--r--packages/app-arch/libarchive/libarchive-3.5.1.exheres-0 (renamed from packages/app-arch/libarchive/libarchive-3.4.3.exheres-0)0
-rw-r--r--packages/app-arch/libarchive/libarchive.exlib4
-rw-r--r--packages/app-arch/libjcat/files/libjcat-0.1.5-Fall-back-to-the-AliasId-for-validation.patch62
-rw-r--r--packages/app-arch/libjcat/files/libjcat-0.1.5-Fix-jcat_context_verify_blob-to-use-self-verify-for-.patch32
-rw-r--r--packages/app-arch/libjcat/libjcat-0.1.5.exheres-0 (renamed from packages/app-arch/libjcat/libjcat-0.1.3.exheres-0)5
-rw-r--r--packages/app-arch/snappy/snappy-1.1.8.exheres-0 (renamed from packages/app-arch/snappy/snappy-1.1.7.exheres-0)19
-rw-r--r--packages/app-arch/tar/tar-1.33.exheres-0 (renamed from packages/app-arch/tar/tar-1.32.exheres-0)0
-rw-r--r--packages/app-arch/unrar/unrar-6.0.2.exheres-0 (renamed from packages/app-arch/unrar/unrar-5.9.1.exheres-0)3
-rw-r--r--packages/app-arch/zstd/zstd-1.4.8.exheres-0 (renamed from packages/app-arch/zstd/zstd-1.4.5.exheres-0)0
-rw-r--r--packages/app-crypt/gnupg/gnupg-2.2.27.exheres-0 (renamed from packages/app-crypt/gnupg/gnupg-2.2.25.exheres-0)1
-rw-r--r--packages/app-crypt/gpgme/gpgme-1.15.1.exheres-0 (renamed from packages/app-crypt/gpgme/gpgme-1.15.0.exheres-0)0
-rw-r--r--packages/app-crypt/rhash/rhash-1.4.1.exheres-0 (renamed from packages/app-crypt/rhash/rhash-1.4.0.exheres-0)0
-rw-r--r--packages/app-dicts/aspell-pl/aspell-pl-6.0_20210105.0.exheres-0 (renamed from packages/app-dicts/aspell-pl/aspell-pl-6.0_20200327.0.exheres-0)0
-rw-r--r--packages/app-doc/doxygen/doxygen-1.9.1.exheres-0 (renamed from packages/app-doc/doxygen/doxygen-1.8.20.exheres-0)0
-rw-r--r--packages/app-doc/scdoc/scdoc-1.11.1.exheres-0 (renamed from packages/app-doc/scdoc/scdoc-1.10.0.exheres-0)0
-rw-r--r--packages/app-editors/nano/nano-5.5.exheres-0 (renamed from packages/app-editors/nano/nano-5.3.exheres-0)0
-rw-r--r--packages/app-text/md4c/md4c-0.4.7.exheres-0 (renamed from packages/app-text/md4c/md4c-0.4.6.exheres-0)0
-rw-r--r--packages/app-text/podofo/files/podofo-cmake-3.12.patch17
-rw-r--r--packages/app-text/podofo/podofo-0.9.7.exheres-0 (renamed from packages/app-text/podofo/podofo-0.9.6.exheres-0)4
-rw-r--r--packages/app-text/podofo/podofo.exlib4
-rw-r--r--packages/dev-cpp/mcpp/files/01-zeroc-fixes.patch86
-rw-r--r--packages/dev-cpp/mcpp/files/02-gniibe-fixes.patch36
-rw-r--r--packages/dev-cpp/mcpp/files/03-gniibe-fix-11.patch24
-rw-r--r--packages/dev-cpp/mcpp/files/04-gniibe-fix-12.patch20
-rw-r--r--packages/dev-cpp/mcpp/files/05-gniibe-fix-13.patch56
-rw-r--r--packages/dev-cpp/mcpp/files/06-gniibe-fix-autotools.patch138
-rw-r--r--packages/dev-cpp/mcpp/files/mcpp-fix-build-system.patch31
-rw-r--r--packages/dev-cpp/mcpp/mcpp-2.7.2.exheres-030
-rw-r--r--packages/dev-cpp/pstl/pstl-11.0.1.exheres-0 (renamed from packages/dev-cpp/pstl/pstl-11.0.0.exheres-0)0
-rw-r--r--packages/dev-db/xapian-core/xapian-core-1.4.18.exheres-0 (renamed from packages/dev-db/xapian-core/xapian-core-1.4.17.exheres-0)0
-rw-r--r--packages/dev-lang/clang/clang-11.0.1.exheres-0 (renamed from packages/dev-lang/clang/clang-11.0.0.exheres-0)0
-rw-r--r--packages/dev-lang/clang/clang-9.0.1-r2.exheres-015
-rw-r--r--packages/dev-lang/clang/clang.exlib37
-rw-r--r--packages/dev-lang/clang/files/9/0001-clang-Exherbo-multiarch-ajustments.patch236
-rw-r--r--packages/dev-lang/clang/files/9/5e866e411caad4c4e17e7e0c67b06d28451e1bf2.patch727
-rw-r--r--packages/dev-lang/clang/files/9/bb282f47511e83fdb6761a6bda185e2062d7a099.patch333
-rw-r--r--packages/dev-lang/elixir/elixir-1.11.3.exheres-0 (renamed from packages/dev-lang/elixir/elixir-1.11.0.exheres-0)0
-rw-r--r--packages/dev-lang/erlang/erlang-22.3.4.14.exheres-0 (renamed from packages/dev-lang/erlang/erlang-22.3.4.11.exheres-0)0
-rw-r--r--packages/dev-lang/erlang/erlang-23.2.1.exheres-07
-rw-r--r--packages/dev-lang/go/go-1.14.13.exheres-0 (renamed from packages/dev-lang/go/go-1.14.12.exheres-0)0
-rw-r--r--packages/dev-lang/go/go-1.15.6.exheres-0 (renamed from packages/dev-lang/go/go-1.15.5.exheres-0)0
-rw-r--r--packages/dev-lang/llvm/llvm-11.0.1.exheres-0 (renamed from packages/dev-lang/llvm/llvm-11.0.0.exheres-0)0
-rw-r--r--packages/dev-lang/llvm/llvm-9.0.1-r1.exheres-025
-rw-r--r--packages/dev-lang/llvm/llvm.exlib11
-rw-r--r--packages/dev-lang/node/node-12.20.1.exheres-0 (renamed from packages/dev-lang/node/node-12.19.0.exheres-0)0
-rw-r--r--packages/dev-lang/node/node-15.5.1.exheres-0 (renamed from packages/dev-lang/node/node-15.1.0.exheres-0)0
-rw-r--r--packages/dev-lang/node/node.exlib13
-rw-r--r--packages/dev-lang/php/php-7.3.26.exheres-0 (renamed from packages/dev-lang/php/php-7.3.24.exheres-0)0
-rw-r--r--packages/dev-lang/php/php-7.4.14.exheres-0 (renamed from packages/dev-lang/php/php-7.4.12.exheres-0)0
-rw-r--r--packages/dev-lang/php/php-8.0.1.exheres-07
-rw-r--r--packages/dev-lang/php/php.exlib33
-rw-r--r--packages/dev-lang/python/files/3.8/0001-bpo-42794-Update-test_nntplib-to-use-offical-group-n.patch64
-rw-r--r--packages/dev-lang/python/python-3.8.7.exheres-0 (renamed from packages/dev-lang/python/python-3.8.6.exheres-0)0
-rw-r--r--packages/dev-lang/python/python-3.9.1.exheres-0 (renamed from packages/dev-lang/python/python-3.9.0.exheres-0)0
-rw-r--r--packages/dev-libs/boost/boost-1.72.0-r1.exheres-09
-rw-r--r--packages/dev-libs/boost/boost-1.75.0.exheres-0 (renamed from packages/dev-libs/boost/boost-1.71.0-r2.exheres-0)0
-rw-r--r--packages/dev-libs/botan/botan-2.17.3.exheres-0 (renamed from packages/dev-libs/botan/botan-2.17.2.exheres-0)0
-rw-r--r--packages/dev-libs/botan/botan.exlib2
-rw-r--r--packages/dev-libs/cjson/cjson-1.7.14.exheres-032
-rw-r--r--packages/dev-libs/compiler-rt/compiler-rt-11.0.1.exheres-0 (renamed from packages/dev-libs/compiler-rt/compiler-rt-11.0.0.exheres-0)0
-rw-r--r--packages/dev-libs/compiler-rt/compiler-rt-9.0.1-r2.exheres-014
-rw-r--r--packages/dev-libs/compiler-rt/files/0001-compiler-rt-Backport-patch-to-fix-build-error-with-g.patch47
-rw-r--r--packages/dev-libs/compiler-rt/files/38c356176b5370164578c1d08e984964354b7189.patch140
-rw-r--r--packages/dev-libs/compiler-rt/files/9e8b011195a3602dff7193f71527697b121fb551.patch27
-rw-r--r--packages/dev-libs/fmt/fmt-7.1.3.exheres-0 (renamed from packages/dev-libs/fmt/fmt-7.0.1.exheres-0)0
-rw-r--r--packages/dev-libs/glib/glib-2.66.4.exheres-0 (renamed from packages/dev-libs/glib/glib-2.66.1.exheres-0)0
-rw-r--r--packages/dev-libs/icu/files/icu-68.2-ICU-21366-testConverter-allow-some-double-precision-.patch36
-rw-r--r--packages/dev-libs/icu/icu-68.2.exheres-0 (renamed from packages/dev-libs/icu/icu-68.1.exheres-0)4
-rw-r--r--packages/dev-libs/icu/icu.exlib5
-rw-r--r--packages/dev-libs/inih/inih-52.exheres-033
-rw-r--r--packages/dev-libs/isl/isl-0.23.exheres-028
-rw-r--r--packages/dev-libs/json/json-3.9.1-r1.exheres-0 (renamed from packages/dev-libs/json/json-3.9.1.exheres-0)2
-rw-r--r--packages/dev-libs/libfido2/libfido2-1.6.0.exheres-0 (renamed from packages/dev-libs/libfido2/libfido2-1.5.0.exheres-0)13
-rw-r--r--packages/dev-libs/libgpg-error/libgpg-error-1.41.exheres-0 (renamed from packages/dev-libs/libgpg-error/libgpg-error-1.39.exheres-0)0
-rw-r--r--packages/dev-libs/libpcap/files/libpcap-1.10.0-usbmon.patch18
-rw-r--r--packages/dev-libs/libpcap/files/libpcap-1.8.1-pkg-config.patch98
-rw-r--r--packages/dev-libs/libpcap/files/libpcap-1.8.1-usbmon.patch20
-rw-r--r--packages/dev-libs/libpcap/libpcap-1.10.0.exheres-0 (renamed from packages/dev-libs/libpcap/libpcap-1.9.1.exheres-0)17
-rw-r--r--packages/dev-libs/libressl/libressl-3.1.5.exheres-0 (renamed from packages/dev-libs/libressl/libressl-3.1.4.exheres-0)0
-rw-r--r--packages/dev-libs/libressl/libressl-3.2.3.exheres-0 (renamed from packages/dev-libs/libressl/libressl-3.2.2.exheres-0)0
-rw-r--r--packages/dev-libs/libusb/libusb-1.0.24.exheres-0 (renamed from packages/dev-libs/libusb/libusb-1.0.23.exheres-0)0
-rw-r--r--packages/dev-libs/libxmlb/libxmlb-0.2.1.exheres-0 (renamed from packages/dev-libs/libxmlb/libxmlb-0.1.15.exheres-0)0
-rw-r--r--packages/dev-libs/nettle/nettle-3.7.exheres-0 (renamed from packages/dev-libs/nettle/nettle-3.6.exheres-0)0
-rw-r--r--packages/dev-libs/nettle/nettle.exlib8
-rw-r--r--packages/dev-libs/openssl/openssl-1.1.1i.exheres-0 (renamed from packages/dev-libs/openssl/openssl-1.1.1h.exheres-0)0
-rw-r--r--packages/dev-libs/openssl/openssl-3.0.0_alpha10.exheres-07
-rw-r--r--packages/dev-libs/openssl/openssl.exlib91
-rw-r--r--packages/dev-libs/p11-kit/p11-kit-0.23.22.exheres-0 (renamed from packages/dev-libs/p11-kit/p11-kit-0.23.21.exheres-0)0
-rw-r--r--packages/dev-libs/pcre/pcre-8.44.exheres-01
-rw-r--r--packages/dev-libs/pcre2/pcre2-10.36.exheres-0 (renamed from packages/dev-libs/pcre2/pcre2-10.35.exheres-0)0
-rw-r--r--packages/dev-libs/pybind11/pybind11-2.6.1.exheres-0 (renamed from packages/dev-libs/pybind11/pybind11-2.5.0.exheres-0)32
-rw-r--r--packages/dev-libs/robin-map/robin-map-0.6.3.exheres-0 (renamed from packages/dev-libs/robin-map/robin-map-0.6.1.exheres-0)2
-rw-r--r--packages/dev-node/yarn/yarn-1.22.10.exheres-0 (renamed from packages/dev-node/yarn/yarn-1.22.4.exheres-0)0
-rw-r--r--packages/dev-perl/URI/URI-5.06.exheres-0 (renamed from packages/dev-perl/URI/URI-5.05.exheres-0)0
-rw-r--r--packages/dev-python/setuptools/setuptools-51.3.3.exheres-0 (renamed from packages/dev-python/setuptools/setuptools-50.3.2.exheres-0)4
-rw-r--r--packages/dev-scm/bzr/bzr-2.7.0-r1.exheres-0 (renamed from packages/dev-scm/bzr/bzr-2.7.0.exheres-0)0
-rw-r--r--packages/dev-scm/bzr/bzr.exlib2
-rw-r--r--packages/dev-scm/git-remote-hg/git-remote-hg-1.0.2.1.exheres-0 (renamed from packages/dev-scm/git-remote-hg/git-remote-hg-1.0.0.exheres-0)0
-rw-r--r--packages/dev-scm/git/files/git-fast-import-fix-over-allocation-of-marks-storage.patch227
-rw-r--r--packages/dev-scm/git/git-2.29.2-r1.exheres-0 (renamed from packages/dev-scm/git/git-2.29.2.exheres-0)4
-rw-r--r--packages/dev-scm/git/git-2.30.0.exheres-0 (renamed from packages/dev-scm/git/git-2.28.0.exheres-0)0
-rw-r--r--packages/dev-scm/git/git-build.exlib2
-rw-r--r--packages/dev-scm/mercurial/mercurial-5.6.1.exheres-0 (renamed from packages/dev-scm/mercurial/mercurial-5.0.1-r1.exheres-0)29
-rw-r--r--packages/dev-util/strace/strace-5.10.exheres-0 (renamed from packages/dev-util/strace/strace-5.9.exheres-0)0
-rw-r--r--packages/mail-mta/postfix/postfix-3.5.9.exheres-0 (renamed from packages/mail-mta/postfix/postfix-3.5.8.exheres-0)0
-rw-r--r--packages/mail-mta/postfix/postfix.exlib2
-rw-r--r--packages/media-libs/jasper/jasper-2.0.24.exheres-0 (renamed from packages/media-libs/jasper/jasper-2.0.17.exheres-0)8
-rw-r--r--packages/net-dialup/linux-atm/files/linux-atm-fix-build-after-y2038-changes-in-glibc.patch38
-rw-r--r--packages/net-dialup/linux-atm/linux-atm-2.5.2.exheres-01
-rw-r--r--packages/net-dialup/ppp/files/ppp-2.4.7-abort-on-errors-in-subdir-builds.patch50
-rw-r--r--packages/net-dialup/ppp/files/ppp-2.4.7-rc_mksid-no-buffer-overflow.patch27
-rw-r--r--packages/net-dialup/ppp/files/ppp-pppoe-include-netinet-in.h-before-linux-in.h.patch51
-rw-r--r--packages/net-dialup/ppp/files/use-openssl.patch111
-rw-r--r--packages/net-dialup/ppp/ppp-2.4.9.exheres-0 (renamed from packages/net-dialup/ppp/ppp-2.4.7-r2.exheres-0)30
-rw-r--r--packages/net-dns/c-ares/c-ares-1.17.1.exheres-0 (renamed from packages/net-dns/c-ares/c-ares-1.16.1-r1.exheres-0)9
-rw-r--r--packages/net-dns/c-ares/files/c-ares-1.16.1-caa-reply-backport.patch395
-rw-r--r--packages/net-firewall/iptables/iptables-1.8.7.exheres-0 (renamed from packages/net-firewall/iptables/iptables-1.8.6.exheres-0)0
-rw-r--r--packages/net-libs/libtirpc/libtirpc-1.3.1.exheres-0 (renamed from packages/net-libs/libtirpc/libtirpc-1.2.6.exheres-0)0
-rw-r--r--packages/net-misc/curl/curl-7.74.0.exheres-0 (renamed from packages/net-misc/curl/curl-7.73.0.exheres-0)1
-rw-r--r--packages/net-misc/dhcpcd/dhcpcd-9.4.0.exheres-0 (renamed from packages/net-misc/dhcpcd/dhcpcd-9.3.1.exheres-0)0
-rw-r--r--packages/net-misc/wget/files/wget-1.20.3-src-iri.c-do_conversion-Remove-unneeded-debug-lines.patch39
-rw-r--r--packages/net-misc/wget/files/wget-tests-unit-tests.c-Fix-multiple-definition-of.-with-.patch37
-rw-r--r--packages/net-misc/wget/wget-1.21.1.exheres-0 (renamed from packages/net-misc/wget/wget-1.20.3-r1.exheres-0)11
-rw-r--r--packages/net-print/cups-filters/cups-filters-1.28.6.exheres-0 (renamed from packages/net-print/cups-filters/cups-filters-1.28.5.exheres-0)2
-rw-r--r--packages/sys-apps/busybox/busybox-1.32.1.exheres-0 (renamed from packages/sys-apps/busybox/busybox-1.31.1-r1.exheres-0)6
-rw-r--r--packages/sys-apps/busybox/files/0001-Remove-stime-function-calls.patch95
-rw-r--r--packages/sys-apps/busybox/files/config11
-rw-r--r--packages/sys-apps/findutils/findutils-4.8.0.exheres-0 (renamed from packages/sys-apps/findutils/findutils-4.7.0.exheres-0)0
-rw-r--r--packages/sys-apps/gptfdisk/gptfdisk-1.0.6.exheres-0 (renamed from packages/sys-apps/gptfdisk/gptfdisk-1.0.5.exheres-0)0
-rw-r--r--packages/sys-apps/iproute2/iproute2-5.10.0.exheres-07
-rw-r--r--packages/sys-apps/kbd/kbd-2.4.0.exheres-0 (renamed from packages/sys-apps/kbd/kbd-2.3.0.exheres-0)2
-rw-r--r--packages/sys-apps/kmod/kmod-28.exheres-0 (renamed from packages/sys-apps/kmod/kmod-27.exheres-0)0
-rw-r--r--packages/sys-apps/kmod/kmod.exlib8
-rw-r--r--packages/sys-apps/lesspipe/lesspipe-1.85.exheres-0 (renamed from packages/sys-apps/lesspipe/lesspipe-1.84.exheres-0)19
-rw-r--r--packages/sys-apps/man-pages-posix/man-pages-posix-2017a.exheres-0 (renamed from packages/sys-apps/man-pages-posix/man-pages-posix-2013a-r1.exheres-0)8
-rw-r--r--packages/sys-apps/man-pages/man-pages-5.10.exheres-0 (renamed from packages/sys-apps/man-pages/man-pages-5.08.exheres-0)0
-rw-r--r--packages/sys-apps/net-tools/net-tools-2.10.exheres-0 (renamed from packages/sys-apps/net-tools/net-tools-2.10_alpha1_pre20170208.exheres-0)18
-rw-r--r--packages/sys-apps/pax-utils/pax-utils-1.2.8.exheres-0 (renamed from packages/sys-apps/pax-utils/pax-utils-1.2.6.exheres-0)0
-rw-r--r--packages/sys-apps/systemd/systemd-246.9.exheres-0 (renamed from packages/sys-apps/systemd/systemd-246.6.exheres-0)0
-rw-r--r--packages/sys-apps/systemd/systemd-247.2-r2.exheres-0 (renamed from packages/sys-apps/systemd/systemd-245.7.exheres-0)3
-rw-r--r--packages/sys-apps/systemd/systemd.exlib58
-rw-r--r--packages/sys-auth/passwdqc/passwdqc-1.4.0.exheres-02
-rw-r--r--packages/sys-boot/dracut/dracut-051.exheres-0 (renamed from packages/sys-boot/dracut/dracut-050.exheres-0)0
-rw-r--r--packages/sys-devel/automake/automake-1.16.3.exheres-0 (renamed from packages/sys-devel/automake/automake-1.16.2.exheres-0)0
-rw-r--r--packages/sys-devel/binutils/binutils-2.33.1-r5.exheres-0 (renamed from packages/sys-devel/binutils/binutils-2.33.1-r4.exheres-0)0
-rw-r--r--packages/sys-devel/binutils/binutils-2.34-r5.exheres-0 (renamed from packages/sys-devel/binutils/binutils-2.34-r4.exheres-0)0
-rw-r--r--packages/sys-devel/binutils/binutils-2.35.1-r2.exheres-0 (renamed from packages/sys-devel/binutils/binutils-2.35.1-r1.exheres-0)0
-rw-r--r--packages/sys-devel/binutils/binutils.exlib20
-rw-r--r--packages/sys-devel/cmake/cmake-3.19.3.exheres-0 (renamed from packages/sys-devel/cmake/cmake-3.19.1.exheres-0)0
-rw-r--r--packages/sys-devel/gcc/gcc-10.2.0-r1.exheres-0 (renamed from packages/sys-devel/gcc/gcc-10.2.0.exheres-0)0
-rw-r--r--packages/sys-devel/gcc/gcc-6.4.0-r2.exheres-0 (renamed from packages/sys-devel/gcc/gcc-6.4.0-r1.exheres-0)0
-rw-r--r--packages/sys-devel/gcc/gcc-7.4.0-r2.exheres-0 (renamed from packages/sys-devel/gcc/gcc-7.4.0-r1.exheres-0)0
-rw-r--r--packages/sys-devel/gcc/gcc-8.4.0-r1.exheres-0 (renamed from packages/sys-devel/gcc/gcc-8.4.0.exheres-0)0
-rw-r--r--packages/sys-devel/gcc/gcc-9.3.0-r1.exheres-0 (renamed from packages/sys-devel/gcc/gcc-9.3.0.exheres-0)0
-rw-r--r--packages/sys-devel/gcc/gcc.exlib6
-rw-r--r--packages/sys-devel/gdb/gdb.exlib8
-rw-r--r--packages/sys-devel/gnuconfig/gnuconfig-20210107.exheres-0 (renamed from packages/sys-devel/gnuconfig/gnuconfig-20200621.exheres-0)3
-rw-r--r--packages/sys-devel/lld/lld-11.0.1.exheres-0 (renamed from packages/sys-devel/lld/lld-11.0.0.exheres-0)0
-rw-r--r--packages/sys-devel/lld/lld-9.0.1-r3.exheres-07
-rw-r--r--packages/sys-devel/lld/lld.exlib13
-rw-r--r--packages/sys-devel/lldb/lldb-11.0.1.exheres-0 (renamed from packages/sys-devel/lldb/lldb-11.0.0.exheres-0)0
-rw-r--r--packages/sys-devel/meson/meson-0.56.2.exheres-0 (renamed from packages/sys-devel/meson/meson-0.55.3.exheres-0)0
-rw-r--r--packages/sys-devel/ninja/ninja-1.10.2.exheres-0 (renamed from packages/sys-devel/ninja/ninja-1.10.1.exheres-0)0
-rw-r--r--packages/sys-fs/fuse/fuse-3.10.1.exheres-0 (renamed from packages/sys-fs/fuse/fuse-3.10.0.exheres-0)0
-rw-r--r--packages/sys-fs/xfsprogs/xfsprogs-5.10.0.exheres-0 (renamed from packages/sys-fs/xfsprogs/xfsprogs-5.9.0.exheres-0)5
-rw-r--r--packages/sys-kernel/dkms/dkms-2.8.4.exheres-0 (renamed from packages/sys-kernel/dkms/dkms-2.8.3.exheres-0)0
-rw-r--r--packages/sys-kernel/linux-headers/linux-headers-5.10.exheres-09
-rw-r--r--packages/sys-libs/gdbm/files/gdbm-1.18.1-gcc10.patch21
-rw-r--r--packages/sys-libs/gdbm/gdbm-1.19.exheres-0 (renamed from packages/sys-libs/gdbm/gdbm-1.18.1.exheres-0)6
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0001-x86-64-Fix-FMA4-detection-in-ifunc-BZ-26534.patch32
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0002-NEWS-Update-for-BZ-26534-fix.patch30
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0003-intl-Handle-translation-output-codesets-with-suffixe.patch252
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0004-string-Fix-strerrorname_np-return-value-BZ-26555.patch1700
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0005-Set-version.h-RELEASE-to-stable-Bug-26700.patch28
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0006-AArch64-Improve-backwards-memmove-performance.patch41
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0007-AArch64-Use-__memcpy_simd-on-Neoverse-N2-V1.patch64
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0008-sysvipc-Fix-SEM_STAT_ANY-kernel-argument-pass-BZ-266.patch315
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0009-sysvipc-Fix-IPC_INFO-and-MSG_INFO-handling-BZ-26639.patch281
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0010-sysvipc-Fix-IPC_INFO-and-SHM_INFO-handling-BZ-26636.patch305
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0011-Reversing-calculation-of-__x86_shared_non_temporal_t.patch100
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0012-x86-Optimizing-memcpy-for-AMD-Zen-architecture.patch68
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0013-aarch64-Fix-DT_AARCH64_VARIANT_PCS-handling-BZ-26798.patch57
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0014-aarch64-Add-unwind-information-to-_start-bug-26853.patch59
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0015-Remove-__warn_memset_zero_len-BZ-25399.patch60
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0016-Remove-__warndecl.patch129
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0017-support-Provide-a-way-to-reorder-responses-within-th.patch309
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0018-support-Provide-a-way-to-clear-the-RA-bit-in-DNS-ser.patch47
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0019-resolv-Handle-transaction-ID-collisions-in-parallel-.patch443
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0020-resolv-Serialize-processing-in-resolv-tst-resolv-txn.patch41
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0021-struct-_Unwind_Exception-alignment-should-not-depend.patch61
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0022-sh-Add-sh4-fpu-Implies-folder.patch72
-rw-r--r--packages/sys-libs/glibc/files/patches-2.32/0023-iconv-Accept-redundant-shift-sequences-in-IBM1364-BZ.patch112
-rw-r--r--packages/sys-libs/glibc/glibc-2.32-r1.exheres-0 (renamed from packages/sys-libs/glibc/glibc-2.32.exheres-0)0
-rw-r--r--packages/sys-libs/libc++/files/9/0001-Fix-various-test-failures-with-GCC.patch54
-rw-r--r--packages/sys-libs/libc++/files/9/8c84318aad43620024310db6c1fe75c0c1706ead.patch24
-rw-r--r--packages/sys-libs/libc++/files/9/linux_distribution-hack.patch24
-rw-r--r--packages/sys-libs/libc++/libc++-11.0.1-r1.exheres-0 (renamed from packages/sys-libs/libc++/libc++-11.0.0.exheres-0)0
-rw-r--r--packages/sys-libs/libc++/libc++-9.0.1-r1.exheres-013
-rw-r--r--packages/sys-libs/libc++/libc++.exlib19
-rw-r--r--packages/sys-libs/libc++abi/files/9/linux_distribution-hack.patch24
-rw-r--r--packages/sys-libs/libc++abi/libc++abi-11.0.1.exheres-0 (renamed from packages/sys-libs/libc++abi/libc++abi-11.0.0.exheres-0)0
-rw-r--r--packages/sys-libs/libc++abi/libc++abi-9.0.1-r1.exheres-011
-rw-r--r--packages/sys-libs/libcap-ng/libcap-ng-0.8.2.exheres-0 (renamed from packages/sys-libs/libcap-ng/libcap-ng-0.8.1.exheres-0)0
-rw-r--r--packages/sys-libs/libcap/libcap-2.46.exheres-0 (renamed from packages/sys-libs/libcap/libcap-2.45.exheres-0)0
-rw-r--r--packages/sys-libs/llvm-libunwind/files/0001-38529c15312c52f39fc6bf693d2977295385d699.patch679
-rw-r--r--packages/sys-libs/llvm-libunwind/files/0002-b956c52c878776391430443706d884c124610c41.patch59
-rw-r--r--packages/sys-libs/llvm-libunwind/files/0003-cbc872a63f81ad9482bb288165af63d7444fa3ed.patch44
-rw-r--r--packages/sys-libs/llvm-libunwind/files/0004-aa582e3648cc4036aec3b9302ab93bfe9929d19c.patch78
-rw-r--r--packages/sys-libs/llvm-libunwind/files/0005-e74e61ff297e81c0a9bda54037033fc40fc76e1d.patch49
-rw-r--r--packages/sys-libs/llvm-libunwind/files/0006-d3c744313c3cca0c076f031ec71e66ca74b12f2a.patch126
-rw-r--r--packages/sys-libs/llvm-libunwind/files/0007-4fb8ecdef4c9b19563e428a151c376a4103d65fc.patch52
-rw-r--r--packages/sys-libs/llvm-libunwind/llvm-libunwind-11.0.1.exheres-0 (renamed from packages/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.exheres-0)0
-rw-r--r--packages/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1-r1.exheres-017
-rw-r--r--packages/sys-libs/openmp/openmp-11.0.1.exheres-0 (renamed from packages/sys-libs/openmp/openmp-11.0.0.exheres-0)0
-rw-r--r--packages/sys-libs/openmp/openmp-9.0.1-r1.exheres-07
-rw-r--r--packages/sys-libs/timezone-data/timezone-data-2020f.exheres-0 (renamed from packages/sys-libs/timezone-data/timezone-data-2020d.exheres-0)0
-rw-r--r--packages/sys-process/htop/files/htop-3.0.2-configure.ac-axe-python-check.patch31
-rw-r--r--packages/sys-process/htop/htop-3.0.5.exheres-0 (renamed from packages/sys-process/htop/htop-3.0.2.exheres-0)10
-rw-r--r--packages/x11-libs/libutempter/files/libutempter-1.1.6-musl.patch79
-rw-r--r--packages/x11-libs/libutempter/libutempter-1.2.1.exheres-0 (renamed from packages/x11-libs/libutempter/libutempter-1.1.6.exheres-0)6
-rw-r--r--packages/x11-misc/shared-mime-info/files/meson-Use-templated-pkgconfig-file-rather-than-meson.patch67
-rw-r--r--packages/x11-misc/shared-mime-info/shared-mime-info-2.1.exheres-0 (renamed from packages/x11-misc/shared-mime-info/shared-mime-info-2.0-r1.exheres-0)17
-rw-r--r--profiles/options.conf3
236 files changed, 6214 insertions, 4334 deletions
diff --git a/.mailmap b/.mailmap
index c588b9f39..185ae4332 100644
--- a/.mailmap
+++ b/.mailmap
@@ -39,6 +39,8 @@ Stephen Bennett <spb@exherbo.org>
Sterling X. Winter <replica@exherbo.org> <sterling.winter@gmail.com>
Maxime Sorin <maxime.sorin@clever-cloud.com> s0dy <you@example.com>
Thomas Anderson <gentoofan23@gentoo.org> <thomas@nosredna.net>
+Thomas Witt <pyromaniac@exherbo.org> <pyromaniac@thwitt.de>
+Thomas Witt <pyromaniac@exherbo.org> <thomas@thwitt.de>
Timo Gurr <tgurr@exherbo.org> tgurr <tgurr@gentoo.org>
Wulf C. Krueger <philantrop@exherbo.org> <philantrop@gentoo.org>
Wulf C. Krueger <philantrop@exherbo.org> <root@exherbo-amd64.(none)>
diff --git a/exlibs/cargo.exlib b/exlibs/cargo.exlib
index 772b426b8..0be0bc1d0 100644
--- a/exlibs/cargo.exlib
+++ b/exlibs/cargo.exlib
@@ -5,11 +5,17 @@ myexparam crate=${PN}
myexparam rust_minimum_version=1.36.0
myexparam channel=all
myexparam -b disable_default_features=false
+myexparam -b with_opt=false
+
+if exparam -b with_opt; then
+ myexparam option_name=rust
+ exparam -v OPTION_NAME option_name
+fi
exparam -v CRATE crate
exparam -v RUST_CHANNEL channel
-HOMEPAGE="http://crates.io/crates/${CRATE}"
+HOMEPAGE="https://crates.io/crates/${CRATE}"
if [[ $(type -t scm_src_unpack) == function ]]; then
DOWNLOADS=""
else
@@ -35,9 +41,14 @@ if [[ "${CATEGORY}/${PN}" != "dev-lang/rust" ]]; then
esac
}
+ rust_dep="dev-lang/rust:$(rust_slot_requirement)[>=$(exparam rust_minimum_version)]"
+ if exparam -b with_opt ; then
+ rust_dep="$(exparam option_name)? ( ${rust_dep} )"
+ fi
+
DEPENDENCIES="
build:
- dev-lang/rust:$(rust_slot_requirement)[>=$(exparam rust_minimum_version)]
+ ${rust_dep}
"
fi
@@ -67,6 +78,10 @@ ecargo() {
shift
+ if [[ -n "${OPTION_NAME}" ]] && ! option ${OPTION_NAME}; then
+ return
+ fi
+
if [[ "${cmd}" != "fetch" ]]; then
if exparam -b disable_default_features; then
params+=( --no-default-features )
diff --git a/exlibs/llvm-project.exlib b/exlibs/llvm-project.exlib
index d1c739454..fc8e2e9a9 100644
--- a/exlibs/llvm-project.exlib
+++ b/exlibs/llvm-project.exlib
@@ -4,6 +4,7 @@
# Distributed under the terms of the GNU General Public License v2
myexparam pn="${PN}"
+myexparam pv="${PV/_/-}"
myexparam dependencies_label="build+run"
myexparam check_target="check-all"
myexparam -b slotted=false
@@ -12,10 +13,10 @@ myexparam -b rtlib=false
myexparam -b stdlib=false
exparam -v MY_PN pn
+exparam -v MY_PV pv
exparam -v DEPENDENCIES_LABEL dependencies_label
exparam -v CHECK_TARGET check_target
-MY_PV="${PV/_/-}"
MY_PNV="${MY_PN}-${MY_PV}"
SCM_CHECKOUT_TO="llvm-project"
@@ -42,12 +43,12 @@ LICENCES="Apache-2.0-with-LLVM-exception"
# See http://blog.llvm.org/2016/12/llvms-new-versioning-scheme.html for more info
# In "X.Y.Z", X is major release, Y is minor release, and Z is "patch" release
# Major version is the slot, except for any LLVM with major-release < 4
-if [[ ${PV} == scm ]]; then
+if [[ ${MY_PV} == scm ]]; then
LLVM_SLOT="12"
elif ever is_scm ; then
- LLVM_SLOT="${PV%-scm}"
+ LLVM_SLOT="${MY_PV%-scm}"
else
- LLVM_SLOT="$(ever major)"
+ LLVM_SLOT="$(ever major ${MY_PV})"
fi
if exparam -b slotted; then
@@ -101,6 +102,9 @@ fi
LLVM_PREFIX="/usr/$(exhost --target)/lib/llvm/${LLVM_SLOT}"
CMAKE_SRC_CONFIGURE_PARAMS=(
+ --hates=CMAKE_BUILD_TYPE
+ -DCMAKE_BUILD_TYPE=Release
+
-DPYTHON_EXECUTABLE:PATH="${PYTHON}"
-DLLVM_MAIN_SRC_DIR="${WORKBASE}/llvm-project/llvm"
@@ -120,13 +124,6 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
-DLLVM_ENABLE_PIC:BOOL=ON
)
-if ever at_least 10; then
- CMAKE_SRC_CONFIGURE_PARAMS+=(
- --hates=CMAKE_BUILD_TYPE
- -DCMAKE_BUILD_TYPE=Release
- )
-fi
-
CMAKE_SRC_CONFIGURE_OPTIONS=()
if exparam -b asserts; then
diff --git a/exlibs/php-pecl.exlib b/exlibs/php-pecl.exlib
index d9b9e9abc..481fe789c 100644
--- a/exlibs/php-pecl.exlib
+++ b/exlibs/php-pecl.exlib
@@ -9,7 +9,7 @@ myexparam module=extension
# If the package doesn't support all php slots, you have to list
# all supported slots yourself
-myexparam php_abis=[ 5.6 7.0 7.1 7.2 7.3 7.4 ]
+myexparam php_abis=[ 5.6 7.0 7.1 7.2 7.3 7.4 8.0 ]
# Provide a way to customize the PN used by easy-multibuild for $WORK
myexparam pn=${PN}
@@ -90,6 +90,14 @@ prepare_one_multibuild() {
php-pecl_prepare_one_multibuild
}
+php-pecl_configure_one_multibuild() {
+ econf --with-php-config=/usr/$(exhost --target)/bin/php-config-$(php-pecl_get_abi)
+}
+
+configure_one_multibuild() {
+ php-pecl_configure_one_multibuild
+}
+
php-pecl_install_one_multibuild() {
local abi=$(php-pecl_get_abi)
local extensionDir extensionFileName
diff --git a/exlibs/postgresql.exlib b/exlibs/postgresql.exlib
index 80a9740a2..fcfb2a616 100644
--- a/exlibs/postgresql.exlib
+++ b/exlibs/postgresql.exlib
@@ -46,6 +46,7 @@ myexparam min_version=
myexparam max_version=
myexparam -b multiunpack=true
myexparam -b with_opt=false
+myexparam -b multibuild=true
myexparam postgresql_opts=
if exparam -b multiunpack; then
@@ -74,8 +75,8 @@ if [[ -n "${POSTGRESQL_MIN_VERSION}" ]] ; then
found_min_version=0
filtered_servers=
for server in ${POSTGRESQL_FILTERED_SERVERS} ; do
- if [ ${found_min_version} || "${server}" == "${POSTGRESQL_MIN_VERSION}" ] ; then
- filtered_versions+="${server} "
+ if [[ ${found_min_version} == 1 || "${server}" == "${POSTGRESQL_MIN_VERSION}" ]] ; then
+ filtered_servers+="${server} "
found_min_version=1
fi
done
@@ -86,7 +87,7 @@ if [[ -n "${POSTGRESQL_MAX_VERSION}" ]] ; then
# search the last matching version
filtered_servers=
for server in ${POSTGRESQL_FILTERED_SERVERS} ; do
- filtered_version+="${server} "
+ filtered_servers+="${server} "
if [ "${server}" == "${POSTGRESQL_MAX_VERSION}" ] ; then
break
fi
@@ -100,12 +101,17 @@ for server in ${POSTGRESQL_FILTERED_SERVERS} ; do
export MULTIBUILD_POSTGRESQL_SERVERS_${server//./_}_PROFILE_PG_CONFIG="/usr/$(exhost --target)/libexec/postgresql-${server}/pg_config"
done
+MULTIBUILD_POSTGRESQL_SERVERS_TARGETS="${POSTGRESQL_FILTERED_SERVERS}"
# add the options for the postgresql abis
MYOPTIONS='('
exparam -b with_opt && MYOPTIONS+=" ${OPTION_NAME}?"
MYOPTIONS+=" ( postgresql_servers: ( ${POSTGRESQL_FILTERED_SERVERS} )"
-MYOPTIONS+=" [[ number-selected = at-least-one ]]"
+if exparam -b multibuild; then
+ MYOPTIONS+=" [[ number-selected = at-least-one ]]"
+else
+ MYOPTIONS+=" [[ number-selected = exactly-one ]]"
+fi
MYOPTIONS+=' ) )'
# define our dependencies
diff --git a/exlibs/qmake.exlib b/exlibs/qmake.exlib
index d628d0ee4..a96573c74 100644
--- a/exlibs/qmake.exlib
+++ b/exlibs/qmake.exlib
@@ -5,14 +5,38 @@
# EQMAKE_SOURCES
# TODO: CONFIG += / -=
+require toolchain-funcs
+
export_exlib_phases src_configure
-# Default to slot=4 for now
-myexparam slot=4
+# Default to slot=5 for now
+myexparam slot=5
exparam -v qt_slot slot
DEFAULT_SRC_INSTALL_PARAMS=( INSTALL_ROOT="${IMAGE}" )
+qmake_mkspecs_dir() {
+ # Allows us to define which mkspecs dir we want to use.
+ illegal_in_global_scope
+
+ local spec
+
+ spec="linux"
+ if [[ ${CXX} == *c++* ]]; then
+ if cxx-is-gcc;then
+ spec+="-g++"
+ elif cxx-is-clang;then
+ spec+="-clang"
+ else
+ die "Unknown compiler ${CXX}; you will need to add a check for it to qt.exlib"
+ fi
+ else
+ die "Unknown compiler ${CXX}"
+ fi
+
+ echo "${spec}"
+}
+
eqmake() {
illegal_in_global_scope
@@ -21,7 +45,7 @@ eqmake() {
shift
fi
- export QMAKESPEC="/usr/$(exhost --target)/lib/qt${qt_slot}/mkspecs/linux-g++"
+ export QMAKESPEC="/usr/$(exhost --target)/lib/qt${qt_slot}/mkspecs/$(qmake_mkspecs_dir)"
local qmake_path host=$(exhost --target)
diff --git a/metadata/news/2020-12-05-perl-update/2020-12-05-perl-update.en.txt b/metadata/news/2020-12-05-perl-update/2020-12-05-perl-update.en.txt
new file mode 100644
index 000000000..40f23d4a0
--- /dev/null
+++ b/metadata/news/2020-12-05-perl-update/2020-12-05-perl-update.en.txt
@@ -0,0 +1,26 @@
+Title: Perl 5.32 update
+Author: Heiko Becker <heirecka@exherbo.org>
+Content-Type: text/plain
+Posted: 2020-12-05
+Revision: 1
+News-Item-Format: 1.0
+Display-If-Installed: dev-lang/perl[<5.32.0]
+
+Perl was bumped to 5.32.0 and unmasked.
+
+To switch to that version, run...
+
+# eclectic perl set 5.32
+
+As always after changing perl slots, you will need to rebuild all packages
+that install Perl modules. To do this, you can run the following command
+after switching to the new perl...
+
+# cave resolve -1 $(for d in /usr/${CHOST}/lib/perl5/*/5.30-*; do cave print-owners "${d}" -f '%I\n'; done)
+
+Replacing ${CHOST} with the triplet matching your system, and executing
+those commands for any cross targets which Perl is installed to (or even
+older perl slots).
+
+In addition, if you installed any site-modules manually, you have to
+reinstall those as well.
diff --git a/metadata/options/descriptions/contrib_modules.conf b/metadata/options/descriptions/contrib_modules.conf
index 6c23f8b4c..e7e21b52e 100644
--- a/metadata/options/descriptions/contrib_modules.conf
+++ b/metadata/options/descriptions/contrib_modules.conf
@@ -1,17 +1,29 @@
+alphamat - Computer Vision based Alpha Matting
bgsegm - Improved Adaptive Background Mixture Model for Real-time Tracking
bioinspired - Biologically inspired vision models and derivated tools
ccalib - Custom Calibration Pattern for 3D reconstruction
cvv - GUI for Interactive Visual Debugging of Computer Vision Programs
datasets - Interface for existing computer vision databases
-face - Recently added face recognition software which is not yet stabalized
+dpm - Deformable Part-based Models
+face - Face recognition techniques
+fuzzy - Fuzzy mathematical image processing
+img_hash - Image hash algorithms
+intensity_transform - Intensity transformations
line_descriptor - Binary descriptors for lines extracted from an image
optflow - Optical Flow Algorithms for tracking points
+phase_unwrapping - Phase Unwrapping API
+plot - Plot function for Mat data
+quality - Image Quality Analysis API
+rapid - Silhouette based 3D object tracking
reg - Image Registration module
rgbd - RGB-Depth Processing module
saliency - Saliency API, understanding where humans focus given a scene
+shape - Shape descriptors and matchers
surface_matching - Surface Matching Algorithm Through 3D Features
text - Scene Text Detection and Recognition in Natural Scene Images
tracking - Long-term optical tracking API
+videostab - Video stabilization
+viz - Viz module allowing 3D visualization via VTK
ximgproc - Extended Image Processing Filters
-xobjdetect - Integral Channel Features Detector Framework.
+xobjdetect - Integral Channel Features Detector Framework
xphoto - Additional photo processing algorithms
diff --git a/metadata/options/descriptions/php_abis.conf b/metadata/options/descriptions/php_abis.conf
index 7d36dba9d..96172d860 100644
--- a/metadata/options/descriptions/php_abis.conf
+++ b/metadata/options/descriptions/php_abis.conf
@@ -4,3 +4,4 @@
7.2 - Use PHP 7.2
7.3 - Use PHP 7.3
7.4 - Use PHP 7.4
+8.0 - Use PHP 8.0
diff --git a/metadata/options/descriptions/providers.conf b/metadata/options/descriptions/providers.conf
index c9a2c3043..4a7a70d97 100644
--- a/metadata/options/descriptions/providers.conf
+++ b/metadata/options/descriptions/providers.conf
@@ -2,6 +2,7 @@ bearssl - Use BearSSL as the SSL provider
compiler-rt - Use compiler-rt (llvm) as the c compiler runtime/builtins library provider
dhcp - Use ISC DHCP's dhclient as the DHCP client provider
dhcpcd - Use dhcpcd as the DHCP client provider
+elogind - Use elogind as the logind provider
eudev - Use eudev as the udev provider
gcrypt - Use libgcrypt as the provider for cryptographic functions
gnutls - Use GnuTLS as the SSL provider
@@ -26,7 +27,7 @@ mbedtls - Use mbed TLS as the SSL provider
nettle - Use nettle as the SSL provider
nss - Use NSS as the SSL provider
openssl - Use OpenSSL as the SSL provider
-systemd - Use systemd as the syslog/udev provider
+systemd - Use systemd as the syslog/udev/logind provider
libelf - Use libelf as the libelf provider
elfutils - Use elfutils as the libelf provider
libxml2 - Use libxml2 for XML handling
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index 00142b4f5..0deaee900 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -66,39 +66,25 @@ dev-util/ccache [[
]
]]
-dev-libs/openssl[<1.0.2t] [[
- author = [ Heiko Becker <heirecka@exherbo.org> ]
- date = [ 12 Nov 2019 ]
- token = security
- description = [ CVE-2019-1547, CVE-2019-1563 ]
-]]
-
-dev-libs/openssl[>=1.1&<1.1.1g] [[
- author = [ Kevin Decherf <kevin@kdecherf.com> ]
- date = [ 21 Apr 2020 ]
- token = security
- description = [ CVE-2020-1967 ]
-]]
-
-media-libs/jasper[<1.900.20] [[
+media-libs/jasper[<2.0.24] [[
author = [ Timo Gurr <tgurr@exherbo.org> ]
- date = [ 23 May 2017 ]
+ date = [ 14 Jan 2021 ]
token = security
- description = [ CVE-2016-10251 ]
+ description = [ CVE-2020-27828 ]
]]
-net-misc/curl[<7.72.0] [[
+net-misc/curl[<7.74.0] [[
author = [ Timo Gurr <tgurr@exherbo.org> ]
- date = [ 28 Aug 2020 ]
+ date = [ 10 Dec 2020 ]
token = security
- description = [ CVE-2020-8231 ]
+ description = [ CVE-2020-828{4,5,6} ]
]]
-app-admin/sudo[<1.8.31] [[
- author = [ Timo Gurr <tgurr@exherbo.org> ]
- date = [ 04 Feb 2020 ]
+app-admin/sudo[<1.9.5] [[
+ author = [ Heiko Becker <heirecka@exherbo.org> ]
+ date = [ 11 Jan 2021 ]
token = security
- description = [ CVE-2019-18634 ]
+ description = [ CVE-2021-23239, CVE-2021-23240 ]
]]
(
@@ -611,13 +597,13 @@ app-arch/libarchive[<3.4.0] [[
]]
(
- dev-lang/node[<12.18.4]
- dev-lang/node[>=14&<14.11.0]
+ dev-lang/node[<12.20.1]
+ dev-lang/node[>=15&<15.5.1]
) [[
*author = [ Timo Gurr <tgurr@exherbo.org> ]
- *date = [ 21 Sep 2020 ]
+ *date = [ 11 Jan 2021 ]
*token = security
- *description = [ CVE-2020-8201, CVE-2020-8251, CVE-2020-8252 ]
+ *description = [ CVE-2020-8265, CVE-2020-8287 ]
]]
app-arch/p7zip[<15.14.1-r1] [[
@@ -719,13 +705,13 @@ net-dns/c-ares[<1.13.0] [[
]]
(
- dev-libs/libressl:42.44.16[<2.6.5]
- dev-libs/libressl:43.45.17[<2.7.4]
+ dev-libs/libressl[<3.1.5]
+ dev-libs/libressl[>=3.2&<3.2.3]
) [[
*author = [ Heiko Becker <heirecka@exherbo.org> ]
- *date = [ 13 Jun 2018 ]
+ *date = [ 09 Dec 2020 ]
*token = security
- *description = [ CVE-2018-0495, CVE-2018-0732 ]
+ *description = [ CVE-2020-1971 ]
]]
net-libs/libtirpc[<1.0.2-r1] [[
@@ -884,14 +870,14 @@ sys-apps/util-linux[<2.32] [[
]]
(
- dev-lang/php:7.2[<7.2.34]
- dev-lang/php:7.3[<7.3.23]
- dev-lang/php:7.4[<7.4.11]
+ dev-lang/php:7.3[<7.3.26]
+ dev-lang/php:7.4[<7.4.14]
+ dev-lang/php:8.0[<8.0.1]
) [[
*author = [ Timo Gurr <tgurr@exherbo.org> ]
- *date = [ 12 Oct 2020 ]
+ *date = [ 12 Jan 2021 ]
*token = security
- *description = [ CVE-2020-7069, CVE-2020-7070 ]
+ *description = [ CVE-2020-7071 ]
]]
sys-apps/busybox[<1.28.4-r1] [[
@@ -957,6 +943,7 @@ net-libs/ldns[<1.7.0-rc1] [[
dev-lang/php:5.6
dev-lang/php:7.0
dev-lang/php:7.1
+ dev-lang/php:7.2
) [[
*author = [ Timo Gurr <tgurr@exherbo.org> ]
*date = [ 25 Aug 2020 ]
@@ -1094,13 +1081,6 @@ sys-fs/cryptsetup[<2.3.4] [[
description = [ CVE-2020-14382 (only on 32bit systems) ]
]]
-dev-lang/perl:5.32 [[
- author = [ Heiko Becker <heirecka@exherbo.org> ]
- date = [ 20 Sep 2020 ]
- token = testing
- description = [ Might kill your kittens ]
-]]
-
(
virtual/jdk:15
virtual/jre:15
@@ -1132,13 +1112,6 @@ dev-scm/gitolite[<3.6.12] [[
description = [ CVE-2018-20683 ]
]]
-dev-libs/boost[>=1.74.0] [[
- author = [ Heiko Becker <heirecka@exherbo.org> ]
- date = [ 18 Oct 2020 ]
- token = testing
- description = [ New versions are likely to break dependents ]
-]]
-
dev-lang/ruby:2.7[<2.7.2] [[
author = [ Timo Gurr <tgurr@exherbo.org> ]
date = [ 22 Oct 2020 ]
@@ -1180,3 +1153,38 @@ sys-libs/musl[>=1.2.0&<1.2.1-r1] [[
token = security
description = [ CVE-2020-28928 ]
]]
+
+dev-libs/openssl[<1.1.1i] [[
+ author = [ Marc-Antoine Perennou <keruspe@exherbo.org> ]
+ date = [ 08 Dec 2020 ]
+ token = security
+ description = [ CVE-2020-1971 ]
+]]
+
+dev-libs/openssl[>2] [[
+ author = [ Marc-Antoine Perennou <keruspe@exherbo.org> ]
+ date = [ 05 Dev 2020 ]
+ token = experimental
+ description = [ Currently in alpha stage, only use it for testing purposes ]
+]]
+
+dev-libs/p11-kit[<0.23.22] [[
+ author = [ Heiko Becker <heirecka@exherbo.org> ]
+ date = [ 14 Jan 2021 ]
+ token = security
+ description = [ CVE-2020-29361, CVE-2020-29362, CVE-2020-29363 ]
+]]
+
+sys-apps/gptfdisk[<1.0.6] [[
+ author = [ Timo Gurr <tgurr@exherbo.org> ]
+ date = [ 15 Jan 2021 ]
+ token = security
+ description = [ CVE-2020-0256, CVE-2021-0308 ]
+]]
+
+dev-libs/boost[>=1.75.0] [[
+ author = [ Heiko Becker <heirecka@exherbo.org> ]
+ date = [ 16 Jan 2021 ]
+ token = testing
+ description = [ New versions are likely to break dependents ]
+]]
diff --git a/packages/app-admin/eclectic-llvm/eclectic-llvm-0.exheres-0 b/packages/app-admin/eclectic-llvm/eclectic-llvm-0-r1.exheres-0
index fe1b78765..c90299c89 100644
--- a/packages/app-admin/eclectic-llvm/eclectic-llvm-0.exheres-0
+++ b/packages/app-admin/eclectic-llvm/eclectic-llvm-0-r1.exheres-0
@@ -39,13 +39,14 @@ eclectic-llvm_alternatives() {
local host=$(exhost --target)
local target=${1}
local alternatives=()
+ local as_alternatives=()
# Not supported yet: c++filt elfedit gprof
- local compiler_tools=( addr2line ar as c++filt dwp elfedit gprof nm objcopy objdump ranlib readelf size strings strip )
+ local compiler_tools=( addr2line ar c++filt dwp elfedit gprof nm objcopy objdump ranlib readelf size strings strip )
local tool
for tool in ${compiler_tools[@]}; do
if [[ -x /usr/${host}/bin/llvm-${tool} ]]; then
- local alternatives+=(
+ alternatives+=(
/usr/${host}/bin/${target}-${tool} llvm-${tool}
/usr/${host}/${target}/bin/${tool} ../../bin/llvm-${tool}
)
@@ -59,7 +60,20 @@ eclectic-llvm_alternatives() {
fi
done
+ as_alternatives+=(
+ /usr/${host}/bin/${target}-as llvm-as
+ /usr/${host}/${target}/bin/as ../../bin/llvm-as
+ )
+ if [[ ${host} == ${target} ]]; then
+ dobanned as
+ as_alternatives+=(
+ /usr/${host}/bin/as llvm-as
+ "${BANNEDDIR}"/as as.llvm
+ )
+ fi
+
alternatives_for compiler-tools llvm 10 "${alternatives[@]}"
+ alternatives_for assembler llvm 10 "${as_alternatives[@]}"
}
src_install() {
diff --git a/packages/app-admin/sudo/sudo-1.9.3_p1.exheres-0 b/packages/app-admin/sudo/sudo-1.9.5_p1.exheres-0
index 2707b9d7b..2707b9d7b 100644
--- a/packages/app-admin/sudo/sudo-1.9.3_p1.exheres-0
+++ b/packages/app-admin/sudo/sudo-1.9.5_p1.exheres-0
diff --git a/packages/app-arch/libarchive/libarchive-3.4.3.exheres-0 b/packages/app-arch/libarchive/libarchive-3.5.1.exheres-0
index 658999c37..658999c37 100644
--- a/packages/app-arch/libarchive/libarchive-3.4.3.exheres-0
+++ b/packages/app-arch/libarchive/libarchive-3.5.1.exheres-0
diff --git a/packages/app-arch/libarchive/libarchive.exlib b/packages/app-arch/libarchive/libarchive.exlib
index 7c2f829d5..18b70378d 100644
--- a/packages/app-arch/libarchive/libarchive.exlib
+++ b/packages/app-arch/libarchive/libarchive.exlib
@@ -1,7 +1,7 @@
# Copyright 2008-2011 Ingmar Vanhassel <ingmar@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require alternatives github [ release=v${PV} suffix=tar.xz ]
+require alternatives github [ release=${PV} suffix=tar.xz ]
require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
export_exlib_phases src_prepare src_install
@@ -59,7 +59,7 @@ DEPENDENCIES="
providers:libxml2? ( dev-libs/libxml2:= )
providers:mbedtls? ( dev-libs/mbedtls )
providers:nettle? ( dev-libs/nettle:= )
- providers:openssl? ( dev-libs/openssl )
+ providers:openssl? ( dev-libs/openssl:= )
run:
!app-arch/tar[<1.28-r2] [[
description = [ Alternatives conflict before tar-1.28-r2 ]
diff --git a/packages/app-arch/libjcat/files/libjcat-0.1.5-Fall-back-to-the-AliasId-for-validation.patch b/packages/app-arch/libjcat/files/libjcat-0.1.5-Fall-back-to-the-AliasId-for-validation.patch
new file mode 100644
index 000000000..33908cec0
--- /dev/null
+++ b/packages/app-arch/libjcat/files/libjcat-0.1.5-Fall-back-to-the-AliasId-for-validation.patch
@@ -0,0 +1,62 @@
+Upstream: yes
+
+From 9143b6f03266b42e4a53437b3d71d75fbc3259c2 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Thu, 14 Jan 2021 11:07:08 +0000
+Subject: [PATCH 1/2] Fall back to the AliasId for validation
+
+Fixes https://github.com/hughsie/libjcat/issues/48
+---
+ libjcat/jcat-tool.c | 31 ++++++++++++++++++++++++++++++-
+ 1 file changed, 30 insertions(+), 1 deletion(-)
+
+diff --git a/libjcat/jcat-tool.c b/libjcat/jcat-tool.c
+index d02f946..0de0eaa 100644
+--- a/libjcat/jcat-tool.c
++++ b/libjcat/jcat-tool.c
+@@ -500,12 +500,41 @@ jcat_tool_verify_item (JcatToolPrivate *priv, JcatItem *item, GError **error)
+ {
+ gboolean ret = TRUE;
+ g_autoptr(GBytes) source = NULL;
++ g_autoptr(GPtrArray) alias_ids = jcat_item_get_alias_ids (item);
+ g_autoptr(GPtrArray) blobs = jcat_item_get_blobs (item);
++ g_autoptr(GPtrArray) fns_possible = g_ptr_array_new_with_free_func (g_free);
+ g_autofree gchar *fn_safe = NULL;
+
+ /* load source */
+ g_print ("%s:\n", jcat_item_get_id (item));
+- fn_safe = g_build_filename (priv->prefix, jcat_item_get_id (item), NULL);
++
++ /* find the source */
++ g_ptr_array_add (fns_possible,
++ g_build_filename (priv->prefix, jcat_item_get_id (item), NULL));
++ for (guint i = 0; i < alias_ids->len; i++) {
++ const gchar *alias_id = g_ptr_array_index (alias_ids, i);
++ g_ptr_array_add (fns_possible,
++ g_build_filename (priv->prefix, alias_id, NULL));
++ }
++ for (guint i = 0; i < fns_possible->len; i++) {
++ const gchar *fn = g_ptr_array_index (fns_possible, i);
++ if (g_file_test (fn, G_FILE_TEST_EXISTS)) {
++ fn_safe = g_strdup (fn);
++ break;
++ }
++ }
++ if (fn_safe == NULL) {
++ g_autofree gchar *str = NULL;
++ g_autofree gchar **strv = g_new0 (gchar *, fns_possible->len);
++ for (guint i = 0; i < fns_possible->len; i++)
++ strv[i] = g_ptr_array_index (fns_possible, i);
++ str = g_strjoinv (" or ", strv);
++ g_set_error (error,
++ G_IO_ERROR,
++ G_IO_ERROR_NOT_FOUND,
++ "Could not find %s", str);
++ return FALSE;
++ }
+ source = jcat_get_contents_bytes (fn_safe, error);
+ if (source == NULL)
+ return FALSE;
+--
+2.30.0
+
diff --git a/packages/app-arch/libjcat/files/libjcat-0.1.5-Fix-jcat_context_verify_blob-to-use-self-verify-for-.patch b/packages/app-arch/libjcat/files/libjcat-0.1.5-Fix-jcat_context_verify_blob-to-use-self-verify-for-.patch
new file mode 100644
index 000000000..5f2b9dd3a
--- /dev/null
+++ b/packages/app-arch/libjcat/files/libjcat-0.1.5-Fix-jcat_context_verify_blob-to-use-self-verify-for-.patch
@@ -0,0 +1,32 @@
+Upstream: yes
+
+From 98f747fb5d41e3e0d2a09a2c58adbd5f3df3a567 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Thu, 14 Jan 2021 11:01:36 +0000
+Subject: [PATCH 2/2] Fix jcat_context_verify_blob() to use self verify for
+ checksums
+
+This is the same behaviour as used in jcat_context_verify_item() but forgotten
+somehow. We can only use jcat_engine_pubkey_verify() on pubkeys.
+
+Fixes https://github.com/hughsie/libjcat/issues/47
+---
+ libjcat/jcat-context.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libjcat/jcat-context.c b/libjcat/jcat-context.c
+index b27d3a4..ea376c3 100644
+--- a/libjcat/jcat-context.c
++++ b/libjcat/jcat-context.c
+@@ -223,6 +223,8 @@ jcat_context_verify_blob (JcatContext *self,
+ if (engine == NULL)
+ return NULL;
+ blob_signature = jcat_blob_get_data (blob);
++ if (jcat_engine_get_method (engine) == JCAT_BLOB_METHOD_CHECKSUM)
++ return jcat_engine_self_verify (engine, data, blob_signature, flags, error);
+ return jcat_engine_pubkey_verify (engine, data, blob_signature, flags, error);
+ }
+
+--
+2.30.0
+
diff --git a/packages/app-arch/libjcat/libjcat-0.1.3.exheres-0 b/packages/app-arch/libjcat/libjcat-0.1.5.exheres-0
index 4bfa17599..31f96ee5f 100644
--- a/packages/app-arch/libjcat/libjcat-0.1.3.exheres-0
+++ b/packages/app-arch/libjcat/libjcat-0.1.5.exheres-0
@@ -32,6 +32,11 @@ DEPENDENCIES="
dev-libs/gnutls [[ note = [ certtool ] ]]
"
+DEFAULT_SRC_PREPARE_PATCHES+=(
+ "${FILES}"/${PNV}-Fall-back-to-the-AliasId-for-validation.patch
+ "${FILES}"/${PNV}-Fix-jcat_context_verify_blob-to-use-self-verify-for-.patch
+)
+
MESON_SRC_CONFIGURE_PARAMS=(
-Dgpg=true
-Dman=true
diff --git a/packages/app-arch/snappy/snappy-1.1.7.exheres-0 b/packages/app-arch/snappy/snappy-1.1.8.exheres-0
index f7883761b..829e97c6f 100644
--- a/packages/app-arch/snappy/snappy-1.1.7.exheres-0
+++ b/packages/app-arch/snappy/snappy-1.1.8.exheres-0
@@ -18,14 +18,13 @@ DEPENDENCIES="
DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/9818832f9411e2708618b4ec763c99f635becf33.patch )
-src_configure() {
- local cmakeargs=(
- -DBUILD_SHARED_LIBS:BOOL=TRUE
- -DHAVE_LIBLZO2:BOOL=FALSE # only used for benchmarks
- -DHAVE_LIBZ:BOOL=FALSE # only used for benchmarks
- -DSNAPPY_BUILD_TESTS:BOOL=$(expecting_tests TRUE FALSE)
- )
-
- ecmake "${cmakeargs[@]}"
-}
+CMAKE_SRC_CONFIGURE_PARAMS=(
+ -DBUILD_SHARED_LIBS:BOOL=TRUE
+ -DHAVE_LIBLZO2:BOOL=FALSE # only used for benchmarks
+ -DHAVE_LIBZ:BOOL=FALSE # only used for benchmarks
+ -DSNAPPY_FUZZING_BUILD:BOOL=FALSE
+)
+CMAKE_SRC_CONFIGURE_TESTS=(
+ '-DSNAPPY_BUILD_TESTS:BOOL=TRUE -DSNAPPY_BUILD_TESTS:BOOL=FALSE'
+)
diff --git a/packages/app-arch/tar/tar-1.32.exheres-0 b/packages/app-arch/tar/tar-1.33.exheres-0
index 6b49867ec..6b49867ec 100644
--- a/packages/app-arch/tar/tar-1.32.exheres-0
+++ b/packages/app-arch/tar/tar-1.33.exheres-0
diff --git a/packages/app-arch/unrar/unrar-5.9.1.exheres-0 b/packages/app-arch/unrar/unrar-6.0.2.exheres-0
index a8a16c295..f9e1bb42a 100644
--- a/packages/app-arch/unrar/unrar-5.9.1.exheres-0
+++ b/packages/app-arch/unrar/unrar-6.0.2.exheres-0
@@ -26,6 +26,7 @@ src_prepare() {
-e "/^CXX=/s:c++:${CXX}:" \
-e "/^CXXFLAGS=/s:-O2:${CXXFLAGS}:" \
-e "/^LDFLAGS=/s:$: ${LDFLAGS}:" \
+ -e "s/^\t@rm -f unrar libunrar\.\*$//" \
-i makefile
}
@@ -39,6 +40,6 @@ src_install() {
dolib libunrar.so
insinto /usr/$(exhost --target)/include/unrar
doins dll.hpp
- dodoc readme.txt
+ dodoc acknow.txt license.txt readme.txt
}
diff --git a/packages/app-arch/zstd/zstd-1.4.5.exheres-0 b/packages/app-arch/zstd/zstd-1.4.8.exheres-0
index 9e9601db1..9e9601db1 100644
--- a/packages/app-arch/zstd/zstd-1.4.5.exheres-0
+++ b/packages/app-arch/zstd/zstd-1.4.8.exheres-0
diff --git a/packages/app-crypt/gnupg/gnupg-2.2.25.exheres-0 b/packages/app-crypt/gnupg/gnupg-2.2.27.exheres-0
index c3a91ac84..794a8ef20 100644
--- a/packages/app-crypt/gnupg/gnupg-2.2.25.exheres-0
+++ b/packages/app-crypt/gnupg/gnupg-2.2.27.exheres-0
@@ -65,7 +65,6 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
--enable-libdns
--enable-nls
--enable-run-gnupg-user-socket
- --enable-symcryptrun
--disable-build-timestamp
--disable-ldap
--disable-ntbtls
diff --git a/packages/app-crypt/gpgme/gpgme-1.15.0.exheres-0 b/packages/app-crypt/gpgme/gpgme-1.15.1.exheres-0
index 29ed3d8dd..29ed3d8dd 100644
--- a/packages/app-crypt/gpgme/gpgme-1.15.0.exheres-0
+++ b/packages/app-crypt/gpgme/gpgme-1.15.1.exheres-0
diff --git a/packages/app-crypt/rhash/rhash-1.4.0.exheres-0 b/packages/app-crypt/rhash/rhash-1.4.1.exheres-0
index 7fb9f4ceb..7fb9f4ceb 100644
--- a/packages/app-crypt/rhash/rhash-1.4.0.exheres-0
+++ b/packages/app-crypt/rhash/rhash-1.4.1.exheres-0
diff --git a/packages/app-dicts/aspell-pl/aspell-pl-6.0_20200327.0.exheres-0 b/packages/app-dicts/aspell-pl/aspell-pl-6.0_20210105.0.exheres-0
index 808ec9425..808ec9425 100644
--- a/packages/app-dicts/aspell-pl/aspell-pl-6.0_20200327.0.exheres-0
+++ b/packages/app-dicts/aspell-pl/aspell-pl-6.0_20210105.0.exheres-0
diff --git a/packages/app-doc/doxygen/doxygen-1.8.20.exheres-0 b/packages/app-doc/doxygen/doxygen-1.9.1.exheres-0
index b859adb88..b859adb88 100644
--- a/packages/app-doc/doxygen/doxygen-1.8.20.exheres-0
+++ b/packages/app-doc/doxygen/doxygen-1.9.1.exheres-0
diff --git a/packages/app-doc/scdoc/scdoc-1.10.0.exheres-0 b/packages/app-doc/scdoc/scdoc-1.11.1.exheres-0
index bac39ed5c..bac39ed5c 100644
--- a/packages/app-doc/scdoc/scdoc-1.10.0.exheres-0
+++ b/packages/app-doc/scdoc/scdoc-1.11.1.exheres-0
diff --git a/packages/app-editors/nano/nano-5.3.exheres-0 b/packages/app-editors/nano/nano-5.5.exheres-0
index 90c3f82f5..90c3f82f5 100644
--- a/packages/app-editors/nano/nano-5.3.exheres-0
+++ b/packages/app-editors/nano/nano-5.5.exheres-0
diff --git a/packages/app-text/md4c/md4c-0.4.6.exheres-0 b/packages/app-text/md4c/md4c-0.4.7.exheres-0
index f942dc2ef..f942dc2ef 100644
--- a/packages/app-text/md4c/md4c-0.4.6.exheres-0
+++ b/packages/app-text/md4c/md4c-0.4.7.exheres-0
diff --git a/packages/app-text/podofo/files/podofo-cmake-3.12.patch b/packages/app-text/podofo/files/podofo-cmake-3.12.patch
deleted file mode 100644
index c35697b93..000000000
--- a/packages/app-text/podofo/files/podofo-cmake-3.12.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream: workaround, but "under review" at
-Source: https://sourceforge.net/p/podofo/tickets/24/
-Reason: Fix build with cmake >= 3.12.0
-
---- test/TokenizerTest/CMakeLists.txt.old 2018-07-20 18:26:02.921494293 +0200
-+++ test/TokenizerTest/CMakeLists.txt 2018-07-20 18:34:53.727136443 +0200
-@@ -2,10 +2,3 @@
- TARGET_LINK_LIBRARIES(TokenizerTest ${PODOFO_LIB} ${PODOFO_LIB_DEPENDS})
- SET_TARGET_PROPERTIES(TokenizerTest PROPERTIES COMPILE_FLAGS "${PODOFO_CFLAGS}")
- ADD_DEPENDENCIES(TokenizerTest ${PODOFO_DEPEND_TARGET})
--
--# Copy the test samples over to the build tree
--ADD_CUSTOM_COMMAND(
-- TARGET TokenizerTest
-- POST_BUILD
-- COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/objects" "${CMAKE_CURRENT_BINARY_DIR}/objects"
-- )
diff --git a/packages/app-text/podofo/podofo-0.9.6.exheres-0 b/packages/app-text/podofo/podofo-0.9.7.exheres-0
index 8ef8474c9..1869248bc 100644
--- a/packages/app-text/podofo/podofo-0.9.6.exheres-0
+++ b/packages/app-text/podofo/podofo-0.9.7.exheres-0
@@ -5,7 +5,3 @@ require podofo
PLATFORMS="~amd64 ~armv8 ~x86"
-DEFAULT_SRC_PREPARE_PATCHES+=(
- -p0 "${FILES}"/${PN}-cmake-3.12.patch
-)
-
diff --git a/packages/app-text/podofo/podofo.exlib b/packages/app-text/podofo/podofo.exlib
index 894875e05..4baf91481 100644
--- a/packages/app-text/podofo/podofo.exlib
+++ b/packages/app-text/podofo/podofo.exlib
@@ -15,8 +15,6 @@ includes also very simple classes to create your own PDF files. All classes are
documented so it is easy to start writing your own application using PoDoFo.
"
-REMOTE_IDS+="freecode:${PN}"
-
UPSTREAM_DOCUMENTATION="${HOMEPAGE}/doc/html/index.html [[ lang = en ]]"
UPSTREAM_RELEASE_NOTES="https://sourceforge.net/p/podofo/mailman/message/36370252/ [[ lang = en ]]"
@@ -45,7 +43,7 @@ DEPENDENCIES="
providers:ijg-jpeg? ( media-libs/jpeg:=[>=6b] )
providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
providers:libressl? ( dev-libs/libressl:= )
- providers:openssl? ( dev-libs/openssl )
+ providers:openssl? ( dev-libs/openssl:= )
tiff? ( media-libs/tiff[>=3.8.2-r1] )
test:
dev-cpp/cppunit[>=1.12.1]
diff --git a/packages/dev-cpp/mcpp/files/01-zeroc-fixes.patch b/packages/dev-cpp/mcpp/files/01-zeroc-fixes.patch
new file mode 100644
index 000000000..1c5beee0b
--- /dev/null
+++ b/packages/dev-cpp/mcpp/files/01-zeroc-fixes.patch
@@ -0,0 +1,86 @@
+Upstream: no, probably dead
+Source: Debian
+
+Description: Fixes by ZeroC, Inc.
+Author: ZeroC, Inc.
+Bug-Debian: http://bugs.debian.org/611749
+
+Index: mcpp/src/main.c
+===================================================================
+--- mcpp.orig/src/main.c
++++ mcpp/src/main.c
+@@ -326,6 +326,8 @@ static void init_main( void)
+ = FALSE;
+ option_flags.trig = TRIGRAPHS_INIT;
+ option_flags.dig = DIGRAPHS_INIT;
++ sh_file = NULL;
++ sh_line = 0;
+ }
+
+ int mcpp_lib_main
+Index: mcpp/src/support.c
+===================================================================
+--- mcpp.orig/src/support.c
++++ mcpp/src/support.c
+@@ -188,7 +188,7 @@ static char * append_to_buffer(
+ size_t length
+ )
+ {
+- if (mem_buf_p->bytes_avail < length) { /* Need to allocate more memory */
++ if (mem_buf_p->bytes_avail < length + 1) { /* Need to allocate more memory */
+ size_t size = MAX( BUF_INCR_SIZE, length);
+
+ if (mem_buf_p->buffer == NULL) { /* 1st append */
+@@ -1722,6 +1722,8 @@ com_start:
+ sp -= 2;
+ while (*sp != '\n') /* Until end of line */
+ mcpp_fputc( *sp++, OUT);
++ mcpp_fputc( '\n', OUT);
++ wrong_line = TRUE;
+ }
+ goto end_line;
+ default: /* Not a comment */
+Index: mcpp/src/internal.H
+===================================================================
+--- mcpp.orig/src/internal.H
++++ mcpp/src/internal.H
+@@ -390,6 +390,8 @@ extern char * const work_end; /* E
+ extern char identifier[]; /* Lastly scanned name */
+ extern IFINFO ifstack[]; /* Information of #if nesting */
+ extern char work_buf[];
++extern FILEINFO * sh_file;
++extern int sh_line;
+ /* Temporary buffer for directive line and macro expansion */
+
+ /* main.c */
+@@ -557,6 +559,6 @@ extern void init_system( void);
+ #endif
+ #endif
+
+-#if HOST_HAVE_STPCPY
++#if HOST_HAVE_STPCPY && !defined(stpcpy)
+ extern char * stpcpy( char * dest, const char * src);
+ #endif
+Index: mcpp/src/system.c
+===================================================================
+--- mcpp.orig/src/system.c
++++ mcpp/src/system.c
+@@ -3858,6 +3858,9 @@ static int chk_dirp(
+ }
+ #endif
+
++FILEINFO* sh_file;
++int sh_line;
++
+ void sharp(
+ FILEINFO * sharp_file,
+ int flag /* Flag to append to the line for GCC */
+@@ -3868,8 +3871,6 @@ void sharp(
+ * else (i.e. 'sharp_file' is NULL) 'infile'.
+ */
+ {
+- static FILEINFO * sh_file;
+- static int sh_line;
+ FILEINFO * file;
+ int line;
+
diff --git a/packages/dev-cpp/mcpp/files/02-gniibe-fixes.patch b/packages/dev-cpp/mcpp/files/02-gniibe-fixes.patch
new file mode 100644
index 000000000..68d841ceb
--- /dev/null
+++ b/packages/dev-cpp/mcpp/files/02-gniibe-fixes.patch
@@ -0,0 +1,36 @@
+Upstream: no, probably dead
+Source: Debian
+
+Description: Simple fixes
+ * Fix freeing unmalloced memory
+ The memory of 'in_file' is not malloced, but points to argv[].
+ It is wrong to free it.
+ * When there is no input file specified by argv, it causes error
+ and fp_in == NULL. Check is needed to call fclose for fp_in.
+Author: NIIBE Yutaka
+
+## Fixes the issue reported at:
+## http://www.forallsecure.com/bug-reports/6b11b6fccda17cc467e055ccf7fec3fa2d89ec00/
+
+Index: mcpp/src/main.c
+===================================================================
+--- mcpp.orig/src/main.c
++++ mcpp/src/main.c
+@@ -428,16 +428,11 @@ int main
+
+ fatal_error_exit:
+ #if MCPP_LIB
+- /* Free malloced memory */
+- if (mcpp_debug & MACRO_CALL) {
+- if (in_file != stdin_name)
+- free( in_file);
+- }
+ clear_filelist();
+ clear_symtable();
+ #endif
+
+- if (fp_in != stdin)
++ if (fp_in && fp_in != stdin)
+ fclose( fp_in);
+ if (fp_out != stdout)
+ fclose( fp_out);
diff --git a/packages/dev-cpp/mcpp/files/03-gniibe-fix-11.patch b/packages/dev-cpp/mcpp/files/03-gniibe-fix-11.patch
new file mode 100644
index 000000000..405b2026f
--- /dev/null
+++ b/packages/dev-cpp/mcpp/files/03-gniibe-fix-11.patch
@@ -0,0 +1,24 @@
+Upstream: no, probably dead
+Source: Debian
+
+Description: Fix for a bug reported to sourceforge.net #11
+Author: NIIBE Yutaka
+
+Index: mcpp/src/support.c
+===================================================================
+--- mcpp.orig/src/support.c
++++ mcpp/src/support.c
+@@ -1747,9 +1747,11 @@ not_comment:
+ *tp++ = '\t';
+ else
+ *tp++ = ' '; /* Convert to ' ' */
+- } else if (! (char_type[ *(tp - 1) & UCHARMAX] & HSP)) {
++ } else if (temp == tp
++ || ! (char_type[ *(tp - 1) & UCHARMAX] & HSP)) {
+ *tp++ = ' '; /* Squeeze white spaces */
+- } else if (mcpp_mode == OLD_PREP && *(tp - 1) == COM_SEP) {
++ } else if (mcpp_mode == OLD_PREP && tp > temp
++ && *(tp - 1) == COM_SEP) {
+ *(tp - 1) = ' '; /* Replace COM_SEP with ' ' */
+ }
+ break;
diff --git a/packages/dev-cpp/mcpp/files/04-gniibe-fix-12.patch b/packages/dev-cpp/mcpp/files/04-gniibe-fix-12.patch
new file mode 100644
index 000000000..7f23c7410
--- /dev/null
+++ b/packages/dev-cpp/mcpp/files/04-gniibe-fix-12.patch
@@ -0,0 +1,20 @@
+Upstream: no, probably dead
+Source: Debian
+
+Description: Fix for a bug reported to sourceforge.net #12
+Author: NIIBE Yutaka
+
+Index: mcpp/src/support.c
+===================================================================
+--- mcpp.orig/src/support.c
++++ mcpp/src/support.c
+@@ -1948,6 +1948,9 @@ static char * get_line(
+ dump_string( NULL, ptr);
+ }
+ len = strlen( ptr);
++ if (len == 0)
++ cwarn( "null character ignored", NULL, 0L, NULL);
++
+ if (NBUFF - 1 <= ptr - infile->buffer + len
+ && *(ptr + len - 1) != '\n') {
+ /* The line does not yet end, though the buffer is full. */
diff --git a/packages/dev-cpp/mcpp/files/05-gniibe-fix-13.patch b/packages/dev-cpp/mcpp/files/05-gniibe-fix-13.patch
new file mode 100644
index 000000000..b483d6970
--- /dev/null
+++ b/packages/dev-cpp/mcpp/files/05-gniibe-fix-13.patch
@@ -0,0 +1,56 @@
+Upstream: no, probably dead
+Source: Debian
+Reason: CVE-2019-14274
+
+Description: Fix for a bug reported to sourceforge.net #13
+ by fixing error messages.
+ Also, fix erroneous messages.
+Author: NIIBE Yutaka
+
+Index: mcpp/src/support.c
+===================================================================
+--- mcpp.orig/src/support.c
++++ mcpp/src/support.c
+@@ -822,7 +822,7 @@ escape:
+ if (diag && iscntrl( c) && ((char_type[ c] & SPA) == 0)
+ && (warn_level & 1))
+ cwarn(
+- "Illegal control character %.0s0lx%02x in quotation" /* _W1_ */
++ "Illegal control character %.0s0x%02x in quotation" /* _W1_ */
+ , NULL, (long) c, NULL);
+ *out_p++ = c;
+ chk_limit:
+@@ -861,10 +861,10 @@ chk_limit:
+ if (mcpp_mode != POST_STD && option_flags.lang_asm) {
+ /* STD, KR */
+ if (warn_level & 1)
+- cwarn( unterm_char, out, 0L, NULL); /* _W1_ */
++ cwarn( unterm_char, NULL, (long)delim, NULL); /* _W1_ */
+ goto done;
+ } else {
+- cerror( unterm_char, out, 0L, skip); /* _E_ */
++ cerror( unterm_char, NULL, (long)delim, skip); /* _E_ */
+ }
+ } else {
+ cerror( "Unterminated header name %s%.0ld%s" /* _E_ */
+@@ -875,9 +875,9 @@ chk_limit:
+ if (mcpp_mode != POST_STD && option_flags.lang_asm) {
+ /* STD, KR */
+ if (warn_level & 1)
+- cwarn( empty_const, out, 0L, skip); /* _W1_ */
++ cwarn( empty_const, NULL, (long)delim, skip); /* _W1_ */
+ } else {
+- cerror( empty_const, out, 0L, skip); /* _E_ */
++ cerror( empty_const, NULL, (long)delim, skip); /* _E_ */
+ out_p = NULL;
+ goto done;
+ }
+@@ -1774,7 +1774,7 @@ not_comment:
+ default:
+ if (iscntrl( c)) {
+ cerror( /* Skip the control character */
+- "Illegal control character %.0s0x%lx, skipped the character" /* _E_ */
++ "Illegal control character %.0s0x%02x, skipped the character" /* _E_ */
+ , NULL, (long) c, NULL);
+ } else { /* Any valid character */
+ *tp++ = c;
diff --git a/packages/dev-cpp/mcpp/files/06-gniibe-fix-autotools.patch b/packages/dev-cpp/mcpp/files/06-gniibe-fix-autotools.patch
new file mode 100644
index 000000000..4ab23a045
--- /dev/null
+++ b/packages/dev-cpp/mcpp/files/06-gniibe-fix-autotools.patch
@@ -0,0 +1,138 @@
+Upstream: no, probably dead
+Source: Debian
+
+Description: Fix for newer autotools
+Author: NIIBE Yutaka
+
+Index: mcpp/configure.ac
+===================================================================
+--- mcpp.orig/configure.ac
++++ mcpp/configure.ac
+@@ -164,11 +164,11 @@ AC_CHECK_FUNCS( [stpcpy])
+
+ dnl Checks for some system characteristics.
+
+-AC_CACHE_CHECK( if the cases of filename are folded,
++AC_CACHE_CHECK(if the cases of filename are folded,
+ ac_cv_fname_fold,
+ [touch hJkL
+ [ac_cv_fname_fold=no]
+- AC_RUN_IFELSE( [[
++ AC_RUN_IFELSE([AC_LANG_SOURCE([
+ #include <stdio.h>
+ #include <errno.h>
+ void exit();
+@@ -178,7 +178,7 @@ int main( void)
+ exit( errno);
+ else
+ exit( 0);
+-} ]],
++} ])],
+ [ac_cv_fname_fold=yes],
+ [],
+ AC_MSG_WARN( cannot run on cross-compiling so assumes that the cases of filename are not folded.)
+@@ -202,9 +202,9 @@ dnl Check printf length modifier of the
+ # The redundant sscanf() is for some compilers which cannot handle
+ # long long integer token.
+ AC_DEFUN([AC_CHECK_MOD_LL], [
+- AC_CACHE_CHECK( [printf length modifier for the longest integer],
++ AC_CACHE_CHECK([printf length modifier for the longest integer],
+ [ac_cv_c_printf_modifier],
+- AC_RUN_IFELSE( [[
++ AC_RUN_IFELSE([AC_LANG_SOURCE([
+ #include <stdio.h>
+ #include <assert.h>
+ int strcmp();
+@@ -217,7 +217,7 @@ int main( void)
+ sprintf( buf, "%$2d", num);
+ assert( strcmp( buf, "1234567890123456789") == 0);
+ exit( 0);
+-} ]],
++} ])],
+ [ac_cv_c_printf_modifier=$2],
+ ,
+ AC_MSG_WARN( cannot run on cross-compiling so assumes the length modifier of long long is "%ll")
+@@ -229,7 +229,7 @@ int main( void)
+ ] )
+
+ if test x$ac_cv_type_intmax_t = xyes; then
+- AC_CHECK_MOD_LL( [intmax_t], [j], [#include <stdint.h>])
++ AC_CHECK_MOD_LL([intmax_t], [j], [#include <stdint.h>])
+ if test $ac_c_define_HOST_SYSTEM = SYS_CYGWIN \
+ || test $ac_c_define_HOST_SYSTEM = SYS_MINGW; then
+ sleep 1 # wait for cleanup
+@@ -239,7 +239,7 @@ fi
+ if test x$ac_cv_type_long_long = xyes; then
+ for modifier in ll I64 q L
+ do
+- AC_CHECK_MOD_LL( [long long], ${modifier})
++ AC_CHECK_MOD_LL([long long], ${modifier})
+ if test x${ac_cv_c_printf_modifier+set} = xset; then
+ break
+ fi
+@@ -485,11 +485,12 @@ AC_CACHE_CHECK( include preference - rel
+ AC_DEFINE_UNQUOTED( [SEARCH_INIT], $ac_cv_c_include_pref,
+ [Define include preference.])
+
+-AC_CACHE_CHECK( if the argument of pragma is macro expanded,
++AC_CACHE_CHECK(if the argument of pragma is macro expanded,
+ ac_cv_c_pragma_is_expanded,
+- AC_COMPILE_IFELSE( [[
++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #define once
+-#pragma once]],
++#pragma once
++])],
+ [ac_cv_c_pragma_is_expanded=no],
+ [ac_cv_c_pragma_is_expanded=yes]
+ )
+@@ -501,9 +502,9 @@ fi
+
+ AC_CACHE_CHECK( if digraphs can be used,
+ ac_cv_c_digraph,
+- [AC_PREPROC_IFELSE( [
++ [AC_PREPROC_IFELSE([AC_LANG_SOURCE([
+ %:if 1
+-%:endif],
++%:endif])],
+ [ac_cv_c_digraph=yes],
+ [ac_cv_c_digraph=no]
+ )]
+@@ -710,25 +711,25 @@ if test x$ac_cv_c_compiler_gnu = xyes; t
+
+ if test x$gcc_maj_ver = x2; then
+
+- AC_CACHE_CHECK( for value of predefined macro '__SIZE_TYPE__',
+- size_type,
+- [size_type=`echo '__SIZE_TYPE__' | $CPP - | sed 's/^ *//' | $EGREP -v '^#|^$' | sed 's/ *//'`]
++ AC_CACHE_CHECK(for value of predefined macro '__SIZE_TYPE__',
++ mcpp_cv_size_type,
++ [mcpp_cv_size_type=`echo '__SIZE_TYPE__' | $CPP - | sed 's/^ *//' | $EGREP -v '^#|^$' | sed 's/ *//'`]
+ )
+- AC_DEFINE_UNQUOTED( [COMPILER_SP1_VAL], "$size_type",
++ AC_DEFINE_UNQUOTED([COMPILER_SP1_VAL], "$mcpp_cv_size_type",
+ [Define the type of size_t.])
+
+- AC_CACHE_CHECK( for value of predefined macro '__PTRDIFF_TYPE__',
+- ptrdiff_type,
+- [ptrdiff_type=`echo '__PTRDIFF_TYPE__' | $CPP - | sed 's/^ *//' | $EGREP -v '^#|^$' | sed 's/ *$//'`]
++ AC_CACHE_CHECK(for value of predefined macro '__PTRDIFF_TYPE__',
++ mcpp_cv_ptrdiff_type,
++ [mcpp_cv_ptrdiff_type=`echo '__PTRDIFF_TYPE__' | $CPP - | sed 's/^ *//' | $EGREP -v '^#|^$' | sed 's/ *$//'`]
+ )
+- AC_DEFINE_UNQUOTED( [COMPILER_SP2_VAL], "$ptrdiff_type",
++ AC_DEFINE_UNQUOTED([COMPILER_SP2_VAL], "$mcpp_cv_ptrdiff_type",
+ [Define the type of ptrdiff_t.])
+
+- AC_CACHE_CHECK( for value of predefined macro '__WCHAR_TYPE__',
+- wchar_type,
+- [wchar_type=`echo '__WCHAR_TYPE__' | $CPP - | sed 's/^ *//' | $EGREP -v '^#|^$' | sed 's/ *$//'`]
++ AC_CACHE_CHECK(for value of predefined macro '__WCHAR_TYPE__',
++ mcpp_cv_wchar_type,
++ [mcpp_cv_wchar_type=`echo '__WCHAR_TYPE__' | $CPP - | sed 's/^ *//' | $EGREP -v '^#|^$' | sed 's/ *$//'`]
+ )
+- AC_DEFINE_UNQUOTED( [COMPILER_SP3_VAL], "$wchar_type",
++ AC_DEFINE_UNQUOTED( [COMPILER_SP3_VAL], "$mcpp_cv_wchar_type",
+ [Define the type of wchar_t.])
+
+ fi
diff --git a/packages/dev-cpp/mcpp/files/mcpp-fix-build-system.patch b/packages/dev-cpp/mcpp/files/mcpp-fix-build-system.patch
new file mode 100644
index 000000000..f00c47374
--- /dev/null
+++ b/packages/dev-cpp/mcpp/files/mcpp-fix-build-system.patch
@@ -0,0 +1,31 @@
+Upstream: no, probably dead
+Source: Gentoo
+Reason: Fix install locations
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -23,16 +23,12 @@
+ $(top_srcdir)/test-c $(top_srcdir)/test-l $(top_srcdir)/tool \
+ $(top_srcdir)/doc $(top_srcdir)/doc-jp
+
+-if ! REPLACE_CPP
+-install-exec-hook:
+- $(top_srcdir)/config/install-sh -d "$(DESTDIR)$(prefix)/share/doc/mcpp"
+- cp -pf $(top_srcdir)/LICENSE $(top_srcdir)/README $(top_srcdir)/NEWS \
+- $(DESTDIR)$(prefix)/share/doc/mcpp
+- cp -pf $(top_srcdir)/doc/mcpp-manual.html \
+- $(DESTDIR)$(prefix)/share/doc/mcpp
+- cp -pf $(top_srcdir)/doc-jp/mcpp-manual.html \
+- $(DESTDIR)$(prefix)/share/doc/mcpp/mcpp-manual-jp.html
+-uninstall-hook:
+- rm -rf $(DESTDIR)$(prefix)/share/doc/mcpp
+-endif
++dist_doc_DATA = README NEWS doc/mcpp-summary.pdf
+
++dist_html_DATA = \
++ doc/cpp-test.html \
++ doc/mcpp-manual.html \
++ doc/mcpp-porting.html
++
++htmljadir = $(htmldir)/doc-jp
++dist_htmlja_DATA = doc-jp/mcpp-manual.html
diff --git a/packages/dev-cpp/mcpp/mcpp-2.7.2.exheres-0 b/packages/dev-cpp/mcpp/mcpp-2.7.2.exheres-0
new file mode 100644
index 000000000..97b6f7320
--- /dev/null
+++ b/packages/dev-cpp/mcpp/mcpp-2.7.2.exheres-0
@@ -0,0 +1,30 @@
+# Copyright 2021 Heiko Becker <heirecka@exherbo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+require sourceforge [ suffix=tar.gz ]
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
+
+SUMMARY="A portable C/C++ preprocessor"
+
+LICENCES=""
+SLOT="0"
+PLATFORMS="~amd64"
+MYOPTIONS=""
+
+DEPENDENCIES=""
+
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/01-zeroc-fixes.patch
+ "${FILES}"/02-gniibe-fixes.patch
+ "${FILES}"/03-gniibe-fix-11.patch
+ "${FILES}"/04-gniibe-fix-12.patch
+ "${FILES}"/05-gniibe-fix-13.patch
+ "${FILES}"/06-gniibe-fix-autotools.patch
+ "${FILES}"/${PN}-fix-build-system.patch
+)
+
+DEFAULT_SRC_CONFIGURE_PARAMS=(
+ --disable-static
+ --enable-mcpplib
+)
+
diff --git a/packages/dev-cpp/pstl/pstl-11.0.0.exheres-0 b/packages/dev-cpp/pstl/pstl-11.0.1.exheres-0
index 29070cb1f..29070cb1f 100644
--- a/packages/dev-cpp/pstl/pstl-11.0.0.exheres-0
+++ b/packages/dev-cpp/pstl/pstl-11.0.1.exheres-0
diff --git a/packages/dev-db/xapian-core/xapian-core-1.4.17.exheres-0 b/packages/dev-db/xapian-core/xapian-core-1.4.18.exheres-0
index 3c9609038..3c9609038 100644
--- a/packages/dev-db/xapian-core/xapian-core-1.4.17.exheres-0
+++ b/packages/dev-db/xapian-core/xapian-core-1.4.18.exheres-0
diff --git a/packages/dev-lang/clang/clang-11.0.0.exheres-0 b/packages/dev-lang/clang/clang-11.0.1.exheres-0
index f2e341aba..f2e341aba 100644
--- a/packages/dev-lang/clang/clang-11.0.0.exheres-0
+++ b/packages/dev-lang/clang/clang-11.0.1.exheres-0
diff --git a/packages/dev-lang/clang/clang-9.0.1-r2.exheres-0 b/packages/dev-lang/clang/clang-9.0.1-r2.exheres-0
deleted file mode 100644
index 81fae3054..000000000
--- a/packages/dev-lang/clang/clang-9.0.1-r2.exheres-0
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2012 Elias Pipping <pipping@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require clang
-
-PLATFORMS="~amd64 ~armv7 ~x86"
-
-src_prepare() {
- clang_src_prepare
-
- # ld tests will fail because of Exherbo's non-standard path for ld
- edo sed -e '/-dynamic-linker/d' \
- -i "${CMAKE_SOURCE}"/test/Driver/riscv{32,64}-toolchain.c
-}
-
diff --git a/packages/dev-lang/clang/clang.exlib b/packages/dev-lang/clang/clang.exlib
index dbf824cdd..6eb3a0184 100644
--- a/packages/dev-lang/clang/clang.exlib
+++ b/packages/dev-lang/clang/clang.exlib
@@ -76,7 +76,7 @@ if ever at_least 11; then
-p2 "${FILES}"/11/0002-tests-Mark-tests-that-are-expected-to-fail-on-Exherb.patch
-p2 "${FILES}"/11/0003-Headers-Introduce-EXHERBO_CLANG_SLOT.patch
)
-elif ever at_least 10; then
+else
DEFAULT_SRC_PREPARE_PATCHES+=(
-p2 "${FILES}"/10/0001-clang-Exherbo-multiarch-ajustments.patch
-p2 "${FILES}"/10/0002-tests-Mark-tests-that-are-expected-to-fail-on-Exherb.patch
@@ -84,12 +84,6 @@ elif ever at_least 10; then
-p2 "${FILES}"/10/D74602.diff
-p2 "${FILES}"/10/D74757.diff
)
-else
- DEFAULT_SRC_PREPARE_PATCHES+=(
- -p2 "${FILES}"/9/0001-clang-Exherbo-multiarch-ajustments.patch
- -p2 "${FILES}"/9/5e866e411caad4c4e17e7e0c67b06d28451e1bf2.patch
- -p2 "${FILES}"/9/bb282f47511e83fdb6761a6bda185e2062d7a099.patch
- )
fi
CMAKE_SRC_CONFIGURE_PARAMS+=(
@@ -103,6 +97,7 @@ CMAKE_SRC_CONFIGURE_PARAMS+=(
# method is hidden; move the definition out of line, and export the interface
-DSUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG:BOOL=NO
+ -DCLANG_RESOURCE_DIR:STRING="../lib/clang/${SLOT}"
-DCLANG_BUILD_TOOLS:BOOL=ON
-DCLANG_ENABLE_ARCMT:BOOL=ON
-DCLANG_ENABLE_CLANGD:BOOL=ON
@@ -114,19 +109,9 @@ CMAKE_SRC_CONFIGURE_PARAMS+=(
-DCLANG_PLUGIN_SUPPORT:BOOL=ON
)
-if ever at_least 10; then
- CMAKE_SRC_CONFIGURE_PARAMS+=(
- -DCLANG_RESOURCE_DIR:STRING="../lib/clang/${SLOT}"
- )
- CMAKE_SRC_CONFIGURE_OPTIONS+=(
- 'polly LLVM_POLLY_LINK_INTO_TOOLS'
- )
-else
- CMAKE_SRC_CONFIGURE_OPTIONS+=(
- 'polly WITH_POLLY'
- 'polly LINK_POLLY_INTO_TOOLS'
- )
-fi
+CMAKE_SRC_CONFIGURE_OPTIONS+=(
+ 'polly LLVM_POLLY_LINK_INTO_TOOLS'
+)
CMAKE_SRC_CONFIGURE_TESTS=(
'-DCLANG_INCLUDE_TESTS:BOOL=ON -DCLANG_INCLUDE_TESTS:BOOL=OFF'
@@ -159,12 +144,10 @@ clang_src_prepare() {
edo sed -e 's/@DOT@//g' -i docs/doxygen.cfg.in
default
- if ever at_least 10; then
- # Replace @EXHERBO_CLANG_SLOT@ introduced via patch with the actual SLOT to get the install
- # location in sync with the configured CLANG_RESOURCE_DIR
- edo sed -e "s:@EXHERBO_CLANG_SLOT@:${SLOT}:" \
- -i lib/Headers/CMakeLists.txt
- fi
+ # Replace @EXHERBO_CLANG_SLOT@ introduced via patch with the actual SLOT to get the install
+ # location in sync with the configured CLANG_RESOURCE_DIR
+ edo sed -e "s:@EXHERBO_CLANG_SLOT@:${SLOT}:" \
+ -i lib/Headers/CMakeLists.txt
edo popd
}
@@ -222,7 +205,7 @@ clang_src_install() {
exeinto "${LLVM_PREFIX}"/bin
doexe bin/clang-tblgen
- if ever at_least 11.0.0_rc1; then
+ if ever at_least 11; then
# Remove empty clang-tidy/plugin dir
edo rmdir "${IMAGE}${LLVM_PREFIX}"/include/clang-tidy/plugin
fi
diff --git a/packages/dev-lang/clang/files/9/0001-clang-Exherbo-multiarch-ajustments.patch b/packages/dev-lang/clang/files/9/0001-clang-Exherbo-multiarch-ajustments.patch
deleted file mode 100644
index 5512f62e7..000000000
--- a/packages/dev-lang/clang/files/9/0001-clang-Exherbo-multiarch-ajustments.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-Upstream: https://reviews.llvm.org/D70306
-From 9045de80424764c0e245e2dcef2324cd1979352b Mon Sep 17 00:00:00 2001
-From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Date: Fri, 15 Nov 2019 14:18:30 +0100
-Subject: [PATCH 1/2] clang: Exherbo multiarch ajustments
-
-Exherbo multiarch layout being somewhat specific,
-some adjustments need to be made wrt the lookup
-paths
-
-Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
----
- clang/lib/Driver/ToolChains/Linux.cpp | 75 ++++++++++++++++++--
- clang/test/Driver/android-ndk-standalone.cpp | 4 +-
- clang/test/Driver/arm-multilibs.c | 2 +
- clang/test/Driver/cross-linux.c | 2 +
- clang/test/Driver/dyld-prefix.c | 2 +
- clang/test/Driver/linux-header-search.cpp | 2 +
- clang/test/Driver/linux-ld.c | 2 +
- clang/test/Driver/mips-cs.cpp | 1 +
- clang/test/Driver/mips-fsf.cpp | 1 +
- clang/test/Driver/mips-img.cpp | 1 +
- clang/test/lit.cfg.py | 3 +
- 13 files changed, 92 insertions(+), 7 deletions(-)
-
-diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index 087783875ff..93642486938 100644
---- a/clang/lib/Driver/ToolChains/Linux.cpp
-+++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -350,9 +350,21 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
- //
- // Note that this matches the GCC behavior. See the below comment for where
- // Clang diverges from GCC's behavior.
-- addPathIfExists(D, LibPath + "/../" + GCCTriple.str() + "/lib/../" +
-- OSLibDir + SelectedMultilib.osSuffix(),
-- Paths);
-+ //
-+ // On Exherbo, the GCC installation will reside in e.g.
-+ // /usr/x86_64-pc-linux-gnu/lib/gcc/armv7-unknown-linux-gnueabihf/9.2.0
-+ // while the matching lib path is
-+ // /usr/armv7-unknown-linux-gnueabihf/lib
-+ if (Distro == Distro::Exherbo)
-+ addPathIfExists(D,
-+ LibPath + "/../../" + GCCTriple.str() + "/lib/../" +
-+ OSLibDir + SelectedMultilib.osSuffix(),
-+ Paths);
-+ else
-+ addPathIfExists(D,
-+ LibPath + "/../" + GCCTriple.str() + "/lib/../" +
-+ OSLibDir + SelectedMultilib.osSuffix(),
-+ Paths);
-
- // If the GCC installation we found is inside of the sysroot, we want to
- // prefer libraries installed in the parent prefix of the GCC installation.
-@@ -844,6 +856,39 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
- if (getTriple().isAndroid())
- MultiarchIncludeDirs = AndroidMultiarchIncludeDirs;
-
-+ // Exherbo's multiarch layout is /usr/<triple>/include and not
-+ // /usr/include/<triple>
-+ const Distro Distro(D.getVFS());
-+ const StringRef ExherboMultiarchIncludeDirs[] = {"/usr/" + getTriple().str() +
-+ "/include"};
-+ const StringRef ExherboX86_64MuslMultiarchIncludeDirs[] = {
-+ "/usr/x86_64-pc-linux-musl/include"};
-+ const StringRef ExherboX86_64MultiarchIncludeDirs[] = {
-+ "/usr/x86_64-pc-linux-gnu/include"};
-+ const StringRef ExherboI686MuslMultiarchIncludeDirs[] = {
-+ "/usr/i686-pc-linux-musl/include"};
-+ const StringRef ExherboI686MultiarchIncludeDirs[] = {
-+ "/usr/i686-pc-linux-gnu/include"};
-+ if (Distro == Distro::Exherbo) {
-+ switch (getTriple().getArch()) {
-+ case llvm::Triple::x86_64:
-+ if (getTriple().isMusl())
-+ MultiarchIncludeDirs = ExherboX86_64MuslMultiarchIncludeDirs;
-+ else
-+ MultiarchIncludeDirs = ExherboX86_64MultiarchIncludeDirs;
-+ break;
-+ case llvm::Triple::x86:
-+ if (getTriple().isMusl())
-+ MultiarchIncludeDirs = ExherboI686MuslMultiarchIncludeDirs;
-+ else
-+ MultiarchIncludeDirs = ExherboI686MultiarchIncludeDirs;
-+ break;
-+ default:
-+ MultiarchIncludeDirs = ExherboMultiarchIncludeDirs;
-+ break;
-+ }
-+ }
-+
- for (StringRef Dir : MultiarchIncludeDirs) {
- if (D.getVFS().exists(SysRoot + Dir)) {
- addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + Dir);
-@@ -917,12 +962,30 @@ void Linux::addLibStdCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
- StringRef LibDir = GCCInstallation.getParentLibPath();
- StringRef InstallDir = GCCInstallation.getInstallPath();
- StringRef TripleStr = GCCInstallation.getTriple().str();
-+ const Driver &D = getDriver();
- const Multilib &Multilib = GCCInstallation.getMultilib();
-- const std::string GCCMultiarchTriple = getMultiarchTriple(
-- getDriver(), GCCInstallation.getTriple(), getDriver().SysRoot);
-+ const std::string GCCMultiarchTriple =
-+ getMultiarchTriple(D, GCCInstallation.getTriple(), D.SysRoot);
- const std::string TargetMultiarchTriple =
-- getMultiarchTriple(getDriver(), getTriple(), getDriver().SysRoot);
-+ getMultiarchTriple(D, getTriple(), D.SysRoot);
- const GCCVersion &Version = GCCInstallation.getVersion();
-+ const Distro Distro(D.getVFS());
-+
-+ // On Exherbo the consecutive addLibStdCXXIncludePaths call would evaluate to:
-+ // LibDir = /usr/lib/gcc/<triple>/9.2.0/../../..
-+ // = /usr/lib/
-+ // LibDir + "/../include" = /usr/include
-+ // addLibStdCXXIncludePaths would then check if "/usr/include/c++/<version>"
-+ // exists, and add that as include path when what we want is
-+ // "/usr/<triple>/include/c++/<version>"
-+ // Note that "/../../" is needed and not just "/../" as /usr/include points to
-+ // /usr/host/include
-+ if (Distro == Distro::Exherbo &&
-+ addLibStdCXXIncludePaths(
-+ LibDir.str() + "/../../" + TripleStr + "/include",
-+ "/c++/" + Version.Text, TripleStr, GCCMultiarchTriple,
-+ TargetMultiarchTriple, Multilib.includeSuffix(), DriverArgs, CC1Args))
-+ return;
-
- // The primary search for libstdc++ supports multiarch variants.
- if (addLibStdCXXIncludePaths(LibDir.str() + "/../include",
-diff --git a/clang/test/Driver/android-ndk-standalone.cpp b/clang/test/Driver/android-ndk-standalone.cpp
-index c4d93993478..7ce982ddb1c 100644
---- a/clang/test/Driver/android-ndk-standalone.cpp
-+++ b/clang/test/Driver/android-ndk-standalone.cpp
-@@ -1,6 +1,8 @@
-+// XFAIL: exherbo
-+
- // Test header and library paths when Clang is used with Android standalone
- // toolchain.
--//
-+
- // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
- // RUN: -target arm-linux-androideabi21 \
- // RUN: -B%S/Inputs/basic_android_ndk_tree \
-diff --git a/clang/test/Driver/arm-multilibs.c b/clang/test/Driver/arm-multilibs.c
-index bd9c80e8b16..1de8739e7e9 100644
---- a/clang/test/Driver/arm-multilibs.c
-+++ b/clang/test/Driver/arm-multilibs.c
-@@ -1,3 +1,5 @@
-+// XFAIL: exherbo
-+
- // RUN: %clang -target armv7-linux-gnueabi --sysroot=%S/Inputs/multilib_arm_linux_tree -### -c %s -o /dev/null 2>&1 | FileCheck -check-prefix CHECK-ARM %s
- // RUN: %clang -target thumbv7-linux-gnueabi --sysroot=%S/Inputs/multilib_arm_linux_tree -### -c %s -o /dev/null 2>&1 | FileCheck -check-prefix CHECK-ARM %s
-
-diff --git a/clang/test/Driver/cross-linux.c b/clang/test/Driver/cross-linux.c
-index a5ea832e77e..5b95bada497 100644
---- a/clang/test/Driver/cross-linux.c
-+++ b/clang/test/Driver/cross-linux.c
-@@ -1,3 +1,5 @@
-+// XFAIL: exherbo
-+
- // RUN: %clang -### -o %t %s 2>&1 -no-integrated-as -fuse-ld=ld \
- // RUN: --gcc-toolchain=%S/Inputs/basic_cross_linux_tree/usr \
- // RUN: --target=i386-unknown-linux-gnu \
-diff --git a/clang/test/Driver/dyld-prefix.c b/clang/test/Driver/dyld-prefix.c
-index 5a79874b567..f20824ae18a 100644
---- a/clang/test/Driver/dyld-prefix.c
-+++ b/clang/test/Driver/dyld-prefix.c
-@@ -1,3 +1,5 @@
-+// XFAIL: exherbo
-+
- // RUN: touch %t.o
-
- // RUN: %clang -target i386-unknown-linux --dyld-prefix /foo -### %t.o 2>&1 | FileCheck --check-prefix=CHECK-32 %s
-diff --git a/clang/test/Driver/linux-header-search.cpp b/clang/test/Driver/linux-header-search.cpp
-index 03502423c15..f70ad00d03e 100644
---- a/clang/test/Driver/linux-header-search.cpp
-+++ b/clang/test/Driver/linux-header-search.cpp
-@@ -1,3 +1,5 @@
-+// XFAIL: exherbo
-+
- // General tests that the header search paths detected by the driver and passed
- // to CC1 are sane.
- //
-diff --git a/clang/test/Driver/linux-ld.c b/clang/test/Driver/linux-ld.c
-index 7aba660d51f..2fad14e1af3 100644
---- a/clang/test/Driver/linux-ld.c
-+++ b/clang/test/Driver/linux-ld.c
-@@ -1,3 +1,5 @@
-+// XFAIL: exherbo
-+
- // General tests that ld invocations on Linux targets sane. Note that we use
- // sysroot to make these tests independent of the host system.
- //
-diff --git a/clang/test/Driver/mips-cs.cpp b/clang/test/Driver/mips-cs.cpp
-index 6ef4c5d4350..7b2e89919f1 100644
---- a/clang/test/Driver/mips-cs.cpp
-+++ b/clang/test/Driver/mips-cs.cpp
-@@ -1,4 +1,5 @@
- // REQUIRES: mips-registered-target
-+// XFAIL: exherbo
- //
- // Check frontend and linker invocations on Mentor Graphics MIPS toolchain.
- //
-diff --git a/clang/test/Driver/mips-fsf.cpp b/clang/test/Driver/mips-fsf.cpp
-index b94da697891..bb1082d8c96 100644
---- a/clang/test/Driver/mips-fsf.cpp
-+++ b/clang/test/Driver/mips-fsf.cpp
-@@ -1,4 +1,5 @@
- // REQUIRES: mips-registered-target
-+// XFAIL: exherbo
-
- // Check frontend and linker invocations on FSF MIPS toolchain.
- //
-diff --git a/clang/test/Driver/mips-img.cpp b/clang/test/Driver/mips-img.cpp
-index c97bb9478e7..3a2bcaf0a12 100644
---- a/clang/test/Driver/mips-img.cpp
-+++ b/clang/test/Driver/mips-img.cpp
-@@ -1,4 +1,5 @@
- // REQUIRES: mips-registered-target
-+// XFAIL: exherbo
-
- // Check frontend and linker invocations on the IMG MIPS toolchain.
- //
-diff --git a/clang/test/lit.cfg.py b/clang/test/lit.cfg.py
-index 1ffb6d094d7..dedf7b76a4d 100644
---- a/clang/test/lit.cfg.py
-+++ b/clang/test/lit.cfg.py
-@@ -193,3 +193,6 @@ if os.path.exists('/etc/gentoo-release'):
-
- if config.enable_shared:
- config.available_features.add("enable_shared")
-+
-+if os.path.exists('/etc/exherbo-release'):
-+ config.available_features.add('exherbo')
---
-2.24.0
-
diff --git a/packages/dev-lang/clang/files/9/5e866e411caad4c4e17e7e0c67b06d28451e1bf2.patch b/packages/dev-lang/clang/files/9/5e866e411caad4c4e17e7e0c67b06d28451e1bf2.patch
deleted file mode 100644
index 2272556ad..000000000
--- a/packages/dev-lang/clang/files/9/5e866e411caad4c4e17e7e0c67b06d28451e1bf2.patch
+++ /dev/null
@@ -1,727 +0,0 @@
-Upstreapm: yes, in clang 10
-From 5e866e411caad4c4e17e7e0c67b06d28451e1bf2 Mon Sep 17 00:00:00 2001
-From: Reid Kleckner <rnk@google.com>
-Date: Thu, 10 Oct 2019 21:04:25 +0000
-Subject: [PATCH] Add -fgnuc-version= to control __GNUC__ and other GCC macros
-
-I noticed that compiling on Windows with -fno-ms-compatibility had the
-side effect of defining __GNUC__, along with __GNUG__, __GXX_RTTI__, and
-a number of other macros for GCC compatibility. This is undesirable and
-causes Chromium to do things like mix __attribute__ and __declspec,
-which doesn't work. We should have a positive language option to enable
-GCC compatibility features so that we can experiment with
--fno-ms-compatibility on Windows. This change adds -fgnuc-version= to be
-that option.
-
-My issue aside, users have, for a long time, reported that __GNUC__
-doesn't match their expectations in one way or another. We have
-encouraged users to migrate code away from this macro, but new code
-continues to be written assuming a GCC-only environment. There's really
-nothing we can do to stop that. By adding this flag, we can allow them
-to choose their own adventure with __GNUC__.
-
-This overlaps a bit with the "GNUMode" language option from -std=gnu*.
-The gnu language mode tends to enable non-conforming behaviors that we'd
-rather not enable by default, but the we want to set things like
-__GXX_RTTI__ by default, so I've kept these separate.
-
-Helps address PR42817
-
-Reviewed By: hans, nickdesaulniers, MaskRay
-
-Differential Revision: https://reviews.llvm.org/D68055
-
-llvm-svn: 374449
----
- clang/include/clang/Basic/LangOptions.def | 1 +
- clang/include/clang/Driver/Options.td | 3 +
- clang/lib/Driver/ToolChains/Clang.cpp | 33 ++++-
- clang/lib/Frontend/CompilerInvocation.cpp | 16 +++
- clang/lib/Frontend/InitPreprocessor.cpp | 34 +++---
- clang/test/Driver/fgnuc-version.c | 26 ++++
- clang/test/Driver/rewrite-legacy-objc.m | 6 +-
- clang/test/Driver/rewrite-objc.m | 2 +-
- clang/test/Frontend/gnu-inline.c | 12 +-
- clang/test/Headers/stdbool.cpp | 8 +-
- clang/test/Preprocessor/init.c | 140 +++++++++++-----------
- clang/test/Sema/atomic-ops.c | 2 +-
- 14 files changed, 190 insertions(+), 105 deletions(-)
- create mode 100644 clang/test/Driver/fgnuc-version.c
-
-diff --git a/clang/include/clang/Basic/LangOptions.def b/clang/include/clang/Basic/LangOptions.def
-index 53d0e4a490e5..a423654d5e03 100644
---- a/clang/include/clang/Basic/LangOptions.def
-+++ b/clang/include/clang/Basic/LangOptions.def
-@@ -111,6 +111,7 @@ BENIGN_LANGOPT(DollarIdents , 1, 1, "'$' in identifiers")
- BENIGN_LANGOPT(AsmPreprocessor, 1, 0, "preprocessor in asm mode")
- LANGOPT(GNUMode , 1, 1, "GNU extensions")
- LANGOPT(GNUKeywords , 1, 1, "GNU keywords")
-+VALUE_LANGOPT(GNUCVersion , 32, 0, "GNU C compatibility version")
- BENIGN_LANGOPT(ImplicitInt, 1, !C99 && !CPlusPlus, "C89 implicit 'int'")
- LANGOPT(Digraphs , 1, 0, "digraphs")
- BENIGN_LANGOPT(HexFloats , 1, C99, "C99 hexadecimal float constants")
-diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
-index 9f4d3b709645..1374d3fb321a 100644
---- a/clang/include/clang/Driver/Options.td
-+++ b/clang/include/clang/Driver/Options.td
-@@ -1187,6 +1187,9 @@ def fno_use_line_directives : Flag<["-"], "fno-use-line-directives">, Group<f_Gr
-
- def ffreestanding : Flag<["-"], "ffreestanding">, Group<f_Group>, Flags<[CC1Option]>,
- HelpText<"Assert that the compilation takes place in a freestanding environment">;
-+def fgnuc_version_EQ : Joined<["-"], "fgnuc-version=">, Group<f_Group>,
-+ HelpText<"Sets various macros to claim compatibility with the given GCC version (default is 4.2.1)">,
-+ Flags<[CC1Option, CoreOption]>;
- def fgnu_keywords : Flag<["-"], "fgnu-keywords">, Group<f_Group>, Flags<[CC1Option]>,
- HelpText<"Allow GNU-extension keywords regardless of language standard">;
- def fgnu89_inline : Flag<["-"], "fgnu89-inline">, Group<f_Group>, Flags<[CC1Option]>,
-diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
-index 22b830ee838b..154e3a86429b 100644
---- a/clang/lib/Driver/ToolChains/Clang.cpp
-+++ b/clang/lib/Driver/ToolChains/Clang.cpp
-@@ -4875,13 +4875,36 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
- CmdArgs.push_back("-fuse-line-directives");
-
- // -fms-compatibility=0 is default.
-- if (Args.hasFlag(options::OPT_fms_compatibility,
-- options::OPT_fno_ms_compatibility,
-- (IsWindowsMSVC &&
-- Args.hasFlag(options::OPT_fms_extensions,
-- options::OPT_fno_ms_extensions, true))))
-+ bool IsMSVCCompat = Args.hasFlag(
-+ options::OPT_fms_compatibility, options::OPT_fno_ms_compatibility,
-+ (IsWindowsMSVC && Args.hasFlag(options::OPT_fms_extensions,
-+ options::OPT_fno_ms_extensions, true)));
-+ if (IsMSVCCompat)
- CmdArgs.push_back("-fms-compatibility");
-
-+ // Handle -fgcc-version, if present.
-+ VersionTuple GNUCVer;
-+ if (Arg *A = Args.getLastArg(options::OPT_fgnuc_version_EQ)) {
-+ // Check that the version has 1 to 3 components and the minor and patch
-+ // versions fit in two decimal digits.
-+ StringRef Val = A->getValue();
-+ Val = Val.empty() ? "0" : Val; // Treat "" as 0 or disable.
-+ bool Invalid = GNUCVer.tryParse(Val);
-+ unsigned Minor = GNUCVer.getMinor().getValueOr(0);
-+ unsigned Patch = GNUCVer.getSubminor().getValueOr(0);
-+ if (Invalid || GNUCVer.getBuild() || Minor >= 100 || Patch >= 100) {
-+ D.Diag(diag::err_drv_invalid_value)
-+ << A->getAsString(Args) << A->getValue();
-+ }
-+ } else if (!IsMSVCCompat) {
-+ // Imitate GCC 4.2.1 by default if -fms-compatibility is not in effect.
-+ GNUCVer = VersionTuple(4, 2, 1);
-+ }
-+ if (!GNUCVer.empty()) {
-+ CmdArgs.push_back(
-+ Args.MakeArgString("-fgnuc-version=" + GNUCVer.getAsString()));
-+ }
-+
- VersionTuple MSVT = TC.computeMSVCVersion(&D, Args);
- if (!MSVT.empty())
- CmdArgs.push_back(
-diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
-index d55f969e0f44..3ea421c4992e 100644
---- a/clang/lib/Frontend/CompilerInvocation.cpp
-+++ b/clang/lib/Frontend/CompilerInvocation.cpp
-@@ -2250,6 +2250,7 @@ void CompilerInvocation::setLangDefaults(LangOptions &Opts, InputKind IK,
- Opts.Digraphs = Std.hasDigraphs();
- Opts.GNUMode = Std.isGNUMode();
- Opts.GNUInline = !Opts.C99 && !Opts.CPlusPlus;
-+ Opts.GNUCVersion = 0;
- Opts.HexFloats = Std.hasHexFloats();
- Opts.ImplicitInt = Std.hasImplicitInt();
-
-@@ -2574,6 +2575,21 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK,
- (Opts.ObjCRuntime.getKind() == ObjCRuntime::FragileMacOSX);
- }
-
-+ if (Arg *A = Args.getLastArg(options::OPT_fgnuc_version_EQ)) {
-+ // Check that the version has 1 to 3 components and the minor and patch
-+ // versions fit in two decimal digits.
-+ VersionTuple GNUCVer;
-+ bool Invalid = GNUCVer.tryParse(A->getValue());
-+ unsigned Major = GNUCVer.getMajor();
-+ unsigned Minor = GNUCVer.getMinor().getValueOr(0);
-+ unsigned Patch = GNUCVer.getSubminor().getValueOr(0);
-+ if (Invalid || GNUCVer.getBuild() || Minor >= 100 || Patch >= 100) {
-+ Diags.Report(diag::err_drv_invalid_value)
-+ << A->getAsString(Args) << A->getValue();
-+ }
-+ Opts.GNUCVersion = Major * 100 * 100 + Minor * 100 + Patch;
-+ }
-+
- if (Args.hasArg(OPT_fgnu89_inline)) {
- if (Opts.CPlusPlus)
- Diags.Report(diag::err_drv_argument_not_allowed_with)
-diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp
-index 6a3c898d8c3e..6810379c6ff2 100644
---- a/clang/lib/Frontend/InitPreprocessor.cpp
-+++ b/clang/lib/Frontend/InitPreprocessor.cpp
-@@ -574,13 +574,22 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
- Builder.defineMacro("__clang_version__",
- "\"" CLANG_VERSION_STRING " "
- + getClangFullRepositoryVersion() + "\"");
-- if (!LangOpts.MSVCCompat) {
-- // Currently claim to be compatible with GCC 4.2.1-5621, but only if we're
-- // not compiling for MSVC compatibility
-- Builder.defineMacro("__GNUC_MINOR__", "2");
-- Builder.defineMacro("__GNUC_PATCHLEVEL__", "1");
-- Builder.defineMacro("__GNUC__", "4");
-+
-+ if (LangOpts.GNUCVersion != 0) {
-+ // Major, minor, patch, are given two decimal places each, so 4.2.1 becomes
-+ // 40201.
-+ unsigned GNUCMajor = LangOpts.GNUCVersion / 100 / 100;
-+ unsigned GNUCMinor = LangOpts.GNUCVersion / 100 % 100;
-+ unsigned GNUCPatch = LangOpts.GNUCVersion % 100;
-+ Builder.defineMacro("__GNUC__", Twine(GNUCMajor));
-+ Builder.defineMacro("__GNUC_MINOR__", Twine(GNUCMinor));
-+ Builder.defineMacro("__GNUC_PATCHLEVEL__", Twine(GNUCPatch));
- Builder.defineMacro("__GXX_ABI_VERSION", "1002");
-+
-+ if (LangOpts.CPlusPlus) {
-+ Builder.defineMacro("__GNUG__", Twine(GNUCMajor));
-+ Builder.defineMacro("__GXX_WEAK__");
-+ }
- }
-
- // Define macros for the C11 / C++11 memory orderings
-@@ -619,7 +628,7 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
- if (!LangOpts.GNUMode && !LangOpts.MSVCCompat)
- Builder.defineMacro("__STRICT_ANSI__");
-
-- if (!LangOpts.MSVCCompat && LangOpts.CPlusPlus11)
-+ if (LangOpts.GNUCVersion && LangOpts.CPlusPlus11)
- Builder.defineMacro("__GXX_EXPERIMENTAL_CXX0X__");
-
- if (LangOpts.ObjC) {
-@@ -699,7 +708,7 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
-
- if (!LangOpts.MSVCCompat && LangOpts.Exceptions)
- Builder.defineMacro("__EXCEPTIONS");
-- if (!LangOpts.MSVCCompat && LangOpts.RTTI)
-+ if (LangOpts.GNUCVersion && LangOpts.RTTI)
- Builder.defineMacro("__GXX_RTTI");
-
- if (LangOpts.SjLjExceptions)
-@@ -713,11 +722,8 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
- if (LangOpts.Deprecated)
- Builder.defineMacro("__DEPRECATED");
-
-- if (!LangOpts.MSVCCompat && LangOpts.CPlusPlus) {
-- Builder.defineMacro("__GNUG__", "4");
-- Builder.defineMacro("__GXX_WEAK__");
-+ if (!LangOpts.MSVCCompat && LangOpts.CPlusPlus)
- Builder.defineMacro("__private_extern__", "extern");
-- }
-
- if (LangOpts.MicrosoftExt) {
- if (LangOpts.WChar) {
-@@ -927,7 +933,7 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
- else
- Builder.defineMacro("__FINITE_MATH_ONLY__", "0");
-
-- if (!LangOpts.MSVCCompat) {
-+ if (LangOpts.GNUCVersion) {
- if (LangOpts.GNUInline || LangOpts.CPlusPlus)
- Builder.defineMacro("__GNUC_GNU_INLINE__");
- else
-@@ -964,7 +970,7 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
- #undef DEFINE_LOCK_FREE_MACRO
- };
- addLockFreeMacros("__CLANG_ATOMIC_");
-- if (!LangOpts.MSVCCompat)
-+ if (LangOpts.GNUCVersion)
- addLockFreeMacros("__GCC_ATOMIC_");
-
- if (LangOpts.NoInlineDefine)
-diff --git a/clang/test/Driver/fgnuc-version.c b/clang/test/Driver/fgnuc-version.c
-new file mode 100644
-index 000000000000..dea82bbaae0a
---- /dev/null
-+++ b/clang/test/Driver/fgnuc-version.c
-@@ -0,0 +1,26 @@
-+//
-+// Verify -fgnuc-version parsing
-+//
-+
-+// RUN: %clang -c %s -target i686-linux -### 2>&1 | FileCheck %s -check-prefix GNUC-DEFAULT
-+// GNUC-DEFAULT: "-fgnuc-version=4.2.1"
-+
-+// RUN: %clang -c %s -target i686-linux -fgnuc-version=100.99.99 -### 2>&1 | FileCheck %s -check-prefix GNUC-OVERRIDE
-+// GNUC-OVERRIDE: "-fgnuc-version=100.99.99"
-+
-+// RUN: %clang -c %s -target i686-linux -fgnuc-version=0 -### 2>&1 | FileCheck %s -check-prefix GNUC-DISABLE
-+// RUN: %clang -c %s -target i686-linux -fgnuc-version= -### 2>&1 | FileCheck %s -check-prefix GNUC-DISABLE
-+// GNUC-DISABLE-NOT: "-fgnuc-version=
-+
-+// RUN: not %clang -c %s -target i686-linux -fgnuc-version=100.100.10 2>&1 | FileCheck %s -check-prefix GNUC-INVALID
-+// RUN: not %clang -c %s -target i686-linux -fgnuc-version=100.10.100 2>&1 | FileCheck %s -check-prefix GNUC-INVALID
-+// RUN: not %clang -c %s -target i686-linux -fgnuc-version=-1.0.0 2>&1 | FileCheck %s -check-prefix GNUC-INVALID
-+// GNUC-INVALID: error: invalid value {{.*}} in '-fgnuc-version={{.*}}'
-+
-+// RUN: %clang -fgnuc-version=100.99.99 %s -dM -E -o - | FileCheck %s -check-prefix GNUC-LARGE
-+// GNUC-LARGE: #define __GNUC_MINOR__ 99
-+// GNUC-LARGE: #define __GNUC_PATCHLEVEL__ 99
-+// GNUC-LARGE: #define __GNUC__ 100
-+
-+// RUN: %clang -fgnuc-version=100.99.99 -x c++ %s -dM -E -o - | FileCheck %s -check-prefix GXX-LARGE
-+// GXX-LARGE: #define __GNUG__ 100
-diff --git a/clang/test/Driver/rewrite-legacy-objc.m b/clang/test/Driver/rewrite-legacy-objc.m
-index 6461aecfe5d9..dc92dd4bf107 100644
---- a/clang/test/Driver/rewrite-legacy-objc.m
-+++ b/clang/test/Driver/rewrite-legacy-objc.m
-@@ -3,11 +3,11 @@
- // TEST0: clang{{.*}}" "-cc1"
- // TEST0: "-rewrite-objc"
- // FIXME: CHECK-NOT is broken somehow, it doesn't work here. Check adjacency instead.
--// TEST0: "-fmessage-length" "0" "-stack-protector" "1" "-fblocks" "-fencode-extended-block-signature" "-fregister-global-dtors-with-atexit" "-fobjc-runtime=macosx-fragile" "-fno-objc-infer-related-result-type" "-fobjc-exceptions" "-fexceptions" "-fmax-type-align=16" "-fdiagnostics-show-option"
-+// TEST0: "-fmessage-length" "0" "-stack-protector" "1" "-fblocks" "-fencode-extended-block-signature" "-fregister-global-dtors-with-atexit" "-fgnuc-version=4.2.1" "-fobjc-runtime=macosx-fragile" "-fno-objc-infer-related-result-type" "-fobjc-exceptions" "-fexceptions" "-fmax-type-align=16" "-fdiagnostics-show-option"
- // TEST0: rewrite-legacy-objc.m"
- // RUN: %clang -no-canonical-prefixes -target i386-apple-macosx10.9.0 -rewrite-legacy-objc %s -o - -### 2>&1 | \
- // RUN: FileCheck -check-prefix=TEST1 %s
- // RUN: %clang -no-canonical-prefixes -target i386-apple-macosx10.6.0 -rewrite-legacy-objc %s -o - -### 2>&1 | \
- // RUN: FileCheck -check-prefix=TEST2 %s
--// TEST1: "-fmessage-length" "0" "-stack-protector" "1" "-fblocks" "-fencode-extended-block-signature" "-fregister-global-dtors-with-atexit" "-fobjc-runtime=macosx-fragile" "-fobjc-subscripting-legacy-runtime" "-fno-objc-infer-related-result-type" "-fobjc-exceptions" "-fmax-type-align=16" "-fdiagnostics-show-option"
--// TEST2: "-fmessage-length" "0" "-stack-protector" "1" "-fblocks" "-fencode-extended-block-signature" "-fregister-global-dtors-with-atexit" "-fobjc-runtime=macosx-fragile" "-fobjc-subscripting-legacy-runtime" "-fno-objc-infer-related-result-type" "-fobjc-exceptions" "-fmax-type-align=16" "-fdiagnostics-show-option"
-+// TEST1: "-fmessage-length" "0" "-stack-protector" "1" "-fblocks" "-fencode-extended-block-signature" "-fregister-global-dtors-with-atexit" "-fgnuc-version=4.2.1" "-fobjc-runtime=macosx-fragile" "-fobjc-subscripting-legacy-runtime" "-fno-objc-infer-related-result-type" "-fobjc-exceptions" "-fmax-type-align=16" "-fdiagnostics-show-option"
-+// TEST2: "-fmessage-length" "0" "-stack-protector" "1" "-fblocks" "-fencode-extended-block-signature" "-fregister-global-dtors-with-atexit" "-fgnuc-version=4.2.1" "-fobjc-runtime=macosx-fragile" "-fobjc-subscripting-legacy-runtime" "-fno-objc-infer-related-result-type" "-fobjc-exceptions" "-fmax-type-align=16" "-fdiagnostics-show-option"
-diff --git a/clang/test/Driver/rewrite-objc.m b/clang/test/Driver/rewrite-objc.m
-index 1c6dbcc329e2..b04062992b7f 100644
---- a/clang/test/Driver/rewrite-objc.m
-+++ b/clang/test/Driver/rewrite-objc.m
-@@ -3,4 +3,4 @@
- // TEST0: clang{{.*}}" "-cc1"
- // TEST0: "-rewrite-objc"
- // FIXME: CHECK-NOT is broken somehow, it doesn't work here. Check adjacency instead.
--// TEST0: "-fmessage-length" "0" "-stack-protector" "1" "-fblocks" "-fencode-extended-block-signature" "-fregister-global-dtors-with-atexit" "-fobjc-runtime=macosx" "-fno-objc-infer-related-result-type" "-fobjc-exceptions" "-fexceptions" "-fmax-type-align=16" "-fdiagnostics-show-option"
-+// TEST0: "-fmessage-length" "0" "-stack-protector" "1" "-fblocks" "-fencode-extended-block-signature" "-fregister-global-dtors-with-atexit" "-fgnuc-version=4.2.1" "-fobjc-runtime=macosx" "-fno-objc-infer-related-result-type" "-fobjc-exceptions" "-fexceptions" "-fmax-type-align=16" "-fdiagnostics-show-option"
-diff --git a/clang/test/Frontend/gnu-inline.c b/clang/test/Frontend/gnu-inline.c
-index 75d4fe6516f1..ef9966931372 100644
---- a/clang/test/Frontend/gnu-inline.c
-+++ b/clang/test/Frontend/gnu-inline.c
-@@ -1,9 +1,9 @@
--// RUN: %clang_cc1 -std=c89 -fsyntax-only -x c -E -dM %s | FileCheck --check-prefix=GNU-INLINE %s
--// RUN: %clang_cc1 -std=c99 -fsyntax-only -x c -E -dM %s | FileCheck --check-prefix=STDC-INLINE %s
--// RUN: %clang_cc1 -std=c99 -fgnu89-inline -fsyntax-only -x c -E -dM %s | FileCheck --check-prefix=GNU-INLINE %s
--// RUN: %clang_cc1 -fsyntax-only -x c++ -E -dM %s | FileCheck --check-prefix=GNU-INLINE %s
--// RUN: not %clang_cc1 -fgnu89-inline -fsyntax-only -x c++ %s 2>&1 | FileCheck --check-prefix=CXX %s
--// RUN: not %clang_cc1 -fgnu89-inline -fsyntax-only -x objective-c++ %s 2>&1 | FileCheck --check-prefix=OBJCXX %s
-+// RUN: %clang_cc1 -fgnuc-version=4.2.1 -std=c89 -fsyntax-only -x c -E -dM %s | FileCheck --check-prefix=GNU-INLINE %s
-+// RUN: %clang_cc1 -fgnuc-version=4.2.1 -std=c99 -fsyntax-only -x c -E -dM %s | FileCheck --check-prefix=STDC-INLINE %s
-+// RUN: %clang_cc1 -fgnuc-version=4.2.1 -std=c99 -fgnu89-inline -fsyntax-only -x c -E -dM %s | FileCheck --check-prefix=GNU-INLINE %s
-+// RUN: %clang_cc1 -fgnuc-version=4.2.1 -fsyntax-only -x c++ -E -dM %s | FileCheck --check-prefix=GNU-INLINE %s
-+// RUN: not %clang_cc1 -fgnu89-inline -fgnuc-version=4.2.1 -fsyntax-only -x c++ %s 2>&1 | FileCheck --check-prefix=CXX %s
-+// RUN: not %clang_cc1 -fgnu89-inline -fgnuc-version=4.2.1 -fsyntax-only -x objective-c++ %s 2>&1 | FileCheck --check-prefix=OBJCXX %s
-
- // CXX: '-fgnu89-inline' not allowed with 'C++'
- // OBJCXX: '-fgnu89-inline' not allowed with 'Objective-C++'
-diff --git a/clang/test/Headers/stdbool.cpp b/clang/test/Headers/stdbool.cpp
-index 0110a45b2dc6..70a921fe743f 100644
---- a/clang/test/Headers/stdbool.cpp
-+++ b/clang/test/Headers/stdbool.cpp
-@@ -1,7 +1,7 @@
--// RUN: %clang_cc1 -std=gnu++98 -E -dM %s | FileCheck --check-prefix=CHECK-GNU-COMPAT-98 %s
--// RUN: %clang_cc1 -std=gnu++11 -E -dM %s | FileCheck --check-prefix=CHECK-GNU-COMPAT-11 %s
--// RUN: %clang_cc1 -std=c++98 -E -dM %s | FileCheck --check-prefix=CHECK-CONFORMING %s
--// RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -verify -Weverything %s
-+// RUN: %clang_cc1 -fgnuc-version=4.2.1 -std=gnu++98 -E -dM %s | FileCheck --check-prefix=CHECK-GNU-COMPAT-98 %s
-+// RUN: %clang_cc1 -fgnuc-version=4.2.1 -std=gnu++11 -E -dM %s | FileCheck --check-prefix=CHECK-GNU-COMPAT-11 %s
-+// RUN: %clang_cc1 -fgnuc-version=4.2.1 -std=c++98 -E -dM %s | FileCheck --check-prefix=CHECK-CONFORMING %s
-+// RUN: %clang_cc1 -fgnuc-version=4.2.1 -fsyntax-only -std=gnu++98 -verify -Weverything %s
- #include <stdbool.h>
- #define zzz
-
-diff --git a/clang/test/Preprocessor/init.c b/clang/test/Preprocessor/init.c
-index 0f5e43bfb046..18972de35348 100644
---- a/clang/test/Preprocessor/init.c
-+++ b/clang/test/Preprocessor/init.c
-@@ -9,18 +9,18 @@
- // BLOCKS:#define __block __attribute__((__blocks__(byref)))
- //
- //
--// RUN: %clang_cc1 -x c++ -std=c++2a -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix CXX2A %s
-+// RUN: %clang_cc1 -x c++ -fgnuc-version=4.2.1 -std=c++2a -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix CXX2A %s
- //
--// CXX2A:#define __GNUG__ {{.*}}
-+// CXX2A:#define __GNUG__ 4
- // CXX2A:#define __GXX_EXPERIMENTAL_CXX0X__ 1
- // CXX2A:#define __GXX_RTTI 1
- // CXX2A:#define __GXX_WEAK__ 1
- // CXX2A:#define __cplusplus 201707L
- // CXX2A:#define __private_extern__ extern
- //
--// RUN: %clang_cc1 -x c++ -std=c++1z -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix CXX1Z %s
-+// RUN: %clang_cc1 -x c++ -fgnuc-version=4.2.1 -std=c++1z -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix CXX1Z %s
- //
--// CXX1Z:#define __GNUG__ {{.*}}
-+// CXX1Z:#define __GNUG__ 4
- // CXX1Z:#define __GXX_EXPERIMENTAL_CXX0X__ 1
- // CXX1Z:#define __GXX_RTTI 1
- // CXX1Z:#define __GXX_WEAK__ 1
-@@ -28,9 +28,9 @@
- // CXX1Z:#define __private_extern__ extern
- //
- //
--// RUN: %clang_cc1 -x c++ -std=c++1y -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix CXX1Y %s
-+// RUN: %clang_cc1 -x c++ -fgnuc-version=4.2.1 -std=c++1y -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix CXX1Y %s
- //
--// CXX1Y:#define __GNUG__ {{.*}}
-+// CXX1Y:#define __GNUG__ 4
- // CXX1Y:#define __GXX_EXPERIMENTAL_CXX0X__ 1
- // CXX1Y:#define __GXX_RTTI 1
- // CXX1Y:#define __GXX_WEAK__ 1
-@@ -38,9 +38,9 @@
- // CXX1Y:#define __private_extern__ extern
- //
- //
--// RUN: %clang_cc1 -x c++ -std=c++11 -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix CXX11 %s
-+// RUN: %clang_cc1 -x c++ -fgnuc-version=4.2.1 -std=c++11 -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix CXX11 %s
- //
--// CXX11:#define __GNUG__ {{.*}}
-+// CXX11:#define __GNUG__ 4
- // CXX11:#define __GXX_EXPERIMENTAL_CXX0X__ 1
- // CXX11:#define __GXX_RTTI 1
- // CXX11:#define __GXX_WEAK__ 1
-@@ -48,9 +48,9 @@
- // CXX11:#define __private_extern__ extern
- //
- //
--// RUN: %clang_cc1 -x c++ -std=c++98 -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix CXX98 %s
-+// RUN: %clang_cc1 -x c++ -fgnuc-version=4.2.1 -std=c++98 -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix CXX98 %s
- //
--// CXX98:#define __GNUG__ {{.*}}
-+// CXX98:#define __GNUG__ 4
- // CXX98:#define __GXX_RTTI 1
- // CXX98:#define __GXX_WEAK__ 1
- // CXX98:#define __cplusplus 199711L
-@@ -87,7 +87,7 @@
- // C11-NOT: __cplusplus
- //
- //
--// RUN: %clang_cc1 -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix COMMON %s
-+// RUN: %clang_cc1 -fgnuc-version=4.2.1 -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix COMMON %s
- //
- // COMMON:#define __CONSTANT_CFSTRINGS__ 1
- // COMMON:#define __FINITE_MATH_ONLY__ 0
-@@ -119,41 +119,41 @@
- // RUN: %clang_cc1 -ffreestanding -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix FREESTANDING %s
- // FREESTANDING:#define __STDC_HOSTED__ 0
- //
--// RUN: %clang_cc1 -x c++ -std=gnu++2a -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix GXX2A %s
-+// RUN: %clang_cc1 -x c++ -fgnuc-version=4.2.1 -std=gnu++2a -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix GXX2A %s
- //
--// GXX2A:#define __GNUG__ {{.*}}
-+// GXX2A:#define __GNUG__ 4
- // GXX2A:#define __GXX_WEAK__ 1
- // GXX2A:#define __cplusplus 201707L
- // GXX2A:#define __private_extern__ extern
- //
- //
--// RUN: %clang_cc1 -x c++ -std=gnu++1z -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix GXX1Z %s
-+// RUN: %clang_cc1 -x c++ -fgnuc-version=4.2.1 -std=gnu++1z -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix GXX1Z %s
- //
--// GXX1Z:#define __GNUG__ {{.*}}
-+// GXX1Z:#define __GNUG__ 4
- // GXX1Z:#define __GXX_WEAK__ 1
- // GXX1Z:#define __cplusplus 201703L
- // GXX1Z:#define __private_extern__ extern
- //
- //
--// RUN: %clang_cc1 -x c++ -std=gnu++1y -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix GXX1Y %s
-+// RUN: %clang_cc1 -x c++ -fgnuc-version=4.2.1 -std=gnu++1y -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix GXX1Y %s
- //
--// GXX1Y:#define __GNUG__ {{.*}}
-+// GXX1Y:#define __GNUG__ 4
- // GXX1Y:#define __GXX_WEAK__ 1
- // GXX1Y:#define __cplusplus 201402L
- // GXX1Y:#define __private_extern__ extern
- //
- //
--// RUN: %clang_cc1 -x c++ -std=gnu++11 -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix GXX11 %s
-+// RUN: %clang_cc1 -x c++ -fgnuc-version=4.2.1 -std=gnu++11 -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix GXX11 %s
- //
--// GXX11:#define __GNUG__ {{.*}}
-+// GXX11:#define __GNUG__ 4
- // GXX11:#define __GXX_WEAK__ 1
- // GXX11:#define __cplusplus 201103L
- // GXX11:#define __private_extern__ extern
- //
- //
--// RUN: %clang_cc1 -x c++ -std=gnu++98 -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix GXX98 %s
-+// RUN: %clang_cc1 -x c++ -fgnuc-version=4.2.1 -std=gnu++98 -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix GXX98 %s
- //
--// GXX98:#define __GNUG__ {{.*}}
-+// GXX98:#define __GNUG__ 4
- // GXX98:#define __GXX_WEAK__ 1
- // GXX98:#define __cplusplus 199711L
- // GXX98:#define __private_extern__ extern
-@@ -2845,9 +2845,9 @@
- // I386:#define __i386__ 1
- // I386:#define i386 1
- //
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=i386-pc-linux-gnu -target-cpu pentium4 < /dev/null | FileCheck -match-full-lines -check-prefix I386-LINUX -check-prefix I386-LINUX-ALIGN32 %s
--// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -triple=i386-pc-linux-gnu -target-cpu pentium4 < /dev/null | FileCheck -match-full-lines -check-prefix I386-LINUX -check-prefix I386-LINUX-CXX -check-prefix I386-LINUX-ALIGN32 %s
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=i386-pc-linux-gnu -target-cpu pentium4 -malign-double < /dev/null | FileCheck -match-full-lines -check-prefix I386-LINUX -check-prefix I386-LINUX-ALIGN64 %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=i386-pc-linux-gnu -target-cpu pentium4 < /dev/null | FileCheck -match-full-lines -check-prefix I386-LINUX -check-prefix I386-LINUX-ALIGN32 %s
-+// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=i386-pc-linux-gnu -target-cpu pentium4 < /dev/null | FileCheck -match-full-lines -check-prefix I386-LINUX -check-prefix I386-LINUX-CXX -check-prefix I386-LINUX-ALIGN32 %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=i386-pc-linux-gnu -target-cpu pentium4 -malign-double < /dev/null | FileCheck -match-full-lines -check-prefix I386-LINUX -check-prefix I386-LINUX-ALIGN64 %s
- //
- // I386-LINUX-NOT:#define _LP64
- // I386-LINUX:#define __BIGGEST_ALIGNMENT__ 16
-@@ -3047,9 +3047,9 @@
- // I386-LINUX:#define __i386__ 1
- // I386-LINUX:#define i386 1
- //
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=i386-netbsd -target-cpu i486 < /dev/null | FileCheck -match-full-lines -check-prefix I386-NETBSD %s
--// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -triple=i386-netbsd -target-cpu i486 < /dev/null | FileCheck -match-full-lines -check-prefix I386-NETBSD -check-prefix I386-NETBSD-CXX %s
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=i386-netbsd -target-cpu i486 -malign-double < /dev/null | FileCheck -match-full-lines -check-prefix I386-NETBSD %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=i386-netbsd -target-cpu i486 < /dev/null | FileCheck -match-full-lines -check-prefix I386-NETBSD %s
-+// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=i386-netbsd -target-cpu i486 < /dev/null | FileCheck -match-full-lines -check-prefix I386-NETBSD -check-prefix I386-NETBSD-CXX %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=i386-netbsd -target-cpu i486 -malign-double < /dev/null | FileCheck -match-full-lines -check-prefix I386-NETBSD %s
- //
- //
- // I386-NETBSD-NOT:#define _LP64
-@@ -3263,8 +3263,8 @@
- // I386-DECLSPEC: #define __declspec{{.*}}
-
- //
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=mips-none-none < /dev/null | FileCheck -match-full-lines -check-prefix MIPS32BE -check-prefix MIPS32BE-C %s
--// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -triple=mips-none-none < /dev/null | FileCheck -match-full-lines -check-prefix MIPS32BE -check-prefix MIPS32BE-CXX %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=mips-none-none < /dev/null | FileCheck -match-full-lines -check-prefix MIPS32BE -check-prefix MIPS32BE-C %s
-+// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=mips-none-none < /dev/null | FileCheck -match-full-lines -check-prefix MIPS32BE -check-prefix MIPS32BE-CXX %s
- //
- // MIPS32BE:#define MIPSEB 1
- // MIPS32BE:#define _ABIO32 1
-@@ -3682,10 +3682,10 @@
- // MIPS32EL:#define _mips 1
- // MIPS32EL:#define mips 1
- //
--// RUN: %clang_cc1 -E -dM -ffreestanding \
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 \
- // RUN: -triple=mips64-none-none -target-abi n32 < /dev/null \
- // RUN: | FileCheck -match-full-lines -check-prefix MIPSN32BE -check-prefix MIPSN32BE-C %s
--// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding \
-+// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -fgnuc-version=4.2.1 \
- // RUN: -triple=mips64-none-none -target-abi n32 < /dev/null \
- // RUN: | FileCheck -match-full-lines -check-prefix MIPSN32BE -check-prefix MIPSN32BE-CXX %s
- //
-@@ -3993,7 +3993,7 @@
- // MIPSN32BE: #define _mips 1
- // MIPSN32BE: #define mips 1
- //
--// RUN: %clang_cc1 -E -dM -ffreestanding \
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 \
- // RUN: -triple=mips64el-none-none -target-abi n32 < /dev/null \
- // RUN: | FileCheck -match-full-lines -check-prefix MIPSN32EL %s
- //
-@@ -4300,8 +4300,8 @@
- // MIPSN32EL: #define _mips 1
- // MIPSN32EL: #define mips 1
- //
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=mips64-none-none < /dev/null | FileCheck -match-full-lines -check-prefix MIPS64BE %s
--// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -triple=mips64-none-none < /dev/null | FileCheck -match-full-lines -check-prefix MIPS64BE -check-prefix MIPS64BE-CXX %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=mips64-none-none < /dev/null | FileCheck -match-full-lines -check-prefix MIPS64BE %s
-+// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=mips64-none-none < /dev/null | FileCheck -match-full-lines -check-prefix MIPS64BE -check-prefix MIPS64BE-CXX %s
- //
- // MIPS64BE:#define MIPSEB 1
- // MIPS64BE:#define _ABI64 3
-@@ -6838,13 +6838,13 @@
- // PPC64-LINUX:#define __ppc64__ 1
- // PPC64-LINUX:#define __ppc__ 1
-
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-unknown-linux-gnu < /dev/null | FileCheck -match-full-lines -check-prefix PPC64-ELFv1 %s
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-unknown-linux-gnu -target-abi elfv1 < /dev/null | FileCheck -match-full-lines -check-prefix PPC64-ELFv1 %s
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-unknown-linux-gnu -target-abi elfv1-qpx < /dev/null | FileCheck -match-full-lines -check-prefix PPC64-ELFv1 %s
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-unknown-linux-gnu -target-abi elfv2 < /dev/null | FileCheck -match-full-lines -check-prefix PPC64-ELFv2 %s
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64le-unknown-linux-gnu < /dev/null | FileCheck -match-full-lines -check-prefix PPC64-ELFv2 %s
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64le-unknown-linux-gnu -target-abi elfv1 < /dev/null | FileCheck -match-full-lines -check-prefix PPC64-ELFv1 %s
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64le-unknown-linux-gnu -target-abi elfv2 < /dev/null | FileCheck -match-full-lines -check-prefix PPC64-ELFv2 %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=powerpc64-unknown-linux-gnu < /dev/null | FileCheck -match-full-lines -check-prefix PPC64-ELFv1 %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=powerpc64-unknown-linux-gnu -target-abi elfv1 < /dev/null | FileCheck -match-full-lines -check-prefix PPC64-ELFv1 %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=powerpc64-unknown-linux-gnu -target-abi elfv1-qpx < /dev/null | FileCheck -match-full-lines -check-prefix PPC64-ELFv1 %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=powerpc64-unknown-linux-gnu -target-abi elfv2 < /dev/null | FileCheck -match-full-lines -check-prefix PPC64-ELFv2 %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=powerpc64le-unknown-linux-gnu < /dev/null | FileCheck -match-full-lines -check-prefix PPC64-ELFv2 %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=powerpc64le-unknown-linux-gnu -target-abi elfv1 < /dev/null | FileCheck -match-full-lines -check-prefix PPC64-ELFv1 %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=powerpc64le-unknown-linux-gnu -target-abi elfv2 < /dev/null | FileCheck -match-full-lines -check-prefix PPC64-ELFv2 %s
- // PPC64-ELFv1:#define _CALL_ELF 1
- // PPC64-ELFv2:#define _CALL_ELF 2
- //
-@@ -7980,12 +7980,12 @@
- // S390X:#define __s390__ 1
- // S390X:#define __s390x__ 1
- //
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=sparc-none-none < /dev/null | FileCheck -match-full-lines -check-prefix SPARC -check-prefix SPARC-DEFAULT %s
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=sparc-rtems-elf < /dev/null | FileCheck -match-full-lines -check-prefix SPARC -check-prefix SPARC-DEFAULT %s
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=sparc-none-netbsd < /dev/null | FileCheck -match-full-lines -check-prefix SPARC -check-prefix SPARC-NETOPENBSD %s
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=sparc-none-openbsd < /dev/null | FileCheck -match-full-lines -check-prefix SPARC -check-prefix SPARC-NETOPENBSD %s
--// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -triple=sparc-none-none < /dev/null | FileCheck -match-full-lines -check-prefix SPARC -check-prefix SPARC-DEFAULT -check-prefix SPARC-DEFAULT-CXX %s
--// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -triple=sparc-none-openbsd < /dev/null | FileCheck -match-full-lines -check-prefix SPARC -check-prefix SPARC-NETOPENBSD -check-prefix SPARC-NETOPENBSD-CXX %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=sparc-none-none < /dev/null | FileCheck -match-full-lines -check-prefix SPARC -check-prefix SPARC-DEFAULT %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=sparc-rtems-elf < /dev/null | FileCheck -match-full-lines -check-prefix SPARC -check-prefix SPARC-DEFAULT %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=sparc-none-netbsd < /dev/null | FileCheck -match-full-lines -check-prefix SPARC -check-prefix SPARC-NETOPENBSD %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=sparc-none-openbsd < /dev/null | FileCheck -match-full-lines -check-prefix SPARC -check-prefix SPARC-NETOPENBSD %s
-+// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=sparc-none-none < /dev/null | FileCheck -match-full-lines -check-prefix SPARC -check-prefix SPARC-DEFAULT -check-prefix SPARC-DEFAULT-CXX %s
-+// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=sparc-none-openbsd < /dev/null | FileCheck -match-full-lines -check-prefix SPARC -check-prefix SPARC-NETOPENBSD -check-prefix SPARC-NETOPENBSD-CXX %s
- //
- // SPARC-NOT:#define _LP64
- // SPARC:#define __BIGGEST_ALIGNMENT__ 8
-@@ -8185,8 +8185,8 @@
- // SPARC:#define __sparcv8 1
- // SPARC:#define sparc 1
-
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=tce-none-none < /dev/null | FileCheck -match-full-lines -check-prefix TCE %s
--// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -triple=tce-none-none < /dev/null | FileCheck -match-full-lines -check-prefix TCE -check-prefix TCE-CXX %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=tce-none-none < /dev/null | FileCheck -match-full-lines -check-prefix TCE %s
-+// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=tce-none-none < /dev/null | FileCheck -match-full-lines -check-prefix TCE -check-prefix TCE-CXX %s
- //
- // TCE-NOT:#define _LP64
- // TCE:#define __BIGGEST_ALIGNMENT__ 4
-@@ -8354,8 +8354,8 @@
- // TCE:#define __tce__ 1
- // TCE:#define tce 1
- //
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=x86_64-none-none < /dev/null | FileCheck -match-full-lines -check-prefix X86_64 %s
--// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -triple=x86_64-none-none < /dev/null | FileCheck -match-full-lines -check-prefix X86_64 -check-prefix X86_64-CXX %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=x86_64-none-none < /dev/null | FileCheck -match-full-lines -check-prefix X86_64 %s
-+// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=x86_64-none-none < /dev/null | FileCheck -match-full-lines -check-prefix X86_64 -check-prefix X86_64-CXX %s
- //
- // X86_64:#define _LP64 1
- // X86_64-NOT:#define _LP32 1
-@@ -8562,8 +8562,8 @@
- // RUN: %clang -xc - -E -dM -mcmodel=medium --target=i386-unknown-linux < /dev/null | FileCheck -match-full-lines -check-prefix X86_MEDIUM %s
- // X86_MEDIUM:#define __code_model_medium_ 1
- //
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=x86_64-none-none-gnux32 < /dev/null | FileCheck -match-full-lines -check-prefix X32 %s
--// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -triple=x86_64-none-none-gnux32 < /dev/null | FileCheck -match-full-lines -check-prefix X32 -check-prefix X32-CXX %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=x86_64-none-none-gnux32 < /dev/null | FileCheck -match-full-lines -check-prefix X32 %s
-+// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=x86_64-none-none-gnux32 < /dev/null | FileCheck -match-full-lines -check-prefix X32 -check-prefix X32-CXX %s
- //
- // X32:#define _ILP32 1
- // X32-NOT:#define _LP64 1
-@@ -8759,7 +8759,7 @@
- // X32:#define __x86_64 1
- // X32:#define __x86_64__ 1
- //
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=x86_64-unknown-cloudabi < /dev/null | FileCheck -match-full-lines -check-prefix X86_64-CLOUDABI %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=x86_64-unknown-cloudabi < /dev/null | FileCheck -match-full-lines -check-prefix X86_64-CLOUDABI %s
- //
- // X86_64-CLOUDABI:#define _LP64 1
- // X86_64-CLOUDABI:#define __ATOMIC_ACQUIRE 2
-@@ -9064,7 +9064,7 @@
- // X86_64-CLOUDABI:#define __x86_64 1
- // X86_64-CLOUDABI:#define __x86_64__ 1
- //
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=x86_64-pc-linux-gnu < /dev/null | FileCheck -match-full-lines -check-prefix X86_64-LINUX %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=x86_64-pc-linux-gnu < /dev/null | FileCheck -match-full-lines -check-prefix X86_64-LINUX %s
- //
- // X86_64-LINUX:#define _LP64 1
- // X86_64-LINUX:#define __BIGGEST_ALIGNMENT__ 16
-@@ -9277,7 +9277,7 @@
- // X86_64-FREEBSD:#define __LDBL_DECIMAL_DIG__ 21
- // X86_64-FREEBSD:#define __STDC_MB_MIGHT_NEQ_WC__ 1
- //
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=x86_64-netbsd < /dev/null | FileCheck -match-full-lines -check-prefix X86_64-NETBSD %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=x86_64-netbsd < /dev/null | FileCheck -match-full-lines -check-prefix X86_64-NETBSD %s
- //
- // X86_64-NETBSD:#define _LP64 1
- // X86_64-NETBSD:#define __BIGGEST_ALIGNMENT__ 16
-@@ -9481,7 +9481,7 @@
- // X86_64-NETBSD:#define __x86_64 1
- // X86_64-NETBSD:#define __x86_64__ 1
- //
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=x86_64-scei-ps4 < /dev/null | FileCheck -match-full-lines -check-prefix PS4 %s
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=x86_64-scei-ps4 < /dev/null | FileCheck -match-full-lines -check-prefix PS4 %s
- //
- // PS4:#define _LP64 1
- // PS4:#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__
-@@ -9641,7 +9641,7 @@
- // RUN: %clang_cc1 -x objective-c -triple i386-unknown-freebsd -fobjc-runtime=gnustep-2.5 -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix GNUSTEP2 %s
- // GNUSTEP2:#define __OBJC_GNUSTEP_RUNTIME_ABI__ 20
- //
--// RUN: %clang_cc1 -x c++ -std=c++98 -fno-rtti -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix NORTTI %s
-+// RUN: %clang_cc1 -x c++ -fgnuc-version=4.2.1 -std=c++98 -fno-rtti -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix NORTTI %s
- // NORTTI: #define __GXX_ABI_VERSION {{.*}}
- // NORTTI-NOT:#define __GXX_RTTI
- // NORTTI:#define __STDC__ 1
-@@ -9700,16 +9700,16 @@
- // XCORE:#define __LITTLE_ENDIAN__ 1
- // XCORE:#define __XS1B__ 1
- //
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=wasm32-unknown-unknown \
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=wasm32-unknown-unknown \
- // RUN: < /dev/null \
- // RUN: | FileCheck -match-full-lines -check-prefixes=WEBASSEMBLY,WEBASSEMBLY32 %s
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=wasm64-unknown-unknown \
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=wasm64-unknown-unknown \
- // RUN: < /dev/null \
- // RUN: | FileCheck -match-full-lines -check-prefixes=WEBASSEMBLY,WEBASSEMBLY64 %s
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=wasm32-wasi \
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=wasm32-wasi \
- // RUN: < /dev/null \
- // RUN: | FileCheck -match-full-lines -check-prefixes=WEBASSEMBLY,WEBASSEMBLY32,WEBASSEMBLY-WASI %s
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=wasm64-wasi \
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=wasm64-wasi \
- // RUN: < /dev/null \
- // RUN: | FileCheck -match-full-lines -check-prefixes=WEBASSEMBLY,WEBASSEMBLY64,WEBASSEMBLY-WASI %s
- //
-@@ -10087,7 +10087,7 @@
- // RUN: %clang_cc1 -E -dM -ffreestanding -triple x86_64-windows-cygnus < /dev/null | FileCheck -match-full-lines -check-prefix CYGWIN-X64 %s
- // CYGWIN-X64: #define __USER_LABEL_PREFIX__
-
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=avr \
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=avr \
- // RUN: < /dev/null \
- // RUN: | FileCheck -match-full-lines -check-prefix=AVR %s
- //
-@@ -10295,10 +10295,10 @@
- // MSVC-X64:#define __STDCPP_DEFAULT_NEW_ALIGNMENT__ 16ULL
-
- // RUN: %clang_cc1 -E -dM -ffreestanding \
--// RUN: -triple=aarch64-apple-ios9 < /dev/null \
-+// RUN: -fgnuc-version=4.2.1 -triple=aarch64-apple-ios9 < /dev/null \
- // RUN: | FileCheck -check-prefix=DARWIN %s
- // RUN: %clang_cc1 -E -dM -ffreestanding \
--// RUN: -triple=aarch64-apple-macosx10.12 < /dev/null \
-+// RUN: -fgnuc-version=4.2.1 -triple=aarch64-apple-macosx10.12 < /dev/null \
- // RUN: | FileCheck -check-prefix=DARWIN %s
-
- // DARWIN:#define __STDC_NO_THREADS__ 1
-@@ -10364,11 +10364,11 @@
- // ARM-DARWIN-BAREMETAL-64: #define __PTRDIFF_TYPE__ long int
- // ARM-DARWIN-BAREMETAL-64: #define __SIZE_TYPE__ long unsigned int
-
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=riscv32 < /dev/null \
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=riscv32 < /dev/null \
- // RUN: | FileCheck -match-full-lines -check-prefix=RISCV32 %s
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=riscv32-unknown-linux < /dev/null \
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=riscv32-unknown-linux < /dev/null \
- // RUN: | FileCheck -match-full-lines -check-prefixes=RISCV32,RISCV32-LINUX %s
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=riscv32 \
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=riscv32 \
- // RUN: -fforce-enable-int128 < /dev/null | FileCheck -match-full-lines \
- // RUN: -check-prefixes=RISCV32,RISCV32-INT128 %s
- // RISCV32: #define _ILP32 1
-@@ -10575,9 +10575,9 @@
- // RISCV32-LINUX: #define linux 1
- // RISCV32-LINUX: #define unix 1
-
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=riscv64 < /dev/null \
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=riscv64 < /dev/null \
- // RUN: | FileCheck -match-full-lines -check-prefix=RISCV64 %s
--// RUN: %clang_cc1 -E -dM -ffreestanding -triple=riscv64-unknown-linux < /dev/null \
-+// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=riscv64-unknown-linux < /dev/null \
- // RUN: | FileCheck -match-full-lines -check-prefixes=RISCV64,RISCV64-LINUX %s
- // RISCV64: #define _LP64 1
- // RISCV64: #define __ATOMIC_ACQUIRE 2
-diff --git a/clang/test/Sema/atomic-ops.c b/clang/test/Sema/atomic-ops.c
-index 638c30f278ce..0340e2334894 100644
---- a/clang/test/Sema/atomic-ops.c
-+++ b/clang/test/Sema/atomic-ops.c
-@@ -1,4 +1,4 @@
--// RUN: %clang_cc1 %s -verify -ffreestanding -fsyntax-only -triple=i686-linux-gnu -std=c11
-+// RUN: %clang_cc1 %s -verify -fgnuc-version=4.2.1 -ffreestanding -fsyntax-only -triple=i686-linux-gnu -std=c11
-
- // Basic parsing/Sema tests for __c11_atomic_*
-
diff --git a/packages/dev-lang/clang/files/9/bb282f47511e83fdb6761a6bda185e2062d7a099.patch b/packages/dev-lang/clang/files/9/bb282f47511e83fdb6761a6bda185e2062d7a099.patch
deleted file mode 100644
index 6434d1818..000000000
--- a/packages/dev-lang/clang/files/9/bb282f47511e83fdb6761a6bda185e2062d7a099.patch
+++ /dev/null
@@ -1,333 +0,0 @@
-Upstream: Yes
-Reason: Fix compiler crash while building chromium-80:
-
-clang-9: /usr/x86_64-pc-linux-gnu/lib/llvm/9/include/llvm/IR/IRBuilder.h:2573: llvm::CallInst* llvm::IRBuilder<T, Inserter>::CreateAlignmentAssumption(const llvm::DataLayout&, llvm::Value*, unsigned int, llvm::Value*, llvm::Value**) [with T = llvm::ConstantFolder; Inserter = clang::CodeGen::CGBuilderInserter]: Assertion `Alignment != 0 && "Invalid Alignment"' failed. Stack dump: 0. Program arguments: /usr/x86_64-pc-linux-gnu/lib/llvm/9/bin/clang-9 -cc1 -triple x86_64-pc-linux-gnu -emit-obj -disable-free -main-file-name mark-compact.cc -mrelocation-model pic -pic-level 2 -mthread-model posix -fmerge-all-constants -mdisable-fp-elim -relaxed-aliasing -fmath-errno -masm-verbose -mconstructor-aliases -munwind-tables -fuse-init-array -target-cpu haswell -dwarf-column-info -debugger-tuning=gdb -momit-leaf-frame-pointer -ffunction-sections -fdata-sections -coverage-notes-file /var/tmp/paludis/build/net-www-chromium-beta-80.0.3987.16/work/chromium-80.0.3987.16/out/Release/obj/v8/v8_base_without_compiler/
-mark-compact.gcno -resource-dir /usr/x86_64-pc-linux-gnu/lib/llvm/9/lib/clang/9.0.1 -dependency-file obj/v8/v8_base_without_compiler/mark-compact.o.d -MT obj/v8/v8_base_without_compiler/mark-compact.o -D USE_UDE
-V -D USE_AURA=1 -D USE_GLIB=1 -D USE_NSS_CERTS=1 -D USE_X11=1 -D _FILE_OFFSET_BITS=64 -D _LARGEFILE_SOURCE -D _LARGEFILE64_SOURCE -D _GNU_SOURCE -D __STDC_CONSTANT_MACROS -D __STDC_FORMAT_MACROS -D _FORTIFY_SOUR
-CE=2 -D NDEBUG -D NVALGRIND -D DYNAMIC_ANNOTATIONS_ENABLED=0 -D V8_TYPED_ARRAY_MAX_SIZE_IN_HEAP=64 -D ENABLE_MINOR_MC -D V8_INTL_SUPPORT -D V8_USE_EXTERNAL_STARTUP_DATA -D V8_CONCURRENT_MARKING -D V8_ENABLE_LAZY
-_SOURCE_POSITIONS -D V8_EMBEDDED_BUILTINS -D V8_WIN64_UNWINDING_INFO -D V8_ENABLE_REGEXP_INTERPRETER_THREADED_DISPATCH -D V8_COMPRESS_POINTERS -D V8_31BIT_SMIS_ON_64BIT_ARCH -D V8_DEPRECATION_WARNINGS -D V8_TARG
-ET_ARCH_X64 -D V8_HAVE_TARGET_OS -D V8_TARGET_OS_LINUX -D DISABLE_UNTRUSTED_CODE_MITIGATIONS -D V8_COMPRESS_POINTERS -D V8_31BIT_SMIS_ON_64BIT_ARCH -D V8_DEPRECATION_WARNINGS -D USING_SYSTEM_ICU=1 -D ICU_UTIL_DA
-TA_IMPL=ICU_UTIL_DATA_STATIC -D UCHAR_TYPE=uint16_t -D U_IMPORT=U_EXPORT -D V8_COMPRESS_POINTERS -D V8_31BIT_SMIS_ON_64BIT_ARCH -D V8_DEPRECATION_WARNINGS -D USE_SYSTEM_ZLIB=1 -I ../.. -I gen -I ../../v8 -I gen/
-v8 -I gen/shim_headers/icui18n_shim -I gen/shim_headers/icuuc_shim -I gen/shim_headers/zlib_shim -I ../../v8/include -D __DATE__= -D __TIME__= -D __TIMESTAMP__= -internal-isystem /usr/bin/../lib64/gcc/x86_64-pc-
-linux-gnu/9.2.0/../../../../../x86_64-pc-linux-gnu/include/c++/9.2.0 -internal-isystem /usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.2.0/../../../../../x86_64-pc-linux-gnu/include/c++/9.2.0/x86_64-pc-linux-gnu -in
-ternal-isystem /usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.2.0/../../../../../x86_64-pc-linux-gnu/include/c++/9.2.0/backward -internal-isystem /usr/local/include -internal-isystem /usr/x86_64-pc-linux-gnu/lib/ll
-vm/9/lib/clang/9.0.1/include -internal-externc-isystem /usr/x86_64-pc-linux-gnu/include -internal-externc-isystem /include -internal-externc-isystem /usr/include -O2 -Wno-builtin-macro-redefined -Wall -Wextra -W
-implicit-fallthrough -Wthread-safety -Wextra-semi -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-unneeded-internal-declaration -Wno-undefined-var-template -Wno-ignored-pragma-opt
-imize -Wno-implicit-int-float-conversion -Wno-final-dtor-non-final-class -Wno-bitwise-conditional-parentheses -Wno-builtin-assume-aligned-alignment -Wno-deprecated-copy -Wheader-hygiene -Wstring-conversion -Wtau
-tological-overlap-compare -Wmissing-field-initializers -Wunreachable-code -Wshorten-64-to-32 -Wexit-time-destructors -std=c++14 -fdeprecated-macro -fdebug-compilation-dir /var/tmp/paludis/build/net-www-chromium-
-beta-80.0.3987.16/work/chromium-80.0.3987.16/out/Release -ferror-limit 19 -fmessage-length 0 -fvisibility hidden -fvisibility-inlines-hidden -pthread -stack-protector 1 -stack-protector-buffer-size 4 -ftrivial-a
-uto-var-init=pattern -fno-rtti -fgnuc-version=4.2.1 -fobjc-runtime=gcc -Qn -fdiagnostics-show-option -fcolor-diagnostics -vectorize-loops -vectorize-slp -mllvm -instcombine-lower-dbg-declare=0 -faddrsig -o obj/v
-8/v8_base_without_compiler/mark-compact.o -x c++ ../../v8/src/heap/mark-compact.cc
-1. <eof> parser at end of file
-2. Per-file LLVM IR generation
-3. ../../v8/src/common/ptr-compr-inl.h:30:19: Generating code for declaration 'v8::internal::GetIsolateRoot'
- #0 0x00007fb573fa77aa llvm::sys::PrintStackTrace(llvm::raw_ostream&) (/usr/x86_64-pc-linux-gnu/lib/llvm/9/bin/../lib/libLLVM-9.so+0x107d7aa)
- #1 0x00007fb573fa5a84 llvm::sys::RunSignalHandlers() (/usr/x86_64-pc-linux-gnu/lib/llvm/9/bin/../lib/libLLVM-9.so+0x107ba84)
- #2 0x00007fb573fa5be5 (/usr/x86_64-pc-linux-gnu/lib/llvm/9/bin/../lib/libLLVM-9.so+0x107bbe5)
- #3 0x00007fb572b8c130 (/usr/x86_64-pc-linux-gnu/lib/libc.so.6+0x3c130)
- #4 0x00007fb572b8c0ae raise /var/tmp/paludis/build/sys-libs-glibc-2.30/work/glibc-2.30/signal/../sysdeps/unix/sysv/linux/raise.c:51:1
- #5 0x00007fb572b7589b abort /var/tmp/paludis/build/sys-libs-glibc-2.30/work/glibc-2.30/stdlib/abort.c:81:7
- #6 0x00007fb572b75764 get_sysdep_segment_value /var/tmp/paludis/build/sys-libs-glibc-2.30/work/glibc-2.30/intl/loadmsgcat.c:509:8
- #7 0x00007fb572b75764 _nl_load_domain /var/tmp/paludis/build/sys-libs-glibc-2.30/work/glibc-2.30/intl/loadmsgcat.c:970:34
- #8 0x00007fb572b843c7 (/usr/x86_64-pc-linux-gnu/lib/libc.so.6+0x343c7)
- #9 0x000055c78d22ab43 clang::CodeGen::CodeGenFunction::EmitAlignmentAssumption(llvm::Value*, clang::QualType, clang::SourceLocation, clang::SourceLocation, unsigned int, llvm::Value*) (/usr/x86_64-pc-linux-gnu/
-lib/llvm/9/bin/clang-9+0x8e7b43)
-#10 0x000055c78d22abcb clang::CodeGen::CodeGenFunction::EmitAlignmentAssumption(llvm::Value*, clang::Expr const*, clang::SourceLocation, unsigned int, llvm::Value*) (/usr/x86_64-pc-linux-gnu/lib/llvm/9/bin/clang
--9+0x8e7bcb)
-#11 0x000055c78d38c98c clang::CodeGen::CodeGenFunction::EmitBuiltinExpr(clang::GlobalDecl, unsigned int, clang::CallExpr const*, clang::CodeGen::ReturnValueSlot) (/usr/x86_64-pc-linux-gnu/lib/llvm/9/bin/clang-9+
-0xa4998c)
-#12 0x000055c78d426d10 clang::CodeGen::CodeGenFunction::EmitCallExpr(clang::CallExpr const*, clang::CodeGen::ReturnValueSlot) (/usr/x86_64-pc-linux-gnu/lib/llvm/9/bin/clang-9+0xae3d10)
-#13 0x000055c78d45d72c (/usr/x86_64-pc-linux-gnu/lib/llvm/9/bin/clang-9+0xb1a72c)
-#14 0x000055c78d45b23b (/usr/x86_64-pc-linux-gnu/lib/llvm/9/bin/clang-9+0xb1823b)
-#15 0x000055c78d462f45 (/usr/x86_64-pc-linux-gnu/lib/llvm/9/bin/clang-9+0xb1ff45)
-#16 0x000055c78d45b155 (/usr/x86_64-pc-linux-gnu/lib/llvm/9/bin/clang-9+0xb18155)
-
-
-
-From bb282f47511e83fdb6761a6bda185e2062d7a099 Mon Sep 17 00:00:00 2001
-From: Erich Keane <erich.keane@intel.com>
-Date: Fri, 11 Oct 2019 14:59:44 +0000
-Subject: [PATCH] Reland r374450 with Richard Smith's comments and test fixed.
-
-The behavior from the original patch has changed, since we're no longer
-allowing LLVM to just ignore the alignment. Instead, we're just
-assuming the maximum possible alignment.
-
-Differential Revision: https://reviews.llvm.org/D68824
-
-git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@374562 91177308-0d34-0410-b5e6-96231b3b80d8
----
- include/clang/Basic/DiagnosticSemaKinds.td | 4 ++++
- lib/CodeGen/CGBuiltin.cpp | 6 ++++--
- lib/CodeGen/CGCall.cpp | 2 +-
- lib/CodeGen/CGExprScalar.cpp | 3 +--
- lib/CodeGen/CGStmtOpenMP.cpp | 11 ++++++-----
- lib/CodeGen/CodeGenFunction.cpp | 17 +----------------
- lib/CodeGen/CodeGenFunction.h | 7 +------
- lib/Sema/SemaChecking.cpp | 6 ++++++
- test/CodeGen/builtin-assume-aligned.c | 9 +++++++++
- ...tin_assume_aligned-three-params-variable.cpp | 6 +++---
- ...tion-builtin_assume_aligned-three-params.cpp | 6 +++---
- ...mption-builtin_assume_aligned-two-params.cpp | 6 +++---
- test/Sema/builtin-assume-aligned.c | 4 ++++
- 13 files changed, 46 insertions(+), 41 deletions(-)
-
-diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
-index bcd059be9113..47a1deef98a7 100644
---- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
-+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
-@@ -2853,6 +2853,10 @@ def err_alignment_dependent_typedef_name : Error<
-
- def err_attribute_aligned_too_great : Error<
- "requested alignment must be %0 bytes or smaller">;
-+def warn_assume_aligned_too_great
-+ : Warning<"requested alignment must be %0 bytes or smaller; maximum "
-+ "alignment assumed">,
-+ InGroup<DiagGroup<"builtin-assume-aligned-alignment">>;
- def warn_redeclaration_without_attribute_prev_attribute_ignored : Warning<
- "%q0 redeclared without %1 attribute: previous %1 ignored">,
- InGroup<MicrosoftInconsistentDllImport>;
-diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp
-index 0562a623ae2b..ddff595987bc 100644
---- a/clang/lib/CodeGen/CGBuiltin.cpp
-+++ b/clang/lib/CodeGen/CGBuiltin.cpp
-@@ -2048,11 +2048,13 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
-
- Value *AlignmentValue = EmitScalarExpr(E->getArg(1));
- ConstantInt *AlignmentCI = cast<ConstantInt>(AlignmentValue);
-- unsigned Alignment = (unsigned)AlignmentCI->getZExtValue();
-+ if (AlignmentCI->getValue().ugt(llvm::Value::MaximumAlignment))
-+ AlignmentCI = ConstantInt::get(AlignmentCI->getType(),
-+ llvm::Value::MaximumAlignment);
-
- EmitAlignmentAssumption(PtrValue, Ptr,
- /*The expr loc is sufficient.*/ SourceLocation(),
-- Alignment, OffsetValue);
-+ AlignmentCI, OffsetValue);
- return RValue::get(PtrValue);
- }
- case Builtin::BI__assume:
-diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
-index 682a7ccb493f..2ec9e91e3154 100644
---- a/clang/lib/CodeGen/CGCall.cpp
-+++ b/clang/lib/CodeGen/CGCall.cpp
-@@ -4569,7 +4569,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
- llvm::Value *Alignment = EmitScalarExpr(AA->getAlignment());
- llvm::ConstantInt *AlignmentCI = cast<llvm::ConstantInt>(Alignment);
- EmitAlignmentAssumption(Ret.getScalarVal(), RetTy, Loc, AA->getLocation(),
-- AlignmentCI->getZExtValue(), OffsetValue);
-+ AlignmentCI, OffsetValue);
- } else if (const auto *AA = TargetDecl->getAttr<AllocAlignAttr>()) {
- llvm::Value *AlignmentVal = CallArgs[AA->getParamIndex().getLLVMIndex()]
- .getRValue(*this)
-diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp
-index 0b9271b1d31f..c7f279d28e83 100644
---- a/clang/lib/CodeGen/CGExprScalar.cpp
-+++ b/clang/lib/CodeGen/CGExprScalar.cpp
-@@ -294,8 +294,7 @@ class ScalarExprEmitter
-
- Value *AlignmentValue = CGF.EmitScalarExpr(AVAttr->getAlignment());
- llvm::ConstantInt *AlignmentCI = cast<llvm::ConstantInt>(AlignmentValue);
-- CGF.EmitAlignmentAssumption(V, E, AVAttr->getLocation(),
-- AlignmentCI->getZExtValue());
-+ CGF.EmitAlignmentAssumption(V, E, AVAttr->getLocation(), AlignmentCI);
- }
-
- /// EmitLoadOfLValue - Given an expression with complex type that represents a
-diff --git a/clang/lib/CodeGen/CGStmtOpenMP.cpp b/clang/lib/CodeGen/CGStmtOpenMP.cpp
-index e50cdb1b678f..2a4e89b9e2bb 100644
---- a/clang/lib/CodeGen/CGStmtOpenMP.cpp
-+++ b/clang/lib/CodeGen/CGStmtOpenMP.cpp
-@@ -1519,14 +1519,14 @@ static void emitAlignedClause(CodeGenFunction &CGF,
- if (!CGF.HaveInsertPoint())
- return;
- for (const auto *Clause : D.getClausesOfKind<OMPAlignedClause>()) {
-- unsigned ClauseAlignment = 0;
-+ llvm::APInt ClauseAlignment(64, 0);
- if (const Expr *AlignmentExpr = Clause->getAlignment()) {
- auto *AlignmentCI =
- cast<llvm::ConstantInt>(CGF.EmitScalarExpr(AlignmentExpr));
-- ClauseAlignment = static_cast<unsigned>(AlignmentCI->getZExtValue());
-+ ClauseAlignment = AlignmentCI->getValue();
- }
- for (const Expr *E : Clause->varlists()) {
-- unsigned Alignment = ClauseAlignment;
-+ llvm::APInt Alignment(ClauseAlignment);
- if (Alignment == 0) {
- // OpenMP [2.8.1, Description]
- // If no optional parameter is specified, implementation-defined default
-@@ -1537,12 +1537,13 @@ static void emitAlignedClause(CodeGenFunction &CGF,
- E->getType()->getPointeeType()))
- .getQuantity();
- }
-- assert((Alignment == 0 || llvm::isPowerOf2_32(Alignment)) &&
-+ assert((Alignment == 0 || Alignment.isPowerOf2()) &&
- "alignment is not power of 2");
- if (Alignment != 0) {
- llvm::Value *PtrValue = CGF.EmitScalarExpr(E);
- CGF.EmitAlignmentAssumption(
-- PtrValue, E, /*No second loc needed*/ SourceLocation(), Alignment);
-+ PtrValue, E, /*No second loc needed*/ SourceLocation(),
-+ llvm::ConstantInt::get(CGF.getLLVMContext(), Alignment));
- }
- }
- }
-diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp
-index 41b7f2f4b1be..3f9a52ab7638 100644
---- a/clang/lib/CodeGen/CodeGenFunction.cpp
-+++ b/clang/lib/CodeGen/CodeGenFunction.cpp
-@@ -2056,25 +2056,10 @@ void CodeGenFunction::EmitAlignmentAssumption(llvm::Value *PtrValue,
- }
- }
-
--void CodeGenFunction::EmitAlignmentAssumption(llvm::Value *PtrValue,
-- QualType Ty, SourceLocation Loc,
-- SourceLocation AssumptionLoc,
-- unsigned Alignment,
-- llvm::Value *OffsetValue) {
-- llvm::Value *TheCheck;
-- llvm::Instruction *Assumption = Builder.CreateAlignmentAssumption(
-- CGM.getDataLayout(), PtrValue, Alignment, OffsetValue, &TheCheck);
-- if (SanOpts.has(SanitizerKind::Alignment)) {
-- llvm::Value *AlignmentVal = llvm::ConstantInt::get(IntPtrTy, Alignment);
-- EmitAlignmentAssumptionCheck(PtrValue, Ty, Loc, AssumptionLoc, AlignmentVal,
-- OffsetValue, TheCheck, Assumption);
-- }
--}
--
- void CodeGenFunction::EmitAlignmentAssumption(llvm::Value *PtrValue,
- const Expr *E,
- SourceLocation AssumptionLoc,
-- unsigned Alignment,
-+ llvm::Value *Alignment,
- llvm::Value *OffsetValue) {
- if (auto *CE = dyn_cast<CastExpr>(E))
- E = CE->getSubExprAsWritten();
-diff --git a/clang/lib/CodeGen/CodeGenFunction.h b/clang/lib/CodeGen/CodeGenFunction.h
-index ea78309a0697..bb4fed808373 100644
---- a/clang/lib/CodeGen/CodeGenFunction.h
-+++ b/clang/lib/CodeGen/CodeGenFunction.h
-@@ -2829,13 +2829,8 @@ class CodeGenFunction : public CodeGenTypeCache {
- llvm::Value *Alignment,
- llvm::Value *OffsetValue = nullptr);
-
-- void EmitAlignmentAssumption(llvm::Value *PtrValue, QualType Ty,
-- SourceLocation Loc, SourceLocation AssumptionLoc,
-- unsigned Alignment,
-- llvm::Value *OffsetValue = nullptr);
--
- void EmitAlignmentAssumption(llvm::Value *PtrValue, const Expr *E,
-- SourceLocation AssumptionLoc, unsigned Alignment,
-+ SourceLocation AssumptionLoc, llvm::Value *Alignment,
- llvm::Value *OffsetValue = nullptr);
-
- //===--------------------------------------------------------------------===//
-diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
-index 07d3648dc9ac..dca81d1d275f 100644
---- a/clang/lib/Sema/SemaChecking.cpp
-+++ b/clang/lib/Sema/SemaChecking.cpp
-@@ -6063,6 +6063,12 @@ bool Sema::SemaBuiltinAssumeAligned(CallExpr *TheCall) {
- if (!Result.isPowerOf2())
- return Diag(TheCall->getBeginLoc(), diag::err_alignment_not_power_of_two)
- << Arg->getSourceRange();
-+
-+ // Alignment calculations can wrap around if it's greater than 2**29.
-+ unsigned MaximumAlignment = 536870912;
-+ if (Result > MaximumAlignment)
-+ Diag(TheCall->getBeginLoc(), diag::warn_assume_aligned_too_great)
-+ << Arg->getSourceRange() << MaximumAlignment;
- }
-
- if (NumArgs > 2) {
-diff --git a/clang/test/CodeGen/builtin-assume-aligned.c b/clang/test/CodeGen/builtin-assume-aligned.c
-index 1d807a40cad4..f6a89a20ecfb 100644
---- a/clang/test/CodeGen/builtin-assume-aligned.c
-+++ b/clang/test/CodeGen/builtin-assume-aligned.c
-@@ -65,3 +65,12 @@ int test6() {
- // CHECK: call void @llvm.assume(i1 [[MASKCOND6]])
- }
-
-+// CHECK-LABEL: @pr43638
-+int pr43638(int *a) {
-+ a = __builtin_assume_aligned(a, 4294967296);
-+return a[0];
-+// CHECK: [[PTRINT7:%.+]] = ptrtoint
-+// CHECK: [[MASKEDPTR7:%.+]] = and i64 [[PTRINT7]], 536870911
-+// CHECK: [[MASKCOND7:%.+]] = icmp eq i64 [[MASKEDPTR7]], 0
-+// CHECK: call void @llvm.assume(i1 [[MASKCOND7]])
-+}
-diff --git a/clang/test/CodeGen/catch-alignment-assumption-builtin_assume_aligned-three-params-variable.cpp b/clang/test/CodeGen/catch-alignment-assumption-builtin_assume_aligned-three-params-variable.cpp
-index 4384b9ce7200..4306e322f5fb 100644
---- a/clang/test/CodeGen/catch-alignment-assumption-builtin_assume_aligned-three-params-variable.cpp
-+++ b/clang/test/CodeGen/catch-alignment-assumption-builtin_assume_aligned-three-params-variable.cpp
-@@ -18,13 +18,13 @@ void *caller(char **x, unsigned long offset) {
- // CHECK-NEXT: %[[OFFSET_RELOADED:.*]] = load i64, i64* %[[OFFSET_ADDR]], align 8
- // CHECK-NEXT: %[[PTRINT:.*]] = ptrtoint i8* %[[BITCAST]] to i64
- // CHECK-NEXT: %[[OFFSETPTR:.*]] = sub i64 %[[PTRINT]], %[[OFFSET_RELOADED]]
-- // CHECK-NEXT: %[[MASKEDPTR:.*]] = and i64 %[[OFFSETPTR]], 2147483647
-+ // CHECK-NEXT: %[[MASKEDPTR:.*]] = and i64 %[[OFFSETPTR]], 536870911
- // CHECK-NEXT: %[[MASKCOND:.*]] = icmp eq i64 %[[MASKEDPTR]], 0
- // CHECK-SANITIZE-NEXT: %[[PTRINT_DUP:.*]] = ptrtoint i8* %[[BITCAST]] to i64, !nosanitize
- // CHECK-SANITIZE-NEXT: br i1 %[[MASKCOND]], label %[[CONT:.*]], label %[[HANDLER_ALIGNMENT_ASSUMPTION:[^,]+]],{{.*}} !nosanitize
- // CHECK-SANITIZE: [[HANDLER_ALIGNMENT_ASSUMPTION]]:
-- // CHECK-SANITIZE-NORECOVER-NEXT: call void @__ubsan_handle_alignment_assumption_abort(i8* bitcast ({ {{{.*}}}, {{{.*}}}, {{{.*}}}* }* @[[LINE_100_ALIGNMENT_ASSUMPTION]] to i8*), i64 %[[PTRINT_DUP]], i64 2147483648, i64 %[[OFFSET_RELOADED]]){{.*}}, !nosanitize
-- // CHECK-SANITIZE-RECOVER-NEXT: call void @__ubsan_handle_alignment_assumption(i8* bitcast ({ {{{.*}}}, {{{.*}}}, {{{.*}}}* }* @[[LINE_100_ALIGNMENT_ASSUMPTION]] to i8*), i64 %[[PTRINT_DUP]], i64 2147483648, i64 %[[OFFSET_RELOADED]]){{.*}}, !nosanitize
-+ // CHECK-SANITIZE-NORECOVER-NEXT: call void @__ubsan_handle_alignment_assumption_abort(i8* bitcast ({ {{{.*}}}, {{{.*}}}, {{{.*}}}* }* @[[LINE_100_ALIGNMENT_ASSUMPTION]] to i8*), i64 %[[PTRINT_DUP]], i64 536870912, i64 %[[OFFSET_RELOADED]]){{.*}}, !nosanitize
-+ // CHECK-SANITIZE-RECOVER-NEXT: call void @__ubsan_handle_alignment_assumption(i8* bitcast ({ {{{.*}}}, {{{.*}}}, {{{.*}}}* }* @[[LINE_100_ALIGNMENT_ASSUMPTION]] to i8*), i64 %[[PTRINT_DUP]], i64 536870912, i64 %[[OFFSET_RELOADED]]){{.*}}, !nosanitize
- // CHECK-SANITIZE-TRAP-NEXT: call void @llvm.trap(){{.*}}, !nosanitize
- // CHECK-SANITIZE-UNREACHABLE-NEXT: unreachable, !nosanitize
- // CHECK-SANITIZE: [[CONT]]:
-diff --git a/clang/test/CodeGen/catch-alignment-assumption-builtin_assume_aligned-three-params.cpp b/clang/test/CodeGen/catch-alignment-assumption-builtin_assume_aligned-three-params.cpp
-index 18a573429d9f..27f53e92bed8 100644
---- a/clang/test/CodeGen/catch-alignment-assumption-builtin_assume_aligned-three-params.cpp
-+++ b/clang/test/CodeGen/catch-alignment-assumption-builtin_assume_aligned-three-params.cpp
-@@ -15,13 +15,13 @@ void *caller(char **x) {
- // CHECK-NEXT: %[[BITCAST:.*]] = bitcast i8** %[[X_RELOADED]] to i8*
- // CHECK-NEXT: %[[PTRINT:.*]] = ptrtoint i8* %[[BITCAST]] to i64
- // CHECK-NEXT: %[[OFFSETPTR:.*]] = sub i64 %[[PTRINT]], 42
-- // CHECK-NEXT: %[[MASKEDPTR:.*]] = and i64 %[[OFFSETPTR]], 2147483647
-+ // CHECK-NEXT: %[[MASKEDPTR:.*]] = and i64 %[[OFFSETPTR]], 536870911
- // CHECK-NEXT: %[[MASKCOND:.*]] = icmp eq i64 %[[MASKEDPTR]], 0
- // CHECK-SANITIZE-NEXT: %[[PTRINT_DUP:.*]] = ptrtoint i8* %[[BITCAST]] to i64, !nosanitize
- // CHECK-SANITIZE-NEXT: br i1 %[[MASKCOND]], label %[[CONT:.*]], label %[[HANDLER_ALIGNMENT_ASSUMPTION:[^,]+]],{{.*}} !nosanitize
- // CHECK-SANITIZE: [[HANDLER_ALIGNMENT_ASSUMPTION]]:
-- // CHECK-SANITIZE-NORECOVER-NEXT: call void @__ubsan_handle_alignment_assumption_abort(i8* bitcast ({ {{{.*}}}, {{{.*}}}, {{{.*}}}* }* @[[LINE_100_ALIGNMENT_ASSUMPTION]] to i8*), i64 %[[PTRINT_DUP]], i64 2147483648, i64 42){{.*}}, !nosanitize
-- // CHECK-SANITIZE-RECOVER-NEXT: call void @__ubsan_handle_alignment_assumption(i8* bitcast ({ {{{.*}}}, {{{.*}}}, {{{.*}}}* }* @[[LINE_100_ALIGNMENT_ASSUMPTION]] to i8*), i64 %[[PTRINT_DUP]], i64 2147483648, i64 42){{.*}}, !nosanitize
-+ // CHECK-SANITIZE-NORECOVER-NEXT: call void @__ubsan_handle_alignment_assumption_abort(i8* bitcast ({ {{{.*}}}, {{{.*}}}, {{{.*}}}* }* @[[LINE_100_ALIGNMENT_ASSUMPTION]] to i8*), i64 %[[PTRINT_DUP]], i64 536870912, i64 42){{.*}}, !nosanitize
-+ // CHECK-SANITIZE-RECOVER-NEXT: call void @__ubsan_handle_alignment_assumption(i8* bitcast ({ {{{.*}}}, {{{.*}}}, {{{.*}}}* }* @[[LINE_100_ALIGNMENT_ASSUMPTION]] to i8*), i64 %[[PTRINT_DUP]], i64 536870912, i64 42){{.*}}, !nosanitize
- // CHECK-SANITIZE-TRAP-NEXT: call void @llvm.trap(){{.*}}, !nosanitize
- // CHECK-SANITIZE-UNREACHABLE-NEXT: unreachable, !nosanitize
- // CHECK-SANITIZE: [[CONT]]:
-diff --git a/clang/test/CodeGen/catch-alignment-assumption-builtin_assume_aligned-two-params.cpp b/clang/test/CodeGen/catch-alignment-assumption-builtin_assume_aligned-two-params.cpp
-index fe4384752ceb..5412270f3761 100644
---- a/clang/test/CodeGen/catch-alignment-assumption-builtin_assume_aligned-two-params.cpp
-+++ b/clang/test/CodeGen/catch-alignment-assumption-builtin_assume_aligned-two-params.cpp
-@@ -14,13 +14,13 @@ void *caller(char **x) {
- // CHECK-NEXT: %[[X_RELOADED:.*]] = load i8**, i8*** %[[X_ADDR]], align 8
- // CHECK-NEXT: %[[BITCAST:.*]] = bitcast i8** %[[X_RELOADED]] to i8*
- // CHECK-NEXT: %[[PTRINT:.*]] = ptrtoint i8* %[[BITCAST]] to i64
-- // CHECK-NEXT: %[[MASKEDPTR:.*]] = and i64 %[[PTRINT]], 2147483647
-+ // CHECK-NEXT: %[[MASKEDPTR:.*]] = and i64 %[[PTRINT]], 536870911
- // CHECK-NEXT: %[[MASKCOND:.*]] = icmp eq i64 %[[MASKEDPTR]], 0
- // CHECK-SANITIZE-NEXT: %[[PTRINT_DUP:.*]] = ptrtoint i8* %[[BITCAST]] to i64, !nosanitize
- // CHECK-SANITIZE-NEXT: br i1 %[[MASKCOND]], label %[[CONT:.*]], label %[[HANDLER_ALIGNMENT_ASSUMPTION:[^,]+]],{{.*}} !nosanitize
- // CHECK-SANITIZE: [[HANDLER_ALIGNMENT_ASSUMPTION]]:
-- // CHECK-SANITIZE-NORECOVER-NEXT: call void @__ubsan_handle_alignment_assumption_abort(i8* bitcast ({ {{{.*}}}, {{{.*}}}, {{{.*}}}* }* @[[LINE_100_ALIGNMENT_ASSUMPTION]] to i8*), i64 %[[PTRINT_DUP]], i64 2147483648, i64 0){{.*}}, !nosanitize
-- // CHECK-SANITIZE-RECOVER-NEXT: call void @__ubsan_handle_alignment_assumption(i8* bitcast ({ {{{.*}}}, {{{.*}}}, {{{.*}}}* }* @[[LINE_100_ALIGNMENT_ASSUMPTION]] to i8*), i64 %[[PTRINT_DUP]], i64 2147483648, i64 0){{.*}}, !nosanitize
-+ // CHECK-SANITIZE-NORECOVER-NEXT: call void @__ubsan_handle_alignment_assumption_abort(i8* bitcast ({ {{{.*}}}, {{{.*}}}, {{{.*}}}* }* @[[LINE_100_ALIGNMENT_ASSUMPTION]] to i8*), i64 %[[PTRINT_DUP]], i64 536870912, i64 0){{.*}}, !nosanitize
-+ // CHECK-SANITIZE-RECOVER-NEXT: call void @__ubsan_handle_alignment_assumption(i8* bitcast ({ {{{.*}}}, {{{.*}}}, {{{.*}}}* }* @[[LINE_100_ALIGNMENT_ASSUMPTION]] to i8*), i64 %[[PTRINT_DUP]], i64 536870912, i64 0){{.*}}, !nosanitize
- // CHECK-SANITIZE-TRAP-NEXT: call void @llvm.trap(){{.*}}, !nosanitize
- // CHECK-SANITIZE-UNREACHABLE-NEXT: unreachable, !nosanitize
- // CHECK-SANITIZE: [[CONT]]:
-diff --git a/clang/test/Sema/builtin-assume-aligned.c b/clang/test/Sema/builtin-assume-aligned.c
-index 057a500b321a..9411cb4e6389 100644
---- a/clang/test/Sema/builtin-assume-aligned.c
-+++ b/clang/test/Sema/builtin-assume-aligned.c
-@@ -58,3 +58,7 @@ void *test_no_fn_proto() __attribute__((assume_aligned)); // expected-error {{'a
- void *test_no_fn_proto() __attribute__((assume_aligned())); // expected-error {{'assume_aligned' attribute takes at least 1 argument}}
- void *test_no_fn_proto() __attribute__((assume_aligned(32, 45, 37))); // expected-error {{'assume_aligned' attribute takes no more than 2 arguments}}
-
-+int pr43638(int *a) {
-+ a = __builtin_assume_aligned(a, 4294967296); // expected-warning {{requested alignment must be 536870912 bytes or smaller; maximum alignment assumed}}
-+return a[0];
-+}
diff --git a/packages/dev-lang/elixir/elixir-1.11.0.exheres-0 b/packages/dev-lang/elixir/elixir-1.11.3.exheres-0
index d9de67612..d9de67612 100644
--- a/packages/dev-lang/elixir/elixir-1.11.0.exheres-0
+++ b/packages/dev-lang/elixir/elixir-1.11.3.exheres-0
diff --git a/packages/dev-lang/erlang/erlang-22.3.4.11.exheres-0 b/packages/dev-lang/erlang/erlang-22.3.4.14.exheres-0
index 286d4f1e0..286d4f1e0 100644
--- a/packages/dev-lang/erlang/erlang-22.3.4.11.exheres-0
+++ b/packages/dev-lang/erlang/erlang-22.3.4.14.exheres-0
diff --git a/packages/dev-lang/erlang/erlang-23.2.1.exheres-0 b/packages/dev-lang/erlang/erlang-23.2.1.exheres-0
new file mode 100644
index 000000000..286d4f1e0
--- /dev/null
+++ b/packages/dev-lang/erlang/erlang-23.2.1.exheres-0
@@ -0,0 +1,7 @@
+# Copyright 2012-2013 Quentin "Sardem FF7" Glidic <sardemff7@exherbo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+require erlang
+
+PLATFORMS="~amd64"
+
diff --git a/packages/dev-lang/go/go-1.14.12.exheres-0 b/packages/dev-lang/go/go-1.14.13.exheres-0
index 678a7b9b7..678a7b9b7 100644
--- a/packages/dev-lang/go/go-1.14.12.exheres-0
+++ b/packages/dev-lang/go/go-1.14.13.exheres-0
diff --git a/packages/dev-lang/go/go-1.15.5.exheres-0 b/packages/dev-lang/go/go-1.15.6.exheres-0
index 678a7b9b7..678a7b9b7 100644
--- a/packages/dev-lang/go/go-1.15.5.exheres-0
+++ b/packages/dev-lang/go/go-1.15.6.exheres-0
diff --git a/packages/dev-lang/llvm/llvm-11.0.0.exheres-0 b/packages/dev-lang/llvm/llvm-11.0.1.exheres-0
index 900f2b914..900f2b914 100644
--- a/packages/dev-lang/llvm/llvm-11.0.0.exheres-0
+++ b/packages/dev-lang/llvm/llvm-11.0.1.exheres-0
diff --git a/packages/dev-lang/llvm/llvm-9.0.1-r1.exheres-0 b/packages/dev-lang/llvm/llvm-9.0.1-r1.exheres-0
deleted file mode 100644
index a1689ac38..000000000
--- a/packages/dev-lang/llvm/llvm-9.0.1-r1.exheres-0
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2012 Elias Pipping <pipping@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require llvm
-
-PLATFORMS="~amd64 ~armv7"
-
-DEFAULT_SRC_PREPARE_PATCHES+=(
- "${FILES}"/${PN}-fix-buildtype-test.patch
- "${FILES}"/0001-Allow-CMAKE_BUILD_TYPE-None.patch
-)
-
-src_prepare() {
- llvm_src_prepare
-
- edo pushd "${CMAKE_SOURCE}"
- # Doesn't pass, upstream knows about it
- # https://reviews.llvm.org/D43113
- edo rm test/BugPoint/unsymbolized.ll
-
- edo rm test/CodeGen/AArch64/wineh4.mir
-
- edo popd
-}
-
diff --git a/packages/dev-lang/llvm/llvm.exlib b/packages/dev-lang/llvm/llvm.exlib
index 821c8ae25..b964c6763 100644
--- a/packages/dev-lang/llvm/llvm.exlib
+++ b/packages/dev-lang/llvm/llvm.exlib
@@ -74,19 +74,10 @@ CMAKE_SRC_CONFIGURE_PARAMS+=(
CMAKE_SRC_CONFIGURE_OPTIONS+=(
'libedit LLVM_ENABLE_LIBEDIT'
+ 'polly LLVM_TOOL_POLLY_BUILD'
'polly LLVM_POLLY_LINK_INTO_TOOLS'
)
-if ever at_least 10; then
- CMAKE_SRC_CONFIGURE_OPTIONS+=(
- 'polly LLVM_TOOL_POLLY_BUILD'
- )
-else
- CMAKE_SRC_CONFIGURE_OPTIONS+=(
- 'polly LLVM_POLLY_BUILD'
- )
-fi
-
CMAKE_SRC_CONFIGURE_TESTS=(
# Build tests in src_compile instead of src_test
'-DLLVM_BUILD_TESTS:BOOL=ON -DLLVM_BUILD_TESTS:BOOL=OFF'
diff --git a/packages/dev-lang/node/node-12.19.0.exheres-0 b/packages/dev-lang/node/node-12.20.1.exheres-0
index 85d8b940f..85d8b940f 100644
--- a/packages/dev-lang/node/node-12.19.0.exheres-0
+++ b/packages/dev-lang/node/node-12.20.1.exheres-0
diff --git a/packages/dev-lang/node/node-15.1.0.exheres-0 b/packages/dev-lang/node/node-15.5.1.exheres-0
index d49cecf71..d49cecf71 100644
--- a/packages/dev-lang/node/node-15.1.0.exheres-0
+++ b/packages/dev-lang/node/node-15.5.1.exheres-0
diff --git a/packages/dev-lang/node/node.exlib b/packages/dev-lang/node/node.exlib
index 8ee4d37e7..4107deedf 100644
--- a/packages/dev-lang/node/node.exlib
+++ b/packages/dev-lang/node/node.exlib
@@ -35,22 +35,23 @@ RESTRICT="test"
# providers:libressl? ( dev-libs/libressl )
# providers:openssl? ( dev-libs/openssl )
# TODO: shared ngtcp2 & nghttp3 for >= 15.0.0
+# TODO: >= 15.4.0 bundles currently masked icu 68.1
+# dev-libs/icu:=[>=68.1]
DEPENDENCIES="
build+run:
app-arch/brotli[>=1.0.9]
dev-libs/icu:=[>=67.1]
- dev-libs/libuv[>=1.39.0]
- net-dns/c-ares[>=1.16.0]
+ dev-libs/libuv[>=1.40.0]
+ net-dns/c-ares[>=1.16.1-r1]
net-libs/nghttp2[>=1.41.0]
sys-libs/zlib[>=1.2.11]
- !bundled-openssl? ( dev-libs/openssl[>=1.1.1g] )
+ !bundled-openssl? ( dev-libs/openssl[>=1.1.1i] )
"
-if ever at_least 15.0.0; then
+if ever at_least 15.5.0; then
DEPENDENCIES+="
build+run:
- dev-libs/libuv[>=1.40.0]
- net-dns/c-ares[>=1.16.1-r1]
+ net-dns/c-ares[>=1.17.1]
"
fi
diff --git a/packages/dev-lang/php/php-7.3.24.exheres-0 b/packages/dev-lang/php/php-7.3.26.exheres-0
index c5cb3c538..c5cb3c538 100644
--- a/packages/dev-lang/php/php-7.3.24.exheres-0
+++ b/packages/dev-lang/php/php-7.3.26.exheres-0
diff --git a/packages/dev-lang/php/php-7.4.12.exheres-0 b/packages/dev-lang/php/php-7.4.14.exheres-0
index c5cb3c538..c5cb3c538 100644
--- a/packages/dev-lang/php/php-7.4.12.exheres-0
+++ b/packages/dev-lang/php/php-7.4.14.exheres-0
diff --git a/packages/dev-lang/php/php-8.0.1.exheres-0 b/packages/dev-lang/php/php-8.0.1.exheres-0
new file mode 100644
index 000000000..c5cb3c538
--- /dev/null
+++ b/packages/dev-lang/php/php-8.0.1.exheres-0
@@ -0,0 +1,7 @@
+# Copyright 2013-2017 Wulf C. Krueger <philantrop@exherbo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+require php
+
+PLATFORMS="~amd64 ~armv7 ~armv8"
+
diff --git a/packages/dev-lang/php/php.exlib b/packages/dev-lang/php/php.exlib
index 6506ebedf..82d74a4ba 100644
--- a/packages/dev-lang/php/php.exlib
+++ b/packages/dev-lang/php/php.exlib
@@ -104,12 +104,12 @@ DEPENDENCIES="
build:
sys-devel/gettext
build+run:
- app-arch/libzip[>=0.11]
+ app-arch/libzip[>=1.7.0]
dev-libs/gmp:=[>=4.3.0]
dev-libs/icu:=[>=4.2.1]
dev-libs/oniguruma
apache? ( www-servers/apache[>=2.2.11] )
- php_extensions:curl? ( net-misc/curl[>=7.19.4] )
+ php_extensions:curl? ( net-misc/curl[>=7.29.0] )
php_extensions:berkdb? ( sys-libs/db:=[>=4.6.21] )
php_extensions:ftp? (
providers:libressl? ( dev-libs/libressl:= )
@@ -141,9 +141,9 @@ DEPENDENCIES="
php_extensions:pcre? ( dev-libs/pcre[>=7.9] )
php_extensions:pdo-dblib? ( dev-db/freetds[>=0.82] )
php_extensions:pdo-odbc? ( dev-db/unixODBC[>=2.2.14] )
- php_extensions:pdo-pgsql? ( dev-db/postgresql-client[>=8.3.7] )
+ php_extensions:pdo-pgsql? ( dev-db/postgresql-client[>=9.1] )
php_extensions:pdo-sqlite? ( dev-db/sqlite:3[>=3.5.9] )
- php_extensions:pgsql? ( dev-db/postgresql-client[>=8.3.7] )
+ php_extensions:pgsql? ( dev-db/postgresql-client[>=9.1] )
php_extensions:pspell? ( app-spell/aspell[>=0.50.0] )
php_extensions:readline? ( sys-libs/readline:=[>=5.2_p12] )
php_extensions:recode? ( app-text/recode:=[>=3.6] )
@@ -156,7 +156,7 @@ DEPENDENCIES="
)
php_extensions:tidy? ( app-text/tidy[>=5.1.47] )
php_extensions:unixodbc? ( dev-db/unixODBC[>=2.2.14] )
- php_extensions:xml? ( dev-libs/libxml2:2.0[>=2.7.2_p20081127] )
+ php_extensions:xml? ( dev-libs/libxml2:2.0[>=2.9.0] )
php_extensions:xsl? ( dev-libs/libxslt[>=1.1.0] )
"
@@ -213,7 +213,6 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
--enable-inifile
--enable-intl
--enable-ipv6
- --enable-json
--enable-mbstring
--enable-mbregex
--enable-mbregex-backtrack
@@ -344,6 +343,24 @@ DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
"php_extensions:xsl xsl"
)
+if ever at_least 8.0.1; then
+ DEFAULT_SRC_CONFIGURE_PARAMS+=(
+ --disable-memory-sanitizer
+ --disable-fpm-apparmor
+ --disable-fuzzer
+ --disable-fuzzer-msan
+ --disable-zts
+ --enable-opcache-jit
+ )
+ DEFAULT_SRC_CONFIGURE_OPTION_ENABLES+=(
+ "debug debug-assertions"
+ )
+else
+ DEFAULT_SRC_CONFIGURE_PARAMS+=(
+ --enable-json
+ )
+fi
+
if ever at_least 7.4.0; then
DEFAULT_SRC_CONFIGURE_PARAMS+=(
--with-zip
@@ -569,9 +586,9 @@ php_src_install() {
fi
# Set extension_dir path. Only replace the first occurence.
- linenum=$(edo grep -n "extension_dir" "${IMAGE}"/etc/php-${SLOT}/php.ini | head -1 | awk -F: '{ print $1}')
+ linenum=$(edo cat -n "${IMAGE}"/etc/php-${SLOT}/php.ini | sed -n "/extension_dir/{p;q}" | awk '{ print $1}')
extension_dir=$(edo "${IMAGE}"/usr/$(exhost --target)/bin/php-config-${SLOT} --extension-dir | sed -e 's/\//\\\//g')
- edo sed -i -e "${linenum},${linenum} s/; extension_dir = \".\/\"/extension_dir = \"${extension_dir}\"/" "${IMAGE}"/etc/php-${SLOT}/php.ini
+ edo sed -i -e "${linenum},${linenum} s/; ?extension_dir = \".\/\"/extension_dir = \"${extension_dir}\"/" "${IMAGE}"/etc/php-${SLOT}/php.ini
alternatives_for ${PN} ${SLOT} ${SLOT} "${alternatives[@]}"
}
diff --git a/packages/dev-lang/python/files/3.8/0001-bpo-42794-Update-test_nntplib-to-use-offical-group-n.patch b/packages/dev-lang/python/files/3.8/0001-bpo-42794-Update-test_nntplib-to-use-offical-group-n.patch
new file mode 100644
index 000000000..7ff697c45
--- /dev/null
+++ b/packages/dev-lang/python/files/3.8/0001-bpo-42794-Update-test_nntplib-to-use-offical-group-n.patch
@@ -0,0 +1,64 @@
+Upstream: Yes, backported
+
+From 2ca4c122b15f18dfd373bbdf526c6ea04502bae2 Mon Sep 17 00:00:00 2001
+From: "Miss Islington (bot)"
+ <31488909+miss-islington@users.noreply.github.com>
+Date: Fri, 1 Jan 2021 06:40:18 -0800
+Subject: [PATCH] bpo-42794: Update test_nntplib to use offical group name for
+ testing (GH-24037)
+
+(cherry picked from commit ec3165320e81ac87edcb85c86c452528ddbaec1c)
+
+Co-authored-by: Dong-hee Na <donghee.na@python.org>
+---
+ Lib/test/test_nntplib.py | 10 +++++++---
+ .../Tests/2021-01-01-08-52-36.bpo-42794.-7-XGz.rst | 2 ++
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+ create mode 100644 Misc/NEWS.d/next/Tests/2021-01-01-08-52-36.bpo-42794.-7-XGz.rst
+
+diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
+index fbd7db03de..89a2004dfb 100644
+--- a/Lib/test/test_nntplib.py
++++ b/Lib/test/test_nntplib.py
+@@ -82,7 +82,7 @@ class NetworkedNNTPTestsMixin:
+ desc = self.server.description(self.GROUP_NAME)
+ _check_desc(desc)
+ # Another sanity check
+- self.assertIn("Python", desc)
++ self.assertIn(self.DESC, desc)
+ # With a pattern
+ desc = self.server.description(self.GROUP_PAT)
+ _check_desc(desc)
+@@ -299,6 +299,7 @@ class NetworkedNNTPTests(NetworkedNNTPTestsMixin, unittest.TestCase):
+ NNTP_HOST = 'news.trigofacile.com'
+ GROUP_NAME = 'fr.comp.lang.python'
+ GROUP_PAT = 'fr.comp.lang.*'
++ DESC = 'Python'
+
+ NNTP_CLASS = NNTP
+
+@@ -332,8 +333,11 @@ class NetworkedNNTP_SSLTests(NetworkedNNTPTests):
+ # 400 connections per day are accepted from each IP address."
+
+ NNTP_HOST = 'nntp.aioe.org'
+- GROUP_NAME = 'comp.lang.python'
+- GROUP_PAT = 'comp.lang.*'
++ # bpo-42794: aioe.test is one of the official groups on this server
++ # used for testing: https://news.aioe.org/manual/aioe-hierarchy/
++ GROUP_NAME = 'aioe.test'
++ GROUP_PAT = 'aioe.*'
++ DESC = 'test'
+
+ NNTP_CLASS = getattr(nntplib, 'NNTP_SSL', None)
+
+diff --git a/Misc/NEWS.d/next/Tests/2021-01-01-08-52-36.bpo-42794.-7-XGz.rst b/Misc/NEWS.d/next/Tests/2021-01-01-08-52-36.bpo-42794.-7-XGz.rst
+new file mode 100644
+index 0000000000..577f2259e1
+--- /dev/null
++++ b/Misc/NEWS.d/next/Tests/2021-01-01-08-52-36.bpo-42794.-7-XGz.rst
+@@ -0,0 +1,2 @@
++Update test_nntplib to use offical group name of news.aioe.org for testing.
++Patch by Dong-hee Na.
+--
+2.30.0
+
diff --git a/packages/dev-lang/python/python-3.8.6.exheres-0 b/packages/dev-lang/python/python-3.8.7.exheres-0
index 166270d13..166270d13 100644
--- a/packages/dev-lang/python/python-3.8.6.exheres-0
+++ b/packages/dev-lang/python/python-3.8.7.exheres-0
diff --git a/packages/dev-lang/python/python-3.9.0.exheres-0 b/packages/dev-lang/python/python-3.9.1.exheres-0
index c9d1fad8d..c9d1fad8d 100644
--- a/packages/dev-lang/python/python-3.9.0.exheres-0
+++ b/packages/dev-lang/python/python-3.9.1.exheres-0
diff --git a/packages/dev-libs/boost/boost-1.72.0-r1.exheres-0 b/packages/dev-libs/boost/boost-1.72.0-r1.exheres-0
deleted file mode 100644
index ef2bea56a..000000000
--- a/packages/dev-libs/boost/boost-1.72.0-r1.exheres-0
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2008, 2009, 2010, 2012, 2016 Ingmar Vanhassel <ingmar@exherbo.org>
-# Copyright 2013 Wouter van Kesteren <woutershep@gmail.com>
-# Copyright 2013 Wulf C. Krueger <philantrop@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require boost
-
-PLATFORMS="~amd64 ~armv8 ~x86"
-
diff --git a/packages/dev-libs/boost/boost-1.71.0-r2.exheres-0 b/packages/dev-libs/boost/boost-1.75.0.exheres-0
index ef2bea56a..ef2bea56a 100644
--- a/packages/dev-libs/boost/boost-1.71.0-r2.exheres-0
+++ b/packages/dev-libs/boost/boost-1.75.0.exheres-0
diff --git a/packages/dev-libs/botan/botan-2.17.2.exheres-0 b/packages/dev-libs/botan/botan-2.17.3.exheres-0
index ac3d96fd0..ac3d96fd0 100644
--- a/packages/dev-libs/botan/botan-2.17.2.exheres-0
+++ b/packages/dev-libs/botan/botan-2.17.3.exheres-0
diff --git a/packages/dev-libs/botan/botan.exlib b/packages/dev-libs/botan/botan.exlib
index 2a8804f77..ba6126fc2 100644
--- a/packages/dev-libs/botan/botan.exlib
+++ b/packages/dev-libs/botan/botan.exlib
@@ -40,7 +40,7 @@ DEPENDENCIES="
sys-libs/zlib
boost? ( dev-libs/boost )
providers:libressl? ( dev-libs/libressl:= )
- providers:openssl? ( dev-libs/openssl )
+ providers:openssl? ( dev-libs/openssl:= )
sqlite? ( dev-db/sqlite:3 )
run:
!dev-libs/botan:2[<2.14.0-r1] [[
diff --git a/packages/dev-libs/cjson/cjson-1.7.14.exheres-0 b/packages/dev-libs/cjson/cjson-1.7.14.exheres-0
new file mode 100644
index 000000000..a450246c3
--- /dev/null
+++ b/packages/dev-libs/cjson/cjson-1.7.14.exheres-0
@@ -0,0 +1,32 @@
+# Copyright 2020 Timo Gurr <tgurr@exherbo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+require github [ user=DaveGamble project=cJSON tag=v${PV} ] cmake
+
+SUMMARY="Ultralightweight JSON parser in ANSI C"
+
+LICENCES="MIT"
+SLOT="0"
+PLATFORMS="~amd64"
+MYOPTIONS=""
+
+DEPENDENCIES=""
+
+CMAKE_SRC_CONFIGURE_PARAMS=(
+ -DBUILD_SHARED_LIBS:BOOL=TRUE
+ -DENABLE_CJSON_UTILS:BOOL=FALSE
+ -DENABLE_CUSTOM_COMPILER_FLAGS:BOOL=TRUE
+ -DENABLE_FUZZING:BOOL=FALSE
+ -DENABLE_HIDDEN_SYMBOLS:BOOL=FALSE
+ -DENABLE_LOCALES:BOOL=TRUE
+ -DENABLE_PUBLIC_SYMBOLS:BOOL=TRUE
+ -DENABLE_SAFE_STACK:BOOL=FALSE
+ -DENABLE_SANITIZERS:BOOL=FALSE
+ -DENABLE_TARGET_EXPORT:BOOL=TRUE
+ -DENABLE_VALGRIND:BOOL=FALSE
+)
+
+CMAKE_SRC_CONFIGURE_TESTS=(
+ '-DENABLE_CJSON_TEST:BOOL=TRUE -DENABLE_CJSON_TEST:BOOL=FALSE'
+)
+
diff --git a/packages/dev-libs/compiler-rt/compiler-rt-11.0.0.exheres-0 b/packages/dev-libs/compiler-rt/compiler-rt-11.0.1.exheres-0
index e6c40fa94..e6c40fa94 100644
--- a/packages/dev-libs/compiler-rt/compiler-rt-11.0.0.exheres-0
+++ b/packages/dev-libs/compiler-rt/compiler-rt-11.0.1.exheres-0
diff --git a/packages/dev-libs/compiler-rt/compiler-rt-9.0.1-r2.exheres-0 b/packages/dev-libs/compiler-rt/compiler-rt-9.0.1-r2.exheres-0
deleted file mode 100644
index 34788a4d4..000000000
--- a/packages/dev-libs/compiler-rt/compiler-rt-9.0.1-r2.exheres-0
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2015 Niels Ole Salscheider <niels_ole@salscheider-online.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require compiler-rt
-
-PLATFORMS="~amd64 ~x86"
-
-DEFAULT_SRC_PREPARE_PATCHES=(
- -p2 "${FILES}"/0001-compiler-rt-use-correct-builtins-library-when-linkin.patch
- -p2 "${FILES}"/9e8b011195a3602dff7193f71527697b121fb551.patch
- -p2 "${FILES}"/38c356176b5370164578c1d08e984964354b7189.patch
- -p2 "${FILES}"/0001-compiler-rt-Backport-patch-to-fix-build-error-with-g.patch
-)
-
diff --git a/packages/dev-libs/compiler-rt/files/0001-compiler-rt-Backport-patch-to-fix-build-error-with-g.patch b/packages/dev-libs/compiler-rt/files/0001-compiler-rt-Backport-patch-to-fix-build-error-with-g.patch
deleted file mode 100644
index 8f6cd280e..000000000
--- a/packages/dev-libs/compiler-rt/files/0001-compiler-rt-Backport-patch-to-fix-build-error-with-g.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 55d58812fd5dbdd96e84947d55e3c0f3de833e32 Mon Sep 17 00:00:00 2001
-From: Marvin Schmidt <marv@exherbo.org>
-Date: Sat, 14 Mar 2020 08:38:33 +0100
-Subject: [PATCH] compiler-rt: Backport patch to fix build error with
- glibc-2.31
-
-Manual backport of 947f9692440836dcb8d88b74b69dd379d85974ce which
-doesn't apply easily to release/9.x
----
- .../sanitizer_platform_limits_posix.h | 15 +--------------
- 1 file changed, 1 insertion(+), 14 deletions(-)
-
-diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
-index f1a4fd7d370..029a209fc03 100644
---- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
-+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
-@@ -203,26 +203,13 @@ namespace __sanitizer {
- u64 __unused1;
- u64 __unused2;
- #elif defined(__sparc__)
--#if defined(__arch64__)
- unsigned mode;
-- unsigned short __pad1;
--#else
-- unsigned short __pad1;
-- unsigned short mode;
- unsigned short __pad2;
--#endif
- unsigned short __seq;
- unsigned long long __unused1;
- unsigned long long __unused2;
--#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__)
-- unsigned int mode;
-- unsigned short __seq;
-- unsigned short __pad1;
-- unsigned long __unused1;
-- unsigned long __unused2;
- #else
-- unsigned short mode;
-- unsigned short __pad1;
-+ unsigned int mode;
- unsigned short __seq;
- unsigned short __pad2;
- #if defined(__x86_64__) && !defined(_LP64)
---
-2.25.1
-
diff --git a/packages/dev-libs/compiler-rt/files/38c356176b5370164578c1d08e984964354b7189.patch b/packages/dev-libs/compiler-rt/files/38c356176b5370164578c1d08e984964354b7189.patch
deleted file mode 100644
index 24fe7fe8d..000000000
--- a/packages/dev-libs/compiler-rt/files/38c356176b5370164578c1d08e984964354b7189.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 38c356176b5370164578c1d08e984964354b7189 Mon Sep 17 00:00:00 2001
-From: Sterling Augustine <saugustine@google.com>
-Date: Fri, 8 Nov 2019 15:51:35 -0800
-Subject: [PATCH] Fix include guard and properly order __deregister_frame_info.
-
-Summary:
-This patch fixes two problems with the crtbegin.c as written:
-
-1. In do_init, register_frame_info is not guarded by a #define, but in
-do_fini, deregister_frame_info is guarded by #ifndef
-CRT_HAS_INITFINI_ARRAY. Thus when CRT_HAS_INITFINI_ARRAY is not
-defined, frames are registered but then never deregistered.
-
-The frame registry mechanism builds a linked-list from the .so's
-static variable do_init.object, and when the .so is unloaded, this
-memory becomes invalid and should be deregistered.
-
-Further, libgcc's crtbegin treats the frame registry as independent
-from the initfini array mechanism.
-
-This patch fixes this by adding a new #define,
-"EH_USE_FRAME_INFO_REGISTRY", which is set by the cmake option
-COMPILER_RT_CRT_USE_EH_FRAME_REGISTRY Currently, do_init calls
-register_frame_info, and then calls the binary's constructors. This
-allows constructors to safely use libunwind. However, do_fini calls
-deregister_frame_info and then calls the binary's destructors. This
-prevents destructors from safely using libunwind.
-
-This patch also switches that ordering, so that destructors can safely
-use libunwind. As it happens, this is a fairly common scenario for
-thread sanitizer.
----
- compiler-rt/CMakeLists.txt | 2 ++
- compiler-rt/lib/crt/CMakeLists.txt | 1 +
- compiler-rt/lib/crt/crtbegin.c | 12 ++++++++----
- compiler-rt/test/crt/ctor_dtor.c | 16 +++++++++++++++-
- 4 files changed, 26 insertions(+), 5 deletions(-)
-
-diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
-index f8925ab2d76c..8d768a404f21 100644
---- a/compiler-rt/CMakeLists.txt
-+++ b/compiler-rt/CMakeLists.txt
-@@ -35,6 +35,8 @@ option(COMPILER_RT_BUILD_BUILTINS "Build builtins" ON)
- mark_as_advanced(COMPILER_RT_BUILD_BUILTINS)
- option(COMPILER_RT_BUILD_CRT "Build crtbegin.o/crtend.o" ON)
- mark_as_advanced(COMPILER_RT_BUILD_CRT)
-+option(COMPILER_RT_CRT_USE_EH_FRAME_REGISTRY "Use eh_frame in crtbegin.o/crtend.o" ON)
-+mark_as_advanced(COMPILER_RT_CRT_USE_EH_FRAME_REGISTRY)
- option(COMPILER_RT_BUILD_SANITIZERS "Build sanitizers" ON)
- mark_as_advanced(COMPILER_RT_BUILD_SANITIZERS)
- option(COMPILER_RT_BUILD_XRAY "Build xray" ON)
-diff --git a/compiler-rt/lib/crt/CMakeLists.txt b/compiler-rt/lib/crt/CMakeLists.txt
-index 90e94b93db47..1ed04827925a 100644
---- a/compiler-rt/lib/crt/CMakeLists.txt
-+++ b/compiler-rt/lib/crt/CMakeLists.txt
-@@ -74,6 +74,7 @@ check_cxx_section_exists(".init_array" COMPILER_RT_HAS_INITFINI_ARRAY
-
- append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 CRT_CFLAGS)
- append_list_if(COMPILER_RT_HAS_INITFINI_ARRAY -DCRT_HAS_INITFINI_ARRAY CRT_CFLAGS)
-+append_list_if(COMPILER_RT_CRT_USE_EH_FRAME_REGISTRY -DEH_USE_FRAME_REGISTRY CRT_CFLAGS)
- append_list_if(COMPILER_RT_HAS_FPIC_FLAG -fPIC CRT_CFLAGS)
- append_list_if(COMPILER_RT_HAS_WNO_PEDANTIC -Wno-pedantic CRT_CFLAGS)
-
-diff --git a/compiler-rt/lib/crt/crtbegin.c b/compiler-rt/lib/crt/crtbegin.c
-index 2450ce54e31b..5b56ea3df757 100644
---- a/compiler-rt/lib/crt/crtbegin.c
-+++ b/compiler-rt/lib/crt/crtbegin.c
-@@ -10,11 +10,13 @@
-
- __attribute__((visibility("hidden"))) void *__dso_handle = &__dso_handle;
-
-+#ifdef EH_USE_FRAME_REGISTRY
- __extension__ static void *__EH_FRAME_LIST__[]
- __attribute__((section(".eh_frame"), aligned(sizeof(void *)))) = {};
-
- extern void __register_frame_info(const void *, void *) __attribute__((weak));
- extern void *__deregister_frame_info(const void *) __attribute__((weak));
-+#endif
-
- #ifndef CRT_HAS_INITFINI_ARRAY
- typedef void (*fp)(void);
-@@ -32,10 +34,11 @@ static void __attribute__((used)) __do_init() {
- return;
- __initialized = 1;
-
-+#ifdef EH_USE_FRAME_REGISTRY
- static struct { void *p[8]; } __object;
- if (__register_frame_info)
- __register_frame_info(__EH_FRAME_LIST__, &__object);
--
-+#endif
- #ifndef CRT_HAS_INITFINI_ARRAY
- const size_t n = __CTOR_LIST_END__ - __CTOR_LIST__ - 1;
- for (size_t i = n; i >= 1; i--) __CTOR_LIST__[i]();
-@@ -73,12 +76,13 @@ static void __attribute__((used)) __do_fini() {
- __cxa_finalize(__dso_handle);
-
- #ifndef CRT_HAS_INITFINI_ARRAY
-- if (__deregister_frame_info)
-- __deregister_frame_info(__EH_FRAME_LIST__);
--
- const size_t n = __DTOR_LIST_END__ - __DTOR_LIST__ - 1;
- for (size_t i = 1; i <= n; i++) __DTOR_LIST__[i]();
- #endif
-+#ifdef EH_USE_FRAME_REGISTRY
-+ if (__deregister_frame_info)
-+ __deregister_frame_info(__EH_FRAME_LIST__);
-+#endif
- }
-
- #ifdef CRT_HAS_INITFINI_ARRAY
-diff --git a/compiler-rt/test/crt/ctor_dtor.c b/compiler-rt/test/crt/ctor_dtor.c
-index 64f188333195..69848a01c7ca 100644
---- a/compiler-rt/test/crt/ctor_dtor.c
-+++ b/compiler-rt/test/crt/ctor_dtor.c
-@@ -4,9 +4,23 @@
-
- #include <stdio.h>
-
--// CHECK: ctor()
-+// Ensure the various startup functions are called in the proper order.
-+
-+// CHECK: __register_frame_info()
-+// CHECK-NEXT: ctor()
- // CHECK-NEXT: main()
- // CHECK-NEXT: dtor()
-+// CHECK-NEXT: __deregister_frame_info()
-+
-+struct object;
-+
-+void __register_frame_info(const void *fi, struct object *obj) {
-+ printf("__register_frame_info()\n");
-+}
-+
-+void __deregister_frame_info(const void *fi) {
-+ printf("__deregister_frame_info()\n");
-+}
-
- void __attribute__((constructor)) ctor() {
- printf("ctor()\n");
diff --git a/packages/dev-libs/compiler-rt/files/9e8b011195a3602dff7193f71527697b121fb551.patch b/packages/dev-libs/compiler-rt/files/9e8b011195a3602dff7193f71527697b121fb551.patch
deleted file mode 100644
index f0bc591c4..000000000
--- a/packages/dev-libs/compiler-rt/files/9e8b011195a3602dff7193f71527697b121fb551.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9e8b011195a3602dff7193f71527697b121fb551 Mon Sep 17 00:00:00 2001
-From: Hans Wennborg <hans@hanshq.net>
-Date: Tue, 20 Aug 2019 07:41:14 +0000
-Subject: [PATCH] [compiler-rt][crt] Pass -fno-lto in check_cxx_section_exists
-
-Otherwise it doesn't work when building with -DLLVM_ENABLE_LTO=thin
-
-(We hit this in Chromium in
-https://bugs.chromium.org/p/chromium/issues/detail?id=966403)
-
-llvm-svn: 369336
----
- compiler-rt/lib/crt/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/compiler-rt/lib/crt/CMakeLists.txt b/compiler-rt/lib/crt/CMakeLists.txt
-index 03a07f475d7e..34c368f7ca44 100644
---- a/compiler-rt/lib/crt/CMakeLists.txt
-+++ b/compiler-rt/lib/crt/CMakeLists.txt
-@@ -19,6 +19,7 @@ function(check_cxx_section_exists section output)
- if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET)
- list(APPEND try_compile_flags "-target ${CMAKE_C_COMPILER_TARGET}")
- endif()
-+ append_list_if(COMPILER_RT_HAS_FNO_LTO_FLAG -fno-lto try_compile_flags)
-
- string(REPLACE ";" " " extra_flags "${try_compile_flags}")
-
diff --git a/packages/dev-libs/fmt/fmt-7.0.1.exheres-0 b/packages/dev-libs/fmt/fmt-7.1.3.exheres-0
index 7f48a0679..7f48a0679 100644
--- a/packages/dev-libs/fmt/fmt-7.0.1.exheres-0
+++ b/packages/dev-libs/fmt/fmt-7.1.3.exheres-0
diff --git a/packages/dev-libs/glib/glib-2.66.1.exheres-0 b/packages/dev-libs/glib/glib-2.66.4.exheres-0
index 703c1c808..703c1c808 100644
--- a/packages/dev-libs/glib/glib-2.66.1.exheres-0
+++ b/packages/dev-libs/glib/glib-2.66.4.exheres-0
diff --git a/packages/dev-libs/icu/files/icu-68.2-ICU-21366-testConverter-allow-some-double-precision-.patch b/packages/dev-libs/icu/files/icu-68.2-ICU-21366-testConverter-allow-some-double-precision-.patch
new file mode 100644
index 000000000..03fda2636
--- /dev/null
+++ b/packages/dev-libs/icu/files/icu-68.2-ICU-21366-testConverter-allow-some-double-precision-.patch
@@ -0,0 +1,36 @@
+Upstream: yes, cherrry-picked from master, will be in 69.1
+Reason: Fixes a test
+
+From bbd1d25810bc134e97bc54c7d850e380d7f509c6 Mon Sep 17 00:00:00 2001
+From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com>
+Date: Fri, 6 Nov 2020 17:55:21 +0000
+Subject: [PATCH] ICU-21366 testConverter: allow some double-precision error
+ for 0.0
+
+See #1443
+---
+ icu4c/source/test/intltest/units_test.cpp | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/icu4c/source/test/intltest/units_test.cpp b/icu4c/source/test/intltest/units_test.cpp
+index a853dd79a8..098efb8921 100644
+--- a/icu4c/source/test/intltest/units_test.cpp
++++ b/icu4c/source/test/intltest/units_test.cpp
+@@ -252,9 +252,12 @@ void UnitsTest::testTemperature() {
+ ConversionRates conversionRates(status);
+ UnitConverter converter(source, target, conversionRates, status);
+
++ double maxDelta = 1e-6 * uprv_fabs(testCase.expectedValue);
++ if (testCase.expectedValue == 0) {
++ maxDelta = 1e-12;
++ }
+ assertEqualsNear(UnicodeString("testTemperature: ") + testCase.source + " to " + testCase.target,
+- testCase.expectedValue, converter.convert(testCase.inputValue),
+- 0.0001 * uprv_fabs(testCase.expectedValue));
++ testCase.expectedValue, converter.convert(testCase.inputValue), maxDelta);
+ }
+ }
+
+--
+2.30.0.rc0
+
diff --git a/packages/dev-libs/icu/icu-68.1.exheres-0 b/packages/dev-libs/icu/icu-68.2.exheres-0
index b5f64dff1..322ccea1c 100644
--- a/packages/dev-libs/icu/icu-68.1.exheres-0
+++ b/packages/dev-libs/icu/icu-68.2.exheres-0
@@ -5,3 +5,7 @@ require icu
PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
+DEFAULT_SRC_PREPARE_PATCHES+=(
+ -p3 "${FILES}"/${PNV}-ICU-21366-testConverter-allow-some-double-precision-.patch
+)
+
diff --git a/packages/dev-libs/icu/icu.exlib b/packages/dev-libs/icu/icu.exlib
index 2978ac61b..658a041c7 100644
--- a/packages/dev-libs/icu/icu.exlib
+++ b/packages/dev-libs/icu/icu.exlib
@@ -38,11 +38,6 @@ icu_src_prepare() {
# Used in Makefile
edo unset TARGET
-
- # Skip failing test (https://unicode-org.atlassian.net/browse/ICU-21366)
- ever at_least 68.1 \
- && edo sed -e "/TESTCASE_AUTO(testConverter);/d" \
- -i test/intltest/units_test.cpp
}
icu_src_configure() {
diff --git a/packages/dev-libs/inih/inih-52.exheres-0 b/packages/dev-libs/inih/inih-52.exheres-0
new file mode 100644
index 000000000..8daa05e8b
--- /dev/null
+++ b/packages/dev-libs/inih/inih-52.exheres-0
@@ -0,0 +1,33 @@
+# Copyright 2020 Timo Gurr <tgurr@exherbo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+require github [ user=benhoyt tag="r${PV}" ] \
+ meson
+
+SUMMARY="Simple .INI file parser written in C"
+
+LICENCES="BSD-3"
+SLOT="0"
+PLATFORMS="~amd64"
+MYOPTIONS=""
+
+DEPENDENCIES=""
+
+MESON_SRC_CONFIGURE_PARAMS=(
+ -Dallow_no_value=false
+ -Dallow_realloc=false
+ -Dcall_handler_on_new_section=false
+ -Ddistro_install=true
+ -Dinitial_malloc_size=200
+ -Dinline_comments=true
+ -Dinline_comment_prefix=";"
+ -Dmax_line_length=200
+ -Dmulti-line_entries=true
+ -Dreport_line_numbers=false
+ -Dstart-of-line_comment_prefix=";#"
+ -Dstop_on_first_error=false
+ -Duse_heap=false
+ -Dutf-8_bom=true
+ -Dwith_INIReader=true
+)
+
diff --git a/packages/dev-libs/isl/isl-0.23.exheres-0 b/packages/dev-libs/isl/isl-0.23.exheres-0
new file mode 100644
index 000000000..8ad80fc13
--- /dev/null
+++ b/packages/dev-libs/isl/isl-0.23.exheres-0
@@ -0,0 +1,28 @@
+# Copyright 2012 Paul Seidler <sepek@exherbo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+require isl autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
+require flag-o-matic
+
+LICENCES="MIT"
+# Change the SLOT for a version bump if it breaks ABI
+SLOT="0.23"
+PLATFORMS="~amd64 ~armv8 ~x86"
+MYOPTIONS=""
+
+# automagic for the docs: perl, pdflatex, pod2html
+DEPENDENCIES="
+ build+run:
+ dev-libs/gmp:=[>=4.0]
+"
+
+DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/${PN}-0.22-gdb.patch )
+
+DEFAULT_SRC_CONFIGURE_PARAMS=(
+ CC_FOR_BUILD=$(exhost --build)-cc
+ CFLAGS_FOR_BUILD=$(print-build-flags CFLAGS)
+ --with-gmp=system
+ --with-int=gmp
+ --without-clang
+)
+
diff --git a/packages/dev-libs/json/json-3.9.1.exheres-0 b/packages/dev-libs/json/json-3.9.1-r1.exheres-0
index 6d60356db..85fe894a2 100644
--- a/packages/dev-libs/json/json-3.9.1.exheres-0
+++ b/packages/dev-libs/json/json-3.9.1-r1.exheres-0
@@ -16,7 +16,7 @@ DEPENDENCIES=""
CMAKE_SRC_CONFIGURE_PARAMS=(
-DCMAKE_BUILD_TYPE:STRING=Release
- -DJSON_MultipleHeaders:BOOL=FALSE
+ -DJSON_MultipleHeaders:BOOL=TRUE
-DJSON_Install:BOOL=TRUE
-DJSON_TestDataDirectory:PATH="${WORKBASE}"/${PN}_test_data-${_TEST_DATA_VER}
)
diff --git a/packages/dev-libs/libfido2/libfido2-1.5.0.exheres-0 b/packages/dev-libs/libfido2/libfido2-1.6.0.exheres-0
index f8c35eb0f..3bb3cc543 100644
--- a/packages/dev-libs/libfido2/libfido2-1.5.0.exheres-0
+++ b/packages/dev-libs/libfido2/libfido2-1.6.0.exheres-0
@@ -26,7 +26,7 @@ DEPENDENCIES="
dev-libs/libcbor
providers:eudev? ( sys-apps/eudev )
providers:libressl? ( dev-libs/libressl:= )
- providers:openssl? ( dev-libs/openssl )
+ providers:openssl? ( dev-libs/openssl:= )
providers:systemd? ( sys-apps/systemd )
!dev-libs/libu2f-host[<1.1.10-r1] [[
description = [ libfido2 now provides the udev rules ]
@@ -36,9 +36,18 @@ DEPENDENCIES="
src_configure() {
local cmake_params=(
+ $(cmake_build doc MANPAGES)
+ $(option doc -DMANDOC_PATH:PATH=/usr/$(exhost --target)/bin/mandoc)
+ # examples build fails (last checked 1.6.0)
+ -DBUILD_EXAMPLES:BOOL=FALSE
+ -DBUILD_SHARED_LIBS:BOOL=TRUE
+ -DBUILD_STATIC_LIBS:BOOL=FALSE
+ -DBUILD_TOOLS:BOOL=TRUE
+ -DFUZZ:BOOL=OFF
+ -DLIBFUZZER:BOOL=OFF
+ -DUSE_HIDAPI:BOOL=OFF
-DCMAKE_INSTALL_DOCDIR:PATH=/usr/share/doc/${PNVR}
-DUDEV_RULES_DIR:PATH=${UDEVRULESDIR}
- $(option doc -DMANDOC_PATH:PATH=/usr/$(exhost --target)/bin/mandoc -DMANDOC_PATH:PATH=FALSE)
)
if option libc:musl; then
diff --git a/packages/dev-libs/libgpg-error/libgpg-error-1.39.exheres-0 b/packages/dev-libs/libgpg-error/libgpg-error-1.41.exheres-0
index cee56e4eb..cee56e4eb 100644
--- a/packages/dev-libs/libgpg-error/libgpg-error-1.39.exheres-0
+++ b/packages/dev-libs/libgpg-error/libgpg-error-1.41.exheres-0
diff --git a/packages/dev-libs/libpcap/files/libpcap-1.10.0-usbmon.patch b/packages/dev-libs/libpcap/files/libpcap-1.10.0-usbmon.patch
new file mode 100644
index 000000000..2009a8851
--- /dev/null
+++ b/packages/dev-libs/libpcap/files/libpcap-1.10.0-usbmon.patch
@@ -0,0 +1,18 @@
+Upstream: Unknown
+Source: Gentoo, https://gitweb.gentoo.org/repo/gentoo.git/tree/net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch
+Reason: The USB monitor name should not depend on build host environment
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -2225,10 +2225,7 @@
+ AC_DEFINE(PCAP_SUPPORT_LINUX_USBMON, 1, [target host supports Linux usbmon for USB sniffing])
+ MODULE_C_SRC="$MODULE_C_SRC pcap-usb-linux.c"
+ AC_MSG_RESULT(yes)
+- ac_usb_dev_name=`udevinfo -q name -p /sys/class/usb_device/usbmon 2>/dev/null`
+- if test $? -ne 0 ; then
+- ac_usb_dev_name="usbmon"
+- fi
++ ac_usb_dev_name="usbmon"
+ AC_DEFINE_UNQUOTED(LINUX_USB_MON_DEV, "/dev/$ac_usb_dev_name", [path for device for USB sniffing])
+ AC_MSG_NOTICE(Device for USB sniffing is /dev/$ac_usb_dev_name)
+ #
diff --git a/packages/dev-libs/libpcap/files/libpcap-1.8.1-pkg-config.patch b/packages/dev-libs/libpcap/files/libpcap-1.8.1-pkg-config.patch
deleted file mode 100644
index dca907494..000000000
--- a/packages/dev-libs/libpcap/files/libpcap-1.8.1-pkg-config.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Upstream: submitted
-Source: https://github.com/the-tcpdump-group/libpcap/pull/488
-
-From 873789e0435f4c840c9232fe3e8e22f29cd0bba2 Mon Sep 17 00:00:00 2001
-From: Kylie McClain <somasis@exherbo.org>
-Date: Mon, 11 Apr 2016 21:24:04 -0400
-Subject: [PATCH] configure.in: Use PKG_PROG_PKG_CONFIG for getting the right
- pkg-config
-
-pkg-config provides a macro that comes with the distribution, and it
-provides PKG_PROG_PKG_CONFIG, which should be preferred to using custom
-code for detecting it; this can aid in building with cross-compilation,
-where target-prefixed pkg-config binaries may be preferred to just
-`pkg-config`.
-
-diff -Naur libpcap-1.8.1/configure.ac libpcap-1.8.1.new/configure.ac
---- libpcap-1.8.1/configure.ac 2016-10-26 02:07:59.000000000 +0200
-+++ libpcap-1.8.1.new/configure.ac 2016-10-31 17:23:09.899055087 +0100
-@@ -1729,45 +1729,44 @@
- fi
-
- if test "x$enable_dbus" != "xno"; then
-- AC_CHECK_PROG([PKGCONFIG], [pkg-config], [pkg-config], [no])
-- if test "x$PKGCONFIG" != "xno"; then
-- AC_MSG_CHECKING([for D-Bus])
-- if "$PKGCONFIG" dbus-1; then
-- AC_MSG_RESULT([yes])
-- DBUS_CFLAGS=`"$PKGCONFIG" --cflags dbus-1`
-- DBUS_LIBS=`"$PKGCONFIG" --libs dbus-1`
-- save_CFLAGS="$CFLAGS"
-- save_LIBS="$LIBS"
-- CFLAGS="$CFLAGS $DBUS_CFLAGS"
-- LIBS="$LIBS $DBUS_LIBS"
-- AC_MSG_CHECKING(whether the D-Bus library defines dbus_connection_read_write)
-- AC_TRY_LINK(
-- [#include <string.h>
-+ AC_MSG_CHECKING([for pkg-config])
-+ PKG_PROG_PKG_CONFIG()
-+ AC_MSG_CHECKING([for D-Bus])
-+ if "$PKG_CONFIG" dbus-1; then
-+ AC_MSG_RESULT([yes])
-+ DBUS_CFLAGS=`"$PKG_CONFIG" --cflags dbus-1`
-+ DBUS_LIBS=`"$PKG_CONFIG" --libs dbus-1`
-+ save_CFLAGS="$CFLAGS"
-+ save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $DBUS_CFLAGS"
-+ LIBS="$LIBS $DBUS_LIBS"
-+ AC_MSG_CHECKING(whether the D-Bus library defines dbus_connection_read_write)
-+ AC_TRY_LINK(
-+ [#include <string.h>
-
-- #include <time.h>
-- #include <sys/time.h>
-+ #include <time.h>
-+ #include <sys/time.h>
-
-- #include <dbus/dbus.h>],
-- [return dbus_connection_read_write(NULL, 0);],
-- [
-+ #include <dbus/dbus.h>],
-+ [return dbus_connection_read_write(NULL, 0);],
-+ [
- AC_MSG_RESULT([yes])
-- AC_DEFINE(PCAP_SUPPORT_DBUS, 1, [support D-Bus sniffing])
-- DBUS_SRC=pcap-dbus.c
-- V_INCLS="$V_INCLS $DBUS_CFLAGS"
-- ],
-- [
-- AC_MSG_RESULT([no])
-- if test "x$enable_dbus" = "xyes"; then
-- AC_MSG_ERROR([--enable-dbus was given, but the D-Bus library doesn't define dbus_connection_read_write()])
-- fi
-- LIBS="$save_LIBS"
-- ])
-- CFLAGS="$save_CFLAGS"
-- else
-- AC_MSG_RESULT([no])
-+ AC_DEFINE(PCAP_SUPPORT_DBUS, 1, [support D-Bus sniffing])
-+ DBUS_SRC=pcap-dbus.c
-+ V_INCLS="$V_INCLS $DBUS_CFLAGS"
-+ ],
-+ [
-+ AC_MSG_RESULT([no])
- if test "x$enable_dbus" = "xyes"; then
-- AC_MSG_ERROR([--enable-dbus was given, but the dbus-1 package is not installed])
-- fi
-+ AC_MSG_ERROR([--enable-dbus was given, but the D-Bus library doesn't define dbus_connection_read_write()])
-+ fi
-+ LIBS="$save_LIBS"
-+ ])
-+ CFLAGS="$save_CFLAGS"
-+ else
-+ AC_MSG_RESULT([no])
-+ if test "x$enable_dbus" = "xyes"; then
-+ AC_MSG_ERROR([--enable-dbus was given, but the dbus-1 package is not installed])
- fi
- fi
- AC_SUBST(PCAP_SUPPORT_DBUS)
diff --git a/packages/dev-libs/libpcap/files/libpcap-1.8.1-usbmon.patch b/packages/dev-libs/libpcap/files/libpcap-1.8.1-usbmon.patch
deleted file mode 100644
index e5d9f607c..000000000
--- a/packages/dev-libs/libpcap/files/libpcap-1.8.1-usbmon.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Upstream: Unknown
-Source: Gentoo, https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3fc3e111161b3c7b8d15b1e9cefa2c2467f017
-Reason: The USB monitor name should not depend on build host environment
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1493,10 +1493,9 @@
- AC_DEFINE(PCAP_SUPPORT_USB, 1, [target host supports USB sniffing])
- USB_SRC=pcap-usb-linux.c
- AC_MSG_RESULT(yes)
-- ac_usb_dev_name=`udevinfo -q name -p /sys/class/usb_device/usbmon 2>/dev/null`
-- if test $? -ne 0 ; then
-- ac_usb_dev_name="usbmon"
-- fi
-+
-+ ac_usb_dev_name="usbmon"
-+
- AC_DEFINE_UNQUOTED(LINUX_USB_MON_DEV, "/dev/$ac_usb_dev_name", [path for device for USB sniffing])
- AC_MSG_NOTICE(Device for USB sniffing is /dev/$ac_usb_dev_name)
- #
diff --git a/packages/dev-libs/libpcap/libpcap-1.9.1.exheres-0 b/packages/dev-libs/libpcap/libpcap-1.10.0.exheres-0
index 4ca7b9b3c..acc58fe61 100644
--- a/packages/dev-libs/libpcap/libpcap-1.9.1.exheres-0
+++ b/packages/dev-libs/libpcap/libpcap-1.10.0.exheres-0
@@ -30,13 +30,11 @@ DEPENDENCIES="
"
DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/${PN}-1.8.1-pkg-config.patch
- "${FILES}"/${PN}-1.8.1-usbmon.patch
+ "${FILES}"/${PN}-1.10.0-usbmon.patch
)
DEFAULT_SRC_CONFIGURE_PARAMS=(
--enable-ipv6
- --enable-packet-ring
--enable-usb
--disable-netmap
--disable-optimizer-dbg
@@ -44,11 +42,22 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
--disable-remote
--with-pcap=linux
--without-dag
+ --without-dpdk
--without-septel
--without-snf
--without-turbocap
)
DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( bluetooth dbus )
DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( 'nl80211 libnl' )
-DEFAULT_SRC_INSTALL_EXCLUDE=( README.{Win32,aix,dag,hpux,macosx,septel,sita,tru64} )
+DEFAULT_SRC_INSTALL_EXCLUDE=( README.{Win32,aix,dag,hpux,macosx,septel,tru64} )
+
+src_prepare() {
+ # find prefixed pkg-config
+ # TODO: fix upstream
+ edo sed \
+ -e "s/^\(AC_CHECK_PROG(.*\)pkg-config/\1${PKG_CONFIG}/" \
+ -i configure.ac
+
+ autotools_src_prepare
+}
diff --git a/packages/dev-libs/libressl/libressl-3.1.4.exheres-0 b/packages/dev-libs/libressl/libressl-3.1.5.exheres-0
index 48e79dcd0..48e79dcd0 100644
--- a/packages/dev-libs/libressl/libressl-3.1.4.exheres-0
+++ b/packages/dev-libs/libressl/libressl-3.1.5.exheres-0
diff --git a/packages/dev-libs/libressl/libressl-3.2.2.exheres-0 b/packages/dev-libs/libressl/libressl-3.2.3.exheres-0
index 48e79dcd0..48e79dcd0 100644
--- a/packages/dev-libs/libressl/libressl-3.2.2.exheres-0
+++ b/packages/dev-libs/libressl/libressl-3.2.3.exheres-0
diff --git a/packages/dev-libs/libusb/libusb-1.0.23.exheres-0 b/packages/dev-libs/libusb/libusb-1.0.24.exheres-0
index 342672b1f..342672b1f 100644
--- a/packages/dev-libs/libusb/libusb-1.0.23.exheres-0
+++ b/packages/dev-libs/libusb/libusb-1.0.24.exheres-0
diff --git a/packages/dev-libs/libxmlb/libxmlb-0.1.15.exheres-0 b/packages/dev-libs/libxmlb/libxmlb-0.2.1.exheres-0
index f183b1626..f183b1626 100644
--- a/packages/dev-libs/libxmlb/libxmlb-0.1.15.exheres-0
+++ b/packages/dev-libs/libxmlb/libxmlb-0.2.1.exheres-0
diff --git a/packages/dev-libs/nettle/nettle-3.6.exheres-0 b/packages/dev-libs/nettle/nettle-3.7.exheres-0
index f5ea6d67a..f5ea6d67a 100644
--- a/packages/dev-libs/nettle/nettle-3.6.exheres-0
+++ b/packages/dev-libs/nettle/nettle-3.7.exheres-0
diff --git a/packages/dev-libs/nettle/nettle.exlib b/packages/dev-libs/nettle/nettle.exlib
index 77d459d98..63125f4e3 100644
--- a/packages/dev-libs/nettle/nettle.exlib
+++ b/packages/dev-libs/nettle/nettle.exlib
@@ -8,7 +8,7 @@ require alternatives
export_exlib_phases src_install
SUMMARY="A cryptographic library that is designed to fit easily in more or less any context"
-HOMEPAGE="http://www.lysator.liu.se/~nisse/${PN}"
+HOMEPAGE="https://www.lysator.liu.se/~nisse/${PN}"
LICENCES="|| ( LGPL-2.1 LGPL-3 )"
SLOT="0"
@@ -45,6 +45,12 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
DEFAULT_SRC_CONFIGURE_OPTION_ENABLES+=( 'arm_cpu_features:neon arm-neon' )
+if ever at_least 3.7 ; then
+ DEFAULT_SRC_CONFIGURE_PARAMS+=(
+ --disable-fat
+ )
+fi
+
nettle_src_install() {
local arch_dependent_alternatives=() other_alternatives=()
local host=$(exhost --target)
diff --git a/packages/dev-libs/openssl/openssl-1.1.1h.exheres-0 b/packages/dev-libs/openssl/openssl-1.1.1i.exheres-0
index 5c28699d5..5c28699d5 100644
--- a/packages/dev-libs/openssl/openssl-1.1.1h.exheres-0
+++ b/packages/dev-libs/openssl/openssl-1.1.1i.exheres-0
diff --git a/packages/dev-libs/openssl/openssl-3.0.0_alpha10.exheres-0 b/packages/dev-libs/openssl/openssl-3.0.0_alpha10.exheres-0
new file mode 100644
index 000000000..5c28699d5
--- /dev/null
+++ b/packages/dev-libs/openssl/openssl-3.0.0_alpha10.exheres-0
@@ -0,0 +1,7 @@
+# Copyright 2007 Bryan Østergaard
+# Distributed under the terms of the GNU General Public License v2
+
+require openssl
+
+PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
+
diff --git a/packages/dev-libs/openssl/openssl.exlib b/packages/dev-libs/openssl/openssl.exlib
index 0f5cd9c41..a1e7f693b 100644
--- a/packages/dev-libs/openssl/openssl.exlib
+++ b/packages/dev-libs/openssl/openssl.exlib
@@ -1,20 +1,32 @@
# Copyright 2007 Bryan Østergaard
# Distributed under the terms of the GNU General Public License v2
+require alternatives
+
export_exlib_phases src_configure src_compile src_test src_install
SUMMARY="Open source SSL and TLS implementation and cryptographic library"
HOMEPAGE="https://www.openssl.org"
-DOWNLOADS="${HOMEPAGE}/source/${PNV}.tar.gz"
+DOWNLOADS="${HOMEPAGE}/source/${PNV/_/-}.tar.gz"
UPSTREAM_CHANGELOG="${HOMEPAGE}/news/changelog.html [[ lang = en ]]"
UPSTREAM_DOCUMENTATION="${HOMEPAGE}/docs/ [[ lang = en ]]"
UPSTREAM_RELEASE_NOTES="${HOMEPAGE}/news/announce.html [[ lang = en ]]"
-LICENCES="${PN}"
-SLOT="0"
+if ever at_least 2; then
+ SOVER="$(ever major)"
+ SLOT="${SOVER}"
+ LICENCES="Apache-2.0"
+else
+ SOVER="$(ever range 1-2)"
+ SLOT="0" # clean upgrade path for 1.1
+ LICENCES="${PN}"
+fi
+
MYOPTIONS="parts: binaries configuration development documentation libraries"
+WORK="${WORKBASE}/${PNV/_/-}"
+
DEPENDENCIES="
build+run:
!dev-libs/libressl:* [[
@@ -79,21 +91,10 @@ openssl_src_compile() {
-j1
LIBDIR=lib
MANDIR=/usr/share/man
+ ENGINESDIR=/usr/$(exhost --target)/lib/engines-${SOVER}
+ MODULESDIR=/usr/$(exhost --target)/lib/ossl-modules-${SOVER}
)
- if ever at_least 1.1; then
- mymake+=(
- ENGINESDIR=/usr/$(exhost --target)/lib/engines-1.1
- )
- else
- # NOTE(tridactyla) openssl uses CROSS_COMPILE to test whether to build the rehash target (which
- # runs newly built executables). If we set it through Configure, it prepends the value to all of
- # the tools (which already have the correct prefix), so set it here instead.
- mymake+=(
- $(exhost --is-native -q || echo CROSS_COMPILE=1)
- )
- fi
-
emake "${mymake[@]}"
}
@@ -108,32 +109,60 @@ openssl_src_install() {
-j1
LIBDIR=lib
MANDIR=/usr/share/man
+ DESTDIR="${IMAGE}"
+ DOCDIR=/usr/share/doc/${PNVR}
+ ENGINESDIR=/usr/$(exhost --target)/lib/engines-${SOVER}
+ MODULESDIR=/usr/$(exhost --target)/lib/ossl-modules-${SOVER}
)
- if ever at_least 1.1; then
- myinstall+=(
- DESTDIR="${IMAGE}"
- DOCDIR=/usr/share/doc/${PNVR}
- ENGINESDIR=/usr/$(exhost --target)/lib/engines-1.1
- )
- else
- myinstall+=(
- INSTALL_PREFIX="${IMAGE}"
- )
- fi
-
emake "${myinstall[@]}" install
- # avoid file collisions with sys-apps/man-pages
- if ! ever at_least 1.1; then
- edo rm "${IMAGE}"/usr/share/man/man3/{err,rand}.3
+ local lib
+
+ for lib in crypto ssl; do
+ edo rm "${IMAGE}"/usr/$(exhost --target)/lib/lib${lib}.so
+ alternatives_for _$(exhost --target)_${PN}_${lib} ${SOVER} ${SOVER} \
+ /usr/$(exhost --target)/lib/lib${lib}.so{,.${SOVER}}
+ done
+
+ # alternatives to support multiple slots, architecture dependent files
+ alternatives_for \
+ _$(exhost --target)_${PN} ${SOVER} ${SOVER} \
+ /usr/$(exhost --target)/bin/c_rehash{,-${SOVER}} \
+ /usr/$(exhost --target)/bin/openssl{,-${SOVER}} \
+ /usr/$(exhost --target)/lib/libcrypto.a{,-${SOVER}} \
+ /usr/$(exhost --target)/lib/libssl.a{,-${SOVER}} \
+ /usr/$(exhost --target)/lib/pkgconfig/libcrypto.pc{,-${SOVER}} \
+ /usr/$(exhost --target)/lib/pkgconfig/libssl.pc{,-${SOVER}} \
+ /usr/$(exhost --target)/lib/pkgconfig/openssl.pc{,-${SOVER}} \
+ /usr/$(exhost --target)/include/openssl{,-${SOVER}}
+
+ if ! ever at_least 2; then
+ # conflicts with shadow, avoid by overwriting the symlink with the actual
+ # manpage
+ edo mv "${IMAGE}"/usr/share/man/man1/{,openssl-}passwd.1
fi
+ # alternatives to support multiple slots, architecture independent files
+ local alternatives=()
+
+ for file in "${IMAGE}"/usr/share/man/*/*; do
+ alternatives+=(
+ ${file#${IMAGE}}
+ ${file#${IMAGE}}-${SOVER}
+ )
+ done
+
+ alternatives_for \
+ _${PN} ${SOVER} ${SOVER} \
+ "${alternatives[@]}"
+
keepdir /etc/ssl/{certs,private}
emagicdocs
expart binaries /usr/$(exhost --target)/bin
expart configuration /etc
+ expart --exclude configuration /etc/env.d
expart documentation /usr/share/{doc,man}
expart libraries /usr/$(exhost --target)/lib
expart development /usr/$(exhost --target)/{include,lib/pkgconfig}
diff --git a/packages/dev-libs/p11-kit/p11-kit-0.23.21.exheres-0 b/packages/dev-libs/p11-kit/p11-kit-0.23.22.exheres-0
index 5c12f5262..5c12f5262 100644
--- a/packages/dev-libs/p11-kit/p11-kit-0.23.21.exheres-0
+++ b/packages/dev-libs/p11-kit/p11-kit-0.23.22.exheres-0
diff --git a/packages/dev-libs/pcre/pcre-8.44.exheres-0 b/packages/dev-libs/pcre/pcre-8.44.exheres-0
index 7e82da35b..40e586fb7 100644
--- a/packages/dev-libs/pcre/pcre-8.44.exheres-0
+++ b/packages/dev-libs/pcre/pcre-8.44.exheres-0
@@ -30,6 +30,7 @@ MYOPTIONS="parts: binaries development documentation libraries"
DEPENDENCIES="
build+run:
+ app-arch/bzip2
sys-libs/ncurses
sys-libs/readline:=
sys-libs/zlib
diff --git a/packages/dev-libs/pcre2/pcre2-10.35.exheres-0 b/packages/dev-libs/pcre2/pcre2-10.36.exheres-0
index 98e0169c7..98e0169c7 100644
--- a/packages/dev-libs/pcre2/pcre2-10.35.exheres-0
+++ b/packages/dev-libs/pcre2/pcre2-10.36.exheres-0
diff --git a/packages/dev-libs/pybind11/pybind11-2.5.0.exheres-0 b/packages/dev-libs/pybind11/pybind11-2.6.1.exheres-0
index 0ba348285..e71a24b25 100644
--- a/packages/dev-libs/pybind11/pybind11-2.5.0.exheres-0
+++ b/packages/dev-libs/pybind11/pybind11-2.6.1.exheres-0
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Timo Gurr <tgurr@exherbo.org>
+# Copyright 2019-2021 Timo Gurr <tgurr@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
require github [ user=pybind tag=v${PV} ] cmake \
@@ -11,24 +11,14 @@ SLOT="0"
PLATFORMS="~amd64"
MYOPTIONS=""
+# broken, last checked: 2.6.1
+RESTRICT="test"
+
DEPENDENCIES="
test:
dev-python/pytest[python_abis:*(-)?]
"
-CMAKE_SRC_CONFIGURE_PARAMS=(
- -DCMAKE_BUILD_TYPE:STRING=Release
- -DPYBIND11_INSTALL:BOOL=TRUE
-)
-
-CMAKE_SRC_CONFIGURE_TESTS=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Boost:BOOL=TRUE
- -DCMAKE_DISABLE_FIND_PACKAGE_Catch:BOOL=TRUE
- -DCMAKE_DISABLE_FIND_PACKAGE_Eigen3:BOOL=TRUE
- '-DPYBIND11_TEST:BOOL=TRUE -DPYBIND11_TEST:BOOL=FALSE'
- -DPYBIND11_WERROR:BOOL=FALSE
-)
-
src_unpack() {
cmake_src_unpack
easy-multibuild_src_unpack
@@ -41,12 +31,18 @@ src_prepare() {
src_configure() {
local cmakeparams=(
+ -DBUILD_TESTING:BOOL=$(expecting_tests TRUE FALSE)
+ -DCMAKE_BUILD_TYPE:STRING=Release
+ -DCMAKE_DISABLE_FIND_PACKAGE_Boost:BOOL=TRUE
+ -DCMAKE_DISABLE_FIND_PACKAGE_Catch:BOOL=TRUE
+ -DCMAKE_DISABLE_FIND_PACKAGE_Eigen3:BOOL=TRUE
+ -DPYBIND11_INSTALL:BOOL=TRUE
+ -DPYBIND11_NOPYTHON:BOOL=FALSE
+ -DPYBIND11_WERROR:BOOL=FALSE
-DPYTHON_EXECUTABLE:PATH=${PYTHON}
)
ecmake \
- "${CMAKE_SRC_CONFIGURE_PARAMS[@]}" \
- "${CMAKE_SRC_CONFIGURE_TESTS[@]}" \
"${cmakeparams[@]}"
setup-py_src_configure
@@ -64,9 +60,5 @@ src_test() {
src_install() {
cmake_src_install
setup-py_src_install
-
- dodir /usr/$(exhost --target)/lib/cmake
- edo mv "${IMAGE}"/usr/$(exhost --target)/{share,lib}/cmake/${PN}
- edo rm -rf "${IMAGE}"/usr/$(exhost --target)/share
}
diff --git a/packages/dev-libs/robin-map/robin-map-0.6.1.exheres-0 b/packages/dev-libs/robin-map/robin-map-0.6.3.exheres-0
index 058df5fc0..3fb4f1c79 100644
--- a/packages/dev-libs/robin-map/robin-map-0.6.1.exheres-0
+++ b/packages/dev-libs/robin-map/robin-map-0.6.3.exheres-0
@@ -1,4 +1,4 @@
-# Copyright 2019 Timo Gurr <tgurr@exherbo.org>
+# Copyright 2019-2021 Timo Gurr <tgurr@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
require github [ user=Tessil tag=v${PV} ] cmake
diff --git a/packages/dev-node/yarn/yarn-1.22.4.exheres-0 b/packages/dev-node/yarn/yarn-1.22.10.exheres-0
index cf94f187f..cf94f187f 100644
--- a/packages/dev-node/yarn/yarn-1.22.4.exheres-0
+++ b/packages/dev-node/yarn/yarn-1.22.10.exheres-0
diff --git a/packages/dev-perl/URI/URI-5.05.exheres-0 b/packages/dev-perl/URI/URI-5.06.exheres-0
index 244e63698..244e63698 100644
--- a/packages/dev-perl/URI/URI-5.05.exheres-0
+++ b/packages/dev-perl/URI/URI-5.06.exheres-0
diff --git a/packages/dev-python/setuptools/setuptools-50.3.2.exheres-0 b/packages/dev-python/setuptools/setuptools-51.3.3.exheres-0
index 3d765c3f9..596b484a4 100644
--- a/packages/dev-python/setuptools/setuptools-50.3.2.exheres-0
+++ b/packages/dev-python/setuptools/setuptools-51.3.3.exheres-0
@@ -4,7 +4,7 @@
# Based in part upon 'setuptools-0.6_rc8-r1.ebuild' from Gentoo, which is:
# Copyright 1999-2008 Gentoo Foundation
-require pypi [ suffix=zip ] setup-py [ import=distutils blacklist=2 has_bin=true ]
+require pypi setup-py [ import=distutils blacklist=2 has_bin=true ]
SUMMARY="Easily download, build, install, upgrade, and uninstall Python packages"
DESCRIPTION="
@@ -28,8 +28,8 @@ PYTEST_VER=3.7.0
# TODO: most tests fail, last checked: 50.3.2
# unpacked test dependencies for python >= 3.6
# - flake8-2020
-# - jaraco-test
# - paver
+# - pytest-enabler
RESTRICT="test"
DEPENDENCIES="
diff --git a/packages/dev-scm/bzr/bzr-2.7.0.exheres-0 b/packages/dev-scm/bzr/bzr-2.7.0-r1.exheres-0
index 68a52c4fd..68a52c4fd 100644
--- a/packages/dev-scm/bzr/bzr-2.7.0.exheres-0
+++ b/packages/dev-scm/bzr/bzr-2.7.0-r1.exheres-0
diff --git a/packages/dev-scm/bzr/bzr.exlib b/packages/dev-scm/bzr/bzr.exlib
index 109132b20..11ced449c 100644
--- a/packages/dev-scm/bzr/bzr.exlib
+++ b/packages/dev-scm/bzr/bzr.exlib
@@ -37,7 +37,7 @@ RESTRICT="test"
DEPENDENCIES="
suggestion:
dev-python/paramiko [[ description = [ Provides sftp support ] group-name = [ bzr-sftp-support ] ]]
- dev-python/pycrypto [[ description = [ Provides sftp support ] group-name = [ bzr-sftp-support ] ]]
+ dev-python/pycryptodome [[ description = [ Provides sftp support ] group-name = [ bzr-sftp-support ] ]]
dev-scm/bzrtools [[ description = [ Provides rsync support, and other useful extra functionality ] ]]
test-expensive:
dev-python/paramiko
diff --git a/packages/dev-scm/git-remote-hg/git-remote-hg-1.0.0.exheres-0 b/packages/dev-scm/git-remote-hg/git-remote-hg-1.0.2.1.exheres-0
index ec4cfd945..ec4cfd945 100644
--- a/packages/dev-scm/git-remote-hg/git-remote-hg-1.0.0.exheres-0
+++ b/packages/dev-scm/git-remote-hg/git-remote-hg-1.0.2.1.exheres-0
diff --git a/packages/dev-scm/git/files/git-fast-import-fix-over-allocation-of-marks-storage.patch b/packages/dev-scm/git/files/git-fast-import-fix-over-allocation-of-marks-storage.patch
new file mode 100644
index 000000000..1fa622e05
--- /dev/null
+++ b/packages/dev-scm/git/files/git-fast-import-fix-over-allocation-of-marks-storage.patch
@@ -0,0 +1,227 @@
+Upstream: yes
+Reason: Fixes HUGE memory usage of git-hg
+
+From 3f018ec716292b4d757385686f42f57af3bca685 Mon Sep 17 00:00:00 2001
+From: Jeff King <peff@peff.net>
+Date: Thu, 15 Oct 2020 11:38:49 -0400
+Subject: [PATCH] fast-import: fix over-allocation of marks storage
+
+Fast-import stores its marks in a trie-like structure made of mark_set
+structs. Each struct has a fixed size (1024). If our id number is too
+large to fit in the struct, then we allocate a new struct which shifts
+the id number by 10 bits. Our original struct becomes a child node
+of this new layer, and the new struct becomes the top level of the trie.
+
+This scheme was broken by ddddf8d7e2 (fast-import: permit reading
+multiple marks files, 2020-02-22). Before then, we had a top-level
+"marks" pointer, and the push-down worked by assigning the new top-level
+struct to "marks". But after that commit, insert_mark() takes a pointer
+to the mark_set, rather than using the global "marks". It continued to
+assign to the global "marks" variable during the push down, which was
+wrong for two reasons:
+
+ - we added a call in option_rewrite_submodules() which uses a separate
+ mark set; pushing down on "marks" is outright wrong here. We'd
+ corrupt the "marks" set, and we'd fail to correctly store any
+ submodule mappings with an id over 1024.
+
+ - the other callers passed "marks", but the push-down was still wrong.
+ In read_mark_file(), we take the pointer to the mark_set as a
+ parameter. So even though insert_mark() was updating the global
+ "marks", the local pointer we had in read_mark_file() was not
+ updated. As a result, we'd add a new level when needed, but then the
+ next call to insert_mark() wouldn't see it! It would then allocate a
+ new layer, which would also not be seen, and so on. Lookups for the
+ lost layers obviously wouldn't work, but before we even hit any
+ lookup stage, we'd generally run out of memory and die.
+
+Our tests didn't notice either of these cases because they didn't have
+enough marks to trigger the push-down behavior. The new tests in t9304
+cover both cases (and fail without this patch).
+
+We can solve the problem by having insert_mark() take a pointer-to-pointer
+of the top-level of the set. Then our push down can assign to it in a
+way that the caller actually sees. Note the subtle reordering in
+option_rewrite_submodules(). Our call to read_mark_file() may modify our
+top-level set pointer, so we have to wait until after it returns to
+assign its value into the string_list.
+
+Reported-by: Sergey Brester <serg.brester@sebres.de>
+Signed-off-by: Jeff King <peff@peff.net>
+Signed-off-by: Junio C Hamano <gitster@pobox.com>
+---
+ builtin/fast-import.c | 31 ++++++++++++----------
+ t/t9304-fast-import-marks.sh | 51 ++++++++++++++++++++++++++++++++++++
+ 2 files changed, 68 insertions(+), 14 deletions(-)
+ create mode 100755 t/t9304-fast-import-marks.sh
+
+diff --git a/builtin/fast-import.c b/builtin/fast-import.c
+index 1bf50a73dc..70d7d25eed 100644
+--- a/builtin/fast-import.c
++++ b/builtin/fast-import.c
+@@ -150,7 +150,7 @@ struct recent_command {
+ char *buf;
+ };
+
+-typedef void (*mark_set_inserter_t)(struct mark_set *s, struct object_id *oid, uintmax_t mark);
++typedef void (*mark_set_inserter_t)(struct mark_set **s, struct object_id *oid, uintmax_t mark);
+ typedef void (*each_mark_fn_t)(uintmax_t mark, void *obj, void *cbp);
+
+ /* Configured limits on output */
+@@ -526,13 +526,15 @@ static unsigned int hc_str(const char *s, size_t len)
+ return r;
+ }
+
+-static void insert_mark(struct mark_set *s, uintmax_t idnum, struct object_entry *oe)
++static void insert_mark(struct mark_set **top, uintmax_t idnum, struct object_entry *oe)
+ {
++ struct mark_set *s = *top;
++
+ while ((idnum >> s->shift) >= 1024) {
+ s = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct mark_set));
+- s->shift = marks->shift + 10;
+- s->data.sets[0] = marks;
+- marks = s;
++ s->shift = (*top)->shift + 10;
++ s->data.sets[0] = *top;
++ *top = s;
+ }
+ while (s->shift) {
+ uintmax_t i = idnum >> s->shift;
+@@ -944,7 +946,7 @@ static int store_object(
+
+ e = insert_object(&oid);
+ if (mark)
+- insert_mark(marks, mark, e);
++ insert_mark(&marks, mark, e);
+ if (e->idx.offset) {
+ duplicate_count_by_type[type]++;
+ return 1;
+@@ -1142,7 +1144,7 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark)
+ e = insert_object(&oid);
+
+ if (mark)
+- insert_mark(marks, mark, e);
++ insert_mark(&marks, mark, e);
+
+ if (e->idx.offset) {
+ duplicate_count_by_type[OBJ_BLOB]++;
+@@ -1717,7 +1719,7 @@ static void dump_marks(void)
+ }
+ }
+
+-static void insert_object_entry(struct mark_set *s, struct object_id *oid, uintmax_t mark)
++static void insert_object_entry(struct mark_set **s, struct object_id *oid, uintmax_t mark)
+ {
+ struct object_entry *e;
+ e = find_object(oid);
+@@ -1734,12 +1736,12 @@ static void insert_object_entry(struct mark_set *s, struct object_id *oid, uintm
+ insert_mark(s, mark, e);
+ }
+
+-static void insert_oid_entry(struct mark_set *s, struct object_id *oid, uintmax_t mark)
++static void insert_oid_entry(struct mark_set **s, struct object_id *oid, uintmax_t mark)
+ {
+ insert_mark(s, mark, xmemdupz(oid, sizeof(*oid)));
+ }
+
+-static void read_mark_file(struct mark_set *s, FILE *f, mark_set_inserter_t inserter)
++static void read_mark_file(struct mark_set **s, FILE *f, mark_set_inserter_t inserter)
+ {
+ char line[512];
+ while (fgets(line, sizeof(line), f)) {
+@@ -1772,7 +1774,7 @@ static void read_marks(void)
+ goto done; /* Marks file does not exist */
+ else
+ die_errno("cannot read '%s'", import_marks_file);
+- read_mark_file(marks, f, insert_object_entry);
++ read_mark_file(&marks, f, insert_object_entry);
+ fclose(f);
+ done:
+ import_marks_file_done = 1;
+@@ -3228,7 +3230,7 @@ static void parse_alias(void)
+ die(_("Expected 'to' command, got %s"), command_buf.buf);
+ e = find_object(&b.oid);
+ assert(e);
+- insert_mark(marks, next_mark, e);
++ insert_mark(&marks, next_mark, e);
+ }
+
+ static char* make_fast_import_path(const char *path)
+@@ -3321,13 +3323,14 @@ static void option_rewrite_submodules(const char *arg, struct string_list *list)
+ *f = '\0';
+ f++;
+ ms = xcalloc(1, sizeof(*ms));
+- string_list_insert(list, s)->util = ms;
+
+ fp = fopen(f, "r");
+ if (!fp)
+ die_errno("cannot read '%s'", f);
+- read_mark_file(ms, fp, insert_oid_entry);
++ read_mark_file(&ms, fp, insert_oid_entry);
+ fclose(fp);
++
++ string_list_insert(list, s)->util = ms;
+ }
+
+ static int parse_one_option(const char *option)
+diff --git a/t/t9304-fast-import-marks.sh b/t/t9304-fast-import-marks.sh
+new file mode 100755
+index 0000000000..d4359dba21
+--- /dev/null
++++ b/t/t9304-fast-import-marks.sh
+@@ -0,0 +1,51 @@
++#!/bin/sh
++
++test_description='test exotic situations with marks'
++. ./test-lib.sh
++
++test_expect_success 'setup dump of basic history' '
++ test_commit one &&
++ git fast-export --export-marks=marks HEAD >dump
++'
++
++test_expect_success 'setup large marks file' '
++ # normally a marks file would have a lot of useful, unique
++ # marks. But for our purposes, just having a lot of nonsense
++ # ones is fine. Start at 1024 to avoid clashing with marks
++ # legitimately used in our tiny dump.
++ blob=$(git rev-parse HEAD:one.t) &&
++ for i in $(test_seq 1024 16384)
++ do
++ echo ":$i $blob"
++ done >>marks
++'
++
++test_expect_success 'import with large marks file' '
++ git fast-import --import-marks=marks <dump
++'
++
++test_expect_success 'setup dump with submodule' '
++ git submodule add "$PWD" sub &&
++ git commit -m "add submodule" &&
++ git fast-export HEAD >dump
++'
++
++test_expect_success 'setup submodule mapping with large id' '
++ old=$(git rev-parse HEAD:sub) &&
++ new=$(echo $old | sed s/./a/g) &&
++ echo ":12345 $old" >from &&
++ echo ":12345 $new" >to
++'
++
++test_expect_success 'import with submodule mapping' '
++ git init dst &&
++ git -C dst fast-import \
++ --rewrite-submodules-from=sub:../from \
++ --rewrite-submodules-to=sub:../to \
++ <dump &&
++ git -C dst rev-parse HEAD:sub >actual &&
++ echo "$new" >expect &&
++ test_cmp expect actual
++'
++
++test_done
+--
+2.29.2
+
diff --git a/packages/dev-scm/git/git-2.29.2.exheres-0 b/packages/dev-scm/git/git-2.29.2-r1.exheres-0
index 197fe5f04..114f4ee60 100644
--- a/packages/dev-scm/git/git-2.29.2.exheres-0
+++ b/packages/dev-scm/git/git-2.29.2-r1.exheres-0
@@ -6,3 +6,7 @@ require git-build
PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
+DEFAULT_SRC_PREPARE_PATCHES+=(
+ "${FILES}"/${PN}-fast-import-fix-over-allocation-of-marks-storage.patch
+)
+
diff --git a/packages/dev-scm/git/git-2.28.0.exheres-0 b/packages/dev-scm/git/git-2.30.0.exheres-0
index 197fe5f04..197fe5f04 100644
--- a/packages/dev-scm/git/git-2.28.0.exheres-0
+++ b/packages/dev-scm/git/git-2.30.0.exheres-0
diff --git a/packages/dev-scm/git/git-build.exlib b/packages/dev-scm/git/git-build.exlib
index 8797a11ae..0ebc6133d 100644
--- a/packages/dev-scm/git/git-build.exlib
+++ b/packages/dev-scm/git/git-build.exlib
@@ -63,7 +63,7 @@ DEPENDENCIES="
)
pcre? ( dev-libs/pcre2 )
providers:libressl? ( dev-libs/libressl:= )
- providers:openssl? ( dev-libs/openssl )
+ providers:openssl? ( dev-libs/openssl:= )
sha1-collision-detection? ( dev-libs/sha1collisiondetection )
tk? (
dev-lang/tcl[>=8.4]
diff --git a/packages/dev-scm/mercurial/mercurial-5.0.1-r1.exheres-0 b/packages/dev-scm/mercurial/mercurial-5.6.1.exheres-0
index 70e18b954..2c2b71599 100644
--- a/packages/dev-scm/mercurial/mercurial-5.0.1-r1.exheres-0
+++ b/packages/dev-scm/mercurial/mercurial-5.6.1.exheres-0
@@ -4,6 +4,7 @@
require bash-completion zsh-completion elisp [ with_opt=true source_directory=contrib ]
require setup-py [ import=setuptools has_bin=true multibuild=false ]
+require cargo [ with_opt=true disable_default_features=true ]
SUMMARY="A fast, lightweight, distributed source control management system"
HOMEPAGE="https://${PN}-scm.org"
@@ -28,6 +29,7 @@ SLOT="0"
PLATFORMS="~amd64 ~armv8 ~x86"
MYOPTIONS="
emacs
+ rust [[ description = [ Install extensions requiring rust ] ]]
tk [[ description = [ Install hgk, a port to mercurial of git's gitk repository viewer ] ]]
"
@@ -43,12 +45,31 @@ DEPENDENCIES="
python_abis:3.6? ( dev-lang/python:3.6[>=3.6.2] )
"
-# Allow python3
-export HGPYTHON3=1
+ECARGO_FEATURES=( python3 )
+
+src_unpack() {
+ default
+
+ if option rust; then
+ edo pushd "${WORK}"/rust/hg-cpython || die
+ ecargo_fetch
+ edo popd
+ fi
+}
src_compile() {
+ if option rust; then
+ export HGWITHRUSTEXT=cpython
+ fi
+
setup-py_src_compile
elisp_src_compile
+
+ if option rust; then
+ edo pushd rust/hg-cpython || die
+ cargo_src_compile
+ edo popd
+ fi
}
src_test_expensive() {
@@ -63,6 +84,10 @@ src_test_expensive() {
}
src_install() {
+ if option rust; then
+ export HGWITHRUSTEXT=cpython
+ fi
+
setup-py_src_install
dobashcompletion contrib/bash_completion hg
diff --git a/packages/dev-util/strace/strace-5.9.exheres-0 b/packages/dev-util/strace/strace-5.10.exheres-0
index 7a6144e0c..7a6144e0c 100644
--- a/packages/dev-util/strace/strace-5.9.exheres-0
+++ b/packages/dev-util/strace/strace-5.10.exheres-0
diff --git a/packages/mail-mta/postfix/postfix-3.5.8.exheres-0 b/packages/mail-mta/postfix/postfix-3.5.9.exheres-0
index afa34c935..afa34c935 100644
--- a/packages/mail-mta/postfix/postfix-3.5.8.exheres-0
+++ b/packages/mail-mta/postfix/postfix-3.5.9.exheres-0
diff --git a/packages/mail-mta/postfix/postfix.exlib b/packages/mail-mta/postfix/postfix.exlib
index c9d7ca558..3a4059df7 100644
--- a/packages/mail-mta/postfix/postfix.exlib
+++ b/packages/mail-mta/postfix/postfix.exlib
@@ -49,7 +49,7 @@ DEPENDENCIES="
postgresql? ( dev-db/postgresql-client )
ssl? (
providers:libressl? ( dev-libs/libressl:= )
- providers:openssl? ( dev-libs/openssl )
+ providers:openssl? ( dev-libs/openssl:= )
)
suggestion:
net-mail/dovecot [[ description = [ Used for SASL support without cyrus-sasl ] ]]
diff --git a/packages/media-libs/jasper/jasper-2.0.17.exheres-0 b/packages/media-libs/jasper/jasper-2.0.24.exheres-0
index 8516b4a25..6d828e1ec 100644
--- a/packages/media-libs/jasper/jasper-2.0.17.exheres-0
+++ b/packages/media-libs/jasper/jasper-2.0.24.exheres-0
@@ -1,7 +1,7 @@
# Copyright 2008 Ingmar Vanhassel <ingmar@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require github [ user=mdadams tag=version-${PV} ] cmake
+require github [ user=${PN}-software tag=version-${PV} ] cmake
SUMMARY="Software-based implementation of the codec specified in the JPEG-2000 Part-1 standard"
HOMEPAGE+=" https://www.ece.uvic.ca/~frodo/${PN}"
@@ -31,12 +31,18 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
-DCMAKE_DISABLE_FIND_PACKAGE_LATEX:BOOL=TRUE
-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PNVR}
-DJAS_ENABLE_32BIT:BOOL=FALSE
+ -DJAS_ENABLE_ASAN:BOOL=FALSE
-DJAS_ENABLE_AUTOMATIC_DEPENDENCIES:BOOL=FALSE
+ -DJAS_ENABLE_DANGEROUS_INTERNAL_TESTING_MODE:BOOL=FALSE
-DJAS_ENABLE_DOC:BOOL=FALSE
+ -DJAS_ENABLE_FUZZER:BOOL=FALSE
-DJAS_ENABLE_HIDDEN:BOOL=FALSE
-DJAS_ENABLE_LIBJPEG:BOOL=TRUE
+ -DJAS_ENABLE_LSAN:BOOL=FALSE
+ -DJAS_ENABLE_MSAN:BOOL=FALSE
-DJAS_ENABLE_PROGRAMS:BOOL=TRUE
-DJAS_ENABLE_SHARED:BOOL=TRUE
+ -DJAS_ENABLE_USAN:BOOL=FALSE
)
CMAKE_SRC_CONFIGURE_OPTIONS=(
'opengl JAS_ENABLE_OPENGL'
diff --git a/packages/net-dialup/linux-atm/files/linux-atm-fix-build-after-y2038-changes-in-glibc.patch b/packages/net-dialup/linux-atm/files/linux-atm-fix-build-after-y2038-changes-in-glibc.patch
new file mode 100644
index 000000000..2481f7d90
--- /dev/null
+++ b/packages/net-dialup/linux-atm/files/linux-atm-fix-build-after-y2038-changes-in-glibc.patch
@@ -0,0 +1,38 @@
+Upstream: no, seems pretty dead (latest commit from 2013)
+Source: openSUSE
+Reason: Fix build with linux-headers[>=5.2]
+
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 7 Jun 2019 09:51:33 +0200
+Subject: fix build after y2038 changes in glibc
+Patch-mainline: upstream seems to be dead
+
+SIOCGSTAMP is now defined in linux/sockios.h. Include that file wherever
+needed.
+
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ src/maint/atmdump.c | 1 +
+ src/maint/saaldump.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/src/maint/atmdump.c
++++ b/src/maint/atmdump.c
+@@ -16,6 +16,7 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h> /* for htonl and ntohl */
+ #include <atm.h>
++#include <linux/sockios.h>
+
+
+ static const char *pti[] = { "Data SDU 0","Data SDU 1","Data SDU 0, CE",
+--- a/src/maint/saaldump.c
++++ b/src/maint/saaldump.c
+@@ -16,6 +16,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <atm.h>
++#include <linux/sockios.h>
+
+ #include "pdu.h"
+ #define DUMP_MODE
diff --git a/packages/net-dialup/linux-atm/linux-atm-2.5.2.exheres-0 b/packages/net-dialup/linux-atm/linux-atm-2.5.2.exheres-0
index 3c56b18bd..c7b4b87af 100644
--- a/packages/net-dialup/linux-atm/linux-atm-2.5.2.exheres-0
+++ b/packages/net-dialup/linux-atm/linux-atm-2.5.2.exheres-0
@@ -23,6 +23,7 @@ RESTRICT="test"
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/${PNV}-cross-prefixed-objcopy.patch
+ "${FILES}"/${PN}-fix-build-after-y2038-changes-in-glibc.patch
)
DEFAULT_SRC_CONFIGURE_PARAMS=(
diff --git a/packages/net-dialup/ppp/files/ppp-2.4.7-abort-on-errors-in-subdir-builds.patch b/packages/net-dialup/ppp/files/ppp-2.4.7-abort-on-errors-in-subdir-builds.patch
deleted file mode 100644
index 070777858..000000000
--- a/packages/net-dialup/ppp/files/ppp-2.4.7-abort-on-errors-in-subdir-builds.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Upstream: yes
-
-From 5e90783d11a59268e05f4cfb29ce2343b13e8ab2 Mon Sep 17 00:00:00 2001
-From: Martin von Gagern <Martin.vGagern@gmx.net>
-Date: Sat, 9 Aug 2014 22:44:45 -0400
-Subject: [PATCH] abort on errors in subdir builds
-
-The current recursive loops do not check the exit status of make
-in subdirs which leads to `make` passing even when a subdir failed
-to compile or install.
-
-URL: https://bugs.gentoo.org/334727
-Signed-off-by: Martin von Gagern <Martin.vGagern@gmx.net>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- pppd/plugins/Makefile.linux | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
-index ab8cf50..8a90e39 100644
---- a/pppd/plugins/Makefile.linux
-+++ b/pppd/plugins/Makefile.linux
-@@ -27,7 +27,7 @@ include .depend
- endif
-
- all: $(PLUGINS)
-- for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done
-+ for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all || exit $$?; done
-
- %.so: %.c
- $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^
-@@ -37,12 +37,12 @@ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)
- install: $(PLUGINS)
- $(INSTALL) -d $(LIBDIR)
- $(INSTALL) $? $(LIBDIR)
-- for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install; done
-+ for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install || exit $$?; done
-
- clean:
- rm -f *.o *.so *.a
-- for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d clean; done
-+ for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d clean || exit $$?; done
-
- depend:
- $(CPP) -M $(CFLAGS) *.c >.depend
-- for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d depend; done
-+ for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d depend || exit $$?; done
---
-2.10.1
-
diff --git a/packages/net-dialup/ppp/files/ppp-2.4.7-rc_mksid-no-buffer-overflow.patch b/packages/net-dialup/ppp/files/ppp-2.4.7-rc_mksid-no-buffer-overflow.patch
deleted file mode 100644
index 485785703..000000000
--- a/packages/net-dialup/ppp/files/ppp-2.4.7-rc_mksid-no-buffer-overflow.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Source: Debian
-Upstream: Unknown
-Reason: CVE-2015-3310: Buffer overflow in radius plugin
-
-Description: Fix buffer overflow in rc_mksid()
- rc_mksid converts the PID of pppd to hex to generate a pseudo-unique string.
- .
- If the process id is bigger than 65535 (FFFF), its hex representation will be
- longer than 4 characters, resulting in a buffer overflow.
- .
- The bug can be exploited to cause a remote DoS.
- .
-Author: Emanuele Rocca <ema@debian.org>
-Bug-Debian: https://bugs.debian.org/782450
-Last-Update: <2015-04-14>
-
---- ppp-2.4.6.orig/pppd/plugins/radius/util.c
-+++ ppp-2.4.6/pppd/plugins/radius/util.c
-@@ -77,7 +77,7 @@ rc_mksid (void)
- static unsigned short int cnt = 0;
- sprintf (buf, "%08lX%04X%02hX",
- (unsigned long int) time (NULL),
-- (unsigned int) getpid (),
-+ (unsigned int) getpid () % 65535,
- cnt & 0xFF);
- cnt++;
- return buf;
diff --git a/packages/net-dialup/ppp/files/ppp-pppoe-include-netinet-in.h-before-linux-in.h.patch b/packages/net-dialup/ppp/files/ppp-pppoe-include-netinet-in.h-before-linux-in.h.patch
deleted file mode 100644
index 4e646851b..000000000
--- a/packages/net-dialup/ppp/files/ppp-pppoe-include-netinet-in.h-before-linux-in.h.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Upstream: yes
-
-From 50a2997b256e0e0ef7a46fae133f56f60fce539c Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Mon, 9 Jan 2017 13:34:23 +0000
-Subject: [PATCH] pppoe: include netinet/in.h before linux/in.h
-
-This fixes builds with newer kernels. Basically, <netinet/in.h> needs to be
-included before <linux/in.h> otherwise the earlier, unaware of the latter,
-tries to redefine symbols and structures. Also, <linux/if_pppox.h> doesn't work
-alone anymore, since it pulls the headers in the wrong order, so we better
-include <netinet/in.h> early.
----
- pppd/plugins/rp-pppoe/pppoe.h | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h
-index 9ab2eee..c4aaa6e 100644
---- a/pppd/plugins/rp-pppoe/pppoe.h
-+++ b/pppd/plugins/rp-pppoe/pppoe.h
-@@ -47,6 +47,10 @@
- #include <sys/socket.h>
- #endif
-
-+/* This has to be included before Linux 4.8's linux/in.h
-+ * gets dragged in. */
-+#include <netinet/in.h>
-+
- /* Ugly header files on some Linux boxes... */
- #if defined(HAVE_LINUX_IF_H)
- #include <linux/if.h>
-@@ -84,8 +88,6 @@ typedef unsigned long UINT32_t;
- #include <linux/if_ether.h>
- #endif
-
--#include <netinet/in.h>
--
- #ifdef HAVE_NETINET_IF_ETHER_H
- #include <sys/types.h>
-
-@@ -98,7 +100,6 @@ typedef unsigned long UINT32_t;
- #endif
-
-
--
- /* Ethernet frame types according to RFC 2516 */
- #define ETH_PPPOE_DISCOVERY 0x8863
- #define ETH_PPPOE_SESSION 0x8864
---
-2.19.1
-
diff --git a/packages/net-dialup/ppp/files/use-openssl.patch b/packages/net-dialup/ppp/files/use-openssl.patch
deleted file mode 100644
index b75c039c2..000000000
--- a/packages/net-dialup/ppp/files/use-openssl.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-Upstream: yes
-From 3c7b86229f7bd2600d74db14b1fe5b3896be3875 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
-Date: Fri, 6 Apr 2018 14:27:18 +0200
-Subject: [PATCH] pppd: Use openssl for the DES instead of the libcrypt / glibc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It seems the latest glibc (in Fedora glibc-2.27.9000-12.fc29) dropped
-libcrypt. The libxcrypt standalone package can be used instead, but
-it dropped the old setkey/encrypt API which ppp uses for DES. There
-is support for using openssl in pppcrypt.c, but it contains typos
-preventing it from compiling and seems to be written for an ancient
-openssl version.
-
-This updates the code to use current openssl.
-
-[paulus@ozlabs.org - wrote the commit description, fixed comment in
- Makefile.linux.]
-
-Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
-Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
----
- pppd/Makefile.linux | 7 ++++---
- pppd/pppcrypt.c | 18 +++++++++---------
- 2 files changed, 13 insertions(+), 12 deletions(-)
-
-diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 36d2b036..8d5ce99d 100644
---- a/pppd/Makefile.linux
-+++ b/pppd/Makefile.linux
-@@ -35,10 +35,10 @@ endif
- COPTS = -O2 -pipe -Wall -g
- LIBS =
-
--# Uncomment the next 2 lines to include support for Microsoft's
-+# Uncomment the next line to include support for Microsoft's
- # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux.
- CHAPMS=y
--USE_CRYPT=y
-+#USE_CRYPT=y
- # Don't use MSLANMAN unless you really know what you're doing.
- #MSLANMAN=y
- # Uncomment the next line to include support for MPPE. CHAPMS (above) must
-@@ -137,7 +137,8 @@ endif
-
- ifdef NEEDDES
- ifndef USE_CRYPT
--LIBS += -ldes $(LIBS)
-+CFLAGS += -I/usr/include/openssl
-+LIBS += -lcrypto
- else
- CFLAGS += -DUSE_CRYPT=1
- endif
-diff --git a/pppd/pppcrypt.c b/pppd/pppcrypt.c
-index 8b85b132..6b35375e 100644
---- a/pppd/pppcrypt.c
-+++ b/pppd/pppcrypt.c
-@@ -64,7 +64,7 @@ u_char *des_key; /* OUT 64 bit DES key with parity bits added */
- des_key[7] = Get7Bits(key, 49);
-
- #ifndef USE_CRYPT
-- des_set_odd_parity((des_cblock *)des_key);
-+ DES_set_odd_parity((DES_cblock *)des_key);
- #endif
- }
-
-@@ -158,25 +158,25 @@ u_char *clear; /* OUT 8 octets */
- }
-
- #else /* USE_CRYPT */
--static des_key_schedule key_schedule;
-+static DES_key_schedule key_schedule;
-
- bool
- DesSetkey(key)
- u_char *key;
- {
-- des_cblock des_key;
-+ DES_cblock des_key;
- MakeKey(key, des_key);
-- des_set_key(&des_key, key_schedule);
-+ DES_set_key(&des_key, &key_schedule);
- return (1);
- }
-
- bool
--DesEncrypt(clear, key, cipher)
-+DesEncrypt(clear, cipher)
- u_char *clear; /* IN 8 octets */
- u_char *cipher; /* OUT 8 octets */
- {
-- des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher,
-- key_schedule, 1);
-+ DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher,
-+ &key_schedule, 1);
- return (1);
- }
-
-@@ -185,8 +185,8 @@ DesDecrypt(cipher, clear)
- u_char *cipher; /* IN 8 octets */
- u_char *clear; /* OUT 8 octets */
- {
-- des_ecb_encrypt((des_cblock *)cipher, (des_cblock *)clear,
-- key_schedule, 0);
-+ DES_ecb_encrypt((DES_cblock *)cipher, (DES_cblock *)clear,
-+ &key_schedule, 0);
- return (1);
- }
-
diff --git a/packages/net-dialup/ppp/ppp-2.4.7-r2.exheres-0 b/packages/net-dialup/ppp/ppp-2.4.9.exheres-0
index 08c6cfc90..a27b64b29 100644
--- a/packages/net-dialup/ppp/ppp-2.4.7-r2.exheres-0
+++ b/packages/net-dialup/ppp/ppp-2.4.9.exheres-0
@@ -19,8 +19,6 @@ DOWNLOADS="
https://dev.exherbo.org/~philantrop/distfiles/${PN}-2.4.4-scripts-${SCRIPT_VER}.tar.bz2
"
-REMOTE_IDS="freecode:pppd"
-
UPSTREAM_CHANGELOG="https://ppp.samba.org/README.html"
UPSTREAM_DOCUMENTATION="https://ppp.samba.org/documentation.html"
@@ -32,22 +30,20 @@ MYOPTIONS="
atm [[ description = [ Enables support for PPP over ATM (PPPoA) ] ]]
pam
radius
+ systemd
+
+ ( providers: libressl openssl )
"
DEPENDENCIES="
build+run:
activefilter? ( dev-libs/libpcap[>=0.9.8] )
atm? ( net-dialup/linux-atm )
pam? ( sys-libs/pam )
+ providers:libressl? ( dev-libs/libressl:= )
+ providers:openssl? ( dev-libs/openssl:= )
+ systemd? ( sys-apps/systemd )
"
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/respect-cflags.patch
- "${FILES}"/${PNV}-abort-on-errors-in-subdir-builds.patch
- "${FILES}"/${PN}-pppoe-include-netinet-in.h-before-linux-in.h.patch
- "${FILES}"/${PN}-2.4.7-rc_mksid-no-buffer-overflow.patch
- "${FILES}"/use-openssl.patch
-)
-
DEFAULT_SRC_COMPILE_PARAMS=(
COPTS="${CFLAGS} -D_GNU_SOURCE"
)
@@ -67,6 +63,10 @@ src_prepare() {
edo sed -i "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux
fi
+ if option systemd ; then
+ edo sed -i "s/^#SYSTEMD=y/SYSTEMD=y/" pppd/Makefile.linux
+ fi
+
edo sed -i "s/^#CBCP=y/CBCP=y/" pppd/Makefile.linux
edo sed -e "s:/usr/include:/usr/$(exhost --target)/include:" \
@@ -88,6 +88,8 @@ src_configure() {
# This configure script is not Autotools-compliant
edo ./configure \
--prefix="/usr/$(exhost --target)" \
+ --cc=${CC}
+ --cflags="${CFLAGS}" \
--sysconfdir=/etc
}
@@ -105,7 +107,7 @@ src_install() {
emake -j1 INSTROOT="${IMAGE}" install-devel
edo popd
- dobin pppd/plugins/rp-pppoe/pppoe-discovery
+ dobin pppd/plugins/pppoe/pppoe-discovery
keepdir /etc/ppp/peers
insinto /etc/ppp
@@ -128,7 +130,7 @@ src_install() {
insinto /usr/$(exhost --target)/lib/pppd/${PV}
insopts -m0755
- doins pppd/plugins/{minconn,passprompt,passwordfd,winbind,rp-pppoe/rp-pppoe,pppol2tp/openl2tp,pppol2tp/pppol2tp}.so
+ doins pppd/plugins/{minconn,passprompt,passwordfd,winbind,pppoe/pppoe,pppol2tp/openl2tp,pppol2tp/pppol2tp}.so
if option atm; then
doins pppd/plugins/pppoatm/pppoatm.so
@@ -177,7 +179,7 @@ pkg_postinst() {
elog "CONFIG_PPP_ASYNC (Recommended)"
elog "CONFIG_PPP_DEFLATE (Recommended)"
elog "CONFIG_PPP_BSDCOMP (Recommended)"
- elog "CONFIG_PPPOE (Optional, needed by rp-pppoe plugin)"
+ elog "CONFIG_PPPOE (Optional, needed by pppoe plugin)"
elog "CONFIG_PPP_SYNC_TTY (Optional, used by the sync option)"
elog "CONFIG_PPP_MPPE (Optional, mostly used by PPTP links)"
@@ -186,7 +188,7 @@ pkg_postinst() {
fi
# lib name has changed
- sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options" ||
+ sed -i -e "s:^rp-pppoe.so:pppoe.so:" "${ROOT}/etc/ppp/options" ||
eerror "sed /etc/ppp/options failed"
echo
diff --git a/packages/net-dns/c-ares/c-ares-1.16.1-r1.exheres-0 b/packages/net-dns/c-ares/c-ares-1.17.1.exheres-0
index 25982468a..64caec089 100644
--- a/packages/net-dns/c-ares/c-ares-1.16.1-r1.exheres-0
+++ b/packages/net-dns/c-ares/c-ares-1.17.1.exheres-0
@@ -1,8 +1,6 @@
# Copyright 2008, 2011 Ingmar Vanhassel <ingmar@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
-
SUMMARY="A C library that performs DNS requests and name resolves asynchronously"
DESCRIPTION="
c-ares is a C library that performs DNS requests and name resolves asynchronously.
@@ -16,11 +14,10 @@ SLOT="0"
PLATFORMS="~amd64 ~armv7 ~armv8 ~x86"
MYOPTIONS="debug"
-DEPENDENCIES=""
+# require network
+RESTRICT="test"
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/${PN}-1.16.1-caa-reply-backport.patch
-)
+DEPENDENCIES=""
src_configure() {
local args=(
diff --git a/packages/net-dns/c-ares/files/c-ares-1.16.1-caa-reply-backport.patch b/packages/net-dns/c-ares/files/c-ares-1.16.1-caa-reply-backport.patch
deleted file mode 100644
index c6ea91817..000000000
--- a/packages/net-dns/c-ares/files/c-ares-1.16.1-caa-reply-backport.patch
+++ /dev/null
@@ -1,395 +0,0 @@
-Source/Upstream: Yes, fixed in git master
-Reason: Backport of f5b4c0851027286ef56b84a13c85424fe25c3703 required for nodejs >= 15.0.0
-
-diff -Naur c-ares-1.16.1/adig.c c-ares-1.16.1.new/adig.c
---- c-ares-1.16.1/adig.c 2019-08-06 16:29:37.000000000 +0200
-+++ c-ares-1.16.1.new/adig.c 2020-10-21 11:49:23.067110848 +0200
-@@ -83,6 +83,9 @@
- #ifndef T_DNSKEY
- # define T_DNSKEY 48 /* DNS Public Key (RFC4034) */
- #endif
-+#ifndef T_CAA
-+# define T_CAA 257 /* Certification Authority Authorization */
-+#endif
-
- struct nv {
- const char *name;
-@@ -147,6 +150,7 @@
- { "RRSIG", T_RRSIG },
- { "NSEC", T_NSEC },
- { "DNSKEY", T_DNSKEY },
-+ { "CAA", T_CAA },
- { "ANY", T_ANY }
- };
- static const int ntypes = sizeof(types) / sizeof(types[0]);
-@@ -529,6 +533,7 @@
- const unsigned char *p;
- int type, dnsclass, ttl, dlen, status;
- long len;
-+ int vlen;
- char addr[46];
- union {
- unsigned char * as_uchar;
-@@ -684,6 +689,35 @@
- }
- break;
-
-+ case T_CAA:
-+
-+ p = aptr;
-+
-+ /* Flags */
-+ printf(" %u", (int)*p);
-+ p += 1;
-+
-+ /* Remainder of record */
-+ vlen = (int)dlen - ((char)*p) - 2;
-+
-+ /* The Property identifier, one of:
-+ - "issue",
-+ - "iodef", or
-+ - "issuewild" */
-+ status = ares_expand_string(p, abuf, alen, &name.as_uchar, &len);
-+ if (status != ARES_SUCCESS)
-+ return NULL;
-+ printf(" %s", name.as_char);
-+ ares_free_string(name.as_char);
-+ p += len;
-+
-+ if (p + vlen > abuf + alen)
-+ return NULL;
-+
-+ /* A sequence of octets representing the Property Value */
-+ printf(" %.*s", vlen, p);
-+ break;
-+
- case T_A:
- /* The RR data is a four-byte Internet address. */
- if (dlen != 4)
-diff -Naur c-ares-1.16.1/ares_data.c c-ares-1.16.1.new/ares_data.c
---- c-ares-1.16.1/ares_data.c 2018-02-07 13:13:59.000000000 +0100
-+++ c-ares-1.16.1.new/ares_data.c 2020-10-21 11:32:48.887557217 +0200
-@@ -119,6 +119,16 @@
- ares_free(ptr->data.soa_reply.hostmaster);
- break;
-
-+ case ARES_DATATYPE_CAA_REPLY:
-+
-+ if (ptr->data.caa_reply.next)
-+ next_data = ptr->data.caa_reply.next;
-+ if (ptr->data.caa_reply.property)
-+ ares_free(ptr->data.caa_reply.property);
-+ if (ptr->data.caa_reply.value)
-+ ares_free(ptr->data.caa_reply.value);
-+ break;
-+
- default:
- return;
- }
-@@ -174,6 +184,14 @@
- ptr->data.txt_reply.length = 0;
- break;
-
-+ case ARES_DATATYPE_CAA_REPLY:
-+ ptr->data.caa_reply.next = NULL;
-+ ptr->data.caa_reply.plength = 0;
-+ ptr->data.caa_reply.property = NULL;
-+ ptr->data.caa_reply.length = 0;
-+ ptr->data.caa_reply.value = NULL;
-+ break;
-+
- case ARES_DATATYPE_ADDR_NODE:
- ptr->data.addr_node.next = NULL;
- ptr->data.addr_node.family = 0;
-diff -Naur c-ares-1.16.1/ares_data.h c-ares-1.16.1.new/ares_data.h
---- c-ares-1.16.1/ares_data.h 2017-07-03 11:04:19.000000000 +0200
-+++ c-ares-1.16.1.new/ares_data.h 2020-10-21 11:33:49.540014902 +0200
-@@ -30,6 +30,7 @@
- ARES_DATATYPE_OPTIONS, /* struct ares_options */
- #endif
- ARES_DATATYPE_ADDR_PORT_NODE, /* struct ares_addr_port_node - introduced in 1.11.0 */
-+ ARES_DATATYPE_CAA_REPLY, /* struct ares_caa_reply - introduced in 1.17 */
- ARES_DATATYPE_LAST /* not used - introduced in 1.7.0 */
- } ares_datatype;
-
-@@ -65,6 +66,7 @@
- struct ares_mx_reply mx_reply;
- struct ares_naptr_reply naptr_reply;
- struct ares_soa_reply soa_reply;
-+ struct ares_caa_reply caa_reply;
- } data;
- };
-
-diff -Naur c-ares-1.16.1/ares.h c-ares-1.16.1.new/ares.h
---- c-ares-1.16.1/ares.h 2019-08-06 16:29:37.000000000 +0200
-+++ c-ares-1.16.1.new/ares.h 2020-10-21 11:30:59.557551430 +0200
-@@ -528,6 +528,15 @@
- int ttl;
- };
-
-+struct ares_caa_reply {
-+ struct ares_caa_reply *next;
-+ int critical;
-+ unsigned char *property;
-+ size_t plength; /* plength excludes null termination */
-+ unsigned char *value;
-+ size_t length; /* length excludes null termination */
-+};
-+
- struct ares_srv_reply {
- struct ares_srv_reply *next;
- char *host;
-@@ -637,6 +646,10 @@
- struct ares_addr6ttl *addrttls,
- int *naddrttls);
-
-+CARES_EXTERN int ares_parse_caa_reply(const unsigned char* abuf,
-+ int alen,
-+ struct ares_caa_reply** caa_out);
-+
- CARES_EXTERN int ares_parse_ptr_reply(const unsigned char *abuf,
- int alen,
- const void *addr,
-diff -Naur c-ares-1.16.1/ares_parse_caa_reply.c c-ares-1.16.1.new/ares_parse_caa_reply.c
---- c-ares-1.16.1/ares_parse_caa_reply.c 1970-01-01 01:00:00.000000000 +0100
-+++ c-ares-1.16.1.new/ares_parse_caa_reply.c 2020-10-21 11:34:40.932559859 +0200
-@@ -0,0 +1,209 @@
-+
-+/* Copyright 2020 by <danny.sonnenschein@platynum.ch>
-+ *
-+ * Permission to use, copy, modify, and distribute this
-+ * software and its documentation for any purpose and without
-+ * fee is hereby granted, provided that the above copyright
-+ * notice appear in all copies and that both that copyright
-+ * notice and this permission notice appear in supporting
-+ * documentation, and that the name of M.I.T. not be used in
-+ * advertising or publicity pertaining to distribution of the
-+ * software without specific, written prior permission.
-+ * M.I.T. makes no representations about the suitability of
-+ * this software for any purpose. It is provided "as is"
-+ * without express or implied warranty.
-+ */
-+
-+#include "ares_setup.h"
-+
-+#ifdef HAVE_NETINET_IN_H
-+# include <netinet/in.h>
-+#endif
-+#ifdef HAVE_NETDB_H
-+# include <netdb.h>
-+#endif
-+#ifdef HAVE_ARPA_INET_H
-+# include <arpa/inet.h>
-+#endif
-+#ifdef HAVE_ARPA_NAMESER_H
-+# include <arpa/nameser.h>
-+#else
-+# include "nameser.h"
-+#endif
-+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-+# include <arpa/nameser_compat.h>
-+#endif
-+
-+#ifdef HAVE_STRINGS_H
-+# include <strings.h>
-+#endif
-+
-+#include "ares.h"
-+#include "ares_dns.h"
-+#include "ares_data.h"
-+#include "ares_private.h"
-+
-+#ifndef T_CAA
-+# define T_CAA 257 /* Certification Authority Authorization */
-+#endif
-+
-+int
-+ares_parse_caa_reply (const unsigned char *abuf, int alen,
-+ struct ares_caa_reply **caa_out)
-+{
-+ unsigned int qdcount, ancount, i;
-+ const unsigned char *aptr;
-+ const unsigned char *strptr;
-+ int status, rr_type, rr_class, rr_len;
-+ long len;
-+ char *hostname = NULL, *rr_name = NULL;
-+ struct ares_caa_reply *caa_head = NULL;
-+ struct ares_caa_reply *caa_last = NULL;
-+ struct ares_caa_reply *caa_curr;
-+
-+ /* Set *caa_out to NULL for all failure cases. */
-+ *caa_out = NULL;
-+
-+ /* Give up if abuf doesn't have room for a header. */
-+ if (alen < HFIXEDSZ)
-+ return ARES_EBADRESP;
-+
-+ /* Fetch the question and answer count from the header. */
-+ qdcount = DNS_HEADER_QDCOUNT (abuf);
-+ ancount = DNS_HEADER_ANCOUNT (abuf);
-+ if (qdcount != 1)
-+ return ARES_EBADRESP;
-+ if (ancount == 0)
-+ return ARES_ENODATA;
-+
-+ /* Expand the name from the question, and skip past the question. */
-+ aptr = abuf + HFIXEDSZ;
-+ status = ares_expand_name (aptr, abuf, alen, &hostname, &len);
-+ if (status != ARES_SUCCESS)
-+ return status;
-+
-+ if (aptr + len + QFIXEDSZ > abuf + alen)
-+ {
-+ ares_free (hostname);
-+ return ARES_EBADRESP;
-+ }
-+ aptr += len + QFIXEDSZ;
-+
-+ /* Examine each answer resource record (RR) in turn. */
-+ for (i = 0; i < ancount; i++)
-+ {
-+ /* Decode the RR up to the data field. */
-+ status = ares_expand_name (aptr, abuf, alen, &rr_name, &len);
-+ if (status != ARES_SUCCESS)
-+ {
-+ break;
-+ }
-+ aptr += len;
-+ if (aptr + RRFIXEDSZ > abuf + alen)
-+ {
-+ status = ARES_EBADRESP;
-+ break;
-+ }
-+ rr_type = DNS_RR_TYPE (aptr);
-+ rr_class = DNS_RR_CLASS (aptr);
-+ rr_len = DNS_RR_LEN (aptr);
-+ aptr += RRFIXEDSZ;
-+ if (aptr + rr_len > abuf + alen)
-+ {
-+ status = ARES_EBADRESP;
-+ break;
-+ }
-+
-+ /* Check if we are really looking at a CAA record */
-+ if ((rr_class == C_IN || rr_class == C_CHAOS) && rr_type == T_CAA)
-+ {
-+ strptr = aptr;
-+
-+ /* Allocate storage for this CAA answer appending it to the list */
-+ caa_curr = ares_malloc_data(ARES_DATATYPE_CAA_REPLY);
-+ if (!caa_curr)
-+ {
-+ status = ARES_ENOMEM;
-+ break;
-+ }
-+ if (caa_last)
-+ {
-+ caa_last->next = caa_curr;
-+ }
-+ else
-+ {
-+ caa_head = caa_curr;
-+ }
-+ caa_last = caa_curr;
-+ if (rr_len < 2)
-+ {
-+ status = ARES_EBADRESP;
-+ break;
-+ }
-+ caa_curr->critical = (int)*strptr++;
-+ caa_curr->plength = (int)*strptr++;
-+ if (caa_curr->plength <= 0 || (int)caa_curr->plength >= rr_len - 2)
-+ {
-+ status = ARES_EBADRESP;
-+ break;
-+ }
-+ caa_curr->property = ares_malloc (caa_curr->plength + 1/* Including null byte */);
-+ if (caa_curr->property == NULL)
-+ {
-+ status = ARES_ENOMEM;
-+ break;
-+ }
-+ memcpy ((char *) caa_curr->property, strptr, caa_curr->plength);
-+ /* Make sure we NULL-terminate */
-+ caa_curr->property[caa_curr->plength] = 0;
-+ strptr += caa_curr->plength;
-+
-+ caa_curr->length = rr_len - caa_curr->plength - 2;
-+ if (caa_curr->length <= 0)
-+ {
-+ status = ARES_EBADRESP;
-+ break;
-+ }
-+ caa_curr->value = ares_malloc (caa_curr->length + 1/* Including null byte */);
-+ if (caa_curr->value == NULL)
-+ {
-+ status = ARES_ENOMEM;
-+ break;
-+ }
-+ memcpy ((char *) caa_curr->value, strptr, caa_curr->length);
-+ /* Make sure we NULL-terminate */
-+ caa_curr->value[caa_curr->length] = 0;
-+ }
-+
-+ /* Propagate any failures */
-+ if (status != ARES_SUCCESS)
-+ {
-+ break;
-+ }
-+
-+ /* Don't lose memory in the next iteration */
-+ ares_free (rr_name);
-+ rr_name = NULL;
-+
-+ /* Move on to the next record */
-+ aptr += rr_len;
-+ }
-+
-+ if (hostname)
-+ ares_free (hostname);
-+ if (rr_name)
-+ ares_free (rr_name);
-+
-+ /* clean up on error */
-+ if (status != ARES_SUCCESS)
-+ {
-+ if (caa_head)
-+ ares_free_data (caa_head);
-+ return status;
-+ }
-+
-+ /* everything looks fine, return the data */
-+ *caa_out = caa_head;
-+
-+ return ARES_SUCCESS;
-+}
-diff -Naur c-ares-1.16.1/Makefile.inc c-ares-1.16.1.new/Makefile.inc
---- c-ares-1.16.1/Makefile.inc 2019-08-06 16:29:37.000000000 +0200
-+++ c-ares-1.16.1.new/Makefile.inc 2020-10-21 11:31:32.750247116 +0200
-@@ -31,6 +31,7 @@
- ares_options.c \
- ares_parse_a_reply.c \
- ares_parse_aaaa_reply.c \
-+ ares_parse_caa_reply.c \
- ares_parse_mx_reply.c \
- ares_parse_naptr_reply.c \
- ares_parse_ns_reply.c \
-diff -Naur c-ares-1.16.1/nameser.h c-ares-1.16.1.new/nameser.h
---- c-ares-1.16.1/nameser.h 2017-07-03 11:04:19.000000000 +0200
-+++ c-ares-1.16.1.new/nameser.h 2020-10-21 11:35:52.146935327 +0200
-@@ -88,6 +88,7 @@
- ns_t_maila = 254, /* Transfer mail agent records. */
- ns_t_any = 255, /* Wildcard match. */
- ns_t_zxfr = 256, /* BIND-specific, nonstandard. */
-+ ns_t_caa = 257, /* Certification Authority Authorization. */
- ns_t_max = 65536
- } ns_type;
-
-@@ -204,6 +205,7 @@
- #define T_AXFR ns_t_axfr
- #define T_MAILB ns_t_mailb
- #define T_MAILA ns_t_maila
-+#define T_CAA ns_t_caa
- #define T_ANY ns_t_any
-
- #endif /* HAVE_ARPA_NAMESER_COMPAT_H */
diff --git a/packages/net-firewall/iptables/iptables-1.8.6.exheres-0 b/packages/net-firewall/iptables/iptables-1.8.7.exheres-0
index afcaeb717..afcaeb717 100644
--- a/packages/net-firewall/iptables/iptables-1.8.6.exheres-0
+++ b/packages/net-firewall/iptables/iptables-1.8.7.exheres-0
diff --git a/packages/net-libs/libtirpc/libtirpc-1.2.6.exheres-0 b/packages/net-libs/libtirpc/libtirpc-1.3.1.exheres-0
index f54a0531b..f54a0531b 100644
--- a/packages/net-libs/libtirpc/libtirpc-1.2.6.exheres-0
+++ b/packages/net-libs/libtirpc/libtirpc-1.3.1.exheres-0
diff --git a/packages/net-misc/curl/curl-7.73.0.exheres-0 b/packages/net-misc/curl/curl-7.74.0.exheres-0
index bd3fe8fb8..c9e2c9490 100644
--- a/packages/net-misc/curl/curl-7.73.0.exheres-0
+++ b/packages/net-misc/curl/curl-7.74.0.exheres-0
@@ -93,6 +93,7 @@ src_configure() {
--enable-unix-sockets
--enable-{dict,file,ftp,gopher,http,ipv6,imap,pop3,rtsp,smb,smtp,telnet,tftp}
--disable-alt-svc
+ --disable-hsts
--disable-mqtt
--disable-sspi
--disable-static
diff --git a/packages/net-misc/dhcpcd/dhcpcd-9.3.1.exheres-0 b/packages/net-misc/dhcpcd/dhcpcd-9.4.0.exheres-0
index 65ca47814..65ca47814 100644
--- a/packages/net-misc/dhcpcd/dhcpcd-9.3.1.exheres-0
+++ b/packages/net-misc/dhcpcd/dhcpcd-9.4.0.exheres-0
diff --git a/packages/net-misc/wget/files/wget-1.20.3-src-iri.c-do_conversion-Remove-unneeded-debug-lines.patch b/packages/net-misc/wget/files/wget-1.20.3-src-iri.c-do_conversion-Remove-unneeded-debug-lines.patch
deleted file mode 100644
index 9981d05b4..000000000
--- a/packages/net-misc/wget/files/wget-1.20.3-src-iri.c-do_conversion-Remove-unneeded-debug-lines.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Upstream: yes
-
-From 562eacb76a2b64d5dc80a443f0f739bc9ef76c17 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
-Date: Fri, 5 Apr 2019 13:01:57 +0200
-Subject: [PATCH] * src/iri.c (do_conversion): Remove unneeded debug lines
-
----
- src/iri.c | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/iri.c b/src/iri.c
-index d00683cd..eef12dce 100644
---- a/src/iri.c
-+++ b/src/iri.c
-@@ -152,11 +152,8 @@ do_conversion (const char *tocode, const char *fromcode, char const *in_org, siz
- *out = s = xmalloc (outlen + 1);
- done = 0;
-
-- DEBUGP (("iconv %s -> %s\n", tocode, fromcode));
--
- for (;;)
- {
-- DEBUGP (("iconv outlen=%d inlen=%d\n", outlen, inlen));
- if (iconv (cd, (ICONV_CONST char **) &in, &inlen, out, &outlen) != (size_t)(-1) &&
- iconv (cd, NULL, NULL, out, &outlen) != (size_t)(-1))
- {
-@@ -191,8 +188,6 @@ do_conversion (const char *tocode, const char *fromcode, char const *in_org, siz
- }
- else if (errno == E2BIG) /* Output buffer full */
- {
-- logprintf (LOG_VERBOSE,
-- _("Reallocate output buffer len=%d outlen=%d inlen=%d\n"), len, outlen, inlen);
- tooshort++;
- done = len;
- len = done + inlen * 2;
---
-2.21.0
-
diff --git a/packages/net-misc/wget/files/wget-tests-unit-tests.c-Fix-multiple-definition-of.-with-.patch b/packages/net-misc/wget/files/wget-tests-unit-tests.c-Fix-multiple-definition-of.-with-.patch
deleted file mode 100644
index e947298f9..000000000
--- a/packages/net-misc/wget/files/wget-tests-unit-tests.c-Fix-multiple-definition-of.-with-.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Upstream: yes
-
-From 04b7369490344d014b05dee5d48ca78cd04733ce Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
-Date: Sat, 22 Feb 2020 13:40:50 +0100
-Subject: [PATCH] * tests/unit-tests.c: Fix 'multiple definition of...' with
- gcc 10
-
----
- tests/unit-tests.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/unit-tests.c b/tests/unit-tests.c
-index 5fae8a21..f66e5e66 100644
---- a/tests/unit-tests.c
-+++ b/tests/unit-tests.c
-@@ -37,7 +37,7 @@ as that of the covered work. */
-
- #include "unit-tests.h"
-
--const char *program_argstring = "TEST";
-+extern const char *program_argstring;
-
- static int tests_run;
-
-@@ -69,7 +69,7 @@ all_tests(void)
- return NULL;
- }
-
--const char *program_name; /* Needed by lib/error.c. */
-+extern const char *program_name; /* Needed by lib/error.c. */
-
- int
- main (int argc _GL_UNUSED, const char *argv[])
---
-2.26.0
-
diff --git a/packages/net-misc/wget/wget-1.20.3-r1.exheres-0 b/packages/net-misc/wget/wget-1.21.1.exheres-0
index 143d387fd..d7729e166 100644
--- a/packages/net-misc/wget/wget-1.20.3-r1.exheres-0
+++ b/packages/net-misc/wget/wget-1.21.1.exheres-0
@@ -14,11 +14,13 @@ MYOPTIONS="
ares [[ description = [ Enable support for C-Ares DNS lookup ] ]]
idn [[ description = [ Enable support for internationalized domain names ] ]]
( providers: gnutls libressl openssl ) [[ number-selected = exactly-one ]]
+ ( linguas: be bg ca cs da de el en_GB eo es et eu fi fr ga gl he hr hu id it ja lt nb nl pl pt
+ pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_TW )
"
DEPENDENCIES="
build:
- sys-devel/gettext[>=0.18.1]
+ sys-devel/gettext[>=0.19.3]
virtual/pkg-config[>=0.9.0]
build+run:
dev-libs/pcre2
@@ -39,11 +41,6 @@ DEPENDENCIES="
dev-perl/IO-Socket-SSL
"
-DEFAULT_SRC_PREPARE_PATCHES+=(
- "${FILES}"/${PNV}-src-iri.c-do_conversion-Remove-unneeded-debug-lines.patch
- "${FILES}"/${PN}-tests-unit-tests.c-Fix-multiple-definition-of.-with-.patch
-)
-
DEFAULT_SRC_INSTALL_EXTRA_DOCS=( MAILING-LIST doc/sample.wgetrc )
src_configure() {
@@ -51,10 +48,12 @@ src_configure() {
gt_cv_func_gnugettext{1,2}_libc=yes
--enable-ipv6
--enable-nls
+ --enable-ntlm
--enable-pcre2
--enable-xattr
--disable-assert
--disable-debug
+ --disable-manywarnings
--disable-pcre
--disable-rpath
--with-libuuid
diff --git a/packages/net-print/cups-filters/cups-filters-1.28.5.exheres-0 b/packages/net-print/cups-filters/cups-filters-1.28.6.exheres-0
index 6325b8f4c..10ac4fe28 100644
--- a/packages/net-print/cups-filters/cups-filters-1.28.5.exheres-0
+++ b/packages/net-print/cups-filters/cups-filters-1.28.6.exheres-0
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Timo Gurr <tgurr@exherbo.org>
+# Copyright 2012-2021 Timo Gurr <tgurr@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
require github [ user=OpenPrinting release=${PV} suffix=tar.xz ] \
diff --git a/packages/sys-apps/busybox/busybox-1.31.1-r1.exheres-0 b/packages/sys-apps/busybox/busybox-1.32.1.exheres-0
index d9f1acef4..f2b2ce271 100644
--- a/packages/sys-apps/busybox/busybox-1.31.1-r1.exheres-0
+++ b/packages/sys-apps/busybox/busybox-1.32.1.exheres-0
@@ -10,8 +10,6 @@ SUMMARY="BusyBox provides tiny replacements for many common UNIX utilities"
HOMEPAGE="https://busybox.net"
DOWNLOADS="${HOMEPAGE}/downloads/${PNV}.tar.bz2"
-REMOTE_IDS="freecode:${PN}"
-
LICENCES="GPL-2"
SLOT="0"
PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
@@ -37,10 +35,6 @@ DEPENDENCIES="
]]
"
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/0001-Remove-stime-function-calls.patch
-)
-
bb_make() {
local make_options=(
CROSS_COMPILE=$(exhost --tool-prefix)
diff --git a/packages/sys-apps/busybox/files/0001-Remove-stime-function-calls.patch b/packages/sys-apps/busybox/files/0001-Remove-stime-function-calls.patch
deleted file mode 100644
index a7795f5d3..000000000
--- a/packages/sys-apps/busybox/files/0001-Remove-stime-function-calls.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From a333299315dcc5f710f76bfdfee34adc1a454c0c Mon Sep 17 00:00:00 2001
-From: Alistair Francis <alistair.francis@wdc.com>
-Date: Tue, 19 Nov 2019 13:06:40 +0100
-Subject: [PATCH] Remove stime() function calls
-Upstream: Yes
-
-stime() has been deprecated in glibc 2.31 and replaced with
-clock_settime(). Let's replace the stime() function calls with
-clock_settime() in preperation.
-
-function old new delta
-rdate_main 197 224 +27
-clock_settime - 27 +27
-date_main 926 941 +15
-stime 37 - -37
-------------------------------------------------------------------------------
-(add/remove: 2/2 grow/shrink: 2/0 up/down: 69/-37) Total: 32 bytes
-
-Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- coreutils/date.c | 6 +++++-
- libbb/missing_syscalls.c | 8 --------
- util-linux/rdate.c | 10 +++++++---
- 3 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/coreutils/date.c b/coreutils/date.c
-index 3414d38ae..4ade6abb4 100644
---- a/coreutils/date.c
-+++ b/coreutils/date.c
-@@ -279,6 +279,9 @@ int date_main(int argc UNUSED_PARAM, char **argv)
- time(&ts.tv_sec);
- #endif
- }
-+#if !ENABLE_FEATURE_DATE_NANO
-+ ts.tv_nsec = 0;
-+#endif
- localtime_r(&ts.tv_sec, &tm_time);
-
- /* If date string is given, update tm_time, and maybe set date */
-@@ -301,9 +304,10 @@ int date_main(int argc UNUSED_PARAM, char **argv)
- if (date_str[0] != '@')
- tm_time.tm_isdst = -1;
- ts.tv_sec = validate_tm_time(date_str, &tm_time);
-+ ts.tv_nsec = 0;
-
- /* if setting time, set it */
-- if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
-+ if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
- bb_perror_msg("can't set date");
- }
- }
-diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c
-index 87cf59b3d..dc40d9155 100644
---- a/libbb/missing_syscalls.c
-+++ b/libbb/missing_syscalls.c
-@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid)
- return syscall(__NR_getsid, pid);
- }
-
--int stime(const time_t *t)
--{
-- struct timeval tv;
-- tv.tv_sec = *t;
-- tv.tv_usec = 0;
-- return settimeofday(&tv, NULL);
--}
--
- int sethostname(const char *name, size_t len)
- {
- return syscall(__NR_sethostname, name, len);
-diff --git a/util-linux/rdate.c b/util-linux/rdate.c
-index 70f829e7f..bab41d98f 100644
---- a/util-linux/rdate.c
-+++ b/util-linux/rdate.c
-@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
- if (!(flags & 2)) { /* no -p (-s may be present) */
- if (time(NULL) == remote_time)
- bb_error_msg("current time matches remote time");
-- else
-- if (stime(&remote_time) < 0)
-- bb_perror_msg_and_die("can't set time of day");
-+ else {
-+ struct timespec ts;
-+ ts.tv_sec = remote_time;
-+ ts.tv_nsec = 0;
-+ if (clock_settime(CLOCK_REALTIME, &ts) < 0)
-+ bb_simple_perror_msg_and_die("can't set time of day");
-+ }
- }
-
- if (flags != 1) /* not lone -s */
---
-2.25.1
-
diff --git a/packages/sys-apps/busybox/files/config b/packages/sys-apps/busybox/files/config
index b258a090e..45a511923 100644
--- a/packages/sys-apps/busybox/files/config
+++ b/packages/sys-apps/busybox/files/config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.31.1
-# Mon Oct 28 14:05:15 2019
+# Busybox version: 1.32.1
+# Thu Jan 7 16:47:06 2021
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -76,6 +76,7 @@ CONFIG_PREFIX="./_install"
# CONFIG_DEBUG_SANITIZE is not set
# CONFIG_UNIT_TEST is not set
# CONFIG_WERROR is not set
+# CONFIG_WARN_SIMPLE_MSG is not set
CONFIG_NO_DEBUG_LIB=y
# CONFIG_DMALLOC is not set
# CONFIG_EFENCE is not set
@@ -462,6 +463,7 @@ CONFIG_FEATURE_FIND_SIZE=y
CONFIG_FEATURE_FIND_PRUNE=y
CONFIG_FEATURE_FIND_QUIT=y
CONFIG_FEATURE_FIND_DELETE=y
+CONFIG_FEATURE_FIND_EMPTY=y
CONFIG_FEATURE_FIND_PATH=y
CONFIG_FEATURE_FIND_REGEX=y
# CONFIG_FEATURE_FIND_CONTEXT is not set
@@ -692,6 +694,7 @@ CONFIG_FEATURE_SWAPONOFF_LABEL=y
CONFIG_SWITCH_ROOT=y
# CONFIG_TASKSET is not set
# CONFIG_FEATURE_TASKSET_FANCY is not set
+# CONFIG_FEATURE_TASKSET_CPULIST is not set
CONFIG_UEVENT=y
CONFIG_UMOUNT=y
CONFIG_FEATURE_UMOUNT_ALL=y
@@ -809,6 +812,7 @@ CONFIG_MAKEDEVS=y
CONFIG_FEATURE_MAKEDEVS_TABLE=y
CONFIG_MAN=y
CONFIG_MICROCOM=y
+CONFIG_MIM=y
CONFIG_MT=y
CONFIG_NANDWRITE=y
CONFIG_NANDDUMP=y
@@ -1099,6 +1103,7 @@ CONFIG_SH_IS_ASH=y
# CONFIG_BASH_IS_ASH is not set
# CONFIG_BASH_IS_HUSH is not set
CONFIG_BASH_IS_NONE=y
+CONFIG_SHELL_ASH=y
CONFIG_ASH=y
CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
CONFIG_ASH_INTERNAL_GLOB=y
@@ -1119,6 +1124,7 @@ CONFIG_ASH_GETOPTS=y
CONFIG_ASH_CMDCMD=y
CONFIG_CTTYHACK=y
CONFIG_HUSH=y
+CONFIG_SHELL_HUSH=y
CONFIG_HUSH_BASH_COMPAT=y
CONFIG_HUSH_BRACE_EXPANSION=y
CONFIG_HUSH_LINENO_VAR=y
@@ -1185,6 +1191,7 @@ CONFIG_FEATURE_ROTATE_LOGFILE=y
CONFIG_FEATURE_REMOTE_LOG=y
CONFIG_FEATURE_SYSLOGD_DUP=y
CONFIG_FEATURE_SYSLOGD_CFG=y
+# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
CONFIG_FEATURE_IPC_SYSLOG=y
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
diff --git a/packages/sys-apps/findutils/findutils-4.7.0.exheres-0 b/packages/sys-apps/findutils/findutils-4.8.0.exheres-0
index 5cae02517..5cae02517 100644
--- a/packages/sys-apps/findutils/findutils-4.7.0.exheres-0
+++ b/packages/sys-apps/findutils/findutils-4.8.0.exheres-0
diff --git a/packages/sys-apps/gptfdisk/gptfdisk-1.0.5.exheres-0 b/packages/sys-apps/gptfdisk/gptfdisk-1.0.6.exheres-0
index 728450f83..728450f83 100644
--- a/packages/sys-apps/gptfdisk/gptfdisk-1.0.5.exheres-0
+++ b/packages/sys-apps/gptfdisk/gptfdisk-1.0.6.exheres-0
diff --git a/packages/sys-apps/iproute2/iproute2-5.10.0.exheres-0 b/packages/sys-apps/iproute2/iproute2-5.10.0.exheres-0
new file mode 100644
index 000000000..099f7bdfc
--- /dev/null
+++ b/packages/sys-apps/iproute2/iproute2-5.10.0.exheres-0
@@ -0,0 +1,7 @@
+# Copyright 2008 Daniel Mierswa <impulze@impulze.org>
+# Distributed under the terms of the GNU General Public License v2
+
+require iproute2
+
+PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
+
diff --git a/packages/sys-apps/kbd/kbd-2.3.0.exheres-0 b/packages/sys-apps/kbd/kbd-2.4.0.exheres-0
index 38b021100..ec04f78d8 100644
--- a/packages/sys-apps/kbd/kbd-2.3.0.exheres-0
+++ b/packages/sys-apps/kbd/kbd-2.4.0.exheres-0
@@ -12,7 +12,7 @@ LICENCES="GPL-2"
SLOT="0"
PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
MYOPTIONS="
- ( linguas: cs da de el eo es fr gr id it nl pl pt pt_BR ro ru sv tr uk vi zh_CN )
+ ( linguas: cs da de el eo es fr gr id it nl pl pt pt_BR ro ru sr sv tr uk vi zh_CN )
"
DEPENDENCIES="
diff --git a/packages/sys-apps/kmod/kmod-27.exheres-0 b/packages/sys-apps/kmod/kmod-28.exheres-0
index 7a5479bdc..7a5479bdc 100644
--- a/packages/sys-apps/kmod/kmod-27.exheres-0
+++ b/packages/sys-apps/kmod/kmod-28.exheres-0
diff --git a/packages/sys-apps/kmod/kmod.exlib b/packages/sys-apps/kmod/kmod.exlib
index 9d7e8d4ba..f63f7bbd4 100644
--- a/packages/sys-apps/kmod/kmod.exlib
+++ b/packages/sys-apps/kmod/kmod.exlib
@@ -27,11 +27,15 @@ MYOPTIONS="
debug
doc [[ description = [ Build libkmod's API documentation using gtk-doc ] ]]
experimental [[ description = [ Enable experimental tools and features. Do not enable it unless you know what you are doing. ] ]]
+ zstd [[ description = [ Support for the ZStandard compression algorithm ] ]]
( providers: openssl [[
description = [ Handle PKCS7 signatures via openssl>=1.1.0 ] ]]
)
"
+# testsuite/test-depmod fails with zstd disabled, last checked: 28
+RESTRICT="test"
+
DEPENDENCIES="
build:
dev-libs/libxslt
@@ -40,7 +44,8 @@ DEPENDENCIES="
build+run:
app-arch/xz
sys-libs/zlib
- providers:openssl? ( dev-libs/openssl[>=1.1.0] )
+ providers:openssl? ( dev-libs/openssl:=[>=1.1.0] )
+ zstd? ( app-arch/zstd[>=1.4.4] )
!sys-apps/module-init-tools [[
description = [ module-init-tools has been replaced by kmod. ]
resolution = uninstall-blocked-after
@@ -65,6 +70,7 @@ DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
"bash-completion bashcompletiondir /usr/share/bash-completion/completions"
"providers:openssl openssl"
+ zstd
)
DEFAULT_SRC_TEST_PARAMS=( CC="${CC}" LD="${LD}" AR="${AR}" )
diff --git a/packages/sys-apps/lesspipe/lesspipe-1.84.exheres-0 b/packages/sys-apps/lesspipe/lesspipe-1.85.exheres-0
index 8a98f2389..deb32e919 100644
--- a/packages/sys-apps/lesspipe/lesspipe-1.84.exheres-0
+++ b/packages/sys-apps/lesspipe/lesspipe-1.85.exheres-0
@@ -50,7 +50,7 @@ DEPENDENCIES="
app-arch/p7zip [[ description = [ Support for the contents of 7-zip archives ] ]]
virtual/cpio [[ description = [ Support for RPM packages, together with app-arch/rpm ] ]]
- ( app-text/html2text net-www/elinks net-www/links net-www/lynx net-www/w3m ) [[
+ ( app-text/html2text net-www/elinks net-www/links:* net-www/lynx net-www/w3m ) [[
*description = [ Support for HTML documents ]
]]
@@ -92,13 +92,20 @@ DEPENDENCIES="
app-text/xlhtml [[ description = [ Support for Microsoft Excel < 2007 documents ] ]]
app-arch/dpkg [[ description = [ Support for metadata of Debian packages ] ]]
app-office/libreoffice [[ description = [ Support for RTF, OpenDocument/OpenOffice and Microsoft Excel/Powerpoint/Word documents ] ]]
- app-text/pandoc [[ description = [ Support for epub, RTF, OpenDocument/OpenOffice and Microsoft Word (docx) documents ] ]]
- dev-libs/openssl [[ description = [ Support for crt, pem, csr, crl files ] ]]
- media/mediainfo [[ description = [ Support for metadata of mp4 video files ] ]]
+ app-text/pandoc:* [[ description = [ Support for epub, RTF, OpenDocument/OpenOffice and Microsoft Word (docx) documents ] ]]
+ dev-libs/openssl:* [[ description = [ Support for crt, pem, csr, crl files ] ]]
+ media/mediainfo [[ description = [ Support for metadata of audio and video files ] ]]
"
lesspipe_set() {
- edo sed -i -e '/^__END__/,${s/^\('"${1}"'[ \t]\+\)[yYnN]\([ \t].*\)$/\1'"${2}"'\2/}' configure
+ # usage: lesspipe_set option value
+ # Set Y/N values for matching option(s) in block after __END__
+ # which is used later in configure --fixed call
+ edo sed \
+ -Ee '/^__END__/,$ {
+ s:^('"${1}"'\s+)[ynYN](\s.*)$:\1'"${2}"'\2:
+ }' \
+ -i configure
}
src_prepare() {
@@ -115,7 +122,7 @@ src_prepare() {
}
src_configure() {
- lesspipe_set '.*' Y
+ lesspipe_set '.*' Y # enable everything first
lesspipe_set rpmunpack N # dead and just a fallback for rpm2cpio
lesspipe_set fastjar N # dead and unzip works fine
lesspipe_set lsbom N # OS X only
diff --git a/packages/sys-apps/man-pages-posix/man-pages-posix-2013a-r1.exheres-0 b/packages/sys-apps/man-pages-posix/man-pages-posix-2017a.exheres-0
index 395d2c8a7..033684953 100644
--- a/packages/sys-apps/man-pages-posix/man-pages-posix-2013a-r1.exheres-0
+++ b/packages/sys-apps/man-pages-posix/man-pages-posix-2017a.exheres-0
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
SUMMARY="POSIX man-pages (0p, 1p, 3p)"
-HOMEPAGE="http://www.kernel.org/doc/man-pages/"
+HOMEPAGE="https://www.kernel.org/doc/man-pages/"
DOWNLOADS="mirror://kernel/linux/docs/man-pages/${PN}/${PN}-${PV/a/-a}.tar.xz"
LICENCES=""
@@ -12,9 +12,11 @@ MYOPTIONS=""
DEPENDENCIES="
run:
- virtual/man"
+ virtual/man
+"
+
+WORK="${WORKBASE}/${PN}-${PV/a}"
-WORK="${WORKBASE}/${PN}-${PV/a/-a}"
DEFAULT_SRC_INSTALL_EXTRA_DOCS=( ${PNV}.Announce )
src_compile() {
diff --git a/packages/sys-apps/man-pages/man-pages-5.08.exheres-0 b/packages/sys-apps/man-pages/man-pages-5.10.exheres-0
index 09e557e69..09e557e69 100644
--- a/packages/sys-apps/man-pages/man-pages-5.08.exheres-0
+++ b/packages/sys-apps/man-pages/man-pages-5.10.exheres-0
diff --git a/packages/sys-apps/net-tools/net-tools-2.10_alpha1_pre20170208.exheres-0 b/packages/sys-apps/net-tools/net-tools-2.10.exheres-0
index 01649780b..a072e95b4 100644
--- a/packages/sys-apps/net-tools/net-tools-2.10_alpha1_pre20170208.exheres-0
+++ b/packages/sys-apps/net-tools/net-tools-2.10.exheres-0
@@ -1,15 +1,16 @@
# Copyright 2007 Bryan Østergaard
# Distributed under the terms of the GNU General Public License v2
-require sourceforge alternatives
+require sourceforge [ suffix=tar.xz ] alternatives
SUMMARY="A deprecated, but familiar collection of basic networking tools"
-DOWNLOADS="https://dev.exherbo.org/distfiles/${PN}/${PNV}.tar.xz"
LICENCES="GPL-2"
SLOT="0"
PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
-MYOPTIONS=""
+MYOPTIONS="
+ ( linguas: cs de et et_EE fr pt_BR )
+"
DEPENDENCIES="
build:
@@ -21,11 +22,14 @@ DEFAULT_SRC_INSTALL_PARAMS=(
SBINDIR=/usr/$(exhost --target)/bin
)
+src_prepare() {
+ edo sed \
+ -e 's:I18N n:I18N y:' \
+ -i config.in
+}
+
src_configure() {
yes "" | edo ./configure.sh config.in
- edo sed -e 's:I18N 0:I18N 1:' \
- -e 's:AFECONET 1:AFECONET 0:' \
- -i config.h
}
src_install() {
@@ -39,5 +43,7 @@ src_install() {
alternatives_for hostname net-tools 5000 \
/usr/$(exhost --target)/bin/hostname /usr/$(exhost --target)/bin/domainname \
/usr/share/man/man1/hostname.1 /usr/share/man/man1/hostname.net-tools.1
+
+ edo find "${IMAGE}" -type d -empty -delete
}
diff --git a/packages/sys-apps/pax-utils/pax-utils-1.2.6.exheres-0 b/packages/sys-apps/pax-utils/pax-utils-1.2.8.exheres-0
index 62f215b38..62f215b38 100644
--- a/packages/sys-apps/pax-utils/pax-utils-1.2.6.exheres-0
+++ b/packages/sys-apps/pax-utils/pax-utils-1.2.8.exheres-0
diff --git a/packages/sys-apps/systemd/systemd-246.6.exheres-0 b/packages/sys-apps/systemd/systemd-246.9.exheres-0
index aebd9b4de..aebd9b4de 100644
--- a/packages/sys-apps/systemd/systemd-246.6.exheres-0
+++ b/packages/sys-apps/systemd/systemd-246.9.exheres-0
diff --git a/packages/sys-apps/systemd/systemd-245.7.exheres-0 b/packages/sys-apps/systemd/systemd-247.2-r2.exheres-0
index db125bcb2..aebd9b4de 100644
--- a/packages/sys-apps/systemd/systemd-245.7.exheres-0
+++ b/packages/sys-apps/systemd/systemd-247.2-r2.exheres-0
@@ -6,3 +6,6 @@ require systemd
PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
+# tests mess with cgroups which results in permission denied errors
+RESTRICT="test"
+
diff --git a/packages/sys-apps/systemd/systemd.exlib b/packages/sys-apps/systemd/systemd.exlib
index fce6641a7..42e339628 100644
--- a/packages/sys-apps/systemd/systemd.exlib
+++ b/packages/sys-apps/systemd/systemd.exlib
@@ -84,10 +84,15 @@ MYOPTIONS="
requires = [ openssl ]
]]
seccomp [[ description = [ System call filtering support via seccomp ] ]]
+ security-key [[
+ description = [ FIDO2 support for systemd-homed ]
+ requires = [ homed ]
+ ]]
selinux
static [[ description = [ Build static versions of libsystemd and libudev and link systemctl, networkd and timesynd against them ] ]]
xkbcommon [[ description = [ verify x11 keymap settings by compiling the configured keymap ] ]]
zsh-completion
+ zstd [[ description = [ Use Zstandard compression for longer journal fields ] ]]
( linguas: ${LANGUAGES[@]} )
( providers:
gnutls [[ requires = [ gnutls ] ]]
@@ -113,7 +118,7 @@ DEPENDENCIES="
sys-apps/kmod[>=15]
sys-apps/pciutils
sys-apps/skeleton-filesystem-layout
- sys-apps/util-linux[>=2.30]
+ sys-apps/util-linux[>=2.33]
sys-kernel/linux-headers[>=3.10]
sys-libs/libcap
sys-libs/pam[>=1.1.2]
@@ -126,7 +131,7 @@ DEPENDENCIES="
resolution = uninstall-blocked-after
]]
acl? ( sys-apps/acl )
- apparmor? ( security/apparmor )
+ apparmor? ( security/apparmor[>=2.13] )
cryptsetup? ( sys-fs/cryptsetup[>=2.0.1] )
efi? ( sys-boot/gnu-efi )
gcrypt? (
@@ -148,7 +153,9 @@ DEPENDENCIES="
regexp? ( dev-libs/pcre2 )
seccomp? ( sys-libs/libseccomp[>=2.3.1] )
xkbcommon? ( x11-libs/libxkbcommon[>=0.3.0] )
+ security-key? ( dev-libs/libfido2 )
selinux? ( security/libselinux )
+ zstd? ( app-arch/zstd[>=1.4.0] )
run:
sys-apps/coreutils[selinux?][>=8.16]
sys-apps/dbus[>=1.9.18] [[ note = [ Required to support the new DBus policy files location ] ]]
@@ -216,6 +223,7 @@ systemd_src_prepare() {
edo sed -e "s/(prefixdir, 'lib/(rootprefixdir, 'lib/" -i meson.build
edo sed -e 's:${prefix}/lib:${rootprefix}/lib:' -i src/core/systemd.pc.in
+ edo sed -e 's:/usr/lib:${rootprefix}/lib:' -i src/core/systemd.pc.in
# Fails tests because our prefix makes --help outputs longer than 80 characters
# Disable the test because it doesn't test actual functionality and is more of an upstream CI check
@@ -229,6 +237,7 @@ systemd_src_prepare() {
MESON_SRC_CONFIGURE_PARAMS=(
-Dadm-group=false
+ -Danalyze=true
-Daudit=false
-Dbacklight=true
-Dbinfmt=true
@@ -242,6 +251,8 @@ MESON_SRC_CONFIGURE_PARAMS=(
-Ddefault-dnssec=allow-downgrade
-Ddefault-hierarchy=unified
-Ddefault-kill-user-processes=false
+ -Ddefault-llmnr=yes
+ -Ddefault-mdns=yes
-Ddefault-net-naming-scheme=latest
-Ddocdir=/usr/share/doc/${PNVR}
-Defi-cc=${EFI_CC:-${CC}}
@@ -253,6 +264,7 @@ MESON_SRC_CONFIGURE_PARAMS=(
-Dfallback-hostname=localhost
-Dfdisk=true
-Dfirstboot=true
+ -Dfuzz-tests=false
-Dglib=false
-Dgshadow=true
-Dhibernate=true
@@ -260,7 +272,9 @@ MESON_SRC_CONFIGURE_PARAMS=(
-Dhtml=false
-Dhwdb=true
-Dima=false
+ -Dinitrd=true
-Dinstall-tests=false
+ -Dkernel-install=true
-Dkmod=true
-Dldconfig=true
-Dlibidn=false
@@ -296,6 +310,7 @@ MESON_SRC_CONFIGURE_PARAMS=(
-Dsmack=false
-Dsplit-bin=false
-Dsplit-usr=false
+ -Dstandalone-binaries=false
-Dstatus-unit-format-default=description
-Dsysusers=true
-Dsysvinit-path=""
@@ -310,6 +325,7 @@ MESON_SRC_CONFIGURE_PARAMS=(
-Dutmp=true
-Dvconsole=true
-Dwheel-group=true
+ -Dxdg-autostart=true
-Dxz=true
-Dzlib=true
)
@@ -342,6 +358,7 @@ MESON_SRC_CONFIGURE_OPTION_SWITCHES=(
'regexp pcre2'
repart
seccomp
+ 'security-key libfido2'
selinux
'static link-networkd-shared false true'
'static link-systemctl-shared false true'
@@ -350,36 +367,19 @@ MESON_SRC_CONFIGURE_OPTION_SWITCHES=(
'static static-libudev pic false'
xkbcommon
'zsh-completion zshcompletiondir /usr/share/zsh/site-functions no'
+ zstd
)
-if ever at_least 246.5; then
- MYOPTIONS+="
- security-key [[
- description = [ FIDO2 support for systemd-homed ]
- requires = [ homed ]
- ]]
- zstd [[ description = [ Use Zstandard compression for longer journal fields ] ]]
- "
+if ever at_least 247.2; then
DEPENDENCIES+="
build+run:
- sys-apps/util-linux[>=2.33]
- apparmor? ( security/apparmor[>=2.13] )
- security-key? ( dev-libs/libfido2 )
- zstd? ( app-arch/zstd[>=1.4.0] )
+ qrencode? ( media-libs/qrencode:=[>=4] )
"
MESON_SRC_CONFIGURE_PARAMS+=(
- -Danalyze=true
- -Ddefault-llmnr=yes
- -Ddefault-mdns=yes
- -Dfuzz-tests=false
- -Dinitrd=true
- -Dkernel-install=true
- -Dstandalone-binaries=false
- -Dxdg-autostart=true
- )
- MESON_SRC_CONFIGURE_OPTION_SWITCHES+=(
- 'security-key libfido2'
- zstd
+ -Dcompat-mutable-uid-boundaries=true
+ -Dinstall-sysconfdir=true
+ -Dmode=release
+ -Doomd=true
)
fi
@@ -444,11 +444,7 @@ systemd_src_install() {
)
local a manpages=()
- if ever at_least 246.5 ; then
- manpages=( halt poweroff reboot shutdown )
- else
- manpages=( halt poweroff reboot runlevel shutdown telinit )
- fi
+ manpages=( halt poweroff reboot shutdown )
for a in ${manpages[@]} ; do
alternatives+=(
/usr/share/man/man8/${a}.8 ${PN}.${a}.8
diff --git a/packages/sys-auth/passwdqc/passwdqc-1.4.0.exheres-0 b/packages/sys-auth/passwdqc/passwdqc-1.4.0.exheres-0
index be00ed624..6c004993e 100644
--- a/packages/sys-auth/passwdqc/passwdqc-1.4.0.exheres-0
+++ b/packages/sys-auth/passwdqc/passwdqc-1.4.0.exheres-0
@@ -9,7 +9,7 @@ DOWNLOADS="${HOMEPAGE}/${PNV}.tar.gz"
LICENCES="BSD-3 public-domain"
SLOT="0"
-PLATFORMS="~amd64"
+PLATFORMS="~amd64 ~armv7 ~armv8 ~x86"
MYOPTIONS="
( linguas: ru )
"
diff --git a/packages/sys-boot/dracut/dracut-050.exheres-0 b/packages/sys-boot/dracut/dracut-051.exheres-0
index 2754cda43..2754cda43 100644
--- a/packages/sys-boot/dracut/dracut-050.exheres-0
+++ b/packages/sys-boot/dracut/dracut-051.exheres-0
diff --git a/packages/sys-devel/automake/automake-1.16.2.exheres-0 b/packages/sys-devel/automake/automake-1.16.3.exheres-0
index 356d995c5..356d995c5 100644
--- a/packages/sys-devel/automake/automake-1.16.2.exheres-0
+++ b/packages/sys-devel/automake/automake-1.16.3.exheres-0
diff --git a/packages/sys-devel/binutils/binutils-2.33.1-r4.exheres-0 b/packages/sys-devel/binutils/binutils-2.33.1-r5.exheres-0
index 2adb68d83..2adb68d83 100644
--- a/packages/sys-devel/binutils/binutils-2.33.1-r4.exheres-0
+++ b/packages/sys-devel/binutils/binutils-2.33.1-r5.exheres-0
diff --git a/packages/sys-devel/binutils/binutils-2.34-r4.exheres-0 b/packages/sys-devel/binutils/binutils-2.34-r5.exheres-0
index 7e9ce3e39..7e9ce3e39 100644
--- a/packages/sys-devel/binutils/binutils-2.34-r4.exheres-0
+++ b/packages/sys-devel/binutils/binutils-2.34-r5.exheres-0
diff --git a/packages/sys-devel/binutils/binutils-2.35.1-r1.exheres-0 b/packages/sys-devel/binutils/binutils-2.35.1-r2.exheres-0
index 8cec7f91a..8cec7f91a 100644
--- a/packages/sys-devel/binutils/binutils-2.35.1-r1.exheres-0
+++ b/packages/sys-devel/binutils/binutils-2.35.1-r2.exheres-0
diff --git a/packages/sys-devel/binutils/binutils.exlib b/packages/sys-devel/binutils/binutils.exlib
index 47fa9c357..817b989b3 100644
--- a/packages/sys-devel/binutils/binutils.exlib
+++ b/packages/sys-devel/binutils/binutils.exlib
@@ -217,6 +217,7 @@ binutils_src_install() {
for target in ${CROSS_COMPILE_TARGETS} ; do
local m symbols
local alternatives=()
+ local as_alternatives=()
# eclectic managed files
local em=( /usr/${host}/bin/${target}-ld /usr/${host}/${target}/bin/ld )
local man_dir=/usr/share/man/man1/
@@ -245,6 +246,23 @@ binutils_src_install() {
done
edo rm "${IMAGE}"/usr/${host}/bin/${target}-ld
+ edo mv "${IMAGE}"/usr/${host}/{bin/${target}-as,${target}/bin/as.${PN}}
+ edo mv "${IMAGE}"/${man_dir}/{${target}-as.1,${target}-as.${PN}.1}
+ as_alternatives=(
+ assembler binutils 100
+ /usr/${host}/${target}/bin/as /usr/${host}/${target}/bin/as.${PN}
+ /usr/${host}/bin/${target}-as /usr/${host}/${target}/bin/as.${PN}
+ ${man_dir}/${target}-as.1 ${man_dir}/${target}-as.${PN}.1
+ )
+ if [[ ${target} == ${host} ]]; then
+ dobanned as
+ as_alternatives+=(
+ /usr/${host}/bin/as /usr/${host}/${target}/bin/as.${PN}
+ ${man_dir}/as.1 ${man_dir}/${target}-as.${PN}.1
+ "${BANNEDDIR}"/as as.${PN}
+ )
+ fi
+
alternatives=( compiler-tools binutils 100 )
for f in $(find "${IMAGE}"/usr/${host}/bin/ -type f ); do
local name=${f##*/}
@@ -277,6 +295,8 @@ binutils_src_install() {
done
alternatives_for "${alternatives[@]}"
+ alternatives_for "${as_alternatives[@]}"
+
# alternatives setup
for provider in $(linkers_for_target ${target}) ; do
local priority=
diff --git a/packages/sys-devel/cmake/cmake-3.19.1.exheres-0 b/packages/sys-devel/cmake/cmake-3.19.3.exheres-0
index 59c92d325..59c92d325 100644
--- a/packages/sys-devel/cmake/cmake-3.19.1.exheres-0
+++ b/packages/sys-devel/cmake/cmake-3.19.3.exheres-0
diff --git a/packages/sys-devel/gcc/gcc-10.2.0.exheres-0 b/packages/sys-devel/gcc/gcc-10.2.0-r1.exheres-0
index 66e2fd7fe..66e2fd7fe 100644
--- a/packages/sys-devel/gcc/gcc-10.2.0.exheres-0
+++ b/packages/sys-devel/gcc/gcc-10.2.0-r1.exheres-0
diff --git a/packages/sys-devel/gcc/gcc-6.4.0-r1.exheres-0 b/packages/sys-devel/gcc/gcc-6.4.0-r2.exheres-0
index 4505b7378..4505b7378 100644
--- a/packages/sys-devel/gcc/gcc-6.4.0-r1.exheres-0
+++ b/packages/sys-devel/gcc/gcc-6.4.0-r2.exheres-0
diff --git a/packages/sys-devel/gcc/gcc-7.4.0-r1.exheres-0 b/packages/sys-devel/gcc/gcc-7.4.0-r2.exheres-0
index 20338e985..20338e985 100644
--- a/packages/sys-devel/gcc/gcc-7.4.0-r1.exheres-0
+++ b/packages/sys-devel/gcc/gcc-7.4.0-r2.exheres-0
diff --git a/packages/sys-devel/gcc/gcc-8.4.0.exheres-0 b/packages/sys-devel/gcc/gcc-8.4.0-r1.exheres-0
index 721327cb2..721327cb2 100644
--- a/packages/sys-devel/gcc/gcc-8.4.0.exheres-0
+++ b/packages/sys-devel/gcc/gcc-8.4.0-r1.exheres-0
diff --git a/packages/sys-devel/gcc/gcc-9.3.0.exheres-0 b/packages/sys-devel/gcc/gcc-9.3.0-r1.exheres-0
index da783628d..da783628d 100644
--- a/packages/sys-devel/gcc/gcc-9.3.0.exheres-0
+++ b/packages/sys-devel/gcc/gcc-9.3.0-r1.exheres-0
diff --git a/packages/sys-devel/gcc/gcc.exlib b/packages/sys-devel/gcc/gcc.exlib
index 076e5fcd8..dc8106ee5 100644
--- a/packages/sys-devel/gcc/gcc.exlib
+++ b/packages/sys-devel/gcc/gcc.exlib
@@ -196,7 +196,8 @@ gcc_src_configure() {
$(optionq threads || echo --with-newlib)
$(optionq threads || echo --without-headers)
--with-lib-path=/usr/${target}/lib
- --with-as=/usr/${CHOST}/bin/${target}-as
+ # gcc doesn't like as from llvm
+ --with-as=/usr/${CHOST}/${target}/bin/as.binutils
--with-ld=/usr/${CHOST}/bin/${target}-ld
--with-system-zlib
--with-glibc-version=2.11
@@ -435,7 +436,8 @@ gcc_src_install() {
# in "lib" and not "lib/<target>/<gcc version>"
symlink_dynamic_libs libcc1
slot_dynamic_libs libcc1
- slot_other_libs libcc1.la
+ # libcc1.la is unused
+ nonfatal edo rm "${IMAGE}"/usr/${host}/lib/libcc1.la
alternatives_for gcc ${SLOT} ${SLOT} "${alternatives[@]}"
diff --git a/packages/sys-devel/gdb/gdb.exlib b/packages/sys-devel/gdb/gdb.exlib
index 78052eed2..0bdef1e6d 100644
--- a/packages/sys-devel/gdb/gdb.exlib
+++ b/packages/sys-devel/gdb/gdb.exlib
@@ -86,10 +86,14 @@ DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
python
)
-# People reported parallel build failures ( 7.9.1 )
+# People reported parallel build failures (7.9.1)
DEFAULT_SRC_COMPILE_PARAMS=(
-j1
- pkg_config_prog_path=/usr/$( exhost --target )/bin/$( exhost --tool-prefix )pkg-config
+ pkg_config_prog_path=/usr/$(exhost --target)/bin/$(exhost --tool-prefix)pkg-config
+
+ # The check doesn't work properly for musl
+ gt_cv_func_gnugettext_libc=yes
+ gt_cv_func_gnugettext2_libc=yes
)
DEFAULT_SRC_INSTALL_EXTRA_SUBDIRS=( gdb sim )
diff --git a/packages/sys-devel/gnuconfig/gnuconfig-20200621.exheres-0 b/packages/sys-devel/gnuconfig/gnuconfig-20210107.exheres-0
index 17594bffa..0d64d0a55 100644
--- a/packages/sys-devel/gnuconfig/gnuconfig-20200621.exheres-0
+++ b/packages/sys-devel/gnuconfig/gnuconfig-20210107.exheres-0
@@ -1,7 +1,7 @@
# Copyright 2007 Bryan Østergaard <kloeri@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-commit=696cd4a4eab1ee9fefbb7e38dbab291d741d0c5a
+commit=04d8eb4c26730125701706761b4db6bb0569429a
WORK=${WORKBASE}/config-${commit:0:7}
SUMMARY="GNU config.guess and config.sub scripts"
@@ -34,7 +34,6 @@ src_install() {
insinto /usr/share/${PN}
insopts -m0755
doins config.guess config.sub
- dodoc ChangeLog
doman doc/config.guess.1 doc/config.sub.1
expart data /usr/share/gnuconfig
diff --git a/packages/sys-devel/lld/lld-11.0.0.exheres-0 b/packages/sys-devel/lld/lld-11.0.1.exheres-0
index 4ece2a33e..4ece2a33e 100644
--- a/packages/sys-devel/lld/lld-11.0.0.exheres-0
+++ b/packages/sys-devel/lld/lld-11.0.1.exheres-0
diff --git a/packages/sys-devel/lld/lld-9.0.1-r3.exheres-0 b/packages/sys-devel/lld/lld-9.0.1-r3.exheres-0
deleted file mode 100644
index 4ece2a33e..000000000
--- a/packages/sys-devel/lld/lld-9.0.1-r3.exheres-0
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2017 Saleem Abdulrasool <compnerd@compnerd.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require lld
-
-PLATFORMS="~amd64"
-
diff --git a/packages/sys-devel/lld/lld.exlib b/packages/sys-devel/lld/lld.exlib
index eaa3f88d9..e0b236dd8 100644
--- a/packages/sys-devel/lld/lld.exlib
+++ b/packages/sys-devel/lld/lld.exlib
@@ -3,7 +3,9 @@
# Distributed under the terms of the GNU General Public License v2
require llvm-project [ slotted=true ]
-require alternatives providers
+require alternatives
+
+export_exlib_phases src_install src_test
SUMMARY="The LLVM linker"
@@ -35,10 +37,6 @@ MYOPTIONS+="
( targets: ${CROSS_COMPILE_TARGETS} ) [[ number-selected = at-least-one ]]
"
-providers=( "llvm $(ever major)" )
-
-export_exlib_phases src_configure src_install src_test
-
CMAKE_SRC_CONFIGURE_PARAMS=(
-DLLVM_CONFIG_PATH:STRING=${LLVM_PREFIX}/bin/llvm-config
@@ -47,11 +45,6 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
-DCMAKE_INSTALL_MANDIR:STRING=${LLVM_PREFIX}/share/man
)
-lld_src_configure() {
- providers_set
- cmake_src_configure
-}
-
lld_target() {
case "${1}" in
aarch64-*)
diff --git a/packages/sys-devel/lldb/lldb-11.0.0.exheres-0 b/packages/sys-devel/lldb/lldb-11.0.1.exheres-0
index 839f2410f..839f2410f 100644
--- a/packages/sys-devel/lldb/lldb-11.0.0.exheres-0
+++ b/packages/sys-devel/lldb/lldb-11.0.1.exheres-0
diff --git a/packages/sys-devel/meson/meson-0.55.3.exheres-0 b/packages/sys-devel/meson/meson-0.56.2.exheres-0
index fd73ec846..fd73ec846 100644
--- a/packages/sys-devel/meson/meson-0.55.3.exheres-0
+++ b/packages/sys-devel/meson/meson-0.56.2.exheres-0
diff --git a/packages/sys-devel/ninja/ninja-1.10.1.exheres-0 b/packages/sys-devel/ninja/ninja-1.10.2.exheres-0
index 4b11e2b80..4b11e2b80 100644
--- a/packages/sys-devel/ninja/ninja-1.10.1.exheres-0
+++ b/packages/sys-devel/ninja/ninja-1.10.2.exheres-0
diff --git a/packages/sys-fs/fuse/fuse-3.10.0.exheres-0 b/packages/sys-fs/fuse/fuse-3.10.1.exheres-0
index 2edbf48e5..2edbf48e5 100644
--- a/packages/sys-fs/fuse/fuse-3.10.0.exheres-0
+++ b/packages/sys-fs/fuse/fuse-3.10.1.exheres-0
diff --git a/packages/sys-fs/xfsprogs/xfsprogs-5.9.0.exheres-0 b/packages/sys-fs/xfsprogs/xfsprogs-5.10.0.exheres-0
index 0ede18c90..72175fedb 100644
--- a/packages/sys-fs/xfsprogs/xfsprogs-5.9.0.exheres-0
+++ b/packages/sys-fs/xfsprogs/xfsprogs-5.10.0.exheres-0
@@ -1,6 +1,8 @@
# Copyright 2009 Daniel Mierswa <impulze@impulze.org>
# Distributed under the terms of the GNU General Public License v2
+require systemd-service
+
SUMMARY="XFS userspace tools"
DESCRIPTION="Userspace utilities for the XFS filesystem including fsck and mkfs."
HOMEPAGE="https://xfs.org"
@@ -19,8 +21,10 @@ DEPENDENCIES="
virtual/pkg-config
build+run:
dev-libs/icu:=
+ dev-libs/inih
dev-libs/libedit
sys-apps/util-linux [[ note = [ for libblkid and libuuid ] ]]
+ sys-fs/lvm2
"
DEFAULT_SRC_CONFIGURE_PARAMS=(
@@ -37,6 +41,7 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
--disable-termcap
--disable-threadsan
--disable-ubsan
+ --with-systemd-unit-dir=${SYSTEMDSYSTEMUNITDIR}
)
DEFAULT_SRC_COMPILE_PARAMS=( V=1 )
DEFAULT_SRC_INSTALL_PARAMS=( DIST_ROOT="${IMAGE}" install-dev )
diff --git a/packages/sys-kernel/dkms/dkms-2.8.3.exheres-0 b/packages/sys-kernel/dkms/dkms-2.8.4.exheres-0
index bcbb2d9c8..bcbb2d9c8 100644
--- a/packages/sys-kernel/dkms/dkms-2.8.3.exheres-0
+++ b/packages/sys-kernel/dkms/dkms-2.8.4.exheres-0
diff --git a/packages/sys-kernel/linux-headers/linux-headers-5.10.exheres-0 b/packages/sys-kernel/linux-headers/linux-headers-5.10.exheres-0
new file mode 100644
index 000000000..d1eb96c28
--- /dev/null
+++ b/packages/sys-kernel/linux-headers/linux-headers-5.10.exheres-0
@@ -0,0 +1,9 @@
+# Copyright 2007 Bryan Østergaard <kloeri@exherbo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+require linux-headers
+
+PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
+
+DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/linux-headers-4-musl-sysinfo.patch )
+
diff --git a/packages/sys-libs/gdbm/files/gdbm-1.18.1-gcc10.patch b/packages/sys-libs/gdbm/files/gdbm-1.18.1-gcc10.patch
deleted file mode 100644
index 215e37e3e..000000000
--- a/packages/sys-libs/gdbm/files/gdbm-1.18.1-gcc10.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Source: Fedora, https://src.fedoraproject.org/rpms/gdbm/blob/master/f/gdbm_gcc_10.patch
-Upstream: Unknown
-Reason: Fix build with GCC 10
-
-Author:Filip Januš <fjanus@redhat.com>
-Date: 7.2.2020
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1799391
-After upgrade gcc to version gcc version 10.0.1 20200130 (Red Hat 10.0.1-0.7) (GCC) is not possible to build GDBM
-
-diff -ur gdbm-1.18.1/src/parseopt.c gdbm-1.18.1_new/src/parseopt.c
---- gdbm-1.18.1/src/parseopt.c 2018-05-30 11:39:15.000000000 +0200
-+++ gdbm-1.18.1_new/src/parseopt.c 2020-02-07 20:36:37.226390871 +0100
-@@ -255,8 +255,6 @@
- }
-
- char *parseopt_program_name;
--char *parseopt_program_doc;
--char *parseopt_program_args;
- const char *program_bug_address = "<" PACKAGE_BUGREPORT ">";
- void (*parseopt_help_hook) (FILE *stream);
-
diff --git a/packages/sys-libs/gdbm/gdbm-1.18.1.exheres-0 b/packages/sys-libs/gdbm/gdbm-1.19.exheres-0
index 7be3e02d2..ba66411e6 100644
--- a/packages/sys-libs/gdbm/gdbm-1.18.1.exheres-0
+++ b/packages/sys-libs/gdbm/gdbm-1.19.exheres-0
@@ -9,7 +9,7 @@ LICENCES="GPL-3"
SLOT="0"
PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
MYOPTIONS="
- ( linguas: da de eo es fi fr ja pl pt_BR sr sv uk vi )
+ ( linguas: da de eo es fi fr ja pl pt_BR ru sr sv uk vi )
"
DEPENDENCIES="
@@ -20,10 +20,6 @@ DEPENDENCIES="
sys-libs/readline:=
"
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/${PN}-1.18.1-gcc10.patch
-)
-
DEFAULT_SRC_CONFIGURE_PARAMS=(
--includedir=/usr/$(exhost --target)/include/gdbm
--enable-libgdbm-compat
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0001-x86-64-Fix-FMA4-detection-in-ifunc-BZ-26534.patch b/packages/sys-libs/glibc/files/patches-2.32/0001-x86-64-Fix-FMA4-detection-in-ifunc-BZ-26534.patch
new file mode 100644
index 000000000..6642a2088
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0001-x86-64-Fix-FMA4-detection-in-ifunc-BZ-26534.patch
@@ -0,0 +1,32 @@
+Upstream: yes, taken from release/2.32/master
+
+From cebc01cbfd6c257f329e818b68bb1b2eef2afe09 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Ho=C5=A1ek?= <ondra.hosek@gmail.com>
+Date: Wed, 26 Aug 2020 04:26:50 +0200
+Subject: [PATCH 01/23] x86-64: Fix FMA4 detection in ifunc [BZ #26534]
+
+A typo in commit 107e6a3c2212ba7a3a4ec7cae8d82d73f7c95d0b causes the
+FMA4 code path to be taken on systems that support FMA, even if they do
+not support FMA4. Fix this to detect FMA4.
+
+(cherry picked from commit 23af890b3f04e80da783ba64e6b6d94822e01d54)
+---
+ sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h b/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h
+index 7659758972..e5fd5ac9cb 100644
+--- a/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h
++++ b/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h
+@@ -32,7 +32,7 @@ IFUNC_SELECTOR (void)
+ && CPU_FEATURE_USABLE_P (cpu_features, AVX2))
+ return OPTIMIZE (fma);
+
+- if (CPU_FEATURE_USABLE_P (cpu_features, FMA))
++ if (CPU_FEATURE_USABLE_P (cpu_features, FMA4))
+ return OPTIMIZE (fma4);
+
+ return OPTIMIZE (sse2);
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0002-NEWS-Update-for-BZ-26534-fix.patch b/packages/sys-libs/glibc/files/patches-2.32/0002-NEWS-Update-for-BZ-26534-fix.patch
new file mode 100644
index 000000000..3dcd365bd
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0002-NEWS-Update-for-BZ-26534-fix.patch
@@ -0,0 +1,30 @@
+Upstream: yes, taken from release/2.32/master
+
+From 386543bc4495f658dcce6cd4d11e4ba6574a46f5 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Wed, 26 Aug 2020 04:26:50 +0200
+Subject: [PATCH 02/23] NEWS: Update for [BZ #26534] fix
+
+---
+ NEWS | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/NEWS b/NEWS
+index 485b8ddffa..a141de93dd 100644
+--- a/NEWS
++++ b/NEWS
+@@ -5,6 +5,11 @@ See the end for copying conditions.
+ Please send GNU C library bug reports via <https://sourceware.org/bugzilla/>
+ using `glibc' in the "product" field.
+
++The following bugs are resolved with this release:
++
++ [26534] libm.so 2.32 SIGILL in pow() due to FMA4 instruction on non-FMA4
++ system
++
+ Version 2.32
+
+ Major new features:
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0003-intl-Handle-translation-output-codesets-with-suffixe.patch b/packages/sys-libs/glibc/files/patches-2.32/0003-intl-Handle-translation-output-codesets-with-suffixe.patch
new file mode 100644
index 000000000..91a676cc8
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0003-intl-Handle-translation-output-codesets-with-suffixe.patch
@@ -0,0 +1,252 @@
+Upstream: yes, taken from release/2.32/master
+
+From fe62c4d173f3cc1ac64f01e75a8f421b2f092cdb Mon Sep 17 00:00:00 2001
+From: Arjun Shankar <arjun@redhat.com>
+Date: Fri, 25 Sep 2020 14:47:06 +0200
+Subject: [PATCH 03/23] intl: Handle translation output codesets with suffixes
+ [BZ #26383]
+
+Commit 91927b7c7643 (Rewrite iconv option parsing [BZ #19519]) did not
+handle cases where the output codeset for translations (via the `gettext'
+family of functions) might have a caller specified encoding suffix such as
+TRANSLIT or IGNORE. This led to a regression where translations did not
+work when the codeset had a suffix.
+
+This commit fixes the above issue by parsing any suffixes passed to
+__dcigettext and adds two new test-cases to intl/tst-codeset.c to
+verify correct behaviour. The iconv-internal function __gconv_create_spec
+and the static iconv-internal function gconv_destroy_spec are now visible
+internally within glibc and used in intl/dcigettext.c.
+
+(cherry picked from commit 7d4ec75e111291851620c6aa2c4460647b7fd50d)
+---
+ iconv/Versions | 4 +++-
+ iconv/gconv_charset.c | 10 ++++++++++
+ iconv/gconv_charset.h | 27 ---------------------------
+ iconv/gconv_int.h | 21 +++++++++++++++++++++
+ iconv/iconv_open.c | 2 +-
+ iconv/iconv_prog.c | 2 +-
+ intl/dcigettext.c | 17 ++++++++++-------
+ intl/tst-codeset.c | 34 ++++++++++++++--------------------
+ 8 files changed, 60 insertions(+), 57 deletions(-)
+
+diff --git a/iconv/Versions b/iconv/Versions
+index 8a5f4cf780..d51af52fa3 100644
+--- a/iconv/Versions
++++ b/iconv/Versions
+@@ -6,7 +6,9 @@ libc {
+ GLIBC_PRIVATE {
+ # functions shared with iconv program
+ __gconv_get_alias_db; __gconv_get_cache; __gconv_get_modules_db;
+- __gconv_open; __gconv_create_spec;
++
++ # functions used elsewhere in glibc
++ __gconv_open; __gconv_create_spec; __gconv_destroy_spec;
+
+ # function used by the gconv modules
+ __gconv_transliterate;
+diff --git a/iconv/gconv_charset.c b/iconv/gconv_charset.c
+index 6ccd0773cc..4ba0aa99f5 100644
+--- a/iconv/gconv_charset.c
++++ b/iconv/gconv_charset.c
+@@ -216,3 +216,13 @@ out:
+ return ret;
+ }
+ libc_hidden_def (__gconv_create_spec)
++
++
++void
++__gconv_destroy_spec (struct gconv_spec *conv_spec)
++{
++ free (conv_spec->fromcode);
++ free (conv_spec->tocode);
++ return;
++}
++libc_hidden_def (__gconv_destroy_spec)
+diff --git a/iconv/gconv_charset.h b/iconv/gconv_charset.h
+index b39b09aea1..e9c122cf7e 100644
+--- a/iconv/gconv_charset.h
++++ b/iconv/gconv_charset.h
+@@ -48,33 +48,6 @@
+ #define GCONV_IGNORE_ERRORS_SUFFIX "IGNORE"
+
+
+-/* This function accepts the charset names of the source and destination of the
+- conversion and populates *conv_spec with an equivalent conversion
+- specification that may later be used by __gconv_open. The charset names
+- might contain options in the form of suffixes that alter the conversion,
+- e.g. "ISO-10646/UTF-8/TRANSLIT". It processes the charset names, ignoring
+- and truncating any suffix options in fromcode, and processing and truncating
+- any suffix options in tocode. Supported suffix options ("TRANSLIT" or
+- "IGNORE") when found in tocode lead to the corresponding flag in *conv_spec
+- to be set to true. Unrecognized suffix options are silently discarded. If
+- the function succeeds, it returns conv_spec back to the caller. It returns
+- NULL upon failure. */
+-struct gconv_spec *
+-__gconv_create_spec (struct gconv_spec *conv_spec, const char *fromcode,
+- const char *tocode);
+-libc_hidden_proto (__gconv_create_spec)
+-
+-
+-/* This function frees all heap memory allocated by __gconv_create_spec. */
+-static void __attribute__ ((unused))
+-gconv_destroy_spec (struct gconv_spec *conv_spec)
+-{
+- free (conv_spec->fromcode);
+- free (conv_spec->tocode);
+- return;
+-}
+-
+-
+ /* This function copies in-order, characters from the source 's' that are
+ either alpha-numeric or one in one of these: "_-.,:/" - into the destination
+ 'wp' while dropping all other characters. In the process, it converts all
+diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h
+index e86938dae7..f721ce30ff 100644
+--- a/iconv/gconv_int.h
++++ b/iconv/gconv_int.h
+@@ -152,6 +152,27 @@ extern int __gconv_open (struct gconv_spec *conv_spec,
+ __gconv_t *handle, int flags);
+ libc_hidden_proto (__gconv_open)
+
++/* This function accepts the charset names of the source and destination of the
++ conversion and populates *conv_spec with an equivalent conversion
++ specification that may later be used by __gconv_open. The charset names
++ might contain options in the form of suffixes that alter the conversion,
++ e.g. "ISO-10646/UTF-8/TRANSLIT". It processes the charset names, ignoring
++ and truncating any suffix options in fromcode, and processing and truncating
++ any suffix options in tocode. Supported suffix options ("TRANSLIT" or
++ "IGNORE") when found in tocode lead to the corresponding flag in *conv_spec
++ to be set to true. Unrecognized suffix options are silently discarded. If
++ the function succeeds, it returns conv_spec back to the caller. It returns
++ NULL upon failure. */
++extern struct gconv_spec *
++__gconv_create_spec (struct gconv_spec *conv_spec, const char *fromcode,
++ const char *tocode);
++libc_hidden_proto (__gconv_create_spec)
++
++/* This function frees all heap memory allocated by __gconv_create_spec. */
++extern void
++__gconv_destroy_spec (struct gconv_spec *conv_spec);
++libc_hidden_proto (__gconv_destroy_spec)
++
+ /* Free resources associated with transformation descriptor CD. */
+ extern int __gconv_close (__gconv_t cd)
+ attribute_hidden;
+diff --git a/iconv/iconv_open.c b/iconv/iconv_open.c
+index dd54bc12e0..5b30055c04 100644
+--- a/iconv/iconv_open.c
++++ b/iconv/iconv_open.c
+@@ -39,7 +39,7 @@ iconv_open (const char *tocode, const char *fromcode)
+
+ int res = __gconv_open (&conv_spec, &cd, 0);
+
+- gconv_destroy_spec (&conv_spec);
++ __gconv_destroy_spec (&conv_spec);
+
+ if (__builtin_expect (res, __GCONV_OK) != __GCONV_OK)
+ {
+diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
+index b4334faa57..d59979759c 100644
+--- a/iconv/iconv_prog.c
++++ b/iconv/iconv_prog.c
+@@ -184,7 +184,7 @@ main (int argc, char *argv[])
+ /* Let's see whether we have these coded character sets. */
+ res = __gconv_open (&conv_spec, &cd, 0);
+
+- gconv_destroy_spec (&conv_spec);
++ __gconv_destroy_spec (&conv_spec);
+
+ if (res != __GCONV_OK)
+ {
+diff --git a/intl/dcigettext.c b/intl/dcigettext.c
+index 2e7c662bc7..bd332e71da 100644
+--- a/intl/dcigettext.c
++++ b/intl/dcigettext.c
+@@ -1120,15 +1120,18 @@ _nl_find_msg (struct loaded_l10nfile *domain_file,
+
+ # ifdef _LIBC
+
+- struct gconv_spec conv_spec
+- = { .fromcode = norm_add_slashes (charset, ""),
+- .tocode = norm_add_slashes (outcharset, ""),
+- /* We always want to use transliteration. */
+- .translit = true,
+- .ignore = false
+- };
++ struct gconv_spec conv_spec;
++
++ __gconv_create_spec (&conv_spec, charset, outcharset);
++
++ /* We always want to use transliteration. */
++ conv_spec.translit = true;
++
+ int r = __gconv_open (&conv_spec, &convd->conv,
+ GCONV_AVOID_NOCONV);
++
++ __gconv_destroy_spec (&conv_spec);
++
+ if (__builtin_expect (r != __GCONV_OK, 0))
+ {
+ /* If the output encoding is the same there is
+diff --git a/intl/tst-codeset.c b/intl/tst-codeset.c
+index fd70432eca..e9f6e5e09f 100644
+--- a/intl/tst-codeset.c
++++ b/intl/tst-codeset.c
+@@ -22,13 +22,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <support/check.h>
+
+ static int
+ do_test (void)
+ {
+- char *s;
+- int result = 0;
+-
+ unsetenv ("LANGUAGE");
+ unsetenv ("OUTPUT_CHARSET");
+ setlocale (LC_ALL, "de_DE.ISO-8859-1");
+@@ -36,25 +34,21 @@ do_test (void)
+ bindtextdomain ("codeset", OBJPFX "domaindir");
+
+ /* Here we expect output in ISO-8859-1. */
+- s = gettext ("cheese");
+- if (strcmp (s, "K\344se"))
+- {
+- printf ("call 1 returned: %s\n", s);
+- result = 1;
+- }
++ TEST_COMPARE_STRING (gettext ("cheese"), "K\344se");
+
++ /* Here we expect output in UTF-8. */
+ bind_textdomain_codeset ("codeset", "UTF-8");
++ TEST_COMPARE_STRING (gettext ("cheese"), "K\303\244se");
+
+- /* Here we expect output in UTF-8. */
+- s = gettext ("cheese");
+- if (strcmp (s, "K\303\244se"))
+- {
+- printf ("call 2 returned: %s\n", s);
+- result = 1;
+- }
+-
+- return result;
++ /* `a with umlaut' is transliterated to `ae'. */
++ bind_textdomain_codeset ("codeset", "ASCII//TRANSLIT");
++ TEST_COMPARE_STRING (gettext ("cheese"), "Kaese");
++
++ /* Transliteration also works by default even if not set. */
++ bind_textdomain_codeset ("codeset", "ASCII");
++ TEST_COMPARE_STRING (gettext ("cheese"), "Kaese");
++
++ return 0;
+ }
+
+-#define TEST_FUNCTION do_test ()
+-#include "../test-skeleton.c"
++#include <support/test-driver.c>
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0004-string-Fix-strerrorname_np-return-value-BZ-26555.patch b/packages/sys-libs/glibc/files/patches-2.32/0004-string-Fix-strerrorname_np-return-value-BZ-26555.patch
new file mode 100644
index 000000000..3e8d2d95b
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0004-string-Fix-strerrorname_np-return-value-BZ-26555.patch
@@ -0,0 +1,1700 @@
+Upstream: yes, taken from release/2.32/master
+
+From 69beb5cbf85cae1c61fe7432500ac10880dc7b07 Mon Sep 17 00:00:00 2001
+From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Mon, 31 Aug 2020 11:53:51 -0300
+Subject: [PATCH 04/23] string: Fix strerrorname_np return value [BZ #26555]
+
+It returns the string of the error constant, not its description (as
+strerrordesc_np). To handle the Hurd error mapping, the ERR_MAP was
+removed from errlist.h to errlist.c.
+
+Also, the testcase test-strerr (added on 325081b9eb2) was not added
+on the check build neither it builds correctly. This patch also
+changed it to decouple from errlist.h, the expected return values
+are added explicitly for both both strerrorname_np and strerrordesc_np
+directly.
+
+Checked on x86_64-linux-gnu and i686-linux-gnu. I also run a make
+check for i686-gnu.
+
+(cherry picked from commit cef95fdc2e4002ee6357d8d40ef73c8d875720e3)
+---
+ NEWS | 1 +
+ stdio-common/Makefile | 3 +-
+ stdio-common/errlist.c | 13 +-
+ stdio-common/test-strerr.c | 690 +++++++++++++++++++++++++++++++++++--
+ sysdeps/gnu/errlist.h | 301 ++++++++--------
+ 5 files changed, 819 insertions(+), 189 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index a141de93dd..3aad30baee 100644
+--- a/NEWS
++++ b/NEWS
+@@ -9,6 +9,7 @@ The following bugs are resolved with this release:
+
+ [26534] libm.so 2.32 SIGILL in pow() due to FMA4 instruction on non-FMA4
+ system
++ [26555] string: strerrorname_np does not return the documented value
+
+ Version 2.32
+
+diff --git a/stdio-common/Makefile b/stdio-common/Makefile
+index 8475fd1f09..eff0c98d82 100644
+--- a/stdio-common/Makefile
++++ b/stdio-common/Makefile
+@@ -69,7 +69,8 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
+ tst-printf-bz25691 \
+ tst-vfprintf-width-prec-alloc \
+ tst-printf-fp-free \
+- tst-printf-fp-leak
++ tst-printf-fp-leak \
++ test-strerr
+
+
+ test-srcs = tst-unbputc tst-printf tst-printfsz-islongdouble
+diff --git a/stdio-common/errlist.c b/stdio-common/errlist.c
+index d15f13a22a..2ecf121674 100644
+--- a/stdio-common/errlist.c
++++ b/stdio-common/errlist.c
+@@ -20,9 +20,13 @@
+ #include <libintl.h>
+ #include <array_length.h>
+
++#ifndef ERR_MAP
++# define ERR_MAP(n) n
++#endif
++
+ const char *const _sys_errlist_internal[] =
+ {
+-#define _S(n, str) [n] = str,
++#define _S(n, str) [ERR_MAP(n)] = str,
+ #include <errlist.h>
+ #undef _S
+ };
+@@ -41,20 +45,21 @@ static const union sys_errname_t
+ {
+ #define MSGSTRFIELD1(line) str##line
+ #define MSGSTRFIELD(line) MSGSTRFIELD1(line)
+-#define _S(n, str) char MSGSTRFIELD(__LINE__)[sizeof(str)];
++#define _S(n, str) char MSGSTRFIELD(__LINE__)[sizeof(#n)];
+ #include <errlist.h>
+ #undef _S
+ };
+ char str[0];
+ } _sys_errname = { {
+-#define _S(n, s) s,
++#define _S(n, s) #n,
+ #include <errlist.h>
+ #undef _S
+ } };
+
+ static const unsigned short _sys_errnameidx[] =
+ {
+-#define _S(n, s) [n] = offsetof(union sys_errname_t, MSGSTRFIELD(__LINE__)),
++#define _S(n, s) \
++ [ERR_MAP(n)] = offsetof(union sys_errname_t, MSGSTRFIELD(__LINE__)),
+ #include <errlist.h>
+ #undef _S
+ };
+diff --git a/stdio-common/test-strerr.c b/stdio-common/test-strerr.c
+index fded208118..d77b81d507 100644
+--- a/stdio-common/test-strerr.c
++++ b/stdio-common/test-strerr.c
+@@ -18,46 +18,672 @@
+
+ #include <string.h>
+ #include <errno.h>
+-#include <array_length.h>
+
+ #include <support/support.h>
+ #include <support/check.h>
+
+-#define N_(name) name
+-
+-static const char *const errlist[] =
+- {
+-/* This file is auto-generated from errlist.def. */
+-#include <errlist.h>
+- };
+-
+-#define MSGSTR_T errname_t
+-#define MSGSTR errname
+-#define MSGIDX errnameidx
+-#include <errlist-name.h>
+-#undef MSGSTR
+-#undef MSGIDX
+-
+ static int
+ do_test (void)
+ {
+- TEST_VERIFY (strerrordesc_np (-1) == NULL);
+- TEST_VERIFY (strerrordesc_np (array_length (errlist)) == NULL);
+- for (size_t i = 0; i < array_length (errlist); i++)
+- {
+- if (errlist[i] == NULL)
+- continue;
+- TEST_COMPARE_STRING (strerrordesc_np (i), errlist[i]);
+- }
++ TEST_COMPARE_STRING (strerrordesc_np (0), "Success");
++ TEST_COMPARE_STRING (strerrorname_np (0), "0");
+
+- TEST_VERIFY (strerrorname_np (-1) == NULL);
+- TEST_VERIFY (strerrorname_np (array_length (errlist)) == NULL);
+- for (size_t i = 0; i < array_length (errlist); i++)
+- {
+- if (errlist[i] == NULL)
+- continue;
+- TEST_COMPARE_STRING (strerrorname_np (i), errname.str + errnameidx[i]);
+- }
++#ifdef EPERM
++ TEST_COMPARE_STRING (strerrordesc_np (EPERM), "Operation not permitted");
++ TEST_COMPARE_STRING (strerrorname_np (EPERM), "EPERM");
++#endif
++#ifdef ENOENT
++ TEST_COMPARE_STRING (strerrordesc_np (ENOENT),
++ "No such file or directory");
++ TEST_COMPARE_STRING (strerrorname_np (ENOENT), "ENOENT");
++#endif
++#ifdef ESRCH
++ TEST_COMPARE_STRING (strerrordesc_np (ESRCH), "No such process");
++ TEST_COMPARE_STRING (strerrorname_np (ESRCH), "ESRCH");
++#endif
++#ifdef EINTR
++ TEST_COMPARE_STRING (strerrordesc_np (EINTR), "Interrupted system call");
++ TEST_COMPARE_STRING (strerrorname_np (EINTR), "EINTR");
++#endif
++#ifdef EIO
++ TEST_COMPARE_STRING (strerrordesc_np (EIO), "Input/output error");
++ TEST_COMPARE_STRING (strerrorname_np (EIO), "EIO");
++#endif
++#ifdef ENXIO
++ TEST_COMPARE_STRING (strerrordesc_np (ENXIO), "No such device or address");
++ TEST_COMPARE_STRING (strerrorname_np (ENXIO), "ENXIO");
++#endif
++#ifdef E2BIG
++ TEST_COMPARE_STRING (strerrordesc_np (E2BIG), "Argument list too long");
++ TEST_COMPARE_STRING (strerrorname_np (E2BIG), "E2BIG");
++#endif
++#ifdef ENOEXEC
++ TEST_COMPARE_STRING (strerrordesc_np (ENOEXEC), "Exec format error");
++ TEST_COMPARE_STRING (strerrorname_np (ENOEXEC), "ENOEXEC");
++#endif
++#ifdef EBADF
++ TEST_COMPARE_STRING (strerrordesc_np (EBADF), "Bad file descriptor");
++ TEST_COMPARE_STRING (strerrorname_np (EBADF), "EBADF");
++#endif
++#ifdef ECHILD
++ TEST_COMPARE_STRING (strerrordesc_np (ECHILD), "No child processes");
++ TEST_COMPARE_STRING (strerrorname_np (ECHILD), "ECHILD");
++#endif
++#ifdef EDEADLK
++ TEST_COMPARE_STRING (strerrordesc_np (EDEADLK),
++ "Resource deadlock avoided");
++ TEST_COMPARE_STRING (strerrorname_np (EDEADLK), "EDEADLK");
++#endif
++#ifdef ENOMEM
++ TEST_COMPARE_STRING (strerrordesc_np (ENOMEM), "Cannot allocate memory");
++ TEST_COMPARE_STRING (strerrorname_np (ENOMEM), "ENOMEM");
++#endif
++#ifdef EACCES
++ TEST_COMPARE_STRING (strerrordesc_np (EACCES), "Permission denied");
++ TEST_COMPARE_STRING (strerrorname_np (EACCES), "EACCES");
++#endif
++#ifdef EFAULT
++ TEST_COMPARE_STRING (strerrordesc_np (EFAULT), "Bad address");
++ TEST_COMPARE_STRING (strerrorname_np (EFAULT), "EFAULT");
++#endif
++#ifdef ENOTBLK
++ TEST_COMPARE_STRING (strerrordesc_np (ENOTBLK), "Block device required");
++ TEST_COMPARE_STRING (strerrorname_np (ENOTBLK), "ENOTBLK");
++#endif
++#ifdef EBUSY
++ TEST_COMPARE_STRING (strerrordesc_np (EBUSY), "Device or resource busy");
++ TEST_COMPARE_STRING (strerrorname_np (EBUSY), "EBUSY");
++#endif
++#ifdef EEXIST
++ TEST_COMPARE_STRING (strerrordesc_np (EEXIST), "File exists");
++ TEST_COMPARE_STRING (strerrorname_np (EEXIST), "EEXIST");
++#endif
++#ifdef EXDEV
++ TEST_COMPARE_STRING (strerrordesc_np (EXDEV), "Invalid cross-device link");
++ TEST_COMPARE_STRING (strerrorname_np (EXDEV), "EXDEV");
++#endif
++#ifdef ENODEV
++ TEST_COMPARE_STRING (strerrordesc_np (ENODEV), "No such device");
++ TEST_COMPARE_STRING (strerrorname_np (ENODEV), "ENODEV");
++#endif
++#ifdef ENOTDIR
++ TEST_COMPARE_STRING (strerrordesc_np (ENOTDIR), "Not a directory");
++ TEST_COMPARE_STRING (strerrorname_np (ENOTDIR), "ENOTDIR");
++#endif
++#ifdef EISDIR
++ TEST_COMPARE_STRING (strerrordesc_np (EISDIR), "Is a directory");
++ TEST_COMPARE_STRING (strerrorname_np (EISDIR), "EISDIR");
++#endif
++#ifdef EINVAL
++ TEST_COMPARE_STRING (strerrordesc_np (EINVAL), "Invalid argument");
++ TEST_COMPARE_STRING (strerrorname_np (EINVAL), "EINVAL");
++#endif
++#ifdef EMFILE
++ TEST_COMPARE_STRING (strerrordesc_np (EMFILE), "Too many open files");
++ TEST_COMPARE_STRING (strerrorname_np (EMFILE), "EMFILE");
++#endif
++#ifdef ENFILE
++ TEST_COMPARE_STRING (strerrordesc_np (ENFILE),
++ "Too many open files in system");
++ TEST_COMPARE_STRING (strerrorname_np (ENFILE), "ENFILE");
++#endif
++#ifdef ENOTTY
++ TEST_COMPARE_STRING (strerrordesc_np (ENOTTY),
++ "Inappropriate ioctl for device");
++ TEST_COMPARE_STRING (strerrorname_np (ENOTTY), "ENOTTY");
++#endif
++#ifdef ETXTBSY
++ TEST_COMPARE_STRING (strerrordesc_np (ETXTBSY), "Text file busy");
++ TEST_COMPARE_STRING (strerrorname_np (ETXTBSY), "ETXTBSY");
++#endif
++#ifdef EFBIG
++ TEST_COMPARE_STRING (strerrordesc_np (EFBIG), "File too large");
++ TEST_COMPARE_STRING (strerrorname_np (EFBIG), "EFBIG");
++#endif
++#ifdef ENOSPC
++ TEST_COMPARE_STRING (strerrordesc_np (ENOSPC), "No space left on device");
++ TEST_COMPARE_STRING (strerrorname_np (ENOSPC), "ENOSPC");
++#endif
++#ifdef ESPIPE
++ TEST_COMPARE_STRING (strerrordesc_np (ESPIPE), "Illegal seek");
++ TEST_COMPARE_STRING (strerrorname_np (ESPIPE), "ESPIPE");
++#endif
++#ifdef EROFS
++ TEST_COMPARE_STRING (strerrordesc_np (EROFS), "Read-only file system");
++ TEST_COMPARE_STRING (strerrorname_np (EROFS), "EROFS");
++#endif
++#ifdef EMLINK
++ TEST_COMPARE_STRING (strerrordesc_np (EMLINK), "Too many links");
++ TEST_COMPARE_STRING (strerrorname_np (EMLINK), "EMLINK");
++#endif
++#ifdef EPIPE
++ TEST_COMPARE_STRING (strerrordesc_np (EPIPE), "Broken pipe");
++ TEST_COMPARE_STRING (strerrorname_np (EPIPE), "EPIPE");
++#endif
++#ifdef EDOM
++ TEST_COMPARE_STRING (strerrordesc_np (EDOM),
++ "Numerical argument out of domain");
++ TEST_COMPARE_STRING (strerrorname_np (EDOM), "EDOM");
++#endif
++#ifdef ERANGE
++ TEST_COMPARE_STRING (strerrordesc_np (ERANGE),
++ "Numerical result out of range");
++ TEST_COMPARE_STRING (strerrorname_np (ERANGE), "ERANGE");
++#endif
++#ifdef EAGAIN
++ TEST_COMPARE_STRING (strerrordesc_np (EAGAIN),
++ "Resource temporarily unavailable");
++ TEST_COMPARE_STRING (strerrorname_np (EAGAIN), "EAGAIN");
++#endif
++#ifdef EINPROGRESS
++ TEST_COMPARE_STRING (strerrordesc_np (EINPROGRESS),
++ "Operation now in progress");
++ TEST_COMPARE_STRING (strerrorname_np (EINPROGRESS), "EINPROGRESS");
++#endif
++#ifdef EALREADY
++ TEST_COMPARE_STRING (strerrordesc_np (EALREADY),
++ "Operation already in progress");
++ TEST_COMPARE_STRING (strerrorname_np (EALREADY), "EALREADY");
++#endif
++#ifdef ENOTSOCK
++ TEST_COMPARE_STRING (strerrordesc_np (ENOTSOCK),
++ "Socket operation on non-socket");
++ TEST_COMPARE_STRING (strerrorname_np (ENOTSOCK), "ENOTSOCK");
++#endif
++#ifdef EMSGSIZE
++ TEST_COMPARE_STRING (strerrordesc_np (EMSGSIZE), "Message too long");
++ TEST_COMPARE_STRING (strerrorname_np (EMSGSIZE), "EMSGSIZE");
++#endif
++#ifdef EPROTOTYPE
++ TEST_COMPARE_STRING (strerrordesc_np (EPROTOTYPE),
++ "Protocol wrong type for socket");
++ TEST_COMPARE_STRING (strerrorname_np (EPROTOTYPE), "EPROTOTYPE");
++#endif
++#ifdef ENOPROTOOPT
++ TEST_COMPARE_STRING (strerrordesc_np (ENOPROTOOPT),
++ "Protocol not available");
++ TEST_COMPARE_STRING (strerrorname_np (ENOPROTOOPT), "ENOPROTOOPT");
++#endif
++#ifdef EPROTONOSUPPORT
++ TEST_COMPARE_STRING (strerrordesc_np (EPROTONOSUPPORT),
++ "Protocol not supported");
++ TEST_COMPARE_STRING (strerrorname_np (EPROTONOSUPPORT), "EPROTONOSUPPORT");
++#endif
++#ifdef ESOCKTNOSUPPORT
++ TEST_COMPARE_STRING (strerrordesc_np (ESOCKTNOSUPPORT),
++ "Socket type not supported");
++ TEST_COMPARE_STRING (strerrorname_np (ESOCKTNOSUPPORT), "ESOCKTNOSUPPORT");
++#endif
++#ifdef EOPNOTSUPP
++ TEST_COMPARE_STRING (strerrordesc_np (EOPNOTSUPP),
++ "Operation not supported");
++ TEST_COMPARE_STRING (strerrorname_np (EOPNOTSUPP), "EOPNOTSUPP");
++#endif
++#ifdef EPFNOSUPPORT
++ TEST_COMPARE_STRING (strerrordesc_np (EPFNOSUPPORT),
++ "Protocol family not supported");
++ TEST_COMPARE_STRING (strerrorname_np (EPFNOSUPPORT), "EPFNOSUPPORT");
++#endif
++#ifdef EAFNOSUPPORT
++ TEST_COMPARE_STRING (strerrordesc_np (EAFNOSUPPORT),
++ "Address family not supported by protocol");
++ TEST_COMPARE_STRING (strerrorname_np (EAFNOSUPPORT), "EAFNOSUPPORT");
++#endif
++#ifdef EADDRINUSE
++ TEST_COMPARE_STRING (strerrordesc_np (EADDRINUSE),
++ "Address already in use");
++ TEST_COMPARE_STRING (strerrorname_np (EADDRINUSE), "EADDRINUSE");
++#endif
++#ifdef EADDRNOTAVAIL
++ TEST_COMPARE_STRING (strerrordesc_np (EADDRNOTAVAIL),
++ "Cannot assign requested address");
++ TEST_COMPARE_STRING (strerrorname_np (EADDRNOTAVAIL), "EADDRNOTAVAIL");
++#endif
++#ifdef ENETDOWN
++ TEST_COMPARE_STRING (strerrordesc_np (ENETDOWN), "Network is down");
++ TEST_COMPARE_STRING (strerrorname_np (ENETDOWN), "ENETDOWN");
++#endif
++#ifdef ENETUNREACH
++ TEST_COMPARE_STRING (strerrordesc_np (ENETUNREACH),
++ "Network is unreachable");
++ TEST_COMPARE_STRING (strerrorname_np (ENETUNREACH), "ENETUNREACH");
++#endif
++#ifdef ENETRESET
++ TEST_COMPARE_STRING (strerrordesc_np (ENETRESET),
++ "Network dropped connection on reset");
++ TEST_COMPARE_STRING (strerrorname_np (ENETRESET), "ENETRESET");
++#endif
++#ifdef ECONNABORTED
++ TEST_COMPARE_STRING (strerrordesc_np (ECONNABORTED),
++ "Software caused connection abort");
++ TEST_COMPARE_STRING (strerrorname_np (ECONNABORTED), "ECONNABORTED");
++#endif
++#ifdef ECONNRESET
++ TEST_COMPARE_STRING (strerrordesc_np (ECONNRESET),
++ "Connection reset by peer");
++ TEST_COMPARE_STRING (strerrorname_np (ECONNRESET), "ECONNRESET");
++#endif
++#ifdef ENOBUFS
++ TEST_COMPARE_STRING (strerrordesc_np (ENOBUFS),
++ "No buffer space available");
++ TEST_COMPARE_STRING (strerrorname_np (ENOBUFS), "ENOBUFS");
++#endif
++#ifdef EISCONN
++ TEST_COMPARE_STRING (strerrordesc_np (EISCONN),
++ "Transport endpoint is already connected");
++ TEST_COMPARE_STRING (strerrorname_np (EISCONN), "EISCONN");
++#endif
++#ifdef ENOTCONN
++ TEST_COMPARE_STRING (strerrordesc_np (ENOTCONN),
++ "Transport endpoint is not connected");
++ TEST_COMPARE_STRING (strerrorname_np (ENOTCONN), "ENOTCONN");
++#endif
++#ifdef EDESTADDRREQ
++ TEST_COMPARE_STRING (strerrordesc_np (EDESTADDRREQ),
++ "Destination address required");
++ TEST_COMPARE_STRING (strerrorname_np (EDESTADDRREQ), "EDESTADDRREQ");
++#endif
++#ifdef ESHUTDOWN
++ TEST_COMPARE_STRING (strerrordesc_np (ESHUTDOWN),
++ "Cannot send after transport endpoint shutdown");
++ TEST_COMPARE_STRING (strerrorname_np (ESHUTDOWN), "ESHUTDOWN");
++#endif
++#ifdef ETOOMANYREFS
++ TEST_COMPARE_STRING (strerrordesc_np (ETOOMANYREFS),
++ "Too many references: cannot splice");
++ TEST_COMPARE_STRING (strerrorname_np (ETOOMANYREFS), "ETOOMANYREFS");
++#endif
++#ifdef ETIMEDOUT
++ TEST_COMPARE_STRING (strerrordesc_np (ETIMEDOUT), "Connection timed out");
++ TEST_COMPARE_STRING (strerrorname_np (ETIMEDOUT), "ETIMEDOUT");
++#endif
++#ifdef ECONNREFUSED
++ TEST_COMPARE_STRING (strerrordesc_np (ECONNREFUSED), "Connection refused");
++ TEST_COMPARE_STRING (strerrorname_np (ECONNREFUSED), "ECONNREFUSED");
++#endif
++#ifdef ELOOP
++ TEST_COMPARE_STRING (strerrordesc_np (ELOOP),
++ "Too many levels of symbolic links");
++ TEST_COMPARE_STRING (strerrorname_np (ELOOP), "ELOOP");
++#endif
++#ifdef ENAMETOOLONG
++ TEST_COMPARE_STRING (strerrordesc_np (ENAMETOOLONG), "File name too long");
++ TEST_COMPARE_STRING (strerrorname_np (ENAMETOOLONG), "ENAMETOOLONG");
++#endif
++#ifdef EHOSTDOWN
++ TEST_COMPARE_STRING (strerrordesc_np (EHOSTDOWN), "Host is down");
++ TEST_COMPARE_STRING (strerrorname_np (EHOSTDOWN), "EHOSTDOWN");
++#endif
++#ifdef EHOSTUNREACH
++ TEST_COMPARE_STRING (strerrordesc_np (EHOSTUNREACH), "No route to host");
++ TEST_COMPARE_STRING (strerrorname_np (EHOSTUNREACH), "EHOSTUNREACH");
++#endif
++#ifdef ENOTEMPTY
++ TEST_COMPARE_STRING (strerrordesc_np (ENOTEMPTY), "Directory not empty");
++ TEST_COMPARE_STRING (strerrorname_np (ENOTEMPTY), "ENOTEMPTY");
++#endif
++#ifdef EUSERS
++ TEST_COMPARE_STRING (strerrordesc_np (EUSERS), "Too many users");
++ TEST_COMPARE_STRING (strerrorname_np (EUSERS), "EUSERS");
++#endif
++#ifdef EDQUOT
++ TEST_COMPARE_STRING (strerrordesc_np (EDQUOT), "Disk quota exceeded");
++ TEST_COMPARE_STRING (strerrorname_np (EDQUOT), "EDQUOT");
++#endif
++#ifdef ESTALE
++ TEST_COMPARE_STRING (strerrordesc_np (ESTALE), "Stale file handle");
++ TEST_COMPARE_STRING (strerrorname_np (ESTALE), "ESTALE");
++#endif
++#ifdef EREMOTE
++ TEST_COMPARE_STRING (strerrordesc_np (EREMOTE), "Object is remote");
++ TEST_COMPARE_STRING (strerrorname_np (EREMOTE), "EREMOTE");
++#endif
++#ifdef ENOLCK
++ TEST_COMPARE_STRING (strerrordesc_np (ENOLCK), "No locks available");
++ TEST_COMPARE_STRING (strerrorname_np (ENOLCK), "ENOLCK");
++#endif
++#ifdef ENOSYS
++ TEST_COMPARE_STRING (strerrordesc_np (ENOSYS), "Function not implemented");
++ TEST_COMPARE_STRING (strerrorname_np (ENOSYS), "ENOSYS");
++#endif
++#ifdef EILSEQ
++ TEST_COMPARE_STRING (strerrordesc_np (EILSEQ),
++ "Invalid or incomplete multibyte or wide character");
++ TEST_COMPARE_STRING (strerrorname_np (EILSEQ), "EILSEQ");
++#endif
++#ifdef EBADMSG
++ TEST_COMPARE_STRING (strerrordesc_np (EBADMSG), "Bad message");
++ TEST_COMPARE_STRING (strerrorname_np (EBADMSG), "EBADMSG");
++#endif
++#ifdef EIDRM
++ TEST_COMPARE_STRING (strerrordesc_np (EIDRM), "Identifier removed");
++ TEST_COMPARE_STRING (strerrorname_np (EIDRM), "EIDRM");
++#endif
++#ifdef EMULTIHOP
++ TEST_COMPARE_STRING (strerrordesc_np (EMULTIHOP), "Multihop attempted");
++ TEST_COMPARE_STRING (strerrorname_np (EMULTIHOP), "EMULTIHOP");
++#endif
++#ifdef ENODATA
++ TEST_COMPARE_STRING (strerrordesc_np (ENODATA), "No data available");
++ TEST_COMPARE_STRING (strerrorname_np (ENODATA), "ENODATA");
++#endif
++#ifdef ENOLINK
++ TEST_COMPARE_STRING (strerrordesc_np (ENOLINK), "Link has been severed");
++ TEST_COMPARE_STRING (strerrorname_np (ENOLINK), "ENOLINK");
++#endif
++#ifdef ENOMSG
++ TEST_COMPARE_STRING (strerrordesc_np (ENOMSG),
++ "No message of desired type");
++ TEST_COMPARE_STRING (strerrorname_np (ENOMSG), "ENOMSG");
++#endif
++#ifdef ENOSR
++ TEST_COMPARE_STRING (strerrordesc_np (ENOSR), "Out of streams resources");
++ TEST_COMPARE_STRING (strerrorname_np (ENOSR), "ENOSR");
++#endif
++#ifdef ENOSTR
++ TEST_COMPARE_STRING (strerrordesc_np (ENOSTR), "Device not a stream");
++ TEST_COMPARE_STRING (strerrorname_np (ENOSTR), "ENOSTR");
++#endif
++#ifdef EOVERFLOW
++ TEST_COMPARE_STRING (strerrordesc_np (EOVERFLOW),
++ "Value too large for defined data type");
++ TEST_COMPARE_STRING (strerrorname_np (EOVERFLOW), "EOVERFLOW");
++#endif
++#ifdef EPROTO
++ TEST_COMPARE_STRING (strerrordesc_np (EPROTO), "Protocol error");
++ TEST_COMPARE_STRING (strerrorname_np (EPROTO), "EPROTO");
++#endif
++#ifdef ETIME
++ TEST_COMPARE_STRING (strerrordesc_np (ETIME), "Timer expired");
++ TEST_COMPARE_STRING (strerrorname_np (ETIME), "ETIME");
++#endif
++#ifdef ECANCELED
++ TEST_COMPARE_STRING (strerrordesc_np (ECANCELED), "Operation canceled");
++ TEST_COMPARE_STRING (strerrorname_np (ECANCELED), "ECANCELED");
++#endif
++#ifdef EOWNERDEAD
++ TEST_COMPARE_STRING (strerrordesc_np (EOWNERDEAD), "Owner died");
++ TEST_COMPARE_STRING (strerrorname_np (EOWNERDEAD), "EOWNERDEAD");
++#endif
++#ifdef ENOTRECOVERABLE
++ TEST_COMPARE_STRING (strerrordesc_np (ENOTRECOVERABLE),
++ "State not recoverable");
++ TEST_COMPARE_STRING (strerrorname_np (ENOTRECOVERABLE), "ENOTRECOVERABLE");
++#endif
++#ifdef ERESTART
++ TEST_COMPARE_STRING (strerrordesc_np (ERESTART),
++ "Interrupted system call should be restarted");
++ TEST_COMPARE_STRING (strerrorname_np (ERESTART), "ERESTART");
++#endif
++#ifdef ECHRNG
++ TEST_COMPARE_STRING (strerrordesc_np (ECHRNG),
++ "Channel number out of range");
++ TEST_COMPARE_STRING (strerrorname_np (ECHRNG), "ECHRNG");
++#endif
++#ifdef EL2NSYNC
++ TEST_COMPARE_STRING (strerrordesc_np (EL2NSYNC),
++ "Level 2 not synchronized");
++ TEST_COMPARE_STRING (strerrorname_np (EL2NSYNC), "EL2NSYNC");
++#endif
++#ifdef EL3HLT
++ TEST_COMPARE_STRING (strerrordesc_np (EL3HLT), "Level 3 halted");
++ TEST_COMPARE_STRING (strerrorname_np (EL3HLT), "EL3HLT");
++#endif
++#ifdef EL3RST
++ TEST_COMPARE_STRING (strerrordesc_np (EL3RST), "Level 3 reset");
++ TEST_COMPARE_STRING (strerrorname_np (EL3RST), "EL3RST");
++#endif
++#ifdef ELNRNG
++ TEST_COMPARE_STRING (strerrordesc_np (ELNRNG), "Link number out of range");
++ TEST_COMPARE_STRING (strerrorname_np (ELNRNG), "ELNRNG");
++#endif
++#ifdef EUNATCH
++ TEST_COMPARE_STRING (strerrordesc_np (EUNATCH),
++ "Protocol driver not attached");
++ TEST_COMPARE_STRING (strerrorname_np (EUNATCH), "EUNATCH");
++#endif
++#ifdef ENOCSI
++ TEST_COMPARE_STRING (strerrordesc_np (ENOCSI),
++ "No CSI structure available");
++ TEST_COMPARE_STRING (strerrorname_np (ENOCSI), "ENOCSI");
++#endif
++#ifdef EL2HLT
++ TEST_COMPARE_STRING (strerrordesc_np (EL2HLT), "Level 2 halted");
++ TEST_COMPARE_STRING (strerrorname_np (EL2HLT), "EL2HLT");
++#endif
++#ifdef EBADE
++ TEST_COMPARE_STRING (strerrordesc_np (EBADE), "Invalid exchange");
++ TEST_COMPARE_STRING (strerrorname_np (EBADE), "EBADE");
++#endif
++#ifdef EBADR
++ TEST_COMPARE_STRING (strerrordesc_np (EBADR),
++ "Invalid request descriptor");
++ TEST_COMPARE_STRING (strerrorname_np (EBADR), "EBADR");
++#endif
++#ifdef EXFULL
++ TEST_COMPARE_STRING (strerrordesc_np (EXFULL), "Exchange full");
++ TEST_COMPARE_STRING (strerrorname_np (EXFULL), "EXFULL");
++#endif
++#ifdef ENOANO
++ TEST_COMPARE_STRING (strerrordesc_np (ENOANO), "No anode");
++ TEST_COMPARE_STRING (strerrorname_np (ENOANO), "ENOANO");
++#endif
++#ifdef EBADRQC
++ TEST_COMPARE_STRING (strerrordesc_np (EBADRQC), "Invalid request code");
++ TEST_COMPARE_STRING (strerrorname_np (EBADRQC), "EBADRQC");
++#endif
++#ifdef EBADSLT
++ TEST_COMPARE_STRING (strerrordesc_np (EBADSLT), "Invalid slot");
++ TEST_COMPARE_STRING (strerrorname_np (EBADSLT), "EBADSLT");
++#endif
++#ifdef EBFONT
++ TEST_COMPARE_STRING (strerrordesc_np (EBFONT), "Bad font file format");
++ TEST_COMPARE_STRING (strerrorname_np (EBFONT), "EBFONT");
++#endif
++#ifdef ENONET
++ TEST_COMPARE_STRING (strerrordesc_np (ENONET),
++ "Machine is not on the network");
++ TEST_COMPARE_STRING (strerrorname_np (ENONET), "ENONET");
++#endif
++#ifdef ENOPKG
++ TEST_COMPARE_STRING (strerrordesc_np (ENOPKG), "Package not installed");
++ TEST_COMPARE_STRING (strerrorname_np (ENOPKG), "ENOPKG");
++#endif
++#ifdef EADV
++ TEST_COMPARE_STRING (strerrordesc_np (EADV), "Advertise error");
++ TEST_COMPARE_STRING (strerrorname_np (EADV), "EADV");
++#endif
++#ifdef ESRMNT
++ TEST_COMPARE_STRING (strerrordesc_np (ESRMNT), "Srmount error");
++ TEST_COMPARE_STRING (strerrorname_np (ESRMNT), "ESRMNT");
++#endif
++#ifdef ECOMM
++ TEST_COMPARE_STRING (strerrordesc_np (ECOMM),
++ "Communication error on send");
++ TEST_COMPARE_STRING (strerrorname_np (ECOMM), "ECOMM");
++#endif
++#ifdef EDOTDOT
++ TEST_COMPARE_STRING (strerrordesc_np (EDOTDOT), "RFS specific error");
++ TEST_COMPARE_STRING (strerrorname_np (EDOTDOT), "EDOTDOT");
++#endif
++#ifdef ENOTUNIQ
++ TEST_COMPARE_STRING (strerrordesc_np (ENOTUNIQ),
++ "Name not unique on network");
++ TEST_COMPARE_STRING (strerrorname_np (ENOTUNIQ), "ENOTUNIQ");
++#endif
++#ifdef EBADFD
++ TEST_COMPARE_STRING (strerrordesc_np (EBADFD),
++ "File descriptor in bad state");
++ TEST_COMPARE_STRING (strerrorname_np (EBADFD), "EBADFD");
++#endif
++#ifdef EREMCHG
++ TEST_COMPARE_STRING (strerrordesc_np (EREMCHG), "Remote address changed");
++ TEST_COMPARE_STRING (strerrorname_np (EREMCHG), "EREMCHG");
++#endif
++#ifdef ELIBACC
++ TEST_COMPARE_STRING (strerrordesc_np (ELIBACC),
++ "Can not access a needed shared library");
++ TEST_COMPARE_STRING (strerrorname_np (ELIBACC), "ELIBACC");
++#endif
++#ifdef ELIBBAD
++ TEST_COMPARE_STRING (strerrordesc_np (ELIBBAD),
++ "Accessing a corrupted shared library");
++ TEST_COMPARE_STRING (strerrorname_np (ELIBBAD), "ELIBBAD");
++#endif
++#ifdef ELIBSCN
++ TEST_COMPARE_STRING (strerrordesc_np (ELIBSCN),
++ ".lib section in a.out corrupted");
++ TEST_COMPARE_STRING (strerrorname_np (ELIBSCN), "ELIBSCN");
++#endif
++#ifdef ELIBMAX
++ TEST_COMPARE_STRING (strerrordesc_np (ELIBMAX),
++ "Attempting to link in too many shared libraries");
++ TEST_COMPARE_STRING (strerrorname_np (ELIBMAX), "ELIBMAX");
++#endif
++#ifdef ELIBEXEC
++ TEST_COMPARE_STRING (strerrordesc_np (ELIBEXEC),
++ "Cannot exec a shared library directly");
++ TEST_COMPARE_STRING (strerrorname_np (ELIBEXEC), "ELIBEXEC");
++#endif
++#ifdef ESTRPIPE
++ TEST_COMPARE_STRING (strerrordesc_np (ESTRPIPE), "Streams pipe error");
++ TEST_COMPARE_STRING (strerrorname_np (ESTRPIPE), "ESTRPIPE");
++#endif
++#ifdef EUCLEAN
++ TEST_COMPARE_STRING (strerrordesc_np (EUCLEAN),
++ "Structure needs cleaning");
++ TEST_COMPARE_STRING (strerrorname_np (EUCLEAN), "EUCLEAN");
++#endif
++#ifdef ENOTNAM
++ TEST_COMPARE_STRING (strerrordesc_np (ENOTNAM),
++ "Not a XENIX named type file");
++ TEST_COMPARE_STRING (strerrorname_np (ENOTNAM), "ENOTNAM");
++#endif
++#ifdef ENAVAIL
++ TEST_COMPARE_STRING (strerrordesc_np (ENAVAIL),
++ "No XENIX semaphores available");
++ TEST_COMPARE_STRING (strerrorname_np (ENAVAIL), "ENAVAIL");
++#endif
++#ifdef EISNAM
++ TEST_COMPARE_STRING (strerrordesc_np (EISNAM), "Is a named type file");
++ TEST_COMPARE_STRING (strerrorname_np (EISNAM), "EISNAM");
++#endif
++#ifdef EREMOTEIO
++ TEST_COMPARE_STRING (strerrordesc_np (EREMOTEIO), "Remote I/O error");
++ TEST_COMPARE_STRING (strerrorname_np (EREMOTEIO), "EREMOTEIO");
++#endif
++#ifdef ENOMEDIUM
++ TEST_COMPARE_STRING (strerrordesc_np (ENOMEDIUM), "No medium found");
++ TEST_COMPARE_STRING (strerrorname_np (ENOMEDIUM), "ENOMEDIUM");
++#endif
++#ifdef EMEDIUMTYPE
++ TEST_COMPARE_STRING (strerrordesc_np (EMEDIUMTYPE), "Wrong medium type");
++ TEST_COMPARE_STRING (strerrorname_np (EMEDIUMTYPE), "EMEDIUMTYPE");
++#endif
++#ifdef ENOKEY
++ TEST_COMPARE_STRING (strerrordesc_np (ENOKEY),
++ "Required key not available");
++ TEST_COMPARE_STRING (strerrorname_np (ENOKEY), "ENOKEY");
++#endif
++#ifdef EKEYEXPIRED
++ TEST_COMPARE_STRING (strerrordesc_np (EKEYEXPIRED), "Key has expired");
++ TEST_COMPARE_STRING (strerrorname_np (EKEYEXPIRED), "EKEYEXPIRED");
++#endif
++#ifdef EKEYREVOKED
++ TEST_COMPARE_STRING (strerrordesc_np (EKEYREVOKED),
++ "Key has been revoked");
++ TEST_COMPARE_STRING (strerrorname_np (EKEYREVOKED), "EKEYREVOKED");
++#endif
++#ifdef EKEYREJECTED
++ TEST_COMPARE_STRING (strerrordesc_np (EKEYREJECTED),
++ "Key was rejected by service");
++ TEST_COMPARE_STRING (strerrorname_np (EKEYREJECTED), "EKEYREJECTED");
++#endif
++#ifdef ERFKILL
++ TEST_COMPARE_STRING (strerrordesc_np (ERFKILL),
++ "Operation not possible due to RF-kill");
++ TEST_COMPARE_STRING (strerrorname_np (ERFKILL), "ERFKILL");
++#endif
++#ifdef EHWPOISON
++ TEST_COMPARE_STRING (strerrordesc_np (EHWPOISON),
++ "Memory page has hardware error");
++ TEST_COMPARE_STRING (strerrorname_np (EHWPOISON), "EHWPOISON");
++#endif
++#ifdef EBADRPC
++ TEST_COMPARE_STRING (strerrordesc_np (EBADRPC), "RPC struct is bad");
++ TEST_COMPARE_STRING (strerrorname_np (EBADRPC), "EBADRPC");
++#endif
++#ifdef EFTYPE
++ TEST_COMPARE_STRING (strerrordesc_np (EFTYPE),
++ "Inappropriate file type or format");
++ TEST_COMPARE_STRING (strerrorname_np (EFTYPE), "EFTYPE");
++#endif
++#ifdef EPROCUNAVAIL
++ TEST_COMPARE_STRING (strerrordesc_np (EPROCUNAVAIL),
++ "RPC bad procedure for program");
++ TEST_COMPARE_STRING (strerrorname_np (EPROCUNAVAIL), "EPROCUNAVAIL");
++#endif
++#ifdef EAUTH
++ TEST_COMPARE_STRING (strerrordesc_np (EAUTH), "Authentication error");
++ TEST_COMPARE_STRING (strerrorname_np (EAUTH), "EAUTH");
++#endif
++#ifdef EDIED
++ TEST_COMPARE_STRING (strerrordesc_np (EDIED), "Translator died");
++ TEST_COMPARE_STRING (strerrorname_np (EDIED), "EDIED");
++#endif
++#ifdef ERPCMISMATCH
++ TEST_COMPARE_STRING (strerrordesc_np (ERPCMISMATCH), "RPC version wrong");
++ TEST_COMPARE_STRING (strerrorname_np (ERPCMISMATCH), "ERPCMISMATCH");
++#endif
++#ifdef EGREGIOUS
++ TEST_COMPARE_STRING (strerrordesc_np (EGREGIOUS),
++ "You really blew it this time");
++ TEST_COMPARE_STRING (strerrorname_np (EGREGIOUS), "EGREGIOUS");
++#endif
++#ifdef EPROCLIM
++ TEST_COMPARE_STRING (strerrordesc_np (EPROCLIM), "Too many processes");
++ TEST_COMPARE_STRING (strerrorname_np (EPROCLIM), "EPROCLIM");
++#endif
++#ifdef EGRATUITOUS
++ TEST_COMPARE_STRING (strerrordesc_np (EGRATUITOUS), "Gratuitous error");
++ TEST_COMPARE_STRING (strerrorname_np (EGRATUITOUS), "EGRATUITOUS");
++#endif
++#if defined (ENOTSUP) && ENOTSUP != EOPNOTSUPP
++ TEST_COMPARE_STRING (strerrordesc_np (ENOTSUP), "Not supported");
++ TEST_COMPARE_STRING (strerrorname_np (ENOTSUP), "ENOTSUP");
++#endif
++#ifdef EPROGMISMATCH
++ TEST_COMPARE_STRING (strerrordesc_np (EPROGMISMATCH),
++ "RPC program version wrong");
++ TEST_COMPARE_STRING (strerrorname_np (EPROGMISMATCH), "EPROGMISMATCH");
++#endif
++#ifdef EBACKGROUND
++ TEST_COMPARE_STRING (strerrordesc_np (EBACKGROUND),
++ "Inappropriate operation for background process");
++ TEST_COMPARE_STRING (strerrorname_np (EBACKGROUND), "EBACKGROUND");
++#endif
++#ifdef EIEIO
++ TEST_COMPARE_STRING (strerrordesc_np (EIEIO), "Computer bought the farm");
++ TEST_COMPARE_STRING (strerrorname_np (EIEIO), "EIEIO");
++#endif
++#if defined (EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
++ TEST_COMPARE_STRING (strerrordesc_np (EWOULDBLOCK),
++ "Operation would block");
++ TEST_COMPARE_STRING (strerrorname_np (EWOULDBLOCK), "EWOULDBLOCK");
++#endif
++#ifdef ENEEDAUTH
++ TEST_COMPARE_STRING (strerrordesc_np (ENEEDAUTH), "Need authenticator");
++ TEST_COMPARE_STRING (strerrorname_np (ENEEDAUTH), "ENEEDAUTH");
++#endif
++#ifdef ED
++ TEST_COMPARE_STRING (strerrordesc_np (ED), "?");
++ TEST_COMPARE_STRING (strerrorname_np (ED), "ED");
++#endif
++#ifdef EPROGUNAVAIL
++ TEST_COMPARE_STRING (strerrordesc_np (EPROGUNAVAIL),
++ "RPC program not available");
++ TEST_COMPARE_STRING (strerrorname_np (EPROGUNAVAIL), "EPROGUNAVAIL");
++#endif
+
+ return 0;
+ }
+diff --git a/sysdeps/gnu/errlist.h b/sysdeps/gnu/errlist.h
+index 5d11ed723d..6329e5f393 100644
+--- a/sysdeps/gnu/errlist.h
++++ b/sysdeps/gnu/errlist.h
+@@ -1,24 +1,21 @@
+-#ifndef ERR_MAP
+-#define ERR_MAP(value) value
+-#endif
+-_S(ERR_MAP(0), N_("Success"))
++_S(0, N_("Success"))
+ #ifdef EPERM
+ /*
+ TRANS Only the owner of the file (or other resource)
+ TRANS or processes with special privileges can perform the operation. */
+-_S(ERR_MAP(EPERM), N_("Operation not permitted"))
++_S(EPERM, N_("Operation not permitted"))
+ #endif
+ #ifdef ENOENT
+ /*
+ TRANS This is a ``file doesn't exist'' error
+ TRANS for ordinary files that are referenced in contexts where they are
+ TRANS expected to already exist. */
+-_S(ERR_MAP(ENOENT), N_("No such file or directory"))
++_S(ENOENT, N_("No such file or directory"))
+ #endif
+ #ifdef ESRCH
+ /*
+ TRANS No process matches the specified process ID. */
+-_S(ERR_MAP(ESRCH), N_("No such process"))
++_S(ESRCH, N_("No such process"))
+ #endif
+ #ifdef EINTR
+ /*
+@@ -29,12 +26,12 @@ TRANS
+ TRANS You can choose to have functions resume after a signal that is handled,
+ TRANS rather than failing with @code{EINTR}; see @ref{Interrupted
+ TRANS Primitives}. */
+-_S(ERR_MAP(EINTR), N_("Interrupted system call"))
++_S(EINTR, N_("Interrupted system call"))
+ #endif
+ #ifdef EIO
+ /*
+ TRANS Usually used for physical read or write errors. */
+-_S(ERR_MAP(EIO), N_("Input/output error"))
++_S(EIO, N_("Input/output error"))
+ #endif
+ #ifdef ENXIO
+ /*
+@@ -43,7 +40,7 @@ TRANS represented by a file you specified, and it couldn't find the device.
+ TRANS This can mean that the device file was installed incorrectly, or that
+ TRANS the physical device is missing or not correctly attached to the
+ TRANS computer. */
+-_S(ERR_MAP(ENXIO), N_("No such device or address"))
++_S(ENXIO, N_("No such device or address"))
+ #endif
+ #ifdef E2BIG
+ /*
+@@ -51,27 +48,27 @@ TRANS Used when the arguments passed to a new program
+ TRANS being executed with one of the @code{exec} functions (@pxref{Executing a
+ TRANS File}) occupy too much memory space. This condition never arises on
+ TRANS @gnuhurdsystems{}. */
+-_S(ERR_MAP(E2BIG), N_("Argument list too long"))
++_S(E2BIG, N_("Argument list too long"))
+ #endif
+ #ifdef ENOEXEC
+ /*
+ TRANS Invalid executable file format. This condition is detected by the
+ TRANS @code{exec} functions; see @ref{Executing a File}. */
+-_S(ERR_MAP(ENOEXEC), N_("Exec format error"))
++_S(ENOEXEC, N_("Exec format error"))
+ #endif
+ #ifdef EBADF
+ /*
+ TRANS For example, I/O on a descriptor that has been
+ TRANS closed or reading from a descriptor open only for writing (or vice
+ TRANS versa). */
+-_S(ERR_MAP(EBADF), N_("Bad file descriptor"))
++_S(EBADF, N_("Bad file descriptor"))
+ #endif
+ #ifdef ECHILD
+ /*
+ TRANS This error happens on operations that are
+ TRANS supposed to manipulate child processes, when there aren't any processes
+ TRANS to manipulate. */
+-_S(ERR_MAP(ECHILD), N_("No child processes"))
++_S(ECHILD, N_("No child processes"))
+ #endif
+ #ifdef EDEADLK
+ /*
+@@ -79,74 +76,74 @@ TRANS Allocating a system resource would have resulted in a
+ TRANS deadlock situation. The system does not guarantee that it will notice
+ TRANS all such situations. This error means you got lucky and the system
+ TRANS noticed; it might just hang. @xref{File Locks}, for an example. */
+-_S(ERR_MAP(EDEADLK), N_("Resource deadlock avoided"))
++_S(EDEADLK, N_("Resource deadlock avoided"))
+ #endif
+ #ifdef ENOMEM
+ /*
+ TRANS The system cannot allocate more virtual memory
+ TRANS because its capacity is full. */
+-_S(ERR_MAP(ENOMEM), N_("Cannot allocate memory"))
++_S(ENOMEM, N_("Cannot allocate memory"))
+ #endif
+ #ifdef EACCES
+ /*
+ TRANS The file permissions do not allow the attempted operation. */
+-_S(ERR_MAP(EACCES), N_("Permission denied"))
++_S(EACCES, N_("Permission denied"))
+ #endif
+ #ifdef EFAULT
+ /*
+ TRANS An invalid pointer was detected.
+ TRANS On @gnuhurdsystems{}, this error never happens; you get a signal instead. */
+-_S(ERR_MAP(EFAULT), N_("Bad address"))
++_S(EFAULT, N_("Bad address"))
+ #endif
+ #ifdef ENOTBLK
+ /*
+ TRANS A file that isn't a block special file was given in a situation that
+ TRANS requires one. For example, trying to mount an ordinary file as a file
+ TRANS system in Unix gives this error. */
+-_S(ERR_MAP(ENOTBLK), N_("Block device required"))
++_S(ENOTBLK, N_("Block device required"))
+ #endif
+ #ifdef EBUSY
+ /*
+ TRANS A system resource that can't be shared is already in use.
+ TRANS For example, if you try to delete a file that is the root of a currently
+ TRANS mounted filesystem, you get this error. */
+-_S(ERR_MAP(EBUSY), N_("Device or resource busy"))
++_S(EBUSY, N_("Device or resource busy"))
+ #endif
+ #ifdef EEXIST
+ /*
+ TRANS An existing file was specified in a context where it only
+ TRANS makes sense to specify a new file. */
+-_S(ERR_MAP(EEXIST), N_("File exists"))
++_S(EEXIST, N_("File exists"))
+ #endif
+ #ifdef EXDEV
+ /*
+ TRANS An attempt to make an improper link across file systems was detected.
+ TRANS This happens not only when you use @code{link} (@pxref{Hard Links}) but
+ TRANS also when you rename a file with @code{rename} (@pxref{Renaming Files}). */
+-_S(ERR_MAP(EXDEV), N_("Invalid cross-device link"))
++_S(EXDEV, N_("Invalid cross-device link"))
+ #endif
+ #ifdef ENODEV
+ /*
+ TRANS The wrong type of device was given to a function that expects a
+ TRANS particular sort of device. */
+-_S(ERR_MAP(ENODEV), N_("No such device"))
++_S(ENODEV, N_("No such device"))
+ #endif
+ #ifdef ENOTDIR
+ /*
+ TRANS A file that isn't a directory was specified when a directory is required. */
+-_S(ERR_MAP(ENOTDIR), N_("Not a directory"))
++_S(ENOTDIR, N_("Not a directory"))
+ #endif
+ #ifdef EISDIR
+ /*
+ TRANS You cannot open a directory for writing,
+ TRANS or create or remove hard links to it. */
+-_S(ERR_MAP(EISDIR), N_("Is a directory"))
++_S(EISDIR, N_("Is a directory"))
+ #endif
+ #ifdef EINVAL
+ /*
+ TRANS This is used to indicate various kinds of problems
+ TRANS with passing the wrong argument to a library function. */
+-_S(ERR_MAP(EINVAL), N_("Invalid argument"))
++_S(EINVAL, N_("Invalid argument"))
+ #endif
+ #ifdef EMFILE
+ /*
+@@ -157,20 +154,20 @@ TRANS In BSD and GNU, the number of open files is controlled by a resource
+ TRANS limit that can usually be increased. If you get this error, you might
+ TRANS want to increase the @code{RLIMIT_NOFILE} limit or make it unlimited;
+ TRANS @pxref{Limits on Resources}. */
+-_S(ERR_MAP(EMFILE), N_("Too many open files"))
++_S(EMFILE, N_("Too many open files"))
+ #endif
+ #ifdef ENFILE
+ /*
+ TRANS There are too many distinct file openings in the entire system. Note
+ TRANS that any number of linked channels count as just one file opening; see
+ TRANS @ref{Linked Channels}. This error never occurs on @gnuhurdsystems{}. */
+-_S(ERR_MAP(ENFILE), N_("Too many open files in system"))
++_S(ENFILE, N_("Too many open files in system"))
+ #endif
+ #ifdef ENOTTY
+ /*
+ TRANS Inappropriate I/O control operation, such as trying to set terminal
+ TRANS modes on an ordinary file. */
+-_S(ERR_MAP(ENOTTY), N_("Inappropriate ioctl for device"))
++_S(ENOTTY, N_("Inappropriate ioctl for device"))
+ #endif
+ #ifdef ETXTBSY
+ /*
+@@ -179,35 +176,35 @@ TRANS write to a file that is currently being executed. Often using a
+ TRANS debugger to run a program is considered having it open for writing and
+ TRANS will cause this error. (The name stands for ``text file busy''.) This
+ TRANS is not an error on @gnuhurdsystems{}; the text is copied as necessary. */
+-_S(ERR_MAP(ETXTBSY), N_("Text file busy"))
++_S(ETXTBSY, N_("Text file busy"))
+ #endif
+ #ifdef EFBIG
+ /*
+ TRANS The size of a file would be larger than allowed by the system. */
+-_S(ERR_MAP(EFBIG), N_("File too large"))
++_S(EFBIG, N_("File too large"))
+ #endif
+ #ifdef ENOSPC
+ /*
+ TRANS Write operation on a file failed because the
+ TRANS disk is full. */
+-_S(ERR_MAP(ENOSPC), N_("No space left on device"))
++_S(ENOSPC, N_("No space left on device"))
+ #endif
+ #ifdef ESPIPE
+ /*
+ TRANS Invalid seek operation (such as on a pipe). */
+-_S(ERR_MAP(ESPIPE), N_("Illegal seek"))
++_S(ESPIPE, N_("Illegal seek"))
+ #endif
+ #ifdef EROFS
+ /*
+ TRANS An attempt was made to modify something on a read-only file system. */
+-_S(ERR_MAP(EROFS), N_("Read-only file system"))
++_S(EROFS, N_("Read-only file system"))
+ #endif
+ #ifdef EMLINK
+ /*
+ TRANS The link count of a single file would become too large.
+ TRANS @code{rename} can cause this error if the file being renamed already has
+ TRANS as many links as it can take (@pxref{Renaming Files}). */
+-_S(ERR_MAP(EMLINK), N_("Too many links"))
++_S(EMLINK, N_("Too many links"))
+ #endif
+ #ifdef EPIPE
+ /*
+@@ -216,19 +213,19 @@ TRANS Every library function that returns this error code also generates a
+ TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled
+ TRANS or blocked. Thus, your program will never actually see @code{EPIPE}
+ TRANS unless it has handled or blocked @code{SIGPIPE}. */
+-_S(ERR_MAP(EPIPE), N_("Broken pipe"))
++_S(EPIPE, N_("Broken pipe"))
+ #endif
+ #ifdef EDOM
+ /*
+ TRANS Used by mathematical functions when an argument value does
+ TRANS not fall into the domain over which the function is defined. */
+-_S(ERR_MAP(EDOM), N_("Numerical argument out of domain"))
++_S(EDOM, N_("Numerical argument out of domain"))
+ #endif
+ #ifdef ERANGE
+ /*
+ TRANS Used by mathematical functions when the result value is
+ TRANS not representable because of overflow or underflow. */
+-_S(ERR_MAP(ERANGE), N_("Numerical result out of range"))
++_S(ERANGE, N_("Numerical result out of range"))
+ #endif
+ #ifdef EAGAIN
+ /*
+@@ -261,7 +258,7 @@ TRANS Such shortages are usually fairly serious and affect the whole system,
+ TRANS so usually an interactive program should report the error to the user
+ TRANS and return to its command loop.
+ TRANS @end itemize */
+-_S(ERR_MAP(EAGAIN), N_("Resource temporarily unavailable"))
++_S(EAGAIN, N_("Resource temporarily unavailable"))
+ #endif
+ #ifdef EINPROGRESS
+ /*
+@@ -273,47 +270,47 @@ TRANS the operation has begun and will take some time. Attempts to manipulate
+ TRANS the object before the call completes return @code{EALREADY}. You can
+ TRANS use the @code{select} function to find out when the pending operation
+ TRANS has completed; @pxref{Waiting for I/O}. */
+-_S(ERR_MAP(EINPROGRESS), N_("Operation now in progress"))
++_S(EINPROGRESS, N_("Operation now in progress"))
+ #endif
+ #ifdef EALREADY
+ /*
+ TRANS An operation is already in progress on an object that has non-blocking
+ TRANS mode selected. */
+-_S(ERR_MAP(EALREADY), N_("Operation already in progress"))
++_S(EALREADY, N_("Operation already in progress"))
+ #endif
+ #ifdef ENOTSOCK
+ /*
+ TRANS A file that isn't a socket was specified when a socket is required. */
+-_S(ERR_MAP(ENOTSOCK), N_("Socket operation on non-socket"))
++_S(ENOTSOCK, N_("Socket operation on non-socket"))
+ #endif
+ #ifdef EMSGSIZE
+ /*
+ TRANS The size of a message sent on a socket was larger than the supported
+ TRANS maximum size. */
+-_S(ERR_MAP(EMSGSIZE), N_("Message too long"))
++_S(EMSGSIZE, N_("Message too long"))
+ #endif
+ #ifdef EPROTOTYPE
+ /*
+ TRANS The socket type does not support the requested communications protocol. */
+-_S(ERR_MAP(EPROTOTYPE), N_("Protocol wrong type for socket"))
++_S(EPROTOTYPE, N_("Protocol wrong type for socket"))
+ #endif
+ #ifdef ENOPROTOOPT
+ /*
+ TRANS You specified a socket option that doesn't make sense for the
+ TRANS particular protocol being used by the socket. @xref{Socket Options}. */
+-_S(ERR_MAP(ENOPROTOOPT), N_("Protocol not available"))
++_S(ENOPROTOOPT, N_("Protocol not available"))
+ #endif
+ #ifdef EPROTONOSUPPORT
+ /*
+ TRANS The socket domain does not support the requested communications protocol
+ TRANS (perhaps because the requested protocol is completely invalid).
+ TRANS @xref{Creating a Socket}. */
+-_S(ERR_MAP(EPROTONOSUPPORT), N_("Protocol not supported"))
++_S(EPROTONOSUPPORT, N_("Protocol not supported"))
+ #endif
+ #ifdef ESOCKTNOSUPPORT
+ /*
+ TRANS The socket type is not supported. */
+-_S(ERR_MAP(ESOCKTNOSUPPORT), N_("Socket type not supported"))
++_S(ESOCKTNOSUPPORT, N_("Socket type not supported"))
+ #endif
+ #ifdef EOPNOTSUPP
+ /*
+@@ -323,71 +320,71 @@ TRANS implemented for all communications protocols. On @gnuhurdsystems{}, this
+ TRANS error can happen for many calls when the object does not support the
+ TRANS particular operation; it is a generic indication that the server knows
+ TRANS nothing to do for that call. */
+-_S(ERR_MAP(EOPNOTSUPP), N_("Operation not supported"))
++_S(EOPNOTSUPP, N_("Operation not supported"))
+ #endif
+ #ifdef EPFNOSUPPORT
+ /*
+ TRANS The socket communications protocol family you requested is not supported. */
+-_S(ERR_MAP(EPFNOSUPPORT), N_("Protocol family not supported"))
++_S(EPFNOSUPPORT, N_("Protocol family not supported"))
+ #endif
+ #ifdef EAFNOSUPPORT
+ /*
+ TRANS The address family specified for a socket is not supported; it is
+ TRANS inconsistent with the protocol being used on the socket. @xref{Sockets}. */
+-_S(ERR_MAP(EAFNOSUPPORT), N_("Address family not supported by protocol"))
++_S(EAFNOSUPPORT, N_("Address family not supported by protocol"))
+ #endif
+ #ifdef EADDRINUSE
+ /*
+ TRANS The requested socket address is already in use. @xref{Socket Addresses}. */
+-_S(ERR_MAP(EADDRINUSE), N_("Address already in use"))
++_S(EADDRINUSE, N_("Address already in use"))
+ #endif
+ #ifdef EADDRNOTAVAIL
+ /*
+ TRANS The requested socket address is not available; for example, you tried
+ TRANS to give a socket a name that doesn't match the local host name.
+ TRANS @xref{Socket Addresses}. */
+-_S(ERR_MAP(EADDRNOTAVAIL), N_("Cannot assign requested address"))
++_S(EADDRNOTAVAIL, N_("Cannot assign requested address"))
+ #endif
+ #ifdef ENETDOWN
+ /*
+ TRANS A socket operation failed because the network was down. */
+-_S(ERR_MAP(ENETDOWN), N_("Network is down"))
++_S(ENETDOWN, N_("Network is down"))
+ #endif
+ #ifdef ENETUNREACH
+ /*
+ TRANS A socket operation failed because the subnet containing the remote host
+ TRANS was unreachable. */
+-_S(ERR_MAP(ENETUNREACH), N_("Network is unreachable"))
++_S(ENETUNREACH, N_("Network is unreachable"))
+ #endif
+ #ifdef ENETRESET
+ /*
+ TRANS A network connection was reset because the remote host crashed. */
+-_S(ERR_MAP(ENETRESET), N_("Network dropped connection on reset"))
++_S(ENETRESET, N_("Network dropped connection on reset"))
+ #endif
+ #ifdef ECONNABORTED
+ /*
+ TRANS A network connection was aborted locally. */
+-_S(ERR_MAP(ECONNABORTED), N_("Software caused connection abort"))
++_S(ECONNABORTED, N_("Software caused connection abort"))
+ #endif
+ #ifdef ECONNRESET
+ /*
+ TRANS A network connection was closed for reasons outside the control of the
+ TRANS local host, such as by the remote machine rebooting or an unrecoverable
+ TRANS protocol violation. */
+-_S(ERR_MAP(ECONNRESET), N_("Connection reset by peer"))
++_S(ECONNRESET, N_("Connection reset by peer"))
+ #endif
+ #ifdef ENOBUFS
+ /*
+ TRANS The kernel's buffers for I/O operations are all in use. In GNU, this
+ TRANS error is always synonymous with @code{ENOMEM}; you may get one or the
+ TRANS other from network operations. */
+-_S(ERR_MAP(ENOBUFS), N_("No buffer space available"))
++_S(ENOBUFS, N_("No buffer space available"))
+ #endif
+ #ifdef EISCONN
+ /*
+ TRANS You tried to connect a socket that is already connected.
+ TRANS @xref{Connecting}. */
+-_S(ERR_MAP(EISCONN), N_("Transport endpoint is already connected"))
++_S(EISCONN, N_("Transport endpoint is already connected"))
+ #endif
+ #ifdef ENOTCONN
+ /*
+@@ -395,74 +392,74 @@ TRANS The socket is not connected to anything. You get this error when you
+ TRANS try to transmit data over a socket, without first specifying a
+ TRANS destination for the data. For a connectionless socket (for datagram
+ TRANS protocols, such as UDP), you get @code{EDESTADDRREQ} instead. */
+-_S(ERR_MAP(ENOTCONN), N_("Transport endpoint is not connected"))
++_S(ENOTCONN, N_("Transport endpoint is not connected"))
+ #endif
+ #ifdef EDESTADDRREQ
+ /*
+ TRANS No default destination address was set for the socket. You get this
+ TRANS error when you try to transmit data over a connectionless socket,
+ TRANS without first specifying a destination for the data with @code{connect}. */
+-_S(ERR_MAP(EDESTADDRREQ), N_("Destination address required"))
++_S(EDESTADDRREQ, N_("Destination address required"))
+ #endif
+ #ifdef ESHUTDOWN
+ /*
+ TRANS The socket has already been shut down. */
+-_S(ERR_MAP(ESHUTDOWN), N_("Cannot send after transport endpoint shutdown"))
++_S(ESHUTDOWN, N_("Cannot send after transport endpoint shutdown"))
+ #endif
+ #ifdef ETOOMANYREFS
+-_S(ERR_MAP(ETOOMANYREFS), N_("Too many references: cannot splice"))
++_S(ETOOMANYREFS, N_("Too many references: cannot splice"))
+ #endif
+ #ifdef ETIMEDOUT
+ /*
+ TRANS A socket operation with a specified timeout received no response during
+ TRANS the timeout period. */
+-_S(ERR_MAP(ETIMEDOUT), N_("Connection timed out"))
++_S(ETIMEDOUT, N_("Connection timed out"))
+ #endif
+ #ifdef ECONNREFUSED
+ /*
+ TRANS A remote host refused to allow the network connection (typically because
+ TRANS it is not running the requested service). */
+-_S(ERR_MAP(ECONNREFUSED), N_("Connection refused"))
++_S(ECONNREFUSED, N_("Connection refused"))
+ #endif
+ #ifdef ELOOP
+ /*
+ TRANS Too many levels of symbolic links were encountered in looking up a file name.
+ TRANS This often indicates a cycle of symbolic links. */
+-_S(ERR_MAP(ELOOP), N_("Too many levels of symbolic links"))
++_S(ELOOP, N_("Too many levels of symbolic links"))
+ #endif
+ #ifdef ENAMETOOLONG
+ /*
+ TRANS Filename too long (longer than @code{PATH_MAX}; @pxref{Limits for
+ TRANS Files}) or host name too long (in @code{gethostname} or
+ TRANS @code{sethostname}; @pxref{Host Identification}). */
+-_S(ERR_MAP(ENAMETOOLONG), N_("File name too long"))
++_S(ENAMETOOLONG, N_("File name too long"))
+ #endif
+ #ifdef EHOSTDOWN
+ /*
+ TRANS The remote host for a requested network connection is down. */
+-_S(ERR_MAP(EHOSTDOWN), N_("Host is down"))
++_S(EHOSTDOWN, N_("Host is down"))
+ #endif
+ /*
+ TRANS The remote host for a requested network connection is not reachable. */
+ #ifdef EHOSTUNREACH
+-_S(ERR_MAP(EHOSTUNREACH), N_("No route to host"))
++_S(EHOSTUNREACH, N_("No route to host"))
+ #endif
+ #ifdef ENOTEMPTY
+ /*
+ TRANS Directory not empty, where an empty directory was expected. Typically,
+ TRANS this error occurs when you are trying to delete a directory. */
+-_S(ERR_MAP(ENOTEMPTY), N_("Directory not empty"))
++_S(ENOTEMPTY, N_("Directory not empty"))
+ #endif
+ #ifdef EUSERS
+ /*
+ TRANS The file quota system is confused because there are too many users.
+ TRANS @c This can probably happen in a GNU system when using NFS. */
+-_S(ERR_MAP(EUSERS), N_("Too many users"))
++_S(EUSERS, N_("Too many users"))
+ #endif
+ #ifdef EDQUOT
+ /*
+ TRANS The user's disk quota was exceeded. */
+-_S(ERR_MAP(EDQUOT), N_("Disk quota exceeded"))
++_S(EDQUOT, N_("Disk quota exceeded"))
+ #endif
+ #ifdef ESTALE
+ /*
+@@ -471,7 +468,7 @@ TRANS file system which is due to file system rearrangements on the server host
+ TRANS for NFS file systems or corruption in other file systems.
+ TRANS Repairing this condition usually requires unmounting, possibly repairing
+ TRANS and remounting the file system. */
+-_S(ERR_MAP(ESTALE), N_("Stale file handle"))
++_S(ESTALE, N_("Stale file handle"))
+ #endif
+ #ifdef EREMOTE
+ /*
+@@ -479,7 +476,7 @@ TRANS An attempt was made to NFS-mount a remote file system with a file name tha
+ TRANS already specifies an NFS-mounted file.
+ TRANS (This is an error on some operating systems, but we expect it to work
+ TRANS properly on @gnuhurdsystems{}, making this error code impossible.) */
+-_S(ERR_MAP(EREMOTE), N_("Object is remote"))
++_S(EREMOTE, N_("Object is remote"))
+ #endif
+ #ifdef ENOLCK
+ /*
+@@ -487,7 +484,7 @@ TRANS This is used by the file locking facilities; see
+ TRANS @ref{File Locks}. This error is never generated by @gnuhurdsystems{}, but
+ TRANS it can result from an operation to an NFS server running another
+ TRANS operating system. */
+-_S(ERR_MAP(ENOLCK), N_("No locks available"))
++_S(ENOLCK, N_("No locks available"))
+ #endif
+ #ifdef ENOSYS
+ /*
+@@ -496,46 +493,46 @@ TRANS not implemented at all, either in the C library itself or in the
+ TRANS operating system. When you get this error, you can be sure that this
+ TRANS particular function will always fail with @code{ENOSYS} unless you
+ TRANS install a new version of the C library or the operating system. */
+-_S(ERR_MAP(ENOSYS), N_("Function not implemented"))
++_S(ENOSYS, N_("Function not implemented"))
+ #endif
+ #ifdef EILSEQ
+ /*
+ TRANS While decoding a multibyte character the function came along an invalid
+ TRANS or an incomplete sequence of bytes or the given wide character is invalid. */
+-_S(ERR_MAP(EILSEQ), N_("Invalid or incomplete multibyte or wide character"))
++_S(EILSEQ, N_("Invalid or incomplete multibyte or wide character"))
+ #endif
+ #ifdef EBADMSG
+-_S(ERR_MAP(EBADMSG), N_("Bad message"))
++_S(EBADMSG, N_("Bad message"))
+ #endif
+ #ifdef EIDRM
+-_S(ERR_MAP(EIDRM), N_("Identifier removed"))
++_S(EIDRM, N_("Identifier removed"))
+ #endif
+ #ifdef EMULTIHOP
+-_S(ERR_MAP(EMULTIHOP), N_("Multihop attempted"))
++_S(EMULTIHOP, N_("Multihop attempted"))
+ #endif
+ #ifdef ENODATA
+-_S(ERR_MAP(ENODATA), N_("No data available"))
++_S(ENODATA, N_("No data available"))
+ #endif
+ #ifdef ENOLINK
+-_S(ERR_MAP(ENOLINK), N_("Link has been severed"))
++_S(ENOLINK, N_("Link has been severed"))
+ #endif
+ #ifdef ENOMSG
+-_S(ERR_MAP(ENOMSG), N_("No message of desired type"))
++_S(ENOMSG, N_("No message of desired type"))
+ #endif
+ #ifdef ENOSR
+-_S(ERR_MAP(ENOSR), N_("Out of streams resources"))
++_S(ENOSR, N_("Out of streams resources"))
+ #endif
+ #ifdef ENOSTR
+-_S(ERR_MAP(ENOSTR), N_("Device not a stream"))
++_S(ENOSTR, N_("Device not a stream"))
+ #endif
+ #ifdef EOVERFLOW
+-_S(ERR_MAP(EOVERFLOW), N_("Value too large for defined data type"))
++_S(EOVERFLOW, N_("Value too large for defined data type"))
+ #endif
+ #ifdef EPROTO
+-_S(ERR_MAP(EPROTO), N_("Protocol error"))
++_S(EPROTO, N_("Protocol error"))
+ #endif
+ #ifdef ETIME
+-_S(ERR_MAP(ETIME), N_("Timer expired"))
++_S(ETIME, N_("Timer expired"))
+ #endif
+ #ifdef ECANCELED
+ /*
+@@ -543,148 +540,148 @@ TRANS An asynchronous operation was canceled before it
+ TRANS completed. @xref{Asynchronous I/O}. When you call @code{aio_cancel},
+ TRANS the normal result is for the operations affected to complete with this
+ TRANS error; @pxref{Cancel AIO Operations}. */
+-_S(ERR_MAP(ECANCELED), N_("Operation canceled"))
++_S(ECANCELED, N_("Operation canceled"))
+ #endif
+ #ifdef EOWNERDEAD
+-_S(ERR_MAP(EOWNERDEAD), N_("Owner died"))
++_S(EOWNERDEAD, N_("Owner died"))
+ #endif
+ #ifdef ENOTRECOVERABLE
+-_S(ERR_MAP(ENOTRECOVERABLE), N_("State not recoverable"))
++_S(ENOTRECOVERABLE, N_("State not recoverable"))
+ #endif
+ #ifdef ERESTART
+-_S(ERR_MAP(ERESTART), N_("Interrupted system call should be restarted"))
++_S(ERESTART, N_("Interrupted system call should be restarted"))
+ #endif
+ #ifdef ECHRNG
+-_S(ERR_MAP(ECHRNG), N_("Channel number out of range"))
++_S(ECHRNG, N_("Channel number out of range"))
+ #endif
+ #ifdef EL2NSYNC
+-_S(ERR_MAP(EL2NSYNC), N_("Level 2 not synchronized"))
++_S(EL2NSYNC, N_("Level 2 not synchronized"))
+ #endif
+ #ifdef EL3HLT
+-_S(ERR_MAP(EL3HLT), N_("Level 3 halted"))
++_S(EL3HLT, N_("Level 3 halted"))
+ #endif
+ #ifdef EL3RST
+-_S(ERR_MAP(EL3RST), N_("Level 3 reset"))
++_S(EL3RST, N_("Level 3 reset"))
+ #endif
+ #ifdef ELNRNG
+-_S(ERR_MAP(ELNRNG), N_("Link number out of range"))
++_S(ELNRNG, N_("Link number out of range"))
+ #endif
+ #ifdef EUNATCH
+-_S(ERR_MAP(EUNATCH), N_("Protocol driver not attached"))
++_S(EUNATCH, N_("Protocol driver not attached"))
+ #endif
+ #ifdef ENOCSI
+-_S(ERR_MAP(ENOCSI), N_("No CSI structure available"))
++_S(ENOCSI, N_("No CSI structure available"))
+ #endif
+ #ifdef EL2HLT
+-_S(ERR_MAP(EL2HLT), N_("Level 2 halted"))
++_S(EL2HLT, N_("Level 2 halted"))
+ #endif
+ #ifdef EBADE
+-_S(ERR_MAP(EBADE), N_("Invalid exchange"))
++_S(EBADE, N_("Invalid exchange"))
+ #endif
+ #ifdef EBADR
+-_S(ERR_MAP(EBADR), N_("Invalid request descriptor"))
++_S(EBADR, N_("Invalid request descriptor"))
+ #endif
+ #ifdef EXFULL
+-_S(ERR_MAP(EXFULL), N_("Exchange full"))
++_S(EXFULL, N_("Exchange full"))
+ #endif
+ #ifdef ENOANO
+-_S(ERR_MAP(ENOANO), N_("No anode"))
++_S(ENOANO, N_("No anode"))
+ #endif
+ #ifdef EBADRQC
+-_S(ERR_MAP(EBADRQC), N_("Invalid request code"))
++_S(EBADRQC, N_("Invalid request code"))
+ #endif
+ #ifdef EBADSLT
+-_S(ERR_MAP(EBADSLT), N_("Invalid slot"))
++_S(EBADSLT, N_("Invalid slot"))
+ #endif
+ #ifdef EBFONT
+-_S(ERR_MAP(EBFONT), N_("Bad font file format"))
++_S(EBFONT, N_("Bad font file format"))
+ #endif
+ #ifdef ENONET
+-_S(ERR_MAP(ENONET), N_("Machine is not on the network"))
++_S(ENONET, N_("Machine is not on the network"))
+ #endif
+ #ifdef ENOPKG
+-_S(ERR_MAP(ENOPKG), N_("Package not installed"))
++_S(ENOPKG, N_("Package not installed"))
+ #endif
+ #ifdef EADV
+-_S(ERR_MAP(EADV), N_("Advertise error"))
++_S(EADV, N_("Advertise error"))
+ #endif
+ #ifdef ESRMNT
+-_S(ERR_MAP(ESRMNT), N_("Srmount error"))
++_S(ESRMNT, N_("Srmount error"))
+ #endif
+ #ifdef ECOMM
+-_S(ERR_MAP(ECOMM), N_("Communication error on send"))
++_S(ECOMM, N_("Communication error on send"))
+ #endif
+ #ifdef EDOTDOT
+-_S(ERR_MAP(EDOTDOT), N_("RFS specific error"))
++_S(EDOTDOT, N_("RFS specific error"))
+ #endif
+ #ifdef ENOTUNIQ
+-_S(ERR_MAP(ENOTUNIQ), N_("Name not unique on network"))
++_S(ENOTUNIQ, N_("Name not unique on network"))
+ #endif
+ #ifdef EBADFD
+-_S(ERR_MAP(EBADFD), N_("File descriptor in bad state"))
++_S(EBADFD, N_("File descriptor in bad state"))
+ #endif
+ #ifdef EREMCHG
+-_S(ERR_MAP(EREMCHG), N_("Remote address changed"))
++_S(EREMCHG, N_("Remote address changed"))
+ #endif
+ #ifdef ELIBACC
+-_S(ERR_MAP(ELIBACC), N_("Can not access a needed shared library"))
++_S(ELIBACC, N_("Can not access a needed shared library"))
+ #endif
+ #ifdef ELIBBAD
+-_S(ERR_MAP(ELIBBAD), N_("Accessing a corrupted shared library"))
++_S(ELIBBAD, N_("Accessing a corrupted shared library"))
+ #endif
+ #ifdef ELIBSCN
+-_S(ERR_MAP(ELIBSCN), N_(".lib section in a.out corrupted"))
++_S(ELIBSCN, N_(".lib section in a.out corrupted"))
+ #endif
+ #ifdef ELIBMAX
+-_S(ERR_MAP(ELIBMAX), N_("Attempting to link in too many shared libraries"))
++_S(ELIBMAX, N_("Attempting to link in too many shared libraries"))
+ #endif
+ #ifdef ELIBEXEC
+-_S(ERR_MAP(ELIBEXEC), N_("Cannot exec a shared library directly"))
++_S(ELIBEXEC, N_("Cannot exec a shared library directly"))
+ #endif
+ #ifdef ESTRPIPE
+-_S(ERR_MAP(ESTRPIPE), N_("Streams pipe error"))
++_S(ESTRPIPE, N_("Streams pipe error"))
+ #endif
+ #ifdef EUCLEAN
+-_S(ERR_MAP(EUCLEAN), N_("Structure needs cleaning"))
++_S(EUCLEAN, N_("Structure needs cleaning"))
+ #endif
+ #ifdef ENOTNAM
+-_S(ERR_MAP(ENOTNAM), N_("Not a XENIX named type file"))
++_S(ENOTNAM, N_("Not a XENIX named type file"))
+ #endif
+ #ifdef ENAVAIL
+-_S(ERR_MAP(ENAVAIL), N_("No XENIX semaphores available"))
++_S(ENAVAIL, N_("No XENIX semaphores available"))
+ #endif
+ #ifdef EISNAM
+-_S(ERR_MAP(EISNAM), N_("Is a named type file"))
++_S(EISNAM, N_("Is a named type file"))
+ #endif
+ #ifdef EREMOTEIO
+-_S(ERR_MAP(EREMOTEIO), N_("Remote I/O error"))
++_S(EREMOTEIO, N_("Remote I/O error"))
+ #endif
+ #ifdef ENOMEDIUM
+-_S(ERR_MAP(ENOMEDIUM), N_("No medium found"))
++_S(ENOMEDIUM, N_("No medium found"))
+ #endif
+ #ifdef EMEDIUMTYPE
+-_S(ERR_MAP(EMEDIUMTYPE), N_("Wrong medium type"))
++_S(EMEDIUMTYPE, N_("Wrong medium type"))
+ #endif
+ #ifdef ENOKEY
+-_S(ERR_MAP(ENOKEY), N_("Required key not available"))
++_S(ENOKEY, N_("Required key not available"))
+ #endif
+ #ifdef EKEYEXPIRED
+-_S(ERR_MAP(EKEYEXPIRED), N_("Key has expired"))
++_S(EKEYEXPIRED, N_("Key has expired"))
+ #endif
+ #ifdef EKEYREVOKED
+-_S(ERR_MAP(EKEYREVOKED), N_("Key has been revoked"))
++_S(EKEYREVOKED, N_("Key has been revoked"))
+ #endif
+ #ifdef EKEYREJECTED
+-_S(ERR_MAP(EKEYREJECTED), N_("Key was rejected by service"))
++_S(EKEYREJECTED, N_("Key was rejected by service"))
+ #endif
+ #ifdef ERFKILL
+-_S(ERR_MAP(ERFKILL), N_("Operation not possible due to RF-kill"))
++_S(ERFKILL, N_("Operation not possible due to RF-kill"))
+ #endif
+ #ifdef EHWPOISON
+-_S(ERR_MAP(EHWPOISON), N_("Memory page has hardware error"))
++_S(EHWPOISON, N_("Memory page has hardware error"))
+ #endif
+ #ifdef EBADRPC
+-_S(ERR_MAP(EBADRPC), N_("RPC struct is bad"))
++_S(EBADRPC, N_("RPC struct is bad"))
+ #endif
+ #ifdef EFTYPE
+ /*
+@@ -693,40 +690,40 @@ TRANS operation, or a data file had the wrong format.
+ TRANS
+ TRANS On some systems @code{chmod} returns this error if you try to set the
+ TRANS sticky bit on a non-directory file; @pxref{Setting Permissions}. */
+-_S(ERR_MAP(EFTYPE), N_("Inappropriate file type or format"))
++_S(EFTYPE, N_("Inappropriate file type or format"))
+ #endif
+ #ifdef EPROCUNAVAIL
+-_S(ERR_MAP(EPROCUNAVAIL), N_("RPC bad procedure for program"))
++_S(EPROCUNAVAIL, N_("RPC bad procedure for program"))
+ #endif
+ #ifdef EAUTH
+-_S(ERR_MAP(EAUTH), N_("Authentication error"))
++_S(EAUTH, N_("Authentication error"))
+ #endif
+ #ifdef EDIED
+ /*
+ TRANS On @gnuhurdsystems{}, opening a file returns this error when the file is
+ TRANS translated by a program and the translator program dies while starting
+ TRANS up, before it has connected to the file. */
+-_S(ERR_MAP(EDIED), N_("Translator died"))
++_S(EDIED, N_("Translator died"))
+ #endif
+ #ifdef ERPCMISMATCH
+-_S(ERR_MAP(ERPCMISMATCH), N_("RPC version wrong"))
++_S(ERPCMISMATCH, N_("RPC version wrong"))
+ #endif
+ #ifdef EGREGIOUS
+ /*
+ TRANS You did @strong{what}? */
+-_S(ERR_MAP(EGREGIOUS), N_("You really blew it this time"))
++_S(EGREGIOUS, N_("You really blew it this time"))
+ #endif
+ #ifdef EPROCLIM
+ /*
+ TRANS This means that the per-user limit on new process would be exceeded by
+ TRANS an attempted @code{fork}. @xref{Limits on Resources}, for details on
+ TRANS the @code{RLIMIT_NPROC} limit. */
+-_S(ERR_MAP(EPROCLIM), N_("Too many processes"))
++_S(EPROCLIM, N_("Too many processes"))
+ #endif
+ #ifdef EGRATUITOUS
+ /*
+ TRANS This error code has no purpose. */
+-_S(ERR_MAP(EGRATUITOUS), N_("Gratuitous error"))
++_S(EGRATUITOUS, N_("Gratuitous error"))
+ #endif
+ #if defined (ENOTSUP) && ENOTSUP != EOPNOTSUPP
+ /*
+@@ -742,10 +739,10 @@ TRANS values.
+ TRANS
+ TRANS If the entire function is not available at all in the implementation,
+ TRANS it returns @code{ENOSYS} instead. */
+-_S(ERR_MAP(ENOTSUP), N_("Not supported"))
++_S(ENOTSUP, N_("Not supported"))
+ #endif
+ #ifdef EPROGMISMATCH
+-_S(ERR_MAP(EPROGMISMATCH), N_("RPC program version wrong"))
++_S(EPROGMISMATCH, N_("RPC program version wrong"))
+ #endif
+ #ifdef EBACKGROUND
+ /*
+@@ -755,7 +752,7 @@ TRANS foreground process group of the terminal. Users do not usually see this
+ TRANS error because functions such as @code{read} and @code{write} translate
+ TRANS it into a @code{SIGTTIN} or @code{SIGTTOU} signal. @xref{Job Control},
+ TRANS for information on process groups and these signals. */
+-_S(ERR_MAP(EBACKGROUND), N_("Inappropriate operation for background process"))
++_S(EBACKGROUND, N_("Inappropriate operation for background process"))
+ #endif
+ #ifdef EIEIO
+ /*
+@@ -773,7 +770,7 @@ TRANS @c "bought the farm" means "died". -jtobey
+ TRANS @c
+ TRANS @c Translators, please do not translate this litteraly, translate it into
+ TRANS @c an idiomatic funny way of saying that the computer died. */
+-_S(ERR_MAP(EIEIO), N_("Computer bought the farm"))
++_S(EIEIO, N_("Computer bought the farm"))
+ #endif
+ #if defined (EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+ /*
+@@ -782,18 +779,18 @@ TRANS The values are always the same, on every operating system.
+ TRANS
+ TRANS C libraries in many older Unix systems have @code{EWOULDBLOCK} as a
+ TRANS separate error code. */
+-_S(ERR_MAP(EWOULDBLOCK), N_("Operation would block"))
++_S(EWOULDBLOCK, N_("Operation would block"))
+ #endif
+ #ifdef ENEEDAUTH
+-_S(ERR_MAP(ENEEDAUTH), N_("Need authenticator"))
++_S(ENEEDAUTH, N_("Need authenticator"))
+ #endif
+ #ifdef ED
+ /*
+ TRANS The experienced user will know what is wrong.
+ TRANS @c This error code is a joke. Its perror text is part of the joke.
+ TRANS @c Don't change it. */
+-_S(ERR_MAP(ED), N_("?"))
++_S(ED, N_("?"))
+ #endif
+ #ifdef EPROGUNAVAIL
+-_S(ERR_MAP(EPROGUNAVAIL), N_("RPC program not available"))
++_S(EPROGUNAVAIL, N_("RPC program not available"))
+ #endif
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0005-Set-version.h-RELEASE-to-stable-Bug-26700.patch b/packages/sys-libs/glibc/files/patches-2.32/0005-Set-version.h-RELEASE-to-stable-Bug-26700.patch
new file mode 100644
index 000000000..b8b4899aa
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0005-Set-version.h-RELEASE-to-stable-Bug-26700.patch
@@ -0,0 +1,28 @@
+Upstream: yes, taken from release/2.32/master
+
+From 23482f788665df83edc8b542698f45fed45a2711 Mon Sep 17 00:00:00 2001
+From: Carlos O'Donell <carlos@redhat.com>
+Date: Fri, 2 Oct 2020 09:23:35 -0400
+Subject: [PATCH 05/23] Set version.h RELEASE to "stable" (Bug 26700)
+
+The RELEASE macro was accidentaly set to "release" instead of
+the expected "stable" by the release manager. This is a mistake
+that leads to the build using "-g -O1" instead of "-g -O2" if
+configure was executed with "CFLAGS=" (CFLAGS set but empty).
+---
+ version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/version.h b/version.h
+index 83cd196798..e6ca7a8857 100644
+--- a/version.h
++++ b/version.h
+@@ -1,4 +1,4 @@
+ /* This file just defines the current version number of libc. */
+
+-#define RELEASE "release"
++#define RELEASE "stable"
+ #define VERSION "2.32"
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0006-AArch64-Improve-backwards-memmove-performance.patch b/packages/sys-libs/glibc/files/patches-2.32/0006-AArch64-Improve-backwards-memmove-performance.patch
new file mode 100644
index 000000000..64f336583
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0006-AArch64-Improve-backwards-memmove-performance.patch
@@ -0,0 +1,41 @@
+Upstream: yes, taken from release/2.32/master
+
+From 0f8f0ed25c196cfb93edf461aefdad15314ae05c Mon Sep 17 00:00:00 2001
+From: Wilco Dijkstra <wdijkstr@arm.com>
+Date: Fri, 28 Aug 2020 17:51:40 +0100
+Subject: [PATCH 06/23] AArch64: Improve backwards memmove performance
+
+On some microarchitectures performance of the backwards memmove improves if
+the stores use STR with decreasing addresses. So change the memmove loop
+in memcpy_advsimd.S to use 2x STR rather than STP.
+
+Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+(cherry picked from commit bd394d131c10c9ec22c6424197b79410042eed99)
+---
+ sysdeps/aarch64/multiarch/memcpy_advsimd.S | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/sysdeps/aarch64/multiarch/memcpy_advsimd.S b/sysdeps/aarch64/multiarch/memcpy_advsimd.S
+index d4ba747777..48bb6d7ca4 100644
+--- a/sysdeps/aarch64/multiarch/memcpy_advsimd.S
++++ b/sysdeps/aarch64/multiarch/memcpy_advsimd.S
+@@ -223,12 +223,13 @@ L(copy_long_backwards):
+ b.ls L(copy64_from_start)
+
+ L(loop64_backwards):
+- stp A_q, B_q, [dstend, -32]
++ str B_q, [dstend, -16]
++ str A_q, [dstend, -32]
+ ldp A_q, B_q, [srcend, -96]
+- stp C_q, D_q, [dstend, -64]
++ str D_q, [dstend, -48]
++ str C_q, [dstend, -64]!
+ ldp C_q, D_q, [srcend, -128]
+ sub srcend, srcend, 64
+- sub dstend, dstend, 64
+ subs count, count, 64
+ b.hi L(loop64_backwards)
+
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0007-AArch64-Use-__memcpy_simd-on-Neoverse-N2-V1.patch b/packages/sys-libs/glibc/files/patches-2.32/0007-AArch64-Use-__memcpy_simd-on-Neoverse-N2-V1.patch
new file mode 100644
index 000000000..b36f373b9
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0007-AArch64-Use-__memcpy_simd-on-Neoverse-N2-V1.patch
@@ -0,0 +1,64 @@
+Upstream: yes, taken from release/2.32/master
+
+From 81c5484d93a7768a8acc4cfdc228d925d60cd906 Mon Sep 17 00:00:00 2001
+From: Wilco Dijkstra <wdijkstr@arm.com>
+Date: Wed, 14 Oct 2020 13:56:21 +0100
+Subject: [PATCH 07/23] AArch64: Use __memcpy_simd on Neoverse N2/V1
+
+Add CPU detection of Neoverse N2 and Neoverse V1, and select __memcpy_simd as
+the memcpy/memmove ifunc.
+
+Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+(cherry picked from commit e11ed9d2b4558eeacff81557dc9557001af42a6b)
+---
+ sysdeps/aarch64/multiarch/memcpy.c | 3 ++-
+ sysdeps/aarch64/multiarch/memmove.c | 3 ++-
+ sysdeps/unix/sysv/linux/aarch64/cpu-features.h | 4 ++++
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/sysdeps/aarch64/multiarch/memcpy.c b/sysdeps/aarch64/multiarch/memcpy.c
+index 7cf5f033e8..799d60c98c 100644
+--- a/sysdeps/aarch64/multiarch/memcpy.c
++++ b/sysdeps/aarch64/multiarch/memcpy.c
+@@ -41,7 +41,8 @@ libc_ifunc (__libc_memcpy,
+ ? __memcpy_falkor
+ : (IS_THUNDERX2 (midr) || IS_THUNDERX2PA (midr)
+ ? __memcpy_thunderx2
+- : (IS_NEOVERSE_N1 (midr)
++ : (IS_NEOVERSE_N1 (midr) || IS_NEOVERSE_N2 (midr)
++ || IS_NEOVERSE_V1 (midr)
+ ? __memcpy_simd
+ : __memcpy_generic)))));
+
+diff --git a/sysdeps/aarch64/multiarch/memmove.c b/sysdeps/aarch64/multiarch/memmove.c
+index ad10aa8ac6..46a4cb3a54 100644
+--- a/sysdeps/aarch64/multiarch/memmove.c
++++ b/sysdeps/aarch64/multiarch/memmove.c
+@@ -41,7 +41,8 @@ libc_ifunc (__libc_memmove,
+ ? __memmove_falkor
+ : (IS_THUNDERX2 (midr) || IS_THUNDERX2PA (midr)
+ ? __memmove_thunderx2
+- : (IS_NEOVERSE_N1 (midr)
++ : (IS_NEOVERSE_N1 (midr) || IS_NEOVERSE_N2 (midr)
++ || IS_NEOVERSE_V1 (midr)
+ ? __memmove_simd
+ : __memmove_generic)))));
+
+diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h
+index fc688450ee..00a4d0c8e7 100644
+--- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h
++++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h
+@@ -54,6 +54,10 @@
+ && MIDR_PARTNUM(midr) == 0x000)
+ #define IS_NEOVERSE_N1(midr) (MIDR_IMPLEMENTOR(midr) == 'A' \
+ && MIDR_PARTNUM(midr) == 0xd0c)
++#define IS_NEOVERSE_N2(midr) (MIDR_IMPLEMENTOR(midr) == 'A' \
++ && MIDR_PARTNUM(midr) == 0xd49)
++#define IS_NEOVERSE_V1(midr) (MIDR_IMPLEMENTOR(midr) == 'A' \
++ && MIDR_PARTNUM(midr) == 0xd40)
+
+ #define IS_EMAG(midr) (MIDR_IMPLEMENTOR(midr) == 'P' \
+ && MIDR_PARTNUM(midr) == 0x000)
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0008-sysvipc-Fix-SEM_STAT_ANY-kernel-argument-pass-BZ-266.patch b/packages/sys-libs/glibc/files/patches-2.32/0008-sysvipc-Fix-SEM_STAT_ANY-kernel-argument-pass-BZ-266.patch
new file mode 100644
index 000000000..007c0b6ea
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0008-sysvipc-Fix-SEM_STAT_ANY-kernel-argument-pass-BZ-266.patch
@@ -0,0 +1,315 @@
+Upstream: yes, taken from release/2.32/master
+
+From 9b139b6b81a5def91bec01f30301acc95fbf0289 Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Tue, 29 Sep 2020 14:10:20 -0300
+Subject: [PATCH 08/23] sysvipc: Fix SEM_STAT_ANY kernel argument pass [BZ
+ #26637]
+
+Handle SEM_STAT_ANY the same way as SEM_STAT so that the buffer argument
+of SEM_STAT_ANY is properly passed to the kernel and back.
+
+The regression testcase checks for Linux specifix SysV ipc message
+control extension. For IPC_INFO/SEM_INFO it tries to match the values
+against the tunable /proc values and for SEM_STAT/SEM_STAT_ANY it
+check if the create message queue is within the global list returned
+by the kernel.
+
+Checked on x86_64-linux-gnu and on i686-linux-gnu (Linux v5.4 and on
+Linux v4.15).
+
+Co-authored-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+
+(cherry picked from commit 574500a108be1d2a6a0dc97a075c9e0a98371aba)
+---
+ NEWS | 2 +
+ sysdeps/unix/sysv/linux/Makefile | 2 +-
+ sysdeps/unix/sysv/linux/semctl.c | 6 +
+ sysdeps/unix/sysv/linux/tst-sysvsem-linux.c | 184 ++++++++++++++++++++
+ sysvipc/test-sysvsem.c | 1 +
+ 5 files changed, 194 insertions(+), 1 deletion(-)
+ create mode 100644 sysdeps/unix/sysv/linux/tst-sysvsem-linux.c
+
+diff --git a/NEWS b/NEWS
+index 3aad30baee..fb3a9e4f7d 100644
+--- a/NEWS
++++ b/NEWS
+@@ -10,6 +10,8 @@ The following bugs are resolved with this release:
+ [26534] libm.so 2.32 SIGILL in pow() due to FMA4 instruction on non-FMA4
+ system
+ [26555] string: strerrorname_np does not return the documented value
++ [26637] libc: semctl SEM_STAT_ANY fails to pass the buffer specified
++ by the caller to the kernel
+
+ Version 2.32
+
+diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
+index 9b2a253032..9b930e7466 100644
+--- a/sysdeps/unix/sysv/linux/Makefile
++++ b/sysdeps/unix/sysv/linux/Makefile
+@@ -100,7 +100,7 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
+ tst-quota tst-sync_file_range tst-sysconf-iov_max tst-ttyname \
+ test-errno-linux tst-memfd_create tst-mlock2 tst-pkey \
+ tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \
+- tst-tgkill
++ tst-tgkill tst-sysvsem-linux
+ tests-internal += tst-ofdlocks-compat tst-sigcontext-get_pc
+
+ CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables
+diff --git a/sysdeps/unix/sysv/linux/semctl.c b/sysdeps/unix/sysv/linux/semctl.c
+index f131a26fc7..1cdabde8f2 100644
+--- a/sysdeps/unix/sysv/linux/semctl.c
++++ b/sysdeps/unix/sysv/linux/semctl.c
+@@ -102,6 +102,7 @@ semun64_to_ksemun64 (int cmd, union semun64 semun64,
+ r.array = semun64.array;
+ break;
+ case SEM_STAT:
++ case SEM_STAT_ANY:
+ case IPC_STAT:
+ case IPC_SET:
+ r.buf = buf;
+@@ -150,6 +151,7 @@ __semctl64 (int semid, int semnum, int cmd, ...)
+ case IPC_STAT: /* arg.buf */
+ case IPC_SET:
+ case SEM_STAT:
++ case SEM_STAT_ANY:
+ case IPC_INFO: /* arg.__buf */
+ case SEM_INFO:
+ va_start (ap, cmd);
+@@ -238,6 +240,7 @@ semun_to_semun64 (int cmd, union semun semun, struct __semid64_ds *semid64)
+ r.array = semun.array;
+ break;
+ case SEM_STAT:
++ case SEM_STAT_ANY:
+ case IPC_STAT:
+ case IPC_SET:
+ r.buf = semid64;
+@@ -267,6 +270,7 @@ __semctl (int semid, int semnum, int cmd, ...)
+ case IPC_STAT: /* arg.buf */
+ case IPC_SET:
+ case SEM_STAT:
++ case SEM_STAT_ANY:
+ case IPC_INFO: /* arg.__buf */
+ case SEM_INFO:
+ va_start (ap, cmd);
+@@ -321,6 +325,7 @@ __semctl_mode16 (int semid, int semnum, int cmd, ...)
+ case IPC_STAT: /* arg.buf */
+ case IPC_SET:
+ case SEM_STAT:
++ case SEM_STAT_ANY:
+ case IPC_INFO: /* arg.__buf */
+ case SEM_INFO:
+ va_start (ap, cmd);
+@@ -354,6 +359,7 @@ __old_semctl (int semid, int semnum, int cmd, ...)
+ case IPC_STAT: /* arg.buf */
+ case IPC_SET:
+ case SEM_STAT:
++ case SEM_STAT_ANY:
+ case IPC_INFO: /* arg.__buf */
+ case SEM_INFO:
+ va_start (ap, cmd);
+diff --git a/sysdeps/unix/sysv/linux/tst-sysvsem-linux.c b/sysdeps/unix/sysv/linux/tst-sysvsem-linux.c
+new file mode 100644
+index 0000000000..45f19e2d37
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/tst-sysvsem-linux.c
+@@ -0,0 +1,184 @@
++/* Basic tests for Linux SYSV semaphore extensions.
++ Copyright (C) 2020 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <sys/ipc.h>
++#include <sys/sem.h>
++#include <errno.h>
++#include <stdlib.h>
++#include <stdbool.h>
++#include <stdio.h>
++
++#include <support/check.h>
++#include <support/temp_file.h>
++
++/* These are for the temporary file we generate. */
++static char *name;
++static int semid;
++
++static void
++remove_sem (void)
++{
++ /* Enforce message queue removal in case of early test failure.
++ Ignore error since the sem may already have being removed. */
++ semctl (semid, 0, IPC_RMID, 0);
++}
++
++static void
++do_prepare (int argc, char *argv[])
++{
++ TEST_VERIFY_EXIT (create_temp_file ("tst-sysvsem.", &name) != -1);
++}
++
++#define PREPARE do_prepare
++
++#define SEM_MODE 0644
++
++union semun
++{
++ int val;
++ struct semid_ds *buf;
++ unsigned short *array;
++ struct seminfo *__buf;
++};
++
++struct test_seminfo
++{
++ int semmsl;
++ int semmns;
++ int semopm;
++ int semmni;
++};
++
++/* It tries to obtain some system-wide SysV semaphore information from /proc
++ to check against IPC_INFO/SEM_INFO. The /proc only returns the tunables
++ value of SEMMSL, SEMMNS, SEMOPM, and SEMMNI.
++
++ The kernel also returns constant value for SEMVMX, SEMMNU, SEMMAP, SEMUME,
++ and also SEMUSZ and SEMAEM (for IPC_INFO). The issue to check them is they
++ might change over kernel releases. */
++
++static void
++read_sem_stat (struct test_seminfo *tseminfo)
++{
++ FILE *f = fopen ("/proc/sys/kernel/sem", "r");
++ if (f == NULL)
++ FAIL_UNSUPPORTED ("/proc is not mounted or /proc/sys/kernel/sem is not "
++ "available");
++
++ int r = fscanf (f, "%d %d %d %d",
++ &tseminfo->semmsl, &tseminfo->semmns, &tseminfo->semopm,
++ &tseminfo->semmni);
++ TEST_VERIFY_EXIT (r == 4);
++
++ fclose (f);
++}
++
++
++/* Check if the semaphore with IDX (index into the kernel's internal array)
++ matches the one with KEY. The CMD is either SEM_STAT or SEM_STAT_ANY. */
++
++static bool
++check_seminfo (int idx, key_t key, int cmd)
++{
++ struct semid_ds seminfo;
++ int sid = semctl (idx, 0, cmd, (union semun) { .buf = &seminfo });
++ /* Ignore unused array slot returned by the kernel or information from
++ unknown semaphores. */
++ if ((sid == -1 && errno == EINVAL) || sid != semid)
++ return false;
++
++ if (sid == -1)
++ FAIL_EXIT1 ("semctl with SEM_STAT failed (errno=%d)", errno);
++
++ TEST_COMPARE (seminfo.sem_perm.__key, key);
++ TEST_COMPARE (seminfo.sem_perm.mode, SEM_MODE);
++ TEST_COMPARE (seminfo.sem_nsems, 1);
++
++ return true;
++}
++
++static int
++do_test (void)
++{
++ atexit (remove_sem);
++
++ key_t key = ftok (name, 'G');
++ if (key == -1)
++ FAIL_EXIT1 ("ftok failed: %m");
++
++ semid = semget (key, 1, IPC_CREAT | IPC_EXCL | SEM_MODE);
++ if (semid == -1)
++ FAIL_EXIT1 ("semget failed: %m");
++
++ struct test_seminfo tipcinfo;
++ read_sem_stat (&tipcinfo);
++
++ int semidx;
++
++ {
++ struct seminfo ipcinfo;
++ semidx = semctl (semid, 0, IPC_INFO, (union semun) { .__buf = &ipcinfo });
++ if (semidx == -1)
++ FAIL_EXIT1 ("semctl with IPC_INFO failed: %m");
++
++ TEST_COMPARE (ipcinfo.semmsl, tipcinfo.semmsl);
++ TEST_COMPARE (ipcinfo.semmns, tipcinfo.semmns);
++ TEST_COMPARE (ipcinfo.semopm, tipcinfo.semopm);
++ TEST_COMPARE (ipcinfo.semmni, tipcinfo.semmni);
++ }
++
++ /* Same as before but with SEM_INFO. */
++ {
++ struct seminfo ipcinfo;
++ semidx = semctl (semid, 0, SEM_INFO, (union semun) { .__buf = &ipcinfo });
++ if (semidx == -1)
++ FAIL_EXIT1 ("semctl with IPC_INFO failed: %m");
++
++ TEST_COMPARE (ipcinfo.semmsl, tipcinfo.semmsl);
++ TEST_COMPARE (ipcinfo.semmns, tipcinfo.semmns);
++ TEST_COMPARE (ipcinfo.semopm, tipcinfo.semopm);
++ TEST_COMPARE (ipcinfo.semmni, tipcinfo.semmni);
++ }
++
++ /* We check if the created semaphore shows in the system-wide status. */
++ bool found = false;
++ for (int i = 0; i <= semidx; i++)
++ {
++ /* We can't tell apart if SEM_STAT_ANY is not supported (kernel older
++ than 4.17) or if the index used is invalid. So it just check if
++ value returned from a valid call matches the created semaphore. */
++ check_seminfo (i, key, SEM_STAT_ANY);
++
++ if (check_seminfo (i, key, SEM_STAT))
++ {
++ found = true;
++ break;
++ }
++ }
++
++ if (!found)
++ FAIL_EXIT1 ("semctl with SEM_STAT/SEM_STAT_ANY could not find the "
++ "created semaphore");
++
++ if (semctl (semid, 0, IPC_RMID, 0) == -1)
++ FAIL_EXIT1 ("semctl failed: %m");
++
++ return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/sysvipc/test-sysvsem.c b/sysvipc/test-sysvsem.c
+index 01dbff343a..b7284e0b48 100644
+--- a/sysvipc/test-sysvsem.c
++++ b/sysvipc/test-sysvsem.c
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <string.h>
++#include <stdbool.h>
+ #include <sys/types.h>
+ #include <sys/ipc.h>
+ #include <sys/sem.h>
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0009-sysvipc-Fix-IPC_INFO-and-MSG_INFO-handling-BZ-26639.patch b/packages/sys-libs/glibc/files/patches-2.32/0009-sysvipc-Fix-IPC_INFO-and-MSG_INFO-handling-BZ-26639.patch
new file mode 100644
index 000000000..05dbaf297
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0009-sysvipc-Fix-IPC_INFO-and-MSG_INFO-handling-BZ-26639.patch
@@ -0,0 +1,281 @@
+Upstream: yes, taken from release/2.32/master
+
+From c4aeedea598a1bd80f52ca9ebd07fe447680d491 Mon Sep 17 00:00:00 2001
+From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Tue, 29 Sep 2020 14:39:56 -0300
+Subject: [PATCH 09/23] sysvipc: Fix IPC_INFO and MSG_INFO handling [BZ #26639]
+
+Both commands are Linux extensions where the third argument is a
+'struct msginfo' instead of 'struct msqid_ds' and its information
+does not contain any time related fields (so there is no need to
+extra conversion for __IPC_TIME64.
+
+The regression testcase checks for Linux specifix SysV ipc message
+control extension. For IPC_INFO/MSG_INFO it tries to match the values
+against the tunable /proc values and for MSG_STAT/MSG_STAT_ANY it
+check if the create message queue is within the global list returned
+by the kernel.
+
+Checked on x86_64-linux-gnu and on i686-linux-gnu (Linux v5.4 and on
+Linux v4.15).
+
+(cherry picked from commit 20a00dbefca5695cccaa44846a482db8ccdd85ab)
+---
+ NEWS | 1 +
+ sysdeps/unix/sysv/linux/Makefile | 2 +-
+ sysdeps/unix/sysv/linux/msgctl.c | 22 ++-
+ sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c | 177 ++++++++++++++++++++
+ 4 files changed, 197 insertions(+), 5 deletions(-)
+ create mode 100644 sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c
+
+diff --git a/NEWS b/NEWS
+index fb3a9e4f7d..15c0299dd0 100644
+--- a/NEWS
++++ b/NEWS
+@@ -12,6 +12,7 @@ The following bugs are resolved with this release:
+ [26555] string: strerrorname_np does not return the documented value
+ [26637] libc: semctl SEM_STAT_ANY fails to pass the buffer specified
+ by the caller to the kernel
++ [26639] libc: msgctl IPC_INFO and MSG_INFO return garbage
+
+ Version 2.32
+
+diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
+index 9b930e7466..6ea615ab00 100644
+--- a/sysdeps/unix/sysv/linux/Makefile
++++ b/sysdeps/unix/sysv/linux/Makefile
+@@ -100,7 +100,7 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
+ tst-quota tst-sync_file_range tst-sysconf-iov_max tst-ttyname \
+ test-errno-linux tst-memfd_create tst-mlock2 tst-pkey \
+ tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \
+- tst-tgkill tst-sysvsem-linux
++ tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux
+ tests-internal += tst-ofdlocks-compat tst-sigcontext-get_pc
+
+ CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables
+diff --git a/sysdeps/unix/sysv/linux/msgctl.c b/sysdeps/unix/sysv/linux/msgctl.c
+index 0776472d5e..a1f24ab242 100644
+--- a/sysdeps/unix/sysv/linux/msgctl.c
++++ b/sysdeps/unix/sysv/linux/msgctl.c
+@@ -90,8 +90,15 @@ __msgctl64 (int msqid, int cmd, struct __msqid64_ds *buf)
+ struct kernel_msqid64_ds ksemid, *arg = NULL;
+ if (buf != NULL)
+ {
+- msqid64_to_kmsqid64 (buf, &ksemid);
+- arg = &ksemid;
++ /* This is a Linux extension where kernel returns a 'struct msginfo'
++ instead. */
++ if (cmd == IPC_INFO || cmd == MSG_INFO)
++ arg = (struct kernel_msqid64_ds *) buf;
++ else
++ {
++ msqid64_to_kmsqid64 (buf, &ksemid);
++ arg = &ksemid;
++ }
+ }
+ # ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T
+ if (cmd == IPC_SET)
+@@ -169,8 +176,15 @@ __msgctl (int msqid, int cmd, struct msqid_ds *buf)
+ struct __msqid64_ds msqid64, *buf64 = NULL;
+ if (buf != NULL)
+ {
+- msqid_to_msqid64 (&msqid64, buf);
+- buf64 = &msqid64;
++ /* This is a Linux extension where kernel returns a 'struct msginfo'
++ instead. */
++ if (cmd == IPC_INFO || cmd == MSG_INFO)
++ buf64 = (struct __msqid64_ds *) buf;
++ else
++ {
++ msqid_to_msqid64 (&msqid64, buf);
++ buf64 = &msqid64;
++ }
+ }
+
+ int ret = __msgctl64 (msqid, cmd, buf64);
+diff --git a/sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c b/sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c
+new file mode 100644
+index 0000000000..630f4f792c
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c
+@@ -0,0 +1,177 @@
++/* Basic tests for Linux SYSV message queue extensions.
++ Copyright (C) 2020 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <sys/ipc.h>
++#include <sys/msg.h>
++#include <errno.h>
++#include <stdlib.h>
++#include <stdbool.h>
++#include <stdio.h>
++
++#include <support/check.h>
++#include <support/temp_file.h>
++
++#define MSGQ_MODE 0644
++
++/* These are for the temporary file we generate. */
++static char *name;
++static int msqid;
++
++static void
++remove_msq (void)
++{
++ /* Enforce message queue removal in case of early test failure.
++ Ignore error since the msg may already have being removed. */
++ msgctl (msqid, IPC_RMID, NULL);
++}
++
++static void
++do_prepare (int argc, char *argv[])
++{
++ TEST_VERIFY_EXIT (create_temp_file ("tst-sysvmsg.", &name) != -1);
++}
++
++#define PREPARE do_prepare
++
++struct test_msginfo
++{
++ int msgmax;
++ int msgmnb;
++ int msgmni;
++};
++
++/* It tries to obtain some system-wide SysV messsage queue information from
++ /proc to check against IPC_INFO/MSG_INFO. The /proc only returns the
++ tunables value of MSGMAX, MSGMNB, and MSGMNI.
++
++ The kernel also returns constant value for MSGSSZ, MSGSEG and also MSGMAP,
++ MSGPOOL, and MSGTQL (for IPC_INFO). The issue to check them is they might
++ change over kernel releases. */
++
++static int
++read_proc_file (const char *file)
++{
++ FILE *f = fopen (file, "r");
++ if (f == NULL)
++ FAIL_UNSUPPORTED ("/proc is not mounted or %s is not available", file);
++
++ int v;
++ int r = fscanf (f, "%d", & v);
++ TEST_VERIFY_EXIT (r == 1);
++
++ fclose (f);
++ return v;
++}
++
++
++/* Check if the message queue with IDX (index into the kernel's internal
++ array) matches the one with KEY. The CMD is either MSG_STAT or
++ MSG_STAT_ANY. */
++
++static bool
++check_msginfo (int idx, key_t key, int cmd)
++{
++ struct msqid_ds msginfo;
++ int mid = msgctl (idx, cmd, &msginfo);
++ /* Ignore unused array slot returned by the kernel or information from
++ unknown message queue. */
++ if ((mid == -1 && errno == EINVAL) || mid != msqid)
++ return false;
++
++ if (mid == -1)
++ FAIL_EXIT1 ("msgctl with %s failed: %m",
++ cmd == MSG_STAT ? "MSG_STAT" : "MSG_STAT_ANY");
++
++ TEST_COMPARE (msginfo.msg_perm.__key, key);
++ TEST_COMPARE (msginfo.msg_perm.mode, MSGQ_MODE);
++ TEST_COMPARE (msginfo.msg_qnum, 0);
++
++ return true;
++}
++
++static int
++do_test (void)
++{
++ atexit (remove_msq);
++
++ key_t key = ftok (name, 'G');
++ if (key == -1)
++ FAIL_EXIT1 ("ftok failed: %m");
++
++ msqid = msgget (key, MSGQ_MODE | IPC_CREAT);
++ if (msqid == -1)
++ FAIL_EXIT1 ("msgget failed: %m");
++
++ struct test_msginfo tipcinfo;
++ tipcinfo.msgmax = read_proc_file ("/proc/sys/kernel/msgmax");
++ tipcinfo.msgmnb = read_proc_file ("/proc/sys/kernel/msgmnb");
++ tipcinfo.msgmni = read_proc_file ("/proc/sys/kernel/msgmni");
++
++ int msqidx;
++
++ {
++ struct msginfo ipcinfo;
++ msqidx = msgctl (msqid, IPC_INFO, (struct msqid_ds *) &ipcinfo);
++ if (msqidx == -1)
++ FAIL_EXIT1 ("msgctl with IPC_INFO failed: %m");
++
++ TEST_COMPARE (ipcinfo.msgmax, tipcinfo.msgmax);
++ TEST_COMPARE (ipcinfo.msgmnb, tipcinfo.msgmnb);
++ TEST_COMPARE (ipcinfo.msgmni, tipcinfo.msgmni);
++ }
++
++ /* Same as before but with MSG_INFO. */
++ {
++ struct msginfo ipcinfo;
++ msqidx = msgctl (msqid, MSG_INFO, (struct msqid_ds *) &ipcinfo);
++ if (msqidx == -1)
++ FAIL_EXIT1 ("msgctl with IPC_INFO failed: %m");
++
++ TEST_COMPARE (ipcinfo.msgmax, tipcinfo.msgmax);
++ TEST_COMPARE (ipcinfo.msgmnb, tipcinfo.msgmnb);
++ TEST_COMPARE (ipcinfo.msgmni, tipcinfo.msgmni);
++ }
++
++ /* We check if the created message queue shows in global list. */
++ bool found = false;
++ for (int i = 0; i <= msqidx; i++)
++ {
++ /* We can't tell apart if MSG_STAT_ANY is not supported (kernel older
++ than 4.17) or if the index used is invalid. So it just check if the
++ value returned from a valid call matches the created message
++ queue. */
++ check_msginfo (i, key, MSG_STAT_ANY);
++
++ if (check_msginfo (i, key, MSG_STAT))
++ {
++ found = true;
++ break;
++ }
++ }
++
++ if (!found)
++ FAIL_EXIT1 ("msgctl with MSG_STAT/MSG_STAT_ANY could not find the "
++ "created message queue");
++
++ if (msgctl (msqid, IPC_RMID, NULL) == -1)
++ FAIL_EXIT1 ("msgctl failed");
++
++ return 0;
++}
++
++#include <support/test-driver.c>
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0010-sysvipc-Fix-IPC_INFO-and-SHM_INFO-handling-BZ-26636.patch b/packages/sys-libs/glibc/files/patches-2.32/0010-sysvipc-Fix-IPC_INFO-and-SHM_INFO-handling-BZ-26636.patch
new file mode 100644
index 000000000..138d483c6
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0010-sysvipc-Fix-IPC_INFO-and-SHM_INFO-handling-BZ-26636.patch
@@ -0,0 +1,305 @@
+Upstream: yes, taken from release/2.32/master
+
+From 0b9460d22e285432d232f42c7442a3226e1bf830 Mon Sep 17 00:00:00 2001
+From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Tue, 29 Sep 2020 14:51:36 -0300
+Subject: [PATCH 10/23] sysvipc: Fix IPC_INFO and SHM_INFO handling [BZ #26636]
+
+Both commands are Linux extensions where the third argument is either
+a 'struct shminfo' (IPC_INFO) or a 'struct shm_info' (SHM_INFO) instead
+of 'struct shmid_ds'. And their information does not contain any time
+related fields, so there is no need to extra conversion for __IPC_TIME64.
+
+The regression testcase checks for Linux specifix SysV ipc message
+control extension. For SHM_INFO it tries to match the values against the
+tunable /proc values and for MSG_STAT/MSG_STAT_ANY it check if the create\
+shared memory is within the global list returned by the kernel.
+
+Checked on x86_64-linux-gnu and on i686-linux-gnu (Linux v5.4 and on
+Linux v4.15).
+
+(cherry picked from commit a49d7fd4f764e97ccaf922e433046590ae52fce9)
+---
+ NEWS | 2 +
+ sysdeps/unix/sysv/linux/Makefile | 2 +-
+ sysdeps/unix/sysv/linux/shmctl.c | 24 ++-
+ sysdeps/unix/sysv/linux/tst-sysvshm-linux.c | 185 ++++++++++++++++++++
+ 4 files changed, 206 insertions(+), 7 deletions(-)
+ create mode 100644 sysdeps/unix/sysv/linux/tst-sysvshm-linux.c
+
+diff --git a/NEWS b/NEWS
+index 15c0299dd0..3030735839 100644
+--- a/NEWS
++++ b/NEWS
+@@ -10,6 +10,8 @@ The following bugs are resolved with this release:
+ [26534] libm.so 2.32 SIGILL in pow() due to FMA4 instruction on non-FMA4
+ system
+ [26555] string: strerrorname_np does not return the documented value
++ [26636] libc: 32-bit shmctl(IPC_INFO) crashes when shminfo struct is
++ at the end of a memory mapping
+ [26637] libc: semctl SEM_STAT_ANY fails to pass the buffer specified
+ by the caller to the kernel
+ [26639] libc: msgctl IPC_INFO and MSG_INFO return garbage
+diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
+index 6ea615ab00..34748ffcd1 100644
+--- a/sysdeps/unix/sysv/linux/Makefile
++++ b/sysdeps/unix/sysv/linux/Makefile
+@@ -100,7 +100,7 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
+ tst-quota tst-sync_file_range tst-sysconf-iov_max tst-ttyname \
+ test-errno-linux tst-memfd_create tst-mlock2 tst-pkey \
+ tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \
+- tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux
++ tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux
+ tests-internal += tst-ofdlocks-compat tst-sigcontext-get_pc
+
+ CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables
+diff --git a/sysdeps/unix/sysv/linux/shmctl.c b/sysdeps/unix/sysv/linux/shmctl.c
+index 76d88441f1..1d19a798b1 100644
+--- a/sysdeps/unix/sysv/linux/shmctl.c
++++ b/sysdeps/unix/sysv/linux/shmctl.c
+@@ -90,8 +90,15 @@ __shmctl64 (int shmid, int cmd, struct __shmid64_ds *buf)
+ struct kernel_shmid64_ds kshmid, *arg = NULL;
+ if (buf != NULL)
+ {
+- shmid64_to_kshmid64 (buf, &kshmid);
+- arg = &kshmid;
++ /* This is a Linux extension where kernel expects either a
++ 'struct shminfo' (IPC_INFO) or 'struct shm_info' (SHM_INFO). */
++ if (cmd == IPC_INFO || cmd == SHM_INFO)
++ arg = (struct kernel_shmid64_ds *) buf;
++ else
++ {
++ shmid64_to_kshmid64 (buf, &kshmid);
++ arg = &kshmid;
++ }
+ }
+ # ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T
+ if (cmd == IPC_SET)
+@@ -107,7 +114,6 @@ __shmctl64 (int shmid, int cmd, struct __shmid64_ds *buf)
+
+ switch (cmd)
+ {
+- case IPC_INFO:
+ case IPC_STAT:
+ case SHM_STAT:
+ case SHM_STAT_ANY:
+@@ -168,8 +174,15 @@ __shmctl (int shmid, int cmd, struct shmid_ds *buf)
+ struct __shmid64_ds shmid64, *buf64 = NULL;
+ if (buf != NULL)
+ {
+- shmid_to_shmid64 (&shmid64, buf);
+- buf64 = &shmid64;
++ /* This is a Linux extension where kernel expects either a
++ 'struct shminfo' (IPC_INFO) or 'struct shm_info' (SHM_INFO). */
++ if (cmd == IPC_INFO || cmd == SHM_INFO)
++ buf64 = (struct __shmid64_ds *) buf;
++ else
++ {
++ shmid_to_shmid64 (&shmid64, buf);
++ buf64 = &shmid64;
++ }
+ }
+
+ int ret = __shmctl64 (shmid, cmd, buf64);
+@@ -178,7 +191,6 @@ __shmctl (int shmid, int cmd, struct shmid_ds *buf)
+
+ switch (cmd)
+ {
+- case IPC_INFO:
+ case IPC_STAT:
+ case SHM_STAT:
+ case SHM_STAT_ANY:
+diff --git a/sysdeps/unix/sysv/linux/tst-sysvshm-linux.c b/sysdeps/unix/sysv/linux/tst-sysvshm-linux.c
+new file mode 100644
+index 0000000000..7128ae2e14
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/tst-sysvshm-linux.c
+@@ -0,0 +1,185 @@
++/* Basic tests for Linux SYSV shared memory extensions.
++ Copyright (C) 2020 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <sys/ipc.h>
++#include <sys/shm.h>
++#include <errno.h>
++#include <stdlib.h>
++#include <stdbool.h>
++#include <stdio.h>
++#include <unistd.h>
++#include <inttypes.h>
++#include <limits.h>
++
++#include <support/check.h>
++#include <support/temp_file.h>
++
++#define SHM_MODE 0644
++
++/* These are for the temporary file we generate. */
++static char *name;
++static int shmid;
++static long int pgsz;
++
++static void
++remove_shm (void)
++{
++ /* Enforce message queue removal in case of early test failure.
++ Ignore error since the shm may already have being removed. */
++ shmctl (shmid, IPC_RMID, NULL);
++}
++
++static void
++do_prepare (int argc, char *argv[])
++{
++ TEST_VERIFY_EXIT (create_temp_file ("tst-sysvshm.", &name) != -1);
++}
++
++#define PREPARE do_prepare
++
++struct test_shminfo
++{
++ unsigned long int shmall;
++ unsigned long int shmmax;
++ unsigned long int shmmni;
++};
++
++/* It tries to obtain some system-wide SysV shared memory information from
++ /proc to check against IPC_INFO/SHM_INFO. The /proc only returns the
++ tunables value of SHMALL, SHMMAX, and SHMMNI. */
++
++static uint64_t
++read_proc_file (const char *file)
++{
++ FILE *f = fopen (file, "r");
++ if (f == NULL)
++ FAIL_UNSUPPORTED ("/proc is not mounted or %s is not available", file);
++
++ /* Handle 32-bit binaries running on 64-bit kernels. */
++ uint64_t v;
++ int r = fscanf (f, "%" SCNu64, &v);
++ TEST_VERIFY_EXIT (r == 1);
++
++ fclose (f);
++ return v;
++}
++
++
++/* Check if the message queue with IDX (index into the kernel's internal
++ array) matches the one with KEY. The CMD is either SHM_STAT or
++ SHM_STAT_ANY. */
++
++static bool
++check_shminfo (int idx, key_t key, int cmd)
++{
++ struct shmid_ds shminfo;
++ int sid = shmctl (idx, cmd, &shminfo);
++ /* Ignore unused array slot returned by the kernel or information from
++ unknown message queue. */
++ if ((sid == -1 && errno == EINVAL) || sid != shmid)
++ return false;
++
++ if (sid == -1)
++ FAIL_EXIT1 ("shmctl with %s failed: %m",
++ cmd == SHM_STAT ? "SHM_STAT" : "SHM_STAT_ANY");
++
++ TEST_COMPARE (shminfo.shm_perm.__key, key);
++ TEST_COMPARE (shminfo.shm_perm.mode, SHM_MODE);
++ TEST_COMPARE (shminfo.shm_segsz, pgsz);
++
++ return true;
++}
++
++static int
++do_test (void)
++{
++ atexit (remove_shm);
++
++ pgsz = sysconf (_SC_PAGESIZE);
++ if (pgsz == -1)
++ FAIL_EXIT1 ("sysconf (_SC_PAGESIZE) failed: %m");
++
++ key_t key = ftok (name, 'G');
++ if (key == -1)
++ FAIL_EXIT1 ("ftok failed: %m");
++
++ shmid = shmget (key, pgsz, IPC_CREAT | IPC_EXCL | SHM_MODE);
++ if (shmid == -1)
++ FAIL_EXIT1 ("shmget failed: %m");
++
++ struct test_shminfo tipcinfo;
++ {
++ uint64_t v = read_proc_file ("/proc/sys/kernel/shmmax");
++#if LONG_MAX == INT_MAX
++ /* Kernel explicit clamp the value for shmmax on compat symbol (32-bit
++ binaries running on 64-bit kernels). */
++ if (v > INT_MAX)
++ v = INT_MAX;
++#endif
++ tipcinfo.shmmax = v;
++ }
++ tipcinfo.shmall = read_proc_file ("/proc/sys/kernel/shmall");
++ tipcinfo.shmmni = read_proc_file ("/proc/sys/kernel/shmmni");
++
++ int shmidx;
++
++ /* Note: SHM_INFO does not return a shminfo, but rather a 'struct shm_info'.
++ It is tricky to verify its values since the syscall returns system wide
++ resources consumed by shared memory. The shmctl implementation handles
++ SHM_INFO as IPC_INFO, so the IPC_INFO test should validate SHM_INFO as
++ well. */
++
++ {
++ struct shminfo ipcinfo;
++ shmidx = shmctl (shmid, IPC_INFO, (struct shmid_ds *) &ipcinfo);
++ if (shmidx == -1)
++ FAIL_EXIT1 ("shmctl with IPC_INFO failed: %m");
++
++ TEST_COMPARE (ipcinfo.shmall, tipcinfo.shmall);
++ TEST_COMPARE (ipcinfo.shmmax, tipcinfo.shmmax);
++ TEST_COMPARE (ipcinfo.shmmni, tipcinfo.shmmni);
++ }
++
++ /* We check if the created shared memory shows in the global list. */
++ bool found = false;
++ for (int i = 0; i <= shmidx; i++)
++ {
++ /* We can't tell apart if SHM_STAT_ANY is not supported (kernel older
++ than 4.17) or if the index used is invalid. So it just check if
++ value returned from a valid call matches the created message
++ queue. */
++ check_shminfo (i, key, SHM_STAT_ANY);
++
++ if (check_shminfo (i, key, SHM_STAT))
++ {
++ found = true;
++ break;
++ }
++ }
++
++ if (!found)
++ FAIL_EXIT1 ("shmctl with SHM_STAT/SHM_STAT_ANY could not find the "
++ "created shared memory");
++
++ if (shmctl (shmid, IPC_RMID, NULL) == -1)
++ FAIL_EXIT1 ("shmctl failed");
++
++ return 0;
++}
++
++#include <support/test-driver.c>
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0011-Reversing-calculation-of-__x86_shared_non_temporal_t.patch b/packages/sys-libs/glibc/files/patches-2.32/0011-Reversing-calculation-of-__x86_shared_non_temporal_t.patch
new file mode 100644
index 000000000..51e1ecfe7
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0011-Reversing-calculation-of-__x86_shared_non_temporal_t.patch
@@ -0,0 +1,100 @@
+Upstream: yes, taken from release/2.32/master
+
+From e61a8fd8fadbf1a8cef997a0f921575cb2905ea2 Mon Sep 17 00:00:00 2001
+From: Patrick McGehearty <patrick.mcgehearty@oracle.com>
+Date: Mon, 28 Sep 2020 20:11:28 +0000
+Subject: [PATCH 11/23] Reversing calculation of
+ __x86_shared_non_temporal_threshold
+
+The __x86_shared_non_temporal_threshold determines when memcpy on x86
+uses non_temporal stores to avoid pushing other data out of the last
+level cache.
+
+This patch proposes to revert the calculation change made by H.J. Lu's
+patch of June 2, 2017.
+
+H.J. Lu's patch selected a threshold suitable for a single thread
+getting maximum performance. It was tuned using the single threaded
+large memcpy micro benchmark on an 8 core processor. The last change
+changes the threshold from using 3/4 of one thread's share of the
+cache to using 3/4 of the entire cache of a multi-threaded system
+before switching to non-temporal stores. Multi-threaded systems with
+more than a few threads are server-class and typically have many
+active threads. If one thread consumes 3/4 of the available cache for
+all threads, it will cause other active threads to have data removed
+from the cache. Two examples show the range of the effect. John
+McCalpin's widely parallel Stream benchmark, which runs in parallel
+and fetches data sequentially, saw a 20% slowdown with this patch on
+an internal system test of 128 threads. This regression was discovered
+when comparing OL8 performance to OL7. An example that compares
+normal stores to non-temporal stores may be found at
+https://vgatherps.github.io/2018-09-02-nontemporal/. A simple test
+shows performance loss of 400 to 500% due to a failure to use
+nontemporal stores. These performance losses are most likely to occur
+when the system load is heaviest and good performance is critical.
+
+The tunable x86_non_temporal_threshold can be used to override the
+default for the knowledgable user who really wants maximum cache
+allocation to a single thread in a multi-threaded system.
+The manual entry for the tunable has been expanded to provide
+more information about its purpose.
+
+ modified: sysdeps/x86/cacheinfo.c
+ modified: manual/tunables.texi
+
+(cherry picked from commit d3c57027470b78dba79c6d931e4e409b1fecfc80)
+---
+ manual/tunables.texi | 6 +++++-
+ sysdeps/x86/cacheinfo.c | 16 +++++++++++-----
+ 2 files changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/manual/tunables.texi b/manual/tunables.texi
+index 23ef0d40e7..d72d7a5ec0 100644
+--- a/manual/tunables.texi
++++ b/manual/tunables.texi
+@@ -432,7 +432,11 @@ set shared cache size in bytes for use in memory and string routines.
+
+ @deftp Tunable glibc.cpu.x86_non_temporal_threshold
+ The @code{glibc.cpu.x86_non_temporal_threshold} tunable allows the user
+-to set threshold in bytes for non temporal store.
++to set threshold in bytes for non temporal store. Non temporal stores
++give a hint to the hardware to move data directly to memory without
++displacing other data from the cache. This tunable is used by some
++platforms to determine when to use non temporal stores in operations
++like memmove and memcpy.
+
+ This tunable is specific to i386 and x86-64.
+ @end deftp
+diff --git a/sysdeps/x86/cacheinfo.c b/sysdeps/x86/cacheinfo.c
+index 217c21c34f..dadec5d58f 100644
+--- a/sysdeps/x86/cacheinfo.c
++++ b/sysdeps/x86/cacheinfo.c
+@@ -854,14 +854,20 @@ init_cacheinfo (void)
+ __x86_shared_cache_size = shared;
+ }
+
+- /* The large memcpy micro benchmark in glibc shows that 6 times of
+- shared cache size is the approximate value above which non-temporal
+- store becomes faster on a 8-core processor. This is the 3/4 of the
+- total shared cache size. */
++ /* The default setting for the non_temporal threshold is 3/4 of one
++ thread's share of the chip's cache. For most Intel and AMD processors
++ with an initial release date between 2017 and 2020, a thread's typical
++ share of the cache is from 500 KBytes to 2 MBytes. Using the 3/4
++ threshold leaves 125 KBytes to 500 KBytes of the thread's data
++ in cache after a maximum temporal copy, which will maintain
++ in cache a reasonable portion of the thread's stack and other
++ active data. If the threshold is set higher than one thread's
++ share of the cache, it has a substantial risk of negatively
++ impacting the performance of other threads running on the chip. */
+ __x86_shared_non_temporal_threshold
+ = (cpu_features->non_temporal_threshold != 0
+ ? cpu_features->non_temporal_threshold
+- : __x86_shared_cache_size * threads * 3 / 4);
++ : __x86_shared_cache_size * 3 / 4);
+
+ /* NB: The REP MOVSB threshold must be greater than VEC_SIZE * 8. */
+ unsigned int minimum_rep_movsb_threshold;
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0012-x86-Optimizing-memcpy-for-AMD-Zen-architecture.patch b/packages/sys-libs/glibc/files/patches-2.32/0012-x86-Optimizing-memcpy-for-AMD-Zen-architecture.patch
new file mode 100644
index 000000000..ace0be22f
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0012-x86-Optimizing-memcpy-for-AMD-Zen-architecture.patch
@@ -0,0 +1,68 @@
+Upstream: yes, taken from release/2.32/master
+
+From 8813b2682e4094e43b0cf1634e99619f1b8b2c62 Mon Sep 17 00:00:00 2001
+From: Sajan Karumanchi <sajan.karumanchi@amd.com>
+Date: Wed, 28 Oct 2020 13:05:33 +0530
+Subject: [PATCH 12/23] x86: Optimizing memcpy for AMD Zen architecture.
+
+Modifying the shareable cache '__x86_shared_cache_size', which is a
+factor in computing the non-temporal threshold parameter
+'__x86_shared_non_temporal_threshold' to optimize memcpy for AMD Zen
+architectures.
+In the existing implementation, the shareable cache is computed as 'L3
+per thread, L2 per core'. Recomputing this shareable cache as 'L3 per
+CCX(Core-Complex)' has brought in performance gains.
+As per the large bench variant results, this patch also addresses the
+regression problem on AMD Zen architectures.
+
+Backport of commit 59803e81f96b479c17f583b31eac44b57591a1bf upstream,
+with the fix from cb3a749a22a55645dc6a52659eea765300623f98 ("x86:
+Restore processing of cache size tunables in init_cacheinfo") applied.
+
+Reviewed-by: Premachandra Mallappa <premachandra.mallappa@amd.com>
+Co-Authored-by: Florian Weimer <fweimer@redhat.com>
+---
+ sysdeps/x86/cacheinfo.c | 20 +++++++++++++++++---
+ 1 file changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/sysdeps/x86/cacheinfo.c b/sysdeps/x86/cacheinfo.c
+index dadec5d58f..3fb4a028d8 100644
+--- a/sysdeps/x86/cacheinfo.c
++++ b/sysdeps/x86/cacheinfo.c
+@@ -808,7 +808,7 @@ init_cacheinfo (void)
+ threads = 1 << ((ecx >> 12) & 0x0f);
+ }
+
+- if (threads == 0)
++ if (threads == 0 || cpu_features->basic.family >= 0x17)
+ {
+ /* If APIC ID width is not available, use logical
+ processor count. */
+@@ -823,8 +823,22 @@ init_cacheinfo (void)
+ if (threads > 0)
+ shared /= threads;
+
+- /* Account for exclusive L2 and L3 caches. */
+- shared += core;
++ /* Get shared cache per ccx for Zen architectures. */
++ if (cpu_features->basic.family >= 0x17)
++ {
++ unsigned int eax;
++
++ /* Get number of threads share the L3 cache in CCX. */
++ __cpuid_count (0x8000001D, 0x3, eax, ebx, ecx, edx);
++
++ unsigned int threads_per_ccx = ((eax >> 14) & 0xfff) + 1;
++ shared *= threads_per_ccx;
++ }
++ else
++ {
++ /* Account for exclusive L2 and L3 caches. */
++ shared += core;
++ }
+ }
+ }
+
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0013-aarch64-Fix-DT_AARCH64_VARIANT_PCS-handling-BZ-26798.patch b/packages/sys-libs/glibc/files/patches-2.32/0013-aarch64-Fix-DT_AARCH64_VARIANT_PCS-handling-BZ-26798.patch
new file mode 100644
index 000000000..0e43b8d7a
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0013-aarch64-Fix-DT_AARCH64_VARIANT_PCS-handling-BZ-26798.patch
@@ -0,0 +1,57 @@
+Upstream: yes, taken from release/2.32/master
+
+From 70ee5e8b573f76745760dd6b75f705590fc1923a Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <szabolcs.nagy@arm.com>
+Date: Thu, 22 Oct 2020 17:55:01 +0100
+Subject: [PATCH 13/23] aarch64: Fix DT_AARCH64_VARIANT_PCS handling [BZ
+ #26798]
+
+The variant PCS support was ineffective because in the common case
+linkmap->l_mach.plt == 0 but then the symbol table flags were ignored
+and normal lazy binding was used instead of resolving the relocs early.
+(This was a misunderstanding about how GOT[1] is setup by the linker.)
+
+In practice this mainly affects SVE calls when the vector length is
+more than 128 bits, then the top bits of the argument registers get
+clobbered during lazy binding.
+
+Fixes bug 26798.
+
+(cherry picked from commit 558251bd8785760ad40fcbfeaaee5d27fa5b0fe4)
+---
+ sysdeps/aarch64/dl-machine.h | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h
+index 70b9ed3925..fde7cfd9e2 100644
+--- a/sysdeps/aarch64/dl-machine.h
++++ b/sysdeps/aarch64/dl-machine.h
+@@ -395,13 +395,6 @@ elf_machine_lazy_rel (struct link_map *map,
+ /* Check for unexpected PLT reloc type. */
+ if (__builtin_expect (r_type == AARCH64_R(JUMP_SLOT), 1))
+ {
+- if (map->l_mach.plt == 0)
+- {
+- /* Prelinking. */
+- *reloc_addr += l_addr;
+- return;
+- }
+-
+ if (__glibc_unlikely (map->l_info[DT_AARCH64 (VARIANT_PCS)] != NULL))
+ {
+ /* Check the symbol table for variant PCS symbols. */
+@@ -425,7 +418,10 @@ elf_machine_lazy_rel (struct link_map *map,
+ }
+ }
+
+- *reloc_addr = map->l_mach.plt;
++ if (map->l_mach.plt == 0)
++ *reloc_addr += l_addr;
++ else
++ *reloc_addr = map->l_mach.plt;
+ }
+ else if (__builtin_expect (r_type == AARCH64_R(TLSDESC), 1))
+ {
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0014-aarch64-Add-unwind-information-to-_start-bug-26853.patch b/packages/sys-libs/glibc/files/patches-2.32/0014-aarch64-Add-unwind-information-to-_start-bug-26853.patch
new file mode 100644
index 000000000..9b84b97a4
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0014-aarch64-Add-unwind-information-to-_start-bug-26853.patch
@@ -0,0 +1,59 @@
+Upstream: yes, taken from release/2.32/master
+
+From c6e794640c324db37038c6a8606f3f5f8903250b Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Mon, 9 Nov 2020 11:31:04 +0100
+Subject: [PATCH 14/23] aarch64: Add unwind information to _start (bug 26853)
+
+This adds CFI directives which communicate that the stack ends
+with this function.
+
+Fixes bug 26853.
+
+(cherry picked from commit 5edf3d9fd6efe06fda37b2a460e60690a90457a4)
+---
+ NEWS | 1 +
+ sysdeps/aarch64/start.S | 7 +++----
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index 3030735839..d2a484462b 100644
+--- a/NEWS
++++ b/NEWS
+@@ -15,6 +15,7 @@ The following bugs are resolved with this release:
+ [26637] libc: semctl SEM_STAT_ANY fails to pass the buffer specified
+ by the caller to the kernel
+ [26639] libc: msgctl IPC_INFO and MSG_INFO return garbage
++ [26853] aarch64: Missing unwind information in statically linked startup code
+
+ Version 2.32
+
+diff --git a/sysdeps/aarch64/start.S b/sysdeps/aarch64/start.S
+index 75393e1c18..108f602721 100644
+--- a/sysdeps/aarch64/start.S
++++ b/sysdeps/aarch64/start.S
+@@ -43,11 +43,9 @@
+ */
+
+ .text
+- .globl _start
+- .type _start,#function
+-_start:
+- BTI_C
++ENTRY(_start)
+ /* Create an initial frame with 0 LR and FP */
++ cfi_undefined (x30)
+ mov x29, #0
+ mov x30, #0
+
+@@ -103,6 +101,7 @@ _start:
+ __wrap_main:
+ b main
+ #endif
++END(_start)
+
+ /* Define a symbol for the first piece of initialized data. */
+ .data
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0015-Remove-__warn_memset_zero_len-BZ-25399.patch b/packages/sys-libs/glibc/files/patches-2.32/0015-Remove-__warn_memset_zero_len-BZ-25399.patch
new file mode 100644
index 000000000..0770b2258
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0015-Remove-__warn_memset_zero_len-BZ-25399.patch
@@ -0,0 +1,60 @@
+Upstream: yes, taken from release/2.32/master
+
+From 5337b2af4b863fc9a1b92134bbe09758f1eff39d Mon Sep 17 00:00:00 2001
+From: Siddhesh Poyarekar <siddhesh@sourceware.org>
+Date: Tue, 3 Nov 2020 15:09:28 +0530
+Subject: [PATCH 15/23] Remove __warn_memset_zero_len [BZ #25399]
+
+Non-gcc compilers (clang and possibly other compilers that do not
+masquerade as gcc 5.0 or later) are unable to use
+__warn_memset_zero_len since the symbol is no longer available on
+glibc built with gcc 5.0 or later. While it was likely an oversight
+that caused this omission, the fact that it wasn't noticed until
+recently (when clang closed the gap on _FORTIFY_SUPPORT) that the
+symbol was missing.
+
+Given that both gcc and clang are capable of doing this check in the
+compiler, drop all remaining signs of __warn_memset_zero_len from
+glibc so that no more objects are built with this symbol in future.
+
+(cherry-picked from dc274b141666766b8ef70992d887e3c0c5e41bed)
+---
+ string/bits/string_fortified.h | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/string/bits/string_fortified.h b/string/bits/string_fortified.h
+index 309d0f39b2..c8d3051af8 100644
+--- a/string/bits/string_fortified.h
++++ b/string/bits/string_fortified.h
+@@ -22,11 +22,6 @@
+ # error "Never use <bits/string_fortified.h> directly; include <string.h> instead."
+ #endif
+
+-#if !__GNUC_PREREQ (5,0)
+-__warndecl (__warn_memset_zero_len,
+- "memset used with constant zero length parameter; this could be due to transposed parameters");
+-#endif
+-
+ __fortify_function void *
+ __NTH (memcpy (void *__restrict __dest, const void *__restrict __src,
+ size_t __len))
+@@ -58,16 +53,6 @@ __NTH (mempcpy (void *__restrict __dest, const void *__restrict __src,
+ __fortify_function void *
+ __NTH (memset (void *__dest, int __ch, size_t __len))
+ {
+- /* GCC-5.0 and newer implements these checks in the compiler, so we don't
+- need them here. */
+-#if !__GNUC_PREREQ (5,0)
+- if (__builtin_constant_p (__len) && __len == 0
+- && (!__builtin_constant_p (__ch) || __ch != 0))
+- {
+- __warn_memset_zero_len ();
+- return __dest;
+- }
+-#endif
+ return __builtin___memset_chk (__dest, __ch, __len, __bos0 (__dest));
+ }
+
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0016-Remove-__warndecl.patch b/packages/sys-libs/glibc/files/patches-2.32/0016-Remove-__warndecl.patch
new file mode 100644
index 000000000..52a5c1033
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0016-Remove-__warndecl.patch
@@ -0,0 +1,129 @@
+Upstream: yes, taken from release/2.32/master
+
+From eba0ce6058828afd84b27a42b7bca5218f94aa10 Mon Sep 17 00:00:00 2001
+From: Siddhesh Poyarekar <siddhesh@sourceware.org>
+Date: Thu, 5 Nov 2020 10:20:32 +0530
+Subject: [PATCH 16/23] Remove __warndecl
+
+The macro is not used anymore, so remove it and warning-nop.c.
+
+Reviewed-by: Florian Weimer <fweimer@redhat.com>
+
+(cherry-picked from 34aec973e15a81926198f4b71ff99081dff87a92)
+---
+ debug/Makefile | 2 +-
+ debug/warning-nop.c | 70 ---------------------------------------------
+ misc/sys/cdefs.h | 3 --
+ 3 files changed, 1 insertion(+), 74 deletions(-)
+ delete mode 100644 debug/warning-nop.c
+
+diff --git a/debug/Makefile b/debug/Makefile
+index 3a60d7af7a..0036edd187 100644
+--- a/debug/Makefile
++++ b/debug/Makefile
+@@ -51,7 +51,7 @@ routines = backtrace backtracesyms backtracesymsfd noophooks \
+ explicit_bzero_chk \
+ stack_chk_fail fortify_fail \
+ $(static-only-routines)
+-static-only-routines := warning-nop stack_chk_fail_local
++static-only-routines := stack_chk_fail_local
+
+ # Don't add stack_chk_fail_local.o to libc.a since __stack_chk_fail_local
+ # is an alias of __stack_chk_fail in stack_chk_fail.o.
+diff --git a/debug/warning-nop.c b/debug/warning-nop.c
+deleted file mode 100644
+index 4ab7e182b7..0000000000
+--- a/debug/warning-nop.c
++++ /dev/null
+@@ -1,70 +0,0 @@
+-/* Dummy nop functions to elicit link-time warnings.
+- Copyright (C) 2005-2020 Free Software Foundation, Inc.
+- This file is part of the GNU C Library.
+-
+- The GNU C Library is free software; you can redistribute it and/or
+- modify it under the terms of the GNU Lesser General Public
+- License as published by the Free Software Foundation; either
+- version 2.1 of the License, or (at your option) any later version.
+-
+- In addition to the permissions in the GNU Lesser General Public
+- License, the Free Software Foundation gives you unlimited
+- permission to link the compiled version of this file with other
+- programs, and to distribute those programs without any restriction
+- coming from the use of this file. (The GNU Lesser General Public
+- License restrictions do apply in other respects; for example, they
+- cover modification of the file, and distribution when not linked
+- into another program.)
+-
+- Note that people who make modified versions of this file are not
+- obligated to grant this special exception for their modified
+- versions; it is their choice whether to do so. The GNU Lesser
+- General Public License gives permission to release a modified
+- version without this exception; this exception also makes it
+- possible to release a modified version which carries forward this
+- exception.
+-
+- The GNU C Library is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Lesser General Public License for more details.
+-
+- You should have received a copy of the GNU Lesser General Public
+- License along with the GNU C Library; if not, see
+- <https://www.gnu.org/licenses/>. */
+-
+-#include <sys/cdefs.h>
+-
+-static void
+-__attribute__ ((used))
+-nop (void)
+-{
+-}
+-
+-/* Don't insert any other #include's before this #undef! */
+-
+-#undef __warndecl
+-#define __warndecl(name, msg) \
+- extern void name (void) __attribute__ ((alias ("nop"))) attribute_hidden; \
+- link_warning (name, msg)
+-
+-#undef __USE_FORTIFY_LEVEL
+-#define __USE_FORTIFY_LEVEL 99
+-
+-/* Following here we need an #include for each public header file
+- that uses __warndecl. */
+-
+-/* Define away to avoid warnings with compilers that do not have these
+- builtins. */
+-#define __builtin___memcpy_chk(dest, src, len, bos) NULL
+-#define __builtin___memmove_chk(dest, src, len, bos) NULL
+-#define __builtin___mempcpy_chk(dest, src, len, bos) NULL
+-#define __builtin___memset_chk(dest, ch, len, bos) NULL
+-#define __builtin___stpcpy_chk(dest, src, bos) NULL
+-#define __builtin___strcat_chk(dest, src, bos) NULL
+-#define __builtin___strcpy_chk(dest, src, bos) NULL
+-#define __builtin___strncat_chk(dest, src, len, bos) NULL
+-#define __builtin___strncpy_chk(dest, src, len, bos) NULL
+-#define __builtin_object_size(bos, level) 0
+-
+-#include <string.h>
+diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
+index 19d9cc5cfe..38221d0b2a 100644
+--- a/misc/sys/cdefs.h
++++ b/misc/sys/cdefs.h
+@@ -124,13 +124,10 @@
+ #define __bos0(ptr) __builtin_object_size (ptr, 0)
+
+ #if __GNUC_PREREQ (4,3)
+-# define __warndecl(name, msg) \
+- extern void name (void) __attribute__((__warning__ (msg)))
+ # define __warnattr(msg) __attribute__((__warning__ (msg)))
+ # define __errordecl(name, msg) \
+ extern void name (void) __attribute__((__error__ (msg)))
+ #else
+-# define __warndecl(name, msg) extern void name (void)
+ # define __warnattr(msg)
+ # define __errordecl(name, msg) extern void name (void)
+ #endif
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0017-support-Provide-a-way-to-reorder-responses-within-th.patch b/packages/sys-libs/glibc/files/patches-2.32/0017-support-Provide-a-way-to-reorder-responses-within-th.patch
new file mode 100644
index 000000000..5045c51a3
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0017-support-Provide-a-way-to-reorder-responses-within-th.patch
@@ -0,0 +1,309 @@
+Upstream: yes, taken from release/2.32/master
+
+From f688bcd83de17986deed911434b20a964410ad2e Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Wed, 14 Oct 2020 10:54:39 +0200
+Subject: [PATCH 17/23] support: Provide a way to reorder responses within the
+ DNS test server
+
+(cherry picked from commit 873e239a4c3d8ec235c27439c1bdc5bbf8aa1818)
+---
+ support/Makefile | 2 +
+ support/resolv_response_context_duplicate.c | 37 +++++++++++++
+ support/resolv_response_context_free.c | 28 ++++++++++
+ support/resolv_test.c | 59 +++++++++++++--------
+ support/resolv_test.h | 37 +++++++++++--
+ 5 files changed, 135 insertions(+), 28 deletions(-)
+ create mode 100644 support/resolv_response_context_duplicate.c
+ create mode 100644 support/resolv_response_context_free.c
+
+diff --git a/support/Makefile b/support/Makefile
+index 93faafddf9..4154863511 100644
+--- a/support/Makefile
++++ b/support/Makefile
+@@ -35,6 +35,8 @@ libsupport-routines = \
+ ignore_stderr \
+ next_to_fault \
+ oom_error \
++ resolv_response_context_duplicate \
++ resolv_response_context_free \
+ resolv_test \
+ set_fortify_handler \
+ support-xfstat \
+diff --git a/support/resolv_response_context_duplicate.c b/support/resolv_response_context_duplicate.c
+new file mode 100644
+index 0000000000..f9c5c3462a
+--- /dev/null
++++ b/support/resolv_response_context_duplicate.c
+@@ -0,0 +1,37 @@
++/* Duplicate a response context used in DNS resolver tests.
++ Copyright (C) 2020 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <string.h>
++#include <support/resolv_test.h>
++#include <support/support.h>
++
++struct resolv_response_context *
++resolv_response_context_duplicate (const struct resolv_response_context *ctx)
++{
++ struct resolv_response_context *result = xmalloc (sizeof (*result));
++ memcpy (result, ctx, sizeof (*result));
++ if (result->client_address != NULL)
++ {
++ result->client_address = xmalloc (result->client_address_length);
++ memcpy (result->client_address, ctx->client_address,
++ result->client_address_length);
++ }
++ result->query_buffer = xmalloc (result->query_length);
++ memcpy (result->query_buffer, ctx->query_buffer, result->query_length);
++ return result;
++}
+diff --git a/support/resolv_response_context_free.c b/support/resolv_response_context_free.c
+new file mode 100644
+index 0000000000..b88c05ffd4
+--- /dev/null
++++ b/support/resolv_response_context_free.c
+@@ -0,0 +1,28 @@
++/* Free a response context used in DNS resolver tests.
++ Copyright (C) 2020 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <stdlib.h>
++#include <support/resolv_test.h>
++
++void
++resolv_response_context_free (struct resolv_response_context *ctx)
++{
++ free (ctx->query_buffer);
++ free (ctx->client_address);
++ free (ctx);
++}
+diff --git a/support/resolv_test.c b/support/resolv_test.c
+index 53b7fc41ab..e343c4b516 100644
+--- a/support/resolv_test.c
++++ b/support/resolv_test.c
+@@ -434,9 +434,9 @@ resolv_response_buffer (const struct resolv_response_builder *b)
+ return result;
+ }
+
+-static struct resolv_response_builder *
+-response_builder_allocate
+- (const unsigned char *query_buffer, size_t query_length)
++struct resolv_response_builder *
++resolv_response_builder_allocate (const unsigned char *query_buffer,
++ size_t query_length)
+ {
+ struct resolv_response_builder *b = xmalloc (sizeof (*b));
+ memset (b, 0, offsetof (struct resolv_response_builder, buffer));
+@@ -445,8 +445,8 @@ response_builder_allocate
+ return b;
+ }
+
+-static void
+-response_builder_free (struct resolv_response_builder *b)
++void
++resolv_response_builder_free (struct resolv_response_builder *b)
+ {
+ tdestroy (b->compression_offsets, free);
+ free (b);
+@@ -661,13 +661,17 @@ server_thread_udp_process_one (struct resolv_test *obj, int server_index)
+
+ struct resolv_response_context ctx =
+ {
++ .test = obj,
++ .client_address = &peer,
++ .client_address_length = peerlen,
+ .query_buffer = query,
+ .query_length = length,
+ .server_index = server_index,
+ .tcp = false,
+ .edns = qinfo.edns,
+ };
+- struct resolv_response_builder *b = response_builder_allocate (query, length);
++ struct resolv_response_builder *b
++ = resolv_response_builder_allocate (query, length);
+ obj->config.response_callback
+ (&ctx, b, qinfo.qname, qinfo.qclass, qinfo.qtype);
+
+@@ -684,7 +688,7 @@ server_thread_udp_process_one (struct resolv_test *obj, int server_index)
+ if (b->offset >= 12)
+ printf ("info: UDP server %d: sending response:"
+ " %zu bytes, RCODE %d (for %s/%u/%u)\n",
+- server_index, b->offset, b->buffer[3] & 0x0f,
++ ctx.server_index, b->offset, b->buffer[3] & 0x0f,
+ qinfo.qname, qinfo.qclass, qinfo.qtype);
+ else
+ printf ("info: UDP server %d: sending response: %zu bytes"
+@@ -694,23 +698,31 @@ server_thread_udp_process_one (struct resolv_test *obj, int server_index)
+ if (b->truncate_bytes > 0)
+ printf ("info: truncated by %u bytes\n", b->truncate_bytes);
+ }
+- size_t to_send = b->offset;
+- if (to_send < b->truncate_bytes)
+- to_send = 0;
+- else
+- to_send -= b->truncate_bytes;
+-
+- /* Ignore most errors here because the other end may have closed
+- the socket. */
+- if (sendto (obj->servers[server_index].socket_udp,
+- b->buffer, to_send, 0,
+- (struct sockaddr *) &peer, peerlen) < 0)
+- TEST_VERIFY_EXIT (errno != EBADF);
++ resolv_response_send_udp (&ctx, b);
+ }
+- response_builder_free (b);
++ resolv_response_builder_free (b);
+ return true;
+ }
+
++void
++resolv_response_send_udp (const struct resolv_response_context *ctx,
++ struct resolv_response_builder *b)
++{
++ TEST_VERIFY_EXIT (!ctx->tcp);
++ size_t to_send = b->offset;
++ if (to_send < b->truncate_bytes)
++ to_send = 0;
++ else
++ to_send -= b->truncate_bytes;
++
++ /* Ignore most errors here because the other end may have closed
++ the socket. */
++ if (sendto (ctx->test->servers[ctx->server_index].socket_udp,
++ b->buffer, to_send, 0,
++ ctx->client_address, ctx->client_address_length) < 0)
++ TEST_VERIFY_EXIT (errno != EBADF);
++}
++
+ /* UDP thread_callback function. Variant for one thread per
+ server. */
+ static void
+@@ -897,14 +909,15 @@ server_thread_tcp_client (void *arg)
+
+ struct resolv_response_context ctx =
+ {
++ .test = closure->obj,
+ .query_buffer = query_buffer,
+ .query_length = query_length,
+ .server_index = closure->server_index,
+ .tcp = true,
+ .edns = qinfo.edns,
+ };
+- struct resolv_response_builder *b = response_builder_allocate
+- (query_buffer, query_length);
++ struct resolv_response_builder *b
++ = resolv_response_builder_allocate (query_buffer, query_length);
+ closure->obj->config.response_callback
+ (&ctx, b, qinfo.qname, qinfo.qclass, qinfo.qtype);
+
+@@ -936,7 +949,7 @@ server_thread_tcp_client (void *arg)
+ writev_fully (closure->client_socket, buffers, 2);
+ }
+ bool close_flag = b->close;
+- response_builder_free (b);
++ resolv_response_builder_free (b);
+ free (query_buffer);
+ if (close_flag)
+ break;
+diff --git a/support/resolv_test.h b/support/resolv_test.h
+index 67819469a0..c46de32ff4 100644
+--- a/support/resolv_test.h
++++ b/support/resolv_test.h
+@@ -35,25 +35,36 @@ struct resolv_edns_info
+ uint16_t payload_size;
+ };
+
++/* This opaque struct collects information about the resolver testing
++ currently in progress. */
++struct resolv_test;
++
+ /* This struct provides context information when the response callback
+ specified in struct resolv_redirect_config is invoked. */
+ struct resolv_response_context
+ {
+- const unsigned char *query_buffer;
++ struct resolv_test *test;
++ void *client_address;
++ size_t client_address_length;
++ unsigned char *query_buffer;
+ size_t query_length;
+ int server_index;
+ bool tcp;
+ struct resolv_edns_info edns;
+ };
+
++/* Produces a deep copy of the context. */
++struct resolv_response_context *
++ resolv_response_context_duplicate (const struct resolv_response_context *);
++
++/* Frees the copy. For the context passed to the response function,
++ this happens implicitly. */
++void resolv_response_context_free (struct resolv_response_context *);
++
+ /* This opaque struct is used to construct responses from within the
+ response callback function. */
+ struct resolv_response_builder;
+
+-/* This opaque struct collects information about the resolver testing
+- currently in progress. */
+-struct resolv_test;
+-
+ enum
+ {
+ /* Maximum number of test servers supported by the framework. */
+@@ -188,6 +199,22 @@ void resolv_response_close (struct resolv_response_builder *);
+ /* The size of the response packet built so far. */
+ size_t resolv_response_length (const struct resolv_response_builder *);
+
++/* Allocates a response builder tied to a specific query packet,
++ starting at QUERY_BUFFER, containing QUERY_LENGTH bytes. */
++struct resolv_response_builder *
++ resolv_response_builder_allocate (const unsigned char *query_buffer,
++ size_t query_length);
++
++/* Deallocates a response buffer. */
++void resolv_response_builder_free (struct resolv_response_builder *);
++
++/* Sends a UDP response using a specific context. This can be used to
++ reorder or duplicate responses, along with
++ resolv_response_context_duplicate and
++ response_builder_allocate. */
++void resolv_response_send_udp (const struct resolv_response_context *,
++ struct resolv_response_builder *);
++
+ __END_DECLS
+
+ #endif /* SUPPORT_RESOLV_TEST_H */
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0018-support-Provide-a-way-to-clear-the-RA-bit-in-DNS-ser.patch b/packages/sys-libs/glibc/files/patches-2.32/0018-support-Provide-a-way-to-clear-the-RA-bit-in-DNS-ser.patch
new file mode 100644
index 000000000..5b73ad7d5
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0018-support-Provide-a-way-to-clear-the-RA-bit-in-DNS-ser.patch
@@ -0,0 +1,47 @@
+Upstream: yes, taken from release/2.32/master
+
+From 05c025abca109daf7ddbc9e4562815a4274920ef Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Wed, 14 Oct 2020 10:54:39 +0200
+Subject: [PATCH 18/23] support: Provide a way to clear the RA bit in DNS
+ server responses
+
+(cherry picked from commit 08443b19965f48862b02c2fd7b33a39d66daf2ff)
+---
+ support/resolv_test.c | 4 +++-
+ support/resolv_test.h | 4 ++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/support/resolv_test.c b/support/resolv_test.c
+index e343c4b516..9878a040a3 100644
+--- a/support/resolv_test.c
++++ b/support/resolv_test.c
+@@ -181,7 +181,9 @@ resolv_response_init (struct resolv_response_builder *b,
+ b->buffer[2] |= b->query_buffer[2] & 0x01; /* Copy the RD bit. */
+ if (flags.tc)
+ b->buffer[2] |= 0x02;
+- b->buffer[3] = 0x80 | flags.rcode; /* Always set RA. */
++ b->buffer[3] = flags.rcode;
++ if (!flags.clear_ra)
++ b->buffer[3] |= 0x80;
+ if (flags.ad)
+ b->buffer[3] |= 0x20;
+
+diff --git a/support/resolv_test.h b/support/resolv_test.h
+index c46de32ff4..31a5c1c3e7 100644
+--- a/support/resolv_test.h
++++ b/support/resolv_test.h
+@@ -148,6 +148,10 @@ struct resolv_response_flags
+ /* If true, the AD (authenticated data) flag will be set. */
+ bool ad;
+
++ /* If true, do not set the RA (recursion available) flag in the
++ response. */
++ bool clear_ra;
++
+ /* Initial section count values. Can be used to artificially
+ increase the counts, for malformed packet testing.*/
+ unsigned short qdcount;
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0019-resolv-Handle-transaction-ID-collisions-in-parallel-.patch b/packages/sys-libs/glibc/files/patches-2.32/0019-resolv-Handle-transaction-ID-collisions-in-parallel-.patch
new file mode 100644
index 000000000..8fa3156ca
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0019-resolv-Handle-transaction-ID-collisions-in-parallel-.patch
@@ -0,0 +1,443 @@
+Upstream: yes, taken from release/2.32/master
+
+From 2dfa659a66f20facc4082207884c20e986ddecee Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Wed, 14 Oct 2020 10:54:39 +0200
+Subject: [PATCH 19/23] resolv: Handle transaction ID collisions in parallel
+ queries (bug 26600)
+
+If the transaction IDs are equal, the old check attributed both
+responses to the first query, not recognizing the second response.
+This fixes bug 26600.
+
+(cherry picked from commit f1f00c072138af90ae6da180f260111f09afe7a3)
+---
+ NEWS | 1 +
+ resolv/Makefile | 7 +
+ resolv/res_send.c | 40 ++--
+ resolv/tst-resolv-txnid-collision.c | 329 ++++++++++++++++++++++++++++
+ 4 files changed, 357 insertions(+), 20 deletions(-)
+ create mode 100644 resolv/tst-resolv-txnid-collision.c
+
+diff --git a/NEWS b/NEWS
+index d2a484462b..1c1f270784 100644
+--- a/NEWS
++++ b/NEWS
+@@ -10,6 +10,7 @@ The following bugs are resolved with this release:
+ [26534] libm.so 2.32 SIGILL in pow() due to FMA4 instruction on non-FMA4
+ system
+ [26555] string: strerrorname_np does not return the documented value
++ [26600] Transaction ID collisions cause slow DNS lookups in getaddrinfo
+ [26636] libc: 32-bit shmctl(IPC_INFO) crashes when shminfo struct is
+ at the end of a memory mapping
+ [26637] libc: semctl SEM_STAT_ANY fails to pass the buffer specified
+diff --git a/resolv/res_send.c b/resolv/res_send.c
+index 7e5fec6646..70e5066031 100644
+--- a/resolv/res_send.c
++++ b/resolv/res_send.c
+@@ -1342,15 +1342,6 @@ send_dg(res_state statp,
+ *terrno = EMSGSIZE;
+ return close_and_return_error (statp, resplen2);
+ }
+- if ((recvresp1 || hp->id != anhp->id)
+- && (recvresp2 || hp2->id != anhp->id)) {
+- /*
+- * response from old query, ignore it.
+- * XXX - potential security hazard could
+- * be detected here.
+- */
+- goto wait;
+- }
+
+ /* Paranoia check. Due to the connected UDP socket,
+ the kernel has already filtered invalid addresses
+@@ -1360,15 +1351,24 @@ send_dg(res_state statp,
+
+ /* Check for the correct header layout and a matching
+ question. */
+- if ((recvresp1 || !res_queriesmatch(buf, buf + buflen,
+- *thisansp,
+- *thisansp
+- + *thisanssizp))
+- && (recvresp2 || !res_queriesmatch(buf2, buf2 + buflen2,
+- *thisansp,
+- *thisansp
+- + *thisanssizp)))
+- goto wait;
++ int matching_query = 0; /* Default to no matching query. */
++ if (!recvresp1
++ && anhp->id == hp->id
++ && res_queriesmatch (buf, buf + buflen,
++ *thisansp, *thisansp + *thisanssizp))
++ matching_query = 1;
++ if (!recvresp2
++ && anhp->id == hp2->id
++ && res_queriesmatch (buf2, buf2 + buflen2,
++ *thisansp, *thisansp + *thisanssizp))
++ matching_query = 2;
++ if (matching_query == 0)
++ /* Spurious UDP packet. Drop it and continue
++ waiting. */
++ {
++ need_recompute = 1;
++ goto wait;
++ }
+
+ if (anhp->rcode == SERVFAIL ||
+ anhp->rcode == NOTIMP ||
+@@ -1383,7 +1383,7 @@ send_dg(res_state statp,
+ /* No data from the first reply. */
+ resplen = 0;
+ /* We are waiting for a possible second reply. */
+- if (hp->id == anhp->id)
++ if (matching_query == 1)
+ recvresp1 = 1;
+ else
+ recvresp2 = 1;
+@@ -1414,7 +1414,7 @@ send_dg(res_state statp,
+ return (1);
+ }
+ /* Mark which reply we received. */
+- if (recvresp1 == 0 && hp->id == anhp->id)
++ if (matching_query == 1)
+ recvresp1 = 1;
+ else
+ recvresp2 = 1;
+diff --git a/resolv/tst-resolv-txnid-collision.c b/resolv/tst-resolv-txnid-collision.c
+new file mode 100644
+index 0000000000..611d37362f
+--- /dev/null
++++ b/resolv/tst-resolv-txnid-collision.c
+@@ -0,0 +1,329 @@
++/* Test parallel queries with transaction ID collisions.
++ Copyright (C) 2020 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <arpa/nameser.h>
++#include <array_length.h>
++#include <resolv-internal.h>
++#include <resolv_context.h>
++#include <stdbool.h>
++#include <stdio.h>
++#include <string.h>
++#include <support/check.h>
++#include <support/check_nss.h>
++#include <support/resolv_test.h>
++#include <support/support.h>
++#include <support/test-driver.h>
++
++/* Result of parsing a DNS question name.
++
++ A question name has the form reorder-N-M-rcode-C.example.net, where
++ N and M are either 0 and 1, corresponding to the reorder member,
++ and C is a number that will be stored in the rcode field.
++
++ Also see parse_qname below. */
++struct parsed_qname
++{
++ /* The DNS response code requested from the first server. The
++ second server always responds with RCODE zero. */
++ int rcode;
++
++ /* Indicates whether to perform reordering in the responses from the
++ respective server. */
++ bool reorder[2];
++};
++
++/* Fills *PARSED based on QNAME. */
++static void
++parse_qname (struct parsed_qname *parsed, const char *qname)
++{
++ int reorder0;
++ int reorder1;
++ int rcode;
++ char *suffix;
++ if (sscanf (qname, "reorder-%d-%d.rcode-%d.%ms",
++ &reorder0, &reorder1, &rcode, &suffix) == 4)
++ {
++ if (reorder0 != 0)
++ TEST_COMPARE (reorder0, 1);
++ if (reorder1 != 0)
++ TEST_COMPARE (reorder1, 1);
++ TEST_VERIFY (rcode >= 0 && rcode <= 15);
++ TEST_COMPARE_STRING (suffix, "example.net");
++ free (suffix);
++
++ parsed->rcode = rcode;
++ parsed->reorder[0] = reorder0;
++ parsed->reorder[1] = reorder1;
++ }
++ else
++ FAIL_EXIT1 ("unexpected query: %s", qname);
++}
++
++/* Used to construct a response. The first server responds with an
++ error, the second server succeeds. */
++static void
++build_response (const struct resolv_response_context *ctx,
++ struct resolv_response_builder *b,
++ const char *qname, uint16_t qclass, uint16_t qtype)
++{
++ struct parsed_qname parsed;
++ parse_qname (&parsed, qname);
++
++ switch (ctx->server_index)
++ {
++ case 0:
++ {
++ struct resolv_response_flags flags = { 0 };
++ if (parsed.rcode == 0)
++ /* Simulate a delegation in case a NODATA (RCODE zero)
++ response is requested. */
++ flags.clear_ra = true;
++ else
++ flags.rcode = parsed.rcode;
++
++ resolv_response_init (b, flags);
++ resolv_response_add_question (b, qname, qclass, qtype);
++ }
++ break;
++
++ case 1:
++ {
++ struct resolv_response_flags flags = { 0, };
++ resolv_response_init (b, flags);
++ resolv_response_add_question (b, qname, qclass, qtype);
++
++ resolv_response_section (b, ns_s_an);
++ resolv_response_open_record (b, qname, qclass, qtype, 0);
++ if (qtype == T_A)
++ {
++ char ipv4[4] = { 192, 0, 2, 1 };
++ resolv_response_add_data (b, &ipv4, sizeof (ipv4));
++ }
++ else
++ {
++ char ipv6[16]
++ = { 0x20, 0x01, 0xd, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
++ resolv_response_add_data (b, &ipv6, sizeof (ipv6));
++ }
++ resolv_response_close_record (b);
++ }
++ break;
++ }
++}
++
++/* Used to reorder responses. */
++struct resolv_response_context *previous_query;
++
++/* Used to keep track of the queries received. */
++static int previous_server_index = -1;
++static uint16_t previous_qtype;
++
++/* For each server, buffer the first query and then send both answers
++ to the second query, reordered if requested. */
++static void
++response (const struct resolv_response_context *ctx,
++ struct resolv_response_builder *b,
++ const char *qname, uint16_t qclass, uint16_t qtype)
++{
++ TEST_VERIFY (qtype == T_A || qtype == T_AAAA);
++ if (ctx->server_index != 0)
++ TEST_COMPARE (ctx->server_index, 1);
++
++ struct parsed_qname parsed;
++ parse_qname (&parsed, qname);
++
++ if (previous_query == NULL)
++ {
++ /* No buffered query. Record this query and do not send a
++ response. */
++ TEST_COMPARE (previous_qtype, 0);
++ previous_query = resolv_response_context_duplicate (ctx);
++ previous_qtype = qtype;
++ resolv_response_drop (b);
++ previous_server_index = ctx->server_index;
++
++ if (test_verbose)
++ printf ("info: buffering first query for: %s\n", qname);
++ }
++ else
++ {
++ TEST_VERIFY (previous_query != 0);
++ TEST_COMPARE (ctx->server_index, previous_server_index);
++ TEST_VERIFY (previous_qtype != qtype); /* Not a duplicate. */
++
++ /* If reordering, send a response for this query explicitly, and
++ then skip the implicit send. */
++ if (parsed.reorder[ctx->server_index])
++ {
++ if (test_verbose)
++ printf ("info: sending reordered second response for: %s\n",
++ qname);
++ build_response (ctx, b, qname, qclass, qtype);
++ resolv_response_send_udp (ctx, b);
++ resolv_response_drop (b);
++ }
++
++ /* Build a response for the previous query and send it, thus
++ reordering the two responses. */
++ {
++ if (test_verbose)
++ printf ("info: sending first response for: %s\n", qname);
++ struct resolv_response_builder *btmp
++ = resolv_response_builder_allocate (previous_query->query_buffer,
++ previous_query->query_length);
++ build_response (ctx, btmp, qname, qclass, previous_qtype);
++ resolv_response_send_udp (ctx, btmp);
++ resolv_response_builder_free (btmp);
++ }
++
++ /* If not reordering, send the reply as usual. */
++ if (!parsed.reorder[ctx->server_index])
++ {
++ if (test_verbose)
++ printf ("info: sending non-reordered second response for: %s\n",
++ qname);
++ build_response (ctx, b, qname, qclass, qtype);
++ }
++
++ /* Unbuffer the response and prepare for the next query. */
++ resolv_response_context_free (previous_query);
++ previous_query = NULL;
++ previous_qtype = 0;
++ previous_server_index = -1;
++ }
++}
++
++/* Runs a query for QNAME and checks for the expected reply. See
++ struct parsed_qname for the expected format for QNAME. */
++static void
++test_qname (const char *qname, int rcode)
++{
++ struct resolv_context *ctx = __resolv_context_get ();
++ TEST_VERIFY_EXIT (ctx != NULL);
++
++ unsigned char q1[512];
++ int q1len = res_mkquery (QUERY, qname, C_IN, T_A, NULL, 0, NULL,
++ q1, sizeof (q1));
++ TEST_VERIFY_EXIT (q1len > 12);
++
++ unsigned char q2[512];
++ int q2len = res_mkquery (QUERY, qname, C_IN, T_AAAA, NULL, 0, NULL,
++ q2, sizeof (q2));
++ TEST_VERIFY_EXIT (q2len > 12);
++
++ /* Produce a transaction ID collision. */
++ memcpy (q2, q1, 2);
++
++ unsigned char ans1[512];
++ unsigned char *ans1p = ans1;
++ unsigned char *ans2p = NULL;
++ int nans2p = 0;
++ int resplen2 = 0;
++ int ans2p_malloced = 0;
++
++ /* Perform a parallel A/AAAA query. */
++ int resplen1 = __res_context_send (ctx, q1, q1len, q2, q2len,
++ ans1, sizeof (ans1), &ans1p,
++ &ans2p, &nans2p,
++ &resplen2, &ans2p_malloced);
++
++ TEST_VERIFY (resplen1 > 12);
++ TEST_VERIFY (resplen2 > 12);
++ if (resplen1 <= 12 || resplen2 <= 12)
++ return;
++
++ if (rcode == 1 || rcode == 3)
++ {
++ /* Format Error and Name Error responses does not trigger
++ switching to the next server. */
++ TEST_COMPARE (ans1p[3] & 0x0f, rcode);
++ TEST_COMPARE (ans2p[3] & 0x0f, rcode);
++ return;
++ }
++
++ /* The response should be successful. */
++ TEST_COMPARE (ans1p[3] & 0x0f, 0);
++ TEST_COMPARE (ans2p[3] & 0x0f, 0);
++
++ /* Due to bug 19691, the answer may not be in the slot matching the
++ query. Assume that the AAAA response is the longer one. */
++ unsigned char *a_answer;
++ int a_answer_length;
++ unsigned char *aaaa_answer;
++ int aaaa_answer_length;
++ if (resplen2 > resplen1)
++ {
++ a_answer = ans1p;
++ a_answer_length = resplen1;
++ aaaa_answer = ans2p;
++ aaaa_answer_length = resplen2;
++ }
++ else
++ {
++ a_answer = ans2p;
++ a_answer_length = resplen2;
++ aaaa_answer = ans1p;
++ aaaa_answer_length = resplen1;
++ }
++
++ {
++ char *expected = xasprintf ("name: %s\n"
++ "address: 192.0.2.1\n",
++ qname);
++ check_dns_packet (qname, a_answer, a_answer_length, expected);
++ free (expected);
++ }
++ {
++ char *expected = xasprintf ("name: %s\n"
++ "address: 2001:db8::1\n",
++ qname);
++ check_dns_packet (qname, aaaa_answer, aaaa_answer_length, expected);
++ free (expected);
++ }
++
++ if (ans2p_malloced)
++ free (ans2p);
++
++ __resolv_context_put (ctx);
++}
++
++static int
++do_test (void)
++{
++ struct resolv_test *aux = resolv_test_start
++ ((struct resolv_redirect_config)
++ {
++ .response_callback = response,
++ });
++
++ for (int rcode = 0; rcode <= 5; ++rcode)
++ for (int do_reorder_0 = 0; do_reorder_0 < 2; ++do_reorder_0)
++ for (int do_reorder_1 = 0; do_reorder_1 < 2; ++do_reorder_1)
++ {
++ char *qname = xasprintf ("reorder-%d-%d.rcode-%d.example.net",
++ do_reorder_0, do_reorder_1, rcode);
++ test_qname (qname, rcode);
++ free (qname);
++ }
++
++ resolv_test_end (aux);
++
++ return 0;
++}
++
++#include <support/test-driver.c>
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0020-resolv-Serialize-processing-in-resolv-tst-resolv-txn.patch b/packages/sys-libs/glibc/files/patches-2.32/0020-resolv-Serialize-processing-in-resolv-tst-resolv-txn.patch
new file mode 100644
index 000000000..6906e5c45
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0020-resolv-Serialize-processing-in-resolv-tst-resolv-txn.patch
@@ -0,0 +1,41 @@
+Upstream: yes, taken from release/2.32/master
+
+From 5c36293f067d2af16e4eb9f9465be36f346ea6d0 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Thu, 15 Oct 2020 12:33:13 +0200
+Subject: [PATCH 20/23] resolv: Serialize processing in
+ resolv/tst-resolv-txnid-collision
+
+When switching name servers, response processing by two server
+threads clobbers the global test state. (There is still some
+risk that this test is negatively impact by packet drops and
+packet reordering, but this applies to many of the resolver tests
+and is difficult to avoid.)
+
+Fixes commit f1f00c072138af90ae6da180f260111f09afe7a3 ("resolv:
+Handle transaction ID collisions in parallel queries (bug 26600)").
+
+(cherry picked from commit b8b53b338f6da91e86d115a39da860cefac736ad)
+---
+ resolv/tst-resolv-txnid-collision.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/resolv/tst-resolv-txnid-collision.c b/resolv/tst-resolv-txnid-collision.c
+index 611d37362f..189b76f126 100644
+--- a/resolv/tst-resolv-txnid-collision.c
++++ b/resolv/tst-resolv-txnid-collision.c
+@@ -309,6 +309,11 @@ do_test (void)
+ ((struct resolv_redirect_config)
+ {
+ .response_callback = response,
++
++ /* The response callback use global state (the previous_*
++ variables), and query processing must therefore be
++ serialized. */
++ .single_thread_udp = true,
+ });
+
+ for (int rcode = 0; rcode <= 5; ++rcode)
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0021-struct-_Unwind_Exception-alignment-should-not-depend.patch b/packages/sys-libs/glibc/files/patches-2.32/0021-struct-_Unwind_Exception-alignment-should-not-depend.patch
new file mode 100644
index 000000000..80a747964
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0021-struct-_Unwind_Exception-alignment-should-not-depend.patch
@@ -0,0 +1,61 @@
+Upstream: yes, taken from release/2.32/master
+
+From 3ea24955bff835f1c5bbfd7674208e25fa795c1a Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Wed, 11 Nov 2020 11:59:11 +0100
+Subject: [PATCH 21/23] struct _Unwind_Exception alignment should not depend on
+ compiler flags
+
+__attribute__((__aligned__)) selects an alignment that depends on
+the micro-architecture selected by GCC flags. Enabling vector
+extensions may increase the allignment. This is a problem when
+building glibc as a collection of ELF multilibs with different
+GCC flags because ld.so and libc.so/libpthread.so/&c may end up
+with a different layout of struct pthread because of the
+changing offset of its struct _Unwind_Exception field.
+
+Tested-By: Matheus Castanho <msc@linux.ibm.com>
+
+(cherry picked from commit 30af7c7fa13e17d82c3f1f91536384715844f432)
+---
+ sysdeps/generic/unwind.h | 24 +++++++++++++++---------
+ 1 file changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/sysdeps/generic/unwind.h b/sysdeps/generic/unwind.h
+index b667a5b652..c229603af3 100644
+--- a/sysdeps/generic/unwind.h
++++ b/sysdeps/generic/unwind.h
+@@ -75,15 +75,21 @@ typedef void (*_Unwind_Exception_Cleanup_Fn) (_Unwind_Reason_Code,
+
+ struct _Unwind_Exception
+ {
+- _Unwind_Exception_Class exception_class;
+- _Unwind_Exception_Cleanup_Fn exception_cleanup;
+- _Unwind_Word private_1;
+- _Unwind_Word private_2;
+-
+- /* @@@ The IA-64 ABI says that this structure must be double-word aligned.
+- Taking that literally does not make much sense generically. Instead we
+- provide the maximum alignment required by any type for the machine. */
+-} __attribute__((__aligned__));
++ union
++ {
++ struct
++ {
++ _Unwind_Exception_Class exception_class;
++ _Unwind_Exception_Cleanup_Fn exception_cleanup;
++ _Unwind_Word private_1;
++ _Unwind_Word private_2;
++ };
++
++ /* The IA-64 ABI says that this structure must be double-word aligned. */
++ _Unwind_Word unwind_exception_align[2]
++ __attribute__ ((__aligned__ (2 * sizeof (_Unwind_Word))));
++ };
++};
+
+
+ /* The ACTIONS argument to the personality routine is a bitwise OR of one
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0022-sh-Add-sh4-fpu-Implies-folder.patch b/packages/sys-libs/glibc/files/patches-2.32/0022-sh-Add-sh4-fpu-Implies-folder.patch
new file mode 100644
index 000000000..d6d7973c2
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0022-sh-Add-sh4-fpu-Implies-folder.patch
@@ -0,0 +1,72 @@
+Upstream: yes, taken from release/2.32/master
+
+From ac0a6929c5d370952557aded97c2dd073a28773b Mon Sep 17 00:00:00 2001
+From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Wed, 25 Nov 2020 15:00:44 -0300
+Subject: [PATCH 22/23] sh: Add sh4 fpu Implies folder
+
+The commit 605f38177db (sh: Split BE/LE abilist) did not take in
+consideration the SH4 fpu support.
+
+Checked with a build for sh4-linux-gnu and manually checked that
+the implementations at sysdeps/sh/sh4/fpu/ are selected.
+
+John Paul Adrian Glaubitz also confirmed it fixes the build issues
+he encontered.
+
+(cherry-picked from 9ff2674ef82eccd5ae5dfa6bb733c0e3613764c6)
+---
+ NEWS | 1 +
+ sysdeps/sh/be/sh4/fpu/Implies | 1 +
+ sysdeps/sh/le/sh4/fpu/Implies | 1 +
+ sysdeps/unix/sysv/linux/sh/be/sh4/fpu/Implies | 1 +
+ sysdeps/unix/sysv/linux/sh/le/sh4/fpu/Implies | 1 +
+ 5 files changed, 5 insertions(+)
+ create mode 100644 sysdeps/sh/be/sh4/fpu/Implies
+ create mode 100644 sysdeps/sh/le/sh4/fpu/Implies
+ create mode 100644 sysdeps/unix/sysv/linux/sh/be/sh4/fpu/Implies
+ create mode 100644 sysdeps/unix/sysv/linux/sh/le/sh4/fpu/Implies
+
+diff --git a/NEWS b/NEWS
+index 1c1f270784..8b18675683 100644
+--- a/NEWS
++++ b/NEWS
+@@ -17,6 +17,7 @@ The following bugs are resolved with this release:
+ by the caller to the kernel
+ [26639] libc: msgctl IPC_INFO and MSG_INFO return garbage
+ [26853] aarch64: Missing unwind information in statically linked startup code
++ [26932] libc: sh: Multiple floating point functions defined as stubs only
+
+ Version 2.32
+
+diff --git a/sysdeps/sh/be/sh4/fpu/Implies b/sysdeps/sh/be/sh4/fpu/Implies
+new file mode 100644
+index 0000000000..71b28ee1a4
+--- /dev/null
++++ b/sysdeps/sh/be/sh4/fpu/Implies
+@@ -0,0 +1 @@
++sh/sh4/fpu
+diff --git a/sysdeps/sh/le/sh4/fpu/Implies b/sysdeps/sh/le/sh4/fpu/Implies
+new file mode 100644
+index 0000000000..71b28ee1a4
+--- /dev/null
++++ b/sysdeps/sh/le/sh4/fpu/Implies
+@@ -0,0 +1 @@
++sh/sh4/fpu
+diff --git a/sysdeps/unix/sysv/linux/sh/be/sh4/fpu/Implies b/sysdeps/unix/sysv/linux/sh/be/sh4/fpu/Implies
+new file mode 100644
+index 0000000000..7eeaf15a5a
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/sh/be/sh4/fpu/Implies
+@@ -0,0 +1 @@
++unix/sysv/linux/sh/sh4/fpu
+diff --git a/sysdeps/unix/sysv/linux/sh/le/sh4/fpu/Implies b/sysdeps/unix/sysv/linux/sh/le/sh4/fpu/Implies
+new file mode 100644
+index 0000000000..7eeaf15a5a
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/sh/le/sh4/fpu/Implies
+@@ -0,0 +1 @@
++unix/sysv/linux/sh/sh4/fpu
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/files/patches-2.32/0023-iconv-Accept-redundant-shift-sequences-in-IBM1364-BZ.patch b/packages/sys-libs/glibc/files/patches-2.32/0023-iconv-Accept-redundant-shift-sequences-in-IBM1364-BZ.patch
new file mode 100644
index 000000000..78b5054a2
--- /dev/null
+++ b/packages/sys-libs/glibc/files/patches-2.32/0023-iconv-Accept-redundant-shift-sequences-in-IBM1364-BZ.patch
@@ -0,0 +1,112 @@
+Upstream: yes, taken from release/2.32/master
+
+From 050022910be1d1f5c11cd5168f1685ad4f9580d2 Mon Sep 17 00:00:00 2001
+From: Arjun Shankar <arjun@redhat.com>
+Date: Wed, 4 Nov 2020 12:19:38 +0100
+Subject: [PATCH 23/23] iconv: Accept redundant shift sequences in IBM1364 [BZ
+ #26224]
+
+The IBM1364, IBM1371, IBM1388, IBM1390 and IBM1399 character sets
+share converter logic (iconvdata/ibm1364.c) which would reject
+redundant shift sequences when processing input in these character
+sets. This led to a hang in the iconv program (CVE-2020-27618).
+
+This commit adjusts the converter to ignore redundant shift sequences
+and adds test cases for iconv_prog hangs that would be triggered upon
+their rejection. This brings the implementation in line with other
+converters that also ignore redundant shift sequences (e.g. IBM930
+etc., fixed in commit 692de4b3960d).
+
+Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+(cherry picked from commit 9a99c682144bdbd40792ebf822fe9264e0376fb5)
+---
+ NEWS | 6 ++++++
+ iconv/tst-iconv_prog.sh | 16 ++++++++++------
+ iconvdata/ibm1364.c | 14 ++------------
+ 3 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index 8b18675683..4da2a0cbda 100644
+--- a/NEWS
++++ b/NEWS
+@@ -7,6 +7,8 @@ using `glibc' in the "product" field.
+
+ The following bugs are resolved with this release:
+
++ [26224] iconv hangs when converting some invalid inputs from several IBM
++ character sets (CVE-2020-27618)
+ [26534] libm.so 2.32 SIGILL in pow() due to FMA4 instruction on non-FMA4
+ system
+ [26555] string: strerrorname_np does not return the documented value
+@@ -199,6 +201,10 @@ Security related changes:
+ Dytrych of the Cisco Security Assessment and Penetration Team (See
+ TALOS-2020-1019).
+
++ CVE-2020-27618: An infinite loop has been fixed in the iconv program when
++ invoked with input containing redundant shift sequences in the IBM1364,
++ IBM1371, IBM1388, IBM1390, or IBM1399 character sets.
++
+ The following bugs are resolved with this release:
+
+ [9809] localedata: ckb_IQ: new Kurdish Sorani locale
+diff --git a/iconv/tst-iconv_prog.sh b/iconv/tst-iconv_prog.sh
+index 8298136b7f..d8db7b335c 100644
+--- a/iconv/tst-iconv_prog.sh
++++ b/iconv/tst-iconv_prog.sh
+@@ -102,12 +102,16 @@ hangarray=(
+ "\x00\x80;-c;IBM1161;UTF-8//TRANSLIT//IGNORE"
+ "\x00\xdb;-c;IBM1162;UTF-8//TRANSLIT//IGNORE"
+ "\x00\x70;-c;IBM12712;UTF-8//TRANSLIT//IGNORE"
+-# These are known hangs that are yet to be fixed:
+-# "\x00\x0f;-c;IBM1364;UTF-8"
+-# "\x00\x0f;-c;IBM1371;UTF-8"
+-# "\x00\x0f;-c;IBM1388;UTF-8"
+-# "\x00\x0f;-c;IBM1390;UTF-8"
+-# "\x00\x0f;-c;IBM1399;UTF-8"
++"\x00\x0f;-c;IBM1364;UTF-8"
++"\x0e\x0e;-c;IBM1364;UTF-8"
++"\x00\x0f;-c;IBM1371;UTF-8"
++"\x0e\x0e;-c;IBM1371;UTF-8"
++"\x00\x0f;-c;IBM1388;UTF-8"
++"\x0e\x0e;-c;IBM1388;UTF-8"
++"\x00\x0f;-c;IBM1390;UTF-8"
++"\x0e\x0e;-c;IBM1390;UTF-8"
++"\x00\x0f;-c;IBM1399;UTF-8"
++"\x0e\x0e;-c;IBM1399;UTF-8"
+ "\x00\x53;-c;IBM16804;UTF-8//TRANSLIT//IGNORE"
+ "\x00\x41;-c;IBM274;UTF-8//TRANSLIT//IGNORE"
+ "\x00\x41;-c;IBM275;UTF-8//TRANSLIT//IGNORE"
+diff --git a/iconvdata/ibm1364.c b/iconvdata/ibm1364.c
+index 49e7267ab4..521f0825b7 100644
+--- a/iconvdata/ibm1364.c
++++ b/iconvdata/ibm1364.c
+@@ -158,24 +158,14 @@ enum
+ \
+ if (__builtin_expect (ch, 0) == SO) \
+ { \
+- /* Shift OUT, change to DBCS converter. */ \
+- if (curcs == db) \
+- { \
+- result = __GCONV_ILLEGAL_INPUT; \
+- break; \
+- } \
++ /* Shift OUT, change to DBCS converter (redundant escape okay). */ \
+ curcs = db; \
+ ++inptr; \
+ continue; \
+ } \
+ if (__builtin_expect (ch, 0) == SI) \
+ { \
+- /* Shift IN, change to SBCS converter. */ \
+- if (curcs == sb) \
+- { \
+- result = __GCONV_ILLEGAL_INPUT; \
+- break; \
+- } \
++ /* Shift IN, change to SBCS converter (redundant escape okay). */ \
+ curcs = sb; \
+ ++inptr; \
+ continue; \
+--
+2.29.2
+
diff --git a/packages/sys-libs/glibc/glibc-2.32.exheres-0 b/packages/sys-libs/glibc/glibc-2.32-r1.exheres-0
index f44c5e835..f44c5e835 100644
--- a/packages/sys-libs/glibc/glibc-2.32.exheres-0
+++ b/packages/sys-libs/glibc/glibc-2.32-r1.exheres-0
diff --git a/packages/sys-libs/libc++/files/9/0001-Fix-various-test-failures-with-GCC.patch b/packages/sys-libs/libc++/files/9/0001-Fix-various-test-failures-with-GCC.patch
deleted file mode 100644
index 5811e09d4..000000000
--- a/packages/sys-libs/libc++/files/9/0001-Fix-various-test-failures-with-GCC.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Upstream: yes
-From 21c85ea7d372719b6c755fafea7179d5f0da1044 Mon Sep 17 00:00:00 2001
-From: Eric Fiselier <eric@efcs.ca>
-Date: Fri, 13 Sep 2019 18:40:46 +0000
-Subject: [PATCH] Fix various test failures with GCC
-
-llvm-svn: 371880
----
- libcxx/include/type_traits | 4 ++--
- .../meta.unary/meta.unary.prop/is_constructible.pass.cpp | 8 ++++++--
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits
-index 5ccafec01f0..259f1a3966e 100644
---- a/libcxx/include/type_traits
-+++ b/libcxx/include/type_traits
-@@ -509,8 +509,8 @@ struct _Lazy : _Func<_Args...> {};
-
- // Member detector base
-
--template <template <class...> class _Templ, class ..._Args>
--true_type __sfinae_test_impl(_FirstType<int, _Templ<_Args...> >);
-+template <template <class...> class _Templ, class ..._Args, class = _Templ<_Args...>>
-+true_type __sfinae_test_impl(int);
- template <template <class...> class, class ...>
- false_type __sfinae_test_impl(...);
-
-diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp
-index a5b723c0e59..b51972432d0 100644
---- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp
-+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp
-@@ -244,13 +244,17 @@ int main(int, char**)
-
- test_is_constructible<const int&, ExplicitTo<int&>&>();
- test_is_constructible<const int&, ExplicitTo<int&>>();
-- test_is_constructible<int&, ExplicitTo<int&>>();
-- test_is_constructible<const int&, ExplicitTo<int&&>>();
-+
-
- // Binding through reference-compatible type is required to perform
- // direct-initialization as described in [over.match.ref] p. 1 b. 1:
-+ //
-+ // But the rvalue to lvalue reference binding isn't allowed according to
-+ // [over.match.ref] despite Clang accepting it.
- test_is_constructible<int&, ExplicitTo<int&>>();
-+#ifndef TEST_COMPILER_GCC
- test_is_constructible<const int&, ExplicitTo<int&&>>();
-+#endif
-
- static_assert(std::is_constructible<int&&, ExplicitTo<int&&>>::value, "");
- #ifdef __clang__
---
-2.23.0
-
diff --git a/packages/sys-libs/libc++/files/9/8c84318aad43620024310db6c1fe75c0c1706ead.patch b/packages/sys-libs/libc++/files/9/8c84318aad43620024310db6c1fe75c0c1706ead.patch
deleted file mode 100644
index 3b0547bd8..000000000
--- a/packages/sys-libs/libc++/files/9/8c84318aad43620024310db6c1fe75c0c1706ead.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Upstream: yes
-From 8c84318aad43620024310db6c1fe75c0c1706ead Mon Sep 17 00:00:00 2001
-From: Eric Fiselier <eric@efcs.ca>
-Date: Fri, 13 Sep 2019 20:30:45 +0000
-Subject: [PATCH] Fix C++03 build failures due to >>
-
-git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@371894 91177308-0d34-0410-b5e6-96231b3b80d8
----
- include/type_traits | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/type_traits b/include/type_traits
-index 7dc5de7d3..ee1782431 100644
---- a/include/type_traits
-+++ b/include/type_traits
-@@ -509,7 +509,7 @@ struct _Lazy : _Func<_Args...> {};
-
- // Member detector base
-
--template <template <class...> class _Templ, class ..._Args, class = _Templ<_Args...>>
-+template <template <class...> class _Templ, class ..._Args, class = _Templ<_Args...> >
- true_type __sfinae_test_impl(int);
- template <template <class...> class, class ...>
- false_type __sfinae_test_impl(...);
diff --git a/packages/sys-libs/libc++/files/9/linux_distribution-hack.patch b/packages/sys-libs/libc++/files/9/linux_distribution-hack.patch
deleted file mode 100644
index ec1d16516..000000000
--- a/packages/sys-libs/libc++/files/9/linux_distribution-hack.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Upstream: none
-Reason: linux_distribution function has been removed in Python 3.8
- and never worked correctly on Exherbo. Just hardcode these values
- returned by distro module.
-
---- utils/libcxx/test/target_info.py.orig 2019-04-18 20:18:15.000000000 +0300
-+++ utils/libcxx/test/target_info.py 2019-11-15 23:33:26.761216715 +0300
-@@ -192,14 +192,14 @@
- return 'linux'
-
- def platform_name(self):
-- name, _, _ = platform.linux_distribution()
-+ name = "Exherbo"
- # Some distros have spaces, e.g. 'SUSE Linux Enterprise Server'
- # lit features can't have spaces
- name = name.lower().strip().replace(' ', '-')
- return name # Permitted to be None
-
- def platform_ver(self):
-- _, ver, _ = platform.linux_distribution()
-+ ver = "n/a"
- ver = ver.lower().strip().replace(' ', '-')
- return ver # Permitted to be None.
-
diff --git a/packages/sys-libs/libc++/libc++-11.0.0.exheres-0 b/packages/sys-libs/libc++/libc++-11.0.1-r1.exheres-0
index 6f181d754..6f181d754 100644
--- a/packages/sys-libs/libc++/libc++-11.0.0.exheres-0
+++ b/packages/sys-libs/libc++/libc++-11.0.1-r1.exheres-0
diff --git a/packages/sys-libs/libc++/libc++-9.0.1-r1.exheres-0 b/packages/sys-libs/libc++/libc++-9.0.1-r1.exheres-0
deleted file mode 100644
index 01809853b..000000000
--- a/packages/sys-libs/libc++/libc++-9.0.1-r1.exheres-0
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2017 Rasmus Thomsen <Rasmus.thomsen@protonmail.com>
-# Distributed under the terms of the GNU General Public License v2
-
-require libc++
-
-PLATFORMS="~amd64"
-
-DEFAULT_SRC_PREPARE_PATCHES+=(
- -p0 "${FILES}"/9/linux_distribution-hack.patch
- -p2 "${FILES}"/9/0001-Fix-various-test-failures-with-GCC.patch
- -p1 "${FILES}"/9/8c84318aad43620024310db6c1fe75c0c1706ead.patch
-)
-
diff --git a/packages/sys-libs/libc++/libc++.exlib b/packages/sys-libs/libc++/libc++.exlib
index 6b8720a0e..f9154b628 100644
--- a/packages/sys-libs/libc++/libc++.exlib
+++ b/packages/sys-libs/libc++/libc++.exlib
@@ -13,6 +13,12 @@ export_exlib_phases src_test
SUMMARY="A new implementation of the C++ standard library"
+if ever at_least 11; then
+ MYOPTIONS+="
+ pstl [[ description = [ Enable parallel algorithms through pstl ] ]]
+ "
+fi
+
MYOPTIONS+="
( libc: musl )
"
@@ -22,6 +28,13 @@ DEPENDENCIES="
sys-libs/libc++abi[providers:compiler-rt?][providers:libgcc?]
"
+if ever at_least 11; then
+ DEPENDENCIES+="
+ build+run:
+ pstl? ( dev-cpp/pstl )
+ "
+fi
+
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/libc++-9-Fix-make_shared-for-types-with-noexcept-false-dtor.patch
)
@@ -51,6 +64,12 @@ CMAKE_SRC_CONFIGURE_OPTIONS+=(
'providers:compiler-rt LIBCXXABI_USE_LLVM_UNWINDER'
)
+if ever at_least 11; then
+ CMAKE_SRC_CONFIGURE_OPTIONS+=(
+ 'pstl LIBCXX_ENABLE_PARALLEL_ALGORITHMS'
+ )
+fi
+
libc++_src_test() {
esandbox allow_net "unix:${WORK}/test/filesystem/Output/dynamic_env/test.*/socket"
esandbox allow_net "unix:/tmp/test.*/socket"
diff --git a/packages/sys-libs/libc++abi/files/9/linux_distribution-hack.patch b/packages/sys-libs/libc++abi/files/9/linux_distribution-hack.patch
deleted file mode 100644
index ec1d16516..000000000
--- a/packages/sys-libs/libc++abi/files/9/linux_distribution-hack.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Upstream: none
-Reason: linux_distribution function has been removed in Python 3.8
- and never worked correctly on Exherbo. Just hardcode these values
- returned by distro module.
-
---- utils/libcxx/test/target_info.py.orig 2019-04-18 20:18:15.000000000 +0300
-+++ utils/libcxx/test/target_info.py 2019-11-15 23:33:26.761216715 +0300
-@@ -192,14 +192,14 @@
- return 'linux'
-
- def platform_name(self):
-- name, _, _ = platform.linux_distribution()
-+ name = "Exherbo"
- # Some distros have spaces, e.g. 'SUSE Linux Enterprise Server'
- # lit features can't have spaces
- name = name.lower().strip().replace(' ', '-')
- return name # Permitted to be None
-
- def platform_ver(self):
-- _, ver, _ = platform.linux_distribution()
-+ ver = "n/a"
- ver = ver.lower().strip().replace(' ', '-')
- return ver # Permitted to be None.
-
diff --git a/packages/sys-libs/libc++abi/libc++abi-11.0.0.exheres-0 b/packages/sys-libs/libc++abi/libc++abi-11.0.1.exheres-0
index 3763374c6..3763374c6 100644
--- a/packages/sys-libs/libc++abi/libc++abi-11.0.0.exheres-0
+++ b/packages/sys-libs/libc++abi/libc++abi-11.0.1.exheres-0
diff --git a/packages/sys-libs/libc++abi/libc++abi-9.0.1-r1.exheres-0 b/packages/sys-libs/libc++abi/libc++abi-9.0.1-r1.exheres-0
deleted file mode 100644
index 05962bdbc..000000000
--- a/packages/sys-libs/libc++abi/libc++abi-9.0.1-r1.exheres-0
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2017 Rasmus Thomsen <Rasmus.thomsen@protonmail.com>
-# Distributed under the terms of the GNU General Public License v2
-
-require libc++abi
-
-PLATFORMS="~amd64"
-
-DEFAULT_SRC_PREPARE_PATCHES+=(
- -p0 "${FILES}"/9/linux_distribution-hack.patch
-)
-
diff --git a/packages/sys-libs/libcap-ng/libcap-ng-0.8.1.exheres-0 b/packages/sys-libs/libcap-ng/libcap-ng-0.8.2.exheres-0
index 13b2119d3..13b2119d3 100644
--- a/packages/sys-libs/libcap-ng/libcap-ng-0.8.1.exheres-0
+++ b/packages/sys-libs/libcap-ng/libcap-ng-0.8.2.exheres-0
diff --git a/packages/sys-libs/libcap/libcap-2.45.exheres-0 b/packages/sys-libs/libcap/libcap-2.46.exheres-0
index 7d6ac0fb5..7d6ac0fb5 100644
--- a/packages/sys-libs/libcap/libcap-2.45.exheres-0
+++ b/packages/sys-libs/libcap/libcap-2.46.exheres-0
diff --git a/packages/sys-libs/llvm-libunwind/files/0001-38529c15312c52f39fc6bf693d2977295385d699.patch b/packages/sys-libs/llvm-libunwind/files/0001-38529c15312c52f39fc6bf693d2977295385d699.patch
deleted file mode 100644
index a283a0678..000000000
--- a/packages/sys-libs/llvm-libunwind/files/0001-38529c15312c52f39fc6bf693d2977295385d699.patch
+++ /dev/null
@@ -1,679 +0,0 @@
-Upstream: yes
-From 38529c15312c52f39fc6bf693d2977295385d699 Mon Sep 17 00:00:00 2001
-From: Petr Hosek <phosek@chromium.org>
-Date: Fri, 11 Oct 2019 22:22:29 +0000
-Subject: [PATCH] [libunwind] Refactor CMake flag checks to match libc++ and
- libc++abi
-
-libunwind was using its own set of macros/functions for flag checking
-which was similar but different from libc++ and libc++abi. This made
-it difficult to replicate the same checks across projects, in fact
-there were some checks that appear to have been copy & pasted from
-another project and that were broken in the standalone libunwind build.
-This change refactors flag checks to match libc++ and libc++abi using
-a copy of HandleLibunwindFlags.cmake which is derived from the versions
-used by the other projects. This also paves a road to deduplicating and
-unifying HandleLibunwindFlags.cmake, HandleLibcxxabiFlags.cmake and
-HandleLibcxxFlags.cmake post monorepo switch.
-
-Differential Revision: https://reviews.llvm.org/D68855
-
-git-svn-id: https://llvm.org/svn/llvm-project/libunwind/trunk@374606 91177308-0d34-0410-b5e6-96231b3b80d8
----
- CMakeLists.txt | 107 ++++-----
- cmake/Modules/HandleLibunwindFlags.cmake | 272 +++++++++++++++++++++++
- cmake/config-ix.cmake | 39 +---
- src/CMakeLists.txt | 85 ++++---
- 4 files changed, 371 insertions(+), 132 deletions(-)
- create mode 100644 cmake/Modules/HandleLibunwindFlags.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 440141c..736c533 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -213,28 +213,14 @@ set(LIBUNWIND_CXX_FLAGS "")
- set(LIBUNWIND_COMPILE_FLAGS "")
- set(LIBUNWIND_LINK_FLAGS "")
-
--# Get required flags.
--macro(unwind_append_if list condition var)
-- if (${condition})
-- list(APPEND ${list} ${var})
-- endif()
--endmacro()
--
--macro(add_target_flags)
-- foreach(value ${ARGN})
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${value}")
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${value}")
-- list(APPEND LIBUNWIND_COMPILE_FLAGS ${value})
-- list(APPEND LIBUNWIND_LINK_FLAGS ${value})
-- endforeach()
--endmacro()
--
--macro(add_target_flags_if condition)
-- if (${condition})
-- add_target_flags(${ARGN})
-- endif()
--endmacro()
-+# Include macros for adding and removing libunwind flags.
-+include(HandleLibunwindFlags)
-+
-+#===============================================================================
-+# Setup Compiler Flags
-+#===============================================================================
-
-+# Get required flags.
- add_target_flags_if(LIBUNWIND_BUILD_32_BITS "-m32")
-
- if(LIBUNWIND_TARGET_TRIPLE)
-@@ -264,83 +250,86 @@ if (LIBUNWIND_USE_COMPILER_RT AND NOT LIBUNWIND_HAS_NODEFAULTLIBS_FLAG)
- list(APPEND LIBUNWIND_LINK_FLAGS "-rtlib=compiler-rt")
- endif()
-
--#===============================================================================
--# Setup Compiler Flags
--#===============================================================================
--
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WERROR_FLAG -Werror=return-type)
-+add_compile_flags_if_supported(-Werror=return-type)
-
- # Get warning flags
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_W_FLAG -W)
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WALL_FLAG -Wall)
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WCHAR_SUBSCRIPTS_FLAG -Wchar-subscripts)
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WCONVERSION_FLAG -Wconversion)
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WMISMATCHED_TAGS_FLAG -Wmismatched-tags)
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WMISSING_BRACES_FLAG -Wmissing-braces)
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WNEWLINE_EOF_FLAG -Wnewline-eof)
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WNO_UNUSED_FUNCTION_FLAG -Wno-unused-function)
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WSHADOW_FLAG -Wshadow)
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WSHORTEN_64_TO_32_FLAG -Wshorten-64-to-32)
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WSIGN_COMPARE_FLAG -Wsign-compare)
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WSIGN_CONVERSION_FLAG -Wsign-conversion)
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WSTRICT_ALIASING_FLAG -Wstrict-aliasing=2)
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WSTRICT_OVERFLOW_FLAG -Wstrict-overflow=4)
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WUNUSED_PARAMETER_FLAG -Wunused-parameter)
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WUNUSED_VARIABLE_FLAG -Wunused-variable)
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WWRITE_STRINGS_FLAG -Wwrite-strings)
--unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WUNDEF_FLAG -Wundef)
-+add_compile_flags_if_supported(-W)
-+add_compile_flags_if_supported(-Wall)
-+add_compile_flags_if_supported(-Wchar-subscripts)
-+add_compile_flags_if_supported(-Wconversion)
-+add_compile_flags_if_supported(-Wmismatched-tags)
-+add_compile_flags_if_supported(-Wmissing-braces)
-+add_compile_flags_if_supported(-Wnewline-eof)
-+add_compile_flags_if_supported(-Wno-unused-function)
-+add_compile_flags_if_supported(-Wshadow)
-+add_compile_flags_if_supported(-Wshorten-64-to-32)
-+add_compile_flags_if_supported(-Wsign-compare)
-+add_compile_flags_if_supported(-Wsign-conversion)
-+add_compile_flags_if_supported(-Wstrict-aliasing=2)
-+add_compile_flags_if_supported(-Wstrict-overflow=4)
-+add_compile_flags_if_supported(-Wunused-parameter)
-+add_compile_flags_if_supported(-Wunused-variable)
-+add_compile_flags_if_supported(-Wwrite-strings)
-+add_compile_flags_if_supported(-Wundef)
-
- if (LIBUNWIND_ENABLE_WERROR)
-- unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WERROR_FLAG -Werror)
-- unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WX_FLAG -WX)
-+ add_compile_flags_if_supported(-Werror)
-+ add_compile_flags_if_supported(-WX)
- else()
-- unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WNO_ERROR_FLAG -Wno-error)
-- unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_NO_WX_FLAG -WX-)
-+ add_compile_flags_if_supported(-Wno-error)
-+ add_compile_flags_if_supported(-WX-)
- endif()
-
- if (LIBUNWIND_ENABLE_PEDANTIC)
-- unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_PEDANTIC_FLAG -pedantic)
-+ add_compile_flags_if_supported(-pedantic)
- endif()
-
- # Get feature flags.
- # Exceptions
- # Catches C++ exceptions only and tells the compiler to assume that extern C
- # functions never throw a C++ exception.
--unwind_append_if(LIBUNWIND_CXX_FLAGS LIBUNWIND_HAS_FSTRICT_ALIASING_FLAG -fstrict-aliasing)
--unwind_append_if(LIBUNWIND_CXX_FLAGS LIBUNWIND_HAS_EHSC_FLAG -EHsc)
-+add_cxx_compile_flags_if_supported(-fstrict-aliasing)
-+add_cxx_compile_flags_if_supported(-EHsc)
-
--unwind_append_if(LIBUNWIND_C_FLAGS LIBUNWIND_HAS_FUNWIND_TABLES -funwind-tables)
-+add_c_compile_flags_if_supported(-funwind-tables)
-+add_cxx_compile_flags_if_supported(-fno-exceptions)
-+add_cxx_compile_flags_if_supported(-fno-rtti)
-
- # Ensure that we don't depend on C++ standard library.
--unwind_append_if(LIBUNWIND_CXX_FLAGS LIBUNWIND_HAS_NOSTDINCXX_FLAG -nostdinc++)
-+if (LIBCXXABI_HAS_NOSTDINCXX_FLAG)
-+ list(APPEND LIBUNWIND_COMPILE_FLAGS -nostdinc++)
-+ # Remove -stdlib flags to prevent them from causing an unused flag warning.
-+ string(REPLACE "-stdlib=libc++" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+ string(REPLACE "-stdlib=libstdc++" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+endif()
-
- # Assert
- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
- if (LIBUNWIND_ENABLE_ASSERTIONS)
- # MSVC doesn't like _DEBUG on release builds. See PR 4379.
- if (NOT MSVC)
-- list(APPEND LIBUNWIND_COMPILE_FLAGS -D_DEBUG)
-+ add_compile_flags(-D_DEBUG)
- endif()
-
- # On Release builds cmake automatically defines NDEBUG, so we
- # explicitly undefine it:
- if (uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE")
-- list(APPEND LIBUNWIND_COMPILE_FLAGS -UNDEBUG)
-+ add_compile_flags(-UNDEBUG)
- endif()
- else()
- if (NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE")
-- list(APPEND LIBUNWIND_COMPILE_FLAGS -DNDEBUG)
-+ add_compile_flags(-DNDEBUG)
- endif()
- endif()
-
- # Cross-unwinding
- if (NOT LIBUNWIND_ENABLE_CROSS_UNWINDING)
-- list(APPEND LIBUNWIND_COMPILE_FLAGS -D_LIBUNWIND_IS_NATIVE_ONLY)
-+ add_compile_flags(-D_LIBUNWIND_IS_NATIVE_ONLY)
- endif()
-
- # Threading-support
- if (NOT LIBUNWIND_ENABLE_THREADS)
-- list(APPEND LIBUNWIND_COMPILE_FLAGS -D_LIBUNWIND_HAS_NO_THREADS)
-+ add_compile_flags(-D_LIBUNWIND_HAS_NO_THREADS)
- endif()
-
- # ARM WMMX register support
-@@ -349,7 +338,7 @@ if (LIBUNWIND_ENABLE_ARM_WMMX)
- # define this macro for any supported target at present. Therefore, here we
- # provide the option to explicitly enable support for WMMX registers in the
- # unwinder.
-- list(APPEND LIBUNWIND_COMPILE_FLAGS -D__ARM_WMMX)
-+ add_compile_flags(-D__ARM_WMMX)
- endif()
-
- # This is the _ONLY_ place where add_definitions is called.
-diff --git a/cmake/Modules/HandleLibunwindFlags.cmake b/cmake/Modules/HandleLibunwindFlags.cmake
-new file mode 100644
-index 0000000..57ba0b8
---- /dev/null
-+++ b/cmake/Modules/HandleLibunwindFlags.cmake
-@@ -0,0 +1,272 @@
-+# HandleLibcxxFlags - A set of macros used to setup the flags used to compile
-+# and link libc++abi. These macros add flags to the following CMake variables.
-+# - LIBUNWIND_COMPILE_FLAGS: flags used to compile libunwind
-+# - LIBUNWIND_LINK_FLAGS: flags used to link libunwind
-+# - LIBUNWIND_LIBRARIES: libraries to link libunwind to.
-+
-+include(CheckCCompilerFlag)
-+include(CheckCXXCompilerFlag)
-+
-+unset(add_flag_if_supported)
-+
-+# Mangle the name of a compiler flag into a valid CMake identifier.
-+# Ex: --std=c++11 -> STD_EQ_CXX11
-+macro(mangle_name str output)
-+ string(STRIP "${str}" strippedStr)
-+ string(REGEX REPLACE "^/" "" strippedStr "${strippedStr}")
-+ string(REGEX REPLACE "^-+" "" strippedStr "${strippedStr}")
-+ string(REGEX REPLACE "-+$" "" strippedStr "${strippedStr}")
-+ string(REPLACE "-" "_" strippedStr "${strippedStr}")
-+ string(REPLACE "=" "_EQ_" strippedStr "${strippedStr}")
-+ string(REPLACE "+" "X" strippedStr "${strippedStr}")
-+ string(TOUPPER "${strippedStr}" ${output})
-+endmacro()
-+
-+# Remove a list of flags from all CMake variables that affect compile flags.
-+# This can be used to remove unwanted flags specified on the command line
-+# or added in other parts of LLVM's cmake configuration.
-+macro(remove_flags)
-+ foreach(var ${ARGN})
-+ string(REPLACE "${var}" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
-+ string(REPLACE "${var}" "" CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}")
-+ string(REPLACE "${var}" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-+ string(REPLACE "${var}" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-+ string(REPLACE "${var}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+ string(REPLACE "${var}" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-+ string(REPLACE "${var}" "" CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
-+ string(REPLACE "${var}" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
-+ string(REPLACE "${var}" "" CMAKE_SHARED_MODULE_FLAGS "${CMAKE_SHARED_MODULE_FLAGS}")
-+ remove_definitions(${var})
-+ endforeach()
-+endmacro(remove_flags)
-+
-+macro(check_flag_supported flag)
-+ mangle_name("${flag}" flagname)
-+ check_cxx_compiler_flag("${flag}" "LIBUNWIND_SUPPORTS_${flagname}_FLAG")
-+endmacro()
-+
-+macro(append_flags DEST)
-+ foreach(value ${ARGN})
-+ list(APPEND ${DEST} ${value})
-+ list(APPEND ${DEST} ${value})
-+ endforeach()
-+endmacro()
-+
-+# If the specified 'condition' is true then append the specified list of flags to DEST
-+macro(append_flags_if condition DEST)
-+ if (${condition})
-+ list(APPEND ${DEST} ${ARGN})
-+ endif()
-+endmacro()
-+
-+# Add each flag in the list specified by DEST if that flag is supported by the current compiler.
-+macro(append_flags_if_supported DEST)
-+ foreach(flag ${ARGN})
-+ mangle_name("${flag}" flagname)
-+ check_cxx_compiler_flag("${flag}" "LIBUNWIND_SUPPORTS_${flagname}_FLAG")
-+ append_flags_if(LIBUNWIND_SUPPORTS_${flagname}_FLAG ${DEST} ${flag})
-+ endforeach()
-+endmacro()
-+
-+# Add a macro definition if condition is true.
-+macro(define_if condition def)
-+ if (${condition})
-+ add_definitions(${def})
-+ endif()
-+endmacro()
-+
-+# Add a macro definition if condition is not true.
-+macro(define_if_not condition def)
-+ if (NOT ${condition})
-+ add_definitions(${def})
-+ endif()
-+endmacro()
-+
-+# Add a macro definition to the __config_site file if the specified condition
-+# is 'true'. Note that '-D${def}' is not added. Instead it is expected that
-+# the build include the '__config_site' header.
-+macro(config_define_if condition def)
-+ if (${condition})
-+ set(${def} ON)
-+ set(LIBUNWIND_NEEDS_SITE_CONFIG ON)
-+ endif()
-+endmacro()
-+
-+macro(config_define_if_not condition def)
-+ if (NOT ${condition})
-+ set(${def} ON)
-+ set(LIBUNWIND_NEEDS_SITE_CONFIG ON)
-+ endif()
-+endmacro()
-+
-+macro(config_define value def)
-+ set(${def} ${value})
-+ set(LIBUNWIND_NEEDS_SITE_CONFIG ON)
-+endmacro()
-+
-+# Add a list of flags to all of 'CMAKE_CXX_FLAGS', 'CMAKE_C_FLAGS',
-+# 'LIBUNWIND_COMPILE_FLAGS' and 'LIBUNWIND_LINK_FLAGS'.
-+macro(add_target_flags)
-+ foreach(value ${ARGN})
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${value}")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${value}")
-+ list(APPEND LIBUNWIND_COMPILE_FLAGS ${value})
-+ list(APPEND LIBUNWIND_LINK_FLAGS ${value})
-+ endforeach()
-+endmacro()
-+
-+# If the specified 'condition' is true then add a list of flags to
-+# all of 'CMAKE_CXX_FLAGS', 'CMAKE_C_FLAGS', 'LIBUNWIND_COMPILE_FLAGS'
-+# and 'LIBUNWIND_LINK_FLAGS'.
-+macro(add_target_flags_if condition)
-+ if (${condition})
-+ add_target_flags(${ARGN})
-+ endif()
-+endmacro()
-+
-+# Add a specified list of flags to both 'LIBUNWIND_COMPILE_FLAGS' and
-+# 'LIBUNWIND_LINK_FLAGS'.
-+macro(add_flags)
-+ foreach(value ${ARGN})
-+ list(APPEND LIBUNWIND_COMPILE_FLAGS ${value})
-+ list(APPEND LIBUNWIND_LINK_FLAGS ${value})
-+ endforeach()
-+endmacro()
-+
-+# If the specified 'condition' is true then add a list of flags to both
-+# 'LIBUNWIND_COMPILE_FLAGS' and 'LIBUNWIND_LINK_FLAGS'.
-+macro(add_flags_if condition)
-+ if (${condition})
-+ add_flags(${ARGN})
-+ endif()
-+endmacro()
-+
-+# Add each flag in the list to LIBUNWIND_COMPILE_FLAGS and LIBUNWIND_LINK_FLAGS
-+# if that flag is supported by the current compiler.
-+macro(add_flags_if_supported)
-+ foreach(flag ${ARGN})
-+ mangle_name("${flag}" flagname)
-+ check_cxx_compiler_flag("${flag}" "LIBUNWIND_SUPPORTS_${flagname}_FLAG")
-+ add_flags_if(LIBUNWIND_SUPPORTS_${flagname}_FLAG ${flag})
-+ endforeach()
-+endmacro()
-+
-+# Add a list of flags to 'LIBUNWIND_COMPILE_FLAGS'.
-+macro(add_compile_flags)
-+ foreach(f ${ARGN})
-+ list(APPEND LIBUNWIND_COMPILE_FLAGS ${f})
-+ endforeach()
-+endmacro()
-+
-+# If 'condition' is true then add the specified list of flags to
-+# 'LIBUNWIND_COMPILE_FLAGS'
-+macro(add_compile_flags_if condition)
-+ if (${condition})
-+ add_compile_flags(${ARGN})
-+ endif()
-+endmacro()
-+
-+# For each specified flag, add that flag to 'LIBUNWIND_COMPILE_FLAGS' if the
-+# flag is supported by the C++ compiler.
-+macro(add_compile_flags_if_supported)
-+ foreach(flag ${ARGN})
-+ mangle_name("${flag}" flagname)
-+ check_cxx_compiler_flag("${flag}" "LIBUNWIND_SUPPORTS_${flagname}_FLAG")
-+ add_compile_flags_if(LIBUNWIND_SUPPORTS_${flagname}_FLAG ${flag})
-+ endforeach()
-+endmacro()
-+
-+# Add a list of flags to 'LIBUNWIND_C_FLAGS'.
-+macro(add_c_flags)
-+ foreach(f ${ARGN})
-+ list(APPEND LIBUNWIND_C_FLAGS ${f})
-+ endforeach()
-+endmacro()
-+
-+# If 'condition' is true then add the specified list of flags to
-+# 'LIBUNWIND_C_FLAGS'
-+macro(add_c_flags_if condition)
-+ if (${condition})
-+ add_c_flags(${ARGN})
-+ endif()
-+endmacro()
-+
-+# For each specified flag, add that flag to 'LIBUNWIND_C_FLAGS' if the
-+# flag is supported by the C compiler.
-+macro(add_c_compile_flags_if_supported)
-+ foreach(flag ${ARGN})
-+ mangle_name("${flag}" flagname)
-+ check_c_compiler_flag("${flag}" "LIBUNWIND_SUPPORTS_${flagname}_FLAG")
-+ add_c_flags_if(LIBUNWIND_SUPPORTS_${flagname}_FLAG ${flag})
-+ endforeach()
-+endmacro()
-+
-+# Add a list of flags to 'LIBUNWIND_CXX_FLAGS'.
-+macro(add_cxx_flags)
-+ foreach(f ${ARGN})
-+ list(APPEND LIBUNWIND_CXX_FLAGS ${f})
-+ endforeach()
-+endmacro()
-+
-+# If 'condition' is true then add the specified list of flags to
-+# 'LIBUNWIND_CXX_FLAGS'
-+macro(add_cxx_flags_if condition)
-+ if (${condition})
-+ add_cxx_flags(${ARGN})
-+ endif()
-+endmacro()
-+
-+# For each specified flag, add that flag to 'LIBUNWIND_CXX_FLAGS' if the
-+# flag is supported by the C compiler.
-+macro(add_cxx_compile_flags_if_supported)
-+ foreach(flag ${ARGN})
-+ mangle_name("${flag}" flagname)
-+ check_cxx_compiler_flag("${flag}" "LIBUNWIND_SUPPORTS_${flagname}_FLAG")
-+ add_cxx_flags_if(LIBUNWIND_SUPPORTS_${flagname}_FLAG ${flag})
-+ endforeach()
-+endmacro()
-+
-+# Add a list of flags to 'LIBUNWIND_LINK_FLAGS'.
-+macro(add_link_flags)
-+ foreach(f ${ARGN})
-+ list(APPEND LIBUNWIND_LINK_FLAGS ${f})
-+ endforeach()
-+endmacro()
-+
-+# If 'condition' is true then add the specified list of flags to
-+# 'LIBUNWIND_LINK_FLAGS'
-+macro(add_link_flags_if condition)
-+ if (${condition})
-+ add_link_flags(${ARGN})
-+ endif()
-+endmacro()
-+
-+# For each specified flag, add that flag to 'LIBUNWIND_LINK_FLAGS' if the
-+# flag is supported by the C++ compiler.
-+macro(add_link_flags_if_supported)
-+ foreach(flag ${ARGN})
-+ mangle_name("${flag}" flagname)
-+ check_cxx_compiler_flag("${flag}" "LIBUNWIND_SUPPORTS_${flagname}_FLAG")
-+ add_link_flags_if(LIBUNWIND_SUPPORTS_${flagname}_FLAG ${flag})
-+ endforeach()
-+endmacro()
-+
-+# Add a list of libraries or link flags to 'LIBUNWIND_LIBRARIES'.
-+macro(add_library_flags)
-+ foreach(lib ${ARGN})
-+ list(APPEND LIBUNWIND_LIBRARIES ${lib})
-+ endforeach()
-+endmacro()
-+
-+# if 'condition' is true then add the specified list of libraries and flags
-+# to 'LIBUNWIND_LIBRARIES'.
-+macro(add_library_flags_if condition)
-+ if(${condition})
-+ add_library_flags(${ARGN})
-+ endif()
-+endmacro()
-+
-+# Turn a comma separated CMake list into a space separated string.
-+macro(split_list listname)
-+ string(REPLACE ";" " " ${listname} "${${listname}}")
-+endmacro()
-diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
-index 07a95ce..02d2f13 100644
---- a/cmake/config-ix.cmake
-+++ b/cmake/config-ix.cmake
-@@ -68,43 +68,8 @@ int main() { return 0; }
- endif()
-
- # Check compiler flags
--check_c_compiler_flag(-funwind-tables LIBUNWIND_HAS_FUNWIND_TABLES)
--check_cxx_compiler_flag(-fno-exceptions LIBUNWIND_HAS_NO_EXCEPTIONS_FLAG)
--check_cxx_compiler_flag(-fno-rtti LIBUNWIND_HAS_NO_RTTI_FLAG)
--check_cxx_compiler_flag(-fstrict-aliasing LIBUNWIND_HAS_FSTRICT_ALIASING_FLAG)
--check_cxx_compiler_flag(-nostdinc++ LIBUNWIND_HAS_NOSTDINCXX_FLAG)
--check_cxx_compiler_flag(-Wall LIBUNWIND_HAS_WALL_FLAG)
--check_cxx_compiler_flag(-W LIBUNWIND_HAS_W_FLAG)
--check_cxx_compiler_flag(-Wno-unused-function LIBUNWIND_HAS_WNO_UNUSED_FUNCTION_FLAG)
--check_cxx_compiler_flag(-Wunused-variable LIBUNWIND_HAS_WUNUSED_VARIABLE_FLAG)
--check_cxx_compiler_flag(-Wunused-parameter LIBUNWIND_HAS_WUNUSED_PARAMETER_FLAG)
--check_cxx_compiler_flag(-Wstrict-aliasing LIBUNWIND_HAS_WSTRICT_ALIASING_FLAG)
--check_cxx_compiler_flag(-Wstrict-overflow LIBUNWIND_HAS_WSTRICT_OVERFLOW_FLAG)
--check_cxx_compiler_flag(-Wwrite-strings LIBUNWIND_HAS_WWRITE_STRINGS_FLAG)
--check_cxx_compiler_flag(-Wchar-subscripts LIBUNWIND_HAS_WCHAR_SUBSCRIPTS_FLAG)
--check_cxx_compiler_flag(-Wmismatched-tags LIBUNWIND_HAS_WMISMATCHED_TAGS_FLAG)
--check_cxx_compiler_flag(-Wmissing-braces LIBUNWIND_HAS_WMISSING_BRACES_FLAG)
--check_cxx_compiler_flag(-Wshorten-64-to-32 LIBUNWIND_HAS_WSHORTEN_64_TO_32_FLAG)
--check_cxx_compiler_flag(-Wsign-conversion LIBUNWIND_HAS_WSIGN_CONVERSION_FLAG)
--check_cxx_compiler_flag(-Wsign-compare LIBUNWIND_HAS_WSIGN_COMPARE_FLAG)
--check_cxx_compiler_flag(-Wshadow LIBUNWIND_HAS_WSHADOW_FLAG)
--check_cxx_compiler_flag(-Wconversion LIBUNWIND_HAS_WCONVERSION_FLAG)
--check_cxx_compiler_flag(-Wnewline-eof LIBUNWIND_HAS_WNEWLINE_EOF_FLAG)
--check_cxx_compiler_flag(-Wundef LIBUNWIND_HAS_WUNDEF_FLAG)
--check_cxx_compiler_flag(-pedantic LIBUNWIND_HAS_PEDANTIC_FLAG)
--check_cxx_compiler_flag(-Werror LIBUNWIND_HAS_WERROR_FLAG)
--check_cxx_compiler_flag(-Wno-error LIBUNWIND_HAS_WNO_ERROR_FLAG)
--check_cxx_compiler_flag(/WX LIBUNWIND_HAS_WX_FLAG)
--check_cxx_compiler_flag(/WX- LIBUNWIND_HAS_NO_WX_FLAG)
--check_cxx_compiler_flag(/EHsc LIBUNWIND_HAS_EHSC_FLAG)
--check_cxx_compiler_flag(/EHs- LIBUNWIND_HAS_NO_EHS_FLAG)
--check_cxx_compiler_flag(/EHa- LIBUNWIND_HAS_NO_EHA_FLAG)
--check_cxx_compiler_flag(/GR- LIBUNWIND_HAS_NO_GR_FLAG)
--check_cxx_compiler_flag(-std=c++11 LIBUNWIND_HAS_STD_CXX11)
--
--if(LIBUNWIND_HAS_STD_CXX11)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
--endif()
-+check_cxx_compiler_flag(-nostdinc++ LIBUNWIND_HAS_NOSTDINCXX_FLAG)
-
-+# Check libraries
- check_library_exists(dl dladdr "" LIBUNWIND_HAS_DL_LIB)
- check_library_exists(pthread pthread_once "" LIBUNWIND_HAS_PTHREAD_LIB)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 572c823..0b2a830 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -5,7 +5,11 @@ set(LIBUNWIND_CXX_SOURCES
- Unwind-EHABI.cpp
- Unwind-seh.cpp
- )
--unwind_append_if(LIBUNWIND_CXX_SOURCES APPLE Unwind_AppleExtras.cpp)
-+if(APPLE)
-+ list(APPEND LIBUNWIND_CXX_SOURCES
-+ Unwind_AppleExtras.cpp
-+ )
-+endif()
-
- set(LIBUNWIND_C_SOURCES
- UnwindLevel1.c
-@@ -39,10 +43,11 @@ set(LIBUNWIND_HEADERS
- ../include/libunwind.h
- ../include/unwind.h
- )
--
--unwind_append_if(LIBUNWIND_HEADERS APPLE
-+if(APPLE)
-+ list(APPEND LIBUNWIND_HEADERS
- ../include/mach-o/compact_unwind_encoding.h
- )
-+endif()
-
- if (MSVC_IDE)
- # Force them all into the headers dir on MSVC, otherwise they end up at
-@@ -56,32 +61,28 @@ set(LIBUNWIND_SOURCES
- ${LIBUNWIND_ASM_SOURCES})
-
- # Generate library list.
--set(libraries)
--unwind_append_if(libraries LIBUNWIND_HAS_C_LIB c)
-+add_library_flags_if(LIBUNWIND_HAS_C_LIB c)
- if (LIBUNWIND_USE_COMPILER_RT)
-- list(APPEND libraries "${LIBUNWIND_BUILTINS_LIBRARY}")
-+ add_library_flags("${LIBUNWIND_BUILTINS_LIBRARY}")
- else()
-- unwind_append_if(libraries LIBUNWIND_HAS_GCC_S_LIB gcc_s)
-- unwind_append_if(libraries LIBUNWIND_HAS_GCC_LIB gcc)
-+ add_library_flags_if(LIBUNWIND_HAS_GCC_S_LIB gcc_s)
-+ add_library_flags_if(LIBUNWIND_HAS_GCC_LIB gcc)
- endif()
--unwind_append_if(libraries LIBUNWIND_HAS_DL_LIB dl)
-+add_library_flags_if(LIBUNWIND_HAS_DL_LIB dl)
- if (LIBUNWIND_ENABLE_THREADS)
-- unwind_append_if(libraries LIBUNWIND_HAS_PTHREAD_LIB pthread)
-- unwind_append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_WEAK_PTHREAD_LIB -DLIBUNWIND_USE_WEAK_PTHREAD=1)
-+ add_library_flags_if(LIBUNWIND_HAS_PTHREAD_LIB pthread)
-+ add_compile_flags_if(LIBUNWIND_WEAK_PTHREAD_LIB -DLIBUNWIND_USE_WEAK_PTHREAD=1)
- endif()
-
- # Setup flags.
--unwind_append_if(LIBUNWIND_CXX_FLAGS LIBUNWIND_HAS_NO_RTTI_FLAG -fno-rtti)
--
--unwind_append_if(LIBUNWIND_LINK_FLAGS LIBUNWIND_HAS_NODEFAULTLIBS_FLAG -nodefaultlibs)
-+add_link_flags_if_supported(-nodefaultlibs)
-
- # MINGW_LIBRARIES is defined in config-ix.cmake
--unwind_append_if(libraries MINGW "${MINGW_LIBRARIES}")
-+add_library_flags_if(MINGW "${MINGW_LIBRARIES}")
-
--if (LIBUNWIND_HAS_NO_EXCEPTIONS_FLAG AND LIBUNWIND_HAS_FUNWIND_TABLES)
-- list(APPEND LIBUNWIND_COMPILE_FLAGS -fno-exceptions)
-- list(APPEND LIBUNWIND_COMPILE_FLAGS -funwind-tables)
--elseif (LIBUNWIND_ENABLE_SHARED)
-+if (LIBUNWIND_ENABLE_SHARED AND
-+ NOT (LIBUNWIND_SUPPORTS_FNO_EXCEPTIONS_FLAG AND
-+ LIBUNWIND_SUPPORTS_FUNWIND_TABLES_FLAG))
- message(FATAL_ERROR
- "Compiler doesn't support generation of unwind tables if exception "
- "support is disabled. Building libunwind DSO with runtime dependency "
-@@ -89,15 +90,11 @@ elseif (LIBUNWIND_ENABLE_SHARED)
- endif()
-
- if (APPLE)
-- list(APPEND LIBUNWIND_COMPILE_FLAGS "-U__STRICT_ANSI__")
-- list(APPEND LIBUNWIND_LINK_FLAGS
-- "-compatibility_version 1"
-- "-install_name /usr/lib/libunwind.1.dylib")
-+ add_compile_flags("-U__STRICT_ANSI__")
-+ add_link_flags("-compatibility_version 1" "-install_name /usr/lib/libunwind.1.dylib")
-
- if (CMAKE_OSX_DEPLOYMENT_TARGET STREQUAL "10.6")
-- list(APPEND LIBUNWIND_LINK_FLAGS
-- "-current_version ${LIBUNWIND_VERSION}"
-- "/usr/lib/libSystem.B.dylib")
-+ add_link_flags("-current_version ${LIBUNWIND_VERSION}" "/usr/lib/libSystem.B.dylib")
- endif ()
- endif ()
-
-@@ -117,14 +114,23 @@ if (LIBUNWIND_ENABLE_SHARED)
- if(COMMAND llvm_setup_rpath)
- llvm_setup_rpath(unwind_shared)
- endif()
-- target_link_libraries(unwind_shared PRIVATE ${libraries})
-+ target_link_libraries(unwind_shared PRIVATE ${LIBUNWIND_LIBRARIES})
- set_target_properties(unwind_shared
- PROPERTIES
-- COMPILE_FLAGS "${LIBUNWIND_COMPILE_FLAGS}"
-- LINK_FLAGS "${LIBUNWIND_LINK_FLAGS}"
-- OUTPUT_NAME "unwind"
-- VERSION "1.0"
-- SOVERSION "1")
-+ CXX_STANDARD
-+ 11
-+ CXX_STANDARD_REQUIRED
-+ ON
-+ COMPILE_FLAGS
-+ "${LIBUNWIND_COMPILE_FLAGS}"
-+ LINK_FLAGS
-+ "${LIBUNWIND_LINK_FLAGS}"
-+ OUTPUT_NAME
-+ "unwind"
-+ VERSION
-+ "1.0"
-+ SOVERSION
-+ "1")
- list(APPEND LIBUNWIND_BUILD_TARGETS "unwind_shared")
- if (LIBUNWIND_INSTALL_SHARED_LIBRARY)
- list(APPEND LIBUNWIND_INSTALL_TARGETS "unwind_shared")
-@@ -134,12 +140,19 @@ endif()
- # Build the static library.
- if (LIBUNWIND_ENABLE_STATIC)
- add_library(unwind_static STATIC ${LIBUNWIND_SOURCES} ${LIBUNWIND_HEADERS})
-- target_link_libraries(unwind_static PRIVATE ${libraries})
-+ target_link_libraries(unwind_static PRIVATE ${LIBUNWIND_LIBRARIES})
- set_target_properties(unwind_static
- PROPERTIES
-- COMPILE_FLAGS "${LIBUNWIND_COMPILE_FLAGS}"
-- LINK_FLAGS "${LIBUNWIND_LINK_FLAGS}"
-- OUTPUT_NAME "unwind")
-+ CXX_STANDARD
-+ 11
-+ CXX_STANDARD_REQUIRED
-+ ON
-+ COMPILE_FLAGS
-+ "${LIBUNWIND_COMPILE_FLAGS}"
-+ LINK_FLAGS
-+ "${LIBUNWIND_LINK_FLAGS}"
-+ OUTPUT_NAME
-+ "unwind")
-
- if(LIBUNWIND_HERMETIC_STATIC_LIBRARY)
- append_flags_if_supported(UNWIND_STATIC_LIBRARY_FLAGS -fvisibility=hidden)
diff --git a/packages/sys-libs/llvm-libunwind/files/0002-b956c52c878776391430443706d884c124610c41.patch b/packages/sys-libs/llvm-libunwind/files/0002-b956c52c878776391430443706d884c124610c41.patch
deleted file mode 100644
index 6fbd38bf1..000000000
--- a/packages/sys-libs/llvm-libunwind/files/0002-b956c52c878776391430443706d884c124610c41.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Upstream: yes
-From b956c52c878776391430443706d884c124610c41 Mon Sep 17 00:00:00 2001
-From: Petr Hosek <phosek@chromium.org>
-Date: Sat, 12 Oct 2019 01:50:57 +0000
-Subject: [PATCH] [libunwind] Fix issues introduced in r374606
-
-There are few differences in compile flags introduced in r374606
-which are causing libcxx-libcxxabi-libunwind-armv8-linux to fail.
-This change should address all of those, I've compared the generated
-build file from before r374606 and with this change and the set of
-flags is the same modulo order.
-
-git-svn-id: https://llvm.org/svn/llvm-project/libunwind/trunk@374624 91177308-0d34-0410-b5e6-96231b3b80d8
----
- CMakeLists.txt | 4 ++--
- src/CMakeLists.txt | 4 ++++
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 736c533..3639585 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -291,12 +291,12 @@ endif()
- add_cxx_compile_flags_if_supported(-fstrict-aliasing)
- add_cxx_compile_flags_if_supported(-EHsc)
-
--add_c_compile_flags_if_supported(-funwind-tables)
-+add_compile_flags_if_supported(-funwind-tables)
- add_cxx_compile_flags_if_supported(-fno-exceptions)
- add_cxx_compile_flags_if_supported(-fno-rtti)
-
- # Ensure that we don't depend on C++ standard library.
--if (LIBCXXABI_HAS_NOSTDINCXX_FLAG)
-+if (LIBUNWIND_HAS_NOSTDINCXX_FLAG)
- list(APPEND LIBUNWIND_COMPILE_FLAGS -nostdinc++)
- # Remove -stdlib flags to prevent them from causing an unused flag warning.
- string(REPLACE "-stdlib=libc++" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0b2a830..ed20ff0 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -117,6 +117,8 @@ if (LIBUNWIND_ENABLE_SHARED)
- target_link_libraries(unwind_shared PRIVATE ${LIBUNWIND_LIBRARIES})
- set_target_properties(unwind_shared
- PROPERTIES
-+ CXX_EXTENSIONS
-+ OFF
- CXX_STANDARD
- 11
- CXX_STANDARD_REQUIRED
-@@ -143,6 +145,8 @@ if (LIBUNWIND_ENABLE_STATIC)
- target_link_libraries(unwind_static PRIVATE ${LIBUNWIND_LIBRARIES})
- set_target_properties(unwind_static
- PROPERTIES
-+ CXX_EXTENSIONS
-+ OFF
- CXX_STANDARD
- 11
- CXX_STANDARD_REQUIRED
diff --git a/packages/sys-libs/llvm-libunwind/files/0003-cbc872a63f81ad9482bb288165af63d7444fa3ed.patch b/packages/sys-libs/llvm-libunwind/files/0003-cbc872a63f81ad9482bb288165af63d7444fa3ed.patch
deleted file mode 100644
index eed16de1f..000000000
--- a/packages/sys-libs/llvm-libunwind/files/0003-cbc872a63f81ad9482bb288165af63d7444fa3ed.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Upstream: yes
-From cbc872a63f81ad9482bb288165af63d7444fa3ed Mon Sep 17 00:00:00 2001
-From: Saleem Abdulrasool <compnerd@compnerd.org>
-Date: Wed, 6 Nov 2019 10:51:42 -0800
-Subject: [PATCH] unwind: disable RTTI during the build of libunwind
-
-Disable the type information emission for libunwind. libunwind does not
-use `dynamic_cast`. This results in a smaller binary, and more
-importantly, avoids the dependency on libc++abi. This ensures that we
-have complete symbol resolution of symbols on ELF targets without
-linking to the C++ runtime support library. This change avoids the
-emission of a reference to `__si_class_type_info`.
----
- libunwind/src/CMakeLists.txt | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/libunwind/src/CMakeLists.txt b/libunwind/src/CMakeLists.txt
-index ed20ff0015f4..2dab16afbdf9 100644
---- a/libunwind/src/CMakeLists.txt
-+++ b/libunwind/src/CMakeLists.txt
-@@ -111,6 +111,11 @@ set_property(SOURCE ${LIBUNWIND_C_SOURCES}
- # Build the shared library.
- if (LIBUNWIND_ENABLE_SHARED)
- add_library(unwind_shared SHARED ${LIBUNWIND_SOURCES} ${LIBUNWIND_HEADERS})
-+ if(CMAKE_C_COMPILER_ID STREQUAL MSVC)
-+ target_compile_options(unwind_shared PRIVATE /GR-)
-+ else()
-+ target_compile_options(unwind_shared PRIVATE -fno-rtti)
-+ endif()
- if(COMMAND llvm_setup_rpath)
- llvm_setup_rpath(unwind_shared)
- endif()
-@@ -142,6 +147,11 @@ endif()
- # Build the static library.
- if (LIBUNWIND_ENABLE_STATIC)
- add_library(unwind_static STATIC ${LIBUNWIND_SOURCES} ${LIBUNWIND_HEADERS})
-+ if(CMAKE_C_COMPILER_ID STREQUAL MSVC)
-+ target_compile_options(unwind_static PRIVATE /GR-)
-+ else()
-+ target_compile_options(unwind_static PRIVATE -fno-rtti)
-+ endif()
- target_link_libraries(unwind_static PRIVATE ${LIBUNWIND_LIBRARIES})
- set_target_properties(unwind_static
- PROPERTIES
diff --git a/packages/sys-libs/llvm-libunwind/files/0004-aa582e3648cc4036aec3b9302ab93bfe9929d19c.patch b/packages/sys-libs/llvm-libunwind/files/0004-aa582e3648cc4036aec3b9302ab93bfe9929d19c.patch
deleted file mode 100644
index 19d1f2b6c..000000000
--- a/packages/sys-libs/llvm-libunwind/files/0004-aa582e3648cc4036aec3b9302ab93bfe9929d19c.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Upstream: yes
-From aa582e3648cc4036aec3b9302ab93bfe9929d19c Mon Sep 17 00:00:00 2001
-From: Saleem Abdulrasool <compnerd@compnerd.org>
-Date: Wed, 6 Nov 2019 15:38:25 -0800
-Subject: [PATCH] unwind: reflow some of the build rules (NFC)
-
-Reflow the CMake properties to take less vertical space. This just
-makes it easier to read. NFC.
----
- libunwind/src/CMakeLists.txt | 48 ++++++++++++------------------------
- 1 file changed, 16 insertions(+), 32 deletions(-)
-
-diff --git a/libunwind/src/CMakeLists.txt b/libunwind/src/CMakeLists.txt
-index 2dab16afbdf9..eaa8ae6ca980 100644
---- a/libunwind/src/CMakeLists.txt
-+++ b/libunwind/src/CMakeLists.txt
-@@ -120,24 +120,15 @@ if (LIBUNWIND_ENABLE_SHARED)
- llvm_setup_rpath(unwind_shared)
- endif()
- target_link_libraries(unwind_shared PRIVATE ${LIBUNWIND_LIBRARIES})
-- set_target_properties(unwind_shared
-- PROPERTIES
-- CXX_EXTENSIONS
-- OFF
-- CXX_STANDARD
-- 11
-- CXX_STANDARD_REQUIRED
-- ON
-- COMPILE_FLAGS
-- "${LIBUNWIND_COMPILE_FLAGS}"
-- LINK_FLAGS
-- "${LIBUNWIND_LINK_FLAGS}"
-- OUTPUT_NAME
-- "unwind"
-- VERSION
-- "1.0"
-- SOVERSION
-- "1")
-+ set_target_properties(unwind_shared PROPERTIES
-+ CXX_EXTENSIONS OFF
-+ CXX_STANDARD 11
-+ CXX_STANDARD_REQUIRED ON
-+ COMPILE_FLAGS "${LIBUNWIND_COMPILE_FLAGS}"
-+ LINK_FLAGS "${LIBUNWIND_LINK_FLAGS}"
-+ OUTPUT_NAME "unwind"
-+ VERSION "1.0"
-+ SOVERSION "1")
- list(APPEND LIBUNWIND_BUILD_TARGETS "unwind_shared")
- if (LIBUNWIND_INSTALL_SHARED_LIBRARY)
- list(APPEND LIBUNWIND_INSTALL_TARGETS "unwind_shared")
-@@ -153,20 +144,13 @@ if (LIBUNWIND_ENABLE_STATIC)
- target_compile_options(unwind_static PRIVATE -fno-rtti)
- endif()
- target_link_libraries(unwind_static PRIVATE ${LIBUNWIND_LIBRARIES})
-- set_target_properties(unwind_static
-- PROPERTIES
-- CXX_EXTENSIONS
-- OFF
-- CXX_STANDARD
-- 11
-- CXX_STANDARD_REQUIRED
-- ON
-- COMPILE_FLAGS
-- "${LIBUNWIND_COMPILE_FLAGS}"
-- LINK_FLAGS
-- "${LIBUNWIND_LINK_FLAGS}"
-- OUTPUT_NAME
-- "unwind")
-+ set_target_properties(unwind_static PROPERTIES
-+ CXX_EXTENSIONS OFF
-+ CXX_STANDARD 11
-+ CXX_STANDARD_REQUIRED ON
-+ COMPILE_FLAGS "${LIBUNWIND_COMPILE_FLAGS}"
-+ LINK_FLAGS "${LIBUNWIND_LINK_FLAGS}"
-+ OUTPUT_NAME "unwind")
-
- if(LIBUNWIND_HERMETIC_STATIC_LIBRARY)
- append_flags_if_supported(UNWIND_STATIC_LIBRARY_FLAGS -fvisibility=hidden)
diff --git a/packages/sys-libs/llvm-libunwind/files/0005-e74e61ff297e81c0a9bda54037033fc40fc76e1d.patch b/packages/sys-libs/llvm-libunwind/files/0005-e74e61ff297e81c0a9bda54037033fc40fc76e1d.patch
deleted file mode 100644
index 621d0db36..000000000
--- a/packages/sys-libs/llvm-libunwind/files/0005-e74e61ff297e81c0a9bda54037033fc40fc76e1d.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Upstream: yes
-From e74e61ff297e81c0a9bda54037033fc40fc76e1d Mon Sep 17 00:00:00 2001
-From: Saleem Abdulrasool <compnerd@compnerd.org>
-Date: Wed, 6 Nov 2019 15:40:07 -0800
-Subject: [PATCH] unwind: restore the LINKER_LANGUAGE
-
-Have CMake treat the unwind libraries as C libraries rather than C++.
-There is no C++ runtime dependency at runtime. This ensures that we do
-not accidentally end up with a link against the C++ runtime.
-
-We need to explicitly reset the implicitly linked libraries for C++ to
-ensure that we do not have CMake force the link against the C++ runtime.
-This adjustment should enable the NetBSD bots to be happy with this
-change.
----
- libunwind/src/CMakeLists.txt | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/libunwind/src/CMakeLists.txt b/libunwind/src/CMakeLists.txt
-index eaa8ae6ca980..d02f8a21dd48 100644
---- a/libunwind/src/CMakeLists.txt
-+++ b/libunwind/src/CMakeLists.txt
-@@ -108,6 +108,10 @@ set_property(SOURCE ${LIBUNWIND_CXX_SOURCES}
- set_property(SOURCE ${LIBUNWIND_C_SOURCES}
- APPEND_STRING PROPERTY COMPILE_FLAGS " ${LIBUNWIND_C_FLAGS}")
-
-+# NOTE: avoid implicit dependencies on C++ runtimes. libunwind uses C++ for
-+# ease, but does not rely on C++ at runtime.
-+set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
-+
- # Build the shared library.
- if (LIBUNWIND_ENABLE_SHARED)
- add_library(unwind_shared SHARED ${LIBUNWIND_SOURCES} ${LIBUNWIND_HEADERS})
-@@ -126,6 +130,7 @@ if (LIBUNWIND_ENABLE_SHARED)
- CXX_STANDARD_REQUIRED ON
- COMPILE_FLAGS "${LIBUNWIND_COMPILE_FLAGS}"
- LINK_FLAGS "${LIBUNWIND_LINK_FLAGS}"
-+ LINKER_LANGUAGE C
- OUTPUT_NAME "unwind"
- VERSION "1.0"
- SOVERSION "1")
-@@ -150,6 +155,7 @@ if (LIBUNWIND_ENABLE_STATIC)
- CXX_STANDARD_REQUIRED ON
- COMPILE_FLAGS "${LIBUNWIND_COMPILE_FLAGS}"
- LINK_FLAGS "${LIBUNWIND_LINK_FLAGS}"
-+ LINKER_LANGUAGE C
- OUTPUT_NAME "unwind")
-
- if(LIBUNWIND_HERMETIC_STATIC_LIBRARY)
diff --git a/packages/sys-libs/llvm-libunwind/files/0006-d3c744313c3cca0c076f031ec71e66ca74b12f2a.patch b/packages/sys-libs/llvm-libunwind/files/0006-d3c744313c3cca0c076f031ec71e66ca74b12f2a.patch
deleted file mode 100644
index 41df350be..000000000
--- a/packages/sys-libs/llvm-libunwind/files/0006-d3c744313c3cca0c076f031ec71e66ca74b12f2a.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Upstream: yes
-From d3c744313c3cca0c076f031ec71e66ca74b12f2a Mon Sep 17 00:00:00 2001
-From: Sterling Augustine <saugustine@google.com>
-Date: Thu, 31 Oct 2019 12:45:20 -0700
-Subject: [PATCH] Correctly update isSignalFrame when unwinding the stack via
- dwarf.
-
-A "signal frame" is a function or block of code where execution arrives via a signal or interrupt, rather than via a normal call instruction. In fact, a particular instruction is interrupted by the signal and needs to be restarted. Therefore, when the signal handler is complete, execution needs to return to the interrupted instruction, rather than the instruction immediately following the call instruction, as in a normal call.
-
-Stack unwinders need to know this to correctly unwind signal frames. Dwarf handily provides an "S" in the CIE augmentation string to describe this case, and the libunwind API provides various functions to for unwinders to determine it,.
-
-The llvm libunwind implementation correctly sets it's internal variable "isSignalFrame" when initializing an unwind context. However, upon stepping up the stack, the current implementation correctly reads the augmentation string and sets it in the CIE info (which it then discards), libunwind doesn't update it's internal unwind context data structure.
-
-This change fixes that, and provides compatibility with both the canonical libunwind and the libgcc implementation.
-
-Reviewers: jfb
-
-Subscribers: christof, libcxx-commits
-
-Tags: #libc
-
-Differential Revision: https://reviews.llvm.org/D69677
----
- libunwind/src/DwarfInstructions.hpp | 7 +++++--
- libunwind/src/UnwindCursor.hpp | 2 +-
- libunwind/src/UnwindLevel1-gcc-ext.c | 9 ++++++++-
- libunwind/test/signal_frame.pass.cpp | 25 +++++++++++++++++++++++++
- 4 files changed, 39 insertions(+), 4 deletions(-)
- create mode 100644 libunwind/test/signal_frame.pass.cpp
-
-diff --git a/libunwind/src/DwarfInstructions.hpp b/libunwind/src/DwarfInstructions.hpp
-index 29a070fa3e04..48ef1866d6e1 100644
---- a/libunwind/src/DwarfInstructions.hpp
-+++ b/libunwind/src/DwarfInstructions.hpp
-@@ -34,7 +34,7 @@ class DwarfInstructions {
- typedef typename A::sint_t sint_t;
-
- static int stepWithDwarf(A &addressSpace, pint_t pc, pint_t fdeStart,
-- R &registers);
-+ R &registers, bool &isSignalFrame);
-
- private:
-
-@@ -150,7 +150,8 @@ v128 DwarfInstructions<A, R>::getSavedVectorRegister(
-
- template <typename A, typename R>
- int DwarfInstructions<A, R>::stepWithDwarf(A &addressSpace, pint_t pc,
-- pint_t fdeStart, R &registers) {
-+ pint_t fdeStart, R &registers,
-+ bool &isSignalFrame) {
- FDE_Info fdeInfo;
- CIE_Info cieInfo;
- if (CFI_Parser<A>::decodeFDE(addressSpace, fdeStart, &fdeInfo,
-@@ -196,6 +197,8 @@ int DwarfInstructions<A, R>::stepWithDwarf(A &addressSpace, pint_t pc,
- // restoring SP means setting it to CFA.
- newRegisters.setSP(cfa);
-
-+ isSignalFrame = cieInfo.isSignalFrame;
-+
- #if defined(_LIBUNWIND_TARGET_AARCH64)
- // If the target is aarch64 then the return address may have been signed
- // using the v8.3 pointer authentication extensions. The original
-diff --git a/libunwind/src/UnwindCursor.hpp b/libunwind/src/UnwindCursor.hpp
-index b4d44e111a65..4c18614b33d2 100644
---- a/libunwind/src/UnwindCursor.hpp
-+++ b/libunwind/src/UnwindCursor.hpp
-@@ -929,7 +929,7 @@ class UnwindCursor : public AbstractUnwindCursor{
- return DwarfInstructions<A, R>::stepWithDwarf(_addressSpace,
- (pint_t)this->getReg(UNW_REG_IP),
- (pint_t)_info.unwind_info,
-- _registers);
-+ _registers, _isSignalFrame);
- }
- #endif
-
-diff --git a/libunwind/src/UnwindLevel1-gcc-ext.c b/libunwind/src/UnwindLevel1-gcc-ext.c
-index 63e4083a4579..008df815665e 100644
---- a/libunwind/src/UnwindLevel1-gcc-ext.c
-+++ b/libunwind/src/UnwindLevel1-gcc-ext.c
-@@ -221,7 +221,14 @@ _LIBUNWIND_EXPORT uintptr_t _Unwind_GetCFA(struct _Unwind_Context *context) {
- _LIBUNWIND_EXPORT uintptr_t _Unwind_GetIPInfo(struct _Unwind_Context *context,
- int *ipBefore) {
- _LIBUNWIND_TRACE_API("_Unwind_GetIPInfo(context=%p)", (void *)context);
-- *ipBefore = 0;
-+ int isSignalFrame = __unw_is_signal_frame((unw_cursor_t *)context);
-+ // Negative means some kind of error (probably UNW_ENOINFO), but we have no
-+ // good way to report that, and this maintains backward compatibility with the
-+ // implementation that hard-coded zero in every case, even signal frames.
-+ if (isSignalFrame <= 0)
-+ *ipBefore = 0;
-+ else
-+ *ipBefore = 1;
- return _Unwind_GetIP(context);
- }
-
-diff --git a/libunwind/test/signal_frame.pass.cpp b/libunwind/test/signal_frame.pass.cpp
-new file mode 100644
-index 000000000000..b14e95a51528
---- /dev/null
-+++ b/libunwind/test/signal_frame.pass.cpp
-@@ -0,0 +1,25 @@
-+// -*- C++ -*-
-+//===----------------------------------------------------------------------===//
-+//
-+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-+// See https://llvm.org/LICENSE.txt for license information.
-+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-+//
-+//===----------------------------------------------------------------------===//
-+
-+// Ensure that functions marked as signal frames are reported as such.
-+
-+#include <assert.h>
-+#include <stdlib.h>
-+#include <libunwind.h>
-+
-+int main(void) {
-+ asm(".cfi_signal_frame");
-+ unw_cursor_t cursor;
-+ unw_context_t uc;
-+ unw_getcontext(&uc);
-+ unw_init_local(&cursor, &uc);
-+ assert(unw_step(&cursor) > 0);
-+ assert(unw_is_signal_frame(&cursor));
-+ return 0;
-+}
diff --git a/packages/sys-libs/llvm-libunwind/files/0007-4fb8ecdef4c9b19563e428a151c376a4103d65fc.patch b/packages/sys-libs/llvm-libunwind/files/0007-4fb8ecdef4c9b19563e428a151c376a4103d65fc.patch
deleted file mode 100644
index 30465cf3b..000000000
--- a/packages/sys-libs/llvm-libunwind/files/0007-4fb8ecdef4c9b19563e428a151c376a4103d65fc.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Upstream: yes
-From 4fb8ecdef4c9b19563e428a151c376a4103d65fc Mon Sep 17 00:00:00 2001
-From: Mikhail Maltsev <mikhail.maltsev@arm.com>
-Date: Tue, 19 Nov 2019 09:57:04 +0000
-Subject: [PATCH] [libunwind] Adjust the signal_frame test for Arm
-
-Summary:
-This patch adjusts the signal_frame.pass.cpp to pass on Arm targets:
-* When Arm EHABI is used the unwinder does not use DWARF, hence the
- DWARF-specific check unw_is_signal_frame() must be disabled.
-* Certain C libraries don't include EH tables, so the unwinder must
- not try to step out of main(). The patch moves the test code out of
- main() into a separate function to avoid this.
-
-Reviewers: saugustine, ostannard, phosek, jfb, mclow.lists
-
-Reviewed By: saugustine
-
-Subscribers: dexonsmith, aprantl, kristof.beyls, christof, libcxx-commits, pbarrio, labrinea
-
-Tags: #libc
-
-Differential Revision: https://reviews.llvm.org/D70397
----
- libunwind/test/signal_frame.pass.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/libunwind/test/signal_frame.pass.cpp b/libunwind/test/signal_frame.pass.cpp
-index b14e95a51528..a6f3f483bea5 100644
---- a/libunwind/test/signal_frame.pass.cpp
-+++ b/libunwind/test/signal_frame.pass.cpp
-@@ -13,13 +13,19 @@
- #include <stdlib.h>
- #include <libunwind.h>
-
--int main(void) {
-+void test() {
- asm(".cfi_signal_frame");
- unw_cursor_t cursor;
- unw_context_t uc;
- unw_getcontext(&uc);
- unw_init_local(&cursor, &uc);
- assert(unw_step(&cursor) > 0);
-+#if !defined(_LIBUNWIND_ARM_EHABI)
- assert(unw_is_signal_frame(&cursor));
-+#endif
-+}
-+
-+int main() {
-+ test();
- return 0;
- }
diff --git a/packages/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.exheres-0 b/packages/sys-libs/llvm-libunwind/llvm-libunwind-11.0.1.exheres-0
index 5f4bfc4bc..5f4bfc4bc 100644
--- a/packages/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.exheres-0
+++ b/packages/sys-libs/llvm-libunwind/llvm-libunwind-11.0.1.exheres-0
diff --git a/packages/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1-r1.exheres-0 b/packages/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1-r1.exheres-0
deleted file mode 100644
index 72a05a22d..000000000
--- a/packages/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1-r1.exheres-0
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2019 Marvin Schmidt <marv@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require llvm-libunwind
-
-PLATFORMS="~amd64"
-
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/0001-38529c15312c52f39fc6bf693d2977295385d699.patch
- "${FILES}"/0002-b956c52c878776391430443706d884c124610c41.patch
- -p2 "${FILES}"/0003-cbc872a63f81ad9482bb288165af63d7444fa3ed.patch
- -p2 "${FILES}"/0004-aa582e3648cc4036aec3b9302ab93bfe9929d19c.patch
- -p2 "${FILES}"/0005-e74e61ff297e81c0a9bda54037033fc40fc76e1d.patch
- -p2 "${FILES}"/0006-d3c744313c3cca0c076f031ec71e66ca74b12f2a.patch
- -p2 "${FILES}"/0007-4fb8ecdef4c9b19563e428a151c376a4103d65fc.patch
-)
-
diff --git a/packages/sys-libs/openmp/openmp-11.0.0.exheres-0 b/packages/sys-libs/openmp/openmp-11.0.1.exheres-0
index 2029909bf..2029909bf 100644
--- a/packages/sys-libs/openmp/openmp-11.0.0.exheres-0
+++ b/packages/sys-libs/openmp/openmp-11.0.1.exheres-0
diff --git a/packages/sys-libs/openmp/openmp-9.0.1-r1.exheres-0 b/packages/sys-libs/openmp/openmp-9.0.1-r1.exheres-0
deleted file mode 100644
index 2029909bf..000000000
--- a/packages/sys-libs/openmp/openmp-9.0.1-r1.exheres-0
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2015 Niels Ole Salscheider <niels_ole@salscheider-online.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require openmp
-
-PLATFORMS="~amd64 ~x86"
-
diff --git a/packages/sys-libs/timezone-data/timezone-data-2020d.exheres-0 b/packages/sys-libs/timezone-data/timezone-data-2020f.exheres-0
index fe59f3371..fe59f3371 100644
--- a/packages/sys-libs/timezone-data/timezone-data-2020d.exheres-0
+++ b/packages/sys-libs/timezone-data/timezone-data-2020f.exheres-0
diff --git a/packages/sys-process/htop/files/htop-3.0.2-configure.ac-axe-python-check.patch b/packages/sys-process/htop/files/htop-3.0.2-configure.ac-axe-python-check.patch
deleted file mode 100644
index 5c4e3ad6e..000000000
--- a/packages/sys-process/htop/files/htop-3.0.2-configure.ac-axe-python-check.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream: yes
-Reason: Not necessary anymore, allows us to drop the python dep
-
-From a852fae8e02650d621abdd5aea29b7a56d9a3090 Mon Sep 17 00:00:00 2001
-From: Stephen Gregoratto <dev@sgregoratto.me>
-Date: Tue, 15 Sep 2020 15:19:55 +1000
-Subject: [PATCH] configure.ac: axe python check
-
-Now that the automated header script is gone, there's no need for python
-now.
----
- configure.ac | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 30834f2..18617c1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -291,9 +291,6 @@ AC_ARG_ENABLE([werror], [AS_HELP_STRING([--enable-werror], [Treat warnings as er
- AS_IF([test "x$enable_werror" = "xyes"], [AM_CFLAGS="$AM_CFLAGS -Werror"])
- AC_SUBST([AM_CFLAGS])
-
--AC_CHECK_PROGS(PYTHON, [python python3 python2])
--AC_SUBST(PYTHON)
--
- # Bail out on errors.
- # ----------------------------------------------------------------------
- if test ! -z "$missing_libraries"; then
---
-2.28.0
-
diff --git a/packages/sys-process/htop/htop-3.0.2.exheres-0 b/packages/sys-process/htop/htop-3.0.5.exheres-0
index 5e0aae05e..acd13aca6 100644
--- a/packages/sys-process/htop/htop-3.0.2.exheres-0
+++ b/packages/sys-process/htop/htop-3.0.5.exheres-0
@@ -16,6 +16,7 @@ SLOT="0"
PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
MYOPTIONS="
delay-accounting [[ description = [ Displays delay accounting info from the Linux kernel ] ]]
+ lm_sensors
"
DEPENDENCIES="
@@ -24,28 +25,25 @@ DEPENDENCIES="
build+run:
sys-libs/ncurses
delay-accounting? ( net-libs/libnl:3.0 )
+ lm_sensors? ( sys-apps/lm_sensors )
suggestion:
dev-util/strace [[ description = [ Trace system calls of the selected process ] ]]
sys-process/lsof [[ description = [ Display a list of open files of the selected process ] ]]
"
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/${PNV}-configure.ac-axe-python-check.patch
-)
-
DEFAULT_SRC_CONFIGURE_PARAMS=(
# Help htop to find our ncurses library when cross-compiling
# NOTE: this only works because ncursesw6-config is a bash script, ideally this would be done
# using pkg-config, see https://github.com/hishamhm/htop/issues/671
HTOP_NCURSESW_CONFIG_SCRIPT="/usr/$(exhost --target)/bin/ncursesw6-config"
- --enable-cgroup
--enable-openvz
- --enable-taskstats
--enable-unicode
--enable-vserver
--disable-ancient-vserver
+ --disable-debug
--disable-hwloc
--disable-werror
)
DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'delay-accounting delayacct' )
+DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( 'lm_sensors sensors' )
diff --git a/packages/x11-libs/libutempter/files/libutempter-1.1.6-musl.patch b/packages/x11-libs/libutempter/files/libutempter-1.1.6-musl.patch
deleted file mode 100644
index 39dc24515..000000000
--- a/packages/x11-libs/libutempter/files/libutempter-1.1.6-musl.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Upstream: no, upstream appears dead
-
-From 4c0914bb9fde4810bb64acfea71c18bada402474 Mon Sep 17 00:00:00 2001
-From: Kylie McClain <somasis@exherbo.org>
-Date: Sat, 7 Nov 2015 02:27:03 -0500
-Subject: [PATCH] Don't assume glibc is the only libc for linux
-
----
- libutempter/utempter.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/libutempter/utempter.c b/libutempter/utempter.c
-index b79af97..af37a64 100644
---- a/libutempter/utempter.c
-+++ b/libutempter/utempter.c
-@@ -34,13 +34,13 @@
- #include <sys/stat.h>
- #include <utmp.h>
-
--#ifdef __GLIBC__
-+#ifdef linux
- # include <pty.h>
- #elif defined(__FreeBSD__)
- # include <libutil.h>
- #else
- # error Unsupported platform
--#endif /* __GLIBC__ || __FreeBSD__ */
-+#endif /* linux || __FreeBSD__ */
-
- #define DEV_PREFIX "/dev/"
- #define DEV_PREFIX_LEN (sizeof(DEV_PREFIX)-1)
-@@ -106,7 +106,7 @@ validate_device(const char *device)
-
- static int
- write_uwtmp_record(const char *user, const char *term, const char *host,
--#ifdef __GLIBC__
-+#ifdef linux
- pid_t pid,
- #endif
- int add)
-@@ -114,7 +114,7 @@ write_uwtmp_record(const char *user, const char *term, const char *host,
- struct utmp ut;
- struct timeval tv;
-
--#ifdef __GLIBC__
-+#ifdef linux
- size_t offset;
- #endif
-
-@@ -128,7 +128,7 @@ write_uwtmp_record(const char *user, const char *term, const char *host,
- if (host)
- strncpy(ut.ut_host, host, sizeof(ut.ut_host));
-
--#ifdef __GLIBC__
-+#ifdef linux
-
- offset = (strlen(term) <= sizeof(ut.ut_id)) ? 0 :
- strlen(term) - sizeof(ut.ut_id);
-@@ -175,7 +175,7 @@ write_uwtmp_record(const char *user, const char *term, const char *host,
- }
- }
-
--#endif /* __GLIBC__ || __FreeBSD__ */
-+#endif /* linux || __FreeBSD__ */
-
- #ifdef UTEMPTER_DEBUG
- fprintf(stderr,
-@@ -255,7 +255,7 @@ main(int argc, const char *argv[])
- validate_device(device);
-
- return write_uwtmp_record(pw->pw_name, device + DEV_PREFIX_LEN, host,
--#ifdef __GLIBC__
-+#ifdef linux
- pid,
- #endif
- add);
---
-2.6.2
-
diff --git a/packages/x11-libs/libutempter/libutempter-1.1.6.exheres-0 b/packages/x11-libs/libutempter/libutempter-1.2.1.exheres-0
index 3e41ec1de..ad6ef73a5 100644
--- a/packages/x11-libs/libutempter/libutempter-1.1.6.exheres-0
+++ b/packages/x11-libs/libutempter/libutempter-1.2.1.exheres-0
@@ -5,7 +5,7 @@
SUMMARY="A library interface for terminal emulators to record user sessions to utmp and wtmp"
HOMEPAGE=""
-DOWNLOADS="ftp://ftp.altlinux.org/pub/people/ldv/${PN}/${PNV}.tar.bz2"
+DOWNLOADS="ftp://ftp.altlinux.org/pub/people/ldv/${PN}/${PNV}.tar.gz"
REMOTE_IDS="freecode:${PN}"
@@ -19,10 +19,6 @@ DEPENDENCIES="
group/utmp
"
-DEFAULT_SRC_PREPARE_PATCHES=(
- -p2 "${FILES}"/${PNV}-musl.patch
-)
-
DEFAULT_SRC_COMPILE_PARAMS=(
libdir="/usr/$(exhost --target)/lib"
libexecdir="/usr/$(exhost --target)/libexec"
diff --git a/packages/x11-misc/shared-mime-info/files/meson-Use-templated-pkgconfig-file-rather-than-meson.patch b/packages/x11-misc/shared-mime-info/files/meson-Use-templated-pkgconfig-file-rather-than-meson.patch
deleted file mode 100644
index 6bf6e8c41..000000000
--- a/packages/x11-misc/shared-mime-info/files/meson-Use-templated-pkgconfig-file-rather-than-meson.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Upstream: Backport to 2.0 of patch submitted here:
- https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/91
-
-From 8e826b0643015d9aeff8a90dd49894bea5499e22 Mon Sep 17 00:00:00 2001
-From: Calvin Walton <calvin.walton@kepstin.ca>
-Date: Tue, 6 Oct 2020 17:02:40 -0400
-Subject: [PATCH] meson: Use templated pkgconfig file rather than meson
- generator
-
-The meson pkgconfig generator was, in some circumstances, adding
-architecture-specific Cflags and libdir/includedir to the pkgconfig
-file. Since the pkgconfig file is installed in an
-architecture-independent path (e.g. /usr/share/pkgconfig) this was
-causing problems with cross-compile builds or builds on
-multilib/multiarch systems.
-
-The extra variables could be avoided by setting the "dataonly" option on
-the pkgconfig generator, but that causes the "prefix" variable to also
-be removed. I took a quick check and didn't see anything that used this
-variable... but there could be something I missed.
-
-So, in the interests of fixing the issue while preserving compatibility
-with the old autotools build, I've adjusted the meson build to use the
-pkgconfig template which was leftover from the autotools build system.
----
- data/meson.build | 6 ------
- meson.build | 10 ++++++++++
- 2 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 25ce031..263567d 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -33,9 +33,3 @@ custom_target('shared-mime-info-spec-html',
- ],
- build_by_default: true,
- )
--
--pkgconfig.generate(
-- name: 'shared-mime-info',
-- description: 'Freedesktop common MIME database',
-- version: meson.project_version(),
--)
-diff --git a/meson.build b/meson.build
-index bdffdb9..c1816af 100644
---- a/meson.build
-+++ b/meson.build
-@@ -68,6 +68,16 @@ subdir('data')
- subdir('src')
- subdir('tests')
-
-+configure_file(
-+ input: 'shared-mime-info.pc.in',
-+ output: '@BASENAME@',
-+ configuration: {
-+ 'prefix': get_option('prefix'),
-+ 'VERSION': meson.project_version()
-+ },
-+ install_dir: get_option('datadir') / 'pkgconfig'
-+)
-+
- if get_option('update-mimedb')
- upd_tool = (meson.is_cross_build()
- ? find_program('update-mime-database').path()
---
-2.28.0
-
diff --git a/packages/x11-misc/shared-mime-info/shared-mime-info-2.0-r1.exheres-0 b/packages/x11-misc/shared-mime-info/shared-mime-info-2.1.exheres-0
index 92f0a73d0..85c40a8b1 100644
--- a/packages/x11-misc/shared-mime-info/shared-mime-info-2.0-r1.exheres-0
+++ b/packages/x11-misc/shared-mime-info/shared-mime-info-2.1.exheres-0
@@ -4,24 +4,17 @@
# Based in part upon 'shared-mime-info-0.23-r1.ebuild' from Gentoo, which is:
# Copyright 1999-2008 Gentoo Foundation.
-require gitlab [ prefix="https://gitlab.freedesktop.org" user="xdg" ]
+require gitlab [ prefix=https://gitlab.freedesktop.org user=xdg tag=${PV} new_download_scheme=true ]
require meson
require freedesktop-mime
SUMMARY="The Shared MIME-info Database specification"
-
-gibberish="0440063a2e6823a4b1a6fb2f2af8350f"
-DOWNLOADS="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${gibberish}/${PNV}.tar.xz"
+HOMEPAGE+=" https://freedesktop.org/wiki/Software/shared-mime-info"
LICENCES="GPL-2"
SLOT="0"
PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
-MYOPTIONS="
- ( linguas: ar as ast az be be@latin bg bn_IN ca ca@valencia cs cy da de el en_GB eo es et eu fa
- fi fo fr fur ga gl gu he hi hr hu ia id it ja ka kk kn ko lt lv ml mr ms nb nl nn oc
- or pa pl pt pt_BR ro ru rw sk sl sq sr sr@latin sv ta te th tr uk vi wa zh_CN zh_HK
- zh_TW )
-"
+MYOPTIONS=""
DEPENDENCIES="
build:
@@ -34,10 +27,6 @@ DEPENDENCIES="
dev-libs/libxml2:2.0[>=2.4]
"
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/meson-Use-templated-pkgconfig-file-rather-than-meson.patch
-)
-
MESON_SRC_CONFIGURE_PARAMS=(
-Dupdate-mimedb=false
)
diff --git a/profiles/options.conf b/profiles/options.conf
index 411895ef6..d4e738839 100644
--- a/profiles/options.conf
+++ b/profiles/options.conf
@@ -276,7 +276,7 @@ x11-libs/qttools gui
# Marc-Antoine Perennou <keruspe@exherbo.org>
# Default php version
-*/* PHP_ABIS: 7.2
+*/* PHP_ABIS: 7.4
# Marc-Antoine Perennou <keruspe@exherbo.org>
# Default vala version
@@ -375,7 +375,6 @@ dev-python/functools32 python_abis: 2.7
dev-python/futures python_abis: 2.7
dev-python/gnuplot-py python_abis: 2.7
dev-python/nautilus-python python_abis: 2.7
-dev-python/pychm python_abis: 2.7
dev-python/pyPdf python_abis: 2.7
dev-python/pysqlite python_abis: 2.7
dev-python/python-aosd python_abis: 2.7