aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/aaudit/APKBUILD2
-rw-r--r--main/abi-compliance-checker/APKBUILD14
-rw-r--r--main/abuild/0001-abuild-fix-amove-corner-cases.patch132
-rw-r--r--main/abuild/0001-make-increase-test-timeout.patch25
-rw-r--r--main/abuild/APKBUILD20
-rw-r--r--main/abuild/mr128-newapkbuild-fetch-rust-deps-in-prepare.patch110
-rw-r--r--main/abuild/mr131-newapkbuild-change-cmake-build-type.patch33
-rw-r--r--main/abuild/mr60-newapkbuild-use-abuild-meson.patch34
-rw-r--r--main/acf-kamailio/APKBUILD1
-rw-r--r--main/acf-mariadb/APKBUILD1
-rw-r--r--main/acf-postgresql/APKBUILD1
-rw-r--r--main/ack/APKBUILD8
-rw-r--r--main/acl/APKBUILD6
-rw-r--r--main/acpica/APKBUILD4
-rw-r--r--main/alpine-base/APKBUILD40
-rw-r--r--main/alpine-baselayout/APKBUILD22
-rw-r--r--main/alpine-baselayout/mkmntdirs.c67
-rw-r--r--main/alpine-conf/APKBUILD4
-rw-r--r--main/alpine-git-mirror-syncd/APKBUILD5
-rw-r--r--main/alpine-make-rootfs/APKBUILD4
-rw-r--r--main/alsa-lib/APKBUILD4
-rw-r--r--main/alsa-ucm-conf/APKBUILD20
-rw-r--r--main/alsa-utils/APKBUILD4
-rw-r--r--main/aom/APKBUILD11
-rw-r--r--main/apache-mod-auth-ntlm-winbind/APKBUILD14
-rw-r--r--main/apache-mod-auth-radius/APKBUILD3
-rw-r--r--main/apache2-mod-wsgi/APKBUILD4
-rw-r--r--main/apache2/APKBUILD6
-rw-r--r--main/api-sanity-checker/APKBUILD2
-rw-r--r--main/apk-tools/APKBUILD8
-rw-r--r--main/apk-tools/increase-index-meta-buffer.patch13
-rw-r--r--main/apparmor/0001-Fix-linking-against-gettext-on-musl-libc.patch40
-rw-r--r--main/apparmor/0003-parser-remove-specific-tests-for-rttime.patch73
-rw-r--r--main/apparmor/0004-parser-remove-specific-tests-for-ofile.patch28
-rw-r--r--main/apparmor/0005-utils-adjust-tests-to-match-the-Alpine-layout.patch38
-rw-r--r--main/apparmor/0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch28
-rw-r--r--main/apparmor/0007-Remove-Locale-gettext-from-parser-tests.patch39
-rw-r--r--main/apparmor/APKBUILD222
-rw-r--r--main/apparmor/aa-notify-test.patch20
-rw-r--r--main/apparmor/apparmor.initd91
-rw-r--r--main/apparmor/fix-dnsmasq-profile.patch12
-rw-r--r--main/apparmor/python-3.10-test-aa-notify.patch50
-rw-r--r--main/apr-util/APKBUILD6
-rw-r--r--main/argon2/APKBUILD2
-rw-r--r--main/argp-standalone/001-throw-in-funcdef.patch79
-rw-r--r--main/argp-standalone/APKBUILD17
-rw-r--r--main/argp-standalone/gnu89-inline.patch7
-rw-r--r--main/arm-trusted-firmware/APKBUILD16
-rw-r--r--main/asciidoc/APKBUILD37
-rw-r--r--main/aspell-fr/APKBUILD13
-rw-r--r--main/aspell-ru/APKBUILD6
-rw-r--r--main/aspell-uk/APKBUILD6
-rw-r--r--main/asterisk/APKBUILD8
-rw-r--r--main/at-spi2-core/APKBUILD7
-rw-r--r--main/audit/APKBUILD4
-rw-r--r--main/augeas/APKBUILD2
-rw-r--r--main/autoconf-archive/APKBUILD4
-rw-r--r--main/automake/APKBUILD4
-rw-r--r--main/avahi-ui/APKBUILD10
-rw-r--r--main/avahi-ui/gnome-nettool.pngbin4509 -> 4142 bytes
-rw-r--r--main/awall/APKBUILD4
-rwxr-xr-xmain/awall/setup-firewall4
-rw-r--r--main/axel/APKBUILD4
-rw-r--r--main/bacula/APKBUILD6
-rw-r--r--main/bash/APKBUILD24
-rw-r--r--main/batctl/APKBUILD6
-rw-r--r--main/bats/APKBUILD5
-rw-r--r--main/bc/APKBUILD6
-rw-r--r--main/bctoolbox/APKBUILD4
-rw-r--r--main/bdftopcf/APKBUILD6
-rw-r--r--main/bind/APKBUILD15
-rw-r--r--main/binutils/APKBUILD22
-rw-r--r--main/binutils/CVE-2022-38533.patch22
-rw-r--r--main/binutils/binutils-ppc-fix-machine-options.patch41
-rw-r--r--main/binutils/binutils-ppc64le-assertion.patch32
-rw-r--r--main/binutils/binutils-s390x-1.patch147
-rw-r--r--main/binutils/binutils-s390x-2.patch51
-rw-r--r--main/bison/APKBUILD9
-rw-r--r--main/bluez/APKBUILD7
-rw-r--r--main/boost1.78/APKBUILD197
-rw-r--r--main/boost1.78/bjam-no-skip-install.patch73
-rw-r--r--main/boost1.78/boost-1.78.0-interprocess-musl-include.patch23
-rw-r--r--main/boost1.79/0001-revert-cease-dependence-on-range.patch49
-rw-r--r--main/boost1.79/boost-1.57.0-python-abi_letters.patch62
-rw-r--r--main/boost1.79/boost-1.57.0-python-libpython_dep.patch13
-rw-r--r--main/boost1.79/boost-1.79.0-fix-segfault-in-array-erase.patch50
-rw-r--r--main/boost1.80/0001-revert-cease-dependence-on-range.patch (renamed from main/boost1.78/0001-revert-cease-dependence-on-range.patch)0
-rw-r--r--main/boost1.80/APKBUILD (renamed from main/boost1.79/APKBUILD)22
-rw-r--r--main/boost1.80/aligned-alloc.patch28
-rw-r--r--main/boost1.80/boost-1.57.0-python-abi_letters.patch (renamed from main/boost1.78/boost-1.57.0-python-abi_letters.patch)0
-rw-r--r--main/boost1.80/boost-1.57.0-python-libpython_dep.patch (renamed from main/boost1.78/boost-1.57.0-python-libpython_dep.patch)0
-rw-r--r--main/boost1.80/boost-1.80-boost-unordered.patch175
-rw-r--r--main/boost1.80/boost-1.80-filesystem-fix-weakly-canonical-long-paths.patch171
-rw-r--r--main/boost1.80/boost-1.80-filesystem-win-fix-dir-it-net-share.patch31
-rw-r--r--main/botan/APKBUILD9
-rw-r--r--main/bridge/APKBUILD11
-rw-r--r--main/brotli/APKBUILD41
-rw-r--r--main/btrfs-progs/APKBUILD30
-rw-r--r--main/busybox-initscripts/APKBUILD87
-rw-r--r--main/busybox-initscripts/busybox-initscripts.post-install49
l---------main/busybox-initscripts/busybox-initscripts.post-upgrade1
-rw-r--r--main/busybox-initscripts/dvbdev18
-rw-r--r--main/busybox-initscripts/mdev.conf141
-rw-r--r--main/busybox-initscripts/persistent-storage68
-rwxr-xr-xmain/busybox-initscripts/ptpdev15
-rw-r--r--main/busybox-initscripts/ptpdev.bats49
-rwxr-xr-xmain/busybox-initscripts/usbdev25
-rw-r--r--main/busybox/0001-avoid-redefined-warnings-when-building-with-utmps.patch93
-rw-r--r--main/busybox/0018-ash-fix-ifs-cleanup-on-error-paths.patch91
-rw-r--r--main/busybox/APKBUILD163
-rw-r--r--main/busybox/acpid.initd (renamed from main/busybox-initscripts/acpid.initd)0
-rw-r--r--main/busybox/busybox-extras.post-install2
-rw-r--r--main/busybox/busybox.post-install2
-rw-r--r--main/busybox/busybox.post-upgrade2
-rw-r--r--main/busybox/busyboxconfig2
-rw-r--r--main/busybox/busyboxconfig-extras6
-rw-r--r--main/busybox/crond.confd (renamed from main/busybox-initscripts/crond.confd)0
-rw-r--r--main/busybox/crond.initd (renamed from main/busybox-initscripts/crond.initd)0
-rw-r--r--main/busybox/default.script2
-rw-r--r--main/busybox/dnsd.initd (renamed from main/busybox-initscripts/dnsd.initd)0
-rw-r--r--main/busybox/httpd.initd (renamed from main/busybox-initscripts/httpd.initd)0
-rw-r--r--main/busybox/inetd.initd (renamed from main/busybox-initscripts/inetd.initd)0
-rw-r--r--main/busybox/klogd.confd (renamed from main/busybox-initscripts/klogd.confd)0
-rw-r--r--main/busybox/klogd.initd (renamed from main/busybox-initscripts/klogd.initd)0
-rw-r--r--main/busybox/loadkmap.confd (renamed from main/busybox-initscripts/loadkmap.confd)0
-rw-r--r--main/busybox/loadkmap.initd (renamed from main/busybox-initscripts/loadkmap.initd)0
-rw-r--r--main/busybox/mdev.initd (renamed from main/busybox-initscripts/mdev.initd)33
-rw-r--r--main/busybox/ntpd.confd (renamed from main/busybox-initscripts/ntpd.confd)0
-rw-r--r--main/busybox/ntpd.initd (renamed from main/busybox-initscripts/ntpd.initd)0
-rw-r--r--main/busybox/rdate.confd (renamed from main/busybox-initscripts/rdate.confd)0
-rw-r--r--main/busybox/rdate.initd (renamed from main/busybox-initscripts/rdate.initd)0
-rw-r--r--main/busybox/syslog.confd (renamed from main/busybox-initscripts/syslog.confd)0
-rw-r--r--main/busybox/syslog.initd (renamed from main/busybox-initscripts/syslog.initd)0
-rw-r--r--main/busybox/udhcpd.initd (renamed from main/busybox-initscripts/udhcpd.initd)0
-rw-r--r--main/busybox/watchdog.confd (renamed from main/busybox-initscripts/watchdog.confd)0
-rw-r--r--main/busybox/watchdog.initd (renamed from main/busybox-initscripts/watchdog.initd)0
-rw-r--r--main/bzip2/APKBUILD14
-rw-r--r--main/bzip2/bzip2.pc.in11
-rw-r--r--main/ca-certificates/APKBUILD16
-rw-r--r--main/cairo/APKBUILD14
-rw-r--r--main/ccache/APKBUILD15
-rw-r--r--main/cdparanoia/APKBUILD6
-rw-r--r--main/cgit/APKBUILD4
-rw-r--r--main/charybdis/APKBUILD4
-rw-r--r--main/checkbashisms/APKBUILD8
-rw-r--r--main/chrony/APKBUILD6
-rw-r--r--main/chrony/fix-tests.patch12
-rw-r--r--main/chrpath/APKBUILD5
-rw-r--r--main/cifs-utils/APKBUILD4
-rw-r--r--main/ciwiki/APKBUILD10
-rw-r--r--main/ciwiki/gcc-10.patch7
-rw-r--r--main/ckbcomp/APKBUILD8
-rw-r--r--main/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch13
-rw-r--r--main/clang/APKBUILD128
-rw-r--r--main/clang/llvm-hello.patch63
-rw-r--r--main/cloog/APKBUILD6
-rw-r--r--main/clucene/APKBUILD4
-rw-r--r--main/clucene/clucene-pthread.patch12
-rw-r--r--main/cmake/APKBUILD50
-rw-r--r--main/cmph/APKBUILD5
-rw-r--r--main/command-not-found/APKBUILD2
-rw-r--r--main/compat-pvgrub/APKBUILD15
-rw-r--r--main/compiler-rt/APKBUILD89
-rw-r--r--main/compiler-rt/link-execinfo.patch11
-rw-r--r--main/compiler-rt/xray-ppc64-musl.patch63
-rw-r--r--main/confuse/APKBUILD6
-rw-r--r--main/conky/APKBUILD8
-rw-r--r--main/cppunit/APKBUILD2
-rw-r--r--main/cracklib/APKBUILD12
-rw-r--r--main/cracklib/fix-trigger-warning.patch39
-rw-r--r--main/cramfs/APKBUILD14
-rw-r--r--main/cryptsetup/APKBUILD24
-rw-r--r--main/cryptsetup/dmcrypt.initd4
-rw-r--r--main/cunit/APKBUILD6
-rw-r--r--main/curl/APKBUILD15
-rw-r--r--main/curl/easy_lock.patch24
-rw-r--r--main/cutter/APKBUILD6
-rw-r--r--main/cyrus-sasl/APKBUILD12
-rw-r--r--main/cython/APKBUILD17
-rw-r--r--main/cython/cython-test-fix.patch23
-rw-r--r--main/d-feet/APKBUILD2
-rw-r--r--main/dahdi-linux-lts/APKBUILD2
-rw-r--r--main/dansguardian/APKBUILD42
-rw-r--r--main/dansguardian/cstring.patch12
-rw-r--r--main/dansguardian/gcc11.patch222
-rw-r--r--main/darkhttpd/APKBUILD8
-rw-r--r--main/dav1d/APKBUILD6
-rw-r--r--main/db/APKBUILD19
-rw-r--r--main/dbus-glib/APKBUILD6
-rw-r--r--main/dbus/0001-build-Treat-with-x-yes-the-same-as-with-x-auto.patch27
-rw-r--r--main/dbus/0002-Move-DBUS_X_-definitions-into-PKG_CHECK_MODULES-bloc.patch37
-rw-r--r--main/dbus/0003-Emit-an-error-when-with-x-was-given-but-no-X11-libs-.patch37
-rw-r--r--main/dbus/0004-Add-have_x11-no-if-without-x-was-given-to-make-later.patch25
-rw-r--r--main/dbus/0005-Convert-if-calls-to-AS_IF-macro-for-the-block-that-h.patch52
-rw-r--r--main/dbus/APKBUILD64
-rw-r--r--main/debootstrap/APKBUILD6
-rw-r--r--main/dejagnu/APKBUILD6
-rw-r--r--main/dhcp/APKBUILD7
-rw-r--r--main/dhcpcd/APKBUILD4
-rw-r--r--main/dhcpcd/dhcpcd.initd4
-rw-r--r--main/dialog/APKBUILD4
-rw-r--r--main/diffutils/APKBUILD9
-rw-r--r--main/djbdns/APKBUILD32
-rwxr-xr-xmain/djbdns/dnscache.monthly2
-rw-r--r--main/dkimproxy/APKBUILD7
-rw-r--r--main/dnssec-root/APKBUILD2
-rw-r--r--main/docbook-xml/APKBUILD15
-rw-r--r--main/docbook2x/APKBUILD24
-rw-r--r--main/docs/APKBUILD6
-rw-r--r--main/dovecot/APKBUILD30
-rw-r--r--main/doxygen/APKBUILD9
-rw-r--r--main/drbd-utils/APKBUILD4
-rw-r--r--main/dropbear/APKBUILD8
-rw-r--r--main/dropbear/dropbear-fix-utmp.patch157
-rw-r--r--main/dtc/APKBUILD2
-rw-r--r--main/efibootmgr/APKBUILD10
-rw-r--r--main/efibootmgr/efivar.patch14
-rw-r--r--main/efitools/APKBUILD4
-rw-r--r--main/eggdrop/APKBUILD59
-rw-r--r--main/eggdrop/eggdrop.post-install6
-rw-r--r--main/eggdrop/gseen.mod.patch5133
-rw-r--r--main/eggdrop/logs2html.mod.patch3417
-rw-r--r--main/elfutils/APKBUILD12
-rw-r--r--main/elinks/APKBUILD12
-rw-r--r--main/ell/0001-build-fix-time.h-related-breakage-on-musl.patch79
-rw-r--r--main/ell/APKBUILD6
-rw-r--r--main/email/APKBUILD6
-rw-r--r--main/encfs/APKBUILD4
-rw-r--r--main/encodings/APKBUILD11
-rw-r--r--main/etckeeper/APKBUILD4
-rw-r--r--main/ethtool/APKBUILD15
-rw-r--r--main/eudev/APKBUILD20
-rw-r--r--main/eudev/setup-udev28
-rw-r--r--main/expat/APKBUILD13
-rw-r--r--main/ez-ipupdate/APKBUILD21
-rw-r--r--main/fail2ban/APKBUILD6
-rw-r--r--main/fail2ban/alpine-sshd.filterd1
-rw-r--r--main/fakeroot/APKBUILD22
-rw-r--r--main/fakeroot/do-not-redefine-id_t.patch21
-rw-r--r--main/fakeroot/fakeroot-skip-ipc-sanity-check.patch29
-rw-r--r--main/fakeroot/fix-format.patch25
-rw-r--r--main/ferm/APKBUILD2
-rw-r--r--main/findutils/APKBUILD13
-rw-r--r--main/fish/APKBUILD12
-rw-r--r--main/flac/APKBUILD49
-rw-r--r--main/flashcache-utils/APKBUILD6
-rw-r--r--main/flite/APKBUILD4
-rw-r--r--main/font-adobe-100dpi/APKBUILD15
-rw-r--r--main/font-adobe-75dpi/APKBUILD15
-rw-r--r--main/font-adobe-utopia-100dpi/APKBUILD15
-rw-r--r--main/font-adobe-utopia-75dpi/APKBUILD15
-rw-r--r--main/font-adobe-utopia-type1/APKBUILD15
-rw-r--r--main/font-arabic-misc/APKBUILD15
-rw-r--r--main/font-bh-100dpi/APKBUILD15
-rw-r--r--main/font-bh-75dpi/APKBUILD15
-rw-r--r--main/font-bh-lucidatypewriter-100dpi/APKBUILD15
-rw-r--r--main/font-bh-lucidatypewriter-75dpi/APKBUILD15
-rw-r--r--main/font-bh-type1/APKBUILD15
-rw-r--r--main/font-bitstream-100dpi/APKBUILD15
-rw-r--r--main/font-bitstream-75dpi/APKBUILD15
-rw-r--r--main/font-bitstream-speedo/APKBUILD17
-rw-r--r--main/font-bitstream-type1/APKBUILD15
-rw-r--r--main/font-cronyx-cyrillic/APKBUILD15
-rw-r--r--main/font-cursor-misc/APKBUILD6
-rw-r--r--main/font-daewoo-misc/APKBUILD15
-rw-r--r--main/font-dec-misc/APKBUILD15
-rw-r--r--main/font-ibm-type1/APKBUILD15
-rw-r--r--main/font-isas-misc/APKBUILD13
-rw-r--r--main/font-jis-misc/APKBUILD15
-rw-r--r--main/font-micro-misc/APKBUILD15
-rw-r--r--main/font-misc-cyrillic/APKBUILD15
-rw-r--r--main/font-misc-meltho/APKBUILD17
-rw-r--r--main/font-misc-misc/APKBUILD6
-rw-r--r--main/font-mutt-misc/APKBUILD29
-rw-r--r--main/font-schumacher-misc/APKBUILD15
-rw-r--r--main/font-screen-cyrillic/APKBUILD15
-rw-r--r--main/font-sony-misc/APKBUILD6
-rw-r--r--main/font-sun-misc/APKBUILD15
-rw-r--r--main/font-util/APKBUILD11
-rw-r--r--main/font-vollkorn/APKBUILD6
-rw-r--r--main/font-winitzki-cyrillic/APKBUILD15
-rw-r--r--main/font-xfree86-type1/APKBUILD15
-rw-r--r--main/fprobe-ulog/APKBUILD22
-rw-r--r--main/fprobe/APKBUILD20
-rw-r--r--main/freeradius/APKBUILD8
-rw-r--r--main/freeradius/remove-eap-from-default-mods.patch2
-rw-r--r--main/freeswitch/APKBUILD6
-rw-r--r--main/freeswitch/openssl3.patch25
-rw-r--r--main/freetds/APKBUILD6
-rw-r--r--main/freetype/APKBUILD2
-rw-r--r--main/fribidi/APKBUILD2
-rw-r--r--main/fts/APKBUILD46
-rw-r--r--main/fuse3/APKBUILD13
-rw-r--r--main/gawk/APKBUILD2
-rw-r--r--main/gc/APKBUILD10
-rw-r--r--main/gcc/0001-posix_memalign.patch7
-rw-r--r--main/gcc/0002-gcc-poison-system-directories.patch55
-rw-r--r--main/gcc/0003-specs-turn-on-Wl-z-now-by-default.patch21
-rw-r--r--main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch23
-rw-r--r--main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch53
-rw-r--r--main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch11
-rw-r--r--main/gcc/0007-Enable-Wtrampolines-by-default.patch11
-rw-r--r--main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch23
-rw-r--r--main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch11
-rw-r--r--main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch7
-rw-r--r--main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch9
-rw-r--r--main/gcc/0012-libitm-disable-FORTIFY.patch7
-rw-r--r--main/gcc/0013-libgcc_s.patch31
-rw-r--r--main/gcc/0014-nopie.patch13
-rw-r--r--main/gcc/0015-dlang-use-libucontext-on-mips64.patch (renamed from main/gcc/0017-dlang-use-libucontext-on-mips64.patch)7
-rw-r--r--main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch25
-rw-r--r--main/gcc/0016-ada-fix-shared-linking.patch (renamed from main/gcc/0019-ada-fix-shared-linking.patch)7
-rw-r--r--main/gcc/0016-dlang-update-zlib-binding.patch425
-rw-r--r--main/gcc/0017-build-fix-CXXFLAGS_FOR_BUILD-passing.patch (renamed from main/gcc/0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch)9
-rw-r--r--main/gcc/0018-add-fortify-headers-paths.patch (renamed from main/gcc/0021-add-fortify-headers-paths.patch)9
-rw-r--r--main/gcc/0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch38
-rw-r--r--main/gcc/0019-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch (renamed from main/gcc/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch)17
-rw-r--r--main/gcc/0020-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch (renamed from main/gcc/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch)23
-rw-r--r--main/gcc/0021-mips64-disable-multilib-support.patch (renamed from main/gcc/0024-mips64-disable-multilib-support.patch)11
-rw-r--r--main/gcc/0022-aarch64-disable-multilib-support.patch (renamed from main/gcc/0025-aarch64-disable-multilib-support.patch)7
-rw-r--r--main/gcc/0023-s390x-disable-multilib-support.patch (renamed from main/gcc/0026-s390x-disable-multilib-support.patch)5
-rw-r--r--main/gcc/0024-ppc64-le-disable-multilib-support.patch (renamed from main/gcc/0027-ppc64-le-disable-multilib-support.patch)11
-rw-r--r--main/gcc/0025-x86_64-disable-multilib-support.patch (renamed from main/gcc/0028-x86_64-disable-multilib-support.patch)7
-rw-r--r--main/gcc/0026-riscv-disable-multilib-support.patch (renamed from main/gcc/0029-riscv-disable-multilib-support.patch)7
-rw-r--r--main/gcc/0027-always-build-libgcc_eh.a.patch (renamed from main/gcc/0030-always-build-libgcc_eh.a.patch)7
-rw-r--r--main/gcc/0028-ada-libgnarl-compatibility-for-musl.patch (renamed from main/gcc/0031-ada-libgnarl-compatibility-for-musl.patch)13
-rw-r--r--main/gcc/0029-ada-musl-support-fixes.patch (renamed from main/gcc/0032-ada-musl-support-fixes.patch)33
-rw-r--r--main/gcc/0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch43
-rw-r--r--main/gcc/0033-gcc-go-link-to-libucontext.patch42
-rw-r--r--main/gcc/0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch27
-rw-r--r--main/gcc/0034-Use-generic-errstr.go-implementation-on-musl.patch (renamed from main/gcc/0038-Use-generic-errstr.go-implementation-on-musl.patch)5
-rw-r--r--main/gcc/0035-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch (renamed from main/gcc/0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch)66
-rw-r--r--main/gcc/0035-gcc-go-signal-34-is-special-on-musl-libc.patch29
-rw-r--r--main/gcc/0036-configure-fix-detection-of-atomic-builtins-in-libato.patch (renamed from main/gcc/0040-configure-fix-detection-of-atomic-builtins-in-libato.patch)7
-rw-r--r--main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch27
-rw-r--r--main/gcc/0037-gcc-go-link-to-libucontext.patch25
-rw-r--r--main/gcc/0037-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch199
-rw-r--r--main/gcc/0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch39
-rw-r--r--main/gcc/0041-go-gospec-forcibly-disable-fsplit-stack-support.patch (renamed from main/gcc/0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch)34
-rw-r--r--main/gcc/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch84
-rw-r--r--main/gcc/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch80
-rw-r--r--main/gcc/0042-gcc-go-fix-build-error-with-SYS_SECCOMP.patch41
-rw-r--r--main/gcc/0043-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch24
-rw-r--r--main/gcc/0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch106
-rw-r--r--main/gcc/0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch63
-rw-r--r--main/gcc/0044-gdc-unconditionally-link-libgphobos-against-libucont.patch (renamed from main/gcc/0048-gdc-unconditionally-link-libgphobos-against-libucont.patch)9
-rw-r--r--main/gcc/0045-druntime-link-against-libucontext-on-all-platforms.patch51
-rw-r--r--main/gcc/0045-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch58
-rw-r--r--main/gcc/0046-Disable-fsplit-stack-support-on-non-glibc-targets.patch115
-rw-r--r--main/gcc/0047-x86-Properly-disable-fsplit-stack-support-on-non-gli.patch94
-rw-r--r--main/gcc/0049-libgo-adjust-name-of-union-in-sigevent-struct.patch108
-rw-r--r--main/gcc/0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch298
-rw-r--r--main/gcc/0050-libphobos-don-t-define-__mode_t-twice-on-musl-target.patch75
-rw-r--r--main/gcc/0051-go-gospec-forcibly-disable-fsplit-stack-support.patch33
-rw-r--r--main/gcc/0051-libgo-Explicitly-define-SYS_timer_settime-for-32-bit.patch36
-rw-r--r--main/gcc/0052-libgnat-time_t-is-always-64-bit-on-musl-libc.patch22
-rw-r--r--main/gcc/0053-libgo-make-match.sh-POSIX-shell-compatible.patch50
-rw-r--r--main/gcc/APKBUILD323
-rw-r--r--main/gcc/libgo-musl-1.2.3.patch13
-rw-r--r--main/gcr/APKBUILD25
-rw-r--r--main/gcr/dont-run-gpg-tests.patch12
-rw-r--r--main/gcr/fix-build-without-systemd.patch28
-rw-r--r--main/gcr/fix-meson-invalid-kw-argument.patch61
-rw-r--r--main/gdk-pixbuf/APKBUILD40
-rw-r--r--main/gengetopt/APKBUILD6
-rw-r--r--main/giflib/APKBUILD9
-rw-r--r--main/git/APKBUILD79
-rw-r--r--main/glib/0001-gslice-remove-slice-allocator.patch1695
-rw-r--r--main/glib/APKBUILD41
-rw-r--r--main/glib/gparamspec.patch33
-rw-r--r--main/glib/musl-libintl.patch22
-rw-r--r--main/glslang/APKBUILD10
-rw-r--r--main/glu/APKBUILD9
-rw-r--r--main/gnu-efi/APKBUILD4
-rw-r--r--main/gnupg/70-gpg-import-Ed25519-private-keys-as-MPIs.patch53
-rw-r--r--main/gnupg/APKBUILD10
-rw-r--r--main/gnupg/CVE-2022-34903.patch41
-rw-r--r--main/gnutls/APKBUILD11
-rw-r--r--main/goaccess/APKBUILD4
-rw-r--r--main/gobject-introspection/APKBUILD15
-rw-r--r--main/gperf/APKBUILD13
-rw-r--r--main/gpsd/APKBUILD8
-rw-r--r--main/gpsd/timepps.h12
-rw-r--r--main/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch38
-rw-r--r--main/gptfdisk/APKBUILD9
-rw-r--r--main/graphene/APKBUILD5
-rw-r--r--main/graphviz/0001-clone-nameclash.patch87
-rw-r--r--main/graphviz/APKBUILD89
-rw-r--r--main/grep/APKBUILD8
-rw-r--r--main/grub/0013-prevent-vgs-warnings.patch37
-rw-r--r--main/grub/APKBUILD23
-rw-r--r--main/gsm/APKBUILD16
-rw-r--r--main/gsm/gsm-makefile.patch7
-rw-r--r--main/gst-plugins-base/APKBUILD3
-rw-r--r--main/gstreamer/APKBUILD6
-rw-r--r--main/gtk+2.0/APKBUILD44
-rw-r--r--main/gtk+3.0/APKBUILD93
-rw-r--r--main/gtk+3.0/gtk-update-icon-cache.trigger (renamed from main/gtk+2.0/gtk-update-icon-cache.trigger)0
-rw-r--r--main/gtk-doc/APKBUILD8
-rw-r--r--main/guile/APKBUILD24
-rw-r--r--main/guile/failing-encoding-test.patch26
-rw-r--r--main/gvpe/APKBUILD4
-rw-r--r--main/haproxy/APKBUILD6
-rw-r--r--main/harfbuzz/APKBUILD46
-rw-r--r--main/hdparm/APKBUILD4
-rw-r--r--main/heimdal/APKBUILD4
-rw-r--r--main/hicolor-icon-theme/APKBUILD4
-rw-r--r--main/highlight/APKBUILD25
-rw-r--r--main/hiredis/APKBUILD14
-rw-r--r--main/hostapd/0001-hostapd-Add-the-missing-CONFIG_SAE-option-to-the-def.patch30
-rw-r--r--main/hostapd/APKBUILD95
-rw-r--r--main/htop/APKBUILD15
-rw-r--r--main/hunspell/APKBUILD11
-rw-r--r--main/hwdata/APKBUILD73
-rw-r--r--main/hwdata/install-T.patch13
-rw-r--r--main/hwids/APKBUILD70
-rw-r--r--main/hylafaxplus/APKBUILD6
-rw-r--r--main/iaxmodem/APKBUILD27
-rw-r--r--main/icecast/APKBUILD6
-rw-r--r--main/icu/APKBUILD2
-rw-r--r--main/imake/APKBUILD4
-rw-r--r--main/imap/APKBUILD4
-rw-r--r--main/imlib2/APKBUILD23
-rw-r--r--main/inih/APKBUILD4
-rw-r--r--main/iniparser/APKBUILD9
-rw-r--r--main/inotify-tools/APKBUILD6
-rw-r--r--main/intel-ucode/APKBUILD6
-rw-r--r--main/intltool/APKBUILD6
-rw-r--r--main/iperf3/APKBUILD12
-rw-r--r--main/iperf3/build-fixes.patch20
-rw-r--r--main/iproute2-qos/APKBUILD13
-rw-r--r--main/iproute2-qos/qos.initd2
-rw-r--r--main/iproute2/APKBUILD15
-rw-r--r--main/ipvsadm/APKBUILD2
-rw-r--r--main/irssi/APKBUILD8
-rw-r--r--main/isl24/APKBUILD (renamed from main/isl/APKBUILD)25
-rw-r--r--main/isl25/APKBUILD (renamed from main/isl22/APKBUILD)14
-rw-r--r--main/iso-codes/APKBUILD4
-rw-r--r--main/ivykis/APKBUILD2
-rw-r--r--main/jack/APKBUILD33
-rw-r--r--main/jack/increase-api-version.patch4
-rw-r--r--main/jemalloc/APKBUILD46
-rw-r--r--main/jemalloc/jemalloc-no-pprof.patch11
-rw-r--r--main/joe/APKBUILD8
-rw-r--r--main/jwhois/APKBUILD20
-rw-r--r--main/kamailio/APKBUILD12
-rw-r--r--main/kamailio/kamailio.initd31
-rw-r--r--main/kbd/APKBUILD2
-rw-r--r--main/kmod/APKBUILD4
-rw-r--r--main/knock/APKBUILD4
-rw-r--r--main/knot/APKBUILD11
-rw-r--r--main/krb5/APKBUILD8
-rw-r--r--main/kyua/APKBUILD9
-rw-r--r--main/lame/APKBUILD10
-rw-r--r--main/ldapvi/APKBUILD4
-rw-r--r--main/ldb/APKBUILD24
-rw-r--r--main/ldb/strtoull.patch89
-rw-r--r--main/lddtree/APKBUILD11
-rw-r--r--main/ldns/APKBUILD6
-rw-r--r--main/ldoc/APKBUILD6
-rw-r--r--main/less/APKBUILD4
-rw-r--r--main/lftp/APKBUILD4
-rw-r--r--main/libaio/APKBUILD15
-rw-r--r--main/libaio/libaio-optional-werror.patch31
-rw-r--r--main/libarchive/APKBUILD4
-rw-r--r--main/libart-lgpl/APKBUILD2
-rw-r--r--main/libasr/APKBUILD4
-rw-r--r--main/libatomic_ops/APKBUILD14
-rw-r--r--main/libcap/APKBUILD26
-rw-r--r--main/libdbi/APKBUILD2
-rw-r--r--main/libdnet/APKBUILD6
-rw-r--r--main/libdrm/APKBUILD20
-rw-r--r--main/libeconf/APKBUILD6
-rw-r--r--main/libepoxy/APKBUILD2
-rw-r--r--main/libestr/APKBUILD4
-rw-r--r--main/libevent/APKBUILD4
-rw-r--r--main/libexecinfo/10-execinfo.patch64
-rw-r--r--main/libexecinfo/20-define-gnu-source.patch24
-rw-r--r--main/libexecinfo/30-linux-makefile.patch44
-rw-r--r--main/libexecinfo/APKBUILD50
-rw-r--r--main/libffi/APKBUILD11
-rw-r--r--main/libffi/pax-dlmmap.patch120
-rw-r--r--main/libfido2/APKBUILD8
-rw-r--r--main/libfontenc/APKBUILD11
-rw-r--r--main/libice/APKBUILD3
-rw-r--r--main/libid3tag/APKBUILD29
-rw-r--r--main/libidn/APKBUILD4
-rw-r--r--main/libidn2/APKBUILD6
-rw-r--r--main/libimagequant/APKBUILD41
-rw-r--r--main/libjpeg-turbo/APKBUILD15
-rw-r--r--main/libkcapi/APKBUILD86
-rw-r--r--main/libkcapi/no-werror.patch13
-rw-r--r--main/libks/APKBUILD4
-rw-r--r--main/libksba/APKBUILD4
-rw-r--r--main/liblognorm/APKBUILD5
-rw-r--r--main/libmaxminddb/APKBUILD6
-rw-r--r--main/libmemcached/APKBUILD2
-rw-r--r--main/libnetfilter_conntrack/APKBUILD13
-rw-r--r--main/libnetfilter_conntrack/fix_build_with_kernel_5.15_and_musl.patch56
-rw-r--r--main/libnftnl/APKBUILD4
-rw-r--r--main/libnl/APKBUILD8
-rw-r--r--main/libnl3/APKBUILD8
-rw-r--r--main/libnl3/fix-tests.patch46
-rw-r--r--main/libogg/APKBUILD2
-rw-r--r--main/libpciaccess/APKBUILD4
-rw-r--r--main/libpng/APKBUILD33
-rw-r--r--main/libpng/dont-run-pngtest.patch12
-rw-r--r--main/libpng/libpng-fix-arm-neon.patch8
-rw-r--r--main/libpri/APKBUILD2
-rw-r--r--main/librelp/APKBUILD4
-rw-r--r--main/libretls/APKBUILD6
-rw-r--r--main/libseccomp/APKBUILD8
-rw-r--r--main/libseccomp/tests-11-basic-errors-support-older-kernels.patch108
-rw-r--r--main/libsecret/APKBUILD2
-rw-r--r--main/libshout/APKBUILD6
-rw-r--r--main/libsm/APKBUILD6
-rw-r--r--main/libsndfile/APKBUILD3
-rw-r--r--main/libsodium/APKBUILD15
-rw-r--r--main/libsrtp/APKBUILD6
-rw-r--r--main/libssh2/APKBUILD4
-rw-r--r--main/libtasn1/APKBUILD22
-rw-r--r--main/libtasn1/failed-test.patch13
-rw-r--r--main/libtheora/APKBUILD2
-rw-r--r--main/libtirpc/APKBUILD8
-rw-r--r--main/libtirpc/CVE-2021-46828.patch181
-rw-r--r--main/libtxc_dxtn/APKBUILD16
-rw-r--r--main/libuv/APKBUILD4
-rw-r--r--main/libva/APKBUILD5
-rw-r--r--main/libvdpau/APKBUILD2
-rw-r--r--main/libverto/APKBUILD6
-rw-r--r--main/libwebp/APKBUILD11
-rw-r--r--main/libwebsockets/APKBUILD8
-rw-r--r--main/libxau/APKBUILD15
-rw-r--r--main/libxcomposite/APKBUILD4
-rw-r--r--main/libxdmcp/APKBUILD3
-rw-r--r--main/libxext/APKBUILD5
-rw-r--r--main/libxfont/APKBUILD5
-rw-r--r--main/libxft/APKBUILD8
-rw-r--r--main/libxft/emoji.patch861
-rw-r--r--main/libxinerama/APKBUILD6
-rw-r--r--main/libxkbcommon/APKBUILD2
-rw-r--r--main/libxkbfile/APKBUILD10
-rw-r--r--main/libxml2/APKBUILD41
-rw-r--r--main/libxmu/APKBUILD7
-rw-r--r--main/libxpm/APKBUILD3
-rw-r--r--main/libxrender/APKBUILD7
-rw-r--r--main/libxslt/APKBUILD15
-rw-r--r--main/libxtst/APKBUILD19
-rw-r--r--main/libxv/APKBUILD11
-rw-r--r--main/libxxf86vm/APKBUILD25
-rw-r--r--main/lighttpd/APKBUILD6
-rw-r--r--main/linenoise/APKBUILD7
-rw-r--r--main/links/APKBUILD6
-rw-r--r--main/linux-firmware/APKBUILD35
-rw-r--r--main/linux-headers/0001-bpf-Add-btf-enum64-support.patch503
-rw-r--r--main/linux-headers/APKBUILD12
-rw-r--r--main/linux-lts/APKBUILD47
-rw-r--r--main/linux-lts/awk.patch13
-rw-r--r--main/linux-lts/lts.aarch64.config19
-rw-r--r--main/linux-lts/lts.armv7.config3
-rw-r--r--main/linux-lts/lts.ppc64le.config3
-rw-r--r--main/linux-lts/lts.s390x.config2
-rw-r--r--main/linux-lts/lts.x86.config4
-rw-r--r--main/linux-lts/lts.x86_64.config5
-rw-r--r--main/linux-lts/virt.aarch64.config3
-rw-r--r--main/linux-lts/virt.armv7.config3
-rw-r--r--main/linux-lts/virt.ppc64le.config2
-rw-r--r--main/linux-lts/virt.x86.config3
-rw-r--r--main/linux-lts/virt.x86_64.config3
-rw-r--r--main/linux-octeon/APKBUILD4
-rw-r--r--main/linux-rpi/APKBUILD8
-rw-r--r--main/lld/APKBUILD72
-rw-r--r--main/llvm-runtimes/APKBUILD113
-rw-r--r--main/llvm-runtimes/compiler-rt-sanitizer-ppc64-musl.patch (renamed from main/compiler-rt/sanitizer-ppc64-musl.patch)12
-rw-r--r--main/llvm-runtimes/compiler-rt-sanitizer-supported-arch.patch (renamed from main/compiler-rt/sanitizer-supported-arch.patch)8
-rw-r--r--main/llvm-runtimes/compiler-rt-xray-ppc64-musl.patch11
-rw-r--r--main/llvm-runtimes/libcxx-musl.patch28
-rw-r--r--main/llvm-runtimes/libcxx-ppc.patch24
-rw-r--r--main/llvm-runtimes/libunwind-link-libssp.patch20
-rw-r--r--main/llvm13/fix-LLVMConfig-cmake-install-prefix.patch24
-rw-r--r--main/llvm14/APKBUILD19
-rw-r--r--main/llvm14/llvm-stack-size.patch34
-rw-r--r--main/llvm15/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch (renamed from main/llvm13/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch)4
-rw-r--r--main/llvm15/APKBUILD (renamed from main/llvm13/APKBUILD)141
-rw-r--r--main/llvm15/fix-memory-mf_exec-on-aarch64.patch (renamed from main/llvm13/fix-memory-mf_exec-on-aarch64.patch)4
-rw-r--r--main/llvm15/install-prefix.patch31
-rw-r--r--main/llvm15/llvm-stack-size.patch34
-rw-r--r--main/lm-sensors/APKBUILD45
-rw-r--r--main/lm-sensors/lm-sensors.post-upgrade12
-rw-r--r--main/logcheck/APKBUILD11
-rw-r--r--main/logrotate/APKBUILD14
-rw-r--r--main/logrotate/syslog1
-rw-r--r--main/lsof/APKBUILD4
-rw-r--r--main/lsyncd/APKBUILD16
-rw-r--r--main/ltrace/APKBUILD2
-rw-r--r--main/lttng-ust/APKBUILD4
-rw-r--r--main/lua-asn1/APKBUILD24
-rw-r--r--main/lua-cmsgpack/APKBUILD2
-rw-r--r--main/lua-cqueues/APKBUILD4
-rw-r--r--main/lua-dns/APKBUILD4
-rw-r--r--main/lua-evdev/APKBUILD12
-rw-r--r--main/lua-expat/APKBUILD12
-rw-r--r--main/lua-ldbus/APKBUILD58
-rw-r--r--main/lua-mqtt-publish/APKBUILD14
-rw-r--r--main/lua-mqtt-publish/restore-sigpipe-handler.patch23
-rw-r--r--main/lua-ossl/APKBUILD12
-rw-r--r--main/lua-ossl/openssl3.patch933
-rw-r--r--main/lua-resty-lrucache/APKBUILD10
-rw-r--r--main/lua-sec/APKBUILD8
-rw-r--r--main/lua-soap/APKBUILD26
-rw-r--r--main/lua-socket/0001-Create-socket-on-first-sendto-if-family-agnostic-udp.patch49
-rw-r--r--main/lua-socket/APKBUILD26
-rw-r--r--main/lua-socket/git.patch6609
-rw-r--r--main/lua-socket/lua-cflags.patch18
-rw-r--r--main/lua5.2/APKBUILD9
-rw-r--r--main/lua5.3/APKBUILD9
-rw-r--r--main/lua5.4/APKBUILD3
-rw-r--r--main/luajit/APKBUILD9
-rw-r--r--main/lvm2/APKBUILD10
-rw-r--r--main/lxc/APKBUILD102
-rw-r--r--main/lxc/sysconfdir.patch17
-rw-r--r--main/lynx/APKBUILD4
-rw-r--r--main/lz4/APKBUILD14
-rw-r--r--main/lz4/CVE-2021-3520.patch22
-rw-r--r--main/makedepend/APKBUILD5
-rw-r--r--main/mandoc/APKBUILD8
-rw-r--r--main/mandoc/mandoc-apropos.post-deinstall (renamed from main/mandoc/mandoc.post-deinstall)0
-rw-r--r--main/mandoc/mandoc-apropos.trigger2
-rw-r--r--main/mariadb-connector-c/APKBUILD18
-rw-r--r--main/mariadb/APKBUILD26
-rw-r--r--main/mbedtls/APKBUILD6
-rw-r--r--main/mdadm/APKBUILD4
-rw-r--r--main/mdev-conf/APKBUILD30
-rw-r--r--main/mdev-conf/fix-input-stuff.patch34
-rw-r--r--main/mdevd/APKBUILD16
-rw-r--r--main/mdevd/mdevd-init.initd2
-rw-r--r--main/memcached/APKBUILD8
-rw-r--r--main/mesa/0001-freedreno-Enable-A619.patch37
-rw-r--r--main/mesa/APKBUILD187
-rw-r--r--main/mesa/add-use-elf-tls.patch29
-rw-r--r--main/mesa/musl-fix-includes.patch13
-rw-r--r--main/meson/APKBUILD8
-rwxr-xr-x[-rw-r--r--]main/meson/abuild-meson51
-rw-r--r--main/mini_httpd/APKBUILD4
-rw-r--r--main/mkinitfs/APKBUILD4
-rw-r--r--main/mlmmj/APKBUILD8
-rw-r--r--main/monit/APKBUILD4
-rw-r--r--main/mosh/APKBUILD4
-rw-r--r--main/mosquitto/APKBUILD6
-rw-r--r--main/mpc1/APKBUILD8
-rw-r--r--main/mpg123/APKBUILD6
-rw-r--r--main/mqtt-exec/APKBUILD6
-rw-r--r--main/mqtt-exec/mqtt-exec.confd23
-rw-r--r--main/mqtt-exec/mqtt-exec.initd3
-rw-r--r--main/mtd-utils/APKBUILD8
-rw-r--r--main/mtools/APKBUILD6
-rw-r--r--main/multipath-tools/APKBUILD6
-rw-r--r--main/musl-fts/APKBUILD44
-rw-r--r--main/nagios-plugins/APKBUILD4
-rw-r--r--main/nagios/APKBUILD4
-rw-r--r--main/nano/APKBUILD8
-rw-r--r--main/ncdu/APKBUILD4
-rw-r--r--main/ncurses/APKBUILD132
-rw-r--r--main/ndisc6/APKBUILD6
-rw-r--r--main/ndisc6/rdnssd-fix-merge-hook-regex.patch17
-rw-r--r--main/neon/APKBUILD26
-rw-r--r--main/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch50
-rw-r--r--main/net-snmp/APKBUILD20
-rw-r--r--main/net-tools/git.patch26170
-rw-r--r--main/netcf/APKBUILD19
-rw-r--r--main/nettle/APKBUILD4
-rw-r--r--main/newt/APKBUILD4
-rw-r--r--main/nfdump/APKBUILD6
-rw-r--r--main/nfdump/noyywrap.patch13
-rw-r--r--main/nftables/APKBUILD4
-rw-r--r--main/nghttp2/APKBUILD16
-rw-r--r--main/nginx/APKBUILD59
-rw-r--r--main/nginx/nginx-module-vts~cast-key-length-to-correct-type.patch24
-rw-r--r--main/nginx/nginx-module-vts~fix-uri-overflow.patch30
-rw-r--r--main/nginx/nginx-module-vts~set-histogram-buckets-on-first-request.patch147
-rw-r--r--main/nginx/nginx.conf8
-rw-r--r--main/nginx/nginx.post-upgrade47
-rw-r--r--main/nginx/njs~fix-dangling-pointer.patch94
-rw-r--r--main/nginx/stream.conf2
-rw-r--r--main/ngircd/APKBUILD4
-rw-r--r--main/nload/APKBUILD16
-rw-r--r--main/nmap/APKBUILD10
-rw-r--r--main/nodejs/APKBUILD23
-rw-r--r--main/nrpe/APKBUILD23
-rw-r--r--main/nsd/APKBUILD4
-rw-r--r--main/nspr/APKBUILD15
-rw-r--r--main/nspr/fix-getproto.patch13
-rw-r--r--main/nspr/fix-sgidefs-usage.patch40
-rw-r--r--main/numactl/APKBUILD31
-rw-r--r--main/numactl/musl.patch21
-rw-r--r--main/obex-data-server/APKBUILD2
-rw-r--r--main/one-context/APKBUILD6
-rw-r--r--main/open-iscsi/APKBUILD4
-rw-r--r--main/open-isns/APKBUILD4
-rw-r--r--main/openldap/0001-Fix-build-issue-in-clients-tools-common.c.patch26
-rw-r--r--main/openldap/0002-Add-UNIX_LINK_LIBS-to-slapi-Makefile.patch24
-rw-r--r--main/openldap/0003-Add-mqtt-overlay.patch (renamed from main/openldap/openldap-mqtt-overlay.patch)18
-rw-r--r--main/openldap/0004-Fix-manpages.patch (renamed from main/openldap/fix-manpages.patch)25
-rw-r--r--main/openldap/0005-Correct-command-line-syntax-in-lloadd-tests.patch (renamed from main/openldap/fix-lloadd-tests.patch)33
-rw-r--r--main/openldap/0006-Fix-build-on-mips-inconsistent-cacheflush-prototype.patch27
-rw-r--r--main/openldap/0007-Use-correct-extension-for-slapd-modules-in-slapd.con.patch31
-rw-r--r--main/openldap/0008-Remove-pidfile-and-argsfile.patch29
-rw-r--r--main/openldap/APKBUILD47
-rw-r--r--main/openldap/cacheflush.patch12
-rw-r--r--main/openldap/openldap-2.4-ppolicy.patch13
-rw-r--r--main/openldap/openldap-2.4.11-libldap_r.patch11
-rw-r--r--main/openldap/slapd.initd3
-rw-r--r--main/openldap/slapd.ldif.patch29
-rw-r--r--main/openldap/tests-make-add-missing-dependency.patch13
-rw-r--r--main/openntpd/APKBUILD4
-rw-r--r--main/openntpd/openntpd.confd3
-rw-r--r--main/openrc/0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch111
-rw-r--r--main/openrc/0003-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch4
-rw-r--r--main/openrc/0009-fix-bootmisc-mv-error.patch27
-rw-r--r--main/openrc/0010-noexec-devfs.patch14
-rw-r--r--main/openrc/APKBUILD33
-rw-r--r--main/openrc/hwdrivers.initd4
-rw-r--r--main/openrc/openrc.post-upgrade30
-rw-r--r--main/openrc/remount-root.patch42
-rw-r--r--main/openrc/seedrng.patch640
-rw-r--r--main/opensbi/APKBUILD5
-rw-r--r--main/opensmtpd/APKBUILD4
-rw-r--r--main/openssh/APKBUILD27
-rw-r--r--main/openssh/default-internal-sftp.patch14
-rw-r--r--main/openssh/fix-utmp.patch29
-rw-r--r--main/openssl/APKBUILD61
-rw-r--r--main/openssl/man-section.patch51
-rw-r--r--main/openssl1.1-compat/APKBUILD (renamed from main/openssl3/APKBUILD)63
-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/openssl3/man-section.patch31
-rw-r--r--main/openvpn-ad-check/APKBUILD33
-rw-r--r--main/openvpn/APKBUILD2
-rw-r--r--main/opusfile/APKBUILD4
-rw-r--r--main/orc/APKBUILD5
-rw-r--r--main/ortp/APKBUILD4
-rw-r--r--main/p11-kit/APKBUILD2
-rw-r--r--main/p7zip/APKBUILD5
-rw-r--r--main/pango/APKBUILD29
-rw-r--r--main/pango/disable-broken-test.patch9
-rw-r--r--main/parallel/APKBUILD16
-rw-r--r--main/parallel/completion-dir.patch18
-rw-r--r--main/pax-utils/APKBUILD31
-rw-r--r--main/pciutils/APKBUILD13
-rw-r--r--main/pcmciautils/APKBUILD15
-rw-r--r--main/pcsc-lite/APKBUILD7
-rw-r--r--main/perdition/APKBUILD4
-rw-r--r--main/perl-convert-color/APKBUILD8
-rw-r--r--main/perl-cpanel-json-xs/APKBUILD4
-rw-r--r--main/perl-crypt-openssl-guess/APKBUILD4
-rw-r--r--main/perl-crypt-openssl-random/APKBUILD4
-rw-r--r--main/perl-crypt-openssl-rsa/APKBUILD12
-rw-r--r--main/perl-crypt-openssl-rsa/no-sslv23-padding.patch15
-rw-r--r--main/perl-crypt-ssleay/APKBUILD4
-rw-r--r--main/perl-datetime-format-w3cdtf/APKBUILD17
-rw-r--r--main/perl-datetime-locale/APKBUILD4
-rw-r--r--main/perl-datetime-timezone/APKBUILD4
-rw-r--r--main/perl-dbd-mysql/APKBUILD2
-rw-r--r--main/perl-dbd-pg/APKBUILD6
-rw-r--r--main/perl-encode/APKBUILD4
-rw-r--r--main/perl-exporter-tiny/APKBUILD8
-rw-r--r--main/perl-file-listing/APKBUILD7
-rw-r--r--main/perl-file-sharedir-install/APKBUILD8
-rw-r--r--main/perl-file-slurper/APKBUILD8
-rw-r--r--main/perl-gd/APKBUILD6
-rw-r--r--main/perl-io-socket-ssl/APKBUILD4
-rw-r--r--main/perl-json/APKBUILD6
-rw-r--r--main/perl-list-utilsby/APKBUILD8
-rw-r--r--main/perl-log-dispatch/APKBUILD1
-rw-r--r--main/perl-lwp-protocol-https/APKBUILD7
-rw-r--r--main/perl-mime-tools/APKBUILD8
-rw-r--r--main/perl-mime-types/APKBUILD4
-rw-r--r--main/perl-module-refresh/APKBUILD10
-rw-r--r--main/perl-net-dns-resolver-mock/APKBUILD8
-rw-r--r--main/perl-net-ssleay/APKBUILD4
-rw-r--r--main/perl-path-tiny/APKBUILD4
-rw-r--r--main/perl-scalar-list-utils/APKBUILD6
-rw-r--r--main/perl-socket/APKBUILD4
-rw-r--r--main/perl-struct-dumb/APKBUILD8
-rw-r--r--main/perl-test-simple/APKBUILD6
-rw-r--r--main/perl-test-warn/APKBUILD8
-rw-r--r--main/perl-text-csv/APKBUILD4
-rw-r--r--main/perl-type-tiny/APKBUILD4
-rw-r--r--main/perl-uri/APKBUILD6
-rw-r--r--main/perl-variable-magic/APKBUILD29
-rw-r--r--main/perl-xml-xpath/APKBUILD11
-rw-r--r--main/pgpool/APKBUILD10
-rw-r--r--main/pgpool/pgpool.confd5
-rw-r--r--main/pgpool/pgpool.initd11
-rw-r--r--main/pgtcl/APKBUILD78
-rw-r--r--main/pgtcl/pgtcl-tests.patch91
-rw-r--r--main/pinentry/APKBUILD11
-rw-r--r--main/pinentry/pinentry-curses-ss.post-deinstall12
-rw-r--r--main/pingu/APKBUILD13
-rw-r--r--main/pixman/APKBUILD19
-rw-r--r--main/pjproject/APKBUILD25
-rw-r--r--main/pkgconf/APKBUILD16
-rw-r--r--main/pkgconf/fix-cflags-include.patch16
-rw-r--r--main/po4a/APKBUILD6
-rw-r--r--main/policyd-spf-fs/APKBUILD9
-rw-r--r--main/poppler/APKBUILD37
-rw-r--r--main/poppler/dont-enforce-build-type.patch26
-rw-r--r--main/popt/APKBUILD6
-rw-r--r--main/postfix-policyd-spf-perl/APKBUILD8
-rw-r--r--main/postfix/APKBUILD4
-rw-r--r--main/postgresql-common/APKBUILD16
-rw-r--r--main/postgresql-common/postgresql.confd16
-rw-r--r--main/postgresql-common/postgresql.initd2
-rw-r--r--main/postgresql13/APKBUILD16
-rw-r--r--main/postgresql13/dont-use-locale-a-on-musl.patch31
-rw-r--r--main/postgresql13/icu-collations-hack.patch893
-rw-r--r--main/postgresql13/plperl-5.36-new-warnings-category.patch38
-rw-r--r--main/postgresql14/APKBUILD12
-rw-r--r--main/postgresql14/dont-use-locale-a-on-musl.patch31
-rw-r--r--main/postgresql14/icu-collations-hack.patch893
-rw-r--r--main/pound/APKBUILD6
-rw-r--r--main/pound/openssl1.1-cli.patch17
-rw-r--r--main/powertop/APKBUILD32
-rw-r--r--main/powertop/musl-fix-headers.patch22
-rw-r--r--main/ppp/APKBUILD6
-rw-r--r--main/ppp/drop-ipx.patch395
-rw-r--r--main/pptpd/APKBUILD22
-rw-r--r--main/procps/APKBUILD5
-rw-r--r--main/protobuf-c/APKBUILD4
-rw-r--r--main/protobuf/APKBUILD6
-rw-r--r--main/pspg/APKBUILD4
-rw-r--r--main/psqlodbc/APKBUILD6
-rw-r--r--main/pstree/APKBUILD24
-rw-r--r--main/py3-appdirs/APKBUILD2
-rw-r--r--main/py3-atomicwrites/APKBUILD14
-rw-r--r--main/py3-attrs/APKBUILD4
-rw-r--r--main/py3-babel/APKBUILD13
-rw-r--r--main/py3-bcrypt/APKBUILD31
-rw-r--r--main/py3-build/APKBUILD9
-rw-r--r--main/py3-cairo/APKBUILD2
-rw-r--r--main/py3-certifi/APKBUILD12
-rw-r--r--main/py3-certifi/use-alpine-system-certs.patch16
-rw-r--r--main/py3-chardet/APKBUILD10
-rw-r--r--main/py3-charset-normalizer/APKBUILD14
-rw-r--r--main/py3-coverage/APKBUILD7
-rw-r--r--main/py3-coverage/toml-error-message.patch13
-rw-r--r--main/py3-cparser/APKBUILD11
-rw-r--r--main/py3-dbus/APKBUILD35
-rw-r--r--main/py3-distlib/APKBUILD2
-rw-r--r--main/py3-docutils/APKBUILD38
-rw-r--r--main/py3-elementpath/APKBUILD7
-rw-r--r--main/py3-elftools/APKBUILD8
-rw-r--r--main/py3-exceptiongroup/APKBUILD4
-rw-r--r--main/py3-filelock/APKBUILD13
-rw-r--r--main/py3-gobject3/APKBUILD22
-rw-r--r--main/py3-gpep517/APKBUILD33
-rw-r--r--main/py3-gpep517/gpep5176
-rw-r--r--main/py3-hypothesis/APKBUILD4
-rw-r--r--main/py3-idna/APKBUILD21
-rw-r--r--main/py3-imagesize/APKBUILD4
-rw-r--r--main/py3-iniconfig/APKBUILD4
-rw-r--r--main/py3-lxc/APKBUILD2
-rw-r--r--main/py3-mako/APKBUILD4
-rw-r--r--main/py3-markdown/APKBUILD8
-rw-r--r--main/py3-markupsafe/APKBUILD4
-rw-r--r--main/py3-mimeparse/APKBUILD6
-rw-r--r--main/py3-mock/APKBUILD4
-rw-r--r--main/py3-ordered-set/APKBUILD38
-rw-r--r--main/py3-packaging/APKBUILD4
-rw-r--r--main/py3-parsing/APKBUILD32
-rw-r--r--main/py3-pbr/APKBUILD4
-rw-r--r--main/py3-pep517/APKBUILD17
-rw-r--r--main/py3-pexpect/APKBUILD2
-rw-r--r--main/py3-pluggy/APKBUILD4
-rw-r--r--main/py3-ply/APKBUILD12
-rw-r--r--main/py3-ply/no-py3-six.patch13
-rw-r--r--main/py3-pretend/APKBUILD2
-rw-r--r--main/py3-ptyprocess/APKBUILD2
-rw-r--r--main/py3-py/APKBUILD13
-rw-r--r--main/py3-pygments/APKBUILD4
-rw-r--r--main/py3-pynacl/APKBUILD4
-rw-r--r--main/py3-pytest-timeout/APKBUILD8
-rw-r--r--main/py3-pytest/APKBUILD7
-rw-r--r--main/py3-setuptools/APKBUILD40
-rw-r--r--main/py3-six/APKBUILD7
-rw-r--r--main/py3-sphinx/APKBUILD28
-rw-r--r--main/py3-sphinx_rtd_theme/APKBUILD6
-rw-r--r--main/py3-sphinxcontrib-applehelp/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-devhelp/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-htmlhelp/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-jsmath/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-qthelp/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-serializinghtml/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-websupport/APKBUILD2
-rw-r--r--main/py3-tappy/APKBUILD8
-rw-r--r--main/py3-toml/APKBUILD2
-rw-r--r--main/py3-tz/APKBUILD6
-rw-r--r--main/py3-urllib3/APKBUILD4
-rw-r--r--main/py3-wheel/APKBUILD24
-rw-r--r--main/py3-xmlschema/APKBUILD4
-rw-r--r--main/python3/APKBUILD33
-rw-r--r--main/rabbitmq-c/APKBUILD7
-rw-r--r--main/rarian/APKBUILD5
-rw-r--r--main/raspberrypi-bootloader/APKBUILD9
-rw-r--r--main/readline/APKBUILD13
-rw-r--r--main/redis/APKBUILD12
-rw-r--r--main/rhash/APKBUILD4
-rw-r--r--main/rlog/APKBUILD4
-rw-r--r--main/rng-tools/APKBUILD4
-rw-r--r--main/rrdcollect/APKBUILD5
-rw-r--r--main/rsync/APKBUILD8
-rw-r--r--main/rtapd/APKBUILD2
-rw-r--r--main/rtnppd/APKBUILD10
-rw-r--r--main/ruby-bundler/APKBUILD6
-rw-r--r--main/ruby-bundler/manpages.patch19
-rw-r--r--main/ruby-minitest/APKBUILD6
-rw-r--r--main/ruby-typeprof/APKBUILD6
-rw-r--r--main/ruby-typeprof/gemspec.patch5
-rw-r--r--main/ruby/APKBUILD4
-rw-r--r--main/s390-tools/0009-link-libexecinfo.patch12
-rw-r--r--main/s390-tools/APKBUILD11
-rw-r--r--main/s390-tools/no-execinfo.patch56
-rw-r--r--main/samba/APKBUILD154
-rw-r--r--main/samba/netapp.patch85
-rw-r--r--main/samba/netdb-defines.patch6
-rw-r--r--main/samba/netgroup.patch15
-rw-r--r--main/sbsigntool/APKBUILD12
-rw-r--r--main/sbsigntool/sbsigntools-openssl3.patch12
-rw-r--r--main/sc/APKBUILD4
-rw-r--r--main/scons/APKBUILD11
-rw-r--r--main/scons/broken-tests.patch9
-rw-r--r--main/scstadmin/APKBUILD20
-rw-r--r--main/secureboot-hook/APKBUILD4
-rw-r--r--main/secureboot-hook/secureboot.conf2
-rw-r--r--main/sed/APKBUILD16
-rw-r--r--main/sed/fix-test-canonicalize-lgpl.patch23
-rw-r--r--main/sendpage/APKBUILD29
-rw-r--r--main/ser2net/APKBUILD8
-rw-r--r--main/serf/APKBUILD14
-rw-r--r--main/serf/bio-ctrl.patch27
-rw-r--r--main/serf/openssl3.patch14
-rw-r--r--main/setup-box/APKBUILD38
-rw-r--r--main/sfic/APKBUILD19
-rw-r--r--main/shared-mime-info/APKBUILD4
-rw-r--r--main/shared-mime-info/shared-mime-info.trigger1
-rw-r--r--main/sipp/APKBUILD4
-rw-r--r--main/sipsak/APKBUILD4
-rw-r--r--main/slang/APKBUILD12
-rw-r--r--main/slang/disable-rpath.patch14
-rw-r--r--main/slang/fix-slarray-32bit.patch19
-rw-r--r--main/smokeping/APKBUILD4
-rw-r--r--main/socat/APKBUILD4
-rw-r--r--main/sofia-sip/APKBUILD4
-rw-r--r--main/source-highlight/APKBUILD2
-rw-r--r--main/spandsp/APKBUILD5
-rw-r--r--main/speedtest-cli/APKBUILD2
-rw-r--r--main/spice-protocol/APKBUILD6
-rw-r--r--main/spice/APKBUILD8
-rw-r--r--main/spice/python-module-check.patch37
-rw-r--r--main/spirv-headers/APKBUILD9
-rw-r--r--main/spirv-tools/APKBUILD13
-rw-r--r--main/sqlite-tcl/APKBUILD4
-rw-r--r--main/sqlite/APKBUILD6
-rw-r--r--main/squid/APKBUILD18
-rw-r--r--main/squid/squid-5.2-openssl3.patch185
-rw-r--r--main/ssh-getkey-ldap/APKBUILD9
-rw-r--r--main/sshguard/APKBUILD10
-rw-r--r--main/sshguard/sshguard.initd2
-rw-r--r--main/ssmtp/APKBUILD4
-rw-r--r--main/statserial/APKBUILD22
-rw-r--r--main/stfl/APKBUILD4
-rw-r--r--main/strace/APKBUILD4
-rw-r--r--main/strongswan/APKBUILD27
-rw-r--r--main/strongswan/disable_test_time_printf_hook.patch51
-rw-r--r--main/su-exec/APKBUILD4
-rw-r--r--main/subversion/APKBUILD2
-rw-r--r--main/swig/APKBUILD2
-rw-r--r--main/syslog-ng/APKBUILD24
-rw-r--r--main/tar/APKBUILD4
-rw-r--r--main/tarsnap/APKBUILD4
-rw-r--r--main/tcl-tls/APKBUILD4
-rw-r--r--main/tcl/APKBUILD7
-rw-r--r--main/tcl/restore-fp-control-word.patch106
-rw-r--r--main/tcpdump/APKBUILD4
-rw-r--r--main/tcpflow/APKBUILD4
-rw-r--r--main/tevent/APKBUILD10
-rw-r--r--main/tevent/fix-public-header.patch13
-rw-r--r--main/tevent/python-3.10.patch34
-rw-r--r--main/thin-provisioning-tools/APKBUILD2
-rw-r--r--main/tig/APKBUILD14
-rw-r--r--main/tinc/APKBUILD4
-rw-r--r--main/tiny-cloud/APKBUILD31
-rw-r--r--main/tiny-cloud/tiny-cloud-aws.post-install5
-rw-r--r--main/tiny-cloud/tiny-cloud-azure.post-install5
-rw-r--r--main/tiny-cloud/tiny-cloud-gcp.post-install5
-rw-r--r--main/tiny-cloud/tiny-cloud-nocloud.post-install5
-rw-r--r--main/tiny-cloud/tiny-cloud-oci.post-install5
-rw-r--r--main/tinyproxy/APKBUILD4
-rw-r--r--main/tinyproxy/tinyproxy.initd2
-rw-r--r--main/tinyxml2/APKBUILD2
-rw-r--r--main/tree/0001-remove-03-cflag.patch25
-rw-r--r--main/tree/APKBUILD16
-rw-r--r--main/ttf-dejavu/APKBUILD6
-rw-r--r--main/tzdata/APKBUILD12
-rw-r--r--main/u-boot/APKBUILD12
-rw-r--r--main/udev-init-scripts/APKBUILD9
-rw-r--r--main/udev-init-scripts/udev-init-scripts.post-install10
l---------main/udev-init-scripts/udev-init-scripts.post-upgrade1
-rw-r--r--main/udns/APKBUILD22
-rw-r--r--main/ulogd/APKBUILD4
-rw-r--r--main/umix/APKBUILD17
-rw-r--r--main/umurmur/APKBUILD4
-rw-r--r--main/unbound/APKBUILD14
-rw-r--r--main/unifont/APKBUILD10
-rw-r--r--main/unionfs-fuse/APKBUILD19
-rw-r--r--main/unionfs-fuse/test-exepath.patch33
-rw-r--r--main/unzip/APKBUILD4
-rw-r--r--main/unzip/large-symlinks.patch38
-rw-r--r--main/usbutils/APKBUILD4
-rw-r--r--main/userspace-rcu/APKBUILD4
-rw-r--r--main/util-linux/APKBUILD115
-rw-r--r--main/uwsgi/APKBUILD3
-rw-r--r--main/v86d/APKBUILD16
-rw-r--r--main/vala/APKBUILD4
-rw-r--r--main/vanessa_socket/APKBUILD8
-rw-r--r--main/varnish/APKBUILD10
-rw-r--r--main/vde2/APKBUILD6
-rw-r--r--main/vim/APKBUILD38
-rw-r--r--main/vulkan-headers/APKBUILD34
-rw-r--r--main/vulkan-loader/APKBUILD45
-rw-r--r--main/vulkan-tools/APKBUILD50
-rw-r--r--main/wayland-protocols/APKBUILD6
-rw-r--r--main/wayland/APKBUILD6
-rw-r--r--main/wget/APKBUILD4
-rw-r--r--main/wipe/APKBUILD19
-rw-r--r--main/wireless-regdb/APKBUILD4
-rw-r--r--main/wpa_supplicant/APKBUILD15
-rw-r--r--main/wpa_supplicant/config12
-rw-r--r--main/wpa_supplicant/unsafe-renegotiation-1.patch103
-rw-r--r--main/wpa_supplicant/unsafe-renegotiation-2.patch105
-rw-r--r--main/xcb-proto/APKBUILD4
-rw-r--r--main/xen/APKBUILD46
-rw-r--r--main/xen/xsa401-4.16-1.patch170
-rw-r--r--main/xen/xsa401-4.16-2.patch191
-rw-r--r--main/xen/xsa402-4.16-1.patch43
-rw-r--r--main/xen/xsa402-4.16-2.patch213
-rw-r--r--main/xen/xsa402-4.16-3.patch284
-rw-r--r--main/xen/xsa402-4.16-4.patch83
-rw-r--r--main/xen/xsa402-4.16-5.patch148
-rw-r--r--main/xen/xsa404-4.16-1.patch239
-rw-r--r--main/xen/xsa404-4.16-2.patch85
-rw-r--r--main/xen/xsa404-4.16-3.patch177
-rw-r--r--main/xfsprogs/APKBUILD4
-rw-r--r--main/xkeyboard-config/APKBUILD13
-rw-r--r--main/xkeyboard-config/fix-syntax-error.patch58
-rw-r--r--main/xmlrpc-c/APKBUILD33
-rw-r--r--main/xmlto/APKBUILD5
-rw-r--r--main/xorgproto/APKBUILD6
-rw-r--r--main/xtables-addons-lts/APKBUILD2
-rw-r--r--main/xtables-addons/APKBUILD4
-rw-r--r--main/xtrans/APKBUILD5
-rw-r--r--main/xz/APKBUILD14
-rw-r--r--main/xz/xzgrep-ZDI-CAN-16587.patch94
-rw-r--r--main/yajl/APKBUILD5
-rw-r--r--main/yasm/APKBUILD2
-rw-r--r--main/zd1211-firmware/APKBUILD24
-rw-r--r--main/zeromq/APKBUILD21
-rw-r--r--main/zfs-lts/APKBUILD8
-rw-r--r--main/zfs-rpi/APKBUILD2
-rw-r--r--main/zfs/APKBUILD10
-rw-r--r--main/zlib/APKBUILD8
-rw-r--r--main/zstd/APKBUILD55
-rw-r--r--main/zstd/zstdConfig.cmake1
-rw-r--r--main/zstd/zstdConfigVersion.cmake70
-rw-r--r--main/zstd/zstdTargets-release.cmake29
-rw-r--r--main/zstd/zstdTargets.cmake118
1076 files changed, 16311 insertions, 55729 deletions
diff --git a/main/aaudit/APKBUILD b/main/aaudit/APKBUILD
index a7b44e9e95..c8e187921f 100644
--- a/main/aaudit/APKBUILD
+++ b/main/aaudit/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=aaudit
pkgver=0.7.2
-pkgrel=2
+pkgrel=3
pkgdesc="Alpine Auditor"
url="https://alpinelinux.org"
arch="noarch"
diff --git a/main/abi-compliance-checker/APKBUILD b/main/abi-compliance-checker/APKBUILD
index cdb13ccc66..f46a7dd9a0 100644
--- a/main/abi-compliance-checker/APKBUILD
+++ b/main/abi-compliance-checker/APKBUILD
@@ -2,27 +2,17 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=abi-compliance-checker
pkgver=2.3
-pkgrel=0
+pkgrel=1
pkgdesc="A tool for checking backward compatibility of a C/C++ library"
url="https://github.com/lvc/abi-compliance-checker"
arch="noarch"
license="LGPL-2.0-or-later"
depends="perl build-base"
-depends_dev=""
-makedepends="$depends_dev perl-dev"
+makedepends="perl-dev"
options="!check"
-install=""
-subpackages=""
source="$pkgname-$pkgver.tar.gz::https://github.com/lvc/abi-compliance-checker/archive/$pkgver.tar.gz"
-builddir="${srcdir}"/$pkgname-$pkgver
-
-build() {
- return 0
-}
-
package() {
- cd "$builddir"
mkdir -p "$pkgdir"/usr
perl Makefile.pl -install --prefix=/usr --destdir="$pkgdir"
}
diff --git a/main/abuild/0001-abuild-fix-amove-corner-cases.patch b/main/abuild/0001-abuild-fix-amove-corner-cases.patch
new file mode 100644
index 0000000000..a7694ef371
--- /dev/null
+++ b/main/abuild/0001-abuild-fix-amove-corner-cases.patch
@@ -0,0 +1,132 @@
+From 5c542377a8f06d9c201d4ade3260dec0b6183630 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 23 Sep 2022 12:31:56 +0200
+Subject: [PATCH] abuild: fix amove corner cases
+
+fix `amove dir` (without leading or trailing /)
+
+add various testcases for amove
+---
+ abuild.in | 8 +++--
+ tests/abuild_test | 79 ++++++++++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 84 insertions(+), 3 deletions(-)
+
+diff --git a/abuild.in b/abuild.in
+index d013ab1..ac17067 100755
+--- a/abuild.in
++++ b/abuild.in
+@@ -79,11 +79,15 @@ amove() {
+ local pattern f
+ for pattern; do
+ for f in ${pattern#/}; do # let shell expand the pattern
+- # only create dir if needed
++ # strip trailing /
++ f=${f%/}
+ if [ "${f%/*}" != "$f" ]; then
+ mkdir -p "$subpkgdir/${f%/*}"
++ mv -v "$pkgdir"/$f "$subpkgdir/${f%/*}"
++ else
++ mkdir -p "$subpkgdir"
++ mv -v "$pkgdir"/$f "$subpkgdir/"
+ fi
+- mv -v "$pkgdir"/$f "$subpkgdir/${f%/*}"
+ # cleanup
+ rmdir -p "$f" 2>/dev/null || rmdir -p "${f%/*}" 2>/dev/null || true
+ done
+diff --git a/tests/abuild_test b/tests/abuild_test
+index f127abf..7fefae4 100755
+--- a/tests/abuild_test
++++ b/tests/abuild_test
+@@ -24,7 +24,8 @@ init_tests \
+ abuild_multiline_license \
+ abuild_git_ceiling \
+ abuild_package_size_zero \
+- abuild_package_size_nonzero
++ abuild_package_size_nonzero \
++ abuild_amove
+
+ export ABUILD_SHAREDIR=$(atf_get_srcdir)/..
+ export ABUILD_CONF=/dev/null
+@@ -517,3 +518,79 @@ abuild_package_size_nonzero_body() {
+ atf_check -o not-match:'^size = 1$' \
+ cat pkg/.control.test-size/.PKGINFO
+ }
++
++abuild_amove_body() {
++ init_keys
++ mkdir -p test-amove
++
++ cd test-amove
++ cat > APKBUILD <<-EOF
++ # Maintainer: Test User 123 <123@example.com>
++
++ # test package
++ pkgname="test-amove"
++ pkgver="1.0"
++ pkgrel=0
++ pkgdesc='Dummy test package - amove'
++ url='https://gitlab.alpinelinux.org/alpine/aports'
++ arch='noarch'
++ license='MIT'
++ subpackages="\$pkgname-file:_file
++ \$pkgname-etc:_etc
++ \$pkgname-bin:_bin
++ \$pkgname-sbin:_sbin
++ \$pkgname-var:_var
++ \$pkgname-usr:_usr"
++
++ package() {
++ mkdir -p "\$pkgdir"/etc \
++ "\$pkgdir"/bin \
++ "\$pkgdir"/sbin \
++ "\$pkgdir"/var/lib/\$pkgname \
++ "\$pkgdir"/usr/share
++ touch "\$pkgdir"/etc/file \
++ "\$pkgdir"/etc/\$pkgname.conf \
++ "\$pkgdir"/bin/hello \
++ "\$pkgdir"/sbin/shello \
++ "\$pkgdir"/var/lib/\$pkgname/testfile \
++ "\$pkgdir"/usr/share/a \
++ "\$pkgdir"/usr/share/b
++ }
++ _file() {
++ amove etc/file
++ }
++ _etc() {
++ # leading and trailing /
++ amove /etc/
++ }
++ _bin() {
++ # trailing /
++ amove bin/
++ }
++ _sbin() {
++ # no /
++ amove sbin/shello
++ }
++ _var() {
++ # leading /
++ amove /var/lib
++ }
++ _usr() {
++ # glob *
++ amove usr/share/*
++ }
++
++ EOF
++ abuild rootpkg || atf_fail "abuild rootpkg failed"
++ for i in \
++ test-amove-file/etc/file \
++ test-amove-etc/etc/test-amove.conf \
++ test-amove-bin/bin/hello \
++ test-amove-sbin/sbin/shello \
++ test-amove-var/var/lib/test-amove/testfile \
++ test-amove-usr/usr/share/a \
++ test-amove-usr/usr/share/b \
++ ; do \
++ test -f pkg/$i || atf_fail "$i failed"
++ done
++}
+--
+2.37.3
+
diff --git a/main/abuild/0001-make-increase-test-timeout.patch b/main/abuild/0001-make-increase-test-timeout.patch
new file mode 100644
index 0000000000..eb0c2ffd71
--- /dev/null
+++ b/main/abuild/0001-make-increase-test-timeout.patch
@@ -0,0 +1,25 @@
+From 58a9262c480b524ad5489bcf393047c006bef225 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Mon, 12 Sep 2022 17:50:35 +0200
+Subject: [PATCH] make: increase test timeout
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 4f36624..2d1ebe7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -106,7 +106,7 @@ tests/Kyuafile: $(wildcard tests/*_test)
+ echo "syntax(2)" > $@
+ echo "test_suite('abuild')" >> $@
+ for i in $(notdir $(wildcard tests/*_test)); do \
+- echo "atf_test_program{name='$$i',timeout=5}" >> $@ ; \
++ echo "atf_test_program{name='$$i',timeout=45}" >> $@ ; \
+ done
+
+ Kyuafile: tests/Kyuafile
+--
+2.37.3
+
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 7f029cc096..a780d05754 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,21 +1,21 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=abuild
-pkgver=3.9.0
+pkgver=3.10.0_rc1
_ver=${pkgver%_git*}
pkgrel=2
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch="all"
license="GPL-2.0-only"
-depends="fakeroot scanelf openssl apk-tools>=2.0.7-r1 libc-utils
+depends="fakeroot scanelf openssl>3 apk-tools>=2.0.7-r1 libc-utils
attr tar pkgconf patch lzip"
if [ "$CBUILD" = "$CHOST" ]; then
depends="$depends curl"
fi
makedepends_build="pkgconfig scdoc"
-makedepends_host="openssl1.1-compat-dev zlib-dev"
+makedepends_host="openssl-dev>3 zlib-dev"
makedepends="$makedepends_host $makedepends_build"
-checkdepends="bats"
+checkdepends="kyua git"
install="$pkgname.pre-install $pkgname.pre-upgrade"
subpackages="
apkbuild-cpan:cpan:noarch
@@ -27,9 +27,8 @@ subpackages="
options="suid"
pkggroups="abuild"
source="https://gitlab.alpinelinux.org/alpine/abuild/-/archive/$pkgver/abuild-$pkgver.tar.gz
- mr60-newapkbuild-use-abuild-meson.patch
- mr128-newapkbuild-fetch-rust-deps-in-prepare.patch
- mr131-newapkbuild-change-cmake-build-type.patch
+ 0001-make-increase-test-timeout.patch
+ 0001-abuild-fix-amove-corner-cases.patch
"
builddir="$srcdir"/abuild-$pkgver
@@ -87,8 +86,7 @@ _rootbld() {
}
sha512sums="
-a3075b18d4a085ca796d1c2df703c3e7c80e682623175eb0822479f3a6d96ffba571f283bdec8ae3db832e296f9e58bdd0f58097b86b503a91fbb40148084a68 abuild-3.9.0.tar.gz
-a52fa7978d61f1636dbe3d120fee4e3fab6fae018a91f662c082f4eab37e6fd63d74c55124fd50fa3a676a8af71ba858cebf93f3ca21f95b03d3478fa1e55e6b mr60-newapkbuild-use-abuild-meson.patch
-f8d5c131cefb1c10d34962994ee3158fd8155acf68616fe471a7d07ce15e04d184bdfa3c181ec19bd1ca95e0f5acf1664f14a52b29451b2760aa580222e75f73 mr128-newapkbuild-fetch-rust-deps-in-prepare.patch
-56b71c3feff5a17d9550e1947fe316b7c7aa397f9e365532410e492ea992b8bfcfbb97041ddc2128c7bb9772e9e03584a9f5d5f5bcced00a1082e7374f02801a mr131-newapkbuild-change-cmake-build-type.patch
+8dccc843cc6b3f53642bb2849d00cc00a283763f2b915c01600b0542ce16a96b2e265498b59ceff250a1c7be22c4a5aeb0cb0926c7498668ded897c64b83b9c0 abuild-3.10.0_rc1.tar.gz
+605e17e99ba24388e278de3a378bf717f6061930a73197bbf5d3462b281fccc242262a7582d0c7106fcf92daa2166e4bc341d3a784868906527e493adfb9bf5f 0001-make-increase-test-timeout.patch
+c979b3f926a4bd5aabe3996473151156f4573040c37a99aa4bf9042743952c46c08286581753c372196ce9da651971879a9e31eed124e65393dab71c96494df9 0001-abuild-fix-amove-corner-cases.patch
"
diff --git a/main/abuild/mr128-newapkbuild-fetch-rust-deps-in-prepare.patch b/main/abuild/mr128-newapkbuild-fetch-rust-deps-in-prepare.patch
deleted file mode 100644
index 298f717e3b..0000000000
--- a/main/abuild/mr128-newapkbuild-fetch-rust-deps-in-prepare.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-Patch-Source: https://gitlab.alpinelinux.org/alpine/abuild/-/merge_requests/128
---
-From 29611f3a6929b4edecd89506e666f963fa25ae52 Mon Sep 17 00:00:00 2001
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Thu, 16 Dec 2021 00:19:07 +0100
-Subject: [PATCH 1/2] newapkbuild: fetch rust dependencies in prepare phase
-
-Fetch all dependencies in the prepare phase and do not access network
-in the following phases.
----
- newapkbuild.in | 27 ++++++++++++++++++++++++---
- 1 file changed, 24 insertions(+), 3 deletions(-)
-
-diff --git a/newapkbuild.in b/newapkbuild.in
-index c58d519..0182ad2 100644
---- a/newapkbuild.in
-+++ b/newapkbuild.in
-@@ -30,6 +30,12 @@ is_github_url() {
- return 1
- }
-
-+prepare_rust() {
-+ cat >>APKBUILD<<__EOF__
-+ cargo fetch --locked
-+__EOF__
-+}
-+
- # Build sections
- build_make() {
- cat >>APKBUILD<<__EOF__
-@@ -104,7 +110,7 @@ __EOF__
-
- build_rust() {
- cat >>APKBUILD<<__EOF__
-- cargo build --release --locked
-+ cargo build --frozen --release
- __EOF__
- }
-
-@@ -150,7 +156,7 @@ __EOF__
-
- check_rust() {
- cat >>APKBUILD<<__EOF__
-- cargo test --release --locked
-+ cargo test --frozen --release
- __EOF__
- }
-
-@@ -199,7 +205,7 @@ __EOF__
-
- package_rust() {
- cat >>APKBUILD<<__EOF__
-- cargo install --locked --path . --root="\$pkgdir/usr"
-+ cargo install --frozen --offline --path . --root="\$pkgdir/usr"
- rm "\$pkgdir"/usr/.crates*
- __EOF__
- }
-@@ -333,6 +339,21 @@ __EOF__
- fi
- fi
-
-+ case "$buildtype" in
-+ rust)
-+ cat >>APKBUILD<<__EOF__
-+prepare() {
-+ default_prepare
-+
-+__EOF__
-+ prepare_rust
-+ cat >>APKBUILD<<__EOF__
-+}
-+
-+__EOF__
-+ ;;
-+ esac
-+
- # Create build() function
- cat >>APKBUILD<<__EOF__
- build() {
---
-GitLab
-
-
-From 0a9374e4ffa8202ba011497ea39fb5443d7ef9a5 Mon Sep 17 00:00:00 2001
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Thu, 16 Dec 2021 00:23:48 +0100
-Subject: [PATCH 2/2] newapkbuild: do not run cargo test with --release
-
-It takes a longer time to compile and, most importantly, it may cause
-unnecessary rebuild of everything in the package phase (installation).
----
- newapkbuild.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/newapkbuild.in b/newapkbuild.in
-index 0182ad2..9e8643d 100644
---- a/newapkbuild.in
-+++ b/newapkbuild.in
-@@ -156,7 +156,7 @@ __EOF__
-
- check_rust() {
- cat >>APKBUILD<<__EOF__
-- cargo test --frozen --release
-+ cargo test --frozen
- __EOF__
- }
-
---
-GitLab
-
diff --git a/main/abuild/mr131-newapkbuild-change-cmake-build-type.patch b/main/abuild/mr131-newapkbuild-change-cmake-build-type.patch
deleted file mode 100644
index 5b98b499a4..0000000000
--- a/main/abuild/mr131-newapkbuild-change-cmake-build-type.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Patch-Source: https://gitlab.alpinelinux.org/alpine/abuild/-/merge_requests/131
---
-From 6c43d67a053be0476384fcf8252c07fa2a235a87 Mon Sep 17 00:00:00 2001
-From: psykose <alice@ayaya.dev>
-Date: Thu, 30 Dec 2021 21:48:50 +0000
-Subject: [PATCH] newapkbuild: refine default cmake format
-
-MinSizeRel is a better recommended default- of course it can still be
-overriden.
-the dot is redundant- we already specify -B and so the dot is implicitly
-cwd.
----
- newapkbuild.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/newapkbuild.in b/newapkbuild.in
-index c58d519..63b387d 100644
---- a/newapkbuild.in
-+++ b/newapkbuild.in
-@@ -65,8 +65,8 @@ build_cmake() {
- -DCMAKE_INSTALL_PREFIX=/usr \\
- -DCMAKE_INSTALL_LIBDIR=lib \\
- -DBUILD_SHARED_LIBS=True \\
-- -DCMAKE_BUILD_TYPE=None \\
-- \$CMAKE_CROSSOPTS .
-+ -DCMAKE_BUILD_TYPE=MinSizeRel \\
-+ \$CMAKE_CROSSOPTS
- cmake --build build
- __EOF__
- }
---
-GitLab
-
diff --git a/main/abuild/mr60-newapkbuild-use-abuild-meson.patch b/main/abuild/mr60-newapkbuild-use-abuild-meson.patch
deleted file mode 100644
index 44aefd46bf..0000000000
--- a/main/abuild/mr60-newapkbuild-use-abuild-meson.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Patch-Source: https://gitlab.alpinelinux.org/alpine/abuild/-/merge_requests/60
---
-From 55b66b3ad702ba673384126d98026043cdf949ef Mon Sep 17 00:00:00 2001
-From: Leo <thinkabit.ukim@gmail.com>
-Date: Tue, 7 Jul 2020 13:37:31 -0300
-Subject: [PATCH] newapkbuild: use meson-abuild helper instead of meson
-
-abuild-meson is a shellscript that wraps around meson and passes options
-meant for packaging software that uses meson, for Alpine Linux.
----
- newapkbuild.in | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/newapkbuild.in b/newapkbuild.in
-index c58d519..d7a2eb5 100644
---- a/newapkbuild.in
-+++ b/newapkbuild.in
-@@ -78,12 +78,7 @@ build_meson() {
- # TODO For cross compilation a cross_file needs to be created.
-
- cat >>APKBUILD<<__EOF__
-- meson \\
-- --prefix=/usr \\
-- --sysconfdir=/etc \\
-- --mandir=/usr/share/man \\
-- --localstatedir=/var \\
-- --buildtype=plain \\
-+ abuild-meson \\
- . output
- meson compile \${JOBS:+-j \${JOBS}} -C output
- __EOF__
---
-GitLab
-
diff --git a/main/acf-kamailio/APKBUILD b/main/acf-kamailio/APKBUILD
index 548151f844..a4a094ec77 100644
--- a/main/acf-kamailio/APKBUILD
+++ b/main/acf-kamailio/APKBUILD
@@ -9,7 +9,6 @@ arch="noarch"
license="GPL-2.0-only"
options="!check" # no test suite
depends="acf-core kamailio acf-db-lib"
-makedepends="acf-db-lib"
source="https://gitlab.alpinelinux.org/acf/acf-kamailio/-/archive/v$pkgver/acf-kamailio-v$pkgver.tar.gz"
builddir="$srcdir/$pkgname-v$pkgver"
diff --git a/main/acf-mariadb/APKBUILD b/main/acf-mariadb/APKBUILD
index 99e5ef1382..4d0777a36d 100644
--- a/main/acf-mariadb/APKBUILD
+++ b/main/acf-mariadb/APKBUILD
@@ -9,7 +9,6 @@ arch="noarch"
license="GPL-2.0-only"
options="!check" # no test suite
depends="acf-core mariadb mariadb-client lua-sql-mysql acf-db-lib"
-makedepends="acf-db-lib"
replaces="acf-mysql"
source="https://gitlab.alpinelinux.org/acf/acf-mariadb/-/archive/v$pkgver/acf-mariadb-v$pkgver.tar.gz"
builddir="$srcdir/$pkgname-v$pkgver"
diff --git a/main/acf-postgresql/APKBUILD b/main/acf-postgresql/APKBUILD
index e90e5aad21..0db960e41f 100644
--- a/main/acf-postgresql/APKBUILD
+++ b/main/acf-postgresql/APKBUILD
@@ -9,7 +9,6 @@ arch="noarch"
license="GPL-2.0-only"
options="!check" # no test suite
depends="acf-core postgresql acf-db-lib lua-sql-postgres"
-makedepends="acf-db-lib"
source="https://gitlab.alpinelinux.org/acf/acf-postgresql/-/archive/v$pkgver/acf-postgresql-v$pkgver.tar.gz"
builddir="$srcdir/$pkgname-v$pkgver"
diff --git a/main/ack/APKBUILD b/main/ack/APKBUILD
index 567f52036c..0bd3b1b7ab 100644
--- a/main/ack/APKBUILD
+++ b/main/ack/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ack
-pkgver=3.5.0
-pkgrel=1
+pkgver=3.6.0
+pkgrel=0
pkgdesc="A Perl-powered replacement for grep"
url="https://beyondgrep.com/"
arch="noarch"
@@ -28,4 +28,6 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="f5b9321fc62cf2ab86fa7dc933dd44245314ebd26bee2d8769f85c15fc8b4493d0757ca4430708f0ebea5692f9c73ad17cc00bc46d1f611b8489b30811df307d ack-v3.5.0.tar.gz"
+sha512sums="
+1cef0d873be47c8e27d5c3b3b47ea965cf39755d1556c3f653c28d75e1cea9b1ff183297c897d919e220cfcb556e3d5b88eb0b5343d933a05fa2c1fff1234173 ack-v3.6.0.tar.gz
+"
diff --git a/main/acl/APKBUILD b/main/acl/APKBUILD
index 367c811b86..6dbbc28557 100644
--- a/main/acl/APKBUILD
+++ b/main/acl/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=acl
pkgver=2.3.1
-pkgrel=0
+pkgrel=1
pkgdesc="Access control list utilities"
url="https://savannah.nongnu.org/projects/acl"
arch="all"
@@ -29,6 +29,10 @@ build() {
package() {
cd "$builddir"
DESTDIR="$pkgdir" make install
+
+ # fix install path of pkgconf files
+ mkdir -p "$pkgdir"/usr/lib/
+ mv "$pkgdir"/lib/pkgconfig "$pkgdir"/usr/lib/
}
libacl() {
diff --git a/main/acpica/APKBUILD b/main/acpica/APKBUILD
index 4129ae6ed5..31cf390c78 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=20210930
+pkgver=20220331
pkgrel=0
pkgdesc="ACPI Component Architecture utilities"
url="https://www.acpica.org"
@@ -30,6 +30,6 @@ iasl() {
}
sha512sums="
-b02470bdda891eb7ca556ec4eee3387f80535b43b213f61e68e3913f4f8173dbf4c2dadaf28ad181ecc76171d40175d5ea5734dbc1237b3c3d2fba3072314c9e acpica-unix-20210930.tar.gz
+3120ba2a8b63adbf58323e4493222510119248e6b68e6f0f7c9b0eb2f798ba307544fcb148a079cd2647a933f5a39df0da1a3086db9ab22a3134bc788c849a9f acpica-unix-20220331.tar.gz
1f5049568d612d4debf3690e0d918d8d56abbed14ade7b2e6282eba17b25934b695d1a9fe10f99469efe8d4382c4546481d0579afdf5cdb9695fcdc93559fbab disable-werror.patch
"
diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD
index 08c293d04b..4cbb4053c1 100644
--- a/main/alpine-base/APKBUILD
+++ b/main/alpine-base/APKBUILD
@@ -1,28 +1,46 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-base
-pkgver=3.16.0
-pkgrel=0
+pkgver=3.17_alpha20220809
+pkgrel=4
pkgdesc="Meta package for minimal alpine base"
url="https://alpinelinux.org"
arch="noarch"
license="MIT"
-depends="alpine-baselayout alpine-conf apk-tools busybox busybox-suid busybox-initscripts
- openrc libc-utils alpine-keys"
+depends="
+ alpine-baselayout
+ alpine-conf
+ alpine-release
+ apk-tools
+ busybox
+ busybox-openrc
+ busybox-suid
+ dev-openrc
+ libc-utils
+ openrc
+ "
makedepends=""
install=""
-subpackages=""
+subpackages="alpine-release:release"
replaces="alpine-baselayout"
source=""
+options="!check"
build() {
return 0
}
package() {
- mkdir -p "$pkgdir"/etc
+ mkdir -p "$pkgdir"
+}
+
+release() {
+ depends="alpine-keys"
+ pkgdesc="Alpine release data"
+
+ mkdir -p "$subpkgdir"/etc
# create /etc/alpine-release
- echo $pkgver > "$pkgdir"/etc/alpine-release
+ echo $pkgver > "$subpkgdir"/etc/alpine-release
local _ver="$(echo "$pkgver" | grep -E -o '^[0-9]+\.[0-9]+')"
local _rel="v$_ver"
case "$pkgver" in
@@ -33,14 +51,14 @@ package() {
esac
# create /etc/issue
- cat >"$pkgdir"/etc/issue<<EOF
+ cat >"$subpkgdir"/etc/issue<<EOF
Welcome to Alpine Linux $_ver
Kernel \\r on an \\m (\\l)
EOF
# create os-release
- cat >"$pkgdir"/etc/os-release<<EOF
+ cat >"$subpkgdir"/etc/os-release<<EOF
NAME="Alpine Linux"
ID=alpine
VERSION_ID=$pkgver
@@ -50,8 +68,8 @@ BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues"
EOF
# create secfixes.d repository list
- mkdir -p "$pkgdir"/etc/secfixes.d
- cat >"$pkgdir"/etc/secfixes.d/alpine<<EOF
+ mkdir -p "$subpkgdir"/etc/secfixes.d
+ cat >"$subpkgdir"/etc/secfixes.d/alpine<<EOF
https://secdb.alpinelinux.org/$_rel/main.json
https://secdb.alpinelinux.org/$_rel/community.json
EOF
diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index a31f17c380..b3974d2b0c 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -1,11 +1,11 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-baselayout
-pkgver=3.2.0
-pkgrel=23
+pkgver=3.3.0
+pkgrel=2
pkgdesc="Alpine base dir structure and init scripts"
url="https://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
-arch="all"
+arch="noarch"
license="GPL-2.0-only"
pkggroups="shadow"
options="!fhs !check"
@@ -14,8 +14,7 @@ subpackages="$pkgname-data"
install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade
$pkgname.post-install"
_nbver=6.2
-source="mkmntdirs.c
- crontab
+source="crontab
color_prompt.sh.disabled
locale.sh
@@ -41,9 +40,6 @@ prepare() {
}
build() {
- ${CC:-${CROSS_COMPILE}gcc} $CPPFLAGS $CFLAGS $LDFLAGS \
- "$srcdir"/mkmntdirs.c -o "$builddir"/mkmntdirs
-
# generate shadow
awk -F: '{
pw = ":!:"
@@ -61,6 +57,7 @@ data() {
amove etc/hostname
amove etc/hosts
amove etc/inittab
+ amove etc/nsswitch.conf
amove etc/modules
amove etc/mtab
amove etc/passwd
@@ -138,7 +135,6 @@ package() {
install -d -m 0555 var/empty
install -d -m 0700 "$pkgdir"/root
install -d -m 1777 "$pkgdir"/tmp "$pkgdir"/var/tmp
- install -m755 "$builddir"/mkmntdirs "$pkgdir"/sbin/mkmntdirs
install -m600 "$srcdir"/crontab "$pkgdir"/etc/crontabs/root
install -m644 \
@@ -235,6 +231,13 @@ package() {
Bourne-compatible shells (like ash, bash or zsh) when started as a
login shell.
EOF
+ cat > "$pkgdir"/etc/nsswitch.conf <<-EOF
+ # musl itself does not support NSS, however some third-party DNS
+ # implementations use the nsswitch.conf file to determine what
+ # policy to follow.
+ # Editing this file is not recommended.
+ hosts: files dns
+ EOF
install -m644 \
"$srcdir"/group \
@@ -255,7 +258,6 @@ package() {
}
sha512sums="
-199a34716b1f029407b08679fed4fda58384a1ccefbbec9abe1c64f4a3f7ad2a89bc7c02fc19a7f791f7c6bb87f9f0c708cb3f18c027cb7f54f25976eba4b839 mkmntdirs.c
6e169c0975a1ad1ad871a863e8ee83f053de9ad0b58d94952efa4c28a8c221445d9e9732ad8b52832a50919c2f39aa965a929b3d5b3f9e62f169e2b2e0813d82 crontab
558071efdce2fe92afe4277006235b1a6368b070337c7567e5632a1a3fe531f87ca692eb36f3dda498d4d29d1f834fc8f7139f2985669ae3400b6d103d6f4c5e color_prompt.sh.disabled
b2fc9b72846a43a45ba9a8749e581cef34d1915836833b51b7919dfbf4e275b7d55fec4dea7b23df3796380910971a41331e53e8cf0d304834e3da02cc135e5a locale.sh
diff --git a/main/alpine-baselayout/mkmntdirs.c b/main/alpine-baselayout/mkmntdirs.c
deleted file mode 100644
index eaeae7321e..0000000000
--- a/main/alpine-baselayout/mkmntdirs.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Create mount directories in fstab
- *
- * Copyright(c) 2008 Natanael Copa <natanael.copa@gmail.com>
- * May be distributed under the terms of GPL-2
- *
- * usage: mkmntdirs [fstab]
- *
- */
-
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <err.h>
-#include <mntent.h>
-#include <stdio.h>
-#include <string.h>
-
-
-#ifdef DEBUG
-#define mkdir_recursive(p) puts((p))
-#else
-static void mkdir_recursive(char *path)
-{
- char *s = path;
- while (1) {
- int c = '\0';
- while (*s) {
- if (*s == '/') {
- do {
- ++s;
- } while (*s == '/');
- c = *s; /* Save the current char */
- *s = '\0'; /* and replace it with nul. */
- break;
- }
- ++s;
- }
- mkdir(path, 0755);
- if (c == '\0')
- return;
- *s = c;
- }
-}
-#endif
-
-int main(int argc, const char *argv[])
-{
- const char *filename = "/etc/fstab";
- FILE *f;
- struct mntent *ent;
- if (argc == 2)
- filename = argv[1];
-
- f = setmntent(filename, "r");
- if (f == NULL)
- err(1, "%s", filename);
-
- while ((ent = getmntent(f)) != NULL) {
- if (strcmp(ent->mnt_dir, "none") != 0)
- mkdir_recursive(ent->mnt_dir);
- }
-
- endmntent(f);
- return 0;
-}
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 9c22ea0a01..c02db806b6 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
-pkgver=3.14.2
+pkgver=3.14.6
pkgrel=0
pkgdesc="Alpine configuration management scripts"
url="https://git.alpinelinux.org/alpine-conf/about"
@@ -30,5 +30,5 @@ check() {
}
sha512sums="
-beb1e283db82cda8ce892c1a209d15011ad0ac5f061a5040d8ef0dddf7668c31a6dd7568451078e4b44f519744ea5488f973e9d00735e925568f8d6e710d6f6b alpine-conf-3.14.2.tar.gz
+d8f59adfce6ff3aa2e6c986c073fc48e1eab52eadd5264db909abd8b7c9cfdb888efa896a928b6c25b8b4ea5a9e66b42c67dbe348cad29432bf68d446c654d97 alpine-conf-3.14.6.tar.gz
"
diff --git a/main/alpine-git-mirror-syncd/APKBUILD b/main/alpine-git-mirror-syncd/APKBUILD
index d465f2e700..13d981d32f 100644
--- a/main/alpine-git-mirror-syncd/APKBUILD
+++ b/main/alpine-git-mirror-syncd/APKBUILD
@@ -3,14 +3,13 @@
pkgname=alpine-git-mirror-syncd
_shortname=git-mirror-syncd
pkgver=0.3.1
-pkgrel=0
+pkgrel=1
pkgdesc="Lua script that listens on MQTT and synchronizes Git mirrors when notified about changes"
url="https://github.com/jirutka/alpine-git-mirror-syncd"
arch="noarch"
license="MIT"
depends="ca-certificates git lua5.1 lua5.1-cjson lua5.1-mosquitto"
source="https://github.com/jirutka/$pkgname/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
options="!check" # upstream does not provide any tests yet
prepare() {
@@ -20,8 +19,6 @@ prepare() {
}
package() {
- cd "$builddir"
-
install -D -m 755 $_shortname.lua "$pkgdir"/usr/bin/$_shortname
install -D -m 644 config.lua.example "$pkgdir"/etc/$_shortname/config.lua
install -D -m 755 etc/init.d/$_shortname "$pkgdir"/etc/init.d/$_shortname
diff --git a/main/alpine-make-rootfs/APKBUILD b/main/alpine-make-rootfs/APKBUILD
index f0d18ef361..d857215751 100644
--- a/main/alpine-make-rootfs/APKBUILD
+++ b/main/alpine-make-rootfs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=alpine-make-rootfs
-pkgver=0.6.0
+pkgver=0.6.1
pkgrel=0
pkgdesc="Make customized Alpine Linux rootfs (base image) for containers"
url="https://github.com/alpinelinux/alpine-make-rootfs"
@@ -18,5 +18,5 @@ package() {
}
sha512sums="
-2ea723071c469318006a0e5d8fcc22f7cd9ebfb6ebc271e20951f5999a1521811f12850dfcd91533cd3f6572eafaa6b001112a32c8f6c00fd626f9aa1e9a372b alpine-make-rootfs-0.6.0.tar.gz
+4a15b51f716d4d23f758e236ffaa1d192ca8e472a2cdcc591600aeae7681060baad25c88cb52bb4c827fd4d79263e0ba2d2f6ba1cef317ceb57a0306f456c415 alpine-make-rootfs-0.6.1.tar.gz
"
diff --git a/main/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD
index 20a3b8c828..cba8d72c15 100644
--- a/main/alsa-lib/APKBUILD
+++ b/main/alsa-lib/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alsa-lib
-pkgver=1.2.7.1
+pkgver=1.2.7.2
pkgrel=0
pkgdesc="Advanced Linux Sound Architecture (ALSA) library"
url="https://alsa-project.org/"
@@ -39,7 +39,7 @@ package() {
}
sha512sums="
-2a0b4205e8bf602b56a6f5007ba219799e5443827393058e439adf5b391bb6c4815a48bb994b5d108b9f31a90db0eb43a96a0d7741216e2d710dc63d372de27e alsa-lib-1.2.7.1.tar.bz2
+79e5920384e570a1acd8ecd1eb8812879333c3cedb1d15780080afc40125b97df893c33f4163d9dd863871b628bc6026265f8ace2c8634fc1af5b52b62ac9cfe alsa-lib-1.2.7.2.tar.bz2
e15318431fe2d5bd1e42ef793f223e3e5995890d7befe6daa3d7456ccf5cb2f51eb79171539cecae13032a9b8a798ea35e04c89b27c7ef9567e2c03fb8db4512 remove-test.patch
f980d153c2f179e2f8fd90180d19250e5a5e12388f31d86a233d89be72ae7e96b944a8f435f0a11c6140378ac38eaa937175e1c100395ec4f635a9a6a4b1ae25 fix-PATH_MAX-on-ppc64le.patch
"
diff --git a/main/alsa-ucm-conf/APKBUILD b/main/alsa-ucm-conf/APKBUILD
new file mode 100644
index 0000000000..438c2609a6
--- /dev/null
+++ b/main/alsa-ucm-conf/APKBUILD
@@ -0,0 +1,20 @@
+# Contributor: Minecrell <minecrell@minecrell.net>
+# Maintainer: Minecrell <minecrell@minecrell.net>
+pkgname=alsa-ucm-conf
+pkgver=1.2.7.2
+pkgrel=0
+pkgdesc="ALSA Use Case Manager configuration"
+url="https://alsa-project.org"
+arch="noarch"
+license="BSD-3-Clause"
+source="https://alsa-project.org/files/pub/lib/alsa-ucm-conf-$pkgver.tar.bz2"
+options="!check" # no tests
+
+package() {
+ mkdir -p "$pkgdir"/usr/share/alsa
+ cp -r ucm2 "$pkgdir"/usr/share/alsa
+}
+
+sha512sums="
+b6866f1ca6a3f4d69d7923bc1107a64b49944a3a8756f129f39034e5390e08db1c295669e54dfe1437ca934cc11abf407f60fc8319f5cba3f021966e8654c2db alsa-ucm-conf-1.2.7.2.tar.bz2
+"
diff --git a/main/alsa-utils/APKBUILD b/main/alsa-utils/APKBUILD
index 8c72835a6b..cb4ca08ede 100644
--- a/main/alsa-utils/APKBUILD
+++ b/main/alsa-utils/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alsa-utils
pkgver=1.2.7
-pkgrel=0
+pkgrel=1
pkgdesc="Advanced Linux Sound Architecture (ALSA) utilities"
url="https://alsa-project.org/"
arch="all"
options="!check" # No test suite, applets use ncurses / don't have --version
license="GPL-2.0-or-later"
makedepends="alsa-lib-dev fftw-dev ncurses-dev pciutils-dev xmlto"
-depends="dialog"
+depends="dialog alsa-ucm-conf"
subpackages="$pkgname-dbg alsaconf::noarch $pkgname-doc $pkgname-openrc"
source="https://alsa-project.org/files/pub/utils/alsa-utils-$pkgver.tar.bz2
alsaconf.patch
diff --git a/main/aom/APKBUILD b/main/aom/APKBUILD
index 7985463181..3aec00d530 100644
--- a/main/aom/APKBUILD
+++ b/main/aom/APKBUILD
@@ -1,13 +1,13 @@
# Contributor: Oleg Titov <oleg.titov@gmail.com>
# Maintainer: Oleg Titov <oleg.titov@gmail.com>
pkgname=aom
-pkgver=3.4.0
+pkgver=3.5.0
pkgrel=0
pkgdesc="Alliance for Open Media (AOM) AV1 codec SDK"
url="https://aomedia.org/"
arch="all"
-license="custom"
-options="net !check" # tests require a lot of time
+license="BSD-2-Clause AND custom"
+options="!check" # tests run for 5+ hours
makedepends="cmake perl python3 yasm samurai"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
source="$pkgname-$pkgver.tar.gz::https://aomedia.googlesource.com/aom/+archive/v$pkgver.tar.gz
@@ -36,8 +36,7 @@ build() {
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
- -DCMAKE_C_FLAGS="$CFLAGS"
+ -DENABLE_TESTS="$(want_check && echo ON || echo OFF)"
ninja -C build
}
@@ -65,6 +64,6 @@ unpack() {
}
sha512sums="
-cb375445410319aac4149baad5f7b8f2e863a0fc47247b55b640edf8e650a766276bcebe107f2fbe9828990ab3b725fbf553f97f74b5e2d291dd12626a205287 aom-3.4.0.tar.gz
+7499b9ee32e8b687edb82f448ebebca214feaa0a58442307483dd98b63f88f51494f15107cea6e2f0ed8b957526ee16905b2b50668b36e9cb4b71f5cb85c982c aom-3.5.0.tar.gz
573a6c9cd1e9c71a0612f750fb1b69ee65ab86364d3aa78ef51b8fb20633c69b97026d0685dedeabb51f31d0dab7c651d1fe5c72e0dc9f14b8ed2704584934a9 fix-stack-size-e53da0b.patch
"
diff --git a/main/apache-mod-auth-ntlm-winbind/APKBUILD b/main/apache-mod-auth-ntlm-winbind/APKBUILD
index 8685a24c3a..43b7f304f0 100644
--- a/main/apache-mod-auth-ntlm-winbind/APKBUILD
+++ b/main/apache-mod-auth-ntlm-winbind/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <natanael.copa@gmail.com>
pkgname=apache-mod-auth-ntlm-winbind
pkgver=0.1
-pkgrel=6
+pkgrel=7
pkgdesc="Authentication module for Apache using NTLM protocol with winbind helper"
url="http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/"
arch="all"
@@ -10,19 +10,19 @@ license="Apache-2.0"
depends="apache2 samba samba-winbind"
makedepends="autoconf apache2-dev apr-util-dev apr-dev"
source="http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/mod_auth_ntlm_winbind.c
-http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/configure.in
-http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/Makefile.in
-mod-auth-ntlm-winbind.conf"
+ http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/configure.in
+ http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/Makefile.in
+ mod-auth-ntlm-winbind.conf
+ "
+builddir="$srcdir"
build() {
- cd "$srcdir"
autoconf
./configure
- make DESTDIR="$pkgdir" || return 1
+ make DESTDIR="$pkgdir"
}
package() {
- cd "$srcdir"
mkdir -p "$pkgdir"/etc/apache2/conf.d
mkdir -p "$pkgdir"/usr/lib/apache2
install mod-auth-ntlm-winbind.conf "$pkgdir"/etc/apache2/conf.d/mod-auth-ntlm-winbind.conf
diff --git a/main/apache-mod-auth-radius/APKBUILD b/main/apache-mod-auth-radius/APKBUILD
index a0e2a4c6cb..4cd0bafa39 100644
--- a/main/apache-mod-auth-radius/APKBUILD
+++ b/main/apache-mod-auth-radius/APKBUILD
@@ -3,14 +3,13 @@
pkgname=apache-mod-auth-radius
_pkgname=mod_auth_radius
pkgver=1.6.0
-pkgrel=0
+pkgrel=1
pkgdesc="Apache authentication module to become RADIUS client for AAA requests"
url="http://freeradius.org/mod_auth_radius/"
arch="all"
license="BSD"
depends="apache2"
makedepends="apache2-dev freeradius-dev"
-install=""
options="!check"
source="$pkgname_$pkgver.tar.gz::https://github.com/FreeRADIUS/mod_auth_radius/archive/v$pkgver.tar.gz
mod-auth-radius.conf"
diff --git a/main/apache2-mod-wsgi/APKBUILD b/main/apache2-mod-wsgi/APKBUILD
index bba5063a27..9be36d92d2 100644
--- a/main/apache2-mod-wsgi/APKBUILD
+++ b/main/apache2-mod-wsgi/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Matt Smith <mcs@darkregion.net>
pkgname=apache2-mod-wsgi
_realname=mod_wsgi
-pkgver=4.9.0
+pkgver=4.9.3
pkgrel=0
pkgdesc="Python WSGI Module for Apache2"
url="https://github.com/GrahamDumpleton/mod_wsgi"
@@ -33,6 +33,6 @@ package() {
}
sha512sums="
-9dc34d431171321094a9713444895d9754eff4e69ad1e86c8d3cd77bc1ca0a4c10b697e7f8cf14902d6bfaf205c8842e62fa944bb38f66f1c54fd36af95a09d6 apache2-mod-wsgi-4.9.0.tar.gz
+75061bee9a7d6b787c822cf396ce5e8c2c51d616648e6795f1ba170a9d771817df365115f633d3112330d800151697974863f1a0242408c511a233434fc3e2ec apache2-mod-wsgi-4.9.3.tar.gz
5b36a458bd3539e58ea61ec405c4f5c5e0001a644263b0e1f8421a5c7fc7884b6df1355674a9d9b610780b5e9db6ce66d0ae1bbc0e512ecb027c3757209152c8 apache2-mod-wsgi.apache2.conf
"
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index 1202ca36a6..0637780fc3 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -3,7 +3,7 @@
pkgname=apache2
_pkgreal=httpd
pkgver=2.4.54
-pkgrel=0
+pkgrel=1
pkgdesc="A high performance Unix-based HTTP server"
url="https://httpd.apache.org/"
arch="all"
@@ -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 openssl1.1-compat-dev pcre-dev sed zlib-dev"
+ lua-dev nghttp2-dev openssl-dev>3 pcre-dev sed zlib-dev"
subpackages="$pkgname-ctl
$pkgname-error:_error:noarch
$pkgname-dev
@@ -333,7 +333,7 @@ ctl() {
ssl() {
pkgdesc="SSL/TLS module for the Apache HTTP Server"
install="apache2-ssl.post-install"
- depends="apache2 openssl"
+ depends="apache2 openssl>3"
install -d "$subpkgdir"/usr/lib/apache2
mv "$pkgdir"/usr/lib/apache2/mod_ssl.so \
diff --git a/main/api-sanity-checker/APKBUILD b/main/api-sanity-checker/APKBUILD
index dbdee62a9c..9753867e55 100644
--- a/main/api-sanity-checker/APKBUILD
+++ b/main/api-sanity-checker/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=api-sanity-checker
pkgver=1.98.7
-pkgrel=1
+pkgrel=2
pkgdesc="A tool for creating automated test suites from any set of C sources"
url="https://lvc.github.io/api-sanity-checker/"
arch="noarch"
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 59f5710424..3009817a8c 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
pkgver=2.12.9
-pkgrel=5
+pkgrel=7
pkgdesc="Alpine Package Keeper - package manager for alpine"
arch="all"
url="https://gitlab.alpinelinux.org/alpine/apk-tools"
@@ -10,8 +10,8 @@ subpackages="$pkgname-dbg $pkgname-dev $pkgname-static $pkgname-doc $pkgname-zsh
# 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 openssl1.1-compat-dev zlib-static openssl1.1-compat-libs-static linux-headers"
+makedepends_build="openssl>3 lua5.3 lua5.3-lzlib scdoc"
+makedepends_host="zlib-dev openssl-dev zlib-static openssl-libs-static linux-headers"
makedepends="$makedepends_build $makedepends_host"
_lua="no"
if [ "$CBUILD" = "$CHOST" ]; then
@@ -23,6 +23,7 @@ if [ "$CBUILD" = "$CHOST" ]; then
depends="$depends ca-certificates-bundle"
fi
source="https://gitlab.alpinelinux.org/alpine/$pkgname/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz
+ increase-index-meta-buffer.patch
_apk
"
builddir="$srcdir/$pkgname-v$pkgver"
@@ -87,5 +88,6 @@ luaapk() {
sha512sums="
2e299e50c5ca8733f04fad971247146ff4bebb697c3589e4692c9a940ede89432dd9fea48004dc947cb493db1206a336ac0ad1e876b02683183d69b4a127d1c6 apk-tools-v2.12.9.tar.gz
+3807fe95357855a8b682a13dc6178db9d0396ed905bee694ef923867b1f79c61801ba4d4240adeb27825bc472006a74a5e7898b4683c548ee826e825710ce3e1 increase-index-meta-buffer.patch
7870676720f5007eee9482786e02246f8e3474afb90e76c9c83aebe914747a8e007b5d2eed6441933f4922024b3f0664db270f21981ad6c2db877a110b0cd79e _apk
"
diff --git a/main/apk-tools/increase-index-meta-buffer.patch b/main/apk-tools/increase-index-meta-buffer.patch
new file mode 100644
index 0000000000..d542d96e07
--- /dev/null
+++ b/main/apk-tools/increase-index-meta-buffer.patch
@@ -0,0 +1,13 @@
+diff --git a/src/package.c b/src/package.c
+index 2aeb21c..e317026 100644
+--- a/src/package.c
++++ b/src/package.c
+@@ -1117,7 +1117,7 @@ static int write_depends(struct apk_ostream *os, const char *field,
+ int apk_pkg_write_index_entry(struct apk_package *info,
+ struct apk_ostream *os)
+ {
+- char buf[512];
++ char buf[1024];
+ apk_blob_t bbuf = APK_BLOB_BUF(buf);
+
+ apk_blob_push_blob(&bbuf, APK_BLOB_STR("C:"));
diff --git a/main/apparmor/0001-Fix-linking-against-gettext-on-musl-libc.patch b/main/apparmor/0001-Fix-linking-against-gettext-on-musl-libc.patch
new file mode 100644
index 0000000000..4180cf6581
--- /dev/null
+++ b/main/apparmor/0001-Fix-linking-against-gettext-on-musl-libc.patch
@@ -0,0 +1,40 @@
+From 183849ec988c7326bcb9bf729d087e262d121b67 Mon Sep 17 00:00:00 2001
+From: allgdante <allan.garret@gmail.com>
+Date: Wed, 4 Jul 2018 16:57:19 +0200
+Subject: [PATCH 1/7] Fix linking against gettext on musl libc
+
+Both parser and binutils must be linked against gettext
+---
+ binutils/Makefile | 2 +-
+ parser/Makefile | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/binutils/Makefile b/binutils/Makefile
+index 7fb71813..52e55f70 100644
+--- a/binutils/Makefile
++++ b/binutils/Makefile
+@@ -52,7 +52,7 @@ SRCS = aa_enabled.c
+ HDRS =
+ TOOLS = aa-enabled aa-exec
+
+-AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread
++AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread -lintl
+
+ ifdef USE_SYSTEM
+ # Using the system libapparmor so Makefile dependencies can't be used
+diff --git a/parser/Makefile b/parser/Makefile
+index 5d799f6a..000540a3 100644
+--- a/parser/Makefile
++++ b/parser/Makefile
+@@ -90,7 +90,7 @@ AAREDIR= libapparmor_re
+ AAREOBJECT = ${AAREDIR}/libapparmor_re.a
+ AAREOBJECTS = $(AAREOBJECT)
+ AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L. $(LDFLAGS)
+-AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread
++AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread -lintl
+
+ ifdef USE_SYSTEM
+ # Using the system libapparmor so Makefile dependencies can't be used
+--
+2.20.1
+
diff --git a/main/apparmor/0003-parser-remove-specific-tests-for-rttime.patch b/main/apparmor/0003-parser-remove-specific-tests-for-rttime.patch
new file mode 100644
index 0000000000..fe5ac45d4b
--- /dev/null
+++ b/main/apparmor/0003-parser-remove-specific-tests-for-rttime.patch
@@ -0,0 +1,73 @@
+From 3e78593208264935ed2589d784cbcb69f750c274 Mon Sep 17 00:00:00 2001
+From: allgdante <allan.garret@gmail.com>
+Date: Wed, 4 Jul 2018 17:05:10 +0200
+Subject: [PATCH 3/7] parser: remove specific tests for rttime
+
+musl libc doesn't implement this feature, so the tests fail.
+We must find a way to skip those tests instead of removing them
+---
+ parser/tst/equality.sh | 18 +++++++++---------
+ .../tst/simple_tests/rlimits/ok_rlimit_13.sd | 7 -------
+ .../tst/simple_tests/rlimits/ok_rlimit_18.sd | 7 -------
+ 3 files changed, 9 insertions(+), 23 deletions(-)
+ delete mode 100644 parser/tst/simple_tests/rlimits/ok_rlimit_13.sd
+ delete mode 100644 parser/tst/simple_tests/rlimits/ok_rlimit_18.sd
+
+diff --git a/parser/tst/equality.sh b/parser/tst/equality.sh
+index 029eec46..3b2f0f9f 100755
+--- a/parser/tst/equality.sh
++++ b/parser/tst/equality.sh
+@@ -525,15 +525,15 @@ verify_binary_equality "@{profile_name} is literal in peer with esc alt sequence
+
+
+ # verify rlimit data conversions
+-verify_binary_equality "set rlimit rttime <= 12 weeks" \
+- "/t { set rlimit rttime <= 12 weeks, }" \
+- "/t { set rlimit rttime <= $((12 * 7)) days, }" \
+- "/t { set rlimit rttime <= $((12 * 7 * 24)) hours, }" \
+- "/t { set rlimit rttime <= $((12 * 7 * 24 * 60)) minutes, }" \
+- "/t { set rlimit rttime <= $((12 * 7 * 24 * 60 * 60)) seconds, }" \
+- "/t { set rlimit rttime <= $((12 * 7 * 24 * 60 * 60 * 1000)) ms, }" \
+- "/t { set rlimit rttime <= $((12 * 7 * 24 * 60 * 60 * 1000 * 1000)) us, }" \
+- "/t { set rlimit rttime <= $((12 * 7 * 24 * 60 * 60 * 1000 * 1000)), }"
++#verify_binary_equality "set rlimit rttime <= 12 weeks" \
++# "/t { set rlimit rttime <= 12 weeks, }" \
++# "/t { set rlimit rttime <= $((12 * 7)) days, }" \
++# "/t { set rlimit rttime <= $((12 * 7 * 24)) hours, }" \
++# "/t { set rlimit rttime <= $((12 * 7 * 24 * 60)) minutes, }" \
++# "/t { set rlimit rttime <= $((12 * 7 * 24 * 60 * 60)) seconds, }" \
++# "/t { set rlimit rttime <= $((12 * 7 * 24 * 60 * 60 * 1000)) ms, }" \
++# "/t { set rlimit rttime <= $((12 * 7 * 24 * 60 * 60 * 1000 * 1000)) us, }" \
++# "/t { set rlimit rttime <= $((12 * 7 * 24 * 60 * 60 * 1000 * 1000)), }"
+
+ verify_binary_equality "set rlimit cpu <= 42 weeks" \
+ "/t { set rlimit cpu <= 42 weeks, }" \
+diff --git a/parser/tst/simple_tests/rlimits/ok_rlimit_13.sd b/parser/tst/simple_tests/rlimits/ok_rlimit_13.sd
+deleted file mode 100644
+index 50b9a6f3..00000000
+--- a/parser/tst/simple_tests/rlimits/ok_rlimit_13.sd
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#
+-#=DESCRIPTION simple rttime rlimit allows default units
+-#=EXRESULT PASS
+-
+-profile rlimit {
+- set rlimit rttime <= 12,
+-}
+diff --git a/parser/tst/simple_tests/rlimits/ok_rlimit_18.sd b/parser/tst/simple_tests/rlimits/ok_rlimit_18.sd
+deleted file mode 100644
+index f2747f10..00000000
+--- a/parser/tst/simple_tests/rlimits/ok_rlimit_18.sd
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#
+-#=DESCRIPTION simple realtime time rlimit test
+-#=EXRESULT PASS
+-
+-profile rlimit {
+- set rlimit rttime <= 60minutes,
+-}
+--
+2.20.1
+
diff --git a/main/apparmor/0004-parser-remove-specific-tests-for-ofile.patch b/main/apparmor/0004-parser-remove-specific-tests-for-ofile.patch
new file mode 100644
index 0000000000..2847bc1df2
--- /dev/null
+++ b/main/apparmor/0004-parser-remove-specific-tests-for-ofile.patch
@@ -0,0 +1,28 @@
+From 7227f8c49cf74ff470248cdb946dd27872854979 Mon Sep 17 00:00:00 2001
+From: allgdante <allan.garret@gmail.com>
+Date: Wed, 4 Jul 2018 17:08:11 +0200
+Subject: [PATCH 4/7] parser: remove specific tests for ofile
+
+musl libc doesn't implement this feature, so the test fail.
+We must find a way to skip this test instead of removing it
+---
+ parser/tst/simple_tests/rlimits/ok_rlimit_09.sd | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 parser/tst/simple_tests/rlimits/ok_rlimit_09.sd
+
+diff --git a/parser/tst/simple_tests/rlimits/ok_rlimit_09.sd b/parser/tst/simple_tests/rlimits/ok_rlimit_09.sd
+deleted file mode 100644
+index 6510ae72..00000000
+--- a/parser/tst/simple_tests/rlimits/ok_rlimit_09.sd
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#
+-#=DESCRIPTION simple max open file (same as nofile) rlimit test
+-#=EXRESULT PASS
+-
+-profile rlimit {
+- set rlimit ofile <= 1234,
+-}
+--
+2.20.1
+
diff --git a/main/apparmor/0005-utils-adjust-tests-to-match-the-Alpine-layout.patch b/main/apparmor/0005-utils-adjust-tests-to-match-the-Alpine-layout.patch
new file mode 100644
index 0000000000..bb90494626
--- /dev/null
+++ b/main/apparmor/0005-utils-adjust-tests-to-match-the-Alpine-layout.patch
@@ -0,0 +1,38 @@
+From 1951d7c3535d46edbfe16b8a1b8d2176d96d4235 Mon Sep 17 00:00:00 2001
+From: allgdante <allan.garret@gmail.com>
+Date: Mon, 23 Mar 2020 16:12:36 +0000
+Subject: [PATCH 07/12] utils: adjust tests to match the Alpine layout
+
+Here we need to adjust several utilities path with the ones used by
+Alpine
+---
+ utils/test/test-aa.py | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/utils/test/test-aa.py b/utils/test/test-aa.py
+index b5221737..9d1d3ecc 100644
+--- a/utils/test/test-aa.py
++++ b/utils/test/test-aa.py
+@@ -157,15 +157,13 @@ class AaTest_get_interpreter_and_abstraction(AATest):
+ tests = [
+ ('#!/bin/bash', ('/bin/bash', 'abstractions/bash')),
+ ('#!/bin/dash', ('/bin/dash', 'abstractions/bash')),
+- ('#!/bin/sh', ('/bin/sh', 'abstractions/bash')),
+- ('#! /bin/sh ', ('/bin/sh', 'abstractions/bash')),
+- ('#! /bin/sh -x ', ('/bin/sh', 'abstractions/bash')), # '-x' is not part of the interpreter path
++ ('#!/bin/sh', ('/bin/sh', None)),
++ ('#! /bin/sh ', ('/bin/sh', None)),
++ ('#! /bin/sh -x ', ('/bin/sh', None)), # '-x' is not part of the interpreter path
+ ('#!/usr/bin/perl', ('/usr/bin/perl', 'abstractions/perl')),
+ ('#!/usr/bin/perl -w', ('/usr/bin/perl', 'abstractions/perl')), # '-w' is not part of the interpreter path
+- ('#!/usr/bin/python', ('/usr/bin/python', 'abstractions/python')),
+- ('#!/usr/bin/python2', ('/usr/bin/python2', 'abstractions/python')),
+- ('#!/usr/bin/python2.7', ('/usr/bin/python2.7', 'abstractions/python')),
+ ('#!/usr/bin/python3', ('/usr/bin/python3', 'abstractions/python')),
++ ('#!/usr/bin/python3.8', ('/usr/bin/python3.8', 'abstractions/python')),
+ ('#!/usr/bin/python4', ('/usr/bin/python4', None)), # python abstraction is only applied to py2 and py3
+ ('#!/usr/bin/ruby', ('/usr/bin/ruby', 'abstractions/ruby')),
+ ('#!/usr/bin/ruby2.2', ('/usr/bin/ruby2.2', 'abstractions/ruby')),
+--
+2.25.2
+
diff --git a/main/apparmor/0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch b/main/apparmor/0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch
new file mode 100644
index 0000000000..14dddeae1e
--- /dev/null
+++ b/main/apparmor/0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch
@@ -0,0 +1,28 @@
+From 72a3291fc94210401e5dac3b2fa328b2bb40998d Mon Sep 17 00:00:00 2001
+From: allgdante <allan.garret@gmail.com>
+Date: Thu, 5 Jul 2018 17:32:46 +0200
+Subject: [PATCH 6/7] utils: adjust rc functions for aa-remove-unknown
+
+Update the path to the rc.apparmor.functions file to the one we can find
+inside Alpine.
+No intended functional changes
+---
+ utils/aa-remove-unknown | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/aa-remove-unknown b/utils/aa-remove-unknown
+index d3bd9144..0b9ead7d 100644
+--- a/utils/aa-remove-unknown
++++ b/utils/aa-remove-unknown
+@@ -15,7 +15,7 @@
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+ # ----------------------------------------------------------------------
+
+-APPARMOR_FUNCTIONS=/lib/apparmor/rc.apparmor.functions
++APPARMOR_FUNCTIONS=/usr/libexec/apparmor/rc.apparmor.functions
+ APPARMORFS=/sys/kernel/security/apparmor
+ PROFILES="${APPARMORFS}/profiles"
+ REMOVE="${APPARMORFS}/.remove"
+--
+2.20.1
+
diff --git a/main/apparmor/0007-Remove-Locale-gettext-from-parser-tests.patch b/main/apparmor/0007-Remove-Locale-gettext-from-parser-tests.patch
new file mode 100644
index 0000000000..bad8cbe195
--- /dev/null
+++ b/main/apparmor/0007-Remove-Locale-gettext-from-parser-tests.patch
@@ -0,0 +1,39 @@
+From 05dd326460042c0f82234b7299a0327529c98d4f Mon Sep 17 00:00:00 2001
+From: allgdante <allan.garret@gmail.com>
+Date: Thu, 31 Jan 2019 13:36:34 +0000
+Subject: [PATCH 7/7] Remove Locale::gettext from parser tests
+
+The package for Alpine doesn't exists and it seems that the tests run ok
+without this
+---
+ parser/tst/gen-dbus.pl | 1 -
+ parser/tst/gen-xtrans.pl | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/parser/tst/gen-dbus.pl b/parser/tst/gen-dbus.pl
+index 1fe58108..3fa5d0ce 100755
+--- a/parser/tst/gen-dbus.pl
++++ b/parser/tst/gen-dbus.pl
+@@ -17,7 +17,6 @@
+ #
+
+ use strict;
+-use Locale::gettext;
+ use POSIX;
+
+ setlocale(LC_MESSAGES, "");
+diff --git a/parser/tst/gen-xtrans.pl b/parser/tst/gen-xtrans.pl
+index 8cf077f4..64219cef 100755
+--- a/parser/tst/gen-xtrans.pl
++++ b/parser/tst/gen-xtrans.pl
+@@ -1,7 +1,6 @@
+ #!/usr/bin/perl
+
+ use strict;
+-use Locale::gettext;
+ use POSIX;
+
+ setlocale(LC_MESSAGES, "");
+--
+2.20.1
+
diff --git a/main/apparmor/APKBUILD b/main/apparmor/APKBUILD
new file mode 100644
index 0000000000..4fa96d20e6
--- /dev/null
+++ b/main/apparmor/APKBUILD
@@ -0,0 +1,222 @@
+# Contributor: Allan Garret <allan.garret@gmail.com>
+# Maintainer: Allan Garret <allan.garret@gmail.com>
+pkgname=apparmor
+pkgver=3.0.4
+pkgrel=3
+pkgdesc="Linux application security framework - mandatory access control for programs"
+url="https://gitlab.com/apparmor/apparmor/wikis/home"
+arch="all"
+license="GPL-2.0-only"
+depends="bash"
+makedepends="
+ autoconf
+ automake
+ bison
+ flex
+ gettext-dev
+ libtool
+ linux-headers
+ linux-pam-dev
+ perl-dev
+ py3-setuptools
+ python3-dev
+ sed
+ swig
+ "
+checkdepends="
+ dejagnu
+ py3-notify2
+ py3-psutil
+ py3-pyflakes
+ "
+subpackages="
+ libapparmor:_libapparmor
+ libapparmor-dev
+ py3-$pkgname:_py3_apparmor
+ perl-$pkgname:_perl_apparmor
+ $pkgname-utils:_apparmor_utils
+ $pkgname-utils-lang:_apparmor_utils_lang
+ $pkgname-profiles:_apparmor_profiles:noarch
+ $pkgname-pam:_apparmor_pam
+ $pkgname-vim:_apparmor_vim:noarch
+ $pkgname-openrc
+ $pkgname-doc
+ $pkgname-lang
+ "
+source="
+ https://gitlab.com/apparmor/apparmor/-/archive/v$pkgver/apparmor-v$pkgver.tar.gz
+
+ apparmor.initd
+
+ 0001-Fix-linking-against-gettext-on-musl-libc.patch
+ 0003-parser-remove-specific-tests-for-rttime.patch
+ 0004-parser-remove-specific-tests-for-ofile.patch
+ 0005-utils-adjust-tests-to-match-the-Alpine-layout.patch
+ 0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch
+ 0007-Remove-Locale-gettext-from-parser-tests.patch
+ python-3.10-test-aa-notify.patch
+ fix-dnsmasq-profile.patch
+ aa-notify-test.patch
+ "
+builddir="$srcdir/$pkgname-v$pkgver"
+options="!check" # checkdepends in community
+
+# test_entries_since_login fails
+[ "$CARCH" = "s390x" ] && options="!check"
+
+prepare() {
+ default_prepare
+
+ common/list_af_names.sh > parser/base_af_names.h
+
+ cd libraries/libapparmor
+ ./autogen.sh
+}
+
+build() {
+ export PYTHON_VERSION=3
+ export PYTHON_VERSIONS=python3
+ export PYTHON=/usr/bin/python3
+
+ (
+ cd "$builddir"/libraries/libapparmor
+ msg "Building: libapparmor"
+ ./configure \
+ --prefix=/usr \
+ --with-python \
+ --with-perl
+ make
+ )
+
+ msg "Building: apparmor parser"
+ make -C parser
+
+ msg "Building: apparmor-binutils"
+ make -C binutils
+
+ msg "Building: apparmor-utils"
+ make -C utils
+
+ msg "Building: apparmor-profiles"
+ make -C profiles
+
+ msg "Building: apparmor-pam"
+ make -C changehat/pam_apparmor
+
+ msg "Building: apparmor-vim"
+ make -C utils/vim
+}
+
+check() {
+ cd "$builddir"/libraries/libapparmor
+ make check
+
+ cd "$builddir"
+ make -C parser check
+ make -C binutils check
+ make -j1 -e PYFLAKES=pyflakes-3 -C utils check
+}
+
+package() {
+ make -C libraries/libapparmor install DESTDIR="$pkgdir"
+ make -C changehat/pam_apparmor install DESTDIR="$pkgdir"
+ make -C binutils install DESTDIR="$pkgdir" BINDIR="$pkgdir/usr/bin"
+ make -C parser install DESTDIR="$pkgdir" BINDIR="$pkgdir/usr/bin"
+ make -C profiles install DESTDIR="$pkgdir"
+ make -C utils install \
+ DESTDIR="$pkgdir" \
+ BINDIR="$pkgdir/usr/bin" \
+ VIM_INSTALL_PATH="$pkgdir/usr/share/vim/vimfiles/syntax"
+
+ mv "$pkgdir"/lib "$pkgdir"/usr/lib
+
+ mkdir -p "$pkgdir"/usr/libexec/apparmor "$pkgdir"/lib
+ mv "$pkgdir"/usr/lib/lib/apparmor/rc.apparmor.functions \
+ "$pkgdir"/usr/libexec/apparmor/
+ mv "$pkgdir"/usr/lib/lib/security "$pkgdir"/lib
+ rm -r "$pkgdir"/usr/lib/lib/
+
+ install -Dm755 "$srcdir"/apparmor.initd \
+ "$pkgdir"/etc/init.d/apparmor
+
+ install -Dm644 changehat/pam_apparmor/README \
+ "$pkgdir"/usr/share/doc/apparmor/README.pam_apparmor
+}
+
+_libapparmor() {
+ pkgdesc="AppArmor library"
+ depends="bash sed"
+
+ amove usr/lib/libapparmor.so.*
+}
+
+_py3_apparmor() {
+ pkgdesc="Python3 module for apparmor"
+ depends="libapparmor=$pkgver-r$pkgrel python3"
+
+ amove usr/lib/python3*/site-packages/LibAppArmor*
+}
+
+_perl_apparmor() {
+ pkgdesc="Perl module for apparmor"
+ depends="libapparmor=$pkgver-r$pkgrel perl"
+
+ amove usr/lib/perl5
+}
+
+_apparmor_utils() {
+ pkgdesc="AppArmor userspace utilities"
+ depends="py3-apparmor libapparmor=$pkgver-r$pkgrel perl python3 bash"
+
+ amove etc/apparmor/easyprof.conf
+ amove etc/apparmor/logprof.conf
+ amove etc/apparmor/notify.conf
+ amove etc/apparmor/severity.db
+ amove usr/bin
+ amove usr/sbin
+ amove usr/lib/python3*/site-packages/apparmor*
+ amove usr/share/apparmor/easyprof
+}
+
+_apparmor_utils_lang() {
+ pkgdesc="Languages for package $subpkgname"
+ install_if="$pkgname-utils=$pkgver-r$pkgrel lang"
+
+ amove usr/share/locale/*/LC_MESSAGES/*utils.mo
+}
+
+_apparmor_profiles() {
+ pkgdesc="AppArmor sample pre-made profiles"
+ depends="apparmor"
+
+ amove etc/apparmor.d
+ amove usr/share/apparmor/extra-profiles
+}
+
+_apparmor_pam() {
+ pkgdesc="AppArmor PAM library"
+ depends="libapparmor=$pkgver-r$pkgrel linux-pam"
+
+ amove lib/security
+}
+
+_apparmor_vim() {
+ pkgdesc="AppArmor VIM support"
+ install_if="$pkgname-vim=$pkgver-r$pkgrel vim"
+
+ amove usr/share/vim
+}
+
+sha512sums="
+2bd9df907a0ba3fd64d370fca050200aa97d53995cdff6db447c9a72f0d1876ac86a00524bfc2ef74d5a5986fb30208762840af5d77e5e2d221802cc685c8f7b apparmor-v3.0.4.tar.gz
+1a57cc577ba3aedfbe10ef6148c1e8f5d0bbf65c99e60eec80c52409c9dab59ae002024500c6e4fd0e01e8c7aeb0c85e3e6b41cacee08c17fdd869d31bca614e apparmor.initd
+e94f44427ed3c6f64462170939ffc92ce9ac1a58c61c7c7c3483fe16fe8e1c419daade9d56cdd342132e4d823dcac1963a86ad889f10bf71fd52b7f54c4694ed 0001-Fix-linking-against-gettext-on-musl-libc.patch
+568e10bda27745ac6e1b9495bb6863e93466ee1c387912393c2c7396bcedd7400b13ee233dd953f82460328e3aae45dd2f7aba92962edef31330d6b4dbc9951b 0003-parser-remove-specific-tests-for-rttime.patch
+3a84fb3b2b19ccf52e179190e98ec0da2469727eaaa73d0094b0e9c85b80738c9cb9da9242d17a472a649e6042933bedb5f78c3f574d555369a4ece38a1d8a8a 0004-parser-remove-specific-tests-for-ofile.patch
+ebe2494e0023d45a41623038f8126fd5366606507d7c1caadf776253a5a64e2979ed157b00d2240556945c414fd3a6dff3d5ce971a5c975033dfb53db60abecc 0005-utils-adjust-tests-to-match-the-Alpine-layout.patch
+38ebb30a0185f8eabd9103925959da365f64ef485f66ffb10180ac596fc172f9c98df39baec0b035138e9ab32056148e69a066faba9faebf9e92bf7a09c150c0 0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch
+093c2f216776c5cc67294a134af6ef788dd5a82477592093abbdd244d65591006890a7c911d4f72d7c0ceac5d3ee33927b055a6d3731284701057b35372e7265 0007-Remove-Locale-gettext-from-parser-tests.patch
+00751466e80c05d741ea490c1726c41efce71966a83ccf58916cef3b9873f79ece459472c4ebe0204957239630f2d6805861fff5ffd47e799fb7727afbb51d77 python-3.10-test-aa-notify.patch
+cbe6eb9dd46e3ace122d5bc386596d5106a301b82a9ac1681f31a967013d3db67a8d674d54605444f30c3a136677ff3b26fad80f78d0f02dbe18a9f10f64672a fix-dnsmasq-profile.patch
+521459f497c45e15d14eaa8648cfc0193c0b6f14c67624c5dee5e2e3ca791ae522fa8e50042be9a4acd38a767e33483e964e542f64b241b2c51b694854256bee aa-notify-test.patch
+"
diff --git a/main/apparmor/aa-notify-test.patch b/main/apparmor/aa-notify-test.patch
new file mode 100644
index 0000000000..a69a96ddf6
--- /dev/null
+++ b/main/apparmor/aa-notify-test.patch
@@ -0,0 +1,20 @@
+--- a/utils/test/test-aa-notify.py
++++ b/utils/test/test-aa-notify.py
+@@ -192,7 +192,7 @@
+ result = 'Got output "%s", expected "%s"\n' % (output, expected_output_has)
+ self.assertIn(expected_output_has, output, result + output)
+
+- @unittest.skipUnless(os.path.isfile('/var/log/wtmp'), 'Requires wtmp on system')
++ @unittest.skip('fails if wtmp present with invalid data on builder')
+ def test_entries_since_login(self):
+ '''Test showing log entries since last login'''
+
+@@ -207,7 +207,7 @@
+ result = 'Got output "%s", expected "%s"\n' % (output, expected_output_has)
+ self.assertIn(expected_output_has, output, result + output)
+
+- @unittest.skipUnless(os.path.isfile('/var/log/wtmp'), 'Requires wtmp on system')
++ @unittest.skip('fails if wtmp present with invalid data on builder')
+ def test_entries_since_login_verbose(self):
+ '''Test showing log entries since last login in verbose mode'''
+
diff --git a/main/apparmor/apparmor.initd b/main/apparmor/apparmor.initd
new file mode 100644
index 0000000000..15058f2895
--- /dev/null
+++ b/main/apparmor/apparmor.initd
@@ -0,0 +1,91 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Load all configured profiles for the AppArmor security module."
+description_reload="Reload all profiles"
+
+extra_started_commands="reload"
+
+aa_action() {
+ local arg=$1
+ local return
+
+ shift
+ $*
+ return=$?
+
+ if [ ${return} -eq 0 ]; then
+ aa_log_success_msg $arg
+ else
+ aa_log_failure_msg arg
+ fi
+
+ return $return
+}
+
+aa_log_action_start() {
+ ebegin $1
+}
+
+aa_log_action_end() {
+ eend $1
+}
+
+aa_log_success_msg() {
+ einfo $1
+}
+
+aa_log_warning_msg() {
+ ewarn $1
+}
+
+aa_log_failure_msg() {
+ eerror $1
+}
+
+aa_log_skipped_msg() {
+ einfo $1
+}
+
+aa_log_daemon_msg() {
+ einfo $1
+}
+
+aa_log_end_msg() {
+ eend $1
+}
+
+. /usr/libexec/apparmor/rc.apparmor.functions
+
+start() {
+ ebegin "Starting AppArmor"
+ eindent
+
+ if ! is_apparmor_loaded ; then
+ load_module
+ if [ $? -ne 0 ]; then
+ eerror "AppArmor kernel support is not present"
+ eend 1
+ return 1
+ fi
+ fi
+
+ parse_profiles load
+
+ eoutdent
+}
+
+stop() {
+ ebegin "Stopping AppArmor"
+ eindent
+ apparmor_stop
+ eoutdent
+}
+
+reload() {
+ # todo: split out clean_profiles into its own function upstream
+ # so we can do parse_profiles reload && clean_profiles
+ # and do a proper reload instead of restart
+ apparmor_restart
+}
diff --git a/main/apparmor/fix-dnsmasq-profile.patch b/main/apparmor/fix-dnsmasq-profile.patch
new file mode 100644
index 0000000000..9a92065702
--- /dev/null
+++ b/main/apparmor/fix-dnsmasq-profile.patch
@@ -0,0 +1,12 @@
+diff --git a/profiles/apparmor.d/usr.sbin.dnsmasq b/profiles/apparmor.d/usr.sbin.dnsmasq
+index 7ae9a14..0005b14 100644
+--- a/profiles/apparmor.d/usr.sbin.dnsmasq
++++ b/profiles/apparmor.d/usr.sbin.dnsmasq
+@@ -66,6 +66,7 @@ profile dnsmasq /usr/{bin,sbin}/dnsmasq flags=(attach_disconnected) {
+ /var/lib/misc/dnsmasq.leases rw, # Required only for DHCP server usage
+
+ /{,usr/}bin/{ba,da,}sh ix, # Required to execute --dhcp-script argument
++ /bin/busybox ix, # /bin/sh is a symlink of busybox on Alpine
+
+ # access to iface mtu needed for Router Advertisement messages in IPv6
+ # Neighbor Discovery protocol (RFC 2461)
diff --git a/main/apparmor/python-3.10-test-aa-notify.patch b/main/apparmor/python-3.10-test-aa-notify.patch
new file mode 100644
index 0000000000..e3ecc4a1f8
--- /dev/null
+++ b/main/apparmor/python-3.10-test-aa-notify.patch
@@ -0,0 +1,50 @@
+Patch-Source: https://gitlab.com/apparmor/apparmor/-/merge_requests/848
+From 39f4132ab95abfa88c2c688048493fae2443f7e0 Mon Sep 17 00:00:00 2001
+From: Christian Boltz <apparmor@cboltz.de>
+Date: Mon, 14 Feb 2022 19:59:21 +0100
+Subject: [PATCH] make test-aa-notify test_help_contents () less strict
+
+Python 3.10 generates a slightly different --help output.
+
+Fixes https://gitlab.com/apparmor/apparmor/-/issues/220
+---
+ utils/test/test-aa-notify.py | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/utils/test/test-aa-notify.py b/utils/test/test-aa-notify.py
+index 76cf597aa..aa41f32f7 100644
+--- a/utils/test/test-aa-notify.py
++++ b/utils/test/test-aa-notify.py
+@@ -148,13 +148,15 @@ Feb 4 13:40:38 XPS-13-9370 kernel: [128552.880347] audit: type=1400 audit({epoc
+ '''Test output of help text'''
+
+ expected_return_code = 0
+- expected_output_is = \
++ expected_output_1 = \
+ '''usage: aa-notify [-h] [-p] [--display DISPLAY] [-f FILE] [-l] [-s NUM] [-v]
+ [-u USER] [-w NUM] [--debug]
+
+ Display AppArmor notifications or messages for DENIED entries.
++'''
+
+-optional arguments:
++ expected_output_2 = \
++'''
+ -h, --help show this help message and exit
+ -p, --poll poll AppArmor logs and display notifications
+ --display DISPLAY set the DISPLAY environment variable (might be needed if
+@@ -174,8 +176,9 @@ optional arguments:
+ return_code, output = cmd(aanotify_bin + ['--help'])
+ result = 'Got return code %d, expected %d\n' % (return_code, expected_return_code)
+ self.assertEqual(expected_return_code, return_code, result + output)
+- result = 'Got output "%s", expected "%s"\n' % (output, expected_output_is)
+- self.assertEqual(expected_output_is, output, result + output)
++
++ self.assertIn(expected_output_1, output)
++ self.assertIn(expected_output_2, output)
+
+ def test_entries_since_100_days(self):
+ '''Test showing log entries since 100 days'''
+--
+GitLab
+
diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD
index f3fe4bec27..3b92fa5588 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=12
+pkgrel=13
pkgdesc="The Apache Portable Runtime Utility Library"
url="https://apr.apache.org/"
arch="all"
@@ -9,8 +9,8 @@ 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 libpq-dev
- openssl1.1-compat-dev mariadb-dev"
-makedepends="$depends_dev apr-dev bash chrpath openssl"
+ openssl-dev>3 mariadb-dev"
+makedepends="$depends_dev apr-dev bash chrpath openssl>3"
source="https://www.apache.org/dist/apr/apr-util-$pkgver.tar.bz2
musl-fix-testsuite.patch"
diff --git a/main/argon2/APKBUILD b/main/argon2/APKBUILD
index b3eb0b1e8a..40d1211f54 100644
--- a/main/argon2/APKBUILD
+++ b/main/argon2/APKBUILD
@@ -4,7 +4,7 @@
pkgname=argon2
_pkgname=phc-winner-argon2
pkgver=20190702
-pkgrel=1
+pkgrel=2
pkgdesc="The password hash Argon2, winner of PHC"
url="https://github.com/P-H-C/phc-winner-argon2"
arch="all"
diff --git a/main/argp-standalone/001-throw-in-funcdef.patch b/main/argp-standalone/001-throw-in-funcdef.patch
deleted file mode 100644
index 4a90751e1e..0000000000
--- a/main/argp-standalone/001-throw-in-funcdef.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone
-# Copyright (C) 2006 The T2 SDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-
-No __THROW in function implementation.
- --jsaw
-
---- argp-standalone-1.4-test2/argp.h.orig 2006-01-06 02:29:59.000000000 +0100
-+++ argp-standalone-1.4-test2/argp.h 2006-01-06 02:41:10.000000000 +0100
-@@ -560,17 +560,17 @@
- # endif
-
- # ifndef ARGP_EI
--# define ARGP_EI extern __inline__
-+# define ARGP_EI extern inline
- # endif
-
- ARGP_EI void
--__argp_usage (__const struct argp_state *__state) __THROW
-+__argp_usage (__const struct argp_state *__state)
- {
- __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
- }
-
- ARGP_EI int
--__option_is_short (__const struct argp_option *__opt) __THROW
-+__option_is_short (__const struct argp_option *__opt)
- {
- if (__opt->flags & OPTION_DOC)
- return 0;
-@@ -582,7 +582,7 @@
- }
-
- ARGP_EI int
--__option_is_end (__const struct argp_option *__opt) __THROW
-+__option_is_end (__const struct argp_option *__opt)
- {
- return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
- }
---- argp-standalone-1.4-test2/argp-parse.c.orig 2006-01-06 02:47:48.000000000 +0100
-+++ argp-standalone-1.4-test2/argp-parse.c 2006-01-06 02:48:16.000000000 +0100
-@@ -1290,13 +1290,13 @@
- /* Defined here, in case a user is not inlining the definitions in
- * argp.h */
- void
--__argp_usage (__const struct argp_state *__state) __THROW
-+__argp_usage (__const struct argp_state *__state)
- {
- __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
- }
-
- int
--__option_is_short (__const struct argp_option *__opt) __THROW
-+__option_is_short (__const struct argp_option *__opt)
- {
- if (__opt->flags & OPTION_DOC)
- return 0;
-@@ -1310,7 +1310,7 @@
- }
-
- int
--__option_is_end (__const struct argp_option *__opt) __THROW
-+__option_is_end (__const struct argp_option *__opt)
- {
- return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
- }
diff --git a/main/argp-standalone/APKBUILD b/main/argp-standalone/APKBUILD
index 5799c19d1f..e08b84006d 100644
--- a/main/argp-standalone/APKBUILD
+++ b/main/argp-standalone/APKBUILD
@@ -1,17 +1,15 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=argp-standalone
-pkgver=1.3
-pkgrel=4
+pkgver=1.5.0
+pkgrel=0
pkgdesc="Hierarchial argument parsing library broken out from glibc"
url="http://www.lysator.liu.se/~nisse/misc/"
arch="all"
license="GPL-2.0-or-later"
makedepends="libtool automake autoconf"
-source="http://www.lysator.liu.se/~nisse/misc/argp-standalone-$pkgver.tar.gz
- 001-throw-in-funcdef.patch
- gnu89-inline.patch
- "
+source="$pkgname-$pkgver.tar.gz::https://github.com/argp-standalone/argp-standalone/archive/refs/tags/$pkgver.tar.gz
+ gnu89-inline.patch"
prepare() {
default_prepare
@@ -39,6 +37,7 @@ package() {
install -D -m755 libargp.a "$pkgdir"/usr/lib/libargp.a
}
-sha512sums="58c3feb8852b90248fff39e49b5019bd0dcf646790c3eaf70c3262eb81dda31a61dc0a45963c7b4a010e80fc14b37288dcb3b3ef48d02f2d33dd72c1c62e62d9 argp-standalone-1.3.tar.gz
-5e4cdeeb16e6a4fb46a00ab95f3da9276ee554eec00bb2a05da7467961234ba3f9a630aafa7ceb5feb429a84ece8bf03b869fa996b86468f4716935a914c79a4 001-throw-in-funcdef.patch
-69f1d8a4fcd542346f98bc1fb7151db748483fc2f331c8c35114e0891d867b41c603ddaa5f3130aaaf1c640e02c51ac71cee71b62c09301b146812e9059e9ade gnu89-inline.patch"
+sha512sums="
+fa2eb61ea00f7a13385e5c1e579dd88471d6ba3a13b6353e924fe71914b90b40688b42a9f1789bc246e03417fee1788b1990753cda8c8d4a544e85f26b63f9e2 argp-standalone-1.5.0.tar.gz
+42b2072b68d9287cfde2f5023af0a6c24bc34a7af6df036a313d5c4fa2762688b12476c688caf010176c069184305325f3134756f0c4e19aa4b06278e3f233e0 gnu89-inline.patch
+"
diff --git a/main/argp-standalone/gnu89-inline.patch b/main/argp-standalone/gnu89-inline.patch
index 71978eba58..bcb15d8d55 100644
--- a/main/argp-standalone/gnu89-inline.patch
+++ b/main/argp-standalone/gnu89-inline.patch
@@ -1,12 +1,11 @@
diff --git a/configure.ac b/configure.ac
-index 4658839..09f0267 100644
+index 932b9da..b4f85bb 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -79,16 +79,10 @@ AC_CHECK_DECLS([program_invocation_name, program_invocation_short_name],
-
+@@ -80,15 +80,10 @@ AC_CHECK_DECLS([program_invocation_name, program_invocation_short_name],
# Set these flags *last*, or else the test programs won't compile
if test x$GCC = xyes ; then
-- # Using -ggdb3 makes (some versions of) Redhat's gcc-2.96 dump core
+ # Using -ggdb3 makes (some versions of) Redhat's gcc-2.96 dump core
- if "$CC" --version | grep '^2\.96$' 1>/dev/null 2>&1; then
- true
- else
diff --git a/main/arm-trusted-firmware/APKBUILD b/main/arm-trusted-firmware/APKBUILD
index aff371ab3e..f8e3ed6691 100644
--- a/main/arm-trusted-firmware/APKBUILD
+++ b/main/arm-trusted-firmware/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Maxim Karasev <begs@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=arm-trusted-firmware
-pkgver=2.6
+pkgver=2.7.0
pkgrel=1
pkgdesc="ARM Trusted Firmware-A (TF-A)"
url="https://github.com/ARM-software/arm-trusted-firmware"
@@ -21,8 +21,16 @@ _plats="
build() {
unset LDFLAGS
for plat in $_plats; do
- msg "Building ATF for $plat"
- make PLAT=$plat bl31
+ local opts=""
+
+ case "$plat" in
+ sun50i_a64)
+ opts="SUNXI_SETUP_REGULATORS=0 SUNXI_AMEND_DTB=1"
+ ;;
+ esac
+
+ msg "Building ATF for $plat (opts='$opts')"
+ make PLAT=$plat bl31 $opts
done
}
@@ -34,5 +42,5 @@ package() {
}
sha512sums="
-8b20964b1b672898268e27424984af0ef9e95b38f426370ed4b802f67fc204db5f467886707dce77e4560548e01777a6c36d4eb801842c7d1f2ff6ca5d9b7dd1 arm-trusted-firmware-v2.6.tar.gz
+3e1e09bcc69a0f080f91b94d9c8da6dd0b27b86292599c280438d7b6f594017a896af7cfc58d9d22053f77b5daa2faecd51a59505c755eac8493e4e0fd1e9203 arm-trusted-firmware-v2.7.0.tar.gz
"
diff --git a/main/asciidoc/APKBUILD b/main/asciidoc/APKBUILD
index 9aafab2c19..328529f3e5 100644
--- a/main/asciidoc/APKBUILD
+++ b/main/asciidoc/APKBUILD
@@ -1,45 +1,34 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=asciidoc
-pkgver=9.1.1
+pkgver=10.2.0
pkgrel=0
pkgdesc="Text based documentation"
url="https://asciidoc.org/"
arch="noarch"
-license="GPL-2.0-or-later and GPL-1.0-or-later"
-depends="python3 libxml2-utils docbook-xsl source-highlight"
-makedepends="autoconf automake"
+license="GPL-2.0-or-later AND GPL-1.0-or-later"
+depends="python3 libxml2-utils docbook-xsl"
+makedepends="py3-setuptools"
+checkdepends="py3-pytest py3-pytest-mock"
subpackages="$pkgname-doc"
-# There is a upstream-created tarball but it has depth=1 which unpacks
-# everything into $srcdir instead of $srcdir/$pkgname-$pkgver
-source="$pkgname-$pkgver.tar.gz::https://github.com/asciidoc/asciidoc-py3/archive/$pkgver.tar.gz"
-builddir="$srcdir/asciidoc-py-$pkgver"
+source="https://github.com/asciidoc-py/asciidoc-py/releases/download/$pkgver/asciidoc-$pkgver.tar.gz"
+options="!check" # py3-pytest-mock
replaces="$pkgname-vim"
-prepare() {
- default_prepare
- autoreconf -fi
-}
-
build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info
- make
+ python3 setup.py build
}
check() {
- make test
+ pytest
}
package() {
- make DESTDIR="$pkgdir" install
+ python3 setup.py install --skip-build --root="$pkgdir"
+ install -Dm644 doc/*.1 -t "$pkgdir"/usr/share/man/man1/
+ install -Dm644 asciidoc/api.py -t "$pkgdir"/usr/lib/python3*/site-packages/asciidoc/
}
sha512sums="
-444de69e3b87af984327873d5be1162157db5f7fb353e1fbbd24b4938ce0238fd474a67c9d3461fb7b069e7b029c63fbaf1ba8dd9cf7b91fbfa81e5429db404c asciidoc-9.1.1.tar.gz
+e8f97559a169504bd2b47a5a4108268d08dbeb98e304486e64761c2603963f4610a0f96c443fdbb8ea289586f015d066681c8ad2946610864662d6df5d7ba9d6 asciidoc-10.2.0.tar.gz
"
diff --git a/main/aspell-fr/APKBUILD b/main/aspell-fr/APKBUILD
index 458c2065e1..ac95afb3cc 100644
--- a/main/aspell-fr/APKBUILD
+++ b/main/aspell-fr/APKBUILD
@@ -2,25 +2,22 @@
pkgname=aspell-fr
pkgver=0.50_p3
_ver=${pkgver/_p/-}
-pkgrel=1
+pkgrel=2
pkgdesc="French dictionary for aspell"
url="http://aspell.net/"
arch="noarch"
license="GPL-2.0"
-depends=""
makedepends="aspell-dev"
source="https://ftp.gnu.org/gnu/aspell/dict/fr/aspell-fr-$_ver.tar.bz2"
+builddir="$srcdir"/aspell-fr-$_ver
-_builddir="$srcdir"/aspell-fr-$_ver
build () {
- cd "$_builddir"
- ./configure || return 1
- make || return 1
+ ./configure
+ make
}
package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
}
sha512sums="bb5d1faada9283521096a19a8f5abada2a19cc02717f6dde57846ef46a4df253113b10a2bb72d2b0e32e4a3ab24b541a5acd9f4595b908d2f6cd2fc448d8bc3b aspell-fr-0.50-3.tar.bz2"
diff --git a/main/aspell-ru/APKBUILD b/main/aspell-ru/APKBUILD
index d6e6636d43..35b743514b 100644
--- a/main/aspell-ru/APKBUILD
+++ b/main/aspell-ru/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Valery Kartel <valery.kartel@gmail.com>
pkgname=aspell-ru
pkgver=0.99f7
-pkgrel=0
+pkgrel=1
_lang=${pkgname##*-}
_name=${pkgname%%-*}6-$_lang-$pkgver-1
pkgdesc="Russian dictionary for aspell"
@@ -15,15 +15,13 @@ source="https://ftp.gnu.org/gnu/aspell/dict/$_lang/$_name.tar.bz2"
builddir="$srcdir"/$_name
build () {
- cd "$builddir"
./configure
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
- install -D -m644 Copyright "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+ install -Dm644 Copyright "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
sha512sums="789fe15f5502b54008a41f2afb5635dcb7bb0a36e61b300ee48b2429c339793f5c4808d6063f13f1f8455ce251912433890e7d01ca59d8b0924ecd2987ceb430 aspell6-ru-0.99f7-1.tar.bz2"
diff --git a/main/aspell-uk/APKBUILD b/main/aspell-uk/APKBUILD
index 4755219613..910d6380d2 100644
--- a/main/aspell-uk/APKBUILD
+++ b/main/aspell-uk/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Valery Kartel <valery.kartel@gmail.com>
pkgname=aspell-uk
pkgver=1.4.0
-pkgrel=1
+pkgrel=2
_lang=${pkgname##*-}
_name=${pkgname%%-*}6-$_lang-$pkgver-0
pkgdesc="Ukrainian dictionary for aspell"
@@ -14,15 +14,13 @@ source="https://ftp.gnu.org/gnu/aspell/dict/$_lang/$_name.tar.bz2"
builddir="$srcdir"/$_name
build () {
- cd "$builddir"
./configure
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
- install -D -m644 Copyright "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+ install -Dm644 Copyright "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
sha512sums="2e66465d17695dd3147241f13d611571f8a80a15886c69728d2f34019fb4834e56e4c0834d9e898927522b54d75f78a32dd3435b2c16eb86cf9cfa11070f0799 aspell6-uk-1.4.0-0.tar.bz2"
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index f19a684766..1642f028b4 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -3,8 +3,8 @@
# Contributor: Timo Teras <timo.teras@iki.fi>
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=asterisk
-pkgver=18.11.2
-pkgrel=0
+pkgver=18.13.0
+pkgrel=1
pkgdesc="Modular Open Source PBX System"
pkgusers="asterisk"
pkggroups="asterisk"
@@ -34,7 +34,7 @@ makedepends="
mariadb-connector-c-dev
ncurses-dev
newt-dev
- openssl1.1-compat-dev
+ openssl-dev>3
opus-dev
opusfile-dev
pjproject-dev
@@ -240,7 +240,7 @@ sound_en() {
}
sha512sums="
-6b33949edb26b8dec5c4c79fe07f4fe3c82a83014944b142ffe5cdf9e626a7240e65c31f9215136ab964b14e077829c4ae99e1b0c2067e8b8ac016f628281e06 asterisk-18.11.2.tar.gz
+085dfcf15f99d7d96b49a720156678c4de5a88b55375257a9a1234f9dd83f21eed1685d4177dae5978272608e690582367c6c34fdef91bbad54299594d0ce9df asterisk-18.13.0.tar.gz
aacef3f4796fb1abd33266998b53909cb4b36e7cc5ad2f7bac68bdc43e9a9072d9a4e2e7e681bddfa31f3d04575eb248afe6ea95da780c67e4829c1e22adfe1b asterisk-addon-mp3-r201.patch.gz
69d82b878728f99b7bf7e862025cbc01aa5b6b9332a5372059ea89a788c66fd351f1103989b3573a7a4ba9ff533f3ee2ff5d88de938440e05d6246e41a882306 asterisk-13.7-90e8780faccc79e68c07775c6ab2fe1ffaccfa08.tar.gz
771237ba6d42ab62d914f2702234b23fd0bc8c22f2aa33b0e745c9170163c8046f6d48ecb299faab3d6fb397f1aa046421083c3cc88510c9779861c522f357dd 10-musl-mutex-init.patch
diff --git a/main/at-spi2-core/APKBUILD b/main/at-spi2-core/APKBUILD
index 2ce67c1ca8..6ee2b291c6 100644
--- a/main/at-spi2-core/APKBUILD
+++ b/main/at-spi2-core/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=at-spi2-core
-pkgver=2.45.1
-pkgrel=1
+pkgver=2.46.0
+pkgrel=0
pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
url="https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/"
arch="all"
@@ -32,6 +32,7 @@ replaces="atk at-spi2-atk"
build() {
abuild-meson \
+ -Db_lto=true \
-Dx11=yes \
-Dintrospection=yes \
-Ddocs=true \
@@ -66,5 +67,5 @@ libatk_bridge() {
}
sha512sums="
-989d696aec54b5148f938614c96fbc6c04f72af6ed863ab076b945954c5bf7ce205a41b2739b68968e18c1c014f18273c95bb8967e1cdc853440fffd7a441a77 at-spi2-core-2.45.1.tar.xz
+633af2c02fab3b8cb02e37f929ce80dd5ce28ca5641046ef5e25cb29299530b90028e6c6f318a0c098a4270bed3eab48fb55d6967a76bfadd2520f49de47c770 at-spi2-core-2.46.0.tar.xz
"
diff --git a/main/audit/APKBUILD b/main/audit/APKBUILD
index d706e91a99..68133d1200 100644
--- a/main/audit/APKBUILD
+++ b/main/audit/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Dermot Bradley <dermot_bradley@yahoo.com>
# Maintainer: Tycho Andersen <tycho@docker.com>
pkgname=audit
-pkgver=3.0.8
+pkgver=3.0.9
pkgrel=0
pkgdesc="User space tools for kernel auditing"
url="https://people.redhat.com/sgrubb/audit/"
@@ -50,7 +50,7 @@ static() {
}
sha512sums="
-8379bf425d68381d182300e628e42de8460d2f3e15b2395e10880f94b9989656852a50a9bece75b632ec8a04c40c9e666ff4c9d6b25ace3a8f50d2011506afab audit-3.0.8.tar.gz
+5219eb0b41746eca3406008a97731c0083e7be50ec88563a39537de22cb69fe88490f5fe5a11535930f360b11a62538e2ff6cbe39e059cd760038363954ef4d6 audit-3.0.9.tar.gz
f3f2c4ee745e99877c981d889c5cbb0379d073a9b7634c1480ae603a21a13045f9978b51f8cb53c8d0ba414d249bb859af7bca7e302c464b3fc3c6463ecca762 0003-all-get-rid-of-strndupa.patch
90c7d213a0b4ef27bf643e046dd2b3c5909706c62fba24ef34ecb32ff07b73fda13ed04c616a7cf8148115fc977aa1096b61e717abd5bd32f72f7bb4ac07999f usr-paths.patch
a347c45cb1cd3c93ece5352218f1e7bc38938f3cbaf060158e4df40e9f027afbc3c6a3651f25e26e45ab9f2c96af2181d2638b09ed747a4348d0fc88af798798 musl.patch
diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD
index 85803b7803..b8cdd567ec 100644
--- a/main/augeas/APKBUILD
+++ b/main/augeas/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=augeas
pkgver=1.12.0
-pkgrel=0
+pkgrel=1
pkgdesc="A configuration editing tool"
url="http://augeas.net"
arch="all"
diff --git a/main/autoconf-archive/APKBUILD b/main/autoconf-archive/APKBUILD
index 43f4159b1e..13466f622b 100644
--- a/main/autoconf-archive/APKBUILD
+++ b/main/autoconf-archive/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com>
pkgname=autoconf-archive
-pkgver=2022.02.11
+pkgver=2022.09.03
pkgrel=0
pkgdesc="Collection of re-usable GNU Autoconf macros"
url="https://www.gnu.org/software/autoconf-archive"
@@ -28,5 +28,5 @@ package() {
}
sha512sums="
-243e06a356ea2c0fddc527febd4241da49fe4c11fb64b548873744a54e079860739d7a1da842833b99540acde3f6a2ebfddc41897306cc2e61e2c6037a7d22ff autoconf-archive-2022.02.11.tar.xz
+157b5b6a979d5ec5bfab6ddf34422da620fec1e95f4c901821abbb7361544af77747b4a449029b84750d75679d6130a591e98da8772de2c121ecdea163f0340b autoconf-archive-2022.09.03.tar.xz
"
diff --git a/main/automake/APKBUILD b/main/automake/APKBUILD
index 31ab53d03c..62f4606eb3 100644
--- a/main/automake/APKBUILD
+++ b/main/automake/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=automake
pkgver=1.16.5
-pkgrel=0
+pkgrel=1
pkgdesc="GNU tool for automatically creating Makefiles"
url="https://www.gnu.org/software/automake"
arch="noarch"
@@ -10,6 +10,7 @@ depends="perl"
makedepends="autoconf"
subpackages="$pkgname-doc"
source="https://ftp.gnu.org/gnu/automake/automake-$pkgver.tar.xz
+ $pkgname-python3.10.patch::https://github.com/autotools-mirror/automake/commit/930a9a73f4bb776ec334eff4cf6e182802841daa.patch
"
# many tests have bashisms
@@ -33,4 +34,5 @@ package() {
sha512sums="
3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88 automake-1.16.5.tar.xz
+cd22baa12751be72b35a926127c85d793d1ccf69c48d4d0911b2cbd2b9f1249d6eecae4f90be60847a7880861abf59cc10b8846367885e1c6aadc4dd2d0219a0 automake-python3.10.patch
"
diff --git a/main/avahi-ui/APKBUILD b/main/avahi-ui/APKBUILD
index 7011a3c558..d5d9e3e3aa 100644
--- a/main/avahi-ui/APKBUILD
+++ b/main/avahi-ui/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=avahi-ui
pkgver=0.8
-pkgrel=2
+pkgrel=3
pkgdesc="Gtk user interface library for Avahi"
url="https://www.avahi.org/"
arch="all"
@@ -11,7 +11,7 @@ makedepends="$depends_dev py3-gobject3-dev py3-dbus-dev intltool libevent-dev
gobject-introspection-dev expat-dev libdaemon-dev glib-dev dbus-dev
libcap-dev python3-dev autoconf automake libtool avahi-dev gtk+3.0-dev"
subpackages="$pkgname-dev $pkgname-tools $pkgname-gtk3"
-source="http://www.avahi.org/download/avahi-$pkgver.tar.gz
+source="https://www.avahi.org/download/avahi-$pkgver.tar.gz
system-avahi.patch
gnome-nettool.png"
_subdirs="avahi-ui avahi-python"
@@ -86,6 +86,8 @@ gtk3() {
"$subpkgdir"/usr/lib/
}
-sha512sums="c6ba76feb6e92f70289f94b3bf12e5f5c66c11628ce0aeb3cadfb72c13a5d1a9bd56d71bdf3072627a76cd103b9b056d9131aa49ffe11fa334c24ab3b596c7de avahi-0.8.tar.gz
+sha512sums="
+c6ba76feb6e92f70289f94b3bf12e5f5c66c11628ce0aeb3cadfb72c13a5d1a9bd56d71bdf3072627a76cd103b9b056d9131aa49ffe11fa334c24ab3b596c7de avahi-0.8.tar.gz
99723e66889601044ac5ca919e79aa328083cb377bb3d270f3e8d2baee27505f967949f72faa0424756e5f18b1359fd7f7fb30636861d47455ff7b92ed48bcfa system-avahi.patch
-d8e92fcdd82759f8de536ebfa356fe208c27b2d998ce5bb51d585dffc163dc16228be4a7108644fe1a11defbe750244bc8105a430b1397297cdef4cb83ab0db5 gnome-nettool.png"
+261183cd4659b2c2fd4df53c109f310f62c726bbd590d158a270a0fe461167c6409460f811c5188435004a4da79b843505921465018a2e57c40c4bac84b3c096 gnome-nettool.png
+"
diff --git a/main/avahi-ui/gnome-nettool.png b/main/avahi-ui/gnome-nettool.png
index 227d0678a3..1603bdafee 100644
--- a/main/avahi-ui/gnome-nettool.png
+++ b/main/avahi-ui/gnome-nettool.png
Binary files differ
diff --git a/main/awall/APKBUILD b/main/awall/APKBUILD
index 5503262464..d7daca0489 100644
--- a/main/awall/APKBUILD
+++ b/main/awall/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
pkgname=awall
pkgver=1.12.0
-pkgrel=0
+pkgrel=1
pkgdesc="Alpine Wall"
url="https://gitlab.alpinelinux.org/alpine/awall"
_luaver=5.4
@@ -53,5 +53,5 @@ policies() {
sha512sums="
1e5b2bb3a64229c79959bd44dfa02c3b6230135eb0368bdc83ee5f0ce97ff9c02259442a3e8f9ae4eb62aaab97186537de15e5a548c720c7bed1aac8ecf30aa2 awall-v1.12.0.tar.bz2
e83ea3281c298092530e45fa5b62f6f85b9e5109b11e109799465ea832608294c7d9c4c3f5b0f321dfc0e82040daf3a17d066e9dea65cb0dbae2c453ea9e62cd awall-init
-1cd4b7fa5fc6c9ac6667dff5cc00d96a3cc42aaccafe3c5562d3dcfd9f22ddec9cfe5a9339fee8001b67ccb8e8b81c9417f39a461e5052af9bf74a2753559bf7 setup-firewall
+3a444b0bff5d36c504bc98e71687319778a037240b1170fa7f0bc534d19b3c41a3e4e871a3e3c27304a934e6c2d6b1cd589586a01250244394d014dc858606d9 setup-firewall
"
diff --git a/main/awall/setup-firewall b/main/awall/setup-firewall
index 06e3b769a5..62605e1d1b 100755
--- a/main/awall/setup-firewall
+++ b/main/awall/setup-firewall
@@ -102,7 +102,7 @@ if [ "$DHCP_ZONES" ]; then
enable_policy dhcp
fi
-egrep -q "^https?://" /etc/apk/repositories && enable_policy web-client
+grep -E -q "^https?://" /etc/apk/repositories && enable_policy web-client
enable_if_running ntp-client chronyd ntpd openntpd
enable_if_running ssh-server dropbear sshd
@@ -132,6 +132,6 @@ enable_service() {
}
enable_service iptables
-if ip -o address | egrep -q '^[0-9]+: [^ ]+ +inet6 '; then
+if ip -o address | grep -E -q '^[0-9]+: [^ ]+ +inet6 '; then
enable_service ip6tables
fi
diff --git a/main/axel/APKBUILD b/main/axel/APKBUILD
index 46a783dc03..799cba03c7 100644
--- a/main/axel/APKBUILD
+++ b/main/axel/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=axel
pkgver=2.17.11
-pkgrel=0
+pkgrel=1
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="openssl1.1-compat-dev"
+makedepends="openssl-dev>3"
subpackages="$pkgname-doc"
source="$url/releases/download/v$pkgver/axel-$pkgver.tar.xz"
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index 947154bd0d..e72777775b 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -1,13 +1,13 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=bacula
-pkgver=11.0.6
+pkgver=13.0.0
pkgrel=1
pkgdesc="Enterprise ready, network based backup program"
url="https://www.bacula.org"
arch="all"
license="AGPL-3.0-or-later WITH OpenSSL-Exception"
-makedepends="autoconf automake libtool mariadb-connector-c-dev ncurses-dev openssl1.1-compat-dev libpq-dev
+makedepends="autoconf automake libtool mariadb-connector-c-dev ncurses-dev openssl-dev>3 libpq-dev
sqlite-dev zlib-dev lzo-dev acl-dev"
install="$pkgname.pre-install $pkgname.post-upgrade"
subpackages="$pkgname-doc $pkgname-mysql $pkgname-pgsql $pkgname-sqlite
@@ -157,7 +157,7 @@ client() {
}
sha512sums="
-44abc9e3598f3d3beea3e85cca0867e4b9b77c4e7a17cb1902a5e952b049fb2b15f8f6319436fce1dd92ad52d26f04d7225dd052372ecc30aa55fb668a639149 bacula-11.0.6.tar.gz
+4049771f0a0a6c9302d73bd9870c0508d339e919077ac7cfabd4df83a24bb734dcaa8b1c655fb2ad44b04ce616cd566c2ff6dbb7567ae5904efb255ad2b7c0be bacula-13.0.0.tar.gz
bb954bb94bffa68ba80872046782a73012487291f019fb8d7ff77fc7f4325e25bee88612b3279b4db7d3c2002ac7448ffabcda62da7bab54642a7413904abc91 bacula-dir.initd
0505b9a74520af6982d5df4390525976f8e009e641d0acfe8f24b2ec9f155166a65eecbabee9ff70ffe188d523effa64f958acd8f657410b1c002a6d736e8aee bacula-sd.initd
91a53cb566cfd91b42a319bd6ff9947047cae187c6ec198767853d1a0253667d6c2c58f0e72ed43a7b9f40b76e705cafde7a1d6ac86577fa0f64f44b031dec11 bacula-fd.initd
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index e5309b99bc..441238581a 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -2,17 +2,17 @@
# Contributor: TBK <alpine@jjtc.eu>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bash
-pkgver=5.1.16
+pkgver=5.2.0
_patchlevel=${pkgver##*.}
_myver=${pkgver%.*}
_patchbase=${_myver/./}
-pkgrel=2
+pkgrel=0
pkgdesc="The GNU Bourne Again shell"
url="https://www.gnu.org/software/bash/bash.html"
arch="all"
license="GPL-3.0-or-later"
makedepends_build="bison flex"
-makedepends_host="readline-dev>8 ncurses-dev"
+makedepends_host="readline-dev>8 ncurses-dev musl-libintl"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc"
source="https://ftp.gnu.org/gnu/bash/bash-$_myver.tar.gz
@@ -95,23 +95,7 @@ dev() {
}
sha512sums="
-c44a0ce381469219548a3a27589af3fea4f22eda1ca4e9434b59fc16da81b471c29ce18e31590e0860a6a251a664b68c2b45e3a17d22cfc02799ffd9a208390c bash-5.1.tar.gz
+5647636223ba336bf33e0c65e516d8ebcf6932de8b44f37bc468eedb87579c628ad44213f78534beb10f47aebb9c6fa670cb0bed3b4e7717e5faf7e9a1ef81ae bash-5.2.tar.gz
4542e19f2c6c31fff1f412379d5e36c65767cf2d91f1311e8d43f2566e2e50ab8dddff6045aec9b0272ed7387aa9b35daf6b0844478c0bda94d961efcf6f3ae3 bashrc
9d8845491d0fe335bdd8e9a2bd98bda54bfed2ae3c35b2196c6d5a38bdf96c4d97572ba7d6b19ab605ef4e8f001f64cf3312f87dedebb9e37a95ad2c44e33cdb bash-noinfo.patch
-1cd86805a2639614372aec29a710bc456e330abcbbaa0867820c94f714a1fa5fb5c1b18aa2c10263ae0bce9dad7579c7af2f732282315c1c34bfd6a90777bfd2 bash51-001
-923e7822a9629645347d3aea0058fb5e2d52223507159a62369309f264612df44a84931c19e0ccb3852e98ce672dfbd454477090b4041b5a0de477c94eb61088 bash51-002
-01e952dcfdae58624723d64912ea3444eed2fdcd266ba1a929b95ec3abd70f914bf400607c3f7bb7a94ac2925f794f91f37c1929d5bb987de2ba7f60a19cb8bd bash51-003
-10ff24cd91a2cd88818bfa7218050843af6b409e43fcca89f5ec70d8266020c6c2a55132426271f165cd0f154f49eb0f8ec2761b80fc066c921b83120bb543ce bash51-004
-fa83d894fe874a05b9a7d47b8bca8e5b7f4067221d82e8b1af616d17725592c3737c621f2a8ad3c917b29846012c37c85acd34dcbb43eb6b05065ccce89b260c bash51-005
-b9b6e3d71f7b7718e2e8598ec8e337dcc675571fb233c29e5230ebf14eab2249204531f2fe8c4d1459c5fed10acb679048588d1e457e98dbc00ffc4d2cd227e3 bash51-006
-e4ebdc47e780ddc2588ecdfcfe00cb618039c7044e250ab2b836b0735c461ebacd15beaf2145e277c70b7f51cded55bd8dde7757df810f33f8dae306ee5ba571 bash51-007
-97f9558a08a66cc9da62c285bf9118b39328e25ed3b9277728e0539b1ac0adef176a090e39cd96dc03d6fd900d8155bd58040cb3390a09f637bab1de8af3faf6 bash51-008
-2d3c65162ec4e5c3dfeb439891950ef2c43973a84122fcdf6b56c388466c7e671dbc9b236d2253f01411b668c365855263995dbacb8e6f9e9dbcb7e6c2cc518c bash51-009
-aac4a0b72b559566334f1029c52754f4c98185af99e09436e401d83ab81bab7882d0d8050674b30f171733f3628157777a264566e927e93db2ea5a18d26630f1 bash51-010
-bb9e47a570bb9758c365831f9650b9379b60862b8cef572edc3cd833df96ebb8b9612de474bdc2a03ff4efc2275f871d55962295385e38f3658874488e974b81 bash51-011
-59819914b6821d9f4af0aade7b9b7ea92368c2b8eb8407cea11dfeee7208905dd06bdef7a049d7b1c4fac41c44d9a130b95a061957a9649050b37471b3044cf1 bash51-012
-67535155f49a7f54f151e62aba9274f82d01f33a1a1a7e5efd1aa0d63ba2d078765f0b5e22cb24db7132eff2d8c5852a3688298baa5217b8b6e159aae065d748 bash51-013
-f658ab7ef01ba1d26f735e24b23bf35687e15b0d5d20f90da233d000745a55bdba142c11e9fba52e3b84470ec625fab60cc74cd6be533d990496a3795c658e88 bash51-014
-fd4bc85f942a3a16c545f7e951a24f620ff2d884640dea6e05f305aaf88ed41862bfb05eea2258881608de696f9dc7a0fe3bebb51a011f50b720ea7a66699184 bash51-015
-020b3f3db77ca603a27a3423323538db5c9844be17ee428cf7cda80bebdcc715d30eab6c95773541cb8d14f3ad9e6142bf0adcda0e745ee638242508cc0ab05f bash51-016
"
diff --git a/main/batctl/APKBUILD b/main/batctl/APKBUILD
index d09134295d..8c52d16a38 100644
--- a/main/batctl/APKBUILD
+++ b/main/batctl/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=batctl
-pkgver=2022.0
-pkgrel=1
+pkgver=2022.1
+pkgrel=0
pkgdesc="B.A.T.M.A.N. advanced control and management tool"
url="https://www.open-mesh.org/"
arch="all"
@@ -21,5 +21,5 @@ package() {
}
sha512sums="
-4e839119914c471818dcdc6ee0850802f0141dade8303be92fd0fc6f4cf492e37e482401f4e519d815f3928c84b247a5d5e0000128eb958702b8a99ff6f4975e batctl-2022.0.tar.gz
+4e268b5ec7cb07fed08b8688e10c603b788ccbe3cc3c84e536ba27cf2e54e306b49d86a9f9c657627c673a48029834d0454db53c0fa46d7fad5e2095823828f5 batctl-2022.1.tar.gz
"
diff --git a/main/bats/APKBUILD b/main/bats/APKBUILD
index 6f8285b511..e32a93b800 100644
--- a/main/bats/APKBUILD
+++ b/main/bats/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Jose-Luis Rivas <ghostbar@riseup.net>
pkgname=bats
-pkgver=1.6.0
+pkgver=1.8.0
pkgrel=0
pkgdesc="Bash Automated Testing System"
options="!check" # Test passes CI/locally, fails on builders
@@ -19,6 +19,7 @@ check() {
package() {
./install.sh "$pkgdir"/usr
}
+
sha512sums="
-c76a219c0d6e8016bac90229b842c0666c1a63ae4c063c644a1cb2c78234e5b2685576889ca2c71cd1a6adfd3281be4c01e907b183873777e58e0d749e07d23c bats-1.6.0.zip
+a97b33d8ff4f89d68e4c77c654fb0711b91de9fd86d941d629310557c453beaad68004ae54e790a2d6eb9b902e1adee3cd902a0ce6833d6d767d50482ec4bc33 bats-1.8.0.zip
"
diff --git a/main/bc/APKBUILD b/main/bc/APKBUILD
index d311816fbf..4235a1b5b7 100644
--- a/main/bc/APKBUILD
+++ b/main/bc/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bc
pkgver=1.07.1
-pkgrel=1
+pkgrel=2
pkgdesc="An arbitrary precision numeric processing language (calculator)"
url="https://www.gnu.org/software/bc/bc.html"
arch="all"
@@ -10,10 +10,8 @@ license="GPL-2.0-or-later"
makedepends="ed flex bison readline-dev texinfo"
subpackages="$pkgname-doc"
source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/bctoolbox/APKBUILD b/main/bctoolbox/APKBUILD
index 7a220d8cf3..7f3693937c 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.1.45
+pkgver=5.1.55
pkgrel=0
pkgdesc="Utilities library used by Belledonne Communications softwares like belle-sip, mediastreamer2 and linphone"
url="https://github.com/BelledonneCommunications/bctoolbox"
@@ -46,5 +46,5 @@ dev() {
}
sha512sums="
-488d296f3d0328858692d865ce4c315bd9f2baa9fbe9577a1fd214735d8bbe83005f082239c277607d8561682d220e0da0f30b695911780b1a7ec27cfea1c247 bctoolbox-5.1.45.tar.gz
+8dc47d8094f2ce0152b4acce7d320c62196abd6d96f87e7006cd8c67042f1640e4c45618d3e18edfa3b081a991a7d0b43409e20bae965472e7c65299d537258a bctoolbox-5.1.55.tar.gz
"
diff --git a/main/bdftopcf/APKBUILD b/main/bdftopcf/APKBUILD
index 5bc7092580..0b54eb32c3 100644
--- a/main/bdftopcf/APKBUILD
+++ b/main/bdftopcf/APKBUILD
@@ -1,20 +1,17 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bdftopcf
pkgver=1.1
-pkgrel=0
+pkgrel=1
pkgdesc="X.Org font utility"
url="http://xorg.freedesktop.org"
arch="all"
license="MIT"
options="!check" # No test suite.
-depends=""
makedepends="libxfont-dev util-macros"
-install=""
subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,7 +23,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index 061a77dd42..0e9a88f552 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -5,12 +5,12 @@
# Contributor: ungleich <alpinelinux@ungleich.ch>
# Maintainer:
pkgname=bind
-pkgver=9.18.4
+pkgver=9.18.7
_ver=${pkgver%_p*}
_p=${pkgver#*_p}
_major=${pkgver%%.*}
[ "$_p" != "$pkgver" ] && _ver="$_ver-P$_p"
-pkgrel=2
+pkgrel=0
pkgdesc="The ISC DNS server"
url="https://www.isc.org/"
arch="all"
@@ -33,7 +33,7 @@ makedepends="
linux-headers
nghttp2-dev
openldap-dev
- openssl1.1-compat-dev
+ openssl-dev>3
perl
protobuf-c-dev
$_depends_root_keys
@@ -61,6 +61,13 @@ source="
"
# secfixes:
+# 9.18.7-r0:
+# - CVE-2022-2795
+# - CVE-2022-2881
+# - CVE-2022-2906
+# - CVE-2022-3080
+# - CVE-2022-38177
+# - CVE-2022-38178
# 9.16.27-r0:
# - CVE-2022-0396
# - CVE-2021-25220
@@ -265,7 +272,7 @@ _gpgfingerprints="
"
sha512sums="
-5deb46f6549e42087734fe80f8cd8de8f3fa54590e4635f8c0e2e8d362f8756404e911e46d7fe1cd75f0f19217532ca402e7a5947111f16e412c8aaa754b9e16 bind-9.18.4.tar.xz
+2cdceb4125b8759f5225296c6ffecdbb895b0a27dfcfcd98b04b9ad78552d16c16b0452fb823dc47d11cec21d2c6ecb05a107dd3094f8e7419bb9717d68820c5 bind-9.18.7.tar.xz
3d1d3e954aaee5e125f6b6f3cb660b51fc91d803df4cad43c47dbe97f19789cef20b5ca2834624668f0d761a5b81ac72db8959745d6eb293ca1154a1b390a007 named.initd
127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf named.confd
d2f61d02d7829af51faf14fbe2bafe8bc90087e6b6697c6275a269ebbddcaa14a234fff5c41da793e945e8ff1de3de0858a40334e0d24289eab98df4bb721ac5 named.conf.authoritative
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index 17fab6ace8..ea00dbe7ec 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=binutils
-pkgver=2.38
-pkgrel=3
+pkgver=2.39
+pkgrel=2
pkgdesc="Tools necessary to build programs"
url="https://www.gnu.org/software/binutils/"
makedepends_build="bison flex texinfo"
@@ -17,10 +17,7 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
ld-bfd-mips.patch
0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
binutils-mips-disable-assert.patch
- binutils-ppc-fix-machine-options.patch
- binutils-s390x-1.patch
- binutils-s390x-2.patch
- binutils-ppc64le-assertion.patch
+ CVE-2022-38533.patch
"
builddir="$srcdir/$pkgname-$pkgver"
@@ -35,6 +32,10 @@ if [ "$CHOST" != "$CTARGET" ]; then
fi
# secfixes:
+# 2.39-r2:
+# - CVE-2022-38533
+# 2.39-r0:
+# - CVE-2022-38126
# 2.35.2-r1:
# - CVE-2021-3487
# 2.32-r0:
@@ -85,12 +86,14 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--disable-multilib \
+ --disable-gprofng \
--enable-ld=default \
$_gold_configure \
--enable-64-bit-bfd \
$_plugin_configure \
--enable-relro \
--enable-deterministic-archives \
+ --enable-default-execstack=no \
$_cross_configure \
$_arch_configure \
$_hash_style_configure \
@@ -136,14 +139,11 @@ gold() {
}
sha512sums="
-8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz
+68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 binutils-2.39.tar.xz
ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49 binutils-ld-fix-static-linking.patch
f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f gold-mips.patch
314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d ld-bfd-mips.patch
70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f binutils-mips-disable-assert.patch
-27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4 binutils-ppc-fix-machine-options.patch
-a9efe2689624865f0ff33d4776a5bd295bcad6484bdd38d0ca490fea43691c4933ab33d17478851998eef12922dbf83d6c3225bb1f8faf92a1367d086390f7d3 binutils-s390x-1.patch
-0e291df80ad279005265634014d0935d2c115a5ed708d25407094b7ad4ddf267d1fb7fcbcb2d9ad73bd305b4e3974628b820bd1f249f56c095e4896872434cc9 binutils-s390x-2.patch
-63e58f45df3570279cb1ee5215ba3de77de012cac20da9cdd23f86a93890056e1efa397521559cfd0716d5239604607c440d8f4d089d83c98b8fbc1b5c5305f8 binutils-ppc64le-assertion.patch
+631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7 CVE-2022-38533.patch
"
diff --git a/main/binutils/CVE-2022-38533.patch b/main/binutils/CVE-2022-38533.patch
new file mode 100644
index 0000000000..df948da2e2
--- /dev/null
+++ b/main/binutils/CVE-2022-38533.patch
@@ -0,0 +1,22 @@
+X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
+
+diff --git a/bfd/coffcode.h b/bfd/coffcode.h
+index 67aaf158ca1..52027981c3f 100644
+--- a/bfd/coffcode.h
++++ b/bfd/coffcode.h
+@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
+
+ rec = (bfd_byte *) location;
+ recend = rec + count;
+- while (rec < recend)
++ while (recend - rec >= 4)
+ {
++ size_t len = bfd_get_32 (abfd, rec);
++ if (len == 0 || len > (size_t) (recend - rec) / 4)
++ break;
++ rec += len * 4;
+ ++section->lma;
+- rec += bfd_get_32 (abfd, rec) * 4;
+ }
+
+ BFD_ASSERT (rec == recend);
diff --git a/main/binutils/binutils-ppc-fix-machine-options.patch b/main/binutils/binutils-ppc-fix-machine-options.patch
deleted file mode 100644
index 703ecf98a3..0000000000
--- a/main/binutils/binutils-ppc-fix-machine-options.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Fix for DARN opcode error during ppc64le compilation of rng-tools which
-occurs with binutils 2.38 but not with binutils 2.37..
-
-https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=cebc89b9328;hp=9cbed90ee623d75e31994e7943960c997ba565f2
-
-
-diff -aur a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
---- a/gas/config/tc-ppc.c
-+++ b/gas/config/tc-ppc.c
-@@ -5965,7 +5965,30 @@
- options do not count as a new machine, instead they add
- to currently selected opcodes. */
- ppc_cpu_t machine_sticky = 0;
-- new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
-+ /* Unfortunately, some versions of gcc emit a .machine
-+ directive very near the start of the compiler's assembly
-+ output file. This is bad because it overrides user -Wa
-+ cpu selection. Worse, there are versions of gcc that
-+ emit the *wrong* cpu, not even respecting the -mcpu given
-+ to gcc. See gcc pr101393. And to compound the problem,
-+ as of 20220222 gcc doesn't pass the correct cpu option to
-+ gas on the command line. See gcc pr59828. Hack around
-+ this by keeping sticky options for an early .machine. */
-+ asection *sec;
-+ for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
-+ {
-+ segment_info_type *info = seg_info (sec);
-+ /* Are the frags for this section perturbed from their
-+ initial state? Even .align will count here. */
-+ if (info != NULL
-+ && (info->frchainP->frch_root != info->frchainP->frch_last
-+ || info->frchainP->frch_root->fr_type != rs_fill
-+ || info->frchainP->frch_root->fr_fix != 0))
-+ break;
-+ }
-+ new_cpu = ppc_parse_cpu (ppc_cpu,
-+ sec == NULL ? &sticky : &machine_sticky,
-+ cpu_string);
- if (new_cpu != 0)
- ppc_cpu = new_cpu;
- else
diff --git a/main/binutils/binutils-ppc64le-assertion.patch b/main/binutils/binutils-ppc64le-assertion.patch
deleted file mode 100644
index cd6113e6f8..0000000000
--- a/main/binutils/binutils-ppc64le-assertion.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 97dd8079feb35456d7b387a594b5e00f7654b3b8 Mon Sep 17 00:00:00 2001
-From: Alan Modra <amodra@gmail.com>
-Date: Thu, 23 Jun 2022 17:50:30 +0930
-Subject: [PATCH] PowerPC64: fix assertion in ppc_build_one_stub with -Os code
-
-save_res stubs aren't written in ppc_build_one_stub, their offsets
-(which are zero) should not be checked.
-
- * elf64-ppc.c (ppc_build_one_stub): Don't check save_res offsets.
-
-(cherry picked from commit 570e911f4e533fad33ad5e4e1102929cf7e80bd7)
----
- bfd/elf64-ppc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
-index cb12ed476d8..df503341fe9 100644
---- a/bfd/elf64-ppc.c
-+++ b/bfd/elf64-ppc.c
-@@ -11700,7 +11700,8 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
- if (htab == NULL)
- return false;
-
-- BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size);
-+ BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size
-+ || stub_entry->type.main == ppc_stub_save_res);
- loc = stub_entry->group->stub_sec->contents + stub_entry->stub_offset;
-
- htab->stub_count[stub_entry->type.main - 1] += 1;
---
-2.31.1
-
diff --git a/main/binutils/binutils-s390x-1.patch b/main/binutils/binutils-s390x-1.patch
deleted file mode 100644
index fab51a2fad..0000000000
--- a/main/binutils/binutils-s390x-1.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 82a5bb730a16f8c7962568030268e784b4fb42c8 Mon Sep 17 00:00:00 2001
-From: Stefan Liebler <stli@linux.ibm.com>
-Date: Thu, 28 Apr 2022 14:29:58 +0200
-Subject: [PATCH] s390: Avoid dynamic TLS relocs in PIE
-
-No dynamic relocs are needed for TLS defined in an executable, the
-TP relative offset is known at link time.
-
-Fixes
-FAIL: Build pr22263-1
-
-bfd/
- PR ld/22263
- * elf64-s390.c (elf_s390_tls_transition): Use bfd_link_dll
- instead of bfd_link_pic for TLS.
- (elf_s390_check_relocs): Likewise.
- (allocate_dynrelocs): Likewise.
- (elf_s390_relocate_section): Likewise.
-
-(cherry picked from commit 26b1426577b5dcb32d149c64cca3e603b81948a9)
----
- bfd/elf64-s390.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
-index e780efa7181..00ee386baab 100644
---- a/bfd/elf64-s390.c
-+++ b/bfd/elf64-s390.c
-@@ -774,7 +774,7 @@ elf_s390_tls_transition (struct bfd_link_info *info,
- int r_type,
- int is_local)
- {
-- if (bfd_link_pic (info))
-+ if (bfd_link_dll (info))
- return r_type;
-
- switch (r_type)
-@@ -1026,7 +1026,7 @@ elf_s390_check_relocs (bfd *abfd,
- case R_390_TLS_GOTIE20:
- case R_390_TLS_GOTIE64:
- case R_390_TLS_IEENT:
-- if (bfd_link_pic (info))
-+ if (bfd_link_dll (info))
- info->flags |= DF_STATIC_TLS;
- /* Fall through */
-
-@@ -1107,7 +1107,7 @@ elf_s390_check_relocs (bfd *abfd,
- if (r_type == R_390_TLS_LE64 && bfd_link_pie (info))
- break;
-
-- if (!bfd_link_pic (info))
-+ if (!bfd_link_dll (info))
- break;
- info->flags |= DF_STATIC_TLS;
- /* Fall through */
-@@ -1571,7 +1571,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h,
- to R_390_TLS_LE64 requiring no TLS entry. For GOTIE12 and IEENT
- we can save the dynamic TLS relocation. */
- if (h->got.refcount > 0
-- && !bfd_link_pic (info)
-+ && !bfd_link_dll (info)
- && h->dynindx == -1
- && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
- {
-@@ -2662,7 +2662,7 @@ elf_s390_relocate_section (bfd *output_bfd,
-
- /* Relocations for tls literal pool entries. */
- case R_390_TLS_IE64:
-- if (bfd_link_pic (info))
-+ if (bfd_link_dll (info))
- {
- Elf_Internal_Rela outrel;
- asection *sreloc;
-@@ -2690,7 +2690,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- else if (h != NULL)
- {
- tls_type = elf_s390_hash_entry(h)->tls_type;
-- if (!bfd_link_pic (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
-+ if (!bfd_link_dll (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
- r_type = R_390_TLS_LE64;
- }
- if (r_type == R_390_TLS_GD64 && tls_type >= GOT_TLS_IE)
-@@ -2801,14 +2801,14 @@ elf_s390_relocate_section (bfd *output_bfd,
- if (local_got_offsets == NULL)
- abort();
- off = local_got_offsets[r_symndx];
-- if (bfd_link_pic (info))
-+ if (bfd_link_dll (info))
- goto emit_tls_relocs;
- }
- else
- {
- off = h->got.offset;
- tls_type = elf_s390_hash_entry(h)->tls_type;
-- if (bfd_link_pic (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
-+ if (bfd_link_dll (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
- goto emit_tls_relocs;
- }
-
-@@ -2825,7 +2825,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- break;
-
- case R_390_TLS_LDM64:
-- if (! bfd_link_pic (info))
-+ if (! bfd_link_dll (info))
- /* The literal pool entry this relocation refers to gets ignored
- by the optimized code of the local exec model. Do nothing
- and the value will turn out zero. */
-@@ -2900,7 +2900,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- continue;
-
- case R_390_TLS_LDO64:
-- if (bfd_link_pic (info) || (input_section->flags & SEC_DEBUGGING))
-+ if (bfd_link_dll (info) || (input_section->flags & SEC_DEBUGGING))
- relocation -= dtpoff_base (info);
- else
- /* When converting LDO to LE, we must negate. */
-@@ -2922,7 +2922,7 @@ elf_s390_relocate_section (bfd *output_bfd,
-
- if (r_type == R_390_TLS_LOAD)
- {
-- if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+ if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- {
- /* IE->LE transition. Four valid cases:
- lg %rx,(0,%ry) -> sllg %rx,%ry,0
-@@ -2972,7 +2972,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- invalid_tls_insn (input_bfd, input_section, rel);
- return false;
- }
-- if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+ if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- {
- /* GD->LE transition.
- brasl %r14,__tls_get_addr@plt -> brcl 0,. */
-@@ -2991,7 +2991,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- }
- else if (r_type == R_390_TLS_LDCALL)
- {
-- if (!bfd_link_pic (info))
-+ if (!bfd_link_dll (info))
- {
- unsigned int insn0, insn1;
-
---
-2.27.0
-
diff --git a/main/binutils/binutils-s390x-2.patch b/main/binutils/binutils-s390x-2.patch
deleted file mode 100644
index 75d7a931a3..0000000000
--- a/main/binutils/binutils-s390x-2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 9a01457e02e7bb594ff9a9ac62a38c909e2e3083 Mon Sep 17 00:00:00 2001
-From: Stefan Liebler <stli@linux.ibm.com>
-Date: Thu, 28 Apr 2022 14:30:55 +0200
-Subject: [PATCH] s390: Add DT_JMPREL pointing to .rela.[i]plt with static-pie
-
-In static-pie case, there are IRELATIVE-relocs in
-.rela.iplt (htab->irelplt), which will later be grouped
-to .rela.plt. On s390, the IRELATIVE relocations are
-always located in .rela.iplt - even for non-static case.
-Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
-to the dynamic section even if htab->srelplt->size == 0.
-See _bfd_elf_add_dynamic_tags in bfd/elflink.c.
-
-bfd/
- elf64-s390.c (elf_s390_size_dynamic_sections):
- Enforce DT_JMPREL via htab->elf.dt_jmprel_required.
-
-(cherry picked from commit d942d8db12adf4c9e5c7d9ed6496a779ece7149e)
----
- bfd/elf64-s390.c | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
-index 00ee386baab..0b851f7ac0e 100644
---- a/bfd/elf64-s390.c
-+++ b/bfd/elf64-s390.c
-@@ -1876,7 +1876,20 @@ elf_s390_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
- else if (startswith (bfd_section_name (s), ".rela"))
- {
- if (s->size != 0 && s != htab->elf.srelplt)
-- relocs = true;
-+ {
-+ relocs = true;
-+ if (s == htab->elf.irelplt)
-+ {
-+ /* In static-pie case, there are IRELATIVE-relocs in
-+ .rela.iplt (htab->irelplt), which will later be grouped
-+ to .rela.plt. On s390, the IRELATIVE relocations are
-+ always located in .rela.iplt - even for non-static case.
-+ Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
-+ to the dynamic section even if htab->srelplt->size == 0.
-+ See _bfd_elf_add_dynamic_tags in bfd/elflink.c. */
-+ htab->elf.dt_jmprel_required = true;
-+ }
-+ }
-
- /* We use the reloc_count field as a counter if we need
- to copy relocs into the output file. */
---
-2.27.0
-
diff --git a/main/bison/APKBUILD b/main/bison/APKBUILD
index fab20a4ab1..fbd78f98e1 100644
--- a/main/bison/APKBUILD
+++ b/main/bison/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bison
-pkgver=3.7.6
+pkgver=3.8.2
pkgrel=0
pkgdesc="The GNU general-purpose parser generator"
arch="all"
@@ -21,6 +21,9 @@ subpackages="$pkgname-doc"
# - CVE-2020-24980
build() {
+ # work around temporary failure for armhf
+ CFLAGS="$CFLAGS -O2" \
+ CXXFLAGS="$CXXFLAGS -O2" \
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -41,4 +44,6 @@ package() {
rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
}
-sha512sums="6c1c9b825fbd2c94b8903f03a7e68e6832599f7bbd8d3c49864537c11b038c45a15de02fd36128d662af314334c83515bbc132df84e9acc6c651e98649c65bad bison-3.7.6.tar.xz"
+sha512sums="
+d4d23af6671406e97257892f90651b67f2ab95219831372be032190b7156c10a3435d457857e677445df8b2327aacccc15344acbbc3808a6f332a93cce23b444 bison-3.8.2.tar.xz
+"
diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD
index 43a6073005..559e1defde 100644
--- a/main/bluez/APKBUILD
+++ b/main/bluez/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bluez
-pkgver=5.64
-pkgrel=0
+pkgver=5.65
+pkgrel=1
pkgdesc="Tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
arch="all"
@@ -13,6 +13,7 @@ makedepends="dbus-dev libusb-compat-dev eudev-dev json-c-dev
libical-dev readline-dev glib-dev linux-headers
autoconf automake libtool ell-dev py3-docutils"
subpackages="
+ $pkgname-dbg
$pkgname-dev
$pkgname-doc
$pkgname-libs
@@ -187,7 +188,7 @@ openrc() {
}
sha512sums="
-f11f9974b29c5c6fce3890d7e42425c1cb02e42c1b8f49c5cc4b249234e67b64317d0e5e82721e2fbf1b53269c8569a9c869d59ce42b5e927f6622f0753e53cd bluez-5.64.tar.xz
+c20c09a1a75053c77d73b3ce15ac7fd321eb6df5ca1646d57c6848b87c0c9957908bc17dd928da4ef2aacfc8667877cbc7511c1ba43db839bfa9bf1fb8269907 bluez-5.65.tar.xz
e1d64fac673cceb657684b1bc5c36ff6d05f7cc5832d940863129adacd5b8ade1315b14df039a61f061950ac99e155266530efe2d2d35ea3c145b0469698a726 bluetooth.initd
8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd
a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd
diff --git a/main/boost1.78/APKBUILD b/main/boost1.78/APKBUILD
deleted file mode 100644
index bdb83372e5..0000000000
--- a/main/boost1.78/APKBUILD
+++ /dev/null
@@ -1,197 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=boost1.78
-pkgver=1.78.0
-_pkgver="${pkgver//./_}"
-pkgrel=2
-pkgdesc="Free peer-reviewed portable C++ source libraries"
-url="https://www.boost.org/"
-arch="all"
-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"
-subpackages="
- $pkgname-static
- $pkgname-dev
- $pkgname-doc
- "
-source="https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/boost_$_pkgver.tar.bz2
- boost-1.57.0-python-abi_letters.patch
- boost-1.57.0-python-libpython_dep.patch
- 0001-revert-cease-dependence-on-range.patch
- bjam-no-skip-install.patch
- boost-1.78.0-interprocess-musl-include.patch
- "
-builddir="$srcdir/boost_$_pkgver"
-
-_enginedir="tools/build/src/engine"
-_bjam="$builddir"/$_enginedir/b2
-
-_libs="
- atomic
- chrono
- container
- context
- contract
- coroutine
- date_time
- fiber
- filesystem
- graph
- iostreams
- locale
- log_setup
- log
- math
- prg_exec_monitor
- program_options
- python3
- random
- regex
- serialization
- stacktrace_basic
- stacktrace_noop
- system
- thread
- timer
- type_erasure
- unit_test_framework
- wave
- wserialization
- json
- nowide
- "
-for _lib in $_libs; do
- subpackages="$subpackages $pkgname-${_lib}:_boostlib"
-done; unset -v _lib
-subpackages="$subpackages $pkgname-libs"
-
-_set_options() {
- local _python="$(_pyversion python3)"
- export PY3_VERSION="$_python"
- export BOOST_ROOT="$builddir"
-
- _options="
- --user-config=\"$builddir/user-config.jam\"
- --prefix=\"$pkgdir/usr\"
- variant=release
- python=$PY3_VERSION
- toolset=gcc
- debug-symbols=off
- threading=multi
- runtime-link=shared
- link=shared,static
- cflags=-fno-strict-aliasing
- --layout=system
- -q
- -j${JOBS:-2}
- "
-}
-
-prepare() {
- default_prepare
- _set_options
-
- local abiflags="$(python3-config --abiflags)"
-
- # create user-config.jam
- cat > user-config.jam <<-__EOF__
-
- using gcc : : $CC : <cxxflags>"$CXXFLAGS" <linkflags>"$LDFLAGS" ;
- using python : $PY3_VERSION : /usr/bin/python3 : /usr/include/python${PY3_VERSION}$abiflags : : : : $abiflags ;
-
- __EOF__
-}
-
-build() {
- _set_options
-
- msg "Building bjam"
- cd "$builddir"/$_enginedir
- CC= ./build.sh gcc
-
- msg "Building bcp"
- cd "$builddir"/tools/bcp
- "$_bjam" -j${JOBS:-2}
-
- msg "Building boost"
- cd "$builddir"
-
- "$_bjam" $_options
-}
-
-check() {
- cd "$builddir"/tools/build/test
-
- PATH="${_bjam%/*}:$PATH" python3 test_all.py --default-bjam
-}
-
-package() {
- _set_options
-
- install -Dm755 "$_bjam" \
- "$pkgdir"/usr/bin/b2
- ln -s b2 "$pkgdir"/usr/bin/bjam # old name for b2 binary
-
- install -Dm755 dist/bin/bcp "$pkgdir"/usr/bin/bcp
-
- install -Dm644 LICENSE_1_0.txt \
- "$pkgdir"/usr/share/licenses/$pkgname/LICENSE_1_0.txt
-
- "$pkgdir"/usr/bin/bjam $_options \
- --includedir="$pkgdir"/usr/include \
- --libdir="$pkgdir"/usr/lib \
- install
-}
-
-static() {
- pkgdesc="Boost static libraries"
- depends="$depends_static"
-
- amove usr/lib/lib*.a
-}
-
-_boostlib() {
- local name="${subpkgname#$pkgname-}"
- pkgdesc="Boost $name shared library"
- depends="$depends__boostlib"
-
- amove usr/lib/libboost_$name*.so.[0-9]*
-}
-
-libs() {
- default_libs
-
- pkgdesc="Boost shared libraries"
- depends="$depends_libs"
- local _pkg; for _pkg in $origsubpackages; do
- case "$_pkg" in
- *:_boostlib) depends="$depends ${_pkg%%:*}" ;;
- esac
- done
-
- mkdir -p "$subpkgdir"
- rmdir "$pkgdir"/usr/lib >/dev/null 2>&1 || :
-}
-
-dev() {
- default_dev
- replaces="boost1.77-dev"
-}
-
-doc() {
- default_doc
-}
-
-_pyversion() {
- "$1" -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))'
-}
-
-sha512sums="
-9c34a387a203b99aa773eb0c59f5abac7a99ba10e4623653e793c1d5b29b99b88e0e4e0d4e2e4ca5d497c42f2e46e23bab66417722433a457dc818d7670bcbbf boost_1_78_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
-3e6679ce66b5fb5e89ba9500c7fdc94f0f7ede0c821cd89d488a618ecd7e6f2edd80b4a1928402a569f6e33fdefbd709bd16868b3d703a070c6117a65ac4761c bjam-no-skip-install.patch
-18d3944abd74a8f3b4dc53f39f47b4138a03b50f49f7a2cb7ccc49528d9a6c547d29b5589c620e02e0a6080c417fb33cd2b4d5a67644815d520091463771ed87 boost-1.78.0-interprocess-musl-include.patch
-"
diff --git a/main/boost1.78/bjam-no-skip-install.patch b/main/boost1.78/bjam-no-skip-install.patch
deleted file mode 100644
index bf63081f52..0000000000
--- a/main/boost1.78/bjam-no-skip-install.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Patch-Source: https://github.com/bfgroup/b2/commit/78fd284a42caabe8815cb0870b46e5567872e75b
-From 78fd284a42caabe8815cb0870b46e5567872e75b Mon Sep 17 00:00:00 2001
-From: Dmitry <grisumbras@gmail.com>
-Date: Sat, 11 Dec 2021 16:58:23 +0300
-Subject: [PATCH] Don't skip install targets if there's <build>no in ureqs
- (#113)
-
----
- src/tools/stage.jam | 4 ++++
- test/install_build_no.py | 26 ++++++++++++++++++++++++++
- test/test_all.py | 1 +
- 3 files changed, 31 insertions(+)
- create mode 100755 test/install_build_no.py
-
-diff --git a/src/tools/stage.jam b/src/tools/stage.jam
-index c5f02e3ba4..325129dc81 100644
---- a/tools/build/src/tools/stage.jam
-+++ b/tools/build/src/tools/stage.jam
-@@ -478,6 +478,10 @@ class install-target-class : basic-target
- return [ sequence.unique $(result2) ] ;
- }
-
-+ rule skip-from-usage-requirements ( )
-+ {
-+ }
-+
- # Returns true iff 'type' is subtype of some element of 'types-to-include'.
- #
- local rule include-type ( type : types-to-include * )
-diff --git a/test/install_build_no.py b/test/install_build_no.py
-new file mode 100755
-index 0000000000..0ccf3c5cc6
---- /dev/null
-+++ b/tools/build/test/install_build_no.py
-@@ -0,0 +1,26 @@
-+#!/usr/bin/python
-+
-+# Copyright 2021 Dmitry Arkhipov (grisumbras@gmail.com)
-+# Distributed under the Boost Software License, Version 1.0.
-+# (See accompanying file LICENSE.txt or https://www.bfgroup.xyz/b2/LICENSE.txt)
-+
-+# Check that <build>no in usage-requirements of dependencies does not affect
-+# install rule, i.e. a skipped installed target does not affect insallation of
-+# other targets.
-+
-+import BoostBuild
-+
-+t = BoostBuild.Tester()
-+
-+t.write("a.cpp", "int main() {}\n")
-+
-+t.write("jamroot.jam", """
-+make x : : maker : <build>no ;
-+exe a : a.cpp ;
-+install install : x a ;
-+""")
-+
-+t.run_build_system()
-+t.expect_addition("install/a.exe")
-+
-+t.cleanup()
-diff --git a/test/test_all.py b/test/test_all.py
-index b7ef5ad701..9ed729d017 100644
---- a/tools/build/test/test_all.py
-+++ b/tools/build/test/test_all.py
-@@ -250,6 +250,7 @@ def reorder_tests(tests, first_test):
- "inherit_toolset",
- "inherited_dependency",
- "inline",
-+ "install_build_no",
- "libjpeg",
- "liblzma",
- "libpng",
diff --git a/main/boost1.78/boost-1.78.0-interprocess-musl-include.patch b/main/boost1.78/boost-1.78.0-interprocess-musl-include.patch
deleted file mode 100644
index 5a6f8a97c5..0000000000
--- a/main/boost1.78/boost-1.78.0-interprocess-musl-include.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Patch-Source: https://github.com/boostorg/interprocess/commit/d002a0d929ecb031843d806c2bda69e013442e13
-From: Leonardo Neumann <leonardo@neumann.dev.br>
-Date: Mon, 13 Dec 2021 01:07:20 -0300
-Subject: [PATCH] Fix missing sys/stat.h include on musl-based systems
-
-Boost 1.78.0 fails to build on musl-based systems because musl does
-not include sys/stat.h by default.
-
-Fixes #161 ("Boost compiler error")
---- a/boost/interprocess/permissions.hpp
-+++ b/boost/interprocess/permissions.hpp
-@@ -29,6 +29,10 @@
-
- #include <boost/interprocess/detail/win32_api.hpp>
-
-+#else
-+
-+#include <sys/stat.h>
-+
- #endif
-
- #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
-
diff --git a/main/boost1.79/0001-revert-cease-dependence-on-range.patch b/main/boost1.79/0001-revert-cease-dependence-on-range.patch
deleted file mode 100644
index a6002074ab..0000000000
--- a/main/boost1.79/0001-revert-cease-dependence-on-range.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001
-From: Oliver Kowalke <oliver.kowalke@gmail.com>
-Date: Sun, 1 Dec 2019 20:40:28 +0100
-Subject: [PATCH] Revert "Cease dependence on Range"
-
-This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db.
-
-see #44 (One test fails to compile after boostorg/coroutine submodule updated)
----
- boost/coroutine/asymmetric_coroutine.hpp | 12 +++---------
- 1 file changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp
-index ea96981..640896f 100644
---- a/boost/coroutine/asymmetric_coroutine.hpp
-+++ b/boost/coroutine/asymmetric_coroutine.hpp
-@@ -14,6 +14,7 @@
- #include <boost/assert.hpp>
- #include <boost/config.hpp>
- #include <boost/move/move.hpp>
-+#include <boost/range.hpp>
- #include <boost/throw_exception.hpp>
- #include <boost/utility/explicit_operator_bool.hpp>
-
-@@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c)
-
- }
-
--// forward declaration of Boost.Range traits to break dependency on it
--template<typename C, typename Enabler>
--struct range_mutable_iterator;
--
--template<typename C, typename Enabler>
--struct range_const_iterator;
--
- template< typename Arg >
--struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void >
-+struct range_mutable_iterator< coroutines::push_coroutine< Arg > >
- { typedef typename coroutines::push_coroutine< Arg >::iterator type; };
-
- template< typename R >
--struct range_mutable_iterator< coroutines::pull_coroutine< R >, void >
-+struct range_mutable_iterator< coroutines::pull_coroutine< R > >
- { typedef typename coroutines::pull_coroutine< R >::iterator type; };
-
- }
---
-2.24.1
-
diff --git a/main/boost1.79/boost-1.57.0-python-abi_letters.patch b/main/boost1.79/boost-1.57.0-python-abi_letters.patch
deleted file mode 100644
index 7df3ee7047..0000000000
--- a/main/boost1.79/boost-1.57.0-python-abi_letters.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- boost_1_57_0/tools/build/src/tools/python.jam 2013-05-21 06:14:18.000000000 +0200
-+++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413877 +0200
-@@ -94,7 +94,7 @@ feature.feature pythonpath : : free opti
- # using python : 2.3 : /usr/local/bin/python ;
- #
- rule init ( version ? : cmd-or-prefix ? : includes * : libraries ?
-- : condition * : extension-suffix ? )
-+ : condition * : extension-suffix ? : abi-letters ? )
- {
- project.push-current $(.project) ;
-
-@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ?
- }
- }
-
-- configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) ;
-+ configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) : $(abi-letters) ;
-
- project.pop-current ;
- }
-@@ -653,7 +653,7 @@ local rule system-library-dependencies (
-
- # Declare a target to represent Python's library.
- #
--local rule declare-libpython-target ( version ? : requirements * )
-+local rule declare-libpython-target ( version ? : requirements * : abi-letters ? )
- {
- # Compute the representation of Python version in the name of Python's
- # library file.
-@@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve
- }
-
- # Declare it.
-- lib python.lib : : <name>python$(lib-version) $(requirements) ;
-+ lib python.lib : : <name>python$(lib-version)$(abi-letters) $(requirements) ;
- }
-
-
- # Implementation of init.
- local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
-- condition * : extension-suffix ? )
-+ condition * : extension-suffix ? : abi-letters ? )
- {
- local prefix ;
- local exec-prefix ;
-@@ -699,6 +699,7 @@ local rule configure ( version ? : cmd-o
- extension-suffix ?= _d ;
- }
- extension-suffix ?= "" ;
-+ abi-letters ?= "" ;
-
- # Normalize and dissect any version number.
- local major-minor ;
-@@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o
- }
- else
- {
-- declare-libpython-target $(version) : $(target-requirements) ;
-+ declare-libpython-target $(version) : $(target-requirements) : $(abi-letters) ;
-
- # This is an evil hack. On, Windows, when Python is embedded, nothing
- # seems to set up sys.path to include Python's standard library
diff --git a/main/boost1.79/boost-1.57.0-python-libpython_dep.patch b/main/boost1.79/boost-1.57.0-python-libpython_dep.patch
deleted file mode 100644
index 57bfc26774..0000000000
--- a/main/boost1.79/boost-1.57.0-python-libpython_dep.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: boost_1_57_0/tools/build/src/tools/python.jam
-===================================================================
---- boost_1_57_0/tools/build/src/tools/python.jam (revision 50406)
-+++ boost_1_57_0/tools/build/src/tools/python.jam (working copy)
-@@ -994,7 +994,7 @@
- else
- {
- alias python_for_extensions
-- :
-+ : python
- : $(target-requirements)
- :
- : $(usage-requirements)
diff --git a/main/boost1.79/boost-1.79.0-fix-segfault-in-array-erase.patch b/main/boost1.79/boost-1.79.0-fix-segfault-in-array-erase.patch
deleted file mode 100644
index f853bc25dd..0000000000
--- a/main/boost1.79/boost-1.79.0-fix-segfault-in-array-erase.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Patch-Source: https://www.boost.org/users/history/version_1_79_0.html , known-issues
-diff -ur boost_1_79_0/boost/json/impl/array.ipp boost_1_79_0/boost/json/impl/array.ipp
---- boost_1_79_0/boost/json/impl/array.ipp 2022-04-06 17:02:43.000000000 -0400
-+++ boost_1_79_0/boost/json/impl/array.ipp 2022-04-13 20:55:20.464359478 -0400
-@@ -491,8 +491,11 @@
- auto const p = &(*t_)[0] +
- (pos - &(*t_)[0]);
- destroy(p, p + 1);
-- relocate(p, p + 1, 1);
- --t_->size;
-+ if(t_->size > 0)
-+ relocate(p, p + 1,
-+ t_->size - (p -
-+ &(*t_)[0]));
- return p;
- }
-
-diff -ur boost_1_79_0/libs/json/test/array.cpp boost_1_79_0/libs/json/test/array.cpp
---- boost_1_79_0/libs/json/test/array.cpp 2022-04-06 17:02:43.000000000 -0400
-+++ boost_1_79_0/libs/json/test/array.cpp 2022-04-13 20:53:32.671782680 -0400
-@@ -1270,6 +1270,21 @@
- }
-
- void
-+ testIssue692()
-+ {
-+ array a;
-+ object obj;
-+ obj["test1"] = "hello";
-+ a.push_back(obj);
-+ a.push_back(obj);
-+ a.push_back(obj);
-+ a.push_back(obj);
-+ a.push_back(obj);
-+ while(a.size())
-+ a.erase(a.begin());
-+ }
-+
-+ void
- run()
- {
- testDestroy();
-@@ -1283,6 +1298,7 @@
- testExceptions();
- testEquality();
- testHash();
-+ testIssue692();
- }
- };
-
diff --git a/main/boost1.78/0001-revert-cease-dependence-on-range.patch b/main/boost1.80/0001-revert-cease-dependence-on-range.patch
index a6002074ab..a6002074ab 100644
--- a/main/boost1.78/0001-revert-cease-dependence-on-range.patch
+++ b/main/boost1.80/0001-revert-cease-dependence-on-range.patch
diff --git a/main/boost1.79/APKBUILD b/main/boost1.80/APKBUILD
index 2292013a42..6e1e43aec3 100644
--- a/main/boost1.79/APKBUILD
+++ b/main/boost1.80/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=boost1.79
-pkgver=1.79.0
+pkgname=boost1.80
+pkgver=1.80.0
_pkgver="${pkgver//./_}"
-pkgrel=1
+pkgrel=2
pkgdesc="Free peer-reviewed portable C++ source libraries"
url="https://www.boost.org/"
arch="all"
@@ -17,10 +17,13 @@ subpackages="
boost-dev:_dev
"
source="https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/boost_$_pkgver.tar.bz2
+ aligned-alloc.patch
boost-1.57.0-python-abi_letters.patch
boost-1.57.0-python-libpython_dep.patch
0001-revert-cease-dependence-on-range.patch
- boost-1.79.0-fix-segfault-in-array-erase.patch
+ boost-1.80-filesystem-win-fix-dir-it-net-share.patch
+ boost-1.80-filesystem-fix-weakly-canonical-long-paths.patch
+ boost-1.80-boost-unordered.patch
"
builddir="$srcdir/boost_$_pkgver"
@@ -69,7 +72,7 @@ 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 boost1.78"
+replaces="boost boost1.79"
_set_options() {
local _python="$(_pyversion python3)"
@@ -199,7 +202,7 @@ dev() {
# boost to a new version. Replace previous boost version for clean -dev
# upgrade
default_dev
- replaces="boost1.78-dev"
+ replaces="boost1.79-dev"
}
_dev() {
@@ -222,9 +225,12 @@ _pyversion() {
}
sha512sums="
-70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312 boost_1_79_0.tar.bz2
+829a95b463473d69ff79ea41799c68429bb79d3b2321fbdb71df079af237ab01de9ad7e9612d8783d925730acada010068d2d1aa856c34244ee5c0ece16f208f boost_1_80_0.tar.bz2
+6254b4cc92d091aef9e8fdea375c0779f47bc3ea7965f6d93cab8bf76d2a502d9593d860228d2313ea133ee4f7935c4813d39df4bcb29bdf380628474ce4dcd6 aligned-alloc.patch
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
-17db69e7b41665b2fae5630aa5edf15f0b8d00aa04e8597b198eb4f530793e8227d0234ceb9c8a9859fac3a4ceb5b9eb51721329b91497a422d4ff579739b964 boost-1.79.0-fix-segfault-in-array-erase.patch
+bfc055c63191379b6db91a5c862cea3ce9e0856d6b8efdb31869a4b684a30319880f7033cd90f9c5493d9fd69765e62f858a0710e1cf5364777061d6eace1f78 boost-1.80-filesystem-win-fix-dir-it-net-share.patch
+0fe46226870bede3bd5a90a137e6ea406d217aa7de0582e6b08223bd0634b3640b93dfd6f7f6054f25edd42d815f313c20268e8f10fd3d520a287ac90b27d789 boost-1.80-filesystem-fix-weakly-canonical-long-paths.patch
+a8184bb2301f63ee918b5f392890ecf1af13d9b5e0eb35e431e7d7bef40a6fb505f9f2bf718239f8446fb096bf97fbf21b94cd2ed3c0eb44c4394450c2dae2de boost-1.80-boost-unordered.patch
"
diff --git a/main/boost1.80/aligned-alloc.patch b/main/boost1.80/aligned-alloc.patch
new file mode 100644
index 0000000000..8d168ee6bd
--- /dev/null
+++ b/main/boost1.80/aligned-alloc.patch
@@ -0,0 +1,28 @@
+Patch-Source: https://github.com/chimera-linux/cports/blob/1dd1fed225a0b65b5164bc5168194f85deea3b19/main/boost1.80/patches/aligned_alloc.patch
+commit 98ca73bfe3f574ba72232013919885bdae679e09
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Fri Sep 23 03:55:45 2022 +0200
+
+ use posix as a fallback for aligned_alloc
+
+ Testing for feature test macros is a broken antipattern, and
+ fucks up in ugly ways under musl. Since we don't really care
+ for having a non-POSIX fallback, always use the POSIX code
+ unless forced.
+
+diff --git a/boost/align/aligned_alloc.hpp b/boost/align/aligned_alloc.hpp
+index 1d81a13..f2b5137 100644
+--- a/boost/align/aligned_alloc.hpp
++++ b/boost/align/aligned_alloc.hpp
+@@ -38,10 +38,8 @@ Distributed under the Boost Software License, Version 1.0.
+ #include <boost/align/detail/aligned_alloc_posix.hpp>
+ #elif defined(sun) || defined(__sun)
+ #include <boost/align/detail/aligned_alloc_sunos.hpp>
+-#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
+-#include <boost/align/detail/aligned_alloc_posix.hpp>
+ #else
+-#include <boost/align/detail/aligned_alloc.hpp>
++#include <boost/align/detail/aligned_alloc_posix.hpp>
+ #endif
+
+ #endif
diff --git a/main/boost1.78/boost-1.57.0-python-abi_letters.patch b/main/boost1.80/boost-1.57.0-python-abi_letters.patch
index 7df3ee7047..7df3ee7047 100644
--- a/main/boost1.78/boost-1.57.0-python-abi_letters.patch
+++ b/main/boost1.80/boost-1.57.0-python-abi_letters.patch
diff --git a/main/boost1.78/boost-1.57.0-python-libpython_dep.patch b/main/boost1.80/boost-1.57.0-python-libpython_dep.patch
index 57bfc26774..57bfc26774 100644
--- a/main/boost1.78/boost-1.57.0-python-libpython_dep.patch
+++ b/main/boost1.80/boost-1.57.0-python-libpython_dep.patch
diff --git a/main/boost1.80/boost-1.80-boost-unordered.patch b/main/boost1.80/boost-1.80-boost-unordered.patch
new file mode 100644
index 0000000000..da065fc627
--- /dev/null
+++ b/main/boost1.80/boost-1.80-boost-unordered.patch
@@ -0,0 +1,175 @@
+diff -urN boost_1_80_0/boost/unordered/detail/fca.hpp boost_1_80_1/boost/unordered/detail/fca.hpp
+--- boost_1_80_0/boost/unordered/detail/fca.hpp 2022-08-03 22:47:16.000000000 -0400
++++ boost_1_80_1/boost/unordered/detail/fca.hpp 2022-08-24 19:44:43.139787681 -0400
+@@ -646,7 +646,7 @@
+
+ size_type bucket_count() const { return size_; }
+
+- iterator begin() const { return ++at(size_); }
++ iterator begin() const { return size_ == 0 ? end() : ++at(size_); }
+
+ iterator end() const
+ {
+@@ -660,6 +660,10 @@
+
+ local_iterator begin(size_type n) const
+ {
++ if (size_ == 0) {
++ return this->end(n);
++ }
++
+ return local_iterator(
+ (buckets + static_cast<difference_type>(n))->next);
+ }
+@@ -670,12 +674,16 @@
+
+ iterator at(size_type n) const
+ {
+- std::size_t const N = group::N;
++ if (size_ > 0) {
++ std::size_t const N = group::N;
+
+- iterator pbg(buckets + static_cast<difference_type>(n),
+- groups + static_cast<difference_type>(n / N));
++ iterator pbg(buckets + static_cast<difference_type>(n),
++ groups + static_cast<difference_type>(n / N));
+
+- return pbg;
++ return pbg;
++ } else {
++ return this->end();
++ }
+ }
+
+ span<Bucket> raw()
+diff -urN boost_1_80_0/boost/unordered/detail/implementation.hpp boost_1_80_1/boost/unordered/detail/implementation.hpp
+--- boost_1_80_0/boost/unordered/detail/implementation.hpp 2022-08-03 22:47:16.000000000 -0400
++++ boost_1_80_1/boost/unordered/detail/implementation.hpp 2022-08-24 19:44:43.139787681 -0400
+@@ -2054,12 +2054,14 @@
+
+ std::size_t bucket_size(std::size_t index) const
+ {
+- bucket_iterator itb = buckets_.at(index);
+- node_pointer n = itb->next;
+ std::size_t count = 0;
+- while (n) {
+- ++count;
+- n = n->next;
++ if (size_ > 0) {
++ bucket_iterator itb = buckets_.at(index);
++ node_pointer n = itb->next;
++ while (n) {
++ ++count;
++ n = n->next;
++ }
+ }
+ return count;
+ }
+@@ -2420,11 +2422,14 @@
+ node_pointer find_node_impl(
+ Key const& x, bucket_iterator itb) const
+ {
+- key_equal const& pred = this->key_eq();
+- node_pointer p = itb->next;
+- for (; p; p = p->next) {
+- if (pred(x, extractor::extract(p->value()))) {
+- break;
++ node_pointer p = node_pointer();
++ if (itb != buckets_.end()) {
++ key_equal const& pred = this->key_eq();
++ p = itb->next;
++ for (; p; p = p->next) {
++ if (pred(x, extractor::extract(p->value()))) {
++ break;
++ }
+ }
+ }
+ return p;
+@@ -2453,11 +2458,13 @@
+ inline iterator transparent_find(
+ Key const& k, Hash const& h, Pred const& pred) const
+ {
+- std::size_t const key_hash = h(k);
+- bucket_iterator itb = buckets_.at(buckets_.position(key_hash));
+- for (node_pointer p = itb->next; p; p = p->next) {
+- if (BOOST_LIKELY(pred(k, extractor::extract(p->value())))) {
+- return iterator(p, itb);
++ if (size_ > 0) {
++ std::size_t const key_hash = h(k);
++ bucket_iterator itb = buckets_.at(buckets_.position(key_hash));
++ for (node_pointer p = itb->next; p; p = p->next) {
++ if (BOOST_LIKELY(pred(k, extractor::extract(p->value())))) {
++ return iterator(p, itb);
++ }
+ }
+ }
+
+@@ -2467,11 +2474,13 @@
+ template <class Key>
+ node_pointer* find_prev(Key const& key, bucket_iterator itb)
+ {
+- key_equal pred = this->key_eq();
+- for (node_pointer* pp = boost::addressof(itb->next); *pp;
+- pp = boost::addressof((*pp)->next)) {
+- if (pred(key, extractor::extract((*pp)->value()))) {
+- return pp;
++ if (size_ > 0) {
++ key_equal pred = this->key_eq();
++ for (node_pointer* pp = boost::addressof(itb->next); *pp;
++ pp = boost::addressof((*pp)->next)) {
++ if (pred(key, extractor::extract((*pp)->value()))) {
++ return pp;
++ }
+ }
+ }
+ typedef node_pointer* node_pointer_pointer;
+diff -urN boost_1_80_0/boost/unordered/unordered_map.hpp boost_1_80_1/boost/unordered/unordered_map.hpp
+--- boost_1_80_0/boost/unordered/unordered_map.hpp 2022-08-03 22:47:16.000000000 -0400
++++ boost_1_80_1/boost/unordered/unordered_map.hpp 2022-08-24 19:44:43.139787681 -0400
+@@ -2069,6 +2069,10 @@
+ template <class K, class T, class H, class P, class A>
+ float unordered_map<K, T, H, P, A>::load_factor() const BOOST_NOEXCEPT
+ {
++ if (table_.size_ == 0) {
++ return 0.0f;
++ }
++
+ BOOST_ASSERT(table_.bucket_count() != 0);
+ return static_cast<float>(table_.size_) /
+ static_cast<float>(table_.bucket_count());
+@@ -2506,6 +2510,10 @@
+ template <class K, class T, class H, class P, class A>
+ float unordered_multimap<K, T, H, P, A>::load_factor() const BOOST_NOEXCEPT
+ {
++ if (table_.size_ == 0) {
++ return 0.0f;
++ }
++
+ BOOST_ASSERT(table_.bucket_count() != 0);
+ return static_cast<float>(table_.size_) /
+ static_cast<float>(table_.bucket_count());
+diff -urN boost_1_80_0/boost/unordered/unordered_set.hpp boost_1_80_1/boost/unordered/unordered_set.hpp
+--- boost_1_80_0/boost/unordered/unordered_set.hpp 2022-08-03 22:47:16.000000000 -0400
++++ boost_1_80_1/boost/unordered/unordered_set.hpp 2022-08-24 19:44:43.139787681 -0400
+@@ -1586,6 +1586,10 @@
+ template <class T, class H, class P, class A>
+ float unordered_set<T, H, P, A>::load_factor() const BOOST_NOEXCEPT
+ {
++ if (table_.size_ == 0) {
++ return 0.0f;
++ }
++
+ BOOST_ASSERT(table_.bucket_count() != 0);
+ return static_cast<float>(table_.size_) /
+ static_cast<float>(table_.bucket_count());
+@@ -1986,6 +1990,10 @@
+ template <class T, class H, class P, class A>
+ float unordered_multiset<T, H, P, A>::load_factor() const BOOST_NOEXCEPT
+ {
++ if (table_.size_ == 0) {
++ return 0.0f;
++ }
++
+ BOOST_ASSERT(table_.bucket_count() != 0);
+ return static_cast<float>(table_.size_) /
+ static_cast<float>(table_.bucket_count());
diff --git a/main/boost1.80/boost-1.80-filesystem-fix-weakly-canonical-long-paths.patch b/main/boost1.80/boost-1.80-filesystem-fix-weakly-canonical-long-paths.patch
new file mode 100644
index 0000000000..9312059a60
--- /dev/null
+++ b/main/boost1.80/boost-1.80-filesystem-fix-weakly-canonical-long-paths.patch
@@ -0,0 +1,171 @@
+commit 476ca7b6c1d37a5d796f8525813a9a64c9e54ffc
+Author: Andrey Semashev <andrey.semashev@gmail.com>
+Date: Wed Aug 10 04:57:21 2022 +0300
+
+ Fix weakly_canonical on Windows with long paths prefix.
+
+ During its operation, weakly_canonical would call status() on the path
+ consisting only from the root name of the input path. This would fail
+ with ERROR_INVALID_FUNCTION if the root name starts with the "\\?\" prefix,
+ as the root name path is not absolute.
+
+ To fix this, we don't check the status of the root name path (which is
+ not the correct check anyways as it tests the current directory on the
+ corresponding drive for existence, which is not what we want). Additionally,
+ avoid calling status() on the paths containing dot and dot-dot elements
+ during the weakly_canonical execution for the same reason - the "\\?\"
+ prefix disables most of the path processing in Windows APIs, including
+ dot and dot-dot elements resolution.
+
+ Fixes https://github.com/boostorg/filesystem/issues/247.
+
+diff --git a/libs/filesystem/src/operations.cpp b/libs/filesystem/src/operations.cpp
+index dd636e9..ca2fff3 100644
+--- a/libs/filesystem/src/operations.cpp
++++ b/libs/filesystem/src/operations.cpp
+@@ -4434,7 +4434,7 @@ path weakly_canonical(path const& p, path const& base, system::error_code* ec)
+ path head(p);
+ for (; !head.empty(); --itr)
+ {
+- file_status head_status = detail::status_impl(head, &local_ec);
++ file_status head_status(detail::status_impl(head, &local_ec));
+ if (BOOST_UNLIKELY(head_status.type() == fs::status_error))
+ {
+ if (!ec)
+@@ -4450,32 +4450,83 @@ path weakly_canonical(path const& p, path const& base, system::error_code* ec)
+ head.remove_filename();
+ }
+
++ if (head.empty())
++ return p.lexically_normal();
++
++ path const& dot_p = dot_path();
++ path const& dot_dot_p = dot_dot_path();
++
+ #else
+
+- // On Windows, filesystem APIs such as GetFileAttributesW perform lexical path normalization internally.
+- // As a result, a path like "c:\a\.." can be reported as present even if "c:\a" is not. This would break
+- // canonical, as symlink_status that it calls internally would report an error that the file at the intermediate
+- // path does not exist. To avoid this, scan the initial path in the forward direction.
+- // Also, operate on paths with preferred separators. This can be important on Windows since GetFileAttributesW,
+- // which is called in status() may return "file not found" for paths to network shares and mounted cloud
+- // storages that have forward slashes as separators.
++ // On Windows, filesystem APIs such as GetFileAttributesW and CreateFileW perform lexical path normalization
++ // internally. As a result, a path like "c:\a\.." can be reported as present even if "c:\a" is not. This would
++ // break canonical, as symlink_status that it calls internally would report an error that the file at the
++ // intermediate path does not exist. To avoid this, scan the initial path in the forward direction.
++ // Also, operate on paths with preferred separators. This can be important on Windows since GetFileAttributesW
++ // or CreateFileW, which is called in status() may return "file not found" for paths to network shares and
++ // mounted cloud storages that have forward slashes as separators.
++ // Also, avoid querying status of the root name such as \\?\c: as CreateFileW returns ERROR_INVALID_FUNCTION for
++ // such path. Querying the status of a root name such as c: is also not right as this path refers to the current
++ // directory on drive C:, which is not what we want to test for existence anyway.
+ path::iterator itr(p.begin());
+ path head;
+- for (; itr != p_end; ++itr)
++ if (p.has_root_name())
+ {
+- path const& p_elem = *itr;
+- if (p_elem.size() == 1u && detail::is_directory_separator(p_elem.native()[0]))
++ BOOST_ASSERT(itr != p_end);
++ head = *itr;
++ ++itr;
++ }
++
++ if (p.has_root_directory())
++ {
++ BOOST_ASSERT(itr != p_end);
++ // Convert generic separator returned by the iterator for the root directory to
++ // the preferred separator.
++ head += path::preferred_separator;
++ ++itr;
++ }
++
++ if (!head.empty())
++ {
++ file_status head_status(detail::status_impl(head, &local_ec));
++ if (BOOST_UNLIKELY(head_status.type() == fs::status_error))
+ {
+- // Convert generic separator returned by the iterator for the root directory to
+- // the preferred separator.
+- head += path::preferred_separator;
++ if (!ec)
++ BOOST_FILESYSTEM_THROW(filesystem_error("boost::filesystem::weakly_canonical", head, local_ec));
++
++ *ec = local_ec;
++ return path();
+ }
+- else
++
++ if (head_status.type() == fs::file_not_found)
++ {
++ // If the root path does not exist then no path element exists
++ return p.lexically_normal();
++ }
++ }
++
++ path const& dot_p = dot_path();
++ path const& dot_dot_p = dot_dot_path();
++ for (; itr != p_end; ++itr)
++ {
++ path const& p_elem = *itr;
++
++ // Avoid querying status of paths containing dot and dot-dot elements, as this will break
++ // if the root name starts with "\\?\".
++ if (p_elem == dot_p)
++ continue;
++
++ if (p_elem == dot_dot_p)
+ {
+- head /= p_elem;
++ if (head.has_relative_path())
++ head.remove_filename();
++
++ continue;
+ }
+
+- file_status head_status = detail::status_impl(head, &local_ec);
++ head /= p_elem;
++
++ file_status head_status(detail::status_impl(head, &local_ec));
+ if (BOOST_UNLIKELY(head_status.type() == fs::status_error))
+ {
+ if (!ec)
+@@ -4492,33 +4543,22 @@ path weakly_canonical(path const& p, path const& base, system::error_code* ec)
+ }
+ }
+
++ if (head.empty())
++ return p.lexically_normal();
++
+ #endif
+
+- path const& dot_p = dot_path();
+- path const& dot_dot_p = dot_dot_path();
+ path tail;
+ bool tail_has_dots = false;
+ for (; itr != p_end; ++itr)
+ {
+ path const& tail_elem = *itr;
+-#if defined(BOOST_WINDOWS_API)
+- if (tail_elem.size() == 1u && detail::is_directory_separator(tail_elem.native()[0]))
+- {
+- // Convert generic separator returned by the iterator for the root directory to
+- // the preferred separator.
+- tail += path::preferred_separator;
+- continue;
+- }
+-#endif
+ tail /= tail_elem;
+ // for a later optimization, track if any dot or dot-dot elements are present
+ if (!tail_has_dots && (tail_elem == dot_p || tail_elem == dot_dot_p))
+ tail_has_dots = true;
+ }
+
+- if (head.empty())
+- return p.lexically_normal();
+-
+ head = detail::canonical(head, base, &local_ec);
+ if (BOOST_UNLIKELY(!!local_ec))
+ {
diff --git a/main/boost1.80/boost-1.80-filesystem-win-fix-dir-it-net-share.patch b/main/boost1.80/boost-1.80-filesystem-win-fix-dir-it-net-share.patch
new file mode 100644
index 0000000000..0d28b86bb6
--- /dev/null
+++ b/main/boost1.80/boost-1.80-filesystem-win-fix-dir-it-net-share.patch
@@ -0,0 +1,31 @@
+commit 9c9d127bddc2b72187c57f4933c49666255d7a4f
+Author: Olavo Belloc <obelloc@think-cell.com>
+Date: Mon Aug 8 10:54:02 2022 +0200
+
+ Limit the buffer size for compatibility with previous versions of Windows
+
+ The reported error was reproduced on Windows 7 and 8.1, but not on an early
+ version of Windows 10 (2004).
+
+ Closes https://github.com/boostorg/filesystem/pull/246.
+ Likely fixes https://github.com/boostorg/filesystem/issues/245.
+
+diff --git a/libs/filesystem/src/directory.cpp b/libs/filesystem/src/directory.cpp
+index 6a3e1dc..9334893 100644
+--- a/libs/filesystem/src/directory.cpp
++++ b/libs/filesystem/src/directory.cpp
+@@ -599,9 +599,12 @@ extra_data_format g_extra_data_format = file_directory_information_format;
+ * \brief Extra buffer size for GetFileInformationByHandleEx-based or NtQueryDirectoryFile-based directory iterator.
+ *
+ * Must be large enough to accommodate at least one FILE_DIRECTORY_INFORMATION or *_DIR_INFO struct and one filename.
+- * NTFS, VFAT, exFAT support filenames up to 255 UTF-16/UCS-2 characters. ReFS supports filenames up to 32768 UTF-16 characters.
++ * NTFS, VFAT, exFAT and ReFS support filenames up to 255 UTF-16/UCS-2 characters. (For ReFS, there is no information
++ * on the on-disk format, and it is possible that it supports longer filenames, up to 32768 UTF-16/UCS-2 characters.)
++ * The buffer cannot be larger than 64k, because up to Windows 8.1, NtQueryDirectoryFile and GetFileInformationByHandleEx
++ * fail with ERROR_INVALID_PARAMETER when trying to retrieve the filenames from a network share.
+ */
+-BOOST_CONSTEXPR_OR_CONST std::size_t dir_itr_extra_size = sizeof(file_id_extd_dir_info) + 65536u;
++BOOST_CONSTEXPR_OR_CONST std::size_t dir_itr_extra_size = 65536u;
+
+ inline system::error_code dir_itr_close(dir_itr_imp& imp) BOOST_NOEXCEPT
+ {
diff --git a/main/botan/APKBUILD b/main/botan/APKBUILD
index 938831a676..2786b3b25c 100644
--- a/main/botan/APKBUILD
+++ b/main/botan/APKBUILD
@@ -1,13 +1,13 @@
# Contributor: tcely <tcely@users.noreply.github.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=botan
-pkgver=2.19.1
-pkgrel=2
+pkgver=2.19.2
+pkgrel=1
pkgdesc="Crypto and TLS for C++11"
url="https://botan.randombit.net/"
arch="all"
license="BSD-2-Clause"
-depends_dev="boost-dev bzip2-dev openssl1.1-compat-dev sqlite-dev xz-dev zlib-dev"
+depends_dev="boost-dev bzip2-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"
@@ -41,7 +41,6 @@ build() {
--with-bzip2 \
--with-lzma \
--with-openmp \
- --with-openssl \
--with-sqlite3 \
--with-zlib \
--with-os-feature=getrandom \
@@ -60,5 +59,5 @@ package() {
}
sha512sums="
-e604be0e7e82da89e3e1949d3035a87dc63314bd9854d5fe5129ccb3ed5bc78edb0406c7f8ad1a152b59a63b6d98ba207a0851a08428c3452cce794614b5eef5 Botan-2.19.1.tar.xz
+52b9c80a240457e46a299480338472f7d0c0b56df7b1709fdef52c5be3afca5b474fe143801c9a332ae884eaf033e60461c9d3e0b2f7b069f4fe8b4c45932abf Botan-2.19.2.tar.xz
"
diff --git a/main/bridge/APKBUILD b/main/bridge/APKBUILD
index 950862e6f9..71dd7f0e95 100644
--- a/main/bridge/APKBUILD
+++ b/main/bridge/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bridge
pkgver=1.5
-pkgrel=4
+pkgrel=5
pkgdesc="Scripts for configuring network bridge interfaces"
url="https://wiki.alpinelinux.org/wiki/Bridge"
arch="noarch"
@@ -11,8 +11,15 @@ source="bridge.pre-up"
builddir="$srcdir"
+# secfixes:
+# 0:
+# - CVE-2021-42533
+# - CVE-2021-42719
+# - CVE-2021-42720
+# - CVE-2021-42722
+# - CVE-2021-42725
+
package() {
- cd "$builddir"
install -Dm755 "$srcdir"/bridge.pre-up \
"$pkgdir"/etc/network/if-pre-up.d/bridge
install -d "$pkgdir"/etc/network/if-post-down.d
diff --git a/main/brotli/APKBUILD b/main/brotli/APKBUILD
index d371e0f7bc..b671bcc462 100644
--- a/main/brotli/APKBUILD
+++ b/main/brotli/APKBUILD
@@ -2,18 +2,19 @@
# Maintainer: prspkt <prspkt@protonmail.com>
pkgname=brotli
pkgver=1.0.9
-pkgrel=6
+pkgrel=8
pkgdesc="Generic lossless compressor"
url="https://github.com/google/brotli"
arch="all"
license="MIT"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
makedepends_build="automake autoconf libtool"
if [ -z "$BOOTSTRAP" ]; then
makedepends_host="python3-dev"
python="py3-$pkgname:py3"
fi
-subpackages="$pkgname-doc $pkgname-static $pkgname-dev $pkgname-libs $python"
-source="$pkgname-$pkgver.tar.gz::https://github.com/google/brotli/archive/v$pkgver.tar.gz
+subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $python"
+source="$pkgname-$pkgver.tar.gz::https://github.com/google/brotli/archive/refs/tags/v$pkgver.tar.gz
optimize-mips-s390x.patch
build-tool-against-shared-lib.patch
838.patch
@@ -24,9 +25,6 @@ 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,13 +32,27 @@ prepare() {
}
build() {
+ # use sysroot when cross compiling to avoid libtool pulling in host libs
+ if [ "$CBUILD" != "$CHOST" ]; then
+ local cross_configure="--with-sysroot=$CBUILDROOT"
+ else
+ CFLAGS="$CFLAGS -flto=auto"
+ fi
+
+ CFLAGS="$CFLAGS -O2" \
./configure \
--build=$CBUILD \
--host=$CHOST \
--target=$CTARGET \
--prefix=/usr \
- $_cross_configure \
+ --disable-static \
+ $_cross_configure
+
make
+
+ if [ -z "$BOOTSTRAP" ]; then
+ python3 setup.py build
+ fi
}
check() {
@@ -53,15 +65,22 @@ package() {
local man; for man in docs/*.?; do
install -D -m644 $man "$pkgdir"/usr/share/man/man${man##*.}/${man##*/}
done
+
+ if [ -z "$BOOTSTRAP" ]; then
+ python3 setup.py install --skip-build --root="$pkgdir"
+ fi
}
py3() {
- cd "$builddir"
- python3 setup.py install --prefix=/usr --root="$subpkgdir"
+ pkgdesc="$pkgdesc (python bindings)"
+
+ amove usr/lib/python3*
}
-sha512sums="b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5 brotli-1.0.9.tar.gz
+sha512sums="
+b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5 brotli-1.0.9.tar.gz
59e934578ce23b703f8f25f56578f8e9fd1466a9844b6f67b542acd6496df352548e3762697dc3851cfd0f8e1bad170bfdaa3e8a87c901fe81e2f3042e3aee84 optimize-mips-s390x.patch
f4a7653a0f7ef69f059d7f744a48c7731c8e66f977ce2e66cd106f697e82aa1f005923898d216a3d8be143b2dc8db1927c09daedb981818e752640a333d75fbc build-tool-against-shared-lib.patch
58ef677595f0db80b7d1353e42603cc30ef9b0b9530927f731ee31ac60ad9a3b2aac960a5cd100f8b10e547c9534e1ebf78c53550b52eed6fb3b7fb853317d20 838.patch
-6b7953f09c7ce4219dd9411d53fcd495e0de92f210c53be43dcd235a47050b10933b347fcc8e92d7e3fd89b12375eb0deea61b01eb279902079fa7b7aca62a5a 0545759b2ed9b69e3f21fd0ac954bee78f3104b6.patch"
+6b7953f09c7ce4219dd9411d53fcd495e0de92f210c53be43dcd235a47050b10933b347fcc8e92d7e3fd89b12375eb0deea61b01eb279902079fa7b7aca62a5a 0545759b2ed9b69e3f21fd0ac954bee78f3104b6.patch
+"
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index 078b06c4b2..fd07558d0d 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.18.1
+pkgver=5.19.1
pkgrel=0
pkgdesc="BTRFS filesystem utilities"
url="https://btrfs.wiki.kernel.org"
@@ -13,34 +13,29 @@ makedepends="$depends_dev
acl-dev
asciidoc
attr-dev
- autoconf
- automake
e2fsprogs-dev
- libtool
+ eudev-dev
lzo-dev
py3-setuptools
+ py3-sphinx
python3-dev
util-linux-dev
xmlto
zlib-dev
zstd-dev
- eudev-dev
- py3-sphinx"
-subpackages="$pkgname-doc
+ "
+subpackages="
+ $pkgname-doc
$pkgname-static
$pkgname-dev
$pkgname-bash-completion
py3-$pkgname:py3
$pkgname-libs
- $pkgname-extra"
+ $pkgname-extra
+ "
source="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar.xz"
builddir="$srcdir/$pkgname-v$pkgver"
-prepare() {
- default_prepare
- ./autogen.sh
-}
-
build() {
./configure \
--build=$CBUILD \
@@ -75,19 +70,16 @@ py3() {
provides="py-btrfs-progs=$pkgver-r$pkgrel" # for backward compatibility
replaces="py-btrfs-progs" # for backward compatibility
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
+ amove usr/lib/python*
}
extra() {
depends="$pkgname"
pkgdesc="BTRFS filesystem extra utilities"
- mkdir -p "$subpkgdir"
- mv "$pkgdir"/usr "$subpkgdir"/
- rmdir "$subpkgdir"/usr/lib
+ amove usr/sbin
}
sha512sums="
-265a03b0db00a231ad51bb75fb161dee0a7a51cd120a696ca0524f08ef635b18afe43b391fa9889a4a79734ccc3931e4374bd950eb26dc47ddc8482368efed0e btrfs-progs-v5.18.1.tar.xz
+17fded8583b7392202b1bb408cbb5d42024623ac15415f95e8e56e27b43be79da6d4e6c191d39db4e5a8948390a7c216c0ea520171b0ab95438cc330084c8398 btrfs-progs-v5.19.1.tar.xz
"
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
deleted file mode 100644
index 65bec6c676..0000000000
--- a/main/busybox-initscripts/APKBUILD
+++ /dev/null
@@ -1,87 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=busybox-initscripts
-pkgver=4.1
-pkgrel=1
-pkgdesc="Init scripts for busybox daemons"
-url="https://git.alpinelinux.org/aports/tree/main/busybox-initscripts"
-arch="noarch"
-license="GPL-2.0-only"
-depends="busybox openrc>=0.24.1-r6 mdev-conf=$pkgver-r$pkgrel"
-makedepends=""
-install="$pkgname.post-install $pkgname.post-upgrade"
-subpackages="mdev-conf:_mdev_conf"
-checkdepends="bats"
-replaces="alpine-baselayout openntpd"
-source="acpid.initd crond.initd dnsd.initd httpd.initd inetd.initd klogd.initd
- mdev.initd ntpd.initd rdate.initd syslog.initd udhcpd.initd loadkmap.initd
- watchdog.initd crond.confd klogd.confd ntpd.confd rdate.confd syslog.confd
- watchdog.confd loadkmap.confd mdev.conf dvbdev usbdev persistent-storage
- ptpdev
- ptpdev.bats
- "
-
-check() {
- cd "$srcdir"
- msg "running tests"
- bats *.bats
-}
-
-package() {
- local i
- cd "$srcdir"
-
- mkdir -p "$pkgdir"/etc/conf.d "$pkgdir"/etc/init.d "$pkgdir"/lib/mdev\
- "$pkgdir"/etc/acpi/PWRF
- for i in *.initd; do
- install -m755 "$srcdir"/$i "$pkgdir"/etc/init.d/${i%.*} || return 1
- done
- for i in *.confd; do
- install -m644 "$srcdir"/$i "$pkgdir"/etc/conf.d/${i%.*} || return 1
- done
- install -m644 mdev.conf "$pkgdir"/etc
- install -m755 dvbdev persistent-storage ptpdev usbdev \
- "$pkgdir"/lib/mdev/
-
- # poweroff script for acpid
- cat >"$pkgdir"/etc/acpi/PWRF/00000080 <<EOF
-#!/bin/sh
-poweroff
-EOF
- chmod +x "$pkgdir"/etc/acpi/PWRF/00000080
-}
-
-_mdev_conf() {
- pkgdesc="Configuration files for mdev and mdevd"
- depends=
- amove etc/mdev.conf lib/mdev
-}
-
-sha512sums="
-dd548670114a92404b8e35fb915fdbe5994498b05b0a418583271c3dd72fb7800950e42c095c902a014eb198c046b8a346d43dccd8e7a158048ae33767c572ed acpid.initd
-c9d0fb0f8cc27d661d3b4e58c56eb598ca368890576e18ffffd42efdf68ba35537656be9be319b2e2818aa0152d3ca8611bece2433512fbfcd4eed7988765549 crond.initd
-612a7ffb475fd23d33b2a7266b621537ca59b4abd8cb5a9ce03771800ec4f7622a8ff380320f8d768291e4d1a68adfff28f369776a80125940ee40b2e4a5db4d dnsd.initd
-66bfd7d2a03f4e8a50f08b7057091bfef8e36001eb7c07574ec45da6d75db05a88ae37dbd51e3e3fc7b00a784bf69f8416682ce0454ca16cc072358abdf4d2ce httpd.initd
-9f7c96a7af5e0f6450b6100b7f99e3fe52759f797dca3a92e8e4ad7c08e6acf384fba2496a4e1e8b77f60ba23195bf2bf58013b16aa03f649a16d6f8aad3f8a9 inetd.initd
-e8deb44d6a7c4cf7e1ced3436ad8c97ed86ff211d2db270cdd4a96e0cc4e6720909a821c35bc2830769da2304f9d6fc732051e205c8e22fe9a65d2798dfe3c42 klogd.initd
-1aed59fb048f0636ee8a095a089a20554a20eda84c70485a894ae60b0f97b792b7ce8e832557457258f59a2750735c4a25e247364ccf1180e9652b292a5f9e8d mdev.initd
-c30d3936e045c01fdc9d1e9d1c0d2cd79b6dabb453400f067bc4eefa239a41c98bbe3fcd3ae53792e0e6d8fcf4aebc727e4524ec3ccd5741d5659a0a351c1c7e ntpd.initd
-a95d03564712803fc58c48534f2fbbf23dd8418ffd3a6a06f840e969627892eea518b4fe17f059850665fc056cedf972c26aee52c309805987fb5c59a710bd30 rdate.initd
-acfd45bda4526ab551a30faec1742ad1569aa85e0d315959c3e3a3d6a693f94c74efeb57a00b8791524651e8a61d3f7ea3e3e08a4b0291ec46309f594ee8124c syslog.initd
-1d4574ec7cc6d7e9952bb50b4fcb10a910868688da03a25aede492835313c686247bde1faa17f50243d61a93bfc1d8fa54cf821d7be908581e365b0f1b6a5588 udhcpd.initd
-1b61a0f1eb40f2ea14bf3ed3441996f343d70fd45858d443f21244f133dcdf1c64433c3deaef769eee4e3e698b405f25e1bbc185a25c351a88ce7d120d61cf00 loadkmap.initd
-0a4f989068f00dd8599433ea1fe0713c405ed871750b918e32db2d6bccefc8b870ea2e16864d1b7c3dd57d63e04b41aa0bf9c882c1a9e8108def141d12072e90 watchdog.initd
-34c6f3197064bb91619b899b28a201bd4d920b18bded3845440b2cb36dc6f16cabf447c96878349b16e46c30184cbe48bac00a01c5f7cf1be038c0b7136064c5 crond.confd
-f9bf43b72142bbb4c0665c1268a3d91586ef8a057dfe64c53b6923815d2db1f669b8080a38311ad89cda0b783a8628700fc5414d834a21d8e48515760bb910f7 klogd.confd
-b0ba67585f39d83320ed6de183d7463a0e163807b9f3dc6f0baa212236056f22aeb2c5399dfdcd54929eb5ae06a15714c2fed133b5888869ed9d9cf589cef843 ntpd.confd
-3d6c4d358e226e0c0462f2003bcf0b6787f91a53f4d6b6db5bfe7748bb0dd392d7cc454058ea8a9b649e8dd2629963a5ad1257c36af04367caeb1923f954daf7 rdate.confd
-bf8173ee33a5d2b61cbdbc1b070e599a17a21e5433a0d8aa9beef71e4ac831304076af8e7e58dc594cdee61562329793afdc57af91e5496bf5fffb9b734a3d9c syslog.confd
-359af0a4a1841dd6557eaf3e71d39f0d7a2687bad6a8fc6ef436eccf72a40f85c6400a3b7880c7f64d8e460b6af8a0ff3dd5ffc3a4b1aa8eb0d8f7eaf99ee3e4 watchdog.confd
-acbba3385fb2c416362eb9176f24146b617a2e394ee0e00b9eff89350f82468a5ab8396f4f52b0aaf03d341ac6150c73182e808fa3f29a2dc71c69271cdfb811 loadkmap.confd
-b5c299d5dcd854eb23717aab6938e2e1c9572d10ed667595b4a98f9cddca9f81c3f8f7ae508b62db5fe203c45c696d3c2a9ce62761aa329b2bcfcc5e5a3a9224 mdev.conf
-ebd82f935da2ca89097234dd8a8f47e179a423652c151123a1f3343f3e1e7bfaba2b8800380e988d4e8f4294545d3a9ab6708ae2e77c5b108b5f091bbce8f94a dvbdev
-b2dcf0ded9264334d79fbbb05dd12d649dc3119a060db5893f0e8aeca2141323961c3ba4c822a0ffb00dba848742d5cb374dc77e776b57cecde352a3e8e30f8a usbdev
-0f54666072a8ee32965cc1b5205a6d35bc2ba6655f298c37ba9ccd72949fa7c41b1e540ec91f41b11f4b261ace614cdcc42dccf390bf0a22698d0ba499feae39 persistent-storage
-46b9379a5def08ce0afffae546693c19be158ca4fa4ce3c619ec81e0adbaa087ea5dd6df10abbfcd59bfdaf351d7170a7d24c2b403eceeb80f4f04f090630227 ptpdev
-5e1f6fabd7845f9cd6f90477f10a0b428b4414caed18a6dfe8e86e2ce3d373521d593aa6a9ee475b138a18b15c7a403a2bb0e1987b1dbdb6d465ebd7d5836a86 ptpdev.bats
-"
diff --git a/main/busybox-initscripts/busybox-initscripts.post-install b/main/busybox-initscripts/busybox-initscripts.post-install
deleted file mode 100644
index c393627437..0000000000
--- a/main/busybox-initscripts/busybox-initscripts.post-install
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# this is for upgraders
-addgroup -S -g 23 input 2>/dev/null
-
-# this is for upgraders
-if [ -L /etc/runlevels/boot/mdev ] && ! [ -L /etc/runlevels/sysinit/mdev ]; then
- mkdir -p /etc/runlevels/sysinit
- mv /etc/runlevels/boot/mdev /etc/runlevels/sysinit/ 2>/dev/null
-fi
-
-rename_service() {
- oldname="$1"
- newname="$2"
-
- ret=1
- for link in /run/openrc/*/${oldname} /etc/runlevels/*/${oldname}; do
- newlink="${link%/*}/${newname}"
- if [ -L "$link" ] && ! [ -L "$newlink" ]; then
- target="$(readlink $link)"
- ln -s "${target%/*}/$newname" "$newlink"
- rm "$link"
- ret=0
- continue
- fi
- if [ -d "$link" ] && ! [ -d "$newlink" ]; then
- mv "$link" "$newlink"
- ret=0
- fi
- done
-
- return $ret
-}
-
-# cron was renamed to crond
-rename_service cron crond
-
-# keymaps was renamed to loadkmap
-rename_service keymaps loadkmap && cat 1>&2 <<-EOF
-*
-* The OpenRC keymaps service was renamed to loadkmap. You might want
-* to rename your previous configuration file /etc/conf.d/keymaps to
-* /etc/conf.d/loadkmap. Also make sure that /etc/init.d/keymaps was
-* removed and remove it manually if it wasn't.
-*
-EOF
-
-exit 0
-
diff --git a/main/busybox-initscripts/busybox-initscripts.post-upgrade b/main/busybox-initscripts/busybox-initscripts.post-upgrade
deleted file mode 120000
index ef17c50147..0000000000
--- a/main/busybox-initscripts/busybox-initscripts.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-busybox-initscripts.post-install \ No newline at end of file
diff --git a/main/busybox-initscripts/dvbdev b/main/busybox-initscripts/dvbdev
deleted file mode 100644
index f0186c176c..0000000000
--- a/main/busybox-initscripts/dvbdev
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# MDEV=dvb0.demux1 -> ADAPTER=dvb0 -> N=0
-ADAPTER=${MDEV%.*}
-N=${ADAPTER#dvb}
-# MDEV=dvb0.demux1 -> DEVB_DEV=demux1
-DVB_DEV=${MDEV#*.}
-
-case "$ACTION" in
- add|"")
- mkdir -p dvb/adapter${N}
- mv ${MDEV} dvb/adapter${N}/${DVB_DEV}
- ;;
- remove)
- rm -f dvb/adapter${N}/${DVB_DEV}
- rmdir dvb/adapter${N} 2>/dev/null
- rmdir dvb/ 2>/dev/null
-esac
diff --git a/main/busybox-initscripts/mdev.conf b/main/busybox-initscripts/mdev.conf
deleted file mode 100644
index 0857942cab..0000000000
--- a/main/busybox-initscripts/mdev.conf
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# This is a sample mdev.conf.
-#
-
-# Devices:
-# Syntax: %s %d:%d %s
-# devices user:group mode
-
-$MODALIAS=.* root:root 0660 @modprobe -q -b "$MODALIAS"
-
-# null does already exist; therefore ownership has to be changed with command
-null root:root 0666 @chmod 666 $MDEV
-zero root:root 0666
-grsec root:root 0660
-full root:root 0666
-
-random root:root 0666
-urandom root:root 0444
-hwrandom root:root 0660
-
-console root:tty 0600
-
-# load frambuffer console when first frambuffer is found
-fb0 root:video 0660 @modprobe -q -b fbcon
-vchiq root:video 0660
-
-fd0 root:floppy 0660
-kmem root:root 0640
-mem root:root 0640
-port root:root 0640
-ptmx root:tty 0666
-
-# Kernel-based Virtual Machine.
-kvm root:kvm 660
-
-# ram.*
-ram([0-9]*) root:disk 0660 >rd/%1
-loop([0-9]+) root:disk 0660 >loop/%1
-
-# persistent storage
-dasd.* root:disk 0660 */lib/mdev/persistent-storage
-mmcblk.* root:disk 0660 */lib/mdev/persistent-storage
-nbd.* root:disk 0660 */lib/mdev/persistent-storage
-nvme.* root:disk 0660 */lib/mdev/persistent-storage
-sd[a-z].* root:disk 0660 */lib/mdev/persistent-storage
-sr[0-9]+ root:cdrom 0660 */lib/mdev/persistent-storage
-vd[a-z].* root:disk 0660 */lib/mdev/persistent-storage
-xvd[a-z].* root:disk 0660 */lib/mdev/persistent-storage
-
-md[0-9] root:disk 0660
-
-tty root:tty 0666
-tty[0-9] root:root 0600
-tty[0-9][0-9] root:tty 0660
-ttyS[0-9]* root:uucp 0660
-pty.* root:tty 0660
-vcs[0-9]* root:tty 0660
-vcsa[0-9]* root:tty 0660
-
-# rpi bluetooth
-#ttyAMA0 root:tty 660 @btattach -B /dev/$MDEV -P bcm -S 115200 -N &
-
-ttyACM[0-9] root:dialout 0660 @ln -sf $MDEV modem
-ttyUSB[0-9] root:dialout 0660 @ln -sf $MDEV modem
-ttyLTM[0-9] root:dialout 0660 @ln -sf $MDEV modem
-ttySHSF[0-9] root:dialout 0660 @ln -sf $MDEV modem
-slamr root:dialout 0660 @ln -sf $MDEV slamr0
-slusb root:dialout 0660 @ln -sf $MDEV slusb0
-fuse root:root 0666
-
-# dri device
-dri/.* root:video 0660
-card[0-9] root:video 0660 =dri/
-
-# alsa sound devices and audio stuff
-pcm.* root:audio 0660 =snd/
-control.* root:audio 0660 =snd/
-midi.* root:audio 0660 =snd/
-seq root:audio 0660 =snd/
-timer root:audio 0660 =snd/
-
-adsp root:audio 0660 >sound/
-audio root:audio 0660 >sound/
-dsp root:audio 0660 >sound/
-mixer root:audio 0660 >sound/
-sequencer.* root:audio 0660 >sound/
-
-SUBSYSTEM=sound;.* root:audio 0660
-
-# PTP devices
-ptp[0-9] root:root 0660 */lib/mdev/ptpdev
-
-# virtio-ports
-SUBSYSTEM=virtio-ports;vport.* root:root 0600 @mkdir -p virtio-ports; ln -sf ../$MDEV virtio-ports/$(cat /sys/class/virtio-ports/$MDEV/name)
-
-# misc stuff
-agpgart root:root 0660 >misc/
-psaux root:root 0660 >misc/
-rtc root:root 0664 >misc/
-
-# input stuff
-event[0-9]+ root:input 0640 =input/
-mice root:input 0640 =input/
-mouse[0-9] root:input 0640 =input/
-js[0-9] root:input 0640 =input/
-ts[0-9] root:input 0600 =input/
-
-# v4l stuff
-vbi[0-9] root:video 0660 >v4l/
-video[0-9]+ root:video 0660 >v4l/
-
-# dvb stuff
-dvb.* root:video 0660 */lib/mdev/dvbdev
-
-# load drivers for usb devices
-usb[0-9]+ root:root 0660 */lib/mdev/usbdev
-
-# net devices
-# 666 is fine: https://www.kernel.org/doc/Documentation/networking/tuntap.txt
-net/tun[0-9]* root:netdev 0666
-net/tap[0-9]* root:netdev 0666
-
-# zaptel devices
-zap(.*) root:dialout 0660 =zap/%1
-dahdi!(.*) root:dialout 0660 =dahdi/%1
-dahdi/(.*) root:dialout 0660 =dahdi/%1
-
-# raid controllers
-cciss!(.*) root:disk 0660 =cciss/%1
-cciss/(.*) root:disk 0660 =cciss/%1
-ida!(.*) root:disk 0660 =ida/%1
-ida/(.*) root:disk 0660 =ida/%1
-rd!(.*) root:disk 0660 =rd/%1
-rd/(.*) root:disk 0660 =rd/%1
-
-# tape devices
-nst[0-9]+.* root:tape 0660
-st[0-9]+.* root:tape 0660
-
-# fallback for any!device -> any/device
-(.*)!(.*) root:root 0660 =%1/%2
diff --git a/main/busybox-initscripts/persistent-storage b/main/busybox-initscripts/persistent-storage
deleted file mode 100644
index ea68948294..0000000000
--- a/main/busybox-initscripts/persistent-storage
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-symlink_action() {
- case "$ACTION" in
- add) ln -sf "$1" "$2";;
- remove) rm -f "$2";;
- esac
-}
-
-# cdrom symlink
-case "$MDEV" in
- sr*|xvd*)
- caps="$(cat /sys/block/$MDEV/capability 2>/dev/null)"
- if [ $(( 0x${caps:-0} & 8 )) -gt 0 ]; then
- symlink_action $MDEV cdrom
- fi
-esac
-
-# by-id symlinks
-mkdir -p disk/by-id
-
-partition=$(cat /sys/class/block/$MDEV/partition 2>/dev/null)
-case "$partition" in
- [0-9]*) partsuffix="-part$partition";;
-esac
-
-wwid=$(cat /sys/class/block/$MDEV/wwid 2>/dev/null)
-: ${wwid:=$(cat /sys/class/block/$MDEV/device/wwid 2>/dev/null)}
-
-if [ -n "$wwid" ]; then
- case "$MDEV" in
- nvme*) symlink_action ../../$MDEV disk/by-id/nvme-${wwid}${partsuffix};;
- esac
- case "$wwid" in
- naa.*) symlink_action ../../$MDEV disk/by-id/wwn-0x${wwid#naa.};;
- esac
-fi
-
-serial=$(sed -E -e 's/^\s+//' -e 's/\s+$//' -e 's/ /_/g' \
- /sys/class/block/$MDEV/device/serial 2>/dev/null)
-
-model=$(sed -E -e 's/^\s+//' -e 's/\s+$//' -e 's/ /_/g' \
- /sys/class/block/$MDEV/device/model 2>/dev/null)
-
-if [ -n "$serial" ] && [ -n "$model" ]; then
- case "$MDEV" in
- nvme*) symlink_action ../../$MDEV disk/by-id/nvme-${model}_${serial}${partsuffix};;
- esac
-fi
-
-# virtio-blk
-if [ -n "$serial" ]; then
- case "$MDEV" in
- vd*) symlink_action ../../$MDEV disk/by-id/virtio-${serial}${partsuffix};;
- esac
-fi
-
-# by-uuid, by-partuuid
-eval $(blkid /dev/$MDEV | cut -d: -f2-)
-if [ -n "$UUID" ]; then
- mkdir -p disk/by-uuid
- symlink_action ../../$MDEV disk/by-uuid/$UUID
-fi
-if [ -n "$PARTUUID" ]; then
- mkdir -p disk/by-partuuid
- symlink_action ../../$MDEV disk/by-partuuid/$PARTUUID
-fi
-
diff --git a/main/busybox-initscripts/ptpdev b/main/busybox-initscripts/ptpdev
deleted file mode 100755
index 56757fba28..0000000000
--- a/main/busybox-initscripts/ptpdev
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-symlink_action() {
- case "$ACTION" in
- add) ln -sf "$1" "$2";;
- remove) rm -f "$2";;
- esac
-}
-
-clock_name=$(cat ${SYSFS:-/sys}/class/ptp/$MDEV/clock_name 2>/dev/null | sed -e 's/ /_/g')
-case "$clock_name" in
- KVM_virtual_PTP) symlink_action $MDEV ptp_kvm ;;
- ptp_vmw) symlink_action $MDEV ptp_vmw ;;
- hyperv) symlink_action $MDEV ptp_hyperv ;;
-esac
diff --git a/main/busybox-initscripts/ptpdev.bats b/main/busybox-initscripts/ptpdev.bats
deleted file mode 100644
index 7c43c482d0..0000000000
--- a/main/busybox-initscripts/ptpdev.bats
+++ /dev/null
@@ -1,49 +0,0 @@
-setup() {
- mdevscript=${BATS_TEST_FILENAME%.bats}
- root="$BATS_FILE_TMPDIR"
- mkdir -p "$root"/dev "$root"/sys "$root"/bin
- PATH="$root/bin:$PATH"
- export SYSFS="$root/sys"
-
- mkdir -p "$root"/sys/class/ptp/ptp0 \
- "$root"/sys/class/ptp/ptp1 \
- "$root"/sys/class/ptp/ptp2
-
- echo "KVM virtual PTP" > "$root"/sys/class/ptp/ptp0/clock_name
- echo "ptp vmw" > "$root"/sys/class/ptp/ptp1/clock_name
- echo hyperv > "$root"/sys/class/ptp/ptp2/clock_name
-
- cd "$root"/dev
-}
-
-teardown() {
- rm -r "$root"
-}
-
-@test "ptpdev kvm" {
- MDEV=ptp0 ACTION=add sh $mdevscript
- [ $(readlink ptp_kvm) = ptp0 ]
-
- MDEV=ptp0 ACTION=remove sh $mdevscript
- run readlink ptp_kvm
- [ "$status" -ne 0 ]
-}
-
-@test "ptpdev vmw" {
- MDEV=ptp1 ACTION=add sh $mdevscript
- [ $(readlink ptp_vmw) = ptp1 ]
-
- MDEV=ptp1 ACTION=remove sh $mdevscript
- run readlink ptp_vmw
- [ "$status" -ne 0 ]
-}
-
-@test "ptpdev hyperv" {
- MDEV=ptp2 ACTION=add sh $mdevscript
- run readlink ptp_hyperv
- [ $(readlink ptp_hyperv) = ptp2 ]
-
- MDEV=ptp2 ACTION=remove sh $mdevscript
- run readlink ptp_hyperv
- [ "$status" -ne 0 ]
-}
diff --git a/main/busybox-initscripts/usbdev b/main/busybox-initscripts/usbdev
deleted file mode 100755
index c811736dda..0000000000
--- a/main/busybox-initscripts/usbdev
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# mdev -s will not set SUBSYSTEM or DEVNAME so we trigger a hotplug event
-if [ "$SUBSYSTEM" != "usb" ] || [ "$DEVTYPE" != "usb_device" ]; then
- uev=/sys/bus/usb/devices/$MDEV/uevent
- [ -e "$uev" ] && echo "add" > "$uev"
- exit
-fi
-
-[ -n "$DEVNAME" ] || exit
-
-case "$ACTION" in
-add)
- mkdir -p "${DEVNAME%/*}"
- mv $MDEV $DEVNAME
- # autoload driver
- for i in /sys/$DEVPATH/*/modalias; do
- [ -e "$i" ] && echo $i
- done | xargs sort -u | xargs modprobe -a 2>/dev/null
- ;;
-remove)
- rm $DEVNAME
- ;;
-esac
-
diff --git a/main/busybox/0001-avoid-redefined-warnings-when-building-with-utmps.patch b/main/busybox/0001-avoid-redefined-warnings-when-building-with-utmps.patch
index 246e9b079c..1ce06f8c36 100644
--- a/main/busybox/0001-avoid-redefined-warnings-when-building-with-utmps.patch
+++ b/main/busybox/0001-avoid-redefined-warnings-when-building-with-utmps.patch
@@ -1,16 +1,93 @@
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Mon, 06 Sep 2021 23:13:05 +0200
-Subject: [PATCH] Avoid redefined warnings when building with utmps
+From 711de34e8fa42bd9ec704cc922db937edada84d8 Mon Sep 17 00:00:00 2001
+From: Laurent Bercot <ska-devel@skarnet.org>
+Date: Fri, 22 Jul 2022 01:35:14 +0200
+Subject: [PATCH] Avoid redefined warnings when buiding with utmps
+Do not use _PATH_UTMP or _PATH_WTMP, and do not touch
+the files directly.
+---
+ include/libbb.h | 8 +++-----
+ libbb/messages.c | 4 ++--
+ libbb/utmp.c | 8 ++++----
+ util-linux/last_fancy.c | 2 +-
+ 4 files changed, 10 insertions(+), 12 deletions(-)
+
+diff --git a/include/libbb.h b/include/libbb.h
+index abbc9ac59..405108b17 100644
--- a/include/libbb.h
+++ b/include/libbb.h
-@@ -107,6 +107,9 @@
+@@ -107,14 +107,12 @@
# define _PATH_UTMPX _PATH_UTMP
# else
# if !defined(__FreeBSD__)
-+/* _PATH_UTMP and _PATH_WTMP are defined both in paths.h and utmps/utmp.h. */
-+# undef _PATH_UTMP
-+# undef _PATH_WTMP
- # include <utmp.h>
+-# include <utmp.h>
++# include <utmpx.h>
++# define _CORRECT_PATH_UTMPX "/run/utmps/utmp"
++# define _CORRECT_PATH_WTMP "/var/log/wtmp"
# else
# define _PATH_UTMPX "/var/run/utx.active"
+ # endif
+-# include <utmpx.h>
+-# if defined _PATH_UTMP && !defined _PATH_UTMPX
+-# define _PATH_UTMPX _PATH_UTMP
+-# endif
+ # endif
+ #endif
+ #if ENABLE_LOCALE_SUPPORT
+diff --git a/libbb/messages.c b/libbb/messages.c
+index 6914d5701..689dd0c6d 100644
+--- a/libbb/messages.c
++++ b/libbb/messages.c
+@@ -42,8 +42,8 @@ const int const_int_0 = 0;
+ #if ENABLE_FEATURE_WTMP
+ /* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */
+ const char bb_path_wtmp_file[] ALIGN1 =
+-# if defined _PATH_WTMP
+- _PATH_WTMP;
++# if defined _CORRECT_PATH_WTMP
++ _CORRECT_PATH_WTMP;
+ # elif defined WTMP_FILE
+ WTMP_FILE;
+ # else
+diff --git a/libbb/utmp.c b/libbb/utmp.c
+index bd07670db..463ee1317 100644
+--- a/libbb/utmp.c
++++ b/libbb/utmp.c
+@@ -45,8 +45,8 @@ void FAST_FUNC write_new_utmp(pid_t pid, int new_type, const char *tty_name, con
+ tty_name += 3;
+ strncpy(id, tty_name, width);
+
+- touch(_PATH_UTMPX);
+- //utmpxname(_PATH_UTMPX);
++ //touch(_CORRECT_PATH_UTMPX);
++ //utmpxname(_CORRECT_PATH_UTMPX);
+ setutxent();
+ /* Append new one (hopefully, unless we collide on ut_id) */
+ pututxline(&utent);
+@@ -67,8 +67,8 @@ void FAST_FUNC update_utmp(pid_t pid, int new_type, const char *tty_name, const
+ struct utmpx utent;
+ struct utmpx *utp;
+
+- touch(_PATH_UTMPX);
+- //utmpxname(_PATH_UTMPX);
++ //touch(_CORRECT_PATH_UTMPX);
++ //utmpxname(_CORRECT_PATH_UTMPX);
+ setutxent();
+
+ /* Did init/getty/telnetd/sshd/... create an entry for us?
+diff --git a/util-linux/last_fancy.c b/util-linux/last_fancy.c
+index 648236229..aa7a62bbe 100644
+--- a/util-linux/last_fancy.c
++++ b/util-linux/last_fancy.c
+@@ -159,7 +159,7 @@ int last_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int last_main(int argc UNUSED_PARAM, char **argv)
+ {
+ struct utmpx ut;
+- const char *filename = _PATH_WTMP;
++ const char *filename = _CORRECT_PATH_WTMP;
+ llist_t *zlist;
+ off_t pos;
+ time_t start_time;
+--
+2.37.1
+
diff --git a/main/busybox/0018-ash-fix-ifs-cleanup-on-error-paths.patch b/main/busybox/0018-ash-fix-ifs-cleanup-on-error-paths.patch
new file mode 100644
index 0000000000..c09bc84daa
--- /dev/null
+++ b/main/busybox/0018-ash-fix-ifs-cleanup-on-error-paths.patch
@@ -0,0 +1,91 @@
+From 1c5455284234e894dfb6086bf7f3e9a6d5d9611f Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Tue, 2 Aug 2022 11:13:44 +0200
+Subject: [PATCH] ash: fix ifs cleanup on error paths
+
+Patch by Alex Gorinson <algore3698@gmail.com>
+
+function old new delta
+evalvar 477 495 +18
+varvalue 603 618 +15
+subevalvar 1557 1572 +15
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 3/0 up/down: 48/0) Total: 48 bytes
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ shell/ash.c | 2 ++
+ shell/ash_test/ash-heredoc/heredoc_and_cmd.right | 2 ++
+ shell/ash_test/ash-heredoc/heredoc_and_cmd.tests | 8 ++++++++
+ shell/hush_test/hush-heredoc/heredoc_and_cmd.right | 2 ++
+ shell/hush_test/hush-heredoc/heredoc_and_cmd.tests | 8 ++++++++
+ 5 files changed, 22 insertions(+)
+ create mode 100644 shell/ash_test/ash-heredoc/heredoc_and_cmd.right
+ create mode 100755 shell/ash_test/ash-heredoc/heredoc_and_cmd.tests
+ create mode 100644 shell/hush_test/hush-heredoc/heredoc_and_cmd.right
+ create mode 100755 shell/hush_test/hush-heredoc/heredoc_and_cmd.tests
+
+diff --git a/shell/ash.c b/shell/ash.c
+index d29de37b7..c731a333b 100644
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -7028,6 +7028,7 @@ varunset(const char *end, const char *var, const char *umsg, int varflags)
+ msg = umsg;
+ }
+ }
++ ifsfree();
+ ash_msg_and_raise_error("%.*s: %s%s", (int)(end - var - 1), var, msg, tail);
+ }
+
+@@ -7453,6 +7454,7 @@ varvalue(char *name, int varflags, int flags, int quoted)
+ if (discard)
+ return -1;
+
++ ifsfree();
+ raise_error_syntax("bad substitution");
+ }
+
+diff --git a/shell/ash_test/ash-heredoc/heredoc_and_cmd.right b/shell/ash_test/ash-heredoc/heredoc_and_cmd.right
+new file mode 100644
+index 000000000..25ae70561
+--- /dev/null
++++ b/shell/ash_test/ash-heredoc/heredoc_and_cmd.right
+@@ -0,0 +1,2 @@
++./heredoc_and_cmd.tests: line 4: D: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
++Y
+diff --git a/shell/ash_test/ash-heredoc/heredoc_and_cmd.tests b/shell/ash_test/ash-heredoc/heredoc_and_cmd.tests
+new file mode 100755
+index 000000000..197542de7
+--- /dev/null
++++ b/shell/ash_test/ash-heredoc/heredoc_and_cmd.tests
+@@ -0,0 +1,8 @@
++# The bug was only happening with <<REDIR;CMD form below:
++M='AAAAAAAAAAAAAAAAA'
++fff(){
++date <<000; echo Y
++${D?$M$M$M$M$M$M}
++000
++}
++fff
+diff --git a/shell/hush_test/hush-heredoc/heredoc_and_cmd.right b/shell/hush_test/hush-heredoc/heredoc_and_cmd.right
+new file mode 100644
+index 000000000..5c19a0621
+--- /dev/null
++++ b/shell/hush_test/hush-heredoc/heredoc_and_cmd.right
+@@ -0,0 +1,2 @@
++hush: D: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
++Y
+diff --git a/shell/hush_test/hush-heredoc/heredoc_and_cmd.tests b/shell/hush_test/hush-heredoc/heredoc_and_cmd.tests
+new file mode 100755
+index 000000000..197542de7
+--- /dev/null
++++ b/shell/hush_test/hush-heredoc/heredoc_and_cmd.tests
+@@ -0,0 +1,8 @@
++# The bug was only happening with <<REDIR;CMD form below:
++M='AAAAAAAAAAAAAAAAA'
++fff(){
++date <<000; echo Y
++${D?$M$M$M$M$M$M}
++000
++}
++fff
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 7c685460e2..f288c38a5b 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -5,26 +5,47 @@
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=busybox
pkgver=1.35.0
-pkgrel=17
+pkgrel=27
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"
-# Only build with UTMPS support if we are not bootstraping.
+makedepends_host="linux-headers openssl-dev>3"
+# Only build with utmps support if we are not bootstraping.
# skalibs-static is needed for utmps-static
[ -z "$BOOTSTRAP" ] && makedepends_host="$makedepends_host utmps-dev utmps-static skalibs-static"
makedepends="$makedepends_build $makedepends_host"
checkdepends="zip"
-provides="/bin/sh"
-provider_priority=100
install="$pkgname.post-install $pkgname.post-upgrade
$pkgname-extras.post-install $pkgname-extras.pre-deinstall"
-subpackages="$pkgname-static $pkgname-doc $pkgname-suid $pkgname-extras ssl_client $pkgname-ifupdown"
+subpackages="
+ $pkgname-static
+ $pkgname-doc
+ $pkgname-suid
+ ssl_client
+ $pkgname-ifupdown
+ $pkgname-binsh
+ $pkgname-openrc
+ $pkgname-mdev-openrc:mdev_openrc
+ $pkgname-extras
+ $pkgname-extras-openrc:extras_openrc
+ "
options="suid net" # net needed for check()
replaces="busybox-initscripts" # move of default.script
triggers="busybox.trigger=/bin:/usr/bin:/sbin:/usr/sbin:/lib/modules/*"
+
+_openrc_files="acpid.initd
+ crond.confd crond.initd
+ klogd.confd klogd.initd
+ ntpd.confd ntpd.initd
+ rdate.confd rdate.initd
+ syslog.confd syslog.initd
+ loadkmap.confd loadkmap.initd
+ watchdog.confd watchdog.initd"
+_mdev_openrc_files="mdev.initd"
+_extras_openrc_files="dnsd.initd httpd.initd inetd.initd udhcpd.initd"
+
source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
@@ -45,6 +66,7 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
0015-ed-don-t-use-memcpy-with-overlapping-memory-regions.patch
0016-ash-don-t-read-past-end-of-var-in-subvareval-for-bas.patch
0017-ash-Fix-use-after-free-on-idx-variable.patch
+ 0018-ash-fix-ifs-cleanup-on-error-paths.patch
0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
@@ -66,7 +88,10 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
dad.if-up
ssl_client.c
default.script
- "
+ $_openrc_files
+ $_mdev_openrc_files
+ $_extras_openrc_files
+"
# secfixes:
# 1.35.0-r17:
@@ -119,6 +144,12 @@ prepare() {
}
build() {
+ local _extra_cflags= _extra_libs=
+ if [ -z "$BOOTSTRAP" ] ; then
+ _extra_cflags="$(pkg-config --cflags --static utmps)"
+ _extra_libs="$(pkg-config --libs --static utmps)"
+ fi
+
# build bbsuid
msg "Building bbsuid"
${CC:-${CROSS_COMPILE}gcc} ${CPPFLAGS} ${CFLAGS} \
@@ -138,14 +169,6 @@ build() {
-e "s/CONFIG_EXTRA_COMPAT=y/CONFIG_EXTRA_COMPAT=n/" \
.config
make -C "$builddir" O="$PWD" silentoldconfig
-
- local _extra_cflags="" _extra_libs=""
- if [ -z "$BOOTSTRAP" ]; then
- _extra_cflags="$(pkg-config --cflags --static utmps)"
- _extra_libs="$(pkg-config --libs --static utmps)"
- fi
-
- # NOTE: Defining CONFIG_EXTRA_LDLIBS in .config doesn't work, the second -l is ignored.
make CONFIG_EXTRA_CFLAGS="$_extra_cflags" CONFIG_EXTRA_LDLIBS="$_extra_libs"
# build dynamic (extras)
@@ -156,7 +179,10 @@ build() {
-e "s/CONFIG_EXTRA_COMPAT=y/CONFIG_EXTRA_COMPAT=n/" \
.config
make -C "$builddir" O="$PWD" silentoldconfig
- make
+ make CONFIG_EXTRA_CFLAGS="$_extra_cflags" CONFIG_EXTRA_LDLIBS="$_extra_libs"
+ # Yes, the above command line is verbose, but it needs to be duplicated verbatim
+ # for every build. Because the busybox build system is extremely brittle and
+ # breaks on *any* attempt to factorize it.
# build static
cd "$_staticdir"
@@ -171,31 +197,44 @@ build() {
-e "s/CONFIG_EXTRA_COMPAT=y/CONFIG_EXTRA_COMPAT=n/" \
.config
make -C "$builddir" O="$PWD" silentoldconfig
- make
+ make CONFIG_EXTRA_CFLAGS="$_extra_cflags" CONFIG_EXTRA_LDLIBS="$_extra_libs"
mv busybox busybox.static
}
check() {
+ local _extra_cflags= _extra_libs=
+ if [ -z "$BOOTSTRAP" ] ; then
+ _extra_cflags="$(pkg-config --cflags --static utmps)"
+ _extra_libs="$(pkg-config --libs --static utmps)"
+ fi
+
# Set VERBOSE to see expected outcome of each test (runtest -v flag).
# Set DEBUG to enable command trace (see testsuite/testing.sh).
cd "$_dyndir"
- SKIP_KNOWN_BUGS=1 make -C "$builddir" O="$PWD" V=1 check
+ SKIP_KNOWN_BUGS=1 make -C "$builddir" O="$PWD" V=1 check CONFIG_EXTRA_CFLAGS="$_extra_cflags" CONFIG_EXTRA_LDLIBS="$_extra_libs"
cd "$_dyndir_extras"
- SKIP_KNOWN_BUGS=1 make -C "$builddir" O="$PWD" V=1 check
+ SKIP_KNOWN_BUGS=1 make -C "$builddir" O="$PWD" V=1 check CONFIG_EXTRA_CFLAGS="$_extra_cflags" CONFIG_EXTRA_LDLIBS="$_extra_libs"
}
package() {
- cd "$_dyndir"
+ local file
mkdir -p "$pkgdir"/usr/sbin "$pkgdir"/usr/bin "$pkgdir"/tmp \
"$pkgdir"/var/cache/misc "$pkgdir"/bin "$pkgdir"/sbin \
- "$pkgdir"/usr/share/man/man1
+ "$pkgdir"/usr/share/man/man1 \
+ "$pkgdir"/etc/conf.d "$pkgdir"/etc/init.d
chmod 1777 "$pkgdir"/tmp
- install -m755 busybox "$pkgdir"/bin/busybox
- # we need /bin/sh to be able to execute post-install
- ln -s /bin/busybox "$pkgdir"/bin/sh
+ cd "$srcdir"
+ for file in *.confd ; do
+ install -D -m 0644 ${file} "$pkgdir"/etc/conf.d/${file%%\.confd}
+ done
+ for file in *.initd ; do
+ install -D -m 0755 ${file} "$pkgdir"/etc/init.d/${file%%\.initd}
+ done
+ cd "$_dyndir"
+ install -m755 busybox "$pkgdir"/bin/busybox
install -m 644 docs/busybox.1 "$pkgdir"/usr/share/man/man1/busybox.1
#ifupdown needs those dirs to be present
@@ -266,7 +305,7 @@ ssl_client() {
pkgdesc="EXternal ssl_client for busybox wget"
local _sslver=$(pkg-config --modversion libssl)
# automatically pull in if both busybox and libssl is installed
- install_if="$pkgname=$pkgver-r$pkgrel libssl${_sslver%.*}"
+ install_if="$pkgname=$pkgver-r$pkgrel libssl${_sslver%%.*}"
mkdir -p "$subpkgdir"/usr/bin
install -m755 "$_dyndir"/ssl_client \
"$subpkgdir"/usr/bin/ssl_client
@@ -279,6 +318,51 @@ ifupdown() {
mkdir -p "$subpkgdir"
}
+binsh() {
+ pkgdesc="busybox ash /bin/sh"
+ provides="/bin/sh"
+ provider_priority=100
+
+ mkdir -p "$subpkgdir"/bin
+
+ ln -s /bin/busybox "$subpkgdir"/bin/sh
+}
+
+_helper_openrc() {
+ local file
+ for file ; do
+ if test ${file%%\.confd} != ${file} ; then
+ amove "etc/conf.d/${file%%\.confd}"
+ elif test ${file%%\.initd} != ${file} ; then
+ amove "etc/init.d/${file%%\.initd}"
+ fi
+ done
+}
+
+openrc() {
+ depends="openrc>=0.24.1-r6"
+ replaces="openntpd busybox-initscripts acpid-openrc"
+ _helper_openrc $_openrc_files
+ # poweroff script for acpid
+ mkdir -p "$subpkgdir"/etc/acpi/PWRF
+ { echo '#!/bin/sh' ; echo poweroff ; } > "$subpkgdir"/etc/acpi/PWRF/00000080
+ chmod 0755 "$subpkgdir"/etc/acpi/PWRF/00000080
+}
+
+mdev_openrc() {
+ depends="openrc>=0.24.1-r6 mdev-conf"
+ replaces="busybox-initscripts"
+ provides="dev-openrc"
+ provider_priority=30
+ _helper_openrc $_mdev_openrc_files
+}
+
+extras_openrc() {
+ depends="openrc>=0.24.1-r6 busybox-extras"
+ replaces="busybox-initscripts"
+ _helper_openrc $_extras_openrc_files
+}
+
sha512sums="
62b2e718b6669271380445ed6db249618d777a4e8d5e6d879fa39ffee43887b6a2e93ceef874c615c565ad492deb772b03a19b7475c403202741579fb151e16a busybox-1.35.0.tar.bz2
ead3403578c071c2216de17ab0543984c1f1509c12c062f03af49141547c3ea21356f3e8f0f0695550f05a41a1379dd73fc3cc18dcd78addbb411f247351e353 0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
@@ -300,9 +384,10 @@ ecbe5c890d966f09280c7eb534109f785c68e292765f17ed7ff62fcc61d20f61443c4155add0a1eb
0040800382a6e3adcc6a8094b821488c7e297fc80304afba23a4fca43b7b26ac699378dfbd930ebbf9985336b3e431301f7ca93e2d041a071902a48740d263ef 0015-ed-don-t-use-memcpy-with-overlapping-memory-regions.patch
4c95dc4bf6aff9018bfb52b400f6d8375a1d22493b44ea516cb12dba6556f12797a3cba55768d2e59ff57c0f3247ec1ff95edb8f17561f3d37ec18d83ca47eb0 0016-ash-don-t-read-past-end-of-var-in-subvareval-for-bas.patch
ccdf098fb15eaa316708181469a1193d6eec7067131e7b7645e0219bf03cfd07f4f79e8f62c1e560f6146dcc38186a29bdee08aaa39f290e11d020b8f07d2f65 0017-ash-Fix-use-after-free-on-idx-variable.patch
+3abdbd25f1f0daa24b0aabe92880c28dc2d3b59eb29fad357dfaf2b78bb895466bbf4495e2185370d9219d65b22e65e525769e369e50fb1fdfd71b5229a4f429 0018-ash-fix-ifs-cleanup-on-error-paths.patch
6d100fe44da2b97c2cbdda253d0504b487212d195144d9315cddbe8c51d18fae3745701923b170b40e35f54b592f94f02cadbffd9cb716661c12a7f1da022763 0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
e33dbc27d77c4636f4852d5d5216ef60a9a4343484e4559e391c13c813bf65c782b889914eff2e1f038d74cf02cb0d23824ebbb1044b5f8c86260d5a1bbc4e4d 0001-pgrep-add-support-for-matching-against-UID-and-RUID.patch
-2640698e5108434991a8491fcc508bd991d2111b14bb6957385393a36603e1d81fdf826ad7b150d487d2a924630ee54c0fc4f979214e90feca9ba7d2fd96a865 0001-avoid-redefined-warnings-when-building-with-utmps.patch
+7608fbb9deddc9268ba53bc5b762a00fa16744d595f6f8a2f5a857339e754ea0c3da084a1e48269c8281553e9171d2bb29b8530fbe85e6a934f97c3cfcdbe31b 0001-avoid-redefined-warnings-when-building-with-utmps.patch
9b66151ef51293292b3829adaf721e5453c0710b1d151ab7e959aff0ffae2ec704e686161909cbbfc09c700e23e7200f5e14539ccc5583bccaa11193ea0cffce test-fix-tarball-creation.patch
f65052adc4df305c22f79cc2819d7750b528ad66289512fc15c442c4347ebd6bc14340e60f2c5209d2e7d2e7feb7d19f372e02dca2451dd36787c5f6908c21d8 test-timezone-workaround.patch
b52050678e79e4da856956906d07fcb620cbf35f2ef6b5a8ee3b8d244ea63b4b98eef505451184d5b4937740d91eef154ed748c30d329ac485be51b37626f251 0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch
@@ -310,10 +395,30 @@ ead4ad65d270d8659e1898fa16f76b6cbcf567d8aba238eacccda3764edb4362240d9359d6389873
4f6ddd59d6096943f617b0938fca428114190b8b37732d6783faab291451a2c30c452ed39299db22d1d9679d007022f87d43e93b38a4f6ced64a8659e9233773 0001-modinfo-add-k-option-for-kernel-version.patch
22e2fa8f7a6105fd9990f93b71c235980fd4eab62269939a0e3a920fe517ee4f913c6bd0148a554b67fe01d1660bf0fd76a80e9dcac290b4b8b2c304ef6080a9 CVE-2022-30065.patch
aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate
-20ad8edb3741ffffa99bdb4c00603ddfc76564c869cb46736f878eba01cc3d3f611dd8049625a66ad7f018ce485a9d9592ec133fc8fe7f13da3d69daa6c545ec busyboxconfig
-9dc49c5ff0750cd713f49ee566a19e705e6b68e360a82e2c99b15a5271c7e8a5c47aaf399a03828befbe4e9ccbebb3de766cc0cfc1672848a939b5ae97b44aa1 busyboxconfig-extras
+4947c70497629cda33a9eaac8cef5ea4f4cc4c2160e65bcd988b45c33964af86679e7604dac3f72470dd98490bb1c84b0e34acc4b6f7f65b8154db1073d60170 busyboxconfig
+2209f502a13b33891b08f684bd22dd32a18bf2191ece31a807cae8aa01f6c00503858eb6281e638b8eeb68f8b1f154d72dbf7a06b76efdaaa586467af581eab8 busyboxconfig-extras
0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c
6321c1d96d8938a3b5eab21731de289ede136fff550f98127c509452bfb17769ccf94b118491f7b81d3c60e1bbb3e80bb07186e4ce07e29724a52f0daba9b218 dad.if-up
26eac967d6cfe13b7dc973112de145543ac0bdda9e9dd3a69bbd8c133ae6a20387abe9377917efb770b191130d3a6385ff5738abc84a8216d7b86ae88b159260 ssl_client.c
-c3194ccffe7300a0f55d50fb56d38c8df55d588adac13056fd0be2676594974477f94de5570a5a882bc864c3711cf67aa43b6ad6808e672f4533dd0f7363d2f5 default.script
+e56f9d74f7d471893ff9c3fde319b989e1854c9b12f06c1b6739694b07165ae256b5c555bc75c92986265df7f0a276001aba73853855c7a0fb3404a091a92c86 default.script
+dd548670114a92404b8e35fb915fdbe5994498b05b0a418583271c3dd72fb7800950e42c095c902a014eb198c046b8a346d43dccd8e7a158048ae33767c572ed acpid.initd
+34c6f3197064bb91619b899b28a201bd4d920b18bded3845440b2cb36dc6f16cabf447c96878349b16e46c30184cbe48bac00a01c5f7cf1be038c0b7136064c5 crond.confd
+c9d0fb0f8cc27d661d3b4e58c56eb598ca368890576e18ffffd42efdf68ba35537656be9be319b2e2818aa0152d3ca8611bece2433512fbfcd4eed7988765549 crond.initd
+f9bf43b72142bbb4c0665c1268a3d91586ef8a057dfe64c53b6923815d2db1f669b8080a38311ad89cda0b783a8628700fc5414d834a21d8e48515760bb910f7 klogd.confd
+e8deb44d6a7c4cf7e1ced3436ad8c97ed86ff211d2db270cdd4a96e0cc4e6720909a821c35bc2830769da2304f9d6fc732051e205c8e22fe9a65d2798dfe3c42 klogd.initd
+b0ba67585f39d83320ed6de183d7463a0e163807b9f3dc6f0baa212236056f22aeb2c5399dfdcd54929eb5ae06a15714c2fed133b5888869ed9d9cf589cef843 ntpd.confd
+c30d3936e045c01fdc9d1e9d1c0d2cd79b6dabb453400f067bc4eefa239a41c98bbe3fcd3ae53792e0e6d8fcf4aebc727e4524ec3ccd5741d5659a0a351c1c7e ntpd.initd
+3d6c4d358e226e0c0462f2003bcf0b6787f91a53f4d6b6db5bfe7748bb0dd392d7cc454058ea8a9b649e8dd2629963a5ad1257c36af04367caeb1923f954daf7 rdate.confd
+a95d03564712803fc58c48534f2fbbf23dd8418ffd3a6a06f840e969627892eea518b4fe17f059850665fc056cedf972c26aee52c309805987fb5c59a710bd30 rdate.initd
+bf8173ee33a5d2b61cbdbc1b070e599a17a21e5433a0d8aa9beef71e4ac831304076af8e7e58dc594cdee61562329793afdc57af91e5496bf5fffb9b734a3d9c syslog.confd
+acfd45bda4526ab551a30faec1742ad1569aa85e0d315959c3e3a3d6a693f94c74efeb57a00b8791524651e8a61d3f7ea3e3e08a4b0291ec46309f594ee8124c syslog.initd
+acbba3385fb2c416362eb9176f24146b617a2e394ee0e00b9eff89350f82468a5ab8396f4f52b0aaf03d341ac6150c73182e808fa3f29a2dc71c69271cdfb811 loadkmap.confd
+1b61a0f1eb40f2ea14bf3ed3441996f343d70fd45858d443f21244f133dcdf1c64433c3deaef769eee4e3e698b405f25e1bbc185a25c351a88ce7d120d61cf00 loadkmap.initd
+359af0a4a1841dd6557eaf3e71d39f0d7a2687bad6a8fc6ef436eccf72a40f85c6400a3b7880c7f64d8e460b6af8a0ff3dd5ffc3a4b1aa8eb0d8f7eaf99ee3e4 watchdog.confd
+0a4f989068f00dd8599433ea1fe0713c405ed871750b918e32db2d6bccefc8b870ea2e16864d1b7c3dd57d63e04b41aa0bf9c882c1a9e8108def141d12072e90 watchdog.initd
+6ce0b2a8fe69cc7ea657c5b9076aba51c8f0beeaafa4a887d8673bcc9f9cf8ee40f4b07d2d901ec7a1a1e4f29c150c496559559e803595d0bd487dec56b530a2 mdev.initd
+612a7ffb475fd23d33b2a7266b621537ca59b4abd8cb5a9ce03771800ec4f7622a8ff380320f8d768291e4d1a68adfff28f369776a80125940ee40b2e4a5db4d dnsd.initd
+66bfd7d2a03f4e8a50f08b7057091bfef8e36001eb7c07574ec45da6d75db05a88ae37dbd51e3e3fc7b00a784bf69f8416682ce0454ca16cc072358abdf4d2ce httpd.initd
+9f7c96a7af5e0f6450b6100b7f99e3fe52759f797dca3a92e8e4ad7c08e6acf384fba2496a4e1e8b77f60ba23195bf2bf58013b16aa03f649a16d6f8aad3f8a9 inetd.initd
+1d4574ec7cc6d7e9952bb50b4fcb10a910868688da03a25aede492835313c686247bde1faa17f50243d61a93bfc1d8fa54cf821d7be908581e365b0f1b6a5588 udhcpd.initd
"
diff --git a/main/busybox-initscripts/acpid.initd b/main/busybox/acpid.initd
index 2e73b777bb..2e73b777bb 100644
--- a/main/busybox-initscripts/acpid.initd
+++ b/main/busybox/acpid.initd
diff --git a/main/busybox/busybox-extras.post-install b/main/busybox/busybox-extras.post-install
index a0327a6910..dc663a554f 100644
--- a/main/busybox/busybox-extras.post-install
+++ b/main/busybox/busybox-extras.post-install
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/busybox sh
# Create all symlinks
exec /bin/busybox-extras --install -s
diff --git a/main/busybox/busybox.post-install b/main/busybox/busybox.post-install
index 30c436115c..fa265421dd 100644
--- a/main/busybox/busybox.post-install
+++ b/main/busybox/busybox.post-install
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/busybox sh
# We need the symlinks early
/bin/busybox mkdir -p "/bin" "/sbin" "/usr/bin" "/usr/sbin"
diff --git a/main/busybox/busybox.post-upgrade b/main/busybox/busybox.post-upgrade
index b478cbe0cb..9587dd89cb 100644
--- a/main/busybox/busybox.post-upgrade
+++ b/main/busybox/busybox.post-upgrade
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/busybox sh
# remove links that has been relocated or removed
# - generate a list of all symlinks in bin dirs and a list with all busybox
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index ebf00edc78..0ff2d5e884 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -650,7 +650,7 @@ CONFIG_FEATURE_MDEV_RENAME=y
CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
CONFIG_FEATURE_MDEV_EXEC=y
CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
-# CONFIG_FEATURE_MDEV_DAEMON is not set
+CONFIG_FEATURE_MDEV_DAEMON=y
CONFIG_MESG=y
CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
# CONFIG_MKE2FS is not set
diff --git a/main/busybox/busyboxconfig-extras b/main/busybox/busyboxconfig-extras
index 34ed93e6ae..67b8237621 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.35.0
-# Wed Dec 29 18:19:30 2021
+# Wed Jul 6 13:33:15 2022
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -747,7 +747,7 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0
# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
-# CONFIG_CONSPY is not set
+CONFIG_CONSPY=y
# CONFIG_CROND is not set
# CONFIG_FEATURE_CROND_D is not set
# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
@@ -938,7 +938,7 @@ CONFIG_FAKEIDENTD=y
# CONFIG_SSL_CLIENT is not set
# CONFIG_TC is not set
# CONFIG_FEATURE_TC_INGRESS is not set
-# CONFIG_TCPSVD is not set
+CONFIG_TCPSVD=y
# CONFIG_UDPSVD is not set
CONFIG_TELNET=y
CONFIG_FEATURE_TELNET_TTYPE=y
diff --git a/main/busybox-initscripts/crond.confd b/main/busybox/crond.confd
index 542af1ed1d..542af1ed1d 100644
--- a/main/busybox-initscripts/crond.confd
+++ b/main/busybox/crond.confd
diff --git a/main/busybox-initscripts/crond.initd b/main/busybox/crond.initd
index afaf384acd..afaf384acd 100644
--- a/main/busybox-initscripts/crond.initd
+++ b/main/busybox/crond.initd
diff --git a/main/busybox/default.script b/main/busybox/default.script
index e2cd5218d6..fd66e830c6 100644
--- a/main/busybox/default.script
+++ b/main/busybox/default.script
@@ -120,7 +120,7 @@ resolvconf() {
echo "nameserver $i" >> "$RESOLV_CONF.$$"
done
chmod a+r "$RESOLV_CONF.$$"
- mv "$RESOLV_CONF.$$" "$RESOLV_CONF"
+ mv -f "$RESOLV_CONF.$$" "$RESOLV_CONF"
}
bound() {
diff --git a/main/busybox-initscripts/dnsd.initd b/main/busybox/dnsd.initd
index dc6ddb730b..dc6ddb730b 100644
--- a/main/busybox-initscripts/dnsd.initd
+++ b/main/busybox/dnsd.initd
diff --git a/main/busybox-initscripts/httpd.initd b/main/busybox/httpd.initd
index 001aeb5a38..001aeb5a38 100644
--- a/main/busybox-initscripts/httpd.initd
+++ b/main/busybox/httpd.initd
diff --git a/main/busybox-initscripts/inetd.initd b/main/busybox/inetd.initd
index 2f0c6fa316..2f0c6fa316 100644
--- a/main/busybox-initscripts/inetd.initd
+++ b/main/busybox/inetd.initd
diff --git a/main/busybox-initscripts/klogd.confd b/main/busybox/klogd.confd
index 100deedaac..100deedaac 100644
--- a/main/busybox-initscripts/klogd.confd
+++ b/main/busybox/klogd.confd
diff --git a/main/busybox-initscripts/klogd.initd b/main/busybox/klogd.initd
index 6f83ca1c30..6f83ca1c30 100644
--- a/main/busybox-initscripts/klogd.initd
+++ b/main/busybox/klogd.initd
diff --git a/main/busybox-initscripts/loadkmap.confd b/main/busybox/loadkmap.confd
index 2bdbc0608c..2bdbc0608c 100644
--- a/main/busybox-initscripts/loadkmap.confd
+++ b/main/busybox/loadkmap.confd
diff --git a/main/busybox-initscripts/loadkmap.initd b/main/busybox/loadkmap.initd
index 7149dd729e..7149dd729e 100644
--- a/main/busybox-initscripts/loadkmap.initd
+++ b/main/busybox/loadkmap.initd
diff --git a/main/busybox-initscripts/mdev.initd b/main/busybox/mdev.initd
index 9dbb994896..630d83777d 100644
--- a/main/busybox-initscripts/mdev.initd
+++ b/main/busybox/mdev.initd
@@ -1,39 +1,40 @@
#!/sbin/openrc-run
+description="the mdev device manager"
+
depend() {
provide dev
need sysfs dev-mount
before checkfs fsck
- keyword -vserver -lxc
+ keyword -containers -vserver -lxc
}
-start() {
- # check if udev is specified on cmd line
- if get_bootparam "udev"; then
- ewarn "Skipping mdev as udev requested in kernel cmdline"
- return 0
- fi
-
+_start_service () {
ebegin "Starting busybox mdev"
mkdir -p /dev
-
- # use mdev for hotplug
echo "/sbin/mdev" > /proc/sys/kernel/hotplug
-
+ eend $?
+}
+
+_start_coldplug () {
+ ebegin "Scanning hardware for mdev"
# mdev -s will not create /dev/usb[1-9] devices with recent kernels
- # so we trigger hotplug events for usb for now
+ # so we manually trigger events for usb
for i in $(find /sys/devices -name 'usb[0-9]*'); do
[ -e $i/uevent ] && echo add > $i/uevent
done
-
- # create devices
+ # trigger the rest of the coldplug
mdev -s
eend $?
}
+start() {
+ _start_service
+ _start_coldplug
+}
+
stop() {
ebegin "Stopping busybox mdev"
- echo "" > /proc/sys/kernel/hotplug
+ echo > /proc/sys/kernel/hotplug
eend
}
-
diff --git a/main/busybox-initscripts/ntpd.confd b/main/busybox/ntpd.confd
index c5b4c1c1d4..c5b4c1c1d4 100644
--- a/main/busybox-initscripts/ntpd.confd
+++ b/main/busybox/ntpd.confd
diff --git a/main/busybox-initscripts/ntpd.initd b/main/busybox/ntpd.initd
index ad738057da..ad738057da 100644
--- a/main/busybox-initscripts/ntpd.initd
+++ b/main/busybox/ntpd.initd
diff --git a/main/busybox-initscripts/rdate.confd b/main/busybox/rdate.confd
index 93c6786169..93c6786169 100644
--- a/main/busybox-initscripts/rdate.confd
+++ b/main/busybox/rdate.confd
diff --git a/main/busybox-initscripts/rdate.initd b/main/busybox/rdate.initd
index 708429f17b..708429f17b 100644
--- a/main/busybox-initscripts/rdate.initd
+++ b/main/busybox/rdate.initd
diff --git a/main/busybox-initscripts/syslog.confd b/main/busybox/syslog.confd
index 2f00667118..2f00667118 100644
--- a/main/busybox-initscripts/syslog.confd
+++ b/main/busybox/syslog.confd
diff --git a/main/busybox-initscripts/syslog.initd b/main/busybox/syslog.initd
index 629d86843b..629d86843b 100644
--- a/main/busybox-initscripts/syslog.initd
+++ b/main/busybox/syslog.initd
diff --git a/main/busybox-initscripts/udhcpd.initd b/main/busybox/udhcpd.initd
index 02c7620d27..02c7620d27 100644
--- a/main/busybox-initscripts/udhcpd.initd
+++ b/main/busybox/udhcpd.initd
diff --git a/main/busybox-initscripts/watchdog.confd b/main/busybox/watchdog.confd
index 5cfd2c2cc4..5cfd2c2cc4 100644
--- a/main/busybox-initscripts/watchdog.confd
+++ b/main/busybox/watchdog.confd
diff --git a/main/busybox-initscripts/watchdog.initd b/main/busybox/watchdog.initd
index 5b0435c920..5b0435c920 100644
--- a/main/busybox-initscripts/watchdog.initd
+++ b/main/busybox/watchdog.initd
diff --git a/main/bzip2/APKBUILD b/main/bzip2/APKBUILD
index 4b0d4da080..73063455fc 100644
--- a/main/bzip2/APKBUILD
+++ b/main/bzip2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bzip2
pkgver=1.0.8
-pkgrel=1
+pkgrel=3
pkgdesc="A high-quality data compression program"
url="http://sources.redhat.com/bzip2"
arch="all"
@@ -13,6 +13,7 @@ source="https://sourceware.org/pub/bzip2/bzip2-$pkgver.tar.gz
bzip2-1.0.2-progress.patch
bzip2-1.0.3-no-test.patch
saneso.patch
+ bzip2.pc.in
"
# secfixes:
@@ -51,6 +52,10 @@ package() {
install -D libbz2.so.$pkgver "$pkgdir"/usr/lib/libbz2.so.$pkgver
ln -s libbz2.so.$pkgver "$pkgdir"/usr/lib/libbz2.so
ln -s libbz2.so.$pkgver "$pkgdir"/usr/lib/libbz2.so.${pkgver%%.*}
+
+ mkdir -p "$pkgdir"/usr/lib/pkgconfig/
+ sed "s|@VERSION@|$pkgver|" "$srcdir"/bzip2.pc.in \
+ > "$pkgdir"/usr/lib/pkgconfig/bzip2.pc
}
libbz2() {
@@ -59,9 +64,12 @@ libbz2() {
mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir"/usr/lib/
}
-sha512sums="083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 bzip2-1.0.8.tar.gz
+sha512sums="
+083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 bzip2-1.0.8.tar.gz
58cc37430555520b6e35db2740e699cf37eacdd82989c21a222a593e36288710a0defb003662d4238235c12b3764bfc89cd646e6be9d0a08d54bd2c9baa6ad15 bzip2-1.0.4-makefile-CFLAGS.patch
2d9a306bc0f552a58916ebc702d32350a225103c487e070d2082121a54e07f1813d3228f43293cc80a4bee62053fd597294c99a1751b1685cd678f4e5c6a2fe7 bzip2-1.0.4-man-links.patch
b6810c73428f17245e0d7c2decd00c88986cd8ad1cfe4982defe34bdab808d53870ed92cb513b2d00c15301747ceb6ca958fb0e0458d0663b7d8f7c524f7ba4e bzip2-1.0.2-progress.patch
aefcafaaadc7f19b20fe023e0bd161127b9f32e0cd364621f6e5c03e95fb976e7e69e354ec46673a554392519532a3bfe56d982a5cde608c10e0b18c3847a030 bzip2-1.0.3-no-test.patch
-dd624110ce06426d2990ad1de96f5b6a2790c599030fb8848e26b64aa847cf956806f7a539fe61c6005d99bfc135920fc704f274862d2557ab1861adb7391d45 saneso.patch"
+dd624110ce06426d2990ad1de96f5b6a2790c599030fb8848e26b64aa847cf956806f7a539fe61c6005d99bfc135920fc704f274862d2557ab1861adb7391d45 saneso.patch
+e17c6f8f88a89d38667a68cd1397c863663c7996a9f18481f3f6ed35902044220c01e5fe19f114159fceac068a4dd32c2ddc903f0d0901cdf722c841dd9f2b93 bzip2.pc.in
+"
diff --git a/main/bzip2/bzip2.pc.in b/main/bzip2/bzip2.pc.in
new file mode 100644
index 0000000000..a4dd68259c
--- /dev/null
+++ b/main/bzip2/bzip2.pc.in
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=/usr
+bindir=${exec_prefix}/bin
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: bzip2
+Description: A file compression library
+Version: @VERSION@
+Libs: -L${libdir} -lbz2
+Cflags: -I${includedir}
diff --git a/main/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD
index 9d6e2cbcf7..8c8a06b336 100644
--- a/main/ca-certificates/APKBUILD
+++ b/main/ca-certificates/APKBUILD
@@ -1,18 +1,17 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ca-certificates
-pkgver=20211220
-pkgrel=0
+pkgver=20220614
+pkgrel=2
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="openssl1.1-compat-dev"
+makedepends_host="openssl-dev>3"
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"
+replaces="openssl"
options="!fhs !check"
triggers="ca-certificates.trigger=/usr/share/ca-certificates:/usr/local/share/ca-certificates:/etc/ssl/certs:/etc/ca-certificates/update.d"
install="$pkgname.post-deinstall"
@@ -62,8 +61,13 @@ bundle() {
"$subpkgdir"/etc/ssl/certs/
ln -s certs/ca-certificates.crt \
"$subpkgdir"/etc/ssl/cert.pem
+
+ # Symlinks for OpenSSL 1.1 compatibility
+ mkdir -p "$subpkgdir"/etc/ssl1.1/
+ ln -s /etc/ssl/certs "$subpkgdir"/etc/ssl1.1/
+ ln -s /etc/ssl/cert.pem "$subpkgdir"/etc/ssl1.1/
}
sha512sums="
-6b486384c80b29632939a28524acfeeedc60f5df44da86bc16ce79f3cf2ff464455e963ebeb410c3072829b9083215961b32c18673ff77b211652d4c1e870799 ca-certificates-20211220.tar.bz2
+8e20d3021222bb3b470a935d34ffe23e7857bf0b7fedda5284049155aab01bc88ab54ae939376968fb7fbff41e6b06bd32e34405210a8e74faadb68ffa6d9dd4 ca-certificates-20220614.tar.bz2
"
diff --git a/main/cairo/APKBUILD b/main/cairo/APKBUILD
index 5b075754c3..234b0ebce8 100644
--- a/main/cairo/APKBUILD
+++ b/main/cairo/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cairo
pkgver=1.17.6
-pkgrel=2
+pkgrel=3
pkgdesc="A vector graphics library"
url="https://cairographics.org/"
arch="all"
options="!check" # Recursive dependency on gtk+2.0 for check.
license="LGPL-2.0-or-later MPL-1.1"
depends_dev="
- $pkgname-tools
+ $pkgname-tools=$pkgver-r$pkgrel
fontconfig-dev
freetype-dev
libxext-dev
@@ -16,7 +16,8 @@ depends_dev="
pixman-dev
xcb-util-dev
"
-makedepends="$depends_dev
+makedepends="
+ $depends_dev
expat-dev
glib-dev
gtk-doc
@@ -36,7 +37,6 @@ source="https://gitlab.freedesktop.org/cairo/cairo/-/archive/$pkgver/cairo-$pkgv
musl-stacksize.patch
fix-type1-subset-indexing.patch
"
-builddir="$srcdir/$pkgname-$pkgver"
# secfixes:
# 1.17.4-r1:
@@ -48,14 +48,16 @@ builddir="$srcdir/$pkgname-$pkgver"
build() {
abuild-meson \
+ -Db_lto=true \
-Ddefault_library=both \
-Dgtk_doc=true \
- output
+ -Dtests="$(want_check && echo enabled || echo disabled)" \
+ . output
meson compile ${JOBS:+-j ${JOBS}} -C output
}
check() {
- meson test --no-rebuild -v -C output
+ meson test --no-rebuild --print-errorlogs -C output
}
package() {
diff --git a/main/ccache/APKBUILD b/main/ccache/APKBUILD
index 2a1642b305..58371615ab 100644
--- a/main/ccache/APKBUILD
+++ b/main/ccache/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ccache
-pkgver=4.6.1
+pkgver=4.6.3
pkgrel=0
pkgdesc="fast C/C++ compiler cache"
url="https://ccache.dev/"
@@ -19,7 +19,8 @@ makedepends="
checkdepends="bash util-linux-misc python3 redis"
subpackages="$pkgname-doc"
source="https://github.com/ccache/ccache/releases/download/v$pkgver/ccache-$pkgver.tar.xz
- ioctl.patch"
+ ioctl.patch
+ "
# XXX: https://github.com/ccache/ccache/issues/1014
case "$CARCH" in
@@ -36,8 +37,12 @@ build() {
check() {
case $CARCH in
- armhf) echo "SKIP make -C build test on $CARCH" ;;
- *) ninja -C build test ;;
+ armhf)
+ echo "SKIP make -C build test on $CARCH"
+ ;;
+ *)
+ ctest -j4 --output-on-failure --test-dir build
+ ;;
esac
}
@@ -55,6 +60,6 @@ package() {
}
sha512sums="
-361427ccecd74e8c25ca6a98ef3d3c125d81862196767eb383f6f8159fed8e1695cd5bc8731cb591c23c55352f0114a088b32a673717711efbfbb178a6c08c82 ccache-4.6.1.tar.xz
+b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966 ccache-4.6.3.tar.xz
785ce34305a3bb6c24117341157356c2bd2272eca9d58fa20acd14a023abe6f784c88d9c55656d2f37320392bb73a61c52cd8b6bd9ac7c5316c8ed187dd6f5fb ioctl.patch
"
diff --git a/main/cdparanoia/APKBUILD b/main/cdparanoia/APKBUILD
index 2d1c905184..57ecc5992f 100644
--- a/main/cdparanoia/APKBUILD
+++ b/main/cdparanoia/APKBUILD
@@ -2,15 +2,15 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cdparanoia
pkgver=10.2
-pkgrel=10
+pkgrel=11
pkgdesc="An audio CD extraction application"
-url="http://www.xiph.org/paranoia"
+url="https://www.xiph.org/paranoia"
arch="all"
options="!check" # Build system has test suite commented out.
license="LGPL-2.0-or-later"
makedepends="libtool autoconf automake linux-headers"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-source="http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz
+source="https://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz
gcc.patch
fix-includes.patch"
builddir="$srcdir/$pkgname-III-$pkgver"
diff --git a/main/cgit/APKBUILD b/main/cgit/APKBUILD
index 930ead579d..e14c09a8b3 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=2
+pkgrel=3
_gitver=2.25.1
pkgdesc="A fast webinterface for git"
url="https://git.zx2c4.com/cgit/"
arch="all"
license="GPL-2.0-only"
-makedepends="openssl1.1-compat-dev zlib-dev lua5.3-dev asciidoc"
+makedepends="openssl-dev>3 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 1e1d7284ab..ae93356f43 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=4
+pkgrel=5
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 openssl1.1-compat-dev zlib-dev file
+ bison flex openssl-dev>3 zlib-dev file
sqlite-dev libltdl"
install="$pkgname.pre-install"
subpackages="$pkgname-openrc"
diff --git a/main/checkbashisms/APKBUILD b/main/checkbashisms/APKBUILD
index 1be57cb006..9f3a1a0b74 100644
--- a/main/checkbashisms/APKBUILD
+++ b/main/checkbashisms/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=checkbashisms
-pkgver=2.22.1
+pkgver=2.22.2
pkgrel=0
pkgdesc="Check shell scripts for POXIX compliance"
url="https://tracker.debian.org/pkg/devscripts"
@@ -8,8 +8,8 @@ arch="noarch"
license="GPL-2.0-or-later"
depends="perl"
subpackages="$pkgname-doc $pkgname-bash-completion"
-source="https://ftp.debian.org/debian/pool/main/d/devscripts/devscripts_$pkgver.tar.xz"
-builddir="$srcdir/devscripts-$pkgver/scripts"
+source="https://salsa.debian.org/debian/devscripts/-/archive/v$pkgver/devscripts-v$pkgver.tar.gz"
+builddir="$srcdir/devscripts-v$pkgver/scripts"
check() {
printf '#!/bin/sh\necho "hello world"\n' > ./testfile
@@ -32,5 +32,5 @@ package() {
}
sha512sums="
-260603e1a655035c5aca3c9734db1bc6aa7e9aa017ece7e9158c57e06a1ee548922ec2defdd9dcb4560743d78aef08d30695b1bc833bd4d77fe1c7497d157c45 devscripts_2.22.1.tar.xz
+9c08b7f2d4e386bafdab12443ba621204e2ee543f660bd574ad5f8dbfe33c889157dfa6fdf0616528f0735ee79885f67af5cea2da6e3aea6858ce945735251aa devscripts-v2.22.2.tar.gz
"
diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD
index 1b2791e0c7..aa61416a00 100644
--- a/main/chrony/APKBUILD
+++ b/main/chrony/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=chrony
-pkgver=4.2
+pkgver=4.3
pkgrel=0
pkgdesc="NTP client and server programs"
url="https://chrony.tuxfamily.org"
@@ -15,7 +15,6 @@ makedepends="asciidoctor libcap-dev texinfo nettle-dev gnutls-dev"
checkdepends="bash"
subpackages="$pkgname-doc $pkgname-openrc"
source="https://download.tuxfamily.org/chrony/chrony-$pkgver.tar.gz
- fix-tests.patch
max_resolve_interval.patch
chronyd.confd
@@ -80,8 +79,7 @@ package() {
}
sha512sums="
-7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d chrony-4.2.tar.gz
-067d47224a8c075ec8f63ffc58e65b030fdf228a72c4f03d50a2f2c17414da65bb5d27c7c2e4ba99e909f452041db83eaebe3c9e34c0c8fce18e05ebb489735e fix-tests.patch
+1394bac3ed684352fe89b7fef7da50e61f9f522abee807627ae1fc4c2dde891017bc8e5b13759fced028f3a1e875d5e4e5a4f85de65c63b5f83d0ca03bb4c5df chrony-4.3.tar.gz
b26581ed32680585edea5b8163a0062a87f648394c0f363c77a7d01a36608fcf4d005d9e6ab179ed2827b8a08f598f7bad4801bb5e135cad5107eb77fb19b247 max_resolve_interval.patch
c1ce577ed1af9f3d88a6a2880a4834ae0c6a7f45870d9396d2aacd7716eb8de346ce458e1a45fdd48b1e8b8f5cd3afcba9534ac47fedb517604c9d910a342fac chronyd.confd
1501161812ad12679d47a1b671d2ddbe94ec5825d5e225729057abc3b8869cb813acd8bdd7adaba0cd786afdf04280228e327a3b83f89a11d06bf3cb826c5269 chronyd.initd
diff --git a/main/chrony/fix-tests.patch b/main/chrony/fix-tests.patch
deleted file mode 100644
index 6291fb0469..0000000000
--- a/main/chrony/fix-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr chrony-3.2.orig/test/unit/test.c chrony-3.2/test/unit/test.c
---- chrony-3.2.orig/test/unit/test.c 2017-11-29 11:32:23.610059580 +0100
-+++ chrony-3.2/test/unit/test.c 2017-11-29 11:32:51.213742887 +0100
-@@ -23,6 +23,8 @@
- #include <logging.h>
- #include <localp.h>
-
-+#include <sys/param.h>
-+
- #include "test.h"
-
- void
diff --git a/main/chrpath/APKBUILD b/main/chrpath/APKBUILD
index f2bc440be4..0c77afca66 100644
--- a/main/chrpath/APKBUILD
+++ b/main/chrpath/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=chrpath
pkgver=0.16
-pkgrel=2
+pkgrel=3
pkgdesc="Modify rpath of compiled programs"
url="https://tracker.debian.org/pkg/chrpath"
arch="all"
@@ -15,7 +15,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" docdir=/usr/share/doc/$pkgname-$pkgver \
install
}
diff --git a/main/cifs-utils/APKBUILD b/main/cifs-utils/APKBUILD
index 03ccae8f85..0618751fb1 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.15
+pkgver=7.0
pkgrel=0
pkgdesc="CIFS filesystem user-space tools"
url="https://wiki.samba.org/index.php/LinuxCIFS_utils"
@@ -50,7 +50,7 @@ package() {
}
sha512sums="
-eedb8066563db584595a8ba7cb7a603e6b763ac2c1261430d605c327fcc5a831acd48b58ea55dd243af778dfdc827ab8c6daf4015764ff550dcffc2182773510 cifs-utils-6.15.tar.bz2
+4c57741af0c4567a78f352c73caca998881666a5ed36536275cfa775efd66ff1a44ebe539a8ed96c409c5b08a1378266964ce667a27e9fc7f2d43999c63dd0eb cifs-utils-7.0.tar.bz2
99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch
2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch
"
diff --git a/main/ciwiki/APKBUILD b/main/ciwiki/APKBUILD
index aa2ebc8802..0d37d4a1f5 100644
--- a/main/ciwiki/APKBUILD
+++ b/main/ciwiki/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
# Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
pkgname=ciwiki
-pkgver=2.0.5
-pkgrel=2
+pkgver=2.0.8
+pkgrel=0
pkgdesc="personal lightweight wiki written in C"
url="http://ciwiki.sourceforge.net/"
arch="all"
@@ -28,5 +28,7 @@ package() {
}
-sha512sums="ce4aefb8fa7cc0630b1d1841260452d50f762a8c8b3e8da1fb0c878cada9ccfc1824d1e20004db8bc8f9c77a0658879e3fa97c4914e73618b404937fb5ea1c29 ciwiki-2.0.5.tar.gz
-d6843ea7a757ad3ebc59f550c8fbebe5c12ddf7345f31c5cac9aca3929f263264d9eb6dbc48c0edb107e2d122b299017da94bf6909a5db565b7a7872ff415ea3 gcc-10.patch"
+sha512sums="
+0686f01837add6d88f21e4f8f81e719515909515274ca7a91032eeaf3cf06b43a0cac6aaff69e088032652646b3602be1f970145a76fb96e05a9fe6fc7b1757d ciwiki-2.0.8.tar.gz
+c023a1e94e5a69c42640b9b0f3cf9ded4201f8116eb815c73cdd93718abe75d5d1e5d8875112acb8fc789664f6fdbcdedd054525185d983c5fec0d34bb0fe3d3 gcc-10.patch
+"
diff --git a/main/ciwiki/gcc-10.patch b/main/ciwiki/gcc-10.patch
index 52aaf26142..9d09f06447 100644
--- a/main/ciwiki/gcc-10.patch
+++ b/main/ciwiki/gcc-10.patch
@@ -1,15 +1,12 @@
Upstream: Should be
Reason: Fixes compilation under gcc-10
-diff --git a/src/wiki.c b/src/wiki.c
-index cb88f72..b2be314 100755
--- a/src/wiki.c
+++ b/src/wiki.c
-@@ -29,8 +29,7 @@ extern int upload_status;
- extern int lgindex;
+@@ -30,7 +30,7 @@ extern int lgindex;
extern int Exec_allowed;
extern int Upload_allowed;
--
+
-int loginform;
+extern int loginform;
diff --git a/main/ckbcomp/APKBUILD b/main/ckbcomp/APKBUILD
index 4b9770b262..45013c01a0 100644
--- a/main/ckbcomp/APKBUILD
+++ b/main/ckbcomp/APKBUILD
@@ -1,15 +1,15 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ckbcomp
-pkgver=1.208
+pkgver=1.209
pkgrel=0
pkgdesc="Compile a XKB keyboard description to a keymap"
-url="https://packages.debian.org/sid/console-setup"
+url="https://salsa.debian.org/installer-team/console-setup"
arch="noarch"
license="GPL-2.0-or-later"
depends="perl"
options="!check"
subpackages="$pkgname-doc"
-source="https://deb.debian.org/debian/pool/main/c/console-setup/console-setup_$pkgver.tar.xz"
+source="https://salsa.debian.org/installer-team/console-setup/-/archive/$pkgver/console-setup-$pkgver.tar.gz"
builddir="$srcdir"/console-setup-$pkgver
package() {
@@ -18,5 +18,5 @@ package() {
}
sha512sums="
-2fbc68bd6cf10e61eae50cef8fa8e26cc293f22d8303969032e2b693e9e4424cd87bcb7a411868694f7fac66365b3ac2f414dd281bc3dd3ad22d52a25e268313 console-setup_1.208.tar.xz
+4297da451b3efab1b29f83095c1e57e5094f37759581cea9e51d1974f138b9b1700bca9f05a27434345c238e32cea8b8d0f143b79b91059b41b44b87b036eafb console-setup-1.209.tar.gz
"
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
index 344df99286..bae4532c16 100644
--- 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
@@ -67,3 +67,16 @@
// Test default stack protector values for Darwin platforms
// RUN: %clang -target armv7k-apple-watchos2.0 -### %s 2>&1 | FileCheck %s -check-prefix=SSP_WATCHOS
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -563,6 +563,10 @@
+ // The profile runtime also needs access to system libraries.
+ getToolChain().addProfileRTLibs(Args, CmdArgs);
+
++ if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles, options::OPT_nodefaultlibs)) {
++ CmdArgs.push_back("-lssp_nonshared");
++ }
++
+ if (D.CCCIsCXX() &&
+ !Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs,
+ options::OPT_r)) {
diff --git a/main/clang/APKBUILD b/main/clang/APKBUILD
index 0df023ebc9..736f9baa3d 100644
--- a/main/clang/APKBUILD
+++ b/main/clang/APKBUILD
@@ -4,8 +4,7 @@
# Contributor omni <omni+alpine@hack.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=clang
-# Note: Update together with llvm.
-pkgver=14.0.6
+pkgver=15.0.2
pkgrel=0
_llvmver=${pkgver%%.*}
pkgdesc="A C language family front-end for LLVM"
@@ -15,18 +14,21 @@ license="Apache-2.0"
options="!check" # fail to build
makedepends="
cmake
+ help2man
libxml2-dev
- libxml2-utils
llvm$_llvmver-dev
llvm$_llvmver-static
llvm$_llvmver-test-utils
samurai
python3
- py3-sphinx
- " # py3-recommonmark is also needed for -doc, but currently in testing
+ "
checkdepends="diffutils bash gtest-dev"
depends_dev="$pkgname=$pkgver-r$pkgrel $pkgname-extra-tools=$pkgver-r$pkgrel"
-subpackages="$pkgname-static $pkgname-doc $pkgname-libs
+subpackages="
+ $pkgname-static
+ $pkgname-doc
+ $pkgname-libs
+ $pkgname-bash-completion
$pkgname-analyzer::noarch
$pkgname-dev
$pkgname-extra-tools:extra
@@ -34,51 +36,44 @@ subpackages="$pkgname-static $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
+ https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/cmake-$pkgver.src.tar.xz
10-add-musl-triples.patch
30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
- llvm-hello.patch
"
builddir="$srcdir/clang-$pkgver.src"
prepare() {
mv "$srcdir/clang-tools-extra-$pkgver.src" "$builddir/tools/extra"
- # 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 -r f; do
- sed -i "$f" -e 's|^#!/usr/bin/env python$|&3|'
- done
default_prepare
}
build() {
- mkdir -p "$builddir"/build
- cd "$builddir"/build
-
python_version=$(python3 -V | sed 's/.*\([0-9]\{1,\}\.[0-9]\{1,\}\)\..*/\1/')
- # NOTE: DO NOT change CMAKE_BUILD_TYPE! Buildmodes like None will enable
- # debug assertions for LLVM!
- cmake .. -G Ninja -Wno-dev \
+ # note: the libclang-c soversion is locked at 13 now
+ cmake -B build -G Ninja -Wno-dev \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_EXE_LINKER_FLAGS_RELEASE_INIT="$LDFLAGS -Wl,-z,stack-size=2097152" \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCLANG_VENDOR=Alpine \
- -DLLVM_EXTERNAL_LIT=/usr/bin/lit \
- -DCLANG_BUILD_EXAMPLES=OFF \
- -DCLANG_INCLUDE_DOCS=ON \
- -DCLANG_PYTHON_BINDINGS_VERSIONS="$python_version" \
- -DLLVM_BUILD_DOCS=ON \
- -DLLVM_ENABLE_SPHINX=OFF \
- -DSPHINX_WARNINGS_AS_ERRORS=OFF \
- -DCLANG_INCLUDE_TESTS=ON \
+ -DCMAKE_MODULE_PATH="$srcdir/cmake-$pkgver.src/Modules" \
+ -DCLANG_BUILT_STANDALONE=ON \
+ -DCLANG_FORCE_MATCHING_LIBCLANG_SOVERSION=OFF \
+ -DCLANG_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \
+ -DCLANG_LINK_CLANG_DYLIB=ON \
-DCLANG_PLUGIN_SUPPORT=ON \
- -DLIBCLANG_BUILD_STATIC=ON \
- -DLLVM_ENABLE_EH=ON \
- -DLLVM_ENABLE_RTTI=ON \
- -DCLANG_BUILT_STANDALONE=ON
-
- ninja clang-tblgen
- ninja
+ -DCLANG_PYTHON_BINDINGS_VERSIONS="$python_version" \
+ -DCLANG_VENDOR=Alpine \
+ -DENABLE_LINKER_BUILD_ID=ON \
+ -DLIBCLANG_BUILD_STATIC=ON
+
+ ninja -C build clang-tblgen
+ ninja -C build
+
+ help2man --no-info \
+ --source "Alpine" \
+ --name "Alpine Clang $pkgver-r$pkgrel" \
+ --version-string "$pkgver-r$pkgrel" \
+ --help-option "--help-hidden" \
+ ./build/bin/clang > clang.1
}
check() {
@@ -86,15 +81,20 @@ check() {
}
package() {
+ depends="libstdc++-dev"
DESTDIR="$pkgdir" ninja -C build install
- install -m 644 build/lib/libclang.a "$pkgdir"/usr/lib
-}
-static() {
- pkgdesc="Static libraries for clang"
+ install -Dm644 build/lib/libclang.a -t "$pkgdir"/usr/lib/
+
+ install -Dm644 clang.1 -t "$pkgdir"/usr/share/man/man1/
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
+ rm "$pkgdir"/usr/share/clang/clang-format-bbedit.applescript \
+ "$pkgdir"/usr/share/clang/clang-doc-default-stylesheet.css \
+ "$pkgdir"/usr/share/clang/index.js
+
+ mkdir -p "$pkgdir"/usr/share/bash-completion/completions
+ mv "$pkgdir"/usr/share/clang/bash-autocomplete.sh \
+ "$pkgdir"/usr/share/bash-completion/completions/clang
}
dev() {
@@ -109,22 +109,15 @@ analyzer() {
pkgdesc="Clang source code analysis framework"
depends="$pkgname=$pkgver-r$pkgrel perl python3"
- cd "$pkgdir"
-
- install -dm0755 \
- "$subpkgdir"/usr/bin \
- "$subpkgdir"/usr/lib \
- "$subpkgdir"/usr/libexec \
- "$subpkgdir"/usr/share
-
- mv usr/bin/scan-* "$subpkgdir"/usr/bin/
- mv usr/bin/analyze-build "$subpkgdir"/usr/bin/
- mv usr/bin/intercept-build "$subpkgdir"/usr/bin/
- mv usr/libexec/*-analyzer "$subpkgdir"/usr/libexec/
- mv usr/libexec/analyze-* "$subpkgdir"/usr/libexec/
- mv usr/libexec/intercept-* "$subpkgdir"/usr/libexec/
- mv usr/share/scan-* "$subpkgdir"/usr/share/
- mv usr/lib/libear "$subpkgdir"/usr/lib
+ amove \
+ usr/bin/scan* \
+ usr/bin/analyze-build \
+ usr/bin/intercept-build \
+ usr/libexec/*-analyzer \
+ usr/libexec/analyze-* \
+ usr/libexec/intercept-* \
+ usr/share/scan-* \
+ usr/lib/libear
}
extra() {
@@ -133,12 +126,11 @@ extra() {
cd "$pkgdir"
install -dm0755 \
- "$subpkgdir"/usr/bin \
- "$subpkgdir"/usr/share/clang \
"$subpkgdir"/usr/share/emacs/site-lisp
# FIXME: Make sure this is the right list of binaries for -extra-tools
- mv usr/bin/clang-apply-replacements \
+ amove \
+ usr/bin/clang-apply-replacements \
usr/bin/clang-change-namespace \
usr/bin/clang-check \
usr/bin/clang-doc \
@@ -164,12 +156,11 @@ extra() {
usr/bin/modularize \
usr/bin/pp-trace \
usr/bin/run-clang-tidy \
- "$subpkgdir"/usr/bin
- mv usr/share/clang/clang-include-fixer* \
+ usr/share/clang/clang-include-fixer* \
usr/share/clang/clang-format*.py \
usr/share/clang/*clang-tidy* \
- usr/share/clang/run-find-all-symbols.py \
- "$subpkgdir"/usr/share/clang
+ usr/share/clang/run-find-all-symbols.py
+
mv usr/share/clang/clang-*.el \
"$subpkgdir"/usr/share/emacs/site-lisp
}
@@ -181,15 +172,16 @@ python() {
local sitedir=$(python3 -c "import site; print(site.getsitepackages()[0])")
amove usr/lib/python*
+ amove usr/share/clang/clang-rename.py
# actually a python module..
mv "$pkgdir"/usr/lib/libscanbuild "$subpkgdir"/"$sitedir"
}
sha512sums="
-5f5497b57dd116225e90f321902f1015beb50c0b1bb90d0fc6c026f13aa748feabe44f98eb75e86f98f3b1785ad5e850210732f3eae75b942ecd520527dcd30b clang-14.0.6.src.tar.xz
-b55fd9872e52a27599e27fa665cf39af3d172814c0e7246ea0e57286e9eea42bf816f8b6d350334f3fe5e2fae35a8e59d59e71a3a5de330ecb0622ef7655e63f clang-tools-extra-14.0.6.src.tar.xz
+577ed39126a1eae1e1fe7e27c7b8267a74a8e725169f8eeaf8e41d98917c204ba5826e851e7a707e837c071ba5a5d8ea0cda12020955f075f25c78b237361ca0 clang-15.0.2.src.tar.xz
+b02bba3166f60fae3cfdfc904211368139fe3b9d19258d2d01291b47ead48081a3fb5927b7129e47f7222acd05615b653ca78a4b18be8d38376d01c2fe2f0779 clang-tools-extra-15.0.2.src.tar.xz
+6803d94f7af8561d55d85265065c0adddfae476528dc69313b79faa05afc5733e80a10ae48b0f06e1ac499451ce3e110ba5bcb64b8782fae9cf4894d3d18049c cmake-15.0.2.src.tar.xz
5809d931656cac13b91bc91aac63df072b0403708ac718bf01546d9d520ff2c4163ee11411439dce5bb683a3bfa044b62443b6f66a1419c9086d20e79a018071 10-add-musl-triples.patch
-8d2433160c20e7f4a66dc6e0b4af34fb91f0ef215655c4364ca4d1a65c85e295a9604657ea82fef7414e865e50b3018f4b900398d2ee777224bf1246984fbe54 30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
-e49ac24ebbd2922374c8f0562ef5ba40f481bfc9531303ff391c43d1e0306df360f1bc0e94093521d278ed33662defacf6e7ce644482fb0150259b20f44bba77 llvm-hello.patch
+b9b5529bcf460767796ddbc6f7d8c479b62d63c74d39297b3c7c79a2f6898272ac52a2f2d1ea2bd601e869cecf23c0cd69fbcd613b8c6299b14a1be8203fd089 30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
"
diff --git a/main/clang/llvm-hello.patch b/main/clang/llvm-hello.patch
deleted file mode 100644
index b5cd37a3ed..0000000000
--- a/main/clang/llvm-hello.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Taken from https://reviews.llvm.org/D120301
-
-diff --git a/tools/extra/test/CMakeLists.txt b/tools/extra/test/CMakeLists.txt
---- a/tools/extra/test/CMakeLists.txt
-+++ b/tools/extra/test/CMakeLists.txt
-@@ -15,10 +15,15 @@
-
- string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} CLANG_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
-
-+if (TARGET LLVMHello)
-+ set (LLVM_HAS_LLVM_HELLO 1)
-+endif()
-+
- llvm_canonicalize_cmake_booleans(
- CLANG_TIDY_ENABLE_STATIC_ANALYZER
- CLANG_PLUGIN_SUPPORT
- LLVM_INSTALL_TOOLCHAIN_ONLY
-+ LLVM_HAS_LLVM_HELLO
- )
-
- configure_lit_site_cfg(
-@@ -97,7 +102,10 @@
- endif()
-
- if(TARGET CTTestTidyModule)
-- list(APPEND CLANG_TOOLS_TEST_DEPS CTTestTidyModule LLVMHello)
-+ list(APPEND CLANG_TOOLS_TEST_DEPS CTTestTidyModule)
-+ if (TARGET LLVMHello)
-+ list(APPEND CLANG_TOOLS_TEST_DEPS CTTestTidyModule)
-+ endif()
- target_include_directories(CTTestTidyModule PUBLIC BEFORE "${CLANG_TOOLS_SOURCE_DIR}")
- if(CLANG_PLUGIN_SUPPORT AND (WIN32 OR CYGWIN))
- set(LLVM_LINK_COMPONENTS
-diff --git a/tools/extra/test/clang-tidy/CTTestTidyModule.cpp b/tools/extra/test/clang-tidy/CTTestTidyModule.cpp
---- a/tools/extra/test/clang-tidy/CTTestTidyModule.cpp
-+++ b/tools/extra/test/clang-tidy/CTTestTidyModule.cpp
-@@ -1,4 +1,4 @@
--// REQUIRES: plugins
-+// REQUIRES: plugins, llvm-hello
- // RUN: clang-tidy -checks='-*,mytest*' --list-checks -load %llvmshlibdir/CTTestTidyModule%pluginext -load %llvmshlibdir/LLVMHello%pluginext | FileCheck --check-prefix=CHECK-LIST %s
- // CHECK-LIST: Enabled checks:
- // CHECK-LIST-NEXT: mytest1
-diff --git a/tools/extra/test/lit.cfg.py b/tools/extra/test/lit.cfg.py
---- a/tools/extra/test/lit.cfg.py
-+++ b/tools/extra/test/lit.cfg.py
-@@ -155,3 +155,6 @@
- # Plugins (loadable modules)
- if config.has_plugins and config.llvm_plugin_ext:
- config.available_features.add('plugins')
-+
-+if config.has_llvm_hello:
-+ config.available_features.add("llvm-hello")
-diff --git a/tools/extra/test/lit.site.cfg.py.in b/tools/extra/test/lit.site.cfg.py.in
---- a/tools/extra/test/lit.site.cfg.py.in
-+++ b/tools/extra/test/lit.site.cfg.py.in
-@@ -13,6 +13,7 @@
- config.target_triple = "@TARGET_TRIPLE@"
- config.clang_tidy_staticanalyzer = @CLANG_TIDY_ENABLE_STATIC_ANALYZER@
- config.has_plugins = @CLANG_PLUGIN_SUPPORT@ & ~@LLVM_INSTALL_TOOLCHAIN_ONLY@
-+config.has_llvm_hello = @LLVM_HAS_LLVM_HELLO@
-
- # Support substitution of the tools and libs dirs with user parameters. This is
- # used when we can't determine the tool dir at configuration time.
diff --git a/main/cloog/APKBUILD b/main/cloog/APKBUILD
index 75f6ec4cdc..07e99ff8ee 100644
--- a/main/cloog/APKBUILD
+++ b/main/cloog/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cloog
pkgver=0.20.0
-pkgrel=1
+pkgrel=3
pkgdesc="The Chunky Loop Generator"
url="http://www.cloog.org/"
arch="all"
@@ -35,4 +35,6 @@ package() {
make DESTDIR="$pkgdir" INSTALL="install -D" install
}
-sha512sums="d00cbefd348b45d9d482320a088f7ae736440046b99469cbdfbb177a38dcef182c3305f0a567a1f5699c23b7108db6fd5ad6dfbc071d63ccca1d6bfc1b198565 cloog-0.20.0.tar.gz"
+sha512sums="
+d00cbefd348b45d9d482320a088f7ae736440046b99469cbdfbb177a38dcef182c3305f0a567a1f5699c23b7108db6fd5ad6dfbc071d63ccca1d6bfc1b198565 cloog-0.20.0.tar.gz
+"
diff --git a/main/clucene/APKBUILD b/main/clucene/APKBUILD
index 4e5054e54e..62503fc1b9 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=14
+pkgrel=16
pkgdesc="A C++ port of Lucene"
url="https://www.sourceforge.net/projects/clucene"
arch="all"
@@ -14,6 +14,7 @@ subpackages="$pkgname-dev $pkgname-contribs"
source="https://downloads.sourceforge.net/clucene/clucene-core-$pkgver.tar.gz
clucene-core-2.3.3.4-pkgconfig.patch
clucene-core-2.3.3.4-install_contribs_lib.patch
+ clucene-pthread.patch
"
builddir="$srcdir/$pkgname-core-$pkgver"
@@ -53,4 +54,5 @@ sha512sums="
1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4 clucene-core-2.3.3.4.tar.gz
b357cb5a1c5d66219f3168724a71af3ebf5c45c752a612d3a69c170b739acc065dc17c261c3a730298ea6c637fe820637a100f73ab03d931734f80bb598fbf55 clucene-core-2.3.3.4-pkgconfig.patch
0aa92635949089196e4e7c579e78761e8751987ef5036320a161a4aaa67da3c63756398c903419c76ea0fbdc8a949e871fcb65be98179a9853a24a5a4cacfde3 clucene-core-2.3.3.4-install_contribs_lib.patch
+bc8f50fda6ccc5baf1783ae138c8e83aa9d0273373a2e4a0ce40797fb2c814defa5105da4586079bdeeb3dff8642e98e4bc7700368c34448ac22085002d2e56f clucene-pthread.patch
"
diff --git a/main/clucene/clucene-pthread.patch b/main/clucene/clucene-pthread.patch
new file mode 100644
index 0000000000..7aed18cce8
--- /dev/null
+++ b/main/clucene/clucene-pthread.patch
@@ -0,0 +1,12 @@
+diff --git a/src/shared/CLucene/LuceneThreads.h b/src/shared/CLucene/LuceneThreads.h
+index 97072ee..4ee241e 100644
+--- a/src/shared/CLucene/LuceneThreads.h
++++ b/src/shared/CLucene/LuceneThreads.h
+@@ -7,6 +7,7 @@
+ #ifndef _LuceneThreads_h
+ #define _LuceneThreads_h
+
++#include <pthread.h>
+
+ CL_NS_DEF(util)
+ class CLuceneThreadIdCompare;
diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD
index 85266e1268..00ef2fe158 100644
--- a/main/cmake/APKBUILD
+++ b/main/cmake/APKBUILD
@@ -1,41 +1,44 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cmake
-pkgver=3.23.2
+pkgver=3.24.2
pkgrel=0
pkgdesc="Cross-platform, open-source make system"
url="https://www.cmake.org/"
arch="all"
license="BSD-3-Clause"
-makedepends="bzip2-dev curl-dev expat-dev libarchive-dev linux-headers
- libuv-dev ncurses-dev rhash-dev xz-dev zlib-dev py3-sphinx"
-options="!check"
+makedepends="
+ bzip2-dev
+ curl-dev
+ expat-dev
+ libarchive-dev
+ libuv-dev
+ linux-headers
+ ncurses-dev
+ py3-sphinx
+ rhash-dev
+ samurai
+ xz-dev
+ zlib-dev
+ "
checkdepends="file musl-utils"
-subpackages="$pkgname-doc $pkgname-bash-completion
+subpackages="
+ $pkgname-doc
+ $pkgname-bash-completion
"
case $pkgver in
*.*.*.*) _v=v${pkgver%.*.*};;
*.*.*) _v=v${pkgver%.*};;
esac
-
-source="https://www.cmake.org/files/$_v/cmake-$pkgver.tar.gz
- "
-
-_parallel_opt() {
- local i n
- for i in $MAKEOPTS; do
- case "$i" in
- -j*) n=${i#-j};;
- esac;
- done
- [ -n "$n" ] && echo "--parallel $n"
-}
+source="https://www.cmake.org/files/$_v/cmake-$pkgver.tar.gz"
+options="!check"
build() {
# jsoncpp needs cmake to build so to avoid recursive build
# dependency, we use the bundled version of jsoncpp.
# Do NOT remove --no-system-jsoncpp unless you consulted
# maintainer
+
./bootstrap \
--prefix=/usr \
--mandir=/share/man \
@@ -44,8 +47,9 @@ build() {
--sphinx-man \
--system-libs \
--no-system-jsoncpp \
- $(_parallel_opt)
- make
+ --generator=Ninja \
+ --parallel="${JOBS:-2}"
+ ninja
}
check() {
@@ -53,9 +57,9 @@ check() {
}
package() {
- cd $startdir/src/$pkgname-$pkgver
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja install
}
+
sha512sums="
-0925adf973d642fd76d4089b61b3882babb0a85050c4c57d5f5f3bd6b17564a9feb0beed236cd636e25f69072fa30b67ea3f80932380b6b6576f2dd78b8e6931 cmake-3.23.2.tar.gz
+6f0e8e29bf0336f555ba72c4d83f35d820f8a5159cc999d48795dc57a6627b4ee3966dda84ca97d39906e35dd476ea00cf80023672cc0fad862e2996194c0674 cmake-3.24.2.tar.gz
"
diff --git a/main/cmph/APKBUILD b/main/cmph/APKBUILD
index 74a20752f7..202affe42d 100644
--- a/main/cmph/APKBUILD
+++ b/main/cmph/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=cmph
pkgver=2.0.2
-pkgrel=0
+pkgrel=1
pkgdesc="A minimal hash C library - utility application"
url="http://cmph.sourceforge.net/"
arch="all"
@@ -10,7 +10,6 @@ subpackages="$pkgname-dev $pkgname-doc libcmph:lib"
source="https://downloads.sourceforge.net/cmph/cmph-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--disable-static \
--build=$CBUILD \
@@ -23,12 +22,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/command-not-found/APKBUILD b/main/command-not-found/APKBUILD
index 137947fdc5..da8e136add 100644
--- a/main/command-not-found/APKBUILD
+++ b/main/command-not-found/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=command-not-found
pkgver=0.3
-pkgrel=0
+pkgrel=1
pkgdesc="friendly command not found handling"
url="https://github.com/kaniini/command-not-found"
arch="noarch"
diff --git a/main/compat-pvgrub/APKBUILD b/main/compat-pvgrub/APKBUILD
index 0b46906f38..899028120c 100644
--- a/main/compat-pvgrub/APKBUILD
+++ b/main/compat-pvgrub/APKBUILD
@@ -1,25 +1,18 @@
-# Contributor:
-# Maintainer:
+# Contributor:
+# Maintainer:
pkgname=compat-pvgrub
pkgver=1
-pkgrel=1
+pkgrel=2
pkgdesc="compatibility support for PV-GRUB 1.x"
url="https://www.alpinelinux.org/"
arch="noarch"
license="ISC"
-depends=""
-depends_dev=""
makedepends="$depends_dev"
triggers="compat-pvgrub.trigger=/boot"
-install=""
-subpackages=""
source="update-pvgrub"
-
-_builddir="$srcdir"
+builddir="$srcdir"
package() {
- cd "$_builddir"
-
mkdir -p "$pkgdir"/boot/grub "$pkgdir"/sbin
touch "$pkgdir"/boot/grub/.keep-compat-pvgrub
diff --git a/main/compiler-rt/APKBUILD b/main/compiler-rt/APKBUILD
deleted file mode 100644
index c363680d61..0000000000
--- a/main/compiler-rt/APKBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# Contributor: Eric Molitor <eric@molitor.org>
-# Contributor: Travis Tilley <ttilley@gmail.com>
-# Contributor: Jakub Jirutka <jakub@jirutka.cz>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=compiler-rt
-# Note: Update together with llvm.
-pkgver=14.0.6
-pkgrel=0
-_llvmver=${pkgver%%.*}
-pkgdesc="LLVM compiler-rt runtime libraries"
-arch="all"
-url="https://llvm.org/"
-license="Apache-2.0"
-makedepends="
- clang
- cmake
- libexecinfo-dev
- linux-headers
- llvm-dev~$_llvmver
- llvm-static~$_llvmver
- llvm-test-utils~$_llvmver
- python3
- samurai
- "
-checkdepends="gtest-dev"
-provides="$pkgname-static=$pkgver-r$pkgrel" # for backward compatibility (Alpine <3.16)
-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
- xray-ppc64-musl.patch
-
- link-execinfo.patch
- sanitizer-supported-arch.patch
- sanitizer-ppc64-musl.patch
- "
-builddir="$srcdir/$pkgname-$pkgver.src"
-options="!check" # tests fail to build
-
-case "$CARCH" in
- # Sanitizers are broken on other arches.
- # Keep in sync with sanitizer-supported-arch.patch.
- aarch64 | ppc64le | x86_64) _build_sanitizers='ON';;
- *) _build_sanitizers='OFF';;
-esac
-
-prepare() {
- default_prepare
-
- sed -i 's|/usr/bin/env python$|/usr/bin/python3|' \
- lib/hwasan/scripts/hwasan_symbolize
-
- cd "$srcdir"
-
- # monorepo layout
- ln -sfv llvm-$pkgver.src llvm
-}
-
-build() {
- # compiler-rt uses llvm intrinsic types for testing
- # and therefore requires clang
- # It also needs LLVM source for testing purposes
- cmake -G Ninja -B build -Wno-dev \
- -DCMAKE_C_COMPILER=clang \
- -DCMAKE_CXX_COMPILER=clang++ \
- -DCMAKE_BUILD_TYPE=MinSizeRel \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCOMPILER_RT_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \
- -DCOMPILER_RT_BUILD_SANITIZERS=$_build_sanitizers \
- -DCOMPILER_RT_BUILD_XRAY=ON \
- -DCOMPILER_RT_INSTALL_PATH="/usr/lib/clang/$pkgver" \
- -DLLVM_EXTERNAL_LIT="/usr/bin/lit"
- cmake --build build
-}
-
-check() {
- ninja -C build check-compiler-rt
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-}
-
-sha512sums="
-c0e63071cb99bca837b83fd0e3597cf45cc635f73ab88a1ec48e863a1633f42bd402ea7c5130e8fa0f550b9574c1ecac1799b92b789565e4ead955cf60060907 compiler-rt-14.0.6.src.tar.xz
-6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d llvm-14.0.6.src.tar.xz
-8ed6746474f135ebf77a0888957126ef3a5ded97551632198cf15659104d792487920324b74569dfc46140d26f0a268e2378d6f8878c1c9013b8e6f199eeb3b7 xray-ppc64-musl.patch
-50c68838f79c948b3a0bff6cb120f8c68cac9ad2254d6409b1cddf79cc8a776d1142b29678445d92b62fadc66f353fe89e14dac7aa6c3b4f08d883a06615d7e3 link-execinfo.patch
-9aaac8aa9217509cf377b44e20a8c8294b9972e03e9d4f7c1b0ac7c22bcdac6f6a0888ab16b7542e1d6b89a5ac9054c5d8ef8acd1ae1002cca2d0b3df86136a6 sanitizer-supported-arch.patch
-aed5efa8a9c4f3bcb3b377d3c69c3fef387ef73d712bb58d60622d02d09f42b827cd810cd0648ca2a0ed6cca794f98a6176522e528488caf2f9ce08e0138c931 sanitizer-ppc64-musl.patch
-"
diff --git a/main/compiler-rt/link-execinfo.patch b/main/compiler-rt/link-execinfo.patch
deleted file mode 100644
index 8da49fb38b..0000000000
--- a/main/compiler-rt/link-execinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/scudo/standalone/CMakeLists.txt
-+++ b/lib/scudo/standalone/CMakeLists.txt
-@@ -137,6 +137,8 @@
-
- append_list_if(FUCHSIA zircon SCUDO_LINK_LIBS)
-
-+list(APPEND SCUDO_LINK_LIBS execinfo)
-+
- if(COMPILER_RT_HAS_SCUDO_STANDALONE)
- add_compiler_rt_object_libraries(RTScudoStandalone
- ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
diff --git a/main/compiler-rt/xray-ppc64-musl.patch b/main/compiler-rt/xray-ppc64-musl.patch
deleted file mode 100644
index d1c55ba195..0000000000
--- a/main/compiler-rt/xray-ppc64-musl.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Patch-Source: https://github.com/void-linux/void-packages/blob/c907a54de30ad0b19fbf9f37d5b67cabe5c7744d/srcpkgs/llvm12/patches/compiler-rt-xray-ppc64-musl.patch
---- a/lib/xray/xray_powerpc64.inc
-+++ b/lib/xray/xray_powerpc64.inc
-@@ -12,7 +12,13 @@
-
- #include <cstdint>
- #include <mutex>
-+#ifdef __GLIBC__
- #include <sys/platform/ppc.h>
-+#else
-+#include <cctype>
-+#include <cstring>
-+#include <cstdlib>
-+#endif
-
- #include "xray_defs.h"
-
-@@ -20,13 +26,45 @@ namespace __xray {
-
- ALWAYS_INLINE uint64_t readTSC(uint8_t &CPU) XRAY_NEVER_INSTRUMENT {
- CPU = 0;
-+#ifdef __GLIBC__
- return __ppc_get_timebase();
-+#else
-+ return __builtin_ppc_get_timebase();
-+#endif
- }
-
- inline uint64_t getTSCFrequency() XRAY_NEVER_INSTRUMENT {
- static std::mutex M;
- std::lock_guard<std::mutex> Guard(M);
-+#ifdef __GLIBC__
- return __ppc_get_timebase_freq();
-+#else
-+ /* FIXME: a less dirty implementation? */
-+ static uint64_t base;
-+ if (!base) {
-+ FILE *f = fopen("/proc/cpuinfo", "rb");
-+ if (f) {
-+ ssize_t nr;
-+ /* virtually always big enough to hold the line */
-+ char buf[512];
-+ while (fgets(buf, sizeof(buf), f)) {
-+ char *ret = strstr(buf, "timebase");
-+ if (!ret) {
-+ continue;
-+ }
-+ ret += sizeof("timebase") - 1;
-+ ret = strchr(ret, ':');
-+ if (!ret) {
-+ continue;
-+ }
-+ base = strtoul(ret + 1, nullptr, 10);
-+ break;
-+ }
-+ fclose(f);
-+ }
-+ }
-+ return base;
-+#endif
- }
-
- inline bool probeRequiredCPUFeatures() XRAY_NEVER_INSTRUMENT {
diff --git a/main/confuse/APKBUILD b/main/confuse/APKBUILD
index 102d162034..d188ed069e 100644
--- a/main/confuse/APKBUILD
+++ b/main/confuse/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=confuse
pkgver=3.3
-pkgrel=0
+pkgrel=1
pkgdesc="C library for parsing configuration files"
-url="https://github.com/martinh/libconfuse"
+url="https://github.com/libconfuse/libconfuse"
arch="all"
license="ISC"
makedepends="flex bison"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://github.com/martinh/libconfuse/releases/download/v$pkgver/confuse-$pkgver.tar.xz"
+source="https://github.com/libconfuse/libconfuse/releases/download/v$pkgver/confuse-$pkgver.tar.xz"
# secfixes:
diff --git a/main/conky/APKBUILD b/main/conky/APKBUILD
index bebff925af..af62a4912f 100644
--- a/main/conky/APKBUILD
+++ b/main/conky/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=conky
-pkgver=1.12.2
-pkgrel=1
+pkgver=1.13.1
+pkgrel=0
pkgdesc="An advanced, highly configurable system monitor for X based on torsmo"
url="http://conky.sourceforge.net/"
arch="all"
@@ -41,4 +41,6 @@ package() {
install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
}
-sha512sums="55280953da437efe36320e4c12f74d95b8406bd7d8b7d93c6582f9b346c1c80a94b71d1c27860f6274de9171865fca91e330dfc39feb80bb2f453a538bc5ce1a conky-1.12.2.tar.gz"
+sha512sums="
+3ee0e14f6ff2bac39404c272790055ac1106f47a00e8298da909a0febf6de0661486e8ce23f34e8c5050e364168b2efcefd0b28736cbd0bc135e1362f0dc5516 conky-1.13.1.tar.gz
+"
diff --git a/main/cppunit/APKBUILD b/main/cppunit/APKBUILD
index d5e483ac4c..9fc4a574b9 100644
--- a/main/cppunit/APKBUILD
+++ b/main/cppunit/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cppunit
pkgver=1.15.1
-pkgrel=0
+pkgrel=1
pkgdesc="C++ unit testing framework"
url="http://www.freedesktop.org/wiki/Software/cppunit/"
arch="all"
diff --git a/main/cracklib/APKBUILD b/main/cracklib/APKBUILD
index 814eebe04b..76f0d965f2 100644
--- a/main/cracklib/APKBUILD
+++ b/main/cracklib/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=cracklib
-pkgver=2.9.7
-pkgrel=4
+pkgver=2.9.8
+pkgrel=0
pkgdesc="A library used to enforce strong passwords"
url="https://github.com/cracklib/cracklib"
arch="all"
@@ -12,7 +12,6 @@ makedepends="zlib-dev"
subpackages="$pkgname-dev $pkgname-words::noarch"
source="https://github.com/cracklib/cracklib/releases/download/v$pkgver/cracklib-$pkgver.tar.bz2
https://github.com/cracklib/cracklib/releases/download/v$pkgver/cracklib-words-$pkgver.gz
- fix-trigger-warning.patch
"
# secfixes:
@@ -54,6 +53,7 @@ words() {
install -m644 -D $pkgname-words-$pkgver.gz "$subpkgdir"/usr/share/cracklib/$pkgname-words.gz
}
-sha512sums="f6bf65ac092ba46ff78ddbc115692260fb76dc71219cd679d2ea935ebfb9e709fbb30259a7406743ed00dbdc415335b3ac9d9fcba1d204ea36d5eb96bf1333a2 cracklib-2.9.7.tar.bz2
-1fa34b0a2e16d6906982b248f1757bf5bf8154d8d7e8bab94a4ac25080c41434d3828a2c8dd5065e9be586f36480ab70375f09e0bb64eb495d96a460619e2bae cracklib-words-2.9.7.gz
-f9cececd7ba4636bc5d2b9b2acf7c40563a32c1725f6bdcc0f7604ecc4c8cb31656972bfb17a302427bb17b5b8be24c44fd3fd9e1a891745c02f3243e0087216 fix-trigger-warning.patch"
+sha512sums="
+bba1b82067156f44095b282c70c06a05e58572cde7ad2430dd24c4b42ae98be86708ea86ba8b7104aa5887e16ac90d7cf3ae613b84ab9c0f7602307d78b75371 cracklib-2.9.8.tar.bz2
+1700c56b9776b7ae4684b9ab1e784dd7707550bce2149301f662618a4f00a2eb0ba2d1a206c09aac22f7d95bc561544d412d2fdac5008fc3aabc4872e8a74afc cracklib-words-2.9.8.gz
+"
diff --git a/main/cracklib/fix-trigger-warning.patch b/main/cracklib/fix-trigger-warning.patch
deleted file mode 100644
index 21ec638b27..0000000000
--- a/main/cracklib/fix-trigger-warning.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Dermot Bradley <dermot_bradley@yahoo.com>
-Date: Sat, 12 Sep 2020 20:03 +0100
-Subject: [PATCH] cracklib: prevent "line out of order" warnings
-
-Workaround for handling excessively long lines in cracklib-words.gz file.
-Ensure that all lines read from any words files are truncated to 1023
-characters as the cracklib-packer utility (run by the Alpine package trigger)
-breaks up long lines on this boundary and processes them separately as if
-they were seperate lines and it can potentially generate "line out of order"
-warnings.
-
-It also ignores blank lines in word files, this prevents "skipping line"
-warnings when blank lines are encountered.
-
-Upstream PR 33 has been raised with this fix.
-
----
-
---- a/util/cracklib-format
-+++ b/util/cracklib-format
-@@ -3,8 +3,17 @@
- # This preprocesses a set of word lists into a suitable form for input
- # into cracklib-packer
- #
-+# Truncates lines longer than 1022 characters long as cracklib-packer
-+# does not handle them correctly.
-+#
-+# The last part of the pipeline uses 'grep -v' to remove any blank
-+# lines (possibly introduced by earlier parts of the pipeline) as
-+# cracklib-packer will generate "skipping line" warnings otherwise.
-+#
- gzip -cdf "$@" |
-- grep -v '^\(#\|$\)' |
-+ grep -a -v '^#' |
- tr '[A-Z]' '[a-z]' |
- tr -cd '\012[a-z][0-9]' |
-+ cut -c 1-1022 |
-+ grep -v '^$' |
- env LC_ALL=C sort -u
diff --git a/main/cramfs/APKBUILD b/main/cramfs/APKBUILD
index 854df0ecf0..c89c2a97a9 100644
--- a/main/cramfs/APKBUILD
+++ b/main/cramfs/APKBUILD
@@ -1,25 +1,21 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cramfs
pkgver=1.1
-pkgrel=3
+pkgrel=5
pkgdesc="Linux filesystem designed to be simple, small, and to compress things well"
arch="all"
url="https://sourceforge.net/projects/cramfs/"
-license='GPL'
-depends=
+license="GPL-2.0-or-later"
makedepends="zlib-dev linux-headers"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+source="https://downloads.sourceforge.net/cramfs/cramfs-$pkgver.tar.gz
mkcramfs-include-sysmacros.patch"
build() {
- cd "$srcdir/$pkgname-$pkgver"
- make CFLAGS="$CFLAGS -D_GNU_SOURCE" || return 1
+ make CFLAGS="$CFLAGS -D_GNU_SOURCE"
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
- install -d "$pkgdir"/sbin
- install mkcramfs cramfsck "$pkgdir"/sbin
+ install -Dm755 -t "$pkgdir"/sbin mkcramfs cramfsck
}
sha512sums="6c18dbe32df57f7d132fb2a59a917ad381156ca1f720c1ad0997ca81c62e82fd43ebb0339c5a66d5b144a72ce5c7ae93596522fe2698259f2b68c31db26e3b63 cramfs-1.1.tar.gz
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index 4a0dbb4d23..2df5de9728 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -1,15 +1,21 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cryptsetup
-pkgver=2.4.3
-pkgrel=0
+pkgver=2.5.0
+pkgrel=2
pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
url="https://gitlab.com/cryptsetup/cryptsetup"
arch="all"
license="GPL-2.0-or-later WITH OpenSSL-Exception"
-makedepends_build="bash coreutils"
-makedepends_host="lvm2-dev openssl1.1-compat-dev popt-dev util-linux-dev
- json-c-dev argon2-dev"
+makedepends_build="asciidoctor bash coreutils"
+makedepends_host="
+ argon2-dev
+ json-c-dev
+ lvm2-dev
+ openssl-dev>3
+ popt-dev
+ util-linux-dev
+ "
makedepends="$makedepends_build $makedepends_host"
checkdepends="device-mapper which sharutils"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc"
@@ -57,8 +63,8 @@ package() {
install -Dm755 "$srcdir"/dmcrypt.initd "$pkgdir"/etc/init.d/dmcrypt
mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
- install -m644 README.md FAQ docs/v$pkgver-ReleaseNotes \
- "$pkgdir"/usr/share/doc/$pkgname/
+ install -m644 README.md FAQ.md docs/v$pkgver-ReleaseNotes \
+ -t "$pkgdir"/usr/share/doc/$pkgname/
}
libs() {
@@ -68,8 +74,8 @@ libs() {
}
sha512sums="
-a6c8a33e62853fd5757239b5ec3529bd7d994c6d70db65188b7bd121ee59347a89b57f72d5ebdf521027f5a00951db2fb8acfcbbf1902e8697b006c4fe13c9f2 cryptsetup-2.4.3.tar.gz
-a3ca3e648749136ee724692b61488cd855f118eb93435942c2b04964a34fe49d0f0da4ef64cd2531c1c0f650e77808cf5d802789fd7664398248ead668bb35e5 dmcrypt.initd
+f457168292ae9fadc34d709494818aee3f18b56bdf5fcff0b2a5ae0b554031ce888d01cd126ca7aa915fcdcb00de6afed2fdb25bbbd690aa8bfcaafa516ade93 cryptsetup-2.5.0.tar.gz
+5315589102d6e7fac5fdee1230a4012d5548c1a7193a05a310eacdeaf709857d370359cae7ea437e3ca0591ffdb848c205c14d42017a1c5445cadaec2e8eb4a1 dmcrypt.initd
74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 dmcrypt.confd
529187851def5fbc08e995eba90d3f013f1cf8469dcb9344f83d1e3c73c71467ca4ed62c8282ec27ebfa30ccc33653fdd1aea8d1d80e1ac4293d51865c9a6200 flush-stdout.patch
"
diff --git a/main/cryptsetup/dmcrypt.initd b/main/cryptsetup/dmcrypt.initd
index 85c77f7c1d..4dbda6f892 100644
--- a/main/cryptsetup/dmcrypt.initd
+++ b/main/cryptsetup/dmcrypt.initd
@@ -81,7 +81,7 @@ dm_crypt_execute() {
# ${target} is active:
# Newer versions report:
# ${target} is active[ and is in use.]
- if cryptsetup status ${target} | egrep -q ' is active' ; then
+ if cryptsetup status ${target} | grep -qE ' is active' ; then
einfo "dm-crypt mapping ${target} is already configured"
return
fi
@@ -301,7 +301,7 @@ stop() {
# Break down all mappings
header=true
- egrep "^(target|swap)=" ${conf_file} | \
+ grep -E "^(target|swap)=" ${conf_file} | \
while read line ; do
${header} && einfo "Removing dm-crypt mappings"
header=false
diff --git a/main/cunit/APKBUILD b/main/cunit/APKBUILD
index ae369ebcb6..0e218e765c 100644
--- a/main/cunit/APKBUILD
+++ b/main/cunit/APKBUILD
@@ -4,7 +4,7 @@ pkgname=cunit
_pkgname=CUnit
pkgver=2.1.3
_pkgver=${pkgver%.*}-${pkgver##*.}
-pkgrel=2
+pkgrel=3
pkgdesc="Automated testing framework for C"
url="http://cunit.sourceforge.net/"
arch="all"
@@ -17,7 +17,6 @@ builddir="$srcdir/$_pkgname-$_pkgver"
prepare() {
default_prepare
- cd "$builddir"
libtoolize --force --copy
aclocal
autoheader
@@ -28,7 +27,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -46,12 +44,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD
index 7cb2785634..3d313e256b 100644
--- a/main/curl/APKBUILD
+++ b/main/curl/APKBUILD
@@ -8,14 +8,14 @@
# this aport from arch=all WILL be reverted.
pkgname=curl
-pkgver=7.84.0
+pkgver=7.85.0
pkgrel=0
pkgdesc="URL retrival utility and library"
url="https://curl.se/"
arch="all"
license="curl"
depends="ca-certificates"
-depends_dev="openssl1.1-compat-dev nghttp2-dev zlib-dev brotli-dev"
+depends_dev="openssl-dev>3 nghttp2-dev zlib-dev brotli-dev"
checkdepends="nghttp2 python3"
makedepends_host="$depends_dev"
makedepends_build="autoconf automake groff libtool perl"
@@ -23,12 +23,13 @@ subpackages="$pkgname-dbg $pkgname-static $pkgname-doc $pkgname-dev libcurl"
[ -z "$BOOTSTRAP" ] && subpackages="$subpackages $pkgname-zsh-completion $pkgname-fish-completion"
source="
https://curl.se/download/curl-$pkgver.tar.xz
- easy_lock.patch
"
options="net" # Required for running tests
[ -n "$BOOTSTRAP" ] && options="$options !check" # remove python3 dependency
# secfixes:
+# 7.85.0-r0:
+# - CVE-2022-35252
# 7.84.0-r0:
# - CVE-2022-32205
# - CVE-2022-32206
@@ -153,7 +154,6 @@ build() {
--enable-unix-sockets \
--enable-static \
--with-openssl \
- --without-libidn \
--without-libidn2 \
--with-nghttp2 \
--disable-ldap \
@@ -162,7 +162,9 @@ build() {
make
# generation of completions is not supported when cross-compiling.
- [ -z "$BOOTSTRAP" ] && make -C scripts/
+ if [ -z "$BOOTSTRAP" ]; then
+ make -C scripts/
+ fi
}
check() {
@@ -194,6 +196,5 @@ static() {
}
sha512sums="
-86231866a35593a1637fbc0c6af3b6761bdfd99fb35580cc52970c36f19604f93dce59fea67a1d5bb4b455f719307599c7916c77d14f2b661f6bf7fb1ca716ce curl-7.84.0.tar.xz
-287a9f2c501d790cf2db27d6f3887da6417afe38a218fc8b14039beab6055869cd75eda83e79bc8579e8dd5e35e1c9f6644d52f6b708577f9f61d5ff86feee73 easy_lock.patch
+b57cc31649a4f47cc4b482f56a85c86c8e8aaeaf01bc1b51b065fdb9145a9092bc52535e52a85a66432eb163605b2edbf5bc5c33ea6e40e50f26a69ad1365cbd curl-7.85.0.tar.xz
"
diff --git a/main/curl/easy_lock.patch b/main/curl/easy_lock.patch
deleted file mode 100644
index 73a4b9d2f2..0000000000
--- a/main/curl/easy_lock.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3f6beb669e4edc170e167aa6cca3b4a6ec4501e9 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Mon, 27 Jun 2022 08:46:21 +0200
-Subject: [PATCH] easy_lock.h: include sched.h if available to fix build
-
-Patched-by: Harry Sintonen
----
- lib/easy_lock.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/easy_lock.h b/lib/easy_lock.h
-index 819f50ce815b8..1f54289ceb2d3 100644
---- a/lib/easy_lock.h
-+++ b/lib/easy_lock.h
-@@ -36,6 +36,9 @@
-
- #elif defined (HAVE_ATOMIC)
- #include <stdatomic.h>
-+#if defined(HAVE_SCHED_YIELD)
-+#include <sched.h>
-+#endif
-
- #define curl_simple_lock atomic_bool
- #define CURL_SIMPLE_LOCK_INIT false
diff --git a/main/cutter/APKBUILD b/main/cutter/APKBUILD
index 8d2a310b4e..bcf88fc4cd 100644
--- a/main/cutter/APKBUILD
+++ b/main/cutter/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=cutter
pkgver=1.04
-pkgrel=1
+pkgrel=2
pkgdesc="A program that allows firewall administrators to abort TCP/IP connections"
url="http://www.digitage.co.uk/digitage/software/linux-security/cutter"
arch="all"
@@ -12,15 +12,11 @@ options="!check"
source="http://www.digitage.co.uk/digitage/files/cutter/$pkgname-$pkgver.tgz
musl-fix.patch"
-builddir="$srcdir/$pkgname-$pkgver"
-
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
install -m755 -D $pkgname "$pkgdir"/usr/sbin/$pkgname
}
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 560775e1c8..fa40d31ddb 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.28
-pkgrel=0
+pkgrel=2
pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
url="https://www.cyrusimap.org/sasl/"
arch="all"
@@ -21,11 +21,12 @@ subpackages="
$pkgname-crammd5:_plugin
$pkgname-digestmd5:_plugin
$pkgname-login:_plugin
+ $pkgname-sql:_plugin
"
# use heimdal to avoid circular dep: cyrus-sasl -> krb5 -> openldap -> cyrus-sasl
makedepends="
gdbm-dev
- openssl1.1-compat-dev
+ openssl-dev>3
heimdal-dev
py3-sphinx
sqlite-dev
@@ -65,7 +66,6 @@ build() {
--mandir=/usr/share/man \
--enable-static \
--enable-shared \
- --disable-java \
--with-plugindir=/usr/lib/sasl2 \
--with-configdir=/etc/sasl2 \
--with-dbpath=/etc/sasl2/sasldb2 \
@@ -77,7 +77,11 @@ build() {
--with-saslauthd=/run/saslauthd \
--without-pwcheck \
--with-devrandom=/dev/urandom \
- --with-sqlite \
+ --enable-sql \
+ --without-mysql \
+ --without-pgsql \
+ --without-sqlite \
+ --with-sqlite3=/usr/lib \
--enable-anon \
--enable-cram \
--enable-digest \
diff --git a/main/cython/APKBUILD b/main/cython/APKBUILD
index 424ff4a2fc..732970dde2 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.24
-pkgrel=2
+pkgver=0.29.32
+pkgrel=0
pkgdesc="Cython is an optimising static compiler for both the Python & the extended Cython programming languages."
url="https://cython.org/"
arch="all"
@@ -11,8 +11,14 @@ license="Apache-2.0"
makedepends="py3-setuptools python3-dev"
depends="python3"
subpackages="cython-doc"
-source="cython-$pkgver.tar.gz::https://github.com/cython/cython/archive/$pkgver.tar.gz
-cython-test-fix.patch"
+source="cython-$pkgver.tar.gz::https://github.com/cython/cython/archive/$pkgver.tar.gz"
+
+case "$CARCH" in
+arm*)
+ # hang forever
+ options="$options !check"
+ ;;
+esac
build() {
python3 setup.py build
@@ -30,6 +36,5 @@ package() {
}
sha512sums="
-387a827f3cb7428248019744e3ed606a133d98ac882b83624d24ae0fdf8a8f2334978555d7d84e5cc4adaf715c541fef64e45bcbdda85ca33473c21f99360be8 cython-0.29.24.tar.gz
-6a924351d54636edf5c65309c285a7298a6b25d28a81812c636fd16901471b4d9522f271ec28c2e03c0a48fa926aa52bfbe60bf4cb80073d7837b81828a7220c cython-test-fix.patch
+55462792fa70d8edf60aa470627ab494918d7297fd7d282a7a54da76ee5a180233108404a1c8f3d79f6408f19b6e4f46b36e59fd47c38ede24f061f374437b6f cython-0.29.32.tar.gz
"
diff --git a/main/cython/cython-test-fix.patch b/main/cython/cython-test-fix.patch
deleted file mode 100644
index 58ddce13c3..0000000000
--- a/main/cython/cython-test-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 9bc0abecb3a08ea13313200a51f1ee26a65e5be3 Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan_ml@behnel.de>
-Date: Sat, 3 Apr 2021 08:23:44 +0200
-Subject: [PATCH] Make a helper function in a C++ test correctly propagate
- exceptions so that it won't have to spit out compiler warnings.
-
----
- tests/run/cpp_stl_conversion.pyx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/run/cpp_stl_conversion.pyx b/tests/run/cpp_stl_conversion.pyx
-index 5278c677ae..ccebc700ee 100644
---- a/tests/run/cpp_stl_conversion.pyx
-+++ b/tests/run/cpp_stl_conversion.pyx
-@@ -15,7 +15,7 @@ py_set = set
- py_xrange = xrange
- py_unicode = unicode
-
--cdef string add_strings(string a, string b):
-+cdef string add_strings(string a, string b) except *:
- return a + b
-
- def normalize(bytes b):
diff --git a/main/d-feet/APKBUILD b/main/d-feet/APKBUILD
index f18e741687..f693cdab1e 100644
--- a/main/d-feet/APKBUILD
+++ b/main/d-feet/APKBUILD
@@ -29,7 +29,7 @@ build() {
}
check() {
- meson test --no-rebuild -v -C output
+ meson test --no-rebuild --print-errorlogs -C output
}
package() {
diff --git a/main/dahdi-linux-lts/APKBUILD b/main/dahdi-linux-lts/APKBUILD
index dcbfc34fad..9877440e3d 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.15.52
+_kver=5.15.72
_krel=0
_kpkgver="$_kver-r$_krel"
diff --git a/main/dansguardian/APKBUILD b/main/dansguardian/APKBUILD
index 294bd96d80..af88e93999 100644
--- a/main/dansguardian/APKBUILD
+++ b/main/dansguardian/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dansguardian
pkgver=2.12.0.3
-pkgrel=4
+pkgrel=6
pkgdesc="Web content filter"
url="http://dansguardian.org"
arch="all"
@@ -10,7 +10,7 @@ license="GPL"
depends="logrotate"
makedepends="zlib-dev pcre-dev"
install="$pkgname.pre-install"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
pkgusers="dansguar"
pkggroups="dansguar"
source="https://downloads.sourceforge.net/project/dansguardian/dansguardian-$pkgver.tar.bz2
@@ -19,29 +19,23 @@ source="https://downloads.sourceforge.net/project/dansguardian/dansguardian-$pkg
ftp-credential.patch
dansguardian-2.10.1.1-pcre830.patch
fix-includes.patch
- gcc11.patch
+ cstring.patch
"
-_builddir="$srcdir"/dansguardian-$pkgver
prepare() {
- cd "$_builddir"
- update_config_sub || return 1
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
+ default_prepare
+ update_config_sub
+
# do not block "microsoft...clustimg=..." and similar
- sed -i -e 's:\.\*:.{1,10}:g' configs/lists/bannedregexpurllist \
- || return 1
+ sed -i -e 's:\.\*:.{1,10}:g' configs/lists/bannedregexpurllist
# bind to 127.0.0.1 by default
sed -i -e 's:^filterip =.*:filterip = 127.0.0.1:' \
- configs/dansguardian.conf.in || return 1
+ configs/dansguardian.conf.in
}
build() {
- cd "$_builddir"
+ CXXFLAGS="$CXXFLAGS -std=gnu++11" \
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -53,18 +47,16 @@ build() {
--with-proxygroup=dansguar \
--with-logdir=/var/log/dansguardian \
--with-piddir=/var/run/ \
- --enable-ntlm \
- || return 1
- make || return 1
+ --enable-ntlm
+ make
}
package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
- install -D -m 755 "$srcdir"/dansguardian.initd \
- "$pkgdir"/etc/init.d/dansguardian || return 1
- install -D -m 644 "$srcdir"/dansguardian.logrotate \
- "$pkgdir"/etc/logrotate.d/dansguardian || return 1
+ make DESTDIR="$pkgdir" install
+ install -Dm755 "$srcdir"/dansguardian.initd \
+ "$pkgdir"/etc/init.d/dansguardian
+ install -Dm644 "$srcdir"/dansguardian.logrotate \
+ "$pkgdir"/etc/logrotate.d/dansguardian
install -d -o dansguar -g dansguar "$pkgdir"/var/log/dansguardian
}
@@ -75,5 +67,5 @@ cc23178755365a3cceff08d9eb5c26dd440648b22af15377a30d2032f71cf0bd8ed3ab59c8a671f2
07b62441363534f39a1400389c702bbd5a53317526a18b3fc929f00bd854706c56b891d7fecb4151e200448f8ba012729e712e9cfdbbd683a3d2634fdc095bd1 ftp-credential.patch
d3d9af038ff5a91d1f9dc6cf4175b0da2a791386ca624f4a639338ed189a274eba720e9771986e7ded517e2623185e8b61ef3689414197c47a6ae3220be99d57 dansguardian-2.10.1.1-pcre830.patch
2eb17ef01a0b7d626f50197e0ddd160ae4ed17a813af00ceb9f6c54610d84b03b5c819bc2d8799f683e68dc16a65cbac5a8e36f0c43737d8ea82c7354e852d78 fix-includes.patch
-7ff0232e185e09b561a73496bb68a5fad11d97c02dde4436c993af454e5cfba5124c20b54c18bc864a21818df170fa8306a67419752ca75ea8a3cc797e88c1fe gcc11.patch
+77257cd290bfa91a6af7aaf6e58a4280e75a1a7ea5dc7e89fd418cd7509263533e4133f447f02f77410da1533502c9011921288d05b5d4cf33aac1e66467eaa6 cstring.patch
"
diff --git a/main/dansguardian/cstring.patch b/main/dansguardian/cstring.patch
new file mode 100644
index 0000000000..53c48fcd70
--- /dev/null
+++ b/main/dansguardian/cstring.patch
@@ -0,0 +1,12 @@
+diff --git a/src/UDSocket.cpp b/src/UDSocket.cpp
+index 3d33ff6..db4de8c 100644
+--- a/src/UDSocket.cpp
++++ b/src/UDSocket.cpp
+@@ -13,6 +13,7 @@
+ #include "UDSocket.hpp"
+
+ #include <syslog.h>
++#include <cstring>
+ #include <csignal>
+ #include <fcntl.h>
+ #include <sys/time.h>
diff --git a/main/dansguardian/gcc11.patch b/main/dansguardian/gcc11.patch
deleted file mode 100644
index b7a11a746e..0000000000
--- a/main/dansguardian/gcc11.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-diff --git a/src/BaseSocket.cpp b/src/BaseSocket.cpp
-index 18c8030..4992647 100644
---- a/src/BaseSocket.cpp
-+++ b/src/BaseSocket.cpp
-@@ -210,7 +210,7 @@ bool BaseSocket::checkForInput()
- }
-
- // blocking check for waiting data - blocks for up to given timeout, can be told to break on signal-triggered config reloads
--void BaseSocket::checkForInput(int timeout, bool honour_reloadconfig) throw(std::exception)
-+void BaseSocket::checkForInput(int timeout, bool honour_reloadconfig) noexcept(false)
- {
- #ifdef DGDEBUG
- std::cout << "BaseSocket::checkForInput: starting for sck:" << sck << std::endl;
-@@ -249,7 +249,7 @@ bool BaseSocket::readyForOutput()
- }
-
- // blocking equivalent of above, can be told to break on signal-triggered reloads
--void BaseSocket::readyForOutput(int timeout, bool honour_reloadconfig) throw(std::exception)
-+void BaseSocket::readyForOutput(int timeout, bool honour_reloadconfig) noexcept(false)
- {
- // blocks if socket blocking
- // until timeout
-@@ -266,7 +266,7 @@ void BaseSocket::readyForOutput(int timeout, bool honour_reloadconfig) throw(std
- }
-
- // read a line from the socket, can be told to break on config reloads
--int BaseSocket::getLine(char *buff, int size, int timeout, bool honour_reloadconfig, bool *chopped, bool *truncated) throw(std::exception)
-+int BaseSocket::getLine(char *buff, int size, int timeout, bool honour_reloadconfig, bool *chopped, bool *truncated) noexcept(false)
- {
- // first, return what's left from the previous buffer read, if anything
- int i = 0;
-@@ -347,7 +347,7 @@ int BaseSocket::getLine(char *buff, int size, int timeout, bool honour_reloadcon
- }
-
- // write line to socket
--void BaseSocket::writeString(const char *line) throw(std::exception)
-+void BaseSocket::writeString(const char *line) noexcept(false)
- {
- int l = strlen(line);
- if (!writeToSocket(line, l, 0, timeout)) {
-@@ -356,7 +356,7 @@ void BaseSocket::writeString(const char *line) throw(std::exception)
- }
-
- // write data to socket - throws exception on failure, can be told to break on config reloads
--void BaseSocket::writeToSockete(const char *buff, int len, unsigned int flags, int timeout, bool honour_reloadconfig) throw(std::exception)
-+void BaseSocket::writeToSockete(const char *buff, int len, unsigned int flags, int timeout, bool honour_reloadconfig) noexcept(false)
- {
- if (!writeToSocket(buff, len, flags, timeout, honour_reloadconfig)) {
- throw std::runtime_error(std::string("Can't write to socket: ") + strerror(errno));
-diff --git a/src/BaseSocket.hpp b/src/BaseSocket.hpp
-index cffcf7d..bbbeac2 100644
---- a/src/BaseSocket.hpp
-+++ b/src/BaseSocket.hpp
-@@ -48,17 +48,17 @@ public:
- // non-blocking check for input data
- bool checkForInput();
- // blocking check for data, can be told to break on signal triggered config reloads (-r)
-- void checkForInput(int timeout, bool honour_reloadconfig = false) throw(std::exception);
-+ void checkForInput(int timeout, bool honour_reloadconfig = false) noexcept(false);
- // non-blocking check for writable socket
- bool readyForOutput();
- // blocking check, can break on config reloads
-- void readyForOutput(int timeout, bool honour_reloadconfig = false) throw(std::exception);
-+ void readyForOutput(int timeout, bool honour_reloadconfig = false) noexcept(false);
-
- // get a line from the socket - can break on config reloads
-- int getLine(char *buff, int size, int timeout, bool honour_reloadconfig = false, bool *chopped = NULL, bool *truncated = NULL) throw(std::exception);
-+ int getLine(char *buff, int size, int timeout, bool honour_reloadconfig = false, bool *chopped = NULL, bool *truncated = NULL) noexcept(false);
-
- // write buffer to string - throws std::exception on error
-- void writeString(const char *line) throw(std::exception);
-+ void writeString(const char *line) noexcept(false);
- // write buffer to string - can be told not to do an initial readyForOutput, and told to break on -r
- bool writeToSocket(const char *buff, int len, unsigned int flags, int timeout, bool check_first = true, bool honour_reloadconfig = false);
- // read from socket, returning number of bytes read
-@@ -66,7 +66,7 @@ public:
- // read from socket, returning error status - can be told to skip initial checkForInput, and to break on -r
- int readFromSocket(char *buff, int len, unsigned int flags, int timeout, bool check_first = true, bool honour_reloadconfig = false);
- // write to socket, throwing std::exception on error - can be told to break on -r
-- void writeToSockete(const char *buff, int len, unsigned int flags, int timeout, bool honour_reloadconfig = false) throw(std::exception);
-+ void writeToSockete(const char *buff, int len, unsigned int flags, int timeout, bool honour_reloadconfig = false) noexcept(false);
-
- protected:
- // socket-wide timeout (is this actually used?)
-diff --git a/src/DataBuffer.cpp b/src/DataBuffer.cpp
-index 3bb8349..0fc1da7 100644
---- a/src/DataBuffer.cpp
-+++ b/src/DataBuffer.cpp
-@@ -236,7 +236,7 @@ bool DataBuffer::in(Socket * sock, Socket * peersock, HTTPHeader * requestheader
- }
-
- // send the request body to the client after having been handled by a DM plugin
--void DataBuffer::out(Socket * sock) throw(std::exception)
-+void DataBuffer::out(Socket * sock) noexcept(false)
- {
- if (dontsendbody) {
- #ifdef DGDEBUG
-diff --git a/src/DataBuffer.hpp b/src/DataBuffer.hpp
-index dd0b8fc..e8f16aa 100644
---- a/src/DataBuffer.hpp
-+++ b/src/DataBuffer.hpp
-@@ -40,7 +40,7 @@ public:
- // gives true if it pauses due to too much data
- bool in(Socket * sock, Socket * peersock, class HTTPHeader * requestheader, class HTTPHeader * docheader, bool runav, int *headersent);
- // send body to client
-- void out(Socket * sock) throw(std::exception);
-+ void out(Socket * sock) noexcept(false);
-
- void setTimeout(int t) { timeout = t; };
- void setDecompress(String d) { decompress = d; };
-diff --git a/src/HTTPHeader.cpp b/src/HTTPHeader.cpp
-index 383a7e5..5ffcc45 100644
---- a/src/HTTPHeader.cpp
-+++ b/src/HTTPHeader.cpp
-@@ -1602,7 +1602,7 @@ int HTTPHeader::decode1b64(char c)
- // - this allows us to re-open the proxy connection on pconns if squid's end has
- // timed out but the client's end hasn't. not much use with NTLM, since squid
- // will throw a 407 and restart negotiation, but works well with basic & others.
--void HTTPHeader::out(Socket * peersock, Socket * sock, int sendflag, bool reconnect) throw(std::exception)
-+void HTTPHeader::out(Socket * peersock, Socket * sock, int sendflag, bool reconnect) noexcept(false)
- {
- String l; // for amalgamating to avoid conflict with the Nagel algorithm
-
-diff --git a/src/HTTPHeader.hpp b/src/HTTPHeader.hpp
-index ce30779..c237463 100644
---- a/src/HTTPHeader.hpp
-+++ b/src/HTTPHeader.hpp
-@@ -45,7 +45,7 @@ public:
- // - this allows us to re-open the proxy connection on pconns if squid's end has
- // timed out but the client's end hasn't. not much use with NTLM, since squid
- // will throw a 407 and restart negotiation, but works well with basic & others.
-- void out(Socket *peersock, Socket *sock, int sendflag, bool reconnect = false) throw(std::exception);
-+ void out(Socket *peersock, Socket *sock, int sendflag, bool reconnect = false) noexcept(false);
-
- // discard remainder of POST data
- // amount to discard can be passed in, or will default to contentLength()
-diff --git a/src/Socket.cpp b/src/Socket.cpp
-index 990f30f..8212622 100644
---- a/src/Socket.cpp
-+++ b/src/Socket.cpp
-@@ -654,7 +654,7 @@ bool Socket::checkForInput()
- }
-
- // blocking check for waiting data - blocks for up to given timeout, can be told to break on signal-triggered config reloads
--void Socket::checkForInput(int timeout, bool honour_reloadconfig) throw(std::exception)
-+void Socket::checkForInput(int timeout, bool honour_reloadconfig) noexcept(false)
- {
- if (!isssl){
- BaseSocket::checkForInput(timeout, honour_reloadconfig);
-@@ -676,7 +676,7 @@ bool Socket::readyForOutput()
- return true;
- }
-
--void Socket::readyForOutput(int timeout, bool honour_reloadconfig) throw(std::exception)
-+void Socket::readyForOutput(int timeout, bool honour_reloadconfig) noexcept(false)
- {
- if (!isssl){
- BaseSocket::readyForOutput(timeout,honour_reloadconfig);
-@@ -689,7 +689,7 @@ void Socket::readyForOutput(int timeout, bool honour_reloadconfig) throw(std::ex
- }
-
- // read a line from the socket, can be told to break on config reloads
--int Socket::getLine(char *buff, int size, int timeout, bool honour_reloadconfig, bool *chopped, bool *truncated) throw(std::exception)
-+int Socket::getLine(char *buff, int size, int timeout, bool honour_reloadconfig, bool *chopped, bool *truncated) noexcept(false)
- {
- if (!isssl){
- return BaseSocket::getLine(buff, size,timeout, honour_reloadconfig, chopped, truncated);
-@@ -765,7 +765,7 @@ int Socket::getLine(char *buff, int size, int timeout, bool honour_reloadconfig,
- }
-
- // write line to socket
--void Socket::writeString(const char *line) throw(std::exception)
-+void Socket::writeString(const char *line) noexcept(false)
- {
- int l = strlen(line);
- if (!writeToSocket(line, l, 0, timeout)) {
-@@ -774,7 +774,7 @@ void Socket::writeString(const char *line) throw(std::exception)
- }
-
- // write data to socket - throws exception on failure, can be told to break on config reloads
--void Socket::writeToSockete(const char *buff, int len, unsigned int flags, int timeout, bool honour_reloadconfig) throw(std::exception)
-+void Socket::writeToSockete(const char *buff, int len, unsigned int flags, int timeout, bool honour_reloadconfig) noexcept(false)
- {
- if (!writeToSocket(buff, len, flags, timeout, honour_reloadconfig)) {
- throw std::runtime_error(std::string("Can't write to socket: ") + strerror(errno));
-diff --git a/src/Socket.hpp b/src/Socket.hpp
-index 0917cbf..e78ae9b 100644
---- a/src/Socket.hpp
-+++ b/src/Socket.hpp
-@@ -82,19 +82,19 @@ public:
- // non-blocking check for writable socket
- bool readyForOutput();
- // blocking check, can break on config reloads
-- void readyForOutput(int timeout, bool honour_reloadconfig = false) throw(std::exception);
-+ void readyForOutput(int timeout, bool honour_reloadconfig = false) noexcept(false);
-
- // non-blocking check for input data
- bool checkForInput();
-
- // blocking check for data, can be told to break on signal triggered config reloads (-r)
-- void checkForInput(int timeout, bool honour_reloadconfig = false) throw(std::exception);
-+ void checkForInput(int timeout, bool honour_reloadconfig = false) noexcept(false);
-
- // get a line from the socket - can break on config reloads
-- int getLine(char *buff, int size, int timeout, bool honour_reloadconfig = false, bool *chopped = NULL, bool *truncated = NULL) throw(std::exception);
-+ int getLine(char *buff, int size, int timeout, bool honour_reloadconfig = false, bool *chopped = NULL, bool *truncated = NULL) noexcept(false);
-
- // write buffer to string - throws std::exception on error
-- void writeString(const char *line) throw(std::exception);
-+ void writeString(const char *line) noexcept(false);
- // write buffer to string - can be told not to do an initial readyForOutput, and told to break on -r
- bool writeToSocket(const char *buff, int len, unsigned int flags, int timeout, bool check_first = true, bool honour_reloadconfig = false);
- // read from socket, returning number of bytes read
-@@ -102,7 +102,7 @@ public:
- // read from socket, returning error status - can be told to skip initial checkForInput, and to break on -r
- int readFromSocket(char *buff, int len, unsigned int flags, int timeout, bool check_first = true, bool honour_reloadconfig = false);
- // write to socket, throwing std::exception on error - can be told to break on -r
-- void writeToSockete(const char *buff, int len, unsigned int flags, int timeout, bool honour_reloadconfig = false) throw(std::exception);
-+ void writeToSockete(const char *buff, int len, unsigned int flags, int timeout, bool honour_reloadconfig = false) noexcept(false);
- #endif //__SSLMITM
-
-
diff --git a/main/darkhttpd/APKBUILD b/main/darkhttpd/APKBUILD
index f22aaa0226..93af05941f 100644
--- a/main/darkhttpd/APKBUILD
+++ b/main/darkhttpd/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Alan Lacerda <alacerda@alpinelinux.org>
# Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
pkgname=darkhttpd
-pkgver=1.13
+pkgver=1.14
pkgrel=0
pkgdesc="A simple, single-threaded, static content webserver"
url="https://unix4lyfe.org/darkhttpd/"
@@ -29,7 +29,9 @@ package() {
install -Dm644 "$srcdir"/darkhttpd.confd "$pkgdir"/etc/conf.d/darkhttpd
}
-sha512sums="2c8c5dd225f3ba8b636adeae049039b5c3f852b3efe17969075cd361c34f7bfbef9efa6d64a0a9c6021fae939d85befe92981923e1fa3d326c8a8402f3358868 darkhttpd-1.13.tar.gz
+sha512sums="
+c2017ab6a7aafe8527610b15ee9f057a44a416852baa777d58a684903b45b4568deb1a67b56e73cc4bfabb5d629b7bdc6e956ad58b9c4abc58ef14e5cef67eac darkhttpd-1.14.tar.gz
bb95277a9f8f227aeec8bfe6ef54f52a2f034ed0dd25258b996c17f9ce9dd4ad220366b10490246b25bb6b18ccde7bda0d52eeb88667941cf2fdab15c940dbbc darkhttpd.logrotate
dd792892588e03cef4a36bb8e81297990884298d8a2bc1c14ae2d8986a0a17af8d15bf3fb4e1830d22b154dc00591d884e20da915f51fd8ecf3b05b6c92dc7d4 darkhttpd.initd
-79ecdbc751e8b5497a1afee294cf0addb4261f041a58a382e7fb51dd698dd99625a369173542c905e1e4eac7c68dfa1d8d778f4777ebe74d5031817a6ec437ad darkhttpd.confd"
+79ecdbc751e8b5497a1afee294cf0addb4261f041a58a382e7fb51dd698dd99625a369173542c905e1e4eac7c68dfa1d8d778f4777ebe74d5031817a6ec437ad darkhttpd.confd
+"
diff --git a/main/dav1d/APKBUILD b/main/dav1d/APKBUILD
index 2316f80810..7f5e4b1746 100644
--- a/main/dav1d/APKBUILD
+++ b/main/dav1d/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=dav1d
pkgver=1.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="small and fast AV1 Decoder"
url="https://code.videolan.org/videolan/dav1d"
arch="all"
@@ -20,6 +20,8 @@ build() {
esac
abuild-meson \
+ --buildtype=release \
+ -Db_lto=true \
-Denable_tests=true \
-Denable_tools=true \
-Dfuzzing_engine=none \
@@ -30,7 +32,7 @@ build() {
}
check() {
- meson test --no-rebuild -v -C build
+ meson test --no-rebuild --print-errorlogs -C build
}
package() {
diff --git a/main/db/APKBUILD b/main/db/APKBUILD
index ce746403ad..6b091ce518 100644
--- a/main/db/APKBUILD
+++ b/main/db/APKBUILD
@@ -1,29 +1,23 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=db
pkgver=5.3.28
-_ver=${pkgver}
-pkgrel=1
+pkgrel=2
pkgdesc="The Berkeley DB embedded database system"
url="https://www.oracle.com/technology/software/products/berkeley-db/index.html"
arch="all"
license="custom"
options="!check" # "check target not available"
-depends=
-makedepends=
subpackages="$pkgname-dev $pkgname-doc $pkgname-utils $pkgname-c++:cxx"
source="https://download.oracle.com/berkeley-db/db-$pkgver.tar.gz
atomic.patch
"
-builddir="$srcdir/db-$_ver"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build () {
- cd "$builddir"
cd build_unix
../dist/configure \
--build=$CBUILD \
@@ -38,13 +32,12 @@ build () {
}
package() {
- cd "$builddir"/build_unix
- make DESTDIR="$pkgdir" install
+ make -C build_unix DESTDIR="$pkgdir" install
mkdir -p "$pkgdir"/usr/share/doc
mv "$pkgdir"/usr/docs "$pkgdir"/usr/share/doc/$pkgname
- install -D -m644 "$srcdir"/db-$_ver/LICENSE \
+ install -Dm644 LICENSE \
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
@@ -61,5 +54,7 @@ cxx() {
mv "$pkgdir"/usr/lib/libdb_cxx*.so "$subpkgdir"/usr/lib/
}
-sha512sums="e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090 db-5.3.28.tar.gz
-e9fedc5b870b95fe772a8121fca8b3642327d960441fe40a1090375efd37eec397a508e6e9100c2817c02bb4380421eb8ea400aeb060fe46a8bdac83a1abfbeb atomic.patch"
+sha512sums="
+e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090 db-5.3.28.tar.gz
+e9fedc5b870b95fe772a8121fca8b3642327d960441fe40a1090375efd37eec397a508e6e9100c2817c02bb4380421eb8ea400aeb060fe46a8bdac83a1abfbeb atomic.patch
+"
diff --git a/main/dbus-glib/APKBUILD b/main/dbus-glib/APKBUILD
index 28adc0dc14..63a5d76c59 100644
--- a/main/dbus-glib/APKBUILD
+++ b/main/dbus-glib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dbus-glib
pkgver=0.112
-pkgrel=0
+pkgrel=1
pkgdesc="GLib bindings for DBUS"
options="!check" # FIXME: tests fails
url="http://www.freedesktop.org/wiki/Software/DBusBindings"
@@ -31,4 +31,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="7c9f393f065dfb3d698f35e6554caf15fe539f5dd52d2b2bb6ed1770e130f5dab8e45379232520301455bae9bb77e25a109faf175153fcd4b9dd11d7de4a546e dbus-glib-0.112.tar.gz"
+sha512sums="
+7c9f393f065dfb3d698f35e6554caf15fe539f5dd52d2b2bb6ed1770e130f5dab8e45379232520301455bae9bb77e25a109faf175153fcd4b9dd11d7de4a546e dbus-glib-0.112.tar.gz
+"
diff --git a/main/dbus/0001-build-Treat-with-x-yes-the-same-as-with-x-auto.patch b/main/dbus/0001-build-Treat-with-x-yes-the-same-as-with-x-auto.patch
deleted file mode 100644
index 2d2530e5f0..0000000000
--- a/main/dbus/0001-build-Treat-with-x-yes-the-same-as-with-x-auto.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 99cc28e0eb1a37233c0f7d3595175d1f331550e7 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 1 Mar 2022 15:56:30 +0100
-Subject: [PATCH 1/5] build: Treat --with-x[=yes] the same as --with-x=auto
-
-Previously, --with-x would disable the check for X11 libraries, which
-was not intended.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index fa75e930..847e95fb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1115,7 +1115,7 @@ if test "x$dbus_win" = xyes; then
-
- enable_x11_autolaunch=no
- have_x11=no
--else if test "x$with_x" = xauto; then
-+else if test "x$with_x" != xno; then
- PKG_CHECK_MODULES([X], [x11],
- [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])],
- [ have_x11=no ])
---
-2.36.0
-
diff --git a/main/dbus/0002-Move-DBUS_X_-definitions-into-PKG_CHECK_MODULES-bloc.patch b/main/dbus/0002-Move-DBUS_X_-definitions-into-PKG_CHECK_MODULES-bloc.patch
deleted file mode 100644
index 9f871864bb..0000000000
--- a/main/dbus/0002-Move-DBUS_X_-definitions-into-PKG_CHECK_MODULES-bloc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 51e468d828785cbc7060678f6f257723ba11cd10 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 1 Mar 2022 16:01:29 +0100
-Subject: [PATCH 2/5] Move DBUS_X_* definitions into PKG_CHECK_MODULES block
-
----
- configure.ac | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 847e95fb..a51e7265 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1117,15 +1117,15 @@ if test "x$dbus_win" = xyes; then
- have_x11=no
- else if test "x$with_x" != xno; then
- PKG_CHECK_MODULES([X], [x11],
-- [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])],
-+ [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])
-+ have_x11=yes
-+ DBUS_X_LIBS="$X_LIBS"
-+ DBUS_X_CFLAGS="$X_CFLAGS"
-+ ],
- [ have_x11=no ])
-
- if test "x$have_x11" = xno; then
- AC_MSG_WARN([Couldn't found X11, tried with pkg-config.])
-- else
-- have_x11=yes
-- DBUS_X_LIBS="$X_LIBS"
-- DBUS_X_CFLAGS="$X_CFLAGS"
- fi
- else
- AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
---
-2.36.0
-
diff --git a/main/dbus/0003-Emit-an-error-when-with-x-was-given-but-no-X11-libs-.patch b/main/dbus/0003-Emit-an-error-when-with-x-was-given-but-no-X11-libs-.patch
deleted file mode 100644
index e0c5cad5ab..0000000000
--- a/main/dbus/0003-Emit-an-error-when-with-x-was-given-but-no-X11-libs-.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 17c88a894499da64460a0ef76db1d8b88ceb9eeb Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 1 Mar 2022 16:05:52 +0100
-Subject: [PATCH 3/5] Emit an error when --with-x was given but no X11 libs
- were found
-
----
- configure.ac | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a51e7265..4420c6d3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1121,12 +1121,13 @@ else if test "x$with_x" != xno; then
- have_x11=yes
- DBUS_X_LIBS="$X_LIBS"
- DBUS_X_CFLAGS="$X_CFLAGS"
-- ],
-- [ have_x11=no ])
--
-- if test "x$have_x11" = xno; then
-- AC_MSG_WARN([Couldn't found X11, tried with pkg-config.])
-- fi
-+ ], [
-+ AS_IF([test "x$with_x" = xyes],
-+ [AC_MSG_ERROR([Couldn't find X11, tried with pkg-config.])],
-+ [AC_MSG_WARN([Couldn't find X11, tried with pkg-config.])]
-+ )
-+ have_x11=no
-+ ])
- else
- AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
- AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible])
---
-2.36.0
-
diff --git a/main/dbus/0004-Add-have_x11-no-if-without-x-was-given-to-make-later.patch b/main/dbus/0004-Add-have_x11-no-if-without-x-was-given-to-make-later.patch
deleted file mode 100644
index 9cfa9de488..0000000000
--- a/main/dbus/0004-Add-have_x11-no-if-without-x-was-given-to-make-later.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bf3cb42c6db1f4479467d66a111b08a98afef31b Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 1 Mar 2022 16:08:06 +0100
-Subject: [PATCH 4/5] Add have_x11=no if --without-x was given to make later
- checks happy
-
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 4420c6d3..8816a950 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1129,6 +1129,7 @@ else if test "x$with_x" != xno; then
- have_x11=no
- ])
- else
-+ have_x11=no
- AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
- AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible])
- ])
---
-2.36.0
-
diff --git a/main/dbus/0005-Convert-if-calls-to-AS_IF-macro-for-the-block-that-h.patch b/main/dbus/0005-Convert-if-calls-to-AS_IF-macro-for-the-block-that-h.patch
deleted file mode 100644
index 1059b94741..0000000000
--- a/main/dbus/0005-Convert-if-calls-to-AS_IF-macro-for-the-block-that-h.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c71f013a64cd7f6de4c9cf3cf3b236239d713eb1 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 1 Mar 2022 16:11:05 +0100
-Subject: [PATCH 5/5] Convert "if" calls to AS_IF macro for the block that
- handles X11
-
----
- configure.ac | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8816a950..91bd898c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1108,14 +1108,14 @@ AC_ARG_ENABLE([x11-autolaunch],
- AS_HELP_STRING([--enable-x11-autolaunch], [build with X11 auto-launch support]),
- [], [enable_x11_autolaunch=auto])
-
--if test "x$dbus_win" = xyes; then
-- if test "x$enable_x11_autolaunch" = xyes; then
-+AS_IF([test "x$dbus_win" = xyes], [
-+ AS_IF([test "x$enable_x11_autolaunch" = xyes], [
- AC_MSG_ERROR([X11 auto-launch is not supported on Windows])
-- fi
-+ ])
-
- enable_x11_autolaunch=no
- have_x11=no
--else if test "x$with_x" != xno; then
-+], [test "x$with_x" != xno], [
- PKG_CHECK_MODULES([X], [x11],
- [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])
- have_x11=yes
-@@ -1128,13 +1128,12 @@ else if test "x$with_x" != xno; then
- )
- have_x11=no
- ])
--else
-+], [
- have_x11=no
- AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
- AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible])
- ])
--fi
--fi
-+])
-
- if test "x$enable_x11_autolaunch,$have_x11" = xyes,no; then
- AC_MSG_ERROR([X11 auto-launch requires X headers/libraries])
---
-2.36.0
-
diff --git a/main/dbus/APKBUILD b/main/dbus/APKBUILD
index 84a819a21f..7b4d6398c4 100644
--- a/main/dbus/APKBUILD
+++ b/main/dbus/APKBUILD
@@ -1,29 +1,25 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dbus
-pkgver=1.14.0
-pkgrel=1
+pkgver=1.15.0
+pkgrel=2
pkgdesc="Freedesktop.org message bus system"
url="https://www.freedesktop.org/Software/dbus"
arch="all"
license="AFL-2.1 OR GPL-2.0-or-later"
depends_dev="util-linux-dev"
-makedepends="$depends_dev
- autoconf
- autoconf-archive
- automake
+makedepends="
+ $depends_dev
expat-dev
glib-dev
libsm-dev
- libtool
libx11-dev
+ meson
xmlto
"
-checkdepends="xvfb-run"
pkggroups="messagebus"
install="$pkgname.pre-install $pkgname.post-install"
triggers="$pkgname.trigger=/usr/share/dbus-1/system.d"
subpackages="
- $pkgname-static
$pkgname-dev
$pkgname-doc
$pkgname-libs
@@ -31,15 +27,9 @@ subpackages="
$pkgname-openrc
"
source="https://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.xz
- 0001-build-Treat-with-x-yes-the-same-as-with-x-auto.patch
- 0002-Move-DBUS_X_-definitions-into-PKG_CHECK_MODULES-bloc.patch
- 0003-Emit-an-error-when-with-x-was-given-but-no-X11-libs-.patch
- 0004-Add-have_x11-no-if-without-x-was-given-to-make-later.patch
- 0005-Convert-if-calls-to-AS_IF-macro-for-the-block-that-h.patch
$pkgname.initd
$pkgname.confd
"
-options="!check" # introduces circular dependency with xorg-server (xvfb-run -> xvfb)
# secfixes:
# 1.12.18-r0:
@@ -47,40 +37,23 @@ options="!check" # introduces circular dependency with xorg-server (xvfb-run ->
# 1.12.16-r0:
# - CVE-2019-12749
-prepare() {
- default_prepare
- autoreconf -vif
-}
-
build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-xml=expat \
- --with-dbus-user=messagebus \
- --with-system-pid-file=/run/dbus/dbus.pid \
- --disable-verbose-mode \
- --enable-inotify \
- --disable-dnotify \
- --enable-modular-tests=yes \
- --disable-asserts \
- --enable-user-session \
- --enable-xml-docs \
- --with-session-socket-dir=/tmp \
- --with-x
- make
+ abuild-meson \
+ -Db_lto=true \
+ -Dinotify=enabled \
+ -Ddbus_user=messagebus \
+ -Dsystem_pid_file=/run/dbus/dbus.pid \
+ . output
+
+ meson compile -C output
}
check() {
- xvfb-run make check
+ meson test -t 4 --no-rebuild --print-errorlogs -C output
}
package() {
- make -j1 DESTDIR="$pkgdir" install
- rm -rf "$pkgdir"/usr/lib/systemd
+ DESTDIR="$pkgdir" meson install --no-rebuild -C output
install -Dm755 "$srcdir"/dbus.initd "$pkgdir"/etc/init.d/dbus
install -Dm644 "$srcdir"/dbus.confd "$pkgdir"/etc/conf.d/dbus
@@ -101,12 +74,7 @@ x11() {
}
sha512sums="
-9bf17a3ebb3cf44722c6fbf24ee56e9dc14d6882fc312f26c7f07459d969424bc2fb63a229139e011804ecc479a8f0eb1a0c83286f8d5a664c5979d12634179f dbus-1.14.0.tar.xz
-d7c9ca341af0672621b3793ae51118d1b3ab4d1cd4cb8f8ad6b209e713c8e6446c2641c250ba82be42bb5ad3b7812e85165315a0997e4e298c8f8a265cbdcb3a 0001-build-Treat-with-x-yes-the-same-as-with-x-auto.patch
-6e8cdbef3c4263d9a2a878cbbc09511c68a02bc9b16d4d7e3a5e39e07e8dce9ec25ce5c7a7c77bda89e7a2af93246d5cbfd503406acb082d8189936c7d6076dd 0002-Move-DBUS_X_-definitions-into-PKG_CHECK_MODULES-bloc.patch
-eb53caf763fa11d2d9be6e9a4a09e93ea021d1764f401fb3d18f4ef656efacfda231efe2618adb704d15d881846785fea266c1d9700adc3cb38792cee823cf34 0003-Emit-an-error-when-with-x-was-given-but-no-X11-libs-.patch
-20163c93695c4286f3634941e959dc3b1289ab8d056d528ed35ccb7e71c5706377f72d514f9609bf5f51e9f573b9a996c64631bd2079ad12ae7cf0b2e69f227f 0004-Add-have_x11-no-if-without-x-was-given-to-make-later.patch
-723ba846da40883d7b1d2fd6e48822b427a5f29e9530854e90f2d761cbba711711b3013ed2b824576cdc529726c7bb39f8a5c9cc779222efb8e016c5d9d18332 0005-Convert-if-calls-to-AS_IF-macro-for-the-block-that-h.patch
+6f7e1d4ff525ce13c5f671f1b045a089c379cbfb777662ce7a55ffe4893a8ab2aaf38877a7b8f261823067a20f3b336437449eb353a97d30699496375e00bf1a dbus-1.15.0.tar.xz
0db5c0804b5aa19c8d7e517b1c6d11b9b52d96477d4d26769c01a31765491ff12897b5634455ee57d978ea30e2d71c5df5ed3eecd5435983d8ab1128ff516315 dbus.initd
3f063efa672a900ed04bc7224ba31b3ced91bb98ae096a3ce12552a0b6e2c38ddb445edb4876518f9be4140a5d901dc62080e95aab4346d89dbf329ebec33cb3 dbus.confd
"
diff --git a/main/debootstrap/APKBUILD b/main/debootstrap/APKBUILD
index a11e79d530..a0f56be37b 100644
--- a/main/debootstrap/APKBUILD
+++ b/main/debootstrap/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=debootstrap
-pkgver=1.0.126
-pkgrel=2
+pkgver=1.0.127
+pkgrel=0
pkgdesc="Debian/Ubuntu bootstrap scripts"
url="https://packages.qa.debian.org/d/debootstrap.html"
arch="noarch"
@@ -20,6 +20,6 @@ package() {
}
sha512sums="
-4851be46698c4e63c4c29d19a4d4e636fbb4c9aa46d1da04524d95a889b5062e216506bb33ef06875a5c5743bac115bd5323daf236783b85b066b2dc11d9b3ca debootstrap-1.0.126.tar.bz2
+4fc5dc23c9a2ab7255d19df74f413e8e17302b57468291da88f5980d48c8a2959e3318829d6eb4cbaf5441d326cbe01ef212d2d1c1f3f41659fbb21861eec904 debootstrap-1.0.127.tar.bz2
a349d9d8f5fe9e4ccb67d7206d5e87174722c0e0ee07405557662e94fb3c330a922f9cfe12bbd096103cbbe2146262ea300d9e1854f7fef77f4f1949984f5591 auto-detect-arch.patch
"
diff --git a/main/dejagnu/APKBUILD b/main/dejagnu/APKBUILD
index b974176acb..54ad23a79c 100644
--- a/main/dejagnu/APKBUILD
+++ b/main/dejagnu/APKBUILD
@@ -1,9 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer:
-
pkgname=dejagnu
pkgver=1.6.2
-pkgrel=0
+pkgrel=1
pkgdesc="A framework for testing other programs"
url="https://www.gnu.org/software/dejagnu/"
arch="noarch"
@@ -14,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index d9aa8ad407..c88a44b064 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=dhcp
-pkgver=4.4.3
+pkgver=4.4.3_p1
_realver=${pkgver/_p/-P}
pkgrel=0
pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
@@ -45,6 +45,9 @@ builddir="$srcdir/$pkgname-$_realver"
makedepends="$makedepends $_depends_dhclient $_depends_server_ldap $_depends_server_vanilla"
# secfixes:
+# 4.4.3_p1-r0:
+# - CVE-2022-2928
+# - CVE-2022-2929
# 4.4.2_p1-r0:
# - CVE-2021-25217
# 4.4.1-r0:
@@ -195,7 +198,7 @@ static() {
# "
sha512sums="
-4472d6794af80b482560956cee6895889cc1aca39980f851faf56824627e95731f2983cf7c7454bc3decb0a12c874fcbd29bd6c5a9695412def6bc14c6df17e0 dhcp-4.4.3.tar.gz
+d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154 dhcp-4.4.3-P1.tar.gz
17e2b9588ee5d1bd9acb9c2e30f7a28308d29c9e797c2be14c1feff52e6e231ce8a94535f18badff1342aff4ae4003aab986e0f0473f0cd280292fdab044b148 01-dhclient-script-fix-bare-ip.patch
a70e4a7e80ee65c8ced6b61db80f7ccd0f35015b5cccf2e7c51705ae129230aa49ba9926bb88f7418018e7a112c2a40451f24b88e04464b590ff20091e8d8709 02-dhclient-script-remove-bashisms.patch
23ab581d85ba97a37fd6a0a612e0aa977b24bbaf83d58a93d1a87f9f24ea9a098aa549e77a6e1d78f721681c152464b15fd1d402d0673edf4dac6aa196df1fe9 03-fix-unwind-import.patch
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index 269a068ca9..0a76dd8655 100644
--- a/main/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dhcpcd
pkgver=9.4.1
-pkgrel=0
+pkgrel=1
pkgdesc="RFC2131 compliant DHCP client"
url="https://roy.marples.name/projects/dhcpcd"
arch="all"
@@ -47,5 +47,5 @@ sha512sums="
530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45 dhcpcd-9.4.1.tar.xz
692b2c8c75166fabd512a7cc69c650f9391e0f682ce9cbe1771bfa44e82dcf09e322c46493c45ca75000f479d3cddde306754ba31d28a798a15e2b79a56045f0 busybox-logger.patch
1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch
-dc3b30295dbe5310526443736e60ccc53621d465d512639e8ea20efe598037ff33730e46964e4e7bc32d4ce88aaecf3b9bb9a4ceab892d8bff3423e0374ccae1 dhcpcd.initd
+f2c9878449ba8a8d7415c31c7e955bcfc3e1dc7cc84d06de39a3584bb9cae42e214176dd3a91f4d998d94e098be3d9fa990b7277b4763e292b8f32e45dc6f7e5 dhcpcd.initd
"
diff --git a/main/dhcpcd/dhcpcd.initd b/main/dhcpcd/dhcpcd.initd
index aab118242e..7daa07b94e 100644
--- a/main/dhcpcd/dhcpcd.initd
+++ b/main/dhcpcd/dhcpcd.initd
@@ -3,8 +3,8 @@
description="DHCP Client Daemon"
command="/sbin/dhcpcd"
-command_args="-q ${command_args:-}"
-command_args_foreground="-B"
+command_args="-q -B ${command_args:-}"
+command_background="true"
pidfile="/run/dhcpcd.pid"
depend() {
diff --git a/main/dialog/APKBUILD b/main/dialog/APKBUILD
index 1812026b87..c2469a4920 100644
--- a/main/dialog/APKBUILD
+++ b/main/dialog/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dialog
-pkgver=1.3.20220526
+pkgver=1.3.20220728
_pkgver=${pkgver%.*}-${pkgver##*.}
pkgrel=0
pkgdesc="Script interpreter providing curses widgets"
@@ -39,5 +39,5 @@ static() {
}
sha512sums="
-619d52b8123264bf586f5325443c3b85863166119c6fbaa91571a57454d761f01a53ebeb2203ea725c83dc88f2abf886c64c6eac5b56c126e4f3939eb1d24d62 dialog-1.3-20220526.tgz
+dddceaf00bfec4b53f2cf67e51d4c54841d9db337536657c21bc8f324a0eb9c6d621f00e09bfb741bd263f171dde38cfea87568f86daf04a9e88575a0ed61218 dialog-1.3-20220728.tgz
"
diff --git a/main/diffutils/APKBUILD b/main/diffutils/APKBUILD
index fe0cfc392c..a08b08f853 100644
--- a/main/diffutils/APKBUILD
+++ b/main/diffutils/APKBUILD
@@ -1,22 +1,17 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=diffutils
pkgver=3.8
-pkgrel=0
+pkgrel=1
pkgdesc="Show differences among files"
subpackages="$pkgname-doc"
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"
+checkdepends="perl"
source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz
skip-test-presue-output-tty.patch
"
-builddir=$srcdir/$pkgname-$pkgver
-
build() {
./configure \
--build=$CBUILD \
diff --git a/main/djbdns/APKBUILD b/main/djbdns/APKBUILD
index e0ee5b2618..de0dac31bc 100644
--- a/main/djbdns/APKBUILD
+++ b/main/djbdns/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=djbdns
pkgver=1.05
-pkgrel=47
+pkgrel=49
pkgdesc="Excellent high-performance DNS services"
url="http://cr.yp.to/djbdns.html"
arch="all"
@@ -23,32 +23,26 @@ https://www.fefe.de/dns/djbdns-1.05-test25.diff.bz2
dnscache.monthly
"
-builddir="$srcdir"/$pkgname-$pkgver
prepare() {
default_prepare
- cd "$builddir"
# remove all the generated headers. they came with the jumbo patch and should
# never have been there...
sed -n 's/^\([a-z0-9]\+\.h\):.*/\1/gp' Makefile Makefile.sig | xargs rm -f
}
build() {
- cd "$builddir"
- echo "${CC:-"gcc"} ${CFLAGS}" > conf-cc
- echo "${CC:-"gcc"} ${LDFLAGS}" > conf-ld
+ echo "${CC:-"gcc"} $CFLAGS" > conf-cc
+ echo "${CC:-"gcc"} $LDFLAGS" > conf-ld
echo "/usr" > conf-home
make -j1
}
package() {
- cd "$builddir"
- mkdir -p "$pkgdir"/etc/
- cp dnsroots.global "$pkgdir"/etc/
- mkdir -p "$pkgdir"/usr/bin
- cp *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
+ install -Dm644 dnsroots.global -t "$pkgdir"/etc/
+ install -Dm755 *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
*-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort \
- "$pkgdir"/usr/bin/
+ -t "$pkgdir"/usr/bin/
mkdir -p "$pkgdir"/usr/share/doc/djbdns
}
@@ -56,18 +50,16 @@ common() {
pkgdesc="Base utilities of djbdns"
replaces="djbdns"
- mkdir -p "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/dnsqr "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/dnsip "$subpkgdir"/usr/bin
+ amove usr/bin/dnsqr usr/bin/dnsip
}
tinydns() {
pkgdesc="A small and secure DNS server"
install=tinydns.pre-install
- mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/etc/tinydns \
+ amove usr/bin/tinydns*
+ mkdir -p "$subpkgdir"/etc/tinydns \
"$subpkgdir"/var/cache/tinydns
- mv "$pkgdir"/usr/bin/tinydns* "$subpkgdir"/usr/bin
install -D -m755 "$srcdir"/tinydns.initd \
"$subpkgdir"/etc/init.d/tinydns
install -D -m644 "$srcdir"/tinydns.confd \
@@ -95,7 +87,8 @@ dnscache() {
"$subpkgdir"/etc/periodic/monthly/dnscache-hints-refresh
}
-sha512sums="20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9 djbdns-1.05.tar.gz
+sha512sums="
+20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9 djbdns-1.05.tar.gz
41cca597dba971010b9844071e0349d3a4b25cc4b144e12721b0bc8250589fb374e40ece8908f1081762597048179b1177e88b9a5f97be0b47b63e3183e654bb djbdns-1.05-test25.diff.bz2
be4c9aea40c737364a56f188ad2276d90deac0dffb73ba4b659490836c0fe92ffb65ccf23c6724b913b2d6354336727004be0cf5b43ebc47abe7004700dfe1e8 headtail.patch
0cd97d833e0aaee2b82ed27b56ce183e9ab9806ff1e77bc61b7f38ae3168aa7310b12d2ed330713c4da97e60881ee339f6af449142cc29823865d87270733211 dnsroots.patch
@@ -108,4 +101,5 @@ af7c0a0a2f519ec16ac2a937664b7984aafeb19d04fbd6e0fd0afa5482f3cb0b4ac5cf6a846d574a
31b52bd4dd0f78ff63e105ff3937fb9bf582628fe7a04bfcba91195d4fc4b55b60869f993a42ef55a228892647af07ed7ea22cfff72812430c7b8207debdd8f1 tinydns.confd
31bf58ed6a049e02210ce1cbbea00b62e2fe92339cd861eb3ee35f16186a3904e85fcd2f056e2d788b8a284068d83a3767cef01519a6d0152f1958be8e418956 dnscache.initd
1b281a4892c1c9ad39a15c95d0fbd14b0ada69b31723250e33d96946bd19f3edc4b36ec90fb9b6b884d7907b7e86cc3980f116f16fe35fb7496feffd728b1ffa dnscache.confd
-70d3431db407d02f145cb1521d563559b536e89a6a88f50cf853036b2833d78b594398df30cc33c17debea23aa6a7112614741e13f8ec5d1429fad075273a9f6 dnscache.monthly"
+19dcd0880a4e43657d05916b96c1ce075e4ba0a9dc0f7085408e92e087e5a9386ff760e76f81c509fe7402aa6fd9580817f590d5a062dca6bf813d73e0e1b95c dnscache.monthly
+"
diff --git a/main/djbdns/dnscache.monthly b/main/djbdns/dnscache.monthly
index 574d56f01d..1c8d1edd1d 100755
--- a/main/djbdns/dnscache.monthly
+++ b/main/djbdns/dnscache.monthly
@@ -28,7 +28,7 @@ for ZONEFILE in $ZONES; do
# Refresh zone info
dnsqr ns $ZONE | awk '/^answer: ./ { print $5 }' | sort -u | xargs dnsip > $TMPF
- if egrep -q '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' $TMPF; then
+ if grep -E -q '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' $TMPF; then
cmp -s $ZONEFILE $TMPF
if [ "$?" != 0 ]; then
NEEDRESTART=yes
diff --git a/main/dkimproxy/APKBUILD b/main/dkimproxy/APKBUILD
index dbec8b06a1..8b4f2cd791 100644
--- a/main/dkimproxy/APKBUILD
+++ b/main/dkimproxy/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=dkimproxy
pkgver=1.4.1
-pkgrel=5
+pkgrel=6
pkgdesc="SMTP-proxy that signs and/or verifies emails, using the Mail::DKIM module"
url="http://dkimproxy.sourceforge.net/"
arch="noarch"
@@ -17,11 +17,8 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
dkimproxy.in.confd
dkimproxy.out.confd
"
-builddir="$srcdir/$pkgname-$pkgver"
build() {
- cd "$builddir"
-
local vendorlib=$(perl -V:vendorlib | sed -En "s|vendorlib='([^']+)';|\1|p")
perllibdir="$vendorlib" ./configure --prefix=/usr \
@@ -33,8 +30,6 @@ build() {
}
package() {
- cd "$builddir"
-
make DESTDIR="$pkgdir" install
cd "$pkgdir"
diff --git a/main/dnssec-root/APKBUILD b/main/dnssec-root/APKBUILD
index c868c7a171..a9d4f889a3 100644
--- a/main/dnssec-root/APKBUILD
+++ b/main/dnssec-root/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dnssec-root
pkgver=20190225
-pkgrel=1
+pkgrel=2
_commit=67c11662510f5e2db6e6517228e80b794950c43f
pkgdesc="The DNSSEC root key(s)"
url="https://www.iana.org/dnssec/"
diff --git a/main/docbook-xml/APKBUILD b/main/docbook-xml/APKBUILD
index 5ece603158..7ba2a3d0c6 100644
--- a/main/docbook-xml/APKBUILD
+++ b/main/docbook-xml/APKBUILD
@@ -1,13 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=docbook-xml
pkgver=4.5
-pkgrel=6
+pkgrel=7
pkgdesc="A widely used XML scheme for writing documentation and help"
url="http://scrollkeeper.sourceforge.net/docbook.shtml"
arch="noarch"
license="MIT"
depends="libxml2-utils"
-makedepends=
options="!check"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
source="https://www.docbook.org/xml/$pkgver/$pkgname-$pkgver.zip
@@ -25,9 +24,9 @@ unpack() {
4.1.2) _filename=docbkx412.zip;;
*) _filename=docbook-xml-$ver.zip;;
esac
- mkdir -p "$srcdir"/docbook-xml-${ver}
- cd "$srcdir"/docbook-xml-${ver}
- msg "extracting ${_filename}"
+ mkdir -p "$srcdir"/docbook-xml-$ver
+ cd "$srcdir"/docbook-xml-$ver
+ msg "extracting $_filename"
unzip "$srcdir"/$_filename
done
}
@@ -35,9 +34,9 @@ unpack() {
package () {
local ver
for ver in $_versions; do
- cd "$srcdir"/docbook-xml-${ver}
- mkdir -p "$pkgdir"/usr/share/xml/docbook/xml-dtd-${ver}
- cp -af docbook.cat *.dtd ent/ *.mod "$pkgdir"/usr/share/xml/docbook/xml-dtd-${ver}/
+ cd "$srcdir"/docbook-xml-$ver
+ mkdir -p "$pkgdir"/usr/share/xml/docbook/xml-dtd-$ver
+ cp -af docbook.cat *.dtd ent/ *.mod "$pkgdir"/usr/share/xml/docbook/xml-dtd-$ver/
done
chmod 755 "$pkgdir"/usr/share/xml/docbook/xml-dtd-*/ent
diff --git a/main/docbook2x/APKBUILD b/main/docbook2x/APKBUILD
index e0024ccc30..7f02b7ce35 100644
--- a/main/docbook2x/APKBUILD
+++ b/main/docbook2x/APKBUILD
@@ -2,15 +2,13 @@
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=docbook2x
pkgver=0.8.8
-pkgrel=6
+pkgrel=7
pkgdesc="DocBook converter to UNIX manpage and GNU Texinfo format"
url="http://docbook2x.sourceforge.net"
arch="all"
license="MIT"
depends="texinfo openjade docbook-xml docbook-xsl perl-xml-sax libxslt"
-depends_dev=""
makedepends="autoconf automake"
-install=""
subpackages="$pkgname-doc"
source="https://downloads.sourceforge.net/$pkgname/docbook2X-$pkgver.tar.gz
01_fix_static_datadir_evaluation.patch
@@ -20,19 +18,9 @@ source="https://downloads.sourceforge.net/$pkgname/docbook2X-$pkgver.tar.gz
05_fix_439214_error_on_missing_refentry.patch
06_fix_man_typo.patch"
-_builddir="$srcdir"/docbook2X-$pkgver
-prepare() {
- local i
- cd "$_builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1 ;;
- esac
- done
-}
+builddir="$srcdir"/docbook2X-$pkgver
build() {
- cd "$_builddir"
autoreconf --install
./configure \
--build=$CBUILD \
@@ -42,14 +30,12 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--localstatedir=/var \
- --program-transform-name 's/docbook2/docbook2x-/' \
- || return 1
- make || return 1
+ --program-transform-name 's/docbook2/docbook2x-/'
+ make
}
package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
}
sha512sums="cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c docbook2X-0.8.8.tar.gz
diff --git a/main/docs/APKBUILD b/main/docs/APKBUILD
index a46f5297a0..3f6c2defa9 100644
--- a/main/docs/APKBUILD
+++ b/main/docs/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=docs
pkgver=0.2
-pkgrel=3
+pkgrel=6
pkgdesc="Meta package for pulling in all documentation"
url="https://alpinelinux.org"
-arch="all"
+arch="noarch"
license="MIT"
-depends="mandoc" # It was previously called man
+depends="doc-provider man-pages"
package() {
mkdir -p "$pkgdir"
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 589e0f9704..18f73091e5 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -2,6 +2,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Contributor: Michael Mason <ms13sp@gmail.com>
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Contributor: Martin Uddén <martin.udden@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dovecot
pkgver=2.3.19.1
@@ -9,14 +10,14 @@ case "$pkgver" in
*.*.*.*) _pkgverminor=${pkgver%.*.*};;
*.*.*) _pkgverminor=${pkgver%.*};;
esac
-pkgrel=0
+pkgrel=3
_pigeonholever=0.5.19
pkgdesc="IMAP and POP3 server"
url="https://www.dovecot.org/"
arch="all"
options="libtool"
license="LGPL-2.0-or-later"
-depends="openssl"
+depends="openssl>3"
pkgusers="dovecot dovenull"
pkggroups="dovecot dovenull"
makedepends="
@@ -33,9 +34,10 @@ makedepends="
libsodium-dev
libtool
linux-headers
+ lua5.3-dev
mariadb-connector-c-dev
openldap-dev
- openssl1.1-compat-dev
+ openssl-dev>3
sqlite-dev
zlib-dev
"
@@ -55,11 +57,12 @@ subpackages="
$pkgname-sqlite
$pkgname-gssapi
$pkgname-ldap
+ $pkgname-lua
$pkgname-fts-solr:_fts_solr
$pkgname-fts-lucene:_fts_lucene
"
source="https://www.dovecot.org/releases/$_pkgverminor/dovecot-$pkgver.tar.gz
- https://pigeonhole.dovecot.org/releases/$_pkgverminor/dovecot-$_pkgverminor-pigeonhole-$_pigeonholever.tar.gz
+ $pkgname-pigeonhole-$_pigeonholever.tar.gz::https://pigeonhole.dovecot.org/releases/$_pkgverminor/dovecot-$_pkgverminor-pigeonhole-$_pigeonholever.tar.gz
skip-iconv-check.patch
split-protocols.patch
default-config.patch
@@ -131,6 +134,7 @@ build() {
--with-gssapi=plugin \
--with-ldap=plugin \
--with-sql=plugin \
+ --with-lua=plugin \
--with-mysql \
--with-sqlite \
--with-pgsql \
@@ -262,6 +266,22 @@ pgsql() {
_find usr/lib/dovecot _pgsql
}
+lua() {
+ pkgdesc="Lua plugins for Dovecot"
+ depends="$pkgname-lua=$pkgver-r$pkgrel"
+
+ cd "$pkgdir"
+ _submv usr/lib/dovecot/auth/libauthdb_lua.so
+ _submv usr/lib/dovecot/lib01_mail_lua_plugin.so
+ _submv usr/lib/dovecot/lib22_push_notification_lua_plugin.so
+ _submv usr/lib/dovecot/libdovecot-lua.so
+ _submv usr/lib/dovecot/libdovecot-lua.so.0
+ _submv usr/lib/dovecot/libdovecot-lua.so.0.0.0
+ _submv usr/lib/dovecot/libdovecot-storage-lua.so
+ _submv usr/lib/dovecot/libdovecot-storage-lua.so.0
+ _submv usr/lib/dovecot/libdovecot-storage-lua.so.0.0.0
+}
+
mysql() {
pkgdesc="MySQL driver for Dovecot"
depends="$pkgname-sql=$pkgver-r$pkgrel"
@@ -338,7 +358,7 @@ _submv() {
sha512sums="
ceb87a5f76b6352d28fd030aae5ad2165a133e9a8a6309891e793911203fc0ada9fb254dc05d183eaaa7e2b9851d3f1755b33f08fa6ff5b4b415ac4272bfe150 dovecot-2.3.19.1.tar.gz
-5b0a61c7711232ea3651b818a970b500b05bd340a04bcd5a5f0ea0529eda65f498912a845c8f3b3b80196d010bc22bd4a380e1f682cb42f62b80d2d43a94993a dovecot-2.3-pigeonhole-0.5.19.tar.gz
+07e6a0e638508dddaa3822703ce5c08f479c4e721c0fe7a544776d9a037d557c16bad000fc422a1e83f53781058d3575e67d5264dd04cae763750b0dc40e6c51 dovecot-pigeonhole-0.5.19.tar.gz
fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a skip-iconv-check.patch
794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5 split-protocols.patch
0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07 default-config.patch
diff --git a/main/doxygen/APKBUILD b/main/doxygen/APKBUILD
index 48275c88af..f090a57202 100644
--- a/main/doxygen/APKBUILD
+++ b/main/doxygen/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=doxygen
-pkgver=1.9.4
+pkgver=1.9.5
pkgrel=0
pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
url="https://www.doxygen.nl/"
@@ -8,8 +8,7 @@ arch="all"
license="GPL-2.0-or-later"
checkdepends="libxml2-utils"
makedepends="flex bison coreutils perl python3 cmake samurai"
-source="https://doxygen.nl/files/doxygen-$pkgver.src.tar.gz
- "
+source="https://doxygen.nl/files/doxygen-$pkgver.src.tar.gz"
[ "$CARCH" = "riscv64" ] && options="textrels"
@@ -18,7 +17,7 @@ build() {
-DGIT_EXECUTABLE=/bin/false \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=MinSizeRel \
- -Dbuild_xmlparser=ON .
+ -Dbuild_xmlparser=ON
cmake --build build
}
@@ -34,5 +33,5 @@ package() {
}
sha512sums="
-613f17800ebd05b66b1954af4d51282a1779678e7ade6c43046fc940742a697ebdf3af8e94ac70a3422bc96def663e70eaea8c4349d192e2fe5e516c57cc345a doxygen-1.9.4.src.tar.gz
+4ad4c1ecd4a12220442f354b90aa56f80e78fcaf288d5e36da421437d59811ed3d429ee13717692886a55b9628ae565d40ce13c51792ccc8bba15b1e018cb651 doxygen-1.9.5.src.tar.gz
"
diff --git a/main/drbd-utils/APKBUILD b/main/drbd-utils/APKBUILD
index a3a3003ba8..3403cc28b9 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.21.1
+pkgver=9.21.4
pkgrel=0
pkgdesc="Network-based RAID 1"
url="https://www.drbd.org"
@@ -61,7 +61,7 @@ bashcomp() {
}
sha512sums="
-f6f7d0a5a440c8dd276cb143650fb4152b063fa840cbf68395cd2c36d74da5cd1a45f4413bef1a22724d19f875199d62d3e0372841690cec02fff16975c27fdd drbd-utils-9.21.1.tar.gz
+78095aeeeb6117ccbaba94bc1135495fc316690f60bd905d7a3b645e567fd04ca775bbaeb98be812a597da84ae3e18cd1899964165a81a42ceef9cd5839964dd drbd-utils-9.21.4.tar.gz
562ae8eee03148666fb6e6e700c1eb9086f6901e176ea6cd007e3ac4e39d1cdaf967064de74dc1ad620155996dc7011bd0e2abd1c9595ff9bf5f4413673726f3 drbdsetup-permissions.patch
dc9d825019803ab5cf66d14b0b67b9d3f42cabac2aee07228176b9ff73dacc74e413f2c9ed0fe22a8217ff502c80b891950d1d4fb51df56d9c8e51e7c1fc1cc6 fix-drbdsetup_events2.c.patch
f61a833dc5eea79000a7dd85e83ae10e284109c76b5d59974ed69f92dbab6c389d6d20f7ea374b7c066519c6d1d816ed27b48dbaee6b91fb9754974acf52f46e drbd.initd
diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD
index 2cda1f7a8a..7b3b95f836 100644
--- a/main/dropbear/APKBUILD
+++ b/main/dropbear/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dropbear
pkgver=2022.82
-pkgrel=0
+pkgrel=1
pkgdesc="small SSH 2 client/server designed for small memory environments"
url="https://matt.ucc.asn.au/dropbear/dropbear.html"
arch="all"
@@ -20,6 +20,7 @@ source="https://matt.ucc.asn.au/dropbear/releases/dropbear-$pkgver.tar.bz2
dropbear.initd
dropbear.confd
dropbear-options_sftp-server_path.patch
+ dropbear-fix-utmp.patch
"
# secfixes:
@@ -32,7 +33,7 @@ _progs="dropbear dropbearkey dbclient dropbearconvert scp"
build() {
CFLAGS="$CFLAGS $(pkg-config --cflags --static utmps)" \
- LDLIBS="$LDLIBS $(pkg-config --libs --static utmps)" \
+ LIBS="$LDLIBS $(pkg-config --libs --static utmps)" \
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -41,7 +42,9 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--localstatedir=/var \
+ --disable-utmp \
--disable-wtmp \
+ --disable-pututline \
--disable-lastlog
make PROGRAMS="$_progs"
}
@@ -88,4 +91,5 @@ sha512sums="
9c55ab3d8b61955cde1ccc1b8acbd3d2ef123feb9489e92737304c35315d07b7f85fad8a12ac7b0ec2c1dcee3d76b8bc4aa18518f4ddd963917805db33e48826 dropbear.initd
83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f dropbear.confd
df3fa2c64665b669257ec511afa2e04107eb6b0a2a4238ad9b33db3d322b90854b00506e14a09b648fe2d716dc6c140212cc1739f7cd03088f9b7b9781aaa499 dropbear-options_sftp-server_path.patch
+e143b8b2083c96fdf425fbe179aa43892e44b95734686a57ae5d5612778f1bd7e78a725d8413c1701d37dcf1b24986b1faa7365eb039789e2204320272fed7a3 dropbear-fix-utmp.patch
"
diff --git a/main/dropbear/dropbear-fix-utmp.patch b/main/dropbear/dropbear-fix-utmp.patch
new file mode 100644
index 0000000000..c4e79c725f
--- /dev/null
+++ b/main/dropbear/dropbear-fix-utmp.patch
@@ -0,0 +1,157 @@
+diff --git a/loginrec.c b/loginrec.c
+index af10d95..9e5c3aa 100644
+--- a/loginrec.c
++++ b/loginrec.c
+@@ -239,6 +239,13 @@ logininfo *login_alloc_entry(int pid, const char *username,
+
+ newli = (struct logininfo *) m_malloc (sizeof(*newli));
+ (void)login_init_entry(newli, pid, username, hostname, line);
++#ifdef HAVE_STRUCT_SOCKADDR_IN6
++ if (inet_pton(AF_INET6, hostname, newli->hostaddr.sa_in6.sin6_addr.s6_addr) > 0)
++ newli->hostaddr.sa_in6.sin6_family = AF_INET6;
++ else
++#endif
++ if (inet_pton(AF_INET, hostname, &newli->hostaddr.sa_in.sin_addr.s_addr) > 0)
++ newli->hostaddr.sa_in.sin_family = AF_INET;
+ return newli;
+ }
+
+@@ -473,9 +480,6 @@ void
+ construct_utmp(struct logininfo *li,
+ struct utmp *ut)
+ {
+-# ifdef HAVE_ADDR_V6_IN_UTMP
+- struct sockaddr_in6 *sa6;
+-# endif
+ memset(ut, '\0', sizeof(*ut));
+
+ /* First fill out fields used for both logins and logouts */
+@@ -528,12 +532,11 @@ construct_utmp(struct logininfo *li,
+ if (li->hostaddr.sa.sa_family == AF_INET)
+ ut->ut_addr = li->hostaddr.sa_in.sin_addr.s_addr;
+ # endif
+-# ifdef HAVE_ADDR_V6_IN_UTMP
++# if defined(HAVE_STRUCT_UTMP_UT_ADDR_V6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
+ /* this is just a 128-bit IPv6 address */
+ if (li->hostaddr.sa.sa_family == AF_INET6) {
+- sa6 = ((struct sockaddr_in6 *)&li->hostaddr.sa);
+- memcpy(ut->ut_addr_v6, sa6->sin6_addr.s6_addr, 16);
+- if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr)) {
++ memcpy(ut->ut_addr_v6, li->hostaddr.sa_in6.sin6_addr.s6_addr, 16);
++ if (IN6_IS_ADDR_V4MAPPED(&li->hostaddr.sa_in6.sin6_addr)) {
+ ut->ut_addr_v6[0] = ut->ut_addr_v6[3];
+ ut->ut_addr_v6[1] = 0;
+ ut->ut_addr_v6[2] = 0;
+@@ -569,9 +572,6 @@ set_utmpx_time(struct logininfo *li, struct utmpx *utx)
+ void
+ construct_utmpx(struct logininfo *li, struct utmpx *utx)
+ {
+-# ifdef HAVE_ADDR_V6_IN_UTMP
+- struct sockaddr_in6 *sa6;
+-# endif
+ memset(utx, '\0', sizeof(*utx));
+ # ifdef HAVE_STRUCT_UTMPX_UT_ID
+ line_abbrevname(utx->ut_id, li->line, sizeof(utx->ut_id));
+@@ -589,8 +589,6 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx)
+ line_stripname(utx->ut_line, li->line, sizeof(utx->ut_line));
+ set_utmpx_time(li, utx);
+ utx->ut_pid = li->pid;
+- /* strncpy(): Don't necessarily want null termination */
+- strncpy(utx->ut_name, li->username, MIN_SIZEOF(utx->ut_name, li->username));
+
+ if (li->type == LTYPE_LOGOUT)
+ return;
+@@ -600,6 +598,9 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx)
+ * for logouts.
+ */
+
++ /* strncpy(): Don't necessarily want null termination */
++ strncpy(utx->ut_name, li->username, MIN_SIZEOF(utx->ut_name, li->username));
++
+ # ifdef HAVE_STRUCT_UTMPX_UT_HOST
+ strncpy(utx->ut_host, li->hostname, MIN_SIZEOF(utx->ut_host, li->hostname));
+ # endif
+@@ -608,16 +609,15 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx)
+ if (li->hostaddr.sa.sa_family == AF_INET)
+ utx->ut_addr = li->hostaddr.sa_in.sin_addr.s_addr;
+ # endif
+-# ifdef HAVE_ADDR_V6_IN_UTMP
++# if defined(HAVE_STRUCT_UTMPX_UT_ADDR_V6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
+ /* this is just a 128-bit IPv6 address */
+ if (li->hostaddr.sa.sa_family == AF_INET6) {
+- sa6 = ((struct sockaddr_in6 *)&li->hostaddr.sa);
+- memcpy(ut->ut_addr_v6, sa6->sin6_addr.s6_addr, 16);
+- if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr)) {
+- ut->ut_addr_v6[0] = ut->ut_addr_v6[3];
+- ut->ut_addr_v6[1] = 0;
+- ut->ut_addr_v6[2] = 0;
+- ut->ut_addr_v6[3] = 0;
++ memcpy(utx->ut_addr_v6, li->hostaddr.sa_in6.sin6_addr.s6_addr, 16);
++ if (IN6_IS_ADDR_V4MAPPED(&li->hostaddr.sa_in6.sin6_addr)) {
++ utx->ut_addr_v6[0] = utx->ut_addr_v6[3];
++ utx->ut_addr_v6[1] = 0;
++ utx->ut_addr_v6[2] = 0;
++ utx->ut_addr_v6[3] = 0;
+ }
+ }
+ # endif
+@@ -1047,30 +1047,12 @@ wtmp_get_entry(struct logininfo *li)
+ **/
+
+ #ifdef USE_WTMPX
+-/* write a wtmpx entry direct to the end of the file */
+-/* This is a slight modification of code in OpenBSD's logwtmp.c */
++/* write a wtmpx entry via updwtmpx() */
+ static int
+ wtmpx_write(struct logininfo *li, struct utmpx *utx)
+ {
+- struct stat buf;
+- int fd, ret = 1;
+-
+- if ((fd = open(WTMPX_FILE, O_WRONLY|O_APPEND, 0)) < 0) {
+- dropbear_log(LOG_WARNING, "wtmpx_write: problem opening %s: %s",
+- WTMPX_FILE, strerror(errno));
+- return 0;
+- }
+-
+- if (fstat(fd, &buf) == 0)
+- if (atomicio(vwrite, fd, utx, sizeof(*utx)) != sizeof(*utx)) {
+- ftruncate(fd, buf.st_size);
+- dropbear_log(LOG_WARNING, "wtmpx_write: problem writing %s: %s",
+- WTMPX_FILE, strerror(errno));
+- ret = 0;
+- }
+- (void)close(fd);
+-
+- return ret;
++ updwtmpx(WTMPX_FILE, utx);
++ return 1;
+ }
+
+
+diff --git a/loginrec.h b/loginrec.h
+index b2e3778..f594ad7 100644
+--- a/loginrec.h
++++ b/loginrec.h
+@@ -105,6 +105,9 @@
+ union login_netinfo {
+ struct sockaddr sa;
+ struct sockaddr_in sa_in;
++#ifdef HAVE_STRUCT_SOCKADDR_IN6
++ struct sockaddr_in6 sa_in6;
++#endif
+ #ifdef HAVE_STRUCT_SOCKADDR_STORAGE
+ struct sockaddr_storage sa_storage;
+ #endif
+diff --git a/svr-chansession.c b/svr-chansession.c
+index 656a968..bb4536c 100644
+--- a/svr-chansession.c
++++ b/svr-chansession.c
+@@ -850,6 +850,7 @@ static int ptycommand(struct Channel *channel, struct ChanSess *chansess) {
+ * terminal used for stdout with the dup2 above, otherwise
+ * the wtmp login will not be recorded */
+ li = chansess_login_alloc(chansess);
++ li->pid = getpid();
+ login_login(li);
+ login_free_entry(li);
+
diff --git a/main/dtc/APKBUILD b/main/dtc/APKBUILD
index a5ac44f1fe..b4b441d0af 100644
--- a/main/dtc/APKBUILD
+++ b/main/dtc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dtc
pkgver=1.6.1
-pkgrel=1
+pkgrel=2
pkgdesc="Device Tree Compiler"
url="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/"
arch="all"
diff --git a/main/efibootmgr/APKBUILD b/main/efibootmgr/APKBUILD
index be7ff431c4..2e70de93eb 100644
--- a/main/efibootmgr/APKBUILD
+++ b/main/efibootmgr/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Lucas Ramage <ramage.lucas@protonmail.com>
pkgname=efibootmgr
-pkgver=17
+pkgver=18
pkgrel=0
pkgdesc="Linux user-space application to modify the Intel Extensible Firmware Interface"
url="https://github.com/rhboot/efibootmgr"
@@ -12,8 +12,7 @@ makedepends="efivar-dev linux-headers popt-dev gettext-dev"
install=""
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/rhboot/$pkgname/archive/$pkgver.tar.gz
- musl-gettext.patch
- efivar.patch"
+ musl-gettext.patch"
builddir="$srcdir/efibootmgr-$pkgver"
build() {
@@ -31,6 +30,7 @@ check() {
"$builddir"/src/efibootmgr --help > /dev/null
}
-sha512sums="10c7ad9a79f23dcd4708dc4f42701196af7aa11f5e9a6468ea51f7013d4caeba6c92527ba1304f6e3b2ef3b51b3b69ea1a30f81bb099a8aea49eeb30eb631e1d efibootmgr-17.tar.gz
+sha512sums="
+04e40a705cb82440fd823043b598ef9fd1acc2ceda3e8d043a93e49d43ea9481b7386cad0f46de9862beff19b8a5480d79e7d6522ae584aff6655472f967764d efibootmgr-18.tar.gz
3ed49c6d267e6f14bf43207fecb55ebc984f6fbd15d77cd1b8f466c8d0a4c3ab9bb276e8ed183b5ab0129fde5c06ffcd0450ffb7dad0edfa18b4c472e481373b musl-gettext.patch
-a8f4b37e9c0c55a3b2d20f733606653add0219066b9a46b0878885023480747936ad015a52363ceece481ae4d8b702aaa710d9fde2334aae48f97f650416e129 efivar.patch"
+"
diff --git a/main/efibootmgr/efivar.patch b/main/efibootmgr/efivar.patch
deleted file mode 100644
index 614195f3c9..0000000000
--- a/main/efibootmgr/efivar.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/efibootmgr.c b/src/efibootmgr.c
-index de38f01..4e1a680 100644
---- a/src/efibootmgr.c
-+++ b/src/efibootmgr.c
-@@ -1536,9 +1536,6 @@ parse_opts(int argc, char **argv)
- "invalid numeric value %s\n",
- optarg);
- }
-- /* XXX efivar-36 accidentally doesn't have a public
-- * header for this */
-- extern int efi_set_verbose(int verbosity, FILE *errlog);
- efi_set_verbose(opts.verbose - 2, stderr);
- break;
- case 'V':
diff --git a/main/efitools/APKBUILD b/main/efitools/APKBUILD
index d2ff29fcea..88ac914873 100644
--- a/main/efitools/APKBUILD
+++ b/main/efitools/APKBUILD
@@ -3,14 +3,14 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=efitools
pkgver=1.9.2
-pkgrel=4
+pkgrel=5
pkgdesc="EFI tools"
url="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"
# riscv64: fails to build
# others: limited by sbsigntool
arch="all !armhf !s390x !ppc64le !mips !mips64 !riscv64"
license="(GPL-2.0-only AND LGPL-2.1-or-later) WITH OpenSSL-Exception"
-makedepends="gnu-efi-dev openssl1.1-compat-dev perl-file-slurp help2man sbsigntool"
+makedepends="gnu-efi-dev openssl-dev>3 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 6d63c4fd8c..d27fffb0cd 100644
--- a/main/eggdrop/APKBUILD
+++ b/main/eggdrop/APKBUILD
@@ -1,18 +1,16 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=eggdrop
-pkgver=1.8.4
-pkgrel=4
+pkgver=1.9.3
+pkgrel=0
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
-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
+makedepends="openssl-dev>3 tcl-dev"
+subpackages="$pkgname-doc"
+source="https://github.com/eggheads/eggdrop/releases/download/v$pkgver/eggdrop-$pkgver.tar.gz
eggdrop-langdir.patch
- logs2html.mod.patch
- gseen.mod.patch
utf8.patch
"
@@ -30,7 +28,6 @@ build() {
package() {
# workaround for borked Makefile
mkdir -p "$pkgdir"/usr/share/eggdrop/doc \
- "$pkgdir"/usr/share/eggdrop/scripts \
"$pkgdir"/usr/share/eggdrop/help/set/
make DEST="$pkgdir"/usr/share/eggdrop install
@@ -61,54 +58,16 @@ package() {
mkdir -p "$pkgdir"/usr/share/doc/eggdrop
cp -a \
- COPYING FEATURES NEWS README doc/Changes1.8 eggdrop.conf \
+ COPYING FEATURES NEWS README doc/Changes1.9 eggdrop.conf \
doc/ABOUT doc/BANS doc/BOTNET doc/BUG-REPORT doc/FIRST-SCRIPT \
- doc/MODULES doc/PARTYLINE doc/TEXT-SUBSTITUTIONS doc/TRICKS \
- doc/USERS doc/WEIRD-MESSAGES doc/tcl-commands.doc doc/settings \
+ doc/MODULES doc/PARTYLINE doc/TRICKS \
+ doc/USERS doc/tcl-commands.doc doc/settings \
doc/html \
"$pkgdir"/usr/share/doc/eggdrop
}
-logs2html() {
- pkgdesc="logs2html module for eggdrop"
- install=""
- cd "$builddir"
-
- for dir in language help; do
- mkdir -p "$subpkgdir"/usr/share/eggdrop/$dir
- mv "$pkgdir"/usr/share/eggdrop/$dir/logs2html.* "$subpkgdir"/usr/share/eggdrop/$dir/
- done
-
- mkdir -p "$subpkgdir"/usr/lib/eggdrop
- mv "$pkgdir"/usr/lib/eggdrop/logs2html.so \
- "$subpkgdir"/usr/lib/eggdrop/
-
- mkdir -p "$subpkgdir"/usr/share/eggdrop/log2html
-
- for files in logs2html.conf user.css readme.txt; do
- cp src/mod/logs2html.mod/$files "$subpkgdir"/usr/share/eggdrop/log2html/
- done
-}
-
-gseen() {
- pkgdesc="gseen module for eggdrop"
- install=""
- cd "$builddir"
- mkdir -p "$subpkgdir"/usr/share/eggdrop/language
- mv "$pkgdir"/usr/share/eggdrop/language/gseen.* \
- "$subpkgdir"/usr/share/eggdrop/language/
- mkdir -p "$subpkgdir"/usr/lib/eggdrop
- mv "$pkgdir"/usr/lib/eggdrop/gseen.so \
- "$subpkgdir"/usr/lib/eggdrop/
- mkdir -p "$subpkgdir"/usr/share/eggdrop/gseen
- cp src/mod/gseen.mod/gseen.conf "$subpkgdir"/usr/share/eggdrop/gseen/
- cp src/mod/gseen.mod/README "$subpkgdir"/usr/share/eggdrop/gseen/
-}
-
sha512sums="
-80239a015f518cadc251bfc5edcf08715b9200a70eb0df7edf0efc113f320a7e407ab1fee96322fc6ec923781aa94f5a947c458e935e8a3714fb86cbcc02cb04 eggdrop-1.8.4.tar.gz
+67d6d0f798222e54e09acb319aa4926181c34b6e4cdc2cbb4fc7a8433915a7d6281904fd190fe2ee92bcc2cb99943e3fb5b9d99831cc0bfd930205e63e33d1a1 eggdrop-1.9.3.tar.gz
d8e8655fed028030bc3cfe28207a289d0efbc412c7e01170a4d0bb31200f7ea93df310f19e83b485013ca5d4264694b4956252663cb3a63c3d5e4cc31346e0fe eggdrop-langdir.patch
-be173d94a953c4dc5b178950d06ce894deda60c3ddb8195c836797d45fbbcc9fba3bc3d3f34c96226464fdd327093a5d15bbc2b7924d18f845738c1a4dd64a3b logs2html.mod.patch
-7879b998880deb1943c41569e243f9f1a50df23982d82d942af6c111e7fac0fb8a8444c84980645ba15b71dd69c8db2dab6f90bcb7a4292306011c7bcfc03d0d gseen.mod.patch
7966d4d42994e44a0e571b89f1c66cb41f672d75e6ced7051d1ece23d8c209059c3565b41de950bf9c907701ce7a5e33a215b637587075ed300a002a58eda503 utf8.patch
"
diff --git a/main/eggdrop/eggdrop.post-install b/main/eggdrop/eggdrop.post-install
deleted file mode 100644
index 44b43cf34e..0000000000
--- a/main/eggdrop/eggdrop.post-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-echo "*"
-echo "* Please run /usr/bin/eggdrop-installer to install your eggdrop bot."
-echo "*"
-exit 0
-
diff --git a/main/eggdrop/gseen.mod.patch b/main/eggdrop/gseen.mod.patch
deleted file mode 100644
index dd49248c65..0000000000
--- a/main/eggdrop/gseen.mod.patch
+++ /dev/null
@@ -1,5133 +0,0 @@
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/addons/gseen.selectlang.1.0.0.tcl src/eggdrop-1.8.4/src/mod/gseen.mod/addons/gseen.selectlang.1.0.0.tcl
---- ./src/mod/gseen.mod/addons/gseen.selectlang.1.0.0.tcl 1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/addons/gseen.selectlang.1.0.0.tcl 2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,80 @@
-+#####################################################################
-+#
-+# gseen.selectlang v1.0.0
-+#
-+# This is a simple script which selects a language based on the
-+# user's host.
-+#
-+# It only works for /msg commands.
-+#
-+# If the user is in a channel which has a language defined, gseen's
-+# internal functions will override this selection and use the language
-+# of the channel instead.
-+#
-+#####################################################################
-+
-+
-+# Here you can define which language to use for which host.
-+# The first part is the mask for the host, and the second part
-+# is the language which should be used for this host.
-+
-+set tld-langs {
-+ {"*.de" "de"}
-+ {"*.at" "de"}
-+ {"*.ch" "de"}
-+ {"*.t-dialin.net" "de"}
-+ {"*.t-ipconnect.net" "de"}
-+ {"*.pl" "pl"}
-+ {"*.jp" "ja"}
-+}
-+
-+#################################################
-+
-+
-+proc selectlang:getlang {uhost} {
-+ global tld-langs
-+
-+ foreach tld ${tld-langs} {
-+ if {[string match [lindex $tld 0] $uhost]} {
-+ return [lindex $tld 1]
-+ }
-+ }
-+ return ""
-+}
-+
-+proc sl:rebind {oldtarget newtarget} {
-+ foreach binding [binds msg] {
-+ if {[lindex $binding 4] == $oldtarget} {
-+ unbind [lindex $binding 0] [lindex $binding 1] [lindex $binding 2] [lindex $binding 4]
-+ bind [lindex $binding 0] [lindex $binding 1] [lindex $binding 2] $newtarget
-+ }
-+ }
-+}
-+
-+proc sl:msg:trigger {nick uhost hand rest target} {
-+ global default-slang
-+
-+ set lang [selectlang:getlang $uhost]
-+ set old-slang ${default-slang}
-+ if {$lang != ""} {
-+ set default-slang $lang
-+ putlog "using '$lang'..."
-+ }
-+ $target $nick $uhost $hand $rest
-+ set default-slang ${old-slang}
-+}
-+
-+sl:rebind *msg:seen sl:msg:seen
-+proc sl:msg:seen {nick uhost hand rest} {
-+ sl:msg:trigger $nick $uhost $hand $rest *msg:seen
-+}
-+
-+sl:rebind *msg:seenstats sl:msg:seenstats
-+proc sl:msg:seenstats {nick uhost hand rest} {
-+ sl:msg:trigger $nick $uhost $hand $rest *msg:seenstats
-+}
-+
-+sl:rebind *msg:seennick sl:msg:seennick
-+proc sl:msg:seennick {nick uhost hand rest} {
-+ sl:msg:trigger $nick $uhost $hand $rest *msg:seennick
-+}
-\ No newline at end of file
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/ai.c src/eggdrop-1.8.4/src/mod/gseen.mod/ai.c
---- ./src/mod/gseen.mod/ai.c 1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/ai.c 2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,151 @@
-+/*
-+ * Copyright (C) 2000,2001 Florian Sander
-+ *
-+ * 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 2
-+ * 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, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ */
-+
-+static int quietaiseens(char *chan)
-+{
-+ char buf[121], *b;
-+
-+ Context;
-+ strncpy(buf, quiet_ai_seen, 120);
-+ buf[120] = 0;
-+ b = buf;
-+ while (b[0])
-+ if (!strcasecmp(chan, newsplit(&b)))
-+ return 1;
-+#if EGG_IS_MIN_VER(10503)
-+ if (ngetudef("quietaiseens", chan))
-+ return 1;
-+#endif
-+ return 0;
-+}
-+
-+static int tcl_pubmseen STDVAR
-+{
-+ char *nick, *uhost, *hand, *chan, *text;
-+ char buf[1024];
-+ char *words, *word;
-+ seendat *l;
-+ int i;
-+
-+ Context;
-+ BADARGS(6, 6, " nick uhost hand chan text");
-+ nick = argv[1];
-+ uhost = argv[2];
-+ hand = argv[3];
-+ chan = argv[4];
-+ text = argv[5];
-+ reset_global_vars();
-+ glob_slang = slang_find(coreslangs, slang_chanlang_get(chanlangs, chan));
-+ glob_nick = nick;
-+ for (i = 0; i < strlen(text); i++)
-+ if (strchr("!?.,\"", text[i]))
-+ text[i] = ' ';
-+ strncpy(buf, ignore_words, 1023);
-+ buf[1023] = 0;
-+ words = buf;
-+ while (words[0])
-+ add_ignoredword(newsplit(&words));
-+ strncpy(buf, text, 1023);
-+ buf[1023] = 0;
-+ words = buf;
-+ while (words[0]) {
-+ word = newsplit(&words);
-+ if (word_is_ignored(word))
-+ continue;
-+ l = findseen(word);
-+ if (l) {
-+ if (quietaiseens(chan)) {
-+ set_prefix(SLNOTPREFIX);
-+ dprintf(DP_HELP, "NOTICE %s :%s%s\n", nick, reply_prefix,
-+ do_seen(word, nick, uhost, chan, 0));
-+ } else {
-+ set_prefix(SLPUBPREFIX);
-+ dprintf(DP_HELP, "PRIVMSG %s :%s%s\n", chan, reply_prefix,
-+ do_seen(word, nick, uhost, chan, 0));
-+ }
-+ add_seenreq(word, nick, uhost, chan, now);
-+ free_ignoredwords();
-+ Tcl_AppendResult(irp, "1", NULL);
-+ return TCL_OK;
-+ }
-+ }
-+ free_ignoredwords();
-+ Tcl_AppendResult(irp, "0", NULL);
-+ return TCL_OK;
-+}
-+
-+static tcl_cmds mytcls[] =
-+{
-+ {"*pubm:seen", tcl_pubmseen},
-+ {"*chjn:gseen", gseen_chjn},
-+ {"*chpt:gseen", gseen_chpt},
-+ {0, 0}
-+};
-+
-+static void add_ignoredword(char *word)
-+{
-+ ignoredword *l, *nl;
-+
-+ l = ignoredwords;
-+ while (l && l->next)
-+ l = l->next;
-+ nl = nmalloc(sizeof(ignoredword));
-+ nl->word = nmalloc(strlen(word) + 1);
-+ strcpy(nl->word, word);
-+ nl->next = NULL;
-+ if (ignoredwords)
-+ l->next = nl;
-+ else
-+ ignoredwords = nl;
-+}
-+
-+static void free_ignoredwords()
-+{
-+ ignoredword *l, *ll;
-+
-+ l = ignoredwords;
-+ while (l) {
-+ ll = l->next;
-+ nfree(l->word);
-+ nfree(l);
-+ l = ll;
-+ }
-+ ignoredwords = NULL;
-+}
-+
-+static int expmem_ignoredwords()
-+{
-+ ignoredword *l;
-+ int size = 0;
-+
-+ for (l = ignoredwords; l; l = l->next) {
-+ size += sizeof(ignoredword);
-+ size += strlen(l->word) + 1;
-+ }
-+ return size;
-+}
-+
-+static int word_is_ignored(char *word)
-+{
-+ ignoredword *l;
-+
-+ for (l = ignoredwords; l; l = l->next)
-+ if (!strcasecmp(l->word, word))
-+ return 1;
-+ return 0;
-+}
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/datahandling.c src/eggdrop-1.8.4/src/mod/gseen.mod/datahandling.c
---- ./src/mod/gseen.mod/datahandling.c 1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/datahandling.c 2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,151 @@
-+/*
-+ * Copyright (C) 2000,2001 Florian Sander
-+ *
-+ * 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 2
-+ * 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, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ */
-+
-+
-+static void write_seens()
-+{
-+ seenreq *r;
-+ seenreq_by *b;
-+ FILE *f;
-+ char s[125];
-+
-+ Context;
-+ /* putlog(LOG_MISC, "*", "Saving seen data..."); */
-+ if (!gseenfile[0])
-+ return;
-+ sprintf(s, "%s~new", gseenfile);
-+ f = fopen(s, "w");
-+ chmod(s, 0600);
-+ if (f == NULL) {
-+ putlog(LOG_MISC, "*", "ERROR writing gseen file.");
-+ return;
-+ }
-+ fprintf(f, "# gseen data file v1.\n");
-+ write_seen_tree_target = f;
-+ btree_getall(&seentree, write_seen_tree);
-+ for (r = requests; r; r = r->next)
-+ for (b = r->by; b; b = b->next)
-+ /* @ nick by host chan when */
-+ fprintf(f, "@ %s %s %s %s %lu\n", r->nick, b->who, b->host, b->chan,
-+ b->when);
-+ fclose(f);
-+ unlink(gseenfile);
-+ movefile(s, gseenfile);
-+ /* putlog(LOG_MISC, "*", "Done."); */
-+ return;
-+}
-+
-+static void read_seens()
-+{
-+ FILE *f;
-+ char buf[512], *s, *type, *nick, *host, *chan, *msg, *by;
-+ time_t when;
-+ int spent, iType, i;
-+
-+ Context;
-+ f = fopen(gseenfile, "r");
-+ if (f == NULL) {
-+ putlog(LOG_MISC, "*", "Can't open gseen file, creating new database...");
-+ return;
-+ }
-+ while (!feof(f)) {
-+ buf[0] = 0;
-+ s = buf;
-+ fgets(s, 511, f);
-+ i = strlen(buf);
-+ if (buf[i - 1] == '\n')
-+ buf[i - 1] = 0;
-+ if ((buf[0] == 0) || (buf[0] == '#'))
-+ continue;
-+ type = newsplit(&s);
-+ if (!strcmp(type, "!")) {
-+ nick = newsplit(&s);
-+ host = newsplit(&s);
-+ chan = newsplit(&s);
-+ iType = atoi(newsplit(&s));
-+ when = (time_t) atoi(newsplit(&s));
-+ spent = atoi(newsplit(&s));
-+ msg = s;
-+ add_seen(iType, nick, host, chan, msg, when, spent);
-+ } else if (!strcmp(type, "@")) {
-+ nick = newsplit(&s);
-+ by = newsplit(&s);
-+ host = newsplit(&s);
-+ chan