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/APKBUILD10
-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/APKBUILD4
-rw-r--r--main/alpine-baselayout/APKBUILD12
-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/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/apache2-mod-wsgi/APKBUILD6
-rw-r--r--main/apcupsd/APKBUILD2
-rw-r--r--main/apk-tools/APKBUILD8
-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/atf/APKBUILD6
-rw-r--r--main/audit/APKBUILD4
-rw-r--r--main/autoconf/APKBUILD19
-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/APKBUILD38
-rw-r--r--main/bash/bashrc5
-rw-r--r--main/batctl/APKBUILD4
-rw-r--r--main/bats/APKBUILD4
-rw-r--r--main/bcache-tools/APKBUILD8
-rw-r--r--main/bctoolbox/APKBUILD20
-rw-r--r--main/bdftopcf/APKBUILD12
-rw-r--r--main/bind/APKBUILD4
-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/APKBUILD34
-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.80/APKBUILD5
-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/APKBUILD15
-rw-r--r--main/btrfs-progs/APKBUILD4
-rw-r--r--main/bubblewrap/APKBUILD4
-rw-r--r--main/busybox/0001-sed-check-errors-writing-file-with-sed-i.patch66
-rw-r--r--main/busybox/APKBUILD8
-rw-r--r--main/busybox/busyboxconfig-extras2
-rw-r--r--main/busybox/default.script2
-rw-r--r--main/bwm-ng/APKBUILD2
-rw-r--r--main/byacc/APKBUILD4
-rw-r--r--main/byobu/APKBUILD2
-rw-r--r--main/bzip2/APKBUILD6
-rw-r--r--main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch4
-rw-r--r--main/c-ares/APKBUILD39
-rw-r--r--main/ccache/APKBUILD8
-rw-r--r--main/cciss_vol_status/APKBUILD4
-rw-r--r--main/check/APKBUILD2
-rw-r--r--main/ciwiki/APKBUILD4
-rw-r--r--main/ckbcomp/APKBUILD4
-rw-r--r--main/cksfv/APKBUILD2
-rw-r--r--main/clang/APKBUILD180
-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/APKBUILD40
-rw-r--r--main/cmake/APKBUILD4
-rw-r--r--main/cmocka/APKBUILD23
-rw-r--r--main/cmph/APKBUILD6
-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/crconf/APKBUILD2
-rw-r--r--main/cryptsetup/APKBUILD8
-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/APKBUILD17
-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/APKBUILD2
-rw-r--r--main/dahdi-linux-lts/APKBUILD26
-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/APKBUILD6
-rw-r--r--main/dbus/APKBUILD30
-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/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/APKBUILD6
-rw-r--r--main/ell/APKBUILD4
-rw-r--r--main/encfs/APKBUILD32
-rw-r--r--main/espeak/APKBUILD4
-rw-r--r--main/ethtool/APKBUILD4
-rw-r--r--main/eudev/APKBUILD29
-rw-r--r--main/eudev/add-hyperv-ptp-rule.patch18
-rw-r--r--main/eudev/eudev-hwids.trigger5
-rw-r--r--main/expat/APKBUILD6
-rw-r--r--main/expect/APKBUILD4
-rw-r--r--main/fail2ban/APKBUILD23
-rw-r--r--main/fail2ban/CVE-2021-32749.patch155
-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/fish/APKBUILD5
-rw-r--r--main/flac/APKBUILD18
-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-vollkorn/APKBUILD2
-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/APKBUILD8
-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/fsarchiver/APKBUILD2
-rw-r--r--main/fstrm/APKBUILD2
-rw-r--r--main/fuse/APKBUILD2
-rw-r--r--main/gawk/APKBUILD6
-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/0034-Use-generic-errstr.go-implementation-on-musl.patch219
-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.patch73
-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/APKBUILD64
-rw-r--r--main/gcc/gcc-go.post-install8
-rw-r--r--main/gcr/APKBUILD10
-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/APKBUILD6
-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/APKBUILD18
-rw-r--r--main/glib/0001-gslice-remove-slice-allocator.patch1695
-rw-r--r--main/glib/APKBUILD11
-rw-r--r--main/glslang/APKBUILD4
-rw-r--r--main/gnokii/APKBUILD2
-rw-r--r--main/gnu-efi/APKBUILD6
-rw-r--r--main/gnupg/APKBUILD4
-rw-r--r--main/gnutls/APKBUILD8
-rw-r--r--main/goaccess/APKBUILD4
-rw-r--r--main/gobject-introspection/APKBUILD2
-rw-r--r--main/gpsd/APKBUILD2
-rw-r--r--main/graphite2/APKBUILD33
-rw-r--r--main/graphviz/APKBUILD6
-rw-r--r--main/groff/APKBUILD2
-rw-r--r--main/gsm/APKBUILD10
-rw-r--r--main/gsm/gsm-makefile.patch34
-rw-r--r--main/gst-plugins-base/APKBUILD30
-rw-r--r--main/gstreamer/APKBUILD6
-rw-r--r--main/gtk+2.0/APKBUILD102
-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/APKBUILD15
-rw-r--r--main/guile/APKBUILD15
-rw-r--r--main/haproxy/APKBUILD4
-rw-r--r--main/harfbuzz/APKBUILD6
-rw-r--r--main/haserl/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/APKBUILD6
-rw-r--r--main/hostapd/hostapd.confd13
-rw-r--r--main/hostapd/hostapd.initd52
-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/APKBUILD4
-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/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/intel-ucode/APKBUILD4
-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/APKBUILD4
-rw-r--r--main/iputils/APKBUILD9
-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/iso-codes/APKBUILD4
-rw-r--r--main/iucode-tool/APKBUILD2
-rw-r--r--main/ivykis/APKBUILD6
-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/APKBUILD4
-rw-r--r--main/krb5/APKBUILD8
-rw-r--r--main/lame/APKBUILD4
-rw-r--r--main/lcms2/APKBUILD4
-rw-r--r--main/ldb/APKBUILD2
-rw-r--r--main/leveldb/APKBUILD38
-rw-r--r--main/libassuan/APKBUILD2
-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/libdbi/APKBUILD4
-rw-r--r--main/libde265/APKBUILD16
-rw-r--r--main/libdnet/APKBUILD18
-rw-r--r--main/libdrm/APKBUILD4
-rw-r--r--main/libdwarf/APKBUILD81
-rw-r--r--main/libeconf/APKBUILD7
-rw-r--r--main/libedit/APKBUILD6
-rw-r--r--main/libffi/APKBUILD4
-rw-r--r--main/libgpg-error/APKBUILD7
-rw-r--r--main/libical/APKBUILD4
-rw-r--r--main/libice/APKBUILD24
-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/libnftnl/APKBUILD4
-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/APKBUILD10
-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/libsm/APKBUILD2
-rw-r--r--main/libtasn1/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/libusb-compat/APKBUILD14
-rw-r--r--main/libusb-compat/fix-headers.patch10
-rw-r--r--main/libva/APKBUILD5
-rw-r--r--main/libx11/APKBUILD9
-rw-r--r--main/libxcomposite/APKBUILD11
-rw-r--r--main/libxdamage/APKBUILD11
-rw-r--r--main/libxdmcp/APKBUILD10
-rw-r--r--main/libxext/APKBUILD10
-rw-r--r--main/libxft/APKBUILD4
-rw-r--r--main/libxinerama/APKBUILD10
-rw-r--r--main/libxkbfile/APKBUILD12
-rw-r--r--main/libxml2/APKBUILD14
-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/libxt/APKBUILD2
-rw-r--r--main/libxv/APKBUILD15
-rw-r--r--main/lighttpd/APKBUILD2
-rw-r--r--main/links/APKBUILD6
-rw-r--r--main/linux-firmware/APKBUILD48
-rw-r--r--main/linux-lts/APKBUILD63
-rw-r--r--main/linux-lts/lts.aarch64.config4
-rw-r--r--main/linux-lts/lts.armv7.config3
-rw-r--r--main/linux-lts/lts.ppc64le.config3
-rw-r--r--main/linux-lts/lts.s390x.config3
-rw-r--r--main/linux-lts/lts.x86.config5
-rw-r--r--main/linux-lts/lts.x86_64.config5
-rw-r--r--main/linux-lts/virt.aarch64.config2
-rw-r--r--main/linux-lts/virt.ppc64le.config2
-rw-r--r--main/linux-lts/virt.x86.config9
-rw-r--r--main/linux-lts/virt.x86_64.config10
-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/APKBUILD18
-rw-r--r--main/llvm-libunwind/APKBUILD70
-rw-r--r--main/llvm-libunwind/D124248.patch558
-rw-r--r--main/llvm-libunwind/D124765.patch216
-rw-r--r--main/llvm-libunwind/libunwind-link-libssp.patch20
-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.patch (renamed from main/llvm-libunwind/libcxx-musl.patch)0
-rw-r--r--main/llvm-runtimes/libcxx-ppc.patch (renamed from main/llvm-libunwind/libcxx-ppc.patch)0
-rw-r--r--main/llvm-runtimes/libunwind-link-libssp.patch20
-rw-r--r--main/llvm14/APKBUILD24
-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/lmdb/APKBUILD2
-rw-r--r--main/lockfile-progs/APKBUILD2
-rw-r--r--main/log4cplus/APKBUILD50
-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-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/lvm2/0001-lvresize-use-POSIX-shell.patch127
-rw-r--r--main/lvm2/APKBUILD82
-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/APKBUILD13
-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/mariadb-connector-c/APKBUILD4
-rw-r--r--main/mariadb/APKBUILD4
-rw-r--r--main/mbedtls/APKBUILD4
-rw-r--r--main/mdev-conf/APKBUILD10
-rw-r--r--main/mdev-conf/fix-input-stuff.patch34
-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/APKBUILD31
-rw-r--r--main/mesa/disable-rgb10-by-default.patch25
-rw-r--r--main/meson/APKBUILD6
-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/APKBUILD4
-rw-r--r--main/multipath-tools/APKBUILD10
-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/APKBUILD7
-rw-r--r--main/nasm/APKBUILD2
-rw-r--r--main/ncftp/APKBUILD2
-rw-r--r--main/ncurses/APKBUILD4
-rw-r--r--main/netcat-openbsd/APKBUILD2
-rw-r--r--main/network-extras/APKBUILD4
-rw-r--r--main/newt/APKBUILD8
-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/APKBUILD4
-rw-r--r--main/nginx/APKBUILD59
-rw-r--r--main/nginx/nginx-module-vts~cast-key-length-to-correct-type.patch24
-rw-r--r--main/nginx/nginx-module-vts~fix-uri-overflow.patch30
-rw-r--r--main/nginx/nginx-module-vts~set-histogram-buckets-on-first-request.patch147
-rw-r--r--main/nginx/njs~fix-dangling-pointer.patch94
-rw-r--r--main/ngrep/APKBUILD4
-rw-r--r--main/nikto/APKBUILD2
-rw-r--r--main/nodejs/APKBUILD38
-rw-r--r--main/npth/APKBUILD2
-rw-r--r--main/nsd/APKBUILD6
-rw-r--r--main/ntfs-3g/APKBUILD6
-rw-r--r--main/numactl/APKBUILD9
-rw-r--r--main/numactl/version.patch11
-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/0007-Use-correct-extension-for-slapd-modules-in-slapd.con.patch31
-rw-r--r--main/openldap/0007-Use-correct-extension-for-slapd-modules.patch44
-rw-r--r--main/openldap/0008-Remove-pidfile-and-argsfile.patch24
-rw-r--r--main/openldap/0009-Include-more-schemas-in-default-config.patch44
-rw-r--r--main/openldap/APKBUILD22
-rw-r--r--main/openldap/lloadd.confd8
-rw-r--r--main/openldap/lloadd.initd2
-rw-r--r--main/openldap/slapd.confd21
-rw-r--r--main/openldap/slapd.initd34
-rw-r--r--main/openldap/slapd.ldif.patch29
-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/APKBUILD11
-rw-r--r--main/openrc/supervise-daemon-defaults.patch31
-rw-r--r--main/openrc/sysctl-readme.patch11
-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/APKBUILD11
-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/APKBUILD13
-rw-r--r--main/ortp/APKBUILD4
-rw-r--r--main/p11-kit/APKBUILD3
-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/APKBUILD11
-rw-r--r--main/pango/disable-broken-test.patch9
-rw-r--r--main/parallel/APKBUILD4
-rw-r--r--main/patch/APKBUILD2
-rw-r--r--main/patchutils/APKBUILD2
-rw-r--r--main/pciutils/APKBUILD15
-rw-r--r--main/pciutils/fix-linking-pci-malloc-Makefile.patch11
-rw-r--r--main/perl-archive-zip/APKBUILD4
-rw-r--r--main/perl-astro-suntime/APKBUILD2
-rw-r--r--main/perl-authen-sasl/APKBUILD2
-rw-r--r--main/perl-b-cow/APKBUILD8
-rw-r--r--main/perl-clone/APKBUILD10
-rw-r--r--main/perl-compress-raw-bzip2/APKBUILD2
-rw-r--r--main/perl-compress-raw-zlib/APKBUILD2
-rw-r--r--main/perl-convert-binhex/APKBUILD4
-rw-r--r--main/perl-convert-color/APKBUILD21
-rw-r--r--main/perl-convert-tnef/APKBUILD2
-rw-r--r--main/perl-convert-uulib/APKBUILD8
-rw-r--r--main/perl-crypt-openssl-random/APKBUILD2
-rw-r--r--main/perl-crypt-openssl-rsa/APKBUILD2
-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-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-device-serialport/APKBUILD2
-rw-r--r--main/perl-digest-hmac/APKBUILD2
-rw-r--r--main/perl-digest-sha1/APKBUILD2
-rw-r--r--main/perl-email-date-format/APKBUILD35
-rw-r--r--main/perl-encode-locale/APKBUILD2
-rw-r--r--main/perl-error/APKBUILD2
-rw-r--r--main/perl-exporter-tiny/APKBUILD4
-rw-r--r--main/perl-file-rsync/APKBUILD2
-rw-r--r--main/perl-future/APKBUILD24
-rw-r--r--main/perl-getopt-long/APKBUILD30
-rw-r--r--main/perl-html-mason/APKBUILD2
-rw-r--r--main/perl-html-parser/APKBUILD8
-rw-r--r--main/perl-html-tree/APKBUILD2
-rw-r--r--main/perl-http-date/APKBUILD2
-rw-r--r--main/perl-http-message/APKBUILD11
-rw-r--r--main/perl-inline/APKBUILD2
-rw-r--r--main/perl-io-multiplex/APKBUILD2
-rw-r--r--main/perl-io-socket-ssl/APKBUILD4
-rw-r--r--main/perl-io-stringy/APKBUILD2
-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-libwww/APKBUILD2
-rw-r--r--main/perl-locale-maketext-lexicon/APKBUILD2
-rw-r--r--main/perl-log-any/APKBUILD4
-rw-r--r--main/perl-lwp-mediatypes/APKBUILD2
-rw-r--r--main/perl-mail-dkim/APKBUILD2
-rw-r--r--main/perl-mail-domainkeys/APKBUILD2
-rw-r--r--main/perl-mail-spf/APKBUILD2
-rw-r--r--main/perl-metrics-any/APKBUILD4
-rw-r--r--main/perl-mime-tools/APKBUILD2
-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-cidr-lite/APKBUILD2
-rw-r--r--main/perl-net-dns/APKBUILD6
-rw-r--r--main/perl-net-ip/APKBUILD4
-rw-r--r--main/perl-net-libidn/APKBUILD2
-rw-r--r--main/perl-net-rblclient/APKBUILD4
-rw-r--r--main/perl-net-server/APKBUILD12
-rw-r--r--main/perl-net-snmp/APKBUILD2
-rw-r--r--main/perl-net-snpp/APKBUILD2
-rw-r--r--main/perl-netaddr-ip/APKBUILD2
-rw-r--r--main/perl-params-validate/APKBUILD8
-rw-r--r--main/perl-parse-recdescent/APKBUILD2
-rw-r--r--main/perl-parse-syslog/APKBUILD2
-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-string-shellquote/APKBUILD2
-rw-r--r--main/perl-super/APKBUILD2
-rw-r--r--main/perl-sys-hostname-long/APKBUILD2
-rw-r--r--main/perl-test-mockmodule/APKBUILD2
-rw-r--r--main/perl-test-mockobject/APKBUILD2
-rw-r--r--main/perl-test-pod/APKBUILD2
-rw-r--r--main/perl-time-hires/APKBUILD2
-rw-r--r--main/perl-type-tiny/APKBUILD7
-rw-r--r--main/perl-unix-syslog/APKBUILD2
-rw-r--r--main/perl-uri/APKBUILD10
-rw-r--r--main/perl-x10/APKBUILD4
-rw-r--r--main/perl-yaml-libyaml/APKBUILD31
-rw-r--r--main/pixman/APKBUILD18
-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/APKBUILD7
-rw-r--r--main/poppler/APKBUILD24
-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/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/APKBUILD2
-rw-r--r--main/py3-babel/APKBUILD6
-rw-r--r--main/py3-build/APKBUILD34
-rw-r--r--main/py3-cairo/APKBUILD2
-rw-r--r--main/py3-certifi/APKBUILD8
-rw-r--r--main/py3-certifi/use-alpine-system-certs.patch50
-rw-r--r--main/py3-cffi/APKBUILD2
-rw-r--r--main/py3-chardet/APKBUILD17
-rw-r--r--main/py3-charset-normalizer/APKBUILD6
-rw-r--r--main/py3-coverage/APKBUILD12
-rw-r--r--main/py3-coverage/toml-error-message.patch13
-rw-r--r--main/py3-cparser/APKBUILD2
-rw-r--r--main/py3-dbus/APKBUILD2
-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/APKBUILD2
-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/APKBUILD2
-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/APKBUILD4
-rw-r--r--main/py3-gpep517/APKBUILD9
-rw-r--r--main/py3-hypothesis/APKBUILD6
-rw-r--r--main/py3-idna/APKBUILD9
-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/APKBUILD8
-rw-r--r--main/py3-markdown/APKBUILD2
-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/APKBUILD9
-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/APKBUILD2
-rw-r--r--main/py3-ply/APKBUILD2
-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/APKBUILD8
-rw-r--r--main/py3-pygments/APKBUILD2
-rw-r--r--main/py3-pynacl/APKBUILD2
-rw-r--r--main/py3-pytest-timeout/APKBUILD2
-rw-r--r--main/py3-pytest/0001-remove-setuptools_scm.patch31
-rw-r--r--main/py3-pytest/APKBUILD24
-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/APKBUILD2
-rw-r--r--main/py3-snowballstemmer/APKBUILD2
-rw-r--r--main/py3-sortedcontainers/APKBUILD2
-rw-r--r--main/py3-sphinx/APKBUILD9
-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/APKBUILD2
-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/APKBUILD2
-rw-r--r--main/py3-wcag-contrast-ratio/APKBUILD2
-rw-r--r--main/py3-wcwidth/APKBUILD2
-rw-r--r--main/py3-wheel/APKBUILD7
-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/APKBUILD63
-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/APKBUILD8
-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/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/APKBUILD4
-rw-r--r--main/ruby-debug/APKBUILD6
-rw-r--r--main/ruby-debug/gemspec.patch9
-rw-r--r--main/ruby-power_assert/APKBUILD4
-rw-r--r--main/ruby-rbs/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/ruby/APKBUILD8
-rw-r--r--main/run-parts/APKBUILD2
-rw-r--r--main/s390-tools/APKBUILD10
-rw-r--r--main/samba/APKBUILD12
-rw-r--r--main/scons/APKBUILD2
-rw-r--r--main/scstadmin/APKBUILD4
-rw-r--r--main/sed/APKBUILD15
-rw-r--r--main/sed/fix-test-canonicalize-lgpl.patch23
-rw-r--r--main/sfic/APKBUILD4
-rw-r--r--main/shared-mime-info/APKBUILD2
-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/APKBUILD4
-rw-r--r--main/spandsp/APKBUILD2
-rw-r--r--main/spawn-fcgi/APKBUILD2
-rw-r--r--main/speedtest-cli/APKBUILD6
-rw-r--r--main/spice/APKBUILD35
-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/APKBUILD4
-rw-r--r--main/spirv-tools/APKBUILD6
-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/APKBUILD8
-rw-r--r--main/squid/squid-5.2-openssl3.patch185
-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/APKBUILD16
-rw-r--r--main/swish-e/APKBUILD2
-rw-r--r--main/sysfsutils/APKBUILD2
-rw-r--r--main/syslog-ng/APKBUILD2
-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/APKBUILD2
-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/APKBUILD5
-rw-r--r--main/tig/test-git-file-protocol.patch46
-rw-r--r--main/tiny-cloud/APKBUILD4
-rw-r--r--main/tinyproxy/APKBUILD10
-rw-r--r--main/tinyproxy/CVE-2022-40468.patch28
-rw-r--r--main/tk/APKBUILD6
-rw-r--r--main/ttf-freefont/APKBUILD29
-rw-r--r--main/ttf-tlwg/APKBUILD19
-rw-r--r--main/tzdata/APKBUILD11
-rw-r--r--main/u-boot/APKBUILD26
-rwxr-xr-xmain/u-boot/update-u-boot12
-rw-r--r--main/ucarp/APKBUILD2
-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/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/valgrind/APKBUILD4
-rw-r--r--main/vanessa_logger/APKBUILD2
-rw-r--r--main/varnish/APKBUILD4
-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/APKBUILD10
-rw-r--r--main/vulkan-headers/APKBUILD34
-rw-r--r--main/vulkan-loader/APKBUILD45
-rw-r--r--main/vulkan-tools/APKBUILD50
-rw-r--r--main/wayland-protocols/APKBUILD6
-rw-r--r--main/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/xcb-proto/APKBUILD2
-rw-r--r--main/xen/APKBUILD16
-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.patch70
-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/APKBUILD11
-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/APKBUILD12
-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/zfs-lts/APKBUILD12
-rw-r--r--main/zfs-rpi/APKBUILD10
-rw-r--r--main/zfs/APKBUILD6
-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
1065 files changed, 14669 insertions, 19747 deletions
diff --git a/main/abuild/0001-abuild-fix-amove-corner-cases.patch b/main/abuild/0001-abuild-fix-amove-corner-cases.patch
deleted file mode 100644
index a7694ef371..0000000000
--- a/main/abuild/0001-abuild-fix-amove-corner-cases.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-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
deleted file mode 100644
index eb0c2ffd71..0000000000
--- a/main/abuild/0001-make-increase-test-timeout.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 a780d05754..4fe7ebe442 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=abuild
-pkgver=3.10.0_rc1
+pkgver=3.10.0
_ver=${pkgver%_git*}
-pkgrel=2
+pkgrel=0
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch="all"
@@ -27,8 +27,6 @@ subpackages="
options="suid"
pkggroups="abuild"
source="https://gitlab.alpinelinux.org/alpine/abuild/-/archive/$pkgver/abuild-$pkgver.tar.gz
- 0001-make-increase-test-timeout.patch
- 0001-abuild-fix-amove-corner-cases.patch
"
builddir="$srcdir"/abuild-$pkgver
@@ -86,7 +84,5 @@ _rootbld() {
}
sha512sums="
-8dccc843cc6b3f53642bb2849d00cc00a283763f2b915c01600b0542ce16a96b2e265498b59ceff250a1c7be22c4a5aeb0cb0926c7498668ded897c64b83b9c0 abuild-3.10.0_rc1.tar.gz
-605e17e99ba24388e278de3a378bf717f6061930a73197bbf5d3462b281fccc242262a7582d0c7106fcf92daa2166e4bc341d3a784868906527e493adfb9bf5f 0001-make-increase-test-timeout.patch
-c979b3f926a4bd5aabe3996473151156f4573040c37a99aa4bf9042743952c46c08286581753c372196ce9da651971879a9e31eed124e65393dab71c96494df9 0001-abuild-fix-amove-corner-cases.patch
+5acf9f2b0681ae1bc83505699769d3042b9380008f8fe064bc87fc6280bbe25ec76ea6f5c356c3bb0fa123b575f89e98319b3bca21d642cce3f0bcba1a39c2fc abuild-3.10.0.tar.gz
"
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 4cbb4053c1..caa04885eb 100644
--- a/main/alpine-base/APKBUILD
+++ b/main/alpine-base/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-base
-pkgver=3.17_alpha20220809
-pkgrel=4
+pkgver=3.17.0
+pkgrel=0
pkgdesc="Meta package for minimal alpine base"
url="https://alpinelinux.org"
arch="noarch"
diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index b3974d2b0c..b610612163 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-baselayout
-pkgver=3.3.0
-pkgrel=2
+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"
arch="noarch"
@@ -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
@@ -268,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/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/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 3009817a8c..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=7
+pkgver=2.12.10
+pkgrel=1
pkgdesc="Alpine Package Keeper - package manager for alpine"
arch="all"
url="https://gitlab.alpinelinux.org/alpine/apk-tools"
@@ -52,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
@@ -87,7 +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/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..323cdf7b4f 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=3
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/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/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/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..63bd101649 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.12
_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,19 @@ 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
+12d120e39593d3f23aa86e510b0eda514ec69ef42e910e5855e4c7510354e8504e5d6949770448f5632ce482c9ab468f4ba82a8a38b4a8237cdd7b54f742946a bash52-010
+83a7584ca8ee512839183e329183476a2c8bcb995e3dc9d5188f04f11760bd3cb0f2d29d12bca2661b7ce8ab125d44d35d839f735992ca6c27f936d609ac4683 bash52-011
+8f969cb36ee81ac47a4c3c6ee7fbe62159192fa4f14cb48973eccd55c458e6a093adc3045ee1c379544d8183d77813977a43cad5d225322d8816540a1cb8893b bash52-012
"
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 e32a93b800..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.8.0
+pkgver=1.8.2
pkgrel=0
pkgdesc="Bash Automated Testing System"
options="!check" # Test passes CI/locally, fails on builders
@@ -21,5 +21,5 @@ package() {
}
sha512sums="
-a97b33d8ff4f89d68e4c77c654fb0711b91de9fd86d941d629310557c453beaad68004ae54e790a2d6eb9b902e1adee3cd902a0ce6833d6d767d50482ec4bc33 bats-1.8.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 0e9a88f552..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.7
+pkgver=9.18.9
_ver=${pkgver%_p*}
_p=${pkgver#*_p}
_major=${pkgver%%.*}
@@ -272,7 +272,7 @@ _gpgfingerprints="
"
sha512sums="
-2cdceb4125b8759f5225296c6ffecdbb895b0a27dfcfcd98b04b9ad78552d16c16b0452fb823dc47d11cec21d2c6ecb05a107dd3094f8e7419bb9717d68820c5 bind-9.18.7.tar.xz
+7d9bca47e29e8634416ab52819d78ce4ec6196c0dcbd9fe95a24687337f71c69b6472cf20bf49ea0ae1751a861944f354f9122acfb01780f51278ad4a3fdd817 bind-9.18.9.tar.xz
3d1d3e954aaee5e125f6b6f3cb660b51fc91d803df4cad43c47dbe97f19789cef20b5ca2834624668f0d761a5b81ac72db8959745d6eb293ca1154a1b390a007 named.initd
127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf named.confd
d2f61d02d7829af51faf14fbe2bafe8bc90087e6b6697c6275a269ebbddcaa14a234fff5c41da793e945e8ff1de3de0858a40334e0d24289eab98df4bb721ac5 named.conf.authoritative
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 559e1defde..0dea945792 100644
--- a/main/bluez/APKBUILD
+++ b/main/bluez/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bluez
-pkgver=5.65
+pkgver=5.66
pkgrel=1
pkgdesc="Tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
@@ -9,9 +9,20 @@ 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
@@ -42,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
@@ -188,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
@@ -197,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.80/APKBUILD b/main/boost1.80/APKBUILD
index 6e1e43aec3..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=2
+pkgrel=4
pkgdesc="Free peer-reviewed portable C++ source libraries"
url="https://www.boost.org/"
arch="all"
@@ -18,6 +18,7 @@ subpackages="
"
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
@@ -26,6 +27,7 @@ source="https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/boost_
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
@@ -227,6 +229,7 @@ _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
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 32a7266a39..b00a7c0479 100644
--- a/main/brotli/APKBUILD
+++ b/main/brotli/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: prspkt <prspkt@protonmail.com>
pkgname=brotli
pkgver=1.0.9
-pkgrel=8
+pkgrel=10
pkgdesc="Generic lossless compressor"
url="https://github.com/google/brotli"
arch="all"
@@ -13,7 +13,13 @@ if [ -z "$BOOTSTRAP" ]; then
makedepends_host="python3-dev"
python="py3-$pkgname:py3"
fi
-subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $python"
+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
@@ -35,15 +41,16 @@ 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 -flto=auto" \
+ CFLAGS="$CFLAGS -O2" \
./configure \
--build=$CBUILD \
--host=$CHOST \
--target=$CTARGET \
--prefix=/usr \
- --disable-static \
$_cross_configure
make
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index fd07558d0d..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.1
+pkgver=6.0.2
pkgrel=0
pkgdesc="BTRFS filesystem utilities"
url="https://btrfs.wiki.kernel.org"
@@ -81,5 +81,5 @@ extra() {
}
sha512sums="
-17fded8583b7392202b1bb408cbb5d42024623ac15415f95e8e56e27b43be79da6d4e6c191d39db4e5a8948390a7c216c0ea520171b0ab95438cc330084c8398 btrfs-progs-v5.19.1.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/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/APKBUILD b/main/busybox/APKBUILD
index e247cc13fa..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=25
+pkgrel=29
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
@@ -80,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
@@ -394,13 +395,14 @@ 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
4947c70497629cda33a9eaac8cef5ea4f4cc4c2160e65bcd988b45c33964af86679e7604dac3f72470dd98490bb1c84b0e34acc4b6f7f65b8154db1073d60170 busyboxconfig
-53e6ba22ac89ccd733ad02f1553b351669abff1a2f1f233c92940770bb1b14d91b052ef81a2d4ef0cb087318e4f3972cc0735951a214b47d00b22e8b8f1db787 busyboxconfig-extras
+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
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/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/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 73063455fc..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=3
+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"
@@ -66,7 +66,7 @@ libbz2() {
sha512sums="
083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 bzip2-1.0.8.tar.gz
-58cc37430555520b6e35db2740e699cf37eacdd82989c21a222a593e36288710a0defb003662d4238235c12b3764bfc89cd646e6be9d0a08d54bd2c9baa6ad15 bzip2-1.0.4-makefile-CFLAGS.patch
+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
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/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/ccache/APKBUILD b/main/ccache/APKBUILD
index 58371615ab..d4229511dc 100644
--- a/main/ccache/APKBUILD
+++ b/main/ccache/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ccache
-pkgver=4.6.3
-pkgrel=0
+pkgver=4.7.4
+pkgrel=1
pkgdesc="fast C/C++ compiler cache"
url="https://ccache.dev/"
arch="all"
@@ -53,13 +53,13 @@ package() {
mkdir -p "$pkgdir"/usr/lib/ccache/bin
for link in cc gcc g++ cpp c++ $CHOST-cc $CHOST-gcc \
- $CHOST-g++ $CHOST-cpp $CHOST-c++ \
+ $CHOST-g++ $CHOST-c++ \
clang clang++; do
ln -sf /usr/bin/ccache "$pkgdir"/usr/lib/ccache/bin/$link
done
}
sha512sums="
-b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966 ccache-4.6.3.tar.xz
+48c663b51e874cfbd8daf0ef9759d025c2605c36da47ebbc77b52ceb941b810436600429f74204f13e2e2e601af6186a4bdb992f8da239f88cb9df4c6c95d58f ccache-4.7.4.tar.xz
785ce34305a3bb6c24117341157356c2bd2272eca9d58fa20acd14a023abe6f784c88d9c55656d2f37320392bb73a61c52cd8b6bd9ac7c5316c8ed187dd6f5fb ioctl.patch
"
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/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/ciwiki/APKBUILD b/main/ciwiki/APKBUILD
index 0d37d4a1f5..bbe6d2d354 100644
--- a/main/ciwiki/APKBUILD
+++ b/main/ciwiki/APKBUILD
@@ -2,9 +2,9 @@
# Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
pkgname=ciwiki
pkgver=2.0.8
-pkgrel=0
+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"
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 7a47b97a02..0000000000
--- a/main/clang/APKBUILD
+++ /dev/null
@@ -1,180 +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=4
-_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
- "
-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() {
- depends="libstdc++-dev"
- DESTDIR="$pkgdir" ninja -C build install
- install -Dm644 build/lib/libclang.a -t "$pkgdir"/usr/lib/
-
- rm "$pkgdir"/usr/share/clang/clang-format-bbedit.applescript \
- "$pkgdir"/usr/share/clang/clang-doc-default-stylesheet.css \
- "$pkgdir"/usr/share/clang/index.js
-
- mkdir -p "$pkgdir"/usr/share/bash-completion/completions
- mv "$pkgdir"/usr/share/clang/bash-autocomplete.sh \
- "$pkgdir"/usr/share/bash-completion/completions/clang
-}
-
-dev() {
- 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*
- amove usr/share/clang/clang-rename.py
-
- # actually a python module..
- mv "$pkgdir"/usr/lib/libscanbuild "$subpkgdir"/"$sitedir"
-}
-
-sha512sums="
-5f5497b57dd116225e90f321902f1015beb50c0b1bb90d0fc6c026f13aa748feabe44f98eb75e86f98f3b1785ad5e850210732f3eae75b942ecd520527dcd30b clang-14.0.6.src.tar.xz
-b55fd9872e52a27599e27fa665cf39af3d172814c0e7246ea0e57286e9eea42bf816f8b6d350334f3fe5e2fae35a8e59d59e71a3a5de330ecb0622ef7655e63f clang-tools-extra-14.0.6.src.tar.xz
-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..2487cada65
--- /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.6
+pkgrel=0
+_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="
+898e9793b27a17689150b8df99fce87037d7353e35b6f03449c64f131a8afb3780e45bf640af8c173362ddbf60bcf09f864a4316b523123899cdd19073ed5e48 clang-15.0.6.src.tar.xz
+c9a36e7fa924351304af27e20e362f580d1d8585fdcd7973bd4c614f81c5c5e0ed313ae110c7662f8df8373a98c10f386352bce6fbfed568e7f879f07fd6a452 clang-tools-extra-15.0.6.src.tar.xz
+a078b9b426515414dae41c8732d7cd955e8ddc9638b4ba9c7dd0925db68e5ea760096f08fd7e1cb9d55b6d73da75f9b4318a2fac36d7aa64f47536ac383b3edc cmake-15.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/cloog/APKBUILD b/main/cloog/APKBUILD
deleted file mode 100644
index 07e99ff8ee..0000000000
--- a/main/cloog/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=cloog
-pkgver=0.20.0
-pkgrel=3
-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/cmake/APKBUILD b/main/cmake/APKBUILD
index 00ef2fe158..0240bc46cb 100644
--- a/main/cmake/APKBUILD
+++ b/main/cmake/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cmake
-pkgver=3.24.2
+pkgver=3.25.1
pkgrel=0
pkgdesc="Cross-platform, open-source make system"
url="https://www.cmake.org/"
@@ -61,5 +61,5 @@ package() {
}
sha512sums="
-6f0e8e29bf0336f555ba72c4d83f35d820f8a5159cc999d48795dc57a6627b4ee3966dda84ca97d39906e35dd476ea00cf80023672cc0fad862e2996194c0674 cmake-3.24.2.tar.gz
+ec4203cac569e3c340bf6535d193d9ccff9c4e4d59a7a7ae5b9156172f647d9f9212bdc37b3c12cbd676b1351b9a64364c563aaa968a2f41e0f402410ed78d57 cmake-3.25.1.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..55a5fc94e4 100644
--- a/main/cmph/APKBUILD
+++ b/main/cmph/APKBUILD
@@ -1,9 +1,9 @@
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+# 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/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..fd862d3438 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cryptsetup
-pkgver=2.5.0
-pkgrel=1
+pkgver=2.6.0
+pkgrel=0
pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
url="https://gitlab.com/cryptsetup/cryptsetup"
arch="all"
@@ -74,8 +74,8 @@ libs() {
}
sha512sums="
-f457168292ae9fadc34d709494818aee3f18b56bdf5fcff0b2a5ae0b554031ce888d01cd126ca7aa915fcdcb00de6afed2fdb25bbbd690aa8bfcaafa516ade93 cryptsetup-2.5.0.tar.gz
-a3ca3e648749136ee724692b61488cd855f118eb93435942c2b04964a34fe49d0f0da4ef64cd2531c1c0f650e77808cf5d802789fd7664398248ead668bb35e5 dmcrypt.initd
+6c08234af0520281c694445c30e61c8566e8314a1bb098e5a03fd10723f16370ad822b505dc7d74cf3465197fabb7983bc898adfd6fe00ccbf777fee66fc66a3 cryptsetup-2.6.0.tar.gz
+5315589102d6e7fac5fdee1230a4012d5548c1a7193a05a310eacdeaf709857d370359cae7ea437e3ca0591ffdb848c205c14d42017a1c5445cadaec2e8eb4a1 dmcrypt.initd
74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 dmcrypt.confd
529187851def5fbc08e995eba90d3f013f1cf8469dcb9344f83d1e3c73c71467ca4ed62c8282ec27ebfa30ccc33653fdd1aea8d1d80e1ac4293d51865c9a6200 flush-stdout.patch
"
diff --git a/main/cryptsetup/dmcrypt.initd b/main/cryptsetup/dmcrypt.initd
index 85c77f7c1d..4dbda6f892 100644
--- a/main/cryptsetup/dmcrypt.initd
+++ b/main/cryptsetup/dmcrypt.initd
@@ -81,7 +81,7 @@ dm_crypt_execute() {
# ${target} is active:
# Newer versions report:
# ${target} is active[ and is in use.]
- if cryptsetup status ${target} | egrep -q ' is active' ; then
+ if cryptsetup status ${target} | grep -qE ' is active' ; then
einfo "dm-crypt mapping ${target} is already configured"
return
fi
@@ -301,7 +301,7 @@ stop() {
# Break down all mappings
header=true
- egrep "^(target|swap)=" ${conf_file} | \
+ grep -E "^(target|swap)=" ${conf_file} | \
while read line ; do
${header} && einfo "Removing dm-crypt mappings"
header=false
diff --git a/main/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 3d313e256b..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.85.0
-pkgrel=0
+pkgver=7.86.0
+pkgrel=1
pkgdesc="URL retrival utility and library"
url="https://curl.se/"
arch="all"
@@ -28,6 +28,11 @@ 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:
@@ -140,11 +145,6 @@ options="net" # Required for running tests
# 0:
# - CVE-2021-22897
-prepare() {
- default_prepare
- autoreconf -vfi
-}
-
build() {
./configure \
--build=$CBUILD \
@@ -158,6 +158,7 @@ build() {
--with-nghttp2 \
--disable-ldap \
--with-pic \
+ --enable-websockets \
--without-libssh2 # https://bugs.alpinelinux.org/issues/10222
make
@@ -196,5 +197,5 @@ static() {
}
sha512sums="
-b57cc31649a4f47cc4b482f56a85c86c8e8aaeaf01bc1b51b065fdb9145a9092bc52535e52a85a66432eb163605b2edbf5bc5c33ea6e40e50f26a69ad1365cbd curl-7.85.0.tar.xz
+18e03a3c00f22125e07bddb18becbf5acdca22baeb7b29f45ef189a5c56f95b2d51247813f7a9a90f04eb051739e9aa7d3a1c5be397bae75d763a2b918d1b656 curl-7.86.0.tar.xz
"
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 f693cdab1e..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"
diff --git a/main/dahdi-linux-lts/APKBUILD b/main/dahdi-linux-lts/APKBUILD
index e807a84c56..8cbeb63e1b 100644
--- a/main/dahdi-linux-lts/APKBUILD
+++ b/main/dahdi-linux-lts/APKBUILD
@@ -4,12 +4,12 @@
# 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.70
+_kver=5.15.81
_krel=0
_kpkgver="$_kver-r$_krel"
@@ -17,7 +17,7 @@ _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 7f5e4b1746..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=1
+pkgrel=2
pkgdesc="small and fast AV1 Decoder"
url="https://code.videolan.org/videolan/dav1d"
arch="all"
@@ -19,8 +19,10 @@ build() {
*) meson_opts="-Denable_asm=true" ;;
esac
+ CFLAGS="$CFLAGS -O2" \
+ CXXFLAGS="$CXXFLAGS -O2" \
+ CPPFLAGS="$CPPFLAGS -O2" \
abuild-meson \
- --buildtype=release \
-Db_lto=true \
-Denable_tests=true \
-Denable_tools=true \
diff --git a/main/dbus/APKBUILD b/main/dbus/APKBUILD
index 7d90f62af8..f0d77f2310 100644
--- a/main/dbus/APKBUILD
+++ b/main/dbus/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dbus
-pkgver=1.15.0
+pkgver=1.14.4
pkgrel=0
pkgdesc="Freedesktop.org message bus system"
url="https://www.freedesktop.org/Software/dbus"
@@ -30,30 +30,36 @@ source="https://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.xz
$pkgname.initd
$pkgname.confd
"
+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
build() {
- abuild-meson \
- -Db_lto=true \
- -Dinotify=enabled \
- -Ddbus_user=messagebus \
- -Dsystem_pid_file=/run/dbus/dbus.pid \
- . output
-
- meson compile -C output
+ CFLAGS="$CFLAGS -flto=auto" \
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --localstatedir=/var \
+ --sysconfdir=/etc \
+ --with-system-pid-file=/run/dbus/dbus.pid \
+ make
}
check() {
- meson test -t 4 --no-rebuild --print-errorlogs -C output
+ make check
}
package() {
- DESTDIR="$pkgdir" meson install --no-rebuild -C output
+ make DESTDIR="$pkgdir" install
install -Dm755 "$srcdir"/dbus.initd "$pkgdir"/etc/init.d/dbus
install -Dm644 "$srcdir"/dbus.confd "$pkgdir"/etc/conf.d/dbus
@@ -74,7 +80,7 @@ x11() {
}
sha512sums="
-6f7e1d4ff525ce13c5f671f1b045a089c379cbfb777662ce7a55ffe4893a8ab2aaf38877a7b8f261823067a20f3b336437449eb353a97d30699496375e00bf1a dbus-1.15.0.tar.xz
+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 */
- }
-
-+ // Make sure the udp size is not smaller than the incoming message so that we
-+ // do not underflow
-+ if (udp_size < n) udp_size = n;
-+
- #ifdef HAVE_CONNTRACK
- #ifdef HAVE_AUTH
- if (!auth_dns || local_auth)
diff --git a/src/rfc1035.c b/src/rfc1035.c
-index 6fc4f26..66fa00c 100644
+index 60ef272..93701f6 100644
--- a/src/rfc1035.c
+++ b/src/rfc1035.c
-@@ -1396,6 +1396,9 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
+@@ -1411,6 +1411,9 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
size_t len;
int rd_bit = (header->hb3 & HB3_RD);
@@ -62,5 +46,4 @@ index 6fc4f26..66fa00c 100644
if (ntohs(header->ancount) != 0 ||
ntohs(header->nscount) != 0 ||
--
-2.31.1
-
+2.37.3
diff --git a/main/dnsmasq/0001-Retry-on-interrupted-error-in-tftp.patch b/main/dnsmasq/0001-Retry-on-interrupted-error-in-tftp.patch
deleted file mode 100644
index 6fa3ac3584..0000000000
--- a/main/dnsmasq/0001-Retry-on-interrupted-error-in-tftp.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/0001-Retry-on-interrupted-error-in-tftp.patch (backport from upstream)
---
-From f5f56c001dddd486859dc6301e6cbe00ba604fe8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Wed, 18 Aug 2021 10:09:35 +0200
-Subject: [PATCH 01/15] Retry on interrupted error in tftp
-
-Interrupt might arrive when sending error reply. Retry if possible.
-
-Wrong Check of Return Value
-
-diff --git a/src/tftp.c b/src/tftp.c
-index 37bdff2..3d87523 100644
---- a/src/tftp.c
-+++ b/src/tftp.c
-@@ -600,7 +600,7 @@ void check_tftp_listeners(time_t now)
- /* Wrong source address. See rfc1350 para 4. */
- prettyprint_addr(&peer, daemon->addrbuff);
- len = tftp_err(ERR_TID, daemon->packet, _("ignoring packet from %s (TID mismatch)"), daemon->addrbuff);
-- sendto(transfer->sockfd, daemon->packet, len, 0, &peer.sa, sa_len(&peer));
-+ while(retry_send(sendto(transfer->sockfd, daemon->packet, len, 0, &peer.sa, sa_len(&peer))));
- }
- }
- }
---
-2.31.1
-
diff --git a/main/dnsmasq/0002-Add-safety-checks-to-places-pointed-by-Coverity.patch b/main/dnsmasq/0002-Add-safety-checks-to-places-pointed-by-Coverity.patch
deleted file mode 100644
index 1c84ecdd95..0000000000
--- a/main/dnsmasq/0002-Add-safety-checks-to-places-pointed-by-Coverity.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/0002-Add-safety-checks-to-places-pointed-by-Coverity.patch (backport from upstream)
---
-From 061013293ceddce509ae06a31a045e803103f1ce Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Wed, 18 Aug 2021 14:59:23 +0200
-Subject: [PATCH 02/15] Add safety checks to places pointed by Coverity
-
-diff --git a/src/cache.c b/src/cache.c
-index 8add610..97c51a7 100644
---- a/src/cache.c
-+++ b/src/cache.c
-@@ -433,7 +433,7 @@ static struct crec *cache_scan_free(char *name, union all_addr *addr, unsigned s
- else if (!(crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG)) &&
- (flags & crecp->flags & F_REVERSE) &&
- (flags & crecp->flags & (F_IPV4 | F_IPV6)) &&
-- memcmp(&crecp->addr, addr, addrlen) == 0)
-+ addr && memcmp(&crecp->addr, addr, addrlen) == 0)
- {
- *up = crecp->hash_next;
- cache_unlink(crecp);
-@@ -2013,7 +2013,7 @@ void log_query(unsigned int flags, char *name, union all_addr *addr, char *arg)
- else
- source = "cached";
-
-- if (strlen(name) == 0)
-+ if (name && !name[0])
- name = ".";
-
- if (option_bool(OPT_EXTRALOG))
-diff --git a/src/forward.c b/src/forward.c
-index 3d638e4..f07c908 100644
---- a/src/forward.c
-+++ b/src/forward.c
-@@ -2276,7 +2276,7 @@ int allocate_rfd(struct randfd_list **fdlp, struct server *serv)
- }
- }
-
-- if (j == daemon->numrrand)
-+ if (!rfd) /* should be when j == daemon->numrrand */
- {
- struct randfd_list *rfl_poll;
-
---
-2.31.1
-
diff --git a/main/dnsmasq/0003-Small-safeguard-to-unexpected-data.patch b/main/dnsmasq/0003-Small-safeguard-to-unexpected-data.patch
deleted file mode 100644
index 8d90e964d8..0000000000
--- a/main/dnsmasq/0003-Small-safeguard-to-unexpected-data.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/0003-Small-safeguard-to-unexpected-data.patch
---
-From 920cd815bafea084f68cc4309399aea77bd7f66b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Fri, 3 Sep 2021 14:11:42 +0200
-Subject: [PATCH 03/15] Small safeguard to unexpected data
-
-Make sure negative index is not used for comparison. It seems code in
-option parsing does not allow it to be empty, but insist on it also in
-this place.
----
- src/dhcp-common.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/dhcp-common.c b/src/dhcp-common.c
-index 73568a9..85b269a 100644
---- a/src/dhcp-common.c
-+++ b/src/dhcp-common.c
-@@ -88,7 +88,7 @@ int match_netid_wild(struct dhcp_netid *check, struct dhcp_netid *pool)
- for (; check; check = check->next)
- {
- const int check_len = strlen(check->net);
-- const int is_wc = (check->net[check_len - 1] == '*');
-+ const int is_wc = (check_len > 0 && check->net[check_len - 1] == '*');
-
- /* '#' for not is for backwards compat. */
- if (check->net[0] != '!' && check->net[0] != '#')
---
-2.31.1
-
diff --git a/main/dnsmasq/0004-Fix-bunch-of-warnings-in-auth.c.patch b/main/dnsmasq/0004-Fix-bunch-of-warnings-in-auth.c.patch
deleted file mode 100644
index f3b7caaecd..0000000000
--- a/main/dnsmasq/0004-Fix-bunch-of-warnings-in-auth.c.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/0004-Fix-bunch-of-warnings-in-auth.c.patch (backport from upstream)
---
-From e61af561900b4d2dd976a575b2efd388be092742 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Fri, 3 Sep 2021 16:00:35 +0200
-Subject: [PATCH 04/15] Fix bunch of warnings in auth.c
-
-diff --git a/src/auth.c b/src/auth.c
-index 172a4b2..4f03c39 100644
---- a/src/auth.c
-+++ b/src/auth.c
-@@ -417,7 +417,6 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
-
- if (!found && is_name_synthetic(flag, name, &addr) )
- {
-- found = 1;
- nxdomain = 0;
-
- log_query(F_FORWARD | F_CONFIG | flag, name, &addr, NULL);
-@@ -433,7 +432,6 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
- if (qtype == T_SOA)
- {
- auth = soa = 1; /* inhibits auth section */
-- found = 1;
- log_query(F_RRNAME | F_AUTH, zone->domain, NULL, "<SOA>");
- }
- else if (qtype == T_AXFR)
-@@ -469,7 +467,6 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
- soa = 1; /* inhibits auth section */
- ns = 1; /* ensure we include NS records! */
- axfr = 1;
-- found = 1;
- axfroffset = nameoffset;
- log_query(F_RRNAME | F_AUTH, zone->domain, NULL, "<AXFR>");
- }
-@@ -477,7 +474,6 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
- {
- auth = 1;
- ns = 1; /* inhibits auth section */
-- found = 1;
- log_query(F_RRNAME | F_AUTH, zone->domain, NULL, "<NS>");
- }
- }
-@@ -498,7 +494,6 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
- *cut = '.'; /* restore domain part */
- log_query(crecp->flags, name, &crecp->addr, record_source(crecp->uid));
- *cut = 0; /* remove domain part */
-- found = 1;
- if (add_resource_record(header, limit, &trunc, nameoffset, &ansp,
- daemon->auth_ttl, NULL, qtype, C_IN,
- qtype == T_A ? "4" : "6", &crecp->addr))
-@@ -519,7 +514,6 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
- if ((crecp->flags & flag) && (local_query || filter_zone(zone, flag, &(crecp->addr))))
- {
- log_query(crecp->flags, name, &crecp->addr, record_source(crecp->uid));
-- found = 1;
- if (add_resource_record(header, limit, &trunc, nameoffset, &ansp,
- daemon->auth_ttl, NULL, qtype, C_IN,
- qtype == T_A ? "4" : "6", &crecp->addr))
-@@ -614,7 +608,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
- if (subnet->prefixlen >= 16 )
- p += sprintf(p, "%u.", a & 0xff);
- a = a >> 8;
-- p += sprintf(p, "%u.in-addr.arpa", a & 0xff);
-+ sprintf(p, "%u.in-addr.arpa", a & 0xff);
-
- }
- else
-@@ -627,7 +621,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
- int dig = ((unsigned char *)&subnet->addr.addr6)[i>>3];
- p += sprintf(p, "%.1x.", (i>>2) & 1 ? dig & 15 : dig >> 4);
- }
-- p += sprintf(p, "ip6.arpa");
-+ sprintf(p, "ip6.arpa");
-
- }
- }
---
-2.31.1
-
diff --git a/main/dnsmasq/0005-Fix-few-coverity-warnings-in-lease-tools.patch b/main/dnsmasq/0005-Fix-few-coverity-warnings-in-lease-tools.patch
deleted file mode 100644
index dafed7d95c..0000000000
--- a/main/dnsmasq/0005-Fix-few-coverity-warnings-in-lease-tools.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/0005-Fix-few-coverity-warnings-in-lease-tools.patch (backport from upstream)
---
-From be7f213066282baeed46cc34223601c462db9cbf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Fri, 3 Sep 2021 16:32:05 +0200
-Subject: [PATCH 05/15] Fix few coverity warnings in lease-tools
-
-diff --git a/contrib/lease-tools/dhcp_release.c b/contrib/lease-tools/dhcp_release.c
-index c1c835b..84f5610 100644
---- a/contrib/lease-tools/dhcp_release.c
-+++ b/contrib/lease-tools/dhcp_release.c
-@@ -280,6 +280,7 @@ int main(int argc, char **argv)
-
- /* This voodoo fakes up a packet coming from the correct interface, which really matters for
- a DHCP server */
-+ memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, argv[1], sizeof(ifr.ifr_name)-1);
- ifr.ifr_name[sizeof(ifr.ifr_name)-1] = '\0';
- if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr)) == -1)
-diff --git a/contrib/lease-tools/dhcp_release6.c b/contrib/lease-tools/dhcp_release6.c
-index d680222..9b3438f 100644
---- a/contrib/lease-tools/dhcp_release6.c
-+++ b/contrib/lease-tools/dhcp_release6.c
-@@ -318,6 +318,12 @@ void usage(const char* arg, FILE* stream)
- fprintf (stream, "Usage: %s %s\n", arg, usage_string);
- }
-
-+static void fail_fatal(const char *errstr, int exitcode)
-+{
-+ perror(errstr);
-+ exit(exitcode);
-+}
-+
- int send_release_packet(const char* iface, struct dhcp6_packet* packet)
- {
- struct sockaddr_in6 server_addr, client_addr;
-@@ -343,18 +349,19 @@ int send_release_packet(const char* iface, struct dhcp6_packet* packet)
- client_addr.sin6_port = htons(DHCP6_CLIENT_PORT);
- client_addr.sin6_flowinfo = 0;
- client_addr.sin6_scope_id =0;
-- inet_pton(AF_INET6, "::", &client_addr.sin6_addr);
-- bind(sock, (struct sockaddr*)&client_addr, sizeof(struct sockaddr_in6));
-- inet_pton(AF_INET6, DHCP6_MULTICAST_ADDRESS, &server_addr.sin6_addr);
-+ if (inet_pton(AF_INET6, "::", &client_addr.sin6_addr) <= 0)
-+ fail_fatal("inet_pton", 5);
-+ if (bind(sock, (struct sockaddr*)&client_addr, sizeof(struct sockaddr_in6)) != 0)
-+ perror("bind"); /* continue on bind error */
-+ if (inet_pton(AF_INET6, DHCP6_MULTICAST_ADDRESS, &server_addr.sin6_addr) <= 0)
-+ fail_fatal("inet_pton", 5);
- server_addr.sin6_port = htons(DHCP6_SERVER_PORT);
-- int16_t recv_size = 0;
-+ ssize_t recv_size = 0;
-+ int result;
- for (i = 0; i < 5; i++)
- {
- if (sendto(sock, packet->buf, packet->len, 0, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0)
-- {
-- perror("sendto failed");
-- exit(4);
-- }
-+ fail_fatal("sendto failed", 4);
-
- recv_size = recvfrom(sock, response, sizeof(response), MSG_DONTWAIT, NULL, 0);
- if (recv_size == -1)
-@@ -367,16 +374,18 @@ int send_release_packet(const char* iface, struct dhcp6_packet* packet)
- else
- {
- perror("recvfrom");
-+ result = UNSPEC_FAIL;
- }
- }
--
-- int16_t result = parse_packet(response, recv_size);
-- if (result == NOT_REPLY_CODE)
-+ else
- {
-- sleep(1);
-- continue;
-+ result = parse_packet(response, recv_size);
-+ if (result == NOT_REPLY_CODE)
-+ {
-+ sleep(1);
-+ continue;
-+ }
- }
--
- close(sock);
- return result;
- }
---
-2.31.1
-
diff --git a/main/dnsmasq/0006-Fix-coverity-formats-issues-in-blockdata.patch b/main/dnsmasq/0006-Fix-coverity-formats-issues-in-blockdata.patch
deleted file mode 100644
index 441fbefa46..0000000000
--- a/main/dnsmasq/0006-Fix-coverity-formats-issues-in-blockdata.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/0006-Fix-coverity-formats-issues-in-blockdata.patch (backport from upstream)
---
-From 3a077065ce846e301b532127ebecdd2771ad75ed Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Fri, 3 Sep 2021 16:41:00 +0200
-Subject: [PATCH 06/15] Fix coverity formats issues in blockdata
-
-diff --git a/src/blockdata.c b/src/blockdata.c
-index f7740b5..0986285 100644
---- a/src/blockdata.c
-+++ b/src/blockdata.c
-@@ -52,7 +52,7 @@ void blockdata_init(void)
-
- void blockdata_report(void)
- {
-- my_syslog(LOG_INFO, _("pool memory in use %u, max %u, allocated %u"),
-+ my_syslog(LOG_INFO, _("pool memory in use %zu, max %zu, allocated %zu"),
- blockdata_count * sizeof(struct blockdata),
- blockdata_hwm * sizeof(struct blockdata),
- blockdata_alloced * sizeof(struct blockdata));
---
-2.31.1
-
diff --git a/main/dnsmasq/0007-Retry-dhcp6-ping-on-interrupts.patch b/main/dnsmasq/0007-Retry-dhcp6-ping-on-interrupts.patch
deleted file mode 100644
index 7fea5532af..0000000000
--- a/main/dnsmasq/0007-Retry-dhcp6-ping-on-interrupts.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/0007-Retry-dhcp6-ping-on-interrupts.patch (backport from upstream)
---
-From 467b621fb7da6e1318ac7204325b0adb01b3ff19 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Fri, 3 Sep 2021 16:48:50 +0200
-Subject: [PATCH 07/15] Retry dhcp6 ping on interrupts
-
-diff --git a/src/dhcp6.c b/src/dhcp6.c
-index 2be877f..ae1f5c1 100644
---- a/src/dhcp6.c
-+++ b/src/dhcp6.c
-@@ -292,7 +292,7 @@ void get_client_mac(struct in6_addr *client, int iface, unsigned char *mac, unsi
- if ((maclen = find_mac(&addr, mac, 0, now)) != 0)
- break;
-
-- sendto(daemon->icmp6fd, &neigh, sizeof(neigh), 0, &addr.sa, sizeof(addr));
-+ while(retry_send(sendto(daemon->icmp6fd, &neigh, sizeof(neigh), 0, &addr.sa, sizeof(addr))));
-
- ts.tv_sec = 0;
- ts.tv_nsec = 100000000; /* 100ms */
---
-2.31.1
-
diff --git a/main/dnsmasq/0008-Fix-coverity-warnings-on-dbus.patch b/main/dnsmasq/0008-Fix-coverity-warnings-on-dbus.patch
deleted file mode 100644
index 160d4d0d6d..0000000000
--- a/main/dnsmasq/0008-Fix-coverity-warnings-on-dbus.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/0008-Fix-coverity-warnings-on-dbus.patch (backport from upstream)
---
-From bbfdf6a435cbd5f71ae76f962ce86786346589aa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Fri, 3 Sep 2021 17:19:05 +0200
-Subject: [PATCH 08/15] Fix coverity warnings on dbus
-
-diff --git a/src/dbus.c b/src/dbus.c
-index cbdce9c..d746b9a 100644
---- a/src/dbus.c
-+++ b/src/dbus.c
-@@ -114,7 +114,7 @@ static dbus_bool_t add_watch(DBusWatch *watch, void *data)
- w->next = daemon->watches;
- daemon->watches = w;
-
-- w = data; /* no warning */
-+ (void)data; /* no warning */
- return TRUE;
- }
-
-@@ -134,16 +134,20 @@ static void remove_watch(DBusWatch *watch, void *data)
- up = &(w->next);
- }
-
-- w = data; /* no warning */
-+ (void)data; /* no warning */
- }
-
--static void dbus_read_servers(DBusMessage *message)
-+static DBusMessage* dbus_read_servers(DBusMessage *message)
- {
- DBusMessageIter iter;
- union mysockaddr addr, source_addr;
- char *domain;
-
-- dbus_message_iter_init(message, &iter);
-+ if (!dbus_message_iter_init(message, &iter))
-+ {
-+ return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS,
-+ "Failed to initialize dbus message iter");
-+ }
-
- mark_servers(SERV_FROM_DBUS);
-
-@@ -222,6 +226,7 @@ static void dbus_read_servers(DBusMessage *message)
-
- /* unlink and free anything still marked. */
- cleanup_servers();
-+ return NULL;
- }
-
- #ifdef HAVE_LOOP
-@@ -545,6 +550,10 @@ static DBusMessage *dbus_add_lease(DBusMessage* message)
- "Invalid IP address '%s'", ipaddr);
-
- hw_len = parse_hex((char*)hwaddr, dhcp_chaddr, DHCP_CHADDR_MAX, NULL, &hw_type);
-+ if (hw_len < 0)
-+ return dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS,
-+ "Invalid HW address '%s'", hwaddr);
-+
- if (hw_type == 0 && hw_len != 0)
- hw_type = ARPHRD_ETHER;
-
-@@ -668,7 +677,7 @@ DBusHandlerResult message_handler(DBusConnection *connection,
- #endif
- else if (strcmp(method, "SetServers") == 0)
- {
-- dbus_read_servers(message);
-+ reply = dbus_read_servers(message);
- new_servers = 1;
- }
- else if (strcmp(method, "SetServersEx") == 0)
-@@ -719,7 +728,7 @@ DBusHandlerResult message_handler(DBusConnection *connection,
- if (clear_cache)
- clear_cache_and_reload(dnsmasq_time());
-
-- method = user_data; /* no warning */
-+ (void)user_data; /* no warning */
-
- /* If no reply or no error, return nothing */
- if (!reply)
---
-2.31.1
-
diff --git a/main/dnsmasq/0009-Address-coverity-issues-detected-in-util.c.patch b/main/dnsmasq/0009-Address-coverity-issues-detected-in-util.c.patch
deleted file mode 100644
index 4dbf56de5a..0000000000
--- a/main/dnsmasq/0009-Address-coverity-issues-detected-in-util.c.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/0009-Address-coverity-issues-detected-in-util.c.patch (backport from upstream)
---
-From 7b975696a7bda5b86fcf168644f177544adb6fe9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Fri, 3 Sep 2021 17:38:26 +0200
-Subject: [PATCH 09/15] Address coverity issues detected in util.c
-
-diff --git a/src/util.c b/src/util.c
-index 1425764..8e69d55 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -208,6 +208,8 @@ char *canonicalise(char *in, int *nomem)
- /* older libidn2 strips underscores, so don't do IDN processing
- if the name has an underscore (check_name() returned 2) */
- if (rc != 2)
-+#else
-+ (void)rc;
- #endif
- #if defined(HAVE_IDN) || defined(HAVE_LIBIDN2)
- {
-@@ -235,11 +237,14 @@ char *canonicalise(char *in, int *nomem)
- return ret;
- }
- #endif
--
-+
-+#if !defined(HAVE_LIBIDN2) || (defined(HAVE_LIBIDN2) && (!defined(IDN2_VERSION_NUMBER) || IDN2_VERSION_NUMBER < 0x02000003))
-+ /* If recent libidn2 is used, it cannot reach this code. */
- if ((ret = whine_malloc(strlen(in)+1)))
- strcpy(ret, in);
- else if (nomem)
-- *nomem = 1;
-+ *nomem = 1;
-+#endif
-
- return ret;
- }
-@@ -528,7 +533,7 @@ void prettyprint_time(char *buf, unsigned int t)
- if ((x = (t/60)%60))
- p += sprintf(&buf[p], "%um", x);
- if ((x = t%60))
-- p += sprintf(&buf[p], "%us", x);
-+ sprintf(&buf[p], "%us", x);
- }
- }
-
-@@ -574,7 +579,7 @@ int parse_hex(char *in, unsigned char *out, int maxlen,
- int j, bytes = (1 + (r - in))/2;
- for (j = 0; j < bytes; j++)
- {
-- char sav = sav;
-+ char sav;
- if (j < bytes - 1)
- {
- sav = in[(j+1)*2];
---
-2.31.1
-
diff --git a/main/dnsmasq/0010-Fix-coverity-detected-issues-in-option.c.patch b/main/dnsmasq/0010-Fix-coverity-detected-issues-in-option.c.patch
deleted file mode 100644
index 25b271fe78..0000000000
--- a/main/dnsmasq/0010-Fix-coverity-detected-issues-in-option.c.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/0010-Fix-coverity-detected-issues-in-option.c.patch (backport from upstream)
---
-From db835f8c40e83c6392e69ffc7f2cc500f7682dd4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Fri, 3 Sep 2021 19:23:20 +0200
-Subject: [PATCH 10/15] Fix coverity detected issues in option.c
-
-diff --git a/src/option.c b/src/option.c
-index ffce9fc..11655fd 100644
---- a/src/option.c
-+++ b/src/option.c
-@@ -798,7 +798,7 @@ static void do_usage(void)
-
- if (usage[i].arg)
- {
-- strcpy(buff, usage[i].arg);
-+ safe_strncpy(buff, usage[i].arg, sizeof(buff));
- for (j = 0; tab[j].handle; j++)
- if (tab[j].handle == *(usage[i].arg))
- sprintf(buff, "%d", tab[j].val);
-@@ -959,7 +959,7 @@ static int domain_rev4(char *domain, struct in_addr addr, int msize)
- return 0;
- }
-
-- domain += sprintf(domain, "in-addr.arpa");
-+ sprintf(domain, "in-addr.arpa");
-
- return 1;
- }
-@@ -978,7 +978,7 @@ static int domain_rev6(char *domain, struct in6_addr *addr, int msize)
- int dig = ((unsigned char *)addr)[i>>3];
- domain += sprintf(domain, "%.1x.", (i>>2) & 1 ? dig & 15 : dig >> 4);
- }
-- domain += sprintf(domain, "ip6.arpa");
-+ sprintf(domain, "ip6.arpa");
-
- return 1;
- }
-@@ -1829,6 +1829,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
- new->next = li;
- *up = new;
- }
-+ else
-+ free(path);
-
- }
-
-@@ -1995,7 +1997,11 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
-
- if (!(name = canonicalise_opt(arg)) ||
- (comma && !(target = canonicalise_opt(comma))))
-- ret_err(_("bad MX name"));
-+ {
-+ free(name);
-+ free(target);
-+ ret_err(_("bad MX name"));
-+ }
-
- new = opt_malloc(sizeof(struct mx_srv_record));
- new->next = daemon->mxnames;
-@@ -3616,6 +3622,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
- inet_ntop(AF_INET, &in, daemon->addrbuff, ADDRSTRLEN);
- sprintf(errstr, _("duplicate dhcp-host IP address %s"),
- daemon->addrbuff);
-+ dhcp_config_free(new);
- return 0;
- }
- }
-@@ -3779,16 +3786,16 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
-
- case LOPT_NAME_MATCH: /* --dhcp-name-match */
- {
-- struct dhcp_match_name *new = opt_malloc(sizeof(struct dhcp_match_name));
-- struct dhcp_netid *id = opt_malloc(sizeof(struct dhcp_netid));
-+ struct dhcp_match_name *new;
- ssize_t len;
-
- if (!(comma = split(arg)) || (len = strlen(comma)) == 0)
- ret_err(gen_err);
-
-+ new = opt_malloc(sizeof(struct dhcp_match_name));
- new->wildcard = 0;
-- new->netid = id;
-- id->net = opt_string_alloc(set_prefix(arg));
-+ new->netid = opt_malloc(sizeof(struct dhcp_netid));
-+ new->netid->net = opt_string_alloc(set_prefix(arg));
-
- if (comma[len-1] == '*')
- {
-@@ -3992,6 +3999,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
- }
- }
-
-+ dhcp_netid_free(new->netid);
-+ free(new);
- ret_err(gen_err);
- }
-
-@@ -4367,7 +4376,7 @@ err:
- case LOPT_CNAME: /* --cname */
- {
- struct cname *new;
-- char *alias, *target, *last, *pen;
-+ char *alias, *target=NULL, *last, *pen;
- int ttl = -1;
-
- for (last = pen = NULL, comma = arg; comma; comma = split(comma))
-@@ -4382,13 +4391,13 @@ err:
- if (pen != arg && atoi_check(last, &ttl))
- last = pen;
-
-- target = canonicalise_opt(last);
--
- while (arg != last)
- {
- int arglen = strlen(arg);
- alias = canonicalise_opt(arg);
-
-+ if (!target)
-+ target = canonicalise_opt(last);
- if (!alias || !target)
- {
- free(target);
-@@ -4691,7 +4700,7 @@ err:
- struct name_list *nl;
- if (!canon)
- {
-- struct name_list *tmp = new->names, *next;
-+ struct name_list *tmp, *next;
- for (tmp = new->names; tmp; tmp = next)
- {
- next = tmp->next;
---
-2.31.1
-
diff --git a/main/dnsmasq/0011-Fix-coverity-detected-issue-in-radv.c.patch b/main/dnsmasq/0011-Fix-coverity-detected-issue-in-radv.c.patch
deleted file mode 100644
index d3a9819891..0000000000
--- a/main/dnsmasq/0011-Fix-coverity-detected-issue-in-radv.c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/0011-Fix-coverity-detected-issue-in-radv.c.patch (backport from upstream)
---
-From 9c088b29dcdb8a3e013120d8272a6e0314a8f3df Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Fri, 3 Sep 2021 19:29:23 +0200
-Subject: [PATCH 11/15] Fix coverity detected issue in radv.c
-
-diff --git a/src/radv.c b/src/radv.c
-index 3255904..6d6fa32 100644
---- a/src/radv.c
-+++ b/src/radv.c
-@@ -746,6 +746,8 @@ static int add_lla(int index, unsigned int type, char *mac, size_t maclen, void
- add 7 to round up */
- int len = (maclen + 9) >> 3;
- unsigned char *p = expand(len << 3);
-+ if (!p)
-+ return 1;
- memset(p, 0, len << 3);
- *p++ = ICMP6_OPT_SOURCE_MAC;
- *p++ = len;
---
-2.31.1
-
diff --git a/main/dnsmasq/0012-Fix-coverity-detected-issues-in-cache.c.patch b/main/dnsmasq/0012-Fix-coverity-detected-issues-in-cache.c.patch
deleted file mode 100644
index b98f71f216..0000000000
--- a/main/dnsmasq/0012-Fix-coverity-detected-issues-in-cache.c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/0012-Fix-coverity-detected-issues-in-cache.c.patch (backport from upstream)
---
-From 957b2b25238d82a6c3afced2ff0423ad171fb22e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Fri, 3 Sep 2021 20:10:37 +0200
-Subject: [PATCH 12/15] Fix coverity detected issues in cache.c
-
-diff --git a/src/cache.c b/src/cache.c
-index 97c51a7..6722fa6 100644
---- a/src/cache.c
-+++ b/src/cache.c
-@@ -1188,7 +1188,7 @@ void cache_reload(void)
- struct host_record *hr;
- struct name_list *nl;
- struct cname *a;
-- struct crec lrec;
-+ struct crec lrec = { 0, };
- struct mx_srv_record *mx;
- struct txt_record *txt;
- struct interface_name *intr;
---
-2.31.1
-
diff --git a/main/dnsmasq/0013-Fix-coverity-issues-detected-in-domain-match.c.patch b/main/dnsmasq/0013-Fix-coverity-issues-detected-in-domain-match.c.patch
deleted file mode 100644
index 869fab74d3..0000000000
--- a/main/dnsmasq/0013-Fix-coverity-issues-detected-in-domain-match.c.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/0013-Fix-coverity-issues-detected-in-domain-match.c.patch (backport from upstream)
---
-From 0dafe990a1395d597bc6022c3936769f7a0ddea7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Fri, 3 Sep 2021 21:16:22 +0200
-Subject: [PATCH 13/15] Fix coverity issues detected in domain-match.c
-
-diff --git a/src/domain-match.c b/src/domain-match.c
-index f8e4796..7124c18 100644
---- a/src/domain-match.c
-+++ b/src/domain-match.c
-@@ -411,7 +411,8 @@ size_t make_local_answer(int flags, int gotname, size_t size, struct dns_header
- addr.addr4 = srv->addr;
-
- header->ancount = htons(ntohs(header->ancount) + 1);
-- add_resource_record(header, limit, &trunc, sizeof(struct dns_header), &p, daemon->local_ttl, NULL, T_A, C_IN, "4", &addr);
-+ if (!add_resource_record(header, limit, &trunc, sizeof(struct dns_header), &p, daemon->local_ttl, NULL, T_A, C_IN, "4", &addr))
-+ return 0;
- log_query((flags | F_CONFIG | F_FORWARD) & ~F_IPV6, name, (union all_addr *)&addr, NULL);
- }
-
-@@ -426,7 +427,8 @@ size_t make_local_answer(int flags, int gotname, size_t size, struct dns_header
- addr.addr6 = srv->addr;
-
- header->ancount = htons(ntohs(header->ancount) + 1);
-- add_resource_record(header, limit, &trunc, sizeof(struct dns_header), &p, daemon->local_ttl, NULL, T_AAAA, C_IN, "6", &addr);
-+ if (!add_resource_record(header, limit, &trunc, sizeof(struct dns_header), &p, daemon->local_ttl, NULL, T_AAAA, C_IN, "6", &addr))
-+ return 0;
- log_query((flags | F_CONFIG | F_FORWARD) & ~F_IPV4, name, (union all_addr *)&addr, NULL);
- }
-
-@@ -609,9 +611,12 @@ int add_update_server(int flags,
-
- if (*domain == 0)
- alloc_domain = whine_malloc(1);
-- else if (!(alloc_domain = canonicalise((char *)domain, NULL)))
-+ else
-+ alloc_domain = canonicalise((char *)domain, NULL);
-+
-+ if (!alloc_domain)
- return 0;
--
-+
- /* See if there is a suitable candidate, and unmark
- only do this for forwarding servers, not
- address or local, to avoid delays on large numbers. */
-@@ -643,7 +647,10 @@ int add_update_server(int flags,
- size = sizeof(struct server);
-
- if (!(serv = whine_malloc(size)))
-- return 0;
-+ {
-+ free(alloc_domain);
-+ return 0;
-+ }
-
- if (flags & SERV_IS_LOCAL)
- {
---
-2.31.1
-
diff --git a/main/dnsmasq/0014-Fix-coverity-detected-issues-in-dnsmasq.c.patch b/main/dnsmasq/0014-Fix-coverity-detected-issues-in-dnsmasq.c.patch
deleted file mode 100644
index 148a4b319f..0000000000
--- a/main/dnsmasq/0014-Fix-coverity-detected-issues-in-dnsmasq.c.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/0014-Fix-coverity-detected-issues-in-dnsmasq.c.patch (backport from upstream)
---
-From f476acbe3c2830e6ff0c50cc36d364a3f3f4fadb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Fri, 3 Sep 2021 22:45:29 +0200
-Subject: [PATCH 14/15] Fix coverity detected issues in dnsmasq.c
-
-diff --git a/src/dnsmasq.c b/src/dnsmasq.c
-index 602daed..3e1bfe8 100644
---- a/src/dnsmasq.c
-+++ b/src/dnsmasq.c
-@@ -34,7 +34,6 @@ static void poll_resolv(int force, int do_reload, time_t now);
-
- int main (int argc, char **argv)
- {
-- int bind_fallback = 0;
- time_t now;
- struct sigaction sigact;
- struct iname *if_tmp;
-@@ -59,6 +58,8 @@ int main (int argc, char **argv)
- int did_bind = 0;
- struct server *serv;
- char *netlink_warn;
-+#else
-+ int bind_fallback = 0;
- #endif
- #if defined(HAVE_DHCP) || defined(HAVE_DHCP6)
- struct dhcp_context *context;
-@@ -377,7 +378,7 @@ int main (int argc, char **argv)
- bindtodevice(bound_device, daemon->dhcpfd);
- did_bind = 1;
- }
-- if (daemon->enable_pxe && bound_device)
-+ if (daemon->enable_pxe && bound_device && daemon->pxefd != -1)
- {
- bindtodevice(bound_device, daemon->pxefd);
- did_bind = 1;
-@@ -920,8 +921,10 @@ int main (int argc, char **argv)
- my_syslog(LOG_WARNING, _("warning: failed to change owner of %s: %s"),
- daemon->log_file, strerror(log_err));
-
-+#ifndef HAVE_LINUX_NETWORK
- if (bind_fallback)
- my_syslog(LOG_WARNING, _("setting --bind-interfaces option because of OS limitations"));
-+#endif
-
- if (option_bool(OPT_NOWILD))
- warn_bound_listeners();
-@@ -1575,7 +1578,7 @@ static void async_event(int pipe, time_t now)
- {
- /* block in writes until all done */
- if ((i = fcntl(daemon->helperfd, F_GETFL)) != -1)
-- fcntl(daemon->helperfd, F_SETFL, i & ~O_NONBLOCK);
-+ while(retry_send(fcntl(daemon->helperfd, F_SETFL, i & ~O_NONBLOCK)));
- do {
- helper_write();
- } while (!helper_buf_empty() || do_script_run(now));
-@@ -1984,7 +1987,7 @@ static void check_dns_listeners(time_t now)
- attribute from the listening socket.
- Reset that here. */
- if ((flags = fcntl(confd, F_GETFL, 0)) != -1)
-- fcntl(confd, F_SETFL, flags & ~O_NONBLOCK);
-+ while(retry_send(fcntl(confd, F_SETFL, flags & ~O_NONBLOCK)));
-
- buff = tcp_request(confd, now, &tcp_addr, netmask, auth_dns);
-
---
-2.31.1
-
diff --git a/main/dnsmasq/0015-Fix-coverity-issues-in-dnssec.c.patch b/main/dnsmasq/0015-Fix-coverity-issues-in-dnssec.c.patch
deleted file mode 100644
index 7f9d5d36ac..0000000000
--- a/main/dnsmasq/0015-Fix-coverity-issues-in-dnssec.c.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/0015-Fix-coverity-issues-in-dnssec.c.patch (backport from upstream)
---
-From 82c23fb1f0d9e46c6ce4bc4a57f0d377cc6089b7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Fri, 3 Sep 2021 22:51:36 +0200
-Subject: [PATCH 15/15] Fix coverity issues in dnssec.c
-
-diff --git a/src/dnssec.c b/src/dnssec.c
-index 94ebb6f..8800a5b 100644
---- a/src/dnssec.c
-+++ b/src/dnssec.c
-@@ -724,7 +724,8 @@ static int validate_rrset(time_t now, struct dns_header *header, size_t plen, in
-
- /* namebuff used for workspace above, restore to leave unchanged on exit */
- p = (unsigned char*)(rrset[0]);
-- extract_name(header, plen, &p, name, 1, 0);
-+ if (!extract_name(header, plen, &p, name, 1, 0))
-+ return STAT_BOGUS;
-
- if (key)
- {
-@@ -1017,7 +1018,9 @@ int dnssec_validate_ds(time_t now, struct dns_header *header, size_t plen, char
- }
-
- p = (unsigned char *)(header+1);
-- extract_name(header, plen, &p, name, 1, 4);
-+ if (!extract_name(header, plen, &p, name, 1, 4))
-+ return STAT_BOGUS;
-+
- p += 4; /* qtype, qclass */
-
- /* If the key needed to validate the DS is on the same domain as the DS, we'll
---
-2.31.1
-
diff --git a/main/dnsmasq/0020-fix-domain-match-local.patch b/main/dnsmasq/0020-fix-domain-match-local.patch
deleted file mode 100644
index 120f90ec68..0000000000
--- a/main/dnsmasq/0020-fix-domain-match-local.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-Patch-Source: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=de372d6914ae20a1f9997815f258efbf3b14c39b (modified)
---
-From de372d6914ae20a1f9997815f258efbf3b14c39b Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Sat, 18 Sep 2021 23:01:12 +0100
-Subject: [PATCH 1/1] Fix confusion is server=/domain/# combined with
- server|address=/domain/....
-
-The 2.86 domain matching rewrite failed to take into account the possibilty that
-
-server=/example.com/#
-
-could be combined with, for example
-
-address=/example.com/1.2.3.4
-
-resulting in the struct server datastructure for the former getting passed
-to forward_query(), rapidly followed by a SEGV.
-
-This fix makes server=/example.com/# a fully fledged member of the
-priority list, which is now IPv6 addr, IPv4 addr, all zero return,
-resolvconf servers, upstream servers, no-data return
-
-Thanks to dl6er@dl6er.de for finding and characterising the bug.
----
- src/dnsmasq.h | 34 +++++++-------
- src/domain-match.c | 113 +++++++++++++++++++++++----------------------
- 2 files changed, 75 insertions(+), 72 deletions(-)
-
-diff --git a/src/dnsmasq.h b/src/dnsmasq.h
-index 56a3f1d..327ad65 100644
---- a/src/dnsmasq.h
-+++ b/src/dnsmasq.h
-@@ -530,23 +530,23 @@ union mysockaddr {
-
-
- /* The actual values here matter, since we sort on them to get records in the order
-- IPv6 addr, IPv4 addr, all zero return, no-data return, send upstream. */
--#define SERV_LITERAL_ADDRESS 1 /* addr is the answer, or NoDATA is the answer, depending on the next three flags */
--#define SERV_ALL_ZEROS 2 /* return all zeros for A and AAAA */
--#define SERV_4ADDR 4 /* addr is IPv4 */
--#define SERV_6ADDR 8 /* addr is IPv6 */
--#define SERV_HAS_SOURCE 16 /* source address defined */
--#define SERV_FOR_NODOTS 32 /* server for names with no domain part only */
--#define SERV_WARNED_RECURSIVE 64 /* avoid warning spam */
--#define SERV_FROM_DBUS 128 /* 1 if source is DBus */
--#define SERV_MARK 256 /* for mark-and-delete and log code */
--#define SERV_WILDCARD 512 /* domain has leading '*' */
--#define SERV_USE_RESOLV 1024 /* forward this domain in the normal way */
--#define SERV_FROM_RESOLV 2048 /* 1 for servers from resolv, 0 for command line. */
--#define SERV_FROM_FILE 4096 /* read from --servers-file */
--#define SERV_LOOP 8192 /* server causes forwarding loop */
--#define SERV_DO_DNSSEC 16384 /* Validate DNSSEC when using this server */
--#define SERV_GOT_TCP 32768 /* Got some data from the TCP connection */
-+ IPv6 addr, IPv4 addr, all zero return, resolvconf servers, upstream server, no-data return */
-+#define SERV_LITERAL_ADDRESS 1 /* addr is the answer, or NoDATA is the answer, depending on the next four flags */
-+#define SERV_USE_RESOLV 2 /* forward this domain in the normal way */
-+#define SERV_ALL_ZEROS 4 /* return all zeros for A and AAAA */
-+#define SERV_4ADDR 8 /* addr is IPv4 */
-+#define SERV_6ADDR 16 /* addr is IPv6 */
-+#define SERV_HAS_SOURCE 32 /* source address defined */
-+#define SERV_FOR_NODOTS 64 /* server for names with no domain part only */
-+#define SERV_WARNED_RECURSIVE 128 /* avoid warning spam */
-+#define SERV_FROM_DBUS 256 /* 1 if source is DBus */
-+#define SERV_MARK 512 /* for mark-and-delete and log code */
-+#define SERV_WILDCARD 1024 /* domain has leading '*' */
-+#define SERV_FROM_RESOLV 2048 /* 1 for servers from resolv, 0 for command line. */
-+#define SERV_FROM_FILE 4096 /* read from --servers-file */
-+#define SERV_LOOP 8192 /* server causes forwarding loop */
-+#define SERV_DO_DNSSEC 16384 /* Validate DNSSEC when using this server */
-+#define SERV_GOT_TCP 32768 /* Got some data from the TCP connection */
-
- struct serverfd {
- int fd;
-diff --git a/src/domain-match.c b/src/domain-match.c
-index b22948c..8f29621 100644
---- a/src/domain-match.c
-+++ b/src/domain-match.c
-@@ -207,16 +207,16 @@ int lookup_domain(char *domain, int flags, int *lowout, int *highout)
- }
- }
-
-- if (found)
-+ if (found && filter_servers(try, flags, &nlow, &nhigh))
-+ /* We have a match, but it may only be (say) an IPv6 address, and
-+ if the query wasn't for an AAAA record, it's no good, and we need
-+ to continue generalising */
- {
- /* We've matched a setting which says to use servers without a domain.
- Continue the search with empty query */
-- if (daemon->serverarray[try]->flags & SERV_USE_RESOLV)
-+ if (daemon->serverarray[nlow]->flags & SERV_USE_RESOLV)
- crop_query = qlen;
-- else if (filter_servers(try, flags, &nlow, &nhigh))
-- /* We have a match, but it may only be (say) an IPv6 address, and
-- if the query wasn't for an AAAA record, it's no good, and we need
-- to continue generalising */
-+ else
- break;
- }
- }
-@@ -273,7 +273,7 @@ int filter_servers(int seed, int flags, int *lowout, int *highout)
- nlow--;
-
- while (nhigh < daemon->serverarraysz-1 && order_servers(daemon->serverarray[nhigh], daemon->serverarray[nhigh+1]) == 0)
-- nhigh++;
-+ nhigh++;
-
- nhigh++;
-
-@@ -293,10 +293,10 @@ int filter_servers(int seed, int flags, int *lowout, int *highout)
- else
- {
- /* Now the servers are on order between low and high, in the order
-- IPv6 addr, IPv4 addr, return zero for both, send upstream, no-data return.
-+ IPv6 addr, IPv4 addr, return zero for both, resolvconf servers, send upstream, no-data return.
-
- See which of those match our query in that priority order and narrow (low, high) */
--
-+
- for (i = nlow; i < nhigh && (daemon->serverarray[i]->flags & SERV_6ADDR); i++);
-
- if (i != nlow && (flags & F_IPV6))
-@@ -321,32 +321,40 @@ int filter_servers(int seed, int flags, int *lowout, int *highout)
- {
- nlow = i;
-
-- /* now look for a server */
-- for (i = nlow; i < nhigh && !(daemon->serverarray[i]->flags & SERV_LITERAL_ADDRESS); i++);
--
-+ /* Short to resolv.conf servers */
-+ for (i = nlow; i < nhigh && (daemon->serverarray[i]->flags & SERV_USE_RESOLV); i++);
-+
- if (i != nlow)
-- {
-- /* If we want a server that can do DNSSEC, and this one can't,
-- return nothing, similarly if were looking only for a server
-- for a particular domain. */
-- if ((flags & F_DNSSECOK) && !(daemon->serverarray[nlow]->flags & SERV_DO_DNSSEC))
-- nlow = nhigh;
-- else if ((flags & F_DOMAINSRV) && daemon->serverarray[nlow]->domain_len == 0)
-- nlow = nhigh;
-- else
-- nhigh = i;
-- }
-+ nhigh = i;
- else
- {
-- /* --local=/domain/, only return if we don't need a server. */
-- if (flags & (F_DNSSECOK | F_DOMAINSRV | F_SERVER))
-- nhigh = i;
-+ /* now look for a server */
-+ for (i = nlow; i < nhigh && !(daemon->serverarray[i]->flags & SERV_LITERAL_ADDRESS); i++);
-+
-+ if (i != nlow)
-+ {
-+ /* If we want a server that can do DNSSEC, and this one can't,
-+ return nothing, similarly if were looking only for a server
-+ for a particular domain. */
-+ if ((flags & F_DNSSECOK) && !(daemon->serverarray[nlow]->flags & SERV_DO_DNSSEC))
-+ nlow = nhigh;
-+ else if ((flags & F_DOMAINSRV) && daemon->serverarray[nlow]->domain_len == 0)
-+ nlow = nhigh;
-+ else
-+ nhigh = i;
-+ }
-+ else
-+ {
-+ /* --local=/domain/, only return if we don't need a server. */
-+ if (flags & (F_DNSSECOK | F_DOMAINSRV | F_SERVER))
-+ nhigh = i;
-+ }
- }
- }
- }
- }
- }
--
-+
- *lowout = nlow;
- *highout = nhigh;
-
-@@ -522,10 +530,10 @@ static int order_qsort(const void *a, const void *b)
- /* Sort all literal NODATA and local IPV4 or IPV6 responses together,
- in a very specific order. We flip the SERV_LITERAL_ADDRESS bit
- so the order is IPv6 literal, IPv4 literal, all-zero literal,
-- upstream server, NXDOMAIN literal. */
-+ unqualified servers, upstream server, NXDOMAIN literal. */
- if (rc == 0)
-- rc = ((s2->flags & (SERV_LITERAL_ADDRESS | SERV_4ADDR | SERV_6ADDR | SERV_ALL_ZEROS)) ^ SERV_LITERAL_ADDRESS) -
-- ((s1->flags & (SERV_LITERAL_ADDRESS | SERV_4ADDR | SERV_6ADDR | SERV_ALL_ZEROS)) ^ SERV_LITERAL_ADDRESS);
-+ rc = ((s2->flags & (SERV_LITERAL_ADDRESS | SERV_4ADDR | SERV_6ADDR | SERV_USE_RESOLV | SERV_ALL_ZEROS)) ^ SERV_LITERAL_ADDRESS) -
-+ ((s1->flags & (SERV_LITERAL_ADDRESS | SERV_4ADDR | SERV_6ADDR | SERV_USE_RESOLV | SERV_ALL_ZEROS)) ^ SERV_LITERAL_ADDRESS);
-
- /* Finally, order by appearance in /etc/resolv.conf etc, for --strict-order */
- if (rc == 0)
-@@ -635,7 +643,7 @@ int add_update_server(int flags,
- {
- size_t size;
-
-- if (flags & SERV_LITERAL_ADDRESS)
-+ if (flags & SERV_IS_LOCAL)
- {
- if (flags & SERV_6ADDR)
- size = sizeof(struct serv_addr6);
-@@ -657,10 +665,19 @@ int add_update_server(int flags,
- {
- serv->next = daemon->local_domains;
- daemon->local_domains = serv;
-+
-+ if (flags & SERV_4ADDR)
-+ ((struct serv_addr4*)serv)->addr = local_addr->addr4;
-+
-+ if (flags & SERV_6ADDR)
-+ ((struct serv_addr6*)serv)->addr = local_addr->addr6;
- }
- else
- {
- struct server *s;
-+
-+ memset(serv, 0, sizeof(struct server));
-+
- /* Add to the end of the chain, for order */
- if (!daemon->servers)
- daemon->servers = serv;
-@@ -670,37 +687,23 @@ int add_update_server(int flags,
- s->next = serv;
- }
-
-- serv->next = NULL;
-+#ifdef HAVE_LOOP
-+ serv->uid = rand32();
-+#endif
-+
-+ if (interface)
-+ safe_strncpy(serv->interface, interface, sizeof(serv->interface));
-+ if (addr)
-+ serv->addr = *addr;
-+ if (source_addr)
-+ serv->source_addr = *source_addr;
- }
- }
-
-- if (!(flags & SERV_IS_LOCAL))
-- memset(serv, 0, sizeof(struct server));
--
- serv->flags = flags;
- serv->domain = alloc_domain;
- serv->domain_len = strlen(alloc_domain);
-
-- if (flags & SERV_4ADDR)
-- ((struct serv_addr4*)serv)->addr = local_addr->addr4;
--
-- if (flags & SERV_6ADDR)
-- ((struct serv_addr6*)serv)->addr = local_addr->addr6;
--
-- if (!(flags & SERV_IS_LOCAL))
-- {
--#ifdef HAVE_LOOP
-- serv->uid = rand32();
--#endif
--
-- if (interface)
-- safe_strncpy(serv->interface, interface, sizeof(serv->interface));
-- if (addr)
-- serv->addr = *addr;
-- if (source_addr)
-- serv->source_addr = *source_addr;
-- }
--
- return 1;
- }
-
---
-2.20.1
-
diff --git a/main/dnsmasq/0021-build_server_array.patch b/main/dnsmasq/0021-build_server_array.patch
deleted file mode 100644
index 2c70418dc9..0000000000
--- a/main/dnsmasq/0021-build_server_array.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/dnsmasq-2.86-build_server_array.patch
-This patch replaces/enhances http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=d290630d31f4517ab26392d00753d1397f9a4114
---
-From 068e849c713fa5e95eeb210792c061b7e212eab5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Wed, 13 Oct 2021 16:58:39 +0200
-Subject: [PATCH] Ensure serverarray is rebuilt once server can be removed
-
-Because cleanup_servers is called from each place which can remove
-server, use that function to refresh serverarray after changes. Make it
-static, since it does not have to be called from other places.
----
- src/dnsmasq.h | 1 -
- src/domain-match.c | 8 +++++++-
- src/network.c | 1 -
- 3 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/dnsmasq.h b/src/dnsmasq.h
-index 08f2785..3f82412 100644
---- a/src/dnsmasq.h
-+++ b/src/dnsmasq.h
-@@ -1757,7 +1757,6 @@ void dump_packet(int mask, void *packet, size_t len, union mysockaddr *src, unio
- #endif
-
- /* domain-match.c */
--void build_server_array(void);
- int lookup_domain(char *qdomain, int flags, int *lowout, int *highout);
- int filter_servers(int seed, int flags, int *lowout, int *highout);
- int is_local_answer(time_t now, int first, char *name);
-diff --git a/src/domain-match.c b/src/domain-match.c
-index 45528c1..e5b409e 100644
---- a/src/domain-match.c
-+++ b/src/domain-match.c
-@@ -23,7 +23,7 @@ static int order_servers(struct server *s, struct server *s2);
- /* If the server is USE_RESOLV or LITERAL_ADDRES, it lives on the local_domains chain. */
- #define SERV_IS_LOCAL (SERV_USE_RESOLV | SERV_LITERAL_ADDRESS)
-
--void build_server_array(void)
-+static void build_server_array(void)
- {
- struct server *serv;
- int count = 0;
-@@ -592,6 +592,12 @@ void cleanup_servers(void)
- else
- up = &serv->next;
- }
-+
-+ /* If we're delaying things, we don't call check_servers(), but
-+ reload_servers() may have deleted some servers, rendering the server_array
-+ invalid, so just rebuild that here. Once reload_servers() succeeds,
-+ we call check_servers() above, which calls build_server_array itself. */
-+ build_server_array();
- }
-
- int add_update_server(int flags,
-diff --git a/src/network.c b/src/network.c
-index 3fc179d..0b68866 100644
---- a/src/network.c
-+++ b/src/network.c
-@@ -1653,7 +1653,6 @@ void check_servers(int no_loop_check)
- }
-
- cleanup_servers(); /* remove servers we just deleted. */
-- build_server_array();
- }
-
- /* Return zero if no servers found, in that case we keep polling.
---
-2.31.1
-
diff --git a/main/dnsmasq/0022-Fix-problems-with-upper-case-in-domain-match.patch b/main/dnsmasq/0022-Fix-problems-with-upper-case-in-domain-match.patch
deleted file mode 100644
index 2fa5337822..0000000000
--- a/main/dnsmasq/0022-Fix-problems-with-upper-case-in-domain-match.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Patch-Source: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff;h=e3093b532c34a8d95c8c751bdd9cabf552f5bf05 (modified)
---
-From e3093b532c34a8d95c8c751bdd9cabf552f5bf05 Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Sun, 28 Nov 2021 18:39:42 +0000
-Subject: [PATCH 1/1] Fix problems with upper-case in domain-match.
-
-The domain-match rewrite didn't take into account
-that domain names are case-insensitive, so things like
-
---address=/Example.com/.....
-
-didn't work correctly.
----
- src/dnsmasq.h | 1 +
- src/domain-match.c | 2 +-
- src/forward.c | 2 +-
- src/util.c | 16 ++++++++++++----
- 4 files changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/src/dnsmasq.h b/src/dnsmasq.h
-index bf7685d..05c1743 100644
---- a/src/dnsmasq.h
-+++ b/src/dnsmasq.h
-@@ -1366,6 +1366,7 @@ void safe_pipe(int *fd, int read_noblock);
- void *whine_malloc(size_t size);
- int sa_len(union mysockaddr *addr);
- int sockaddr_isequal(const union mysockaddr *s1, const union mysockaddr *s2);
-+int hostname_order(const char *a, const char *b);
- int hostname_isequal(const char *a, const char *b);
- int hostname_issubdomain(char *a, char *b);
- time_t dnsmasq_time(void);
-diff --git a/src/domain-match.c b/src/domain-match.c
-index 6f59566..b457f5b 100644
---- a/src/domain-match.c
-+++ b/src/domain-match.c
-@@ -495,7 +495,7 @@ static int order(char *qdomain, size_t qlen, struct server *serv)
- if (qlen > dlen)
- return -1;
-
-- return strcmp(qdomain, serv->domain);
-+ return hostname_order(qdomain, serv->domain);
- }
-
- static int order_servers(struct server *s1, struct server *s2)
-diff --git a/src/util.c b/src/util.c
-index 7bef630..f2adac1 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -352,7 +352,7 @@ int sa_len(union mysockaddr *addr)
- }
-
- /* don't use strcasecmp and friends here - they may be messed up by LOCALE */
--int hostname_isequal(const char *a, const char *b)
-+int hostname_order(const char *a, const char *b)
- {
- unsigned int c1, c2;
-
-@@ -365,11 +365,19 @@ int hostname_isequal(const char *a, const char *b)
- if (c2 >= 'A' && c2 <= 'Z')
- c2 += 'a' - 'A';
-
-- if (c1 != c2)
-- return 0;
-+ if (c1 < c2)
-+ return -1;
-+ else if (c1 > c2)
-+ return 1;
-+
- } while (c1);
-
-- return 1;
-+ return 0;
-+}
-+
-+int hostname_isequal(const char *a, const char *b)
-+{
-+ return hostname_order(a, b) == 0;
- }
-
- /* is b equal to or a subdomain of a return 2 for equal, 1 for subdomain */
---
-2.20.1
-
diff --git a/main/dnsmasq/0023-Optimize-inserting-records-into-server-list.patch b/main/dnsmasq/0023-Optimize-inserting-records-into-server-list.patch
deleted file mode 100644
index c9b8b2b7c6..0000000000
--- a/main/dnsmasq/0023-Optimize-inserting-records-into-server-list.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Patch-Source: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff;h=eb88eed1fc8ed246e9355531c2715fa2f7738afc
-This patch is needed for 0024-Fix-massive-confusion-on-server-reload.patch.
---
-From eb88eed1fc8ed246e9355531c2715fa2f7738afc Mon Sep 17 00:00:00 2001
-From: hev <r@hev.cc>
-Date: Sun, 19 Sep 2021 18:56:08 +0800
-Subject: [PATCH 1/1] Optimize inserting records into server list.
-
-Signed-off-by: hev <r@hev.cc>
----
- src/dnsmasq.h | 2 +-
- src/domain-match.c | 17 ++++++++---------
- 2 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/src/dnsmasq.h b/src/dnsmasq.h
-index 327ad65..639c568 100644
---- a/src/dnsmasq.h
-+++ b/src/dnsmasq.h
-@@ -1105,7 +1105,7 @@ extern struct daemon {
- char *lease_change_command;
- struct iname *if_names, *if_addrs, *if_except, *dhcp_except, *auth_peers, *tftp_interfaces;
- struct bogus_addr *bogus_addr, *ignore_addr;
-- struct server *servers, *local_domains, **serverarray, *no_rebind;
-+ struct server *servers, *servers_tail, *local_domains, **serverarray, *no_rebind;
- int server_has_wildcard;
- int serverarraysz, serverarrayhwm;
- struct ipsets *ipsets;
-diff --git a/src/domain-match.c b/src/domain-match.c
-index 8f29621..3f1cc74 100644
---- a/src/domain-match.c
-+++ b/src/domain-match.c
-@@ -576,7 +576,10 @@ void cleanup_servers(void)
- free(serv);
- }
- else
-- up = &serv->next;
-+ {
-+ up = &serv->next;
-+ daemon->servers_tail = serv;
-+ }
- }
-
- for (serv = daemon->local_domains, up = &daemon->local_domains; serv; serv = tmp)
-@@ -673,18 +676,14 @@ int add_update_server(int flags,
- }
- else
- {
-- struct server *s;
--
- memset(serv, 0, sizeof(struct server));
-
- /* Add to the end of the chain, for order */
-- if (!daemon->servers)
-- daemon->servers = serv;
-+ if (daemon->servers_tail)
-+ daemon->servers_tail->next = serv;
- else
-- {
-- for (s = daemon->servers; s->next; s = s->next);
-- s->next = serv;
-- }
-+ daemon->servers = serv;
-+ daemon->servers_tail = serv;
-
- #ifdef HAVE_LOOP
- serv->uid = rand32();
---
-2.20.1
-
diff --git a/main/dnsmasq/0024-Fix-massive-confusion-on-server-reload.patch b/main/dnsmasq/0024-Fix-massive-confusion-on-server-reload.patch
deleted file mode 100644
index 1c2ae0deff..0000000000
--- a/main/dnsmasq/0024-Fix-massive-confusion-on-server-reload.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-Patch-Source: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff;h=553c4c99cca173e9964d0edbd0676ed96c30f62b (modified)
---
-From 553c4c99cca173e9964d0edbd0676ed96c30f62b Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Mon, 3 Jan 2022 23:32:30 +0000
-Subject: [PATCH 1/1] Fix massive confusion on server reload.
-
-The 2.86 upstream server rewrite severely broke re-reading
-of server configuration. It would get everyting right the first
-time, but on re-reading /etc/resolv.conf or --servers-file
-or setting things with DBUS, the results were just wrong.
-
-This should put things right again.
----
- src/domain-match.c | 157 +++++++++++++++++++++++++--------------------
- 1 file changed, 88 insertions(+), 69 deletions(-)
-
-diff --git a/src/domain-match.c b/src/domain-match.c
-index b457f5b..4e01092 100644
---- a/src/domain-match.c
-+++ b/src/domain-match.c
-@@ -543,22 +542,39 @@ static int order_qsort(const void *a, const void *b)
- return rc;
- }
-
-+/* Must be called before add_update_server() to set daemon->servers_tail */
- void mark_servers(int flag)
- {
-- struct server *serv;
-+ struct server *serv, **up;
-
-+ daemon->servers_tail = NULL;
-+
- /* mark everything with argument flag */
- for (serv = daemon->servers; serv; serv = serv->next)
-- if (serv->flags & flag)
-- serv->flags |= SERV_MARK;
-- else
-- serv->flags &= ~SERV_MARK;
-+ {
-+ if (serv->flags & flag)
-+ serv->flags |= SERV_MARK;
-+ else
-+ serv->flags &= ~SERV_MARK;
-
-- for (serv = daemon->local_domains; serv; serv = serv->next)
-- if (serv->flags & flag)
-- serv->flags |= SERV_MARK;
-- else
-- serv->flags &= ~SERV_MARK;
-+ daemon->servers_tail = serv;
-+ }
-+
-+ /* --address etc is different: since they are expected to be
-+ 1) numerous and 2) not reloaded often. We just delete
-+ and recreate. */
-+ if (flag)
-+ for (serv = daemon->local_domains, up = &daemon->local_domains; serv; serv = serv->next)
-+ {
-+ if (serv->flags & flag)
-+ {
-+ *up = serv->next;
-+ free(serv->domain);
-+ free(serv);
-+ }
-+ else
-+ up = &serv->next;
-+ }
- }
-
- void cleanup_servers(void)
-@@ -566,7 +583,7 @@ void cleanup_servers(void)
- struct server *serv, *tmp, **up;
-
- /* unlink and free anything still marked. */
-- for (serv = daemon->servers, up = &daemon->servers; serv; serv = tmp)
-+ for (serv = daemon->servers, up = &daemon->servers, daemon->servers_tail = NULL; serv; serv = tmp)
- {
- tmp = serv->next;
- if (serv->flags & SERV_MARK)
-@@ -582,19 +599,6 @@ void cleanup_servers(void)
- daemon->servers_tail = serv;
- }
- }
--
-- for (serv = daemon->local_domains, up = &daemon->local_domains; serv; serv = tmp)
-- {
-- tmp = serv->next;
-- if (serv->flags & SERV_MARK)
-- {
-- *up = serv->next;
-- free(serv->domain);
-- free(serv);
-- }
-- else
-- up = &serv->next;
-- }
-
- /* If we're delaying things, we don't call check_servers(), but
- reload_servers() may have deleted some servers, rendering the server_array
-@@ -634,35 +640,16 @@ int add_update_server(int flags,
- if (!alloc_domain)
- return 0;
-
-- /* See if there is a suitable candidate, and unmark
-- only do this for forwarding servers, not
-- address or local, to avoid delays on large numbers. */
- if (flags & SERV_IS_LOCAL)
-- for (serv = daemon->servers; serv; serv = serv->next)
-- if ((serv->flags & SERV_MARK) &&
-- hostname_isequal(alloc_domain, serv->domain))
-- break;
--
-- if (serv)
- {
-- free(alloc_domain);
-- alloc_domain = serv->domain;
-- }
-- else
-- {
- size_t size;
--
-- if (flags & SERV_IS_LOCAL)
-- {
-- if (flags & SERV_6ADDR)
-- size = sizeof(struct serv_addr6);
-- else if (flags & SERV_4ADDR)
-- size = sizeof(struct serv_addr4);
-- else
-- size = sizeof(struct serv_local);
-- }
-+
-+ if (flags & SERV_6ADDR)
-+ size = sizeof(struct serv_addr6);
-+ else if (flags & SERV_4ADDR)
-+ size = sizeof(struct serv_addr4);
- else
-- size = sizeof(struct server);
-+ size = sizeof(struct serv_local);
-
- if (!(serv = whine_malloc(size)))
- {
-@@ -670,19 +655,53 @@ int add_update_server(int flags,
- return 0;
- }
-
-- if (flags & SERV_IS_LOCAL)
-+ serv->next = daemon->local_domains;
-+ daemon->local_domains = serv;
-+
-+ if (flags & SERV_4ADDR)
-+ ((struct serv_addr4*)serv)->addr = local_addr->addr4;
-+
-+ if (flags & SERV_6ADDR)
-+ ((struct serv_addr6*)serv)->addr = local_addr->addr6;
-+ }
-+ else
-+ {
-+ /* Upstream servers. See if there is a suitable candidate, if so unmark
-+ and move to the end of the list, for order. The entry found may already
-+ be at the end. */
-+ struct server **up, *tmp;
-+
-+ for (serv = daemon->servers, up = &daemon->servers; serv; serv = tmp)
- {
-- serv->next = daemon->local_domains;
-- daemon->local_domains = serv;
-+ tmp = serv->next;
-+ if ((serv->flags & SERV_MARK) &&
-+ hostname_isequal(alloc_domain, serv->domain))
-+ {
-+ /* Need to move down? */
-+ if (serv->next)
-+ {
-+ *up = serv->next;
-+ daemon->servers_tail->next = serv;
-+ daemon->servers_tail = serv;
-+ serv->next = NULL;
-+ }
-+ break;
-+ }
-+ }
-
-- if (flags & SERV_4ADDR)
-- ((struct serv_addr4*)serv)->addr = local_addr->addr4;
--
-- if (flags & SERV_6ADDR)
-- ((struct serv_addr6*)serv)->addr = local_addr->addr6;
-+ if (serv)
-+ {
-+ free(alloc_domain);
-+ alloc_domain = serv->domain;
- }
- else
- {
-+ if (!(serv = whine_malloc(sizeof(struct server))))
-+ {
-+ free(alloc_domain);
-+ return 0;
-+ }
-+
- memset(serv, 0, sizeof(struct server));
-
- /* Add to the end of the chain, for order */
-@@ -691,20 +710,20 @@ int add_update_server(int flags,
- else
- daemon->servers = serv;
- daemon->servers_tail = serv;
--
-+ }
-+
- #ifdef HAVE_LOOP
-- serv->uid = rand32();
-+ serv->uid = rand32();
- #endif
-
-- if (interface)
-- safe_strncpy(serv->interface, interface, sizeof(serv->interface));
-- if (addr)
-- serv->addr = *addr;
-- if (source_addr)
-- serv->source_addr = *source_addr;
-- }
-+ if (interface)
-+ safe_strncpy(serv->interface, interface, sizeof(serv->interface));
-+ if (addr)
-+ serv->addr = *addr;
-+ if (source_addr)
-+ serv->source_addr = *source_addr;
- }
--
-+
- serv->flags = flags;
- serv->domain = alloc_domain;
- serv->domain_len = strlen(alloc_domain);
---
-2.20.1
-
diff --git a/main/dnsmasq/0025-reuse-server.patch b/main/dnsmasq/0025-reuse-server.patch
deleted file mode 100644
index c6264bf27b..0000000000
--- a/main/dnsmasq/0025-reuse-server.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/dnsmasq-2.87-reuse-server.patch (modified)
---
-From f0d061c9977d6c9bc2ddd4e6cf6ffe1ed9cd285a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Fri, 17 Jun 2022 11:40:56 +0200
-Subject: [PATCH] Correct add_update_server losing first unmarked entries
-
-Beginning of servers list were updated when first server(s) record is
-not marked. That was a mistake, which forgot updating also up pointer to
-correct value. Move that loop to separate reuse_server function, which
-is close to similar loop in cleanup_servers. Makes it easier to compare
-and do correct. Removed tmp variable, because this code does not
-invalidate previous serv pointer.
-
-Modified for 2.86
----
- src/domain-match.c | 52 ++++++++++++++++++++++++++--------------------
- 1 file changed, 29 insertions(+), 23 deletions(-)
-
-diff --git a/src/domain-match.c b/src/domain-match.c
-index f4fd093..8409c4d 100644
---- a/src/domain-match.c
-+++ b/src/domain-match.c
-@@ -607,6 +607,33 @@
- build_server_array();
- }
-
-+/* Upstream servers. See if there is a suitable candidate, if so unmark
-+ and move to the end of the list, for order. The entry found may already
-+ be at the end. */
-+static struct server *reuse_server(char *alloc_domain)
-+{
-+ struct server **up, *serv;
-+
-+ for (serv = daemon->servers, up = &daemon->servers; serv; serv = serv->next)
-+ {
-+ if ((serv->flags & SERV_MARK) &&
-+ hostname_isequal(alloc_domain, serv->domain))
-+ {
-+ /* Need to move down? */
-+ if (serv->next)
-+ {
-+ *up = serv->next;
-+ daemon->servers_tail->next = serv;
-+ daemon->servers_tail = serv;
-+ serv->next = NULL;
-+ }
-+ return serv;
-+ }
-+ up = &serv->next;
-+ }
-+ return NULL;
-+}
-+
- int add_update_server(int flags,
- union mysockaddr *addr,
- union mysockaddr *source_addr,
-@@ -666,28 +693,7 @@
- }
- else
- {
-- /* Upstream servers. See if there is a suitable candidate, if so unmark
-- and move to the end of the list, for order. The entry found may already
-- be at the end. */
-- struct server **up, *tmp;
--
-- for (serv = daemon->servers, up = &daemon->servers; serv; serv = tmp)
-- {
-- tmp = serv->next;
-- if ((serv->flags & SERV_MARK) &&
-- hostname_isequal(alloc_domain, serv->domain))
-- {
-- /* Need to move down? */
-- if (serv->next)
-- {
-- *up = serv->next;
-- daemon->servers_tail->next = serv;
-- daemon->servers_tail = serv;
-- serv->next = NULL;
-- }
-- break;
-- }
-- }
-+ serv = reuse_server(alloc_domain);
-
- if (serv)
- {
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index be89d141df..3a936e4846 100644
--- a/main/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
pkgname=dnsmasq
-pkgver=2.86
-pkgrel=5
+pkgver=2.87
+pkgrel=0
pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server"
url="https://www.thekelleys.org.uk/dnsmasq/"
arch="all"
@@ -29,28 +29,6 @@ subpackages="
"
source="https://www.thekelleys.org.uk/dnsmasq/dnsmasq-$pkgver.tar.xz
0000-underflow.patch
- 0001-Retry-on-interrupted-error-in-tftp.patch
- 0002-Add-safety-checks-to-places-pointed-by-Coverity.patch
- 0003-Small-safeguard-to-unexpected-data.patch
- 0004-Fix-bunch-of-warnings-in-auth.c.patch
- 0005-Fix-few-coverity-warnings-in-lease-tools.patch
- 0006-Fix-coverity-formats-issues-in-blockdata.patch
- 0007-Retry-dhcp6-ping-on-interrupts.patch
- 0008-Fix-coverity-warnings-on-dbus.patch
- 0009-Address-coverity-issues-detected-in-util.c.patch
- 0010-Fix-coverity-detected-issues-in-option.c.patch
- 0011-Fix-coverity-detected-issue-in-radv.c.patch
- 0012-Fix-coverity-detected-issues-in-cache.c.patch
- 0013-Fix-coverity-issues-detected-in-domain-match.c.patch
- 0014-Fix-coverity-detected-issues-in-dnsmasq.c.patch
- 0015-Fix-coverity-issues-in-dnssec.c.patch
- 0020-fix-domain-match-local.patch
- 0021-build_server_array.patch
- 0022-Fix-problems-with-upper-case-in-domain-match.patch
- 0023-Optimize-inserting-records-into-server-list.patch
- 0024-Fix-massive-confusion-on-server-reload.patch
- 0025-reuse-server.patch
- CVE-2022-0934.patch
config.h.patch
dnsmasq.conf.patch
@@ -149,30 +127,8 @@ openrc() {
}
sha512sums="
-487eae0afbc8bb3d5282a729ffb0cb2c9bdc7d8e46e2e8aa114cd7c5d82e0fd66f49926e7fa4028577548d6f57e8a865aca17f33963a589874584d608ab2deaf dnsmasq-2.86.tar.xz
-bae115897d25aa1eec1d7e60f7faa6c1c50685fce7f7decc2296256c2d26cb3cd104935b81bbfc58536ee6c44ae4ba350b022d0f9ea2798b0dc391a498258063 0000-underflow.patch
-da45c81c475666936895a582d957495fb16034ee7d474d6f1b5751edc1f2f581eda020401a938aafa70bfd239a551d6acaf545e9c79674b9a6841d2c7f827df0 0001-Retry-on-interrupted-error-in-tftp.patch
-9e82f19b808954211c1deb1b2e648236c161fc7b9c8a6796c5ecf3a37e7b13a76b83fe13a2bf5a20f62d78ac789102cae96925c1e40bd13ec2968831805ff9c6 0002-Add-safety-checks-to-places-pointed-by-Coverity.patch
-e3d40e71e93b417429c15a6a7d15b9dd7441e8235651f457e66ff509a3fc1144b53ba3e3425b97d909301c38c15091e942ef822e53ab81900472d20ecee30e75 0003-Small-safeguard-to-unexpected-data.patch
-990ab720de1940794829e9830e01de71b0c7bf36ccfcf32b109533d0dd25efce63612ba612a611fc065e0634240e9252a905973dc0a5beb614088990c0a5b658 0004-Fix-bunch-of-warnings-in-auth.c.patch
-3d24d216dad94f272d7a7b724e14d4a86e9eb2a6d9088a18b8821b5bc61675397acb5134b0349cbce57ae3f42396d922d801b41514202f78bbdfdf785dbeb5bf 0005-Fix-few-coverity-warnings-in-lease-tools.patch
-aa558bd2356c3d820425132d1e26039bc8ed1782cde6e421a363ae405c8a7a044253d74bd9bf2b0e3728b06d1f5ca0a1a5102f79fea4ee1f54298111e796f05a 0006-Fix-coverity-formats-issues-in-blockdata.patch
-aadb1cb9f7d21b1a083fc664e060a1509cbbe00549ea6466faf92887044e7bca58cf2cbddb82b70cbfe2fbf7a082e7a89d266c8ddc7b7a7dab793c9f99522457 0007-Retry-dhcp6-ping-on-interrupts.patch
-ccace656e7abbc97f6709a642e9fb7875bb220f3e8ff89a601e703ac5143401ccb0a365971c7effb11b9a5b710733011bc1d39b4dde7996321053b9d08faca26 0008-Fix-coverity-warnings-on-dbus.patch
-39e4b52b25e3223f5803f73f721a597bfe8cb5df96aa5e0fdfda62672380c55301821a610e11e167a0eca44bf2cd4c45f995b79e19e9cd0f2c62d89f8451935b 0009-Address-coverity-issues-detected-in-util.c.patch
-462996c6f0f278fad95156f5bae059f34384849f5602af674d073f29b889d2cbf993717641dc6ab02de4e0195fb22d8b440495272271c4969011151068888cf2 0010-Fix-coverity-detected-issues-in-option.c.patch
-09167fa3ee06d7686f83639a70fd97d3b50d8ccb8bcef57a99905536fd9f53f00b3019a29b96715bab19ec0129babdc4ebe360d5439f5902f4cddff0a6fc4c54 0011-Fix-coverity-detected-issue-in-radv.c.patch
-a60d537ab2f89cff05fbbf02c0b7167b823b0e024b70b80d69828bf111875ea8c238448ffad4ef8f67a1be5cd2be5751ab5a8b489ba34f57f3d3074d5832001e 0012-Fix-coverity-detected-issues-in-cache.c.patch
-edc4cbec2b506a995ed454903972aed130577c8dd04c218999023e6c1830ed8ba4b77926b60c7f19a7b03550eed3ba18f4ce68ec4760650ccbbcedfa1f3ea0c7 0013-Fix-coverity-issues-detected-in-domain-match.c.patch
-6383a7a4ec6f11468bd416b9b96ecc35fd291f439a80230aa773186aa31894a898d776c651ab68dd8f3517bceebee81536c3523c648d6a795b1207555992deb7 0014-Fix-coverity-detected-issues-in-dnsmasq.c.patch
-7af46affcff002361d3412f0448d428b37299e6fda1c335bae4947a9ea29e1709a041df21e5376a474946a6b46ff00994abd2d56fdc4946facb93daffcac42ba 0015-Fix-coverity-issues-in-dnssec.c.patch
-dcd8bac303c8988a5096996d395b6ffd1a98ba5e5b48591dac3250bdb95eef7f3e9fe5800150ea49877abb76b588c409db3d4db2f04f28a359a1dd069b2d6c7a 0020-fix-domain-match-local.patch
-f511a279c776e125530747c9df3e92b93af39cdfc1861e0ad53ddf7c41e091f09b51aba56ce3dcb06a2e4d60962aee81288d6157d0f4355cc6586f0ef67f6c4f 0021-build_server_array.patch
-2b639d3355221eedd462b59a79535b9ce1787be08d88e7f30dc7e7d77d50e5652378acaa297d63dd793cc46d5cf8de6529c9fe9c694ff6edc67358165a6b117b 0022-Fix-problems-with-upper-case-in-domain-match.patch
-7a5bbdd0bf8b9ab188f46d3ef4c5aaa860256e48b5e3363bbc4639d1b279d4209490ae54317a1d33e1d238482796e8cc6181fcf80365ce6dfad394eab47c5558 0023-Optimize-inserting-records-into-server-list.patch
-6cfd44add1214d4f9d9504edacb2a0ce3ece371b2a44966cda0446884386a70234cafc5aee52ddc15be8252439e3aab15780eb21c48f85ed73d9e858c37aa76f 0024-Fix-massive-confusion-on-server-reload.patch
-41e36c721d47799711cd5f8fc6099a3fd53534ce052b59d58d40f457561ab5759ee443d0b043fcb105e0ca1ad0a241fd0a689560ed675a3d586cab4d38c38fc3 0025-reuse-server.patch
-b04ad7a5019a64feb9e4237e5fbc4f2dc1b1ae12c092222a5e14099566022f17aa4eb9139f69a5a778166c6a096e311ab5ec6ce44fff8409f7df5f5ab86bdd60 CVE-2022-0934.patch
+965071ff35aed558a661e7f57ff82de170f4ad7fcdd6a4070ce7915c9f5e41450d8d86b2a0c2c30bf52ddc3aaeb22af18bb6da71a1cccb3c409429ef0ef308f3 dnsmasq-2.87.tar.xz
+d1c47feb2a2788f8b986109f824d2e300d98458d99b97b6b229481163614925246f3a86c26bcde55b9db4009acc9017a1c09e4c8414c9b38caf9cb4206f94152 0000-underflow.patch
d0274417019af84911f3f4a850e785797bdc77732fd93504fe21db7317a874d2ab54bf7a211d000a751cdc43e225a30be4c1a315ab2383fc3fcc619e436aed97 config.h.patch
41679e0e889607896dcf7fdeb179b9b7a79095c9f86aebda131ac09c12e3ef2a94cece0018ab33ea08d3e6f6bbae44379e9d6fb8987fae29e68ecad952ccdd45 dnsmasq.conf.patch
0c609a55ca0140d8f31f8f6eb4cb96eca7bc76385d48739998bea926b409f3d72cbfdffc30ad3f9e3a62db4ea3280f7fe6a60a12fc091164814a7cdf6a14b307 dnsmasq.initd
diff --git a/main/dnsmasq/CVE-2022-0934.patch b/main/dnsmasq/CVE-2022-0934.patch
deleted file mode 100644
index 13816267ab..0000000000
--- a/main/dnsmasq/CVE-2022-0934.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-Patch-Source: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=03345ecefeb0d82e3c3a4c28f27c3554f0611b39 (upstream)
---
-From 03345ecefeb0d82e3c3a4c28f27c3554f0611b39 Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Thu, 31 Mar 2022 21:35:20 +0100
-Subject: [PATCH] Fix write-after-free error in DHCPv6 code. CVE-2022-0934
- refers.
-
----
- CHANGELOG | 3 +++
- src/rfc3315.c | 48 +++++++++++++++++++++++++++---------------------
- 2 files changed, 30 insertions(+), 21 deletions(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 87d6c2b..4bc7fb1 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -55,6 +55,9 @@ version 2.87
- doesn't require hard-coding addresses. Thanks to Sten Spans for
- the idea.
-
-+ Fix write-after-free error in DHCPv6 server code.
-+ CVE-2022-0934 refers.
-+
-
- version 2.86
- Handle DHCPREBIND requests in the DHCPv6 server code.
-diff --git a/src/rfc3315.c b/src/rfc3315.c
-index cee8382..e218d26 100644
---- a/src/rfc3315.c
-+++ b/src/rfc3315.c
-@@ -33,9 +33,9 @@ struct state {
- unsigned int mac_len, mac_type;
- };
-
--static int dhcp6_maybe_relay(struct state *state, void *inbuff, size_t sz,
-+static int dhcp6_maybe_relay(struct state *state, unsigned char *inbuff, size_t sz,
- struct in6_addr *client_addr, int is_unicast, time_t now);
--static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_t sz, int is_unicast, time_t now);
-+static int dhcp6_no_relay(struct state *state, int msg_type, unsigned char *inbuff, size_t sz, int is_unicast, time_t now);
- static void log6_opts(int nest, unsigned int xid, void *start_opts, void *end_opts);
- static void log6_packet(struct state *state, char *type, struct in6_addr *addr, char *string);
- static void log6_quiet(struct state *state, char *type, struct in6_addr *addr, char *string);
-@@ -104,12 +104,12 @@ unsigned short dhcp6_reply(struct dhcp_context *context, int interface, char *if
- }
-
- /* This cost me blood to write, it will probably cost you blood to understand - srk. */
--static int dhcp6_maybe_relay(struct state *state, void *inbuff, size_t sz,
-+static int dhcp6_maybe_relay(struct state *state, unsigned char *inbuff, size_t sz,
- struct in6_addr *client_addr, int is_unicast, time_t now)
- {
- void *end = inbuff + sz;
- void *opts = inbuff + 34;
-- int msg_type = *((unsigned char *)inbuff);
-+ int msg_type = *inbuff;
- unsigned char *outmsgtypep;
- void *opt;
- struct dhcp_vendor *vendor;
-@@ -259,15 +259,15 @@ static int dhcp6_maybe_relay(struct state *state, void *inbuff, size_t sz,
- return 1;
- }
-
--static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_t sz, int is_unicast, time_t now)
-+static int dhcp6_no_relay(struct state *state, int msg_type, unsigned char *inbuff, size_t sz, int is_unicast, time_t now)
- {
- void *opt;
-- int i, o, o1, start_opts;
-+ int i, o, o1, start_opts, start_msg;
- struct dhcp_opt *opt_cfg;
- struct dhcp_netid *tagif;
- struct dhcp_config *config = NULL;
- struct dhcp_netid known_id, iface_id, v6_id;
-- unsigned char *outmsgtypep;
-+ unsigned char outmsgtype;
- struct dhcp_vendor *vendor;
- struct dhcp_context *context_tmp;
- struct dhcp_mac *mac_opt;
-@@ -296,12 +296,13 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
- v6_id.next = state->tags;
- state->tags = &v6_id;
-
-- /* copy over transaction-id, and save pointer to message type */
-- if (!(outmsgtypep = put_opt6(inbuff, 4)))
-+ start_msg = save_counter(-1);
-+ /* copy over transaction-id */
-+ if (!put_opt6(inbuff, 4))
- return 0;
- start_opts = save_counter(-1);
-- state->xid = outmsgtypep[3] | outmsgtypep[2] << 8 | outmsgtypep[1] << 16;
--
-+ state->xid = inbuff[3] | inbuff[2] << 8 | inbuff[1] << 16;
-+
- /* We're going to be linking tags from all context we use.
- mark them as unused so we don't link one twice and break the list */
- for (context_tmp = state->context; context_tmp; context_tmp = context_tmp->current)
-@@ -347,7 +348,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
- (msg_type == DHCP6REQUEST || msg_type == DHCP6RENEW || msg_type == DHCP6RELEASE || msg_type == DHCP6DECLINE))
-
- {
-- *outmsgtypep = DHCP6REPLY;
-+ outmsgtype = DHCP6REPLY;
- o1 = new_opt6(OPTION6_STATUS_CODE);
- put_opt6_short(DHCP6USEMULTI);
- put_opt6_string("Use multicast");
-@@ -619,11 +620,11 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
- struct dhcp_netid *solicit_tags;
- struct dhcp_context *c;
-
-- *outmsgtypep = DHCP6ADVERTISE;
-+ outmsgtype = DHCP6ADVERTISE;
-
- if (opt6_find(state->packet_options, state->end, OPTION6_RAPID_COMMIT, 0))
- {
-- *outmsgtypep = DHCP6REPLY;
-+ outmsgtype = DHCP6REPLY;
- state->lease_allocate = 1;
- o = new_opt6(OPTION6_RAPID_COMMIT);
- end_opt6(o);
-@@ -809,7 +810,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
- int start = save_counter(-1);
-
- /* set reply message type */
-- *outmsgtypep = DHCP6REPLY;
-+ outmsgtype = DHCP6REPLY;
- state->lease_allocate = 1;
-
- log6_quiet(state, "DHCPREQUEST", NULL, ignore ? _("ignored") : NULL);
-@@ -924,7 +925,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
- int address_assigned = 0;
-
- /* set reply message type */
-- *outmsgtypep = DHCP6REPLY;
-+ outmsgtype = DHCP6REPLY;
-
- log6_quiet(state, msg_type == DHCP6RENEW ? "DHCPRENEW" : "DHCPREBIND", NULL, NULL);
-
-@@ -1057,7 +1058,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
- int good_addr = 0;
-
- /* set reply message type */
-- *outmsgtypep = DHCP6REPLY;
-+ outmsgtype = DHCP6REPLY;
-
- log6_quiet(state, "DHCPCONFIRM", NULL, NULL);
-
-@@ -1121,7 +1122,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
- log6_quiet(state, "DHCPINFORMATION-REQUEST", NULL, ignore ? _("ignored") : state->hostname);
- if (ignore)
- return 0;
-- *outmsgtypep = DHCP6REPLY;
-+ outmsgtype = DHCP6REPLY;
- tagif = add_options(state, 1);
- break;
- }
-@@ -1130,7 +1131,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
- case DHCP6RELEASE:
- {
- /* set reply message type */
-- *outmsgtypep = DHCP6REPLY;
-+ outmsgtype = DHCP6REPLY;
-
- log6_quiet(state, "DHCPRELEASE", NULL, NULL);
-
-@@ -1195,7 +1196,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
- case DHCP6DECLINE:
- {
- /* set reply message type */
-- *outmsgtypep = DHCP6REPLY;
-+ outmsgtype = DHCP6REPLY;
-
- log6_quiet(state, "DHCPDECLINE", NULL, NULL);
-
-@@ -1275,7 +1276,12 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
- }
-
- }
--
-+
-+ /* Fill in the message type. Note that we store the offset,
-+ not a direct pointer, since the packet memory may have been
-+ reallocated. */
-+ ((unsigned char *)(daemon->outpacket.iov_base))[start_msg] = outmsgtype;
-+
- log_tags(tagif, state->xid);
- log6_opts(0, state->xid, daemon->outpacket.iov_base + start_opts, daemon->outpacket.iov_base + save_counter(-1));
-
---
-2.20.1
-
diff --git a/main/dnstop/APKBUILD b/main/dnstop/APKBUILD
index 1a1d2ce5ef..dd637447fd 100644
--- a/main/dnstop/APKBUILD
+++ b/main/dnstop/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=dnstop
pkgver=20140915
-pkgrel=4
+pkgrel=5
pkgdesc="A DNS traffic capture utility"
url="http://dns.measurement-factory.com/tools/dnstop/"
arch="all"
diff --git a/main/doas-sudo-shim/APKBUILD b/main/doas-sudo-shim/APKBUILD
index 01e84dab03..b969b57962 100644
--- a/main/doas-sudo-shim/APKBUILD
+++ b/main/doas-sudo-shim/APKBUILD
@@ -9,7 +9,7 @@ url="https://github.com/jirutka/doas-sudo-shim"
arch="noarch"
license="ISC"
depends="cmd:doas"
-makedepends="asciidoctor"
+makedepends="asciidoctor doas"
subpackages="$pkgname-doc"
source="https://github.com/jirutka/doas-sudo-shim/archive/v$pkgver/$pkgname-$pkgver.tar.gz
help-alpine.patch
diff --git a/main/docbook-xml/APKBUILD b/main/docbook-xml/APKBUILD
index 7ba2a3d0c6..7f06f4b5b5 100644
--- a/main/docbook-xml/APKBUILD
+++ b/main/docbook-xml/APKBUILD
@@ -1,9 +1,9 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=docbook-xml
pkgver=4.5
-pkgrel=7
+pkgrel=8
pkgdesc="A widely used XML scheme for writing documentation and help"
-url="http://scrollkeeper.sourceforge.net/docbook.shtml"
+url="https://scrollkeeper.sourceforge.net/docbook.shtml"
arch="noarch"
license="MIT"
depends="libxml2-utils"
diff --git a/main/docbook-xsl/APKBUILD b/main/docbook-xsl/APKBUILD
index b32f7eaef6..37aa9e09d6 100644
--- a/main/docbook-xsl/APKBUILD
+++ b/main/docbook-xsl/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=docbook-xsl
pkgver=1.79.2
-pkgrel=4
+pkgrel=8
pkgdesc="XML stylesheets for Docbook-xml transformations."
url="https://docbook.org/"
arch="noarch"
@@ -20,6 +20,7 @@ package() {
install -dm755 "$_dest"
install -m644 VERSION VERSION.xsl "$_dest"/
+ ln -s xsl-stylesheets-$pkgver "${_dest%/*}/xsl-stylesheets"
for dir in assembly common eclipse epub epub3 fo highlighting html \
htmlhelp javahelp lib manpages params profiling roundtrip \
diff --git a/main/docbook-xsl/docbook-xsl.post-install b/main/docbook-xsl/docbook-xsl.post-install
index 6afae6abe6..3832543dcd 100644..120000
--- a/main/docbook-xsl/docbook-xsl.post-install
+++ b/main/docbook-xsl/docbook-xsl.post-install
@@ -1,29 +1 @@
-#!/bin/sh
-
-if [ ! -f /etc/xml/catalog ]; then
- xmlcatalog --noout --create /etc/xml/catalog
-fi
-
-
-_NEW=${1%-r[0-9]*}
-
-xmlcatalog --noout --add "rewriteSystem" \
- "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
- etc/xml/catalog
-
-xmlcatalog --noout --add "rewriteURI" \
- "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
- etc/xml/catalog &&
-
-xmlcatalog --noout --add "rewriteSystem" \
- "http://docbook.sourceforge.net/release/xsl/current" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
- etc/xml/catalog &&
-
-xmlcatalog --noout --add "rewriteURI" \
- "http://docbook.sourceforge.net/release/xsl/current" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
- etc/xml/catalog
-
+docbook-xsl.post-upgrade \ No newline at end of file
diff --git a/main/docbook-xsl/docbook-xsl.post-upgrade b/main/docbook-xsl/docbook-xsl.post-upgrade
index d481480fc2..a0dc75de3c 100644
--- a/main/docbook-xsl/docbook-xsl.post-upgrade
+++ b/main/docbook-xsl/docbook-xsl.post-upgrade
@@ -1,33 +1,31 @@
#!/bin/sh
if [ ! -f /etc/xml/catalog ]; then
- xmlcatalog --noout --create /etc/xml/catalog
+ xmlcatalog --noout --create /etc/xml/catalog
fi
-_NEW=${1%-r[0-9]*}
-_OLD=${2%-r[0-9]*}
+newver=${1%-r[0-9]*}
+oldver=${2%-r[0-9]*}
-xmlcatalog --noout --del \
- "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" \
- etc/xml/catalog
-
-xmlcatalog --noout --add "rewriteSystem" \
- "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
- etc/xml/catalog
-
-xmlcatalog --noout --add "rewriteURI" \
- "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
- etc/xml/catalog
-
-xmlcatalog --noout --add "rewriteSystem" \
- "http://docbook.sourceforge.net/release/xsl/current" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
- etc/xml/catalog
-
-xmlcatalog --noout --add "rewriteURI" \
- "http://docbook.sourceforge.net/release/xsl/current" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
- etc/xml/catalog
+if [ -n "$oldver" ]; then # upgrade
+ xmlcatalog --noout --del \
+ "file://$docbookdir/xsl-stylesheets-$oldver" \
+ etc/xml/catalog
+fi
+docbookdir=/usr/share/xml/docbook
+urls="
+ http://cdn.docbook.org/release/xsl-nons
+ http://docbook.sourceforge.net/release/xsl
+"
+
+for url in $urls; do
+ for rewrite in rewriteSystem rewriteURI; do
+ for version in $newver current; do
+ xmlcatalog --noout --add "$rewrite" \
+ "$url/$version" \
+ "file://$docbookdir/xsl-stylesheets-$newver" \
+ etc/xml/catalog
+ done
+ done
+done
diff --git a/main/docbook2x/APKBUILD b/main/docbook2x/APKBUILD
index 7f02b7ce35..6cebc6d544 100644
--- a/main/docbook2x/APKBUILD
+++ b/main/docbook2x/APKBUILD
@@ -2,9 +2,9 @@
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=docbook2x
pkgver=0.8.8
-pkgrel=7
+pkgrel=8
pkgdesc="DocBook converter to UNIX manpage and GNU Texinfo format"
-url="http://docbook2x.sourceforge.net"
+url="https://docbook2x.sourceforge.net/"
arch="all"
license="MIT"
depends="texinfo openjade docbook-xml docbook-xsl perl-xml-sax libxslt"
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 18f73091e5..8429796633 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -10,7 +10,7 @@ case "$pkgver" in
*.*.*.*) _pkgverminor=${pkgver%.*.*};;
*.*.*) _pkgverminor=${pkgver%.*};;
esac
-pkgrel=3
+pkgrel=6
_pigeonholever=0.5.19
pkgdesc="IMAP and POP3 server"
url="https://www.dovecot.org/"
@@ -63,6 +63,7 @@ subpackages="
"
source="https://www.dovecot.org/releases/$_pkgverminor/dovecot-$pkgver.tar.gz
$pkgname-pigeonhole-$_pigeonholever.tar.gz::https://pigeonhole.dovecot.org/releases/$_pkgverminor/dovecot-$_pkgverminor-pigeonhole-$_pigeonholever.tar.gz
+ CVE-2022-30550.patch
skip-iconv-check.patch
split-protocols.patch
default-config.patch
@@ -77,6 +78,8 @@ _builddir_pigeonhole="$srcdir/$pkgname-$_pkgverminor-pigeonhole-$_pigeonholever"
options="!check" # tests being weird
# secfixes:
+# 2.3.19.1-r5:
+# - CVE-2022-30550
# 2.3.15-r0:
# - CVE-2021-29157
# - CVE-2021-33515
@@ -268,7 +271,7 @@ pgsql() {
lua() {
pkgdesc="Lua plugins for Dovecot"
- depends="$pkgname-lua=$pkgver-r$pkgrel"
+ depends="$pkgname=$pkgver-r$pkgrel"
cd "$pkgdir"
_submv usr/lib/dovecot/auth/libauthdb_lua.so
@@ -359,6 +362,7 @@ _submv() {
sha512sums="
ceb87a5f76b6352d28fd030aae5ad2165a133e9a8a6309891e793911203fc0ada9fb254dc05d183eaaa7e2b9851d3f1755b33f08fa6ff5b4b415ac4272bfe150 dovecot-2.3.19.1.tar.gz
07e6a0e638508dddaa3822703ce5c08f479c4e721c0fe7a544776d9a037d557c16bad000fc422a1e83f53781058d3575e67d5264dd04cae763750b0dc40e6c51 dovecot-pigeonhole-0.5.19.tar.gz
+b2ff67fd8b6c5cea93877651a1168ef1a5d399cc5f1a61d1cce407c7624f5b6d758996084c6a5714b6880de0ce11ce5eac74a1e02918758cb6983caedb651c58 CVE-2022-30550.patch
fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a skip-iconv-check.patch
794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5 split-protocols.patch
0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07 default-config.patch
diff --git a/main/dovecot/CVE-2022-30550.patch b/main/dovecot/CVE-2022-30550.patch
new file mode 100644
index 0000000000..d7da1316f7
--- /dev/null
+++ b/main/dovecot/CVE-2022-30550.patch
@@ -0,0 +1,155 @@
+From 7bad6a24160e34bce8f10e73dbbf9e5fbbcd1904 Mon Sep 17 00:00:00 2001
+From: Timo Sirainen <timo.sirainen@open-xchange.com>
+Date: Mon, 9 May 2022 15:23:33 +0300
+Subject: [PATCH 1/2] auth: Fix handling passdbs with identical driver/args but
+ different mechanisms/username_filter
+
+The passdb was wrongly deduplicated in this situation, causing wrong
+mechanisms or username_filter setting to be used. This would be a rather
+unlikely configuration though.
+
+Fixed by moving mechanisms and username_filter from struct passdb_module
+to struct auth_passdb, which is where they should have been in the first
+place.
+---
+ src/auth/auth-request.c | 6 +++---
+ src/auth/auth.c | 18 ++++++++++++++++++
+ src/auth/auth.h | 5 +++++
+ src/auth/passdb.c | 15 ++-------------
+ src/auth/passdb.h | 4 ----
+ 5 files changed, 28 insertions(+), 20 deletions(-)
+
+diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
+index cd08b1fa02..0ca29f3674 100644
+--- a/src/auth/auth-request.c
++++ b/src/auth/auth-request.c
+@@ -534,8 +534,8 @@ auth_request_want_skip_passdb(struct auth_request *request,
+ struct auth_passdb *passdb)
+ {
+ /* if mechanism is not supported, skip */
+- const char *const *mechs = passdb->passdb->mechanisms;
+- const char *const *username_filter = passdb->passdb->username_filter;
++ const char *const *mechs = passdb->mechanisms;
++ const char *const *username_filter = passdb->username_filter;
+ const char *username;
+
+ username = request->fields.user;
+@@ -548,7 +548,7 @@ auth_request_want_skip_passdb(struct auth_request *request,
+ return TRUE;
+ }
+
+- if (passdb->passdb->username_filter != NULL &&
++ if (passdb->username_filter != NULL &&
+ !auth_request_username_accepted(username_filter, username)) {
+ auth_request_log_debug(request,
+ request->mech != NULL ? AUTH_SUBSYS_MECH
+diff --git a/src/auth/auth.c b/src/auth/auth.c
+index f2f3fda20c..9f6c4ba60c 100644
+--- a/src/auth/auth.c
++++ b/src/auth/auth.c
+@@ -99,6 +99,24 @@ auth_passdb_preinit(struct auth *auth, const struct auth_passdb_settings *set,
+ auth_passdb->override_fields_tmpl =
+ passdb_template_build(auth->pool, set->override_fields);
+
++ if (*set->mechanisms == '\0') {
++ auth_passdb->mechanisms = NULL;
++ } else if (strcasecmp(set->mechanisms, "none") == 0) {
++ auth_passdb->mechanisms = (const char *const[]){ NULL };
++ } else {
++ auth_passdb->mechanisms =
++ (const char *const *)p_strsplit_spaces(auth->pool,
++ set->mechanisms, " ,");
++ }
++
++ if (*set->username_filter == '\0') {
++ auth_passdb->username_filter = NULL;
++ } else {
++ auth_passdb->username_filter =
++ (const char *const *)p_strsplit_spaces(auth->pool,
++ set->username_filter, " ,");
++ }
++
+ /* for backwards compatibility: */
+ if (set->pass)
+ auth_passdb->result_success = AUTH_DB_RULE_CONTINUE;
+diff --git a/src/auth/auth.h b/src/auth/auth.h
+index f700e29d5c..460a179765 100644
+--- a/src/auth/auth.h
++++ b/src/auth/auth.h
+@@ -41,6 +41,11 @@ struct auth_passdb {
+ struct passdb_template *default_fields_tmpl;
+ struct passdb_template *override_fields_tmpl;
+
++ /* Supported authentication mechanisms, NULL is all, {NULL} is none */
++ const char *const *mechanisms;
++ /* Username filter, NULL is no filter */
++ const char *const *username_filter;
++
+ enum auth_passdb_skip skip;
+ enum auth_db_rule result_success;
+ enum auth_db_rule result_failure;
+diff --git a/src/auth/passdb.c b/src/auth/passdb.c
+index eb4ac8ae82..f5eed1af4f 100644
+--- a/src/auth/passdb.c
++++ b/src/auth/passdb.c
+@@ -224,19 +224,8 @@ passdb_preinit(pool_t pool, const struct auth_passdb_settings *set)
+ passdb->id = ++auth_passdb_id;
+ passdb->iface = *iface;
+ passdb->args = p_strdup(pool, set->args);
+- if (*set->mechanisms == '\0') {
+- passdb->mechanisms = NULL;
+- } else if (strcasecmp(set->mechanisms, "none") == 0) {
+- passdb->mechanisms = (const char *const[]){NULL};
+- } else {
+- passdb->mechanisms = (const char* const*)p_strsplit_spaces(pool, set->mechanisms, " ,");
+- }
+-
+- if (*set->username_filter == '\0') {
+- passdb->username_filter = NULL;
+- } else {
+- passdb->username_filter = (const char* const*)p_strsplit_spaces(pool, set->username_filter, " ,");
+- }
++ /* NOTE: if anything else than driver & args are added here,
++ passdb_find() also needs to be updated. */
+ array_push_back(&passdb_modules, &passdb);
+ return passdb;
+ }
+diff --git a/src/auth/passdb.h b/src/auth/passdb.h
+index 2e95328e5c..e466a9fdb6 100644
+--- a/src/auth/passdb.h
++++ b/src/auth/passdb.h
+@@ -63,10 +63,6 @@ struct passdb_module {
+ /* Default password scheme for this module.
+ If default_cache_key is set, must not be NULL. */
+ const char *default_pass_scheme;
+- /* Supported authentication mechanisms, NULL is all, [NULL] is none*/
+- const char *const *mechanisms;
+- /* Username filter, NULL is no filter */
+- const char *const *username_filter;
+
+ /* If blocking is set to TRUE, use child processes to access
+ this passdb. */
+
+From a1022072e2ce36f853873d910287f466165b184b Mon Sep 17 00:00:00 2001
+From: Timo Sirainen <timo.sirainen@open-xchange.com>
+Date: Mon, 16 May 2022 14:58:45 +0200
+Subject: [PATCH 2/2] auth: Add a comment about updating userdb_find()
+
+---
+ src/auth/userdb.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/auth/userdb.c b/src/auth/userdb.c
+index 0849659102..830bc2dd64 100644
+--- a/src/auth/userdb.c
++++ b/src/auth/userdb.c
+@@ -158,7 +158,8 @@ userdb_preinit(pool_t pool, const struct auth_userdb_settings *set)
+ userdb->id = ++auth_userdb_id;
+ userdb->iface = iface;
+ userdb->args = p_strdup(pool, set->args);
+-
++ /* NOTE: if anything else than driver & args are added here,
++ userdb_find() also needs to be updated. */
+ array_push_back(&userdb_modules, &userdb);
+ return userdb;
+ }
diff --git a/main/drbd-utils/APKBUILD b/main/drbd-utils/APKBUILD
index 3403cc28b9..8bc563d117 100644
--- a/main/drbd-utils/APKBUILD
+++ b/main/drbd-utils/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=drbd-utils
-pkgver=9.21.4
-pkgrel=0
+pkgver=9.22.0
+pkgrel=1
pkgdesc="Network-based RAID 1"
url="https://www.drbd.org"
arch="all"
@@ -15,7 +15,7 @@ subpackages="$pkgname-doc $pkgname-pacemaker::noarch
$pkgname-bash-completion:bashcomp:noarch $pkgname-openrc"
source="https://pkg.linbit.com//downloads/drbd/utils/drbd-utils-$pkgver.tar.gz
drbdsetup-permissions.patch
- fix-drbdsetup_events2.c.patch
+ drop_use_of_GLOB_MAGCHAR.patch
drbd.initd
"
@@ -61,8 +61,8 @@ bashcomp() {
}
sha512sums="
-78095aeeeb6117ccbaba94bc1135495fc316690f60bd905d7a3b645e567fd04ca775bbaeb98be812a597da84ae3e18cd1899964165a81a42ceef9cd5839964dd drbd-utils-9.21.4.tar.gz
+41a6a709aab99af75ce9c3a17741b40f76c8b218091a96ad47d31ee2a47a7124ce124f2a08ef857a890ae93b96625ba06d23db70b8686d52e1d3070db89562e6 drbd-utils-9.22.0.tar.gz
562ae8eee03148666fb6e6e700c1eb9086f6901e176ea6cd007e3ac4e39d1cdaf967064de74dc1ad620155996dc7011bd0e2abd1c9595ff9bf5f4413673726f3 drbdsetup-permissions.patch
-dc9d825019803ab5cf66d14b0b67b9d3f42cabac2aee07228176b9ff73dacc74e413f2c9ed0fe22a8217ff502c80b891950d1d4fb51df56d9c8e51e7c1fc1cc6 fix-drbdsetup_events2.c.patch
+9c0baa2a1b85c64002480a749ff1527312a08390edcb4b18fbe52043a94c33fda843da3b675f1e4b60752f717e3f1f6811fef0da0845dd9c1cf1bde51598a516 drop_use_of_GLOB_MAGCHAR.patch
f61a833dc5eea79000a7dd85e83ae10e284109c76b5d59974ed69f92dbab6c389d6d20f7ea374b7c066519c6d1d816ed27b48dbaee6b91fb9754974acf52f46e drbd.initd
"
diff --git a/main/drbd-utils/drop_use_of_GLOB_MAGCHAR.patch b/main/drbd-utils/drop_use_of_GLOB_MAGCHAR.patch
new file mode 100644
index 0000000000..7f1cf9416e
--- /dev/null
+++ b/main/drbd-utils/drop_use_of_GLOB_MAGCHAR.patch
@@ -0,0 +1,88 @@
+From 33d5e8f7066116bd0a706c7cdda4950895164d34 Mon Sep 17 00:00:00 2001
+From: Lars Ellenberg <lars.ellenberg@linbit.com>
+Date: Wed, 9 Nov 2022 11:01:54 +0100
+Subject: [PATCH] drbdadm: drop use of GLOB_MAGCHAR, use strchr heuristic only
+
+Fixup for
+2022-09-05 4a1b5900 drbdadm: allow files from an expanded include glob to vanish
+
+When using the `include` statement, if the glob did not match any file,
+there is nothing to do, silently ignore. Unless it was no glob, but a literal,
+which we would expect to exist.
+
+Also, there is a race between expanding a glob and accessing the file.
+That also should not happen for literals, though.
+
+Since we still had the heuristic anyways, because apparently |GLOB_MAGCHAR
+does not happen for GLOB_NOMATCH returns, and there exist non-GNU libc that
+don't (and likely won't) implement that extension, just forget about
+(gl_flags & GLOB_MAGCHAR) but use the incomplete strchr heuristic only.
+---
+ user/v9/drbdadm_parser.c | 35 ++++++++++++++++++++---------------
+ 1 file changed, 20 insertions(+), 15 deletions(-)
+
+diff --git a/user/v9/drbdadm_parser.c b/user/v9/drbdadm_parser.c
+index 616ec0aa..4d9d7f99 100644
+--- a/user/v9/drbdadm_parser.c
++++ b/user/v9/drbdadm_parser.c
+@@ -1966,14 +1966,29 @@ void include_stmt(char *str)
+ size_t i;
+ int r;
+
+- cwd = pushd_to_current_config_file_unless_stdin();
+-
+- /* """
++ /*
++ * If the glob did not match any file,
++ * there is nothing to do, silently ignore.
++ * Unless it was no glob, but a literal,
++ * which we would expect to exist.
++ *
++ * """
+ * As a GNU extension, pglob->gl_flags is set to the
+ * flags specified, ored with GLOB_MAGCHAR if any
+ * metacharacters were found.
+ * """
++ *
++ * But apparently |GLOB_MAGCHAR does not happen for GLOB_NOMATCH returns,
++ * at least not consistently :-(
++ * Also, there exist non-GNU libc
++ * So we have this incomplete strchr heuristic anyways.
+ */
++ bool contains_glob_magic_char =
++ strchr(str, '*') ||
++ strchr(str, '?') ||
++ strchr(str, '[');
++
++ cwd = pushd_to_current_config_file_unless_stdin();
+ r = glob(str, 0, NULL, &glob_buf);
+ if (r == 0) {
+ for (i=0; i<glob_buf.gl_pathc; i++) {
+@@ -1984,7 +1999,7 @@ void include_stmt(char *str)
+ if (f) {
+ include_file(f, strdup(glob_buf.gl_pathv[i]));
+ fclose(f);
+- } else if (errno == ENOENT && glob_buf.gl_flags & GLOB_MAGCHAR) {
++ } else if (errno == ENOENT && contains_glob_magic_char) {
+ /* Noisily ignore race between glob expansion
+ * and actual open. */
+ err("%s:%d: include file vanished after glob expansion '%s'.\n",
+@@ -1998,17 +2013,7 @@ void include_stmt(char *str)
+ }
+ globfree(&glob_buf);
+ } else if (r == GLOB_NOMATCH) {
+- /*
+- * If the glob did not match any file,
+- * there is nothing to do, silently ignore.
+- * Unless it was no glob, but a literal,
+- * which we would expect to exist.
+- * Apparently |GLOB_MAGCHAR does not happen for GLOB_NOMATCH returns,
+- * at least not consistently :-(
+- * So we have this strchr heuristic anyways.
+- */
+- /* if (!(glob_buf.gl_flags & GLOB_MAGCHAR)) { */
+- if (!strchr(str, '?') && !strchr(str, '*') && !strchr(str, '[')) {
++ if (!contains_glob_magic_char) {
+ err("%s:%d: Failed to open include file '%s'.\n",
+ config_save, line, str);
+ config_valid = 0;
diff --git a/main/drbd-utils/fix-drbdsetup_events2.c.patch b/main/drbd-utils/fix-drbdsetup_events2.c.patch
deleted file mode 100644
index e1cf69cf38..0000000000
--- a/main/drbd-utils/fix-drbdsetup_events2.c.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Milan P. Stanić <mps@arvanta.net>
-Date: 2021-04-13 06:32:07.000000000 +0000
-
-musl doesn't support __free_fn_t, fix this by 'void (*)(void *)'
-
---- a//user/v9/drbdsetup_events2.c 2021-04-13 06:32:07.000000000 +0000
-+++ b//user/v9/drbdsetup_events2.c 2021-06-23 06:52:47.451319822 +0000
-@@ -1375,7 +1375,7 @@ void events2_prepare_update()
- /* Drop all data and start again with new initial state. */
- void events2_reset()
- {
-- tdestroy(all_resources, (__free_fn_t) free_resource);
-+ tdestroy(all_resources, (void (*)(void *)) free_resource);
- all_resources = NULL;
- initial_state = true;
- }
diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD
index 7b3b95f836..92a588699e 100644
--- a/main/dropbear/APKBUILD
+++ b/main/dropbear/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dropbear
-pkgver=2022.82
-pkgrel=1
+pkgver=2022.83
+pkgrel=0
pkgdesc="small SSH 2 client/server designed for small memory environments"
url="https://matt.ucc.asn.au/dropbear/dropbear.html"
arch="all"
@@ -87,8 +87,8 @@ _ssh() {
}
sha512sums="
-94c664e0d56bce3750b04aff166bf073f778dc2aa08e093541b520db1f165d4173e1cf25eef69a59b0a5a0a63cfb3ce8bbf94d6c4010687a0233ba1ad8ea403b dropbear-2022.82.tar.bz2
-9c55ab3d8b61955cde1ccc1b8acbd3d2ef123feb9489e92737304c35315d07b7f85fad8a12ac7b0ec2c1dcee3d76b8bc4aa18518f4ddd963917805db33e48826 dropbear.initd
+c63afa615d64b0c8c5e739c758eb8ae277ecc36a4223b766bf562702de69910904cbc3ea98d22989df478ae419e1f81057fe1ee09616c80cb859f58f44175422 dropbear-2022.83.tar.bz2
+48376a85756679ff12dd73355ef78f52f06d6e28cdc2ebcf6f5b9de9451a9a82b741ce7a4a5a2e974273649b732a2f06f5871668d801aa8ab351056d6b2541f2 dropbear.initd
83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f dropbear.confd
df3fa2c64665b669257ec511afa2e04107eb6b0a2a4238ad9b33db3d322b90854b00506e14a09b648fe2d716dc6c140212cc1739f7cd03088f9b7b9781aaa499 dropbear-options_sftp-server_path.patch
e143b8b2083c96fdf425fbe179aa43892e44b95734686a57ae5d5612778f1bd7e78a725d8413c1701d37dcf1b24986b1faa7365eb039789e2204320272fed7a3 dropbear-fix-utmp.patch
diff --git a/main/dropbear/dropbear.initd b/main/dropbear/dropbear.initd
index 633cede4d3..66039081c3 100644
--- a/main/dropbear/dropbear.initd
+++ b/main/dropbear/dropbear.initd
@@ -25,6 +25,10 @@ check_config() {
einfo "Generating ECDSA-Hostkey..."
/usr/bin/dropbearkey -t ecdsa -f /etc/dropbear/dropbear_ecdsa_host_key
fi
+ if [ ! -e /etc/dropbear/dropbear_ed25519_host_key ] ; then
+ einfo "Generating ED25519-Hostkey..."
+ /usr/bin/dropbearkey -t ed25519 -f /etc/dropbear/dropbear_ed25519_host_key
+ fi
}
start() {
diff --git a/main/dtach/APKBUILD b/main/dtach/APKBUILD
index b0f2d6cec8..9f452cbe16 100644
--- a/main/dtach/APKBUILD
+++ b/main/dtach/APKBUILD
@@ -1,9 +1,9 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=dtach
pkgver=0.9
-pkgrel=2
+pkgrel=3
pkgdesc="A program that emulates the detach feature of screen"
-url="http://dtach.sourceforge.net"
+url="https://dtach.sourceforge.net/"
arch="all"
license="GPL"
source="https://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
diff --git a/main/dtc/APKBUILD b/main/dtc/APKBUILD
index b4b441d0af..4d6502ba7e 100644
--- a/main/dtc/APKBUILD
+++ b/main/dtc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dtc
pkgver=1.6.1
-pkgrel=2
+pkgrel=3
pkgdesc="Device Tree Compiler"
url="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/"
arch="all"
diff --git a/main/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD
index 9cdce5119d..10305ebf38 100644
--- a/main/e2fsprogs/APKBUILD
+++ b/main/e2fsprogs/APKBUILD
@@ -2,17 +2,25 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=e2fsprogs
pkgver=1.46.5
-pkgrel=2
+pkgrel=4
pkgdesc="Standard Ext2/3/4 filesystem utilities"
-url="http://e2fsprogs.sourceforge.net/"
+url="https://e2fsprogs.sourceforge.net/"
arch="all"
license="GPL-2.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND MIT"
depends_dev="util-linux-dev gawk"
-makedepends="$depends_dev linux-headers"
+makedepends="$depends_dev linux-headers fuse-dev"
checkdepends="diffutils perl coreutils"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc libcom_err $pkgname-libs $pkgname-extra"
-source="$pkgname-$pkgver.tar.gz::https://github.com/tytso/e2fsprogs/archive/v$pkgver.tar.gz
+subpackages="
+ $pkgname-static
+ $pkgname-dev
+ libcom_err
+ fuse2fs
+ fuse2fs-doc:fuse2fs_doc:noarch
+ $pkgname-doc
+ $pkgname-libs
+ $pkgname-extra
"
+source="$pkgname-$pkgver.tar.gz::https://github.com/tytso/e2fsprogs/archive/v$pkgver.tar.gz"
case $CHOST in
riscv64*)
@@ -86,6 +94,19 @@ libcom_err() {
amove lib/libcom_err*
}
+fuse2fs() {
+ pkgdesc="Ext2/3/4 filesystem driver for FUSE"
+ amove usr/bin/fuse2fs
+}
+
+fuse2fs_doc() {
+ pkgdesc="Ext2/3/4 filesystem driver for FUSE (documentation)"
+ install_if="fuse2fs=$pkgver-r$pkgrel docs"
+
+ amove usr/share/man/man1/fuse2fs.1
+ gzip -9 "$subpkgdir"/usr/share/man/man1/fuse2fs.1
+}
+
extra() {
depends="$pkgname=$pkgver-r$pkgrel"
pkgdesc="Ext2/3/4 filesystem extra utilities"
diff --git a/main/elfutils/APKBUILD b/main/elfutils/APKBUILD
index 756219c89d..84018da532 100644
--- a/main/elfutils/APKBUILD
+++ b/main/elfutils/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=elfutils
-pkgver=0.187
-pkgrel=2
+pkgver=0.188
+pkgrel=0
pkgdesc="Utilities and DSOs to handle ELF files and DWARF data"
url="http://elfutils.org/"
arch="all"
@@ -79,7 +79,7 @@ libelf() {
}
sha512sums="
-a9b9e32b503b8b50a62d4e4001097ed2721d3475232a6380e6b9853bd1647aec016440c0ca7ceb950daf1144f8db9814ab43cf33cc0ebef7fc91e9e775c9e874 elfutils-0.187.tar.bz2
+585551b2d937d19d1becfc2f28935db1dd1a3d25571a62f322b70ac8da98c1a741a55d070327705df6c3e2ee026652e0b9a3c733b050a0b0ec5f2fc75d5b74b5 elfutils-0.188.tar.bz2
8b650bc78cea66f30f0ff66357005890ac8a1b04a8dcc50209cb10a4b4c5ede849505cb68463beca8316ace0fbd53bbc484cfb597805b55616f3b3fc2b864e9a error.h
c3676b0b8b40d6e437f5d88c0d658dc0829ec97d1955e4bbf96f4cff9ee9001b8f2f06174450ae7aa5858b91c7905bdbd49073b561c346416132338a9c94731b fix-aarch64_fregs.patch
b9ba55e1b56a8abf694b6d02f022d9a3a0ae6ab53a8c4a71e49552e32411ef410d3a7512fbd1a729696bc2046ac11586829816f0fa3b8226ee77c9dc4b741e58 fix-uninitialized.patch
diff --git a/main/ell/APKBUILD b/main/ell/APKBUILD
index 9339ca07a5..7c87c1ccda 100644
--- a/main/ell/APKBUILD
+++ b/main/ell/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Milan P. Stanić <mps@arvanta.net>
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=ell
-pkgver=0.53
+pkgver=0.54
pkgrel=0
pkgdesc="Linux library for embedded development"
url="https://01.org/ell"
@@ -38,5 +38,5 @@ package() {
}
sha512sums="
-12e31c985a1aab68fe5bf22048e61cf155d0ebfb69cc86734e1f440b763abdb05c9e40ca6f15a1378b608d803872fe56279b77e328225461cf751e66b308b41b ell-0.53.tar.gz
+c05ed8934ef459ff3e17d007fc1f3d103c7a243e895ba8d335b090cd74d6327817b239e89c67ad8cc4fe63af82fee49a1941ea88abae754ff17fe8d08a18a14f ell-0.54.tar.gz
"
diff --git a/main/encfs/APKBUILD b/main/encfs/APKBUILD
index 32d9e16573..78171d113d 100644
--- a/main/encfs/APKBUILD
+++ b/main/encfs/APKBUILD
@@ -3,13 +3,23 @@
pkgname=encfs
pkgver=1.9.5
_ver=${pkgver/_/-}
-pkgrel=17
+pkgrel=18
pkgdesc="EncFS provides an encrypted filesystem in user-space"
url="https://vgough.github.io/encfs/"
arch="all"
license="GPL-3.0-only"
-makedepends="rlog-dev openssl-dev>3 fuse-dev boost-dev
- libtool gettext-dev cmake tinyxml2-dev perl"
+makedepends="
+ boost-dev
+ cmake
+ fuse-dev
+ gettext-dev
+ libtool
+ openssl-dev>3
+ perl
+ rlog-dev
+ samurai
+ tinyxml2-dev
+ "
subpackages="$pkgname-doc $pkgname-lang $pkgname-libs"
source="$pkgname-$_ver.tar.gz::https://github.com/vgough/encfs/archive/v$_ver.tar.gz"
options="!check" # No test suite
@@ -19,25 +29,19 @@ build() {
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir build
- cd build
-
- cmake .. \
+ cmake -B build -G Ninja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DUSE_INTERNAL_TINYXML=OFF \
-DINSTALL_LIBENCFS=ON \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=MinSizeRel \
- -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
- -DCMAKE_C_FLAGS="$CFLAGS" \
$CMAKE_CROSSOPTS
- make
+ cmake --build build
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" cmake --install build
}
libs() {
@@ -45,4 +49,6 @@ libs() {
default_libs
}
-sha512sums="036e08ca9bc13b44742aebdee49bf7029d0c6b7e59cd6dedc9a09da2af99482859f6a79eddf07e3db296edaf45aafc48fe08488840e765682e9b192dd6ae4c46 encfs-1.9.5.tar.gz"
+sha512sums="
+036e08ca9bc13b44742aebdee49bf7029d0c6b7e59cd6dedc9a09da2af99482859f6a79eddf07e3db296edaf45aafc48fe08488840e765682e9b192dd6ae4c46 encfs-1.9.5.tar.gz
+"
diff --git a/main/espeak/APKBUILD b/main/espeak/APKBUILD
index 3ba76b958c..5d0edae73a 100644
--- a/main/espeak/APKBUILD
+++ b/main/espeak/APKBUILD
@@ -1,9 +1,9 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=espeak
pkgver=1.48.04
-pkgrel=2
+pkgrel=3
pkgdesc="Speech synthesizer for English and other languages"
-url="http://espeak.sourceforge.net/"
+url="https://espeak.sourceforge.net/"
arch="all"
license="GPL-3.0"
subpackages="$pkgname-dev"
diff --git a/main/ethtool/APKBUILD b/main/ethtool/APKBUILD
index 897e9212c9..a15b3ee255 100644
--- a/main/ethtool/APKBUILD
+++ b/main/ethtool/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ethtool
-pkgver=5.19
+pkgver=6.0
pkgrel=0
pkgdesc="Utility for controlling network drivers and hardware"
url="https://mirrors.edge.kernel.org/pub/software/network/ethtool/"
@@ -29,5 +29,5 @@ package() {
}
sha512sums="
-71103c6856a889161ef2bf81eadec69b2f3a84c94aa776d545f889dc1c55b91d566d3b7394dbd2cb70ed92ac19d5f26967b1f829c204f23831d1fb81a0464972 ethtool-5.19.tar.xz
+4a8b17ab71aaae3a74e2a82eab19e4ce147fda01af618aa1baaf4c337df22f968ab1f90569118c83ce0405bf0950cdab08212977e43dc0293239bb8e2ceb868a ethtool-6.0.tar.xz
"
diff --git a/main/eudev/APKBUILD b/main/eudev/APKBUILD
index 7f5bd576bb..df96219013 100644
--- a/main/eudev/APKBUILD
+++ b/main/eudev/APKBUILD
@@ -4,7 +4,7 @@
pkgname=eudev
pkgver=3.2.11
_pkgver=${pkgver/_pre/-pre}
-pkgrel=1
+pkgrel=6
pkgdesc="init system agnostic fork of systemd-udev"
url="https://github.com/eudev-project/eudev"
arch="all"
@@ -13,15 +13,22 @@ depends="udev-init-scripts"
replaces="udev"
provides="udev=176"
provider_priority=100
-makedepends="gperf glib-dev linux-headers kmod-dev gobject-introspection-dev
- util-linux-dev"
+makedepends="
+ gperf
+ glib-dev
+ linux-headers
+ kmod-dev
+ gobject-introspection-dev
+ util-linux-dev
+ "
checkdepends="tree xz perl"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc
- $pkgname-netifnames::noarch $pkgname-rule-generator::noarch"
+ $pkgname-netifnames::noarch $pkgname-rule-generator::noarch $pkgname-hwids"
triggers="eudev.trigger=/lib/udev/rules.d:/usr/lib/udev/rules.d"
source="https://github.com/eudev-project/eudev/releases/download/v$_pkgver/eudev-$_pkgver.tar.gz
default-rules.patch
load-fbcon.patch
+ add-hyperv-ptp-rule.patch
udev-postmount.initd
"
builddir="$srcdir"/"$pkgname"-"$_pkgver"
@@ -29,9 +36,6 @@ builddir="$srcdir"/"$pkgname"-"$_pkgver"
[ "$CARCH" = "riscv64" ] && options="$options textrels"
build() {
- # we need disable kmod til busybox depmod generates binary formats:
- # modules.dep.bin modules.alias.bin modules.symbols.bin
- # modules.builtin.bin
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -42,7 +46,6 @@ build() {
--libdir=/usr/lib \
--enable-split-usr \
--enable-manpages \
- --disable-hwdb \
--enable-kmod \
--exec-prefix=/ \
--bindir=/bin
@@ -103,9 +106,19 @@ generator() {
"$subpkgdir"/lib/udev/rule_generator.functions
}
+hwids() {
+ pkgdesc="Hardware identification databases (from eudev)"
+ provides="hwids-udev=$pkgver-r$pkgrel"
+ install_if="hwdata eudev=$pkgver-r$pkgrel"
+ triggers="eudev-hwids.trigger=/lib/udev/hwdb.d:/etc/udev/hwdb.d:/usr/lib/udev/hwdb.d"
+
+ amove etc/udev/hwdb.d
+}
+
sha512sums="
2be64e24f0af30b010d0929287f5053dff908ec5ce45817304869027ce7c4ba1e31babc0f5fabd712cd301c697bcb7c2afe297a8855e96042fec6a087a786311 eudev-3.2.11.tar.gz
683e3c26ca4f058303f8db7d4977e436d728386ee6866719c4f11ff31db27572d3f486f51d3173310e1ec2cf995fa4c396f2415bdf45dabdd80e6e55e798a314 default-rules.patch
ff5928fd555e095d9f3234dd004ac4c5925405d308777e9b018e8e03112cd109935b51d75a3bc4a2a1018eb486e8a5e5ef6ee978860002a8fff93b116e9721f5 load-fbcon.patch
+59efb5bf068f1195d0693730b28fd271c8b8e42962130b1072f7dac202e361058727c47ae9226a244104340c2fe02b918828cce42adaaf0d8a153d6263a9e04e add-hyperv-ptp-rule.patch
8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88 udev-postmount.initd
"
diff --git a/main/eudev/add-hyperv-ptp-rule.patch b/main/eudev/add-hyperv-ptp-rule.patch
new file mode 100644
index 0000000000..2c8384c692
--- /dev/null
+++ b/main/eudev/add-hyperv-ptp-rule.patch
@@ -0,0 +1,18 @@
+From: Dermot Bradley <dermot_bradley@yahoo.com>
+Date: Tue, 15 Nov 2022 18:08 +0000
+Subject: [PATCH] Add hyperv PTP rule
+
+This change has already been merged upstream in eudev as #218.
+
+---
+
+diff -aur a/rules/50-udev-default.rules b/rules/50-udev-default.rules
+--- a/rules/50-udev-default.rules
++++ b/rules/50-udev-default.rules
+@@ -84,4 +84,6 @@
+
+ SUBSYSTEM=="ptp", ATTR{clock_name}=="KVM virtual PTP", SYMLINK += "ptp_kvm"
+
++SUBSYSTEM=="ptp", ATTR{clock_name}=="hyperv", SYMLINK += "ptp_hyperv"
++
+ LABEL="default_end"
diff --git a/main/eudev/eudev-hwids.trigger b/main/eudev/eudev-hwids.trigger
new file mode 100644
index 0000000000..b1516251b0
--- /dev/null
+++ b/main/eudev/eudev-hwids.trigger
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+udevadm hwdb --update
+
+exit 0
diff --git a/main/expat/APKBUILD b/main/expat/APKBUILD
index db2c30cd4e..8e94affdb5 100644
--- a/main/expat/APKBUILD
+++ b/main/expat/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=expat
-pkgver=2.4.9
+pkgver=2.5.0
pkgrel=0
pkgdesc="XML Parser library written in C"
url="https://libexpat.github.io/"
@@ -14,6 +14,8 @@ depends_dev="$pkgname=$pkgver-r$pkgrel"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc lib$pkgname:libs"
# secfixes:
+# 2.5.0-r0:
+# - CVE-2022-43680
# 2.4.9-r0:
# - CVE-2022-40674
# 2.4.5-r0:
@@ -60,5 +62,5 @@ package() {
}
sha512sums="
-fdfdc57dd11541eb307b38bd97ec84f78012c7b48fafc5c879b4b8c768cabfbcd7652ccec11e870bf31fee8f68174b22cf632de12c8c46601277f6750f90c192 expat-2.4.9.tar.bz2
+22fd904d75aab7506a85c03519b9cf79e44898c8e1ba6abf6cb7f95de71b8e63a7e2d5cf4395e3627d46035ea29342b3e631a8809fef8aad3f59976dc075ad17 expat-2.5.0.tar.bz2
"
diff --git a/main/expect/APKBUILD b/main/expect/APKBUILD
index a365fdba6d..7dacdb1550 100644
--- a/main/expect/APKBUILD
+++ b/main/expect/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=expect
pkgver=5.45.4
-pkgrel=2
+pkgrel=3
pkgdesc="A tool for automating interactive applications"
url="https://core.tcl-lang.org/expect/index"
arch="all"
-# http://expect.sourceforge.net/FAQ.html#q6
+# https://expect.sourceforge.net/FAQ.html#q6
license="NIST-PD"
makedepends="tcl-dev"
subpackages="$pkgname-dev $pkgname-doc"
diff --git a/main/fail2ban/APKBUILD b/main/fail2ban/APKBUILD
index 129082f784..5d620b5a04 100644
--- a/main/fail2ban/APKBUILD
+++ b/main/fail2ban/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Jeff Bilyk <jbilyk@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fail2ban
-pkgver=0.11.2
-pkgrel=3
+pkgver=1.0.2
+pkgrel=1
pkgdesc="Scans log files for login failures then updates iptables to reject originating ip address"
url="https://www.fail2ban.org/"
arch="noarch"
@@ -12,11 +12,7 @@ depends="python3 iptables ip6tables logrotate"
makedepends="python3-dev py3-setuptools bash"
subpackages="$pkgname-tests $pkgname-doc $pkgname-openrc"
source="$pkgname-$pkgver.tar.gz::https://github.com/fail2ban/fail2ban/archive/$pkgver.tar.gz
- $pkgname-747d468-fix-tests.patch::https://github.com/fail2ban/fail2ban/commit/747d4683221b5584f9663695fb48145689b42ceb.patch
- CVE-2021-32749.patch
- python-3.10.patch
- setuptools59.patch
-
+ fail2ban.initd
fail2ban.confd
fail2ban.logrotate
alpine-ssh.jaild
@@ -24,7 +20,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/fail2ban/fail2ban/archive/$p
alpine-sshd-ddos.filterd
"
case "$CARCH" in
- ppc64le|s390x|mips64|armhf) options="!check";;
+ x86_64|ppc64le|s390x|armhf) options="!check";;
esac
# secfixes:
@@ -43,7 +39,7 @@ check() {
package() {
python3 setup.py install --root "$pkgdir"
- install -Dm755 files/gentoo-initd "$pkgdir"/etc/init.d/fail2ban
+ install -Dm755 "$srcdir"/fail2ban.initd "$pkgdir"/etc/init.d/fail2ban
install -Dm644 "$srcdir"/fail2ban.confd "$pkgdir"/etc/conf.d/fail2ban
install -Dm644 "$srcdir"/fail2ban.logrotate \
"$pkgdir"/etc/logrotate.d/fail2ban
@@ -54,8 +50,6 @@ package() {
install -Dm644 "$srcdir"/alpine-sshd-ddos.filterd \
"$pkgdir"/etc/fail2ban/filter.d/alpine-sshd-ddos.conf
- chmod o+r "$pkgdir"/usr/lib/python3*/site-packages/fail2ban*.egg-info/*
-
install -Dm644 -t "$pkgdir"/usr/share/man/man1 man/*.1
install -Dm644 -t "$pkgdir"/usr/share/man/man5 man/*.5
@@ -75,11 +69,8 @@ tests() {
}
sha512sums="
-46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97 fail2ban-0.11.2.tar.gz
-5c0748c048031d88bc8fd2519bf99a35437b78a08fa942dbccdd2c0e4e9125560a847a8f1dc4414691c922dff558acff988492250be6a1f443a139b0e3762898 fail2ban-747d468-fix-tests.patch
-994de8a4fdd4535607cd1b21553266de015b57bdb7f84f931973cb4b3cadd93fb2fda2d402a4ecccf505dffabf146cd9eae2cd0b635c3cb3dfa2d312539d41be CVE-2021-32749.patch
-acd8f1f97233ed02012b166c62e8dc67b89729b82f0fcd81c871d0e425633f617404390b8301e6b22ef3ddf137f604a47aae7880a9f4ba6601b8d0ffe52b4f85 python-3.10.patch
-7af6a22b60e21557dfbfe2c473156ca22a8f27978c6897d4b3b050f737eeced9dc26921ae52b1de5faa399f89f5fe80364633a4a3c80b100fc99882fd55824b4 setuptools59.patch
+688a84361b5794e1658f53d2d200ce752fe1e3320ddb1742c32c4b4b82a79ace16ae464e7ea3eeb94a0e862bcac73c2d3a0e61dd7b28e179a4c857f950d74dbb fail2ban-1.0.2.tar.gz
+9ba3da904e2169264ca2ad3af1a6c10ba82f559b9c746d20c515ec806263a7fe0576536e38e4e6107cd551048aa8868b45986f1a803a049ea745158678b8d8be fail2ban.initd
1e7581dd04e7777d6fd5c40cc842a7ec5f4e6a0374673d020d89dd61bf4093d48934844bee89bcac9084f9ae44f3beb66e714cf3c2763d79c3e8feb790c5e43b fail2ban.confd
ee1c229db970239ebc707cd484a650fcf2347c70b411728ee2a4a35a72f4118cfccecf2a221275603320e0332efcc16e4979201933cec1aef1c5d5a082fc4940 fail2ban.logrotate
84915967ae1276f1e14a5813680ee2ebf081af1ff452a688ae5f9ac3363f4aff90e39f8e6456b5c33d5699917d28a16308797095fd1ef9bb1fbcb46d4cea3def alpine-ssh.jaild
diff --git a/main/fail2ban/CVE-2021-32749.patch b/main/fail2ban/CVE-2021-32749.patch
deleted file mode 100644
index d3c677918c..0000000000
--- a/main/fail2ban/CVE-2021-32749.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 410a6ce5c80dd981c22752da034f2529b5eee844 Mon Sep 17 00:00:00 2001
-From: sebres <serg.brester@sebres.de>
-Date: Mon, 21 Jun 2021 17:12:53 +0200
-Subject: [PATCH] fixed possible RCE vulnerability, unset escape variable
- (default tilde) stops consider "~" char after new-line as composing escape
- sequence
-
----
- config/action.d/complain.conf | 2 +-
- config/action.d/dshield.conf | 2 +-
- config/action.d/mail-buffered.conf | 8 ++++----
- config/action.d/mail-whois-lines.conf | 2 +-
- config/action.d/mail-whois.conf | 6 +++---
- config/action.d/mail.conf | 6 +++---
- 6 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/config/action.d/complain.conf b/config/action.d/complain.conf
-index 3a5f882c9f..4d73b05859 100644
---- a/config/action.d/complain.conf
-+++ b/config/action.d/complain.conf
-@@ -102,7 +102,7 @@ logpath = /dev/null
- # Notes.: Your system mail command. Is passed 2 args: subject and recipient
- # Values: CMD
- #
--mailcmd = mail -s
-+mailcmd = mail -E 'set escape' -s
-
- # Option: mailargs
- # Notes.: Additional arguments to mail command. e.g. for standard Unix mail:
-diff --git a/config/action.d/dshield.conf b/config/action.d/dshield.conf
-index c128bef348..3d5a7a53a9 100644
---- a/config/action.d/dshield.conf
-+++ b/config/action.d/dshield.conf
-@@ -179,7 +179,7 @@ tcpflags =
- # Notes.: Your system mail command. Is passed 2 args: subject and recipient
- # Values: CMD
- #
--mailcmd = mail -s
-+mailcmd = mail -E 'set escape' -s
-
- # Option: mailargs
- # Notes.: Additional arguments to mail command. e.g. for standard Unix mail:
-diff --git a/config/action.d/mail-buffered.conf b/config/action.d/mail-buffered.conf
-index 325f185b2f..79b841049c 100644
---- a/config/action.d/mail-buffered.conf
-+++ b/config/action.d/mail-buffered.conf
-@@ -17,7 +17,7 @@ actionstart = printf %%b "Hi,\n
- The jail <name> has been started successfully.\n
- Output will be buffered until <lines> lines are available.\n
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
-
- # Option: actionstop
- # Notes.: command executed at the stop of jail (or at the end of Fail2Ban)
-@@ -28,13 +28,13 @@ actionstop = if [ -f <tmpfile> ]; then
- These hosts have been banned by Fail2Ban.\n
- `cat <tmpfile>`
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: Summary from <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: Summary from <fq-hostname>" <dest>
- rm <tmpfile>
- fi
- printf %%b "Hi,\n
- The jail <name> has been stopped.\n
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
-
- # Option: actioncheck
- # Notes.: command executed once before each actionban command
-@@ -55,7 +55,7 @@ actionban = printf %%b "`date`: <ip> (<failures> failures)\n" >> <tmpfile>
- These hosts have been banned by Fail2Ban.\n
- `cat <tmpfile>`
- \nRegards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: Summary" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: Summary" <dest>
- rm <tmpfile>
- fi
-
-diff --git a/config/action.d/mail-whois-lines.conf b/config/action.d/mail-whois-lines.conf
-index 3a3e56b2c7..d2818cb9b9 100644
---- a/config/action.d/mail-whois-lines.conf
-+++ b/config/action.d/mail-whois-lines.conf
-@@ -72,7 +72,7 @@ actionunban =
- # Notes.: Your system mail command. Is passed 2 args: subject and recipient
- # Values: CMD
- #
--mailcmd = mail -s
-+mailcmd = mail -E 'set escape' -s
-
- # Default name of the chain
- #
-diff --git a/config/action.d/mail-whois.conf b/config/action.d/mail-whois.conf
-index 7fea34c40d..ab33b616dc 100644
---- a/config/action.d/mail-whois.conf
-+++ b/config/action.d/mail-whois.conf
-@@ -20,7 +20,7 @@ norestored = 1
- actionstart = printf %%b "Hi,\n
- The jail <name> has been started successfully.\n
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
-
- # Option: actionstop
- # Notes.: command executed at the stop of jail (or at the end of Fail2Ban)
-@@ -29,7 +29,7 @@ actionstart = printf %%b "Hi,\n
- actionstop = printf %%b "Hi,\n
- The jail <name> has been stopped.\n
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
-
- # Option: actioncheck
- # Notes.: command executed once before each actionban command
-@@ -49,7 +49,7 @@ actionban = printf %%b "Hi,\n
- Here is more information about <ip> :\n
- `%(_whois_command)s`\n
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: banned <ip> from <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: banned <ip> from <fq-hostname>" <dest>
-
- # Option: actionunban
- # Notes.: command executed when unbanning an IP. Take care that the
-diff --git a/config/action.d/mail.conf b/config/action.d/mail.conf
-index 5d8c0e154c..f4838ddcb6 100644
---- a/config/action.d/mail.conf
-+++ b/config/action.d/mail.conf
-@@ -16,7 +16,7 @@ norestored = 1
- actionstart = printf %%b "Hi,\n
- The jail <name> has been started successfully.\n
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
-
- # Option: actionstop
- # Notes.: command executed at the stop of jail (or at the end of Fail2Ban)
-@@ -25,7 +25,7 @@ actionstart = printf %%b "Hi,\n
- actionstop = printf %%b "Hi,\n
- The jail <name> has been stopped.\n
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
-
- # Option: actioncheck
- # Notes.: command executed once before each actionban command
-@@ -43,7 +43,7 @@ actionban = printf %%b "Hi,\n
- The IP <ip> has just been banned by Fail2Ban after
- <failures> attempts against <name>.\n
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: banned <ip> from <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: banned <ip> from <fq-hostname>" <dest>
-
- # Option: actionunban
- # Notes.: command executed when unbanning an IP. Take care that the
diff --git a/main/fail2ban/fail2ban.initd b/main/fail2ban/fail2ban.initd
new file mode 100755
index 0000000000..0fb157cdad
--- /dev/null
+++ b/main/fail2ban/fail2ban.initd
@@ -0,0 +1,60 @@
+#!/sbin/openrc-run
+# This file is part of Fail2Ban.
+#
+# Fail2Ban is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fail2Ban is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Fail2Ban; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Author: Sireyessire, Cyril Jaquier
+#
+
+description="Daemon to ban hosts that cause multiple authentication errors"
+description_reload="reload configuration"
+description_showlog="show fail2ban logs"
+extra_started_commands="reload showlog"
+
+FAIL2BAN="/usr/bin/fail2ban-client ${FAIL2BAN_OPTIONS}"
+
+depend() {
+ need net
+ need logger
+ after iptables
+}
+
+start() {
+ ebegin "Starting fail2ban"
+ mkdir -p /var/run/fail2ban || return 1
+ # remove stalled sock file after system crash
+ # bug 347477
+ rm -f /var/run/fail2ban/fail2ban.sock || return 1
+ start-stop-daemon --start --pidfile /var/run/fail2ban/fail2ban.pid \
+ -- ${FAIL2BAN} start
+ eend $? "Failed to start fail2ban"
+}
+
+stop() {
+ ebegin "Stopping fail2ban"
+ start-stop-daemon --stop --pidfile /var/run/fail2ban/fail2ban.pid --retry 30 \
+ -- ${FAIL2BAN} stop
+ eend $? "Failed to stop fail2ban"
+}
+
+reload() {
+ ebegin "Reloading fail2ban"
+ ${FAIL2BAN} reload
+ eend $? "Failed to reload fail2ban"
+}
+
+showlog(){
+ less /var/log/fail2ban.log
+}
diff --git a/main/fail2ban/python-3.10.patch b/main/fail2ban/python-3.10.patch
deleted file mode 100644
index 53a3227d9b..0000000000
--- a/main/fail2ban/python-3.10.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 2b6bb2c1bed8f7009631e8f8c306fa3160324a49 Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 17:19:24 +0100
-Subject: [PATCH] follow bpo-37324: :ref:`collections-abstract-base-classes`
- moved to the :mod:`collections.abc` module
-
-(since 3.10-alpha.5 `MutableMapping` is missing in collections module)
----
- fail2ban/server/action.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fail2ban/server/action.py b/fail2ban/server/action.py
-index 3bc48fe046..f0f1e6f59a 100644
---- a/fail2ban/server/action.py
-+++ b/fail2ban/server/action.py
-@@ -30,7 +30,10 @@
- import threading
- import time
- from abc import ABCMeta
--from collections import MutableMapping
-+try:
-+ from collections.abc import MutableMapping
-+except ImportError:
-+ from collections import MutableMapping
-
- from .failregex import mapTag2Opt
- from .ipdns import DNSUtils
-From 42dee38ad2ac5c3f23bdf297d824022923270dd9 Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 17:25:45 +0100
-Subject: [PATCH] amend for `Mapping`
-
----
- fail2ban/server/actions.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fail2ban/server/actions.py b/fail2ban/server/actions.py
-index b7b95b445a..897d907c1a 100644
---- a/fail2ban/server/actions.py
-+++ b/fail2ban/server/actions.py
-@@ -28,7 +28,10 @@
- import os
- import sys
- import time
--from collections import Mapping
-+try:
-+ from collections.abc import Mapping
-+except ImportError:
-+ from collections import Mapping
- try:
- from collections import OrderedDict
- except ImportError:
-From 9f1d1f4fbd0804695a976beb191f2c49a2739834 Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 17:35:59 +0100
-Subject: [PATCH] amend for `Mapping` (jails)
-
----
- fail2ban/server/jails.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fail2ban/server/jails.py b/fail2ban/server/jails.py
-index 972a8c4bd2..27e12ddf65 100644
---- a/fail2ban/server/jails.py
-+++ b/fail2ban/server/jails.py
-@@ -22,7 +22,10 @@
- __license__ = "GPL"
-
- from threading import Lock
--from collections import Mapping
-+try:
-+ from collections.abc import Mapping
-+except ImportError:
-+ from collections import Mapping
-
- from ..exceptions import DuplicateJailException, UnknownJailException
- from .jail import Jail
diff --git a/main/fail2ban/setuptools59.patch b/main/fail2ban/setuptools59.patch
deleted file mode 100644
index d54f3a345b..0000000000
--- a/main/fail2ban/setuptools59.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -186,7 +186,6 @@
- if setuptools:
- setup_extra = {
- 'test_suite': "fail2ban.tests.utils.gatherTests",
-- 'use_2to3': True,
- }
- else:
- setup_extra = {}
diff --git a/main/fcgi/APKBUILD b/main/fcgi/APKBUILD
index 14e2a72dad..0432f7fe70 100644
--- a/main/fcgi/APKBUILD
+++ b/main/fcgi/APKBUILD
@@ -3,7 +3,7 @@
pkgname=fcgi
_pkgname=fcgi2
pkgver=2.4.2
-pkgrel=1
+pkgrel=2
pkgdesc="FAST CGI(fcgi) is a language independent, high performant extension to CGI"
url="https://github.com/FastCGI-Archives/fcgi2"
arch="all"
diff --git a/main/fcgiwrap/APKBUILD b/main/fcgiwrap/APKBUILD
index ec5214f2ac..67252791cf 100644
--- a/main/fcgiwrap/APKBUILD
+++ b/main/fcgiwrap/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fcgiwrap
pkgver=1.1.0
-pkgrel=5
+pkgrel=6
pkgdesc="Simple server for running CGI applications over FastCGI"
url="https://github.com/gnosek/fcgiwrap"
arch="all"
diff --git a/main/fftw/APKBUILD b/main/fftw/APKBUILD
index 0448459398..844f7aaf77 100644
--- a/main/fftw/APKBUILD
+++ b/main/fftw/APKBUILD
@@ -3,15 +3,20 @@
pkgname=fftw
pkgver=3.3.10
_pkgver=${pkgver//p/-pl}
-pkgrel=0
+pkgrel=1
pkgdesc="Discrete Fourier transform (DFT) library"
url="http://www.fftw.org/"
arch="all"
license="GPL-2.0-or-later"
makedepends="texinfo"
# order of the libs split functions are important because of lib naming
-subpackages="$pkgname-dev $pkgname-doc $pkgname-single-libs:single
- $pkgname-long-double-libs:long_double $pkgname-double-libs:double"
+subpackages="
+ $pkgname-dev
+ $pkgname-doc
+ $pkgname-single-libs:single
+ $pkgname-long-double-libs:long_double
+ $pkgname-double-libs:double
+ "
source="http://www.fftw.org/fftw-$_pkgver.tar.gz
cycle.h.patch
"
@@ -33,8 +38,9 @@ prepare() {
}
build() {
- local _openmp=
-
+ export CFLAGS="$CFLAGS -O2"
+ export CXXFLAGS="$CXXFLAGS -O2"
+ export CPPFLAGS="$CPPFLAGS -O2"
local i; for i in $_precision; do
case "$i" in
single) _cf="--enable-single";;
@@ -60,7 +66,6 @@ build() {
--infodir=/usr/share/info \
--enable-shared \
--enable-threads \
- $_openmp \
$_cf
make
done
@@ -81,21 +86,15 @@ package() {
}
single() {
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libfftw3f*.so* \
- "$subpkgdir"/usr/lib/
+ amove usr/lib/libfftw3f*.so*
}
double() {
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libfftw3*.so* \
- "$subpkgdir"/usr/lib/
+ amove usr/lib/libfftw3*.so*
}
long_double() {
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libfftw3l*.so* \
- "$subpkgdir"/usr/lib/
+ amove usr/lib/libfftw3l*.so*
}
sha512sums="
diff --git a/main/file/APKBUILD b/main/file/APKBUILD
index 347750c7aa..e943f1c15a 100644
--- a/main/file/APKBUILD
+++ b/main/file/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=file
-pkgver=5.42
+pkgver=5.43
pkgrel=0
pkgdesc="File type identification utility"
url="https://www.darwinsys.com/file/"
@@ -9,7 +9,9 @@ arch="all"
license="BSD-2-Clause"
makedepends="autoconf libtool automake"
subpackages="$pkgname-dev $pkgname-doc libmagic"
-source="$pkgname-$pkgver.tar.gz::https://github.com/file/file/archive/FILE${pkgver/./_}.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/file/file/archive/FILE${pkgver/./_}.tar.gz
+ fix-dsf-format.patch
+ "
builddir="$srcdir/$pkgname-FILE${pkgver/./_}"
# secfixes:
@@ -47,5 +49,6 @@ libmagic() {
}
sha512sums="
-7df20a1818a59feaa92012c6e19c263db1ac006d19bdec9fd69f47da702dae040f53371f112c31c38e42a35279a668a9e98469bc19cc88bed781ba46db235942 file-5.42.tar.gz
+a961136cd89794bf45eb107fbe7785603b5d40363d0634c6c85e96d4ca9f85087c98442ca1fb0089beff60e9c3a49aa6acab8b67416e72b7d32c67ad5b1d1fa2 file-5.43.tar.gz
+d1f671e35181fbe7f5332585a50ff0fb889d37090f4cf5bcba851f26b07c8bebbc8f52f2e4a6ca5f5cec7fa087e40c9a1293a5acd1987c8ea91151f2ee94464f fix-dsf-format.patch
"
diff --git a/main/file/fix-dsf-format.patch b/main/file/fix-dsf-format.patch
new file mode 100644
index 0000000000..cd5fab574e
--- /dev/null
+++ b/main/file/fix-dsf-format.patch
@@ -0,0 +1,77 @@
+Patch-Source:
+ https://github.com/file/file/commit/1294029cdb18d4c0997f2b52df435076b8444137
+ https://github.com/file/file/commit/e332d4e4a3c0d12a1e0d2a15876ba9d2e03a0bfb
+From e332d4e4a3c0d12a1e0d2a15876ba9d2e03a0bfb Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Sun, 9 Oct 2022 13:40:22 +0000
+Subject: [PATCH] revert previous; the original dsf entry in audio was better
+
+---
+ magic/Magdir/audio | 11 ++++++++++-
+ magic/Magdir/dsf | 34 ----------------------------------
+ magic/Makefile.am | 3 +--
+ 3 files changed, 11 insertions(+), 37 deletions(-)
+ delete mode 100644 magic/Magdir/dsf
+
+diff --git a/magic/Magdir/audio b/magic/Magdir/audio
+index 0328f7b..7a0a192 100644
+--- a/magic/Magdir/audio
++++ b/magic/Magdir/audio
+@@ -1,6 +1,6 @@
+
+ #------------------------------------------------------------------------------
+-# $File: audio,v 1.124 2022/08/28 08:58:20 christos Exp $
++# $File: audio,v 1.126 2022/10/09 13:40:22 christos Exp $
+ # audio: file(1) magic for sound formats (see also "iff")
+ #
+ # Jan Nicolai Langfeldt (janl@ifi.uio.no), Dan Quinlan (quinlan@yggdrasil.com),
+diff --git a/magic/Magdir/dsf b/magic/Magdir/dsf
+deleted file mode 100644
+index e6c4b6e..0000000
+--- a/magic/Magdir/dsf
++++ /dev/null
+@@ -1,25 +0,0 @@
+-
+-#------------------------------------------------------------
+-# $File: dsf,v 1.1 2022/01/08 16:29:18 christos Exp $
+-# dsf: file(1) magic for DSD Stream File
+-# URL: https://en.wikipedia.org/wiki/Direct_Stream_Digital
+-# Reference: https://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf
+-0 string DSD\x20 DSD Stream File,
+->0x30 leshort 1 mono,
+->0x30 leshort 2 stereo,
+->0x30 leshort 3 three-channel,
+->0x30 leshort 4 quad-channel,
+->0x30 leshort 5 3.1 4-channel,
+->0x30 leshort 6 five-channel,
+->0x30 leshort 7 5.1 surround,
+->0x30 default x
+->>0x30 leshort x unknown channel format (%d),
+->0x38 lelong 2822400 simple-rate,
+->0x38 lelong 5644800 double-rate,
+->0x38 default x
+->>0x38 lelong x %d Hz,
+->0x3c leshort 1 1 bit,
+->0x3c leshort 8 8 bit,
+->0x3c default x
+->>0x3c leshort x %d bit,
+->0x40 lelong x %d samples
+diff --git a/magic/Makefile.am b/magic/Makefile.am
+index 9fec70c..d82a2f6 100644
+--- a/magic/Makefile.am
++++ b/magic/Makefile.am
+@@ -1,5 +1,5 @@
+ #
+-# $File: Makefile.am,v 1.182 2022/09/11 21:04:30 christos Exp $
++# $File: Makefile.am,v 1.183 2022/10/09 13:40:22 christos Exp $
+ #
+ MAGIC_FRAGMENT_BASE = Magdir
+ MAGIC_DIR = $(top_srcdir)/magic
+@@ -92,7 +92,6 @@ $(MAGIC_FRAGMENT_DIR)/dif \
+ $(MAGIC_FRAGMENT_DIR)/diff \
+ $(MAGIC_FRAGMENT_DIR)/digital \
+ $(MAGIC_FRAGMENT_DIR)/dolby \
+-$(MAGIC_FRAGMENT_DIR)/dsf \
+ $(MAGIC_FRAGMENT_DIR)/dump \
+ $(MAGIC_FRAGMENT_DIR)/dyadic \
+ $(MAGIC_FRAGMENT_DIR)/ebml \
diff --git a/main/fish/APKBUILD b/main/fish/APKBUILD
index 27e33402db..336e73f044 100644
--- a/main/fish/APKBUILD
+++ b/main/fish/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=fish
pkgver=3.5.1
-pkgrel=1
+pkgrel=2
pkgdesc="Modern interactive commandline shell"
url="https://fishshell.com/"
arch="all"
@@ -81,6 +81,9 @@ package() {
# provided by mdbook-fish-completion
rm "$pkgdir"/usr/share/fish/completions/mdbook.fish
+
+ # provided by black-fish-completion
+ rm "$pkgdir"/usr/share/fish/completions/black.fish
}
doc() {
diff --git a/main/flac/APKBUILD b/main/flac/APKBUILD
index b99cc6b1d2..bc94d616be 100644
--- a/main/flac/APKBUILD
+++ b/main/flac/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=flac
-pkgver=1.4.1
+pkgver=1.4.2
pkgrel=0
pkgdesc="Free Lossless Audio Codec"
url="https://xiph.org/flac/"
@@ -8,7 +8,7 @@ arch="all"
license="custom:Xiph LGPL GPL FDL"
options="!check" # Tests are infinite
subpackages="$pkgname-dev $pkgname-libs $pkgname-doc"
-makedepends="cmake libogg-dev nasm !libiconv samurai"
+makedepends="cmake libogg-dev !libiconv samurai"
source="https://downloads.xiph.org/releases/flac/flac-$pkgver.tar.xz"
# secfixes:
@@ -20,15 +20,6 @@ source="https://downloads.xiph.org/releases/flac/flac-$pkgver.tar.xz"
build() {
- case "$CARCH" in
- x86)
- local sse=off
- ;;
- x86_64)
- local sse=on
- ;;
- esac
-
export CFLAGS="$CFLAGS -O2 -flto=auto"
export CXXFLAGS="$CXXFLAGS -O2 -flto=auto"
@@ -38,8 +29,7 @@ build() {
-DBUILD_TESTING=OFF \
-DBUILD_EXAMPLES=OFF \
-DBUILD_SHARED_LIBS=ON \
- -DNDEBUG=ON \
- -DWITH_SSE=$sse
+ -DNDEBUG=ON
cmake --build build
}
@@ -56,5 +46,5 @@ package() {
}
sha512sums="
-72a5ced62e06407ddea3ed6dcd28bf8f56f3d45e0649ea38e1b778f7856041c68bf85c3cec0a55170c2fbc144626829fed132d386f7439f1d6e3d0b45f13dba7 flac-1.4.1.tar.xz
+20bdf0990a7432ac765037764bc8733a0d5646866fe6cc6f4868152d2a051c89676e501012ae489c7f87b3aacb45a5b30265afaca164cf0cf53ac058644a74c5 flac-1.4.2.tar.xz
"
diff --git a/main/flashrom/APKBUILD b/main/flashrom/APKBUILD
index 67c74ec6f4..d065f8c367 100644
--- a/main/flashrom/APKBUILD
+++ b/main/flashrom/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
pkgname=flashrom
pkgver=1.2
-pkgrel=0
+pkgrel=1
pkgdesc="A utility for identifying, reading, writing, verifying and erasing flash chips"
url="https://www.flashrom.org/Flashrom"
arch="all"
license="GPL-2.0-or-later"
depends="dmidecode"
-makedepends="pciutils-dev libusb-compat-dev linux-headers"
+makedepends="pciutils-dev libusb-dev linux-headers"
subpackages="$pkgname-doc"
install="$pkgname.post-install"
options="!check" # no test suite
@@ -26,5 +26,7 @@ package() {
make PREFIX="$pkgdir/usr/" install
}
-sha512sums="8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8 flashrom-v1.2.tar.bz2
-371131e37ee0f2ce31b5dd264707b91817a2f0a3654943e6b3430df862d4bb64f27117c1c94276cb447f5b45f1771b9997f9c96423d68c6dd4565c1e1f442a5e musl-ffs.patch"
+sha512sums="
+8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8 flashrom-v1.2.tar.bz2
+371131e37ee0f2ce31b5dd264707b91817a2f0a3654943e6b3430df862d4bb64f27117c1c94276cb447f5b45f1771b9997f9c96423d68c6dd4565c1e1f442a5e musl-ffs.patch
+"
diff --git a/main/font-adobe-100dpi/APKBUILD b/main/font-adobe-100dpi/APKBUILD
index 19e6b9c621..bac39bb111 100644
--- a/main/font-adobe-100dpi/APKBUILD
+++ b/main/font-adobe-100dpi/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-adobe-100dpi
pkgver=1.0.3
-pkgrel=1
+pkgrel=2
pkgdesc="X.org adobe 100dpi font"
url="http://xorg.freedesktop.org/"
arch="all"
license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+depends="encodings font-alias mkfontscale fontconfig"
makedepends="font-util-dev bdftopcf"
source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
diff --git a/main/font-adobe-75dpi/APKBUILD b/main/font-adobe-75dpi/APKBUILD
index c7136e52a5..6688fa094a 100644
--- a/main/font-adobe-75dpi/APKBUILD
+++ b/main/font-adobe-75dpi/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-adobe-75dpi
pkgver=1.0.3
-pkgrel=1
+pkgrel=2
pkgdesc="X.org adobe 75dpi font"
url="http://xorg.freedesktop.org/"
arch="noarch"
license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+depends="encodings font-alias mkfontscale fontconfig"
makedepends="font-util-dev bdftopcf"
source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
diff --git a/main/font-adobe-utopia-100dpi/APKBUILD b/main/font-adobe-utopia-100dpi/APKBUILD
index 1eaf4c9038..5ffe42cc1a 100644
--- a/main/font-adobe-utopia-100dpi/APKBUILD
+++ b/main/font-adobe-utopia-100dpi/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-adobe-utopia-100dpi
pkgver=1.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="X.org adobe 100dpi font"
url="http://xorg.freedesktop.org/"
arch="all"
license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+depends="encodings font-alias mkfontscale fontconfig"
makedepends="font-util-dev bdftopcf"
source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
diff --git a/main/font-adobe-utopia-75dpi/APKBUILD b/main/font-adobe-utopia-75dpi/APKBUILD
index 589d5155e9..efc6cd872d 100644
--- a/main/font-adobe-utopia-75dpi/APKBUILD
+++ b/main/font-adobe-utopia-75dpi/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-adobe-utopia-75dpi
pkgver=1.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="X.org adobe 75dpi font"
url="http://xorg.freedesktop.org/"
arch="all"
license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+depends="encodings font-alias mkfontscale fontconfig"
makedepends="font-util-dev bdftopcf"
source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
diff --git a/main/font-adobe-utopia-type1/APKBUILD b/main/font-adobe-utopia-type1/APKBUILD
index f64d276239..7927a98308 100644
--- a/main/font-adobe-utopia-type1/APKBUILD
+++ b/main/font-adobe-utopia-type1/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-adobe-utopia-type1
pkgver=1.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="X.org adobe utopia-type1 fonts"
url="http://xorg.freedesktop.org/"
arch="all"
license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+depends="encodings font-alias mkfontscale fontconfig"
makedepends="font-util-dev bdftopcf"
source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
diff --git a/main/font-arabic-misc/APKBUILD b/main/font-arabic-misc/APKBUILD
index c53a0c289d..f26129c25d 100644
--- a/main/font-arabic-misc/APKBUILD
+++ b/main/font-arabic-misc/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-arabic-misc
pkgver=1.0.3
-pkgrel=1
+pkgrel=2
pkgdesc="X.org misc font"
url="http://xorg.freedesktop.org/"