aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/abuild/0001-feat-abuild-add-support-for-pyX.Y-providers.patch104
-rw-r--r--main/abuild/APKBUILD8
-rw-r--r--main/ack/APKBUILD4
-rw-r--r--main/acpica/APKBUILD6
-rw-r--r--main/alpine-baselayout/APKBUILD20
-rw-r--r--main/alpine-baselayout/profile17
-rw-r--r--main/amavis/APKBUILD45
-rw-r--r--main/amavis/amavisd-conf.patch33
-rw-r--r--main/ansible-base/APKBUILD2
-rw-r--r--main/ansible/APKBUILD2
-rw-r--r--main/apache2-mod-wsgi/APKBUILD2
-rw-r--r--main/apk-tools/APKBUILD7
-rw-r--r--main/asciidoc/APKBUILD8
-rw-r--r--main/asciidoctor/APKBUILD6
-rw-r--r--main/asterisk/30-asterisk-mariadb.patch2
-rw-r--r--main/asterisk/APKBUILD11
-rw-r--r--main/at-spi2-core/APKBUILD4
-rw-r--r--main/attr/APKBUILD17
-rw-r--r--main/attr/fix-tests.patch14
-rw-r--r--main/audit/0002-auparse-remove-use-of-rawmemchr.patch34
-rw-r--r--main/audit/0005-fix-path-in-auditd-conf.patch19
-rw-r--r--main/audit/APKBUILD12
-rw-r--r--main/audit/fno-common-fix.patch23
-rw-r--r--main/autoconf/APKBUILD24
-rw-r--r--main/autoconf/autoconf-2.69-backport-runstatedir.patch50
-rw-r--r--main/autoconf/autoconf-2.69-fix-perl-regex.patch11
-rw-r--r--main/avahi-ui/APKBUILD2
-rw-r--r--main/avahi/APKBUILD2
-rw-r--r--main/awall/APKBUILD13
-rw-r--r--main/awstats/APKBUILD10
-rw-r--r--main/awstats/CVE-2020-35176.patch30
-rw-r--r--main/bash-completion/APKBUILD3
-rw-r--r--main/bats/APKBUILD5
-rw-r--r--main/bctoolbox/APKBUILD10
-rw-r--r--main/bctoolbox/cmake-lib-version-fix.patch34
-rw-r--r--main/bind/APKBUILD25
-rw-r--r--main/binutils/APKBUILD16
-rw-r--r--main/binutils/CVE-2021-3487.patch72
-rw-r--r--main/bison/APKBUILD4
-rw-r--r--main/bitlbee/APKBUILD2
-rw-r--r--main/bluez/APKBUILD4
-rw-r--r--main/boost1.75/APKBUILD38
-rw-r--r--main/boost1.76/0001-revert-cease-dependence-on-range.patch49
-rw-r--r--main/boost1.76/APKBUILD225
-rw-r--r--main/boost1.76/boost-1.57.0-python-abi_letters.patch62
-rw-r--r--main/boost1.76/boost-1.57.0-python-libpython_dep.patch13
-rw-r--r--main/boost1.76/build-undefine-statx-syscall.patch17
-rw-r--r--main/botan/APKBUILD14
-rw-r--r--main/brotli/APKBUILD2
-rw-r--r--main/btrfs-progs/APKBUILD17
-rw-r--r--main/bubblewrap/APKBUILD2
-rw-r--r--main/busybox/0001-ash-add-built-in-BB_ASH_VERSION-variable.patch83
-rw-r--r--main/busybox/0001-lineedit-fix-tab-completion-with-equal-sign.patch29
-rw-r--r--main/busybox/APKBUILD26
-rw-r--r--main/busybox/busyboxconfig5
-rw-r--r--main/busybox/busyboxconfig-extras4
-rw-r--r--main/byacc/APKBUILD4
-rw-r--r--main/byobu/APKBUILD2
-rw-r--r--main/cairo/APKBUILD59
-rw-r--r--main/cairo/cff-allow-empty-array-of-operands-for-certain-operat.patch119
-rw-r--r--main/cairo/composite_color_glyphs.patch58
-rw-r--r--main/cairo/fix-mask-usage-in-image-compositor.patch172
-rw-r--r--main/ccache/APKBUILD13
-rw-r--r--main/chrony/APKBUILD5
-rw-r--r--main/cifs-utils/APKBUILD4
-rw-r--r--main/cjdns/APKBUILD2
-rw-r--r--main/cjson/APKBUILD4
-rw-r--r--main/ckbcomp/APKBUILD6
-rw-r--r--main/clamav/APKBUILD261
-rw-r--r--main/clamav/clamav-daemon.pre-install6
-rw-r--r--main/clamav/clamav-daemon.pre-upgrade11
-rw-r--r--main/clamav/clamav-db.pre-install6
-rw-r--r--main/clamav/clamav-db.pre-upgrade11
-rw-r--r--main/clamav/clamd.confd9
-rwxr-xr-xmain/clamav/clamd.initd85
-rw-r--r--main/clamav/clamd.logrotate7
-rw-r--r--main/clamav/freshclam.confd3
-rw-r--r--main/clamav/freshclam.initd54
-rw-r--r--main/clamav/freshclam.logrotate7
-rw-r--r--main/clamav/freshclam.pre-install6
-rw-r--r--main/clang/10-add-musl-triples.patch8
-rw-r--r--main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch9
-rw-r--r--main/clang/30-fix-python-shebangs.patch391
-rw-r--r--main/clang/40-fix-ld-name-on-x86.patch2
-rw-r--r--main/clang/APKBUILD110
-rw-r--r--main/clucene/APKBUILD2
-rw-r--r--main/cmake/APKBUILD6
-rw-r--r--main/cmake/patch-adjust-lib64.patch31
-rw-r--r--main/compiler-rt/APKBUILD8
-rw-r--r--main/conky/APKBUILD4
-rw-r--r--main/coova-chilli/APKBUILD84
-rw-r--r--main/coova-chilli/chilli.confd1
-rw-r--r--main/coova-chilli/chilli.initd39
-rw-r--r--main/coova-chilli/coova-chilli.post-install2
-rw-r--r--main/coova-chilli/coova-chilli.pre-install6
-rw-r--r--main/coova-chilli/des.patch42
-rw-r--r--main/coova-chilli/posix-regex.patch135
-rw-r--r--main/coova-chilli/system.patch60
-rw-r--r--main/cryptsetup/APKBUILD16
-rw-r--r--main/ctags/APKBUILD10
-rw-r--r--main/curl/APKBUILD13
-rw-r--r--main/cyrus-sasl/APKBUILD4
-rw-r--r--main/cyrus-sasl/cyrus-sasl-2.1.27-dbm-errno.patch29
-rw-r--r--main/cython/APKBUILD3
-rw-r--r--main/d-feet/APKBUILD2
-rw-r--r--main/dahdi-linux-lts/APKBUILD8
-rw-r--r--main/dahdi-linux/APKBUILD1
-rw-r--r--main/daq/APKBUILD2
-rw-r--r--main/dbus-glib/APKBUILD11
-rw-r--r--main/dconf/APKBUILD23
-rw-r--r--main/dconf/systemd-userunit.patch42
-rw-r--r--main/debootstrap/APKBUILD4
-rw-r--r--main/dialog/APKBUILD4
-rw-r--r--main/distcc/APKBUILD10
-rw-r--r--main/distcc/distcc-hardened.patch2
-rw-r--r--main/distcc/gcc-10.patch14
-rw-r--r--main/dns-root-hints/APKBUILD7
-rw-r--r--main/dnsmasq/APKBUILD14
-rw-r--r--main/dnssec-root/APKBUILD10
-rw-r--r--main/doas/APKBUILD4
-rw-r--r--main/dovecot/0001-oauth2-jwt-Use-int64_t-instead-time_t-for-portabilit.patch (renamed from main/dovecot/fix-oauth2-jwt.c.patch)22
-rw-r--r--main/dovecot/APKBUILD20
-rw-r--r--main/dovecot/fix-libssl_iostream_openssl.patch14
-rw-r--r--main/doxygen/APKBUILD2
-rw-r--r--main/dpkg/APKBUILD4
-rw-r--r--main/drbd-utils/APKBUILD4
-rw-r--r--main/dtc/APKBUILD2
-rw-r--r--main/ell/APKBUILD8
-rw-r--r--main/encfs/APKBUILD2
-rw-r--r--main/ethtool/APKBUILD4
-rw-r--r--main/eventlog/APKBUILD18
-rw-r--r--main/execline/APKBUILD4
-rw-r--r--main/expat/APKBUILD6
-rw-r--r--main/f2fs-tools/APKBUILD8
-rw-r--r--main/fail2ban/0001-amend-to-f3dbc9dda10e52610e3de26f538b5581fd905505-ch.patch92
-rw-r--r--main/fail2ban/APKBUILD16
-rw-r--r--main/fail2ban/ec37b1942c4da76f7a0f71efe81bea6835466648.patch25
-rw-r--r--main/file/APKBUILD12
-rw-r--r--main/file/file-5.40-magic-unsigned.patch147
-rw-r--r--main/file/file-5.40-magic-xzip.patch37
-rw-r--r--main/findutils/APKBUILD11
-rw-r--r--main/fish/APKBUILD9
-rw-r--r--main/fontconfig/APKBUILD2
-rw-r--r--main/freeradius/APKBUILD2
-rw-r--r--main/freeswitch/APKBUILD6
-rw-r--r--main/freetds/APKBUILD4
-rw-r--r--main/fsarchiver/APKBUILD6
-rw-r--r--main/fstrm/APKBUILD14
-rw-r--r--main/fuse3/APKBUILD4
-rw-r--r--main/gcc/0001-posix_memalign.patch4
-rw-r--r--main/gcc/0002-gcc-poison-system-directories.patch16
-rw-r--r--main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch6
-rw-r--r--main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch6
-rw-r--r--main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch4
-rw-r--r--main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch4
-rw-r--r--main/gcc/0007-Enable-Wtrampolines-by-default.patch6
-rw-r--r--main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch4
-rw-r--r--main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch4
-rw-r--r--main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch4
-rw-r--r--main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch4
-rw-r--r--main/gcc/0012-libitm-disable-FORTIFY.patch8
-rw-r--r--main/gcc/0013-libgcc_s.patch12
-rw-r--r--main/gcc/0014-nopie.patch12
-rw-r--r--main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch4
-rw-r--r--main/gcc/0016-dlang-update-zlib-binding.patch4
-rw-r--r--main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch4
-rw-r--r--main/gcc/0018-ada-fix-shared-linking.patch4
-rw-r--r--main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch4
-rw-r--r--main/gcc/0020-add-fortify-headers-paths.patch4
-rw-r--r--main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch4
-rw-r--r--main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch4
-rw-r--r--main/gcc/0023-Pure-64-bit-MIPS.patch4
-rw-r--r--main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch4
-rw-r--r--main/gcc/0025-always-build-libgcc_eh.a.patch4
-rw-r--r--main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch6
-rw-r--r--main/gcc/0027-ada-musl-support-fixes.patch4
-rw-r--r--main/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch4
-rw-r--r--main/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch4
-rw-r--r--main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch4
-rw-r--r--main/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch4
-rw-r--r--main/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch4
-rw-r--r--main/gcc/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch4
-rw-r--r--main/gcc/0034-gcc-go-signal-34-is-special-on-musl-libc.patch4
-rw-r--r--main/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch4
-rw-r--r--main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch6
-rw-r--r--main/gcc/0037-gcc-go-link-to-libucontext.patch4
-rw-r--r--main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch4
-rw-r--r--main/gcc/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch (renamed from main/gcc/0040-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch)4
-rw-r--r--main/gcc/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch269
-rw-r--r--main/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch48
-rw-r--r--main/gcc/APKBUILD109
-rw-r--r--main/gcr/APKBUILD6
-rw-r--r--main/gcr/allow-building-without-gpg.patch39
-rw-r--r--main/gd/APKBUILD12
-rw-r--r--main/gdb/APKBUILD4
-rw-r--r--main/gdk-pixbuf/APKBUILD4
-rw-r--r--main/ghostscript/APKBUILD8
-rw-r--r--main/ghostscript/freetype.patch21
-rw-r--r--main/git/APKBUILD8
-rw-r--r--main/gitolite/APKBUILD4
-rw-r--r--main/glib/APKBUILD4
-rw-r--r--main/glslang/APKBUILD4
-rw-r--r--main/gnu-efi/APKBUILD4
-rw-r--r--main/gnutls/APKBUILD9
-rw-r--r--main/gnutls/tests-certtool.patch4
-rw-r--r--main/gobject-introspection/APKBUILD6
-rw-r--r--main/gptfdisk/APKBUILD5
-rw-r--r--main/graphviz/APKBUILD4
-rw-r--r--main/grub/APKBUILD2
-rw-r--r--main/gst-plugins-base/APKBUILD4
-rw-r--r--main/gstreamer/APKBUILD9
-rw-r--r--main/gtest/APKBUILD2
-rw-r--r--main/gtk+3.0/APKBUILD6
-rw-r--r--main/gtk-doc/APKBUILD2
-rw-r--r--main/haproxy/APKBUILD4
-rw-r--r--main/harfbuzz/APKBUILD8
-rw-r--r--main/haserl/APKBUILD12
-rw-r--r--main/hdparm/APKBUILD4
-rw-r--r--main/help2man/APKBUILD4
-rw-r--r--main/highlight/APKBUILD2
-rw-r--r--main/hostapd/APKBUILD8
-rw-r--r--main/htop/APKBUILD2
-rw-r--r--main/hylafaxplus/APKBUILD10
-rw-r--r--main/hylafaxplus/libtiff-version.patch13
-rw-r--r--main/iaxmodem/APKBUILD12
-rw-r--r--main/iaxmodem/fix-use-after-free.patch142
-rw-r--r--main/ifupdown-ng/APKBUILD20
-rw-r--r--main/inih/APKBUILD4
-rw-r--r--main/iperf/APKBUILD2
-rw-r--r--main/iproute2/APKBUILD4
-rw-r--r--main/iptables/APKBUILD4
-rw-r--r--main/iptables/iptables.initd14
-rw-r--r--main/ircii/APKBUILD8
-rw-r--r--main/irqbalance/APKBUILD4
-rw-r--r--main/irssi/APKBUILD8
-rw-r--r--main/irssi/glib-2-63.patch38
-rw-r--r--main/iso-codes/APKBUILD6
-rw-r--r--main/itstool/APKBUILD8
-rw-r--r--main/jack/APKBUILD9
-rw-r--r--main/jansson/APKBUILD4
-rw-r--r--main/kamailio/APKBUILD8
-rw-r--r--main/kamailio/tm-proper-fill-of-From-To-URI-tag-values-using-parsed.patch73
-rw-r--r--main/knot/APKBUILD4
-rw-r--r--main/lcms2/APKBUILD3
-rw-r--r--main/ldb/APKBUILD8
-rw-r--r--main/less/APKBUILD4
-rw-r--r--main/libassuan/APKBUILD4
-rw-r--r--main/libbsd/APKBUILD20
-rw-r--r--main/libbsd/disable-fpurge-test.patch11
-rw-r--r--main/libcap/APKBUILD4
-rw-r--r--main/libde265/APKBUILD14
-rw-r--r--main/libde265/disable-tools.patch39
-rw-r--r--main/libde265/export-only-decoder-api.patch10
-rw-r--r--main/libde265/use-new-ffmpeg-enum-names.patch25
-rw-r--r--main/libdrm/APKBUILD4
-rw-r--r--main/libeconf/APKBUILD4
-rw-r--r--main/libepoxy/APKBUILD4
-rw-r--r--main/libevent/APKBUILD2
-rw-r--r--main/libgcrypt/APKBUILD4
-rw-r--r--main/libgpg-error/APKBUILD4
-rw-r--r--main/libical/APKBUILD4
-rw-r--r--main/libimagequant/APKBUILD4
-rw-r--r--main/libjpeg-turbo/APKBUILD6
-rw-r--r--main/libksba/APKBUILD4
-rw-r--r--main/libmaxminddb/APKBUILD6
-rw-r--r--main/libmd/APKBUILD34
-rw-r--r--main/libretls/APKBUILD41
-rw-r--r--main/libretls/test_program.c (renamed from main/libtls-standalone/test_program.c)0
-rw-r--r--main/librsync/APKBUILD8
-rw-r--r--main/librsync/Fix-heap-corruption-from-too-small-kbloom.patch23
-rw-r--r--main/libseccomp/APKBUILD17
-rw-r--r--main/libsecret/APKBUILD2
-rw-r--r--main/libsndfile/APKBUILD2
-rw-r--r--main/libtls-standalone/APKBUILD68
-rw-r--r--main/libtls-standalone/Makefile86
-rw-r--r--main/libtls-standalone/libtls-ciphers.patch17
-rw-r--r--main/libtls-standalone/openssl-1.1.0-asn1-string.patch31
-rw-r--r--main/libtls-standalone/openssl-1.1.0-bio-method.patch107
-rw-r--r--main/libtls-standalone/openssl-1.1.0-verify-param.patch50
-rw-r--r--main/libtls-standalone/openssl-1.1.0-x509-object.patch40
-rw-r--r--main/libtls-standalone/tls_compat.c369
-rw-r--r--main/libtls-standalone/tls_compat.h23
-rw-r--r--main/libucontext/APKBUILD4
-rw-r--r--main/libunistring/APKBUILD7
-rw-r--r--main/liburing/APKBUILD4
-rw-r--r--main/libva/APKBUILD4
-rw-r--r--main/libverto/APKBUILD12
-rw-r--r--main/libwebsockets/APKBUILD7
-rw-r--r--main/libxaw/APKBUILD10
-rw-r--r--main/libxcb/APKBUILD2
-rw-r--r--main/libxkbcommon/APKBUILD6
-rw-r--r--main/libxml2/APKBUILD5
-rw-r--r--main/libxml2/python-3.9.patch92
-rw-r--r--main/links/APKBUILD8
-rw-r--r--main/linux-firmware/APKBUILD23
-rw-r--r--main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch14
-rw-r--r--main/linux-headers/APKBUILD8
-rw-r--r--main/linux-lts/APKBUILD39
-rw-r--r--main/linux-lts/ampere-mt-jade.patch600
-rw-r--r--main/linux-lts/config-lts.aarch6438
-rw-r--r--main/linux-lts/config-lts.armv745
-rw-r--r--main/linux-lts/config-lts.mips6433
-rw-r--r--main/linux-lts/config-lts.ppc64le23
-rw-r--r--main/linux-lts/config-lts.s390x16
-rw-r--r--main/linux-lts/config-lts.x8639
-rw-r--r--main/linux-lts/config-lts.x86_6440
-rw-r--r--main/linux-lts/config-virt.aarch6412
-rw-r--r--main/linux-lts/config-virt.armv712
-rw-r--r--main/linux-lts/config-virt.ppc64le12
-rw-r--r--main/linux-lts/config-virt.x8613
-rw-r--r--main/linux-lts/config-virt.x86_6417
-rw-r--r--main/linux-rpi/APKBUILD6
-rw-r--r--main/llvm10/APKBUILD4
-rw-r--r--main/llvm11/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch22
-rw-r--r--main/llvm11/APKBUILD287
-rw-r--r--main/llvm11/fix-LLVMConfig-cmake-install-prefix.patch24
-rw-r--r--main/llvm11/fix-memory-mf_exec-on-aarch64.patch25
-rw-r--r--main/lmdb/APKBUILD4
-rw-r--r--main/lttng-ust/APKBUILD6
-rw-r--r--main/lua-ldap/APKBUILD8
-rw-r--r--main/lua-luaxml/APKBUILD23
-rw-r--r--main/lua-sec/APKBUILD4
-rw-r--r--main/lua-unit/APKBUILD2
-rw-r--r--main/lua5.4/APKBUILD4
-rw-r--r--main/lxc-templates-legacy/APKBUILD6
-rw-r--r--main/lxc-templates-legacy/alpine-skip-mknod-when-existing.patch50
-rw-r--r--main/lxc/APKBUILD7
-rw-r--r--main/man-pages/APKBUILD4
-rw-r--r--main/mbedtls/APKBUILD9
-rw-r--r--main/mc/APKBUILD6
-rw-r--r--main/mercurial/APKBUILD78
-rw-r--r--main/mercurial/blacklist.txt112
-rw-r--r--main/mesa/APKBUILD34
-rw-r--r--main/mesa/add-use-elf-tls.patch16
-rw-r--r--main/meson/APKBUILD28
-rw-r--r--main/mksh/APKBUILD6
-rw-r--r--main/monit/APKBUILD4
-rw-r--r--main/mosh/APKBUILD2
-rw-r--r--main/mosquitto/APKBUILD6
-rw-r--r--main/mpg123/APKBUILD8
-rw-r--r--main/mtools/APKBUILD4
-rw-r--r--main/multipath-tools/APKBUILD13
-rw-r--r--main/musl/APKBUILD10
-rw-r--r--main/musl/syscall-cp-epoll.patch16
-rw-r--r--main/nagios-plugins/APKBUILD4
-rw-r--r--main/nagios-plugins/check_mysql_query-fix-use-after-free.patch33
-rw-r--r--main/nagios/APKBUILD8
-rw-r--r--main/nagios/cgi-pairlist-truncation-fix.patch14
-rw-r--r--main/nano/APKBUILD4
-rw-r--r--main/ncurses/APKBUILD4
-rw-r--r--main/net-snmp/APKBUILD18
-rw-r--r--main/net-snmp/Prevent-parsing-IP-address-twice.patch47
-rw-r--r--main/nettle/APKBUILD8
-rw-r--r--main/nftables/APKBUILD6
-rw-r--r--main/nftables/nftables.nft8
-rw-r--r--main/nginx/APKBUILD14
-rw-r--r--main/nginx/nginx.post-install3
-rw-r--r--main/nodejs/APKBUILD46
-rw-r--r--main/nodejs/nodejs.post-upgrade26
-rw-r--r--main/npm/APKBUILD118
-rw-r--r--main/npm/dont-check-for-last-version.patch18
-rw-r--r--main/npm/make-dont-install-deps.patch11
-rw-r--r--main/npm/npmrc6
-rw-r--r--main/npm/reproducible-documentation-build.patch20
-rw-r--r--main/npm/smoke-tests-npm-location.patch23
-rw-r--r--main/nsd/APKBUILD11
-rw-r--r--main/nsd/config.patch21
-rw-r--r--main/nspr/APKBUILD4
-rw-r--r--main/oniguruma/APKBUILD6
-rw-r--r--main/open-iscsi/APKBUILD4
-rw-r--r--main/openjpeg/APKBUILD10
-rw-r--r--main/openldap/APKBUILD26
-rw-r--r--main/openldap/CVE-2021-27212.patch25
-rw-r--r--main/openntpd/APKBUILD6
-rw-r--r--main/openrc/0012-gcc-10.patch48
-rw-r--r--main/openrc/0013-fix-osclock.patch39
-rw-r--r--main/openrc/APKBUILD10
-rw-r--r--main/openssh/2e0beff67def2120f4b051b1016d7fbf84823e78.patch23
-rw-r--r--main/openssh/APKBUILD18
-rw-r--r--main/openssh/d9e727dcc04a52caaac87543ea1d230e9e6b5604.patch30
-rw-r--r--main/openssh/sshd.confd18
-rw-r--r--main/openssh/sshd.initd42
-rw-r--r--main/openssl/APKBUILD7
-rw-r--r--main/openvpn/APKBUILD11
-rw-r--r--main/ortp/APKBUILD6
-rw-r--r--main/pango/APKBUILD6
-rw-r--r--main/parallel/APKBUILD4
-rw-r--r--main/perl-cpanel-json-xs/APKBUILD4
-rw-r--r--main/perl-crypt-openssl-guess/APKBUILD41
-rw-r--r--main/perl-crypt-rijndael/APKBUILD4
-rw-r--r--main/perl-crypt-x509/APKBUILD6
-rw-r--r--main/perl-data-hexdump/APKBUILD11
-rw-r--r--main/perl-datetime-locale/APKBUILD6
-rw-r--r--main/perl-devel-overloadinfo/APKBUILD13
-rw-r--r--main/perl-digest-hmac/APKBUILD36
-rw-r--r--main/perl-digest-md5/APKBUILD6
-rw-r--r--main/perl-file-which/APKBUILD40
-rw-r--r--main/perl-html-parser/APKBUILD29
-rw-r--r--main/perl-http-message/APKBUILD4
-rw-r--r--main/perl-inc-latest/APKBUILD4
-rw-r--r--main/perl-io-async/APKBUILD1
-rw-r--r--main/perl-io-socket-ssl/APKBUILD4
-rw-r--r--main/perl-javascript-minifier/APKBUILD5
-rw-r--r--main/perl-libwww/APKBUILD6
-rw-r--r--main/perl-mail-authenticationresults/APKBUILD5
-rw-r--r--main/perl-net-async-http/APKBUILD6
-rw-r--r--main/perl-net-cidr-lite/APKBUILD30
-rw-r--r--main/perl-net-cidr/APKBUILD21
-rw-r--r--main/perl-net-dns/APKBUILD4
-rw-r--r--main/perl-net-http/APKBUILD4
-rw-r--r--main/perl-net-server/APKBUILD6
-rw-r--r--main/perl-pod-parser/APKBUILD4
-rw-r--r--main/perl-posix-strftime-compiler/APKBUILD28
-rw-r--r--main/perl-posix-strftime-compiler/change-timezone-name.patch12
-rw-r--r--main/perl-scalar-list-utils/APKBUILD6
-rw-r--r--main/perl-socket/APKBUILD6
-rw-r--r--main/perl-sys-hostname-long/APKBUILD13
-rw-r--r--main/perl-test-fork/APKBUILD4
-rw-r--r--main/perl-tk/APKBUILD35
-rw-r--r--main/perl-type-tiny/APKBUILD6
-rw-r--r--main/perl-universal-require/APKBUILD35
-rw-r--r--main/perl-uri/APKBUILD4
-rw-r--r--main/pjproject/APKBUILD4
-rw-r--r--main/pkgconf/APKBUILD4
-rw-r--r--main/poppler/APKBUILD6
-rw-r--r--main/postfix/APKBUILD4
-rw-r--r--main/postgresql-bdr/APKBUILD2
-rw-r--r--main/postgresql-pllua/APKBUILD2
-rw-r--r--main/postgresql/APKBUILD40
-rw-r--r--main/postgresql/postgresql.initd11
-rw-r--r--main/powertop/APKBUILD4
-rw-r--r--main/privoxy/APKBUILD30
-rw-r--r--main/privoxy/privoxy-alpine.patch16
-rw-r--r--main/protobuf-c/APKBUILD21
-rw-r--r--main/protobuf/APKBUILD18
-rw-r--r--main/protobuf/musl-fix.patch6
-rw-r--r--main/protobuf/ruby-fix-cflags.patch9
-rw-r--r--main/protobuf/skip-failing-tests.patch83
-rw-r--r--main/protobuf/trim-rakefile.patch14
-rw-r--r--main/pspg/APKBUILD4
-rw-r--r--main/psqlodbc/APKBUILD10
-rw-r--r--main/pssh/APKBUILD2
-rw-r--r--main/putty/APKBUILD10
-rw-r--r--main/putty/fix-ppc64le-disable-werror.patch13
-rw-r--r--main/py3-alabaster/APKBUILD2
-rw-r--r--main/py3-appdirs/APKBUILD2
-rw-r--r--main/py3-asn1/APKBUILD2
-rw-r--r--main/py3-asn1crypto/APKBUILD2
-rw-r--r--main/py3-atomicwrites/APKBUILD2
-rw-r--r--main/py3-attrs/APKBUILD2
-rw-r--r--main/py3-babel/APKBUILD2
-rw-r--r--main/py3-bcrypt/APKBUILD2
-rw-r--r--main/py3-cairo/APKBUILD2
-rw-r--r--main/py3-certifi/APKBUILD2
-rw-r--r--main/py3-cffi/APKBUILD2
-rw-r--r--main/py3-chardet/APKBUILD2
-rw-r--r--main/py3-coverage/APKBUILD2
-rw-r--r--main/py3-cparser/APKBUILD2
-rw-r--r--main/py3-cryptography/APKBUILD2
-rw-r--r--main/py3-dbus/APKBUILD2
-rw-r--r--main/py3-distlib/APKBUILD4
-rw-r--r--main/py3-dnspython/APKBUILD2
-rw-r--r--main/py3-docutils/APKBUILD6
-rw-r--r--main/py3-elftools/APKBUILD2
-rw-r--r--main/py3-extras/APKBUILD2
-rw-r--r--main/py3-filelock/APKBUILD2
-rw-r--r--main/py3-fixtures/APKBUILD12
-rw-r--r--main/py3-funcsigs/APKBUILD2
-rw-r--r--main/py3-future/APKBUILD2
-rw-r--r--main/py3-gobject3/APKBUILD4
-rw-r--r--main/py3-hypothesis/APKBUILD9
-rw-r--r--main/py3-idna/APKBUILD2
-rw-r--r--main/py3-imagesize/APKBUILD2
-rw-r--r--main/py3-iniconfig/APKBUILD2
-rw-r--r--main/py3-iso8601/APKBUILD2
-rw-r--r--main/py3-jinja2/APKBUILD6
-rw-r--r--main/py3-lxc/APKBUILD2
-rw-r--r--main/py3-mako/APKBUILD4
-rw-r--r--main/py3-markdown/APKBUILD6
-rw-r--r--main/py3-markupsafe/APKBUILD2
-rw-r--r--main/py3-meld3/APKBUILD2
-rw-r--r--main/py3-mimeparse/APKBUILD2
-rw-r--r--main/py3-mock/APKBUILD7
-rw-r--r--main/py3-monotonic/APKBUILD2
-rw-r--r--main/py3-more-itertools/APKBUILD2
-rw-r--r--main/py3-olefile/APKBUILD2
-rw-r--r--main/py3-ordered-set/APKBUILD13
-rw-r--r--main/py3-packaging/APKBUILD2
-rw-r--r--main/py3-paramiko/APKBUILD4
-rw-r--r--main/py3-parsing/APKBUILD13
-rw-r--r--main/py3-pbr/APKBUILD6
-rw-r--r--main/py3-pexpect/APKBUILD2
-rw-r--r--main/py3-pillow/APKBUILD15
-rw-r--r--main/py3-pluggy/0001-remove-setuptools_scm.patch13
-rw-r--r--main/py3-pluggy/APKBUILD17
-rw-r--r--main/py3-ply/APKBUILD17
-rw-r--r--main/py3-pretend/APKBUILD2
-rw-r--r--main/py3-ptyprocess/APKBUILD2
-rw-r--r--main/py3-py/0001-remove-setuptools_scm.patch22
-rw-r--r--main/py3-py/APKBUILD28
-rw-r--r--main/py3-pygments/APKBUILD10
-rw-r--r--main/py3-pynacl/APKBUILD25
-rw-r--r--main/py3-pytest/0001-remove-setuptools_scm.patch31
-rw-r--r--main/py3-pytest/APKBUILD19
-rw-r--r--main/py3-requests/APKBUILD2
-rw-r--r--main/py3-setuptools/APKBUILD9
-rw-r--r--main/py3-six/APKBUILD2
-rw-r--r--main/py3-snowballstemmer/APKBUILD2
-rw-r--r--main/py3-sortedcontainers/APKBUILD2
-rw-r--r--main/py3-sphinx/APKBUILD4
-rw-r--r--main/py3-sphinx_rtd_theme/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-applehelp/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-devhelp/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-htmlhelp/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-jsmath/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-qthelp/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-serializinghtml/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-websupport/APKBUILD2
-rw-r--r--main/py3-tappy/APKBUILD2
-rw-r--r--main/py3-testtools/APKBUILD8
-rw-r--r--main/py3-testtools/traceback2.patch10
-rw-r--r--main/py3-toml/APKBUILD2
-rw-r--r--main/py3-tz/APKBUILD11
-rw-r--r--main/py3-urllib3/APKBUILD8
-rw-r--r--main/py3-virtualenv/APKBUILD4
-rw-r--r--main/py3-wcwidth/APKBUILD2
-rw-r--r--main/py3-wheel/APKBUILD33
-rw-r--r--main/py3-wheel/use-system-packaging.patch21
-rw-r--r--main/py3-yaml/APKBUILD8
-rw-r--r--main/python3/APKBUILD53
-rw-r--r--main/python3/bpo-43112.patch211
-rw-r--r--main/python3/custom-bluetooth-h-path.patch25
-rw-r--r--main/python3/ece5dfd403dac211f8d3c72701fe7ba7b7aa5b5f.patch186
-rw-r--r--main/python3/fix-xattrs-glibc.patch10
-rw-r--r--main/python3/test_nntplib.patch34
-rw-r--r--main/raspberrypi-bootloader/APKBUILD4
-rw-r--r--main/rdiff-backup/0002-remove-setuptools_scm.patch18
-rw-r--r--main/rdiff-backup/APKBUILD9
-rw-r--r--main/re2c/APKBUILD13
-rw-r--r--main/redis/APKBUILD7
-rw-r--r--main/rng-tools/01-fix-jitter-format-warning.patch22
-rw-r--r--main/rng-tools/02-fix-list-for-enabled-sources.patch62
-rw-r--r--main/rng-tools/APKBUILD15
-rw-r--r--main/ruby-bundler/APKBUILD26
-rw-r--r--main/ruby-bundler/manpages.patch30
-rw-r--r--main/ruby/APKBUILD20
-rw-r--r--main/ruby/remove-broken-autoconf-section.patch30
-rw-r--r--main/s390-tools/0002-musl-fixes.patch2
-rw-r--r--main/s390-tools/0009-link-libexecinfo.patch2
-rw-r--r--main/s390-tools/0300-disable-program-using-gnu-ext.patch2
-rw-r--r--main/s390-tools/0400-busybox-compat.patch27
-rw-r--r--main/s390-tools/0500-remove-lib64.patch74
-rw-r--r--main/s390-tools/APKBUILD24
-rw-r--r--main/s390-tools/argz.patch21
-rw-r--r--main/s390-tools/iucvterm-gettext.patch11
-rw-r--r--main/s390-tools/zkey-ekmfweb-install.patch11
-rw-r--r--main/s6-dns/APKBUILD4
-rw-r--r--main/s6-linux-init/APKBUILD4
-rw-r--r--main/s6-linux-utils/APKBUILD4
-rw-r--r--main/s6-networking/APKBUILD4
-rw-r--r--main/s6-portable-utils/APKBUILD4
-rw-r--r--main/s6-rc/APKBUILD6
-rw-r--r--main/s6/APKBUILD4
-rw-r--r--main/samba/APKBUILD19
-rw-r--r--main/samurai/APKBUILD17
-rw-r--r--main/samurai/CVE-2021-30218.patch29
-rw-r--r--main/samurai/CVE-2021-30219.patch26
-rw-r--r--main/scons/APKBUILD2
-rw-r--r--main/seabios/APKBUILD2
-rw-r--r--main/skalibs/APKBUILD6
-rw-r--r--main/softhsm/APKBUILD3
-rw-r--r--main/source-highlight/APKBUILD32
-rw-r--r--main/spamassassin/APKBUILD10
-rw-r--r--main/speedtest-cli/APKBUILD6
-rw-r--r--main/spirv-headers/APKBUILD4
-rw-r--r--main/spirv-tools/APKBUILD4
-rw-r--r--main/sqlite-tcl/APKBUILD4
-rw-r--r--main/sqlite/APKBUILD6
-rw-r--r--main/squid/APKBUILD4
-rw-r--r--main/sshguard/APKBUILD4
-rw-r--r--main/strace/APKBUILD4
-rw-r--r--main/strongswan/APKBUILD2
-rw-r--r--main/subunit/APKBUILD7
-rw-r--r--main/subversion/APKBUILD2
-rw-r--r--main/sudo/APKBUILD9
-rw-r--r--main/supervisor/APKBUILD2
-rw-r--r--main/swig/APKBUILD2
-rw-r--r--main/sysfsutils/gcc-10.patch31
-rw-r--r--main/syslinux/APKBUILD4
-rwxr-xr-xmain/syslinux/update-extlinux28
-rw-r--r--main/syslog-ng/APKBUILD2
-rw-r--r--main/talloc/APKBUILD2
-rw-r--r--main/tar/APKBUILD2
-rw-r--r--main/tcpflow/APKBUILD2
-rw-r--r--main/tdb/APKBUILD2
-rw-r--r--main/terminus-font/APKBUILD19
-rw-r--r--main/tevent/APKBUILD2
-rw-r--r--main/thin-provisioning-tools/APKBUILD2
-rw-r--r--main/tiff/APKBUILD9
-rw-r--r--main/tig/APKBUILD10
-rw-r--r--main/tig/time_t.patch33
-rw-r--r--main/tinyproxy/APKBUILD19
-rw-r--r--main/tinyproxy/tinyproxy.initd36
-rwxr-xr-xmain/tinyproxy/tinyproxy.pre-install2
-rw-r--r--main/tmux/APKBUILD4
-rw-r--r--main/ttf-ubuntu-font-family/45-ubuntu.conf26
-rw-r--r--main/ttf-ubuntu-font-family/90-tt-ubuntu.conf71
-rw-r--r--main/ttf-ubuntu-font-family/APKBUILD46
-rw-r--r--main/u-boot/APKBUILD14
-rw-r--r--main/ucarp/APKBUILD4
-rw-r--r--main/umurmur/APKBUILD4
-rw-r--r--main/unbound/APKBUILD2
-rw-r--r--main/unifont/APKBUILD6
-rw-r--r--main/unrar/APKBUILD8
-rw-r--r--main/userspace-rcu/APKBUILD2
-rw-r--r--main/util-linux/APKBUILD10
-rw-r--r--main/utmps/0001-add-stub-utmp.h.patch2
-rw-r--r--main/utmps/APKBUILD10
-rw-r--r--main/utmps/utmpd.initd11
-rw-r--r--main/utmps/wtmpd.initd16
-rw-r--r--main/uwsgi/APKBUILD2
-rw-r--r--main/vala/APKBUILD4
-rw-r--r--main/valgrind/APKBUILD8
-rw-r--r--main/valgrind/activate-musl-supp.patch12
-rw-r--r--main/varnish/APKBUILD4
-rw-r--r--main/vde2/APKBUILD2
-rw-r--r--main/vim/APKBUILD12
-rw-r--r--main/vim/posix-shell-redirection.patch71
-rw-r--r--main/wireguard-tools/APKBUILD4
-rw-r--r--main/wireless-regdb/APKBUILD4
-rw-r--r--main/wpa_supplicant/APKBUILD6
-rw-r--r--main/xcb-proto/APKBUILD2
-rw-r--r--main/xen/APKBUILD15
-rw-r--r--main/xen/xenconsoled.initd6
-rw-r--r--main/xen/xendomains.initd2
-rw-r--r--main/xen/xendriverdomain.initd4
-rw-r--r--main/xen/xenqemu.initd6
-rw-r--r--main/xen/xenstored.initd6
-rw-r--r--main/xfsprogs/APKBUILD10
-rw-r--r--main/xfsprogs/missing-signal.h.patch12
-rw-r--r--main/xkbcomp/APKBUILD4
-rw-r--r--main/xorgproto/APKBUILD6
-rw-r--r--main/xtables-addons-lts/APKBUILD8
-rw-r--r--main/xtables-addons/APKBUILD4
-rw-r--r--main/zfs-lts/APKBUILD6
-rw-r--r--main/zfs-rpi/APKBUILD2
-rw-r--r--main/zfs/APKBUILD2
-rw-r--r--main/zsh/APKBUILD15
-rw-r--r--main/zstd/APKBUILD29
649 files changed, 6552 insertions, 5647 deletions
diff --git a/main/abuild/0001-feat-abuild-add-support-for-pyX.Y-providers.patch b/main/abuild/0001-feat-abuild-add-support-for-pyX.Y-providers.patch
new file mode 100644
index 0000000000..b41cc5b314
--- /dev/null
+++ b/main/abuild/0001-feat-abuild-add-support-for-pyX.Y-providers.patch
@@ -0,0 +1,104 @@
+From ac3ee42458ebb6204c75135cbeb30201777e4116 Mon Sep 17 00:00:00 2001
+From: Leo <thinkabit.ukim@gmail.com>
+Date: Thu, 8 Aug 2019 19:01:39 -0300
+Subject: [PATCH 1/2] feat(abuild): add support for pyX.Y providers
+
+Now all python packages that install python modules under
+/usr/lib/pythonX.Y/site-packages will have a provider that indicates
+their MAJOR (X) and MINOR (Y) versions.
+
+pyX maps to the MAJOR version of the package, its objective is to allow
+users to quickly install a python module without having to search around
+for the correct package, doing `apk add py3.9:foo` will install whatever
+packages provides the foo module.
+
+The directories checked only go one level deep, so
+'/usr/lib/python3.9/site-packages/date' will generate
+py3:date=$pkgver-r$pkgrel.
+
+files ending with .py also count and are added with their .py prefix
+stripped away. so '/usr/lib/python3.9/site-packages/six.py' will
+generate py3:six=$pkgver-r$pkgrel.
+
+The reason for doing this is the same as creating pc:, so: and cmd:, it
+is more reliable and robust to depened on what we known of what the package
+provides than to try to guess via the pkgname.
+
+Co-authored-by: Chloe Kudryavtsev <toast@toast.cafe>
+---
+ abuild.in | 45 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 45 insertions(+)
+
+diff --git a/abuild.in b/abuild.in
+index 303834c..aad4223 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -1225,6 +1225,46 @@ prepare_command_provides() {
+ done
+ }
+
++prepare_py_provides() {
++ local dir="${subpkgdir:-$pkgdir}" py_providers=""
++ options_has "!tracedeps" && return 0
++ cd "$dir" || return 1
++
++ # Find all directories under site-packages, ignore __pycache__ and
++ # .egg-info packages, store the basename with the proper pyX.Y prefix
++ # one per-line
++ py_providers="$(find 'usr/lib/python'*/site-packages \
++ -print0 -mindepth 1 -maxdepth 1 \
++ -type f -iname '*.py' -o -type d \
++ 2>/dev/null | xargs -0 -I '{}' sh -c '
++ d="{}"
++
++ # Check if we were given a directory then check if there
++ # is a file called __init__.py inside, this is required
++ # to import modules, if there is no __init__.py then the
++ # installed directory is not actually a module, this is a
++ # special case for packages that use c-extensions and
++ # install their .c and .h files to $sitelib.
++ if [ -d "$d" ] && [ ! -f "$d"/__init__.py ]; then
++ exit 0
++ fi
++
++ # Find out which version of python we are building for
++ # this will find out by looking at the MAJOR and MINOR
++ # versions in /usr/lib/pythonMAJOR.MINOR
++ pyver="${d##*usr/lib/python}"
++ pyver="${pyver%%/*}"
++
++ # Strip the .py prefix if it exists
++ d="${d%%.py*}"
++
++ echo "py$pyver:${d##*/}"
++ ')"
++ local i; for i in $py_providers; do
++ echo "$i=$pkgver-r$pkgrel" >> "$controldir"/.provides-py
++ done
++}
++
+ # check if dir has arch specific binaries
+ dir_has_arch_binaries() {
+ local dir="$1"
+@@ -1294,6 +1334,7 @@ prepare_package() {
+ && prepare_symlinks \
+ && prepare_pkgconfig_provides \
+ && prepare_command_provides \
++ && prepare_py_provides \
+ || return 1
+ archcheck
+ }
+@@ -1447,6 +1488,10 @@ trace_apk_deps() {
+ sed 's/^/provides = cmd:/' "$dir"/.provides-command | sort -u \
+ >> "$dir"/.PKGINFO
+ fi
++ if [ -f "$dir"/.provides-py ]; then
++ sed 's/^/provides = /' "$dir"/.provides-py | sort -u \
++ >> "$dir"/.PKGINFO
++ fi
+ [ -z "$autodeps" ] && return 0
+ for i in $autodeps; do
+ echo "depend = $i"
+--
+2.31.1
+
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index e88996ba2b..3252e9ce19 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=abuild
-pkgver=3.7.0
+pkgver=3.8.0_rc2
_ver=${pkgver%_git*}
pkgrel=1
pkgdesc="Script to build Alpine Packages"
@@ -27,6 +27,7 @@ subpackages="
options="suid"
pkggroups="abuild"
source="https://git.alpinelinux.org/abuild/snapshot/abuild-$pkgver.tar.xz
+ 0001-feat-abuild-add-support-for-pyX.Y-providers.patch
"
builddir="$srcdir"/abuild-$pkgver
@@ -83,4 +84,7 @@ _rootbld() {
mkdir -p "$subpkgdir"
}
-sha512sums="455371b11626b67ac96df780dd80d074eabdfd942bccc5736cb4f58e8a55f0cf79edba11792e43fa0608803726aaa902a5718dd8d756a8099a76c4720ea0248f abuild-3.7.0.tar.xz"
+sha512sums="
+8e272666403ffb11a6d565e271754fa7b7ce90f5e746c8f5bd80694ece6786a12d27372d25880fe07e03bef18b3690e89e7a5a761766599a575c8db07e365b65 abuild-3.8.0_rc2.tar.xz
+3cb6d4f5ad4f68924115562a20c9ea5cc728f1378a5c884a923b4dcb8260d0b9126c47f69d6b3588abba7cfdb3c45b857d757d4f82437d94ab022be4ed1b0c06 0001-feat-abuild-add-support-for-pyX.Y-providers.patch
+"
diff --git a/main/ack/APKBUILD b/main/ack/APKBUILD
index 60b3231f6c..cd3466f8b9 100644
--- a/main/ack/APKBUILD
+++ b/main/ack/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ack
-pkgver=3.4.0
+pkgver=3.5.0
pkgrel=0
pkgdesc="A Perl-powered replacement for grep"
url="https://beyondgrep.com/"
@@ -28,4 +28,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="cc8de5a784f63a8f48b9548e930972578866d0fcc520febc6002d1ce4f9b55aabb0c8e87860586a668d94b5091c66194c05a07c584fe30fad2c5d786aee95db5 ack-v3.4.0.tar.gz"
+sha512sums="f5b9321fc62cf2ab86fa7dc933dd44245314ebd26bee2d8769f85c15fc8b4493d0757ca4430708f0ebea5692f9c73ad17cc00bc46d1f611b8489b30811df307d ack-v3.5.0.tar.gz"
diff --git a/main/acpica/APKBUILD b/main/acpica/APKBUILD
index c28a3ac3a8..6dbec75f36 100644
--- a/main/acpica/APKBUILD
+++ b/main/acpica/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Roger Pau Monne <roger.pau@entel.upc.edu>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=acpica
-pkgver=20200717
+pkgver=20210331
pkgrel=0
pkgdesc="ACPI Component Architecture utilities"
url="https://www.acpica.org"
@@ -10,7 +10,7 @@ license="GPL-2.0-only OR BSD-3-Clause OR Intel-ACPI"
makedepends="flex bison"
subpackages="iasl"
options="!check"
-source="acpica-unix-$pkgver.tar.gz::https://acpica.org/sites/acpica/files/acpica-unix-$pkgver.tar_0.gz
+source="acpica-unix-$pkgver.tar.gz::https://acpica.org/sites/acpica/files/acpica-unix-$pkgver.tar.gz
disable-werror.patch
"
@@ -29,5 +29,5 @@ iasl() {
mv "$pkgdir"/usr/bin/iasl "$subpkgdir"/usr/bin/
}
-sha512sums="16de55b97a3b478dd2dd44fcbe51b871c7cc6174d337939b873bcbc871bee10487a796aa86abaa7b54ff6b75279cdbf9ec48e19f6baaea4290daf1ad56bdbc46 acpica-unix-20200717.tar.gz
+sha512sums="f247162db70181b6c2b294dab2c7e220a7a125ae474ebeeea9243faca361b1ab392b62f58d66719bcb54f09e37ed533e9f68f56d9ea23976e41f274966207949 acpica-unix-20210331.tar.gz
1f5049568d612d4debf3690e0d918d8d56abbed14ade7b2e6282eba17b25934b695d1a9fe10f99469efe8d4382c4546481d0579afdf5cdb9695fcdc93559fbab disable-werror.patch"
diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index 2851e03439..a6ea35a536 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-baselayout
pkgver=3.2.0
-pkgrel=9
+pkgrel=13
pkgdesc="Alpine base dir structure and init scripts"
url="https://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
arch="all"
@@ -11,6 +11,7 @@ pkggroups="shadow"
options="!fhs !check"
install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade
$pkgname.post-install"
+_nbver=6.2
source="mkmntdirs.c
crontab
color_prompt
@@ -25,15 +26,16 @@ source="mkmntdirs.c
inittab
passwd
profile
- protocols
- services-$pkgver-$pkgrel::https://salsa.debian.org/md/netbase/-/raw/v6.1/etc/services
+ protocols-$_nbver::https://salsa.debian.org/md/netbase/-/raw/v$_nbver/etc/protocols
+ services-$_nbver::https://salsa.debian.org/md/netbase/-/raw/v$_nbver/etc/services
"
builddir="$srcdir/build"
prepare() {
default_prepare
mkdir -p "$builddir"
- mv "$srcdir"/services-$pkgver-$pkgrel "$srcdir"/services
+ mv "$srcdir"/protocols-$_nbver "$srcdir"/protocols
+ mv "$srcdir"/services-$_nbver "$srcdir"/services
}
build() {
@@ -222,7 +224,8 @@ package() {
ln -s /var/mail "$pkgdir"/var/spool/mail
}
-sha512sums="199a34716b1f029407b08679fed4fda58384a1ccefbbec9abe1c64f4a3f7ad2a89bc7c02fc19a7f791f7c6bb87f9f0c708cb3f18c027cb7f54f25976eba4b839 mkmntdirs.c
+sha512sums="
+199a34716b1f029407b08679fed4fda58384a1ccefbbec9abe1c64f4a3f7ad2a89bc7c02fc19a7f791f7c6bb87f9f0c708cb3f18c027cb7f54f25976eba4b839 mkmntdirs.c
6e169c0975a1ad1ad871a863e8ee83f053de9ad0b58d94952efa4c28a8c221445d9e9732ad8b52832a50919c2f39aa965a929b3d5b3f9e62f169e2b2e0813d82 crontab
7fcb5df98b0f19e609cb9444b2e6ca5ee97f5f308eb407436acdd0115781623fd89768a9285e9816e36778e565b6f27055f2a586a58f19d6d880de5446d263c4 color_prompt
b2fc9b72846a43a45ba9a8749e581cef34d1915836833b51b7919dfbf4e275b7d55fec4dea7b23df3796380910971a41331e53e8cf0d304834e3da02cc135e5a locale.sh
@@ -233,6 +236,7 @@ bfe947bdd69e7d93b32c8cb4e2cabe5717cb6c1e1f49a74015ac2cfb13e96d1f12c4be23ae93a1d6
abb391a9b5c2b418ad9ea15dcc373a0a0946e5e438d371d00d4bd6c8c60fa81613429a3b8d4313970dcc7eae527793a874c31a9b5a62706f450ab9bb9e8db405 group
fdab6f8fec2a556ab817d90a73635a927ea04dbc4e0470ed59ee6a62c87393f9534c9b746b09a776d938c25b8af9c9fb1686578e24f8307d1d074921ade1bdc7 inittab
06d12a7b9ca14fe17e412d0f24814620b67d035ae859be7906cbf4782dd69e359a6a555dafb98060b7fb7e4714aaa676c88d9017cded36e6d8398e23369bb290 passwd
-07a440966e54edadfd2da5d2817ecda0d4bb46a97db8a5799461dcf56c546619bf8676f2914e6484c158084827e2a022f875e9101bcd083673b72e78ff3446e3 profile
-f1548a2b5a107479446f15905f0f2fbf8762815b2215188d49d905c803786d35de6d98005dc0828fb2486b04aaa356f1216a964befddf1e72cb169656e23b6ac protocols
-680add49729cb9d88a03dfdd35c49784a951a18289adbf567f2126eb96b0378deca7b1d7999dac1579295466fca49e1cd5251341dd75da1a0f06f970ba8e0293 services-3.2.0-9"
+73cad571186f8c3202ca87af3d735d85b276a0e0c0877fc6f248de22a57f5995963173d6265dff42e0534c9dc96c2ad09bb21ded6add94dc01363382b95da10f profile
+eadc83e47fcc354ab83fd109bee452bda170886fb684e67faf615930c11480919505f4af60c685b124efc54af0ded9522663132f911eac6622144f8b4c8be695 protocols-6.2
+adfae0d2f569c2a2f413b7e27683a007fc8ca689b8c3349672fe0dcb6208c192ede4402eff09c604b7e7b4fd9d8df93b875efa5bdaa6c14ff1d8022a7caad5cd services-6.2
+"
diff --git a/main/alpine-baselayout/profile b/main/alpine-baselayout/profile
index f4482ce2d2..45caac1d92 100644
--- a/main/alpine-baselayout/profile
+++ b/main/alpine-baselayout/profile
@@ -1,7 +1,22 @@
-export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+export PATH="$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
export PAGER=less
umask 022
+# set up fallback default PS1
+: "${HOSTNAME:=$(hostname)}"
+PS1='${HOSTNAME%%.*}:$PWD'
+[ "$(id -u)" = "0" ] && PS1="${PS1}# "
+[ "$(id -u)" = "0" ] || PS1="${PS1}\$ "
+
+# use nicer PS1 for bash and busybox ash
+[ -n "$BASH_VERSION" -o "$BB_ASH_VERSION" ] && PS1='\h:\w\$ '
+
+# use nicer PS1 for zsh
+[ -n "$ZSH_VERSION" ] && PS1='%m:%~%# '
+
+# export PS1 as before
+export PS1
+
for script in /etc/profile.d/*.sh ; do
if [ -r $script ] ; then
. $script
diff --git a/main/amavis/APKBUILD b/main/amavis/APKBUILD
index 7b41bc8578..d55c588a27 100644
--- a/main/amavis/APKBUILD
+++ b/main/amavis/APKBUILD
@@ -1,8 +1,7 @@
-# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=amavis
pkgver=2.12.1
-pkgrel=0
+pkgrel=1
pkgdesc="High-performance interface between mailer (MTA) and content checkers"
url="https://gitlab.com/amavis/amavis"
arch="noarch !x86" # perl-db
@@ -23,47 +22,33 @@ subpackages="$pkgname-openrc"
source="https://gitlab.com/amavis/amavis/-/archive/v$pkgver/amavis-v$pkgver.tar.gz
amavisd.initd
amavisd.confd
+ amavisd-conf.patch
"
pkgusers="amavis"
pkggroups="amavis"
-
builddir="$srcdir"/$pkgname-v$pkgver
package() {
- cd "$builddir"
- (
- HOME=/var/amavis
- QUARANTINE=$HOME/quarantine
- USER=amavis
- GROUP=amavis
- DIRS="$HOME $HOME/tmp $HOME/var $HOME/db $HOME/home $QUARANTINE"
- CONFIG=/etc/amavisd.conf
+ _amavis_home=/var/amavis
- for dir in $DIRS
- do
- mkdir -p ${pkgdir}$dir
+ for dir in $_amavis_home/tmp \
+ $_amavis_home/var \
+ $_amavis_home/db \
+ $_amavis_home/home \
+ $_amavis_home/quarantine \
+ ; do
+ install -dm750 -o amavis -g amavis "${pkgdir}$dir"
done
- install -m 755 -o root -D amavisd $pkgdir/usr/sbin/amavisd
- install -m 755 -o root -D amavisd-nanny $pkgdir/usr/bin/amavisd-nanny
- install -m 755 -o root -D amavisd-release $pkgdir/usr/bin/amavisd-release
- sed -e "s:^.*\$MYHOME = .*$:\$MYHOME = '$HOME';:" \
- -e 's:^.*\$TEMPBASE = .*$:\$TEMPBASE = "\$MYHOME/tmp";:' \
- -e 's:^.*\$db_home = .*$:\$db_home = "$MYHOME/db";:' \
- -e "s:^.*\$QUARANTINEDIR = .*$:\$QUARANTINEDIR = '$QUARANTINE';:" \
- -e "s:^.*\$daemon_user = 'vscan';\(.*\)$:\$daemon_user = 'amavis';\1:" \
- -e "s:^.*\$daemon_group = 'vscan';\(.*\)$:\$daemon_group = 'amavis';\1:" < amavisd.conf > amavisd.conf.alpine
- install -m 640 -o root -D amavisd.conf.alpine ${pkgdir}${CONFIG}
- )
+ for file in amavisd amavisd-nanny amavisd-release amavisd.conf; do
+ install -Dm755 -o root -g amavis "$file" "$pkgdir/usr/sbin/$file"
+ done
install -Dm755 "$srcdir"/amavisd.initd "$pkgdir"/etc/init.d/amavisd
install -Dm644 "$srcdir"/amavisd.confd "$pkgdir"/etc/conf.d/amavisd
-
- chown -R amavis:amavis "$pkgdir"/var/amavis
- chmod -R 750 "$pkgdir"/var/amavis
- chown root:amavis "$pkgdir"/etc/amavisd.conf
}
sha512sums="33bcc8606e142ed390cb368a7c640f96b70ecd1c8473e7d19f3125f89afde7a044981b9e3704c722c54472f88b2e4e54c89bab19bc28ceb89561aeb8ede04c8e amavis-v2.12.1.tar.gz
6a9dd16a6b52f3d1fbd16887f29ccceddc58e88a02e681f23c1fe54b7e24feea5089d52813f4f3e87d9242daf79d2b2ea1e7c451d83d7de943403e71dc61c4e5 amavisd.initd
-a5ce3583c34197f335372728cf92da23bae2cd7a9ae48daff6eaadbf66fbd5be6bb8b480b0fce1ea2b3a662b0a54d1d2f1f277d2f9a06d9630b57fa5d7ac2635 amavisd.confd"
+a5ce3583c34197f335372728cf92da23bae2cd7a9ae48daff6eaadbf66fbd5be6bb8b480b0fce1ea2b3a662b0a54d1d2f1f277d2f9a06d9630b57fa5d7ac2635 amavisd.confd
+87f9c4489fb377e6e1315edcef75940b1a61a30c418106c1ef48eef4f425746333c550b270e0e6727fe89a68239f673f24392d81a53157ad487d3d2da1e95b4c amavisd-conf.patch"
diff --git a/main/amavis/amavisd-conf.patch b/main/amavis/amavisd-conf.patch
new file mode 100644
index 0000000000..708bd4a265
--- /dev/null
+++ b/main/amavis/amavisd-conf.patch
@@ -0,0 +1,33 @@
+--- a/amavisd.conf
++++ b/amavisd.conf
+@@ -17,15 +17,15 @@
+ # truncation in /proc/<pid>/stat and ps -e output
+
+ $max_servers = 2; # num of pre-forked children (2..30 is common), -m
+-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
+-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g
++$daemon_user = 'amavis'; # (no default; customary: vscan or amavis), -u
++$daemon_group = 'amavis'; # (no default; customary: vscan or amavis), -g
+
+ $mydomain = 'example.com'; # a convenient default for other settings
+
+-# $MYHOME = '/var/amavis'; # a convenient default for other settings, -H
+-$TEMPBASE = "$MYHOME/tmp"; # working directory, needs to exist, -T
++$MYHOME = '/var/amavis';
++$TEMPBASE = "$MYHOME/tmp";
+ $ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR, used by SA, etc.
+-$QUARANTINEDIR = '/var/virusmails'; # -Q
++$QUARANTINEDIR = '/var/amavis/quarantine';
+ # $quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine
+ # $release_format = 'resend'; # 'attach', 'plain', 'resend'
+ # $report_format = 'arf'; # 'attach', 'plain', 'resend', 'arf'
+@@ -44,7 +44,8 @@
+ $syslog_facility = 'mail'; # Syslog facility as a string
+ # e.g.: mail, daemon, user, local0, ... local7
+
+-$enable_db = 1; # enable use of BerkeleyDB/libdb (SNMP and nanny)
++# BDB is no longer supported in Alpine
++$enable_db = 0; # enable use of BerkeleyDB/libdb (SNMP and nanny)
+ # $enable_zmq = 1; # enable use of ZeroMQ (SNMP and nanny)
+ $nanny_details_level = 2; # nanny verbosity: 1: traditional, 2: detailed
+ $enable_dkim_verification = 1; # enable DKIM signatures verification
diff --git a/main/ansible-base/APKBUILD b/main/ansible-base/APKBUILD
index a1a5e5ba64..a856540dcb 100644
--- a/main/ansible-base/APKBUILD
+++ b/main/ansible-base/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=ansible-base
pkgver=2.10.5
-pkgrel=0
+pkgrel=1
pkgdesc="A configuration-management, deployment, task-execution, and multinode orchestration framework"
url="https://ansible.com/"
options="!check" # TODO: enable tests
diff --git a/main/ansible/APKBUILD b/main/ansible/APKBUILD
index c327018fb9..60fc6ef43c 100644
--- a/main/ansible/APKBUILD
+++ b/main/ansible/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=ansible
pkgver=2.10.6
-pkgrel=0
+pkgrel=1
pkgdesc="A configuration-management, deployment, task-execution, and multinode orchestration framework"
url="https://ansible.com/"
options="!check" # TODO: enable tests
diff --git a/main/apache2-mod-wsgi/APKBUILD b/main/apache2-mod-wsgi/APKBUILD
index 5f6fabb86e..86f60a086e 100644
--- a/main/apache2-mod-wsgi/APKBUILD
+++ b/main/apache2-mod-wsgi/APKBUILD
@@ -3,7 +3,7 @@
pkgname=apache2-mod-wsgi
_realname=mod_wsgi
pkgver=4.7.1
-pkgrel=0
+pkgrel=1
pkgdesc="Python WSGI Module for Apache2"
url="https://github.com/GrahamDumpleton/mod_wsgi"
arch="all"
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index ff8b7f4e33..ce30a3424d 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
-pkgver=2.12.3
+pkgver=2.12.5
pkgrel=0
pkgdesc="Alpine Package Keeper - package manager for alpine"
arch="all"
@@ -24,6 +24,9 @@ source="https://gitlab.alpinelinux.org/alpine/$pkgname/-/archive/v$pkgver/$pkgna
"
builddir="$srcdir/$pkgname-v$pkgver"
+# secfixes:
+# 2.12.5-r0:
+# - CVE-2021-30139
prepare() {
default_prepare
@@ -77,5 +80,5 @@ luaapk() {
mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/
}
-sha512sums="564e6ba560270e42845b0086c7a2c8cd9891865b4491f9a1c704ecb163c63435fdc21d5ccacc8af3a85e891fd3b647520fbf6dc5f20f1934c3a7d5f7a736ce51 apk-tools-v2.12.3.tar.gz
+sha512sums="478137f14617e97bdf79cd431812116b94270107d1473313fa94d5c258ed55c11234ad80cb6ba74e0134b0de0f25356d60f77966ecc5dbe5175415768718d1d8 apk-tools-v2.12.5.tar.gz
102e6d01a984fb7a84c9432f797e4d8d2c90e9570dd26208b8485569ab471ea88a2cc81eabd3b3f7e4c9685a37afc458dec172a65b03c19c78a7efb598c54f45 _apk"
diff --git a/main/asciidoc/APKBUILD b/main/asciidoc/APKBUILD
index c1f22d4d01..2a6e892c78 100644
--- a/main/asciidoc/APKBUILD
+++ b/main/asciidoc/APKBUILD
@@ -1,18 +1,18 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=asciidoc
-pkgver=9.0.5
+pkgver=9.1.0
pkgrel=0
pkgdesc="Text based documentation"
url="https://asciidoc.org/"
arch="noarch"
license="GPL-2.0-or-later and GPL-1.0-or-later"
-depends="python3 libxml2-utils docbook-xsl"
+depends="python3 libxml2-utils docbook-xsl source-highlight"
makedepends="autoconf automake"
subpackages="$pkgname-doc"
# There is a upstream-created tarball but it has depth=1 which unpacks
# everything into $srcdir instead of $srcdir/$pkgname-$pkgver
source="$pkgname-$pkgver.tar.gz::https://github.com/asciidoc/asciidoc-py3/archive/$pkgver.tar.gz"
-builddir="$srcdir/asciidoc-py3-$pkgver"
+builddir="$srcdir/asciidoc-py-$pkgver"
replaces="$pkgname-vim"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="5b79d74c1efd43a960e8a415d3a68f26dcd3a3eee748b830101cec69475b0af40de7ad190ae105cade8ee558a59a643d04f38c1be490d253e3a6740c347d94e3 asciidoc-9.0.5.tar.gz"
+sha512sums="c4565cfb30a8789ed64b7b9293019a6528eb93341ab109c9a6cb4985bf4a65117516e03b84340eb84ea07981650f50f52c0ae85eba2956fcbde23e46b3cf228e asciidoc-9.1.0.tar.gz"
diff --git a/main/asciidoctor/APKBUILD b/main/asciidoctor/APKBUILD
index 4a1cd6febf..4833db001b 100644
--- a/main/asciidoctor/APKBUILD
+++ b/main/asciidoctor/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Seung Soo Mun <hamletmun@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=asciidoctor
-pkgver=2.0.12
+pkgver=2.0.15
pkgrel=0
pkgdesc="Converter for AsciiDoc to HTML5, DocBook 5 (or 4.5) and other formats"
url="https://rubygems.org/gems/$pkgname"
@@ -33,4 +33,6 @@ package() {
done
}
-sha512sums="a927d052e4a2934524d8222700e83fbc746fa2b4880a810e39a579c1dff02054c83284a1c9e0af176709c0ab129677fcfcaa14c038ec124fb394852f38294db5 asciidoctor-2.0.12.gem"
+sha512sums="
+55ab7ceb85e219a36fdcb21d5620199e1d46281742cf52ce5892f36ee5db1119b535f488fae57aa360cbaee762f903d6bd957e3a65781eacd810b41eafcaa8f1 asciidoctor-2.0.15.gem
+"
diff --git a/main/asterisk/30-asterisk-mariadb.patch b/main/asterisk/30-asterisk-mariadb.patch
index ae9e1aa23b..4f50fff2e5 100644
--- a/main/asterisk/30-asterisk-mariadb.patch
+++ b/main/asterisk/30-asterisk-mariadb.patch
@@ -12,7 +12,7 @@ index 00c75dd..bc405bb 100644
#include <mysql/errmsg.h>
#include "asterisk/config.h"
-@@ -501,7 +502,7 @@ static int my_load_module(int reload)
+@@ -648,7 +649,7 @@ static int my_load_module(int reload)
res |= my_load_config_string(cfg, "global", "ssl_cert", &ssl_cert, "");
res |= my_load_config_string(cfg, "global", "ssl_key", &ssl_key, "");
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 5d9d7a718c..99640048a1 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Timo Teras <timo.teras@iki.fi>
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=asterisk
-pkgver=18.2.1
+pkgver=18.2.2
pkgrel=0
pkgdesc="Modular Open Source PBX System"
pkgusers="asterisk"
@@ -38,6 +38,8 @@ source="$_download/asterisk-$pkgver.tar.gz
asterisk.logrotate"
# secfixes:
+# 18.2.2-r0:
+# - CVE-2019-15297
# 18.2.1-r0:
# - CVE-2021-26712
# - CVE-2021-26713
@@ -137,6 +139,9 @@ package() {
chown -R asterisk:asterisk "$pkgdir"/var/*/asterisk
chown -R asterisk:asterisk "$pkgdir"/etc/asterisk
chmod -R u=rwX,g=rX,o= "$pkgdir"/etc/asterisk
+
+ # let alpine-baselayout set permissions of /tmp
+ rm -r "$pkgdir"/tmp
}
dev() {
@@ -185,11 +190,11 @@ sound_en() {
chown -R asterisk:asterisk "$subpkgdir"/var/*/asterisk
}
-sha512sums="9d7ab83059509dacfab85fdecbdecdb9a90d5da5e3e7f2dce3b49edbbcf5198e19afe8c23b6c4fa480285f00406e74e29bf16bb40cb90a96d03b3e6b315191f9 asterisk-18.2.1.tar.gz
+sha512sums="e15fe3c7f46d49991bcb6f6f565f15e4af0d658b4cd6b091079209dd95a8027858effdc2f2314d72ed46a73cdebc089d3c27d5cf8db50d2d21f3c317a8a4a546 asterisk-18.2.2.tar.gz
aacef3f4796fb1abd33266998b53909cb4b36e7cc5ad2f7bac68bdc43e9a9072d9a4e2e7e681bddfa31f3d04575eb248afe6ea95da780c67e4829c1e22adfe1b asterisk-addon-mp3-r201.patch.gz
771237ba6d42ab62d914f2702234b23fd0bc8c22f2aa33b0e745c9170163c8046f6d48ecb299faab3d6fb397f1aa046421083c3cc88510c9779861c522f357dd 10-musl-mutex-init.patch
0fae11b42894ab3d405bc50e9275b9084712b482fbf9b4259ea938667fc5cbe413655f3ff83da0f607151bb2b6e49c2f741b5ada6944dbb478f076ef8d86380a 20-musl-astmm-fix.patch
-a43239189a1170d23d8f99d7658d8e064d4cc8149dd92d68e80d7af7a8fe181e0b111860ab13f12a91172c1e7f370c1a86679081b9ced98f4932fdfc64f04a49 30-asterisk-mariadb.patch
+616de74bdd3c4a6e899128c73e31f5ff219095d2afe321f85a51f518ec2e9dac9b63396eed8e2568c295f1beb90f9a506c72d28211a973b35185bfffd24af37e 30-asterisk-mariadb.patch
ba33f11169284f190b7dabab1da7d2751cb65d7976408db635a892fa17d7552e1660350017e7aada3464ecc7d9d6e99d6ad76d66c0036de062a386cffbc948e6 40-asterisk-cdefs.patch
0044c5db468ec8f2385d18d476f89976f6d036448583a4ef8017ce7a6f8f72105337e6b20037ffe47f561d2877fc9c86720aef23ab037df89b36dc140a5924c4 asterisk.initd
ab6b6f08ff43268cbb1abb7ed7d678949991ba495682a644bbaeb017d6adbff0a43297905fd73ae8db1786a28d5b5904f1bc253209a0e388c8a27f26c6ce14ed asterisk.confd
diff --git a/main/at-spi2-core/APKBUILD b/main/at-spi2-core/APKBUILD
index 6773389348..17cead82bc 100644
--- a/main/at-spi2-core/APKBUILD
+++ b/main/at-spi2-core/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=at-spi2-core
-pkgver=2.38.0
+pkgver=2.40.0
pkgrel=0
pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
url="https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/"
@@ -27,4 +27,4 @@ package() {
rm -rf "$pkgdir"/usr/lib/systemd
}
-sha512sums="3a1eb27cff6e0dd03119b4f8361a3b6037b26c511e80e2d003d1d5c41fede6d49eb5e0ac1ee45cfb4f3ca8e53292a7e2da67df80be28e77014775e41777a96c1 at-spi2-core-2.38.0.tar.xz"
+sha512sums="45f9123dac27982003e4c5e357ddaf31dbe945ff334bf1a7d02e81011b841bd69c717233e8b2d33abb6cfe16320bfe5893499f25d9f603cde5d11d63315e8725 at-spi2-core-2.40.0.tar.xz"
diff --git a/main/attr/APKBUILD b/main/attr/APKBUILD
index 996f6499fe..c56e5ecb9d 100644
--- a/main/attr/APKBUILD
+++ b/main/attr/APKBUILD
@@ -1,27 +1,25 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=attr
-pkgver=2.4.48
+pkgver=2.5.1
pkgrel=0
-pkgdesc="Utilities for managing filesystem extended attributes"
+pkgdesc="utilities for managing filesystem extended attributes"
options="checkroot !check" # attr.test fails with no error message
url="https://savannah.nongnu.org/projects/attr"
arch="all"
license="GPL-2.0-or-later"
checkdepends="perl"
subpackages="$pkgname-dev $pkgname-doc lib$pkgname:libs"
-source="https://download.savannah.nongnu.org/releases/attr/attr-$pkgver.tar.gz
- fix-tests.patch
- "
+source="https://download.savannah.nongnu.org/releases/attr/attr-$pkgver.tar.gz"
build() {
- OPTIMIZER="${CFLAGS}" \
+ OPTIMIZER="$CFLAGS" \
DEBUG=-DNDEBUG \
INSTALL_USER=root \
INSTALL_GROUP=root \
./configure \
- --build=$CBUILD \
- --host=$CHOST \
+ --build="$CBUILD" \
+ --host="$CHOST" \
--prefix=/ \
--exec-prefix=/ \
--sbindir=/bin \
@@ -58,5 +56,4 @@ libs() {
default_libs
}
-sha512sums="75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923 attr-2.4.48.tar.gz
-2ff96b8822c4344035eef6e2edc632e9b7381876cbc2c7e0931dfb43af3b9383c0066f9b9d125c53e030a6bf542dc5ae988610bda250a261a39ee211f6208cf2 fix-tests.patch"
+sha512sums="8b4c043d61f8f3e0cd098e701181069f51117b85fd6ba18bfe9af77d894ea671232377d4793ffc822e9259ceee6ac71d75732eb93b2830c6cb5d0d918ba2d21b attr-2.5.1.tar.gz"
diff --git a/main/attr/fix-tests.patch b/main/attr/fix-tests.patch
deleted file mode 100644
index 54ca561a8f..0000000000
--- a/main/attr/fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/test/run b/test/run
-index 4b1f8d0..07e916c 100755
---- a/test/run
-+++ b/test/run
-@@ -106,7 +106,7 @@ for (;;) {
- if (defined $line) {
- # Substitute %VAR and %{VAR} with environment variables.
- $line =~ s[%(\w+)][$ENV{$1}]eg;
-- $line =~ s[%{(\w+)}][$ENV{$1}]eg;
-+ $line =~ s[%\{(\w+)}][$ENV{$1}]eg;
- }
- if (defined $line) {
- if ($line =~ s/^\s*< ?//) {
-
diff --git a/main/audit/0002-auparse-remove-use-of-rawmemchr.patch b/main/audit/0002-auparse-remove-use-of-rawmemchr.patch
deleted file mode 100644
index 891a87bbc3..0000000000
--- a/main/audit/0002-auparse-remove-use-of-rawmemchr.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8f2a6788b78dd6b219545aacbd42e2f84df8c71a Mon Sep 17 00:00:00 2001
-From: Tycho Andersen <tycho@docker.com>
-Date: Mon, 13 Mar 2017 16:17:10 -0700
-Subject: [PATCH 2/4] auparse: remove use of rawmemchr
-
-just iterate over the string instead, it's much simpler and doesn't use a
-glibc extension.
-
-Signed-off-by: Tycho Andersen <tycho@docker.com>
----
- auparse/interpret.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/auparse/interpret.c b/auparse/interpret.c
-index ea17c41..75b7679 100644
---- a/auparse/interpret.c
-+++ b/auparse/interpret.c
-@@ -819,10 +819,9 @@ static const char *print_proctitle(const char *val)
- // Proctitle has arguments separated by NUL bytes
- // We need to write over the NUL bytes with a space
- // so that we can see the arguments
-- while ((ptr = rawmemchr(ptr, '\0'))) {
-- if (ptr >= end)
-- break;
-- *ptr = ' ';
-+ while (ptr < end) {
-+ if (*ptr == '\0')
-+ *ptr = ' ';
- ptr++;
- }
- }
---
-2.13.1
-
diff --git a/main/audit/0005-fix-path-in-auditd-conf.patch b/main/audit/0005-fix-path-in-auditd-conf.patch
deleted file mode 100644
index 4214d39861..0000000000
--- a/main/audit/0005-fix-path-in-auditd-conf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Dermot Bradley <dermot_bradley@yahoo.com>
-Date: Fri, 29 May 2020 19:58:07 +0100
-
-Fix the path to the audispd binary.
-
-There is no point upstreaming this fix as the next release (3.0
-in development) no longer uses this configuration setting.
-
---- a/init.d/auditd.conf
-+++ b/init.d/auditd.conf
-@@ -13,7 +13,7 @@
- num_logs = 5
- priority_boost = 4
- disp_qos = lossy
--dispatcher = /sbin/audispd
-+dispatcher = /usr/sbin/audispd
- name_format = NONE
- ##name = mydomain
- max_log_file_action = ROTATE
diff --git a/main/audit/APKBUILD b/main/audit/APKBUILD
index b99bc5a5b4..bd9c723667 100644
--- a/main/audit/APKBUILD
+++ b/main/audit/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Dermot Bradley <dermot_bradley@yahoo.com>
# Maintainer: Tycho Andersen <tycho@docker.com>
pkgname=audit
-pkgver=2.8.5
-pkgrel=3
+pkgver=3.0.1
+pkgrel=1
pkgdesc="User space tools for 2.6 kernel auditing"
url="https://people.redhat.com/sgrubb/audit/"
arch="all"
@@ -12,11 +12,8 @@ makedepends="$depends_dev swig libcap-ng-dev python3"
install="$pkgname.pre-install"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc"
source="https://people.redhat.com/sgrubb/audit/audit-$pkgver.tar.gz
- fno-common-fix.patch
- 0002-auparse-remove-use-of-rawmemchr.patch
0003-all-get-rid-of-strndupa.patch
0004-fix-path-in-au-remote-conf.patch
- 0005-fix-path-in-auditd-conf.patch
auditd.initd
auditd.confd"
@@ -65,11 +62,8 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
}
-sha512sums="7d416aaa21c1a167f8e911ca82aecbaba804424f3243f505066c43ecc4a62a34feb2c27555e99d3268608404793dccca0f828c63670e3aa816016fb493f8174a audit-2.8.5.tar.gz
-78e32c05b6896d37bacf0938954fbce7486a528dabd55421f1715438fe489171f9157059050abdcb3f673258aa28b4a11f643ddb7824f3499a195dbbe634f101 fno-common-fix.patch
-b7851d4c3c6d7d35f2e822273c17ab530ac24301c414da7f0c7578b7a182692ecd01b51cb50ea04adba4b43987f27020f8f411aec23b3bda0af4d4b6e9fbae5d 0002-auparse-remove-use-of-rawmemchr.patch
+sha512sums="ad2897c9f539681f0f65b08cd0e650c528957fd4799755c2bcc47f869e04272aad31684c46847124d7b42dde243a16ba2754936890189610814c7007c0381d8c audit-3.0.1.tar.gz
f3f2c4ee745e99877c981d889c5cbb0379d073a9b7634c1480ae603a21a13045f9978b51f8cb53c8d0ba414d249bb859af7bca7e302c464b3fc3c6463ecca762 0003-all-get-rid-of-strndupa.patch
6a0e1fb81d7defe6ad84da447a55e1e0b90299fcbd1ca679934a1dfa1a211986ea4642a1c69abe0619120b64b16546a41fa028f55f27c79819d896178aac6df7 0004-fix-path-in-au-remote-conf.patch
-f2ed684363df755360f5265257da3d0cbd41024b1112498beb9c6d76b8f538e7b5e4bcfe233c8d6cbb22ecac60eb1b20f91ae0ba93b3d9009af733021c4be61e 0005-fix-path-in-auditd-conf.patch
b3d7ceba02b6b4406222c3b142fcfdf2b612dc52eebc490cfd121d696e4ef7c6cc5e27813d67937c464ed4c3cd283de9ccfcb75e63405a447523fa4641e79da3 auditd.initd
69d8777772ded7a8c0db2bcf84961b121bb355fa0d4ba0e14e311f8a8bfe665cbd2b7ac632d73477f9dfa9a6eec357a7ed458fe9b3e7b5ede75b166f3f092ab7 auditd.confd"
diff --git a/main/audit/fno-common-fix.patch b/main/audit/fno-common-fix.patch
deleted file mode 100644
index b73ae271ff..0000000000
--- a/main/audit/fno-common-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 017e6c6ab95df55f34e339d2139def83e5dada1f Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Fri, 10 Jan 2020 21:13:50 -0500
-Subject: [PATCH] Header definitions need to be external when building with
- -fno-common (which is default in GCC 10) - Tony Jones
-
----
- src/ausearch-common.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ausearch-common.h b/src/ausearch-common.h
-index 6669203..3040547 100644
---- a/src/ausearch-common.h
-+++ b/src/ausearch-common.h
-@@ -50,7 +50,7 @@ extern pid_t event_pid;
- extern int event_exact_match;
- extern uid_t event_uid, event_euid, event_loginuid;
- extern const char *event_tuid, *event_teuid, *event_tauid;
--slist *event_node_list;
-+extern slist *event_node_list;
- extern const char *event_comm;
- extern const char *event_filename;
- extern const char *event_hostname;
diff --git a/main/autoconf/APKBUILD b/main/autoconf/APKBUILD
index 28e27f86a1..c7fc2f5121 100644
--- a/main/autoconf/APKBUILD
+++ b/main/autoconf/APKBUILD
@@ -1,27 +1,17 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=autoconf
-pkgver=2.69
-pkgrel=3
-pkgdesc="A GNU tool for automatically configuring source code"
+pkgver=2.71
+pkgrel=0
+pkgdesc="GNU tool for automatically configuring source code"
arch="noarch"
license="GPL-2.0-or-later"
url="https://www.gnu.org/software/autoconf"
depends="m4 perl"
subpackages="$pkgname-doc"
options="!check"
-source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
- autoconf-2.69-fix-perl-regex.patch
- autoconf-2.69-backport-runstatedir.patch
- "
-
-builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
- update_config_sub
- default_prepare
-}
+source="https://ftp.gnu.org/gnu/autoconf/autoconf-$pkgver.tar.gz"
build() {
- cd "$builddir"
M4=/usr/bin/m4 ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -30,18 +20,14 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm -f "$pkgdir"/usr/share/info/dir
# conflict with bintuils
rm -f "$pkgdir"/usr/share/info/standards.info
}
-sha512sums="e34c7818bcde14d2cb13cdd293ed17d70740d4d1fd7c67a07b415491ef85d42f450d4fe5f8f80cc330bf75c40a62774c51a4336e06e8da07a4cbc49922d975ee autoconf-2.69.tar.gz
-8b779ecec178091c899b75df4471fb72334a062d6b413502d414e8827fe0c9e2f335a8bef6878ae261e1af1568e3fe71fe82d6b5e53cb54e6585ffd91f069d8d autoconf-2.69-fix-perl-regex.patch
-e040bf855011145d8edf3bc4886e7a11b6dad9c3c8698f07de2bfd6059a23eb90210cad8d9bc4fbcdd54cbd084e46bd6f9a48592948c8d02e7b99471fe9470a5 autoconf-2.69-backport-runstatedir.patch"
+sha512sums="2bc5331f9807da8754b2ee623a30299cc0d103d6f98068a4c22263aab67ff148b7ad3a1646bd274e604bc08a8ef0ac2601e6422e641ad0cfab2222d60a58c5a8 autoconf-2.71.tar.gz"
diff --git a/main/autoconf/autoconf-2.69-backport-runstatedir.patch b/main/autoconf/autoconf-2.69-backport-runstatedir.patch
deleted file mode 100644
index e796743b18..0000000000
--- a/main/autoconf/autoconf-2.69-backport-runstatedir.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Source: http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=patch;h=a197431414088a417b407b9b20583b2e8f7363bd
-
-diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
-index 70b0168..1ce9922 100644
---- a/lib/autoconf/general.m4
-+++ b/lib/autoconf/general.m4
-@@ -586,6 +586,7 @@ AC_SUBST([datadir], ['${datarootdir}'])dnl
- AC_SUBST([sysconfdir], ['${prefix}/etc'])dnl
- AC_SUBST([sharedstatedir], ['${prefix}/com'])dnl
- AC_SUBST([localstatedir], ['${prefix}/var'])dnl
-+AC_SUBST([runstatedir], ['${localstatedir}/run'])dnl
- AC_SUBST([includedir], ['${prefix}/include'])dnl
- AC_SUBST([oldincludedir], ['/usr/include'])dnl
- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
-@@ -812,6 +813,15 @@ do
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-
-+ -runstatedir | --runstatedir | --runstatedi | --runstated \
-+ | --runstate | --runstat | --runsta | --runst | --runs \
-+ | --run | --ru | --r)
-+ ac_prev=runstatedir ;;
-+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-+ | --run=* | --ru=* | --r=*)
-+ runstatedir=$ac_optarg ;;
-+
- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
- ac_prev=sbindir ;;
- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-@@ -921,7 +931,7 @@ fi
- for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
- datadir sysconfdir sharedstatedir localstatedir includedir \
- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-- libdir localedir mandir
-+ libdir localedir mandir runstatedir
- do
- eval ac_val=\$$ac_var
- # Remove trailing slashes.
-@@ -1058,6 +1068,7 @@ Fine tuning of the installation directories:
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
-+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
---
-1.9.1
-
diff --git a/main/autoconf/autoconf-2.69-fix-perl-regex.patch b/main/autoconf/autoconf-2.69-fix-perl-regex.patch
deleted file mode 100644
index 9cccf912b0..0000000000
--- a/main/autoconf/autoconf-2.69-fix-perl-regex.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- autoconf-2.69/bin/autoscan.in.old 2012-04-25 02:37:26.000000000 +0000
-+++ autoconf-2.69/bin/autoscan.in 2017-08-03 23:59:38.720214631 +0000
-@@ -358,7 +358,7 @@
- {
- # Strip out comments and variable references.
- s/#.*//;
-- s/\${[^\}]*}//g;
-+ s/\$\{[^\}]*\}//g;
- s/@[^@]*@//g;
-
- # Tokens in the code.
diff --git a/main/avahi-ui/APKBUILD b/main/avahi-ui/APKBUILD
index 75e6acf5ca..dd85f7069c 100644
--- a/main/avahi-ui/APKBUILD
+++ b/main/avahi-ui/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=avahi-ui
pkgver=0.8
-pkgrel=0
+pkgrel=1
pkgdesc="Gtk user interface library for Avahi"
url="https://www.avahi.org/"
arch="all"
diff --git a/main/avahi/APKBUILD b/main/avahi/APKBUILD
index 4eaa0da7ad..09ebf96ab0 100644
--- a/main/avahi/APKBUILD
+++ b/main/avahi/APKBUILD
@@ -26,6 +26,8 @@ source="https://github.com/lathiat/avahi/releases/download/v$pkgver/avahi-$pkgve
# 0.7-r2:
# - CVE-2017-6519
# - CVE-2018-1000845
+# 0:
+# - CVE-2021-26720
prepare() {
default_prepare
diff --git a/main/awall/APKBUILD b/main/awall/APKBUILD
index 1d6763ace2..e0f85bf335 100644
--- a/main/awall/APKBUILD
+++ b/main/awall/APKBUILD
@@ -1,17 +1,17 @@
# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
pkgname=awall
-pkgver=1.8.2
+pkgver=1.9.1
pkgrel=0
pkgdesc="Alpine Wall"
url="https://gitlab.alpinelinux.org/alpine/awall"
-_luaver=5.3
+_luaver=5.4
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
replaces="awall-nat"
depends="drill ip6tables ipset iptables lua$_luaver lua$_luaver-alt-getopt
- lua$_luaver-cjson lua$_luaver-pc lua$_luaver-posix lua$_luaver-stringy
- lua$_luaver-lyaml xtables-addons"
+ lua$_luaver-cjson lua$_luaver-pc lua$_luaver-posix lua$_luaver-stringy
+ lua$_luaver-lyaml xtables-addons"
subpackages="$pkgname-masquerade $pkgname-policies"
triggers="$pkgname.trigger=/usr/share/awall"
source="$url/-/archive/v$pkgver/awall-v$pkgver.tar.bz2
@@ -22,7 +22,6 @@ builddir=$srcdir/awall-v$pkgver
build() {
sed -i -e "1,1s:lua:lua$_luaver:" awall-cli
- return 0
}
check() {
@@ -51,6 +50,6 @@ policies() {
install -D "$srcdir"/setup-firewall "$subpkgdir"/usr/sbin/setup-firewall
}
-sha512sums="40bb09d81152618be65e5b6c907b0b49a9e7ebcdf7d940d029450eae5cf51ad02aca4ba9208f89919b079ff7048d6f7cced26a27f579c27d5fbc3a27bde39b15 awall-v1.8.2.tar.bz2
+sha512sums="b2f6818bf6aee73ba7731795de2a7b27053108c4f6ccd4bd94a510d12b9b315d23e445eac2a8a81a98e30c0038c26100771efb6a29403a9889d5240abd310937 awall-v1.9.1.tar.bz2
e83ea3281c298092530e45fa5b62f6f85b9e5109b11e109799465ea832608294c7d9c4c3f5b0f321dfc0e82040daf3a17d066e9dea65cb0dbae2c453ea9e62cd awall-init
1cd4b7fa5fc6c9ac6667dff5cc00d96a3cc42aaccafe3c5562d3dcfd9f22ddec9cfe5a9339fee8001b67ccb8e8b81c9417f39a461e5052af9bf74a2753559bf7 setup-firewall"
diff --git a/main/awstats/APKBUILD b/main/awstats/APKBUILD
index d8417e9a78..f7270f008c 100644
--- a/main/awstats/APKBUILD
+++ b/main/awstats/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=awstats
pkgver=7.8
-pkgrel=0
+pkgrel=1
pkgdesc="Free real-time logfile analyzer to get advanced statistics"
url="http://awstats.sourceforge.net/"
arch="noarch"
@@ -10,9 +10,12 @@ license="GPL-3.0-or-later"
depends="perl perl-uri"
subpackages="$pkgname-doc"
options="!check" # no testsuite
-source="https://prdownloads.sourceforge.net/awstats/awstats-$pkgver.tar.gz"
+source="https://prdownloads.sourceforge.net/awstats/awstats-$pkgver.tar.gz
+ CVE-2020-35176.patch"
# secfixes:
+# 7.8-r1:
+# - CVE-2020-35176
# 7.6-r2:
# - CVE-2017-1000501
@@ -57,4 +60,5 @@ package() {
"$pkgdir"/usr/lib/$pkgname/cgi-bin/plugins/example
}
-sha512sums="b532f74a8b420841b1ae7eea73fd341049925af01688a06114f53807c14c6a4edc4ca4f671b2b9c1aee8024ba25ccf69b6eae391250e5722d2fd719de4cf87e2 awstats-7.8.tar.gz"
+sha512sums="b532f74a8b420841b1ae7eea73fd341049925af01688a06114f53807c14c6a4edc4ca4f671b2b9c1aee8024ba25ccf69b6eae391250e5722d2fd719de4cf87e2 awstats-7.8.tar.gz
+d012866662206ffba9f84af437824324bf402a49ecb67161833b3f9593ccd4327db4b465d305c3ca78e5b29917acd469760faac6f7678055d4de01621f689c63 CVE-2020-35176.patch"
diff --git a/main/awstats/CVE-2020-35176.patch b/main/awstats/CVE-2020-35176.patch
new file mode 100644
index 0000000000..3e707c35dc
--- /dev/null
+++ b/main/awstats/CVE-2020-35176.patch
@@ -0,0 +1,30 @@
+From 0d4d4c05f8e73be8f71dd361dc55cbd52858b823 Mon Sep 17 00:00:00 2001
+From: Beuc <beuc@beuc.net>
+Date: Thu, 17 Dec 2020 18:14:43 +0100
+Subject: [PATCH] Only look for configuration in dedicated awstats directories
+
+Fixes #195/CVE-2020-35176
+---
+ wwwroot/cgi-bin/awstats.pl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
+index e709b7f5..8341c0a5 100755
+--- a/wwwroot/cgi-bin/awstats.pl
++++ b/wwwroot/cgi-bin/awstats.pl
+@@ -1711,13 +1711,13 @@ sub Read_Config {
+ # Check config file in common possible directories :
+ # Windows : "$DIR" (same dir than awstats.pl)
+ # Standard, Mandrake and Debian package : "/etc/awstats"
+- # Other possible directories : "/usr/local/etc/awstats", "/etc"
++ # Other possible directories : "/usr/local/etc/awstats",
+ # FHS standard, Suse package : "/etc/opt/awstats"
+ my $configdir = shift;
+ my @PossibleConfigDir = (
+ "$DIR",
+ "/etc/awstats",
+- "/usr/local/etc/awstats", "/etc",
++ "/usr/local/etc/awstats",
+ "/etc/opt/awstats"
+ );
+
diff --git a/main/bash-completion/APKBUILD b/main/bash-completion/APKBUILD
index 41e22b9c9f..5eebe70757 100644
--- a/main/bash-completion/APKBUILD
+++ b/main/bash-completion/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Lucas Ramage <ramage.lucas@protonmail.com>
pkgname=bash-completion
pkgver=2.11
-pkgrel=2
+pkgrel=3
pkgdesc="Command-line tab-completion for bash"
options="!check" # 7 Tests fail
url="https://github.com/scop/bash-completion"
@@ -17,6 +17,7 @@ source="https://github.com/scop/bash-completion/releases/download/$pkgver/bash-c
# Provided by other packages
_conflicting="
+ _adb
cal
chsh
dmesg
diff --git a/main/bats/APKBUILD b/main/bats/APKBUILD
index 8d1ea735bf..689c6a6c23 100644
--- a/main/bats/APKBUILD
+++ b/main/bats/APKBUILD
@@ -1,8 +1,9 @@
# Maintainer: Jose-Luis Rivas <ghostbar@riseup.net>
pkgname=bats
-pkgver=1.2.1
+pkgver=1.3.0
pkgrel=0
pkgdesc="Bash Automated Testing System"
+options="!check" # Test passes CI/locally, fails on builders
url="https://github.com/bats-core/bats-core"
arch="noarch"
license="MIT"
@@ -18,4 +19,4 @@ check() {
package() {
./install.sh "$pkgdir"/usr
}
-sha512sums="bd7a334a558471f691552e18362ed55882e3cdb4dbbb5ebd2c0cc5f40bbd09a4a44b8e91d0d8ce51059a84c745b30c533f3e8444c6588ab355865340a98c079b bats-1.2.1.zip"
+sha512sums="5d5bf4d4eee0bed5bcb2a8d7ddacdd12e221c04723a9bcc2be8e5679f5a9384b00439ed5da316386f3efdd7643bd06f1e56ba9f938dce1e69a81330939980451 bats-1.3.0.zip"
diff --git a/main/bctoolbox/APKBUILD b/main/bctoolbox/APKBUILD
index a37d147196..8a292fa2c6 100644
--- a/main/bctoolbox/APKBUILD
+++ b/main/bctoolbox/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=bctoolbox
-pkgver=4.4.32
+pkgver=4.5.10
pkgrel=0
pkgdesc="Utilities library used by Belledonne Communications softwares like belle-sip, mediastreamer2 and linphone"
url="https://github.com/BelledonneCommunications/bctoolbox"
@@ -11,8 +11,7 @@ options="!check" # bcunit not available
makedepends="cmake mbedtls-dev"
subpackages="$pkgname-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/BelledonneCommunications/bctoolbox/archive/$pkgver.tar.gz
- cmake-bcunit-fix.patch
- cmake-lib-version-fix.patch"
+ cmake-bcunit-fix.patch"
build() {
cmake \
@@ -47,6 +46,7 @@ dev() {
rmdir "$pkgdir"/usr/share
}
-sha512sums="6e5703c5010064a28bb2950ae3f3395b602bb40b55b7a8ad0d2b8004679375f70d8c7f755844f91db8e305cf0e2120e485b833c68e2fb6db38e8556ccd6e245d bctoolbox-4.4.32.tar.gz
+sha512sums="
+3c6fffea93d4c926dfb351eadfdc1813f9d6771b5e7317c885fe469070b2127fbcd6fd0af7346a0dfff8495f03ef41a8fb98f8280d81d7208d1e1b07d4800a5d bctoolbox-4.5.10.tar.gz
466d2a7aa33952c8086c698030af0addc79373aa31104cbe6133d352682439ae5c30055ea4f162cc9b6b9fc54bf3dea0ddcff78e0042e7ce43833d82b9487116 cmake-bcunit-fix.patch
-ee9ae2db8a2a0be0e70e1e017747bbb498f6fc2e64c5e0283343bec91d0b849db2d88f185ba0c8e67a3d654c13ce56615d8db14a0b78b3aae127fa9343877cad cmake-lib-version-fix.patch"
+"
diff --git a/main/bctoolbox/cmake-lib-version-fix.patch b/main/bctoolbox/cmake-lib-version-fix.patch
deleted file mode 100644
index f2e88c34b1..0000000000
--- a/main/bctoolbox/cmake-lib-version-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/cmake/BcToolboxCMakeUtils.cmake b/cmake/BcToolboxCMakeUtils.cmake
-index fd4894e..da8daf1 100644
---- a/cmake/BcToolboxCMakeUtils.cmake
-+++ b/cmake/BcToolboxCMakeUtils.cmake
-@@ -147,29 +147,7 @@ function(bc_parse_full_version version major minor patch)
- endfunction()
-
- function(bc_compute_lib_version OUTPUT_VERSION default_version)
-- find_program(GIT_EXECUTABLE git NAMES Git CMAKE_FIND_ROOT_PATH_BOTH)
-- if(GIT_EXECUTABLE)
-- execute_process(
-- COMMAND "${GIT_EXECUTABLE}" "describe"
-- OUTPUT_VARIABLE GIT_DESCRIBE_VERSION
-- OUTPUT_STRIP_TRAILING_WHITESPACE
-- ERROR_QUIET
-- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-- )
--
-- # parse git describe version
-- if (NOT (GIT_DESCRIBE_VERSION MATCHES "^([0-9]+)[.]([0-9]+)[.]([0-9]+)(-alpha|-beta)?(-[0-9]+)?(-g[0-9a-f]+)?$"))
-- message(FATAL_ERROR "invalid git describe version: '${GIT_DESCRIBE_VERSION}'")
-- endif()
-- set(version_major ${CMAKE_MATCH_1})
-- set(version_minor ${CMAKE_MATCH_2})
-- set(version_patch ${CMAKE_MATCH_3})
--
-- # format lib version
-- set(${OUTPUT_VERSION} "${version_major}.${version_minor}.${version_patch}" CACHE STRING "")
-- else()
- set(${OUTPUT_VERSION} "${default_version}" CACHE STRING "")
-- endif()
- endfunction()
-
- function(bc_compute_full_version OUTPUT_VERSION)
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index f675a74915..e360ae30c3 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -5,12 +5,12 @@
# Contributor: ungleich <alpinelinux@ungleich.ch>
# Maintainer:
pkgname=bind
-pkgver=9.16.11
+pkgver=9.16.15
_ver=${pkgver%_p*}
_p=${pkgver#*_p}
_major=${pkgver%%.*}
[ "$_p" != "$pkgver" ] && _ver="$_ver-P$_p"
-pkgrel=0
+pkgrel=2
pkgdesc="The ISC DNS server"
url="https://www.isc.org/"
arch="all"
@@ -60,6 +60,12 @@ source="
"
# secfixes:
+# 9.16.15-r0:
+# - CVE-2021-25214
+# - CVE-2021-25215
+# - CVE-2021-25216
+# 9.16.11-r2:
+# - CVE-2020-8625
# 9.16.6-r0:
# - CVE-2020-8620
# - CVE-2020-8621
@@ -241,20 +247,27 @@ root_keys() {
ln -s "../../$_dir/$_file" "$_link"
}
-# TODO: remove when abuild is sufficiently upgraded
+# The default_libs() in abuild uses the wrong pattern.
libs() {
depends="$depends_libs"
- default_libs
+ pkgdesc="$pkgdesc (libraries)"
+ local dir= file=
+ for dir in lib usr/lib; do
+ for file in "$pkgdir"/$dir/lib*.so; do
+ [ -f "$file" ] || continue
+ mkdir -p "$subpkgdir"/$dir
+ mv "$file" "$subpkgdir"/$dir/
+ done
+ done
}
-
_gpg_signature_extensions="sha512.asc"
_gpgfingerprints="
good:AE3F AC79 6711 EC59 FC00 7AA4 74BB 6B9A 4CBB 3D38
BE0E 9748 B718 253A 28BB 89FF F1B1 1BF0 5CF0 2E57
"
-sha512sums="5ed632df7c74f5e6693db9b378450ea3073b8002e9924df1d0465f8b8edb933df3a853d3965a290a0477a67ca2bfa79f679d7e344db08a65462860c58d04dc1b bind-9.16.11.tar.xz
+sha512sums="30dad6e2144b3ac53ef0a2d1ed3c8342120f148fc0eb6409113a6d5ed3444eecb917915fdf39c26fd223396fc1e873410a50da305f0b870864f7fbbdccec8033 bind-9.16.15.tar.xz
2b32d1e7f62cd1e01bb4fdd92d15460bc14761b933d5acc463a91f5ecd4773d7477c757c5dd2738e8e433693592cf3f623ffc142241861c91848f01aa84640d6 bind.plugindir.patch
7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch
53db80f7ee4902f42fb1d0bc959242bcb6f20d95256bda99ce2c206af8b4703c7f72bb26d026c633f70451b84a37c3946b210951e34dd5d6620b181cd0183de4 named.initd
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index 506ec2841e..7c02f23dc5 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=binutils
-pkgver=2.35.1
+pkgver=2.35.2
pkgrel=1
pkgdesc="Tools necessary to build programs"
url="https://www.gnu.org/software/binutils/"
@@ -15,10 +15,11 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
gold-mips.patch
ld-bfd-mips.patch
0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+ CVE-2021-3487.patch
"
builddir="$srcdir/$pkgname-$pkgver"
-if [ "$CHOST" = "$CBUILD" -a "$CBUILD" = "$CTARGET" -a "$CTARGET_ARCH" != "riscv64" ]; then
+if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
subpackages="$subpackages $pkgname-gold"
fi
@@ -29,6 +30,8 @@ if [ "$CHOST" != "$CTARGET" ]; then
fi
# secfixes:
+# 2.35.2-r1:
+# - CVE-2021-3487
# 2.32-r0:
# - CVE-2018-19931
# - CVE-2018-19932
@@ -48,7 +51,7 @@ build() {
_cross_configure="--disable-install-libiberty"
fi
- if [ "$CHOST" = "$CBUILD" -a "$CBUILD" = "$CTARGET" ]; then
+ if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
_gold_configure="--enable-gold"
fi
@@ -101,7 +104,7 @@ package() {
if [ "$CHOST" != "$CTARGET" ]; then
# creating cross tools: remove any files that would conflict
# with the native tools, or other cross tools
- rm -r "$pkgdir"/usr/share
+ rm -r "${pkgdir:?}"/usr/share
rm -f "$pkgdir"/usr/lib/libiberty.a
fi
}
@@ -124,8 +127,9 @@ gold() {
mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
}
-sha512sums="94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb binutils-2.35.1.tar.xz
+sha512sums="9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz
ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49 binutils-ld-fix-static-linking.patch
f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f gold-mips.patch
314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d ld-bfd-mips.patch
-642c617db6c6e491f78f053d60f3aa369bad7bf8c1bc7ce267de6cf8fddf6c0d4cf63ce8c8f6e2f225dedbce7cb930d8e87e168fd8f72ca0837c77266ee2b5f8 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch"
+642c617db6c6e491f78f053d60f3aa369bad7bf8c1bc7ce267de6cf8fddf6c0d4cf63ce8c8f6e2f225dedbce7cb930d8e87e168fd8f72ca0837c77266ee2b5f8 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+b08384ed124a74ad3a424db370c107230f09a54378502ca4385deb738f7cf799857f2af0db52709c7eeab8fa6c0a3d972f891396cce1e2834a21f67682fc4355 CVE-2021-3487.patch"
diff --git a/main/binutils/CVE-2021-3487.patch b/main/binutils/CVE-2021-3487.patch
new file mode 100644
index 0000000000..db99ae73d9
--- /dev/null
+++ b/main/binutils/CVE-2021-3487.patch
@@ -0,0 +1,72 @@
+From 647cebce12a6b0a26960220caff96ff38978cf24 Mon Sep 17 00:00:00 2001
+From: Nick Clifton <nickc@redhat.com>
+Date: Thu, 26 Nov 2020 17:08:33 +0000
+Subject: [PATCH] Prevent a memory allocation failure when parsing corrupt
+ DWARF debug sections.
+
+ PR 26946
+ * dwarf2.c (read_section): Check for debug sections with excessive
+ sizes.
+
+diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
+index 977bf43a6a1..8bbfc81d3e7 100644
+--- a/bfd/dwarf2.c
++++ b/bfd/dwarf2.c
+@@ -531,22 +531,24 @@ read_section (bfd * abfd,
+ bfd_byte ** section_buffer,
+ bfd_size_type * section_size)
+ {
+- asection *msec;
+ const char *section_name = sec->uncompressed_name;
+ bfd_byte *contents = *section_buffer;
+- bfd_size_type amt;
+
+ /* The section may have already been read. */
+ if (contents == NULL)
+ {
++ bfd_size_type amt;
++ asection *msec;
++ ufile_ptr filesize;
++
+ msec = bfd_get_section_by_name (abfd, section_name);
+- if (! msec)
++ if (msec == NULL)
+ {
+ section_name = sec->compressed_name;
+ if (section_name != NULL)
+ msec = bfd_get_section_by_name (abfd, section_name);
+ }
+- if (! msec)
++ if (msec == NULL)
+ {
+ _bfd_error_handler (_("DWARF error: can't find %s section."),
+ sec->uncompressed_name);
+@@ -554,12 +556,23 @@ read_section (bfd * abfd,
+ return FALSE;
+ }
+
+- *section_size = msec->rawsize ? msec->rawsize : msec->size;
++ amt = bfd_get_section_limit_octets (abfd, msec);
++ filesize = bfd_get_file_size (abfd);
++ if (amt >= filesize)
++ {
++ /* PR 26946 */
++ _bfd_error_handler (_("DWARF error: section %s is larger than its filesize! (0x%lx vs 0x%lx)"),
++ section_name, (long) amt, (long) filesize);
++ bfd_set_error (bfd_error_bad_value);
++ return FALSE;
++ }
++ *section_size = amt;
+ /* Paranoia - alloc one extra so that we can make sure a string
+ section is NUL terminated. */
+- amt = *section_size + 1;
++ amt += 1;
+ if (amt == 0)
+ {
++ /* Paranoia - this should never happen. */
+ bfd_set_error (bfd_error_no_memory);
+ return FALSE;
+ }
+--
+2.27.0
+
diff --git a/main/bison/APKBUILD b/main/bison/APKBUILD
index 9b4e7f7181..fab20a4ab1 100644
--- a/main/bison/APKBUILD
+++ b/main/bison/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bison
-pkgver=3.7.5
+pkgver=3.7.6
pkgrel=0
pkgdesc="The GNU general-purpose parser generator"
arch="all"
@@ -41,4 +41,4 @@ package() {
rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
}
-sha512sums="98cdfaf114b8f8eb0927b29fe999dc9629336333d85bd2f87c4c558125500c44ee6fbfff453e3121c7e9e239a632f8c72e08c39be7dfb045361d35ec59d31811 bison-3.7.5.tar.xz"
+sha512sums="6c1c9b825fbd2c94b8903f03a7e68e6832599f7bbd8d3c49864537c11b038c45a15de02fd36128d662af314334c83515bbc132df84e9acc6c651e98649c65bad bison-3.7.6.tar.xz"
diff --git a/main/bitlbee/APKBUILD b/main/bitlbee/APKBUILD
index ad8eab2455..eaf1b9ba70 100644
--- a/main/bitlbee/APKBUILD
+++ b/main/bitlbee/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
pkgname=bitlbee
pkgver=3.6
-pkgrel=0
+pkgrel=1
pkgdesc="An IRC to other chat networks gateway"
url="https://www.bitlbee.org/"
arch="all"
diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD
index 9dc35feb91..d53cacd059 100644
--- a/main/bluez/APKBUILD
+++ b/main/bluez/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bluez
-pkgver=5.56
+pkgver=5.58
pkgrel=0
pkgdesc="Tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
@@ -154,7 +154,7 @@ zshcomp() {
amove usr/share/zsh/site-functions
}
-sha512sums="b320ee9d49a516f5cecb5fbc410ba42e9127f44ebcfb95647f68bd5d300147d0eaf633f8e8d0678631a2184ea3afae7b01b5f228157328874fa2a87832ed0ae1 bluez-5.56.tar.xz
+sha512sums="159b554e0afd56af5da6f8333383f2fdf96d77a0e82d762bf4b37786e7312b7e61fbbae0f18b26442a606e0a232f48e0f45a4b38b95de36c7daf384f582315a3 bluez-5.58.tar.xz
fc43c78ed248ea412529eed5ae8bb47bacca9bf5b3b10de121ddd4e792c85893561a88be4aa2c6318106e5d2146a721445152d44fa60ca257ca0b4eb87318c1e bluetooth.initd
8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd
a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd
diff --git a/main/boost1.75/APKBUILD b/main/boost1.75/APKBUILD
index cbf2709b3f..981e3abb6d 100644
--- a/main/boost1.75/APKBUILD
+++ b/main/boost1.75/APKBUILD
@@ -2,7 +2,7 @@
pkgname=boost1.75
pkgver=1.75.0
_pkgver="${pkgver//./_}"
-pkgrel=5
+pkgrel=8
pkgdesc="Free peer-reviewed portable C++ source libraries"
url="https://www.boost.org/"
arch="all"
@@ -14,7 +14,6 @@ subpackages="
$pkgname-static
$pkgname-dev
$pkgname-doc
- boost-dev:_dev
"
source="https://dl.bintray.com/boostorg/release/$pkgver/source/boost_$_pkgver.tar.bz2
boost-1.57.0-python-abi_letters.patch
@@ -67,11 +66,6 @@ for _lib in $_libs; do
done; unset -v _lib
subpackages="$subpackages $pkgname-libs"
-# Claim the unversioned name, this must be removed once we switch our
-# boost to a new version
-provides="boost=$pkgver-r$pkgrel"
-replaces="boost"
-
_set_options() {
[ -n "$PY3_VERSION" ] || PY3_VERSION="$(_pyversion python3)"
@@ -157,11 +151,6 @@ static() {
pkgdesc="Boost static libraries"
depends="$depends_static"
- # Claim the unversioned name, this must be removed once we switch our
- # boost to a new version
- provides="boost-static=$pkgver-r$pkgrel"
- replaces="boost-static"
-
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/lib*.a "$subpkgdir"/usr/lib/
}
@@ -171,11 +160,6 @@ _boostlib() {
pkgdesc="Boost $name shared library"
depends="$depends__boostlib"
- # Claim the unversioned name, this must be removed once we switch our
- # boost to a new version
- provides="boost-$name=$pkgver-r$pkgrel"
- replaces="boost-$name"
-
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/libboost_$name*.so.[0-9]* "$subpkgdir"/usr/lib/
}
@@ -183,11 +167,6 @@ _boostlib() {
libs() {
default_libs
- # Claim the unversioned name, this must be removed once we switch our
- # boost to a new version
- provides="boost-libs=$pkgver-r$pkgrel"
- replaces="boost-libs"
-
pkgdesc="Boost shared libraries"
depends="$depends_libs"
local _pkg; for _pkg in $origsubpackages; do
@@ -200,21 +179,6 @@ libs() {
rmdir "$pkgdir"/usr/lib >/dev/null 2>&1 || :
}
-_dev() {
- # This makes boost-dev be a metapackage that depends on boostX.Y-dev
- mkdir -p "$subpkgdir"
- depends="$pkgname-dev=$pkgver-r$pkgrel"
-}
-
-doc() {
- # Claim the unversioned name, this must be removed once we switch our
- # boost to a new version
- provides="boost-doc=$pkgver-r$pkgrel"
- replaces="boost-doc"
-
- default_doc
-}
-
_pyversion() {
"$1" -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))'
}
diff --git a/main/boost1.76/0001-revert-cease-dependence-on-range.patch b/main/boost1.76/0001-revert-cease-dependence-on-range.patch
new file mode 100644
index 0000000000..a6002074ab
--- /dev/null
+++ b/main/boost1.76/0001-revert-cease-dependence-on-range.patch
@@ -0,0 +1,49 @@
+From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001
+From: Oliver Kowalke <oliver.kowalke@gmail.com>
+Date: Sun, 1 Dec 2019 20:40:28 +0100
+Subject: [PATCH] Revert "Cease dependence on Range"
+
+This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db.
+
+see #44 (One test fails to compile after boostorg/coroutine submodule updated)
+---
+ boost/coroutine/asymmetric_coroutine.hpp | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp
+index ea96981..640896f 100644
+--- a/boost/coroutine/asymmetric_coroutine.hpp
++++ b/boost/coroutine/asymmetric_coroutine.hpp
+@@ -14,6 +14,7 @@
+ #include <boost/assert.hpp>
+ #include <boost/config.hpp>
+ #include <boost/move/move.hpp>
++#include <boost/range.hpp>
+ #include <boost/throw_exception.hpp>
+ #include <boost/utility/explicit_operator_bool.hpp>
+
+@@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c)
+
+ }
+
+-// forward declaration of Boost.Range traits to break dependency on it
+-template<typename C, typename Enabler>
+-struct range_mutable_iterator;
+-
+-template<typename C, typename Enabler>
+-struct range_const_iterator;
+-
+ template< typename Arg >
+-struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void >
++struct range_mutable_iterator< coroutines::push_coroutine< Arg > >
+ { typedef typename coroutines::push_coroutine< Arg >::iterator type; };
+
+ template< typename R >
+-struct range_mutable_iterator< coroutines::pull_coroutine< R >, void >
++struct range_mutable_iterator< coroutines::pull_coroutine< R > >
+ { typedef typename coroutines::pull_coroutine< R >::iterator type; };
+
+ }
+--
+2.24.1
+
diff --git a/main/boost1.76/APKBUILD b/main/boost1.76/APKBUILD
new file mode 100644
index 0000000000..d45f09b9b3
--- /dev/null
+++ b/main/boost1.76/APKBUILD
@@ -0,0 +1,225 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=boost1.76
+pkgver=1.76.0
+_pkgver="${pkgver//./_}"
+pkgrel=0
+pkgdesc="Free peer-reviewed portable C++ source libraries"
+url="https://www.boost.org/"
+arch="all"
+license="custom"
+depends="$pkgname-libs"
+depends_dev="$pkgname linux-headers bzip2-dev icu-dev xz-dev zlib-dev"
+makedepends="$depends_dev python3-dev>=3.8 flex bison"
+subpackages="
+ $pkgname-static
+ $pkgname-dev
+ $pkgname-doc
+ boost-dev:_dev
+ "
+source="https://dl.bintray.com/boostorg/release/$pkgver/source/boost_$_pkgver.tar.bz2
+ boost-1.57.0-python-abi_letters.patch
+ boost-1.57.0-python-libpython_dep.patch
+ 0001-revert-cease-dependence-on-range.patch
+ build-undefine-statx-syscall.patch
+ "
+builddir="$srcdir/boost_$_pkgver"
+
+_enginedir="tools/build/src/engine"
+_bjam="$builddir"/$_enginedir/b2
+
+_libs="
+ atomic
+ chrono
+ container
+ context
+ contract
+ coroutine
+ date_time
+ fiber
+ filesystem
+ graph
+ iostreams
+ locale
+ log_setup
+ log
+ math
+ prg_exec_monitor
+ program_options
+ python3
+ random
+ regex
+ serialization
+ stacktrace_basic
+ stacktrace_noop
+ system
+ thread
+ timer
+ type_erasure
+ unit_test_framework
+ wave
+ wserialization
+ json
+ nowide
+ "
+for _lib in $_libs; do
+ subpackages="$subpackages $pkgname-${_lib}:_boostlib"
+done; unset -v _lib
+subpackages="$subpackages $pkgname-libs"
+
+# Claim the unversioned name, this must be removed once we switch our
+# boost to a new version
+provides="boost=$pkgver-r$pkgrel"
+replaces="boost"
+
+_set_options() {
+ [ -n "$PY3_VERSION" ] || PY3_VERSION="$(_pyversion python3)"
+
+ local _options_python="${PY2_VERSION:+$PY2_VERSION,}$PY3_VERSION"
+ [ -z "$_options_python" ] || _options_python="python=$_options_python"
+
+ _options="
+ --user-config=\"$builddir/user-config.jam\"
+ --prefix=\"$pkgdir/usr\"
+ release
+ $_options_python
+ toolset=gcc
+ debug-symbols=off
+ threading=multi
+ runtime-link=shared
+ link=shared,static
+ cflags=-fno-strict-aliasing
+ --layout=system
+ -q
+ -j${JOBS:-2}
+ $_options_carch
+ "
+}
+
+prepare() {
+ default_prepare
+
+ _set_options
+ local abiflags="$(python3-config --abiflags)"
+
+ # create user-config.jam
+ cat > user-config.jam <<-__EOF__
+
+ using gcc : : $CC : <cxxflags>"$CXXFLAGS" <linkflags>"$LDFLAGS" ;
+ using python : ${PY3_VERSION:+$PY3_VERSION }: /usr/bin/python3 : ${PY3_VERSION:+/usr/include/python${PY3_VERSION}$abiflags }: : : : ${abiflags:+$abiflags };
+
+ __EOF__
+}
+
+build() {
+ export BOOST_ROOT="$builddir"
+
+ msg "Building bjam"
+ cd "$builddir"/$_enginedir
+ CC= ./build.sh gcc
+
+ msg "Building bcp"
+ cd "$builddir"/tools/bcp
+ "$_bjam" -j${JOBS:-2}
+
+ msg "Building boost"
+ cd "$builddir"
+ _set_options
+ "$_bjam" $_options
+}
+
+check() {
+ cd "$builddir"/tools/build/test
+
+ PATH="${_bjam%/*}:$PATH" python3 test_all.py --default-bjam
+}
+
+package() {
+ export BOOST_ROOT="$builddir"
+ _set_options
+
+ install -Dm755 "$_bjam" \
+ "$pkgdir"/usr/bin/b2
+ ln -s b2 "$pkgdir"/usr/bin/bjam # old name for b2 binary
+
+ install -Dm755 dist/bin/bcp "$pkgdir"/usr/bin/bcp
+
+ install -Dm644 LICENSE_1_0.txt \
+ "$pkgdir"/usr/share/licenses/$pkgname/LICENSE_1_0.txt
+
+ "$pkgdir"/usr/bin/bjam $_options \
+ --includedir="$pkgdir"/usr/include \
+ --libdir="$pkgdir"/usr/lib \
+ install
+}
+
+static() {
+ pkgdesc="Boost static libraries"
+ depends="$depends_static"
+
+ # Claim the unversioned name, this must be removed once we switch our
+ # boost to a new version
+ provides="boost-static=$pkgver-r$pkgrel"
+ replaces="boost-static"
+
+ mkdir -p "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/lib*.a "$subpkgdir"/usr/lib/
+}
+
+_boostlib() {
+ local name="${subpkgname#$pkgname-}"
+ pkgdesc="Boost $name shared library"
+ depends="$depends__boostlib"
+
+ # Claim the unversioned name, this must be removed once we switch our
+ # boost to a new version
+ provides="boost-$name=$pkgver-r$pkgrel"
+ replaces="boost-$name"
+
+ mkdir -p "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/libboost_$name*.so.[0-9]* "$subpkgdir"/usr/lib/
+}
+
+libs() {
+ default_libs
+
+ # Claim the unversioned name, this must be removed once we switch our
+ # boost to a new version
+ provides="boost-libs=$pkgver-r$pkgrel"
+ replaces="boost-libs"
+
+ pkgdesc="Boost shared libraries"
+ depends="$depends_libs"
+ local _pkg; for _pkg in $origsubpackages; do
+ case "$_pkg" in
+ *:_boostlib) depends="$depends ${_pkg%%:*}" ;;
+ esac
+ done
+
+ mkdir -p "$subpkgdir"
+ rmdir "$pkgdir"/usr/lib >/dev/null 2>&1 || :
+}
+
+_dev() {
+ # This makes boost-dev be a metapackage that depends on boostX.Y-dev
+ mkdir -p "$subpkgdir"
+ depends="$pkgname-dev=$pkgver-r$pkgrel"
+}
+
+doc() {
+ # Claim the unversioned name, this must be removed once we switch our
+ # boost to a new version
+ provides="boost-doc=$pkgver-r$pkgrel"
+ replaces="boost-doc"
+
+ default_doc
+}
+
+_pyversion() {
+ "$1" -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))'
+}
+
+sha512sums="5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429 boost_1_76_0.tar.bz2
+d96d4d37394a31764ed817d0bc4a99cffa68a75ff1ecfd4417b9e1e5ae2c31a96ed24f948c6f2758ffdac01328d2402c4cf0d33a37107e4f5f721e636daebd66 boost-1.57.0-python-abi_letters.patch
+132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02 boost-1.57.0-python-libpython_dep.patch
+9b53d2fe2dddd592e43db03c26fadd6c07d4c45a980ae4c775b7a914346a3914f6e0c3ef42dad5e2ea4568afb86c9967e09444ff609cfba1e1d39f4980b22ad6 0001-revert-cease-dependence-on-range.patch
+debb898a9d2295a4480a32bec69a77c6e8d5dc094b0be39df1f1afc3a0f610fe916c59be1304bc904ad74440f93a224e4b138c60a5f0253143c9eb5db973cd2b build-undefine-statx-syscall.patch"
diff --git a/main/boost1.76/boost-1.57.0-python-abi_letters.patch b/main/boost1.76/boost-1.57.0-python-abi_letters.patch
new file mode 100644
index 0000000000..7df3ee7047
--- /dev/null
+++ b/main/boost1.76/boost-1.57.0-python-abi_letters.patch
@@ -0,0 +1,62 @@
+--- boost_1_57_0/tools/build/src/tools/python.jam 2013-05-21 06:14:18.000000000 +0200
++++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413877 +0200
+@@ -94,7 +94,7 @@ feature.feature pythonpath : : free opti
+ # using python : 2.3 : /usr/local/bin/python ;
+ #
+ rule init ( version ? : cmd-or-prefix ? : includes * : libraries ?
+- : condition * : extension-suffix ? )
++ : condition * : extension-suffix ? : abi-letters ? )
+ {
+ project.push-current $(.project) ;
+
+@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ?
+ }
+ }
+
+- configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) ;
++ configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) : $(abi-letters) ;
+
+ project.pop-current ;
+ }
+@@ -653,7 +653,7 @@ local rule system-library-dependencies (
+
+ # Declare a target to represent Python's library.
+ #
+-local rule declare-libpython-target ( version ? : requirements * )
++local rule declare-libpython-target ( version ? : requirements * : abi-letters ? )
+ {
+ # Compute the representation of Python version in the name of Python's
+ # library file.
+@@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve
+ }
+
+ # Declare it.
+- lib python.lib : : <name>python$(lib-version) $(requirements) ;
++ lib python.lib : : <name>python$(lib-version)$(abi-letters) $(requirements) ;
+ }
+
+
+ # Implementation of init.
+ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
+- condition * : extension-suffix ? )
++ condition * : extension-suffix ? : abi-letters ? )
+ {
+ local prefix ;
+ local exec-prefix ;
+@@ -699,6 +699,7 @@ local rule configure ( version ? : cmd-o
+ extension-suffix ?= _d ;
+ }
+ extension-suffix ?= "" ;
++ abi-letters ?= "" ;
+
+ # Normalize and dissect any version number.
+ local major-minor ;
+@@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o
+ }
+ else
+ {
+- declare-libpython-target $(version) : $(target-requirements) ;
++ declare-libpython-target $(version) : $(target-requirements) : $(abi-letters) ;
+
+ # This is an evil hack. On, Windows, when Python is embedded, nothing
+ # seems to set up sys.path to include Python's standard library
diff --git a/main/boost1.76/boost-1.57.0-python-libpython_dep.patch b/main/boost1.76/boost-1.57.0-python-libpython_dep.patch
new file mode 100644
index 0000000000..57bfc26774
--- /dev/null
+++ b/main/boost1.76/boost-1.57.0-python-libpython_dep.patch
@@ -0,0 +1,13 @@
+Index: boost_1_57_0/tools/build/src/tools/python.jam
+===================================================================
+--- boost_1_57_0/tools/build/src/tools/python.jam (revision 50406)
++++ boost_1_57_0/tools/build/src/tools/python.jam (working copy)
+@@ -994,7 +994,7 @@
+ else
+ {
+ alias python_for_extensions
+- :
++ : python
+ : $(target-requirements)
+ :
+ : $(usage-requirements)
diff --git a/main/boost1.76/build-undefine-statx-syscall.patch b/main/boost1.76/build-undefine-statx-syscall.patch
new file mode 100644
index 0000000000..4b984f0b34
--- /dev/null
+++ b/main/boost1.76/build-undefine-statx-syscall.patch
@@ -0,0 +1,17 @@
+Description: The way the statx function is defined is broken, and does not fall
+back in case the syscall is not present, which is the case for mips64, which
+runs Linux 4.9.
+Upstream: rejected
+URL: https://github.com/boostorg/filesystem/issues/173
+diff --git a/libs/filesystem/build/Jamfile.v2 b/libs/filesystem/build/Jamfile.v2
+index 132641a32..76547eb92 100644
+--- a/libs/filesystem/build/Jamfile.v2
++++ b/libs/filesystem/build/Jamfile.v2
+@@ -54,7 +54,6 @@ project boost/filesystem
+ [ check-target-builds ../config//has_stat_st_birthtimensec "has stat::st_birthtimensec" : <define>BOOST_FILESYSTEM_HAS_STAT_ST_BIRTHTIMENSEC ]
+ [ check-target-builds ../config//has_stat_st_birthtimespec "has stat::st_birthtimespec" : <define>BOOST_FILESYSTEM_HAS_STAT_ST_BIRTHTIMESPEC ]
+ [ check-target-builds ../config//has_statx "has statx" : <define>BOOST_FILESYSTEM_HAS_STATX ]
+- [ check-target-builds ../config//has_statx_syscall "has statx syscall" : <define>BOOST_FILESYSTEM_HAS_STATX_SYSCALL ]
+ <conditional>@select-windows-crypto-api
+ : source-location ../src
+ : usage-requirements # pass these requirement to dependents (i.e. users)
diff --git a/main/botan/APKBUILD b/main/botan/APKBUILD
index b7f005b11b..deb13b99f9 100644
--- a/main/botan/APKBUILD
+++ b/main/botan/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: tcely <tcely@users.noreply.github.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=botan
-pkgver=2.11.0
-pkgrel=6
+pkgver=2.17.3
+pkgrel=2
pkgdesc="Crypto and TLS for C++11"
url="https://botan.randombit.net/"
arch="all"
@@ -14,6 +14,8 @@ source="https://botan.randombit.net/releases/Botan-$pkgver.tar.xz"
builddir="$srcdir/Botan-$pkgver"
# secfixes:
+# 2.17.3-r0:
+# - CVE-2021-24115
# 2.9.0-r0:
# - CVE-2018-20187
# 2.7.0-r0:
@@ -23,6 +25,10 @@ builddir="$srcdir/Botan-$pkgver"
# 2.5.0-r0:
# - CVE-2018-9127
+case $CARCH in
+ ppc64le|armhf|armv7) options="$options !check" ;; # 3 tests timeout
+esac
+
build() {
# botan benefits from -O3. Upstream is using it when testing.
CXXFLAGS="$CXXFLAGS -O3" \
@@ -43,7 +49,7 @@ build() {
}
check() {
- ./botan-test
+ LD_LIBRARY_PATH="$builddir" ./botan-test
}
package() {
@@ -51,4 +57,4 @@ package() {
rm -rf "$pkgdir"/usr/lib/python*
}
-sha512sums="a697a7f29788afc561cde35431e65e2f37e40fd45af89a6d060bf9988d28089905c6a1c005f9b23fb377547cd7a96a41f62c8d2f61a7f80d1ca1b9ccf857a2ce Botan-2.11.0.tar.xz"
+sha512sums="ead0f144dfb9eca66d0e81e376d0d49f4b0b6bc1599f8cf52299e1753645b5b20100efa004ef5f9571f7bea88958f35db38367fc26f2603890f8f199cc890dbc Botan-2.17.3.tar.xz"
diff --git a/main/brotli/APKBUILD b/main/brotli/APKBUILD
index 21624e5b9c..8e93da5e94 100644
--- a/main/brotli/APKBUILD
+++ b/main/brotli/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: prspkt <prspkt@protonmail.com>
pkgname=brotli
pkgver=1.0.9
-pkgrel=3
+pkgrel=4
pkgdesc="Generic lossless compressor"
url="https://github.com/google/brotli"
arch="all"
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index 506419da33..159c4d78ed 100644
--- a/main/btrfs-progs/APKBUILD
+++ b/main/btrfs-progs/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=btrfs-progs
-pkgver=5.10.1
+pkgver=5.12
pkgrel=0
pkgdesc="BTRFS filesystem utilities"
url="https://btrfs.wiki.kernel.org"
@@ -13,7 +13,7 @@ makedepends="$depends_dev acl-dev asciidoc attr-dev autoconf automake
e2fsprogs-dev libtool lzo-dev py3-setuptools python3-dev util-linux-dev
xmlto zlib-dev zstd-dev"
subpackages="$pkgname-doc $pkgname-static $pkgname-dev
- $pkgname-bash-completion:bashcomp:noarch
+ $pkgname-bash-completion
py3-$pkgname:py3 $pkgname-libs $pkgname-extra"
source="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar.xz"
builddir="$srcdir/$pkgname-v$pkgver"
@@ -47,14 +47,9 @@ package() {
mv "$pkgdir"/usr/bin/$i "$pkgdir"/sbin/
done
mv "$pkgdir"/usr/bin "$pkgdir"/usr/sbin
-}
-
-bashcomp() {
- pkgdesc="Bash completion script for $pkgname"
- install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
- install -D -m644 "$builddir"/btrfs-completion \
- "$subpkgdir"/usr/share/bash-completion/completions/btrfs
+ install -Dm644 btrfs-completion \
+ "$pkgdir"/usr/share/bash-completion/completions/btrfs
}
py3() {
@@ -75,4 +70,6 @@ extra() {
rmdir "$subpkgdir"/usr/lib
}
-sha512sums="32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d btrfs-progs-v5.10.1.tar.xz"
+sha512sums="
+af9ab8bf232e0c62cc093d848b95991924cc3a84020fb9c85765a63a1cc132403e784bf18f81b71b2af9daa0038a7b11e578ee7b50d90481a888f7a967a5b197 btrfs-progs-v5.12.tar.xz
+"
diff --git a/main/bubblewrap/APKBUILD b/main/bubblewrap/APKBUILD
index 4b36f6bd7e..17af9fcb11 100644
--- a/main/bubblewrap/APKBUILD
+++ b/main/bubblewrap/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="Unprivileged sandboxing tool"
url="https://github.com/containers/bubblewrap"
arch="all"
license="LGPL-2.0-or-later"
-options="!check suid" # Testsuite with suid requires sudo binary and some socket operations fail
+options="!check" # Testsuite fails
makedepends="autoconf automake libcap-dev docbook-xsl"
subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
source="bubblewrap-$pkgver.tar.gz::https://github.com/containers/bubblewrap/archive/v$pkgver.tar.gz"
diff --git a/main/busybox/0001-ash-add-built-in-BB_ASH_VERSION-variable.patch b/main/busybox/0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
new file mode 100644
index 0000000000..f7f901f6ad
--- /dev/null
+++ b/main/busybox/0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
@@ -0,0 +1,83 @@
+From cf95fcc20717e4c0906109b13565fdd06d874ee0 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 10 Mar 2021 23:38:57 -0700
+Subject: [PATCH] ash: add built-in $BB_ASH_VERSION variable
+
+This is helpful for detecting if the shell is busybox ash or not,
+which is necessary for enabling ash-specific features in /etc/profile
+and Alpine's default $ENV.
+
+https://gitlab.alpinelinux.org/alpine/aports/-/issues/12398 outlines
+the rationale for detecting what shell is running in /etc/profile and
+similar.
+
+function old new delta
+.rodata 77899 77925 +26
+varinit_data 360 384 +24
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 2/0 up/down: 50/0) Total: 50 bytes
+
+Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
+---
+ shell/ash.c | 26 +++++++++++++++++++-------
+ 1 file changed, 19 insertions(+), 7 deletions(-)
+
+diff --git a/shell/ash.c b/shell/ash.c
+index 6a16833b1..b8525dd57 100644
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -153,6 +153,14 @@
+ //config: you to run the specified command or builtin,
+ //config: even when there is a function with the same name.
+ //config:
++//config:config ASH_VERSION_VAR
++//config: bool "declare $BB_ASH_VERSION variable"
++//config: default y
++//config: depends on SHELL_ASH
++//config: help
++//config: Enable support for declaring the $BB_ASH_VERSION variable,
++//config: which is set as the busybox version.
++//config:
+ //config:endif # ash options
+
+ //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP))
+@@ -2109,6 +2117,9 @@ static const struct {
+ { VSTRFIXED|VTEXTFIXED , "PS1=$ " , NULL },
+ { VSTRFIXED|VTEXTFIXED , "PS2=> " , NULL },
+ { VSTRFIXED|VTEXTFIXED , "PS4=+ " , NULL },
++#if ENABLE_ASH_VERSION_VAR
++ { VSTRFIXED|VTEXTFIXED , "BB_ASH_VERSION=" BB_VER, NULL },
++#endif
+ #if ENABLE_ASH_GETOPTS
+ { VSTRFIXED|VTEXTFIXED , defoptindvar, getoptsreset },
+ #endif
+@@ -2159,18 +2170,19 @@ extern struct globals_var *BB_GLOBAL_CONST ash_ptr_to_globals_var;
+ #define vps1 varinit[VAR_OFFSET1 + 2]
+ #define vps2 varinit[VAR_OFFSET1 + 3]
+ #define vps4 varinit[VAR_OFFSET1 + 4]
++#define VAR_OFFSET2 (VAR_OFFSET1 + ENABLE_ASH_VERSION_VAR)
+ #if ENABLE_ASH_GETOPTS
+-# define voptind varinit[VAR_OFFSET1 + 5]
++# define voptind varinit[VAR_OFFSET2 + 5]
+ #endif
+-#define VAR_OFFSET2 (VAR_OFFSET1 + ENABLE_ASH_GETOPTS)
+-#define vlineno varinit[VAR_OFFSET2 + 5]
++#define VAR_OFFSET3 (VAR_OFFSET2 + ENABLE_ASH_GETOPTS)
++#define vlineno varinit[VAR_OFFSET3 + 5]
+ #if ENABLE_ASH_RANDOM_SUPPORT
+-# define vrandom varinit[VAR_OFFSET2 + 6]
++# define vrandom varinit[VAR_OFFSET3 + 6]
+ #endif
+-#define VAR_OFFSET3 (VAR_OFFSET2 + ENABLE_ASH_RANDOM_SUPPORT)
++#define VAR_OFFSET4 (VAR_OFFSET2 + ENABLE_ASH_RANDOM_SUPPORT)
+ #if BASH_EPOCH_VARS
+-# define vepochs varinit[VAR_OFFSET3 + 6]
+-# define vepochr varinit[VAR_OFFSET3 + 7]
++# define vepochs varinit[VAR_OFFSET4 + 6]
++# define vepochr varinit[VAR_OFFSET4 + 7]
+ #endif
+ #define INIT_G_var() do { \
+ unsigned i; \
+--
+2.30.2
+
diff --git a/main/busybox/0001-lineedit-fix-tab-completion-with-equal-sign.patch b/main/busybox/0001-lineedit-fix-tab-completion-with-equal-sign.patch
new file mode 100644
index 0000000000..ee2435542d
--- /dev/null
+++ b/main/busybox/0001-lineedit-fix-tab-completion-with-equal-sign.patch
@@ -0,0 +1,29 @@
+From 1f8e69eb81f05503c498e86636dd87d6f4306f6b Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 9 Apr 2021 16:49:21 +0200
+Subject: [PATCH] lineedit: fix tab completion with equal sign
+
+Fix tab completion for the path when equal sign (=) is used. For
+example: dd if=/dev/ze<tab>
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ libbb/lineedit.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libbb/lineedit.c b/libbb/lineedit.c
+index b0adcf140..2cae4711a 100644
+--- a/libbb/lineedit.c
++++ b/libbb/lineedit.c
+@@ -1071,7 +1071,7 @@ static NOINLINE int build_match_prefix(char *match_buf)
+ continue;
+ for (--i; i >= 0; i--) {
+ int cur = int_buf[i];
+- if (cur == ' ' || cur == '<' || cur == '>' || cur == '|' || cur == '&') {
++ if (cur == ' ' || cur == '<' || cur == '>' || cur == '|' || cur == '&' || cur == '=') {
+ remove_chunk(int_buf, 0, i + 1);
+ break;
+ }
+--
+2.31.1
+
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 03f0a1612b..46745ca4bd 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -3,14 +3,14 @@
# Contributor: Michal Artazov <michal@artazov.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
-pkgver=1.33.0
-pkgrel=2
+pkgver=1.33.1
+pkgrel=1
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
license="GPL-2.0-only"
makedepends_build="perl"
-makedepends_host="linux-headers openssl-dev libtls-standalone-dev"
+makedepends_host="linux-headers openssl-dev libretls-dev"
makedepends="$makedepends_build $makedepends_host"
checkdepends="zip"
provides="/bin/sh"
@@ -21,6 +21,7 @@ options="suid !check"
replaces="busybox-initscripts" # move of default.script
triggers="busybox.trigger=/bin:/usr/bin:/sbin:/usr/sbin:/lib/modules/*"
source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
+ 0001-lineedit-fix-tab-completion-with-equal-sign.patch
0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
0001-properly-fix-wget-https-support.patch
@@ -36,6 +37,7 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
0012-udhcpc-Don-t-background-if-n-is-given.patch
0001-echo-do-not-assume-that-free-leaves-errno-unmodified.patch
+ 0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
acpid.logrotate
busyboxconfig
@@ -47,6 +49,8 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
"
# secfixes:
+# 1.33.0-r5:
+# - CVE-2021-28831
# 1.30.1-r2:
# - CVE-2019-5747
# 1.29.3-r10:
@@ -79,8 +83,8 @@ build() {
msg "Building ssl_client"
# shellcheck disable=SC2046 # Allow wordsplitting for pkg-config
- ${CC:-${CROSS_COMPILE}gcc} ${CPPFLAGS} ${CFLAGS} $(pkg-config --cflags libtls-standalone) \
- "$srcdir"/ssl_client.c -o "$_dyndir"/ssl_client ${LDFLAGS} $(pkg-config --libs libtls-standalone)
+ ${CC:-${CROSS_COMPILE}gcc} ${CPPFLAGS} ${CFLAGS} $(pkg-config --cflags libtls) \
+ "$srcdir"/ssl_client.c -o "$_dyndir"/ssl_client ${LDFLAGS} $(pkg-config --libs libtls)
# no timestamp in build
export KCONFIG_NOTIMESTAMP=1
@@ -224,7 +228,9 @@ ifupdown() {
mkdir -p "$subpkgdir"
}
-sha512sums="20f8f5197c5cbc8b244f69d82d6628066296c7306a9736ee1344cb555882854412cf7f264490f9a735251c139b9621004f48e972d06ef2623a3c99278f8e765a busybox-1.33.0.tar.bz2
+sha512sums="
+d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a busybox-1.33.1.tar.bz2
+84a6599d327d33350432d1f332006d8ce04363ecc53836a98a6180e0cc32fbc4f12c3f9f2b112a1cb2e787dce705b04562347d008465256e796c808433a188b6 0001-lineedit-fix-tab-completion-with-equal-sign.patch
ead3403578c071c2216de17ab0543984c1f1509c12c062f03af49141547c3ea21356f3e8f0f0695550f05a41a1379dd73fc3cc18dcd78addbb411f247351e353 0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
a2787a3ecaf6746dadef62166e8ee6ecaa166147e5ad8b917c5838536057c875bab5f9cf40c3e05eba74d575484ac662929ac3799d58432d3a99ac46f364f302 0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
e858bb6a0065d0b0cd757df1fb0eb7af1bc1890b276f20706f828b34171d3af3aea4e244233f495e752fb5b591e62da756d46a5b5cbb002c570d3efbb726f704 0001-properly-fix-wget-https-support.patch
@@ -239,10 +245,12 @@ df02adb3e3cd3349cc8d070911e3392164cb2e30bd72cae7ceaa974b2db6f958fdcedf809abc7b4b
ecbe5c890d966f09280c7eb534109f785c68e292765f17ed7ff62fcc61d20f61443c4155add0a1ebfb67ce8564e104c1aa22a8ef0400e119b0bca2bca3671f2d 0010-Add-flag-for-not-following-symlinks-when-recursing.patch
4d043999ffbf6875e6b28ffdb43a36dd5d37d51e862ed7d89c6007e38cdda056292c5322a3ac3189fd489bf3ad1cce7b20508a96aee55c09f09354e1c3f5f5fe 0012-udhcpc-Don-t-background-if-n-is-given.patch
1ec62ab67e32684e2bbfbafefc9e2bffeb758248a97a1ed9468f449d1fc67fca5c1a6743acc889e12c6f18636708e35ba4bab3345c4994eea6be11f10c9a128c 0001-echo-do-not-assume-that-free-leaves-errno-unmodified.patch
+d12246f1134bbd3993462d27172c4739cc601b251d57ce8e088745773afa965551236e8cb8b9013dfc142fd055e369a771d86c7c54615c89bd30393400bfa390 0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate
-e8e1647b2c26033d0ec61a1786b6703a309cb66bba6558132ee15f28113d77e069f20fe65fd7eb5f27924be33bec26280df5e9c926841dfed7a53ff888e5153c busyboxconfig
-fe9fd2c46b7fba920e5c588d69b35858129100e7ec6bf4ea747ef7823e096bea135dab42e1bc37a9fb285193c8d611621d6c85d9aaa63eaf9bfcb6ce3a525b3b busyboxconfig-extras
+5b0adc5bbe3d539380007ccc2e90ee1c986d24eae29b5e04b65a1e18988dc18907e7f617c7b3eb66ce131fdcb2de78da8b7653f58f95347d286fe5d17c6118f8 busyboxconfig
+470a646505887dbf20dd8c3c3b5c8ab25f363f3a0bfbca577de115b8ec61f28e9843f4f3a7978c634e863dbf28bae987f20e7fa1aa529450ff6c17bc188cae53 busyboxconfig-extras
0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c
b993ce589685d5d1f806153d0b7f71657f2d37556654ec60884130a40f09acc4944a13e0a4d02914000bedd779e5a35da08c760fed5f7ca5b601243aff7ba2c9 dad.if-up
646ad9aefe3596d0170d92c8506ca1846e43b5b83cbef97ae565f15ffa7b14665a8c7061bc69c608c043f834c134c5d63f042509f8999031e89163508a868e46 ssl_client.c
-c3194ccffe7300a0f55d50fb56d38c8df55d588adac13056fd0be2676594974477f94de5570a5a882bc864c3711cf67aa43b6ad6808e672f4533dd0f7363d2f5 default.script"
+c3194ccffe7300a0f55d50fb56d38c8df55d588adac13056fd0be2676594974477f94de5570a5a882bc864c3711cf67aa43b6ad6808e672f4533dd0f7363d2f5 default.script
+"
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index 7feb9a85c7..1767540299 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.33.0
-# Fri Jan 8 19:34:17 2021
+# Sat Jan 23 11:56:15 2021
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -54,7 +54,7 @@ CONFIG_EXTRA_LDFLAGS=""
CONFIG_EXTRA_LDLIBS=""
# CONFIG_USE_PORTABLE_CODE is not set
CONFIG_STACK_OPTIMIZATION_386=y
-CONFIG_STATIC_LIBGCC=y
+# CONFIG_STATIC_LIBGCC is not set
#
# Installation Options ("make install" behavior)
@@ -1128,6 +1128,7 @@ CONFIG_ASH_TEST=y
CONFIG_ASH_HELP=y
CONFIG_ASH_GETOPTS=y
CONFIG_ASH_CMDCMD=y
+CONFIG_ASH_VERSION_VAR=y
# CONFIG_CTTYHACK is not set
# CONFIG_HUSH is not set
# CONFIG_SHELL_HUSH is not set
diff --git a/main/busybox/busyboxconfig-extras b/main/busybox/busyboxconfig-extras
index c76cba6644..78412c8c96 100644
--- a/main/busybox/busyboxconfig-extras
+++ b/main/busybox/busyboxconfig-extras
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.33.0
-# Fri Jan 8 19:34:47 2021
+# Sat Jan 23 11:57:08 2021
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -54,7 +54,7 @@ CONFIG_EXTRA_LDFLAGS=""
CONFIG_EXTRA_LDLIBS=""
# CONFIG_USE_PORTABLE_CODE is not set
CONFIG_STACK_OPTIMIZATION_386=y
-CONFIG_STATIC_LIBGCC=y
+# CONFIG_STATIC_LIBGCC is not set
#
# Installation Options ("make install" behavior)
diff --git a/main/byacc/APKBUILD b/main/byacc/APKBUILD
index a6ae0039ed..6f37c29165 100644
--- a/main/byacc/APKBUILD
+++ b/main/byacc/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
pkgname=byacc
-pkgver=20210109
+pkgver=20210328
pkgrel=0
pkgdesc="The Berkeley Yacc general-purpose parser generator"
url="https://invisible-island.net/byacc/byacc.html"
@@ -29,4 +29,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="95eafe81948fee1839fed8fff71d65c23d85de02af51672c118b2eed7c680f0dd300cec54cf366a248307c480844edc66a027575b29e20ef2f71f3c243ad5202 byacc-20210109.tgz"
+sha512sums="fdcf98976524c1f37710cf9551a357ebc24ece94dd2bd10501d4fafb914a7ab4847926b99647e387f22a3d3206e6a4bfc14a4c41115702382fcc1d6f688f9dae byacc-20210328.tgz"
diff --git a/main/byobu/APKBUILD b/main/byobu/APKBUILD
index fa3210e1f2..689a1cb4cc 100644
--- a/main/byobu/APKBUILD
+++ b/main/byobu/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=byobu
pkgver=5.133
-pkgrel=0
+pkgrel=1
pkgdesc="An enhancement of the GNU Screen"
url="https://launchpad.net/byobu"
arch="noarch"
diff --git a/main/cairo/APKBUILD b/main/cairo/APKBUILD
index d15bd16726..e4b684c330 100644
--- a/main/cairo/APKBUILD
+++ b/main/cairo/APKBUILD
@@ -1,30 +1,55 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cairo
pkgver=1.16.0
-pkgrel=2
+pkgrel=3
pkgdesc="A vector graphics library"
url="https://cairographics.org/"
arch="all"
options="!check" # Recursive dependency on gtk+2.0 for check.
license="LGPL-2.0-or-later MPL-1.1"
-depends=
-depends_dev="fontconfig-dev freetype-dev libxrender-dev pixman-dev
- xcb-util-dev libxext-dev $pkgname-tools"
-makedepends="$depends_dev zlib-dev expat-dev glib-dev libpng-dev autoconf automake libtool"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-gobject $pkgname-tools $pkgname-dbg"
+depends_dev="
+ $pkgname-tools
+ fontconfig-dev
+ freetype-dev
+ libxext-dev
+ libxrender-dev
+ pixman-dev
+ xcb-util-dev
+ "
+makedepends="$depends_dev
+ autoconf
+ automake
+ expat-dev
+ glib-dev
+ libpng-dev
+ libtool
+ zlib-dev
+ "
+subpackages="
+ $pkgname-static
+ $pkgname-dev
+ $pkgname-doc
+ $pkgname-gobject
+ $pkgname-tools
+ $pkgname-dbg
+ "
source="https://cairographics.org/releases/cairo-$pkgver.tar.xz
musl-stacksize.patch
CVE-2018-19876.patch
pdf-flush.patch
+ fix-mask-usage-in-image-compositor.patch
+ composite_color_glyphs.patch
+ cff-allow-empty-array-of-operands-for-certain-operat.patch
"
builddir="$srcdir/$pkgname-$pkgver"
# secfixes:
+# 1.16.0-r2:
+# - CVE-2020-35492
# 1.16.0-r1:
# - CVE-2018-19876
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -43,31 +68,31 @@ build() {
--enable-xcb-shm \
--enable-xlib \
--enable-xlib-xrender \
- --disable-xlib-xcb \
- --disable-static
+ --disable-xlib-xcb
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
gobject() {
pkgdesc="$pkgdesc (gobject bindings)"
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libcairo-gobject.so.* "$subpkgdir"/usr/lib/
+
+ amove usr/lib/libcairo-gobject.so.*
}
tools() {
pkgdesc="$pkgdesc (development tools)"
- mkdir -p "$subpkgdir"/usr/lib/cairo
- mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
- mv "$pkgdir"/usr/lib/cairo/libcairo-trace.* \
- "$subpkgdir"/usr/lib/cairo/
+
+ amove usr/bin
+ amove usr/lib/cairo/libcairo-trace.*
}
sha512sums="9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f cairo-1.16.0.tar.xz
86f26fe41deb5e14f553c999090d1ec1d92a534fa7984112c9a7f1d6c6a8f1b7bb735947e8ec3f26e817f56410efe8cc46c5e682f6a278d49b40a683513740e0 musl-stacksize.patch
8f13cdcae0f134e04778cf5915f858fb8d5357a7e0a454791c93d1566935b985ec66dfe1683cd0b74a1cb44a130923d7a27cf006f3fc70b9bee93abd58a55aa3 CVE-2018-19876.patch
-533ea878dc7f917af92e2694bd3f535a09cde77f0ecd0cc00881fbc9ec1ea86f60026eacc76129705f525f6672929ad8d15d8cfe1bfa61e9962e805a7fbded81 pdf-flush.patch"
+533ea878dc7f917af92e2694bd3f535a09cde77f0ecd0cc00881fbc9ec1ea86f60026eacc76129705f525f6672929ad8d15d8cfe1bfa61e9962e805a7fbded81 pdf-flush.patch
+20699d2dd10531f99587cdcd187a23e23bca5a9f031255c95aade4dadb79bbb62118c7ddff677c2fd20e4ba7694eee4debcd79a4d0736d62951a4fcee56ccae0 fix-mask-usage-in-image-compositor.patch
+a056e85549e8410782674cb4ce7b38b035cdde8f4319c18dd942a18b33d35c5be4d0c0c34081ee556473df4f2725cdba508a387ee6222214484b10a5d9eaad90 composite_color_glyphs.patch
+ae079840a842ec645ab3c9a2d5db8d3f8bb4e25ce4090afc3d226ba292f15b85bdaaed0967bb12bfa429d7f6376a28c87518df194ab6b1d2a2e7c96ab6df8ba2 cff-allow-empty-array-of-operands-for-certain-operat.patch"
diff --git a/main/cairo/cff-allow-empty-array-of-operands-for-certain-operat.patch b/main/cairo/cff-allow-empty-array-of-operands-for-certain-operat.patch
new file mode 100644
index 0000000000..3149dadba6
--- /dev/null
+++ b/main/cairo/cff-allow-empty-array-of-operands-for-certain-operat.patch
@@ -0,0 +1,119 @@
+From ef959bc76e65ea0b0d4ba3ee50dfbce31c3484ad Mon Sep 17 00:00:00 2001
+From: Marek Kasik <mkasik@redhat.com>
+Date: Fri, 27 Mar 2020 19:39:46 +0100
+Subject: [PATCH] cff: Allow empty array of operands for certain operators
+
+Operators BlueValues, OtherBlues, FamilyBlues, FamilyOtherBlues,
+StemSnapH and StemSnapV have operands of type delta which can be
+a number or an array of delta-encoded numbers. This array can be
+empty according to freetype developers.
+This commit checks whether current operator is among those listed
+and permits empty operand in such case.
+---
+ src/cairo-cff-subset.c | 78 ++++++++++++++++++++++++++----------------
+ 1 file changed, 49 insertions(+), 29 deletions(-)
+
+Patch-Source: https://src.fedoraproject.org/rpms/cairo/blob/ba42ecc23bb1162a1951edc0209f9f48e87bba7e/f/0001-cff-Allow-empty-array-of-operands-for-certain-operat.patch
+See-Also: https://bugzilla.redhat.com/show_bug.cgi?id=1817958
+
+diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c
+index 37727eddb..fce4195e9 100644
+--- a/src/cairo-cff-subset.c
++++ b/src/cairo-cff-subset.c
+@@ -56,30 +56,36 @@
+
+ /* CFF Dict Operators. If the high byte is 0 the command is encoded
+ * with a single byte. */
+-#define BASEFONTNAME_OP 0x0c16
+-#define CIDCOUNT_OP 0x0c22
+-#define CHARSET_OP 0x000f
+-#define CHARSTRINGS_OP 0x0011
+-#define COPYRIGHT_OP 0x0c00
+-#define DEFAULTWIDTH_OP 0x0014
+-#define ENCODING_OP 0x0010
+-#define FAMILYNAME_OP 0x0003
+-#define FDARRAY_OP 0x0c24
+-#define FDSELECT_OP 0x0c25
+-#define FONTBBOX_OP 0x0005
+-#define FONTMATRIX_OP 0x0c07
+-#define FONTNAME_OP 0x0c26
+-#define FULLNAME_OP 0x0002
+-#define LOCAL_SUB_OP 0x0013
+-#define NOMINALWIDTH_OP 0x0015
+-#define NOTICE_OP 0x0001
+-#define POSTSCRIPT_OP 0x0c15
+-#define PRIVATE_OP 0x0012
+-#define ROS_OP 0x0c1e
+-#define UNIQUEID_OP 0x000d
+-#define VERSION_OP 0x0000
+-#define WEIGHT_OP 0x0004
+-#define XUID_OP 0x000e
++#define BASEFONTNAME_OP 0x0c16
++#define CIDCOUNT_OP 0x0c22
++#define CHARSET_OP 0x000f
++#define CHARSTRINGS_OP 0x0011
++#define COPYRIGHT_OP 0x0c00
++#define DEFAULTWIDTH_OP 0x0014
++#define ENCODING_OP 0x0010
++#define FAMILYNAME_OP 0x0003
++#define FDARRAY_OP 0x0c24
++#define FDSELECT_OP 0x0c25
++#define FONTBBOX_OP 0x0005
++#define FONTMATRIX_OP 0x0c07
++#define FONTNAME_OP 0x0c26
++#define FULLNAME_OP 0x0002
++#define LOCAL_SUB_OP 0x0013
++#define NOMINALWIDTH_OP 0x0015
++#define NOTICE_OP 0x0001
++#define POSTSCRIPT_OP 0x0c15
++#define PRIVATE_OP 0x0012
++#define ROS_OP 0x0c1e
++#define UNIQUEID_OP 0x000d
++#define VERSION_OP 0x0000
++#define WEIGHT_OP 0x0004
++#define XUID_OP 0x000e
++#define BLUEVALUES_OP 0x0006
++#define OTHERBLUES_OP 0x0007
++#define FAMILYBLUES_OP 0x0008
++#define FAMILYOTHERBLUES_OP 0x0009
++#define STEMSNAPH_OP 0x0c0c
++#define STEMSNAPV_OP 0x0c0d
+
+ #define NUM_STD_STRINGS 391
+
+@@ -615,13 +621,27 @@ cff_dict_create_operator (int operator,
+ return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+ _cairo_dict_init_key (op, operator);
+- op->operand = _cairo_malloc (size);
+- if (unlikely (op->operand == NULL)) {
+- free (op);
+- return _cairo_error (CAIRO_STATUS_NO_MEMORY);
++ if (size != 0) {
++ op->operand = _cairo_malloc (size);
++ if (unlikely (op->operand == NULL)) {
++ free (op);
++ return _cairo_error (CAIRO_STATUS_NO_MEMORY);
++ }
++ memcpy (op->operand, operand, size);
++ } else {
++ op->operand = NULL;
++ /* Delta-encoded arrays can be empty. */
++ if (operator != BLUEVALUES_OP &&
++ operator != OTHERBLUES_OP &&
++ operator != FAMILYBLUES_OP &&
++ operator != FAMILYOTHERBLUES_OP &&
++ operator != STEMSNAPH_OP &&
++ operator != STEMSNAPV_OP) {
++ free (op);
++ return _cairo_error (CAIRO_STATUS_NO_MEMORY);
++ }
+ }
+
+- memcpy (op->operand, operand, size);
+ op->operand_length = size;
+ op->operand_offset = -1;
+
+--
+2.26.0
+
diff --git a/main/cairo/composite_color_glyphs.patch b/main/cairo/composite_color_glyphs.patch
new file mode 100644
index 0000000000..97440f27f7
--- /dev/null
+++ b/main/cairo/composite_color_glyphs.patch
@@ -0,0 +1,58 @@
+From 79ad01724161502e8d9d2bd384ff1f0174e5df6e Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Thu, 30 May 2019 07:30:55 -0400
+Subject: [PATCH] Fix a thinko in composite_color_glyphs
+
+We can't just move around the contents of the
+passed-in string, we need to make a copy. This
+was showing up as memory corruption in pango.
+
+See https://gitlab.gnome.org/GNOME/pango/issues/346
+---
+ src/cairo-surface.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+Patch-Source: https://github.com/matthiasclasen/cairo/commit/79ad01724161502e8d9d2bd384ff1f0174e5df6e
+
+diff --git a/src/cairo-surface.c b/src/cairo-surface.c
+index c30f84087..e112b660a 100644
+--- a/src/cairo-surface.c
++++ b/src/cairo-surface.c
+@@ -2820,6 +2820,7 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface,
+ const cairo_clip_t *clip)
+ {
+ cairo_int_status_t status;
++ char *utf8_copy = NULL;
+
+ TRACE ((stderr, "%s\n", __FUNCTION__));
+ if (unlikely (surface->status))
+@@ -2847,6 +2848,10 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface,
+ status = CAIRO_INT_STATUS_UNSUPPORTED;
+
+ if (_cairo_scaled_font_has_color_glyphs (scaled_font)) {
++ utf8_copy = malloc (sizeof (char) * utf8_len);
++ memcpy (utf8_copy, utf8, sizeof (char) * utf8_len);
++ utf8 = utf8_copy;
++
+ status = composite_color_glyphs (surface, op,
+ source,
+ (char *)utf8, &utf8_len,
+@@ -2861,6 +2866,8 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface,
+ if (num_glyphs == 0)
+ goto DONE;
+ }
++ else
++ utf8_copy = NULL;
+
+ /* The logic here is duplicated in _cairo_analysis_surface show_glyphs and
+ * show_text_glyphs. Keep in synch. */
+@@ -2918,6 +2925,9 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface,
+ surface->serial++;
+ }
+
++ if (utf8_copy)
++ free (utf8_copy);
++
+ return _cairo_surface_set_error (surface, status);
+ }
+
diff --git a/main/cairo/fix-mask-usage-in-image-compositor.patch b/main/cairo/fix-mask-usage-in-image-compositor.patch
new file mode 100644
index 0000000000..8d5717ffa2
--- /dev/null
+++ b/main/cairo/fix-mask-usage-in-image-compositor.patch
@@ -0,0 +1,172 @@
+From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001
+From: Heiko Lewin <heiko.lewin@worldiety.de>
+Date: Tue, 15 Dec 2020 16:48:19 +0100
+Subject: [PATCH 1/3] Fix mask usage in image-compositor
+
+---
+ src/cairo-image-compositor.c | 8 ++--
+ test/Makefile.sources | 1 +
+ test/bug-image-compositor.c | 39 ++++++++++++++++++++
+ test/reference/bug-image-compositor.ref.png | Bin 0 -> 185 bytes
+ 4 files changed, 44 insertions(+), 4 deletions(-)
+ create mode 100644 test/bug-image-compositor.c
+ create mode 100644 test/reference/bug-image-compositor.ref.png
+
+diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c
+index 79ad69f68..4f8aaed99 100644
+--- a/src/cairo-image-compositor.c
++++ b/src/cairo-image-compositor.c
+@@ -2610,14 +2610,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h,
+ unsigned num_spans)
+ {
+ cairo_image_span_renderer_t *r = abstract_renderer;
+- uint8_t *m;
++ uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask);
+ int x0;
+
+ if (num_spans == 0)
+ return CAIRO_STATUS_SUCCESS;
+
+ x0 = spans[0].x;
+- m = r->_buf;
++ m = base;
+ do {
+ int len = spans[1].x - spans[0].x;
+ if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) {
+@@ -2655,7 +2655,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h,
+ spans[0].x, y,
+ spans[1].x - spans[0].x, h);
+
+- m = r->_buf;
++ m = base;
+ x0 = spans[1].x;
+ } else if (spans[0].coverage == 0x0) {
+ if (spans[0].x != x0) {
+@@ -2684,7 +2684,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h,
+ #endif
+ }
+
+- m = r->_buf;
++ m = base;
+ x0 = spans[1].x;
+ } else {
+ *m++ = spans[0].coverage;
+diff --git a/test/bug-image-compositor.c b/test/bug-image-compositor.c
+new file mode 100644
+index 000000000..fc4fd370b
+--- /dev/null
++++ b/test/bug-image-compositor.c
+@@ -0,0 +1,39 @@
++#include "cairo-test.h"
++
++static cairo_test_status_t
++draw (cairo_t *cr, int width, int height)
++{
++ cairo_set_source_rgb (cr, 0., 0., 0.);
++ cairo_paint (cr);
++
++ cairo_set_source_rgb (cr, 1., 1., 1.);
++ cairo_set_line_width (cr, 1.);
++
++ cairo_pattern_t *p = cairo_pattern_create_linear (0, 0, width, height);
++ cairo_pattern_add_color_stop_rgb (p, 0, 0.99, 1, 1);
++ cairo_pattern_add_color_stop_rgb (p, 1, 1, 1, 1);
++ cairo_set_source (cr, p);
++
++ cairo_move_to (cr, 0.5, -1);
++ for (int i = 0; i < width; i+=3) {
++ cairo_rel_line_to (cr, 2, 2);
++ cairo_rel_line_to (cr, 1, -2);
++ }
++
++ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
++ cairo_stroke (cr);
++
++ cairo_pattern_destroy(p);
++
++ return CAIRO_TEST_SUCCESS;
++}
++
++
++CAIRO_TEST (bug_image_compositor,
++ "Crash in image-compositor",
++ "stroke, stress", /* keywords */
++ NULL, /* requirements */
++ 10000, 1,
++ NULL, draw)
++
++
+
+From 8bc14a6bba3bc8a64ff0749c74d9b96305bf6429 Mon Sep 17 00:00:00 2001
+From: Heiko Lewin <heiko.lewin@worldiety.de>
+Date: Tue, 15 Dec 2020 17:14:18 +0100
+Subject: [PATCH 2/3] Minor cleanups
+
+---
+ test/bug-image-compositor.c | 33 ++++++++++++++++++++++++++++++---
+ 1 file changed, 30 insertions(+), 3 deletions(-)
+
+diff --git a/test/bug-image-compositor.c b/test/bug-image-compositor.c
+index fc4fd370b..304ea089c 100644
+--- a/test/bug-image-compositor.c
++++ b/test/bug-image-compositor.c
+@@ -1,5 +1,34 @@
++/*
++ * Copyright © 2020 Uli Schlachter, Heiko Lewin
++ *
++ * Permission is hereby granted, free of charge, to any person
++ * obtaining a copy of this software and associated documentation
++ * files (the "Software"), to deal in the Software without
++ * restriction, including without limitation the rights to use, copy,
++ * modify, merge, publish, distribute, sublicense, and/or sell copies
++ * of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
++ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
++ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++ * SOFTWARE.
++ *
++ * Author: Uli Schlachter <psychon@znc.in>
++ * Author: Heiko Lewin <hlewin@gmx.de>
++ */
+ #include "cairo-test.h"
+
++
++/* This test reproduces an overflow of a mask-buffer in cairo-image-compositor.c */
++
+ static cairo_test_status_t
+ draw (cairo_t *cr, int width, int height)
+ {
+@@ -13,6 +42,7 @@ draw (cairo_t *cr, int width, int height)
+ cairo_pattern_add_color_stop_rgb (p, 0, 0.99, 1, 1);
+ cairo_pattern_add_color_stop_rgb (p, 1, 1, 1, 1);
+ cairo_set_source (cr, p);
++ cairo_pattern_destroy(p);
+
+ cairo_move_to (cr, 0.5, -1);
+ for (int i = 0; i < width; i+=3) {
+@@ -23,8 +53,6 @@ draw (cairo_t *cr, int width, int height)
+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+ cairo_stroke (cr);
+
+- cairo_pattern_destroy(p);
+-
+ return CAIRO_TEST_SUCCESS;
+ }
+
+@@ -36,4 +64,3 @@ CAIRO_TEST (bug_image_compositor,
+ 10000, 1,
+ NULL, draw)
+
+-
+--
+GitLab
+
diff --git a/main/ccache/APKBUILD b/main/ccache/APKBUILD
index 61a560ada2..e2d9ee5a60 100644
--- a/main/ccache/APKBUILD
+++ b/main/ccache/APKBUILD
@@ -1,18 +1,23 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ccache
-pkgver=4.2
+pkgver=4.2.1
pkgrel=0
pkgdesc="fast C/C++ compiler cache"
-options="!check" # Tests fail on the builders
+options="!check" # fails on builders, passes on CI
url="https://ccache.dev/"
arch="all"
license="GPL-3.0-or-later"
makedepends="cmake zstd-dev asciidoc perl"
-checkdepends="bash perl"
+checkdepends="bash"
subpackages="$pkgname-doc"
source="https://github.com/ccache/ccache/releases/download/v$pkgver/ccache-$pkgver.tar.xz"
+case $CARCH in
+ppc64le) ;; # https://github.com/ccache/ccache/issues/820
+*) makedepends="$makedepends linux-headers" ;;
+esac
+
build() {
cmake -B build \
-DCMAKE_BUILD_TYPE=None \
@@ -37,4 +42,4 @@ package() {
done
}
-sha512sums="b7e5823a0705b9a1100c959281170dcd682228b585c329821337ef57d5b5cf47d6f3d644a6d5a3675a32a02730559f8fe6d84d11f01847f47b77c0893d1d1fbe ccache-4.2.tar.xz"
+sha512sums="46bb760ddad5999c5bdff4f3ce6e405eb2018c4a591ad76ba3dd7921b8bfd59a257d992d285e38d69aaf86537962602689175b8741894094819775eec9493b77 ccache-4.2.1.tar.xz"
diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD
index 6965268ccc..1429c8a72a 100644
--- a/main/chrony/APKBUILD
+++ b/main/chrony/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=chrony
pkgver=4.0
-pkgrel=1
+pkgrel=2
pkgdesc="NTP client and server programs"
url="https://chrony.tuxfamily.org"
pkgusers="$pkgname"
@@ -11,7 +11,7 @@ pkggroups="$pkgname"
arch="all"
license="GPL-2.0-only"
install="$pkgname.pre-install $pkgname.pre-upgrade"
-makedepends="asciidoctor libcap-dev texinfo"
+makedepends="asciidoctor libcap-dev texinfo nettle-dev gnutls-dev"
checkdepends="bash"
subpackages="$pkgname-doc $pkgname-openrc"
source="https://download.tuxfamily.org/chrony/chrony-$pkgver.tar.gz
@@ -41,7 +41,6 @@ prepare() {
build() {
CPPFLAGS="$CPPFLAGS -I./pps-tools/" ./configure \
--prefix=/usr \
- --infodir=/usr/share/info \
--mandir=/usr/share/man \
--sysconfdir=/etc/$pkgname \
--disable-readline \
diff --git a/main/cifs-utils/APKBUILD b/main/cifs-utils/APKBUILD
index 836599ab17..7caf96d1fb 100644
--- a/main/cifs-utils/APKBUILD
+++ b/main/cifs-utils/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=cifs-utils
-pkgver=6.12
+pkgver=6.13
pkgrel=0
pkgdesc="CIFS filesystem user-space tools"
url="https://wiki.samba.org/index.php/LinuxCIFS_utils"
@@ -44,6 +44,6 @@ package() {
chmod +s $pkgdir/sbin/mount.cifs
}
-sha512sums="2f2e1cba8d56c9039fc28236fa63812a09f07f14931c3bd7bd5ae3e6aeb372130c5a059569d8714fb973bea87eba394fd30228fbaeabe700961bba400dd01ca6 cifs-utils-6.12.tar.bz2
+sha512sums="1337ac4b69f0c3e8d0241eb608207ba81dfa35f84c661649d25da78637882c4d73467b0f632be0bd120362e0b786e40eb340bffcf21c8a09629c441100fd10de cifs-utils-6.13.tar.bz2
99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch
2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch"
diff --git a/main/cjdns/APKBUILD b/main/cjdns/APKBUILD
index bcbabebb1e..995a2e1e30 100644
--- a/main/cjdns/APKBUILD
+++ b/main/cjdns/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
pkgname=cjdns
pkgver=21.1
-pkgrel=0
+pkgrel=1
pkgdesc="A routing engine designed for security, scalability, speed and ease of use"
url="https://github.com/cjdelisle/cjdns"
arch="all !mips64 !s390x !ppc64le"
diff --git a/main/cjson/APKBUILD b/main/cjson/APKBUILD
index bbb539c1aa..35a7ba793a 100644
--- a/main/cjson/APKBUILD
+++ b/main/cjson/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer:
pkgname=cjson
pkgver=1.7.14
-pkgrel=0
+pkgrel=1
pkgdesc="Lighweight JSON parser in C"
url="https://github.com/DaveGamble/cJSON"
arch="all"
diff --git a/main/ckbcomp/APKBUILD b/main/ckbcomp/APKBUILD
index 8cf27fa93d..64414b7083 100644
--- a/main/ckbcomp/APKBUILD
+++ b/main/ckbcomp/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ckbcomp
-pkgver=1.199
+pkgver=1.202
pkgrel=0
pkgdesc="Compile a XKB keyboard description to a keymap"
url="http://anonscm.debian.org/cgit/d-i/console-setup.git"
@@ -10,11 +10,11 @@ depends="perl"
options="!check"
subpackages="$pkgname-doc"
source="http://ftp.debian.org/debian/pool/main/c/console-setup/console-setup_$pkgver.tar.xz"
-builddir="$srcdir"/console-setup
+builddir="$srcdir"/console-setup-$pkgver
package() {
install -D -m755 Keyboard/$pkgname $pkgdir/usr/bin/$pkgname
install -D -m644 man/$pkgname.1 $pkgdir/usr/share/man/man1/$pkgname.1
}
-sha512sums="8d969de9e6c300c799fb8c58c5300112c1576768c41cd29a9185ecbf0d5c5205356439b54141f00ef4e76ceaf3dc2106cb5fd3e9ec430a205183c07bea341d96 console-setup_1.199.tar.xz"
+sha512sums="caa7dcf667d44edab97811d8f95a3532af6d340e217e4a2acfa02f8812625522823e8d90bd35f701f3fc0b6c6e3b867a0a58c5c2323c64022f2c5ca3527e7d33 console-setup_1.202.tar.xz"
diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
deleted file mode 100644
index a4a49bd366..0000000000
--- a/main/clamav/APKBUILD
+++ /dev/null
@@ -1,261 +0,0 @@
-# Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
-# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
-pkgname=clamav
-pkgver=0.103.1
-pkgrel=0
-pkgusers="clamav"
-pkggroups="clamav"
-pkgdesc="An anti-virus toolkit for UNIX eis-ng backport"
-url="https://www.clamav.net/"
-arch="all"
-license="GPL-2.0-only WITH OpenSSL-Exception"
-depends="$pkgname-scanner $pkgname-daemon"
-depends_dev="openssl-dev"
-install="freshclam.pre-install
- clamav-daemon.pre-install clamav-daemon.pre-upgrade"
-makedepends="ncurses-dev zlib-dev bzip2-dev pcre-dev linux-headers $depends_dev
- libmilter-dev fts-dev curl-dev autoconf automake libtool"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-libunrar $pkgname-libs
- $pkgname-daemon $pkgname-clamdscan $pkgname-scanner $pkgname-db::noarch freshclam
- $pkgname-daemon-openrc:daemon_rc:noarch freshclam-openrc:freshclam_rc:noarch
- $pkgname-milter"
-source="https://www.clamav.net/downloads/production/clamav-$pkgver.tar.gz
- clamd.initd
- clamd.confd
- freshclam.initd
- freshclam.confd
- clamd.logrotate
- freshclam.logrotate
- "
-
-
-# secfixes:
-# 0.102.4-r0:
-# - CVE-2020-3350
-# - CVE-2020-3481
-# 0.102.3-r0:
-# - CVE-2020-3327
-# - CVE-2020-3341
-# 0.102.1-r0:
-# - CVE-2020-3123
-# 0.102.0-r0:
-# - CVE-2019-15961
-# 0.101.4-r0:
-# - CVE-2019-12625
-# 0.100.3-r0:
-# - CVE-2019-1787
-# - CVE-2019-1788
-# - CVE-2019-1789
-# 0.99.4-r0:
-# - CVE-2012-6706
-# - CVE-2017-6419
-# - CVE-2017-11423
-# - CVE-2018-0202
-# - CVE-2018-1000085
-# 0.99.3-r0:
-# - CVE-2017-12374
-# - CVE-2017-12375
-# - CVE-2017-12376
-# - CVE-2017-12377
-# - CVE-2017-12378
-# - CVE-2017-12379
-# - CVE-2017-12380
-# 0.100.1-r0:
-# - CVE-2017-16932
-# - CVE-2018-0360
-# - CVE-2018-0361
-# 0.100.2-r0:
-# - CVE-2018-15378
-# - CVE-2018-14680
-# - CVE-2018-14681
-# - CVE-2018-14682
-
-prepare() {
- update_config_sub
- default_prepare
- autoreconf -ifv
-}
-
-build() {
- LIBS=-lfts ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --libdir=/usr/lib \
- --sysconfdir=/etc/clamav \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --without-iconv \
- --disable-llvm \
- --with-user=clamav \
- --with-group=clamav \
- --with-dbdir=/var/lib/clamav \
- --enable-clamdtop \
- --enable-bigstack \
- --with-pcre \
- --enable-milter \
- --enable-clamonacc
- make
-}
-
-check() {
- make check
-}
-
-package() {
- make DESTDIR="$pkgdir" install
-
- # set proper defaults
- sed -i -e "s:^\(Example\):\# \1:" \
- -e "s:.*\(PidFile\) .*:\1 /run/clamav/freshclam.pid:" \
- -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
- -e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
- -e "s:^\#\(NotifyClamd\).*:\1 /etc/clamav/clamd.conf:" \
- -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
- -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
- "$pkgdir"/etc/clamav/freshclam.conf.sample
-
- # set proper defaults
- sed -i -e "s:^\(Example\):\# \1:" \
- -e "s:.*\(PidFile\) .*:\1 /run/clamav/clamd.pid:" \
- -e "s:.*\(LocalSocket\) .*:\1 /run/clamav/clamd.sock:" \
- -e "s:.*\(User\) .*:\1 clamav:" \
- -e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
- -e "s:^\#\(LogTime\).*:\1 yes:" \
- -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
- "$pkgdir"/etc/clamav/clamd.conf.sample
-}
-
-check() {
- make check
-}
-
-libunrar() {
- pkgdesc="ClamAV unrar libraries"
- replaces="clamav"
- depends=
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libclamunrar* \
- "$subpkgdir"/usr/lib/
-}
-
-freshclam() {
- pkgdesc="Auto-updater for the Clam Antivirus scanner data-files"
- replaces="clamav clamav-db"
- depends=
- mkdir -p "$subpkgdir"/usr/bin \
- "$subpkgdir"/etc/clamav
-
- mv "$pkgdir"/usr/bin/freshclam "$subpkgdir"/usr/bin
- mv "$pkgdir"/etc/clamav/freshclam.conf.sample \
- "$subpkgdir"/etc/clamav/freshclam.conf
-
- install -d -m755 -o clamav -g clamav \
- "$subpkgdir"/var/log/clamav \
- "$subpkgdir"/var/lib/clamav
-
- install -m644 -D "$srcdir"/freshclam.logrotate \
- "$subpkgdir"/etc/logrotate.d/freshclam
-}
-
-freshclam_rc() {
- pkgdesc="Auto-updater for the Clam Antivirus scanner data-files (OpenRC init scripts)"
- install_if="freshclam=$pkgver-r$pkgrel openrc"
- replaces="clamav freshclam"
- depends=
- mkdir -p "$subpkgdir"/etc/init.d \
- "$subpkgdir"/etc/conf.d
-
- install -m755 -D "$srcdir"/freshclam.initd \
- "$subpkgdir"/etc/init.d/freshclam
- install -m644 -D "$srcdir"/freshclam.confd \
- "$subpkgdir"/etc/conf.d/freshclam
-}
-
-db() {
- pkgdesc="ClamAV dummy package for compatibility"
- replaces="clamav"
- depends="freshclam"
- mkdir -p "$subpkgdir"/var/lib/ \
- "$subpkgdir"/usr/bin \
- "$subpkgdir"/etc/clamav
- install -d -m755 -o clamav -g clamav \
- "$subpkgdir"/var/log/clamav \
- "$subpkgdir"/var/lib/clamav
-}
-
-scanner() {
- pkgdesc="ClamAV command-line scanner and utils"
- replaces="clamav"
- depends="freshclam"
- mkdir -p "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/clamscan \
- "$subpkgdir"/usr/bin/
- mv "$pkgdir"/usr/bin/sigtool \
- "$subpkgdir"/usr/bin/
- mv "$pkgdir"/usr/bin/clambc \
- "$subpkgdir"/usr/bin/
-}
-
-clamdscan() {
- pkgdesc="ClamAV daemon client"
- depends="openssl"
- mkdir -p "$subpkgdir"/usr/bin/
- mv "$pkgdir"/usr/bin/clamdscan \
- "$subpkgdir"/usr/bin/
-}
-
-daemon() {
- pkgdesc="ClamAV daemon scanner"
- replaces="clamav"
- depends="freshclam $pkgname-clamdscan"
- mkdir -p "$subpkgdir"/usr/bin \
- "$subpkgdir"/usr/sbin \
- "$subpkgdir"/etc/clamav
- install -d -m 755 -o clamav -g clamav \
- "$subpkgdir"/var/log/clamav \
- "$subpkgdir"/var/lib/clamav
- mv "$pkgdir"/usr/bin/clamconf \
- "$subpkgdir"/usr/bin/
- mv "$pkgdir"/usr/sbin/clamd \
- "$subpkgdir"/usr/sbin/
- mv "$pkgdir"/usr/bin/clamdtop \
- "$subpkgdir"/usr/bin/
- mv "$pkgdir"/etc/clamav/clamd.conf.sample \
- "$subpkgdir"/etc/clamav/clamd.conf
- install -m644 -D "$srcdir"/clamd.logrotate \
- "$subpkgdir"/etc/logrotate.d/clamd
-}
-
-daemon_rc() {
- pkgdesc="ClamAV anti-virus scanner daemon (OpenRC init scripts)"
- replaces="clamav"
- depends="freshclam-openrc"
- install_if="$pkgname-daemon=$pkgver-r$pkgrel openrc"
-
- install -m755 -D "$srcdir"/clamd.initd \
- "$subpkgdir"/etc/init.d/clamd
- install -m644 -D "$srcdir"/clamd.confd \
- "$subpkgdir"/etc/conf.d/clamd
-}
-
-milter() {
- pkgdesc="ClamAV milter"
- depends=
- mkdir -p "$subpkgdir"/usr/sbin \
- "$subpkgdir"/etc/clamav
- mv "$pkgdir"/usr/sbin/clamav-milter \
- "$subpkgdir"/usr/sbin/
- mv "$pkgdir"/etc/clamav/clamav-milter.conf.sample \
- "$subpkgdir"/etc/clamav/clamav-milter.conf
-}
-
-sha512sums="f13e9542898ef42c0db6f7826bcb220b9cb57de2a88bfedc6c991b76ff06c59290522d31119132eaa2093da58c5069d63103f6260e271497bda2b472c3cd6ffb clamav-0.103.1.tar.gz
-d886d810de66e8da800384c1e8192f7da4352402ffc3b33cfbca93d81a2235d8c902ca9d436b9be70f00740b4555e1efbf09bf9f84059095a1a297b27581cd20 clamd.initd
-59c561b3dcb0b616b647cd8e4ebc46a2cc5e7144c8c7ea0054cc1c3021d1da8f67e4dad5c083c3fe712ed887aaabfca91b538f4759537e7c4c9ab71ba4fd5794 clamd.confd
-6f0c615b89f0f0d2f0e9f965f025b9ac8c81b2168fa6727dc8a47222abd780f9b656732f289d6061a20126b16126a975d50e8b3b8ff131f55dd8803da8be5dec freshclam.initd
-ba181fe1abaac7b898ccb40b0713455aa3c9d5e25ad21d687b6cac09b0105b9e376526e7c776a44636234d8db819709d8d6a6cc76119bc3e98b637b1a3f26c08 freshclam.confd
-3ae493dd1610a819402c015f6b8c0f080f926b72dc43d2bded60030bf6a55040e4b88e0f64d3aae299dc1133d7e1b89855e7346b4665a64e8b82592f7b75cf6a clamd.logrotate
-30cff378bc28c76b795e00c92ae5ee623f3abe4a19bed61dd8403c96e72658bb02b7f040d26a6258104af754464d25ea7d9646918c4b47d2ba9a8cbf4687056c freshclam.logrotate"
diff --git a/main/clamav/clamav-daemon.pre-install b/main/clamav/clamav-daemon.pre-install
deleted file mode 100644
index a5da829031..0000000000
--- a/main/clamav/clamav-daemon.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S clamav 2>/dev/null
-adduser -S -D -H -h /var/lib/clamav -s /sbin/nologin -G clamav -g clamav clamav 2>/dev/null
-
-exit 0
diff --git a/main/clamav/clamav-daemon.pre-upgrade b/main/clamav/clamav-daemon.pre-upgrade
deleted file mode 100644
index c8f82dacd4..0000000000
--- a/main/clamav/clamav-daemon.pre-upgrade
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# make sure we don't lose our config
-mkdir -p /etc/clamav
-if [ -f /etc/clamav.conf ]; then
- mv /etc/clamav.conf /etc/clamav/
- ln -s clamav/clamav.conf /etc/clamav.conf
-fi
-
-exit 0
-
diff --git a/main/clamav/clamav-db.pre-install b/main/clamav/clamav-db.pre-install
deleted file mode 100644
index fdb83a0904..0000000000
--- a/main/clamav/clamav-db.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S clamav 2>/dev/null
-adduser -S -D -H -s /sbin/nologin -G clamav -g clamav clamav 2>/dev/null
-
-exit 0
diff --git a/main/clamav/clamav-db.pre-upgrade b/main/clamav/clamav-db.pre-upgrade
deleted file mode 100644
index 47230e16b2..0000000000
--- a/main/clamav/clamav-db.pre-upgrade
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# make sure we don't lose our config
-mkdir -p /etc/clamav
-if [ -f /etc/freshclam.conf ]; then
- mv /etc/freshclam.conf /etc/clamav/
- ln -s clamav/freshclam.conf /etc/freshclam.conf
-fi
-
-exit 0
-
diff --git a/main/clamav/clamd.confd b/main/clamav/clamd.confd
deleted file mode 100644
index bdf73b0fb4..0000000000
--- a/main/clamav/clamd.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-
-CLAMD_NICELEVEL=0
-
-# make sure we also start freshclam
-# comment out if you dont want start freshclam
-rc_need="freshclam"
-
-# timeout for the database download
-FRESHCLAM_TIMEOUT=120
diff --git a/main/clamav/clamd.initd b/main/clamav/clamd.initd
deleted file mode 100755
index c38868a5c4..0000000000
--- a/main/clamav/clamd.initd
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/sbin/openrc-run
-
-NAME=clamd
-CONF=/etc/clamav/clamd.conf
-
-pidfile=/run/clamav/clamd.pid
-command=/usr/sbin/clamd
-extra_started_commands="reload"
-extra_commands="logfix"
-required_files=$CONF
-
-depend() {
- need net
- after firewall
- provide antivirus
-}
-
-start_pre() {
- # fix clamd run permissions
- local pid=`awk '$1 == "PidFile" { print $2 }' $CONF`
- [ "x$pid" != "x" ] && pidfile=$pid
- local socket=`awk '$1 == "LocalSocket" { print $2 }' $CONF`
- local socketdir=${socket%/*}
- local clamav_user=`awk '$1 == "User" { print $2 }' $CONF`
- checkpath --directory --owner ${clamav_user:-clamav} \
- --mode 750 ${pidfile%/*}
- checkpath --directory --owner ${clamav_user:-clamav} \
- --mode 755 ${socketdir:-/run/clamav}
-}
-
-start() {
- local clamd_socket=$(awk '$1 == "LocalSocket" { print $2 }' $CONF)
-
- logfix
-
- if [ -S "${clamd_socket:=/tmp/clamd}" ]; then
- rm -f ${clamd_socket}
- fi
-
- local dbdir=$(awk '$1 == "DatabaseDirectory" { print $2 }' $CONF)
- local timeout=${FRESHCLAM_TIMEOUT:-120}
- local cvd="${dbdir:-/var/lib/clamav}"/main.cvd
- local cld="${dbdir:-/var/lib/clamav}"/main.cld
-
- if ! [ -e "$cld" ]; then
- if ! [ -e "$cvd" ]; then
- ebegin "Waiting for clamav database download"
- while ! [ -e "$cvd" ]; do
- timeout=$(( $timeout - 1 ))
- if [ $timeout -eq 0 ]; then
- eend 1 "Timed out"
- return 1
- fi
- sleep 1
- done
- eend 0
- fi
- fi
- ebegin "Starting ${NAME}"
- start-stop-daemon --start --quiet \
- --nicelevel ${CLAMD_NICELEVEL:-0} \
- --exec $command
- eend $? "Failed to start ${NAME}"
-}
-
-reload() {
- ebegin "Reloading ${SVCNAME}"
- start-stop-daemon --signal HUP --pidfile $pidfile --name $SVCNAME
- eend $?
-}
-
-logfix() {
- # fix clamd log permissions
- # (might be clobbered by logrotate or something)
- local logfile=`awk '$1 == "LogFile" { print $2 }' $CONF`
- local clamav_user=`awk '$1 == "User" { print $2 }' $CONF`
- if [ -n "${logfile}" ] && [ -n "${clamav_user}" ]; then
- if [ ! -f "${logfile}" ]; then
- checkpath -Fm 0640 -o ${clamav_user} ${logfile}
- else
- chmod 640 ${logfile}
- chown ${clamav_user} ${logfile}
- fi
- fi
-}
diff --git a/main/clamav/clamd.logrotate b/main/clamav/clamd.logrotate
deleted file mode 100644
index dc0f5ca38e..0000000000
--- a/main/clamav/clamd.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/clamav/clamd.log {
- missingok
- postrotate
- /etc/init.d/clamd --quiet logfix
- /etc/init.d/clamd --quiet --ifstarted reload
- endscript
-}
diff --git a/main/clamav/freshclam.confd b/main/clamav/freshclam.confd
deleted file mode 100644
index 17559037da..0000000000
--- a/main/clamav/freshclam.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-
-FRESHCLAM_NICELEVEL=0
-
diff --git a/main/clamav/freshclam.initd b/main/clamav/freshclam.initd
deleted file mode 100644
index 6589da0bca..0000000000
--- a/main/clamav/freshclam.initd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/openrc-run
-
-CONF=/etc/clamav/freshclam.conf
-
-pidfile=/run/clamav/freshclam.pid
-command=/usr/bin/freshclam
-extra_started_commands="reload"
-extra_commands="logfix"
-required_files=$CONF
-
-depend() {
- need net
- after firewall
-}
-
-start_pre() {
- local pid=`awk '$1 == "PidFile" { print $2 }' $CONF`
- local owner=`awk '$1 == "DatabaseOwner" { print $2 }' $CONF`
- [ "x$pid" != "x" ] && pidfile=$pid
- checkpath --directory --owner ${owner:-clamav} \
- --mode 750 ${pidfile%/*}
-}
-
-start() {
- ebegin "Starting freshclam"
- start-stop-daemon --start --quiet \
- --nicelevel ${FRESHCLAM_NICELEVEL:-0} \
- --exec $command \
- -- \
- --daemon \
- --pid=$pidfile
- eend $?
-}
-
-reload() {
- ebegin "Reloading ${SVCNAME}"
- start-stop-daemon --signal HUP --pidfile $pidfile --name $SVCNAME
- eend $?
-}
-
-logfix() {
- # fix freshclam log permissions
- # (might be clobbered by logrotate or something)
- logfile=$(awk '$1 == "UpdateLogFile" { print $2 }' $CONF)
- local freshclam_user=$(awk '$1 == "DatabaseOwner" { print $2 }' $CONF)
- if [ -n "${logfile}" -a -n "${clamav_user}" ]; then
- if [ ! -f "${logfile}" ]; then
- checkpath -fm 0640 ${logfile}
- else
- chmod 640 ${logfile}
- fi
- chown ${freshclam_user} ${logfile}
- fi
-}
diff --git a/main/clamav/freshclam.logrotate b/main/clamav/freshclam.logrotate
deleted file mode 100644
index 18117eeb2a..0000000000
--- a/main/clamav/freshclam.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/clamav/freshclam.log {
- missingok
- postrotate
- /etc/init.d/freshclam --quiet logfix
- /etc/init.d/freshclam --quiet --ifstarted reload
- endscript
-}
diff --git a/main/clamav/freshclam.pre-install b/main/clamav/freshclam.pre-install
deleted file mode 100644
index a5da829031..0000000000
--- a/main/clamav/freshclam.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S clamav 2>/dev/null
-adduser -S -D -H -h /var/lib/clamav -s /sbin/nologin -G clamav -g clamav clamav 2>/dev/null
-
-exit 0
diff --git a/main/clang/10-add-musl-triples.patch b/main/clang/10-add-musl-triples.patch
index fd3f3cd09c..27e28aa1d3 100644
--- a/main/clang/10-add-musl-triples.patch
+++ b/main/clang/10-add-musl-triples.patch
@@ -2,7 +2,7 @@ diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
index da197e47..505439ea 100644
--- a/lib/Driver/ToolChains/Gnu.cpp
+++ b/lib/Driver/ToolChains/Gnu.cpp
-@@ -1997,6 +1997,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+@@ -2049,6 +2049,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
static const char *const AArch64Triples[] = {
"aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
@@ -10,7 +10,7 @@ index da197e47..505439ea 100644
"aarch64-suse-linux", "aarch64-linux-android"};
static const char *const AArch64beLibDirs[] = {"/lib"};
static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
-@@ -2006,6 +2007,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+@@ -2058,6 +2059,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
static const char *const ARMTriples[] = {"arm-linux-gnueabi",
"arm-linux-androideabi"};
static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
@@ -19,7 +19,7 @@ index da197e47..505439ea 100644
"armv7hl-redhat-linux-gnueabi",
"armv6hl-suse-linux-gnueabi",
"armv7hl-suse-linux-gnueabi"};
-@@ -2025,6 +2028,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+@@ -2077,6 +2080,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
"x86_64-redhat-linux", "x86_64-suse-linux",
"x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
"x86_64-slackware-linux", "x86_64-unknown-linux",
@@ -27,7 +27,7 @@ index da197e47..505439ea 100644
"x86_64-amazon-linux", "x86_64-linux-android"};
static const char *const X32LibDirs[] = {"/libx32"};
static const char *const X86LibDirs[] = {"/lib32", "/lib"};
-@@ -2034,6 +2038,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+@@ -2086,6 +2090,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
"i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux",
"i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu",
"i686-linux-android", "i386-gnu", "i486-gnu",
diff --git a/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch b/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
index b8bd2e15fd..674486cbe0 100644
--- a/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+++ b/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
@@ -1,13 +1,14 @@
Based on original patchset from Jakub Jirutka <jakub@jirutka.cz>
Updated by Eric Molitor <eric@molitor.org>
Updated by Natanael Copa <ncopa@alpinelinux.org>
+Updated by omni <omni+alpine@hack.org>
diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp
index f8f3623..9c8c748 100644
--- a/lib/Driver/ToolChains/Linux.cpp
+++ b/lib/Driver/ToolChains/Linux.cpp
-@@ -907,6 +907,13 @@ bool Linux::isPIEDefault() const {
- getTriple().isMusl() || getSanitizerArgs().requiresPIE();
+@@ -833,6 +833,13 @@ bool Linux::isPIEDefault() const {
+ return Generic_ELF::IsMathErrnoDefault();
}
+unsigned Linux::GetDefaultStackProtectorLevel(bool KernelOrKext) const {
@@ -24,7 +25,7 @@ diff --git a/lib/Driver/ToolChains/Linux.h b/lib/Driver/ToolChains/Linux.h
index 22dbbec..ba0d558 100644
--- a/lib/Driver/ToolChains/Linux.h
+++ b/lib/Driver/ToolChains/Linux.h
-@@ -39,6 +39,7 @@
+@@ -38,6 +38,7 @@
CXXStdlibType GetDefaultCXXStdlibType() const override;
bool isPIEDefault() const override;
bool isNoExecStackDefault() const override;
@@ -36,7 +37,7 @@ diff --git a/test/Driver/fsanitize.c b/test/Driver/fsanitize.c
index 304e759..29ead22 100644
--- a/test/Driver/fsanitize.c
+++ b/test/Driver/fsanitize.c
-@@ -585,18 +585,17 @@
+@@ -662,18 +662,17 @@
// RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
// NOSP-NOT: "-fsanitize=safe-stack"
diff --git a/main/clang/30-fix-python-shebangs.patch b/main/clang/30-fix-python-shebangs.patch
deleted file mode 100644
index 41bee37424..0000000000
--- a/main/clang/30-fix-python-shebangs.patch
+++ /dev/null
@@ -1,391 +0,0 @@
-diff --git a/bindings/python/examples/cindex/cindex-dump.py b/bindings/python/examples/cindex/cindex-dump.py
-index 46073b28..fc513c7e 100644
---- a/bindings/python/examples/cindex/cindex-dump.py
-+++ b/bindings/python/examples/cindex/cindex-dump.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #===- cindex-dump.py - cindex/Python Source Dump -------------*- python -*--===#
- #
-diff --git a/bindings/python/examples/cindex/cindex-includes.py b/bindings/python/examples/cindex/cindex-includes.py
-index ec1fbc0c..be600342 100644
---- a/bindings/python/examples/cindex/cindex-includes.py
-+++ b/bindings/python/examples/cindex/cindex-includes.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #===- cindex-includes.py - cindex/Python Inclusion Graph -----*- python -*--===#
- #
-diff --git a/docs/tools/dump_ast_matchers.py b/docs/tools/dump_ast_matchers.py
-index c96c1ca2..26cf4156 100755
---- a/docs/tools/dump_ast_matchers.py
-+++ b/docs/tools/dump_ast_matchers.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # A tool to parse ASTMatchers.h and update the documentation in
- # ../LibASTMatchersReference.html automatically. Run from the
- # directory in which this file is located to update the docs.
-diff --git a/docs/tools/dump_format_style.py b/docs/tools/dump_format_style.py
-index 5feb793a..e18a2ffb 100755
---- a/docs/tools/dump_format_style.py
-+++ b/docs/tools/dump_format_style.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # A tool to parse the FormatStyle struct from Format.h and update the
- # documentation in ../ClangFormatStyleOptions.rst automatically.
- # Run from the directory in which this file is located to update the docs.
-diff --git a/test/AST/gen_ast_dump_json_test.py b/test/AST/gen_ast_dump_json_test.py
-index 975039ea..9a6ee94c 100644
---- a/test/AST/gen_ast_dump_json_test.py
-+++ b/test/AST/gen_ast_dump_json_test.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- from collections import OrderedDict
- from sets import Set
-diff --git a/tools/clang-format/clang-format-diff.py b/tools/clang-format/clang-format-diff.py
-index 3ba0abef..6b0425a7 100755
---- a/tools/clang-format/clang-format-diff.py
-+++ b/tools/clang-format/clang-format-diff.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- #===- clang-format-diff.py - ClangFormat Diff Reformatter ----*- python -*--===#
- #
-diff --git a/tools/clang-format/git-clang-format b/tools/clang-format/git-clang-format
-index ef7f22d0..4ea4521f 100755
---- a/tools/clang-format/git-clang-format
-+++ b/tools/clang-format/git-clang-format
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- #===- git-clang-format - ClangFormat Git Integration ---------*- python -*--===#
- #
-diff --git a/tools/scan-build-py/bin/analyze-build b/tools/scan-build-py/bin/analyze-build
-index 6c285874..5b270d54 100755
---- a/tools/scan-build-py/bin/analyze-build
-+++ b/tools/scan-build-py/bin/analyze-build
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
- # See https://llvm.org/LICENSE.txt for license information.
-diff --git a/tools/scan-build-py/bin/analyze-c++ b/tools/scan-build-py/bin/analyze-c++
-index 564e2abf..b2b60a44 100755
---- a/tools/scan-build-py/bin/analyze-c++
-+++ b/tools/scan-build-py/bin/analyze-c++
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
- # See https://llvm.org/LICENSE.txt for license information.
-diff --git a/tools/scan-build-py/bin/analyze-cc b/tools/scan-build-py/bin/analyze-cc
-index 564e2abf..b2b60a44 100755
---- a/tools/scan-build-py/bin/analyze-cc
-+++ b/tools/scan-build-py/bin/analyze-cc
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
- # See https://llvm.org/LICENSE.txt for license information.
-diff --git a/tools/scan-build-py/bin/intercept-build b/tools/scan-build-py/bin/intercept-build
-index 23f51047..fe45c545 100755
---- a/tools/scan-build-py/bin/intercept-build
-+++ b/tools/scan-build-py/bin/intercept-build
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
- # See https://llvm.org/LICENSE.txt for license information.
-diff --git a/tools/scan-build-py/bin/intercept-c++ b/tools/scan-build-py/bin/intercept-c++
-index 4230c803..0cba3a3c 100755
---- a/tools/scan-build-py/bin/intercept-c++
-+++ b/tools/scan-build-py/bin/intercept-c++
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
- # See https://llvm.org/LICENSE.txt for license information.
-diff --git a/tools/scan-build-py/bin/intercept-cc b/tools/scan-build-py/bin/intercept-cc
-index 4230c803..0cba3a3c 100755
---- a/tools/scan-build-py/bin/intercept-cc
-+++ b/tools/scan-build-py/bin/intercept-cc
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
- # See https://llvm.org/LICENSE.txt for license information.
-diff --git a/tools/scan-build-py/bin/scan-build b/tools/scan-build-py/bin/scan-build
-index 156da064..4fa08175 100755
---- a/tools/scan-build-py/bin/scan-build
-+++ b/tools/scan-build-py/bin/scan-build
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
- # See https://llvm.org/LICENSE.txt for license information.
-diff --git a/tools/scan-view/bin/scan-view b/tools/scan-view/bin/scan-view
-index 6165432e..07effbca 100755
---- a/tools/scan-view/bin/scan-view
-+++ b/tools/scan-view/bin/scan-view
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- from __future__ import print_function
-
-diff --git a/tools/scan-view/share/Reporter.py b/tools/scan-view/share/Reporter.py
-index b1ff1614..d6300e78 100644
---- a/tools/scan-view/share/Reporter.py
-+++ b/tools/scan-view/share/Reporter.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
-
- """Methods for reporting bugs."""
-diff --git a/tools/scan-view/share/startfile.py b/tools/scan-view/share/startfile.py
-index 9eb548bc..cdf3db27 100644
---- a/tools/scan-view/share/startfile.py
-+++ b/tools/scan-view/share/startfile.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
-
- """Utility for opening a file using the default application in a cross-platform
-diff --git a/utils/ABITest/ABITestGen.py b/utils/ABITest/ABITestGen.py
-index 93a6de93..efb35fa7 100755
---- a/utils/ABITest/ABITestGen.py
-+++ b/utils/ABITest/ABITestGen.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- from __future__ import absolute_import, division, print_function
- from pprint import pprint
-diff --git a/utils/CIndex/completion_logger_server.py b/utils/CIndex/completion_logger_server.py
-index 20166711..02d7cd6f 100755
---- a/utils/CIndex/completion_logger_server.py
-+++ b/utils/CIndex/completion_logger_server.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- from __future__ import absolute_import, division, print_function
- import sys
- from socket import *
-diff --git a/utils/CaptureCmd b/utils/CaptureCmd
-index 705585c3..5ffdfe56 100755
---- a/utils/CaptureCmd
-+++ b/utils/CaptureCmd
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """CaptureCmd - A generic tool for capturing information about the
- invocations of another program.
-diff --git a/utils/CmpDriver b/utils/CmpDriver
-index 12ce7a32..c2b6ab5e 100755
---- a/utils/CmpDriver
-+++ b/utils/CmpDriver
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- A simple utility that compares tool invocations and exit codes issued by
-diff --git a/utils/FindSpecRefs b/utils/FindSpecRefs
-index 9097f93f..3ad581b3 100755
---- a/utils/FindSpecRefs
-+++ b/utils/FindSpecRefs
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- import os
- import re
-diff --git a/utils/FuzzTest b/utils/FuzzTest
-index 0e043df7..c4c956b6 100755
---- a/utils/FuzzTest
-+++ b/utils/FuzzTest
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- This is a generic fuzz testing tool, see --help for more information.
-diff --git a/utils/TestUtils/deep-stack.py b/utils/TestUtils/deep-stack.py
-index 10bf47ac..5fb8d0df 100755
---- a/utils/TestUtils/deep-stack.py
-+++ b/utils/TestUtils/deep-stack.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- from __future__ import absolute_import, division, print_function
- def pcall(f, N):
-diff --git a/utils/analyzer/CmpRuns.py b/utils/analyzer/CmpRuns.py
-index 3fab6ef5..9baa7a48 100755
---- a/utils/analyzer/CmpRuns.py
-+++ b/utils/analyzer/CmpRuns.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- CmpRuns - A simple tool for comparing two static analyzer runs to determine
-diff --git a/utils/analyzer/SATestAdd.py b/utils/analyzer/SATestAdd.py
-index 52089f4e..d087a90b 100755
---- a/utils/analyzer/SATestAdd.py
-+++ b/utils/analyzer/SATestAdd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- Static Analyzer qualification infrastructure: adding a new project to
-diff --git a/utils/analyzer/SATestBuild.py b/utils/analyzer/SATestBuild.py
-index 691ded80..b17b3db1 100755
---- a/utils/analyzer/SATestBuild.py
-+++ b/utils/analyzer/SATestBuild.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- Static Analyzer qualification infrastructure.
-diff --git a/utils/analyzer/SATestUpdateDiffs.py b/utils/analyzer/SATestUpdateDiffs.py
-index ea3c08cc..08e3f82f 100755
---- a/utils/analyzer/SATestUpdateDiffs.py
-+++ b/utils/analyzer/SATestUpdateDiffs.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- Update reference results for static analyzer.
-diff --git a/utils/analyzer/SumTimerInfo.py b/utils/analyzer/SumTimerInfo.py
-index 36e519ad..d1934f19 100644
---- a/utils/analyzer/SumTimerInfo.py
-+++ b/utils/analyzer/SumTimerInfo.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- Script to Summarize statistics in the scan-build output.
-diff --git a/utils/analyzer/exploded-graph-rewriter.py b/utils/analyzer/exploded-graph-rewriter.py
-index 5ce56d61..808f21c9 100755
---- a/utils/analyzer/exploded-graph-rewriter.py
-+++ b/utils/analyzer/exploded-graph-rewriter.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- #===- exploded-graph-rewriter.py - ExplodedGraph dump tool -----*- python -*--#
- #
-diff --git a/utils/check_cfc/check_cfc.py b/utils/check_cfc/check_cfc.py
-index 311f502f..0bbbc088 100755
---- a/utils/check_cfc/check_cfc.py
-+++ b/utils/check_cfc/check_cfc.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """Check CFC - Check Compile Flow Consistency
-
-diff --git a/utils/check_cfc/obj_diff.py b/utils/check_cfc/obj_diff.py
-index a0951c5b..b3866948 100755
---- a/utils/check_cfc/obj_diff.py
-+++ b/utils/check_cfc/obj_diff.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- from __future__ import absolute_import, division, print_function
-
-diff --git a/utils/check_cfc/test_check_cfc.py b/utils/check_cfc/test_check_cfc.py
-index 0808252a..6f149ebc 100755
---- a/utils/check_cfc/test_check_cfc.py
-+++ b/utils/check_cfc/test_check_cfc.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """Test internal functions within check_cfc.py."""
-
-diff --git a/utils/creduce-clang-crash.py b/utils/creduce-clang-crash.py
-index be16211c..e56f3697 100755
---- a/utils/creduce-clang-crash.py
-+++ b/utils/creduce-clang-crash.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- """Calls C-Reduce to create a minimal reproducer for clang crashes.
-
- Output files:
-diff --git a/utils/hmaptool/hmaptool b/utils/hmaptool/hmaptool
-index 58baab2f..00296f11 100755
---- a/utils/hmaptool/hmaptool
-+++ b/utils/hmaptool/hmaptool
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- from __future__ import absolute_import, division, print_function
-
- import json
-diff --git a/utils/modfuzz.py b/utils/modfuzz.py
-index 61ca3272..19a9807b 100644
---- a/utils/modfuzz.py
-+++ b/utils/modfuzz.py
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python3
-
- # To use:
- # 1) Update the 'decls' list below with your fuzzing configuration.
-diff --git a/utils/token-delta.py b/utils/token-delta.py
-index 62b4eb3c..022fb2f8 100755
---- a/utils/token-delta.py
-+++ b/utils/token-delta.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- from __future__ import absolute_import, division, print_function
- import os
-diff --git a/www/builtins.py b/www/builtins.py
-index f0bcf196..54901487 100755
---- a/www/builtins.py
-+++ b/www/builtins.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- import sys, fileinput
-
-diff --git a/www/make_cxx_dr_status b/www/make_cxx_dr_status
-index 2d7c1f32..bc24cd12 100755
---- a/www/make_cxx_dr_status
-+++ b/www/make_cxx_dr_status
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python3
- import sys, os, re
-
- index = 'cwg_index.html'
-
diff --git a/main/clang/40-fix-ld-name-on-x86.patch b/main/clang/40-fix-ld-name-on-x86.patch
index 4150fa6f8d..4490bba9da 100644
--- a/main/clang/40-fix-ld-name-on-x86.patch
+++ b/main/clang/40-fix-ld-name-on-x86.patch
@@ -6,7 +6,7 @@ diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp
index bff1ab10..68ca89d9 100644
--- a/lib/Driver/ToolChains/Linux.cpp
+++ b/lib/Driver/ToolChains/Linux.cpp
-@@ -531,6 +531,11 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -434,6 +434,11 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
ArchName = "armeb";
IsArm = true;
break;
diff --git a/main/clang/APKBUILD b/main/clang/APKBUILD
index dd491ff703..6a0dbe76e9 100644
--- a/main/clang/APKBUILD
+++ b/main/clang/APKBUILD
@@ -1,17 +1,18 @@
# Contributor Eric Molitor <eric@molitor.org>
# Contributor Patrick Gansterer <paroga@paroga.com>
# Contributor Travis Tilley <ttilley@gmail.com>
+# Contributor omni <omni+alpine@hack.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=clang
# Note: Update together with llvm.
-pkgver=10.0.1
-pkgrel=0
+pkgver=11.1.0
+pkgrel=1
_llvmver=${pkgver%%.*}
pkgdesc="A C language family front-end for LLVM"
arch="all"
url="https://llvm.org/"
license="Apache-2.0"
-options="!check" # some 170 failing tests...
+options="!check" # fail to build
makedepends="
cmake
isl-dev
@@ -26,7 +27,7 @@ makedepends="
python3
py3-sphinx
"
-checkdepends="diffutils bash"
+checkdepends="diffutils bash gtest-dev"
depends_dev="$pkgname=$pkgver-r$pkgrel $pkgname-extra-tools=$pkgver-r$pkgrel"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs
$pkgname-analyzer::noarch
@@ -37,14 +38,15 @@ source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/c
https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-tools-extra-$pkgver.src.tar.xz
10-add-musl-triples.patch
20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
- 30-fix-python-shebangs.patch
40-fix-ld-name-on-x86.patch
"
-
builddir="$srcdir/clang-$pkgver.src"
prepare() {
mv "$srcdir/clang-tools-extra-$pkgver.src" "$builddir/tools/extra"
+ # Substitute python hashbangs with python3
+ find . -name '*.py' -type f -exec \
+ sed -i 's,^#!/usr/bin/env python$,#!/usr/bin/env python3,' {} +
default_prepare
}
@@ -54,14 +56,17 @@ build() {
python_version=$(python3 -V | sed 's/.*\([0-9]\{1,\}\.[0-9]\{1,\}\)\..*/\1/')
+ # NOTE: DO NOT change `CMAKE_BUILD_TYPE`! Buildmodes like `None` will enable
+ # debug assertions for LLVM!
cmake .. -G Ninja -Wno-dev \
- -DCMAKE_BUILD_TYPE=MinSizeRel \
- -DCMAKE_C_FLAGS_MINSIZEREL_INIT="$CFLAGS" \
- -DCMAKE_CXX_FLAGS_MINSIZEREL_INIT="$CXXFLAGS" \
- -DCMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT="$LDFLAGS -Wl,-z,stack-size=2097152" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_C_FLAGS_RELEASE_INIT="$CFLAGS -O2" \
+ -DCMAKE_CXX_FLAGS_RELEASE_INIT="$CXXFLAGS" \
+ -DCMAKE_EXE_LINKER_FLAGS_RELEASE_INIT="$LDFLAGS -Wl,-z,stack-size=2097152" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_VERBOSE_MAKEFILE=OFF \
-DCLANG_VENDOR=Alpine \
+ -DLLVM_EXTERNAL_LIT=/usr/bin/lit \
-DCLANG_BUILD_EXAMPLES=OFF \
-DCLANG_INCLUDE_DOCS=ON \
-DCLANG_PYTHON_BINDINGS_VERSIONS="$python_version" \
@@ -79,19 +84,12 @@ build() {
}
check() {
- cd "$builddir"/build
-
- case "$CARCH" in
- armhf) return;; # FIXME: tests fails on armhf
- esac
- lit -sv --param clang_site_config=$builddir/build/test/lib.site.cfg $builddir/build/test
+ ninja -C build check-all
}
package() {
- cd "$builddir"/build
-
- DESTDIR="$pkgdir" ninja install
- install -m 644 lib/libclang.a "$pkgdir"/usr/lib
+ DESTDIR="$pkgdir" ninja -C build install
+ install -m 644 build/lib/libclang.a "$pkgdir"/usr/lib
}
static() {
@@ -115,9 +113,11 @@ analyzer() {
cd "$pkgdir"
- mkdir -p "$subpkgdir"/usr/bin \
+ install -dm0755 \
+ "$subpkgdir"/usr/bin \
"$subpkgdir"/usr/libexec \
- "$subpkgdir"/usr/share/
+ "$subpkgdir"/usr/share
+
mv usr/bin/scan-* "$subpkgdir"/usr/bin/
mv usr/libexec/*-analyzer "$subpkgdir"/usr/libexec/
mv usr/share/scan-* "$subpkgdir"/usr/share/
@@ -128,24 +128,43 @@ extra() {
cd "$pkgdir"
- mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/share/clang
-
- mv usr/bin/clang-apply-replacements "$subpkgdir"/usr/bin/
- mv usr/bin/clang-reorder-fields "$subpkgdir"/usr/bin/
- mv usr/bin/modularize "$subpkgdir"/usr/bin/
- mv usr/bin/clang-tidy "$subpkgdir"/usr/bin/
- mv usr/share/clang/*clang-tidy* "$subpkgdir"/usr/share/clang
- mv usr/bin/clang-change-namespace "$subpkgdir"/usr/bin/
- mv usr/bin/clang-doc "$subpkgdir"/usr/bin/
- mv usr/bin/clang-include-fixer "$subpkgdir"/usr/bin/
- #mv usr/bin/clang-move "$subpkgdir"/usr/bin/
- mv usr/bin/find-all-symbols "$subpkgdir"/usr/bin/
- mv usr/share/clang/clang-include-fixer* "$subpkgdir"/usr/share/clang
- mv usr/share/clang/run-find-all-symbols.py "$subpkgdir"/usr/share/clang
- mv usr/bin/clang-query "$subpkgdir"/usr/bin/
- mv usr/bin/clangd* "$subpkgdir"/usr/bin/
- #mv usr/bin/pp-trace "$subpkgdir"/usr/bin/
- #mv usr/bin/tool-template "$subpkgdir"/usr/bin/
+ install -dm0755 \
+ "$subpkgdir"/usr/bin \
+ "$subpkgdir"/usr/share/clang \
+ "$subpkgdir"/usr/share/emacs/site-lisp
+
+ # FIXME: Make sure this is the right list of binaries for -extra-tools
+ mv usr/bin/clang-apply-replacements \
+ usr/bin/clang-change-namespace \
+ usr/bin/clang-check \
+ usr/bin/clang-doc \
+ usr/bin/clang-extdef-mapping \
+ usr/bin/clang-format \
+ usr/bin/clang-include-fixer \
+ usr/bin/clang-move \
+ usr/bin/clang-offload-bundler \
+ usr/bin/clang-offload-wrapper \
+ usr/bin/clang-query \
+ usr/bin/clang-refactor \
+ usr/bin/clang-rename \
+ usr/bin/clang-reorder-fields \
+ usr/bin/clang-scan-deps \
+ usr/bin/clang-tidy \
+ usr/bin/clangd* \
+ usr/bin/diagtool \
+ usr/bin/find-all-symbols \
+ usr/bin/git-clang-format \
+ usr/bin/hmaptool \
+ usr/bin/modularize \
+ usr/bin/pp-trace \
+ "$subpkgdir"/usr/bin
+ mv usr/share/clang/clang-include-fixer* \
+ usr/share/clang/clang-format*.py \
+ usr/share/clang/*clang-tidy* \
+ usr/share/clang/run-find-all-symbols.py \
+ "$subpkgdir"/usr/share/clang
+ mv usr/share/clang/clang-*.el \
+ "$subpkgdir"/usr/share/emacs/site-lisp
}
python() {
@@ -156,9 +175,8 @@ python() {
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
}
-sha512sums="c6712d491ce5e166ef72724cf855d742d88da825ffc25585612d7f2eb7770343e3ae48fa78e0af3e5d5efdde3a9686a7361dac3b546a4378de22448ea6e4026c clang-10.0.1.src.tar.xz
-7833197fd1f6d65e8f1fa1c169844a40e8b64f6a5cff984b29333d92527dcef532749907df2ea35b20643898baa0f49bb64b03e4ef54f9a3c4dd77bf1750a634 clang-tools-extra-10.0.1.src.tar.xz
-533558863dc7247202b2a739e1bd2d81a99a16be329370cb734d338284b5408ecd14fe78ac836aaf922e377334b7a3ebef532cf8395d91aafe346bf71eb8b7fc 10-add-musl-triples.patch
-a8557c5a26774bf98548b9fe77cd54a1b0591bc75beffcb5fbd070986ba954d82255dddbcfcc884c07c3f433b1428c2a6ce649c3a158f4352f30e7057872335b 20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
-c7f34b425b0dcea9752eeb7ff3d3a33af9cc45740fd3e77d52e4d610c5fd3daaa4d59138a255b057ef886915615a77ec1e6a447f3818b4b2724129c0ba354932 30-fix-python-shebangs.patch
-c945455cd02345ba84343fc69c82a684566fa7a38d59806035b5f07dce0a4b1892b428283005883f1c202ea87d75de60066497c127ab9292c060700e8f8081d7 40-fix-ld-name-on-x86.patch"
+sha512sums="f4bb7e4ded61f2c489e01310432d8e062eba992d992ed65ca2e69a7c20eb5d0c90e81968baaa71c01ac9d96f814a2dcca4ef8f8bfac4cef6d7907ecece097dac clang-11.1.0.src.tar.xz
+b629b8b8c0a3390bb6cd2ce609242a6f97feea9509145a2eb5566d09359cee56fc510f21f5f8d1508ff5d612ecb9176572e6358c01cd8590fc799898c34873b6 clang-tools-extra-11.1.0.src.tar.xz
+90d61072676b283192fd24804cce7b246acfee418c68c42cc299db6a0605a7d1b5460d5817ea4ea715d94fa6d067dc445673b3949133c1f05957448b9738cc84 10-add-musl-triples.patch
+80af662d9e02f6164ffc1ab70e652b27d7aea3d738d045a87369dd3287506a8eb6a7f5918afb5651b21dcedccde64c8a148bc1cadcacedb1ca532de8c1401dfb 20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+32add4879375d47a0a6055bc45073dc1bfd06a823e59f62cc8c5cdf762393e39a923b3c5b432972f84c294773585c684f623a8ede43a8044de4f3fe9d89e40cb 40-fix-ld-name-on-x86.patch"
diff --git a/main/clucene/APKBUILD b/main/clucene/APKBUILD
index 6447c05c93..1d18a00993 100644
--- a/main/clucene/APKBUILD
+++ b/main/clucene/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=clucene
pkgver=2.3.3.4
-pkgrel=8
+pkgrel=9
pkgdesc="A C++ port of Lucene"
url="http://www.sourceforge.net/projects/clucene"
arch="all"
diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD
index 51293375db..e8d30a29f2 100644
--- a/main/cmake/APKBUILD
+++ b/main/cmake/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cmake
-pkgver=3.19.6
+pkgver=3.20.2
pkgrel=0
pkgdesc="Cross-platform, open-source make system"
url="https://www.cmake.org/"
@@ -19,6 +19,7 @@ case $pkgver in
esac
source="https://www.cmake.org/files/$_v/cmake-$pkgver.tar.gz
+ patch-adjust-lib64.patch
"
_parallel_opt() {
@@ -57,4 +58,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9 cmake-3.19.6.tar.gz"
+sha512sums="675a92f84b437169aee86dbfa59715671b9195ddeffc6fea83c7803a70abe3116106ad0a627b9e4bef326bfb2a10fdf624ad341fd9d3d08e3d8a69c271cd2b32 cmake-3.20.2.tar.gz
+87051601dda49894a1631156bf63aaa79fcf7cb7bb6705712889b9012d87d2f11d2707a1d729223b180668ad61f22b16893658e9777beee330c7e9a90e7421e6 patch-adjust-lib64.patch"
diff --git a/main/cmake/patch-adjust-lib64.patch b/main/cmake/patch-adjust-lib64.patch
new file mode 100644
index 0000000000..251bcaa10d
--- /dev/null
+++ b/main/cmake/patch-adjust-lib64.patch
@@ -0,0 +1,31 @@
+--- cmake-3.19.5/Modules/GNUInstallDirs.cmake.orig
++++ cmake-3.19.5/Modules/GNUInstallDirs.cmake
+@@ -224,28 +224,6 @@
+ "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
+ "Please enable at least one language before including GNUInstallDirs.")
+ endif()
+- if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
+- AND NOT CMAKE_CROSSCOMPILING
+- AND NOT EXISTS "/etc/arch-release")
+- if (EXISTS "/etc/debian_version") # is this a debian system ?
+- if(CMAKE_LIBRARY_ARCHITECTURE)
+- if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
+- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+- endif()
+- if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX
+- AND "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
+- set(__LAST_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+- endif()
+- endif()
+- else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
+- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+- set(_LIBDIR_DEFAULT "lib64")
+- if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
+- set(__LAST_LIBDIR_DEFAULT "lib64")
+- endif()
+- endif()
+- endif()
+- endif()
+ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "Object code libraries (${_LIBDIR_DEFAULT})")
+ elseif(DEFINED __LAST_LIBDIR_DEFAULT
diff --git a/main/compiler-rt/APKBUILD b/main/compiler-rt/APKBUILD
index 910418b77b..cd98622410 100644
--- a/main/compiler-rt/APKBUILD
+++ b/main/compiler-rt/APKBUILD
@@ -3,8 +3,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=compiler-rt
# Note: Update together with llvm.
-pkgver=10.0.1
-pkgrel=0
+pkgver=11.1.0
+pkgrel=1
_llvmver=${pkgver%%.*}
pkgdesc="LLVM compiler-rt runtime libraries"
arch="aarch64 armv7 x86 x86_64"
@@ -72,5 +72,5 @@ package() {
esac
}
-sha512sums="a1d2e3f5ad529a04f87059903b31fc3c9803cd86f44aed1aebd87ce7e423d8dd2b6776be12e85a0374a6215f581420438d224c130aad5e6355920af32c02aa7b compiler-rt-10.0.1.src.tar.xz
-cf34d037c1684d09e7e38d5fc131714eac93c78353d6186b2f806a8fb22dcae0f4748ce22d6faf178c95cfcf20bdc3fa7c5238518a154b3112781f5ab70edaa4 llvm-10.0.1.src.tar.xz"
+sha512sums="9b0b259cc43d5e4d20200676be153de81b485b3fdf065623ff71c7e1894ec5c8ed9d99c1416f70246ab0f417cbba6d1d4af9f3769e2e6577400681a791346231 compiler-rt-11.1.0.src.tar.xz
+07bf9973384151a18d5cc2892103e5f28a88c632e8e49662fde56d123632f2ed1b3710fa7a87b6b821955d0ec44160ff36f2aa4f233e389e14d628e9bf8dc764 llvm-11.1.0.src.tar.xz"
diff --git a/main/conky/APKBUILD b/main/conky/APKBUILD
index 9601b4dcdf..f392de36f1 100644
--- a/main/conky/APKBUILD
+++ b/main/conky/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=conky
-pkgver=1.12.1
+pkgver=1.12.2
pkgrel=0
pkgdesc="An advanced, highly configurable system monitor for X based on torsmo"
url="http://conky.sourceforge.net/"
@@ -38,4 +38,4 @@ package() {
install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
}
-sha512sums="897c6b83528809aa2e33e15b9ad6644d8cf36f4cff93f014811754f982c13180001b972b2b145b607de8d865c2af9a425ab50246065f537e14be75da5631593a conky-1.12.1.tar.gz"
+sha512sums="55280953da437efe36320e4c12f74d95b8406bd7d8b7d93c6582f9b346c1c80a94b71d1c27860f6274de9171865fca91e330dfc39feb80bb2f453a538bc5ce1a conky-1.12.2.tar.gz"
diff --git a/main/coova-chilli/APKBUILD b/main/coova-chilli/APKBUILD
deleted file mode 100644
index 4c19b696f5..0000000000
--- a/main/coova-chilli/APKBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# Contributor: grharry
-# Maintainer:
-pkgname=coova-chilli
-pkgver=1.4
-pkgrel=3
-pkgdesc="CoovaChilli is an open source access controller for wireless LAN"
-url="http://www.coova.org/"
-arch="all"
-license="GPL-3.0-or-later"
-makedepends="perl openssl-dev autoconf automake libtool curl-dev
- linux-headers gengetopt-dev"
-install="$pkgname.pre-install"
-pkgusers="chilli"
-pkggroups="chilli"
-subpackages="$pkgname-doc $pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/coova/coova-chilli/archive/$pkgver.tar.gz
- chilli.initd
- chilli.confd
- posix-regex.patch
- system.patch
- des.patch
- "
-options="suid"
-
-prepare() {
- default_prepare
- sed -i 's/-Werror//g' src/Makefile.am
- sed -i 's%(localstatedir)/run%(localstatedir)%' src/Makefile.am
- libtoolize --force \
- && autoreconf -vif
-}
-
-build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --localstatedir=/var/run/chilli \
- --libdir=/usr/lib \
- --sysconfdir=/etc \
- --with-openssl \
- --with-poll \
- --enable-binstatusfile \
- --enable-statusfile \
- --enable-chillixml \
- --enable-ipwhitelist \
- --enable-redirinject \
- --enable-redirdnsreq \
- --enable-redirinject \
- --enable-debug \
- --enable-debug2 \
- --enable-miniportal \
- --enable-sessgarden \
- --enable-shared \
- --enable-chilliredir \
- --enable-chilliscript \
- --enable-layer3 \
- --enable-dhcpopt \
- --enable-largelimits
- export CFLAGS="$CFLAGS -Wno-error=unused-but-set-variable"
- make -j1
-}
-
-check() {
- make check
-}
-
-package() {
- make DESTDIR="$pkgdir" install
-
- install -Dm755 "$srcdir"/chilli.initd "$pkgdir"/etc/init.d/chilli
- install -Dm644 "$srcdir"/chilli.confd "$pkgdir"/etc/conf.d/chilli
- install -d -o $pkgusers -g $pkggroups "$pkgdir"/var/run/chilli
-}
-
-sha512sums="2ee31731c59af0f4282255a76ef045e9f37dc85da6d18a374154ae5cc690dc485acae2d83372bf48d9326db53292603d69b0093e845b4d08b26d2586455590c5 coova-chilli-1.4.tar.gz
-eb0feda33f74256cedd4987d22427c1575f4de08636ff02c16cb4f6710a54dce0d23410d56e961727d4e78f5f4fb0a7848505215e5c91518301d1e81b589ecde chilli.initd
-840712709974d5a3567e0a14cb05d7e394bf73ac06c0ea865c00351d916f794ec3e70bfbc9255afd419aeceaae3f4b0cbf7e770ccd23af1e677e15821c1690cf chilli.confd
-d47d176d01eda436b04700bb4404fe2a3c17e00bd8c2e4ed08149841c3e692435fee4f7dc22135d07b95556dd2f2d08b540a345bb7d5bdff3266bfcc46dcda76 posix-regex.patch
-7dbfa571f5eb7065a3a6c2f7c14e2d33cec52771e0236f29837d28cc216ca5a12eb31e1f3d3a780964c8e0f65eb057a9c040b14c65d84cd8483858f757240d6b system.patch
-b2dce18c72808e58dd97a235191e9b843f0bfa06805b12c39488bf4464d055c0734248c89c571cc8069e0f06856f7fcf8458aac84f895da4ed2b0ceb7cbd6f82 des.patch"
diff --git a/main/coova-chilli/chilli.confd b/main/coova-chilli/chilli.confd
deleted file mode 100644
index 8133a04c58..0000000000
--- a/main/coova-chilli/chilli.confd
+++ /dev/null
@@ -1 +0,0 @@
-CHILLI_OPTS="--name chilli --group chilli"
diff --git a/main/coova-chilli/chilli.initd b/main/coova-chilli/chilli.initd
deleted file mode 100644
index 3e75949f6e..0000000000
--- a/main/coova-chilli/chilli.initd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
- use net
- after firewall
- provide chilli
-}
-
-checkconfig() {
- if [ -f /etc/chilli.conf ]; then
- return 0;
- else
- eerror "Error starting CoovaChilli. Please create /etc/chilli.conf before."
- return 1;
- fi
-
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting CoovaChilli Captive Portal"
-
- echo 1 > /proc/sys/net/ipv4/ip_forward
- lsmod | grep tun >& /dev/null
-
- if [ $? -ne 0 ]; then
- modprobe tun >& /dev/null
- fi
-
- start-stop-daemon --start --pidfile /var/run/chilli/chilli.pid --quiet \
- --exec /usr/sbin/chilli ${CHILLI_OPTS} -- --pidfile=/var/run/chilli/chilli.pid
- eend $?
-}
-
-stop() {
- ebegin "Stopping CoovaChilli Captive Portal"
- start-stop-daemon --stop --pidfile /var/run/chilli.pid --quiet
- eend $?
-}
diff --git a/main/coova-chilli/coova-chilli.post-install b/main/coova-chilli/coova-chilli.post-install
deleted file mode 100644
index 10dfc9576a..0000000000
--- a/main/coova-chilli/coova-chilli.post-install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-chown -R chilli:chilli /var/run/chilli
diff --git a/main/coova-chilli/coova-chilli.pre-install b/main/coova-chilli/coova-chilli.pre-install
deleted file mode 100644
index 342778dcd6..0000000000
--- a/main/coova-chilli/coova-chilli.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S chilli 2>/dev/null
-adduser -S -D -H -s /sbin/nologin -G chilli -g chilli chilli 2>/dev/null
-
-exit 0
diff --git a/main/coova-chilli/des.patch b/main/coova-chilli/des.patch
deleted file mode 100644
index ae647d5970..0000000000
--- a/main/coova-chilli/des.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 1a809062ecab70de13e299487fdd635434bc86d8 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 4 Oct 2016 20:31:54 +0200
-Subject: [PATCH] Replace deprecated des_ with DES_
-
-The des_* fuctions were renamed to DES_ with openssl 0.9.7 (2002). This
-fixes building with libressl and probably openssl 1.1.0 too.
----
- src/ms_chap.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/ms_chap.c b/src/ms_chap.c
-index 2c236d2..8ad8327 100644
---- a/src/ms_chap.c
-+++ b/src/ms_chap.c
-@@ -96,18 +96,18 @@ MakeKey(u_char *key, u_char *des_key)
- des_key[6] = Get7Bits(key, 42);
- des_key[7] = Get7Bits(key, 49);
-
-- des_set_odd_parity((des_cblock *)des_key);
-+ DES_set_odd_parity((DES_cblock *)des_key);
- }
-
- static void /* IN 8 octets IN 7 octest OUT 8 octets */
- DesEncrypt(u_char *clear, u_char *key, u_char *cipher)
- {
-- des_cblock des_key;
-- des_key_schedule key_schedule;
-+ DES_cblock des_key;
-+ DES_key_schedule key_schedule;
-
- MakeKey(key, des_key);
-- des_set_key(&des_key, key_schedule);
-- des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher, key_schedule, 1);
-+ DES_set_key(&des_key, &key_schedule);
-+ DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher, &key_schedule, 1);
- }
-
- #define LENGTH 20
---
-2.10.0
-
diff --git a/main/coova-chilli/posix-regex.patch b/main/coova-chilli/posix-regex.patch
deleted file mode 100644
index 12ce4427d8..0000000000
--- a/main/coova-chilli/posix-regex.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 60031538ecbf9004ae195114cc5e4ea40cca7d06 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 4 Oct 2016 20:01:49 +0200
-Subject: [PATCH] Improve portability for regex
-
-Do not depend on internal, platform dependant field in regex_t to detect
-if the regex was compiled or not. Instead, use a flag that we set for
-that.
-
-This fixes build with musl libc.
----
- src/garden.h | 11 ++++++++---
- src/main-redir.c | 26 +++++++++++---------------
- src/options.c | 27 +++++++++++++++------------
- 3 files changed, 34 insertions(+), 30 deletions(-)
-
-diff --git a/src/garden.h b/src/garden.h
-index 1b07a23..84563e9 100644
---- a/src/garden.h
-+++ b/src/garden.h
-@@ -39,13 +39,18 @@ typedef struct pass_through_t {
- (a)->port == (b)->port)
-
- #ifdef ENABLE_CHILLIREDIR
-+struct chilli_regex {
-+ regex_t re;
-+ char allocated:1;
-+};
-+
- typedef struct regex_pass_through_t {
- char regex_host[512];
- char regex_path[512];
- char regex_qs[512];
-- regex_t re_host;
-- regex_t re_path;
-- regex_t re_qs;
-+ struct chilli_regex re_host;
-+ struct chilli_regex re_path;
-+ struct chilli_regex re_qs;
- uint8_t inuse:1;
- uint8_t neg_host:1;
- uint8_t neg_path:1;
-diff --git a/src/main-redir.c b/src/main-redir.c
-index c7b0f07..001f882 100644
---- a/src/main-redir.c
-+++ b/src/main-redir.c
-@@ -501,29 +501,25 @@ static int redir_conn_read(struct conn_t *conn, void *ctx) {
- }
-
- static int
--check_regex(regex_t *re, char *regex, char *s) {
-+check_regex(struct chilli_regex *re, char *regex, char *s) {
- int ret;
-
- #if(_debug_)
- syslog(LOG_DEBUG, "Checking %s =~ %s", s, regex);
- #endif
-
--#if defined (__FreeBSD__) || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__)
-- if (!re->re_g)
--#else
-- if (!re->allocated)
--#endif
-- {
-- if ((ret = regcomp(re, regex, REG_EXTENDED | REG_NOSUB)) != 0) {
-- char error[512];
-- regerror(ret, re, error, sizeof(error));
-- syslog(LOG_ERR, "regcomp(%s) failed (%s)", regex, error);
-- regex[0] = 0;
-- return -1;
-- }
-+ if (!re->allocated) {
-+ if ((ret = regcomp(&re->re, regex, REG_EXTENDED | REG_NOSUB)) != 0) {
-+ char error[512];
-+ regerror(ret, &re->re, error, sizeof(error));
-+ syslog(LOG_ERR, "regcomp(%s) failed (%s)", regex, error);
-+ regex[0] = 0;
-+ return -1;
- }
-+ re->allocated = 1;
-+ }
-
-- if ((ret = regexec(re, s, 0, 0, 0)) == 0) {
-+ if ((ret = regexec(&re->re, s, 0, 0, 0)) == 0) {
-
- syslog(LOG_DEBUG, "Matched regex %s", regex);
- return 0;
-diff --git a/src/options.c b/src/options.c
-index 28f1b35..d6be8d0 100644
---- a/src/options.c
-+++ b/src/options.c
-@@ -219,6 +219,16 @@ int options_mkdir(char *path) {
- return 0;
- }
-
-+#ifdef ENABLE_CHILLIREDIR
-+static void chilli_regfree(struct chilli_regex *re)
-+{
-+ if (!re->allocated)
-+ return;
-+ regfree(&re->re);
-+ re->allocated = 0;
-+}
-+#endif
-+
- int options_fromfd(int fd, bstring bt) {
- uint8_t cksum[16], cksum_check[16];
- struct options_t o;
-@@ -380,18 +390,11 @@ int options_fromfd(int fd, bstring bt) {
-
- #ifdef ENABLE_CHILLIREDIR
- for (i = 0; i < MAX_REGEX_PASS_THROUGHS; i++) {
--#if defined (__FreeBSD__) || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__)
-- regfree(&_options.regex_pass_throughs[i].re_host);
-- regfree(&_options.regex_pass_throughs[i].re_path);
-- regfree(&_options.regex_pass_throughs[i].re_qs);
--#else
-- if (_options.regex_pass_throughs[i].re_host.allocated)
-- regfree(&_options.regex_pass_throughs[i].re_host);
-- if (_options.regex_pass_throughs[i].re_path.allocated)
-- regfree(&_options.regex_pass_throughs[i].re_path);
-- if (_options.regex_pass_throughs[i].re_qs.allocated)
-- regfree(&_options.regex_pass_throughs[i].re_qs);
--#endif
-+ if (_options.regex_pass_throughs[i].re_host.allocated) {
-+ chilli_regfree(&_options.regex_pass_throughs[i].re_host);
-+ chilli_regfree(&_options.regex_pass_throughs[i].re_path);
-+ chilli_regfree(&_options.regex_pass_throughs[i].re_qs);
-+ }
- }
- #endif
-
---
-2.10.0
-
diff --git a/main/coova-chilli/system.patch b/main/coova-chilli/system.patch
deleted file mode 100644
index 17d3ba3bb7..0000000000
--- a/main/coova-chilli/system.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/src/system.h b/src/system.h
-index 6ddf98c..3efef6a 100644
---- a/src/system.h
-+++ b/src/system.h
-@@ -117,27 +117,6 @@
- #include <inttypes.h>
- #endif
-
--#if defined(__linux__)
--#include <asm/types.h>
--#include <linux/if.h>
--#include <linux/if_packet.h>
--#include <linux/if_ether.h>
--#include <linux/if_tun.h>
--#include <linux/netlink.h>
--#include <linux/rtnetlink.h>
--#ifndef HAVE_SYS_UN_H
--#include <linux/un.h>
--#endif
--
--#ifdef HAVE_SYS_SYSINFO_H
--#include <sys/sysinfo.h>
--#else
--#ifdef HAVE_LINUX_SYSINFO_H
--#define _LINUX_KERNEL_H
--#include <linux/sysinfo.h>
--#endif
--#endif
--
- #elif defined (__FreeBSD__) || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__)
- #include <net/if.h>
- #include <net/bpf.h>
-@@ -244,6 +223,27 @@
- #include <unistd.h>
- #include <errno.h>
-
-+#if defined(__linux__)
-+#include <asm/types.h>
-+#include <linux/if.h>
-+#include <linux/if_packet.h>
-+#include <linux/if_ether.h>
-+#include <linux/if_tun.h>
-+#include <linux/netlink.h>
-+#include <linux/rtnetlink.h>
-+#ifndef HAVE_SYS_UN_H
-+#include <linux/un.h>
-+#endif
-+
-+#ifdef HAVE_SYS_SYSINFO_H
-+#include <sys/sysinfo.h>
-+#else
-+#ifdef HAVE_LINUX_SYSINFO_H
-+#define _LINUX_KERNEL_H
-+#include <linux/sysinfo.h>
-+#endif
-+#endif
-+
- int safe_accept(int fd, struct sockaddr *sa, socklen_t *lenptr);
- int safe_select(int nfds, fd_set *readfds, fd_set *writefds,
- fd_set *exceptfds, struct timeval *timeout);
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index 797e43b7b8..0a6aa5e936 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cryptsetup
-pkgver=2.3.4
-pkgrel=1
+pkgver=2.3.5
+pkgrel=0
pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
url="https://gitlab.com/cryptsetup/cryptsetup"
arch="all"
@@ -10,12 +10,12 @@ license="GPL-2.0-or-later WITH OpenSSL-Exception"
makedepends_host="lvm2-dev openssl-dev popt-dev util-linux-dev
json-c-dev argon2-dev"
makedepends="$makedepends_build $makedepends_host"
-checkdepends="device-mapper sharutils which bash"
+checkdepends="device-mapper sharutils which bash coreutils"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc"
source="https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/cryptsetup-$pkgver.tar.gz
- flush-stdout.patch
- dmcrypt.confd
dmcrypt.initd
+ dmcrypt.confd
+ flush-stdout.patch
"
# secfixes:
@@ -59,7 +59,7 @@ libs() {
mv "$pkgdir"/lib "$subpkgdir"/
}
-sha512sums="a0a4981ca7294d6f0568bc9465e78ee1781ad73fe77e8daa0bbe67693534f02d3510e6fba9f76749b90ce7533bc9ac96dd27b73d733f8051e9560a3b4196ca3c cryptsetup-2.3.4.tar.gz
-dc896fdb7697d01443a168819f01af02db00a9de75589f062a1ebbfc0bc185b6d2109b18352309c41b818e3ad89609dcea3660d6f3cda890de825f053f94de97 flush-stdout.patch
+sha512sums="436f6969bff2b3a8dd92593d8d0abe81ac9e7996695d8c5ff70cf00ba26ff29a21797b06a4e1fbea88f0f48bc6ef4457ea058a8a484431b2a45e53a2985529fd cryptsetup-2.3.5.tar.gz
+a3ca3e648749136ee724692b61488cd855f118eb93435942c2b04964a34fe49d0f0da4ef64cd2531c1c0f650e77808cf5d802789fd7664398248ead668bb35e5 dmcrypt.initd
74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 dmcrypt.confd
-a3ca3e648749136ee724692b61488cd855f118eb93435942c2b04964a34fe49d0f0da4ef64cd2531c1c0f650e77808cf5d802789fd7664398248ead668bb35e5 dmcrypt.initd"
+dc896fdb7697d01443a168819f01af02db00a9de75589f062a1ebbfc0bc185b6d2109b18352309c41b818e3ad89609dcea3660d6f3cda890de825f053f94de97 flush-stdout.patch"
diff --git a/main/ctags/APKBUILD b/main/ctags/APKBUILD
index 467cbe6ce9..43c1f79dc8 100644
--- a/main/ctags/APKBUILD
+++ b/main/ctags/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=ctags
-pkgver=0_git20201201
-_commit=e52cf4a795c49cfcf6859447124e2612741ac145
+pkgver=5.9.20210411.0
+_realver="p$pkgver"
pkgrel=0
pkgdesc="Generator of tags for all types of C/C++ languages"
url="https://ctags.io/"
@@ -12,8 +12,8 @@ license="GPL-2.0-or-later"
checkdepends="diffutils python3"
makedepends="autoconf automake pkgconf py3-docutils"
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/universal-ctags/ctags/archive/$_commit.tar.gz"
-builddir="$srcdir"/$pkgname-$_commit
+source="$pkgname-$pkgver.tar.gz::https://github.com/universal-ctags/ctags/archive/$_realver.tar.gz"
+builddir="$srcdir"/$pkgname-$_realver
# secfixes:
# 5.8-r5:
@@ -49,4 +49,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4cd6b9cd8c9ca3042b3c193de73699fdb6859e517f2808570ce16486a25bdfc9c8520dbb4367aa8a0c19535ddaf9bb1caf4766db65a0099042fa6badc7fa555a ctags-0_git20201201.tar.gz"
+sha512sums="64f961e3b3d98a16ae087856b67ef95ba53d7daa710e135459d2bea76d084c013dd30f5644e98e00d02374ed7709560759e732c1d5cd870a578d908d16b99933 ctags-5.9.20210411.0.tar.gz"
diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD
index 6513f0db80..d187845995 100644
--- a/main/curl/APKBUILD
+++ b/main/curl/APKBUILD
@@ -8,10 +8,10 @@
# this aport from arch=all WILL be reverted.
pkgname=curl
-pkgver=7.75.0
+pkgver=7.76.1
pkgrel=0
pkgdesc="URL retrival utility and library"
-url="https://curl.haxx.se/"
+url="https://curl.se/"
arch="all"
license="MIT"
depends="ca-certificates"
@@ -20,10 +20,13 @@ checkdepends="nghttp2 python3"
makedepends_host="$depends_dev"
makedepends_build="autoconf automake groff libtool perl"
subpackages="$pkgname-dbg $pkgname-static $pkgname-doc $pkgname-dev libcurl"
-source="https://curl.haxx.se/download/curl-$pkgver.tar.xz
- "
+source="https://curl.se/download/curl-$pkgver.tar.xz"
+options="net" # Required for running tests
# secfixes:
+# 7.76.0-r0:
+# - CVE-2021-22876
+# - CVE-2021-22890
# 7.74.0-r0:
# - CVE-2020-8284
# - CVE-2020-8285
@@ -144,4 +147,4 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
}
-sha512sums="4c2fc6658379b8b93dd50665b70f3000b63d3bcafd2df60b7e651a8edf4735b3decb06c338b84cb22058191aa9f8f4dc85760a42f9987210b59300758304b746 curl-7.75.0.tar.xz"
+sha512sums="5fe85d2e776789aa8117c57fe7648e375b7fa92d5ead5d69855f19ca9a2624d77a1f9ab91766ecb72bbc17e82862248cd07e48917884d6fd856b93fb00d83e28 curl-7.76.1.tar.xz"
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index d6e5215a70..377214b7df 100644
--- a/main/cyrus-sasl/APKBUILD
+++ b/main/cyrus-sasl/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cyrus-sasl
pkgver=2.1.27
-pkgrel=11
+pkgrel=12
pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
url="https://www.cyrusimap.org/sasl/"
arch="all"
@@ -38,6 +38,7 @@ source="https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-$pk
cyrus-sasl-2.1.27-as_needed.patch
cyrus-sasl-2.1.27-autotools_fixes.patch
cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
+ cyrus-sasl-2.1.27-dbm-errno.patch
cyrus-sasl-2.1.27-doc_build_fix.patch
cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
CVE-2019-19906.patch
@@ -122,6 +123,7 @@ sha512sums="d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623
9eefa6d45e3dd9157a5672909acdd88f0ae35e76d64c3723890a474bbb05b22499cfadb0c077924d27f34da3710b2b700094dd7d5704050138c08dabcefdde94 cyrus-sasl-2.1.27-as_needed.patch
0d99ca049e76c11500769079d94f3bdb634bddb4c8d45a83b383e9bb9777edda66b17566800acbd450e1f4842d070ec3fbc236e7f0ef8759c36e6dd5ea8e3c64 cyrus-sasl-2.1.27-autotools_fixes.patch
4ca601839b023ef790e48dae567ffbbd57c632384c980946639ec7437ad23874961451718569455e6e25afaeff1728ecbc71a8686f6b43246f83465f95a2c904 cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
+d7dfdf520d16a79f265708d1c6938bd24bd26b9a0ff9b7fcbfc95c494af7f44220080bd3f79d0486bb6fc30b4a9a269adb7836bc593eacca99a1ef549ce58a9e cyrus-sasl-2.1.27-dbm-errno.patch
6d723e7ec2c431b45c011b887187b6a670dbe646aa4c39d38171047ab23db529c30c433f8d4dd624181917c5ce4e5271f86e35e2644ede1c40dfb09cb67dccde cyrus-sasl-2.1.27-doc_build_fix.patch
fca4f2b7e427c7613f71daa4a31772c33c8c0fe9d7f85b57b85da71bc5a88a18fc52f7caea463188b4addd31cd041d5349af689d5face2cc45fb50c700a8afd7 cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
c39efd87dc9c883d3b07474197f6835fbd32f23baa1f5cd04b25a0473639f847321c40f232e390d4dc9d9ee189dbd177c05d3d1461af4d28a48a4827abc5d9b8 CVE-2019-19906.patch
diff --git a/main/cyrus-sasl/cyrus-sasl-2.1.27-dbm-errno.patch b/main/cyrus-sasl/cyrus-sasl-2.1.27-dbm-errno.patch
new file mode 100644
index 0000000000..dd9147d9f5
--- /dev/null
+++ b/main/cyrus-sasl/cyrus-sasl-2.1.27-dbm-errno.patch
@@ -0,0 +1,29 @@
+From af48f6fec9a7b6374d4153c5db894d4a1f349645 Mon Sep 17 00:00:00 2001
+From: Jonas Jelten <jj@sft.mx>
+Date: Sat, 2 Feb 2019 20:53:37 +0100
+Subject: [PATCH] db_gdbm: fix gdbm_errno overlay from gdbm_close
+
+`gdbm_close` also sets gdbm_errno since version 1.17.
+This leads to a problem in `libsasl` as the `gdbm_close` incovation overlays
+the `gdbm_errno` value which is then later used for the error handling.
+---
+ sasldb/db_gdbm.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/sasldb/db_gdbm.c b/sasldb/db_gdbm.c
+index ee56a6bf..c908808e 100644
+--- a/sasldb/db_gdbm.c
++++ b/sasldb/db_gdbm.c
+@@ -107,9 +107,11 @@ int _sasldb_getdata(const sasl_utils_t *utils,
+ gkey.dptr = key;
+ gkey.dsize = key_len;
+ gvalue = gdbm_fetch(db, gkey);
++ int fetch_errno = gdbm_errno;
++
+ gdbm_close(db);
+ if (! gvalue.dptr) {
+- if (gdbm_errno == GDBM_ITEM_NOT_FOUND) {
++ if (fetch_errno == GDBM_ITEM_NOT_FOUND) {
+ utils->seterror(conn, SASL_NOLOG,
+ "user: %s@%s property: %s not found in %s",
+ authid, realm, propName, path);
diff --git a/main/cython/APKBUILD b/main/cython/APKBUILD
index 6e579ab392..36c118f954 100644
--- a/main/cython/APKBUILD
+++ b/main/cython/APKBUILD
@@ -3,12 +3,13 @@
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=cython
pkgver=0.29.22
-pkgrel=0
+pkgrel=2
pkgdesc="Cython is an optimising static compiler for both the Python & the extended Cython programming languages."
url="https://cython.org/"
arch="all"
license="Apache-2.0"
makedepends="py3-setuptools python3-dev"
+depends="python3"
subpackages="cython-doc"
source="cython-$pkgver.tar.gz::https://github.com/cython/cython/archive/$pkgver.tar.gz"
diff --git a/main/d-feet/APKBUILD b/main/d-feet/APKBUILD
index 9bab17fc90..f782a213d3 100644
--- a/main/d-feet/APKBUILD
+++ b/main/d-feet/APKBUILD
@@ -3,7 +3,7 @@
pkgname=d-feet
pkgver=0.3.15
_v=${pkgver%.*}
-pkgrel=3
+pkgrel=4
pkgdesc="A powerful D-Bus Debugger"
options="!check" # Testsuite loops infinitely
url="https://wiki.gnome.org/action/show/Apps/DFeet"
diff --git a/main/dahdi-linux-lts/APKBUILD b/main/dahdi-linux-lts/APKBUILD
index b8814add19..bf25b62651 100644
--- a/main/dahdi-linux-lts/APKBUILD
+++ b/main/dahdi-linux-lts/APKBUILD
@@ -9,7 +9,7 @@ _rel=0
_flavor=${FLAVOR:-lts}
_kpkg=linux-$_flavor
-_kver=5.10.19
+_kver=5.10.35
_krel=0
_kpkgver="$_kver-r$_krel"
@@ -76,9 +76,11 @@ dev() {
ln -s /usr/include "$dir"/include
}
-sha512sums="440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4 dahdi-linux-3.1.0.tar.gz
+sha512sums="
+440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4 dahdi-linux-3.1.0.tar.gz
aba01eb90d9db1c595ff22078c76aadb20900486b5794d38b7ee61fa30d2fb51be318a4d059246017640447aee03fb09bb5514c818e3caa1cd98e331ec065173 dahdi-depmod.patch
fa2fa9e96eefc0f31a1a4a8f8f44e77936f6da0d7b74fe3c3d1f0de085621744ae4367932ac97a10b7f96b7d0954843b0bfe07a251b85434079cc6da29e243ba dahdi-bri_dchan.patch
a03fde27c801bd7a9f5267505072a50dc738dcac9cafb08539bbd38eb78f3bb688f067bbbcbe05521a6f38fe28d4e8bfee68c30acea24647a4ea0d28a05bd987 kernel-compat-5.4.patch
136f49357761252cde233e664c1972beb140877ae46d8095364377eafcbe3ca908adcb6741881d9b0d0716a8525cda134e1db221f38b1ef3d39aea0b9c522b0d kernel-5.6.patch
-2430f50caf6145c0fc3c318fb54968004939a5eb7a3e2d85e9a91a2a71b8408a16cecc63e8c741659b6974bad078d0ead540e5364729e29a62ba81c84638923a kernel-5.9.patch"
+2430f50caf6145c0fc3c318fb54968004939a5eb7a3e2d85e9a91a2a71b8408a16cecc63e8c741659b6974bad078d0ead540e5364729e29a62ba81c84638923a kernel-5.9.patch
+"
diff --git a/main/dahdi-linux/APKBUILD b/main/dahdi-linux/APKBUILD
index b6dcefd37d..632aecebb9 100644
--- a/main/dahdi-linux/APKBUILD
+++ b/main/dahdi-linux/APKBUILD
@@ -10,6 +10,7 @@ license="GPL-2.0-only"
makedepends="wget tar"
subpackages="$pkgname-dev"
source="https://downloads.digium.com/pub/telephony/dahdi-linux/releases/dahdi-linux-$pkgver.tar.gz"
+options="net"
# We online install the firmwares in this package since those are common for all
# kernel flavors. We also install the headers for the -dev package.
diff --git a/main/daq/APKBUILD b/main/daq/APKBUILD
index d16c921e03..e486ca60c8 100644
--- a/main/daq/APKBUILD
+++ b/main/daq/APKBUILD
@@ -52,5 +52,5 @@ sfbpf() {
mv "$pkgdir"/usr/lib/libsfbpf.so* "$subpkgdir"/usr/lib/
}
-sha512sums="9bedddbc2d952526ab4e1d65f4507eb914507f8b3b5702ecf7137f8a210c690703469162a117a76cb8376a5639db46bd767fc48789ba7294a0bad26d4cd0ede2 daq-2.0.7.tar.gz
+sha512sums="115bd9e736c38f4f953a9167e7e3a846727401c2e29b18156a481a3ac36ff6f571ce69203de993400f315362638c723ddef6ab2eed380614747e27fdb84bc2b5 daq-2.0.7.tar.gz
ea769608e4b6ebfd186a5e637a1dbf16f300c5c40501655b891fdc0095879f65927d90872d4953a4a4e32ccc40306b19a1a1e7ae4dd8b3f7572db97aea48390e fix-includes.patch"
diff --git a/main/dbus-glib/APKBUILD b/main/dbus-glib/APKBUILD
index 6b68200bec..28adc0dc14 100644
--- a/main/dbus-glib/APKBUILD
+++ b/main/dbus-glib/APKBUILD
@@ -1,18 +1,17 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dbus-glib
-pkgver=0.110
+pkgver=0.112
pkgrel=0
pkgdesc="GLib bindings for DBUS"
+options="!check" # FIXME: tests fails
url="http://www.freedesktop.org/wiki/Software/DBusBindings"
arch="all"
license="GPL-2.0-or-later"
subpackages="$pkgname-dev $pkgname-doc"
makedepends="dbus-dev glib-dev gettext-dev expat-dev"
-source="https://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
-options="!check" # FIXME: tests fails
+source="https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,13 +24,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54 dbus-glib-0.110.tar.gz"
+sha512sums="7c9f393f065dfb3d698f35e6554caf15fe539f5dd52d2b2bb6ed1770e130f5dab8e45379232520301455bae9bb77e25a109faf175153fcd4b9dd11d7de4a546e dbus-glib-0.112.tar.gz"
diff --git a/main/dconf/APKBUILD b/main/dconf/APKBUILD
index fbfe2359e9..3f386bb648 100644
--- a/main/dconf/APKBUILD
+++ b/main/dconf/APKBUILD
@@ -1,17 +1,21 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=dconf
-pkgver=0.38.0
+pkgver=0.40.0
pkgrel=0
-pkgdesc="A low-level configuration system."
+pkgdesc="low-level configuration system"
url="https://wiki.gnome.org/Projects/dconf"
arch="all"
license="LGPL-2.1-or-later"
makedepends="glib-dev dbus-dev docbook-xsl vala libxml2-dev meson
py3-setuptools bash-completion"
checkdepends="dbus"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
-source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-bash-completion"
+source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz
+ systemd-userunit.patch
+ "
build() {
abuild-meson . output
@@ -26,12 +30,5 @@ package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
-bashcomp() {
- pkgdesc="Bash completions for $pkgname"
- install_if="$pkgname-$pkgver-r$pkgrel bash-completion"
-
- mkdir -p "$subpkgdir"/usr/share
- mv "$pkgdir"/usr/share/bash-completion "$subpkgdir"/usr/share
-}
-
-sha512sums="795f723f34a8406a06323870f8425ca579bbc751c1661db02e170532f6a2653aee749cbb84ad4d7e5a84a07c0caf2662a868b34b6f0d383361c0ff1ad9aed355 dconf-0.38.0.tar.xz"
+sha512sums="71396d71f24f47653181482b052fdfc63795c50c373de34e2fb93e16101745daa7e81192b79a102d5389911cea34138eedf3ac32bc80562018e8a7f31963559a dconf-0.40.0.tar.xz
+320cafc3229c0f5e90f468c948e9a9d1499f69a40cea13c9d75e33d96c9fbef1584b1507fbcdb7ca12f967eb925a399a7bc0805d6f62af52ef3de7dfefee4242 systemd-userunit.patch"
diff --git a/main/dconf/systemd-userunit.patch b/main/dconf/systemd-userunit.patch
new file mode 100644
index 0000000000..24dfeca938
--- /dev/null
+++ b/main/dconf/systemd-userunit.patch
@@ -0,0 +1,42 @@
+From b643f31976d92f67e9fab863836f74ccf41c75d5 Mon Sep 17 00:00:00 2001
+From: Leo <thinkabit.ukim@gmail.com>
+Date: Sat, 13 Mar 2021 02:52:44 -0300
+Subject: [PATCH] build: don't install systemd service unless systemd is found
+
+avoids installing useless files when compiling on non-systemd systems
+like Alpine Linux and Void Linux
+---
+ service/meson.build | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/service/meson.build b/service/meson.build
+index a2045e5..214b74f 100644
+--- a/service/meson.build
++++ b/service/meson.build
+@@ -10,14 +10,16 @@ configure_file(
+ install_dir: dbus_session_service_dir,
+ )
+
+-systemd_service = 'dconf.service'
++if systemd_dep.found()
++ systemd_service = 'dconf.service'
+
+-configure_file(
+- input: systemd_service + '.in',
+- output: systemd_service,
+- configuration: service_conf,
+- install_dir: systemd_userunitdir,
+-)
++ configure_file(
++ input: systemd_service + '.in',
++ output: systemd_service,
++ configuration: service_conf,
++ install_dir: systemd_userunitdir,
++ )
++endif
+
+ lib_sources = [
+ 'dconf-blame.c',
+--
+GitLab
+
diff --git a/main/debootstrap/APKBUILD b/main/debootstrap/APKBUILD
index 193323a9de..9ce17abc68 100644
--- a/main/debootstrap/APKBUILD
+++ b/main/debootstrap/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=debootstrap
-pkgver=1.0.123
+pkgver=1.0.124
pkgrel=0
pkgdesc="Debian/Ubuntu bootstrap scripts"
url="https://packages.qa.debian.org/d/debootstrap.html"
@@ -19,4 +19,4 @@ package() {
"$pkgdir"/usr/share/man/man8/$pkgname.8
}
-sha512sums="3b23f61528d4993750ba22b8765c10cfb9695793177017d9e4faf546da076be6660c5d6e0d1bf30bafe14f6d70f886190d3ec42a0057b895f40e860475eea794 debootstrap_1.0.123.tar.gz"
+sha512sums="bc028f7fec85b35a5f826044d8aff22b6fdf69e7e2c5f5c95e4b92327bcffa6411b5b21869833d10fb1f70316271149470921ad4310d61fdd3c73b65bd8009f1 debootstrap_1.0.124.tar.gz"
diff --git a/main/dialog/APKBUILD b/main/dialog/APKBUILD
index ccbb5893b3..9cb3556ce2 100644
--- a/main/dialog/APKBUILD
+++ b/main/dialog/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dialog
-pkgver=1.3.20210117
+pkgver=1.3.20210324
_pkgver=${pkgver%.*}-${pkgver##*.}
pkgrel=0
pkgdesc="Script interpreter providing curses widgets"
@@ -38,4 +38,4 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
}
-sha512sums="c9387b5c96241220080fe5b50c66c6b3ed97f4bf366b1893ff30253f635a1b57f29920efbabebf0b4af5303760beb0496760c630682b96e0f52dd40b16e1ec2f dialog-1.3-20210117.tgz"
+sha512sums="6850485de5ffb4b5b702be792381b1e2c3e3e74143474b9d96f418ff755e17bd8075f1efab950cf0ca84fffb61c2373526d3607f2f1805b4056aac0ea6831069 dialog-1.3-20210324.tgz"
diff --git a/main/distcc/APKBUILD b/main/distcc/APKBUILD
index 54698dde1a..c353586af6 100644
--- a/main/distcc/APKBUILD
+++ b/main/distcc/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=distcc
-pkgver=3.3.3
-pkgrel=0
+pkgver=3.3.5
+pkgrel=1
pkgdesc="Ddistributed C, C++, Obj C compiler"
url="https://github.com/distcc/distcc"
arch="all"
@@ -64,8 +64,8 @@ pump() {
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
}
-sha512sums="d5e7fc67f49ee640cef753038b5c0ebcbbac61c6ac29f20ee4736b045a89979ced765717c46383a4fadc50a4fe34e94e58e307509144414a9ca19eb4cc68a135 distcc-3.3.3.tar.gz
-d1150dc83bf89c332f8c0bd01e15f52f95d71868733bd2e5430a5377f1a4aaa2b5b6e0cd488d33d9b94ce18b0eeeadf4af719db536b001b50e4d482b35c7e057 distcc-hardened.patch
-9c3c16ddcda8430a76050f6d91d09e0086452b07cf07457c39e30e258d77d86f08034014e49fc6c7cb33a353200af83d651d5d9ba45f67166591a6a38c3ed243 gcc-10.patch
+sha512sums="678909e7ab811d345357955a9f693324ca3870ecbefa62e6a71c8aeb7e4c3c7d9775d56cff4d8ff225614bc8468e1d35f33b7feea835d63167bf11350513ddd7 distcc-3.3.5.tar.gz
+b53a0d6038504917fd41f549da4f5addaff6ebd198a5d9d3ee8d4654f843aab375da4017b40efe24b9d4c9881719030485e4f56724690ba271fb52dc48249a44 distcc-hardened.patch
+4e55e0acda58e6f273c74e9d617de1a121debf820e915cf8aeb4d80907d427a058466bb2fd9126602aea7f861fd5fa1c2bede15e2a512923bc61e3ef163430d4 gcc-10.patch
3c58be08242de09f76876b20a0c6643a3a76a088c356484cb091253b7e4dddb20008d071d8e5d1a66acbc5bfe4d8a59284a6d7f225ca2006e8a8b3c698e71026 distccd.initd
fbb12522e489243475c735e055a72a19b176f1ad736dc810e1f085d8d9d79460ac7590a92bb9563f8b316437f67f6ca729330253f007d06011144a66fede5465 distccd.confd"
diff --git a/main/distcc/distcc-hardened.patch b/main/distcc/distcc-hardened.patch
index 69b3a65169..c50b15d766 100644
--- a/main/distcc/distcc-hardened.patch
+++ b/main/distcc/distcc-hardened.patch
@@ -10,7 +10,7 @@ the distccd host applies all kinds of flags that it shouldn't.
--- distcc-2.18.3/src/strip.c
+++ distcc-2.18.3-hardened/src/strip.c
-@@ -73,7 +73,10 @@ int dcc_strip_local_args(char **from, ch
+@@ -79,7 +79,10 @@ int dcc_strip_local_args(char **from, ch
/* skip through argv, copying all arguments but skipping ones that
* ought to be omitted */
for (from_i = to_i = 0; from[from_i]; from_i++) {
diff --git a/main/distcc/gcc-10.patch b/main/distcc/gcc-10.patch
index 60f1f24c25..599de51e0d 100644
--- a/main/distcc/gcc-10.patch
+++ b/main/distcc/gcc-10.patch
@@ -13,17 +13,3 @@ index 35dbf7d..76bfbee 100644
+extern const char *stats_text[20] = { "TCP_ACCEPT", "REJ_BAD_REQ", "REJ_OVERLOAD",
"COMPILE_OK", "COMPILE_ERROR", "COMPILE_TIMEOUT", "CLI_DISCONN",
"OTHER" };
-
-diff --git a/src/stats.h b/src/stats.h
-index 9bde285..74d4690 100644
---- a/src/stats.h
-+++ b/src/stats.h
-@@ -33,7 +33,7 @@ enum stats_e { STATS_TCP_ACCEPT, STATS_REJ_BAD_REQ, STATS_REJ_OVERLOAD,
- STATS_COMPILE_OK, STATS_COMPILE_ERROR, STATS_COMPILE_TIMEOUT,
- STATS_CLI_DISCONN, STATS_OTHER, STATS_ENUM_MAX };
-
--const char *stats_text[20];
-+extern const char *stats_text[20];
-
- int dcc_stats_init(void);
- void dcc_stats_init_kid(void);
diff --git a/main/dns-root-hints/APKBUILD b/main/dns-root-hints/APKBUILD
index 1995a1a84b..0ddc726238 100644
--- a/main/dns-root-hints/APKBUILD
+++ b/main/dns-root-hints/APKBUILD
@@ -8,18 +8,12 @@ arch="noarch"
license="Public-Domain"
depends="curl gnupg"
makedepends="curl"
-options="net"
source="verisign-grs-nstld-key.asc named.root named.root.sig
update-$pkgname
$pkgname.crond
"
-build() {
- mkdir -p "$builddir"
-}
-
package() {
- cd "$builddir"
install -D -m 644 -o root -g root "$srcdir"/named.root \
"$pkgdir"/usr/share/$pkgname/named.root
install -D -m 644 -o root -g root "$srcdir"/named.root.sig \
@@ -38,7 +32,6 @@ package() {
}
check() {
- cd "$builddir"
local _awkprog='
/related version of root zone:/ {
rootver=$NF;
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index b271d18eb5..6bebb51ed0 100644
--- a/main/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
@@ -2,6 +2,8 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
#
# secfixes:
+# 2.85-r0:
+# - CVE-2021-3448
# 2.83-r0:
# - CVE-2020-25681
# - CVE-2020-25682
@@ -24,18 +26,18 @@
# - CVE-2017-14496
#
pkgname=dnsmasq
-pkgver=2.84
-pkgrel=0
+pkgver=2.85
+pkgrel=2
pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server"
-url="http://www.thekelleys.org.uk/dnsmasq/"
+url="https://www.thekelleys.org.uk/dnsmasq/"
arch="all"
license="GPL-2.0-only OR GPL-3.0-only"
depends="!$pkgname-dnssec"
-makedepends="linux-headers nettle-dev"
+makedepends="linux-headers nettle-dev coreutils"
install="$pkgname.pre-install $pkgname.pre-upgrade
$pkgname-dnssec.pre-install $pkgname-dnssec.pre-upgrade"
subpackages="$pkgname-doc $pkgname-dnssec"
-source="http://www.thekelleys.org.uk/dnsmasq/dnsmasq-$pkgver.tar.gz
+source="https://www.thekelleys.org.uk/dnsmasq/dnsmasq-$pkgver.tar.xz
$pkgname.initd
$pkgname.confd
uncomment-conf-dir.patch
@@ -77,7 +79,7 @@ dnssec() {
cp -r "$pkgdir"/etc "$subpkgdir"/etc
}
-sha512sums="051eef7f9cc84ceeaea0071e5ac03f004fb3be217e9e1b6b6ad692ecda3c448d5bf210b7be933aba48166e7f5a8cb62043e37e0bea1ca1b27a05237db10b4e8a dnsmasq-2.84.tar.gz
+sha512sums="8beefe76b46f7d561f40d0900ba68b260a199cb62ab5b653746e3a1104c04fb8899b9e7a160a1be4fe8782bfb1607b556e9ffb9c25c4e99653e4bc74fcc03b09 dnsmasq-2.85.tar.xz
a7d64a838d10f4f69e0f2178cf66f0b3725901696e30df9e8e3e09f2afd7c86e9d95af64d2b63ef66f18b8a637397b7015573938df9ad961e2b36c391c3ac579 dnsmasq.initd
9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 dnsmasq.confd
01e9e235e667abda07675009fb1947547863e0bb0256393c5a415978e2a49c1007585c7f0b51e8decce79c05e6f2ced3f400b11343feaa4de9b2e524f74a1ee3 uncomment-conf-dir.patch"
diff --git a/main/dnssec-root/APKBUILD b/main/dnssec-root/APKBUILD
index f6bd8293c3..c868c7a171 100644
--- a/main/dnssec-root/APKBUILD
+++ b/main/dnssec-root/APKBUILD
@@ -3,21 +3,18 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dnssec-root
pkgver=20190225
-pkgrel=0
+pkgrel=1
_commit=67c11662510f5e2db6e6517228e80b794950c43f
pkgdesc="The DNSSEC root key(s)"
url="https://www.iana.org/dnssec/"
arch="noarch"
license="Public-Domain"
-depends=""
makedepends="python3 openssl"
-install=""
-subpackages=""
-options="net"
source="$pkgname-$pkgver.tar.gz::https://github.com/iana-org/get-trust-anchor/archive/$_commit.tar.gz
trusted-key.key
"
-builddir="$srcdir"/get-trust-anchor-$_commit
+options="!check" # No tests
+builddir="$srcdir/get-trust-anchor-$_commit"
snapshot() {
unpack
@@ -28,7 +25,6 @@ snapshot() {
}
package() {
- cd "$builddir"
install -Dm644 "$srcdir"/trusted-key.key \
"$pkgdir"/usr/share/$pkgname/trusted-key.key
}
diff --git a/main/doas/APKBUILD b/main/doas/APKBUILD
index 3abbc541e0..4afb74d34d 100644
--- a/main/doas/APKBUILD
+++ b/main/doas/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=doas
pkgver=6.8.1
-pkgrel=0
+pkgrel=1
pkgdesc="OpenBSD's temporary privilege escalation tool"
url="https://github.com/Duncaen/OpenDoas"
arch="all"
-license="BSD"
+license="ISC"
makedepends="bison"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/Duncaen/OpenDoas/archive/v$pkgver.tar.gz"
diff --git a/main/dovecot/fix-oauth2-jwt.c.patch b/main/dovecot/0001-oauth2-jwt-Use-int64_t-instead-time_t-for-portabilit.patch
index b3755f6993..5c4ab58e7e 100644
--- a/main/dovecot/fix-oauth2-jwt.c.patch
+++ b/main/dovecot/0001-oauth2-jwt-Use-int64_t-instead-time_t-for-portabilit.patch
@@ -1,18 +1,23 @@
-From 42c37d2473116bf4a7fcafcaf94de83947fe80bc Mon Sep 17 00:00:00 2001
+From 7372d154a41bc1c2b510c6dfb3ab67099e3a90a7 Mon Sep 17 00:00:00 2001
From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Thu, 13 Aug 2020 20:01:41 +0300
Subject: [PATCH] oauth2-jwt: Use int64_t instead time_t for portability
+---
+ src/lib-oauth2/oauth2-jwt.c | 27 +++++++++++++++++----------
+ 1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/lib-oauth2/oauth2-jwt.c b/src/lib-oauth2/oauth2-jwt.c
-index a68875e57..0adf612d9 100644
+index 83b241c558..09d3970743 100644
--- a/src/lib-oauth2/oauth2-jwt.c
+++ b/src/lib-oauth2/oauth2-jwt.c
-@@ -31,18 +31,25 @@ static const char *get_field(const struct json_tree *tree, const char *key)
+@@ -30,19 +30,26 @@ static const char *get_field(const struct json_tree *tree, const char *key)
+ return json_tree_get_value_str(value_node);
}
- static int get_time_field(const struct json_tree *tree, const char *key,
-- long *value_r)
+-static int
+-get_time_field(const struct json_tree *tree, const char *key, long *value_r)
++static int get_time_field(const struct json_tree *tree, const char *key,
+ int64_t *value_r)
{
+ time_t tvalue;
@@ -40,8 +45,8 @@ index a68875e57..0adf612d9 100644
+ return -1;
}
- static int oauth2_lookup_hmac_key(const struct oauth2_settings *set,
-@@ -283,9 +290,9 @@ oauth2_jwt_body_process(const struct oauth2_settings *set, const char *alg, cons
+ static int
+@@ -311,9 +318,9 @@ oauth2_jwt_body_process(const struct oauth2_settings *set, const char *alg,
const char *sub = get_field(tree, "sub");
int ret;
@@ -53,3 +58,6 @@ index a68875e57..0adf612d9 100644
int tz_offset ATTR_UNUSED;
if (sub == NULL) {
+--
+2.20.1
+
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 18361d7778..4291ec45e5 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -4,11 +4,11 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dovecot
-pkgver=2.3.13
+pkgver=2.3.14
_pkgverminor=${pkgver%.*}
_pkgvermajor=${_pkgverminor%.*}
pkgrel=0
-_pigeonholever=0.5.13
+_pigeonholever=0.5.14
_pigeonholevermajor=${_pigeonholever%.*}
pkgdesc="IMAP and POP3 server"
url="https://www.dovecot.org/"
@@ -24,6 +24,7 @@ makedepends="
bzip2-dev
clucene-dev
expat-dev
+ gettext-dev
heimdal-dev
libcap-dev
openssl-dev
@@ -60,8 +61,9 @@ source="https://www.dovecot.org/releases/$_pkgverminor/dovecot-$pkgver.tar.gz
skip-iconv-check.patch
split-protocols.patch
default-config.patch
- fix-oauth2-jwt.c.patch
fix-out-of-memory-test.patch
+ fix-libssl_iostream_openssl.patch
+ 0001-oauth2-jwt-Use-int64_t-instead-time_t-for-portabilit.patch
dovecot.logrotate
dovecot.initd
"
@@ -99,6 +101,11 @@ _builddir_pigeonhole="$srcdir/$pkgname-$_pkgverminor-pigeonhole-$_pigeonholever"
# - CVE-2017-14461
# - CVE-2017-15132
+prepare() {
+ default_prepare
+ autoreconf -vi
+}
+
_configure() {
./configure \
--build=$CBUILD \
@@ -315,12 +322,13 @@ _submv() {
done
}
-sha512sums="758a169fba8925637ed18fa7522a6f06c9fe01a1707b1ca0d0a4d8757c578a8e117c91733e8314403839f9a484bbcac71ce3532c82379eb583b480756d556a95 dovecot-2.3.13.tar.gz
-fcbc13d71af4e6dd4e34192484e203d755e5015da76a4774b11a79182b2baad36cab5a471346093111ace36a7775dfe8294555f8b777786dde386820b3ec5cd3 dovecot-2.3-pigeonhole-0.5.13.tar.gz
+sha512sums="69df234cb739c7ee7ae3acfb9756bc22481e94c95463d32bfac315c7ec4b1ba0dfbff552b769f2ab7ee554087ca2ebbe331aa008d3af26417016612dc7cad103 dovecot-2.3.14.tar.gz
+c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc dovecot-2.3-pigeonhole-0.5.14.tar.gz
fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a skip-iconv-check.patch
794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5 split-protocols.patch
0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07 default-config.patch
-7f428b0f14323a5dda00aef93f4835c2c38a7b780a939a47f759d31df4636e86055f95d17e2358cb37a2704ea022dfad602c7ed4568cba644347f20fd1e15e3b fix-oauth2-jwt.c.patch
733cdbfb7f6b2608470bd30a0f9190ec86099d4c8e48b7fb92d7b595be665bf749976889033e1ad438edd3f99f2e0d496dd0d667291915c80df82f7e62483f59 fix-out-of-memory-test.patch
+0fb56eb9c7fae8d8b1d794928ce2ba58d03c102cd7c3f959799c62c5d838ff535ecccb64bc1970d960f67d49388c880773e9eac5aed3bcf92e6efed3b56cc837 fix-libssl_iostream_openssl.patch
+5da4367fd8bb0ea4d94c676568a5f0142217a7556fbcf5cdbdfc92e5b7955d432858a5e944ad0aebc310b6b5c4219f800428e6ddadee1a3aaa954847a8a46317 0001-oauth2-jwt-Use-int64_t-instead-time_t-for-portabilit.patch
9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0 dovecot.logrotate
d91951b81150d7a3ef6a674c0dc7b012f538164dac4b9d27a6801d31da6813b764995a438f69b6a680463e1b60a3b4f2959654f68e565fe116ea60312d5e5e70 dovecot.initd"
diff --git a/main/dovecot/fix-libssl_iostream_openssl.patch b/main/dovecot/fix-libssl_iostream_openssl.patch
new file mode 100644
index 0000000000..5c4cbb6263
--- /dev/null
+++ b/main/dovecot/fix-libssl_iostream_openssl.patch
@@ -0,0 +1,14 @@
+diff --git a/src/lib-dcrypt/Makefile.am b/src/lib-dcrypt/Makefile.am
+index e9e5116953..718d451c4f 100644
+--- a/src/lib-dcrypt/Makefile.am
++++ b/src/lib-dcrypt/Makefile.am
+@@ -20,7 +20,8 @@ libdcrypt_la_CFLAGS = $(AM_CPPFLAGS) \
+ if BUILD_DCRYPT_OPENSSL
+ pkglib_LTLIBRARIES += libdcrypt_openssl.la
+ libdcrypt_openssl_la_SOURCES = dcrypt-openssl.c
+-libdcrypt_openssl_la_LDFLAGS = -module -avoid-version ../lib-ssl-iostream/libssl_iostream_openssl.la
++libdcrypt_openssl_la_LDFLAGS = -module -avoid-version ../lib-ssl-iostream/libssl_iostream.la \
++ ../lib-ssl-iostream/libssl_iostream_openssl.la
+ libdcrypt_openssl_la_LIBADD = $(SSL_LIBS)
+ libdcrypt_openssl_la_DEPENDENCIES = ../lib-ssl-iostream/libssl_iostream_openssl.la
+ libdcrypt_openssl_la_CFLAGS = $(AM_CPPFLAGS) \
diff --git a/main/doxygen/APKBUILD b/main/doxygen/APKBUILD
index 716ea93314..6ae0689e2f 100644
--- a/main/doxygen/APKBUILD
+++ b/main/doxygen/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=doxygen
pkgver=1.9.1
-pkgrel=0
+pkgrel=1
pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
url="https://www.doxygen.nl/"
arch="all"
diff --git a/main/dpkg/APKBUILD b/main/dpkg/APKBUILD
index 197c93a138..5b633b8b27 100644
--- a/main/dpkg/APKBUILD
+++ b/main/dpkg/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dpkg
-pkgver=1.20.7.1
+pkgver=1.20.9
pkgrel=0
pkgdesc="The Debian Package Manager"
url="https://wiki.debian.org/Teams/Dpkg"
@@ -91,5 +91,5 @@ dev() {
mv "$pkgdir"/usr/share/perl* "$subpkgdir"/usr/share/
}
-sha512sums="beec7a7ba1cfbd6954b3d583e57c811af3bfa5e4e4554e6af6673d4a4be0e79fb4aded2f6aeeda592c2ba3d91facb82138f2eb8eb2338dc4fae1832911df2fd6 dpkg_1.20.7.1.tar.xz
+sha512sums="904a4742f5f340dc65b2137364dce102a0b2eb42ccedb2a73f79c207362c699fbffaaf1379f1f6c8b8b0e490321af1d03c34b50ebe0c703f5ce8a7f75f17a839 dpkg_1.20.9.tar.xz
059875c06146382f1e4a339860c558a71393a43bf9e6580c0a2211c629cc9be1b4fd12c900b002f833a241ad9a339f138b458b60664da06db5b32db1c6490b2f 0001-t-command-Fix-test_command_exec-program-invocation.patch"
diff --git a/main/drbd-utils/APKBUILD b/main/drbd-utils/APKBUILD
index 3c2498d4dd..fbd806ee4b 100644
--- a/main/drbd-utils/APKBUILD
+++ b/main/drbd-utils/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=drbd-utils
-pkgver=9.15.1
+pkgver=9.16.0
pkgrel=0
pkgdesc="Network-based RAID 1"
url="https://www.drbd.org"
@@ -59,6 +59,6 @@ bashcomp() {
"$subpkgdir"/usr/share/bash-completion/completions
}
-sha512sums="bf9c46335500c0dd7afdc160221acaf8fd053afc453cb26cd76ef085c41580be5a62021ef1f1a57eac9df70d1158a008f489d1a8bb5c3329c5a187f79e4942de drbd-utils-9.15.1.tar.gz
+sha512sums="ad4367d4ed90020e05b98514bff9f515e7ddc07c1e5d2560b7b9330a4c03a1a788658bae719c18023cad0788d7949beeaebacffd9e60bc2a0703ac7fdcc5db89 drbd-utils-9.16.0.tar.gz
562ae8eee03148666fb6e6e700c1eb9086f6901e176ea6cd007e3ac4e39d1cdaf967064de74dc1ad620155996dc7011bd0e2abd1c9595ff9bf5f4413673726f3 drbdsetup-permissions.patch
f61a833dc5eea79000a7dd85e83ae10e284109c76b5d59974ed69f92dbab6c389d6d20f7ea374b7c066519c6d1d816ed27b48dbaee6b91fb9754974acf52f46e drbd.initd"
diff --git a/main/dtc/APKBUILD b/main/dtc/APKBUILD
index 8cd502e02b..57b7ffbfed 100644
--- a/main/dtc/APKBUILD
+++ b/main/dtc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dtc
pkgver=1.6.0
-pkgrel=2
+pkgrel=3
pkgdesc="Device Tree Compiler"
url="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/"
arch="all"
diff --git a/main/ell/APKBUILD b/main/ell/APKBUILD
index 7a9182e34c..823cf57773 100644
--- a/main/ell/APKBUILD
+++ b/main/ell/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Milan P. Stanić <mps@arvanta.net>
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=ell
-pkgver=0.38
+pkgver=0.40
pkgrel=0
pkgdesc="Linux library for embedded development"
url="https://01.org/ell"
@@ -13,6 +13,10 @@ subpackages="$pkgname-dev"
source="https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-$pkgver.tar.gz
"
+case "$CARCH" in
+aarch64|arm*) options="!check" ;;
+esac
+
build() {
./configure \
--build=$CBUILD \
@@ -33,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="b8585c75b6800aad912025feb49203478f67190afca3afa10916f1bd241da2c043f5bb165fa5f4b7f08a597c87fb613e4ac2a2bbe1ee7a91beb558ef9d03d55f ell-0.38.tar.gz"
+sha512sums="a481a75cfc784d77d971f8fc1ca0f5d61a74e09bdd3dcc99fd808cfa33ad4c56f8c6b24ebc5585347d3bca5e7712e97897394f61ef2c59e002ef168da114b49b ell-0.40.tar.gz"
diff --git a/main/encfs/APKBUILD b/main/encfs/APKBUILD
index 20e9f6a870..d92c42c906 100644
--- a/main/encfs/APKBUILD
+++ b/main/encfs/APKBUILD
@@ -3,7 +3,7 @@
pkgname=encfs
pkgver=1.9.5
_ver=${pkgver/_/-}
-pkgrel=7
+pkgrel=8
pkgdesc="EncFS provides an encrypted filesystem in user-space"
url="https://vgough.github.io/encfs/"
arch="all"
diff --git a/main/ethtool/APKBUILD b/main/ethtool/APKBUILD
index 2a64d521bd..861aa9c675 100644
--- a/main/ethtool/APKBUILD
+++ b/main/ethtool/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ethtool
-pkgver=5.10
+pkgver=5.12
pkgrel=0
pkgdesc="Utility for controlling network drivers and hardware"
url="https://mirrors.edge.kernel.org/pub/software/network/ethtool/"
@@ -37,4 +37,4 @@ bashcomp() {
amove usr/share/bash-completion/completions
}
-sha512sums="128ecc0445ec44e231d95158a71cea2c03f059314f1a844cfb2f424970bd68608fb73b8dc5e8905b88ad0da2b65a8884a626be78d6d25f770ce043c6c87580a6 ethtool-5.10.tar.xz"
+sha512sums="9825f0bf10851f0bd9c3e621785144a5ed5f3fbedacb1801aa6a9b4685c870fa9bfac8eb552c900d20be06240c017dd001fde6be7aecc8c466bbe9ade8b1d002 ethtool-5.12.tar.xz"
diff --git a/main/eventlog/APKBUILD b/main/eventlog/APKBUILD
index 0aec432349..a4eb1a4c4b 100644
--- a/main/eventlog/APKBUILD
+++ b/main/eventlog/APKBUILD
@@ -1,24 +1,22 @@
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
# Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
-
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=eventlog
pkgver=0.2.13
-pkgrel=1
+pkgrel=2
pkgdesc="API to format and send structured log messages"
arch="all"
-url="https://www.balabit.com/support/community/products/"
+url="https://github.com/balabit/eventlog"
license="BSD-3-Clause"
makedepends="automake autoconf libtool"
subpackages="$pkgname-dev"
-source="https://src.fedoraproject.org/lookaside/extras/$pkgname/${pkgname}_${pkgver}.tar.gz/68ec8d1ea3b98fa35002bb756227c315/${pkgname}_${pkgver}.tar.gz"
+source="https://src.fedoraproject.org/lookaside/extras/eventlog/eventlog_$pkgver.tar.gz/68ec8d1ea3b98fa35002bb756227c315/eventlog_$pkgver.tar.gz"
prepare() {
- cd "$builddir"
+ default_prepare
autoreconf -vif
}
build() {
- cd "$builddir"
./configure \
--prefix=/usr \
--sysconfdir=/etc \
@@ -28,15 +26,13 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
- make DESTDIR="${pkgdir}" install
+ make DESTDIR="$pkgdir" install
install -Dm644 COPYING \
- "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+ "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
}
sha512sums="0c76199479f1d5191e6f591909878dcb747fc211ea97345c5c5575dd50482ee6e2e34aa0e8255ae366c5d563a79a55b178ed3289965cc9013f001909a2cb9732 eventlog_0.2.13.tar.gz"
diff --git a/main/execline/APKBUILD b/main/execline/APKBUILD
index 811904ca21..55271db629 100644
--- a/main/execline/APKBUILD
+++ b/main/execline/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
# Contributor: John Regan <john@jrjrtech.com>
pkgname=execline
-pkgver=2.8.0.0
+pkgver=2.8.0.1
pkgrel=0
pkgdesc="A small scripting language, to be used in place of a shell in non-interactive scripts."
url="http://skarnet.org/software/$pkgname/"
@@ -37,4 +37,4 @@ static() {
rmdir -p "$pkgdir"/usr/lib || :
}
-sha512sums="9250248ff3753806c05c99d8fd76b17f511413e691fcb2fe0907cbd16b691e17ff260b15f504a8c8bc279cd53360012f345af803fd48b0a27a1009c171a8ddf9 execline-2.8.0.0.tar.gz"
+sha512sums="280c2524d510af0e7913961505cd5bd5eb65528918ad50c638592403b569939e5357d59cd05ddbabbf5e5c2c908fd9fb2218ded16413d62bea4c984582032c08 execline-2.8.0.1.tar.gz"
diff --git a/main/expat/APKBUILD b/main/expat/APKBUILD
index 9bf52beab2..aca6dae577 100644
--- a/main/expat/APKBUILD
+++ b/main/expat/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=expat
-pkgver=2.2.10
-pkgrel=1
+pkgver=2.3.0
+pkgrel=0
pkgdesc="XML Parser library written in C"
url="http://www.libexpat.org/"
arch="all"
@@ -36,4 +36,4 @@ package() {
make DESTDIR="$pkgdir/" install
}
-sha512sums="9623e86024d09e3bb0cf51fd0d56ecaee5fb8c8acb71589104a63b510f73c1e84abb0ccea4e2c196bdf1d30b5ad0633a915758f75813717d031d633e34f022b7 expat-2.2.10.tar.bz2"
+sha512sums="937468f2c298503a2c8d3f70b36e2c79d6b603e758abe0613fd2b636d3cf6906946776fdfe6725a8d6e90748ed7f7f07ad0d7a07c4328f6669bc89482c0e535b expat-2.3.0.tar.bz2"
diff --git a/main/f2fs-tools/APKBUILD b/main/f2fs-tools/APKBUILD
index 372b36f326..ec225940eb 100644
--- a/main/f2fs-tools/APKBUILD
+++ b/main/f2fs-tools/APKBUILD
@@ -12,6 +12,14 @@ subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs"
source="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-$pkgver.tar.gz
"
+# secfixes:
+# 1.14.0-r0:
+# - CVE-2021-6104
+# - CVE-2021-6105
+# - CVE-2021-6106
+# - CVE-2021-6107
+# - CVE-2021-6108
+
prepare() {
default_prepare
./autogen.sh
diff --git a/main/fail2ban/0001-amend-to-f3dbc9dda10e52610e3de26f538b5581fd905505-ch.patch b/main/fail2ban/0001-amend-to-f3dbc9dda10e52610e3de26f538b5581fd905505-ch.patch
deleted file mode 100644
index 831d7a48c5..0000000000
--- a/main/fail2ban/0001-amend-to-f3dbc9dda10e52610e3de26f538b5581fd905505-ch.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From ef7aeba83a6fb936c4dca847a69140c5b22c8000 Mon Sep 17 00:00:00 2001
-From: sebres <serg.brester@sebres.de>
-Date: Fri, 7 Feb 2020 11:08:01 +0100
-Subject: [PATCH] amend to f3dbc9dda10e52610e3de26f538b5581fd905505: change
- main thread-name back to `fail2ban-server`; implements new command line
- option `--pname` to specify it by start of server (default
- `fail2ban-server`); closes gh-2623 (revert change of main thread-name,
- because it can affect process-name too, so `pgrep` & co. may be confused)
-
-(cherry picked from commit 3f489070646b363aa0374681fe910f05521cd247)
----
- fail2ban/client/fail2bancmdline.py | 3 ++-
- fail2ban/server/server.py | 5 +++--
- man/fail2ban-client.1 | 3 +++
- man/fail2ban-server.1 | 3 +++
- 4 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/fail2ban/client/fail2bancmdline.py b/fail2ban/client/fail2bancmdline.py
-index 1268ee9f..3c6bd0bf 100644
---- a/fail2ban/client/fail2bancmdline.py
-+++ b/fail2ban/client/fail2bancmdline.py
-@@ -97,6 +97,7 @@ class Fail2banCmdLine():
- output(" -c <DIR> configuration directory")
- output(" -s <FILE> socket path")
- output(" -p <FILE> pidfile path")
-+ output(" --pname <NAME> name of the process (main thread) to identify instance (default fail2ban-server)")
- output(" --loglevel <LEVEL> logging level")
- output(" --logtarget <TARGET> logging target, use file-name or stdout, stderr, syslog or sysout.")
- output(" --syslogsocket auto|<FILE>")
-@@ -185,7 +186,7 @@ class Fail2banCmdLine():
- try:
- cmdOpts = 'hc:s:p:xfbdtviqV'
- cmdLongOpts = ['loglevel=', 'logtarget=', 'syslogsocket=', 'test', 'async',
-- 'timeout=', 'str2sec=', 'help', 'version', 'dp', '--dump-pretty']
-+ 'pname=', 'timeout=', 'str2sec=', 'help', 'version', 'dp', '--dump-pretty']
- optList, self._args = getopt.getopt(self._argv[1:], cmdOpts, cmdLongOpts)
- except getopt.GetoptError:
- self.dispUsage()
-diff --git a/fail2ban/server/server.py b/fail2ban/server/server.py
-index 15265822..417f4514 100644
---- a/fail2ban/server/server.py
-+++ b/fail2ban/server/server.py
-@@ -81,8 +81,6 @@ class Server:
- 'Linux': '/dev/log',
- }
- self.__prev_signals = {}
-- # replace real thread name with short process name (for top/ps/pstree or diagnostic):
-- prctl_set_th_name('f2b/server')
-
- def __sigTERMhandler(self, signum, frame): # pragma: no cover - indirect tested
- logSys.debug("Caught signal %d. Exiting", signum)
-@@ -113,6 +111,9 @@ class Server:
- logSys.error(err)
- raise ServerInitializationError(err)
- # We are daemon.
-+
-+ # replace main thread (and process) name to identify server (for top/ps/pstree or diagnostic):
-+ prctl_set_th_name(conf.get("pname", "fail2ban-server"))
-
- # Set all logging parameters (or use default if not specified):
- self.__verbose = conf.get("verbose", None)
-diff --git a/man/fail2ban-client.1 b/man/fail2ban-client.1
-index 745c080a..5727caf0 100644
---- a/man/fail2ban-client.1
-+++ b/man/fail2ban-client.1
-@@ -19,6 +19,9 @@ socket path
- \fB\-p\fR <FILE>
- pidfile path
- .TP
-+\fB\-\-pname\fR <NAME>
-+name of the process (main thread) to identify instance (default fail2ban\-server)
-+.TP
- \fB\-\-loglevel\fR <LEVEL>
- logging level
- .TP
-diff --git a/man/fail2ban-server.1 b/man/fail2ban-server.1
-index 418b46dd..25c5ec96 100644
---- a/man/fail2ban-server.1
-+++ b/man/fail2ban-server.1
-@@ -19,6 +19,9 @@ socket path
- \fB\-p\fR <FILE>
- pidfile path
- .TP
-+\fB\-\-pname\fR <NAME>
-+name of the process (main thread) to identify instance (default fail2ban\-server)
-+.TP
- \fB\-\-loglevel\fR <LEVEL>
- logging level
- .TP
---
-2.20.1
-
diff --git a/main/fail2ban/APKBUILD b/main/fail2ban/APKBUILD
index 8267d0c39c..2ccd0932ae 100644
--- a/main/fail2ban/APKBUILD
+++ b/main/fail2ban/APKBUILD
@@ -2,18 +2,16 @@
# Contributor: Jeff Bilyk <jbilyk@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fail2ban
-pkgver=0.11.1
-pkgrel=4
+pkgver=0.11.2
+pkgrel=0
pkgdesc="Scans log files for login failures then updates iptables to reject originating ip address"
-url="https://www.fail2ban.org"
-arch="noarch !s390x" # test failures
+url="https://www.fail2ban.org/"
+arch="" # Tests fail on the builders
license="GPL-2.0-or-later"
depends="python3 iptables ip6tables logrotate"
makedepends="python3-dev py3-setuptools bash"
subpackages="$pkgname-doc $pkgname-openrc"
source="$pkgname-$pkgver.tar.gz::https://github.com/fail2ban/fail2ban/archive/$pkgver.tar.gz
- ec37b1942c4da76f7a0f71efe81bea6835466648.patch
- 0001-amend-to-f3dbc9dda10e52610e3de26f538b5581fd905505-ch.patch
fail2ban.confd
fail2ban.logrotate
alpine-ssh.jaild
@@ -21,7 +19,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/fail2ban/fail2ban/archive/$p
alpine-sshd-ddos.filterd
"
case "$CARCH" in
- mips64|armhf) options="!check";;
+ s390x|mips64|armhf) options="!check";;
esac
build() {
@@ -53,9 +51,7 @@ package() {
install -Dm644 -t "$pkgdir"/usr/share/man/man5 man/*.5
}
-sha512sums="019b088aa6375f98742ed101ef6f65adabca3324444d71d5b8597a8d1d22fa76b9f503660f0498643fe24a3b8e4368de916072a1ab77b8e2ea3eda41c3e0c8c6 fail2ban-0.11.1.tar.gz
-2d57fe7a7e3d1889dfa00ac33f5071069ed62f5fc0edb1e1827aedc47fae3a36d19c568b1721ba3a8e117f4ba6b3756d11942f2320b42864d45203f45761c7b6 ec37b1942c4da76f7a0f71efe81bea6835466648.patch
-a4dbbcde8ba98368905e06a2d526c662f9087931bc1dab02dd85138d7fcd7d724cfdcee074b454f85def76f1a33d10f0c3b062d9bd777fd52ad73ea45df1dcc8 0001-amend-to-f3dbc9dda10e52610e3de26f538b5581fd905505-ch.patch
+sha512sums="46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97 fail2ban-0.11.2.tar.gz
1e7581dd04e7777d6fd5c40cc842a7ec5f4e6a0374673d020d89dd61bf4093d48934844bee89bcac9084f9ae44f3beb66e714cf3c2763d79c3e8feb790c5e43b fail2ban.confd
ee1c229db970239ebc707cd484a650fcf2347c70b411728ee2a4a35a72f4118cfccecf2a221275603320e0332efcc16e4979201933cec1aef1c5d5a082fc4940 fail2ban.logrotate
84915967ae1276f1e14a5813680ee2ebf081af1ff452a688ae5f9ac3363f4aff90e39f8e6456b5c33d5699917d28a16308797095fd1ef9bb1fbcb46d4cea3def alpine-ssh.jaild
diff --git a/main/fail2ban/ec37b1942c4da76f7a0f71efe81bea6835466648.patch b/main/fail2ban/ec37b1942c4da76f7a0f71efe81bea6835466648.patch
deleted file mode 100644
index 38782137b4..0000000000
--- a/main/fail2ban/ec37b1942c4da76f7a0f71efe81bea6835466648.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ec37b1942c4da76f7a0f71efe81bea6835466648 Mon Sep 17 00:00:00 2001
-From: sebres <serg.brester@sebres.de>
-Date: Tue, 14 Jan 2020 11:39:13 +0100
-Subject: [PATCH] action.d/nginx-block-map.conf: fixed backslash substitution
- (different echo behavior in some shells, gh-2596)
-
----
- config/action.d/nginx-block-map.conf | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/config/action.d/nginx-block-map.conf b/config/action.d/nginx-block-map.conf
-index 0b6aa0ad7..ee702907e 100644
---- a/config/action.d/nginx-block-map.conf
-+++ b/config/action.d/nginx-block-map.conf
-@@ -103,6 +103,8 @@ actionstop = %(actionflush)s
-
- actioncheck =
-
--actionban = echo "\\\\<fid> 1;" >> '%(blck_lst_file)s'; %(blck_lst_reload)s
-+_echo_blck_row = printf '\%%s 1;\n' "<fid>"
-
--actionunban = id=$(echo "<fid>" | sed -e 's/[]\/$*.^|[]/\\&/g'); sed -i "/^\\\\$id 1;$/d" %(blck_lst_file)s; %(blck_lst_reload)s
-+actionban = %(_echo_blck_row)s >> '%(blck_lst_file)s'; %(blck_lst_reload)s
-+
-+actionunban = id=$(%(_echo_blck_row)s | sed -e 's/[]\/$*.^|[]/\\&/g'); sed -i "/^$id$/d" %(blck_lst_file)s; %(blck_lst_reload)s
diff --git a/main/file/APKBUILD b/main/file/APKBUILD
index 747031d1bd..dc95111fc9 100644
--- a/main/file/APKBUILD
+++ b/main/file/APKBUILD
@@ -1,15 +1,17 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=file
-pkgver=5.39
-pkgrel=0
+pkgver=5.40
+pkgrel=1
pkgdesc="File type identification utility"
-url="https://www.darwinsys.com/file"
+url="https://www.darwinsys.com/file/"
arch="all"
license="BSD-2-Clause"
makedepends="autoconf libtool automake"
subpackages="$pkgname-dev $pkgname-doc libmagic"
source="$pkgname-$pkgver.tar.gz::https://github.com/file/file/archive/FILE${pkgver/./_}.tar.gz
+ file-5.40-magic-unsigned.patch
+ file-5.40-magic-xzip.patch
"
builddir="$srcdir/$pkgname-FILE${pkgver/./_}"
@@ -47,4 +49,6 @@ libmagic() {
mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr
}
-sha512sums="5633bf2fffc0eda03f2e8cdc8a413f4e97dab6f12f4a5727ec0f4ba6595f2887579612fe508d5d76bbc8bd63d344ed07ee60e0a17e42f4f2d9d9490574a32633 file-5.39.tar.gz"
+sha512sums="d76bfe5326e1b40368e055c2e049a24b4ffdbd727371f4f3aa1dd3f53787d16b88550b3cc71ecf02151e2fb3e567eb2598e4707badab8c391eb71113c2dcc319 file-5.40.tar.gz
+2337fb72b94e0220e40da0d758d2a6f1592725a323080dcbf7a4ca6f37caebacc684f9fe04662624320519553bf74db704aa2922892953bb9b487eb07e95ff8f file-5.40-magic-unsigned.patch
+4e9e64c1ac0e7e95a113577a32be0fe2f2c2d9acbbe323622c2409d2e1b9f9a6cb3e8572569bbef156ca06c6470ee7db38d2579582622f224919eb37243319e5 file-5.40-magic-xzip.patch"
diff --git a/main/file/file-5.40-magic-unsigned.patch b/main/file/file-5.40-magic-unsigned.patch
new file mode 100644
index 0000000000..aff1c80a42
--- /dev/null
+++ b/main/file/file-5.40-magic-unsigned.patch
@@ -0,0 +1,147 @@
+From f06015040e7ffb3be21bb7622f9f8291b749aaf9 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Sun, 4 Apr 2021 17:46:17 +0000
+Subject: [PATCH] Fix regression after unsigned/signed printing changes by
+ making types unsigned (Richard W.M. Jones)
+
+---
+ magic/Magdir/filesystems | 54 +++++++++++++++++++--------------------
+ magic/Magdir/linux | 30 +++++++++++-----------
+ tests/Makefile.am | 1 +
+ tests/ext4.result | 1 +
+ tests/ext4.testfile | Bin 0 -> 2048 bytes
+ 5 files changed, 44 insertions(+), 42 deletions(-)
+ create mode 100644 tests/ext4.result
+ create mode 100644 tests/ext4.testfile
+
+diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
+index 0cb45cbfe..81966d6cc 100644
+--- a/magic/Magdir/filesystems
++++ b/magic/Magdir/filesystems
+@@ -1,5 +1,5 @@
+ #------------------------------------------------------------------------------
+-# $File: filesystems,v 1.140 2021/02/23 00:51:10 christos Exp $
++# $File: filesystems,v 1.141 2021/04/04 17:46:17 christos Exp $
+ # filesystems: file(1) magic for different filesystems
+ #
+ 0 name partid
+@@ -1739,12 +1739,12 @@
+ >>>0x464 lelong >0x0000007 ext4 filesystem data
+ # else large INCOMPAT?
+ >>0x460 lelong >0x000003f ext4 filesystem data
+->0x468 belong x \b, UUID=%08x
+->0x46c beshort x \b-%04x
+->0x46e beshort x \b-%04x
+->0x470 beshort x \b-%04x
+->0x472 belong x \b-%08x
+->0x476 beshort x \b%04x
++>0x468 ubelong x \b, UUID=%08x
++>0x46c ubeshort x \b-%04x
++>0x46e ubeshort x \b-%04x
++>0x470 ubeshort x \b-%04x
++>0x472 ubelong x \b-%08x
++>0x476 ubeshort x \b%04x
+ >0x478 string >0 \b, volume name "%s"
+ # General flags for any ext* fs
+ >0x460 lelong &0x0000004 (needs journal recovery)
+@@ -1767,12 +1767,12 @@
+
+ # f2fs filesystem - Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
+ 0x400 lelong 0xF2F52010 F2FS filesystem
+->0x46c belong x \b, UUID=%08x
+->0x470 beshort x \b-%04x
+->0x472 beshort x \b-%04x
+->0x474 beshort x \b-%04x
+->0x476 belong x \b-%08x
+->0x47a beshort x \b%04x
++>0x46c ubelong x \b, UUID=%08x
++>0x470 ubeshort x \b-%04x
++>0x472 ubeshort x \b-%04x
++>0x474 ubeshort x \b-%04x
++>0x476 ubelong x \b-%08x
++>0x47a ubeshort x \b%04x
+ >0x147c lestring16 x \b, volume name "%s"
+
+ # Minix filesystems - Juan Cespedes <cespedes@debian.org>
+@@ -2296,20 +2296,20 @@
+ >>0x10060 string >\0 lockproto %s)
+
+ # Russell Coker <russell@coker.com.au>
+-0x10040 string _BHRfS_M BTRFS Filesystem
+->0x1012b string >\0 label "%s",
+->0x10090 lelong x sectorsize %d,
+->0x10094 lelong x nodesize %d,
+->0x10098 lelong x leafsize %d,
+->0x10020 belong x UUID=%08x-
+->0x10024 beshort x \b%04x-
+->0x10026 beshort x \b%04x-
+->0x10028 beshort x \b%04x-
+->0x1002a beshort x \b%04x
+->0x1002c belong x \b%08x,
+->0x10078 lequad x %lld/
+->0x10070 lequad x \b%lld bytes used,
+->0x10088 lequad x %lld devices
++0x10040 string _BHRfS_M BTRFS Filesystem
++>0x1012b string >\0 label "%s",
++>0x10090 lelong x sectorsize %d,
++>0x10094 lelong x nodesize %d,
++>0x10098 lelong x leafsize %d,
++>0x10020 ubelong x UUID=%08x-
++>0x10024 ubeshort x \b%04x-
++>0x10026 ubeshort x \b%04x-
++>0x10028 ubeshort x \b%04x-
++>0x1002a ubeshort x \b%04x
++>0x1002c ubelong x \b%08x,
++>0x10078 lequad x %lld/
++>0x10070 lequad x \b%lld bytes used,
++>0x10088 lequad x %lld devices
+
+ # dvdisaster's .ecc
+ # From: "Nelson A. de Oliveira" <naoliv@gmail.com>
+diff --git a/magic/Magdir/linux b/magic/Magdir/linux
+index 693cef6f5..f25243e20 100644
+--- a/magic/Magdir/linux
++++ b/magic/Magdir/linux
+@@ -1,6 +1,6 @@
+
+ #------------------------------------------------------------------------------
+-# $File: linux,v 1.77 2021/02/24 23:05:02 christos Exp $
++# $File: linux,v 1.78 2021/04/04 17:46:17 christos Exp $
+ # linux: file(1) magic for Linux files
+ #
+ # Values for Linux/i386 binaries, from Daniel Quinlan <quinlan@yggdrasil.com>
+@@ -83,20 +83,20 @@
+
+ # format v1, supported since 1998
+ 0 name linux-swap
+->0x400 lelong 1 little endian, version %u,
+->>0x404 lelong x size %u pages,
+->>0x408 lelong x %u bad pages,
+->0x400 belong 1 big endian, version %u,
+->>0x404 belong x size %u pages,
+->>0x408 belong x %u bad pages,
+->0x41c string \0 no label,
+->0x41c string >\0 LABEL=%s,
+->0x40c belong x UUID=%08x
+->0x410 beshort x \b-%04x
+->0x412 beshort x \b-%04x
+->0x414 beshort x \b-%04x
+->0x416 belong x \b-%08x
+->0x41a beshort x \b%04x
++>0x400 lelong 1 little endian, version %u,
++>>0x404 lelong x size %u pages,
++>>0x408 lelong x %u bad pages,
++>0x400 belong 1 big endian, version %u,
++>>0x404 belong x size %u pages,
++>>0x408 belong x %u bad pages,
++>0x41c string \0 no label,
++>0x41c string >\0 LABEL=%s,
++>0x40c ubelong x UUID=%08x
++>0x410 ubeshort x \b-%04x
++>0x412 ubeshort x \b-%04x
++>0x414 ubeshort x \b-%04x
++>0x416 ubelong x \b-%08x
++>0x41a ubeshort x \b%04x
+
+ 0xff6 string SWAPSPACE2 Linux swap file, 4k page size,
+ >0 use linux-swap
diff --git a/main/file/file-5.40-magic-xzip.patch b/main/file/file-5.40-magic-xzip.patch
new file mode 100644
index 0000000000..e4fed0421f
--- /dev/null
+++ b/main/file/file-5.40-magic-xzip.patch
@@ -0,0 +1,37 @@
+From 9b0459afab309a82aa4e46f73a4e50dd641f3d39 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Mon, 19 Apr 2021 17:01:45 +0000
+Subject: [PATCH] PR/257: cuihao: put attributes inside the xz magic.
+
+---
+ magic/Magdir/compress | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/magic/Magdir/compress b/magic/Magdir/compress
+index 64d11a736..41a65738f 100644
+--- a/magic/Magdir/compress
++++ b/magic/Magdir/compress
+@@ -1,5 +1,5 @@
+ #------------------------------------------------------------------------------
+-# $File: compress,v 1.80 2021/03/15 17:49:24 christos Exp $
++# $File: compress,v 1.81 2021/04/19 17:01:45 christos Exp $
+ # compress: file(1) magic for pure-compression formats (no archives)
+ #
+ # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
+@@ -265,14 +265,13 @@
+
+ # http://tukaani.org/xz/xz-file-format.txt
+ 0 ustring \xFD7zXZ\x00 XZ compressed data, checksum
++!:strength * 2
++!:mime application/x-xz
+ >7 byte&0xf 0x0 NONE
+ >7 byte&0xf 0x1 CRC32
+ >7 byte&0xf 0x4 CRC64
+ >7 byte&0xf 0xa SHA-256
+
+-!:strength * 2
+-!:mime application/x-xz
+-
+ # https://github.com/ckolivas/lrzip/blob/master/doc/magic.header.txt
+ 0 string LRZI LRZIP compressed data
+ >4 byte x - version %d
diff --git a/main/findutils/APKBUILD b/main/findutils/APKBUILD
index 1a44c0bc66..551f6ab684 100644
--- a/main/findutils/APKBUILD
+++ b/main/findutils/APKBUILD
@@ -3,13 +3,13 @@
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=findutils
pkgver=4.8.0
-pkgrel=0
+pkgrel=1
pkgdesc="GNU utilities for finding files"
url="https://www.gnu.org/software/findutils/"
arch="all"
license="GPL-3.0-or-later"
checkdepends="coreutils diffutils dejagnu"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-locate:_locate"
source="https://ftp.gnu.org/pub/gnu/findutils/findutils-$pkgver.tar.xz
test-parse-datetime.patch"
@@ -34,5 +34,12 @@ package() {
rm -rf "$pkgdir"/usr/lib
}
+_locate() {
+ pkgdesc="locate and updatedb from findutils"
+ amove usr/libexec/frcode \
+ usr/bin/locate \
+ usr/bin/updatedb
+}
+
sha512sums="eaa2da304dbeb2cd659b9210ac37da1bde4cd665c12a818eca98541c5ed5cba1050641fc0c39c0a446a5a7a87a8d654df0e0e6b0cee21752ea485188c9f1071e findutils-4.8.0.tar.xz
79571dc889afa5e6f01c9e1d4134df5e4112a410f24eb3e315645f6886a901780745abe49597d07c6409a3e3ecd3380b1721d86a684b7705c35767111c93bbf5 test-parse-datetime.patch"
diff --git a/main/fish/APKBUILD b/main/fish/APKBUILD
index 97fb70e76b..28bf2f0c84 100644
--- a/main/fish/APKBUILD
+++ b/main/fish/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Leo <thinkabit.ukim@gmail.com>
pkgname=fish
-pkgver=3.2.0
-pkgrel=0
+pkgver=3.2.2
+pkgrel=1
pkgdesc="Modern interactive commandline shell"
url="https://fishshell.com/"
arch="all"
@@ -53,6 +53,9 @@ package() {
# https://github.com/fish-shell/fish-shell/issues/2436
rm "$pkgdir"/usr/share/fish/completions/docker.fish
+
+ # provided by minikube-fish-completion
+ rm "$pkgdir"/usr/share/fish/completions/minikube.fish
}
doc() {
@@ -70,5 +73,5 @@ tools() {
mv "$pkgdir"/usr/share/$pkgname/tools "$subpkgdir"/usr/share/$pkgname
}
-sha512sums="4525b8dd991179f77a298080d389813d1da8557bd394d174ded9238570715137e3aeec009d123811b34c07856d5f7cbe0ad35dc599d748f8f305036c3b74face fish-3.2.0.tar.xz
+sha512sums="e82c5a390bd94f84c60843a94dc4f30bd46539828a54d2e96f208e0d54a0aa361a8c9d4a66cdf2fa636a5fab310a96bf1c165c58440c38d123f788fff3598f4a fish-3.2.2.tar.xz
c28cef48e3d9cde4956d36192dc221e63eca89282a937e2683578ac0958d98a9c54420aea4f1d91d516f5ee2c74589a75865a973305421e1ad0a9e70854dff4f README.alpine"
diff --git a/main/fontconfig/APKBUILD b/main/fontconfig/APKBUILD
index 8abfbb69e8..7300cb6a0d 100644
--- a/main/fontconfig/APKBUILD
+++ b/main/fontconfig/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fontconfig
pkgver=2.13.1
-pkgrel=3
+pkgrel=4
pkgdesc="Library for configuring and customizing font access"
url="https://www.freedesktop.org/wiki/Software/fontconfig"
arch="all"
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index e66e036414..76004e3dc1 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -5,7 +5,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=freeradius
pkgver=3.0.21
-pkgrel=7
+pkgrel=8
pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
url="https://freeradius.org/"
arch="all"
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 00ae89add1..23f51b325f 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Contributor: Cameron Banta <cbanta@gmail.com>
pkgname=freeswitch
-pkgver=1.10.5
-pkgrel=2
+pkgver=1.10.6
+pkgrel=0
pkgdesc="A communications platform written in C from the ground up"
url="http://www.freeswitch.org"
arch="all"
@@ -222,7 +222,7 @@ conf() {
mkdir -p "$pkgdir"/etc/freeswitch/scripts
}
-sha512sums="6f85d33475217a93a7c1c5d676d63d1d4e4360db2a8c1cd3afeb4fa513df3b6c04095a12d69ed6fbb84b14177026840219f078c1145a877e804ee71eefe7da8c freeswitch-1.10.5.-release.tar.xz
+sha512sums="1bb518cca959df73859d3e7a5980a5a98ffa3d092d1100fc5d2cce83da649fc6499feaa88d4ea0196149353f9af231ef8e4aeb089959c1ea75c0f98175c599c6 freeswitch-1.10.6.-release.tar.xz
5f93150e1acd632df98bc3bed5613fb1e45180ae4096dcfee5c060da213c8355339260eaf5758cd77c785f6d84cf0661650a872ec574b586ab19803d4f6955f8 0002-FS-verto-bswap_64.patch
222e3510790de29e29428c70325eb1d4e7852eb4315ee546f137293868bd71acf89e7c85c5ca9d0eb708090c9eef91878a8e12c1b9d5cc99a68fecbd42ad962f configure-lua53.patch
c1960f3c7acf729468b819f7f15d66a251c3967b2784bce18c7755b333156e687c55fdc1aceda588ceb1bf9638e2fd4a31a169b00b15c5040cf1001c3c73913b include-lua53.patch
diff --git a/main/freetds/APKBUILD b/main/freetds/APKBUILD
index a3342fc789..1eb2359504 100644
--- a/main/freetds/APKBUILD
+++ b/main/freetds/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=freetds
-pkgver=1.2.18
+pkgver=1.2.20
pkgrel=0
pkgdesc="Tabular Datastream Library"
url="https://www.freetds.org/"
@@ -38,5 +38,5 @@ package() {
make -j1 DESTDIR="$pkgdir" install
}
-sha512sums="c655a58fae3ed8ed68fd76c0e46a66c39d5705b8789e5ffd5f3fd892121ccb2b8168502102892cc3bbfebed19967614626c5bc1d5a579ba7916e12474129ea42 freetds-1.2.18.tar.bz2
+sha512sums="2d8b8d73bf5354f3b4269b8de44fc1f3a9fae957455b5ea40abc01bd13cc343f03a52e7cc303eca2df0c3269da91c332811646f9529199eb31ce4fdbca77626d freetds-1.2.20.tar.bz2
9ca126d9316cf48fa5f9572b5aa9122eb114033627ab75f6715bce0260d70c6a7bb8a71ecb1e209a4f83416332d10942c7aaf02a5249948cf1cec6a1a457a236 fix-includes.patch"
diff --git a/main/fsarchiver/APKBUILD b/main/fsarchiver/APKBUILD
index dfc92d5ab0..dd5b1ae113 100644
--- a/main/fsarchiver/APKBUILD
+++ b/main/fsarchiver/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=fsarchiver
-pkgver=0.8.5
-pkgrel=2
+pkgver=0.8.6
+pkgrel=0
pkgdesc="Safe and flexible file-system backup and deployment tool"
options="!check" # No testsuite
arch="all"
@@ -25,4 +25,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="bf427dfcc5a73fc799710766dc1c1392ed379565ec68d7cef49e9391da749e08fb655f2b86b4ab4db7cacaf323286b4673a7c3fbebba81ac50d0b66c1f0b91ff fsarchiver-0.8.5.tar.gz"
+sha512sums="26a2d7a68d162aabb778b14f29c52cf8fbadb8147cf5eae592352a36fbf93cc45c08c241253bd8dfe8cd0b77d0f156afcc8d89e8d24a238fd4427cb479827f14 fsarchiver-0.8.6.tar.gz"
diff --git a/main/fstrm/APKBUILD b/main/fstrm/APKBUILD
index b134c4db55..91394bdc3b 100644
--- a/main/fstrm/APKBUILD
+++ b/main/fstrm/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: tcely <tcely@users.noreply.github.com>
# Maintainer:
-pkgname="fstrm"
-pkgver="0.6.0"
-pkgrel=1
+pkgname=fstrm
+pkgver=0.6.1
+pkgrel=0
pkgdesc="Frame Streams implementation in C"
url="https://github.com/farsightsec/fstrm"
arch="all"
@@ -16,8 +16,6 @@ source="https://dl.farsightsecurity.com/dist/fstrm/fstrm-$pkgver.tar.gz
reduce-testruns.patch"
build() {
- cd "$builddir"
-
./configure \
--build="$CBUILD" \
--host="$CHOST" \
@@ -34,14 +32,10 @@ _cat_found_file() {
}
check() {
- cd "$builddir"
-
make check || _cat_found_file 'test-suite.log'
}
package() {
- cd "$builddir"
-
make -j1 DESTDIR="$pkgdir" install
}
@@ -51,5 +45,5 @@ utils() {
mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/
}
-sha512sums="d1b754caadb1bd8b4b4ce3e7394168dd0a20353e0b7ac65f28d016d840aefe6fa1ab1aa778564e775152164855b38a47ab5817866f8bfb0b2d70520b2881225d fstrm-0.6.0.tar.gz
+sha512sums="b8bc954d894a6967ab20975949d3b5ab142933bb14d51f0bd93d6f72e6a8963d06365626ae4df977b70b2678eb495ca6edaedbfd1b9149ac1ec9384df2b56806 fstrm-0.6.1.tar.gz
1c687ee7741fb20a571c3d7d3fb9a1cf09709d83d66d788eb09835750ee2313aa565f74d35a9cdece2154e1b8c41c68b268ca8f5bc33f8d14550ebe46880d550 reduce-testruns.patch"
diff --git a/main/fuse3/APKBUILD b/main/fuse3/APKBUILD
index d88fa5247c..5ed8457b3d 100644
--- a/main/fuse3/APKBUILD
+++ b/main/fuse3/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fuse3
_pkgname=fuse
-pkgver=3.10.2
+pkgver=3.10.3
pkgrel=0
pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface"
url="https://github.com/libfuse/libfuse"
@@ -64,6 +64,6 @@ _openrc() {
install_if="openrc fuse-common=$pkgver-r$pkgrel"
}
-sha512sums="8a306f69662126747321144b9e62fe43496ee2b5e96ba6094b7756a365205aefea477f39407c3d2b27528fae773a0662130de9d41503da630e17df564ce76260 fuse-3.10.2.tar.xz
+sha512sums="7329dd26284a15309eafc2b8b3f29ed431a5ce9c927c5965a51c270718f4915c318b84e4cf4e7f7ee1913831ce943a2e1a378d0bd2a1215eba7b9bc65efb7942 fuse-3.10.3.tar.xz
1a9e1d1e8a7b0778ffde328e4322c73b5d57ec98d52767c846d755cce861ab27989823a75b6c5f994432ddb77fa351dfa4a8f948c9467c5f7d5f471e4608358b fix-realpath.patch
7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 fuse.initd"
diff --git a/main/gcc/0001-posix_memalign.patch b/main/gcc/0001-posix_memalign.patch
index 6cda64ebf3..34397aef53 100644
--- a/main/gcc/0001-posix_memalign.patch
+++ b/main/gcc/0001-posix_memalign.patch
@@ -1,4 +1,4 @@
-From 61621c64caffb54ea82c5b573e55d16dcb732dea Mon Sep 17 00:00:00 2001
+From 00951a574e9698d8549cc5ea1793059849cab47f Mon Sep 17 00:00:00 2001
From: Szabolcs Nagy <nsz@port70.net>
Date: Fri, 26 Jan 2018 20:32:50 +0000
Subject: [PATCH] posix_memalign
@@ -38,5 +38,5 @@ index 87344d9383f..ece428df487 100644
else
return NULL;
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0002-gcc-poison-system-directories.patch b/main/gcc/0002-gcc-poison-system-directories.patch
index a138872a36..329cfda1e1 100644
--- a/main/gcc/0002-gcc-poison-system-directories.patch
+++ b/main/gcc/0002-gcc-poison-system-directories.patch
@@ -1,4 +1,4 @@
-From b6af6fd400def85c7f6933a991c888df16f12533 Mon Sep 17 00:00:00 2001
+From 0cd08ecfaf79062115dd12744068970502b99c01 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 08:59:00 +0400
Subject: [PATCH] gcc: poison-system-directories
@@ -26,7 +26,7 @@ Upstream-Status: Pending
7 files changed, 68 insertions(+)
diff --git a/gcc/common.opt b/gcc/common.opt
-index dfed6ec76ba..8bb65e0e1af 100644
+index ec5235c3a41..ca942863064 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -682,6 +682,10 @@ Wreturn-local-addr
@@ -58,7 +58,7 @@ index 364eba47737..9551c0dfdf9 100644
optimizer and back end) to be checked for dynamic type safety at runtime.
This is quite expensive. */
diff --git a/gcc/configure b/gcc/configure
-index b4088d8fd1e..793530e21cf 100755
+index 8fe9c91fd7c..17b878e4b4e 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -1010,6 +1010,7 @@ with_system_zlib
@@ -78,7 +78,7 @@ index b4088d8fd1e..793530e21cf 100755
--enable-plugin enable plugin support
--enable-host-shared build host code as shared libraries
--disable-libquadmath-support
-@@ -30271,6 +30274,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+@@ -30276,6 +30279,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
fi
@@ -99,10 +99,10 @@ index b4088d8fd1e..793530e21cf 100755
diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 070b9c6c497..0fd438e39e5 100644
+index 84dceb8074a..bf64ffbe46f 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
-@@ -6605,6 +6605,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+@@ -6608,6 +6608,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
[specify that runtime libraries should be
installed in a compiler-specific directory])])
@@ -120,7 +120,7 @@ index 070b9c6c497..0fd438e39e5 100644
AC_SUBST(subdirs)
AC_SUBST(srcdir)
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 7775bcc72eb..034d3066c2b 100644
+index eabeec944e7..cd31b522e42 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -348,6 +348,7 @@ Objective-C and Objective-C++ Dialects}.
@@ -199,5 +199,5 @@ index 8a2bda00f80..9098ab044ab 100644
/* Use given -I paths for #include "..." but not #include <...>, and
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch b/main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
index d11640b223..d5bd8cac3c 100644
--- a/main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+++ b/main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
@@ -1,4 +1,4 @@
-From 8e8955cbd60155d131d3ac66cb2a1e7e41835278 Mon Sep 17 00:00:00 2001
+From f0338445838d12a82c803c1579653332e2710157 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:45:49 +0000
Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
@@ -9,7 +9,7 @@ Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
2 files changed, 4 insertions(+)
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 034d3066c2b..4885efe3247 100644
+index cd31b522e42..17d371ef432 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -14663,6 +14663,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
@@ -35,5 +35,5 @@ index b2200c5185a..625c9ab7902 100644
%{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
%{Wno-poison-system-directories:--no-poison-system-directories} \
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch b/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
index afff2106c5..a9fcf0383f 100644
--- a/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+++ b/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
@@ -1,4 +1,4 @@
-From c5924988157b27b60c28d20d971179bbacbd2ae3 Mon Sep 17 00:00:00 2001
+From 6aa52d7bf25389177c389ea77eb477e7952d1154 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:46:22 +0000
Subject: [PATCH] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC,
@@ -25,7 +25,7 @@ index db91a36794a..ed976c71404 100644
if (flag_gnu89_inline)
cpp_define (pfile, "__GNUC_GNU_INLINE__");
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 4885efe3247..a3e5e002fa5 100644
+index 17d371ef432..fe793ac08db 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -9230,6 +9230,12 @@ also turns on the following optimization flags:
@@ -42,5 +42,5 @@ index 4885efe3247..a3e5e002fa5 100644
@opindex O3
Optimize yet more. @option{-O3} turns on all optimizations specified
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch b/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
index b207acce6e..ac31d323b1 100644
--- a/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+++ b/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
@@ -1,4 +1,4 @@
-From 5b8de466aa959a6c929cee2c78e4159a0209b4f8 Mon Sep 17 00:00:00 2001
+From 7b624ee24d9299889c35c84303811012f8b8f1d2 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:46:56 +0000
Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
@@ -265,5 +265,5 @@ index 625c9ab7902..7aec9d3a016 100644
#else
#define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch b/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch
index 13de1d647e..39c1b41407 100644
--- a/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch
+++ b/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch
@@ -1,4 +1,4 @@
-From 7c79655102e756622211ca40384e8562be334973 Mon Sep 17 00:00:00 2001
+From 7eed1ed7399593864a097360f778e2409deb663c Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:47:43 +0000
Subject: [PATCH] Enable -Wformat and -Wformat-security by default.
@@ -30,5 +30,5 @@ index c49da99d395..93f25319005 100644
Wformat-overflow=
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0007-Enable-Wtrampolines-by-default.patch b/main/gcc/0007-Enable-Wtrampolines-by-default.patch
index d37d1f1f73..9fd6afbb2a 100644
--- a/main/gcc/0007-Enable-Wtrampolines-by-default.patch
+++ b/main/gcc/0007-Enable-Wtrampolines-by-default.patch
@@ -1,4 +1,4 @@
-From 25eb9009f180c799647cfc81d27d8b67ba3f3b72 Mon Sep 17 00:00:00 2001
+From 63c5bf27194fbc27c6630f325b5d976aad87c5d5 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:48:24 +0000
Subject: [PATCH] Enable -Wtrampolines by default.
@@ -8,7 +8,7 @@ Subject: [PATCH] Enable -Wtrampolines by default.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gcc/common.opt b/gcc/common.opt
-index 8bb65e0e1af..ace932b300d 100644
+index ca942863064..0a0ab6195ee 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -774,7 +774,7 @@ Common Var(warn_system_headers) Warning
@@ -21,5 +21,5 @@ index 8bb65e0e1af..ace932b300d 100644
Wtype-limits
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch b/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
index b0952ddf32..68395ff9c4 100644
--- a/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+++ b/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
@@ -1,4 +1,4 @@
-From cfa0c7a3154415fe0e0ab6bd373a8f2164024ff5 Mon Sep 17 00:00:00 2001
+From c28375576bd7ab89389c9208447a490596aa759f Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:49:40 +0000
Subject: [PATCH] Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
@@ -49,5 +49,5 @@ index 4aec480798b..eaecfab37ad 100644
-param=stack-clash-protection-guard-size=
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch b/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
index a8b318f6f3..40ab0bff34 100644
--- a/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+++ b/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
@@ -1,4 +1,4 @@
-From 4733bb8115411c50028f7a583783ac10c63e8536 Mon Sep 17 00:00:00 2001
+From 85baea39858509dacfc235396f6fbd79ac23d50d Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:50:33 +0000
Subject: [PATCH] Ensure that msgfmt doesn't encounter problems during gcc
@@ -50,5 +50,5 @@ index a0f84b0cfa0..ab24a47a2fd 100644
all-local: all-local-$(USE_NLS)
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch b/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
index 33614362e1..30e1872346 100644
--- a/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+++ b/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
@@ -1,4 +1,4 @@
-From 7d4ee7a90b87edd33a7f628ff89ce1b1e0576b4d Mon Sep 17 00:00:00 2001
+From fb7d03c7ea97fc785327fd00b302c7ac17779837 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:52:07 +0000
Subject: [PATCH] Don't declare asprintf if defined as a macro.
@@ -24,5 +24,5 @@ index 141cb886a85..fa0e78eb62f 100644
/* Like asprintf but allocates memory without fail. This works like
xmalloc. */
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch b/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch
index 3dead241db..3d2c5d1a01 100644
--- a/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch
+++ b/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch
@@ -1,4 +1,4 @@
-From 84b959624e1371f1d02630b6e067f00f46dbe516 Mon Sep 17 00:00:00 2001
+From 07467a2a24bd15a6a28154a33441adc1291789d6 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:53:00 +0000
Subject: [PATCH] libiberty: copy PIC objects during build process
@@ -20,5 +20,5 @@ index d6b302e02fd..fd39928546f 100644
else true; fi
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0012-libitm-disable-FORTIFY.patch b/main/gcc/0012-libitm-disable-FORTIFY.patch
index cc55613c54..b5669fbeab 100644
--- a/main/gcc/0012-libitm-disable-FORTIFY.patch
+++ b/main/gcc/0012-libitm-disable-FORTIFY.patch
@@ -1,4 +1,4 @@
-From 8ffd575380bc28aaf3c210ad838b205ce2403124 Mon Sep 17 00:00:00 2001
+From 07517ed455bf3f03b1be7a5c72d3705b22780a15 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:53:36 +0000
Subject: [PATCH] libitm: disable FORTIFY
@@ -8,10 +8,10 @@ Subject: [PATCH] libitm: disable FORTIFY
1 file changed, 10 insertions(+)
diff --git a/libitm/configure.tgt b/libitm/configure.tgt
-index 04109160e91..107b957ece3 100644
+index d1beb5c9ec8..c2b50b95c01 100644
--- a/libitm/configure.tgt
+++ b/libitm/configure.tgt
-@@ -46,6 +46,16 @@ if test "$gcc_cv_have_tls" = yes ; then
+@@ -47,6 +47,16 @@ if test "$gcc_cv_have_tls" = yes ; then
esac
fi
@@ -29,5 +29,5 @@ index 04109160e91..107b957ece3 100644
# work out any special compilation flags as necessary.
case "${target_cpu}" in
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0013-libgcc_s.patch b/main/gcc/0013-libgcc_s.patch
index 5cdd1af0e7..70cbbabaf6 100644
--- a/main/gcc/0013-libgcc_s.patch
+++ b/main/gcc/0013-libgcc_s.patch
@@ -1,4 +1,4 @@
-From 0d83ea67b2e16658a88068ebce0e25cce22fe75e Mon Sep 17 00:00:00 2001
+From b74afde10094923279a408ff56ea99cff6c259ae Mon Sep 17 00:00:00 2001
From: Szabolcs Nagy <nsz@port70.net>
Date: Sat, 24 Oct 2015 20:09:53 +0000
Subject: [PATCH] libgcc_s
@@ -10,10 +10,10 @@ Subject: [PATCH] libgcc_s
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c
-index c6033688f51..a60e5162995 100644
+index 47d52550e5e..9cb8cc7950e 100644
--- a/gcc/config/i386/i386-expand.c
+++ b/gcc/config/i386/i386-expand.c
-@@ -10966,10 +10966,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
+@@ -10976,10 +10976,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
{
case IX86_BUILTIN_CPU_INIT:
{
@@ -27,10 +27,10 @@ index c6033688f51..a60e5162995 100644
return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
}
diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
-index cf5f0884bb4..ed0381e7744 100644
+index 83301a1445f..89fdc7eb587 100644
--- a/libgcc/config/i386/cpuinfo.c
+++ b/libgcc/config/i386/cpuinfo.c
-@@ -510,7 +510,7 @@ __cpu_indicator_init (void)
+@@ -516,7 +516,7 @@ __cpu_indicator_init (void)
return 0;
}
@@ -53,5 +53,5 @@ index 8506a635790..564296f788e 100644
+HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0014-nopie.patch b/main/gcc/0014-nopie.patch
index 8e6eba712f..f4b0b4e31b 100644
--- a/main/gcc/0014-nopie.patch
+++ b/main/gcc/0014-nopie.patch
@@ -1,4 +1,4 @@
-From 99ccc2d68049c56519d49e21b6f13cf8d98ea163 Mon Sep 17 00:00:00 2001
+From e73096ae33c1ebf2833deab647ca825229c533f1 Mon Sep 17 00:00:00 2001
From: Szabolcs Nagy <nsz@port70.net>
Date: Sat, 7 Nov 2015 02:08:05 +0000
Subject: [PATCH] nopie
@@ -9,10 +9,10 @@ Subject: [PATCH] nopie
2 files changed, 40 insertions(+)
diff --git a/gcc/configure b/gcc/configure
-index 793530e21cf..2d874d3defe 100755
+index 17b878e4b4e..808570b6c99 100755
--- a/gcc/configure
+++ b/gcc/configure
-@@ -30779,6 +30779,33 @@ fi
+@@ -30784,6 +30784,33 @@ fi
$as_echo "$gcc_cv_no_pie" >&6; }
if test "$gcc_cv_no_pie" = "yes"; then
NO_PIE_FLAG="-no-pie"
@@ -47,10 +47,10 @@ index 793530e21cf..2d874d3defe 100755
diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 0fd438e39e5..0b257e687ee 100644
+index bf64ffbe46f..9c2571de709 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
-@@ -6863,6 +6863,19 @@ AC_CACHE_CHECK([for -no-pie option],
+@@ -6866,6 +6866,19 @@ AC_CACHE_CHECK([for -no-pie option],
LDFLAGS="$saved_LDFLAGS"])
if test "$gcc_cv_no_pie" = "yes"; then
NO_PIE_FLAG="-no-pie"
@@ -71,5 +71,5 @@ index 0fd438e39e5..0b257e687ee 100644
AC_SUBST([NO_PIE_FLAG])
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch b/main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
index 831148fa3b..064cb18373 100644
--- a/main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+++ b/main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
@@ -1,4 +1,4 @@
-From a5a7decc1944cf6831eebc10d71a52ef8496bff5 Mon Sep 17 00:00:00 2001
+From d56bf713ed0d248fccb445ac475ad69d9430bb96 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:57:09 +0000
Subject: [PATCH] libffi: use __linux__ instead of __gnu_linux__ for musl
@@ -21,5 +21,5 @@ index 721ff00ea43..22a699c6340 100644
with both write and execute permission. Code compiled when this
option is defined will attempt to map such pages once, but if it
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0016-dlang-update-zlib-binding.patch b/main/gcc/0016-dlang-update-zlib-binding.patch
index 5a334cfb9f..4260fce6f4 100644
--- a/main/gcc/0016-dlang-update-zlib-binding.patch
+++ b/main/gcc/0016-dlang-update-zlib-binding.patch
@@ -1,4 +1,4 @@
-From 3554a4b751acce2a4f432d1bb24d9fc69a916889 Mon Sep 17 00:00:00 2001
+From 6175b540b25a9d899772a7354a6ac2ae77c311ae Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:57:51 +0000
Subject: [PATCH] dlang: update zlib binding
@@ -421,5 +421,5 @@ index e6cce240fd5..bd2fe37ebec 100644
}
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch b/main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
index f8d93c0ebf..4621799981 100644
--- a/main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+++ b/main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
@@ -1,4 +1,4 @@
-From abf18c3f7d908f8f4a365bd4d8f9a4743f1d8f0c Mon Sep 17 00:00:00 2001
+From 578f3d719c1154a38a5cf84217e3cb124da45ad8 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:58:22 +0000
Subject: [PATCH] dlang: fix fcntl on mips, add libucontext dep
@@ -47,5 +47,5 @@ index 9febcff849b..cb34e2108bd 100644
static assert(0, "Platform not supported");
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0018-ada-fix-shared-linking.patch b/main/gcc/0018-ada-fix-shared-linking.patch
index 4a0994cfa6..cac5918502 100644
--- a/main/gcc/0018-ada-fix-shared-linking.patch
+++ b/main/gcc/0018-ada-fix-shared-linking.patch
@@ -1,4 +1,4 @@
-From 277c3317929f41e514632d29ff00354c511deb0e Mon Sep 17 00:00:00 2001
+From b3bcc4fc43170f9914772c543778560c5e473fae Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:59:16 +0000
Subject: [PATCH] ada: fix shared linking
@@ -38,5 +38,5 @@ index 02c413a412f..f0e52a87d6e 100644
unsigned char __gnat_objlist_file_supported = 1;
const char *__gnat_object_library_extension = ".a";
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch b/main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
index a9ae86a4d8..11aec7c369 100644
--- a/main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+++ b/main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
@@ -1,4 +1,4 @@
-From b1e3ea43462684675cc4f75c2ca4e984a6d511fb Mon Sep 17 00:00:00 2001
+From e85513f5bb1884b60d0e261e23366c3291b50d67 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 06:59:43 +0000
Subject: [PATCH] build: fix CXXFLAGS_FOR_BUILD passing
@@ -20,5 +20,5 @@ index 36e369df6e7..63627db68cf 100644
# This is the list of directories to built for the host system.
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0020-add-fortify-headers-paths.patch b/main/gcc/0020-add-fortify-headers-paths.patch
index cc818a39f5..1954992c35 100644
--- a/main/gcc/0020-add-fortify-headers-paths.patch
+++ b/main/gcc/0020-add-fortify-headers-paths.patch
@@ -1,4 +1,4 @@
-From ea75db47e243b59e7cf793623a87295c0d2aada2 Mon Sep 17 00:00:00 2001
+From ba67e2205fb47afeb91c7c2ee575e426c0629845 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 07:01:06 +0000
Subject: [PATCH] add fortify-headers paths
@@ -21,5 +21,5 @@ index 95654bcdb5a..d88df8f154a 100644
{ NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
#else
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch b/main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
index d00d6ccff6..c27639489f 100644
--- a/main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+++ b/main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
@@ -1,4 +1,4 @@
-From 42637405a9cf90d96627406c72dbaf19cca34164 Mon Sep 17 00:00:00 2001
+From 76a7d4998303fe4229c814ea87621af94cb26f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Fri, 21 Aug 2020 07:03:00 +0000
Subject: [PATCH] Alpine musl package provides libssp_nonshared.a. We link to
@@ -27,5 +27,5 @@ index daeb4d0c8ea..6920bec0fa0 100644
#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
"|fstack-protector-strong|fstack-protector-explicit" \
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch b/main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
index 188a708030..a94f460c98 100644
--- a/main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+++ b/main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
@@ -1,4 +1,4 @@
-From 64f209a51a7277d778c196c31c58422a04a69238 Mon Sep 17 00:00:00 2001
+From 81735c7800b3369361c40103d6d479239fa779d7 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 07:03:42 +0000
Subject: [PATCH] DP: Use --push-state/--pop-state for gold as well when
@@ -65,5 +65,5 @@ index 6920bec0fa0..40e07354b3d 100644
#else
#define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0023-Pure-64-bit-MIPS.patch b/main/gcc/0023-Pure-64-bit-MIPS.patch
index e5451d91fb..0b5251750a 100644
--- a/main/gcc/0023-Pure-64-bit-MIPS.patch
+++ b/main/gcc/0023-Pure-64-bit-MIPS.patch
@@ -1,4 +1,4 @@
-From a57f530ace0ce215b1d6e2073223f05417ca2ed4 Mon Sep 17 00:00:00 2001
+From bd3e178619a7d45b2b22141a2b83f67bc27b229a Mon Sep 17 00:00:00 2001
From: Nils Andreas Svee <me@lochnair.net>
Date: Thu, 21 Dec 2017 03:14:33 +0100
Subject: [PATCH] Pure 64-bit MIPS
@@ -43,5 +43,5 @@ index ceb58d3b5f3..8116e23ebba 100644
+ ../lib32 \
+ ../lib
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch b/main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch
index 9750b740c0..fa29a93336 100644
--- a/main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch
+++ b/main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch
@@ -1,4 +1,4 @@
-From 4571e0787fc992d647991e64a64d2b9c82e9a0e6 Mon Sep 17 00:00:00 2001
+From d5e2025be98fd345549d41067eac3fd3fe201a4e Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 07:04:40 +0000
Subject: [PATCH] use pure 64-bit configuration where appropriate
@@ -117,5 +117,5 @@ index cc6ab367072..7f498ee1cdc 100644
+MULTILIB_OSDIRNAMES = m64=../lib
+MULTILIB_OSDIRNAMES+= m32=../lib32
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0025-always-build-libgcc_eh.a.patch b/main/gcc/0025-always-build-libgcc_eh.a.patch
index 1deb72e9a3..125deef925 100644
--- a/main/gcc/0025-always-build-libgcc_eh.a.patch
+++ b/main/gcc/0025-always-build-libgcc_eh.a.patch
@@ -1,4 +1,4 @@
-From a1fb957dd7fe9a8dd99d256d7b0a676f87a9d80c Mon Sep 17 00:00:00 2001
+From 6a51ad76380daed31a4eadcee844647452ce6dfd Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 07:05:41 +0000
Subject: [PATCH] always build libgcc_eh.a
@@ -47,5 +47,5 @@ index 851e7657d07..99ec513a1a6 100644
for file in $$parts; do \
rm -f $(DESTDIR)$(inst_libdir)/$$file; \
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch b/main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch
index e8386a1cc0..2150473d3a 100644
--- a/main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch
+++ b/main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch
@@ -1,4 +1,4 @@
-From 3a0a3d3843edd30ce72c96a40caa9e1334233558 Mon Sep 17 00:00:00 2001
+From 4ce9b92262575e2484836fb9bffca08be99b9a4b Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 07:06:30 +0000
Subject: [PATCH] ada: libgnarl compatibility for musl
@@ -9,7 +9,7 @@ Subject: [PATCH] ada: libgnarl compatibility for musl
2 files changed, 3 insertions(+), 61 deletions(-)
diff --git a/gcc/ada/libgnarl/s-osinte__linux.ads b/gcc/ada/libgnarl/s-osinte__linux.ads
-index 80cb2b2a793..701b7a3aeab 100644
+index ef449af33d1..bd7312e6686 100644
--- a/gcc/ada/libgnarl/s-osinte__linux.ads
+++ b/gcc/ada/libgnarl/s-osinte__linux.ads
@@ -399,12 +399,6 @@ package System.OS_Interface is
@@ -131,5 +131,5 @@ index c45559e5ba0..0b0f173e7d4 100644
pragma Assert (Result in 0 | ENOMEM);
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0027-ada-musl-support-fixes.patch b/main/gcc/0027-ada-musl-support-fixes.patch
index 9be949f2ce..e213959fe1 100644
--- a/main/gcc/0027-ada-musl-support-fixes.patch
+++ b/main/gcc/0027-ada-musl-support-fixes.patch
@@ -1,4 +1,4 @@
-From d0716e14d5bd652a7e21d0e3c75ea8ed32e6b4c7 Mon Sep 17 00:00:00 2001
+From 61c266f5703b9032fc2afaa98756f89cfe62d897 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 21 Aug 2020 07:07:48 +0000
Subject: [PATCH] ada: musl support fixes
@@ -219,5 +219,5 @@ index af4417fab90..bab6bf3ca87 100644
status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
#elif defined (USE_CLONE_DEVICE)
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch b/main/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
index 9545f044ab..5752caa93d 100644
--- a/main/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+++ b/main/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
@@ -1,4 +1,4 @@
-From e30511caa0046a09e09d08e01541ee89ebbf56f3 Mon Sep 17 00:00:00 2001
+From e4d804bdeb899b4a1d6539a3ad1404ad417f6abc Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 30 Aug 2020 17:58:08 +0200
Subject: [PATCH] gcc-go: Use _off_t type instead of _loff_t
@@ -44,5 +44,5 @@ index 88286c07b6e..f8f5cfb5011 100644
}
n, err = splice(rfd, plroff, wfd, plwoff, len, flags)
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch b/main/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch
index 79c39fffd1..2a7181fd67 100644
--- a/main/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch
+++ b/main/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch
@@ -1,4 +1,4 @@
-From dd4c21ab43314e9dd6853f4157c0b2f530b46a3e Mon Sep 17 00:00:00 2001
+From e04850ade73b4e9de9e95438f80bb4c0325168d8 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 30 Aug 2020 17:58:21 +0200
Subject: [PATCH] gcc-go: Don't include sys/user.h
@@ -26,5 +26,5 @@ index 0692fd41eb7..c8d987358d9 100644
#include <sys/utsname.h>
#endif
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch b/main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
index 36a0363f00..3308afa36a 100644
--- a/main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
+++ b/main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
@@ -1,4 +1,4 @@
-From 9f85680c5e156d7ac95260e43bc06fe52468bb6e Mon Sep 17 00:00:00 2001
+From dee0f4faec19854beee5e258e91e40544fead83d Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 30 Aug 2020 17:59:22 +0200
Subject: [PATCH] gcc-go: Fix ucontext_t on PPC64
@@ -25,5 +25,5 @@ index b429fdb2403..fd1c885f043 100644
ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
#elif defined(__aarch64__) && defined(__linux__)
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch b/main/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
index d52aaedb09..8531ba0f19 100644
--- a/main/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+++ b/main/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
@@ -1,4 +1,4 @@
-From e8162b88725980771aaf473353a7a684aa31e974 Mon Sep 17 00:00:00 2001
+From 7c91fa8d1061a7dfe29081449cab03b8a3eae27f Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 30 Aug 2020 17:59:45 +0200
Subject: [PATCH] gcc-go: Fix handling of signal 34 on musl
@@ -39,5 +39,5 @@ index 11e4ec436bd..fe866eacb27 100644
if test "${GOOS}" = "aix"; then
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch b/main/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
index a156f1c591..5c1892cf76 100644
--- a/main/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+++ b/main/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
@@ -1,4 +1,4 @@
-From e52442cf9860963ce5d896436efaa032f9d03d86 Mon Sep 17 00:00:00 2001
+From 2b990c08be4548705261e067233f798520a6ace0 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 30 Aug 2020 18:01:03 +0200
Subject: [PATCH] gcc-go: Use int64 type as offset argument for mmap
@@ -34,5 +34,5 @@ index ba38ebaa9ab..3c9e5ce9461 100644
if uintptr(p) == _MAP_FAILED {
return nil, errno()
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch b/main/gcc/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
index 3c7bbf476b..485a41825d 100644
--- a/main/gcc/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
+++ b/main/gcc/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
@@ -1,4 +1,4 @@
-From d374c7d1d9f6fab654a5ece60a7ea74aeaf90970 Mon Sep 17 00:00:00 2001
+From d42dbc871f149f658b6c3379bbc531efe427253b Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 30 Aug 2020 18:02:28 +0200
Subject: [PATCH] gcc-go: Fix st_{a,m,c}tim fields in generated sysinfo.go
@@ -33,5 +33,5 @@ index bd2ba32cba1..972e2c379bc 100755
-e 's/\([^a-zA-Z0-9_]\)_timespec_t\([^a-zA-Z0-9_]\)/\1Timespec\2/g' \
-e 's/\([^a-zA-Z0-9_]\)_st_timespec_t\([^a-zA-Z0-9_]\)/\1StTimespec\2/g' \
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0034-gcc-go-signal-34-is-special-on-musl-libc.patch b/main/gcc/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
index 04994ac1b1..b085e03ae9 100644
--- a/main/gcc/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
+++ b/main/gcc/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
@@ -1,4 +1,4 @@
-From 03365f764ffe09acbfaa08ede12c48d5cbafe37f Mon Sep 17 00:00:00 2001
+From aecc0619fab1b89a88bda30080417c0ddbb5d2aa Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 30 Aug 2020 18:03:03 +0200
Subject: [PATCH] gcc-go: signal 34 is special on musl libc
@@ -25,5 +25,5 @@ index c555712a03c..9e228580d37 100644
}
throw("sigaction read failure")
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch b/main/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
index 8ee40d77e2..1859b886e3 100644
--- a/main/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
+++ b/main/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
@@ -1,4 +1,4 @@
-From 8f432a1e00956bc2fcb6242571860a69fb32131d Mon Sep 17 00:00:00 2001
+From c988692ec6b151541088b1b48a29d6a54269f55c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Sun, 30 Aug 2020 19:26:53 +0200
Subject: [PATCH] gcc-go: Prefer _off_t over _off64_t
@@ -26,5 +26,5 @@ index 972e2c379bc..8d6da15f983 100755
echo "type Pid_t _pid_t" >> ${OUT}
echo "type Uid_t _uid_t" >> ${OUT}
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch b/main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
index 9117338e68..a2c0c03661 100644
--- a/main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+++ b/main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
@@ -1,4 +1,4 @@
-From 8438932b8a20156459589e9d6b3fcf11989db0e8 Mon Sep 17 00:00:00 2001
+From f634ef3142f759c8220830b77487fe9686ee0f61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Sun, 30 Aug 2020 19:27:51 +0200
Subject: [PATCH] gcc-go: undef SETCONTEXT_CLOBBERS_TLS in proc.c
@@ -8,7 +8,7 @@ Subject: [PATCH] gcc-go: undef SETCONTEXT_CLOBBERS_TLS in proc.c
1 file changed, 4 insertions(+)
diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
-index 274ce01c0bf..92a540bdde9 100644
+index 6f7d2e27996..5afd7902497 100644
--- a/libgo/runtime/proc.c
+++ b/libgo/runtime/proc.c
@@ -66,6 +66,10 @@ static void gscanstack(G*);
@@ -23,5 +23,5 @@ index 274ce01c0bf..92a540bdde9 100644
static inline void
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0037-gcc-go-link-to-libucontext.patch b/main/gcc/0037-gcc-go-link-to-libucontext.patch
index 44848c939d..a9befb16f1 100644
--- a/main/gcc/0037-gcc-go-link-to-libucontext.patch
+++ b/main/gcc/0037-gcc-go-link-to-libucontext.patch
@@ -1,4 +1,4 @@
-From 31375289a4c1a0f32c97ae3d73ab950014729392 Mon Sep 17 00:00:00 2001
+From 13f05ade4843b355a96d72cf3464694e5eca641e Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 31 Aug 2020 08:59:40 +0200
Subject: [PATCH] gcc-go: link to libucontext
@@ -21,5 +21,5 @@ index 63627db68cf..c7f1f84d683 100644
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch b/main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
index 6145ff035c..86793d8656 100644
--- a/main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+++ b/main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
@@ -1,4 +1,4 @@
-From 84fb75f5e30bfde3a076564f566d2f85caf5e6dd Mon Sep 17 00:00:00 2001
+From 6fb1014e9a20deb8c634fc12dd9a146a800e6b70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Mon, 31 Aug 2020 20:26:56 +0200
Subject: [PATCH] gcc-go: Disable printing of unaccessible ppc64 struct members
@@ -22,5 +22,5 @@ index fd1c885f043..e845e453332 100644
mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
int i;
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0040-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch b/main/gcc/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
index 47a922e827..bd5d628d75 100644
--- a/main/gcc/0040-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
+++ b/main/gcc/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
@@ -1,4 +1,4 @@
-From a3ed90c4579725a21f3375a8fe0abb626be7c250 Mon Sep 17 00:00:00 2001
+From ae168d35da22feaa01f9f77f7b578aa05cd50c96 Mon Sep 17 00:00:00 2001
From: Geod24 <pro.mathias.lang@gmail.com>
Date: Mon, 16 Nov 2020 18:40:46 +0100
Subject: [PATCH] CRuntime_Musl: Support v1.2.0 for 32 bits
@@ -49,5 +49,5 @@ index 451c8b4fccc..ca654fbe424 100644
alias c_ulong pthread_t;
version (D_LP64)
--
-2.29.2
+2.31.0
diff --git a/main/gcc/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch b/main/gcc/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
new file mode 100644
index 0000000000..1ba58286a8
--- /dev/null
+++ b/main/gcc/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
@@ -0,0 +1,269 @@
+From bfb6df1638635136c4fd8960575331476fb68d04 Mon Sep 17 00:00:00 2001
+From: Drew DeVault <sir@cmpwn.com>
+Date: Wed, 9 Dec 2020 16:07:26 +0000
+Subject: [PATCH] configure: Add --enable-autolink-libatomic, use in
+ LINK_GCC_C_SEQUENCE_SPEC [PR81358]
+
+This fixes issues with RISC-V.
+---
+ Makefile.in | 1 +
+ gcc/config.in | 6 ++++++
+ gcc/config/gnu-user.h | 12 +++++++++++-
+ gcc/configure | 34 ++++++++++++++++++++++++++++++++--
+ gcc/configure.ac | 23 ++++++++++++++++++++++-
+ gcc/doc/install.texi | 8 ++++++++
+ gcc/doc/tm.texi | 8 +++++++-
+ gcc/doc/tm.texi.in | 8 +++++++-
+ gcc/gcc.c | 12 +++++++++++-
+ 9 files changed, 105 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index c7f1f84d683..cb3983ca547 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -222,6 +222,7 @@ HOST_EXPORTS = \
+ RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
+ READELF_FOR_TARGET="$(READELF_FOR_TARGET)"; export READELF_FOR_TARGET; \
+ TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
++ TARGET_CONFIGDIRS="$(TARGET_CONFIGDIRS)"; export TARGET_CONFIGDIRS; \
+ HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \
+ GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
+ GMPINC="$(HOST_GMPINC)"; export GMPINC; \
+diff --git a/gcc/config.in b/gcc/config.in
+index 9551c0dfdf9..c8ca910df8a 100644
+--- a/gcc/config.in
++++ b/gcc/config.in
+@@ -106,6 +106,12 @@
+ #endif
+
+
++/* Define if libatomic should always be linked. */
++#ifndef USED_FOR_TARGET
++#undef ENABLE_AUTOLINK_LIBATOMIC
++#endif
++
++
+ /* Define to 1 to specify that we are using the BID decimal floating point
+ format instead of DPD */
+ #ifndef USED_FOR_TARGET
+diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
+index 7f30c363e4a..246698bfea5 100644
+--- a/gcc/config/gnu-user.h
++++ b/gcc/config/gnu-user.h
+@@ -109,8 +109,18 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+ #define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} "
+ #endif
+
++#if !defined(LINK_LIBATOMIC_SPEC) && defined(ENABLE_AUTOLINK_LIBATOMIC)
++# ifdef LD_AS_NEEDED_OPTION
++# define LINK_LIBATOMIC_SPEC LD_AS_NEEDED_OPTION " -latomic " LD_NO_AS_NEEDED_OPTION
++# else
++# define LINK_LIBATOMIC_SPEC "-latomic"
++# endif
++#elif !defined(LINK_LIBATOMIC_SPEC)
++# define LINK_LIBATOMIC_SPEC ""
++#endif
++
+ #define GNU_USER_TARGET_LINK_GCC_C_SEQUENCE_SPEC \
+- "%{static|static-pie:--start-group} %G %{!nolibc:%L} \
++ "%{static|static-pie:--start-group} %G %{!nolibc:" LINK_LIBATOMIC_SPEC " %L} \
+ %{static|static-pie:--end-group}%{!static:%{!static-pie:%G}}"
+
+ #undef LINK_GCC_C_SEQUENCE_SPEC
+diff --git a/gcc/configure b/gcc/configure
+index 808570b6c99..6c1e95e0444 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -969,6 +969,7 @@ with_documentation_root_url
+ with_changes_root_url
+ enable_languages
+ with_multilib_list
++enable_autolink_libatomic
+ with_zstd
+ with_zstd_include
+ with_zstd_lib
+@@ -1695,6 +1696,9 @@ Optional Features:
+ --disable-shared don't provide a shared libgcc
+ --disable-gcov don't provide libgcov and related host tools
+ --enable-languages=LIST specify which front-ends to build
++ --enable-autolink-libatomic
++ enable automatic linking of libatomic (ignored if
++ not built)
+ --disable-rpath do not hardcode runtime library paths
+ --enable-sjlj-exceptions
+ arrange to use setjmp/longjmp exception handling
+@@ -8009,6 +8013,33 @@ else
+ fi
+
+
++# If libatomic is available, whether it should be linked automatically
++# Check whether --enable-autolink-libatomic was given.
++if test "${enable_autolink_libatomic+set}" = set; then :
++ enableval=$enable_autolink_libatomic;
++ case $enable_autolink_libatomic in
++ yes | no) ;;
++ *) as_fn_error $? "'$enable_autolink_libatomic' is an invalid value for
++--enable-autolink-libatomic. Valid choices are 'yes' and 'no'." "$LINENO" 5 ;;
++ esac
++
++else
++ enable_autolink_libatomic=''
++fi
++
++
++if test x$enable_autolink_libatomic = xyes; then
++ if echo " ${TARGET_CONFIGDIRS} " | grep " libatomic " > /dev/null 2>&1 ; then
++
++$as_echo "#define ENABLE_AUTOLINK_LIBATOMIC 1" >>confdefs.h
++
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libatomic is not build for this target, --enable-autolink-libatomic ignored" >&5
++$as_echo "$as_me: WARNING: libatomic is not build for this target, --enable-autolink-libatomic ignored" >&2;}
++ fi
++fi
++
++
+ # -------------------------
+ # Checks for other programs
+ # -------------------------
+@@ -19131,7 +19162,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 19131 "configure"
++#line 19158 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -32267,4 +32298,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+
+-
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 9c2571de709..52fd6d8fe06 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -1110,6 +1110,28 @@ AC_ARG_WITH(multilib-list,
+ :,
+ with_multilib_list=default)
+
++# If libatomic is available, whether it should be linked automatically
++AC_ARG_ENABLE(autolink-libatomic,
++[AS_HELP_STRING([--enable-autolink-libatomic],
++ [enable automatic linking of libatomic (ignored if not built)])],
++[
++ case $enable_autolink_libatomic in
++ yes | no) ;;
++ *) AC_MSG_ERROR(['$enable_autolink_libatomic' is an invalid value for
++--enable-autolink-libatomic. Valid choices are 'yes' and 'no'.]) ;;
++ esac
++], [enable_autolink_libatomic=''])
++
++if test x$enable_autolink_libatomic = xyes; then
++ if echo " ${TARGET_CONFIGDIRS} " | grep " libatomic " > /dev/null 2>&1 ; then
++ AC_DEFINE(ENABLE_AUTOLINK_LIBATOMIC, 1,
++ [Define if libatomic should always be linked.])
++ else
++ AC_MSG_WARN([libatomic is not build for this target, --enable-autolink-libatomic ignored])
++ fi
++fi
++
++
+ # -------------------------
+ # Checks for other programs
+ # -------------------------
+@@ -6945,4 +6967,3 @@ done
+ ],
+ [subdirs='$subdirs'])
+ AC_OUTPUT
+-
+diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
+index 7d98ec4190a..a58d5a05be2 100644
+--- a/gcc/doc/install.texi
++++ b/gcc/doc/install.texi
+@@ -2169,6 +2169,14 @@ files, but these changed header paths may conflict with some compilation
+ environments. Enabled by default, and may be disabled using
+ @option{--disable-canonical-system-headers}.
+
++@item --enable-autolink-libatomic
++@itemx --disable-autolink-libatomic
++Tell GCC that it should automatically link libatomic; if supported by
++the linker, the file is only linked as needed. This flag is ignored
++when libatomic is not built. Note that this conigure flag is in particular
++useful when building an offloading-target compiler; as for those, a
++user had to specify @code{-foffload=target=-latomic} otherwise.
++
+ @item --with-glibc-version=@var{major}.@var{minor}
+ Tell GCC that when the GNU C Library (glibc) is used on the target it
+ will be version @var{major}.@var{minor} or later. Normally this can
+diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
+index fcb7245e95c..67b485e8d0c 100644
+--- a/gcc/doc/tm.texi
++++ b/gcc/doc/tm.texi
+@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
+
+ @defmac LINK_GCC_C_SEQUENCE_SPEC
+ The sequence in which libgcc and libc are specified to the linker.
+-By default this is @code{%G %L %G}.
++By default this is @code{%G LINK_LIBATOMIC_SPEC %L %G}.
++@end defmac
++
++@defmac LINK_LIBATOMIC_SPEC
++This macro is used in the default @code{LINK_GCC_C_SEQUENCE_SPEC} to link
++libatomic. By default, it is unset unless @code{ENABLE_AUTOLINK_LIBATOMIC}
++is set.
+ @end defmac
+
+ @defmac POST_LINK_SPEC
+diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
+index c17209daa51..3ec63f6d091 100644
+--- a/gcc/doc/tm.texi.in
++++ b/gcc/doc/tm.texi.in
+@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
+
+ @defmac LINK_GCC_C_SEQUENCE_SPEC
+ The sequence in which libgcc and libc are specified to the linker.
+-By default this is @code{%G %L %G}.
++By default this is @code{%G LINK_LIBATOMIC_SPEC %L %G}.
++@end defmac
++
++@defmac LINK_LIBATOMIC_SPEC
++This macro is used in the default @code{LINK_GCC_C_SEQUENCE_SPEC} to link
++libatomic. By default, it is unset unless @code{ENABLE_AUTOLINK_LIBATOMIC}
++is set.
+ @end defmac
+
+ @defmac POST_LINK_SPEC
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 40e07354b3d..81bd50b4d7c 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -877,13 +877,23 @@ proper position among the other output files. */
+ # define ASM_DEBUG_SPEC ""
+ #endif
+
++#if !defined(LINK_LIBATOMIC_SPEC) && defined(ENABLE_AUTOLINK_LIBATOMIC)
++# ifdef LD_AS_NEEDED_OPTION
++# define LINK_LIBATOMIC_SPEC LD_AS_NEEDED_OPTION " -latomic " LD_NO_AS_NEEDED_OPTION
++# else
++# define LINK_LIBATOMIC_SPEC "-latomic"
++# endif
++#elif !defined(LINK_LIBATOMIC_SPEC)
++# define LINK_LIBATOMIC_SPEC ""
++#endif
++
+ /* Here is the spec for running the linker, after compiling all files. */
+
+ /* This is overridable by the target in case they need to specify the
+ -lgcc and -lc order specially, yet not require them to override all
+ of LINK_COMMAND_SPEC. */
+ #ifndef LINK_GCC_C_SEQUENCE_SPEC
+-#define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
++#define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:" LINK_LIBATOMIC_SPEC " %L %G}"
+ #endif
+
+ #ifdef ENABLE_DEFAULT_SSP
+--
+2.31.0
+
diff --git a/main/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch b/main/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch
new file mode 100644
index 0000000000..1561a7c058
--- /dev/null
+++ b/main/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch
@@ -0,0 +1,48 @@
+From 3bc47945dab0108423dbaa211332817c4784b3db Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Mon, 19 Apr 2021 07:21:41 +0200
+Subject: [PATCH] Use generic errstr.go implementation on musl
+
+glibc provides two version of strerror_r() depending on a feature test
+macro. The first is the XSI-compliant version which returns an int, the
+second is GNU-specific and returns a char pointer.
+
+Similarity, gcc's libgo provides two implementations of Errstr() both of
+which use strerror_r(). On Linux, it is assumed that the GNU-specific
+strerror_r version is used. However, musl only provides the
+XSI-compliant version of strerror_r. This patch enables the generic
+Errstr() implementation which also uses the XSI-compliant version of
+strerror_r.
+---
+ libgo/go/syscall/errstr.go | 1 -
+ libgo/go/syscall/errstr_glibc.go | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/libgo/go/syscall/errstr.go b/libgo/go/syscall/errstr.go
+index 6c2441d364d..8f7c5538163 100644
+--- a/libgo/go/syscall/errstr.go
++++ b/libgo/go/syscall/errstr.go
+@@ -5,7 +5,6 @@
+ // license that can be found in the LICENSE file.
+
+ // +build !hurd
+-// +build !linux
+
+ package syscall
+
+diff --git a/libgo/go/syscall/errstr_glibc.go b/libgo/go/syscall/errstr_glibc.go
+index 5b19e6f202d..8dc60172186 100644
+--- a/libgo/go/syscall/errstr_glibc.go
++++ b/libgo/go/syscall/errstr_glibc.go
+@@ -7,7 +7,7 @@
+ // We use this rather than errstr.go because on GNU/Linux sterror_r
+ // returns a pointer to the error message, and may not use buf at all.
+
+-// +build hurd linux
++// +build hurd !linux
+
+ package syscall
+
+--
+2.31.0
+
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index dbde1c006b..c2273b2f36 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -1,13 +1,14 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=gcc
-_pkgbase=10.2.1
-pkgver=10.2.1_pre1
+_pkgbase=10.3.1
+pkgver=10.3.1_git20210424
[ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
[ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
pkgname="$pkgname$_target"
-pkgrel=3
+pkgrel=0
pkgdesc="The GNU Compiler Collection"
url="https://gcc.gnu.org"
arch="all"
@@ -147,7 +148,7 @@ if $LANG_FORTRAN; then
_languages="$_languages,fortran"
fi
if $LANG_ADA; then
- subpackages="$subpackages libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
+ subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
_languages="$_languages,ada"
[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
@@ -200,7 +201,9 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
0037-gcc-go-link-to-libucontext.patch
0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
- 0040-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
+ 0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
+ 0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+ 0041-Use-generic-errstr.go-implementation-on-musl.patch
"
# we build out-of-tree
@@ -381,6 +384,10 @@ package() {
mv "$i" "$pkgdir"/usr/lib/
ln -s ../../../../${i##*/} $i
done
+ for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
+ mv "$i" "$pkgdir"/usr/lib/
+ ln -s ../../../../${i##*/} $i
+ done
fi
if [ "$CHOST" != "$CTARGET" ]; then
@@ -621,6 +628,14 @@ libgnat() {
mv "$pkgdir"/usr/lib/libgna*.so "$subpkgdir"/usr/lib/
}
+libgnatstatic() {
+ pkgdesc="GNU Ada static libraries"
+ depends=
+
+ mkdir -p "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/libgna*.a "$subpkgdir"/usr/lib/
+}
+
gnat() {
pkgdesc="Ada support for GCC"
depends="gcc=$_gccrel"
@@ -635,43 +650,45 @@ gnat() {
mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/
}
-sha512sums="172fd45e7274c36ebd22a7e12e44a7096ae3bf0e7f0b647da92cfd31ec406a69017df7ee6c1a6ee0822fbef4ff47855f83fab0a0cdb8f031713a14604af3900b gcc-10.2.1_pre1.tar.xz
-429a92934e1c507c0320741ed5cdd98ba96c73412447c8df0704077e3f0fa6ee4cc4056fadeaa6bb55d237416b555408e97a1c1d21f47b6f6812f153bc36f181 0001-posix_memalign.patch
-a0a9445358f58a34ba0a605d142243d62873d4669ca811013a593e3d6e6640006b5ec23b7a5734ee72f71762d098d607749d6ecc98c85aa4f2074400aedd63ff 0002-gcc-poison-system-directories.patch
-9fb636d1f2ef5b8225082f44da3086b9f196d1c045d7319cea148ee630b92c164e80a3e9a70a221e616a65fc00da761e733f87e23e8575634e498728bce2c48b 0003-Turn-on-Wl-z-relro-z-now-by-default.patch
-e34086d5a46f963e43e9f2f9240e3fb4d935e49feb8edba5121a59192b5991103a8253a342fbc20cef8ac2aa4ae2bf9a7ceb62abf6676be16441fd2dbf3b05f2 0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-ffd89376a743d29a16b4f38463076691cd3716bee2bca0dbb67c2c1da00773661fb362bcc4b2ffd94f57c6b4470ae7cf8f6abad95de5880e74adaa5c4da21426 0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-e101b356589fb794f1c4224bba8d8c714a962bed7858a734badfe38a5d10f4e800155f1ed5edbae9da7134192dfd6a4d8a33a9dbe871becb9526810af535819c 0006-Enable-Wformat-and-Wformat-security-by-default.patch
-e6fbe275e8f4b1257271118bfea5d6c05b041439dde560775a7ee1a9457f442c3e0c8b1113c68bd54502b7d44e6e4b76315613bf2972898a981119f384106fde 0007-Enable-Wtrampolines-by-default.patch
-e2a6a0e3cb2c7a40f59432e0f633a3579bb320fc116290d4655766931c56fb78ce73b0f5e75a78c6aacf85155f3c508e84bfee259dba13cd36e77a601fd5d8f5 0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-0f802f8d9d794a6515a7df7b8588eadc0fa49fdb0b7a5148036fa6fc6e74f35c97d79ed1e4ad225f8f46cca6801f49cbc041258494e4fdbad77a6a7020024d7d 0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-ff99bc1d02ab07ca7d4c45ff5bfec555096b9a9eb6ef5c02d7e18de72ff3a02505d5e3dca6681caa23b8993049a4acf6a07f5a2e8b4481c4778a7a982851970e 0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-cf4dc1bfe33250e4065d926d0a126eb87a43695e24a5efda1c383c4d78add0fa7884c378cd3fbb48d713503492d842758fed69c8b5e29774b3bc87c4abe65125 0011-libiberty-copy-PIC-objects-during-build-process.patch
-93f244dda3fa55a6016d511f526abf902f7902e876a2d813980d0ad0bf527e4c0fd6258293c90085c1e59056d827bf92aab2b9b92c6f17f776e0068e507d731a 0012-libitm-disable-FORTIFY.patch
-d6f409d8d9de3ff44e97046fed1b70ebbecebd5722e7c9bbb92d244ed37d43e77b5d398e39038c554945d022df6d2103b9d4c51fbe11e1d8a011bdfd9067b647 0013-libgcc_s.patch
-d380dc2f57bb2065e0c6d80c0837113c3feee2b2290b5747e922aa7dbcbc4463f55f1c22b39a1dcf88653ef5bbae9d29adbfc0f1002d5eaa523a7a31f980b7ab 0014-nopie.patch
-5db204edfcace211fd89eb16c358579d1534546a0245d2e11541078081d627e712a9ce372d838f152b4e361742696324929c4649d9b9ff6fb0678791bd898fca 0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
-bb76853e79fbeb5c57f52739dff132abf0b80fc551fe83d82238f598ab5ec153b7ebb45aa33b05b24750ff1895cd77a52375bcfb9295c1a44683996ac34bd381 0016-dlang-update-zlib-binding.patch
-50916865c79d9a1305f2524f7051d04df46be925fc7385a3b3cb2c17f1becb8827de76c3e897d470ce1f3fc269f9051c9b478c4d022d7611bcf081782e8b4cba 0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
-0de08138565d81d4b7bbd367f08e5a2bc637106c39736fbedc92401cf3c2cf18ff50c183c263354852bc03724f9353a9a357ed637b3f012ede2514d3c2ed3969 0018-ada-fix-shared-linking.patch
-82aa21e25fddb6ba6a4e1424c88cf5989f62bf3fe088b43bfaf2e624df0381c830b1f0d1e7f10afb2ec6bff07a2558c0464229a997420fe0435321d1d2117372 0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-97cb91e95afccfa7fd020d10f48421745cf7afcbe903f17256fc1df05f5f07eaa675576b7eb340da1b5aa97854df4f1f003cb648d8c2e64d9e9c067a0acd2243 0020-add-fortify-headers-paths.patch
-3ffc3bbfbfd7ae3ddfef131d0731577aac0567c965d545a2ad7c9588430397748758990d2c449e4a4c66f11db6a3ea66fb3187d173c3581cda2093d25f3d90e6 0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-fe3e098d71709bde04cc0a17dcf3bb6ce5bc14b51af1395db97afcb464ba5910dbf85be5d968beddf645e916241f9c6be243c24097c326d9bfebc58219f76118 0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-7dc0c14cbdcab4aaa355568556e5263912ecc69301653602f99e7c70352d84431c6f931a27f4977de7bbd0d5a328c865f7717c8136e3ed6a12ef4448a107a1a6 0023-Pure-64-bit-MIPS.patch
-e4bbd675aea5f09d4aaa32990a88597bd070273754656575e9be74a172afd244aa15e58c2d6878606b652d56457b053c94213f3c0bbf63ebe1ede5fcfdedca25 0024-use-pure-64-bit-configuration-where-appropriate.patch
-f2bd09b05fb67544d0ef70ce14fd8ca2e2d21846d5396e4e53cdb95317ae122b3f121b8933e5784fc92e51e50d23812e4aa41f2fd07ae68ba1a21ca094a841ac 0025-always-build-libgcc_eh.a.patch
-0d49f5104e89a1269a286f7021dd32d0ac4f7aa427b36f40133bc8616ca87e92144d6cc36f958b3ab4ec683e12f946c3658bceada8fcd5114bdb7c197992eb4a 0026-ada-libgnarl-compatibility-for-musl.patch
-a09211cb007a9722ec95d046fbf317f63b362fb25f6d3ba285f278a33fe08ad5f5d51ba1e4ccf9ebe02c1ea3ca15f10b0721e7f65af5ced27ffc9380af7558b1 0027-ada-musl-support-fixes.patch
-35c1ee71725042fffded7e3189d96ace6cb730d95d83cd49fd4d8527eba72eb344c11d563d1c751a3934627e5aaa44525c58afd4d01c0bb99bab3b6222fa3040 0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
-26deab6006d46e2c8de4679cc7f598cfdd572b1b77c0595f0160fa693251669d324f47712c6faef481dc33a2c83878ec3fe385d54ab9bfd6fa2c576d84429d05 0029-gcc-go-Don-t-include-sys-user.h.patch
-dd9cc5c3c5368a210276ce4396be9cf120c5acfc65cae88508aebd7d4430a28d21b26b362f7f7456ae64c87dd06dfe7a615cd0c7ca13740b683e3a59c1c7bc8d 0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
-c17f5088172babddbdb32830387487286f6106304cf07d49d0b2e59feacad62aa10a46bf1bf927f1f138fd1112da5bef7ae1227a26e7946082a6edc7f340b522 0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-db67b346f3def6c004639df27cef32a6c4e9b4661634f43b62f4f3be852f5ae6d5dadef85116f816d5fd88cbdd80001d8f81cc8d554b9094744402ca3ae14725 0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-438c165b8e217142b64a002e99b112fbdac9b2c4ced7b0a8c8fe9cff42e6a5ea6d5939cb40905d5a8570fc890de447fd0f5b49c9ee43c3a6e33446efdf2229bf 0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
-85592117e6370ff8612a7a028194c6875c8df1f07299afa0188770bf9bdd82d9aeb322909ec980cf3bd10a54d90829fffb145c566d843027c11d49e78d3f0a9e 0034-gcc-go-signal-34-is-special-on-musl-libc.patch
-abc2ae2ea2ff270226c45321508c3641011b23172d043c55239a52fee9ed8451e8e23a2a65612c5f3a0d2e4d1a601a7e9a2c1d6c07f926e6cdf42164d23cff34 0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
-21ff83b1f5f8c71c41e7c22ba59f194bc789c8e67a6be9e5185f215adf4ddb175551a261556e5c9bd57dd9c302e1f966de01ff90e097d7ace2c2e43208b6e0f9 0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
-5f0230f9e542bcbfa39f1a3da1f171229bd926971a924ec3e9f3ad8178645d3853659a58a89a48906ffdd77e9c5ff2af43dc54cfc4ac335a219267dddc4afad1 0037-gcc-go-link-to-libucontext.patch
-08ffdce5d1ef722364faf5e824b62d0e58655acbba99b58f24c609abb1d90577432863e769fbe269e4151c997b8bbb0cbed29032752b6e6c3356f8fb3086d607 0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-81bcffde9635c9c4b3214afd8bb16048f15dc8c4ce82c5576b15ee552d6ca8eeee2c5444e2949fec3b938e69fc7a2a2259a07d437e004788ac232c43ae9a83d2 0040-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch"
+sha512sums="0ef281e6633b8bef7ce24d1448ec7b96aef66e414f90821a9a021dcd98eca8895d217d9d95b70fd9c96113689cd026aec951edc356462e439a9350edb4009df6 gcc-10.3.1_git20210424.tar.xz
+d1e10db83a04c02d99f9f6ce03f949b83ccd013674773dcb08992c604048df6a08bf9bd16f74e3c60ea85fd861fb08c1fa9fe17c304af9bfc9a032b81f1ac9eb 0001-posix_memalign.patch
+a77c7ebd994b5780cc5209f33ace24fc4d04353638dcdb14af192b0be5b0e5be397218ddba40e577af889a267af1aa69c1def474207a6661a37c3f5c15002bcb 0002-gcc-poison-system-directories.patch
+108ad63f61e61f627a75613605962021c08bbde584f3c0507d6a07c6112487847ce89699d1d80efb9201c4eab3440ba66f2eeb781bd259fdfc9c87b3baee1e27 0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+dc28895223fe7ce531648225da3cd15e20c26a9be0248fdd66f11efb153647776bdbe8109097d87a087c4443e809a0d425848bdeae1442135c52a13bdd06ef75 0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+ce7a5f243072284e767510083c57250dd5f1dcdcae102cf1ecbb06f36ea286b00b1f84dc32e5fdb76bac77b52ef3e4e650cff7cc0d14d94487a40ca9d5605bbd 0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+f5458adfd23f51fa54fb690ec322552d7cadc3afa5773e13e73832c56832854ff14a73ff480c9990731ce929c5a4df35bc20247239268221b9af40ba37331228 0006-Enable-Wformat-and-Wformat-security-by-default.patch
+2601b0de5fe402cdd9a3d87c2a3e959154c2ee413989db21fbc232f169b20d94807a1f89ff5ebb650a143d59b4b48187b338832d8de577fa47bfdd1b76313114 0007-Enable-Wtrampolines-by-default.patch
+3eedfe70c85d963845a658444d8692792a34af8b5e0fa800991bf1e0e2c9ff3196c50f11a284cfaca5d48b4c78b614febf38339918c7fa7a7f4723a1f6bdad16 0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+6a4b6843cb27b560ac4327b17718806bac4b602903f696222617148a52e9918144648cc45642293beb7c8fd48eba325c115e1dcaa4adec85e1caff0ea33d2a8a 0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+af174250b4fbcc3664bed51d919695511b538f2f3b65532383591f511bede3d13a1ade29aea66598d6df17f2e931a2d171f01c4e7008b4f468cfb13dc5f2b4cf 0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+aabac76659e3fa96fa7b4ee2571672c840c3dd37314f16516038d3934333a42b20442a967afce5a35a326685c3c8ef384fc97dc8f4dae57479038f5431e33c19 0011-libiberty-copy-PIC-objects-during-build-process.patch
+36702acf0c9b34adb0b23b74167e5358c706246cc88ce569d4462555bb48288d5d633298aa447ef023c6f75de86dfa7d4ebbf3c43593e1279837ebd47061be0f 0012-libitm-disable-FORTIFY.patch
+79912633ee707c60c66abf6ee16159db3357e4e75d4254f7f38cbc0119c2adfcfa2b8c6b1df3885526d68e49f88e2a0c87969a784ed8a1025a680a4f18acd06c 0013-libgcc_s.patch
+c8c6f4e967afb5d4a9eccd917f6338a61547cc2fabbf56b25e27220b4f3c85f5002477bf2f9d05a911185cee8dcba3a12d3ad24c0d7b1d3b67a3a53bfea702c6 0014-nopie.patch
+d8d8556a6192d7695e1aeb1e64bf98a02b068c427442dd9c23d2b9a863c504e577f35e0890b5f0a184c687ce9315cecff3d2e0bb82f19531a493efb72b54cfe7 0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+b3fb29187561fef84b6eb0b35a582c79833203f689e5bf884146cd9a71ec407e0e3b27b0bd4953143d00879ce32331e92741e1c7229ca291ebf13dfd8f5d409c 0016-dlang-update-zlib-binding.patch
+2a03683d5e00cc65f8ebc83638953dff89981069943169874df03f4f3a22348b960780250d9240505acf5b1bfbe154d57d14f310f29a94b76404f50611da9000 0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+3df60839e5337fccdd228ebf753fb0dbf672aefca5f3f16329b99c813b907f44e1ce4948ce7f692dca316eb307b83ae9f5028cf1875eb3c9fee85b2dee7bfe83 0018-ada-fix-shared-linking.patch
+bd60be22341b508b4b5cb66eb48723d0f48770745352c60cfe146efa4d18ec58cccbb37f85b98dc0432e52bb5dc8dc1f28b3a3ca50d1ca6db68eb38df970e5aa 0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+333f9c7a1935dc4f29783fa31c254bda6339c30ee770eb30d585ac422cd0f69701b5d988f9493471e4c83cf20937050f33320852a83ed6dfb2e739ee3539ca0e 0020-add-fortify-headers-paths.patch
+053b0339936cc0469e8708ccc086fa1dabe8572199530e1e78a93551340dd35467a07273e19d2cbc7fe915b7a5bdf95c128718ba0518b67b9668ef0316b7aa06 0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+7b3d849cdbdee5855918db4114de8f989ec5d612cddc7551eb63ca2878e69e3566353bbfafa9205a161ffd51c5aedd367de6ad82cd5ebf6cb28c716a8d447bb5 0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+6b3c0fa81cebaf32948657bddaac99024f45c2fc19ac8bc504f3773b6458099b9907e310e162952973bdd41c9fc011e7a50bc8fa86cc0ebec9dd4c69830a012b 0023-Pure-64-bit-MIPS.patch
+da634721fa9cba18e4f527b2cdbe6896c0251ce43865c6fbf29a7281d766c3a8f98e2ddd345b801c25b7ceb85880150ae9cc422aa8891b1fc28a3dc40bcd3114 0024-use-pure-64-bit-configuration-where-appropriate.patch
+64b58a273993224f93c68cddfacc1b3da6b0900b2983f27f8db39b4375afa97cce564739c8fc320666821f6de526e54acbc4920c7e16612303b3d25aed34d5f1 0025-always-build-libgcc_eh.a.patch
+6004be7d683993c175f819e1d62767b6ca2b80643917bb584ffffe2aee9fd5ad9745f91651ad5d1d00aed390e7346262b5c28bec356efd9ff1c85e4b54bcfe2e 0026-ada-libgnarl-compatibility-for-musl.patch
+7a3ce107cc55356ac46f3a217eea1cf9cdddd43fd3fede048a26e5da2280f0af9f806392942d2896a0f841ca0b0b0eaceb4e20f09edee7a743b515d3553fc8b3 0027-ada-musl-support-fixes.patch
+0cd8303456ec5479942970679352fe8bcd259b8b04bffba458545abdfac87163a8fb8e55c3aa505c516af8fd0a1bfb5f2ee4c6027ec9bcb0b0d3564469a18e23 0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+6cc82829bb8bf8ffb473e4f2f9c2f657a4078290fc7c3208d199c0b07c2c3a7575a0c423e52fc02fd96c81158ab2e7ad33ccb651523ba80e00dee9e503d19c6d 0029-gcc-go-Don-t-include-sys-user.h.patch
+868e0cf5d32412c557d7835e03eb23621745179e77c87d69b810f8ec968cf80606cb5cb8085e5e125f08e809d5e3ff50c4de869d94caca5f4257669237a29b92 0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
+257814e2dc39bf01dedc3efe9f50029bdc230e112a0e739d0547896212b87bcdb9d40d4632a237137c91e2d9605b2256ebd45ee005920a5c4e401e699ce69f46 0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+0e33205e6ef0b58d12eb80d3fd6ce7361e9e3a86ba2ae781745133be1f0fea6a1e95fd58331765f6bb599f4ad355224c954db4fbaf804b9e4c0ea01dbaae1638 0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+bb1e3bbea65644435134910e04b8d4de27642026371b19f4faf51b90e32af08e7181b3198e936b3626cba2126f8f9182ce39f6b8c8849b6b27f56a1c45e4f8c5 0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
+0758417ab682ee6d4b75f1ba2d0c1f568e115a16625eb664066c1862178a43ae717396c5d61a355a08fc01929041abebbf33bc58176a0b78ab384aba7d2ed8ba 0034-gcc-go-signal-34-is-special-on-musl-libc.patch
+d0b132d1bb9a455af23829a9da4ff89c27eff3f642e2280712667753d552fc214424470cad4cecd0ae39052553b6a22d7dc7a20eebfd1cb976d98552b00b9dcd 0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
+a21844975ff13317ed7985b5f5b257a0bc1dd961360b6a6f36bf52151b8edf5ecf38fbdd47cb2c28c13ed3dfbf4ca112d91d81373fd3e2c5992aba35296645af 0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+0217263fc1fcfbde92fcebfc626b2cf0ba30e704b4fbe5a11f55d9ca5b579cceac3ba9ec45e7f53cd8805678b69fb6e5ab1295e67938b9c83f82e44ddebd0a85 0037-gcc-go-link-to-libucontext.patch
+8a90ce84d493bfcdcad4cb1a02a320dca18e8178e717451087501b059ca00ab8f6b73d628bcb3f49c5c6702b7222b063d3c0803d093e2c6f58820b6aa578969e 0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+a3e7362fa95d5ffa56b0d8ea73f6f8e867409ae3b85d041aa0591dba093c5bb1d30f3294151c5142e8d1df91f4d138e9f4484009b8a675c8fc3b754a34c7648e 0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
+dc7a8f6dc885dc34229128a716531b375ec4e8247a8522adb623c5a6b39db60ff471436b360a25f0310ee16fe1a6ec85ff64398cbae2677534626972ac01db22 0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+046bfe95d6de9df148e6c410b5d23a49c488ab41d95e599fc381a2b7d190e6d7d99de59fa8cd8c3a711ee2310426f3cdcd323cf887c8d11543e119d205659b6a 0041-Use-generic-errstr.go-implementation-on-musl.patch"
diff --git a/main/gcr/APKBUILD b/main/gcr/APKBUILD
index d510afd46d..3f8b3b23be 100644
--- a/main/gcr/APKBUILD
+++ b/main/gcr/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gcr
-pkgver=3.38.1
+pkgver=3.40.0
pkgrel=0
pkgdesc="library for bits of crypto UI and parsing"
options="!check" # Testsuite requires community/xvfb-run
@@ -14,7 +14,6 @@ makedepends="glib-dev gtk+3.0-dev libgcrypt-dev p11-kit-dev
checkdepends="xvfb-run dbus-x11"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-base"
source="https://download.gnome.org/sources/gcr/${pkgver%.*}/gcr-$pkgver.tar.xz
- allow-building-without-gpg.patch
dont-run-gpg-tests.patch
fix-64-bit-time_t-32-bit.patch"
@@ -42,7 +41,6 @@ base() {
"$subpkgdir"/usr/lib
}
-sha512sums="4dc8c3f84023a7cd6f069f4529cb063d7153e589c2f9547410c7eeb5298dc238ea7fc4f22e22d8c237391f31bfcd814190e55125195f20b913665b9ca81d9c21 gcr-3.38.1.tar.xz
-7cca3fd0512621129f0a0c532a3592b4ea0e49f887cf5935b1a104363d08fca05dbba470672561efa4b8b02efdbe22c948f989af26fdb32833a82383393207f0 allow-building-without-gpg.patch
+sha512sums="7118608e7bef7d0cf2eea33cb3286b7f9c3622a38892ce88cf33ed453d343cc33e070831e7b4d0c5cdb43c2e57b3f0b91c7cbd6aa8463982d3af8844b59bcb81 gcr-3.40.0.tar.xz
e4fc2248497e7103980e9baf9444505649ee93c657c7a82c042ae62d7c54b2764ad7bc9780467ceda5e53a23fa11dc4957898929c7d7f995d9d0d205d18d5eb7 dont-run-gpg-tests.patch
579b229d6f310ed035974a92a65804deae7b047cf6109e259844ecdc75df32653a2c9f9dcddba9092da335f44d07d5d82056ae0cf5775057bdb9be5b52e29bcc fix-64-bit-time_t-32-bit.patch"
diff --git a/main/gcr/allow-building-without-gpg.patch b/main/gcr/allow-building-without-gpg.patch
deleted file mode 100644
index 7560419e8d..0000000000
--- a/main/gcr/allow-building-without-gpg.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Upstream: See https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/50
-diff --git a/meson.build b/meson.build
-index f19af0f..57b625b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -41,7 +41,10 @@ gobject_dep = dependency('gobject-2.0', version: '>=' + min_glib_version)
- gio_dep = dependency('gio-2.0', version: '>=' + min_glib_version)
- gio_unix_dep = dependency('gio-unix-2.0',version: '>=' + min_glib_version)
- glib_deps = [ glib_dep, gmodule_dep, gthread_dep, gobject_dep, gio_dep, gio_unix_dep, ]
--gpg_bin = find_program('gpg2', 'gpg')
-+gpg_path = get_option('gpg_path')
-+if gpg_path == ''
-+ gpg_path = find_program('gpg2', 'gpg').path()
-+endif
- libgcrypt_dep = dependency('libgcrypt', version: '>= 1')
- p11kit_dep = dependency('p11-kit-1', version: '>= 0.19.0')
- p11_system_config_modules = p11kit_dep.get_pkgconfig_variable('p11_system_config_modules')
-@@ -65,7 +68,7 @@ conf.set('HAVE_GETTEXT', true)
- conf.set('HAVE_LOCALE_H', cc.has_header('locale.h'))
- conf.set('HAVE_TIMEGM', cc.has_function('timegm'))
- conf.set('HAVE_MLOCK', cc.has_function('mlock'))
--conf.set_quoted('GPG_EXECUTABLE', gpg_bin.path())
-+conf.set_quoted('GPG_EXECUTABLE', gpg_path)
- conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version())
- config_file = configure_file(
- output: 'config.h',
-diff --git a/meson_options.txt b/meson_options.txt
-index bbdc8e3..ae0f524 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -13,3 +13,8 @@ option('gtk_doc',
- value: true,
- description: 'Build the reference documentation (requires gtk-doc)',
- )
-+option('gpg_path',
-+ type: 'string',
-+ value: '',
-+ description: 'Path to gpg, autodetected if not set',
-+)
diff --git a/main/gd/APKBUILD b/main/gd/APKBUILD
index d417667f50..e4726b31b2 100644
--- a/main/gd/APKBUILD
+++ b/main/gd/APKBUILD
@@ -1,14 +1,20 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=gd
-pkgver=2.3.1
+pkgver=2.3.2
pkgrel=0
_pkgreal=lib$pkgname
pkgdesc="Library for the dynamic creation of images by programmers"
url="https://libgd.github.io/"
arch="all"
license="custom"
-makedepends="bash libpng-dev libjpeg-turbo-dev libwebp-dev freetype-dev zlib-dev"
+makedepends="
+ libjpeg-turbo-dev
+ libpng-dev
+ libwebp-dev
+ freetype-dev
+ zlib-dev
+ "
subpackages="$pkgname-dev $_pkgreal:libs"
source="https://github.com/$_pkgreal/$_pkgreal/releases/download/gd-$pkgver/$_pkgreal-$pkgver.tar.xz"
builddir="$srcdir/$_pkgreal-$pkgver"
@@ -54,4 +60,4 @@ dev() {
mv "$pkgdir"/usr/bin/bdftogd "$subpkgdir"/usr/bin/
}
-sha512sums="0b96406a1d62129d7d63f78fc4558062c223a3bfbf9719be86362fd922b72b5dac294524dd1b0a996a4a7a709ee9d2dfc790ee32564add70adad41d044a0ed80 libgd-2.3.1.tar.xz"
+sha512sums="a31c6dbb64e7b725b63f3b400f7bebc289e2d776bdca0595af23006841660dc93a56c2247b98f8a584438a826f9e9ff0bea17d0b3900e48e281580b1308794d2 libgd-2.3.2.tar.xz"
diff --git a/main/gdb/APKBUILD b/main/gdb/APKBUILD
index aaef2c03bf..3521064282 100644
--- a/main/gdb/APKBUILD
+++ b/main/gdb/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gdb
-pkgver=10.1
+pkgver=10.2
pkgrel=0
pkgdesc="The GNU Debugger"
url="https://www.gnu.org/software/gdb/"
@@ -74,7 +74,7 @@ multiarch() {
"$subpkgdir"/usr/bin/gdb-multiarch
}
-sha512sums="0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537 gdb-10.1.tar.xz
+sha512sums="3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz
70e7d04e4d72461436da503b5bfa370c5779e03245c521f30e9779d5ff37dbb2d708b05f2afb27f43ad9defc44df4bd979d72f777e744851fdbf156295e1cc9f s390x-use-elf-gdb_fpregset_t.patch
04911f87904b62dd7662435f9182b20485afb29ddb3d6398a9d31fef13495f7b70639c77fdae3a40e2775e270d7cd40d0cfd7ddf832372b506808d33c8301e01 ppc-musl.patch
ab554899bbb2aa98261fd1b6beb4a71ed7c713a714bddd3fa7ec875258e39bd5474dc96a11accb4dadd316f3834f215e8395d3b373bf3affd122dc5b4a8fe710 ppc-ptregs.patch
diff --git a/main/gdk-pixbuf/APKBUILD b/main/gdk-pixbuf/APKBUILD
index db40b741d0..b392a61852 100644
--- a/main/gdk-pixbuf/APKBUILD
+++ b/main/gdk-pixbuf/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gdk-pixbuf
-pkgver=2.42.2
+pkgver=2.42.6
pkgrel=0
pkgdesc="GTK+ image loading library"
url="https://wiki.gnome.org/Projects/GdkPixbuf"
@@ -50,4 +50,4 @@ dev() {
default_dev
}
-sha512sums="f341d032ea410efed7a35f8ca6a7389bf988f663dae16e774d114d6f11611e9e182c835e90d752b71c258c905cc5c4c785ea697feed5e6921a2a676c9deaa5f2 gdk-pixbuf-2.42.2.tar.xz"
+sha512sums="02e6d89de6cb6c9768d5173dada88c038e2454b4345ebc6f7b012d484303c08e53b58f085e872290555e1ccb74a478fa6cef4623a75f2e1f05c27bfc4e986f4d gdk-pixbuf-2.42.6.tar.xz"
diff --git a/main/ghostscript/APKBUILD b/main/ghostscript/APKBUILD
index 22f173a3e9..1c3a25b557 100644
--- a/main/ghostscript/APKBUILD
+++ b/main/ghostscript/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Cameron Banta <cbanta@gmail.com>
# Maintainer: Cameron Banta <cbanta@gmail.com>
pkgname=ghostscript
-pkgver=9.53.3
+pkgver=9.54.0
pkgrel=0
pkgdesc="An interpreter for the PostScript language and for PDF"
url="https://ghostscript.com/"
@@ -15,7 +15,6 @@ subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-gtk"
source="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${pkgver//./}/ghostscript-$pkgver.tar.gz
ghostscript-system-zlib.patch
fix-sprintf.patch
- freetype.patch
"
# secfixes:
@@ -155,7 +154,6 @@ gtk() {
mv "$pkgdir"/usr/bin/gsx "$subpkgdir"/usr/bin/
}
-sha512sums="c142ef9d83896aa8fd18c8e412220fe8f4950614be00d327d27ab051fe85e16524bf2ee00f46c2aca7a352ce47bc3acf2c4de0f7bbea7e4c55474b8af6cdc0a6 ghostscript-9.53.3.tar.gz
+sha512sums="93cfac3a754d4a7fa94112f3e04ba2ae633c40bb924734db72229096aac2f07c95877737f37f2bfef6be1b1d074af79e75cde3d589ea102def7f4654403e4804 ghostscript-9.54.0.tar.gz
70721e3a335afa5e21d4e6cf919119010bd4544a03ab8f53f5325c173902221ad9b88c118b4bfeee80b3e1956bcdbaf4c53f64ae7fb81f5ba57dbc956750c482 ghostscript-system-zlib.patch
-beefcf395f7f828e1b81c088022c08a506e218f27535b9de01e0f0edf7979b435316c318fa676771630f6ad16ff1ab059cd68aa128ed97e5a9f2f3fa840200c4 fix-sprintf.patch
-16735f13caf20ea56a057f4a94556d3e2191c2db28caab0757f36d12261065a494a053d17fb8a734573709c023955daa18c4e45c319355673ec4e6b7d823cf80 freetype.patch"
+beefcf395f7f828e1b81c088022c08a506e218f27535b9de01e0f0edf7979b435316c318fa676771630f6ad16ff1ab059cd68aa128ed97e5a9f2f3fa840200c4 fix-sprintf.patch"
diff --git a/main/ghostscript/freetype.patch b/main/ghostscript/freetype.patch
deleted file mode 100644
index b2c436516a..0000000000
--- a/main/ghostscript/freetype.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.ghostscript.com/show_bug.cgi?id=702985
-https://bugs.gentoo.org/747808
-
---- ghostscript-9.53.3/base/fapi_ft.c
-+++ ghostscript-9.53.3/base/fapi_ft.c
-@@ -125,6 +125,14 @@
- delete_inc_int_info(gs_fapi_server * a_server,
- FT_IncrementalRec * a_inc_int_info);
-
-+#ifndef FT_CALLBACK_DEF
-+#ifdef __cplusplus
-+#define FT_CALLBACK_DEF( x ) extern "C" x
-+#else
-+#define FT_CALLBACK_DEF( x ) static x
-+#endif
-+#endif
-+
- FT_CALLBACK_DEF(void *)
- FF_alloc(FT_Memory memory, long size)
- {
-
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index 96601133c9..e2c8b3f651 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -2,6 +2,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
#
# secfixes:
+# 2.30.2-r0:
+# - CVE-2021-21300
# 2.26.2-r0:
# - CVE-2020-11008
# 2.26.1-r0:
@@ -25,8 +27,8 @@
# - CVE-2017-1000117
pkgname=git
-pkgver=2.30.1
-pkgrel=0
+pkgver=2.31.1
+pkgrel=1
pkgdesc="Distributed version control system"
url="https://www.git-scm.com/"
arch="all"
@@ -278,7 +280,7 @@ _perl_config() {
perl -e "use Config; print \$Config{$1};"
}
-sha512sums="b3567d251c73807857f05f46cae3acb4e0d876590d122229c05509d5eb17fc3eee0ba97a1b2068070b399085f7a92aa2493c4833b98f65b8ef15fc279798caa3 git-2.30.1.tar.xz
+sha512sums="9aa334a3e8519700ff5d112153ec42677722980094caa9d22aa91afdb65166bd9a98fa445c0d327c428ebfa73bf4832e9b3836109a1d9319feafe3191cfd170e git-2.31.1.tar.xz
89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd
fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd
be5d568fc5b8b84c9afb97b31e471e41f32ccfe188eba0588ea0ef98b2d96c2ce4b2c1a3d70e88205aa4f6667f850b3f32c13bbb149ecddbf670344c162a4e25 fix-t4219-with-sticky-bit.patch"
diff --git a/main/gitolite/APKBUILD b/main/gitolite/APKBUILD
index c6ea5dc294..3dc252bafc 100644
--- a/main/gitolite/APKBUILD
+++ b/main/gitolite/APKBUILD
@@ -1,9 +1,9 @@
+# Maintainer: Łukasz Jendrysik <scadu@yandex.com>
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Maintainer: Łukasz Jendrysik <scadu@yandex.com>
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=gitolite
pkgver=3.6.12
-pkgrel=1
+pkgrel=2
pkgdesc="Centralized git server, with very fine-grained access control and many powerful features"
url="https://github.com/sitaramc/gitolite"
arch="noarch"
diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD
index 89b9bc68d1..91f94a85d4 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=glib
-pkgver=2.66.7
+pkgver=2.68.1
pkgrel=0
pkgdesc="Common C routines used by Gtk+ and other libs"
url="https://developer.gnome.org/glib/"
@@ -66,7 +66,7 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
}
-sha512sums="f6e6cc0fe2ab4a31a623bf9a1e63f833783e044e7ed55b66a84fc0cbf1410eec233fe0e226abb20aac0e40167a9624bf5e65197f9eed879da1293af44408d530 glib-2.66.7.tar.xz
+sha512sums="f705cda6f1b4b0acc5fe8d21b60994ca0ec6de39c6722f4f01cbe0ece30eacb7271d3cb29067e638e0204a3cefa2df1e535f273b72330455e185b544cebc2ab0 glib-2.68.1.tar.xz
32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch
744239ea2afb47e15d5d0214c37d7c798edac53797ca3ac14d515aee4cc3999ef9716ba744c64c40198fb259edc922559f77c9051104a568fc8ee4fc790810b1 deprecated-no-warn.patch
2211140fde86c9a80f67d0ce54dfd3e9e77d61dc14aa9d4c3df6f995582dde48b334622785f54b516cdc37f9cb27e3c75018f4134a72b519801ddd64078841b8 musl-libintl.patch"
diff --git a/main/glslang/APKBUILD b/main/glslang/APKBUILD
index 899003989a..edf70e806d 100644
--- a/main/glslang/APKBUILD
+++ b/main/glslang/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer:
pkgname=glslang
pkgver=8.13.3743
-pkgrel=0
+pkgrel=1
pkgdesc="Khronos reference front-end for GLSL, ESSL, and sample SPIR-V generator"
url="https://github.com/KhronosGroup/glslang"
arch="all"
diff --git a/main/gnu-efi/APKBUILD b/main/gnu-efi/APKBUILD
index 1af6751695..3726f62fc7 100644
--- a/main/gnu-efi/APKBUILD
+++ b/main/gnu-efi/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gnu-efi
-pkgver=3.0.12
+pkgver=3.0.13
pkgrel=0
pkgdesc="Development Libraries and headers for EFI"
url="ftp://ftp.hpl.hp.com/pub/linux-ia64"
@@ -20,5 +20,5 @@ package() {
make PREFIX=/usr INSTALLROOT="$pkgdir" install
}
-sha512sums="cbec6f6e37271c22c71e3ce44d3579e48e7f3b797ec3946f56eb843ed3e472722763c566fc3b749f0c692ab6cb26e8909bb258cd164771a5b1eeff5c7cd51368 gnu-efi-3.0.12.tar.bz2
+sha512sums="cda0e7c04d4fa8431b93dc7caa36e0a5e1076470dcdeae25f8bd08949c5d387647fdd9ca3db6b551766857e2c24ce3c6d95869d5dc5154128a2d3540d410e1eb gnu-efi-3.0.13.tar.bz2
f384597dc967cc9b1cf738d4002dc75847606c8ab10efbaf9e23844c767f5b9a33518374321b2ae5c5d7e4c9c3abaed996d0690ea81a7906355cabec1426d248 no-werror.patch"
diff --git a/main/gnutls/APKBUILD b/main/gnutls/APKBUILD
index 5b76da01c8..3c72a8194e 100644
--- a/main/gnutls/APKBUILD
+++ b/main/gnutls/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gnutls
-pkgver=3.7.0
+pkgver=3.7.1
pkgrel=0
pkgdesc="TLS protocol implementation"
url="https://www.gnutls.org/"
@@ -22,6 +22,9 @@ source="https://www.gnupg.org/ftp/gcrypt/gnutls/v$_v/gnutls-$pkgver.tar.xz
# Upstream Tracker: https://gnutls.org/security-new.html
# secfixes:
+# 3.7.1-r0:
+# - CVE-2021-20231 GNUTLS-SA-2021-03-10
+# - CVE-2021-20232 GNUTLS-SA-2021-03-10
# 3.6.15-r0:
# - CVE-2020-24659 GNUTLS-SA-2020-09-04
# 3.6.14-r0:
@@ -72,6 +75,6 @@ xx() {
mv "$pkgdir"/usr/lib/lib*xx.so.* "$subpkgdir"/usr/lib/
}
-sha512sums="5cf1025f2d0a0cbf5a83dd7f3b22dafd1769f7c3349096c0272d08573bb5ff87f510e0e69b4bbb47dad1b64476aa5479804b2f4ceb2216cd747bbc53bf42d885 gnutls-3.7.0.tar.xz
+sha512sums="0fe801f03676c3bd970387f94578c8be7ba6030904989e7d21dffdc726209bab44c8096fbcb6d51fed2de239537bd00df2338ee9c8d984a1c386826b91062a95 gnutls-3.7.1.tar.xz
3e7d872963cc25e49f1ecf98de7d6f3b6b22d2c1c9e982bc4b22ce658c11d8567903728e5aa33ce7b6d3e25fe0b7a75b8aca3e8f53838155af5abe23887d33fa tests-crq.patch
-30739b5ca06bb72e93d021065fbc90a1808c5fc139ff917308738456ae8601f5c372d223d77e51cdd34a6aa4d28dcb8140101c3f753ede1e39ee12e229c24cbe tests-certtool.patch"
+3cc35bf7dcf6b7963d59bc346f68e0004151e409899b50e98ba5c675e753ade19a7baf317449343688b1bb2905ef8c8a5677dfe819e701b5bd82374d99adeb65 tests-certtool.patch"
diff --git a/main/gnutls/tests-certtool.patch b/main/gnutls/tests-certtool.patch
index 3c6a9a1885..78a79f2f65 100644
--- a/main/gnutls/tests-certtool.patch
+++ b/main/gnutls/tests-certtool.patch
@@ -2,8 +2,8 @@ I think this tests is simply wrong.
When a PIN is given, the program should run in batch mode.
So the question for "Enter password" should _not_ be present.
---- a/tests/cert-tests/certtool 2019-02-07 07:33:45.960887338 +0000
-+++ b/tests/cert-tests/certtool 2019-02-07 07:36:14.550955051 +0000
+--- a/tests/cert-tests/certtool.sh 2019-02-07 07:33:45.960887338 +0000
++++ b/tests/cert-tests/certtool.sh 2019-02-07 07:36:14.550955051 +0000
@@ -49,7 +49,7 @@
#check whether password is being honoured
diff --git a/main/gobject-introspection/APKBUILD b/main/gobject-introspection/APKBUILD
index 3477748791..0a2f094bd3 100644
--- a/main/gobject-introspection/APKBUILD
+++ b/main/gobject-introspection/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gobject-introspection
-pkgver=1.66.1
-pkgrel=0
+pkgver=1.68.0
+pkgrel=1
pkgdesc="Introspection system for GObject-based libraries"
url="https://wiki.gnome.org/action/show/Projects/GObjectIntrospection"
arch="all"
@@ -39,5 +39,5 @@ dev() {
replaces="gobject-introspection"
}
-sha512sums="ea1e20cd94ff8af3572f417f35e96648ffc3e94a91d4e4c81adf99bb0f408ac21ecf40990f9dbd5f2e0f4e83360286ca5db88dbc45bd59289596a324acf7df3d gobject-introspection-1.66.1.tar.xz
+sha512sums="d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381 gobject-introspection-1.68.0.tar.xz
a55df8fbb8d27d073bbab7e3bd2ca5e272c3fca2a3e144207d4cac06dd90f51443373b077fa64543887e2d5da4bc017bd5245473b83dd0ed551a5a437eec9241 musl-time64.patch"
diff --git a/main/gptfdisk/APKBUILD b/main/gptfdisk/APKBUILD
index 2d4c161c4b..d739aeb1a9 100644
--- a/main/gptfdisk/APKBUILD
+++ b/main/gptfdisk/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gptfdisk
-pkgver=1.0.6
+pkgver=1.0.7
pkgrel=0
pkgdesc="Text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks"
arch="all"
@@ -15,6 +15,7 @@ source="https://downloads.sourceforge.net/project/gptfdisk/gptfdisk/$pkgver/gptf
# secfixes:
# 1.0.6-r0:
# - CVE-2021-0308
+# - CVE-2020-0256
build() {
make CXX="${CXX:-g++}" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
@@ -34,5 +35,5 @@ sgdisk() {
mv "$pkgdir"/usr/bin/sgdisk "$subpkgdir"/usr/bin/
}
-sha512sums="a3bf95c813f707d9d41513295c3419916301a0e88b4c6ade70ad7d9422a507d519e092e68a3868d53092428d159bdbb248817c4f40d8ac88b0175d5afbd79dbc gptfdisk-1.0.6.tar.gz
+sha512sums="8a2067523479e34c76392571692b36e6c9eadcd0aca979f1ba09904930ed92a709bfdcdfa3369230a5ab2b5a751682dc7fb4645fb5f7f1c361ee8d28e104214c gptfdisk-1.0.7.tar.gz
9b64c0e565137b4d4275bd6e8b050f98a73ff5593093b54d43736e6aabd24abf6e35d88ea27be17c5fee70aada4ad05a70fe5af3523212aad114f05aaf82356f fix-wrong-include.patch"
diff --git a/main/graphviz/APKBUILD b/main/graphviz/APKBUILD
index e2babeabd8..b3792f6cf3 100644
--- a/main/graphviz/APKBUILD
+++ b/main/graphviz/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=graphviz
-pkgver=2.46.1
+pkgver=2.47.1
pkgrel=0
pkgdesc="Graph Visualization Tools"
url="https://www.graphviz.org/"
@@ -112,5 +112,5 @@ graphs() {
"$subpkgdir"/usr/share/graphviz/
}
-sha512sums="fe402bebe968d57aeea447fa6f054e8b90ddabdd36ad0d82e0be177e13294270ab3f6278b4c507ecfeb59db332def47c0dfaf6e7005c369a70d782aebe6dedae graphviz-2.46.1.tar.gz
+sha512sums="8d12f90bc780d88dda8fe3f64723ee921eda2d345e665fe7e5f2599117b513c7715250e66e630b9de9900ff4b9780f698a6c2d6c25c1aad34d1329ebd69d8d8b graphviz-2.47.1.tar.gz
aa4cbc341906a949a6bf78cadd96c437d6bcc90369941fe03519aa4447731ecbf6063a0dd0366d3e7aaadf22b69e4bcab3f8632a7da7a01f8e08a3be05c2bc5d 0001-clone-nameclash.patch"
diff --git a/main/grub/APKBUILD b/main/grub/APKBUILD
index a7b8b9278b..bca947720d 100644
--- a/main/grub/APKBUILD
+++ b/main/grub/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=grub
pkgver=2.04
-pkgrel=2
+pkgrel=3
pkgdesc="Bootloader with support for Linux, Multiboot and more"
url="https://www.gnu.org/software/grub/"
arch="all !s390x"
diff --git a/main/gst-plugins-base/APKBUILD b/main/gst-plugins-base/APKBUILD
index a4ce62ca28..41882c61d5 100644
--- a/main/gst-plugins-base/APKBUILD
+++ b/main/gst-plugins-base/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gst-plugins-base
-pkgver=1.18.3
+pkgver=1.18.4
pkgrel=0
pkgdesc="GStreamer streaming media framework base plug-ins"
url="https://gstreamer.freedesktop.org"
@@ -47,4 +47,4 @@ doc() {
replaces="${pkgname}1-doc"
}
-sha512sums="5b1850c82d6c29e260cadcde6a412a75eac47b14a1778aa969b0a33540eb843f6cef2209c91a1d7230468ec9fbf00b53ca890b8c336378d39ea3cec0512f8e7f gst-plugins-base-1.18.3.tar.xz"
+sha512sums="c750d68404462807ff03f441e232c4d98752a9bceeec3038fb37a105942f25499bde0660ca688b6f3204c58eb6a2e3f33671e979018c8bd829e7591455961a6a gst-plugins-base-1.18.4.tar.xz"
diff --git a/main/gstreamer/APKBUILD b/main/gstreamer/APKBUILD
index cffedc0bd1..f90d18c806 100644
--- a/main/gstreamer/APKBUILD
+++ b/main/gstreamer/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gstreamer
-pkgver=1.18.3
+pkgver=1.18.4
pkgrel=0
pkgdesc="GStreamer streaming media framework"
url="https://gstreamer.freedesktop.org"
@@ -13,6 +13,11 @@ makedepends="$depends_dev bison flex glib-dev gobject-introspection-dev
libcap-dev meson perl"
source="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$pkgver.tar.xz"
+# secfixes:
+# 1.18.4-r0:
+# - CVE-2021-3497
+# - CVE-2021-3498
+
build() {
abuild-meson \
-Dintrospection=enabled \
@@ -41,4 +46,4 @@ doc() {
replaces="${pkgname}1-doc"
}
-sha512sums="c0258fb1f233facec72b5004d33d36871b11235d369e7f1f1e0597c5880bef89a5337550fa8b285688b5c9f42dac6e7d1f1208076d4b90a09363d2805e0dfba9 gstreamer-1.18.3.tar.xz"
+sha512sums="5312c621fc354b35cc81f53b4ec65c661ad2c22acef2640bc27860234243d06e00e3aaf41c93d379d8424c0ecdf2ae06096dec0d0313215426348ffa0afb3c4a gstreamer-1.18.4.tar.xz"
diff --git a/main/gtest/APKBUILD b/main/gtest/APKBUILD
index 62d78346ef..4c34dd55f2 100644
--- a/main/gtest/APKBUILD
+++ b/main/gtest/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=gtest
pkgver=1.10.0
-pkgrel=1
+pkgrel=2
pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit)"
url="https://github.com/google/googletest"
arch="all"
diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD
index 3a1e25e9fb..792da9b751 100644
--- a/main/gtk+3.0/APKBUILD
+++ b/main/gtk+3.0/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gtk+3.0
-pkgver=3.24.23
-pkgrel=2
+pkgver=3.24.28
+pkgrel=0
pkgdesc="The GTK+ Toolkit (v3)"
url="https://www.gtk.org/"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
@@ -118,6 +118,6 @@ doc() {
default_doc
}
-sha512sums="fe3d677f4922b4568ef406c318ac71e26aac22b808d8d42b516d0e142d38dc12bc97d8a903dfe3e819adf491b9437a49f34213bc67219bee92692e40c6ef564e gtk+-3.24.23.tar.xz
+sha512sums="65856ae06e4a863c56b3718c0cc3d0ca9f61a62a02ddef30904432300cd455851efee3fa1e5661659eaacbdfca45650ee7c8a2d4eca004ad2936c1e26c720c15 gtk+-3.24.28.tar.xz
e4ea76484b70bd9beb65b2964bbcff3b3f78f5f6fe70b12309a7721ca134e3735e8aaac09803f93b393a6130a703f8f346c0df89ad45d18c580dac1e0e922276 10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch
b97ccd8fb78d7c32fe91607befd6a7c0dd969fbfc9c242948fc88085133e3461583a0b18ade199b73f9659cae5f5525b940e66535a6ced4b916af9a88b3cc578 check-version.py"
diff --git a/main/gtk-doc/APKBUILD b/main/gtk-doc/APKBUILD
index c3c81faac3..fecc7077ea 100644
--- a/main/gtk-doc/APKBUILD
+++ b/main/gtk-doc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gtk-doc
pkgver=1.33.2
-pkgrel=0
+pkgrel=1
pkgdesc="Documentation tool for public library API"
url="https://www.gtk.org/gtk-doc/"
arch="noarch"
diff --git a/main/haproxy/APKBUILD b/main/haproxy/APKBUILD
index 38da6dc2a6..cffa764fde 100644
--- a/main/haproxy/APKBUILD
+++ b/main/haproxy/APKBUILD
@@ -4,7 +4,7 @@
pkgname=haproxy
# NOTE: Upgrade only to LTS versions announced on upstream site url!
# Using LTS versions is easier to keep it in good shape for stable releases
-pkgver=2.2.9
+pkgver=2.2.14
_pkgmajorver=${pkgver%.*}
pkgrel=0
pkgdesc="A TCP/HTTP reverse proxy for high availability environments"
@@ -57,6 +57,6 @@ package() {
"$pkgdir"/etc/haproxy/haproxy.cfg
}
-sha512sums="579af88b53c626ff05facbe452e28e3dc8195579be7c02c0b64d2a241332311b41ff3f0b38557fe342d663d4b94be1e0812db6804042139cef943cfa79b8a246 haproxy-2.2.9.tar.gz
+sha512sums="ec5e2bf0c38a9af878f69f062e81e096b849c3ae93957bbcddc32f7c0e972d678136c8f06a16e594b60b7e2f41228e8179e93b4b0a3478ab775bece6745db877 haproxy-2.2.14.tar.gz
4aa8fc812079baf1d17cf9484a9b44568c3dd94f35243a57a4a7868e7f88146a4e94c80ea8ab86f1b08a524567e269a3ec119b67fc679f6bd0d9f1c70ce4f080 haproxy.initd
26bc8f8ac504fcbaec113ecbb9bb59b9da47dc8834779ebbb2870a8cadf2ee7561b3a811f01e619358a98c6c7768e8fdd90ab447098c05b82e788c8212c4c41f haproxy.cfg"
diff --git a/main/harfbuzz/APKBUILD b/main/harfbuzz/APKBUILD
index bbdd0a3a37..7b6d40fa9e 100644
--- a/main/harfbuzz/APKBUILD
+++ b/main/harfbuzz/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpinelinux@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=harfbuzz
-pkgver=2.7.4
-pkgrel=1
+pkgver=2.8.1
+pkgrel=0
pkgdesc="Text shaping library"
url="https://freedesktop.org/wiki/Software/HarfBuzz"
arch="all"
@@ -24,7 +24,7 @@ build() {
-Dicu=enabled \
-Dfreetype=enabled \
-Dcairo=enabled \
- -Dgtk_doc=enabled \
+ -Ddocs=enabled \
. output
meson compile ${JOBS:+-j ${JOBS}} -C output
}
@@ -57,4 +57,4 @@ utils() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="5b412e0f6d1c9142a0ef2713826cb8d6ebf348c5b64054a0676d3ce084bcff1de375dadf90e87dbbf6d0ec8e4a99339cb64b514d5464efb7e27037551e494099 harfbuzz-2.7.4.tar.gz"
+sha512sums="16e43b9182d3ebd2394c2c0e0df815ca9e715d55dc7e46de4eafcde49ddf59cccae69a5340e05c8aa2ee6bc2ba46d1cffae8252d1b2a004ffe9d70c62628cf73 harfbuzz-2.8.1.tar.gz"
diff --git a/main/haserl/APKBUILD b/main/haserl/APKBUILD
index 11921d8939..a27937baeb 100644
--- a/main/haserl/APKBUILD
+++ b/main/haserl/APKBUILD
@@ -2,8 +2,8 @@
_luaversions="5.3 5.2 5.1"
_defaultlua="5.3"
pkgname=haserl
-pkgver=0.9.35
-pkgrel=1
+pkgver=0.9.36
+pkgrel=0
pkgdesc="Html And Shell Embedded Report Language"
url="http://haserl.sourceforge.net/"
arch="all"
@@ -16,9 +16,13 @@ for _i in $_luaversions; do
makedepends="$makedepends lua$_i-dev"
subpackages="$subpackages haserl-lua$_i:split_${_i/./_}"
done
-options="suid"
+options="suid !check" # no test suite
source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+# secfixes:
+# 0.9.36-r0:
+# - CVE-2021-29133
+
_sdir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_sdir"
@@ -75,4 +79,4 @@ for _i in $_luaversions; do
eval "split_${_i/./_}() { _split $_i; }"
done
-sha512sums="f0f2fc46540223b4b5369fe13b3020bed5e0578b7ca1ed1688f01678ba5302c876540c0d58dde427f9180915fa38cfffd01f1a4cbbc0fce851789056b3665ab0 haserl-0.9.35.tar.gz"
+sha512sums="727c6b4cf26bb7fd9d55c328dcca47dc0093b2836cd4874ad28a9c07d9ad4c82c22b899f64df33bad37325f66ce1af8aec1fe0a90e42b9f6cc06b01afe3062d9 haserl-0.9.36.tar.gz"
diff --git a/main/hdparm/APKBUILD b/main/hdparm/APKBUILD
index 3da1512c7c..eda129a05b 100644
--- a/main/hdparm/APKBUILD
+++ b/main/hdparm/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=hdparm
-pkgver=9.60
+pkgver=9.61
pkgrel=0
pkgdesc="Utility for manipulating IDE device parameters"
url="https://sourceforge.net/projects/hdparm"
@@ -28,4 +28,4 @@ package() {
install -D -m644 LICENSE.TXT "$pkgdir"/usr/share/licenses/hdparm/LICENSE.TXT
}
-sha512sums="e40b3b48b409014acd0ec0bd7ff821e850b127627b1f5114c442eeaf0b93f02c6933f93a221037255499b741071c0a5cb4d9cf7f9a06ff92a416caf82673a0ed hdparm-9.60.tar.gz"
+sha512sums="d46c7681d9000d09a8f59b0b6084bb80118c806e124fbfe8903411aafb05101bb2134b8890bd96f1c542fa1061e660ceb546c369ce008961ca0d263eebd841ce hdparm-9.61.tar.gz"
diff --git a/main/help2man/APKBUILD b/main/help2man/APKBUILD
index 33b7d51a53..b88756dd80 100644
--- a/main/help2man/APKBUILD
+++ b/main/help2man/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=help2man
-pkgver=1.48.2
+pkgver=1.48.3
pkgrel=0
pkgdesc="Create simple man pages from --help output"
url="https://www.gnu.org/software/help2man"
@@ -28,4 +28,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="ddd3bde5b9b0e84e21cc03dec713469562b02aac7f4b465fbf18844fc9534e8975ec41f44474fcf1b06816eb9b4e0578eb974a6c9712b6f099d7be813f6d7528 help2man-1.48.2.tar.xz"
+sha512sums="e000e7380604c0986b14cb64b852d55eff48595884bddd389e876056dde6ce72b37aa16d92230e6f8f6e128003b819954bae4aa90933a58b51d3665d3c0ba356 help2man-1.48.3.tar.xz"
diff --git a/main/highlight/APKBUILD b/main/highlight/APKBUILD
index cca54e5660..4d456ad493 100644
--- a/main/highlight/APKBUILD
+++ b/main/highlight/APKBUILD
@@ -3,7 +3,7 @@
_luaver=5.4
pkgname=highlight
pkgver=3.62
-pkgrel=0
+pkgrel=1
pkgdesc="Fast and flexible source code highlighter"
url="http://www.andre-simon.de/doku/highlight/highlight.html"
arch="all !mips !mips64" # Segfault during build
diff --git a/main/hostapd/APKBUILD b/main/hostapd/APKBUILD
index bf078d3fc8..848cd883e6 100644
--- a/main/hostapd/APKBUILD
+++ b/main/hostapd/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=hostapd
pkgver=2.9
-pkgrel=2
+pkgrel=3
pkgdesc="daemon for wireless software access points"
url="https://w1.fi/hostapd/"
arch="all"
@@ -15,11 +15,14 @@ source="https://w1.fi/releases/$pkgname-$pkgver.tar.gz
0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
+ CVE-2021-30004.patch::https://w1.fi/cgit/hostap/patch/?id=a0541334a6394f8237a4393b7372693cd7e96f15
"
options="!check" #no testsuite
builddir="$srcdir"/$pkgname-$pkgver/hostapd
# secfixes:
+# 2.9-r3:
+# - CVE-2021-30004
# 2.9-r2:
# - CVE-2020-12695
# 2.9-r1:
@@ -106,4 +109,5 @@ b54b7c6aa17e5cb86a9b354a516eb2dbefb544df18471339c61d82776de447011a2ac290bea1e6c8
63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38 CVE-2019-16275.patch
b76bbca282a74ef16c0303e5dbd2ccd33a62461595964d52c1481b0bfa4f41deacde56830b85409b288803b87ceb6f33cf0ccc69c5b17ec632c2d4784b872f3c 0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
00cc739e78c42353a555c0de2f29defecff372927040e14407a231d1ead7ff32a37c9fd46bea7cdf1c24e3ac891bc3d483800d44fc6d2c8a12d2ae886523b12c 0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
-69243af20cdcfa837c51917a3723779f4825e11436fb83311355b4ffe8f7a4b7a5747a976f7bf923038c410c9e9055b13b866d9a396913ad08bdec3a70e9f6e0 0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch"
+69243af20cdcfa837c51917a3723779f4825e11436fb83311355b4ffe8f7a4b7a5747a976f7bf923038c410c9e9055b13b866d9a396913ad08bdec3a70e9f6e0 0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
+88608529763a6fd9e8cb1e9c9a35630dc2e311a260e023e2a69002d0db700d5f58fc7723a00433b4ea895b92c371cf1db221f38742490b4ed9b4b049892b65e1 CVE-2021-30004.patch"
diff --git a/main/htop/APKBUILD b/main/htop/APKBUILD
index 5ecaf0430b..ae06d40154 100644
--- a/main/htop/APKBUILD
+++ b/main/htop/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=htop
pkgver=3.0.5
-pkgrel=1
+pkgrel=2
pkgdesc="Interactive process viewer"
url="https://htop.dev/"
arch="all"
diff --git a/main/hylafaxplus/APKBUILD b/main/hylafaxplus/APKBUILD
index fe2749f894..930ddaf521 100644
--- a/main/hylafaxplus/APKBUILD
+++ b/main/hylafaxplus/APKBUILD
@@ -3,7 +3,7 @@
pkgname=hylafaxplus
_pkgname=hylafax
pkgver=7.0.3
-pkgrel=0
+pkgrel=1
pkgdesc="Making the Premier Open-Source Fax Management System Even Better"
url="http://hylafax.sourceforge.net"
arch="all"
@@ -11,15 +11,16 @@ license="MIT"
# check/test not supported from upstream
options="!check"
depends="ghostscript bash tiff-tools !$_pkgname"
-makedepends="zlib-dev tiff-dev<4.2 gettext-dev openldap-dev lcms2-dev
+makedepends="zlib-dev tiff-dev gettext-dev openldap-dev lcms2-dev
libffi-dev jbig2dec-dev sed readline-dev"
-subpackages="$pkgname-doc $pkgname-lang $pkgname-openrc"
+subpackages="$pkgname-dbg $pkgname-doc $pkgname-lang $pkgname-openrc"
source="https://downloads.sourceforge.net/hylafax/$_pkgname-$pkgver.tar.gz
$pkgname.initd
$pkgname.confd
common-functions-busybox-awk.patch
no-locale.patch
utf8-dictionary.patch
+ libtiff-version.patch
"
builddir="$srcdir"/$_pkgname-$pkgver
@@ -99,4 +100,5 @@ sha512sums="938a21e4573fdf12bbc03dfee85e00555e7790a83a26316ac9cd1983501860858175
a2117eddc8f0ff70a23a90f2001dcb88c5bddee46ffa021d6d1701cc5cfc3bcb0362ead2b1b1ce2b288992728053c5947466d08916649f45e7dfb1876576e50f hylafaxplus.confd
41ae2055a7781d83fc275aafe18ced0fe75ba79d3ad7d5096eabaeae3a514b564723185dd33820268577174f6c53bfcfddb30922ba50754b15c5c3b0abbec837 common-functions-busybox-awk.patch
4a1243daff9904e6395c3e28aa4a78a74de99f5aa9dbf5055a3781acfcd9b1b3db42b1569409b27e3ef9b0e55272dc99122436a79a08c9a1c140c2547c5a2c15 no-locale.patch
-f5f1e33897a91b8297311c033d50e7ea2f9088568264a5b9224285066a504da8cc4296f973dd0a70e09abca538cef26964c6181f4f67f76400783d0697f05e61 utf8-dictionary.patch"
+f5f1e33897a91b8297311c033d50e7ea2f9088568264a5b9224285066a504da8cc4296f973dd0a70e09abca538cef26964c6181f4f67f76400783d0697f05e61 utf8-dictionary.patch
+d2b4bb51b657dbeb8c823eef1e8fadeb5227577fe460ad950a7f0c78c5ee0cb2211b3dff1ef91810f2054082852b0183cbdf1a6b612ac922f3557ede7d63b8ff libtiff-version.patch"
diff --git a/main/hylafaxplus/libtiff-version.patch b/main/hylafaxplus/libtiff-version.patch
new file mode 100644
index 0000000000..ae2b5d0fe7
--- /dev/null
+++ b/main/hylafaxplus/libtiff-version.patch
@@ -0,0 +1,13 @@
+diff --git a/configure b/configure
+index 7456dcb..50f218b 100755
+--- a/configure
++++ b/configure
+@@ -2583,7 +2583,7 @@ EOF
+ echo '#define TIFFSTRIPBYTECOUNTS uint32'
+ echo '#define TIFFVERSION TIFF_VERSION'
+ echo '#define TIFFHEADER TIFFHeader';;
+- 4.[01]) tiff_runlen_t="uint32"
++ 4.*) tiff_runlen_t="uint32"
+ tiff_offset_t="uint64"
+ echo '#define TIFFSTRIPBYTECOUNTS uint64'
+ echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'
diff --git a/main/iaxmodem/APKBUILD b/main/iaxmodem/APKBUILD
index 545fee0a09..e9b162b2e1 100644
--- a/main/iaxmodem/APKBUILD
+++ b/main/iaxmodem/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Cameron Banta <cbanta@gmail.com>
pkgname=iaxmodem
pkgver=1.3.2
-pkgrel=0
+pkgrel=2
pkgdesc="Softmodem for hylafax that connects to VOIP gateway with IAX"
url="http://iaxmodem.sourceforge.net/"
arch="all"
@@ -12,9 +12,10 @@ depends=""
depends_dev=""
makedepends="$depends_dev tiff-dev"
install=""
-subpackages="$pkgname-doc"
+subpackages="$pkgname-dbg $pkgname-doc"
source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
iaxmodem-fix.patch
+ fix-use-after-free.patch
config.guess
config.sub
$pkgname.confd
@@ -71,9 +72,12 @@ package() {
}
-sha512sums="ec53be179c5651825dc4e0883d8bdd33662e477b964e3130c94ca46c6d9b628a1087d33f87bebe005e306b52d75cd00407958403d9d175944fba0f5d69d34269 iaxmodem-1.3.2.tar.gz
+sha512sums="
+ec53be179c5651825dc4e0883d8bdd33662e477b964e3130c94ca46c6d9b628a1087d33f87bebe005e306b52d75cd00407958403d9d175944fba0f5d69d34269 iaxmodem-1.3.2.tar.gz
999ba9d554ffa8ecb00b4e18b2e25d0c077a64560985ffc035fe89dedf7ff9686c347aba16a0bc05ad9a4d11e17b9ddad3b99772b2b61e1fcaea00c63bcbb897 iaxmodem-fix.patch
+5efbb8d430e2d216732d28a91f5b8acef554ce7ef14cb9d8c14f56292b704f35946faa3c24c3c655c0669bdd8a0279985d4f37dc7dfad05ae53c0d902d8941ef fix-use-after-free.patch
ec32c1c81a460033d1b419292f408974409d08cfc754af92ca5af303cc848fc5dc3a019028c6724346e96ab5d600519862fd9a2c3f01ae6cf7139ff377de4b80 config.guess
fb999aada492f963fdf86184629a7351e5ff3adac6f4707a2d150ae18cea02478b4ebcb1d2d0bd11698ed74415d2a73bc07d8c0d96a5035bd567d2738fa73128 config.sub
c5b01eecd8048a99777c0265bc31cd8dcafa7ab2b30798500ec52e759f4ad97ffc13e8e72ad3018e9cd77b2acefdbbe7125b0b0d7f7cefd4ab6d764c690c89a1 iaxmodem.confd
-5e62ae6ea099db21e5f3ce319a28b3e6a9da1a2283fd29404126b486209119cfcf32628e9d3f3323522db30dbf052378f654f9498cd1ae75a447d44005b1f587 iaxmodem.initd"
+5e62ae6ea099db21e5f3ce319a28b3e6a9da1a2283fd29404126b486209119cfcf32628e9d3f3323522db30dbf052378f654f9498cd1ae75a447d44005b1f587 iaxmodem.initd
+"
diff --git a/main/iaxmodem/fix-use-after-free.patch b/main/iaxmodem/fix-use-after-free.patch
new file mode 100644
index 0000000000..e874e7af57
--- /dev/null
+++ b/main/iaxmodem/fix-use-after-free.patch
@@ -0,0 +1,142 @@
+https://sourceforge.net/p/iaxmodem/code/46/
+https://sourceforge.net/p/iaxmodem/discussion/497500/thread/b2469a0d1a/
+
+Index: iaxmodem.c
+===================================================================
+--- ./iaxmodem.c (revision 45)
++++ ./iaxmodem.c (working copy)
+@@ -543,7 +543,7 @@
+ printlog(LOG_INFO, "Answering\n");
+
+ /* Unset V.24 Circuit 125, "ring indicator". */
+- int tioflags;
++ int tioflags = 0;
+ ioctl(aslave, TIOCMGET, &tioflags);
+ tioflags &= ~TIOCM_RI;
+ ioctl(aslave, TIOCMSET, &tioflags);
+@@ -762,7 +762,7 @@
+ int16_t iaxbuf[VOIP_PACKET_SIZE];
+ static t31_state_t t31_state;
+ int t31buflen;
+- int tioflags;
++ int tioflags = 0;
+ struct group *grent;
+ char *devgroup;
+ char *pmode;
+Index: lib/libiax2/src/iax.c
+===================================================================
+--- ./lib/libiax2/src/iax.c (revision 45)
++++ ./lib/libiax2/src/iax.c (working copy)
+@@ -3283,20 +3283,7 @@
+ /* It's been acked. No need to send it. Destroy the old
+ frame. If final, destroy the session. */
+ if (frame->final)
+- /* sskacar: Quick deallocation and allocation of sessions may result in
+- the same-address-use ! Therefore we cannot trust remote-sent address only
+- Best bet is checking by somewhat unique properties to decide
+- if we really intend to destroy this session.
+- Example Case:
+- - Have a call
+- - Dump that call and immediately request a new call (or have a incoming call request by a lesser chance)
+- - By considerable probability, you might get the previous address for the session.
+- - When execution hits to this point as a result of previous call ending
+- (as client informs server about dumping and frees the previous session,
+- server proccess call-dumping and eventually this point reached)
+- - frame->session param to the destroy_session() belongs to the new & valid session ! */
+- if (frame->session && (frame->callno == frame->session->callno))
+- destroy_session(frame->session);
++ destroy_session(frame->session);
+ if (frame->data)
+ free(frame->data);
+ free(frame);
+Index: lib/spandsp/src/at_interpreter.c
+===================================================================
+--- ./lib/spandsp/src/at_interpreter.c (revision 45)
++++ ./lib/spandsp/src/at_interpreter.c (working copy)
+@@ -44,6 +44,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <assert.h>
++#include <syslog.h>
+
+ #include "spandsp/telephony.h"
+ #include "spandsp/logging.h"
+@@ -672,43 +673,6 @@
+ }
+ /*- End of function --------------------------------------------------------*/
+
+-static int parse_string_out(at_state_t *s, const char **t, char **target, const char *prefix)
+-{
+- char buf[100];
+-
+- switch (*(*t)++)
+- {
+- case '=':
+- switch (**t)
+- {
+- case '?':
+- /* Show possible values */
+- (*t)++;
+- snprintf(buf, sizeof(buf), "%s", (prefix) ? prefix : "");
+- at_put_response(s, buf);
+- break;
+- default:
+- /* Set value */
+- if (*target)
+- free(*target);
+- /* If this strdup fails, it should be harmless */
+- *target = strdup(*t);
+- break;
+- }
+- break;
+- case '?':
+- /* Show current index value */
+- at_put_response(s, (*target) ? *target : "");
+- break;
+- default:
+- return FALSE;
+- }
+- while (*t)
+- t++;
+- return TRUE;
+-}
+-/*- End of function --------------------------------------------------------*/
+-
+ static const char *s_reg_handler(at_state_t *s, const char *t, int reg)
+ {
+ int val;
+@@ -4965,10 +4929,31 @@
+ {
+ /* Extension of V.253 +VCID, Set calling number ID */
+ t += 5;
+- if (!parse_string_out(s, &t, &s->local_id, NULL))
++ switch (*t)
++ {
++ case '=':
++ switch (*(t+1))
++ {
++ case '?':
++ /* Show possible values */
++ at_put_response(s, "");
++ break;
++ default:
++ /* Set value */
++ s->local_id = strdup(t + 1);
++ if (at_modem_control(s, AT_MODEM_CONTROL_SETID, s->local_id) < 0)
++ return NULL;
++ break;
++ }
++ break;
++ case '?':
++ /* Show current index value from def */
++ at_put_response(s, (s->local_id) ? s->local_id : "");
++ break;
++ default:
+ return NULL;
+- if (at_modem_control(s, AT_MODEM_CONTROL_SETID, s->local_id) < 0)
+- return NULL;
++ }
++ while (*t) t++;
+ return t;
+ }
+ /*- End of function --------------------------------------------------------*/
diff --git a/main/ifupdown-ng/APKBUILD b/main/ifupdown-ng/APKBUILD
index cd42bb6f48..faefe4a3ba 100644
--- a/main/ifupdown-ng/APKBUILD
+++ b/main/ifupdown-ng/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=ifupdown-ng
-pkgver=0.10.2
-pkgrel=2
+pkgver=0.11.2
+pkgrel=0
pkgdesc="tools for managing network configuration"
url="https://github.com/ifupdown-ng/ifupdown-ng"
arch="all"
@@ -9,7 +9,7 @@ license="ISC"
checkdepends="kyua atf"
makedepends="scdoc"
install=""
-subpackages="$pkgname-doc $pkgname-iproute2 $pkgname-ppp $pkgname-wireguard $pkgname-ethtool $pkgname-batman"
+subpackages="$pkgname-doc $pkgname-iproute2 $pkgname-ppp $pkgname-wireguard $pkgname-ethtool $pkgname-batman $pkgname-wifi"
source="https://distfiles.dereferenced.org/ifupdown-ng/ifupdown-ng-$pkgver.tar.xz"
builddir="$srcdir/ifupdown-ng-$pkgver"
provides="ifupdown-any"
@@ -28,10 +28,10 @@ _executor_stubs="bridge bond"
# These are optional executors which do not conflict with what we are
# presently shipping. These executors require iproute2.
-_executor_iproute2="vrf gre vxlan"
+_executor_iproute2="vrf gre vxlan mpls"
# These are all optional executors we plan to use.
-_executor_opt="ppp wireguard ethtool batman $_executor_iproute2"
+_executor_opt="ppp wireguard ethtool batman wifi $_executor_iproute2"
build() {
make
@@ -88,6 +88,14 @@ batman() {
amove usr/libexec/ifupdown-ng/batman
}
+wifi() {
+ pkgdesc="ifupdown-ng integration for wifi"
+ depends="wpa_supplicant"
+ install_if="$pkgname $depends"
+
+ amove usr/libexec/ifupdown-ng/wifi
+}
+
openrc() {
pkgdesc="ifupdown-ng openrc init scripts"
install_if="$pkgname openrc"
@@ -97,4 +105,4 @@ openrc() {
install -D -m644 "$builddir"/dist/openrc/networking.confd "$subpkgdir"/etc/conf.d/networking
}
-sha512sums="b824e40cfafd9dc831f2adc547fb2877947ab264418b410be757686f62a8799fd2ad6101d673b9a7af5cd9f6bc4ccfb5a86a184aaeee25ff1a2e1db3e9c511c6 ifupdown-ng-0.10.2.tar.xz"
+sha512sums="31009bfe07b45dac49b492f8150526f13a59c164e9f71304b73a7faa4fb154ae22dbdcf5d6d7b8fde6022414522ffc15fd49289ff3bab17c63e2398ac5a985dc ifupdown-ng-0.11.2.tar.xz"
diff --git a/main/inih/APKBUILD b/main/inih/APKBUILD
index 837de99841..83144cef4e 100644
--- a/main/inih/APKBUILD
+++ b/main/inih/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer:
pkgname=inih
pkgver=53
-pkgrel=0
+pkgrel=1
pkgdesc="Simple .INI file parser for embedded systems"
options="!check" # No testsuite in Meson, unittests always return 0
url="https://github.com/benhoyt/inih"
diff --git a/main/iperf/APKBUILD b/main/iperf/APKBUILD
index 4e8497dc38..8bc2327012 100644
--- a/main/iperf/APKBUILD
+++ b/main/iperf/APKBUILD
@@ -36,7 +36,7 @@ package() {
install -D -m0644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
}
-sha512sums="7ef370bdbf5b0b38925d81fedc0c5b4afaa083e7212bff34b4f3577ac9ca595a672160bc5d7bdc20d161673880a59073ee1ac5f15099de743fdb00b490039c56 iperf-2.0.14a.tar.gz
+sha512sums="1fb1ea024976922430953f85bac3a45b6fdf5ff2e567cbe41b64cf91a44d471facca5995c4a629db01bd95ce7165c93e0b40c544770e7bd21b5376713661b773 iperf-2.0.14a.tar.gz
7dcd51fa77f7e8bd9a14339f61f93f591d74a86c767dbdc1d6035b6f7f4ce6fec34e8880caf68eab301640250b579b495274f2454c48b9601455ec46abab8949 iperf.initd
fb5e155fff568a72488cc1511d30358835a48bcce309f8f46d040160932b4a4ccb85040c27c60dee477900a25bd34c50eac21d1d0bea984b40faa401be2ba7e8 iperf.confd
3ef92f0a096f3cf378187788c8a0a0ff8f75e38954d048ec023c47f5bc64adda575b99e2d5d3030e07a19814a50ec8b5d215d23d2587ecb188b590c11544c7df long-to-time-t.patch"
diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD
index 96e5fa2e11..5772e17a5e 100644
--- a/main/iproute2/APKBUILD
+++ b/main/iproute2/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=iproute2
-pkgver=5.11.0
+pkgver=5.12.0
pkgrel=0
pkgdesc="IP Routing Utilities"
options="!check" # Requires namespaces support and root
@@ -83,4 +83,4 @@ bashcomp() {
rmdir -p "$pkgdir"/usr/share 2>/dev/null || true
}
-sha512sums="8d0e7efc20db70af2d344962610b7fb7f464da567f63e094a2e2a9915f6e9087a2282163d2c73eb2065aaec4f0b0cf19614253798153b31e34b06f57e704f3ed iproute2-5.11.0.tar.xz"
+sha512sums="9249beb67b30ceef178b60b2b61a5e6c45277e747ae4c865e739b7ab84192549e8e94ebaee43c0a87c0291037746ffb6936346245220786e369201ee13d60fac iproute2-5.12.0.tar.xz"
diff --git a/main/iptables/APKBUILD b/main/iptables/APKBUILD
index d8738c06b5..06623671f5 100644
--- a/main/iptables/APKBUILD
+++ b/main/iptables/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=iptables
pkgver=1.8.7
-pkgrel=0
+pkgrel=1
pkgdesc="Linux kernel firewall, NAT and packet mangling tools"
url="https://www.netfilter.org/projects/iptables/index.html"
arch="all"
@@ -78,8 +78,8 @@ ip6tables_openrc() {
}
sha512sums="c0a33fafbf1139157a9f52860938ebedc282a1394a68dcbd58981159379eb525919f999b25925f2cb4d6b18089bd99a94b00b3e73cff5cb0a0e47bdff174ed75 iptables-1.8.7.tar.bz2
-19cb376bd7a48889daa41ae34d31dfbeac1c277476496e3a1901dc91775c8f596681e0cbccd5c4618158de45da24fcc378a9beb426d79ce26bf46b54599126fe iptables.initd
cb7fecd5cab2c78bd3f215a41f39ec11c37eb360efbe83982378a0e647e0aa9dc0b7ec915a5b5081aa2f7747464787e69404aa15ba15a063c32cb8fb7dd13d1e iptables.confd
0897a7a22f8b700f7f1f5c355ad6cbf39740e44d6c962af99e479978d8a2d556ca7fe4e31f238829046b4a871ce0b5fd52e2544f1361d15dd1ea3e33992646c4 ip6tables.confd
+a37c17a5382c756fcfb183af73af2283f0d09932c5a767241cbab5d784738f6f587f287a0cdf13b4fa74724ecd3a2063a9689ccee84c1bda02e730f63480f74d iptables.initd
8809d6fc69fbaa7d83ca4675d9e605f73e74ea8907495d39abdfbdca5c74bafb4fe0e413c88a4bd9470688a243581fa239527af06be15c9c94190664d9557fca ebtables.initd
1623109d7b564b817904e35b6c6964ce84fe123a8ae1b656944648a39cfef719431cfad313b48eb36ae53a0d1a6b388a5caec1a990448d02f77e5d12b1f7ee9d ebtables.confd"
diff --git a/main/iptables/iptables.initd b/main/iptables/iptables.initd
index d158e3d625..0f906eed7e 100644
--- a/main/iptables/iptables.initd
+++ b/main/iptables/iptables.initd
@@ -43,7 +43,7 @@ set_table_policy() {
esac
local chain
for chain in ${chains} ; do
- ${iptables_bin} -t ${table} -P ${chain} ${policy}
+ ${iptables_bin} -w 5 -t ${table} -P ${chain} ${policy}
done
}
@@ -91,8 +91,8 @@ stop() {
for a in $(cat ${iptables_proc}) ; do
set_table_policy $a ACCEPT
- ${iptables_bin} -F -t $a
- ${iptables_bin} -X -t $a
+ ${iptables_bin} -w 5 -F -t $a
+ ${iptables_bin} -w 5 -X -t $a
done
eend $?
}
@@ -102,8 +102,8 @@ reload() {
ebegin "Flushing firewall"
local a
for a in $(cat ${iptables_proc}) ; do
- ${iptables_bin} -F -t $a
- ${iptables_bin} -X -t $a
+ ${iptables_bin} -w 5 -F -t $a
+ ${iptables_bin} -w 5 -X -t $a
done
eend $?
@@ -126,8 +126,8 @@ panic() {
local a
ebegin "Dropping all packets"
for a in $(cat ${iptables_proc}) ; do
- ${iptables_bin} -F -t $a
- ${iptables_bin} -X -t $a
+ ${iptables_bin} -w 5 -F -t $a
+ ${iptables_bin} -w 5 -X -t $a
set_table_policy $a DROP
done
diff --git a/main/ircii/APKBUILD b/main/ircii/APKBUILD
index ce9b8f624f..79977d55db 100644
--- a/main/ircii/APKBUILD
+++ b/main/ircii/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ircii
-pkgver=20190117
+pkgver=20210314
pkgrel=1
pkgdesc="Universal IRC for Unix systems"
url="http://www.eterna.com.au/ircii/"
@@ -11,6 +11,10 @@ makedepends="ncurses-dev openssl-dev"
subpackages="$pkgname-doc"
source="http://ircii.warped.com/ircii-$pkgver.tar.bz2"
+# secfixes:
+# 20210314-r0:
+# - CVE-2021-29376
+
build() {
./configure \
--build=$CBUILD \
@@ -24,4 +28,4 @@ package() {
make -j1 DESTDIR="$pkgdir" install
}
-sha512sums="08ca96cd62bae35245b40791c8588752b96136b53e5c9434d0f7976d03841fca80e8c83cf8608aad79c381820b06e00167447c6dc0c6294c6b3dfd91a9fdb6d4 ircii-20190117.tar.bz2"
+sha512sums="3dc3a4ddb000133907edb9b867ae7cb0b36488c875f5d4f56e70d7263cf042da6c429f60a8ed6cced89bca077aec42c9d992ea6b56b2ed8b4e91f125eeced310 ircii-20210314.tar.bz2"
diff --git a/main/irqbalance/APKBUILD b/main/irqbalance/APKBUILD
index 5345c571c8..bd7971ca1a 100644
--- a/main/irqbalance/APKBUILD
+++ b/main/irqbalance/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=irqbalance
-pkgver=1.7.0
+pkgver=1.8.0
pkgrel=0
pkgdesc="Daemon that distributes interrupts over the processors"
url="https://github.com/Irqbalance/irqbalance"
@@ -49,6 +49,6 @@ package() {
install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
}
-sha512sums="2fa29c738275dda2fac38d78ca0ec4619826b72529e8eda7ad8ddcda5768bbf282e2260dddc16a8b46d4296289b25dc59684575ae1badca0c6c6ae30b1e9b5ea irqbalance-1.7.0.tar.gz
+sha512sums="3d757198dbe680b010ed9233d73cbf3b4a150e6b07ef97d3e94f5fa0472a22b0b3800868634340fb413a18683ff95ff6a8f7fa51ace65d870651336479e32740 irqbalance-1.8.0.tar.gz
90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c irqbalance.confd
ba4933d35d17c0eaec8026305411605cadfddaba28e5dbbfb55f8d4311feb04db8dc8853a3e63be55ee8ab4b0356658b2f3eba60fa0b4e59effdd1db94a255c2 irqbalance.initd"
diff --git a/main/irssi/APKBUILD b/main/irssi/APKBUILD
index 80979b84bb..d7f8c8e838 100644
--- a/main/irssi/APKBUILD
+++ b/main/irssi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=irssi
-pkgver=1.2.2
-pkgrel=4
+pkgver=1.2.3
+pkgrel=0
pkgdesc="Modular textUI IRC client with IPv6 support"
url="https://irssi.org/"
arch="all"
@@ -9,7 +9,6 @@ license="GPL-2.0-or-later WITH OpenSSL-Exception"
makedepends="glib-dev openssl-dev ncurses-dev perl-dev automake autoconf libtool libotr-dev"
subpackages="$pkgname-doc $pkgname-dev $pkgname-proxy $pkgname-perl $pkgname-otr"
source="https://github.com/irssi/irssi/releases/download/$pkgver/irssi-$pkgver.tar.xz
- glib-2-63.patch
"
# secfixes:
@@ -100,5 +99,4 @@ otr() {
mv "$pkgdir"/usr/share/irssi/help/otr "$subpkgdir"/usr/share/irssi/help/
}
-sha512sums="5444ac102ff9ad3a6399a47c967d138e181330dd226eac68886d35fee4ad455932b9306a367bee3478095158e41ba67fb46deb8f0a33512046b9b83bae37c610 irssi-1.2.2.tar.xz
-bfcdbfb1c06a13412594d5d14f4441ba06c3db3a4260aaa1c8bbfa1c68841ad1efc1c8af07f3fe4d12bb2e4c9fa7f067ace2b439745293082de6427a30242547 glib-2-63.patch"
+sha512sums="826b7bfd86a54647f2d344b6c461e1118b7382fb1637cf33c395af41a9a4ca5d8a794a415f0f0737178968cf2463bb46a0e7b7fd7014c968668b16183e0644bc irssi-1.2.3.tar.xz"
diff --git a/main/irssi/glib-2-63.patch b/main/irssi/glib-2-63.patch
deleted file mode 100644
index 63d26958b7..0000000000
--- a/main/irssi/glib-2-63.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a0544571a80196e5b7705f56e6e2cbcdf7b4d80e Mon Sep 17 00:00:00 2001
-From: ailin-nemui <ailin-nemui@users.noreply.github.com>
-Date: Thu, 23 Apr 2020 21:45:15 +0200
-Subject: [PATCH] manually handle NUL unicode in g_utf8_get_next_char_validated
-
-A change in GLib 2.63 broke some assumptions in Irssi that the null-byte
-NUL / U+0000 is a valid Unicode character. This would occur when the
-user types Ctrl+Space. As a result, the input loop never manages to
-process the NUL-byte (and any other user input that follows, ever).
-
-This patch adds a manual check that properly advances the input loop if
-GLib returns -2 (incomplete character) despite the length being positive
-and a NUL is in first position.
-
-Fixes #1180
-https://gitlab.gnome.org/GNOME/glib/-/merge_requests/967
-https://gitlab.gnome.org/GNOME/glib/-/issues/2093
----
- src/fe-text/term-terminfo.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
-index 5235f72d2..78496a64f 100644
---- a/src/fe-text/term-terminfo.c
-+++ b/src/fe-text/term-terminfo.c
-@@ -672,7 +672,11 @@ void term_stop(void)
-
- static int input_utf8(const unsigned char *buffer, int size, unichar *result)
- {
-- unichar c = g_utf8_get_char_validated((char *)buffer, size);
-+ unichar c = g_utf8_get_char_validated((char *) buffer, size);
-+
-+ /* GLib >= 2.63 do not accept Unicode NUL anymore */
-+ if (c == (unichar) -2 && *buffer == 0 && size > 0)
-+ c = 0;
-
- switch (c) {
- case (unichar)-1:
diff --git a/main/iso-codes/APKBUILD b/main/iso-codes/APKBUILD
index 18e9164f50..1572c685fd 100644
--- a/main/iso-codes/APKBUILD
+++ b/main/iso-codes/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=iso-codes
-pkgver=4.5.0
-pkgrel=0
+pkgver=4.6.0
+pkgrel=1
pkgdesc="ISO codes and their translations"
url="https://salsa.debian.org/iso-codes-team/iso-codes"
arch="noarch"
@@ -25,4 +25,4 @@ package() {
make DESTDIR="$pkgdir" pkgconfigdir=/usr/lib/pkgconfig install
}
-sha512sums="2785d57c2ae2a2d494dd361613965f7e5004b87bb6da7d020914981c4cb0de275050e8e424e3cb467f1e56889cb0dd8d9b5f9456295b4382ed3e73ce3620891d iso-codes_4.5.0.orig.tar.xz"
+sha512sums="989683dc82aa6d065e65085bc363284a4a780a461ff280f4f71e0731824be6275951d1fa54def0b35302f522c099d775ce3127743e63d4019a61b5f2bf951081 iso-codes_4.6.0.orig.tar.xz"
diff --git a/main/itstool/APKBUILD b/main/itstool/APKBUILD
index 7b1028ef99..69e78abafe 100644
--- a/main/itstool/APKBUILD
+++ b/main/itstool/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=itstool
pkgver=2.0.6
-pkgrel=0
+pkgrel=1
pkgdesc="ITS-based XML translation tool"
url="http://itstool.org/"
arch="noarch"
@@ -10,8 +10,10 @@ depends="py3-libxml2 python3"
makedepends="autoconf automake"
checkdepends="diffutils gettext"
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/itstool/itstool/archive/$pkgver.tar.gz
- fix-segfault.patch"
+source="https://github.com/itstool/itstool/archive/$pkgver/itstool-$pkgver.tar.gz
+ fix-segfault.patch
+ "
+options="net" # Tests require network access
prepare() {
default_prepare
diff --git a/main/jack/APKBUILD b/main/jack/APKBUILD
index 455defd51a..9977e79b15 100644
--- a/main/jack/APKBUILD
+++ b/main/jack/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=jack
_realname=jack2
-pkgver=1.9.17
+pkgver=1.9.18
pkgrel=0
pkgdesc="The Jack Audio Connection Kit"
url="http://www.jackaudio.org"
@@ -14,6 +14,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/jackaudio/jack2/archive/v$pk
fix-execinfo.patch
"
builddir="$srcdir"/$_realname-$pkgver
+options="!check" # no real tests provided
prepare() {
default_prepare
@@ -50,5 +51,7 @@ _clients() {
mv "$pkgdir"/usr/bin/*_* "$subpkgdir"/usr/bin/
}
-sha512sums="dff611273e23cea6fe258114c65e193f01dfa0366ddd4e6a026a3d676a32002ee744bc70085fb8568cb85395399072beec2c7f7eed8d9ec912332a2a56623521 jack-1.9.17.tar.gz
-b5abec7e67485d1c13f399b5961539177dd35d21c5dd95e0aa767adb0f5b1e588e9ca2f9b29cc4d66fc039311ff7eacc4cf21f6700ef0a2c8de99b63cb00f84d fix-execinfo.patch"
+sha512sums="
+7b9116b8002db88d9df746acf99e523cf9103c1a7955e8174912c8538b2c53bc8e7c34a64d0df4dc1f212e35035392814fdfcfe78597e26bd08ec028876bcb98 jack-1.9.18.tar.gz
+b5abec7e67485d1c13f399b5961539177dd35d21c5dd95e0aa767adb0f5b1e588e9ca2f9b29cc4d66fc039311ff7eacc4cf21f6700ef0a2c8de99b63cb00f84d fix-execinfo.patch
+"
diff --git a/main/jansson/APKBUILD b/main/jansson/APKBUILD
index 2e29bdae5f..13fc0c3b14 100644
--- a/main/jansson/APKBUILD
+++ b/main/jansson/APKBUILD
@@ -10,6 +10,10 @@ checkdepends="bash"
subpackages="$pkgname-dev"
source="http://www.digip.org/jansson/releases/jansson-$pkgver.tar.bz2"
+# secfixes:
+# 0:
+# - CVE-2020-36325
+
build() {
./configure \
--build=$CBUILD \
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index c78f2e1e1d..2bad009055 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -4,8 +4,8 @@
# Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
pkgname=kamailio
-pkgver=5.4.2
-pkgrel=3
+pkgver=5.4.5
+pkgrel=0
# If building from a git snapshot, specify the gitcommit
# If building a proper release, leave gitcommit blank or commented
@@ -33,7 +33,6 @@ makedepends="bison flex freeradius-client-dev expat-dev
# These are in testing / community - can't enable for kamailio in main
# librdkafka-dev dnssec-tools-dev
source="kamailio-${pkgver}$_suffix.tar.gz::https://github.com/kamailio/kamailio/archive/$_gitcommit.tar.gz
- tm-proper-fill-of-From-To-URI-tag-values-using-parsed.patch
kamailio.initd
"
@@ -555,6 +554,5 @@ sipdump() {
"$_mod_list_sipdump"
}
-sha512sums="944eb54fe5ec1408def842f3f1f909002ba274863ea68baa85fc70aa9abd7331647f75813ccd264ed659a794570c6d8b9c89108684de603e90b0713f33412502 kamailio-5.4.2.tar.gz
-b82dc389dc294cc09b0089ef2e846d308b937a9984a53574f0a434180341725dc025222d2bd9d9b0bb01b05bebd106412cfaf81e3150e338393a6a4012f1deb0 tm-proper-fill-of-From-To-URI-tag-values-using-parsed.patch
+sha512sums="34ad79d4d954499b3711eb12afe1c753e42c6c59d2085d2495237ecce287255510271b61284d79c0db587b75eb9adbc462c4f5470c60fda41de012f1dc41aa7b kamailio-5.4.5.tar.gz
0c87bfb78481568c03e603049eb8597a90d24ae2941fc81694181b2326fa9db89fbddaaa3cf08c7bc2f5fa0e7ffac4cf4e2d010d08c4faa6cf6df98593432539 kamailio.initd"
diff --git a/main/kamailio/tm-proper-fill-of-From-To-URI-tag-values-using-parsed.patch b/main/kamailio/tm-proper-fill-of-From-To-URI-tag-values-using-parsed.patch
deleted file mode 100644
index 694d94a425..0000000000
--- a/main/kamailio/tm-proper-fill-of-From-To-URI-tag-values-using-parsed.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From aa6e9963b2725c1b6b7e5ff995a77c222d95fa3c Mon Sep 17 00:00:00 2001
-From: Daniel-Constantin Mierla <miconda@gmail.com>
-Date: Thu, 19 Nov 2020 17:06:06 +0100
-Subject: [PATCH] tm: proper fill of From/To URI/tag values using parsed
- structure in t_uac_send()
-
----
- src/modules/tm/rpc_uac.c | 24 ++++++++++++++++++------
- 1 file changed, 18 insertions(+), 6 deletions(-)
-
-diff --git a/src/modules/tm/rpc_uac.c b/src/modules/tm/rpc_uac.c
-index cc50274f0c..dfe99d1390 100644
---- a/src/modules/tm/rpc_uac.c
-+++ b/src/modules/tm/rpc_uac.c
-@@ -593,7 +593,7 @@ void rpc_t_uac_wait(rpc_t* rpc, void* c)
-
- static int t_uac_check_msg(struct sip_msg* msg,
- str* method, str* body,
-- int* fromtag, int *cseq_is, int* cseq,
-+ str *fromtag, int *cseq_is, int* cseq,
- str* callid)
- {
- struct to_body* parsed_from;
-@@ -628,7 +628,13 @@ static int t_uac_check_msg(struct sip_msg* msg,
- }
-
- parsed_from = (struct to_body*)msg->from->parsed;
-- *fromtag = parsed_from->tag_value.s && parsed_from->tag_value.len;
-+ if(parsed_from->tag_value.s && parsed_from->tag_value.len) {
-+ fromtag->s = parsed_from->tag_value.s;
-+ fromtag->len = parsed_from->tag_value.len;
-+ } else {
-+ fromtag->s = NULL;
-+ fromtag->len = 0;
-+ }
-
- *cseq = 0;
- if (msg->cseq && (parsed_cseq = get_cseq(msg))) {
-@@ -676,7 +682,8 @@ int t_uac_send(str *method, str *ruri, str *nexthop, str *send_socket,
- struct socket_info* ssock;
- str saddr;
- int sport, sproto;
-- int ret, fromtag, cseq_is, cseq;
-+ int ret, cseq_is, cseq;
-+ str fromtag;
- dlg_t dlg;
- uac_req_t uac_req;
-
-@@ -749,7 +756,9 @@ int t_uac_send(str *method, str *ruri, str *nexthop, str *send_socket,
- */
-
- /* Generate fromtag if not present */
-- if (!fromtag) {
-+ if (fromtag.s && fromtag.len) {
-+ dlg.id.loc_tag = fromtag;
-+ } else {
- generate_fromtag(&dlg.id.loc_tag, &dlg.id.call_id, ruri);
- }
-
-@@ -758,8 +767,11 @@ int t_uac_send(str *method, str *ruri, str *nexthop, str *send_socket,
- else dlg.loc_seq.value = DEFAULT_CSEQ;
- dlg.loc_seq.is_set = 1;
-
-- dlg.loc_uri = faked_msg.from->body;
-- dlg.rem_uri = faked_msg.to->body;
-+ dlg.loc_uri = get_from(&faked_msg)->uri;
-+ dlg.rem_uri = get_to(&faked_msg)->uri;
-+ if(get_to(&faked_msg)->tag_value.len > 0) {
-+ dlg.id.rem_tag = get_to(&faked_msg)->tag_value;
-+ }
- dlg.rem_target = *ruri;
- dlg.dst_uri = *nexthop;
- dlg.send_sock=ssock;
diff --git a/main/knot/APKBUILD b/main/knot/APKBUILD
index c87795ea3d..d09f0317bf 100644
--- a/main/knot/APKBUILD
+++ b/main/knot/APKBUILD
@@ -4,7 +4,7 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=knot
-pkgver=3.0.4
+pkgver=3.0.5
pkgrel=0
pkgdesc="An high-performance authoritative-only DNS server"
url="https://www.knot-dns.cz/"
@@ -109,7 +109,7 @@ utils() {
gpg_signature_extensions="asc"
gpgfingerprints="good:742F A4E9 5829 B6C5 EAC6 B857 10BB 7AF6 FEBB D6AB"
-sha512sums="d674faaafcbe882539d28e53f1cd6cdda61ca8065f66dc0b9127f249f34b59a9d3d1ac206799c2974a2d38264842a2387db35f814bd05f3eaeac0b35b90b21ac knot-3.0.4.tar.xz
+sha512sums="b4875b3a5bef0c597d89ded3c1c87ab65952057e02f4ee79088e08fe62ee542ff737b544995bf8f2cc4dfaeac1fac230213a8492040ed80992bab8c7e8f8c786 knot-3.0.5.tar.xz
39503d16603eaff04cb34de97bff987952818d229ccb5b190567198505ece8077efdf230d5402e69ca4ab8acb282c53bfaaf495360dc11191c985a48fbb61318 test_net.patch
471d3c639a8235ba09491c99d36c0a4f1074d6055ccfd3807be02a30d3ed5bbe69a84f0414ea7810db6bbc1e38f5837108e5744fc59f949ed78a262a7de4597e knotd.confd
979f06a83dd4326920a682f8190319577faf904e0e379b3c55e0420eb43dcb55d86c6727015634fa0c2dff1dddac43bbd5a216ff04f217ad91d670eb899dbefa knotd.initd"
diff --git a/main/lcms2/APKBUILD b/main/lcms2/APKBUILD
index af8fbc6bdb..786f4a8894 100644
--- a/main/lcms2/APKBUILD
+++ b/main/lcms2/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=lcms2
pkgver=2.12
-pkgrel=0
+pkgrel=1
pkgdesc="Color Management Engine"
url="http://www.littlecms.com"
arch="all"
@@ -29,7 +29,6 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--localstatedir=/var \
- --disable-static \
--with-jpeg \
--with-tiff \
--with-zlib \
diff --git a/main/ldb/APKBUILD b/main/ldb/APKBUILD
index 8d6236679b..523893948c 100644
--- a/main/ldb/APKBUILD
+++ b/main/ldb/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ldb
-pkgver=2.2.0
-pkgrel=0
-pkgdesc="A schema-less, ldap like, API and database"
+pkgver=2.3.0
+pkgrel=1
+pkgdesc="schema-less, ldap like, API and database"
url="https://ldb.samba.org/"
arch="all"
license="LGPL-3.0-or-later"
@@ -57,5 +57,5 @@ tools() {
mv "$pkgdir"/usr/lib/ldb/libldb-cmdline.* "$subpkgdir"/usr/lib/ldb/
}
-sha512sums="3814078a51d2110eeda291ac859c0027df88475812bd6b5f2ce8f8f50aba9c84faced97c37aa1f45e406783a8df97c60ae778df897bb0e89ba3ac8568acced69 ldb-2.2.0.tar.gz
+sha512sums="7e389c0b4700a809893276d69216436ebd6d30e1f52407e4a08a1113cf14e151aed74300d8c36765c91c8f3195d8054b13a28cbdfcab031f88fd1d353e415348 ldb-2.3.0.tar.gz
ed55d5151bbcaf5c0a1b70a1f44b461a501ad94ce02ee97e3ea10c560ce3656a190510697bbd3c5b6f70a74519bf7c0a91210bcb415ffd97d9440045e10a02e8 disable-compile-error-test.patch"
diff --git a/main/less/APKBUILD b/main/less/APKBUILD
index 4f150baf97..3715a5f23a 100644
--- a/main/less/APKBUILD
+++ b/main/less/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Cameron Banta <cbanta@gmail.com>
# Maintainer: Cameron Banta <cbanta@gmail.com>
pkgname=less
-pkgver=563
+pkgver=581
pkgrel=0
pkgdesc="File pager"
url="http://www.greenwoodsoftware.com/less/"
@@ -27,4 +27,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="79384ff3faa33aeb86da6027c8b264df78f9f8c799af43dc5340e2ca3d86053c9be168140bfa05734a4217e65ef9939652b004d6a536f64b2e0ef3b74b07f535 less-563.tar.gz"
+sha512sums="b2892c73fb6e8a5cb5d5c22280c653194d6a1667a7d65a4b972a76038818cce827f1d00f266d6222e65f93fecfe1760d30109e9d2cf1aa6872b476b49eecefd9 less-581.tar.gz"
diff --git a/main/libassuan/APKBUILD b/main/libassuan/APKBUILD
index 688712385e..56aebdbd41 100644
--- a/main/libassuan/APKBUILD
+++ b/main/libassuan/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libassuan
-pkgver=2.5.4
+pkgver=2.5.5
pkgrel=0
pkgdesc="IPC library used by some GnuPG related software"
url="https://www.gnupg.org/software/libassuan/index.html"
@@ -26,4 +26,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="764993d5311c24f0c0f970016e903e1a16783a2050c42072dbc1bc4f350f119e53b0be17ed6df25a0086bc9f8c25ee4f3134330577968480997263f95e05594f libassuan-2.5.4.tar.bz2"
+sha512sums="70117f77aa43bbbe0ed28da5ef23834c026780a74076a92ec775e30f851badb423e9a2cb9e8d142c94e4f6f8a794988c1b788fd4bd2271e562071adf0ab16403 libassuan-2.5.5.tar.bz2"
diff --git a/main/libbsd/APKBUILD b/main/libbsd/APKBUILD
index 3cd5b1b724..3b76d2bdb1 100644
--- a/main/libbsd/APKBUILD
+++ b/main/libbsd/APKBUILD
@@ -1,20 +1,19 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=libbsd
-pkgver=0.10.0
+pkgver=0.11.3
pkgrel=0
pkgdesc="commonly-used BSD functions not implemented by all libcs"
url="https://libbsd.freedesktop.org/"
arch="all"
license="BSD"
-depends="musl>=1.1.16-r22"
-depends_dev="bsd-compat-headers linux-headers"
+depends="musl"
+depends_dev="bsd-compat-headers linux-headers libmd-dev"
makedepends_build="autoconf automake libtool"
makedepends_host="$depends_dev"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz
+source="https://libbsd.freedesktop.org/releases/libbsd-$pkgver.tar.xz
disable-fpurge-test.patch"
-builddir="$srcdir/$pkgname-$pkgver"
# secfixes:
# 0.10.0-r0:
@@ -23,12 +22,10 @@ builddir="$srcdir/$pkgname-$pkgver"
prepare() {
default_prepare
- cd "$builddir"
- autoreconf -fi
+ ./autogen
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -41,13 +38,12 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- make DESTDIR="$pkgdir" -C "$builddir" install
+ make DESTDIR="$pkgdir" install
}
-sha512sums="b75529785b16c93d31401187f8a58258fbebe565dac071c8311775c913af989f62cd29d5ce2651af3ea6221cffd31cf04826577d3e546ab9ca14340f297777b9 libbsd-0.10.0.tar.xz
-34ab57a9b67c0d6035312dff78e6dd0d1c48442c6a1b6e769b6ebb6dccb0dac80ccc2c309724e39c097cdac944bdbd9522582f93f2567da8c6615990e2d0238b disable-fpurge-test.patch"
+sha512sums="a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5 libbsd-0.11.3.tar.xz
+9bfd1a7b7a3fdae115c9a9719e882237aa56eecc2d19b4a5da02494f8447a4ed26414fc4f52dcaa406fdee602986eed50674c37b2415b8f50493d18be016b9a8 disable-fpurge-test.patch"
diff --git a/main/libbsd/disable-fpurge-test.patch b/main/libbsd/disable-fpurge-test.patch
index 2a1950b123..abc4759524 100644
--- a/main/libbsd/disable-fpurge-test.patch
+++ b/main/libbsd/disable-fpurge-test.patch
@@ -1,10 +1,11 @@
---- libbsd-0.8.3/test/Makefile.am.old 2017-08-17 02:42:30.045825258 +0000
-+++ libbsd-0.8.3/test/Makefile.am 2017-08-17 03:49:17.928202106 +0000
-@@ -37,7 +37,6 @@
- humanize \
+undefined behaviour
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -38,7 +38,6 @@ check_PROGRAMS = \
fgetln \
+ funopen \
fparseln \
- fpurge \
md5 \
+ nlist \
proctitle-init \
- strmode \
diff --git a/main/libcap/APKBUILD b/main/libcap/APKBUILD
index 25f0c14aeb..c76e83eec1 100644
--- a/main/libcap/APKBUILD
+++ b/main/libcap/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libcap
-pkgver=2.48
+pkgver=2.49
pkgrel=0
pkgdesc="POSIX 1003.1e capabilities"
arch="all"
@@ -40,4 +40,4 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
}
-sha512sums="3cb1e2b026c0f60d6f225c7255944d45023e59fd065b8f832739fc90d33b3347981675de12dd705c4ecbd647a494a17daf39e1d92599bcd1a83306886edadba1 libcap-2.48.tar.xz"
+sha512sums="2934a2ded1370edeb9603dbf43d8ca23a2eb5d67efc5cec5d4ba96c707a8db2702da8aa9be0cb86c5ff100d37ec96115c7777a7566ad0ab2e0b4a288bbe357d0 libcap-2.49.tar.xz"
diff --git a/main/libde265/APKBUILD b/main/libde265/APKBUILD
index ee8ad1c604..ef9d34021f 100644
--- a/main/libde265/APKBUILD
+++ b/main/libde265/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=libde265
-pkgver=1.0.4
+pkgver=1.0.8
pkgrel=0
pkgdesc="Open h.265 video codec implementation"
url="https://github.com/strukturag/libde265"
@@ -12,8 +12,6 @@ options="!check" # no tests provided
subpackages="$pkgname-dev"
source="https://github.com/strukturag/libde265/releases/download/v$pkgver/libde265-$pkgver.tar.gz
export-only-decoder-api.patch
- disable-tools.patch
- use-new-ffmpeg-enum-names.patch
"
prepare() {
@@ -27,8 +25,8 @@ build() {
export CXXFLAGS="${CXXFLAGS/-Os/-O2}"
./configure \
- --build=$CBUILD \
- --host=$CHOST \
+ --build="$CBUILD" \
+ --host="$CHOST" \
--prefix=/usr \
--mandir=/usr/share/man \
--disable-sherlock265
@@ -39,7 +37,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="1c57a0b543d17a09928ce126b957b71d3d92add24936f724767d0fff13a137036e9b053fb3aaa6f8f9c5e3e60cb76d9ad816384a7bb626f7fe0cd1aad6d13ec1 libde265-1.0.4.tar.gz
-b937024655020eaea60cc02110018a4b8a63c7fca5a3c14cf042952e6acc83cf39d8d5a23d16536738a374538e2a20c8130d62e0e82a2dbd86ccea9a01433d11 export-only-decoder-api.patch
-ec3d78eb5e0df13900fdc87711372de8dbf12371feeb885dd54e824b4e6370c8b19528ad1fe07aca410ab281665a64e1357d4ab88fc78fb68d2a9ebd18761bca disable-tools.patch
-6007f51114dcfaefed402ac88599add00f5a25d9e670f20e658d166843b4df3525e9f59556c50358fad85878d5bc2062616a1dede597f4664f46fe1f3baaef7d use-new-ffmpeg-enum-names.patch"
+sha512sums="bcb33493cbc337d29047c6765189aaba523b20c138aa4fd5c264b3c6aea64cd174cbe14ca2d88c76319e0a8bd5d2e6269f300f056876d2962217eea7934172da libde265-1.0.8.tar.gz
+f7bd3799f4e4440e7efb98671eca425a5926dd526f8b1147cee2e49b1995853f67b63287c12739ef8ea680713af903517820f83f7f88eac6459f37bae01b4d50 export-only-decoder-api.patch"
diff --git a/main/libde265/disable-tools.patch b/main/libde265/disable-tools.patch
deleted file mode 100644
index 2376fef503..0000000000
--- a/main/libde265/disable-tools.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Disable building of some internal tools that no longer link
- because internal symbols are not exported.
-Author: Joachim Bauch <bauch@struktur.de>
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,10 +8,6 @@
- SUBDIRS+=dec265
- endif
-
--SUBDIRS+=enc265
--SUBDIRS+=tools
--SUBDIRS+=acceleration-speed
--
- if ENABLE_SHERLOCK265
- SUBDIRS+=sherlock265
- endif
---- a/dec265/Makefile.am
-+++ b/dec265/Makefile.am
-@@ -1,5 +1,5 @@
-
--bin_PROGRAMS = dec265 hdrcopy
-+bin_PROGRAMS = dec265
-
- AM_CPPFLAGS = -I../libde265
-
-@@ -9,12 +9,6 @@
- dec265_LDADD = ../libde265/libde265.la -lstdc++
- dec265_SOURCES = dec265.cc
-
--hdrcopy_DEPENDENCIES = ../libde265/libde265.la
--hdrcopy_CXXFLAGS =
--hdrcopy_LDFLAGS =
--hdrcopy_LDADD = ../libde265/libde265.la -lstdc++
--hdrcopy_SOURCES = hdrcopy.cc
--
- if HAVE_VIDEOGFX
- dec265_CXXFLAGS += $(VIDEOGFX_CFLAGS)
- dec265_LDFLAGS += $(VIDEOGFX_LIBS)
-
diff --git a/main/libde265/export-only-decoder-api.patch b/main/libde265/export-only-decoder-api.patch
index b41effac4d..cd58d39636 100644
--- a/main/libde265/export-only-decoder-api.patch
+++ b/main/libde265/export-only-decoder-api.patch
@@ -7,7 +7,7 @@ Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265
--- a/libde265/encoder/Makefile.am
+++ b/libde265/encoder/Makefile.am
-@@ -10,6 +10,18 @@
+@@ -12,6 +12,18 @@
encpicbuf.h encpicbuf.cc \
sop.h sop.cc
@@ -44,7 +44,7 @@ Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265
CMakeLists.txt
--- a/configure.ac
+++ b/configure.ac
-@@ -50,9 +50,7 @@
+@@ -56,9 +56,7 @@
fi
changequote([,])dnl
@@ -57,7 +57,7 @@ Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265
# Checks for header files.
--- a/libde265/image-io.cc
+++ b/libde265/image-io.cc
-@@ -183,7 +183,7 @@
+@@ -186,7 +186,7 @@
}
@@ -66,7 +66,7 @@ Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265
{
if (mFH) {
fclose(mFH);
-@@ -191,7 +191,7 @@
+@@ -194,7 +194,7 @@
}
@@ -75,7 +75,7 @@ Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265
{
assert(mFH==NULL);
-@@ -199,7 +199,7 @@
+@@ -202,7 +202,7 @@
}
diff --git a/main/libde265/use-new-ffmpeg-enum-names.patch b/main/libde265/use-new-ffmpeg-enum-names.patch
deleted file mode 100644
index 3a2facc440..0000000000
--- a/main/libde265/use-new-ffmpeg-enum-names.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e5b8e2e703d608777afadc54955bd396e4211da0 Mon Sep 17 00:00:00 2001
-From: Dirk Farin <farin@struktur.de>
-Date: Thu, 19 Apr 2018 13:15:18 +0200
-Subject: [PATCH] use new FFMPEG enum names
-
-Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265/libde265-use_new_FFMPEG_enum_names.patch
----
- sherlock265/VideoDecoder.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sherlock265/VideoDecoder.cc b/sherlock265/VideoDecoder.cc
-index 119f6152..b829e1c7 100644
---- a/sherlock265/VideoDecoder.cc
-+++ b/sherlock265/VideoDecoder.cc
-@@ -237,7 +237,7 @@ void VideoDecoder::convert_frame_swscale(const de265_image* img, QImage & qimg)
- }
- width = img->get_width();
- height = img->get_height();
-- sws = sws_getContext(width, height, PIX_FMT_YUV420P, width, height, PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
-+ sws = sws_getContext(width, height, AV_PIX_FMT_YUV420P, width, height, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
- }
-
- int stride[3];
-
-
diff --git a/main/libdrm/APKBUILD b/main/libdrm/APKBUILD
index a548dd08c2..d0a8cac091 100644
--- a/main/libdrm/APKBUILD
+++ b/main/libdrm/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Will Sinatra <wpsinatra@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libdrm
-pkgver=2.4.104
+pkgver=2.4.105
pkgrel=0
pkgdesc="Userspace interface to kernel DRM services"
url="https://dri.freedesktop.org/"
@@ -37,4 +37,4 @@ package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
-sha512sums="8267dc7d6d289cbcb7bb139030a5910abf738df5e7caae728994c736287a99879e77db213c6bad4bd5ccb3ea38758f6ae619b93c1eb882aff5e82714158262a9 drm-libdrm-2.4.104.tar.gz"
+sha512sums="67e679271e5836841be91a45a19a2d07cacc78344fe5cf864537075dd7c451742bd16bf3367907835cf79348e6fddb2c538e559d153a4f26f2b24b4f6d343703 drm-libdrm-2.4.105.tar.gz"
diff --git a/main/libeconf/APKBUILD b/main/libeconf/APKBUILD
index 0256b96c38..02a97ebc7e 100644
--- a/main/libeconf/APKBUILD
+++ b/main/libeconf/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer:
pkgname=libeconf
pkgver=0.3.8
-pkgrel=0
+pkgrel=1
pkgdesc="Enhanced Config File Parser"
url="https://github.com/openSUSE/libeconf"
arch="all"
diff --git a/main/libepoxy/APKBUILD b/main/libepoxy/APKBUILD
index e6bd96d3c4..f9d4c26b13 100644
--- a/main/libepoxy/APKBUILD
+++ b/main/libepoxy/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libepoxy
-pkgver=1.5.5
+pkgver=1.5.7
pkgrel=0
pkgdesc="Direct Rendering Manager runtime library"
url="https://github.com/anholt/libepoxy"
@@ -32,4 +32,4 @@ package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
-sha512sums="d5e008764f21ab86c17dbc548f353ed71434100a19855830d6851690b1c8475dbe2053358698e37d4fcc86a3db21f8c497e15375412509e2493fcf18825e61b6 libepoxy-1.5.5.tar.xz"
+sha512sums="30858eefab049f065d9e3fdc2fb94fd3efdd733d87c4f94efbbfc6bdcfa8c1ae40da65f06a970deb9c370feb9ff241f2f79f79d2725c8b49d056fb8dfd8d7388 libepoxy-1.5.7.tar.xz"
diff --git a/main/libevent/APKBUILD b/main/libevent/APKBUILD
index ae49adf39d..92aa17b423 100644
--- a/main/libevent/APKBUILD
+++ b/main/libevent/APKBUILD
@@ -3,7 +3,7 @@
pkgname=libevent
pkgver=2.1.12
_pkgver=$pkgver-stable
-pkgrel=1
+pkgrel=2
pkgdesc="An event notification library"
url="https://libevent.org/"
arch="all"
diff --git a/main/libgcrypt/APKBUILD b/main/libgcrypt/APKBUILD
index f99334d25b..e25acf97a5 100644
--- a/main/libgcrypt/APKBUILD
+++ b/main/libgcrypt/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libgcrypt
-pkgver=1.9.2
+pkgver=1.9.3
pkgrel=0
pkgdesc="General purpose crypto library based on the code used in GnuPG"
url="https://www.gnupg.org/"
@@ -47,4 +47,4 @@ package() {
rm -f $pkgdir/usr/share/info/dir
}
-sha512sums="d2e3dc89788763229f554382b3cf0c3a2680f774258abc4c1fd9ef1ad44920d57d14422af9b6b405e42742e691d19ab2ee458fddf057e778964519eee090f016 libgcrypt-1.9.2.tar.bz2"
+sha512sums="977e766887c14f19aa1b9fcc0214303036a649e41cd4278de76da7d734cf36888e2e1b6275590dac523dcb4ba8ab07993e6ee8209fd5f1a3383d738b09a060d6 libgcrypt-1.9.3.tar.bz2"
diff --git a/main/libgpg-error/APKBUILD b/main/libgpg-error/APKBUILD
index 2fe658776d..bdf4f0f9d8 100644
--- a/main/libgpg-error/APKBUILD
+++ b/main/libgpg-error/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Arto Kitula <arto.kitula@gmail.com>
pkgname=libgpg-error
-pkgver=1.41
+pkgver=1.42
pkgrel=0
pkgdesc="Support library for libgcrypt"
url="https://www.gnupg.org/"
@@ -51,4 +51,4 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
}
-sha512sums="578d1d8090b9f6e6cbe59d9aeebec7df81aae492f75ec343f8df530950d30866fa0a7903ca050bf7bf721413f7b2708abe34f7467e2b208cc1447ffc9bd5b9a5 libgpg-error-1.41.tar.bz2"
+sha512sums="f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4 libgpg-error-1.42.tar.bz2"
diff --git a/main/libical/APKBUILD b/main/libical/APKBUILD
index ff74967457..09534332f5 100644
--- a/main/libical/APKBUILD
+++ b/main/libical/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libical
-pkgver=3.0.9
+pkgver=3.0.10
pkgrel=0
pkgdesc="Reference implementation of the iCalendar format"
url="https://libical.github.io/libical/"
@@ -35,4 +35,4 @@ package() {
make -C build DESTDIR="$pkgdir" install
}
-sha512sums="4a9894d82776437cb2ef16df70bffb52da7b4fd57b52a4f6941430b3b1f9830829f0775fb495411f67393581bda1304b54c9f0031bc3d4ada56d2204900cb268 libical-3.0.9.tar.gz"
+sha512sums="e32ccaff9b8a501f340567a1221c580023e4ed79918519bfa88aee2c0e8b62f5ea37e10907f2eb6fbd346a57408708a74e30aaf9a57a8d711eae30ddc974ddd0 libical-3.0.10.tar.gz"
diff --git a/main/libimagequant/APKBUILD b/main/libimagequant/APKBUILD
index e772c07cea..39c587d67f 100644
--- a/main/libimagequant/APKBUILD
+++ b/main/libimagequant/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: TBK <alpine@jjtc.eu>
# Maintainer: TBK <alpine@jjtc.eu>
pkgname=libimagequant
-pkgver=2.14.0
+pkgver=2.14.1
pkgrel=0
pkgdesc="Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images."
url="https://pngquant.org/lib/"
@@ -26,4 +26,4 @@ package() {
rm -f "$pkgdir"/usr/lib/*.a
}
-sha512sums="d34aa2ac9f08eebd80fb9e3e7fe22a3f10ce840152c4192735d57ae37c223350af09eeff6870ee2634b3fc51b03d1663cd6afd17daeab923af3b5f60fbef57d4 libimagequant-2.14.0.tar.gz"
+sha512sums="2219d767555c69cdb47bb46cdeb18362358e9465d6e3a249d75c55e5a9dabd434f44908cb4756fbc12e9a786ee602192c0eb8e9d1932ade43781e80ba029bd67 libimagequant-2.14.1.tar.gz"
diff --git a/main/libjpeg-turbo/APKBUILD b/main/libjpeg-turbo/APKBUILD
index 77def7e546..6fe295eaf8 100644
--- a/main/libjpeg-turbo/APKBUILD
+++ b/main/libjpeg-turbo/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libjpeg-turbo
-pkgver=2.0.6
+pkgver=2.1.0
pkgrel=0
pkgdesc="Accelerated baseline JPEG compression and decompression library"
url="https://libjpeg-turbo.org/"
@@ -16,6 +16,8 @@ source="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.ta
[ "$CARCH" = "mips64" ] && options="!check"
# secfixes:
+# 2.1.0-r0:
+# - CVE-2021-20205
# 2.0.4-r2:
# - CVE-2020-13790
# 2.0.4-r0:
@@ -77,4 +79,4 @@ dev() {
replaces="jpeg-dev"
}
-sha512sums="504062778224f2ed2ddb64c988fbf466a14247952aab0cf1d35d281942b6f0874eafd34b45914d2208e087f05ddd896c5ba87a67c944e8bb80323e187413038c libjpeg-turbo-2.0.6.tar.gz"
+sha512sums="6632a2a71cb3a350fe4f850fe84e51e361755c373babf2b47fb164c3a9fc3fd66705639bebedd8c1b40cf6c15fd702e814425b0be5919048987bbec357828605 libjpeg-turbo-2.1.0.tar.gz"
diff --git a/main/libksba/APKBUILD b/main/libksba/APKBUILD
index 9de9707641..42c28b831e 100644
--- a/main/libksba/APKBUILD
+++ b/main/libksba/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libksba
-pkgver=1.5.0
+pkgver=1.5.1
pkgrel=0
pkgdesc="Libksba is a CMS and X.509 access library"
url="https://www.gnupg.org/software/libksba/index.html"
@@ -28,4 +28,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="84383e8b084bf47ac646a9aacb174e510ffcab4b966b649e4351990eaf7ce78cc9d199e6c4f3a1be697888c857ee86ecef949c06156790c7d8d0bd0fb0142721 libksba-1.5.0.tar.bz2"
+sha512sums="156fe6a36daa7b11ce580366ab36a5fceda253413f0057ace791e4f028fd3158a70a3f6ba1d0c824fafee4420d1076864dbd0911606fb65e14c8b2332b6cc92b libksba-1.5.1.tar.bz2"
diff --git a/main/libmaxminddb/APKBUILD b/main/libmaxminddb/APKBUILD
index a058ab29e2..636f59bd36 100644
--- a/main/libmaxminddb/APKBUILD
+++ b/main/libmaxminddb/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libmaxminddb
-pkgver=1.5.0
-pkgrel=1
+pkgver=1.5.2
+pkgrel=0
pkgdesc="Maxmind GeoIP2 database library"
url="https://github.com/maxmind/libmaxminddb"
arch="all"
@@ -42,6 +42,6 @@ package() {
install -Dm644 "$srcdir"/libmaxminddb.confd "$pkgdir"/etc/libmaxminddb.cron.conf
}
-sha512sums="68c769f247156869b84a8ad0f9deec3cb79d39c0a6b8f1458461c223b9cf9967dd9d697ff4e92ac28216ef9e9f5a94908e03f76a5f70ab17636b163c17d2d432 libmaxminddb-1.5.0.tar.gz
+sha512sums="074ef6b62a74cede7be332eaeff5aa7442f43de92d39ea65b38430f0e1b65a5515f4343894ca5c28a7d50181eaec44e8db7083461b9e12e7014d2d1e0ff033b8 libmaxminddb-1.5.2.tar.gz
7eb66e563b156c176a2b23c73c60c55c52f20f94393a82cbdedd8f2ddb136a029bad8a4df0ca2c0f2bb923af170ae56cdd19dbb4e09c3affc23be6f79dd23f80 libmaxminddb.cron
03bdfd6d1d508ea5261a396ac9539f363dcb477b9cf11fd4c9b01001e03205fa667cde21295dc0cc3d38db50adebb9c57e147a22fc7945de7c72d75d10637128 libmaxminddb.confd"
diff --git a/main/libmd/APKBUILD b/main/libmd/APKBUILD
new file mode 100644
index 0000000000..9cd8d1a5b4
--- /dev/null
+++ b/main/libmd/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: omni <omni+alpine@hack.org>
+# Maintainer: omni <omni+alpine@hack.org>
+pkgname=libmd
+pkgver=1.0.3
+pkgrel=0
+pkgdesc="Message Digest functions from BSD systems"
+url="https://www.hadrons.org/software/libmd/"
+arch="all"
+license="Public Domain"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://archive.hadrons.org/software/libmd/libmd-$pkgver.tar.xz"
+
+build() {
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --localstatedir=/var
+ make
+}
+
+check() {
+ make check
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+ install -Dm0644 COPYING -t "$pkgdir"/usr/share/licenses/"$pkgname"
+}
+
+sha512sums="f4b5a86bea7b9fac9f7f173032ee436d1e7141f760c1a114a785d31644edbf6802fe8193cc4cf3b5c66d38963be919c05055780bdf6bf5a47927690490ff5966 libmd-1.0.3.tar.xz"
diff --git a/main/libretls/APKBUILD b/main/libretls/APKBUILD
new file mode 100644
index 0000000000..b0029dac9e
--- /dev/null
+++ b/main/libretls/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: TBK <alpine@jjtc.eu>
+# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
+pkgname=libretls
+pkgver=3.3.2
+pkgrel=0
+pkgdesc="port of libtls from libressl to openssl"
+arch="all"
+url="https://git.causal.agency/libretls/"
+license="ISC AND (BSD-3-Clause OR MIT)"
+depends="ca-certificates-bundle"
+depends_dev="openssl-dev"
+makedepends="$depends_dev"
+subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
+source="https://causal.agency/libretls/libretls-$pkgver.tar.gz
+ test_program.c"
+
+build() {
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr
+ make all
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+check() {
+ set -x
+
+ gcc -o test_program "$srcdir"/test_program.c -I"$builddir"/include -L"$builddir"/.libs -ltls $(pkgconf --cflags --libs openssl)
+ LD_LIBRARY_PATH="$builddir"/.libs ./test_program
+
+ set +x
+}
+
+sha512sums="
+b9fe3d807a0ad8bdd3c4ee7d5437d238bd34386974e369981ba7e33d64c7675626ed4072a6841f0e6aef2a9a0a6966366ff9a6097172db29cb1ec002e10a49f6 libretls-3.3.2.tar.gz
+71d36fe25c95a0a45497e3f699b01dddcaae9053dd1b1e2419df94272c47024cf6516c51c902129201061601b04a72551904b15a332a4cf53358983b5db73618 test_program.c
+"
diff --git a/main/libtls-standalone/test_program.c b/main/libretls/test_program.c
index f8d7332d72..f8d7332d72 100644
--- a/main/libtls-standalone/test_program.c
+++ b/main/libretls/test_program.c
diff --git a/main/librsync/APKBUILD b/main/librsync/APKBUILD
index 31c0886cf2..8420ac9707 100644
--- a/main/librsync/APKBUILD
+++ b/main/librsync/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com>
# Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com>
pkgname=librsync
-pkgver=2.3.1
-pkgrel=1
+pkgver=2.3.2
+pkgrel=0
pkgdesc="librsync implements the rolling-checksum algorithm of rsync"
url="https://github.com/librsync/librsync"
arch="all"
@@ -10,7 +10,6 @@ license="LGPL-2.1-or-later"
makedepends="cmake popt-dev bzip2-dev zlib-dev perl"
subpackages="$pkgname-dev $pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/librsync/librsync/archive/v$pkgver.tar.gz
- Fix-heap-corruption-from-too-small-kbloom.patch
"
prepare() {
@@ -37,5 +36,4 @@ package() {
install -D -m644 doc/librsync.3 "$pkgdir/usr/share/man/man3/librsync.3"
}
-sha512sums="89e5b5ad960b8036acce41df09f5e50601d7eb57d48a2bd21c4ee54a3a375f62ee514036b9a562277b5656735b84cadf6f54cbf48c364bbf0c04f2d95ae3b5a6 librsync-2.3.1.tar.gz
-4a5c21ed149da9aee720d4e9b178a34f4d7c9e6b94de629216ca59d0b7bd831b04bcb4b5b138e6a224a060c5aa51dc8f621623031d3bbbb7b97556a6164b95d1 Fix-heap-corruption-from-too-small-kbloom.patch"
+sha512sums="77d826dbaf02061b759d876a6b537238bad40379a08e4494ebfd3e380b2eb921b7b060bc570330aeac9424ef1a9d521f449d559c9ffa3be24acdef4ad530fe90 librsync-2.3.2.tar.gz"
diff --git a/main/librsync/Fix-heap-corruption-from-too-small-kbloom.patch b/main/librsync/Fix-heap-corruption-from-too-small-kbloom.patch
deleted file mode 100644
index 582607c32a..0000000000
--- a/main/librsync/Fix-heap-corruption-from-too-small-kbloom.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d89f2cd4714f717e6cc5468c6066e18f22b5fea6 Mon Sep 17 00:00:00 2001
-From: ljusten <ljusten@google.com>
-Date: Mon, 21 Sep 2020 17:52:58 +0200
-Subject: [PATCH] Fix heap corruption from too small kbloom
-
-kbloom is a bitmask with 'size2' bits, where 'size2' is the next power of 2 of 'size'. Thus, if 'size' is smaller than 4, 'size2' is smaller than 8, so that size2 / 8 == 0 and calloc allocates 0 bytes. This causes heap corruption when kbloom is subsequently written to. See discussion on https://groups.google.com/g/librsync/c/vmqzQS1QjIw.
----
- src/hashtable.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/hashtable.c b/src/hashtable.c
-index 4ffd9bf..ff3f29c 100644
---- a/src/hashtable.c
-+++ b/src/hashtable.c
-@@ -52,7 +52,7 @@ hashtable_t *_hashtable_new(int size)
- t->count = 0;
- t->tmask = size2 - 1;
- #ifndef HASHTABLE_NBLOOM
-- if (!(t->kbloom = calloc(size2 / 8, sizeof(unsigned char)))) {
-+ if (!(t->kbloom = calloc((size2 + 7) / 8, sizeof(unsigned char)))) {
- _hashtable_free(t);
- return NULL;
- }
diff --git a/main/libseccomp/APKBUILD b/main/libseccomp/APKBUILD
index 01ec64af91..6ca204f23b 100644
--- a/main/libseccomp/APKBUILD
+++ b/main/libseccomp/APKBUILD
@@ -3,15 +3,15 @@
# Contributor: Dan Williams <dan@ma.ssive.co>
pkgname=libseccomp
pkgver=2.5.1
-pkgrel=0
+pkgrel=2
pkgdesc="An interface to the Linux Kernel's syscall filtering mechanism"
url="https://github.com/seccomp/libseccomp"
arch="all"
license="LGPL-2.1-or-later"
depends_dev="linux-headers"
-makedepends="$depends_dev gperf"
+makedepends="$depends_dev gperf cython python3 python3-dev"
checkdepends="bash"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc py3-$pkgname:py3"
source="https://github.com/seccomp/libseccomp/releases/download/v$pkgver/libseccomp-$pkgver.tar.gz
remove-redefinition-prctl.patch
"
@@ -32,6 +32,7 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
+ --enable-python \
--enable-static \
--localstatedir=/var
make
@@ -44,6 +45,9 @@ check() {
ppc64le|s390x) rm -f tests/36-sim-ipc_syscalls.tests \
tests/37-sim-ipc_syscalls_be.tests;;
esac
+ # fix python shebang
+ sed -i -e 's@cmd /usr/bin/env python @cmd /usr/bin/env python3 @' tests/regression
+ sed -i -e 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@' tests/*.py
make check
}
@@ -51,5 +55,12 @@ package() {
make DESTDIR="$pkgdir" install
}
+py3() {
+ pkgdesc="Python 3 bindings for $pkgname"
+ depends="$depends $pkgname python3"
+
+ amove usr/lib/python3*
+}
+
sha512sums="2be80a6323f9282dbeae8791724e5778b32e2382b2a3d1b0f77366371ec4072ea28128204f675cce101c091c0420d12c497e1a9ccbb7dc5bcbf61bfd777160af libseccomp-2.5.1.tar.gz
f2c31dcafdc9a1ad78e32e76b75e1c1603071eaa3f979e1f2483b879a34ad07e0a4ef3642196a695415cdf81e1ed2bf325175872fb4e203ef9d0e668c287493f remove-redefinition-prctl.patch"
diff --git a/main/libsecret/APKBUILD b/main/libsecret/APKBUILD
index 23aacf67cf..89128faa9d 100644
--- a/main/libsecret/APKBUILD
+++ b/main/libsecret/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=libsecret
pkgver=0.20.4
-pkgrel=0
+pkgrel=1
pkgdesc="Library for storing and retrieving passwords and other secrets"
url="https://wiki.gnome.org/Projects/Libsecret"
arch="all"
diff --git a/main/libsndfile/APKBUILD b/main/libsndfile/APKBUILD
index 1e002c6f4b..839cbdf219 100644
--- a/main/libsndfile/APKBUILD
+++ b/main/libsndfile/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libsndfile
pkgver=1.0.31
-pkgrel=0
+pkgrel=1
pkgdesc="C library for reading and writing files containing sampled sound"
url="https://libsndfile.github.io/libsndfile/"
arch="all"
diff --git a/main/libtls-standalone/APKBUILD b/main/libtls-standalone/APKBUILD
deleted file mode 100644
index ac8d2fdb1d..0000000000
--- a/main/libtls-standalone/APKBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Maintainer:
-pkgname=libtls-standalone
-pkgver=2.9.1
-_namever=${pkgname}${pkgver%.*}
-pkgrel=1
-pkgdesc="libtls extricated from libressl sources"
-url="https://www.libressl.org/"
-arch="all"
-license="ISC"
-depends="ca-certificates-bundle"
-depends_dev="openssl-dev"
-makedepends_build=""
-makedepends_host="libbsd-dev openssl-dev"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc"
-source="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-$pkgver.tar.gz
- Makefile
- tls_compat.c
- tls_compat.h
- test_program.c
- libtls-ciphers.patch
- openssl-1.1.0-bio-method.patch
- openssl-1.1.0-verify-param.patch
- openssl-1.1.0-asn1-string.patch
- openssl-1.1.0-x509-object.patch
- "
-libressl_src="$srcdir/libressl-$pkgver"
-builddir="$srcdir"
-
-prepare() {
- cd "$builddir"
- rm -rf "$libressl_src"/include/openssl
-
- cd "$libressl_src"
- patch -p1 < "$srcdir"/libtls-ciphers.patch
- patch -p1 < "$srcdir"/openssl-1.1.0-bio-method.patch
- patch -p1 < "$srcdir"/openssl-1.1.0-verify-param.patch
- patch -p1 < "$srcdir"/openssl-1.1.0-asn1-string.patch
- patch -p1 < "$srcdir"/openssl-1.1.0-x509-object.patch
-}
-
-build() {
- cd "$builddir"
-
- make PREFIX=/usr LIBRESSL_SRCDIR="${libressl_src}" LIBRESSL_VERSION="${pkgver}"
-}
-
-check() {
- cd "$builddir"
- make PREFIX=/usr LIBRESSL_SRCDIR="${libressl_src}" LIBRESSL_VERSION="${pkgver}" check
-}
-
-package() {
- cd "$builddir"
-
- make PREFIX=/usr LIBRESSL_SRCDIR="${libressl_src}" LIBRESSL_VERSION="${pkgver}" DESTDIR="${pkgdir}" install
- install -Dm644 "${libressl_src}"/COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="7051911e566bb093c48a70da72c9981b870e3bf49a167ba6c934eece873084cc41221fbe3cd0c8baba268d0484070df7164e4b937854e716337540a87c214354 libressl-2.9.1.tar.gz
-75292dcd0321a3cb00b30715f537cd35f2375922aac3ad5445f3d7b9eff16ab934926b1605f3330032f8455378c89f41bd1ed83f5a027fc967adff7006ed9486 Makefile
-be8216d08a6992ca65a8e3f1e010645833899465090179f269a62de5fcfe2711d463fe1aa57e408492648878fa2ee53377c4509ef48a2aafe3f267cce73e9209 tls_compat.c
-0b8fca899e1f7b51979d69458be23c77c1b7f265ed60de76cf5cfb9eb5742111cf50813bd35384831301523a6a0562a20acf1aec22dc0d9ad653271d45ede915 tls_compat.h
-71d36fe25c95a0a45497e3f699b01dddcaae9053dd1b1e2419df94272c47024cf6516c51c902129201061601b04a72551904b15a332a4cf53358983b5db73618 test_program.c
-8da41dc7f3a3e94c7c26c20b88e649eeaa556064c6b45deb4604fb0b5738109344bf2d9e5c37dc963634db1761370aa5ed4dfe085cae2a21e74535b5b98f4a43 libtls-ciphers.patch
-90244db67d2f5a2b4679cd4b905f6e58105e20e5a4648dd0781dee3f3d1ce87350eee9683f2e6e554949a390ee45d2247e7588e75668e82feb68213178905d3d openssl-1.1.0-bio-method.patch
-b0c6c0b32d6ea30b7161ae75e36b8102b3c00268723dec15464318bae8f77a386dba9ef0537d47018b385b16f57132b5c893e494b8853d51b638b4d270e1f9d6 openssl-1.1.0-verify-param.patch
-e0b7ce674269714cd63f628c332ed3420086c973f6e763a9a5d57991738370759d437b59edff5349ce4213725588f58e196c479b372a702833fcae75da9d71a1 openssl-1.1.0-asn1-string.patch
-7d88088240f78dc3656e71d67f2222b4562bbcfacfaac77e7d8d3ace50ae7f02fac15cea0df2d9990b8d30f6cfd0b4ffd92ea97191181f0b00b1d34c050ef130 openssl-1.1.0-x509-object.patch"
diff --git a/main/libtls-standalone/Makefile b/main/libtls-standalone/Makefile
deleted file mode 100644
index 781a15a7d1..0000000000
--- a/main/libtls-standalone/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-PREFIX = /usr/local
-EXEC_PREFIX = ${PREFIX}
-LIBDIR = ${PREFIX}/lib
-INCLUDEDIR = ${PREFIX}/include
-
-LIBRESSL_VERSION = 1.0
-LIBTLS_SOVERSION = 1
-LIBTLS_FULLVERSION = 1.0.0
-
-OPENSSL_CFLAGS = $(shell pkgconf openssl --cflags)
-OPENSSL_LIBS = $(shell pkgconf openssl --libs)
-
-CFLAGS = -Wall -Wno-pointer-sign -fPIC -DPIC -shared -include tls_compat.h -isystem ${LIBRESSL_SRCDIR}/include/compat ${OPENSSL_CFLAGS} -I ${LIBRESSL_SRCDIR}/include \
- -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS=
-LDFLAGS = -fPIC -DPIC -shared -Wl,-soname,libtls-standalone.so.${LIBTLS_SOVERSION} ${OPENSSL_LIBS}
-
-SOURCES = \
- tls_compat.c \
- ${LIBRESSL_SRCDIR}/tls/tls.c \
- ${LIBRESSL_SRCDIR}/tls/tls_bio_cb.c \
- ${LIBRESSL_SRCDIR}/tls/tls_client.c \
- ${LIBRESSL_SRCDIR}/tls/tls_config.c \
- ${LIBRESSL_SRCDIR}/tls/tls_conninfo.c \
- ${LIBRESSL_SRCDIR}/tls/tls_keypair.c \
- ${LIBRESSL_SRCDIR}/tls/tls_ocsp.c \
- ${LIBRESSL_SRCDIR}/tls/tls_peer.c \
- ${LIBRESSL_SRCDIR}/tls/tls_server.c \
- ${LIBRESSL_SRCDIR}/tls/tls_util.c \
- ${LIBRESSL_SRCDIR}/tls/tls_verify.c \
- ${LIBRESSL_SRCDIR}/crypto/compat/arc4random.c \
- ${LIBRESSL_SRCDIR}/crypto/compat/arc4random_uniform.c \
- ${LIBRESSL_SRCDIR}/crypto/compat/freezero.c \
- ${LIBRESSL_SRCDIR}/crypto/compat/reallocarray.c \
- ${LIBRESSL_SRCDIR}/crypto/compat/timingsafe_memcmp.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-all: dumpconfig libtls-standalone.so.${LIBTLS_FULLVERSION} libtls-standalone.so.${LIBTLS_SOVERSION} libtls-standalone.pc
-
-dumpconfig:
- @echo "Building with:"
- @echo " LIBRESSL_SRCDIR = ${LIBRESSL_SRCDIR}"
- @echo " OPENSSL_CFLAGS = ${OPENSSL_CFLAGS}"
- @echo " OPENSSL_LIBS = ${OPENSSL_LIBS}"
-
-.c.o:
- ${CC} ${CFLAGS} -o $@ -c $<
-
-libtls-standalone.so.${LIBTLS_SOVERSION}: libtls-standalone.so.${LIBTLS_FULLVERSION}
- ln -s $< $@
-
-libtls-standalone.so.${LIBTLS_FULLVERSION}: ${OBJECTS}
- ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${OPENSSL_LIBS}
-
-check: test_program
- LD_LIBRARY_PATH=$$PWD ./test_program
-
-test_program: test_program.c
- ${CC} -I${LIBRESSL_SRCDIR}/include -o $@ test_program.c ./libtls-standalone.so.${LIBTLS_FULLVERSION}
-
-clean:
- rm -f ${OBJECTS}
- rm -f libtls-standalone.so.${LIBTLS_FULLVERSION} libtls-standalone.so.${LIBTLS_SOVERSION}
- rm -f test_program
-
-install:
- install -D -m755 libtls-standalone.so.${LIBTLS_FULLVERSION} ${DESTDIR}${PREFIX}/lib/libtls-standalone.so.${LIBTLS_FULLVERSION}
- ln -sf libtls-standalone.so.${LIBTLS_FULLVERSION} ${DESTDIR}${PREFIX}/lib/libtls-standalone.so.${LIBTLS_SOVERSION}
- ln -sf libtls-standalone.so.${LIBTLS_FULLVERSION} ${DESTDIR}${PREFIX}/lib/libtls-standalone.so
-
- install -D -m644 ${LIBRESSL_SRCDIR}/include/tls.h ${DESTDIR}${PREFIX}/include/libtls-standalone/tls.h
-
- install -D -m644 libtls-standalone.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/libtls-standalone.pc
-
-libtls-standalone.pc: ${LIBRESSL_SRCDIR}/libtls.pc.in
- sed -e s:@prefix@:${PREFIX}:g \
- -e s:@exec_prefix@:${EXEC_PREFIX}:g \
- -e s:@libdir@:${LIBDIR}:g \
- -e s:@includedir@:${INCLUDEDIR}/libtls-standalone:g \
- -e s:@LIBS@:-ltls-standalone:g \
- -e s:@PLATFORM_LDADD@::g \
- -e s:@VERSION@:${LIBRESSL_VERSION}:g \
- -e /^Libs:/s:-ltls:-ltls-standalone:g \
- $< > libtls-standalone.pc
-
-.DUMMY: check dumpconfig clean install
diff --git a/main/libtls-standalone/libtls-ciphers.patch b/main/libtls-standalone/libtls-ciphers.patch
deleted file mode 100644
index 7b5843b28c..0000000000
--- a/main/libtls-standalone/libtls-ciphers.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- libressl-2.7.4.orig/tls/tls_internal.h
-+++ libressl-2.7.4/tls/tls_internal.h
-@@ -30,12 +30,12 @@
- #define _PATH_SSL_CA_FILE "/etc/ssl/cert.pem"
- #endif
-
--#define TLS_CIPHERS_DEFAULT "TLSv1.2+AEAD+ECDHE:TLSv1.2+AEAD+DHE"
- #define TLS_CIPHERS_COMPAT "HIGH:!aNULL"
- #define TLS_CIPHERS_LEGACY "HIGH:MEDIUM:!aNULL"
- #define TLS_CIPHERS_ALL "ALL:!aNULL:!eNULL"
-+#define TLS_CIPHERS_DEFAULT TLS_CIPHERS_COMPAT
-
--#define TLS_ECDHE_CURVES "X25519,P-256,P-384"
-+#define TLS_ECDHE_CURVES "P-256,P-384"
-
- union tls_addr {
- struct in_addr ip4;
diff --git a/main/libtls-standalone/openssl-1.1.0-asn1-string.patch b/main/libtls-standalone/openssl-1.1.0-asn1-string.patch
deleted file mode 100644
index 258ba60a5d..0000000000
--- a/main/libtls-standalone/openssl-1.1.0-asn1-string.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- libressl-2.7.4.orig/tls/tls_verify.c
-+++ libressl-2.7.4/tls/tls_verify.c
-@@ -126,12 +126,12 @@
- continue;
-
- if (type == GEN_DNS) {
-- unsigned char *data;
-+ const unsigned char *data;
- int format, len;
-
- format = ASN1_STRING_type(altname->d.dNSName);
- if (format == V_ASN1_IA5STRING) {
-- data = ASN1_STRING_data(altname->d.dNSName);
-+ data = ASN1_STRING_get0_data(altname->d.dNSName);
- len = ASN1_STRING_length(altname->d.dNSName);
-
- if (len < 0 || (size_t)len != strlen(data)) {
-@@ -171,11 +171,11 @@
- }
-
- } else if (type == GEN_IPADD) {
-- unsigned char *data;
-+ const unsigned char *data;
- int datalen;
-
- datalen = ASN1_STRING_length(altname->d.iPAddress);
-- data = ASN1_STRING_data(altname->d.iPAddress);
-+ data = ASN1_STRING_get0_data(altname->d.iPAddress);
-
- if (datalen < 0) {
- tls_set_errorx(ctx,
diff --git a/main/libtls-standalone/openssl-1.1.0-bio-method.patch b/main/libtls-standalone/openssl-1.1.0-bio-method.patch
deleted file mode 100644
index 4f4290c3ce..0000000000
--- a/main/libtls-standalone/openssl-1.1.0-bio-method.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- libressl-2.7.4.orig/tls/tls_bio_cb.c
-+++ libressl-2.7.4/tls/tls_bio_cb.c
-@@ -18,6 +18,7 @@
- #include <fcntl.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <assert.h>
-
- #include <openssl/bio.h>
-
-@@ -29,19 +30,36 @@
- static int bio_cb_puts(BIO *bio, const char *str);
- static long bio_cb_ctrl(BIO *bio, int cmd, long num, void *ptr);
-
--static BIO_METHOD bio_cb_method = {
-- .type = BIO_TYPE_MEM,
-- .name = "libtls_callbacks",
-- .bwrite = bio_cb_write,
-- .bread = bio_cb_read,
-- .bputs = bio_cb_puts,
-- .ctrl = bio_cb_ctrl,
--};
-+static pthread_once_t bio_cb_init_once = PTHREAD_ONCE_INIT;
-
-+static BIO_METHOD *bio_cb_method = NULL;
-+
-+static void
-+bio_s_cb_init(void)
-+{
-+ BIO_METHOD *method;
-+
-+ method = BIO_meth_new(BIO_TYPE_MEM, "libtls_callbacks");
-+ assert(method != NULL);
-+
-+ BIO_meth_set_read(method, bio_cb_read);
-+ BIO_meth_set_write(method, bio_cb_write);
-+ BIO_meth_set_puts(method, bio_cb_puts);
-+ BIO_meth_set_ctrl(method, bio_cb_ctrl);
-+
-+ bio_cb_method = method;
-+}
-+
- static BIO_METHOD *
- bio_s_cb(void)
- {
-- return (&bio_cb_method);
-+ if (bio_cb_method != NULL) {
-+ return bio_cb_method;
-+ }
-+
-+ (void) pthread_once(&bio_cb_init_once, bio_s_cb_init);
-+
-+ return bio_cb_method;
- }
-
- static int
-@@ -57,10 +75,10 @@
-
- switch (cmd) {
- case BIO_CTRL_GET_CLOSE:
-- ret = (long)bio->shutdown;
-+ ret = (long) BIO_get_shutdown(bio);
- break;
- case BIO_CTRL_SET_CLOSE:
-- bio->shutdown = (int)num;
-+ BIO_set_shutdown(bio, (int) num);
- break;
- case BIO_CTRL_DUP:
- case BIO_CTRL_FLUSH:
-@@ -69,7 +87,7 @@
- case BIO_CTRL_GET:
- case BIO_CTRL_SET:
- default:
-- ret = BIO_ctrl(bio->next_bio, cmd, num, ptr);
-+ ret = BIO_ctrl(BIO_next(bio), cmd, num, ptr);
- }
-
- return (ret);
-@@ -78,7 +96,7 @@
- static int
- bio_cb_write(BIO *bio, const char *buf, int num)
- {
-- struct tls *ctx = bio->ptr;
-+ struct tls *ctx = BIO_get_data(bio);
- int rv;
-
- BIO_clear_retry_flags(bio);
-@@ -96,7 +114,7 @@
- static int
- bio_cb_read(BIO *bio, char *buf, int size)
- {
-- struct tls *ctx = bio->ptr;
-+ struct tls *ctx = BIO_get_data(bio);
- int rv;
-
- BIO_clear_retry_flags(bio);
-@@ -131,8 +149,8 @@
- tls_set_errorx(ctx, "failed to create callback i/o");
- goto err;
- }
-- bio->ptr = ctx;
-- bio->init = 1;
-+ BIO_set_data(bio, ctx);
-+ BIO_set_init(bio, 1);
-
- SSL_set_bio(ctx->ssl_conn, bio, bio);
-
diff --git a/main/libtls-standalone/openssl-1.1.0-verify-param.patch b/main/libtls-standalone/openssl-1.1.0-verify-param.patch
deleted file mode 100644
index ef3f948e02..0000000000
--- a/main/libtls-standalone/openssl-1.1.0-verify-param.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- libressl-2.7.4.orig/tls/tls.c
-+++ libressl-2.7.4/tls/tls.c
-@@ -438,8 +438,16 @@
- }
-
- if (ctx->config->verify_time == 0) {
-- X509_VERIFY_PARAM_set_flags(ssl_ctx->param,
-- X509_V_FLAG_NO_CHECK_TIME);
-+ X509_VERIFY_PARAM *param = X509_VERIFY_PARAM_new();
-+
-+ if (param == NULL) {
-+ goto err;
-+ }
-+
-+ X509_VERIFY_PARAM_set_flags(param, X509_V_FLAG_NO_CHECK_TIME);
-+ SSL_CTX_set1_param(ssl_ctx, param);
-+
-+ X509_VERIFY_PARAM_free(param);
- }
-
- /* Disable any form of session caching by default */
-@@ -487,6 +495,7 @@
- STACK_OF(X509_INFO) *xis = NULL;
- X509_STORE *store;
- X509_INFO *xi;
-+ X509_VERIFY_PARAM *param;
- BIO *bio = NULL;
- int rv = -1;
- int i;
-@@ -548,8 +557,19 @@
- }
- xi->crl = NULL;
- }
-- X509_VERIFY_PARAM_set_flags(store->param,
-+
-+ param = X509_VERIFY_PARAM_new();
-+
-+ if (param == NULL) {
-+ goto err;
-+ }
-+
-+ X509_VERIFY_PARAM_set_flags(param,
- X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL);
-+
-+ X509_STORE_set1_param(store, param);
-+
-+ X509_VERIFY_PARAM_free(param);
- }
-
- done:
diff --git a/main/libtls-standalone/openssl-1.1.0-x509-object.patch b/main/libtls-standalone/openssl-1.1.0-x509-object.patch
deleted file mode 100644
index e90903252f..0000000000
--- a/main/libtls-standalone/openssl-1.1.0-x509-object.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libressl-2.7.4.orig/tls/tls_ocsp.c
-+++ libressl-2.7.4/tls/tls_ocsp.c
-@@ -127,8 +127,8 @@
- {
- X509_NAME *issuer_name;
- X509 *issuer;
-- X509_STORE_CTX storectx;
-- X509_OBJECT tmpobj;
-+ X509_STORE_CTX *storectx;
-+ X509_OBJECT *tmpobj;
- OCSP_CERTID *cid = NULL;
- X509_STORE *store;
-
-@@ -143,14 +143,20 @@
-
- if ((store = SSL_CTX_get_cert_store(ssl_ctx)) == NULL)
- return NULL;
-- if (X509_STORE_CTX_init(&storectx, store, main_cert, extra_certs) != 1)
-+ if ((storectx = X509_STORE_CTX_new()) == NULL)
- return NULL;
-- if (X509_STORE_get_by_subject(&storectx, X509_LU_X509, issuer_name,
-- &tmpobj) == 1) {
-- cid = OCSP_cert_to_id(NULL, main_cert, tmpobj.data.x509);
-- X509_OBJECT_free_contents(&tmpobj);
-+ if (X509_STORE_CTX_init(storectx, store, main_cert, extra_certs) != 1)
-+ goto err;
-+ if ((tmpobj = X509_OBJECT_new()) == NULL)
-+ goto err;
-+ if (X509_STORE_get_by_subject(storectx, X509_LU_X509, issuer_name,
-+ tmpobj) == 1) {
-+ cid = OCSP_cert_to_id(NULL, main_cert, X509_OBJECT_get0_X509(tmpobj));
-+ X509_OBJECT_free(tmpobj);
- }
-- X509_STORE_CTX_cleanup(&storectx);
-+
-+ err:
-+ X509_STORE_CTX_cleanup(storectx);
- return cid;
- }
-
diff --git a/main/libtls-standalone/tls_compat.c b/main/libtls-standalone/tls_compat.c
deleted file mode 100644
index 2d184e4020..0000000000
--- a/main/libtls-standalone/tls_compat.c
+++ /dev/null
@@ -1,369 +0,0 @@
-/*
- * Copyright (c) 2016 Tai Chi Minh Ralph Eastwood <tcmreastwood@gmail.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <openssl/opensslv.h>
-#include <openssl/x509_vfy.h>
-#include <openssl/ssl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <ctype.h>
-
-int SSL_CTX_load_verify_mem(SSL_CTX *ctx, void *buf, int len)
-{
- char fname[] = "/tmp/libtlscompatXXXXXX";
- int rc;
- int fd;
-
- fd = mkstemp(fname);
-
- if (fd < 0)
- return -1;
- do {
- ssize_t wrote = write(fd, buf, len);
- if(wrote == -1) {
- break;
- } else {
- buf = (char *)buf + wrote;
- len -= wrote;
- }
- } while(len);
- close(fd);
- rc = SSL_CTX_load_verify_locations(ctx, fname, NULL);
- remove(fname);
- return rc;
-}
-
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <sys/types.h>
-
-#include <unistd.h>
-#include <stdio.h>
-
-#include <openssl/err.h>
-#include <openssl/bio.h>
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-#include <openssl/ssl.h>
-
-int
-SSL_CTX_use_certificate_chain_mem(SSL_CTX *ctx, char *buf, off_t len)
-{
- int ret;
- BIO*in;
- X509*x;
- X509*ca;
- unsigned long err;
-
- ret = 0;
- x = ca = NULL;
-
- if ((in = BIO_new_mem_buf(buf, len)) == NULL) {
- SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE, ERR_R_BUF_LIB);
- goto end;
- }
-
- if ((x = PEM_read_bio_X509(in, NULL,
- SSL_CTX_get_default_passwd_cb(ctx),
- SSL_CTX_get_default_passwd_cb_userdata(ctx))) == NULL) {
- SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE, ERR_R_PEM_LIB);
- goto end;
- }
-
- if (!SSL_CTX_use_certificate(ctx, x) || ERR_peek_error() != 0)
- goto end;
-
- /* If we could set up our certificate, now proceed to
- * the CA certificates.
- */
- SSL_CTX_clear_extra_chain_certs(ctx);
-
- while ((ca = PEM_read_bio_X509(in, NULL,
- SSL_CTX_get_default_passwd_cb(ctx),
- SSL_CTX_get_default_passwd_cb_userdata(ctx))) != NULL) {
-
- if (!SSL_CTX_add_extra_chain_cert(ctx, ca))
- goto end;
- }
-
- err = ERR_peek_last_error();
- if (ERR_GET_LIB(err) == ERR_LIB_PEM &&
- ERR_GET_REASON(err) == PEM_R_NO_START_LINE)
- ERR_clear_error();
- else
- goto end;
-
- ret = 1;
-end:
- if (ca != NULL)
- X509_free(ca);
- if (x != NULL)
- X509_free(x);
- if (in != NULL)
- BIO_free(in);
- return (ret);
-}
-
-/*
- * Copyright (c) 2015 Bob Beck <beck@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * Parse an RFC 5280 format ASN.1 time string.
- *
- * mode must be:
- * 0 if we expect to parse a time as specified in RFC 5280 from an X509 object.
- * V_ASN1_UTCTIME if we wish to parse on RFC5280 format UTC time.
- * V_ASN1_GENERALIZEDTIME if we wish to parse an RFC5280 format Generalized time.
- *
- * Returns:
- * -1 if the string was invalid.
- * V_ASN1_UTCTIME if the string validated as a UTC time string.
- * V_ASN1_GENERALIZEDTIME if the string validated as a Generalized time string.
- *
- * Fills in *tm with the corresponding time if tm is non NULL.
- */
-
-#define GENTIME_LENGTH 15
-#define UTCTIME_LENGTH 13
-
-#define ATOI2(ar) ((ar) += 2, ((ar)[-2] - '0') * 10 + ((ar)[-1] - '0'))
-int
-ASN1_time_parse(const char *bytes, size_t len, struct tm *tm, int mode)
-{
- size_t i;
- int type = 0;
- struct tm ltm;
- struct tm *lt;
- const char *p;
-
- if (bytes == NULL)
- return (-1);
-
- /* Constrain to valid lengths. */
- if (len != UTCTIME_LENGTH && len != GENTIME_LENGTH)
- return (-1);
-
- lt = tm;
- if (lt == NULL) {
- memset(&ltm, 0, sizeof(ltm));
- lt = &ltm;
- }
-
- /* Timezone is required and must be GMT (Zulu). */
- if (bytes[len - 1] != 'Z')
- return (-1);
-
- /* Make sure everything else is digits. */
- for (i = 0; i < len - 1; i++) {
- if (isdigit((unsigned char)bytes[i]))
- continue;
- return (-1);
- }
-
- /*
- * Validate and convert the time
- */
- p = bytes;
- switch (len) {
- case GENTIME_LENGTH:
- if (mode == V_ASN1_UTCTIME)
- return (-1);
- lt->tm_year = (ATOI2(p) * 100) - 1900; /* cc */
- type = V_ASN1_GENERALIZEDTIME;
- /* FALLTHROUGH */
- case UTCTIME_LENGTH:
- if (type == 0) {
- if (mode == V_ASN1_GENERALIZEDTIME)
- return (-1);
- type = V_ASN1_UTCTIME;
- }
- lt->tm_year += ATOI2(p); /* yy */
- if (type == V_ASN1_UTCTIME) {
- if (lt->tm_year < 50)
- lt->tm_year += 100;
- }
- lt->tm_mon = ATOI2(p) - 1; /* mm */
- if (lt->tm_mon < 0 || lt->tm_mon > 11)
- return (-1);
- lt->tm_mday = ATOI2(p); /* dd */
- if (lt->tm_mday < 1 || lt->tm_mday > 31)
- return (-1);
- lt->tm_hour = ATOI2(p); /* HH */
- if (lt->tm_hour < 0 || lt->tm_hour > 23)
- return (-1);
- lt->tm_min = ATOI2(p); /* MM */
- if (lt->tm_min < 0 || lt->tm_min > 59)
- return (-1);
- lt->tm_sec = ATOI2(p); /* SS */
- /* Leap second 60 is not accepted. Reconsider later? */
- if (lt->tm_sec < 0 || lt->tm_sec > 59)
- return (-1);
- break;
- default:
- return (-1);
- }
-
- return (type);
-}
-
-/* $OpenBSD: a_time_tm.c,v 1.14 2017/08/28 17:42:47 jsing Exp $ */
-/*
- * Copyright (c) 2015 Bob Beck <beck@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <ctype.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-
-#include <openssl/asn1t.h>
-#include <openssl/err.h>
-
-#define RFC5280 0
-#define GENTIME_LENGTH 15
-#define UTCTIME_LENGTH 13
-
-int
-ASN1_time_tm_cmp(struct tm *tm1, struct tm *tm2)
-{
- if (tm1->tm_year < tm2->tm_year)
- return (-1);
- if (tm1->tm_year > tm2->tm_year)
- return (1);
- if (tm1->tm_mon < tm2->tm_mon)
- return (-1);
- if (tm1->tm_mon > tm2->tm_mon)
- return (1);
- if (tm1->tm_mday < tm2->tm_mday)
- return (-1);
- if (tm1->tm_mday > tm2->tm_mday)
- return (1);
- if (tm1->tm_hour < tm2->tm_hour)
- return (-1);
- if (tm1->tm_hour > tm2->tm_hour)
- return (1);
- if (tm1->tm_min < tm2->tm_min)
- return (-1);
- if (tm1->tm_min > tm2->tm_min)
- return (1);
- if (tm1->tm_sec < tm2->tm_sec)
- return (-1);
- if (tm1->tm_sec > tm2->tm_sec)
- return (1);
- return 0;
-}
-
-int
-ASN1_time_tm_clamp_notafter(struct tm *tm)
-{
- if (sizeof(time_t) < 8) {
- struct tm broken_os_epoch_tm;
- time_t broken_os_epoch_time = INT_MAX;
-
- if (gmtime_r(&broken_os_epoch_time, &broken_os_epoch_tm) == NULL)
- return 0;
-
- if (ASN1_time_tm_cmp(tm, &broken_os_epoch_tm) == 1)
- memcpy(tm, &broken_os_epoch_tm, sizeof(*tm));
- }
-
- return 1;
-}
diff --git a/main/libtls-standalone/tls_compat.h b/main/libtls-standalone/tls_compat.h
deleted file mode 100644
index 8e4629e35a..0000000000
--- a/main/libtls-standalone/tls_compat.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <string.h>
-
-#include <openssl/opensslv.h>
-#include <openssl/x509_vfy.h>
-
-#ifndef LIBTLS_TLS_COMPAT_H
-#define LIBTLS_TLS_COMPAT_H
-
-#ifndef X509_V_FLAG_NO_CHECK_TIME
-#define X509_V_FLAG_NO_CHECK_TIME 0
-#endif
-
-#ifndef SSL_OP_NO_CLIENT_RENEGOTIATION
-#define SSL_OP_NO_CLIENT_RENEGOTIATION 0
-#endif
-
-int SSL_CTX_load_verify_mem(SSL_CTX *ctx, void *buf, int len);
-
-int ASN1_time_parse(const char *bytes, size_t len, struct tm *tm, int mode);
-
-int SSL_CTX_use_certificate_chain_mem(SSL_CTX *, char *buf, off_t);
-
-#endif
diff --git a/main/libucontext/APKBUILD b/main/libucontext/APKBUILD
index d53af7fffc..c625b8de4b 100644
--- a/main/libucontext/APKBUILD
+++ b/main/libucontext/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=libucontext
-pkgver=1.0
+pkgver=1.1
pkgrel=0
pkgdesc="ucontext function implementations"
url="https://github.com/kaniini/libucontext"
@@ -29,4 +29,4 @@ package() {
make ARCH="$LIBUCONTEXT_ARCH" DESTDIR="$pkgdir" install install_docs
}
-sha512sums="98a40eace39751ec454c501919fdf13b1116d84cf3c77edaeb25c623376e9dc29923e66fc08eb79f1c07d8df6cf134dde722dc60ecb8d4f6c6fb84a132436669 libucontext-1.0.tar.xz"
+sha512sums="2692cf03753f20508094ccf736a5678d1e2564540aa6f82ba04806ee731325aeb05ebfe63dd78d752988ae002ac95ec56880886f40dcb1c88db51f5472445b65 libucontext-1.1.tar.xz"
diff --git a/main/libunistring/APKBUILD b/main/libunistring/APKBUILD
index d2d7dfd52b..c97e04460d 100644
--- a/main/libunistring/APKBUILD
+++ b/main/libunistring/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libunistring
pkgver=0.9.10
-pkgrel=0
+pkgrel=1
pkgdesc="Library for manipulating Unicode strings and C strings"
url="https://www.gnu.org/software/libunistring/"
arch="all"
@@ -12,7 +12,7 @@ depends=""
depends_dev=""
makedepends="$depends_dev"
install=""
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
source="https://ftp.gnu.org/gnu/libunistring/libunistring-$pkgver.tar.xz"
build() {
@@ -24,8 +24,7 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --localstatedir=/var \
- --disable-static
+ --localstatedir=/var
make
}
diff --git a/main/liburing/APKBUILD b/main/liburing/APKBUILD
index a8ef67b93b..7ef31eaa98 100644
--- a/main/liburing/APKBUILD
+++ b/main/liburing/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=liburing
-pkgver=0.7
+pkgver=2.0
pkgrel=0
pkgdesc="Linux kernel io_uring access library"
url="https://git.kernel.dk/cgit/liburing/"
@@ -25,4 +25,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="fe609bcf41485aa14565118787215f47e1c2358a1ce1d7fd20701f557655ca066e0cc706772298002b426aee5b29af616040c75ddb102c1f1c5a5b69249ae661 liburing-0.7.tar.gz"
+sha512sums="e7739a33bcbccc80da725556f924d49a3a78c945a7f1e74c03821a9dafc71c7821a46b7f042f1377a192b46b518ebb5e44f76e89aa7e8652f99f4cfbd9d05e79 liburing-2.0.tar.gz"
diff --git a/main/libva/APKBUILD b/main/libva/APKBUILD
index c8c987f406..b1c8e5e14c 100644
--- a/main/libva/APKBUILD
+++ b/main/libva/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libva
-pkgver=2.10.0
+pkgver=2.11.0
pkgrel=0
pkgdesc="Video Acceleration (VA) API for Linux"
url="https://01.org/linuxmedia"
@@ -36,4 +36,4 @@ package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C builddir
}
-sha512sums="b736cde67a8eac0d4c4ff6ea38905111e85ad8f2c9f4324a7f3324813286b3a04afdd386928be5d54fb787f003d13dfe82f44fe11049009c2ff8bf88e981579f libva-2.10.0.tar.gz"
+sha512sums="592df16bca06c93d252d27b2105032f020b0ca30f7937533918a497f385ec59b8a1e19c5d89047c197ddc1aab056128ab114b9ec29de3e968cb96bfa8d85f02a libva-2.11.0.tar.gz"
diff --git a/main/libverto/APKBUILD b/main/libverto/APKBUILD
index f8f624b413..9cc459c3e4 100644
--- a/main/libverto/APKBUILD
+++ b/main/libverto/APKBUILD
@@ -1,16 +1,15 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=libverto
-pkgver=0.3.1
-pkgrel=1
+pkgver=0.3.2
+pkgrel=0
pkgdesc="Main loop abstraction library"
url="https://github.com/npmccallum/libverto"
arch="all"
license="MIT"
makedepends="glib-dev libevent-dev libev-dev automake autoconf libtool"
subpackages="$pkgname-dev $pkgname-libev $pkgname-libevent $pkgname-glib"
-source="$pkgname-$pkgver.tar.gz::https://github.com/npmccallum/$pkgname/archive/$pkgver.tar.gz"
-builddir="$srcdir"/libverto-$pkgver
+source="$pkgname-$pkgver.tar.gz::https://github.com/npmccallum/libverto/archive/$pkgver.tar.gz"
prepare() {
default_prepare
@@ -19,7 +18,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -30,12 +28,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
@@ -49,4 +45,4 @@ libev() { _mv_backend libev; }
libevent() { _mv_backend libevent; }
glib() { _mv_backend glib; }
-sha512sums="8b46a5c410be210e52b92dccfe6e677026b26fd6cab1ee7a97d7eab4d4951913bde8768a77942189a0188ee336d5dcca2a985e9edc3a8c7529f164a7e5077bd8 libverto-0.3.1.tar.gz"
+sha512sums="0fb2b1bb80b62a06f8c068ba23011a5ddf1f640e08f3273292f33d9e4b6d101a3cd34113a592b7f4789931e95f180aae8d81e6fca94d8dc39dbf42d075da91f3 libverto-0.3.2.tar.gz"
diff --git a/main/libwebsockets/APKBUILD b/main/libwebsockets/APKBUILD
index 933b62796f..b109d6e8af 100644
--- a/main/libwebsockets/APKBUILD
+++ b/main/libwebsockets/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: V.Krishn <vkrishn4@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libwebsockets
-pkgver=4.1.6
+pkgver=4.2.0
pkgrel=0
pkgdesc="C library for lightweight websocket clients and servers"
url="https://libwebsockets.org"
@@ -25,7 +25,8 @@ build() {
-DCMAKE_VERBOSE_MAKEFILE=TRUE \
-DLWS_WITH_LIBUV=ON \
-DLWS_WITH_STATIC=OFF \
- -DLWS_LINK_TESTAPPS_DYNAMIC=ON
+ -DLWS_LINK_TESTAPPS_DYNAMIC=ON \
+ -DLWS_WITH_SDEVENT=OFF
make
}
@@ -53,5 +54,5 @@ _evlib() {
amove usr/lib/libwebsockets-$_plugin.so
}
-sha512sums="b83059b5405fe5c8bbfb6ef4cdfb66ce8b3fa2a660c013e64fa579f3ae09c70a6e3807d37ad4cff1d37b0c797959ba4e9c527be7e31520b3853161cfd6224a54 libwebsockets-4.1.6.tar.gz
+sha512sums="e1fb5b204a030ded8dfe2a75c66ec8d1a2e6a67e82c7709fe3c4277e0ccb5fb40c18db04e73c640d07ef4516aa266ae8b102f802b2a41b80980260cb6921f369 libwebsockets-4.2.0.tar.gz
9325b7cadeb2ca8fb20b4759feb49fb255b1b14c432b7c8c3a1b793a49266bb4f69b78a9c72656039e94ba4fc59ca2c5e821ba33e4f133e72cab26786feb9d60 fix-version-string.patch"
diff --git a/main/libxaw/APKBUILD b/main/libxaw/APKBUILD
index 3978b146ac..32e815d28d 100644
--- a/main/libxaw/APKBUILD
+++ b/main/libxaw/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxaw
-pkgver=1.0.13
-pkgrel=3
+pkgver=1.0.14
+pkgrel=0
pkgdesc="X Athena Widget Set"
url="https://www.x.org"
arch="all"
@@ -12,7 +12,6 @@ source="https://www.x.org/releases/individual/lib/libXaw-$pkgver.tar.bz2"
builddir="$srcdir"/libXaw-$pkgver
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -21,20 +20,17 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--localstatedir=/var \
- --disable-xaw8 \
--disable-static \
--disable-xaw6
make
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="d768a39f7111802493fa1df1b80d858e4139ceeb883d45ff13ce3b7a0e775a7d2834b7ad157c8330117f04c32f38979795332dd7a119adb2344fcb1aa9cf1e2f libXaw-1.0.13.tar.bz2"
+sha512sums="29d1c151369523ae6cb418e636b0b7b39ccccc35462a0b394dbeb46d5b6d780badd2eb872a55d9fbba1ee1af034e76c0463f40f8d8a7be2c336d08b3b1bf81d4 libXaw-1.0.14.tar.bz2"
diff --git a/main/libxcb/APKBUILD b/main/libxcb/APKBUILD
index 58e2d53952..068e39753b 100644
--- a/main/libxcb/APKBUILD
+++ b/main/libxcb/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxcb
pkgver=1.14
-pkgrel=1
+pkgrel=2
pkgdesc="X11 client-side library"
url="https://xcb.freedesktop.org"
arch="all"
diff --git a/main/libxkbcommon/APKBUILD b/main/libxkbcommon/APKBUILD
index ea0f53f105..68918f302f 100644
--- a/main/libxkbcommon/APKBUILD
+++ b/main/libxkbcommon/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer:
pkgname=libxkbcommon
-pkgver=1.1.0
+pkgver=1.2.1
pkgrel=0
pkgdesc="keyboard handling library"
url="https://www.xkbcommon.org/"
@@ -52,4 +52,4 @@ xkbcli() {
amove usr/libexec/xkbcommon/xkbcli*
}
-sha512sums="95b6b03e4ddfd158113dc1f9981172e2ca4225f9fd0e025ebaf68e09ec55fd4bfd7abd8434d2005e26b941ef541a22b0aa8d6d98e34b8919de2ee358d971e538 libxkbcommon-1.1.0.tar.gz"
+sha512sums="ac54a3548c3e108cd9d37e26b81d4dea1cd5f9d7b20ed9d242b049f5f8017e8a66a53750b85e78ebf22d198676b161e0a462e573a646a7ae5f29cba4b297815a libxkbcommon-1.2.1.tar.gz"
diff --git a/main/libxml2/APKBUILD b/main/libxml2/APKBUILD
index 75091d1821..cc7d745538 100644
--- a/main/libxml2/APKBUILD
+++ b/main/libxml2/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=libxml2
pkgver=2.9.10
-pkgrel=6
+pkgrel=7
pkgdesc="XML parsing library, version 2"
url="http://www.xmlsoft.org/"
arch="all"
@@ -23,6 +23,7 @@ source="http://xmlsoft.org/sources/libxml2-$pkgver.tar.gz
revert-Make-xmlFreeNodeList-non-recursive.patch
libxml2-2.9.8-python3-unicode-errors.patch
CVE-2020-24977.patch
+ python-3.9.patch
"
# secfixes:
@@ -105,4 +106,4 @@ sha512sums="0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee
347178e432379d543683cba21b902e7305202c03e8dbd724ae395963d677096a5cfc4e345e208d498163ca5174683c167610fc2b297090476038bc2bb7c84b4f revert-Make-xmlFreeNodeList-non-recursive.patch
a205c97fa1488fb8907cfa08b5f82e2055c80b86213dc3cc5c4b526fe6aa786bcc4e4eeb226c44635a1d021307b39e3940f706c42fb60e9e3e9b490a84164df7 libxml2-2.9.8-python3-unicode-errors.patch
b25a49cfb51569799ada41bad0efaf2666d70b9efb380987c3d5678fd943ada5d0baa18a3db5efa58dac65db8e2d2915ab5c6bac850d0c610656c89734853fd5 CVE-2020-24977.patch
-"
+bc8eff7d7a1cbf139b6a8e5de38e413211fb5021e93548f9c224affdc108fb5487e714aa911874c40fa6d0473a6925ad854479d71a6800d4aa53c8d4f3c34e1c python-3.9.patch"
diff --git a/main/libxml2/python-3.9.patch b/main/libxml2/python-3.9.patch
new file mode 100644
index 0000000000..e7db3e7df4
--- /dev/null
+++ b/main/libxml2/python-3.9.patch
@@ -0,0 +1,92 @@
+From e4fb36841800038c289997432ca547c9bfef9db1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Fri, 28 Feb 2020 12:48:14 +0100
+Subject: [PATCH] Parenthesize Py<type>_Check() in ifs
+
+In C, if expressions should be parenthesized.
+PyLong_Check, PyUnicode_Check etc. happened to expand to a parenthesized
+expression before, but that's not API to rely on.
+
+Since Python 3.9.0a4 it needs to be parenthesized explicitly.
+
+Fixes https://gitlab.gnome.org/GNOME/libxml2/issues/149
+---
+ python/libxml.c | 4 ++--
+ python/types.c | 12 ++++++------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/python/libxml.c b/python/libxml.c
+index bc676c4e..81e709f3 100644
+--- a/python/libxml.c
++++ b/python/libxml.c
+@@ -294,7 +294,7 @@ xmlPythonFileReadRaw (void * context, char * buffer, int len) {
+ lenread = PyBytes_Size(ret);
+ data = PyBytes_AsString(ret);
+ #ifdef PyUnicode_Check
+- } else if PyUnicode_Check (ret) {
++ } else if (PyUnicode_Check (ret)) {
+ #if PY_VERSION_HEX >= 0x03030000
+ Py_ssize_t size;
+ const char *tmp;
+@@ -359,7 +359,7 @@ xmlPythonFileRead (void * context, char * buffer, int len) {
+ lenread = PyBytes_Size(ret);
+ data = PyBytes_AsString(ret);
+ #ifdef PyUnicode_Check
+- } else if PyUnicode_Check (ret) {
++ } else if (PyUnicode_Check (ret)) {
+ #if PY_VERSION_HEX >= 0x03030000
+ Py_ssize_t size;
+ const char *tmp;
+diff --git a/python/types.c b/python/types.c
+index c2bafeb1..ed284ec7 100644
+--- a/python/types.c
++++ b/python/types.c
+@@ -602,16 +602,16 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
+ if (obj == NULL) {
+ return (NULL);
+ }
+- if PyFloat_Check (obj) {
++ if (PyFloat_Check (obj)) {
+ ret = xmlXPathNewFloat((double) PyFloat_AS_DOUBLE(obj));
+- } else if PyLong_Check(obj) {
++ } else if (PyLong_Check(obj)) {
+ #ifdef PyLong_AS_LONG
+ ret = xmlXPathNewFloat((double) PyLong_AS_LONG(obj));
+ #else
+ ret = xmlXPathNewFloat((double) PyInt_AS_LONG(obj));
+ #endif
+ #ifdef PyBool_Check
+- } else if PyBool_Check (obj) {
++ } else if (PyBool_Check (obj)) {
+
+ if (obj == Py_True) {
+ ret = xmlXPathNewBoolean(1);
+@@ -620,14 +620,14 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
+ ret = xmlXPathNewBoolean(0);
+ }
+ #endif
+- } else if PyBytes_Check (obj) {
++ } else if (PyBytes_Check (obj)) {
+ xmlChar *str;
+
+ str = xmlStrndup((const xmlChar *) PyBytes_AS_STRING(obj),
+ PyBytes_GET_SIZE(obj));
+ ret = xmlXPathWrapString(str);
+ #ifdef PyUnicode_Check
+- } else if PyUnicode_Check (obj) {
++ } else if (PyUnicode_Check (obj)) {
+ #if PY_VERSION_HEX >= 0x03030000
+ xmlChar *str;
+ const char *tmp;
+@@ -650,7 +650,7 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
+ ret = xmlXPathWrapString(str);
+ #endif
+ #endif
+- } else if PyList_Check (obj) {
++ } else if (PyList_Check (obj)) {
+ int i;
+ PyObject *node;
+ xmlNodePtr cur;
+--
+GitLab
+
diff --git a/main/links/APKBUILD b/main/links/APKBUILD
index 75d5e828e4..71e116393e 100644
--- a/main/links/APKBUILD
+++ b/main/links/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=links
-pkgver=2.21
-pkgrel=1
+pkgver=2.22
+pkgrel=0
pkgdesc="Web browser running in both graphics and text mode"
url="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links"
arch="all"
@@ -12,7 +12,6 @@ makedepends="bzip2-dev openssl-dev zlib-dev libevent-dev zstd-dev"
source="http://links.twibright.com/download/links-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,8 +25,7 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="11fd523d0aa102d8160957bdbd36674a621aeb2e33237f0df35dcc3fad92ec288acd31dc2e7542717406047165f1249d68972c77cdb27fda076645636a056da8 links-2.21.tar.bz2"
+sha512sums="d2c9f764d64c2d73b85c998db9fc8c241556977380eef1f4041623ca306f5798227b2b57daecf09ee85e0b07f8738bdfe0b84fefc924d6e05d931e29d29ba40e links-2.22.tar.bz2"
diff --git a/main/linux-firmware/APKBUILD b/main/linux-firmware/APKBUILD
index 6992412aa5..1b5acfab15 100644
--- a/main/linux-firmware/APKBUILD
+++ b/main/linux-firmware/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Oliver Smith <ollieparanoid@postmarketos.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=linux-firmware
-pkgver=20210208
-pkgrel=0
+pkgver=20210315
+pkgrel=1
pkgdesc="firmware files for linux"
url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
arch="all"
@@ -12,12 +12,13 @@ provides="linux-firmware-any"
provider_priority=1
options="!strip !check !archcheck !tracedeps !spdx"
-_rpi_bt=fff76cb15527c435ce99a9787848eacd6288282c
+_rpi_bt=e7fd166981ab4bb9a36c2d1500205a078a35714d
source="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-$pkgver.tar.gz
BCM43430A1.hcd.${_rpi_bt::8}::https://github.com/RPi-Distro/bluez-firmware/raw/$_rpi_bt/broadcom/BCM43430A1.hcd
BCM4345C0.hcd.${_rpi_bt::8}::https://github.com/RPi-Distro/bluez-firmware/raw/$_rpi_bt/broadcom/BCM4345C0.hcd
- "
+ BCM43430B0.hcd.${_rpi_bt::8}::https://github.com/RPi-Distro/bluez-firmware/raw/$_rpi_bt/broadcom/BCM43430B0.hcd
+ BCM4345C5.hcd.${_rpi_bt::8}::https://github.com/RPi-Distro/bluez-firmware/raw/$_rpi_bt/broadcom/BCM4345C5.hcd"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -28,9 +29,9 @@ _folders="3com acenic adaptec advansys amd amd-ucode amdgpu ar3k ath10k ath11k
ess go7007 i915 imx inside-secure intel isci kaweth keyspan keyspan_pda korg
libertas liquidio matrox mediatek mellanox meson microchip moxa mrvl mwl8k
mwlwifi myricom netronome nvidia ositech qca qcom qed qlogic r128 radeon
- rockchip rsi rtl8192e rtl_bt rtl_nic rtlwifi rtw88 sb16 slicoss sun sxg tehuti
- ti ti-connectivity ti-keystone tigon ttusb-budget ueagle-atm vicam vxge yam
- yamaha"
+ rockchip rsi rtl8192e rtl_bt rtl_nic rtlwifi rtw88 rtw89 sb16 silabs slicoss
+ sun sxg tehuti ti ti-connectivity ti-keystone tigon ttusb-budget ueagle-atm
+ vicam vxge yam yamaha"
subpackages="$pkgname-other::noarch $pkgname-none::noarch"
depends="linux-firmware-other=$pkgver-r$pkgrel"
@@ -132,6 +133,8 @@ ucode() {
bsdtar --null -cf - --format=newc @- > "$subpkgdir"/boot/amd-ucode.img
}
-sha512sums="812e2d84d7c6eb40705556c258243ddae84c89eb3ad788a27c44edd2f3d56ab4b99721430b816d089d250e6281afd408e027fe5d2632181c059394ff6a9f9414 linux-firmware-20210208.tar.gz
-a7b37bce092367125e390017bb0329c3b7f8fa891cf30d422ee73ce53d0592d4ff0fc2e2a94a87eefb641d5dd8631fae1cc46664224dea987ca04b68a8af8519 BCM43430A1.hcd.fff76cb1
-a52fdb876131affa85b39434d619580c0e1605094992ffa3bb321af387dd79739736842dea9ffa759e6658aecde40eda6b06d93dbb58234a4b126b756c28521e BCM4345C0.hcd.fff76cb1"
+sha512sums="06e4dbd4b48d655ee0a266a1d516a04fa7c03badfe5b46fdc33b7251f9c4aef904f38e87949d5993d7bc453a6f6104cf5ae7695c817a26e91943d77395d85cc5 linux-firmware-20210315.tar.gz
+355c940b4fd597101c332207678fd28154d7e7a90cb374b1fdf230d2061bf979af0209c5a423fca8d23ddb3d95abec741e7dd651da7f0aaa97459ed4fe4d2355 BCM43430A1.hcd.e7fd1669
+1707c2955ceac3e6fc4b1edb8965c871dcfab21ce85cc617de67d7e6f3d6f9b93ee5a8a202de6b20f7b43d1462668287a8569786146cadf5e0268058d2524a9c BCM4345C0.hcd.e7fd1669
+c8b943bfeffa54ce1687ca69884e9d56efd28d5ea1dbef660915a80c3e036a8675e7d4299102c32006193e4895367654bb67e2d08e66d7803f396eee7e3dfbd6 BCM43430B0.hcd.e7fd1669
+eac7428befa36952542e19d3c4a5fa96e1cb3a56c3b00770534909fb0d8caf503a42368175e715e1de58e50cfbd2b4c8ea5a26af3bd546cbbaf8d2c12457a628 BCM4345C5.hcd.e7fd1669"
diff --git a/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch b/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
index b5c4e1750e..f3381c4b18 100644
--- a/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
+++ b/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
@@ -13,17 +13,17 @@ Upstream-Status: Submitted
include/uapi/linux/kernel.h | 2 ++
1 file changed, 2 insertions(+)
-Index: linux-4.8-rc4/include/uapi/linux/kernel.h
-===================================================================
---- linux-4.8-rc4.orig/include/uapi/linux/kernel.h
-+++ linux-4.8-rc4/include/uapi/linux/kernel.h
-@@ -1,7 +1,9 @@
+diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h
+index fadf2db71fe8..813800ed141f 100644
+--- a/include/uapi/linux/kernel.h
++++ b/include/uapi/linux/kernel.h
+@@ -2,7 +2,9 @@
#ifndef _UAPI_LINUX_KERNEL_H
#define _UAPI_LINUX_KERNEL_H
+#ifdef __GLIBC__
#include <linux/sysinfo.h>
+#endif
+ #include <linux/const.h>
- /*
- * 'kernel.h' contains some often-used function prototypes etc
+ #endif /* _UAPI_LINUX_KERNEL_H */
diff --git a/main/linux-headers/APKBUILD b/main/linux-headers/APKBUILD
index a6078f643d..b723ab151a 100644
--- a/main/linux-headers/APKBUILD
+++ b/main/linux-headers/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=linux-headers
-pkgver=5.7.8
+pkgver=5.10.27
_kernver=${pkgver%.*}
pkgrel=0
pkgdesc="Linux system headers"
@@ -47,8 +47,8 @@ package() {
rm -rf "$pkgdir"/usr/include/drm
}
-sha512sums="45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6 linux-5.7.tar.xz
-4820a45fba9fa299181a96598a96bbdbf6f5faaf1862173d9cca3cc5ea84c21d8e7d4baf0601697565fad3b7d3c76085f4ac86a726961b62c356d70968edc48f patch-5.7.8.xz
+sha512sums="95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e linux-5.10.tar.xz
+fb18bbd9cfac84e438ea00e3a1a8e9e2a74ea91da57c3ed0f87c0028ffaa7be88be9b5c2f382ac4be06ff468b187480f719eed4df7b38bf9f7beaeddb352c0eb patch-5.10.27.xz
32597f2672d1ec365a936d15041a7cf219ef9353241d4a5c378244cf2fc155610443a19bbcd391c86099a0b08486c45e042ec7c90b0d04fe675c3ad0ffc36b53 revert-broken-uapi.patch
-302283b1b5f560c850e24aad73febcf7f906ed62b4cad2d826bf140ffe59191631f3cd4ac29525c349cdfe61aba6a47886a0d76f1c6a4a16b744d59b94ea5df8 0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
+607c074d72aca88fea9ecdbd62198d8f7857daca75e5d027966e0a9997338d6ac8ce0a1e9114b19232b390751d05acca09e28b0cfad2a12d5942f5575a9f4684 0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
7cfa786144009c52d682e307bb512156e4812d7abe03b3fed99651a02d80567d47ee6f347f88d083c1b9805e0c09625fc3df08a8d0ae96b169d24eb5b83917b7 include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch"
diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD
index a63ea6ecfb..c31c68e261 100644
--- a/main/linux-lts/APKBUILD
+++ b/main/linux-lts/APKBUILD
@@ -2,7 +2,7 @@
_flavor=lts
pkgname=linux-${_flavor}
-pkgver=5.10.19
+pkgver=5.10.35
case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;;
@@ -22,6 +22,7 @@ source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver
0007-pci-hotplug-declare-IDT-bridge-as-hotpluggabl-bridge.patch
0008-pci-spr2803-quirk-to-fix-class-ID.patch
+ ampere-mt-jade.patch
config-lts.aarch64
config-lts.armv7
@@ -68,6 +69,11 @@ ppc*) _carch="powerpc" ;;
s390*) _carch="s390" ;;
esac
+# secfixes:
+# 5.10.4-r0:
+# - CVE-2020-29568
+# - CVE-2020-29569
+
prepare() {
local _patch_failed=
cd "$srcdir"/linux-$_kernver
@@ -224,20 +230,23 @@ _dev() {
"$subpkgdir"/lib/modules/${_abi_release}/build
}
-sha512sums="95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e linux-5.10.tar.xz
+sha512sums="
+95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e linux-5.10.tar.xz
d19365fe94431008768c96a2c88955652f70b6df6677457ee55ee95246a64fdd2c6fed9b3bef37c29075178294a7fc91f148ead636382530ebfa822be4ad8c2f 0002-powerpc-config-defang-gcc-check-for-stack-protector-.patch
ca5aafac37e0b5f3fcbaf801e12f98beb58ffaf1d8c88f76caff22b059831869b4094e7fdcb6d6860422d6b2d036e072caff460e1feb84bd04d10740ad56265b 0007-pci-hotplug-declare-IDT-bridge-as-hotpluggabl-bridge.patch
cbe85cf34e8420c91d2276c2d2aa0ab5023af68e57a1fa613f073f16a76766c67f585eda71c28f232bd0625e0dc8275a9eddc95f49409205dc0dbcc28c9fac1c 0008-pci-spr2803-quirk-to-fix-class-ID.patch
-3db7c984aa303ade05164f28edeb419217635f7801fc9477e1e1682381d5d4ec29ff4b5302e4f40f088c8e7ddf8041ade8f83ca5b96b49d9911d27ee61a326a3 config-lts.aarch64
-0db9b7cd5eb75840777029743f9399514791ddc88ae3b5f772447359ca33ff6c187506bf5fcca077997fb24a79356651c6003e54e008024c3b7798bf3ea8516c config-lts.armv7
-489ddf854d30c3abbb7a4a772147d8a6aa5982c0f9b94db585a6394e56c26c212f5221a0b0a74afa4f3ccbc281f0dfc7d6464bc542eabee8b565f4fea8f34243 config-lts.x86
-19bd0c1bc45930e0c56abd71db590bc774352eb938241e0a029a5bba0a3619b5d23865d182fbdce0d6451f641ad237f21b7836b5388d62f550bdcf55bdd7e802 config-lts.x86_64
-b6aac23c041f70c0d43a729f11597e11178d1a819f040fa0b6272fd83c3b284458c79bb88d99aeae2b87c28776f63bff9c92660bff6630ea016f362099a5de42 config-lts.ppc64le
-870bede958686b413700d28e8143962dbc368bac091d74ae86bd9d8201871cb19c7010d104fa654309f0c36c0d9e36177b06e05cc6af6abcb54f673b281f1eb7 config-lts.s390x
-baed39f4f46cafd9a2b835d4f1620c71b89d36992e96cf32d5d46d8636f7474b2c8398f4ad6af00625c72b70d45ee539709efa453bb132f3aae80536b56591a2 config-lts.mips64
-329841ad0a9021f08eba361ef08862444afb0994c9cd727903ce8a767950a60494fc6f3755e01bdaad04f75b0080518f53f9f1f8d5380202cc53f29bab2e6400 config-virt.aarch64
-74bdda8757de4b0207d813544fe68d5991dc8d88cc40f0257deafcf8a3dcbffa7cad64ae99090cf7d0c64cc9a8e67f16a1e9ff6ddf213a5b36bfffc545823702 config-virt.armv7
-bcb8ea434260cfe9a1618e967c17067441d838b74a0dbffd211945b5470df8c4d8132da362eac29794904cfd41cbf589a4a62cd302ccdfc951603b3e1269a6e9 config-virt.ppc64le
-dd919f927efa037c766d4dd988034e5301c43a08730b83428cd352db4ab693695d4b7f3476e5fb28f34a00909e5ce3fd4d94e00b737326d69dc4b597b5a680f9 config-virt.x86
-6735d6911884b22668de0d7f709ea6e2a2afffcd3751f7d2bec18b953f04d982bf4680f1b5ecb6daecb1b89cee0b2d7f70c5a9f13ac2ea353fcdcfcc24e32c80 config-virt.x86_64
-9637f8dac379ffa6d376afcce8da87250eb48a6a2ffac0e5732884cca2cc2f0a85811fc326f006d2d297680ff7dcf726665360d9c7d5d34307bc3e7169ce6a7a patch-5.10.19.xz"
+16b2d5b0255b37075ba894fc797673d633395907ce0b93400c5a8bd05b512b5cd040b91000fa41f9240d42afc664a69206597d1e3f754a1aa64b9be21a67f5c6 ampere-mt-jade.patch
+9b6e2988f819ab234380b7e7899732e53e4403577abb8dc7d4792ce5004fa5a786ef16c245e603f06ae58677f954e2354bd7578d89c6c99dd0bd531c28f1267a config-lts.aarch64
+e9acae08bfbbdf1227544c7e635232a7037d945f0bc6cc316361092a18f0a8cc1326979bed7b948d5284d25d3e0ade77d2a04494933886d5c4b37d5aae1c8427 config-lts.armv7
+fd4e6ecfa98a7f74a384089b07802f40f30a70300cd466b30a5343b3594cf20679ac6c4f80ea815987ce1deff92d75039d6692ba9e3ad85035878e2a360d43eb config-lts.x86
+f370f92e35a8815229e52eec5a5e9c4d15ab01c8e7afa13e9672b6b1d1e0eaeb1379347fe92ae172d61bb749d5ebe53dee2c4f1a3062b144befc3a7339502bb0 config-lts.x86_64
+46b44a0dc3ceb85f081bc04bacfab12f9e5e701eeeff89281af8123a2061afb4012194c9d5c5365c1391c95bdcdc12e641436458000c6b145024072e676c9eec config-lts.ppc64le
+b0aa02a11f6f8d88b83d8a615d0fa182e8033bc1543e94099030dd777d9930876ab1b3b4ffee60cf4efda92860a9755f939226c5b5bec69317a47284866dea55 config-lts.s390x
+06148ae8d49127dd17a3b5cbe8e09bb4e3b95a85a9b372d6a2753a59c1c9caf5639dce865f3bab36da58c8fdcebe52483d7b0c785fdf15e3b71d6fc59c61c6c6 config-lts.mips64
+8fcfe68a15d4316d4cb8bddfc2fa82b9ef96c773a8a16b6347bddd8a2e399187dbf3facb8b7df26795a28d2c55db9e9a12b94a5021d7de251e52db32a0fc7071 config-virt.aarch64
+b4799566dbb0ea7813647c965937c72a40afe60e535a29fb94b8343170e2272c73c27c68568ab296bb6351dfdedd28d0bc2e0000e378afe9c90d7a20a2cc86b5 config-virt.armv7
+a795ab637ba2d84da8f1475bbac4600b59370c277b788fd58b3b28cb3dccf3d3d19b0d5196d915ccfb46c95a2ee20b4626401ee3ee05a54ee17c59bef963142e config-virt.ppc64le
+00aef9f7f596be069eba7b5c3ed23d2b057a35d8c9d3b0d54f562a3460302583164baade001f971c9deb16fd8b7bdd36bdc1e7aa0a1fbed75dc55a1f3e3e8e4f config-virt.x86
+bf8bf531cc6fd1d2d80eda1129b67bd28a7f04c7e893d6ef4d52dcd5f9bcc9b9e712efe205f0f6b2d32a8a23e19670e9498a636e6dc4e9b6f920e1ee253582b7 config-virt.x86_64
+9771da96b4f79b5ff5927379f5a939ff3c0f70724fab5cdc7d6fc81ed993fac89244c1c0e26e8c6c034a27f5f670f813071ea33e1d1d36a2e1a5370644d67112 patch-5.10.35.xz
+"
diff --git a/main/linux-lts/ampere-mt-jade.patch b/main/linux-lts/ampere-mt-jade.patch
new file mode 100644
index 0000000000..62a6c490f1
--- /dev/null
+++ b/main/linux-lts/ampere-mt-jade.patch
@@ -0,0 +1,600 @@
+From 36652a295266095a5f44bdb1c9f2c6400a9c71cf Mon Sep 17 00:00:00 2001
+From: Quan Nguyen <quan@os.amperecomputing.com>
+Date: Tue, 8 Dec 2020 11:37:00 +0700
+Subject: [PATCH] ARM: dts: aspeed: Add device tree for Ampere's Mt. Jade BMC
+
+The Mt. Jade BMC is an ASPEED AST2500-based BMC for the Mt. Jade
+hardware reference platform with Ampere's Altra Processor Family.
+
+Signed-off-by: Quan Nguyen <quan@os.amperecomputing.com>
+Signed-off-by: Phong Vo <phong@os.amperecomputing.com>
+Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
+Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
+Reviewed-by: Joel Stanley <joel@jms.id.au>
+Link: https://lore.kernel.org/r/20201208043700.23098-3-quan@os.amperecomputing.com
+Signed-off-by: Joel Stanley <joel@jms.id.au>
+---
+ arch/arm/boot/dts/Makefile | 1 +
+ .../arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 558 ++++++++++++++++++
+ 2 files changed, 559 insertions(+)
+ create mode 100644 arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 3d1ea0b25168..5271820a5380 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -1403,6 +1403,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
+ aspeed-ast2500-evb.dtb \
+ aspeed-ast2600-evb.dtb \
+ aspeed-bmc-amd-ethanolx.dtb \
++ aspeed-bmc-ampere-mtjade.dtb \
+ aspeed-bmc-arm-centriq2400-rep.dtb \
+ aspeed-bmc-arm-stardragon4800-rep2.dtb \
+ aspeed-bmc-bytedance-g220a.dtb \
+diff --git a/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
+new file mode 100644
+index 000000000000..8f5ec22e51c2
+--- /dev/null
++++ b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
+@@ -0,0 +1,558 @@
++// SPDX-License-Identifier: GPL-2.0+
++/dts-v1/;
++#include "aspeed-g5.dtsi"
++#include <dt-bindings/gpio/aspeed-gpio.h>
++
++/ {
++ model = "Ampere Mt. Jade BMC";
++ compatible = "ampere,mtjade-bmc", "aspeed,ast2500";
++
++ chosen {
++ stdout-path = &uart5;
++ bootargs = "console=ttyS4,115200 earlyprintk";
++ };
++
++ memory@80000000 {
++ reg = <0x80000000 0x20000000>;
++ };
++
++ reserved-memory {
++ #address-cells = <1>;
++ #size-cells = <1>;
++ ranges;
++
++ vga_memory: framebuffer@9f000000 {
++ no-map;
++ reg = <0x9f000000 0x01000000>; /* 16M */
++ };
++
++ gfx_memory: framebuffer {
++ size = <0x01000000>;
++ alignment = <0x01000000>;
++ compatible = "shared-dma-pool";
++ reusable;
++ };
++
++ video_engine_memory: jpegbuffer {
++ size = <0x02000000>; /* 32M */
++ alignment = <0x01000000>;
++ compatible = "shared-dma-pool";
++ reusable;
++ };
++ };
++
++ leds {
++ compatible = "gpio-leds";
++
++ fault {
++ gpios = <&gpio ASPEED_GPIO(B, 6) GPIO_ACTIVE_HIGH>;
++ };
++
++ identify {
++ gpios = <&gpio ASPEED_GPIO(Q, 6) GPIO_ACTIVE_HIGH>;
++ };
++ };
++
++ gpio-keys {
++ compatible = "gpio-keys";
++
++ shutdown_ack {
++ label = "SHUTDOWN_ACK";
++ gpios = <&gpio ASPEED_GPIO(G, 2) GPIO_ACTIVE_LOW>;
++ linux,code = <ASPEED_GPIO(G, 2)>;
++ };
++
++ reboot_ack {
++ label = "REBOOT_ACK";
++ gpios = <&gpio ASPEED_GPIO(J, 3) GPIO_ACTIVE_LOW>;
++ linux,code = <ASPEED_GPIO(J, 3)>;
++ };
++
++ S0_overtemp {
++ label = "S0_OVERTEMP";
++ gpios = <&gpio ASPEED_GPIO(G, 3) GPIO_ACTIVE_LOW>;
++ linux,code = <ASPEED_GPIO(G, 3)>;
++ };
++
++ S0_hightemp {
++ label = "S0_HIGHTEMP";
++ gpios = <&gpio ASPEED_GPIO(J, 0) GPIO_ACTIVE_LOW>;
++ linux,code = <ASPEED_GPIO(J, 0)>;
++ };
++
++ S0_cpu_fault {
++ label = "S0_CPU_FAULT";
++ gpios = <&gpio ASPEED_GPIO(J, 1) GPIO_ACTIVE_HIGH>;
++ linux,code = <ASPEED_GPIO(J, 1)>;
++ };
++
++ S1_overtemp {
++ label = "S1_OVERTEMP";
++ gpios = <&gpio ASPEED_GPIO(Z, 6) GPIO_ACTIVE_LOW>;
++ linux,code = <ASPEED_GPIO(Z, 6)>;
++ };
++
++ S1_hightemp {
++ label = "S1_HIGHTEMP";
++ gpios = <&gpio ASPEED_GPIO(AB, 0) GPIO_ACTIVE_LOW>;
++ linux,code = <ASPEED_GPIO(AB, 0)>;
++ };
++
++ S1_cpu_fault {
++ label = "S1_CPU_FAULT";
++ gpios = <&gpio ASPEED_GPIO(Z, 1) GPIO_ACTIVE_HIGH>;
++ linux,code = <ASPEED_GPIO(Z, 1)>;
++ };
++
++ id_button {
++ label = "ID_BUTTON";
++ gpios = <&gpio ASPEED_GPIO(Q, 5) GPIO_ACTIVE_LOW>;
++ linux,code = <ASPEED_GPIO(Q, 5)>;
++ };
++
++ };
++
++ gpioA0mux: mux-controller {
++ compatible = "gpio-mux";
++ #mux-control-cells = <0>;
++ mux-gpios = <&gpio ASPEED_GPIO(A, 0) GPIO_ACTIVE_LOW>;
++ };
++
++ adc0mux: adc0mux {
++ compatible = "io-channel-mux";
++ io-channels = <&adc 0>;
++ #io-channel-cells = <1>;
++ io-channel-names = "parent";
++ mux-controls = <&gpioA0mux>;
++ channels = "s0", "s1";
++ };
++
++ adc1mux: adc1mux {
++ compatible = "io-channel-mux";
++ io-channels = <&adc 1>;
++ #io-channel-cells = <1>;
++ io-channel-names = "parent";
++ mux-controls = <&gpioA0mux>;
++ channels = "s0", "s1";
++ };
++
++ adc2mux: adc2mux {
++ compatible = "io-channel-mux";
++ io-channels = <&adc 2>;
++ #io-channel-cells = <1>;
++ io-channel-names = "parent";
++ mux-controls = <&gpioA0mux>;
++ channels = "s0", "s1";
++ };
++
++ adc3mux: adc3mux {
++ compatible = "io-channel-mux";
++ io-channels = <&adc 3>;
++ #io-channel-cells = <1>;
++ io-channel-names = "parent";
++ mux-controls = <&gpioA0mux>;
++ channels = "s0", "s1";
++ };
++
++ adc4mux: adc4mux {
++ compatible = "io-channel-mux";
++ io-channels = <&adc 4>;
++ #io-channel-cells = <1>;
++ io-channel-names = "parent";
++ mux-controls = <&gpioA0mux>;
++ channels = "s0", "s1";
++ };
++
++ adc5mux: adc5mux {
++ compatible = "io-channel-mux";
++ io-channels = <&adc 5>;
++ #io-channel-cells = <1>;
++ io-channel-names = "parent";
++ mux-controls = <&gpioA0mux>;
++ channels = "s0", "s1";
++ };
++
++ adc6mux: adc6mux {
++ compatible = "io-channel-mux";
++ io-channels = <&adc 6>;
++ #io-channel-cells = <1>;
++ io-channel-names = "parent";
++ mux-controls = <&gpioA0mux>;
++ channels = "s0", "s1";
++ };
++
++ adc7mux: adc7mux {
++ compatible = "io-channel-mux";
++ io-channels = <&adc 7>;
++ #io-channel-cells = <1>;
++ io-channel-names = "parent";
++ mux-controls = <&gpioA0mux>;
++ channels = "s0", "s1";
++ };
++
++ adc8mux: adc8mux {
++ compatible = "io-channel-mux";
++ io-channels = <&adc 8>;
++ #io-channel-cells = <1>;
++ io-channel-names = "parent";
++ mux-controls = <&gpioA0mux>;
++ channels = "s0", "s1";
++ };
++
++ adc9mux: adc9mux {
++ compatible = "io-channel-mux";
++ io-channels = <&adc 9>;
++ #io-channel-cells = <1>;
++ io-channel-names = "parent";
++ mux-controls = <&gpioA0mux>;
++ channels = "s0", "s1";
++ };
++
++ adc10mux: adc10mux {
++ compatible = "io-channel-mux";
++ io-channels = <&adc 10>;
++ #io-channel-cells = <1>;
++ io-channel-names = "parent";
++ mux-controls = <&gpioA0mux>;
++ channels = "s0", "s1";
++ };
++
++ adc11mux: adc11mux {
++ compatible = "io-channel-mux";
++ io-channels = <&adc 11>;
++ #io-channel-cells = <1>;
++ io-channel-names = "parent";
++ mux-controls = <&gpioA0mux>;
++ channels = "s0", "s1";
++ };
++
++ adc12mux: adc12mux {
++ compatible = "io-channel-mux";
++ io-channels = <&adc 12>;
++ #io-channel-cells = <1>;
++ io-channel-names = "parent";
++ mux-controls = <&gpioA0mux>;
++ channels = "s0", "s1";
++ };
++
++ adc13mux: adc13mux {
++ compatible = "io-channel-mux";
++ io-channels = <&adc 13>;
++ #io-channel-cells = <1>;
++ io-channel-names = "parent";
++ mux-controls = <&gpioA0mux>;
++ channels = "s0", "s1";
++ };
++
++ iio-hwmon {
++ compatible = "iio-hwmon";
++ io-channels = <&adc0mux 0>, <&adc0mux 1>,
++ <&adc1mux 0>, <&adc1mux 1>,
++ <&adc2mux 0>, <&adc2mux 1>,
++ <&adc3mux 0>, <&adc3mux 1>,
++ <&adc4mux 0>, <&adc4mux 1>,
++ <&adc5mux 0>, <&adc5mux 1>,
++ <&adc6mux 0>, <&adc6mux 1>,
++ <&adc7mux 0>, <&adc7mux 1>,
++ <&adc8mux 0>, <&adc8mux 1>,
++ <&adc9mux 0>, <&adc9mux 1>,
++ <&adc10mux 0>, <&adc10mux 1>,
++ <&adc11mux 0>, <&adc11mux 1>,
++ <&adc12mux 0>, <&adc12mux 1>,
++ <&adc13mux 0>, <&adc13mux 1>;
++ };
++
++ iio-hwmon-adc14 {
++ compatible = "iio-hwmon";
++ io-channels = <&adc 14>;
++ };
++
++ iio-hwmon-battery {
++ compatible = "iio-hwmon";
++ io-channels = <&adc 15>;
++ };
++};
++
++&fmc {
++ status = "okay";
++ flash@0 {
++ status = "okay";
++ m25p,fast-read;
++ label = "bmc";
++ /* spi-max-frequency = <50000000>; */
++#include "openbmc-flash-layout.dtsi"
++ };
++};
++
++&spi1 {
++ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_spi1_default>;
++
++ flash@0 {
++ status = "okay";
++ m25p,fast-read;
++ label = "pnor";
++ /* spi-max-frequency = <100000000>; */
++ };
++};
++
++&uart1 {
++ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_txd1_default
++ &pinctrl_rxd1_default
++ &pinctrl_ncts1_default
++ &pinctrl_nrts1_default>;
++};
++
++&uart2 {
++ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_txd2_default
++ &pinctrl_rxd2_default>;
++};
++
++&uart3 {
++ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_txd3_default
++ &pinctrl_rxd3_default>;
++};
++
++&uart4 {
++ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_txd4_default
++ &pinctrl_rxd4_default>;
++};
++
++/* The BMC's uart */
++&uart5 {
++ status = "okay";
++};
++
++&mac1 {
++ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;
++};
++
++&i2c0 {
++ status = "okay";
++};
++
++&i2c1 {
++ status = "okay";
++};
++
++&i2c2 {
++ status = "okay";
++};
++
++&i2c3 {
++ status = "okay";
++ eeprom@50 {
++ compatible = "microchip,24c64", "atmel,24c64";
++ reg = <0x50>;
++ pagesize = <32>;
++ };
++
++ inlet_mem2: tmp175@28 {
++ compatible = "ti,tmp175";
++ reg = <0x28>;
++ };
++
++ inlet_cpu: tmp175@29 {
++ compatible = "ti,tmp175";
++ reg = <0x29>;
++ };
++
++ inlet_mem1: tmp175@2a {
++ compatible = "ti,tmp175";
++ reg = <0x2a>;
++ };
++
++ outlet_cpu: tmp175@2b {
++ compatible = "ti,tmp175";
++ reg = <0x2b>;
++ };
++
++ outlet1: tmp175@2c {
++ compatible = "ti,tmp175";
++ reg = <0x2c>;
++ };
++
++ outlet2: tmp175@2d {
++ compatible = "ti,tmp175";
++ reg = <0x2d>;
++ };
++};
++
++&i2c4 {
++ status = "okay";
++ rtc@51 {
++ compatible = "nxp,pcf85063a";
++ reg = <0x51>;
++ };
++};
++
++&i2c5 {
++ status = "okay";
++};
++
++&i2c6 {
++ status = "okay";
++ psu@58 {
++ compatible = "pmbus";
++ reg = <0x58>;
++ };
++
++ psu@59 {
++ compatible = "pmbus";
++ reg = <0x59>;
++ };
++};
++
++&i2c7 {
++ status = "okay";
++};
++
++&i2c8 {
++ status = "okay";
++};
++
++&i2c9 {
++ status = "okay";
++};
++
++&gfx {
++ status = "okay";
++ memory-region = <&gfx_memory>;
++};
++
++&pinctrl {
++ aspeed,external-nodes = <&gfx &lhc>;
++};
++
++&pwm_tacho {
++ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm2_default &pinctrl_pwm3_default
++ &pinctrl_pwm4_default &pinctrl_pwm5_default
++ &pinctrl_pwm6_default &pinctrl_pwm7_default>;
++
++ fan@0 {
++ reg = <0x02>;
++ aspeed,fan-tach-ch = /bits/ 8 <0x04>;
++ };
++
++ fan@1 {
++ reg = <0x02>;
++ aspeed,fan-tach-ch = /bits/ 8 <0x05>;
++ };
++
++ fan@2 {
++ reg = <0x03>;
++ aspeed,fan-tach-ch = /bits/ 8 <0x06>;
++ };
++
++ fan@3 {
++ reg = <0x03>;
++ aspeed,fan-tach-ch = /bits/ 8 <0x07>;
++ };
++
++ fan@4 {
++ reg = <0x04>;
++ aspeed,fan-tach-ch = /bits/ 8 <0x08>;
++ };
++
++ fan@5 {
++ reg = <0x04>;
++ aspeed,fan-tach-ch = /bits/ 8 <0x09>;
++ };
++
++ fan@6 {
++ reg = <0x05>;
++ aspeed,fan-tach-ch = /bits/ 8 <0x0a>;
++ };
++
++ fan@7 {
++ reg = <0x05>;
++ aspeed,fan-tach-ch = /bits/ 8 <0x0b>;
++ };
++
++ fan@8 {
++ reg = <0x06>;
++ aspeed,fan-tach-ch = /bits/ 8 <0x0c>;
++ };
++
++ fan@9 {
++ reg = <0x06>;
++ aspeed,fan-tach-ch = /bits/ 8 <0x0d>;
++ };
++
++ fan@10 {
++ reg = <0x07>;
++ aspeed,fan-tach-ch = /bits/ 8 <0x0e>;
++ };
++
++ fan@11 {
++ reg = <0x07>;
++ aspeed,fan-tach-ch = /bits/ 8 <0x0f>;
++ };
++
++};
++
++&vhub {
++ status = "okay";
++};
++
++&adc {
++ status = "okay";
++};
++
++&video {
++ status = "okay";
++ memory-region = <&video_engine_memory>;
++};
++
++&gpio {
++ gpio-line-names =
++ /*A0-A7*/ "","","","S0_BMC_SPECIAL_BOOT","","","","",
++ /*B0-B7*/ "BMC_SELECT_EEPROM","","","",
++ "POWER_BUTTON","","","",
++ /*C0-C7*/ "","","","","","","","",
++ /*D0-D7*/ "","","","","","","","",
++ /*E0-E7*/ "","","","","","","","",
++ /*F0-F7*/ "","","BMC_SYS_PSON_L","S0_DDR_SAVE","PGOOD",
++ "S1_DDR_SAVE","","",
++ /*G0-G7*/ "S0_FW_BOOT_OK","SHD_REQ_L","","S0_OVERTEMP_L","","",
++ "","",
++ /*H0-H7*/ "","","","","","","","",
++ /*I0-I7*/ "","","S1_BMC_SPECIAL_BOOT","","","","","",
++ /*J0-J7*/ "S0_HIGHTEMP_L","S0_FAULT_L","S0_SCP_AUTH_FAIL_L","",
++ "","","","",
++ /*K0-K7*/ "","","","","","","","",
++ /*L0-L7*/ "","","","BMC_SYSRESET_L","SPI_AUTH_FAIL_L","","","",
++ /*M0-M7*/ "","","","","","","","",
++ /*N0-N7*/ "","","","","","","","",
++ /*O0-O7*/ "","","","","","","","",
++ /*P0-P7*/ "","","","","","","","",
++ /*Q0-Q7*/ "","","","","","UID_BUTTON","","",
++ /*R0-R7*/ "","","BMC_EXT_HIGHTEMP_L","","","RESET_BUTTON","","",
++ /*S0-S7*/ "","","","","","","","",
++ /*T0-T7*/ "","","","","","","","",
++ /*U0-U7*/ "","","","","","","","",
++ /*V0-V7*/ "","","","","","","","",
++ /*W0-W7*/ "","","","","","","","",
++ /*X0-X7*/ "","","","","","","","",
++ /*Y0-Y7*/ "","","","","","","","",
++ /*Z0-Z7*/ "S0_BMC_PLIMIT","S1_FAULT_L","S1_FW_BOOT_OK","","",
++ "S1_SCP_AUTH_FAIL_L","S1_OVERTEMP_L","",
++ /*AA0-AA7*/ "","","","","","","","",
++ /*AB0-AB7*/ "S1_HIGHTEMP_L","S1_BMC_PLIMIT","S0_BMC_DDR_ADDR",
++ "S1_BMC_DDR_ADR","","","","",
++ /*AC0-AC7*/ "SYS_PWR_GD","","","","","BMC_READY","SLAVE_PRESENT_L",
++ "BMC_OCP_PG";
++};
+--
+2.31.0
+
diff --git a/main/linux-lts/config-lts.aarch64 b/main/linux-lts/config-lts.aarch64
index fcaaa23dc7..60d414bd69 100644
--- a/main/linux-lts/config-lts.aarch64
+++ b/main/linux-lts/config-lts.aarch64
@@ -1,11 +1,11 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.1 Kernel Configuration
+# Linux/arm64 5.10.32 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.3.1_git20210409) 10.3.1 20210409"
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100201
-CONFIG_LD_VERSION=235010000
+CONFIG_GCC_VERSION=100301
+CONFIG_LD_VERSION=235020000
CONFIG_CLANG_VERSION=0
CONFIG_LLD_VERSION=0
CONFIG_CC_CAN_LINK=y
@@ -221,6 +221,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y
# CONFIG_BPF_PRELOAD is not set
# CONFIG_USERFAULTFD is not set