aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/a52dec/APKBUILD49
-rw-r--r--main/a52dec/a52dec-0.7.4-build.patch27
-rw-r--r--main/a52dec/automake.patch11
-rw-r--r--main/a52dec/fix-globals-test-x86-pie.patch11
-rw-r--r--main/abuild/APKBUILD10
-rw-r--r--main/acpica/APKBUILD8
-rw-r--r--main/alpine-base/APKBUILD2
-rw-r--r--main/alpine-baselayout/APKBUILD4
-rw-r--r--main/alpine-baselayout/blacklist.conf4
-rw-r--r--main/alpine-baselayout/protocols45
-rw-r--r--main/alpine-keys/APKBUILD18
-rw-r--r--main/alpine-keys/alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub14
-rw-r--r--main/alpine-keys/alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub14
-rw-r--r--main/alpine-keys/alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub14
-rw-r--r--main/alpine-keys/alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub14
-rw-r--r--main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub14
-rw-r--r--main/alpine-keys/alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub14
-rw-r--r--main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub14
-rw-r--r--main/alpine-keys/alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub14
-rw-r--r--main/amavisd-milter/APKBUILD10
-rw-r--r--main/ansible-base/0001-new-module-lbu.patch151
-rw-r--r--main/ansible-base/APKBUILD69
-rw-r--r--main/ansible/APKBUILD33
-rw-r--r--main/apache2/APKBUILD19
-rw-r--r--main/apcupsd/APKBUILD6
-rw-r--r--main/apcupsd/apcupsd.powerfail.initd17
-rw-r--r--main/apk-tools/0001-solver-don-t-consider-requirer-count-for-preference.patch100
-rw-r--r--main/apk-tools/APKBUILD17
-rw-r--r--main/apr-util/APKBUILD4
-rw-r--r--main/arm-trusted-firmware/APKBUILD4
-rw-r--r--main/arpwatch/APKBUILD19
-rw-r--r--main/arpwatch/arpwatch.initd2
-rw-r--r--main/asciidoc/APKBUILD6
-rw-r--r--main/asciidoctor/APKBUILD6
-rw-r--r--main/aspell/APKBUILD13
-rw-r--r--main/aspell/CVE-2019-25051.patch96
-rw-r--r--main/asterisk/APKBUILD70
-rw-r--r--main/asterisk/CVE-2021-32558.patch126
-rw-r--r--main/at-spi2-core/APKBUILD4
-rw-r--r--main/attr/APKBUILD4
-rw-r--r--main/audit/APKBUILD10
-rw-r--r--main/automake/0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch70
-rw-r--r--main/automake/APKBUILD15
-rw-r--r--main/awall/APKBUILD4
-rw-r--r--main/axel/APKBUILD4
-rw-r--r--main/bacula/APKBUILD4
-rw-r--r--main/bats/APKBUILD6
-rw-r--r--main/bctoolbox/APKBUILD4
-rw-r--r--main/bind/APKBUILD10
-rw-r--r--main/bind/bind-9.16.20-map-format-fix.patch8
-rw-r--r--main/binutils/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch65
-rw-r--r--main/binutils/APKBUILD22
-rw-r--r--main/binutils/CVE-2021-3487.patch72
-rw-r--r--main/binutils/bfd-close-file-desriptor-if-there-is-no-archive-fd.patch234
-rw-r--r--main/binutils/defang-no-split.patch38
-rw-r--r--main/bluez/APKBUILD9
-rw-r--r--main/bluez/bluetooth.initd2
-rw-r--r--main/bluez/mpris-proxy.desktop1
-rw-r--r--main/boost1.75/boost-context-mips-softfloat.patch72
-rw-r--r--main/boost1.75/build-undefine-statx-syscall.patch17
-rw-r--r--main/boost1.76/APKBUILD31
-rw-r--r--main/boost1.77/0001-revert-cease-dependence-on-range.patch (renamed from main/boost1.75/0001-revert-cease-dependence-on-range.patch)0
-rw-r--r--main/boost1.77/APKBUILD (renamed from main/boost1.75/APKBUILD)50
-rw-r--r--main/boost1.77/boost-1.57.0-python-abi_letters.patch (renamed from main/boost1.75/boost-1.57.0-python-abi_letters.patch)0
-rw-r--r--main/boost1.77/boost-1.57.0-python-libpython_dep.patch (renamed from main/boost1.75/boost-1.57.0-python-libpython_dep.patch)0
-rw-r--r--main/botan/APKBUILD16
-rw-r--r--main/botan/CVE-2021-40529.patch132
-rw-r--r--main/botan/dl-exponents.patch304
-rw-r--r--main/brotli/APKBUILD5
-rw-r--r--main/btrfs-progs/APKBUILD11
-rw-r--r--main/btrfs-progs/fix-ppc64le.patch11
-rw-r--r--main/bubblewrap/APKBUILD19
-rw-r--r--main/busybox-initscripts/APKBUILD12
-rw-r--r--main/busybox-initscripts/mdev.conf3
-rw-r--r--main/busybox/0001-echo-do-not-assume-that-free-leaves-errno-unmodified.patch63
-rw-r--r--main/busybox/0001-lineedit-fix-tab-completion-with-equal-sign.patch29
-rw-r--r--main/busybox/0001-properly-fix-wget-https-support.patch16
-rw-r--r--main/busybox/0001-rev-correct-output-for-long-input-lines.patch91
-rw-r--r--main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch16
-rw-r--r--main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch41
-rw-r--r--main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch22
-rw-r--r--main/busybox/APKBUILD30
-rw-r--r--main/busybox/busyboxconfig15
-rw-r--r--main/busybox/busyboxconfig-extras20
-rw-r--r--main/byacc/APKBUILD6
-rw-r--r--main/c-ares/APKBUILD12
-rw-r--r--main/ca-certificates/APKBUILD4
-rw-r--r--main/cgit/APKBUILD4
-rw-r--r--main/charybdis/APKBUILD4
-rw-r--r--main/checkbashisms/APKBUILD4
-rw-r--r--main/cifs-utils/APKBUILD8
-rw-r--r--main/cjson/APKBUILD8
-rw-r--r--main/ckbcomp/APKBUILD4
-rw-r--r--main/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch98
-rw-r--r--main/clang/APKBUILD22
-rw-r--r--main/clucene/APKBUILD2
-rw-r--r--main/cmake/APKBUILD4
-rw-r--r--main/compiler-rt/APKBUILD15
-rw-r--r--main/compiler-rt/disable-sanitizer-common.patch12
-rw-r--r--main/compiler-rt/replace-size_t-std-size-t.patch139
-rw-r--r--main/coreutils/APKBUILD18
-rw-r--r--main/coreutils/fix-chmod-exit-code.patch111
-rw-r--r--main/coreutils/ls.patch25
-rw-r--r--main/cryptsetup/APKBUILD20
-rw-r--r--main/cryptsetup/flush-stdout.patch12
-rw-r--r--main/ctags/APKBUILD8
-rw-r--r--main/ctags/disable-check-genfile.patch19
-rw-r--r--main/cups/APKBUILD12
-rw-r--r--main/cups/cups-nostrip.patch68
-rw-r--r--main/curl/APKBUILD11
-rw-r--r--main/cvs/APKBUILD24
-rw-r--r--main/cvs/add-libbsd.patch12
-rw-r--r--main/cvs/cvs_1.12.13+real-26.patch (renamed from main/cvs/cvs_1.12.13+real-26.diff)0
-rw-r--r--main/cyrus-sasl/APKBUILD4
-rw-r--r--main/cython/APKBUILD8
-rw-r--r--main/dahdi-linux-lts/APKBUILD2
-rw-r--r--main/datefudge/APKBUILD3
-rw-r--r--main/debootstrap/APKBUILD2
-rw-r--r--main/dhcpcd/APKBUILD6
-rw-r--r--main/dhcpcd/musl.patch24
-rw-r--r--main/diffutils/APKBUILD29
-rw-r--r--main/diffutils/disable-mbrtowc-test.patch10
-rw-r--r--main/diffutils/skip-test-presue-output-tty.patch24
-rw-r--r--main/dns-root-hints/APKBUILD4
-rw-r--r--main/dnsmasq/APKBUILD42
-rw-r--r--main/doas/APKBUILD21
-rw-r--r--main/doas/configuration-directory.patch509
-rwxr-xr-xmain/doas/doas.post-install30
-rwxr-xr-xmain/doas/doas.post-upgrade30
-rw-r--r--main/doas/manpage-example-path.patch16
-rw-r--r--main/dovecot/APKBUILD18
-rw-r--r--main/dovecot/fix-check-s390x.patch52
-rw-r--r--main/dovecot/fix-test-file-cache.patch22
-rw-r--r--main/doxygen/APKBUILD13
-rw-r--r--main/doxygen/fix-segfault.patch83
-rw-r--r--main/drbd-utils/APKBUILD6
-rw-r--r--main/e2fsprogs/APKBUILD9
-rw-r--r--main/e2fsprogs/ensure-small-filesystems-are-Y2038-ok.patch36
-rw-r--r--main/efitools/APKBUILD8
-rw-r--r--main/eggdrop/APKBUILD11
-rw-r--r--main/elfutils/APKBUILD21
-rw-r--r--main/elfutils/musl-fts-obstack.patch87
-rw-r--r--main/elfutils/musl-qsort_r.patch67
-rw-r--r--main/elfutils/musl-strerror_r.patch19
-rw-r--r--main/elinks/APKBUILD4
-rw-r--r--main/ell/APKBUILD4
-rw-r--r--main/email/APKBUILD4
-rw-r--r--main/encfs/APKBUILD4
-rw-r--r--main/ethtool/APKBUILD4
-rw-r--r--main/execline/APKBUILD8
-rw-r--r--main/expect/07-file-handle.patch24
-rw-r--r--main/expect/09-unsafe-traps.patch24
-rw-r--r--main/expect/10-manpage.patch384
-rw-r--r--main/expect/12-fdout.patch22
-rw-r--r--main/expect/22-segfault-with-stubs.patch71
-rw-r--r--main/expect/24-format.patch24
-rw-r--r--main/expect/APKBUILD26
-rw-r--r--main/fakeroot/APKBUILD2
-rw-r--r--main/fftw/APKBUILD8
-rw-r--r--main/file/APKBUILD15
-rw-r--r--main/file/file-5.40-magic-unsigned.patch147
-rw-r--r--main/file/file-5.40-magic-xzip.patch37
-rw-r--r--main/fish/APKBUILD10
-rw-r--r--main/freeradius/APKBUILD25
-rw-r--r--main/freeradius/default-config.patch10
-rw-r--r--main/freeradius/fix-request_running-segfault.patch23
-rw-r--r--main/freeradius/freeradius.logrotated10
-rw-r--r--main/freeradius/radacct-rotate87
-rw-r--r--main/freeradius/radacct-rotate.conf26
-rw-r--r--main/freeradius/radacct-rotate.crond10
-rw-r--r--main/freeswitch/APKBUILD4
-rw-r--r--main/freetds/APKBUILD8
-rw-r--r--main/fribidi/APKBUILD6
-rw-r--r--main/fuse3/APKBUILD4
-rw-r--r--main/gc/APKBUILD15
-rw-r--r--main/gcc/0001-posix_memalign.patch4
-rw-r--r--main/gcc/0002-gcc-poison-system-directories.patch8
-rw-r--r--main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch8
-rw-r--r--main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch8
-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.patch4
-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.patch4
-rw-r--r--main/gcc/0013-libgcc_s.patch4
-rw-r--r--main/gcc/0014-nopie.patch4
-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.patch4
-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.patch4
-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.patch4
-rw-r--r--main/gcc/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch4
-rw-r--r--main/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch4
-rw-r--r--main/gcc/0042-configure-fix-detection-of-atomic-builtins-in-libato.patch57
-rw-r--r--main/gcc/APKBUILD90
-rw-r--r--main/gd/APKBUILD24
-rw-r--r--main/gd/CVE-2021-38115.patch26
-rw-r--r--main/gd/CVE-2021-40145.patch124
-rw-r--r--main/gdb/APKBUILD11
-rw-r--r--main/gdbm/APKBUILD12
-rw-r--r--main/gdl/APKBUILD6
-rw-r--r--main/geoip/APKBUILD16
-rwxr-xr-xmain/geoip/geoip.cron7
-rw-r--r--main/ghi/APKBUILD4
-rw-r--r--main/ghostscript/APKBUILD12
-rw-r--r--main/ghostscript/CVE-2021-3781.patch232
-rw-r--r--main/git/APKBUILD50
-rw-r--r--main/glib/APKBUILD8
-rw-r--r--main/glib/musl-libintl.patch11
-rw-r--r--main/glslang/APKBUILD13
-rw-r--r--main/glslang/default-resources.patch12
-rw-r--r--main/glslang/pkgconfig.patch143
-rw-r--r--main/gnu-efi/0001-Initial-support-for-RISCV64.patch636
-rw-r--r--main/gnu-efi/APKBUILD8
-rw-r--r--main/gnupg/0010-avoid-beta-warning.patch46
-rw-r--r--main/gnupg/0020-avoid-regenerating-defsincdate-use-shipped-file.patch41
-rw-r--r--main/gnupg/0110-avoid-simple-memory-dumps-via-ptrace.patch91
-rw-r--r--main/gnupg/0210-dirmngr-hkp-avoid-potential-race-condition-when-some-host-die.patch83
-rw-r--r--main/gnupg/0220-dirmngr-avoid-need-for-hkp-housekeeping.patch232
-rw-r--r--main/gnupg/0230-dirmngr-avoid-automatically-checking-upstream-swdb.patch51
-rw-r--r--main/gnupg/0310-gpg-default-to-3072-bit-keys.patch93
-rw-r--r--main/gnupg/0320-gpg-default-to-aes256.patch37
-rw-r--r--main/gnupg/0330-gpg-default-to-sha512-for-all-signature-types-on-rsa-keys.patch66
-rw-r--r--main/gnupg/0340-gpg-prefer-sha512-and-sha384-in-personal-digest.patch48
-rw-r--r--main/gnupg/0410-make-gpg-zip-use-tar-from-path.patch29
-rw-r--r--main/gnupg/0420-gpg-drop-import-clean-from-default-keyserver-import-options.patch51
-rw-r--r--main/gnupg/APKBUILD209
-rw-r--r--main/goaccess/APKBUILD4
-rw-r--r--main/gobject-introspection/APKBUILD8
-rw-r--r--main/gpsd/APKBUILD89
-rw-r--r--main/gpsd/gpsd.confd7
-rw-r--r--main/gpsd/gpsd.initd39
-rw-r--r--main/gpsd/timepps.h216
-rw-r--r--main/graphene/APKBUILD31
-rw-r--r--main/graphene/fix-gnome-shell-touch-issues.patch14
-rw-r--r--main/graphviz/0001-clone-nameclash.patch20
-rw-r--r--main/graphviz/APKBUILD6
-rw-r--r--main/grep/APKBUILD8
-rw-r--r--main/grub/0001-loader-drop-argv-argument-in-grub_initrd_load.patch178
-rw-r--r--main/grub/0002-efi-add-definition-of-LoadFile2-protocol.patch64
-rw-r--r--main/grub/0003-efi-implemented-LoadFile2-initrd-loading-protocol-fo.patch187
-rw-r--r--main/grub/0004-linux-ignore-FDT-unless-we-need-to-modify-it.patch83
-rw-r--r--main/grub/0005-loader-Move-arm64-linux-loader-to-common-code.patch79
-rw-r--r--main/grub/0006-RISC-V-Update-image-header.patch87
-rw-r--r--main/grub/0007-RISC-V-Use-common-linux-loader.patch123
-rw-r--r--main/grub/0008-fix-build-error-in-binutils-2.36.patch44
-rw-r--r--main/grub/APKBUILD18
-rw-r--r--main/gsm/APKBUILD4
-rw-r--r--main/gst-plugins-base/APKBUILD10
-rw-r--r--main/gst-plugins-base/meson-0.58.patch45
-rw-r--r--main/gstreamer/APKBUILD6
-rw-r--r--main/gtk+3.0/3614.patch91
-rw-r--r--main/gtk+3.0/APKBUILD10
-rw-r--r--main/gtk-doc/APKBUILD4
-rw-r--r--main/guile/APKBUILD2
-rw-r--r--main/gvpe/APKBUILD4
-rw-r--r--main/gzip/APKBUILD8
-rw-r--r--main/haproxy/APKBUILD13
-rw-r--r--main/haproxy/haproxy-openssl-3.patch42
-rw-r--r--main/harfbuzz/APKBUILD6
-rw-r--r--main/haveged/APKBUILD12
-rw-r--r--main/haveged/double-the-sample-size-used-in-the-entest.patch24
-rw-r--r--main/heimdal/APKBUILD4
-rw-r--r--main/help2man/APKBUILD6
-rw-r--r--main/highlight/APKBUILD2
-rw-r--r--main/hiredis/APKBUILD8
-rw-r--r--main/hostapd/APKBUILD4
-rw-r--r--main/htop/APKBUILD8
-rw-r--r--main/hylafax/APKBUILD2
-rw-r--r--main/hylafaxplus/APKBUILD12
-rw-r--r--main/hylafaxplus/libtiff-version.patch13
-rw-r--r--main/iaxmodem/APKBUILD7
-rw-r--r--main/icecast/APKBUILD4
-rw-r--r--main/icu/APKBUILD10
-rw-r--r--main/ifupdown/APKBUILD2
-rw-r--r--main/imap/APKBUILD4
-rw-r--r--main/imlib2/APKBUILD6
-rw-r--r--main/iperf/APKBUILD4
-rw-r--r--main/iproute2/APKBUILD12
-rw-r--r--main/ipset/APKBUILD8
-rw-r--r--main/irssi/APKBUILD4
-rw-r--r--main/isl/APKBUILD2
-rw-r--r--main/isl22/APKBUILD2
-rw-r--r--main/iso-codes/APKBUILD11
-rw-r--r--main/itstool/APKBUILD10
-rw-r--r--main/jansson/APKBUILD8
-rw-r--r--main/jitterentropy-library/01-disable-gcc-optimisation.patch26
-rw-r--r--main/jitterentropy-library/02-use-proper-pointer-dereferencing.patch26
-rw-r--r--main/jitterentropy-library/03-fix-execution-flow-and-args-order.patch44
-rw-r--r--main/jitterentropy-library/04-c11-asm-correction.patch21
-rw-r--r--main/jitterentropy-library/05-gcd-sensible-max.patch37
-rw-r--r--main/jitterentropy-library/06-fix-memory-size.patch42
-rwxr-xr-xmain/jitterentropy-library/APKBUILD29
-rw-r--r--main/kamailio/APKBUILD6
-rw-r--r--main/kmod/APKBUILD4
-rw-r--r--main/knot/APKBUILD8
-rw-r--r--main/krb5/APKBUILD14
-rw-r--r--main/ldb/APKBUILD11
-rw-r--r--main/ldns/APKBUILD22
-rw-r--r--main/lftp/APKBUILD4
-rw-r--r--main/libao/APKBUILD42
-rw-r--r--main/libao/CVE-2017-11548.patch177
-rw-r--r--main/libarchive/APKBUILD12
-rw-r--r--main/libasr/APKBUILD4
-rw-r--r--main/libatomic_ops/APKBUILD6
-rw-r--r--main/libbsd/APKBUILD4
-rw-r--r--main/libcap/APKBUILD11
-rw-r--r--main/libcbor/APKBUILD38
-rw-r--r--main/libedit/APKBUILD4
-rw-r--r--main/libepoxy/APKBUILD4
-rw-r--r--main/libevent/APKBUILD4
-rw-r--r--main/libffi/APKBUILD33
-rw-r--r--main/libfido2/APKBUILD44
-rw-r--r--main/libgcrypt/APKBUILD14
-rw-r--r--main/libgpg-error/APKBUILD8
-rw-r--r--main/libical/APKBUILD16
-rw-r--r--main/libimagequant/APKBUILD4
-rw-r--r--main/libisoburn/APKBUILD4
-rw-r--r--main/libisofs/APKBUILD4
-rw-r--r--main/libjpeg-turbo/APKBUILD6
-rw-r--r--main/libmaxminddb/APKBUILD8
-rw-r--r--main/libmilter/APKBUILD18
-rw-r--r--main/libnetfilter_acct/APKBUILD14
-rw-r--r--main/libnetfilter_conntrack/APKBUILD4
-rw-r--r--main/libnetfilter_cthelper/APKBUILD26
-rw-r--r--main/libnetfilter_cttimeout/APKBUILD26
-rw-r--r--main/libnetfilter_log/APKBUILD4
-rw-r--r--main/libnetfilter_queue/APKBUILD4
-rw-r--r--main/libnfnetlink/APKBUILD4
-rw-r--r--main/libnftnl/APKBUILD6
-rw-r--r--main/libpaper/APKBUILD6
-rw-r--r--main/librelp/APKBUILD8
-rw-r--r--main/libretls/APKBUILD26
-rw-r--r--main/libseccomp/APKBUILD14
-rw-r--r--main/libseccomp/tests-11-basic-errors-support-older-kernels.patch108
-rw-r--r--main/libshout/APKBUILD4
-rw-r--r--main/libspf2/APKBUILD14
-rw-r--r--main/libspf2/CVE-2021-20314.patch22
-rw-r--r--main/libsrtp/APKBUILD13
-rw-r--r--main/libsrtp/gcc-10.patch29
-rw-r--r--main/libssh2/APKBUILD17
-rw-r--r--main/libssh2/CVE-2019-17498.patch72
-rw-r--r--main/liburing/APKBUILD6
-rw-r--r--main/libusb/APKBUILD4
-rw-r--r--main/libutempter/APKBUILD2
-rw-r--r--main/libva/APKBUILD4
-rw-r--r--main/libwebp/APKBUILD8
-rw-r--r--main/libwebsockets/APKBUILD10
-rw-r--r--main/libxft/APKBUILD12
-rw-r--r--main/libxft/emoji.patch617
-rw-r--r--main/libxi/APKBUILD9
-rw-r--r--main/libxkbcommon/APKBUILD4
-rw-r--r--main/lighttpd/APKBUILD4
-rw-r--r--main/links/APKBUILD10
-rw-r--r--main/linux-firmware/APKBUILD8
-rw-r--r--main/linux-lts/APKBUILD30
-rw-r--r--main/linux-lts/config-lts.aarch6411
-rw-r--r--main/linux-lts/config-lts.armv713
-rw-r--r--main/linux-lts/config-lts.mips645
-rw-r--r--main/linux-lts/config-lts.ppc64le8
-rw-r--r--main/linux-lts/config-lts.s390x8
-rw-r--r--main/linux-lts/config-lts.x8612
-rw-r--r--main/linux-lts/config-lts.x86_649
-rw-r--r--main/linux-lts/config-virt.aarch6410
-rw-r--r--main/linux-lts/config-virt.armv710
-rw-r--r--main/linux-lts/config-virt.ppc64le10
-rw-r--r--main/linux-lts/config-virt.x869
-rw-r--r--main/linux-lts/config-virt.x86_644
-rw-r--r--main/linux-octeon/APKBUILD4
-rw-r--r--main/linux-pam/APKBUILD13
-rw-r--r--main/linux-rpi/APKBUILD10
-rw-r--r--main/llvm10/APKBUILD2
-rw-r--r--main/llvm11/APKBUILD7
-rw-r--r--main/llvm12/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch22
-rw-r--r--main/llvm12/APKBUILD290
-rw-r--r--main/llvm12/fix-LLVMConfig-cmake-install-prefix.patch24
-rw-r--r--main/llvm12/fix-memory-mf_exec-on-aarch64.patch25
-rw-r--r--main/lmdb/APKBUILD14
-rw-r--r--main/lockfile-progs/APKBUILD16
-rw-r--r--main/logcheck/APKBUILD6
-rw-r--r--main/logtail/APKBUILD31
-rw-r--r--main/lua-cqueues/APKBUILD4
-rw-r--r--main/lua-ossl/APKBUILD5
-rw-r--r--main/lua-posix/APKBUILD6
-rw-r--r--main/lua-resty-core/APKBUILD8
-rw-r--r--main/lua-sec/APKBUILD10
-rw-r--r--main/lvm2/APKBUILD8
-rw-r--r--main/lxc/APKBUILD12
-rw-r--r--main/lxc/skip-rootfs-pinning-for-ro-fs.patch28
-rw-r--r--main/lynx/APKBUILD26
-rw-r--r--main/lynx/CVE-2021-38165.patch45
-rw-r--r--main/man-pages/APKBUILD6
-rw-r--r--main/mandoc/APKBUILD19
-rw-r--r--main/mandoc/fix-tbl-null-pointer.patch27
-rw-r--r--main/mandoc/mandoc_configure.patch12
-rw-r--r--main/mandoc/outdated-warn-disable.patch19
-rw-r--r--main/mandoc/shared-libmandoc.patch64
-rw-r--r--main/mandoc/simplify-compat.patch275
-rw-r--r--main/mariadb-connector-c/APKBUILD4
-rw-r--r--main/mariadb/APKBUILD11
-rw-r--r--main/mariadb/fix-cmake.patch13
-rw-r--r--main/mc/APKBUILD11
-rw-r--r--main/memcached/APKBUILD15
-rw-r--r--main/memcached/fix-bsd-headers.patch22
-rw-r--r--main/mesa/APKBUILD10
-rw-r--r--main/meson/APKBUILD4
-rw-r--r--main/mini_httpd/APKBUILD4
-rw-r--r--main/monit/APKBUILD12
-rw-r--r--main/mosh/APKBUILD6
-rw-r--r--main/mosquitto/APKBUILD27
-rw-r--r--main/mpg123/APKBUILD8
-rw-r--r--main/mrtg/APKBUILD31
-rw-r--r--main/mtd-utils/APKBUILD10
-rw-r--r--main/mtools/APKBUILD4
-rw-r--r--main/multipath-tools/0001-Disable-Werror-and-O2.patch20
-rw-r--r--main/multipath-tools/APKBUILD8
-rw-r--r--main/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch41
-rw-r--r--main/musl-nscd/APKBUILD14
-rw-r--r--main/musl-nscd/musl-nscd.initd2
-rw-r--r--main/musl/0001-fix-TZ-parsing-logic-for-identifying-POSIX-form-stri.patch57
-rw-r--r--main/musl/APKBUILD6
-rw-r--r--main/musl/qsort_r.patch213
-rw-r--r--main/nagios-plugins/APKBUILD22
-rw-r--r--main/nagios-plugins/check_openrc2
-rw-r--r--main/nagios-plugins/nagios-openrc.doasd (renamed from main/nagios-plugins/nagios-openrc.sudoers)3
-rw-r--r--main/nagios/APKBUILD2
-rw-r--r--main/nano/APKBUILD6
-rw-r--r--main/ncurses/APKBUILD8
-rw-r--r--main/neon/APKBUILD8
-rw-r--r--main/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch50
-rw-r--r--main/net-snmp/APKBUILD8
-rw-r--r--main/nettle/APKBUILD2
-rw-r--r--main/nfs-utils/APKBUILD10
-rw-r--r--main/nftables/APKBUILD6
-rw-r--r--main/nghttp2/APKBUILD6
-rw-r--r--main/nginx/APKBUILD41
-rw-r--r--main/ngircd/APKBUILD4
-rw-r--r--main/nmap/APKBUILD32
-rw-r--r--main/nodejs/APKBUILD25
-rw-r--r--main/nodejs/fix-build-with-system-c-ares.patch535
-rw-r--r--main/npm/APKBUILD10
-rw-r--r--main/npm/smoke-tests-npm-location.patch8
-rw-r--r--main/nrpe/APKBUILD4
-rw-r--r--main/nsd/APKBUILD12
-rw-r--r--main/nsd/tsig-openssl.patch11
-rw-r--r--main/ntfs-3g/APKBUILD24
-rw-r--r--main/ntfs-3g/CVE-2019-9755.patch62
-rw-r--r--main/numactl/APKBUILD3
-rw-r--r--main/open-iscsi/APKBUILD12
-rw-r--r--main/open-isns/APKBUILD4
-rw-r--r--main/openjpeg/APKBUILD33
-rw-r--r--main/openldap/APKBUILD10
-rw-r--r--main/openrc/0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch8
-rw-r--r--main/openrc/0002-force-root-be-rw-before-localmount.patch22
-rw-r--r--main/openrc/0002-fsck-don-t-add-C0-to-busybox-fsck.patch (renamed from main/openrc/0001-fsck-don-t-add-C0-to-busybox-fsck.patch)4
-rw-r--r--main/openrc/0003-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch (renamed from main/openrc/0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch)19
-rw-r--r--main/openrc/0004-hide-error-when-migrating-var-run-to-run.patch28
-rw-r--r--main/openrc/0004-make-consolefont-service-compatible-with-busyboxs-se.patch (renamed from main/openrc/0007-make-consolefont-service-compatible-with-busyboxs-se.patch)8
-rw-r--r--main/openrc/0005-Support-early-loading-of-keymap-if-kbd-is-installed.patch (renamed from main/openrc/0009-Support-early-loading-of-keymap-if-kdb-is-installed.patch)7
-rw-r--r--main/openrc/0006-Add-support-for-starting-services-in-a-specified-VRF.patch (renamed from main/openrc/0011-vrf.patch)27
-rw-r--r--main/openrc/0007-Clean-up-staticroute-config-remove-irrelevant-parts-.patch (renamed from main/openrc/0020-staticroute-confd.patch)16
-rw-r--r--main/openrc/0008-bootmisc-switch-wipe_tmp-setting-to-no-by-default.patch44
-rw-r--r--main/openrc/0008-fix-undeclared-UT_LINESIZE.patch28
-rw-r--r--main/openrc/0010-rc-mount-make-timeout-invocation-compatible-with-bus.patch27
-rw-r--r--main/openrc/0014-time_t-64bit.patch30
-rw-r--r--main/openrc/APKBUILD50
-rw-r--r--main/opensbi/APKBUILD26
-rw-r--r--main/opensmtpd/APKBUILD4
-rw-r--r--main/openssh/APKBUILD10
-rw-r--r--main/openssl/APKBUILD25
-rw-r--r--main/openssl/man-section.patch51
-rw-r--r--main/openssl1.1-compat/APKBUILD161
-rw-r--r--main/openssl1.1-compat/man-section.patch54
-rw-r--r--main/openssl1.1-compat/ppc64.patch (renamed from main/openssl/ppc64.patch)0
-rw-r--r--main/openvpn-auth-ldap/APKBUILD2
-rw-r--r--main/openvpn/APKBUILD4
-rw-r--r--main/opusfile/APKBUILD38
-rw-r--r--main/opusfile/fix-conflict.patch9
-rw-r--r--main/ortp/APKBUILD4
-rw-r--r--main/p11-kit/APKBUILD8
-rw-r--r--main/pango/APKBUILD4
-rw-r--r--main/parallel/APKBUILD4
-rw-r--r--main/partimage/APKBUILD4
-rw-r--r--main/pax-utils/APKBUILD3
-rw-r--r--main/paxmark/APKBUILD19
-rw-r--r--main/paxmark/paxmark34
-rw-r--r--main/pcre/APKBUILD19
-rw-r--r--main/pcre2/APKBUILD6
-rw-r--r--main/pcsc-lite/APKBUILD48
-rw-r--r--main/perdition/APKBUILD4
-rw-r--r--main/perl-apache-logformat-compiler/APKBUILD6
-rw-r--r--main/perl-apache-session/APKBUILD2
-rw-r--r--main/perl-archive-zip/APKBUILD4
-rw-r--r--main/perl-astro-suntime/APKBUILD2
-rw-r--r--main/perl-async-mergepoint/APKBUILD2
-rw-r--r--main/perl-authen-sasl/APKBUILD2
-rw-r--r--main/perl-b-cow/APKBUILD2
-rw-r--r--main/perl-b-hooks-endofscope/APKBUILD36
-rw-r--r--main/perl-boolean/APKBUILD1
-rw-r--r--main/perl-business-hours/APKBUILD16
-rw-r--r--main/perl-cache-cache/APKBUILD4
-rw-r--r--main/perl-cache-simple-timedexpiry/APKBUILD5
-rw-r--r--main/perl-capture-tiny/APKBUILD5
-rw-r--r--main/perl-carp-clan/APKBUILD5
-rw-r--r--main/perl-carp/APKBUILD1
-rw-r--r--main/perl-cgi-emulate-psgi/APKBUILD15
-rw-r--r--main/perl-cgi-fast/APKBUILD24
-rw-r--r--main/perl-cgi-psgi/APKBUILD10
-rw-r--r--main/perl-cgi-session/APKBUILD1
-rw-r--r--main/perl-cgi/APKBUILD1
-rw-r--r--main/perl-class-accessor/APKBUILD1
-rw-r--r--main/perl-class-data-inheritable/APKBUILD39
-rw-r--r--main/perl-class-inspector/APKBUILD5
-rw-r--r--main/perl-class-load/APKBUILD20
-rw-r--r--main/perl-class-method-modifiers/APKBUILD11
-rw-r--r--main/perl-class-mix/APKBUILD15
-rw-r--r--main/perl-class-returnvalue/APKBUILD5
-rw-r--r--main/perl-class-singleton/APKBUILD1
-rw-r--r--main/perl-class-tiny/APKBUILD2
-rw-r--r--main/perl-clone/APKBUILD2
-rw-r--r--main/perl-common-sense/APKBUILD2
-rw-r--r--main/perl-compress-raw-bzip2/APKBUILD2
-rw-r--r--main/perl-compress-raw-zlib/APKBUILD2
-rw-r--r--main/perl-config-grammar/APKBUILD7
-rw-r--r--main/perl-config-inifiles/APKBUILD2
-rw-r--r--main/perl-control-x10/APKBUILD3
-rw-r--r--main/perl-convert-asn1/APKBUILD5
-rw-r--r--main/perl-convert-binhex/APKBUILD1
-rw-r--r--main/perl-convert-color/APKBUILD8
-rw-r--r--main/perl-convert-tnef/APKBUILD1
-rw-r--r--main/perl-convert-uulib/APKBUILD8
-rw-r--r--main/perl-cpan-meta-check/APKBUILD17
-rw-r--r--main/perl-cpanel-json-xs/APKBUILD6
-rw-r--r--main/perl-crypt-des/APKBUILD2
-rw-r--r--main/perl-crypt-eksblowfish/APKBUILD2
-rw-r--r--main/perl-crypt-openssl-guess/APKBUILD7
-rw-r--r--main/perl-crypt-openssl-random/APKBUILD4
-rw-r--r--main/perl-crypt-openssl-rsa/APKBUILD33
-rw-r--r--main/perl-crypt-openssl-rsa/no-sslv23-padding.patch15
-rw-r--r--main/perl-crypt-rijndael/APKBUILD2
-rw-r--r--main/perl-crypt-ssleay/APKBUILD4
-rw-r--r--main/perl-crypt-x509/APKBUILD3
-rw-r--r--main/perl-css-minifier-xs/APKBUILD2
-rw-r--r--main/perl-css-squish/APKBUILD2
-rw-r--r--main/perl-data-guid/APKBUILD41
-rw-r--r--main/perl-data-hexdump/APKBUILD1
-rw-r--r--main/perl-data-optlist/APKBUILD1
-rw-r--r--main/perl-data-page/APKBUILD14
-rw-r--r--main/perl-data-uuid/APKBUILD2
-rw-r--r--main/perl-date-format/APKBUILD1
-rw-r--r--main/perl-datetime-format-mail/APKBUILD5
-rw-r--r--main/perl-datetime-format-w3cdtf/APKBUILD1
-rw-r--r--main/perl-datetime-locale/APKBUILD10
-rw-r--r--main/perl-datetime-timezone/APKBUILD12
-rw-r--r--main/perl-datetime/APKBUILD2
-rw-r--r--main/perl-db/APKBUILD6
-rw-r--r--main/perl-dbd-mysql/APKBUILD2
-rw-r--r--main/perl-dbd-odbc/APKBUILD2
-rw-r--r--main/perl-dbd-pg/APKBUILD2
-rw-r--r--main/perl-dbd-sqlite/APKBUILD38
-rw-r--r--main/perl-dbi/APKBUILD22
-rw-r--r--main/perl-dbix-dbschema/APKBUILD5
-rw-r--r--main/perl-dbix-searchbuilder/APKBUILD18
-rw-r--r--main/perl-devel-checkbin/APKBUILD8
-rw-r--r--main/perl-devel-checklib/APKBUILD6
-rw-r--r--main/perl-devel-globaldestruction/APKBUILD7
-rw-r--r--main/perl-devel-overloadinfo/APKBUILD1
-rw-r--r--main/perl-devel-stacktrace-ashtml/APKBUILD4
-rw-r--r--main/perl-devel-stacktrace/APKBUILD2
-rw-r--r--main/perl-devel-symdump/APKBUILD7
-rw-r--r--main/perl-device-serialport/APKBUILD2
-rw-r--r--main/perl-digest-hmac/APKBUILD1
-rw-r--r--main/perl-digest-md5/APKBUILD2
-rw-r--r--main/perl-digest-sha1/APKBUILD2
-rw-r--r--main/perl-dist-checkconflicts/APKBUILD8
-rw-r--r--main/perl-email-address-list/APKBUILD5
-rw-r--r--main/perl-email-address/APKBUILD4
-rw-r--r--main/perl-email-date-format/APKBUILD8
-rw-r--r--main/perl-encode-hanextra/APKBUILD15
-rw-r--r--main/perl-encode-locale/APKBUILD6
-rw-r--r--main/perl-encode/APKBUILD8
-rw-r--r--main/perl-error/APKBUILD1
-rw-r--r--main/perl-eval-closure/APKBUILD8
-rw-r--r--main/perl-exception-class/APKBUILD40
-rw-r--r--main/perl-exporter-tiny/APKBUILD3
-rw-r--r--main/perl-exporter/APKBUILD1
-rw-r--r--main/perl-extutils-config/APKBUILD7
-rw-r--r--main/perl-extutils-helpers/APKBUILD7
-rw-r--r--main/perl-extutils-installpaths/APKBUILD15
-rw-r--r--main/perl-extutils-pkgconfig/APKBUILD15
-rw-r--r--main/perl-fcgi-procmanager/APKBUILD5
-rw-r--r--main/perl-fcgi/APKBUILD9
-rw-r--r--main/perl-file-copy-recursive/APKBUILD5
-rw-r--r--main/perl-file-listing/APKBUILD1
-rw-r--r--main/perl-file-next/APKBUILD1
-rw-r--r--main/perl-file-remove/APKBUILD2
-rw-r--r--main/perl-file-rsync/APKBUILD2
-rw-r--r--main/perl-file-sharedir-install/APKBUILD17
-rw-r--r--main/perl-file-sharedir/APKBUILD2
-rw-r--r--main/perl-file-slurp-tiny/APKBUILD7
-rw-r--r--main/perl-file-slurp/APKBUILD1
-rw-r--r--main/perl-file-slurper/APKBUILD11
-rw-r--r--main/perl-file-tail/APKBUILD15
-rw-r--r--main/perl-file-temp/APKBUILD1
-rw-r--r--main/perl-file-which/APKBUILD1
-rw-r--r--main/perl-filesys-notify-simple/APKBUILD1
-rw-r--r--main/perl-font-afm/APKBUILD7
-rw-r--r--main/perl-future/APKBUILD2
-rw-r--r--main/perl-gd/APKBUILD2
-rw-r--r--main/perl-gdgraph/APKBUILD8
-rw-r--r--main/perl-gdtextutil/APKBUILD7
-rw-r--r--main/perl-getopt-long/APKBUILD11
-rw-r--r--main/perl-hash-multivalue/APKBUILD4
-rw-r--r--main/perl-heap/APKBUILD2
-rw-r--r--main/perl-html-formatter/APKBUILD1
-rw-r--r--main/perl-html-formattext-withlinks-andtables/APKBUILD10
-rw-r--r--main/perl-html-formattext-withlinks/APKBUILD2
-rw-r--r--main/perl-html-mason/APKBUILD7
-rw-r--r--main/perl-html-parser/APKBUILD2
-rw-r--r--main/perl-html-quoted/APKBUILD5
-rw-r--r--main/perl-html-rewriteattributes/APKBUILD17
-rw-r--r--main/perl-html-scrubber/APKBUILD7
-rw-r--r--main/perl-html-tagset/APKBUILD11
-rw-r--r--main/perl-html-tree/APKBUILD14
-rw-r--r--main/perl-http-body/APKBUILD3
-rw-r--r--main/perl-http-cookies/APKBUILD1
-rw-r--r--main/perl-http-daemon/APKBUILD2
-rw-r--r--main/perl-http-date/APKBUILD1
-rw-r--r--main/perl-http-message/APKBUILD1
-rw-r--r--main/perl-http-negotiate/APKBUILD5
-rw-r--r--main/perl-inc-latest/APKBUILD1
-rw-r--r--main/perl-inline-c/APKBUILD7
-rw-r--r--main/perl-inline/APKBUILD1
-rw-r--r--main/perl-io-async/APKBUILD11
-rw-r--r--main/perl-io-captureoutput/APKBUILD6
-rw-r--r--main/perl-io-html/APKBUILD1
-rw-r--r--main/perl-io-multiplex/APKBUILD4
-rw-r--r--main/perl-io-socket-inet6/APKBUILD8
-rw-r--r--main/perl-io-socket-ssl/APKBUILD5
-rw-r--r--main/perl-io-stringy/APKBUILD1
-rw-r--r--main/perl-io-tty/APKBUILD10
-rw-r--r--main/perl-io-tty/disable-failing-test.patch13
-rw-r--r--main/perl-io/APKBUILD28
-rw-r--r--main/perl-ipc-run3/APKBUILD3
-rw-r--r--main/perl-ipc-sharelite/APKBUILD2
-rw-r--r--main/perl-ipc-system-simple/APKBUILD1
-rw-r--r--main/perl-javascript-minifier-xs/APKBUILD2
-rw-r--r--main/perl-javascript-minifier/APKBUILD1
-rw-r--r--main/perl-json-maybexs/APKBUILD1
-rw-r--r--main/perl-json/APKBUILD2
-rw-r--r--main/perl-ldap/APKBUILD7
-rw-r--r--main/perl-libwww/APKBUILD17
-rw-r--r--main/perl-list-allutils/APKBUILD1
-rw-r--r--main/perl-list-moreutils-xs/APKBUILD2
-rw-r--r--main/perl-list-someutils-xs/APKBUILD2
-rw-r--r--main/perl-list-someutils/APKBUILD10
-rw-r--r--main/perl-list-utilsby/APKBUILD9
-rw-r--r--main/perl-locale-maketext-fuzzy/APKBUILD5
-rw-r--r--main/perl-locale-maketext-lexicon/APKBUILD2
-rw-r--r--main/perl-log-any/APKBUILD7
-rw-r--r--main/perl-log-dispatch/APKBUILD7
-rw-r--r--main/perl-lwp-mediatypes/APKBUILD6
-rw-r--r--main/perl-lwp-protocol-https/APKBUILD1
-rw-r--r--main/perl-lwp-useragent-determined/APKBUILD7
-rw-r--r--main/perl-mail-authenticationresults/APKBUILD2
-rw-r--r--main/perl-mail-dkim/APKBUILD15
-rw-r--r--main/perl-mail-domainkeys/APKBUILD1
-rw-r--r--main/perl-mail-imapclient/APKBUILD1
-rw-r--r--main/perl-mail-spf/APKBUILD7
-rw-r--r--main/perl-mailtools/APKBUILD15
-rw-r--r--main/perl-math-round/APKBUILD2
-rw-r--r--main/perl-mime-base64/APKBUILD2
-rw-r--r--main/perl-mime-lite/APKBUILD8
-rw-r--r--main/perl-mime-tools/APKBUILD9
-rw-r--r--main/perl-mime-types/APKBUILD7
-rw-r--r--main/perl-module-implementation/APKBUILD15
-rw-r--r--main/perl-module-install/APKBUILD13
-rw-r--r--main/perl-module-metadata/APKBUILD6
-rw-r--r--main/perl-module-pluggable/APKBUILD7
-rw-r--r--main/perl-module-refresh/APKBUILD17
-rw-r--r--main/perl-module-runtime/APKBUILD16
-rw-r--r--main/perl-module-scandeps/APKBUILD1
-rw-r--r--main/perl-module-util/APKBUILD8
-rw-r--r--main/perl-module-versions-report/APKBUILD2
-rw-r--r--main/perl-moo/APKBUILD1
-rw-r--r--main/perl-mozilla-ca/APKBUILD2
-rw-r--r--main/perl-mro-compat/APKBUILD11
-rw-r--r--main/perl-namespace-autoclean/APKBUILD1
-rw-r--r--main/perl-namespace-clean/APKBUILD7
-rw-r--r--main/perl-net-async-http/APKBUILD5
-rw-r--r--main/perl-net-cidr-lite/APKBUILD1
-rw-r--r--main/perl-net-cidr/APKBUILD1
-rw-r--r--main/perl-net-dns-resolver-mock/APKBUILD1
-rw-r--r--main/perl-net-dns-resolver-programmable/APKBUILD5
-rw-r--r--main/perl-net-dns/APKBUILD7
-rw-r--r--main/perl-net-http/APKBUILD1
-rw-r--r--main/perl-net-ip/APKBUILD1
-rw-r--r--main/perl-net-libidn/APKBUILD2
-rw-r--r--main/perl-net-openssh/APKBUILD1
-rw-r--r--main/perl-net-rblclient/APKBUILD3
-rw-r--r--main/perl-net-server/APKBUILD9
-rw-r--r--main/perl-net-smtp-ssl/APKBUILD15
-rw-r--r--main/perl-net-smtp-tls-butmaintained/APKBUILD7
-rw-r--r--main/perl-net-snmp/APKBUILD4
-rw-r--r--main/perl-net-snpp/APKBUILD4
-rw-r--r--main/perl-net-ssleay/APKBUILD5
-rw-r--r--main/perl-net-telnet/APKBUILD39
-rw-r--r--main/perl-netaddr-ip/APKBUILD2
-rw-r--r--main/perl-package-anon/APKBUILD2
-rw-r--r--main/perl-package-deprecationmanager/APKBUILD9
-rw-r--r--main/perl-package-stash-xs/APKBUILD2
-rw-r--r--main/perl-package-stash/APKBUILD1
-rw-r--r--main/perl-parallel-forkmanager/APKBUILD13
-rw-r--r--main/perl-params-classify/APKBUILD16
-rw-r--r--main/perl-params-util/APKBUILD2
-rw-r--r--main/perl-params-validate/APKBUILD2
-rw-r--r--main/perl-params-validationcompiler/APKBUILD11
-rw-r--r--main/perl-parse-recdescent/APKBUILD9
-rw-r--r--main/perl-parse-syslog/APKBUILD1
-rw-r--r--main/perl-parse-yapp/APKBUILD2
-rw-r--r--main/perl-path-class/APKBUILD8
-rw-r--r--main/perl-path-tiny/APKBUILD1
-rw-r--r--main/perl-pathtools/APKBUILD2
-rw-r--r--main/perl-php-serialization/APKBUILD3
-rw-r--r--main/perl-pod-coverage/APKBUILD1
-rw-r--r--main/perl-pod-parser/APKBUILD1
-rw-r--r--main/perl-posix-strftime-compiler/APKBUILD2
-rw-r--r--main/perl-probe-perl/APKBUILD7
-rw-r--r--main/perl-proc-wait3/APKBUILD2
-rw-r--r--main/perl-protocol-websocket/APKBUILD7
-rw-r--r--main/perl-regexp-common/APKBUILD11
-rw-r--r--main/perl-regexp-ipv6/APKBUILD2
-rw-r--r--main/perl-role-basic/APKBUILD8
-rw-r--r--main/perl-role-tiny/APKBUILD1
-rw-r--r--main/perl-scalar-list-utils/APKBUILD6
-rw-r--r--main/perl-scope-guard/APKBUILD2
-rw-r--r--main/perl-scope-upper/APKBUILD14
-rw-r--r--main/perl-server-starter/APKBUILD9
-rw-r--r--main/perl-set-intspan/APKBUILD5
-rw-r--r--main/perl-snmp-session/APKBUILD1
-rw-r--r--main/perl-socket-getaddrinfo/APKBUILD4
-rw-r--r--main/perl-socket/APKBUILD2
-rw-r--r--main/perl-socket6/APKBUILD2
-rw-r--r--main/perl-specio/APKBUILD1
-rw-r--r--main/perl-stream-buffered/APKBUILD17
-rw-r--r--main/perl-string-shellquote/APKBUILD7
-rw-r--r--main/perl-struct-dumb/APKBUILD3
-rw-r--r--main/perl-sub-exporter-progressive/APKBUILD8
-rw-r--r--main/perl-sub-exporter/APKBUILD41
-rw-r--r--main/perl-sub-identify/APKBUILD18
-rw-r--r--main/perl-sub-info/APKBUILD14
-rw-r--r--main/perl-sub-install/APKBUILD2
-rw-r--r--main/perl-sub-name/APKBUILD2
-rw-r--r--main/perl-sub-quote/APKBUILD9
-rw-r--r--main/perl-sub-uplevel/APKBUILD3
-rw-r--r--main/perl-switch/APKBUILD2
-rw-r--r--main/perl-symbol-global-name/APKBUILD17
-rw-r--r--main/perl-sys-hostname-long/APKBUILD1
-rw-r--r--main/perl-sys-mmap/APKBUILD2
-rw-r--r--main/perl-term-readkey/APKBUILD2
-rw-r--r--main/perl-term-table/APKBUILD6
-rw-r--r--main/perl-test-cpan-meta/APKBUILD12
-rw-r--r--main/perl-test-deep/APKBUILD3
-rw-r--r--main/perl-test-eol/APKBUILD4
-rw-r--r--main/perl-test-exception/APKBUILD7
-rw-r--r--main/perl-test-failwarnings/APKBUILD11
-rw-r--r--main/perl-test-fatal/APKBUILD5
-rw-r--r--main/perl-test-file-sharedir/APKBUILD15
-rw-r--r--main/perl-test-fork/APKBUILD2
-rw-r--r--main/perl-test-harness/APKBUILD10
-rw-r--r--main/perl-test-identity/APKBUILD3
-rw-r--r--main/perl-test-leaktrace/APKBUILD2
-rw-r--r--main/perl-test-longstring/APKBUILD4
-rw-r--r--main/perl-test-manifest/APKBUILD1
-rw-r--r--main/perl-test-metrics-any/APKBUILD2
-rw-r--r--main/perl-test-mockmodule/APKBUILD37
-rw-r--r--main/perl-test-mockrandom/APKBUILD10
-rw-r--r--main/perl-test-mocktime/APKBUILD15
-rw-r--r--main/perl-test-needs/APKBUILD27
-rw-r--r--main/perl-test-notabs/APKBUILD14
-rw-r--r--main/perl-test-nowarnings/APKBUILD43
-rw-r--r--main/perl-test-number-delta/APKBUILD5
-rw-r--r--main/perl-test-output/APKBUILD1
-rw-r--r--main/perl-test-pod-coverage/APKBUILD1
-rw-r--r--main/perl-test-pod/APKBUILD15
-rw-r--r--main/perl-test-refcount/APKBUILD3
-rw-r--r--main/perl-test-requires/APKBUILD1
-rw-r--r--main/perl-test-requiresinternet/APKBUILD9
-rw-r--r--main/perl-test-sharedfork/APKBUILD1
-rw-r--r--main/perl-test-simple/APKBUILD11
-rw-r--r--main/perl-test-taint/APKBUILD2
-rw-r--r--main/perl-test-tcp/APKBUILD8
-rw-r--r--main/perl-test-warn/APKBUILD3
-rw-r--r--main/perl-test-warnings/APKBUILD10
-rw-r--r--main/perl-test-without-module/APKBUILD1
-rw-r--r--main/perl-test-without/APKBUILD1
-rw-r--r--main/perl-test2-plugin-nowarnings/APKBUILD3
-rw-r--r--main/perl-test2-suite/APKBUILD5
-rw-r--r--main/perl-text-autoformat/APKBUILD4
-rw-r--r--main/perl-text-csv/APKBUILD4
-rw-r--r--main/perl-text-password-pronounceable/APKBUILD5
-rw-r--r--main/perl-text-reform/APKBUILD1
-rw-r--r--main/perl-text-soundex/APKBUILD2
-rw-r--r--main/perl-text-vfile-asdata/APKBUILD7
-rw-r--r--main/perl-text-wikiformat/APKBUILD8
-rw-r--r--main/perl-text-wrapper/APKBUILD14
-rw-r--r--main/perl-time-hires/APKBUILD2
-rw-r--r--main/perl-time-parsedate/APKBUILD2
-rw-r--r--main/perl-timedate/APKBUILD1
-rw-r--r--main/perl-tk/APKBUILD2
-rw-r--r--main/perl-tree-dag_node/APKBUILD1
-rw-r--r--main/perl-try-tiny/APKBUILD4
-rw-r--r--main/perl-type-tiny/APKBUILD5
-rw-r--r--main/perl-universal-can/APKBUILD7
-rw-r--r--main/perl-universal-isa/APKBUILD7
-rw-r--r--main/perl-unix-syslog/APKBUILD2
-rw-r--r--main/perl-uri/APKBUILD1
-rw-r--r--main/perl-variable-magic/APKBUILD2
-rw-r--r--main/perl-want/APKBUILD2
-rw-r--r--main/perl-www-robotrules/APKBUILD5
-rw-r--r--main/perl-x10/APKBUILD1
-rw-r--r--main/perl-xml-namespacesupport/APKBUILD4
-rw-r--r--main/perl-xml-parser/APKBUILD2
-rw-r--r--main/perl-xml-sax-base/APKBUILD35
-rw-r--r--main/perl-xml-sax/APKBUILD6
-rw-r--r--main/perl-xml-simple/APKBUILD6
-rw-r--r--main/perl-xml-xpath/APKBUILD4
-rw-r--r--main/perl-yaml-libyaml/APKBUILD8
-rw-r--r--main/perl-yaml-syck/APKBUILD2
-rw-r--r--main/perl-yaml-tiny/APKBUILD16
-rw-r--r--main/perl-yaml/APKBUILD1
-rw-r--r--main/perl/APKBUILD18
-rw-r--r--main/perl/CVE-2021-36770.patch29
-rw-r--r--main/perl/skip-test-due-to-busybox-ps.patch9
-rw-r--r--main/pgpool/APKBUILD8
-rw-r--r--main/pinentry/APKBUILD47
-rw-r--r--main/pinentry/pinentry-curses-ss.post-install9
-rw-r--r--main/pinentry/pinentry.post-install9
-rw-r--r--main/pinentry/pinentry.post-upgrade12
-rw-r--r--main/pixman/APKBUILD14
-rw-r--r--main/pjproject/APKBUILD12
-rw-r--r--main/pjproject/libpjsua2-install.patch26
-rw-r--r--main/pkgconf/APKBUILD6
-rw-r--r--main/po4a/APKBUILD6
-rw-r--r--main/poppler/APKBUILD9
-rw-r--r--main/poppler/dont-enforce-build-type.patch26
-rw-r--r--main/portaudio/APKBUILD47
-rw-r--r--main/portaudio/portaudio-audacity.patch100
-rw-r--r--main/postfix/APKBUILD8
-rw-r--r--main/postgresql-bdr/APKBUILD46
-rw-r--r--main/postgresql/0001-jit-Don-t-use-host-specific-CPU-or-features.patch27
-rw-r--r--main/postgresql/APKBUILD37
-rw-r--r--main/postgresql/czech-snowball-stemmer.patch38
-rw-r--r--main/postgresql/disable-test-collate.icu.utf8.patch6
-rw-r--r--main/postgresql/initdb.patch16
-rw-r--r--main/pound/APKBUILD14
-rw-r--r--main/pound/dhparam.patch15
-rw-r--r--main/powertop/APKBUILD10
-rw-r--r--main/ppp/APKBUILD4
-rw-r--r--main/protobuf-c/APKBUILD8
-rw-r--r--main/protobuf/APKBUILD14
-rw-r--r--main/protobuf/musl-fix.patch22
-rw-r--r--main/protobuf/ruby-fix-cflags.patch4
-rw-r--r--main/protobuf/skip-failing-tests.patch37
-rw-r--r--main/protobuf/trim-rakefile.patch28
-rw-r--r--main/proxychains-ng/APKBUILD6
-rw-r--r--main/pspg/APKBUILD4
-rw-r--r--main/psqlodbc/APKBUILD6
-rw-r--r--main/py3-babel/APKBUILD8
-rw-r--r--main/py3-bcrypt/APKBUILD2
-rw-r--r--main/py3-cffi/APKBUILD2
-rw-r--r--main/py3-charset-normalizer/APKBUILD31
-rw-r--r--main/py3-coverage/APKBUILD8
-rw-r--r--main/py3-cryptography/APKBUILD48
-rw-r--r--main/py3-distlib/APKBUILD4
-rw-r--r--main/py3-gobject3/APKBUILD8
-rw-r--r--main/py3-hypothesis/APKBUILD4
-rw-r--r--main/py3-idna/APKBUILD4
-rw-r--r--main/py3-iso8601/APKBUILD11
-rw-r--r--main/py3-mako/APKBUILD8
-rw-r--r--main/py3-monotonic/APKBUILD15
-rw-r--r--main/py3-more-itertools/APKBUILD4
-rw-r--r--main/py3-paramiko/APKBUILD56
-rw-r--r--main/py3-pillow/APKBUILD6
-rw-r--r--main/py3-pygments/APKBUILD4
-rw-r--r--main/py3-pynacl/APKBUILD2
-rw-r--r--main/py3-pytest/0001-remove-setuptools_scm.patch4
-rw-r--r--main/py3-pytest/APKBUILD6
-rw-r--r--main/py3-requests/0002-allow-idna-3.patch15
-rw-r--r--main/py3-requests/APKBUILD25
-rw-r--r--main/py3-six/APKBUILD8
-rw-r--r--main/py3-urllib3/APKBUILD4
-rw-r--r--main/py3-virtualenv/APKBUILD8
-rw-r--r--main/python3/APKBUILD12
-rw-r--r--main/rabbitmq-c/APKBUILD8
-rw-r--r--main/radvd/APKBUILD10
-rw-r--r--main/radvd/radvd.confd5
-rw-r--r--main/radvd/radvd.initd18
-rw-r--r--main/raspberrypi-bootloader/APKBUILD4
-rw-r--r--main/razor/APKBUILD2
-rw-r--r--main/rdesktop/APKBUILD63
-rw-r--r--main/rdiff-backup/0003-fix-version.patch11
-rw-r--r--main/rdiff-backup/APKBUILD16
-rw-r--r--main/readline/APKBUILD14
-rw-r--r--main/readline/fix-ncurses-underlinking.patch4
-rw-r--r--main/redis/APKBUILD15
-rw-r--r--main/rhash/APKBUILD4
-rw-r--r--main/rng-tools/01-fix-warning.patch26
-rw-r--r--main/rng-tools/02-onecpu.patch204
-rw-r--r--main/rng-tools/03-fix-pthread-setaffinity-call.patch58
-rw-r--r--main/rng-tools/04-jitter-termination-sigs.patch33
-rw-r--r--main/rng-tools/05-jitter-shutdown-fix.patch27
-rw-r--r--main/rng-tools/06-musl-pthread-setaffinity-fix.patch21
-rw-r--r--main/rng-tools/07-use-jent_entropy_init_ex.patch70
-rw-r--r--main/rng-tools/08-correct-entflags.patch17
-rw-r--r--main/rng-tools/APKBUILD68
-rw-r--r--main/rng-tools/rngd-extra.confd24
-rw-r--r--main/rng-tools/rngd-extra.confd-arm111
-rw-r--r--main/rng-tools/rngd-extra.initd10
-rw-r--r--main/rng-tools/rngd.confd18
-rw-r--r--main/rng-tools/rngd.confd-arm93
-rw-r--r--main/rng-tools/rngd.initd6
-rw-r--r--main/rrdtool/APKBUILD2
-rw-r--r--main/rsync/APKBUILD4
-rw-r--r--main/rsync/Fix-regression-with---delay-updates.patch26
-rw-r--r--main/rsyslog/APKBUILD6
-rw-r--r--main/ruby-augeas/APKBUILD74
-rw-r--r--main/ruby-bundler/APKBUILD9
-rw-r--r--main/ruby-minitest/APKBUILD66
-rw-r--r--main/ruby-minitest/gemspec.patch15
-rw-r--r--main/ruby-power_assert/APKBUILD62
-rw-r--r--main/ruby-power_assert/gemspec.patch23
-rw-r--r--main/ruby-rake/APKBUILD58
-rw-r--r--main/ruby-rake/gemspec.patch12
-rw-r--r--main/ruby-rbs/APKBUILD62
-rw-r--r--main/ruby-rbs/gemspec.patch14
-rw-r--r--main/ruby-rexml/APKBUILD56
-rw-r--r--main/ruby-rss/APKBUILD58
-rw-r--r--main/ruby-rss/gemspec.patch17
-rw-r--r--main/ruby-test-unit/APKBUILD54
-rw-r--r--main/ruby-test-unit/gemspec.patch15
-rw-r--r--main/ruby-typeprof/APKBUILD57
-rw-r--r--main/ruby-typeprof/gemspec.patch13
-rw-r--r--main/ruby/APKBUILD243
-rw-r--r--main/ruby/dont-install-bundled-gems.patch20
-rw-r--r--main/ruby/fix-get_main_stack.patch4
-rw-r--r--main/ruby/get-ruby_nonempty_memcpy-to-have-c-linkage.patch31
-rw-r--r--main/ruby/rubygems-avoid-platform-specific-gems.patch31
-rw-r--r--main/ruby/test_insns-lower-recursion-depth.patch2
-rw-r--r--main/run-parts/APKBUILD2
-rw-r--r--main/s390-tools/APKBUILD4
-rw-r--r--main/s6-dns/APKBUILD11
-rw-r--r--main/s6-linux-init/APKBUILD6
-rw-r--r--main/s6-linux-utils/APKBUILD8
-rw-r--r--main/s6-networking/APKBUILD10
-rw-r--r--main/s6-portable-utils/APKBUILD8
-rw-r--r--main/s6-rc/APKBUILD8
-rw-r--r--main/s6/APKBUILD10
-rw-r--r--main/s6/s6.trigger2
-rw-r--r--main/samba/APKBUILD25
-rw-r--r--main/samba/samba-bgqd-include-signal-h.patch13
-rw-r--r--main/sbsigntool/APKBUILD4
-rw-r--r--main/scons/APKBUILD6
-rw-r--r--main/seabios/0003-vgasrc-ignore-.node.gnu.property-binutils-2.36-suppo.patch39
-rw-r--r--main/seabios/APKBUILD10
-rw-r--r--main/serf/APKBUILD4
-rw-r--r--main/shorewall/APKBUILD10
-rw-r--r--main/shorewall/shorewall-find.patch58
-rw-r--r--main/sipp/APKBUILD4
-rw-r--r--main/sipsak/APKBUILD4
-rw-r--r--main/skalibs/APKBUILD11
-rw-r--r--main/smokeping/APKBUILD4
-rw-r--r--main/sngtc_client/APKBUILD4
-rw-r--r--main/socat/APKBUILD4
-rw-r--r--main/sofia-sip/APKBUILD10
-rw-r--r--main/source-highlight/APKBUILD4
-rw-r--r--main/spamassassin/APKBUILD16
-rw-r--r--main/spamassassin/taint.patch27
-rw-r--r--main/spandsp/APKBUILD2
-rw-r--r--main/spice/APKBUILD18
-rw-r--r--main/spice/CVE-2021-20201.patch36
-rw-r--r--main/spice/failing-tests.patch34
-rw-r--r--main/spice/fix-build.patch7
-rw-r--r--main/sqlite-tcl/APKBUILD2
-rw-r--r--main/sqlite/APKBUILD11
-rw-r--r--main/sqlite/license.txt33
-rw-r--r--main/squashfs-tools/APKBUILD4
-rw-r--r--main/squashfs-tools/gcc-10.patch14
-rw-r--r--main/squid/APKBUILD12
-rw-r--r--main/ssmtp/APKBUILD6
-rw-r--r--main/strace/APKBUILD11
-rw-r--r--main/strongswan/APKBUILD17
-rw-r--r--main/subunit/APKBUILD2
-rw-r--r--main/subversion/APKBUILD2
-rw-r--r--main/sudo/APKBUILD13
-rw-r--r--main/sudo/SIGUNUSED.patch19
-rw-r--r--main/sudo/fix-cross-compile.patch18
-rw-r--r--main/swig/APKBUILD2
-rw-r--r--main/swish-e/APKBUILD2
-rw-r--r--main/syslog-ng/APKBUILD4
-rw-r--r--main/talloc/APKBUILD10
-rw-r--r--main/tarsnap/APKBUILD4
-rw-r--r--main/tcl-tls/APKBUILD4
-rw-r--r--main/tcl/APKBUILD19
-rw-r--r--main/tcpdump/APKBUILD6
-rw-r--r--main/tcpflow/APKBUILD4
-rw-r--r--main/tdb/APKBUILD8
-rw-r--r--main/testdisk/APKBUILD2
-rw-r--r--main/tevent/APKBUILD12
-rw-r--r--main/texinfo/APKBUILD8
-rw-r--r--main/texinfo/fix-build-without-NLS.patch12
-rw-r--r--main/thin-provisioning-tools/APKBUILD35
-rw-r--r--main/thin-provisioning-tools/page-size.patch11
-rw-r--r--main/thin-provisioning-tools/paths.patch30
-rw-r--r--main/tiff/APKBUILD10
-rw-r--r--main/tinc/APKBUILD4
-rw-r--r--main/tiny-ec2-bootstrap/APKBUILD10
-rw-r--r--main/tk/APKBUILD15
-rw-r--r--main/tolua++/APKBUILD21
-rw-r--r--main/tzdata/APKBUILD12
-rw-r--r--main/u-boot/APKBUILD36
-rw-r--r--main/u-boot/hifive-unmatched-ramdisk.patch19
-rw-r--r--main/udev-init-scripts/APKBUILD8
-rw-r--r--main/udev-init-scripts/modloop.patch10
-rw-r--r--main/ulogd/APKBUILD4
-rw-r--r--main/umurmur/APKBUILD13
-rw-r--r--main/umurmur/remove-crypto-mem-ctrl.patch11
-rw-r--r--main/unbound/APKBUILD6
-rw-r--r--main/unrar/APKBUILD31
-rw-r--r--main/unrar/makefile.patch30
-rw-r--r--main/usbutils/APKBUILD14
-rw-r--r--main/util-linux/APKBUILD13
-rw-r--r--main/utmps/APKBUILD14
-rw-r--r--main/vala/APKBUILD6
-rw-r--r--main/valgrind/APKBUILD10
-rw-r--r--main/varnish/APKBUILD26
-rw-r--r--main/varnish/maxminddb.vcl78
-rw-r--r--main/varnish/musl-include-vpf.patch15
-rw-r--r--main/varnish/musl-include-vsb.patch15
-rw-r--r--main/varnish/varnishd.confd2
-rw-r--r--main/varnish/varnishd.initd25
-rw-r--r--main/vde2/APKBUILD4
-rw-r--r--main/vim/APKBUILD40
-rw-r--r--main/wayland-protocols/APKBUILD4
-rw-r--r--main/wayland/APKBUILD2
-rw-r--r--main/wget/APKBUILD10
-rw-r--r--main/wireguard-tools/APKBUILD6
-rw-r--r--main/wireless-regdb/APKBUILD6
-rw-r--r--main/wpa_supplicant/APKBUILD6
-rw-r--r--main/wpa_supplicant/config2
-rw-r--r--main/xen/0001-xen-arm-Create-dom0less-domUs-earlier.patch85
-rw-r--r--main/xen/0002-xen-arm-Boot-modules-should-always-be-scrubbed-if-bo.patch59
-rw-r--r--main/xen/APKBUILD43
-rw-r--r--main/xen/stubdom-hack.patch11
-rw-r--r--main/xen/xsa373-4.15-1.patch120
-rw-r--r--main/xen/xsa373-4.15-2.patch102
-rw-r--r--main/xen/xsa373-4.15-3.patch163
-rw-r--r--main/xen/xsa373-4.15-4.patch79
-rw-r--r--main/xen/xsa373-4.15-5.patch141
-rw-r--r--main/xen/xsa375.patch50
-rw-r--r--main/xen/xsa377.patch27
-rw-r--r--main/xfsprogs/APKBUILD4
-rw-r--r--main/xkeyboard-config/APKBUILD4
-rw-r--r--main/xorgproto/APKBUILD4
-rw-r--r--main/xtables-addons-lts/APKBUILD2
-rw-r--r--main/yajl/APKBUILD4
-rw-r--r--main/zfs-lts/APKBUILD6
-rw-r--r--main/zfs-rpi/APKBUILD4
-rw-r--r--main/zfs/APKBUILD4
-rw-r--r--main/zstd/APKBUILD4
1093 files changed, 14173 insertions, 8898 deletions
diff --git a/main/a52dec/APKBUILD b/main/a52dec/APKBUILD
deleted file mode 100644
index 78fb877a7f..0000000000
--- a/main/a52dec/APKBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=a52dec
-pkgver=0.7.4
-pkgrel=7
-pkgdesc="A free library for decoding ATSC A/52 streams."
-url="http://liba52.sourceforge.net/"
-arch="all"
-license="GPL-2.0-or-later"
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="autoconf automake libtool linux-headers"
-source="http://liba52.sourceforge.net/files/$pkgname-$pkgver.tar.gz
- automake.patch
- fix-globals-test-x86-pie.patch
- $pkgname-$pkgver-build.patch
- "
-
-builddir="$srcdir/$pkgname-$pkgver"
-prepare() {
- default_prepare
- update_config_sub
- libtoolize --force && \
- aclocal && autoconf && automake --add-missing
-}
-
-build() {
- cd "$builddir"
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --enable-shared
- make
-}
-
-check() {
- cd "$builddir"
- make check
-}
-
-package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
- install -m644 liba52/a52_internal.h "$pkgdir"/usr/include/a52dec/
-}
-
-sha512sums="4b26fe9492f218b775fb190b76ecf06edaeb656adfe6dcbd24d0a0f86871c3ba917edb88a398eb12dccedaa1605b6f0a0be06b09f9fddd9a46e457b7dd244848 a52dec-0.7.4.tar.gz
-4a832b7e13e19ba00b1fcf5ddbdcca416ee71818f2fd77f19114d7f98fb41dbd04f906eb78f403dc27324d7e8bd8ec4e0b670139a27b49a7acdb2e3cf88d8d12 automake.patch
-b8dbcdc817531bc737ee689a1a8fc76ba40462397ca95286fe834795a09df04cd68010ca6105c8e56392328bec00c838372ab28324c5428421d44824109ea6ec fix-globals-test-x86-pie.patch
-eee40a2871c00fc704fa49d3192a41ceadc4cf7e80d7d7cf368aa2a3e7ebb786f39ef835bdffca5685bf054316a9bacf87556b9a0c90868dbf29e7269873806e a52dec-0.7.4-build.patch"
diff --git a/main/a52dec/a52dec-0.7.4-build.patch b/main/a52dec/a52dec-0.7.4-build.patch
deleted file mode 100644
index f3a29f303c..0000000000
--- a/main/a52dec/a52dec-0.7.4-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur a52dec-0.7.4.orig/liba52/Makefile.am a52dec-0.7.4/liba52/Makefile.am
---- a52dec-0.7.4.orig/liba52/Makefile.am 2002-01-27 20:36:48.000000000 -0800
-+++ a52dec-0.7.4/liba52/Makefile.am 2004-11-05 01:10:21.317401872 -0800
-@@ -1,4 +1,3 @@
--CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
-
- lib_LTLIBRARIES = liba52.la
-
-diff -Naur a52dec-0.7.4.orig/liba52/configure.incl a52dec-0.7.4/liba52/configure.incl
---- a52dec-0.7.4.orig/liba52/configure.incl 2002-01-27 20:36:48.000000000 -0800
-+++ a52dec-0.7.4/liba52/configure.incl 2004-11-05 01:11:38.172672216 -0800
-@@ -2,7 +2,6 @@
- AC_SUBST([LIBA52_LIBS])
-
- dnl avoid -fPIC when possible
--LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
-
- AC_ARG_ENABLE([double],
- [ --enable-double use double-precision samples])
-diff -Naur a52dec-0.7.4.orig/src/Makefile.am a52dec-0.7.4/src/Makefile.am
---- a52dec-0.7.4.orig/src/Makefile.am 2002-06-22 18:51:57.000000000 -0700
-+++ a52dec-0.7.4/src/Makefile.am 2004-11-05 01:10:21.320401375 -0800
-@@ -1,4 +1,3 @@
--CFLAGS = @A52DEC_CFLAGS@
-
- bin_PROGRAMS = a52dec extract_a52
- a52dec_SOURCES = a52dec.c getopt.c gettimeofday.c
diff --git a/main/a52dec/automake.patch b/main/a52dec/automake.patch
deleted file mode 100644
index 42231e040b..0000000000
--- a/main/a52dec/automake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.in.orig 2013-04-23 12:43:16.258733686 +0000
-+++ ./configure.in 2013-04-23 12:43:32.922233281 +0000
-@@ -6,7 +6,7 @@
- AC_CONFIG_FILES([Makefile autotools/Makefile include/Makefile test/Makefile
- doc/Makefile src/Makefile liba52/Makefile libao/Makefile vc++/Makefile])
- AM_INIT_AUTOMAKE([a52dec],[0.7.4])
--AM_CONFIG_HEADER(include/config.h)
-+AC_CONFIG_HEADERS(include/config.h)
- AM_MAINTAINER_MODE
- AC_CANONICAL_HOST
-
diff --git a/main/a52dec/fix-globals-test-x86-pie.patch b/main/a52dec/fix-globals-test-x86-pie.patch
deleted file mode 100644
index da227a1397..0000000000
--- a/main/a52dec/fix-globals-test-x86-pie.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a52dec-0.7.4.orig/test/globals
-+++ a52dec-0.7.4/test/globals
-@@ -13,7 +13,7 @@
- builddir=`cd $builddir;pwd`
-
- bad_globals=`nm -g --defined-only $builddir/../liba52/*.o|\
-- awk '{if ($3) print $3}'|grep -v '^_\?a52_'`
-+ awk '{if ($3) print $3}'|grep -v '^_\?a52_'`|grep -v '^__x86.get_pc_thunk.'
-
- if test x"$bad_globals" != x""; then
- echo BAD GLOBAL SYMBOLS:
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 5308962506..4e5181c5c0 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=abuild
-pkgver=3.8.0_rc4
+pkgver=3.9.0_rc2
_ver=${pkgver%_git*}
-pkgrel=0
+pkgrel=1
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch="all"
@@ -12,8 +12,8 @@ depends="fakeroot scanelf openssl apk-tools>=2.0.7-r1 libc-utils
if [ "$CBUILD" = "$CHOST" ]; then
depends="$depends curl"
fi
-makedepends_build="pkgconfig"
-makedepends_host="openssl-dev zlib-dev"
+makedepends_build="pkgconfig scdoc"
+makedepends_host="openssl1.1-compat-dev zlib-dev"
makedepends="$makedepends_host $makedepends_build"
checkdepends="bats"
install="$pkgname.pre-install $pkgname.pre-upgrade"
@@ -84,5 +84,5 @@ _rootbld() {
}
sha512sums="
-687c21c233570b1e06f1298b24d5bcbf5925dfb9e9e00d0fb1626a7e0983dc6c2079cba96408033210b562c1cf08c2cd149379b22f86e0a255e2dde1c6886d48 abuild-3.8.0_rc4.tar.xz
+a90daf72cd1f1c5fb31d998786fd418355e2ff03ab1f3c6b9bf0d1a0b94538f34d37d405de8615d596f866e31adaad14662eee93d5342ee41bf1ee898dc7d915 abuild-3.9.0_rc2.tar.xz
"
diff --git a/main/acpica/APKBUILD b/main/acpica/APKBUILD
index 6dbec75f36..4129ae6ed5 100644
--- a/main/acpica/APKBUILD
+++ b/main/acpica/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Roger Pau Monne <roger.pau@entel.upc.edu>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=acpica
-pkgver=20210331
+pkgver=20210930
pkgrel=0
pkgdesc="ACPI Component Architecture utilities"
url="https://www.acpica.org"
@@ -29,5 +29,7 @@ iasl() {
mv "$pkgdir"/usr/bin/iasl "$subpkgdir"/usr/bin/
}
-sha512sums="f247162db70181b6c2b294dab2c7e220a7a125ae474ebeeea9243faca361b1ab392b62f58d66719bcb54f09e37ed533e9f68f56d9ea23976e41f274966207949 acpica-unix-20210331.tar.gz
-1f5049568d612d4debf3690e0d918d8d56abbed14ade7b2e6282eba17b25934b695d1a9fe10f99469efe8d4382c4546481d0579afdf5cdb9695fcdc93559fbab disable-werror.patch"
+sha512sums="
+b02470bdda891eb7ca556ec4eee3387f80535b43b213f61e68e3913f4f8173dbf4c2dadaf28ad181ecc76171d40175d5ea5734dbc1237b3c3d2fba3072314c9e acpica-unix-20210930.tar.gz
+1f5049568d612d4debf3690e0d918d8d56abbed14ade7b2e6282eba17b25934b695d1a9fe10f99469efe8d4382c4546481d0579afdf5cdb9695fcdc93559fbab disable-werror.patch
+"
diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD
index bf75a3586a..2992992554 100644
--- a/main/alpine-base/APKBUILD
+++ b/main/alpine-base/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-base
-pkgver=3.14.0
+pkgver=3.15.0_alpha20210804
pkgrel=0
pkgdesc="Meta package for minimal alpine base"
url="https://alpinelinux.org"
diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index af40c15663..4825ea730c 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=17
+pkgrel=18
pkgdesc="Alpine base dir structure and init scripts"
url="https://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
arch="all"
@@ -238,7 +238,7 @@ sha512sums="
7fcb5df98b0f19e609cb9444b2e6ca5ee97f5f308eb407436acdd0115781623fd89768a9285e9816e36778e565b6f27055f2a586a58f19d6d880de5446d263c4 color_prompt.sh.disabled
b2fc9b72846a43a45ba9a8749e581cef34d1915836833b51b7919dfbf4e275b7d55fec4dea7b23df3796380910971a41331e53e8cf0d304834e3da02cc135e5a locale.sh
bfe947bdd69e7d93b32c8cb4e2cabe5717cb6c1e1f49a74015ac2cfb13e96d1f12c4be23ae93a1d61aaa3760d33a032fa9bd99f227fb21223a76b5f5908acc65 aliases.conf
-0b93db8ba1b5d16b2c23f9b6daea27a3a76c059a1f5ea0369af526ea3f4ff92a6040face89e95c45cf7daaa7a663f229df0f6c1ba24073ef4b2f7b74b298fdae blacklist.conf
+0a1e1afa580751e80bf26057b65fadffe269c0552e7a1903de498f94973ba3da8453b51f25e649968ca5f4841266f5ccf951700fa28465a8614b83d07344de60 blacklist.conf
49109d434b577563849c43dd8141961ca798dada74d4d3f49003dac1911f522c43438b8241fa254e4faacdd90058f4d39a7d69b1f493f6d57422c1f706547c95 i386.conf
9dda8c9d1896baf1217aa05ae2936e909300a22a98da9f4c3ba29136852477bf4764321b6a1abb15e93ee58f4a6e77ddfc42cbb12cbbb53cf0f431ace444f72f kms.conf
806b8f23f823a9471846d12fa6b55690b95eedb4c613b82aefaba7ffef23f83e17552befd891a487864f72ef24e395d8611738933f684a85eb4c336cb20994f8 group
diff --git a/main/alpine-baselayout/blacklist.conf b/main/alpine-baselayout/blacklist.conf
index 76c3fb75cd..1cf7e1aa24 100644
--- a/main/alpine-baselayout/blacklist.conf
+++ b/main/alpine-baselayout/blacklist.conf
@@ -78,3 +78,7 @@ blacklist hfcsusb
blacklist e_powersaver
blacklist microcode
+
+# needs init config, not compatible with acpid
+# https://gitlab.alpinelinux.org/alpine/aports/-/issues/12999
+blacklist tiny_power_button
diff --git a/main/alpine-baselayout/protocols b/main/alpine-baselayout/protocols
deleted file mode 100644
index 03f049d067..0000000000
--- a/main/alpine-baselayout/protocols
+++ /dev/null
@@ -1,45 +0,0 @@
-# /etc/protocols:
-# $Id: protocols,v 1.1 2004/02/04 03:32:40 pebenito Exp $
-# $Header: /home/cvsroot/gentoo-projects/embedded/baselayout-lite/protocols,v 1.1 2004/02/04 03:32:40 pebenito Exp $
-#
-# Internet (IP) protocols
-#
-# from: @(#)protocols 5.1 (Berkeley) 4/17/89
-#
-# Updated for NetBSD based on RFC 1340, Assigned Numbers (July 1992).
-
-ip 0 IP # internet protocol, pseudo protocol number
-icmp 1 ICMP # internet control message protocol
-igmp 2 IGMP # Internet Group Management
-ggp 3 GGP # gateway-gateway protocol
-ipencap 4 IP-ENCAP # IP encapsulated in IP (officially ``IP'')
-st 5 ST # ST datagram mode
-tcp 6 TCP # transmission control protocol
-egp 8 EGP # exterior gateway protocol
-pup 12 PUP # PARC universal packet protocol
-udp 17 UDP # user datagram protocol
-hmp 20 HMP # host monitoring protocol
-xns-idp 22 XNS-IDP # Xerox NS IDP
-rdp 27 RDP # "reliable datagram" protocol
-iso-tp4 29 ISO-TP4 # ISO Transport Protocol class 4
-xtp 36 XTP # Xpress Tranfer Protocol
-ddp 37 DDP # Datagram Delivery Protocol
-idpr-cmtp 38 IDPR-CMTP # IDPR Control Message Transport
-ipv6 41 IPv6 # IPv6
-ipv6-route 43 IPv6-Route # Routing Header for IPv6
-ipv6-frag 44 IPv6-Frag # Fragment Header for IPv6
-idrp 45 IDRP # Inter-Domain Routing Protocol
-rsvp 46 RSVP # Reservation Protocol
-gre 47 GRE # General Routing Encapsulation
-esp 50 ESP # Encap Security Payload for IPv6
-ah 51 AH # Authentication Header for IPv6
-skip 57 SKIP # SKIP
-ipv6-icmp 58 IPv6-ICMP # ICMP for IPv6
-ipv6-nonxt 59 IPv6-NoNxt # No Next Header for IPv6
-ipv6-opts 60 IPv6-Opts # Destination Options for IPv6
-rspf 73 RSPF # Radio Shortest Path First.
-vmtp 81 VMTP # Versatile Message Transport
-ospf 89 OSPFIGP # Open Shortest Path First IGP
-ipip 94 IPIP # IP-within-IP Encapsulation Protocol
-encap 98 ENCAP # Yet Another IP encapsulation
-pim 103 PIM # Protocol Independent Multicast
diff --git a/main/alpine-keys/APKBUILD b/main/alpine-keys/APKBUILD
index ac8cf49f95..ecb2c7ffb1 100644
--- a/main/alpine-keys/APKBUILD
+++ b/main/alpine-keys/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-keys
-pkgver=2.3
+pkgver=2.4
pkgrel=1
pkgdesc="Public keys for Alpine Linux packages"
url="https://alpinelinux.org"
@@ -12,19 +12,27 @@ options="!check" # No testsuite
_arch_keys="
aarch64:alpine-devel@lists.alpinelinux.org-58199dcc.rsa.pub
+ aarch64:alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
armhf,armv7:alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub
+ armv7:alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
+ armhf:alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub
x86:alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
+ x86:alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub
x86,x86_64:alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
x86_64:alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
+ x86_64:alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub
ppc64le:alpine-devel@lists.alpinelinux.org-58cbb476.rsa.pub
+ ppc64le:alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub
s390x:alpine-devel@lists.alpinelinux.org-58e4f17d.rsa.pub
+ s390x:alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub
mips64:alpine-devel@lists.alpinelinux.org-5e69ca50.rsa.pub
riscv64:alpine-devel@lists.alpinelinux.org-60ac2099.rsa.pub
+ riscv64:alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub
"
for _i in $_arch_keys; do
@@ -99,12 +107,20 @@ package() {
sha512sums="
e4f9e314f8e506fba2cb3e599c6412a036ec37ce3a54990fc7d80a821d8728f40ee3b4aa8a15218d50341fa785d9ddf7c7471f45018c6a2065ab13664a1aa9e9 alpine-devel@lists.alpinelinux.org-58199dcc.rsa.pub
+51a5ec21283fe218809b2325202e1f8c9b2551705db48254b9d48a04f4ed0075de51e9886c4704647ffb309fd32d9850d14013848a53038039e85011251fe1cc alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
698fda502f70365a852de3c10636eadfc4f70a7a00f096581119aef665e248b787004ceef63f4c8cb18c6f88d18b8b1bd6b3c5d260e79e6d73a3cc09537b196e alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub
+a98095a626f2dcbda73ffd8873ba2d609ee1d881f5da13b0eb3469ddd58b06440b4b0b2f791b037c88073e9a17c6dfc62dc1a4c8491bed871524d772ef04ad24 alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
+7aa5526a88519ae91f997bf914a9bd3d230b21c011587f155ce22c4bb94b70181b28590027eb555d96d1122dffb8242c1fb044228e99b4e9b7650fcf6f5121c7 alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub
e18e65ee911eb1f8ea869f758e8f2c94cf2ac254ee7ab90a3de1d47b94a547c2066214abf710da21910ebedc0153d05fd4fe579cc5ce24f46e0cfd29a02b1a68 alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
+b89d825e6af73687339848817791b294e2404162e2e069d9212d76d4ee53d6216eb75421a07b02f9778ef57dbb27962b2436247264eea1a1d882967ca0c18724 alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub
2d4064cbe09ff958493ec86bcb925af9b7517825d1d9d8d00f2986201ad5952f986fea83d1e2c177e92130700bafa8c0bff61411b3cdb59a41e460ed719580a6 alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
721134f289ab1e7dde9158359906017daee40983199fe55f28206c8cdc46b8fcf177a36f270ce374b0eba5dbe01f68cbb3e385ae78a54bb0a2ed1e83a4d820a5 alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
+8b9c2208c904c9f34d9d01d3d68b224208530e684265df214deb8c9e6b4b19633aa48a405e673249c9e93a8ee194a336e951cd82a4e27e5e66e85fdc5e0d495e alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub
bb5a3df8fac14a62d5936fb3722873fa6a121219b703cba955eb77de38c4384aeaf378fb9321a655e255f0be761e894e309b3789867279c1524dab6300cd8ef1 alpine-devel@lists.alpinelinux.org-58cbb476.rsa.pub
+bad4da65221150a5d4cc6f63981e4dd203d40844d32e82c17f346eee5350e460e32d28f0e231a2b78d326ec32b898eec597d3787dae47dcacc9a9776d19fb4a1 alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub
0666389ca53121453578cd4bef5fd06e159e291164b3e3233e7d6521604f8bebd30caeef1663adcd5309e07278833402c8a92c33294ec0c5cada24dc47c8cc98 alpine-devel@lists.alpinelinux.org-58e4f17d.rsa.pub
+83fc29066f6073418ecf01176ce24c1c0e788508f3083a97691706e2c78323e53448060fb0d2abb8118a759570f1f0db9d39953c63fe26fe06da2be05dff393c alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub
66ce9677e9c2a7961d5d7bc5b162ed3114a7aef6d01181073c1f42a9934966eecded2ec09deb210f5a389d434d1641ba35fe3abdd5246b2e97d5a5b26a945c5c alpine-devel@lists.alpinelinux.org-5e69ca50.rsa.pub
34514100e502f449dcabe0aa550232c3330ed2f0b789b977eb228d4ac86afc93479474ac005914992a3b47c18ee3eb32ca27ccd0d392700a8f11f47d64a78969 alpine-devel@lists.alpinelinux.org-60ac2099.rsa.pub
+7cea57204a50d72bddff201c509ccbf06773d87062a3ead0a206cc6e4a00e0960f52d21f7cee7aaec6a4abba7a697e2e2e7f630fa1ccef7ee2c33908fca18998 alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub
"
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub
new file mode 100644
index 0000000000..f2165aebad
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAutQkua2CAig4VFSJ7v54
+ALyu/J1WB3oni7qwCZD3veURw7HxpNAj9hR+S5N/pNeZgubQvJWyaPuQDm7PTs1+
+tFGiYNfAsiibX6Rv0wci3M+z2XEVAeR9Vzg6v4qoofDyoTbovn2LztaNEjTkB+oK
+tlvpNhg1zhou0jDVYFniEXvzjckxswHVb8cT0OMTKHALyLPrPOJzVtM9C1ew2Nnc
+3848xLiApMu3NBk0JqfcS3Bo5Y2b1FRVBvdt+2gFoKZix1MnZdAEZ8xQzL/a0YS5
+Hd0wj5+EEKHfOd3A75uPa/WQmA+o0cBFfrzm69QDcSJSwGpzWrD1ScH3AK8nWvoj
+v7e9gukK/9yl1b4fQQ00vttwJPSgm9EnfPHLAtgXkRloI27H6/PuLoNvSAMQwuCD
+hQRlyGLPBETKkHeodfLoULjhDi1K2gKJTMhtbnUcAA7nEphkMhPWkBpgFdrH+5z4
+Lxy+3ek0cqcI7K68EtrffU8jtUj9LFTUC8dERaIBs7NgQ/LfDbDfGh9g6qVj1hZl
+k9aaIPTm/xsi8v3u+0qaq7KzIBc9s59JOoA8TlpOaYdVgSQhHHLBaahOuAigH+VI
+isbC9vmqsThF2QdDtQt37keuqoda2E6sL7PUvIyVXDRfwX7uMDjlzTxHTymvq2Ck
+htBqojBnThmjJQFgZXocHG8CAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub
new file mode 100644
index 0000000000..aa63d81d66
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlEyxkHggKCXC2Wf5Mzx4
+nZLFZvU2bgcA3exfNPO/g1YunKfQY+Jg4fr6tJUUTZ3XZUrhmLNWvpvSwDS19ZmC
+IXOu0+V94aNgnhMsk9rr59I8qcbsQGIBoHzuAl8NzZCgdbEXkiY90w1skUw8J57z
+qCsMBydAueMXuWqF5nGtYbi5vHwK42PffpiZ7G5Kjwn8nYMW5IZdL6ZnMEVJUWC9
+I4waeKg0yskczYDmZUEAtrn3laX9677ToCpiKrvmZYjlGl0BaGp3cxggP2xaDbUq
+qfFxWNgvUAb3pXD09JM6Mt6HSIJaFc9vQbrKB9KT515y763j5CC2KUsilszKi3mB
+HYe5PoebdjS7D1Oh+tRqfegU2IImzSwW3iwA7PJvefFuc/kNIijfS/gH/cAqAK6z
+bhdOtE/zc7TtqW2Wn5Y03jIZdtm12CxSxwgtCF1NPyEWyIxAQUX9ACb3M0FAZ61n
+fpPrvwTaIIxxZ01L3IzPLpbc44x/DhJIEU+iDt6IMTrHOphD9MCG4631eIdB0H1b
+6zbNX1CXTsafqHRFV9XmYYIeOMggmd90s3xIbEujA6HKNP/gwzO6CDJ+nHFDEqoF
+SkxRdTkEqjTjVKieURW7Swv7zpfu5PrsrrkyGnsRrBJJzXlm2FOOxnbI2iSL1B5F
+rO5kbUxFeZUIDq+7Yv4kLWcCAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub
new file mode 100644
index 0000000000..59c330e9f7
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnC+bR4bHf/L6QdU4puhQ
+gl1MHePszRC38bzvVFDUJsmCaMCL2suCs2A2yxAgGb9pu9AJYLAmxQC4mM3jNqhg
+/E7yuaBbek3O02zN/ctvflJ250wZCy+z0ZGIp1ak6pu1j14IwHokl9j36zNfGtfv
+ADVOcdpWITFFlPqwq1qt/H3UsKVmtiF3BNWWTeUEQwKvlU8ymxgS99yn0+4OPyNT
+L3EUeS+NQJtDS01unau0t7LnjUXn+XIneWny8bIYOQCuVR6s/gpIGuhBaUqwaJOw
+7jkJZYF2Ij7uPb4b5/R3vX2FfxxqEHqssFSg8FFUNTZz3qNZs0CRVyfA972g9WkJ
+hPfn31pQYil4QGRibCMIeU27YAEjXoqfJKEPh4UWMQsQLrEfdGfb8VgwrPbniGfU
+L3jKJR3VAafL9330iawzVQDlIlwGl6u77gEXMl9K0pfazunYhAp+BMP+9ot5ckK+
+osmrqj11qMESsAj083GeFdfV3pXEIwUytaB0AKEht9DbqUfiE/oeZ/LAXgySMtVC
+sbC4ESmgVeY2xSBIJdDyUap7FR49GGrw0W49NUv9gRgQtGGaNVQQO9oGL2PBC41P
+iWF9GLoX30HIz1P8PF/cZvicSSPkQf2Z6TV+t0ebdGNS5DjapdnCrq8m9Z0pyKsQ
+uxAL2a7zX8l5i1CZh1ycUGsCAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub
new file mode 100644
index 0000000000..915bc566b7
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0MfCDrhODRCIxR9Dep1s
+eXafh5CE5BrF4WbCgCsevyPIdvTeyIaW4vmO3bbG4VzhogDZju+R3IQYFuhoXP5v
+Y+zYJGnwrgz3r5wYAvPnLEs1+dtDKYOgJXQj+wLJBW1mzRDL8FoRXOe5iRmn1EFS
+wZ1DoUvyu7/J5r0itKicZp3QKED6YoilXed+1vnS4Sk0mzN4smuMR9eO1mMCqNp9
+9KTfRDHTbakIHwasECCXCp50uXdoW6ig/xUAFanpm9LtK6jctNDbXDhQmgvAaLXZ
+LvFqoaYJ/CvWkyYCgL6qxvMvVmPoRv7OPcyni4xR/WgWa0MSaEWjgPx3+yj9fiMA
+1S02pFWFDOr5OUF/O4YhFJvUCOtVsUPPfA/Lj6faL0h5QI9mQhy5Zb9TTaS9jB6p
+Lw7u0dJlrjFedk8KTJdFCcaGYHP6kNPnOxMylcB/5WcztXZVQD5WpCicGNBxCGMm
+W64SgrV7M07gQfL/32QLsdqPUf0i8hoVD8wfQ3EpbQzv6Fk1Cn90bZqZafg8XWGY
+wddhkXk7egrr23Djv37V2okjzdqoyLBYBxMz63qQzFoAVv5VoY2NDTbXYUYytOvG
+GJ1afYDRVWrExCech1mX5ZVUB1br6WM+psFLJFoBFl6mDmiYt0vMYBddKISsvwLl
+IJQkzDwtXzT2cSjoj3T5QekCAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub
new file mode 100644
index 0000000000..1e49d24690
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvaaoSLab+IluixwKV5Od
+0gib2YurjPatGIbn5Ov2DLUFYiebj2oJINXJSwUOO+4WcuHFEqiL/1rya+k5hLZt
+hnPL1tn6QD4rESznvGSasRCQNT2vS/oyZbTYJRyAtFkEYLlq0t3S3xBxxHWuvIf0
+qVxVNYpQWyM3N9RIeYBR/euXKJXileSHk/uq1I5wTC0XBIHWcthczGN0m9wBEiWS
+0m3cnPk4q0Ea8mUJ91Rqob19qETz6VbSPYYpZk3qOycjKosuwcuzoMpwU8KRiMFd
+5LHtX0Hx85ghGsWDVtS0c0+aJa4lOMGvJCAOvDfqvODv7gKlCXUpgumGpLdTmaZ8
+1RwqspAe3IqBcdKTqRD4m2mSg23nVx2FAY3cjFvZQtfooT7q1ItRV5RgH6FhQSl7
++6YIMJ1Bf8AAlLdRLpg+doOUGcEn+pkDiHFgI8ylH1LKyFKw+eXaAml/7DaWZk1d
+dqggwhXOhc/UUZFQuQQ8A8zpA13PcbC05XxN2hyP93tCEtyynMLVPtrRwDnHxFKa
+qKzs3rMDXPSXRn3ZZTdKH3069ApkEjQdpcwUh+EmJ1Ve/5cdtzT6kKWCjKBFZP/s
+91MlRrX2BTRdHaU5QJkUheUtakwxuHrdah2F94lRmsnQlpPr2YseJu6sIE+Dnx4M
+CfhdVbQL2w54R645nlnohu8CAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
new file mode 100644
index 0000000000..bb15efe96d
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq0BFD1D4lIxQcsqEpQzU
+pNCYM3aP1V/fxxVdT4DWvSI53JHTwHQamKdMWtEXetWVbP5zSROniYKFXd/xrD9X
+0jiGHey3lEtylXRIPxe5s+wXoCmNLcJVnvTcDtwx/ne2NLHxp76lyc25At+6RgE6
+ADjLVuoD7M4IFDkAsd8UQ8zM0Dww9SylIk/wgV3ZkifecvgUQRagrNUdUjR56EBZ
+raQrev4hhzOgwelT0kXCu3snbUuNY/lU53CoTzfBJ5UfEJ5pMw1ij6X0r5S9IVsy
+KLWH1hiO0NzU2c8ViUYCly4Fe9xMTFc6u2dy/dxf6FwERfGzETQxqZvSfrRX+GLj
+/QZAXiPg5178hT/m0Y3z5IGenIC/80Z9NCi+byF1WuJlzKjDcF/TU72zk0+PNM/H
+Kuppf3JT4DyjiVzNC5YoWJT2QRMS9KLP5iKCSThwVceEEg5HfhQBRT9M6KIcFLSs
+mFjx9kNEEmc1E8hl5IR3+3Ry8G5/bTIIruz14jgeY9u5jhL8Vyyvo41jgt9sLHR1
+/J1TxKfkgksYev7PoX6/ZzJ1ksWKZY5NFoDXTNYUgzFUTOoEaOg3BAQKadb3Qbbq
+XIrxmPBdgrn9QI7NCgfnAY3Tb4EEjs3ON/BNyEhUENcXOH6I1NbcuBQ7g9P73kE4
+VORdoc8MdJ5eoKBpO8Ww8HECAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
new file mode 100644
index 0000000000..0ecbccc2e4
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyduVzi1mWm+lYo2Tqt/0
+XkCIWrDNP1QBMVPrE0/ZlU2bCGSoo2Z9FHQKz/mTyMRlhNqTfhJ5qU3U9XlyGOPJ
+piM+b91g26pnpXJ2Q2kOypSgOMOPA4cQ42PkHBEqhuzssfj9t7x47ppS94bboh46
+xLSDRff/NAbtwTpvhStV3URYkxFG++cKGGa5MPXBrxIp+iZf9GnuxVdST5PGiVGP
+ODL/b69sPJQNbJHVquqUTOh5Ry8uuD2WZuXfKf7/C0jC/ie9m2+0CttNu9tMciGM
+EyKG1/Xhk5iIWO43m4SrrT2WkFlcZ1z2JSf9Pjm4C2+HovYpihwwdM/OdP8Xmsnr
+DzVB4YvQiW+IHBjStHVuyiZWc+JsgEPJzisNY0Wyc/kNyNtqVKpX6dRhMLanLmy+
+f53cCSI05KPQAcGj6tdL+D60uKDkt+FsDa0BTAobZ31OsFVid0vCXtsbplNhW1IF
+HwsGXBTVcfXg44RLyL8Lk/2dQxDHNHzAUslJXzPxaHBLmt++2COa2EI1iWlvtznk
+Ok9WP8SOAIj+xdqoiHcC4j72BOVVgiITIJNHrbppZCq6qPR+fgXmXa+sDcGh30m6
+9Wpbr28kLMSHiENCWTdsFij+NQTd5S47H7XTROHnalYDuF1RpS+DpQidT5tUimaT
+JZDr++FjKrnnijbyNF8b98UCAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub
new file mode 100644
index 0000000000..ceffa3ace9
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnpUpyWDWjlUk3smlWeA0
+lIMW+oJ38t92CRLHH3IqRhyECBRW0d0aRGtq7TY8PmxjjvBZrxTNDpJT6KUk4LRm
+a6A6IuAI7QnNK8SJqM0DLzlpygd7GJf8ZL9SoHSH+gFsYF67Cpooz/YDqWrlN7Vw
+tO00s0B+eXy+PCXYU7VSfuWFGK8TGEv6HfGMALLjhqMManyvfp8hz3ubN1rK3c8C
+US/ilRh1qckdbtPvoDPhSbTDmfU1g/EfRSIEXBrIMLg9ka/XB9PvWRrekrppnQzP
+hP9YE3x/wbFc5QqQWiRCYyQl/rgIMOXvIxhkfe8H5n1Et4VAorkpEAXdsfN8KSVv
+LSMazVlLp9GYq5SUpqYX3KnxdWBgN7BJoZ4sltsTpHQ/34SXWfu3UmyUveWj7wp0
+x9hwsPirVI00EEea9AbP7NM2rAyu6ukcm4m6ATd2DZJIViq2es6m60AE6SMCmrQF
+wmk4H/kdQgeAELVfGOm2VyJ3z69fQuywz7xu27S6zTKi05Qlnohxol4wVb6OB7qG
+LPRtK9ObgzRo/OPumyXqlzAi/Yvyd1ZQk8labZps3e16bQp8+pVPiumWioMFJDWV
+GZjCmyMSU8V6MB6njbgLHoyg2LCukCAeSjbPGGGYhnKLm1AKSoJh3IpZuqcKCk5C
+8CM1S15HxV78s9dFntEqIokCAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/amavisd-milter/APKBUILD b/main/amavisd-milter/APKBUILD
index eafffd3740..45299851b6 100644
--- a/main/amavisd-milter/APKBUILD
+++ b/main/amavisd-milter/APKBUILD
@@ -2,23 +2,21 @@
# Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting>
pkgname=amavisd-milter
pkgver=1.7.1
-pkgrel=1
+pkgrel=2
pkgdesc="sendmail milter for amavisd-new using the AM.PDP protocol"
url="https://github.com/prehor/amavisd-milter"
arch="all !x86" #amavis isn't build for x86
license="BSD-3-Clause"
-depends="amavis libmilter"
+depends="amavis"
makedepends="libmilter-dev"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
source="
https://github.com/prehor/amavisd-milter/releases/download/$pkgver/amavisd-milter-$pkgver.tar.gz
amavisd-milter.initd
amavisd-milter.confd
"
-builddir="$srcdir/$pkgname-$pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
diff --git a/main/ansible-base/0001-new-module-lbu.patch b/main/ansible-base/0001-new-module-lbu.patch
deleted file mode 100644
index 6147d3d3dd..0000000000
--- a/main/ansible-base/0001-new-module-lbu.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From a419a9539ddff10fa4d3fd7460b117a9f4dd2691 Mon Sep 17 00:00:00 2001
-From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Date: Thu, 19 Sep 2019 10:58:07 +0300
-Subject: [PATCH] new module: lbu
-
-Alpine Linux Local Backup Utility
----
- lib/ansible/modules/system/lbu.py | 131 ++++++++++++++++++++++++++++++
- 1 file changed, 131 insertions(+)
- create mode 100644 lib/ansible/modules/system/lbu.py
-
-diff --git a/lib/ansible/modules/system/lbu.py b/lib/ansible/modules/system/lbu.py
-new file mode 100644
-index 0000000000..9952ec29f1
---- /dev/null
-+++ b/lib/ansible/modules/lbu.py
-@@ -0,0 +1,131 @@
-+#!/usr/bin/python
-+
-+# Copyright: (c) 2019, Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-+
-+from __future__ import absolute_import, division, print_function
-+__metaclass__ = type
-+
-+ANSIBLE_METADATA = {
-+ 'metadata_version': '1.1',
-+ 'status': ['preview'],
-+ 'supported_by': 'community'
-+}
-+
-+DOCUMENTATION = '''
-+---
-+module: lbu
-+
-+short_description: Local Backup Utility for Alpine Linux
-+
-+version_added: "2.10"
-+
-+description:
-+- Manage Local Backup Utility of Alpine Linux in run-from-RAM mode
-+
-+options:
-+ commit:
-+ description:
-+ - Control whether to commit changed files.
-+ type: bool
-+ exclude:
-+ description:
-+ - List of paths to exclude.
-+ type: list
-+ include:
-+ description:
-+ - List of paths to include.
-+ type: list
-+
-+author:
-+- Kaarle Ritvanen (@kunkku)
-+'''
-+
-+EXAMPLES = '''
-+# Commit changed files (if any)
-+- name: Commit
-+ lbu:
-+ commit: true
-+
-+# Exclude path and commit
-+- name: Exclude directory
-+ lbu:
-+ commit: true
-+ exclude:
-+ - /etc/opt
-+
-+# Include paths without committing
-+- name: Include file and directory
-+ lbu:
-+ include:
-+ - /root/.ssh/authorized_keys
-+ - /var/lib/misc
-+'''
-+
-+RETURN = '''
-+msg:
-+ description: Error message
-+ type: str
-+ returned: on failure
-+'''
-+
-+from ansible.module_utils.basic import AnsibleModule
-+
-+import os.path
-+
-+
-+def run_module():
-+ module = AnsibleModule(
-+ argument_spec={
-+ 'commit': {'type': 'bool'},
-+ 'exclude': {'type': 'list', 'elements': 'str'},
-+ 'include': {'type': 'list', 'elements': 'str'}
-+ },
-+ supports_check_mode=True
-+ )
-+
-+ changed = False
-+
-+ def run_lbu(*args):
-+ code, stdout, stderr = module.run_command(
-+ [module.get_bin_path('lbu', required=True)] + list(args)
-+ )
-+ if code:
-+ module.fail_json(changed=changed, msg=stderr)
-+ return stdout
-+
-+ update = False
-+ commit = False
-+
-+ for param in ('include', 'exclude'):
-+ if module.params[param]:
-+ paths = run_lbu(param, '-l').split('\n')
-+ for path in module.params[param]:
-+ if os.path.normpath('/' + path)[1:] not in paths:
-+ update = True
-+
-+ if module.params['commit']:
-+ commit = update or run_lbu('status') > ''
-+
-+ if module.check_mode:
-+ module.exit_json(changed=update or commit)
-+
-+ if update:
-+ for param in ('include', 'exclude'):
-+ if module.params[param]:
-+ run_lbu(param, *module.params[param])
-+ changed = True
-+
-+ if commit:
-+ run_lbu('commit')
-+ changed = True
-+
-+ module.exit_json(changed=changed)
-+
-+
-+def main():
-+ run_module()
-+
-+
-+if __name__ == '__main__':
-+ main()
---
-2.20.1
-
diff --git a/main/ansible-base/APKBUILD b/main/ansible-base/APKBUILD
deleted file mode 100644
index a856540dcb..0000000000
--- a/main/ansible-base/APKBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Takuya Noguchi <takninnovationresearch@gmail.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=ansible-base
-pkgver=2.10.5
-pkgrel=1
-pkgdesc="A configuration-management, deployment, task-execution, and multinode orchestration framework"
-url="https://ansible.com/"
-options="!check" # TODO: enable tests
-arch="noarch"
-license="GPL-3.0-or-later"
-depends="python3 py3-jinja2 py3-packaging py3-yaml py3-cryptography py3-paramiko"
-makedepends="py3-setuptools"
-subpackages="$pkgname-doc"
-source="https://pypi.python.org/packages/source/a/ansible-base/ansible-base-$pkgver.tar.gz
- 0001-new-module-lbu.patch
- "
-
-# secfixes:
-# 2.9.13-r0:
-# - CVE-2020-14330
-# - CVE-2020-14332
-# - CVE-2020-14365
-# 2.9.7-r0:
-# - CVE-2019-3828
-# - CVE-2020-1733
-# - CVE-2020-1739
-# - CVE-2020-1740
-# - CVE-2020-1746
-# - CVE-2020-10691
-# 2.9.6-r0:
-# - CVE-2020-1737
-# 2.9.3-r0:
-# - CVE-2019-14904
-# - CVE-2019-14905
-# 2.8.6-r0:
-# - CVE-2019-14846
-# - CVE-2019-14856
-# - CVE-2019-14858
-# 2.8.4-r0:
-# - CVE-2019-10206
-# - CVE-2019-10217
-# 2.8.2-r0:
-# - CVE-2019-10156
-# 2.7.9-r0:
-# - CVE-2018-16876
-# 2.6.3-r0:
-# - CVE-2018-10875
-
-build() {
- python3 setup.py build
-}
-
-package() {
- python3 setup.py install --prefix=/usr --root="$pkgdir"
-
- mkdir -p "$pkgdir"/usr/share/man/man1
- install -Dm644 "$builddir"/docs/man/man1/*.1 \
- "$pkgdir"/usr/share/man/man1/
-
- mkdir -p "$pkgdir"/usr/share/doc/$pkgname/examples/
- cp -r examples/* \
- "$pkgdir"/usr/share/doc/$pkgname/examples/
- install -m644 README.rst "$pkgdir"/usr/share/doc/$pkgname
-}
-
-sha512sums="2449a36bdea7242a3f4e248e42388339299340cd6c377d6a20b02803db527895912e49040f3931a1aa2ebf04e3d4d5594cfc08aec28da44b73c8206dc81ddb89 ansible-base-2.10.5.tar.gz
-57364eb94bd5fa1add6fb2f60d4e3790a6f1d7582f92ec1e25ea9459704d12ffe49b09ebde4aef91463d1950cfc9a4a34ab2ef83c60f1bc1c1fb6399e900369d 0001-new-module-lbu.patch"
diff --git a/main/ansible/APKBUILD b/main/ansible/APKBUILD
deleted file mode 100644
index f7e327866b..0000000000
--- a/main/ansible/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Takuya Noguchi <takninnovationresearch@gmail.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=ansible
-pkgver=2.10.7
-pkgrel=0
-pkgdesc="A configuration-management, deployment, task-execution, and multinode orchestration framework"
-url="https://ansible.com/"
-options="!check" # TODO: enable tests
-arch="noarch"
-license="GPL-3.0-or-later"
-depends="python3 ansible-base"
-makedepends="py3-setuptools"
-source="https://pypi.python.org/packages/source/a/ansible/ansible-$pkgver.tar.gz"
-
-# secfixes:
-# 2.10.7-r0:
-# - CVE-2021-20191
-# 2.10.1-r0:
-# - CVE-2020-25646
-
-build() {
- python3 setup.py build
-}
-
-package() {
- python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="
-7a6522bcc57c178c9c6e87e313f6f175d5c74ac0d1b9dd0cad5506c7fa0efb16d4a627dc2d9c73f988177544bd9ccfdbec162d0feacc757edeb20280d7414191 ansible-2.10.7.tar.gz
-"
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index dde873aec7..4f5099ccc3 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
pkgname=apache2
_pkgreal=httpd
-pkgver=2.4.48
+pkgver=2.4.51
pkgrel=0
pkgdesc="A high performance Unix-based HTTP server"
url="https://httpd.apache.org/"
@@ -12,7 +12,7 @@ install="$pkgname.pre-install $pkgname.pre-upgrade"
pkgusers="apache"
pkggroups="apache"
makedepends="apr-dev apr-util-dev autoconf automake brotli-dev libxml2-dev
- lua-dev nghttp2-dev openssl-dev pcre-dev sed zlib-dev"
+ lua-dev nghttp2-dev openssl1.1-compat-dev pcre-dev sed zlib-dev"
subpackages="$pkgname-ctl
$pkgname-error:_error:noarch
$pkgname-dev
@@ -27,7 +27,7 @@ subpackages="$pkgname-ctl
$pkgname-ssl
$pkgname-utils
$pkgname-webdav"
-source="https://archive.apache.org/dist/$_pkgreal/$_pkgreal-$pkgver.tar.bz2
+source="https://dlcdn.apache.org/$_pkgreal/$_pkgreal-$pkgver.tar.bz2
apache2.confd
apache2.logrotate
apache2.initd
@@ -51,6 +51,17 @@ options="suid"
builddir="$srcdir"/$_pkgreal-$pkgver
# secfixes:
+# 2.4.51-r0:
+# - CVE-2021-42013
+# 2.4.50-r0:
+# - CVE-2021-41524
+# - CVE-2021-41773
+# 2.4.49-r0:
+# - CVE-2021-40438
+# - CVE-2021-39275
+# - CVE-2021-36160
+# - CVE-2021-34798
+# - CVE-2021-33193
# 2.4.48-r0:
# - CVE-2019-17657
# - CVE-2020-13938
@@ -367,7 +378,7 @@ _lua() {
_load_mods
}
sha512sums="
-6c250626f1e7d10428a92d984fd48ff841effcc8705f7816ab71b681bbd51d0012ad158dcd13763fe7d630311f2de258b27574603140d648be42796ab8326724 httpd-2.4.48.tar.bz2
+9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66 httpd-2.4.51.tar.bz2
8e62b101f90c67babe864bcb74f711656180b011df3fd4b541dc766b980b72aa409e86debf3559a55be359471c1cad81b8779ef3a55add8d368229fc7e9544fc apache2.confd
18e8859c7d99c4483792a5fd20127873aad8fa396cafbdb6f2c4253451ffe7a1093a3859ce719375e0769739c93704c88897bd087c63e1ef585e26dcc1f5dd9b apache2.logrotate
81a2d2a297d8049ba1b021b879ec863767149e056d9bdb2ac8acf63572b254935ec96c2e1580eba86639ea56433eec5c41341e4f1501f9072745dccdb3602701 apache2.initd
diff --git a/main/apcupsd/APKBUILD b/main/apcupsd/APKBUILD
index ed3b38ade2..fda125aa29 100644
--- a/main/apcupsd/APKBUILD
+++ b/main/apcupsd/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apcupsd
pkgver=3.14.14
-pkgrel=1
+pkgrel=2
pkgdesc="A Daemon to control APC UPSes"
subpackages="$pkgname-doc $pkgname-webif $pkgname-openrc"
url="http://www.apcupsd.org"
@@ -12,6 +12,7 @@ makedepends="net-snmp-dev linux-headers gd-dev libusb-compat-dev"
options="!check" # no test suite included
source="https://sourceforge.net/projects/apcupsd/files/apcupsd%20-%20Stable/$pkgver/apcupsd-$pkgver.tar.gz
apcupsd.initd
+ apcupsd.powerfail.initd
apcupsd-alpine.patch
"
@@ -46,6 +47,8 @@ package() {
cd "$_builddir"
make DESTDIR=$pkgdir install
install -D -m755 "$srcdir"/apcupsd.initd "$pkgdir"/etc/init.d/apcupsd
+ install -D -m755 "$srcdir"/apcupsd.powerfail.initd \
+ "$pkgdir"/etc/init.d/apcupsd.powerfail
}
webif() {
@@ -56,4 +59,5 @@ webif() {
sha512sums="c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f apcupsd-3.14.14.tar.gz
cd9cb3c812dfd72660007807965cac866dfb2ce4bd8200668f08e94fdcce874cce2ec87a0d832b8f37f254908d093aff0cc2db26e9403d5e613dc192072da617 apcupsd.initd
+8d1c266bd86cd1cdf4fccdd171a877957bf5e26e1bb8c20e4c9c6b362a63d8cc1b887a1661939e4e56228a8d23dfc81fe782806b5d1527423c2ef7872cbeb881 apcupsd.powerfail.initd
4f0712519213c4ef14f41eeef681c5498fac7bf42f205de8a855938f8e834d9488d86820d7c883e89d0d305ee287e17e2d321dbbc98ae12f8487bf58aa0d4a6b apcupsd-alpine.patch"
diff --git a/main/apcupsd/apcupsd.powerfail.initd b/main/apcupsd/apcupsd.powerfail.initd
new file mode 100644
index 0000000000..cd7a1e9210
--- /dev/null
+++ b/main/apcupsd/apcupsd.powerfail.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description='Signal the UPS to kill power in a power failure condition'
+
+depend() {
+ need mount-ro
+}
+
+start() {
+ if [ "$RC_RUNLEVEL" = "shutdown" -a -f /etc/apcupsd/powerfail ] ; then
+ ebegin 'Signaling UPS to kill power'
+ /sbin/apcupsd --killpower
+ eend $?
+ fi
+}
diff --git a/main/apk-tools/0001-solver-don-t-consider-requirer-count-for-preference.patch b/main/apk-tools/0001-solver-don-t-consider-requirer-count-for-preference.patch
deleted file mode 100644
index 6634e2d3dc..0000000000
--- a/main/apk-tools/0001-solver-don-t-consider-requirer-count-for-preference.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 3cce27e83d068d274235995c03fed1e0f8a808fb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Wed, 19 May 2021 16:29:55 +0300
-Subject: [PATCH] solver: don't consider requirer count for preference
-
-The original intent was to choose packages to which there is most
-dependencies. However, since the code has evolved this is has been
-mostly obsolete. And in fact now interferes with the provides and
-provides priority mechanism. Remove this as obsolete.
-
-Fixes #10742
----
- src/solver.c | 18 ------------------
- test/provides.repo | 22 ++++++++++++++++++++++
- test/provides13.test | 7 +++++++
- 3 files changed, 29 insertions(+), 18 deletions(-)
- create mode 100644 test/provides13.test
-
-diff --git a/src/solver.c b/src/solver.c
-index df63060..810c9ce 100644
---- a/src/solver.c
-+++ b/src/solver.c
-@@ -493,17 +493,6 @@ static void reconsider_name(struct apk_solver_state *ss, struct apk_name *name)
- name->name, name->ss.has_options, name->ss.reverse_deps_done);
- }
-
--static int count_requirers(const struct apk_package *pkg)
--{
-- int cnt = pkg->name->ss.requirers;
-- struct apk_dependency *p;
--
-- foreach_array_item(p, pkg->provides)
-- cnt += p->name->ss.requirers;
--
-- return cnt;
--}
--
- static int compare_providers(struct apk_solver_state *ss,
- struct apk_provider *pA, struct apk_provider *pB)
- {
-@@ -597,13 +586,6 @@ static int compare_providers(struct apk_solver_state *ss,
- return r;
- }
-
-- /* Prefer highest requirer count. */
-- r = count_requirers(pkgA) - count_requirers(pkgB);
-- if (r) {
-- dbg_printf(" prefer highest requirer count\n");
-- return r;
-- }
--
- /* Prefer installed */
- if (!(solver_flags & APK_SOLVERF_UPGRADE)) {
- r = (pkgA->ipkg != NULL) - (pkgB->ipkg != NULL);
-diff --git a/test/provides.repo b/test/provides.repo
-index 358151e..ed72f72 100644
---- a/test/provides.repo
-+++ b/test/provides.repo
-@@ -111,3 +111,25 @@ V:0.1
- S:1
- I:1
- D:conflicted-provider-2
-+
-+C:Q1inqy40xXhjHaXUlG+qIshN+TIvA=
-+P:pulseaudio-alsa
-+V:1
-+S:1
-+I:1
-+k:10
-+
-+c:a79b3f751d72fd4bdb6729139660d0b4f5b87a33
-+P:pulseaudio
-+V:1
-+S:1
-+I:1
-+k:10
-+
-+C:Q1FAFBeAhWPV1XXEdoW+TSjrUghxU=
-+P:pipewire-pulse
-+V:1
-+S:1
-+I:1
-+k:1
-+p:pulseaudio=1 pulseaudio-alsa=1
-diff --git a/test/provides13.test b/test/provides13.test
-new file mode 100644
-index 0000000..5d6482d
---- /dev/null
-+++ b/test/provides13.test
-@@ -0,0 +1,7 @@
-+@ARGS
-+--test-repo provides.repo
-+add pulseaudio pulseaudio-alsa
-+@EXPECT
-+(1/2) Installing pulseaudio (1)
-+(2/2) Installing pulseaudio-alsa (1)
-+OK: 0 MiB in 0 packages
---
-2.31.1
-
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index c819b368cc..6bd813c552 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,31 +1,35 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
-pkgver=2.12.5
-pkgrel=1
+pkgver=2.12.7
+pkgrel=3
pkgdesc="Alpine Package Keeper - package manager for alpine"
arch="all"
url="https://gitlab.alpinelinux.org/alpine/apk-tools"
license="GPL-2.0-only"
-subpackages="$pkgname-dev $pkgname-static $pkgname-doc $pkgname-zsh-completion"
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-static $pkgname-doc $pkgname-zsh-completion"
# Musl 1.2 introduced new ABI for time64 => upgrading apk-tools
# while staying on musl <1.2 causes missing symbols
depends="musl>=1.2"
makedepends_build="openssl lua5.3 lua5.3-lzlib scdoc"
-makedepends_host="zlib-dev openssl-dev zlib-static openssl-libs-static linux-headers"
+makedepends_host="zlib-dev openssl1.1-compat-dev zlib-static openssl1.1-compat-libs-static linux-headers"
makedepends="$makedepends_build $makedepends_host"
_lua="no"
if [ "$CBUILD" = "$CHOST" ]; then
_lua="lua5.3"
subpackages="$subpackages $_lua-apk:luaapk"
makedepends="$makedepends $_lua-dev"
+
+ # ca-certificates-bundle needed for https certificate validation
+ depends="$depends ca-certificates-bundle"
fi
source="https://gitlab.alpinelinux.org/alpine/$pkgname/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz
- 0001-solver-don-t-consider-requirer-count-for-preference.patch
_apk
"
builddir="$srcdir/$pkgname-v$pkgver"
# secfixes:
+# 2.12.6-r0:
+# - CVE-2021-36159
# 2.12.5-r0:
# - CVE-2021-30139
@@ -82,7 +86,6 @@ luaapk() {
}
sha512sums="
-478137f14617e97bdf79cd431812116b94270107d1473313fa94d5c258ed55c11234ad80cb6ba74e0134b0de0f25356d60f77966ecc5dbe5175415768718d1d8 apk-tools-v2.12.5.tar.gz
-d7ef6721eab357ff6d8329c56443da472099d3d5e4764cce7101b55c0d1a0653bae6103ab25c2a5e0800a283cf950d890c8b2f2aea3ccf288b1521c014e31b13 0001-solver-don-t-consider-requirer-count-for-preference.patch
+1297bb969a4d27164b38e64f4d2c00b00758d8d83c7ba658eeddccdd549dc6ba8f26a60a9e71c88f4bca87b2746a8fb4b7bb41e0096cf459e1b841203f903681 apk-tools-v2.12.7.tar.gz
102e6d01a984fb7a84c9432f797e4d8d2c90e9570dd26208b8485569ab471ea88a2cc81eabd3b3f7e4c9685a37afc458dec172a65b03c19c78a7efb598c54f45 _apk
"
diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD
index 656bf1bf37..fc6efbe259 100644
--- a/main/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apr-util
pkgver=1.6.1
-pkgrel=7
+pkgrel=9
pkgdesc="The Apache Portable Runtime Utility Library"
url="http://apr.apache.org/"
arch="all"
@@ -9,7 +9,7 @@ license="Apache-2.0"
subpackages="$pkgname-dev $pkgname-dbd_pgsql $pkgname-dbd_mysql
$pkgname-dbd_sqlite3 $pkgname-ldap"
depends_dev="expat-dev openldap-dev sqlite-dev postgresql-dev
- openssl-dev mariadb-dev"
+ openssl1.1-compat-dev mariadb-dev"
makedepends="$depends_dev apr-dev bash chrpath openssl"
source="https://www.apache.org/dist/apr/apr-util-$pkgver.tar.bz2
musl-fix-testsuite.patch"
diff --git a/main/arm-trusted-firmware/APKBUILD b/main/arm-trusted-firmware/APKBUILD
index a5302307c4..a7354ff000 100644
--- a/main/arm-trusted-firmware/APKBUILD
+++ b/main/arm-trusted-firmware/APKBUILD
@@ -3,12 +3,12 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=arm-trusted-firmware
pkgver=2.5
-pkgrel=0
+pkgrel=3
pkgdesc="ARM Trusted Firmware-A (TF-A)"
url="https://github.com/ARM-software/arm-trusted-firmware"
arch="aarch64"
license="BSD-3-Clause"
-makedepends="dtc openssl-dev gcc-arm-none-eabi"
+makedepends="dtc openssl1.1-compat-dev"
source="https://github.com/ARM-software/arm-trusted-firmware/archive/v$pkgver/arm-trusted-firmware-v$pkgver.tar.gz
rk3399-baudrate.patch"
options="!check" # No tests
diff --git a/main/arpwatch/APKBUILD b/main/arpwatch/APKBUILD
index 30f367d4c2..2c64257c23 100644
--- a/main/arpwatch/APKBUILD
+++ b/main/arpwatch/APKBUILD
@@ -2,10 +2,10 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=arpwatch
pkgver=3.1
-pkgrel=0
+pkgrel=1
pkgdesc="Ethernet monitoring program"
url="https://www-nrg.ee.lbl.gov/"
-arch="all !riscv64"
+arch="all"
license="BSD-4-Clause-Shortened"
pkgusers="arpwatch"
depends="python3"
@@ -21,6 +21,13 @@ source="https://ee.lbl.gov/downloads/arpwatch/arpwatch-$pkgver.tar.gz
remove-freebsd-arpwatch.patch
"
+prepare() {
+ default_prepare
+
+ update_config_sub
+ update_config_guess
+}
+
build() {
export PYTHON=python3
./configure \
@@ -47,9 +54,11 @@ package() {
done
}
-sha512sums="2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282 arpwatch-3.1.tar.gz
+sha512sums="
+2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282 arpwatch-3.1.tar.gz
854f6361bf02586516db4f50afdee729c047cd788985f72f475e592e0e744c24d7d765f0391d733dbf417048c26b6d43c00eb63c58e6798bdb2366b93cbfe03a arpwatch.confd
-d60d8d07c5572ba645f037d2d8a9b028f8cd434d99e76a9f75a046d00959d6b4544ab6d866d3c88b4861175c5407d83ecd954b5f5dad0b2ec3894411e83e5e2f arpwatch.initd
+83fc559aecd82cefd430104df23fc7680ac14d2c27f74d4543585382166e16a65563e00122281e886278993a9ca574daa5b2b2100884369c3a3146a66b68a0f7 arpwatch.initd
b537220b7a19f7f28d1b60cfea6ef2e4d0c852ac83907fdd2515e467c3d16529b0c5a25ee653536e674c63d47a00709fc89fd6085efc5ba4a12f392df5ae5788 22_alpine_bihourly_script.patch
6eae9b143deea1655b3adb45640329d1c6d15c0bf6172a229ed142bb59e6c53b73ad19dc38adc42fe547f0bae1310394b19c9f8efe1af3a7dbf889c3742008c1 53_stop-using-_getshort.patch
-68298d7967c281bbda6fe7d64f9af427eb39ac1a0011283b14ea1004396949595acc6947ddcabb385acdc83abe6255bf79ff92e5b8b1c33c67c26830b82ecd64 remove-freebsd-arpwatch.patch"
+68298d7967c281bbda6fe7d64f9af427eb39ac1a0011283b14ea1004396949595acc6947ddcabb385acdc83abe6255bf79ff92e5b8b1c33c67c26830b82ecd64 remove-freebsd-arpwatch.patch
+"
diff --git a/main/arpwatch/arpwatch.initd b/main/arpwatch/arpwatch.initd
index 437633effe..c6f2a18c51 100644
--- a/main/arpwatch/arpwatch.initd
+++ b/main/arpwatch/arpwatch.initd
@@ -24,7 +24,7 @@ start() {
else
chown ${ARPUSER} ${DATAFILE}
start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch/arpwatch.${IFACE}.pid --exec \
- /usr/sbin/arpwatch -- -i $IFACE -u ${ARPUSER} -f ${DATAFILE} -P /var/run/arpwatch/arpwatch.${IFACE}.pid ${OPTIONS}
+ /usr/sbin/arpwatch -- -i $IFACE -f ${DATAFILE} -P /var/run/arpwatch/arpwatch.${IFACE}.pid ${OPTIONS}
fi
eend $?
done
diff --git a/main/asciidoc/APKBUILD b/main/asciidoc/APKBUILD
index 2a6e892c78..9aafab2c19 100644
--- a/main/asciidoc/APKBUILD
+++ b/main/asciidoc/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=asciidoc
-pkgver=9.1.0
+pkgver=9.1.1
pkgrel=0
pkgdesc="Text based documentation"
url="https://asciidoc.org/"
@@ -40,4 +40,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="c4565cfb30a8789ed64b7b9293019a6528eb93341ab109c9a6cb4985bf4a65117516e03b84340eb84ea07981650f50f52c0ae85eba2956fcbde23e46b3cf228e asciidoc-9.1.0.tar.gz"
+sha512sums="
+444de69e3b87af984327873d5be1162157db5f7fb353e1fbbd24b4938ce0238fd474a67c9d3461fb7b069e7b029c63fbaf1ba8dd9cf7b91fbfa81e5429db404c asciidoc-9.1.1.tar.gz
+"
diff --git a/main/asciidoctor/APKBUILD b/main/asciidoctor/APKBUILD
index 4833db001b..c5de7d3d92 100644
--- a/main/asciidoctor/APKBUILD
+++ b/main/asciidoctor/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Seung Soo Mun <hamletmun@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=asciidoctor
-pkgver=2.0.15
-pkgrel=0
+pkgver=2.0.16
+pkgrel=1
pkgdesc="Converter for AsciiDoc to HTML5, DocBook 5 (or 4.5) and other formats"
url="https://rubygems.org/gems/$pkgname"
arch="noarch"
@@ -34,5 +34,5 @@ package() {
}
sha512sums="
-55ab7ceb85e219a36fdcb21d5620199e1d46281742cf52ce5892f36ee5db1119b535f488fae57aa360cbaee762f903d6bd957e3a65781eacd810b41eafcaa8f1 asciidoctor-2.0.15.gem
+2e164a0d24374e0c5461926c865c8900d3fb3f27606af5aac1a0a5f53102ca758f6421a113a9bb100fe7dba2e1accec04ca6ca16670e4b85e373f729bdaba6cd asciidoctor-2.0.16.gem
"
diff --git a/main/aspell/APKBUILD b/main/aspell/APKBUILD
index 80bf0cd21a..92cc7a92e3 100644
--- a/main/aspell/APKBUILD
+++ b/main/aspell/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
pkgname=aspell
pkgver=0.60.8
-pkgrel=0
+pkgrel=1
pkgdesc="A spell checker designed to eventually replace Ispell"
url="http://aspell.net/"
arch="all"
@@ -11,11 +11,15 @@ subpackages="$pkgname-compat::noarch $pkgname-utils $pkgname-dev $pkgname-doc
$pkgname-lang $pkgname-libs"
depends_dev="$pkgname-utils"
makedepends="ncurses-dev perl gettext-dev"
-source="https://ftp.gnu.org/gnu/aspell/aspell-$pkgver.tar.gz"
+source="https://ftp.gnu.org/gnu/aspell/aspell-$pkgver.tar.gz
+ CVE-2019-25051.patch"
# secfixes:
+# 0.60.8-r1:
+# - CVE-2019-25051
# 0.60.8-r0:
# - CVE-2019-17544
+
prepare() {
default_prepare
update_config_sub
@@ -67,4 +71,7 @@ libs() {
rm -fr "$pkgdir"/usr/lib
}
-sha512sums="8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29 aspell-0.60.8.tar.gz"
+sha512sums="
+8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29 aspell-0.60.8.tar.gz
+529f3f4737d2e19f7571f4c8666b1cd089cc4e9dfdaa52dc468919f01ce9f8f8112d8fe8afda295b3dfb92f5e0c2bbd79bf1ec69f06c163c32eb28f0168ab263 CVE-2019-25051.patch
+"
diff --git a/main/aspell/CVE-2019-25051.patch b/main/aspell/CVE-2019-25051.patch
new file mode 100644
index 0000000000..2f15d380ec
--- /dev/null
+++ b/main/aspell/CVE-2019-25051.patch
@@ -0,0 +1,96 @@
+From 0718b375425aad8e54e1150313b862e4c6fd324a Mon Sep 17 00:00:00 2001
+From: Kevin Atkinson <kevina@gnu.org>
+Date: Sat, 21 Dec 2019 20:32:47 +0000
+Subject: [PATCH] objstack: assert that the alloc size will fit within a chunk
+ to prevent a buffer overflow
+
+Bug found using OSS-Fuze.
+---
+ common/objstack.hpp | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/common/objstack.hpp b/common/objstack.hpp
+index 3997bf7..bd97ccd 100644
+--- a/common/objstack.hpp
++++ b/common/objstack.hpp
+@@ -5,6 +5,7 @@
+ #include "parm_string.hpp"
+ #include <stdlib.h>
+ #include <assert.h>
++#include <stddef.h>
+
+ namespace acommon {
+
+@@ -26,6 +27,12 @@ class ObjStack
+ byte * temp_end;
+ void setup_chunk();
+ void new_chunk();
++ bool will_overflow(size_t sz) const {
++ return offsetof(Node,data) + sz > chunk_size;
++ }
++ void check_size(size_t sz) {
++ assert(!will_overflow(sz));
++ }
+
+ ObjStack(const ObjStack &);
+ void operator=(const ObjStack &);
+@@ -56,7 +63,7 @@ class ObjStack
+ void * alloc_bottom(size_t size) {
+ byte * tmp = bottom;
+ bottom += size;
+- if (bottom > top) {new_chunk(); tmp = bottom; bottom += size;}
++ if (bottom > top) {check_size(size); new_chunk(); tmp = bottom; bottom += size;}
+ return tmp;
+ }
+ // This alloc_bottom will insure that the object is aligned based on the
+@@ -66,7 +73,7 @@ class ObjStack
+ align_bottom(align);
+ byte * tmp = bottom;
+ bottom += size;
+- if (bottom > top) {new_chunk(); goto loop;}
++ if (bottom > top) {check_size(size); new_chunk(); goto loop;}
+ return tmp;
+ }
+ char * dup_bottom(ParmString str) {
+@@ -79,7 +86,7 @@ class ObjStack
+ // always be aligned as such.
+ void * alloc_top(size_t size) {
+ top -= size;
+- if (top < bottom) {new_chunk(); top -= size;}
++ if (top < bottom) {check_size(size); new_chunk(); top -= size;}
+ return top;
+ }
+ // This alloc_top will insure that the object is aligned based on
+@@ -88,7 +95,7 @@ class ObjStack
+ {loop:
+ top -= size;
+ align_top(align);
+- if (top < bottom) {new_chunk(); goto loop;}
++ if (top < bottom) {check_size(size); new_chunk(); goto loop;}
+ return top;
+ }
+ char * dup_top(ParmString str) {
+@@ -117,6 +124,7 @@ class ObjStack
+ void * alloc_temp(size_t size) {
+ temp_end = bottom + size;
+ if (temp_end > top) {
++ check_size(size);
+ new_chunk();
+ temp_end = bottom + size;
+ }
+@@ -131,6 +139,7 @@ class ObjStack
+ } else {
+ size_t s = temp_end - bottom;
+ byte * p = bottom;
++ check_size(size);
+ new_chunk();
+ memcpy(bottom, p, s);
+ temp_end = bottom + size;
+@@ -150,6 +159,7 @@ class ObjStack
+ } else {
+ size_t s = temp_end - bottom;
+ byte * p = bottom;
++ check_size(size);
+ new_chunk();
+ memcpy(bottom, p, s);
+ temp_end = bottom + size;
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index aef31b4e8e..e05f4d5e2e 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=asterisk
pkgver=18.2.2
-pkgrel=1
+pkgrel=5
pkgdesc="Modular Open Source PBX System"
pkgusers="asterisk"
pkggroups="asterisk"
@@ -12,32 +12,72 @@ url="https://www.asterisk.org/"
arch="all"
license="GPL-2.0-only WITH OpenSSL-Exception"
options="!check" # Test suite is separate, and require separate build
-makedepends="findutils tar bsd-compat-headers libtool
- ncurses-dev popt-dev newt-dev zlib-dev libedit-dev tiff-dev curl-dev
- openssl-dev lua-dev libcap-dev jansson-dev util-linux-dev
- sqlite-dev postgresql-dev unixodbc-dev freetds-dev mariadb-connector-c-dev
- alsa-lib-dev pjproject-dev dahdi-tools-dev libpri-dev libsrtp-dev
- spandsp-dev libresample speex-dev speexdsp-dev libogg-dev
- bluez-dev libxml2-dev imap-dev unbound-dev"
+makedepends="
+ alsa-lib-dev
+ bluez-dev
+ bsd-compat-headers
+ curl-dev
+ dahdi-tools-dev
+ findutils
+ freetds-dev
+ imap-dev
+ jansson-dev
+ libcap-dev
+ libedit-dev
+ libogg-dev
+ libpri-dev
+ libresample
+ libsrtp-dev
+ libtool
+ libxml2-dev
+ lua-dev
+ mariadb-connector-c-dev
+ ncurses-dev
+ newt-dev
+ openssl1.1-compat-dev
+ opus-dev
+ opusfile-dev
+ pjproject-dev
+ popt-dev
+ postgresql-dev
+ spandsp-dev
+ speexdsp-dev
+ speex-dev
+ sqlite-dev
+ tar
+ tiff-dev
+ unbound-dev
+ unixodbc-dev
+ util-linux-dev
+ zlib-dev
+ "
install="$pkgname.pre-install $pkgname.pre-upgrade"
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc
$pkgname-tds $pkgname-fax $pkgname-sample-config:config:noarch
$pkgname-sounds-moh:sound_moh:noarch $pkgname-sounds-en:sound_en:noarch
$pkgname-mobile $pkgname-curl:_curl $pkgname-srtp $pkgname-dahdi
- $pkgname-speex $pkgname-alsa $pkgname-cdr-mysql:cdr_mysql $pkgname-openrc"
+ $pkgname-speex $pkgname-opus $pkgname-alsa $pkgname-cdr-mysql:cdr_mysql
+ $pkgname-openrc"
+# Using commit from https://github.com/traud/asterisk-opus/commits/asterisk-13.7
+_opus_commit=90e8780faccc79e68c07775c6ab2fe1ffaccfa08
_download="https://downloads.asterisk.org/pub/telephony/asterisk/releases"
source="$_download/asterisk-$pkgver.tar.gz
https://dev.alpinelinux.org/~tteras/asterisk-addon-mp3-r201.patch.gz
+ asterisk-13.7-$_opus_commit.tar.gz::https://github.com/traud/asterisk-opus/archive/$_opus_commit.tar.gz
10-musl-mutex-init.patch
20-musl-astmm-fix.patch
30-asterisk-mariadb.patch
40-asterisk-cdefs.patch
+ CVE-2021-32558.patch
asterisk.initd
asterisk.confd
- asterisk.logrotate"
+ asterisk.logrotate
+ "
# secfixes:
+# 18.2.2-r2:
+# - CVE-2021-32558
# 18.2.1-r0:
# - CVE-2021-26712
# - CVE-2021-26713
@@ -68,6 +108,10 @@ prepare() {
# asteriskssl does not have direct references to libssl, but looks up
# symbols from it using dlsym(RTLD_NEXT), so use --no-as-needed for it.
sed -i -e 's/ASTSSL_LIBS:=$(OPENSSL_LIB)/ASTSSL_LIBS:=-Wl,--no-as-needed $(OPENSSL_LIB) -Wl,--as-needed/g' main/Makefile
+
+ # copy codec_opus_open_source files
+ # res/* and include/asterisk/* are not needed as asterisk is new enough
+ cp --verbose ../asterisk-opus*/codecs/* codecs
}
build() {
@@ -104,6 +148,8 @@ build() {
--with-libedit \
--with-srtp \
--with-imap=system \
+ --with-opus \
+ --with-opusfile \
CFLAGS="$CFLAGS -DENABLE_SRTP_AES_256"
# get default modules to build
@@ -117,6 +163,7 @@ build() {
--enable cdr_mysql \
--disable BUILD_NATIVE \
--enable IMAP_STORAGE \
+ --enable codec_opus_open_source \
menuselect.makeopts
# build
@@ -162,6 +209,7 @@ cdr_mysql() { amove usr/lib/asterisk/modules/*cdr_mysql*; }
srtp() { amove usr/lib/asterisk/modules/*_srtp*; }
dahdi() { amove usr/lib/asterisk/modules/*_dahdi*; }
speex() { amove usr/lib/asterisk/modules/*_speex*; }
+opus() { amove usr/lib/asterisk/modules/codec_opus_open_source.so; }
alsa() { amove usr/lib/asterisk/modules/*_alsa*; }
config() {
@@ -192,10 +240,12 @@ sound_en() {
sha512sums="
e15fe3c7f46d49991bcb6f6f565f15e4af0d658b4cd6b091079209dd95a8027858effdc2f2314d72ed46a73cdebc089d3c27d5cf8db50d2d21f3c317a8a4a546 asterisk-18.2.2.tar.gz
aacef3f4796fb1abd33266998b53909cb4b36e7cc5ad2f7bac68bdc43e9a9072d9a4e2e7e681bddfa31f3d04575eb248afe6ea95da780c67e4829c1e22adfe1b asterisk-addon-mp3-r201.patch.gz
+69d82b878728f99b7bf7e862025cbc01aa5b6b9332a5372059ea89a788c66fd351f1103989b3573a7a4ba9ff533f3ee2ff5d88de938440e05d6246e41a882306 asterisk-13.7-90e8780faccc79e68c07775c6ab2fe1ffaccfa08.tar.gz
771237ba6d42ab62d914f2702234b23fd0bc8c22f2aa33b0e745c9170163c8046f6d48ecb299faab3d6fb397f1aa046421083c3cc88510c9779861c522f357dd 10-musl-mutex-init.patch
0fae11b42894ab3d405bc50e9275b9084712b482fbf9b4259ea938667fc5cbe413655f3ff83da0f607151bb2b6e49c2f741b5ada6944dbb478f076ef8d86380a 20-musl-astmm-fix.patch
616de74bdd3c4a6e899128c73e31f5ff219095d2afe321f85a51f518ec2e9dac9b63396eed8e2568c295f1beb90f9a506c72d28211a973b35185bfffd24af37e 30-asterisk-mariadb.patch
ba33f11169284f190b7dabab1da7d2751cb65d7976408db635a892fa17d7552e1660350017e7aada3464ecc7d9d6e99d6ad76d66c0036de062a386cffbc948e6 40-asterisk-cdefs.patch
+87df7c97c0963f41a6d61ed80c7b9996d7f38fa39bbca50c3157f4bb68146e1c977459dfdff734395aca4fd9d801c15d6c996bfabdd81be16b96f3bbe92ff480 CVE-2021-32558.patch
0044c5db468ec8f2385d18d476f89976f6d036448583a4ef8017ce7a6f8f72105337e6b20037ffe47f561d2877fc9c86720aef23ab037df89b36dc140a5924c4 asterisk.initd
ab6b6f08ff43268cbb1abb7ed7d678949991ba495682a644bbaeb017d6adbff0a43297905fd73ae8db1786a28d5b5904f1bc253209a0e388c8a27f26c6ce14ed asterisk.confd
449b5808d90c813c23432274fba47e53227e3a924a55719d2f9e5a90fd2dfb33660a5c85c7e8f11fbb1cd93387e5c68329ed5583f7a64c2451fadad62a9f87dd asterisk.logrotate
diff --git a/main/asterisk/CVE-2021-32558.patch b/main/asterisk/CVE-2021-32558.patch
new file mode 100644
index 0000000000..522d8d6f4f
--- /dev/null
+++ b/main/asterisk/CVE-2021-32558.patch
@@ -0,0 +1,126 @@
+From 852a8780cb45db0dca7c18b364cb0485a1e09840 Mon Sep 17 00:00:00 2001
+From: Kevin Harwell <kharwell@sangoma.com>
+Date: Mon, 10 May 2021 17:59:00 -0500
+Subject: [PATCH] AST-2021-008 - chan_iax2: remote crash on unsupported media format
+
+If chan_iax2 received a packet with an unsupported media format, for
+example vp9, then it would set the frame's format to NULL. This could
+then result in a crash later when an attempt was made to access the
+format.
+
+This patch makes it so chan_iax2 now ignores/drops frames received
+with unsupported media format types.
+
+ASTERISK-29392 #close
+
+Change-Id: Ifa869a90dafe33eed8fd9463574fe6f1c0ad3eb1
+---
+
+diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
+index 4122c04..c57434b 100644
+--- a/channels/chan_iax2.c
++++ b/channels/chan_iax2.c
+@@ -4132,6 +4132,7 @@
+ long ms;
+ long next;
+ struct timeval now = ast_tvnow();
++ struct ast_format *voicefmt;
+
+ /* Make sure we have a valid private structure before going on */
+ ast_mutex_lock(&iaxsl[callno]);
+@@ -4151,10 +4152,9 @@
+
+ ms = ast_tvdiff_ms(now, pvt->rxcore);
+
+- if(ms >= (next = jb_next(pvt->jb))) {
+- struct ast_format *voicefmt;
+- voicefmt = ast_format_compatibility_bitfield2format(pvt->voiceformat);
+- ret = jb_get(pvt->jb, &frame, ms, voicefmt ? ast_format_get_default_ms(voicefmt) : 20);
++ voicefmt = ast_format_compatibility_bitfield2format(pvt->voiceformat);
++ if (voicefmt && ms >= (next = jb_next(pvt->jb))) {
++ ret = jb_get(pvt->jb, &frame, ms, ast_format_get_default_ms(voicefmt));
+ switch(ret) {
+ case JB_OK:
+ fr = frame.data;
+@@ -4182,7 +4182,7 @@
+ pvt = iaxs[callno];
+ }
+ }
+- break;
++ break;
+ case JB_DROP:
+ iax2_frame_free(frame.data);
+ break;
+@@ -6451,8 +6451,14 @@
+ f->frametype = fh->type;
+ if (f->frametype == AST_FRAME_VIDEO) {
+ f->subclass.format = ast_format_compatibility_bitfield2format(uncompress_subclass(fh->csub & ~0x40) | ((fh->csub >> 6) & 0x1));
++ if (!f->subclass.format) {
++ f->subclass.format = ast_format_none;
++ }
+ } else if (f->frametype == AST_FRAME_VOICE) {
+ f->subclass.format = ast_format_compatibility_bitfield2format(uncompress_subclass(fh->csub));
++ if (!f->subclass.format) {
++ f->subclass.format = ast_format_none;
++ }
+ } else {
+ f->subclass.integer = uncompress_subclass(fh->csub);
+ }
+@@ -9929,8 +9935,8 @@
+ } else if (iaxs[fr->callno]->voiceformat == 0) {
+ ast_log(LOG_WARNING, "Received trunked frame before first full voice frame\n");
+ iax2_vnak(fr->callno);
+- } else {
+- f.subclass.format = ast_format_compatibility_bitfield2format(iaxs[fr->callno]->voiceformat);
++ } else if ((f.subclass.format = ast_format_compatibility_bitfield2format(
++ iaxs[fr->callno]->voiceformat))) {
+ f.datalen = len;
+ if (f.datalen >= 0) {
+ if (f.datalen)
+@@ -10173,11 +10179,17 @@
+ f.frametype = fh->type;
+ if (f.frametype == AST_FRAME_VIDEO) {
+ f.subclass.format = ast_format_compatibility_bitfield2format(uncompress_subclass(fh->csub & ~0x40));
++ if (!f.subclass.format) {
++ return 1;
++ }
+ if ((fh->csub >> 6) & 0x1) {
+ f.subclass.frame_ending = 1;
+ }
+ } else if (f.frametype == AST_FRAME_VOICE) {
+ f.subclass.format = ast_format_compatibility_bitfield2format(uncompress_subclass(fh->csub));
++ if (!f.subclass.format) {
++ return 1;
++ }
+ } else {
+ f.subclass.integer = uncompress_subclass(fh->csub);
+ }
+@@ -11795,6 +11807,11 @@
+ f.subclass.frame_ending = 1;
+ }
+ f.subclass.format = ast_format_compatibility_bitfield2format(iaxs[fr->callno]->videoformat);
++ if (!f.subclass.format) {
++ ast_variables_destroy(ies.vars);
++ ast_mutex_unlock(&iaxsl[fr->callno]);
++ return 1;
++ }
+ } else {
+ ast_log(LOG_WARNING, "Received mini frame before first full video frame\n");
+ iax2_vnak(fr->callno);
+@@ -11816,9 +11833,14 @@
+ } else {
+ /* A mini frame */
+ f.frametype = AST_FRAME_VOICE;
+- if (iaxs[fr->callno]->voiceformat > 0)
++ if (iaxs[fr->callno]->voiceformat > 0) {
+ f.subclass.format = ast_format_compatibility_bitfield2format(iaxs[fr->callno]->voiceformat);
+- else {
++ if (!f.subclass.format) {
++ ast_variables_destroy(ies.vars);
++ ast_mutex_unlock(&iaxsl[fr->callno]);
++ return 1;
++ }
++ } else {
+ ast_debug(1, "Received mini frame before first full voice frame\n");
+ iax2_vnak(fr->callno);
+ ast_variables_destroy(ies.vars);
diff --git a/main/at-spi2-core/APKBUILD b/main/at-spi2-core/APKBUILD
index b48ee4deaf..3a811bfadd 100644
--- a/main/at-spi2-core/APKBUILD
+++ b/main/at-spi2-core/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=at-spi2-core
-pkgver=2.40.3
+pkgver=2.42.0
pkgrel=0
pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
url="https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/"
@@ -28,5 +28,5 @@ package() {
}
sha512sums="
-85adf3da0a369d7f3481646a495a9c4c3337da3ae6a20ce8c924f8621d3d6ed1d9461bfac0e821dfe86e4ad6b930e4fd65d24c26401cbea644ef4951e5dda5ce at-spi2-core-2.40.3.tar.xz
+befcab94b3aa99471723238d9666fc6667041b058a2bac3b012cfa15a91950996431296f33c921764e0ec4ffd0cc41ebe00be461a8460d6f4d2bafff19a38e10 at-spi2-core-2.42.0.tar.xz
"
diff --git a/main/attr/APKBUILD b/main/attr/APKBUILD
index c56e5ecb9d..60ce2f2c18 100644
--- a/main/attr/APKBUILD
+++ b/main/attr/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=attr
pkgver=2.5.1
-pkgrel=0
+pkgrel=1
pkgdesc="utilities for managing filesystem extended attributes"
options="checkroot !check" # attr.test fails with no error message
url="https://savannah.nongnu.org/projects/attr"
@@ -28,7 +28,7 @@ build() {
--libexecdir=/usr/lib \
--includedir=/usr/include \
--mandir=/usr/share/man \
- --docdir=/usr/share/doc \
+ --docdir=/usr/share/doc/attr \
--datadir=/usr/share \
--disable-nls \
--disable-static
diff --git a/main/audit/APKBUILD b/main/audit/APKBUILD
index bd9c723667..56c58146b3 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=3.0.1
-pkgrel=1
+pkgver=3.0.5
+pkgrel=0
pkgdesc="User space tools for 2.6 kernel auditing"
url="https://people.redhat.com/sgrubb/audit/"
arch="all"
@@ -62,8 +62,10 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
}
-sha512sums="ad2897c9f539681f0f65b08cd0e650c528957fd4799755c2bcc47f869e04272aad31684c46847124d7b42dde243a16ba2754936890189610814c7007c0381d8c audit-3.0.1.tar.gz
+sha512sums="
+147b8aab7801ac286d8d634736b90b94cf497c5d3a6142f521e527dec9b989ed884caf0ac08aa533635276da46e78a65b14ebf165cd847a8500e29a2829a890d audit-3.0.5.tar.gz
f3f2c4ee745e99877c981d889c5cbb0379d073a9b7634c1480ae603a21a13045f9978b51f8cb53c8d0ba414d249bb859af7bca7e302c464b3fc3c6463ecca762 0003-all-get-rid-of-strndupa.patch
6a0e1fb81d7defe6ad84da447a55e1e0b90299fcbd1ca679934a1dfa1a211986ea4642a1c69abe0619120b64b16546a41fa028f55f27c79819d896178aac6df7 0004-fix-path-in-au-remote-conf.patch
b3d7ceba02b6b4406222c3b142fcfdf2b612dc52eebc490cfd121d696e4ef7c6cc5e27813d67937c464ed4c3cd283de9ccfcb75e63405a447523fa4641e79da3 auditd.initd
-69d8777772ded7a8c0db2bcf84961b121bb355fa0d4ba0e14e311f8a8bfe665cbd2b7ac632d73477f9dfa9a6eec357a7ed458fe9b3e7b5ede75b166f3f092ab7 auditd.confd"
+69d8777772ded7a8c0db2bcf84961b121bb355fa0d4ba0e14e311f8a8bfe665cbd2b7ac632d73477f9dfa9a6eec357a7ed458fe9b3e7b5ede75b166f3f092ab7 auditd.confd
+"
diff --git a/main/automake/0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch b/main/automake/0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch
new file mode 100644
index 0000000000..9923474f4c
--- /dev/null
+++ b/main/automake/0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch
@@ -0,0 +1,70 @@
+From 3009ad094f5807c512e79224a8acee5a81a736b0 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Sun, 29 Aug 2021 13:02:33 +0200
+Subject: [PATCH] automake: add install dep on install-libLTLIBRARIES to all
+ targets
+
+A Makefile.am like
+
+ bin_PROGRAMS =
+ lib_LTLIBRARIES = library1.la
+ pkglib_LTLIBRARIES = library2.la
+ library2_LIBADD = library1.la
+
+produces, in Makefile.in,
+
+ install-binPROGRAMS: install-libLTLIBRARIES
+
+but no
+
+ install-pkglibLTLIBRARIES: install-libLTLIBRARIES
+
+therefore potentially breaking `make install -j`. Rectify this by
+depending on install-libLTLIBRARIES not just for bin_PROGRAMS, but
+all PROGRAMS and LTLIBRARIES.
+
+Signed-off-by: Jan Engelhardt <jengelh@inai.de>
+---
+ bin/automake.in | 25 +++++++++++++++++++------
+ 1 file changed, 19 insertions(+), 6 deletions(-)
+
+diff --git a/bin/automake.in b/bin/automake.in
+index f04f5d5f5..30babd607 100644
+--- a/bin/automake.in
++++ b/bin/automake.in
+@@ -8042,13 +8042,26 @@ sub generate_makefile
+ handle_all ($makefile);
+
+ # FIXME: Gross!
+- if (var ('lib_LTLIBRARIES') && var ('bin_PROGRAMS'))
++ my $have_lt1 = !!var("lib_LTLIBRARIES");
++ my $have_lt2 = !!var("nobase_lib_LTLIBRARIES");
++ for my $var (variables("PROGRAMS"), variables("LTLIBRARIES"))
+ {
+- $output_rules .= "install-binPROGRAMS: install-libLTLIBRARIES\n\n";
+- }
+- if (var ('nobase_lib_LTLIBRARIES') && var ('bin_PROGRAMS'))
+- {
+- $output_rules .= "install-binPROGRAMS: install-nobase_libLTLIBRARIES\n\n";
++ if ($var->name eq "lib_LTLIBRARIES"
++ || $var->name eq "nobase_lib_LTLIBRARIES"
++ || substr($var->name, 0, 7) eq "noinst_")
++ {
++ next;
++ }
++ my $shortname = $var->name;
++ $shortname =~ tr{_}{}d;
++ if ($have_lt1)
++ {
++ $output_rules .= "install-$shortname: install-libLTLIBRARIES\n\n";
++ }
++ if ($have_lt2)
++ {
++ $output_rules .= "install-$shortname: install-nobase_libLTLIBRARIES\n\n";
++ }
+ }
+
+ handle_install;
+--
+2.33.0
+
diff --git a/main/automake/APKBUILD b/main/automake/APKBUILD
index 89219c7ae6..b046b621f7 100644
--- a/main/automake/APKBUILD
+++ b/main/automake/APKBUILD
@@ -1,15 +1,17 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=automake
-pkgver=1.16.3
-pkgrel=0
-pkgdesc="A GNU tool for automatically creating Makefiles"
+pkgver=1.16.4
+pkgrel=1
+pkgdesc="GNU tool for automatically creating Makefiles"
url="https://www.gnu.org/software/automake"
arch="noarch"
license="GPL-2.0-or-later MIT Public-Domain"
depends="perl"
makedepends="autoconf"
subpackages="$pkgname-doc"
-source="https://ftp.gnu.org/gnu/automake/automake-$pkgver.tar.xz"
+source="https://ftp.gnu.org/gnu/automake/automake-$pkgver.tar.xz
+ 0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch
+ "
# many tests have bashisms
options="!check"
@@ -30,4 +32,7 @@ package() {
make DESTDIR=$pkgdir install
}
-sha512sums="7265aeb7f82a8a205761d76e6ade7b7e97831c283349fd80f86e511f4b0b3e17f429d1506fca84c76079f63781e5dbf5ca81455d6bf6cda27d2e5c3d23b0d1aa automake-1.16.3.tar.xz"
+sha512sums="
+5a8883657e73b75bfa1ee59ab04af6bf4d43f390ab62fb7a9e8e2ac66159dfe4947b2ac7bc1028afffe6a09d88f388339500e03f6cdfa1226985be45ec033246 automake-1.16.4.tar.xz
+ff5fc38987afd00076f32f42bb58f5cffca8de246f8354321f2c8564e1465b9f5d373b4fe6a54f18962c8850717a2d955bdab50ea59068f1ab285da18035b7fd 0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch
+"
diff --git a/main/awall/APKBUILD b/main/awall/APKBUILD
index 013c1709b3..4358af12d0 100644
--- a/main/awall/APKBUILD
+++ b/main/awall/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
pkgname=awall
-pkgver=1.10.0
+pkgver=1.10.1
pkgrel=0
pkgdesc="Alpine Wall"
url="https://gitlab.alpinelinux.org/alpine/awall"
@@ -51,7 +51,7 @@ policies() {
}
sha512sums="
-ef846cf04221d0c6474992d1a31465693988afbdd18d02652566abe704b282674044b6c818d9c35fdc6aa456a5e04fdba00154969a716e20e935b9cd5027ec52 awall-v1.10.0.tar.bz2
+0105eda3429526e4c5af84617ecccdecb5044024b830adb005746981ca7924deacc13e211751fa8d57ac1eb6fd6aca2270348c8ee1806ceb459ef9a7acf2697e awall-v1.10.1.tar.bz2
e83ea3281c298092530e45fa5b62f6f85b9e5109b11e109799465ea832608294c7d9c4c3f5b0f321dfc0e82040daf3a17d066e9dea65cb0dbae2c453ea9e62cd awall-init
1cd4b7fa5fc6c9ac6667dff5cc00d96a3cc42aaccafe3c5562d3dcfd9f22ddec9cfe5a9339fee8001b67ccb8e8b81c9417f39a461e5052af9bf74a2753559bf7 setup-firewall
"
diff --git a/main/axel/APKBUILD b/main/axel/APKBUILD
index 811ffd998e..3f2ee25250 100644
--- a/main/axel/APKBUILD
+++ b/main/axel/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=axel
pkgver=2.17.10
-pkgrel=0
+pkgrel=2
pkgdesc="A multiple-connection concurrent downloader"
url="https://github.com/axel-download-accelerator/axel"
arch="all"
options="!check" # has no checks
license="GPL-2.0-or-later WITH OpenSSL-Exception"
-makedepends="openssl-dev"
+makedepends="openssl1.1-compat-dev"
subpackages="$pkgname-doc"
source="$url/releases/download/v$pkgver/axel-$pkgver.tar.xz"
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index 72d2d3232f..578120e2b6 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=bacula
pkgver=9.6.7
-pkgrel=1
+pkgrel=2
pkgdesc="Enterprise ready, network based backup program"
url="https://www.bacula.org"
#arch="all"
license="AGPL-3.0-or-later WITH OpenSSL-Exception"
-makedepends="autoconf automake libtool mariadb-connector-c-dev ncurses-dev openssl-dev postgresql-dev
+makedepends="autoconf automake libtool mariadb-connector-c-dev ncurses-dev openssl1.1-compat-dev postgresql-dev
sqlite-dev zlib-dev lzo-dev acl-dev postgresql"
install="$pkgname.pre-install $pkgname.post-upgrade"
subpackages="$pkgname-doc $pkgname-mysql $pkgname-pgsql $pkgname-sqlite
diff --git a/main/bats/APKBUILD b/main/bats/APKBUILD
index 689c6a6c23..39d28860cd 100644
--- a/main/bats/APKBUILD
+++ b/main/bats/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Jose-Luis Rivas <ghostbar@riseup.net>
pkgname=bats
-pkgver=1.3.0
+pkgver=1.5.0
pkgrel=0
pkgdesc="Bash Automated Testing System"
options="!check" # Test passes CI/locally, fails on builders
@@ -19,4 +19,6 @@ check() {
package() {
./install.sh "$pkgdir"/usr
}
-sha512sums="5d5bf4d4eee0bed5bcb2a8d7ddacdd12e221c04723a9bcc2be8e5679f5a9384b00439ed5da316386f3efdd7643bd06f1e56ba9f938dce1e69a81330939980451 bats-1.3.0.zip"
+sha512sums="
+4e0b4adbc6ae7d40cbeb353d856dd919485838f9ee1eca5fb6747bcdd7b88f4eda673005ab735e104c9e8c5740cd2357b955e31b3769cb1c2561564e7369179d bats-1.5.0.zip
+"
diff --git a/main/bctoolbox/APKBUILD b/main/bctoolbox/APKBUILD
index 3c1db7b577..7e64e51228 100644
--- a/main/bctoolbox/APKBUILD
+++ b/main/bctoolbox/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=bctoolbox
-pkgver=5.0.0
+pkgver=5.0.23
pkgrel=0
pkgdesc="Utilities library used by Belledonne Communications softwares like belle-sip, mediastreamer2 and linphone"
url="https://github.com/BelledonneCommunications/bctoolbox"
@@ -47,6 +47,6 @@ dev() {
}
sha512sums="
-347230e992cd543c01fa75e99ea45faef30edac51ec6f006ce5c6c795d322be0f4241afe88797407a7a9a10c0c0c2d343019eb8376327e84c3856840124452d1 bctoolbox-5.0.0.tar.gz
+efb5c4390e3ad0a602be8b2f2c53f3d4541075c09d6b5c4d812c22be7e4416c02229135b54ffb6411e931a379fb14ae7e91e50a70b75032e246e8e4457d62870 bctoolbox-5.0.23.tar.gz
466d2a7aa33952c8086c698030af0addc79373aa31104cbe6133d352682439ae5c30055ea4f162cc9b6b9fc54bf3dea0ddcff78e0042e7ce43833d82b9487116 cmake-bcunit-fix.patch
"
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index 27fc160c15..cb9b574c71 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -5,7 +5,7 @@
# Contributor: ungleich <alpinelinux@ungleich.ch>
# Maintainer:
pkgname=bind
-pkgver=9.16.18
+pkgver=9.16.20
_ver=${pkgver%_p*}
_p=${pkgver#*_p}
_major=${pkgver%%.*}
@@ -34,7 +34,7 @@ makedepends="
libxml2-dev
linux-headers
openldap-dev
- openssl-dev
+ openssl1.1-compat-dev
perl
protobuf-c-dev
$_py3deps
@@ -64,9 +64,12 @@ source="
named.conf.recursive
127.zone
localhost.zone
+ bind-9.16.20-map-format-fix.patch
"
# secfixes:
+# 9.16.20-r0:
+# - CVE-2021-25218
# 9.16.15-r0:
# - CVE-2021-25214
# - CVE-2021-25215
@@ -278,7 +281,7 @@ _gpgfingerprints="
"
sha512sums="
-6ba2f14324ebdc66d2a6d60e929fb47e170dd7662cf4b18ef3ad9da30a61b43c7d5539e931c483ab36e63ae0398aeed255fd672489fb332dccf182df9aa102f9 bind-9.16.18.tar.xz
+bd4ffcc2589ca8f1ac228576ec11e86f317d5a78d7964a0a7ae70b2fa38831d5bd65c2e8c35d8190502de7139f85d8b080b3b8ee968811a8df78e5761781525d bind-9.16.20.tar.xz
2b32d1e7f62cd1e01bb4fdd92d15460bc14761b933d5acc463a91f5ecd4773d7477c757c5dd2738e8e433693592cf3f623ffc142241861c91848f01aa84640d6 bind.plugindir.patch
7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch
53db80f7ee4902f42fb1d0bc959242bcb6f20d95256bda99ce2c206af8b4703c7f72bb26d026c633f70451b84a37c3946b210951e34dd5d6620b181cd0183de4 named.initd
@@ -287,4 +290,5 @@ d2f61d02d7829af51faf14fbe2bafe8bc90087e6b6697c6275a269ebbddcaa14a234fff5c41da793
3aba9763cfaf0880a89fd01202f41406b465547296ce91373eb999ea7719040bc1ac4e47b0de025a8060f693d3d88774a20d09a43fa7ac6aa43989b58b5ee8fe named.conf.recursive
eed9886717539399518e011ae5eae6335aed4fae019e1def088c5be26bdc896c99c07adf84ee61babafa31d31ff3b028263d1c88d2eee17ecf4c95a9d77d524c 127.zone
340e86472a2c2746fe585c0aa5f079d3a9b46e828c1f53d48026533a169b7f77ded7d0a13d291d6962607bb9481456e6fa69df1834603e7555332615fb998f0b localhost.zone
+d9224712ee2c6f6d0ff483ed253497548935fe35f45e5bdf26c9bd25c6234adde00727df7eb49fbfbfb34aad9d9fa0f112e900804794ad90a5cd8a64e9db61c6 bind-9.16.20-map-format-fix.patch
"
diff --git a/main/bind/bind-9.16.20-map-format-fix.patch b/main/bind/bind-9.16.20-map-format-fix.patch
new file mode 100644
index 0000000000..f6e3c9b378
--- /dev/null
+++ b/main/bind/bind-9.16.20-map-format-fix.patch
@@ -0,0 +1,8 @@
+--- a/lib/dns/mapapi
++++ b/lib/dns/mapapi
+@@ -13,4 +13,4 @@
+ # Whenever releasing a new major release of BIND9, set this value
+ # back to 1.0 when releasing the first alpha. Map files are *never*
+ # compatible across major releases.
+-MAPAPI=2.0
++MAPAPI=3.0
diff --git a/main/binutils/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch b/main/binutils/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
index 5de937f4fc..6e1fa7731c 100644
--- a/main/binutils/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+++ b/main/binutils/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
@@ -1,39 +1,24 @@
-From b1faf99f3e546df2cd302bb1ad36a2078224fe8b Mon Sep 17 00:00:00 2001
+From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 30 Oct 2020 16:59:48 -0600
+Date: Tue, 21 Sep 2021 14:53:13 +0000
Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
libraries"
+This revert is needed to avoid wrongly tagging objects with the incompatible
+IBM long double ABI, which is not supported by musl and will result in
+linking errors if used.
+
This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
---
- bfd/ChangeLog | 6 ------
- bfd/elf32-tic6x.c | 3 ---
- ld/ChangeLog | 6 ------
- ld/ldlang.c | 9 ++++-----
- 4 files changed, 4 insertions(+), 20 deletions(-)
+ bfd/elf32-tic6x.c | 3 ---
+ ld/ldlang.c | 10 ++++------
+ 2 files changed, 4 insertions(+), 9 deletions(-)
-diff --git a/bfd/ChangeLog b/bfd/ChangeLog
-index 9fac12538a..b5461494e8 100644
---- a/bfd/ChangeLog
-+++ b/bfd/ChangeLog
-@@ -1422,12 +1422,6 @@
- accessing root.u.def of symbols. Also check root.u.def.section
- is non-NULL. Reverse tests so as to make the logic positive.
-
--2020-05-01 Alan Modra <amodra@gmail.com>
--
-- PR 25882
-- * elf32-tic6x.c (elf32_tic6x_merge_attributes): Don't transfer
-- Tag_ABI_PIC or Tag_ABI_PID from dynamic objects to the output.
--
- 2020-05-01 Alan Modra <amodra@gmail.com>
-
- PR 25882
diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
-index b8b916bfd3..91bb6a10b1 100644
+index 5754f3cb860..3ad1d612749 100644
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
-@@ -3748,9 +3748,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
+@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
case Tag_ABI_PIC:
case Tag_ABI_PID:
@@ -43,36 +28,20 @@ index b8b916bfd3..91bb6a10b1 100644
if (out_attr[i].i > in_attr[i].i)
out_attr[i].i = in_attr[i].i;
break;
-diff --git a/ld/ChangeLog b/ld/ChangeLog
-index 4eec7d2977..b93452f70c 100644
---- a/ld/ChangeLog
-+++ b/ld/ChangeLog
-@@ -1319,12 +1319,6 @@
- * testsuite/ld-aarch64/farcall-group.d: New test driver.
- * testsuite/ld-aarch64/aarch64-elf.exp: Run the new test.
-
--2020-05-01 Alan Modra <amodra@gmail.com>
--
-- PR 25882
-- * ldlang.c (lang_check): Call bfd_merge_private_bfd_data for
-- shared libraries.
--
- 2020-05-01 Alan Modra <amodra@gmail.com>
-
- * po/BLD-POTFILES.in: Regenerate.
diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 9977195074..173d8ec349 100644
+index 37b64c89ee1..f13beaef9d9 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
-@@ -6972,12 +6972,11 @@ lang_check (void)
+@@ -7071,13 +7071,11 @@ lang_check (void)
bfd_printable_name (input_bfd), input_bfd,
bfd_printable_name (link_info.output_bfd));
}
-
- /* If the input bfd has no contents, it shouldn't set the
- private data of the output bfd. */
-- else if ((input_bfd->flags & DYNAMIC) != 0
-- || bfd_count_sections (input_bfd) != 0)
+- else if (!file->flags.just_syms
+- && ((input_bfd->flags & DYNAMIC) != 0
+- || bfd_count_sections (input_bfd) != 0))
+ else if (bfd_count_sections (input_bfd))
{
+ /* If the input bfd has no contents, it shouldn't set the
@@ -82,5 +51,5 @@ index 9977195074..173d8ec349 100644
/* If we aren't supposed to warn about mismatched input
--
-2.29.2
+2.33.0
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index 79c74bfe8b..fa65f83000 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -1,7 +1,8 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=binutils
-pkgver=2.35.2
-pkgrel=2
+pkgver=2.37
+pkgrel=3
pkgdesc="Tools necessary to build programs"
url="https://www.gnu.org/software/binutils/"
makedepends_build="bison flex texinfo"
@@ -15,8 +16,9 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
gold-mips.patch
ld-bfd-mips.patch
0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
- CVE-2021-3487.patch
binutils-mips-disable-assert.patch
+ bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
+ defang-no-split.patch
"
builddir="$srcdir/$pkgname-$pkgver"
@@ -46,10 +48,12 @@ build() {
local _cross_configure="--enable-install-libiberty --enable-shared"
local _arch_configure=""
local _gold_configure="--disable-gold"
+ local _plugin_configure="--enable-plugins"
if [ "$CHOST" != "$CTARGET" ]; then
_sysroot="$CBUILDROOT"
_cross_configure="--disable-install-libiberty"
+ _plugin_configure="--disable-plugins"
fi
if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
@@ -82,7 +86,7 @@ build() {
--enable-ld=default \
$_gold_configure \
--enable-64-bit-bfd \
- --enable-plugins \
+ $_plugin_configure \
--enable-relro \
--enable-deterministic-archives \
$_cross_configure \
@@ -107,6 +111,7 @@ package() {
# with the native tools, or other cross tools
rm -r "${pkgdir:?}"/usr/share
rm -f "$pkgdir"/usr/lib/libiberty.a
+ rm -r "${pkgdir:?}"/usr/lib/bfd-plugins
fi
}
@@ -129,11 +134,12 @@ gold() {
}
sha512sums="
-9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz
+5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz
ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49 binutils-ld-fix-static-linking.patch
f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f gold-mips.patch
314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d ld-bfd-mips.patch
-642c617db6c6e491f78f053d60f3aa369bad7bf8c1bc7ce267de6cf8fddf6c0d4cf63ce8c8f6e2f225dedbce7cb930d8e87e168fd8f72ca0837c77266ee2b5f8 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-b08384ed124a74ad3a424db370c107230f09a54378502ca4385deb738f7cf799857f2af0db52709c7eeab8fa6c0a3d972f891396cce1e2834a21f67682fc4355 CVE-2021-3487.patch
+70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f binutils-mips-disable-assert.patch
+10a0074583d2cc4598710c7e434ba7088da074b105f4f5e951fc61af7150ad62adf60a7c98f6fd13b1771f169e45a5a1ef618240c6893d3f0f3d93fd768a03c6 bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
+4652f092c9376f0cb7fd6c72cb37ff7c15c1c6e3408fac79329b7f41a7925c98eb35989a9a040682130988a36401901d6d95afa44f0ce50caa85ee478db6bf03 defang-no-split.patch
"
diff --git a/main/binutils/CVE-2021-3487.patch b/main/binutils/CVE-2021-3487.patch
deleted file mode 100644
index db99ae73d9..0000000000
--- a/main/binutils/CVE-2021-3487.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 647cebce12a6b0a26960220caff96ff38978cf24 Mon Sep 17 00:00:00 2001
-From: Nick Clifton <nickc@redhat.com>
-Date: Thu, 26 Nov 2020 17:08:33 +0000
-Subject: [PATCH] Prevent a memory allocation failure when parsing corrupt
- DWARF debug sections.
-
- PR 26946
- * dwarf2.c (read_section): Check for debug sections with excessive
- sizes.
-
-diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
-index 977bf43a6a1..8bbfc81d3e7 100644
---- a/bfd/dwarf2.c
-+++ b/bfd/dwarf2.c
-@@ -531,22 +531,24 @@ read_section (bfd * abfd,
- bfd_byte ** section_buffer,
- bfd_size_type * section_size)
- {
-- asection *msec;
- const char *section_name = sec->uncompressed_name;
- bfd_byte *contents = *section_buffer;
-- bfd_size_type amt;
-
- /* The section may have already been read. */
- if (contents == NULL)
- {
-+ bfd_size_type amt;
-+ asection *msec;
-+ ufile_ptr filesize;
-+
- msec = bfd_get_section_by_name (abfd, section_name);
-- if (! msec)
-+ if (msec == NULL)
- {
- section_name = sec->compressed_name;
- if (section_name != NULL)
- msec = bfd_get_section_by_name (abfd, section_name);
- }
-- if (! msec)
-+ if (msec == NULL)
- {
- _bfd_error_handler (_("DWARF error: can't find %s section."),
- sec->uncompressed_name);
-@@ -554,12 +556,23 @@ read_section (bfd * abfd,
- return FALSE;
- }
-
-- *section_size = msec->rawsize ? msec->rawsize : msec->size;
-+ amt = bfd_get_section_limit_octets (abfd, msec);
-+ filesize = bfd_get_file_size (abfd);
-+ if (amt >= filesize)
-+ {
-+ /* PR 26946 */
-+ _bfd_error_handler (_("DWARF error: section %s is larger than its filesize! (0x%lx vs 0x%lx)"),
-+ section_name, (long) amt, (long) filesize);
-+ bfd_set_error (bfd_error_bad_value);
-+ return FALSE;
-+ }
-+ *section_size = amt;
- /* Paranoia - alloc one extra so that we can make sure a string
- section is NUL terminated. */
-- amt = *section_size + 1;
-+ amt += 1;
- if (amt == 0)
- {
-+ /* Paranoia - this should never happen. */
- bfd_set_error (bfd_error_no_memory);
- return FALSE;
- }
---
-2.27.0
-
diff --git a/main/binutils/bfd-close-file-desriptor-if-there-is-no-archive-fd.patch b/main/binutils/bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
new file mode 100644
index 0000000000..357d0f9701
--- /dev/null
+++ b/main/binutils/bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
@@ -0,0 +1,234 @@
+Upstream: yes
+URL: https://sourceware.org/bugzilla/show_bug.cgi?id=28138
+From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Mon, 26 Jul 2021 05:59:55 -0700
+Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd
+
+Close the file descriptor if there is no archive plugin file descriptor
+to avoid running out of file descriptors on thin archives with many
+archive members.
+
+bfd/
+
+ PR ld/28138
+ * plugin.c (bfd_plugin_close_file_descriptor): Close the file
+ descriptor there is no archive plugin file descriptor.
+
+ld/
+
+ PR ld/28138
+ * testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for
+ native build.
+
+ PR ld/28138
+ * testsuite/ld-plugin/lto.exp: Run ld/28138 tests.
+ * testsuite/ld-plugin/pr28138.c: New file.
+ * testsuite/ld-plugin/pr28138-1.c: Likewise.
+ * testsuite/ld-plugin/pr28138-2.c: Likewise.
+ * testsuite/ld-plugin/pr28138-3.c: Likewise.
+ * testsuite/ld-plugin/pr28138-4.c: Likewise.
+ * testsuite/ld-plugin/pr28138-5.c: Likewise.
+ * testsuite/ld-plugin/pr28138-6.c: Likewise.
+ * testsuite/ld-plugin/pr28138-7.c: Likewise.
+
+(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742)
+(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2)
+---
+ bfd/plugin.c | 8 +++++++
+ ld/testsuite/ld-plugin/lto.exp | 34 ++++++++++++++++++++++++++++++
+ ld/testsuite/ld-plugin/pr28138-1.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-2.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-3.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-4.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-5.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-6.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-7.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138.c | 20 ++++++++++++++++++
+ 10 files changed, 104 insertions(+)
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138.c
+
+diff --git a/bfd/plugin.c b/bfd/plugin.c
+index 6cfa2b66470..3bab8febe88 100644
+--- a/bfd/plugin.c
++++ b/bfd/plugin.c
+@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd)
+ && !bfd_is_thin_archive (abfd->my_archive))
+ abfd = abfd->my_archive;
+
++ /* Close the file descriptor if there is no archive plugin file
++ descriptor. */
++ if (abfd->archive_plugin_fd == -1)
++ {
++ close (fd);
++ return;
++ }
++
+ abfd->archive_plugin_fd_open_count--;
+ /* Dup the archive plugin file descriptor for later use, which
+ will be closed by _bfd_archive_close_and_cleanup. */
+diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
+index def69e43ab3..999d911ce6a 100644
+--- a/ld/testsuite/ld-plugin/lto.exp
++++ b/ld/testsuite/ld-plugin/lto.exp
+@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } {
+ }
+ }
+
++run_cc_link_tests [list \
++ [list \
++ "Build pr28138.a" \
++ "-T" "" \
++ {pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \
++ pr28138-6.c pr28138-7.c} {} "pr28138.a" \
++ ] \
++ [list \
++ "Build pr28138.o" \
++ "" "" \
++ {pr28138.c} {} \
++ ] \
++]
++
++set exec_output [run_host_cmd "sh" \
++ "-c \"ulimit -n 20; \
++ $CC -Btmpdir/ld -o tmpdir/pr28138 \
++ tmpdir/pr28138.o tmpdir/pr28138.a\""]
++set exec_output [prune_warnings $exec_output]
++if [string match "" $exec_output] then {
++ if { [isnative] } {
++ set exec_output [run_host_cmd "tmpdir/pr28138" ""]
++ if [string match "PASS" $exec_output] then {
++ pass "PR ld/28138"
++ } else {
++ fail "PR ld/28138"
++ }
++ } else {
++ pass "PR ld/28138"
++ }
++} else {
++ fail "PR ld/28138"
++}
++
+ set testname "Build liblto-11.a"
+ remote_file host delete "tmpdir/liblto-11.a"
+ set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
+diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c
+new file mode 100644
+index 00000000000..51d119e1642
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-1.c
+@@ -0,0 +1,6 @@
++extern int a0(void);
++int
++a1(void)
++{
++ return 1 + a0();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c
+new file mode 100644
+index 00000000000..1120cd797e9
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-2.c
+@@ -0,0 +1,6 @@
++extern int a1(void);
++int
++a2(void)
++{
++ return 1 + a1();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c
+new file mode 100644
+index 00000000000..ec464947ee6
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-3.c
+@@ -0,0 +1,6 @@
++extern int a2(void);
++int
++a3(void)
++{
++ return 1 + a2();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c
+new file mode 100644
+index 00000000000..475701b2c5c
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-4.c
+@@ -0,0 +1,6 @@
++extern int a3(void);
++int
++a4(void)
++{
++ return 1 + a3();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c
+new file mode 100644
+index 00000000000..e24f86c363e
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-5.c
+@@ -0,0 +1,6 @@
++extern int a4(void);
++int
++a5(void)
++{
++ return 1 + a4();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c
+new file mode 100644
+index 00000000000..b5b938bdb21
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-6.c
+@@ -0,0 +1,6 @@
++extern int a5(void);
++int
++a6(void)
++{
++ return 1 + a5();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c
+new file mode 100644
+index 00000000000..4ef75bf0f0c
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-7.c
+@@ -0,0 +1,6 @@
++extern int a6(void);
++int
++a7(void)
++{
++ return 1 + a6();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c
+new file mode 100644
+index 00000000000..68252c9f382
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138.c
+@@ -0,0 +1,20 @@
++#include <stdio.h>
++
++extern int a7(void);
++
++int
++a0(void)
++{
++ return 0;
++}
++
++int
++main()
++{
++ if (a7() == 7)
++ {
++ printf ("PASS\n");
++ return 0;
++ }
++ return 1;
++}
+--
+2.27.0
+
diff --git a/main/binutils/defang-no-split.patch b/main/binutils/defang-no-split.patch
new file mode 100644
index 0000000000..cea68edc5d
--- /dev/null
+++ b/main/binutils/defang-no-split.patch
@@ -0,0 +1,38 @@
+From 2dad02b6d46eef438cbd14d8511487b056628a38 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <siarheit@google.com>
+Date: Mon, 26 Jul 2021 22:51:18 +0100
+Subject: [PATCH 1/1] texi2pod.pl: add no-op --no-split option support
+ [PR28144]
+
+Change 2faf902da ("generate single html manual page by default")
+added use of --no-split option to makeinfo. binutils reuses
+makeinfo options for texi2pod.pl wrapper. Unsupported option
+led to silent manpage truncation.
+
+The change adds no-op option support.
+
+etc/
+ PR 28144
+ * texi2pod.pl: Handle no-op --no-split option.
+
+(cherry picked from commit 96a7037cd8573cf065aa6b12baca68696f96d9ca)
+---
+ etc/texi2pod.pl | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/etc/texi2pod.pl b/etc/texi2pod.pl
+index 11f70d156be..dcf2b437640 100644
+--- a/etc/texi2pod.pl
++++ b/etc/texi2pod.pl
+@@ -59,6 +59,8 @@ while ($_ = shift) {
+ $flag = shift;
+ }
+ push (@ipath, $flag);
++ } elsif (/^--no-split$/) {
++ # ignore option for makeinfo compatibility
+ } elsif (/^-/) {
+ usage();
+ } else {
+--
+2.27.0
+
diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD
index 7841207942..bb32ae6a16 100644
--- a/main/bluez/APKBUILD
+++ b/main/bluez/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bluez
pkgver=5.60
-pkgrel=0
+pkgrel=3
pkgdesc="Tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
arch="all"
@@ -155,6 +155,9 @@ plugins() {
pkgdesc="Bluez plugins (PS3 Sixaxis controller)"
cd "$builddir"
make DESTDIR="$subpkgdir" install-pluginLTLIBRARIES
+
+ # These are installed but should not be part of this package
+ rm $subpkgdir/usr/lib/libbluetooth.so*
}
openrc() {
@@ -184,11 +187,11 @@ openrc() {
sha512sums="
069e054360b4ab72f1daa033572f0fd822fb0f47e52069f4f3dcdfecfa312b9a5366cc04967e639aef39b980c0e1007389f1ee757e7c3bae43a5e66f8ed21a6b bluez-5.60.tar.xz
-fc43c78ed248ea412529eed5ae8bb47bacca9bf5b3b10de121ddd4e792c85893561a88be4aa2c6318106e5d2146a721445152d44fa60ca257ca0b4eb87318c1e bluetooth.initd
+e1d64fac673cceb657684b1bc5c36ff6d05f7cc5832d940863129adacd5b8ade1315b14df039a61f061950ac99e155266530efe2d2d35ea3c145b0469698a726 bluetooth.initd
8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd
a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd
d6766a4992ed4141569d6d82a802a771a5cb4c08873bfb0fdbedeea4d738bf9b56d9e0452ec19b7635418b1af4ab9b1735692043d629cbed3ce0eda6f51e1c6f org.bluez.obex.service
-78e4c1e1f3b3b31a8622f92bacb6cd61b7795c2371457cf6baa74c04d38683780a0ee9ad0687a9af74b1af85a4d330f183d01d8768e5899adbaa7644956b58a3 mpris-proxy.desktop
+72f9bc6cafe910ed7d105d4f3a537b16cd897622b2391ea545e6a302fcce2ed79e490e2841c6290aa1290489870a67638d71b0de5bc57f9d650e2248d9e4f0a4 mpris-proxy.desktop
73202915fda01d420b2864da77b1c25af5a55c815e9be6546400a0940bfb6097d83322790bc22a80ec0fcd557144fdd1877e243a79285a7f040ff96ba3600b94 001-bcm43xx-Add-bcm43xx-3wire-variant.patch
d5fd1c962bd846eaa6fff879bab85f753eb367d514f82d133b5d3242e1da989af5eddd942c60a87d5b67783e060f91bfa0f74fb1e8e6699cdee6e5bbe6a431ea 002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
784e9644c8de4e2693e2eeed988a245608b8cb14e1fc0dff8795c60c527b2e8d0c87862cfbfd6b850b47ae80cdf993a5ed3f477078ea1068fd7374899c7a1a77 003-Increase-firmware-load-timeout-to-30s.patch
diff --git a/main/bluez/bluetooth.initd b/main/bluez/bluetooth.initd
index ee40153ec8..3e5ec982f8 100644
--- a/main/bluez/bluetooth.initd
+++ b/main/bluez/bluetooth.initd
@@ -7,7 +7,7 @@ start_stop_daemon_args="--background --make-pidfile"
depend() {
- after coldplug
+ after coldplug udev-postmount
need dbus localmount hostname
}
diff --git a/main/bluez/mpris-proxy.desktop b/main/bluez/mpris-proxy.desktop
index 42e637b9bb..4995eaa431 100644
--- a/main/bluez/mpris-proxy.desktop
+++ b/main/bluez/mpris-proxy.desktop
@@ -5,5 +5,4 @@ Comment=Start mpris-proxy in daemon mode
Exec=/usr/bin/mpris-proxy
TryExec=/usr/bin/mpris-proxy
Terminal=false
-X-GNOME-Autostart-Phase=Panel
X-KDE-autostart-phase=2
diff --git a/main/boost1.75/boost-context-mips-softfloat.patch b/main/boost1.75/boost-context-mips-softfloat.patch
deleted file mode 100644
index 38e2b52b09..0000000000
--- a/main/boost1.75/boost-context-mips-softfloat.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -urN boost_1_72_0.orig/libs/context/src/asm/jump_mips64_n64_elf_gas.S boost_1_72_0/libs/context/src/asm/jump_mips64_n64_elf_gas.S
---- boost_1_72_0.orig/libs/context/src/asm/jump_mips64_n64_elf_gas.S 2021-01-15 02:29:42.053471423 -0700
-+++ boost_1_72_0/libs/context/src/asm/jump_mips64_n64_elf_gas.S 2021-01-15 02:31:15.297335652 -0700
-@@ -67,7 +67,7 @@
- sd $ra, 144($sp) # save RA
- sd $ra, 152($sp) # save RA as PC
-
--
-+#ifdef __mips_hard_float
- s.d $f24, 0($sp) # save F24
- s.d $f25, 8($sp) # save F25
- s.d $f26, 16($sp) # save F26
-@@ -76,6 +76,7 @@
- s.d $f29, 40($sp) # save F29
- s.d $f30, 48($sp) # save F30
- s.d $f31, 56($sp) # save F31
-+#endif
-
- # store SP (pointing to old context-data) in v0 as return
- move $v0, $sp
-@@ -83,6 +84,7 @@
- # get SP (pointing to new context-data) from a0 param
- move $sp, $a0
-
-+#ifdef __mips_hard_float
- l.d $f24, 0($sp) # restore F24
- l.d $f25, 8($sp) # restore F25
- l.d $f26, 16($sp) # restore F26
-@@ -91,6 +93,7 @@
- l.d $f29, 40($sp) # restore F29
- l.d $f30, 48($sp) # restore F30
- l.d $f31, 56($sp) # restore F31
-+#endif
-
- ld $s0, 64($sp) # restore S0
- ld $s1, 72($sp) # restore S1
-diff -urN boost_1_72_0.orig/libs/context/src/asm/ontop_mips64_n64_elf_gas.S boost_1_72_0/libs/context/src/asm/ontop_mips64_n64_elf_gas.S
---- boost_1_72_0.orig/libs/context/src/asm/ontop_mips64_n64_elf_gas.S 2021-01-15 02:29:42.056804776 -0700
-+++ boost_1_72_0/libs/context/src/asm/ontop_mips64_n64_elf_gas.S 2021-01-15 02:31:48.294188377 -0700
-@@ -67,7 +67,7 @@
- sd $ra, 144($sp) # save RA
- sd $ra, 152($sp) # save RA as PC
-
--
-+#ifdef __mips_hard_float
- s.d $f24, 0($sp) # save F24
- s.d $f25, 8($sp) # save F25
- s.d $f26, 16($sp) # save F26
-@@ -76,6 +76,7 @@
- s.d $f29, 40($sp) # save F29
- s.d $f30, 48($sp) # save F30
- s.d $f31, 56($sp) # save F31
-+#endif
-
- # store SP (pointing to context-data) in t0
- move $t0, $sp
-@@ -83,6 +84,7 @@
- # restore SP (pointing to context-data) from a0
- move $sp, $a0
-
-+#ifdef __mips_hard_float
- l.d $f24, 0($sp) # restore F24
- l.d $f25, 8($sp) # restore F25
- l.d $f26, 16($sp) # restore F26
-@@ -91,6 +93,7 @@
- l.d $f29, 40($sp) # restore F29
- l.d $f30, 48($sp) # restore F30
- l.d $f31, 56($sp) # restore F31
-+#endif
-
- ld $s0, 64($sp) # restore S0
- ld $s1, 72($sp) # restore S1
diff --git a/main/boost1.75/build-undefine-statx-syscall.patch b/main/boost1.75/build-undefine-statx-syscall.patch
deleted file mode 100644
index 4b984f0b34..0000000000
--- a/main/boost1.75/build-undefine-statx-syscall.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: The way the statx function is defined is broken, and does not fall
-back in case the syscall is not present, which is the case for mips64, which
-runs Linux 4.9.
-Upstream: rejected
-URL: https://github.com/boostorg/filesystem/issues/173
-diff --git a/libs/filesystem/build/Jamfile.v2 b/libs/filesystem/build/Jamfile.v2
-index 132641a32..76547eb92 100644
---- a/libs/filesystem/build/Jamfile.v2
-+++ b/libs/filesystem/build/Jamfile.v2
-@@ -54,7 +54,6 @@ project boost/filesystem
- [ check-target-builds ../config//has_stat_st_birthtimensec "has stat::st_birthtimensec" : <define>BOOST_FILESYSTEM_HAS_STAT_ST_BIRTHTIMENSEC ]
- [ check-target-builds ../config//has_stat_st_birthtimespec "has stat::st_birthtimespec" : <define>BOOST_FILESYSTEM_HAS_STAT_ST_BIRTHTIMESPEC ]
- [ check-target-builds ../config//has_statx "has statx" : <define>BOOST_FILESYSTEM_HAS_STATX ]
-- [ check-target-builds ../config//has_statx_syscall "has statx syscall" : <define>BOOST_FILESYSTEM_HAS_STATX_SYSCALL ]
- <conditional>@select-windows-crypto-api
- : source-location ../src
- : usage-requirements # pass these requirement to dependents (i.e. users)
diff --git a/main/boost1.76/APKBUILD b/main/boost1.76/APKBUILD
index 42d42f2a81..63cae391b1 100644
--- a/main/boost1.76/APKBUILD
+++ b/main/boost1.76/APKBUILD
@@ -2,7 +2,7 @@
pkgname=boost1.76
pkgver=1.76.0
_pkgver="${pkgver//./_}"
-pkgrel=0
+pkgrel=2
pkgdesc="Free peer-reviewed portable C++ source libraries"
url="https://www.boost.org/"
arch="all"
@@ -66,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)"
@@ -156,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/
}
@@ -170,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/
}
@@ -182,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
@@ -205,15 +185,6 @@ _dev() {
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.75/0001-revert-cease-dependence-on-range.patch b/main/boost1.77/0001-revert-cease-dependence-on-range.patch
index a6002074ab..a6002074ab 100644
--- a/main/boost1.75/0001-revert-cease-dependence-on-range.patch
+++ b/main/boost1.77/0001-revert-cease-dependence-on-range.patch
diff --git a/main/boost1.75/APKBUILD b/main/boost1.77/APKBUILD
index 92da12900c..3f11dede9e 100644
--- a/main/boost1.75/APKBUILD
+++ b/main/boost1.77/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=boost1.75
-pkgver=1.75.0
+pkgname=boost1.77
+pkgver=1.77.0
_pkgver="${pkgver//./_}"
-pkgrel=8
+pkgrel=1
pkgdesc="Free peer-reviewed portable C++ source libraries"
url="https://www.boost.org/"
arch="all"
-license="custom"
+license="BSL-1.0"
depends="$pkgname-libs"
depends_dev="$pkgname linux-headers bzip2-dev icu-dev xz-dev zlib-dev"
makedepends="$depends_dev python3-dev>=3.8 flex bison"
@@ -14,13 +14,12 @@ subpackages="
$pkgname-static
$pkgname-dev
$pkgname-doc
+ boost-dev:_dev
"
source="https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/boost_$_pkgver.tar.bz2
boost-1.57.0-python-abi_letters.patch
boost-1.57.0-python-libpython_dep.patch
0001-revert-cease-dependence-on-range.patch
- boost-context-mips-softfloat.patch
- build-undefine-statx-syscall.patch
"
builddir="$srcdir/boost_$_pkgver"
@@ -66,6 +65,11 @@ 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)"
@@ -151,6 +155,11 @@ 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/
}
@@ -160,6 +169,11 @@ _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/
}
@@ -167,6 +181,11 @@ _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
@@ -179,15 +198,28 @@ 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))'
}
sha512sums="
-d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a boost_1_75_0.tar.bz2
+39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f boost_1_77_0.tar.bz2
d96d4d37394a31764ed817d0bc4a99cffa68a75ff1ecfd4417b9e1e5ae2c31a96ed24f948c6f2758ffdac01328d2402c4cf0d33a37107e4f5f721e636daebd66 boost-1.57.0-python-abi_letters.patch
132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02 boost-1.57.0-python-libpython_dep.patch
9b53d2fe2dddd592e43db03c26fadd6c07d4c45a980ae4c775b7a914346a3914f6e0c3ef42dad5e2ea4568afb86c9967e09444ff609cfba1e1d39f4980b22ad6 0001-revert-cease-dependence-on-range.patch
-1ace57c256017a99f84cdd32fedca0ade12b1666edf3c8e2465e6f01a95ee978b9eea010917787997d81ad7832f06dd25ff392d6a83cb12398e546d5b9eceadd boost-context-mips-softfloat.patch
-debb898a9d2295a4480a32bec69a77c6e8d5dc094b0be39df1f1afc3a0f610fe916c59be1304bc904ad74440f93a224e4b138c60a5f0253143c9eb5db973cd2b build-undefine-statx-syscall.patch
"
diff --git a/main/boost1.75/boost-1.57.0-python-abi_letters.patch b/main/boost1.77/boost-1.57.0-python-abi_letters.patch
index 7df3ee7047..7df3ee7047 100644
--- a/main/boost1.75/boost-1.57.0-python-abi_letters.patch
+++ b/main/boost1.77/boost-1.57.0-python-abi_letters.patch
diff --git a/main/boost1.75/boost-1.57.0-python-libpython_dep.patch b/main/boost1.77/boost-1.57.0-python-libpython_dep.patch
index 57bfc26774..57bfc26774 100644
--- a/main/boost1.75/boost-1.57.0-python-libpython_dep.patch
+++ b/main/boost1.77/boost-1.57.0-python-libpython_dep.patch
diff --git a/main/botan/APKBUILD b/main/botan/APKBUILD
index 156f0f122c..3332e06e3e 100644
--- a/main/botan/APKBUILD
+++ b/main/botan/APKBUILD
@@ -2,18 +2,22 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=botan
pkgver=2.18.1
-pkgrel=0
+pkgrel=4
pkgdesc="Crypto and TLS for C++11"
url="https://botan.randombit.net/"
arch="all"
license="BSD-2-Clause"
-depends_dev="boost-dev bzip2-dev openssl-dev sqlite-dev xz-dev zlib-dev"
+depends_dev="boost-dev bzip2-dev openssl1.1-compat-dev sqlite-dev xz-dev zlib-dev"
makedepends="$depends_dev python3"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-source="https://botan.randombit.net/releases/Botan-$pkgver.tar.xz"
+source="https://botan.randombit.net/releases/Botan-$pkgver.tar.xz
+ dl-exponents.patch
+ CVE-2021-40529.patch"
builddir="$srcdir/Botan-$pkgver"
# secfixes:
+# 2.18.1-r3:
+# - CVE-2021-40529
# 2.17.3-r0:
# - CVE-2021-24115
# 2.9.0-r0:
@@ -57,4 +61,8 @@ package() {
rm -rf "$pkgdir"/usr/lib/python*
}
-sha512sums="2f11d1ab703d977a2d64504d2a2489ce56109a2a6c46c0dc7c8db428470ce511bcc0160f70baedad29237abd5e1622f2c155ea58c4dec4d3ae57ee7b350415c3 Botan-2.18.1.tar.xz"
+sha512sums="
+2f11d1ab703d977a2d64504d2a2489ce56109a2a6c46c0dc7c8db428470ce511bcc0160f70baedad29237abd5e1622f2c155ea58c4dec4d3ae57ee7b350415c3 Botan-2.18.1.tar.xz
+e0d5e2c07d1ea66def33cbf8d64ba87eeb46c10ff0c14a54bc518b87a668a74a184e18b89440a2ef4b78ddf97cb4e2b02f1a70b4bbf705170715e353b2abbddb dl-exponents.patch
+fd5d29ea98de0f0ddc63340270f118a2a633e740d604cf030780fdca46a87733654c38c01f933bb607f92cbb3750250a1af6ef9fe26fec601bbe8c9f079a6660 CVE-2021-40529.patch
+"
diff --git a/main/botan/CVE-2021-40529.patch b/main/botan/CVE-2021-40529.patch
new file mode 100644
index 0000000000..c864ef5838
--- /dev/null
+++ b/main/botan/CVE-2021-40529.patch
@@ -0,0 +1,132 @@
+From 9a23e4e3bc3966340531f2ff608fa9d33b5185a2 Mon Sep 17 00:00:00 2001
+From: Jack Lloyd <jack@randombit.net>
+Date: Tue, 3 Aug 2021 18:20:29 -0400
+Subject: [PATCH] Avoid using short exponents with ElGamal
+
+Some off-brand PGP implementation generates keys where p - 1 is
+smooth, as a result short exponents can leak enough information about
+k to allow decryption.
+---
+ src/lib/pubkey/elgamal/elgamal.cpp | 8 +++-
+ src/tests/data/pubkey/elgamal_decrypt.vec | 45 +++++++++++++++++++++++
+ src/tests/data/pubkey/elgamal_encrypt.vec | 17 ++++++---
+ 3 files changed, 62 insertions(+), 8 deletions(-)
+
+diff --git a/src/lib/pubkey/elgamal/elgamal.cpp b/src/lib/pubkey/elgamal/elgamal.cpp
+index b3ec6df2cb..0e33c2ca5f 100644
+--- a/src/lib/pubkey/elgamal/elgamal.cpp
++++ b/src/lib/pubkey/elgamal/elgamal.cpp
+@@ -113,8 +113,12 @@ ElGamal_Encryption_Operation::raw_encrypt(const uint8_t msg[], size_t msg_len,
+ if(m >= m_group.get_p())
+ throw Invalid_Argument("ElGamal encryption: Input is too large");
+
+- const size_t k_bits = m_group.exponent_bits();
+- const BigInt k(rng, k_bits);
++ /*
++ Some ElGamal implementations foolishly use prime fields where p - 1 is
++ smooth, as a result it is unsafe to use short exponents.
++ */
++ const size_t k_bits = m_group.p_bits() - 1;
++ const BigInt k(rng, k_bits, false);
+
+ const BigInt a = m_group.power_g_p(k, k_bits);
+ const BigInt b = m_group.multiply_mod_p(m, monty_execute(*m_monty_y_p, k, k_bits));
+diff --git a/src/tests/data/pubkey/elgamal_decrypt.vec b/src/tests/data/pubkey/elgamal_decrypt.vec
+index f676be50e7..a9d9dd1679 100644
+--- a/src/tests/data/pubkey/elgamal_decrypt.vec
++++ b/src/tests/data/pubkey/elgamal_decrypt.vec
+@@ -58,3 +58,48 @@ G = 4956716650468111499852968442558584961751486202697832959709919208796153871740
+ X = 4304232149632055597449717737864742436448127103739097
+ Msg = F73BB7E5C8A5619380
+ Ciphertext = C9881464A37749949D66D75CD9B7A8ACAD33DD1FAC7561F684E9CB5343D2ED15969D7EDB4135518B50F0FEC9A9559C1D5E44DAB42C14BBDE2D2711EA4D02D7F27D1A9BCFEC9E8B73FA64BA3C54707FDDE7D5BE695E17FB9D259FB576FD4E57D66C8F727DC236E2A6E9FD01709D34B8D09F7DD3890F003EBE616042B4E0A8A00F6C3F34DE7E002FE72A84AF8D014D64E8CD08B9B56CC3A6BBE6F966B92105A92C5ABF4F2BF735670622F6213FE9739FAD65692E1C0EBF708A47E18600A22972A5A3DA0F22D11C581D46F734151A083FF757E961351EB183B467A859FBB9ED1DAC396FA405701FD6E3A62EB126E93648C3C6DFA9C4DBF3C005880F4799F66B310E
++
++P = 0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF
++G = 0x02
++X = 0xCC13EE3533858E0F0024FFC935DC5BD297DEC9385AC8EF7E
++Msg = 1C
++Ciphertext = D73F6E5CEF558B92C924FEC2329774ACD75E7CEA04D2485F07920EF4E5B86E361E23E42AB6F3A97F5B1F46218BF3C00E93A2EA981B8BB48EDD020A3F96D61FDA0F3E4D26F5538B2179B7D7E333CE78414F18E6CD0AE74C3F44FBFAC9121A3A6CF80C85E89280F9BC476078F9FD686A6500590B1AD75616C0A92BC73838A6D4437368304638242BCD628A72EA432FE7C1892922136B3C19B39990980185328E5BBD35DE42549819C8E301348320BA80602E751172D9ACAA8E0B67FB97996310BC0C14B9E40626FE54138851E4BC4CA4CB2F0A1F3D3F042556A4942B2B03B4C2F75E50260365865FEE0050DAC3604E78708715549FF878F1B337D6ABF8B695462F
++
++P = 0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA237327FFFFFFFFFFFFFFFF
++G = 0x02
++X = 0x8D81343C4994DAF21AD0E6CB88C74F55529925EC953381470B72B3C8
++Msg = 7F0CCACA157707BF03
++Ciphertext = 2EDE1A9F975FCAF943AEEB51EB37EAEDF54C4D939D0DCF7C80874A3BF8601B511685B1FDE52E07D8894EA647C50E480DE7A48ACADD89F79EEB9411234507CE6AB8503BD47B284134E301A78BD7FAC8D8B15A5D1424B820FF3FE1F363FC88FF510183165F52EE022A55EC43D4DD75763297C13F9EE3BCD579ADBA6800348F0C6240F49744B385737926A770EDF67257E7F5654C478C614700B6D2D671A13B28006C11C499BEB29658EF10C3E2EEC390A972372EBF733BA6EE5F4D600AAE1DDDC87EFA6D9FB05CBC995F82C3EF47CF862715E17DF7CC948846E849661D5C82C6A120610D90BB2D373D189A0BF13175F551326ECACF2D349A4BD2D265FDAC716E4B0A5D850E7EDA92CF9F8863BF1CD31C3888BFD81500DA4C615575EE8FA27615EF8E4B9D23A53852B236057E15DA7FC5827668A7B8AA699D3F79201567F4F0DAF7D89919906486A66ABA689FFD9E3BB5F0D1C677CCC12EA29BBFE1083C4FC349EE7E236BC8DC02DEE063E7F7C7B719E3176739D55196A2B7E6C3AA2A543135AB8F
++
++P = 0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AACAA68FFFFFFFFFFFFFFFF
++G = 0x02
++X = 0xA9F666E685F4F0BAFFF22C407B28461591CBF43F8DA1A8C3B1510BB6AA3BCD6C
++Msg = D830F02AA1AE9328CF3F2C6CB7D86875
++Ciphertext = E8AC61EE6EA9DCBEDF5DD10247240E0FF3A6D1B1D2C9832A73C5EF2F96FB23C6FA571F9E407089ADAB459086B4331DBCBB3E5FC69B996748131D0D499EFF4F3654CEF8ED3C14C97C4985E5E0D6E0714E789F9D926CB26A23ACB52D6308CDB3C4DBF92F7A701513B133A0512A0CC16E13BCC7F983BC181C71A42252D48B113BAB4B861430AC6157E3043BD861C44D0804CCBB0B9D5BA599650DABE9FA7BF286EB08A97D11D5F88CB0157A4522E2C9F4EF53EB9D7679974C5AD86554EED49736D0D7B39461B92C73CBBEBAD8E92A6501293AE9A5BF0FBDA11BC743E032F78740F96F8CD71D30EA0F17F42181783C908A6008E339620CCB80226E9CDD7E5D50DEF9310DF03C971955CCF70557C9816049C2137CB7554998BD90B81AD549E9B65347E4BC798039BF05929DED052EE816EA3A87014B0D25E2E279B7736446201F52E542AA6E494BDC6D02A9A0479E1F90D5F3898A36AF7BA03E8F0BCBBF891A1C1B0B300EA664349E765EA331841ABC7963012C623318EF9B681711461ECC83EDC88722DE5E16FF1AB57B23F285CC5E75F6FCB46EEC9F919D1C089E7C045535E64A97F16662DF9CEFFB0E6C9C6402A43E47D1D073A5555A470E2451809234ABFD463A013D70288BA4A093E51FCED6A434886ED70490D63DFD809F27A773CDAC3D848A21C2937CA194C4FFBF8E50C05AEB3A530A7AB8B39B91A72EA45034A2FF8F16B1
++
++P = 0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFCE0FD108E4B82D120A93AD2CAFFFFFFFFFFFFFFFF
++G = 0x02
++X = 0x981606068AE29B5B86E6F1E4E578010E43E1DBCB12504857CA6CDFC77913EFF0B3F563E1DDB40934B4F33099A6BF8EE8
++Msg = 0E738AF35B6AE8951E5C3BF8EB
++Ciphertext = 659C8E28BF6A26E5D55386E437F2B66282EB9F9ECA54522D8A1FDE6BC6C4D65E5412D030BDC9833F93E3653B7B58FFD66A2EBFB8AAF1F7BBB52C3CD43E08DDB3D2C73E26EEA988EEF9CFDC9C59872B4D2454A1F500911B4D3BD3EED99107FAF39D97A3302166AD5B0381ECAB769953406DD3FEB502D23587D9CF2C89F93FE6A73167E3734CD0676EE95F7C43A558A56E7B0264A6084875D1E7F2312FA7BA7145AAA5921F904EDDC7A6EC823C57AFE323E4368CD7D47CAF2F8A94D6D3117A8BE92BAF6F0392A20C7FCFE381789755B7B47B9C5496382FF26533EA7F911472F02E2F9E29CAC9CFF4AEB90C36E55A1AF5D0259B195E2824C7F6B40299D8A0858E162B3D9392E323F62B48DA629089902F16D01D1AB3DCFBAAB46F1E74ECA6560B3A97E85E9B88B8F11AA83F78E8E542B8A3B4C0E7B47220594979BC7DD12E97238EB4B91D23A8F2D5362CB8B08C1F07B3461AD0968FB3053F60ECC2B3C0E900A0A7C2924C3FA79CCB43B33B336B807C6F4B83A7AE0112BD72A13822E3CD0B2E2AF7717F2CB21BE02D8DB0EB3BCCF66836BD83C828C221569EFCAA53124D206CB51D3718BC1511799DEA0558DD6FDBFB06B3D96BAC451FE71A4244BD3CD6826BF27EA3CC7782C17DCAF52EAA944CEA734D011145F10A4132A271349A8BF1ED0D7F7EF2ABC7031475B4397574F8A7EC4F5480D85CF0CA1F7C69097A2A009FFD4927AA769FD821F64741812FE5DB996ECAD3265CE93DBA7B40532A2133FB8EE5066A0C5F91C7E0F3902B6CEA39D5BB4B59B2993B5DAA2B61FF589BF45613D1EF36D5F7D959E8255C0010EC439AAE1C9B682BAC92C2883ED279CD8C644A301150879EB8D37B217B36447CBAC37C132C0278AA8CB38A8596392E3A3CAA91573370ED44DF46311EEE878B63F947F2A28930133D343737502623D0C7D3EA5D8D8123D7963C70AD30CC865BCD68F96C1A13A3484AB4EF3828CE338BF8E087F2300B777D556974D5E23FAFD55AB54353BCA31BEC13003AC7258510578F96B8F1E2254E91768A78CF9FCC6D8CFB0493701D523F75EC25B37B623B5A73A28009DBC169A084E95D
++
++P = 0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199FFFFFFFFFFFFFFFF
++G = 0x02
++X = 0xB73A80EB48DB4DF3108BE1345281A1B39B4373BFE71CB4DA9F3594A94C525E2E288F06089F61C1D29D6A99EA775C05D6
++Msg = D413DAC9D341361F17EDCE1C46A04D343424251B
++Ciphertext = 085E76D450C7FF0B2DB59D41D12596AD1B0D8AF877F5C63416D2B355ED137A5AEAB3B75AC4CBFB5168F37EC02724EA057ED5B9AAF0C40D5469FB9E068C7E090C6EB411CDFBC9A500294E2433A9F879F52F8359B0865128A76801B7C4E22D5A3A6279F755291ECC9454AC3C1F1395DA5FA8E25CD951FCBF9B569EED304B3B82B0198913FAFD0B9A3ED32A64B0E394F96C153D25FBFEF92ECB38F79F2DE12570A041C8B4E8ADB998D6A559BC9640EBA8B61A6D0387CF0CA621B6C3F60D464DE7D27D5347F79CABD09533219DD2CDA8BAB74E886E206409A94054CCF3EBBA570C33FE456BD6B0BEB564F406AF49400550AE01A21A68126C90E0B8295CB7F9C2F4C790D8B0FEFD1FC6BFF40A00737AF9EDA25A1BF00E7FEC8CE776C3D24C61EBF48049CE5B27E024B796566BA670090BAB1A6015C01DB57DFDDAD61240F151C61BC80C3BA320050D1E537D501611627531E41793C3468B87F28BF2281CE996957901BE6CE41FAB0F88467ECBC0DE6C5F60AB5A1AF21A9528B0E8BABAD56FA23F2AD3CBC521A8D54047F15F58FC9C5CD4BB322A0838EDAC053415CFED87FD0756FBFF6B052D385C2EED6FD4686E024F7175A9840DF7E74740FF368DA4DAEB879D7C0D265D51809BD6EC6A66717498A4998D0232586CA4C5F7858EBEC824821CDBD1133DA557612A398EA8F9AC959A39381FCF1D727D08136CAFC4D72E9A945043E6DE2C67F6B55C21B7EDBFDCEA2B63CF9A5BB931DFE76CA2BE5D3D964AA2C348E6DFBA4FFC4D5E463105E243BD20AF38531A70BE1DD4930F998E28C3182665507700976BC14438452179747E623B2E5328A3ED5925FA526AE897ACF67059D76D159CB31D85F03589A4874AB11A7E2BB680FCEF7A4CEBFD98B0DC18BC1AF838524107E3264C2FDACF883ED2701CF3306E83CB8E75F5ED148F3377A77474D47522596F50DADEFC149A91C619F4A9366771681CAE1A82AA57BB038E0180BD38C4323928E63FA890B85009B1A25C022AEE8DB4D7F4E34260677A22B3BC7F24089E98FC484B93EC95ED68D9D56B2F6DDBCE73AB844F5CBBD908E51651517F6920DC42F41B874EEB9DA244C4485D2A931C7A76E99D490E6B3D4AE44484CAE4B784A0773782D2B9CFB4D893E79D35CF4282CB9A70EA53700F49F6F47F374161D0B820690D2C99E3A2602B31E659E64E5D4D4BD111C73FD5AF47412748091E272947A307309F3732E04FA848AACC312ADD0323F09F7947788D9F2BC55BDB7DDDD1FE664C5C9E861F6052F8F94084927116CAB24C6B11FEE69ADD2BCED4CC7EF330519D287531861A75E0F00CA8E52CBE9B77E8F840168937222D5851C84195DD4E698AB8BB558A05026EBC09520A1B1F0BC44F699478A69E1C1384F37F16102DE90ED960CEFFD9EA299FB79D416F3AF6CCD1A022895CFE032AC65978486998E3714A56E3DBAE
++
++# Generated by Golang x/crypto
++P = 0xB10B8F96A080E01DDE92DE5EAE5D54EC52C99FBCFB06A3C69A6A9DCA52D23B616073E28675A23D189838EF1E2EE652C013ECB4AEA906112324975C3CD49B83BFACCBDD7D90C4BD7098488E9C219A73724EFFD6FAE5644738FAA31A4FF55BCCC0A151AF5F0DC8B4BD45BF37DF365C1A65E68CFDA76D4DA708DF1FB2BC2E4A4371
++G = 0xA4D1CBD5C3FD34126765A442EFB99905F8104DD258AC507FD6406CFF14266D31266FEA1E5C41564B777E690F5504F213160217B4B01B886A5E91547F9E2749F4D7FBD7D3B9A92EE1909D0D2263F80A76A6A24C087A091F531DBF0A0169B6A28AD662A4D18E73AFA32D779D5918D08BC8858F4DCEF97C2A24855E6EEB22B3B2E5
++X = 0x626adfc4696e5dee7f95f24077c8377b1df439cb76ab82134fe4a48b673e565a
++Msg = 0244454144424545464445414442454546444541444245454644454144424545464445414442454546444541444245454644454144424545464445414442454546444541444245454644454144424545464445414442454546444541444245454644454144424545464445414442454500476F207465737420766563746F72
++Ciphertext = 0F0AF27EB240927497A4245E592BDA1AA12420054AA406080420E92FCEDA12A3DCBF1CDEDA86A87029DF05C8D2435DF91A53BF65164375C302C19773C88677E88C36C3BBC408DFAD0672C1A56E5CDB8932AE11DD250F3DC31CB601582CC10C2E4BD26149AA5519AEDC7619C35B6F920B53B3AAEF728B06F37D08250B14C7AA0E291F233A5F5A6EE2333C9839C7C654C21669795B5C1415F92AFFBD24273403160AFE1DF058F554085283E0D5D8C487CBD4F7EFFBAE620C67F285CE4DD83FB1A00733B5BF9CA22A33039A7A15169757EFECC36A15F67609707C751F88FB5E70861BDE09A72A6B4558EA2841792BC86EC523DF23094D4B55663527EAB70D182CA9
++
++[EME-PKCS1-v1_5]
++# Same as above test from Go but with PKCS1 padding removed
++P = 0xB10B8F96A080E01DDE92DE5EAE5D54EC52C99FBCFB06A3C69A6A9DCA52D23B616073E28675A23D189838EF1E2EE652C013ECB4AEA906112324975C3CD49B83BFACCBDD7D90C4BD7098488E9C219A73724EFFD6FAE5644738FAA31A4FF55BCCC0A151AF5F0DC8B4BD45BF37DF365C1A65E68CFDA76D4DA708DF1FB2BC2E4A4371
++G = 0xA4D1CBD5C3FD34126765A442EFB99905F8104DD258AC507FD6406CFF14266D31266FEA1E5C41564B777E690F5504F213160217B4B01B886A5E91547F9E2749F4D7FBD7D3B9A92EE1909D0D2263F80A76A6A24C087A091F531DBF0A0169B6A28AD662A4D18E73AFA32D779D5918D08BC8858F4DCEF97C2A24855E6EEB22B3B2E5
++X = 0x626adfc4696e5dee7f95f24077c8377b1df439cb76ab82134fe4a48b673e565a
++Msg = 476F207465737420766563746F72
++Ciphertext = 0F0AF27EB240927497A4245E592BDA1AA12420054AA406080420E92FCEDA12A3DCBF1CDEDA86A87029DF05C8D2435DF91A53BF65164375C302C19773C88677E88C36C3BBC408DFAD0672C1A56E5CDB8932AE11DD250F3DC31CB601582CC10C2E4BD26149AA5519AEDC7619C35B6F920B53B3AAEF728B06F37D08250B14C7AA0E291F233A5F5A6EE2333C9839C7C654C21669795B5C1415F92AFFBD24273403160AFE1DF058F554085283E0D5D8C487CBD4F7EFFBAE620C67F285CE4DD83FB1A00733B5BF9CA22A33039A7A15169757EFECC36A15F67609707C751F88FB5E70861BDE09A72A6B4558EA2841792BC86EC523DF23094D4B55663527EAB70D182CA9
+diff --git a/src/tests/data/pubkey/elgamal_encrypt.vec b/src/tests/data/pubkey/elgamal_encrypt.vec
+index 059eb1668d..92e8690549 100644
+--- a/src/tests/data/pubkey/elgamal_encrypt.vec
++++ b/src/tests/data/pubkey/elgamal_encrypt.vec
+@@ -3,30 +3,35 @@
+ Group = modp/ietf/1024
+ Secret = 0xCC13EE3533858E0F0024FFC935DC5BD297DEC9385AC8EF7E
+ Msg = 1C
+-Nonce = EEE23AAA149AF29E18EF8D66AD8D4BACB72076BAE583A297
++Nonce = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000EEE23AAA149AF29E18EF8D66AD8D4BACB72076BAE583A297
+ Ciphertext = D73F6E5CEF558B92C924FEC2329774ACD75E7CEA04D2485F07920EF4E5B86E361E23E42AB6F3A97F5B1F46218BF3C00E93A2EA981B8BB48EDD020A3F96D61FDA0F3E4D26F5538B2179B7D7E333CE78414F18E6CD0AE74C3F44FBFAC9121A3A6CF80C85E89280F9BC476078F9FD686A6500590B1AD75616C0A92BC73838A6D4437368304638242BCD628A72EA432FE7C1892922136B3C19B39990980185328E5BBD35DE42549819C8E301348320BA80602E751172D9ACAA8E0B67FB97996310BC0C14B9E40626FE54138851E4BC4CA4CB2F0A1F3D3F042556A4942B2B03B4C2F75E50260365865FEE0050DAC3604E78708715549FF878F1B337D6ABF8B695462F
+
++Group = modp/ietf/1024
++Secret = 0xCC13EE3533858E0F0024FFC935DC5BD297DEC9385AC8EF7E
++Msg = 1C
++Nonce = D0F937A84865734C37877CBBD731D9A378EA8644B5C4D9A65B2C81C46F1014364F3593C6B9DFF25E0741EFB6C3E033522D66A6DA1C6B7666E8C15112BFAB850C38177C30CC05449B1A7D0D11EDD555997C57840D319279E5C80A51DC15F8103B820C5C870432DC14B70A12207EF749C835825C63B05B2E1A8FE36F0264D5B13D
++Ciphertext = B1F5602B7E72A8B3B5932EE86F303A14D764BAD54BF37902F0AA4C2592E04D3BB70F6CAAD3287B613D48C4D735E776F212BB26D46F53699B08194A0105239C588A2678EDC7476DF68B6C60F83E8DE47BA3477E17B3AD72D96F41FC1066089940F99ED6C0C8E9E77F322D986FDC4C718451E2CFBA51DCE13741C78AF81878EC6D4155741BFDD369A9DB4C9619E3753E0E80BD39A9B788481FB82ABA9A26FEF1B7619F9FC524B5D64DA2E3B23F8E8C0922754EB56A495DBD4F31B2DD3F9DC76A2EAB4D94F957F4E3776F423B85A8CDB343787AAFF00C95AFC297875DFF49EC9C886A5D550E1130A6CCC25E4A1C2D078C3B98586FFFD3C87EABC3FDC13A15AD4666
++
+ Group = modp/ietf/1536
+ Secret = 0x8D81343C4994DAF21AD0E6CB88C74F55529925EC953381470B72B3C8
+ Msg = 7F0CCACA157707BF03
+-Nonce = F0A0844B268ECEABA04827E7CE9F960119E0053CFBA00ADA47604857
++Nonce = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000F0A0844B268ECEABA04827E7CE9F960119E0053CFBA00ADA47604857
+ Ciphertext = 2EDE1A9F975FCAF943AEEB51EB37EAEDF54C4D939D0DCF7C80874A3BF8601B511685B1FDE52E07D8894EA647C50E480DE7A48ACADD89F79EEB9411234507CE6AB8503BD47B284134E301A78BD7FAC8D8B15A5D1424B820FF3FE1F363FC88FF510183165F52EE022A55EC43D4DD75763297C13F9EE3BCD579ADBA6800348F0C6240F49744B385737926A770EDF67257E7F5654C478C614700B6D2D671A13B28006C11C499BEB29658EF10C3E2EEC390A972372EBF733BA6EE5F4D600AAE1DDDC87EFA6D9FB05CBC995F82C3EF47CF862715E17DF7CC948846E849661D5C82C6A120610D90BB2D373D189A0BF13175F551326ECACF2D349A4BD2D265FDAC716E4B0A5D850E7EDA92CF9F8863BF1CD31C3888BFD81500DA4C615575EE8FA27615EF8E4B9D23A53852B236057E15DA7FC5827668A7B8AA699D3F79201567F4F0DAF7D89919906486A66ABA689FFD9E3BB5F0D1C677CCC12EA29BBFE1083C4FC349EE7E236BC8DC02DEE063E7F7C7B719E3176739D55196A2B7E6C3AA2A543135AB8F
+
+ Group = modp/ietf/2048
+ Secret = 0xA9F666E685F4F0BAFFF22C407B28461591CBF43F8DA1A8C3B1510BB6AA3BCD6C
+ Msg = D830F02AA1AE9328CF3F2C6CB7D86875
+-Nonce = DFA4E0979DADE5A620C4B9ED87C205F34D7AE739761BCDD060A9EC530E066538
++Nonce = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000DFA4E0979DADE5A620C4B9ED87C205F34D7AE739761BCDD060A9EC530E066538
+ Ciphertext = E8AC61EE6EA9DCBEDF5DD10247240E0FF3A6D1B1D2C9832A73C5EF2F96FB23C6FA571F9E407089ADAB459086B4331DBCBB3E5FC69B996748131D0D499EFF4F3654CEF8ED3C14C97C4985E5E0D6E0714E789F9D926CB26A23ACB52D6308CDB3C4DBF92F7A701513B133A0512A0CC16E13BCC7F983BC181C71A42252D48B113BAB4B861430AC6157E3043BD861C44D0804CCBB0B9D5BA599650DABE9FA7BF286EB08A97D11D5F88CB0157A4522E2C9F4EF53EB9D7679974C5AD86554EED49736D0D7B39461B92C73CBBEBAD8E92A6501293AE9A5BF0FBDA11BC743E032F78740F96F8CD71D30EA0F17F42181783C908A6008E339620CCB80226E9CDD7E5D50DEF9310DF03C971955CCF70557C9816049C2137CB7554998BD90B81AD549E9B65347E4BC798039BF05929DED052EE816EA3A87014B0D25E2E279B7736446201F52E542AA6E494BDC6D02A9A0479E1F90D5F3898A36AF7BA03E8F0BCBBF891A1C1B0B300EA664349E765EA331841ABC7963012C623318EF9B681711461ECC83EDC88722DE5E16FF1AB57B23F285CC5E75F6FCB46EEC9F919D1C089E7C045535E64A97F16662DF9CEFFB0E6C9C6402A43E47D1D073A5555A470E2451809234ABFD463A013D70288BA4A093E51FCED6A434886ED70490D63DFD809F27A773CDAC3D848A21C2937CA194C4FFBF8E50C05AEB3A530A7AB8B39B91A72EA45034A2FF8F16B1
+
+ Group = modp/ietf/3072
+ Secret = 0x981606068AE29B5B86E6F1E4E578010E43E1DBCB12504857CA6CDFC77913EFF0B3F563E1DDB40934B4F33099A6BF8EE8
+ Msg = 0E738AF35B6AE8951E5C3BF8EB
+-Nonce = F53B7EF9224D33392AE79CA3816755F066A2B15689B157FBA588CD5C247EFC9050DB2F84FA40C12E3493230D94D89306
++Nonce = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000F53B7EF9224D33392AE79CA3816755F066A2B15689B157FBA588CD5C247EFC9050DB2F84FA40C12E3493230D94D89306
+ Ciphertext = 659C8E28BF6A26E5D55386E437F2B66282EB9F9ECA54522D8A1FDE6BC6C4D65E5412D030BDC9833F93E3653B7B58FFD66A2EBFB8AAF1F7BBB52C3CD43E08DDB3D2C73E26EEA988EEF9CFDC9C59872B4D2454A1F500911B4D3BD3EED99107FAF39D97A3302166AD5B0381ECAB769953406DD3FEB502D23587D9CF2C89F93FE6A73167E3734CD0676EE95F7C43A558A56E7B0264A6084875D1E7F2312FA7BA7145AAA5921F904EDDC7A6EC823C57AFE323E4368CD7D47CAF2F8A94D6D3117A8BE92BAF6F0392A20C7FCFE381789755B7B47B9C5496382FF26533EA7F911472F02E2F9E29CAC9CFF4AEB90C36E55A1AF5D0259B195E2824C7F6B40299D8A0858E162B3D9392E323F62B48DA629089902F16D01D1AB3DCFBAAB46F1E74ECA6560B3A97E85E9B88B8F11AA83F78E8E542B8A3B4C0E7B47220594979BC7DD12E97238EB4B91D23A8F2D5362CB8B08C1F07B3461AD0968FB3053F60ECC2B3C0E900A0A7C2924C3FA79CCB43B33B336B807C6F4B83A7AE0112BD72A13822E3CD0B2E2AF7717F2CB21BE02D8DB0EB3BCCF66836BD83C828C221569EFCAA53124D206CB51D3718BC1511799DEA0558DD6FDBFB06B3D96BAC451FE71A4244BD3CD6826BF27EA3CC7782C17DCAF52EAA944CEA734D011145F10A4132A271349A8BF1ED0D7F7EF2ABC7031475B4397574F8A7EC4F5480D85CF0CA1F7C69097A2A009FFD4927AA769FD821F64741812FE5DB996ECAD3265CE93DBA7B40532A2133FB8EE5066A0C5F91C7E0F3902B6CEA39D5BB4B59B2993B5DAA2B61FF589BF45613D1EF36D5F7D959E8255C0010EC439AAE1C9B682BAC92C2883ED279CD8C644A301150879EB8D37B217B36447CBAC37C132C0278AA8CB38A8596392E3A3CAA91573370ED44DF46311EEE878B63F947F2A28930133D343737502623D0C7D3EA5D8D8123D7963C70AD30CC865BCD68F96C1A13A3484AB4EF3828CE338BF8E087F2300B777D556974D5E23FAFD55AB54353BCA31BEC13003AC7258510578F96B8F1E2254E91768A78CF9FCC6D8CFB0493701D523F75EC25B37B623B5A73A28009DBC169A084E95D
+
+ Group = modp/ietf/4096
+ Secret = 0xB73A80EB48DB4DF3108BE1345281A1B39B4373BFE71CB4DA9F3594A94C525E2E288F06089F61C1D29D6A99EA775C05D6
+ Msg = D413DAC9D341361F17EDCE1C46A04D343424251B
+-Nonce = B9AFD0F2F97C677BD3088B032696E7928DD62AD20912367113CFE5ABEEB7B4DFAD22E30442B04571CDC683D9971DE257
++Nonce = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B9AFD0F2F97C677BD3088B032696E7928DD62AD20912367113CFE5ABEEB7B4DFAD22E30442B04571CDC683D9971DE257
+ Ciphertext = 085E76D450C7FF0B2DB59D41D12596AD1B0D8AF877F5C63416D2B355ED137A5AEAB3B75AC4CBFB5168F37EC02724EA057ED5B9AAF0C40D5469FB9E068C7E090C6EB411CDFBC9A500294E2433A9F879F52F8359B0865128A76801B7C4E22D5A3A6279F755291ECC9454AC3C1F1395DA5FA8E25CD951FCBF9B569EED304B3B82B0198913FAFD0B9A3ED32A64B0E394F96C153D25FBFEF92ECB38F79F2DE12570A041C8B4E8ADB998D6A559BC9640EBA8B61A6D0387CF0CA621B6C3F60D464DE7D27D5347F79CABD09533219DD2CDA8BAB74E886E206409A94054CCF3EBBA570C33FE456BD6B0BEB564F406AF49400550AE01A21A68126C90E0B8295CB7F9C2F4C790D8B0FEFD1FC6BFF40A00737AF9EDA25A1BF00E7FEC8CE776C3D24C61EBF48049CE5B27E024B796566BA670090BAB1A6015C01DB57DFDDAD61240F151C61BC80C3BA320050D1E537D501611627531E41793C3468B87F28BF2281CE996957901BE6CE41FAB0F88467ECBC0DE6C5F60AB5A1AF21A9528B0E8BABAD56FA23F2AD3CBC521A8D54047F15F58FC9C5CD4BB322A0838EDAC053415CFED87FD0756FBFF6B052D385C2EED6FD4686E024F7175A9840DF7E74740FF368DA4DAEB879D7C0D265D51809BD6EC6A66717498A4998D0232586CA4C5F7858EBEC824821CDBD1133DA557612A398EA8F9AC959A39381FCF1D727D08136CAFC4D72E9A945043E6DE2C67F6B55C21B7EDBFDCEA2B63CF9A5BB931DFE76CA2BE5D3D964AA2C348E6DFBA4FFC4D5E463105E243BD20AF38531A70BE1DD4930F998E28C3182665507700976BC14438452179747E623B2E5328A3ED5925FA526AE897ACF67059D76D159CB31D85F03589A4874AB11A7E2BB680FCEF7A4CEBFD98B0DC18BC1AF838524107E3264C2FDACF883ED2701CF3306E83CB8E75F5ED148F3377A77474D47522596F50DADEFC149A91C619F4A9366771681CAE1A82AA57BB038E0180BD38C4323928E63FA890B85009B1A25C022AEE8DB4D7F4E34260677A22B3BC7F24089E98FC484B93EC95ED68D9D56B2F6DDBCE73AB844F5CBBD908E51651517F6920DC42F41B874EEB9DA244C4485D2A931C7A76E99D490E6B3D4AE44484CAE4B784A0773782D2B9CFB4D893E79D35CF4282CB9A70EA53700F49F6F47F374161D0B820690D2C99E3A2602B31E659E64E5D4D4BD111C73FD5AF47412748091E272947A307309F3732E04FA848AACC312ADD0323F09F7947788D9F2BC55BDB7DDDD1FE664C5C9E861F6052F8F94084927116CAB24C6B11FEE69ADD2BCED4CC7EF330519D287531861A75E0F00CA8E52CBE9B77E8F840168937222D5851C84195DD4E698AB8BB558A05026EBC09520A1B1F0BC44F699478A69E1C1384F37F16102DE90ED960CEFFD9EA299FB79D416F3AF6CCD1A022895CFE032AC65978486998E3714A56E3DBAE
+-
diff --git a/main/botan/dl-exponents.patch b/main/botan/dl-exponents.patch
new file mode 100644
index 0000000000..28c5e06b81
--- /dev/null
+++ b/main/botan/dl-exponents.patch
@@ -0,0 +1,304 @@
+From 9258696e147894e45d0422fd65a34193fba76211 Mon Sep 17 00:00:00 2001
+From: Jack Lloyd <jack@randombit.net>
+Date: Mon, 14 Dec 2020 07:15:20 -0500
+Subject: [PATCH] New sizes for DL exponents
+
+Avoid using a formula for this and instead just bucket into a few very
+rough sizes. In all cases (except very large keys) this results in
+using a somewhat larger exponent.
+---
+ src/lib/pubkey/workfactor.cpp | 23 +++++++------
+ src/scripts/test_cli.py | 4 +--
+ .../{elgamal.vec => elgamal_decrypt.vec} | 10 ------
+ src/tests/data/pubkey/elgamal_encrypt.vec | 32 ++++++++++++++++++
+ src/tests/data/pubkey/workfactor.vec | 18 ++++++----
+ src/tests/{test_elg.cpp => test_elgamal.cpp} | 33 +++++++++++++++----
+ src/tests/test_workfactor.cpp | 2 +-
+ 7 files changed, 86 insertions(+), 36 deletions(-)
+ rename src/tests/data/pubkey/{elgamal.vec => elgamal_decrypt.vec} (95%)
+ create mode 100644 src/tests/data/pubkey/elgamal_encrypt.vec
+ rename src/tests/{test_elg.cpp => test_elgamal.cpp} (54%)
+
+diff --git a/src/lib/pubkey/workfactor.cpp b/src/lib/pubkey/workfactor.cpp
+index cd0a83e5ce..13760351ea 100644
+--- a/src/lib/pubkey/workfactor.cpp
++++ b/src/lib/pubkey/workfactor.cpp
+@@ -51,16 +51,19 @@ size_t dl_work_factor(size_t bits)
+
+ size_t dl_exponent_size(size_t bits)
+ {
+- /*
+- This uses a slightly tweaked version of the standard work factor
+- function above. It assumes k is 1 (thus overestimating the strength
+- of the prime group by 5-6 bits), and always returns at least 128 bits
+- (this only matters for very small primes).
+- */
+- const size_t min_workfactor = 64;
+- const double log2_k = 0;
+-
+- return 2 * std::max<size_t>(min_workfactor, nfs_workfactor(bits, log2_k));
++ if(bits == 0)
++ return 0;
++ if(bits <= 256)
++ return bits - 1;
++ if(bits <= 1024)
++ return 192;
++ if(bits <= 1536)
++ return 224;
++ if(bits <= 2048)
++ return 256;
++ if(bits <= 4096)
++ return 384;
++ return 512;
+ }
+
+ }
+diff --git a/src/scripts/test_cli.py b/src/scripts/test_cli.py
+index 7fb46feab4..5fc2f04e84 100755
+--- a/src/scripts/test_cli.py
++++ b/src/scripts/test_cli.py
+@@ -278,7 +278,7 @@ def cli_gen_dl_group_tests(_tmp_dir):
+ mFvAZ/8wal0=
+ -----END X9.42 DH PARAMETERS-----"""
+
+- test_cli("gen_dl_group", "--pbits=1043", pem)
++ test_cli("gen_dl_group", ["--pbits=1043", "--qbits=174"], pem)
+
+ dsa_grp = """-----BEGIN DSA PARAMETERS-----
+ MIIBHgKBgQCyP1vosC/axliM2hmJ9EOSdd1zBkuzMP25CYD8PFkRVrPLr1ClSUtn
+@@ -679,7 +679,7 @@ def cli_pk_workfactor_tests(_tmp_dir):
+ test_cli("pk_workfactor", "2048", "111")
+ test_cli("pk_workfactor", ["--type=rsa", "512"], "58")
+ test_cli("pk_workfactor", ["--type=dl", "512"], "58")
+- test_cli("pk_workfactor", ["--type=dl_exp", "512"], "128")
++ test_cli("pk_workfactor", ["--type=dl_exp", "512"], "192")
+
+ def cli_dl_group_info_tests(_tmp_dir):
+
+diff --git a/src/tests/data/pubkey/elgamal.vec b/src/tests/data/pubkey/elgamal_decrypt.vec
+similarity index 95%
+rename from src/tests/data/pubkey/elgamal.vec
+rename to src/tests/data/pubkey/elgamal_decrypt.vec
+index 5cfbacdeee..f676be50e7 100644
+--- a/src/tests/data/pubkey/elgamal.vec
++++ b/src/tests/data/pubkey/elgamal_decrypt.vec
+@@ -3,68 +3,58 @@ P = 1365501321293735349225077112267598047546199828869335521691442858164229618266
+ G = 13
+ X = 1510837665211600837455333225484573368412905214721958306259132011740929687444
+ Msg = 02AD1D776D591520E4D8BEF8B21CC2F54FB4EB788E52ECEBE13564435DA66284D51A6A6696E615EF599786CE4CBEFAFF066E0A1CD8868454EB5CE0CA99241B29E1D1492CF2712C2C101B3F3779034683AD8271098C2E3FBAA83901A97D9645FA5815AF79F4F638ECBE09020003F434D708914899C668F34830E70F4CAF0803
+-Nonce = 0A5842A8D0C1B07E5DE6FD3E0C6B1108523D4D35417F
+ Ciphertext = 5B99F58B48F3D473327075F2FF4EEA3C8C1FEB0B241F042864610D6FC512A81F431A965724195DB71C3B84B6B9F1DFAE0DAE60E7CDA957703D10FCCDA45CDD0EF8C8F76AA4F51F3EDAD8E5085B97D69523A3EAC89D67CDFDDCF0A30491A98BE2FD6C5E69C3A2C95300B9DB4EDF2111E7613EF7B2CA430D0CFFBDECF6A7BE592A853B404B6910C48A0204ED3430691E766FBAF21A428B9F833C5932C053C616EEB59850150A22331A8FB5AF2065B595E4F08881B1DB7CB85A28A33F4449890739679CCAA431A9205210995BEA68759B475BE4183A975C9D042FBBEDF589AB6AF017D7523B2CC90CD63526BC584F1E9EF42ABAAA9238987D7F73B94E323C6AADFD
+
+ P = 1541287358797997024335652872773425159872421808416662301794871595911973385718041854467851087853175356350298847849929853669980047096240555092681165983790725605204837589691602540741068782404825906414885161661820441988899240406981724303
+ G = 5
+ X = 1344717445208905302019700797220481877896877304443340806021921711564
+ Msg = 02C1ED6A171875F055809F12BC61829961CC740935C6DCC468FA663E8D1A7DE9E0555E3EA99476436743FC5C76D3E041055FAEB7641907F8E2F1F94061B22E72B7CD39EDD7A6367828CCDC000301CEA7D91CB1E8A3E20DC85FAA23EF6D08E6
+-Nonce = F42F854C10C9DD14A6712594A31326A1FD2CF5
+ Ciphertext = 9E47FB001BDDB12F2D8E0FA5501A7EAC1B185FDFC7D2FF3E4461B0D75D626F5156DEDD4D25F13C6C1F5F9A1F916058045705F5E82F748E9B6F0DC95D572B8DC2770159092EECA13946F0522FE2A859705009B615818A1B4F98E8DD38CF00DE746ABD5F3852D93F8D9299DE18EB763F11E41A8B9660C5F056538EED431BB8E2199D9012F50C7FBEF5AAD35ECCD7F141CD9AC6553315A2699D6718F50EBDCEAE62A11ACC466E8533EDBAF13C15B5532B323EBF283B108F892DBFCEA21231DFD548
+
+ P = 13232376895198612407547930718267435757728527029623408872245156039757713029036368719146452186041204237350521785240337048752071462798273003935646236777459223
+ G = 11629401773565540073100961473632977008134185076958364415809981826641612629974728305105606061133984394938666464842000720534465163992699133277631369246002549
+ X = 175607362627753240470186183617696577774
+ Msg = 47E586A7E7D98C116A6F553F652E57BF
+-Nonce = BEF5E7EFAA76C52A8ECEE604EDAFD31B
+ Ciphertext = CD70DE085B0C586B4E64097EA3AB4CE0B60A71B0F640FE4468F4F940412EDBDD9035EEC602530CFF81B2CDC35805264A866E4689DDBADC3438575B6337118BB23A5AB7710F85F2A4E1E0DBEC5652FEF73C868747ECB7043BA08241A0879A2DC588D3EC14ED552E62B1B111646FF4DFA9050754240A46A840EA5EB1D97712F2BB
+
+ P = 13232376895198612407547930718267435757728527029623408872245156039757713029036368719146452186041204237350521785240337048752071462798273003935646236777459223
+ G = 11629401773565540073100961473632977008134185076958364415809981826641612629974728305105606061133984394938666464842000720534465163992699133277631369246002549
+ X = 226260657342880764984259695048075261500
+ Msg = 74BC8D009250F4CD2E08BC556EE01449
+-Nonce = A2951BE393736E39E9D209FE978C7546
+ Ciphertext = 6D6ED1C6E519C628CACC7981A5BBE487F6E013B26448D711911698CEEAA4F746182A716602183A746FC35B022BD7B27EF079F7164309653D148D0CE91907FF6C4A9001A0CCA2A0A163F3F93200C2E40A957919CB84AC35B928E026F1827E6D4A9B986B592BE39861538414D5EA6980248FD3C3C0CDEE372F392D5AC46DB8EEFB
+
+ P = 13232376895198612407547930718267435757728527029623408872245156039757713029036368719146452186041204237350521785240337048752071462798273003935646236777459223
+ G = 11629401773565540073100961473632977008134185076958364415809981826641612629974728305105606061133984394938666464842000720534465163992699133277631369246002549
+ X = 190989497955271245954961490592364802400
+ Msg = 01AFE1A93EDB9CD3E3715523C952478D
+-Nonce = 9500DDCD404618F64A2063BC19941A6E
+ Ciphertext = 0636C3F1C63C54CAB4B48B6EF0ECBFF00BA6AB70DF4DB6266D0785351B37279D41D957D16CAB48C64035DCB2A1CD75BAC298C8ECAE8057D87071EADAA5DA6E2B69B5F353B5753F7E24DA81ABAD40059CD73CFA6E78CAB1C7DA418D55E5DBD42FA4F2B876A25B4AF63588C80E0DB11E8BAB1531960E951C08C1A68C8FAE0DA87C
+
+ P = 1418488780399624169246918906980830188668962659968489177172519612007411971965075884911751185624649475197807409457369163882960326663412481439463507475025544888587052733646843233033458377686354235239579046252542291754237282749312023983
+ G = 1351977104923085061876231022324913317418268765766371251774974499254352282996737121345129752664271877383194755574993089982460597274051441610498438524702048238124542105329402087161253933648442955133245175046317041420863434958965806440
+ X = 5693645782587047029911723275175292231768316497
+ Msg = 58E72BD0F04B11
+-Nonce = EF07721FF6B28A8A3B4EBC95C16B13A83649B7
+ Ciphertext = C7B6ACADBBCFD3A34EDA31CE9CA7F7889FBB2DF5C6C25793EB974591BF0EDE93637B6A95E8075BDB2A987039D92487665465C98AAD0C123FA00BB9736170E78069AA32DFBEB07099A0B7D439AA807A2D3D6F9F913EBC673F9F8CD5D3C0E9DD0D988EAC4D8204928C2DA8ECD1FA3A598FCBFFEF5017DB8542D123CF69E8C92EB956F10DC995AE6B6564967D5C12A07BA35607C54CC3F10A36FF3603DD7CC1490664610002977CE8C4A4EFFBD1421C902D4D8DFF81D014E1AB55F239E0F2FD28AB
+
+ P = 1418488780399624169246918906980830188668962659968489177172519612007411971965075884911751185624649475197807409457369163882960326663412481439463507475025544888587052733646843233033458377686354235239579046252542291754237282749312023983
+ G = 1351977104923085061876231022324913317418268765766371251774974499254352282996737121345129752664271877383194755574993089982460597274051441610498438524702048238124542105329402087161253933648442955133245175046317041420863434958965806440
+ X = 4008521039270359712424267366152273661245582878
+ Msg = C37AA41207A357DBCCFBE93DC45C5BD91D29FD29CBA29B26AC437A9B560C3BEA
+-Nonce = A36338E4D7815E6A4B178E951BEF073C6D5A7F
+ Ciphertext = D824C94623313298600CC20203F8A40006CAFCFC8F883C99AC09DBAE4B95E6DB9FB5737E24D9D7E39B603893076BC81A2BC0C0D608B32B353972B57066535DAAC49E3F7F2A0E243618EEE01C5AB3AFAE1D55E3A1DB33CF713E5187AD51D55144B1A108354ECA651E55F85F253FE73C1C15FA5EDDDA47467BD0425F09E3C4156548E71896659C618B84FD72BA176E2DEEECD8B15F2C05F870697EA464B88273742BD6ECBA5164424F34EBB9E13E31683A16712901818C7E5F502720FBCB075EA1
+
+ P = 1418488780399624169246918906980830188668962659968489177172519612007411971965075884911751185624649475197807409457369163882960326663412481439463507475025544888587052733646843233033458377686354235239579046252542291754237282749312023983
+ G = 1351977104923085061876231022324913317418268765766371251774974499254352282996737121345129752664271877383194755574993089982460597274051441610498438524702048238124542105329402087161253933648442955133245175046317041420863434958965806440
+ X = 5316253934868425065538718034591876558413406625
+ Msg = 36FDC0501B44AF
+-Nonce = 832BC01DB63F958D47B6962AEAA74C0831A6AB
+ Ciphertext = 62E46CDF100BADF4419215256BEC8427DD0388D1B60B5A8675532C0934351BA0036AF58032AB6C4DB829F1A0C8217FBF2CB9C10A5C60FF285919BCAF238E89FBAA4771CAD13D4A69AB2C1FFF0A44D2F9287F1E70D58210AE859074B3969EE800A9D1507BA48582BD1E03CC234B0CB11408BE0932763EDC99CA4BEC6E496A452237F920972C629714EA2F1FF212460C23B66DB56BC73E94743D32D2CD3536A17A136F56D7F7C24E3B8F102F48BBB21633279D3E584E71DC37B436104CA69A6BB3
+
+ P = 178011905478542266528237562450159990145232156369120674273274450314442865788737020770612695252123463079567156784778466449970650770920727857050009668388144034129745221171818506047231150039301079959358067395348717066319802262019714966524135060945913707594956514672855690606794135837542707371727429551343320695239
+ G = 49567166504681114998529684425585849617514862026978329597099192087961538717407709177883083441369264146939535263894140299406849834767828526204179623557679393249247253593623658376992386256295047165071989556654741504656225128772294708626157371448610928885819291350567633953878147205134001752476855481804967677085
+ X = 3756315909532643155590215634844150624450334340186095
+ Msg = DF72B687F62AFEA3A51195EE876E4C87708F7ABB8D2D5DD72B68256DAC6D
+-Nonce = 0B333C9C486C5F3A96F37D00133ADD18113376C9BE76
+ Ciphertext = 4156CF437A39C415B212AAA34C9AACAFA3F3113F53BB75E0BD3D759089E21754EF89B4BA1A8B37E5EDA13F8A2F87D16F03F3B6FE19A5CF799B17D83F7B5E9A225F324AAD7D46E80A1DAFCA337A3F500930A7831D1F3785763EB9A6994063CED033177E1CA2770B751B3053C1445ADFEAED790E49E4685A05B9563D1EF32BD321971D541B525D648EA7C8741D8FA7E46293D46A0F4345BE73EA4FAF1E4C16BCBE11C53BA0FCBA2975BD37F11FE5ADA8731CAED3C403EA6E43AE47ADAA7E28433404AD3ADE6AA8E12BFC374BADAAFB167F3AAF91DC6F8398003E5F8528E8D4773F800D48C8EDDAEDD72A3870E97679F946CE27FB692BC11677757A28F3899A3DA8
+
+ P = 178011905478542266528237562450159990145232156369120674273274450314442865788737020770612695252123463079567156784778466449970650770920727857050009668388144034129745221171818506047231150039301079959358067395348717066319802262019714966524135060945913707594956514672855690606794135837542707371727429551343320695239
+ G = 49567166504681114998529684425585849617514862026978329597099192087961538717407709177883083441369264146939535263894140299406849834767828526204179623557679393249247253593623658376992386256295047165071989556654741504656225128772294708626157371448610928885819291350567633953878147205134001752476855481804967677085
+ X = 4304232149632055597449717737864742436448127103739097
+ Msg = F73BB7E5C8A5619380
+-Nonce = 0AD9527B09EAD1E59B4A1CAF58C861B69A856AB8AA80
+ Ciphertext = C9881464A37749949D66D75CD9B7A8ACAD33DD1FAC7561F684E9CB5343D2ED15969D7EDB4135518B50F0FEC9A9559C1D5E44DAB42C14BBDE2D2711EA4D02D7F27D1A9BCFEC9E8B73FA64BA3C54707FDDE7D5BE695E17FB9D259FB576FD4E57D66C8F727DC236E2A6E9FD01709D34B8D09F7DD3890F003EBE616042B4E0A8A00F6C3F34DE7E002FE72A84AF8D014D64E8CD08B9B56CC3A6BBE6F966B92105A92C5ABF4F2BF735670622F6213FE9739FAD65692E1C0EBF708A47E18600A22972A5A3DA0F22D11C581D46F734151A083FF757E961351EB183B467A859FBB9ED1DAC396FA405701FD6E3A62EB126E93648C3C6DFA9C4DBF3C005880F4799F66B310E
+diff --git a/src/tests/data/pubkey/elgamal_encrypt.vec b/src/tests/data/pubkey/elgamal_encrypt.vec
+new file mode 100644
+index 0000000000..059eb1668d
+--- /dev/null
++++ b/src/tests/data/pubkey/elgamal_encrypt.vec
+@@ -0,0 +1,32 @@
++# These were generated by Botan and not checked against other implementations
++
++Group = modp/ietf/1024
++Secret = 0xCC13EE3533858E0F0024FFC935DC5BD297DEC9385AC8EF7E
++Msg = 1C
++Nonce = EEE23AAA149AF29E18EF8D66AD8D4BACB72076BAE583A297
++Ciphertext = D73F6E5CEF558B92C924FEC2329774ACD75E7CEA04D2485F07920EF4E5B86E361E23E42AB6F3A97F5B1F46218BF3C00E93A2EA981B8BB48EDD020A3F96D61FDA0F3E4D26F5538B2179B7D7E333CE78414F18E6CD0AE74C3F44FBFAC9121A3A6CF80C85E89280F9BC476078F9FD686A6500590B1AD75616C0A92BC73838A6D4437368304638242BCD628A72EA432FE7C1892922136B3C19B39990980185328E5BBD35DE42549819C8E301348320BA80602E751172D9ACAA8E0B67FB97996310BC0C14B9E40626FE54138851E4BC4CA4CB2F0A1F3D3F042556A4942B2B03B4C2F75E50260365865FEE0050DAC3604E78708715549FF878F1B337D6ABF8B695462F
++
++Group = modp/ietf/1536
++Secret = 0x8D81343C4994DAF21AD0E6CB88C74F55529925EC953381470B72B3C8
++Msg = 7F0CCACA157707BF03
++Nonce = F0A0844B268ECEABA04827E7CE9F960119E0053CFBA00ADA47604857
++Ciphertext = 2EDE1A9F975FCAF943AEEB51EB37EAEDF54C4D939D0DCF7C80874A3BF8601B511685B1FDE52E07D8894EA647C50E480DE7A48ACADD89F79EEB9411234507CE6AB8503BD47B284134E301A78BD7FAC8D8B15A5D1424B820FF3FE1F363FC88FF510183165F52EE022A55EC43D4DD75763297C13F9EE3BCD579ADBA6800348F0C6240F49744B385737926A770EDF67257E7F5654C478C614700B6D2D671A13B28006C11C499BEB29658EF10C3E2EEC390A972372EBF733BA6EE5F4D600AAE1DDDC87EFA6D9FB05CBC995F82C3EF47CF862715E17DF7CC948846E849661D5C82C6A120610D90BB2D373D189A0BF13175F551326ECACF2D349A4BD2D265FDAC716E4B0A5D850E7EDA92CF9F8863BF1CD31C3888BFD81500DA4C615575EE8FA27615EF8E4B9D23A53852B236057E15DA7FC5827668A7B8AA699D3F79201567F4F0DAF7D89919906486A66ABA689FFD9E3BB5F0D1C677CCC12EA29BBFE1083C4FC349EE7E236BC8DC02DEE063E7F7C7B719E3176739D55196A2B7E6C3AA2A543135AB8F
++
++Group = modp/ietf/2048
++Secret = 0xA9F666E685F4F0BAFFF22C407B28461591CBF43F8DA1A8C3B1510BB6AA3BCD6C
++Msg = D830F02AA1AE9328CF3F2C6CB7D86875
++Nonce = DFA4E0979DADE5A620C4B9ED87C205F34D7AE739761BCDD060A9EC530E066538
++Ciphertext = E8AC61EE6EA9DCBEDF5DD10247240E0FF3A6D1B1D2C9832A73C5EF2F96FB23C6FA571F9E407089ADAB459086B4331DBCBB3E5FC69B996748131D0D499EFF4F3654CEF8ED3C14C97C4985E5E0D6E0714E789F9D926CB26A23ACB52D6308CDB3C4DBF92F7A701513B133A0512A0CC16E13BCC7F983BC181C71A42252D48B113BAB4B861430AC6157E3043BD861C44D0804CCBB0B9D5BA599650DABE9FA7BF286EB08A97D11D5F88CB0157A4522E2C9F4EF53EB9D7679974C5AD86554EED49736D0D7B39461B92C73CBBEBAD8E92A6501293AE9A5BF0FBDA11BC743E032F78740F96F8CD71D30EA0F17F42181783C908A6008E339620CCB80226E9CDD7E5D50DEF9310DF03C971955CCF70557C9816049C2137CB7554998BD90B81AD549E9B65347E4BC798039BF05929DED052EE816EA3A87014B0D25E2E279B7736446201F52E542AA6E494BDC6D02A9A0479E1F90D5F3898A36AF7BA03E8F0BCBBF891A1C1B0B300EA664349E765EA331841ABC7963012C623318EF9B681711461ECC83EDC88722DE5E16FF1AB57B23F285CC5E75F6FCB46EEC9F919D1C089E7C045535E64A97F16662DF9CEFFB0E6C9C6402A43E47D1D073A5555A470E2451809234ABFD463A013D70288BA4A093E51FCED6A434886ED70490D63DFD809F27A773CDAC3D848A21C2937CA194C4FFBF8E50C05AEB3A530A7AB8B39B91A72EA45034A2FF8F16B1
++
++Group = modp/ietf/3072
++Secret = 0x981606068AE29B5B86E6F1E4E578010E43E1DBCB12504857CA6CDFC77913EFF0B3F563E1DDB40934B4F33099A6BF8EE8
++Msg = 0E738AF35B6AE8951E5C3BF8EB
++Nonce = F53B7EF9224D33392AE79CA3816755F066A2B15689B157FBA588CD5C247EFC9050DB2F84FA40C12E3493230D94D89306
++Ciphertext = 659C8E28BF6A26E5D55386E437F2B66282EB9F9ECA54522D8A1FDE6BC6C4D65E5412D030BDC9833F93E3653B7B58FFD66A2EBFB8AAF1F7BBB52C3CD43E08DDB3D2C73E26EEA988EEF9CFDC9C59872B4D2454A1F500911B4D3BD3EED99107FAF39D97A3302166AD5B0381ECAB769953406DD3FEB502D23587D9CF2C89F93FE6A73167E3734CD0676EE95F7C43A558A56E7B0264A6084875D1E7F2312FA7BA7145AAA5921F904EDDC7A6EC823C57AFE323E4368CD7D47CAF2F8A94D6D3117A8BE92BAF6F0392A20C7FCFE381789755B7B47B9C5496382FF26533EA7F911472F02E2F9E29CAC9CFF4AEB90C36E55A1AF5D0259B195E2824C7F6B40299D8A0858E162B3D9392E323F62B48DA629089902F16D01D1AB3DCFBAAB46F1E74ECA6560B3A97E85E9B88B8F11AA83F78E8E542B8A3B4C0E7B47220594979BC7DD12E97238EB4B91D23A8F2D5362CB8B08C1F07B3461AD0968FB3053F60ECC2B3C0E900A0A7C2924C3FA79CCB43B33B336B807C6F4B83A7AE0112BD72A13822E3CD0B2E2AF7717F2CB21BE02D8DB0EB3BCCF66836BD83C828C221569EFCAA53124D206CB51D3718BC1511799DEA0558DD6FDBFB06B3D96BAC451FE71A4244BD3CD6826BF27EA3CC7782C17DCAF52EAA944CEA734D011145F10A4132A271349A8BF1ED0D7F7EF2ABC7031475B4397574F8A7EC4F5480D85CF0CA1F7C69097A2A009FFD4927AA769FD821F64741812FE5DB996ECAD3265CE93DBA7B40532A2133FB8EE5066A0C5F91C7E0F3902B6CEA39D5BB4B59B2993B5DAA2B61FF589BF45613D1EF36D5F7D959E8255C0010EC439AAE1C9B682BAC92C2883ED279CD8C644A301150879EB8D37B217B36447CBAC37C132C0278AA8CB38A8596392E3A3CAA91573370ED44DF46311EEE878B63F947F2A28930133D343737502623D0C7D3EA5D8D8123D7963C70AD30CC865BCD68F96C1A13A3484AB4EF3828CE338BF8E087F2300B777D556974D5E23FAFD55AB54353BCA31BEC13003AC7258510578F96B8F1E2254E91768A78CF9FCC6D8CFB0493701D523F75EC25B37B623B5A73A28009DBC169A084E95D
++
++Group = modp/ietf/4096
++Secret = 0xB73A80EB48DB4DF3108BE1345281A1B39B4373BFE71CB4DA9F3594A94C525E2E288F06089F61C1D29D6A99EA775C05D6
++Msg = D413DAC9D341361F17EDCE1C46A04D343424251B
++Nonce = B9AFD0F2F97C677BD3088B032696E7928DD62AD20912367113CFE5ABEEB7B4DFAD22E30442B04571CDC683D9971DE257
++Ciphertext = 085E76D450C7FF0B2DB59D41D12596AD1B0D8AF877F5C63416D2B355ED137A5AEAB3B75AC4CBFB5168F37EC02724EA057ED5B9AAF0C40D5469FB9E068C7E090C6EB411CDFBC9A500294E2433A9F879F52F8359B0865128A76801B7C4E22D5A3A6279F755291ECC9454AC3C1F1395DA5FA8E25CD951FCBF9B569EED304B3B82B0198913FAFD0B9A3ED32A64B0E394F96C153D25FBFEF92ECB38F79F2DE12570A041C8B4E8ADB998D6A559BC9640EBA8B61A6D0387CF0CA621B6C3F60D464DE7D27D5347F79CABD09533219DD2CDA8BAB74E886E206409A94054CCF3EBBA570C33FE456BD6B0BEB564F406AF49400550AE01A21A68126C90E0B8295CB7F9C2F4C790D8B0FEFD1FC6BFF40A00737AF9EDA25A1BF00E7FEC8CE776C3D24C61EBF48049CE5B27E024B796566BA670090BAB1A6015C01DB57DFDDAD61240F151C61BC80C3BA320050D1E537D501611627531E41793C3468B87F28BF2281CE996957901BE6CE41FAB0F88467ECBC0DE6C5F60AB5A1AF21A9528B0E8BABAD56FA23F2AD3CBC521A8D54047F15F58FC9C5CD4BB322A0838EDAC053415CFED87FD0756FBFF6B052D385C2EED6FD4686E024F7175A9840DF7E74740FF368DA4DAEB879D7C0D265D51809BD6EC6A66717498A4998D0232586CA4C5F7858EBEC824821CDBD1133DA557612A398EA8F9AC959A39381FCF1D727D08136CAFC4D72E9A945043E6DE2C67F6B55C21B7EDBFDCEA2B63CF9A5BB931DFE76CA2BE5D3D964AA2C348E6DFBA4FFC4D5E463105E243BD20AF38531A70BE1DD4930F998E28C3182665507700976BC14438452179747E623B2E5328A3ED5925FA526AE897ACF67059D76D159CB31D85F03589A4874AB11A7E2BB680FCEF7A4CEBFD98B0DC18BC1AF838524107E3264C2FDACF883ED2701CF3306E83CB8E75F5ED148F3377A77474D47522596F50DADEFC149A91C619F4A9366771681CAE1A82AA57BB038E0180BD38C4323928E63FA890B85009B1A25C022AEE8DB4D7F4E34260677A22B3BC7F24089E98FC484B93EC95ED68D9D56B2F6DDBCE73AB844F5CBBD908E51651517F6920DC42F41B874EEB9DA244C4485D2A931C7A76E99D490E6B3D4AE44484CAE4B784A0773782D2B9CFB4D893E79D35CF4282CB9A70EA53700F49F6F47F374161D0B820690D2C99E3A2602B31E659E64E5D4D4BD111C73FD5AF47412748091E272947A307309F3732E04FA848AACC312ADD0323F09F7947788D9F2BC55BDB7DDDD1FE664C5C9E861F6052F8F94084927116CAB24C6B11FEE69ADD2BCED4CC7EF330519D287531861A75E0F00CA8E52CBE9B77E8F840168937222D5851C84195DD4E698AB8BB558A05026EBC09520A1B1F0BC44F699478A69E1C1384F37F16102DE90ED960CEFFD9EA299FB79D416F3AF6CCD1A022895CFE032AC65978486998E3714A56E3DBAE
++
+diff --git a/src/tests/data/pubkey/workfactor.vec b/src/tests/data/pubkey/workfactor.vec
+index 7d8999da84..1b7fa70235 100644
+--- a/src/tests/data/pubkey/workfactor.vec
++++ b/src/tests/data/pubkey/workfactor.vec
+@@ -24,20 +24,26 @@ ParamSize = 14400
+ Workfactor = 256
+
+ [DL_Exponent_Size]
++ParamSize = 192
++Workfactor = 191
++
++ParamSize = 512
++Workfactor = 192
++
+ ParamSize = 1024
+-Workfactor = 86
++Workfactor = 192
+
+ ParamSize = 1536
+-Workfactor = 103
++Workfactor = 224
+
+ ParamSize = 2048
+-Workfactor = 116
++Workfactor = 256
+
+ ParamSize = 3072
+-Workfactor = 138
++Workfactor = 384
+
+ ParamSize = 4096
+-Workfactor = 156
++Workfactor = 384
+
+ ParamSize = 8192
+-Workfactor = 208
++Workfactor = 512
+diff --git a/src/tests/test_elg.cpp b/src/tests/test_elgamal.cpp
+similarity index 54%
+rename from src/tests/test_elg.cpp
+rename to src/tests/test_elgamal.cpp
+index 6a6bdb8b54..cb69657251 100644
+--- a/src/tests/test_elg.cpp
++++ b/src/tests/test_elgamal.cpp
+@@ -1,5 +1,5 @@
+ /*
+-* (C) 2014,2015 Jack Lloyd
++* (C) 2014,2015,2020 Jack Lloyd
+ *
+ * Botan is released under the Simplified BSD License (see license.txt)
+ */
+@@ -17,15 +17,33 @@ namespace {
+
+ #if defined(BOTAN_HAS_ELGAMAL)
+
+-class ElGamal_KAT_Tests final : public PK_Encryption_Decryption_Test
++class ElGamal_Encrypt_Tests final : public PK_Encryption_Decryption_Test
+ {
+ public:
+- ElGamal_KAT_Tests()
++ ElGamal_Encrypt_Tests()
+ : PK_Encryption_Decryption_Test(
+ "ElGamal",
+- "pubkey/elgamal.vec",
+- "P,G,X,Msg,Nonce,Ciphertext",
+- "Padding") {}
++ "pubkey/elgamal_encrypt.vec",
++ "Group,Padding,Secret,Nonce,Msg,Ciphertext") {}
++
++ std::unique_ptr<Botan::Private_Key> load_private_key(const VarMap& vars) override
++ {
++ const Botan::BigInt x = vars.get_req_bn("Secret");
++ const Botan::DL_Group grp(vars.get_req_str("Group"));
++
++ std::unique_ptr<Botan::Private_Key> key(new Botan::ElGamal_PrivateKey(Test::rng(), grp, x));
++ return key;
++ }
++ };
++
++class ElGamal_Decrypt_Tests final : public PK_Decryption_Test
++ {
++ public:
++ ElGamal_Decrypt_Tests()
++ : PK_Decryption_Test(
++ "ElGamal",
++ "pubkey/elgamal_decrypt.vec",
++ "P,G,X,Msg,Ciphertext") {}
+
+ std::unique_ptr<Botan::Private_Key> load_private_key(const VarMap& vars) override
+ {
+@@ -53,7 +71,8 @@ class ElGamal_Keygen_Tests final : public PK_Key_Generation_Test
+ }
+ };
+
+-BOTAN_REGISTER_TEST("pubkey", "elgamal_encrypt", ElGamal_KAT_Tests);
++BOTAN_REGISTER_TEST("pubkey", "elgamal_encrypt", ElGamal_Encrypt_Tests);
++BOTAN_REGISTER_TEST("pubkey", "elgamal_decrypt", ElGamal_Decrypt_Tests);
+ BOTAN_REGISTER_TEST("pubkey", "elgamal_keygen", ElGamal_Keygen_Tests);
+
+ #endif
+diff --git a/src/tests/test_workfactor.cpp b/src/tests/test_workfactor.cpp
+index fe61f80e46..8c11869c73 100644
+--- a/src/tests/test_workfactor.cpp
++++ b/src/tests/test_workfactor.cpp
+@@ -34,7 +34,7 @@ class PK_Workfactor_Tests final : public Text_Based_Test
+ }
+ else if(type == "DL_Exponent_Size")
+ {
+- output = Botan::dl_exponent_size(param_size) / 2;
++ output = Botan::dl_exponent_size(param_size);
+ }
+
+ Test::Result result(type + " work factor calculation");
diff --git a/main/brotli/APKBUILD b/main/brotli/APKBUILD
index 45dec65e52..6805d652cd 100644
--- a/main/brotli/APKBUILD
+++ b/main/brotli/APKBUILD
@@ -24,6 +24,9 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/google/brotli/archive/v$pkgv
# 1.0.9-r0:
# - CVE-2020-8927
+# use sysroot when cross compiling to avoid libtool pulling in host libs
+[ "$CBUILD" != "$CHOST" ] && _cross_configure="--with-sysroot=$CBUILDROOT"
+
prepare() {
default_prepare
sed -i 's,/usr/bin/env bash,/bin/sh,' tests/*.sh
@@ -34,7 +37,9 @@ build() {
./configure \
--build=$CBUILD \
--host=$CHOST \
+ --target=$CTARGET \
--prefix=/usr \
+ $_cross_configure \
make
}
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index 6d789b8929..4fa734e51f 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.13
+pkgver=5.14.2
pkgrel=0
pkgdesc="BTRFS filesystem utilities"
url="https://btrfs.wiki.kernel.org"
@@ -11,13 +11,11 @@ license="GPL-2.0-or-later LGPL-3.0-or-later"
depends_dev="linux-headers"
makedepends="$depends_dev acl-dev asciidoc attr-dev autoconf automake
e2fsprogs-dev libtool lzo-dev py3-setuptools python3-dev util-linux-dev
- xmlto zlib-dev zstd-dev"
+ xmlto zlib-dev zstd-dev eudev-dev"
subpackages="$pkgname-doc $pkgname-static $pkgname-dev
$pkgname-bash-completion
py3-$pkgname:py3 $pkgname-libs $pkgname-extra"
-source="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar.xz
- fix-ppc64le.patch
- "
+source="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar.xz"
builddir="$srcdir/$pkgname-v$pkgver"
prepare() {
@@ -73,6 +71,5 @@ extra() {
}
sha512sums="
-7832ca02b77410edd8d80f10c6f1482dee944073518dbacd5773e70f27b7c632231ea66bdb64aa4611869465c15d2d60d364bfd25c2e40e0a2c198edbf9741cd btrfs-progs-v5.13.tar.xz
-4d382556df2956f4f98c33c503e711bd894be8e4728338e0a7cff33e3314926fbd0456e4841eb5826ebfb4700f6472a91bb73ef21a6eb84acad93bcc55b06fb5 fix-ppc64le.patch
+dc1a73e49dd94ccd8128c197d99f112977b16350d22bc0ca32247211314a3fec66de73827305bf24ef8e0571fc890f00378d0ec3a82988f0ee54f5db10f6578c btrfs-progs-v5.14.2.tar.xz
"
diff --git a/main/btrfs-progs/fix-ppc64le.patch b/main/btrfs-progs/fix-ppc64le.patch
deleted file mode 100644
index 8a8dbc1263..0000000000
--- a/main/btrfs-progs/fix-ppc64le.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Fix error: 'NAME_MAX' undeclared (first use in this function)
---- a/cmds/filesystem-usage.c
-+++ b/cmds/filesystem-usage.c
-@@ -24,6 +24,7 @@
- #include <stdarg.h>
- #include <getopt.h>
- #include <fcntl.h>
-+#include <limits.h>
-
- #include "common/utils.h"
- #include "kerncompat.h"
diff --git a/main/bubblewrap/APKBUILD b/main/bubblewrap/APKBUILD
index 17af9fcb11..b3fad96bde 100644
--- a/main/bubblewrap/APKBUILD
+++ b/main/bubblewrap/APKBUILD
@@ -1,15 +1,15 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=bubblewrap
-pkgver=0.4.1
-pkgrel=2
+pkgver=0.5.0
+pkgrel=0
pkgdesc="Unprivileged sandboxing tool"
url="https://github.com/containers/bubblewrap"
arch="all"
license="LGPL-2.0-or-later"
options="!check" # Testsuite fails
makedepends="autoconf automake libcap-dev docbook-xsl"
-subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
+subpackages="$pkgname-doc $pkgname-bash-completion $pkgname-zsh-completion"
source="bubblewrap-$pkgver.tar.gz::https://github.com/containers/bubblewrap/archive/v$pkgver.tar.gz"
# secfixes:
@@ -38,13 +38,6 @@ package() {
make install DESTDIR="$pkgdir"
}
-bashcomp() {
- pkgdesc="Bash completions for $pkgname"
- depends=""
- install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
- mkdir -p "$subpkgdir"/usr/share/
- mv "$pkgdir"/usr/share/bash-completion/ "$subpkgdir"/usr/share/
-}
-
-sha512sums="83e036e242503e1364b2d0052bba5127175891203c57bd22ba47a1b1e934fdca64ca620cd0e48c903fa2bc7cdcf92339b8a7fcb8716b54c2e28034b6d6f86adc bubblewrap-0.4.1.tar.gz"
+sha512sums="
+9d1faa02aaf78a8005d5f032cfc708d9823b5d110bd35f600a7d075122eeda785db72dd5c5e416a35ade437cd0ff9b176d24aea980971e304600e03c793d1865 bubblewrap-0.5.0.tar.gz
+"
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index 6e39de7417..f86833cabc 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox-initscripts
-pkgver=3.2
-pkgrel=2
+pkgver=3.3
+pkgrel=1
pkgdesc="Init scripts for busybox daemons"
url="https://git.alpinelinux.org/aports/tree/main/busybox-initscripts"
arch="noarch"
@@ -43,7 +43,8 @@ EOF
chmod +x "$pkgdir"/etc/acpi/PWRF/00000080
}
-sha512sums="dd548670114a92404b8e35fb915fdbe5994498b05b0a418583271c3dd72fb7800950e42c095c902a014eb198c046b8a346d43dccd8e7a158048ae33767c572ed acpid.initd
+sha512sums="
+dd548670114a92404b8e35fb915fdbe5994498b05b0a418583271c3dd72fb7800950e42c095c902a014eb198c046b8a346d43dccd8e7a158048ae33767c572ed acpid.initd
c9d0fb0f8cc27d661d3b4e58c56eb598ca368890576e18ffffd42efdf68ba35537656be9be319b2e2818aa0152d3ca8611bece2433512fbfcd4eed7988765549 crond.initd
612a7ffb475fd23d33b2a7266b621537ca59b4abd8cb5a9ce03771800ec4f7622a8ff380320f8d768291e4d1a68adfff28f369776a80125940ee40b2e4a5db4d dnsd.initd
66bfd7d2a03f4e8a50f08b7057091bfef8e36001eb7c07574ec45da6d75db05a88ae37dbd51e3e3fc7b00a784bf69f8416682ce0454ca16cc072358abdf4d2ce httpd.initd
@@ -63,9 +64,10 @@ b0ba67585f39d83320ed6de183d7463a0e163807b9f3dc6f0baa212236056f22aeb2c5399dfdcd54
bf8173ee33a5d2b61cbdbc1b070e599a17a21e5433a0d8aa9beef71e4ac831304076af8e7e58dc594cdee61562329793afdc57af91e5496bf5fffb9b734a3d9c syslog.confd
359af0a4a1841dd6557eaf3e71d39f0d7a2687bad6a8fc6ef436eccf72a40f85c6400a3b7880c7f64d8e460b6af8a0ff3dd5ffc3a4b1aa8eb0d8f7eaf99ee3e4 watchdog.confd
acbba3385fb2c416362eb9176f24146b617a2e394ee0e00b9eff89350f82468a5ab8396f4f52b0aaf03d341ac6150c73182e808fa3f29a2dc71c69271cdfb811 loadkmap.confd
-cb269ed1ede0714dfc767d03cc0253aed3b30cec74a19d792bad42b844a942941c7e9f2c54e12c85ae2ceef0f173d38b91fe2376d91ffd55b3093f5cf4341fe4 mdev.conf
+085a5a722183a0d5d99c3027efe3a213a009fb8adf4d0aaba85b6d54f180302505ca35a59369ed8601546ee70cd637c271558ad1a9bb731738b3a33ea03ac906 mdev.conf
ebd82f935da2ca89097234dd8a8f47e179a423652c151123a1f3343f3e1e7bfaba2b8800380e988d4e8f4294545d3a9ab6708ae2e77c5b108b5f091bbce8f94a dvbdev
0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec ide_links
b2dcf0ded9264334d79fbbb05dd12d649dc3119a060db5893f0e8aeca2141323961c3ba4c822a0ffb00dba848742d5cb374dc77e776b57cecde352a3e8e30f8a usbdev
392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 usbdisk_link
-5db6fa8bbb2d891212187c598cd8703277b3fcb95b5dba6628f7128eb48cc7c1bf4c53885e9d870999c8c95d2fe9cd27609b523596dc553c31b6f72a452a0118 xvd_links"
+5db6fa8bbb2d891212187c598cd8703277b3fcb95b5dba6628f7128eb48cc7c1bf4c53885e9d870999c8c95d2fe9cd27609b523596dc553c31b6f72a452a0118 xvd_links
+"
diff --git a/main/busybox-initscripts/mdev.conf b/main/busybox-initscripts/mdev.conf
index 5285139b53..e59c3ec26f 100644
--- a/main/busybox-initscripts/mdev.conf
+++ b/main/busybox-initscripts/mdev.conf
@@ -77,6 +77,9 @@ sequencer.* root:audio 0660 >sound/
SUBSYSTEM=sound;.* root:audio 0660
+# virtio-ports
+SUBSYSTEM=virtio-ports;vport.* root:root 0600 @mkdir -p virtio-ports; ln -s ../$MDEV virtio-ports/$(cat /sys/class/virtio-ports/$MDEV/name)
+
# misc stuff
agpgart root:root 0660 >misc/
psaux root:root 0660 >misc/
diff --git a/main/busybox/0001-echo-do-not-assume-that-free-leaves-errno-unmodified.patch b/main/busybox/0001-echo-do-not-assume-that-free-leaves-errno-unmodified.patch
deleted file mode 100644
index ab445baedf..0000000000
--- a/main/busybox/0001-echo-do-not-assume-that-free-leaves-errno-unmodified.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From ffd2a7e631ddf25ee7097fc64b45283f7f8910d3 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 21 Jan 2021 14:12:51 +0100
-Subject: [PATCH] echo: do not assume that free() leaves errno unmodified
-
-musl libc's mallocng free() may modify errno if kernel does not support
-MADV_FREE which causes echo to echo with error when it shouldn't.
-
-Future versions of POSIX[1] will require that free() leaves errno
-unmodified but til then, do not rely free() implementation.
-
-Should fix downstream issues:
-https://github.com/alpinelinux/docker-alpine/issues/134
-https://gitlab.alpinelinux.org/alpine/aports/-/issues/12311
-
-Bloatcheck on x86_64:
-
-function old new delta
-echo_main 414 406 -8
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-8) Total: -8
-bytes
- text data bss dec hex filename
- 881114 15196 2000 898310 db506 busybox_old
- 881106 15196 2000 898302 db4fe busybox_unstripped
----
- coreutils/echo.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/coreutils/echo.c b/coreutils/echo.c
-index b3828894c..002832ead 100644
---- a/coreutils/echo.c
-+++ b/coreutils/echo.c
-@@ -97,6 +97,7 @@ int echo_main(int argc UNUSED_PARAM, char **argv)
- #else
- char nflag = 1;
- char eflag = 0;
-+ int err;
-
- while ((arg = *++argv) != NULL) {
- char n, e;
-@@ -184,14 +185,12 @@ int echo_main(int argc UNUSED_PARAM, char **argv)
-
- do_write:
- /* Careful to error out on partial writes too (think ENOSPC!) */
-- errno = 0;
-- /*r =*/ full_write(STDOUT_FILENO, buffer, out - buffer);
-- free(buffer);
-- if (/*WRONG:r < 0*/ errno) {
-+ err = full_write(STDOUT_FILENO, buffer, out - buffer) != out - buffer;
-+ if (err) {
- bb_simple_perror_msg(bb_msg_write_error);
-- return 1;
- }
-- return 0;
-+ free(buffer);
-+ return err;
- }
-
- /*
---
-2.30.0
-
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
deleted file mode 100644
index ee2435542d..0000000000
--- a/main/busybox/0001-lineedit-fix-tab-completion-with-equal-sign.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/0001-properly-fix-wget-https-support.patch b/main/busybox/0001-properly-fix-wget-https-support.patch
index f628901c4b..7e59be7030 100644
--- a/main/busybox/0001-properly-fix-wget-https-support.patch
+++ b/main/busybox/0001-properly-fix-wget-https-support.patch
@@ -1,4 +1,4 @@
-From 50fff6ca286c9efcc43dbd25d672fee1e427b7c6 Mon Sep 17 00:00:00 2001
+From ad8843a3df89aabfa6ebae841de32f22a48c2166 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 30 May 2018 09:52:20 +0000
Subject: [PATCH] properly fix wget https support
@@ -9,18 +9,18 @@ See: https://git.alpinelinux.org/cgit/aports/commit/?id=1d0560a9b6b5597b191e5aff
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/networking/wget.c b/networking/wget.c
-index 6a8c08324..a39766a1f 100644
+index 6a9604421..96dd4c403 100644
--- a/networking/wget.c
+++ b/networking/wget.c
-@@ -51,7 +51,6 @@
- //it also enables FTPS support, but it's not well tested yet
+@@ -57,7 +57,6 @@
+ //config: bool "Support HTTPS using internal TLS code"
//config: default y
//config: depends on WGET
-//config: select TLS
//config: help
//config: wget will use internal TLS code to connect to https:// URLs.
- //config: Note:
-@@ -736,10 +735,8 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
+ //config: It also enables FTPS support, but it's not well tested yet.
+@@ -760,10 +759,8 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
int pid;
char *servername, *p;
@@ -33,7 +33,7 @@ index 6a8c08324..a39766a1f 100644
servername = xstrdup(host);
p = strrchr(servername, ':');
-@@ -756,14 +753,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
+@@ -780,14 +777,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
close(sp[0]);
xmove_fd(sp[1], 0);
xdup2(0, 1);
@@ -50,7 +50,7 @@ index 6a8c08324..a39766a1f 100644
xmove_fd(network_fd, 3);
argv[0] = (char*)"ssl_client";
-@@ -771,8 +768,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
+@@ -795,8 +792,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
//TODO: if (!is_ip_address(servername))...
argv[2] = (char*)"-n";
argv[3] = servername;
diff --git a/main/busybox/0001-rev-correct-output-for-long-input-lines.patch b/main/busybox/0001-rev-correct-output-for-long-input-lines.patch
new file mode 100644
index 0000000000..ba40a2f0a2
--- /dev/null
+++ b/main/busybox/0001-rev-correct-output-for-long-input-lines.patch
@@ -0,0 +1,91 @@
+From 4357569fdc7bc482dea0ef0bff57a70e7f06523c Mon Sep 17 00:00:00 2001
+From: Ron Yorston <rmy@pobox.com>
+Date: Sat, 21 Aug 2021 09:36:27 +0100
+Subject: rev: correct output for long input lines
+
+The input buffer is initialised to a reasonable size and extended
+if necessary. When this happened the offset into the buffer wasn't
+reset to zero so subsequent lines were appended to the long line.
+
+Fix this and add some tests.
+
+function old new delta
+rev_main 377 368 -9
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-9) Total: -9 bytes
+
+Signed-off-by: Ron Yorston <rmy@pobox.com>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ testsuite/rev.tests | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ util-linux/rev.c | 1 +
+ 2 files changed, 47 insertions(+)
+ create mode 100755 testsuite/rev.tests
+
+diff --git a/testsuite/rev.tests b/testsuite/rev.tests
+new file mode 100755
+index 000000000..dd65dcd3b
+--- /dev/null
++++ b/testsuite/rev.tests
+@@ -0,0 +1,46 @@
++#!/bin/sh
++# Copyright 2021 by Ron Yorston
++# Licensed under GPLv2, see file LICENSE in this source tree.
++
++. ./testing.sh
++
++# testing "test name" "commands" "expected result" "file input" "stdin"
++
++testing "rev works" \
++ "rev input" \
++"\
++1 enil
++
++3 enil
++" \
++ "line 1\n\nline 3\n" \
++ ""
++
++testing "rev file with missing newline" \
++ "rev input" \
++"\
++1 enil
++
++3 enil" \
++ "line 1\n\nline 3" \
++ ""
++
++testing "rev file with NUL character" \
++ "rev input" \
++"\
++nil
++3 enil
++" \
++ "lin\000e 1\n\nline 3\n" \
++ ""
++
++testing "rev file with long line" \
++ "rev input" \
++"\
+++--------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------
++cba
++" \
++ "---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+--------------+\nabc\n" \
++ ""
++
++exit $FAILCOUNT
+diff --git a/util-linux/rev.c b/util-linux/rev.c
+index d439b4da8..63b005c67 100644
+--- a/util-linux/rev.c
++++ b/util-linux/rev.c
+@@ -109,6 +109,7 @@ int rev_main(int argc UNUSED_PARAM, char **argv)
+ strrev(buf, strlen(buf));
+ #endif
+ fputs_stdout(buf);
++ pos = 0;
+ }
+ fclose(fp);
+ } while (*argv);
+--
+cgit v1.2.3
+
diff --git a/main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch b/main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
index ca558f8afb..964db5df6a 100644
--- a/main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
+++ b/main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
@@ -1,4 +1,4 @@
-From d4bc80ad7bf9b846b38c903a087c5ed318e848fb Mon Sep 17 00:00:00 2001
+From 3f44fe588d0d68ff5897928b65c0749505937d8d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 27 Dec 2016 20:46:59 +0100
Subject: [PATCH] app location for cpio, vi and lspci
@@ -11,7 +11,7 @@ Adjust location to where alpine linux installs them
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/archival/cpio.c b/archival/cpio.c
-index 221667112..a6d7630a4 100644
+index d84f6937d..29e7d396a 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -39,7 +39,7 @@
@@ -24,12 +24,12 @@ index 221667112..a6d7630a4 100644
//kbuild:lib-$(CONFIG_CPIO) += cpio.o
diff --git a/editors/vi.c b/editors/vi.c
-index f103e0dc0..89397710c 100644
+index 3e1bd0820..774da291f 100644
--- a/editors/vi.c
+++ b/editors/vi.c
-@@ -161,7 +161,7 @@
- //config: Unless you want more (or less) frequent "undo points" while typing,
- //config: you should probably leave this unchanged.
+@@ -176,7 +176,7 @@
+ //config: Enable more verbose reporting of the results of yank, change,
+ //config: delete, undo and substitution commands.
-//applet:IF_VI(APPLET(vi, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_VI(APPLET(vi, BB_DIR_USR_BIN, BB_SUID_DROP))
@@ -37,10 +37,10 @@ index f103e0dc0..89397710c 100644
//kbuild:lib-$(CONFIG_VI) += vi.o
diff --git a/util-linux/lspci.c b/util-linux/lspci.c
-index 0000fbfda..34189d2b5 100644
+index c22cbcc1e..70a623650 100644
--- a/util-linux/lspci.c
+++ b/util-linux/lspci.c
-@@ -16,7 +16,7 @@
+@@ -15,7 +15,7 @@
//config:
//config: This version uses sysfs (/sys/bus/pci/devices) only.
diff --git a/main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch b/main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch
index 086959468c..ea15834569 100644
--- a/main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch
+++ b/main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch
@@ -1,18 +1,41 @@
-From 38d7a4f9edda522ea504930ede17491a6c3253b3 Mon Sep 17 00:00:00 2001
+From 7f626404022bb69cd314e2eea33a721d75cc933d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 4 Aug 2016 11:08:35 +0200
+Date: Thu, 4 Aug 2016 12:46:55 +0200
Subject: [PATCH] udhcpc: set default discover retries to 5
Some slower nics needs more attempts to get a lease
---
- networking/udhcp/dhcpc.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ networking/udhcp/d6_dhcpc.c | 4 ++--
+ networking/udhcp/dhcpc.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
+index 8d11a7539..794441953 100644
+--- a/networking/udhcp/d6_dhcpc.c
++++ b/networking/udhcp/d6_dhcpc.c
+@@ -1135,7 +1135,7 @@ static void client_background(void)
+ //usage: "\n -s PROG Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
+ //usage: "\n -B Request broadcast replies"
+ //usage: "\n -t N Send up to N discover packets"
+-//usage: "\n -T SEC Pause between packets (default 3)"
++//usage: "\n -T SEC Pause between packets (default 5)"
+ //usage: "\n -A SEC Wait if lease is not obtained (default 20)"
+ //usage: USE_FOR_MMU(
+ //usage: "\n -b Background if lease is not obtained"
+@@ -1180,7 +1180,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
+ llist_t *list_x = NULL;
+ int tryagain_timeout = 20;
+ int discover_timeout = 3;
+- int discover_retries = 3;
++ int discover_retries = 5;
+ struct in6_addr srv6_buf;
+ struct in6_addr ipv6_buf;
+ struct in6_addr *requested_ipv6;
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
-index 102178a4f..1a0152d0c 100644
+index 331f13a8c..0c1b58d7c 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
-@@ -1165,7 +1165,7 @@ static void client_background(void)
+@@ -1173,7 +1173,7 @@ static void client_background(void)
//usage: "\n -p FILE Create pidfile"
//usage: "\n -B Request broadcast replies"
//usage: "\n -t N Send up to N discover packets (default 3)"
@@ -21,12 +44,12 @@ index 102178a4f..1a0152d0c 100644
//usage: "\n -A SEC Wait if lease is not obtained (default 20)"
//usage: USE_FOR_MMU(
//usage: "\n -b Background if lease is not obtained"
-@@ -1210,7 +1210,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
+@@ -1217,7 +1217,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
llist_t *list_x = NULL;
int tryagain_timeout = 20;
int discover_timeout = 3;
- int discover_retries = 3;
+ int discover_retries = 5;
- uint32_t server_addr = server_addr; /* for compiler */
+ uint32_t server_id = server_id; /* for compiler */
uint32_t requested_ip = 0;
- uint32_t xid = xid; /* for compiler */
+ int packet_num;
diff --git a/main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch b/main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
index 8d4a488014..523768bb94 100644
--- a/main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
+++ b/main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
@@ -1,6 +1,6 @@
-From a74c9074136192461b459df3f10a08ad416f4cb4 Mon Sep 17 00:00:00 2001
+From 0cd01228c1e4173683637c4e582448656b26c05f Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 6 Jul 2017 13:39:15 +0200
+Date: Thu, 6 Jul 2017 11:40:14 +0200
Subject: [PATCH] udhcpc: Don't background if -n is given
we need add -b to our udhcpc options to prevent boot forever if there are no
@@ -21,12 +21,12 @@ See also: https://bugs.busybox.net/11691
2 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
-index fc2d672b7..bf9363bac 100644
+index 8d11a7539..0284a0fd8 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
-@@ -1432,25 +1432,19 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
- }
+@@ -1401,25 +1401,19 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
leasefail:
+ change_listen_mode(LISTEN_NONE);
d6_run_script_no_option("leasefail");
+ if (opt & OPT_n) { /* abort if no lease */
+ bb_simple_info_msg("no lease, failing");
@@ -54,17 +54,17 @@ index fc2d672b7..bf9363bac 100644
+ opt = ((opt & ~OPT_b) | OPT_f);
}
+#endif
- /* wait before trying again */
+ /* Wait before trying again */
timeout = tryagain_timeout;
packet_num = 0;
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
-index 102178a4f..f20d3ddb9 100644
+index bbf95caca..8e034ac8a 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
-@@ -1438,25 +1438,19 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
- }
+@@ -1456,25 +1456,19 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
leasefail:
- udhcp_run_script(NULL, "leasefail");
+ change_listen_mode(LISTEN_NONE);
+ d4_run_script(NULL, "leasefail");
+ if (opt & OPT_n) { /* abort if no lease */
+ bb_simple_info_msg("no lease, failing");
+ retval = 1;
@@ -91,6 +91,6 @@ index 102178a4f..f20d3ddb9 100644
+ opt = ((opt & ~OPT_b) | OPT_f);
}
+#endif
- /* wait before trying again */
+ /* Wait before trying again */
timeout = tryagain_timeout;
packet_num = 0;
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index ecf9a3ce1e..71b0c9e79e 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.1
-pkgrel=4
+pkgver=1.34.1
+pkgrel=2
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
license="GPL-2.0-only"
makedepends_build="perl"
-makedepends_host="linux-headers openssl-dev libretls-dev"
+makedepends_host="linux-headers openssl1.1-compat-dev libretls-dev"
makedepends="$makedepends_build $makedepends_host"
checkdepends="zip"
provides="/bin/sh"
@@ -21,7 +21,8 @@ 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-rev-correct-output-for-long-input-lines.patch
+
0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
0001-properly-fix-wget-https-support.patch
@@ -36,7 +37,6 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
0010-Add-flag-for-not-following-symlinks-when-recursing.patch
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
0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch
@@ -89,9 +89,6 @@ build() {
${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
-
# build dynamic
cd "$_dyndir"
msg "Building dynamic busybox"
@@ -232,28 +229,27 @@ ifupdown() {
}
sha512sums="
-d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a busybox-1.33.1.tar.bz2
-84a6599d327d33350432d1f332006d8ce04363ecc53836a98a6180e0cc32fbc4f12c3f9f2b112a1cb2e787dce705b04562347d008465256e796c808433a188b6 0001-lineedit-fix-tab-completion-with-equal-sign.patch
+fb7e53a56c07b1098a12ee7232ad5401b147816648a0619b3b5358fdcf0915cfbb054500c0e0dd4acb3bc0a93a584b62bc5448e1f16b28004f58b39518a13b9d busybox-1.34.1.tar.bz2
+054e766429887e610c4a17846f495b7099bb419217f5fcc0dce0ed62b8740c2d4ee53b12a609b1830c26ac2af1eca9beb6140063b7d2665939f99f8664dfcc05 0001-rev-correct-output-for-long-input-lines.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
+1efe1c4894ae983fed5ac848125f8603f157b9d91c952c53f4192b48d3e50967e05559851148397b583f34fb02d480393547904b4635e4248248be567ab268ea 0001-properly-fix-wget-https-support.patch
d8694293edc8cd55cecafeb902f03c01af318e13966f399365cf792b840793891ac086bb67ef83e7a5a2e01b246497a6c6511cb6a856834f6672dee4bca76896 0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
8c34dd5ce9a6e84279fa6494cbae0b254778976f341af1d0ccc2a3afb405fb22d374e9623ea83d1500da77c7463db2ed5218d2c9f49350a21114bd0bb17fd87d 0003-ash-exec-busybox.static.patch
-e4be12a1453a306a58c4ea59cd8a0bf1f261514ae090ea962ac6f7609dc1e9dab0d4d8d351d7adf4f76bf52d37db9ad0102116635e437945c131f762d5750d19 0004-app-location-for-cpio-vi-and-lspci.patch
-095c5617ba7e9f1523deb77ae465e635c347bb2a0934038b91e779f8deb4d7c7ff9ccabbb3bf8a176e83a3994df74692b0f3547d39ff87678cc54b08c8124db0 0005-udhcpc-set-default-discover-retries-to-5.patch
+a8fc2ccced4054f5eff6ea00389906a543a1716202b19ab71fda1de0e6860c8377ed3c306ffb9efabe9fb16779a306da6770b871229f6bd1d725a84fdaa03fef 0004-app-location-for-cpio-vi-and-lspci.patch
+f12916e70f7cc1ef4f6d85d09b9a496a52a494e6318029fdce9a9c812ab5c7b2a046c33b66834127bf809f243c91a53c3c5e27efca026a96fe6b03421de26e60 0005-udhcpc-set-default-discover-retries-to-5.patch
89215c328a46afc686c458a133dd88dcda817586df60eb041a694715e73dc78a297fc0f9a92e8ee7d0a39ce7f6053a6b8e38f3ee078ff90ed13fac2608510105 0006-ping-make-ping-work-without-root-privileges.patch
7873b98c676a92faea61511d50c1efac1220354d20afd53de19e2c8f1472559cb333b9dd4e0d6432616d8c5f59885f1503c448c86a912e8031c9bfed628c2db1 0007-fbsplash-support-console-switching.patch
2c56906dac70dea6276e4c573707cb06c4c8b53defcd33b1e5a28f928e7dafe905a52ce40571de430e4af7e00a75ecc0f249d2fec02da5f3d9edd4e904919a35 0008-fbsplash-support-image-and-bar-alignment-and-positio.patch
df02adb3e3cd3349cc8d070911e3392164cb2e30bd72cae7ceaa974b2db6f958fdcedf809abc7b4bee37c729a4d20abf127f615b0e238a667d572137abe6a79e 0009-depmod-support-generating-kmod-binary-index-files.patch
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
+3ae5ecf3ea66c8d98762432026806fdb67b13a28075c6a3cb6e811a34ef89c2f0ed651946003aaad97fb4b7f74d132af3c394c114b7a72e1d20b319b739c5a6e 0012-udhcpc-Don-t-background-if-n-is-given.patch
d12246f1134bbd3993462d27172c4739cc601b251d57ce8e088745773afa965551236e8cb8b9013dfc142fd055e369a771d86c7c54615c89bd30393400bfa390 0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
6f8fa4ec190d64d6c3d5377994be933885ed0b40361c99ca35881684db3b1b79664d6eab56a389df290b9f6c4db502c617ec8e4ffa6d5284bd41cea1f478b26c 0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch
97109be04445b7b887c402b7072c1da57212ef11f2eca6d34c24d5a4e3b2866ee79aca7a0ca41043726293d9bed1b2fa8aab100501569f00b8670c280a87a01c 0002-cpio-add-support-for-renumber-inodes-like-GNU-cpio.patch
aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate
-9fc6424fb28e1fb5d6fba7a389ced7b8fdedb20ba418db22b5092de0db3faee9cedbccb14f9e9e1ff5f173e58ddc2d92417241bde0006fbdb99986f3fc397e01 busyboxconfig
-470a646505887dbf20dd8c3c3b5c8ab25f363f3a0bfbca577de115b8ec61f28e9843f4f3a7978c634e863dbf28bae987f20e7fa1aa529450ff6c17bc188cae53 busyboxconfig-extras
+e6549c9d5dbd272fe26b3e1347c84e31dbca3c57f141a345504a334c6f92016f3a3e43f3ee6777d5e382b8e6c8aeb095e11110b96c1aa2dee6c358df72c57ec4 busyboxconfig
+2471879bca825af30ab3342e0c3635499f98eeed69ec2353b01c6cea1b07fee8b6f8bd4746fd2944039aa32acdec1e0c93c344a788f2f5ba4056db6182af4c02 busyboxconfig-extras
0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c
6321c1d96d8938a3b5eab21731de289ede136fff550f98127c509452bfb17769ccf94b118491f7b81d3c60e1bbb3e80bb07186e4ce07e29724a52f0daba9b218 dad.if-up
646ad9aefe3596d0170d92c8506ca1846e43b5b83cbef97ae565f15ffa7b14665a8c7061bc69c608c043f834c134c5d63f042509f8999031e89163508a868e46 ssl_client.c
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index 49ccfc2bd4..579da5cdbf 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
-# Sat Jan 23 11:56:15 2021
+# Busybox version: 1.34.0
+# Sat Aug 21 11:29:32 2021
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -209,11 +209,13 @@ CONFIG_CHOWN=y
CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
CONFIG_CHROOT=y
CONFIG_CKSUM=y
+# CONFIG_CRC32 is not set
CONFIG_COMM=y
CONFIG_CP=y
CONFIG_FEATURE_CP_LONG_OPTIONS=y
CONFIG_FEATURE_CP_REFLINK=y
CONFIG_CUT=y
+# CONFIG_FEATURE_CUT_REGEX is not set
CONFIG_DATE=y
CONFIG_FEATURE_DATE_ISOFMT=y
# CONFIG_FEATURE_DATE_NANO is not set
@@ -318,7 +320,6 @@ CONFIG_TEST2=y
CONFIG_FEATURE_TEST_64=y
CONFIG_TIMEOUT=y
CONFIG_TOUCH=y
-CONFIG_FEATURE_TOUCH_NODEREF=y
CONFIG_FEATURE_TOUCH_SUSV3=y
CONFIG_TR=y
CONFIG_FEATURE_TR_CLASSES=y
@@ -426,6 +427,7 @@ CONFIG_VI=y
CONFIG_FEATURE_VI_MAX_LEN=4096
CONFIG_FEATURE_VI_8BIT=y
CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_COLON_EXPAND=y
CONFIG_FEATURE_VI_YANKMARK=y
CONFIG_FEATURE_VI_SEARCH=y
# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
@@ -439,6 +441,7 @@ CONFIG_FEATURE_VI_ASK_TERMINAL=y
CONFIG_FEATURE_VI_UNDO=y
CONFIG_FEATURE_VI_UNDO_QUEUE=y
CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
+# CONFIG_FEATURE_VI_VERBOSE_STATUS is not set
CONFIG_FEATURE_ALLOW_EXEC=y
#
@@ -746,6 +749,7 @@ CONFIG_FEATURE_VOLUMEID_XFS=y
# Miscellaneous Utilities
#
CONFIG_ADJTIMEX=y
+# CONFIG_ASCII is not set
CONFIG_BBCONFIG=y
CONFIG_FEATURE_COMPRESS_BBCONFIG=y
CONFIG_BC=y
@@ -841,6 +845,7 @@ CONFIG_TTYSIZE=y
# CONFIG_UBIRENAME is not set
CONFIG_VOLNAME=y
CONFIG_WATCHDOG=y
+CONFIG_FEATURE_WATCHDOG_OPEN_TWICE=y
#
# Networking Utilities
@@ -979,6 +984,7 @@ CONFIG_VCONFIG=y
CONFIG_WGET=y
CONFIG_FEATURE_WGET_LONG_OPTIONS=y
CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_FTP=y
CONFIG_FEATURE_WGET_AUTHENTICATION=y
CONFIG_FEATURE_WGET_TIMEOUT=y
CONFIG_FEATURE_WGET_HTTPS=y
@@ -1004,6 +1010,7 @@ CONFIG_FEATURE_UDHCPC6_RFC5970=y
#
# Common options for DHCP applets
#
+CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0"
# CONFIG_FEATURE_UDHCP_PORT is not set
CONFIG_UDHCP_DEBUG=0
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
@@ -1136,8 +1143,8 @@ CONFIG_ASH_VERSION_VAR=y
# CONFIG_SHELL_HUSH is not set
# CONFIG_HUSH_BASH_COMPAT is not set
# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_LINENO_VAR is not set
# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
+# CONFIG_HUSH_LINENO_VAR is not set
# CONFIG_HUSH_INTERACTIVE is not set
# CONFIG_HUSH_SAVEHISTORY is not set
# CONFIG_HUSH_JOB is not set
diff --git a/main/busybox/busyboxconfig-extras b/main/busybox/busyboxconfig-extras
index 78412c8c96..998b660723 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
-# Sat Jan 23 11:57:08 2021
+# Busybox version: 1.34.0
+# Sat Aug 21 11:30:37 2021
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -162,6 +162,8 @@ CONFIG_BZIP2_SMALL=0
# CONFIG_CPIO is not set
# CONFIG_FEATURE_CPIO_O is not set
# CONFIG_FEATURE_CPIO_P is not set
+# CONFIG_FEATURE_CPIO_IGNORE_DEVNO is not set
+# CONFIG_FEATURE_CPIO_RENUMBER_INODES is not set
# CONFIG_DPKG is not set
# CONFIG_DPKG_DEB is not set
# CONFIG_GZIP is not set
@@ -207,11 +209,13 @@ CONFIG_GZIP_FAST=0
# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
# CONFIG_CHROOT is not set
# CONFIG_CKSUM is not set
+# CONFIG_CRC32 is not set
# CONFIG_COMM is not set
# CONFIG_CP is not set
# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
# CONFIG_FEATURE_CP_REFLINK is not set
# CONFIG_CUT is not set
+# CONFIG_FEATURE_CUT_REGEX is not set
# CONFIG_DATE is not set
# CONFIG_FEATURE_DATE_ISOFMT is not set
# CONFIG_FEATURE_DATE_NANO is not set
@@ -312,7 +316,6 @@ CONFIG_GZIP_FAST=0
# CONFIG_FEATURE_TEST_64 is not set
# CONFIG_TIMEOUT is not set
# CONFIG_TOUCH is not set
-# CONFIG_FEATURE_TOUCH_NODEREF is not set
# CONFIG_FEATURE_TOUCH_SUSV3 is not set
# CONFIG_TR is not set
# CONFIG_FEATURE_TR_CLASSES is not set
@@ -408,6 +411,7 @@ CONFIG_DEFAULT_SETFONT_DIR=""
CONFIG_FEATURE_VI_MAX_LEN=0
# CONFIG_FEATURE_VI_8BIT is not set
# CONFIG_FEATURE_VI_COLON is not set
+# CONFIG_FEATURE_VI_COLON_EXPAND is not set
# CONFIG_FEATURE_VI_YANKMARK is not set
# CONFIG_FEATURE_VI_SEARCH is not set
# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
@@ -421,6 +425,7 @@ CONFIG_FEATURE_VI_MAX_LEN=0
# CONFIG_FEATURE_VI_UNDO is not set
# CONFIG_FEATURE_VI_UNDO_QUEUE is not set
CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0
+# CONFIG_FEATURE_VI_VERBOSE_STATUS is not set
# CONFIG_FEATURE_ALLOW_EXEC is not set
#
@@ -720,6 +725,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
# Miscellaneous Utilities
#
# CONFIG_ADJTIMEX is not set
+# CONFIG_ASCII is not set
# CONFIG_BBCONFIG is not set
# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
# CONFIG_BC is not set
@@ -815,6 +821,7 @@ CONFIG_READAHEAD=y
# CONFIG_UBIRENAME is not set
# CONFIG_VOLNAME is not set
# CONFIG_WATCHDOG is not set
+# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set
#
# Networking Utilities
@@ -953,6 +960,7 @@ CONFIG_FEATURE_TFTP_BLOCKSIZE=y
# CONFIG_WGET is not set
# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
# CONFIG_FEATURE_WGET_STATUSBAR is not set
+# CONFIG_FEATURE_WGET_FTP is not set
# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
# CONFIG_FEATURE_WGET_TIMEOUT is not set
# CONFIG_FEATURE_WGET_HTTPS is not set
@@ -978,12 +986,13 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT=""
#
# Common options for DHCP applets
#
+CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0"
# CONFIG_FEATURE_UDHCP_PORT is not set
CONFIG_UDHCP_DEBUG=0
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
CONFIG_FEATURE_UDHCP_RFC3397=y
CONFIG_FEATURE_UDHCP_8021Q=y
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R"
#
# Print Utilities
@@ -1104,13 +1113,14 @@ CONFIG_BASH_IS_NONE=y
# CONFIG_ASH_HELP is not set
# CONFIG_ASH_GETOPTS is not set
# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_VERSION_VAR is not set
# CONFIG_CTTYHACK is not set
# CONFIG_HUSH is not set
# CONFIG_SHELL_HUSH is not set
# CONFIG_HUSH_BASH_COMPAT is not set
# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_LINENO_VAR is not set
# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
+# CONFIG_HUSH_LINENO_VAR is not set
# CONFIG_HUSH_INTERACTIVE is not set
# CONFIG_HUSH_SAVEHISTORY is not set
# CONFIG_HUSH_JOB is not set
diff --git a/main/byacc/APKBUILD b/main/byacc/APKBUILD
index 6f37c29165..ee1276c26c 100644
--- a/main/byacc/APKBUILD
+++ b/main/byacc/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
pkgname=byacc
-pkgver=20210328
+pkgver=20210808
pkgrel=0
pkgdesc="The Berkeley Yacc general-purpose parser generator"
url="https://invisible-island.net/byacc/byacc.html"
@@ -29,4 +29,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="fdcf98976524c1f37710cf9551a357ebc24ece94dd2bd10501d4fafb914a7ab4847926b99647e387f22a3d3206e6a4bfc14a4c41115702382fcc1d6f688f9dae byacc-20210328.tgz"
+sha512sums="
+cde092dbd845364752aca228a838b97fc34378c7dd7f860c614d13c8ec7167b8416422ded82864d22e8c3c447b47b30abca591ef8ab667c49f9fa070d68114c4 byacc-20210808.tgz
+"
diff --git a/main/c-ares/APKBUILD b/main/c-ares/APKBUILD
index 8b0d659a63..5977622f51 100644
--- a/main/c-ares/APKBUILD
+++ b/main/c-ares/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=c-ares
-pkgver=1.17.1
-pkgrel=1
+pkgver=1.17.2
+pkgrel=0
pkgdesc="An asynchronously DNS/names resolver library"
url="https://c-ares.haxx.se/"
arch="all"
@@ -11,6 +11,10 @@ license="MIT"
subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
source="https://c-ares.haxx.se/download/c-ares-$pkgver.tar.gz"
+# secfixes:
+# 1.17.2-r0:
+# - CVE-2021-3672
+
build() {
./configure \
--build=$CBUILD \
@@ -36,4 +40,6 @@ package() {
make -j1 DESTDIR="$pkgdir" install
}
-sha512sums="b11887bcc9274d368088e1a8b6aca62414f20675cf0bc58e948f54fa04c327c39dd23cefe7509eec6397db14b550a3f6b77f5c18b3d735b3eef48ce2da1dcd00 c-ares-1.17.1.tar.gz"
+sha512sums="
+f625e0ef8508af6475d3e83b51ab29be8a4878e2a87e7f518bea046b76a74bfde7043ca6ec2a9e714c898ab9e5d4a5a678c3347a9f9eb68980438f7ca8ae3fc8 c-ares-1.17.2.tar.gz
+"
diff --git a/main/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD
index c2f84505b3..6a4d7ab8d6 100644
--- a/main/ca-certificates/APKBUILD
+++ b/main/ca-certificates/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ca-certificates
pkgver=20191127
-pkgrel=5
+pkgrel=7
pkgdesc="Common CA certificates PEM files from Mozilla"
url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/"
arch="all"
# There is a GPL-2.0-or-later script inside the source but it is not shipped
license="MPL-2.0 AND MIT"
makedepends_build="perl"
-makedepends_host="openssl-dev"
+makedepends_host="openssl1.1-compat-dev"
subpackages="$pkgname-doc $pkgname-bundle"
# c_rehash is either in libcrypto1.0 or openssl depending on package, grr. replace both of them
replaces="libcrypto1.0 openssl openssl1.0"
diff --git a/main/cgit/APKBUILD b/main/cgit/APKBUILD
index 51b2c319be..930ead579d 100644
--- a/main/cgit/APKBUILD
+++ b/main/cgit/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cgit
pkgver=1.2.3
-pkgrel=0
+pkgrel=2
_gitver=2.25.1
pkgdesc="A fast webinterface for git"
url="https://git.zx2c4.com/cgit/"
arch="all"
license="GPL-2.0-only"
-makedepends="openssl-dev zlib-dev lua5.3-dev asciidoc"
+makedepends="openssl1.1-compat-dev zlib-dev lua5.3-dev asciidoc"
subpackages="$pkgname-doc"
source="http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz
https://www.kernel.org/pub/software/scm/git/git-$_gitver.tar.gz
diff --git a/main/charybdis/APKBUILD b/main/charybdis/APKBUILD
index 64f7879919..1e1d7284ab 100644
--- a/main/charybdis/APKBUILD
+++ b/main/charybdis/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=charybdis
pkgver=4.1.2
-pkgrel=2
+pkgrel=4
pkgdesc="A highly-scalable IRCv3-compliant IRC daemon"
url="https://github.com/charybdis-ircd/charybdis"
arch="all"
license="GPL-2.0-or-later"
pkgusers="ircd"
makedepends="automake autoconf libtool
- bison flex openssl-dev zlib-dev file
+ bison flex openssl1.1-compat-dev zlib-dev file
sqlite-dev libltdl"
install="$pkgname.pre-install"
subpackages="$pkgname-openrc"
diff --git a/main/checkbashisms/APKBUILD b/main/checkbashisms/APKBUILD
index bfa337689c..6d4e28f334 100644
--- a/main/checkbashisms/APKBUILD
+++ b/main/checkbashisms/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=checkbashisms
-pkgver=2.21.2
+pkgver=2.21.4
pkgrel=0
pkgdesc="Check shell scripts for POXIX compliance"
url="https://tracker.debian.org/pkg/devscripts"
@@ -29,5 +29,5 @@ package() {
}
sha512sums="
-a6765d807dc0c2ef7a3d8c59e1262bfe7542c3ca52cda3c1910af253925cb105a9d1bf272c76a86f0b3cdda9c8a4e2d29a660437f73087dd70ee8a444bbedb01 devscripts_2.21.2.tar.xz
+99250737cabc24bbd21e20de7c787e182492e15cad4288226ed497349cbf3dd45927e1c501d73341e48dfd14ee2285c8cca8ac3b2145c2f02ce4d04ddb881e50 devscripts_2.21.4.tar.xz
"
diff --git a/main/cifs-utils/APKBUILD b/main/cifs-utils/APKBUILD
index 7caf96d1fb..ef5f32ab84 100644
--- a/main/cifs-utils/APKBUILD
+++ b/main/cifs-utils/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=cifs-utils
-pkgver=6.13
+pkgver=6.14
pkgrel=0
pkgdesc="CIFS filesystem user-space tools"
url="https://wiki.samba.org/index.php/LinuxCIFS_utils"
@@ -44,6 +44,8 @@ package() {
chmod +s $pkgdir/sbin/mount.cifs
}
-sha512sums="1337ac4b69f0c3e8d0241eb608207ba81dfa35f84c661649d25da78637882c4d73467b0f632be0bd120362e0b786e40eb340bffcf21c8a09629c441100fd10de cifs-utils-6.13.tar.bz2
+sha512sums="
+dd875e110988f84ac766900426e1a75c043607de1f24b87e95cd942f2f58561e1133d16466f02863643c8395fc0160df4050636d1ce0db005f2e52a592c7f0ab cifs-utils-6.14.tar.bz2
99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch
-2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch"
+2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch
+"
diff --git a/main/cjson/APKBUILD b/main/cjson/APKBUILD
index 35a7ba793a..9fbdcb0837 100644
--- a/main/cjson/APKBUILD
+++ b/main/cjson/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer:
pkgname=cjson
-pkgver=1.7.14
-pkgrel=1
+pkgver=1.7.15
+pkgrel=0
pkgdesc="Lighweight JSON parser in C"
url="https://github.com/DaveGamble/cJSON"
arch="all"
@@ -35,4 +35,6 @@ package() {
DESTDIR="$pkgdir" cmake --build build --target install
}
-sha512sums="8de1dedc123ed025a9cbe6764e5963eb0550f726d06a8f6bedfe05b84e852cd9c1587cd381669663073967f42be894a535ba239013f304ce544c3b15a6477c01 cjson-1.7.14.tar.gz"
+sha512sums="
+0b32a758c597fcc90c8ed0af493c9bccd611b9d4f9a03e87de3f7337bb9a28990b810befd44bc321a0cb42cbcd0b026d45761f9bab7bd798f920b7b6975fb124 cjson-1.7.15.tar.gz
+"
diff --git a/main/ckbcomp/APKBUILD b/main/ckbcomp/APKBUILD
index e93c2ebca4..57505b252e 100644
--- a/main/ckbcomp/APKBUILD
+++ b/main/ckbcomp/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ckbcomp
-pkgver=1.204
+pkgver=1.205
pkgrel=0
pkgdesc="Compile a XKB keyboard description to a keymap"
url="https://packages.debian.org/sid/console-setup"
@@ -18,5 +18,5 @@ package() {
}
sha512sums="
-f1be4ad00405cb0a7129b9db56fa7144e052767cbfa012b525fe542a8356790500b9a94033eb92d57b4eaf2422b34c0bbb930ac0f21ee5e55051c2148ca25132 console-setup_1.204.tar.xz
+757643f040542fda2903ffaa35a311c6c572b4c1e9c6c169a032e85a360bfe7d64e66ad66fba988515a4c1004ae4ecb45a40fba5c0a9eec6bd58abc1e0624b15 console-setup_1.205.tar.xz
"
diff --git a/main/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch b/main/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
new file mode 100644
index 0000000000..939a50dd09
--- /dev/null
+++ b/main/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
@@ -0,0 +1,98 @@
+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>
+
+--- a/lib/Driver/ToolChains/Linux.h
++++ b/lib/Driver/ToolChains/Linux.h
+@@ -11,6 +11,7 @@
+
+ #include "Gnu.h"
+ #include "clang/Driver/ToolChain.h"
++#include "clang/Basic/LangOptions.h"
+
+ namespace clang {
+ namespace driver {
+@@ -38,6 +39,18 @@
+ CXXStdlibType GetDefaultCXXStdlibType() const override;
+ bool isPIEDefault() const override;
+ bool isNoExecStackDefault() const override;
++
++ LangOptions::StackProtectorMode
++ GetDefaultStackProtectorLevel(bool KernelOrKext) const override {
++ StringRef VendorName = Linux::getTriple().getVendorName();
++ if (VendorName.compare("alpine") == 0)
++ return LangOptions::SSPStrong;
++
++ return LangOptions::SSPOff;
++ }
++
++
++
+ bool IsMathErrnoDefault() const override;
+ SanitizerMask getSupportedSanitizers() const override;
+ void addProfileRTLibs(const llvm::opt::ArgList &Args,
+--- a/lib/Driver/ToolChains/Linux.cpp
++++ b/lib/Driver/ToolChains/Linux.cpp
+@@ -832,8 +832,7 @@
+ }
+
+ bool Linux::isPIEDefault() const {
+- return (getTriple().isAndroid() && !getTriple().isAndroidVersionLT(16)) ||
+- getTriple().isMusl() || getSanitizerArgs().requiresPIE();
++ return Generic_ELF::IsMathErrnoDefault();
+ }
+
+ bool Linux::isNoExecStackDefault() const {
+--- a/test/Driver/fsanitize.c
++++ b/test/Driver/fsanitize.c
+@@ -667,18 +667,17 @@
+ // RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
+ // NOSP-NOT: "-fsanitize=safe-stack"
+
+-// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
++// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang -target x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN
+ // RUN: %clang -target x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP
+-// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
+-// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
++// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
++// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang -target i386-contiki-unknown -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
+ // NO-SP-NOT: stack-protector
+ // NO-SP: "-fsanitize=safe-stack"
+ // SP-ASAN: error: invalid argument '-fsanitize=safe-stack' not allowed with '-fsanitize=address'
+ // SP: "-fsanitize=safe-stack"
+-// SP: -stack-protector
+ // NO-SP-NOT: stack-protector
+
+ // RUN: %clang -target powerpc64-unknown-linux-gnu -fsanitize=memory %s -### 2>&1 | FileCheck %s -check-prefix=CHECK-SANM
+--- a/test/Driver/stack-protector.c
++++ b/test/Driver/stack-protector.c
+@@ -35,6 +35,20 @@
+
+ // Test default stack protector values for Darwin platforms
+
++// RUN: %clang -target x86_64-alpine-linux-musl -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE
++// ALPINE: "-stack-protector" "2"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_SPS
++// ALPINE_SPS: "-stack-protector" "2"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_ALL
++// ALPINE_ALL: "-stack-protector" "3"
++// ALPINE_ALL-NOT: "-stack-protector-buffer-size"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fno-stack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_NOSSP
++// ALPINE_NOSSP-NOT: "-stack-protector"
++// ALPINE_NOSSP-NOT: "-stack-protector-buffer-size"
++
+ // RUN: %clang -target armv7k-apple-watchos2.0 -### %s 2>&1 | FileCheck %s -check-prefix=SSP_WATCHOS
+ // RUN: %clang -ffreestanding -target armv7k-apple-watchos2.0 -### %s 2>&1 | FileCheck %s -check-prefix=SSP_WATCHOS
+ // SSP_WATCHOS: "-stack-protector" "1"
+@@ -53,3 +67,4 @@
+ // RUN: %clang -ffreestanding -target x86_64-apple-darwin10 -mmacosx-version-min=10.6 -### %s 2>&1 | FileCheck %s -check-prefix=SSP_MACOSX_10_6_KERNEL
+ // SSP_MACOSX_10_6_KERNEL: "-stack-protector" "1"
+
++// SP: -stack-protector
diff --git a/main/clang/APKBUILD b/main/clang/APKBUILD
index 6a0dbe76e9..ed020d26fe 100644
--- a/main/clang/APKBUILD
+++ b/main/clang/APKBUILD
@@ -5,8 +5,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=clang
# Note: Update together with llvm.
-pkgver=11.1.0
-pkgrel=1
+pkgver=12.0.1
+pkgrel=0
_llvmver=${pkgver%%.*}
pkgdesc="A C language family front-end for LLVM"
arch="all"
@@ -37,16 +37,18 @@ subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs
source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-$pkgver.src.tar.xz
https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-tools-extra-$pkgver.src.tar.xz
10-add-musl-triples.patch
- 20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+ 30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
40-fix-ld-name-on-x86.patch
"
builddir="$srcdir/clang-$pkgver.src"
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,' {} +
+ # Substitute python hashbangs with python3.
+ # Some scripts do not have a *.py postfix, thus iterate over all files.
+ grep -l -R "^#!/usr/bin/env python$" . | while read f; do
+ sed -i "$f" -e 's|^#!/usr/bin/env python$|&3|'
+ done
default_prepare
}
@@ -175,8 +177,8 @@ python() {
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
}
-sha512sums="f4bb7e4ded61f2c489e01310432d8e062eba992d992ed65ca2e69a7c20eb5d0c90e81968baaa71c01ac9d96f814a2dcca4ef8f8bfac4cef6d7907ecece097dac clang-11.1.0.src.tar.xz
-b629b8b8c0a3390bb6cd2ce609242a6f97feea9509145a2eb5566d09359cee56fc510f21f5f8d1508ff5d612ecb9176572e6358c01cd8590fc799898c34873b6 clang-tools-extra-11.1.0.src.tar.xz
+sha512sums="405011f0974b239427ca87c65e7485709c77705a9b7d51d679fe2abec79865f8c51c7ab085b4e6bf7aa4d0eade4b1438d88dd5feb56b434dc5d718ebf5715efa clang-12.0.1.src.tar.xz
+be4975c81c83f98deb5f6e0cc170fb6740bc46396d5bd8f25b55270ed874bb099b6d6f0e413617396f5ab67182314735580f44be1913d9be44ae288cf8c4fd7c clang-tools-extra-12.0.1.src.tar.xz
90d61072676b283192fd24804cce7b246acfee418c68c42cc299db6a0605a7d1b5460d5817ea4ea715d94fa6d067dc445673b3949133c1f05957448b9738cc84 10-add-musl-triples.patch
-80af662d9e02f6164ffc1ab70e652b27d7aea3d738d045a87369dd3287506a8eb6a7f5918afb5651b21dcedccde64c8a148bc1cadcacedb1ca532de8c1401dfb 20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
-32add4879375d47a0a6055bc45073dc1bfd06a823e59f62cc8c5cdf762393e39a923b3c5b432972f84c294773585c684f623a8ede43a8044de4f3fe9d89e40cb 40-fix-ld-name-on-x86.patch"
+32add4879375d47a0a6055bc45073dc1bfd06a823e59f62cc8c5cdf762393e39a923b3c5b432972f84c294773585c684f623a8ede43a8044de4f3fe9d89e40cb 40-fix-ld-name-on-x86.patch
+46c7419b02f0755d12d4577b18b5a959393937622b67de10806c38c81d01c7b53606a78fdf031cb6a244365c3f8e216f06376f3636c2a2eb460b2a1f9d39d324 30-Enable-stack-protector-by-default-for-Alpine-Linux.patch"
diff --git a/main/clucene/APKBUILD b/main/clucene/APKBUILD
index 1d18a00993..639ff5b405 100644
--- a/main/clucene/APKBUILD
+++ b/main/clucene/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=clucene
pkgver=2.3.3.4
-pkgrel=9
+pkgrel=10
pkgdesc="A C++ port of Lucene"
url="http://www.sourceforge.net/projects/clucene"
arch="all"
diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD
index d9fcc22f20..6d89f25a57 100644
--- a/main/cmake/APKBUILD
+++ b/main/cmake/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cmake
-pkgver=3.21.0
+pkgver=3.21.3
pkgrel=0
pkgdesc="Cross-platform, open-source make system"
url="https://www.cmake.org/"
@@ -57,5 +57,5 @@ package() {
make DESTDIR="$pkgdir" install
}
sha512sums="
-b635c50db0d3a18392a84b24f14017bb625708bcc6f6ba2d749a5c37d45f5e0565e415a802d129090a18e0747f80f2640747650d28fa0b3069d28e3e6a735ebc cmake-3.21.0.tar.gz
+0571b78443906c5ad51fb0fafbd32d565caf628cc150b1190802cb819e8497c108ea6b7ecaa03133df2dbbceb730696d24b4df38468c92088c769ce4076d9e9f cmake-3.21.3.tar.gz
"
diff --git a/main/compiler-rt/APKBUILD b/main/compiler-rt/APKBUILD
index cd98622410..bc1c288559 100644
--- a/main/compiler-rt/APKBUILD
+++ b/main/compiler-rt/APKBUILD
@@ -3,11 +3,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=compiler-rt
# Note: Update together with llvm.
-pkgver=11.1.0
+pkgver=12.0.1
pkgrel=1
_llvmver=${pkgver%%.*}
pkgdesc="LLVM compiler-rt runtime libraries"
-arch="aarch64 armv7 x86 x86_64"
+arch="all"
url="https://llvm.org/"
license="Apache-2.0"
makedepends="
@@ -23,7 +23,10 @@ checkdepends="gtest-dev llvm-test-utils>=$_llvmver"
subpackages="$pkgname-static"
options="!check" # Doesn't seem to work with linux ld: /lib/ld-musl-x86_64.so.1: cannot load --version: No such file or directory
source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/compiler-rt-$pkgver.src.tar.xz
- https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz"
+ https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz
+ disable-sanitizer-common.patch
+ replace-size_t-std-size-t.patch"
+
builddir="$srcdir/$pkgname-$pkgver.src"
build() {
@@ -72,5 +75,7 @@ package() {
esac
}
-sha512sums="9b0b259cc43d5e4d20200676be153de81b485b3fdf065623ff71c7e1894ec5c8ed9d99c1416f70246ab0f417cbba6d1d4af9f3769e2e6577400681a791346231 compiler-rt-11.1.0.src.tar.xz
-07bf9973384151a18d5cc2892103e5f28a88c632e8e49662fde56d123632f2ed1b3710fa7a87b6b821955d0ec44160ff36f2aa4f233e389e14d628e9bf8dc764 llvm-11.1.0.src.tar.xz"
+sha512sums="708780aa47ef289a9700eb76c17cc1f3bab19b8245174e612b5f684c48448030263a72eeef1021b10bdffa6ace2df489adcbba9e7a790ccbcd5fe72056f63f92 compiler-rt-12.0.1.src.tar.xz
+ff674afb4c8eea699a4756f1bb463f15098a7fa354c733de83c024f8f0cf238cd5f19ae3ec446831c7109235e293e2bf31d8562567ede163c8ec53af7306ba0f llvm-12.0.1.src.tar.xz
+b099dac8ab1da41a3bd12df1ceb2ff6a46e41a82db31f3444fdca1de1e0565131a612cd375e721f894a7da2df1a90a99b53c983b45914d18a8ee6f99a3ec563f disable-sanitizer-common.patch
+78181b4ea227f30c1c06d12059cf0746bd0ed430f5e2e9752eaa4d59bebc7ee5e3a78df167ff0fdf68562609e5f3ee8ab8a10fa76f42c9f0d5a6836853add6e7 replace-size_t-std-size-t.patch"
diff --git a/main/compiler-rt/disable-sanitizer-common.patch b/main/compiler-rt/disable-sanitizer-common.patch
new file mode 100644
index 0000000000..0036c3acc0
--- /dev/null
+++ b/main/compiler-rt/disable-sanitizer-common.patch
@@ -0,0 +1,12 @@
+Sanitizer code appears broken on arm and 32bit x86
+--- a/cmake/config-ix.cmake
++++ b/cmake/config-ix.cmake
+@@ -649,7 +649,7 @@
+ (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|Fuchsia|SunOS" OR
+ (OS_NAME MATCHES "Windows" AND NOT CYGWIN AND
+ (NOT MINGW OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"))))
+- set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)
++ set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)
+ else()
+ set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)
+ endif()
diff --git a/main/compiler-rt/replace-size_t-std-size-t.patch b/main/compiler-rt/replace-size_t-std-size-t.patch
new file mode 100644
index 0000000000..d18d91fb9f
--- /dev/null
+++ b/main/compiler-rt/replace-size_t-std-size-t.patch
@@ -0,0 +1,139 @@
+--- a/lib/fuzzer/FuzzerInterceptors.cpp
++++ b/lib/fuzzer/FuzzerInterceptors.cpp
+@@ -59,8 +59,8 @@
+ }
+
+ static int internal_strcmp_strncmp(const char *s1, const char *s2, bool strncmp,
+- size_t n) {
+- size_t i = 0;
++ std::size_t n) {
++ std::size_t i = 0;
+ while (true) {
+ if (strncmp) {
+ if (i == n)
+@@ -79,7 +79,7 @@
+ return 0;
+ }
+
+-static int internal_strncmp(const char *s1, const char *s2, size_t n) {
++static int internal_strncmp(const char *s1, const char *s2, std::size_t n) {
+ return internal_strcmp_strncmp(s1, s2, true, n);
+ }
+
+@@ -87,17 +87,17 @@
+ return internal_strcmp_strncmp(s1, s2, false, 0);
+ }
+
+-static int internal_memcmp(const void *s1, const void *s2, size_t n) {
++static int internal_memcmp(const void *s1, const void *s2, std::size_t n) {
+ const uint8_t *t1 = static_cast<const uint8_t *>(s1);
+ const uint8_t *t2 = static_cast<const uint8_t *>(s2);
+- for (size_t i = 0; i < n; ++i, ++t1, ++t2)
++ for (std::size_t i = 0; i < n; ++i, ++t1, ++t2)
+ if (*t1 != *t2)
+ return *t1 < *t2 ? -1 : 1;
+ return 0;
+ }
+
+-static size_t internal_strlen(const char *s) {
+- size_t i = 0;
++static std::size_t internal_strlen(const char *s) {
++ std::size_t i = 0;
+ while (s[i])
+ i++;
+ return i;
+@@ -105,11 +105,11 @@
+
+ static char *internal_strstr(const char *haystack, const char *needle) {
+ // This is O(N^2), but we are not using it in hot places.
+- size_t len1 = internal_strlen(haystack);
+- size_t len2 = internal_strlen(needle);
++ std::size_t len1 = internal_strlen(haystack);
++ std::size_t len2 = internal_strlen(needle);
+ if (len1 < len2)
+ return nullptr;
+- for (size_t pos = 0; pos <= len1 - len2; pos++) {
++ for (std::size_t pos = 0; pos <= len1 - len2; pos++) {
+ if (internal_memcmp(haystack + pos, needle, len2) == 0)
+ return const_cast<char *>(haystack) + pos;
+ }
+@@ -121,11 +121,11 @@
+ // Weak hooks forward-declared to avoid dependency on
+ // <sanitizer/common_interface_defs.h>.
+ void __sanitizer_weak_hook_memcmp(void *called_pc, const void *s1,
+- const void *s2, size_t n, int result);
++ const void *s2, std::size_t n, int result);
+ void __sanitizer_weak_hook_strncmp(void *called_pc, const char *s1,
+- const char *s2, size_t n, int result);
++ const char *s2, std::size_t n, int result);
+ void __sanitizer_weak_hook_strncasecmp(void *called_pc, const char *s1,
+- const char *s2, size_t n, int result);
++ const char *s2, std::size_t n, int result);
+ void __sanitizer_weak_hook_strcmp(void *called_pc, const char *s1,
+ const char *s2, int result);
+ void __sanitizer_weak_hook_strcasecmp(void *called_pc, const char *s1,
+@@ -134,20 +134,20 @@
+ const char *s2, char *result);
+ void __sanitizer_weak_hook_strcasestr(void *called_pc, const char *s1,
+ const char *s2, char *result);
+-void __sanitizer_weak_hook_memmem(void *called_pc, const void *s1, size_t len1,
+- const void *s2, size_t len2, void *result);
++void __sanitizer_weak_hook_memmem(void *called_pc, const void *s1, std::size_t len1,
++ const void *s2, std::size_t len2, void *result);
+
+-DEFINE_REAL(int, bcmp, const void *, const void *, size_t)
+-DEFINE_REAL(int, memcmp, const void *, const void *, size_t)
+-DEFINE_REAL(int, strncmp, const char *, const char *, size_t)
++DEFINE_REAL(int, bcmp, const void *, const void *, std::size_t)
++DEFINE_REAL(int, memcmp, const void *, const void *, std::size_t)
++DEFINE_REAL(int, strncmp, const char *, const char *, std::size_t)
+ DEFINE_REAL(int, strcmp, const char *, const char *)
+-DEFINE_REAL(int, strncasecmp, const char *, const char *, size_t)
++DEFINE_REAL(int, strncasecmp, const char *, const char *, std::size_t)
+ DEFINE_REAL(int, strcasecmp, const char *, const char *)
+ DEFINE_REAL(char *, strstr, const char *, const char *)
+ DEFINE_REAL(char *, strcasestr, const char *, const char *)
+-DEFINE_REAL(void *, memmem, const void *, size_t, const void *, size_t)
++DEFINE_REAL(void *, memmem, const void *, std::size_t, const void *, std::size_t)
+
+-ATTRIBUTE_INTERFACE int bcmp(const char *s1, const char *s2, size_t n) {
++ATTRIBUTE_INTERFACE int bcmp(const char *s1, const char *s2, std::size_t n) {
+ if (!FuzzerInited)
+ return internal_memcmp(s1, s2, n);
+ int result = REAL(bcmp)(s1, s2, n);
+@@ -155,7 +155,7 @@
+ return result;
+ }
+
+-ATTRIBUTE_INTERFACE int memcmp(const void *s1, const void *s2, size_t n) {
++ATTRIBUTE_INTERFACE int memcmp(const void *s1, const void *s2, std::size_t n) {
+ if (!FuzzerInited)
+ return internal_memcmp(s1, s2, n);
+ int result = REAL(memcmp)(s1, s2, n);
+@@ -163,7 +163,7 @@
+ return result;
+ }
+
+-ATTRIBUTE_INTERFACE int strncmp(const char *s1, const char *s2, size_t n) {
++ATTRIBUTE_INTERFACE int strncmp(const char *s1, const char *s2, std::size_t n) {
+ if (!FuzzerInited)
+ return internal_strncmp(s1, s2, n);
+ int result = REAL(strncmp)(s1, s2, n);
+@@ -179,7 +179,7 @@
+ return result;
+ }
+
+-ATTRIBUTE_INTERFACE int strncasecmp(const char *s1, const char *s2, size_t n) {
++ATTRIBUTE_INTERFACE int strncasecmp(const char *s1, const char *s2, std::size_t n) {
+ ensureFuzzerInited();
+ int result = REAL(strncasecmp)(s1, s2, n);
+ __sanitizer_weak_hook_strncasecmp(GET_CALLER_PC(), s1, s2, n, result);
+@@ -209,7 +209,7 @@
+ }
+
+ ATTRIBUTE_INTERFACE
+-void *memmem(const void *s1, size_t len1, const void *s2, size_t len2) {
++void *memmem(const void *s1, std::size_t len1, const void *s2, std::size_t len2) {
+ ensureFuzzerInited();
+ void *result = REAL(memmem)(s1, len1, s2, len2);
+ __sanitizer_weak_hook_memmem(GET_CALLER_PC(), s1, len1, s2, len2, result);
diff --git a/main/coreutils/APKBUILD b/main/coreutils/APKBUILD
index 10aa518ab0..4f888be8aa 100644
--- a/main/coreutils/APKBUILD
+++ b/main/coreutils/APKBUILD
@@ -2,17 +2,17 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=coreutils
-pkgver=8.32
+pkgver=9.0
pkgrel=2
pkgdesc="The basic file, shell and text manipulation utilities"
url="https://www.gnu.org/software/coreutils/"
arch="all"
license="GPL-3.0-or-later"
-makedepends="bash acl-dev attr-dev utmps-dev perl"
+makedepends="bash acl-dev attr-dev utmps-dev perl automake autoconf"
subpackages="$pkgname-doc"
install="$pkgname.post-deinstall"
source="https://ftp.gnu.org/gnu/coreutils/coreutils-$pkgver.tar.xz
- ls.patch
+ fix-chmod-exit-code.patch
"
options="!check"
@@ -21,7 +21,7 @@ options="!check"
# - CVE-2017-18018
build() {
- CFLAGS="-I/usr/include/utmps" LIBS="-lutmps -lskarnet -lrt" ./configure \
+ CFLAGS="$CFLAGS -I/usr/include/utmps" LIBS="-lutmps -lskarnet -lrt" ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
@@ -29,7 +29,6 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--disable-nls \
- --without-gmp \
--enable-no-install-program=hostname,su,kill,uptime \
--enable-single-binary=symlinks
make
@@ -57,6 +56,9 @@ package() {
# chroot lives in /usr/sbin with busybox
rm "$pkgdir"/usr/bin/chroot
ln -s ../bin/coreutils "$pkgdir"/usr/sbin/chroot
+
+ # resolve conflict between shadow and coreutils for cmd:groups
+ rm "$pkgdir"/usr/bin/groups
}
# XXX - some gnulib tests broken, find a way to patch out gnulib tests
@@ -64,5 +66,7 @@ check() {
make check
}
-sha512sums="1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145 coreutils-8.32.tar.xz
-2742d74c45bdb52c524d415fb0787ed63164aec2c22980a1c46b40b7db2f0911008161b1219d5b571cc25de274bacc20c8be3f651906967a032a3ac9859cffce ls.patch"
+sha512sums="
+9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03 coreutils-9.0.tar.xz
+9f86dacb9c429bb0873e68f3e7b185ac8fa54f801dd00e532b01719a919e5c22ec706c58a4da4196f68f46fcd5589afc09028680ad34f89d1c16eae6e679aeca fix-chmod-exit-code.patch
+"
diff --git a/main/coreutils/fix-chmod-exit-code.patch b/main/coreutils/fix-chmod-exit-code.patch
new file mode 100644
index 0000000000..42237ad677
--- /dev/null
+++ b/main/coreutils/fix-chmod-exit-code.patch
@@ -0,0 +1,111 @@
+From e8b56ebd536e82b15542a00c888109471936bfda Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Fri, 24 Sep 2021 20:57:41 +0100
+Subject: chmod: fix exit status when ignoring symlinks
+
+* src/chmod.c: Reorder enum so CH_NOT_APPLIED
+can be treated as a non error.
+* tests/chmod/ignore-symlink.sh: A new test.
+* tests/local.mk: Reference the new test.
+* NEWS: Mention the bug fix.
+Fixes https://bugs.gnu.org/50784
+---
+ NEWS | 6 ++++++
+ src/chmod.c | 4 ++--
+ tests/chmod/ignore-symlink.sh | 31 +++++++++++++++++++++++++++++++
+ tests/local.mk | 1 +
+ 4 files changed, 40 insertions(+), 2 deletions(-)
+ create mode 100755 tests/chmod/ignore-symlink.sh
+
+diff --git a/NEWS b/NEWS
+index a1470a7d7..1cb3c28a1 100644
+--- a/NEWS
++++ b/NEWS
+@@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*-
+
+ * Noteworthy changes in release ?.? (????-??-??) [?]
+
++** Bug fixes
++
++ chmod -R no longer exits with error status when encountering symlinks.
++ All files would be processed correctly, but the exit status was incorrect.
++ [bug introduced in coreutils-9.0]
++
+
+ * Noteworthy changes in release 9.0 (2021-09-24) [stable]
+
+diff --git a/src/chmod.c b/src/chmod.c
+index 37b04f500..57ac47f33 100644
+--- a/src/chmod.c
++++ b/src/chmod.c
+@@ -44,8 +44,8 @@ struct change_status
+ enum
+ {
+ CH_NO_STAT,
+- CH_NOT_APPLIED,
+ CH_FAILED,
++ CH_NOT_APPLIED,
+ CH_NO_CHANGE_REQUESTED,
+ CH_SUCCEEDED
+ }
+@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent)
+ if ( ! recurse)
+ fts_set (fts, ent, FTS_SKIP);
+
+- return CH_NO_CHANGE_REQUESTED <= ch.status;
++ return CH_NOT_APPLIED <= ch.status;
+ }
+
+ /* Recursively change the modes of the specified FILES (the last entry
+diff --git a/tests/chmod/ignore-symlink.sh b/tests/chmod/ignore-symlink.sh
+new file mode 100755
+index 000000000..5ce3de816
+--- /dev/null
++++ b/tests/chmod/ignore-symlink.sh
+@@ -0,0 +1,31 @@
++#!/bin/sh
++# Test for proper exit code of chmod on a processed symlink.
++
++# Copyright (C) 2021 Free Software Foundation, Inc.
++
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program. If not, see <https://www.gnu.org/licenses/>.
++
++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++print_ver_ chmod
++
++mkdir dir || framework_failure_
++touch dir/f || framework_failure_
++ln -s f dir/l || framework_failure_
++
++# This operation ignores symlinks but should succeed.
++chmod u+w -R dir 2> out || fail=1
++
++compare /dev/null out || fail=1
++
++Exit $fail
+diff --git a/tests/local.mk b/tests/local.mk
+index 228d0e368..b5b893fb7 100644
+--- a/tests/local.mk
++++ b/tests/local.mk
+@@ -456,6 +456,7 @@ all_tests = \
+ tests/chmod/c-option.sh \
+ tests/chmod/equal-x.sh \
+ tests/chmod/equals.sh \
++ tests/chmod/ignore-symlink.sh \
+ tests/chmod/inaccessible.sh \
+ tests/chmod/octal.sh \
+ tests/chmod/setgid.sh \
+--
+cgit v1.2.1
+
diff --git a/main/coreutils/ls.patch b/main/coreutils/ls.patch
deleted file mode 100644
index 0e2057caec..0000000000
--- a/main/coreutils/ls.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-../src/ls.c: In function 'print_dir':
-
-../src/ls.c:3026:24: error: 'SYS_getdents' undeclared (first use in this function); did you mean 'SYS_getdents64'?
-
- 3026 | if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1
-
- | ^~~~~~~~~~~~
-
- | SYS_getdents64
-
-../src/ls.c:3026:24: note: each undeclared identifier is reported only once for each function it appears in
-
-diff --git a/src/ls.c b/src/ls.c
-index 24b9832..64ecf40 100644
---- a/src/ls.c
-+++ b/src/ls.c
-@@ -3018,7 +3018,7 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
- if (errno != EOVERFLOW)
- break;
- }
--#ifdef __linux__
-+#if defined(__linux__) && defined(__x86_64__)
- else if (! found_any_entries)
- {
- /* If readdir finds no directory entries at all, not even "." or
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index ee50ce4d38..28da200842 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -1,20 +1,22 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cryptsetup
-pkgver=2.3.6
+pkgver=2.4.1 # XXX: remove automake/autoconf when upgrading to 2.5.0
pkgrel=0
pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
url="https://gitlab.com/cryptsetup/cryptsetup"
arch="all"
license="GPL-2.0-or-later WITH OpenSSL-Exception"
-makedepends_host="lvm2-dev openssl-dev popt-dev util-linux-dev
+makedepends_build="automake autoconf bash coreutils"
+makedepends_host="lvm2-dev openssl1.1-compat-dev popt-dev util-linux-dev
json-c-dev argon2-dev"
makedepends="$makedepends_build $makedepends_host"
-checkdepends="device-mapper sharutils which bash coreutils"
+checkdepends="device-mapper which sharutils"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc"
source="https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/cryptsetup-$pkgver.tar.gz
dmcrypt.initd
dmcrypt.confd
+
flush-stdout.patch
"
@@ -23,6 +25,8 @@ source="https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/cryptset
# - CVE-2020-14382
build() {
+ # Disable support for external tokens since it requires
+ # dlvsym(3) which is a GNU extension and not available in musl.
./configure \
--build="$CBUILD" \
--host="$CHOST" \
@@ -31,7 +35,9 @@ build() {
--sbindir=/sbin \
--disable-static \
--enable-libargon2 \
- --with-crypto_backend=openssl
+ --with-crypto_backend=openssl \
+ --disable-external-tokens \
+ --disable-ssh-token
make
}
@@ -49,7 +55,7 @@ package() {
install -Dm755 "$srcdir"/dmcrypt.initd "$pkgdir"/etc/init.d/dmcrypt
mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
- install -m644 README TODO FAQ NEWS docs/v$pkgver-ReleaseNotes \
+ install -m644 README.md FAQ docs/v$pkgver-ReleaseNotes \
"$pkgdir"/usr/share/doc/$pkgname/
}
@@ -60,8 +66,8 @@ libs() {
}
sha512sums="
-a0ec8dcb7082e458660f6379a532cffb56561488288e514db2ebceab11779c7d94aa732660b24f85e46a333a969d8d39aed9ca9b2e9ac0af724cabb07488e2f5 cryptsetup-2.3.6.tar.gz
+b12589181e48c8ae7e95fa7d0642caa479a0000c76ac4c2f9dcacb9319512f0c079d037c6fe596639481a62b6290dd7d0bf826ac5e096c526435a8241386fe0e cryptsetup-2.4.1.tar.gz
a3ca3e648749136ee724692b61488cd855f118eb93435942c2b04964a34fe49d0f0da4ef64cd2531c1c0f650e77808cf5d802789fd7664398248ead668bb35e5 dmcrypt.initd
74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 dmcrypt.confd
-dc896fdb7697d01443a168819f01af02db00a9de75589f062a1ebbfc0bc185b6d2109b18352309c41b818e3ad89609dcea3660d6f3cda890de825f053f94de97 flush-stdout.patch
+529187851def5fbc08e995eba90d3f013f1cf8469dcb9344f83d1e3c73c71467ca4ed62c8282ec27ebfa30ccc33653fdd1aea8d1d80e1ac4293d51865c9a6200 flush-stdout.patch
"
diff --git a/main/cryptsetup/flush-stdout.patch b/main/cryptsetup/flush-stdout.patch
index a39aec5474..9698460b29 100644
--- a/main/cryptsetup/flush-stdout.patch
+++ b/main/cryptsetup/flush-stdout.patch
@@ -1,15 +1,15 @@
-diff -upr cryptsetup-2.1.0.orig/src/utils_tools.c cryptsetup-2.1.0/src/utils_tools.c
---- cryptsetup-2.1.0.orig/src/utils_tools.c 2019-01-31 21:37:12.000000000 +0100
-+++ cryptsetup-2.1.0/src/utils_tools.c 2019-03-16 16:33:13.000000000 +0100
-@@ -105,10 +105,13 @@ void tool_log(int level, const char *msg
+diff -upr cryptsetup-2.4.0.orig/src/utils_tools.c cryptsetup-2.4.0/src/utils_tools.c
+--- cryptsetup-2.4.0.orig/src/utils_tools.c 2021-08-29 15:17:46.989874344 +0200
++++ cryptsetup-2.4.0/src/utils_tools.c 2021-08-29 15:18:45.543241866 +0200
+@@ -79,10 +79,13 @@ void tool_log(int level, const char *msg
case CRYPT_LOG_NORMAL:
fprintf(stdout, "%s", msg);
+ fflush(stdout);
break;
case CRYPT_LOG_VERBOSE:
-- if (opt_verbose)
-+ if (opt_verbose) {
+- if (params && params->verbose)
++ if (params && params->verbose) {
fprintf(stdout, "%s", msg);
+ fflush(stdout);
+ }
diff --git a/main/ctags/APKBUILD b/main/ctags/APKBUILD
index 723dc85c55..279a39e700 100644
--- a/main/ctags/APKBUILD
+++ b/main/ctags/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=ctags
-pkgver=5.9.20210620.0
+pkgver=5.9.20211010.0
_realver="p$pkgver"
pkgrel=0
pkgdesc="Generator of tags for all types of C/C++ languages"
@@ -12,7 +12,8 @@ license="GPL-2.0-or-later"
checkdepends="diffutils python3"
makedepends="autoconf automake pkgconf py3-docutils"
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/universal-ctags/ctags/archive/$_realver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/universal-ctags/ctags/archive/$_realver.tar.gz
+ disable-check-genfile.patch"
builddir="$srcdir"/$pkgname-$_realver
# secfixes:
@@ -50,5 +51,6 @@ package() {
}
sha512sums="
-6127dd6a9eb02240fd244eb2bcc5c1ca895bf1cc23f78b7b8dea14033aca6c50687b6a5680076d0a353d355c3f086e43d6e87dfa6c6c3663b1f685f75915a88b ctags-5.9.20210620.0.tar.gz
+c3a417682d9e95b98724c758e91b5ef0a3551aad09745681b2fdcafb92b8c2871094144853c7fbeb62aac3c6fd3d88e290a328079c0ec5f8db1277f20dd85fed ctags-5.9.20211010.0.tar.gz
+185b0647ddaba90ae386c40d75cd8cf8613a89b4d1d0d0905eb78ba3afad57cf273ab2d826053e49d22278f9d3cec97780c8f15aef13c7582658ca24708abf14 disable-check-genfile.patch
"
diff --git a/main/ctags/disable-check-genfile.patch b/main/ctags/disable-check-genfile.patch
new file mode 100644
index 0000000000..1135411ffb
--- /dev/null
+++ b/main/ctags/disable-check-genfile.patch
@@ -0,0 +1,19 @@
+The check-genfile target only works when run from inside a Git
+repository. Since we build ctags from a tagged tarball and not from the
+Git repository, invoking `git diff` fails with a usage error and causes
+`make check` to fail.
+
+This should be reported upstream.
+
+diff -upr a/makefiles/testing.mak b/makefiles/testing.mak
+--- a/makefiles/testing.mak 2021-10-02 15:48:41.000000000 +0200
++++ b/makefiles/testing.mak 2021-10-10 12:07:32.081801888 +0200
+@@ -5,7 +5,7 @@ EXTRA_DIST += misc/units misc/units.py m
+ EXTRA_DIST += misc/tlib misc/mini-geany.expected
+ MAN_TEST_TMPDIR = ManTest
+
+-check: tmain units tlib man-test check-genfile
++check: tmain units tlib man-test
+
+ # We may use CLEANFILES, DISTCLEANFILES, or etc.
+ # clean-tlib and clean-gcov are not included
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index 4fa0420991..6326795468 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -1,13 +1,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cups
pkgver=2.3.3
-pkgrel=2
+pkgrel=4
pkgdesc="The CUPS Printing System"
url="https://www.cups.org/"
arch="all"
license="GPL-2.0-only"
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-libs ipptool $pkgname-client
- $pkgname-lang $pkgname-openrc $pkgname-dbg"
+ $pkgname-lang $pkgname-openrc"
depends_dev="libgcrypt-dev gnutls-dev zlib-dev"
makedepends="$depends_dev libpaper-dev dbus-dev libjpeg-turbo-dev avahi-dev
linux-headers libusb-dev"
@@ -19,6 +19,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenPrinting/cups/archive/v$
$pkgname.logrotate
cupsd.initd
cups-no-export-ssllibs.patch
+ cups-nostrip.patch
default-config-no-gssapi.patch
"
@@ -131,8 +132,11 @@ _mv() {
done
}
-sha512sums="5a43ef98f83c1783221155c01de940f3679023251709931ef28572c7b00620b36252afe894e86f2f08a527008dc2c95dc8af4129f0ab28a28663be8d3ccc3418 cups-2.3.3.tar.gz
+sha512sums="
+5a43ef98f83c1783221155c01de940f3679023251709931ef28572c7b00620b36252afe894e86f2f08a527008dc2c95dc8af4129f0ab28a28663be8d3ccc3418 cups-2.3.3.tar.gz
cf64211da59e79285f99d437c02fdd7db462855fb2920ec9563ba47bd8a9e5cbd10555094940ceedeb41ac805c4f0ddb9147481470112a11a76220d0298aef79 cups.logrotate
2c2683f755a220166b3a1653fdd1a6daa9718c8f0bbdff2e2d5e61d1133306260d63a83d3ff41619b5cf84c4913fae5822b79553e2822858f38fa3613f4c7082 cupsd.initd
7a8cd9ac33b0dd4627c72df4275db8ccd7cf8e201bce3833719b42f532f526bb347b842e3ea1ef0d61855b5c6e1088b5d20b68942f2c2c0acf504d8d9728efd3 cups-no-export-ssllibs.patch
-ac1ec4453d6a4b641d40089c77d3b776963d90efb092851c8d93deceb6068b111dee71171967ffb7ad0f5adb424398a43f51feb7d5d9734287cfb9e419efaa93 default-config-no-gssapi.patch"
+f9f465c0a0125e15d969e4992e94657277211045b393247808b028ba5f8e010f753b750b7a01e4272da03188955866cbe6db1970fc865f883e8377a7e432ba65 cups-nostrip.patch
+ac1ec4453d6a4b641d40089c77d3b776963d90efb092851c8d93deceb6068b111dee71171967ffb7ad0f5adb424398a43f51feb7d5d9734287cfb9e419efaa93 default-config-no-gssapi.patch
+"
diff --git a/main/cups/cups-nostrip.patch b/main/cups/cups-nostrip.patch
new file mode 100644
index 0000000000..62b3ce2344
--- /dev/null
+++ b/main/cups/cups-nostrip.patch
@@ -0,0 +1,68 @@
+diff -ru a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
+--- a/config-scripts/cups-compiler.m4 2020-04-27 14:04:29.000000000 -0400
++++ b/config-scripts/cups-compiler.m4 2021-08-06 20:53:29.316010169 -0400
+@@ -9,9 +9,6 @@
+
+ dnl Clear the debugging and non-shared library options unless the user asks
+ dnl for them...
+-INSTALL_STRIP=""
+-AC_SUBST(INSTALL_STRIP)
+-
+ AC_ARG_WITH(optim, [ --with-optim set optimization flags ],
+ OPTIM="$withval",
+ OPTIM="")
+@@ -25,8 +22,6 @@
+ dnl For debugging, keep symbols, otherwise strip them...
+ if test x$enable_debug = xyes -a "x$OPTIM" = x; then
+ OPTIM="-g"
+-else
+- INSTALL_STRIP="-s"
+ fi
+
+ dnl Debug printfs can slow things down, so provide a separate option for that
+diff -ru a/configure b/configure
+--- a/configure 2020-04-27 14:04:29.000000000 -0400
++++ b/configure 2021-08-06 20:54:01.585892266 -0400
+@@ -694,7 +694,6 @@
+ ARCHFLAGS
+ UNITTESTS
+ OPTIM
+-INSTALL_STRIP
+ LIBTOOL_INSTALL
+ LIBTOOL_CXX
+ LIBTOOL_CC
+@@ -6662,7 +6661,6 @@
+
+
+
+-INSTALL_STRIP=""
+
+
+
+@@ -6698,8 +6696,6 @@
+
+ if test x$enable_debug = xyes -a "x$OPTIM" = x; then
+ OPTIM="-g"
+-else
+- INSTALL_STRIP="-s"
+ fi
+
+ if test x$enable_debug_printfs = xyes; then
+diff -ru a/Makedefs.in b/Makedefs.in
+--- a/Makedefs.in 2020-04-27 14:04:29.000000000 -0400
++++ b/Makedefs.in 2021-08-06 20:53:42.565961754 -0400
+@@ -45,12 +45,12 @@
+ # Installation programs...
+ #
+
+-INSTALL_BIN = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
++INSTALL_BIN = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
+ INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@
+ INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+ INSTALL_DATA = $(INSTALL) -c -m 444
+ INSTALL_DIR = $(INSTALL) -d
+-INSTALL_LIB = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
++INSTALL_LIB = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
+ INSTALL_MAN = $(INSTALL) -c -m 444
+ INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
+
diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD
index ee3d654bb2..5cc761cff1 100644
--- a/main/curl/APKBUILD
+++ b/main/curl/APKBUILD
@@ -8,22 +8,27 @@
# this aport from arch=all WILL be reverted.
pkgname=curl
-pkgver=7.78.0
+pkgver=7.79.1
pkgrel=0
pkgdesc="URL retrival utility and library"
url="https://curl.se/"
arch="all"
license="MIT"
depends="ca-certificates"
-depends_dev="openssl-dev nghttp2-dev zlib-dev brotli-dev"
+depends_dev="openssl1.1-compat-dev nghttp2-dev zlib-dev brotli-dev"
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.se/download/curl-$pkgver.tar.xz"
options="net" # Required for running tests
+[ -n "$BOOTSTRAP" ] && options="$options !check" # remove python3 dependency
# secfixes:
+# 7.79.0-r0:
+# - CVE-2021-22945
+# - CVE-2021-22946
+# - CVE-2021-22947
# 7.78.0-r0:
# - CVE-2021-22922
# - CVE-2021-22923
@@ -159,5 +164,5 @@ static() {
}
sha512sums="
-f72e822a0b5e28320ef547c7a441c07f3b4870579a70ab4c428751baba435a1385cb89a22b9ed4b84a7fafecf620f155911e4131e3463ec1bdad80ecde47bb7a curl-7.78.0.tar.xz
+1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d curl-7.79.1.tar.xz
"
diff --git a/main/cvs/APKBUILD b/main/cvs/APKBUILD
index 43925f68f5..108fadb6bb 100644
--- a/main/cvs/APKBUILD
+++ b/main/cvs/APKBUILD
@@ -2,19 +2,27 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cvs
pkgver=1.12.13
-pkgrel=0
+pkgrel=1
pkgdesc="Concurrent Versions System"
url="https://www.nongnu.org/cvs/"
arch="all"
license="GPL-2.0-or-later"
options="!check" # Tests fail - src/lib/test-getdate.sh
-makedepends="zlib-dev"
+makedepends="
+ autoconf
+ automake
+ gettext-dev
+ libbsd-dev
+ texinfo
+ zlib-dev
+"
subpackages="$pkgname-doc"
source="https://ftp.gnu.org/non-gnu/cvs/source/feature/$pkgver/cvs-$pkgver.tar.gz
- cvs_1.12.13+real-26.diff
+ cvs_1.12.13+real-26.patch
install-sh.patch
mktime-configure.patch
getcwd.patch
+ add-libbsd.patch
"
# secfixes:
@@ -25,6 +33,7 @@ source="https://ftp.gnu.org/non-gnu/cvs/source/feature/$pkgver/cvs-$pkgver.tar.g
prepare() {
default_prepare
update_config_sub
+ autoreconf -fi
}
build() {
@@ -48,8 +57,11 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="acd658b7ffa29a67e33f294073a0f80a27aa4e19dc2185cfa43f862d34e511bcf9802012b8e6957f82c7532fdabbb058b33686e0e6046cdd1f1aa9af619e92e9 cvs-1.12.13.tar.gz
-510a8a3ed392108f360f3477af45f863ea3603b8c3f90504dfc018e3ef5ed79e69fcd3e38c82b46061cc82a53859d8ab209ae6f8ee07134f7db98bc3f1e38f06 cvs_1.12.13+real-26.diff
+sha512sums="
+acd658b7ffa29a67e33f294073a0f80a27aa4e19dc2185cfa43f862d34e511bcf9802012b8e6957f82c7532fdabbb058b33686e0e6046cdd1f1aa9af619e92e9 cvs-1.12.13.tar.gz
+510a8a3ed392108f360f3477af45f863ea3603b8c3f90504dfc018e3ef5ed79e69fcd3e38c82b46061cc82a53859d8ab209ae6f8ee07134f7db98bc3f1e38f06 cvs_1.12.13+real-26.patch
44e0b683f8178804d029957e78af046197142181564bfb0209da2682f9817e6c661a9e0dd390d236c9ebdc937df920269e708bb7d7c84ca942341fd413a1b265 install-sh.patch
a430f2659e1f96bc4ba2205567662eb5863c0c73b2e0c43eba86b23734b3874663e389e74e6011c6a0e9f4074d676adfd6c88fbe20f11ca33ba3223a93dad02c mktime-configure.patch
-99a9107603a933c164070787a3e270f8b1d82fb6930763061f019a42c0d88e4ac981941ccc0851ae051df757caef5d6c9a9e9b87d3378e7361cc78f48460f4a1 getcwd.patch"
+99a9107603a933c164070787a3e270f8b1d82fb6930763061f019a42c0d88e4ac981941ccc0851ae051df757caef5d6c9a9e9b87d3378e7361cc78f48460f4a1 getcwd.patch
+eecdd7f8a31ae63901e6b7336c7aac5827dd33ce2c80bb7d629ffb3dc65927eae75f59f6a949e290471982f22265f02eaa17febd6e6ea5f799edcfcbccd3b511 add-libbsd.patch
+"
diff --git a/main/cvs/add-libbsd.patch b/main/cvs/add-libbsd.patch
new file mode 100644
index 0000000000..1b018a7a12
--- /dev/null
+++ b/main/cvs/add-libbsd.patch
@@ -0,0 +1,12 @@
+--- old/src/Makefile.am
++++ new/src/Makefile.am
+@@ -117,7 +117,8 @@
+ $(ZLIB_LIBS) \
+ $(LIB_CLOCK_GETTIME) \
+ $(LIB_NANOSLEEP) \
+- $(LIBINTL)
++ $(LIBINTL) \
++ -lbsd
+
+ # General
+ EXTRA_DIST = \
diff --git a/main/cvs/cvs_1.12.13+real-26.diff b/main/cvs/cvs_1.12.13+real-26.patch
index 756fbdbd46..756fbdbd46 100644
--- a/main/cvs/cvs_1.12.13+real-26.diff
+++ b/main/cvs/cvs_1.12.13+real-26.patch
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 14956bbd6e..7e7522848a 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=12
+pkgrel=14
pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
url="https://www.cyrusimap.org/sasl/"
arch="all"
@@ -25,7 +25,7 @@ subpackages="
# use heimdal to avoid circular dep: cyrus-sasl -> krb5 -> openldap -> cyrus-sasl
makedepends="
gdbm-dev
- openssl-dev
+ openssl1.1-compat-dev
heimdal-dev
py3-sphinx
sqlite-dev
diff --git a/main/cython/APKBUILD b/main/cython/APKBUILD
index 36c118f954..e098d9c9cb 100644
--- a/main/cython/APKBUILD
+++ b/main/cython/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Oleg Titov <oleg.titov@gmail.com>
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=cython
-pkgver=0.29.22
-pkgrel=2
+pkgver=0.29.23
+pkgrel=0
pkgdesc="Cython is an optimising static compiler for both the Python & the extended Cython programming languages."
url="https://cython.org/"
arch="all"
@@ -32,4 +32,6 @@ package() {
install -Dm 644 README.rst "$pkgdir/usr/share/doc/cython/readme.rst"
}
-sha512sums="b7f22112678f159bf1d0ad5fe4f7c103e96f240bab4d9dc07edd7c2f66a9887b9af72b32f1d5886361b48d428bc2b9499d3c5b59ce5af1068f20a26549783dd6 cython-0.29.22.tar.gz"
+sha512sums="
+093b7a1d5c68f6e2d2b9b8adb9ac99e8967ddd0a66c0513a78e88bd55d96533dd8352b2478554fb53bf32a72d730967fb08ccb2eaa462da68f86891dceb4925a cython-0.29.23.tar.gz
+"
diff --git a/main/dahdi-linux-lts/APKBUILD b/main/dahdi-linux-lts/APKBUILD
index df660337e3..d50185c6ba 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.52
+_kver=5.10.75
_krel=0
_kpkgver="$_kver-r$_krel"
diff --git a/main/datefudge/APKBUILD b/main/datefudge/APKBUILD
index 9ed6f292ad..8340e0e316 100644
--- a/main/datefudge/APKBUILD
+++ b/main/datefudge/APKBUILD
@@ -10,8 +10,7 @@ license="GPL-2.0"
depends="coreutils"
checkdepends="perl"
subpackages="$pkgname-doc"
-source="http://deb.debian.org/debian/pool/main/d/datefudge/datefudge_$pkgver.tar.xz
- "
+source="https://deb.debian.org/debian/pool/main/d/datefudge/datefudge_$pkgver.tar.xz"
build() {
# fix Makefile, set the version number directly as dpkg-parsechangelog is not available
diff --git a/main/debootstrap/APKBUILD b/main/debootstrap/APKBUILD
index 9ce17abc68..29b4afa9af 100644
--- a/main/debootstrap/APKBUILD
+++ b/main/debootstrap/APKBUILD
@@ -10,7 +10,7 @@ license="MIT"
options="!check" # upstream doesn't have a test suite
depends="debian-archive-keyring dpkg tar"
subpackages="$pkgname-doc"
-source="http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_$pkgver.tar.gz"
+source="https://deb.debian.org/debian/pool/main/d/debootstrap/debootstrap_$pkgver.tar.gz"
builddir="$srcdir/debootstrap"
package() {
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index 26ddd3aa32..9a0ef8ad38 100644
--- a/main/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dhcpcd
-pkgver=8.1.9
+pkgver=9.4.0
pkgrel=0
pkgdesc="RFC2131 compliant DHCP client"
url="https://roy.marples.name/projects/dhcpcd"
@@ -15,7 +15,6 @@ source="https://roy.marples.name/downloads/dhcpcd/dhcpcd-$pkgver.tar.xz
busybox-logger.patch
fix-chrony-conf-location.patch
dhcpcd.initd
- musl.patch
"
build() {
CFLAGS="$CFLAGS -D_GNU_SOURCE -DHAVE_PRINTF_M"
@@ -45,9 +44,8 @@ package() {
}
sha512sums="
-40ac106ffca60b32362aacdfae0fa3a2993a3eed72bf452322412a912f594aaade1c24b862233455033158a6e453ec75d6d14fa52df6b4c5ae435dd6ceb29f2a dhcpcd-8.1.9.tar.xz
+e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f dhcpcd-9.4.0.tar.xz
692b2c8c75166fabd512a7cc69c650f9391e0f682ce9cbe1771bfa44e82dcf09e322c46493c45ca75000f479d3cddde306754ba31d28a798a15e2b79a56045f0 busybox-logger.patch
1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch
dc3b30295dbe5310526443736e60ccc53621d465d512639e8ea20efe598037ff33730e46964e4e7bc32d4ce88aaecf3b9bb9a4ceab892d8bff3423e0374ccae1 dhcpcd.initd
-082aa80798476917e2a86003cb95136212cbb9b8da986e7d8186d7f3d857e81a4cb03af56296484e035e5006d36c695ef57f571ea9c1fd18b4200a9cf745a6b4 musl.patch
"
diff --git a/main/dhcpcd/musl.patch b/main/dhcpcd/musl.patch
deleted file mode 100644
index 9de5163db7..0000000000
--- a/main/dhcpcd/musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Include linux/if_tun.h after netinet/if_tun.h to avoid redefinition of struct ethhdr
-
-diff --git a/src/if-linux.c b/src/if-linux.c
-index fd47278..cca4e36 100644
---- a/src/if-linux.c
-+++ b/src/if-linux.c
-@@ -37,7 +37,6 @@
- #include <linux/if_addr.h>
- #include <linux/if_link.h>
- #include <linux/if_packet.h>
--#include <linux/if_tun.h>
- #include <linux/if_vlan.h>
- #include <linux/filter.h>
- #include <linux/netlink.h>
-@@ -51,6 +50,8 @@
- #include <netinet/in.h>
- #include <net/route.h>
-
-+#include <linux/if_tun.h>
-+
- #include <errno.h>
- #include <fcntl.h>
- #include <ctype.h>
-
diff --git a/main/diffutils/APKBUILD b/main/diffutils/APKBUILD
index d2bbbb4885..fe0cfc392c 100644
--- a/main/diffutils/APKBUILD
+++ b/main/diffutils/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=diffutils
-pkgver=3.7
+pkgver=3.8
pkgrel=0
pkgdesc="Show differences among files"
subpackages="$pkgname-doc"
@@ -8,22 +8,16 @@ url="https://www.gnu.org/software/diffutils/"
arch="all"
license="GPL-3.0-or-later"
checkdepends="coreutils perl"
+# cyclic dependency during bootstrap:
+# m4 -> diffutils -> coreutils -> bash -> flex -> bison -> m4
+[ -n "$BOOTSTRAP" ] && options="$options !check"
source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz
- disable-mbrtowc-test.patch
+ skip-test-presue-output-tty.patch
"
-builddir=$srcdir/$pkgname-$pkgver
-
-prepare() {
- cd "$builddir"
- default_prepare
- # fix eglibc-2.16 build issue
- sed -i -e '/gets is a/d' \
- lib/stdio.in.h
-}
+builddir=$srcdir/$pkgname-$pkgver
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,17 +29,14 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make install DESTDIR=$pkgdir
-
- rm -rf "$pkgdir"/usr/lib/charset.alias
- rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
}
-sha512sums="7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c diffutils-3.7.tar.xz
-2602dabf0ac52a273b84160032416613da7ad111541fe25466cf9d4ce1eb2630f0ba0cb0b3013967965d8359a11a5f390f0486b4526b35516d9de1c8975f720d disable-mbrtowc-test.patch"
+sha512sums="
+279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c diffutils-3.8.tar.xz
+5df0dc7a452180c361698ee502b4636a5e7277132e543136c205747fac64acc6276186ec8c884b17e9fe3e307f15e045ba327d44ac4662db88675c309c56367a skip-test-presue-output-tty.patch
+"
diff --git a/main/diffutils/disable-mbrtowc-test.patch b/main/diffutils/disable-mbrtowc-test.patch
deleted file mode 100644
index 1461a40939..0000000000
--- a/main/diffutils/disable-mbrtowc-test.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- diffutils-3.6/gnulib-tests/test-mbrtowc5.sh.old 2016-12-31 13:54:43.000000000 +0000
-+++ diffutils-3.6/gnulib-tests/test-mbrtowc5.sh 2017-07-30 17:29:50.879924130 +0000
-@@ -1,6 +1,2 @@
- #!/bin/sh
--# Test whether the POSIX locale has encoding errors.
--LC_ALL=C \
--./test-mbrtowc${EXEEXT} 5 || exit
--LC_ALL=POSIX \
--./test-mbrtowc${EXEEXT} 5
-+exit 77
diff --git a/main/diffutils/skip-test-presue-output-tty.patch b/main/diffutils/skip-test-presue-output-tty.patch
new file mode 100644
index 0000000000..e0a47d5160
--- /dev/null
+++ b/main/diffutils/skip-test-presue-output-tty.patch
@@ -0,0 +1,24 @@
+Test fails for unknown reasons on lxc builders
+
+diff --git a/tests/colors b/tests/colors
+index d28a61c..e799dd3 100755
+--- a/tests/colors
++++ b/tests/colors
+@@ -123,11 +123,11 @@ compare exp out || fail=1
+
+ # Before the fix in http://debbugs.gnu.org/22067,
+ # this test would trigger an infinite loop bug.
+-mkfifo fifo
+-printf '%1000000s-a' > a
+-printf '%1000000s-b' > b
+-head -c 10 < fifo > /dev/null &
+-diff --color=always ---presume-output-tty a b > fifo
+-test $? = 141 || fail=1
++#mkfifo fifo
++#printf '%1000000s-a' > a
++#printf '%1000000s-b' > b
++#head -c 10 < fifo > /dev/null &
++#diff --color=always ---presume-output-tty a b > fifo
++#test $? = 141 || fail=1
+
+ Exit $fail
diff --git a/main/dns-root-hints/APKBUILD b/main/dns-root-hints/APKBUILD
index 0ddc726238..2cc6385db3 100644
--- a/main/dns-root-hints/APKBUILD
+++ b/main/dns-root-hints/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=dns-root-hints
pkgver=2019073000
-pkgrel=2
+pkgrel=3
pkgdesc="The DNS root hint(s)"
url="https://www.internic.net/domain"
arch="noarch"
license="Public-Domain"
-depends="curl gnupg"
+depends="curl gpg"
makedepends="curl"
source="verisign-grs-nstld-key.asc named.root named.root.sig
update-$pkgname
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index 6bebb51ed0..4a57bdf959 100644
--- a/main/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
@@ -1,6 +1,22 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
-#
+pkgname=dnsmasq
+pkgver=2.86
+pkgrel=0
+pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server"
+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 coreutils"
+install="$pkgname.pre-install $pkgname.pre-upgrade
+ $pkgname-dnssec.pre-install $pkgname-dnssec.pre-upgrade"
+subpackages="$pkgname-doc $pkgname-dnssec"
+source="https://www.thekelleys.org.uk/dnsmasq/dnsmasq-$pkgver.tar.xz
+ $pkgname.initd
+ $pkgname.confd
+ uncomment-conf-dir.patch
+ "
# secfixes:
# 2.85-r0:
# - CVE-2021-3448
@@ -24,24 +40,6 @@
# - CVE-2017-14494
# - CVE-2017-14495
# - CVE-2017-14496
-#
-pkgname=dnsmasq
-pkgver=2.85
-pkgrel=2
-pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server"
-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 coreutils"
-install="$pkgname.pre-install $pkgname.pre-upgrade
- $pkgname-dnssec.pre-install $pkgname-dnssec.pre-upgrade"
-subpackages="$pkgname-doc $pkgname-dnssec"
-source="https://www.thekelleys.org.uk/dnsmasq/dnsmasq-$pkgver.tar.xz
- $pkgname.initd
- $pkgname.confd
- uncomment-conf-dir.patch
- "
build() {
make CFLAGS="$CFLAGS" COPTS="-DHAVE_DNSSEC" all
@@ -79,7 +77,9 @@ dnssec() {
cp -r "$pkgdir"/etc "$subpkgdir"/etc
}
-sha512sums="8beefe76b46f7d561f40d0900ba68b260a199cb62ab5b653746e3a1104c04fb8899b9e7a160a1be4fe8782bfb1607b556e9ffb9c25c4e99653e4bc74fcc03b09 dnsmasq-2.85.tar.xz
+sha512sums="
+487eae0afbc8bb3d5282a729ffb0cb2c9bdc7d8e46e2e8aa114cd7c5d82e0fd66f49926e7fa4028577548d6f57e8a865aca17f33963a589874584d608ab2deaf dnsmasq-2.86.tar.xz
a7d64a838d10f4f69e0f2178cf66f0b3725901696e30df9e8e3e09f2afd7c86e9d95af64d2b63ef66f18b8a637397b7015573938df9ad961e2b36c391c3ac579 dnsmasq.initd
9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 dnsmasq.confd
-01e9e235e667abda07675009fb1947547863e0bb0256393c5a415978e2a49c1007585c7f0b51e8decce79c05e6f2ced3f400b11343feaa4de9b2e524f74a1ee3 uncomment-conf-dir.patch"
+01e9e235e667abda07675009fb1947547863e0bb0256393c5a415978e2a49c1007585c7f0b51e8decce79c05e6f2ced3f400b11343feaa4de9b2e524f74a1ee3 uncomment-conf-dir.patch
+"
diff --git a/main/doas/APKBUILD b/main/doas/APKBUILD
index aee6c31792..9b5f49fc77 100644
--- a/main/doas/APKBUILD
+++ b/main/doas/APKBUILD
@@ -1,14 +1,17 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=doas
pkgver=6.8.1
-pkgrel=3
+pkgrel=6
pkgdesc="OpenBSD's temporary privilege escalation tool"
url="https://github.com/Duncaen/OpenDoas"
arch="all"
license="ISC"
makedepends="bison"
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/Duncaen/OpenDoas/archive/v$pkgver.tar.gz"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="$pkgname-$pkgver.tar.gz::https://github.com/Duncaen/OpenDoas/archive/v$pkgver.tar.gz
+ configuration-directory.patch
+ manpage-example-path.patch"
builddir="$srcdir/OpenDoas-$pkgver"
options="$options suid"
@@ -20,7 +23,8 @@ build() {
./configure \
--prefix=/usr \
--without-pam \
- --with-timestamp
+ --with-timestamp \
+ --with-doas-confdir
make
}
@@ -31,14 +35,17 @@ check() {
package() {
make install DESTDIR="$pkgdir"
- install -d "$pkgdir"/etc
- cat > "$pkgdir"/etc/doas.conf <<-EOF
+ install -d "$pkgdir"/usr/share/doc/$pkgname
+ cat > "$pkgdir"/usr/share/doc/$pkgname/doas.conf.example <<-EOF
# see doas.conf(5) for configuration details
# Uncomment to allow group "wheel" to become root
# permit persist :wheel
EOF
- chmod 600 "$pkgdir"/etc/doas.conf
}
-sha512sums="d96fe1cdd70e9211de9996ad05bcf7a127facd02af48f7ab2561869d9d16708f1b61722c6e6b9fe15a62e9ef501e09b1ba444b7b43a066f1895e543ebc9402e7 doas-6.8.1.tar.gz"
+sha512sums="
+d96fe1cdd70e9211de9996ad05bcf7a127facd02af48f7ab2561869d9d16708f1b61722c6e6b9fe15a62e9ef501e09b1ba444b7b43a066f1895e543ebc9402e7 doas-6.8.1.tar.gz
+79218c2798e67e6345818c357e651e09ef558d6cbcc5566e9e4816e8f4e73e4f737710caf617c211e89902ae7ef21cd520d3fc4d829550d40e1bd3b13befd0dc configuration-directory.patch
+60efd196595bda2c4f036cd0080a8825a85fedcc7524c917304b342373863213b3c557b4336f1dab760f167fd8cc2a59b2e744d8a47ff8a8acebbe74b1328f4f manpage-example-path.patch
+"
diff --git a/main/doas/configuration-directory.patch b/main/doas/configuration-directory.patch
new file mode 100644
index 0000000000..6a9575e57b
--- /dev/null
+++ b/main/doas/configuration-directory.patch
@@ -0,0 +1,509 @@
+From 7de1d454bda06d68a04f4f2e48099398a7711ae9 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 4 Aug 2021 04:47:04 -0600
+Subject: [PATCH 1/8] add --with-confdir feature
+
+This adds support for an /etc/doas.d configuration directory as discussed in #61. It is disabled by default.
+---
+ README.md | 9 +++++++
+ configure | 8 +++++++
+ doas.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ parse.y | 3 ++-
+ 4 files changed, 91 insertions(+), 1 deletion(-)
+
+diff --git a/README.md b/README.md
+index f15610c..f967eca 100644
+--- a/README.md
++++ b/README.md
+@@ -61,3 +61,12 @@ similar to sudo.
+
+ See the comment block in `timestamp.c` for an in-depth description on how
+ timestamps are created and checked to be as safe as possible.
++
++### `--with-doas-confdir`
++
++An optional feature can be enabled which will result in `doas` reading configuration
++snippets from `/etc/doas.d`. These configuration snippets have the same requirements
++as `/etc/doas.conf` (owned by root, not world-writable).
++
++If this feature is enabled, only the `/etc/doas.d` directory is read, and the historical
++`/etc/doas.conf` file is ignored.
+\ No newline at end of file
+diff --git a/configure b/configure
+index 1f92f01..a3078dc 100755
+--- a/configure
++++ b/configure
+@@ -27,6 +27,7 @@ usage: configure [options]
+ --without-shadow disable shadow support
+
+ --with-timestamp enable timestamp support
++ --with-doas-confdir enable configuration directory support
+
+ --uid-max=NUM set UID_MAX (default 65535)
+ --gid-max=NUM set GID_MAX (default 65535)
+@@ -38,6 +39,7 @@ EOF
+
+ # defaults
+ WITHOUT_TIMESTAMP=yes
++WITHOUT_CONFDIR=yes
+ UID_MAX=65535
+ GID_MAX=65535
+
+@@ -56,6 +58,8 @@ for x; do
+ --target) TARGET=$var ;;
+ --enable-debug) DEBUG=yes ;;
+ --enable-static) BUILD_STATIC=yes ;;
++ --with-doas-confdir) WITHOUT_CONFDIR= ;;
++ --without-doas-confdir) WITHOUT_CONFDIR=yes ;;
+ --with-pam) WITHOUT_PAM=; WITHOUT_SHADOW=yes ;;
+ --with-shadow) WITHOUT_SHADOW=; WITHOUT_PAM=yes ;;
+ --without-pam) WITHOUT_PAM=yes ;;
+@@ -558,4 +562,8 @@ fi
+
+ printf '#define DOAS_CONF "%s/doas.conf"\n' "${SYSCONFDIR}" >>$CONFIG_H
+
++if [ -z "$WITHOUT_CONFDIR" ]; then
++ printf '#define DOAS_CONFDIR "%s/doas.d"\n' "${SYSCONFDIR}" >>$CONFIG_H
++fi
++
+ printf '\n#endif /* CONFIG_H */\n' >>$CONFIG_H
+diff --git a/doas.c b/doas.c
+index ac3a42a..58701b7 100644
+--- a/doas.c
++++ b/doas.c
+@@ -35,6 +35,7 @@
+ #include <syslog.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <dirent.h>
+
+ #include "openbsd.h"
+ #include "doas.h"
+@@ -155,6 +156,7 @@ permit(uid_t uid, gid_t *groups, int ngroups, const struct rule **lastr,
+ static void
+ parseconfig(const char *filename, int checkperms)
+ {
++ extern const char *yyfn;
+ extern FILE *yyfp;
+ extern int yyparse(void);
+ struct stat sb;
+@@ -164,6 +166,8 @@ parseconfig(const char *filename, int checkperms)
+ err(1, checkperms ? "doas is not enabled, %s" :
+ "could not open config file %s", filename);
+
++ yyfn = filename;
++
+ if (checkperms) {
+ if (fstat(fileno(yyfp), &sb) != 0)
+ err(1, "fstat(\"%s\")", filename);
+@@ -174,11 +178,67 @@ parseconfig(const char *filename, int checkperms)
+ }
+
+ yyparse();
++ yyfn = NULL;
++
+ fclose(yyfp);
+ if (parse_errors)
+ exit(1);
+ }
+
++#ifdef DOAS_CONFDIR
++static int
++isconfdir(const char *dirpath)
++{
++ struct stat sb;
++
++ if (lstat(dirpath, &sb) != 0)
++ err(1, "lstat(\"%s\")", dirpath);
++
++ if ((sb.st_mode & (S_IFMT)) == S_IFDIR)
++ return 1;
++
++ errno = ENOTDIR;
++ return 0;
++}
++
++static void
++parseconfdir(const char *dirpath, int checkperms)
++{
++ struct dirent **dirent_table;
++ size_t i, dirent_count;
++ char pathbuf[PATH_MAX];
++
++ if (!isconfdir(dirpath))
++ err(1, checkperms ? "doas is not enabled, %s" :
++ "could not open config directory %s", dirpath);
++
++ dirent_count = scandir(dirpath, &dirent_table, NULL, alphasort);
++
++ for (i = 0; i < dirent_count; i++)
++ {
++ struct stat sb;
++ size_t pathlen;
++
++ pathlen = snprintf(pathbuf, sizeof pathbuf, "%s/%s", dirpath, dirent_table[i]->d_name);
++ free(dirent_table[i]);
++
++ /* make sure path ends in .conf */
++ if (strcmp(pathbuf + (pathlen - 5), ".conf"))
++ continue;
++
++ if (stat(pathbuf, &sb) != 0)
++ err(1, "stat(\"%s\")", pathbuf);
++
++ if ((sb.st_mode & (S_IFMT)) != S_IFREG)
++ continue;
++
++ parseconfig(pathbuf, checkperms);
++ }
++
++ free(dirent_table);
++}
++#endif
++
+ static void __dead
+ checkconfig(const char *confpath, int argc, char **argv,
+ uid_t uid, gid_t *groups, int ngroups, uid_t target)
+@@ -188,7 +248,13 @@ checkconfig(const char *confpath, int argc, char **argv,
+ if (setresuid(uid, uid, uid) != 0)
+ err(1, "setresuid");
+
++#ifdef DOAS_CONFDIR
++ if (isconfdir(confpath))
++ parseconfdir(confpath, 0);
++ else
++#else
+ parseconfig(confpath, 0);
++#endif
+ if (!argc)
+ exit(0);
+
+@@ -330,7 +396,13 @@ main(int argc, char **argv)
+ if (geteuid())
+ errx(1, "not installed setuid");
+
++#ifdef DOAS_CONFDIR
++ if (isconfdir(DOAS_CONFDIR))
++ parseconfdir(DOAS_CONFDIR, 1);
++ else
++#else
+ parseconfig(DOAS_CONF, 1);
++#endif
+
+ /* cmdline is used only for logging, no need to abort on truncate */
+ (void)strlcpy(cmdline, argv[0], sizeof(cmdline));
+diff --git a/parse.y b/parse.y
+index 388c2a5..c6d7ebf 100644
+--- a/parse.y
++++ b/parse.y
+@@ -49,6 +49,7 @@ typedef struct {
+ } yystype;
+ #define YYSTYPE yystype
+
++const char *yyfn;
+ FILE *yyfp;
+
+ struct rule **rules;
+@@ -203,7 +204,7 @@ yyerror(const char *fmt, ...)
+ va_start(va, fmt);
+ vfprintf(stderr, fmt, va);
+ va_end(va);
+- fprintf(stderr, " at line %d\n", yylval.lineno + 1);
++ fprintf(stderr, " at %s, line %d\n", yyfn, yylval.lineno + 1);
+ parse_errors++;
+ }
+
+
+From 046ff34408ea8bf2cafc079bd71a126aa009b005 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 4 Aug 2021 09:20:35 -0600
+Subject: [PATCH 2/8] gracefully handle ENOENT in isconfdir()
+
+---
+ doas.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/doas.c b/doas.c
+index 58701b7..4c0cafe 100644
+--- a/doas.c
++++ b/doas.c
+@@ -191,8 +191,13 @@ isconfdir(const char *dirpath)
+ {
+ struct stat sb;
+
+- if (lstat(dirpath, &sb) != 0)
+- err(1, "lstat(\"%s\")", dirpath);
++ if (lstat(dirpath, &sb) != 0) {
++ if (errno != ENOENT)
++ err(1, "lstat(\"%s\")", dirpath);
++
++ errno = ENOTDIR;
++ return 0;
++ }
+
+ if ((sb.st_mode & (S_IFMT)) == S_IFDIR)
+ return 1;
+
+From 6e76fb04ac637a1001ba201559f28279e3abe738 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 4 Aug 2021 09:31:49 -0600
+Subject: [PATCH 3/8] ensure pathlen - 5 is always non-zero
+
+---
+ doas.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/doas.c b/doas.c
+index 4c0cafe..f827fcd 100644
+--- a/doas.c
++++ b/doas.c
+@@ -228,6 +228,9 @@ parseconfdir(const char *dirpath, int checkperms)
+ free(dirent_table[i]);
+
+ /* make sure path ends in .conf */
++ if (pathlen < 6)
++ continue;
++
+ if (strcmp(pathbuf + (pathlen - 5), ".conf"))
+ continue;
+
+
+From cac56ea61e16d0ccb91100164a61e9f7215604e5 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 4 Aug 2021 10:17:35 -0600
+Subject: [PATCH 4/8] bail if dirent_count < 0
+
+---
+ doas.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/doas.c b/doas.c
+index f827fcd..6e308c8 100644
+--- a/doas.c
++++ b/doas.c
+@@ -210,7 +210,7 @@ static void
+ parseconfdir(const char *dirpath, int checkperms)
+ {
+ struct dirent **dirent_table;
+- size_t i, dirent_count;
++ int i, dirent_count;
+ char pathbuf[PATH_MAX];
+
+ if (!isconfdir(dirpath))
+@@ -218,6 +218,9 @@ parseconfdir(const char *dirpath, int checkperms)
+ "could not open config directory %s", dirpath);
+
+ dirent_count = scandir(dirpath, &dirent_table, NULL, alphasort);
++ if (dirent_count < 0)
++ err(1, checkperms ? "doas is not enabled, %s" :
++ "could not open config directory %s", dirpath);
+
+ for (i = 0; i < dirent_count; i++)
+ {
+
+From 8d224060adbdb1dececeb02660df8693f7c54a40 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 4 Aug 2021 10:20:33 -0600
+Subject: [PATCH 5/8] error out if no matching configuration files are found in
+ the configuration directory
+
+---
+ doas.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/doas.c b/doas.c
+index 6e308c8..cdfa3ea 100644
+--- a/doas.c
++++ b/doas.c
+@@ -210,7 +210,7 @@ static void
+ parseconfdir(const char *dirpath, int checkperms)
+ {
+ struct dirent **dirent_table;
+- int i, dirent_count;
++ int i, m, dirent_count;
+ char pathbuf[PATH_MAX];
+
+ if (!isconfdir(dirpath))
+@@ -222,7 +222,7 @@ parseconfdir(const char *dirpath, int checkperms)
+ err(1, checkperms ? "doas is not enabled, %s" :
+ "could not open config directory %s", dirpath);
+
+- for (i = 0; i < dirent_count; i++)
++ for (i = 0, m = 0; i < dirent_count; i++)
+ {
+ struct stat sb;
+ size_t pathlen;
+@@ -244,9 +244,16 @@ parseconfdir(const char *dirpath, int checkperms)
+ continue;
+
+ parseconfig(pathbuf, checkperms);
++ m++;
+ }
+
+ free(dirent_table);
++
++ if (!m) {
++ fprintf(stderr, "doas is not enabled, %s: no matching configuration files found\n",
++ dirpath);
++ exit(1);
++ }
+ }
+ #endif
+
+
+From 35c3e69fa52157683b8ae6fe040367390aa63bb6 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 4 Aug 2021 10:34:28 -0600
+Subject: [PATCH 6/8] use errx instead of fprintf(stderr)
+
+---
+ doas.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/doas.c b/doas.c
+index cdfa3ea..b50138a 100644
+--- a/doas.c
++++ b/doas.c
+@@ -249,11 +249,8 @@ parseconfdir(const char *dirpath, int checkperms)
+
+ free(dirent_table);
+
+- if (!m) {
+- fprintf(stderr, "doas is not enabled, %s: no matching configuration files found\n",
+- dirpath);
+- exit(1);
+- }
++ if (!m)
++ errx(1, "doas is not enabled, %s: no matching configuration files found\n", dirpath);
+ }
+ #endif
+
+
+From c9ff0fcdc0253679a0348995c36f89edc8d73a5b Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 4 Aug 2021 16:50:58 -0600
+Subject: [PATCH 7/8] fix up the ifndef DOAS_CONFDIR branch
+
+---
+ doas.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/doas.c b/doas.c
+index b50138a..d77186b 100644
+--- a/doas.c
++++ b/doas.c
+@@ -267,9 +267,8 @@ checkconfig(const char *confpath, int argc, char **argv,
+ if (isconfdir(confpath))
+ parseconfdir(confpath, 0);
+ else
+-#else
+- parseconfig(confpath, 0);
+ #endif
++ parseconfig(confpath, 0);
+ if (!argc)
+ exit(0);
+
+@@ -415,9 +414,8 @@ main(int argc, char **argv)
+ if (isconfdir(DOAS_CONFDIR))
+ parseconfdir(DOAS_CONFDIR, 1);
+ else
+-#else
+- parseconfig(DOAS_CONF, 1);
+ #endif
++ parseconfig(DOAS_CONF, 1);
+
+ /* cmdline is used only for logging, no need to abort on truncate */
+ (void)strlcpy(cmdline, argv[0], sizeof(cmdline));
+
+From 9fe4df5f004435fa0b092dc15a3c5ab09090f45d Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 3 Sep 2021 11:59:12 -0600
+Subject: [PATCH 8/8] add manpage for doas.d(5)
+
+---
+ GNUmakefile | 1 +
+ doas.conf.5 | 1 +
+ doas.d.5 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 52 insertions(+)
+ create mode 100644 doas.d.5
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 2eef88e..423731c 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -24,6 +24,7 @@ install: ${PROG} ${MAN}
+ chmod ${BINMODE} ${DESTDIR}${BINDIR}/${PROG}
+ cp -f doas.1 ${DESTDIR}${MANDIR}/man1
+ cp -f doas.conf.5 ${DESTDIR}${MANDIR}/man5
++ cp -f doas.d.5 ${DESTDIR}${MANDIR}/man5
+
+ uninstall:
+ rm -f ${DESTDIR}${BINDIR}/${PROG}
+diff --git a/doas.conf.5 b/doas.conf.5
+index e98bfbe..e90d512 100644
+--- a/doas.conf.5
++++ b/doas.conf.5
+@@ -143,6 +143,7 @@ permit nopass keepenv setenv { PATH } root as root
+ .Ed
+ .Sh SEE ALSO
+ .Xr doas 1 ,
++.Xr doas.d 5 ,
+ .Xr syslogd 8
+ .Sh HISTORY
+ The
+diff --git a/doas.d.5 b/doas.d.5
+new file mode 100644
+index 0000000..8f5f96a
+--- /dev/null
++++ b/doas.d.5
+@@ -0,0 +1,50 @@
++.\"Copyright (c) 2021 Ariadne Conill <ariadne@dereferenced.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.
++.Dd $Mdocdate: October 9 2020 $
++.Dt DOAS.CONF 5
++.Os
++.Sh NAME
++.Nm doas.conf
++.Nd doas configuration file
++.Sh DESCRIPTION
++The
++.Xr doas 1
++utility executes commands as other users according to the rules
++configured in either the configuration file or, optionally, the
++configuration directory. The preference to use the configuration
++file or configuration directory is determined at compile time,
++.Xr doas 1
++will only consult one or the other.
++.Pp
++Configuration snippets stored in the configuration directory
++follow the same rules as the classic
++.Xr doas 1
++configuration file, documented in
++.Xr doas.conf 5 .
++They must end with the .conf extension, or they will be ignored.
++.Pp
++These snippets are read in alphabetical order and thus can be
++ordered in the same way as other configuration directories.
++.Sh FILES
++.Bl -tag -width /etc/doas.d -compact
++.It Pa /etc/doas.d
++.Xr doas 1
++configuration directory.
++.Sh SEE ALSO
++.Xr doas 1 ,
++.Xr doas.conf 5
++.Sh HISTORY
++The
++.Nm
++configuration directory first appeared in OpenDoas.
diff --git a/main/doas/doas.post-install b/main/doas/doas.post-install
new file mode 100755
index 0000000000..46518437c2
--- /dev/null
+++ b/main/doas/doas.post-install
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+[ -d /etc/doas.d ] || mkdir /etc/doas.d
+[ -e /etc/doas.d/doas.conf ] && exit 0
+
+cat << _EOF_ >/etc/doas.d/doas.conf
+# This file is actually located at /etc/doas.d/doas.conf, and reflects
+# the system doas configuration. It may have been migrated from its
+# previous location, /etc/doas.conf, automatically.
+_EOF_
+
+[ -e /etc/doas.conf ] && cat /etc/doas.conf >> /etc/doas.d/doas.conf
+[ -e /etc/doas.conf ] || cat << _EOF_ >> /etc/doas.d/doas.conf
+# Please see /usr/share/doc/doas/doas.conf.example in the doas-doc
+# package for configuration examples.
+_EOF_
+
+# install compatibility symlink
+rm -f /etc/doas.conf
+ln -sf /etc/doas.d/doas.conf /etc/doas.conf
+
+# chmod 600
+chmod 600 /etc/doas.d/doas.conf
+
+cat << _EOF_ >&2
+ * Your configuration in /etc/doas.conf was migrated to
+ * /etc/doas.d/doas.conf and a symlink was installed in its
+ * place. For more information about the new doas configuration
+ * directory, consult doas.d(5).
+_EOF_ \ No newline at end of file
diff --git a/main/doas/doas.post-upgrade b/main/doas/doas.post-upgrade
new file mode 100755
index 0000000000..46518437c2
--- /dev/null
+++ b/main/doas/doas.post-upgrade
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+[ -d /etc/doas.d ] || mkdir /etc/doas.d
+[ -e /etc/doas.d/doas.conf ] && exit 0
+
+cat << _EOF_ >/etc/doas.d/doas.conf
+# This file is actually located at /etc/doas.d/doas.conf, and reflects
+# the system doas configuration. It may have been migrated from its
+# previous location, /etc/doas.conf, automatically.
+_EOF_
+
+[ -e /etc/doas.conf ] && cat /etc/doas.conf >> /etc/doas.d/doas.conf
+[ -e /etc/doas.conf ] || cat << _EOF_ >> /etc/doas.d/doas.conf
+# Please see /usr/share/doc/doas/doas.conf.example in the doas-doc
+# package for configuration examples.
+_EOF_
+
+# install compatibility symlink
+rm -f /etc/doas.conf
+ln -sf /etc/doas.d/doas.conf /etc/doas.conf
+
+# chmod 600
+chmod 600 /etc/doas.d/doas.conf
+
+cat << _EOF_ >&2
+ * Your configuration in /etc/doas.conf was migrated to
+ * /etc/doas.d/doas.conf and a symlink was installed in its
+ * place. For more information about the new doas configuration
+ * directory, consult doas.d(5).
+_EOF_ \ No newline at end of file
diff --git a/main/doas/manpage-example-path.patch b/main/doas/manpage-example-path.patch
new file mode 100644
index 0000000000..31048c70d6
--- /dev/null
+++ b/main/doas/manpage-example-path.patch
@@ -0,0 +1,16 @@
+--- OpenDoas-6.8.1.orig/doas.conf.5
++++ OpenDoas-6.8.1/doas.conf.5
+@@ -114,11 +114,11 @@
+ it is not considered a keyword.
+ .El
+ .Sh FILES
+-.Bl -tag -width /etc/examples/doas.conf -compact
++.Bl -tag -width /usr/share/doc/doas/doas.conf.example -compact
+ .It Pa /etc/doas.conf
+ .Xr doas 1
+ configuration file.
+-.It Pa /etc/examples/doas.conf
++.It Pa /usr/share/doc/doas/doas.conf.example
+ Example configuration file.
+ .El
+ .Sh EXAMPLES
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 672e407d6c..c33b835ed3 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -4,10 +4,10 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dovecot
-pkgver=2.3.15
+pkgver=2.3.16
_pkgverminor=${pkgver%.*}
-pkgrel=0
-_pigeonholever=0.5.15
+pkgrel=2
+_pigeonholever=0.5.16
pkgdesc="IMAP and POP3 server"
url="https://www.dovecot.org/"
arch="all"
@@ -24,13 +24,14 @@ makedepends="
expat-dev
gettext-dev
heimdal-dev
+ icu-dev
libcap-dev
libsodium-dev
libtool
linux-headers
mariadb-connector-c-dev
openldap-dev
- openssl-dev
+ openssl1.1-compat-dev
postgresql-dev
sqlite-dev
zlib-dev
@@ -61,11 +62,14 @@ source="https://www.dovecot.org/releases/$_pkgverminor/dovecot-$pkgver.tar.gz
default-config.patch
fix-out-of-memory-test.patch
fix-libssl_iostream_openssl.patch
+ fix-check-s390x.patch
+ fix-test-file-cache.patch
test-imap-client-hibernate.patch
dovecot.logrotate
dovecot.initd
"
_builddir_pigeonhole="$srcdir/$pkgname-$_pkgverminor-pigeonhole-$_pigeonholever"
+options="!check" # tests being weird
# secfixes:
# 2.3.15-r0:
@@ -330,13 +334,15 @@ _submv() {
}
sha512sums="
-75bbdbeac663da109f78dba06c42bb5193e911c6b3c64f055fc4473ae9afaf0c8304c49fc7f06c5c6b61e67dd13dc21fbed6ff160a99f38f547c88ba05e6b03a dovecot-2.3.15.tar.gz
-521070080802bf2a50cd0ff0af5dc991c04d70b807abc2cd9aa567444a4869f5f42800f19d9b740a519bd4069437139e70ca6ae4b905479fcec8faa133ac5f54 dovecot-2.3-pigeonhole-0.5.15.tar.gz
+31a9d352c7ead466d65ee0535b1fbd9138e35235f1ebfeedc4eef54cba450663c59708d162eaf0712af1c40f23526ac86aab2eece8cefde3edf690127472fd1e dovecot-2.3.16.tar.gz
+880e00654eab85cc41b27ac470cce6011991e3cdb005642f495c2297fd9492bfb2b6b4ef63c88c2ac10bec870ad69b8bee6b11dd1bc5099e16c3cc2857312543 dovecot-2.3-pigeonhole-0.5.16.tar.gz
fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a skip-iconv-check.patch
794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5 split-protocols.patch
0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07 default-config.patch
733cdbfb7f6b2608470bd30a0f9190ec86099d4c8e48b7fb92d7b595be665bf749976889033e1ad438edd3f99f2e0d496dd0d667291915c80df82f7e62483f59 fix-out-of-memory-test.patch
0fb56eb9c7fae8d8b1d794928ce2ba58d03c102cd7c3f959799c62c5d838ff535ecccb64bc1970d960f67d49388c880773e9eac5aed3bcf92e6efed3b56cc837 fix-libssl_iostream_openssl.patch
+c7a7882e2391f6d97e361a33cd627c423f5130d08828012bdcce02ba3050424475edbdb370185a717f1054575b9008633f1e433b2216b843b48225515ebe1dda fix-check-s390x.patch
+bfa8f18cce438bbf55cfaa2164358424f04393365aa98ebc342dc2677b48bf8fb16bdb1803aba18ad74fe8494bb7d2091569c430086ed2b47d13100ae5e9ffab fix-test-file-cache.patch
33c6eefaaca755c7766c74cb1afdc54fa9241b3d75b1db6b1167615061b5d79b85d759746c2d1793f4a3669d493489236e89ca4278dd38dd681f537c83e81a20 test-imap-client-hibernate.patch
9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0 dovecot.logrotate
d91951b81150d7a3ef6a674c0dc7b012f538164dac4b9d27a6801d31da6813b764995a438f69b6a680463e1b60a3b4f2959654f68e565fe116ea60312d5e5e70 dovecot.initd
diff --git a/main/dovecot/fix-check-s390x.patch b/main/dovecot/fix-check-s390x.patch
new file mode 100644
index 0000000000..d4d5f6ae5b
--- /dev/null
+++ b/main/dovecot/fix-check-s390x.patch
@@ -0,0 +1,52 @@
+commit ec4595097067a736717ef202fe8542b1b4bc2dd5
+Author: Timo Sirainen <timo.sirainen@open-xchange.com>
+Date: Tue Aug 10 12:22:08 2021 +0300
+
+ lib-index: Fix storing cache fields' last_used with 64bit big endian CPUs
+
+diff --git a/src/lib-index/mail-cache-fields.c b/src/lib-index/mail-cache-fields.c
+index e929fb559d..429e0d234c 100644
+--- a/src/lib-index/mail-cache-fields.c
++++ b/src/lib-index/mail-cache-fields.c
+@@ -524,6 +524,19 @@ static void copy_to_buf_byte(struct mail_cache *cache, buffer_t *dest,
+ }
+ }
+
++static void
++copy_to_buf_last_used(struct mail_cache *cache, buffer_t *dest, bool add_new)
++{
++ size_t offset = offsetof(struct mail_cache_field, last_used);
++#if defined(WORDS_BIGENDIAN) && SIZEOF_VOID_P == 8
++ /* 64bit time_t with big endian CPUs: copy the last 32 bits instead of
++ the first 32 bits (that are always 0). The 32 bits are enough until
++ year 2106, so we're not in a hurry to use 64 bits on disk. */
++ offset += sizeof(uint32_t);
++#endif
++ copy_to_buf(cache, dest, add_new, offset, sizeof(uint32_t));
++}
++
+ static int mail_cache_header_fields_update_locked(struct mail_cache *cache)
+ {
+ buffer_t *buffer;
+@@ -536,9 +549,7 @@ static int mail_cache_header_fields_update_locked(struct mail_cache *cache)
+
+ buffer = t_buffer_create(256);
+
+- copy_to_buf(cache, buffer, FALSE,
+- offsetof(struct mail_cache_field, last_used),
+- sizeof(uint32_t));
++ copy_to_buf_last_used(cache, buffer, FALSE);
+ ret = mail_cache_write(cache, buffer->data, buffer->used,
+ offset + MAIL_CACHE_FIELD_LAST_USED());
+ if (ret == 0) {
+@@ -599,9 +610,7 @@ void mail_cache_header_fields_get(struct mail_cache *cache, buffer_t *dest)
+ buffer_append(dest, &hdr, sizeof(hdr));
+
+ /* we have to keep the field order for the existing fields. */
+- copy_to_buf(cache, dest, TRUE,
+- offsetof(struct mail_cache_field, last_used),
+- sizeof(uint32_t));
++ copy_to_buf_last_used(cache, dest, TRUE);
+ copy_to_buf(cache, dest, TRUE,
+ offsetof(struct mail_cache_field, field_size),
+ sizeof(uint32_t));
diff --git a/main/dovecot/fix-test-file-cache.patch b/main/dovecot/fix-test-file-cache.patch
new file mode 100644
index 0000000000..c4a9630aa8
--- /dev/null
+++ b/main/dovecot/fix-test-file-cache.patch
@@ -0,0 +1,22 @@
+posted over IRC to me by Aki Tuomi
+
+diff --git a/src/lib/test-file-cache.c b/src/lib/test-file-cache.c
+index 6bac9abfe7..a402d38a58 100644
+--- a/src/lib/test-file-cache.c
++++ b/src/lib/test-file-cache.c
+@@ -251,6 +251,7 @@ static void test_file_cache_errors(void)
+ test_assert(size == 0);
+ test_assert(map == NULL);
+
++#if 0
+ /* temporarily set a small memory limit to make mmap attempt fail */
+ struct rlimit rl_cur;
+ test_assert(getrlimit(RLIMIT_AS, &rl_cur) == 0);
+@@ -274,6 +275,7 @@ static void test_file_cache_errors(void)
+ test_expect_error_string(errstr);
+ test_assert(file_cache_set_size(cache, page_size*2) == -1);
+ test_assert(setrlimit(RLIMIT_AS, &rl_cur) == 0);
++#endif
+
+ file_cache_free(&cache);
+ i_close_fd(&fd);
diff --git a/main/doxygen/APKBUILD b/main/doxygen/APKBUILD
index 6ae0689e2f..ca09568515 100644
--- a/main/doxygen/APKBUILD
+++ b/main/doxygen/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=doxygen
-pkgver=1.9.1
+pkgver=1.9.2
pkgrel=1
pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
url="https://www.doxygen.nl/"
@@ -8,7 +8,11 @@ arch="all"
license="GPL-2.0-or-later"
checkdepends="libxml2-utils"
makedepends="flex bison coreutils perl python3 cmake"
-source="https://doxygen.nl/files/doxygen-$pkgver.src.tar.gz"
+source="https://doxygen.nl/files/doxygen-$pkgver.src.tar.gz
+ fix-segfault.patch
+ "
+
+[ "$CARCH" = "riscv64" ] && options="textrels"
build() {
cmake -B build \
@@ -29,4 +33,7 @@ package() {
make -C build DESTDIR="$pkgdir" install
}
-sha512sums="637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed doxygen-1.9.1.src.tar.gz"
+sha512sums="
+2729d013b0363a919bbf6babd300389b76e95dd9dbb16ac0f57fc5a0392d3e2076ea4fba958a236311513e68e4aa056a77bd22c9c92b410a17eed095e5adccc0 doxygen-1.9.2.src.tar.gz
+ced906c1caccf478a217c05dfcf03f9c5b7854b88d461c6364d9857c5ad1fc96e983a1c30e16859a9aaa76da837626a0750d5ebc2c58e9ef703a3b31cf23f884 fix-segfault.patch
+"
diff --git a/main/doxygen/fix-segfault.patch b/main/doxygen/fix-segfault.patch
new file mode 100644
index 0000000000..6dc4cf4840
--- /dev/null
+++ b/main/doxygen/fix-segfault.patch
@@ -0,0 +1,83 @@
+From 11bd374ea216b561deaf9be675ddd8941b80a487 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Sun, 29 Aug 2021 01:07:27 -0300
+Subject: [PATCH] Fix memory corruption in TextStream.
+
+This resulted in observable crashes with musl libc due to corruption in
+malloc, but could also be observed in valgrind, when building GNU
+Radio's doxygen docs. One of the valgrind errors is reproduced below.
+
+==26== Invalid read of size 4
+==26== at 0x405A62D: fwrite (fwrite.c:32)
+==26== by 0x47154D: flush (textstream.h:181)
+==26== by 0x47154D: setFile (textstream.h:74)
+==26== by 0x47154D: OutputGenerator::startPlainFile(QCString const&) (outputgen.cpp:69)
+==26== by 0x2EFF57: HtmlGenerator::startFile(QCString const&, QCString const&, QCString const&, int) (htmlgen.cpp:1121)
+==26== by 0x3083EC: forall<OutputGenerator, const QCString&, const QCString&, const QCString&, int, const QCString&, const QCString&, const QCString&, int&> (outputlist.h:512)
+==26== by 0x3083EC: startFile (outputlist.h:91)
+==26== by 0x3083EC: startFile(OutputList&, QCString const&, QCString const&, QCString const&, HighlightedItem, bool, QCString const&) (index.cpp:240)
+==26== by 0x296807: FileDefImpl::writeSourceHeader(OutputList&) (filedef.cpp:1110)
+==26== by 0x276751: generateFileSources() (doxygen.cpp:7971)
+==26== by 0x277793: generateOutput() (doxygen.cpp:11992)
+==26== by 0x21173E: main (main.cpp:38)
+==26== Address 0x130bb62c is 140 bytes inside a block of size 1,264 free'd
+==26== at 0x48BAA4B: free (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+==26== by 0x40585D0: fclose (fclose.c:35)
+==26== by 0x4DCE5D7: std::__basic_file<char>::close() (in /usr/lib/libstdc++.so.6.0.28)
+==26== by 0x4E1D676: std::basic_filebuf<char, std::char_traits<char> >::close() (in /usr/lib/libstdc++.so.6.0.28)
+==26== by 0x4B055C: ~basic_filebuf (fstream:249)
+==26== by 0x4B055C: ~basic_ofstream (fstream:863)
+==26== by 0x4B055C: writeJavaScriptSearchIndex() (searchindex.cpp:923)
+==26== by 0x2776F0: generateOutput() (doxygen.cpp:11957)
+==26== by 0x21173E: main (main.cpp:38)
+==26== Block was alloc'd at
+==26== at 0x48B981F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+==26== by 0x40578FE: fdopen (__fdopen.c:21)
+==26== by 0x405943E: fopen (fopen.c:26)
+==26== by 0x4DCE55F: std::__basic_file<char>::open(char const*, std::_Ios_Openmode, int) (in /usr/lib/libstdc++.so.6.0.28)
+==26== by 0x4E1E19A: std::basic_filebuf<char, std::char_traits<char> >::open(char const*, std::_Ios_Openmode) (in /usr/lib/libstdc++.so.6.0.28)
+==26== by 0x4B0470: open (fstream:332)
+==26== by 0x4B0470: open (fstream:962)
+==26== by 0x4B0470: basic_ofstream (fstream:830)
+==26== by 0x4B0470: writeJavaScriptSearchIndex() (searchindex.cpp:923)
+==26== by 0x2776F0: generateOutput() (doxygen.cpp:11957)
+==26== by 0x21173E: main (main.cpp:38)
+
+What was happening is that the TextStream object is reused for multiple
+different files. Therefore, when one calls setStream(nullptr) or
+setFile(nullptr), m_f or m_s will, respectively, still contain a pointer
+to the previous member, which is used when one calls setFile() or
+setStream() again, since these methods will call flush().
+
+For example, a program doing
+
+ s.setFile(f1);
+ s.setStream(nullptr);
+ fclose(f1);
+ s.setFile(f2);
+
+will call fwrite(f1, ...). This pattern can be observed in many parts of
+Doxygen, so fixing it in TextStream itself by always zeroing the other
+pointer is the simplest fix.
+---
+ src/textstream.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/textstream.h b/src/textstream.h
+index 161ce7fe1..38027ec07 100644
+--- a/src/textstream.h
++++ b/src/textstream.h
+@@ -67,11 +67,13 @@ class TextStream final
+ {
+ flush();
+ m_s = s;
++ m_f = nullptr;
+ }
+
+ void setFile(FILE *f)
+ {
+ flush();
++ m_s = nullptr;
+ m_f = f;
+ }
+
diff --git a/main/drbd-utils/APKBUILD b/main/drbd-utils/APKBUILD
index a6e5735ef9..8bb89b16f8 100644
--- a/main/drbd-utils/APKBUILD
+++ b/main/drbd-utils/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=drbd-utils
-pkgver=9.18.0
+pkgver=9.19.0
pkgrel=0
pkgdesc="Network-based RAID 1"
url="https://www.drbd.org"
@@ -13,7 +13,7 @@ options="!check" # no tests provided
provides="drbd=$pkgver-r$pkgrel"
subpackages="$pkgname-doc $pkgname-pacemaker::noarch
$pkgname-bash-completion:bashcomp:noarch $pkgname-openrc"
-source="https://www.linbit.com/downloads/drbd/utils/drbd-utils-$pkgver.tar.gz
+source="https://pkg.linbit.com//downloads/drbd/utils/drbd-utils-$pkgver.tar.gz
drbdsetup-permissions.patch
fix-drbdsetup_events2.c.patch
drbd.initd
@@ -61,7 +61,7 @@ bashcomp() {
}
sha512sums="
-1bbd3c5f744b1b2c76c1b5638efaf75de1b000ec74c5c54fa004bfc362db56a7e147a4b222a6781d0a81cd58accbb8147c28d19be9419b37f461bb90800625e9 drbd-utils-9.18.0.tar.gz
+e2dd2205a2e0b2c82ad7430146919a34cad6d5636ff9e6c229c0ab073b31f2bd02ae20027b2ec9fc5e42c52c3447f2bd671f647b4336eaf5b93d0a4029ca75b5 drbd-utils-9.19.0.tar.gz
562ae8eee03148666fb6e6e700c1eb9086f6901e176ea6cd007e3ac4e39d1cdaf967064de74dc1ad620155996dc7011bd0e2abd1c9595ff9bf5f4413673726f3 drbdsetup-permissions.patch
dc9d825019803ab5cf66d14b0b67b9d3f42cabac2aee07228176b9ff73dacc74e413f2c9ed0fe22a8217ff502c80b891950d1d4fb51df56d9c8e51e7c1fc1cc6 fix-drbdsetup_events2.c.patch
f61a833dc5eea79000a7dd85e83ae10e284109c76b5d59974ed69f92dbab6c389d6d20f7ea374b7c066519c6d1d816ed27b48dbaee6b91fb9754974acf52f46e drbd.initd
diff --git a/main/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD
index 2dbdba1e48..4bdb23ad0b 100644
--- a/main/e2fsprogs/APKBUILD
+++ b/main/e2fsprogs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=e2fsprogs
-pkgver=1.46.2
+pkgver=1.46.4
pkgrel=0
pkgdesc="Standard Ext2/3/4 filesystem utilities"
url="http://e2fsprogs.sourceforge.net"
@@ -12,8 +12,8 @@ makedepends="$depends_dev linux-headers"
checkdepends="diffutils perl"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc libcom_err $pkgname-libs $pkgname-extra"
source="$pkgname-$pkgver.tar.gz::https://github.com/tytso/e2fsprogs/archive/v$pkgver.tar.gz
- ensure-small-filesystems-are-Y2038-ok.patch
"
+
case $CHOST in
riscv64*)
# j_recover_fast_commit appears to be a false negative due to a compiler
@@ -100,5 +100,6 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
}
-sha512sums="2550cb2fbed0c9cc6f0df0e8870cb36dd1c8d4e66321c9551b0fb14d343c7b3f09110424db2699926b8249600c0788c1a2e270fae9d0bacecd71f96745883b30 e2fsprogs-1.46.2.tar.gz
-daf63f8ca704eaa9a3293444469ef1a36c09806614d20e844b451af2426d5c8611a61669c99e4702f1fd787145cf9a34f1345ae5ed15ef47c41ca02f03302231 ensure-small-filesystems-are-Y2038-ok.patch"
+sha512sums="
+ea1a489581e62037ddb20e35e8da75eb2569bf0c7f65c76d123bb0f3c80d2b0e03ce9bfddc254602e3b01b3efc4128216b8390c89184e6841b47d19ab2977fbc e2fsprogs-1.46.4.tar.gz
+"
diff --git a/main/e2fsprogs/ensure-small-filesystems-are-Y2038-ok.patch b/main/e2fsprogs/ensure-small-filesystems-are-Y2038-ok.patch
deleted file mode 100644
index df77148b57..0000000000
--- a/main/e2fsprogs/ensure-small-filesystems-are-Y2038-ok.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Dermot Bradley <dermot_bradley@yahoo.com>
-Date: Thu, 10 Dec 2020 23:52 +0000
-Subject: ensure that small filesystems are Y2038 ok
-
-When formatting a partition with a EXT2/3/4 filesystem, if the partition
-specified is 512M or smaller in size then the "small" entry from
-/etc/mke2fs.conf is used, in addition to the defaults in that file, for
-the new filesystem's settings. Currently the "small" entry specifies an
-inode size of 128bytes which is insufficient to hold timestamps beyond
-2038.
-
-After booting a system with an affected EXT2/3/4 filesystem the kernel
-buffer will show a warning:
-
-$ dmesg | grep 2038
-
- filesystem being remounted at / supports timestamps until 2038
-
-This patch removes the 128 byte inode size entry from the 'small'
-definition and so the formatting tool will fallback to the default
-value of 256 byte inodes which will ensure no Y2038 issues. The disk
-space overhead when formatting after this change will slightly increase.
-
----
-
-diff -aur a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in
---- a/misc/mke2fs.conf.in
-+++ b/misc/mke2fs.conf.in
-@@ -16,7 +16,6 @@
- }
- small = {
- blocksize = 1024
-- inode_size = 128
- inode_ratio = 4096
- }
- floppy = {
diff --git a/main/efitools/APKBUILD b/main/efitools/APKBUILD
index 9fe306cf61..d2ff29fcea 100644
--- a/main/efitools/APKBUILD
+++ b/main/efitools/APKBUILD
@@ -3,12 +3,14 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=efitools
pkgver=1.9.2
-pkgrel=2
+pkgrel=4
pkgdesc="EFI tools"
url="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"
-arch="all !armhf !s390x !ppc64le !mips !mips64" # limited by sbsigntool
+# riscv64: fails to build
+# others: limited by sbsigntool
+arch="all !armhf !s390x !ppc64le !mips !mips64 !riscv64"
license="(GPL-2.0-only AND LGPL-2.1-or-later) WITH OpenSSL-Exception"
-makedepends="gnu-efi-dev openssl-dev perl-file-slurp help2man sbsigntool"
+makedepends="gnu-efi-dev openssl1.1-compat-dev perl-file-slurp help2man sbsigntool"
subpackages="$pkgname-doc"
source="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/efitools-$pkgver.tar.gz
001-datatypes.patch
diff --git a/main/eggdrop/APKBUILD b/main/eggdrop/APKBUILD
index 963500c57f..6d63c4fd8c 100644
--- a/main/eggdrop/APKBUILD
+++ b/main/eggdrop/APKBUILD
@@ -1,14 +1,13 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=eggdrop
pkgver=1.8.4
-pkgrel=1
+pkgrel=4
pkgdesc="World's most popular Open Source IRC bot"
url="https://eggheads.org/"
arch="all"
license='GPL-2.0-or-later'
options="!check" # No test suite
-depends="tcl"
-makedepends="openssl-dev tcl-dev !bind-libs"
+makedepends="openssl1.1-compat-dev tcl-dev !bind-libs"
subpackages="$pkgname-doc $pkgname-logs2html $pkgname-gseen"
source="$pkgname-$pkgver.tar.gz::https://github.com/eggheads/eggdrop/archive/v$pkgver.tar.gz
eggdrop-langdir.patch
@@ -106,8 +105,10 @@ gseen() {
cp src/mod/gseen.mod/README "$subpkgdir"/usr/share/eggdrop/gseen/
}
-sha512sums="80239a015f518cadc251bfc5edcf08715b9200a70eb0df7edf0efc113f320a7e407ab1fee96322fc6ec923781aa94f5a947c458e935e8a3714fb86cbcc02cb04 eggdrop-1.8.4.tar.gz
+sha512sums="
+80239a015f518cadc251bfc5edcf08715b9200a70eb0df7edf0efc113f320a7e407ab1fee96322fc6ec923781aa94f5a947c458e935e8a3714fb86cbcc02cb04 eggdrop-1.8.4.tar.gz
d8e8655fed028030bc3cfe28207a289d0efbc412c7e01170a4d0bb31200f7ea93df310f19e83b485013ca5d4264694b4956252663cb3a63c3d5e4cc31346e0fe eggdrop-langdir.patch
be173d94a953c4dc5b178950d06ce894deda60c3ddb8195c836797d45fbbcc9fba3bc3d3f34c96226464fdd327093a5d15bbc2b7924d18f845738c1a4dd64a3b logs2html.mod.patch
7879b998880deb1943c41569e243f9f1a50df23982d82d942af6c111e7fac0fb8a8444c84980645ba15b71dd69c8db2dab6f90bcb7a4292306011c7bcfc03d0d gseen.mod.patch
-7966d4d42994e44a0e571b89f1c66cb41f672d75e6ced7051d1ece23d8c209059c3565b41de950bf9c907701ce7a5e33a215b637587075ed300a002a58eda503 utf8.patch"
+7966d4d42994e44a0e571b89f1c66cb41f672d75e6ced7051d1ece23d8c209059c3565b41de950bf9c907701ce7a5e33a215b637587075ed300a002a58eda503 utf8.patch
+"
diff --git a/main/elfutils/APKBUILD b/main/elfutils/APKBUILD
index aad47bcb61..f5e18c7b21 100644
--- a/main/elfutils/APKBUILD
+++ b/main/elfutils/APKBUILD
@@ -1,23 +1,19 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=elfutils
-pkgver=0.182
-pkgrel=1
+pkgver=0.185
+pkgrel=0
pkgdesc="Utilities and DSOs to handle ELF files and DWARF data"
url="http://elfutils.org/"
arch="all"
license="GPL-3.0-or-later AND (GPL-2.0-or-later OR LGPL-3.0-or-later)"
makedepends="bison flex-dev zlib-dev bzip2-dev xz-dev argp-standalone
- bsd-compat-headers autoconf automake libtool fts-dev musl-obstack-dev
- linux-headers"
+ bsd-compat-headers libtool fts-dev musl-obstack-dev linux-headers"
subpackages="libelf libelf-static $pkgname-dev $pkgname-doc"
source="https://sourceware.org/elfutils/ftp/$pkgver/elfutils-$pkgver.tar.bz2
error.h
fix-aarch64_fregs.patch
fix-uninitialized.patch
- musl-fts-obstack.patch
musl-macros.patch
- musl-qsort_r.patch
- musl-strerror_r.patch
musl-strndupa.patch
musl-asm-ptrace-h.patch
"
@@ -48,8 +44,6 @@ prepare() {
cp "$srcdir"/error.h "$builddir"/lib
cp "$srcdir"/error.h "$builddir"/src
- autoreconf -vif
-
cat > lib/libintl.h <<-EOF
#ifndef LIBINTL_H
#define LIBINTL_H
@@ -91,13 +85,12 @@ libelf() {
mv "$pkgdir"/usr/lib/*-*.so "$subpkgdir"/usr/lib/
}
-sha512sums="8ab0735bbe11b4383169341bf674ace360038b6ae5239f1d5a991c46260cd4bce545e078735b7de3b8fab132bb5da41f60689ff1b1d7ebccfada117a954a2c81 elfutils-0.182.tar.bz2
+sha512sums="
+34de0de1355b11740e036e0fc64f2fc063587c8eb121b19216ee5548d3f0f268d8fc3995176c47190466b9d881007cfa11a9d01e9a50e38af6119492bf8bb47f elfutils-0.185.tar.bz2
8b650bc78cea66f30f0ff66357005890ac8a1b04a8dcc50209cb10a4b4c5ede849505cb68463beca8316ace0fbd53bbc484cfb597805b55616f3b3fc2b864e9a error.h
c3676b0b8b40d6e437f5d88c0d658dc0829ec97d1955e4bbf96f4cff9ee9001b8f2f06174450ae7aa5858b91c7905bdbd49073b561c346416132338a9c94731b fix-aarch64_fregs.patch
b9ba55e1b56a8abf694b6d02f022d9a3a0ae6ab53a8c4a71e49552e32411ef410d3a7512fbd1a729696bc2046ac11586829816f0fa3b8226ee77c9dc4b741e58 fix-uninitialized.patch
-3b9fb4ebb5b33d4c7fb1e1f7e476a3ea4eba796bd9c89b9c920ef8c879638fb70abb1d83a0039b5b95558ba9597fb9cdb0fd6983498a11bb8dbdd50738c925c8 musl-fts-obstack.patch
952109b1e0a2ccf435f5a7825ca3514d526161dae32e3d734f93d76b5693c469a889a488cb05cf423a006e9df550e7aae68697cc09d2c48fee1acd38163e5750 musl-macros.patch
-ce1a25387865ff96ecc5104810acc225dd64c28571ee5473ab732f7b63b927e4a260ebe74f17d3d8ba0c917cce233b9f902dd35c149d6d8317eecbc71f8d2da6 musl-qsort_r.patch
-a0d986100c8ff2ef0595645ec1b2eeb1d517b7442aef5f349ebf27fcb66c76e51fadeda25bed5f04b4bb16a61aa23ac6e86a1f34a0087d2136acf0f64c3fa4d1 musl-strerror_r.patch
1728376b8408e9ae97f048d54bc6faae889bca197cc0500a952e64683835dfca66465aa4bce8e57d1ce7a81dcba0bbeeb4bd1e1026d3c4bd196ef4ffe536a509 musl-strndupa.patch
-7c529f88dc248f657a8d690044560c20a222c5b37d0d7dcb057bf2eea8938c406cccd6129bce19542088511a026b233234c9a83933a525c4691810be9ca712bf musl-asm-ptrace-h.patch"
+7c529f88dc248f657a8d690044560c20a222c5b37d0d7dcb057bf2eea8938c406cccd6129bce19542088511a026b233234c9a83933a525c4691810be9ca712bf musl-asm-ptrace-h.patch
+"
diff --git a/main/elfutils/musl-fts-obstack.patch b/main/elfutils/musl-fts-obstack.patch
deleted file mode 100644
index 8d45854e66..0000000000
--- a/main/elfutils/musl-fts-obstack.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- a/configure.ac 2015-10-15 15:16:57.000000000 +0200
-+++ b/configure.ac 2015-11-20 05:32:57.723901582 +0100
-@@ -305,6 +305,62 @@
- fi
- AC_SUBST([argp_LDADD])
-
-+dnl Check if we have fts available from our libc
-+AC_LINK_IFELSE(
-+ [AC_LANG_PROGRAM(
-+ [#if !defined(__x86_64__)
-+ #undef _FILE_OFFSET_BITS
-+ #define _FILE_OFFSET_BITS 32
-+ #endif
-+ #include <fts.h>],
-+ [FTS* fts = 0; return fts_close(fts); return 0;]
-+ )],
-+ [libc_has_fts="true"],
-+ [libc_has_fts="false"]
-+)
-+
-+dnl If our libc doesn't provide fts, then test for libfts
-+if test "$libc_has_fts" = "false" ; then
-+ AC_MSG_WARN("libc does not have fts")
-+ AC_CHECK_LIB([fts], [fts_close], [have_fts="true"], [have_fts="false"])
-+
-+ if test "$have_fts" = "false"; then
-+ AC_MSG_ERROR("no libfts found")
-+ else
-+ fts_LDADD="-lfts"
-+ fi
-+else
-+ fts_LDADD=""
-+fi
-+AC_SUBST([fts_LDADD])
-+
-+dnl Check if we have obstack available from our libc
-+AC_LINK_IFELSE(
-+ [AC_LANG_PROGRAM(
-+ [#include <obstack.h>],
-+ [_obstack_begin(0, 0, 0, NULL, NULL); return 0;]
-+ )],
-+ [libc_has_obstack="true"],
-+ [libc_has_obstack="false"]
-+)
-+
-+dnl If our libc doesn't provide obstack, then test for libobstack
-+if test "$libc_has_obstack" = "false" ; then
-+ AC_MSG_WARN("libc does not have obstack")
-+ AC_CHECK_LIB([obstack], [_obstack_begin], [have_obstack="true"], [have_obstack="false"])
-+
-+ if test "$have_obstack" = "false"; then
-+ AC_MSG_ERROR("no libobstack found")
-+ else
-+ obstack_LDADD="-lobstack"
-+ fi
-+else
-+ obstack_LDADD=""
-+fi
-+AC_SUBST([obstack_LDADD])
-+
-+dnl The directories with content.
-+
- dnl The directories with content.
-
- dnl Documentation.
---- a/src/Makefile.am.orig
-+++ b/src/Makefile.am
-@@ -46,7 +46,7 @@
- else
- libasm = ../libasm/libasm.so
- libdw = ../libdw/libdw.so
--libelf = ../libelf/libelf.so
-+libelf = ../libelf/libelf.so $(fts_LDADD) $(obstack_LDADD)
- endif
- libebl = ../libebl/libebl.a
- libeu = ../lib/libeu.a
---- a/libdw/Makefile.am.orig
-+++ b/libdw/Makefile.am
-@@ -109,7 +109,7 @@
- ../libcpu/libcpu_pic.a libdw_pic.a ../libdwelf/libdwelf_pic.a \
- ../libdwfl/libdwfl_pic.a
- libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so
--libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) -pthread
-+libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) $(zip_LIBS) -pthread
- libdw_so_SOURCES =
- libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS)
- $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \
diff --git a/main/elfutils/musl-qsort_r.patch b/main/elfutils/musl-qsort_r.patch
deleted file mode 100644
index 0843aec648..0000000000
--- a/main/elfutils/musl-qsort_r.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/src/readelf.c b/src/readelf.c
-index cbb519d..dea513b 100644
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -4829,10 +4829,11 @@ listptr_base (struct listptr *p)
- return cudie_base (&cu);
- }
-
-+static const char *listptr_name;
-+
- static int
--compare_listptr (const void *a, const void *b, void *arg)
-+compare_listptr (const void *a, const void *b)
- {
-- const char *name = arg;
- struct listptr *p1 = (void *) a;
- struct listptr *p2 = (void *) b;
-
-@@ -4848,21 +4849,21 @@ compare_listptr (const void *a, const void *b, void *arg)
- p1->warned = p2->warned = true;
- error (0, 0,
- gettext ("%s %#" PRIx64 " used with different address sizes"),
-- name, (uint64_t) p1->offset);
-+ listptr_name, (uint64_t) p1->offset);
- }
- if (p1->dwarf64 != p2->dwarf64)
- {
- p1->warned = p2->warned = true;
- error (0, 0,
- gettext ("%s %#" PRIx64 " used with different offset sizes"),
-- name, (uint64_t) p1->offset);
-+ listptr_name, (uint64_t) p1->offset);
- }
- if (listptr_base (p1) != listptr_base (p2))
- {
- p1->warned = p2->warned = true;
- error (0, 0,
- gettext ("%s %#" PRIx64 " used with different base addresses"),
-- name, (uint64_t) p1->offset);
-+ listptr_name, (uint64_t) p1->offset);
- }
- if (p1->attr != p2 ->attr)
- {
-@@ -4870,7 +4871,7 @@ compare_listptr (const void *a, const void *b, void *arg)
- error (0, 0,
- gettext ("%s %#" PRIx64
- " used with different attribute %s and %s"),
-- name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr),
-+ listptr_name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr),
- dwarf_attr_name (p2->attr));
- }
- }
-@@ -4941,9 +4942,11 @@ notice_listptr (enum section_e section, struct listptr_table *table,
- static void
- sort_listptr (struct listptr_table *table, const char *name)
- {
-- if (table->n > 0)
-- qsort_r (table->table, table->n, sizeof table->table[0],
-- &compare_listptr, (void *) name);
-+ if (table->n > 0) {
-+ listptr_name = name;
-+ qsort (table->table, table->n, sizeof table->table[0],
-+ &compare_listptr);
-+ }
- }
-
- static bool
diff --git a/main/elfutils/musl-strerror_r.patch b/main/elfutils/musl-strerror_r.patch
deleted file mode 100644
index 72977951d5..0000000000
--- a/main/elfutils/musl-strerror_r.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libdwfl/dwfl_error.c 2015-09-29 17:18:51.000000000 +0200
-+++ b/libdwfl/dwfl_error.c 2015-11-20 05:11:29.889002058 +0100
-@@ -154,7 +154,16 @@
- switch (error &~ 0xffff)
- {
- case OTHER_ERROR (ERRNO):
-+#if defined(__GLIBC__)
- return strerror_r (error & 0xffff, "bad", 0);
-+#else
-+ {
-+ static __thread char buf[128] = "";
-+ if (0 == strerror_r(error & 0xffff, buf, sizeof(buf)))
-+ return buf;
-+ }
-+ return "strerror_r() failed";
-+#endif
- case OTHER_ERROR (LIBELF):
- return elf_errmsg (error & 0xffff);
- case OTHER_ERROR (LIBDW):
diff --git a/main/elinks/APKBUILD b/main/elinks/APKBUILD
index 76cb1f1ce2..647e33b368 100644
--- a/main/elinks/APKBUILD
+++ b/main/elinks/APKBUILD
@@ -3,13 +3,13 @@
pkgname=elinks
pkgver=0.13
_ver=${pkgver/_/}
-pkgrel=6
+pkgrel=8
pkgdesc="a text mode web browser"
url="http://elinks.or.cz/"
arch="all"
license="GPL"
depends=
-makedepends="bzip2-dev zlib-dev openssl-dev expat-dev gettext-dev"
+makedepends="bzip2-dev zlib-dev openssl1.1-compat-dev expat-dev gettext-dev"
install=
subpackages="$pkgname-doc $pkgname-lang"
source="https://dev.alpinelinux.org/archive/elinks/elinks-$pkgver.tar.bz2
diff --git a/main/ell/APKBUILD b/main/ell/APKBUILD
index 6f31a564a8..07525a9976 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.41
+pkgver=0.44
pkgrel=0
pkgdesc="Linux library for embedded development"
url="https://01.org/ell"
@@ -38,5 +38,5 @@ package() {
}
sha512sums="
-57247b62c436524c9fa33ec6c6c88c6f9e4a0eae05ea1fed9aa08b81231c0a2595d85480712a6d34de4fd0a587e9dcd270053eab05f365b79a308589f0f1ee78 ell-0.41.tar.gz
+0d663b437852c99e11e448335466fb96d7093858a626b84ee2eb9bacfa7b703dc9f22d273256e6db007bdf213d5d2fb3c0824960840ad7e0ea1c5139de8496e1 ell-0.44.tar.gz
"
diff --git a/main/email/APKBUILD b/main/email/APKBUILD
index d8a9c867df..579aefb7c2 100644
--- a/main/email/APKBUILD
+++ b/main/email/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=email
pkgver=3.1.4
-pkgrel=9
+pkgrel=11
pkgdesc="command line SMTP client that's simple"
options="!check" # No testsuite
url="http://www.cleancode.org/projects/email"
arch="all"
license="GPL-2.0-or-later"
depends="openssl"
-makedepends="openssl-dev"
+makedepends="openssl1.1-compat-dev"
subpackages="$pkgname-doc"
source="https://dev.alpinelinux.org/archive/email/email-$pkgver.tar.gz"
builddir="$srcdir/$pkgname-3.1.3" # Release was made with the wrong tarball name
diff --git a/main/encfs/APKBUILD b/main/encfs/APKBUILD
index 44e2bb0dd5..bbd9ca95e0 100644
--- a/main/encfs/APKBUILD
+++ b/main/encfs/APKBUILD
@@ -3,12 +3,12 @@
pkgname=encfs
pkgver=1.9.5
_ver=${pkgver/_/-}
-pkgrel=9
+pkgrel=12
pkgdesc="EncFS provides an encrypted filesystem in user-space"
url="https://vgough.github.io/encfs/"
arch="all"
license="GPL-3.0-only"
-makedepends="rlog-dev openssl-dev fuse-dev boost-dev
+makedepends="rlog-dev openssl1.1-compat-dev fuse-dev boost-dev
libtool gettext-dev cmake tinyxml2-dev perl"
subpackages="$pkgname-doc $pkgname-lang $pkgname-libs"
source="$pkgname-$_ver.tar.gz::https://github.com/vgough/encfs/archive/v$_ver.tar.gz"
diff --git a/main/ethtool/APKBUILD b/main/ethtool/APKBUILD
index 8307a2fc61..0bcc3b3e1b 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.13
+pkgver=5.14
pkgrel=0
pkgdesc="Utility for controlling network drivers and hardware"
url="https://mirrors.edge.kernel.org/pub/software/network/ethtool/"
@@ -38,5 +38,5 @@ bashcomp() {
}
sha512sums="
-44426653aabd20707d2e597707113f4d30d12696b4f32c0ab0450af0dccece1b6a11e529a22d1299204f63c9e71ae41a1495d3d36b8f630f1734a72694d779be ethtool-5.13.tar.xz
+880c4b6d5f83c25cabc6101222a5abf5f7e5e6501165ba5cdb420da242c351d7c32c1cffacfa1bcf0c4655434d89c64d39f0809af0d38f626a0a78f92ec68f87 ethtool-5.14.tar.xz
"
diff --git a/main/execline/APKBUILD b/main/execline/APKBUILD
index 55271db629..2641d8b808 100644
--- a/main/execline/APKBUILD
+++ b/main/execline/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
# Contributor: John Regan <john@jrjrtech.com>
pkgname=execline
-pkgver=2.8.0.1
+pkgver=2.8.1.0
pkgrel=0
pkgdesc="A small scripting language, to be used in place of a shell in non-interactive scripts."
url="http://skarnet.org/software/$pkgname/"
arch="all"
license="ISC"
options="!check"
-makedepends="skalibs-dev"
+makedepends="skalibs-dev>=2.11"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
source="https://skarnet.org/software/execline/execline-$pkgver.tar.gz"
@@ -37,4 +37,6 @@ static() {
rmdir -p "$pkgdir"/usr/lib || :
}
-sha512sums="280c2524d510af0e7913961505cd5bd5eb65528918ad50c638592403b569939e5357d59cd05ddbabbf5e5c2c908fd9fb2218ded16413d62bea4c984582032c08 execline-2.8.0.1.tar.gz"
+sha512sums="
+4e20ff5cd82941914a639abe2481efd93a7ada6d2431b65813793cc7801463179bc1c58ee73e889747038c859e5fd6e7e668b758fa1785da03e549547ca3c94c execline-2.8.1.0.tar.gz
+"
diff --git a/main/expect/07-file-handle.patch b/main/expect/07-file-handle.patch
new file mode 100644
index 0000000000..98e42180bf
--- /dev/null
+++ b/main/expect/07-file-handle.patch
@@ -0,0 +1,24 @@
+Author: Russell Coker <russell@coker.com.au>
+Description:
+ Fixes file handle 3 to be left open when running programs (Closes: #166677).
+
+--- a/exp_clib.c
++++ b/exp_clib.c
+@@ -2040,6 +2040,7 @@
+
+ /* save error fd while we're setting up new one */
+ errorfd = fcntl(2,F_DUPFD,3);
++ fcntl(3, F_SETFD, FD_CLOEXEC);
+ /* and here is the macro to restore it */
+ #define restore_error_fd {close(2);fcntl(errorfd,F_DUPFD,2);}
+
+--- a/exp_command.c
++++ b/exp_command.c
+@@ -1162,6 +1162,7 @@
+
+ /* save error fd while we're setting up new one */
+ errorfd = fcntl(2,F_DUPFD,3);
++ fcntl(3, F_SETFD, FD_CLOEXEC);
+ /* and here is the macro to restore it */
+ #define restore_error_fd {close(2);fcntl(errorfd,F_DUPFD,2);}
+
diff --git a/main/expect/09-unsafe-traps.patch b/main/expect/09-unsafe-traps.patch
new file mode 100644
index 0000000000..1440f217c9
--- /dev/null
+++ b/main/expect/09-unsafe-traps.patch
@@ -0,0 +1,24 @@
+Author: n/a
+Description: Fixes some unsafe traps.
+
+--- a/exp_trap.c
++++ b/exp_trap.c
+@@ -264,6 +264,18 @@
+ #if defined(SIGSTOP)
+ traps[SIGSTOP].reserved = TRUE;
+ #endif
++#if defined(SIGSEGV)
++ traps[SIGSEGV].reserved = TRUE;
++#endif
++#if defined(SIGBUS)
++ traps[SIGBUS].reserved = TRUE;
++#endif
++#if defined(SIGILL)
++ traps[SIGILL].reserved = TRUE;
++#endif
++#if defined(SIGFPE)
++ traps[SIGFPE].reserved = TRUE;
++#endif
+
+ async_handler = Tcl_AsyncCreate(tophalf,(ClientData)0);
+
diff --git a/main/expect/10-manpage.patch b/main/expect/10-manpage.patch
new file mode 100644
index 0000000000..2faa21c597
--- /dev/null
+++ b/main/expect/10-manpage.patch
@@ -0,0 +1,384 @@
+Author: n/a
+Description: Fixes sample expect shebang and excapes dashes.
+
+--- a/expect.man
++++ b/expect.man
+@@ -108,11 +108,11 @@
+ may also be invoked implicitly on systems which support the #! notation
+ by marking the script executable, and making the first line in your script:
+
+- #!/usr/local/bin/expect \-f
++ #!/usr/bin/expect \-f
+
+ Of course, the path must accurately describe where
+ .B Expect
+-lives. /usr/local/bin is just an example.
++lives. /usr/bin is just an example.
+
+ The
+ .B \-c
+@@ -209,7 +209,7 @@
+ original arguments (including the script name) in the variable
+ .IR argv .
+
+- #!/usr/local/bin/expect \-\-
++ #!/usr/bin/expect \-\-
+
+ Note that the usual getopt(3) and execve(2) conventions must be observed
+ when adding arguments to the #! line.
+@@ -293,7 +293,7 @@
+ program.)
+ .I
+ .TP 6
+-.BI close " [-slave] [\-onexec 0|1] [\-i spawn_id]"
++.BI close " [\-slave] [\-onexec 0|1] [\-i spawn_id]"
+ closes the connection to the current process.
+ Most interactive programs will detect EOF on their stdin and exit;
+ thus
+@@ -322,7 +322,7 @@
+
+ The
+ .B \-slave
+-flag closes the slave associated with the spawn id. (See "spawn -pty".)
++flag closes the slave associated with the spawn id. (See "spawn \-pty".)
+ When the connection is closed, the slave is automatically closed as
+ well if still open.
+
+@@ -339,7 +339,7 @@
+ .B wait
+ below for more info.
+ .TP
+-.BI debug " [[-now] 0|1]"
++.BI debug " [[\-now] 0|1]"
+ controls a Tcl debugger allowing you to step through statements, set
+ breakpoints, etc.
+
+@@ -357,7 +357,7 @@
+ The
+ .B debug
+ command does not change any traps. Compare this to starting Expect with the
+-.B -D
++.B \-D
+ flag (see above).
+
+ See the README file or SEE ALSO (below)
+@@ -387,7 +387,7 @@
+ .nf
+
+ send_user "password?\\ "
+- expect_user -re "(.*)\\n"
++ expect_user \-re "(.*)\\n"
+ for {} 1 {} {
+ if {[fork]!=0} {sleep 3600;continue}
+ disconnect
+@@ -454,7 +454,7 @@
+ .B exit
+ is implicitly executed if the end of the script is reached.
+ .TP
+-\fBexp_continue\fR [-continue_timer]
++\fBexp_continue\fR [\-continue_timer]
+ The command
+ .B exp_continue
+ allows
+@@ -464,7 +464,7 @@
+ default
+ .B exp_continue
+ resets the timeout timer. The
+-.I -continue_timer
++.I \-continue_timer
+ flag prevents timer from being restarted. (See
+ .B expect
+ for more information.)
+@@ -627,8 +627,8 @@
+ be used to protect patterns that might otherwise match
+ .B expect
+ flags from doing so.
+-Any pattern beginning with a "-" should be protected this way. (All strings
+-starting with "-" are reserved for future options.)
++Any pattern beginning with a "\-" should be protected this way. (All strings
++starting with "\-" are reserved for future options.)
+
+ .IP
+ For example, the following fragment looks for a successful login.
+@@ -735,7 +735,7 @@
+ through
+ .IR expect_out(9,string) .
+ If the
+-.B -indices
++.B \-indices
+ flag is used before a pattern,
+ the starting and ending indices (in a form suitable for
+ .BR lrange )
+@@ -782,7 +782,7 @@
+ set expect_out(buffer) abbbcabkkkk
+
+ .fi
+-and "a\\n" is left in the output buffer. The pattern "*" (and -re ".*") will
++and "a\\n" is left in the output buffer. The pattern "*" (and \-re ".*") will
+ flush the output buffer without reading any more output from the
+ process.
+ .IP
+@@ -790,7 +790,7 @@
+ This may be prevented by prefixing a pattern with the
+ .B \-notransfer
+ flag. This flag is especially useful in experimenting (and can be
+-abbreviated to "-not" for convenience while experimenting).
++abbreviated to "\-not" for convenience while experimenting).
+
+ The spawn id associated with the matching output (or eof or
+ full_buffer) is stored in
+@@ -874,9 +874,9 @@
+
+ expect {
+ Password: {
+- stty -echo
++ stty \-echo
+ send_user "password (for $user) on $host: "
+- expect_user -re "(.*)\\n"
++ expect_user \-re "(.*)\\n"
+ send_user "\\n"
+ send "$expect_out(1,string)\\r"
+ stty echo
+@@ -891,7 +891,7 @@
+ send_user \\
+ "connection to host failed: $expect_out(buffer)"
+ exit
+- } -re $prompt
++ } \-re $prompt
+ }
+
+ .fi
+@@ -1023,14 +1023,14 @@
+ By default, it reports on the current spawn id. An optional spawn id specification may be given for information on that spawn id. For example
+ .nf
+
+- expect_before -info -i $proc
++ expect_before \-info \-i $proc
+
+ .fi
+ At most one spawn id specification may be given. The flag \-indirect
+ suppresses direct spawn ids that come only from indirect specifications.
+
+-Instead of a spawn id specification, the flag "-all" will cause
+-"-info" to report on all spawn ids.
++Instead of a spawn id specification, the flag "\-all" will cause
++"\-info" to report on all spawn ids.
+
+ The output of the \-info flag can be reused as the argument to expect_before.
+ .TP
+@@ -1123,7 +1123,7 @@
+ .ta \w' interact 'u +\w'$CTRLZ 'u +\w'{'u
+ set CTRLZ \\032
+ interact {
+- -reset $CTRLZ {exec kill \-STOP [pid]}
++ \-reset $CTRLZ {exec kill \-STOP [pid]}
+ \\001 {send_user "you typed a control\-A\\n";
+ send "\\001"
+ }
+@@ -1152,8 +1152,8 @@
+ flag may be used to protect patterns that might otherwise match
+ .B interact
+ flags from doing so.
+-Any pattern beginning with a "-" should be protected this way. (All strings
+-starting with "-" are reserved for future options.)
++Any pattern beginning with a "\-" should be protected this way. (All strings
++starting with "\-" are reserved for future options.)
+
+ The
+ .B \-re
+@@ -1199,7 +1199,7 @@
+ messages:
+ .nf
+
+- interact -input $user_spawn_id timeout 3600 return -output \\
++ interact \-input $user_spawn_id timeout 3600 return \-output \\
+ $spawn_id
+
+ .fi
+@@ -1298,9 +1298,9 @@
+ .nf
+
+ interact {
+- -echo ~g {getcurdirectory 1}
+- -echo ~l {getcurdirectory 0}
+- -echo ~p {putcurdirectory}
++ \-echo ~g {getcurdirectory 1}
++ \-echo ~l {getcurdirectory 0}
++ \-echo ~p {putcurdirectory}
+ }
+
+ .fi
+@@ -1316,11 +1316,11 @@
+ .nf
+
+ proc lognumber {} {
+- interact -nobuffer -re "(.*)\\r" return
++ interact \-nobuffer \-re "(.*)\\r" return
+ puts $log "[clock format [clock seconds]]: dialed $interact_out(1,string)"
+ }
+
+- interact -nobuffer "atd" lognumber
++ interact \-nobuffer "atd" lognumber
+
+ .fi
+ .IP
+@@ -1391,7 +1391,7 @@
+ command, except that any_spawn_id is not meaningful in
+ .BR interact .)
+ All following flags and
+-strings (or patterns) apply to this input until another -input flag appears.
++strings (or patterns) apply to this input until another \-input flag appears.
+ If no
+ .B \-input
+ appears,
+@@ -1429,7 +1429,7 @@
+ It is possible to change the processes that are being interacted with
+ by using indirect spawn ids. (Indirect spawn ids are described in the
+ section on the expect command.) Indirect spawn ids may be specified
+-with the -i, -u, -input, or -output flags.
++with the \-i, \-u, \-input, or \-output flags.
+ .TP
+ .B interpreter " [args]"
+ causes the user to be interactively prompted for
+@@ -1515,18 +1515,18 @@
+ flag.
+
+ The
+-.B -info
++.B \-info
+ flag causes log_file to return a description of the
+ most recent non-info arguments given.
+ .TP
+-.BI log_user " -info|0|1"
++.BI log_user " \-info|0|1"
+ By default, the send/expect dialogue is logged to stdout
+ (and a logfile if open).
+ The logging to stdout is disabled by the command "log_user 0"
+ and reenabled by "log_user 1". Logging to the logfile is unchanged.
+
+ The
+-.B -info
++.B \-info
+ flag causes log_user to return a description of the
+ most recent non-info arguments given.
+ .TP
+@@ -1647,7 +1647,7 @@
+ Any string can be preceded by "\-\-" whether or not it actually looks
+ like a flag. This provides a reliable mechanism to specify variable strings
+ without being tripped up by those that accidentally look like flags.
+-(All strings starting with "-" are reserved for future options.)
++(All strings starting with "\-" are reserved for future options.)
+
+ The
+ .B \-i
+@@ -1671,7 +1671,7 @@
+ The
+ .B \-break
+ flag generates a break condition. This only makes sense if the spawn
+-id refers to a tty device opened via "spawn -open". If you have
++id refers to a tty device opened via "spawn \-open". If you have
+ spawned a process such as tip, you should use tip's convention for
+ generating a break.
+
+@@ -1774,7 +1774,7 @@
+ except that the output is sent to stderr rather than the current
+ process.
+ .TP
+-.BI send_log " [\--] string"
++.BI send_log " [\-\-] string"
+ is like
+ .BR send ,
+ except that the string is only sent to the log file (see
+@@ -1951,7 +1951,7 @@
+ The variable
+ .I spawn_out(slave,fd)
+ is set to a file identifier corresponding to the pty slave.
+-It can be closed using "close -slave".
++It can be closed using "close \-slave".
+
+ The
+ .B \-ignore
+@@ -1978,7 +1978,7 @@
+ .fi
+
+ The
+-.B -info
++.B \-info
+ flag causes strace to return a description of the
+ most recent non-info arguments given.
+ .TP
+@@ -2018,7 +2018,7 @@
+
+ stty \-echo
+ send_user "Password: "
+- expect_user -re "(.*)\\n"
++ expect_user \-re "(.*)\\n"
+ set password $expect_out(1,string)
+ stty echo
+
+@@ -2153,7 +2153,7 @@
+ trap exit {SIGINT SIGTERM}
+
+ .fi
+-If you use the -D flag to start the debugger, SIGINT is redefined
++If you use the \-D flag to start the debugger, SIGINT is redefined
+ to start the interactive debugger. This is due to the following trap:
+ .nf
+
+@@ -2194,9 +2194,9 @@
+ normally returns a list of four integers.
+ The first integer is the pid of the process that was waited upon.
+ The second integer is the corresponding spawn id.
+-The third integer is -1 if an operating system error occurred, or 0 otherwise.
++The third integer is \-1 if an operating system error occurred, or 0 otherwise.
+ If the third integer was 0, the fourth integer is the status returned by
+-the spawned process. If the third integer was -1, the fourth integer is
++the spawned process. If the third integer was \-1, the fourth integer is
+ the value of errno set by the operating system. The global variable
+ errorCode is also set.
+
+@@ -2212,7 +2212,7 @@
+ flag declares the process to wait corresponding to the named spawn_id
+ (NOT the process id).
+ Inside a SIGCHLD handler,
+-it is possible to wait for any spawned process by using the spawn id -1.
++it is possible to wait for any spawned process by using the spawn id \-1.
+
+ The
+ .B \-nowait
+@@ -2223,7 +2223,7 @@
+ The
+ .B wait
+ command may also be used wait for a forked process using the arguments
+-"-i -1". Unlike its use with spawned processes, this command can be
++"\-i \-1". Unlike its use with spawned processes, this command can be
+ executed at any time. There is no control over which process is
+ reaped. However, the return value can be checked for the process id.
+
+@@ -2374,7 +2374,7 @@
+ .nf
+
+ set env(SHELL) /bin/sh
+- set env(HOME) /usr/local/bin
++ set env(HOME) /usr/bin
+
+ .fi
+
+@@ -2427,7 +2427,7 @@
+ to set a flag in the trap code. Then check the flag immediately after
+ the command (i.e., sleep).
+
+-The expect_background command ignores -timeout arguments and has no
++The expect_background command ignores \-timeout arguments and has no
+ concept of timeouts in general.
+
+ .SH "EXPECT HINTS"
+@@ -2449,7 +2449,7 @@
+ set prompt "(%|#|\\\\$) $" ;# default prompt
+ catch {set prompt $env(EXPECT_PROMPT)}
+
+- expect -re $prompt
++ expect \-re $prompt
+
+ .fi
+ I encourage you to write
diff --git a/main/expect/12-fdout.patch b/main/expect/12-fdout.patch
new file mode 100644
index 0000000000..0942819ad1
--- /dev/null
+++ b/main/expect/12-fdout.patch
@@ -0,0 +1,22 @@
+Author: Ian Jackson <iwj@ubuntu.com>
+Description: expBusy forgets to open fdout (Closes: #440818).
+
+--- a/exp_command.c
++++ b/exp_command.c
+@@ -315,7 +315,15 @@
+ fcntl(x,F_DUPFD,esPtr->fdin);
+ close(x);
+ }
+- expCloseOnExec(esPtr->fdin);
++ if (esPtr->fdout != EXP_NOFD &&
++ esPtr->fdout != esPtr->fdin) {
++ fcntl(esPtr->fdin,F_DUPFD,esPtr->fdout);
++ }
++ if (esPtr->fdin > 2)
++ expCloseOnExec(esPtr->fdin);
++ if (esPtr->fdout != EXP_NOFD &&
++ esPtr->fdout > 2)
++ expCloseOnExec(esPtr->fdout);
+ esPtr->fdBusy = TRUE;
+ }
+
diff --git a/main/expect/22-segfault-with-stubs.patch b/main/expect/22-segfault-with-stubs.patch
new file mode 100644
index 0000000000..3fd825575b
--- /dev/null
+++ b/main/expect/22-segfault-with-stubs.patch
@@ -0,0 +1,71 @@
+Author: Sergei Golovan <sgolovan@debian.org>
+Description: This dirty hack fixes segfaults if Tcl is built with stubs
+ and Expect is used directly from C program.
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=588817
+Example:
+ #include <stdio.h>
+ #include <tcl8.5/expect.h>
+ int main()
+ {
+ FILE *pipe;
+ char *some_command = "uname";
+ char datum;
+ pipe = exp_popen(some_command);
+ if (pipe == NULL) return 1;
+ while ((datum = getc (pipe)) != EOF)
+ printf("%c",datum);
+ }
+Example:
+ #include <stdio.h>
+ #include "expect.h"
+ main()
+ {
+ int fd = 0;
+ fd = exp_spawnl("echo", "echo", "Hello User: Whats up?", (char*) 0);
+ switch (exp_expectl(fd, exp_regexp, "ser:", 1, exp_end)) {
+ case 1: {
+ printf("GOT ser:\n");
+ break;
+ }
+ default: {
+ printf("DEFAULT\n");
+ return 1;
+ }
+ }
+ printf("Normal Exit\n");
+ return 0;
+ }
+
+--- a/exp_clib.c
++++ b/exp_clib.c
+@@ -117,7 +117,11 @@
+ #include <stdlib.h> /* for malloc */
+ #endif
+
+-#include <tcl.h>
++#define ckalloc(x) Tcl_Alloc(x)
++#define ckfree(x) Tcl_Free(x)
++extern char *Tcl_ErrnoMsg(int err);
++extern char *Tcl_Alloc(unsigned int size);
++extern void Tcl_Free(char *ptr);
+ #include "expect.h"
+ #define TclRegError exp_TclRegError
+
+@@ -392,7 +396,7 @@
+ FAIL("regexp too big");
+
+ /* Allocate space. */
+- r = (regexp *)ckalloc(sizeof(regexp) + (unsigned)rcstate->regsize);
++ r = (regexp *)malloc(sizeof(regexp) + (unsigned)rcstate->regsize);
+ if (r == NULL)
+ FAIL("out of space");
+
+@@ -402,7 +406,7 @@
+ rcstate->regcode = r->program;
+ regc(MAGIC, rcstate);
+ if (reg(0, &flags, rcstate) == NULL) {
+- ckfree ((char*) r);
++ free ((char*) r);
+ return(NULL);
+ }
+
diff --git a/main/expect/24-format.patch b/main/expect/24-format.patch
new file mode 100644
index 0000000000..477b7a3e02
--- /dev/null
+++ b/main/expect/24-format.patch
@@ -0,0 +1,24 @@
+--- a/exp_clib.c
++++ b/exp_clib.c
+@@ -1483,8 +1483,8 @@
+ char *str;
+ {
+ if (exp_is_debugging) {
+- fprintf(stderr,str);
+- if (exp_logfile) fprintf(exp_logfile,str);
++ fprintf(stderr,"%s",str);
++ if (exp_logfile) fprintf(exp_logfile,"%s",str);
+ }
+ }
+
+--- a/exp_command.c
++++ b/exp_command.c
+@@ -995,7 +995,7 @@
+
+ exp_slave_control(master,1);
+
+- sprintf(value,"%d",esPtr->fd_slave);
++ sprintf(value,"%ld",esPtr->fd_slave);
+ Tcl_SetVar2(interp,SPAWN_OUT,"slave,fd",value,0);
+ }
+ Tcl_SetObjResult (interp, Tcl_NewIntObj (EXP_NOPID));
diff --git a/main/expect/APKBUILD b/main/expect/APKBUILD
index ffe48ea449..a365fdba6d 100644
--- a/main/expect/APKBUILD
+++ b/main/expect/APKBUILD
@@ -2,14 +2,22 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=expect
pkgver=5.45.4
-pkgrel=0
+pkgrel=2
pkgdesc="A tool for automating interactive applications"
-url="http://www.nist.gov/el/msid/expect.cfm"
+url="https://core.tcl-lang.org/expect/index"
arch="all"
-license="custom"
+# http://expect.sourceforge.net/FAQ.html#q6
+license="NIST-PD"
makedepends="tcl-dev"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://downloads.sourceforge.net/project/expect/Expect/$pkgver/$pkgname$pkgver.tar.gz"
+source="https://downloads.sourceforge.net/project/expect/Expect/$pkgver/$pkgname$pkgver.tar.gz
+ 07-file-handle.patch
+ 09-unsafe-traps.patch
+ 10-manpage.patch
+ 12-fdout.patch
+ 22-segfault-with-stubs.patch
+ 24-format.patch
+"
builddir="$srcdir"/$pkgname$pkgver
prepare() {
@@ -43,4 +51,12 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a expect5.45.4.tar.gz"
+sha512sums="
+a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a expect5.45.4.tar.gz
+ccdff94648a732cfb12cb079e37449913579b536d43f46a1e95687c3be8d4ce84b01be6748b34b59a4b4bf1cbc755de96f8f7882d5bc5c9a704cb5ef3103836f 07-file-handle.patch
+e8a3c4c6d634c135e1f3b7ccfb543281fdbaa83870670ff87bdd0aaf07c803f79353b512e49b311ecd8f701c9e2d0d3e2994a3d5b344cdd6f0220d92fc1cea7d 09-unsafe-traps.patch
+f7760ba5ce60659cce4d64beaf3cf50ecd6a8af7714b704bbd08ba970e0883b0eb7ddfd83522f21bf1bbe86cdbe26d70d4517f9d58030128c2a311e6d18c6b30 10-manpage.patch
+8675a93f3344e4eeb5024faa487bdcdfb0bc8ec86ed0abcf5612e130e346b35f7d9bf7d601714cc6acb32ccc77ecc309e51e39e0a0ad17f0a3ceeacc5031f6ce 12-fdout.patch
+f4c7789feea3eae471c988d7c78ce78da1bd4ab765d142e7fce5a7a2a92e887310ba571ea2a010110f7e0859102fadfb56b2b7e1638c52586657299e6e332c91 22-segfault-with-stubs.patch
+38b542330d26ca0dade87bfad20f71f7411fc2951d4d53706f938f83a862ed4868990bc24bdbffb09c9591cca22cca913e073605216311a36a008550c00b1b78 24-format.patch
+"
diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD
index 8a9b0497ba..c524529040 100644
--- a/main/fakeroot/APKBUILD
+++ b/main/fakeroot/APKBUILD
@@ -11,7 +11,7 @@ makedepends_build="libtool autoconf automake po4a"
makedepends_host="libcap-dev acl-dev linux-headers"
makedepends="$makedepends_build $makedepends_host"
subpackages="$pkgname-dbg $pkgname-doc"
-source="http://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_$pkgver.orig.tar.gz
+source="https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_$pkgver.orig.tar.gz
fakeroot-no64.patch
fakeroot-stdint.patch
xstatjunk.patch
diff --git a/main/fftw/APKBUILD b/main/fftw/APKBUILD
index b58a73259e..0448459398 100644
--- a/main/fftw/APKBUILD
+++ b/main/fftw/APKBUILD
@@ -1,7 +1,7 @@
# Contributor:
# Maintainer:
pkgname=fftw
-pkgver=3.3.9
+pkgver=3.3.10
_pkgver=${pkgver//p/-pl}
pkgrel=0
pkgdesc="Discrete Fourier transform (DFT) library"
@@ -98,5 +98,7 @@ long_double() {
"$subpkgdir"/usr/lib/
}
-sha512sums="52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf fftw-3.3.9.tar.gz
-7da269fc43dabd02ae6fad2ebad92b07e06825b6b7c6f8987fc6444f02e0d55080db4ba6e401760e071f5c33015faf8c710f643636cab7a79bdf1af5d434dbb4 cycle.h.patch"
+sha512sums="
+2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40 fftw-3.3.10.tar.gz
+7da269fc43dabd02ae6fad2ebad92b07e06825b6b7c6f8987fc6444f02e0d55080db4ba6e401760e071f5c33015faf8c710f643636cab7a79bdf1af5d434dbb4 cycle.h.patch
+"
diff --git a/main/file/APKBUILD b/main/file/APKBUILD
index dc95111fc9..271cb267d8 100644
--- a/main/file/APKBUILD
+++ b/main/file/APKBUILD
@@ -1,18 +1,15 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=file
-pkgver=5.40
-pkgrel=1
+pkgver=5.41
+pkgrel=0
pkgdesc="File type identification utility"
url="https://www.darwinsys.com/file/"
arch="all"
license="BSD-2-Clause"
makedepends="autoconf libtool automake"
subpackages="$pkgname-dev $pkgname-doc libmagic"
-source="$pkgname-$pkgver.tar.gz::https://github.com/file/file/archive/FILE${pkgver/./_}.tar.gz
- file-5.40-magic-unsigned.patch
- file-5.40-magic-xzip.patch
- "
+source="$pkgname-$pkgver.tar.gz::https://github.com/file/file/archive/FILE${pkgver/./_}.tar.gz"
builddir="$srcdir/$pkgname-FILE${pkgver/./_}"
# secfixes:
@@ -49,6 +46,6 @@ libmagic() {
mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr
}
-sha512sums="d76bfe5326e1b40368e055c2e049a24b4ffdbd727371f4f3aa1dd3f53787d16b88550b3cc71ecf02151e2fb3e567eb2598e4707badab8c391eb71113c2dcc319 file-5.40.tar.gz
-2337fb72b94e0220e40da0d758d2a6f1592725a323080dcbf7a4ca6f37caebacc684f9fe04662624320519553bf74db704aa2922892953bb9b487eb07e95ff8f file-5.40-magic-unsigned.patch
-4e9e64c1ac0e7e95a113577a32be0fe2f2c2d9acbbe323622c2409d2e1b9f9a6cb3e8572569bbef156ca06c6470ee7db38d2579582622f224919eb37243319e5 file-5.40-magic-xzip.patch"
+sha512sums="
+efa94eec7f33b6d63e6a835987e83300accc2d81b6ea04e7bc031e4224594f96905bb5ffa8b0b3a5143084a8f5659349dffca9c78d9f444c1fd9b723ecb0c973 file-5.41.tar.gz
+"
diff --git a/main/file/file-5.40-magic-unsigned.patch b/main/file/file-5.40-magic-unsigned.patch
deleted file mode 100644
index aff1c80a42..0000000000
--- a/main/file/file-5.40-magic-unsigned.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From f06015040e7ffb3be21bb7622f9f8291b749aaf9 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Sun, 4 Apr 2021 17:46:17 +0000
-Subject: [PATCH] Fix regression after unsigned/signed printing changes by
- making types unsigned (Richard W.M. Jones)
-
----
- magic/Magdir/filesystems | 54 +++++++++++++++++++--------------------
- magic/Magdir/linux | 30 +++++++++++-----------
- tests/Makefile.am | 1 +
- tests/ext4.result | 1 +
- tests/ext4.testfile | Bin 0 -> 2048 bytes
- 5 files changed, 44 insertions(+), 42 deletions(-)
- create mode 100644 tests/ext4.result
- create mode 100644 tests/ext4.testfile
-
-diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
-index 0cb45cbfe..81966d6cc 100644
---- a/magic/Magdir/filesystems
-+++ b/magic/Magdir/filesystems
-@@ -1,5 +1,5 @@
- #------------------------------------------------------------------------------
--# $File: filesystems,v 1.140 2021/02/23 00:51:10 christos Exp $
-+# $File: filesystems,v 1.141 2021/04/04 17:46:17 christos Exp $
- # filesystems: file(1) magic for different filesystems
- #
- 0 name partid
-@@ -1739,12 +1739,12 @@
- >>>0x464 lelong >0x0000007 ext4 filesystem data
- # else large INCOMPAT?
- >>0x460 lelong >0x000003f ext4 filesystem data
-->0x468 belong x \b, UUID=%08x
-->0x46c beshort x \b-%04x
-->0x46e beshort x \b-%04x
-->0x470 beshort x \b-%04x
-->0x472 belong x \b-%08x
-->0x476 beshort x \b%04x
-+>0x468 ubelong x \b, UUID=%08x
-+>0x46c ubeshort x \b-%04x
-+>0x46e ubeshort x \b-%04x
-+>0x470 ubeshort x \b-%04x
-+>0x472 ubelong x \b-%08x
-+>0x476 ubeshort x \b%04x
- >0x478 string >0 \b, volume name "%s"
- # General flags for any ext* fs
- >0x460 lelong &0x0000004 (needs journal recovery)
-@@ -1767,12 +1767,12 @@
-
- # f2fs filesystem - Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
- 0x400 lelong 0xF2F52010 F2FS filesystem
-->0x46c belong x \b, UUID=%08x
-->0x470 beshort x \b-%04x
-->0x472 beshort x \b-%04x
-->0x474 beshort x \b-%04x
-->0x476 belong x \b-%08x
-->0x47a beshort x \b%04x
-+>0x46c ubelong x \b, UUID=%08x
-+>0x470 ubeshort x \b-%04x
-+>0x472 ubeshort x \b-%04x
-+>0x474 ubeshort x \b-%04x
-+>0x476 ubelong x \b-%08x
-+>0x47a ubeshort x \b%04x
- >0x147c lestring16 x \b, volume name "%s"
-
- # Minix filesystems - Juan Cespedes <cespedes@debian.org>
-@@ -2296,20 +2296,20 @@
- >>0x10060 string >\0 lockproto %s)
-
- # Russell Coker <russell@coker.com.au>
--0x10040 string _BHRfS_M BTRFS Filesystem
-->0x1012b string >\0 label "%s",
-->0x10090 lelong x sectorsize %d,
-->0x10094 lelong x nodesize %d,
-->0x10098 lelong x leafsize %d,
-->0x10020 belong x UUID=%08x-
-->0x10024 beshort x \b%04x-
-->0x10026 beshort x \b%04x-
-->0x10028 beshort x \b%04x-
-->0x1002a beshort x \b%04x
-->0x1002c belong x \b%08x,
-->0x10078 lequad x %lld/
-->0x10070 lequad x \b%lld bytes used,
-->0x10088 lequad x %lld devices
-+0x10040 string _BHRfS_M BTRFS Filesystem
-+>0x1012b string >\0 label "%s",
-+>0x10090 lelong x sectorsize %d,
-+>0x10094 lelong x nodesize %d,
-+>0x10098 lelong x leafsize %d,
-+>0x10020 ubelong x UUID=%08x-
-+>0x10024 ubeshort x \b%04x-
-+>0x10026 ubeshort x \b%04x-
-+>0x10028 ubeshort x \b%04x-
-+>0x1002a ubeshort x \b%04x
-+>0x1002c ubelong x \b%08x,
-+>0x10078 lequad x %lld/
-+>0x10070 lequad x \b%lld bytes used,
-+>0x10088 lequad x %lld devices
-
- # dvdisaster's .ecc
- # From: "Nelson A. de Oliveira" <naoliv@gmail.com>
-diff --git a/magic/Magdir/linux b/magic/Magdir/linux
-index 693cef6f5..f25243e20 100644
---- a/magic/Magdir/linux
-+++ b/magic/Magdir/linux
-@@ -1,6 +1,6 @@
-
- #------------------------------------------------------------------------------
--# $File: linux,v 1.77 2021/02/24 23:05:02 christos Exp $
-+# $File: linux,v 1.78 2021/04/04 17:46:17 christos Exp $
- # linux: file(1) magic for Linux files
- #
- # Values for Linux/i386 binaries, from Daniel Quinlan <quinlan@yggdrasil.com>
-@@ -83,20 +83,20 @@
-
- # format v1, supported since 1998
- 0 name linux-swap
-->0x400 lelong 1 little endian, version %u,
-->>0x404 lelong x size %u pages,
-->>0x408 lelong x %u bad pages,
-->0x400 belong 1 big endian, version %u,
-->>0x404 belong x size %u pages,
-->>0x408 belong x %u bad pages,
-->0x41c string \0 no label,
-->0x41c string >\0 LABEL=%s,
-->0x40c belong x UUID=%08x
-->0x410 beshort x \b-%04x
-->0x412 beshort x \b-%04x
-->0x414 beshort x \b-%04x
-->0x416 belong x \b-%08x
-->0x41a beshort x \b%04x
-+>0x400 lelong 1 little endian, version %u,
-+>>0x404 lelong x size %u pages,
-+>>0x408 lelong x %u bad pages,
-+>0x400 belong 1 big endian, version %u,
-+>>0x404 belong x size %u pages,
-+>>0x408 belong x %u bad pages,
-+>0x41c string \0 no label,
-+>0x41c string >\0 LABEL=%s,
-+>0x40c ubelong x UUID=%08x
-+>0x410 ubeshort x \b-%04x
-+>0x412 ubeshort x \b-%04x
-+>0x414 ubeshort x \b-%04x
-+>0x416 ubelong x \b-%08x
-+>0x41a ubeshort x \b%04x
-
- 0xff6 string SWAPSPACE2 Linux swap file, 4k page size,
- >0 use linux-swap
diff --git a/main/file/file-5.40-magic-xzip.patch b/main/file/file-5.40-magic-xzip.patch
deleted file mode 100644
index e4fed0421f..0000000000
--- a/main/file/file-5.40-magic-xzip.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9b0459afab309a82aa4e46f73a4e50dd641f3d39 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 19 Apr 2021 17:01:45 +0000
-Subject: [PATCH] PR/257: cuihao: put attributes inside the xz magic.
-
----
- magic/Magdir/compress | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/magic/Magdir/compress b/magic/Magdir/compress
-index 64d11a736..41a65738f 100644
---- a/magic/Magdir/compress
-+++ b/magic/Magdir/compress
-@@ -1,5 +1,5 @@
- #------------------------------------------------------------------------------
--# $File: compress,v 1.80 2021/03/15 17:49:24 christos Exp $
-+# $File: compress,v 1.81 2021/04/19 17:01:45 christos Exp $
- # compress: file(1) magic for pure-compression formats (no archives)
- #
- # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
-@@ -265,14 +265,13 @@
-
- # http://tukaani.org/xz/xz-file-format.txt
- 0 ustring \xFD7zXZ\x00 XZ compressed data, checksum
-+!:strength * 2
-+!:mime application/x-xz
- >7 byte&0xf 0x0 NONE
- >7 byte&0xf 0x1 CRC32
- >7 byte&0xf 0x4 CRC64
- >7 byte&0xf 0xa SHA-256
-
--!:strength * 2
--!:mime application/x-xz
--
- # https://github.com/ckolivas/lrzip/blob/master/doc/magic.header.txt
- 0 string LRZI LRZIP compressed data
- >4 byte x - version %d
diff --git a/main/fish/APKBUILD b/main/fish/APKBUILD
index c0487286f1..2824b76eef 100644
--- a/main/fish/APKBUILD
+++ b/main/fish/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer:
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=fish
pkgver=3.3.1
-pkgrel=0
+pkgrel=1
pkgdesc="Modern interactive commandline shell"
url="https://fishshell.com/"
arch="all"
@@ -56,6 +56,12 @@ package() {
# provided by minikube-fish-completion
rm "$pkgdir"/usr/share/fish/completions/minikube.fish
+
+ # provided by flatpak-fish-completion
+ rm "$pkgdir"/usr/share/fish/completions/flatpak.fish
+
+ # provided by helm-fish-completion
+ rm "$pkgdir"/usr/share/fish/completions/helm.fish
}
doc() {
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index bd05d3f852..c2591a26dc 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -4,7 +4,7 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=freeradius
-pkgver=3.0.23
+pkgver=3.0.25
pkgrel=0
pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
url="https://freeradius.org/"
@@ -26,7 +26,7 @@ makedepends="
mariadb-connector-c-dev
net-snmp-tools
openldap-dev
- openssl-dev
+ openssl1.1-compat-dev
perl-dev
postgresql-dev
python3-dev
@@ -69,13 +69,15 @@ source="ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-$pkgver.tar.gz
radiusd.initd
setup-freeradius.in
print-var.mk
+ radacct-rotate
+ radacct-rotate.conf
+ radacct-rotate.crond
musl-fix-headers.patch
fix-scopeid.patch
default-config.patch
remove-eap-from-default-mods.patch
readme-setup-script.patch
- fix-request_running-segfault.patch
dont-install-test-tools.patch
"
builddir="$srcdir/$pkgname-server-$pkgver"
@@ -167,6 +169,10 @@ package() {
install -m644 -D "$srcdir"/$pkgname.logrotated "$pkgdir"/etc/logrotate.d/$pkgname
install -m755 -D setup-freeradius "$pkgdir"/usr/sbin/setup-freeradius
+ install -m755 -D "$srcdir"/radacct-rotate -t "$pkgdir"/usr/bin/
+ install -m644 -D "$srcdir"/radacct-rotate.conf -t "$pkgdir"/etc/raddb/
+ install -m755 -D "$srcdir"/radacct-rotate.crond "$pkgdir"/etc/periodic/daily/radacct-rotate
+
# Install misses to create this
mkdir -p "$pkgdir"/$_radmodsconfdir/sql/ippool-dhcp/postgresql
@@ -369,6 +375,9 @@ utils() {
replaces="freeradius-radclient"
amove usr/bin/*
+
+ mkdir -p "$pkgdir"/usr/bin
+ mv "$subpkgdir"/usr/bin/radacct-rotate "$pkgdir"/usr/bin/
}
_mvdb() {
@@ -382,17 +391,19 @@ _enable_mod() {
}
sha512sums="
-8ba2825d026c9639b15f45afaf4e26a33efec565b485890f6fef9f103a2eafc3a078c4ac404456688d203ccbe5adf5862d7129d64f396e1aa0e71a17d17c4f21 freeradius-server-3.0.23.tar.gz
-c3ae1ee6bd7743f883310612ba2c20c6ff7f288fedc308735df05b097ecb2f7fa4d1679b844e262757808978c7bb2d7630b99e4b87ce6d6ba7f84013f9c49f1d freeradius.logrotated
+30a2125f1b823acb3c6f32158e327f4d49503b11e4d9cde64f12ba6e94cbd02d52d7b947d2d68f66f4c71374dcd2435f06e2067404515cd27a610dcd316127a3 freeradius-server-3.0.25.tar.gz
+52ecccd479bb22c80d5cc298d9d1c12bd2d1a9d80e1265ba032201f3942370910fa78f3bb429031d91bc89712fa2127f16cd68814489cbc99d174fbf5789875f freeradius.logrotated
bb3df1fa2c9ed95514ae090e0f6619c4e3280f424c4351bc79f5254bf1a327fa7d27e5fe3add5ab8d9e5ba3792c9553bd9a0481fe9c5bc34945ce46627ef2638 radiusd.confd
5a8579f06e905117c67f87f0833d0760e81e64f97de7672ecee45775733fae05763edb91c472e313bf58523c713f86815e47cc39c841f4c141aa59a5930113c6 radiusd.initd
9f6a4f76fd06e81cfcfe4536f1f8be494634b07e548a6f7e651e5501aded24b030ed7d57dbdc867ae0eb39ee4a090234c4122a89bed84c13733c77de36b9c2cf setup-freeradius.in
5f940e200aa39b2fbbfaf5b24f2ad99869fa75bb7e2008876940ea96cb9dbc7f2b27dd1672aa56cdb5243faabdcbc38875594dd8792af965987183c0aa2aefd1 print-var.mk
+4fbd774618d41a28a5874fd5bd96ccf6ab5ea38e4a97b1671bd51f6d07476985629dabc0a7300b3287bd223c62496c930bc555bb617739d6383afd5d55c97501 radacct-rotate
+2cecaae9bf9dd88f7c4344f2b08977c46d4831e733b82adcf6cf9553c1a77363dac9f1784f9eb9cf93d46c3da10a10d548a1071cdb0cd49e1319a62b7d5a357b radacct-rotate.conf
+52c477b4d13009bc3776ed889feeb4b1ea8d85bb97b0031b1d2d4c04e6466fcb4e9a16e556e861e7ec56acb54624bea39d73d44802535aa39d3dc84580d95775 radacct-rotate.crond
c49e5eec7497fccde5fd09dba1ea9b846e57bc88015bd81640aa531fb5c9b449f37136f42c85fe1d7940c5963aed664b85da28442b388c9fb8cc27873df03b2d musl-fix-headers.patch
41d478c0e40ff82fc36232964037c1ab8ffca9fdbb7dca02ed49319906e751c133b5d7bc7773c645cec6d9d39d1de69cba25e8d59afa8d6662563dd17f35f234 fix-scopeid.patch
-1eabdb7d8954331e7bf3c002dafd496289c8b67526d0fa07b11cf129c41c3f9a3beae241e911b6b9ea3f86bbdeaabf158bfbf502a8cd1da80cd194515af671eb default-config.patch
+caf85ffb96e08ad8314fe72aac052948b2461f94bb21e20ea34925534ee1ef682284457318d50df813ba167a8cb4b520c5a0f38d86de21cd56e8391f299a5dd6 default-config.patch
f96b7b2e0fc614cb8b70bd500933538e98e05b58718af931a62bc7ba2307600cf8c2a8a99de856ad2e18101dd5bfe95c50ee34de20eef21ba0ad795577a6619b remove-eap-from-default-mods.patch
55e179d5e6b31d289c2da7f907e494a6a6f5900483fdff8d3bb25ee15a583b8705942eca1f0d5390e91376966e66e457dce9b2cf1a1f61c8eac6d8fb825404dd readme-setup-script.patch
-7ddf75901f635216b0d972c14631334a8138e0dbb021685bb6b3a996f38d232b84146c621dae541b00f6149fa401e835d1579bbacd27fad72a80bacd4391b404 fix-request_running-segfault.patch
908c4408ab6538ddd96577e47d5e509b19e227e144655eaa0fd7569ddadbe5b2298e6599b8370847b3bcb5e788067b163b0cb66e1b3afa4d83dc3f724e058674 dont-install-test-tools.patch
"
diff --git a/main/freeradius/default-config.patch b/main/freeradius/default-config.patch
index 16d0bde28c..1c31e19e5c 100644
--- a/main/freeradius/default-config.patch
+++ b/main/freeradius/default-config.patch
@@ -1,7 +1,13 @@
From f37bee486aca3de86b594770f0b2b3ff8e96596a Mon Sep 17 00:00:00 2001
-From: Leonardo Arena <rnalrd@alpinelinux.org>
+From: Jakub Jirutka <jakub@jirutka.cz>
Date: Tue, 18 May 2021 14:10:00 +0000
-Subject: [PATCH] default config
+Subject: [PATCH] Adjust default config
+
+- Fix default location of db_dir and run_dir.
+- Remove pidfile - this is handled by OpenRC.
+- Change default sqlite db path to a reasonable location.
+- Change default cui sqlite location to $db_dir/.
+- Change default cache paths to /var/cache/radiusd.
---
raddb/mods-available/cui | 2 +-
diff --git a/main/freeradius/fix-request_running-segfault.patch b/main/freeradius/fix-request_running-segfault.patch
deleted file mode 100644
index d1ca890302..0000000000
--- a/main/freeradius/fix-request_running-segfault.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 30ffd2174ec0acd1c5b4b4988d522c24d80a1049 Mon Sep 17 00:00:00 2001
-From: "Alan T. DeKok" <aland@freeradius.org>
-Date: Wed, 20 Nov 2019 08:30:42 -0500
-Subject: [PATCH] home_server may be NULL if proxying fails
-
----
- src/main/process.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/main/process.c b/src/main/process.c
-index 78c6d8a9e5..c8b3af24e2 100644
---- a/src/main/process.c
-+++ b/src/main/process.c
-@@ -1642,7 +1642,8 @@ static void request_running(REQUEST *request, int action)
- * handler.
- */
- if (request_proxy(request) < 0) {
-- if (request->home_server && request->home_server->server) goto req_finished;
-+ if (!request->home_server ||
-+ (request->home_server && request->home_server->server)) goto req_finished;
-
- (void) setup_post_proxy_fail(request);
- process_proxy_reply(request, NULL);
diff --git a/main/freeradius/freeradius.logrotated b/main/freeradius/freeradius.logrotated
index 1975caee75..4b6d9455ba 100644
--- a/main/freeradius/freeradius.logrotated
+++ b/main/freeradius/freeradius.logrotated
@@ -18,13 +18,6 @@
su radius radius
}
-# There are different detail-rotating strategies you can use. One is
-# to write to a single detail file per IP and use the rotate config
-# below. Another is to write to a daily detail file per IP with:
-# detailfile = ${radacctdir}/%{Client-IP-Address}/%Y%m%d-detail
-# (or similar) in radiusd.conf, without rotation. If you go with the
-# second technique, you will need another cron job that removes old
-# detail files. You do not need to comment out the below for method #2.
/var/log/radius/radacct/*/detail {
missingok
compress
@@ -32,3 +25,6 @@
nocreate
su radius radius
}
+
+# NOTE: Files in /var/log/radius/radacct/*/ with "-YYYYMMDD" suffix are
+# compressed and later removed by script radacct-rotate executed daily by cron.
diff --git a/main/freeradius/radacct-rotate b/main/freeradius/radacct-rotate
new file mode 100644
index 0000000000..5dc03458c3
--- /dev/null
+++ b/main/freeradius/radacct-rotate
@@ -0,0 +1,87 @@
+#!/bin/sh
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2021 Jakub Jirutka <jakub@jirutka.cz>
+#---help---
+# Usage: radacct-rotate [options]
+#
+# Compress and later remove old FreeRADIUS' radacct log files with "-YYYYMMDD"
+# suffix. This script is provided by the freeradius package in Alpine Linux.
+#
+# Options:
+# -C FILE Location of radacct-rotate config file (defaults to
+# /etc/raddb/radacct-rotate.conf).
+#
+# -c DAYS Compress files older than DAYS (overrides option
+# compress_after_days from the config).
+#
+# -r DAYS Remove compressed files older than DAYS (overrides
+# option remove_after_days from the config).
+#
+# -d Run in dry-run mode (only print what would be done).
+#
+# -h Show this message and exit.
+#---help---
+set -eu
+
+readonly PROGNAME='radacct-rotate'
+# Y Y Y Y m m d d
+readonly DATE_GLOB='[1-9][0-9][0-9][0-9][0-1][0-9][0-3][0-9]'
+readonly HELP_TAG='#---help---'
+
+# Defaults
+CONFIG='/etc/raddb/radacct-rotate.conf'
+DRY_RUN=false
+radacct_dir='/var/log/radius/radacct'
+compress_cmd='gzip -9'
+compress_ext='.gz'
+compress_after_days=2
+remove_after_days=180
+
+while getopts ':C:c:dr:h' OPT; do
+ case "$OPT" in
+ C) CONFIG=$OPTARG;;
+ c) COMPRESS_AFTER_DAYS=$OPTARG;;
+ d) DRY_RUN=true;;
+ r) REMOVE_AFTER_DAYS=$OPTARG;;
+ h) sed -n "/^$HELP_TAG/,/^$HELP_TAG/{/^$HELP_TAG/d; s/^# \\?//; p;}" "$0"; exit 0;;
+ \?) echo "$PROGNAME: invalid option: -$OPTARG (see '$PROGNAME -h')" >&2; exit 100;;
+ esac
+done
+
+readonly CONFIG COMPRESS_AFTER_DAYS DRY_RUN REMOVE_AFTER_DAYS
+
+sh -n "$CONFIG" || exit 100
+. "$CONFIG"
+
+compress_after_days=${COMPRESS_AFTER_DAYS:-$compress_after_days}
+remove_after_days=${REMOVE_AFTER_DAYS:-$remove_after_days}
+
+
+find_compressible() {
+ find "$radacct_dir" -type f -name "*-$DATE_GLOB" -mtime "+$compress_after_days" "$@"
+}
+
+find_deletable() {
+ find "$radacct_dir" -type f -name "*-${DATE_GLOB}${compress_ext}" -mtime "+$remove_after_days" "$@"
+}
+
+check_number() {
+ case "$1" in
+ ''|*[!0-9]*) echo "$PROGNAME: option '$2' must be a number, but given: '$1'" >&2; exit 100;;
+ esac
+}
+check_number "$compress_after_days" 'compress_after_days'
+check_number "$remove_after_days" 'remove_after_days'
+
+rc=0
+if $DRY_RUN; then
+ find_compressible -exec echo $compress_cmd {} \; || rc=111
+ find_deletable -exec echo rm {} \; || rc=111
+else
+ for path in $(find_compressible -print); do
+ $compress_cmd "$path" >&2 && touch -ct "${path##*-}0000" "$path".* || rc=111
+ done
+ find_deletable -exec rm '{}' \; >&2 || rc=111
+fi
+
+exit $rc
diff --git a/main/freeradius/radacct-rotate.conf b/main/freeradius/radacct-rotate.conf
new file mode 100644
index 0000000000..4f9003a701
--- /dev/null
+++ b/main/freeradius/radacct-rotate.conf
@@ -0,0 +1,26 @@
+# Configuration file for radacct-rotate
+#
+# Script radacct-rotate compresses and removes old log files with suffix
+# "-YYYYMMDD" (e.g. detail-20210921) found in /var/log/radius/radacct/*/.
+#
+# The age of the files is determined by their time of last modification
+# (see stat(1)). When the file is compressed, its modification time is set
+# to the date encoded in the file name.
+
+# Set to "yes" to disable cron script /etc/periodic/daily/radacct-rotate.
+#cron_disabled=no
+
+# Compress files older than specified number of days.
+#compress_after_days=3
+
+# Remove files older than specified number of days.
+#remove_after_days=180
+
+# Location of the radacct directory.
+#radacct_dir="/var/log/radius/radacct"
+
+# Specifies which command (and arguments) to use to compress files.
+# It must produce compressed file with ${compress_ext} extension and remove
+# the original file.
+#compress_cmd="gzip -9"
+#compress_ext=".gz"
diff --git a/main/freeradius/radacct-rotate.crond b/main/freeradius/radacct-rotate.crond
new file mode 100644
index 0000000000..69a21df96f
--- /dev/null
+++ b/main/freeradius/radacct-rotate.crond
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+: ${RADACCT_ROTATE_CONFIG:="/etc/raddb/radacct-rotate.conf"}
+
+/bin/sh -n "$RADACCT_ROTATE_CONFIG" 2>/dev/null || exit 0
+
+. "$RADACCT_ROTATE_CONFIG"
+[ "$cron_disabled" = yes ] && exit 0
+
+exec /usr/bin/radacct-rotate
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 23f51b325f..c2b13d8649 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Cameron Banta <cbanta@gmail.com>
pkgname=freeswitch
pkgver=1.10.6
-pkgrel=0
+pkgrel=2
pkgdesc="A communications platform written in C from the ground up"
url="http://www.freeswitch.org"
arch="all"
@@ -26,7 +26,7 @@ makedepends="
libjpeg-turbo-dev
libogg-dev
libpri-dev
- openssl-dev
+ openssl1.1-compat-dev
libshout-dev
libsndfile-dev
libvorbis-dev
diff --git a/main/freetds/APKBUILD b/main/freetds/APKBUILD
index 063679079a..8bc97e3749 100644
--- a/main/freetds/APKBUILD
+++ b/main/freetds/APKBUILD
@@ -1,13 +1,13 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=freetds
-pkgver=1.3
-pkgrel=0
+pkgver=1.3.3
+pkgrel=2
pkgdesc="Tabular Datastream Library"
url="https://www.freetds.org/"
arch="all"
license="GPL-2.0-or-later OR LGPL-2.0-or-later"
-makedepends="openssl-dev linux-headers readline-dev unixodbc-dev"
+makedepends="openssl1.1-compat-dev linux-headers readline-dev unixodbc-dev"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
source="https://www.freetds.org/files/stable/freetds-$pkgver.tar.bz2
fix-includes.patch
@@ -39,6 +39,6 @@ package() {
}
sha512sums="
-3bf136755563eb8fae611937247ad553dc16b6957ec1f37a0f0a9ec572d7bcbf414d5f3b18a3e665e0b6f9d6bcc760eff45fd79ee5b782c43ae83940c290f9ca freetds-1.3.tar.bz2
+889ed65e091f848112eb26a203f39de5998749540a40b7988ba0f3c56309cc49dc9c87f3eac3d27e6e568964f8ff72592feea4d10d5c73bd9f9f696dc82513a2 freetds-1.3.3.tar.bz2
9ca126d9316cf48fa5f9572b5aa9122eb114033627ab75f6715bce0260d70c6a7bb8a71ecb1e209a4f83416332d10942c7aaf02a5249948cf1cec6a1a457a236 fix-includes.patch
"
diff --git a/main/fribidi/APKBUILD b/main/fribidi/APKBUILD
index a8bc91a18c..96b36a9446 100644
--- a/main/fribidi/APKBUILD
+++ b/main/fribidi/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fribidi
-pkgver=1.0.10
+pkgver=1.0.11
pkgrel=0
pkgdesc="Free Implementation of the Unicode Bidirectional Algorithm"
url="https://github.com/fribidi/fribidi"
@@ -30,4 +30,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360 fribidi-1.0.10.tar.xz"
+sha512sums="
+6afde86784de06759f18235ccb44f23261a975f7cce0021b16755065a6a8ed84d7d5fb7fdcaadd691b48011efb4bfc2ee67555e5133a294a418cca1a0c85476c fribidi-1.0.11.tar.xz
+"
diff --git a/main/fuse3/APKBUILD b/main/fuse3/APKBUILD
index 2dbfd079b7..fdbff6ef84 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.4
+pkgver=3.10.5
pkgrel=0
pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface"
url="https://github.com/libfuse/libfuse"
@@ -65,7 +65,7 @@ _openrc() {
}
sha512sums="
-1cb7600dc04f148b15ec3183d0348320dd946cf15d4077798e7e34fe7e8202837718c8b8bd1f190b7dddda2453ee2b0433d77e18f142ecb7affec1cae29520f6 fuse-3.10.4.tar.xz
+da17788acc3fabef3dc7b736b7319c1638d7de27e163699f7dbc0fe9159aeba35964af6afa77a7654f1f321e2fc03ee167909f21516cbb585ead33cad95620fe fuse-3.10.5.tar.xz
1a9e1d1e8a7b0778ffde328e4322c73b5d57ec98d52767c846d755cce861ab27989823a75b6c5f994432ddb77fa351dfa4a8f948c9467c5f7d5f471e4608358b fix-realpath.patch
7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 fuse.initd
"
diff --git a/main/gc/APKBUILD b/main/gc/APKBUILD
index d8699c1ac0..bbf6967ae4 100644
--- a/main/gc/APKBUILD
+++ b/main/gc/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gc
-pkgver=8.0.4
-pkgrel=5
-pkgdesc="A garbage collector for C and C++"
+pkgver=8.0.6
+pkgrel=0
+pkgdesc="garbage collector for C and C++"
url="https://hboehm.info/gc/"
arch="all"
license="custom:GPL-like"
makedepends="linux-headers"
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc libgc++:libgccpp"
-source="http://hboehm.info/gc/gc_source/gc-$pkgver.tar.gz
+source="https://github.com/ivmai/bdwgc/releases/download/v$pkgver/gc-$pkgver.tar.gz
0001-Fix-gctest-with-musl-libc-on-s390x.patch
data_start_riscv64.patch
"
@@ -32,7 +32,6 @@ build() {
}
check() {
- # two FAILs due to grsecurity
make check
}
@@ -45,6 +44,8 @@ libgccpp() {
mv "$pkgdir"/usr/lib/libgccpp.* "$subpkgdir"/usr/lib/
}
-sha512sums="57ccca15c6e50048d306a30de06c1a844f36103a84c2d1c17cbccbbc0001e17915488baec79737449982da99ce5d14ce527176afae9ae153cbbb5a19d986366e gc-8.0.4.tar.gz
+sha512sums="
<