aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/a52dec/APKBUILD49
-rw-r--r--main/a52dec/a52dec-0.7.4-build.patch27
-rw-r--r--main/a52dec/automake.patch11
-rw-r--r--main/a52dec/fix-globals-test-x86-pie.patch11
-rw-r--r--main/abuild/APKBUILD2
-rw-r--r--main/acpica/APKBUILD8
-rw-r--r--main/alpine-base/APKBUILD2
-rw-r--r--main/alpine-baselayout/APKBUILD6
-rw-r--r--main/alpine-baselayout/blacklist.conf4
-rw-r--r--main/alpine-baselayout/profile29
-rw-r--r--main/alsa-lib/1.2.5-load_all_cards.patch94
-rw-r--r--main/alsa-lib/1.2.5-private_device_prefix1.patch65
-rw-r--r--main/alsa-lib/1.2.5-private_device_prefix2.patch31
-rw-r--r--main/alsa-lib/APKBUILD18
-rw-r--r--main/alsa-utils/0001-load_state-Only-delete-config-if-one-was-loaded.patch52
-rw-r--r--main/alsa-utils/1.2.5-nested_iteration.patch28
-rw-r--r--main/alsa-utils/APKBUILD20
-rw-r--r--main/alsa-utils/alsa.confd5
-rw-r--r--main/alsa-utils/alsa.initd4
-rw-r--r--main/alsa-utils/fix-PATH_MAX-on-ppc64le.patch15
-rw-r--r--main/amavis/APKBUILD7
-rw-r--r--main/ansible-base/0001-new-module-lbu.patch151
-rw-r--r--main/ansible-base/APKBUILD69
-rw-r--r--main/ansible/APKBUILD33
-rw-r--r--main/apache2/APKBUILD4
-rw-r--r--main/apcupsd/APKBUILD6
-rw-r--r--main/apcupsd/apcupsd.powerfail.initd17
-rw-r--r--main/apk-tools/0001-solver-don-t-consider-requirer-count-for-preference.patch100
-rw-r--r--main/apk-tools/APKBUILD8
-rw-r--r--main/apr-util/APKBUILD4
-rw-r--r--main/arm-trusted-firmware/APKBUILD34
-rw-r--r--main/arpwatch/01_all_arpwatch-2.1a15-manpages.patch69
-rw-r--r--main/arpwatch/02_all_arpwatch-2.1a15-srcdir.patch250
-rw-r--r--main/arpwatch/03_all_arpwatch-2.1a15-getopt.patch150
-rw-r--r--main/arpwatch/04_all_arpwatch-2.1a15-sendmail-cmdline-opt.patch159
-rw-r--r--main/arpwatch/05_all_arpwatch-2.1a15-promiscuous-mode.patch89
-rw-r--r--main/arpwatch/06_all_arpwatch-2.1a15-bogons-report.patch507
-rw-r--r--main/arpwatch/07_all_arpwatch-2.1a15-specify-mail.patch168
-rw-r--r--main/arpwatch/08_all_arpwatch-2.1a15-drop-priveleges.patch147
-rw-r--r--main/arpwatch/09_all_arpwatch-2.1a15-quite-mail.patch90
-rw-r--r--main/arpwatch/10_all_arpwatch-2.1a15-ignore-net.patch97
-rw-r--r--main/arpwatch/11_all_arpwatch-2.1a15-secure-tmp.patch26
-rw-r--r--main/arpwatch/12_all_arpwatch-2.1a15-defalt-dir-in-manpages.patch24
-rw-r--r--main/arpwatch/13_all_arpwatch-2.1a15-scripts-awk.patch31
-rw-r--r--main/arpwatch/14_all_arpwatch-2.1a15-paths-fix.patch35
-rw-r--r--main/arpwatch/15_all_arpwatch-2.1a15-fix-dead-lock.patch32
-rw-r--r--main/arpwatch/16_all_arpwatch-2.1a15-additional-manpages-cleanups.patch98
-rw-r--r--main/arpwatch/17_all_arpwatch-2.1a15-restart.patch162
-rw-r--r--main/arpwatch/18_all_arpwatch-2.1a15-nofork.patch94
-rw-r--r--main/arpwatch/19_all_arpwatch-2.1a15-nonewstation.patch100
-rw-r--r--main/arpwatch/20_all_arpwatch-2.1a15-noreversedns-resolve.patch99
-rw-r--r--main/arpwatch/21_all_arpwatch-2.1a15-pid-filename.patch108
-rw-r--r--main/arpwatch/22_alpine_bihourly_script.patch14
-rw-r--r--main/arpwatch/53_stop-using-_getshort.patch25
-rw-r--r--main/arpwatch/APKBUILD104
-rw-r--r--main/arpwatch/arpwatch.initd2
-rw-r--r--main/arpwatch/arpwatch.post-install5
-rw-r--r--main/arpwatch/remove-freebsd-arpwatch.patch10
-rw-r--r--main/asciidoctor/APKBUILD4
-rw-r--r--main/aspell/APKBUILD13
-rw-r--r--main/aspell/CVE-2019-25051.patch96
-rw-r--r--main/asterisk/APKBUILD70
-rw-r--r--main/asterisk/CVE-2021-32558.patch126
-rw-r--r--main/at-spi2-core/APKBUILD6
-rw-r--r--main/audit/APKBUILD10
-rw-r--r--main/autoconf-archive/APKBUILD8
-rw-r--r--main/automake/0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch70
-rw-r--r--main/automake/APKBUILD15
-rw-r--r--main/avahi/APKBUILD14
-rw-r--r--main/avahi/CVE-2021-3468.patch37
-rw-r--r--main/avahi/CVE-2021-36217.patch148
-rw-r--r--main/awall/APKBUILD8
-rw-r--r--main/axel/APKBUILD2
-rw-r--r--main/bacula/APKBUILD4
-rw-r--r--main/bash/APKBUILD12
-rw-r--r--main/bats/APKBUILD6
-rw-r--r--main/bctoolbox/APKBUILD4
-rw-r--r--main/bind/APKBUILD23
-rw-r--r--main/bind/bind-9.16.20-map-format-fix.patch8
-rw-r--r--main/bluez/APKBUILD50
-rw-r--r--main/bluez/bluetooth.initd2
-rw-r--r--main/bluez/fix-musl.patch12
-rw-r--r--main/bluez/mpris-proxy.desktop8
-rw-r--r--main/botan/APKBUILD8
-rw-r--r--main/brotli/APKBUILD5
-rw-r--r--main/btrfs-progs/APKBUILD4
-rw-r--r--main/bubblewrap/APKBUILD19
-rw-r--r--main/busybox-initscripts/APKBUILD12
-rw-r--r--main/busybox-initscripts/mdev.conf3
-rw-r--r--main/busybox/0001-ash-regressions-in-process-substitution.patch80
-rw-r--r--main/busybox/0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch88
-rw-r--r--main/busybox/0001-echo-do-not-assume-that-free-leaves-errno-unmodified.patch63
-rw-r--r--main/busybox/0001-properly-fix-wget-https-support.patch16
-rw-r--r--main/busybox/0001-rev-correct-output-for-long-input-lines.patch91
-rw-r--r--main/busybox/0002-cpio-add-support-for-renumber-inodes-like-GNU-cpio.patch129
-rw-r--r--main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch16
-rw-r--r--main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch41
-rw-r--r--main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch22
-rw-r--r--main/busybox/APKBUILD37
-rw-r--r--main/busybox/busyboxconfig17
-rw-r--r--main/busybox/busyboxconfig-extras20
-rw-r--r--main/byacc/APKBUILD6
-rw-r--r--main/c-ares/APKBUILD12
-rw-r--r--main/ca-certificates/APKBUILD2
-rw-r--r--main/cgit/APKBUILD2
-rw-r--r--main/charybdis/APKBUILD2
-rw-r--r--main/cjson/APKBUILD8
-rw-r--r--main/ckbcomp/APKBUILD10
-rw-r--r--main/cmake/APKBUILD7
-rw-r--r--main/cmake/patch-adjust-lib64.patch31
-rw-r--r--main/compiler-rt/APKBUILD2
-rw-r--r--main/cryptsetup/APKBUILD20
-rw-r--r--main/cryptsetup/flush-stdout.patch12
-rw-r--r--main/ctags/APKBUILD6
-rw-r--r--main/cups/APKBUILD12
-rw-r--r--main/cups/cups-nostrip.patch68
-rw-r--r--main/curl/APKBUILD22
-rw-r--r--main/curl/conn_shutdown-if-closed-during-CONNECT-cleanup-properly.patch97
-rw-r--r--main/cvs/APKBUILD24
-rw-r--r--main/cvs/add-libbsd.patch12
-rw-r--r--main/cvs/cvs_1.12.13+real-26.patch (renamed from main/cvs/cvs_1.12.13+real-26.diff)0
-rw-r--r--main/cyrus-sasl/APKBUILD4
-rw-r--r--main/dahdi-linux-lts/APKBUILD2
-rw-r--r--main/datefudge/APKBUILD3
-rw-r--r--main/debootstrap/APKBUILD2
-rw-r--r--main/devicemaster-linux/APKBUILD28
-rw-r--r--main/dhcp/APKBUILD1
-rw-r--r--main/dhcpcd/APKBUILD10
-rw-r--r--main/dhcpcd/musl.patch24
-rw-r--r--main/dialog/APKBUILD4
-rw-r--r--main/diffutils/APKBUILD26
-rw-r--r--main/diffutils/disable-mbrtowc-test.patch10
-rw-r--r--main/diffutils/skip-test-presue-output-tty.patch24
-rw-r--r--main/distcc/APKBUILD10
-rw-r--r--main/dmidecode/APKBUILD8
-rw-r--r--main/dns-root-hints/APKBUILD4
-rw-r--r--main/dnsmasq/APKBUILD42
-rw-r--r--main/doas/APKBUILD21
-rw-r--r--main/doas/configuration-directory.patch509
-rwxr-xr-xmain/doas/doas.post-install30
-rwxr-xr-xmain/doas/doas.post-upgrade30
-rw-r--r--main/doas/manpage-example-path.patch16
-rw-r--r--main/docbook-xsl/APKBUILD11
-rw-r--r--main/dovecot/0001-oauth2-jwt-Use-int64_t-instead-time_t-for-portabilit.patch63
-rw-r--r--main/dovecot/APKBUILD26
-rw-r--r--main/dovecot/fix-check-s390x.patch52
-rw-r--r--main/dovecot/fix-test-file-cache.patch22
-rw-r--r--main/doxygen/APKBUILD13
-rw-r--r--main/doxygen/fix-segfault.patch83
-rw-r--r--main/drbd-utils/APKBUILD12
-rw-r--r--main/drbd-utils/fix-drbdsetup_events2.c.patch16
-rw-r--r--main/e2fsprogs/APKBUILD9
-rw-r--r--main/e2fsprogs/ensure-small-filesystems-are-Y2038-ok.patch36
-rw-r--r--main/efitools/005-riscv64.patch45
-rw-r--r--main/efitools/APKBUILD16
-rw-r--r--main/eggdrop/APKBUILD2
-rw-r--r--main/elfutils/APKBUILD21
-rw-r--r--main/elfutils/musl-fts-obstack.patch87
-rw-r--r--main/elfutils/musl-qsort_r.patch67
-rw-r--r--main/elfutils/musl-strerror_r.patch19
-rw-r--r--main/elinks/APKBUILD2
-rw-r--r--main/ell/APKBUILD4
-rw-r--r--main/email/APKBUILD2
-rw-r--r--main/encfs/APKBUILD2
-rw-r--r--main/ethtool/APKBUILD6
-rw-r--r--main/eudev/APKBUILD5
-rw-r--r--main/expect/07-file-handle.patch24
-rw-r--r--main/expect/09-unsafe-traps.patch24
-rw-r--r--main/expect/10-manpage.patch384
-rw-r--r--main/expect/12-fdout.patch22
-rw-r--r--main/expect/22-segfault-with-stubs.patch71
-rw-r--r--main/expect/24-format.patch24
-rw-r--r--main/expect/APKBUILD26
-rw-r--r--main/fail2ban/APKBUILD26
-rw-r--r--main/fakeroot/APKBUILD2
-rw-r--r--main/fftw/APKBUILD8
-rw-r--r--main/fish/APKBUILD44
-rw-r--r--main/freeradius/APKBUILD4
-rw-r--r--main/freeswitch/APKBUILD4
-rw-r--r--main/freetds/APKBUILD8
-rw-r--r--main/freetype/APKBUILD10
-rw-r--r--main/fuse3/APKBUILD4
-rw-r--r--main/gcc/0001-posix_memalign.patch4
-rw-r--r--main/gcc/0002-gcc-poison-system-directories.patch4
-rw-r--r--main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch4
-rw-r--r--main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch4
-rw-r--r--main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch4
-rw-r--r--main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch4
-rw-r--r--main/gcc/0007-Enable-Wtrampolines-by-default.patch4
-rw-r--r--main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch4
-rw-r--r--main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch4
-rw-r--r--main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch4
-rw-r--r--main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch4
-rw-r--r--main/gcc/0012-libitm-disable-FORTIFY.patch4
-rw-r--r--main/gcc/0013-libgcc_s.patch4
-rw-r--r--main/gcc/0014-nopie.patch4
-rw-r--r--main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch4
-rw-r--r--main/gcc/0016-dlang-update-zlib-binding.patch4
-rw-r--r--main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch4
-rw-r--r--main/gcc/0018-ada-fix-shared-linking.patch4
-rw-r--r--main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch4
-rw-r--r--main/gcc/0020-add-fortify-headers-paths.patch4
-rw-r--r--main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch4
-rw-r--r--main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch4
-rw-r--r--main/gcc/0023-Pure-64-bit-MIPS.patch4
-rw-r--r--main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch4
-rw-r--r--main/gcc/0025-always-build-libgcc_eh.a.patch4
-rw-r--r--main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch4
-rw-r--r--main/gcc/0027-ada-musl-support-fixes.patch4
-rw-r--r--main/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch4
-rw-r--r--main/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch4
-rw-r--r--main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch4
-rw-r--r--main/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch4
-rw-r--r--main/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch4
-rw-r--r--main/gcc/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch4
-rw-r--r--main/gcc/0034-gcc-go-signal-34-is-special-on-musl-libc.patch4
-rw-r--r--main/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch4
-rw-r--r--main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch4
-rw-r--r--main/gcc/0037-gcc-go-link-to-libucontext.patch4
-rw-r--r--main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch4
-rw-r--r--main/gcc/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch4
-rw-r--r--main/gcc/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch4
-rw-r--r--main/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch4
-rw-r--r--main/gcc/0042-configure-fix-detection-of-atomic-builtins-in-libato.patch54
-rw-r--r--main/gcc/APKBUILD92
-rw-r--r--main/gd/APKBUILD24
-rw-r--r--main/gd/CVE-2021-38115.patch26
-rw-r--r--main/gd/CVE-2021-40145.patch124
-rw-r--r--main/gdbm/APKBUILD18
-rw-r--r--main/gdl/APKBUILD6
-rw-r--r--main/geoip/APKBUILD16
-rwxr-xr-xmain/geoip/geoip.cron7
-rw-r--r--main/ghostscript/APKBUILD12
-rw-r--r--main/ghostscript/CVE-2021-3781.patch232
-rw-r--r--main/git/APKBUILD21
-rw-r--r--main/glib/APKBUILD4
-rw-r--r--main/glslang/APKBUILD12
-rw-r--r--main/glslang/default-resources.patch12
-rw-r--r--main/glslang/pkgconfig.patch143
-rw-r--r--main/glu/APKBUILD8
-rw-r--r--main/gnu-efi/0001-Initial-support-for-RISCV64.patch636
-rw-r--r--main/gnu-efi/APKBUILD8
-rw-r--r--main/gnupg/0010-avoid-beta-warning.patch46
-rw-r--r--main/gnupg/0020-avoid-regenerating-defsincdate-use-shipped-file.patch41
-rw-r--r--main/gnupg/0110-avoid-simple-memory-dumps-via-ptrace.patch91
-rw-r--r--main/gnupg/0210-dirmngr-hkp-avoid-potential-race-condition-when-some-host-die.patch83
-rw-r--r--main/gnupg/0220-dirmngr-avoid-need-for-hkp-housekeeping.patch232
-rw-r--r--main/gnupg/0230-dirmngr-avoid-automatically-checking-upstream-swdb.patch51
-rw-r--r--main/gnupg/0310-gpg-default-to-3072-bit-keys.patch93
-rw-r--r--main/gnupg/0320-gpg-default-to-aes256.patch37
-rw-r--r--main/gnupg/0330-gpg-default-to-sha512-for-all-signature-types-on-rsa-keys.patch66
-rw-r--r--main/gnupg/0340-gpg-prefer-sha512-and-sha384-in-personal-digest.patch48
-rw-r--r--main/gnupg/0410-make-gpg-zip-use-tar-from-path.patch29
-rw-r--r--main/gnupg/0420-gpg-drop-import-clean-from-default-keyserver-import-options.patch51
-rw-r--r--main/gnupg/APKBUILD209
-rw-r--r--main/goaccess/APKBUILD4
-rw-r--r--main/gpsd/APKBUILD89
-rw-r--r--main/gpsd/gpsd.confd7
-rw-r--r--main/gpsd/gpsd.initd39
-rw-r--r--main/gpsd/timepps.h216
-rw-r--r--main/graphene/APKBUILD31
-rw-r--r--main/graphene/fix-gnome-shell-touch-issues.patch14
-rw-r--r--main/graphviz/APKBUILD8
-rw-r--r--main/grep/APKBUILD8
-rw-r--r--main/gst-plugins-base/APKBUILD10
-rw-r--r--main/gst-plugins-base/meson-0.58.patch45
-rw-r--r--main/gstreamer/APKBUILD6
-rw-r--r--main/gtk+3.0/APKBUILD10
-rw-r--r--main/gummiboot/APKBUILD46
-rw-r--r--main/gummiboot/gummiboot-aarch64-support.patch231
-rw-r--r--main/gummiboot/remove-conflicts.patch66
-rw-r--r--main/gummiboot/sysmacros.patch12
-rw-r--r--main/gvpe/APKBUILD2
-rw-r--r--main/gzip/APKBUILD8
-rw-r--r--main/haproxy/APKBUILD11
-rw-r--r--main/haproxy/haproxy-openssl-3.patch42
-rw-r--r--main/harfbuzz/APKBUILD6
-rw-r--r--main/heimdal/APKBUILD4
-rw-r--r--main/help2man/APKBUILD6
-rw-r--r--main/hiredis/APKBUILD4
-rw-r--r--main/hostapd/APKBUILD2
-rw-r--r--main/hylafaxplus/APKBUILD10
-rw-r--r--main/hylafaxplus/libtiff-version.patch13
-rw-r--r--main/iaxmodem/APKBUILD7
-rw-r--r--main/icecast/APKBUILD4
-rw-r--r--main/iftop/APKBUILD33
-rw-r--r--main/ifupdown/APKBUILD2
-rw-r--r--main/imap/APKBUILD4
-rw-r--r--main/imlib2/APKBUILD6
-rw-r--r--main/indent/APKBUILD38
-rw-r--r--main/iperf/APKBUILD8
-rw-r--r--main/iperf/long-to-time-t.patch15
-rw-r--r--main/iproute2/APKBUILD14
-rw-r--r--main/ipset/APKBUILD8
-rw-r--r--main/iputils/APKBUILD11
-rw-r--r--main/ircii/APKBUILD31
-rw-r--r--main/irssi/APKBUILD2
-rw-r--r--main/iso-codes/APKBUILD11
-rw-r--r--main/jack/APKBUILD4
-rw-r--r--main/jansson/APKBUILD8
-rw-r--r--main/jitterentropy-library/01-disable-gcc-optimisation.patch26
-rwxr-xr-xmain/jitterentropy-library/APKBUILD19
-rw-r--r--main/kamailio/APKBUILD14
-rw-r--r--main/kmod/APKBUILD2
-rw-r--r--main/knock/APKBUILD15
-rw-r--r--main/knot/APKBUILD6
-rw-r--r--main/krb5/APKBUILD14
-rw-r--r--main/ldb/APKBUILD11
-rw-r--r--main/ldns/APKBUILD22
-rw-r--r--main/less/0001-Shouldn-t-use-memcpy-to-copy-to-overlapping-range.patch28
-rw-r--r--main/less/APKBUILD12
-rw-r--r--main/lftp/APKBUILD2
-rw-r--r--main/libao/APKBUILD42
-rw-r--r--main/libao/CVE-2017-11548.patch177
-rw-r--r--main/libarchive/APKBUILD12
-rw-r--r--main/libasr/APKBUILD2
-rw-r--r--main/libburn/APKBUILD12
-rw-r--r--main/libcap/APKBUILD18
-rw-r--r--main/libcap/restore-capsh-binary.patch38
-rw-r--r--main/libcbor/APKBUILD38
-rw-r--r--main/libconfig/APKBUILD12
-rw-r--r--main/libdnet/APKBUILD22
-rw-r--r--main/libdnet/automake.patch11
-rw-r--r--main/libdrm/APKBUILD4
-rw-r--r--main/libeconf/APKBUILD16
-rw-r--r--main/libeconf/musl-tests.patch14
-rw-r--r--main/libedit/APKBUILD6
-rw-r--r--main/libepoxy/APKBUILD4
-rw-r--r--main/libevent/APKBUILD4
-rw-r--r--main/libfido2/APKBUILD44
-rw-r--r--main/libgcrypt/APKBUILD14
-rw-r--r--main/libgpg-error/APKBUILD8
-rw-r--r--main/libidn/APKBUILD6
-rw-r--r--main/libidn2/APKBUILD6
-rw-r--r--main/libisoburn/APKBUILD8
-rw-r--r--main/libisofs/APKBUILD10
-rw-r--r--main/libjpeg-turbo/APKBUILD6
-rw-r--r--main/libmaxminddb/APKBUILD8
-rw-r--r--main/libmilter/APKBUILD18
-rw-r--r--main/libmnl/APKBUILD12
-rw-r--r--main/libnetfilter_acct/APKBUILD14
-rw-r--r--main/libnetfilter_conntrack/APKBUILD4
-rw-r--r--main/libnetfilter_cthelper/APKBUILD26
-rw-r--r--main/libnetfilter_cttimeout/APKBUILD26
-rw-r--r--main/libnetfilter_log/APKBUILD4
-rw-r--r--main/libnetfilter_queue/APKBUILD4
-rw-r--r--main/libnfnetlink/APKBUILD4
-rw-r--r--main/libpaper/APKBUILD6
-rw-r--r--main/librelp/APKBUILD2
-rw-r--r--main/libretls/APKBUILD28
-rw-r--r--main/libshout/APKBUILD4
-rw-r--r--main/libspf2/APKBUILD14
-rw-r--r--main/libspf2/CVE-2021-20314.patch22
-rw-r--r--main/libsrtp/APKBUILD13
-rw-r--r--main/libsrtp/gcc-10.patch29
-rw-r--r--main/libssh2/APKBUILD12
-rw-r--r--main/libssh2/CVE-2019-17498.patch72
-rw-r--r--main/liburing/APKBUILD6
-rw-r--r--main/libusb-compat/APKBUILD25
-rw-r--r--main/libusb/APKBUILD4
-rw-r--r--main/libuv/APKBUILD6
-rw-r--r--main/libva/APKBUILD6
-rw-r--r--main/libwebp/APKBUILD8
-rw-r--r--main/libwebsockets/APKBUILD13
-rw-r--r--main/libxft/APKBUILD15
-rw-r--r--main/libxft/emoji.patch861
-rw-r--r--main/libxi/APKBUILD9
-rw-r--r--main/libxkbcommon/APKBUILD6
-rw-r--r--main/libxml2/APKBUILD1
-rw-r--r--main/lighttpd/APKBUILD2
-rw-r--r--main/links/APKBUILD2
-rw-r--r--main/linux-firmware/APKBUILD8
-rw-r--r--main/linux-lts/APKBUILD30
-rw-r--r--main/linux-lts/config-lts.aarch6425
-rw-r--r--main/linux-lts/config-lts.armv711
-rw-r--r--main/linux-lts/config-lts.mips646
-rw-r--r--main/linux-lts/config-lts.ppc64le6
-rw-r--r--main/linux-lts/config-lts.s390x6
-rw-r--r--main/linux-lts/config-lts.x869
-rw-r--r--main/linux-lts/config-lts.x86_6412
-rw-r--r--main/linux-lts/config-virt.aarch6424
-rw-r--r--main/linux-lts/config-virt.armv736
-rw-r--r--main/linux-lts/config-virt.ppc64le8
-rw-r--r--main/linux-lts/config-virt.x869
-rw-r--r--main/linux-lts/config-virt.x86_649
-rw-r--r--main/linux-octeon/APKBUILD4
-rw-r--r--main/linux-pam/APKBUILD13
-rw-r--r--main/linux-rpi/APKBUILD15
-rw-r--r--main/lmdb/APKBUILD14
-rw-r--r--main/lockfile-progs/APKBUILD16
-rw-r--r--main/logcheck/APKBUILD6
-rw-r--r--main/logtail/APKBUILD31
-rw-r--r--main/lua-cqueues/APKBUILD2
-rw-r--r--main/lua-mosquitto/APKBUILD8
-rw-r--r--main/lua-ossl/APKBUILD5
-rw-r--r--main/lua-posix/APKBUILD6
-rw-r--r--main/lua-sec/APKBUILD8
-rw-r--r--main/luajit/APKBUILD6
-rw-r--r--main/lxc/APKBUILD8
-rw-r--r--main/lxc/skip-rootfs-pinning-for-ro-fs.patch28
-rw-r--r--main/lynx/APKBUILD24
-rw-r--r--main/lynx/CVE-2021-38165.patch45
-rw-r--r--main/lzip/APKBUILD8
-rw-r--r--main/man-pages/APKBUILD20
-rw-r--r--main/mariadb-connector-c/APKBUILD4
-rw-r--r--main/mariadb/APKBUILD22
-rw-r--r--main/mariadb/fix-cmake.patch13
-rw-r--r--main/mariadb/ppc-remove-glibc-dep.patch13
-rw-r--r--main/mc/APKBUILD11
-rw-r--r--main/memcached/APKBUILD8
-rw-r--r--main/mesa/APKBUILD8
-rw-r--r--main/meson/APKBUILD4
-rw-r--r--main/mini_httpd/APKBUILD2
-rw-r--r--main/mkinitfs/APKBUILD6
-rw-r--r--main/mkinitfs/mkinitfs.trigger7
-rw-r--r--main/monit/APKBUILD10
-rw-r--r--main/mosh/APKBUILD4
-rw-r--r--main/mosquitto/APKBUILD10
-rw-r--r--main/mpg123/APKBUILD6
-rw-r--r--main/mrtg/APKBUILD31
-rw-r--r--main/mtd-utils/APKBUILD6
-rw-r--r--main/mtools/APKBUILD6
-rw-r--r--main/multipath-tools/0001-Disable-Werror-and-O2.patch20
-rw-r--r--main/multipath-tools/APKBUILD8
-rw-r--r--main/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch41
-rw-r--r--main/musl-nscd/APKBUILD14
-rw-r--r--main/musl-nscd/musl-nscd.initd2
-rw-r--r--main/musl/0001-fix-TZ-parsing-logic-for-identifying-POSIX-form-stri.patch57
-rw-r--r--main/musl/APKBUILD14
-rw-r--r--main/musl/eh-frame.patch140
-rw-r--r--main/nagios-plugins/APKBUILD22
-rw-r--r--main/nagios-plugins/check_openrc2
-rw-r--r--main/nagios-plugins/nagios-openrc.doasd (renamed from main/nagios-plugins/nagios-openrc.sudoers)3
-rw-r--r--main/nagios/APKBUILD2
-rw-r--r--main/nano/APKBUILD11
-rw-r--r--main/ncdu/APKBUILD6
-rw-r--r--main/ncurses/APKBUILD5
-rw-r--r--main/neon/APKBUILD2
-rw-r--r--main/net-snmp/0001-snmpd-always-exit-after-displaying-usage.patch50
-rw-r--r--main/net-snmp/APKBUILD14
-rw-r--r--main/net-snmp/Prevent-parsing-IP-address-twice.patch47
-rw-r--r--main/netcat-openbsd/APKBUILD15
-rw-r--r--main/nettle/APKBUILD2
-rw-r--r--main/nfs-utils/APKBUILD4
-rw-r--r--main/nftables/APKBUILD6
-rw-r--r--main/nftables/nftables.nft3
-rw-r--r--main/nghttp2/APKBUILD14
-rw-r--r--main/nginx/APKBUILD22
-rw-r--r--main/ngircd/APKBUILD2
-rw-r--r--main/nikto/APKBUILD16
-rw-r--r--main/nikto/CVE-2018-11652.patch101
-rw-r--r--main/nmap/APKBUILD30
-rw-r--r--main/nodejs/APKBUILD22
-rw-r--r--main/nodejs/fix-build-with-system-c-ares.patch535
-rw-r--r--main/npm/APKBUILD8
-rw-r--r--main/npth/APKBUILD6
-rw-r--r--main/nrpe/APKBUILD2
-rw-r--r--main/nsd/APKBUILD14
-rw-r--r--main/nsd/openssl3.patch85
-rw-r--r--main/nsd/tsig-openssl.patch11
-rw-r--r--main/nspr/APKBUILD4
-rw-r--r--main/ntfs-3g/APKBUILD24
-rw-r--r--main/ntfs-3g/CVE-2019-9755.patch62
-rw-r--r--main/numactl/APKBUILD3
-rw-r--r--main/open-iscsi/APKBUILD16
-rw-r--r--main/open-iscsi/iscsid.confd12
-rw-r--r--main/open-iscsi/iscsid.initd14
-rw-r--r--main/open-isns/APKBUILD2
-rw-r--r--main/openjpeg/APKBUILD33
-rw-r--r--main/openldap/APKBUILD14
-rw-r--r--main/openntpd/APKBUILD2
-rw-r--r--main/openrc/0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch6
-rw-r--r--main/openrc/0002-force-root-be-rw-before-localmount.patch22
-rw-r--r--main/openrc/0002-fsck-don-t-add-C0-to-busybox-fsck.patch (renamed from main/openrc/0001-fsck-don-t-add-C0-to-busybox-fsck.patch)6
-rw-r--r--main/openrc/0003-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch (renamed from main/openrc/0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch)18
-rw-r--r--main/openrc/0004-hide-error-when-migrating-var-run-to-run.patch28
-rw-r--r--main/openrc/0004-make-consolefont-service-compatible-with-busyboxs-se.patch (renamed from main/openrc/0007-make-consolefont-service-compatible-with-busyboxs-se.patch)8
-rw-r--r--main/openrc/0005-Support-early-loading-of-keymap-if-kbd-is-installed.patch (renamed from main/openrc/0009-Support-early-loading-of-keymap-if-kdb-is-installed.patch)9
-rw-r--r--main/openrc/0006-Add-support-for-starting-services-in-a-specified-VRF.patch (renamed from main/openrc/0011-vrf.patch)29
-rw-r--r--main/openrc/0007-Clean-up-staticroute-config-remove-irrelevant-parts-.patch (renamed from main/openrc/0020-staticroute-confd.patch)16
-rw-r--r--main/openrc/0008-fix-undeclared-UT_LINESIZE.patch28
-rw-r--r--main/openrc/0010-rc-mount-make-timeout-invocation-compatible-with-bus.patch27
-rw-r--r--main/openrc/0014-time_t-64bit.patch30
-rw-r--r--main/openrc/APKBUILD44
-rw-r--r--main/opensbi/APKBUILD26
-rw-r--r--main/opensmtpd/APKBUILD2
-rw-r--r--main/openssh/APKBUILD5
-rw-r--r--main/openssl/APKBUILD56
-rw-r--r--main/openssl/man-section.patch51
-rw-r--r--main/openssl1.1-compat/APKBUILD159
-rw-r--r--main/openssl1.1-compat/man-section.patch54
-rw-r--r--main/openssl1.1-compat/ppc64.patch (renamed from main/openssl/ppc64.patch)0
-rw-r--r--main/openvpn-auth-ldap/APKBUILD2
-rw-r--r--main/openvpn/APKBUILD12
-rw-r--r--main/opusfile/APKBUILD38
-rw-r--r--main/opusfile/fix-conflict.patch9
-rw-r--r--main/ortp/APKBUILD4
-rw-r--r--main/p11-kit/APKBUILD6
-rw-r--r--main/pango/APKBUILD4
-rw-r--r--main/parallel/APKBUILD4
-rw-r--r--main/partimage/APKBUILD2
-rw-r--r--main/patch/APKBUILD12
-rw-r--r--main/patch/CVE-2019-20633.patch26
-rw-r--r--main/pax-utils/APKBUILD4
-rw-r--r--main/paxmark/APKBUILD19
-rw-r--r--main/paxmark/paxmark34
-rw-r--r--main/pcre/APKBUILD25
-rw-r--r--main/pcre2/APKBUILD6
-rw-r--r--main/pcsc-lite/APKBUILD8
-rw-r--r--main/perdition/APKBUILD2
-rw-r--r--main/perl-apache-logformat-compiler/APKBUILD6
-rw-r--r--main/perl-apache-session/APKBUILD2
-rw-r--r--main/perl-archive-zip/APKBUILD4
-rw-r--r--main/perl-astro-suntime/APKBUILD2
-rw-r--r--main/perl-async-mergepoint/APKBUILD2
-rw-r--r--main/perl-authen-sasl/APKBUILD2
-rw-r--r--main/perl-b-cow/APKBUILD2
-rw-r--r--main/perl-b-hooks-endofscope/APKBUILD7
-rw-r--r--main/perl-boolean/APKBUILD1
-rw-r--r--main/perl-business-hours/APKBUILD16
-rw-r--r--main/perl-cache-cache/APKBUILD4
-rw-r--r--main/perl-cache-simple-timedexpiry/APKBUILD5
-rw-r--r--main/perl-capture-tiny/APKBUILD5
-rw-r--r--main/perl-carp-clan/APKBUILD5
-rw-r--r--main/perl-carp/APKBUILD1
-rw-r--r--main/perl-cgi-emulate-psgi/APKBUILD15
-rw-r--r--main/perl-cgi-fast/APKBUILD24
-rw-r--r--main/perl-cgi-psgi/APKBUILD10
-rw-r--r--main/perl-cgi-session/APKBUILD1
-rw-r--r--main/perl-cgi/APKBUILD7
-rw-r--r--main/perl-class-accessor/APKBUILD1
-rw-r--r--main/perl-class-data-inheritable/APKBUILD39
-rw-r--r--main/perl-class-inspector/APKBUILD5
-rw-r--r--main/perl-class-load/APKBUILD20
-rw-r--r--main/perl-class-method-modifiers/APKBUILD11
-rw-r--r--main/perl-class-mix/APKBUILD15
-rw-r--r--main/perl-class-returnvalue/APKBUILD5
-rw-r--r--main/perl-class-singleton/APKBUILD1
-rw-r--r--main/perl-class-tiny/APKBUILD2
-rw-r--r--main/perl-clone/APKBUILD2
-rw-r--r--main/perl-common-sense/APKBUILD2
-rw-r--r--main/perl-compress-raw-bzip2/APKBUILD2
-rw-r--r--main/perl-compress-raw-zlib/APKBUILD2
-rw-r--r--main/perl-config-autoconf/APKBUILD8
-rw-r--r--main/perl-config-grammar/APKBUILD7
-rw-r--r--main/perl-config-inifiles/APKBUILD2
-rw-r--r--main/perl-control-x10/APKBUILD3
-rw-r--r--main/perl-convert-asn1/APKBUILD1
-rw-r--r--main/perl-convert-binhex/APKBUILD1
-rw-r--r--main/perl-convert-color/APKBUILD8
-rw-r--r--main/perl-convert-tnef/APKBUILD1
-rw-r--r--main/perl-convert-uulib/APKBUILD8
-rw-r--r--main/perl-cpan-meta-check/APKBUILD17
-rw-r--r--main/perl-cpanel-json-xs/APKBUILD2
-rw-r--r--main/perl-crypt-des/APKBUILD2
-rw-r--r--main/perl-crypt-eksblowfish/APKBUILD2
-rw-r--r--main/perl-crypt-openssl-guess/APKBUILD7
-rw-r--r--main/perl-crypt-openssl-random/APKBUILD2
-rw-r--r--main/perl-crypt-openssl-rsa/APKBUILD33
-rw-r--r--main/perl-crypt-openssl-rsa/no-sslv23-padding.patch15
-rw-r--r--main/perl-crypt-rijndael/APKBUILD2
-rw-r--r--main/perl-crypt-ssleay/APKBUILD2
-rw-r--r--main/perl-crypt-x509/APKBUILD3
-rw-r--r--main/perl-css-minifier-xs/APKBUILD2
-rw-r--r--main/perl-css-squish/APKBUILD2
-rw-r--r--main/perl-data-guid/APKBUILD41
-rw-r--r--main/perl-data-hexdump/APKBUILD1
-rw-r--r--main/perl-data-optlist/APKBUILD41
-rw-r--r--main/perl-data-page/APKBUILD14
-rw-r--r--main/perl-data-uuid/APKBUILD2
-rw-r--r--main/perl-date-format/APKBUILD1
-rw-r--r--main/perl-datetime-format-mail/APKBUILD5
-rw-r--r--main/perl-datetime-format-w3cdtf/APKBUILD1
-rw-r--r--main/perl-datetime-locale/APKBUILD10
-rw-r--r--main/perl-datetime-timezone/APKBUILD1
-rw-r--r--main/perl-datetime/APKBUILD2
-rw-r--r--main/perl-db/APKBUILD6
-rw-r--r--main/perl-dbd-mysql/APKBUILD2
-rw-r--r--main/perl-dbd-odbc/APKBUILD2
-rw-r--r--main/perl-dbd-pg/APKBUILD2
-rw-r--r--main/perl-dbd-sqlite/APKBUILD38
-rw-r--r--main/perl-dbi/APKBUILD22
-rw-r--r--main/perl-dbix-dbschema/APKBUILD5
-rw-r--r--main/perl-dbix-searchbuilder/APKBUILD18
-rw-r--r--main/perl-devel-checkbin/APKBUILD8
-rw-r--r--main/perl-devel-checklib/APKBUILD6
-rw-r--r--main/perl-devel-globaldestruction/APKBUILD7
-rw-r--r--main/perl-devel-overloadinfo/APKBUILD1
-rw-r--r--main/perl-devel-stacktrace-ashtml/APKBUILD4
-rw-r--r--main/perl-devel-stacktrace/APKBUILD2
-rw-r--r--main/perl-devel-symdump/APKBUILD7
-rw-r--r--main/perl-device-serialport/APKBUILD2
-rw-r--r--main/perl-digest-hmac/APKBUILD1
-rw-r--r--main/perl-digest-md5/APKBUILD2
-rw-r--r--main/perl-digest-sha1/APKBUILD2
-rw-r--r--main/perl-dist-checkconflicts/APKBUILD8
-rw-r--r--main/perl-email-address-list/APKBUILD5
-rw-r--r--main/perl-email-address/APKBUILD4
-rw-r--r--main/perl-email-date-format/APKBUILD8
-rw-r--r--main/perl-encode-hanextra/APKBUILD15
-rw-r--r--main/perl-encode-locale/APKBUILD6
-rw-r--r--main/perl-encode/APKBUILD8
-rw-r--r--main/perl-error/APKBUILD1
-rw-r--r--main/perl-eval-closure/APKBUILD8
-rw-r--r--main/perl-exception-class/APKBUILD40
-rw-r--r--main/perl-exporter-tiny/APKBUILD3
-rw-r--r--main/perl-exporter/APKBUILD1
-rw-r--r--main/perl-extutils-cchecker/APKBUILD18
-rw-r--r--main/perl-extutils-config/APKBUILD7
-rw-r--r--main/perl-extutils-helpers/APKBUILD7
-rw-r--r--main/perl-extutils-installpaths/APKBUILD15
-rw-r--r--main/perl-extutils-pkgconfig/APKBUILD15
-rw-r--r--main/perl-fcgi-procmanager/APKBUILD5
-rw-r--r--main/perl-fcgi/APKBUILD9
-rw-r--r--main/perl-file-copy-recursive/APKBUILD5
-rw-r--r--main/perl-file-listing/APKBUILD1
-rw-r--r--main/perl-file-next/APKBUILD1
-rw-r--r--main/perl-file-remove/APKBUILD2
-rw-r--r--main/perl-file-rsync/APKBUILD2
-rw-r--r--main/perl-file-sharedir-install/APKBUILD17
-rw-r--r--main/perl-file-sharedir/APKBUILD2
-rw-r--r--main/perl-file-slurp-tiny/APKBUILD7
-rw-r--r--main/perl-file-slurp/APKBUILD1
-rw-r--r--main/perl-file-slurper/APKBUILD11
-rw-r--r--main/perl-file-tail/APKBUILD15
-rw-r--r--main/perl-file-temp/APKBUILD1
-rw-r--r--main/perl-file-which/APKBUILD1
-rw-r--r--main/perl-filesys-notify-simple/APKBUILD1
-rw-r--r--main/perl-font-afm/APKBUILD7
-rw-r--r--main/perl-future/APKBUILD2
-rw-r--r--main/perl-gd/APKBUILD2
-rw-r--r--main/perl-gdgraph/APKBUILD8
-rw-r--r--main/perl-gdtextutil/APKBUILD7
-rw-r--r--main/perl-getopt-long/APKBUILD11
-rw-r--r--main/perl-hash-multivalue/APKBUILD4
-rw-r--r--main/perl-heap/APKBUILD2
-rw-r--r--main/perl-html-formatter/APKBUILD1
-rw-r--r--main/perl-html-formattext-withlinks-andtables/APKBUILD10
-rw-r--r--main/perl-html-formattext-withlinks/APKBUILD2
-rw-r--r--main/perl-html-mason/APKBUILD7
-rw-r--r--main/perl-html-parser/APKBUILD2
-rw-r--r--main/perl-html-quoted/APKBUILD5
-rw-r--r--main/perl-html-rewriteattributes/APKBUILD17
-rw-r--r--main/perl-html-scrubber/APKBUILD7
-rw-r--r--main/perl-html-tagset/APKBUILD11
-rw-r--r--main/perl-html-tree/APKBUILD14
-rw-r--r--main/perl-http-body/APKBUILD3
-rw-r--r--main/perl-http-cookies/APKBUILD1
-rw-r--r--main/perl-http-daemon/APKBUILD2
-rw-r--r--main/perl-http-date/APKBUILD1
-rw-r--r--main/perl-http-message/APKBUILD5
-rw-r--r--main/perl-http-negotiate/APKBUILD5
-rw-r--r--main/perl-inc-latest/APKBUILD1
-rw-r--r--main/perl-inline-c/APKBUILD7
-rw-r--r--main/perl-inline/APKBUILD1
-rw-r--r--main/perl-io-async/APKBUILD11
-rw-r--r--main/perl-io-captureoutput/APKBUILD6
-rw-r--r--main/perl-io-html/APKBUILD1
-rw-r--r--main/perl-io-multiplex/APKBUILD4
-rw-r--r--main/perl-io-socket-inet6/APKBUILD8
-rw-r--r--main/perl-io-socket-ssl/APKBUILD5
-rw-r--r--main/perl-io-stringy/APKBUILD1
-rw-r--r--main/perl-io-tty/APKBUILD10
-rw-r--r--main/perl-io-tty/disable-failing-test.patch13
-rw-r--r--main/perl-io/APKBUILD28
-rw-r--r--main/perl-ipc-run3/APKBUILD3
-rw-r--r--main/perl-ipc-sharelite/APKBUILD2
-rw-r--r--main/perl-ipc-system-simple/APKBUILD1
-rw-r--r--main/perl-javascript-minifier-xs/APKBUILD2
-rw-r--r--main/perl-javascript-minifier/APKBUILD1
-rw-r--r--main/perl-json-maybexs/APKBUILD1
-rw-r--r--main/perl-json/APKBUILD2
-rw-r--r--main/perl-ldap/APKBUILD7
-rw-r--r--main/perl-libwww/APKBUILD17
-rw-r--r--main/perl-list-allutils/APKBUILD9
-rw-r--r--main/perl-list-moreutils-xs/APKBUILD2
-rw-r--r--main/perl-list-someutils-xs/APKBUILD2
-rw-r--r--main/perl-list-someutils/APKBUILD10
-rw-r--r--main/perl-list-utilsby/APKBUILD9
-rw-r--r--main/perl-locale-maketext-fuzzy/APKBUILD5
-rw-r--r--main/perl-locale-maketext-lexicon/APKBUILD2
-rw-r--r--main/perl-log-any/APKBUILD7
-rw-r--r--main/perl-log-dispatch/APKBUILD7
-rw-r--r--main/perl-lwp-mediatypes/APKBUILD6
-rw-r--r--main/perl-lwp-protocol-https/APKBUILD1
-rw-r--r--main/perl-lwp-useragent-determined/APKBUILD7
-rw-r--r--main/perl-mail-authenticationresults/APKBUILD2
-rw-r--r--main/perl-mail-dkim/APKBUILD15
-rw-r--r--main/perl-mail-domainkeys/APKBUILD1
-rw-r--r--main/perl-mail-imapclient/APKBUILD1
-rw-r--r--main/perl-mail-spf/APKBUILD7
-rw-r--r--main/perl-mailtools/APKBUILD15
-rw-r--r--main/perl-math-round/APKBUILD2
-rw-r--r--main/perl-metrics-any/APKBUILD10
-rw-r--r--main/perl-mime-base64/APKBUILD2
-rw-r--r--main/perl-mime-lite/APKBUILD8
-rw-r--r--main/perl-mime-tools/APKBUILD9
-rw-r--r--main/perl-mime-types/APKBUILD7
-rw-r--r--main/perl-module-implementation/APKBUILD15
-rw-r--r--main/perl-module-install/APKBUILD13
-rw-r--r--main/perl-module-metadata/APKBUILD6
-rw-r--r--main/perl-module-pluggable/APKBUILD7
-rw-r--r--main/perl-module-refresh/APKBUILD17
-rw-r--r--main/perl-module-runtime/APKBUILD16
-rw-r--r--main/perl-module-scandeps/APKBUILD7
-rw-r--r--main/perl-module-util/APKBUILD8
-rw-r--r--main/perl-module-versions-report/APKBUILD2
-rw-r--r--main/perl-moo/APKBUILD1
-rw-r--r--main/perl-mozilla-ca/APKBUILD2
-rw-r--r--main/perl-mro-compat/APKBUILD11
-rw-r--r--main/perl-namespace-autoclean/APKBUILD1
-rw-r--r--main/perl-namespace-clean/APKBUILD7
-rw-r--r--main/perl-net-async-http/APKBUILD5
-rw-r--r--main/perl-net-cidr-lite/APKBUILD1
-rw-r--r--main/perl-net-cidr/APKBUILD1
-rw-r--r--main/perl-net-dns-resolver-mock/APKBUILD1
-rw-r--r--main/perl-net-dns-resolver-programmable/APKBUILD5
-rw-r--r--main/perl-net-dns/APKBUILD7
-rw-r--r--main/perl-net-http/APKBUILD1
-rw-r--r--main/perl-net-ip/APKBUILD1
-rw-r--r--main/perl-net-libidn/APKBUILD2
-rw-r--r--main/perl-net-openssh/APKBUILD1
-rw-r--r--main/perl-net-rblclient/APKBUILD3
-rw-r--r--main/perl-net-server/APKBUILD9
-rw-r--r--main/perl-net-smtp-ssl/APKBUILD15
-rw-r--r--main/perl-net-smtp-tls-butmaintained/APKBUILD7
-rw-r--r--main/perl-net-snmp/APKBUILD4
-rw-r--r--main/perl-net-snpp/APKBUILD4
-rw-r--r--main/perl-net-ssleay/APKBUILD3
-rw-r--r--main/perl-net-telnet/APKBUILD39
-rw-r--r--main/perl-netaddr-ip/APKBUILD2
-rw-r--r--main/perl-package-anon/APKBUILD2
-rw-r--r--main/perl-package-deprecationmanager/APKBUILD9
-rw-r--r--main/perl-package-stash-xs/APKBUILD2
-rw-r--r--main/perl-package-stash/APKBUILD1
-rw-r--r--main/perl-parallel-forkmanager/APKBUILD13
-rw-r--r--main/perl-params-classify/APKBUILD16
-rw-r--r--main/perl-params-util/APKBUILD2
-rw-r--r--main/perl-params-validate/APKBUILD2
-rw-r--r--main/perl-params-validationcompiler/APKBUILD11
-rw-r--r--main/perl-parse-recdescent/APKBUILD9
-rw-r--r--main/perl-parse-syslog/APKBUILD1
-rw-r--r--main/perl-parse-yapp/APKBUILD2
-rw-r--r--main/perl-path-class/APKBUILD8
-rw-r--r--main/perl-path-tiny/APKBUILD1
-rw-r--r--main/perl-pathtools/APKBUILD2
-rw-r--r--main/perl-php-serialization/APKBUILD3
-rw-r--r--main/perl-pod-coverage/APKBUILD1
-rw-r--r--main/perl-pod-parser/APKBUILD1
-rw-r--r--main/perl-posix-strftime-compiler/APKBUILD2
-rw-r--r--main/perl-probe-perl/APKBUILD7
-rw-r--r--main/perl-proc-wait3/APKBUILD2
-rw-r--r--main/perl-protocol-websocket/APKBUILD7
-rw-r--r--main/perl-regexp-common/APKBUILD11
-rw-r--r--main/perl-regexp-ipv6/APKBUILD2
-rw-r--r--main/perl-role-basic/APKBUILD8
-rw-r--r--main/perl-role-tiny/APKBUILD1
-rw-r--r--main/perl-scalar-list-utils/APKBUILD6
-rw-r--r--main/perl-scope-guard/APKBUILD2
-rw-r--r--main/perl-scope-upper/APKBUILD14
-rw-r--r--main/perl-server-starter/APKBUILD9
-rw-r--r--main/perl-set-intspan/APKBUILD5
-rw-r--r--main/perl-snmp-session/APKBUILD1
-rw-r--r--main/perl-socket-getaddrinfo/APKBUILD4
-rw-r--r--main/perl-socket/APKBUILD2
-rw-r--r--main/perl-socket6/APKBUILD2
-rw-r--r--main/perl-specio/APKBUILD1
-rw-r--r--main/perl-stream-buffered/APKBUILD17
-rw-r--r--main/perl-string-shellquote/APKBUILD7
-rw-r--r--main/perl-struct-dumb/APKBUILD3
-rw-r--r--main/perl-sub-exporter-progressive/APKBUILD8
-rw-r--r--main/perl-sub-exporter/APKBUILD41
-rw-r--r--main/perl-sub-identify/APKBUILD18
-rw-r--r--main/perl-sub-info/APKBUILD14
-rw-r--r--main/perl-sub-install/APKBUILD2
-rw-r--r--main/perl-sub-name/APKBUILD2
-rw-r--r--main/perl-sub-quote/APKBUILD9
-rw-r--r--main/perl-sub-uplevel/APKBUILD3
-rw-r--r--main/perl-switch/APKBUILD2
-rw-r--r--main/perl-symbol-global-name/APKBUILD17
-rw-r--r--main/perl-sys-hostname-long/APKBUILD1
-rw-r--r--main/perl-sys-mmap/APKBUILD2
-rw-r--r--main/perl-term-readkey/APKBUILD2
-rw-r--r--main/perl-term-table/APKBUILD6
-rw-r--r--main/perl-test-cpan-meta/APKBUILD12
-rw-r--r--main/perl-test-deep/APKBUILD3
-rw-r--r--main/perl-test-eol/APKBUILD4
-rw-r--r--main/perl-test-exception/APKBUILD7
-rw-r--r--main/perl-test-failwarnings/APKBUILD11
-rw-r--r--main/perl-test-fatal/APKBUILD5
-rw-r--r--main/perl-test-file-sharedir/APKBUILD15
-rw-r--r--main/perl-test-fork/APKBUILD2
-rw-r--r--main/perl-test-harness/APKBUILD10
-rw-r--r--main/perl-test-identity/APKBUILD3
-rw-r--r--main/perl-test-leaktrace/APKBUILD2
-rw-r--r--main/perl-test-longstring/APKBUILD4
-rw-r--r--main/perl-test-manifest/APKBUILD1
-rw-r--r--main/perl-test-metrics-any/APKBUILD2
-rw-r--r--main/perl-test-mockmodule/APKBUILD37
-rw-r--r--main/perl-test-mockrandom/APKBUILD10
-rw-r--r--main/perl-test-mocktime/APKBUILD15
-rw-r--r--main/perl-test-needs/APKBUILD27
-rw-r--r--main/perl-test-notabs/APKBUILD14
-rw-r--r--main/perl-test-nowarnings/APKBUILD43
-rw-r--r--main/perl-test-number-delta/APKBUILD5
-rw-r--r--main/perl-test-output/APKBUILD1
-rw-r--r--main/perl-test-pod-coverage/APKBUILD1
-rw-r--r--main/perl-test-pod/APKBUILD15
-rw-r--r--main/perl-test-refcount/APKBUILD3
-rw-r--r--main/perl-test-requires/APKBUILD1
-rw-r--r--main/perl-test-requiresinternet/APKBUILD9
-rw-r--r--main/perl-test-sharedfork/APKBUILD1
-rw-r--r--main/perl-test-simple/APKBUILD5
-rw-r--r--main/perl-test-taint/APKBUILD2
-rw-r--r--main/perl-test-tcp/APKBUILD8
-rw-r--r--main/perl-test-warn/APKBUILD3
-rw-r--r--main/perl-test-warnings/APKBUILD10
-rw-r--r--main/perl-test-without-module/APKBUILD1
-rw-r--r--main/perl-test-without/APKBUILD1
-rw-r--r--main/perl-test2-plugin-nowarnings/APKBUILD3
-rw-r--r--main/perl-test2-suite/APKBUILD5
-rw-r--r--main/perl-text-autoformat/APKBUILD4
-rw-r--r--main/perl-text-csv/APKBUILD12
-rw-r--r--main/perl-text-password-pronounceable/APKBUILD5
-rw-r--r--main/perl-text-reform/APKBUILD1
-rw-r--r--main/perl-text-soundex/APKBUILD2
-rw-r--r--main/perl-text-vfile-asdata/APKBUILD7
-rw-r--r--main/perl-text-wikiformat/APKBUILD8
-rw-r--r--main/perl-text-wrapper/APKBUILD14
-rw-r--r--main/perl-time-hires/APKBUILD2
-rw-r--r--main/perl-time-parsedate/APKBUILD2
-rw-r--r--main/perl-timedate/APKBUILD1
-rw-r--r--main/perl-tk/APKBUILD2
-rw-r--r--main/perl-tree-dag_node/APKBUILD1
-rw-r--r--main/perl-try-tiny/APKBUILD4
-rw-r--r--main/perl-type-tiny/APKBUILD5
-rw-r--r--main/perl-universal-can/APKBUILD7
-rw-r--r--main/perl-universal-isa/APKBUILD7
-rw-r--r--main/perl-unix-syslog/APKBUILD2
-rw-r--r--main/perl-uri/APKBUILD1
-rw-r--r--main/perl-variable-magic/APKBUILD2
-rw-r--r--main/perl-want/APKBUILD2
-rw-r--r--main/perl-www-robotrules/APKBUILD5
-rw-r--r--main/perl-x10/APKBUILD1
-rw-r--r--main/perl-xml-namespacesupport/APKBUILD21
-rw-r--r--main/perl-xml-parser/APKBUILD2
-rw-r--r--main/perl-xml-sax-base/APKBUILD35
-rw-r--r--main/perl-xml-sax/APKBUILD6
-rw-r--r--main/perl-xml-simple/APKBUILD6
-rw-r--r--main/perl-xml-xpath/APKBUILD4
-rw-r--r--main/perl-yaml-libyaml/APKBUILD8
-rw-r--r--main/perl-yaml-syck/APKBUILD2
-rw-r--r--main/perl-yaml-tiny/APKBUILD16
-rw-r--r--main/perl-yaml/APKBUILD1
-rw-r--r--main/perl/APKBUILD18
-rw-r--r--main/perl/CVE-2021-36770.patch29
-rw-r--r--main/perl/skip-test-due-to-busybox-ps.patch9
-rw-r--r--main/pgpool/APKBUILD8
-rw-r--r--main/pinentry/APKBUILD47
-rw-r--r--main/pinentry/pinentry-curses-ss.post-install9
-rw-r--r--main/pinentry/pinentry.post-install9
-rw-r--r--main/pinentry/pinentry.post-upgrade12
-rw-r--r--main/pjproject/APKBUILD29
-rw-r--r--main/pjproject/execinfo.patch78
-rw-r--r--main/pjproject/fix-bb-cp-uniqueness.patch12
-rw-r--r--main/pjproject/libpjsua2-install.patch26
-rw-r--r--main/pkgconf/APKBUILD6
-rw-r--r--main/poppler/APKBUILD9
-rw-r--r--main/poppler/dont-enforce-build-type.patch26
-rw-r--r--main/postfix/APKBUILD8
-rw-r--r--main/postgresql-bdr/APKBUILD16
-rw-r--r--main/postgresql/APKBUILD22
-rw-r--r--main/postgresql/pgcrypto-22e1943f13b66df22ea4f8d15836411ba259263a.patch41
-rw-r--r--main/postgresql/pgcrypto-318df802355924015d4d8f21859bc0ef7a348970.patch41
-rw-r--r--main/postgresql/pgcrypto-72bbff4cd6eaf55239ccef79cec61766b5f8f1d2.patch1308
-rw-r--r--main/pound/APKBUILD14
-rw-r--r--main/pound/dhparam.patch15
-rw-r--r--main/powertop/APKBUILD10
-rw-r--r--main/ppp/APKBUILD2
-rw-r--r--main/proxychains-ng/APKBUILD6
-rw-r--r--main/pspg/APKBUILD4
-rw-r--r--main/psqlodbc/APKBUILD6
-rw-r--r--main/putty/APKBUILD6
-rw-r--r--main/py3-coverage/APKBUILD8
-rw-r--r--main/py3-cryptography/APKBUILD50
-rw-r--r--main/py3-dbus/APKBUILD8
-rw-r--r--main/py3-distlib/APKBUILD8
-rw-r--r--main/py3-hypothesis/APKBUILD4
-rw-r--r--main/py3-mako/APKBUILD8
-rw-r--r--main/py3-monotonic/APKBUILD15
-rw-r--r--main/py3-more-itertools/APKBUILD4
-rw-r--r--main/py3-ordered-set/APKBUILD4
-rw-r--r--main/py3-paramiko/APKBUILD56
-rw-r--r--main/py3-pygments/APKBUILD4
-rw-r--r--main/py3-pytest/0001-remove-setuptools_scm.patch4
-rw-r--r--main/py3-pytest/APKBUILD6
-rw-r--r--main/py3-setuptools/APKBUILD4
-rw-r--r--main/py3-sphinxcontrib-websupport/APKBUILD8
-rw-r--r--main/py3-testtools/APKBUILD18
-rw-r--r--main/py3-testtools/traceback2.patch10
-rw-r--r--main/py3-urllib3/APKBUILD4
-rw-r--r--main/py3-virtualenv/APKBUILD8
-rw-r--r--main/python3/APKBUILD12
-rw-r--r--main/rabbitmq-c/APKBUILD8
-rw-r--r--main/radvd/APKBUILD10
-rw-r--r--main/radvd/radvd.confd5
-rw-r--r--main/radvd/radvd.initd18
-rw-r--r--main/raspberrypi-bootloader/APKBUILD4
-rw-r--r--main/razor/APKBUILD2
-rw-r--r--main/rdesktop/APKBUILD63
-rw-r--r--main/readline/APKBUILD14
-rw-r--r--main/readline/fix-ncurses-underlinking.patch4
-rw-r--r--main/redis/APKBUILD6
-rw-r--r--main/rhash/APKBUILD11
-rw-r--r--main/rng-tools/01-fix-pthread-setaffinity-call.patch54
-rw-r--r--main/rng-tools/APKBUILD22
-rw-r--r--main/rrdtool/APKBUILD2
-rw-r--r--main/rsnapshot/APKBUILD8
-rw-r--r--main/rssh/APKBUILD21
-rw-r--r--main/rssh/check-command-line-after-chroot.patch30
-rw-r--r--main/rssh/verify-scp-options.patch89
-rw-r--r--main/rsync/APKBUILD7
-rw-r--r--main/rsync/Fix-regression-with---delay-updates.patch26
-rw-r--r--main/rsyslog/APKBUILD10
-rw-r--r--main/rsyslog/rsyslog.conf10
-rw-r--r--main/ruby-bundler/APKBUILD4
-rw-r--r--main/ruby/APKBUILD12
-rw-r--r--main/ruby/remove-broken-autoconf-section.patch30
-rw-r--r--main/run-parts/APKBUILD2
-rw-r--r--main/s390-tools/APKBUILD4
-rw-r--r--main/samba/APKBUILD10
-rw-r--r--main/samba/vfs_btrfs_14790.patch45
-rw-r--r--main/sbsigntool/APKBUILD4
-rw-r--r--main/scons/APKBUILD32
-rw-r--r--main/serf/APKBUILD2
-rw-r--r--main/shorewall/APKBUILD10
-rw-r--r--main/shorewall/shorewall-find.patch58
-rw-r--r--main/sipcalc/APKBUILD38
-rw-r--r--main/sipp/APKBUILD2
-rw-r--r--main/sipsak/APKBUILD2
-rw-r--r--main/skalibs/APKBUILD3
-rw-r--r--main/smokeping/APKBUILD2
-rw-r--r--main/sngtc_client/APKBUILD16
-rw-r--r--main/snort/APKBUILD15
-rw-r--r--main/snort/gcc-10.patch113
-rw-r--r--main/socat/APKBUILD2
-rw-r--r--main/sofia-sip/APKBUILD10
-rw-r--r--main/softhsm/APKBUILD2
-rw-r--r--main/source-highlight/APKBUILD12
-rw-r--r--main/spamassassin/APKBUILD4
-rw-r--r--main/spandsp/APKBUILD2
-rw-r--r--main/spice/APKBUILD18
-rw-r--r--main/spice/CVE-2021-20201.patch36
-rw-r--r--main/spice/failing-tests.patch34
-rw-r--r--main/spice/fix-build.patch7
-rw-r--r--main/sqlite-tcl/APKBUILD8
-rw-r--r--main/sqlite/APKBUILD15
-rw-r--r--main/sqlite/license.txt33
-rw-r--r--main/squashfs-tools/APKBUILD16
-rw-r--r--main/squashfs-tools/gcc-10.patch14
-rw-r--r--main/squid/APKBUILD12
-rw-r--r--main/ssmtp/APKBUILD4
-rw-r--r--main/strace/APKBUILD11
-rw-r--r--main/strongswan/APKBUILD4
-rw-r--r--main/subunit/APKBUILD2
-rw-r--r--main/subversion/APKBUILD2
-rw-r--r--main/sudo/APKBUILD6
-rw-r--r--main/swish-e/APKBUILD2
-rw-r--r--main/syslog-ng/APKBUILD4
-rw-r--r--main/talloc/APKBUILD10
-rw-r--r--main/tarsnap/APKBUILD2
-rw-r--r--main/tcl-tls/APKBUILD2
-rw-r--r--main/tcl/APKBUILD19
-rw-r--r--main/tcpdump/APKBUILD4
-rw-r--r--main/tcpflow/APKBUILD2
-rw-r--r--main/tdb/APKBUILD8
-rw-r--r--main/testdisk/APKBUILD2
-rw-r--r--main/tevent/APKBUILD12
-rw-r--r--main/texinfo/APKBUILD8
-rw-r--r--main/texinfo/fix-build-without-NLS.patch12
-rw-r--r--main/thin-provisioning-tools/APKBUILD35
-rw-r--r--main/thin-provisioning-tools/page-size.patch11
-rw-r--r--main/thin-provisioning-tools/paths.patch30
-rw-r--r--main/tiff/APKBUILD10
-rw-r--r--main/tinc/APKBUILD2
-rw-r--r--main/tk/APKBUILD15
-rw-r--r--main/tmux/APKBUILD6
-rw-r--r--main/ttf-freefont/APKBUILD10
-rw-r--r--main/u-boot/APKBUILD42
-rw-r--r--main/udev-init-scripts/APKBUILD8
-rw-r--r--main/udev-init-scripts/modloop.patch10
-rw-r--r--main/ulogd/APKBUILD4
-rw-r--r--main/umurmur/APKBUILD11
-rw-r--r--main/umurmur/remove-crypto-mem-ctrl.patch11
-rw-r--r--main/unbound/APKBUILD6
-rw-r--r--main/unzip/APKBUILD12
-rw-r--r--main/unzip/CVE-2018-18384.patch13
-rw-r--r--main/usbutils/APKBUILD14
-rw-r--r--main/util-linux/APKBUILD69
-rw-r--r--main/utmps/APKBUILD4
-rw-r--r--main/vala/APKBUILD4
-rw-r--r--main/valgrind/APKBUILD8
-rw-r--r--main/varnish/APKBUILD41
-rw-r--r--main/varnish/maxminddb.vcl78
-rw-r--r--main/varnish/musl-include-vpf.patch15
-rw-r--r--main/varnish/musl-include-vsb.patch15
-rw-r--r--main/varnish/varnishd.confd2
-rw-r--r--main/varnish/varnishd.initd25
-rw-r--r--main/vde2/APKBUILD2
-rw-r--r--main/vim/APKBUILD8
-rw-r--r--main/wayland-protocols/APKBUILD4
-rw-r--r--main/wget/APKBUILD6
-rw-r--r--main/which/APKBUILD15
-rw-r--r--main/wireguard-tools/APKBUILD6
-rw-r--r--main/wireless-regdb/APKBUILD6
-rw-r--r--main/wpa_supplicant/APKBUILD4
-rw-r--r--main/wpa_supplicant/config2
-rw-r--r--main/xen/0001-xen-arm-Create-dom0less-domUs-earlier.patch85
-rw-r--r--main/xen/0002-xen-arm-Boot-modules-should-always-be-scrubbed-if-bo.patch59
-rw-r--r--main/xen/APKBUILD45
-rw-r--r--main/xen/stubdom-hack.patch11
-rw-r--r--main/xen/xsa373-4.15-1.patch120
-rw-r--r--main/xen/xsa373-4.15-2.patch102
-rw-r--r--main/xen/xsa373-4.15-3.patch163
-rw-r--r--main/xen/xsa373-4.15-4.patch79
-rw-r--r--main/xen/xsa373-4.15-5.patch141
-rw-r--r--main/xen/xsa375.patch50
-rw-r--r--main/xen/xsa377.patch27
-rw-r--r--main/xfsprogs/APKBUILD4
-rw-r--r--main/xmlindent/APKBUILD29
-rw-r--r--main/xorgproto/APKBUILD4
-rw-r--r--main/xtables-addons-lts/APKBUILD2
-rw-r--r--main/yajl/APKBUILD4
-rw-r--r--main/zfs-lts/APKBUILD2
-rw-r--r--main/zfs-rpi/APKBUILD2
-rw-r--r--main/zfs/APKBUILD2
-rw-r--r--main/zsh/APKBUILD8
-rw-r--r--main/zstd/APKBUILD17
-rw-r--r--main/zstd/Reduce-memory-usage-of-MT-CLI-tests.patch27
1039 files changed, 12817 insertions, 10665 deletions
diff --git a/main/a52dec/APKBUILD b/main/a52dec/APKBUILD
deleted file mode 100644
index 78fb877a7f..0000000000
--- a/main/a52dec/APKBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=a52dec
-pkgver=0.7.4
-pkgrel=7
-pkgdesc="A free library for decoding ATSC A/52 streams."
-url="http://liba52.sourceforge.net/"
-arch="all"
-license="GPL-2.0-or-later"
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="autoconf automake libtool linux-headers"
-source="http://liba52.sourceforge.net/files/$pkgname-$pkgver.tar.gz
- automake.patch
- fix-globals-test-x86-pie.patch
- $pkgname-$pkgver-build.patch
- "
-
-builddir="$srcdir/$pkgname-$pkgver"
-prepare() {
- default_prepare
- update_config_sub
- libtoolize --force && \
- aclocal && autoconf && automake --add-missing
-}
-
-build() {
- cd "$builddir"
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --enable-shared
- make
-}
-
-check() {
- cd "$builddir"
- make check
-}
-
-package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
- install -m644 liba52/a52_internal.h "$pkgdir"/usr/include/a52dec/
-}
-
-sha512sums="4b26fe9492f218b775fb190b76ecf06edaeb656adfe6dcbd24d0a0f86871c3ba917edb88a398eb12dccedaa1605b6f0a0be06b09f9fddd9a46e457b7dd244848 a52dec-0.7.4.tar.gz
-4a832b7e13e19ba00b1fcf5ddbdcca416ee71818f2fd77f19114d7f98fb41dbd04f906eb78f403dc27324d7e8bd8ec4e0b670139a27b49a7acdb2e3cf88d8d12 automake.patch
-b8dbcdc817531bc737ee689a1a8fc76ba40462397ca95286fe834795a09df04cd68010ca6105c8e56392328bec00c838372ab28324c5428421d44824109ea6ec fix-globals-test-x86-pie.patch
-eee40a2871c00fc704fa49d3192a41ceadc4cf7e80d7d7cf368aa2a3e7ebb786f39ef835bdffca5685bf054316a9bacf87556b9a0c90868dbf29e7269873806e a52dec-0.7.4-build.patch"
diff --git a/main/a52dec/a52dec-0.7.4-build.patch b/main/a52dec/a52dec-0.7.4-build.patch
deleted file mode 100644
index f3a29f303c..0000000000
--- a/main/a52dec/a52dec-0.7.4-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur a52dec-0.7.4.orig/liba52/Makefile.am a52dec-0.7.4/liba52/Makefile.am
---- a52dec-0.7.4.orig/liba52/Makefile.am 2002-01-27 20:36:48.000000000 -0800
-+++ a52dec-0.7.4/liba52/Makefile.am 2004-11-05 01:10:21.317401872 -0800
-@@ -1,4 +1,3 @@
--CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
-
- lib_LTLIBRARIES = liba52.la
-
-diff -Naur a52dec-0.7.4.orig/liba52/configure.incl a52dec-0.7.4/liba52/configure.incl
---- a52dec-0.7.4.orig/liba52/configure.incl 2002-01-27 20:36:48.000000000 -0800
-+++ a52dec-0.7.4/liba52/configure.incl 2004-11-05 01:11:38.172672216 -0800
-@@ -2,7 +2,6 @@
- AC_SUBST([LIBA52_LIBS])
-
- dnl avoid -fPIC when possible
--LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
-
- AC_ARG_ENABLE([double],
- [ --enable-double use double-precision samples])
-diff -Naur a52dec-0.7.4.orig/src/Makefile.am a52dec-0.7.4/src/Makefile.am
---- a52dec-0.7.4.orig/src/Makefile.am 2002-06-22 18:51:57.000000000 -0700
-+++ a52dec-0.7.4/src/Makefile.am 2004-11-05 01:10:21.320401375 -0800
-@@ -1,4 +1,3 @@
--CFLAGS = @A52DEC_CFLAGS@
-
- bin_PROGRAMS = a52dec extract_a52
- a52dec_SOURCES = a52dec.c getopt.c gettimeofday.c
diff --git a/main/a52dec/automake.patch b/main/a52dec/automake.patch
deleted file mode 100644
index 42231e040b..0000000000
--- a/main/a52dec/automake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.in.orig 2013-04-23 12:43:16.258733686 +0000
-+++ ./configure.in 2013-04-23 12:43:32.922233281 +0000
-@@ -6,7 +6,7 @@
- AC_CONFIG_FILES([Makefile autotools/Makefile include/Makefile test/Makefile
- doc/Makefile src/Makefile liba52/Makefile libao/Makefile vc++/Makefile])
- AM_INIT_AUTOMAKE([a52dec],[0.7.4])
--AM_CONFIG_HEADER(include/config.h)
-+AC_CONFIG_HEADERS(include/config.h)
- AM_MAINTAINER_MODE
- AC_CANONICAL_HOST
-
diff --git a/main/a52dec/fix-globals-test-x86-pie.patch b/main/a52dec/fix-globals-test-x86-pie.patch
deleted file mode 100644
index da227a1397..0000000000
--- a/main/a52dec/fix-globals-test-x86-pie.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a52dec-0.7.4.orig/test/globals
-+++ a52dec-0.7.4/test/globals
-@@ -13,7 +13,7 @@
- builddir=`cd $builddir;pwd`
-
- bad_globals=`nm -g --defined-only $builddir/../liba52/*.o|\
-- awk '{if ($3) print $3}'|grep -v '^_\?a52_'`
-+ awk '{if ($3) print $3}'|grep -v '^_\?a52_'`|grep -v '^__x86.get_pc_thunk.'
-
- if test x"$bad_globals" != x""; then
- echo BAD GLOBAL SYMBOLS:
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 5308962506..b614116d27 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,7 +2,7 @@
pkgname=abuild
pkgver=3.8.0_rc4
_ver=${pkgver%_git*}
-pkgrel=0
+pkgrel=1
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch="all"
diff --git a/main/acpica/APKBUILD b/main/acpica/APKBUILD
index 6dbec75f36..f652e83f66 100644
--- a/main/acpica/APKBUILD
+++ b/main/acpica/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Roger Pau Monne <roger.pau@entel.upc.edu>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=acpica
-pkgver=20210331
+pkgver=20210730
pkgrel=0
pkgdesc="ACPI Component Architecture utilities"
url="https://www.acpica.org"
@@ -29,5 +29,7 @@ iasl() {
mv "$pkgdir"/usr/bin/iasl "$subpkgdir"/usr/bin/
}
-sha512sums="f247162db70181b6c2b294dab2c7e220a7a125ae474ebeeea9243faca361b1ab392b62f58d66719bcb54f09e37ed533e9f68f56d9ea23976e41f274966207949 acpica-unix-20210331.tar.gz
-1f5049568d612d4debf3690e0d918d8d56abbed14ade7b2e6282eba17b25934b695d1a9fe10f99469efe8d4382c4546481d0579afdf5cdb9695fcdc93559fbab disable-werror.patch"
+sha512sums="
+d180cca695175880a29e580e653a9bbeca4863423c06155e50ef687c2690b737017abf1d4af6a8f9acec896c959c26665a6aff8f87db95e36924123995284f22 acpica-unix-20210730.tar.gz
+1f5049568d612d4debf3690e0d918d8d56abbed14ade7b2e6282eba17b25934b695d1a9fe10f99469efe8d4382c4546481d0579afdf5cdb9695fcdc93559fbab disable-werror.patch
+"
diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD
index bf75a3586a..2992992554 100644
--- a/main/alpine-base/APKBUILD
+++ b/main/alpine-base/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-base
-pkgver=3.14.0
+pkgver=3.15.0_alpha20210804
pkgrel=0
pkgdesc="Meta package for minimal alpine base"
url="https://alpinelinux.org"
diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index 29f97c7f7a..4825ea730c 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-baselayout
pkgver=3.2.0
-pkgrel=15
+pkgrel=18
pkgdesc="Alpine base dir structure and init scripts"
url="https://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
arch="all"
@@ -238,13 +238,13 @@ sha512sums="
7fcb5df98b0f19e609cb9444b2e6ca5ee97f5f308eb407436acdd0115781623fd89768a9285e9816e36778e565b6f27055f2a586a58f19d6d880de5446d263c4 color_prompt.sh.disabled
b2fc9b72846a43a45ba9a8749e581cef34d1915836833b51b7919dfbf4e275b7d55fec4dea7b23df3796380910971a41331e53e8cf0d304834e3da02cc135e5a locale.sh
bfe947bdd69e7d93b32c8cb4e2cabe5717cb6c1e1f49a74015ac2cfb13e96d1f12c4be23ae93a1d61aaa3760d33a032fa9bd99f227fb21223a76b5f5908acc65 aliases.conf
-0b93db8ba1b5d16b2c23f9b6daea27a3a76c059a1f5ea0369af526ea3f4ff92a6040face89e95c45cf7daaa7a663f229df0f6c1ba24073ef4b2f7b74b298fdae blacklist.conf
+0a1e1afa580751e80bf26057b65fadffe269c0552e7a1903de498f94973ba3da8453b51f25e649968ca5f4841266f5ccf951700fa28465a8614b83d07344de60 blacklist.conf
49109d434b577563849c43dd8141961ca798dada74d4d3f49003dac1911f522c43438b8241fa254e4faacdd90058f4d39a7d69b1f493f6d57422c1f706547c95 i386.conf
9dda8c9d1896baf1217aa05ae2936e909300a22a98da9f4c3ba29136852477bf4764321b6a1abb15e93ee58f4a6e77ddfc42cbb12cbbb53cf0f431ace444f72f kms.conf
806b8f23f823a9471846d12fa6b55690b95eedb4c613b82aefaba7ffef23f83e17552befd891a487864f72ef24e395d8611738933f684a85eb4c336cb20994f8 group
fdab6f8fec2a556ab817d90a73635a927ea04dbc4e0470ed59ee6a62c87393f9534c9b746b09a776d938c25b8af9c9fb1686578e24f8307d1d074921ade1bdc7 inittab
06d12a7b9ca14fe17e412d0f24814620b67d035ae859be7906cbf4782dd69e359a6a555dafb98060b7fb7e4714aaa676c88d9017cded36e6d8398e23369bb290 passwd
-73cad571186f8c3202ca87af3d735d85b276a0e0c0877fc6f248de22a57f5995963173d6265dff42e0534c9dc96c2ad09bb21ded6add94dc01363382b95da10f profile
+b14920eae431d1f15b066e264a94f804540c5dcbf91caef034019d95456c975c0c054672e53369082682dd9454a034f26bd45b312adfc0ab68a0311d97b037ac profile
eadc83e47fcc354ab83fd109bee452bda170886fb684e67faf615930c11480919505f4af60c685b124efc54af0ded9522663132f911eac6622144f8b4c8be695 protocols-6.2
adfae0d2f569c2a2f413b7e27683a007fc8ca689b8c3349672fe0dcb6208c192ede4402eff09c604b7e7b4fd9d8df93b875efa5bdaa6c14ff1d8022a7caad5cd services-6.2
"
diff --git a/main/alpine-baselayout/blacklist.conf b/main/alpine-baselayout/blacklist.conf
index 76c3fb75cd..1cf7e1aa24 100644
--- a/main/alpine-baselayout/blacklist.conf
+++ b/main/alpine-baselayout/blacklist.conf
@@ -78,3 +78,7 @@ blacklist hfcsusb
blacklist e_powersaver
blacklist microcode
+
+# needs init config, not compatible with acpid
+# https://gitlab.alpinelinux.org/alpine/aports/-/issues/12999
+blacklist tiny_power_button
diff --git a/main/alpine-baselayout/profile b/main/alpine-baselayout/profile
index 45caac1d92..fd7506b96f 100644
--- a/main/alpine-baselayout/profile
+++ b/main/alpine-baselayout/profile
@@ -1,4 +1,24 @@
-export PATH="$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+# Append "$1" to $PATH when not already in.
+# Copied from Arch Linux, see #12803 for details.
+append_path () {
+ case ":$PATH:" in
+ *:"$1":*)
+ ;;
+ *)
+ PATH="${PATH:+$PATH:}$1"
+ ;;
+ esac
+}
+
+append_path "/usr/local/sbin"
+append_path "/usr/local/bin"
+append_path "/usr/sbin"
+append_path "/usr/bin"
+append_path "/sbin"
+append_path "/bin"
+unset -f append_path
+
+export PATH
export PAGER=less
umask 022
@@ -18,7 +38,8 @@ PS1='${HOSTNAME%%.*}:$PWD'
export PS1
for script in /etc/profile.d/*.sh ; do
- if [ -r $script ] ; then
- . $script
- fi
+ if [ -r "$script" ] ; then
+ . "$script"
+ fi
done
+unset script
diff --git a/main/alsa-lib/1.2.5-load_all_cards.patch b/main/alsa-lib/1.2.5-load_all_cards.patch
deleted file mode 100644
index 88ce8f5023..0000000000
--- a/main/alsa-lib/1.2.5-load_all_cards.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From ddfc32abf5697de1618b9e7ffdf57a0f97013090 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 2 Jun 2021 08:49:32 +0200
-Subject: [PATCH] conf: fix load_for_all_cards()
-
-The 63f7745b commit is loading the driver specific configuration
-multiple times which ends with the array merges (see the bug).
-
-Introduce the loaded compound which traces the already loaded
-driver configurations and skip the multiple load requests.
-
-Fixes: https://github.com/alsa-project/alsa-lib/issues/143
-Fixes: 63f7745b ("conf: extend load_for_all_cards hook (id/value table)")
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- src/conf.c | 33 ++++++++++++++++++++++++++++-----
- 1 file changed, 28 insertions(+), 5 deletions(-)
-
-diff --git a/src/conf.c b/src/conf.c
-index f6c80031..d863dec6 100644
---- a/src/conf.c
-+++ b/src/conf.c
-@@ -4325,18 +4325,23 @@ static int _snd_config_hook_table(snd_config_t *root, snd_config_t *config, snd_
- int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config, snd_config_t **dst, snd_config_t *private_data ATTRIBUTE_UNUSED)
- {
- int card = -1, err;
-+ snd_config_t *loaded; // trace loaded cards
-
-+ err = snd_config_top(&loaded);
-+ if (err < 0)
-+ return err;
- do {
- err = snd_card_next(&card);
- if (err < 0)
-- return err;
-+ goto __fin_err;
- if (card >= 0) {
-- snd_config_t *n, *private_data = NULL;
-+ snd_config_t *n, *m, *private_data = NULL;
- const char *driver;
- char *fdriver = NULL;
-+ bool load;
- err = snd_determine_driver(card, &fdriver);
- if (err < 0)
-- return err;
-+ goto __fin_err;
- if (snd_config_search(root, fdriver, &n) >= 0) {
- if (snd_config_get_string(n, &driver) < 0) {
- if (snd_config_get_type(n) == SND_CONFIG_TYPE_COMPOUND) {
-@@ -4357,6 +4362,19 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
- driver = fdriver;
- }
- __std:
-+ load = true;
-+ err = snd_config_imake_integer(&m, driver, 1);
-+ if (err < 0)
-+ goto __err;
-+ err = snd_config_add(loaded, m);
-+ if (err < 0) {
-+ if (err == -EEXIST) {
-+ snd_config_delete(m);
-+ load = false;
-+ } else {
-+ goto __err;
-+ }
-+ }
- private_data = _snd_config_hook_private_data(card, driver);
- if (!private_data) {
- err = -ENOMEM;
-@@ -4365,17 +4383,22 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
- err = _snd_config_hook_table(root, config, private_data);
- if (err < 0)
- goto __err;
-- err = snd_config_hook_load(root, config, &n, private_data);
-+ if (load)
-+ err = snd_config_hook_load(root, config, &n, private_data);
- __err:
- if (private_data)
- snd_config_delete(private_data);
- free(fdriver);
- if (err < 0)
-- return err;
-+ goto __fin_err;
- }
- } while (card >= 0);
-+ snd_config_delete(loaded);
- *dst = NULL;
- return 0;
-+__fin_err:
-+ snd_config_delete(loaded);
-+ return err;
- }
- #ifndef DOC_HIDDEN
- SND_DLSYM_BUILD_VERSION(snd_config_hook_load_for_all_cards, SND_CONFIG_DLSYM_VERSION_HOOK);
diff --git a/main/alsa-lib/1.2.5-private_device_prefix1.patch b/main/alsa-lib/1.2.5-private_device_prefix1.patch
deleted file mode 100644
index 3703f80965..0000000000
--- a/main/alsa-lib/1.2.5-private_device_prefix1.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 0e4ba2ea8c0402f12a645032a14693eb9b1278e6 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 2 Jun 2021 11:09:43 +0200
-Subject: [PATCH] ucm: add _alibpref to get the private device prefix
-
-It may be useful to get the device prefix for the local configuration.
-
-Link: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1251
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- include/use-case.h | 1 +
- src/ucm/main.c | 21 +++++++++++++++++++++
- 2 files changed, 22 insertions(+)
-
-diff --git a/include/use-case.h b/include/use-case.h
-index ec1a97b0..7890358b 100644
---- a/include/use-case.h
-+++ b/include/use-case.h
-@@ -258,6 +258,7 @@ int snd_use_case_get_list(snd_use_case_mgr_t *uc_mgr,
- * - _verb - return current verb
- * - _file - return configuration file loaded for current card
- * - _alibcfg - return private alsa-lib's configuration for current card
-+ * - _alibpref - return private alsa-lib's configuration device prefix for current card
- *
- * - [=]{NAME}[/[{modifier}|{/device}][/{verb}]]
- * - value identifier {NAME}
-diff --git a/src/ucm/main.c b/src/ucm/main.c
-index 361952f6..3c9ea15d 100644
---- a/src/ucm/main.c
-+++ b/src/ucm/main.c
-@@ -2138,6 +2138,25 @@ static int get_alibcfg(snd_use_case_mgr_t *uc_mgr, char **str)
- return 0;
- }
-
-+/**
-+ * \brief Get device prefix for private alsa-lib configuration
-+ * \param uc_mgr Use case manager
-+ * \param str Returned value string
-+ * \return Zero on success (value is filled), otherwise a negative error code
-+ */
-+static int get_alibpref(snd_use_case_mgr_t *uc_mgr, char **str)
-+{
-+ const size_t l = 9;
-+ char *s;
-+
-+ s = malloc(l);
-+ if (s == NULL)
-+ return -ENOMEM;
-+ snprintf(s, l, "_ucm%04X", uc_mgr->ucm_card_number);
-+ *str = s;
-+ return 0;
-+}
-+
- /**
- * \brief Get current - string
- * \param uc_mgr Use case manager
-@@ -2193,6 +2212,8 @@ int snd_use_case_get(snd_use_case_mgr_t *uc_mgr,
-
- } else if (strcmp(identifier, "_alibcfg") == 0) {
- err = get_alibcfg(uc_mgr, (char **)value);
-+ } else if (strcmp(identifier, "_alibpref") == 0) {
-+ err = get_alibpref(uc_mgr, (char **)value);
- } else if (identifier[0] == '_') {
- err = -ENOENT;
- } else {
diff --git a/main/alsa-lib/1.2.5-private_device_prefix2.patch b/main/alsa-lib/1.2.5-private_device_prefix2.patch
deleted file mode 100644
index 981870ed8a..0000000000
--- a/main/alsa-lib/1.2.5-private_device_prefix2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9621d0bff2e60b43e329ffa5059ab19f2914ec14 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 2 Jun 2021 11:21:54 +0200
-Subject: [PATCH] ucm: fix _alibpref string (add '.' delimiter to the end)
-
-Fixes: 0e4ba2ea ("ucm: add _alibpref to get the private device prefix")
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- src/ucm/main.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ucm/main.c b/src/ucm/main.c
-index 3c9ea15d..c9b37b68 100644
---- a/src/ucm/main.c
-+++ b/src/ucm/main.c
-@@ -2146,13 +2146,13 @@ static int get_alibcfg(snd_use_case_mgr_t *uc_mgr, char **str)
- */
- static int get_alibpref(snd_use_case_mgr_t *uc_mgr, char **str)
- {
-- const size_t l = 9;
-+ const size_t l = 10;
- char *s;
-
- s = malloc(l);
- if (s == NULL)
- return -ENOMEM;
-- snprintf(s, l, "_ucm%04X", uc_mgr->ucm_card_number);
-+ snprintf(s, l, "_ucm%04X.", uc_mgr->ucm_card_number);
- *str = s;
- return 0;
- }
diff --git a/main/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD
index f72986d0f3..a5f63cf157 100644
--- a/main/alsa-lib/APKBUILD
+++ b/main/alsa-lib/APKBUILD
@@ -1,19 +1,16 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alsa-lib
-pkgver=1.2.5
-pkgrel=2
+pkgver=1.2.5.1
+pkgrel=1
pkgdesc="Advanced Linux Sound Architecture (ALSA) library"
-url="http://www.alsa-project.org"
+url="https://alsa-project.org/"
arch="all"
license="LGPL-2.1-or-later"
-subpackages="$pkgname-dev $pkgname-dbg"
+subpackages="$pkgname-dbg $pkgname-dev"
makedepends="linux-headers"
-source="ftp://ftp.alsa-project.org/pub/lib/alsa-lib-$pkgver.tar.bz2
+source="https://alsa-project.org/files/pub/lib/alsa-lib-$pkgver.tar.bz2
remove-test.patch
fix-PATH_MAX-on-ppc64le.patch
- 1.2.5-load_all_cards.patch
- 1.2.5-private_device_prefix1.patch
- 1.2.5-private_device_prefix2.patch
"
build() {
@@ -41,10 +38,7 @@ package() {
}
sha512sums="
-d9b53484737a3684aac7e08b4b18400aac10fec1a78a8bf9101944bea2c50710bc7355e9bb0012541b067e2d5ee7b1b818bf1bdbffbb2b2d7ad0eb15efe49725 alsa-lib-1.2.5.tar.bz2
+01998ffa449e925ff552c13aea47f9540903afdc533086067c78dcaba4d239c347180d3d28bb0000e6d19b7779c7249fcc77a30057930ca22d18ba55e163fa1c alsa-lib-1.2.5.1.tar.bz2
e15318431fe2d5bd1e42ef793f223e3e5995890d7befe6daa3d7456ccf5cb2f51eb79171539cecae13032a9b8a798ea35e04c89b27c7ef9567e2c03fb8db4512 remove-test.patch
f980d153c2f179e2f8fd90180d19250e5a5e12388f31d86a233d89be72ae7e96b944a8f435f0a11c6140378ac38eaa937175e1c100395ec4f635a9a6a4b1ae25 fix-PATH_MAX-on-ppc64le.patch
-c5ee4d27001c31772c24595051424869961e1b39b45565256650b63471e2be1236b17cdec5e66e182f1894ef8b09b5f6f959b8f8c6e46a2a0131a8512a9d2516 1.2.5-load_all_cards.patch
-dfe42b349bfc73682158dfeebe97c3f43d28cdccad307a239b2ed1e30d289cfe9b1577799c34917b07ac98f48b28939aba9c6e8b0db322fc6dd36bdb96d56208 1.2.5-private_device_prefix1.patch
-294b79947cbbb00208495ada2baffdaef5e7aa4ea6b49d94733b86bcde59eef7589b87d2d856991405bcb5df8ca48f13c4e89c0a0c163f1abff98aad2c52cd88 1.2.5-private_device_prefix2.patch
"
diff --git a/main/alsa-utils/0001-load_state-Only-delete-config-if-one-was-loaded.patch b/main/alsa-utils/0001-load_state-Only-delete-config-if-one-was-loaded.patch
deleted file mode 100644
index 3d41fc6d05..0000000000
--- a/main/alsa-utils/0001-load_state-Only-delete-config-if-one-was-loaded.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 538b94ebcee49de528e639f922d5e5c61d9bbd94 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 6 Jun 2021 20:29:53 +0200
-Subject: [PATCH] load_state: Only delete config if one was loaded
-
-If load_configuration fails with open_failed == true, load_state will
-jump to the out label without config being initialized and pass this
-uninitialized config value to snd_config_delete. This commit fixes this
-issue by initializing config with NULL and checking if it is non-null
-before invoking snd_config_delete.
-
-To reproduce this error:
-
- $ gdb alsactl
- (gdb) run restore 0
- Starting program: /usr/sbin/alsactl restore 0
- /usr/sbin/alsactl: state_lock:129: file /var/lib/alsa/asound.state lock error: Permission denied
- /usr/sbin/alsactl: load_state:1635: Cannot open /var/lib/alsa/asound.state for reading: Permission denied
- alsa-lib parser.c:2372:(load_toplevel_config) Unable to find the top-level configuration file '/usr/share/alsa/ucm2/ucm.conf'.
- alsa-lib main.c:1402:(snd_use_case_mgr_open) error: failed to import hw:0 use case configuration -2
- Found hardware: "HDA-Intel" "Realtek ALC269VC" "HDA:10ec0269,17aa21fa,00100203 HDA:80862806,80860101,00100000" "0x17aa" "0x21fa"
- Hardware is initialized using a generic method
-
- Program received signal SIGSEGV, Segmentation fault.
- 0x00007ffff7eca458 in snd_config_delete (config=0x0) at conf.c:2323
----
- alsactl/state.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/alsactl/state.c b/alsactl/state.c
-index 44fda3f..5af8245 100644
---- a/alsactl/state.c
-+++ b/alsactl/state.c
-@@ -1624,7 +1624,7 @@ int load_state(const char *cfgdir, const char *file,
- {
- int err, finalerr = 0, open_failed;
- struct snd_card_iterator iter;
-- snd_config_t *config;
-+ snd_config_t *config = NULL;
- const char *cardname1;
-
- err = load_configuration(file, &config, &open_failed);
-@@ -1676,7 +1676,8 @@ int load_state(const char *cfgdir, const char *file,
- }
- err = finalerr ? finalerr : snd_card_iterator_error(&iter);
- out:
-- snd_config_delete(config);
-+ if (config)
-+ snd_config_delete(config);
- snd_config_update_free_global();
- return err;
- }
diff --git a/main/alsa-utils/1.2.5-nested_iteration.patch b/main/alsa-utils/1.2.5-nested_iteration.patch
deleted file mode 100644
index e175287a55..0000000000
--- a/main/alsa-utils/1.2.5-nested_iteration.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 78212445de4c8e07873cbc7dff2abcacd031f151 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Tue, 1 Jun 2021 17:47:42 +0200
-Subject: [PATCH] alsactl: fix the nested iteration
-
-There may be nested iterations for hw: card names.
-Handle this card name in snd_card_iterator_sinit().
-
-BugLink: https://github.com/alsa-project/alsa-lib/issues/142
-Fixes: eefc2c6 ("alsactl: use card iterator functions for all card loops")
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- alsactl/utils.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/alsactl/utils.c b/alsactl/utils.c
-index c79fd951..881b5053 100644
---- a/alsactl/utils.c
-+++ b/alsactl/utils.c
-@@ -247,6 +247,8 @@ int snd_card_iterator_sinit(struct snd_card_iterator *iter, const char *cardname
- int cardno = -1;
-
- if (cardname) {
-+ if (strncmp(cardname, "hw:", 3) == 0)
-+ cardname += 3;
- cardno = snd_card_get_index(cardname);
- if (cardno < 0) {
- error("Cannot find soundcard '%s'...", cardname);
diff --git a/main/alsa-utils/APKBUILD b/main/alsa-utils/APKBUILD
index bb065c31c5..fc001dde11 100644
--- a/main/alsa-utils/APKBUILD
+++ b/main/alsa-utils/APKBUILD
@@ -1,20 +1,17 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alsa-utils
-pkgver=1.2.5
+pkgver=1.2.5.1
pkgrel=2
pkgdesc="Advanced Linux Sound Architecture (ALSA) utilities"
-url="http://www.alsa-project.org"
+url="https://alsa-project.org/"
arch="all"
options="!check" # No test suite, applets use ncurses / don't have --version
license="GPL-2.0-or-later"
makedepends="alsa-lib-dev fftw-dev ncurses-dev pciutils-dev xmlto"
depends="dialog"
-subpackages="$pkgname-doc alsaconf::noarch $pkgname-dbg $pkgname-openrc"
-source="ftp://ftp.alsa-project.org/pub/utils/alsa-utils-$pkgver.tar.bz2
- 0001-load_state-Only-delete-config-if-one-was-loaded.patch
- fix-PATH_MAX-on-ppc64le.patch
- 1.2.5-nested_iteration.patch
+subpackages="$pkgname-dbg alsaconf::noarch $pkgname-doc $pkgname-openrc"
+source="https://alsa-project.org/files/pub/utils/alsa-utils-$pkgver.tar.bz2
alsaconf.patch
alsa.initd
alsa.confd
@@ -44,11 +41,8 @@ alsaconf() {
}
sha512sums="
-0e319e553c9c209a46f5c83c50007bd82acf1c9cf78649978b3ab6fbb4349f51c1c7c6a975a8c24d25ba07ad5325e74d2c34dc5c89180998a0f63d1326fde8b1 alsa-utils-1.2.5.tar.bz2
-39014776b0daefd1a622b13757dbf6960afc970a466da7745a6899851201e2f2796bf0eca9c3508742a75d1f06c7fe2b69775531fd0f8244544d35a5965e321a 0001-load_state-Only-delete-config-if-one-was-loaded.patch
-0e9d34f694de6f2668b75830507b56961f9d8f296050e4337e359108e8e72d75a84119e7904d00da3eebd7f06ffc98acfbf38b6164b8703aa64ba2ecb62547bd fix-PATH_MAX-on-ppc64le.patch
-0cdc8c41b70be714515f355a630fc28b68b95cb7b5a5cbb58c1b288ee0edf3128eb8f80bb874844cf11268c89bb04e82f1fe8c4c1ebb7cd7334d28f2896d5a85 1.2.5-nested_iteration.patch
+bbafeb9189ec5802965c4e69cf6e7cd4c132ffb77b57f164d6585649890f96edd052c72697171fd629b39e12f78648fea634468df34c1a80255227ca397907bf alsa-utils-1.2.5.1.tar.bz2
f04155e1e391c7f36d44422c8e769bf9370117f6bbea6c0664e9858f7a676cc958e4260e4b4d226e71d0716f6be4e6fdd60f1d07cb7e9922fff378ceec01c47d alsaconf.patch
-65f3530df01a2157003df9df4cb5b2c7a258257e8121786383610eb2872ffb5e8c88d070792ad74133a21c5fa54bac5047af4dcccb1854b456d2eeb8f0689076 alsa.initd
-6e716e6230fd3d2c33e3cb2dbf572d632c9ac6452c1768388bea7d3ca22f7c72cf6bcd702580f45cb9089983582011c8b04cbdb4420d14fb988167b1391ea547 alsa.confd
+c66959a4a1a24a727c9c91a455caa5fa093c523d17a563b56ec2449a02ff30c83683db555006954b1fe571446cf4a117cc41de8c8b869a6e875d386595b3cc1f alsa.initd
+d7e212e9f624b09168117b46c66289204a23915adf0d1b0c9ae258049430397b8f2d86d3b5f7e3087151948a031c4eab863e8195a6c7b1276704e9cba9c2d2a7 alsa.confd
"
diff --git a/main/alsa-utils/alsa.confd b/main/alsa-utils/alsa.confd
index d47edb1243..b7c5be8ce0 100644
--- a/main/alsa-utils/alsa.confd
+++ b/main/alsa-utils/alsa.confd
@@ -13,3 +13,8 @@ RESTORE_ON_START="yes"
# yes - Save state
SAVE_ON_STOP="yes"
+
+# Additional options which should be passed to alsactl. Most notably,
+# if you get "UCM is not supported" messages on startup, you can pass
+# --no-ucm here.
+#alsactl_opts="--no-ucm"
diff --git a/main/alsa-utils/alsa.initd b/main/alsa-utils/alsa.initd
index 778e1f682e..3dae726ae1 100644
--- a/main/alsa-utils/alsa.initd
+++ b/main/alsa-utils/alsa.initd
@@ -34,7 +34,7 @@ restore() {
[ -e /dev/snd/controlC${cardnum} ] || sleep 2
[ -e /dev/snd/controlC${cardnum} ] || sleep 2
[ -e /dev/snd/controlC${cardnum} ] || sleep 2
- alsactl -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \
+ alsactl ${alsactl_opts} -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \
|| ewarn "Errors while restoring defaults, ignoring"
done
@@ -57,7 +57,7 @@ save() {
checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
mkdir -p "${alsastatedir}"
- if ! alsactl -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then
+ if ! alsactl ${alsactl_opts} -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then
eerror "Error saving levels."
eend 1
return 1
diff --git a/main/alsa-utils/fix-PATH_MAX-on-ppc64le.patch b/main/alsa-utils/fix-PATH_MAX-on-ppc64le.patch
deleted file mode 100644
index 2ddc2c3a42..0000000000
--- a/main/alsa-utils/fix-PATH_MAX-on-ppc64le.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Milan P. Stanić <mps@arvanta.net>
-Date: Thu Jun 3 09:10:21 2021 +0000
-
-Fix missing PATH_MAX on ppc64le
-
---- a/alsactl/utils.c 2021-05-27 17:18:36.000000000 +0000
-+++ b/alsactl/utils.c 2021-06-03 12:05:43.343126321 +0000
-@@ -31,6 +31,7 @@
- #include <sys/stat.h>
- #include <sys/mman.h>
- #include "alsactl.h"
-+#include <limits.h>
-
- int file_map(const char *filename, char **buf, size_t *bufsize)
- {
diff --git a/main/amavis/APKBUILD b/main/amavis/APKBUILD
index d55c588a27..6e51cce902 100644
--- a/main/amavis/APKBUILD
+++ b/main/amavis/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=amavis
pkgver=2.12.1
-pkgrel=1
+pkgrel=2
pkgdesc="High-performance interface between mailer (MTA) and content checkers"
url="https://gitlab.com/amavis/amavis"
arch="noarch !x86" # perl-db
-license="GPL-2.0-or-later BSD"
+license="GPL-2.0-or-later BSD-2-Clause-Views"
provides="amavisd-new=$pkgver-r$pkgrel"
depends="sed file perl perl-archive-zip perl-carp perl-convert-tnef
perl-compress-raw-zlib perl-convert-uulib perl-digest-md5 perl-io
@@ -40,10 +40,11 @@ package() {
install -dm750 -o amavis -g amavis "${pkgdir}$dir"
done
- for file in amavisd amavisd-nanny amavisd-release amavisd.conf; do
+ for file in amavisd amavisd-nanny amavisd-release; do
install -Dm755 -o root -g amavis "$file" "$pkgdir/usr/sbin/$file"
done
+ install -Dm640 -o root amavisd.conf "$pkgdir"/etc/amavisd.conf
install -Dm755 "$srcdir"/amavisd.initd "$pkgdir"/etc/init.d/amavisd
install -Dm644 "$srcdir"/amavisd.confd "$pkgdir"/etc/conf.d/amavisd
}
diff --git a/main/ansible-base/0001-new-module-lbu.patch b/main/ansible-base/0001-new-module-lbu.patch
deleted file mode 100644
index 6147d3d3dd..0000000000
--- a/main/ansible-base/0001-new-module-lbu.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From a419a9539ddff10fa4d3fd7460b117a9f4dd2691 Mon Sep 17 00:00:00 2001
-From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Date: Thu, 19 Sep 2019 10:58:07 +0300
-Subject: [PATCH] new module: lbu
-
-Alpine Linux Local Backup Utility
----
- lib/ansible/modules/system/lbu.py | 131 ++++++++++++++++++++++++++++++
- 1 file changed, 131 insertions(+)
- create mode 100644 lib/ansible/modules/system/lbu.py
-
-diff --git a/lib/ansible/modules/system/lbu.py b/lib/ansible/modules/system/lbu.py
-new file mode 100644
-index 0000000000..9952ec29f1
---- /dev/null
-+++ b/lib/ansible/modules/lbu.py
-@@ -0,0 +1,131 @@
-+#!/usr/bin/python
-+
-+# Copyright: (c) 2019, Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-+
-+from __future__ import absolute_import, division, print_function
-+__metaclass__ = type
-+
-+ANSIBLE_METADATA = {
-+ 'metadata_version': '1.1',
-+ 'status': ['preview'],
-+ 'supported_by': 'community'
-+}
-+
-+DOCUMENTATION = '''
-+---
-+module: lbu
-+
-+short_description: Local Backup Utility for Alpine Linux
-+
-+version_added: "2.10"
-+
-+description:
-+- Manage Local Backup Utility of Alpine Linux in run-from-RAM mode
-+
-+options:
-+ commit:
-+ description:
-+ - Control whether to commit changed files.
-+ type: bool
-+ exclude:
-+ description:
-+ - List of paths to exclude.
-+ type: list
-+ include:
-+ description:
-+ - List of paths to include.
-+ type: list
-+
-+author:
-+- Kaarle Ritvanen (@kunkku)
-+'''
-+
-+EXAMPLES = '''
-+# Commit changed files (if any)
-+- name: Commit
-+ lbu:
-+ commit: true
-+
-+# Exclude path and commit
-+- name: Exclude directory
-+ lbu:
-+ commit: true
-+ exclude:
-+ - /etc/opt
-+
-+# Include paths without committing
-+- name: Include file and directory
-+ lbu:
-+ include:
-+ - /root/.ssh/authorized_keys
-+ - /var/lib/misc
-+'''
-+
-+RETURN = '''
-+msg:
-+ description: Error message
-+ type: str
-+ returned: on failure
-+'''
-+
-+from ansible.module_utils.basic import AnsibleModule
-+
-+import os.path
-+
-+
-+def run_module():
-+ module = AnsibleModule(
-+ argument_spec={
-+ 'commit': {'type': 'bool'},
-+ 'exclude': {'type': 'list', 'elements': 'str'},
-+ 'include': {'type': 'list', 'elements': 'str'}
-+ },
-+ supports_check_mode=True
-+ )
-+
-+ changed = False
-+
-+ def run_lbu(*args):
-+ code, stdout, stderr = module.run_command(
-+ [module.get_bin_path('lbu', required=True)] + list(args)
-+ )
-+ if code:
-+ module.fail_json(changed=changed, msg=stderr)
-+ return stdout
-+
-+ update = False
-+ commit = False
-+
-+ for param in ('include', 'exclude'):
-+ if module.params[param]:
-+ paths = run_lbu(param, '-l').split('\n')
-+ for path in module.params[param]:
-+ if os.path.normpath('/' + path)[1:] not in paths:
-+ update = True
-+
-+ if module.params['commit']:
-+ commit = update or run_lbu('status') > ''
-+
-+ if module.check_mode:
-+ module.exit_json(changed=update or commit)
-+
-+ if update:
-+ for param in ('include', 'exclude'):
-+ if module.params[param]:
-+ run_lbu(param, *module.params[param])
-+ changed = True
-+
-+ if commit:
-+ run_lbu('commit')
-+ changed = True
-+
-+ module.exit_json(changed=changed)
-+
-+
-+def main():
-+ run_module()
-+
-+
-+if __name__ == '__main__':
-+ main()
---
-2.20.1
-
diff --git a/main/ansible-base/APKBUILD b/main/ansible-base/APKBUILD
deleted file mode 100644
index a856540dcb..0000000000
--- a/main/ansible-base/APKBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Takuya Noguchi <takninnovationresearch@gmail.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=ansible-base
-pkgver=2.10.5
-pkgrel=1
-pkgdesc="A configuration-management, deployment, task-execution, and multinode orchestration framework"
-url="https://ansible.com/"
-options="!check" # TODO: enable tests
-arch="noarch"
-license="GPL-3.0-or-later"
-depends="python3 py3-jinja2 py3-packaging py3-yaml py3-cryptography py3-paramiko"
-makedepends="py3-setuptools"
-subpackages="$pkgname-doc"
-source="https://pypi.python.org/packages/source/a/ansible-base/ansible-base-$pkgver.tar.gz
- 0001-new-module-lbu.patch
- "
-
-# secfixes:
-# 2.9.13-r0:
-# - CVE-2020-14330
-# - CVE-2020-14332
-# - CVE-2020-14365
-# 2.9.7-r0:
-# - CVE-2019-3828
-# - CVE-2020-1733
-# - CVE-2020-1739
-# - CVE-2020-1740
-# - CVE-2020-1746
-# - CVE-2020-10691
-# 2.9.6-r0:
-# - CVE-2020-1737
-# 2.9.3-r0:
-# - CVE-2019-14904
-# - CVE-2019-14905
-# 2.8.6-r0:
-# - CVE-2019-14846
-# - CVE-2019-14856
-# - CVE-2019-14858
-# 2.8.4-r0:
-# - CVE-2019-10206
-# - CVE-2019-10217
-# 2.8.2-r0:
-# - CVE-2019-10156
-# 2.7.9-r0:
-# - CVE-2018-16876
-# 2.6.3-r0:
-# - CVE-2018-10875
-
-build() {
- python3 setup.py build
-}
-
-package() {
- python3 setup.py install --prefix=/usr --root="$pkgdir"
-
- mkdir -p "$pkgdir"/usr/share/man/man1
- install -Dm644 "$builddir"/docs/man/man1/*.1 \
- "$pkgdir"/usr/share/man/man1/
-
- mkdir -p "$pkgdir"/usr/share/doc/$pkgname/examples/
- cp -r examples/* \
- "$pkgdir"/usr/share/doc/$pkgname/examples/
- install -m644 README.rst "$pkgdir"/usr/share/doc/$pkgname
-}
-
-sha512sums="2449a36bdea7242a3f4e248e42388339299340cd6c377d6a20b02803db527895912e49040f3931a1aa2ebf04e3d4d5594cfc08aec28da44b73c8206dc81ddb89 ansible-base-2.10.5.tar.gz
-57364eb94bd5fa1add6fb2f60d4e3790a6f1d7582f92ec1e25ea9459704d12ffe49b09ebde4aef91463d1950cfc9a4a34ab2ef83c60f1bc1c1fb6399e900369d 0001-new-module-lbu.patch"
diff --git a/main/ansible/APKBUILD b/main/ansible/APKBUILD
deleted file mode 100644
index f7e327866b..0000000000
--- a/main/ansible/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Takuya Noguchi <takninnovationresearch@gmail.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=ansible
-pkgver=2.10.7
-pkgrel=0
-pkgdesc="A configuration-management, deployment, task-execution, and multinode orchestration framework"
-url="https://ansible.com/"
-options="!check" # TODO: enable tests
-arch="noarch"
-license="GPL-3.0-or-later"
-depends="python3 ansible-base"
-makedepends="py3-setuptools"
-source="https://pypi.python.org/packages/source/a/ansible/ansible-$pkgver.tar.gz"
-
-# secfixes:
-# 2.10.7-r0:
-# - CVE-2021-20191
-# 2.10.1-r0:
-# - CVE-2020-25646
-
-build() {
- python3 setup.py build
-}
-
-package() {
- python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="
-7a6522bcc57c178c9c6e87e313f6f175d5c74ac0d1b9dd0cad5506c7fa0efb16d4a627dc2d9c73f988177544bd9ccfdbec162d0feacc757edeb20280d7414191 ansible-2.10.7.tar.gz
-"
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index dde873aec7..5171fbda5a 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -3,7 +3,7 @@
pkgname=apache2
_pkgreal=httpd
pkgver=2.4.48
-pkgrel=0
+pkgrel=2
pkgdesc="A high performance Unix-based HTTP server"
url="https://httpd.apache.org/"
arch="all"
@@ -12,7 +12,7 @@ install="$pkgname.pre-install $pkgname.pre-upgrade"
pkgusers="apache"
pkggroups="apache"
makedepends="apr-dev apr-util-dev autoconf automake brotli-dev libxml2-dev
- lua-dev nghttp2-dev openssl-dev pcre-dev sed zlib-dev"
+ lua-dev nghttp2-dev openssl1.1-compat-dev pcre-dev sed zlib-dev"
subpackages="$pkgname-ctl
$pkgname-error:_error:noarch
$pkgname-dev
diff --git a/main/apcupsd/APKBUILD b/main/apcupsd/APKBUILD
index ed3b38ade2..fda125aa29 100644
--- a/main/apcupsd/APKBUILD
+++ b/main/apcupsd/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apcupsd
pkgver=3.14.14
-pkgrel=1
+pkgrel=2
pkgdesc="A Daemon to control APC UPSes"
subpackages="$pkgname-doc $pkgname-webif $pkgname-openrc"
url="http://www.apcupsd.org"
@@ -12,6 +12,7 @@ makedepends="net-snmp-dev linux-headers gd-dev libusb-compat-dev"
options="!check" # no test suite included
source="https://sourceforge.net/projects/apcupsd/files/apcupsd%20-%20Stable/$pkgver/apcupsd-$pkgver.tar.gz
apcupsd.initd
+ apcupsd.powerfail.initd
apcupsd-alpine.patch
"
@@ -46,6 +47,8 @@ package() {
cd "$_builddir"
make DESTDIR=$pkgdir install
install -D -m755 "$srcdir"/apcupsd.initd "$pkgdir"/etc/init.d/apcupsd
+ install -D -m755 "$srcdir"/apcupsd.powerfail.initd \
+ "$pkgdir"/etc/init.d/apcupsd.powerfail
}
webif() {
@@ -56,4 +59,5 @@ webif() {
sha512sums="c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f apcupsd-3.14.14.tar.gz
cd9cb3c812dfd72660007807965cac866dfb2ce4bd8200668f08e94fdcce874cce2ec87a0d832b8f37f254908d093aff0cc2db26e9403d5e613dc192072da617 apcupsd.initd
+8d1c266bd86cd1cdf4fccdd171a877957bf5e26e1bb8c20e4c9c6b362a63d8cc1b887a1661939e4e56228a8d23dfc81fe782806b5d1527423c2ef7872cbeb881 apcupsd.powerfail.initd
4f0712519213c4ef14f41eeef681c5498fac7bf42f205de8a855938f8e834d9488d86820d7c883e89d0d305ee287e17e2d321dbbc98ae12f8487bf58aa0d4a6b apcupsd-alpine.patch"
diff --git a/main/apcupsd/apcupsd.powerfail.initd b/main/apcupsd/apcupsd.powerfail.initd
new file mode 100644
index 0000000000..cd7a1e9210
--- /dev/null
+++ b/main/apcupsd/apcupsd.powerfail.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description='Signal the UPS to kill power in a power failure condition'
+
+depend() {
+ need mount-ro
+}
+
+start() {
+ if [ "$RC_RUNLEVEL" = "shutdown" -a -f /etc/apcupsd/powerfail ] ; then
+ ebegin 'Signaling UPS to kill power'
+ /sbin/apcupsd --killpower
+ eend $?
+ fi
+}
diff --git a/main/apk-tools/0001-solver-don-t-consider-requirer-count-for-preference.patch b/main/apk-tools/0001-solver-don-t-consider-requirer-count-for-preference.patch
deleted file mode 100644
index 6634e2d3dc..0000000000
--- a/main/apk-tools/0001-solver-don-t-consider-requirer-count-for-preference.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 3cce27e83d068d274235995c03fed1e0f8a808fb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Wed, 19 May 2021 16:29:55 +0300
-Subject: [PATCH] solver: don't consider requirer count for preference
-
-The original intent was to choose packages to which there is most
-dependencies. However, since the code has evolved this is has been
-mostly obsolete. And in fact now interferes with the provides and
-provides priority mechanism. Remove this as obsolete.
-
-Fixes #10742
----
- src/solver.c | 18 ------------------
- test/provides.repo | 22 ++++++++++++++++++++++
- test/provides13.test | 7 +++++++
- 3 files changed, 29 insertions(+), 18 deletions(-)
- create mode 100644 test/provides13.test
-
-diff --git a/src/solver.c b/src/solver.c
-index df63060..810c9ce 100644
---- a/src/solver.c
-+++ b/src/solver.c
-@@ -493,17 +493,6 @@ static void reconsider_name(struct apk_solver_state *ss, struct apk_name *name)
- name->name, name->ss.has_options, name->ss.reverse_deps_done);
- }
-
--static int count_requirers(const struct apk_package *pkg)
--{
-- int cnt = pkg->name->ss.requirers;
-- struct apk_dependency *p;
--
-- foreach_array_item(p, pkg->provides)
-- cnt += p->name->ss.requirers;
--
-- return cnt;
--}
--
- static int compare_providers(struct apk_solver_state *ss,
- struct apk_provider *pA, struct apk_provider *pB)
- {
-@@ -597,13 +586,6 @@ static int compare_providers(struct apk_solver_state *ss,
- return r;
- }
-
-- /* Prefer highest requirer count. */
-- r = count_requirers(pkgA) - count_requirers(pkgB);
-- if (r) {
-- dbg_printf(" prefer highest requirer count\n");
-- return r;
-- }
--
- /* Prefer installed */
- if (!(solver_flags & APK_SOLVERF_UPGRADE)) {
- r = (pkgA->ipkg != NULL) - (pkgB->ipkg != NULL);
-diff --git a/test/provides.repo b/test/provides.repo
-index 358151e..ed72f72 100644
---- a/test/provides.repo
-+++ b/test/provides.repo
-@@ -111,3 +111,25 @@ V:0.1
- S:1
- I:1
- D:conflicted-provider-2
-+
-+C:Q1inqy40xXhjHaXUlG+qIshN+TIvA=
-+P:pulseaudio-alsa
-+V:1
-+S:1
-+I:1
-+k:10
-+
-+c:a79b3f751d72fd4bdb6729139660d0b4f5b87a33
-+P:pulseaudio
-+V:1
-+S:1
-+I:1
-+k:10
-+
-+C:Q1FAFBeAhWPV1XXEdoW+TSjrUghxU=
-+P:pipewire-pulse
-+V:1
-+S:1
-+I:1
-+k:1
-+p:pulseaudio=1 pulseaudio-alsa=1
-diff --git a/test/provides13.test b/test/provides13.test
-new file mode 100644
-index 0000000..5d6482d
---- /dev/null
-+++ b/test/provides13.test
-@@ -0,0 +1,7 @@
-+@ARGS
-+--test-repo provides.repo
-+add pulseaudio pulseaudio-alsa
-+@EXPECT
-+(1/2) Installing pulseaudio (1)
-+(2/2) Installing pulseaudio-alsa (1)
-+OK: 0 MiB in 0 packages
---
-2.31.1
-
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index c819b368cc..599afbdcb5 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
-pkgver=2.12.5
+pkgver=2.12.7
pkgrel=1
pkgdesc="Alpine Package Keeper - package manager for alpine"
arch="all"
@@ -20,12 +20,13 @@ if [ "$CBUILD" = "$CHOST" ]; then
makedepends="$makedepends $_lua-dev"
fi
source="https://gitlab.alpinelinux.org/alpine/$pkgname/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz
- 0001-solver-don-t-consider-requirer-count-for-preference.patch
_apk
"
builddir="$srcdir/$pkgname-v$pkgver"
# secfixes:
+# 2.12.6-r0:
+# - CVE-2021-36159
# 2.12.5-r0:
# - CVE-2021-30139
@@ -82,7 +83,6 @@ luaapk() {
}
sha512sums="
-478137f14617e97bdf79cd431812116b94270107d1473313fa94d5c258ed55c11234ad80cb6ba74e0134b0de0f25356d60f77966ecc5dbe5175415768718d1d8 apk-tools-v2.12.5.tar.gz
-d7ef6721eab357ff6d8329c56443da472099d3d5e4764cce7101b55c0d1a0653bae6103ab25c2a5e0800a283cf950d890c8b2f2aea3ccf288b1521c014e31b13 0001-solver-don-t-consider-requirer-count-for-preference.patch
+1297bb969a4d27164b38e64f4d2c00b00758d8d83c7ba658eeddccdd549dc6ba8f26a60a9e71c88f4bca87b2746a8fb4b7bb41e0096cf459e1b841203f903681 apk-tools-v2.12.7.tar.gz
102e6d01a984fb7a84c9432f797e4d8d2c90e9570dd26208b8485569ab471ea88a2cc81eabd3b3f7e4c9685a37afc458dec172a65b03c19c78a7efb598c54f45 _apk
"
diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD
index 656bf1bf37..fc6efbe259 100644
--- a/main/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apr-util
pkgver=1.6.1
-pkgrel=7
+pkgrel=9
pkgdesc="The Apache Portable Runtime Utility Library"
url="http://apr.apache.org/"
arch="all"
@@ -9,7 +9,7 @@ license="Apache-2.0"
subpackages="$pkgname-dev $pkgname-dbd_pgsql $pkgname-dbd_mysql
$pkgname-dbd_sqlite3 $pkgname-ldap"
depends_dev="expat-dev openldap-dev sqlite-dev postgresql-dev
- openssl-dev mariadb-dev"
+ openssl1.1-compat-dev mariadb-dev"
makedepends="$depends_dev apr-dev bash chrpath openssl"
source="https://www.apache.org/dist/apr/apr-util-$pkgver.tar.bz2
musl-fix-testsuite.patch"
diff --git a/main/arm-trusted-firmware/APKBUILD b/main/arm-trusted-firmware/APKBUILD
index 472a1f3421..3532ddcfbb 100644
--- a/main/arm-trusted-firmware/APKBUILD
+++ b/main/arm-trusted-firmware/APKBUILD
@@ -1,33 +1,35 @@
# Contributor: Milan P. Stanić <mps@arvanta.net>
+# Contributor: Maxim Karasev <begs@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=arm-trusted-firmware
-pkgver=2.3
-pkgrel=0
+pkgver=2.5
+pkgrel=1
pkgdesc="ARM Trusted Firmware-A (TF-A)"
url="https://github.com/ARM-software/arm-trusted-firmware"
arch="aarch64"
license="BSD-3-Clause"
-makedepends="dtc openssl-dev"
-subpackages="$pkgname-sun50i"
+makedepends="dtc openssl-dev gcc-arm-none-eabi"
source="https://github.com/ARM-software/arm-trusted-firmware/archive/v$pkgver/arm-trusted-firmware-v$pkgver.tar.gz
- rk3399-baudrate.patch
- "
+ rk3399-baudrate.patch"
options="!check" # No tests
+_plats="sun50i_a64 sun50i_h6"
+
build() {
unset LDFLAGS
- make PLAT=sun50i_a64 bl31
+ for plat in $_plats; do
+ make PLAT=$plat bl31
+ done
}
package() {
- mkdir -p "$pkgdir"/usr/share/$pkgname
-}
-sun50i() {
- pkgdesc="ARM Trusted Firmware-A for sun50i"
-
- mkdir -p "$subpkgdir"/usr/share/$subpkgname
- install "$builddir"/build/sun50i_a64/release/bl31.bin "$subpkgdir"/usr/share/$subpkgname/
+ for plat in $_plats; do
+ install -D "$builddir"/build/$plat/release/bl31.bin \
+ "$pkgdir"/usr/share/$pkgname/$plat/bl31.bin
+ done
}
-sha512sums="c7d65e3d7cb9ee4502beac1a9e2e4e1c9f8d439412c457ee6a24e391ddba0b9becda8f1ed2c1356d92a5c0615b943b59f4e15686e6a4648d944d6bf2c060a957 arm-trusted-firmware-v2.3.tar.gz
-86d8c60157145ab05e9b870aad11d2acaf2137ba00bf71419f8a54a4fd2b1906c19bc8bfeccc735344d1dcf11ba81bd9396bfd8854cdb972a72503b632d1e900 rk3399-baudrate.patch"
+sha512sums="
+3c99f1d849c3c536e8e2e4838ee48a1a431f0bef35eaf27eb14f9caebde71a577589b10efbbd7db49bed3b9763bed46583d0b26e72f61fcd0d34cc46ff684846 arm-trusted-firmware-v2.5.tar.gz
+86d8c60157145ab05e9b870aad11d2acaf2137ba00bf71419f8a54a4fd2b1906c19bc8bfeccc735344d1dcf11ba81bd9396bfd8854cdb972a72503b632d1e900 rk3399-baudrate.patch
+"
diff --git a/main/arpwatch/01_all_arpwatch-2.1a15-manpages.patch b/main/arpwatch/01_all_arpwatch-2.1a15-manpages.patch
deleted file mode 100644
index 987f16e462..0000000000
--- a/main/arpwatch/01_all_arpwatch-2.1a15-manpages.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Taken from tcpdump-3.8.2-14.FC4.src.rpm with some similar fixes for arpwatch.8
-and and fixes unescaped hyphen in arpwatch and arpsnmp man pages.
-
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.8 arpwatch-2.1a15/arpsnmp.8
---- arpwatch-2.1a15.orig/arpsnmp.8 2000-09-18 00:34:48.000000000 +0400
-+++ arpwatch-2.1a15/arpsnmp.8 2006-09-22 19:21:55.000000000 +0400
-@@ -22,7 +22,7 @@
- .TH ARPSNMP 8 "17 September 2000"
- .UC 4
- .SH NAME
--arpsnmp - keep track of ethernet/ip address pairings
-+arpsnmp \- keep track of ethernet/ip address pairings
- .SH SYNOPSIS
- .B arpsnmp
- [
-@@ -41,7 +41,7 @@
- and reports certain changes via email.
- .B Arpsnmp
- reads information from a file (usually generated by
--.BR snmpwalk (8)).
-+.BR snmpwalk (1)).
- .LP
- The
- .B -d
-@@ -62,9 +62,9 @@
- .LP
- .SH "REPORT MESSAGES"
- (See the
--.BR arpwatch (1)
-+.BR arpwatch (8)
- man page for details on the report messages generated by
--.BR arpsnmp (1).)
-+.BR arpsnmp (8).)
- .SH FILES
- .na
- .nh
-@@ -79,7 +79,7 @@
- .na
- .nh
- .BR arpwatch (8),
--.BR snmpwalk (8),
-+.BR snmpwalk (1),
- .BR arp (8)
- .ad
- .hy
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8 2000-10-09 00:31:28.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8 2006-09-22 19:22:07.000000000 +0400
-@@ -22,7 +22,7 @@
- .TH ARPWATCH 8 "8 October 2000"
- .UC 4
- .SH NAME
--arpwatch - keep track of ethernet/ip address pairings
-+arpwatch \- keep track of ethernet/ip address pairings
- .SH SYNOPSIS
- .na
- .B arpwatch
-@@ -101,9 +101,9 @@
- .LP
- .SH "REPORT MESSAGES"
- Here's a quick list of the report messages generated by
--.BR arpwatch (1)
-+.BR arpwatch (8)
- (and
--.BR arpsnmp (1)):
-+.BR arpsnmp (8)):
- .TP
- .B "new activity"
- This ethernet/ip address pair has been used for the first time six
diff --git a/main/arpwatch/02_all_arpwatch-2.1a15-srcdir.patch b/main/arpwatch/02_all_arpwatch-2.1a15-srcdir.patch
deleted file mode 100644
index 3ab59fcb2a..0000000000
--- a/main/arpwatch/02_all_arpwatch-2.1a15-srcdir.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-Patch for aclocal, Makefile.in, configure.in to handle srcdir correctly.
-
-diff -Naru arpwatch-2.1a15.orig/aclocal.m4 arpwatch-2.1a15/aclocal.m4
---- arpwatch-2.1a15.orig/aclocal.m4 2006-03-28 11:55:40.000000000 +0400
-+++ arpwatch-2.1a15/aclocal.m4 2006-09-22 16:16:24.000000000 +0400
-@@ -50,7 +50,7 @@
- $1="-O"
- $2=""
- if test "${srcdir}" != "." ; then
-- $2="-I\$\(srcdir\)"
-+ $2="-I\$(srcdir)"
- fi
- if test "${CFLAGS+set}" = set; then
- LBL_CFLAGS="$CFLAGS"
-diff -Naru arpwatch-2.1a15.orig/configure.in arpwatch-2.1a15/configure.in
---- arpwatch-2.1a15.orig/configure.in 2006-06-22 00:34:29.000000000 +0400
-+++ arpwatch-2.1a15/configure.in 2006-09-22 16:16:24.000000000 +0400
-@@ -143,17 +143,17 @@
- AC_DEFINE(HAVE_DN_SKIPNAME)
- fi
-
--if test -f .devel ; then
-+if test -f $srcdir/.devel ; then
- AC_DEFINE(LBL)
- fi
-
--if test -r lbl/gnuc.h ; then
-- rm -f gnuc.h
-- ln -s lbl/gnuc.h gnuc.h
-+if test -r $srcdir/lbl/gnuc.h ; then
-+ rm -f $srcdir/gnuc.h
-+ ln -s lbl/gnuc.h $srcdir/gnuc.h
- fi
-
--if test ! -r addresses.h ; then
-- cp addresses.h.in addresses.h
-+if test ! -r $srcdir/addresses.h ; then
-+ cp $srcdir/addresses.h.in $srcdir/addresses.h
- fi
-
- AC_SUBST(V_CCOPT)
-@@ -166,12 +166,12 @@
-
- AC_OUTPUT(Makefile)
-
--if test ! -f arp.dat ; then
-+if test ! -f $srcdir/arp.dat ; then
- echo 'creating empty arp.dat file'
-- touch arp.dat
-+ touch $srcdir/arp.dat
- fi
-
--if test -f .devel ; then
-+if test -f $srcdir/.devel ; then
- make depend
- fi
- exit 0
-diff -Naru arpwatch-2.1a15.orig/configure.in.orig arpwatch-2.1a15/configure.in.orig
---- arpwatch-2.1a15.orig/configure.in.orig 1970-01-01 03:00:00.000000000 +0300
-+++ arpwatch-2.1a15/configure.in.orig 2006-06-22 00:34:29.000000000 +0400
-@@ -0,0 +1,177 @@
-+dnl @(#) $Header: /usr/src/local/sbin/arpwatch/RCS/configure.in,v 1.35 2006/06/21 20:34:27 leres Exp $ (LBL)
-+dnl
-+dnl Copyright (c) 1994, 1995, 1996, 1997, 1998, 2000, 2006
-+dnl The Regents of the University of California. All rights reserved.
-+dnl
-+dnl Process this file with autoconf to produce a configure script.
-+dnl
-+
-+AC_INIT(arpwatch.c)
-+
-+AC_CANONICAL_SYSTEM
-+
-+umask 002
-+
-+if test -z "$PWD" ; then
-+ PWD=`pwd`
-+fi
-+
-+AC_LBL_C_INIT(V_CCOPT, V_INCLS)
-+
-+AC_CHECK_HEADERS(fcntl.h memory.h)
-+AC_HEADER_TIME
-+
-+AC_REPLACE_FUNCS(bcopy strerror)
-+
-+dnl The following generates a warning from autoconf...
-+AC_C_BIGENDIAN
-+
-+AC_LBL_TYPE_SIGNAL
-+AC_LBL_UNION_WAIT
-+
-+AC_CHECK_LIB(resolv, res_query)
-+AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS)
-+
-+AC_PATH_PROG(V_SENDMAIL, sendmail, /usr/lib/sendmail,
-+ $PATH:/usr/sbin:/usr/lib:/usr/bin:/usr/ucblib:/usr/local/etc)
-+
-+case "$target_os" in
-+
-+linux*)
-+ V_INCLS="$V_INCLS -Ilinux-include"
-+ ;;
-+
-+osf3*)
-+ # workaround around ip_hl vs. ip_vhl problem in netinet/ip.h
-+ AC_DEFINE(__STDC__,2)
-+ ;;
-+esac
-+
-+AC_LBL_CHECK_TYPE
-+
-+AC_LBL_DEVEL(V_CCOPT)
-+
-+AC_MSG_CHECKING(if ether_header uses ether_addr structs)
-+AC_CACHE_VAL(ac_cv_ether_header_has_ea,
-+ LBL_SAVE_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS $V_INCLS"
-+ AC_TRY_COMPILE([
-+# include <sys/types.h>
-+# if __STDC__
-+ /* osf3 has REALLY good prototyes */
-+ struct mbuf;
-+ struct rtentry;
-+# endif
-+# include <sys/socket.h>
-+# include <net/if.h>
-+# include <netinet/in.h>
-+# include <netinet/if_ether.h>],
-+ [u_int i =
-+ sizeof(((struct ether_header *)0)->ether_dhost.ether_addr_octet)],
-+ ac_cv_ether_header_has_ea=yes,
-+ ac_cv_ether_header_has_ea=no)
-+ CFLAGS="$LBL_SAVE_CFLAGS")
-+AC_MSG_RESULT($ac_cv_ether_header_has_ea)
-+if test $ac_cv_ether_header_has_ea = yes ; then
-+ AC_DEFINE(ETHER_HEADER_HAS_EA)
-+fi
-+
-+AC_MSG_CHECKING(if ether_arp uses ether_addr structs)
-+AC_CACHE_VAL(ac_cv_ether_arp_has_ea,
-+ LBL_SAVE_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS $V_INCLS"
-+ AC_TRY_COMPILE([
-+# include <sys/types.h>
-+# if __STDC__
-+ /* osf3 has REALLY good prototyes */
-+ struct mbuf;
-+ struct rtentry;
-+# endif
-+# include <sys/socket.h>
-+# include <net/if.h>
-+# include <netinet/in.h>
-+# include <netinet/if_ether.h>],
-+ [u_int i =
-+ sizeof(((struct ether_arp *)0)->arp_sha.ether_addr_octet)],
-+ ac_cv_ether_arp_has_ea=yes,
-+ ac_cv_ether_arp_has_ea=no)
-+ CFLAGS="$LBL_SAVE_CFLAGS")
-+AC_MSG_RESULT($ac_cv_ether_arp_has_ea)
-+if test $ac_cv_ether_arp_has_ea = yes ; then
-+ AC_DEFINE(ETHER_ARP_HAS_EA)
-+fi
-+
-+AC_MSG_CHECKING(if ether_arp uses erp_xsha member)
-+AC_CACHE_VAL(ac_cv_struct_ether_arp_x,
-+ LBL_SAVE_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS $V_INCLS"
-+ AC_TRY_COMPILE([
-+# include <sys/types.h>
-+# include <sys/socket.h>
-+# if __STDC__
-+ /* osf3 has REALLY good prototyes */
-+ struct mbuf;
-+ struct rtentry;
-+# endif
-+# include <net/if.h>
-+# include <netinet/in.h>
-+# include <netinet/if_ether.h>],
-+ [u_int i = sizeof( ((struct ether_arp *)0)->arp_xsha)],
-+ ac_cv_struct_ether_arp_x=yes,
-+ ac_cv_struct_ether_arp_x=no)
-+ CFLAGS="$LBL_SAVE_CFLAGS")
-+AC_MSG_RESULT($ac_cv_struct_ether_arp_x)
-+if test $ac_cv_struct_ether_arp_x = yes ; then
-+ AC_DEFINE(ETHER_ARP_HAS_X)
-+fi
-+
-+dnl
-+dnl bind 8 does some routine name renaming so we must test specially
-+dnl
-+AC_MSG_CHECKING(for dn_skipname)
-+AC_CACHE_VAL(ac_cv_have_dn_skipname,
-+ AC_TRY_LINK([
-+# include <sys/types.h>
-+# include <netinet/in.h>
-+# include <arpa/nameser.h>
-+# include <resolv.h>],
-+ [(void)dn_skipname(0, 0);],
-+ ac_cv_have_dn_skipname=yes,
-+ ac_cv_have_dn_skipname=no))
-+AC_MSG_RESULT($ac_cv_have_dn_skipname)
-+if test $ac_cv_have_dn_skipname = yes ; then
-+ AC_DEFINE(HAVE_DN_SKIPNAME)
-+fi
-+
-+if test -f .devel ; then
-+ AC_DEFINE(LBL)
-+fi
-+
-+if test -r lbl/gnuc.h ; then
-+ rm -f gnuc.h
-+ ln -s lbl/gnuc.h gnuc.h
-+fi
-+
-+if test ! -r addresses.h ; then
-+ cp addresses.h.in addresses.h
-+fi
-+
-+AC_SUBST(V_CCOPT)
-+AC_SUBST(V_INCLS)
-+AC_SUBST(V_PCAPDEP)
-+AC_SUBST(V_SENDMAIL)
-+AC_SUBST(LBL_LIBS)
-+
-+AC_PROG_INSTALL
-+
-+AC_OUTPUT(Makefile)
-+
-+if test ! -f arp.dat ; then
-+ echo 'creating empty arp.dat file'
-+ touch arp.dat
-+fi
-+
-+if test -f .devel ; then
-+ make depend
-+fi
-+exit 0
-diff -Naru arpwatch-2.1a15.orig/Makefile.in arpwatch-2.1a15/Makefile.in
---- arpwatch-2.1a15.orig/Makefile.in 2000-06-15 04:39:55.000000000 +0400
-+++ arpwatch-2.1a15/Makefile.in 2006-09-22 16:16:24.000000000 +0400
-@@ -104,7 +104,7 @@
- version.o: version.c
- version.c: $(srcdir)/VERSION
- @rm -f $@
-- sed -e 's/.*/char version[] = "&";/' $(srcdir)/VERSION > $@
-+ sed -e 's/.*/char version[] = "&";/' $(srcdir)/VERSION > $(srcdir)/$@
-
- zap: zap.o intoa.o
- $(CC) $(CFLAGS) -o $@ zap.o intoa.o -lutil
diff --git a/main/arpwatch/03_all_arpwatch-2.1a15-getopt.patch b/main/arpwatch/03_all_arpwatch-2.1a15-getopt.patch
deleted file mode 100644
index 269adc8ea6..0000000000
--- a/main/arpwatch/03_all_arpwatch-2.1a15-getopt.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-Patch from debian. Just reorders usage output and getopt options to ease adding new features.
-
-
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.8 arpwatch-2.1a15/arpsnmp.8
---- arpwatch-2.1a15.orig/arpsnmp.8 2006-09-22 17:18:02.000000000 +0400
-+++ arpwatch-2.1a15/arpsnmp.8 2006-09-22 18:17:44.000000000 +0400
-@@ -27,10 +27,15 @@
- .B arpsnmp
- [
- .B -d
--] [
-+]
-+.br
-+.ti +8
-+[
- .B -f
- .I datafile
- ]
-+.br
-+.ti +8
- .I file
- [
- .I ...
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.c arpwatch-2.1a15/arpsnmp.c
---- arpwatch-2.1a15.orig/arpsnmp.c 2004-01-23 01:25:17.000000000 +0300
-+++ arpwatch-2.1a15/arpsnmp.c 2006-09-22 18:17:15.000000000 +0400
-@@ -78,6 +78,10 @@
- register char *cp;
- register int op, i;
- char errbuf[256];
-+ char options[] =
-+ "d"
-+ "f:"
-+ ;
-
- if ((cp = strrchr(argv[0], '/')) != NULL)
- prog = cp + 1;
-@@ -90,7 +94,7 @@
- }
-
- opterr = 0;
-- while ((op = getopt(argc, argv, "df:")) != EOF)
-+ while ((op = getopt(argc, argv, options)) != EOF)
- switch (op) {
-
- case 'd':
-@@ -182,9 +186,14 @@
- usage(void)
- {
- extern char version[];
-+ char usage[] =
-+ "[-d] "
-+ "[-f datafile] "
-+ "file [...]\n"
-+ ;
-
- (void)fprintf(stderr, "Version %s\n", version);
- (void)fprintf(stderr,
-- "usage: %s [-d] [-f datafile] file [...]\n", prog);
-+ "usage: %s %s", prog, usage);
- exit(1);
- }
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8 2006-09-22 17:18:02.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8 2006-09-22 18:19:20.000000000 +0400
-@@ -28,10 +28,16 @@
- .B arpwatch
- [
- .B -dN
--] [
-+]
-+.br
-+.ti +8
-+[
- .B -f
- .I datafile
--] [
-+]
-+.br
-+.ti +8
-+[
- .B -i
- .I interface
- ]
-@@ -40,7 +46,10 @@
- [
- .B -n
- .IR net [/ width
--]] [
-+]]
-+.br
-+.ti +8
-+[
- .B -r
- .I file
- ]
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c 2004-01-23 01:18:20.000000000 +0300
-+++ arpwatch-2.1a15/arpwatch.c 2006-09-22 18:22:35.000000000 +0400
-@@ -153,6 +153,14 @@
- register char *interface, *rfilename;
- struct bpf_program code;
- char errbuf[PCAP_ERRBUF_SIZE];
-+ char options[] =
-+ "d"
-+ "f:"
-+ "i:"
-+ "n:"
-+ "N"
-+ "r:"
-+ ;
-
- if (argv[0] == NULL)
- prog = "arpwatch";
-@@ -170,7 +178,7 @@
- interface = NULL;
- rfilename = NULL;
- pd = NULL;
-- while ((op = getopt(argc, argv, "df:i:n:Nr:")) != EOF)
-+ while ((op = getopt(argc, argv, options)) != EOF)
- switch (op) {
-
- case 'd':
-@@ -201,7 +209,6 @@
- case 'r':
- rfilename = optarg;
- break;
--
- default:
- usage();
- }
-@@ -748,9 +755,16 @@
- usage(void)
- {
- extern char version[];
-+ char usage[] =
-+ "[-dN] "
-+ "[-f datafile] "
-+ "[-i interface] "
-+ "[-n net[/width]] "
-+ "[-r file] "
-+ "\n"
-+ ;
-
- (void)fprintf(stderr, "Version %s\n", version);
-- (void)fprintf(stderr, "usage: %s [-dN] [-f datafile] [-i interface]"
-- " [-n net[/width]] [-r file]\n", prog);
-+ (void)fprintf(stderr, "usage: %s %s", prog, usage);
- exit(1);
- }
diff --git a/main/arpwatch/04_all_arpwatch-2.1a15-sendmail-cmdline-opt.patch b/main/arpwatch/04_all_arpwatch-2.1a15-sendmail-cmdline-opt.patch
deleted file mode 100644
index 3b2ec7f4cd..0000000000
--- a/main/arpwatch/04_all_arpwatch-2.1a15-sendmail-cmdline-opt.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-This patch from debian adds possibility to specify sendmail program.
-
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.8 arpwatch-2.1a15/arpsnmp.8
---- arpwatch-2.1a15.orig/arpsnmp.8 2006-09-22 19:26:53.000000000 +0400
-+++ arpwatch-2.1a15/arpsnmp.8 2006-09-22 19:31:59.000000000 +0400
-@@ -36,6 +36,12 @@
- ]
- .br
- .ti +8
-+[
-+.B -s
-+.I sendmail_path
-+]
-+.br
-+.ti +8
- .I file
- [
- .I ...
-@@ -60,6 +66,13 @@
- The default is
- .IR arp.dat .
- .LP
-+The
-+.B -s
-+flag is used to specify the path to the sendmail program. Any program that
-+takes the option -odi and then text from stdin can be substituted. This is
-+useful for redirecting reports to log files instead of mail. (This feature
-+comes from Debian).
-+.LP
- Note that an empty
- .I arp.dat
- file must be created before the first time you run
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.c arpwatch-2.1a15/arpsnmp.c
---- arpwatch-2.1a15.orig/arpsnmp.c 2006-09-22 19:26:53.000000000 +0400
-+++ arpwatch-2.1a15/arpsnmp.c 2006-09-22 19:26:23.000000000 +0400
-@@ -67,6 +67,7 @@
- __dead void usage(void) __attribute__((volatile));
-
- char *prog;
-+char *path_sendmail = PATH_SENDMAIL;
-
- extern int optind;
- extern int opterr;
-@@ -81,6 +82,7 @@
- char options[] =
- "d"
- "f:"
-+ "s:"
- ;
-
- if ((cp = strrchr(argv[0], '/')) != NULL)
-@@ -109,6 +111,10 @@
- arpfile = optarg;
- break;
-
-+ case 's':
-+ path_sendmail = optarg;
-+ break;
-+
- default:
- usage();
- }
-@@ -189,6 +195,7 @@
- char usage[] =
- "[-d] "
- "[-f datafile] "
-+ "[-s sendmail_path] "
- "file [...]\n"
- ;
-
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8 2006-09-22 19:26:53.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8 2006-09-22 19:28:02.000000000 +0400
-@@ -53,6 +53,12 @@
- .B -r
- .I file
- ]
-+.br
-+.ti +8
-+[
-+.B -s
-+.I sendmail_path
-+]
- .ad
- .SH DESCRIPTION
- .B Arpwatch
-@@ -103,6 +109,13 @@
- .B arpwatch
- does not fork.
- .LP
-+The
-+.B -s
-+flag is used to specify the path to the sendmail program. Any program that
-+takes the option -odi and then text from stdin can be substituted. This is
-+useful for redirecting reports to log files instead of mail. (This feature
-+comes from Debian).
-+.LP
- Note that an empty
- .I arp.dat
- file must be created before the first time you run
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c 2006-09-22 19:26:53.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c 2006-09-22 19:26:23.000000000 +0400
-@@ -106,6 +106,7 @@
- #endif
-
- char *prog;
-+char *path_sendmail = PATH_SENDMAIL;
-
- int can_checkpoint;
- int swapped;
-@@ -160,6 +161,7 @@
- "n:"
- "N"
- "r:"
-+ "s:"
- ;
-
- if (argv[0] == NULL)
-@@ -209,6 +211,11 @@
- case 'r':
- rfilename = optarg;
- break;
-+
-+ case 's':
-+ path_sendmail = optarg;
-+ break;
-+
- default:
- usage();
- }
-@@ -761,6 +768,7 @@
- "[-i interface] "
- "[-n net[/width]] "
- "[-r file] "
-+ "[-s sendmail_path] "
- "\n"
- ;
-
-diff -Naru arpwatch-2.1a15.orig/report.c arpwatch-2.1a15/report.c
---- arpwatch-2.1a15.orig/report.c 2000-10-01 03:41:10.000000000 +0400
-+++ arpwatch-2.1a15/report.c 2006-09-22 19:26:23.000000000 +0400
-@@ -235,6 +235,7 @@
- report(register char *title, register u_int32_t a, register u_char *e1,
- register u_char *e2, register time_t *t1p, register time_t *t2p)
- {
-+ extern char *path_sendmail;
- register char *cp, *hn;
- register int fd, pid;
- register FILE *f;
-@@ -242,7 +243,7 @@
- char *fmt = "%20s: %s\n";
- char *watcher = WATCHER;
- char *watchee = WATCHEE;
-- char *sendmail = PATH_SENDMAIL;
-+ char *sendmail = path_sendmail;
- char *unknown = "<unknown>";
- char buf[132];
- static int init = 0;
diff --git a/main/arpwatch/05_all_arpwatch-2.1a15-promiscuous-mode.patch b/main/arpwatch/05_all_arpwatch-2.1a15-promiscuous-mode.patch
deleted file mode 100644
index 3f4c679dd6..0000000000
--- a/main/arpwatch/05_all_arpwatch-2.1a15-promiscuous-mode.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8 2006-09-22 19:33:49.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8 2006-09-22 19:34:52.000000000 +0400
-@@ -59,6 +59,11 @@
- .B -s
- .I sendmail_path
- ]
-+.br
-+.ti +8
-+[
-+.B -p
-+]
- .ad
- .SH DESCRIPTION
- .B Arpwatch
-@@ -116,6 +121,15 @@
- useful for redirecting reports to log files instead of mail. (This feature
- comes from Debian).
- .LP
-+The
-+.B -p
-+flag disables promiscuous operation. ARP broadcasts get through hubs without
-+having the interface in promiscuous mode, while saving considerable resources
-+that would be wasted on processing gigabytes of non-broadcast traffic. OTOH,
-+setting promiscuous mode does not mean getting 100% traffic that would concern
-+.B arpwatch.
-+YMMV. (This feature comes from Debian).
-+.LP
- Note that an empty
- .I arp.dat
- file must be created before the first time you run
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c 2006-09-22 19:33:49.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c 2006-09-22 19:34:07.000000000 +0400
-@@ -162,6 +162,7 @@
- "N"
- "r:"
- "s:"
-+ "p"
- ;
-
- if (argv[0] == NULL)
-@@ -216,6 +217,10 @@
- path_sendmail = optarg;
- break;
-
-+ case 'p':
-+ ++nopromisc;
-+ break;
-+
- default:
- usage();
- }
-@@ -283,7 +288,7 @@
- snaplen = max(sizeof(struct ether_header),
- sizeof(struct fddi_header)) + sizeof(struct ether_arp);
- timeout = 1000;
-- pd = pcap_open_live(interface, snaplen, 1, timeout, errbuf);
-+ pd = pcap_open_live(interface, snaplen, !nopromisc, timeout, errbuf);
- if (pd == NULL) {
- syslog(LOG_ERR, "pcap open %s: %s", interface, errbuf);
- exit(1);
-@@ -769,6 +774,7 @@
- "[-n net[/width]] "
- "[-r file] "
- "[-s sendmail_path] "
-+ "[-p] "
- "\n"
- ;
-
-diff -Naru arpwatch-2.1a15.orig/util.c arpwatch-2.1a15/util.c
---- arpwatch-2.1a15.orig/util.c 2004-01-23 01:25:39.000000000 +0300
-+++ arpwatch-2.1a15/util.c 2006-09-22 19:35:15.000000000 +0400
-@@ -61,6 +61,7 @@
-
- int debug = 0;
- int initializing = 1; /* true if initializing */
-+int nopromisc = 0; /* don't activate promisc mode by default */
-
- /* syslog() helper routine */
- void
-diff -Naru arpwatch-2.1a15.orig/util.h arpwatch-2.1a15/util.h
---- arpwatch-2.1a15.orig/util.h 1996-10-06 14:22:14.000000000 +0400
-+++ arpwatch-2.1a15/util.h 2006-09-22 19:34:07.000000000 +0400
-@@ -17,3 +17,4 @@
-
- extern int debug;
- extern int initializing;
-+extern int nopromisc;
diff --git a/main/arpwatch/06_all_arpwatch-2.1a15-bogons-report.patch b/main/arpwatch/06_all_arpwatch-2.1a15-bogons-report.patch
deleted file mode 100644
index a6bdaefd77..0000000000
--- a/main/arpwatch/06_all_arpwatch-2.1a15-bogons-report.patch
+++ /dev/null
@@ -1,507 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.c arpwatch-2.1a15/arpsnmp.c
---- arpwatch-2.1a15.orig/arpsnmp.c 2006-09-22 19:44:44.000000000 +0400
-+++ arpwatch-2.1a15/arpsnmp.c 2006-09-22 19:41:19.000000000 +0400
-@@ -63,7 +63,7 @@
- /* Forwards */
- int main(int, char **);
- int readsnmp(char *);
--int snmp_add(u_int32_t, u_char *, time_t, char *);
-+int snmp_add(u_int32_t, u_char *, time_t, char *, char *);
- __dead void usage(void) __attribute__((volatile));
-
- char *prog;
-@@ -149,22 +149,24 @@
- static time_t now;
-
- int
--snmp_add(register u_int32_t a, register u_char *e, time_t t, register char *h)
-+snmp_add(register u_int32_t a, register u_char *e, time_t t, register char *h,
-+ char *interface)
- {
- /* Watch for ethernet broadcast */
- if (MEMCMP(e, zero, 6) == 0 || MEMCMP(e, allones, 6) == 0) {
-- dosyslog(LOG_INFO, "ethernet broadcast", a, e, NULL);
-+ dosyslog(LOG_INFO, "ethernet broadcast", a, e, NULL,
-+ interface);
- return (1);
- }
-
- /* Watch for some ip broadcast addresses */
- if (a == 0 || a == 1) {
-- dosyslog(LOG_INFO, "ip broadcast", a, e, NULL);
-+ dosyslog(LOG_INFO, "ip broadcast", a, e, NULL, interface);
- return (1);
- }
-
- /* Use current time (although it would be nice to subtract idle time) */
-- return (ent_add(a, e, now, h));
-+ return (ent_add(a, e, now, h, interface));
- }
-
- /* Process an snmp file */
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8 2006-09-22 19:44:53.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8 2006-09-22 19:41:19.000000000 +0400
-@@ -64,6 +64,11 @@
- [
- .B -p
- ]
-+.br
-+.ti +8
-+[
-+.B -a
-+]
- .ad
- .SH DESCRIPTION
- .B Arpwatch
-@@ -130,6 +135,17 @@
- .B arpwatch.
- YMMV. (This feature comes from Debian).
- .LP
-+The
-+.B -a
-+flag tells
-+.B arpwatch
-+to report bogons about every IP address. By default,
-+.B arpwatch
-+reports bogons for IP addresses that are in the same subnet with the first IP
-+address of the default interface (unless
-+.B -N
-+is given). (This feature comes from Debian).
-+.LP
- Note that an empty
- .I arp.dat
- file must be created before the first time you run
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c 2006-09-22 19:44:53.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c 2006-09-22 19:41:19.000000000 +0400
-@@ -142,6 +142,8 @@
- int sanity_fddi(struct fddi_header *, struct ether_arp *, int);
- __dead void usage(void) __attribute__((volatile));
-
-+static char *interface;
-+
- int
- main(int argc, char **argv)
- {
-@@ -151,7 +153,7 @@
- register int fd;
- #endif
- register pcap_t *pd;
-- register char *interface, *rfilename;
-+ register char *rfilename;
- struct bpf_program code;
- char errbuf[PCAP_ERRBUF_SIZE];
- char options[] =
-@@ -163,6 +165,7 @@
- "r:"
- "s:"
- "p"
-+ "a"
- ;
-
- if (argv[0] == NULL)
-@@ -221,6 +224,10 @@
- ++nopromisc;
- break;
-
-+ case 'a':
-+ ++allsubnets;
-+ break;
-+
- default:
- usage();
- }
-@@ -399,29 +406,31 @@
-
- /* Watch for bogons */
- if (isbogon(sia)) {
-- dosyslog(LOG_INFO, "bogon", sia, sea, sha);
-- return;
-+ dosyslog(LOG_INFO, "bogon", sia, sea, sha, interface);
-+ if (!allsubnets) return;
- }
-
- /* Watch for ethernet broadcast */
- if (MEMCMP(sea, zero, 6) == 0 || MEMCMP(sea, allones, 6) == 0 ||
- MEMCMP(sha, zero, 6) == 0 || MEMCMP(sha, allones, 6) == 0) {
-- dosyslog(LOG_INFO, "ethernet broadcast", sia, sea, sha);
-+ dosyslog(LOG_INFO, "ethernet broadcast", sia, sea, sha,
-+ interface);
- return;
- }
-
- /* Double check ethernet addresses */
- if (MEMCMP(sea, sha, 6) != 0) {
-- dosyslog(LOG_INFO, "ethernet mismatch", sia, sea, sha);
-+ dosyslog(LOG_INFO, "ethernet mismatch", sia, sea, sha,
-+ interface);
- return;
- }
-
- /* Got a live one */
- t = h->ts.tv_sec;
- can_checkpoint = 0;
-- if (!ent_add(sia, sea, t, NULL))
-- syslog(LOG_ERR, "ent_add(%s, %s, %ld) failed",
-- intoa(sia), e2str(sea), t);
-+ if (!ent_add(sia, sea, t, NULL, interface))
-+ syslog(LOG_ERR, "ent_add(%s, %s, %ld, %s) failed",
-+ intoa(sia), e2str(sea), t, interface);
- can_checkpoint = 1;
- }
-
-@@ -548,29 +557,31 @@
-
- /* Watch for bogons */
- if (isbogon(sia)) {
-- dosyslog(LOG_INFO, "bogon", sia, sea, sha);
-- return;
-+ dosyslog(LOG_INFO, "bogon", sia, sea, sha, interface);
-+ if (!allsubnets) return;
- }
-
- /* Watch for ethernet broadcast */
- if (MEMCMP(sea, zero, 6) == 0 || MEMCMP(sea, allones, 6) == 0 ||
- MEMCMP(sha, zero, 6) == 0 || MEMCMP(sha, allones, 6) == 0) {
-- dosyslog(LOG_INFO, "ethernet broadcast", sia, sea, sha);
-+ dosyslog(LOG_INFO, "ethernet broadcast", sia, sea, sha,
-+ interface);
- return;
- }
-
- /* Double check ethernet addresses */
- if (MEMCMP(sea, sha, 6) != 0) {
-- dosyslog(LOG_INFO, "ethernet mismatch", sia, sea, sha);
-+ dosyslog(LOG_INFO, "ethernet mismatch", sia, sea, sha,
-+ interface);
- return;
- }
-
- /* Got a live one */
- t = h->ts.tv_sec;
- can_checkpoint = 0;
-- if (!ent_add(sia, sea, t, NULL))
-- syslog(LOG_ERR, "ent_add(%s, %s, %ld) failed",
-- intoa(sia), e2str(sea), t);
-+ if (!ent_add(sia, sea, t, NULL, interface))
-+ syslog(LOG_ERR, "ent_add(%s, %s, %ld, %s) failed",
-+ intoa(sia), e2str(sea), t, interface);
- can_checkpoint = 1;
- }
-
-@@ -775,6 +786,7 @@
- "[-r file] "
- "[-s sendmail_path] "
- "[-p] "
-+ "[-a] "
- "\n"
- ;
-
-diff -Naru arpwatch-2.1a15.orig/db.c arpwatch-2.1a15/db.c
---- arpwatch-2.1a15.orig/db.c 2000-10-01 03:39:58.000000000 +0400
-+++ arpwatch-2.1a15/db.c 2006-09-22 19:43:35.000000000 +0400
-@@ -64,6 +64,7 @@
- u_char e[6]; /* ether address */
- char h[34]; /* simple hostname */
- time_t t; /* timestamp */
-+ char i[16]; /* interface */
- };
-
- /* Address info */
-@@ -80,13 +81,14 @@
-
- static void alist_alloc(struct ainfo *);
- int cmpeinfo(const void *, const void *);
--static struct einfo *elist_alloc(u_int32_t, u_char *, time_t, char *);
-+static struct einfo *elist_alloc(u_int32_t, u_char *, time_t, char *, char *);
- static struct ainfo *ainfo_find(u_int32_t);
- static void check_hname(struct ainfo *);
- struct ainfo *newainfo(void);
-
- int
--ent_add(register u_int32_t a, register u_char *e, time_t t, register char *h)
-+ent_add(register u_int32_t a, register u_char *e, time_t t, register char *h,
-+ char *interface)
- {
- register struct ainfo *ap;
- register struct einfo *ep;
-@@ -103,7 +105,8 @@
- ep = ap->elist[0];
- if (MEMCMP(e, ep->e, 6) == 0) {
- if (t - ep->t > NEWACTIVITY_DELTA) {
-- report("new activity", a, e, NULL, &t, &ep->t);
-+ report("new activity", a, e, NULL, &t, &ep->t,
-+ interface);
- check_hname(ap);
- }
- ep->t = t;
-@@ -114,8 +117,8 @@
- /* Check for a virgin ainfo record */
- if (ap->ecount == 0) {
- ap->ecount = 1;
-- ap->elist[0] = elist_alloc(a, e, t, h);
-- report("new station", a, e, NULL, &t, NULL);
-+ ap->elist[0] = elist_alloc(a, e, t, h, interface);
-+ report("new station", a, e, NULL, &t, NULL, interface);
- return (1);
- }
-
-@@ -133,9 +136,11 @@
- if (t - t2 < FLIPFLIP_DELTA &&
- (isdecnet(e) || isdecnet(e2)))
- dosyslog(LOG_INFO,
-- "suppressed DECnet flip flop", a, e, e2);
-+ "suppressed DECnet flip flop", a, e, e2,
-+ interface);
- else
-- report("flip flop", a, e, e2, &t, &t2);
-+ report("flip flop", a, e, e2, &t, &t2,
-+ interface);
- ap->elist[1] = ap->elist[0];
- ap->elist[0] = ep;
- ep->t = t;
-@@ -151,7 +156,7 @@
- e2 = ap->elist[0]->e;
- t2 = ap->elist[0]->t;
- dosyslog(LOG_NOTICE, "reused old ethernet address",
-- a, e, e2);
-+ a, e, e2, interface);
- /* Shift entries down */
- len = i * sizeof(ap->elist[0]);
- BCOPY(&ap->elist[0], &ap->elist[1], len);
-@@ -165,12 +170,12 @@
- /* New ether address */
- e2 = ap->elist[0]->e;
- t2 = ap->elist[0]->t;
-- report("changed ethernet address", a, e, e2, &t, &t2);
-+ report("changed ethernet address", a, e, e2, &t, &t2, interface);
- /* Make room at head of list */
- alist_alloc(ap);
- len = ap->ecount * sizeof(ap->elist[0]);
- BCOPY(&ap->elist[0], &ap->elist[1], len);
-- ap->elist[0] = elist_alloc(a, e, t, h);
-+ ap->elist[0] = elist_alloc(a, e, t, h, interface);
- ++ap->ecount;
- return (1);
- }
-@@ -227,7 +232,7 @@
- for (ap = &ainfo_table[i]; ap != NULL; ap = ap->next)
- for (j = 0; j < ap->ecount; ++j) {
- ep = ap->elist[j];
-- (*fn)(ap->a, ep->e, ep->t, ep->h);
-+ (*fn)(ap->a, ep->e, ep->t, ep->h, ep->i);
- ++n;
- }
- return (n);
-@@ -259,7 +264,7 @@
- /* Allocate and initialize a elist struct */
- static struct einfo *
- elist_alloc(register u_int32_t a, register u_char *e, register time_t t,
-- register char *h)
-+ register char *h, char *interface)
- {
- register struct einfo *ep;
- register u_int size;
-@@ -286,6 +291,8 @@
- if (h != NULL && !isdigit((int)*h))
- strcpy(ep->h, h);
- ep->t = t;
-+ if (interface != NULL)
-+ strncpy(ep->i, interface, 16);
- return (ep);
- }
-
-diff -Naru arpwatch-2.1a15.orig/db.h arpwatch-2.1a15/db.h
---- arpwatch-2.1a15.orig/db.h 1996-06-05 09:39:30.000000000 +0400
-+++ arpwatch-2.1a15/db.h 2006-09-22 19:41:19.000000000 +0400
-@@ -1,10 +1,10 @@
- /* @(#) $Header: db.h,v 1.8 96/06/04 22:39:29 leres Exp $ (LBL) */
-
--typedef void (*ent_process)(u_int32_t, u_char *, time_t, char *);
-+typedef void (*ent_process)(u_int32_t, u_char *, time_t, char *, char *);
-
- #ifdef DEBUG
- void debugdump(void);
- #endif
--int ent_add(u_int32_t, u_char *, time_t, char *);
-+int ent_add(u_int32_t, u_char *, time_t, char *, char *);
- int ent_loop(ent_process);
- void sorteinfo(void);
-diff -Naru arpwatch-2.1a15.orig/file.c arpwatch-2.1a15/file.c
---- arpwatch-2.1a15.orig/file.c 2000-10-14 02:29:43.000000000 +0400
-+++ arpwatch-2.1a15/file.c 2006-09-22 19:41:19.000000000 +0400
-@@ -69,6 +69,7 @@
- u_int32_t a;
- register time_t t;
- register struct hostent *hp;
-+ char *interface;
- char line[1024];
- u_char e[6];
-
-@@ -117,6 +118,7 @@
- if (cp2 == NULL) {
- t = 0;
- h = NULL;
-+ interface = NULL;
- } else {
- t = atoi(cp2);
- h = strchr(cp2, '\t');
-@@ -126,11 +128,18 @@
- while (*cp2 != '\n' && *cp2 != '\t' &&
- *cp2 != '\0')
- ++cp2;
-+ if (*cp2 == '\t') {
-+ *cp2++ = '\0';
-+ while (*cp2 != '\n' && *cp2 != '\t' &&
-+ *cp2 != '\0') ++cp2;
-+ } else {
-+ interface = NULL;
-+ }
- *cp2 = '\0';
- }
- }
-
-- if (!(*fn)(a, e, t, h))
-+ if (!(*fn)(a, e, t, h, interface))
- return(0);
- }
-
-diff -Naru arpwatch-2.1a15.orig/file.h arpwatch-2.1a15/file.h
---- arpwatch-2.1a15.orig/file.h 1999-01-18 04:46:04.000000000 +0300
-+++ arpwatch-2.1a15/file.h 2006-09-22 19:41:19.000000000 +0400
-@@ -1,5 +1,5 @@
- /* @(#) $Header: file.h,v 1.4 99/01/17 17:46:03 leres Exp $ (LBL) */
-
--typedef int (*file_process)(u_int32_t, u_char *, time_t, char *);
-+typedef int (*file_process)(u_int32_t, u_char *, time_t, char *, char *);
-
- int file_loop(FILE *, file_process, const char *);
-diff -Naru arpwatch-2.1a15.orig/report.c arpwatch-2.1a15/report.c
---- arpwatch-2.1a15.orig/report.c 2006-09-22 19:44:44.000000000 +0400
-+++ arpwatch-2.1a15/report.c 2006-09-22 19:41:19.000000000 +0400
-@@ -233,7 +233,8 @@
-
- void
- report(register char *title, register u_int32_t a, register u_char *e1,
-- register u_char *e2, register time_t *t1p, register time_t *t2p)
-+ register u_char *e2, register time_t *t1p, register time_t *t2p,
-+ char *interface)
- {
- extern char *path_sendmail;
- register char *cp, *hn;
-@@ -254,7 +255,7 @@
-
- if (debug) {
- if (debug > 1) {
-- dosyslog(LOG_NOTICE, title, a, e1, e2);
-+ dosyslog(LOG_NOTICE, title, a, e1, e2, interface);
- return;
- }
- f = stdout;
-@@ -271,7 +272,7 @@
- }
-
- /* Syslog this event too */
-- dosyslog(LOG_NOTICE, title, a, e1, e2);
-+ dosyslog(LOG_NOTICE, title, a, e1, e2, interface);
-
- /* Update child depth */
- ++cdepth;
-@@ -303,16 +304,19 @@
-
- (void)fprintf(f, "From: %s\n", watchee);
- (void)fprintf(f, "To: %s\n", watcher);
-+ if (interface == NULL) interface = ""; /* shouldn't happen */
- hn = gethname(a);
- if (!isdigit(*hn))
-- (void)fprintf(f, "Subject: %s (%s)\n", title, hn);
-+ (void)fprintf(f, "Subject: %s (%s) %s\n", title, hn,
-+ interface);
- else {
-- (void)fprintf(f, "Subject: %s\n", title);
-+ (void)fprintf(f, "Subject: %s %s\n", title, interface);
- hn = unknown;
- }
- (void)putc('\n', f);
- (void)fprintf(f, fmt, "hostname", hn);
- (void)fprintf(f, fmt, "ip address", intoa(a));
-+ (void)fprintf(f, fmt, "interface", interface);
- (void)fprintf(f, fmt, "ethernet address", e2str(e1));
- if ((cp = ec_find(e1)) == NULL)
- cp = unknown;
-diff -Naru arpwatch-2.1a15.orig/report.h arpwatch-2.1a15/report.h
---- arpwatch-2.1a15.orig/report.h 1996-06-05 09:40:54.000000000 +0400
-+++ arpwatch-2.1a15/report.h 2006-09-22 19:41:19.000000000 +0400
-@@ -1,3 +1,3 @@
- /* @(#) $Header: report.h,v 1.3 96/06/04 22:40:53 leres Exp $ (LBL) */
-
--void report(char *, u_int32_t, u_char *, u_char *, time_t *, time_t *);
-+void report(char *, u_int32_t, u_char *, u_char *, time_t *, time_t *, char *);
-diff -Naru arpwatch-2.1a15.orig/util.c arpwatch-2.1a15/util.c
---- arpwatch-2.1a15.orig/util.c 2006-09-22 19:44:53.000000000 +0400
-+++ arpwatch-2.1a15/util.c 2006-09-22 19:41:19.000000000 +0400
-@@ -62,11 +62,12 @@
- int debug = 0;
- int initializing = 1; /* true if initializing */
- int nopromisc = 0; /* don't activate promisc mode by default */
-+int allsubnets = 0; /* watch all attached subnets */
-
- /* syslog() helper routine */
- void
- dosyslog(register int p, register char *s, register u_int32_t a,
-- register u_char *ea, register u_char *ha)
-+ register u_char *ea, register u_char *ha, char *interface)
- {
- char xbuf[64];
-
-@@ -83,23 +84,21 @@
- }
-
- if (debug)
-- fprintf(stderr, "%s: %s %s %s\n", prog, s, intoa(a), xbuf);
-+ fprintf(stderr, "%s: %s %s %s %s\n", prog, s, intoa(a),
-+ xbuf, interface);
- else
-- syslog(p, "%s %s %s", s, intoa(a), xbuf);
-+ syslog(p, "%s %s %s %s", s, intoa(a), xbuf, interface);
- }
-
- static FILE *dumpf;
-
- void
- dumpone(register u_int32_t a, register u_char *e, register time_t t,
-- register char *h)
-+ register char *h, char *interface)
- {
-- (void)fprintf(dumpf, "%s\t%s", e2str(e), intoa(a));
-- if (t != 0 || h != NULL)
-- (void)fprintf(dumpf, "\t%u", (u_int32_t)t);
-- if (h != NULL && *h != '\0')
-- (void)fprintf(dumpf, "\t%s", h);
-- (void)putc('\n', dumpf);
-+ (void)fprintf(dumpf, "%s\t%s\t%u\t%s\t%s\n", e2str(e), intoa(a),
-+ (u_int32_t)t, ((h != NULL)?h:""),
-+ ((interface != NULL)?interface:""));
- }
-
- int
-diff -Naru arpwatch-2.1a15.orig/util.h arpwatch-2.1a15/util.h
---- arpwatch-2.1a15.orig/util.h 2006-09-22 19:44:53.000000000 +0400
-+++ arpwatch-2.1a15/util.h 2006-09-22 19:41:19.000000000 +0400
-@@ -1,8 +1,8 @@
- /* @(#) $Header: util.h,v 1.2 96/10/06 03:22:13 leres Exp $ (LBL) */
-
--void dosyslog(int, char *, u_int32_t, u_char *, u_char *);
-+void dosyslog(int, char *, u_int32_t, u_char *, u_char *, char *);
- int dump(void);
--void dumpone(u_int32_t, u_char *, time_t, char *);
-+void dumpone(u_int32_t, u_char *, time_t, char *, char *);
- int readdata(void);
- char *savestr(const char *);
-
-@@ -18,3 +18,4 @@
- extern int debug;
- extern int initializing;
- extern int nopromisc;
-+extern int allsubnets;
diff --git a/main/arpwatch/07_all_arpwatch-2.1a15-specify-mail.patch b/main/arpwatch/07_all_arpwatch-2.1a15-specify-mail.patch
deleted file mode 100644
index b3b34b1246..0000000000
--- a/main/arpwatch/07_all_arpwatch-2.1a15-specify-mail.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.8 arpwatch-2.1a15/arpsnmp.8
---- arpwatch-2.1a15.orig/arpsnmp.8 2006-09-22 19:44:44.000000000 +0400
-+++ arpwatch-2.1a15/arpsnmp.8 2006-09-22 19:57:15.000000000 +0400
-@@ -42,6 +42,12 @@
- ]
- .br
- .ti +8
-+[
-+.B -m
-+.I addr
-+]
-+.br
-+.ti +8
- .I file
- [
- .I ...
-@@ -55,6 +61,13 @@
- .BR snmpwalk (1)).
- .LP
- The
-+.B -m
-+option is used to specify the e-mail address to which reports will be
-+sent. By default, reports are sent to
-+.I root
-+on the local machine. (This feature comes from Debian).
-+.LP
-+The
- .B -d
- flag is used enable debugging. This also inhibits mailing the reports.
- Instead, they are sent to
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.c arpwatch-2.1a15/arpsnmp.c
---- arpwatch-2.1a15.orig/arpsnmp.c 2006-09-22 19:46:34.000000000 +0400
-+++ arpwatch-2.1a15/arpsnmp.c 2006-09-22 19:57:55.000000000 +0400
-@@ -82,6 +82,7 @@
- char options[] =
- "d"
- "f:"
-+ "m:"
- "s:"
- ;
-
-@@ -111,6 +112,10 @@
- arpfile = optarg;
- break;
-
-+ case 'm':
-+ mailaddress = optarg;
-+ break;
-+
- case 's':
- path_sendmail = optarg;
- break;
-@@ -197,6 +202,7 @@
- char usage[] =
- "[-d] "
- "[-f datafile] "
-+ "[-m e-mail ] "
- "[-s sendmail_path] "
- "file [...]\n"
- ;
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8 2006-09-22 19:46:34.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8 2006-09-22 19:53:35.000000000 +0400
-@@ -46,7 +46,7 @@
- [
- .B -n
- .IR net [/ width
--]]
-+] ]
- .br
- .ti +8
- [
-@@ -56,6 +56,12 @@
- .br
- .ti +8
- [
-+.B -m
-+.I e-mail
-+]
-+.br
-+.ti +8
-+[
- .B -s
- .I sendmail_path
- ]
-@@ -120,6 +126,13 @@
- does not fork.
- .LP
- The
-+.B -m
-+option is used to specify the e-mail address to which reports will be
-+sent. By default, reports are sent to
-+.I root
-+on the local machine. (This feature comes from Debian).
-+.LP
-+The
- .B -s
- flag is used to specify the path to the sendmail program. Any program that
- takes the option -odi and then text from stdin can be substituted. This is
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c 2006-09-22 19:46:34.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c 2006-09-22 19:58:46.000000000 +0400
-@@ -163,6 +163,7 @@
- "n:"
- "N"
- "r:"
-+ "m:"
- "s:"
- "p"
- "a"
-@@ -216,6 +217,10 @@
- rfilename = optarg;
- break;
-
-+ case 'm':
-+ mailaddress = optarg;
-+ break;
-+
- case 's':
- path_sendmail = optarg;
- break;
-@@ -784,6 +789,7 @@
- "[-i interface] "
- "[-n net[/width]] "
- "[-r file] "
-+ "[-m e-mail] "
- "[-s sendmail_path] "
- "[-p] "
- "[-a] "
-diff -Naru arpwatch-2.1a15.orig/report.c arpwatch-2.1a15/report.c
---- arpwatch-2.1a15.orig/report.c 2006-09-22 19:46:34.000000000 +0400
-+++ arpwatch-2.1a15/report.c 2006-09-22 19:59:18.000000000 +0400
-@@ -242,7 +242,7 @@
- register FILE *f;
- char tempfile[64], cpu[64], os[64];
- char *fmt = "%20s: %s\n";
-- char *watcher = WATCHER;
-+ char *watcher = mailaddress;
- char *watchee = WATCHEE;
- char *sendmail = path_sendmail;
- char *unknown = "<unknown>";
-diff -Naru arpwatch-2.1a15.orig/util.c arpwatch-2.1a15/util.c
---- arpwatch-2.1a15.orig/util.c 2006-09-22 19:46:34.000000000 +0400
-+++ arpwatch-2.1a15/util.c 2006-09-22 20:00:25.000000000 +0400
-@@ -50,6 +50,7 @@
- #include "ec.h"
- #include "file.h"
- #include "util.h"
-+#include "addresses.h"
-
- char *arpdir = ARPDIR;
- char *arpfile = ARPFILE;
-@@ -63,6 +64,7 @@
- int initializing = 1; /* true if initializing */
- int nopromisc = 0; /* don't activate promisc mode by default */
- int allsubnets = 0; /* watch all attached subnets */
-+char *mailaddress = WATCHER;
-
- /* syslog() helper routine */
- void
-diff -Naru arpwatch-2.1a15.orig/util.h arpwatch-2.1a15/util.h
---- arpwatch-2.1a15.orig/util.h 2006-09-22 19:46:34.000000000 +0400
-+++ arpwatch-2.1a15/util.h 2006-09-22 20:00:39.000000000 +0400
-@@ -19,3 +19,4 @@
- extern int initializing;
- extern int nopromisc;
- extern int allsubnets;
-+extern char *mailaddress;
diff --git a/main/arpwatch/08_all_arpwatch-2.1a15-drop-priveleges.patch b/main/arpwatch/08_all_arpwatch-2.1a15-drop-priveleges.patch
deleted file mode 100644
index b0283e6a65..0000000000
--- a/main/arpwatch/08_all_arpwatch-2.1a15-drop-priveleges.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8 2006-09-23 22:13:55.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8 2006-09-23 22:15:30.000000000 +0400
-@@ -75,6 +75,18 @@
- [
- .B -a
- ]
-+.br
-+.ti +8
-+[
-+.B -u
-+.I username
-+]
-+.br
-+.ti +8
-+[
-+.B -R
-+.I seconds
-+]
- .ad
- .SH DESCRIPTION
- .B Arpwatch
-@@ -159,6 +171,32 @@
- .B -N
- is given). (This feature comes from Debian).
- .LP
-+The
-+.B -u
-+flag instructs
-+.B arpwatch
-+to drop root privileges and change the UID to
-+.I username
-+and GID to the primary group of
-+.IR username .
-+This is recommended for security reasons, but
-+.I username
-+has to have write access to the default directory. (This feature comes from Debian).
-+.LP
-+The
-+.B -R
-+flag instructs
-+.B arpwatch
-+to restart in
-+.I seconds
-+seconds after the interface went down. By default, in such cases
-+arpwatch would print an error message and exit. This option is
-+ignored if either the
-+.B -r
-+or
-+.B -u
-+flags are used. (This feature comes from Debian).
-+.LP
- Note that an empty
- .I arp.dat
- file must be created before the first time you run
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c 2006-09-23 22:13:55.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c 2006-09-23 22:11:41.000000000 +0400
-@@ -62,7 +62,8 @@
- #include <string.h>
- #include <syslog.h>
- #include <unistd.h>
--
-+#include <pwd.h>
-+#include <grp.h>
- #include <pcap.h>
-
- #include "gnuc.h"
-@@ -144,6 +145,24 @@
-
- static char *interface;
-
-+void dropprivileges(const char* user)
-+{
-+ struct passwd* pw;
-+ pw = getpwnam( user );
-+ if ( pw ) {
-+ if ( initgroups(pw->pw_name, 0) != 0 || setgid(pw->pw_gid) != 0 ||
-+ setuid(pw->pw_uid) != 0 ) {
-+ syslog(LOG_ERR, "Couldn't change to '%.32s' uid=%d gid=%d", user,pw->pw_uid, pw->pw_gid);
-+ exit(1);
-+ }
-+ }
-+ else {
-+ syslog(LOG_ERR, "Couldn't find user '%.32s' in /etc/passwd", user);
-+ exit(1);
-+ }
-+ syslog(LOG_INFO, "Running as uid=%d gid=%d", getuid(), getgid());
-+}
-+
- int
- main(int argc, char **argv)
- {
-@@ -156,6 +175,7 @@
- register char *rfilename;
- struct bpf_program code;
- char errbuf[PCAP_ERRBUF_SIZE];
-+ char* username = NULL;
- char options[] =
- "d"
- "f:"
-@@ -167,6 +187,7 @@
- "s:"
- "p"
- "a"
-+ "u:"
- ;
-
- if (argv[0] == NULL)
-@@ -233,6 +254,10 @@
- ++allsubnets;
- break;
-
-+ case 'u':
-+ username = optarg;
-+ break;
-+
- default:
- usage();
- }
-@@ -310,12 +335,16 @@
- #endif
- }
-
-+ if ( username ) {
-+ dropprivileges( username );
-+ } else {
- /*
- * Revert to non-privileged user after opening sockets
- * (not needed on most systems).
- */
-- setgid(getgid());
-- setuid(getuid());
-+ setgid(getgid());
-+ setuid(getuid());
-+ }
-
- /* Must be ethernet or fddi */
- linktype = pcap_datalink(pd);
-@@ -793,6 +822,7 @@
- "[-s sendmail_path] "
- "[-p] "
- "[-a] "
-+ "[-u username] "
- "\n"
- ;
-
diff --git a/main/arpwatch/09_all_arpwatch-2.1a15-quite-mail.patch b/main/arpwatch/09_all_arpwatch-2.1a15-quite-mail.patch
deleted file mode 100644
index ce5c4b244b..0000000000
--- a/main/arpwatch/09_all_arpwatch-2.1a15-quite-mail.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8 2006-09-23 22:16:05.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8 2006-09-23 22:17:15.000000000 +0400
-@@ -87,6 +87,11 @@
- .B -R
- .I seconds
- ]
-+.br
-+.ti +8
-+[
-+.B -Q
-+]
- .ad
- .SH DESCRIPTION
- .B Arpwatch
-@@ -197,6 +202,10 @@
- .B -u
- flags are used. (This feature comes from Debian).
- .LP
-+The
-+.B -Q
-+flags prevents arpwatch from sending reports by mail. (This feature comes from Debian).
-+.LP
- Note that an empty
- .I arp.dat
- file must be created before the first time you run
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c 2006-09-23 22:16:05.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c 2006-09-23 22:18:10.000000000 +0400
-@@ -188,6 +188,7 @@
- "p"
- "a"
- "u:"
-+ "Q"
- ;
-
- if (argv[0] == NULL)
-@@ -258,6 +259,11 @@
- username = optarg;
- break;
-
-+ case 'Q':
-+ ++quiet;
-+ break;
-+
-+
- default:
- usage();
- }
-@@ -823,6 +829,7 @@
- "[-p] "
- "[-a] "
- "[-u username] "
-+ "[-Q ] "
- "\n"
- ;
-
-diff -Naru arpwatch-2.1a15.orig/report.c arpwatch-2.1a15/report.c
---- arpwatch-2.1a15.orig/report.c 2006-09-23 22:13:55.000000000 +0400
-+++ arpwatch-2.1a15/report.c 2006-09-23 22:17:15.000000000 +0400
-@@ -274,6 +274,10 @@
- /* Syslog this event too */
- dosyslog(LOG_NOTICE, title, a, e1, e2, interface);
-
-+ /* return if watcher is an empty string */
-+ if ( quiet )
-+ return;
-+
- /* Update child depth */
- ++cdepth;
-
-diff -Naru arpwatch-2.1a15.orig/util.c arpwatch-2.1a15/util.c
---- arpwatch-2.1a15.orig/util.c 2006-09-23 22:13:55.000000000 +0400
-+++ arpwatch-2.1a15/util.c 2006-09-23 22:17:15.000000000 +0400
-@@ -65,6 +65,7 @@
- int nopromisc = 0; /* don't activate promisc mode by default */
- int allsubnets = 0; /* watch all attached subnets */
- char *mailaddress = WATCHER;
-+int quiet = 0; /* send mail by default */
-
- /* syslog() helper routine */
- void
-diff -Naru arpwatch-2.1a15.orig/util.h arpwatch-2.1a15/util.h
---- arpwatch-2.1a15.orig/util.h 2006-09-23 22:13:55.000000000 +0400
-+++ arpwatch-2.1a15/util.h 2006-09-23 22:17:15.000000000 +0400
-@@ -20,3 +20,4 @@
- extern int nopromisc;
- extern int allsubnets;
- extern char *mailaddress;
-+extern int quiet;
diff --git a/main/arpwatch/10_all_arpwatch-2.1a15-ignore-net.patch b/main/arpwatch/10_all_arpwatch-2.1a15-ignore-net.patch
deleted file mode 100644
index 2b9405d81e..0000000000
--- a/main/arpwatch/10_all_arpwatch-2.1a15-ignore-net.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8 2006-09-23 22:19:29.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8 2006-09-23 22:19:55.000000000 +0400
-@@ -92,6 +92,12 @@
- [
- .B -Q
- ]
-+.br
-+.ti +8
-+[
-+.B -z
-+.I ignorenet/ignoremask
-+]
- .ad
- .SH DESCRIPTION
- .B Arpwatch
-@@ -206,6 +212,11 @@
- .B -Q
- flags prevents arpwatch from sending reports by mail. (This feature comes from Debian).
- .LP
-+The
-+.B -z
-+flag is used to set a range of ip addresses to ignore (such as a DHCP
-+range). Netmask is specified as 255.255.128.0. (This feature comes from Debian).
-+.LP
- Note that an empty
- .I arp.dat
- file must be created before the first time you run
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c 2006-09-23 22:19:29.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c 2006-09-23 22:19:55.000000000 +0400
-@@ -125,6 +125,9 @@
- static int nets_ind;
- static int nets_size;
-
-+static struct in_addr ignore_net;
-+static struct in_addr ignore_netmask;
-+
- extern int optind;
- extern int opterr;
- extern char *optarg;
-@@ -189,7 +192,9 @@
- "a"
- "u:"
- "Q"
-+ "z:"
- ;
-+ char *tmpptr;
-
- if (argv[0] == NULL)
- prog = "arpwatch";
-@@ -207,6 +212,9 @@
- interface = NULL;
- rfilename = NULL;
- pd = NULL;
-+
-+ inet_aton("0.0.0.0", &ignore_netmask);
-+ inet_aton("255.255.255.255", &ignore_netmask);
- while ((op = getopt(argc, argv, options)) != EOF)
- switch (op) {
-
-@@ -263,6 +271,12 @@
- ++quiet;
- break;
-
-+ case 'z':
-+ tmpptr = strtok(optarg, "/");
-+ inet_aton(tmpptr, &ignore_net);
-+ tmpptr = strtok(NULL, "/");
-+ inet_aton(tmpptr, &ignore_netmask);
-+ break;
-
- default:
- usage();
-@@ -465,6 +479,14 @@
- return;
- }
-
-+ /* Ignores the specified netmask/metwork */
-+ if ((sia & ignore_netmask.s_addr) == ignore_net.s_addr) {
-+ if (debug) {
-+ dosyslog(LOG_INFO, "ignored", sia, sea, sha, interface);
-+ }
-+ return;
-+ }
-+
- /* Got a live one */
- t = h->ts.tv_sec;
- can_checkpoint = 0;
-@@ -830,6 +852,7 @@
- "[-a] "
- "[-u username] "
- "[-Q ] "
-+ "[-z ignorenet/ignoremask] "
- "\n"
- ;
-
diff --git a/main/arpwatch/11_all_arpwatch-2.1a15-secure-tmp.patch b/main/arpwatch/11_all_arpwatch-2.1a15-secure-tmp.patch
deleted file mode 100644
index 4e9cd88b8a..0000000000
--- a/main/arpwatch/11_all_arpwatch-2.1a15-secure-tmp.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/bihourly.sh arpwatch-2.1a15/bihourly.sh
---- arpwatch-2.1a15.orig/bihourly.sh 2006-07-28 22:19:45.000000000 +0400
-+++ arpwatch-2.1a15/bihourly.sh 2006-09-22 21:29:38.000000000 +0400
-@@ -10,8 +10,8 @@
- #
- list="`cat list`"
- cname="`cat cname`"
--temp1=/tmp/bihourly.1.$$
--temp2=/tmp/bihourly.2.$$
-+temp1=$(mktemp)
-+temp2=$(mktemp)
- d=/tmp/errs
-
- # imperfect hack
-diff -Naru arpwatch-2.1a15.orig/mkdep arpwatch-2.1a15/mkdep
---- arpwatch-2.1a15.orig/mkdep 1996-06-23 13:25:24.000000000 +0400
-+++ arpwatch-2.1a15/mkdep 2006-09-22 21:30:04.000000000 +0400
-@@ -51,7 +51,7 @@
- exit 1
- fi
-
--TMP=/tmp/mkdep$$
-+TMP=$(mktemp)
-
- trap 'rm -f $TMP ; exit 1' 1 2 3 13 15
-
diff --git a/main/arpwatch/12_all_arpwatch-2.1a15-defalt-dir-in-manpages.patch b/main/arpwatch/12_all_arpwatch-2.1a15-defalt-dir-in-manpages.patch
deleted file mode 100644
index de4db37b68..0000000000
--- a/main/arpwatch/12_all_arpwatch-2.1a15-defalt-dir-in-manpages.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.8 arpwatch-2.1a15/arpsnmp.8
---- arpwatch-2.1a15.orig/arpsnmp.8 2006-09-22 20:02:04.000000000 +0400
-+++ arpwatch-2.1a15/arpsnmp.8 2006-09-22 21:35:52.000000000 +0400
-@@ -100,7 +100,7 @@
- .na
- .nh
- .nf
--/usr/operator/arpwatch - default directory
-+/usr/lib/arpwatch - default directory
- arp.dat - ethernet/ip address database
- ethercodes.dat - vendor ethernet block list
- .ad
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8 2006-09-22 20:32:56.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8 2006-09-22 21:36:16.000000000 +0400
-@@ -275,7 +275,7 @@
- .na
- .nh
- .nf
--/usr/operator/arpwatch - default directory
-+/usr/lib/arpwatch - default directory
- arp.dat - ethernet/ip address database
- ethercodes.dat - vendor ethernet block list
- .ad
diff --git a/main/arpwatch/13_all_arpwatch-2.1a15-scripts-awk.patch b/main/arpwatch/13_all_arpwatch-2.1a15-scripts-awk.patch
deleted file mode 100644
index 227fd328de..0000000000
--- a/main/arpwatch/13_all_arpwatch-2.1a15-scripts-awk.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arp2ethers arpwatch-2.1a15/arp2ethers
---- arpwatch-2.1a15.orig/arp2ethers 2002-01-05 22:40:48.000000000 +0300
-+++ arpwatch-2.1a15/arp2ethers 2006-09-23 22:47:02.000000000 +0400
-@@ -13,11 +13,10 @@
- # - sort
- #
-
--sort +2rn arp.dat | \
-- awk 'NF == 4 { print }' | \
-+export AWKPATH="$AWKPATH:/usr/share/arpwatch/awk"
-+
-+sort -k 3rn ${1:-/var/lib/arpwatch/arp.dat} | \
- awk -f p.awk | \
-- egrep -v '\.[0-9][0-9]*$' | \
-- sed -e 's/ .* / /' | \
- awk -f d.awk | \
- awk -f e.awk | \
- sort
-diff -Naru arpwatch-2.1a15.orig/massagevendor arpwatch-2.1a15/massagevendor
---- arpwatch-2.1a15.orig/massagevendor 2004-01-28 22:32:43.000000000 +0300
-+++ arpwatch-2.1a15/massagevendor 2006-09-23 22:49:42.000000000 +0400
-@@ -9,6 +9,9 @@
- #
- # - Deal with duplicates in oui.txt (concatenate company names)
- #
-+
-+export AWKPATH="$AWKPATH:/usr/share/arpwatch/awk"
-+
- (sed -n \
- -e 's/^\([0-9A-F][0-9A-F]\)-\([0-9A-F][0-9A-F]\)-\([0-9A-F][0-9A-F]\) *(hex)[ ]*\(..*\)/\1\2\3 \4/p' \
- $* | \
diff --git a/main/arpwatch/14_all_arpwatch-2.1a15-paths-fix.patch b/main/arpwatch/14_all_arpwatch-2.1a15-paths-fix.patch
deleted file mode 100644
index 6162aeebfc..0000000000
--- a/main/arpwatch/14_all_arpwatch-2.1a15-paths-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpwatch.h arpwatch-2.1a15/arpwatch.h
---- arpwatch-2.1a15.orig/arpwatch.h 2000-10-01 03:40:55.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.h 2006-09-22 22:48:13.000000000 +0400
-@@ -1,7 +1,7 @@
- /* @(#) $Id: arpwatch.h,v 1.29 2000/09/30 23:40:49 leres Exp $ (LBL) */
-
- #define ARPFILE "arp.dat"
--#define ETHERCODES "ethercodes.dat"
-+/*#define ETHERCODES "ethercodes.dat" */
- #define CHECKPOINT (15*60) /* Checkpoint time in seconds */
-
- #define MEMCMP(a, b, n) memcmp((char *)a, (char *)b, n)
-diff -Naru arpwatch-2.1a15.orig/Makefile.in arpwatch-2.1a15/Makefile.in
---- arpwatch-2.1a15.orig/Makefile.in 2006-09-22 22:48:59.000000000 +0400
-+++ arpwatch-2.1a15/Makefile.in 2006-09-22 22:49:23.000000000 +0400
-@@ -31,7 +31,8 @@
- # Pathname of directory to install the man page
- MANDEST = @mandir@
- # Pathname of directory to install database file
--ARPDIR = $(prefix)/arpwatch
-+ARPDIR = /var/lib/arpwatch
-+ETHERCODES = /usr/share/arpwatch/ethercodes.dat
-
- # VPATH
- srcdir = @srcdir@
-@@ -45,7 +46,8 @@
- PROG = arpwatch
- CCOPT = @V_CCOPT@
- INCLS = -I. @V_INCLS@
--DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\"
-+DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\" \
-+ -DETHERCODES=\"$(ETHERCODES)\"
-
- # Standard CFLAGS
- CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
diff --git a/main/arpwatch/15_all_arpwatch-2.1a15-fix-dead-lock.patch b/main/arpwatch/15_all_arpwatch-2.1a15-fix-dead-lock.patch
deleted file mode 100644
index 9e94c7dd0c..0000000000
--- a/main/arpwatch/15_all_arpwatch-2.1a15-fix-dead-lock.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/report.c arpwatch-2.1a15/report.c
---- arpwatch-2.1a15.orig/report.c 2006-09-23 19:31:47.000000000 +0400
-+++ arpwatch-2.1a15/report.c 2006-09-23 19:38:54.000000000 +0400
-@@ -217,7 +217,12 @@
- continue;
- /* ECHILD means no one left */
- if (errno != ECHILD)
-- syslog(LOG_ERR, "reaper: %m");
-+ /* It is dangerous to call non reentrant */
-+ /* functions from callback (POSIX) */
-+ /* Next line effectively disables this as */
-+ /* we never get here in debug */
-+ if (debug)
-+ syslog(LOG_ERR, "reaper: %m");
- break;
- }
- /* Already got everyone who was done */
-@@ -225,8 +230,13 @@
- break;
- --cdepth;
- if (WEXITSTATUS(status))
-+ /* It is dangerous to call non-reentrant */
-+ /* functions from callback (POSIX) */
-+ /* Next line effectively disables this as */
-+ /* we never get here in debug */
-+ if (debug)
- syslog(LOG_DEBUG, "reaper: pid %d, exit status %d",
-- pid, WEXITSTATUS(status));
-+ pid, WEXITSTATUS(status));
- }
- return RETSIGVAL;
- }
diff --git a/main/arpwatch/16_all_arpwatch-2.1a15-additional-manpages-cleanups.patch b/main/arpwatch/16_all_arpwatch-2.1a15-additional-manpages-cleanups.patch
deleted file mode 100644
index c026fcfc48..0000000000
--- a/main/arpwatch/16_all_arpwatch-2.1a15-additional-manpages-cleanups.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8 2006-09-23 22:23:03.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8 2006-09-23 22:22:15.000000000 +0400
-@@ -30,70 +30,70 @@
- .B -dN
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -f
- .I datafile
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -i
- .I interface
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -n
- .IR net [/ width
- ] ]
- .br
--.ti +8
-+.ti +9
- [
- .B -r
- .I file
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -m
- .I e-mail
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -s
- .I sendmail_path
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -p
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -a
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -u
- .I username
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -R
- .I seconds
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -Q
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -z
- .I ignorenet/ignoremask
-@@ -175,9 +175,9 @@
- .B -a
- flag tells
- .B arpwatch
--to report bogons about every IP address. By default,
-+to record bogons about every IP address. By default,
- .B arpwatch
--reports bogons for IP addresses that are in the same subnet with the first IP
-+records bogons for IP addresses that are in the same subnet with the first IP
- address of the default interface (unless
- .B -N
- is given). (This feature comes from Debian).
diff --git a/main/arpwatch/17_all_arpwatch-2.1a15-restart.patch b/main/arpwatch/17_all_arpwatch-2.1a15-restart.patch
deleted file mode 100644
index 9c7f119df4..0000000000
--- a/main/arpwatch/17_all_arpwatch-2.1a15-restart.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c 2006-09-23 22:20:51.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c 2006-09-23 22:24:49.000000000 +0400
-@@ -179,6 +179,8 @@
- struct bpf_program code;
- char errbuf[PCAP_ERRBUF_SIZE];
- char* username = NULL;
-+ int restart = 0;
-+ int restarting_loop = 0;
- char options[] =
- "d"
- "f:"
-@@ -191,6 +193,7 @@
- "p"
- "a"
- "u:"
-+ "R:"
- "Q"
- "z:"
- ;
-@@ -267,6 +270,10 @@
- username = optarg;
- break;
-
-+ case 'R':
-+ restart = atoi(optarg);
-+ break;
-+
- case 'Q':
- ++quiet;
- break;
-@@ -285,6 +292,12 @@
- if (optind != argc)
- usage();
-
-+ if ( username && restart ) {
-+ syslog(LOG_ERR, "Please, specify either -u or -R");
-+ (void)fprintf(stderr,"Please, specify either -u or -R. See arpwatch.8\n");
-+ exit(1);
-+ }
-+
- if (rfilename != NULL) {
- net = 0;
- netmask = 0;
-@@ -334,6 +347,7 @@
- syslog(LOG_ERR, "(using current working directory)");
- }
-
-+label_restart:
- if (rfilename != NULL) {
- pd = pcap_open_offline(rfilename, errbuf);
- if (pd == NULL) {
-@@ -348,22 +362,30 @@
- pd = pcap_open_live(interface, snaplen, !nopromisc, timeout, errbuf);
- if (pd == NULL) {
- syslog(LOG_ERR, "pcap open %s: %s", interface, errbuf);
-- exit(1);
-+ if (restart) {
-+ syslog(LOG_ERR, "restart in %d secs", restart);
-+ } else {
-+ exit(1);
-+ }
-+ sleep(restart);
-+ goto label_restart;
- }
- #ifdef WORDS_BIGENDIAN
- swapped = 1;
- #endif
- }
-
-- if ( username ) {
-- dropprivileges( username );
-- } else {
-- /*
-- * Revert to non-privileged user after opening sockets
-- * (not needed on most systems).
-- */
-- setgid(getgid());
-- setuid(getuid());
-+ if (!restarting_loop) {
-+ if ( username && !restart ) {
-+ dropprivileges( username );
-+ } else {
-+ /*
-+ * Revert to non-privileged user after opening sockets
-+ * (not needed on most systems).
-+ */
-+ setgid(getgid());
-+ setuid(getuid());
-+ }
- }
-
- /* Must be ethernet or fddi */
-@@ -386,26 +408,30 @@
- if (rfilename == NULL)
- syslog(LOG_INFO, "listening on %s", interface);
-
-- /* Read in database */
-- initializing = 1;
-- if (!readdata())
-- exit(1);
-- sorteinfo();
-+ if (!restarting_loop) {
-+ /* Read in database */
-+ initializing = 1;
-+ if (!readdata())
-+ exit(1);
-+ sorteinfo();
-+ }
- #ifdef DEBUG
- if (debug > 2) {
- debugdump();
- exit(0);
- }
- #endif
-- initializing = 0;
-+ if (!restarting_loop) {
-+ initializing = 0;
-
-- (void)setsignal(SIGINT, die);
-- (void)setsignal(SIGTERM, die);
-- (void)setsignal(SIGHUP, die);
-- if (rfilename == NULL) {
-- (void)setsignal(SIGQUIT, checkpoint);
-- (void)setsignal(SIGALRM, checkpoint);
-- (void)alarm(CHECKPOINT);
-+ (void)setsignal(SIGINT, die);
-+ (void)setsignal(SIGTERM, die);
-+ (void)setsignal(SIGHUP, die);
-+ if (rfilename == NULL) {
-+ (void)setsignal(SIGQUIT, checkpoint);
-+ (void)setsignal(SIGALRM, checkpoint);
-+ (void)alarm(CHECKPOINT);
-+ }
- }
-
- switch (linktype) {
-@@ -424,7 +450,15 @@
- }
- if (status < 0) {
- syslog(LOG_ERR, "pcap_loop: %s", pcap_geterr(pd));
-- exit(1);
-+ if (restart && rfilename == NULL) {
-+ syslog(LOG_ERR, "restart in %d secs", restart);
-+ ++restarting_loop;
-+ pcap_close(pd);
-+ } else {
-+ exit(1);
-+ }
-+ sleep(restart);
-+ goto label_restart;
- }
- pcap_close(pd);
- if (!dump())
-@@ -851,6 +885,7 @@
- "[-p] "
- "[-a] "
- "[-u username] "
-+ "[-R seconds ] "
- "[-Q ] "
- "[-z ignorenet/ignoremask] "
- "\n"
diff --git a/main/arpwatch/18_all_arpwatch-2.1a15-nofork.patch b/main/arpwatch/18_all_arpwatch-2.1a15-nofork.patch
deleted file mode 100644
index 83447f794f..0000000000
--- a/main/arpwatch/18_all_arpwatch-2.1a15-nofork.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Origianl idea comes from Matthias Andree.
-
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8 2006-09-24 09:34:36.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8 2006-09-24 10:06:24.000000000 +0400
-@@ -27,7 +27,12 @@
- .na
- .B arpwatch
- [
--.B -dN
-+.B -d
-+]
-+.br
-+.ti +9
-+[
-+.B -F
- ]
- .br
- .ti +9
-@@ -50,6 +55,11 @@
- .br
- .ti +9
- [
-+.B -N
-+]
-+.br
-+.ti +9
-+[
- .B -r
- .I file
- ]
-@@ -115,6 +125,14 @@
- .IR stderr .
- .LP
- The
-+.B -F
-+flag is used to prevent
-+.I arpwatch
-+from forking. This is allows to run
-+.I arpwatch
-+from daemon tools.
-+.LP
-+The
- .B -f
- flag is used to set the ethernet/ip address database filename.
- The default is
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c 2006-09-24 09:34:36.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c 2006-09-24 10:10:17.000000000 +0400
-@@ -179,10 +179,12 @@
- struct bpf_program code;
- char errbuf[PCAP_ERRBUF_SIZE];
- char* username = NULL;
-+ int nofork = 0;
- int restart = 0;
- int restarting_loop = 0;
- char options[] =
- "d"
-+ "F"
- "f:"
- "i:"
- "n:"
-@@ -229,6 +231,10 @@
- #endif
- break;
-
-+ case 'F':
-+ ++nofork;
-+ break;
-+
- case 'f':
- arpfile = optarg;
- break;
-@@ -319,12 +325,14 @@
-
- /* Drop into the background if not debugging */
- if (!debug) {
-- pid = fork();
-- if (pid < 0) {
-- syslog(LOG_ERR, "main fork(): %m");
-- exit(1);
-- } else if (pid != 0)
-- exit(0);
-+ if (!nofork) {
-+ pid = fork();
-+ if (pid < 0) {
-+ syslog(LOG_ERR, "main fork(): %m");
-+ exit(1);
-+ } else if (pid != 0)
-+ exit(0);
-+ }
- (void)close(fileno(stdin));
- (void)close(fileno(stdout));
- (void)close(fileno(stderr));
diff --git a/main/arpwatch/19_all_arpwatch-2.1a15-nonewstation.patch b/main/arpwatch/19_all_arpwatch-2.1a15-nonewstation.patch
deleted file mode 100644
index 521d31ae1b..0000000000
--- a/main/arpwatch/19_all_arpwatch-2.1a15-nonewstation.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -Naur arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8 2006-12-11 12:56:18.000000000 +0300
-+++ arpwatch-2.1a15/arpwatch.8 2006-12-11 12:56:53.000000000 +0300
-@@ -60,6 +60,11 @@
- .br
- .ti +9
- [
-+.B -S
-+]
-+.br
-+.ti +9
-+[
- .B -r
- .I file
- ]
-@@ -155,6 +160,10 @@
- flag disables reporting any bogons.
- .LP
- The
-+.B -S
-+flag disables reporting of new stations.
-+.LP
-+The
- .B -r
- flag is used to specify a savefile
- (perhaps created by
-diff -Naur arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c 2006-12-11 12:56:18.000000000 +0300
-+++ arpwatch-2.1a15/arpwatch.c 2006-12-11 12:56:53.000000000 +0300
-@@ -189,6 +189,7 @@
- "i:"
- "n:"
- "N"
-+ "S"
- "r:"
- "m:"
- "s:"
-@@ -252,6 +253,10 @@
- ++nobogons;
- break;
-
-+ case 'S':
-+ ++nonewstations;
-+ break;
-+
- case 'r':
- rfilename = optarg;
- break;
-@@ -883,7 +888,7 @@
- {
- extern char version[];
- char usage[] =
-- "[-dN] "
-+ "[-dNS] "
- "[-f datafile] "
- "[-i interface] "
- "[-n net[/width]] "
-@@ -894,7 +899,7 @@
- "[-a] "
- "[-u username] "
- "[-R seconds ] "
-- "[-Q ] "
-+ "[-Q] "
- "[-z ignorenet/ignoremask] "
- "\n"
- ;
-diff -Naur arpwatch-2.1a15.orig/arpwatch.h arpwatch-2.1a15/arpwatch.h
---- arpwatch-2.1a15.orig/arpwatch.h 2006-12-11 12:56:18.000000000 +0300
-+++ arpwatch-2.1a15/arpwatch.h 2006-12-11 12:57:13.000000000 +0300
-@@ -16,6 +16,8 @@
-
- extern char *prog;
-
-+extern int nonewstations; /* Turns off new-station reporting. */
-+
- #ifdef ETHER_HEADER_HAS_EA
- #define ESRC(ep) ((ep)->ether_shost.ether_addr_octet)
- #define EDST(ep) ((ep)->ether_dhost.ether_addr_octet)
-diff -Naur arpwatch-2.1a15.orig/db.c arpwatch-2.1a15/db.c
---- arpwatch-2.1a15.orig/db.c 2006-12-11 12:56:18.000000000 +0300
-+++ arpwatch-2.1a15/db.c 2006-12-11 12:57:34.000000000 +0300
-@@ -86,6 +86,8 @@
- static void check_hname(struct ainfo *);
- struct ainfo *newainfo(void);
-
-+int nonewstations = 0;
-+
- int
- ent_add(register u_int32_t a, register u_char *e, time_t t, register char *h,
- char *interface)
-@@ -118,7 +120,8 @@
- if (ap->ecount == 0) {
- ap->ecount = 1;
- ap->elist[0] = elist_alloc(a, e, t, h, interface);
-- report("new station", a, e, NULL, &t, NULL, interface);
-+ if (!nonewstations)
-+ report("new station", a, e, NULL, &t, NULL, interface);
- return (1);
- }
-
diff --git a/main/arpwatch/20_all_arpwatch-2.1a15-noreversedns-resolve.patch b/main/arpwatch/20_all_arpwatch-2.1a15-noreversedns-resolve.patch
deleted file mode 100644
index b2d523d491..0000000000
--- a/main/arpwatch/20_all_arpwatch-2.1a15-noreversedns-resolve.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -Naur arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8 2006-12-11 13:00:39.000000000 +0300
-+++ arpwatch-2.1a15/arpwatch.8 2006-12-11 13:00:55.000000000 +0300
-@@ -110,6 +110,11 @@
- .br
- .ti +9
- [
-+.B -D
-+]
-+.br
-+.ti +9
-+[
- .B -z
- .I ignorenet/ignoremask
- ]
-@@ -240,6 +245,10 @@
- flags prevents arpwatch from sending reports by mail. (This feature comes from Debian).
- .LP
- The
-+.B -D
-+flag turns off reverse-DNS queries. This can speed up operations significantly.
-+.LP
-+The
- .B -z
- flag is used to set a range of ip addresses to ignore (such as a DHCP
- range). Netmask is specified as 255.255.128.0. (This feature comes from Debian).
-diff -Naur arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c 2006-12-11 13:00:39.000000000 +0300
-+++ arpwatch-2.1a15/arpwatch.c 2006-12-11 13:00:55.000000000 +0300
-@@ -198,6 +198,7 @@
- "u:"
- "R:"
- "Q"
-+ "D"
- "z:"
- ;
- char *tmpptr;
-@@ -289,6 +290,10 @@
- ++quiet;
- break;
-
-+ case 'D':
-+ ++noreversedns;
-+ break;
-+
- case 'z':
- tmpptr = strtok(optarg, "/");
- inet_aton(tmpptr, &ignore_net);
-@@ -900,6 +905,7 @@
- "[-u username] "
- "[-R seconds ] "
- "[-Q] "
-+ "[-D] "
- "[-z ignorenet/ignoremask] "
- "\n"
- ;
-diff -Naur arpwatch-2.1a15.orig/arpwatch.h arpwatch-2.1a15/arpwatch.h
---- arpwatch-2.1a15.orig/arpwatch.h 2006-12-11 13:00:39.000000000 +0300
-+++ arpwatch-2.1a15/arpwatch.h 2006-12-11 13:00:55.000000000 +0300
-@@ -17,6 +17,7 @@
- extern char *prog;
-
- extern int nonewstations; /* Turns off new-station reporting. */
-+extern int noreversedns; /* Turns off reverse-dns. */
-
- #ifdef ETHER_HEADER_HAS_EA
- #define ESRC(ep) ((ep)->ether_shost.ether_addr_octet)
-diff -Naur arpwatch-2.1a15.orig/dns.c arpwatch-2.1a15/dns.c
---- arpwatch-2.1a15.orig/dns.c 2000-10-14 05:50:52.000000000 +0400
-+++ arpwatch-2.1a15/dns.c 2006-12-11 13:01:07.000000000 +0300
-@@ -71,6 +71,8 @@
- } querybuf;
- #endif
-
-+int noreversedns = 0;
-+
- int
- gethinfo(register char *hostname, register char *cpu, register int cpulen,
- register char *os, register int oslen)
-@@ -84,6 +86,9 @@
- register int type, class, buflen, ancount, qdcount;
- querybuf qbuf;
-
-+ if (noreversedns)
-+ return (0);
-+
- qb = &qbuf;
- n = res_query(hostname, C_IN, T_HINFO, qb->buf, sizeof(qb->buf));
- if (n < 0)
-@@ -144,6 +149,9 @@
- register int32_t options;
- register struct hostent *hp;
-
-+ if (noreversedns)
-+ return (intoa(a));
-+
- options = _res.options;
- _res.options |= RES_AAONLY;
- _res.options &= ~(RES_DEFNAMES | RES_DNSRCH);
diff --git a/main/arpwatch/21_all_arpwatch-2.1a15-pid-filename.patch b/main/arpwatch/21_all_arpwatch-2.1a15-pid-filename.patch
deleted file mode 100644
index af4d6ca51c..0000000000
--- a/main/arpwatch/21_all_arpwatch-2.1a15-pid-filename.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- ./arpwatch.8.orig 2007-03-27 22:06:16.000000000 +0400
-+++ ./arpwatch.8 2007-03-27 22:08:41.000000000 +0400
-@@ -88,6 +88,12 @@
- .br
- .ti +9
- [
-+.B -P
-+.I pid_path
-+]
-+.br
-+.ti +9
-+[
- .B -a
- ]
- .br
-@@ -204,6 +210,10 @@
- YMMV. (This feature comes from Debian).
- .LP
- The
-+.B -P
-+flag is used to specify pid filename. Default is set to /var/run/arpwatch.pid.
-+.LP
-+The
- .B -a
- flag tells
- .B arpwatch
---- ./arpwatch.h.orig 2007-03-27 21:36:50.000000000 +0400
-+++ ./arpwatch.h 2007-03-27 21:37:17.000000000 +0400
-@@ -1,6 +1,7 @@
- /* @(#) $Id: arpwatch.h,v 1.29 2000/09/30 23:40:49 leres Exp $ (LBL) */
-
- #define ARPFILE "arp.dat"
-+#define PIDFILENAME "/var/run/arpwatch.pid"
- /*#define ETHERCODES "ethercodes.dat" */
- #define CHECKPOINT (15*60) /* Checkpoint time in seconds */
-
---- ./arpwatch.c.orig 2007-03-27 21:31:18.000000000 +0400
-+++ ./arpwatch.c 2007-03-27 22:04:15.000000000 +0400
-@@ -108,6 +108,8 @@
-
- char *prog;
- char *path_sendmail = PATH_SENDMAIL;
-+char *pidname = PIDFILENAME;
-+int nofork = 0;
-
- int can_checkpoint;
- int swapped;
-@@ -179,7 +181,6 @@
- struct bpf_program code;
- char errbuf[PCAP_ERRBUF_SIZE];
- char* username = NULL;
-- int nofork = 0;
- int restart = 0;
- int restarting_loop = 0;
- char options[] =
-@@ -194,6 +195,7 @@
- "m:"
- "s:"
- "p"
-+ "P:"
- "a"
- "u:"
- "R:"
-@@ -202,6 +204,7 @@
- "z:"
- ;
- char *tmpptr;
-+ FILE *pidfile;
-
- if (argv[0] == NULL)
- prog = "arpwatch";
-@@ -274,6 +277,10 @@
- ++nopromisc;
- break;
-
-+ case 'P':
-+ pidname = optarg;
-+ break;
-+
- case 'a':
- ++allsubnets;
- break;
-@@ -342,6 +349,15 @@
- exit(1);
- } else if (pid != 0)
- exit(0);
-+ pidfile = fopen(pidname, "w");
-+ if(pidfile) {
-+ int pid = (int)getpid();
-+ fprintf(pidfile, "%d\n", pid);
-+ fclose(pidfile);
-+ syslog(LOG_INFO, "Wrote pid %d to %s", pid, pidname);
-+ }
-+ else
-+ fprintf(stderr, "Couldn't write pid file\n");
- }
- (void)close(fileno(stdin));
- (void)close(fileno(stdout));
-@@ -870,6 +886,9 @@
- {
-
- syslog(LOG_DEBUG, "exiting");
-+ if (!debug && !nofork)
-+ if(!unlink(pidname))
-+ syslog(LOG_DEBUG, "unable to remove pid file %s", pidname);
- checkpoint(0);
- exit(1);
- }
diff --git a/main/arpwatch/22_alpine_bihourly_script.patch b/main/arpwatch/22_alpine_bihourly_script.patch
index 729c2abd14..f449c7e41b 100644
--- a/main/arpwatch/22_alpine_bihourly_script.patch
+++ b/main/arpwatch/22_alpine_bihourly_script.patch
@@ -1,16 +1,14 @@
-diff --git a/bihourly.sh b/bihourly.sh
-index 33e54db..810bf80 100755
--- a/bihourly.sh
+++ b/bihourly.sh
-@@ -3,11 +3,14 @@
+@@ -3,11 +3,13 @@
#
# bihourly arpwatch job
#
-PATH=${PATH}:/usr/local/sbin
-export PATH
-#
--cd /usr/operator/arpwatch
- #
+-cd /usr/local/arpwatch
+-#
+
+. /etc/conf.d/arpwatch
+
@@ -20,8 +18,8 @@ index 33e54db..810bf80 100755
+
list="`cat list`"
cname="`cat cname`"
- temp1=$(mktemp)
-@@ -26,7 +29,7 @@ touch ${l}
+ temp1=/tmp/bihourly.1.$$
+@@ -26,7 +28,7 @@
alist=""
for r in ${list}; do \
@@ -30,7 +28,7 @@ index 33e54db..810bf80 100755
if [ -s ${temp1} ]; then
echo "arpfetch ${r} errors:"
xr=${d}/${r}.$$
-@@ -44,7 +47,7 @@ arpsnmp -d ${alist} > ${temp1} 2>&1
+@@ -44,7 +46,7 @@
sed -e '/arpsnmp: suppressed DECnet flip flop/d' ${temp1} > ${temp2}
if [ -s ${temp2} ]; then
mail -s "`hostname` arpwatch report" \
diff --git a/main/arpwatch/53_stop-using-_getshort.patch b/main/arpwatch/53_stop-using-_getshort.patch
new file mode 100644
index 0000000000..da83f4b438
--- /dev/null
+++ b/main/arpwatch/53_stop-using-_getshort.patch
@@ -0,0 +1,25 @@
+Description: replace private function _getshort with ns_get16
+ _getshort is a private function, triggers a build log warning because it's
+ not present in any header file. We switch to the functionally equivalent
+ ns_get16.
+Author: Lukas Schwaighofer <lukas@schwaighofer.name>
+
+---
+ dns.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/dns.c
++++ b/dns.c
+@@ -115,10 +115,10 @@
+ (u_char *)cp, (char *)bp, buflen)) < 0)
+ break;
+ cp += n;
+- type = _getshort(cp);
++ type = ns_get16(cp);
+ cp += sizeof(u_short); /* class */
+ cp += sizeof(u_short) + sizeof(u_int32_t);
+- n = _getshort(cp);
++ n = ns_get16(cp);
+ cp += sizeof(u_short);
+ if (type == T_HINFO) {
+ /* Unpack */
diff --git a/main/arpwatch/APKBUILD b/main/arpwatch/APKBUILD
index 0ba85e532b..2c64257c23 100644
--- a/main/arpwatch/APKBUILD
+++ b/main/arpwatch/APKBUILD
@@ -1,51 +1,35 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=arpwatch
-pkgver=2.1a15
-pkgrel=17
+pkgver=3.1
+pkgrel=1
pkgdesc="Ethernet monitoring program"
-url="http://www-nrg.ee.lbl.gov/"
+url="https://www-nrg.ee.lbl.gov/"
arch="all"
license="BSD-4-Clause-Shortened"
pkgusers="arpwatch"
+depends="python3"
makedepends="libpcap-dev"
-install="$pkgname.pre-install"
+install="$pkgname.pre-install $pkgname.post-install"
options="!check" # No test suite.
-subpackages="$pkgname-ethercodes $pkgname-doc"
-source="ftp://ftp.ee.lbl.gov/arpwatch-$pkgver.tar.gz
+subpackages="$pkgname-doc $pkgname-openrc"
+source="https://ee.lbl.gov/downloads/arpwatch/arpwatch-$pkgver.tar.gz
arpwatch.confd
arpwatch.initd
- 01_all_arpwatch-2.1a15-manpages.patch
- 02_all_arpwatch-2.1a15-srcdir.patch
- 03_all_arpwatch-2.1a15-getopt.patch
- 04_all_arpwatch-2.1a15-sendmail-cmdline-opt.patch
- 05_all_arpwatch-2.1a15-promiscuous-mode.patch
- 06_all_arpwatch-2.1a15-bogons-report.patch
- 07_all_arpwatch-2.1a15-specify-mail.patch
- 08_all_arpwatch-2.1a15-drop-priveleges.patch
- 09_all_arpwatch-2.1a15-quite-mail.patch
- 10_all_arpwatch-2.1a15-ignore-net.patch
- 11_all_arpwatch-2.1a15-secure-tmp.patch
- 12_all_arpwatch-2.1a15-defalt-dir-in-manpages.patch
- 13_all_arpwatch-2.1a15-scripts-awk.patch
- 14_all_arpwatch-2.1a15-paths-fix.patch
- 15_all_arpwatch-2.1a15-fix-dead-lock.patch
- 16_all_arpwatch-2.1a15-additional-manpages-cleanups.patch
- 17_all_arpwatch-2.1a15-restart.patch
- 18_all_arpwatch-2.1a15-nofork.patch
- 19_all_arpwatch-2.1a15-nonewstation.patch
- 20_all_arpwatch-2.1a15-noreversedns-resolve.patch
- 21_all_arpwatch-2.1a15-pid-filename.patch
22_alpine_bihourly_script.patch
+ 53_stop-using-_getshort.patch
+ remove-freebsd-arpwatch.patch
"
+
prepare() {
- chmod -R u+rwX "$builddir"
default_prepare
+
update_config_sub
- sed -i'' -e 's/-o bin -g bin //g' Makefile.in
+ update_config_guess
}
build() {
+ export PYTHON=python3
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -53,66 +37,28 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info
- make -j1
+ make
}
package() {
#make install command wouldn't create directory
mkdir -p "$pkgdir"/usr/sbin/
- make -j1 DESTDIR="$pkgdir" install
+ mkdir -p "$pkgdir"/usr/share/man/man8
+ mkdir -p "$pkgdir"/usr/share/doc/$pkgname
+ make DESTDIR="$pkgdir" install
install -d -o arpwatch "$pkgdir"/var/lib/arpwatch
install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
- for files in arp2ethers arpfetch massagevendor bihourly.sh; do
+ for files in arp2ethers arpfetch massagevendor.py bihourly.sh; do
install -m755 "$builddir"/$files "$pkgdir"/usr/sbin
done
}
-ethercodes() {
- cd "$builddir"
- pkgdesc="$pkgname ethernet codes"
- mkdir -p "$subpkgdir"/usr/share/$pkgname/awk
- install -Dm644 "$builddir"/ethercodes.dat "$subpkgdir"/usr/share/$pkgname/ethercodes.dat
-
- install -d "$subpkgdir"/usr/share/$pkgname/awk
- for f in "$builddir"/*.awk; do
- install -m644 $f "$subpkgdir"/usr/share/$pkgname/awk/
- done
-}
-
-doc() {
- cd "$builddir"
- install -d "$subpkgdir"/usr/share/man/man8
- make DESTDIR="$subpkgdir" install-man
- gzip "$subpkgdir"/usr/share/man/man8/*.8
- install -d "$subpkgdir"/usr/share/doc/$pkgname
- for f in CHANGES INSTALL README; do
- install -m644 $f "$subpkgdir"/usr/share/doc/$pkgname/
- done
-}
-
-sha512sums="f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90 arpwatch-2.1a15.tar.gz
+sha512sums="
+2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282 arpwatch-3.1.tar.gz
854f6361bf02586516db4f50afdee729c047cd788985f72f475e592e0e744c24d7d765f0391d733dbf417048c26b6d43c00eb63c58e6798bdb2366b93cbfe03a arpwatch.confd
-d60d8d07c5572ba645f037d2d8a9b028f8cd434d99e76a9f75a046d00959d6b4544ab6d866d3c88b4861175c5407d83ecd954b5f5dad0b2ec3894411e83e5e2f arpwatch.initd
-969e956c4fd192d35ce4f23a1f1461eb94a28a8d1e18845d3b099f8833dece003105b415af0a51b4d50221ded4d7434a49bba0ef7f3cac71fda9317b5edeaac3 01_all_arpwatch-2.1a15-manpages.patch
-427a55b7599b8c897f1eae1b8f70b9eaa8e692636b666bf2a3a8703d8227c96e29cdcde8186ebcdcff63d902a919cde660ed6d02f9b5dc650ea9fe23afa44a5f 02_all_arpwatch-2.1a15-srcdir.patch
-04ab5ed5e1097901e80d70925936a2ecdb7e1d815b627cbfa246a15a4fb7cbca59b9be04840c694f71c0ff8e2f3201a6047b4fbbb9e62687e7d95ea29c5e6ae4 03_all_arpwatch-2.1a15-getopt.patch
-7b23ff5f15b98c7d4a2cca39597d2481d072a935f5021dea09be9735aaf54f9378957bf4548cbe004af13a340f0b0ee6c7db44d44cb3605b3d16fd3c08c06897 04_all_arpwatch-2.1a15-sendmail-cmdline-opt.patch
-b4b4ce55ec8b2dba7ce9f49eb77874d8ada26322174a9032176ce28f52edd11edf0fbf16f2a48d974b145fa3e8a10fbf7f1ae72169336d4ed219d41da18007eb 05_all_arpwatch-2.1a15-promiscuous-mode.patch
-3b637cbb8a969a43d737ce3a60c4213ed48db7c279cc4776632239d1bd70e150f88e3fee5f14367b1b9fc26a77f512fd5a6d361ce4303a9099ee3b2fb7cca28e 06_all_arpwatch-2.1a15-bogons-report.patch
-0a36a7dcb10870735065b50c5979933217f479c91c6749d4ebabacb666a6dd25c4a767094f215c72cbd9fffd5568a0d2dd16ab36446d2bb2d55595801854e0cd 07_all_arpwatch-2.1a15-specify-mail.patch
-254ac6d166014a49878bea82db26a61a944348633c81b361b2ab54cd959d7540695c2e96b97c666a2af654b0c30dc2eec56749da5cad8558be6d3cc813f76d31 08_all_arpwatch-2.1a15-drop-priveleges.patch
-87bac2fe654e51940d0a8f6ce4131aef8c2c5db10ec73c92c6a4384bb797666beb8d3180895712a2e602fa513daded362cb20f35815563da7ad9a4a6f053d19d 09_all_arpwatch-2.1a15-quite-mail.patch
-9f626f5d824c8706af7d5e53f0e5743a606c0ed0ef903f5f721457da6139a19bc39a3546d750d70f90f506d6f03ea7a37b1ff48aca35f49a9ffa702e16e8b6d3 10_all_arpwatch-2.1a15-ignore-net.patch
-1c9250346896353857904b43e867ffa5de21bfbe3aa03d8678b2844bb6ad8746ad587884c6b8abe479ddc0bc5fdcfee26c746932c947877862c08f532c1608ee 11_all_arpwatch-2.1a15-secure-tmp.patch
-5be13ab5b03ae5ffc1edc8b8657b6f903921c3ffe608ca9bd86a8b0c85f54e3114781bf2ef759b5bcf6e93a50cae55584c5054cb1f510423e7a9b052792829b2 12_all_arpwatch-2.1a15-defalt-dir-in-manpages.patch
-cc573ea3f4170be7ff711ad0d63d79802111828d7e913c2eca2e9276fc5f6958f55e2c39b61d885084558bf59f2d95a7c6e3f92f65ac0310ff66505ba4229a57 13_all_arpwatch-2.1a15-scripts-awk.patch
-456f3e42f64022cc9999efeaf4b8b7a759a9745e88ff059785ece43a85e2edc8bf56cee1b03c79f90fa9cbda6957cfec61eb40d1db4e03e214c03dcacf749103 14_all_arpwatch-2.1a15-paths-fix.patch
-e5145f3f8d7c921148af25844d354bdc83dc8a8fe2e392155147dea6c168000c2e30a69dce902002c82746d918757e107ac2a9389e52ef4b550fb4f26b285155 15_all_arpwatch-2.1a15-fix-dead-lock.patch
-e6f5571f8d4823c56f68ea13267f217cc60a9481cf08dfe632124593f8e3a49d3c7fb57c118490b126e2e37eed893470c6b92a079e680b0a03b6d0ffbb10e896 16_all_arpwatch-2.1a15-additional-manpages-cleanups.patch
-76c971bd8ce3aec9a6e72f6192ff7f77a5a4b054fad9db4ed29344b0a9b76e07b188ac78b3de654e82de7276ddc877a7f9bbd4f90dd74454a08fd7a5fd2f379c 17_all_arpwatch-2.1a15-restart.patch
-91f01db73b7979464db9e0616cfc2a19c950c65f1409342220e1c6e7b22716827b681cb03ede88644e67d81efc38af32a1fd372151474e9b917abb9e13cdafdd 18_all_arpwatch-2.1a15-nofork.patch
-5322d2ea02f300d2be2cd17fdf7154cfd6e775376d56c9ad4bdc520196b533060d6602ebb7a02bb1b4088afccb6c843ead3d01b9e0928125fadcdd4d1efadc88 19_all_arpwatch-2.1a15-nonewstation.patch
-fd7231744f8025dbcc0bec65ffc02933e0d14717a824187a955a55509316f8667b11bcc4efe847a5002519337b3cc8e778e216ebbb5ad2af504021ea61df4380 20_all_arpwatch-2.1a15-noreversedns-resolve.patch
-11da1ec9cce70f2f9fb0657e3bbc2ca9cbad68a292205dfb01effd15643f0aeb693f544f2f8d308b7c3a4901de0a0f91e33676e40cb39dda2314e11097c1eae3 21_all_arpwatch-2.1a15-pid-filename.patch
-6823fee4d2190fcd4003c4e0940b05725fb3c408b2ff1f4af39dd5ae29cee05e7211274dbcc06b78931e5cb36e9893a8a9de6e924a9d54a99410bcdf9e6591bb 22_alpine_bihourly_script.patch"
+83fc559aecd82cefd430104df23fc7680ac14d2c27f74d4543585382166e16a65563e00122281e886278993a9ca574daa5b2b2100884369c3a3146a66b68a0f7 arpwatch.initd
+b537220b7a19f7f28d1b60cfea6ef2e4d0c852ac83907fdd2515e467c3d16529b0c5a25ee653536e674c63d47a00709fc89fd6085efc5ba4a12f392df5ae5788 22_alpine_bihourly_script.patch
+6eae9b143deea1655b3adb45640329d1c6d15c0bf6172a229ed142bb59e6c53b73ad19dc38adc42fe547f0bae1310394b19c9f8efe1af3a7dbf889c3742008c1 53_stop-using-_getshort.patch
+68298d7967c281bbda6fe7d64f9af427eb39ac1a0011283b14ea1004396949595acc6947ddcabb385acdc83abe6255bf79ff92e5b8b1c33c67c26830b82ecd64 remove-freebsd-arpwatch.patch
+"
diff --git a/main/arpwatch/arpwatch.initd b/main/arpwatch/arpwatch.initd
index 437633effe..c6f2a18c51 100644
--- a/main/arpwatch/arpwatch.initd
+++ b/main/arpwatch/arpwatch.initd
@@ -24,7 +24,7 @@ start() {
else
chown ${ARPUSER} ${DATAFILE}
start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch/arpwatch.${IFACE}.pid --exec \
- /usr/sbin/arpwatch -- -i $IFACE -u ${ARPUSER} -f ${DATAFILE} -P /var/run/arpwatch/arpwatch.${IFACE}.pid ${OPTIONS}
+ /usr/sbin/arpwatch -- -i $IFACE -f ${DATAFILE} -P /var/run/arpwatch/arpwatch.${IFACE}.pid ${OPTIONS}
fi
eend $?
done
diff --git a/main/arpwatch/arpwatch.post-install b/main/arpwatch/arpwatch.post-install
new file mode 100644
index 0000000000..8157042820
--- /dev/null
+++ b/main/arpwatch/arpwatch.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo 'Run bihourly.sh to update ethercodes.dat'
+
+exit 0
diff --git a/main/arpwatch/remove-freebsd-arpwatch.patch b/main/arpwatch/remove-freebsd-arpwatch.patch
new file mode 100644
index 0000000000..d5355e6392
--- /dev/null
+++ b/main/arpwatch/remove-freebsd-arpwatch.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -131,7 +131,6 @@
+ $(INSTALL) -v -m 444 $(srcdir)/$(PROG).8 $(DESTDIR)$(MANDEST)/man8
+ @diff $(srcdir)/arpsnmp.8 $(DESTDIR)$(MANDEST)/man8 >/dev/null 2>&1 || \
+ $(INSTALL) -v -m 444 $(srcdir)/arpsnmp.8 $(DESTDIR)$(MANDEST)/man8
+-@HAVE_FREEBSD_TRUE@ @$(INSTALL) -v -m 555 arpwatch.sh $(DESTDIR)$(prefix)/etc/rc.d/arpwatch
+
+ clean:
+ rm -f $(CLEANFILES)
diff --git a/main/asciidoctor/APKBUILD b/main/asciidoctor/APKBUILD
index 4833db001b..f139c3661a 100644
--- a/main/asciidoctor/APKBUILD
+++ b/main/asciidoctor/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Seung Soo Mun <hamletmun@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=asciidoctor
-pkgver=2.0.15
+pkgver=2.0.16
pkgrel=0
pkgdesc="Converter for AsciiDoc to HTML5, DocBook 5 (or 4.5) and other formats"
url="https://rubygems.org/gems/$pkgname"
@@ -34,5 +34,5 @@ package() {
}
sha512sums="
-55ab7ceb85e219a36fdcb21d5620199e1d46281742cf52ce5892f36ee5db1119b535f488fae57aa360cbaee762f903d6bd957e3a65781eacd810b41eafcaa8f1 asciidoctor-2.0.15.gem
+2e164a0d24374e0c5461926c865c8900d3fb3f27606af5aac1a0a5f53102ca758f6421a113a9bb100fe7dba2e1accec04ca6ca16670e4b85e373f729bdaba6cd asciidoctor-2.0.16.gem
"
diff --git a/main/aspell/APKBUILD b/main/aspell/APKBUILD
index 80bf0cd21a..92cc7a92e3 100644
--- a/main/aspell/APKBUILD
+++ b/main/aspell/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
pkgname=aspell
pkgver=0.60.8
-pkgrel=0
+pkgrel=1
pkgdesc="A spell checker designed to eventually replace Ispell"
url="http://aspell.net/"
arch="all"
@@ -11,11 +11,15 @@ subpackages="$pkgname-compat::noarch $pkgname-utils $pkgname-dev $pkgname-doc
$pkgname-lang $pkgname-libs"
depends_dev="$pkgname-utils"
makedepends="ncurses-dev perl gettext-dev"
-source="https://ftp.gnu.org/gnu/aspell/aspell-$pkgver.tar.gz"
+source="https://ftp.gnu.org/gnu/aspell/aspell-$pkgver.tar.gz
+ CVE-2019-25051.patch"
# secfixes:
+# 0.60.8-r1:
+# - CVE-2019-25051
# 0.60.8-r0:
# - CVE-2019-17544
+
prepare() {
default_prepare
update_config_sub
@@ -67,4 +71,7 @@ libs() {
rm -fr "$pkgdir"/usr/lib
}
-sha512sums="8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29 aspell-0.60.8.tar.gz"
+sha512sums="
+8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29 aspell-0.60.8.tar.gz
+529f3f4737d2e19f7571f4c8666b1cd089cc4e9dfdaa52dc468919f01ce9f8f8112d8fe8afda295b3dfb92f5e0c2bbd79bf1ec69f06c163c32eb28f0168ab263 CVE-2019-25051.patch
+"
diff --git a/main/aspell/CVE-2019-25051.patch b/main/aspell/CVE-2019-25051.patch
new file mode 100644
index 0000000000..2f15d380ec
--- /dev/null
+++ b/main/aspell/CVE-2019-25051.patch
@@ -0,0 +1,96 @@
+From 0718b375425aad8e54e1150313b862e4c6fd324a Mon Sep 17 00:00:00 2001
+From: Kevin Atkinson <kevina@gnu.org>
+Date: Sat, 21 Dec 2019 20:32:47 +0000
+Subject: [PATCH] objstack: assert that the alloc size will fit within a chunk
+ to prevent a buffer overflow
+
+Bug found using OSS-Fuze.
+---
+ common/objstack.hpp | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/common/objstack.hpp b/common/objstack.hpp
+index 3997bf7..bd97ccd 100644
+--- a/common/objstack.hpp
++++ b/common/objstack.hpp
+@@ -5,6 +5,7 @@
+ #include "parm_string.hpp"
+ #include <stdlib.h>
+ #include <assert.h>
++#include <stddef.h>
+
+ namespace acommon {
+
+@@ -26,6 +27,12 @@ class ObjStack
+ byte * temp_end;
+ void setup_chunk();
+ void new_chunk();
++ bool will_overflow(size_t sz) const {
++ return offsetof(Node,data) + sz > chunk_size;
++ }
++ void check_size(size_t sz) {
++ assert(!will_overflow(sz));
++ }
+
+ ObjStack(const ObjStack &);
+ void operator=(const ObjStack &);
+@@ -56,7 +63,7 @@ class ObjStack
+ void * alloc_bottom(size_t size) {
+ byte * tmp = bottom;
+ bottom += size;
+- if (bottom > top) {new_chunk(); tmp = bottom; bottom += size;}
++ if (bottom > top) {check_size(size); new_chunk(); tmp = bottom; bottom += size;}
+ return tmp;
+ }
+ // This alloc_bottom will insure that the object is aligned based on the
+@@ -66,7 +73,7 @@ class ObjStack
+ align_bottom(align);
+ byte * tmp = bottom;
+ bottom += size;
+- if (bottom > top) {new_chunk(); goto loop;}
++ if (bottom > top) {check_size(size); new_chunk(); goto loop;}
+ return tmp;
+ }
+ char * dup_bottom(ParmString str) {
+@@ -79,7 +86,7 @@ class ObjStack
+ // always be aligned as such.
+ void * alloc_top(size_t size) {
+ top -= size;
+- if (top < bottom) {new_chunk(); top -= size;}
++ if (top < bottom) {check_size(size); new_chunk(); top -= size;}
+ return top;
+ }
+ // This alloc_top will insure that the object is aligned based on
+@@ -88,7 +95,7 @@ class ObjStack
+ {loop:
+ top -= size;
+ align_top(align);
+- if (top < bottom) {new_chunk(); goto loop;}
++ if (top < bottom) {check_size(size); new_chunk(); goto loop;}
+ return top;
+ }
+ char * dup_top(ParmString str) {
+@@ -117,6 +124,7 @@ class ObjStack
+ void * alloc_temp(size_t size) {
+ temp_end = bottom + size;
+ if (temp_end > top) {
++ check_size(size);
+ new_chunk();
+ temp_end = bottom + size;
+ }
+@@ -131,6 +139,7 @@ class ObjStack
+ } else {
+ size_t s = temp_end - bottom;
+ byte * p = bottom;
++ check_size(size);
+ new_chunk();
+ memcpy(bottom, p, s);
+ temp_end = bottom + size;
+@@ -150,6 +159,7 @@ class ObjStack
+ } else {
+ size_t s = temp_end - bottom;
+ byte * p = bottom;
++ check_size(size);
+ new_chunk();
+ memcpy(bottom, p, s);
+ temp_end = bottom + size;
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 26a058f20a..c06db3c38b 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=asterisk
pkgver=18.2.2
-pkgrel=1
+pkgrel=4
pkgdesc="Modular Open Source PBX System"
pkgusers="asterisk"
pkggroups="asterisk"
@@ -12,34 +12,70 @@ url="https://www.asterisk.org/"
arch="all"
license="GPL-2.0-only WITH OpenSSL-Exception"
options="!check" # Test suite is separate, and require separate build
-makedepends="findutils tar bsd-compat-headers libtool
- ncurses-dev popt-dev newt-dev zlib-dev libedit-dev tiff-dev curl-dev
- openssl-dev lua-dev libcap-dev jansson-dev util-linux-dev
- sqlite-dev postgresql-dev unixodbc-dev freetds-dev mariadb-connector-c-dev
- alsa-lib-dev pjproject-dev dahdi-tools-dev libpri-dev libsrtp-dev
- spandsp-dev libresample speex-dev speexdsp-dev libogg-dev
- bluez-dev libxml2-dev imap-dev unbound-dev"
+makedepends="
+ alsa-lib-dev
+ bluez-dev
+ bsd-compat-headers
+ curl-dev
+ dahdi-tools-dev
+ findutils
+ freetds-dev
+ imap-dev
+ jansson-dev
+ libcap-dev
+ libedit-dev
+ libogg-dev
+ libpri-dev
+ libresample
+ libsrtp-dev
+ libtool
+ libxml2-dev
+ lua-dev
+ mariadb-connector-c-dev
+ ncurses-dev
+ newt-dev
+ openssl1.1-compat-dev
+ opus-dev
+ opusfile-dev
+ pjproject-dev
+ popt-dev
+ postgresql-dev
+ spandsp-dev
+ speexdsp-dev
+ speex-dev
+ sqlite-dev
+ tar
+ tiff-dev
+ unbound-dev
+ unixodbc-dev
+ util-linux-dev
+ zlib-dev
+ "
install="$pkgname.pre-install $pkgname.pre-upgrade"
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc
$pkgname-tds $pkgname-fax $pkgname-sample-config:config:noarch
$pkgname-sounds-moh:sound_moh:noarch $pkgname-sounds-en:sound_en:noarch
$pkgname-mobile $pkgname-curl:_curl $pkgname-srtp $pkgname-dahdi
- $pkgname-speex $pkgname-alsa $pkgname-cdr-mysql:cdr_mysql $pkgname-openrc"
+ $pkgname-speex $pkgname-opus $pkgname-alsa $pkgname-cdr-mysql:cdr_mysql
+ $pkgname-openrc"
_download="https://downloads.asterisk.org/pub/telephony/asterisk/releases"
source="$_download/asterisk-$pkgver.tar.gz
https://dev.alpinelinux.org/~tteras/asterisk-addon-mp3-r201.patch.gz
+ https://github.com/traud/asterisk-opus/archive/asterisk-13.7.tar.gz
10-musl-mutex-init.patch
20-musl-astmm-fix.patch
30-asterisk-mariadb.patch
40-asterisk-cdefs.patch
+ CVE-2021-32558.patch
asterisk.initd
asterisk.confd
- asterisk.logrotate"
+ asterisk.logrotate
+ "
# secfixes:
-# 18.2.2-r0:
-# - CVE-2019-15297
+# 18.2.2-r2:
+# - CVE-2021-32558
# 18.2.1-r0:
# - CVE-2021-26712
# - CVE-2021-26713
@@ -70,6 +106,10 @@ prepare() {
# asteriskssl does not have direct references to libssl, but looks up
# symbols from it using dlsym(RTLD_NEXT), so use --no-as-needed for it.
sed -i -e 's/ASTSSL_LIBS:=$(OPENSSL_LIB)/ASTSSL_LIBS:=-Wl,--no-as-needed $(OPENSSL_LIB) -Wl,--as-needed/g' main/Makefile
+
+ # copy codec_opus_open_source files
+ # res/* and include/asterisk/* are not needed as asterisk is new enough
+ cp --verbose ../asterisk-opus*/codecs/* codecs
}
build() {
@@ -106,6 +146,8 @@ build() {
--with-libedit \
--with-srtp \
--with-imap=system \
+ --with-opus \
+ --with-opusfile \
CFLAGS="$CFLAGS -DENABLE_SRTP_AES_256"
# get default modules to build
@@ -119,6 +161,7 @@ build() {
--enable cdr_mysql \
--disable BUILD_NATIVE \
--enable IMAP_STORAGE \
+ --enable codec_opus_open_source \
menuselect.makeopts
# build
@@ -164,6 +207,7 @@ cdr_mysql() { amove usr/lib/asterisk/modules/*cdr_mysql*; }
srtp() { amove usr/lib/asterisk/modules/*_srtp*; }
dahdi() { amove usr/lib/asterisk/modules/*_dahdi*; }
speex() { amove usr/lib/asterisk/modules/*_speex*; }
+opus() { amove usr/lib/asterisk/modules/codec_opus_open_source.so; }
alsa() { amove usr/lib/asterisk/modules/*_alsa*; }
config() {
@@ -194,10 +238,12 @@ sound_en() {
sha512sums="
e15fe3c7f46d49991bcb6f6f565f15e4af0d658b4cd6b091079209dd95a8027858effdc2f2314d72ed46a73cdebc089d3c27d5cf8db50d2d21f3c317a8a4a546 asterisk-18.2.2.tar.gz
aacef3f4796fb1abd33266998b53909cb4b36e7cc5ad2f7bac68bdc43e9a9072d9a4e2e7e681bddfa31f3d04575eb248afe6ea95da780c67e4829c1e22adfe1b asterisk-addon-mp3-r201.patch.gz
+156fa77b2864c439fbdfd4be302657dc8264bfc1d5a8f3647a9a5184f5c8651913038dc917db0d2d396dc173d6f1491065a7c81e25b2a67e1bea22c79f5b640e asterisk-13.7.tar.gz
771237ba6d42ab62d914f2702234b23fd0bc8c22f2aa33b0e745c9170163c8046f6d48ecb299faab3d6fb397f1aa046421083c3cc88510c9779861c522f357dd 10-musl-mutex-init.patch
0fae11b42894ab3d405bc50e9275b9084712b482fbf9b4259ea938667fc5cbe413655f3ff83da0f607151bb2b6e49c2f741b5ada6944dbb478f076ef8d86380a 20-musl-astmm-fix.patch
616de74bdd3c4a6e899128c73e31f5ff219095d2afe321f85a51f518ec2e9dac9b63396eed8e2568c295f1beb90f9a506c72d28211a973b35185bfffd24af37e 30-asterisk-mariadb.patch
ba33f11169284f190b7dabab1da7d2751cb65d7976408db635a892fa17d7552e1660350017e7aada3464ecc7d9d6e99d6ad76d66c0036de062a386cffbc948e6 40-asterisk-cdefs.patch
+87df7c97c0963f41a6d61ed80c7b9996d7f38fa39bbca50c3157f4bb68146e1c977459dfdff734395aca4fd9d801c15d6c996bfabdd81be16b96f3bbe92ff480 CVE-2021-32558.patch
0044c5db468ec8f2385d18d476f89976f6d036448583a4ef8017ce7a6f8f72105337e6b20037ffe47f561d2877fc9c86720aef23ab037df89b36dc140a5924c4 asterisk.initd
ab6b6f08ff43268cbb1abb7ed7d678949991ba495682a644bbaeb017d6adbff0a43297905fd73ae8db1786a28d5b5904f1bc253209a0e388c8a27f26c6ce14ed asterisk.confd
449b5808d90c813c23432274fba47e53227e3a924a55719d2f9e5a90fd2dfb33660a5c85c7e8f11fbb1cd93387e5c68329ed5583f7a64c2451fadad62a9f87dd asterisk.logrotate
diff --git a/main/asterisk/CVE-2021-32558.patch b/main/asterisk/CVE-2021-32558.patch
new file mode 100644
index 0000000000..522d8d6f4f
--- /dev/null
+++ b/main/asterisk/CVE-2021-32558.patch
@@ -0,0 +1,126 @@
+From 852a8780cb45db0dca7c18b364cb0485a1e09840 Mon Sep 17 00:00:00 2001
+From: Kevin Harwell <kharwell@sangoma.com>
+Date: Mon, 10 May 2021 17:59:00 -0500
+Subject: [PATCH] AST-2021-008 - chan_iax2: remote crash on unsupported media format
+
+If chan_iax2 received a packet with an unsupported media format, for
+example vp9, then it would set the frame's format to NULL. This could
+then result in a crash later when an attempt was made to access the
+format.
+
+This patch makes it so chan_iax2 now ignores/drops frames received
+with unsupported media format types.
+
+ASTERISK-29392 #close
+
+Change-Id: Ifa869a90dafe33eed8fd9463574fe6f1c0ad3eb1
+---
+
+diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
+index 4122c04..c57434b 100644
+--- a/channels/chan_iax2.c
++++ b/channels/chan_iax2.c
+@@ -4132,6 +4132,7 @@
+ long ms;
+ long next;
+ struct timeval now = ast_tvnow();
++ struct ast_format *voicefmt;
+
+ /* Make sure we have a valid private structure before going on */
+ ast_mutex_lock(&iaxsl[callno]);
+@@ -4151,10 +4152,9 @@
+
+ ms = ast_tvdiff_ms(now, pvt->rxcore);
+
+- if(ms >= (next = jb_next(pvt->jb))) {
+- struct ast_format *voicefmt;
+- voicefmt = ast_format_compatibility_bitfield2format(pvt->voiceformat);
+- ret = jb_get(pvt->jb, &frame, ms, voicefmt ? ast_format_get_default_ms(voicefmt) : 20);
++ voicefmt = ast_format_compatibility_bitfield2format(pvt->voiceformat);
++ if (voicefmt && ms >= (next = jb_next(pvt->jb))) {
++ ret = jb_get(pvt->jb, &frame, ms, ast_format_get_default_ms(voicefmt));
+ switch(ret) {
+ case JB_OK:
+ fr = frame.data;
+@@ -4182,7 +4182,7 @@
+ pvt = iaxs[callno];
+ }
+ }
+- break;
++ break;
+ case JB_DROP:
+ iax2_frame_free(frame.data);
+ break;
+@@ -6451,8 +6451,14 @@
+ f->frametype = fh->type;
+ if (f->frametype == AST_FRAME_VIDEO) {
+ f->subclass.format = ast_format_compatibility_bitfield2format(uncompress_subclass(fh->csub & ~0x40) | ((fh->csub >> 6) & 0x1));
++ if (!f->subclass.format) {
++ f->subclass.format = ast_format_none;
++ }
+ } else if (f->frametype == AST_FRAME_VOICE) {
+ f->subclass.format = ast_format_compatibility_bitfield2format(uncompress_subclass(fh->csub));
++ if (!f->subclass.format) {
++ f->subclass.format = ast_format_none;
++ }
+ } else {
+ f->subclass.integer = uncompress_subclass(fh->csub);
+ }
+@@ -9929,8 +9935,8 @@
+ } else if (iaxs[fr->callno]->voiceformat == 0) {
+ ast_log(LOG_WARNING, "Received trunked frame before first full voice frame\n");
+ iax2_vnak(fr->callno);
+- } else {
+- f.subclass.format = ast_format_compatibility_bitfield2format(iaxs[fr->callno]->voiceformat);
++ } else if ((f.subclass.format = ast_format_compatibility_bitfield2format(
++ iaxs[fr->callno]->voiceformat))) {
+ f.datalen = len;
+ if (f.datalen >= 0) {
+ if (f.datalen)
+@@ -10173,11 +10179,17 @@
+ f.frametype = fh->type;
+ if (f.frametype == AST_FRAME_VIDEO) {
+ f.subclass.format = ast_format_compatibility_bitfield2format(uncompress_subclass(fh->csub & ~0x40));
++ if (!f.subclass.format) {
++ return 1;
++ }
+ if ((fh->csub >> 6) & 0x1) {
+ f.subclass.frame_ending = 1;
+ }
+ } else if (f.frametype == AST_FRAME_VOICE) {
+ f.subclass.format = ast_format_compatibility_bitfield2format(uncompress_subclass(fh->csub));
++ if (!f.subclass.format) {
++ return 1;
++ }
+ } else {
+ f.subclass.integer = uncompress_subclass(fh->csub);
+ }
+@@ -11795,6 +11807,11 @@
+ f.subclass.frame_ending = 1;
+ }
+ f.subclass.format = ast_format_compatibility_bitfield2format(iaxs[fr->callno]->videoformat);
++ if (!f.subclass.format) {
++ ast_variables_destroy(ies.vars);
++ ast_mutex_unlock(&iaxsl[fr->callno]);
++ return 1;
++ }
+ } else {
+ ast_log(LOG_WARNING, "Received mini frame before first full video frame\n");
+ iax2_vnak(fr->callno);
+@@ -11816,9 +11833,14 @@
+ } else {
+ /* A mini frame */
+ f.frametype = AST_FRAME_VOICE;
+- if (iaxs[fr->callno]->voiceformat > 0)
++ if (iaxs[fr->callno]->voiceformat > 0) {
+ f.subclass.format = ast_format_compatibility_bitfield2format(iaxs[fr->callno]->voiceformat);
+- else {
++ if (!f.subclass.format) {
++ ast_variables_destroy(ies.vars);
++ ast_mutex_unlock(&iaxsl[fr->callno]);
++ return 1;
++ }
++ } else {
+ ast_debug(1, "Received mini frame before first full voice frame\n");
+ iax2_vnak(fr->callno);
+ ast_variables_destroy(ies.vars);
diff --git a/main/at-spi2-core/APKBUILD b/main/at-spi2-core/APKBUILD
index 17cead82bc..b48ee4deaf 100644
--- a/main/at-spi2-core/APKBUILD
+++ b/main/at-spi2-core/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=at-spi2-core
-pkgver=2.40.0
+pkgver=2.40.3
pkgrel=0
pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
url="https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/"
@@ -27,4 +27,6 @@ package() {
rm -rf "$pkgdir"/usr/lib/systemd
}
-sha512sums="45f9123dac27982003e4c5e357ddaf31dbe945ff334bf1a7d02e81011b841bd69c717233e8b2d33abb6cfe16320bfe5893499f25d9f603cde5d11d63315e8725 at-spi2-core-2.40.0.tar.xz"
+sha512sums="
+85adf3da0a369d7f3481646a495a9c4c3337da3ae6a20ce8c924f8621d3d6ed1d9461bfac0e821dfe86e4ad6b930e4fd65d24c26401cbea644ef4951e5dda5ce at-spi2-core-2.40.3.tar.xz
+"
diff --git a/main/audit/APKBUILD b/main/audit/APKBUILD
index bd9c723667..56c58146b3 100644
--- a/main/audit/APKBUILD
+++ b/main/audit/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Dermot Bradley <dermot_bradley@yahoo.com>
# Maintainer: Tycho Andersen <tycho@docker.com>
pkgname=audit
-pkgver=3.0.1
-pkgrel=1
+pkgver=3.0.5
+pkgrel=0
pkgdesc="User space tools for 2.6 kernel auditing"
url="https://people.redhat.com/sgrubb/audit/"
arch="all"
@@ -62,8 +62,10 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
}
-sha512sums="ad2897c9f539681f0f65b08cd0e650c528957fd4799755c2bcc47f869e04272aad31684c46847124d7b42dde243a16ba2754936890189610814c7007c0381d8c audit-3.0.1.tar.gz
+sha512sums="
+147b8aab7801ac286d8d634736b90b94cf497c5d3a6142f521e527dec9b989ed884caf0ac08aa533635276da46e78a65b14ebf165cd847a8500e29a2829a890d audit-3.0.5.tar.gz
f3f2c4ee745e99877c981d889c5cbb0379d073a9b7634c1480ae603a21a13045f9978b51f8cb53c8d0ba414d249bb859af7bca7e302c464b3fc3c6463ecca762 0003-all-get-rid-of-strndupa.patch
6a0e1fb81d7defe6ad84da447a55e1e0b90299fcbd1ca679934a1dfa1a211986ea4642a1c69abe0619120b64b16546a41fa028f55f27c79819d896178aac6df7 0004-fix-path-in-au-remote-conf.patch
b3d7ceba02b6b4406222c3b142fcfdf2b612dc52eebc490cfd121d696e4ef7c6cc5e27813d67937c464ed4c3cd283de9ccfcb75e63405a447523fa4641e79da3 auditd.initd
-69d8777772ded7a8c0db2bcf84961b121bb355fa0d4ba0e14e311f8a8bfe665cbd2b7ac632d73477f9dfa9a6eec357a7ed458fe9b3e7b5ede75b166f3f092ab7 auditd.confd"
+69d8777772ded7a8c0db2bcf84961b121bb355fa0d4ba0e14e311f8a8bfe665cbd2b7ac632d73477f9dfa9a6eec357a7ed458fe9b3e7b5ede75b166f3f092ab7 auditd.confd
+"
diff --git a/main/autoconf-archive/APKBUILD b/main/autoconf-archive/APKBUILD
index b4d85808be..36c8afb1a1 100644
--- a/main/autoconf-archive/APKBUILD
+++ b/main/autoconf-archive/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com>
pkgname=autoconf-archive
pkgver=2021.02.19
-pkgrel=0
+pkgrel=1
pkgdesc="Collection of re-usable GNU Autoconf macros"
url="https://www.gnu.org/software/autoconf-archive"
arch="noarch"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
depends="autoconf"
subpackages="$pkgname-doc"
options="!check" # no tests
-source="https://ftpmirror.gnu.org/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-$pkgver.tar.xz"
build() {
./configure \
@@ -27,4 +27,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a968c355c3cf66d74dc5b452141afbdf763e84a6c43b12c25da9a08482910d6d57ba3952aaf270d8cd5fd8b9d2dadf2d7d943ae2e1b067d68b71d2738d881aa0 autoconf-archive-2021.02.19.tar.xz"
+sha512sums="
+a968c355c3cf66d74dc5b452141afbdf763e84a6c43b12c25da9a08482910d6d57ba3952aaf270d8cd5fd8b9d2dadf2d7d943ae2e1b067d68b71d2738d881aa0 autoconf-archive-2021.02.19.tar.xz
+"
diff --git a/main/automake/0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch b/main/automake/0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch
new file mode 100644
index 0000000000..9923474f4c
--- /dev/null
+++ b/main/automake/0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch
@@ -0,0 +1,70 @@
+From 3009ad094f5807c512e79224a8acee5a81a736b0 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Sun, 29 Aug 2021 13:02:33 +0200
+Subject: [PATCH] automake: add install dep on install-libLTLIBRARIES to all
+ targets
+
+A Makefile.am like
+
+ bin_PROGRAMS =
+ lib_LTLIBRARIES = library1.la
+ pkglib_LTLIBRARIES = library2.la
+ library2_LIBADD = library1.la
+
+produces, in Makefile.in,
+
+ install-binPROGRAMS: install-libLTLIBRARIES
+
+but no
+
+ install-pkglibLTLIBRARIES: install-libLTLIBRARIES
+
+therefore potentially breaking `make install -j`. Rectify this by
+depending on install-libLTLIBRARIES not just for bin_PROGRAMS, but
+all PROGRAMS and LTLIBRARIES.
+
+Signed-off-by: Jan Engelhardt <jengelh@inai.de>
+---
+ bin/automake.in | 25 +++++++++++++++++++------
+ 1 file changed, 19 insertions(+), 6 deletions(-)
+
+diff --git a/bin/automake.in b/bin/automake.in
+index f04f5d5f5..30babd607 100644
+--- a/bin/automake.in
++++ b/bin/automake.in
+@@ -8042,13 +8042,26 @@ sub generate_makefile
+ handle_all ($makefile);
+
+ # FIXME: Gross!
+- if (var ('lib_LTLIBRARIES') && var ('bin_PROGRAMS'))
++ my $have_lt1 = !!var("lib_LTLIBRARIES");
++ my $have_lt2 = !!var("nobase_lib_LTLIBRARIES");
++ for my $var (variables("PROGRAMS"), variables("LTLIBRARIES"))
+ {
+- $output_rules .= "install-binPROGRAMS: install-libLTLIBRARIES\n\n";
+- }
+- if (var ('nobase_lib_LTLIBRARIES') && var ('bin_PROGRAMS'))
+- {
+- $output_rules .= "install-binPROGRAMS: install-nobase_libLTLIBRARIES\n\n";
++ if ($var->name eq "lib_LTLIBRARIES"
++ || $var->name eq "nobase_lib_LTLIBRARIES"
++ || substr($var->name, 0, 7) eq "noinst_")
++ {
++ next;
++ }
++ my $shortname = $var->name;
++ $shortname =~ tr{_}{}d;
++ if ($have_lt1)
++ {
++ $output_rules .= "install-$shortname: install-libLTLIBRARIES\n\n";
++ }
++ if ($have_lt2)
++ {
++ $output_rules .= "install-$shortname: install-nobase_libLTLIBRARIES\n\n";
++ }
+ }
+
+ handle_install;
+--
+2.33.0
+
diff --git a/main/automake/APKBUILD b/main/automake/APKBUILD
index 89219c7ae6..b046b621f7 100644
--- a/main/automake/APKBUILD
+++ b/main/automake/APKBUILD
@@ -1,15 +1,17 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=automake
-pkgver=1.16.3
-pkgrel=0
-pkgdesc="A GNU tool for automatically creating Makefiles"
+pkgver=1.16.4
+pkgrel=1
+pkgdesc="GNU tool for automatically creating Makefiles"
url="https://www.gnu.org/software/automake"
arch="noarch"
license="GPL-2.0-or-later MIT Public-Domain"
depends="perl"
makedepends="autoconf"
subpackages="$pkgname-doc"
-source="https://ftp.gnu.org/gnu/automake/automake-$pkgver.tar.xz"
+source="https://ftp.gnu.org/gnu/automake/automake-$pkgver.tar.xz
+ 0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch
+ "
# many tests have bashisms
options="!check"
@@ -30,4 +32,7 @@ package() {
make DESTDIR=$pkgdir install
}
-sha512sums="7265aeb7f82a8a205761d76e6ade7b7e97831c283349fd80f86e511f4b0b3e17f429d1506fca84c76079f63781e5dbf5ca81455d6bf6cda27d2e5c3d23b0d1aa automake-1.16.3.tar.xz"
+sha512sums="
+5a8883657e73b75bfa1ee59ab04af6bf4d43f390ab62fb7a9e8e2ac66159dfe4947b2ac7bc1028afffe6a09d88f388339500e03f6cdfa1226985be45ec033246 automake-1.16.4.tar.xz
+ff5fc38987afd00076f32f42bb58f5cffca8de246f8354321f2c8564e1465b9f5d373b4fe6a54f18962c8850717a2d955bdab50ea59068f1ab285da18035b7fd 0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch
+"
diff --git a/main/avahi/APKBUILD b/main/avahi/APKBUILD
index 09ebf96ab0..8a18632628 100644
--- a/main/avahi/APKBUILD
+++ b/main/avahi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=avahi
pkgver=0.8
-pkgrel=3
+pkgrel=5
pkgdesc="multicast/unicast DNS-SD framework"
url="https://www.avahi.org/"
arch="all"
@@ -20,9 +20,15 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-glib
$pkgname-compat-libdns_sd:lidns_sd $pkgname-lang
"
source="https://github.com/lathiat/avahi/releases/download/v$pkgver/avahi-$pkgver.tar.gz
+ CVE-2021-3468.patch
+ CVE-2021-36217.patch
"
# secfixes:
+# 0.8-r5:
+# - CVE-2021-36217
+# 0.8-r4:
+# - CVE-2021-3468
# 0.7-r2:
# - CVE-2017-6519
# - CVE-2018-1000845
@@ -119,4 +125,8 @@ lidns_sd() {
"$subpkgdir"/usr/lib/
}
-sha512sums="c6ba76feb6e92f70289f94b3bf12e5f5c66c11628ce0aeb3cadfb72c13a5d1a9bd56d71bdf3072627a76cd103b9b056d9131aa49ffe11fa334c24ab3b596c7de avahi-0.8.tar.gz"
+sha512sums="
+c6ba76feb6e92f70289f94b3bf12e5f5c66c11628ce0aeb3cadfb72c13a5d1a9bd56d71bdf3072627a76cd103b9b056d9131aa49ffe11fa334c24ab3b596c7de avahi-0.8.tar.gz
+743430a532b8ec246672cd0997b7831efc15c461cbfe0461faac5d6525293297efb7c06f759b2bcd71d1842ba165464fd334508534e6c247211d613061c49da5 CVE-2021-3468.patch
+9e4688ffd8e512c0f614fd24fff2a2a1c66e009069229a6f81dcd382edfff5a8635e0551533c7f9271973a87e62e199fdb34a5560dab27c0a328f531c94f757d CVE-2021-36217.patch
+"
diff --git a/main/avahi/CVE-2021-3468.patch b/main/avahi/CVE-2021-3468.patch
new file mode 100644
index 0000000000..3e0725a602
--- /dev/null
+++ b/main/avahi/CVE-2021-3468.patch
@@ -0,0 +1,37 @@
+From 447affe29991ee99c6b9732fc5f2c1048a611d3b Mon Sep 17 00:00:00 2001
+From: Riccardo Schirone <sirmy15@gmail.com>
+Date: Fri, 26 Mar 2021 11:50:24 +0100
+Subject: [PATCH] Avoid infinite-loop in avahi-daemon by handling HUP event in
+ client_work
+
+If a client fills the input buffer, client_work() disables the
+AVAHI_WATCH_IN event, thus preventing the function from executing the
+`read` syscall the next times it is called. However, if the client then
+terminates the connection, the socket file descriptor receives a HUP
+event, which is not handled, thus the kernel keeps marking the HUP event
+as occurring. While iterating over the file descriptors that triggered
+an event, the client file descriptor will keep having the HUP event and
+the client_work() function is always called with AVAHI_WATCH_HUP but
+without nothing being done, thus entering an infinite loop.
+
+See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=984938
+---
+ avahi-daemon/simple-protocol.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/avahi-daemon/simple-protocol.c b/avahi-daemon/simple-protocol.c
+index 3e0ebb11..6c0274d6 100644
+--- a/avahi-daemon/simple-protocol.c
++++ b/avahi-daemon/simple-protocol.c
+@@ -424,6 +424,11 @@ static void client_work(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AvahiWatchEv
+ }
+ }
+
++ if (events & AVAHI_WATCH_HUP) {
++ client_free(c);
++ return;
++ }
++
+ c->server->poll_api->watch_update(
+ watch,
+ (c->outbuf_length > 0 ? AVAHI_WATCH_OUT : 0) |
diff --git a/main/avahi/CVE-2021-36217.patch b/main/avahi/CVE-2021-36217.patch
new file mode 100644
index 0000000000..7b0449a2e4
--- /dev/null
+++ b/main/avahi/CVE-2021-36217.patch
@@ -0,0 +1,148 @@
+From 9d31939e55280a733d930b15ac9e4dda4497680c Mon Sep 17 00:00:00 2001
+From: Tommi Rantala <tommi.t.rantala@nokia.com>
+Date: Mon, 8 Feb 2021 11:04:43 +0200
+Subject: [PATCH] Fix NULL pointer crashes from #175
+
+avahi-daemon is crashing when running "ping .local".
+The crash is due to failing assertion from NULL pointer.
+Add missing NULL pointer checks to fix it.
+
+Introduced in #175 - merge commit 8f75a045709a780c8cf92a6a21e9d35b593bdecd
+---
+ avahi-core/browse-dns-server.c | 5 ++++-
+ avahi-core/browse-domain.c | 5 ++++-
+ avahi-core/browse-service-type.c | 3 +++
+ avahi-core/browse-service.c | 3 +++
+ avahi-core/browse.c | 3 +++
+ avahi-core/resolve-address.c | 5 ++++-
+ avahi-core/resolve-host-name.c | 5 ++++-
+ avahi-core/resolve-service.c | 5 ++++-
+ 8 files changed, 29 insertions(+), 5 deletions(-)
+
+diff --git a/avahi-core/browse-dns-server.c b/avahi-core/browse-dns-server.c
+index 049752e9..c2d914fa 100644
+--- a/avahi-core/browse-dns-server.c
++++ b/avahi-core/browse-dns-server.c
+@@ -343,7 +343,10 @@ AvahiSDNSServerBrowser *avahi_s_dns_server_browser_new(
+ AvahiSDNSServerBrowser* b;
+
+ b = avahi_s_dns_server_browser_prepare(server, interface, protocol, domain, type, aprotocol, flags, callback, userdata);
++ if (!b)
++ return NULL;
++
+ avahi_s_dns_server_browser_start(b);
+
+ return b;
+-}
+\ No newline at end of file
++}
+diff --git a/avahi-core/browse-domain.c b/avahi-core/browse-domain.c
+index f145d56a..06fa70c0 100644
+--- a/avahi-core/browse-domain.c
++++ b/avahi-core/browse-domain.c
+@@ -253,7 +253,10 @@ AvahiSDomainBrowser *avahi_s_domain_browser_new(
+ AvahiSDomainBrowser *b;
+
+ b = avahi_s_domain_browser_prepare(server, interface, protocol, domain, type, flags, callback, userdata);
++ if (!b)
++ return NULL;
++
+ avahi_s_domain_browser_start(b);
+
+ return b;
+-}
+\ No newline at end of file
++}
+diff --git a/avahi-core/browse-service-type.c b/avahi-core/browse-service-type.c
+index fdd22dcd..b1fc7af8 100644
+--- a/avahi-core/browse-service-type.c
++++ b/avahi-core/browse-service-type.c
+@@ -171,6 +171,9 @@ AvahiSServiceTypeBrowser *avahi_s_service_type_browser_new(
+ AvahiSServiceTypeBrowser *b;
+
+ b = avahi_s_service_type_browser_prepare(server, interface, protocol, domain, flags, callback, userdata);
++ if (!b)
++ return NULL;
++
+ avahi_s_service_type_browser_start(b);
+
+ return b;
+diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c
+index 5531360c..63e0275a 100644
+--- a/avahi-core/browse-service.c
++++ b/avahi-core/browse-service.c
+@@ -184,6 +184,9 @@ AvahiSServiceBrowser *avahi_s_service_browser_new(
+ AvahiSServiceBrowser *b;
+
+ b = avahi_s_service_browser_prepare(server, interface, protocol, service_type, domain, flags, callback, userdata);
++ if (!b)
++ return NULL;
++
+ avahi_s_service_browser_start(b);
+
+ return b;
+diff --git a/avahi-core/browse.c b/avahi-core/browse.c
+index 2941e579..e8a915e9 100644
+--- a/avahi-core/browse.c
++++ b/avahi-core/browse.c
+@@ -634,6 +634,9 @@ AvahiSRecordBrowser *avahi_s_record_browser_new(
+ AvahiSRecordBrowser *b;
+
+ b = avahi_s_record_browser_prepare(server, interface, protocol, key, flags, callback, userdata);
++ if (!b)
++ return NULL;
++
+ avahi_s_record_browser_start_query(b);
+
+ return b;
+diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c
+index ac0b29b1..e61dd242 100644
+--- a/avahi-core/resolve-address.c
++++ b/avahi-core/resolve-address.c
+@@ -286,7 +286,10 @@ AvahiSAddressResolver *avahi_s_address_resolver_new(
+ AvahiSAddressResolver *b;
+
+ b = avahi_s_address_resolver_prepare(server, interface, protocol, address, flags, callback, userdata);
++ if (!b)
++ return NULL;
++
+ avahi_s_address_resolver_start(b);
+
+ return b;
+-}
+\ No newline at end of file
++}
+diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c
+index 808b0e72..4e8e5973 100644
+--- a/avahi-core/resolve-host-name.c
++++ b/avahi-core/resolve-host-name.c
+@@ -318,7 +318,10 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new(
+ AvahiSHostNameResolver *b;
+
+ b = avahi_s_host_name_resolver_prepare(server, interface, protocol, host_name, aprotocol, flags, callback, userdata);
++ if (!b)
++ return NULL;
++
+ avahi_s_host_name_resolver_start(b);
+
+ return b;
+-}
+\ No newline at end of file
++}
+diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c
+index 66bf3cae..43771763 100644
+--- a/avahi-core/resolve-service.c
++++ b/avahi-core/resolve-service.c
+@@ -519,7 +519,10 @@ AvahiSServiceResolver *avahi_s_service_resolver_new(
+ AvahiSServiceResolver *b;
+
+ b = avahi_s_service_resolver_prepare(server, interface, protocol, name, type, domain, aprotocol, flags, callback, userdata);
++ if (!b)
++ return NULL;
++
+ avahi_s_service_resolver_start(b);
+
+ return b;
+-}
+\ No newline at end of file
++}
diff --git a/main/awall/APKBUILD b/main/awall/APKBUILD
index e0f85bf335..013c1709b3 100644
--- a/main/awall/APKBUILD
+++ b/main/awall/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
pkgname=awall
-pkgver=1.9.1
+pkgver=1.10.0
pkgrel=0
pkgdesc="Alpine Wall"
url="https://gitlab.alpinelinux.org/alpine/awall"
@@ -50,6 +50,8 @@ policies() {
install -D "$srcdir"/setup-firewall "$subpkgdir"/usr/sbin/setup-firewall
}
-sha512sums="b2f6818bf6aee73ba7731795de2a7b27053108c4f6ccd4bd94a510d12b9b315d23e445eac2a8a81a98e30c0038c26100771efb6a29403a9889d5240abd310937 awall-v1.9.1.tar.bz2
+sha512sums="
+ef846cf04221d0c6474992d1a31465693988afbdd18d02652566abe704b282674044b6c818d9c35fdc6aa456a5e04fdba00154969a716e20e935b9cd5027ec52 awall-v1.10.0.tar.bz2
e83ea3281c298092530e45fa5b62f6f85b9e5109b11e109799465ea832608294c7d9c4c3f5b0f321dfc0e82040daf3a17d066e9dea65cb0dbae2c453ea9e62cd awall-init
-1cd4b7fa5fc6c9ac6667dff5cc00d96a3cc42aaccafe3c5562d3dcfd9f22ddec9cfe5a9339fee8001b67ccb8e8b81c9417f39a461e5052af9bf74a2753559bf7 setup-firewall"
+1cd4b7fa5fc6c9ac6667dff5cc00d96a3cc42aaccafe3c5562d3dcfd9f22ddec9cfe5a9339fee8001b67ccb8e8b81c9417f39a461e5052af9bf74a2753559bf7 setup-firewall
+"
diff --git a/main/axel/APKBUILD b/main/axel/APKBUILD
index 811ffd998e..5fbda1de91 100644
--- a/main/axel/APKBUILD
+++ b/main/axel/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=axel
pkgver=2.17.10
-pkgrel=0
+pkgrel=1
pkgdesc="A multiple-connection concurrent downloader"
url="https://github.com/axel-download-accelerator/axel"
arch="all"
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index 72d2d3232f..578120e2b6 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=bacula
pkgver=9.6.7
-pkgrel=1
+pkgrel=2
pkgdesc="Enterprise ready, network based backup program"
url="https://www.bacula.org"
#arch="all"
license="AGPL-3.0-or-later WITH OpenSSL-Exception"
-makedepends="autoconf automake libtool mariadb-connector-c-dev ncurses-dev openssl-dev postgresql-dev
+makedepends="autoconf automake libtool mariadb-connector-c-dev ncurses-dev openssl1.1-compat-dev postgresql-dev
sqlite-dev zlib-dev lzo-dev acl-dev postgresql"
install="$pkgname.pre-install $pkgname.post-upgrade"
subpackages="$pkgname-doc $pkgname-mysql $pkgname-pgsql $pkgname-sqlite
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index 131eed39a9..d5e511822a 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: TBK <alpine@jjtc.eu>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bash
-pkgver=5.1.4
+pkgver=5.1.8
_patchlevel=${pkgver##*.}
_myver=${pkgver%.*}
_patchbase=${_myver/./}
@@ -90,9 +90,15 @@ dev() {
mv "$pkgdir"/usr/lib/$pkgname/Makefile* "$subpkgdir"/usr/lib/$pkgname
}
-sha512sums="c44a0ce381469219548a3a27589af3fea4f22eda1ca4e9434b59fc16da81b471c29ce18e31590e0860a6a251a664b68c2b45e3a17d22cfc02799ffd9a208390c bash-5.1.tar.gz
+sha512sums="
+c44a0ce381469219548a3a27589af3fea4f22eda1ca4e9434b59fc16da81b471c29ce18e31590e0860a6a251a664b68c2b45e3a17d22cfc02799ffd9a208390c bash-5.1.tar.gz
9d8845491d0fe335bdd8e9a2bd98bda54bfed2ae3c35b2196c6d5a38bdf96c4d97572ba7d6b19ab605ef4e8f001f64cf3312f87dedebb9e37a95ad2c44e33cdb bash-noinfo.patch
1cd86805a2639614372aec29a710bc456e330abcbbaa0867820c94f714a1fa5fb5c1b18aa2c10263ae0bce9dad7579c7af2f732282315c1c34bfd6a90777bfd2 bash51-001
923e7822a9629645347d3aea0058fb5e2d52223507159a62369309f264612df44a84931c19e0ccb3852e98ce672dfbd454477090b4041b5a0de477c94eb61088 bash51-002
01e952dcfdae58624723d64912ea3444eed2fdcd266ba1a929b95ec3abd70f914bf400607c3f7bb7a94ac2925f794f91f37c1929d5bb987de2ba7f60a19cb8bd bash51-003
-10ff24cd91a2cd88818bfa7218050843af6b409e43fcca89f5ec70d8266020c6c2a55132426271f165cd0f154f49eb0f8ec2761b80fc066c921b83120bb543ce bash51-004"
+10ff24cd91a2cd88818bfa7218050843af6b409e43fcca89f5ec70d8266020c6c2a55132426271f165cd0f154f49eb0f8ec2761b80fc066c921b83120bb543ce bash51-004
+fa83d894fe874a05b9a7d47b8bca8e5b7f4067221d82e8b1af616d17725592c3737c621f2a8ad3c917b29846012c37c85acd34dcbb43eb6b05065ccce89b260c bash51-005
+b9b6e3d71f7b7718e2e8598ec8e337dcc675571fb233c29e5230ebf14eab2249204531f2fe8c4d1459c5fed10acb679048588d1e457e98dbc00ffc4d2cd227e3 bash51-006
+e4ebdc47e780ddc2588ecdfcfe00cb618039c7044e250ab2b836b0735c461ebacd15beaf2145e277c70b7f51cded55bd8dde7757df810f33f8dae306ee5ba571 bash51-007
+97f9558a08a66cc9da62c285bf9118b39328e25ed3b9277728e0539b1ac0adef176a090e39cd96dc03d6fd900d8155bd58040cb3390a09f637bab1de8af3faf6 bash51-008
+"
diff --git a/main/bats/APKBUILD b/main/bats/APKBUILD
index 689c6a6c23..2920281f41 100644
--- a/main/bats/APKBUILD
+++ b/main/bats/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Jose-Luis Rivas <ghostbar@riseup.net>
pkgname=bats
-pkgver=1.3.0
+pkgver=1.4.1
pkgrel=0
pkgdesc="Bash Automated Testing System"
options="!check" # Test passes CI/locally, fails on builders
@@ -19,4 +19,6 @@ check() {
package() {
./install.sh "$pkgdir"/usr
}
-sha512sums="5d5bf4d4eee0bed5bcb2a8d7ddacdd12e221c04723a9bcc2be8e5679f5a9384b00439ed5da316386f3efdd7643bd06f1e56ba9f938dce1e69a81330939980451 bats-1.3.0.zip"
+sha512sums="
+c8d7cb2c088a8bfbe5fa639be6b5d0eeb89f273dea4bbc0a004e0f62f43222418b002c20f229be69b84f0e94bab5bf9a0d10d7bb1acde33a373fb79ab9ac4c83 bats-1.4.1.zip
+"
diff --git a/main/bctoolbox/APKBUILD b/main/bctoolbox/APKBUILD
index 1bc6331192..b6ecac9c8d 100644
--- a/main/bctoolbox/APKBUILD
+++ b/main/bctoolbox/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=bctoolbox
-pkgver=4.5.20
+pkgver=5.0.18
pkgrel=0
pkgdesc="Utilities library used by Belledonne Communications softwares like belle-sip, mediastreamer2 and linphone"
url="https://github.com/BelledonneCommunications/bctoolbox"
@@ -47,6 +47,6 @@ dev() {
}
sha512sums="
-6f87693ccaed569436f791f54911a010ec4d1a5cb987ccf694f3eb683698985b0f0f14571671b050d321c7a1d3a5d6228f17a70eaeb0f6a76fa4d6aa3b8dd56c bctoolbox-4.5.20.tar.gz
+a9ad056b75369921718db2ae746dd708981767e68947352f7b874591253a620626abf9036a3abef084c0da67fe03b03949b71d42ed250712395c4ef7c66baecb bctoolbox-5.0.18.tar.gz
466d2a7aa33952c8086c698030af0addc79373aa31104cbe6133d352682439ae5c30055ea4f162cc9b6b9fc54bf3dea0ddcff78e0042e7ce43833d82b9487116 cmake-bcunit-fix.patch
"
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index 8054b0e351..4ed51c79be 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -5,7 +5,7 @@
# Contributor: ungleich <alpinelinux@ungleich.ch>
# Maintainer:
pkgname=bind
-pkgver=9.16.16
+pkgver=9.16.20
_ver=${pkgver%_p*}
_p=${pkgver#*_p}
_major=${pkgver%%.*}
@@ -42,10 +42,17 @@ makedepends="
$_depends_root_keys
"
install="$pkgname.pre-install $pkgname.post-install"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc
+subpackages="
+ $pkgname-dbg
+ $pkgname-doc
+ $pkgname-dev
+ $pkgname-libs
+ $pkgname-openrc
$pkgname-${_root_keys_upstream}:root_keys:noarch
- py3-$pkgname:_py3 $pkgname-dnssec-tools:_dnssec_tools
- $pkgname-plugins $pkgname-tools
+ py3-$pkgname:_py3
+ $pkgname-dnssec-tools:_dnssec_tools
+ $pkgname-plugins
+ $pkgname-tools
"
source="
https://downloads.isc.org/isc/bind$_major/$_ver/bind-$_ver.tar.xz
@@ -57,9 +64,12 @@ source="
named.conf.recursive
127.zone
localhost.zone
+ bind-9.16.20-map-format-fix.patch
"
# secfixes:
+# 9.16.20-r0:
+# - CVE-2021-25218
# 9.16.15-r0:
# - CVE-2021-25214
# - CVE-2021-25215
@@ -108,6 +118,8 @@ source="
# - CVE-2016-9131
# - CVE-2016-9147
# - CVE-2016-9444
+# 0:
+# - CVE-2019-6470
prepare() {
default_prepare
@@ -269,7 +281,7 @@ _gpgfingerprints="
"
sha512sums="
-264aa70d0d111ddb2a62c65f57e3eeb7eb93afdebcc523166d236e8f23d61d1e4f91b5a2df8dffa49e6f8e3c7101a2689c38dd6d77ecdedb79e2b163990e6093 bind-9.16.16.tar.xz
+bd4ffcc2589ca8f1ac228576ec11e86f317d5a78d7964a0a7ae70b2fa38831d5bd65c2e8c35d8190502de7139f85d8b080b3b8ee968811a8df78e5761781525d bind-9.16.20.tar.xz
2b32d1e7f62cd1e01bb4fdd92d15460bc14761b933d5acc463a91f5ecd4773d7477c757c5dd2738e8e433693592cf3f623ffc142241861c91848f01aa84640d6 bind.plugindir.patch
7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch
53db80f7ee4902f42fb1d0bc959242bcb6f20d95256bda99ce2c206af8b4703c7f72bb26d026c633f70451b84a37c3946b210951e34dd5d6620b181cd0183de4 named.initd
@@ -278,4 +290,5 @@ d2f61d02d7829af51faf14fbe2bafe8bc90087e6b6697c6275a269ebbddcaa14a234fff5c41da793
3aba9763cfaf0880a89fd01202f41406b465547296ce91373eb999ea7719040bc1ac4e47b0de025a8060f693d3d88774a20d09a43fa7ac6aa43989b58b5ee8fe named.conf.recursive
eed9886717539399518e011ae5eae6335aed4fae019e1def088c5be26bdc896c99c07adf84ee61babafa31d31ff3b028263d1c88d2eee17ecf4c95a9d77d524c 127.zone
340e86472a2c2746fe585c0aa5f079d3a9b46e828c1f53d48026533a169b7f77ded7d0a13d291d6962607bb9481456e6fa69df1834603e7555332615fb998f0b localhost.zone
+d9224712ee2c6f6d0ff483ed253497548935fe35f45e5bdf26c9bd25c6234adde00727df7eb49fbfbfb34aad9d9fa0f112e900804794ad90a5cd8a64e9db61c6 bind-9.16.20-map-format-fix.patch
"
diff --git a/main/bind/bind-9.16.20-map-format-fix.patch b/main/bind/bind-9.16.20-map-format-fix.patch
new file mode 100644
index 0000000000..f6e3c9b378
--- /dev/null
+++ b/main/bind/bind-9.16.20-map-format-fix.patch
@@ -0,0 +1,8 @@
+--- a/lib/dns/mapapi
++++ b/lib/dns/mapapi
+@@ -13,4 +13,4 @@
+ # Whenever releasing a new major release of BIND9, set this value
+ # back to 1.0 when releasing the first alpha. Map files are *never*
+ # compatible across major releases.
+-MAPAPI=2.0
++MAPAPI=3.0
diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD
index a8bced4012..e94262ac2d 100644
--- a/main/bluez/APKBUILD
+++ b/main/bluez/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bluez
-pkgver=5.58
-pkgrel=2
+pkgver=5.60
+pkgrel=3
pkgdesc="Tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
arch="all"
@@ -11,26 +11,29 @@ 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"
+ autoconf automake libtool ell-dev py3-docutils"
subpackages="
$pkgname-dev
$pkgname-doc
$pkgname-libs
+ $pkgname-openrc
$pkgname-btmgmt
$pkgname-btmon
$pkgname-cups
$pkgname-deprecated
+ $pkgname-deprecated-openrc
$pkgname-hid2hci
$pkgname-meshctl
$pkgname-obexd
$pkgname-plugins
- $pkgname-zsh-completion:zshcomp:noarch
+ $pkgname-zsh-completion
"
source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz
bluetooth.initd
rfcomm.initd
rfcomm.confd
org.bluez.obex.service
+ mpris-proxy.desktop
001-bcm43xx-Add-bcm43xx-3wire-variant.patch
002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
003-Increase-firmware-load-timeout-to-30s.patch
@@ -40,6 +43,7 @@ source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz
fix-endianness.patch
musl.patch
test-mesh-crypto.patch
+ fix-musl.patch
"
case "$CARCH" in
@@ -90,6 +94,9 @@ package() {
# Fix shebang for the installed binary
sed 's|^#!/usr/bin/python$|#!/usr/bin/env python3|g' -i test/simple-agent
install -Dm755 test/simple-agent "$pkgdir"/usr/bin/bluez-simple-agent
+
+ # Autostart mpris-proxy to pass through MPRIS control over BlueZ
+ install -Dm644 "$srcdir"/mpris-proxy.desktop -t "$pkgdir"/etc/xdg/autostart/
}
btmgmt() {
@@ -150,20 +157,38 @@ plugins() {
make DESTDIR="$subpkgdir" install-pluginLTLIBRARIES
}
-zshcomp() {
- depends=""
- pkgdesc="Zsh compltions for $pkgname"
- install_if="$pkgname=$pkgver-r$pkgrel zsh"
-
- amove usr/share/zsh/site-functions
+openrc() {
+ case "$subpkgname" in
+ "$pkgname"-deprecated-openrc)
+ # Make this the same as deprecated()
+ # the default_openrc function will add
+ # the correct (OpenRC init scripts) suffix
+ pkgdesc="Deprecated bluez tools"
+ ;;
+ esac
+
+ default_openrc
+
+ case "$subpkgname" in
+ "$pkgname"-openrc)
+ # Move the rfcomm .initd and .confd back to the
+ # mainpkg so the -deprecated-openrc subpackage
+ # can move them later
+ mkdir -p "$pkgdir"/etc/init.d "$pkgdir"/etc/conf.d
+ mv "$subpkgdir"/etc/init.d/rfcomm "$pkgdir"/etc/init.d
+ mv "$subpkgdir"/etc/conf.d/rfcomm "$pkgdir"/etc/conf.d
+ rmdir "$subpkgdir"/etc/conf.d # Only rfcomm was here
+ ;;
+ esac
}
sha512sums="
-159b554e0afd56af5da6f8333383f2fdf96d77a0e82d762bf4b37786e7312b7e61fbbae0f18b26442a606e0a232f48e0f45a4b38b95de36c7daf384f582315a3 bluez-5.58.tar.xz
-fc43c78ed248ea412529eed5ae8bb47bacca9bf5b3b10de121ddd4e792c85893561a88be4aa2c6318106e5d2146a721445152d44fa60ca257ca0b4eb87318c1e bluetooth.initd
+069e054360b4ab72f1daa033572f0fd822fb0f47e52069f4f3dcdfecfa312b9a5366cc04967e639aef39b980c0e1007389f1ee757e7c3bae43a5e66f8ed21a6b bluez-5.60.tar.xz
+e1d64fac673cceb657684b1bc5c36ff6d05f7cc5832d940863129adacd5b8ade1315b14df039a61f061950ac99e155266530efe2d2d35ea3c145b0469698a726 bluetooth.initd
8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd
a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd
d6766a4992ed4141569d6d82a802a771a5cb4c08873bfb0fdbedeea4d738bf9b56d9e0452ec19b7635418b1af4ab9b1735692043d629cbed3ce0eda6f51e1c6f org.bluez.obex.service
+72f9bc6cafe910ed7d105d4f3a537b16cd897622b2391ea545e6a302fcce2ed79e490e2841c6290aa1290489870a67638d71b0de5bc57f9d650e2248d9e4f0a4 mpris-proxy.desktop
73202915fda01d420b2864da77b1c25af5a55c815e9be6546400a0940bfb6097d83322790bc22a80ec0fcd557144fdd1877e243a79285a7f040ff96ba3600b94 001-bcm43xx-Add-bcm43xx-3wire-variant.patch
d5fd1c962bd846eaa6fff879bab85f753eb367d514f82d133b5d3242e1da989af5eddd942c60a87d5b67783e060f91bfa0f74fb1e8e6699cdee6e5bbe6a431ea 002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
784e9644c8de4e2693e2eeed988a245608b8cb14e1fc0dff8795c60c527b2e8d0c87862cfbfd6b850b47ae80cdf993a5ed3f477078ea1068fd7374899c7a1a77 003-Increase-firmware-load-timeout-to-30s.patch
@@ -173,4 +198,5 @@ ac635f9bca0e983835940572eb1b96ad70cf60fb84d5b0fde38c76ea6d1b13ef7d9adf81468b9fed
118d55183860f395fc4bdc93efffb13902ebf7388cad722b9061cd2860d404333e500af521741c3d92c0f8a161f6810348fbeb6682e49c372383f417aed8c76a fix-endianness.patch
641e425333d269833eed624edec0e29cba04bb0ff6570f6afda178a164fc2bb77456fa88957fe49f36000d3601ac00bb7ba089400977c1577e9c226e74baa3d6 musl.patch
9c57bb1abf1b4927441a2a25c3c2599b0da82850e6b945d09e824e25be7c7efa99e54999cf5b799a1093303202badf08833cc4ccb36203901dfa516031ea8eb0 test-mesh-crypto.patch
+2e92639512c11e69d3c47e222a012b4f58fa7727d18b3639130e8fe91654773b1205ddbe650efe49a26ec41a64d39ddba2806503272e09252c51d194e3ced33d fix-musl.patch
"
diff --git a/main/bluez/bluetooth.initd b/main/bluez/bluetooth.initd
index ee40153ec8..3e5ec982f8 100644
--- a/main/bluez/bluetooth.initd
+++ b/main/bluez/bluetooth.initd
@@ -7,7 +7,7 @@ start_stop_daemon_args="--background --make-pidfile"
depend() {
- after coldplug
+ after coldplug udev-postmount
need dbus localmount hostname
}
diff --git a/main/bluez/fix-musl.patch b/main/bluez/fix-musl.patch
new file mode 100644
index 0000000000..436fc5d2bf
--- /dev/null
+++ b/main/bluez/fix-musl.patch
@@ -0,0 +1,12 @@
+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/mpris-proxy.desktop b/main/bluez/mpris-proxy.desktop
new file mode 100644
index 0000000000..4995eaa431
--- /dev/null
+++ b/main/bluez/mpris-proxy.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=mpris-proxy
+Comment=Start mpris-proxy in daemon mode
+Exec=/usr/bin/mpris-proxy
+TryExec=/usr/bin/mpris-proxy
+Terminal=false
+X-KDE-autostart-phase=2
diff --git a/main/botan/APKBUILD b/main/botan/APKBUILD
index 03c9bdd509..9d6fc3c8a5 100644
--- a/main/botan/APKBUILD
+++ b/main/botan/APKBUILD
@@ -1,13 +1,13 @@
# Contributor: tcely <tcely@users.noreply.github.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=botan
-pkgver=2.17.3
-pkgrel=2
+pkgver=2.18.1
+pkgrel=1
pkgdesc="Crypto and TLS for C++11"
url="https://botan.randombit.net/"
arch="all"
license="BSD-2-Clause"
-depends_dev="boost-dev bzip2-dev openssl-dev sqlite-dev xz-dev zlib-dev"
+depends_dev="boost-dev bzip2-dev openssl1.1-compat-dev sqlite-dev xz-dev zlib-dev"
makedepends="$depends_dev python3"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
source="https://botan.randombit.net/releases/Botan-$pkgver.tar.xz"
@@ -57,4 +57,4 @@ package() {
rm -rf "$pkgdir"/usr/lib/python*
}
-sha512sums="ead0f144dfb9eca66d0e81e376d0d49f4b0b6bc1599f8cf52299e1753645b5b20100efa004ef5f9571f7bea88958f35db38367fc26f2603890f8f199cc890dbc Botan-2.17.3.tar.xz"
+sha512sums="2f11d1ab703d977a2d64504d2a2489ce56109a2a6c46c0dc7c8db428470ce511bcc0160f70baedad29237abd5e1622f2c155ea58c4dec4d3ae57ee7b350415c3 Botan-2.18.1.tar.xz"
diff --git a/main/brotli/APKBUILD b/main/brotli/APKBUILD
index 45dec65e52..6805d652cd 100644
--- a/main/brotli/APKBUILD
+++ b/main/brotli/APKBUILD
@@ -24,6 +24,9 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/google/brotli/archive/v$pkgv
# 1.0.9-r0:
# - CVE-2020-8927
+# use sysroot when cross compiling to avoid libtool pulling in host libs
+[ "$CBUILD" != "$CHOST" ] && _cross_configure="--with-sysroot=$CBUILDROOT"
+
prepare() {
default_prepare
sed -i 's,/usr/bin/env bash,/bin/sh,' tests/*.sh
@@ -34,7 +37,9 @@ build() {
./configure \
--build=$CBUILD \
--host=$CHOST \
+ --target=$CTARGET \
--prefix=/usr \
+ $_cross_configure \
make
}
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index 70bd14ffc7..d69b835702 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.12.1
+pkgver=5.14
pkgrel=0
pkgdesc="BTRFS filesystem utilities"
url="https://btrfs.wiki.kernel.org"
@@ -71,5 +71,5 @@ extra() {
}
sha512sums="
-a4044ad7e40e232442601f102ea1c64a65aa4d9765be303813d2547a5b730c5f2f84c9b9c652a4218ab16821fdd049dd8573a1f7f6cc27974c2c4389243e20f5 btrfs-progs-v5.12.1.tar.xz
+153dc24e24cb68e2522bad94873de4e24b106fe160fbea924e132728a908219f22baacbdd224a4d1f93179ebcb265bfef6ae7e92e486f538cd40ecdc46b98efd btrfs-progs-v5.14.tar.xz
"
diff --git a/main/bubblewrap/APKBUILD b/main/bubblewrap/APKBUILD
index 17af9fcb11..b3fad96bde 100644
--- a/main/bubblewrap/APKBUILD
+++ b/main/bubblewrap/APKBUILD
@@ -1,15 +1,15 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=bubblewrap
-pkgver=0.4.1
-pkgrel=2
+pkgver=0.5.0
+pkgrel=0
pkgdesc="Unprivileged sandboxing tool"
url="https://github.com/containers/bubblewrap"
arch="all"
license="LGPL-2.0-or-later"
options="!check" # Testsuite fails
makedepends="autoconf automake libcap-dev docbook-xsl"
-subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
+subpackages="$pkgname-doc $pkgname-bash-completion $pkgname-zsh-completion"
source="bubblewrap-$pkgver.tar.gz::https://github.com/containers/bubblewrap/archive/v$pkgver.tar.gz"
# secfixes:
@@ -38,13 +38,6 @@ package() {
make install DESTDIR="$pkgdir"
}
-bashcomp() {
- pkgdesc="Bash completions for $pkgname"
- depends=""
- install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
- mkdir -p "$subpkgdir"/usr/share/
- mv "$pkgdir"/usr/share/bash-completion/ "$subpkgdir"/usr/share/
-}
-
-sha512sums="83e036e242503e1364b2d0052bba5127175891203c57bd22ba47a1b1e934fdca64ca620cd0e48c903fa2bc7cdcf92339b8a7fcb8716b54c2e28034b6d6f86adc bubblewrap-0.4.1.tar.gz"
+sha512sums="
+9d1faa02aaf78a8005d5f032cfc708d9823b5d110bd35f600a7d075122eeda785db72dd5c5e416a35ade437cd0ff9b176d24aea980971e304600e03c793d1865 bubblewrap-0.5.0.tar.gz
+"
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index 6e39de7417..f86833cabc 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox-initscripts
-pkgver=3.2
-pkgrel=2
+pkgver=3.3
+pkgrel=1
pkgdesc="Init scripts for busybox daemons"
url="https://git.alpinelinux.org/aports/tree/main/busybox-initscripts"
arch="noarch"
@@ -43,7 +43,8 @@ EOF
chmod +x "$pkgdir"/etc/acpi/PWRF/00000080
}
-sha512sums="dd548670114a92404b8e35fb915fdbe5994498b05b0a418583271c3dd72fb7800950e42c095c902a014eb198c046b8a346d43dccd8e7a158048ae33767c572ed acpid.initd
+sha512sums="
+dd548670114a92404b8e35fb915fdbe5994498b05b0a418583271c3dd72fb7800950e42c095c902a014eb198c046b8a346d43dccd8e7a158048ae33767c572ed acpid.initd
c9d0fb0f8cc27d661d3b4e58c56eb598ca368890576e18ffffd42efdf68ba35537656be9be319b2e2818aa0152d3ca8611bece2433512fbfcd4eed7988765549 crond.initd
612a7ffb475fd23d33b2a7266b621537ca59b4abd8cb5a9ce03771800ec4f7622a8ff380320f8d768291e4d1a68adfff28f369776a80125940ee40b2e4a5db4d dnsd.initd
66bfd7d2a03f4e8a50f08b7057091bfef8e36001eb7c07574ec45da6d75db05a88ae37dbd51e3e3fc7b00a784bf69f8416682ce0454ca16cc072358abdf4d2ce httpd.initd
@@ -63,9 +64,10 @@ b0ba67585f39d83320ed6de183d7463a0e163807b9f3dc6f0baa212236056f22aeb2c5399dfdcd54
bf8173ee33a5d2b61cbdbc1b070e599a17a21e5433a0d8aa9beef71e4ac831304076af8e7e58dc594cdee61562329793afdc57af91e5496bf5fffb9b734a3d9c syslog.confd
359af0a4a1841dd6557eaf3e71d39f0d7a2687bad6a8fc6ef436eccf72a40f85c6400a3b7880c7f64d8e460b6af8a0ff3dd5ffc3a4b1aa8eb0d8f7eaf99ee3e4 watchdog.confd
acbba3385fb2c416362eb9176f24146b617a2e394ee0e00b9eff89350f82468a5ab8396f4f52b0aaf03d341ac6150c73182e808fa3f29a2dc71c69271cdfb811 loadkmap.confd
-cb269ed1ede0714dfc767d03cc0253aed3b30cec74a19d792bad42b844a942941c7e9f2c54e12c85ae2ceef0f173d38b91fe2376d91ffd55b3093f5cf4341fe4 mdev.conf
+085a5a722183a0d5d99c3027efe3a213a009fb8adf4d0aaba85b6d54f180302505ca35a59369ed8601546ee70cd637c271558ad1a9bb731738b3a33ea03ac906 mdev.conf
ebd82f935da2ca89097234dd8a8f47e179a423652c151123a1f3343f3e1e7bfaba2b8800380e988d4e8f4294545d3a9ab6708ae2e77c5b108b5f091bbce8f94a dvbdev
0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec ide_links
b2dcf0ded9264334d79fbbb05dd12d649dc3119a060db5893f0e8aeca2141323961c3ba4c822a0ffb00dba848742d5cb374dc77e776b57cecde352a3e8e30f8a usbdev
392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 usbdisk_link
-5db6fa8bbb2d891212187c598cd8703277b3fcb95b5dba6628f7128eb48cc7c1bf4c53885e9d870999c8c95d2fe9cd27609b523596dc553c31b6f72a452a0118 xvd_links"
+5db6fa8bbb2d891212187c598cd8703277b3fcb95b5dba6628f7128eb48cc7c1bf4c53885e9d870999c8c95d2fe9cd27609b523596dc553c31b6f72a452a0118 xvd_links
+"
diff --git a/main/busybox-initscripts/mdev.conf b/main/busybox-initscripts/mdev.conf
index 5285139b53..e59c3ec26f 100644
--- a/main/busybox-initscripts/mdev.conf
+++ b/main/busybox-initscripts/mdev.conf
@@ -77,6 +77,9 @@ sequencer.* root:audio 0660 >sound/
SUBSYSTEM=sound;.* root:audio 0660
+# virtio-ports
+SUBSYSTEM=virtio-ports;vport.* root:root 0600 @mkdir -p virtio-ports; ln -s ../$MDEV virtio-ports/$(cat /sys/class/virtio-ports/$MDEV/name)
+
# misc stuff
agpgart root:root 0660 >misc/
psaux root:root 0660 >misc/
diff --git a/main/busybox/0001-ash-regressions-in-process-substitution.patch b/main/busybox/0001-ash-regressions-in-process-substitution.patch
new file mode 100644
index 0000000000..98fdba7917
--- /dev/null
+++ b/main/busybox/0001-ash-regressions-in-process-substitution.patch
@@ -0,0 +1,80 @@
+From dab3c63da581f0d3d58e3ea1a620474eb5dad0ee Mon Sep 17 00:00:00 2001
+From: Ron Yorston <rmy@pobox.com>
+Date: Mon, 30 Aug 2021 20:31:42 +0100
+Subject: [PATCH] ash: regressions in process substitution
+
+Stacy Harper reports that this script:
+
+ test() { . /tmp/bb_test; }
+ echo "export TEST=foo" >/tmp/bb_test
+ test 2>/dev/null
+ echo "$TEST"
+
+correctly prints 'foo' in BusyBox 1.33 but hangs in 1.34.
+
+Bisection suggested the problem was caused by commit a1b0d3856 (ash: add
+process substitution in bash-compatibility mode). Removing the call to
+unwindredir() in cmdloop() introduced in that commit makes the script
+work again.
+
+Additionally, these examples of process substitution:
+
+ while true; do cat <(echo hi); done
+ f() { while true; do cat <(echo hi); done }
+ f
+
+result in running out of file descriptors. This is a regression from
+v5 of the process substitution patch caused by changes to evalcommand()
+not being transferred to v6.
+
+function old new delta
+static.pushredir - 99 +99
+evalcommand 1729 1750 +21
+exitreset 69 86 +17
+cmdloop 372 365 -7
+unwindredir 28 - -28
+pushredir 112 - -112
+------------------------------------------------------------------------------
+(add/remove: 1/2 grow/shrink: 2/1 up/down: 137/-147) Total: -10 bytes
+
+Signed-off-by: Ron Yorston <rmy@pobox.com>
+---
+ shell/ash.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/shell/ash.c b/shell/ash.c
+index b5947147a..53c140930 100644
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -10278,6 +10278,9 @@ evalcommand(union node *cmd, int flags)
+
+ /* First expand the arguments. */
+ TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
++#if BASH_PROCESS_SUBST
++ redir_stop = redirlist;
++#endif
+ file_stop = g_parsefile;
+ back_exitstatus = 0;
+
+@@ -10356,7 +10359,11 @@ evalcommand(union node *cmd, int flags)
+ lastarg = nargv[-1];
+
+ expredir(cmd->ncmd.redirect);
++#if !BASH_PROCESS_SUBST
+ redir_stop = pushredir(cmd->ncmd.redirect);
++#else
++ pushredir(cmd->ncmd.redirect);
++#endif
+ preverrout_fd = 2;
+ if (BASH_XTRACEFD && xflag) {
+ /* NB: bash closes fd == $BASH_XTRACEFD when it is changed.
+@@ -13476,9 +13483,6 @@ cmdloop(int top)
+ #if JOBS
+ if (doing_jobctl)
+ showjobs(SHOW_CHANGED|SHOW_STDERR);
+-#endif
+-#if BASH_PROCESS_SUBST
+- unwindredir(NULL);
+ #endif
+ inter = 0;
+ if (iflag && top) {
diff --git a/main/busybox/0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch b/main/busybox/0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch
new file mode 100644
index 0000000000..a9b0b8fd7a
--- /dev/null
+++ b/main/busybox/0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch
@@ -0,0 +1,88 @@
+From 808d176a4da607ed3187d58605d089b373694ba2 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Mon, 28 Jun 2021 07:09:25 -0600
+Subject: [PATCH 1/2] cpio: add support for --ignore-devno like GNU cpio
+
+The --ignore-devno option is used to set device numbers to (0, 0).
+This can be useful in verifying whether a CPIO archive is reproducible.
+
+function old new delta
+cpio_o 922 961 +39
+.rodata 78407 78422 +15
+bbconfig_config_bz2 6161 6167 +6
+packed_usage 25770 25764 -6
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 3/1 up/down: 60/-6) Total: 54 bytes
+
+Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
+---
+ archival/cpio.c | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/archival/cpio.c b/archival/cpio.c
+index d84f6937d..4d386d38d 100644
+--- a/archival/cpio.c
++++ b/archival/cpio.c
+@@ -38,6 +38,13 @@
+ //config: depends on FEATURE_CPIO_O
+ //config: help
+ //config: Passthrough mode. Rarely used.
++//config:
++//config:config FEATURE_CPIO_IGNORE_DEVNO
++//config: bool "Support --ignore-devno like GNU cpio"
++//config: default y
++//config: depends on FEATURE_CPIO_O && LONG_OPTS
++//config: help
++//config: Optionally ignore device numbers when creating archives.
+
+ //applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
+
+@@ -75,6 +82,9 @@
+ //usage: "\n -R USER[:GRP] Set owner of created files"
+ //usage: "\n -L Dereference symlinks"
+ //usage: "\n -0 Input is separated by NULs"
++//usage: IF_FEATURE_CPIO_IGNORE_DEVNO(
++//usage: "\n --ignore-devno"
++//usage: )
+
+ /* GNU cpio 2.9 --help (abridged):
+
+@@ -162,11 +172,13 @@ enum {
+ IF_FEATURE_CPIO_P(OPTBIT_PASSTHROUGH,)
+ IF_LONG_OPTS( OPTBIT_QUIET ,)
+ IF_LONG_OPTS( OPTBIT_2STDOUT ,)
++ IF_FEATURE_CPIO_IGNORE_DEVNO(OPTBIT_IGNORE_DEVNO,)
+ OPT_CREATE = IF_FEATURE_CPIO_O((1 << OPTBIT_CREATE )) + 0,
+ OPT_FORMAT = IF_FEATURE_CPIO_O((1 << OPTBIT_FORMAT )) + 0,
+ OPT_PASSTHROUGH = IF_FEATURE_CPIO_P((1 << OPTBIT_PASSTHROUGH)) + 0,
+ OPT_QUIET = IF_LONG_OPTS( (1 << OPTBIT_QUIET )) + 0,
+ OPT_2STDOUT = IF_LONG_OPTS( (1 << OPTBIT_2STDOUT )) + 0,
++ OPT_IGNORE_DEVNO = IF_FEATURE_CPIO_IGNORE_DEVNO((1 << OPTBIT_IGNORE_DEVNO)) + 0,
+ };
+
+ #define OPTION_STR "it0uvdmLF:R:"
+@@ -304,6 +316,11 @@ static NOINLINE int cpio_o(void)
+ }
+ }
+
++#if ENABLE_FEATURE_CPIO_IGNORE_DEVNO
++ if (option_mask32 & OPT_IGNORE_DEVNO)
++ st.st_dev = st.st_rdev = 0;
++#endif
++
+ bytes += printf("070701"
+ "%08X%08X%08X%08X%08X%08X%08X"
+ "%08X%08X%08X%08X" /* GNU cpio uses uppercase hex */
+@@ -379,6 +396,9 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
+ "null\0" No_argument "0"
+ "quiet\0" No_argument "\xff"
+ "to-stdout\0" No_argument "\xfe"
++#if ENABLE_FEATURE_CPIO_IGNORE_DEVNO
++ "ignore-devno\0" No_argument "\xfd"
++#endif
+ ;
+ #endif
+
+--
+2.32.0
+
diff --git a/main/busybox/0001-echo-do-not-assume-that-free-leaves-errno-unmodified.patch b/main/busybox/0001-echo-do-not-assume-that-free-leaves-errno-unmodified.patch
deleted file mode 100644
index ab445baedf..0000000000
--- a/main/busybox/0001-echo-do-not-assume-that-free-leaves-errno-unmodified.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From ffd2a7e631ddf25ee7097fc64b45283f7f8910d3 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 21 Jan 2021 14:12:51 +0100
-Subject: [PATCH] echo: do not assume that free() leaves errno unmodified
-
-musl libc's mallocng free() may modify errno if kernel does not support
-MADV_FREE which causes echo to echo with error when it shouldn't.
-
-Future versions of POSIX[1] will require that free() leaves errno
-unmodified but til then, do not rely free() implementation.
-
-Should fix downstream issues:
-https://github.com/alpinelinux/docker-alpine/issues/134
-https://gitlab.alpinelinux.org/alpine/aports/-/issues/12311
-
-Bloatcheck on x86_64:
-
-function old new delta
-echo_main 414 406 -8
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-8) Total: -8
-bytes
- text data bss dec hex filename
- 881114 15196 2000 898310 db506 busybox_old
- 881106 15196 2000 898302 db4fe busybox_unstripped
----
- coreutils/echo.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/coreutils/echo.c b/coreutils/echo.c
-index b3828894c..002832ead 100644
---- a/coreutils/echo.c
-+++ b/coreutils/echo.c
-@@ -97,6 +97,7 @@ int echo_main(int argc UNUSED_PARAM, char **argv)
- #else
- char nflag = 1;
- char eflag = 0;
-+ int err;
-
- while ((arg = *++argv) != NULL) {
- char n, e;
-@@ -184,14 +185,12 @@ int echo_main(int argc UNUSED_PARAM, char **argv)
-
- do_write:
- /* Careful to error out on partial writes too (think ENOSPC!) */
-- errno = 0;
-- /*r =*/ full_write(STDOUT_FILENO, buffer, out - buffer);
-- free(buffer);
-- if (/*WRONG:r < 0*/ errno) {
-+ err = full_write(STDOUT_FILENO, buffer, out - buffer) != out - buffer;
-+ if (err) {
- bb_simple_perror_msg(bb_msg_write_error);
-- return 1;
- }
-- return 0;
-+ free(buffer);
-+ return err;
- }
-
- /*
---
-2.30.0
-
diff --git a/main/busybox/0001-properly-fix-wget-https-support.patch b/main/busybox/0001-properly-fix-wget-https-support.patch
index f628901c4b..7e59be7030 100644
--- a/main/busybox/0001-properly-fix-wget-https-support.patch
+++ b/main/busybox/0001-properly-fix-wget-https-support.patch
@@ -1,4 +1,4 @@
-From 50fff6ca286c9efcc43dbd25d672fee1e427b7c6 Mon Sep 17 00:00:00 2001
+From ad8843a3df89aabfa6ebae841de32f22a48c2166 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 30 May 2018 09:52:20 +0000
Subject: [PATCH] properly fix wget https support
@@ -9,18 +9,18 @@ See: https://git.alpinelinux.org/cgit/aports/commit/?id=1d0560a9b6b5597b191e5aff
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/networking/wget.c b/networking/wget.c
-index 6a8c08324..a39766a1f 100644
+index 6a9604421..96dd4c403 100644
--- a/networking/wget.c
+++ b/networking/wget.c
-@@ -51,7 +51,6 @@
- //it also enables FTPS support, but it's not well tested yet
+@@ -57,7 +57,6 @@
+ //config: bool "Support HTTPS using internal TLS code"
//config: default y
//config: depends on WGET
-//config: select TLS
//config: help
//config: wget will use internal TLS code to connect to https:// URLs.
- //config: Note:
-@@ -736,10 +735,8 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
+ //config: It also enables FTPS support, but it's not well tested yet.
+@@ -760,10 +759,8 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
int pid;
char *servername, *p;
@@ -33,7 +33,7 @@ index 6a8c08324..a39766a1f 100644
servername = xstrdup(host);
p = strrchr(servername, ':');
-@@ -756,14 +753,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
+@@ -780,14 +777,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
close(sp[0]);
xmove_fd(sp[1], 0);
xdup2(0, 1);
@@ -50,7 +50,7 @@ index 6a8c08324..a39766a1f 100644
xmove_fd(network_fd, 3);
argv[0] = (char*)"ssl_client";
-@@ -771,8 +768,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
+@@ -795,8 +792,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
//TODO: if (!is_ip_address(servername))...
argv[2] = (char*)"-n";
argv[3] = servername;
diff --git a/main/busybox/0001-rev-correct-output-for-long-input-lines.patch b/main/busybox/0001-rev-correct-output-for-long-input-lines.patch
new file mode 100644
index 0000000000..ba40a2f0a2
--- /dev/null
+++ b/main/busybox/0001-rev-correct-output-for-long-input-lines.patch
@@ -0,0 +1,91 @@
+From 4357569fdc7bc482dea0ef0bff57a70e7f06523c Mon Sep 17 00:00:00 2001
+From: Ron Yorston <rmy@pobox.com>
+Date: Sat, 21 Aug 2021 09:36:27 +0100
+Subject: rev: correct output for long input lines
+
+The input buffer is initialised to a reasonable size and extended
+if necessary. When this happened the offset into the buffer wasn't
+reset to zero so subsequent lines were appended to the long line.
+
+Fix this and add some tests.
+
+function old new delta
+rev_main 377 368 -9
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-9) Total: -9 bytes
+
+Signed-off-by: Ron Yorston <rmy@pobox.com>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ testsuite/rev.tests | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ util-linux/rev.c | 1 +
+ 2 files changed, 47 insertions(+)
+ create mode 100755 testsuite/rev.tests
+
+diff --git a/testsuite/rev.tests b/testsuite/rev.tests
+new file mode 100755
+index 000000000..dd65dcd3b
+--- /dev/null
++++ b/testsuite/rev.tests
+@@ -0,0 +1,46 @@
++#!/bin/sh
++# Copyright 2021 by Ron Yorston
++# Licensed under GPLv2, see file LICENSE in this source tree.
++
++. ./testing.sh
++
++# testing "test name" "commands" "expected result" "file input" "stdin"
++
++testing "rev works" \
++ "rev input" \
++"\
++1 enil
++
++3 enil
++" \
++ "line 1\n\nline 3\n" \
++ ""
++
++testing "rev file with missing newline" \
++ "rev input" \
++"\
++1 enil
++
++3 enil" \
++ "line 1\n\nline 3" \
++ ""
++
++testing "rev file with NUL character" \
++ "rev input" \
++"\
++nil
++3 enil
++" \
++ "lin\000e 1\n\nline 3\n" \
++ ""
++
++testing "rev file with long line" \
++ "rev input" \
++"\
+++--------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------
++cba
++" \
++ "---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+--------------+\nabc\n" \
++ ""
++
++exit $FAILCOUNT
+diff --git a/util-linux/rev.c b/util-linux/rev.c
+index d439b4da8..63b005c67 100644
+--- a/util-linux/rev.c
++++ b/util-linux/rev.c
+@@ -109,6 +109,7 @@ int rev_main(int argc UNUSED_PARAM, char **argv)
+ strrev(buf, strlen(buf));
+ #endif
+ fputs_stdout(buf);
++ pos = 0;
+ }
+ fclose(fp);
+ } while (*argv);
+--
+cgit v1.2.3
+
diff --git a/main/busybox/0002-cpio-add-support-for-renumber-inodes-like-GNU-cpio.patch b/main/busybox/0002-cpio-add-support-for-renumber-inodes-like-GNU-cpio.patch
new file mode 100644
index 0000000000..9febb66dd4
--- /dev/null
+++ b/main/busybox/0002-cpio-add-support-for-renumber-inodes-like-GNU-cpio.patch
@@ -0,0 +1,129 @@
+From 67240ede641cdda29ef74a373bc9f5aa8a18f4e8 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Mon, 28 Jun 2021 08:23:09 -0600
+Subject: [PATCH 2/2] cpio: add support for --renumber-inodes like GNU cpio
+
+The --renumber-inodes option renumbers the inodes starting from 1,
+so that the sequence of inodes is always stable. This helps with
+reproducibility.
+
+function old new delta
+cpio_o 961 1045 +84
+.rodata 78422 78440 +18
+bbconfig_config_bz2 6168 6164 -4
+packed_usage 25764 25756 -8
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 2/2 up/down: 102/-12) Total: 90 bytes
+
+Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
+---
+ archival/cpio.c | 32 ++++++++++++++++++++++++++++++++
+ 1 file changed, 32 insertions(+)
+
+diff --git a/archival/cpio.c b/archival/cpio.c
+index 4d386d38d..14f0b5b84 100644
+--- a/archival/cpio.c
++++ b/archival/cpio.c
+@@ -45,6 +45,13 @@
+ //config: depends on FEATURE_CPIO_O && LONG_OPTS
+ //config: help
+ //config: Optionally ignore device numbers when creating archives.
++//config:
++//config:config FEATURE_CPIO_RENUMBER_INODES
++//config: bool "Support --renumber-inodes like GNU cpio"
++//config: default y
++//config: depends on FEATURE_CPIO_O && LONG_OPTS
++//config: help
++//config: Optionally renumber inodes when creating archives.
+
+ //applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
+
+@@ -85,6 +92,9 @@
+ //usage: IF_FEATURE_CPIO_IGNORE_DEVNO(
+ //usage: "\n --ignore-devno"
+ //usage: )
++//usage: IF_FEATURE_CPIO_RENUMBER_INODES(
++//usage: "\n --renumber-inodes"
++//usage: )
+
+ /* GNU cpio 2.9 --help (abridged):
+
+@@ -173,18 +183,21 @@ enum {
+ IF_LONG_OPTS( OPTBIT_QUIET ,)
+ IF_LONG_OPTS( OPTBIT_2STDOUT ,)
+ IF_FEATURE_CPIO_IGNORE_DEVNO(OPTBIT_IGNORE_DEVNO,)
++ IF_FEATURE_CPIO_RENUMBER_INODES(OPTBIT_RENUMBER_INODES,)
+ OPT_CREATE = IF_FEATURE_CPIO_O((1 << OPTBIT_CREATE )) + 0,
+ OPT_FORMAT = IF_FEATURE_CPIO_O((1 << OPTBIT_FORMAT )) + 0,
+ OPT_PASSTHROUGH = IF_FEATURE_CPIO_P((1 << OPTBIT_PASSTHROUGH)) + 0,
+ OPT_QUIET = IF_LONG_OPTS( (1 << OPTBIT_QUIET )) + 0,
+ OPT_2STDOUT = IF_LONG_OPTS( (1 << OPTBIT_2STDOUT )) + 0,
+ OPT_IGNORE_DEVNO = IF_FEATURE_CPIO_IGNORE_DEVNO((1 << OPTBIT_IGNORE_DEVNO)) + 0,
++ OPT_RENUMBER_INODES = IF_FEATURE_CPIO_RENUMBER_INODES((1 << OPTBIT_RENUMBER_INODES)) + 0,
+ };
+
+ #define OPTION_STR "it0uvdmLF:R:"
+
+ struct globals {
+ struct bb_uidgid_t owner_ugid;
++ ino_t next_inode;
+ } FIX_ALIASING;
+ #define G (*(struct globals*)bb_common_bufsiz1)
+ void BUG_cpio_globals_too_big(void);
+@@ -218,6 +231,9 @@ static NOINLINE int cpio_o(void)
+ struct inodes_s *next;
+ struct name_s *names;
+ struct stat st;
++#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
++ ino_t mapped_inode;
++#endif
+ };
+
+ struct inodes_s *links = NULL;
+@@ -272,6 +288,10 @@ static NOINLINE int cpio_o(void)
+ l = xzalloc(sizeof(*l));
+ l->st = st;
+ l->next = links;
++#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
++ if (option_mask32 & OPT_RENUMBER_INODES)
++ l->mapped_inode = ++G.next_inode;
++#endif
+ links = l;
+ break;
+ }
+@@ -290,6 +310,11 @@ static NOINLINE int cpio_o(void)
+ free(line);
+ continue;
+ }
++#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
++ else if (option_mask32 & OPT_RENUMBER_INODES) {
++ st.st_ino = ++G.next_inode;
++ }
++#endif
+ } else { /* line == NULL: EOF */
+ next_link:
+ if (links) {
+@@ -297,6 +322,10 @@ static NOINLINE int cpio_o(void)
+ st = links->st;
+ name = links->names->name;
+ links->names = links->names->next;
++#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
++ if (links->mapped_inode)
++ st.st_ino = links->mapped_inode;
++#endif
+ /* GNU cpio is reported to emit file data
+ * only for the last instance. Mimic that. */
+ if (links->names == NULL)
+@@ -398,6 +427,9 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
+ "to-stdout\0" No_argument "\xfe"
+ #if ENABLE_FEATURE_CPIO_IGNORE_DEVNO
+ "ignore-devno\0" No_argument "\xfd"
++#endif
++#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
++ "renumber-inodes\0" No_argument "\xfc"
+ #endif
+ ;
+ #endif
+--
+2.32.0
+
diff --git a/main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch b/main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
index ca558f8afb..964db5df6a 100644
--- a/main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
+++ b/main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
@@ -1,4 +1,4 @@
-From d4bc80ad7bf9b846b38c903a087c5ed318e848fb Mon Sep 17 00:00:00 2001
+From 3f44fe588d0d68ff5897928b65c0749505937d8d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 27 Dec 2016 20:46:59 +0100
Subject: [PATCH] app location for cpio, vi and lspci
@@ -11,7 +11,7 @@ Adjust location to where alpine linux installs them
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/archival/cpio.c b/archival/cpio.c
-index 221667112..a6d7630a4 100644
+index d84f6937d..29e7d396a 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -39,7 +39,7 @@
@@ -24,12 +24,12 @@ index 221667112..a6d7630a4 100644
//kbuild:lib-$(CONFIG_CPIO) += cpio.o
diff --git a/editors/vi.c b/editors/vi.c
-index f103e0dc0..89397710c 100644
+index 3e1bd0820..774da291f 100644
--- a/editors/vi.c
+++ b/editors/vi.c
-@@ -161,7 +161,7 @@
- //config: Unless you want more (or less) frequent "undo points" while typing,
- //config: you should probably leave this unchanged.
+@@ -176,7 +176,7 @@
+ //config: Enable more verbose reporting of the results of yank, change,
+ //config: delete, undo and substitution commands.
-//applet:IF_VI(APPLET(vi, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_VI(APPLET(vi, BB_DIR_USR_BIN, BB_SUID_DROP))
@@ -37,10 +37,10 @@ index f103e0dc0..89397710c 100644
//kbuild:lib-$(CONFIG_VI) += vi.o
diff --git a/util-linux/lspci.c b/util-linux/lspci.c
-index 0000fbfda..34189d2b5 100644
+index c22cbcc1e..70a623650 100644
--- a/util-linux/lspci.c
+++ b/util-linux/lspci.c
-@@ -16,7 +16,7 @@
+@@ -15,7 +15,7 @@
//config:
//config: This version uses sysfs (/sys/bus/pci/devices) only.
diff --git a/main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch b/main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch
index 086959468c..ea15834569 100644
--- a/main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch
+++ b/main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch
@@ -1,18 +1,41 @@
-From 38d7a4f9edda522ea504930ede17491a6c3253b3 Mon Sep 17 00:00:00 2001
+From 7f626404022bb69cd314e2eea33a721d75cc933d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 4 Aug 2016 11:08:35 +0200
+Date: Thu, 4 Aug 2016 12:46:55 +0200
Subject: [PATCH] udhcpc: set default discover retries to 5
Some slower nics needs more attempts to get a lease
---
- networking/udhcp/dhcpc.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ networking/udhcp/d6_dhcpc.c | 4 ++--
+ networking/udhcp/dhcpc.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
+index 8d11a7539..794441953 100644
+--- a/networking/udhcp/d6_dhcpc.c
++++ b/networking/udhcp/d6_dhcpc.c
+@@ -1135,7 +1135,7 @@ static void client_background(void)
+ //usage: "\n -s PROG Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
+ //usage: "\n -B Request broadcast replies"
+ //usage: "\n -t N Send up to N discover packets"
+-//usage: "\n -T SEC Pause between packets (default 3)"
++//usage: "\n -T SEC Pause between packets (default 5)"
+ //usage: "\n -A SEC Wait if lease is not obtained (default 20)"
+ //usage: USE_FOR_MMU(
+ //usage: "\n -b Background if lease is not obtained"
+@@ -1180,7 +1180,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
+ llist_t *list_x = NULL;
+ int tryagain_timeout = 20;
+ int discover_timeout = 3;
+- int discover_retries = 3;
++ int discover_retries = 5;
+ struct in6_addr srv6_buf;
+ struct in6_addr ipv6_buf;
+ struct in6_addr *requested_ipv6;
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
-index 102178a4f..1a0152d0c 100644
+index 331f13a8c..0c1b58d7c 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
-@@ -1165,7 +1165,7 @@ static void client_background(void)
+@@ -1173,7 +1173,7 @@ static void client_background(void)
//usage: "\n -p FILE Create pidfile"
//usage: "\n -B Request broadcast replies"
//usage: "\n -t N Send up to N discover packets (default 3)"
@@ -21,12 +44,12 @@ index 102178a4f..1a0152d0c 100644
//usage: "\n -A SEC Wait if lease is not obtained (default 20)"
//usage: USE_FOR_MMU(
//usage: "\n -b Background if lease is not obtained"
-@@ -1210,7 +1210,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
+@@ -1217,7 +1217,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
llist_t *list_x = NULL;
int tryagain_timeout = 20;
int discover_timeout = 3;
- int discover_retries = 3;
+ int discover_retries = 5;
- uint32_t server_addr = server_addr; /* for compiler */
+ uint32_t server_id = server_id; /* for compiler */
uint32_t requested_ip = 0;
- uint32_t xid = xid; /* for compiler */
+ int packet_num;
diff --git a/main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch b/main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
index 8d4a488014..523768bb94 100644
--- a/main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
+++ b/main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
@@ -1,6 +1,6 @@
-From a74c9074136192461b459df3f10a08ad416f4cb4 Mon Sep 17 00:00:00 2001
+From 0cd01228c1e4173683637c4e582448656b26c05f Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 6 Jul 2017 13:39:15 +0200
+Date: Thu, 6 Jul 2017 11:40:14 +0200
Subject: [PATCH] udhcpc: Don't background if -n is given
we need add -b to our udhcpc options to prevent boot forever if there are no
@@ -21,12 +21,12 @@ See also: https://bugs.busybox.net/11691
2 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
-index fc2d672b7..bf9363bac 100644
+index 8d11a7539..0284a0fd8 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
-@@ -1432,25 +1432,19 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
- }
+@@ -1401,25 +1401,19 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
leasefail:
+ change_listen_mode(LISTEN_NONE);
d6_run_script_no_option("leasefail");
+ if (opt & OPT_n) { /* abort if no lease */
+ bb_simple_info_msg("no lease, failing");
@@ -54,17 +54,17 @@ index fc2d672b7..bf9363bac 100644
+ opt = ((opt & ~OPT_b) | OPT_f);
}
+#endif
- /* wait before trying again */
+ /* Wait before trying again */
timeout = tryagain_timeout;
packet_num = 0;
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
-index 102178a4f..f20d3ddb9 100644
+index bbf95caca..8e034ac8a 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
-@@ -1438,25 +1438,19 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
- }
+@@ -1456,25 +1456,19 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
leasefail:
- udhcp_run_script(NULL, "leasefail");
+ change_listen_mode(LISTEN_NONE);
+ d4_run_script(NULL, "leasefail");
+ if (opt & OPT_n) { /* abort if no lease */
+ bb_simple_info_msg("no lease, failing");
+ retval = 1;
@@ -91,6 +91,6 @@ index 102178a4f..f20d3ddb9 100644
+ opt = ((opt & ~OPT_b) | OPT_f);
}
+#endif
- /* wait before trying again */
+ /* Wait before trying again */
timeout = tryagain_timeout;
packet_num = 0;
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 74be02ebef..02bd53c76e 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -3,8 +3,8 @@
# Contributor: Michal Artazov <michal@artazov.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
-pkgver=1.33.1
-pkgrel=2
+pkgver=1.34.0
+pkgrel=4
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
@@ -21,7 +21,9 @@ options="suid !check"
replaces="busybox-initscripts" # move of default.script
triggers="busybox.trigger=/bin:/usr/bin:/sbin:/usr/sbin:/lib/modules/*"
source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
- 0001-lineedit-fix-tab-completion-with-equal-sign.patch
+ 0001-rev-correct-output-for-long-input-lines.patch
+ 0001-ash-regressions-in-process-substitution.patch
+
0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
0001-properly-fix-wget-https-support.patch
@@ -36,9 +38,11 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
0010-Add-flag-for-not-following-symlinks-when-recursing.patch
0012-udhcpc-Don-t-background-if-n-is-given.patch
- 0001-echo-do-not-assume-that-free-leaves-errno-unmodified.patch
0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
+ 0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch
+ 0002-cpio-add-support-for-renumber-inodes-like-GNU-cpio.patch
+
acpid.logrotate
busyboxconfig
busyboxconfig-extras
@@ -86,9 +90,6 @@ build() {
${CC:-${CROSS_COMPILE}gcc} ${CPPFLAGS} ${CFLAGS} $(pkg-config --cflags libtls) \
"$srcdir"/ssl_client.c -o "$_dyndir"/ssl_client ${LDFLAGS} $(pkg-config --libs libtls)
- # no timestamp in build
- export KCONFIG_NOTIMESTAMP=1
-
# build dynamic
cd "$_dyndir"
msg "Building dynamic busybox"
@@ -215,7 +216,7 @@ ssl_client() {
pkgdesc="EXternal ssl_client for busybox wget"
local _sslver=$(pkg-config --modversion libssl)
# automatically pull in if both busybox and libssl is installed
- install_if="$pkgname=$pkgver-r$pkgrel libssl${_sslver%.*}"
+ install_if="$pkgname=$pkgver-r$pkgrel libssl${_sslver%.*%.*}"
mkdir -p "$subpkgdir"/usr/bin
install -m755 "$_dyndir"/ssl_client \
"$subpkgdir"/usr/bin/ssl_client
@@ -229,26 +230,28 @@ ifupdown() {
}
sha512sums="
-d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a busybox-1.33.1.tar.bz2
-84a6599d327d33350432d1f332006d8ce04363ecc53836a98a6180e0cc32fbc4f12c3f9f2b112a1cb2e787dce705b04562347d008465256e796c808433a188b6 0001-lineedit-fix-tab-completion-with-equal-sign.patch
+c57231e6d5dea8f2f5429673e9ea392a0f4b752731ec1f4903da8ca786914cda3065d80deeb28fb27d77848c892d587adf3b3150218d27cd87c5ece43de1b35a busybox-1.34.0.tar.bz2
+054e766429887e610c4a17846f495b7099bb419217f5fcc0dce0ed62b8740c2d4ee53b12a609b1830c26ac2af1eca9beb6140063b7d2665939f99f8664dfcc05 0001-rev-correct-output-for-long-input-lines.patch
+61ee8a497ab53ef2cac88eb51929fb0b483930eabb8d015b5fea30eb21257b314b2fe9ec871d6c8b4208964eb1d8329c8db7039297e31618cf555dde65c2db8a 0001-ash-regressions-in-process-substitution.patch
ead3403578c071c2216de17ab0543984c1f1509c12c062f03af49141547c3ea21356f3e8f0f0695550f05a41a1379dd73fc3cc18dcd78addbb411f247351e353 0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
a2787a3ecaf6746dadef62166e8ee6ecaa166147e5ad8b917c5838536057c875bab5f9cf40c3e05eba74d575484ac662929ac3799d58432d3a99ac46f364f302 0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
-e858bb6a0065d0b0cd757df1fb0eb7af1bc1890b276f20706f828b34171d3af3aea4e244233f495e752fb5b591e62da756d46a5b5cbb002c570d3efbb726f704 0001-properly-fix-wget-https-support.patch
+1efe1c4894ae983fed5ac848125f8603f157b9d91c952c53f4192b48d3e50967e05559851148397b583f34fb02d480393547904b4635e4248248be567ab268ea 0001-properly-fix-wget-https-support.patch
d8694293edc8cd55cecafeb902f03c01af318e13966f399365cf792b840793891ac086bb67ef83e7a5a2e01b246497a6c6511cb6a856834f6672dee4bca76896 0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
8c34dd5ce9a6e84279fa6494cbae0b254778976f341af1d0ccc2a3afb405fb22d374e9623ea83d1500da77c7463db2ed5218d2c9f49350a21114bd0bb17fd87d 0003-ash-exec-busybox.static.patch
-e4be12a1453a306a58c4ea59cd8a0bf1f261514ae090ea962ac6f7609dc1e9dab0d4d8d351d7adf4f76bf52d37db9ad0102116635e437945c131f762d5750d19 0004-app-location-for-cpio-vi-and-lspci.patch
-095c5617ba7e9f1523deb77ae465e635c347bb2a0934038b91e779f8deb4d7c7ff9ccabbb3bf8a176e83a3994df74692b0f3547d39ff87678cc54b08c8124db0 0005-udhcpc-set-default-discover-retries-to-5.patch
+a8fc2ccced4054f5eff6ea00389906a543a1716202b19ab71fda1de0e6860c8377ed3c306ffb9efabe9fb16779a306da6770b871229f6bd1d725a84fdaa03fef 0004-app-location-for-cpio-vi-and-lspci.patch
+f12916e70f7cc1ef4f6d85d09b9a496a52a494e6318029fdce9a9c812ab5c7b2a046c33b66834127bf809f243c91a53c3c5e27efca026a96fe6b03421de26e60 0005-udhcpc-set-default-discover-retries-to-5.patch
89215c328a46afc686c458a133dd88dcda817586df60eb041a694715e73dc78a297fc0f9a92e8ee7d0a39ce7f6053a6b8e38f3ee078ff90ed13fac2608510105 0006-ping-make-ping-work-without-root-privileges.patch
7873b98c676a92faea61511d50c1efac1220354d20afd53de19e2c8f1472559cb333b9dd4e0d6432616d8c5f59885f1503c448c86a912e8031c9bfed628c2db1 0007-fbsplash-support-console-switching.patch
2c56906dac70dea6276e4c573707cb06c4c8b53defcd33b1e5a28f928e7dafe905a52ce40571de430e4af7e00a75ecc0f249d2fec02da5f3d9edd4e904919a35 0008-fbsplash-support-image-and-bar-alignment-and-positio.patch
df02adb3e3cd3349cc8d070911e3392164cb2e30bd72cae7ceaa974b2db6f958fdcedf809abc7b4bee37c729a4d20abf127f615b0e238a667d572137abe6a79e 0009-depmod-support-generating-kmod-binary-index-files.patch
ecbe5c890d966f09280c7eb534109f785c68e292765f17ed7ff62fcc61d20f61443c4155add0a1ebfb67ce8564e104c1aa22a8ef0400e119b0bca2bca3671f2d 0010-Add-flag-for-not-following-symlinks-when-recursing.patch
-4d043999ffbf6875e6b28ffdb43a36dd5d37d51e862ed7d89c6007e38cdda056292c5322a3ac3189fd489bf3ad1cce7b20508a96aee55c09f09354e1c3f5f5fe 0012-udhcpc-Don-t-background-if-n-is-given.patch
-1ec62ab67e32684e2bbfbafefc9e2bffeb758248a97a1ed9468f449d1fc67fca5c1a6743acc889e12c6f18636708e35ba4bab3345c4994eea6be11f10c9a128c 0001-echo-do-not-assume-that-free-leaves-errno-unmodified.patch
+3ae5ecf3ea66c8d98762432026806fdb67b13a28075c6a3cb6e811a34ef89c2f0ed651946003aaad97fb4b7f74d132af3c394c114b7a72e1d20b319b739c5a6e 0012-udhcpc-Don-t-background-if-n-is-given.patch
d12246f1134bbd3993462d27172c4739cc601b251d57ce8e088745773afa965551236e8cb8b9013dfc142fd055e369a771d86c7c54615c89bd30393400bfa390 0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
+6f8fa4ec190d64d6c3d5377994be933885ed0b40361c99ca35881684db3b1b79664d6eab56a389df290b9f6c4db502c617ec8e4ffa6d5284bd41cea1f478b26c 0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch
+97109be04445b7b887c402b7072c1da57212ef11f2eca6d34c24d5a4e3b2866ee79aca7a0ca41043726293d9bed1b2fa8aab100501569f00b8670c280a87a01c 0002-cpio-add-support-for-renumber-inodes-like-GNU-cpio.patch
aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate
-5b0adc5bbe3d539380007ccc2e90ee1c986d24eae29b5e04b65a1e18988dc18907e7f617c7b3eb66ce131fdcb2de78da8b7653f58f95347d286fe5d17c6118f8 busyboxconfig
-470a646505887dbf20dd8c3c3b5c8ab25f363f3a0bfbca577de115b8ec61f28e9843f4f3a7978c634e863dbf28bae987f20e7fa1aa529450ff6c17bc188cae53 busyboxconfig-extras
+e6549c9d5dbd272fe26b3e1347c84e31dbca3c57f141a345504a334c6f92016f3a3e43f3ee6777d5e382b8e6c8aeb095e11110b96c1aa2dee6c358df72c57ec4 busyboxconfig
+2471879bca825af30ab3342e0c3635499f98eeed69ec2353b01c6cea1b07fee8b6f8bd4746fd2944039aa32acdec1e0c93c344a788f2f5ba4056db6182af4c02 busyboxconfig-extras
0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c
6321c1d96d8938a3b5eab21731de289ede136fff550f98127c509452bfb17769ccf94b118491f7b81d3c60e1bbb3e80bb07186e4ce07e29724a52f0daba9b218 dad.if-up
646ad9aefe3596d0170d92c8506ca1846e43b5b83cbef97ae565f15ffa7b14665a8c7061bc69c608c043f834c134c5d63f042509f8999031e89163508a868e46 ssl_client.c
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index 1767540299..579da5cdbf 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.33.0
-# Sat Jan 23 11:56:15 2021
+# Busybox version: 1.34.0
+# Sat Aug 21 11:29:32 2021
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -162,6 +162,8 @@ CONFIG_FEATURE_BZIP2_DECOMPRESS=y
CONFIG_CPIO=y
CONFIG_FEATURE_CPIO_O=y
CONFIG_FEATURE_CPIO_P=y
+CONFIG_FEATURE_CPIO_IGNORE_DEVNO=y
+CONFIG_FEATURE_CPIO_RENUMBER_INODES=y
# CONFIG_DPKG is not set
# CONFIG_DPKG_DEB is not set
CONFIG_GZIP=y
@@ -207,11 +209,13 @@ CONFIG_CHOWN=y
CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
CONFIG_CHROOT=y
CONFIG_CKSUM=y
+# CONFIG_CRC32 is not set
CONFIG_COMM=y
CONFIG_CP=y
CONFIG_FEATURE_CP_LONG_OPTIONS=y
CONFIG_FEATURE_CP_REFLINK=y
CONFIG_CUT=y
+# CONFIG_FEATURE_CUT_REGEX is not set
CONFIG_DATE=y
CONFIG_FEATURE_DATE_ISOFMT=y
# CONFIG_FEATURE_DATE_NANO is not set
@@ -316,7 +320,6 @@ CONFIG_TEST2=y
CONFIG_FEATURE_TEST_64=y
CONFIG_TIMEOUT=y
CONFIG_TOUCH=y
-CONFIG_FEATURE_TOUCH_NODEREF=y
CONFIG_FEATURE_TOUCH_SUSV3=y
CONFIG_TR=y
CONFIG_FEATURE_TR_CLASSES=y
@@ -424,6 +427,7 @@ CONFIG_VI=y
CONFIG_FEATURE_VI_MAX_LEN=4096
CONFIG_FEATURE_VI_8BIT=y
CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_COLON_EXPAND=y
CONFIG_FEATURE_VI_YANKMARK=y
CONFIG_FEATURE_VI_SEARCH=y
# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
@@ -437,6 +441,7 @@ CONFIG_FEATURE_VI_ASK_TERMINAL=y
CONFIG_FEATURE_VI_UNDO=y
CONFIG_FEATURE_VI_UNDO_QUEUE=y
CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
+# CONFIG_FEATURE_VI_VERBOSE_STATUS is not set
CONFIG_FEATURE_ALLOW_EXEC=y
#
@@ -744,6 +749,7 @@ CONFIG_FEATURE_VOLUMEID_XFS=y
# Miscellaneous Utilities
#
CONFIG_ADJTIMEX=y
+# CONFIG_ASCII is not set
CONFIG_BBCONFIG=y
CONFIG_FEATURE_COMPRESS_BBCONFIG=y
CONFIG_BC=y
@@ -839,6 +845,7 @@ CONFIG_TTYSIZE=y
# CONFIG_UBIRENAME is not set
CONFIG_VOLNAME=y
CONFIG_WATCHDOG=y
+CONFIG_FEATURE_WATCHDOG_OPEN_TWICE=y
#
# Networking Utilities
@@ -977,6 +984,7 @@ CONFIG_VCONFIG=y
CONFIG_WGET=y
CONFIG_FEATURE_WGET_LONG_OPTIONS=y
CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_FTP=y
CONFIG_FEATURE_WGET_AUTHENTICATION=y
CONFIG_FEATURE_WGET_TIMEOUT=y
CONFIG_FEATURE_WGET_HTTPS=y
@@ -1002,6 +1010,7 @@ CONFIG_FEATURE_UDHCPC6_RFC5970=y
#
# Common options for DHCP applets
#
+CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0"
# CONFIG_FEATURE_UDHCP_PORT is not set
CONFIG_UDHCP_DEBUG=0
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
@@ -1134,8 +1143,8 @@ CONFIG_ASH_VERSION_VAR=y
# CONFIG_SHELL_HUSH is not set
# CONFIG_HUSH_BASH_COMPAT is not set
# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_LINENO_VAR is not set
# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
+# CONFIG_HUSH_LINENO_VAR is not set
# CONFIG_HUSH_INTERACTIVE is not set
# CONFIG_HUSH_SAVEHISTORY is not set
# CONFIG_HUSH_JOB is not set
diff --git a/main/busybox/busyboxconfig-extras b/main/busybox/busyboxconfig-extras
index 78412c8c96..998b660723 100644
--- a/main/busybox/busyboxconfig-extras
+++ b/main/busybox/busyboxconfig-extras
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.33.0
-# Sat Jan 23 11:57:08 2021
+# Busybox version: 1.34.0
+# Sat Aug 21 11:30:37 2021
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -162,6 +162,8 @@ CONFIG_BZIP2_SMALL=0
# CONFIG_CPIO is not set
# CONFIG_FEATURE_CPIO_O is not set
# CONFIG_FEATURE_CPIO_P is not set
+# CONFIG_FEATURE_CPIO_IGNORE_DEVNO is not set
+# CONFIG_FEATURE_CPIO_RENUMBER_INODES is not set
# CONFIG_DPKG is not set
# CONFIG_DPKG_DEB is not set
# CONFIG_GZIP is not set
@@ -207,11 +209,13 @@ CONFIG_GZIP_FAST=0
# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
# CONFIG_CHROOT is not set
# CONFIG_CKSUM is not set
+# CONFIG_CRC32 is not set
# CONFIG_COMM is not set
# CONFIG_CP is not set
# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
# CONFIG_FEATURE_CP_REFLINK is not set
# CONFIG_CUT is not set
+# CONFIG_FEATURE_CUT_REGEX is not set
# CONFIG_DATE is not set
# CONFIG_FEATURE_DATE_ISOFMT is not set
# CONFIG_FEATURE_DATE_NANO is not set
@@ -312,7 +316,6 @@ CONFIG_GZIP_FAST=0
# CONFIG_FEATURE_TEST_64 is not set
# CONFIG_TIMEOUT is not set
# CONFIG_TOUCH is not set
-# CONFIG_FEATURE_TOUCH_NODEREF is not set
# CONFIG_FEATURE_TOUCH_SUSV3 is not set
# CONFIG_TR is not set
# CONFIG_FEATURE_TR_CLASSES is not set
@@ -408,6 +411,7 @@ CONFIG_DEFAULT_SETFONT_DIR=""
CONFIG_FEATURE_VI_MAX_LEN=0
# CONFIG_FEATURE_VI_8BIT is not set
# CONFIG_FEATURE_VI_COLON is not set
+# CONFIG_FEATURE_VI_COLON_EXPAND is not set
# CONFIG_FEATURE_VI_YANKMARK is not set
# CONFIG_FEATURE_VI_SEARCH is not set
# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
@@ -421,6 +425,7 @@ CONFIG_FEATURE_VI_MAX_LEN=0
# CONFIG_FEATURE_VI_UNDO is not set
# CONFIG_FEATURE_VI_UNDO_QUEUE is not set
CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0
+# CONFIG_FEATURE_VI_VERBOSE_STATUS is not set
# CONFIG_FEATURE_ALLOW_EXEC is not set
#
@@ -720,6 +725,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
# Miscellaneous Utilities
#
# CONFIG_ADJTIMEX is not set
+# CONFIG_ASCII is not set
# CONFIG_BBCONFIG is not set
# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
# CONFIG_BC is not set
@@ -815,6 +821,7 @@ CONFIG_READAHEAD=y
# CONFIG_UBIRENAME is not set
# CONFIG_VOLNAME is not set
# CONFIG_WATCHDOG is not set
+# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set
#
# Networking Utilities
@@ -953,6 +960,7 @@ CONFIG_FEATURE_TFTP_BLOCKSIZE=y
# CONFIG_WGET is not set
# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
# CONFIG_FEATURE_WGET_STATUSBAR is not set
+# CONFIG_FEATURE_WGET_FTP is not set
# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
# CONFIG_FEATURE_WGET_TIMEOUT is not set
# CONFIG_FEATURE_WGET_HTTPS is not set
@@ -978,12 +986,13 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT=""
#
# Common options for DHCP applets
#
+CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0"
# CONFIG_FEATURE_UDHCP_PORT is not set
CONFIG_UDHCP_DEBUG=0
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
CONFIG_FEATURE_UDHCP_RFC3397=y
CONFIG_FEATURE_UDHCP_8021Q=y
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R"
#
# Print Utilities
@@ -1104,13 +1113,14 @@ CONFIG_BASH_IS_NONE=y
# CONFIG_ASH_HELP is not set
# CONFIG_ASH_GETOPTS is not set
# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_VERSION_VAR is not set
# CONFIG_CTTYHACK is not set
# CONFIG_HUSH is not set
# CONFIG_SHELL_HUSH is not set
# CONFIG_HUSH_BASH_COMPAT is not set
# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_LINENO_VAR is not set
# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
+# CONFIG_HUSH_LINENO_VAR is not set
# CONFIG_HUSH_INTERACTIVE is not set
# CONFIG_HUSH_SAVEHISTORY is not set
# CONFIG_HUSH_JOB is not set
diff --git a/main/byacc/APKBUILD b/main/byacc/APKBUILD
index 6f37c29165..ee1276c26c 100644
--- a/main/byacc/APKBUILD
+++ b/main/byacc/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
pkgname=byacc
-pkgver=20210328
+pkgver=20210808
pkgrel=0
pkgdesc="The Berkeley Yacc general-purpose parser generator"
url="https://invisible-island.net/byacc/byacc.html"
@@ -29,4 +29,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="fdcf98976524c1f37710cf9551a357ebc24ece94dd2bd10501d4fafb914a7ab4847926b99647e387f22a3d3206e6a4bfc14a4c41115702382fcc1d6f688f9dae byacc-20210328.tgz"
+sha512sums="
+cde092dbd845364752aca228a838b97fc34378c7dd7f860c614d13c8ec7167b8416422ded82864d22e8c3c447b47b30abca591ef8ab667c49f9fa070d68114c4 byacc-20210808.tgz
+"
diff --git a/main/c-ares/APKBUILD b/main/c-ares/APKBUILD
index 8b0d659a63..5977622f51 100644
--- a/main/c-ares/APKBUILD
+++ b/main/c-ares/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=c-ares
-pkgver=1.17.1
-pkgrel=1
+pkgver=1.17.2
+pkgrel=0
pkgdesc="An asynchronously DNS/names resolver library"
url="https://c-ares.haxx.se/"
arch="all"
@@ -11,6 +11,10 @@ license="MIT"
subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
source="https://c-ares.haxx.se/download/c-ares-$pkgver.tar.gz"
+# secfixes:
+# 1.17.2-r0:
+# - CVE-2021-3672
+
build() {
./configure \
--build=$CBUILD \
@@ -36,4 +40,6 @@ package() {
make -j1 DESTDIR="$pkgdir" install
}
-sha512sums="b11887bcc9274d368088e1a8b6aca62414f20675cf0bc58e948f54fa04c327c39dd23cefe7509eec6397db14b550a3f6b77f5c18b3d735b3eef48ce2da1dcd00 c-ares-1.17.1.tar.gz"
+sha512sums="
+f625e0ef8508af6475d3e83b51ab29be8a4878e2a87e7f518bea046b76a74bfde7043ca6ec2a9e714c898ab9e5d4a5a678c3347a9f9eb68980438f7ca8ae3fc8 c-ares-1.17.2.tar.gz
+"
diff --git a/main/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD
index c2f84505b3..fb0185e474 100644
--- a/main/ca-certificates/APKBUILD
+++ b/main/ca-certificates/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ca-certificates
pkgver=20191127
-pkgrel=5
+pkgrel=6
pkgdesc="Common CA certificates PEM files from Mozilla"
url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/"
arch="all"
diff --git a/main/cgit/APKBUILD b/main/cgit/APKBUILD
index 51b2c319be..fc3c9c0eaf 100644
--- a/main/cgit/APKBUILD
+++ b/main/cgit/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cgit
pkgver=1.2.3
-pkgrel=0
+pkgrel=1
_gitver=2.25.1
pkgdesc="A fast webinterface for git"
url="https://git.zx2c4.com/cgit/"
diff --git a/main/charybdis/APKBUILD b/main/charybdis/APKBUILD
index 64f7879919..30ab935d33 100644
--- a/main/charybdis/APKBUILD
+++ b/main/charybdis/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=charybdis
pkgver=4.1.2
-pkgrel=2
+pkgrel=3
pkgdesc="A highly-scalable IRCv3-compliant IRC daemon"
url="https://github.com/charybdis-ircd/charybdis"
arch="all"
diff --git a/main/cjson/APKBUILD b/main/cjson/APKBUILD
index 35a7ba793a..9fbdcb0837 100644
--- a/main/cjson/APKBUILD
+++ b/main/cjson/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer:
pkgname=cjson
-pkgver=1.7.14
-pkgrel=1
+pkgver=1.7.15
+pkgrel=0
pkgdesc="Lighweight JSON parser in C"
url="https://github.com/DaveGamble/cJSON"
arch="all"
@@ -35,4 +35,6 @@ package() {
DESTDIR="$pkgdir" cmake --build build --target install
}
-sha512sums="8de1dedc123ed025a9cbe6764e5963eb0550f726d06a8f6bedfe05b84e852cd9c1587cd381669663073967f42be894a535ba239013f304ce544c3b15a6477c01 cjson-1.7.14.tar.gz"
+sha512sums="
+0b32a758c597fcc90c8ed0af493c9bccd611b9d4f9a03e87de3f7337bb9a28990b810befd44bc321a0cb42cbcd0b026d45761f9bab7bd798f920b7b6975fb124 cjson-1.7.15.tar.gz
+"
diff --git a/main/ckbcomp/APKBUILD b/main/ckbcomp/APKBUILD
index 64414b7083..57505b252e 100644
--- a/main/ckbcomp/APKBUILD
+++ b/main/ckbcomp/APKBUILD
@@ -1,15 +1,15 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ckbcomp
-pkgver=1.202
+pkgver=1.205
pkgrel=0
pkgdesc="Compile a XKB keyboard description to a keymap"
-url="http://anonscm.debian.org/cgit/d-i/console-setup.git"
+url="https://packages.debian.org/sid/console-setup"
arch="noarch"
license="GPL-2.0-or-later"
depends="perl"
options="!check"
subpackages="$pkgname-doc"
-source="http://ftp.debian.org/debian/pool/main/c/console-setup/console-setup_$pkgver.tar.xz"
+source="https://deb.debian.org/debian/pool/main/c/console-setup/console-setup_$pkgver.tar.xz"
builddir="$srcdir"/console-setup-$pkgver
package() {
@@ -17,4 +17,6 @@ package() {
install -D -m644 man/$pkgname.1 $pkgdir/usr/share/man/man1/$pkgname.1
}
-sha512sums="caa7dcf667d44edab97811d8f95a3532af6d340e217e4a2acfa02f8812625522823e8d90bd35f701f3fc0b6c6e3b867a0a58c5c2323c64022f2c5ca3527e7d33 console-setup_1.202.tar.xz"
+sha512sums="
+757643f040542fda2903ffaa35a311c6c572b4c1e9c6c169a032e85a360bfe7d64e66ad66fba988515a4c1004ae4ecb45a40fba5c0a9eec6bd58abc1e0624b15 console-setup_1.205.tar.xz
+"
diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD
index e40e7117e3..026e75e69d 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.20.3
+pkgver=3.21.2
pkgrel=0
pkgdesc="Cross-platform, open-source make system"
url="https://www.cmake.org/"
@@ -19,7 +19,6 @@ case $pkgver in
esac
source="https://www.cmake.org/files/$_v/cmake-$pkgver.tar.gz
- patch-adjust-lib64.patch
"
_parallel_opt() {
@@ -57,8 +56,6 @@ package() {
cd $startdir/src/$pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
-
sha512sums="
-ed2b8b04c759c4f7c5c363be33bf08e6677c710c1f937050a378ab5539136b919531e1c927b117b3d8d68d4bb613de8d92a3d4d50f3ab3bc98355febca779a1b cmake-3.20.3.tar.gz
-87051601dda49894a1631156bf63aaa79fcf7cb7bb6705712889b9012d87d2f11d2707a1d729223b180668ad61f22b16893658e9777beee330c7e9a90e7421e6 patch-adjust-lib64.patch
+75649404564aaa6175a8c66ab19a10318066dbb667806c287e3cb125ac4c16c1629c160e355bcc50864a38d5488b1f7d1bc77acc602f5f3edd5f68691ae5080d cmake-3.21.2.tar.gz
"
diff --git a/main/cmake/patch-adjust-lib64.patch b/main/cmake/patch-adjust-lib64.patch
deleted file mode 100644
index 251bcaa10d..0000000000
--- a/main/cmake/patch-adjust-lib64.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- cmake-3.19.5/Modules/GNUInstallDirs.cmake.orig
-+++ cmake-3.19.5/Modules/GNUInstallDirs.cmake
-@@ -224,28 +224,6 @@
- "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
- "Please enable at least one language before including GNUInstallDirs.")
- endif()
-- if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
-- AND NOT CMAKE_CROSSCOMPILING
-- AND NOT EXISTS "/etc/arch-release")
-- if (EXISTS "/etc/debian_version") # is this a debian system ?
-- if(CMAKE_LIBRARY_ARCHITECTURE)
-- if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
-- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
-- endif()
-- if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX
-- AND "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
-- set(__LAST_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
-- endif()
-- endif()
-- else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
-- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-- set(_LIBDIR_DEFAULT "lib64")
-- if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
-- set(__LAST_LIBDIR_DEFAULT "lib64")
-- endif()
-- endif()
-- endif()
-- endif()
- if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
- set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "Object code libraries (${_LIBDIR_DEFAULT})")
- elseif(DEFINED __LAST_LIBDIR_DEFAULT
diff --git a/main/compiler-rt/APKBUILD b/main/compiler-rt/APKBUILD
index cd98622410..ab8b349e58 100644
--- a/main/compiler-rt/APKBUILD
+++ b/main/compiler-rt/APKBUILD
@@ -7,7 +7,7 @@ pkgver=11.1.0
pkgrel=1
_llvmver=${pkgver%%.*}
pkgdesc="LLVM compiler-rt runtime libraries"
-arch="aarch64 armv7 x86 x86_64"
+arch="all"
url="https://llvm.org/"
license="Apache-2.0"
makedepends="
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index ee50ce4d38..28da200842 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -1,20 +1,22 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cryptsetup
-pkgver=2.3.6
+pkgver=2.4.1 # XXX: remove automake/autoconf when upgrading to 2.5.0
pkgrel=0
pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
url="https://gitlab.com/cryptsetup/cryptsetup"
arch="all"
license="GPL-2.0-or-later WITH OpenSSL-Exception"
-makedepends_host="lvm2-dev openssl-dev popt-dev util-linux-dev
+makedepends_build="automake autoconf bash coreutils"
+makedepends_host="lvm2-dev openssl1.1-compat-dev popt-dev util-linux-dev
json-c-dev argon2-dev"
makedepends="$makedepends_build $makedepends_host"
-checkdepends="device-mapper sharutils which bash coreutils"
+checkdepends="device-mapper which sharutils"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc"
source="https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/cryptsetup-$pkgver.tar.gz
dmcrypt.initd
dmcrypt.confd
+
flush-stdout.patch
"
@@ -23,6 +25,8 @@ source="https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/cryptset
# - CVE-2020-14382
build() {
+ # Disable support for external tokens since it requires
+ # dlvsym(3) which is a GNU extension and not available in musl.
./configure \
--build="$CBUILD" \
--host="$CHOST" \
@@ -31,7 +35,9 @@ build() {
--sbindir=/sbin \
--disable-static \
--enable-libargon2 \
- --with-crypto_backend=openssl
+ --with-crypto_backend=openssl \
+ --disable-external-tokens \
+ --disable-ssh-token
make
}
@@ -49,7 +55,7 @@ package() {
install -Dm755 "$srcdir"/dmcrypt.initd "$pkgdir"/etc/init.d/dmcrypt
mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
- install -m644 README TODO FAQ NEWS docs/v$pkgver-ReleaseNotes \
+ install -m644 README.md FAQ docs/v$pkgver-ReleaseNotes \
"$pkgdir"/usr/share/doc/$pkgname/
}
@@ -60,8 +66,8 @@ libs() {
}
sha512sums="
-a0ec8dcb7082e458660f6379a532cffb56561488288e514db2ebceab11779c7d94aa732660b24f85e46a333a969d8d39aed9ca9b2e9ac0af724cabb07488e2f5 cryptsetup-2.3.6.tar.gz
+b12589181e48c8ae7e95fa7d0642caa479a0000c76ac4c2f9dcacb9319512f0c079d037c6fe596639481a62b6290dd7d0bf826ac5e096c526435a8241386fe0e cryptsetup-2.4.1.tar.gz
a3ca3e648749136ee724692b61488cd855f118eb93435942c2b04964a34fe49d0f0da4ef64cd2531c1c0f650e77808cf5d802789fd7664398248ead668bb35e5 dmcrypt.initd
74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 dmcrypt.confd
-dc896fdb7697d01443a168819f01af02db00a9de75589f062a1ebbfc0bc185b6d2109b18352309c41b818e3ad89609dcea3660d6f3cda890de825f053f94de97 flush-stdout.patch
+529187851def5fbc08e995eba90d3f013f1cf8469dcb9344f83d1e3c73c71467ca4ed62c8282ec27ebfa30ccc33653fdd1aea8d1d80e1ac4293d51865c9a6200 flush-stdout.patch
"
diff --git a/main/cryptsetup/flush-stdout.patch b/main/cryptsetup/flush-stdout.patch
index a39aec5474..9698460b29 100644
--- a/main/cryptsetup/flush-stdout.patch
+++ b/main/cryptsetup/flush-stdout.patch
@@ -1,15 +1,15 @@
-diff -upr cryptsetup-2.1.0.orig/src/utils_tools.c cryptsetup-2.1.0/src/utils_tools.c
---- cryptsetup-2.1.0.orig/src/utils_tools.c 2019-01-31 21:37:12.000000000 +0100
-+++ cryptsetup-2.1.0/src/utils_tools.c 2019-03-16 16:33:13.000000000 +0100
-@@ -105,10 +105,13 @@ void tool_log(int level, const char *msg
+diff -upr cryptsetup-2.4.0.orig/src/utils_tools.c cryptsetup-2.4.0/src/utils_tools.c
+--- cryptsetup-2.4.0.orig/src/utils_tools.c 2021-08-29 15:17:46.989874344 +0200
++++ cryptsetup-2.4.0/src/utils_tools.c 2021-08-29 15:18:45.543241866 +0200
+@@ -79,10 +79,13 @@ void tool_log(int level, const char *msg
case CRYPT_LOG_NORMAL:
fprintf(stdout, "%s", msg);
+ fflush(stdout);
break;
case CRYPT_LOG_VERBOSE:
-- if (opt_verbose)
-+ if (opt_verbose) {
+- if (params && params->verbose)
++ if (params && params->verbose) {
fprintf(stdout, "%s", msg);
+ fflush(stdout);
+ }
diff --git a/main/ctags/APKBUILD b/main/ctags/APKBUILD
index 43c1f79dc8..81ad8e4195 100644
--- a/main/ctags/APKBUILD
+++ b/main/ctags/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=ctags
-pkgver=5.9.20210411.0
+pkgver=5.9.20210829.0
_realver="p$pkgver"
pkgrel=0
pkgdesc="Generator of tags for all types of C/C++ languages"
@@ -49,4 +49,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="64f961e3b3d98a16ae087856b67ef95ba53d7daa710e135459d2bea76d084c013dd30f5644e98e00d02374ed7709560759e732c1d5cd870a578d908d16b99933 ctags-5.9.20210411.0.tar.gz"
+sha512sums="
+3f1875e310efdc8f5d231ec61768d9a4e6d128ae1f321403e0605052daa3a8f41e1a3c5a42b75ae916ddae06944a0917c27104a87c01e115b7d8f9db9e1e06ee ctags-5.9.20210829.0.tar.gz
+"
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index 4fa0420991..6326795468 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -1,13 +1,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cups
pkgver=2.3.3
-pkgrel=2
+pkgrel=4
pkgdesc="The CUPS Printing System"
url="https://www.cups.org/"
arch="all"
license="GPL-2.0-only"
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-libs ipptool $pkgname-client
- $pkgname-lang $pkgname-openrc $pkgname-dbg"
+ $pkgname-lang $pkgname-openrc"
depends_dev="libgcrypt-dev gnutls-dev zlib-dev"
makedepends="$depends_dev libpaper-dev dbus-dev libjpeg-turbo-dev avahi-dev
linux-headers libusb-dev"
@@ -19,6 +19,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenPrinting/cups/archive/v$
$pkgname.logrotate
cupsd.initd
cups-no-export-ssllibs.patch
+ cups-nostrip.patch
default-config-no-gssapi.patch
"
@@ -131,8 +132,11 @@ _mv() {
done
}
-sha512sums="5a43ef98f83c1783221155c01de940f3679023251709931ef28572c7b00620b36252afe894e86f2f08a527008dc2c95dc8af4129f0ab28a28663be8d3ccc3418 cups-2.3.3.tar.gz
+sha512sums="
+5a43ef98f83c1783221155c01de940f3679023251709931ef28572c7b00620b36252afe894e86f2f08a527008dc2c95dc8af4129f0ab28a28663be8d3ccc3418 cups-2.3.3.tar.gz
cf64211da59e79285f99d437c02fdd7db462855fb2920ec9563ba47bd8a9e5cbd10555094940ceedeb41ac805c4f0ddb9147481470112a11a76220d0298aef79 cups.logrotate
2c2683f755a220166b3a1653fdd1a6daa9718c8f0bbdff2e2d5e61d1133306260d63a83d3ff41619b5cf84c4913fae5822b79553e2822858f38fa3613f4c7082 cupsd.initd
7a8cd9ac33b0dd4627c72df4275db8ccd7cf8e201bce3833719b42f532f526bb347b842e3ea1ef0d61855b5c6e1088b5d20b68942f2c2c0acf504d8d9728efd3 cups-no-export-ssllibs.patch
-ac1ec4453d6a4b641d40089c77d3b776963d90efb092851c8d93deceb6068b111dee71171967ffb7ad0f5adb424398a43f51feb7d5d9734287cfb9e419efaa93 default-config-no-gssapi.patch"
+f9f465c0a0125e15d969e4992e94657277211045b393247808b028ba5f8e010f753b750b7a01e4272da03188955866cbe6db1970fc865f883e8377a7e432ba65 cups-nostrip.patch
+ac1ec4453d6a4b641d40089c77d3b776963d90efb092851c8d93deceb6068b111dee71171967ffb7ad0f5adb424398a43f51feb7d5d9734287cfb9e419efaa93 default-config-no-gssapi.patch
+"
diff --git a/main/cups/cups-nostrip.patch b/main/cups/cups-nostrip.patch
new file mode 100644
index 0000000000..62b3ce2344
--- /dev/null
+++ b/main/cups/cups-nostrip.patch
@@ -0,0 +1,68 @@
+diff -ru a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
+--- a/config-scripts/cups-compiler.m4 2020-04-27 14:04:29.000000000 -0400
++++ b/config-scripts/cups-compiler.m4 2021-08-06 20:53:29.316010169 -0400
+@@ -9,9 +9,6 @@
+
+ dnl Clear the debugging and non-shared library options unless the user asks
+ dnl for them...
+-INSTALL_STRIP=""
+-AC_SUBST(INSTALL_STRIP)
+-
+ AC_ARG_WITH(optim, [ --with-optim set optimization flags ],
+ OPTIM="$withval",
+ OPTIM="")
+@@ -25,8 +22,6 @@
+ dnl For debugging, keep symbols, otherwise strip them...
+ if test x$enable_debug = xyes -a "x$OPTIM" = x; then
+ OPTIM="-g"
+-else
+- INSTALL_STRIP="-s"
+ fi
+
+ dnl Debug printfs can slow things down, so provide a separate option for that
+diff -ru a/configure b/configure
+--- a/configure 2020-04-27 14:04:29.000000000 -0400
++++ b/configure 2021-08-06 20:54:01.585892266 -0400
+@@ -694,7 +694,6 @@
+ ARCHFLAGS
+ UNITTESTS
+ OPTIM
+-INSTALL_STRIP
+ LIBTOOL_INSTALL
+ LIBTOOL_CXX
+ LIBTOOL_CC
+@@ -6662,7 +6661,6 @@
+
+
+
+-INSTALL_STRIP=""
+
+
+
+@@ -6698,8 +6696,6 @@
+
+ if test x$enable_debug = xyes -a "x$OPTIM" = x; then
+ OPTIM="-g"
+-else
+- INSTALL_STRIP="-s"
+ fi
+
+ if test x$enable_debug_printfs = xyes; then
+diff -ru a/Makedefs.in b/Makedefs.in
+--- a/Makedefs.in 2020-04-27 14:04:29.000000000 -0400
++++ b/Makedefs.in 2021-08-06 20:53:42.565961754 -0400
+@@ -45,12 +45,12 @@
+ # Installation programs...
+ #
+
+-INSTALL_BIN = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
++INSTALL_BIN = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
+ INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@
+ INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+ INSTALL_DATA = $(INSTALL) -c -m 444
+ INSTALL_DIR = $(INSTALL) -d
+-INSTALL_LIB = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
++INSTALL_LIB = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
+ INSTALL_MAN = $(INSTALL) -c -m 444
+ INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
+
diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD
index b1708ac084..3c89e8d21c 100644
--- a/main/curl/APKBUILD
+++ b/main/curl/APKBUILD
@@ -8,24 +8,31 @@
# this aport from arch=all WILL be reverted.
pkgname=curl
-pkgver=7.77.0
-pkgrel=1
+pkgver=7.79.0
+pkgrel=0
pkgdesc="URL retrival utility and library"
url="https://curl.se/"
arch="all"
license="MIT"
depends="ca-certificates"
-depends_dev="openssl-dev nghttp2-dev zlib-dev brotli-dev"
+depends_dev="openssl1.1-compat-dev nghttp2-dev zlib-dev brotli-dev"
checkdepends="nghttp2 python3"
makedepends_host="$depends_dev"
makedepends_build="autoconf automake groff libtool perl"
subpackages="$pkgname-dbg $pkgname-static $pkgname-doc $pkgname-dev libcurl"
-source="https://curl.se/download/curl-$pkgver.tar.xz
- conn_shutdown-if-closed-during-CONNECT-cleanup-properly.patch
- "
+source="https://curl.se/download/curl-$pkgver.tar.xz"
options="net" # Required for running tests
# secfixes:
+# 7.79.0-r0:
+# - CVE-2021-22945
+# - CVE-2021-22946
+# - CVE-2021-22947
+# 7.78.0-r0:
+# - CVE-2021-22922
+# - CVE-2021-22923
+# - CVE-2021-22924
+# - CVE-2021-22925
# 7.77.0-r0:
# - CVE-2021-22898
# - CVE-2021-22901
@@ -156,6 +163,5 @@ static() {
}
sha512sums="
-aef92a0e3f8ce8491b258a9a1c4dcea3c07c29b139a1f68f08619caa0295cfde76335d2dfb9cdf434525daea7dd05d8acd22f203f5ccc7735bd317964ec1da76 curl-7.77.0.tar.xz
-bcf90547f574dd79c2dabdbc16a17426dbc6f7699799368b0b6d39d8ac6c044b027ceb484160d1e6aa7a1044834f568b94facadfa9430e720296c3103e14d3f0 conn_shutdown-if-closed-during-CONNECT-cleanup-properly.patch
+68bccba61f18de9f94c311b0d92cfa6572bb7e55e8773917c13b25203164a5a9f4ef6b8ad84a14d3d5dcb286271bf18c3dd84c4ca353866763c726f9defce808 curl-7.79.0.tar.xz
"
diff --git a/main/curl/conn_shutdown-if-closed-during-CONNECT-cleanup-properly.patch b/main/curl/conn_shutdown-if-closed-during-CONNECT-cleanup-properly.patch
deleted file mode 100644
index bc43227686..0000000000
--- a/main/curl/conn_shutdown-if-closed-during-CONNECT-cleanup-properly.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 14a2ca85ecb8478772a30d8c2521e5e1d1d98b3d Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Wed, 9 Jun 2021 08:38:07 +0200
-Subject: [PATCH] conn_shutdown: if closed during CONNECT cleanup properly
-
-Reported-by: Alex Xu
-Reported-by: Phil E. Taylor
-
-Fixes #7236
-Closes #7237
----
- lib/http_proxy.c | 19 +++++++++++--------
- lib/http_proxy.h | 7 ++++---
- lib/url.c | 9 +++++++++
- 3 files changed, 24 insertions(+), 11 deletions(-)
-
-diff --git a/lib/http_proxy.c b/lib/http_proxy.c
-index a67d9d3b4115..e0a4987063d7 100644
---- a/lib/http_proxy.c
-+++ b/lib/http_proxy.c
-@@ -129,13 +129,13 @@ CURLcode Curl_proxy_connect(struct Curl_easy *data, int sockindex)
- bool Curl_connect_complete(struct connectdata *conn)
- {
- return !conn->connect_state ||
-- (conn->connect_state->tunnel_state == TUNNEL_COMPLETE);
-+ (conn->connect_state->tunnel_state >= TUNNEL_COMPLETE);
- }
-
- bool Curl_connect_ongoing(struct connectdata *conn)
- {
- return conn->connect_state &&
-- (conn->connect_state->tunnel_state != TUNNEL_COMPLETE);
-+ (conn->connect_state->tunnel_state <= TUNNEL_COMPLETE);
- }
-
- /* when we've sent a CONNECT to a proxy, we should rather either wait for the
-@@ -202,13 +202,16 @@ static void connect_done(struct Curl_easy *data)
- {
- struct connectdata *conn = data->conn;
- struct http_connect_state *s = conn->connect_state;
-- s->tunnel_state = TUNNEL_COMPLETE;
-- Curl_dyn_free(&s->rcvbuf);
-- Curl_dyn_free(&s->req);
-+ if(s->tunnel_state != TUNNEL_EXIT) {
-+ s->tunnel_state = TUNNEL_EXIT;
-+ Curl_dyn_free(&s->rcvbuf);
-+ Curl_dyn_free(&s->req);
-
-- /* retore the protocol pointer */
-- data->req.p.http = s->prot_save;
-- infof(data, "CONNECT phase completed!\n");
-+ /* retore the protocol pointer */
-+ data->req.p.http = s->prot_save;
-+ s->prot_save = NULL;
-+ infof(data, "CONNECT phase completed!\n");
-+ }
- }
-
- static CURLcode CONNECT_host(struct Curl_easy *data,
-diff --git a/lib/http_proxy.h b/lib/http_proxy.h
-index f5a4cb07cf1b..cdf8de4fba86 100644
---- a/lib/http_proxy.h
-+++ b/lib/http_proxy.h
-@@ -65,9 +65,10 @@ struct http_connect_state {
- } keepon;
- curl_off_t cl; /* size of content to read and ignore */
- enum {
-- TUNNEL_INIT, /* init/default/no tunnel state */
-- TUNNEL_CONNECT, /* CONNECT has been sent off */
-- TUNNEL_COMPLETE /* CONNECT response received completely */
-+ TUNNEL_INIT, /* init/default/no tunnel state */
-+ TUNNEL_CONNECT, /* CONNECT has been sent off */
-+ TUNNEL_COMPLETE, /* CONNECT response received completely */
-+ TUNNEL_EXIT
- } tunnel_state;
- BIT(chunked_encoding);
- BIT(close_connection);
-diff --git a/lib/url.c b/lib/url.c
-index 84d37a560eaf..27ba7d6b52ce 100644
---- a/lib/url.c
-+++ b/lib/url.c
-@@ -727,6 +727,15 @@ static void conn_shutdown(struct Curl_easy *data, struct connectdata *conn)
- DEBUGASSERT(data);
- infof(data, "Closing connection %ld\n", conn->connection_id);
-
-+#ifndef USE_HYPER
-+ if(conn->connect_state && conn->connect_state->prot_save) {
-+ /* If this was closed with a CONNECT in progress, cleanup this temporary
-+ struct arrangement */
-+ data->req.p.http = NULL;
-+ Curl_safefree(conn->connect_state->prot_save);
-+ }
-+#endif
-+
- /* possible left-overs from the async name resolvers */
- Curl_resolver_cancel(data);
-
diff --git a/main/cvs/APKBUILD b/main/cvs/APKBUILD
index 43925f68f5..108fadb6bb 100644
--- a/main/cvs/APKBUILD
+++ b/main/cvs/APKBUILD
@@ -2,19 +2,27 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cvs
pkgver=1.12.13
-pkgrel=0
+pkgrel=1
pkgdesc="Concurrent Versions System"
url="https://www.nongnu.org/cvs/"
arch="all"
license="GPL-2.0-or-later"
options="!check" # Tests fail - src/lib/test-getdate.sh
-makedepends="zlib-dev"
+makedepends="
+ autoconf
+ automake
+ gettext-dev
+ libbsd-dev
+ texinfo
+ zlib-dev
+"
subpackages="$pkgname-doc"
source="https://ftp.gnu.org/non-gnu/cvs/source/feature/$pkgver/cvs-$pkgver.tar.gz
- cvs_1.12.13+real-26.diff
+ cvs_1.12.13+real-26.patch
install-sh.patch
mktime-configure.patch
getcwd.patch
+ add-libbsd.patch
"
# secfixes:
@@ -25,6 +33,7 @@ source="https://ftp.gnu.org/non-gnu/cvs/source/feature/$pkgver/cvs-$pkgver.tar.g
prepare() {
default_prepare
update_config_sub
+ autoreconf -fi
}
build() {
@@ -48,8 +57,11 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="acd658b7ffa29a67e33f294073a0f80a27aa4e19dc2185cfa43f862d34e511bcf9802012b8e6957f82c7532fdabbb058b33686e0e6046cdd1f1aa9af619e92e9 cvs-1.12.13.tar.gz
-510a8a3ed392108f360f3477af45f863ea3603b8c3f90504dfc018e3ef5ed79e69fcd3e38c82b46061cc82a53859d8ab209ae6f8ee07134f7db98bc3f1e38f06 cvs_1.12.13+real-26.diff
+sha512sums="
+acd658b7ffa29a67e33f294073a0f80a27aa4e19dc2185cfa43f862d34e511bcf9802012b8e6957f82c7532fdabbb058b33686e0e6046cdd1f1aa9af619e92e9 cvs-1.12.13.tar.gz
+510a8a3ed392108f360f3477af45f863ea3603b8c3f90504dfc018e3ef5ed79e69fcd3e38c82b46061cc82a53859d8ab209ae6f8ee07134f7db98bc3f1e38f06 cvs_1.12.13+real-26.patch
44e0b683f8178804d029957e78af046197142181564bfb0209da2682f9817e6c661a9e0dd390d236c9ebdc937df920269e708bb7d7c84ca942341fd413a1b265 install-sh.patch
a430f2659e1f96bc4ba2205567662eb5863c0c73b2e0c43eba86b23734b3874663e389e74e6011c6a0e9f4074d676adfd6c88fbe20f11ca33ba3223a93dad02c mktime-configure.patch
-99a9107603a933c164070787a3e270f8b1d82fb6930763061f019a42c0d88e4ac981941ccc0851ae051df757caef5d6c9a9e9b87d3378e7361cc78f48460f4a1 getcwd.patch"
+99a9107603a933c164070787a3e270f8b1d82fb6930763061f019a42c0d88e4ac981941ccc0851ae051df757caef5d6c9a9e9b87d3378e7361cc78f48460f4a1 getcwd.patch
+eecdd7f8a31ae63901e6b7336c7aac5827dd33ce2c80bb7d629ffb3dc65927eae75f59f6a949e290471982f22265f02eaa17febd6e6ea5f799edcfcbccd3b511 add-libbsd.patch
+"
diff --git a/main/cvs/add-libbsd.patch b/main/cvs/add-libbsd.patch
new file mode 100644
index 0000000000..1b018a7a12
--- /dev/null
+++ b/main/cvs/add-libbsd.patch
@@ -0,0 +1,12 @@
+--- old/src/Makefile.am
++++ new/src/Makefile.am
+@@ -117,7 +117,8 @@
+ $(ZLIB_LIBS) \
+ $(LIB_CLOCK_GETTIME) \
+ $(LIB_NANOSLEEP) \
+- $(LIBINTL)
++ $(LIBINTL) \
++ -lbsd
+
+ # General
+ EXTRA_DIST = \
diff --git a/main/cvs/cvs_1.12.13+real-26.diff b/main/cvs/cvs_1.12.13+real-26.patch
index 756fbdbd46..756fbdbd46 100644
--- a/main/cvs/cvs_1.12.13+real-26.diff
+++ b/main/cvs/cvs_1.12.13+real-26.patch
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 14956bbd6e..7e7522848a 100644
--- a/main/cyrus-sasl/APKBUILD
+++ b/main/cyrus-sasl/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cyrus-sasl
pkgver=2.1.27
-pkgrel=12
+pkgrel=14
pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
url="https://www.cyrusimap.org/sasl/"
arch="all"
@@ -25,7 +25,7 @@ subpackages="
# use heimdal to avoid circular dep: cyrus-sasl -> krb5 -> openldap -> cyrus-sasl
makedepends="
gdbm-dev
- openssl-dev
+ openssl1.1-compat-dev
heimdal-dev
py3-sphinx
sqlite-dev
diff --git a/main/dahdi-linux-lts/APKBUILD b/main/dahdi-linux-lts/APKBUILD
index 76f256c8d5..c74e80e9db 100644
--- a/main/dahdi-linux-lts/APKBUILD
+++ b/main/dahdi-linux-lts/APKBUILD
@@ -9,7 +9,7 @@ _rel=0
_flavor=${FLAVOR:-lts}
_kpkg=linux-$_flavor
-_kver=5.10.43
+_kver=5.10.64
_krel=0
_kpkgver="$_kver-r$_krel"
diff --git a/main/datefudge/APKBUILD b/main/datefudge/APKBUILD
index 9ed6f292ad..8340e0e316 100644
--- a/main/datefudge/APKBUILD
+++ b/main/datefudge/APKBUILD
@@ -10,8 +10,7 @@ license="GPL-2.0"
depends="coreutils"
checkdepends="perl"
subpackages="$pkgname-doc"
-source="http://deb.debian.org/debian/pool/main/d/datefudge/datefudge_$pkgver.tar.xz
- "
+source="https://deb.debian.org/debian/pool/main/d/datefudge/datefudge_$pkgver.tar.xz"
build() {
# fix Makefile, set the version number directly as dpkg-parsechangelog is not available
diff --git a/main/debootstrap/APKBUILD b/main/debootstrap/APKBUILD
index 9ce17abc68..29b4afa9af 100644
--- a/main/debootstrap/APKBUILD
+++ b/main/debootstrap/APKBUILD
@@ -10,7 +10,7 @@ license="MIT"
options="!check" # upstream doesn't have a test suite
depends="debian-archive-keyring dpkg tar"
subpackages="$pkgname-doc"
-source="http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_$pkgver.tar.gz"
+source="https://deb.debian.org/debian/pool/main/d/debootstrap/debootstrap_$pkgver.tar.gz"
builddir="$srcdir/debootstrap"
package() {
diff --git a/main/devicemaster-linux/APKBUILD b/main/devicemaster-linux/APKBUILD
index 925586b4cb..dca4e080a3 100644
--- a/main/devicemaster-linux/APKBUILD
+++ b/main/devicemaster-linux/APKBUILD
@@ -1,27 +1,18 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=devicemaster-linux
pkgver=7.34
-pkgrel=0
+pkgrel=1
pkgdesc="Userspace tools for NS-Link Device Drivers"
-url="http://www.comtrol.com/resources/product-resources-white-papers/ns-link-device-drivers"
+url="https://www.comtrol.com/resources/product-resources-white-papers/ns-link-device-drivers"
arch="all"
-license="GPL"
+license="GPL-2.0-or-later"
makedepends="linux-headers"
-subpackages="$pkgname-doc"
-source="https://dev.alpinelinux.org/archive/devicemaster-linux/devicemaster-linux-$pkgver.tar.gz
+options="!check" # no testsuite
+subpackages="$pkgname-doc $pkgname-openrc"
+source="https://files.comtrol.com/dev_mstr/rts/drivers/linux/devicemaster-linux-$pkgver.tar.gz
makefile.patch
nslink.initd
"
-_srcurl="ftp://ftp.comtrol.com/dev_mstr/rts/drivers/linux/devicemaster-linux-$pkgver.tar.gz"
-_disturl="dev.alpinelinux.org:/archive/$pkgname/"
-
-snapshot() {
- mkdir -p "$srcdir"/tmp
- cd "$srcdir"/tmp
- curl -ss -o "$pkgname-$pkgver.tar.gz" "$_srcurl"
- rsync --progress -La $pkgname-$pkgver.tar.gz \
- $_disturl
-}
build() {
make nslinkd nslinkadmin nslinkrelease nslinktool
@@ -41,6 +32,9 @@ package() {
install -m644 *.8 "$pkgdir"/usr/share/man/man8
install -m644 *.5 "$pkgdir"/usr/share/man/man5
}
-sha512sums="a7af54fde5812256b4a04f13d41c064dcb7f702cac18e4929d1a9669c49294eb62fc6e55e7b873bae63a795c3148dbca74ab39f337e26962bdee021f5fb2119c devicemaster-linux-7.34.tar.gz
+
+sha512sums="
+a7af54fde5812256b4a04f13d41c064dcb7f702cac18e4929d1a9669c49294eb62fc6e55e7b873bae63a795c3148dbca74ab39f337e26962bdee021f5fb2119c devicemaster-linux-7.34.tar.gz
adadb7b6502b0b6fd2d72a1a453dcea2ff8800d08258b80c5df751bd9fc8de5e88760560c2ab1e911e994999db58882555b5ab6e72f466ed26a47b327f6a668a makefile.patch
-6e67a184ec73d5909d67b7d606d4789cad0e0b4134bb52bfd4019fd7f65b928c15c241dfe6f8a1c6e0854f4d509d7bb150beb9d41ae2a2315ebc040c240abc22 nslink.initd"
+6e67a184ec73d5909d67b7d606d4789cad0e0b4134bb52bfd4019fd7f65b928c15c241dfe6f8a1c6e0854f4d509d7bb150beb9d41ae2a2315ebc040c240abc22 nslink.initd
+"
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 8e9e8daafd..34fab799e1 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -49,6 +49,7 @@ makedepends="$makedepends $_depends_dhclient $_depends_server_ldap $_depends_ser
# 4.4.2_p1-r0:
# - CVE-2021-25217
# 4.4.1-r0:
+# - CVE-2019-6470
# - CVE-2018-5732
# - CVE-2018-5733
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index d4b5a1251c..9a0ef8ad38 100644
--- a/main/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dhcpcd
-pkgver=8.1.6
-pkgrel=1
+pkgver=9.4.0
+pkgrel=0
pkgdesc="RFC2131 compliant DHCP client"
url="https://roy.marples.name/projects/dhcpcd"
arch="all"
@@ -15,7 +15,6 @@ source="https://roy.marples.name/downloads/dhcpcd/dhcpcd-$pkgver.tar.xz
busybox-logger.patch
fix-chrony-conf-location.patch
dhcpcd.initd
- musl.patch
"
build() {
CFLAGS="$CFLAGS -D_GNU_SOURCE -DHAVE_PRINTF_M"
@@ -44,8 +43,9 @@ package() {
"$pkgdir"/etc/init.d/dhcpcd
}
-sha512sums="f4d7ea5f4c139a2735e795e13be68f6edac89d86d97589c2cdd67f89b890a093675dcc207c681332e2163b1094da8ce75bda2ee614c19bafd01410d9fadf19df dhcpcd-8.1.6.tar.xz
+sha512sums="
+e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f dhcpcd-9.4.0.tar.xz
692b2c8c75166fabd512a7cc69c650f9391e0f682ce9cbe1771bfa44e82dcf09e322c46493c45ca75000f479d3cddde306754ba31d28a798a15e2b79a56045f0 busybox-logger.patch
1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch
dc3b30295dbe5310526443736e60ccc53621d465d512639e8ea20efe598037ff33730e46964e4e7bc32d4ce88aaecf3b9bb9a4ceab892d8bff3423e0374ccae1 dhcpcd.initd
-082aa80798476917e2a86003cb95136212cbb9b8da986e7d8186d7f3d857e81a4cb03af56296484e035e5006d36c695ef57f571ea9c1fd18b4200a9cf745a6b4 musl.patch"
+"
diff --git a/main/dhcpcd/musl.patch b/main/dhcpcd/musl.patch
deleted file mode 100644
index 9de5163db7..0000000000
--- a/main/dhcpcd/musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Include linux/if_tun.h after netinet/if_tun.h to avoid redefinition of struct ethhdr
-
-diff --git a/src/if-linux.c b/src/if-linux.c
-index fd47278..cca4e36 100644
---- a/src/if-linux.c
-+++ b/src/if-linux.c
-@@ -37,7 +37,6 @@
- #include <linux/if_addr.h>
- #include <linux/if_link.h>
- #include <linux/if_packet.h>
--#include <linux/if_tun.h>
- #include <linux/if_vlan.h>
- #include <linux/filter.h>
- #include <linux/netlink.h>
-@@ -51,6 +50,8 @@
- #include <netinet/in.h>
- #include <net/route.h>
-
-+#include <linux/if_tun.h>
-+
- #include <errno.h>
- #include <fcntl.h>
- #include <ctype.h>
-
diff --git a/main/dialog/APKBUILD b/main/dialog/APKBUILD
index a4bfa3684d..18327bde82 100644
--- a/main/dialog/APKBUILD
+++ b/main/dialog/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dialog
-pkgver=1.3.20210530
+pkgver=1.3.20210621
_pkgver=${pkgver%.*}-${pkgver##*.}
pkgrel=0
pkgdesc="Script interpreter providing curses widgets"
@@ -39,5 +39,5 @@ static() {
}
sha512sums="
-8f39cfa5f3ba70795927c261861bc55bde668d68d3b45559542cf980e1cfabefb3d1ebabc91715e29a4a9ffca5cdb6affa640ed155539692c868942f6014e7e0 dialog-1.3-20210530.tgz
+bde13aaf215127d143aa0d37989e0bacb6bc23f007681aeff27683efa01a483106710ff756358e396c23e4c1f0355cd8a2b3bb362ae1c3a1a997e00835d53c2b dialog-1.3-20210621.tgz
"
diff --git a/main/diffutils/APKBUILD b/main/diffutils/APKBUILD
index d2bbbb4885..544ce2d6f4 100644
--- a/main/diffutils/APKBUILD
+++ b/main/diffutils/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=diffutils
-pkgver=3.7
+pkgver=3.8
pkgrel=0
pkgdesc="Show differences among files"
subpackages="$pkgname-doc"
@@ -9,21 +9,12 @@ arch="all"
license="GPL-3.0-or-later"
checkdepends="coreutils perl"
source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz
- disable-mbrtowc-test.patch
+ skip-test-presue-output-tty.patch
"
-builddir=$srcdir/$pkgname-$pkgver
-
-prepare() {
- cd "$builddir"
- default_prepare
- # fix eglibc-2.16 build issue
- sed -i -e '/gets is a/d' \
- lib/stdio.in.h
-}
+builddir=$srcdir/$pkgname-$pkgver
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,17 +26,14 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make install DESTDIR=$pkgdir
-
- rm -rf "$pkgdir"/usr/lib/charset.alias
- rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
}
-sha512sums="7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c diffutils-3.7.tar.xz
-2602dabf0ac52a273b84160032416613da7ad111541fe25466cf9d4ce1eb2630f0ba0cb0b3013967965d8359a11a5f390f0486b4526b35516d9de1c8975f720d disable-mbrtowc-test.patch"
+sha512sums="
+279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c diffutils-3.8.tar.xz
+5df0dc7a452180c361698ee502b4636a5e7277132e543136c205747fac64acc6276186ec8c884b17e9fe3e307f15e045ba327d44ac4662db88675c309c56367a skip-test-presue-output-tty.patch
+"
diff --git a/main/diffutils/disable-mbrtowc-test.patch b/main/diffutils/disable-mbrtowc-test.patch
deleted file mode 100644
index 1461a40939..0000000000
--- a/main/diffutils/disable-mbrtowc-test.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- diffutils-3.6/gnulib-tests/test-mbrtowc5.sh.old 2016-12-31 13:54:43.000000000 +0000
-+++ diffutils-3.6/gnulib-tests/test-mbrtowc5.sh 2017-07-30 17:29:50.879924130 +0000
-@@ -1,6 +1,2 @@
- #!/bin/sh
--# Test whether the POSIX locale has encoding errors.
--LC_ALL=C \
--./test-mbrtowc${EXEEXT} 5 || exit
--LC_ALL=POSIX \
--./test-mbrtowc${EXEEXT} 5
-+exit 77
diff --git a/main/diffutils/skip-test-presue-output-tty.patch b/main/diffutils/skip-test-presue-output-tty.patch
new file mode 100644
index 0000000000..e0a47d5160
--- /dev/null
+++ b/main/diffutils/skip-test-presue-output-tty.patch
@@ -0,0 +1,24 @@
+Test fails for unknown reasons on lxc builders
+
+diff --git a/tests/colors b/tests/colors
+index d28a61c..e799dd3 100755
+--- a/tests/colors
++++ b/tests/colors
+@@ -123,11 +123,11 @@ compare exp out || fail=1
+
+ # Before the fix in http://debbugs.gnu.org/22067,
+ # this test would trigger an infinite loop bug.
+-mkfifo fifo
+-printf '%1000000s-a' > a
+-printf '%1000000s-b' > b
+-head -c 10 < fifo > /dev/null &
+-diff --color=always ---presume-output-tty a b > fifo
+-test $? = 141 || fail=1
++#mkfifo fifo
++#printf '%1000000s-a' > a
++#printf '%1000000s-b' > b
++#head -c 10 < fifo > /dev/null &
++#diff --color=always ---presume-output-tty a b > fifo
++#test $? = 141 || fail=1
+
+ Exit $fail
diff --git a/main/distcc/APKBUILD b/main/distcc/APKBUILD
index c353586af6..5a73dc9f83 100644
--- a/main/distcc/APKBUILD
+++ b/main/distcc/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=distcc
-pkgver=3.3.5
-pkgrel=1
+pkgver=3.4
+pkgrel=0
pkgdesc="Ddistributed C, C++, Obj C compiler"
url="https://github.com/distcc/distcc"
arch="all"
@@ -64,8 +64,10 @@ pump() {
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
}
-sha512sums="678909e7ab811d345357955a9f693324ca3870ecbefa62e6a71c8aeb7e4c3c7d9775d56cff4d8ff225614bc8468e1d35f33b7feea835d63167bf11350513ddd7 distcc-3.3.5.tar.gz
+sha512sums="
+de09329fdfa25e08a9b9529190ddaa9ceccb34c8655692edb86f367a8db4a71b750c6e928cb8e5a670f51fbbc02fd1c8524f72e01b3ebaacc1106dc676d18eef distcc-3.4.tar.gz
b53a0d6038504917fd41f549da4f5addaff6ebd198a5d9d3ee8d4654f843aab375da4017b40efe24b9d4c9881719030485e4f56724690ba271fb52dc48249a44 distcc-hardened.patch
4e55e0acda58e6f273c74e9d617de1a121debf820e915cf8aeb4d80907d427a058466bb2fd9126602aea7f861fd5fa1c2bede15e2a512923bc61e3ef163430d4 gcc-10.patch
3c58be08242de09f76876b20a0c6643a3a76a088c356484cb091253b7e4dddb20008d071d8e5d1a66acbc5bfe4d8a59284a6d7f225ca2006e8a8b3c698e71026 distccd.initd
-fbb12522e489243475c735e055a72a19b176f1ad736dc810e1f085d8d9d79460ac7590a92bb9563f8b316437f67f6ca729330253f007d06011144a66fede5465 distccd.confd"
+fbb12522e489243475c735e055a72a19b176f1ad736dc810e1f085d8d9d79460ac7590a92bb9563f8b316437f67f6ca729330253f007d06011144a66fede5465 distccd.confd
+"
diff --git a/main/dmidecode/APKBUILD b/main/dmidecode/APKBUILD
index 46287c7c0c..7f2d9db9ca 100644
--- a/main/dmidecode/APKBUILD
+++ b/main/dmidecode/APKBUILD
@@ -1,9 +1,9 @@
# Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
pkgname=dmidecode
pkgver=3.3
-pkgrel=0
+pkgrel=1
pkgdesc="A utility for reporting system hardware as described by BIOS"
-url="http://www.nongnu.org/dmidecode"
+url="https://nongnu.org/dmidecode"
arch="all"
license="GPL-2.0-or-later"
options="!check" # No testsuite
@@ -24,4 +24,6 @@ package() {
make prefix=/usr DESTDIR="$pkgdir" install
}
-sha512sums="dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22 dmidecode-3.3.tar.xz"
+sha512sums="
+dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22 dmidecode-3.3.tar.xz
+"
diff --git a/main/dns-root-hints/APKBUILD b/main/dns-root-hints/APKBUILD
index 0ddc726238..2cc6385db3 100644
--- a/main/dns-root-hints/APKBUILD
+++ b/main/dns-root-hints/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=dns-root-hints
pkgver=2019073000
-pkgrel=2
+pkgrel=3
pkgdesc="The DNS root hint(s)"
url="https://www.internic.net/domain"
arch="noarch"
license="Public-Domain"
-depends="curl gnupg"
+depends="curl gpg"
makedepends="curl"
source="verisign-grs-nstld-key.asc named.root named.root.sig
update-$pkgname
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index 6bebb51ed0..4a57bdf959 100644
--- a/main/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
@@ -1,6 +1,22 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
-#
+pkgname=dnsmasq
+pkgver=2.86
+pkgrel=0
+pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server"
+url="https://www.thekelleys.org.uk/dnsmasq/"
+arch="all"
+license="GPL-2.0-only OR GPL-3.0-only"
+depends="!$pkgname-dnssec"
+makedepends="linux-headers nettle-dev coreutils"
+install="$pkgname.pre-install $pkgname.pre-upgrade
+ $pkgname-dnssec.pre-install $pkgname-dnssec.pre-upgrade"
+subpackages="$pkgname-doc $pkgname-dnssec"
+source="https://www.thekelleys.org.uk/dnsmasq/dnsmasq-$pkgver.tar.xz
+ $pkgname.initd
+ $pkgname.confd
+ uncomment-conf-dir.patch
+ "
# secfixes:
# 2.85-r0:
# - CVE-2021-3448
@@ -24,24 +40,6 @@
# - CVE-2017-14494
# - CVE-2017-14495
# - CVE-2017-14496
-#
-pkgname=dnsmasq
-pkgver=2.85
-pkgrel=2
-pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server"
-url="https://www.thekelleys.org.uk/dnsmasq/"
-arch="all"
-license="GPL-2.0-only OR GPL-3.0-only"
-depends="!$pkgname-dnssec"
-makedepends="linux-headers nettle-dev coreutils"
-install="$pkgname.pre-install $pkgname.pre-upgrade
- $pkgname-dnssec.pre-install $pkgname-dnssec.pre-upgrade"
-subpackages="$pkgname-doc $pkgname-dnssec"
-source="https://www.thekelleys.org.uk/dnsmasq/dnsmasq-$pkgver.tar.xz
- $pkgname.initd
- $pkgname.confd
- uncomment-conf-dir.patch
- "
build() {
make CFLAGS="$CFLAGS" COPTS="-DHAVE_DNSSEC" all
@@ -79,7 +77,9 @@ dnssec() {
cp -r "$pkgdir"/etc "$subpkgdir"/etc
}
-sha512sums="8beefe76b46f7d561f40d0900ba68b260a199cb62ab5b653746e3a1104c04fb8899b9e7a160a1be4fe8782bfb1607b556e9ffb9c25c4e99653e4bc74fcc03b09 dnsmasq-2.85.tar.xz
+sha512sums="
+487eae0afbc8bb3d5282a729ffb0cb2c9bdc7d8e46e2e8aa114cd7c5d82e0fd66f49926e7fa4028577548d6f57e8a865aca17f33963a589874584d608ab2deaf dnsmasq-2.86.tar.xz
a7d64a838d10f4f69e0f2178cf66f0b3725901696e30df9e8e3e09f2afd7c86e9d95af64d2b63ef66f18b8a637397b7015573938df9ad961e2b36c391c3ac579 dnsmasq.initd
9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 dnsmasq.confd
-01e9e235e667abda07675009fb1947547863e0bb0256393c5a415978e2a49c1007585c7f0b51e8decce79c05e6f2ced3f400b11343feaa4de9b2e524f74a1ee3 uncomment-conf-dir.patch"
+01e9e235e667abda07675009fb1947547863e0bb0256393c5a415978e2a49c1007585c7f0b51e8decce79c05e6f2ced3f400b11343feaa4de9b2e524f74a1ee3 uncomment-conf-dir.patch
+"
diff --git a/main/doas/APKBUILD b/main/doas/APKBUILD
index 4afb74d34d..9b5f49fc77 100644
--- a/main/doas/APKBUILD
+++ b/main/doas/APKBUILD
@@ -1,14 +1,17 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=doas
pkgver=6.8.1
-pkgrel=1
+pkgrel=6
pkgdesc="OpenBSD's temporary privilege escalation tool"
url="https://github.com/Duncaen/OpenDoas"
arch="all"
license="ISC"
makedepends="bison"
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/Duncaen/OpenDoas/archive/v$pkgver.tar.gz"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="$pkgname-$pkgver.tar.gz::https://github.com/Duncaen/OpenDoas/archive/v$pkgver.tar.gz
+ configuration-directory.patch
+ manpage-example-path.patch"
builddir="$srcdir/OpenDoas-$pkgver"
options="$options suid"
@@ -20,7 +23,8 @@ build() {
./configure \
--prefix=/usr \
--without-pam \
- --with-timestamp
+ --with-timestamp \
+ --with-doas-confdir
make
}
@@ -31,14 +35,17 @@ check() {
package() {
make install DESTDIR="$pkgdir"
- install -d "$pkgdir"/etc
- cat > "$pkgdir"/etc/doas.conf <<-EOF
+ install -d "$pkgdir"/usr/share/doc/$pkgname
+ cat > "$pkgdir"/usr/share/doc/$pkgname/doas.conf.example <<-EOF
# see doas.conf(5) for configuration details
# Uncomment to allow group "wheel" to become root
# permit persist :wheel
EOF
- chmod 440 "$pkgdir"/etc/doas.conf
}
-sha512sums="d96fe1cdd70e9211de9996ad05bcf7a127facd02af48f7ab2561869d9d16708f1b61722c6e6b9fe15a62e9ef501e09b1ba444b7b43a066f1895e543ebc9402e7 doas-6.8.1.tar.gz"
+sha512sums="
+d96fe1cdd70e9211de9996ad05bcf7a127facd02af48f7ab2561869d9d16708f1b61722c6e6b9fe15a62e9ef501e09b1ba444b7b43a066f1895e543ebc9402e7 doas-6.8.1.tar.gz
+79218c2798e67e6345818c357e651e09ef558d6cbcc5566e9e4816e8f4e73e4f737710caf617c211e89902ae7ef21cd520d3fc4d829550d40e1bd3b13befd0dc configuration-directory.patch
+60efd196595bda2c4f036cd0080a8825a85fedcc7524c917304b342373863213b3c557b4336f1dab760f167fd8cc2a59b2e744d8a47ff8a8acebbe74b1328f4f manpage-example-path.patch
+"
diff --git a/main/doas/configuration-directory.patch b/main/doas/configuration-directory.patch
new file mode 100644
index 0000000000..6a9575e57b
--- /dev/null
+++ b/main/doas/configuration-directory.patch
@@ -0,0 +1,509 @@
+From 7de1d454bda06d68a04f4f2e48099398a7711ae9 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 4 Aug 2021 04:47:04 -0600
+Subject: [PATCH 1/8] add --with-confdir feature
+
+This adds support for an /etc/doas.d configuration directory as discussed in #61. It is disabled by default.
+---
+ README.md | 9 +++++++
+ configure | 8 +++++++
+ doas.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ parse.y | 3 ++-
+ 4 files changed, 91 insertions(+), 1 deletion(-)
+
+diff --git a/README.md b/README.md
+index f15610c..f967eca 100644
+--- a/README.md
++++ b/README.md
+@@ -61,3 +61,12 @@ similar to sudo.
+
+ See the comment block in `timestamp.c` for an in-depth description on how
+ timestamps are created and checked to be as safe as possible.
++
++### `--with-doas-confdir`
++
++An optional feature can be enabled which will result in `doas` reading configuration
++snippets from `/etc/doas.d`. These configuration snippets have the same requirements
++as `/etc/doas.conf` (owned by root, not world-writable).
++
++If this feature is enabled, only the `/etc/doas.d` directory is read, and the historical
++`/etc/doas.conf` file is ignored.
+\ No newline at end of file
+diff --git a/configure b/configure
+index 1f92f01..a3078dc 100755
+--- a/configure
++++ b/configure
+@@ -27,6 +27,7 @@ usage: configure [options]
+ --without-shadow disable shadow support
+
+ --with-timestamp enable timestamp support
++ --with-doas-confdir enable configuration directory support
+
+ --uid-max=NUM set UID_MAX (default 65535)
+ --gid-max=NUM set GID_MAX (default 65535)
+@@ -38,6 +39,7 @@ EOF
+
+ # defaults
+ WITHOUT_TIMESTAMP=yes
++WITHOUT_CONFDIR=yes
+ UID_MAX=65535
+ GID_MAX=65535
+
+@@ -56,6 +58,8 @@ for x; do
+ --target) TARGET=$var ;;
+ --enable-debug) DEBUG=yes ;;
+ --enable-static) BUILD_STATIC=yes ;;
++ --with-doas-confdir) WITHOUT_CONFDIR= ;;
++ --without-doas-confdir) WITHOUT_CONFDIR=yes ;;
+ --with-pam) WITHOUT_PAM=; WITHOUT_SHADOW=yes ;;
+ --with-shadow) WITHOUT_SHADOW=; WITHOUT_PAM=yes ;;
+ --without-pam) WITHOUT_PAM=yes ;;
+@@ -558,4 +562,8 @@ fi
+
+ printf '#define DOAS_CONF "%s/doas.conf"\n' "${SYSCONFDIR}" >>$CONFIG_H
+
++if [ -z "$WITHOUT_CONFDIR" ]; then
++ printf '#define DOAS_CONFDIR "%s/doas.d"\n' "${SYSCONFDIR}" >>$CONFIG_H
++fi
++
+ printf '\n#endif /* CONFIG_H */\n' >>$CONFIG_H
+diff --git a/doas.c b/doas.c
+index ac3a42a..58701b7 100644
+--- a/doas.c
++++ b/doas.c
+@@ -35,6 +35,7 @@
+ #include <syslog.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <dirent.h>
+
+ #include "openbsd.h"
+ #include "doas.h"
+@@ -155,6 +156,7 @@ permit(uid_t uid, gid_t *groups, int ngroups, const struct rule **lastr,
+ static void
+ parseconfig(const char *filename, int checkperms)
+ {
++ extern const char *yyfn;
+ extern FILE *yyfp;
+ extern int yyparse(void);
+ struct stat sb;
+@@ -164,6 +166,8 @@ parseconfig(const char *filename, int checkperms)
+ err(1, checkperms ? "doas is not enabled, %s" :
+ "could not open config file %s", filename);
+
++ yyfn = filename;
++
+ if (checkperms) {
+ if (fstat(fileno(yyfp), &sb) != 0)
+ err(1, "fstat(\"%s\")", filename);
+@@ -174,11 +178,67 @@ parseconfig(const char *filename, int checkperms)
+ }
+
+ yyparse();
++ yyfn = NULL;
++
+ fclose(yyfp);
+ if (parse_errors)
+ exit(1);
+ }
+
++#ifdef DOAS_CONFDIR
++static int
++isconfdir(const char *dirpath)
++{
++ struct stat sb;
++
++ if (lstat(dirpath, &sb) != 0)
++ err(1, "lstat(\"%s\")", dirpath);
++
++ if ((sb.st_mode & (S_IFMT)) == S_IFDIR)
++ return 1;
++
++ errno = ENOTDIR;
++ return 0;
++}
++
++static void
++parseconfdir(const char *dirpath, int checkperms)
++{
++ struct dirent **dirent_table;
++ size_t i, dirent_count;
++ char pathbuf[PATH_MAX];
++
++ if (!isconfdir(dirpath))
++ err(1, checkperms ? "doas is not enabled, %s" :
++ "could not open config directory %s", dirpath);
++
++ dirent_count = scandir(dirpath, &dirent_table, NULL, alphasort);
++
++ for (i = 0; i < dirent_count; i++)
++ {
++ struct stat sb;
++ size_t pathlen;
++
++ pathlen = snprintf(pathbuf, sizeof pathbuf, "%s/%s", dirpath, dirent_table[i]->d_name);
++ free(dirent_table[i]);
++
++ /* make sure path ends in .conf */
++ if (strcmp(pathbuf + (pathlen - 5), ".conf"))
++ continue;
++
++ if (stat(pathbuf, &sb) != 0)
++ err(1, "stat(\"%s\")", pathbuf);
++
++ if ((sb.st_mode & (S_IFMT)) != S_IFREG)
++ continue;
++
++ parseconfig(pathbuf, checkperms);
++ }
++
++ free(dirent_table);
++}
++#endif
++
+ static void __dead
+ checkconfig(const char *confpath, int argc, char **argv,
+ uid_t uid, gid_t *groups, int ngroups, uid_t target)
+@@ -188,7 +248,13 @@ checkconfig(const char *confpath, int argc, char **argv,
+ if (setresuid(uid, uid, uid) != 0)
+ err(1, "setresuid");
+
++#ifdef DOAS_CONFDIR
++ if (isconfdir(confpath))
++ parseconfdir(confpath, 0);
++ else
++#else
+ parseconfig(confpath, 0);
++#endif
+ if (!argc)
+ exit(0);
+
+@@ -330,7 +396,13 @@ main(int argc, char **argv)
+ if (geteuid())
+ errx(1, "not installed setuid");
+
++#ifdef DOAS_CONFDIR
++ if (isconfdir(DOAS_CONFDIR))
++ parseconfdir(DOAS_CONFDIR, 1);
++ else
++#else
+ parseconfig(DOAS_CONF, 1);
++#endif
+
+ /* cmdline is used only for logging, no need to abort on truncate */
+ (void)strlcpy(cmdline, argv[0], sizeof(cmdline));
+diff --git a/parse.y b/parse.y
+index 388c2a5..c6d7ebf 100644
+--- a/parse.y
++++ b/parse.y
+@@ -49,6 +49,7 @@ typedef struct {
+ } yystype;
+ #define YYSTYPE yystype
+
++const char *yyfn;
+ FILE *yyfp;
+
+ struct rule **rules;
+@@ -203,7 +204,7 @@ yyerror(const char *fmt, ...)
+ va_start(va, fmt);
+ vfprintf(stderr, fmt, va);
+ va_end(va);
+- fprintf(stderr, " at line %d\n", yylval.lineno + 1);
++ fprintf(stderr, " at %s, line %d\n", yyfn, yylval.lineno + 1);
+ parse_errors++;
+ }
+
+
+From 046ff34408ea8bf2cafc079bd71a126aa009b005 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 4 Aug 2021 09:20:35 -0600
+Subject: [PATCH 2/8] gracefully handle ENOENT in isconfdir()
+
+---
+ doas.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/doas.c b/doas.c
+index 58701b7..4c0cafe 100644
+--- a/doas.c
++++ b/doas.c
+@@ -191,8 +191,13 @@ isconfdir(const char *dirpath)
+ {
+ struct stat sb;
+
+- if (lstat(dirpath, &sb) != 0)
+- err(1, "lstat(\"%s\")", dirpath);
++ if (lstat(dirpath, &sb) != 0) {
++ if (errno != ENOENT)
++ err(1, "lstat(\"%s\")", dirpath);
++
++ errno = ENOTDIR;
++ return 0;
++ }
+
+ if ((sb.st_mode & (S_IFMT)) == S_IFDIR)
+ return 1;
+
+From 6e76fb04ac637a1001ba201559f28279e3abe738 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 4 Aug 2021 09:31:49 -0600
+Subject: [PATCH 3/8] ensure pathlen - 5 is always non-zero
+
+---
+ doas.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/doas.c b/doas.c
+index 4c0cafe..f827fcd 100644
+--- a/doas.c
++++ b/doas.c
+@@ -228,6 +228,9 @@ parseconfdir(const char *dirpath, int checkperms)
+ free(dirent_table[i]);
+
+ /* make sure path ends in .conf */
++ if (pathlen < 6)
++ continue;
++
+ if (strcmp(pathbuf + (pathlen - 5), ".conf"))
+ continue;
+
+
+From cac56ea61e16d0ccb91100164a61e9f7215604e5 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 4 Aug 2021 10:17:35 -0600
+Subject: [PATCH 4/8] bail if dirent_count < 0
+
+---
+ doas.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/doas.c b/doas.c
+index f827fcd..6e308c8 100644
+--- a/doas.c
++++ b/doas.c
+@@ -210,7 +210,7 @@ static void
+ parseconfdir(const char *dirpath, int checkperms)
+ {
+ struct dirent **dirent_table;
+- size_t i, dirent_count;
++ int i, dirent_count;
+ char pathbuf[PATH_MAX];
+
+ if (!isconfdir(dirpath))
+@@ -218,6 +218,9 @@ parseconfdir(const char *dirpath, int checkperms)
+ "could not open config directory %s", dirpath);
+
+ dirent_count = scandir(dirpath, &dirent_table, NULL, alphasort);
++ if (dirent_count < 0)
++ err(1, checkperms ? "doas is not enabled, %s" :
++ "could not open config directory %s", dirpath);
+
+ for (i = 0; i < dirent_count; i++)
+ {
+
+From 8d224060adbdb1dececeb02660df8693f7c54a40 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 4 Aug 2021 10:20:33 -0600
+Subject: [PATCH 5/8] error out if no matching configuration files are found in
+ the configuration directory
+
+---
+ doas.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/doas.c b/doas.c
+index 6e308c8..cdfa3ea 100644
+--- a/doas.c
++++ b/doas.c
+@@ -210,7 +210,7 @@ static void
+ parseconfdir(const char *dirpath, int checkperms)
+ {
+ struct dirent **dirent_table;
+- int i, dirent_count;
++ int i, m, dirent_count;
+ char pathbuf[PATH_MAX];
+
+ if (!isconfdir(dirpath))
+@@ -222,7 +222,7 @@ parseconfdir(const char *dirpath, int checkperms)
+ err(1, checkperms ? "doas is not enabled, %s" :
+ "could not open config directory %s", dirpath);
+
+- for (i = 0; i < dirent_count; i++)
++ for (i = 0, m = 0; i < dirent_count; i++)
+ {
+ struct stat sb;
+ size_t pathlen;
+@@ -244,9 +244,16 @@ parseconfdir(const char *dirpath, int checkperms)
+ continue;
+
+ parseconfig(pathbuf, checkperms);
++ m++;
+ }
+
+ free(dirent_table);
++
++ if (!m) {
++ fprintf(stderr, "doas is not enabled, %s: no matching configuration files found\n",
++ dirpath);
++ exit(1);
++ }
+ }
+ #endif
+
+
+From 35c3e69fa52157683b8ae6fe040367390aa63bb6 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 4 Aug 2021 10:34:28 -0600
+Subject: [PATCH 6/8] use errx instead of fprintf(stderr)
+
+---
+ doas.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/doas.c b/doas.c
+index cdfa3ea..b50138a 100644
+--- a/doas.c
++++ b/doas.c
+@@ -249,11 +249,8 @@ parseconfdir(const char *dirpath, int checkperms)
+
+ free(dirent_table);
+
+- if (!m) {
+- fprintf(stderr, "doas is not enabled, %s: no matching configuration files found\n",
+- dirpath);
+- exit(1);
+- }
++ if (!m)
++ errx(1, "doas is not enabled, %s: no matching configuration files found\n", dirpath);
+ }
+ #endif
+
+
+From c9ff0fcdc0253679a0348995c36f89edc8d73a5b Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 4 Aug 2021 16:50:58 -0600
+Subject: [PATCH 7/8] fix up the ifndef DOAS_CONFDIR branch
+
+---
+ doas.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/doas.c b/doas.c
+index b50138a..d77186b 100644
+--- a/doas.c
++++ b/doas.c
+@@ -267,9 +267,8 @@ checkconfig(const char *confpath, int argc, char **argv,
+ if (isconfdir(confpath))
+ parseconfdir(confpath, 0);
+ else
+-#else
+- parseconfig(confpath, 0);
+ #endif
++ parseconfig(confpath, 0);
+ if (!argc)
+ exit(0);
+
+@@ -415,9 +414,8 @@ main(int argc, char **argv)
+ if (isconfdir(DOAS_CONFDIR))
+ parseconfdir(DOAS_CONFDIR, 1);
+ else
+-#else
+- parseconfig(DOAS_CONF, 1);
+ #endif
++ parseconfig(DOAS_CONF, 1);
+
+ /* cmdline is used only for logging, no need to abort on truncate */
+ (void)strlcpy(cmdline, argv[0], sizeof(cmdline));
+
+From 9fe4df5f004435fa0b092dc15a3c5ab09090f45d Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 3 Sep 2021 11:59:12 -0600
+Subject: [PATCH 8/8] add manpage for doas.d(5)
+
+---
+ GNUmakefile | 1 +
+ doas.conf.5 | 1 +
+ doas.d.5 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 52 insertions(+)
+ create mode 100644 doas.d.5
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 2eef88e..423731c 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -24,6 +24,7 @@ install: ${PROG} ${MAN}
+ chmod ${BINMODE} ${DESTDIR}${BINDIR}/${PROG}
+ cp -f doas.1 ${DESTDIR}${MANDIR}/man1
+ cp -f doas.conf.5 ${DESTDIR}${MANDIR}/man5
++ cp -f doas.d.5 ${DESTDIR}${MANDIR}/man5
+
+ uninstall:
+ rm -f ${DESTDIR}${BINDIR}/${PROG}
+diff --git a/doas.conf.5 b/doas.conf.5
+index e98bfbe..e90d512 100644
+--- a/doas.conf.5
++++ b/doas.conf.5
+@@ -143,6 +143,7 @@ permit nopass keepenv setenv { PATH } root as root
+ .Ed
+ .Sh SEE ALSO
+ .Xr doas 1 ,
++.Xr doas.d 5 ,
+ .Xr syslogd 8
+ .Sh HISTORY
+ The
+diff --git a/doas.d.5 b/doas.d.5
+new file mode 100644
+index 0000000..8f5f96a
+--- /dev/null
++++ b/doas.d.5
+@@ -0,0 +1,50 @@
++.\"Copyright (c) 2021 Ariadne Conill <ariadne@dereferenced.org>
++.\"
++.\"Permission to use, copy, modify, and distribute this software for any
++.\"purpose with or without fee is hereby granted, provided that the above
++.\"copyright notice and this permission notice appear in all copies.
++.\"
++.\"THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++.\"WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++.\"MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++.\"ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++.\"WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++.\"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++.\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++.Dd $Mdocdate: October 9 2020 $
++.Dt DOAS.CONF 5
++.Os
++.Sh NAME
++.Nm doas.conf
++.Nd doas configuration file
++.Sh DESCRIPTION
++The
++.Xr doas 1
++utility executes commands as other users according to the rules
++configured in either the configuration file or, optionally, the
++configuration directory. The preference to use the configuration
++file or configuration directory is determined at compile time,
++.Xr doas 1
++will only consult one or the other.
++.Pp
++Configuration snippets stored in the configuration directory
++follow the same rules as the classic
++.Xr doas 1
++configuration file, documented in
++.Xr doas.conf 5 .
++They must end with the .conf extension, or they will be ignored.
++.Pp
++These snippets are read in alphabetical order and thus can be
++ordered in the same way as other configuration directories.
++.Sh FILES
++.Bl -tag -width /etc/doas.d -compact
++.It Pa /etc/doas.d
++.Xr doas 1
++configuration directory.
++.Sh SEE ALSO
++.Xr doas 1 ,
++.Xr doas.conf 5
++.Sh HISTORY
++The
++.Nm
++configuration directory first appeared in OpenDoas.
diff --git a/main/doas/doas.post-install b/main/doas/doas.post-install
new file mode 100755
index 0000000000..46518437c2
--- /dev/null
+++ b/main/doas/doas.post-install
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+[ -d /etc/doas.d ] || mkdir /etc/doas.d
+[ -e /etc/doas.d/doas.conf ] && exit 0
+
+cat << _EOF_ >/etc/doas.d/doas.conf
+# This file is actually located at /etc/doas.d/doas.conf, and reflects
+# the system doas configuration. It may have been migrated from its
+# previous location, /etc/doas.conf, automatically.
+_EOF_
+
+[ -e /etc/doas.conf ] && cat /etc/doas.conf >> /etc/doas.d/doas.conf
+[ -e /etc/doas.conf ] || cat << _EOF_ >> /etc/doas.d/doas.conf
+# Please see /usr/share/doc/doas/doas.conf.example in the doas-doc
+# package for configuration examples.
+_EOF_
+
+# install compatibility symlink
+rm -f /etc/doas.conf
+ln -sf /etc/doas.d/doas.conf /etc/doas.conf
+
+# chmod 600
+chmod 600 /etc/doas.d/doas.conf
+
+cat << _EOF_ >&2
+ * Your configuration in /etc/doas.conf was migrated to
+ * /etc/doas.d/doas.conf and a symlink was installed in its
+ * place. For more information about the new doas configuration
+ * directory, consult doas.d(5).
+_EOF_ \ No newline at end of file
diff --git a/main/doas/doas.post-upgrade b/main/doas/doas.post-upgrade
new file mode 100755
index 0000000000..46518437c2
--- /dev/null
+++ b/main/doas/doas.post-upgrade
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+[ -d /etc/doas.d ] || mkdir /etc/doas.d
+[ -e /etc/doas.d/doas.conf ] && exit 0
+
+cat << _EOF_ >/etc/doas.d/doas.conf
+# This file is actually located at /etc/doas.d/doas.conf, and reflects
+# the system doas configuration. It may have been migrated from its
+# previous location, /etc/doas.conf, automatically.
+_EOF_
+
+[ -e /etc/doas.conf ] && cat /etc/doas.conf >> /etc/doas.d/doas.conf
+[ -e /etc/doas.conf ] || cat << _EOF_ >> /etc/doas.d/doas.conf
+# Please see /usr/share/doc/doas/doas.conf.example in the doas-doc
+# package for configuration examples.
+_EOF_
+
+# install compatibility symlink
+rm -f /etc/doas.conf
+ln -sf /etc/doas.d/doas.conf /etc/doas.conf
+
+# chmod 600
+chmod 600 /etc/doas.d/doas.conf
+
+cat << _EOF_ >&2
+ * Your configuration in /etc/doas.conf was migrated to
+ * /etc/doas.d/doas.conf and a symlink was installed in its
+ * place. For more information about the new doas configuration
+ * directory, consult doas.d(5).
+_EOF_ \ No newline at end of file
diff --git a/main/doas/manpage-example-path.patch b/main/doas/manpage-example-path.patch
new file mode 100644
index 0000000000..31048c70d6
--- /dev/null
+++ b/main/doas/manpage-example-path.patch
@@ -0,0 +1,16 @@
+--- OpenDoas-6.8.1.orig/doas.conf.5
++++ OpenDoas-6.8.1/doas.conf.5
+@@ -114,11 +114,11 @@
+ it is not considered a keyword.
+ .El
+ .Sh FILES
+-.Bl -tag -width /etc/examples/doas.conf -compact
++.Bl -tag -width /usr/share/doc/doas/doas.conf.example -compact
+ .It Pa /etc/doas.conf
+ .Xr doas 1
+ configuration file.
+-.It Pa /etc/examples/doas.conf
++.It Pa /usr/share/doc/doas/doas.conf.example
+ Example configuration file.
+ .El
+ .Sh EXAMPLES
diff --git a/main/docbook-xsl/APKBUILD b/main/docbook-xsl/APKBUILD
index e5b8be5d90..ced50c06e3 100644
--- a/main/docbook-xsl/APKBUILD
+++ b/main/docbook-xsl/APKBUILD
@@ -1,13 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=docbook-xsl
pkgver=1.79.2
-pkgrel=2
+pkgrel=3
pkgdesc="XML stylesheets for Docbook-xml transformations."
-url="https://docbook.org"
+url="https://docbook.org/"
arch="noarch"
license="custom"
depends="libxml2-utils libxslt docbook-xml"
-makedepends=""
options="!check"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
source="https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F$pkgver/docbook-xsl-$pkgver.tar.gz
@@ -24,7 +23,7 @@ package() {
_dest="$pkgdir"/usr/share/xml/docbook/xsl-stylesheets-$pkgver
install -dm755 "$_dest"
- install -m644 VERSION VERSION.xsl "$_dest"/ || return 1
+ install -m644 VERSION VERSION.xsl "$_dest"/
for dir in assembly common eclipse epub epub3 fo highlighting html \
htmlhelp javahelp lib manpages params profiling roundtrip \
@@ -33,11 +32,11 @@ package() {
install -dm755 $_dest/$dir
for f in $dir/*.xml $dir/*.xsl $dir/*.dtd $dir/*.ent; do
[ -e "$f" ] || continue
- install -m644 $f $_dest/$dir || return 1
+ install -m644 $f $_dest/$dir
done
done
- install -dm755 "$pkgdir"/etc/xml || return 1
+ install -dm755 "$pkgdir"/etc/xml
install -m644 -D COPYING \
"$pkgdir"/usr/share/licenses/$pkgname/COPYING
diff --git a/main/dovecot/0001-oauth2-jwt-Use-int64_t-instead-time_t-for-portabilit.patch b/main/dovecot/0001-oauth2-jwt-Use-int64_t-instead-time_t-for-portabilit.patch
deleted file mode 100644
index 5c4ab58e7e..0000000000
--- a/main/dovecot/0001-oauth2-jwt-Use-int64_t-instead-time_t-for-portabilit.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 7372d154a41bc1c2b510c6dfb3ab67099e3a90a7 Mon Sep 17 00:00:00 2001
-From: Aki Tuomi <aki.tuomi@open-xchange.com>
-Date: Thu, 13 Aug 2020 20:01:41 +0300
-Subject: [PATCH] oauth2-jwt: Use int64_t instead time_t for portability
-
----
- src/lib-oauth2/oauth2-jwt.c | 27 +++++++++++++++++----------
- 1 file changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/src/lib-oauth2/oauth2-jwt.c b/src/lib-oauth2/oauth2-jwt.c
-index 83b241c558..09d3970743 100644
---- a/src/lib-oauth2/oauth2-jwt.c
-+++ b/src/lib-oauth2/oauth2-jwt.c
-@@ -30,19 +30,26 @@ static const char *get_field(const struct json_tree *tree, const char *key)
- return json_tree_get_value_str(value_node);
- }
-
--static int
--get_time_field(const struct json_tree *tree, const char *key, long *value_r)
-+static int get_time_field(const struct json_tree *tree, const char *key,
-+ int64_t *value_r)
- {
-+ time_t tvalue;
- const char *value = get_field(tree, key);
- int tz_offset ATTR_UNUSED;
- if (value == NULL)
- return 0;
-- if ((str_to_long(value, value_r) < 0 &&
-- !iso8601_date_parse((const unsigned char*)value, strlen(value),
-- value_r, &tz_offset)) ||
-- *value_r < 0)
-- return -1;
-- return 1;
-+ if (str_to_int64(value, value_r) == 0) {
-+ if (*value_r < 0)
-+ return -1;
-+ return 1;
-+ } else if (iso8601_date_parse((const unsigned char*)value, strlen(value),
-+ &tvalue, &tz_offset)) {
-+ if (tvalue < 0)
-+ return -1;
-+ *value_r = tvalue;
-+ return 1;
-+ }
-+ return -1;
- }
-
- static int
-@@ -311,9 +318,9 @@ oauth2_jwt_body_process(const struct oauth2_settings *set, const char *alg,
- const char *sub = get_field(tree, "sub");
-
- int ret;
-- long t0 = time(NULL);
-+ int64_t t0 = time(NULL);
- /* default IAT and NBF to now */
-- long iat, nbf, exp;
-+ int64_t iat, nbf, exp;
- int tz_offset ATTR_UNUSED;
-
- if (sub == NULL) {
---
-2.20.1
-
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 470f9c0ed3..513259dd54 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -4,10 +4,10 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dovecot
-pkgver=2.3.14
+pkgver=2.3.16
_pkgverminor=${pkgver%.*}
-pkgrel=0
-_pigeonholever=0.5.14
+pkgrel=1
+_pigeonholever=0.5.16
pkgdesc="IMAP and POP3 server"
url="https://www.dovecot.org/"
arch="all"
@@ -30,7 +30,7 @@ makedepends="
linux-headers
mariadb-connector-c-dev
openldap-dev
- openssl-dev
+ openssl1.1-compat-dev
postgresql-dev
sqlite-dev
zlib-dev
@@ -61,14 +61,19 @@ source="https://www.dovecot.org/releases/$_pkgverminor/dovecot-$pkgver.tar.gz
default-config.patch
fix-out-of-memory-test.patch
fix-libssl_iostream_openssl.patch
- 0001-oauth2-jwt-Use-int64_t-instead-time_t-for-portabilit.patch
+ fix-check-s390x.patch
+ fix-test-file-cache.patch
test-imap-client-hibernate.patch
dovecot.logrotate
dovecot.initd
"
_builddir_pigeonhole="$srcdir/$pkgname-$_pkgverminor-pigeonhole-$_pigeonholever"
+options="!check" # tests being weird
# secfixes:
+# 2.3.15-r0:
+# - CVE-2021-29157
+# - CVE-2021-33515
# 2.3.13-r0:
# - CVE-2020-24386
# - CVE-2020-25275
@@ -327,14 +332,17 @@ _submv() {
[ "$(ls -A "$pkgdir/$dir")" ] || rmdir "$pkgdir"/"$dir"
}
-sha512sums="69df234cb739c7ee7ae3acfb9756bc22481e94c95463d32bfac315c7ec4b1ba0dfbff552b769f2ab7ee554087ca2ebbe331aa008d3af26417016612dc7cad103 dovecot-2.3.14.tar.gz
-c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc dovecot-2.3-pigeonhole-0.5.14.tar.gz
+sha512sums="
+31a9d352c7ead466d65ee0535b1fbd9138e35235f1ebfeedc4eef54cba450663c59708d162eaf0712af1c40f23526ac86aab2eece8cefde3edf690127472fd1e dovecot-2.3.16.tar.gz
+880e00654eab85cc41b27ac470cce6011991e3cdb005642f495c2297fd9492bfb2b6b4ef63c88c2ac10bec870ad69b8bee6b11dd1bc5099e16c3cc2857312543 dovecot-2.3-pigeonhole-0.5.16.tar.gz
fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a skip-iconv-check.patch
794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5 split-protocols.patch
0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07 default-config.patch
733cdbfb7f6b2608470bd30a0f9190ec86099d4c8e48b7fb92d7b595be665bf749976889033e1ad438edd3f99f2e0d496dd0d667291915c80df82f7e62483f59 fix-out-of-memory-test.patch
0fb56eb9c7fae8d8b1d794928ce2ba58d03c102cd7c3f959799c62c5d838ff535ecccb64bc1970d960f67d49388c880773e9eac5aed3bcf92e6efed3b56cc837 fix-libssl_iostream_openssl.patch
-5da4367fd8bb0ea4d94c676568a5f0142217a7556fbcf5cdbdfc92e5b7955d432858a5e944ad0aebc310b6b5c4219f800428e6ddadee1a3aaa954847a8a46317 0001-oauth2-jwt-Use-int64_t-instead-time_t-for-portabilit.patch
+c7a7882e2391f6d97e361a33cd627c423f5130d08828012bdcce02ba3050424475edbdb370185a717f1054575b9008633f1e433b2216b843b48225515ebe1dda fix-check-s390x.patch
+bfa8f18cce438bbf55cfaa2164358424f04393365aa98ebc342dc2677b48bf8fb16bdb1803aba18ad74fe8494bb7d2091569c430086ed2b47d13100ae5e9ffab fix-test-file-cache.patch
33c6eefaaca755c7766c74cb1afdc54fa9241b3d75b1db6b1167615061b5d79b85d759746c2d1793f4a3669d493489236e89ca4278dd38dd681f537c83e81a20 test-imap-client-hibernate.patch
9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0 dovecot.logrotate
-d91951b81150d7a3ef6a674c0dc7b012f538164dac4b9d27a6801d31da6813b764995a438f69b6a680463e1b60a3b4f2959654f68e565fe116ea60312d5e5e70 dovecot.initd"
+d91951b81150d7a3ef6a674c0dc7b012f538164dac4b9d27a6801d31da6813b764995a438f69b6a680463e1b60a3b4f2959654f68e565fe116ea60312d5e5e70 dovecot.initd
+"
diff --git a/main/dovecot/fix-check-s390x.patch b/main/dovecot/fix-check-s390x.patch
new file mode 100644
index 0000000000..d4d5f6ae5b
--- /dev/null
+++ b/main/dovecot/fix-check-s390x.patch
@@ -0,0 +1,52 @@
+commit ec4595097067a736717ef202fe8542b1b4bc2dd5
+Author: Timo Sirainen <timo.sirainen@open-xchange.com>
+Date: Tue Aug 10 12:22:08 2021 +0300
+
+ lib-index: Fix storing cache fields' last_used with 64bit big endian CPUs
+
+diff --git a/src/lib-index/mail-cache-fields.c b/src/lib-index/mail-cache-fields.c
+index e929fb559d..429e0d234c 100644
+--- a/src/lib-index/mail-cache-fields.c
++++ b/src/lib-index/mail-cache-fields.c
+@@ -524,6 +524,19 @@ static void copy_to_buf_byte(struct mail_cache *cache, buffer_t *dest,
+ }
+ }
+
++static void
++copy_to_buf_last_used(struct mail_cache *cache, buffer_t *dest, bool add_new)
++{
++ size_t offset = offsetof(struct mail_cache_field, last_used);
++#if defined(WORDS_BIGENDIAN) && SIZEOF_VOID_P == 8
++ /* 64bit time_t with big endian CPUs: copy the last 32 bits instead of
++ the first 32 bits (that are always 0). The 32 bits are enough until
++ year 2106, so we're not in a hurry to use 64 bits on disk. */
++ offset += sizeof(uint32_t);
++#endif
++ copy_to_buf(cache, dest, add_new, offset, sizeof(uint32_t));
++}
++
+ static int mail_cache_header_fields_update_locked(struct mail_cache *cache)
+ {
+ buffer_t *buffer;
+@@ -536,9 +549,7 @@ static int mail_cache_header_fields_update_locked(struct mail_cache *cache)
+
+ buffer = t_buffer_create(256);
+
+- copy_to_buf(cache, buffer, FALSE,
+- offsetof(struct mail_cache_field, last_used),
+- sizeof(uint32_t));
++ copy_to_buf_last_used(cache, buffer, FALSE);
+ ret = mail_cache_write(cache, buffer->data, buffer->used,
+ offset + MAIL_CACHE_FIELD_LAST_USED());
+ if (ret == 0) {
+@@ -599,9 +610,7 @@ void mail_cache_header_fields_get(struct mail_cache *cache, buffer_t *dest)
+ buffer_append(dest, &hdr, sizeof(hdr));
+
+ /* we have to keep the field order for the existing fields. */
+- copy_to_buf(cache, dest, TRUE,
+- offsetof(struct mail_cache_field, last_used),
+- sizeof(uint32_t));
++ copy_to_buf_last_used(cache, dest, TRUE);
+ copy_to_buf(cache, dest, TRUE,
+ offsetof(struct mail_cache_field, field_size),
+ sizeof(uint32_t));
diff --git a/main/dovecot/fix-test-file-cache.patch b/main/dovecot/fix-test-file-cache.patch
new file mode 100644
index 0000000000..c4a9630aa8
--- /dev/null
+++ b/main/dovecot/fix-test-file-cache.patch
@@ -0,0 +1,22 @@
+posted over IRC to me by Aki Tuomi
+
+diff --git a/src/lib/test-file-cache.c b/src/lib/test-file-cache.c
+index 6bac9abfe7..a402d38a58 100644
+--- a/src/lib/test-file-cache.c
++++ b/src/lib/test-file-cache.c
+@@ -251,6 +251,7 @@ static void test_file_cache_errors(void)
+ test_assert(size == 0);
+ test_assert(map == NULL);
+
++#if 0
+ /* temporarily set a small memory limit to make mmap attempt fail */
+ struct rlimit rl_cur;
+ test_assert(getrlimit(RLIMIT_AS, &rl_cur) == 0);
+@@ -274,6 +275,7 @@ static void test_file_cache_errors(void)
+ test_expect_error_string(errstr);
+ test_assert(file_cache_set_size(cache, page_size*2) == -1);
+ test_assert(setrlimit(RLIMIT_AS, &rl_cur) == 0);
++#endif
+
+ file_cache_free(&cache);
+ i_close_fd(&fd);
diff --git a/main/doxygen/APKBUILD b/main/doxygen/APKBUILD
index 6ae0689e2f..ca09568515 100644
--- a/main/doxygen/APKBUILD
+++ b/main/doxygen/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=doxygen
-pkgver=1.9.1
+pkgver=1.9.2
pkgrel=1
pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
url="https://www.doxygen.nl/"
@@ -8,7 +8,11 @@ arch="all"
license="GPL-2.0-or-later"
checkdepends="libxml2-utils"
makedepends="flex bison coreutils perl python3 cmake"
-source="https://doxygen.nl/files/doxygen-$pkgver.src.tar.gz"
+source="https://doxygen.nl/files/doxygen-$pkgver.src.tar.gz
+ fix-segfault.patch
+ "
+
+[ "$CARCH" = "riscv64" ] && options="textrels"
build() {
cmake -B build \
@@ -29,4 +33,7 @@ package() {
make -C build DESTDIR="$pkgdir" install
}
-sha512sums="637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed doxygen-1.9.1.src.tar.gz"
+sha512sums="
+2729d013b0363a919bbf6babd300389b76e95dd9dbb16ac0f57fc5a0392d3e2076ea4fba958a236311513e68e4aa056a77bd22c9c92b410a17eed095e5adccc0 doxygen-1.9.2.src.tar.gz
+ced906c1caccf478a217c05dfcf03f9c5b7854b88d461c6364d9857c5ad1fc96e983a1c30e16859a9aaa76da837626a0750d5ebc2c58e9ef703a3b31cf23f884 fix-segfault.patch
+"
diff --git a/main/doxygen/fix-segfault.patch b/main/doxygen/fix-segfault.patch
new file mode 100644
index 0000000000..6dc4cf4840
--- /dev/null
+++ b/main/doxygen/fix-segfault.patch
@@ -0,0 +1,83 @@
+From 11bd374ea216b561deaf9be675ddd8941b80a487 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Sun, 29 Aug 2021 01:07:27 -0300
+Subject: [PATCH] Fix memory corruption in TextStream.
+
+This resulted in observable crashes with musl libc due to corruption in
+malloc, but could also be observed in valgrind, when building GNU
+Radio's doxygen docs. One of the valgrind errors is reproduced below.
+
+==26== Invalid read of size 4
+==26== at 0x405A62D: fwrite (fwrite.c:32)
+==26== by 0x47154D: flush (textstream.h:181)
+==26== by 0x47154D: setFile (textstream.h:74)
+==26== by 0x47154D: OutputGenerator::startPlainFile(QCString const&) (outputgen.cpp:69)
+==26== by 0x2EFF57: HtmlGenerator::startFile(QCString const&, QCString const&, QCString const&, int) (htmlgen.cpp:1121)
+==26== by 0x3083EC: forall<OutputGenerator, const QCString&, const QCString&, const QCString&, int, const QCString&, const QCString&, const QCString&, int&> (outputlist.h:512)
+==26== by 0x3083EC: startFile (outputlist.h:91)
+==26== by 0x3083EC: startFile(OutputList&, QCString const&, QCString const&, QCString const&, HighlightedItem, bool, QCString const&) (index.cpp:240)
+==26== by 0x296807: FileDefImpl::writeSourceHeader(OutputList&) (filedef.cpp:1110)
+==26== by 0x276751: generateFileSources() (doxygen.cpp:7971)
+==26== by 0x277793: generateOutput() (doxygen.cpp:11992)
+==26== by 0x21173E: main (main.cpp:38)
+==26== Address 0x130bb62c is 140 bytes inside a block of size 1,264 free'd
+==26== at 0x48BAA4B: free (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+==26== by 0x40585D0: fclose (fclose.c:35)
+==26== by 0x4DCE5D7: std::__basic_file<char>::close() (in /usr/lib/libstdc++.so.6.0.28)
+==26== by 0x4E1D676: std::basic_filebuf<char, std::char_traits<char> >::close() (in /usr/lib/libstdc++.so.6.0.28)
+==26== by 0x4B055C: ~basic_filebuf (fstream:249)
+==26== by 0x4B055C: ~basic_ofstream (fstream:863)
+==26== by 0x4B055C: writeJavaScriptSearchIndex() (searchindex.cpp:923)
+==26== by 0x2776F0: generateOutput() (doxygen.cpp:11957)
+==26== by 0x21173E: main (main.cpp:38)
+==26== Block was alloc'd at
+==26== at 0x48B981F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+==26== by 0x40578FE: fdopen (__fdopen.c:21)
+==26== by 0x405943E: fopen (fopen.c:26)
+==26== by 0x4DCE55F: std::__basic_file<char>::open(char const*, std::_Ios_Openmode, int) (in /usr/lib/libstdc++.so.6.0.28)
+==26== by 0x4E1E19A: std::basic_filebuf<char, std::char_traits<char> >::open(char const*, std::_Ios_Openmode) (in /usr/lib/libstdc++.so.6.0.28)
+==26== by 0x4B0470: open (fstream:332)
+==26== by 0x4B0470: open (fstream:962)
+==26== by 0x4B0470: basic_ofstream (fstream:830)
+==26== by 0x4B0470: writeJavaScriptSearchIndex() (searchindex.cpp:923)
+==26== by 0x2776F0: generateOutput() (doxygen.cpp:11957)
+==26== by 0x21173E: main (main.cpp:38)
+
+What was happening is that the TextStream object is reused for multiple
+different files. Therefore, when one calls setStream(nullptr) or
+setFile(nullptr), m_f or m_s will, respectively, still contain a pointer
+to the previous member, which is used when one calls setFile() or
+setStream() again, since these methods will call flush().
+
+For example, a program doing
+
+ s.setFile(f1);
+ s.setStream(nullptr);
+ fclose(f1);
+ s.setFile(f2);
+
+will call fwrite(f1, ...). This pattern can be observed in many parts of
+Doxygen, so fixing it in TextStream itself by always zeroing the other
+pointer is the simplest fix.
+---
+ src/textstream.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/textstream.h b/src/textstream.h
+index 161ce7fe1..38027ec07 100644
+--- a/src/textstream.h
++++ b/src/textstream.h
+@@ -67,11 +67,13 @@ class TextStream final
+ {
+ flush();
+ m_s = s;
++ m_f = nullptr;
+ }
+
+ void setFile(FILE *f)
+ {
+ flush();
++ m_s = nullptr;
+ m_f = f;
+ }
+
diff --git a/main/drbd-utils/APKBUILD b/main/drbd-utils/APKBUILD
index fbd806ee4b..a6e5735ef9 100644
--- a/main/drbd-utils/APKBUILD
+++ b/main/drbd-utils/APKBUILD
@@ -1,20 +1,21 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=drbd-utils
-pkgver=9.16.0
+pkgver=9.18.0
pkgrel=0
pkgdesc="Network-based RAID 1"
url="https://www.drbd.org"
arch="all"
license="GPL-2.0-or-later"
depends="bash"
-makedepends="bison docbook-xsl flex libxslt linux-headers po4a"
+makedepends="bison docbook-xsl flex libxslt linux-headers po4a asciidoctor"
options="!check" # no tests provided
provides="drbd=$pkgver-r$pkgrel"
subpackages="$pkgname-doc $pkgname-pacemaker::noarch
$pkgname-bash-completion:bashcomp:noarch $pkgname-openrc"
source="https://www.linbit.com/downloads/drbd/utils/drbd-utils-$pkgver.tar.gz
drbdsetup-permissions.patch
+ fix-drbdsetup_events2.c.patch
drbd.initd
"
@@ -59,6 +60,9 @@ bashcomp() {
"$subpkgdir"/usr/share/bash-completion/completions
}
-sha512sums="ad4367d4ed90020e05b98514bff9f515e7ddc07c1e5d2560b7b9330a4c03a1a788658bae719c18023cad0788d7949beeaebacffd9e60bc2a0703ac7fdcc5db89 drbd-utils-9.16.0.tar.gz
+sha512sums="
+1bbd3c5f744b1b2c76c1b5638efaf75de1b000ec74c5c54fa004bfc362db56a7e147a4b222a6781d0a81cd58accbb8147c28d19be9419b37f461bb90800625e9 drbd-utils-9.18.0.tar.gz
562ae8eee03148666fb6e6e700c1eb9086f6901e176ea6cd007e3ac4e39d1cdaf967064de74dc1ad620155996dc7011bd0e2abd1c9595ff9bf5f4413673726f3 drbdsetup-permissions.patch
-f61a833dc5eea79000a7dd85e83ae10e284109c76b5d59974ed69f92dbab6c389d6d20f7ea374b7c066519c6d1d816ed27b48dbaee6b91fb9754974acf52f46e drbd.initd"
+dc9d825019803ab5cf66d14b0b67b9d3f42cabac2aee07228176b9ff73dacc74e413f2c9ed0fe22a8217ff502c80b891950d1d4fb51df56d9c8e51e7c1fc1cc6 fix-drbdsetup_events2.c.patch
+f61a833dc5eea79000a7dd85e83ae10e284109c76b5d59974ed69f92dbab6c389d6d20f7ea374b7c066519c6d1d816ed27b48dbaee6b91fb9754974acf52f46e drbd.initd
+"
diff --git a/main/drbd-utils/fix-drbdsetup_events2.c.patch b/main/drbd-utils/fix-drbdsetup_events2.c.patch
new file mode 100644
index 0000000000..e1cf69cf38
--- /dev/null
+++ b/main/drbd-utils/fix-drbdsetup_events2.c.patch
@@ -0,0 +1,16 @@
+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/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD
index 2dbdba1e48..4bdb23ad0b 100644
--- a/main/e2fsprogs/APKBUILD
+++ b/main/e2fsprogs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=e2fsprogs
-pkgver=1.46.2
+pkgver=1.46.4
pkgrel=0
pkgdesc="Standard Ext2/3/4 filesystem utilities"
url="http://e2fsprogs.sourceforge.net"
@@ -12,8 +12,8 @@ makedepends="$depends_dev linux-headers"
checkdepends="diffutils perl"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc libcom_err $pkgname-libs $pkgname-extra"
source="$pkgname-$pkgver.tar.gz::https://github.com/tytso/e2fsprogs/archive/v$pkgver.tar.gz
- ensure-small-filesystems-are-Y2038-ok.patch
"
+
case $CHOST in
riscv64*)
# j_recover_fast_commit appears to be a false negative due to a compiler
@@ -100,5 +100,6 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
}
-sha512sums="2550cb2fbed0c9cc6f0df0e8870cb36dd1c8d4e66321c9551b0fb14d343c7b3f09110424db2699926b8249600c0788c1a2e270fae9d0bacecd71f96745883b30 e2fsprogs-1.46.2.tar.gz
-daf63f8ca704eaa9a3293444469ef1a36c09806614d20e844b451af2426d5c8611a61669c99e4702f1fd787145cf9a34f1345ae5ed15ef47c41ca02f03302231 ensure-small-filesystems-are-Y2038-ok.patch"
+sha512sums="
+ea1a489581e62037ddb20e35e8da75eb2569bf0c7f65c76d123bb0f3c80d2b0e03ce9bfddc254602e3b01b3efc4128216b8390c89184e6841b47d19ab2977fbc e2fsprogs-1.46.4.tar.gz
+"
diff --git a/main/e2fsprogs/ensure-small-filesystems-are-Y2038-ok.patch b/main/e2fsprogs/ensure-small-filesystems-are-Y2038-ok.patch
deleted file mode 100644
index df77148b57..0000000000
--- a/main/e2fsprogs/ensure-small-filesystems-are-Y2038-ok.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Dermot Bradley <dermot_bradley@yahoo.com>
-Date: Thu, 10 Dec 2020 23:52 +0000
-Subject: ensure that small filesystems are Y2038 ok
-
-When formatting a partition with a EXT2/3/4 filesystem, if the partition
-specified is 512M or smaller in size then the "small" entry from
-/etc/mke2fs.conf is used, in addition to the defaults in that file, for
-the new filesystem's settings. Currently the "small" entry specifies an
-inode size of 128bytes which is insufficient to hold timestamps beyond
-2038.
-
-After booting a system with an affected EXT2/3/4 filesystem the kernel
-buffer will show a warning:
-
-$ dmesg | grep 2038
-
- filesystem being remounted at / supports timestamps until 2038
-
-This patch removes the 128 byte inode size entry from the 'small'
-definition and so the formatting tool will fallback to the default
-value of 256 byte inodes which will ensure no Y2038 issues. The disk
-space overhead when formatting after this change will slightly increase.
-
----
-
-diff -aur a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in
---- a/misc/mke2fs.conf.in
-+++ b/misc/mke2fs.conf.in
-@@ -16,7 +16,6 @@
- }
- small = {
- blocksize = 1024
-- inode_size = 128
- inode_ratio = 4096
- }
- floppy = {
diff --git a/main/efitools/005-riscv64.patch b/main/efitools/005-riscv64.patch
new file mode 100644
index 0000000000..b98c138c10
--- /dev/null
+++ b/main/efitools/005-riscv64.patch
@@ -0,0 +1,45 @@
+We can use just the same flags as for aarch64.
+
+Signed-off-by: Heinrich Schuchardt <xypron.glpk@xxxxxx>
+---
+RISC-V patches for gnu-efi are not yet accepted in upstream. Cf.
+
+[Gnu-efi-discuss] [PATCH 1/1] Initial support for RISCV64
+https://sourceforge.net/p/gnu-efi/mailman/gnu-efi-discuss/thread/20210401153553.103286-1-xypron.glpk%40gmx.de/#msg37253360
+[Gnu-efi-discuss] [PATCH 1/1] Undefined Status in LibGetVariableAndSize()
+https://sourceforge.net/p/gnu-efi/mailman/gnu-efi-discuss/thread/20210319162557.334645-1-xypron.glpk%40gmx.de/#msg37243995
+
+You can use
+https://github.com/xypron/gnu-efi/releases/tag/riscv64-2021-04-01 for
+building sbsigntools and efitools.
+---
+ Make.rules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/Make.rules b/Make.rules
+index 903a5a4..69bd3bd 100644
+--- a/Make.rules
++++ b/Make.rules
+@@ -10,6 +10,8 @@ else ifeq ($(ARCH),aarch64)
+ ARCH3264 =
+ else ifeq ($(ARCH),arm)
+ ARCH3264 =
++else ifeq ($(ARCH),riscv64)
++ARCH3264 =
+ else
+ $(error unknown architecture $(ARCH))
+ endif
+@@ -56,6 +58,11 @@ ifeq ($(ARCH),aarch64)
+ FORMAT = -O binary
+ endif
+
++ifeq ($(ARCH),riscv64)
++ LDFLAGS += --defsym=EFI_SUBSYSTEM=0x0a
++ FORMAT = -O binary
++endif
++
+ %.efi: %.so
+ $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym \
+ -j .rel -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \
+--
+2.30.2
diff --git a/main/efitools/APKBUILD b/main/efitools/APKBUILD
index 4f4c79a80d..75d5065e37 100644
--- a/main/efitools/APKBUILD
+++ b/main/efitools/APKBUILD
@@ -3,18 +3,21 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=efitools
pkgver=1.9.2
-pkgrel=2
+pkgrel=3
pkgdesc="EFI tools"
url="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"
-arch="x86_64"
+# riscv64: fails to build
+# others: limited by sbsigntool
+#arch="all !armhf !s390x !ppc64le !mips !mips64 !riscv64"
license="(GPL-2.0-only AND LGPL-2.1-or-later) WITH OpenSSL-Exception"
-makedepends="gnu-efi-dev openssl-dev perl-file-slurp help2man sbsigntool"
+makedepends="gnu-efi-dev openssl1.1-compat-dev perl-file-slurp help2man sbsigntool"
subpackages="$pkgname-doc"
source="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/efitools-$pkgver.tar.gz
001-datatypes.patch
002-fix-parallel-make.patch
003-fix-wchar_t.patch
004-typo.patch
+ 005-riscv64.patch
"
prepare() {
@@ -31,8 +34,11 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="77e0ad7e865814ed388ff6daabe0f4b49ba51672bf2cbb98b7905e209cbd28f9ede2f73213ce45af8a978c1e67dba24ec88a1188661317cc22317b47e575cde8 efitools-1.9.2.tar.gz
+sha512sums="
+77e0ad7e865814ed388ff6daabe0f4b49ba51672bf2cbb98b7905e209cbd28f9ede2f73213ce45af8a978c1e67dba24ec88a1188661317cc22317b47e575cde8 efitools-1.9.2.tar.gz
cd72161a99b26472909a8da834c08a1f88b54d35291a6646562b03a6616fa5fb61e49d4fb3c780861689d23823c101709890dd245dd8aa9f51dca40ac1b2d369 001-datatypes.patch
7afe87e9b44ed3e10200770d3079e4e14b6d39c54c05538031e93d021631427fed47781b016b46f58b8fe6d21f1f3c78667b2b502aa20b99516aa980303aa2ad 002-fix-parallel-make.patch
bd31e51c6d80ab3fdfe0e7abea1cd6f982d63a96a345c0e75f438f6a219bf64b1510f0dabdcc49d24cc788c06ff4ccfbccde0c1aead9c00b65eaf2977e87e742 003-fix-wchar_t.patch
-e34d4d8f420a29cfc50a9f98dcbb048016f2fc535ddb3e39482e58f44b37db672410ffab24392751818d72b1e914d77644cae8f7a92bb9af7fe2a9f726a230e9 004-typo.patch"
+e34d4d8f420a29cfc50a9f98dcbb048016f2fc535ddb3e39482e58f44b37db672410ffab24392751818d72b1e914d77644cae8f7a92bb9af7fe2a9f726a230e9 004-typo.patch
+630587b00bee4e65e9258f56d0e66677e36063c83659f394c5fcb766683d704f63e8e2acf72f69f6bfef77dd84471c28ab21ef15f10389d8c2151fa2e46229c4 005-riscv64.patch
+"
diff --git a/main/eggdrop/APKBUILD b/main/eggdrop/APKBUILD
index 963500c57f..99c73fefc3 100644
--- a/main/eggdrop/APKBUILD
+++ b/main/eggdrop/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=eggdrop
pkgver=1.8.4
-pkgrel=1
+pkgrel=2
pkgdesc="World's most popular Open Source IRC bot"
url="https://eggheads.org/"
arch="all"
diff --git a/main/elfutils/APKBUILD b/main/elfutils/APKBUILD
index aad47bcb61..f5e18c7b21 100644
--- a/main/elfutils/APKBUILD
+++ b/main/elfutils/APKBUILD
@@ -1,23 +1,19 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=elfutils
-pkgver=0.182
-pkgrel=1
+pkgver=0.185
+pkgrel=0
pkgdesc="Utilities and DSOs to handle ELF files and DWARF data"
url="http://elfutils.org/"
arch="all"
license="GPL-3.0-or-later AND (GPL-2.0-or-later OR LGPL-3.0-or-later)"
makedepends="bison flex-dev zlib-dev bzip2-dev xz-dev argp-standalone
- bsd-compat-headers autoconf automake libtool fts-dev musl-obstack-dev
- linux-headers"
+ bsd-compat-headers libtool fts-dev musl-obstack-dev linux-headers"
subpackages="libelf libelf-static $pkgname-dev $pkgname-doc"
source="https://sourceware.org/elfutils/ftp/$pkgver/elfutils-$pkgver.tar.bz2
error.h
fix-aarch64_fregs.patch
fix-uninitialized.patch
- musl-fts-obstack.patch
musl-macros.patch
- musl-qsort_r.patch
- musl-strerror_r.patch
musl-strndupa.patch
musl-asm-ptrace-h.patch
"
@@ -48,8 +44,6 @@ prepare() {
cp "$srcdir"/error.h "$builddir"/lib
cp "$srcdir"/error.h "$builddir"/src
- autoreconf -vif
-
cat > lib/libintl.h <<-EOF
#ifndef LIBINTL_H
#define LIBINTL_H
@@ -91,13 +85,12 @@ libelf() {
mv "$pkgdir"/usr/lib/*-*.so "$subpkgdir"/usr/lib/
}
-sha512sums="8ab0735bbe11b4383169341bf674ace360038b6ae5239f1d5a991c46260cd4bce545e078735b7de3b8fab132bb5da41f60689ff1b1d7ebccfada117a954a2c81 elfutils-0.182.tar.bz2
+sha512sums="
+34de0de1355b11740e036e0fc64f2fc063587c8eb121b19216ee5548d3f0f268d8fc3995176c47190466b9d881007cfa11a9d01e9a50e38af6119492bf8bb47f elfutils-0.185.tar.bz2
8b650bc78cea66f30f0ff66357005890ac8a1b04a8dcc50209cb10a4b4c5ede849505cb68463beca8316ace0fbd53bbc484cfb597805b55616f3b3fc2b864e9a error.h
c3676b0b8b40d6e437f5d88c0d658dc0829ec97d1955e4bbf96f4cff9ee9001b8f2f06174450ae7aa5858b91c7905bdbd49073b561c346416132338a9c94731b fix-aarch64_fregs.patch
b9ba55e1b56a8abf694b6d02f022d9a3a0ae6ab53a8c4a71e49552e32411ef410d3a7512fbd1a729696bc2046ac11586829816f0fa3b8226ee77c9dc4b741e58 fix-uninitialized.patch
-3b9fb4ebb5b33d4c7fb1e1f7e476a3ea4eba796bd9c89b9c920ef8c879638fb70abb1d83a0039b5b95558ba9597fb9cdb0fd6983498a11bb8dbdd50738c925c8 musl-fts-obstack.patch
952109b1e0a2ccf435f5a7825ca3514d526161dae32e3d734f93d76b5693c469a889a488cb05cf423a006e9df550e7aae68697cc09d2c48fee1acd38163e5750 musl-macros.patch
-ce1a25387865ff96ecc5104810acc225dd64c28571ee5473ab732f7b63b927e4a260ebe74f17d3d8ba0c917cce233b9f902dd35c149d6d8317eecbc71f8d2da6 musl-qsort_r.patch
-a0d986100c8ff2ef0595645ec1b2eeb1d517b7442aef5f349ebf27fcb66c76e51fadeda25bed5f04b4bb16a61aa23ac6e86a1f34a0087d2136acf0f64c3fa4d1 musl-strerror_r.patch
1728376b8408e9ae97f048d54bc6faae889bca197cc0500a952e64683835dfca66465aa4bce8e57d1ce7a81dcba0bbeeb4bd1e1026d3c4bd196ef4ffe536a509 musl-strndupa.patch
-7c529f88dc248f657a8d690044560c20a222c5b37d0d7dcb057bf2eea8938c406cccd6129bce19542088511a026b233234c9a83933a525c4691810be9ca712bf musl-asm-ptrace-h.patch"
+7c529f88dc248f657a8d690044560c20a222c5b37d0d7dcb057bf2eea8938c406cccd6129bce19542088511a026b233234c9a83933a525c4691810be9ca712bf musl-asm-ptrace-h.patch
+"
diff --git a/main/elfutils/musl-fts-obstack.patch b/main/elfutils/musl-fts-obstack.patch
deleted file mode 100644
index 8d45854e66..0000000000
--- a/main/elfutils/musl-fts-obstack.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- a/configure.ac 2015-10-15 15:16:57.000000000 +0200
-+++ b/configure.ac 2015-11-20 05:32:57.723901582 +0100
-@@ -305,6 +305,62 @@
- fi
- AC_SUBST([argp_LDADD])
-
-+dnl Check if we have fts available from our libc
-+AC_LINK_IFELSE(
-+ [AC_LANG_PROGRAM(
-+ [#if !defined(__x86_64__)
-+ #undef _FILE_OFFSET_BITS
-+ #define _FILE_OFFSET_BITS 32
-+ #endif
-+ #include <fts.h>],
-+ [FTS* fts = 0; return fts_close(fts); return 0;]
-+ )],
-+ [libc_has_fts="true"],
-+ [libc_has_fts="false"]
-+)
-+
-+dnl If our libc doesn't provide fts, then test for libfts
-+if test "$libc_has_fts" = "false" ; then
-+ AC_MSG_WARN("libc does not have fts")
-+ AC_CHECK_LIB([fts], [fts_close], [have_fts="true"], [have_fts="false"])
-+
-+ if test "$have_fts" = "false"; then
-+ AC_MSG_ERROR("no libfts found")
-+ else
-+ fts_LDADD="-lfts"
-+ fi
-+else
-+ fts_LDADD=""
-+fi
-+AC_SUBST([fts_LDADD])
-+
-+dnl Check if we have obstack available from our libc
-+AC_LINK_IFELSE(
-+ [AC_LANG_PROGRAM(
-+ [#include <obstack.h>],
-+ [_obstack_begin(0, 0, 0, NULL, NULL); return 0;]
-+ )],
-+ [libc_has_obstack="true"],
-+ [libc_has_obstack="false"]
-+)
-+
-+dnl If our libc doesn't provide obstack, then test for libobstack
-+if test "$libc_has_obstack" = "false" ; then
-+ AC_MSG_WARN("libc does not have obstack")
-+ AC_CHECK_LIB([obstack], [_obstack_begin], [have_obstack="true"], [have_obstack="false"])
-+
-+ if test "$have_obstack" = "false"; then
-+ AC_MSG_ERROR("no libobstack found")
-+ else
-+ obstack_LDADD="-lobstack"
-+ fi
-+else
-+ obstack_LDADD=""
-+fi
-+AC_SUBST([obstack_LDADD])
-+
-+dnl The directories with content.
-+
- dnl The directories with content.
-
- dnl Documentation.
---- a/src/Makefile.am.orig
-+++ b/src/Makefile.am
-@@ -46,7 +46,7 @@
- else
- libasm = ../libasm/libasm.so
- libdw = ../libdw/libdw.so
--libelf = ../libelf/libelf.so
-+libelf = ../libelf/libelf.so $(fts_LDADD) $(obstack_LDADD)
- endif
- libebl = ../libebl/libebl.a
- libeu = ../lib/libeu.a
---- a/libdw/Makefile.am.orig
-+++ b/libdw/Makefile.am
-@@ -109,7 +109,7 @@
- ../libcpu/libcpu_pic.a libdw_pic.a ../libdwelf/libdwelf_pic.a \
- ../libdwfl/libdwfl_pic.a
- libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so
--libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) -pthread
-+libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) $(zip_LIBS) -pthread
- libdw_so_SOURCES =
- libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS)
- $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \
diff --git a/main/elfutils/musl-qsort_r.patch b/main/elfutils/musl-qsort_r.patch
deleted file mode 100644
index 0843aec648..0000000000
--- a/main/elfutils/musl-qsort_r.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/src/readelf.c b/src/readelf.c
-index cbb519d..dea513b 100644
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -4829,10 +4829,11 @@ listptr_base (struct listptr *p)
- return cudie_base (&cu);
- }
-
-+static const char *listptr_name;
-+
- static int
--compare_listptr (const void *a, const void *b, void *arg)
-+compare_listptr (const void *a, const void *b)
- {
-- const char *name = arg;
- struct listptr *p1 = (void *) a;
- struct listptr *p2 = (void *) b;
-
-@@ -4848,21 +4849,21 @@ compare_listptr (const void *a, const void *b, void *arg)
- p1->warned = p2->warned = true;
- error (0, 0,
- gettext ("%s %#" PRIx64 " used with different address sizes"),
-- name, (uint64_t) p1->offset);
-+ listptr_name, (uint64_t) p1->offset);
- }
- if (p1->dwarf64 != p2->dwarf64)
- {
- p1->warned = p2->warned = true;
- error (0, 0,
- gettext ("%s %#" PRIx64 " used with different offset sizes"),
-- name, (uint64_t) p1->offset);
-+ listptr_name, (uint64_t) p1->offset);
- }
- if (listptr_base (p1) != listptr_base (p2))
- {
- p1->warned = p2->warned = true;
- error (0, 0,
- gettext ("%s %#" PRIx64 " used with different base addresses"),
-- name, (uint64_t) p1->offset);
-+ listptr_name, (uint64_t) p1->offset);
- }
- if (p1->attr != p2 ->attr)
- {
-@@ -4870,7 +4871,7 @@ compare_listptr (const void *a, const void *b, void *arg)
- error (0, 0,
- gettext ("%s %#" PRIx64
- " used with different attribute %s and %s"),
-- name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr),
-+ listptr_name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr),
- dwarf_attr_name (p2->attr));
- }
- }
-@@ -4941,9 +4942,11 @@ notice_listptr (enum section_e section, struct listptr_table *table,
- static void
- sort_listptr (struct listptr_table *table, const char *name)
- {
-- if (table->n > 0)
-- qsort_r (table->table, table->n, sizeof table->table[0],
-- &compare_listptr, (void *) name);
-+ if (table->n > 0) {
-+ listptr_name = name;
-+ qsort (table->table, table->n, sizeof table->table[0],
-+ &compare_listptr);
-+ }
- }
-
- static bool
diff --git a/main/elfutils/musl-strerror_r.patch b/main/elfutils/musl-strerror_r.patch
deleted file mode 100644
index 72977951d5..0000000000
--- a/main/elfutils/musl-strerror_r.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libdwfl/dwfl_error.c 2015-09-29 17:18:51.000000000 +0200
-+++ b/libdwfl/dwfl_error.c 2015-11-20 05:11:29.889002058 +0100
-@@ -154,7 +154,16 @@
- switch (error &~ 0xffff)
- {
- case OTHER_ERROR (ERRNO):
-+#if defined(__GLIBC__)
- return strerror_r (error & 0xffff, "bad", 0);
-+#else
-+ {
-+ static __thread char buf[128] = "";
-+ if (0 == strerror_r(error & 0xffff, buf, sizeof(buf)))
-+ return buf;
-+ }
-+ return "strerror_r() failed";
-+#endif
- case OTHER_ERROR (LIBELF):
- return elf_errmsg (error & 0xffff);
- case OTHER_ERROR (LIBDW):
diff --git a/main/elinks/APKBUILD b/main/elinks/APKBUILD
index 76cb1f1ce2..89dd60f519 100644
--- a/main/elinks/APKBUILD
+++ b/main/elinks/APKBUILD
@@ -3,7 +3,7 @@
pkgname=elinks
pkgver=0.13
_ver=${pkgver/_/}
-pkgrel=6
+pkgrel=7
pkgdesc="a text mode web browser"
url="http://elinks.or.cz/"
arch="all"
diff --git a/main/ell/APKBUILD b/main/ell/APKBUILD
index 6f31a564a8..727eb9eb8e 100644
--- a/main/ell/APKBUILD
+++ b/main/ell/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Milan P. Stanić <mps@arvanta.net>
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=ell
-pkgver=0.41
+pkgver=0.43
pkgrel=0
pkgdesc="Linux library for embedded development"
url="https://01.org/ell"
@@ -38,5 +38,5 @@ package() {
}
sha512sums="
-57247b62c436524c9fa33ec6c6c88c6f9e4a0eae05ea1fed9aa08b81231c0a2595d85480712a6d34de4fd0a587e9dcd270053eab05f365b79a308589f0f1ee78 ell-0.41.tar.gz
+bb7e21857efc59af7ecfdf7fcb79101be6cf464bac7355baf6fb562800764d495a9fe0b60c5526318b5d57f28b31c08fc45a650d053293f1376b15a69964b5a0 ell-0.43.tar.gz
"
diff --git a/main/email/APKBUILD b/main/email/APKBUILD
index d8a9c867df..e31747f481 100644
--- a/main/email/APKBUILD
+++ b/main/email/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=email
pkgver=3.1.4
-pkgrel=9
+pkgrel=10
pkgdesc="command line SMTP client that's simple"
options="!check" # No testsuite
url="http://www.cleancode.org/projects/email"
diff --git a/main/encfs/APKBUILD b/main/encfs/APKBUILD
index 44e2bb0dd5..b036d76eba 100644
--- a/main/encfs/APKBUILD
+++ b/main/encfs/APKBUILD
@@ -3,7 +3,7 @@
pkgname=encfs
pkgver=1.9.5
_ver=${pkgver/_/-}
-pkgrel=9
+pkgrel=10
pkgdesc="EncFS provides an encrypted filesystem in user-space"
url="https://vgough.github.io/encfs/"
arch="all"
diff --git a/main/ethtool/APKBUILD b/main/ethtool/APKBUILD
index 861aa9c675..0bcc3b3e1b 100644
--- a/main/ethtool/APKBUILD
+++ b/main/ethtool/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ethtool
-pkgver=5.12
+pkgver=5.14
pkgrel=0
pkgdesc="Utility for controlling network drivers and hardware"
url="https://mirrors.edge.kernel.org/pub/software/network/ethtool/"
@@ -37,4 +37,6 @@ bashcomp() {
amove usr/share/bash-completion/completions
}
-sha512sums="9825f0bf10851f0bd9c3e621785144a5ed5f3fbedacb1801aa6a9b4685c870fa9bfac8eb552c900d20be06240c017dd001fde6be7aecc8c466bbe9ade8b1d002 ethtool-5.12.tar.xz"
+sha512sums="
+880c4b6d5f83c25cabc6101222a5abf5f7e5e6501165ba5cdb420da242c351d7c32c1cffacfa1bcf0c4655434d89c64d39f0809af0d38f626a0a78f92ec68f87 ethtool-5.14.tar.xz
+"
diff --git a/main/eudev/APKBUILD b/main/eudev/APKBUILD
index 5143f61adb..7f42247c11 100644
--- a/main/eudev/APKBUILD
+++ b/main/eudev/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=eudev
pkgver=3.2.10
-pkgrel=0
+pkgrel=1
pkgdesc="OpenRC compatible fork of systemd-udev"
url="https://wiki.gentoo.org/wiki/Project:Eudev"
arch="all"
@@ -10,6 +10,7 @@ license="GPL-2.0-only"
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"
checkdepends="tree xz perl"
@@ -23,6 +24,8 @@ source="https://dev.gentoo.org/~blueness/eudev/eudev-$pkgver.tar.gz
setup-udev
"
+[ "$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
diff --git a/main/expect/07-file-handle.patch b/main/expect/07-file-handle.patch
new file mode 100644
index 0000000000..98e42180bf
--- /dev/null
+++ b/main/expect/07-file-handle.patch
@@ -0,0 +1,24 @@
+Author: Russell Coker <russell@coker.com.au>
+Description:
+ Fixes file handle 3 to be left open when running programs (Closes: #166677).
+
+--- a/exp_clib.c
++++ b/exp_clib.c
+@@ -2040,6 +2040,7 @@
+
+ /* save error fd while we're setting up new one */
+ errorfd = fcntl(2,F_DUPFD,3);
++ fcntl(3, F_SETFD, FD_CLOEXEC);
+ /* and here is the macro to restore it */
+ #define restore_error_fd {close(2);fcntl(errorfd,F_DUPFD,2);}
+
+--- a/exp_command.c
++++ b/exp_command.c
+@@ -1162,6 +1162,7 @@
+
+ /* save error fd while we're setting up new one */
+ errorfd = fcntl(2,F_DUPFD,3);
++ fcntl(3, F_SETFD, FD_CLOEXEC);
+ /* and here is the macro to restore it */
+ #define restore_error_fd {close(2);fcntl(errorfd,F_DUPFD,2);}
+
diff --git a/main/expect/09-unsafe-traps.patch b/main/expect/09-unsafe-traps.patch
new file mode 100644
index 0000000000..1440f217c9
--- /dev/null
+++ b/main/expect/09-unsafe-traps.patch
@@ -0,0 +1,24 @@
+Author: n/a
+Description: Fixes some unsafe traps.
+
+--- a/exp_trap.c
++++ b/exp_trap.c
+@@ -264,6 +264,18 @@
+ #if defined(SIGSTOP)
+ traps[SIGSTOP].reserved = TRUE;
+ #endif
++#if defined(SIGSEGV)
++ traps[SIGSEGV].reserved = TRUE;
++#endif
++#if defined(SIGBUS)
++ traps[SIGBUS].reserved = TRUE;
++#endif
++#if defined(SIGILL)
++ traps[SIGILL].reserved = TRUE;
++#endif
++#if defined(SIGFPE)
++ traps[SIGFPE].reserved = TRUE;
++#endif
+
+ async_handler = Tcl_AsyncCreate(tophalf,(ClientData)0);
+
diff --git a/main/expect/10-manpage.patch b/main/expect/10-manpage.patch
new file mode 100644
index 0000000000..2faa21c597
--- /dev/null
+++ b/main/expect/10-manpage.patch
@@ -0,0 +1,384 @@
+Author: n/a
+Description: Fixes sample expect shebang and excapes dashes.
+
+--- a/expect.man
++++ b/expect.man
+@@ -108,11 +108,11 @@
+ may also be invoked implicitly on systems which support the #! notation
+ by marking the script executable, and making the first line in your script:
+
+- #!/usr/local/bin/expect \-f
++ #!/usr/bin/expect \-f
+
+ Of course, the path must accurately describe where
+ .B Expect
+-lives. /usr/local/bin is just an example.
++lives. /usr/bin is just an example.
+
+ The
+ .B \-c
+@@ -209,7 +209,7 @@
+ original arguments (including the script name) in the variable
+ .IR argv .
+
+- #!/usr/local/bin/expect \-\-
++ #!/usr/bin/expect \-\-
+
+ Note that the usual getopt(3) and execve(2) conventions must be observed
+ when adding arguments to the #! line.
+@@ -293,7 +293,7 @@
+ program.)
+ .I
+ .TP 6
+-.BI close " [-slave] [\-onexec 0|1] [\-i spawn_id]"
++.BI close " [\-slave] [\-onexec 0|1] [\-i spawn_id]"
+ closes the connection to the current process.
+ Most interactive programs will detect EOF on their stdin and exit;
+ thus
+@@ -322,7 +322,7 @@
+
+ The
+ .B \-slave
+-flag closes the slave associated with the spawn id. (See "spawn -pty".)
++flag closes the slave associated with the spawn id. (See "spawn \-pty".)
+ When the connection is closed, the slave is automatically closed as
+ well if still open.
+
+@@ -339,7 +339,7 @@
+ .B wait
+ below for more info.
+ .TP
+-.BI debug " [[-now] 0|1]"
++.BI debug " [[\-now] 0|1]"
+ controls a Tcl debugger allowing you to step through statements, set
+ breakpoints, etc.
+
+@@ -357,7 +357,7 @@
+ The
+ .B debug
+ command does not change any traps. Compare this to starting Expect with the
+-.B -D
++.B \-D
+ flag (see above).
+
+ See the README file or SEE ALSO (below)
+@@ -387,7 +387,7 @@
+ .nf
+
+ send_user "password?\\ "
+- expect_user -re "(.*)\\n"
++ expect_user \-re "(.*)\\n"
+ for {} 1 {} {
+ if {[fork]!=0} {sleep 3600;continue}
+ disconnect
+@@ -454,7 +454,7 @@
+ .B exit
+ is implicitly executed if the end of the script is reached.
+ .TP
+-\fBexp_continue\fR [-continue_timer]
++\fBexp_continue\fR [\-continue_timer]
+ The command
+ .B exp_continue
+ allows
+@@ -464,7 +464,7 @@
+ default
+ .B exp_continue
+ resets the timeout timer. The
+-.I -continue_timer
++.I \-continue_timer
+ flag prevents timer from being restarted. (See
+ .B expect
+ for more information.)
+@@ -627,8 +627,8 @@
+ be used to protect patterns that might otherwise match
+ .B expect
+ flags from doing so.
+-Any pattern beginning with a "-" should be protected this way. (All strings
+-starting with "-" are reserved for future options.)
++Any pattern beginning with a "\-" should be protected this way. (All strings
++starting with "\-" are reserved for future options.)
+
+ .IP
+ For example, the following fragment looks for a successful login.
+@@ -735,7 +735,7 @@
+ through
+ .IR expect_out(9,string) .
+ If the
+-.B -indices
++.B \-indices
+ flag is used before a pattern,
+ the starting and ending indices (in a form suitable for
+ .BR lrange )
+@@ -782,7 +782,7 @@
+ set expect_out(buffer) abbbcabkkkk
+
+ .fi
+-and "a\\n" is left in the output buffer. The pattern "*" (and -re ".*") will
++and "a\\n" is left in the output buffer. The pattern "*" (and \-re ".*") will
+ flush the output buffer without reading any more output from the
+ process.
+ .IP
+@@ -790,7 +790,7 @@
+ This may be prevented by prefixing a pattern with the
+ .B \-notransfer
+ flag. This flag is especially useful in experimenting (and can be
+-abbreviated to "-not" for convenience while experimenting).
++abbreviated to "\-not" for convenience while experimenting).
+
+ The spawn id associated with the matching output (or eof or
+ full_buffer) is stored in
+@@ -874,9 +874,9 @@
+
+ expect {
+ Password: {
+- stty -echo
++ stty \-echo
+ send_user "password (for $user) on $host: "
+- expect_user -re "(.*)\\n"
++ expect_user \-re "(.*)\\n"
+ send_user "\\n"
+ send "$expect_out(1,string)\\r"
+ stty echo
+@@ -891,7 +891,7 @@
+ send_user \\
+ "connection to host failed: $expect_out(buffer)"
+ exit
+- } -re $prompt
++ } \-re $prompt
+ }
+
+ .fi
+@@ -1023,14 +1023,14 @@
+ By default, it reports on the current spawn id. An optional spawn id specification may be given for information on that spawn id. For example
+ .nf
+
+- expect_before -info -i $proc
++ expect_before \-info \-i $proc
+
+ .fi
+ At most one spawn id specification may be given. The flag \-indirect
+ suppresses direct spawn ids that come only from indirect specifications.
+
+-Instead of a spawn id specification, the flag "-all" will cause
+-"-info" to report on all spawn ids.
++Instead of a spawn id specification, the flag "\-all" will cause
++"\-info" to report on all spawn ids.
+
+ The output of the \-info flag can be reused as the argument to expect_before.
+ .TP
+@@ -1123,7 +1123,7 @@
+ .ta \w' interact 'u +\w'$CTRLZ 'u +\w'{'u
+ set CTRLZ \\032
+ interact {
+- -reset $CTRLZ {exec kill \-STOP [pid]}
++ \-reset $CTRLZ {exec kill \-STOP [pid]}
+ \\001 {send_user "you typed a control\-A\\n";
+ send "\\001"
+ }
+@@ -1152,8 +1152,8 @@
+ flag may be used to protect patterns that might otherwise match
+ .B interact
+ flags from doing so.
+-Any pattern beginning with a "-" should be protected this way. (All strings
+-starting with "-" are reserved for future options.)
++Any pattern beginning with a "\-" should be protected this way. (All strings
++starting with "\-" are reserved for future options.)
+
+ The
+ .B \-re
+@@ -1199,7 +1199,7 @@
+ messages:
+ .nf
+
+- interact -input $user_spawn_id timeout 3600 return -output \\
++ interact \-input $user_spawn_id timeout 3600 return \-output \\
+ $spawn_id
+
+ .fi
+@@ -1298,9 +1298,9 @@
+ .nf
+
+ interact {
+- -echo ~g {getcurdirectory 1}
+- -echo ~l {getcurdirectory 0}
+- -echo ~p {putcurdirectory}
++ \-echo ~g {getcurdirectory 1}
++ \-echo ~l {getcurdirectory 0}
++ \-echo ~p {putcurdirectory}
+ }
+
+ .fi
+@@ -1316,11 +1316,11 @@
+ .nf
+
+ proc lognumber {} {
+- interact -nobuffer -re "(.*)\\r" return
++ interact \-nobuffer \-re "(.*)\\r" return
+ puts $log "[clock format [clock seconds]]: dialed $interact_out(1,string)"
+ }
+
+- interact -nobuffer "atd" lognumber
++ interact \-nobuffer "atd" lognumber
+
+ .fi
+ .IP
+@@ -1391,7 +1391,7 @@
+ command, except that any_spawn_id is not meaningful in
+ .BR interact .)
+ All following flags and
+-strings (or patterns) apply to this input until another -input flag appears.
++strings (or patterns) apply to this input until another \-input flag appears.
+ If no
+ .B \-input
+ appears,
+@@ -1429,7 +1429,7 @@
+ It is possible to change the processes that are being interacted with
+ by using indirect spawn ids. (Indirect spawn ids are described in the
+ section on the expect command.) Indirect spawn ids may be specified
+-with the -i, -u, -input, or -output flags.
++with the \-i, \-u, \-input, or \-output flags.
+ .TP
+ .B interpreter " [args]"
+ causes the user to be interactively prompted for
+@@ -1515,18 +1515,18 @@
+ flag.
+
+ The
+-.B -info
++.B \-info
+ flag causes log_file to return a description of the
+ most recent non-info arguments given.
+ .TP
+-.BI log_user " -info|0|1"
++.BI log_user " \-info|0|1"
+ By default, the send/expect dialogue is logged to stdout
+ (and a logfile if open).
+ The logging to stdout is disabled by the command "log_user 0"
+ and reenabled by "log_user 1". Logging to the logfile is unchanged.
+
+ The
+-.B -info
++.B \-info
+ flag causes log_user to return a description of the
+ most recent non-info arguments given.
+ .TP
+@@ -1647,7 +1647,7 @@
+ Any string can be preceded by "\-\-" whether or not it actually looks
+ like a flag. This provides a reliable mechanism to specify variable strings
+ without being tripped up by those that accidentally look like flags.
+-(All strings starting with "-" are reserved for future options.)
++(All strings starting with "\-" are reserved for future options.)
+
+ The
+ .B \-i
+@@ -1671,7 +1671,7 @@
+ The
+ .B \-break
+ flag generates a break condition. This only makes sense if the spawn
+-id refers to a tty device opened via "spawn -open". If you have
++id refers to a tty device opened via "spawn \-open". If you have
+ spawned a process such as tip, you should use tip's convention for
+ generating a break.
+
+@@ -1774,7 +1774,7 @@
+ except that the output is sent to stderr rather than the current
+ process.
+ .TP
+-.BI send_log " [\--] string"
++.BI send_log " [\-\-] string"
+ is like
+ .BR send ,
+ except that the string is only sent to the log file (see
+@@ -1951,7 +1951,7 @@
+ The variable
+ .I spawn_out(slave,fd)
+ is set to a file identifier corresponding to the pty slave.
+-It can be closed using "close -slave".
++It can be closed using "close \-slave".
+
+ The
+ .B \-ignore
+@@ -1978,7 +1978,7 @@
+ .fi
+
+ The
+-.B -info
++.B \-info
+ flag causes strace to return a description of the
+ most recent non-info arguments given.
+ .TP
+@@ -2018,7 +2018,7 @@
+
+ stty \-echo
+ send_user "Password: "
+- expect_user -re "(.*)\\n"
++ expect_user \-re "(.*)\\n"
+ set password $expect_out(1,string)
+ stty echo
+
+@@ -2153,7 +2153,7 @@
+ trap exit {SIGINT SIGTERM}
+
+ .fi
+-If you use the -D flag to start the debugger, SIGINT is redefined
++If you use the \-D flag to start the debugger, SIGINT is redefined
+ to start the interactive debugger. This is due to the following trap:
+ .nf
+
+@@ -2194,9 +2194,9 @@
+ normally returns a list of four integers.
+ The first integer is the pid of the process that was waited upon.
+ The second integer is the corresponding spawn id.
+-The third integer is -1 if an operating system error occurred, or 0 otherwise.
++The third integer is \-1 if an operating system error occurred, or 0 otherwise.
+ If the third integer was 0, the fourth integer is the status returned by
+-the spawned process. If the third integer was -1, the fourth integer is
++the spawned process. If the third integer was \-1, the fourth integer is
+ the value of errno set by the operating system. The global variable
+ errorCode is also set.
+
+@@ -2212,7 +2212,7 @@
+ flag declares the process to wait corresponding to the named spawn_id
+ (NOT the process id).
+ Inside a SIGCHLD handler,
+-it is possible to wait for any spawned process by using the spawn id -1.
++it is possible to wait for any spawned process by using the spawn id \-1.
+
+ The
+ .B \-nowait
+@@ -2223,7 +2223,7 @@
+ The
+ .B wait
+ command may also be used wait for a forked process using the arguments
+-"-i -1". Unlike its use with spawned processes, this command can be
++"\-i \-1". Unlike its use with spawned processes, this command can be
+ executed at any time. There is no control over which process is
+ reaped. However, the return value can be checked for the process id.
+
+@@ -2374,7 +2374,7 @@
+ .nf
+
+ set env(SHELL) /bin/sh
+- set env(HOME) /usr/local/bin
++ set env(HOME) /usr/bin
+
+ .fi
+
+@@ -2427,7 +2427,7 @@
+ to set a flag in the trap code. Then check the flag immediately after
+ the command (i.e., sleep).
+
+-The expect_background command ignores -timeout arguments and has no
++The expect_background command ignores \-timeout arguments and has no
+ concept of timeouts in general.
+
+ .SH "EXPECT HINTS"
+@@ -2449,7 +2449,7 @@
+ set prompt "(%|#|\\\\$) $" ;# default prompt
+ catch {set prompt $env(EXPECT_PROMPT)}
+
+- expect -re $prompt
++ expect \-re $prompt
+
+ .fi
+ I encourage you to write
diff --git a/main/expect/12-fdout.patch b/main/expect/12-fdout.patch
new file mode 100644
index 0000000000..0942819ad1
--- /dev/null
+++ b/main/expect/12-fdout.patch
@@ -0,0 +1,22 @@
+Author: Ian Jackson <iwj@ubuntu.com>
+Description: expBusy forgets to open fdout (Closes: #440818).
+
+--- a/exp_command.c
++++ b/exp_command.c
+@@ -315,7 +315,15 @@
+ fcntl(x,F_DUPFD,esPtr->fdin);
+ close(x);
+ }
+- expCloseOnExec(esPtr->fdin);
++ if (esPtr->fdout != EXP_NOFD &&
++ esPtr->fdout != esPtr->fdin) {
++ fcntl(esPtr->fdin,F_DUPFD,esPtr->fdout);
++ }
++ if (esPtr->fdin > 2)
++ expCloseOnExec(esPtr->fdin);
++ if (esPtr->fdout != EXP_NOFD &&
++ esPtr->fdout > 2)
++ expCloseOnExec(esPtr->fdout);
+ esPtr->fdBusy = TRUE;
+ }
+
diff --git a/main/expect/22-segfault-with-stubs.patch b/main/expect/22-segfault-with-stubs.patch
new file mode 100644
index 0000000000..3fd825575b
--- /dev/null
+++ b/main/expect/22-segfault-with-stubs.patch
@@ -0,0 +1,71 @@
+Author: Sergei Golovan <sgolovan@debian.org>
+Description: This dirty hack fixes segfaults if Tcl is built with stubs
+ and Expect is used directly from C program.
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=588817
+Example:
+ #include <stdio.h>
+ #include <tcl8.5/expect.h>
+ int main()
+ {
+ FILE *pipe;
+ char *some_command = "uname";
+ char datum;
+ pipe = exp_popen(some_command);
+ if (pipe == NULL) return 1;
+ while ((datum = getc (pipe)) != EOF)
+ printf("%c",datum);
+ }
+Example:
+ #include <stdio.h>
+ #include "expect.h"
+ main()
+ {
+ int fd = 0;
+ fd = exp_spawnl("echo", "echo", "Hello User: Whats up?", (char*) 0);
+ switch (exp_expectl(fd, exp_regexp, "ser:", 1, exp_end)) {
+ case 1: {
+ printf("GOT ser:\n");
+ break;
+ }
+ default: {
+ printf("DEFAULT\n");
+ return 1;
+ }
+ }
+ printf("Normal Exit\n");
+ return 0;
+ }
+
+--- a/exp_clib.c
++++ b/exp_clib.c
+@@ -117,7 +117,11 @@
+ #include <stdlib.h> /* for malloc */
+ #endif
+
+-#include <tcl.h>
++#define ckalloc(x) Tcl_Alloc(x)
++#define ckfree(x) Tcl_Free(x)
++extern char *Tcl_ErrnoMsg(int err);
++extern char *Tcl_Alloc(unsigned int size);
++extern void Tcl_Free(char *ptr);
+ #include "expect.h"
+ #define TclRegError exp_TclRegError
+
+@@ -392,7 +396,7 @@
+ FAIL("regexp too big");
+
+ /* Allocate space. */
+- r = (regexp *)ckalloc(sizeof(regexp) + (unsigned)rcstate->regsize);
++ r = (regexp *)malloc(sizeof(regexp) + (unsigned)rcstate->regsize);
+ if (r == NULL)
+ FAIL("out of space");
+
+@@ -402,7 +406,7 @@
+ rcstate->regcode = r->program;
+ regc(MAGIC, rcstate);
+ if (reg(0, &flags, rcstate) == NULL) {
+- ckfree ((char*) r);
++ free ((char*) r);
+ return(NULL);
+ }
+
diff --git a/main/expect/24-format.patch b/main/expect/24-format.patch
new file mode 100644
index 0000000000..477b7a3e02
--- /dev/null
+++ b/main/expect/24-format.patch
@@ -0,0 +1,24 @@
+--- a/exp_clib.c
++++ b/exp_clib.c
+@@ -1483,8 +1483,8 @@
+ char *str;
+ {
+ if (exp_is_debugging) {
+- fprintf(stderr,str);
+- if (exp_logfile) fprintf(exp_logfile,str);
++ fprintf(stderr,"%s",str);
++ if (exp_logfile) fprintf(exp_logfile,"%s",str);
+ }
+ }
+
+--- a/exp_command.c
++++ b/exp_command.c
+@@ -995,7 +995,7 @@
+
+ exp_slave_control(master,1);
+
+- sprintf(value,"%d",esPtr->fd_slave);
++ sprintf(value,"%ld",esPtr->fd_slave);
+ Tcl_SetVar2(interp,SPAWN_OUT,"slave,fd",value,0);
+ }
+ Tcl_SetObjResult (interp, Tcl_NewIntObj (EXP_NOPID));
diff --git a/main/expect/APKBUILD b/main/expect/APKBUILD
index ffe48ea449..a365fdba6d 100644
--- a/main/expect/APKBUILD
+++ b/main/expect/APKBUILD
@@ -2,14 +2,22 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=expect
pkgver=5.45.4
-pkgrel=0
+pkgrel=2
pkgdesc="A tool for automating interactive applications"
-url="http://www.nist.gov/el/msid/expect.cfm"
+url="https://core.tcl-lang.org/expect/index"
arch="all"
-license="custom"
+# http://expect.sourceforge.net/FAQ.html#q6
+license="NIST-PD"
makedepends="tcl-dev"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://downloads.sourceforge.net/project/expect/Expect/$pkgver/$pkgname$pkgver.tar.gz"
+source="https://downloads.sourceforge.net/project/expect/Expect/$pkgver/$pkgname$pkgver.tar.gz
+ 07-file-handle.patch
+ 09-unsafe-traps.patch
+ 10-manpage.patch
+ 12-fdout.patch
+ 22-segfault-with-stubs.patch
+ 24-format.patch
+"
builddir="$srcdir"/$pkgname$pkgver
prepare() {
@@ -43,4 +51,12 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a expect5.45.4.tar.gz"
+sha512sums="
+a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a expect5.45.4.tar.gz
+ccdff94648a732cfb12cb079e37449913579b536d43f46a1e95687c3be8d4ce84b01be6748b34b59a4b4bf1cbc755de96f8f7882d5bc5c9a704cb5ef3103836f 07-file-handle.patch
+e8a3c4c6d634c135e1f3b7ccfb543281fdbaa83870670ff87bdd0aaf07c803f79353b512e49b311ecd8f701c9e2d0d3e2994a3d5b344cdd6f0220d92fc1cea7d 09-unsafe-traps.patch
+f7760ba5ce60659cce4d64beaf3cf50ecd6a8af7714b704bbd08ba970e0883b0eb7ddfd83522f21bf1bbe86cdbe26d70d4517f9d58030128c2a311e6d18c6b30 10-manpage.patch
+8675a93f3344e4eeb5024faa487bdcdfb0bc8ec86ed0abcf5612e130e346b35f7d9bf7d601714cc6acb32ccc77ecc309e51e39e0a0ad17f0a3ceeacc5031f6ce 12-fdout.patch
+f4c7789feea3eae471c988d7c78ce78da1bd4ab765d142e7fce5a7a2a92e887310ba571ea2a010110f7e0859102fadfb56b2b7e1638c52586657299e6e332c91 22-segfault-with-stubs.patch
+38b542330d26ca0dade87bfad20f71f7411fc2951d4d53706f938f83a862ed4868990bc24bdbffb09c9591cca22cca913e073605216311a36a008550c00b1b78 24-format.patch
+"
diff --git a/main/fail2ban/APKBUILD b/main/fail2ban/APKBUILD
index 2ccd0932ae..321f717925 100644
--- a/main/fail2ban/APKBUILD
+++ b/main/fail2ban/APKBUILD
@@ -6,12 +6,13 @@ pkgver=0.11.2
pkgrel=0
pkgdesc="Scans log files for login failures then updates iptables to reject originating ip address"
url="https://www.fail2ban.org/"
-arch="" # Tests fail on the builders
+arch="noarch"
license="GPL-2.0-or-later"
depends="python3 iptables ip6tables logrotate"
makedepends="python3-dev py3-setuptools bash"
-subpackages="$pkgname-doc $pkgname-openrc"
+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
fail2ban.confd
fail2ban.logrotate
alpine-ssh.jaild
@@ -49,11 +50,28 @@ package() {
install -Dm644 -t "$pkgdir"/usr/share/man/man1 man/*.1
install -Dm644 -t "$pkgdir"/usr/share/man/man5 man/*.5
+
+ # TODO: Create paths-alpine.conf and remove paths-debian.conf.
+ find "$pkgdir"/etc/fail2ban/ -name 'paths-*.conf' \
+ -a ! -name 'paths-common.conf' \
+ -a ! -name 'paths-debian.conf' \
+ -delete
+}
+
+tests() {
+ pkgdesc="Fail2ban test cases"
+ depends="$pkgname=$pkgver-r$pkgrel"
+
+ amove usr/bin/fail2ban-testcases
+ amove usr/lib/python3.*/site-packages/fail2ban/tests
}
-sha512sums="46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97 fail2ban-0.11.2.tar.gz
+sha512sums="
+46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97 fail2ban-0.11.2.tar.gz
+5c0748c048031d88bc8fd2519bf99a35437b78a08fa942dbccdd2c0e4e9125560a847a8f1dc4414691c922dff558acff988492250be6a1f443a139b0e3762898 fail2ban-747d468-fix-tests.patch
1e7581dd04e7777d6fd5c40cc842a7ec5f4e6a0374673d020d89dd61bf4093d48934844bee89bcac9084f9ae44f3beb66e714cf3c2763d79c3e8feb790c5e43b fail2ban.confd
ee1c229db970239ebc707cd484a650fcf2347c70b411728ee2a4a35a72f4118cfccecf2a221275603320e0332efcc16e4979201933cec1aef1c5d5a082fc4940 fail2ban.logrotate
84915967ae1276f1e14a5813680ee2ebf081af1ff452a688ae5f9ac3363f4aff90e39f8e6456b5c33d5699917d28a16308797095fd1ef9bb1fbcb46d4cea3def alpine-ssh.jaild
3e8e08d5e349e857b51ce34a9d968f16661b34e1cec06bec0aa9a32723bbe9be5a9890dd479331a9cc860821d33b1bf3b8e995182e319dead5a3d434b1816304 alpine-sshd.filterd
-36a81b771be0b36fe0dfb5ee4c72c9cb5b504e110618a8eb6f0f241b4e57d92df01dc5cc04b6b68d5bc6a5e6d68de1000092770285d7a328e5937e50b4b226a3 alpine-sshd-ddos.filterd"
+36a81b771be0b36fe0dfb5ee4c72c9cb5b504e110618a8eb6f0f241b4e57d92df01dc5cc04b6b68d5bc6a5e6d68de1000092770285d7a328e5937e50b4b226a3 alpine-sshd-ddos.filterd
+"
diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD
index 8a9b0497ba..c524529040 100644
--- a/main/fakeroot/APKBUILD
+++ b/main/fakeroot/APKBUILD
@@ -11,7 +11,7 @@ makedepends_build="libtool autoconf automake po4a"
makedepends_host="libcap-dev acl-dev linux-headers"
makedepends="$makedepends_build $makedepends_host"
subpackages="$pkgname-dbg $pkgname-doc"
-source="http://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_$pkgver.orig.tar.gz
+source="https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_$pkgver.orig.tar.gz
fakeroot-no64.patch
fakeroot-stdint.patch
xstatjunk.patch
diff --git a/main/fftw/APKBUILD b/main/fftw/APKBUILD
index b58a73259e..0448459398 100644
--- a/main/fftw/APKBUILD
+++ b/main/fftw/APKBUILD
@@ -1,7 +1,7 @@
# Contributor:
# Maintainer:
pkgname=fftw
-pkgver=3.3.9
+pkgver=3.3.10
_pkgver=${pkgver//p/-pl}
pkgrel=0
pkgdesc="Discrete Fourier transform (DFT) library"
@@ -98,5 +98,7 @@ long_double() {
"$subpkgdir"/usr/lib/
}
-sha512sums="52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf fftw-3.3.9.tar.gz
-7da269fc43dabd02ae6fad2ebad92b07e06825b6b7c6f8987fc6444f02e0d55080db4ba6e401760e071f5c33015faf8c710f643636cab7a79bdf1af5d434dbb4 cycle.h.patch"
+sha512sums="
+2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40 fftw-3.3.10.tar.gz
+7da269fc43dabd02ae6fad2ebad92b07e06825b6b7c6f8987fc6444f02e0d55080db4ba6e401760e071f5c33015faf8c710f643636cab7a79bdf1af5d434dbb4 cycle.h.patch
+"
diff --git a/main/fish/APKBUILD b/main/fish/APKBUILD
index 28bf2f0c84..2824b76eef 100644
--- a/main/fish/APKBUILD
+++ b/main/fish/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=fish
-pkgver=3.2.2
+pkgver=3.3.1
pkgrel=1
pkgdesc="Modern interactive commandline shell"
url="https://fishshell.com/"
@@ -10,7 +10,7 @@ license="GPL-2.0-only"
depends="bc"
depends_doc="util-linux" # Requires 'ul' program
depends_dev="$pkgname-tools"
-makedepends="cmake doxygen ncurses-dev ncurses pcre2-dev"
+makedepends="cmake doxygen ncurses-dev ncurses pcre2-dev py3-sphinx"
checkdepends="py3-pexpect bash"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools::noarch"
@@ -18,28 +18,28 @@ source="https://github.com/fish-shell/fish-shell/releases/download/$pkgver/fish-
README.alpine
"
+# temp allow textrels on riscv64
+[ "$CARCH" = "riscv64" ] && options="$options textrels"