aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-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/APKBUILD22
-rw-r--r--main/abuild/mr127-doas.patch42
-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/mr134-modcacherw.patch23
-rw-r--r--main/abuild/mr60-newapkbuild-use-abuild-meson.patch34
-rw-r--r--main/acf-core/APKBUILD2
-rw-r--r--main/acf-weblog/APKBUILD6
-rw-r--r--main/ack/APKBUILD8
-rw-r--r--main/aconf/APKBUILD2
-rw-r--r--main/acpi/APKBUILD2
-rw-r--r--main/acpica/APKBUILD4
-rw-r--r--main/alpine-base/APKBUILD38
-rw-r--r--main/alpine-baselayout/APKBUILD18
-rw-r--r--main/alpine-baselayout/profile1
-rw-r--r--main/alpine-conf/APKBUILD4
-rw-r--r--main/alpine-ipxe/APKBUILD1
-rw-r--r--main/alpine-make-rootfs/APKBUILD4
-rw-r--r--main/alsa-lib/APKBUILD4
-rw-r--r--main/alsa-ucm-conf/APKBUILD7
-rw-r--r--main/alsa-utils/APKBUILD6
-rw-r--r--main/altermime/APKBUILD2
-rw-r--r--main/amavisd-milter/APKBUILD2
-rw-r--r--main/aom/APKBUILD11
-rw-r--r--main/apache2-mod-wsgi/APKBUILD6
-rw-r--r--main/apcupsd/APKBUILD2
-rw-r--r--main/apk-tools/APKBUILD10
-rw-r--r--main/apk-tools/increase-index-meta-buffer.patch13
-rw-r--r--main/aports-build/APKBUILD8
-rw-r--r--main/aports-build/report-build-errors.lua20
-rw-r--r--main/apparmor/0001-Fix-linking-against-gettext-on-musl-libc.patch40
-rw-r--r--main/apparmor/0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch28
-rw-r--r--main/apparmor/APKBUILD206
-rw-r--r--main/apparmor/apparmor.initd91
-rw-r--r--main/apparmor/fix-dnsmasq-profile.patch12
-rw-r--r--main/arm-trusted-firmware/APKBUILD73
-rw-r--r--main/arm-trusted-firmware/key_t.patch13
-rw-r--r--main/arm-trusted-firmware/rk3399.patch53
-rw-r--r--main/asciidoc/APKBUILD2
-rw-r--r--main/asciidoctor/APKBUILD8
-rw-r--r--main/aspell/APKBUILD2
-rw-r--r--main/asterisk/APKBUILD6
-rw-r--r--main/at-spi2-core/APKBUILD7
-rw-r--r--main/atf/APKBUILD6
-rw-r--r--main/audit/APKBUILD4
-rw-r--r--main/autoconf-archive/APKBUILD4
-rw-r--r--main/autoconf/APKBUILD19
-rw-r--r--main/avahi-ui/APKBUILD10
-rw-r--r--main/avahi-ui/gnome-nettool.pngbin4509 -> 4142 bytes
-rw-r--r--main/awall/APKBUILD6
-rwxr-xr-xmain/awall/setup-firewall4
-rw-r--r--main/awstats/APKBUILD4
-rw-r--r--main/b43-fwcutter/APKBUILD2
-rw-r--r--main/bacula/APKBUILD8
-rw-r--r--main/bash/APKBUILD35
-rw-r--r--main/bash/bashrc5
-rw-r--r--main/batctl/APKBUILD4
-rw-r--r--main/bats/APKBUILD5
-rw-r--r--main/bcache-tools/APKBUILD8
-rw-r--r--main/bctoolbox/APKBUILD20
-rw-r--r--main/bdftopcf/APKBUILD12
-rw-r--r--main/bind/APKBUILD11
-rw-r--r--main/binutils/APKBUILD8
-rw-r--r--main/binutils/CVE-2022-38533.patch22
-rw-r--r--main/bluez-firmware/APKBUILD2
-rw-r--r--main/bluez-headers/APKBUILD35
-rw-r--r--main/bluez/004-Move-the-43xx-firmware-into-lib-firmware.patch23
-rw-r--r--main/bluez/APKBUILD37
-rw-r--r--main/bluez/fix-musl.patch12
-rw-r--r--main/bluez/max-input.patch13
-rw-r--r--main/bluez/musl.patch13
-rw-r--r--main/bmd-tools/APKBUILD2
-rw-r--r--main/boost1.79/0001-revert-cease-dependence-on-range.patch49
-rw-r--r--main/boost1.79/APKBUILD194
-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/APKBUILD9
-rw-r--r--main/boost1.80/aligned-alloc.patch28
-rw-r--r--main/boost1.80/boost-1.80-boost-unordered.patch175
-rw-r--r--main/boost1.80/boost-python-311.patch36
-rw-r--r--main/botan/APKBUILD6
-rw-r--r--main/bridge-utils/APKBUILD2
-rw-r--r--main/brotli/APKBUILD46
-rw-r--r--main/btrfs-progs/APKBUILD23
-rw-r--r--main/bubblewrap/APKBUILD4
-rw-r--r--main/busybox-initscripts/APKBUILD62
-rw-r--r--main/busybox-initscripts/busybox-initscripts.post-install49
l---------main/busybox-initscripts/busybox-initscripts.post-upgrade1
-rw-r--r--main/busybox/0001-sed-check-errors-writing-file-with-sed-i.patch66
-rw-r--r--main/busybox/0018-ash-fix-ifs-cleanup-on-error-paths.patch91
-rw-r--r--main/busybox/APKBUILD104
-rw-r--r--main/busybox/acpid.initd (renamed from main/busybox-initscripts/acpid.initd)0
-rw-r--r--main/busybox/busyboxconfig2
-rw-r--r--main/busybox/busyboxconfig-extras2
-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/bwm-ng/APKBUILD2
-rw-r--r--main/byacc/APKBUILD4
-rw-r--r--main/byobu/APKBUILD2
-rw-r--r--main/bzip2/APKBUILD18
-rw-r--r--main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch4
-rw-r--r--main/bzip2/bzip2.pc.in11
-rw-r--r--main/c-ares/APKBUILD39
-rw-r--r--main/cairo/APKBUILD14
-rw-r--r--main/ccache/APKBUILD14
-rw-r--r--main/ccache/gcc12.patch12
-rw-r--r--main/cciss_vol_status/APKBUILD4
-rw-r--r--main/cdparanoia/APKBUILD6
-rw-r--r--main/check/APKBUILD2
-rw-r--r--main/chrony/APKBUILD6
-rw-r--r--main/chrony/fix-tests.patch12
-rw-r--r--main/ciwiki/APKBUILD12
-rw-r--r--main/ciwiki/gcc-10.patch7
-rw-r--r--main/ckbcomp/APKBUILD4
-rw-r--r--main/cksfv/APKBUILD2
-rw-r--r--main/clang/APKBUILD171
-rw-r--r--main/clang/llvm-hello.patch63
-rw-r--r--main/clang14/10-add-musl-triples.patch (renamed from main/clang/10-add-musl-triples.patch)0
-rw-r--r--main/clang14/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch (renamed from main/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch)0
-rw-r--r--main/clang14/APKBUILD235
-rw-r--r--main/clang15/10-add-musl-triples.patch39
-rw-r--r--main/clang15/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch82
-rw-r--r--main/clang15/APKBUILD244
-rw-r--r--main/cloog/APKBUILD38
-rw-r--r--main/clucene/APKBUILD4
-rw-r--r--main/clucene/clucene-pthread.patch12
-rw-r--r--main/cmake/APKBUILD13
-rw-r--r--main/cmocka/APKBUILD23
-rw-r--r--main/cmph/APKBUILD4
-rw-r--r--main/compiler-rt/APKBUILD88
-rw-r--r--main/compiler-rt/xray-ppc64-musl.patch63
-rw-r--r--main/conky/APKBUILD39
-rw-r--r--main/conntrack-tools/APKBUILD6
-rw-r--r--main/cracklib/APKBUILD12
-rw-r--r--main/cracklib/fix-trigger-warning.patch39
-rw-r--r--main/cramfs/APKBUILD8
-rw-r--r--main/crconf/APKBUILD2
-rw-r--r--main/cryptsetup/APKBUILD4
-rw-r--r--main/cryptsetup/dmcrypt.initd4
-rw-r--r--main/ctags/APKBUILD56
-rw-r--r--main/ctags/disable-check-genfile.patch19
-rw-r--r--main/cunit/APKBUILD4
-rw-r--r--main/cups/APKBUILD2
-rw-r--r--main/curl/APKBUILD22
-rw-r--r--main/curl/easy_lock.patch53
-rw-r--r--main/cutter/APKBUILD10
-rw-r--r--main/cutter/musl-fix.patch36
-rw-r--r--main/cvechecker/APKBUILD2
-rw-r--r--main/cvs/APKBUILD2
-rw-r--r--main/cyrus-sasl/APKBUILD3
-rw-r--r--main/cython/APKBUILD2
-rw-r--r--main/d-feet/APKBUILD4
-rw-r--r--main/dahdi-linux-lts/APKBUILD28
-rw-r--r--main/dahdi-linux-lts/kernel-5.6.patch499
-rw-r--r--main/dahdi-linux-lts/kernel-5.9.patch249
-rw-r--r--main/dahdi-linux-lts/kernel-compat-5.4.patch11
-rw-r--r--main/dahdi-linux/APKBUILD6
-rw-r--r--main/dahdi-tools/APKBUILD12
-rw-r--r--main/daq/APKBUILD2
-rw-r--r--main/darkhttpd/APKBUILD12
-rw-r--r--main/dash/APKBUILD45
-rw-r--r--main/dash/dash.post-install3
l---------main/dash/dash.post-upgrade1
-rw-r--r--main/dash/dash.pre-deinstall3
-rw-r--r--main/datefudge/APKBUILD2
-rw-r--r--main/dav1d/APKBUILD8
-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/APKBUILD56
-rw-r--r--main/dconf/APKBUILD22
-rw-r--r--main/debootstrap/APKBUILD4
-rw-r--r--main/dev86/APKBUILD2
-rw-r--r--main/devicemaster-linux/APKBUILD2
-rw-r--r--main/dhcp/01-dhclient-script-fix-bare-ip.patch13
-rw-r--r--main/dhcp/02-dhclient-script-remove-bashisms.patch28
-rw-r--r--main/dhcp/APKBUILD141
-rw-r--r--main/dhcp/dhcp.pre-install2
-rw-r--r--main/dhcp/dhcrelay.pre-install2
-rw-r--r--main/dhcp/fix-unwind-import.patch (renamed from main/dhcp/03-fix-unwind-import.patch)0
-rw-r--r--main/distcc/APKBUILD2
-rw-r--r--main/djbdns/APKBUILD8
-rwxr-xr-xmain/djbdns/dnscache.monthly2
-rw-r--r--main/dkimproxy/APKBUILD4
-rw-r--r--main/dmvpn/APKBUILD2
-rw-r--r--main/dnsmasq/0000-underflow.patch31
-rw-r--r--main/dnsmasq/0001-Retry-on-interrupted-error-in-tftp.patch27
-rw-r--r--main/dnsmasq/0002-Add-safety-checks-to-places-pointed-by-Coverity.patch45
-rw-r--r--main/dnsmasq/0003-Small-safeguard-to-unexpected-data.patch30
-rw-r--r--main/dnsmasq/0004-Fix-bunch-of-warnings-in-auth.c.patch80
-rw-r--r--main/dnsmasq/0005-Fix-few-coverity-warnings-in-lease-tools.patch92
-rw-r--r--main/dnsmasq/0006-Fix-coverity-formats-issues-in-blockdata.patch23
-rw-r--r--main/dnsmasq/0007-Retry-dhcp6-ping-on-interrupts.patch23
-rw-r--r--main/dnsmasq/0008-Fix-coverity-warnings-on-dbus.patch84
-rw-r--r--main/dnsmasq/0009-Address-coverity-issues-detected-in-util.c.patch58
-rw-r--r--main/dnsmasq/0010-Fix-coverity-detected-issues-in-option.c.patch135
-rw-r--r--main/dnsmasq/0011-Fix-coverity-detected-issue-in-radv.c.patch23
-rw-r--r--main/dnsmasq/0012-Fix-coverity-detected-issues-in-cache.c.patch23
-rw-r--r--main/dnsmasq/0013-Fix-coverity-issues-detected-in-domain-match.c.patch61
-rw-r--r--main/dnsmasq/0014-Fix-coverity-detected-issues-in-dnsmasq.c.patch69
-rw-r--r--main/dnsmasq/0015-Fix-coverity-issues-in-dnssec.c.patch35
-rw-r--r--main/dnsmasq/0020-fix-domain-match-local.patch276
-rw-r--r--main/dnsmasq/0021-build_server_array.patch70
-rw-r--r--main/dnsmasq/0022-Fix-problems-with-upper-case-in-domain-match.patch84
-rw-r--r--main/dnsmasq/0023-Optimize-inserting-records-into-server-list.patch69
-rw-r--r--main/dnsmasq/0024-Fix-massive-confusion-on-server-reload.patch238
-rw-r--r--main/dnsmasq/0025-reuse-server.patch87
-rw-r--r--main/dnsmasq/APKBUILD52
-rw-r--r--main/dnsmasq/CVE-2022-0934.patch189
-rw-r--r--main/dnstop/APKBUILD2
-rw-r--r--main/doas-sudo-shim/APKBUILD2
-rw-r--r--main/docbook-xml/APKBUILD4
-rw-r--r--main/docbook-xsl/APKBUILD3
l---------[-rw-r--r--]main/docbook-xsl/docbook-xsl.post-install30
-rw-r--r--main/docbook-xsl/docbook-xsl.post-upgrade50
-rw-r--r--main/docbook2x/APKBUILD4
-rw-r--r--main/dovecot/APKBUILD8
-rw-r--r--main/dovecot/CVE-2022-30550.patch155
-rw-r--r--main/doxygen/APKBUILD9
-rw-r--r--main/drbd-utils/APKBUILD10
-rw-r--r--main/drbd-utils/drop_use_of_GLOB_MAGCHAR.patch88
-rw-r--r--main/drbd-utils/fix-drbdsetup_events2.c.patch16
-rw-r--r--main/dropbear/APKBUILD8
-rw-r--r--main/dropbear/dropbear.initd4
-rw-r--r--main/dtach/APKBUILD4
-rw-r--r--main/dtc/APKBUILD2
-rw-r--r--main/e2fsprogs/APKBUILD31
-rw-r--r--main/elfutils/APKBUILD8
-rw-r--r--main/ell/APKBUILD4
-rw-r--r--main/encfs/APKBUILD32
-rw-r--r--main/espeak/APKBUILD4
-rw-r--r--main/etckeeper/APKBUILD4
-rw-r--r--main/ethtool/APKBUILD15
-rw-r--r--main/eudev/99-plugdev.rules1
-rw-r--r--main/eudev/APKBUILD33
-rw-r--r--main/eudev/add-hyperv-ptp-rule.patch18
-rw-r--r--main/eudev/eudev-hwids.trigger5
-rw-r--r--main/eudev/eudev.pre-install5
-rw-r--r--main/expat/APKBUILD10
-rw-r--r--main/expect/APKBUILD4
-rw-r--r--main/fail2ban/APKBUILD25
-rw-r--r--main/fail2ban/CVE-2021-32749.patch155
-rw-r--r--main/fail2ban/alpine-sshd.filterd1
-rwxr-xr-xmain/fail2ban/fail2ban.initd60
-rw-r--r--main/fail2ban/python-3.10.patch77
-rw-r--r--main/fail2ban/setuptools59.patch10
-rw-r--r--main/fcgi/APKBUILD2
-rw-r--r--main/fcgiwrap/APKBUILD2
-rw-r--r--main/fftw/APKBUILD29
-rw-r--r--main/file/APKBUILD9
-rw-r--r--main/file/fix-dsf-format.patch77
-rw-r--r--main/findutils/APKBUILD13
-rw-r--r--main/flac/APKBUILD45
-rw-r--r--main/flashrom/APKBUILD10
-rw-r--r--main/font-adobe-100dpi/APKBUILD4
-rw-r--r--main/font-adobe-75dpi/APKBUILD4
-rw-r--r--main/font-adobe-utopia-100dpi/APKBUILD4
-rw-r--r--main/font-adobe-utopia-75dpi/APKBUILD4
-rw-r--r--main/font-adobe-utopia-type1/APKBUILD4
-rw-r--r--main/font-arabic-misc/APKBUILD4
-rw-r--r--main/font-bh-100dpi/APKBUILD4
-rw-r--r--main/font-bh-75dpi/APKBUILD4
-rw-r--r--main/font-bh-lucidatypewriter-100dpi/APKBUILD4
-rw-r--r--main/font-bh-lucidatypewriter-75dpi/APKBUILD4
-rw-r--r--main/font-bh-ttf/APKBUILD10
-rw-r--r--main/font-bh-type1/APKBUILD4
-rw-r--r--main/font-bitstream-100dpi/APKBUILD4
-rw-r--r--main/font-bitstream-75dpi/APKBUILD4
-rw-r--r--main/font-bitstream-speedo/APKBUILD4
-rw-r--r--main/font-bitstream-type1/APKBUILD4
-rw-r--r--main/font-cantarell/APKBUILD (renamed from main/ttf-cantarell/APKBUILD)8
-rw-r--r--main/font-cronyx-cyrillic/APKBUILD4
-rw-r--r--main/font-cursor-misc/APKBUILD4
-rw-r--r--main/font-daewoo-misc/APKBUILD4
-rw-r--r--main/font-dec-misc/APKBUILD4
-rw-r--r--main/font-dejavu/45-dejavu.conf (renamed from main/ttf-dejavu/45-dejavu.conf)0
-rw-r--r--main/font-dejavu/90-tt-dejavu.conf (renamed from main/ttf-dejavu/90-tt-dejavu.conf)0
-rw-r--r--main/font-dejavu/APKBUILD (renamed from main/ttf-dejavu/APKBUILD)36
-rw-r--r--main/font-droid/45-droid.conf (renamed from main/ttf-droid/45-droid.conf)0
-rw-r--r--main/font-droid/65-ttf-droid-sans.conf (renamed from main/ttf-droid/65-ttf-droid-sans.conf)0
-rw-r--r--main/font-droid/65-ttf-droid-serif.conf (renamed from main/ttf-droid/65-ttf-droid-serif.conf)0
-rw-r--r--main/font-droid/90-tt-droid.conf (renamed from main/ttf-droid/90-tt-droid.conf)0
-rw-r--r--main/font-droid/APKBUILD (renamed from main/ttf-droid/APKBUILD)25
-rw-r--r--main/font-freefont/APKBUILD28
-rw-r--r--main/font-ibm-type1/APKBUILD4
-rw-r--r--main/font-isas-misc/APKBUILD4
-rw-r--r--main/font-jis-misc/APKBUILD4
-rw-r--r--main/font-linux-libertine/APKBUILD8
-rw-r--r--main/font-micro-misc/APKBUILD4
-rw-r--r--main/font-misc-cyrillic/APKBUILD4
-rw-r--r--main/font-misc-ethiopic/APKBUILD23
-rw-r--r--main/font-misc-meltho/APKBUILD4
-rw-r--r--main/font-misc-misc/APKBUILD4
-rw-r--r--main/font-schumacher-misc/APKBUILD4
-rw-r--r--main/font-screen-cyrillic/APKBUILD4
-rw-r--r--main/font-sony-misc/APKBUILD4
-rw-r--r--main/font-sun-misc/APKBUILD4
-rw-r--r--main/font-tlwg/APKBUILD27
-rw-r--r--main/font-winitzki-cyrillic/APKBUILD4
-rw-r--r--main/font-xfree86-type1/APKBUILD4
-rw-r--r--main/fontconfig/APKBUILD4
-rw-r--r--main/fprobe/APKBUILD4
-rw-r--r--main/freeradius-client/APKBUILD6
-rw-r--r--main/freeradius/APKBUILD8
-rw-r--r--main/freeswitch-sounds-pt-br-karina-8000/APKBUILD2
-rw-r--r--main/freeswitch/APKBUILD34
-rw-r--r--main/freeswitch/explicit-darwin-macro.patch4
-rw-r--r--main/freeswitch/fix-undeclared-function-s390x.patch21
-rw-r--r--main/freeswitch/openssl3.patch25
-rw-r--r--main/freeswitch/python-3.11.patch19
-rw-r--r--main/freetds/APKBUILD4
-rw-r--r--main/fribidi/APKBUILD2
-rw-r--r--main/fsarchiver/APKBUILD2
-rw-r--r--main/fstrm/APKBUILD2
-rw-r--r--main/fuse/APKBUILD2
-rw-r--r--main/fuse3/APKBUILD14
-rw-r--r--main/gawk/APKBUILD4
-rw-r--r--main/gc/APKBUILD10
-rw-r--r--main/gcc/0030-gcc-go-Fix-handling-of-signal-34-on-musl.patch26
-rw-r--r--main/gcc/0031-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch24
-rw-r--r--main/gcc/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch24
-rw-r--r--main/gcc/0033-gcc-go-link-to-libucontext.patch36
-rw-r--r--main/gcc/0037-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch214
-rw-r--r--main/gcc/0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch57
-rw-r--r--main/gcc/0040-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch55
-rw-r--r--main/gcc/0041-go-gospec-forcibly-disable-fsplit-stack-support.patch89
-rw-r--r--main/gcc/0042-gcc-go-fix-build-error-with-SYS_SECCOMP.patch48
-rw-r--r--main/gcc/0046-c-avoid-memory-poisoning-on-musl-PR106102.patch107
-rw-r--r--main/gcc/0047-jit-avoid-calloc-poisoning-on-musl-PR106102.patch117
-rw-r--r--main/gcc/0049-libgo-adjust-name-of-union-in-sigevent-struct.patch104
-rw-r--r--main/gcc/0051-libgo-Explicitly-define-SYS_timer_settime-for-32-bit.patch46
-rw-r--r--main/gcc/0053-libgo-make-match.sh-POSIX-shell-compatible.patch50
-rw-r--r--main/gcc/0054-libphobos-fix-undefined-reference-to-__cmsg_nxthdr-w.patch65
-rw-r--r--main/gcc/APKBUILD164
-rw-r--r--main/gcc/gcc-go.post-install8
-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/gd/APKBUILD4
-rw-r--r--main/gdb/APKBUILD18
-rw-r--r--main/gdb/fix-arm-segfault.patch155
-rw-r--r--main/gdb/fix-invalid-implicit-conversion.patch13
-rw-r--r--main/gdk-pixbuf/APKBUILD9
-rw-r--r--main/geoip/APKBUILD2
-rw-r--r--main/gettext-tiny/APKBUILD32
-rw-r--r--main/gettext-tiny/line-length.patch15
-rw-r--r--main/gettext-tiny/respect-cflags.patch11
-rw-r--r--main/gettext-tiny/xgettext-version.patch25
-rw-r--r--main/gettext/APKBUILD18
-rw-r--r--main/ghostscript-fonts/APKBUILD4
-rw-r--r--main/ghostscript/APKBUILD4
-rw-r--r--main/giflib/APKBUILD21
-rw-r--r--main/giflib/CVE-2022-28506.patch15
-rw-r--r--main/git/APKBUILD80
-rw-r--r--main/glib/0001-gslice-remove-slice-allocator.patch1695
-rw-r--r--main/glib/APKBUILD38
-rw-r--r--main/glib/gparamspec.patch33
-rw-r--r--main/glib/musl-libintl.patch22
-rw-r--r--main/glslang/APKBUILD4
-rw-r--r--main/glu/APKBUILD9
-rw-r--r--main/gnokii/APKBUILD2
-rw-r--r--main/gnu-efi/APKBUILD6
-rw-r--r--main/gnupg/APKBUILD4
-rw-r--r--main/gnutls/APKBUILD9
-rw-r--r--main/goaccess/APKBUILD4
-rw-r--r--main/gobject-introspection/APKBUILD13
-rw-r--r--main/gpsd/APKBUILD10
-rw-r--r--main/gpsd/timepps.h12
-rw-r--r--main/graphene/APKBUILD5
-rw-r--r--main/graphite2/APKBUILD33
-rw-r--r--main/graphviz/APKBUILD87
-rw-r--r--main/grep/APKBUILD8
-rw-r--r--main/groff/APKBUILD2
-rw-r--r--main/grub/0013-prevent-vgs-warnings.patch37
-rw-r--r--main/grub/APKBUILD4
-rw-r--r--main/gsm/APKBUILD10
-rw-r--r--main/gsm/gsm-makefile.patch34
-rw-r--r--main/gst-plugins-base/APKBUILD31
-rw-r--r--main/gstreamer/APKBUILD8
-rw-r--r--main/gtk+2.0/APKBUILD112
-rw-r--r--main/gtk+2.0/gtk+2.0.post-deinstall7
-rw-r--r--main/gtk+2.0/gtk+2.0.post-install4
l---------main/gtk+2.0/gtk+2.0.post-upgrade1
-rw-r--r--main/gtk+2.0/gtk2-fixdso.patch15
-rw-r--r--main/gtk+2.0/xid-collision-debug.patch15
-rw-r--r--main/gtk+3.0/APKBUILD104
-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/guile/APKBUILD15
-rw-r--r--main/haproxy/APKBUILD6
-rw-r--r--main/harfbuzz/APKBUILD13
-rw-r--r--main/harfbuzz/fix-char-signed.patch29
-rw-r--r--main/haserl/APKBUILD4
-rw-r--r--main/hdparm/APKBUILD4
-rw-r--r--main/heimdal/APKBUILD28
-rw-r--r--main/heimdal/autoconf-270.patch27
-rw-r--r--main/heimdal/silence-include-headers-redirect-warnings.patch20
-rw-r--r--main/highlight/APKBUILD25
-rw-r--r--main/hostapd/0001-hostapd-Add-the-missing-CONFIG_SAE-option-to-the-def.patch30
-rw-r--r--main/hostapd/APKBUILD97
-rw-r--r--main/hostapd/hostapd.confd13
-rw-r--r--main/hostapd/hostapd.initd52
-rw-r--r--main/htop/APKBUILD15
-rw-r--r--main/hunspell/APKBUILD11
-rw-r--r--main/hvtools/APKBUILD2
-rw-r--r--main/hwdata/APKBUILD69
-rw-r--r--main/hwids/APKBUILD70
-rw-r--r--main/hylafax/APKBUILD6
-rw-r--r--main/hylafax/libtiff-42-compatibility.patch2
-rw-r--r--main/hylafaxplus/APKBUILD4
-rw-r--r--main/iaxmodem/APKBUILD29
-rw-r--r--main/icecast/APKBUILD2
-rw-r--r--main/icu/001-fix-heap-buffer-overflow.patch31
-rw-r--r--main/icu/APKBUILD22
-rw-r--r--main/iftop/APKBUILD2
-rw-r--r--main/ifupdown/APKBUILD8
-rw-r--r--main/igmpproxy/APKBUILD2
-rw-r--r--main/imake/APKBUILD10
-rw-r--r--main/imlib2/APKBUILD19
-rw-r--r--main/in-sync/APKBUILD2
-rw-r--r--main/indent/APKBUILD2
-rw-r--r--main/inotify-tools/APKBUILD16
-rw-r--r--main/inotify-tools/fsid-t.patch18
-rw-r--r--main/installkernel/APKBUILD2
-rw-r--r--main/iperf3/APKBUILD12
-rw-r--r--main/iperf3/build-fixes.patch20
-rw-r--r--main/iproute2-qos/APKBUILD8
-rw-r--r--main/iproute2-qos/qos.initd2
-rw-r--r--main/iproute2/APKBUILD12
-rw-r--r--main/iproute2/min.patch13
-rw-r--r--main/ipset/APKBUILD2
-rw-r--r--main/irqbalance/APKBUILD6
-rw-r--r--main/irqbalance/aarch64-sigsegv.patch11
-rw-r--r--main/irssi/APKBUILD6
-rw-r--r--main/iscsi-scst/APKBUILD4
-rw-r--r--main/isl/APKBUILD50
-rw-r--r--main/isl24/APKBUILD16
-rw-r--r--main/isl25/APKBUILD (renamed from main/isl22/APKBUILD)28
-rw-r--r--main/iso-codes/APKBUILD4
-rw-r--r--main/iucode-tool/APKBUILD2
-rw-r--r--main/ivykis/APKBUILD6
-rw-r--r--main/jack/APKBUILD33
-rw-r--r--main/jack/increase-api-version.patch4
-rw-r--r--main/jbig2dec/APKBUILD2
-rw-r--r--main/jfsutils/APKBUILD6
-rw-r--r--main/joe/APKBUILD4
-rw-r--r--main/jq/APKBUILD8
-rw-r--r--main/kamailio/APKBUILD8
-rw-r--r--main/kamailio/python3.11.patch78
-rw-r--r--main/kbd/APKBUILD3
-rw-r--r--main/kea/APKBUILD279
-rw-r--r--main/kea/configs-fix-paths.patch116
-rw-r--r--main/kea/disable-db-tests.patch18
-rw-r--r--main/kea/kea-admin-remove-builddir.patch24
-rw-r--r--main/kea/kea-common.post-upgrade14
-rw-r--r--main/kea/kea-common.pre-install6
-rw-r--r--main/kea/kea.initd.in40
-rw-r--r--main/kea/move-api-files-to-doc.patch18
-rw-r--r--main/kea/put-LOCKFILE_DIR-to-runstatedir.patch13
-rw-r--r--main/kea/use-runstatedir-for-pid-file-location.patch29
-rw-r--r--main/knot/APKBUILD9
-rw-r--r--main/krb5/APKBUILD8
-rw-r--r--main/lame/APKBUILD4
-rw-r--r--main/lcms2/APKBUILD4
-rw-r--r--main/ldb/APKBUILD26
-rw-r--r--main/ldb/strtoull.patch89
-rw-r--r--main/less/APKBUILD4
-rw-r--r--main/leveldb/APKBUILD38
-rw-r--r--main/libaio/APKBUILD15
-rw-r--r--main/libaio/libaio-optional-werror.patch31
-rw-r--r--main/libassuan/APKBUILD2
-rw-r--r--main/libatomic_ops/APKBUILD14
-rw-r--r--main/libavif/APKBUILD7
-rw-r--r--main/libax25/APKBUILD42
-rw-r--r--main/libax25/musl.patch10
-rw-r--r--main/libbpf/10-consolidate-lib-dirs.patch19
-rw-r--r--main/libbpf/APKBUILD37
-rw-r--r--main/libbsd/APKBUILD10
-rw-r--r--main/libbsd/disable-fpurge-test.patch22
-rw-r--r--main/libburn/APKBUILD2
-rw-r--r--main/libcap/APKBUILD6
-rw-r--r--main/libdbi/APKBUILD4
-rw-r--r--main/libde265/APKBUILD16
-rw-r--r--main/libdnet/APKBUILD18
-rw-r--r--main/libdrm/APKBUILD20
-rw-r--r--main/libdwarf/APKBUILD81
-rw-r--r--main/libeconf/APKBUILD9
-rw-r--r--main/libedit/APKBUILD6
-rw-r--r--main/libepoxy/APKBUILD2
-rw-r--r--main/libffi/APKBUILD11
-rw-r--r--main/libffi/pax-dlmmap.patch120
-rw-r--r--main/libfido2/APKBUILD6
-rw-r--r--main/libfontenc/APKBUILD10
-rw-r--r--main/libgpg-error/APKBUILD7
-rw-r--r--main/libical/APKBUILD4
-rw-r--r--main/libidn2/APKBUILD4
-rw-r--r--main/libjpeg-turbo/APKBUILD2
-rw-r--r--main/libkcapi/APKBUILD86
-rw-r--r--main/libkcapi/no-werror.patch13
-rw-r--r--main/libks/APKBUILD19
-rw-r--r--main/libksba/APKBUILD9
-rw-r--r--main/liblockfile/APKBUILD2
-rw-r--r--main/liblogging/APKBUILD2
-rw-r--r--main/libmaxminddb/APKBUILD6
-rw-r--r--main/libmilter/APKBUILD12
-rw-r--r--main/libnet/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/libogg/APKBUILD2
-rw-r--r--main/libotr/APKBUILD11
-rw-r--r--main/libotr/socklen-t.patch12
-rw-r--r--main/libpaper/APKBUILD36
-rw-r--r--main/libpcap/APKBUILD2
-rw-r--r--main/libpciaccess/APKBUILD28
-rw-r--r--main/libpciaccess/limits_h.patch10
-rw-r--r--main/libpng/APKBUILD12
-rw-r--r--main/libpng/dont-run-pngtest.patch12
-rw-r--r--main/libpng/libpng-fix-arm-neon.patch8
-rw-r--r--main/libseccomp/APKBUILD2
-rw-r--r--main/libsecret/APKBUILD2
-rw-r--r--main/libshout/APKBUILD2
-rw-r--r--main/libsndfile/APKBUILD3
-rw-r--r--main/libsrtp/APKBUILD2
-rw-r--r--main/libtasn1/APKBUILD24
-rw-r--r--main/libtasn1/failed-test.patch13
-rw-r--r--main/libtheora/APKBUILD2
-rw-r--r--main/libtirpc/APKBUILD23
-rw-r--r--main/libtirpc/CVE-2021-46828.patch181
-rw-r--r--main/libtirpc/soname-suffix.patch12
-rw-r--r--main/libunistring/APKBUILD4
-rw-r--r--main/liburing/APKBUILD4
-rw-r--r--main/libva/APKBUILD5
-rw-r--r--main/libvdpau/APKBUILD2
-rw-r--r--main/libwebp/APKBUILD2
-rw-r--r--main/libx11/APKBUILD9
-rw-r--r--main/libxau/APKBUILD10
-rw-r--r--main/libxdmcp/APKBUILD10
-rw-r--r--main/libxext/APKBUILD10
-rw-r--r--main/libxft/APKBUILD8
-rw-r--r--main/libxft/emoji.patch861
-rw-r--r--main/libxinerama/APKBUILD10
-rw-r--r--main/libxkbcommon/APKBUILD2
-rw-r--r--main/libxkbfile/APKBUILD12
-rw-r--r--main/libxml2/APKBUILD26
-rw-r--r--main/libxmu/APKBUILD26
-rw-r--r--main/libxpm/APKBUILD10
-rw-r--r--main/libxrandr/APKBUILD11
-rw-r--r--main/libxrender/APKBUILD15
-rw-r--r--main/libxshmfence/APKBUILD10
-rw-r--r--main/libxslt/APKBUILD4
-rw-r--r--main/libxtst/APKBUILD15
-rw-r--r--main/libxxf86vm/APKBUILD19
-rw-r--r--main/lighttpd/APKBUILD6
-rw-r--r--main/links/APKBUILD6
-rw-r--r--main/linux-firmware/APKBUILD58
-rw-r--r--main/linux-firmware/WHENCE-Correct-dangling-symlinks.patch37
-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/APKBUILD86
-rw-r--r--main/linux-lts/awk.patch13
-rw-r--r--main/linux-lts/lts.aarch64.config8
-rw-r--r--main/linux-lts/lts.armv7.config6
-rw-r--r--main/linux-lts/lts.ppc64le.config6
-rw-r--r--main/linux-lts/lts.s390x.config5
-rw-r--r--main/linux-lts/lts.x86.config9
-rw-r--r--main/linux-lts/lts.x86_64.config10
-rw-r--r--main/linux-lts/virt.aarch64.config5
-rw-r--r--main/linux-lts/virt.armv7.config3
-rw-r--r--main/linux-lts/virt.ppc64le.config4
-rw-r--r--main/linux-lts/virt.x86.config12
-rw-r--r--main/linux-lts/virt.x86_64.config13
-rw-r--r--main/linux-rpi/APKBUILD20
-rw-r--r--main/linux-rpi/config-changes-rpi.armhf1
-rw-r--r--main/lksctp-tools/APKBUILD4
-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/llvm14/APKBUILD27
-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.patch22
-rw-r--r--main/llvm15/APKBUILD315
-rw-r--r--main/llvm15/fix-memory-mf_exec-on-aarch64.patch25
-rw-r--r--main/llvm15/install-prefix.patch31
-rw-r--r--main/llvm15/llvm-stack-size.patch34
-rw-r--r--main/lm-sensors/APKBUILD36
-rw-r--r--main/lm-sensors/lm-sensors.post-upgrade12
-rw-r--r--main/lmdb/APKBUILD2
-rw-r--r--main/lockfile-progs/APKBUILD2
-rw-r--r--main/log4cplus/APKBUILD50
-rw-r--r--main/logrotate/APKBUILD6
-rw-r--r--main/logtail/APKBUILD4
-rw-r--r--main/lsof/APKBUILD4
-rw-r--r--main/lsyncd/APKBUILD4
-rw-r--r--main/lttng-ust/APKBUILD2
-rw-r--r--main/lua-aports/APKBUILD6
-rw-r--r--main/lua-discount/APKBUILD10
-rw-r--r--main/lua-expat/APKBUILD12
-rw-r--r--main/lua-filesystem/APKBUILD10
-rw-r--r--main/lua-lyaml/APKBUILD8
-rw-r--r--main/lua-lzmq/APKBUILD21
-rw-r--r--main/lua-mqtt-publish/APKBUILD11
-rw-r--r--main/lua-ossl/APKBUILD11
-rw-r--r--main/lua-ossl/openssl3.patch933
-rw-r--r--main/lua-penlight/APKBUILD4
-rw-r--r--main/lua-resty-core/APKBUILD4
-rw-r--r--main/lua-resty-lrucache/APKBUILD10
-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/lua-sql/APKBUILD10
-rw-r--r--main/lua-yaml/APKBUILD24
-rw-r--r--main/luajit/APKBUILD7
-rw-r--r--main/lvm2/0001-lvresize-use-POSIX-shell.patch127
-rw-r--r--main/lvm2/APKBUILD86
-rw-r--r--main/lvm2/fix-stdio-usage.patch67
-rw-r--r--main/lvm2/includes.patch13
-rw-r--r--main/lvm2/library_dir-default-config.patch2
-rw-r--r--main/lvm2/mallinfo.patch11
-rw-r--r--main/lvm2/mlockall-default-config.patch22
-rw-r--r--main/lxc/APKBUILD104
-rw-r--r--main/lxc/sysconfdir.patch17
-rw-r--r--main/lz4/APKBUILD4
-rw-r--r--main/mailx/APKBUILD2
-rw-r--r--main/make/APKBUILD6
-rw-r--r--main/makedepend/APKBUILD10
-rw-r--r--main/man-pages/APKBUILD8
-rw-r--r--main/mandoc/APKBUILD2
-rw-r--r--main/mandoc/mandoc-apropos.trigger2
-rw-r--r--main/mariadb-connector-c/APKBUILD15
-rw-r--r--main/mariadb/APKBUILD21
-rw-r--r--main/mbedtls/APKBUILD4
-rw-r--r--main/mdev-conf/APKBUILD6
-rw-r--r--main/mdevd/APKBUILD8
-rw-r--r--main/memcached/APKBUILD4
-rw-r--r--main/mesa/0001-Revert-panfrost-Require-64-byte-alignment-on-imports.patch166
-rw-r--r--main/mesa/0001-freedreno-Enable-A619.patch37
-rw-r--r--main/mesa/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch38
-rw-r--r--main/mesa/APKBUILD37
-rw-r--r--main/mesa/disable-rgb10-by-default.patch25
-rw-r--r--main/meson/APKBUILD6
-rwxr-xr-xmain/meson/abuild-meson7
-rw-r--r--main/mg/APKBUILD4
-rw-r--r--main/minicom/APKBUILD2
-rw-r--r--main/mkinitfs/APKBUILD9
-rw-r--r--main/mksh/APKBUILD6
-rw-r--r--main/mosh/APKBUILD17
-rw-r--r--main/mosh/fix-makefile.am.patch10
-rw-r--r--main/mosh/fix-ppc64le-build-with-musl.patch4
-rw-r--r--main/mosquitto/APKBUILD4
-rw-r--r--main/mpc1/APKBUILD8
-rw-r--r--main/mpg123/APKBUILD6
-rw-r--r--main/mqtt-exec/0001-Let-library-generate-client-id-when-unset.patch68
-rw-r--r--main/mqtt-exec/0001-authentication-expose-authentication-with-credential.patch89
-rw-r--r--main/mqtt-exec/APKBUILD12
-rw-r--r--main/mqtt-exec/restore-default-sigpipe-handler.patch17
-rw-r--r--main/mt-st/APKBUILD2
-rw-r--r--main/mtools/APKBUILD6
-rw-r--r--main/multipath-tools/APKBUILD12
-rw-r--r--main/musl-fts/APKBUILD (renamed from main/fts/APKBUILD)17
-rw-r--r--main/musl-nscd/APKBUILD2
-rw-r--r--main/musl/APKBUILD15
-rw-r--r--main/musl/relr-1.patch100
-rw-r--r--main/musl/relr-2.patch31
-rw-r--r--main/musl/relr-3.patch46
-rw-r--r--main/musl/relr-4.patch12
-rw-r--r--main/nagios-plugins/APKBUILD8
-rw-r--r--main/nagios/APKBUILD6
-rw-r--r--main/nano/APKBUILD4
-rw-r--r--main/nasm/APKBUILD2
-rw-r--r--main/ncftp/APKBUILD2
-rw-r--r--main/ncurses/APKBUILD4
-rw-r--r--main/neon/APKBUILD26
-rw-r--r--main/net-tools/git.patch26170
-rw-r--r--main/netcat-openbsd/APKBUILD2
-rw-r--r--main/network-extras/APKBUILD4
-rw-r--r--main/newt/APKBUILD10
-rw-r--r--main/nfdump/APKBUILD6
-rw-r--r--main/nfdump/noyywrap.patch13
-rw-r--r--main/nfs-utils/APKBUILD6
-rw-r--r--main/nftables/APKBUILD33
-rw-r--r--main/nftables/nftables.confd24
-rw-r--r--main/nftables/nftables.initd134
-rw-r--r--main/nftables/nftables.nft6
-rw-r--r--main/nghttp2/APKBUILD16
-rw-r--r--main/nginx/APKBUILD65
-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/ngrep/APKBUILD4
-rw-r--r--main/nikto/APKBUILD2
-rw-r--r--main/nmap/APKBUILD6
-rw-r--r--main/nodejs/APKBUILD40
-rw-r--r--main/npth/APKBUILD2
-rw-r--r--main/nsd/APKBUILD6
-rw-r--r--main/nspr/APKBUILD13
-rw-r--r--main/nspr/fix-getproto.patch13
-rw-r--r--main/nspr/fix-sgidefs-usage.patch40
-rw-r--r--main/ntfs-3g/APKBUILD6
-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/oidentd/APKBUILD11
-rw-r--r--main/one-context/APKBUILD13
-rw-r--r--main/open-iscsi/APKBUILD28
-rw-r--r--main/open-isns/APKBUILD37
-rw-r--r--main/open-lldp/APKBUILD2
-rw-r--r--main/openjade/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.patch44
-rw-r--r--main/openldap/0008-Remove-pidfile-and-argsfile.patch35
-rw-r--r--main/openldap/0009-Include-more-schemas-in-default-config.patch44
-rw-r--r--main/openldap/APKBUILD47
-rw-r--r--main/openldap/cacheflush.patch12
-rw-r--r--main/openldap/lloadd.confd8
-rw-r--r--main/openldap/lloadd.initd2
-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.confd21
-rw-r--r--main/openldap/slapd.initd33
-rw-r--r--main/opennhrp/APKBUILD2
-rw-r--r--main/openobex/APKBUILD29
-rw-r--r--main/openrc/0009-dont-overwrite-empty-supervise_daemon_args.patch40
-rw-r--r--main/openrc/APKBUILD15
-rw-r--r--main/openrc/hwdrivers.initd4
-rw-r--r--main/openrc/remount-root.patch42
-rw-r--r--main/openrc/supervise-daemon-defaults.patch31
-rw-r--r--main/opensbi/APKBUILD5
-rw-r--r--main/opensmtpd/APKBUILD93
-rw-r--r--main/opensmtpd/aliases63
-rw-r--r--main/opensmtpd/opensmtpd.pre-install9
-rw-r--r--main/opensmtpd/smtpd.conf.patch21
-rw-r--r--main/opensmtpd/smtpd.confd8
-rw-r--r--main/opensmtpd/smtpd.initd41
-rw-r--r--main/opensp/APKBUILD4
-rw-r--r--main/openssh/APKBUILD14
-rw-r--r--main/openssh/fix-always-use-compat-getentropy.patch70
-rw-r--r--main/openssl/APKBUILD15
-rw-r--r--main/openssl1.1-compat/APKBUILD166
-rw-r--r--main/openssl1.1-compat/man-section.patch54
-rw-r--r--main/openssl1.1-compat/ppc64.patch96
-rw-r--r--main/openvpn/APKBUILD10
-rw-r--r--main/orc/APKBUILD15
-rw-r--r--main/ortp/APKBUILD4
-rw-r--r--main/p11-kit/APKBUILD5
-rw-r--r--main/pahole/0001-libbpf-Update-libbpf-to-the-latest-git-HEAD.patch120
-rw-r--r--main/pahole/APKBUILD37
-rw-r--r--main/pango/APKBUILD34
-rw-r--r--main/pango/disable-broken-test.patch9
-rw-r--r--main/parallel/APKBUILD11
-rw-r--r--main/patch/APKBUILD2
-rw-r--r--main/patchutils/APKBUILD2
-rw-r--r--main/pax-utils/APKBUILD31
-rw-r--r--main/pciutils/APKBUILD15
-rw-r--r--main/pciutils/fix-linking-pci-malloc-Makefile.patch11
-rw-r--r--main/pcsc-lite/APKBUILD7
-rw-r--r--main/perl-archive-zip/APKBUILD2
-rw-r--r--main/perl-b-cow/APKBUILD8
-rw-r--r--main/perl-clone/APKBUILD10
-rw-r--r--main/perl-convert-binhex/APKBUILD2
-rw-r--r--main/perl-convert-color/APKBUILD21
-rw-r--r--main/perl-convert-uulib/APKBUILD6
-rw-r--r--main/perl-crypt-openssl-guess/APKBUILD4
-rw-r--r--main/perl-datetime-locale/APKBUILD4
-rw-r--r--main/perl-datetime-timezone/APKBUILD4
-rw-r--r--main/perl-datetime/APKBUILD6
-rw-r--r--main/perl-dbd-pg/APKBUILD6
-rw-r--r--main/perl-dbd-sqlite/APKBUILD8
-rw-r--r--main/perl-dbd-sqlite/fix-test.patch11
-rw-r--r--main/perl-dbix-dbschema/APKBUILD8
-rw-r--r--main/perl-email-date-format/APKBUILD35
-rw-r--r--main/perl-encode/APKBUILD4
-rw-r--r--main/perl-exporter-tiny/APKBUILD8
-rw-r--r--main/perl-file-slurper/APKBUILD8
-rw-r--r--main/perl-future/APKBUILD24
-rw-r--r--main/perl-gd/APKBUILD6
-rw-r--r--main/perl-getopt-long/APKBUILD28
-rw-r--r--main/perl-html-mason/APKBUILD2
-rw-r--r--main/perl-html-parser/APKBUILD6
-rw-r--r--main/perl-html-tree/APKBUILD2
-rw-r--r--main/perl-http-message/APKBUILD11
-rw-r--r--main/perl-io-socket-ssl/APKBUILD4
-rw-r--r--main/perl-io-tty/APKBUILD6
-rw-r--r--main/perl-io/APKBUILD6
-rw-r--r--main/perl-ipc-run/APKBUILD37
-rw-r--r--main/perl-json-maybexs/APKBUILD6
-rw-r--r--main/perl-json/APKBUILD4
-rw-r--r--main/perl-locale-maketext-lexicon/APKBUILD2
-rw-r--r--main/perl-log-any/APKBUILD4
-rw-r--r--main/perl-metrics-any/APKBUILD4
-rw-r--r--main/perl-mime-types/APKBUILD4
-rw-r--r--main/perl-module-build/APKBUILD2
-rw-r--r--main/perl-module-scandeps/APKBUILD2
-rw-r--r--main/perl-module-util/APKBUILD2
-rw-r--r--main/perl-mozilla-ca/APKBUILD6
-rw-r--r--main/perl-net-dns-resolver-mock/APKBUILD8
-rw-r--r--main/perl-net-dns/APKBUILD4
-rw-r--r--main/perl-net-ip/APKBUILD2
-rw-r--r--main/perl-net-rblclient/APKBUILD2
-rw-r--r--main/perl-net-server/APKBUILD2
-rw-r--r--main/perl-net-snmp/APKBUILD2
-rw-r--r--main/perl-params-validate/APKBUILD8
-rw-r--r--main/perl-parse-yapp/APKBUILD2
-rw-r--r--main/perl-path-tiny/APKBUILD4
-rw-r--r--main/perl-pod-coverage/APKBUILD2
-rw-r--r--main/perl-server-starter/APKBUILD2
-rw-r--r--main/perl-socket-getaddrinfo/APKBUILD2
-rw-r--r--main/perl-socket/APKBUILD4
-rw-r--r--main/perl-string-shellquote/APKBUILD2
-rw-r--r--main/perl-struct-dumb/APKBUILD8
-rw-r--r--main/perl-test-warn/APKBUILD8
-rw-r--r--main/perl-type-tiny/APKBUILD7
-rw-r--r--main/perl-uri/APKBUILD10
-rw-r--r--main/perl-variable-magic/APKBUILD29
-rw-r--r--main/perl-x10/APKBUILD2
-rw-r--r--main/perl-yaml-libyaml/APKBUILD31
-rw-r--r--main/pgpool/APKBUILD10
-rw-r--r--main/pgpool/pgpool.confd5
-rw-r--r--main/pgpool/pgpool.initd11
-rw-r--r--main/pinentry/APKBUILD6
-rw-r--r--main/pixman/APKBUILD31
-rw-r--r--main/pixman/scaling-test.patch14
-rw-r--r--main/pjproject/APKBUILD12
-rw-r--r--main/pjproject/execinfo.patch78
-rw-r--r--main/pjproject/libpjsua2-install.patch26
-rw-r--r--main/pm-utils/APKBUILD2
-rw-r--r--main/pmacct/APKBUILD13
-rw-r--r--main/po4a/APKBUILD13
-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/APKBUILD7
-rw-r--r--main/postgresql13/disable-broken-tests.patch119
-rw-r--r--main/postgresql13/disable-test-collate.icu.utf8.patch20
-rw-r--r--main/postgresql13/initdb.patch14
-rw-r--r--main/postgresql14/APKBUILD12
-rw-r--r--main/postgresql14/fix-test-temp-schema-cleanup.patch (renamed from main/postgresql13/fix-test-temp-schema-cleanup.patch)4
-rw-r--r--main/postgresql15/APKBUILD (renamed from main/postgresql13/APKBUILD)99
-rw-r--r--main/postgresql15/czech-snowball-stemmer.patch (renamed from main/postgresql13/czech-snowball-stemmer.patch)38
-rw-r--r--main/postgresql15/disable-html-docs.patch (renamed from main/postgresql13/disable-html-docs.patch)0
-rw-r--r--main/postgresql15/dont-use-locale-a-on-musl.patch (renamed from main/postgresql13/dont-use-locale-a-on-musl.patch)0
-rw-r--r--main/postgresql15/external-libpq.patch.txt (renamed from main/postgresql13/external-libpq.patch.txt)0
-rw-r--r--main/postgresql15/icu-collations-hack.patch (renamed from main/postgresql13/icu-collations-hack.patch)12
-rw-r--r--main/postgresql15/initdb.patch14
-rw-r--r--main/postgresql15/jit-datalayout-mismatch-on-s390x-and-x86.patch (renamed from main/postgresql13/jit-datalayout-mismatch-on-s390x.patch)53
-rw-r--r--main/postgresql15/libpgport-pkglibdir.patch.txt (renamed from main/postgresql13/libpgport-pkglibdir.patch.txt)0
-rw-r--r--main/postgresql15/make-split-headers.patch (renamed from main/postgresql13/make-split-headers.patch)0
-rw-r--r--main/postgresql15/per-version-dirs.patch (renamed from main/postgresql13/per-version-dirs.patch)10
-rw-r--r--main/postgresql15/perl-rpath.patch (renamed from main/postgresql13/perl-rpath.patch)0
-rw-r--r--main/postgresql15/pg_config-add-major-version.patch (renamed from main/postgresql13/pg_config-add-major-version.patch)0
-rw-r--r--main/postgresql15/pltcl_create_tables.sql (renamed from main/postgresql13/pltcl_create_tables.sql)0
-rw-r--r--main/postgresql15/postgresql15.post-install (renamed from main/postgresql13/postgresql13.post-install)0
-rw-r--r--main/postgresql15/postgresql15.pre-deinstall (renamed from main/postgresql13/postgresql13.pre-deinstall)0
-rw-r--r--main/postgresql15/remove-libecpg_compat.patch (renamed from main/postgresql13/remove-libecpg_compat.patch)0
-rw-r--r--main/postgresql15/unix_socket_directories.patch (renamed from main/postgresql13/unix_socket_directories.patch)0
-rw-r--r--main/pound/APKBUILD47
-rw-r--r--main/pound/openssl-1.1.patch345
-rw-r--r--main/pound/openssl1.1-cli.patch17
-rw-r--r--main/pound/pound.cfg54
-rw-r--r--main/pound/pound.initd26
-rw-r--r--main/powertop/APKBUILD32
-rw-r--r--main/powertop/musl-fix-headers.patch22
-rw-r--r--main/procps/APKBUILD5
-rw-r--r--main/protobuf-c/APKBUILD2
-rw-r--r--main/protobuf/APKBUILD4
-rw-r--r--main/pspg/APKBUILD4
-rw-r--r--main/psqlodbc/APKBUILD6
-rw-r--r--main/pssh/APKBUILD6
-rw-r--r--main/putty/APKBUILD6
-rw-r--r--main/pwgen/APKBUILD2
-rw-r--r--main/py3-alabaster/APKBUILD6
-rw-r--r--main/py3-appdirs/APKBUILD6
-rw-r--r--main/py3-asn1/APKBUILD6
-rw-r--r--main/py3-atomicwrites/APKBUILD2
-rw-r--r--main/py3-attrs/APKBUILD6
-rw-r--r--main/py3-babel/APKBUILD11
-rw-r--r--main/py3-bcrypt/APKBUILD31
-rw-r--r--main/py3-build/APKBUILD31
-rw-r--r--main/py3-cairo/APKBUILD4
-rw-r--r--main/py3-certifi/APKBUILD14
-rw-r--r--main/py3-certifi/use-alpine-system-certs.patch52
-rw-r--r--main/py3-cffi/APKBUILD2
-rw-r--r--main/py3-chardet/APKBUILD10
-rw-r--r--main/py3-charset-normalizer/APKBUILD6
-rw-r--r--main/py3-coverage/APKBUILD5
-rw-r--r--main/py3-cparser/APKBUILD11
-rw-r--r--main/py3-dbus/APKBUILD35
-rw-r--r--main/py3-distlib/APKBUILD31
-rw-r--r--main/py3-dnspython/APKBUILD2
-rw-r--r--main/py3-docutils/APKBUILD2
-rw-r--r--main/py3-elementpath/APKBUILD2
-rw-r--r--main/py3-elftools/APKBUILD8
-rw-r--r--main/py3-exceptiongroup/APKBUILD41
-rw-r--r--main/py3-exceptiongroup/use-flit-core.patch38
-rw-r--r--main/py3-extras/APKBUILD6
-rw-r--r--main/py3-filelock/APKBUILD6
-rw-r--r--main/py3-fixtures/APKBUILD2
-rw-r--r--main/py3-flit-core/APKBUILD9
-rw-r--r--main/py3-funcsigs/APKBUILD6
-rw-r--r--main/py3-future/APKBUILD2
-rw-r--r--main/py3-gobject3/APKBUILD26
-rw-r--r--main/py3-gpep517/APKBUILD21
-rw-r--r--main/py3-gpep517/gpep5176
-rw-r--r--main/py3-hypothesis/APKBUILD8
-rw-r--r--main/py3-idna/APKBUILD22
-rw-r--r--main/py3-imagesize/APKBUILD2
-rw-r--r--main/py3-iniconfig/APKBUILD6
-rw-r--r--main/py3-installer/APKBUILD2
-rw-r--r--main/py3-jinja2/APKBUILD4
-rw-r--r--main/py3-lxc/APKBUILD6
-rw-r--r--main/py3-lxml/APKBUILD2
-rw-r--r--main/py3-mako/APKBUILD10
-rw-r--r--main/py3-markdown/APKBUILD8
-rw-r--r--main/py3-markupsafe/APKBUILD2
-rw-r--r--main/py3-meld3/APKBUILD8
-rw-r--r--main/py3-mimeparse/APKBUILD6
-rw-r--r--main/py3-mock/APKBUILD6
-rw-r--r--main/py3-more-itertools/APKBUILD8
-rw-r--r--main/py3-olefile/APKBUILD6
-rw-r--r--main/py3-ordered-set/APKBUILD35
-rw-r--r--main/py3-packaging/APKBUILD2
-rw-r--r--main/py3-parsing/APKBUILD7
-rw-r--r--main/py3-pbr/APKBUILD6
-rw-r--r--main/py3-pep517/APKBUILD32
-rw-r--r--main/py3-pexpect/APKBUILD11
-rw-r--r--main/py3-pexpect/python3.11.patch68
-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/APKBUILD6
-rw-r--r--main/py3-ptyprocess/APKBUILD6
-rw-r--r--main/py3-py/0001-remove-setuptools_scm.patch12
-rw-r--r--main/py3-py/APKBUILD15
-rw-r--r--main/py3-pygments/APKBUILD2
-rw-r--r--main/py3-pynacl/APKBUILD2
-rw-r--r--main/py3-pytest-timeout/APKBUILD8
-rw-r--r--main/py3-pytest/0001-remove-setuptools_scm.patch31
-rw-r--r--main/py3-pytest/APKBUILD22
-rw-r--r--main/py3-requests/APKBUILD7
-rw-r--r--main/py3-requests/charset-normaliser-3.patch53
-rw-r--r--main/py3-setuptools-stage0/APKBUILD2
-rw-r--r--main/py3-setuptools/APKBUILD8
-rw-r--r--main/py3-six/APKBUILD7
-rw-r--r--main/py3-snowballstemmer/APKBUILD2
-rw-r--r--main/py3-sortedcontainers/APKBUILD2
-rw-r--r--main/py3-sphinx/APKBUILD15
-rw-r--r--main/py3-sphinx_rtd_theme/APKBUILD8
-rw-r--r--main/py3-sphinxcontrib-applehelp/APKBUILD6
-rw-r--r--main/py3-sphinxcontrib-devhelp/APKBUILD6
-rw-r--r--main/py3-sphinxcontrib-htmlhelp/APKBUILD2
-rw-r--r--main/py3-sphinxcontrib-jsmath/APKBUILD6
-rw-r--r--main/py3-sphinxcontrib-qthelp/APKBUILD6
-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-testtools/APKBUILD2
-rw-r--r--main/py3-toml/APKBUILD31
-rw-r--r--main/py3-tomli/APKBUILD36
-rw-r--r--main/py3-tz/APKBUILD6
-rw-r--r--main/py3-urllib3/APKBUILD6
-rw-r--r--main/py3-wcag-contrast-ratio/APKBUILD2
-rw-r--r--main/py3-wcwidth/APKBUILD2
-rw-r--r--main/py3-wheel/APKBUILD31
-rw-r--r--main/py3-wheel/use-system-packaging.patch26
-rw-r--r--main/py3-xmlschema/APKBUILD6
-rw-r--r--main/py3-yaml/APKBUILD2
-rw-r--r--main/python3/APKBUILD69
-rw-r--r--main/python3/arm-alignment.patch17
-rw-r--r--main/python3/custom-bluetooth-h-path.patch63
-rw-r--r--main/python3/deprecated-test-functions.patch801
-rw-r--r--main/quagga/APKBUILD2
-rw-r--r--main/raspberrypi-bootloader/APKBUILD11
-rw-r--r--main/raspberrypi/APKBUILD6
-rw-r--r--main/razor/APKBUILD4
-rw-r--r--main/rdiff-backup/APKBUILD4
-rw-r--r--main/readline/APKBUILD13
-rw-r--r--main/redis/APKBUILD8
-rw-r--r--main/rpcbind/APKBUILD4
-rw-r--r--main/rrdcollect/APKBUILD4
-rw-r--r--main/rsnapshot/APKBUILD2
-rw-r--r--main/rssh/APKBUILD2
-rw-r--r--main/rsync/APKBUILD4
-rw-r--r--main/rsyslog/APKBUILD6
-rw-r--r--main/rtmpdump/APKBUILD2
-rw-r--r--main/rtpproxy/APKBUILD8
-rw-r--r--main/ruby-bundler/APKBUILD6
-rw-r--r--main/ruby-power_assert/APKBUILD4
-rw-r--r--main/ruby-rr/APKBUILD6
-rw-r--r--main/ruby-rr/gemspec.patch20
-rw-r--r--main/ruby-test-unit/APKBUILD4
-rw-r--r--main/run-parts/APKBUILD2
-rw-r--r--main/s390-tools/APKBUILD10
-rw-r--r--main/samba/APKBUILD152
-rw-r--r--main/samba/netapp.patch85
-rw-r--r--main/samba/netdb-defines.patch8
-rw-r--r--main/scons/APKBUILD2
-rw-r--r--main/scstadmin/APKBUILD4
-rw-r--r--main/secureboot-hook/APKBUILD4
-rw-r--r--main/secureboot-hook/secureboot.conf2
-rw-r--r--main/sed/APKBUILD15
-rw-r--r--main/sed/fix-test-canonicalize-lgpl.patch23
-rw-r--r--main/serf/APKBUILD4
-rw-r--r--main/serf/bio-ctrl.patch27
-rw-r--r--main/sfic/APKBUILD4
-rw-r--r--main/shared-mime-info/APKBUILD4
-rw-r--r--main/shared-mime-info/shared-mime-info.trigger2
-rw-r--r--main/sharutils/APKBUILD2
-rw-r--r--main/shorewall-core/APKBUILD2
-rw-r--r--main/sipcalc/APKBUILD2
-rw-r--r--main/sipsak/APKBUILD10
-rw-r--r--main/sircbot/APKBUILD2
-rw-r--r--main/skalibs/APKBUILD4
-rw-r--r--main/smokeping/APKBUILD4
-rw-r--r--main/snmptt/APKBUILD11
-rw-r--r--main/snort/APKBUILD4
-rw-r--r--main/sntpc/APKBUILD2
-rw-r--r--main/socat/APKBUILD9
-rw-r--r--main/sofia-sip/APKBUILD6
-rw-r--r--main/source-highlight/APKBUILD4
-rw-r--r--main/source-highlight/gcc12.patch82
-rw-r--r--main/spamassassin/APKBUILD2
-rw-r--r--main/spawn-fcgi/APKBUILD2
-rw-r--r--main/speedtest-cli/APKBUILD6
-rw-r--r--main/spice-protocol/APKBUILD6
-rw-r--r--main/spice/APKBUILD37
-rw-r--r--main/spice/failing-tests.patch36
-rw-r--r--main/spice/fix-build.patch6
-rw-r--r--main/spice/python-module-check.patch37
-rw-r--r--main/spirv-headers/APKBUILD10
-rw-r--r--main/spirv-tools/APKBUILD13
-rw-r--r--main/sprunge/APKBUILD2
-rw-r--r--main/sqlite-tcl/APKBUILD4
-rw-r--r--main/sqlite/APKBUILD4
-rw-r--r--main/sqsh/APKBUILD2
-rw-r--r--main/squark/APKBUILD2
-rw-r--r--main/squid/APKBUILD16
-rw-r--r--main/squid/squid-5.2-openssl3.patch185
-rw-r--r--main/sshguard/APKBUILD10
-rw-r--r--main/sshguard/sshguard.initd2
-rw-r--r--main/sshpass/APKBUILD2
-rw-r--r--main/strace/APKBUILD4
-rw-r--r--main/strongswan/0001-charon-add-optional-source-and-remote-overrides-for-.patch579
-rw-r--r--main/strongswan/0002-vici-send-certificates-for-ike-sa-events.patch (renamed from main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch)42
-rw-r--r--main/strongswan/0003-vici-add-support-for-individual-sa-state-changes.patch (renamed from main/strongswan/1003-vici-add-support-for-individual-sa-state-changes.patch)23
-rw-r--r--main/strongswan/APKBUILD27
-rw-r--r--main/strongswan/disable_test_time_printf_hook.patch51
-rw-r--r--main/subunit/APKBUILD30
-rw-r--r--main/subversion/APKBUILD2
-rw-r--r--main/supervisor/APKBUILD2
-rw-r--r--main/swig/APKBUILD12
-rw-r--r--main/swish-e/APKBUILD2
-rw-r--r--main/sysfsutils/APKBUILD2
-rw-r--r--main/syslog-ng/APKBUILD22
-rw-r--r--main/talloc/APKBUILD2
-rw-r--r--main/tar/APKBUILD2
-rw-r--r--main/tarsnap/APKBUILD38
-rw-r--r--main/tcl/APKBUILD8
-rw-r--r--main/tcl/restore-fp-control-word.patch106
-rw-r--r--main/tdb/APKBUILD2
-rw-r--r--main/terminus-font/APKBUILD6
-rw-r--r--main/termrec/APKBUILD2
-rw-r--r--main/testdisk/APKBUILD2
-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/texinfo/APKBUILD9
-rw-r--r--main/tftp-hpa/APKBUILD10
-rw-r--r--main/tftp-hpa/fix-prompt-flush.patch13
-rw-r--r--main/tiff/APKBUILD24
-rw-r--r--main/tiff/CVE-2022-2056-8.patch180
-rw-r--r--main/tiff/CVE-2022-2519-21.patch132
-rw-r--r--main/tiff/CVE-2022-34526.patch28
-rw-r--r--main/tig/APKBUILD23
-rw-r--r--main/tig/test-git-file-protocol.patch46
-rw-r--r--main/tiny-cloud/APKBUILD4
-rw-r--r--main/tinyproxy/APKBUILD12
-rw-r--r--main/tinyproxy/CVE-2022-40468.patch28
-rw-r--r--main/tinyproxy/tinyproxy.initd2
-rw-r--r--main/tinyxml2/APKBUILD2
-rw-r--r--main/tk/APKBUILD6
-rw-r--r--main/tree/0001-remove-03-cflag.patch25
-rw-r--r--main/tree/APKBUILD16
-rw-r--r--main/ttf-freefont/APKBUILD29
-rw-r--r--main/ttf-tlwg/APKBUILD19
-rw-r--r--main/tzdata/APKBUILD15
-rw-r--r--main/u-boot/APKBUILD28
-rwxr-xr-xmain/u-boot/update-u-boot12
-rw-r--r--main/ucarp/APKBUILD2
-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/ulogd/APKBUILD37
-rw-r--r--main/ulogd/musl-fixes.patch10
-rw-r--r--main/umix/APKBUILD8
-rw-r--r--main/unbound/APKBUILD6
-rw-r--r--main/unfs3/APKBUILD4
-rw-r--r--main/unifont/APKBUILD10
-rw-r--r--main/unzip/08-allow-greater-hostver-values.patch14
-rw-r--r--main/unzip/13-remove-build-date.patch17
-rw-r--r--main/unzip/21-fix-warning-messages-on-big-files.patch15
-rw-r--r--main/unzip/APKBUILD45
-rw-r--r--main/unzip/CVE-2014-8139.patch (renamed from main/unzip/fix-CVE-2014-8139.patch)0
-rw-r--r--main/unzip/CVE-2021-4217.patch54
-rw-r--r--main/unzip/CVE-2022-0529-and-CVE-2022-0530.patch173
-rw-r--r--main/unzip/unzip-6.0-exec-shield.patch10
-rw-r--r--main/unzip/unzip-6.0-format-secure.patch90
-rw-r--r--main/unzip/unzip-6.0-timestamp.patch41
-rw-r--r--main/unzip/zipbomb-manpage.patch25
-rw-r--r--main/unzip/zipbomb-part1.patch25
-rw-r--r--main/unzip/zipbomb-part2.patch (renamed from main/unzip/CVE-2019-13232.patch)138
-rw-r--r--main/unzip/zipbomb-part3.patch112
-rw-r--r--main/unzip/zipbomb-part4.patch25
-rw-r--r--main/unzip/zipbomb-part5.patch26
-rw-r--r--main/unzip/zipbomb-part6.patch95
-rw-r--r--main/unzip/zipbomb-switch.patch215
-rw-r--r--main/usb-modeswitch/APKBUILD10
-rw-r--r--main/usbutils/APKBUILD15
-rw-r--r--main/userspace-rcu/APKBUILD4
-rw-r--r--main/util-linux/APKBUILD2
-rw-r--r--main/uvncrepeater/APKBUILD2
-rw-r--r--main/uwsgi/APKBUILD14
-rw-r--r--main/uwsgi/musl-fix-python.patch13
-rw-r--r--main/vala/APKBUILD4
-rw-r--r--main/valgrind/APKBUILD4
-rw-r--r--main/vanessa_logger/APKBUILD2
-rw-r--r--main/varnish/APKBUILD10
-rw-r--r--main/vde2/APKBUILD63
-rw-r--r--main/vde2/inline.patch21
-rw-r--r--main/vde2/musl-build-fix.patch15
-rw-r--r--main/vde2/vde2.post-down37
-rw-r--r--main/vde2/vde2.pre-install6
-rw-r--r--main/vde2/vde2.pre-up74
-rw-r--r--main/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch92
-rw-r--r--main/vim/APKBUILD27
-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/APKBUILD8
-rw-r--r--main/wayland/APKBUILD6
-rw-r--r--main/wget/APKBUILD4
-rw-r--r--main/which/APKBUILD2
-rw-r--r--main/wipe/APKBUILD4
-rw-r--r--main/wireguard-tools/APKBUILD2
-rw-r--r--main/wpa_supplicant/APKBUILD13
-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/APKBUILD6
-rw-r--r--main/xen/APKBUILD65
-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/xsa403-4.16-1.patch56
-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/xen/xsa407-4.16-00.patch823
-rw-r--r--main/xen/xsa407-4.16-1.patch153
-rw-r--r--main/xen/xsa407-4.16-2.patch99
-rw-r--r--main/xen/xsa407-4.16-3.patch86
-rw-r--r--main/xen/xsa407-4.16-4.patch96
-rw-r--r--main/xen/xsa407-4.16-5.patch285
-rw-r--r--main/xen/xsa407-4.16-7.patch94
-rw-r--r--main/xen/xsa407-4.16-8.patch293
-rw-r--r--main/xen/xsa408.patch36
-rw-r--r--main/xen/xsa412-4.16.patch245
-rw-r--r--main/xen/xsa414.patch112
-rw-r--r--main/xen/xsa422-4.16-1.patch (renamed from main/xen/xsa407-4.16-6.patch)75
-rw-r--r--main/xen/xsa422-4.16-2.patch100
-rw-r--r--main/xfsprogs/APKBUILD16
-rw-r--r--main/xkbcomp/APKBUILD2
-rw-r--r--main/xkeyboard-config/APKBUILD13
-rw-r--r--main/xkeyboard-config/fix-syntax-error.patch58
-rw-r--r--main/xl2tpd/APKBUILD4
-rw-r--r--main/xmlindent/APKBUILD4
-rw-r--r--main/xmlrpc-c/APKBUILD4
-rw-r--r--main/xtables-addons-lts/APKBUILD14
-rw-r--r--main/xtables-addons/APKBUILD4
-rw-r--r--main/xz/APKBUILD8
-rw-r--r--main/yaml/APKBUILD4
-rw-r--r--main/yash/APKBUILD98
-rw-r--r--main/yash/yash.post-install11
-rw-r--r--main/yash/yash.post-upgrade14
-rw-r--r--main/yash/yash.pre-deinstall3
-rw-r--r--main/zeromq/APKBUILD21
-rw-r--r--main/zfs-lts/APKBUILD14
-rw-r--r--main/zfs-rpi/APKBUILD8
-rw-r--r--main/zfs/APKBUILD4
-rw-r--r--main/zip/APKBUILD2
-rw-r--r--main/zlib/APKBUILD15
-rw-r--r--main/zlib/Fix-CC-logic-in-configure.patch43
-rw-r--r--main/zlib/crc32.patch51
-rw-r--r--main/zonenotify/APKBUILD2
-rw-r--r--main/zstd/APKBUILD29
-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
1241 files changed, 18037 insertions, 52183 deletions
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 b9f23eaa09..a780d05754 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=abuild
-pkgver=3.9.0
+pkgver=3.10.0_rc1
_ver=${pkgver%_git*}
-pkgrel=5
+pkgrel=2
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch="all"
@@ -15,7 +15,7 @@ fi
makedepends_build="pkgconfig scdoc"
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,11 +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
- mr134-modcacherw.patch
- mr127-doas.patch
+ 0001-make-increase-test-timeout.patch
+ 0001-abuild-fix-amove-corner-cases.patch
"
builddir="$srcdir"/abuild-$pkgver
@@ -89,10 +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
-9a8697819a3c94a968be33eb014a8f59ea15cefd46046b7fb6ef58fcfde37d5a4243f0aaafe51ab6f43766c94775332ea88d4d07cccc3bd0d9443c26651aef21 mr134-modcacherw.patch
-41e68d43db29823305b0496cd35908951a169a7cf4715fb29a6b23c148fc9275cee019e88a7cded45e9ac2d48bdab574f61207d9cdff181efce29a97228e3e29 mr127-doas.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/mr127-doas.patch b/main/abuild/mr127-doas.patch
deleted file mode 100644
index 9a6594cc56..0000000000
--- a/main/abuild/mr127-doas.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4dbf8e3756188748d3fff9dce81f93b21085d123 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 22 Jun 2022 16:38:55 +0200
-Subject: [PATCH] abuild-keygen: use doas instead of sudo
-
-fallback to sudo if doas was not found
----
- abuild-keygen.in | 7 ++++---
- tests/abuild_keygen_test | 21 ++++++++++++++++++++-
- 2 files changed, 24 insertions(+), 4 deletions(-)
-
-diff --git a/abuild-keygen.in b/abuild-keygen.in
-index 299d86c..d9ac0bc 100644
---- a/abuild-keygen.in
-+++ b/abuild-keygen.in
-@@ -8,7 +8,7 @@
-
- program_version=@VERSION@
- sharedir=${ABUILD_SHAREDIR:-@sharedir@}
--SUDO="${SUDO-sudo}"
-+SUDO="${SUDO-$(command -v doas || command -v sudo || echo doas)}"
-
- if ! [ -f "$sharedir/functions.sh" ]; then
- echo "$sharedir/functions.sh: not found" >&2
-@@ -98,14 +98,15 @@ usage() {
- -a, --append Set PACKAGER_PRIVKEY=<generated key> in
- $ABUILD_USERCONF
-
-- -i, --install Install public key into /etc/apk/keys using sudo
-+ -i, --install Install public key into /etc/apk/keys using doas
- -n Non-interactive. Use defaults
- -b, --numbits [BITS] The size of the private key to generate in bits.
- -q, --quiet
- -h, --help Show this help
-
- The SUDO variable can be set to pick which tool can be used to
-- elevate privileges, if it is not set it defaults to sudo.
-+ elevate privileges, if it is not set it defaults to doas or sudo if doas
-+ is not found.
-
- __EOF__
- }
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/mr134-modcacherw.patch b/main/abuild/mr134-modcacherw.patch
deleted file mode 100644
index ceffe6df39..0000000000
--- a/main/abuild/mr134-modcacherw.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-the commit puts it into default config- we put it here to activate it immediately
-diff --git a/abuild.in b/abuild.in
-index 76cd77b..bd38003 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -462,7 +462,7 @@ initdcheck() {
- local i line
- for i in $source; do
- case $i in
-- *.initd)
-+ *.initd)
- line=$(head -n 1 "$srcdir"/"$(filename_from_uri $i)")
- ;;
- *) continue ;;
-@@ -2793,6 +2793,8 @@ fi
- # for recursive action
- export REPODEST SRCDEST
-
-+export GOFLAGS="$GOFLAGS -modcacherw"
-+
- # add dbg subpackage if its enabled globally
- if [ -n "$DEFAULT_DBG" ] && ! subpackage_types_has "dbg" && ! options_has "!dbg" && [ "$arch" != "noarch" ]; then
- subpackages="$pkgname-dbg $subpackages"
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-core/APKBUILD b/main/acf-core/APKBUILD
index b654db9fdc..c7beb8f070 100644
--- a/main/acf-core/APKBUILD
+++ b/main/acf-core/APKBUILD
@@ -3,7 +3,7 @@
_luaversion="5.2"
pkgname=acf-core
pkgver=0.22.0
-pkgrel=2
+pkgrel=3
pkgdesc="Web-based system administration interface framework"
url="https://gitlab.alpinelinux.org/acf/acf-core"
arch="noarch"
diff --git a/main/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD
index 679b728167..54cd77a92d 100644
--- a/main/acf-weblog/APKBUILD
+++ b/main/acf-weblog/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-weblog
pkgver=0.11.1
-pkgrel=3
+pkgrel=4
pkgdesc="ACF for web proxy (squid and dansguardian) logfiles"
url="https://gitlab.alpinelinux.org/acf/acf-weblog"
arch="noarch"
@@ -10,7 +10,7 @@ license="GPL-2.0-only"
options="!check" # no test suite
depends="acf-core lua-sql-postgres wget postgresql-client lua-subprocess"
install="$pkgname.post-upgrade"
-source="https://gitlab.alpinelinux.org/acf/acf-weblog/-/archive/v$pkgver/acf-weblog-v$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://gitlab.alpinelinux.org/acf/acf-weblog/-/archive/v$pkgver/acf-weblog-v$pkgver.tar.gz
acf-weblog-update-schema
"
builddir="$srcdir/$pkgname-v$pkgver"
@@ -22,6 +22,6 @@ package() {
}
sha512sums="
-90f2b1c68e4afd849261410105a442ffb3b83cb1e3c70abaef24ede41773c602bd6d743bf5ef805b5b93619dc0ca3215638f8d1beaa071a408f15f2944b6cf51 acf-weblog-v0.11.1.tar.gz
+90f2b1c68e4afd849261410105a442ffb3b83cb1e3c70abaef24ede41773c602bd6d743bf5ef805b5b93619dc0ca3215638f8d1beaa071a408f15f2944b6cf51 acf-weblog-0.11.1.tar.gz
98474adf2b60b30dbe060753db9b8c8d70696e063cfae810f7aab59cba229e45e15abe368609bd9ab3480c594fd6e9545c5c128fcdc81908df4463f86cb475e3 acf-weblog-update-schema
"
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/aconf/APKBUILD b/main/aconf/APKBUILD
index cd3e537b63..40232e28af 100644
--- a/main/aconf/APKBUILD
+++ b/main/aconf/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
pkgname=aconf
pkgver=0.8.1
-pkgrel=1
+pkgrel=2
pkgdesc="Alpine Configurator"
url="https://gitlab.alpinelinux.org/kunkku/aconf/"
arch="noarch"
diff --git a/main/acpi/APKBUILD b/main/acpi/APKBUILD
index 0b92719794..4eb6c50cc0 100644
--- a/main/acpi/APKBUILD
+++ b/main/acpi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=acpi
pkgver=1.7
-pkgrel=4
+pkgrel=5
pkgdesc="ACPI client for battery, power, and thermal readings"
url="https://sourceforge.net/projects/acpiclient/files/acpiclient/"
arch="all"
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 b220989cb6..caa04885eb 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.17_alpha20220809
+pkgver=3.17.0
pkgrel=0
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 58434ab806..b610612163 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-baselayout
-pkgver=3.3.0
+pkgver=3.4.0
pkgrel=0
pkgdesc="Alpine base dir structure and init scripts"
url="https://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
@@ -13,7 +13,7 @@ depends="$pkgname-data=${pkgver}-r${pkgrel}"
subpackages="$pkgname-data"
install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade
$pkgname.post-install"
-_nbver=6.2
+_nbver=6.4
source="crontab
color_prompt.sh.disabled
locale.sh
@@ -57,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
@@ -230,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 \
@@ -260,7 +268,7 @@ bfe947bdd69e7d93b32c8cb4e2cabe5717cb6c1e1f49a74015ac2cfb13e96d1f12c4be23ae93a1d6
806b8f23f823a9471846d12fa6b55690b95eedb4c613b82aefaba7ffef23f83e17552befd891a487864f72ef24e395d8611738933f684a85eb4c336cb20994f8 group
fdab6f8fec2a556ab817d90a73635a927ea04dbc4e0470ed59ee6a62c87393f9534c9b746b09a776d938c25b8af9c9fb1686578e24f8307d1d074921ade1bdc7 inittab
06d12a7b9ca14fe17e412d0f24814620b67d035ae859be7906cbf4782dd69e359a6a555dafb98060b7fb7e4714aaa676c88d9017cded36e6d8398e23369bb290 passwd
-dfc810763c5d94ef6bd149bdb0b152712c0c0aadc7ad3c5c916e2c6e8ed57246e3cdac50d2743b9d009267bdbd47e91b6ad58fe6d068baf132043c38e8fd820d profile
-eadc83e47fcc354ab83fd109bee452bda170886fb684e67faf615930c11480919505f4af60c685b124efc54af0ded9522663132f911eac6622144f8b4c8be695 protocols-6.2
-adfae0d2f569c2a2f413b7e27683a007fc8ca689b8c3349672fe0dcb6208c192ede4402eff09c604b7e7b4fd9d8df93b875efa5bdaa6c14ff1d8022a7caad5cd services-6.2
+a15252a5eb90983775f63e54d37242f4c76c5c358ad6d8c1622c7da35f1b8a722249e7375a07e9f08fbb25318bd1eb033d3927aed82c3f5e9b854ad550dad2ce profile
+3a00083bcdf5a9e884c9d07877d52311e3d99e79cbee656e236ba06e08ba0dddb7ba76494fdc9dd1a826c48e197a790a69e6bb458e9df64832d6b5e904e9fd15 protocols-6.4
+47b0f3ee73af2d259bd206a026204be0ea25531a895a0b035a904b38fe5407bc3dd2beab7f8fcb3d760587e6159702ebdb9cbc4f508942befdf7f10c10c87888 services-6.4
"
diff --git a/main/alpine-baselayout/profile b/main/alpine-baselayout/profile
index 7544958197..e62587b72f 100644
--- a/main/alpine-baselayout/profile
+++ b/main/alpine-baselayout/profile
@@ -34,7 +34,6 @@ else
PS1='${HOSTNAME%%.*}:$PWD'
[ "$(id -u)" -eq 0 ] && PS1="${PS1}# " || PS1="${PS1}\$ "
fi
-export PS1
for script in /etc/profile.d/*.sh ; do
if [ -r "$script" ] ; then
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index c02db806b6..f124a3f731 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.6
+pkgver=3.15.0
pkgrel=0
pkgdesc="Alpine configuration management scripts"
url="https://git.alpinelinux.org/alpine-conf/about"
@@ -30,5 +30,5 @@ check() {
}
sha512sums="
-d8f59adfce6ff3aa2e6c986c073fc48e1eab52eadd5264db909abd8b7c9cfdb888efa896a928b6c25b8b4ea5a9e66b42c67dbe348cad29432bf68d446c654d97 alpine-conf-3.14.6.tar.gz
+058dd3d68817e2e3abd0598279d6fd202ad7888db95eb6f5c67e681273b28df28aade5dfe3244287556aa6545e1944506ac46e5e18e791c964dc128d76a9b689 alpine-conf-3.15.0.tar.gz
"
diff --git a/main/alpine-ipxe/APKBUILD b/main/alpine-ipxe/APKBUILD
index a54db2b92b..3a33d86799 100644
--- a/main/alpine-ipxe/APKBUILD
+++ b/main/alpine-ipxe/APKBUILD
@@ -56,6 +56,7 @@ build() {
CERT="$srcdir"/alpine-netboot-ca.crt,"$srcdir"/DST_Root_CA_X3.pem \
TRUST="$srcdir"/alpine-netboot-ca.crt,"$srcdir"/DST_Root_CA_X3.pem \
EXTRA_CFLAGS="-fcommon" \
+ NO_WERROR=1 \
$_targets
}
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 cba8d72c15..5a381c2431 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.2
+pkgver=1.2.8
pkgrel=0
pkgdesc="Advanced Linux Sound Architecture (ALSA) library"
url="https://alsa-project.org/"
@@ -39,7 +39,7 @@ package() {
}
sha512sums="
-79e5920384e570a1acd8ecd1eb8812879333c3cedb1d15780080afc40125b97df893c33f4163d9dd863871b628bc6026265f8ace2c8634fc1af5b52b62ac9cfe alsa-lib-1.2.7.2.tar.bz2
+865ff05a8f589996f8d63d43a91c961f1b64144f3e1d17c7074b7ac16f25b3fd1c371d46ed63a8cc20fa01e63c76b75f1a9802b56889ae1073854dd050d27688 alsa-lib-1.2.8.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
index 438c2609a6..86b888b548 100644
--- a/main/alsa-ucm-conf/APKBUILD
+++ b/main/alsa-ucm-conf/APKBUILD
@@ -1,14 +1,15 @@
# Contributor: Minecrell <minecrell@minecrell.net>
# Maintainer: Minecrell <minecrell@minecrell.net>
pkgname=alsa-ucm-conf
-pkgver=1.2.7.2
-pkgrel=0
+pkgver=1.2.8
+pkgrel=1
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
+provider_priority=10
package() {
mkdir -p "$pkgdir"/usr/share/alsa
@@ -16,5 +17,5 @@ package() {
}
sha512sums="
-b6866f1ca6a3f4d69d7923bc1107a64b49944a3a8756f129f39034e5390e08db1c295669e54dfe1437ca934cc11abf407f60fc8319f5cba3f021966e8654c2db alsa-ucm-conf-1.2.7.2.tar.bz2
+a15a9ca52c108ee95a421b91f3fad4329f1e9fb1c004a40d5ff1a57d6701bad19a31d5a296426d26439be9b87d2d543ce51588a98402d24c17f0f92aaf1096ca alsa-ucm-conf-1.2.8.tar.bz2
"
diff --git a/main/alsa-utils/APKBUILD b/main/alsa-utils/APKBUILD
index cb4ca08ede..d3ddf8203b 100644
--- a/main/alsa-utils/APKBUILD
+++ b/main/alsa-utils/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alsa-utils
-pkgver=1.2.7
-pkgrel=1
+pkgver=1.2.8
+pkgrel=0
pkgdesc="Advanced Linux Sound Architecture (ALSA) utilities"
url="https://alsa-project.org/"
arch="all"
@@ -41,7 +41,7 @@ alsaconf() {
}
sha512sums="
-1be8f617315193e6033653ac96a14bd1c3272cd9d8f3776cdb1357f35f5353652acd5975cfc5bd16278cd496f5bf409bb60432818a526282edad9a4c718a97c9 alsa-utils-1.2.7.tar.bz2
+882e6f67467596ed273bf554fcce87d8ef287806bbdabd6c103de4980981f9e2102fb3800c6e8628ee8e86ffb165c1c92f9370c8145f28a6cb7cca563942330b alsa-utils-1.2.8.tar.bz2
f04155e1e391c7f36d44422c8e769bf9370117f6bbea6c0664e9858f7a676cc958e4260e4b4d226e71d0716f6be4e6fdd60f1d07cb7e9922fff378ceec01c47d alsaconf.patch
c66959a4a1a24a727c9c91a455caa5fa093c523d17a563b56ec2449a02ff30c83683db555006954b1fe571446cf4a117cc41de8c8b869a6e875d386595b3cc1f alsa.initd
d7e212e9f624b09168117b46c66289204a23915adf0d1b0c9ae258049430397b8f2d86d3b5f7e3087151948a031c4eab863e8195a6c7b1276704e9cba9c2d2a7 alsa.confd
diff --git a/main/altermime/APKBUILD b/main/altermime/APKBUILD
index b23ad947c6..b6249a1031 100644
--- a/main/altermime/APKBUILD
+++ b/main/altermime/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=altermime
pkgver=0.3.11
-pkgrel=1
+pkgrel=2
pkgdesc="alterMIME - MIME encoded email pack alteration tool"
url="https://pldaniels.com/altermime"
arch="all"
diff --git a/main/amavisd-milter/APKBUILD b/main/amavisd-milter/APKBUILD
index 45299851b6..080d73bcb8 100644
--- a/main/amavisd-milter/APKBUILD
+++ b/main/amavisd-milter/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting>
pkgname=amavisd-milter
pkgver=1.7.1
-pkgrel=2
+pkgrel=3
pkgdesc="sendmail milter for amavisd-new using the AM.PDP protocol"
url="https://github.com/prehor/amavisd-milter"
arch="all !x86" #amavis isn't build for x86
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/apache2-mod-wsgi/APKBUILD b/main/apache2-mod-wsgi/APKBUILD
index 9be36d92d2..4a320d6e65 100644
--- a/main/apache2-mod-wsgi/APKBUILD
+++ b/main/apache2-mod-wsgi/APKBUILD
@@ -2,8 +2,8 @@
# Maintainer: Matt Smith <mcs@darkregion.net>
pkgname=apache2-mod-wsgi
_realname=mod_wsgi
-pkgver=4.9.3
-pkgrel=0
+pkgver=4.9.4
+pkgrel=1
pkgdesc="Python WSGI Module for Apache2"
url="https://github.com/GrahamDumpleton/mod_wsgi"
arch="all"
@@ -33,6 +33,6 @@ package() {
}
sha512sums="
-75061bee9a7d6b787c822cf396ce5e8c2c51d616648e6795f1ba170a9d771817df365115f633d3112330d800151697974863f1a0242408c511a233434fc3e2ec apache2-mod-wsgi-4.9.3.tar.gz
+0898221d95f0ce374cbd34a1849a6e6b5bd7850644d5fe36f558dcc58095cd535c854cb06798482d312485b8d89b8641d91fa26af3d208e10a6073b885af3199 apache2-mod-wsgi-4.9.4.tar.gz
5b36a458bd3539e58ea61ec405c4f5c5e0001a644263b0e1f8421a5c7fc7884b6df1355674a9d9b610780b5e9db6ce66d0ae1bbc0e512ecb027c3757209152c8 apache2-mod-wsgi.apache2.conf
"
diff --git a/main/apcupsd/APKBUILD b/main/apcupsd/APKBUILD
index fda125aa29..d54f5af53e 100644
--- a/main/apcupsd/APKBUILD
+++ b/main/apcupsd/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apcupsd
pkgver=3.14.14
-pkgrel=2
+pkgrel=3
pkgdesc="A Daemon to control APC UPSes"
subpackages="$pkgname-doc $pkgname-webif $pkgname-openrc"
url="http://www.apcupsd.org"
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 582d65029c..78b7904f02 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=6
+pkgver=2.12.10
+pkgrel=1
pkgdesc="Alpine Package Keeper - package manager for alpine"
arch="all"
url="https://gitlab.alpinelinux.org/alpine/apk-tools"
@@ -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"
@@ -51,7 +52,7 @@ check() {
package() {
make DESTDIR="$pkgdir" LUA="$_lua" install
install -d "$pkgdir"/var/lib/apk \
- "$pkgdir"/var/cache/misc \
+ "$pkgdir"/lib/apk/exec \
"$pkgdir"/etc/apk/keys \
"$pkgdir"/etc/apk/protected_paths.d
@@ -86,6 +87,7 @@ luaapk() {
}
sha512sums="
-2e299e50c5ca8733f04fad971247146ff4bebb697c3589e4692c9a940ede89432dd9fea48004dc947cb493db1206a336ac0ad1e876b02683183d69b4a127d1c6 apk-tools-v2.12.9.tar.gz
+7be1a659e58ced1c2be3d058127391b92078a3560746149e1b53bf7b877ad5ded755e9a7cf2a68d8cdd49bfaf10afb7dfe361ef8ae9590aede8ce422c85ea389 apk-tools-v2.12.10.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/aports-build/APKBUILD b/main/aports-build/APKBUILD
index 7e9d595e70..67abeaaa6f 100644
--- a/main/aports-build/APKBUILD
+++ b/main/aports-build/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=aports-build
-pkgver=1.5.3
+pkgver=1.5.4
pkgrel=0
pkgdesc="MQTT based build-on-git-push scripts for Alpine Linux"
url="https://alpinelinux.org"
@@ -46,7 +46,9 @@ package() {
EOF
}
-sha512sums="81c039c6999fddde2489fccdc48b29760c80ea1ff5265cc2d7f73d6575e0173a0f51b89a4d49e5100e2d841b6260adc48e4ab00e8608d52b3b69b17a590467ad aports-build
+sha512sums="
+81c039c6999fddde2489fccdc48b29760c80ea1ff5265cc2d7f73d6575e0173a0f51b89a4d49e5100e2d841b6260adc48e4ab00e8608d52b3b69b17a590467ad aports-build
821035bda47152c341ec94bf960fa67e3377051826712ceb74f39103e6e422777b6e082231bfb87865653d2b93b7d3154cfc24abf65a52e3e66da69412dd7e41 aports-build.initd
62ed5cb6d1fef03fa707512c8c99c572a91e64706ebcc2e7097108811818615618bab908292d0ba0ad2afe93a27333d9c91deb347d6c99703eb8983d1ee5f480 mqtt-exec.aports-build.confd
-cf0d8e65e517857ee781e451a1d3e6404cd72aeb5c7dba25017229ff79c4c43425712d2fcbbaad89af45a358e86f33467ac1df47e8fba0f30f81d84794e1206c report-build-errors.lua"
+939ba54ab4159bc8fcd0cb08f16f67dac05d29c77005da6fca0463048ab991765665b35f2feb978bfd8409bd13fdbdf3d47a7652df842e76504d076ac040c337 report-build-errors.lua
+"
diff --git a/main/aports-build/report-build-errors.lua b/main/aports-build/report-build-errors.lua
index 275b213f86..3621765783 100644
--- a/main/aports-build/report-build-errors.lua
+++ b/main/aports-build/report-build-errors.lua
@@ -6,6 +6,26 @@ local f = io.open("/proc/sys/kernel/hostname")
hostname = f:read()
f:close()
+local function read_mosquitto_conf()
+ local cfg = {}
+ local f = io.open((os.getenv("XDG_CONFIG_HOME") or "").."/mosquitto_pub") or io.open((os.getenv("HOME") or "").."/.config/mosquitto_pub")
+ if f == nil then
+ return cfg
+ end
+ for line in f:lines() do
+ key,value = line:match("^%-%-([^ ]+)%s+(.*)")
+ if key and value then
+ cfg[key] = value
+ end
+ end
+ f:close()
+ return cfg
+end
+local mcfg = read_mosquitto_conf()
+publish.hostname = mcfg.hostname or "localhost"
+publish.username = mcfg.username
+publish.password = mcfg.pw
+
local m = {}
function shell_escape(args)
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/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/APKBUILD b/main/apparmor/APKBUILD
new file mode 100644
index 0000000000..fc06bea196
--- /dev/null
+++ b/main/apparmor/APKBUILD
@@ -0,0 +1,206 @@
+# Contributor: Allan Garret <allan.garret@gmail.com>
+# Maintainer: Allan Garret <allan.garret@gmail.com>
+pkgname=apparmor
+pkgver=3.1.2
+pkgrel=1
+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://launchpad.net/apparmor/${pkgver%.*}/$pkgver/+download/apparmor-$pkgver.tar.gz
+
+ apparmor.initd
+
+ 0001-Fix-linking-against-gettext-on-musl-libc.patch
+ 0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch
+ fix-dnsmasq-profile.patch
+ "
+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
+}
+
+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="
+e4fa8e0985472c00d3b68044f4150659787cf15b384b901af32b5aba3f0b2839f33bfe0b0675bf8ea7a1f5727152756a276c75b1dec383a33b92b0a1b8615a11 apparmor-3.1.2.tar.gz
+1a57cc577ba3aedfbe10ef6148c1e8f5d0bbf65c99e60eec80c52409c9dab59ae002024500c6e4fd0e01e8c7aeb0c85e3e6b41cacee08c17fdd869d31bca614e apparmor.initd
+e94f44427ed3c6f64462170939ffc92ce9ac1a58c61c7c7c3483fe16fe8e1c419daade9d56cdd342132e4d823dcac1963a86ad889f10bf71fd52b7f54c4694ed 0001-Fix-linking-against-gettext-on-musl-libc.patch
+38ebb30a0185f8eabd9103925959da365f64ef485f66ffb10180ac596fc172f9c98df39baec0b035138e9ab32056148e69a066faba9faebf9e92bf7a09c150c0 0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch
+cbe6eb9dd46e3ace122d5bc386596d5106a301b82a9ac1681f31a967013d3db67a8d674d54605444f30c3a136677ff3b26fad80f78d0f02dbe18a9f10f64672a fix-dnsmasq-profile.patch
+"
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/arm-trusted-firmware/APKBUILD b/main/arm-trusted-firmware/APKBUILD
index f8e3ed6691..3e05130070 100644
--- a/main/arm-trusted-firmware/APKBUILD
+++ b/main/arm-trusted-firmware/APKBUILD
@@ -3,44 +3,81 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=arm-trusted-firmware
pkgver=2.7.0
-pkgrel=1
+pkgrel=2
pkgdesc="ARM Trusted Firmware-A (TF-A)"
url="https://github.com/ARM-software/arm-trusted-firmware"
-arch="aarch64"
+# no lld on s390x, but it doesn't matter anyway as this is arm firmware
+arch="all !s390x"
license="BSD-3-Clause"
-makedepends="dtc"
-source="https://github.com/ARM-software/arm-trusted-firmware/archive/v$pkgver/arm-trusted-firmware-v$pkgver.tar.gz"
+makedepends="
+ clang
+ dtc
+ lld
+ llvm
+ openssl-dev
+ "
+subpackages="$pkgname-tools"
+source="https://github.com/ARM-software/arm-trusted-firmware/archive/v$pkgver/arm-trusted-firmware-v$pkgver.tar.gz
+ key_t.patch
+ rk3399.patch
+ "
options="!check" # No tests
_plats="
imx8mq
+ rk3328
+ rk3399
sun50i_a64
sun50i_h6
"
build() {
unset LDFLAGS
- for plat in $_plats; do
- local opts=""
+ if [ "$CARCH" = "aarch64" ]; then
+ for plat in $_plats; do
+ case "$plat" in
+ sun50i_a64)
+ local opts="SUNXI_SETUP_REGULATORS=0 SUNXI_AMEND_DTB=1"
+ ;;
+ esac
- case "$plat" in
- sun50i_a64)
- opts="SUNXI_SETUP_REGULATORS=0 SUNXI_AMEND_DTB=1"
- ;;
- esac
+ msg "Building ATF for $plat (opts='$opts')"
+ LDFLAGS="$LDFLAGS -no-warn-rwx-segment" make E=0 PLAT=$plat bl31 $opts
+ done
+ fi
- msg "Building ATF for $plat (opts='$opts')"
- make PLAT=$plat bl31 $opts
- done
+ make -C tools/fiptool
+ make -C tools/cert_create
}
package() {
- for plat in $_plats; do
- install -D "$builddir"/build/$plat/release/bl31.bin \
- "$pkgdir"/usr/share/$pkgname/$plat/bl31.bin
- done
+ install -d "$pkgdir"/usr/share/$pkgname
+ if [ "$CARCH" = "aarch64" ]; then
+ for plat in $_plats; do
+ case $plat in
+ rk33*)
+ local path="$builddir"/build/$plat/release/bl31/bl31.elf
+ ;;
+ *)
+ local path="$builddir"/build/$plat/release/bl31.bin
+ ;;
+ esac
+ install -D $path -t "$pkgdir"/usr/share/$pkgname/$plat/
+ done
+ fi
+ install -Dm755 -t "$pkgdir"/usr/bin tools/fiptool/fiptool
+ install -Dm755 -t "$pkgdir"/usr/bin tools/cert_create/cert_create
+}
+
+tools() {
+ pkgdesc="$pkgdesc (tools)"
+
+ amove usr/bin/fiptool
+ amove usr/bin/cert_create
}
sha512sums="
3e1e09bcc69a0f080f91b94d9c8da6dd0b27b86292599c280438d7b6f594017a896af7cfc58d9d22053f77b5daa2faecd51a59505c755eac8493e4e0fd1e9203 arm-trusted-firmware-v2.7.0.tar.gz
+f2ff9b6d2b843123e9044af5ead00a1e927e5389e5ab6bdb05ef0eb3a23468a615d6203e14afd05b3e250c9b39836d0d33920833f1211b51671ae5cd3e7e0da8 key_t.patch
+4b26d06cc5f23cd73515927624c164745dd144a0255a717052d80d904a58e001cb7b334ce1fa20cf21ba18b6e0f024da011321cb2c53dfb44ddd52ee24e31a66 rk3399.patch
"
diff --git a/main/arm-trusted-firmware/key_t.patch b/main/arm-trusted-firmware/key_t.patch
new file mode 100644
index 0000000000..af014e352f
--- /dev/null
+++ b/main/arm-trusted-firmware/key_t.patch
@@ -0,0 +1,13 @@
+without it /usr/include/bits/alltypes.h defines key_t as int
+
+--- a/tools/cert_create/Makefile
++++ b/tools/cert_create/Makefile
+@@ -43,7 +43,7 @@
+ include ${PLAT_CERT_CREATE_HELPER_MK}
+ endif
+
+-HOSTCCFLAGS := -Wall -std=c99
++HOSTCCFLAGS := -Wall -std=c99 -D__DEFINED_key_t=1
+
+ ifeq (${DEBUG},1)
+ HOSTCCFLAGS += -g -O0 -DDEBUG -DLOG_LEVEL=40
diff --git a/main/arm-trusted-firmware/rk3399.patch b/main/arm-trusted-firmware/rk3399.patch
new file mode 100644
index 0000000000..ffbb475507
--- /dev/null
+++ b/main/arm-trusted-firmware/rk3399.patch
@@ -0,0 +1,53 @@
+
+
+
+diff --git a/plat/rockchip/rk3399/drivers/m0/Makefile b/plat/rockchip/rk3399/drivers/m0/Makefile
+index 79e09f0..5ab6d28 100644
+--- a/plat/rockchip/rk3399/drivers/m0/Makefile
++++ b/plat/rockchip/rk3399/drivers/m0/Makefile
+@@ -33,16 +33,16 @@ C_SOURCES := src/dram.c \
+ C_SOURCES_PMU := src/suspend.c
+
+ # Flags definition
+-COMMON_FLAGS := -g -mcpu=$(ARCH) -mthumb -Wall -O3 -nostdlib -mfloat-abi=soft
++COMMON_FLAGS := -g -mcpu=$(ARCH) --target=arm-none-eabi -mthumb -Wall -O3 -nostdlib -mfloat-abi=soft
+ CFLAGS := -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-common
+ ASFLAGS := -Wa,--gdwarf-2
+ LDFLAGS := -Wl,--gc-sections -Wl,--build-id=none
+
+ # Cross tool
+-CC := ${M0_CROSS_COMPILE}gcc
++CC := clang
+ CPP := ${M0_CROSS_COMPILE}cpp
+ AR := ${M0_CROSS_COMPILE}ar
+-OC := ${M0_CROSS_COMPILE}objcopy
++OC := llvm-objcopy
+ OD := ${M0_CROSS_COMPILE}objdump
+ NM := ${M0_CROSS_COMPILE}nm
+
+
+Needed to stop linker errors with ldd:
+ld.lld: error: section .ARM.exidx virtual address range overlaps with .m0_bin
+489>>> .ARM.exidx range is [0x0, 0xF]
+490>>> .m0_bin range is [0x0, 0x267]
+491ld.lld: error: section .ARM.exidx load address range overlaps with .m0_bin
+492>>> .ARM.exidx range is [0x0, 0xF]
+493>>> .m0_bin range is [0x0, 0x267]
+494ld.lld: error: section .ARM.exidx virtual address range overlaps with .m0_bin
+495>>> .ARM.exidx range is [0x0, 0xF]
+496>>> .m0_bin range is [0x0, 0x347]
+497ld.lld: error: section .ARM.exidx load address range overlaps with .m0_bin
+498>>> .ARM.exidx range is [0x0, 0xF]
+499>>> .m0_bin range is [0x0, 0x347]
+
+diff --git a/plat/rockchip/rk3399/drivers/m0/src/rk3399m0.ld.S b/plat/rockchip/rk3399/drivers/m0/src/rk3399m0.ld.S
+index bfe054e..fedb012 100644
+--- a/plat/rockchip/rk3399/drivers/m0/src/rk3399m0.ld.S
++++ b/plat/rockchip/rk3399/drivers/m0/src/rk3399m0.ld.S
+@@ -22,5 +22,5 @@ SECTIONS {
+ *(.co_stack*)
+ }
+
+- /DISCARD/ : { *(.comment) *(.note*) }
++ /DISCARD/ : { *(.comment) *(.note*) *(.ARM.exidx) }
+ }
diff --git a/main/asciidoc/APKBUILD b/main/asciidoc/APKBUILD
index 328529f3e5..6b8c31bf97 100644
--- a/main/asciidoc/APKBUILD
+++ b/main/asciidoc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=asciidoc
pkgver=10.2.0
-pkgrel=0
+pkgrel=1
pkgdesc="Text based documentation"
url="https://asciidoc.org/"
arch="noarch"
diff --git a/main/asciidoctor/APKBUILD b/main/asciidoctor/APKBUILD
index 31e0e5f4ba..200f6b65e2 100644
--- a/main/asciidoctor/APKBUILD
+++ b/main/asciidoctor/APKBUILD
@@ -1,10 +1,10 @@
# Contributor: Seung Soo Mun <hamletmun@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=asciidoctor
-pkgver=2.0.17
-pkgrel=1
+pkgver=2.0.18
+pkgrel=0
pkgdesc="Converter for AsciiDoc to HTML5, DocBook 5 (or 4.5) and other formats"
-url="https://rubygems.org/gems/$pkgname"
+url="https://rubygems.org/gems/asciidoctor"
arch="noarch"
license="MIT"
options="!check"
@@ -34,5 +34,5 @@ package() {
}
sha512sums="
-41ebc833c7b8bded5704034c7fcf7d2f26643a24de24eda57db1a0ac94976e775bf0f093f46faaa99c5007c61af325aa5b02e5321159a88daac3397800adbd03 asciidoctor-2.0.17.gem
+522c0a587a95c7a5c5618f88832c11a547448d12b883ee9a7d9f6e8509b44e2c5c027cf23335790cbc5cd74dc297010141ac535c0ba45622e49eac8d70fe6127 asciidoctor-2.0.18.gem
"
diff --git a/main/aspell/APKBUILD b/main/aspell/APKBUILD
index 92cc7a92e3..5868dad884 100644
--- a/main/aspell/APKBUILD
+++ b/main/aspell/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
pkgname=aspell
pkgver=0.60.8
-pkgrel=1
+pkgrel=2
pkgdesc="A spell checker designed to eventually replace Ispell"
url="http://aspell.net/"
arch="all"
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 1642f028b4..1171c0879a 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.13.0
-pkgrel=1
+pkgver=18.15.0
+pkgrel=0
pkgdesc="Modular Open Source PBX System"
pkgusers="asterisk"
pkggroups="asterisk"
@@ -240,7 +240,7 @@ sound_en() {
}
sha512sums="
-085dfcf15f99d7d96b49a720156678c4de5a88b55375257a9a1234f9dd83f21eed1685d4177dae5978272608e690582367c6c34fdef91bbad54299594d0ce9df asterisk-18.13.0.tar.gz
+acf202246e149ddc44ffb688a834455420d6ab53989560568cdccf0da121821ee946c45085c964b52632e24109741908d3f4c00ca00d0b4a9402c128becd9e28 asterisk-18.15.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/atf/APKBUILD b/main/atf/APKBUILD
index f0d90dd3e5..e73eccf6d7 100644
--- a/main/atf/APKBUILD
+++ b/main/atf/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer:
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=atf
pkgver=0.21
-pkgrel=2
+pkgrel=4
pkgdesc="libraries to write tests in C, C++ and shell"
url="https://github.com/jmmv/atf"
arch="all"
@@ -16,7 +16,7 @@ prepare() {
}
build() {
- ./configure \
+ ATF_SHELL=/bin/sh ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
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/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/autoconf/APKBUILD b/main/autoconf/APKBUILD
index c7fc2f5121..5b5d31aa80 100644
--- a/main/autoconf/APKBUILD
+++ b/main/autoconf/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=autoconf
pkgver=2.71
-pkgrel=0
+pkgrel=2
pkgdesc="GNU tool for automatically configuring source code"
arch="noarch"
license="GPL-2.0-or-later"
@@ -9,7 +9,13 @@ url="https://www.gnu.org/software/autoconf"
depends="m4 perl"
subpackages="$pkgname-doc"
options="!check"
-source="https://ftp.gnu.org/gnu/autoconf/autoconf-$pkgver.tar.gz"
+source="https://ftp.gnu.org/gnu/autoconf/autoconf-$pkgver.tar.gz
+ $pkgname-make-4.4.patch::https://github.com/autotools-mirror/autoconf/commit/31f673434ee402258b45e958c88acc8725d82b1a.patch
+ $pkgname-bigendian-lto.patch::https://github.com/autotools-mirror/autoconf/commit/234fc6c86613ed3f366dd1d88996e4d5d85ee222.patch
+ $pkgname-lang-call-c::https://github.com/autotools-mirror/autoconf/commit/b27bc3e230bb12fdd9a813e38e82bc4c3e22b4cc.patch
+ $pkgname-kr-decl::https://github.com/autotools-mirror/autoconf/commit/8b5e2016c7ed2d67f31b03a3d2e361858ff5299b.patch
+ $pkgname-autom4te-time-hires.patch::https://github.com/autotools-mirror/autoconf/commit/3a9802d60156809c139e9b4620bf04917e143ee2.patch
+ "
build() {
M4=/usr/bin/m4 ./configure \
@@ -30,4 +36,11 @@ package() {
rm -f "$pkgdir"/usr/share/info/standards.info
}
-sha512sums="2bc5331f9807da8754b2ee623a30299cc0d103d6f98068a4c22263aab67ff148b7ad3a1646bd274e604bc08a8ef0ac2601e6422e641ad0cfab2222d60a58c5a8 autoconf-2.71.tar.gz"
+sha512sums="
+2bc5331f9807da8754b2ee623a30299cc0d103d6f98068a4c22263aab67ff148b7ad3a1646bd274e604bc08a8ef0ac2601e6422e641ad0cfab2222d60a58c5a8 autoconf-2.71.tar.gz
+2d1aa08dbb0e896625e36f4aa20153c1ed29dd395f5f680122983a06a484722ad299aade28beefcb431eada9a9f4af8ac13b9627209245d5870d31769bc016eb autoconf-make-4.4.patch
+a6397aaba4e24ab8a527aa26abeee6a047c86257c7317f933de9f3f35217fbac8eca8ee9774ddc7b6706c3d61e7690a408eb87dafc12989802951620241c7faf autoconf-bigendian-lto.patch
+446ecc39a933d6c1dcdfe99986b1610c46d53b68cda16f6383fd5b0cee5cfc7d924ef5d81d90978100889e492a204423e8279bae1e70e7a55ece5b995cb346c9 autoconf-lang-call-c
+aa613927bffc48b95f7aa9d5977b2c2aa2bf550c64fde88ff2b9447b84bc35cd8fbe80ba3f26f98df948f31ade2587c2be37a5c830ebc6347fa3760f7b6296ae autoconf-kr-decl
+049fb92dc661560b731c5e1d993da8848e34cf81b930816b9e4a7f3c04c99b1151fc8e858f75d6fb1ce965b6eac71d2e9e76368a8499bbfd2ef06ea55032eb32 autoconf-autom4te-time-hires.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..80c125a605 100644
--- a/main/awall/APKBUILD
+++ b/main/awall/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
pkgname=awall
-pkgver=1.12.0
+pkgver=1.12.1
pkgrel=0
pkgdesc="Alpine Wall"
url="https://gitlab.alpinelinux.org/alpine/awall"
@@ -51,7 +51,7 @@ policies() {
}
sha512sums="
-1e5b2bb3a64229c79959bd44dfa02c3b6230135eb0368bdc83ee5f0ce97ff9c02259442a3e8f9ae4eb62aaab97186537de15e5a548c720c7bed1aac8ecf30aa2 awall-v1.12.0.tar.bz2
+c01494268ad02843262a10aa5e183b52970a4ac75af20f7c394092030c0931af08916d10d923b9795ea1ad800348a6db1bb050b81f82fb865e1a103634a12429 awall-v1.12.1.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/awstats/APKBUILD b/main/awstats/APKBUILD
index f7270f008c..44ad31c466 100644
--- a/main/awstats/APKBUILD
+++ b/main/awstats/APKBUILD
@@ -2,9 +2,9 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=awstats
pkgver=7.8
-pkgrel=1
+pkgrel=2
pkgdesc="Free real-time logfile analyzer to get advanced statistics"
-url="http://awstats.sourceforge.net/"
+url="https://awstats.sourceforge.net/"
arch="noarch"
license="GPL-3.0-or-later"
depends="perl perl-uri"
diff --git a/main/b43-fwcutter/APKBUILD b/main/b43-fwcutter/APKBUILD
index 07cca21a00..f2ea4bd775 100644
--- a/main/b43-fwcutter/APKBUILD
+++ b/main/b43-fwcutter/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=b43-fwcutter
pkgver=019
-pkgrel=1
+pkgrel=2
pkgdesc="Tool to extract firmware from Broadcom drivers"
url="https://wireless.wiki.kernel.org/en/users/Drivers/b43"
arch="all"
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index e72777775b..fd56547bd3 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -1,10 +1,10 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=bacula
-pkgver=13.0.0
-pkgrel=1
+pkgver=13.0.1
+pkgrel=0
pkgdesc="Enterprise ready, network based backup program"
-url="https://www.bacula.org"
+url="https://www.bacula.org/"
arch="all"
license="AGPL-3.0-or-later WITH OpenSSL-Exception"
makedepends="autoconf automake libtool mariadb-connector-c-dev ncurses-dev openssl-dev>3 libpq-dev
@@ -157,7 +157,7 @@ client() {
}
sha512sums="
-4049771f0a0a6c9302d73bd9870c0508d339e919077ac7cfabd4df83a24bb734dcaa8b1c655fb2ad44b04ce616cd566c2ff6dbb7567ae5904efb255ad2b7c0be bacula-13.0.0.tar.gz
+fd10857d12bb637b9f6e51a03888d8cc93604ba1e793f888304f3c115d48800d7f0d69e30a843355c6760ff8e9b5481c174a24ace1c2adc106cf4ec73646b426 bacula-13.0.1.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..f46f08a1f2 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.9
_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,16 @@ dev() {
}
sha512sums="
-c44a0ce381469219548a3a27589af3fea4f22eda1ca4e9434b59fc16da81b471c29ce18e31590e0860a6a251a664b68c2b45e3a17d22cfc02799ffd9a208390c bash-5.1.tar.gz
-4542e19f2c6c31fff1f412379d5e36c65767cf2d91f1311e8d43f2566e2e50ab8dddff6045aec9b0272ed7387aa9b35daf6b0844478c0bda94d961efcf6f3ae3 bashrc
+5647636223ba336bf33e0c65e516d8ebcf6932de8b44f37bc468eedb87579c628ad44213f78534beb10f47aebb9c6fa670cb0bed3b4e7717e5faf7e9a1ef81ae bash-5.2.tar.gz
+3e0ea7dd94ee4bf2967bb0b6c565df4f7f230afe76a69952e881802268db1ab2474d43c2f14441a956b6645b0ee0d524fdd107d28e56ae870bfbb1a6cba22eef 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
+d1e5d508a4a1888052434adff551732c4215372174adb19dce9514faa18c78ee690e1c0fd9858e15c76fbb910ccace7e62751c3c266f5db253dbffda8c882409 bash52-001
+2484262d6cb32303c761793af2c352062421054149fcf3f591a590e409bb21985683a1e50669547e396eea46f1081ae0821076c3975357dc6c850f94cdd527c1 bash52-002
+c8dac54c8b1805dc756efd06be3092a4de1c45bc1e97b574ca49bf4152515a545d154a84c1d9a82747c79d676b8330254856380bc929d8e835b10af743d66cbb bash52-003
+64bab53225ab2f0b974988c9b1ad5d2d2bb256ce384bb9d4646d1e75411a8eefc7ce2a7ee470345bff276e71147e9b5149a5d9b25bd5308f7bad77b8f68b5c84 bash52-004
+9971ebef50d2a776226d68dbb11feaac85522f66824a0e54faa97b0a14cc242eb8daae2c4364ec59cea5413824be7cbc149c02d1452f211588c505f030b13ee0 bash52-005
+aa46d8a5523374a269ea3d1b4b75ae4e3d918ef4f6d89331bed5da24505bcfac321864071f29161e56487c611d35fe1351c2a2ea226ccaeecef55d01a5a5f2c7 bash52-006
+a2f5ce78c651ec220852989a8b2325d0f1a3739f6494796124324e5883290f74b7e360f91d540c339e1ca3030e54b91301241bb481e965f9fdf915d5fd5accd1 bash52-007
+1f317f3c2313ede7b67c4e396dfad453787f4a30ff77fc53aae482c7dbb752f60c1f33cb414dcc3055a55b77c8c80aeda9626e5b066a79af8a082c6e056340e2 bash52-008
+71fffb71e5876e7abea7e769f4438f2f8d3843d7dfec13f1ba7e79ead5b001d7543c92eb3a628b393f8652bf136e4768c1d1c7b55c155cafe83886b900396e68 bash52-009
"
diff --git a/main/bash/bashrc b/main/bash/bashrc
index b851cf50b0..0afb7fb7d4 100644
--- a/main/bash/bashrc
+++ b/main/bash/bashrc
@@ -6,6 +6,11 @@ if [[ $- != *i* ]] ; then
return
fi
+# set fallback PS1; only if currently set to upstream bash default
+if [ "$PS1" = '\s-\v\$ ' ]; then
+ PS1='\h:\w\$ '
+fi
+
if [ -d /etc/profile.d/ ]; then
for f in /etc/profile.d/*.sh; do
[ -r "$f" ] && . "$f"
diff --git a/main/batctl/APKBUILD b/main/batctl/APKBUILD
index 8c52d16a38..de7662bf40 100644
--- a/main/batctl/APKBUILD
+++ b/main/batctl/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=batctl
-pkgver=2022.1
+pkgver=2022.3
pkgrel=0
pkgdesc="B.A.T.M.A.N. advanced control and management tool"
url="https://www.open-mesh.org/"
@@ -21,5 +21,5 @@ package() {
}
sha512sums="
-4e268b5ec7cb07fed08b8688e10c603b788ccbe3cc3c84e536ba27cf2e54e306b49d86a9f9c657627c673a48029834d0454db53c0fa46d7fad5e2095823828f5 batctl-2022.1.tar.gz
+8768e8166845b2ecebd419de36015c27badb68036d76b06233a935d9fe8ab781cbb6fe6127c2b5fff5cf96b99b56b0e21cca0dd525feb13bbaa5094248385f52 batctl-2022.3.tar.gz
"
diff --git a/main/bats/APKBUILD b/main/bats/APKBUILD
index 94132766fd..46818e2907 100644
--- a/main/bats/APKBUILD
+++ b/main/bats/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Jose-Luis Rivas <ghostbar@riseup.net>
pkgname=bats
-pkgver=1.7.0
+pkgver=1.8.2
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="
-557ba2984a21c02ce5d9d819839866390b190905bb87298e3117e4b41484f5eba8b4f471062d7b647b65f750cc1c774db5d7d33d35a47fe163a7d9e54c591e12 bats-1.7.0.zip
+923de33ae5e38e2943181b1521f28d5884f6801e077f40e72f55e28c31472747366f371e4269632a4c7a66576818814080d9d622f87f3c3349ff76f7c639ea31 bats-1.8.2.zip
"
diff --git a/main/bcache-tools/APKBUILD b/main/bcache-tools/APKBUILD
index d7bf07f508..0de5c5904c 100644
--- a/main/bcache-tools/APKBUILD
+++ b/main/bcache-tools/APKBUILD
@@ -1,13 +1,13 @@
# Maintainer:
pkgname=bcache-tools
pkgver=1.1
-pkgrel=0
+pkgrel=1
pkgdesc="tools for managing bcache"
url="https://bcache.evilpiepirate.org/"
arch="all"
license="GPL-2.0-only"
makedepends="eudev-dev util-linux-dev linux-headers coreutils"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-dbg $pkgname-doc"
source="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/snapshot/bcache-tools-$pkgver.tar.gz"
build() {
@@ -22,4 +22,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4ccbef47255bf3644a50242a79951b1f3720e71a55eb1e07dc6b8486df0245da99a77bba751b50197d489b4c5d738e5284aabc014c2f7f44816ddf6a1bb807ca bcache-tools-1.1.tar.gz"
+sha512sums="
+4ccbef47255bf3644a50242a79951b1f3720e71a55eb1e07dc6b8486df0245da99a77bba751b50197d489b4c5d738e5284aabc014c2f7f44816ddf6a1bb807ca bcache-tools-1.1.tar.gz
+"
diff --git a/main/bctoolbox/APKBUILD b/main/bctoolbox/APKBUILD
index 7f3693937c..6096694f89 100644
--- a/main/bctoolbox/APKBUILD
+++ b/main/bctoolbox/APKBUILD
@@ -1,19 +1,19 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=bctoolbox
-pkgver=5.1.55
+pkgver=5.1.64
pkgrel=0
pkgdesc="Utilities library used by Belledonne Communications softwares like belle-sip, mediastreamer2 and linphone"
url="https://github.com/BelledonneCommunications/bctoolbox"
arch="all"
license="GPL-2.0-or-later"
options="!check" # bcunit not available
-makedepends="cmake mbedtls-dev"
+makedepends="cmake mbedtls-dev samurai"
subpackages="$pkgname-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/BelledonneCommunications/bctoolbox/archive/$pkgver.tar.gz"
build() {
- cmake \
+ cmake -B build -G Ninja \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_MODULE_PATH=/usr/lib/cmake \
@@ -23,16 +23,16 @@ build() {
-DENABLE_POLARSSL=NO \
-DENABLE_STATIC=NO \
-DENABLE_TESTS_COMPONENT=OFF \
- -DENABLE_SHARED=YES .
- make
+ -DENABLE_SHARED=YES
+ cmake --build build
}
check() {
- make check
+ ctest --test-dir build --output-on-failure
}
package() {
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" cmake --install build
}
dev() {
@@ -40,11 +40,9 @@ dev() {
mkdir -p "$subpkgdir"/usr/lib/cmake/bctoolbox
mv "$pkgdir"/usr/share/bctoolbox/cmake/* "$subpkgdir"/usr/lib/cmake/bctoolbox
# Remove empty dirs
- rmdir "$pkgdir"/usr/share/bctoolbox/cmake
- rmdir "$pkgdir"/usr/share/bctoolbox
- rmdir "$pkgdir"/usr/share
+ rmdir -p "$pkgdir"/usr/share/bctoolbox/cmake || true
}
sha512sums="
-8dc47d8094f2ce0152b4acce7d320c62196abd6d96f87e7006cd8c67042f1640e4c45618d3e18edfa3b081a991a7d0b43409e20bae965472e7c65299d537258a bctoolbox-5.1.55.tar.gz
+2f1b4600ec7463cf2b858b620859e4a413503edb038911ec1e6068efc8497bc8e93c3f05cc65f479c64128743a15ddeb3f2cbd55b036ddea5631b8f7cd96e832 bctoolbox-5.1.64.tar.gz
"
diff --git a/main/bdftopcf/APKBUILD b/main/bdftopcf/APKBUILD
index 0b54eb32c3..dc4a3c9501 100644
--- a/main/bdftopcf/APKBUILD
+++ b/main/bdftopcf/APKBUILD
@@ -1,15 +1,15 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bdftopcf
-pkgver=1.1
-pkgrel=1
+pkgver=1.1.1
+pkgrel=0
pkgdesc="X.Org font utility"
url="http://xorg.freedesktop.org"
arch="all"
license="MIT"
options="!check" # No test suite.
-makedepends="libxfont-dev util-macros"
+makedepends="libxfont-dev util-macros xorgproto"
subpackages="$pkgname-doc"
-source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/util/$pkgname-$pkgver.tar.xz"
build() {
./configure \
@@ -26,4 +26,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec bdftopcf-1.1.tar.bz2"
+sha512sums="
+257dc9ae29f2cf1496aad91ccba534348d87f881d75431aa6611a8154cb817d17588c464ab6c6c6bc51e6060baa8dcfcb9fd8c037cdaea8d18287651fa6b7ea9 bdftopcf-1.1.1.tar.xz
+"
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index f8bbf37a04..29b41bb4b4 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -5,7 +5,7 @@
# Contributor: ungleich <alpinelinux@ungleich.ch>
# Maintainer:
pkgname=bind
-pkgver=9.18.5
+pkgver=9.18.9
_ver=${pkgver%_p*}
_p=${pkgver#*_p}
_major=${pkgver%%.*}
@@ -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="
-41149e2a225125af0923ac597a31975b0a09eba64c0c4fe2ac6e6d6ae54ef8a72ff95db44d3b516af965871b6bde1b5e20489dd483c120e6f938744f56ab39c3 bind-9.18.5.tar.xz
+7d9bca47e29e8634416ab52819d78ce4ec6196c0dcbd9fe95a24687337f71c69b6472cf20bf49ea0ae1751a861944f354f9122acfb01780f51278ad4a3fdd817 bind-9.18.9.tar.xz
3d1d3e954aaee5e125f6b6f3cb660b51fc91d803df4cad43c47dbe97f19789cef20b5ca2834624668f0d761a5b81ac72db8959745d6eb293ca1154a1b390a007 named.initd
127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf named.confd
d2f61d02d7829af51faf14fbe2bafe8bc90087e6b6697c6275a269ebbddcaa14a234fff5c41da793e945e8ff1de3de0858a40334e0d24289eab98df4bb721ac5 named.conf.authoritative
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index 01a4003ccd..ea00dbe7ec 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=binutils
pkgver=2.39
-pkgrel=1
+pkgrel=2
pkgdesc="Tools necessary to build programs"
url="https://www.gnu.org/software/binutils/"
makedepends_build="bison flex texinfo"
@@ -17,6 +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
+ CVE-2022-38533.patch
"
builddir="$srcdir/$pkgname-$pkgver"
@@ -31,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:
@@ -140,4 +145,5 @@ f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488
314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d ld-bfd-mips.patch
70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f binutils-mips-disable-assert.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/bluez-firmware/APKBUILD b/main/bluez-firmware/APKBUILD
index e13d3d2c33..ba7d842c61 100644
--- a/main/bluez-firmware/APKBUILD
+++ b/main/bluez-firmware/APKBUILD
@@ -6,7 +6,7 @@ pkgdesc="Firmware for Broadcom BCM203x Blutonium devices"
url="http://www.bluez.org/"
arch="all"
license="GPL-2.0-or-later"
-source="http://bluez.sf.net/download/bluez-firmware-$pkgver.tar.gz"
+source="https://bluez.sourceforge.net/download/bluez-firmware-$pkgver.tar.gz"
build() {
./configure \
diff --git a/main/bluez-headers/APKBUILD b/main/bluez-headers/APKBUILD
new file mode 100644
index 0000000000..c15d62d5ad
--- /dev/null
+++ b/main/bluez-headers/APKBUILD
@@ -0,0 +1,35 @@
+# Maintainer: psykose <alice@ayaya.dev>
+pkgname=bluez-headers
+pkgver=5.66
+pkgrel=0
+pkgdesc="Bluez development headers"
+url="http://www.bluez.org/"
+arch="noarch"
+license="GPL-2.0-or-later"
+depends="!bluez-dev"
+source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz"
+builddir="$srcdir/bluez-$pkgver"
+options="!check" # just headers
+
+package() {
+ local headers="
+ bluetooth
+ bnep
+ cmtp
+ hci
+ hci_lib
+ hidp
+ l2cap
+ rfcomm
+ sco
+ sdp
+ sdp_lib
+ "
+ for header in $headers; do
+ install -Dm644 ./lib/$header.h -t "$pkgdir"/usr/include/bluetooth
+ done
+}
+
+sha512sums="
+ed0994932687eacf27207867366671b323671f5d5199daf36ea5eff8f254f2bc99ef989ef7df9883b35c06f2af60452be8bad0a06109428a4717cf2b247b4865 bluez-5.66.tar.xz
+"
diff --git a/main/bluez/004-Move-the-43xx-firmware-into-lib-firmware.patch b/main/bluez/004-Move-the-43xx-firmware-into-lib-firmware.patch
index 80b052d5b7..67410c76f6 100644
--- a/main/bluez/004-Move-the-43xx-firmware-into-lib-firmware.patch
+++ b/main/bluez/004-Move-the-43xx-firmware-into-lib-firmware.patch
@@ -1,20 +1,13 @@
-From 76681284b0ea49852041fdb97a35175089a08781 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Tue, 23 Feb 2016 17:52:29 +0000
-Subject: [PATCH 4/4] Move the 43xx firmware into /lib/firmware
-
----
- tools/hciattach_bcm43xx.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/tools/hciattach_bcm43xx.c
-+++ b/tools/hciattach_bcm43xx.c
-@@ -43,7 +43,7 @@
- #include "hciattach.h"
+diff --git a/tools/hciattach.h b/tools/hciattach.h
+index dfa4c1e..c21dbda 100644
+--- a/tools/hciattach.h
++++ b/tools/hciattach.h
+@@ -41,7 +41,7 @@
+ #define HCI_UART_VND_DETECT 5
#ifndef FIRMWARE_DIR
-#define FIRMWARE_DIR "/etc/firmware"
-+#define FIRMWARE_DIR "/lib/firmware/brcm"
++#define FIRMWARE_DIR "/lib/firmware"
#endif
- #define FW_EXT ".hcd"
+ int read_hci_event(int fd, unsigned char *buf, int size);
diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD
index 3f90d683c0..0dea945792 100644
--- a/main/bluez/APKBUILD
+++ b/main/bluez/APKBUILD
@@ -1,18 +1,30 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bluez
-pkgver=5.65
-pkgrel=0
+pkgver=5.66
+pkgrel=1
pkgdesc="Tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
arch="all"
license="GPL-2.0-or-later"
depends="dbus"
replaces="udev"
-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"
+makedepends="
+ autoconf
+ automake
+ dbus-dev
+ ell-dev
+ eudev-dev
+ glib-dev
+ json-c-dev
+ libical-dev
+ libtool
+ linux-headers
+ py3-docutils
+ readline-dev
+ "
subpackages="
+ $pkgname-dbg
$pkgname-dev
$pkgname-doc
$pkgname-libs
@@ -41,16 +53,10 @@ source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz
005-hostname-Use-phone-class-for-handhelds.patch
disable-lock-test.patch
fix-endianness.patch
- musl.patch
test-mesh-crypto.patch
- fix-musl.patch
+ max-input.patch
"
-case "$CARCH" in
- # crypto tests assume little-endian
- mips*) options="!check";;
-esac
-
# secfixes:
# 5.54-r0:
# - CVE-2020-0556
@@ -187,7 +193,7 @@ openrc() {
}
sha512sums="
-c20c09a1a75053c77d73b3ce15ac7fd321eb6df5ca1646d57c6848b87c0c9957908bc17dd928da4ef2aacfc8667877cbc7511c1ba43db839bfa9bf1fb8269907 bluez-5.65.tar.xz
+ed0994932687eacf27207867366671b323671f5d5199daf36ea5eff8f254f2bc99ef989ef7df9883b35c06f2af60452be8bad0a06109428a4717cf2b247b4865 bluez-5.66.tar.xz
e1d64fac673cceb657684b1bc5c36ff6d05f7cc5832d940863129adacd5b8ade1315b14df039a61f061950ac99e155266530efe2d2d35ea3c145b0469698a726 bluetooth.initd
8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd
a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd
@@ -196,11 +202,10 @@ d6766a4992ed4141569d6d82a802a771a5cb4c08873bfb0fdbedeea4d738bf9b56d9e0452ec19b76
73202915fda01d420b2864da77b1c25af5a55c815e9be6546400a0940bfb6097d83322790bc22a80ec0fcd557144fdd1877e243a79285a7f040ff96ba3600b94 001-bcm43xx-Add-bcm43xx-3wire-variant.patch
d5fd1c962bd846eaa6fff879bab85f753eb367d514f82d133b5d3242e1da989af5eddd942c60a87d5b67783e060f91bfa0f74fb1e8e6699cdee6e5bbe6a431ea 002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
784e9644c8de4e2693e2eeed988a245608b8cb14e1fc0dff8795c60c527b2e8d0c87862cfbfd6b850b47ae80cdf993a5ed3f477078ea1068fd7374899c7a1a77 003-Increase-firmware-load-timeout-to-30s.patch
-42ac04044a8c66e07487598b3a75ef52efc32999ebce4e7c63f6198e2f603f4a1442e74600e43a0938cb4f52d4db0298aa99050b18144b84990cda71748e9de5 004-Move-the-43xx-firmware-into-lib-firmware.patch
+6d864d893aaf08d7a04f5cb27a6b2767c361cd41e479f27ed84d9fbbd2677298c15e31161a614af098df8faf3da54b71cf315fe8e9a9a2f671e4720c7b8b457b 004-Move-the-43xx-firmware-into-lib-firmware.patch
ac635f9bca0e983835940572eb1b96ad70cf60fb84d5b0fde38c76ea6d1b13ef7d9adf81468b9fed779c890ab69dd5dfabf21970bff018466115c424668b82fb 005-hostname-Use-phone-class-for-handhelds.patch
04c4889372c8e790bb338dde7ffa76dc32fcf7370025c71b9184fcf17fd01ade4a6613d84d648303af3bbc54043ad489f29fc0cd4679ec8c9029dcb846d7e026 disable-lock-test.patch
93ef2fe4e72cfa50d577adbae8de7449d3d070ab00d888bcc378d8a1783191130bf555f63cea781595701a5ef8b34355feae276423b10b1e22e2e43d10e09eac fix-endianness.patch
-641e425333d269833eed624edec0e29cba04bb0ff6570f6afda178a164fc2bb77456fa88957fe49f36000d3601ac00bb7ba089400977c1577e9c226e74baa3d6 musl.patch
9c57bb1abf1b4927441a2a25c3c2599b0da82850e6b945d09e824e25be7c7efa99e54999cf5b799a1093303202badf08833cc4ccb36203901dfa516031ea8eb0 test-mesh-crypto.patch
-2e92639512c11e69d3c47e222a012b4f58fa7727d18b3639130e8fe91654773b1205ddbe650efe49a26ec41a64d39ddba2806503272e09252c51d194e3ced33d fix-musl.patch
+3095bdb41cdf8dc2290f41d89ef56a2781569d50f19589c808512c6772ec43433ed0298c826a27ba9dbc9434b0ba136b0d389a9569e5df169aacbc8032e40c00 max-input.patch
"
diff --git a/main/bluez/fix-musl.patch b/main/bluez/fix-musl.patch
deleted file mode 100644
index 436fc5d2bf..0000000000
--- a/main/bluez/fix-musl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tools/mesh-cfgtest.c b/tools/mesh-cfgtest.c
-index fa0474f..9b68314 100644
---- a/tools/mesh-cfgtest.c
-+++ b/tools/mesh-cfgtest.c
-@@ -26,6 +26,7 @@
- #include <time.h>
- #include <unistd.h>
- #include <sys/stat.h>
-+#include <limits.h> /* PATH_MAX */
-
- #include <ell/ell.h>
-
diff --git a/main/bluez/max-input.patch b/main/bluez/max-input.patch
new file mode 100644
index 0000000000..887befef7d
--- /dev/null
+++ b/main/bluez/max-input.patch
@@ -0,0 +1,13 @@
+diff --git a/src/shared/util.c b/src/shared/util.c
+index 0a0308c..a2b8c23 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -65,7 +65,7 @@ void *util_memdup(const void *src, size_t size)
+ void util_debug_va(util_debug_func_t function, void *user_data,
+ const char *format, va_list va)
+ {
+- char str[MAX_INPUT];
++ char str[_POSIX_MAX_INPUT];
+
+ if (!function || !format)
+ return;
diff --git a/main/bluez/musl.patch b/main/bluez/musl.patch
deleted file mode 100644
index cd8f08568f..0000000000
--- a/main/bluez/musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mesh/net.h b/mesh/net.h
-index 150240f..a3dec2b 100644
---- a/mesh/net.h
-+++ b/mesh/net.h
-@@ -21,6 +21,8 @@
- #define __packed __attribute__((packed))
- #endif
-
-+#include <sys/time.h> /* for timeval */
-+
- struct mesh_io;
- struct mesh_node;
-
diff --git a/main/bmd-tools/APKBUILD b/main/bmd-tools/APKBUILD
index 482eb62e9a..d2a750428f 100644
--- a/main/bmd-tools/APKBUILD
+++ b/main/bmd-tools/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=bmd-tools
pkgver=1.0.2
-pkgrel=2
+pkgrel=3
pkgdesc="Tools for Blackmagic USB video encoders"
url="https://github.com/fabled/bmd-tools"
arch="all"
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/APKBUILD b/main/boost1.79/APKBUILD
deleted file mode 100644
index d3798166a7..0000000000
--- a/main/boost1.79/APKBUILD
+++ /dev/null
@@ -1,194 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=boost1.79
-pkgver=1.79.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
- boost-1.79.0-fix-segfault-in-array-erase.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() {
- # Claim the unversioned name, this must be removed once we switch our
- # boost to a new version. Replace previous boost version for clean -dev
- # upgrade
- default_dev
- replaces="boost1.78-dev"
-}
-
-_pyversion() {
- "$1" -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))'
-}
-
-sha512sums="
-70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312 boost_1_79_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
-17db69e7b41665b2fae5630aa5edf15f0b8d00aa04e8597b198eb4f530793e8227d0234ceb9c8a9859fac3a4ceb5b9eb51721329b91497a422d4ff579739b964 boost-1.79.0-fix-segfault-in-array-erase.patch
-"
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.80/APKBUILD b/main/boost1.80/APKBUILD
index 32e72f9305..e0deb74783 100644
--- a/main/boost1.80/APKBUILD
+++ b/main/boost1.80/APKBUILD
@@ -2,7 +2,7 @@
pkgname=boost1.80
pkgver=1.80.0
_pkgver="${pkgver//./_}"
-pkgrel=0
+pkgrel=4
pkgdesc="Free peer-reviewed portable C++ source libraries"
url="https://www.boost.org/"
arch="all"
@@ -17,13 +17,17 @@ subpackages="
boost-dev:_dev
"
source="https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/boost_$_pkgver.tar.bz2
+ aligned-alloc.patch
+ boost-python-311.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.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"
+options="!check" # some tests fail now, figure it out later
_enginedir="tools/build/src/engine"
_bjam="$builddir"/$_enginedir/b2
@@ -224,9 +228,12 @@ _pyversion() {
sha512sums="
829a95b463473d69ff79ea41799c68429bb79d3b2321fbdb71df079af237ab01de9ad7e9612d8783d925730acada010068d2d1aa856c34244ee5c0ece16f208f boost_1_80_0.tar.bz2
+6254b4cc92d091aef9e8fdea375c0779f47bc3ea7965f6d93cab8bf76d2a502d9593d860228d2313ea133ee4f7935c4813d39df4bcb29bdf380628474ce4dcd6 aligned-alloc.patch
+085cf0424f4737bdfab246ac97a6d804aa06239c733bfe499d60b7b4a1550fd62171d3d9564e38f88d915153fc7a84b08564e2c358034abbceaac2651d518675 boost-python-311.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
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.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-python-311.patch b/main/boost1.80/boost-python-311.patch
new file mode 100644
index 0000000000..4fb57eeeb0
--- /dev/null
+++ b/main/boost1.80/boost-python-311.patch
@@ -0,0 +1,36 @@
+Patch-Source: https://github.com/boostorg/python/commit/a218babc8daee904a83f550fb66e5cb3f1cb3013
+From a218babc8daee904a83f550fb66e5cb3f1cb3013 Mon Sep 17 00:00:00 2001
+From: Victor Stinner <vstinner@python.org>
+Date: Mon, 25 Apr 2022 10:51:46 +0200
+Subject: [PATCH] Fix enum_type_object type on Python 3.11
+
+The enum_type_object type inherits from PyLong_Type which is not tracked
+by the GC. Instances doesn't have to be tracked by the GC: remove the
+Py_TPFLAGS_HAVE_GC flag.
+
+The Python C API documentation says:
+
+ "To create a container type, the tp_flags field of the type object
+ must include the Py_TPFLAGS_HAVE_GC and provide an implementation of
+ the tp_traverse handler."
+
+https://docs.python.org/dev/c-api/gcsupport.html
+
+The new exception was introduced in Python 3.11 by:
+https://github.com/python/cpython/issues/88429
+---
+ src/object/enum.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/object/enum.cpp b/src/object/enum.cpp
+index 293e705899..5753b32e07 100644
+--- a/libs/python/src/object/enum.cpp
++++ b/libs/python/src/object/enum.cpp
+@@ -113,7 +113,6 @@ static PyTypeObject enum_type_object = {
+ #if PY_VERSION_HEX < 0x03000000
+ | Py_TPFLAGS_CHECKTYPES
+ #endif
+- | Py_TPFLAGS_HAVE_GC
+ | Py_TPFLAGS_BASETYPE, /* tp_flags */
+ 0, /* tp_doc */
+ 0, /* tp_traverse */
diff --git a/main/botan/APKBUILD b/main/botan/APKBUILD
index 2786b3b25c..bcb2a46310 100644
--- a/main/botan/APKBUILD
+++ b/main/botan/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: tcely <tcely@users.noreply.github.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=botan
-pkgver=2.19.2
-pkgrel=1
+pkgver=2.19.3
+pkgrel=0
pkgdesc="Crypto and TLS for C++11"
url="https://botan.randombit.net/"
arch="all"
@@ -59,5 +59,5 @@ package() {
}
sha512sums="
-52b9c80a240457e46a299480338472f7d0c0b56df7b1709fdef52c5be3afca5b474fe143801c9a332ae884eaf033e60461c9d3e0b2f7b069f4fe8b4c45932abf Botan-2.19.2.tar.xz
+80012397e2aa7cc88a9536340ac9b770d1195fddda53b9d4cfde82318dd05f9d4f925bbdff773aba99883a701f4d30581e9d5c97e915fa80c3ca2acfa5a92110 Botan-2.19.3.tar.xz
"
diff --git a/main/bridge-utils/APKBUILD b/main/bridge-utils/APKBUILD
index 79de768e86..8e9515cfe2 100644
--- a/main/bridge-utils/APKBUILD
+++ b/main/bridge-utils/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bridge-utils
pkgver=1.7.1
-pkgrel=0
+pkgrel=1
pkgdesc="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
url="https://wiki.linuxfoundation.org/networking/bridge/"
arch="all"
diff --git a/main/brotli/APKBUILD b/main/brotli/APKBUILD
index 53f6a763ef..b00a7c0479 100644
--- a/main/brotli/APKBUILD
+++ b/main/brotli/APKBUILD
@@ -2,18 +2,25 @@
# Maintainer: prspkt <prspkt@protonmail.com>
pkgname=brotli
pkgver=1.0.9
-pkgrel=7
+pkgrel=10
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-static
+ $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 +31,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 +38,26 @@ 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 \
+ $_cross_configure
+
make
+
+ if [ -z "$BOOTSTRAP" ]; then
+ python3 setup.py build
+ fi
}
check() {
@@ -53,15 +70,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 3c9015ea97..11dc18b520 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.19
+pkgver=6.0.2
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 \
@@ -86,5 +81,5 @@ extra() {
}
sha512sums="
-c585e7027255d5a9721fb688ec353e24f0828322df4adea6eef6a7fe8d0bbd1bfb225d28480dcb3d47a78f3295479a723e4d4a72bfc64e6bf73a71c7d989fcb6 btrfs-progs-v5.19.tar.xz
+8e01fa6e3373d95a8e8577003ceb94722e4dfdf24110bfea79191a9862daf5e6580d72e898fdea134b5e86beeda32948eed572072f7906226189c6f1ac8615e3 btrfs-progs-v6.0.2.tar.xz
"
diff --git a/main/bubblewrap/APKBUILD b/main/bubblewrap/APKBUILD
index ebc23f8f14..4e81123444 100644
--- a/main/bubblewrap/APKBUILD
+++ b/main/bubblewrap/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=bubblewrap
-pkgver=0.6.2
+pkgver=0.7.0
pkgrel=0
pkgdesc="Unprivileged sandboxing tool"
url="https://github.com/containers/bubblewrap"
@@ -28,5 +28,5 @@ package() {
}
sha512sums="
-09b89836242941bd5d1975a64a9543caae77c344ace7baf06670fddbfce28be22728cf0a7e4c2df142b2d89a903df92cfd4671b442058953ea4ebb099eb05577 bubblewrap-0.6.2.tar.gz
+01ec30b01f70ff896b407d4979df0bc1a75d0b441a388f7be7aa9a4c9f56e6a1e2ae2ae4dbe4d6262a0218f577a8ad317db4217d5663ea9bd8c1d5c4293c39a7 bubblewrap-0.7.0.tar.gz
"
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
deleted file mode 100644
index 418b61ad74..0000000000
--- a/main/busybox-initscripts/APKBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=busybox-initscripts
-pkgver=4.2
-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"
-makedepends=""
-install="$pkgname.post-install $pkgname.post-upgrade"
-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
- "
-
-package() {
- local i
- cd "$srcdir"
-
- mkdir -p "$pkgdir"/etc/conf.d "$pkgdir"/etc/init.d \
- "$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
-
- # poweroff script for acpid
- cat >"$pkgdir"/etc/acpi/PWRF/00000080 <<EOF
-#!/bin/sh
-poweroff
-EOF
- chmod +x "$pkgdir"/etc/acpi/PWRF/00000080
-}
-
-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
-"
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/0001-sed-check-errors-writing-file-with-sed-i.patch b/main/busybox/0001-sed-check-errors-writing-file-with-sed-i.patch
new file mode 100644
index 0000000000..90a5115564
--- /dev/null
+++ b/main/busybox/0001-sed-check-errors-writing-file-with-sed-i.patch
@@ -0,0 +1,66 @@
+From b99395ebf70eadb248da0ecf913eea0236eceea1 Mon Sep 17 00:00:00 2001
+From: Dominique Martinet <dominique.martinet@atmark-techno.com>
+Date: Wed, 16 Nov 2022 11:52:29 +0900
+Subject: [PATCH] sed: check errors writing file with sed -i
+
+sed would currently not error if write failed when modifying a file.
+
+This can be reproduced with the following 'script':
+$ sudo mount -t tmpfs tmpfs -o size=1M /tmp/m
+$ sudo chmod 777 /tmp/m
+$ echo foo > /tmp/m/foo
+$ dd if=/dev/zero of=/tmp/m/fill bs=4k
+dd: error writing '/tmp/m/fill': No space left on device
+256+0 records in
+255+0 records out
+1044480 bytes (1.0 MB, 1020 KiB) copied, 0.00234567 s, 445 MB/s
+$ busybox sed -i -e 's/.*/bar/' /tmp/m/foo
+$ echo $?
+0
+$ cat /tmp/m/foo
+<empty>
+
+new behaviour:
+$ echo foo > /tmp/m/foo
+$ ./busybox sed -i -e 's/.*/bar/' /tmp/m/foo
+sed: write error
+$ echo $?
+4
+$ cat /tmp/m/foo
+foo
+
+function old new delta
+sed_main 754 801 +47
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 1/0 up/down: 47/0) Total: 47 bytes
+ text data bss dec hex filename
+ 66957 2398 1552 70907 114fb busybox_old
+ 67004 2398 1552 70954 1152a busybox_unstripped
+
+Signed-off-by: Dominique Martinet <dominique.martinet@atmark-techno.com>
+---
+Upstream patch:
+http://lists.busybox.net/pipermail/busybox/2022-November/089967.html
+
+ editors/sed.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/editors/sed.c b/editors/sed.c
+index 32a4b61f6d4c..be709eef3a9c 100644
+--- a/editors/sed.c
++++ b/editors/sed.c
+@@ -1639,6 +1639,11 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
+ fchown(nonstdoutfd, statbuf.st_uid, statbuf.st_gid);
+
+ process_files();
++ fflush(G.nonstdout);
++ if (ferror(G.nonstdout)) {
++ xfunc_error_retval = 4; /* It's what gnu sed exits with... */
++ bb_simple_error_msg_and_die(bb_msg_write_error);
++ }
+ fclose(G.nonstdout);
+ G.nonstdout = stdout;
+
+--
+2.35.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 1c2571e560..c22b908d2a 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -5,7 +5,7 @@
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=busybox
pkgver=1.35.0
-pkgrel=22
+pkgrel=29
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
@@ -23,14 +23,29 @@ subpackages="
$pkgname-static
$pkgname-doc
$pkgname-suid
- $pkgname-extras
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
@@ -51,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
@@ -64,6 +80,7 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
0002-nslookup-sanitize-all-printed-strings-with-printable.patch
0001-modinfo-add-k-option-for-kernel-version.patch
CVE-2022-30065.patch
+ 0001-sed-check-errors-writing-file-with-sed-i.patch
acpid.logrotate
busyboxconfig
@@ -72,7 +89,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:
@@ -200,13 +220,22 @@ check() {
}
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
+ 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
@@ -300,6 +329,41 @@ binsh() {
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
@@ -321,6 +385,7 @@ 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
7608fbb9deddc9268ba53bc5b762a00fa16744d595f6f8a2f5a857339e754ea0c3da084a1e48269c8281553e9171d2bb29b8530fbe85e6a934f97c3cfcdbe31b 0001-avoid-redefined-warnings-when-building-with-utmps.patch
@@ -330,11 +395,32 @@ b52050678e79e4da856956906d07fcb620cbf35f2ef6b5a8ee3b8d244ea63b4b98eef505451184d5
ead4ad65d270d8659e1898fa16f76b6cbcf567d8aba238eacccda3764edb4362240d9359d6389873bedc126d405f805fc6dfce653a7181618ebcc67c94bd08d2 0002-nslookup-sanitize-all-printed-strings-with-printable.patch
4f6ddd59d6096943f617b0938fca428114190b8b37732d6783faab291451a2c30c452ed39299db22d1d9679d007022f87d43e93b38a4f6ced64a8659e9233773 0001-modinfo-add-k-option-for-kernel-version.patch
22e2fa8f7a6105fd9990f93b71c235980fd4eab62269939a0e3a920fe517ee4f913c6bd0148a554b67fe01d1660bf0fd76a80e9dcac290b4b8b2c304ef6080a9 CVE-2022-30065.patch
+d1a2fcbf9de623531953e7ad869e41e896aa79a0917983e6f0d20ddf7393e11220dda8be93c796b7abbf34006d8f03e871a6ab293988267df5aadb74cbd8aeb1 0001-sed-check-errors-writing-file-with-sed-i.patch
aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate
-20ad8edb3741ffffa99bdb4c00603ddfc76564c869cb46736f878eba01cc3d3f611dd8049625a66ad7f018ce485a9d9592ec133fc8fe7f13da3d69daa6c545ec busyboxconfig
-53e6ba22ac89ccd733ad02f1553b351669abff1a2f1f233c92940770bb1b14d91b052ef81a2d4ef0cb087318e4f3972cc0735951a214b47d00b22e8b8f1db787 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/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 2d531b94f3..67b8237621 100644
--- a/main/busybox/busyboxconfig-extras
+++ b/main/busybox/busyboxconfig-extras
@@ -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/bwm-ng/APKBUILD b/main/bwm-ng/APKBUILD
index f6878a9bcb..f70482bca8 100644
--- a/main/bwm-ng/APKBUILD
+++ b/main/bwm-ng/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bwm-ng
pkgver=0.6.3
-pkgrel=0
+pkgrel=1
pkgdesc="A small and simple console-based live bandwidth monitor"
url="http://www.gropp.org/"
arch="all"
diff --git a/main/byacc/APKBUILD b/main/byacc/APKBUILD
index c8293b8524..97667bd2b5 100644
--- a/main/byacc/APKBUILD
+++ b/main/byacc/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
pkgname=byacc
-pkgver=20220128
+pkgver=20221106
pkgrel=0
pkgdesc="The Berkeley Yacc general-purpose parser generator"
url="https://invisible-island.net/byacc/byacc.html"
@@ -30,5 +30,5 @@ package() {
}
sha512sums="
-e8ae4c56f5be4cc0ef1d281c43f02c6296fdc40f630269f2a61af511f270ae059ad185b9718190b8133018f7b74b7ca6f84ced5d63a359960b52ea2a3ef562ea byacc-20220128.tgz
+866933b4eb2296565ce70b4ade565e4679f3b652715f0066072bbcc42b95389fa47a2f96cd03de577807dcc49bf453b1d4f7e22b96c80fef1aa66898d3de5d5c byacc-20221106.tgz
"
diff --git a/main/byobu/APKBUILD b/main/byobu/APKBUILD
index 689a1cb4cc..82ee4a7fba 100644
--- a/main/byobu/APKBUILD
+++ b/main/byobu/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=byobu
pkgver=5.133
-pkgrel=1
+pkgrel=2
pkgdesc="An enhancement of the GNU Screen"
url="https://launchpad.net/byobu"
arch="noarch"
diff --git a/main/bzip2/APKBUILD b/main/bzip2/APKBUILD
index 1628eb8d0e..aa4153f12f 100644
--- a/main/bzip2/APKBUILD
+++ b/main/bzip2/APKBUILD
@@ -1,9 +1,9 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bzip2
pkgver=1.0.8
-pkgrel=2
+pkgrel=4
pkgdesc="A high-quality data compression program"
-url="http://sources.redhat.com/bzip2"
+url="https://sourceware.org/bzip2/"
arch="all"
license="bzip2-1.0.6"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc libbz2"
@@ -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
-58cc37430555520b6e35db2740e699cf37eacdd82989c21a222a593e36288710a0defb003662d4238235c12b3764bfc89cd646e6be9d0a08d54bd2c9baa6ad15 bzip2-1.0.4-makefile-CFLAGS.patch
+sha512sums="
+083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 bzip2-1.0.8.tar.gz
+d0430ae96d7a2d4e658a101c84262ba11048e3e3110ae9d7855b36792abc7827c0daba3cdcdec629130a9d3beb128052de458242e494a35962e903e50eddfe45 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-1.0.4-makefile-CFLAGS.patch b/main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
index cf146188c3..6acdc28a10 100644
--- a/main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
+++ b/main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
@@ -8,7 +8,7 @@
BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
-+CFLAGS+=-Wall -Winline $(BIGFILES) $(CPPFLAGS)
++CFLAGS+=-Wall -Winline $(BIGFILES) $(CPPFLAGS) -O2
# Where you want it installed when you do 'make install'
PREFIX=/usr/local
@@ -19,7 +19,7 @@
CC=gcc
BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
-+CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) $(CPPFLAGS)
++CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) $(CPPFLAGS) -O2
OBJS= blocksort.o \
huffman.o \
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/c-ares/APKBUILD b/main/c-ares/APKBUILD
index adf9d6de25..51135cabaa 100644
--- a/main/c-ares/APKBUILD
+++ b/main/c-ares/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=c-ares
pkgver=1.18.1
-pkgrel=0
+pkgrel=1
pkgdesc="An asynchronously DNS/names resolver library"
url="https://c-ares.haxx.se/"
arch="all"
-options="!check"
license="MIT"
-subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-utils"
+makedepends="cmake samurai"
source="https://c-ares.haxx.se/download/c-ares-$pkgver.tar.gz"
# secfixes:
@@ -16,28 +16,31 @@ source="https://c-ares.haxx.se/download/c-ares-$pkgver.tar.gz"
# - CVE-2021-3672
build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --enable-shared
- make
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake -B build \
+ -GNinja \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCARES_BUILD_TESTS=ON \
+ $CMAKE_CROSSOPTS
+
+ cmake --build build
}
check() {
- # This is only needed for < 1.14.0, where the .sh file was not
- # distributed properly - see https://da.gd/carestest
- echo "#!/bin/true" > test/fuzzcheck.sh
- chmod a+x test/fuzzcheck.sh
-
- make -C test check
+ ctest --output-on-failure --test-dir build -E "arestest"
}
package() {
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" cmake --install build
+}
+
+utils() {
+ pkgdesc="Utilities for c-ares"
+ amove usr/bin/*
}
sha512sums="
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 a126d2afba..f8ce2d4f65 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.7.4
pkgrel=0
pkgdesc="fast C/C++ compiler cache"
url="https://ccache.dev/"
@@ -20,7 +20,6 @@ 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
- gcc12.patch
"
# XXX: https://github.com/ccache/ccache/issues/1014
@@ -38,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
}
@@ -57,7 +60,6 @@ package() {
}
sha512sums="
-361427ccecd74e8c25ca6a98ef3d3c125d81862196767eb383f6f8159fed8e1695cd5bc8731cb591c23c55352f0114a088b32a673717711efbfbb178a6c08c82 ccache-4.6.1.tar.xz
+48c663b51e874cfbd8daf0ef9759d025c2605c36da47ebbc77b52ceb941b810436600429f74204f13e2e2e601af6186a4bdb992f8da239f88cb9df4c6c95d58f ccache-4.7.4.tar.xz
785ce34305a3bb6c24117341157356c2bd2272eca9d58fa20acd14a023abe6f784c88d9c55656d2f37320392bb73a61c52cd8b6bd9ac7c5316c8ed187dd6f5fb ioctl.patch
-418f5a7ccf1fe7a9ea360fc33085f8b63390612f39db1e3b25ad089829b94f44c80485cbf3d5f2eb530a7a455dd9ee8e48a796f51dd82c388391cf39b040a94f gcc12.patch
"
diff --git a/main/ccache/gcc12.patch b/main/ccache/gcc12.patch
deleted file mode 100644
index 96edc1066e..0000000000
--- a/main/ccache/gcc12.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/core/Statistics.hpp b/src/core/Statistics.hpp
-index 3e9ed81..0017f20 100644
---- a/src/core/Statistics.hpp
-+++ b/src/core/Statistics.hpp
-@@ -20,6 +20,7 @@
-
- #include <core/StatisticsCounters.hpp>
-
-+#include <ctime>
- #include <string>
- #include <unordered_map>
- #include <vector>
diff --git a/main/cciss_vol_status/APKBUILD b/main/cciss_vol_status/APKBUILD
index 56abfcf517..de1a2e5eaa 100644
--- a/main/cciss_vol_status/APKBUILD
+++ b/main/cciss_vol_status/APKBUILD
@@ -1,9 +1,9 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cciss_vol_status
pkgver=1.12a
-pkgrel=0
+pkgrel=1
pkgdesc="Drivers for the HP (previously Compaq) Smart Array controllers which provide hardware RAID capability"
-url="http://cciss.sourceforge.net/"
+url="https://cciss.sourceforge.net/"
arch="all"
license="GPL-2.0-or-later"
makedepends="linux-headers"
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/check/APKBUILD b/main/check/APKBUILD
index f41e34a8ed..ad96d12724 100644
--- a/main/check/APKBUILD
+++ b/main/check/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=check
pkgver=0.15.2
-pkgrel=0
+pkgrel=1
pkgdesc="A unit test framework for C"
url="https://libcheck.github.io/check/"
arch="all"
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/ciwiki/APKBUILD b/main/ciwiki/APKBUILD
index aa2ebc8802..bbe6d2d354 100644
--- a/main/ciwiki/APKBUILD
+++ b/main/ciwiki/APKBUILD
@@ -1,10 +1,10 @@
# 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=1
pkgdesc="personal lightweight wiki written in C"
-url="http://ciwiki.sourceforge.net/"
+url="https://ciwiki.sourceforge.net/"
arch="all"
license="GPL-2.0-or-later"
options="!check"
@@ -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 45013c01a0..b826572d91 100644
--- a/main/ckbcomp/APKBUILD
+++ b/main/ckbcomp/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ckbcomp
-pkgver=1.209
+pkgver=1.210
pkgrel=0
pkgdesc="Compile a XKB keyboard description to a keymap"
url="https://salsa.debian.org/installer-team/console-setup"
@@ -18,5 +18,5 @@ package() {
}
sha512sums="
-4297da451b3efab1b29f83095c1e57e5094f37759581cea9e51d1974f138b9b1700bca9f05a27434345c238e32cea8b8d0f143b79b91059b41b44b87b036eafb console-setup-1.209.tar.gz
+8e4e4eab1406870a7894955f5d03a927f2f1a0d288284decd812c8d44204abbec1a6713a203d750c096b778adf6c7dd6aa1e7ed0a58a25f903035a64180b6aa1 console-setup-1.210.tar.gz
"
diff --git a/main/cksfv/APKBUILD b/main/cksfv/APKBUILD
index a783d2bb5e..d1a5552b76 100644
--- a/main/cksfv/APKBUILD
+++ b/main/cksfv/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=cksfv
pkgver=1.3.15
-pkgrel=1
+pkgrel=2
pkgdesc="Simple File Verification"
url="http://zakalwe.fi/~shd/foss/cksfv"
arch="all"
diff --git a/main/clang/APKBUILD b/main/clang/APKBUILD
deleted file mode 100644
index 323a03bb87..0000000000
--- a/main/clang/APKBUILD
+++ /dev/null
@@ -1,171 +0,0 @@
-# Contributor Eric Molitor <eric@molitor.org>
-# Contributor Patrick Gansterer <paroga@paroga.com>
-# Contributor Travis Tilley <ttilley@gmail.com>
-# Contributor omni <omni+alpine@hack.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=clang
-# Note: Update together with llvm.
-pkgver=14.0.6
-pkgrel=1
-_llvmver=${pkgver%%.*}
-pkgdesc="A C language family front-end for LLVM"
-arch="all"
-url="https://llvm.org/"
-license="Apache-2.0"
-options="!check" # fail to build
-makedepends="
- cmake
- libxml2-dev
- libxml2-utils
- llvm$_llvmver-dev
- llvm$_llvmver-static
- llvm$_llvmver-test-utils
- samurai
- py3-sphinx
- python3
- pythonispython3
- "
-checkdepends="diffutils bash gtest-dev"
-depends_dev="$pkgname=$pkgver-r$pkgrel $pkgname-extra-tools=$pkgver-r$pkgrel"
-subpackages="$pkgname-static $pkgname-doc $pkgname-libs
- $pkgname-analyzer::noarch
- $pkgname-dev
- $pkgname-extra-tools:extra
- py3-$pkgname:python:noarch
- "
-source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-$pkgver.src.tar.xz
- https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-tools-extra-$pkgver.src.tar.xz
- 10-add-musl-triples.patch
- 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"
- default_prepare
-}
-
-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 -B build -G Ninja -Wno-dev \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -Wl,-z,stack-size=2097152" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCLANG_VENDOR=Alpine \
- -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="$(want_check && echo ON || echo OFF)" \
- -DCLANG_PLUGIN_SUPPORT=ON \
- -DLIBCLANG_BUILD_STATIC=ON \
- -DLLVM_ENABLE_EH=ON \
- -DLLVM_ENABLE_RTTI=ON \
- -DCLANG_BUILT_STANDALONE=ON
-
- ninja -C build clang-tblgen
- ninja -C build
-}
-
-check() {
- ninja -C build check-all
-}
-
-package() {
- DESTDIR="$pkgdir" ninja -C build install
- install -Dm644 build/lib/libclang.a -t "$pkgdir"/usr/lib/
-}
-
-dev() {
- default_dev
-
- # move back usr/lib/clang/x.y.z/include with files such as altivec.h, msa.h etc
- # these are needed to build programs *with* clang, not *against* it.
- mv "$subpkgdir"/usr/lib/clang "$pkgdir"/usr/lib/
-}
-
-analyzer() {
- pkgdesc="Clang source code analysis framework"
- depends="$pkgname=$pkgver-r$pkgrel perl python3"
-
- 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() {
- pkgdesc="Extra tools built using Clang’s tooling APIs"
-
- cd "$pkgdir"
-
- install -dm0755 \
- "$subpkgdir"/usr/share/emacs/site-lisp
-
- # FIXME: Make sure this is the right list of binaries for -extra-tools
- amove \
- usr/bin/clang-apply-replacements \
- usr/bin/clang-change-namespace \
- usr/bin/clang-check \
- usr/bin/clang-doc \
- usr/bin/clang-extdef-mapping \
- usr/bin/clang-format \
- usr/bin/clang-include-fixer \
- usr/bin/clang-move \
- usr/bin/clang-offload-bundler \
- usr/bin/clang-offload-wrapper \
- usr/bin/clang-query \
- usr/bin/clang-refactor \
- usr/bin/clang-rename \
- usr/bin/clang-reorder-fields \
- usr/bin/clang-repl \
- usr/bin/clang-scan-deps \
- usr/bin/clang-tidy \
- usr/bin/clangd* \
- usr/bin/c-index-test \
- usr/bin/diagtool \
- usr/bin/find-all-symbols \
- usr/bin/git-clang-format \
- usr/bin/hmaptool \
- usr/bin/modularize \
- usr/bin/pp-trace \
- usr/bin/run-clang-tidy \
- 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
-
- mv usr/share/clang/clang-*.el \
- "$subpkgdir"/usr/share/emacs/site-lisp
-}
-
-python() {
- pkgdesc="Clang Python Bindings"
- depends="$pkgname-libs=$pkgver-r$pkgrel python3"
-
- local sitedir=$(python3 -c "import site; print(site.getsitepackages()[0])")
-
- amove usr/lib/python*
-
- # 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
-5809d931656cac13b91bc91aac63df072b0403708ac718bf01546d9d520ff2c4163ee11411439dce5bb683a3bfa044b62443b6f66a1419c9086d20e79a018071 10-add-musl-triples.patch
-b9b5529bcf460767796ddbc6f7d8c479b62d63c74d39297b3c7c79a2f6898272ac52a2f2d1ea2bd601e869cecf23c0cd69fbcd613b8c6299b14a1be8203fd089 30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
-e49ac24ebbd2922374c8f0562ef5ba40f481bfc9531303ff391c43d1e0306df360f1bc0e94093521d278ed33662defacf6e7ce644482fb0150259b20f44bba77 llvm-hello.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/clang/10-add-musl-triples.patch b/main/clang14/10-add-musl-triples.patch
index 0ed9c81675..0ed9c81675 100644
--- a/main/clang/10-add-musl-triples.patch
+++ b/main/clang14/10-add-musl-triples.patch
diff --git a/main/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch b/main/clang14/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
index bae4532c16..bae4532c16 100644
--- a/main/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+++ b/main/clang14/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
diff --git a/main/clang14/APKBUILD b/main/clang14/APKBUILD
new file mode 100644
index 0000000000..d4d81cdd78
--- /dev/null
+++ b/main/clang14/APKBUILD
@@ -0,0 +1,235 @@
+# Contributor Eric Molitor <eric@molitor.org>
+# Contributor Patrick Gansterer <paroga@paroga.com>
+# Contributor Travis Tilley <ttilley@gmail.com>
+# Contributor omni <omni+alpine@hack.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=clang14
+pkgver=14.0.6
+pkgrel=1
+_llvmver=${pkgver%%.*}
+pkgdesc="A C language family front-end for LLVM"
+arch="all"
+url="https://llvm.org/"
+license="Apache-2.0"
+options="!check" # fail to build
+makedepends="
+ cmake
+ help2man
+ libxml2-dev
+ llvm$_llvmver-dev
+ llvm$_llvmver-static
+ llvm$_llvmver-test-utils
+ samurai
+ python3
+ "
+checkdepends="diffutils bash gtest-dev"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+subpackages="
+ $pkgname-static
+ $pkgname-libclang
+ $pkgname-libs
+ $pkgname-dev
+ "
+source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-$pkgver.src.tar.xz
+ 10-add-musl-triples.patch
+ 30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+ "
+builddir="$srcdir/clang-$pkgver.src"
+
+# Whether is this package the default (latest) clang version.
+_default_clang="no"
+
+if [ "$_default_clang" = yes ]; then
+ provides="clang=$pkgver-r$pkgrel"
+ replaces="clang"
+ depends_dev="$depends_dev $pkgname-extra-tools=$pkgver-r$pkgrel"
+fi
+
+build() {
+ local python_version=$(python3 -V | sed 's/.*\([0-9]\{1,\}\.[0-9]\{1,\}\)\..*/\1/')
+
+ if [ $_default_clang = yes ]; then
+ local extras=ON
+ else
+ local extras=OFF
+ fi
+
+ cmake -B build -G Ninja -Wno-dev \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH="$srcdir/cmake-$pkgver.src/Modules" \
+ -DCLANG_BUILT_STANDALONE=ON \
+ -DCLANG_ENABLE_ARCMT=$extras \
+ -DCLANG_ENABLE_STATIC_ANALYZER=$extras \
+ -DCLANG_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \
+ -DCLANG_LINK_CLANG_DYLIB=ON \
+ -DCLANG_PLUGIN_SUPPORT=ON \
+ -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() {
+ ninja -C build check-all
+}
+
+package() {
+ depends="libstdc++-dev"
+
+ DESTDIR="$pkgdir" ninja -C build install
+
+ install -Dm644 build/lib/libclang.a -t "$pkgdir"/usr/lib/llvm$_llvmver/lib/
+
+ cd "$pkgdir"/usr/lib
+ # the soname is the majorver but they kept the broken file version
+ rm libclang.so.13
+ ln -sfv libclang.so.$pkgver libclang.so.$_llvmver
+ ln -svf libclang.so.$_llvmver libclang.so
+
+ if [ $_default_clang = "yes" ]; then
+ rm "$pkgdir"/usr/lib/share/clang/clang-format-bbedit.applescript \
+ "$pkgdir"/usr/lib/share/clang/clang-doc-default-stylesheet.css \
+ "$pkgdir"/usr/lib/share/clang/index.js
+
+ install -Dm644 "$builddir"/clang.1 -t "$pkgdir"/usr/share/man/man1/
+
+ mkdir -p "$pkgdir"/usr/share/bash-completion/completions
+ mv "$pkgdir"/usr//share/clang/bash-autocomplete.sh \
+ "$pkgdir"/usr/share/bash-completion/completions/clang
+
+ mkdir -p "$pkgdir"/usr/share/emacs/site-lisp
+ mv "$pkgdir"/usr/share/clang/clang-*.el \
+ "$pkgdir"/usr/share/emacs/site-lisp
+ rmdir -p usr/share/clang || true
+ else
+ # only has things we want to put in the main version
+ rm -rf "$pkgdir"/usr/share
+ rm -rf "$pkgdir"/usr/lib/python3*
+ fi
+}
+
+dev() {
+ default_dev
+ _default_replace
+
+ # move back usr/lib/clang/x.y.z/include with files such as altivec.h, msa.h etc
+ # these are needed to build programs *with* clang, not *against* it.
+ mv "$subpkgdir"/usr/lib/clang "$pkgdir"/usr/lib/
+}
+
+static() {
+ default_static
+ _default_replace
+}
+
+bash() {
+ default_bashcomp
+ _default_replace
+}
+
+libs() {
+ default_libs
+ _default_replace
+}
+
+libclang() {
+ _default_replace
+
+ # we add an extra subpackage for this so things that link to libclang don't
+ # have to pull libclang-cpp too (separate)
+ amove usr/lib/libclang.so.*
+}
+
+analyzer() {
+ pkgdesc="Clang source code analysis framework"
+ depends="$pkgname=$pkgver-r$pkgrel perl python3"
+ _default_replace
+
+ 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() {
+ pkgdesc="Extra tools built using Clang’s tooling APIs"
+ _default_replace
+
+ amove \
+ usr/bin/clang-apply-replacements* \
+ usr/bin/clang-change-namespace* \
+ usr/bin/clang-check* \
+ usr/bin/clang-doc* \
+ usr/bin/clang-extdef-mapping* \
+ usr/bin/clang-format* \
+ usr/bin/clang-include-fixer* \
+ usr/bin/clang-move* \
+ usr/bin/clang-offload-bundler* \
+ usr/bin/clang-offload-wrapper* \
+ usr/bin/clang-query* \
+ usr/bin/clang-refactor* \
+ usr/bin/clang-rename* \
+ usr/bin/clang-reorder-fields* \
+ usr/bin/clang-repl* \
+ usr/bin/clang-scan-deps* \
+ usr/bin/clang-tidy* \
+ usr/bin/clangd* \
+ usr/bin/c-index-test* \
+ usr/bin/diagtool* \
+ usr/bin/find-all-symbols* \
+ usr/bin/git-clang-format* \
+ usr/bin/hmaptool* \
+ usr/bin/modularize* \
+ usr/bin/pp-trace* \
+ usr/bin/run-clang-tidy* \
+ 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
+
+ amove usr/share/emacs
+}
+
+python() {
+ pkgdesc="Clang Python Bindings"
+ depends="$pkgname-libs=$pkgver-r$pkgrel python3"
+ provides="py3-clang=$pkgver-r$pkgrel"
+ replaces="py3-clang"
+
+ 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"
+}
+
+_default_replace() {
+ if [ "$_default_clang" = yes ]; then
+ replaces="clang${subpkgname#"$pkgname"}"
+ provides="$replaces=$pkgver-r$pkgrel"
+ fi
+}
+
+sha512sums="
+5f5497b57dd116225e90f321902f1015beb50c0b1bb90d0fc6c026f13aa748feabe44f98eb75e86f98f3b1785ad5e850210732f3eae75b942ecd520527dcd30b clang-14.0.6.src.tar.xz
+5809d931656cac13b91bc91aac63df072b0403708ac718bf01546d9d520ff2c4163ee11411439dce5bb683a3bfa044b62443b6f66a1419c9086d20e79a018071 10-add-musl-triples.patch
+b9b5529bcf460767796ddbc6f7d8c479b62d63c74d39297b3c7c79a2f6898272ac52a2f2d1ea2bd601e869cecf23c0cd69fbcd613b8c6299b14a1be8203fd089 30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+"
diff --git a/main/clang15/10-add-musl-triples.patch b/main/clang15/10-add-musl-triples.patch
new file mode 100644
index 0000000000..0ed9c81675
--- /dev/null
+++ b/main/clang15/10-add-musl-triples.patch
@@ -0,0 +1,39 @@
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -2073,7 +2073,7 @@
+ static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
+ static const char *const AArch64Triples[] = {
+ "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
+- "aarch64-suse-linux"};
++ "aarch64-suse-linux", "aarch64-linux-musl"};
+ static const char *const AArch64beLibDirs[] = {"/lib"};
+ static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
+ "aarch64_be-linux-gnu"};
+@@ -2085,7 +2085,9 @@
+ "armv7l-linux-musleabihf",
+ "armv7hl-redhat-linux-gnueabi",
+ "armv6hl-suse-linux-gnueabi",
+- "armv7hl-suse-linux-gnueabi"};
++ "armv7hl-suse-linux-gnueabi",
++ "arm-linux-musleabihf",
++ "armv7l-linux-musleabihf"};
+ static const char *const ARMebLibDirs[] = {"/lib"};
+ static const char *const ARMebTriples[] = {"armeb-linux-gnueabi"};
+ static const char *const ARMebHFTriples[] = {
+@@ -2101,7 +2103,7 @@
+ "x86_64-redhat-linux", "x86_64-suse-linux",
+ "x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
+ "x86_64-slackware-linux", "x86_64-unknown-linux",
+- "x86_64-amazon-linux"};
++ "x86_64-amazon-linux", "x86_64-linux-musl"};
+ static const char *const X32Triples[] = {"x86_64-linux-gnux32",
+ "x86_64-pc-linux-gnux32"};
+ static const char *const X32LibDirs[] = {"/libx32", "/lib"};
+@@ -2110,6 +2112,7 @@
+ "i586-linux-gnu", "i686-linux-gnu", "i686-pc-linux-gnu",
+ "i386-redhat-linux6E", "i686-redhat-linux", "i386-redhat-linux",
+ "i586-suse-linux", "i686-montavista-linux", "i686-gnu",
++ "i686-linux-musl",
+ };
+
+ static const char *const M68kLibDirs[] = {"/lib"};
diff --git a/main/clang15/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch b/main/clang15/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
new file mode 100644
index 0000000000..bae4532c16
--- /dev/null
+++ b/main/clang15/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
@@ -0,0 +1,82 @@
+--- a/lib/Driver/ToolChains/Linux.h
++++ b/lib/Driver/ToolChains/Linux.h
+@@ -11,6 +11,7 @@
+
+ #include "Gnu.h"
+ #include "clang/Driver/ToolChain.h"
++#include "clang/Basic/LangOptions.h"
+
+ namespace clang {
+ namespace driver {
+@@ -60,6 +61,15 @@
+ llvm::DenormalMode getDefaultDenormalModeForType(
+ const llvm::opt::ArgList &DriverArgs, const JobAction &JA,
+ const llvm::fltSemantics *FPType = nullptr) const override;
++
++ LangOptions::StackProtectorMode
++ GetDefaultStackProtectorLevel(bool KernelOrKext) const override {
++ StringRef VendorName = Linux::getTriple().getVendorName();
++ if (VendorName.compare("alpine") == 0)
++ return LangOptions::SSPStrong;
++
++ return LangOptions::SSPOff;
++ }
+
+ protected:
+ Tool *buildAssembler() const override;
+--- a/test/Driver/fsanitize.c
++++ b/test/Driver/fsanitize.c
+@@ -666,12 +666,12 @@
+ // RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
+ // NOSP-NOT: "-fsanitize=safe-stack"
+
+-// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
++// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang -target x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN
+ // RUN: %clang -target x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP
+-// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
+-// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
++// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
++// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang -target i386-contiki-unknown -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
+ // NO-SP-NOT: stack-protector
+ // NO-SP: "-fsanitize=safe-stack"
+--- a/test/Driver/stack-protector.c
++++ b/test/Driver/stack-protector.c
+@@ -33,6 +33,22 @@
+ // SSP-PS4-BUF: "-stack-protector" "2"
+ // SSP-PS4-BUF: "-stack-protector-buffer-size" "16"
+
++// Test default stack protector values for Alpine
++
++// RUN: %clang -target x86_64-alpine-linux-musl -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE
++// ALPINE: "-stack-protector" "2"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_SPS
++// ALPINE_SPS: "-stack-protector" "2"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_ALL
++// ALPINE_ALL: "-stack-protector" "3"
++// ALPINE_ALL-NOT: "-stack-protector-buffer-size"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fno-stack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_NOSSP
++// ALPINE_NOSSP-NOT: "-stack-protector"
++// ALPINE_NOSSP-NOT: "-stack-protector-buffer-size"
++
+ // 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/clang15/APKBUILD b/main/clang15/APKBUILD
new file mode 100644
index 0000000000..a2b80ebe01
--- /dev/null
+++ b/main/clang15/APKBUILD
@@ -0,0 +1,244 @@
+# Contributor Eric Molitor <eric@molitor.org>
+# Contributor Patrick Gansterer <paroga@paroga.com>
+# Contributor Travis Tilley <ttilley@gmail.com>
+# Contributor omni <omni+alpine@hack.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=clang15
+pkgver=15.0.5
+pkgrel=2
+_llvmver=${pkgver%%.*}
+pkgdesc="A C language family front-end for LLVM"
+arch="all"
+url="https://llvm.org/"
+license="Apache-2.0"
+options="!check" # fail to build
+makedepends="
+ cmake
+ help2man
+ libxml2-dev
+ llvm$_llvmver-dev
+ llvm$_llvmver-static
+ llvm$_llvmver-test-utils
+ samurai
+ python3
+ "
+checkdepends="diffutils bash gtest-dev"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+subpackages="
+ $pkgname-static
+ $pkgname-doc
+ $pkgname-libclang
+ $pkgname-libs
+ $pkgname-bash-completion:bash:noarch
+ $pkgname-analyzer::noarch
+ $pkgname-dev
+ $pkgname-extra-tools:extra
+ py3-$pkgname:python:noarch
+ "
+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
+ "
+builddir="$srcdir/clang-$pkgver.src"
+
+prepare() {
+ mv "$srcdir/clang-tools-extra-$pkgver.src" "$builddir/tools/extra"
+ default_prepare
+}
+
+# Whether is this package the default (latest) clang version.
+_default_clang="yes"
+
+if [ "$_default_clang" = yes ]; then
+ provides="clang=$pkgver-r$pkgrel"
+ replaces="clang"
+ depends_dev="$depends_dev $pkgname-extra-tools=$pkgver-r$pkgrel"
+fi
+
+build() {
+ local python_version=$(python3 -V | sed 's/.*\([0-9]\{1,\}\.[0-9]\{1,\}\)\..*/\1/')
+
+ if [ $_default_clang = yes ]; then
+ local extras=ON
+ else
+ local extras=OFF
+ fi
+
+ cmake -B build -G Ninja -Wno-dev \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH="$srcdir/cmake-$pkgver.src/Modules" \
+ -DCLANG_BUILT_STANDALONE=ON \
+ -DCLANG_ENABLE_ARCMT=$extras \
+ -DCLANG_ENABLE_STATIC_ANALYZER=$extras \
+ -DCLANG_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \
+ -DCLANG_LINK_CLANG_DYLIB=ON \
+ -DCLANG_PLUGIN_SUPPORT=ON \
+ -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() {
+ ninja -C build check-all
+}
+
+package() {
+ # the libraries should always exactly match, not just by soname
+ depends="$pkgname-libs=$pkgver-r$pkgrel libstdc++-dev"
+
+ DESTDIR="$pkgdir" ninja -C build install
+
+ install -Dm644 build/lib/libclang.a -t "$pkgdir"/usr/lib/
+
+ if [ $_default_clang = "yes" ]; then
+ rm "$pkgdir"/usr/share/clang/clang-format-bbedit.applescript \
+ "$pkgdir"/usr/share/clang/clang-doc-default-stylesheet.css \
+ "$pkgdir"/usr/share/clang/index.js
+
+ install -Dm644 "$builddir"/clang.1 -t "$pkgdir"/usr/share/man/man1/
+
+ mkdir -p "$pkgdir"/usr/share/bash-completion/completions
+ mv "$pkgdir"/usr//share/clang/bash-autocomplete.sh \
+ "$pkgdir"/usr/share/bash-completion/completions/clang
+
+ mkdir -p "$pkgdir"/usr/share/emacs/site-lisp
+ mv "$pkgdir"/usr/share/clang/clang-*.el \
+ "$pkgdir"/usr/share/emacs/site-lisp
+ rmdir -p usr/share/clang || true
+ else
+ # only has things we want to put in the main version
+ rm -rf "$pkgdir"/usr/share
+ fi
+}
+
+dev() {
+ default_dev
+ _default_replace
+
+ # move back usr/lib/clang/x.y.z/include with files such as altivec.h, msa.h etc
+ # these are needed to build programs *with* clang, not *against* it.
+ mv "$subpkgdir"/usr/lib/clang "$pkgdir"/usr/lib/
+}
+
+static() {
+ default_static
+ _default_replace
+}
+
+bash() {
+ default_bashcomp
+ _default_replace
+}
+
+libs() {
+ default_libs
+ _default_replace
+}
+
+libclang() {
+ _default_replace
+ replaces="$replaces clang-libs"
+
+ # we add an extra subpackage for this so things that link to libclang don't
+ # have to pull libclang-cpp too (separate)
+ amove usr/lib/libclang.so.*
+}
+
+analyzer() {
+ pkgdesc="Clang source code analysis framework"
+ depends="$pkgname=$pkgver-r$pkgrel py3-$pkgname=$pkgver-r$pkgrel perl python3"
+ _default_replace
+
+ 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() {
+ pkgdesc="Extra tools built using Clang’s tooling APIs"
+ _default_replace
+
+ amove \
+ usr/bin/clang-apply-replacements* \
+ usr/bin/clang-change-namespace* \
+ usr/bin/clang-check* \
+ usr/bin/clang-doc* \
+ usr/bin/clang-extdef-mapping* \
+ usr/bin/clang-format* \
+ usr/bin/clang-include-fixer* \
+ usr/bin/clang-move* \
+ usr/bin/clang-offload-bundler* \
+ usr/bin/clang-offload-wrapper* \
+ usr/bin/clang-query* \
+ usr/bin/clang-refactor* \
+ usr/bin/clang-rename* \
+ usr/bin/clang-reorder-fields* \
+ usr/bin/clang-repl* \
+ usr/bin/clang-scan-deps* \
+ usr/bin/clang-tidy* \
+ usr/bin/clangd* \
+ usr/bin/c-index-test* \
+ usr/bin/diagtool* \
+ usr/bin/find-all-symbols* \
+ usr/bin/git-clang-format* \
+ usr/bin/hmaptool* \
+ usr/bin/modularize* \
+ usr/bin/pp-trace* \
+ usr/bin/run-clang-tidy* \
+ 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
+
+ amove usr/share/emacs
+}
+
+python() {
+ pkgdesc="Clang Python Bindings"
+ depends="$pkgname-libs=$pkgver-r$pkgrel python3"
+ provides="py3-clang=$pkgver-r$pkgrel"
+ replaces="py3-clang"
+
+ 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"
+}
+
+_default_replace() {
+ if [ "$_default_clang" = yes ]; then
+ replaces="clang${subpkgname#"$pkgname"}"
+ provides="$replaces=$pkgver-r$pkgrel"
+ fi
+}
+
+sha512sums="
+62b2be15b0e8c1fcfa8c35384e794a89ae13ab195454ce8409f255087abd9cfebea6c70658c794f4daaadfa3f6ecbb046ce6f7ba146afe6e0fc0d7d57471b432 clang-15.0.5.src.tar.xz
+f6b64b48408f456922136ac75b42fd55ea05294381e40120d3716bed919b85948f9274af1e334926fbb04957c5339de1c0807b5549f2a750d9d07b62574421ac clang-tools-extra-15.0.5.src.tar.xz
+493825f1b64abef6d56502d28e30056320bdda5a46a478fc85eec3a631c541da2d318fb9c3e3d3e6234f538121b7a1c60d34cba498fd6b7938d3558d24684fed cmake-15.0.5.src.tar.xz
+5809d931656cac13b91bc91aac63df072b0403708ac718bf01546d9d520ff2c4163ee11411439dce5bb683a3bfa044b62443b6f66a1419c9086d20e79a018071 10-add-musl-triples.patch
+b9b5529bcf460767796ddbc6f7d8c479b62d63c74d39297b3c7c79a2f6898272ac52a2f2d1ea2bd601e869cecf23c0cd69fbcd613b8c6299b14a1be8203fd089 30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+"
diff --git a/main/cloog/APKBUILD b/main/cloog/APKBUILD
deleted file mode 100644
index 60193f0459..0000000000
--- a/main/cloog/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=cloog
-pkgver=0.20.0
-pkgrel=2
-pkgdesc="The Chunky Loop Generator"
-url="http://www.cloog.org/"
-arch="all"
-license="GPL-2.0-or-later"
-depends_dev="gmp-dev isl-dev"
-makedepends_host="$depends_dev"
-makedepends="$makedepends_host"
-subpackages="$pkgname-dev"
-source="https://github.com/periscop/cloog/releases/download/cloog-$pkgver/cloog-$pkgver.tar.gz"
-
-build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --localstatedir=/var \
- --with-sysroot=${CBUILDROOT} \
- --with-isl=system
- make
-}
-
-check() {
- make -j1 check
-}
-
-package() {
- make DESTDIR="$pkgdir" INSTALL="install -D" install
-}
-
-sha512sums="d00cbefd348b45d9d482320a088f7ae736440046b99469cbdfbb177a38dcef182c3305f0a567a1f5699c23b7108db6fd5ad6dfbc071d63ccca1d6bfc1b198565 cloog-0.20.0.tar.gz"
diff --git a/main/clucene/APKBUILD b/main/clucene/APKBUILD
index d591737c3e..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=15
+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 835edfd93e..10d5ea101f 100644
--- a/main/cmake/APKBUILD
+++ b/main/cmake/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cmake
-pkgver=3.24.1
-pkgrel=1
+pkgver=3.25.0
+pkgrel=0
pkgdesc="Cross-platform, open-source make system"
url="https://www.cmake.org/"
arch="all"
@@ -17,6 +17,7 @@ makedepends="
ncurses-dev
py3-sphinx
rhash-dev
+ samurai
xz-dev
zlib-dev
"
@@ -37,6 +38,7 @@ 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 \
@@ -45,8 +47,9 @@ build() {
--sphinx-man \
--system-libs \
--no-system-jsoncpp \
+ --generator=Ninja \
--parallel="${JOBS:-2}"
- make
+ ninja
}
check() {
@@ -54,9 +57,9 @@ check() {
}
package() {
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja install
}
sha512sums="
-67bfafcf9ceba617d7ebbb0ac88b689a2d90ab51fea4a83bd073ee082fb55de8962ce7fb283f3db5f455d286f2199843ffa595a1de207d4fa3e4472d951eb289 cmake-3.24.1.tar.gz
+f6e527161b8501c72b71a95ff7a0cf304ae02a214086ff58dd686543243d939e83faf94780cda477b19e4d42e4b8f1ff96c52f98e8f7f717e102a5229f4dd44c cmake-3.25.0.tar.gz
"
diff --git a/main/cmocka/APKBUILD b/main/cmocka/APKBUILD
index 3ee25dc51a..87f4044219 100644
--- a/main/cmocka/APKBUILD
+++ b/main/cmocka/APKBUILD
@@ -2,13 +2,12 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=cmocka
pkgver=1.1.5
-pkgrel=2
+pkgrel=3
pkgdesc="An elegant unit testing framework for C with support for mock objects"
url="https://cmocka.org/"
arch="all"
license="Apache-2.0"
-depends=""
-makedepends="cmake"
+makedepends="cmake samurai"
subpackages="$pkgname-dev"
source="https://cmocka.org/files/${pkgver%.*}/$pkgname-$pkgver.tar.xz
wordsize.patch
@@ -25,30 +24,28 @@ prepare() {
}
build() {
- mkdir -p "$builddir"/build
- cd "$builddir"/build
-
- cmake .. \
+ cmake -B build -G Ninja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=MinSizeRel \
- -DCMAKE_C_FLAGS="$CFLAGS" \
-DUNIT_TESTING=ON
- make
+ cmake --build build
}
check() {
cd "$builddir"/build
# If some tests fail, run them again in verbose mode.
- make test || ctest --rerun-failed --extra-verbose
+ ninja test || ctest --rerun-failed --extra-verbose
}
package() {
- make -C "$builddir"/build DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" cmake --install build
}
-sha512sums="cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd cmocka-1.1.5.tar.xz
+sha512sums="
+cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd cmocka-1.1.5.tar.xz
773b8675f38eda0ca4df919c23646f029390892dd8f8675ce67c2f736f112d243d4e03aff4f013983bbefc2657cfa6c7563416b7b6dd15dd7aa4015228bb6ad1 wordsize.patch
-b20b5c0d172a9df756ec093a3df4bf5bdf2a0c06a3d3ad39ec001248ccb86e6fd3dcedfc9ce42e8309cc01ea34fadffd4ebcc0fb3af9f5e795e7fe40c461ac60 musl_uintptr.patch"
+b20b5c0d172a9df756ec093a3df4bf5bdf2a0c06a3d3ad39ec001248ccb86e6fd3dcedfc9ce42e8309cc01ea34fadffd4ebcc0fb3af9f5e795e7fe40c461ac60 musl_uintptr.patch
+"
diff --git a/main/cmph/APKBUILD b/main/cmph/APKBUILD
index 202affe42d..1a931ab641 100644
--- a/main/cmph/APKBUILD
+++ b/main/cmph/APKBUILD
@@ -1,9 +1,9 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=cmph
pkgver=2.0.2
-pkgrel=1
+pkgrel=2
pkgdesc="A minimal hash C library - utility application"
-url="http://cmph.sourceforge.net/"
+url="https://cmph.sourceforge.net/"
arch="all"
license="LGPL-2.0-or-later MPL-1.1"
subpackages="$pkgname-dev $pkgname-doc libcmph:lib"
diff --git a/main/compiler-rt/APKBUILD b/main/compiler-rt/APKBUILD
deleted file mode 100644
index 3efbba44e0..0000000000
--- a/main/compiler-rt/APKBUILD
+++ /dev/null
@@ -1,88 +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=1
-_llvmver=${pkgver%%.*}
-pkgdesc="LLVM compiler-rt runtime libraries"
-arch="all"
-url="https://llvm.org/"
-license="Apache-2.0"
-makedepends="
- clang
- cmake
- 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
-
- 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
- # GWP asan is broken
- 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" \
- -DCOMPILER_RT_BUILD_GWP_ASAN=OFF \
- -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
-9aaac8aa9217509cf377b44e20a8c8294b9972e03e9d4f7c1b0ac7c22bcdac6f6a0888ab16b7542e1d6b89a5ac9054c5d8ef8acd1ae1002cca2d0b3df86136a6 sanitizer-supported-arch.patch
-aed5efa8a9c4f3bcb3b377d3c69c3fef387ef73d712bb58d60622d02d09f42b827cd810cd0648ca2a0ed6cca794f98a6176522e528488caf2f9ce08e0138c931 sanitizer-ppc64-musl.patch
-"
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/conky/APKBUILD b/main/conky/APKBUILD
index bebff925af..862fa8b85a 100644
--- a/main/conky/APKBUILD
+++ b/main/conky/APKBUILD
@@ -1,14 +1,31 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=conky
-pkgver=1.12.2
-pkgrel=1
+pkgver=1.15.0
+pkgrel=0
pkgdesc="An advanced, highly configurable system monitor for X based on torsmo"
-url="http://conky.sourceforge.net/"
+url="https://conky.sourceforge.net/"
arch="all"
license="custom"
-makedepends="alsa-lib-dev libxml2-dev curl-dev wireless-tools-dev
- libxft-dev glib-dev libxdamage-dev libxext-dev imlib2-dev lua5.3-dev
- cairo-dev tolua++ ncurses-dev linux-headers cmake gawk libxinerama-dev"
+makedepends="
+ alsa-lib-dev
+ cairo-dev
+ cmake
+ curl-dev
+ gawk
+ glib-dev
+ imlib2-dev
+ libxdamage-dev
+ libxext-dev
+ libxft-dev
+ libxinerama-dev
+ libxml2-dev
+ linux-headers
+ lua5.3-dev
+ ncurses-dev
+ tolua++
+ samurai
+ wireless-tools-dev
+ "
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/brndnmtthws/conky/archive/v$pkgver.tar.gz"
@@ -21,7 +38,7 @@ prepare() {
}
build() {
- cmake . \
+ cmake -B build -G Ninja \
-DRELEASE=ON \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -33,12 +50,14 @@ build() {
-DBUILD_WLAN=ON \
-DBUILD_I18N=OFF \
-DBUILD_LUA_CAIRO=ON
- make
+ cmake --build build
}
package() {
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" cmake --install build
install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
}
-sha512sums="55280953da437efe36320e4c12f74d95b8406bd7d8b7d93c6582f9b346c1c80a94b71d1c27860f6274de9171865fca91e330dfc39feb80bb2f453a538bc5ce1a conky-1.12.2.tar.gz"
+sha512sums="
+d317b0a141355ce56c9dce5ba6e4b9dbe73b05b9b0b85d93d491f6d6da4194c1aceefbbc7e1b10e5fc233a9732933949e273630845194f6c16dce34a77ee5841 conky-1.15.0.tar.gz
+"
diff --git a/main/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD
index 6ee991ade9..eaf1299e0f 100644
--- a/main/conntrack-tools/APKBUILD
+++ b/main/conntrack-tools/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=conntrack-tools
-pkgver=1.4.6
-pkgrel=2
+pkgver=1.4.7
+pkgrel=0
pkgdesc="Connection tracking userspace tools"
url="https://www.netfilter.org/projects/conntrack-tools/"
arch="all"
@@ -48,7 +48,7 @@ package() {
}
sha512sums="
-a48260308a12b11b584fcf4658ec2c4c1adb2801c9cf9a73fc259e5c30d2fbe401aca21e931972413f03e415f98fbf9bd678d2126faa6c6d5748e8a652e58f1a conntrack-tools-1.4.6.tar.bz2
+3d37a6b8cd13fd3c149ab80009d686d2184920ba2d0d5c1b57abed6e92e0dd92cba868bfe22f1a155479fe5ab2e291b8bb8a7e72123a73788032202ac142653b conntrack-tools-1.4.7.tar.bz2
f1d96a8107ff1f95b626d592121b59104a3a013970cad8112fde237db2db514d1383e520adf46bf1384831d8d91ec943838a9391b32c3d1ce2bf6aa83c86e18d conntrackd.initd
fd8cfab207867844db6671a8395efadca792d6085c3436381e574dc52f3b4e41d9526b3db6114dd98e534a5419ca19f291d21c091f8cf0426024d73d18133e6f conntrackd.confd
1e4e6414bbf4210fab83d1a8cd7198bf11f2638d378abd674b1b66bd6ab6bdc048fc4052c3e263bd02dfc8085d007f3092f24e818f8579a940aa3b5af19c1766 conntrackd.logrotate
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 b51a935730..c89c2a97a9 100644
--- a/main/cramfs/APKBUILD
+++ b/main/cramfs/APKBUILD
@@ -1,13 +1,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cramfs
pkgver=1.1
-pkgrel=4
+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"
+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() {
@@ -15,7 +15,7 @@ build() {
}
package() {
- install -Dm755 mkcramfs cramfsck "$pkgdir"/sbin
+ install -Dm755 -t "$pkgdir"/sbin mkcramfs cramfsck
}
sha512sums="6c18dbe32df57f7d132fb2a59a917ad381156ca1f720c1ad0997ca81c62e82fd43ebb0339c5a66d5b144a72ce5c7ae93596522fe2698259f2b68c31db26e3b63 cramfs-1.1.tar.gz
diff --git a/main/crconf/APKBUILD b/main/crconf/APKBUILD
index 7332669bf3..ce5ba09505 100644
--- a/main/crconf/APKBUILD
+++ b/main/crconf/APKBUILD
@@ -2,7 +2,7 @@
pkgname=crconf
pkgver=0_pre2
_realver=pre2
-pkgrel=1
+pkgrel=2
pkgdesc="Linux crypto layer configuration tool"
url="https://sourceforge.net/projects/crconf/"
arch="all"
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index 03672d7a8e..2df5de9728 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cryptsetup
pkgver=2.5.0
-pkgrel=1
+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"
@@ -75,7 +75,7 @@ libs() {
sha512sums="
f457168292ae9fadc34d709494818aee3f18b56bdf5fcff0b2a5ae0b554031ce888d01cd126ca7aa915fcdcb00de6afed2fdb25bbbd690aa8bfcaafa516ade93 cryptsetup-2.5.0.tar.gz
-a3ca3e648749136ee724692b61488cd855f118eb93435942c2b04964a34fe49d0f0da4ef64cd2531c1c0f650e77808cf5d802789fd7664398248ead668bb35e5 dmcrypt.initd
+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/ctags/APKBUILD b/main/ctags/APKBUILD
deleted file mode 100644
index 0530265fa7..0000000000
--- a/main/ctags/APKBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=ctags
-pkgver=5.9.20220703.0
-_realver="p$pkgver"
-pkgrel=0
-pkgdesc="Generator of tags for all types of C/C++ languages"
-url="https://ctags.io/"
-arch="all"
-license="GPL-2.0-or-later"
-checkdepends="diffutils python3"
-makedepends="autoconf automake pkgconf py3-docutils"
-subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/universal-ctags/ctags/archive/$_realver.tar.gz
- disable-check-genfile.patch"
-builddir="$srcdir"/$pkgname-$_realver
-
-# secfixes:
-# 5.8-r5:
-# - CVE-2014-7204
-
-prepare() {
- default_prepare
- ./autogen.sh
-
- # Fail, likely due to compatibility issues with musl's iconv.
- # Alternative solution: Build ctags with --disable-iconv.
- rm -r Tmain/input-encoding-option.d \
- Tmain/output-encoding-option.d
-}
-
-build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --localstatedir=/var \
- --disable-external-sort
- make
-}
-
-check() {
- make check
-}
-
-package() {
- make DESTDIR="$pkgdir" install
-}
-
-sha512sums="
-076723b7081add840bb7af26b833a32d225b008e439ff3ccc576ed762ab0bd9c22bc89b7297338df597b35b1ee1eb26ff643e30e94fa42e7eefa6123d9b62633 ctags-5.9.20220703.0.tar.gz
-185b0647ddaba90ae386c40d75cd8cf8613a89b4d1d0d0905eb78ba3afad57cf273ab2d826053e49d22278f9d3cec97780c8f15aef13c7582658ca24708abf14 disable-check-genfile.patch
-"
diff --git a/main/ctags/disable-check-genfile.patch b/main/ctags/disable-check-genfile.patch
deleted file mode 100644
index 1135411ffb..0000000000
--- a/main/ctags/disable-check-genfile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-The check-genfile target only works when run from inside a Git
-repository. Since we build ctags from a tagged tarball and not from the
-Git repository, invoking `git diff` fails with a usage error and causes
-`make check` to fail.
-
-This should be reported upstream.
-
-diff -upr a/makefiles/testing.mak b/makefiles/testing.mak
---- a/makefiles/testing.mak 2021-10-02 15:48:41.000000000 +0200
-+++ b/makefiles/testing.mak 2021-10-10 12:07:32.081801888 +0200
-@@ -5,7 +5,7 @@ EXTRA_DIST += misc/units misc/units.py m
- EXTRA_DIST += misc/tlib misc/mini-geany.expected
- MAN_TEST_TMPDIR = ManTest
-
--check: tmain units tlib man-test check-genfile
-+check: tmain units tlib man-test
-
- # We may use CLEANFILES, DISTCLEANFILES, or etc.
- # clean-tlib and clean-gcov are not included
diff --git a/main/cunit/APKBUILD b/main/cunit/APKBUILD
index 0e218e765c..8776306469 100644
--- a/main/cunit/APKBUILD
+++ b/main/cunit/APKBUILD
@@ -4,9 +4,9 @@ pkgname=cunit
_pkgname=CUnit
pkgver=2.1.3
_pkgver=${pkgver%.*}-${pkgver##*.}
-pkgrel=3
+pkgrel=4
pkgdesc="Automated testing framework for C"
-url="http://cunit.sourceforge.net/"
+url="https://cunit.sourceforge.net/"
arch="all"
license="GPL-2.0"
makedepends="automake autoconf libtool bash"
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index 7578be4ab4..4a2c6caedc 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cups
pkgver=2.4.2
-pkgrel=0
+pkgrel=1
pkgdesc="The CUPS Printing System"
url="https://github.com/OpenPrinting/cups/"
arch="all"
diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD
index ca1289dc34..200cee07c2 100644
--- a/main/curl/APKBUILD
+++ b/main/curl/APKBUILD
@@ -8,8 +8,8 @@
# this aport from arch=all WILL be reverted.
pkgname=curl
-pkgver=7.84.0
-pkgrel=2
+pkgver=7.86.0
+pkgrel=1
pkgdesc="URL retrival utility and library"
url="https://curl.se/"
arch="all"
@@ -23,12 +23,18 @@ 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.86.0-r0:
+# - CVE-2022-32221
+# - CVE-2022-35260
+# - CVE-2022-42915
+# - CVE-2022-42916
+# 7.85.0-r0:
+# - CVE-2022-35252
# 7.84.0-r0:
# - CVE-2022-32205
# - CVE-2022-32206
@@ -139,11 +145,6 @@ options="net" # Required for running tests
# 0:
# - CVE-2021-22897
-prepare() {
- default_prepare
- autoreconf -vfi
-}
-
build() {
./configure \
--build=$CBUILD \
@@ -153,11 +154,11 @@ build() {
--enable-unix-sockets \
--enable-static \
--with-openssl \
- --without-libidn \
--without-libidn2 \
--with-nghttp2 \
--disable-ldap \
--with-pic \
+ --enable-websockets \
--without-libssh2 # https://bugs.alpinelinux.org/issues/10222
make
@@ -196,6 +197,5 @@ static() {
}
sha512sums="
-86231866a35593a1637fbc0c6af3b6761bdfd99fb35580cc52970c36f19604f93dce59fea67a1d5bb4b455f719307599c7916c77d14f2b661f6bf7fb1ca716ce curl-7.84.0.tar.xz
-f0c9e4744e62818f20634b7fa15b1ccd700b49259a99f151f6dc1067adac83ebb34a9bdd75adb1d8889d23a5d61c86dbfeb2ebad031cd4951a509c6bab9e0986 easy_lock.patch
+18e03a3c00f22125e07bddb18becbf5acdca22baeb7b29f45ef189a5c56f95b2d51247813f7a9a90f04eb051739e9aa7d3a1c5be397bae75d763a2b918d1b656 curl-7.86.0.tar.xz
"
diff --git a/main/curl/easy_lock.patch b/main/curl/easy_lock.patch
deleted file mode 100644
index 17728840b3..0000000000
--- a/main/curl/easy_lock.patch
+++ /dev/null
@@ -1,53 +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
-From 897d72b6c749545ee3d07052f9d1c69fd80b9dab Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Tue, 28 Jun 2022 09:00:25 +0200
-Subject: [PATCH] easy_lock: switch to using atomic_int instead of bool
-
-To work with more compilers without requiring separate libs to
-link. Like with gcc-12 for RISC-V on Linux.
-
-Reported-by: Adam Sampson
-Fixes #9055
----
- lib/easy_lock.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/easy_lock.h b/lib/easy_lock.h
-index 07c85c5ffdd19..9c11bc50c5f20 100644
---- a/lib/easy_lock.h
-+++ b/lib/easy_lock.h
-@@ -40,8 +40,8 @@
- #include <sched.h>
- #endif
-
--#define curl_simple_lock atomic_bool
--#define CURL_SIMPLE_LOCK_INIT false
-+#define curl_simple_lock atomic_int
-+#define CURL_SIMPLE_LOCK_INIT 0
-
- static inline void curl_simple_lock_lock(curl_simple_lock *lock)
- {
diff --git a/main/cutter/APKBUILD b/main/cutter/APKBUILD
index bcf88fc4cd..71451acce1 100644
--- a/main/cutter/APKBUILD
+++ b/main/cutter/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=cutter
pkgver=1.04
-pkgrel=2
+pkgrel=3
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"
license="GPL-2.0"
makedepends="linux-headers"
options="!check"
-source="http://www.digitage.co.uk/digitage/files/cutter/$pkgname-$pkgver.tgz
+source="http://dev.alpinelinux.org/archive/cutter/cutter-$pkgver.tgz
musl-fix.patch"
build() {
@@ -20,5 +20,7 @@ package() {
install -m755 -D $pkgname "$pkgdir"/usr/sbin/$pkgname
}
-sha512sums="79c17ec8c17e696a79aa8b11fda347f2e6929eb35f9a37da450acf6aff7ab9471e13eaef24708f90f3f0c2791fade2eb944443b98df3d3ae4eef0c408abc7b3a cutter-1.04.tgz
-815ffcfbae6865443b49390f1c5dc583243009150271804468aad00102b136ac2e6abe565efa18d15f4411690444ca6fdd1184a8b31e61f5a62115f87f6d53dc musl-fix.patch"
+sha512sums="
+79c17ec8c17e696a79aa8b11fda347f2e6929eb35f9a37da450acf6aff7ab9471e13eaef24708f90f3f0c2791fade2eb944443b98df3d3ae4eef0c408abc7b3a cutter-1.04.tgz
+fca7cabce0b142c31bcbbede138f20c7389e58d8ad9d82480526b5ab90165ce6493d54c3a3e9270f02bccc08ae248a7b4d62b34bb26c117e6f4b18106c37106d musl-fix.patch
+"
diff --git a/main/cutter/musl-fix.patch b/main/cutter/musl-fix.patch
index e8ff6de41d..16f4e189d0 100644
--- a/main/cutter/musl-fix.patch
+++ b/main/cutter/musl-fix.patch
@@ -1,6 +1,19 @@
---- ./cutter.c.orig
-+++ ./cutter.c
-@@ -47,7 +47,6 @@
+diff --git a/Makefile b/Makefile
+index 1f11226..d347768 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+ cutter: cutter.c
+- cc cutter.c -o cutter
++ cc $(CFLAGS) cutter.c -o cutter $(LDFLAGS)
+
+ clean:
+ rm -f cutter.o cutter
+diff --git a/cutter.c b/cutter.c
+index 1c639c9..0d0466b 100644
+--- a/cutter.c
++++ b/cutter.c
+@@ -44,7 +44,6 @@
#include <linux/socket.h>
#include <linux/ip.h>
#include <linux/tcp.h>
@@ -8,3 +21,20 @@
#include <fcntl.h>
#include <netpacket/packet.h>
#include <net/ethernet.h> /* the L2 protocols */
+@@ -54,6 +53,7 @@
+ #include <arpa/inet.h>
+ #include <net/if.h>
+ #include <errno.h>
++#include <time.h>
+
+ #define ETHHDR sizeof(struct ethhdr)
+ #define TCPHDR sizeof(struct tcphdr)
+@@ -129,7 +129,7 @@ int getnexthop(in_addr_t ip, char *intf, in_addr_t *gateway)
+ dest_ip = gateway_ip = flags = refcnt = use
+ = metric = mask = mtu = window = irtt = -1;
+
+- if (sscanf(buff, "%s %8lx %8lx %4x %d %d %d %8lx %d %d %d",
++ if (sscanf(buff, "%s %8x %8x %4x %d %d %d %8x %d %d %d",
+ iface, &dest_ip, &gateway_ip, &flags, &refcnt,
+ &use, &metric, &mask, &mtu, &window, &irtt
+ ) == 11) {
diff --git a/main/cvechecker/APKBUILD b/main/cvechecker/APKBUILD
index 7e7c4641e5..5c7339ca8a 100644
--- a/main/cvechecker/APKBUILD
+++ b/main/cvechecker/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=cvechecker
pkgver=4.0
-pkgrel=1
+pkgrel=2
pkgdesc="A local CVE checker tool"
url="https://github.com/sjvermeu/cvechecker/wiki"
arch="all"
diff --git a/main/cvs/APKBUILD b/main/cvs/APKBUILD
index 108fadb6bb..596788513a 100644
--- a/main/cvs/APKBUILD
+++ b/main/cvs/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cvs
pkgver=1.12.13
-pkgrel=1
+pkgrel=2
pkgdesc="Concurrent Versions System"
url="https://www.nongnu.org/cvs/"
arch="all"
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index fa40d31ddb..954644e546 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=2
+pkgrel=3
pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
url="https://www.cyrusimap.org/sasl/"
arch="all"
@@ -85,6 +85,7 @@ build() {
--enable-anon \
--enable-cram \
--enable-digest \
+ --enable-httpform \
--enable-ntlm \
--enable-plain \
--enable-login \
diff --git a/main/cython/APKBUILD b/main/cython/APKBUILD
index 732970dde2..5f1bb86e6c 100644
--- a/main/cython/APKBUILD
+++ b/main/cython/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=cython
pkgver=0.29.32
-pkgrel=0
+pkgrel=1
pkgdesc="Cython is an optimising static compiler for both the Python & the extended Cython programming languages."
url="https://cython.org/"
arch="all"
diff --git a/main/d-feet/APKBUILD b/main/d-feet/APKBUILD
index f18e741687..79de5428be 100644
--- a/main/d-feet/APKBUILD
+++ b/main/d-feet/APKBUILD
@@ -3,7 +3,7 @@
pkgname=d-feet
pkgver=0.3.16
_v=${pkgver%.*}
-pkgrel=1
+pkgrel=2
pkgdesc="powerful D-Bus Debugger"
options="!check" # Testsuite loops infinitely
url="https://wiki.gnome.org/action/show/Apps/DFeet"
@@ -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 03722e5745..2ba8fb9979 100644
--- a/main/dahdi-linux-lts/APKBUILD
+++ b/main/dahdi-linux-lts/APKBUILD
@@ -4,20 +4,20 @@
# when changing _ver we *must* bump _rel
_name=dahdi-linux
-_ver=3.1.0
-_rel=0
-
+_ver=3.2.0
+_rel=1
+# when changing _kver/_krel make sure _rel=0
_flavor=${FLAVOR:-lts}
_kpkg=linux-$_flavor
-_kver=5.15.61
-_krel=0
+_kver=5.15.79
+_krel=1
_kpkgver="$_kver-r$_krel"
_kabi="$_kver-$_krel-$_flavor"
pkgname=$_name-$_flavor
pkgver=$_kver
-pkgrel=$(( $_krel + $_rel ))
+pkgrel=$(( _krel + _rel ))
pkgdesc="Digium Asterisk Hardware Device Interface drivers"
url="https://www.asterisk.org/"
@@ -28,12 +28,9 @@ depends="dahdi-linux $_kpkg=$_kpkgver"
# options for tar and wget.
makedepends="$_kpkg-dev=$_kpkgver wget tar perl"
subpackages="$pkgname-dev"
-source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_name}-$_ver.tar.gz
+source="https://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_name}-$_ver.tar.gz
dahdi-depmod.patch
dahdi-bri_dchan.patch
- kernel-compat-5.4.patch
- kernel-5.6.patch
- kernel-5.9.patch
"
builddir="$srcdir/$_name-$_ver"
@@ -54,12 +51,12 @@ prepare() {
build() {
cd "$srcdir/$_name-$_ver"
- make KVERS="${_kabi}" DYNFS="yes"
+ make KVERS="$_kabi" DYNFS="yes"
}
package() {
cd "$srcdir/$_name-$_ver"
- make KVERS="${_kabi}" DYNFS="yes" \
+ make KVERS="$_kabi" DYNFS="yes" \
DESTDIR="$pkgdir" install-modules
rm -rf "$pkgdir"/lib/firmware "$pkgdir"/usr/lib/hotplug/firmware \
"$pkgdir"/usr/include || true
@@ -70,17 +67,14 @@ package() {
depends_dev="dahdi-linux-dev"
dev() {
default_dev
- local dir="$subpkgdir"/usr/src/dahdi-headers-${_kabi}
+ local dir="$subpkgdir"/usr/src/dahdi-headers-"$_kabi"
install -D "$srcdir"/$_name-$_ver/drivers/dahdi/Module.symvers \
"$dir"/drivers/dahdi/Module.symvers
ln -s /usr/include "$dir"/include
}
sha512sums="
-440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4 dahdi-linux-3.1.0.tar.gz
+cb4b06d5a83aae7ce54049137d989fa6275367debc77a1df64cc36ba1bda08a058ea92f01bb873bcd83c3c7d58ff4c5da42c67bbbe8a02b8f4f0e12348c4a072 dahdi-linux-3.2.0.tar.gz
aba01eb90d9db1c595ff22078c76aadb20900486b5794d38b7ee61fa30d2fb51be318a4d059246017640447aee03fb09bb5514c818e3caa1cd98e331ec065173 dahdi-depmod.patch
fa2fa9e96eefc0f31a1a4a8f8f44e77936f6da0d7b74fe3c3d1f0de085621744ae4367932ac97a10b7f96b7d0954843b0bfe07a251b85434079cc6da29e243ba dahdi-bri_dchan.patch
-a03fde27c801bd7a9f5267505072a50dc738dcac9cafb08539bbd38eb78f3bb688f067bbbcbe05521a6f38fe28d4e8bfee68c30acea24647a4ea0d28a05bd987 kernel-compat-5.4.patch
-136f49357761252cde233e664c1972beb140877ae46d8095364377eafcbe3ca908adcb6741881d9b0d0716a8525cda134e1db221f38b1ef3d39aea0b9c522b0d kernel-5.6.patch
-2430f50caf6145c0fc3c318fb54968004939a5eb7a3e2d85e9a91a2a71b8408a16cecc63e8c741659b6974bad078d0ead540e5364729e29a62ba81c84638923a kernel-5.9.patch
"
diff --git a/main/dahdi-linux-lts/kernel-5.6.patch b/main/dahdi-linux-lts/kernel-5.6.patch
deleted file mode 100644
index 6cb63b8649..0000000000
--- a/main/dahdi-linux-lts/kernel-5.6.patch
+++ /dev/null
@@ -1,499 +0,0 @@
-From 34b9c77c9ab2794d4e912461e4c1080c4b1f6184 Mon Sep 17 00:00:00 2001
-From: Shaun Ruffell <sruffell@sruffell.net>
-Date: Sun, 23 Feb 2020 19:39:24 -0600
-Subject: [PATCH] Use proc_ops on kernels >= 5.6
-
-In commit (d56c0d45f0e27 "proc: decouple proc from VFS with "struct proc_ops"")
-[1], proc_create_data no longer takes a file_operations structure, but instead
-takes a struct proc_ops in order to conserve memory in the kernel.
-
-This change is necessary for DAHDI to work with kernels >= 5.6
-
-[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d56c0d45f0e27f814e87a1676b6bd
-
-Signed-off-by: Shaun Ruffell <sruffell@sruffell.net>
----
- drivers/dahdi/dahdi-base.c | 9 +++++
- drivers/dahdi/dahdi_dynamic_ethmf.c | 18 +++++++---
- drivers/dahdi/xpp/card_bri.c | 23 ++++++++++---
- drivers/dahdi/xpp/card_fxo.c | 25 ++++++++++----
- drivers/dahdi/xpp/card_fxs.c | 35 +++++++++++++++++---
- drivers/dahdi/xpp/xbus-core.c | 62 ++++++++++++++++++++++++++++-------
- drivers/dahdi/xpp/xpp_dahdi.c | 23 ++++++++++---
- drivers/dahdi/xpp/xpp_usb.c | 26 +++++++++++----
- include/dahdi/kernel.h | 11 +++++--
- 9 files changed, 187 insertions(+), 45 deletions(-)
-
-diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
-index d05eff9..4fb06d9 100644
---- a/drivers/dahdi/dahdi-base.c
-+++ b/drivers/dahdi/dahdi-base.c
-@@ -1015,6 +1015,14 @@ static int dahdi_proc_open(struct inode *inode, struct file *file)
- return single_open(file, dahdi_seq_show, PDE_DATA(inode));
- }
-
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops dahdi_proc_ops = {
-+ .proc_open = dahdi_proc_open,
-+ .proc_read = seq_read,
-+ .proc_lseek = seq_lseek,
-+ .proc_release = single_release,
-+};
-+#else
- static const struct file_operations dahdi_proc_ops = {
- .owner = THIS_MODULE,
- .open = dahdi_proc_open,
-@@ -1022,6 +1030,7 @@ static const struct file_operations dahdi_proc_ops = {
- .llseek = seq_lseek,
- .release = single_release,
- };
-+#endif /* DAHDI_HAVE_PROC_OPS */
-
- #endif
-
-diff --git a/drivers/dahdi/dahdi_dynamic_ethmf.c b/drivers/dahdi/dahdi_dynamic_ethmf.c
-index b729079..022afc7 100644
---- a/drivers/dahdi/dahdi_dynamic_ethmf.c
-+++ b/drivers/dahdi/dahdi_dynamic_ethmf.c
-@@ -733,12 +733,22 @@ static int ztdethmf_proc_open(struct inode *inode, struct file *file)
- return single_open(file, ztdethmf_proc_show, NULL);
- }
-
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops ztdethmf_proc_fops = {
-+ .proc_open = ztdethmf_proc_open,
-+ .proc_read = seq_read,
-+ .proc_lseek = seq_lseek,
-+ .proc_release = seq_release,
-+};
-+#else
- static const struct file_operations ztdethmf_proc_fops = {
-- .open = ztdethmf_proc_open,
-- .read = seq_read,
-- .llseek = seq_lseek,
-- .release = seq_release,
-+ .owner = THIS_MODULE,
-+ .open = ztdethmf_proc_open,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .release = seq_release,
- };
-+#endif /* DAHDI_HAVE_PROC_OPS */
- #endif
-
- static int __init ztdethmf_init(void)
-diff --git a/drivers/dahdi/xpp/card_bri.c b/drivers/dahdi/xpp/card_bri.c
-index 12efecf..5d819ca 100644
---- a/drivers/dahdi/xpp/card_bri.c
-+++ b/drivers/dahdi/xpp/card_bri.c
-@@ -153,8 +153,12 @@ static int write_state_register(xpd_t *xpd, __u8 value);
- static bool bri_packet_is_valid(xpacket_t *pack);
- static void bri_packet_dump(const char *msg, xpacket_t *pack);
- #ifdef CONFIG_PROC_FS
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops proc_bri_info_ops;
-+#else
- static const struct file_operations proc_bri_info_ops;
- #endif
-+#endif
- static int bri_spanconfig(struct file *file, struct dahdi_span *span,
- struct dahdi_lineconfig *lc);
- static int bri_chanconfig(struct file *file, struct dahdi_chan *chan,
-@@ -1740,13 +1744,22 @@ static int proc_bri_info_open(struct inode *inode, struct file *file)
- return single_open(file, proc_bri_info_show, PDE_DATA(inode));
- }
-
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops proc_bri_info_ops = {
-+ .proc_open = proc_bri_info_open,
-+ .proc_read = seq_read,
-+ .proc_lseek = seq_lseek,
-+ .proc_release = single_release,
-+};
-+#else
- static const struct file_operations proc_bri_info_ops = {
-- .owner = THIS_MODULE,
-- .open = proc_bri_info_open,
-- .read = seq_read,
-- .llseek = seq_lseek,
-- .release = single_release,
-+ .owner = THIS_MODULE,
-+ .open = proc_bri_info_open,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .release = single_release,
- };
-+#endif /* DAHDI_HAVE_PROC_OPS */
- #endif
-
- static int bri_xpd_probe(struct device *dev)
-diff --git a/drivers/dahdi/xpp/card_fxo.c b/drivers/dahdi/xpp/card_fxo.c
-index 1dbd299..82dbb7a 100644
---- a/drivers/dahdi/xpp/card_fxo.c
-+++ b/drivers/dahdi/xpp/card_fxo.c
-@@ -107,9 +107,13 @@ enum fxo_leds {
- static bool fxo_packet_is_valid(xpacket_t *pack);
- static void fxo_packet_dump(const char *msg, xpacket_t *pack);
- #ifdef CONFIG_PROC_FS
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops proc_fxo_info_ops;
-+#else
- static const struct file_operations proc_fxo_info_ops;
-+#endif
- #ifdef WITH_METERING
--static const struct file_operations proc_xpd_metering_ops;
-+static const struct proc_ops proc_xpd_metering_ops;
- #endif
- #endif
- static void dahdi_report_battery(xpd_t *xpd, lineno_t chan);
-@@ -1484,13 +1488,22 @@ static int proc_fxo_info_open(struct inode *inode, struct file *file)
- return single_open(file, proc_fxo_info_show, PDE_DATA(inode));
- }
-
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops proc_fxo_info_ops = {
-+ .proc_open = proc_fxo_info_open,
-+ .proc_read = seq_read,
-+ .proc_lseek = seq_lseek,
-+ .proc_release = single_release,
-+};
-+#else
- static const struct file_operations proc_fxo_info_ops = {
-- .owner = THIS_MODULE,
-- .open = proc_fxo_info_open,
-- .read = seq_read,
-- .llseek = seq_lseek,
-- .release = single_release,
-+ .owner = THIS_MODULE,
-+ .open = proc_fxo_info_open,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .release = single_release,
- };
-+#endif
-
- #ifdef WITH_METERING
- static int proc_xpd_metering_show(struct seq_file *sfile, void *not_used)
-diff --git a/drivers/dahdi/xpp/card_fxs.c b/drivers/dahdi/xpp/card_fxs.c
-index a3a9233..bb1c169 100644
---- a/drivers/dahdi/xpp/card_fxs.c
-+++ b/drivers/dahdi/xpp/card_fxs.c
-@@ -160,11 +160,19 @@ enum neon_state {
- static bool fxs_packet_is_valid(xpacket_t *pack);
- static void fxs_packet_dump(const char *msg, xpacket_t *pack);
- #ifdef CONFIG_PROC_FS
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops proc_fxs_info_ops;
-+#else
- static const struct file_operations proc_fxs_info_ops;
-+#endif
- #ifdef WITH_METERING
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops proc_xpd_metering_ops;
-+#else
- static const struct file_operations proc_xpd_metering_ops;
- #endif
- #endif
-+#endif
- static void start_stop_vm_led(xbus_t *xbus, xpd_t *xpd, lineno_t pos);
-
- #define PROC_FXS_INFO_FNAME "fxs_info"
-@@ -2115,13 +2123,22 @@ static int proc_fxs_info_open(struct inode *inode, struct file *file)
- return single_open(file, proc_fxs_info_show, PDE_DATA(inode));
- }
-
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops proc_fxs_info_ops = {
-+ .proc_open = proc_fxs_info_open,
-+ .proc_read = seq_read,
-+ .proc_lseek = seq_lseek,
-+ .proc_release = single_release,
-+};
-+#else
- static const struct file_operations proc_fxs_info_ops = {
-- .owner = THIS_MODULE,
-- .open = proc_fxs_info_open,
-- .read = seq_read,
-- .llseek = seq_lseek,
-- .release = single_release,
-+ .owner = THIS_MODULE,
-+ .open = proc_fxs_info_open,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .release = single_release,
- };
-+#endif
-
- #ifdef WITH_METERING
- static ssize_t proc_xpd_metering_write(struct file *file,
-@@ -2165,12 +2182,20 @@ static int proc_xpd_metering_open(struct inode *inode, struct file *file)
- file->private_data = PDE_DATA(inode);
- }
-
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops proc_xpd_metering_ops = {
-+ .proc_open = proc_xpd_metering_open,
-+ .proc_write = proc_xpd_metering_write,
-+ .proc_release = single_release,
-+};
-+#else
- static const struct file_operations proc_xpd_metering_ops = {
- .owner = THIS_MODULE,
- .open = proc_xpd_metering_open,
- .write = proc_xpd_metering_write,
- .release = single_release,
- };
-+#endif /* DAHDI_HAVE_PROC_OPS */
- #endif
- #endif
-
-diff --git a/drivers/dahdi/xpp/xbus-core.c b/drivers/dahdi/xpp/xbus-core.c
-index fc4ce7b..ed7c0f9 100644
---- a/drivers/dahdi/xpp/xbus-core.c
-+++ b/drivers/dahdi/xpp/xbus-core.c
-@@ -50,8 +50,15 @@ static const char rcsid[] = "$Id$";
- #ifdef PROTOCOL_DEBUG
- #ifdef CONFIG_PROC_FS
- #define PROC_XBUS_COMMAND "command"
-+
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops proc_xbus_command_ops;
-+#else
- static const struct file_operations proc_xbus_command_ops;
-+#endif /* DAHDI_HAVE_PROC_OPS */
-+
- #endif
-+
- #endif
-
- /* Command line parameters */
-@@ -65,8 +72,15 @@ static DEF_PARM_BOOL(dahdi_autoreg, 0, 0444,
- "Register devices automatically (1) or not (0). UNUSED.");
-
- #ifdef CONFIG_PROC_FS
-+
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops xbus_read_proc_ops;
-+#else
- static const struct file_operations xbus_read_proc_ops;
--#endif
-+#endif /* DAHDI_HAVE_PROC_OPS */
-+
-+#endif /* CONFIG_PROC_FS */
-+
- static void transport_init(xbus_t *xbus, struct xbus_ops *ops,
- ushort max_send_size,
- struct device *transport_device, void *priv);
-@@ -1828,13 +1842,22 @@ static int xbus_read_proc_open(struct inode *inode, struct file *file)
- return single_open(file, xbus_proc_show, PDE_DATA(inode));
- }
-
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops xbus_read_proc_ops = {
-+ .proc_open = xbus_read_proc_open,
-+ .proc_read = seq_read,
-+ .proc_lseek = seq_lseek,
-+ .proc_release = single_release,
-+};
-+#else
- static const struct file_operations xbus_read_proc_ops = {
-- .owner = THIS_MODULE,
-- .open = xbus_read_proc_open,
-- .read = seq_read,
-- .llseek = seq_lseek,
-- .release = single_release,
-+ .owner = THIS_MODULE,
-+ .open = xbus_read_proc_open,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .release = single_release,
- };
-+#endif /* DAHDI_HAVE_PROC_OPS */
-
- #ifdef PROTOCOL_DEBUG
- static ssize_t proc_xbus_command_write(struct file *file,
-@@ -1927,11 +1950,19 @@ static int proc_xbus_command_open(struct inode *inode, struct file *file)
- return 0;
- }
-
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops proc_xbus_command_ops = {
-+ .proc_open = proc_xbus_command_open,
-+ .proc_write = proc_xbus_command_write,
-+};
-+#else
- static const struct file_operations proc_xbus_command_ops = {
- .owner = THIS_MODULE,
- .open = proc_xbus_command_open,
- .write = proc_xbus_command_write,
- };
-+#endif /* DAHDI_HAVE_PROC_OPS */
-+
- #endif
-
- static int xpp_proc_read_show(struct seq_file *sfile, void *data)
-@@ -1961,13 +1992,22 @@ static int xpp_proc_read_open(struct inode *inode, struct file *file)
- return single_open(file, xpp_proc_read_show, PDE_DATA(inode));
- }
-
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops xpp_proc_read_ops = {
-+ .proc_open = xpp_proc_read_open,
-+ .proc_read = seq_read,
-+ .proc_lseek = seq_lseek,
-+ .proc_release = single_release,
-+};
-+#else
- static const struct file_operations xpp_proc_read_ops = {
-- .owner = THIS_MODULE,
-- .open = xpp_proc_read_open,
-- .read = seq_read,
-- .llseek = seq_lseek,
-- .release = single_release,
-+ .owner = THIS_MODULE,
-+ .open = xpp_proc_read_open,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .release = single_release,
- };
-+#endif /* DAHDI_HAVE_PROC_OPS */
-
- #endif
-
-diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c
-index ecc272b..fd8b835 100644
---- a/drivers/dahdi/xpp/xpp_dahdi.c
-+++ b/drivers/dahdi/xpp/xpp_dahdi.c
-@@ -103,8 +103,12 @@ int total_registered_spans(void)
- }
-
- #ifdef CONFIG_PROC_FS
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops xpd_read_proc_ops;
-+#else
- static const struct file_operations xpd_read_proc_ops;
- #endif
-+#endif
-
- /*------------------------- XPD Management -------------------------*/
-
-@@ -392,13 +396,22 @@ static int xpd_read_proc_open(struct inode *inode, struct file *file)
- return single_open(file, xpd_read_proc_show, PDE_DATA(inode));
- }
-
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops xpd_read_proc_ops = {
-+ .proc_open = xpd_read_proc_open,
-+ .proc_read = seq_read,
-+ .proc_lseek = seq_lseek,
-+ .proc_release = single_release,
-+};
-+#else
- static const struct file_operations xpd_read_proc_ops = {
-- .owner = THIS_MODULE,
-- .open = xpd_read_proc_open,
-- .read = seq_read,
-- .llseek = seq_lseek,
-- .release = single_release,
-+ .owner = THIS_MODULE,
-+ .open = xpd_read_proc_open,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .release = single_release,
- };
-+#endif
-
- #endif
-
-diff --git a/drivers/dahdi/xpp/xpp_usb.c b/drivers/dahdi/xpp/xpp_usb.c
-index 1a591b1..bae2f57 100644
---- a/drivers/dahdi/xpp/xpp_usb.c
-+++ b/drivers/dahdi/xpp/xpp_usb.c
-@@ -227,9 +227,14 @@ static void xpp_receive_callback(struct urb *urb);
- static int xusb_probe(struct usb_interface *interface,
- const struct usb_device_id *id);
- static void xusb_disconnect(struct usb_interface *interface);
--#ifdef CONFIG_PROC_FS
-+
-+#ifdef CONFIG_PROC_FS
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops xusb_read_proc_ops;
-+#else
- static const struct file_operations xusb_read_proc_ops;
- #endif
-+#endif
-
- /*------------------------------------------------------------------*/
-
-@@ -1108,13 +1113,22 @@ static int xusb_read_proc_open(struct inode *inode, struct file *file)
- return single_open(file, xusb_read_proc_show, PDE_DATA(inode));
- }
-
-+#ifdef DAHDI_HAVE_PROC_OPS
-+static const struct proc_ops xusb_read_proc_ops = {
-+ .proc_open = xusb_read_proc_open,
-+ .proc_read = seq_read,
-+ .proc_lseek = seq_lseek,
-+ .proc_release = single_release,
-+};
-+#else
- static const struct file_operations xusb_read_proc_ops = {
-- .owner = THIS_MODULE,
-- .open = xusb_read_proc_open,
-- .read = seq_read,
-- .llseek = seq_lseek,
-- .release = single_release,
-+ .owner = THIS_MODULE,
-+ .open = xusb_read_proc_open,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .release = single_release,
- };
-+#endif
-
-
- #endif
-diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
-index cf629eb..dc16f81 100644
---- a/include/dahdi/kernel.h
-+++ b/include/dahdi/kernel.h
-@@ -62,6 +62,8 @@
- #define HAVE_NET_DEVICE_OPS
- #endif
-
-+#define DAHDI_HAVE_PROC_OPS
-+
- /* __dev* were removed in 3.8. They still have effect in 2.6.18. */
- #ifndef __devinit
- # define __devinit
-@@ -1369,6 +1371,10 @@ static inline short dahdi_txtone_nextsample(struct dahdi_chan *ss)
- /*! Maximum audio mask */
- #define DAHDI_FORMAT_AUDIO_MASK ((1 << 16) - 1)
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
-+
-+#undef DAHDI_HAVE_PROC_OPS
-+
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
-
- #ifndef TIMER_DATA_TYPE
-@@ -1479,14 +1485,13 @@ static inline void *PDE_DATA(const struct inode *inode)
- #endif /* 4.10.0 */
- #endif /* 4.11.0 */
- #endif /* 4.13.0 */
--#else /* >= 4.15.0 */
-+#endif /* 4.15.0 */
-+#endif /* 5.6 */
-
- #ifndef TIMER_DATA_TYPE
- #define TIMER_DATA_TYPE struct timer_list *
- #endif
-
--#endif /* 4.15.0 */
--
- #ifndef dahdi_ktime_equal
- static inline int dahdi_ktime_equal(const ktime_t cmp1, const ktime_t cmp2)
- {
---
-1.7.9.5
-
diff --git a/main/dahdi-linux-lts/kernel-5.9.patch b/main/dahdi-linux-lts/kernel-5.9.patch
deleted file mode 100644
index 75c23a548f..0000000000
--- a/main/dahdi-linux-lts/kernel-5.9.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-From 4df746fe3ffd6678f36b16c9b0750fa552da92e4 Mon Sep 17 00:00:00 2001
-From: Shaun Ruffell <sruffell@sruffell.net>
-Date: Mon, 16 Nov 2020 22:01:21 -0600
-Subject: [PATCH] Remove support for 32-bit userspace with 64-bit kernel
-
-I am not aware of anyone who tests in this configuration, and I'm not
-sure if it currently works. I'll remove any support for the time being
-and can add it back in if someone comes forward needing support for it.
-
-Signed-off-by: Shaun Ruffell <sruffell@sruffell.net>
----
- drivers/dahdi/dahdi-base.c | 34 ----------------------------------
- 1 file changed, 34 deletions(-)
-
-diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
-index 4fb06d9..9fb0c79 100644
---- a/drivers/dahdi/dahdi-base.c
-+++ b/drivers/dahdi/dahdi-base.c
-@@ -7019,17 +7019,6 @@ static int dahdi_ioctl(struct inode *inode, struct file *file,
- }
- #endif
-
--#ifdef HAVE_COMPAT_IOCTL
--static long dahdi_ioctl_compat(struct file *file, unsigned int cmd,
-- unsigned long data)
--{
-- if (cmd == DAHDI_SFCONFIG)
-- return -ENOTTY; /* Not supported yet */
--
-- return dahdi_unlocked_ioctl(file, cmd, data);
--}
--#endif
--
- /**
- * _get_next_channo - Return the next taken channel number from the span list.
- * @span: The span with which to start the search.
-@@ -10285,9 +10274,6 @@ static const struct file_operations dahdi_fops = {
- .release = dahdi_release,
- #ifdef HAVE_UNLOCKED_IOCTL
- .unlocked_ioctl = dahdi_unlocked_ioctl,
--#ifdef HAVE_COMPAT_IOCTL
-- .compat_ioctl = dahdi_ioctl_compat,
--#endif
- #else
- .ioctl = dahdi_ioctl,
- #endif
-@@ -10301,9 +10287,6 @@ static const struct file_operations dahdi_timer_fops = {
- .release = dahdi_timer_release,
- #ifdef HAVE_UNLOCKED_IOCTL
- .unlocked_ioctl = dahdi_timer_unlocked_ioctl,
--#ifdef HAVE_COMPAT_IOCTL
-- .compat_ioctl = dahdi_timer_unlocked_ioctl,
--#endif
- #else
- .ioctl = dahdi_timer_ioctl,
- #endif
-@@ -10377,24 +10360,10 @@ static int nodev_ioctl(struct inode *inode, struct file *file,
- }
- #endif
-
--#ifdef HAVE_COMPAT_IOCTL
--static long nodev_ioctl_compat(struct file *file, unsigned int cmd,
-- unsigned long data)
--{
-- if (cmd == DAHDI_SFCONFIG)
-- return -ENOTTY; /* Not supported yet */
--
-- return nodev_unlocked_ioctl(file, cmd, data);
--}
--#endif
--
- static const struct file_operations nodev_fops = {
- .owner = THIS_MODULE,
- #ifdef HAVE_UNLOCKED_IOCTL
- .unlocked_ioctl = nodev_unlocked_ioctl,
--#ifdef HAVE_COMPAT_IOCTL
-- .compat_ioctl = nodev_ioctl_compat,
--#endif
- #else
- .ioctl = nodev_ioctl,
- #endif
-@@ -10409,9 +10378,6 @@ static const struct file_operations dahdi_chan_fops = {
- .release = dahdi_release,
- #ifdef HAVE_UNLOCKED_IOCTL
- .unlocked_ioctl = dahdi_unlocked_ioctl,
--#ifdef HAVE_COMPAT_IOCTL
-- .compat_ioctl = dahdi_ioctl_compat,
--#endif
- #else
- .ioctl = dahdi_ioctl,
- #endif
---
-1.7.9.5
-
-From 6d4c748e0470efac90e7dc4538ff3c5da51f0169 Mon Sep 17 00:00:00 2001
-From: Shaun Ruffell <sruffell@sruffell.net>
-Date: Mon, 16 Nov 2020 22:01:22 -0600
-Subject: [PATCH] Remove checks for HAVE_UNLOCKED_IOCTL for kernel >= 5.9
-
-In upstream commit (4e24566a134ea1674 "fs: remove the HAVE_UNLOCKED_IOCTL and
-HAVE_COMPAT_IOCTL defines") [1] the kernel removed these defines.
-
-All supported kernels include support for the unlocked_ioctl now, so
-DAHDI can also remove these checks.
-
-[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4e24566a134ea167441a1ffa3d439a27c
-
-Signed-off-by: Shaun Ruffell <sruffell@sruffell.net>
----
- drivers/dahdi/dahdi-base.c | 44 ---------------------------------------
- drivers/dahdi/dahdi_transcode.c | 11 ----------
- 2 files changed, 55 deletions(-)
-
-diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
-index 9fb0c79..bb51e9c 100644
---- a/drivers/dahdi/dahdi-base.c
-+++ b/drivers/dahdi/dahdi-base.c
-@@ -53,10 +53,6 @@
- #include <linux/ktime.h>
- #include <linux/slab.h>
-
--#if defined(HAVE_UNLOCKED_IOCTL) && defined(CONFIG_BKL)
--#include <linux/smp_lock.h>
--#endif
--
- #include <linux/ppp_defs.h>
-
- #include <asm/atomic.h>
-@@ -4069,14 +4065,6 @@ dahdi_timer_unlocked_ioctl(struct file *file, unsigned int cmd,
- return 0;
- }
-
--#ifndef HAVE_UNLOCKED_IOCTL
--static int dahdi_timer_ioctl(struct inode *inode, struct file *file,
-- unsigned int cmd, unsigned long data)
--{
-- return dahdi_timer_unlocked_ioctl(file, cmd, data);
--}
--#endif
--
- static int dahdi_ioctl_getgains(struct file *file, unsigned long data)
- {
- int res = 0;
-@@ -7011,14 +6999,6 @@ exit:
- return ret;
- }
-
--#ifndef HAVE_UNLOCKED_IOCTL
--static int dahdi_ioctl(struct inode *inode, struct file *file,
-- unsigned int cmd, unsigned long data)
--{
-- return dahdi_unlocked_ioctl(file, cmd, data);
--}
--#endif
--
- /**
- * _get_next_channo - Return the next taken channel number from the span list.
- * @span: The span with which to start the search.
-@@ -10272,11 +10252,7 @@ static const struct file_operations dahdi_fops = {
- .owner = THIS_MODULE,
- .open = dahdi_open,
- .release = dahdi_release,
--#ifdef HAVE_UNLOCKED_IOCTL
- .unlocked_ioctl = dahdi_unlocked_ioctl,
--#else
-- .ioctl = dahdi_ioctl,
--#endif
- .poll = dahdi_poll,
- .read = dahdi_no_read,
- .write = dahdi_no_write,
-@@ -10285,11 +10261,7 @@ static const struct file_operations dahdi_fops = {
- static const struct file_operations dahdi_timer_fops = {
- .owner = THIS_MODULE,
- .release = dahdi_timer_release,
--#ifdef HAVE_UNLOCKED_IOCTL
- .unlocked_ioctl = dahdi_timer_unlocked_ioctl,
--#else
-- .ioctl = dahdi_timer_ioctl,
--#endif
- .poll = dahdi_timer_poll,
- .read = dahdi_no_read,
- .write = dahdi_no_write,
-@@ -10352,21 +10324,9 @@ nodev_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long data)
- return nodev_common("ioctl");
- }
-
--#ifndef HAVE_UNLOCKED_IOCTL
--static int nodev_ioctl(struct inode *inode, struct file *file,
-- unsigned int cmd, unsigned long data)
--{
-- return nodev_unlocked_ioctl(file, cmd, data);
--}
--#endif
--
- static const struct file_operations nodev_fops = {
- .owner = THIS_MODULE,
--#ifdef HAVE_UNLOCKED_IOCTL
- .unlocked_ioctl = nodev_unlocked_ioctl,
--#else
-- .ioctl = nodev_ioctl,
--#endif
- .read = nodev_chan_read,
- .write = nodev_chan_write,
- .poll = nodev_chan_poll,
-@@ -10376,11 +10336,7 @@ static const struct file_operations dahdi_chan_fops = {
- .owner = THIS_MODULE,
- .open = dahdi_open,
- .release = dahdi_release,
--#ifdef HAVE_UNLOCKED_IOCTL
- .unlocked_ioctl = dahdi_unlocked_ioctl,
--#else
-- .ioctl = dahdi_ioctl,
--#endif
- .read = dahdi_chan_read,
- .write = dahdi_chan_write,
- .poll = dahdi_chan_poll,
-diff --git a/drivers/dahdi/dahdi_transcode.c b/drivers/dahdi/dahdi_transcode.c
-index a495dcf..6021aac 100644
---- a/drivers/dahdi/dahdi_transcode.c
-+++ b/drivers/dahdi/dahdi_transcode.c
-@@ -397,13 +397,6 @@ static long dahdi_tc_unlocked_ioctl(struct file *file, unsigned int cmd, unsigne
- };
- }
-
--#ifndef HAVE_UNLOCKED_IOCTL
--static int dahdi_tc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long data)
--{
-- return (int)dahdi_tc_unlocked_ioctl(file, cmd, data);
--}
--#endif
--
- static unsigned int dahdi_tc_poll(struct file *file, struct poll_table_struct *wait_table)
- {
- int ret;
-@@ -427,11 +420,7 @@ static struct file_operations __dahdi_transcode_fops = {
- .owner = THIS_MODULE,
- .open = dahdi_tc_open,
- .release = dahdi_tc_release,
--#ifdef HAVE_UNLOCKED_IOCTL
- .unlocked_ioctl = dahdi_tc_unlocked_ioctl,
--#else
-- .ioctl = dahdi_tc_ioctl,
--#endif
- .read = dahdi_tc_read,
- .write = dahdi_tc_write,
- .poll = dahdi_tc_poll,
---
-1.7.9.5
-
diff --git a/main/dahdi-linux-lts/kernel-compat-5.4.patch b/main/dahdi-linux-lts/kernel-compat-5.4.patch
deleted file mode 100644
index 0e835eddab..0000000000
--- a/main/dahdi-linux-lts/kernel-compat-5.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/dahdi/kernel.h
-+++ b/include/dahdi/kernel.h.new
-@@ -59,7 +59,7 @@
- #include <linux/poll.h>
-
- #ifdef CONFIG_PCI
--#include <linux/pci-aspm.h>
-+#include <linux/pci.h>
- #endif
-
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
diff --git a/main/dahdi-linux/APKBUILD b/main/dahdi-linux/APKBUILD
index 632aecebb9..a37e5f92c0 100644
--- a/main/dahdi-linux/APKBUILD
+++ b/main/dahdi-linux/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Timo Teras <timo.teras@iki.fi>
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=dahdi-linux
-pkgver=3.1.0
+pkgver=3.2.0
pkgrel=0
pkgdesc="Firmware for Digium Asterisk Hardware Device Interface drivers"
url="https://www.asterisk.org"
@@ -22,4 +22,6 @@ package() {
install-include install-firmware
}
-sha512sums="440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4 dahdi-linux-3.1.0.tar.gz"
+sha512sums="
+cb4b06d5a83aae7ce54049137d989fa6275367debc77a1df64cc36ba1bda08a058ea92f01bb873bcd83c3c7d58ff4c5da42c67bbbe8a02b8f4f0e12348c4a072 dahdi-linux-3.2.0.tar.gz
+"
diff --git a/main/dahdi-tools/APKBUILD b/main/dahdi-tools/APKBUILD
index 06460c990a..c6bb6e5093 100644
--- a/main/dahdi-tools/APKBUILD
+++ b/main/dahdi-tools/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Timo Teras <timo.teras@iki.fi>
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=dahdi-tools
-pkgver=3.1.0
-pkgrel=1
+pkgver=3.2.0
+pkgrel=0
pkgdesc="Digium Asterisk Hardware Device Interface management utilities"
url="https://www.asterisk.org"
arch="all"
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
depends_dev="bsd-compat-headers linux-headers dahdi-linux-dev newt-dev"
makedepends="perl file autoconf automake libtool $depends_dev"
subpackages="$pkgname-doc $pkgname-dev"
-source="http://downloads.digium.com/pub/telephony/dahdi-tools/releases/dahdi-tools-$pkgver.tar.gz
+source="https://downloads.digium.com/pub/telephony/dahdi-tools/releases/dahdi-tools-$pkgver.tar.gz
fix-musl.patch
$pkgname.initd
"
@@ -42,6 +42,8 @@ package() {
rm -rf "$pkgdir"/usr/lib/dracut # We use mkinitfs, not dracut
}
-sha512sums="e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694 dahdi-tools-3.1.0.tar.gz
+sha512sums="
+29df9a768c6db872bd51926dac11178400a03e2e1d0771ae163433ce300af71691f5c7a60f8756c0e6cef8a43f1331944cb4e44393f04a0ff8dee19bc9e7cf16 dahdi-tools-3.2.0.tar.gz
45955caf04368ff30d60db0b3e892d940c9ac0422b337186ed251108ce25ab305d4590efff452f53f160a53fcd26a273f21d6d093307b426a3a2a6df53584daa fix-musl.patch
-3850ab9e323ec31d676d311c97d0cde70b809379b6c01c8ff6d5a01a860eb43bf3f18f2de53e952365d17f40638c7cb0481682d96cea5b7fdb1423d3e762e2f3 dahdi-tools.initd"
+3850ab9e323ec31d676d311c97d0cde70b809379b6c01c8ff6d5a01a860eb43bf3f18f2de53e952365d17f40638c7cb0481682d96cea5b7fdb1423d3e762e2f3 dahdi-tools.initd
+"
diff --git a/main/daq/APKBUILD b/main/daq/APKBUILD
index a9fd1146ee..ed2180ffa6 100644
--- a/main/daq/APKBUILD
+++ b/main/daq/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=daq
pkgver=2.0.7
-pkgrel=0
+pkgrel=1
pkgdesc="Data Acquisition library - packet I/O library"
url="https://www.snort.org/"
arch="all"
diff --git a/main/darkhttpd/APKBUILD b/main/darkhttpd/APKBUILD
index f22aaa0226..35fa3afdd9 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/"
@@ -16,6 +16,10 @@ source="darkhttpd-$pkgver.tar.gz::https://github.com/emikulic/darkhttpd/archive/
darkhttpd.confd
"
+# secfixes:
+# 1.14-r0:
+# - CVE-2020-25691
+
build() {
make
}
@@ -29,7 +33,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/dash/APKBUILD b/main/dash/APKBUILD
new file mode 100644
index 0000000000..21827ea763
--- /dev/null
+++ b/main/dash/APKBUILD
@@ -0,0 +1,45 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=dash
+pkgver=0.5.11.5
+pkgrel=2
+pkgdesc="Small and fast POSIX-compliant shell"
+url="http://gondor.apana.org.au/~herbert/dash/"
+arch="all"
+license="GPL-2.0-or-later"
+# needs 'nl' utility from coreutils
+makedepends="coreutils"
+install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
+subpackages="$pkgname-doc $pkgname-binsh"
+source="http://gondor.apana.org.au/~herbert/dash/files/dash-$pkgver.tar.gz"
+
+build() {
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+ make
+}
+
+check() {
+ ./src/dash -c 'echo ok'
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+binsh() {
+ pkgdesc="dash as /bin/sh"
+ provides="/bin/sh"
+ provider_priority=60 # lower (other provider is busybox-binsh, yash-binsh)
+
+ mkdir -p "$subpkgdir"/bin
+ ln -s /usr/bin/dash "$subpkgdir"/bin/sh
+}
+
+sha512sums="
+5387e213820eeb44d812bb4697543023fd4662b51a9ffd52a702810fed8b28d23fbe35a7f371e6686107de9f81902eff109458964b4622f4c5412d60190a66bf dash-0.5.11.5.tar.gz
+"
diff --git a/main/dash/dash.post-install b/main/dash/dash.post-install
new file mode 100644
index 0000000000..0619dc848b
--- /dev/null
+++ b/main/dash/dash.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+add-shell '/usr/bin/dash'
+exit 0
diff --git a/main/dash/dash.post-upgrade b/main/dash/dash.post-upgrade
new file mode 120000
index 0000000000..3514e3b3c1
--- /dev/null
+++ b/main/dash/dash.post-upgrade
@@ -0,0 +1 @@
+dash.post-install \ No newline at end of file
diff --git a/main/dash/dash.pre-deinstall b/main/dash/dash.pre-deinstall
new file mode 100644
index 0000000000..8a92b75a41
--- /dev/null
+++ b/main/dash/dash.pre-deinstall
@@ -0,0 +1,3 @@
+#!/bin/sh
+remove-shell '/usr/bin/dash'
+exit 0
diff --git a/main/datefudge/APKBUILD b/main/datefudge/APKBUILD
index 8340e0e316..d067e823c8 100644
--- a/main/datefudge/APKBUILD
+++ b/main/datefudge/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Simon Frankenberger <simon-alpine@fraho.eu>
pkgname=datefudge
pkgver=1.24
-pkgrel=0
+pkgrel=1
pkgdesc="Tool to fake the system date"
url="https://packages.debian.org/sid/datefudge"
arch="all"
diff --git a/main/dav1d/APKBUILD b/main/dav1d/APKBUILD
index 2316f80810..ef1092461b 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=2
pkgdesc="small and fast AV1 Decoder"
url="https://code.videolan.org/videolan/dav1d"
arch="all"
@@ -19,7 +19,11 @@ build() {
*) meson_opts="-Denable_asm=true" ;;
esac
+ CFLAGS="$CFLAGS -O2" \
+ CXXFLAGS="$CXXFLAGS -O2" \
+ CPPFLAGS="$CPPFLAGS -O2" \
abuild-meson \
+ -Db_lto=true \
-Denable_tests=true \
-Denable_tools=true \
-Dfuzzing_engine=none \
@@ -30,7 +34,7 @@ build() {
}
check() {
- meson test --no-rebuild -v -C build
+ meson test --no-rebuild --print-errorlogs -C build
}
package() {
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..f0d77f2310 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.14.4
+pkgrel=0
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,56 +27,39 @@ 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)
+options="!check" # fail on 1.14
# secfixes:
+# 1.14.4-r0:
+# - CVE-2022-42010
+# - CVE-2022-42011
+# - CVE-2022-42012
# 1.12.18-r0:
# - CVE-2020-12049
# 1.12.16-r0:
# - CVE-2019-12749
-prepare() {
- default_prepare
- autoreconf -vif
-}
-
build() {
+ CFLAGS="$CFLAGS -flto=auto" \
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
- --sysconfdir=/etc \
--localstatedir=/var \
- --with-xml=expat \
- --with-dbus-user=messagebus \
+ --sysconfdir=/etc \
--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
}
check() {
- xvfb-run make check
+ make check
}
package() {
- make -j1 DESTDIR="$pkgdir" install
- rm -rf "$pkgdir"/usr/lib/systemd
+ make DESTDIR="$pkgdir" install
install -Dm755 "$srcdir"/dbus.initd "$pkgdir"/etc/init.d/dbus
install -Dm644 "$srcdir"/dbus.confd "$pkgdir"/etc/conf.d/dbus
@@ -101,12 +80,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
+7c8ce95b8a4c63cf51cc9f10bebbc19e66d6a96c4806befad48c3fe73b4468bb2b50f9570b73fe05ff12223e5e6815032139d316995eb670c28b23c028f293d6 dbus-1.14.4.tar.xz
0db5c0804b5aa19c8d7e517b1c6d11b9b52d96477d4d26769c01a31765491ff12897b5634455ee57d978ea30e2d71c5df5ed3eecd5435983d8ab1128ff516315 dbus.initd
3f063efa672a900ed04bc7224ba31b3ced91bb98ae096a3ce12552a0b6e2c38ddb445edb4876518f9be4140a5d901dc62080e95aab4346d89dbf329ebec33cb3 dbus.confd
"
diff --git a/main/dconf/APKBUILD b/main/dconf/APKBUILD
index 54e64f27f6..3c7c6ba430 100644
--- a/main/dconf/APKBUILD
+++ b/main/dconf/APKBUILD
@@ -4,13 +4,21 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=dconf
pkgver=0.40.0
-pkgrel=1
+pkgrel=2
pkgdesc="low-level configuration system"
url="https://wiki.gnome.org/Projects/dconf"
arch="all"
license="LGPL-2.1-or-later"
-makedepends="glib-dev dbus-dev docbook-xsl vala libxml2-dev meson
- py3-setuptools bash-completion"
+makedepends="
+ bash-completion
+ dbus-dev
+ docbook-xsl
+ glib-dev
+ libxml2-dev
+ meson
+ py3-setuptools
+ vala
+ "
checkdepends="dbus"
subpackages="$pkgname-dev $pkgname-doc $pkgname-bash-completion"
source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz
@@ -18,7 +26,7 @@ source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.
"
build() {
- abuild-meson . output
+ abuild-meson -Db_lto=true . output
meson compile ${JOBS:+-j ${JOBS}} -C output
}
@@ -30,5 +38,7 @@ package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
-sha512sums="71396d71f24f47653181482b052fdfc63795c50c373de34e2fb93e16101745daa7e81192b79a102d5389911cea34138eedf3ac32bc80562018e8a7f31963559a dconf-0.40.0.tar.xz
-320cafc3229c0f5e90f468c948e9a9d1499f69a40cea13c9d75e33d96c9fbef1584b1507fbcdb7ca12f967eb925a399a7bc0805d6f62af52ef3de7dfefee4242 systemd-userunit.patch"
+sha512sums="
+71396d71f24f47653181482b052fdfc63795c50c373de34e2fb93e16101745daa7e81192b79a102d5389911cea34138eedf3ac32bc80562018e8a7f31963559a dconf-0.40.0.tar.xz
+320cafc3229c0f5e90f468c948e9a9d1499f69a40cea13c9d75e33d96c9fbef1584b1507fbcdb7ca12f967eb925a399a7bc0805d6f62af52ef3de7dfefee4242 systemd-userunit.patch
+"
diff --git a/main/debootstrap/APKBUILD b/main/debootstrap/APKBUILD
index a0f56be37b..df522b8041 100644
--- a/main/debootstrap/APKBUILD
+++ b/main/debootstrap/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=debootstrap
-pkgver=1.0.127
+pkgver=1.0.128
pkgrel=0
pkgdesc="Debian/Ubuntu bootstrap scripts"
url="https://packages.qa.debian.org/d/debootstrap.html"
@@ -20,6 +20,6 @@ package() {
}
sha512sums="
-4fc5dc23c9a2ab7255d19df74f413e8e17302b57468291da88f5980d48c8a2959e3318829d6eb4cbaf5441d326cbe01ef212d2d1c1f3f41659fbb21861eec904 debootstrap-1.0.127.tar.bz2
+fe9073bdbc4d98f0bfc72a3b4c1a64b396db8899c998fe93823bfc718c984ddaa9ce86539d58246814be2c3b4fbc1651ee6010f6b89ee0bb77b4cb501dee911a debootstrap-1.0.128.tar.bz2
a349d9d8f5fe9e4ccb67d7206d5e87174722c0e0ee07405557662e94fb3c330a922f9cfe12bbd096103cbbe2146262ea300d9e1854f7fef77f4f1949984f5591 auto-detect-arch.patch
"
diff --git a/main/dev86/APKBUILD b/main/dev86/APKBUILD
index 09907dfe7d..f6aa897456 100644
--- a/main/dev86/APKBUILD
+++ b/main/dev86/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dev86
pkgver=0.16.21
-pkgrel=1
+pkgrel=2
pkgdesc="A real mode 80x86 assembler and linker"
url="https://github.com/lkundrak/dev86/"
arch="all"
diff --git a/main/devicemaster-linux/APKBUILD b/main/devicemaster-linux/APKBUILD
index dca4e080a3..4d4f5e07c7 100644
--- a/main/devicemaster-linux/APKBUILD
+++ b/main/devicemaster-linux/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=devicemaster-linux
pkgver=7.34
-pkgrel=1
+pkgrel=2
pkgdesc="Userspace tools for NS-Link Device Drivers"
url="https://www.comtrol.com/resources/product-resources-white-papers/ns-link-device-drivers"
arch="all"
diff --git a/main/dhcp/01-dhclient-script-fix-bare-ip.patch b/main/dhcp/01-dhclient-script-fix-bare-ip.patch
deleted file mode 100644
index 7b3165d875..0000000000
--- a/main/dhcp/01-dhclient-script-fix-bare-ip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 0c42969..3cd2a75 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -394,7 +394,7 @@ case "$reason" in
- make_resolv_conf
- else
- # flush all IPs from interface
-- ip -4 addr flush dev ${interface}
-+ ${ip} -4 addr flush dev ${interface}
- exit_with_hooks 2
- fi
-
diff --git a/main/dhcp/02-dhclient-script-remove-bashisms.patch b/main/dhcp/02-dhclient-script-remove-bashisms.patch
deleted file mode 100644
index afa10484f9..0000000000
--- a/main/dhcp/02-dhclient-script-remove-bashisms.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 0c42969..2e7274b 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # dhclient-script for Linux. Dan Halbert, March, 1997.
- # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
- # No guarantees about this. I'm a novice at the details of Linux
-@@ -428,7 +428,7 @@ case "$reason" in
- # Check if any IPv6 address on this interface is marked as
- # tentative.
- ${ip} addr show ${interface} | grep inet6 | grep tentative \
-- &> /dev/null
-+ > /dev/null 2>&1
- if [ $? -eq 0 ]; then
- # Wait for duplicate address detection to complete or for
- # the timeout specified as --dad-wait-time.
-@@ -437,7 +437,7 @@ case "$reason" in
- # We're going to poll for the tentative flag every second.
- sleep 1
- ${ip} addr show ${interface} | grep inet6 | grep tentative \
-- &> /dev/null
-+ > /dev/null 2>&1
- if [ $? -ne 0 ]; then
- break;
- fi
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index d9aa8ad407..24927910ad 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -1,21 +1,29 @@
-# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer:
pkgname=dhcp
-pkgver=4.4.3
-_realver=${pkgver/_p/-P}
-pkgrel=0
+pkgver=4.4.3_p1
+_projver=${pkgver/_p/-P}
+pkgrel=1
pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
url="https://www.isc.org/"
arch="all"
license="MPL-2.0"
-_depends_server_ldap="!$pkgname-server-vanilla $pkgname"
-_depends_server_vanilla="!$pkgname-server-ldap $pkgname"
-depends_static="$pkgname-dev"
+depends_static="$pkgname-dev=$pkgver-r$pkgrel"
# busybox utils are not sufficient
-_depends_dhclient="coreutils iproute2 run-parts"
-_depends_dhcrelay="" # do not inherit depends from $pkgname
+_depends_dhclient="
+ coreutils
+ iproute2
+ run-parts
+ "
+makedepends="
+ krb5-dev
+ linux-headers
+ openldap-dev
+ perl
+ $_depends_dhclient
+ "
pkgusers="dhcp"
pkggroups="dhcp"
-makedepends="krb5-dev linux-headers openldap-dev perl"
install="$pkgname.pre-install"
subpackages="
$pkgname-dbg
@@ -23,17 +31,15 @@ subpackages="
$pkgname-openrc
$pkgname-libs-static
$pkgname-dev
- dhclient
+ $pkgname-server-vanilla:_server_vanilla
+ $pkgname-server-ldap:_server_ldap
dhcrelay
dhcrelay-openrc
- $pkgname-server-vanilla:server_vanilla
- $pkgname-server-ldap:server_ldap
+ dhclient
+ keama
"
-source="
- https://downloads.isc.org/isc/dhcp/$_realver/dhcp-$_realver.tar.gz
- 01-dhclient-script-fix-bare-ip.patch
- 02-dhclient-script-remove-bashisms.patch
- 03-fix-unwind-import.patch
+source="https://downloads.isc.org/isc/dhcp/$_projver/dhcp-$_projver.tar.gz
+ fix-unwind-import.patch
dhcp-3.0-fix-perms.patch
dhclient-script-alpine
dhcrelay.initd
@@ -41,10 +47,12 @@ source="
dhcpd.confd
dhcpd.initd
"
-builddir="$srcdir/$pkgname-$_realver"
-makedepends="$makedepends $_depends_dhclient $_depends_server_ldap $_depends_server_vanilla"
+builddir="$srcdir/$pkgname-$_projver"
# secfixes:
+# 4.4.3_p1-r0:
+# - CVE-2022-2928
+# - CVE-2022-2929
# 4.4.2_p1-r0:
# - CVE-2021-25217
# 4.4.1-r0:
@@ -79,7 +87,6 @@ _configure() {
--enable-paranoia \
--enable-log-pid \
"$@"
-
}
prepare() {
@@ -88,17 +95,20 @@ prepare() {
# it early then the build system will just use what we've already
# unpacked and patched.
tar -C "$builddir"/bind/ -xzf "$builddir"/bind/bind.tar.gz
+
default_prepare
+
update_config_guess
update_config_sub
+ cp config.guess config.sub bind/bind-*/
+
+ cp -ar "$builddir" "$builddir-ldap"
}
build() {
- cp config.guess config.sub bind/bind-*/
- cp -a "$builddir" "$builddir-ldap"
-
_configure
make -j1 -C bind && make
+ make -C keama
cd "$builddir-ldap"
_configure \
@@ -117,11 +127,10 @@ check() {
package() {
make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C keama install
- #install -m751 -D "$builddir"/client/scripts/linux "$pkgdir"/sbin/dhclient-script
install -m751 -D "$srcdir"/dhclient-script-alpine "$pkgdir"/sbin/dhclient-script
- install -d "$pkgdir"/var/lib/dhcp
- install -d "$pkgdir"/run/dhcp
+ install -d -o dhcp -g dhcp "$pkgdir"/var/lib/dhcp
}
openrc() {
@@ -134,59 +143,57 @@ openrc() {
default_openrc
}
-server_ldap() {
- pkgdesc="ISC dhcpd server with LDAP support"
- depends="$_depends_server_ldap"
- provides="dhcp-server"
- provider_priority=100
-
- install -d "$subpkgdir"
- make DESTDIR="$subpkgdir" -C "$builddir-ldap/server" install-sbinPROGRAMS
+static() {
+ depends="$depends_static"
+ default_static || mkdir -p "$subpkgdir"
}
-server_vanilla() {
- pkgdesc="ISC dhcpd server"
- depends="$_depends_server_vanilla"
+_server_vanilla() {
+ pkgdesc="ISC DHCP server"
+ depends="$pkgname=$pkgver-r$pkgrel"
install_if="$pkgname=$pkgver-r$pkgrel"
- provides="dhcp-server"
- provider_priority=200
+ provides="dhcp-server=$pkgver-r$pkgrel"
+ provider_priority=100 # highest
- install -d "$subpkgdir"/usr/sbin
- mv "$pkgdir/usr/sbin/dhcpd" "$subpkgdir/usr/sbin/"
- rmdir "$pkgdir/usr/sbin" || :
+ amove usr/sbin/dhcpd
}
-dhclient() {
- pkgdesc="ISC dhcp client"
- depends="$_depends_dhclient"
+_server_ldap() {
+ pkgdesc="ISC DHCP server with LDAP support"
+ depends="$pkgname=$pkgver-r$pkgrel"
+ provides="dhcp-server=$pkgver-r$pkgrel"
+ provider_priority=10 # lowest
- install -d -o dhcp -g dhcp "$subpkgdir"/var/lib/dhcp
- install -d -o dhcp -g dhcp "$subpkgdir"/run/dhcp
- install -d "$subpkgdir"/usr/sbin
- install -d "$subpkgdir"/sbin
- install -d "$subpkgdir"/etc/dhcp
- mv "$pkgdir"/usr/sbin/dhclient "$subpkgdir"/usr/sbin/
- mv "$pkgdir"/sbin/dhclient-script "$subpkgdir"/sbin/
- ln -s ../sbin/dhclient-script "$subpkgdir"/etc/dhclient-script
- mv "$pkgdir"/etc/dhcp/dhclient.conf* "$subpkgdir"/etc/dhcp/
+ install -d "$subpkgdir"
+ make DESTDIR="$subpkgdir" -C "$builddir-ldap/server" install-sbinPROGRAMS
}
+
dhcrelay() {
- pkgdesc="ISC dhcp relay server"
- depends="$_depends_dhcrelay"
- replaces="dhcp"
+ pkgdesc="ISC DHCP relay agent"
+ depends=""
install="$subpkgname.pre-install"
- install -d "$subpkgdir"/run/dhcp \
- "$subpkgdir"/usr/sbin
- mv "$pkgdir"/usr/sbin/dhcrelay "$subpkgdir"/usr/sbin/
+ amove usr/sbin/dhcrelay
}
-static() {
- depends="$depends_static"
- default_static || mkdir -p "$subpkgdir"
+dhclient() {
+ pkgdesc="ISC DHCP client"
+ depends="$_depends_dhclient"
+
+ amove etc/dhcp/dhclient.conf*
+ amove usr/sbin/dhclient
+ amove sbin/dhclient-script
+ ln -s ../sbin/dhclient-script "$subpkgdir"/etc/dhclient-script
+
+ install -d -o dhcp -g dhcp "$subpkgdir"/var/lib/dhcp
}
+keama() {
+ pkgdesc="KEA Migration Assistant to translate ISC DHCP configurations to Kea"
+
+ amove usr/sbin/keama
+}
# gpg_signature_extensions="sha512.asc"
# gpgfingerprints="
@@ -195,10 +202,8 @@ static() {
# "
sha512sums="
-4472d6794af80b482560956cee6895889cc1aca39980f851faf56824627e95731f2983cf7c7454bc3decb0a12c874fcbd29bd6c5a9695412def6bc14c6df17e0 dhcp-4.4.3.tar.gz
-17e2b9588ee5d1bd9acb9c2e30f7a28308d29c9e797c2be14c1feff52e6e231ce8a94535f18badff1342aff4ae4003aab986e0f0473f0cd280292fdab044b148 01-dhclient-script-fix-bare-ip.patch
-a70e4a7e80ee65c8ced6b61db80f7ccd0f35015b5cccf2e7c51705ae129230aa49ba9926bb88f7418018e7a112c2a40451f24b88e04464b590ff20091e8d8709 02-dhclient-script-remove-bashisms.patch
-23ab581d85ba97a37fd6a0a612e0aa977b24bbaf83d58a93d1a87f9f24ea9a098aa549e77a6e1d78f721681c152464b15fd1d402d0673edf4dac6aa196df1fe9 03-fix-unwind-import.patch
+d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154 dhcp-4.4.3-P1.tar.gz
+23ab581d85ba97a37fd6a0a612e0aa977b24bbaf83d58a93d1a87f9f24ea9a098aa549e77a6e1d78f721681c152464b15fd1d402d0673edf4dac6aa196df1fe9 fix-unwind-import.patch
d5697a56fbbff25199962608986e7ffb533ed4afd3e344e3c79d2010dda73cc0b088f06c454e9f0c69eb054e09a374455fa71d3f73306e0c98fa76df4dd321b7 dhcp-3.0-fix-perms.patch
d1dce58875793316761f168e29feddc1d3454d1d917d063d43ae102b7b6aab256c3cb420478335c57ebcdb2b7c804afa4d8a1f9ab06a29a4dd23bc5d87db8df2 dhclient-script-alpine
ce62693cb483616844bb6774f9046af6a1a210e35cfaa59ab3bd12f68d50176714a324e92538b35139110b78191866f65b30d6979d8a45f7b68e572e7a1e8427 dhcrelay.initd
diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install
index 6aa3de03be..674cc7ef71 100644
--- a/main/dhcp/dhcp.pre-install
+++ b/main/dhcp/dhcp.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S dhcp 2>/dev/null
-adduser -S -D -h /var/lib/dhcp -s /sbin/nologin -G dhcp -g dhcp dhcp 2>/dev/null
+adduser -S -D -H -h /var/lib/dhcp -s /sbin/nologin -G dhcp -g dhcp dhcp 2>/dev/null
exit 0
diff --git a/main/dhcp/dhcrelay.pre-install b/main/dhcp/dhcrelay.pre-install
index 6aa3de03be..674cc7ef71 100644
--- a/main/dhcp/dhcrelay.pre-install
+++ b/main/dhcp/dhcrelay.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S dhcp 2>/dev/null
-adduser -S -D -h /var/lib/dhcp -s /sbin/nologin -G dhcp -g dhcp dhcp 2>/dev/null
+adduser -S -D -H -h /var/lib/dhcp -s /sbin/nologin -G dhcp -g dhcp dhcp 2>/dev/null
exit 0
diff --git a/main/dhcp/03-fix-unwind-import.patch b/main/dhcp/fix-unwind-import.patch
index 8b87fdbd3e..8b87fdbd3e 100644
--- a/main/dhcp/03-fix-unwind-import.patch
+++ b/main/dhcp/fix-unwind-import.patch
diff --git a/main/distcc/APKBUILD b/main/distcc/APKBUILD
index b8c2882a81..cb25f034f2 100644
--- a/main/distcc/APKBUILD
+++ b/main/distcc/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=distcc
pkgver=3.4
-pkgrel=2
+pkgrel=3
pkgdesc="Ddistributed C, C++, Obj C compiler"
url="https://github.com/distcc/distcc"
arch="all"
diff --git a/main/djbdns/APKBUILD b/main/djbdns/APKBUILD
index 8680b4e4b3..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=48
+pkgrel=49
pkgdesc="Excellent high-performance DNS services"
url="http://cr.yp.to/djbdns.html"
arch="all"
@@ -87,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
@@ -100,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 8b4f2cd791..ec769f7b7a 100644
--- a/main/dkimproxy/APKBUILD
+++ b/main/dkimproxy/APKBUILD
@@ -2,9 +2,9 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=dkimproxy
pkgver=1.4.1
-pkgrel=6
+pkgrel=7
pkgdesc="SMTP-proxy that signs and/or verifies emails, using the Mail::DKIM module"
-url="http://dkimproxy.sourceforge.net/"
+url="https://dkimproxy.sourceforge.net/"
arch="noarch"
license="GPL"
depends="perl-mail-dkim perl-net-server perl-error"
diff --git a/main/dmvpn/APKBUILD b/main/dmvpn/APKBUILD
index 64c4fb894f..15aeda39ba 100644
--- a/main/dmvpn/APKBUILD
+++ b/main/dmvpn/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
pkgname=dmvpn
pkgver=1.4.0
-pkgrel=0
+pkgrel=1
pkgdesc="Dynamic Multipoint VPN"
url="https://git.alpinelinux.org/cgit/dmvpn-tools/"
arch="noarch"
diff --git a/main/dnsmasq/0000-underflow.patch b/main/dnsmasq/0000-underflow.patch
index ab15361f18..9f7f360b20 100644
--- a/main/dnsmasq/0000-underflow.patch
+++ b/main/dnsmasq/0000-underflow.patch
@@ -1,18 +1,17 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/dnsmasq-2.77-underflow.patch
+Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/raw/rawhide/f/dnsmasq-2.77-underflow.patch
--
-From 77c7cabbeab1fbe1f7296f33762771f208586e59 Mon Sep 17 00:00:00 2001
+From 46b9670a418419d9e04bbe9a0d6c5a85f3c63265 Mon Sep 17 00:00:00 2001
From: Doran Moppert <dmoppert@redhat.com>
Date: Tue, 26 Sep 2017 14:48:20 +0930
Subject: [PATCH] google patch hand-applied
---
src/edns0.c | 10 +++++-----
- src/forward.c | 4 ++++
src/rfc1035.c | 3 +++
- 3 files changed, 12 insertions(+), 5 deletions(-)
+ 2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/edns0.c b/src/edns0.c
-index 7bd26b8..7f96414 100644
+index c498eb1..0eb3873 100644
--- a/src/edns0.c
+++ b/src/edns0.c
@@ -212,11 +212,11 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l
@@ -32,26 +31,11 @@ index 7bd26b8..7f96414 100644
memcpy(p, buff, rdlen);
free(buff);
p += rdlen;
-diff --git a/src/forward.c b/src/forward.c
-index 3d638e4..e254e35 100644
---- a/src/forward.c
-+++ b/src/forward.c
-@@ -1558,6 +1558,10 @@ void receive_query(struct listener *listen, time_t now)
- udp_size = PACKETSZ; /* Sanity check - can't reduce below default. RFC 6891 6.2.3 */