aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/abuild/APKBUILD11
-rw-r--r--main/acf-amavisd-new/APKBUILD2
-rw-r--r--main/acf-ipsec-tools/APKBUILD17
-rw-r--r--main/ack/APKBUILD4
-rw-r--r--main/acpica/APKBUILD6
-rw-r--r--main/alpine-base/APKBUILD2
-rw-r--r--main/alpine-baselayout/APKBUILD7
-rw-r--r--main/alpine-mirrors/APKBUILD45
-rw-r--r--main/alpine-mirrors/mirrors.yaml143
-rw-r--r--main/alsa-lib/APKBUILD8
-rw-r--r--main/alsa-utils/APKBUILD4
-rw-r--r--main/amavis/APKBUILD2
-rw-r--r--main/amavisd-milter/APKBUILD16
-rw-r--r--main/ansible/APKBUILD9
-rw-r--r--main/apache2/APKBUILD8
-rw-r--r--main/apk-tools/APKBUILD5
-rw-r--r--main/arpon/APKBUILD2
-rw-r--r--main/arpwatch/APKBUILD27
-rw-r--r--main/asciidoc/APKBUILD31
-rw-r--r--main/asciidoc/asciidoc-python3-a2x-decode-fix.patch41
-rw-r--r--main/asciidoc/asciidoc-python3-deprecation-warning.patch173
-rw-r--r--main/asciidoc/asciidoc-python3.patch40
-rw-r--r--main/asterisk/10-musl-mutex-init.patch (renamed from main/asterisk/musl-mutex-init.patch)2
-rw-r--r--main/asterisk/20-musl-astmm-fix.patch (renamed from main/asterisk/musl-astmm-fix.patch)2
-rw-r--r--main/asterisk/30-asterisk-mariadb.patch (renamed from main/asterisk/asterisk-mariadb.patch)2
-rw-r--r--main/asterisk/40-asterisk-cdefs.patch22
-rw-r--r--main/asterisk/APKBUILD129
-rw-r--r--main/avfs/APKBUILD4
-rw-r--r--main/awall/APKBUILD21
-rw-r--r--main/axel/APKBUILD8
-rw-r--r--main/bacula/APKBUILD17
-rw-r--r--main/bash-completion/APKBUILD9
-rw-r--r--main/bash/APKBUILD5
-rw-r--r--main/bats/APKBUILD4
-rw-r--r--main/bctoolbox/APKBUILD4
-rw-r--r--main/bind/APKBUILD23
-rw-r--r--main/bison/APKBUILD4
-rw-r--r--main/bmd-tools/APKBUILD18
-rw-r--r--main/bridge-utils/APKBUILD14
-rw-r--r--main/btrfs-progs/APKBUILD4
-rw-r--r--main/busybox/0001-Revert-ash-jobs-Only-clear-gotsigchld-when-waiting-f.patch212
-rw-r--r--main/busybox/0001-ln-no-target-directory-implies-no-dereference.patch66
-rw-r--r--main/busybox/0001-properly-fix-wget-https-support.patch14
-rw-r--r--main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch12
-rw-r--r--main/busybox/0006-ping-make-ping-work-without-root-privileges.patch38
-rw-r--r--main/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch10
-rw-r--r--main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch22
-rw-r--r--main/busybox/0013-testsuite-fix-cpio-tests.patch79
-rw-r--r--main/busybox/APKBUILD35
-rw-r--r--main/busybox/busybox-bc.patch11
-rw-r--r--main/busybox/busyboxconfig15
-rw-r--r--main/busybox/busyboxconfig-extras11
-rw-r--r--main/busybox/default.script2
-rw-r--r--main/busybox/nslookup.patch176
-rw-r--r--main/ca-certificates/APKBUILD8
-rw-r--r--main/ca-certificates/ca-certificates.post-deinstall5
-rw-r--r--main/ccache/APKBUILD5
-rw-r--r--main/cciss_vol_status/APKBUILD13
-rw-r--r--main/checkbashisms/APKBUILD4
-rw-r--r--main/cjdns/0001-seccomp-handle-__NR_clock_gettime64-when-appropriate.patch31
-rw-r--r--main/cjdns/APKBUILD11
-rw-r--r--main/ckbcomp/APKBUILD6
-rw-r--r--main/clamav/APKBUILD13
-rwxr-xr-xmain/clamav/clamd.initd7
-rw-r--r--main/clamav/freshclam.initd5
-rw-r--r--main/clang/APKBUILD24
-rw-r--r--main/cmake/APKBUILD16
-rw-r--r--main/compiler-rt/APKBUILD6
-rw-r--r--main/confuse/APKBUILD6
-rw-r--r--main/conky/APKBUILD11
-rw-r--r--main/coova-chilli/APKBUILD10
-rw-r--r--main/cracklib/APKBUILD2
-rw-r--r--main/cracklib/cracklib.trigger2
-rw-r--r--main/cups/APKBUILD3
-rw-r--r--main/curl/APKBUILD12
-rw-r--r--main/cvechecker/APKBUILD15
-rw-r--r--main/cyrus-sasl/APKBUILD7
-rw-r--r--main/cython/APKBUILD4
-rw-r--r--main/dahdi-linux-lts/APKBUILD4
-rw-r--r--main/datefudge/APKBUILD6
-rw-r--r--main/datefudge/musl.patch11
-rw-r--r--main/dbus/APKBUILD8
-rw-r--r--main/dmvpn/APKBUILD12
-rw-r--r--main/dnsmasq/APKBUILD6
-rw-r--r--main/dnstop/APKBUILD4
-rw-r--r--main/doxygen/APKBUILD6
-rw-r--r--main/doxygen/doxygen-1.8.14-install.patch30
-rw-r--r--main/dpkg/APKBUILD6
-rw-r--r--main/drbd-lts/APKBUILD4
-rw-r--r--main/dropbear/APKBUILD14
-rw-r--r--main/elfutils/APKBUILD7
-rw-r--r--main/ell/APKBUILD4
-rw-r--r--main/espeak/APKBUILD10
-rw-r--r--main/ethtool/APKBUILD6
-rw-r--r--main/execline/APKBUILD4
-rw-r--r--main/fail2ban/0001-amend-to-f3dbc9dda10e52610e3de26f538b5581fd905505-ch.patch92
-rw-r--r--main/fail2ban/APKBUILD6
-rw-r--r--main/fail2ban/fail2ban.logrotate2
-rw-r--r--main/fcgiwrap/APKBUILD6
-rw-r--r--main/fcgiwrap/fcgiwrap.initd1
-rw-r--r--main/fcgiwrap/fcgiwrap.pre-install2
-rw-r--r--main/fetchmail/APKBUILD6
-rw-r--r--main/file/APKBUILD4
-rw-r--r--main/fish/APKBUILD5
-rw-r--r--main/flite/APKBUILD10
-rw-r--r--main/font-misc-ethiopic/APKBUILD33
-rw-r--r--main/fontconfig/APKBUILD15
-rw-r--r--main/fping/APKBUILD10
-rw-r--r--main/freeswitch/APKBUILD8
-rw-r--r--main/freeswitch/modules.conf54
-rw-r--r--main/freetds/APKBUILD6
-rw-r--r--main/freetds/fix-includes.patch5
-rw-r--r--main/fribidi/APKBUILD4
-rw-r--r--main/fuse3/APKBUILD4
-rw-r--r--main/gcc/APKBUILD21
-rw-r--r--main/gcc/futex-time64.patch21
-rw-r--r--main/git/APKBUILD9
-rw-r--r--main/gitolite/APKBUILD4
-rw-r--r--main/glib/APKBUILD4
-rw-r--r--main/gnupg/APKBUILD4
-rw-r--r--main/gnutls/APKBUILD21
-rw-r--r--main/gnutls/_gnutls_pkcs11_verify_crt_status-check-validity-against-system-cert.patch219
-rw-r--r--main/gnutls/tests-add-test-case-for-certificate-chain-superseding.patch128
-rw-r--r--main/gnutls/x509-trigger-fallback-verification-path-when-cert-is-expired.patch41
-rw-r--r--main/goaccess/APKBUILD4
-rw-r--r--main/gobject-introspection/APKBUILD9
-rw-r--r--main/gobject-introspection/musl-time64.patch41
-rw-r--r--main/gphoto2/APKBUILD11
-rw-r--r--main/gphoto2/FlashpixVersion.patch18
-rw-r--r--main/gpsd/APKBUILD8
-rw-r--r--main/groff/APKBUILD6
-rw-r--r--main/grub/APKBUILD20
-rw-r--r--main/gtk+2.0/APKBUILD12
-rw-r--r--main/gtk+3.0/APKBUILD4
-rw-r--r--main/haproxy/APKBUILD9
-rw-r--r--main/harfbuzz/APKBUILD39
-rw-r--r--main/haveged/APKBUILD6
-rw-r--r--main/help2man/APKBUILD5
-rw-r--r--main/hostapd/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch150
-rw-r--r--main/hostapd/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch59
-rw-r--r--main/hostapd/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch47
-rw-r--r--main/hostapd/APKBUILD27
-rw-r--r--main/hwids/APKBUILD4
-rw-r--r--main/hylafaxplus/APKBUILD11
-rw-r--r--main/icecast/APKBUILD22
-rw-r--r--main/ifupdown-ng/APKBUILD37
-rw-r--r--main/imlib2/APKBUILD12
-rw-r--r--main/imlib2/fix-s390x.patch16
-rw-r--r--main/iperf3/APKBUILD6
-rw-r--r--main/iproute2/APKBUILD41
-rw-r--r--main/ipsec-tools/20-grekey-support.patch786
-rw-r--r--main/ipsec-tools/50-reverse-connect.patch197
-rw-r--r--main/ipsec-tools/70-defer-isakmp-ident-handling.patch179
-rw-r--r--main/ipsec-tools/75-racoonctl-rcvbuf.patch33
-rw-r--r--main/ipsec-tools/90-dead-on-initial-contact.patch11
-rw-r--r--main/ipsec-tools/APKBUILD75
-rw-r--r--main/ipsec-tools/disable-Werror.patch40
-rw-r--r--main/ipsec-tools/fix-yywrap.patch23
-rw-r--r--main/ipsec-tools/ipsec-tools-openssl-1.1.patch1085
-rw-r--r--main/ipsec-tools/musl-cdefs.patch156
-rw-r--r--main/ipsec-tools/racoon.confd20
-rw-r--r--main/ipsec-tools/racoon.initd60
-rw-r--r--main/iptables/APKBUILD6
-rw-r--r--main/ircii/APKBUILD6
-rw-r--r--main/irqbalance/APKBUILD10
-rw-r--r--main/json-c/APKBUILD13
-rw-r--r--main/kbd/0001-libkbdfile-Check-compression-suffix-even-if-the-suff.patch68
-rw-r--r--main/kbd/0001-libkeymap-Fix-the-compatibility-with-the-busybox-s-l.patch31
-rw-r--r--main/kbd/APKBUILD34
-rw-r--r--main/kbd/fix-tests.patch41
-rw-r--r--main/keyutils/APKBUILD8
-rw-r--r--main/knock/APKBUILD6
-rw-r--r--main/knot/APKBUILD4
-rw-r--r--main/lcms2/APKBUILD17
-rw-r--r--main/lcms2/CVE-2018-16435.patch169
-rw-r--r--main/ldb/APKBUILD8
-rw-r--r--main/lftp/APKBUILD4
-rw-r--r--main/libcap-ng/APKBUILD4
-rw-r--r--main/libcap-ng/async-safe-apply.patch29
-rw-r--r--main/libcap/APKBUILD19
-rw-r--r--main/libdnet/APKBUILD10
-rw-r--r--main/libeconf/APKBUILD27
-rw-r--r--main/libedit/APKBUILD6
-rw-r--r--main/libevdev/APKBUILD11
-rw-r--r--main/libevent/APKBUILD6
-rw-r--r--main/libgcrypt/APKBUILD4
-rw-r--r--main/libical/APKBUILD2
-rw-r--r--main/libinput/APKBUILD14
-rw-r--r--main/libjpeg-turbo/APKBUILD8
-rw-r--r--main/liblogging/APKBUILD4
-rw-r--r--main/libmaxminddb/APKBUILD15
-rw-r--r--main/libmnl/APKBUILD25
-rw-r--r--main/libmnl/musl-fix-headers.patch13
-rw-r--r--main/libnet/APKBUILD26
-rw-r--r--main/libnet/fix-includes.patch29
-rw-r--r--main/libnet/fix-types.patch15
-rw-r--r--main/libnftnl/APKBUILD4
-rw-r--r--main/librelp/APKBUILD6
-rw-r--r--main/libressl/APKBUILD4
-rw-r--r--main/libseccomp/APKBUILD15
-rw-r--r--main/libseccomp/fix-performace-regression.patch361
-rw-r--r--main/libva-glx/APKBUILD4
-rw-r--r--main/libva/APKBUILD4
-rw-r--r--main/libvirt/APKBUILD38
-rw-r--r--main/libvirt/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch35
-rw-r--r--main/libvirt/libvirt-fork-exec-deadlock.patch263
-rw-r--r--main/libvirt/libvirt-guests.confd68
-rw-r--r--main/libvirt/libvirt-guests.initd237
-rw-r--r--main/libvirt/libvirt.confd35
-rw-r--r--main/libvirt/libvirt.initd102
-rw-r--r--main/libvirt/virtlockd.initd7
-rw-r--r--main/libvirt/virtlogd.initd8
-rw-r--r--main/libvorbis/APKBUILD17
-rw-r--r--main/libvorbis/CVE-2017-14160.patch58
-rw-r--r--main/libvorbis/CVE-2018-10392.patch25
-rw-r--r--main/libvorbis/CVE-2018-10393.patch27
-rw-r--r--main/libx11/APKBUILD6
-rw-r--r--main/links/APKBUILD6
-rw-r--r--main/linux-firmware/APKBUILD4
-rw-r--r--main/linux-headers/APKBUILD10
-rw-r--r--main/linux-headers/include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch19
-rw-r--r--main/linux-lts/0001-arm64-dts-lx2160a-add-lx2160acex7-device-tree-build.patch25
-rw-r--r--main/linux-lts/0001-arm64-dts-lx2160a-add-mdio-device-tree-nodes.patch48
-rw-r--r--main/linux-lts/0002-arm64-dts-lx2160a-add-lx2160acex7-device-tree.patch223
-rw-r--r--main/linux-lts/0005-arm64-dts-lx2160a-cex7-add-ltc3882-support.patch37
-rw-r--r--main/linux-lts/0006-arm64-dts-lx2160a-cex7-add-on-module-eeproms.patch52
-rw-r--r--main/linux-lts/0007-pci-hotplug-declare-IDT-bridge-as-hotpluggabl-bridge.patch25
-rw-r--r--main/linux-lts/0008-pci-spr2803-quirk-to-fix-class-ID.patch39
-rw-r--r--main/linux-lts/APKBUILD47
-rw-r--r--main/linux-lts/config-lts.aarch64126
-rw-r--r--main/linux-lts/config-lts.armv737
-rw-r--r--main/linux-lts/config-lts.mips2
-rw-r--r--main/linux-lts/config-lts.mips642
-rw-r--r--main/linux-lts/config-lts.ppc64le9
-rw-r--r--main/linux-lts/config-lts.s390x5
-rw-r--r--main/linux-lts/config-lts.x8611
-rw-r--r--main/linux-lts/config-lts.x86_6472
-rw-r--r--main/linux-lts/config-virt.aarch6411
-rw-r--r--main/linux-lts/config-virt.armv79
-rw-r--r--main/linux-lts/config-virt.ppc64le4424
-rw-r--r--main/linux-lts/config-virt.x869
-rw-r--r--main/linux-lts/config-virt.x86_6411
-rw-r--r--main/linux-octeon/APKBUILD8
-rw-r--r--main/linux-octeon/config-octeon.mips6470
-rw-r--r--main/linux-octeon/kvm-fallthrough.patch13
-rw-r--r--main/linux-rpi/APKBUILD6
-rw-r--r--main/llvm10/APKBUILD15
-rw-r--r--main/lm-sensors/APKBUILD4
-rw-r--r--main/lmdb/APKBUILD28
-rw-r--r--main/lmdb/lmdb.pc11
-rw-r--r--main/logrotate/APKBUILD4
-rw-r--r--main/lttng-ust/APKBUILD28
-rw-r--r--main/lua-discount/APKBUILD8
-rw-r--r--main/lua-evdev/APKBUILD6
-rw-r--r--main/lua-evdev/time64.patch12
-rw-r--r--main/lua-lyaml/APKBUILD2
-rw-r--r--main/lua-ossl/APKBUILD6
-rw-r--r--main/lua-rex/APKBUILD31
-rw-r--r--main/luajit/10-module-paths.patch (renamed from main/luajit/module-paths.patch)0
-rw-r--r--main/luajit/20-src-lib_string.patch30
-rw-r--r--main/luajit/APKBUILD22
-rw-r--r--main/lutok/APKBUILD12
-rw-r--r--main/lvm2/APKBUILD27
-rw-r--r--main/lxc/APKBUILD4
-rw-r--r--main/man-pages/APKBUILD6
-rw-r--r--main/mariadb-connector-c/APKBUILD11
-rw-r--r--main/mariadb-connector-c/fix-ucontext-header.patch11
-rw-r--r--main/mc/APKBUILD8
-rw-r--r--main/mercurial/APKBUILD4
-rw-r--r--main/mesa/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch37
-rw-r--r--main/mesa/APKBUILD17
-rw-r--r--main/mesa/add-use-elf-tls.patch16
-rw-r--r--main/mesa/missing-dep-on-sha1_h.patch13
-rw-r--r--main/mesa/time_h.patch12
-rw-r--r--main/meson/APKBUILD4
-rw-r--r--main/mg/APKBUILD4
-rw-r--r--main/mini_httpd/APKBUILD4
-rw-r--r--main/monit/APKBUILD9
-rw-r--r--main/mosquitto/APKBUILD6
-rw-r--r--main/mpg123/APKBUILD5
-rw-r--r--main/msmtp/APKBUILD45
-rw-r--r--main/msmtp/msmtp.confd5
-rwxr-xr-xmain/msmtp/msmtp.initd10
-rw-r--r--main/musl/0001-add-thumb2-support-to-arm-assembler-memcpy.patch68
-rw-r--r--main/musl/APKBUILD36
-rw-r--r--main/musl/add-missing-case-mapping-between-U-03F3-and-U-037F.patch27
-rw-r--r--main/musl/dont-use-threads-minus-1-for-skipping-locks.patch70
-rw-r--r--main/musl/fix-cacosh-results-for-arguments-with-negative-imagi.patch60
-rw-r--r--main/musl/fix-errno-for-posix_openpt-with-no-free-ptys-availab.patch28
-rw-r--r--main/musl/fix-incorrect-results-for-catanf-and-catanl-with-som.patch87
-rw-r--r--main/musl/fix-remaining-direct-use-of-stat-syscalls-outside.patch118
-rw-r--r--main/musl/fix-return-value-of-ungetc-when-argument-is-outside-.patch31
-rw-r--r--main/musl/fix-wcwidth-wrongly-returning-0-for-most-of-planes-4.patch28
-rw-r--r--main/musl/handle-aux-at_base.patch3
-rw-r--r--main/musl/improve-strerror-speed.patch101
-rw-r--r--main/musl/ppc-pt_regs.patch38
-rw-r--r--main/musl/ppc64-fpregset_t.patch31
-rw-r--r--main/musl/set-AD-bit-in-dns-queries-suppress-for-internal-use.patch67
-rw-r--r--main/nagios/APKBUILD39
-rw-r--r--main/nano/APKBUILD6
-rw-r--r--main/ncdu/APKBUILD5
-rw-r--r--main/ncurses/APKBUILD4
-rw-r--r--main/neon/APKBUILD4
-rw-r--r--main/nfdump/APKBUILD4
-rw-r--r--main/nfs-utils/APKBUILD6
-rw-r--r--main/nfs-utils/musl-time64.patch51
-rw-r--r--main/nftables/APKBUILD6
-rw-r--r--main/nghttp2/APKBUILD8
-rw-r--r--main/nginx/APKBUILD48
-rw-r--r--main/ngircd/APKBUILD10
-rw-r--r--main/ngrep/APKBUILD12
-rw-r--r--main/nodejs/APKBUILD10
-rw-r--r--main/nsd/APKBUILD4
-rw-r--r--main/nspr/APKBUILD4
-rw-r--r--main/nss/APKBUILD42
-rw-r--r--main/oidentd/APKBUILD6
-rw-r--r--main/open-iscsi/APKBUILD6
-rw-r--r--main/openldap/APKBUILD4
-rw-r--r--main/openrc/APKBUILD4
-rw-r--r--main/openrc/firstboot.initd2
-rw-r--r--main/openresolv/APKBUILD6
-rw-r--r--main/opensmtpd/APKBUILD6
-rw-r--r--main/openssl/APKBUILD5
-rw-r--r--main/openssl/ppc64.patch96
-rw-r--r--main/opus/APKBUILD17
-rw-r--r--main/ortp/APKBUILD4
-rw-r--r--main/pango/APKBUILD27
-rw-r--r--main/pango/fix-include-hb.patch39
-rw-r--r--main/parallel/APKBUILD4
-rw-r--r--main/patch/APKBUILD1
-rw-r--r--main/patchutils/APKBUILD33
-rw-r--r--main/pcsc-lite/APKBUILD4
-rw-r--r--main/perl-cgi/APKBUILD4
-rw-r--r--main/perl-compress-raw-bzip2/APKBUILD6
-rw-r--r--main/perl-compress-raw-zlib/APKBUILD12
-rw-r--r--main/perl-crypt-rijndael/APKBUILD9
-rw-r--r--main/perl-crypt-rijndael/use-stdint.patch18
-rw-r--r--main/perl-db/APKBUILD2
-rw-r--r--main/perl-dbd-pg/APKBUILD4
-rw-r--r--main/perl-dbix-searchbuilder/APKBUILD12
-rw-r--r--main/perl-encode/APKBUILD4
-rw-r--r--main/perl-file-slurp/APKBUILD5
-rw-r--r--main/perl-gd/APKBUILD15
-rw-r--r--main/perl-html-mason-psgihandler/APKBUILD39
-rw-r--r--main/perl-http-daemon/APKBUILD4
-rw-r--r--main/perl-http-message/APKBUILD6
-rw-r--r--main/perl-io-async/APKBUILD6
-rw-r--r--main/perl-io-compress/APKBUILD4
-rw-r--r--main/perl-libwww/APKBUILD4
-rw-r--r--main/perl-log-dispatch/APKBUILD30
-rw-r--r--main/perl-mail-dkim/APKBUILD14
-rw-r--r--main/perl-metrics-any/APKBUILD35
-rw-r--r--main/perl-module-scandeps/APKBUILD22
-rw-r--r--main/perl-net-dns/APKBUILD4
-rw-r--r--main/perl-plack/APKBUILD42
-rw-r--r--main/perl-posix-strftime-compiler/APKBUILD2
-rw-r--r--main/perl-socket/APKBUILD11
-rw-r--r--main/perl-test-fatal/APKBUILD17
-rw-r--r--main/perl-test-metrics-any/APKBUILD34
-rw-r--r--main/perl-test-mockmodule/APKBUILD4
-rw-r--r--main/perl-test-simple/APKBUILD4
-rw-r--r--main/perl-test2-plugin-nowarnings/APKBUILD9
-rw-r--r--main/perl-test2-suite/APKBUILD4
-rw-r--r--main/perl-time-hires/APKBUILD11
-rw-r--r--main/perl-type-tiny/APKBUILD4
-rw-r--r--main/perl/APKBUILD6
-rw-r--r--main/pgtcl/APKBUILD4
-rw-r--r--main/pmacct/APKBUILD4
-rw-r--r--main/po4a/APKBUILD4
-rw-r--r--main/poppler/APKBUILD4
-rw-r--r--main/popt/APKBUILD29
-rw-r--r--main/postfix/APKBUILD6
-rw-r--r--main/postgresql-bdr/APKBUILD4
-rw-r--r--main/postgresql-bdr/postgresql-bdr.initd4
-rw-r--r--main/postgresql-pllua/APKBUILD11
-rw-r--r--main/postgrey/APKBUILD2
-rw-r--r--main/powertop/APKBUILD21
-rw-r--r--main/protobuf/APKBUILD4
-rw-r--r--main/putty/APKBUILD6
-rw-r--r--main/py3-asn1/APKBUILD16
-rw-r--r--main/py3-asn1crypto/APKBUILD10
-rw-r--r--main/py3-certifi/APKBUILD9
-rw-r--r--main/py3-cffi/APKBUILD8
-rw-r--r--main/py3-coverage/APKBUILD29
-rw-r--r--main/py3-distlib/APKBUILD15
-rw-r--r--main/py3-django-contact-form/APKBUILD25
-rw-r--r--main/py3-django-djblets/APKBUILD26
-rw-r--r--main/py3-django-extra-views/APKBUILD32
-rw-r--r--main/py3-django-haystack/APKBUILD29
-rw-r--r--main/py3-django-phonenumber-field/APKBUILD31
-rw-r--r--main/py3-django-pipeline/APKBUILD25
-rw-r--r--main/py3-django-registration/APKBUILD25
-rw-r--r--main/py3-django-sorl-thumbnail/APKBUILD30
-rw-r--r--main/py3-django-tables2/APKBUILD25
-rw-r--r--main/py3-django-treebeard/APKBUILD32
-rw-r--r--main/py3-django-widget-tweaks/APKBUILD29
-rw-r--r--main/py3-django/APKBUILD72
-rw-r--r--main/py3-dnspython/APKBUILD15
-rw-r--r--main/py3-docutils/APKBUILD23
-rw-r--r--main/py3-gobject3/APKBUILD7
-rw-r--r--main/py3-idna/APKBUILD4
-rw-r--r--main/py3-iniconfig/APKBUILD28
-rw-r--r--main/py3-markdown/APKBUILD32
-rw-r--r--main/py3-more-itertools/APKBUILD4
-rw-r--r--main/py3-ordered-set/APKBUILD4
-rw-r--r--main/py3-packaging/APKBUILD1
-rw-r--r--main/py3-parsing/APKBUILD5
-rw-r--r--main/py3-phonenumbers/APKBUILD4
-rw-r--r--main/py3-pillow/APKBUILD8
-rw-r--r--main/py3-py/APKBUILD10
-rw-r--r--main/py3-pycryptodome/APKBUILD4
-rw-r--r--main/py3-pytest/APKBUILD10
-rw-r--r--main/py3-requests/APKBUILD4
-rw-r--r--main/py3-setuptools/APKBUILD4
-rw-r--r--main/py3-simplejson/APKBUILD6
-rw-r--r--main/py3-sphinx/APKBUILD4
-rw-r--r--main/py3-tox/APKBUILD4
-rw-r--r--main/py3-urllib3/APKBUILD4
-rw-r--r--main/py3-virtualenv/APKBUILD4
-rw-r--r--main/py3-wcwidth/APKBUILD4
-rw-r--r--main/py3-yaml/APKBUILD3
-rw-r--r--main/python3/APKBUILD8
-rw-r--r--main/quagga/0001-nhrpd-change-ipsec-SA-count-to-32-bit.patch28
-rw-r--r--main/quagga/APKBUILD4
-rw-r--r--main/raspberrypi/APKBUILD4
-rw-r--r--main/rdiff-backup/APKBUILD4
-rw-r--r--main/redis/APKBUILD6
-rw-r--r--main/redis/sentinel.conf.patch2
-rw-r--r--main/rng-tools/APKBUILD4
-rw-r--r--main/rng-tools/stack.patch13
-rw-r--r--main/rp-pppoe/APKBUILD4
-rw-r--r--main/rpcsvc-proto/APKBUILD6
-rw-r--r--main/rsync/APKBUILD19
-rw-r--r--main/rsyslog/APKBUILD6
-rw-r--r--main/ruby/APKBUILD2
-rw-r--r--main/s6-linux-init/APKBUILD4
-rw-r--r--main/s6-portable-utils/APKBUILD4
-rw-r--r--main/s6-rc/APKBUILD6
-rw-r--r--main/s6/APKBUILD4
-rw-r--r--main/samba/APKBUILD15
-rw-r--r--main/samba/posix-bufferlen.patch172
-rw-r--r--main/sbsigntool/APKBUILD9
-rw-r--r--main/scdoc/APKBUILD31
-rw-r--r--main/screen/APKBUILD7
-rw-r--r--main/shorewall6/APKBUILD4
-rw-r--r--main/smokeping/APKBUILD3
-rw-r--r--main/sngtc_client/APKBUILD2
-rw-r--r--main/snmptt/APKBUILD18
-rw-r--r--main/spamassassin/APKBUILD2
-rw-r--r--main/spawn-fcgi/APKBUILD4
-rw-r--r--main/sqlite-tcl/APKBUILD4
-rw-r--r--main/sqlite/APKBUILD4
-rw-r--r--main/sqsh/APKBUILD31
-rw-r--r--main/sqsh/datetime.patch16
-rw-r--r--main/sqsh/freetds-1.2.patch25
-rw-r--r--main/squid/APKBUILD4
-rw-r--r--main/sshguard/APKBUILD18
-rw-r--r--main/sshguard/sshguard.confd25
-rw-r--r--main/sshguard/sshguard.initd26
-rw-r--r--main/strace/APKBUILD4
-rw-r--r--main/strongswan/0001-file-logger-Set-owner-group-of-log-file.patch62
-rw-r--r--main/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch104
-rw-r--r--main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch31
-rw-r--r--main/strongswan/APKBUILD18
-rw-r--r--main/sudo/APKBUILD8
-rw-r--r--main/sudo/SIGUNUSED.patch3
-rw-r--r--main/sudo/fix-cross-compile.patch3
-rw-r--r--main/swig/APKBUILD6
-rw-r--r--main/termrec/APKBUILD18
-rw-r--r--main/tftp-hpa/APKBUILD18
-rw-r--r--main/ttf-cantarell/APKBUILD29
-rw-r--r--main/ttf-droid/APKBUILD4
-rw-r--r--main/ttf-tlwg/APKBUILD19
-rw-r--r--main/txt2man/APKBUILD15
-rw-r--r--main/txt2man/makefile.patch10
-rw-r--r--main/u-boot/APKBUILD4
-rw-r--r--main/udev-init-scripts/0001-init.d-style-fixes.patch167
-rw-r--r--main/udev-init-scripts/0002-udev-settle-fix-timeout-argument-quoting.patch27
-rw-r--r--main/udev-init-scripts/0003-udev-settle-do-not-require-udev.patch31
-rw-r--r--main/udev-init-scripts/APKBUILD16
-rw-r--r--main/umurmur/APKBUILD42
-rw-r--r--main/umurmur/umurmur.confd1
-rw-r--r--main/unbound/APKBUILD10
-rw-r--r--main/unifont/APKBUILD4
-rw-r--r--main/unrar/APKBUILD4
-rw-r--r--main/util-linux/APKBUILD20
-rw-r--r--main/uvncrepeater/APKBUILD18
-rw-r--r--main/uwsgi/APKBUILD10
-rw-r--r--main/uwsgi/close-fd.patch28
-rw-r--r--main/vala/APKBUILD10
-rw-r--r--main/vala/fix-tests-with-musl-1.2.patch76
-rw-r--r--main/valgrind/APKBUILD6
-rw-r--r--main/vim/APKBUILD4
-rw-r--r--main/wpa_supplicant/APKBUILD6
-rw-r--r--main/wpa_supplicant/config4
-rw-r--r--main/wpa_supplicant/wpa_cli.initd9
-rw-r--r--main/xen/APKBUILD45
-rw-r--r--main/xen/qemu-xen-time64.patch43
-rw-r--r--main/xen/xsa317.patch50
-rw-r--r--main/xen/xsa319.patch27
-rw-r--r--main/xen/xsa320-4.13-1.patch117
-rw-r--r--main/xen/xsa320-4.13-2.patch179
-rw-r--r--main/xen/xsa321-4.13-1.patch31
-rw-r--r--main/xen/xsa321-4.13-2.patch175
-rw-r--r--main/xen/xsa321-4.13-3.patch82
-rw-r--r--main/xen/xsa321-4.13-4.patch36
-rw-r--r--main/xen/xsa321-4.13-5.patch24
-rw-r--r--main/xen/xsa321-4.13-6.patch91
-rw-r--r--main/xen/xsa321-4.13-7.patch153
-rw-r--r--main/xen/xsa327.patch63
-rw-r--r--main/xen/xsa328-4.13-1.patch118
-rw-r--r--main/xen/xsa328-4.13-2.patch48
-rw-r--r--main/xf86-input-synaptics/APKBUILD6
-rw-r--r--main/xf86-input-synaptics/time64.patch28
-rw-r--r--main/xf86-video-intel/APKBUILD21
-rw-r--r--main/xf86-video-intel/fix-build-on-i686.patch49
-rw-r--r--main/xf86-video-intel/git.patch43164
-rw-r--r--main/xfsprogs/APKBUILD6
-rw-r--r--main/xkeyboard-config/APKBUILD4
-rw-r--r--main/xorg-server/APKBUILD6
-rw-r--r--main/xorg-server/CVE-2020-14347.patch12
-rw-r--r--main/xtables-addons-lts/APKBUILD4
-rw-r--r--main/zfs-lts/APKBUILD8
-rw-r--r--main/zonenotify/APKBUILD13
524 files changed, 10644 insertions, 51703 deletions
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index d6fdc9b5e6..83d56552e3 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,7 +2,7 @@
pkgname=abuild
pkgver=3.6.0
_ver=${pkgver%_git*}
-pkgrel=0
+pkgrel=1
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch="all"
@@ -19,6 +19,7 @@ install="$pkgname.pre-install $pkgname.pre-upgrade"
subpackages="
apkbuild-cpan:cpan:noarch
apkbuild-gem-resolver:gems:noarch
+ apkbuild-pypi:pypi:noarch
abuild-rootbld:_rootbld:noarch
$pkgname-doc
"
@@ -60,6 +61,14 @@ gems() {
mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/
}
+pypi() {
+ pkgdesc="Script to generate python3 APKBUILD from PYPI"
+ depends="perl perl-libwww perl-json perl-module-build-tiny perl-lwp-protocol-https"
+
+ mkdir -p "$subpkgdir"/usr/bin
+ mv "$pkgdir"/usr/bin/apkbuild-pypi "$subpkgdir"/usr/bin/
+}
+
_rootbld() {
pkgdesc="Build packages in chroot"
depends="abuild bubblewrap gettext git"
diff --git a/main/acf-amavisd-new/APKBUILD b/main/acf-amavisd-new/APKBUILD
index 3f59f4bc4f..d8daa58b5b 100644
--- a/main/acf-amavisd-new/APKBUILD
+++ b/main/acf-amavisd-new/APKBUILD
@@ -5,7 +5,7 @@ pkgver=0.4.0
pkgrel=3
pkgdesc="ACF module for amavis"
url="https://git.alpinelinux.org/cgit/acf/acf-amavisd-new"
-arch="noarch"
+arch="noarch !x86" # amavis
license="GPL-2.0"
depends="acf-core amavis"
source="https://dev.alpinelinux.org/archive/acf-amavisd-new/acf-amavisd-new-$pkgver.tar.xz"
diff --git a/main/acf-ipsec-tools/APKBUILD b/main/acf-ipsec-tools/APKBUILD
deleted file mode 100644
index cd451584d6..0000000000
--- a/main/acf-ipsec-tools/APKBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Contributor: Ted Trask <ttrask01@yahoo.com>
-# Maintainer: Ted Trask <ttrask01@yahoo.com>
-pkgname=acf-ipsec-tools
-pkgver=0.12.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for ipsec-tools"
-url="https://git.alpinelinux.org/cgit/acf/acf-ipsec-tools"
-arch="noarch"
-license="GPL-2.0"
-depends="acf-core ipsec-tools"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-sha512sums="b224ff68d68fac8c3b4f9c27063ef2bf708a271860624724a3c09a98df51baf40af8f0d67feab1592b1ca0fbf27220fc57b17aaaa969df5b5c41374094b8e973 acf-ipsec-tools-0.12.0.tar.xz"
diff --git a/main/ack/APKBUILD b/main/ack/APKBUILD
index 374c6241a5..60b3231f6c 100644
--- a/main/ack/APKBUILD
+++ b/main/ack/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ack
-pkgver=3.3.1
+pkgver=3.4.0
pkgrel=0
pkgdesc="A Perl-powered replacement for grep"
url="https://beyondgrep.com/"
@@ -28,4 +28,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="7f0a5cc55b331f69877d186699e2fab64a196b0ea0fd148699b7be5f9a7bb2850ecf9e45dc026325af8407a37f719faf3f3e314c43e48d575b3685087461addd ack-v3.3.1.tar.gz"
+sha512sums="cc8de5a784f63a8f48b9548e930972578866d0fcc520febc6002d1ce4f9b55aabb0c8e87860586a668d94b5091c66194c05a07c584fe30fad2c5d786aee95db5 ack-v3.4.0.tar.gz"
diff --git a/main/acpica/APKBUILD b/main/acpica/APKBUILD
index b8a05ffb70..c28a3ac3a8 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=20200430
+pkgver=20200717
pkgrel=0
pkgdesc="ACPI Component Architecture utilities"
url="https://www.acpica.org"
@@ -10,7 +10,7 @@ license="GPL-2.0-only OR BSD-3-Clause OR Intel-ACPI"
makedepends="flex bison"
subpackages="iasl"
options="!check"
-source="https://acpica.org/sites/acpica/files/acpica-unix-$pkgver.tar.gz
+source="acpica-unix-$pkgver.tar.gz::https://acpica.org/sites/acpica/files/acpica-unix-$pkgver.tar_0.gz
disable-werror.patch
"
@@ -29,5 +29,5 @@ iasl() {
mv "$pkgdir"/usr/bin/iasl "$subpkgdir"/usr/bin/
}
-sha512sums="91702b63616bef07a3e3cde2c8c3812345ddffba477d8dff3874332f8d1295ac0d565885e4f5b3d06e439272892172b2fd46a2dd0ae7012fcadbfba682c0b4e1 acpica-unix-20200430.tar.gz
+sha512sums="16de55b97a3b478dd2dd44fcbe51b871c7cc6174d337939b873bcbc871bee10487a796aa86abaa7b54ff6b75279cdbf9ec48e19f6baaea4290daf1ad56bdbc46 acpica-unix-20200717.tar.gz
1f5049568d612d4debf3690e0d918d8d56abbed14ade7b2e6282eba17b25934b695d1a9fe10f99469efe8d4382c4546481d0579afdf5cdb9695fcdc93559fbab disable-werror.patch"
diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD
index 4ff29b85d5..b899fbd293 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.12.0
+pkgver=3.13.0_alpha20200626
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 47e58b26b4..0f71f7af25 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=7
+pkgrel=8
pkgdesc="Alpine base dir structure and init scripts"
url="https://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
arch="all"
@@ -31,8 +31,9 @@ source="mkmntdirs.c
builddir="$srcdir/build"
prepare() {
+ default_prepare
mkdir -p "$builddir"
- mv services-$pkgver-$pkgrel services
+ mv "$srcdir"/services-$pkgver-$pkgrel "$srcdir"/services
}
build() {
@@ -234,4 +235,4 @@ fdab6f8fec2a556ab817d90a73635a927ea04dbc4e0470ed59ee6a62c87393f9534c9b746b09a776
06d12a7b9ca14fe17e412d0f24814620b67d035ae859be7906cbf4782dd69e359a6a555dafb98060b7fb7e4714aaa676c88d9017cded36e6d8398e23369bb290 passwd
424a3dc91b9ff056c55b49fbbf7100b1a3707603f91410c5846ab869bdf6fb72287481b1ee78ef07e7b9e20a35310118d5fdbcc96e1bbb2fc5e9b2e0583b8a1c profile
f1548a2b5a107479446f15905f0f2fbf8762815b2215188d49d905c803786d35de6d98005dc0828fb2486b04aaa356f1216a964befddf1e72cb169656e23b6ac protocols
-680add49729cb9d88a03dfdd35c49784a951a18289adbf567f2126eb96b0378deca7b1d7999dac1579295466fca49e1cd5251341dd75da1a0f06f970ba8e0293 services-3.2.0-7"
+680add49729cb9d88a03dfdd35c49784a951a18289adbf567f2126eb96b0378deca7b1d7999dac1579295466fca49e1cd5251341dd75da1a0f06f970ba8e0293 services-3.2.0-8"
diff --git a/main/alpine-mirrors/APKBUILD b/main/alpine-mirrors/APKBUILD
deleted file mode 100644
index 787a95c4c3..0000000000
--- a/main/alpine-mirrors/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Matt Smith <mcs@darkregion.net>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=alpine-mirrors
-pkgver=3.5.10
-pkgrel=0
-pkgdesc="List of Alpine Linux Mirrors"
-url="https://alpinelinux.org/"
-arch="noarch"
-license="MIT"
-depends=""
-checkdepends="curl"
-install=""
-subpackages=""
-source="mirrors.yaml"
-
-build() {
- cd "$srcdir"
- awk '$1 == "-" && $2 ~ /^http:/ {print $2}' mirrors.yaml > MIRRORS.txt
-}
-
-check() {
- cd "$srcdir"
- local failed=""
- for i in $(cat MIRRORS.txt); do
- msg "testing $i"
- curl --head --connect-timeout 10 $i >/dev/null \
- || failed="$failed $i"
- done
- if [ -n "$failed" ]; then
- error "Following mirrors failed:"
- for i in $failed; do
- echo $i
- done
- return 1
- fi
-}
-
-package() {
- install -D -m644 "$srcdir"/mirrors.yaml \
- "$pkgdir"/usr/share/alpine-mirrors/mirrors.yaml || return 1
- install -D -m644 "$srcdir"/MIRRORS.txt \
- "$pkgdir"/usr/share/alpine-mirrors/MIRRORS.txt || return 1
-}
-
-sha512sums="0117a788555557a3383f0a053ad473c91152b69247e68747ea6fb955b1b874b306280449b6dc2b2ea9f6e3e4da406adb63863b8da0ccca99800413d737eacc94 mirrors.yaml"
diff --git a/main/alpine-mirrors/mirrors.yaml b/main/alpine-mirrors/mirrors.yaml
deleted file mode 100644
index 9760b2f787..0000000000
--- a/main/alpine-mirrors/mirrors.yaml
+++ /dev/null
@@ -1,143 +0,0 @@
----
-- name: dl-cdn.alpinelinux.org
- location: GeoDNS
- urls:
- - http://dl-cdn.alpinelinux.org/alpine/
-- name: nl.alpinelinux.org
- location: Europe, Netherlands
- bandwidth: 100 Mbit/s
- urls:
- - http://nl.alpinelinux.org/alpine/
-- name: uk.alpinelinux.org
- location: Maidenhead, United Kingdom
- bandwidth: 1 Gbps
- urls:
- - http://uk.alpinelinux.org/alpine/
- - https://uk.alpinelinux.org/alpine/
-- name: dl-2.alpinelinux.org
- urls:
- - http://dl-2.alpinelinux.org/alpine/
-- name: dl-3.alpinelinux.org
- urls:
- - http://dl-3.alpinelinux.org/alpine/
-- name: dl-4.alpinelinux.org
- urls:
- - http://dl-4.alpinelinux.org/alpine/
-- name: dl-5.alpinelinux.org
- urls:
- - http://dl-5.alpinelinux.org/alpine/
-- name: dl-8.alpinelinux.org
- urls:
- - http://dl-8.alpinelinux.org/alpine/
-- name: mirror.yandex.ru
- urls:
- - http://mirror.yandex.ru/mirrors/alpine/
-- name: mirrors.gigenet.com
- urls:
- - http://mirrors.gigenet.com/alpinelinux/
-- name: mirror1.hs-esslingen.de
- urls:
- - http://mirror1.hs-esslingen.de/pub/Mirrors/alpine/
-- name: leaseweb
- location: GeoDNS
- urls:
- - http://mirror.leaseweb.com/alpine/
- - rsync://mirror.leaseweb.com/alpine/
-- name: FIT CTU in Prague
- location: Europe, Czech Republic
- urls:
- - https://mirror.fit.cvut.cz/alpine/
- - http://mirror.fit.cvut.cz/alpine/
-- name: alpine.mirror.far.fi
- location: Helsinki, Finland
- urls:
- - http://alpine.mirror.far.fi/
-- name: Triple
- location: Amsterdam, The Netherlands
- urls:
- - http://alpine.mirror.wearetriple.com/
- - https://alpine.mirror.wearetriple.com/
- - rsync://alpine.mirror.wearetriple.com/alpine/
- bandwidth: 10Gbit/s
- contact: mirror@wearetriple.com
-- name: Clarkson Open Source Institute
- location: Potsdam, NY, USA
- urls:
- - http://mirror.clarkson.edu/alpine/
- bandwidth: 1Gbit/s
- contact: lannonbr@clarkson.edu
-- name: Centro de Computação Eletrônica, Universidade de São Paulo
- location: South America, Brazil, São Paulo
- urls:
- - http://linorg.usp.br/AlpineLinux/
- - rsync://linorg.usp.br/AlpineLinux/
- contact: linorg@usp.br
-- name: Department of Computer Science and Engineering, Yuan Ze University
- location: Asia, Taiwan
- urls:
- - ftp://ftp.yzu.edu.tw/Linux/alpine/
- - http://ftp.yzu.edu.tw/Linux/alpine/
- - https://ftp.yzu.edu.tw/Linux/alpine/
- - rsync://ftp.yzu.edu.tw/Linux/alpine/
- bandwidth: 1Gbit/s
- contact: hsu@peterdavehello.org
-- name: AARNet
- location: Australia
- urls:
- - http://mirror.aarnet.edu.au/pub/alpine
- contact: mirror@aarnet.edu.au
-- name: mirror.csclub.uwaterloo.ca
- location: Waterloo, Ontario, Canada
- bandwidth: 10Gbit/s
- urls:
- - ftp://mirror.csclub.uwaterloo.ca/alpine
- - http://mirror.csclub.uwaterloo.ca/alpine
- - https://mirror.csclub.uwaterloo.ca/alpine
- - rsync://mirror.csclub.uwaterloo.ca/alpine
-- name: ftp.acc.umu.se
- location: Umeå, Sweden
- bandwidth: 20Gbit/s
- urls:
- - http://ftp.acc.umu.se/mirror/alpinelinux.org
- - https://ftp.acc.umu.se/mirror/alpinelinux.org
- - rsync://ftp.acc.umu.se/mirror/alpinelinux.org
-- name: ftp.halifax.rwth-aachen.de
- location: Aachen, Germany
- bandwidth: 20Gbit/s
- urls:
- - http://ftp.halifax.rwth-aachen.de/alpine
- - https://ftp.halifax.rwth-aachen.de/alpine
- - rsync://ftp.halifax.rwth-aachen.de/alpine
-- name: Síminn hf
- location: Reykjavik, Iceland
- country: is
- urls:
- - http://speglar.siminn.is/alpine
- - https://speglar.siminn.is/alpine
- - rsync://speglar.siminn.is/alpine
-- name: dotsrc at Aalborg University
- location: Aalborg, Denmark
- bandwidth: 10Gbit/s
- urls:
- - http://mirrors.dotsrc.org/alpine
- - https://mirrors.dotsrc.org/alpine
- - rsync://mirrors.dotsrc.org/alpine
-- name: WIDE Project Tsukuba NOC
- location: Tsukuba, Japan
- bandwidth: 1Gbit/s
- urls:
- - http://ftp.tsukuba.wide.ad.jp/Linux/alpine
- - rsync://ftp.tsukuba.wide.ad.jp/alpine
-- name: RISE
- location: Philippines
- urls:
- - http://mirror.rise.ph/alpine
- - ftp://mirror.rise.ph/alpine
-- name: Neostrada B.V.
- location: Europe, Netherlands
- bandwidth: 100Mbit/s
- urls:
- - http://mirror.neostrada.nl/alpine/
- - https://mirror.neostrada.nl/alpine/
- - ftp://mirror.neostrada.nl/alpine/
- - rsync://mirror.neostrada.nl/alpine/
diff --git a/main/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD
index 72cd982986..4d8a008bb1 100644
--- a/main/alsa-lib/APKBUILD
+++ b/main/alsa-lib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alsa-lib
-pkgver=1.2.2
-pkgrel=0
+pkgver=1.2.3.2
+pkgrel=1
pkgdesc="Advanced Linux Sound Architecture (ALSA) library"
url="http://www.alsa-project.org"
arch="all"
@@ -25,6 +25,8 @@ build() {
--disable-dependency-tracking \
--without-versioned
make
+ rm -rf "$builddir"/include/sound/*
+ printf "all:\ncheck:\ninstall:\n" > "$builddir"/include/sound/Makefile
}
check() {
@@ -35,5 +37,5 @@ package() {
make -j1 DESTDIR="$pkgdir" install
}
-sha512sums="d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033 alsa-lib-1.2.2.tar.bz2
+sha512sums="1fbc6360fda841bd9ca488739bdc9f4142c1b4a07ff767f48f1e160e3d4dff914aed422c97088e238b5e77d7e30aa79ff72569c3348a4cf4a412e1e4bce0bf2a alsa-lib-1.2.3.2.tar.bz2
e15318431fe2d5bd1e42ef793f223e3e5995890d7befe6daa3d7456ccf5cb2f51eb79171539cecae13032a9b8a798ea35e04c89b27c7ef9567e2c03fb8db4512 remove-test.patch"
diff --git a/main/alsa-utils/APKBUILD b/main/alsa-utils/APKBUILD
index 57c7b1196a..d5c9bba41a 100644
--- a/main/alsa-utils/APKBUILD
+++ b/main/alsa-utils/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alsa-utils
-pkgver=1.2.2
+pkgver=1.2.3
pkgrel=0
pkgdesc="Advanced Linux Sound Architecture (ALSA) utilities"
url="http://www.alsa-project.org"
@@ -40,7 +40,7 @@ alsaconf() {
"$subpkgdir"/usr/sbin
}
-sha512sums="30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9 alsa-utils-1.2.2.tar.bz2
+sha512sums="5aeba2e5b7279c62d4df85b61a26b3f41e5465bac5a0b94c7bbe1299f7aa38e8cf2a1f749f618289a63b61f76609fe54169fcbe70792b45adc8957811b672012 alsa-utils-1.2.3.tar.bz2
f04155e1e391c7f36d44422c8e769bf9370117f6bbea6c0664e9858f7a676cc958e4260e4b4d226e71d0716f6be4e6fdd60f1d07cb7e9922fff378ceec01c47d alsaconf.patch
65f3530df01a2157003df9df4cb5b2c7a258257e8121786383610eb2872ffb5e8c88d070792ad74133a21c5fa54bac5047af4dcccb1854b456d2eeb8f0689076 alsa.initd
6e716e6230fd3d2c33e3cb2dbf572d632c9ac6452c1768388bea7d3ca22f7c72cf6bcd702580f45cb9089983582011c8b04cbdb4420d14fb988167b1391ea547 alsa.confd"
diff --git a/main/amavis/APKBUILD b/main/amavis/APKBUILD
index f512a4e735..c298353b1f 100644
--- a/main/amavis/APKBUILD
+++ b/main/amavis/APKBUILD
@@ -5,7 +5,7 @@ pkgver=2.12.0
pkgrel=0
pkgdesc="High-performance interface between mailer (MTA) and content checkers"
url="https://gitlab.com/amavis/amavis"
-arch="noarch"
+arch="noarch !x86" # perl-db
license="GPL-2.0-or-later BSD"
provides="amavisd-new=$pkgver-r$pkgrel"
depends="sed file perl perl-archive-zip perl-carp perl-convert-tnef
diff --git a/main/amavisd-milter/APKBUILD b/main/amavisd-milter/APKBUILD
index b20c46fbe6..80c8e019a3 100644
--- a/main/amavisd-milter/APKBUILD
+++ b/main/amavisd-milter/APKBUILD
@@ -1,21 +1,21 @@
# Contributor: Elias Werberich <elias@werberich.de>
-# Maintainer:
+# Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting>
pkgname=amavisd-milter
-pkgver=1.6.1
-pkgrel=2
+pkgver=1.7.0
+pkgrel=0
pkgdesc="sendmail milter for amavisd-new using the AM.PDP protocol"
url="http://amavisd-milter.sourceforge.net/"
-arch="all"
-license="BSD"
+arch="all !x86" #amavis isn't build for x86
+license="BSD-3-Clause"
depends="amavis libmilter"
makedepends="libmilter-dev"
subpackages="$pkgname-doc"
source="
- https://downloads.sourceforge.net/amavisd-milter/amavisd-milter/amavisd-milter-1.6.1/amavisd-milter-1.6.1.tar.gz
+ https://github.com/prehor/amavisd-milter/releases/download/$pkgver/amavisd-milter-$pkgver.tar.gz
amavisd-milter.initd
amavisd-milter.confd
"
-builddir="$srcdir/${pkgname}-${pkgver}"
+builddir="$srcdir/$pkgname-$pkgver"
build() {
cd "$builddir"
@@ -42,6 +42,6 @@ package() {
install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
-sha512sums="28f505a8e130e67decc6c6ff8526f82db24b1b27a11e69f1a112e3e6103f303d333743c2ceaf12bad86979c987cde64f41afb4794c1ca1222cf11a2c3b03c8a5 amavisd-milter-1.6.1.tar.gz
+sha512sums="52fdfe4acdd94e387de63d93aa3347dce46e7e16b8ab51679c7bbfc4f6faba160de5ca55aae141cbd06f3d9d1122dea67fdd67562dd5b8314055f7f6071545af amavisd-milter-1.7.0.tar.gz
3e45a8766f6b5bbb089bcb508efe99d17f107d544b2d50d12437a6b7103e2ce143eef9c6ecc0e2a9ced37b153d122e1eb8f171e4000e4e56a7f2a210587c2d68 amavisd-milter.initd
f44ab528c65050e23a2e78dafd937dae5bc73bd83ff780d7a193d47744674f3991c9d1ae99c4fb8ce1762c50ed6ca5fb604eb2c4cf69fe2e27e8a4076b6f2eec amavisd-milter.confd"
diff --git a/main/ansible/APKBUILD b/main/ansible/APKBUILD
index b0442b50a8..3a7cb8f4f6 100644
--- a/main/ansible/APKBUILD
+++ b/main/ansible/APKBUILD
@@ -3,10 +3,11 @@
# Contributor: Takuya Noguchi <takninnovationresearch@gmail.com>
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=ansible
-pkgver=2.9.9
+pkgver=2.9.11
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 py3-yaml py3-paramiko py3-jinja2 py3-markupsafe py3-pycryptodome"
@@ -49,10 +50,6 @@ build() {
python3 setup.py build
}
-check() {
- python3 setup.py check
-}
-
package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
@@ -66,6 +63,6 @@ package() {
install -m644 README.rst "$pkgdir"/usr/share/doc/$pkgname
}
-sha512sums="327c5ece277096f71f10fec2b33a8d2c94ee59b0e22b15bb5ca449da2331b8158239bdbc8e3afd093af358a787f410c7c2e0942010de65a8d9c8719cf83e4abd ansible-2.9.9.tar.gz
+sha512sums="b157a5cfb5ba7cb651c7afc0dc92cfe3b8f9eebd06de6d7a1e4917ffca3c542c5207c8e1820acc5be840190c8754f111e2501304ad7e64867247e5b973aec81e ansible-2.9.11.tar.gz
f44f1492495abe092cd9f91669ccfee65748f43663571361de97c3b1c5c1219d355aa7236179decb73446376018fa81aace7eaeb8c10a83d3cf4e006508533dd add-lxc-container_shell-option.patch
d6aa6827acee61d857444a00364f9b057a216a0a6f5217f353e8b8e0118db7aee54b7578a3fb31cb43bfa8e0709db8d43dcdb819eb28a457a692359887dad115 0001-new-module-lbu.patch"
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index 612926b3ac..0d20af53dc 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
pkgname=apache2
_pkgreal=httpd
-pkgver=2.4.43
+pkgver=2.4.46
pkgrel=0
pkgdesc="A high performance Unix-based HTTP server"
url="https://httpd.apache.org/"
@@ -50,6 +50,10 @@ options="suid"
builddir="$srcdir"/$_pkgreal-$pkgver
# secfixes:
+# 2.4.46-r0:
+# - CVE-2020-9490
+# - CVE-2020-11984
+# - CVE-2020-11993
# 2.4.43-r0:
# - CVE-2020-1927
# - CVE-2020-1934
@@ -342,7 +346,7 @@ _lua() {
"$subpkgdir"/usr/lib/apache2/
_load_mods
}
-sha512sums="16cfeecc8f6fab6eca478065a384bdf1872f7ac42206b0bc2bcac6c0d9c576f392c07107201f39e0601dec1bbafcb33d66153544de4d87d79b9a52094d334b64 httpd-2.4.43.tar.bz2
+sha512sums="5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13 httpd-2.4.46.tar.bz2
8e62b101f90c67babe864bcb74f711656180b011df3fd4b541dc766b980b72aa409e86debf3559a55be359471c1cad81b8779ef3a55add8d368229fc7e9544fc apache2.confd
18e8859c7d99c4483792a5fd20127873aad8fa396cafbdb6f2c4253451ffe7a1093a3859ce719375e0769739c93704c88897bd087c63e1ef585e26dcc1f5dd9b apache2.logrotate
81a2d2a297d8049ba1b021b879ec863767149e056d9bdb2ac8acf63572b254935ec96c2e1580eba86639ea56433eec5c41341e4f1501f9072745dccdb3602701 apache2.initd
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 3198c59aab..9d15ad21fd 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,12 +1,15 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
pkgver=2.10.5
-pkgrel=1
+pkgrel=2
pkgdesc="Alpine Package Keeper - package manager for alpine"
arch="all"
url="https://gitlab.alpinelinux.org/alpine/apk-tools"
license="GPL-2.0-only"
subpackages="$pkgname-static"
+# Musl 1.2 introduced new ABI for time64 => upgrading apk-tools
+# while staying on musl <1.2 causes missing symbols
+depends="musl>=1.2"
makedepends_build="openssl"
makedepends_host="zlib-dev openssl-dev zlib-static openssl-libs-static linux-headers"
makedepends="$makedepends_build $makedepends_host"
diff --git a/main/arpon/APKBUILD b/main/arpon/APKBUILD
index b82ebc80de..45eb4d722a 100644
--- a/main/arpon/APKBUILD
+++ b/main/arpon/APKBUILD
@@ -3,7 +3,7 @@
pkgname=arpon
pkgver=3.0
_realver=3.0-ng
-pkgrel=3
+pkgrel=4
pkgdesc="Arp handler inspectiON is a handler daemon with tools to handle all ARP aspects"
url="http://arpon.sourceforge.net/"
arch="all"
diff --git a/main/arpwatch/APKBUILD b/main/arpwatch/APKBUILD
index 4cdd89fe8b..9d8bc8cf24 100644
--- a/main/arpwatch/APKBUILD
+++ b/main/arpwatch/APKBUILD
@@ -2,17 +2,17 @@
# Maintainer: Francesco Colista <francesco.colista@gmail.com>
pkgname=arpwatch
pkgver=2.1a15
-pkgrel=16
+pkgrel=17
pkgdesc="Ethernet monitoring program"
url="http://www-nrg.ee.lbl.gov/"
arch="all"
-license="BSD"
+license="BSD-4-Clause-Shortened"
pkgusers="arpwatch"
makedepends="libpcap-dev"
install="$pkgname.pre-install"
options="!check" # No test suite.
-subpackages="$pkgname-ethercodes"
-source="ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz
+subpackages="$pkgname-ethercodes $pkgname-doc"
+source="ftp://ftp.ee.lbl.gov/arpwatch-$pkgver.tar.gz
arpwatch.confd
arpwatch.initd
01_all_arpwatch-2.1a15-manpages.patch
@@ -38,16 +38,14 @@ source="ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz
21_all_arpwatch-2.1a15-pid-filename.patch
22_alpine_bihourly_script.patch
"
-
-builddir="$srcdir/$pkgname-$pkgver"
-
prepare() {
+ chmod -R u+rwX "$builddir"
default_prepare
update_config_sub
+ sed -i'' -e 's/-o bin -g bin //g' Makefile.in
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -59,7 +57,6 @@ build() {
}
package() {
- cd "$builddir"
#make install command wouldn't create directory
mkdir -p "$pkgdir"/usr/sbin/
make -j1 DESTDIR="$pkgdir" install
@@ -83,8 +80,16 @@ ethercodes() {
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
854f6361bf02586516db4f50afdee729c047cd788985f72f475e592e0e744c24d7d765f0391d733dbf417048c26b6d43c00eb63c58e6798bdb2366b93cbfe03a arpwatch.confd
diff --git a/main/asciidoc/APKBUILD b/main/asciidoc/APKBUILD
index 5637fde52c..776818275b 100644
--- a/main/asciidoc/APKBUILD
+++ b/main/asciidoc/APKBUILD
@@ -1,21 +1,20 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=asciidoc
-pkgver=8.6.10
-pkgrel=1
-_commit=986f99d743d0b6ddc2014bdc8dcfa991ab9b4863
+pkgver=9.0.2
+pkgrel=0
pkgdesc="Text based documentation"
url="http://asciidoc.org/"
arch="noarch"
license="GPL-2.0-or-later and GPL-1.0-or-later"
depends="python3 libxml2-utils docbook-xsl"
makedepends="autoconf automake"
-subpackages="$pkgname-doc $pkgname-vim::noarch"
-source="$pkgname-$_commit.tar.gz::https://github.com/asciidoc/asciidoc-py3/archive/$_commit/asciidoc-py3-$_commit.tar.gz
- asciidoc-python3.patch
- asciidoc-python3-a2x-decode-fix.patch
- asciidoc-python3-deprecation-warning.patch
- "
-builddir="$srcdir/asciidoc-py3-$_commit"
+subpackages="$pkgname-doc"
+# There is a upstream-created tarball but it has depth=1 which unpacks
+# everything into $srcdir instead of $srcdir/$pkgname-$pkgver
+source="$pkgname-$pkgver.tar.gz::https://github.com/asciidoc/asciidoc-py3/archive/$pkgver.tar.gz"
+builddir="$srcdir/asciidoc-py3-$pkgver"
+
+replaces="$pkgname-vim"
prepare() {
default_prepare
@@ -37,14 +36,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-vim() {
- pkgdesc="Vim syntax for $pkgname"
- depends=""
- install -Dm644 "$builddir"/vim/syntax/$pkgname.vim \
- "$subpkgdir"/usr/share/vim/vimfiles/syntax/$pkgname.vim
-}
-
-sha512sums="758362cac485cbe4fd504224f7a8d24d20955464dd56af258e9a70deac8dc89d0f07f8e4567cfbbd3e1cbe6336704e9d12590bade662dd5bf228ea7e611676d1 asciidoc-986f99d743d0b6ddc2014bdc8dcfa991ab9b4863.tar.gz
-331d7c1a6e8ec6bdd11c2998c0d76285e282914ca12a0de79e04199926f7fd10a7b24a3602fd01d3cbdf7fb8f718000eb8d5063236354c894a9187ab54194aa6 asciidoc-python3.patch
-dfa4b288c894373aecebafbadf726aadcb51cf4578c0903433936c114a587b086695f85c97bf712140d94adc916c83d0c861c5af8cf15195a3364ca8e4e8414e asciidoc-python3-a2x-decode-fix.patch
-de4687009f4c5dd4d3f7727634e6577d1e6df3f4c812dd4d4c9828a31d529b8e520ae43a53a63cb4c154664d51d5bad96728f05feb9e9ec0889849903cae739e asciidoc-python3-deprecation-warning.patch"
+sha512sums="ea8f64ce54d2f1aa38eceb3c1c9be17b388776de58038f3b888ac5ebed76337fa2779e43eb7f47174adf0a0446ee808dbd1e4f8f7e1d7db99db7c4c8584d5624 asciidoc-9.0.2.tar.gz"
diff --git a/main/asciidoc/asciidoc-python3-a2x-decode-fix.patch b/main/asciidoc/asciidoc-python3-a2x-decode-fix.patch
deleted file mode 100644
index 5525c7d6dc..0000000000
--- a/main/asciidoc/asciidoc-python3-a2x-decode-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from upstream PR#5 (https://github.com/asciidoc/asciidoc-py3/pull/5)
-
-6469317 Remove unnecessary decode in a2x (Matthew Peveler)
-684913e Fix decoding of file that specifies encoding in header tag in a2x (Matthew Peveler)
-8369a97 re-add --nonet option (Matthew Peveler)
-
-diff --git c/a2x.py w/a2x.py
-index 55eb57e..c015079 100755
---- c/a2x.py
-+++ w/a2x.py
-@@ -254,15 +254,11 @@ def find_resources(files, tagname, attrname, filter=None):
- if OPTIONS.dry_run:
- continue
- parser = FindResources()
-- # HTMLParser has problems with non-ASCII strings.
-- # See http://bugs.python.org/issue3932
-- contents = read_file(filename)
-- mo = re.search(r'\A<\?xml.* encoding="(.*?)"', contents)
-- if mo:
-- encoding = mo.group(1)
-- parser.feed(contents.decode(encoding))
-- else:
-- parser.feed(contents)
-+ with open(filename, 'rb') as open_file:
-+ contents = open_file.read()
-+ mo = re.search(b'\A<\?xml.* encoding="(.*?)"', contents)
-+ contents = contents.decode(mo.group(1).decode('utf-8') if mo else 'utf-8')
-+ parser.feed(contents)
- parser.close()
- result = list(set(result)) # Drop duplicate values.
- result.sort()
-@@ -337,7 +333,7 @@ def get_source_options(asciidoc_file):
- result = []
- if os.path.isfile(asciidoc_file):
- options = ''
-- with open(asciidoc_file) as f:
-+ with open(asciidoc_file, encoding='utf-8') as f:
- for line in f:
- mo = re.search(r'^//\s*a2x:', line)
- if mo:
-
diff --git a/main/asciidoc/asciidoc-python3-deprecation-warning.patch b/main/asciidoc/asciidoc-python3-deprecation-warning.patch
deleted file mode 100644
index 00b4f0e9db..0000000000
--- a/main/asciidoc/asciidoc-python3-deprecation-warning.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-diff -urNp a/asciidoc.conf b/asciidoc.conf
---- a/asciidoc.conf 2018-12-03 13:06:23.377407390 +0100
-+++ b/asciidoc.conf 2018-12-03 13:07:08.142320548 +0100
-@@ -29,7 +29,7 @@ empty=
- sp=" "
- # Attribute and AttributeList element patterns.
- attributeentry-pattern=^:(?P<attrname>\w[^.]*?)(\.(?P<attrname2>.*?))?:(\s+(?P<attrvalue>.*))?$
--attributelist-pattern=(?u)(^\[\[(?P<id>[\w_:][\w_:.-]*)(,(?P<reftext>.*?))?\]\]$)|(^\[(?P<attrlist>.*)\]$)
-+attributelist-pattern=(^\[\[(?P<id>[\w_:][\w_:.-]*)(,(?P<reftext>.*?))?\]\]$)|(^\[(?P<attrlist>.*)\]$)
- # Substitution attributes for escaping AsciiDoc processing.
- amp=&
- lt=<
-@@ -288,10 +288,10 @@ endif::no-inline-literal[]
- # Block macros
- #-------------
- # Macros using default syntax.
--(?u)^(?P<name>image|unfloat|toc)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=#
-+^(?P<name>image|unfloat|toc)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=#
-
- # Passthrough macros.
--(?u)^(?P<name>pass)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#
-+^(?P<name>pass)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#
-
- ^'{3,}$=#ruler
- ^<{3,}$=#pagebreak
-diff -urNp a/asciidoc.py b/asciidoc.py
---- a/asciidoc.py 2018-12-03 13:06:23.378407388 +0100
-+++ b/asciidoc.py 2018-12-03 13:17:41.965990011 +0100
-@@ -30,7 +30,7 @@ SUBS_NORMAL = ('specialcharacters','quot
- 'specialwords','replacements','macros','replacements2')
- SUBS_VERBATIM = ('specialcharacters','callouts')
-
--NAME_RE = r'(?u)[^\W\d][-\w]*' # Valid section or attribute name.
-+NAME_RE = r'[^\W\d][-\w]*' # Valid section or attribute name.
- OR, AND = ',', '+' # Attribute list separators.
-
-
-@@ -463,7 +463,7 @@ def parse_options(options,allowed,errmsg
-
- def symbolize(s):
- """Drop non-symbol characters and convert to lowercase."""
-- return re.sub(r'(?u)[^\w\-_]', '', s).lower()
-+ return re.sub(r'[^\w\-_]', '', s).lower()
-
- def is_name(s):
- """Return True if s is valid attribute, macro or tag name
-@@ -1746,7 +1746,7 @@ class AttributeEntry:
- attr.name = attr.name[:-1]
- attr.value = None
- # Strip white space and illegal name chars.
-- attr.name = re.sub(r'(?u)[^\w\-_]', '', attr.name).lower()
-+ attr.name = re.sub(r'[^\w\-_]', '', attr.name).lower()
- # Don't override most command-line attributes.
- if attr.name in config.cmd_attrs \
- and attr.name not in ('trace','numbered'):
-@@ -1946,7 +1946,7 @@ class Title:
- if ul != s[:ul_len]: return False
- # Don't be fooled by back-to-back delimited blocks, require at
- # least one alphanumeric character in title.
-- if not re.search(r'(?u)\w',title): return False
-+ if not re.search(r'\w',title): return False
- mo = re.match(Title.pattern, title)
- if mo:
- Title.attributes = mo.groupdict()
-@@ -2104,7 +2104,7 @@ class Section:
- """
- # Replace non-alpha numeric characters in title with underscores and
- # convert to lower case.
-- base_id = re.sub(r'(?u)\W+', '_', title).strip('_').lower()
-+ base_id = re.sub(r'\W+', '_', title).strip('_').lower()
- if 'ascii-ids' in document.attributes:
- # Replace non-ASCII characters with ASCII equivalents.
- import unicodedata
-@@ -3602,7 +3602,7 @@ class Tables(AbstractBlocks):
-
- class Macros:
- # Default system macro syntax.
-- SYS_RE = r'(?u)^(?P<name>[\\]?\w(\w|-)*?)::(?P<target>\S*?)' + \
-+ SYS_RE = r'^(?P<name>[\\]?\w(\w|-)*?)::(?P<target>\S*?)' + \
- r'(\[(?P<attrlist>.*?)\])$'
- def __init__(self):
- self.macros = [] # List of Macros.
-@@ -4478,7 +4478,7 @@ class Config:
- rdr.open(fname)
- message.linenos = None
- self.fname = fname
-- reo = re.compile(r'(?u)^\[(?P<section>\+?[^\W\d][\w-]*)\]\s*$')
-+ reo = re.compile(r'^\[(?P<section>\+?[^\W\d][\w-]*)\]\s*$')
- sections = OrderedDict()
- section,contents = '',[]
- while not rdr.eof():
-diff -urNp a/doc/asciidoc.conf b/doc/asciidoc.conf
---- a/doc/asciidoc.conf 2018-12-03 13:06:23.379407386 +0100
-+++ b/doc/asciidoc.conf 2018-12-03 13:07:32.374272984 +0100
-@@ -3,5 +3,5 @@
- #
- [specialwords]
- ifndef::doctype-manpage[]
--monospacedwords=(?u)\\?\basciidoc\(1\) (?u)\\?\ba2x\(1\)
-+monospacedwords=\\?\basciidoc\(1\) \\?\ba2x\(1\)
- endif::doctype-manpage[]
-diff -urNp a/docbook45.conf b/docbook45.conf
---- a/docbook45.conf 2018-12-03 13:06:23.383407378 +0100
-+++ b/docbook45.conf 2018-12-03 13:07:53.221231766 +0100
-@@ -47,7 +47,7 @@ latexmath-style=template="latexmathblock
- [macros]
- # math macros.
- (?su)[\\]?(?P<name>latexmath):(?P<subslist>\S*?)\[(?:\$\s*)?(?P<passtext>.*?)(?:\s*\$)?(?<!\\)\]=[]
--(?u)^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[]
-+^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[]
-
- [latexmath-inlinemacro]
- <inlineequation>
-diff -urNp a/examples/website/layout1.conf b/examples/website/layout1.conf
---- a/examples/website/layout1.conf 2018-12-03 13:06:23.384407377 +0100
-+++ b/examples/website/layout1.conf 2018-12-03 13:08:17.989182454 +0100
-@@ -22,7 +22,7 @@
- # xhtml11 backend stylesheets.
-
- [specialwords]
--monospacedwords=(?u)\\?\basciidoc\(1\) (?u)\\?\ba2x\(1\)
-+monospacedwords=\\?\basciidoc\(1\) \\?\ba2x\(1\)
-
- [header]
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-diff -urNp a/examples/website/layout2.conf b/examples/website/layout2.conf
---- a/examples/website/layout2.conf 2018-12-03 13:06:23.384407377 +0100
-+++ b/examples/website/layout2.conf 2018-12-03 13:08:35.614147145 +0100
-@@ -24,7 +24,7 @@
- # xhtml11 backend stylesheets.
-
- [specialwords]
--monospacedwords=(?u)\\?\basciidoc\(1\) (?u)\\?\ba2x\(1\)
-+monospacedwords=\\?\basciidoc\(1\) \\?\ba2x\(1\)
-
- [header]
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-diff -urNp a/html5.conf b/html5.conf
---- a/html5.conf 2018-12-03 13:06:23.386407373 +0100
-+++ b/html5.conf 2018-12-03 13:08:59.231099559 +0100
-@@ -36,13 +36,13 @@ asciimath-style=template="asciimathblock
- latexmath-style=template="latexmathblock",subs=(),posattrs=(),filter="unwraplatex.py"
-
- [macros]
--(?u)^(?P<name>audio|video)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=#
-+^(?P<name>audio|video)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=#
- # math macros.
- # Special characters are escaped in HTML math markup.
- (?su)[\\]?(?P<name>asciimath):(?P<subslist>\S*?)\[(?P<passtext>.*?)(?<!\\)\]=[specialcharacters]
--(?u)^(?P<name>asciimath)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[specialcharacters]
-+^(?P<name>asciimath)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[specialcharacters]
- (?su)[\\]?(?P<name>latexmath):(?P<subslist>\S*?)\[(?:\$\s*)?(?P<passtext>.*?)(?:\s*\$)?(?<!\\)\]=[specialcharacters]
--(?u)^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[specialcharacters]
-+^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[specialcharacters]
-
- [asciimath-inlinemacro]
- `{passtext}`
-diff -urNp a/xhtml11.conf b/xhtml11.conf
---- a/xhtml11.conf 2018-12-03 13:06:23.395407355 +0100
-+++ b/xhtml11.conf 2018-12-03 13:09:18.358060798 +0100
-@@ -39,9 +39,9 @@ latexmath-style=template="latexmathblock
- # math macros.
- # Special characters are escaped in HTML math markup.
- (?su)[\\]?(?P<name>asciimath):(?P<subslist>\S*?)\[(?P<passtext>.*?)(?<!\\)\]=[specialcharacters]
--(?u)^(?P<name>asciimath)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[specialcharacters]
-+^(?P<name>asciimath)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[specialcharacters]
- (?su)[\\]?(?P<name>latexmath):(?P<subslist>\S*?)\[(?:\$\s*)?(?P<passtext>.*?)(?:\s*\$)?(?<!\\)\]=[specialcharacters]
--(?u)^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[specialcharacters]
-+^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[specialcharacters]
-
- [asciimath-inlinemacro]
- `{passtext}`
-
diff --git a/main/asciidoc/asciidoc-python3.patch b/main/asciidoc/asciidoc-python3.patch
deleted file mode 100644
index 74c53d8f75..0000000000
--- a/main/asciidoc/asciidoc-python3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -urNp old/filters/latex/latex2img.py new/filters/latex/latex2img.py
---- old/filters/latex/latex2img.py 2018-06-05 15:27:44.153533130 +0200
-+++ new/filters/latex/latex2img.py 2018-06-05 15:28:43.542828463 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2
-+#!/usr/bin/env python3
- '''
- NAME
- latex2img - Converts LaTeX source to PNG or SVG file
-diff -urNp old/filters/music/music2png.py new/filters/music/music2png.py
---- old/filters/music/music2png.py 2018-06-05 15:27:44.153533130 +0200
-+++ new/filters/music/music2png.py 2018-06-05 15:28:56.502882780 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2
-+#!/usr/bin/env python3
- '''
- NAME
- music2png - Converts textual music notation to classically notated PNG file
-diff -urNp old/filters/unwraplatex.py new/filters/unwraplatex.py
---- old/filters/unwraplatex.py 2018-06-05 15:27:44.152533125 +0200
-+++ new/filters/unwraplatex.py 2018-06-05 15:28:29.956767744 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2
-+#!/usr/bin/env python3
- '''
- NAME
- unwraplatex - Removes delimiters from LaTeX source text
-diff -urNp old/Makefile.in new/Makefile.in
---- old/Makefile.in 2018-06-05 15:27:44.144533079 +0200
-+++ new/Makefile.in 2018-06-05 15:27:56.328600132 +0200
-@@ -107,7 +107,7 @@ $(DATATARGETS): % : %dir
- $(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/
-
- $(manp): %.1 : %.1.txt
-- python2 a2x.py -f manpage $<
-+ python3 a2x.py -f manpage $<
-
- docs:
- $(INSTALL) -d $(DESTDIR)/$(docdir)
-
diff --git a/main/asterisk/musl-mutex-init.patch b/main/asterisk/10-musl-mutex-init.patch
index 891d3fd10a..16b7fccbd9 100644
--- a/main/asterisk/musl-mutex-init.patch
+++ b/main/asterisk/10-musl-mutex-init.patch
@@ -1,3 +1,5 @@
+fix for compiling with musl
+
diff -ru asterisk-12.4.0.orig/include/asterisk/lock.h asterisk-12.4.0/include/asterisk/lock.h
--- asterisk-12.4.0.orig/include/asterisk/lock.h 2013-11-02 06:05:24.000000000 -0200
+++ asterisk-12.4.0/include/asterisk/lock.h 2014-08-04 16:00:29.811967599 -0300
diff --git a/main/asterisk/musl-astmm-fix.patch b/main/asterisk/20-musl-astmm-fix.patch
index 86e3e29713..e6f9d150e6 100644
--- a/main/asterisk/musl-astmm-fix.patch
+++ b/main/asterisk/20-musl-astmm-fix.patch
@@ -1,3 +1,5 @@
+Add include file needed when compiling with musl
+
diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h
index 8547283..476dc2a 100644
--- a/include/asterisk/compat.h
diff --git a/main/asterisk/asterisk-mariadb.patch b/main/asterisk/30-asterisk-mariadb.patch
index dab4d988a7..ae9e1aa23b 100644
--- a/main/asterisk/asterisk-mariadb.patch
+++ b/main/asterisk/30-asterisk-mariadb.patch
@@ -1,3 +1,5 @@
+Use mariadb instead of mysql
+
diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c
index 00c75dd..bc405bb 100644
--- a/addons/cdr_mysql.c
diff --git a/main/asterisk/40-asterisk-cdefs.patch b/main/asterisk/40-asterisk-cdefs.patch
new file mode 100644
index 0000000000..7cf22c84d8
--- /dev/null
+++ b/main/asterisk/40-asterisk-cdefs.patch
@@ -0,0 +1,22 @@
+include depreciated cdefs.h as needed for compilation with alpine
+
+--- a/main/ast_expr2.c
++++ b/main/ast_expr2.c
+@@ -95,6 +95,7 @@
+ #include "asterisk.h"
+
+ #include <sys/types.h>
++#include <sys/cdefs.h>
+ #include <stdio.h>
+
+ #if defined(STANDALONE) || defined(STANDALONE2)
+--- a/utils/db1-ast/include/db.h
++++ b/utils/db1-ast/include/db.h
+@@ -37,6 +37,7 @@
+ #define _DB_H 1
+
+ #include <sys/types.h>
++#include <sys/cdefs.h>
+
+ #include <limits.h>
+
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 0a44a4af68..39c3cf2b4a 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -1,44 +1,42 @@
+# Contributor: Duncan Bellamy <dunk@denkimushi.com>
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Contributor: Timo Teras <timo.teras@iki.fi>
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=asterisk
-pkgver=16.7.0
+pkgver=16.12.0
pkgrel=0
pkgdesc="Asterisk: A Module Open Source PBX System"
pkgusers="asterisk"
pkggroups="asterisk"
url="http://www.asterisk.org/"
arch="all"
-license="GPL-2.0"
-depends=
+license="GPL-2.0-only"
options="!check" # Test suite is separate, and require separate build
-makedepends="findutils tar wget bsd-compat-headers libtool
+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"
+ bluez-dev libxml2-dev imap-dev unbound-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:sample:noarch
+ $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-speex $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
- musl-mutex-init.patch
- musl-astmm-fix.patch
- asterisk-mariadb.patch
-
+ 10-musl-mutex-init.patch
+ 20-musl-astmm-fix.patch
+ 30-asterisk-mariadb.patch
+ 40-asterisk-cdefs.patch
asterisk.initd
asterisk.confd
asterisk.logrotate"
-builddir="$srcdir/$pkgname-${pkgver/_/-}"
-
# secfixes:
# 16.6.2-r0:
# - CVE-2019-18610
@@ -62,7 +60,6 @@ prepare() {
}
build() {
- cd "$builddir"
SHA1SUM="$PWD"/build_tools/sha1sum-sh ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -95,7 +92,8 @@ build() {
--with-libcurl \
--with-libedit \
--with-srtp \
- --with-imap=system
+ --with-imap=system \
+ CFLAGS="$CFLAGS -DENABLE_SRTP_AES_256"
# get default modules to build
rm -f menuselect.makeopts
@@ -111,11 +109,10 @@ build() {
menuselect.makeopts
# build
- make ASTCFLAGS="$CFLAGS" ASTLDFLAGS="$LDFLAGS" LDCONFIG=
+ make LDCONFIG=
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" LDCONFIG_FLAGS="-n" install
install -d "$pkgdir"/var/run/asterisk
@@ -131,30 +128,6 @@ package() {
chmod -R u=rwX,g=rX,o= "$pkgdir"/etc/asterisk
}
-_move_dir() {
- for DIR in "$@"; do
- local dest=`dirname "$subpkgdir/$DIR"`
- echo mkdir -p $dest
- mkdir -p "$dest"
- echo mv "$pkgdir"/$DIR $dest
- mv "$pkgdir"/"$DIR" "$dest"
- done
-}
-
-_find_and_move() {
- local pattern="$1"
- cd "$pkgdir"
- find . -name "$pattern" -type f | while read f; do
- local dest="$subpkgdir/${f%/*}"
- mkdir -p "$dest"
- mv "$f" "$dest"
- done
-}
-
-doc() {
- default_doc
-}
-
dev() {
default_dev
depends="asterisk"
@@ -164,54 +137,19 @@ dev() {
mv "$subpkgdir"/usr/lib/libasteriskssl.so "$pkgdir"/usr/lib/libasteriskssl.so
}
-pgsql() {
- depends=
- install=
- _find_and_move '*_pgsql*'
-}
-
-odbc() {
- depends=
- install=
- _find_and_move '*odbc*'
-}
-
-tds() {
- depends=
- install=
- _find_and_move '*_tds*'
-}
-
-fax() {
- depends=
- install=
- _find_and_move '*_fax*'
-}
-
-mobile() {
- depends=
- install=
- _find_and_move '*_mobile*'
-}
-
-_curl() {
- depends=
- install=
- _find_and_move '*_curl*'
-}
-
-cdr_mysql() {
- depends=
- install=
- _find_and_move '*cdr_mysql*'
-}
-
-srtp() { _find_and_move '*_srtp*'; }
-dahdi() { _find_and_move '*_dahdi*'; }
-speex() { _find_and_move '*_speex*'; }
-alsa() { _find_and_move '*_alsa*'; }
+pgsql() { amove usr/lib/asterisk/modules/*_pgsql*; }
+odbc() { amove usr/lib/asterisk/modules/*_odbc*; }
+tds() { amove usr/lib/asterisk/modules/*_tds*; }
+fax() { amove usr/lib/asterisk/modules/*_fax*; }
+mobile() { amove usr/lib/asterisk/modules/*_mobile*; }
+_curl() { amove usr/lib/asterisk/modules/*_curl*; }
+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*; }
+alsa() { amove usr/lib/asterisk/modules/*_alsa*; }
-sample() {
+config() {
pkgdesc="Sample configuration files for asterisk"
cd "$builddir"
mkdir -p "$subpkgdir"/var/lib/asterisk/phoneprov
@@ -225,24 +163,23 @@ sample() {
sound_moh() {
pkgdesc="Default on-hold music files for asterisk"
depends=
- install=
- _move_dir var/lib/asterisk/moh
+ amove var/lib/asterisk/moh
chown -R asterisk:asterisk "$subpkgdir"/var/*/asterisk
}
sound_en() {
pkgdesc="English sound files for asterisk"
depends=
- install=
- _move_dir var/lib/asterisk/sounds/en
+ amove var/lib/asterisk/sounds/en
chown -R asterisk:asterisk "$subpkgdir"/var/*/asterisk
}
-sha512sums="4b06b7879031abf072d8db5e5be32870be65e726d2e02ef38cce48fa4fd006fe8885c95c649ee6f79280c00dc8b0c2252894cb86cfe3011fcc92e2165f3d0213 asterisk-16.7.0.tar.gz
+sha512sums="1fc41b92d070efd4a7ea5db1a36c83bdb6dbbe7d9b5087b0a887ba3d6875e81ba1b71a79b216138b242f0349a176baf6745480ff6fb7ed47c62dda4b09b6a891 asterisk-16.12.0.tar.gz
aacef3f4796fb1abd33266998b53909cb4b36e7cc5ad2f7bac68bdc43e9a9072d9a4e2e7e681bddfa31f3d04575eb248afe6ea95da780c67e4829c1e22adfe1b asterisk-addon-mp3-r201.patch.gz
-f72c2e04de80d3ed9ce841308101383a1655e6da7a3c888ad31fffe63d1280993e08aefcf8e638316d439c68b38ee05362c87503fca1f36343976a01af9d6eb1 musl-mutex-init.patch
-fdac3868ed2ba566397e3a71314568787e4a84d37738f210a6e288c4285215879756c576e2fd064be9cf5169a7e08dbbfd341f50a87e4e6dbfae20e19bcc4d71 musl-astmm-fix.patch
-c76a882588194372d0c45a2bd1a9a946543f2dc07fde9240b3e600682e9737337c7602da35bfaeddb4d9fe568daa668016237c6f7986e7c44cf5a8dbba291e1f asterisk-mariadb.patch
+771237ba6d42ab62d914f2702234b23fd0bc8c22f2aa33b0e745c9170163c8046f6d48ecb299faab3d6fb397f1aa046421083c3cc88510c9779861c522f357dd 10-musl-mutex-init.patch
+0fae11b42894ab3d405bc50e9275b9084712b482fbf9b4259ea938667fc5cbe413655f3ff83da0f607151bb2b6e49c2f741b5ada6944dbb478f076ef8d86380a 20-musl-astmm-fix.patch
+a43239189a1170d23d8f99d7658d8e064d4cc8149dd92d68e80d7af7a8fe181e0b111860ab13f12a91172c1e7f370c1a86679081b9ced98f4932fdfc64f04a49 30-asterisk-mariadb.patch
+ba33f11169284f190b7dabab1da7d2751cb65d7976408db635a892fa17d7552e1660350017e7aada3464ecc7d9d6e99d6ad76d66c0036de062a386cffbc948e6 40-asterisk-cdefs.patch
0044c5db468ec8f2385d18d476f89976f6d036448583a4ef8017ce7a6f8f72105337e6b20037ffe47f561d2877fc9c86720aef23ab037df89b36dc140a5924c4 asterisk.initd
ab6b6f08ff43268cbb1abb7ed7d678949991ba495682a644bbaeb017d6adbff0a43297905fd73ae8db1786a28d5b5904f1bc253209a0e388c8a27f26c6ce14ed asterisk.confd
7591d2faf539d05d9ee4e431c78a5e20686721fd79221ad94dffeeaff9282220b09cb9aec214bd7a8d12affaec0276c9c91e6e21af8b6712c0a9502b60b02f2b asterisk.logrotate"
diff --git a/main/avfs/APKBUILD b/main/avfs/APKBUILD
index 80f567e486..0560f39566 100644
--- a/main/avfs/APKBUILD
+++ b/main/avfs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: V.Krishn <vkrishn4@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=avfs
-pkgver=1.1.2
+pkgver=1.1.3
pkgrel=0
pkgdesc="A Virtual File System for looking into archives"
url="http://avf.sourceforge.net/"
@@ -37,5 +37,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="f54a82ed4f7f9abba3e9f02c76d3bf8693d8136010e7c628dbd82b960ea32d654f63c6e9d1237ee4bd794014a56d0cebcd4f4c3d29be8d00536fd676db3262b1 avfs-1.1.2.tar.bz2
+sha512sums="8e87655cbdb64f0cbbcc399142957ea9e04a998953cc64def9c8bb338b46abffc85a35e09b5fa52bb9ddcf56e27c4f62503050d32c8201eaad61c54e22bdd005 avfs-1.1.3.tar.bz2
281d36f65652a265781e305647a4c1c8f03b851ba458a0b7d9f36119f5489f3b16337019da2b8521695c9bb5cee7ee01ef0a040453c27e1f82f51d858f4940b5 fix-PATH_MAX.patch"
diff --git a/main/awall/APKBUILD b/main/awall/APKBUILD
index 75531b2fc3..7e282c3960 100644
--- a/main/awall/APKBUILD
+++ b/main/awall/APKBUILD
@@ -1,25 +1,24 @@
# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
pkgname=awall
-pkgver=1.7.3
-pkgrel=0
+pkgver=1.8.0
+pkgrel=1
pkgdesc="Alpine Wall"
-url="https://git.alpinelinux.org/cgit/awall/"
-_luaver=5.2
+url="https://gitlab.alpinelinux.org/alpine/awall"
+_luaver=5.3
arch="noarch"
license="GPL-2.0"
replaces="awall-nat"
depends="drill ip6tables ipset iptables lua$_luaver lua$_luaver-alt-getopt
lua$_luaver-cjson lua$_luaver-pc lua$_luaver-posix lua$_luaver-stringy
- xtables-addons"
+ lua$_luaver-lyaml xtables-addons"
subpackages="$pkgname-masquerade $pkgname-policies"
triggers="$pkgname.trigger=/usr/share/awall"
-source="https://dev.alpinelinux.org/archive/awall/awall-$pkgver.tar.xz
+source="$url/-/archive/v$pkgver/awall-v$pkgver.tar.bz2
awall-init
setup-firewall
"
-
-builddir=$srcdir/awall-$pkgver
+builddir=$srcdir/awall-v$pkgver
build() {
sed -i -e "1,1s:lua:lua$_luaver:" awall-cli
@@ -27,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
- make check
+ make LUA_VERSION=$_luaver check
}
package() {
- cd "$builddir"
make "ROOT_DIR=$pkgdir" LUA_VERSION=$_luaver install
install -D "$srcdir"/awall-init "$pkgdir"/usr/libexec/awall-init
}
@@ -54,6 +51,6 @@ policies() {
install -D "$srcdir"/setup-firewall "$subpkgdir"/usr/sbin/setup-firewall
}
-sha512sums="5a118f52a0f001273838f4e96fb393803c39adcc2df3c9d75171005634018284912cdcaff2709b886e14e97108aeecf4eafd05ce549573e47d230ab14ea64caf awall-1.7.3.tar.xz
+sha512sums="49b7d4847b3b1913daf74ed731459d9d74f283b33d62fa5a8864ae68b1e405c61aceaa2646bff6e9846f512298d7fe543979623adc9f5e8d613e63d04d22ff57 awall-v1.8.0.tar.bz2
e83ea3281c298092530e45fa5b62f6f85b9e5109b11e109799465ea832608294c7d9c4c3f5b0f321dfc0e82040daf3a17d066e9dea65cb0dbae2c453ea9e62cd awall-init
1cd4b7fa5fc6c9ac6667dff5cc00d96a3cc42aaccafe3c5562d3dcfd9f22ddec9cfe5a9339fee8001b67ccb8e8b81c9417f39a461e5052af9bf74a2753559bf7 setup-firewall"
diff --git a/main/axel/APKBUILD b/main/axel/APKBUILD
index 05cddc702d..03d70960ea 100644
--- a/main/axel/APKBUILD
+++ b/main/axel/APKBUILD
@@ -1,7 +1,7 @@
# Contributor:
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=axel
-pkgver=2.17.8
+pkgver=2.17.9
pkgrel=0
pkgdesc="A multiple-connection concurrent downloader"
url="https://github.com/axel-download-accelerator/axel"
@@ -12,6 +12,10 @@ makedepends="openssl-dev"
subpackages="$pkgname-doc"
source="$url/releases/download/v$pkgver/axel-$pkgver.tar.xz"
+# secfixes:
+# 2.17.8-r0:
+# - CVE-2020-13614
+
build() {
./configure \
--build=$CBUILD \
@@ -28,4 +32,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="9158cc0f1c7b54d84e5c15331ddcf6056b5eb654c0ad068e058eedbea99bb87c1b2e759b57872a86d76d83d6807500989ad6bbf87f1c0210db2d4dab100933ea axel-2.17.8.tar.xz"
+sha512sums="a0cabf43f451d61f4b1f4892a381fd5cf4088f7148502bf4e27d1c98177c3777bab9b732780cb9ba60c45aeead6cf9b79f870ac16db7148180f26350e69d8b01 axel-2.17.9.tar.xz"
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index b2de02cd88..023fd2b790 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=bacula
-pkgver=9.4.4
-pkgrel=3
+pkgver=9.6.5
+pkgrel=0
pkgdesc="Enterprise ready, network based backup program"
url="https://www.bacula.org"
arch="all"
@@ -11,7 +11,8 @@ makedepends="autoconf mariadb-connector-c-dev ncurses-dev openssl-dev postgresql
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
- $pkgname-client $pkgname-libs"
+ $pkgname-client-openrc:client_openrc $pkgname-client $pkgname-libs
+ $pkgname-openrc"
pkgusers="bacula"
pkggroups="bacula"
somask="libbaccats-$pkgver.so"
@@ -156,20 +157,24 @@ libs() {
mv "$pkgdir"/usr/lib/* "$subpkgdir"/usr/lib
}
+client_openrc() {
+ pkgdesc="Bacula client init script"
+ install -D -m755 "$pkgdir"/etc/init.d/$pkgname-fd \
+ "$subpkgdir"/etc/init.d/$pkgname-fd
+}
+
client() {
pkgdesc="Bacula client"
mkdir -p "$subpkgdir"/usr/sbin \
- "$subpkgdir"/etc/init.d \
"$subpkgdir"/etc/$pkgname
for bin in $pkgname $pkgname-fd bconsole btraceback; do
mv "$pkgdir"/usr/sbin/$bin "$subpkgdir"/usr/sbin
done
- mv "$pkgdir"/etc/init.d/$pkgname-fd "$subpkgdir"/etc/init.d
mv "$pkgdir"/etc/$pkgname/$pkgname-fd.conf "$subpkgdir"/etc/$pkgname/
install -d -o $pkgname -g $pkgname "$subpkgdir"/$_bworkdir
}
-sha512sums="f973c9ab8ee9867962645b1a1388b494fd402c990be8128b892e043e16361bff2fc08ec43e2c8c9bebeae9c94afd3fdbc04a610b35f99e7dd054ed1ad2c04b31 bacula-9.4.4.tar.gz
+sha512sums="4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70 bacula-9.6.5.tar.gz
bb954bb94bffa68ba80872046782a73012487291f019fb8d7ff77fc7f4325e25bee88612b3279b4db7d3c2002ac7448ffabcda62da7bab54642a7413904abc91 bacula-dir.initd
0505b9a74520af6982d5df4390525976f8e009e641d0acfe8f24b2ec9f155166a65eecbabee9ff70ffe188d523effa64f958acd8f657410b1c002a6d736e8aee bacula-sd.initd
91a53cb566cfd91b42a319bd6ff9947047cae187c6ec198767853d1a0253667d6c2c58f0e72ed43a7b9f40b76e705cafde7a1d6ac86577fa0f64f44b031dec11 bacula-fd.initd
diff --git a/main/bash-completion/APKBUILD b/main/bash-completion/APKBUILD
index 755e3fc95b..4d66dcd3a7 100644
--- a/main/bash-completion/APKBUILD
+++ b/main/bash-completion/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
# Maintainer: Lucas Ramage <ramage.lucas@openmailbox.org>
pkgname=bash-completion
-pkgver=2.10
+pkgver=2.11
pkgrel=0
pkgdesc="Command-line tab-completion for bash"
options="!check" # 7 Tests fail
@@ -14,7 +14,6 @@ makedepends="autoconf automake bc grep iputils musl-utils procps psmisc sed usbu
checkdepends="py3-pexpect py3-pytest"
subpackages="$pkgname-doc"
source="https://github.com/scop/bash-completion/releases/download/$pkgver/bash-completion-$pkgver.tar.xz"
-builddir="$srcdir"/$pkgname-$pkgver
# Provided with util-linux and networkmanager:
_conflicting="
@@ -39,7 +38,6 @@ _conflicting="
"
prepare() {
- cd "$builddir"
default_prepare
# ifup/down tests are still failing
@@ -51,7 +49,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -63,7 +60,6 @@ build() {
}
check() {
- cd "$builddir"
mkdir ./bin
ln -sf "$(command -v pytest-3)" ./bin/pytest
export PATH="${PATH}:$PWD/bin"
@@ -71,7 +67,6 @@ check() {
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
@@ -84,4 +79,4 @@ package() {
done
}
-sha512sums="d434e0e48b25328e8c6b43ed64e58f56459186434754ee972795edd031ce1864038b53926b218fe06e5b3882682db4dec5101b3124362c0137101d3fa6d87cd7 bash-completion-2.10.tar.xz"
+sha512sums="41585f730b5114d397831ba36d10d05643c6a6179e746ddc49aa1cbef61ea5525fd2f09b2e474adee14e647f99df8d5983ee48e29a59d8a30e1daf7fb1837e06 bash-completion-2.11.tar.xz"
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index cdeff0e885..78f1e38134 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.0.17
+pkgver=5.0.18
_patchlevel=${pkgver##*.}
_myver=${pkgver%.*}
_patchbase=${_myver/./}
@@ -110,4 +110,5 @@ cbf51bb242edf36289bd483b47c9451132c12f341f494212c0e5d969cd06a3c1c4d121295f3bacb1
e8f65be24b425ecaf66672eb4271e0efac2f495f882aeb559d60b52359a468b51852ed7aeeea0ab77cf648a48c9d37f2a00e263d06d29e9fa75b67a648399d91 bash50-014
3a1a552d1f03dec9ed41be8d8c319fb3cbd01df9978ab25a7b37322913014beca6703980f342ea908250b666d72db95402d7b8219ffdd3df717acb36ed4b72b9 bash50-015
dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa bash50-016
-d4a4b2746a106a7e78f7df2467cfd4ca486ab36b3e6e97eb9d47ede728033b1246bc1b60edc271cdb49df998af196619b09e598c0da1b425f05455237e256b65 bash50-017"
+d4a4b2746a106a7e78f7df2467cfd4ca486ab36b3e6e97eb9d47ede728033b1246bc1b60edc271cdb49df998af196619b09e598c0da1b425f05455237e256b65 bash50-017
+cfbad36b1805ad76cb21d9136843171d794e57383318a014522e2d35905cf262d6721615f0a79972cacc45152de636977c957cbbad08ccb52f96de40b09bba5c bash50-018"
diff --git a/main/bats/APKBUILD b/main/bats/APKBUILD
index c022da9b7a..8d1ea735bf 100644
--- a/main/bats/APKBUILD
+++ b/main/bats/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Jose-Luis Rivas <ghostbar@riseup.net>
pkgname=bats
-pkgver=1.2.0
+pkgver=1.2.1
pkgrel=0
pkgdesc="Bash Automated Testing System"
url="https://github.com/bats-core/bats-core"
@@ -18,4 +18,4 @@ check() {
package() {
./install.sh "$pkgdir"/usr
}
-sha512sums="54072dc4bd59e62252ed5ec662c748957401e662ffbdabc61f99bc0e6b51b4d845832cd41b3688c92e99399a860101437ed39eddccf0da5d48c6064b95ab020c bats-1.2.0.zip"
+sha512sums="bd7a334a558471f691552e18362ed55882e3cdb4dbbb5ebd2c0cc5f40bbd09a4a44b8e91d0d8ce51059a84c745b30c533f3e8444c6588ab355865340a98c079b bats-1.2.1.zip"
diff --git a/main/bctoolbox/APKBUILD b/main/bctoolbox/APKBUILD
index b9a5a5c0ce..43a089aabe 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.3.1
+pkgver=4.4.0
pkgrel=0
pkgdesc="Utilities library used by Belledonne Communications softwares like belle-sip, mediastreamer2 and linphone"
url="https://github.com/BelledonneCommunications/bctoolbox"
@@ -46,5 +46,5 @@ dev() {
rmdir "$pkgdir"/usr/share
}
-sha512sums="89d4ead8f08fa6e20735e4cfb29666273e1cb47c23e8ed8c3992b53eae966188a57e68259a224b2857fdf8b1f829784c8ad661cac9fbee6f99b8e2493c067a72 bctoolbox-4.3.1.tar.gz
+sha512sums="cebe83d1ff3cc99e8b91b6e90488595aecae0b93ef235864074a7a0b82a593952be4a70b9feb5141a0c3d49c63eaca68ef0683d6473606f8d98bba2db36f9e0f bctoolbox-4.4.0.tar.gz
466d2a7aa33952c8086c698030af0addc79373aa31104cbe6133d352682439ae5c30055ea4f162cc9b6b9fc54bf3dea0ddcff78e0042e7ce43833d82b9487116 cmake-bcunit-fix.patch"
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index 8c2e17c30e..29e8992e1b 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -5,14 +5,14 @@
# Contributor: ungleich <alpinelinux@ungleich.ch>
# Maintainer:
pkgname=bind
-pkgver=9.14.12
+pkgver=9.16.5
_ver=${pkgver%_p*}
_p=${pkgver#*_p}
_major=${pkgver%%.*}
[ "$_p" != "$pkgver" ] && _ver="$_ver-P$_p"
pkgrel=0
pkgdesc="The ISC DNS server"
-url="https://www.isc.org"
+url="https://www.isc.org/"
arch="all"
license="MPL-2.0"
pkgusers="named"
@@ -30,6 +30,7 @@ makedepends="
json-c-dev
krb5-dev
libcap-dev
+ libuv-dev
libxml2-dev
linux-headers
openldap-dev
@@ -47,7 +48,7 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc
$pkgname-plugins $pkgname-tools
"
source="
- https://downloads.isc.org/isc/${pkgname}$_major/$_ver/$pkgname-$_ver.tar.gz
+ https://downloads.isc.org/isc/${pkgname}$_major/$_ver/$pkgname-$_ver.tar.xz
bind.plugindir.patch
bind.so_bsdcompat.patch
named.initd
@@ -59,6 +60,9 @@ source="
"
# secfixes:
+# 9.16.4-r0:
+# - CVE-2020-8618
+# - CVE-2020-8619
# 9.14.12-r0:
# - CVE-2020-8616
# - CVE-2020-8617
@@ -96,7 +100,7 @@ source="
prepare() {
default_prepare
# Adjusting PATHs in manpages
- for i in bin/named/named.8 bin/check/named-checkconf.8 bin/rndc/rndc.8; do
+ for i in bin/named/named.rst bin/check/named-checkconf.rst bin/rndc/rndc.rst; do
sed -i \
-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
@@ -106,7 +110,7 @@ prepare() {
}
build() {
- ### http://bugs.gentoo.org/show_bug.cgi?id=227333
+ ### https://bugs.gentoo.org/show_bug.cgi?id=227333
export CFLAGS="$CFLAGS -D_GNU_SOURCE"
./configure \
@@ -169,13 +173,6 @@ package() {
ln -s named.ca root.cache
}
-dev() {
- default_dev
-
- mkdir -p "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/isc-config.sh "$subpkgdir"/usr/bin/
-}
-
_py3() {
pkgdesc="A module allowing rndc commands to be sent from Python programs"
depends="$_py3deps"
@@ -250,7 +247,7 @@ gpgfingerprints="
BE0E 9748 B718 253A 28BB 89FF F1B1 1BF0 5CF0 2E57
"
-sha512sums="f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf bind-9.14.12.tar.gz
+sha512sums="789fc19f60e81f67ef13ebacd030ea5d8f8cc42cf5f06a01ee2eefe9b7c6d3b10603a3a6a3df85b0e5d770fcf462ce8dddc3a7e5f7f2dab27aa5879ee5380eb7 bind-9.16.5.tar.xz
2b32d1e7f62cd1e01bb4fdd92d15460bc14761b933d5acc463a91f5ecd4773d7477c757c5dd2738e8e433693592cf3f623ffc142241861c91848f01aa84640d6 bind.plugindir.patch
7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch
53db80f7ee4902f42fb1d0bc959242bcb6f20d95256bda99ce2c206af8b4703c7f72bb26d026c633f70451b84a37c3946b210951e34dd5d6620b181cd0183de4 named.initd
diff --git a/main/bison/APKBUILD b/main/bison/APKBUILD
index fdd23c8dd2..43dad81555 100644
--- a/main/bison/APKBUILD
+++ b/main/bison/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bison
-pkgver=3.6.2
+pkgver=3.6.4
pkgrel=0
pkgdesc="The GNU general-purpose parser generator"
arch="all"
@@ -35,4 +35,4 @@ package() {
rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
}
-sha512sums="69f5b6d9f28e0fe2d127a86e1315b06f3367c4d1cb667c0f0eee537fd5705d702d2a8db51204d7928db83efa83208cb5f738b27453eac6e2fd5037e8ffd0cd19 bison-3.6.2.tar.xz"
+sha512sums="041cd87f4ca6b012031719a49aa81e62d3c0817c6364289732e6a3cb9a0762498760e0f2ce84c03ca9e9b74eb74bdffd1b8b86d2b4a6e4a0d8c8a4b864b672dc bison-3.6.4.tar.xz"
diff --git a/main/bmd-tools/APKBUILD b/main/bmd-tools/APKBUILD
index 50364e3169..482eb62e9a 100644
--- a/main/bmd-tools/APKBUILD
+++ b/main/bmd-tools/APKBUILD
@@ -1,39 +1,29 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=bmd-tools
pkgver=1.0.2
-pkgrel=0
+pkgrel=2
pkgdesc="Tools for Blackmagic USB video encoders"
url="https://github.com/fabled/bmd-tools"
arch="all"
-license="GPL-2.0"
-depends=""
+license="MIT"
makedepends="libusb-dev"
-install=""
-subpackages=""
source="bmd-tools-$pkgver.tar.gz::https://github.com/fabled/bmd-tools/archive/v$pkgver.tar.gz
bmd-streamer.initd
bmd-streamer.confd
"
-builddir="$srcdir"/$pkgname-$pkgver
-
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
-
mkdir -p "$pkgdir"/usr/bin
install -s -m755 bmd-streamer bmd-extractfw \
"$pkgdir"/usr/bin
- install -m755 -D "$srcdir"/bmd-streamer.initd \
- "$pkgdir"/etc/init.d/bmd-streamer
- install -m755 -D "$srcdir"/bmd-streamer.confd \
- "$pkgdir"/etc/conf.d/bmd-streamer
+ install -Dm755 "$srcdir"/bmd-streamer.initd "$pkgdir"/etc/init.d/bmd-streamer
+ install -Dm644 "$srcdir"/bmd-streamer.confd "$pkgdir"/etc/conf.d/bmd-streamer
}
sha512sums="bcd6375c23541ef65e8cdf9222c94c4d90bf43976524987c0464b8570533efad15f955eac83e60651bc7295493f5f6f4322ac7a326df747ca88b626ad7654265 bmd-tools-1.0.2.tar.gz
diff --git a/main/bridge-utils/APKBUILD b/main/bridge-utils/APKBUILD
index 890bd41840..de77c9f2b4 100644
--- a/main/bridge-utils/APKBUILD
+++ b/main/bridge-utils/APKBUILD
@@ -1,24 +1,20 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bridge-utils
-pkgver=1.6
+pkgver=1.7
pkgrel=0
pkgdesc="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
-url="https://www.kernel.org/pub/linux/utils/net/bridge-utils/"
+url="https://wiki.linuxfoundation.org/networking/bridge/"
arch="all"
license="GPL-2.0-or-later"
subpackages="$pkgname-doc"
-depends=""
makedepends="autoconf linux-headers"
-source="https://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz"
-builddir="$srcdir"/$pkgname-$pkgver
-
+source="https://kernel.org/pub/linux/kernel/people/shemminger/bridge-utils/bridge-utils-$pkgver.tar.xz"
prepare() {
default_prepare
autoconf
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +23,10 @@ build() {
--libdir=/usr/lib \
--includedir=/usr/include
make
- test -x brctl/brctl
}
package() {
- cd "$builddir"
make install DESTDIR="$pkgdir"
}
-sha512sums="b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02 bridge-utils-1.6.tar.xz"
+sha512sums="e9bc27bddcc8cb644a7e02da615e262b42c8600e5aefa5f02771882be9e8a50b33e533b8711c8591be3397b323c10056103e611f620b92f344ce6f59d603d301 bridge-utils-1.7.tar.xz"
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index 846b643cf6..9d81a92c7c 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.6.1
+pkgver=5.7
pkgrel=0
pkgdesc="BTRFS filesystem utilities"
url="https://btrfs.wiki.kernel.org"
@@ -75,4 +75,4 @@ extra() {
rmdir "$subpkgdir"/usr/lib
}
-sha512sums="8f523249a5c2bfe1c0d52b0dc5d31d52b330b1c616d3ec423fa1fb4a845441bfeaa32abbe42a444a4fc84016a482c8102a3eb451ac423b542e332e9c26e76dc6 btrfs-progs-v5.6.1.tar.xz"
+sha512sums="72c3af13ca589f2e0b96cb7602319035ef8aab6ee224fff3544a5d0bfc013a66552dde4533ec5e64696d404b8905431cd0f25367c40fd34ea39be7c0ed8c2d16 btrfs-progs-v5.7.tar.xz"
diff --git a/main/busybox/0001-Revert-ash-jobs-Only-clear-gotsigchld-when-waiting-f.patch b/main/busybox/0001-Revert-ash-jobs-Only-clear-gotsigchld-when-waiting-f.patch
new file mode 100644
index 0000000000..69c55e1605
--- /dev/null
+++ b/main/busybox/0001-Revert-ash-jobs-Only-clear-gotsigchld-when-waiting-f.patch
@@ -0,0 +1,212 @@
+From e1ac00f597fa3f10dd1fe0e45bd9694e961ac248 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Mon, 27 Jul 2020 10:59:18 +0000
+Subject: [PATCH] Revert "ash: jobs: Only clear gotsigchld when waiting for
+ everything"
+
+This reverts commit 47eb979404735b9528538968cb5eaac7355a0c5a.
+---
+ shell/ash.c | 122 ++++++++++++++++++++++++++++------------------------
+ 1 file changed, 66 insertions(+), 56 deletions(-)
+
+diff --git a/shell/ash.c b/shell/ash.c
+index ecb9b132b..2214557a8 100644
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -3795,6 +3795,8 @@ static struct job *jobtab; //5
+ static unsigned njobs; //4
+ /* current job */
+ static struct job *curjob; //lots
++/* number of presumed living untracked jobs */
++static int jobless; //4
+
+ #if 0
+ /* Bash has a feature: it restores termios after a successful wait for
+@@ -4325,7 +4327,7 @@ wait_block_or_sig(int *status)
+ #endif
+
+ static int
+-waitone(int block, struct job *job)
++dowait(int block, struct job *job)
+ {
+ int pid;
+ int status;
+@@ -4426,6 +4428,10 @@ waitone(int block, struct job *job)
+ goto out;
+ }
+ /* The process wasn't found in job list */
++#if JOBS
++ if (!WIFSTOPPED(status))
++ jobless--;
++#endif
+ out:
+ INT_ON;
+
+@@ -4450,20 +4456,6 @@ waitone(int block, struct job *job)
+ return pid;
+ }
+
+-static int
+-dowait(int block, struct job *jp)
+-{
+- int pid = block == DOWAIT_NONBLOCK ? got_sigchld : 1;
+-
+- while (jp ? jp->state == JOBRUNNING : pid > 0) {
+- if (!jp)
+- got_sigchld = 0;
+- pid = waitone(block, jp);
+- }
+-
+- return pid;
+-}
+-
+ #if JOBS
+ static void
+ showjob(struct job *jp, int mode)
+@@ -4552,7 +4544,8 @@ showjobs(int mode)
+ TRACE(("showjobs(0x%x) called\n", mode));
+
+ /* Handle all finished jobs */
+- dowait(DOWAIT_NONBLOCK, NULL);
++ while (dowait(DOWAIT_NONBLOCK, NULL) > 0)
++ continue;
+
+ for (jp = curjob; jp; jp = jp->prev_job) {
+ if (!(mode & SHOW_CHANGED) || jp->changed) {
+@@ -4669,10 +4662,10 @@ waitcmd(int argc UNUSED_PARAM, char **argv)
+ #else
+ dowait(DOWAIT_BLOCK_OR_SIG, NULL);
+ #endif
+- /* if child sends us a signal *and immediately exits*,
+- * dowait() returns pid > 0. Check this case,
+- * not "if (dowait() < 0)"!
+- */
++ /* if child sends us a signal *and immediately exits*,
++ * dowait() returns pid > 0. Check this case,
++ * not "if (dowait() < 0)"!
++ */
+ if (pending_sig)
+ goto sigout;
+ #if BASH_WAIT_N
+@@ -4708,9 +4701,11 @@ waitcmd(int argc UNUSED_PARAM, char **argv)
+ job = getjob(*argv, 0);
+ }
+ /* loop until process terminated or stopped */
+- dowait(DOWAIT_BLOCK_OR_SIG, NULL);
+- if (pending_sig)
+- goto sigout;
++ while (job->state == JOBRUNNING) {
++ dowait(DOWAIT_BLOCK_OR_SIG, NULL);
++ if (pending_sig)
++ goto sigout;
++ }
+ job->waited = 1;
+ retval = getstatus(job);
+ repeat: ;
+@@ -5262,6 +5257,7 @@ forkchild(struct job *jp, union node *n, int mode)
+ #endif
+ for (jp = curjob; jp; jp = jp->prev_job)
+ freejob(jp);
++ jobless = 0;
+ }
+
+ /* Called after fork(), in parent */
+@@ -5272,8 +5268,13 @@ static void
+ forkparent(struct job *jp, union node *n, int mode, pid_t pid)
+ {
+ TRACE(("In parent shell: child = %d\n", pid));
+- if (!jp) /* jp is NULL when called by openhere() for heredoc support */
++ if (!jp) {
++ /* jp is NULL when called by openhere() for heredoc support */
++ while (jobless && dowait(DOWAIT_NONBLOCK, NULL) > 0)
++ continue;
++ jobless++;
+ return;
++ }
+ #if JOBS
+ if (mode != FORK_NOJOB && jp->jobctl) {
+ int pgrp;
+@@ -5352,39 +5353,48 @@ waitforjob(struct job *jp)
+
+ TRACE(("waitforjob(%%%d) called\n", jp ? jobno(jp) : 0));
+
+- /* In non-interactive shells, we _can_ get
+- * a keyboard signal here and be EINTRed, but we just loop
+- * inside dowait(), waiting for command to complete.
+- *
+- * man bash:
+- * "If bash is waiting for a command to complete and receives
+- * a signal for which a trap has been set, the trap
+- * will not be executed until the command completes."
+- *
+- * Reality is that even if trap is not set, bash
+- * will not act on the signal until command completes.
+- * Try this. sleep5intoff.c:
+- * #include <signal.h>
+- * #include <unistd.h>
+- * int main() {
+- * sigset_t set;
+- * sigemptyset(&set);
+- * sigaddset(&set, SIGINT);
+- * sigaddset(&set, SIGQUIT);
+- * sigprocmask(SIG_BLOCK, &set, NULL);
+- * sleep(5);
+- * return 0;
+- * }
+- * $ bash -c './sleep5intoff; echo hi'
+- * ^C^C^C^C <--- pressing ^C once a second
+- * $ _
+- * $ bash -c './sleep5intoff; echo hi'
+- * ^\^\^\^\hi <--- pressing ^\ (SIGQUIT)
+- * $ _
+- */
+- dowait(jp ? DOWAIT_BLOCK : DOWAIT_NONBLOCK, jp);
+- if (!jp)
++ if (!jp) {
++ int pid = got_sigchld;
++
++ while (pid > 0)
++ pid = dowait(DOWAIT_NONBLOCK, NULL);
++
+ return exitstatus;
++ }
++
++ while (jp->state == JOBRUNNING) {
++ /* In non-interactive shells, we _can_ get
++ * a keyboard signal here and be EINTRed,
++ * but we just loop back, waiting for command to complete.
++ *
++ * man bash:
++ * "If bash is waiting for a command to complete and receives
++ * a signal for which a trap has been set, the trap
++ * will not be executed until the command completes."
++ *
++ * Reality is that even if trap is not set, bash
++ * will not act on the signal until command completes.
++ * Try this. sleep5intoff.c:
++ * #include <signal.h>
++ * #include <unistd.h>
++ * int main() {
++ * sigset_t set;
++ * sigemptyset(&set);
++ * sigaddset(&set, SIGINT);
++ * sigaddset(&set, SIGQUIT);
++ * sigprocmask(SIG_BLOCK, &set, NULL);
++ * sleep(5);
++ * return 0;
++ * }
++ * $ bash -c './sleep5intoff; echo hi'
++ * ^C^C^C^C <--- pressing ^C once a second
++ * $ _
++ * $ bash -c './sleep5intoff; echo hi'
++ * ^\^\^\^\hi <--- pressing ^\ (SIGQUIT)
++ * $ _
++ */
++ dowait(DOWAIT_BLOCK, jp);
++ }
+
+ st = getstatus(jp);
+ #if JOBS
+--
+2.27.0
+
diff --git a/main/busybox/0001-ln-no-target-directory-implies-no-dereference.patch b/main/busybox/0001-ln-no-target-directory-implies-no-dereference.patch
deleted file mode 100644
index e4f5071884..0000000000
--- a/main/busybox/0001-ln-no-target-directory-implies-no-dereference.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 71b268c7d962a819f88050c2567dced975aa249e Mon Sep 17 00:00:00 2001
-From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Date: Tue, 8 Oct 2019 14:07:50 +0200
-Subject: [PATCH] ln: --no-target-directory implies --no-dereference
-
-as in GNU coreutils
-
-Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- coreutils/ln.c | 25 +++++++++++++++++++++----
- 1 file changed, 21 insertions(+), 4 deletions(-)
-
-diff --git a/coreutils/ln.c b/coreutils/ln.c
-index ea2d10eab..5591e8335 100644
---- a/coreutils/ln.c
-+++ b/coreutils/ln.c
-@@ -41,7 +41,6 @@
-
- /* This is a NOEXEC applet. Be very careful! */
-
--
- #define LN_SYMLINK (1 << 0)
- #define LN_FORCE (1 << 1)
- #define LN_NODEREFERENCE (1 << 2)
-@@ -63,7 +62,22 @@ int ln_main(int argc, char **argv)
- int (*link_func)(const char *, const char *);
-
- opts = getopt32(argv, "^" "sfnbS:vT" "\0" "-1", &suffix);
--
-+/*
-+ -s, --symbolic make symbolic links instead of hard links
-+ -f, --force remove existing destination files
-+ -n, --no-dereference treat LINK_NAME as a normal file if it is a symbolic link to a directory
-+ -b like --backup but does not accept an argument
-+ --backup[=CONTROL] make a backup of each existing destination file
-+ -S, --suffix=SUFFIX override the usual backup suffix
-+ -v, --verbose
-+ -T, --no-target-directory
-+ -d, -F, --directory allow the superuser to attempt to hard link directories
-+ -i, --interactive prompt whether to remove destinations
-+ -L, --logical dereference TARGETs that are symbolic links
-+ -P, --physical make hard links directly to symbolic links
-+ -r, --relative create symbolic links relative to link location
-+ -t, --target-directory=DIRECTORY specify the DIRECTORY in which to create the links
-+ */
- last = argv[argc - 1];
- argv += optind;
- argc -= optind;
-@@ -86,8 +100,11 @@ int ln_main(int argc, char **argv)
- src = last;
-
- if (is_directory(src,
-- (opts & LN_NODEREFERENCE) ^ LN_NODEREFERENCE
-- )
-+ /*followlinks:*/ !(opts & (LN_NODEREFERENCE|LN_LINKFILE))
-+ /* Why LN_LINKFILE does not follow links:
-+ * -T/--no-target-directory implies -n/--no-dereference
-+ */
-+ )
- ) {
- if (opts & LN_LINKFILE) {
- bb_error_msg_and_die("'%s' is a directory", src);
---
-2.20.1
-
diff --git a/main/busybox/0001-properly-fix-wget-https-support.patch b/main/busybox/0001-properly-fix-wget-https-support.patch
index 81ac38e350..f628901c4b 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 4fcea48c7a0c6b63a316764932f7ba4854e444f9 Mon Sep 17 00:00:00 2001
+From 50fff6ca286c9efcc43dbd25d672fee1e427b7c6 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,7 +9,7 @@ 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 30683dfc0..1ad4e1769 100644
+index 6a8c08324..a39766a1f 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -51,7 +51,6 @@
@@ -20,20 +20,20 @@ index 30683dfc0..1ad4e1769 100644
//config: help
//config: wget will use internal TLS code to connect to https:// URLs.
//config: Note:
-@@ -717,10 +716,8 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
+@@ -736,10 +735,8 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
int pid;
char *servername, *p;
- if (!(option_mask32 & WGET_OPT_NO_CHECK_CERT)) {
- option_mask32 |= WGET_OPT_NO_CHECK_CERT;
-- bb_error_msg("note: TLS certificate validation not implemented");
+- bb_simple_error_msg("note: TLS certificate validation not implemented");
- }
+ if (ENABLE_SSL_CLIENT && !(option_mask32 & WGET_OPT_NO_CHECK_CERT))
-+ bb_error_msg_and_die("note: TLS certificate validation not implemented");
++ bb_simple_error_msg_and_die("note: TLS certificate validation not implemented");
servername = xstrdup(host);
p = strrchr(servername, ':');
-@@ -737,14 +734,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
+@@ -756,14 +753,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 30683dfc0..1ad4e1769 100644
xmove_fd(network_fd, 3);
argv[0] = (char*)"ssl_client";
-@@ -752,8 +749,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
+@@ -771,8 +768,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/0005-udhcpc-set-default-discover-retries-to-5.patch b/main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch
index 303b5cd860..086959468c 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,4 +1,4 @@
-From ed9d54e8920e6f90ddda8519c761217685c07044 Mon Sep 17 00:00:00 2001
+From 38d7a4f9edda522ea504930ede17491a6c3253b3 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 4 Aug 2016 11:08:35 +0200
Subject: [PATCH] udhcpc: set default discover retries to 5
@@ -9,19 +9,19 @@ Some slower nics needs more attempts to get a lease
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
-index c2805a009..0b14b0332 100644
+index 102178a4f..1a0152d0c 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
-@@ -1197,7 +1197,7 @@ static void client_background(void)
+@@ -1165,7 +1165,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)"
-//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: "\n -n Exit if lease is not obtained"
- //usage: "\n -q Exit after obtaining lease"
-@@ -1242,7 +1242,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
+ //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)
llist_t *list_x = NULL;
int tryagain_timeout = 20;
int discover_timeout = 3;
diff --git a/main/busybox/0006-ping-make-ping-work-without-root-privileges.patch b/main/busybox/0006-ping-make-ping-work-without-root-privileges.patch
index 9bdeb7208d..40ade91782 100644
--- a/main/busybox/0006-ping-make-ping-work-without-root-privileges.patch
+++ b/main/busybox/0006-ping-make-ping-work-without-root-privileges.patch
@@ -1,4 +1,4 @@
-From 9513a2daae84660f2ddd7d60d39bb49cd678adbe Mon Sep 17 00:00:00 2001
+From b82f49ced05dbf6ccee728380e9d78744454bcb0 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 29 Mar 2016 18:59:22 +0200
Subject: [PATCH] ping: make ping work without root privileges
@@ -8,10 +8,10 @@ Subject: [PATCH] ping: make ping work without root privileges
1 file changed, 87 insertions(+), 16 deletions(-)
diff --git a/networking/ping.c b/networking/ping.c
-index 8f85d3ec2..dc3f50968 100644
+index a47342fee..88484e272 100644
--- a/networking/ping.c
+++ b/networking/ping.c
-@@ -165,6 +165,7 @@ enum {
+@@ -167,6 +167,7 @@ enum {
pingsock = 0,
};
@@ -19,15 +19,15 @@ index 8f85d3ec2..dc3f50968 100644
static void
#if ENABLE_PING6
create_icmp_socket(len_and_sockaddr *lsa)
-@@ -181,9 +182,23 @@ create_icmp_socket(void)
+@@ -183,9 +184,23 @@ create_icmp_socket(void)
#endif
sock = socket(AF_INET, SOCK_RAW, 1); /* 1 == ICMP */
if (sock < 0) {
- if (errno == EPERM)
-- bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
-- bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
+- bb_simple_error_msg_and_die(bb_msg_perm_denied_are_you_root);
+- bb_simple_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
+ if (errno != EPERM)
-+ bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
++ bb_simple_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
+#if defined(__linux__) || defined(__APPLE__)
+ /* We don't have root privileges. Try SOCK_DGRAM instead.
+ * Linux needs net.ipv4.ping_group_range for this to work.
@@ -41,13 +41,13 @@ index 8f85d3ec2..dc3f50968 100644
+ sock = socket(AF_INET, SOCK_DGRAM, 1); /* 1 == ICMP */
+ if (sock < 0)
+#endif
-+ bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
++ bb_simple_error_msg_and_die(bb_msg_perm_denied_are_you_root);
+ using_dgram = 1;
}
xmove_fd(sock, pingsock);
-@@ -236,10 +251,12 @@ static void ping4(len_and_sockaddr *lsa)
- bb_perror_msg("recvfrom");
+@@ -238,10 +253,12 @@ static void ping4(len_and_sockaddr *lsa)
+ bb_simple_perror_msg("recvfrom");
continue;
}
- if (c >= 76) { /* ip + icmp */
@@ -62,7 +62,7 @@ index 8f85d3ec2..dc3f50968 100644
if (pkt->icmp_id != G.myid)
continue; /* not our ping */
if (pkt->icmp_type == ICMP_ECHOREPLY)
-@@ -636,19 +653,21 @@ static void unpack_tail(int sz, uint32_t *tp,
+@@ -646,19 +663,21 @@ static void unpack_tail(int sz, uint32_t *tp,
}
static int unpack4(char *buf, int sz, struct sockaddr_in *from)
{
@@ -90,7 +90,7 @@ index 8f85d3ec2..dc3f50968 100644
if (icmppkt->icmp_id != myid)
return 0; /* not our ping */
-@@ -660,7 +679,7 @@ static int unpack4(char *buf, int sz, struct sockaddr_in *from)
+@@ -670,7 +689,7 @@ static int unpack4(char *buf, int sz, struct sockaddr_in *from)
tp = (uint32_t *) icmppkt->icmp_data;
unpack_tail(sz, tp,
inet_ntoa(*(struct in_addr *) &from->sin_addr.s_addr),
@@ -99,7 +99,7 @@ index 8f85d3ec2..dc3f50968 100644
return 1;
}
if (icmppkt->icmp_type != ICMP_ECHO) {
-@@ -710,11 +729,31 @@ static void ping4(len_and_sockaddr *lsa)
+@@ -720,11 +739,31 @@ static void ping4(len_and_sockaddr *lsa)
int sockopt;
pingaddr.sin = lsa->u.sin;
@@ -107,7 +107,7 @@ index 8f85d3ec2..dc3f50968 100644
+ if (source_lsa && !using_dgram) {
if (setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_IF,
&source_lsa->u.sa, source_lsa->len))
- bb_error_msg_and_die("can't set multicast source interface");
+ bb_simple_error_msg_and_die("can't set multicast source interface");
xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
+ } else if(using_dgram) {
+ struct sockaddr_in sa;
@@ -132,7 +132,7 @@ index 8f85d3ec2..dc3f50968 100644
}
/* enable broadcast pings */
-@@ -731,6 +770,15 @@ static void ping4(len_and_sockaddr *lsa)
+@@ -741,6 +780,15 @@ static void ping4(len_and_sockaddr *lsa)
setsockopt_int(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, opt_ttl);
}
@@ -148,7 +148,7 @@ index 8f85d3ec2..dc3f50968 100644
signal(SIGINT, print_stats_and_exit);
/* start the ping's going ... */
-@@ -768,10 +816,33 @@ static void ping6(len_and_sockaddr *lsa)
+@@ -778,10 +826,33 @@ static void ping6(len_and_sockaddr *lsa)
char control_buf[CMSG_SPACE(36)];
pingaddr.sin6 = lsa->u.sin6;
@@ -183,9 +183,9 @@ index 8f85d3ec2..dc3f50968 100644
{
struct icmp6_filter filt;
if (!(option_mask32 & OPT_VERBOSE)) {
-@@ -911,7 +982,7 @@ static int common_ping_main(int opt, char **argv)
- G.deadline_us = 1 | ((d * 1000000) + monotonic_us());
- }
+@@ -927,7 +998,7 @@ static int common_ping_main(int opt, char **argv)
+ interval = INT_MAX/1000000;
+ G.interval_us = interval * 1000000;
- myid = (uint16_t) getpid();
+ if (!using_dgram) myid = (uint16_t) getpid();
diff --git a/main/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch b/main/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch
index a0a56a006d..9f697a564b 100644
--- a/main/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch
+++ b/main/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch
@@ -1,4 +1,4 @@
-From 24f932672e826e8f93955d0c6dd6bca140f3fa98 Mon Sep 17 00:00:00 2001
+From 8d76137506e9c65404280694e56d9a7629d58280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Sun, 25 Oct 2015 22:21:41 +0200
Subject: [PATCH] depmod: support generating kmod binary index files
@@ -37,7 +37,7 @@ index 188296814..7a4c037ad 100644
bool "Support module.symbols file"
default y
diff --git a/modutils/depmod.c b/modutils/depmod.c
-index 004c67a11..05c1a9bce 100644
+index b5244fc60..26e223753 100644
--- a/modutils/depmod.c
+++ b/modutils/depmod.c
@@ -2,7 +2,7 @@
@@ -182,7 +182,7 @@ index 004c67a11..05c1a9bce 100644
+ break;
+
+ if (ch < INDEX_MINCHAR || ch >= INDEX_MAXCHAR)
-+ bb_error_msg_and_die("bad module name");
++ bb_simple_error_msg_and_die("bad module name");
+
+ ch -= INDEX_MINCHAR;
+ if (!cur->children[ch]) {
@@ -281,7 +281,7 @@ index 004c67a11..05c1a9bce 100644
+ fwrite(header, sizeof(uint32_t), 3, out);
+ if (fclose(out)) {
+ remove(filename);
-+ bb_error_msg_and_die(bb_msg_write_error);
++ bb_simple_error_msg_and_die(bb_msg_write_error);
+ }
+ /* .bin files are mmap'ed; not renaming it may crash
+ * long standing daemon using libkmod */
@@ -396,7 +396,7 @@ index 004c67a11..05c1a9bce 100644
if (ENABLE_FEATURE_CLEAN_UP)
moddb_free(&modules);
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
-index 59f6d54f3..0a398a60f 100644
+index 0a372a049..20a60c1a6 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -192,21 +192,6 @@ struct globals {
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 82bd1222ab..8d4a488014 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,4 +1,4 @@
-From 8e43e4ad948c5db6144d49d8968d30dbfb4b5afb Mon Sep 17 00:00:00 2001
+From a74c9074136192461b459df3f10a08ad416f4cb4 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 6 Jul 2017 13:39:15 +0200
Subject: [PATCH] udhcpc: Don't background if -n is given
@@ -21,21 +21,21 @@ 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 422b88882..f09bdf617 100644
+index fc2d672b7..bf9363bac 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
-@@ -1360,25 +1360,19 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
+@@ -1432,25 +1432,19 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
}
leasefail:
d6_run_script_no_option("leasefail");
+ if (opt & OPT_n) { /* abort if no lease */
-+ bb_info_msg("no lease, failing");
++ bb_simple_info_msg("no lease, failing");
+ retval = 1;
+ goto ret;
+ }
#if BB_MMU /* -b is not supported on NOMMU */
if (opt & OPT_b) { /* background if no lease */
- bb_info_msg("no lease, forking to background");
+ bb_simple_info_msg("no lease, forking to background");
client_background();
/* do not background again! */
- opt = ((opt & ~(OPT_b|OPT_n)) | OPT_f);
@@ -48,7 +48,7 @@ index 422b88882..f09bdf617 100644
- } else
-#endif
- if (opt & OPT_n) { /* abort if no lease */
-- bb_info_msg("no lease, failing");
+- bb_simple_info_msg("no lease, failing");
- retval = 1;
- goto ret;
+ opt = ((opt & ~OPT_b) | OPT_f);
@@ -58,21 +58,21 @@ index 422b88882..f09bdf617 100644
timeout = tryagain_timeout;
packet_num = 0;
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
-index 95058dbd8..6501a1ba3 100644
+index 102178a4f..f20d3ddb9 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
-@@ -1478,25 +1478,19 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
+@@ -1438,25 +1438,19 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
}
leasefail:
udhcp_run_script(NULL, "leasefail");
+ if (opt & OPT_n) { /* abort if no lease */
-+ bb_error_msg("no lease, failing");
++ bb_simple_info_msg("no lease, failing");
+ retval = 1;
+ goto ret;
+ }
#if BB_MMU /* -b is not supported on NOMMU */
if (opt & OPT_b) { /* background if no lease */
- bb_info_msg("no lease, forking to background");
+ bb_simple_info_msg("no lease, forking to background");
client_background();
/* do not background again! */
- opt = ((opt & ~(OPT_b|OPT_n)) | OPT_f);
@@ -85,7 +85,7 @@ index 95058dbd8..6501a1ba3 100644
- } else
-#endif
- if (opt & OPT_n) { /* abort if no lease */
-- bb_info_msg("no lease, failing");
+- bb_simple_info_msg("no lease, failing");
- retval = 1;
- goto ret;
+ opt = ((opt & ~OPT_b) | OPT_f);
diff --git a/main/busybox/0013-testsuite-fix-cpio-tests.patch b/main/busybox/0013-testsuite-fix-cpio-tests.patch
deleted file mode 100644
index 3b9c79e5dd..0000000000
--- a/main/busybox/0013-testsuite-fix-cpio-tests.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 69b954f128d397bbe44deb044313810c41cdcbbb Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 6 Jul 2017 13:41:32 +0200
-Subject: [PATCH] testsuite: fix cpio tests
-
-The cpio tests don't search for the right output line correctly,
-using a hardcoded tail offset. Instead, grep for the file entry
-just added.
-
-The reverse-hunk patch tests seem to get the output order wrong,
-and the tests pass when this is corrected.
----
- testsuite/cpio.tests | 6 +++---
- testsuite/patch.tests | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests
-index 88ec086b6..40f72c363 100755
---- a/testsuite/cpio.tests
-+++ b/testsuite/cpio.tests
-@@ -129,7 +129,7 @@ SKIP=
-
- optional FEATURE_CPIO_O
- testing "cpio uses by default uid/gid" \
--"echo $0 | cpio -o -H newc | cpio -tv 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
-+"echo $0 | cpio -o -H newc | cpio -tv 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \
- "\
- $user/$group
- 0
-@@ -138,7 +138,7 @@ SKIP=
-
- optional FEATURE_CPIO_O
- testing "cpio -R with create" \
--"echo $0 | cpio -o -H newc -R 1234:5678 | cpio -tv 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
-+"echo $0 | cpio -o -H newc -R 1234:5678 | cpio -tv 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \
- "\
- 1234/5678
- 0
-@@ -147,7 +147,7 @@ SKIP=
-
- optional FEATURE_CPIO_O
- testing "cpio -R with extract" \
--"echo $0 | cpio -o -H newc | cpio -tv -R 8765:4321 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
-+"echo $0 | cpio -o -H newc | cpio -tv -R 8765:4321 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \
- "\
- 8765/4321
- 0
-diff --git a/testsuite/patch.tests b/testsuite/patch.tests
-index 39205242c..1d48e90be 100755
---- a/testsuite/patch.tests
-+++ b/testsuite/patch.tests
-@@ -75,12 +75,12 @@ zxc
- testing "patch detects already applied hunk" \
- 'patch 2>&1; echo $?; cat input' \
- "\
-+patching file input
- Possibly reversed hunk 1 at 4
- Hunk 1 FAILED 1/1.
- abc
- +def
- 123
--patching file input
- 1
- abc
- def
-@@ -103,12 +103,12 @@ def
- testing "patch detects already applied hunk at the EOF" \
- 'patch 2>&1; echo $?; cat input' \
- "\
-+patching file input
- Possibly reversed hunk 1 at 4
- Hunk 1 FAILED 1/1.
- abc
- 123
- +456
--patching file input
- 1
- abc
- 123
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index d5f96de266..2346e69070 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Oliver Smith <ollieparanoid@postmarketos.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
-pkgver=1.31.1
-pkgrel=16
+pkgver=1.32.0
+pkgrel=1
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
@@ -20,7 +20,6 @@ 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-ln-no-target-directory-implies-no-dereference.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
@@ -34,9 +33,7 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
0009-depmod-support-generating-kmod-binary-index-files.patch
0010-Add-flag-for-not-following-symlinks-when-recursing.patch
0012-udhcpc-Don-t-background-if-n-is-given.patch
- 0013-testsuite-fix-cpio-tests.patch
- busybox-bc.patch
- nslookup.patch
+ 0001-Revert-ash-jobs-Only-clear-gotsigchld-when-waiting-f.patch
acpid.logrotate
busyboxconfig
@@ -53,6 +50,8 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
# 1.29.3-r10:
# - CVE-2018-20679
# - CVE-2019-5747
+# 1.28.3-r2:
+# - CVE-2018-1000500
# 1.27.2-r4:
# - CVE-2017-16544
# - CVE-2017-15873
@@ -172,6 +171,7 @@ tty8
tty9
tty10
tty11
+hvc0
EOF
# script for udhcpc
@@ -213,28 +213,25 @@ ssl_client() {
}
-sha512sums="0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf busybox-1.31.1.tar.bz2
-07e79138c80a12fd3c8770c4a1beaba986465b099816511d2de744b34f7457f22351d991f510cce8665effd651cca34a85f685ed52747313b3980ebf25988958 0001-ln-no-target-directory-implies-no-dereference.patch
+sha512sums="1b1227af69a97e820e28f5f1c62413e4e179202ab525725ea0b1afe9b9f9a5f00e5e32f4603e804ba1596b0fedd60d60457a6d2b8fcedfab45b6e049caeb319b busybox-1.32.0.tar.bz2
ead3403578c071c2216de17ab0543984c1f1509c12c062f03af49141547c3ea21356f3e8f0f0695550f05a41a1379dd73fc3cc18dcd78addbb411f247351e353 0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
a2787a3ecaf6746dadef62166e8ee6ecaa166147e5ad8b917c5838536057c875bab5f9cf40c3e05eba74d575484ac662929ac3799d58432d3a99ac46f364f302 0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
-78f4c602e518b01d600824cea246992e58961f2a65737741b1a2283c96900f11504b791423f2482eec79090a9f612b2088c66f6c9f22153daca08b7fe534cca5 0001-properly-fix-wget-https-support.patch
+e858bb6a0065d0b0cd757df1fb0eb7af1bc1890b276f20706f828b34171d3af3aea4e244233f495e752fb5b591e62da756d46a5b5cbb002c570d3efbb726f704 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
-f96d66ce5a0295a2459a2c49c281b64e016de675ebd31a49af18cb06f3498fe27dfbc8667324b4391fdf8136aea8533dce643f1c740d10de811808985950bd15 0005-udhcpc-set-default-discover-retries-to-5.patch
-136e35be699b6953e1b624c65bcc41fd096cf98fb00de4409855d0eda8b8a1ee830eb6eb1f0d0dd7d47ee940321e056b3765fd77747bf6a90a07d9cf84a9626c 0006-ping-make-ping-work-without-root-privileges.patch
+095c5617ba7e9f1523deb77ae465e635c347bb2a0934038b91e779f8deb4d7c7ff9ccabbb3bf8a176e83a3994df74692b0f3547d39ff87678cc54b08c8124db0 0005-udhcpc-set-default-discover-retries-to-5.patch
+457ff4b0c4aee8ab88c682bd7831b348f78e91e24b3ecbbb6554fdc67dce915d99d6d5d1a19b4cb30255367736294f33c93a2156667a8dee6d6431dc2db1407b 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
-907aef47c88f60e93bcd290eb43102721978ab6fc6eca52914172801ace7306ae8b11f38ed8b086452bbf46d75424740161e4f1e7840a485f0f78024455f902b 0009-depmod-support-generating-kmod-binary-index-files.patch
+df02adb3e3cd3349cc8d070911e3392164cb2e30bd72cae7ceaa974b2db6f958fdcedf809abc7b4bee37c729a4d20abf127f615b0e238a667d572137abe6a79e 0009-depmod-support-generating-kmod-binary-index-files.patch
3b13ba6bd9b697e48864cb5376849c1ac95b30650e3e27605cc05edf4fdc1ecbb4c4503d4fe9012a581bcd660f6bb44d644575cf437d30423614cb83ee92c22c 0010-Add-flag-for-not-following-symlinks-when-recursing.patch
-b0f956e98ed1b670dc27f835441407d32395d371599780cf87a5fb2eee43ad2f77c8c484d20f08b1ed5d2bdee039668ff1a0b02561fa8206832072ab3b89cc45 0012-udhcpc-Don-t-background-if-n-is-given.patch
-d8926f0e4ed7d2fe5af89ff2a944d781b45b109c9edf1ef2591e7bce2a8bbadd7c8ca814cb3c928ae09027d9603434fe70496f308d701f3d42260ebd1e9e9b29 0013-testsuite-fix-cpio-tests.patch
-9bb4d16ca418b6fd3c0b6dc867c92920e66ddb0c98040373d1166608284d2755b8d6eed0022bfddfcc07f5df93974fb7ed79402511a9728eb6c95ce05c37cfeb busybox-bc.patch
-00d7f186bac8f228ebda3c486282df34c0021b58948946f4b2c7efe0cccf5f34a0e0430318359f1008ed51455747ffb525010f2feef450faf05fbc511d99d1d6 nslookup.patch
+4d043999ffbf6875e6b28ffdb43a36dd5d37d51e862ed7d89c6007e38cdda056292c5322a3ac3189fd489bf3ad1cce7b20508a96aee55c09f09354e1c3f5f5fe 0012-udhcpc-Don-t-background-if-n-is-given.patch
+0121eb37ee6ace28802f39eddd3c758f459a5228882af57d362ecc49788e0aa068956913b5f78e7e91c15668286c95ea49f2aef28dc156b085524d616b8fe053 0001-Revert-ash-jobs-Only-clear-gotsigchld-when-waiting-f.patch
aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate
-53691eb4b48319b6c5930125a9683a8b480a68490e901ab999a41f5722cac2b8f2a78c673d2d463a5d7302a10410fadd661f9aa4f2ba611e221712344c3407a8 busyboxconfig
-5f9739b9d0c1ba5d77e3153c373593a1bcb813cf466f951b00a2a040262e5077fb13c1a7aa17d67d1533a473bfcacc1a22833b7f491b4dde9dcb5638ad585f9a busyboxconfig-extras
+aef1c2efcf92375b8adeedfb805597442f3e888e72ca540af50e6001e88128952804b74b80de408a8b46b26a8257867e6219d6c6d74b9726ae24eff737b84992 busyboxconfig
+770d6c14a65ac2319081505f892519ffd46c228fd8e5e0b7908780fa162420851e86f4be514fd3aa152338ef6dac8743a3454acb988e46ba616ec11c00a00860 busyboxconfig-extras
0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c
b993ce589685d5d1f806153d0b7f71657f2d37556654ec60884130a40f09acc4944a13e0a4d02914000bedd779e5a35da08c760fed5f7ca5b601243aff7ba2c9 dad.if-up
646ad9aefe3596d0170d92c8506ca1846e43b5b83cbef97ae565f15ffa7b14665a8c7061bc69c608c043f834c134c5d63f042509f8999031e89163508a868e46 ssl_client.c
-788e3525af419dadff5a46f672b9356a1d9f8a3360523e8e247b926a67180212a002adb2499293d3455cce67a95ed8e2c27f9327ae1a5271f6e7f320dc1c2b98 default.script"
+c047594a1a3c685f679b98bb80015020ed51e7502c0b2f535f8483a8852b8d43b894b36f34ba680ef96a52c67f3d1af706edbfe43c4a2117c469bb2967215252 default.script"
diff --git a/main/busybox/busybox-bc.patch b/main/busybox/busybox-bc.patch
deleted file mode 100644
index 465e798405..0000000000
--- a/main/busybox/busybox-bc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/miscutils/bc.c 2019-11-21 12:59:36.007348161 +0000
-+++ b/miscutils/bc.c 2019-11-21 17:05:22.192565550 +0000
-@@ -1465,7 +1465,7 @@
- b_int = BC_NUM_INT(b);
- a_int -= b_int;
-
-- if (a_int != 0) return (ssize_t) a_int;
-+ if (a_int != 0) return neg ? - (ssize_t) a_int : (ssize_t) a_int;
-
- a_max = (a->rdx > b->rdx);
- if (a_max) {
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index bf3ebee1ad..cac62fb889 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.31.1
-# Fri Mar 13 12:50:55 2020
+# Busybox version: 1.32.0
+# Sat Jun 27 00:18:56 2020
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -76,6 +76,7 @@ CONFIG_PREFIX="/home/ncopa/aports/main/busybox/pkg/busybox"
# CONFIG_DEBUG_SANITIZE is not set
# CONFIG_UNIT_TEST is not set
# CONFIG_WERROR is not set
+# CONFIG_WARN_SIMPLE_MSG is not set
CONFIG_NO_DEBUG_LIB=y
# CONFIG_DMALLOC is not set
# CONFIG_EFENCE is not set
@@ -462,6 +463,7 @@ CONFIG_FEATURE_FIND_SIZE=y
CONFIG_FEATURE_FIND_PRUNE=y
CONFIG_FEATURE_FIND_QUIT=y
CONFIG_FEATURE_FIND_DELETE=y
+CONFIG_FEATURE_FIND_EMPTY=y
CONFIG_FEATURE_FIND_PATH=y
CONFIG_FEATURE_FIND_REGEX=y
# CONFIG_FEATURE_FIND_CONTEXT is not set
@@ -693,6 +695,7 @@ CONFIG_FEATURE_SWAPONOFF_LABEL=y
CONFIG_SWITCH_ROOT=y
# CONFIG_TASKSET is not set
# CONFIG_FEATURE_TASKSET_FANCY is not set
+# CONFIG_FEATURE_TASKSET_CPULIST is not set
# CONFIG_UEVENT is not set
CONFIG_UMOUNT=y
CONFIG_FEATURE_UMOUNT_ALL=y
@@ -810,6 +813,7 @@ CONFIG_FEATURE_LESS_ENV=y
# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
# CONFIG_MAN is not set
CONFIG_MICROCOM=y
+# CONFIG_MIM is not set
# CONFIG_MT is not set
CONFIG_NANDWRITE=y
CONFIG_NANDDUMP=y
@@ -957,7 +961,7 @@ CONFIG_SLATTACH=y
# CONFIG_FEATURE_TFTP_PUT is not set
# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
# CONFIG_TFTP_DEBUG is not set
-CONFIG_TLS=y
+# CONFIG_TLS is not set
CONFIG_TRACEROUTE=y
CONFIG_TRACEROUTE6=y
CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
@@ -1100,6 +1104,7 @@ CONFIG_SH_IS_ASH=y
# CONFIG_BASH_IS_ASH is not set
# CONFIG_BASH_IS_HUSH is not set
CONFIG_BASH_IS_NONE=y
+CONFIG_SHELL_ASH=y
CONFIG_ASH=y
CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
CONFIG_ASH_INTERNAL_GLOB=y
@@ -1120,6 +1125,7 @@ CONFIG_ASH_GETOPTS=y
CONFIG_ASH_CMDCMD=y
# 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
@@ -1186,7 +1192,8 @@ CONFIG_FEATURE_ROTATE_LOGFILE=y
CONFIG_FEATURE_REMOTE_LOG=y
CONFIG_FEATURE_SYSLOGD_DUP=y
CONFIG_FEATURE_SYSLOGD_CFG=y
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=512
+# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=2048
CONFIG_FEATURE_IPC_SYSLOG=y
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
CONFIG_FEATURE_KMSG_SYSLOG=y
diff --git a/main/busybox/busyboxconfig-extras b/main/busybox/busyboxconfig-extras
index 9c70c1f785..877c9253c1 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.31.0
-# Tue Jul 23 12:14:13 2019
+# Busybox version: 1.32.0
+# Sat Jun 27 00:24:40 2020
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -76,6 +76,7 @@ CONFIG_PREFIX="./_install"
# CONFIG_DEBUG_SANITIZE is not set
# CONFIG_UNIT_TEST is not set
# CONFIG_WERROR is not set
+# CONFIG_WARN_SIMPLE_MSG is not set
CONFIG_NO_DEBUG_LIB=y
# CONFIG_DMALLOC is not set
# CONFIG_EFENCE is not set
@@ -446,6 +447,7 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0
# CONFIG_FEATURE_FIND_PRUNE is not set
# CONFIG_FEATURE_FIND_QUIT is not set
# CONFIG_FEATURE_FIND_DELETE is not set
+# CONFIG_FEATURE_FIND_EMPTY is not set
# CONFIG_FEATURE_FIND_PATH is not set
# CONFIG_FEATURE_FIND_REGEX is not set
# CONFIG_FEATURE_FIND_CONTEXT is not set
@@ -677,6 +679,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
# CONFIG_SWITCH_ROOT is not set
# CONFIG_TASKSET is not set
# CONFIG_FEATURE_TASKSET_FANCY is not set
+# CONFIG_FEATURE_TASKSET_CPULIST is not set
# CONFIG_UEVENT is not set
# CONFIG_UMOUNT is not set
# CONFIG_FEATURE_UMOUNT_ALL is not set
@@ -786,6 +789,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0
# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
# CONFIG_MAN is not set
# CONFIG_MICROCOM is not set
+# CONFIG_MIM is not set
# CONFIG_MT is not set
# CONFIG_NANDWRITE is not set
# CONFIG_NANDDUMP is not set
@@ -1076,6 +1080,7 @@ CONFIG_SH_IS_NONE=y
# CONFIG_BASH_IS_ASH is not set
# CONFIG_BASH_IS_HUSH is not set
CONFIG_BASH_IS_NONE=y
+# CONFIG_SHELL_ASH is not set
# CONFIG_ASH is not set
# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
# CONFIG_ASH_INTERNAL_GLOB is not set
@@ -1096,6 +1101,7 @@ CONFIG_BASH_IS_NONE=y
# CONFIG_ASH_CMDCMD 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
@@ -1158,6 +1164,7 @@ CONFIG_BASH_IS_NONE=y
# CONFIG_FEATURE_REMOTE_LOG is not set
# CONFIG_FEATURE_SYSLOGD_DUP is not set
# CONFIG_FEATURE_SYSLOGD_CFG is not set
+# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
# CONFIG_FEATURE_IPC_SYSLOG is not set
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
diff --git a/main/busybox/default.script b/main/busybox/default.script
index 8c786f8740..2b787b1484 100644
--- a/main/busybox/default.script
+++ b/main/busybox/default.script
@@ -84,7 +84,7 @@ resolvconf() {
local i
[ -n "$IF_PEER_DNS" ] && [ "$IF_PEER_DNS" != "yes" ] && return
if [ "$RESOLV_CONF" = "no" ] || [ "$RESOLV_CONF" = "NO" ] \
- || [ -z "$RESOLV_CONF" ]; then
+ || [ -z "$RESOLV_CONF" ] || [ -z "$dns" ]; then
return
fi
for i in $NO_DNS; do
diff --git a/main/busybox/nslookup.patch b/main/busybox/nslookup.patch
deleted file mode 100644
index 79498f9171..0000000000
--- a/main/busybox/nslookup.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From adf24e909cda1ae30767d8ca4902eac92781d932 Mon Sep 17 00:00:00 2001
-From: Jo-Philipp Wich <jo@mein.io>
-Date: Thu, 27 Jun 2019 17:27:28 +0200
-Subject: [PATCH 1/2] nslookup: handle replies without RRs
-
-Under some circumstances, a DNS reply might contain no resource records,
-e.g. when a valid domain is queried that does not have records of the
-requested type.
-
-Example with nslookup from BIND dnsutils:
-
- $ nslookup -q=SRV example.org
- Server: 10.11.12.13
- Address: 10.11.12.13#53
-
- Non-authoritative answer:
- *** Can't find example.org: No answer
-
-Currently the busybox nslookup applet simply prints nothing after the
-"Non-authoritative answer:" line in the same situation.
-
-This change modifies nslookup to either print "Parse error" or "No answer"
-diagnostics, depending on the parse_reply() return value.
-
-function old new delta
-send_queries 1676 1711 +35
-
-Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-(cherry picked from commit 8c3b520d4f937b1d1856898dec5f634b12d9cc36)
----
- networking/nslookup.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/networking/nslookup.c b/networking/nslookup.c
-index 24e09d4f0..f7fd1d377 100644
---- a/networking/nslookup.c
-+++ b/networking/nslookup.c
-@@ -615,9 +615,15 @@ static int send_queries(struct ns *ns)
- G.query[qn].name, rcodes[rcode]);
- G.exitcode = EXIT_FAILURE;
- } else {
-- if (parse_reply(reply, recvlen) < 0) {
-+ switch (parse_reply(reply, recvlen)) {
-+ case -1:
- printf("*** Can't find %s: Parse error\n", G.query[qn].name);
- G.exitcode = EXIT_FAILURE;
-+ break;
-+
-+ case 0:
-+ printf("*** Can't find %s: No answer\n", G.query[qn].name);
-+ break;
- }
- }
- bb_putchar('\n');
---
-2.25.0
-
-
-From 1fc999c00aa6649f17f0879b960427313dac64ae Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 4 Feb 2020 11:04:37 +0000
-Subject: [PATCH 2/2] nslookup: fix exitcode with search domains, closes 12541
-
-Return success if there are any valid answer rather than exit with error.
-
-bloatcheck on x86_64:
-
-function old new delta
-nslookup_main 917 924 +7
-send_queries 2115 2121 +6
-.rodata 136606 136609 +3
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 3/0 up/down: 16/0) Total: 16
-bytes
- text data bss dec hex filename
- 839394 14660 2080 856134 d1046 busybox_old
- 839410 14660 2080 856150 d1056 busybox_unstripped
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- networking/nslookup.c | 34 ++++++++++++++++++----------------
- 1 file changed, 18 insertions(+), 16 deletions(-)
-
-diff --git a/networking/nslookup.c b/networking/nslookup.c
-index f7fd1d377..d66b13039 100644
---- a/networking/nslookup.c
-+++ b/networking/nslookup.c
-@@ -265,7 +265,7 @@ struct query {
- const char *name;
- unsigned qlen;
- // unsigned latency;
--// uint8_t rcode;
-+ uint8_t rcode;
- unsigned char query[512];
- // unsigned char reply[512];
- };
-@@ -320,7 +320,7 @@ struct globals {
- struct query *query;
- char *search;
- smalluint have_search_directive;
-- smalluint exitcode;
-+ smallint answer;
- } FIX_ALIASING;
- #define G (*(struct globals*)bb_common_bufsiz1)
- #define INIT_G() do { \
-@@ -605,28 +605,31 @@ static int send_queries(struct ns *ns)
-
- /* Process reply */
- G.query[qn].qlen = 0; /* flag: "reply received" */
-+ G.query[qn].rcode = rcode;
- tcur = monotonic_ms();
- #if 1
- if (option_mask32 & OPT_debug) {
- printf("Query #%d completed in %ums:\n", qn, tcur - tstart);
- }
- if (rcode != 0) {
-- printf("** server can't find %s: %s\n",
-- G.query[qn].name, rcodes[rcode]);
-- G.exitcode = EXIT_FAILURE;
-+ printf("** server can't find %s: %s\n\n",
-+ G.query[qn].name, rcodes[rcode]);
- } else {
- switch (parse_reply(reply, recvlen)) {
- case -1:
-- printf("*** Can't find %s: Parse error\n", G.query[qn].name);
-- G.exitcode = EXIT_FAILURE;
-+ printf("*** Can't find %s: Parse error\n\n", G.query[qn].name);
-+ G.query[qn].rcode = 0x10;
- break;
-
- case 0:
-- printf("*** Can't find %s: No answer\n", G.query[qn].name);
-+ G.query[qn].rcode = 0x20;
-+ break;
-+ default:
-+ bb_putchar('\n');
-+ G.answer++;
- break;
- }
- }
-- bb_putchar('\n');
- n_replies++;
- if (n_replies >= G.query_count)
- goto ret;
-@@ -984,21 +987,20 @@ int nslookup_main(int argc UNUSED_PARAM, char **argv)
- }
-
- err = 0;
-- for (rc = 0; rc < G.query_count; rc++) {
-- if (G.query[rc].qlen) {
-- printf("*** Can't find %s: No answer\n", G.query[rc].name);
-- err = 1;
-+ for (rc = 0; !G.answer && rc < G.query_count; rc++) {
-+ if (G.query[rc].qlen || G.query[rc].rcode == 0x20) {
-+ printf("*** Can't find %s: No answer\n\n", G.query[rc].name);
-+ } else if (G.query[rc].rcode != 0) {
-+ err = EXIT_FAILURE;
- }
- }
-- if (err) /* should this affect exicode too? */
-- bb_putchar('\n');
-
- if (ENABLE_FEATURE_CLEAN_UP) {
- free(G.server);
- free(G.query);
- }
-
-- return G.exitcode;
-+ return err;
- }
-
- #endif
---
-2.25.0
-
diff --git a/main/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD
index 26d2d3d8de..4b9e93adaa 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=2
+pkgrel=4
pkgdesc="Common CA certificates PEM files from Mozilla"
url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/"
arch="all"
@@ -15,7 +15,7 @@ replaces="libcrypto1.0 openssl openssl1.0"
options="!fhs !check"
triggers="ca-certificates.trigger=/usr/share/ca-certificates:/usr/local/share/ca-certificates:/etc/ssl/certs:/etc/ca-certificates/update.d"
install="$pkgname.post-deinstall"
-source="https://git-old.alpinelinux.org/ca-certificates/snapshot/ca-certificates-$pkgver.tar.xz
+source="https://gitlab.alpinelinux.org/alpine/ca-certificates/-/archive/$pkgver/ca-certificates-$pkgver.tar.bz2
0001-update-ca-fix-compiler-warning.patch
0002-replace-python-script-with-perl-script.patch
0003-update-ca-insert-newline-between-certs.patch
@@ -23,6 +23,8 @@ source="https://git-old.alpinelinux.org/ca-certificates/snapshot/ca-certificates
build() {
make
+ # remove expired cert (https://gitlab.alpinelinux.org/alpine/aports/issues/11607)
+ rm AddTrust_External_Root.crt
}
package() {
@@ -67,7 +69,7 @@ bundle() {
"$subpkgdir"/etc/ssl/cert.pem
}
-sha512sums="68a879680a5e20764b8a4ee3019e9a008193c578a687b0d29694355a679c04cbfa94d4049beb3c52a899d593f46254c94d67db833f39e91325a4476963b9ef18 ca-certificates-20191127.tar.xz
+sha512sums="05e3a11efd80ea88eb81774e084febe4b8d1fa48f01f49e5ed3d469e10a2769260a264faed42ea3a0b725659cda1cc4a67ce5575fe04cdff9dc1c08207911c9b ca-certificates-20191127.tar.bz2
aafe6d9047380fc403792fbf27146dc9c0532ef401e6eb9bd8b533c110f902cad0a66701cf3563ad625d07ae54619e9f2f3091ec14772b92e178dbed142ecd97 0001-update-ca-fix-compiler-warning.patch
4d9c71b9ea0596f5efaa188f244b7ab587f96c218bb6fed01f11e34c553909f65bbe660156f8300be9511ae50614661c5dcd3b493ac146a8e888f62fc52bd9d4 0002-replace-python-script-with-perl-script.patch
051b5d78916ee7389dfbd4e8871aab720415bd6e9ee0313dba770fc40ee7c68ac67d7918f2503458a3218e3bfc10691b5e379b65269106fde02c7e7a36eb7595 0003-update-ca-insert-newline-between-certs.patch"
diff --git a/main/ca-certificates/ca-certificates.post-deinstall b/main/ca-certificates/ca-certificates.post-deinstall
index ead634716c..10d219f03f 100644
--- a/main/ca-certificates/ca-certificates.post-deinstall
+++ b/main/ca-certificates/ca-certificates.post-deinstall
@@ -1,7 +1,6 @@
#!/bin/sh
-# clean up broken symlinks and ca-certificates.crt store
-find -L /etc/ssl/certs -maxdepth 1 \( -type l -o -name ca-certificates.crt \) \
- -delete
+# clean up broken symlinks store
+find -L /etc/ssl/certs -maxdepth 1 -type l -delete
rmdir /etc/ssl/certs 2>/dev/null || true
diff --git a/main/ccache/APKBUILD b/main/ccache/APKBUILD
index 40d68133c1..12b4bf7ca5 100644
--- a/main/ccache/APKBUILD
+++ b/main/ccache/APKBUILD
@@ -1,8 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ccache
-pkgver=3.7.9
-_pkgver=$pkgver
+pkgver=3.7.11
pkgrel=0
pkgdesc="A fast C/C++ compiler cache"
url="https://ccache.dev/"
@@ -46,4 +45,4 @@ package() {
done
}
-sha512sums="5d39baeb66265451b0e9cef250f6d9c5f6869cd87e27c108c9a50bef80050122ed4280ff662a81bba8d1d1311f2004bcaf9ada6b783a42eedc67ca01ebc48bb4 ccache-3.7.9.tar.xz"
+sha512sums="47b71b3ab4b89bf9b6f6d15941c22d2207b369922f51f9a8fbf4e86554325053dccce669e1c1ed3c0019a7e0a3d610f399e52d3fee68b56111aa7c1b24132c11 ccache-3.7.11.tar.xz"
diff --git a/main/cciss_vol_status/APKBUILD b/main/cciss_vol_status/APKBUILD
index c3400946e8..56abfcf517 100644
--- a/main/cciss_vol_status/APKBUILD
+++ b/main/cciss_vol_status/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cciss_vol_status
-pkgver=1.12
+pkgver=1.12a
pkgrel=0
pkgdesc="Drivers for the HP (previously Compaq) Smart Array controllers which provide hardware RAID capability"
url="http://cciss.sourceforge.net/"
@@ -8,12 +8,10 @@ arch="all"
license="GPL-2.0-or-later"
makedepends="linux-headers"
subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/cciss/$pkgname-$pkgver.tar.gz"
+source="https://downloads.sourceforge.net/cciss/cciss_vol_status-$pkgver.tar.gz"
-builddir="$srcdir"/$pkgname-$pkgver
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -24,9 +22,12 @@ build() {
make
}
+check() {
+ make check
+}
+
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="f9fa8b98bd42810932f03f514b4b8c6cea690378f065a6c9788ddb78612c7ca2aa9a7fefa8a40634cfe247600fb6d3f11f0b687fba77d1423087a2b319773d69 cciss_vol_status-1.12.tar.gz"
+sha512sums="c6aeae0d1fd66aabcd4a82f69b12433770fab2dde726bca67d97a09636e39f2eb596a0695afdb7e3e1a35c3d6882a9804a8263caa9b0dad97da8256afea778be cciss_vol_status-1.12a.tar.gz"
diff --git a/main/checkbashisms/APKBUILD b/main/checkbashisms/APKBUILD
index 6495c762c9..253a7d71dd 100644
--- a/main/checkbashisms/APKBUILD
+++ b/main/checkbashisms/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=checkbashisms
-pkgver=2.20.3
+pkgver=2.20.4
pkgrel=0
pkgdesc="Check shell scripts for POXIX compliance"
url="https://tracker.debian.org/pkg/devscripts"
@@ -28,4 +28,4 @@ package() {
install -D -m755 "$pkgname".1 "$pkgdir/usr/share/man/man1/$pkgname".1
}
-sha512sums="6d86deeecff82fc16df7d978678f5b88293164688078bf0732a7e6b844cf8845868be31c107518cf43b8dbcbadcd12a9691585f5725abd397f63ff9456fbdd8f devscripts_2.20.3.tar.xz"
+sha512sums="49e9ae38ca3682f399a17f2108a7ee15198dc955d8c7c4c1b043456c19cb35b47b6116de9a2cfaccbdd7560e79426ca0953674e5a89ac226d21af2c1cf847e5c devscripts_2.20.4.tar.xz"
diff --git a/main/cjdns/0001-seccomp-handle-__NR_clock_gettime64-when-appropriate.patch b/main/cjdns/0001-seccomp-handle-__NR_clock_gettime64-when-appropriate.patch
new file mode 100644
index 0000000000..c220b94ad4
--- /dev/null
+++ b/main/cjdns/0001-seccomp-handle-__NR_clock_gettime64-when-appropriate.patch
@@ -0,0 +1,31 @@
+From 6821900ac6bcb722ff5220ee1ea1152a22f2e148 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 22 Jul 2020 03:12:04 -0600
+Subject: [PATCH] seccomp: handle __NR_clock_gettime64 when appropriate
+
+---
+ util/Seccomp.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/util/Seccomp.c b/util/Seccomp.c
+index c2f87e93..eb6609aa 100644
+--- a/util/Seccomp.c
++++ b/util/Seccomp.c
+@@ -262,7 +262,13 @@ static Er_DEFUN(struct sock_fprog* mkFilter(struct Allocator* alloc))
+ // older versions need system calls for getting the time.
+ // i686 glibc-2.18's time() uses __NR_time
+ // Raspberry Pi and BeagleBone Black don't provide __NR_time
+- IFEQ(__NR_clock_gettime, success),
++ // 32-bit systems with 64-bit time_t use __NR_clock_gettime64
++ #ifdef __NR_clock_gettime64
++ IFEQ(__NR_clock_gettime64, success),
++ #endif
++ #ifdef __NR_clock_gettime
++ IFEQ(__NR_clock_gettime, success),
++ #endif
+ #ifdef __NR_time
+ IFEQ(__NR_time, success),
+ #endif
+--
+2.27.0
+
diff --git a/main/cjdns/APKBUILD b/main/cjdns/APKBUILD
index 03955e0192..daafa31343 100644
--- a/main/cjdns/APKBUILD
+++ b/main/cjdns/APKBUILD
@@ -1,9 +1,8 @@
# Maintainer: kpcyrd <git@rxv.cc>
# Contributor: kpcyrd <git@rxv.cc>
# Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
-
pkgname=cjdns
-pkgver=20.6
+pkgver=20.7
pkgrel=0
pkgdesc="A routing engine designed for security, scalability, speed and ease of use"
url="https://github.com/cjdelisle/cjdns"
@@ -13,7 +12,8 @@ makedepends="nodejs python3 linux-headers libseccomp-dev"
install="$pkgname.post-install"
subpackages="$pkgname-doc $pkgname-openrc"
source="$pkgname-$pkgver.tar.gz::https://github.com/cjdelisle/cjdns/archive/cjdns-v$pkgver.tar.gz
- no-march-flag.patch"
+ no-march-flag.patch
+ 0001-seccomp-handle-__NR_clock_gettime64-when-appropriate.patch"
builddir="$srcdir/$pkgname-$pkgname-v$pkgver"
@@ -44,5 +44,6 @@ package() {
doc/tunnel.md
}
-sha512sums="34057583f2215899b96f95cc60ba0532aff12834ad2c4b432a6752c811f60ed3d6d33ec82e039b159f090558020faf69c71b373ac33ca9e41b186be0b87c3332 cjdns-20.6.tar.gz
-0c487a46609b75408d83cee954fc49f47997f0e9ee2bb8f64c3edc7e67273e5e90b4b2028847e09faa4bd1310b82f1a86fa7d0d0c42f18510cc9dcd4bccb8808 no-march-flag.patch"
+sha512sums="db103e70e3d9f5e4958dcbeed51df358450f9489b6573f9b9eddc1839ee2051fe5180eede894b465e92915fabcb4cb64ce08a41c06450f14de75943879633f25 cjdns-20.7.tar.gz
+0c487a46609b75408d83cee954fc49f47997f0e9ee2bb8f64c3edc7e67273e5e90b4b2028847e09faa4bd1310b82f1a86fa7d0d0c42f18510cc9dcd4bccb8808 no-march-flag.patch
+33f78eed9ee8d417c8f055a1dc5e0c38ebaee2e7a87a6218ac9e58cefb9a5498821c10a68c2ced4fe4a3c19df22bdae97217db5da70ec253adb343a0b9111802 0001-seccomp-handle-__NR_clock_gettime64-when-appropriate.patch"
diff --git a/main/ckbcomp/APKBUILD b/main/ckbcomp/APKBUILD
index 7b2080a5f6..b822fa6aee 100644
--- a/main/ckbcomp/APKBUILD
+++ b/main/ckbcomp/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ckbcomp
-pkgver=1.195
+pkgver=1.196
pkgrel=0
pkgdesc="Compile a XKB keyboard description to a keymap"
url="http://anonscm.debian.org/cgit/d-i/console-setup.git"
@@ -10,11 +10,11 @@ depends="perl"
options="!check"
subpackages="$pkgname-doc"
source="http://ftp.debian.org/debian/pool/main/c/console-setup/console-setup_$pkgver.tar.xz"
-builddir="$srcdir"/console-setup
+builddir="$srcdir"/console-setup-$pkgver
package() {
install -D -m755 Keyboard/$pkgname $pkgdir/usr/bin/$pkgname
install -D -m644 man/$pkgname.1 $pkgdir/usr/share/man/man1/$pkgname.1
}
-sha512sums="f9ee8df45cfb78dea12b1ba3020e32f245dd940bc1d22801849f673f4448853c0ebadb6944a92b462e3e56c59ee13fd6d2130c260a1a406e1bb1c72e9902c04d console-setup_1.195.tar.xz"
+sha512sums="f100cdf2226cdad94c595ca269e65155b52ec23996f2fee8d4916f7a414c7a6f70ae51e9ba2d3c7ae4a93a8830ee2e3eb2f1d09c636f49005d54d52ec674e938 console-setup_1.196.tar.xz"
diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index ffde264aff..16bf808ebc 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -3,8 +3,8 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=clamav
-pkgver=0.102.3
-pkgrel=0
+pkgver=0.102.4
+pkgrel=1
pkgusers="clamav"
pkggroups="clamav"
pkgdesc="An anti-virus toolkit for UNIX eis-ng backport"
@@ -32,6 +32,9 @@ source="https://www.clamav.net/downloads/production/clamav-$pkgver.tar.gz
# secfixes:
+# 0.102.4-r0:
+# - CVE-2020-3350
+# - CVE-2020-3481
# 0.102.3-r0:
# - CVE-2020-3327
# - CVE-2020-3341
@@ -245,10 +248,10 @@ milter() {
"$subpkgdir"/etc/clamav/clamav-milter.conf
}
-sha512sums="d239718814b303fb0f1655d9bdaf3675d888eea57e786d927eafabb7b6f58cd7f5fb7dc149511c2af6f800dcc919f2e1d6954110d45b9e16619c632e8d2b37f2 clamav-0.102.3.tar.gz
-ed81be79bf9a25eec071312252121cc76c96838407377b75077bf94922055f1de99f327982ac4dccd5be85003baa95385e5d002fabab32bb851bb30178475edd clamd.initd
+sha512sums="29893deb8d2d913dff72331875d3dc3a10356bfb254ddfe1c1933b3ea4f8b76c96a1b840f95e72be36cbc0e00b9ec35e395225ef264761f53e709bb1026a4f09 clamav-0.102.4.tar.gz
+d886d810de66e8da800384c1e8192f7da4352402ffc3b33cfbca93d81a2235d8c902ca9d436b9be70f00740b4555e1efbf09bf9f84059095a1a297b27581cd20 clamd.initd
59c561b3dcb0b616b647cd8e4ebc46a2cc5e7144c8c7ea0054cc1c3021d1da8f67e4dad5c083c3fe712ed887aaabfca91b538f4759537e7c4c9ab71ba4fd5794 clamd.confd
-00daed8afb67a6e4a29893340246c8840cce970dd9103d26557ecdd26ef60b12551d2291c214fc657faaaa339484052079347411b0cad65e3a33ece56d57cf16 freshclam.initd
+6f0c615b89f0f0d2f0e9f965f025b9ac8c81b2168fa6727dc8a47222abd780f9b656732f289d6061a20126b16126a975d50e8b3b8ff131f55dd8803da8be5dec freshclam.initd
ba181fe1abaac7b898ccb40b0713455aa3c9d5e25ad21d687b6cac09b0105b9e376526e7c776a44636234d8db819709d8d6a6cc76119bc3e98b637b1a3f26c08 freshclam.confd
3ae493dd1610a819402c015f6b8c0f080f926b72dc43d2bded60030bf6a55040e4b88e0f64d3aae299dc1133d7e1b89855e7346b4665a64e8b82592f7b75cf6a clamd.logrotate
30cff378bc28c76b795e00c92ae5ee623f3abe4a19bed61dd8403c96e72658bb02b7f040d26a6258104af754464d25ea7d9646918c4b47d2ba9a8cbf4687056c freshclam.logrotate"
diff --git a/main/clamav/clamd.initd b/main/clamav/clamd.initd
index 5511a5666d..c38868a5c4 100755
--- a/main/clamav/clamd.initd
+++ b/main/clamav/clamd.initd
@@ -76,9 +76,10 @@ logfix() {
local clamav_user=`awk '$1 == "User" { print $2 }' $CONF`
if [ -n "${logfile}" ] && [ -n "${clamav_user}" ]; then
if [ ! -f "${logfile}" ]; then
- touch ${logfile}
+ checkpath -Fm 0640 -o ${clamav_user} ${logfile}
+ else
+ chmod 640 ${logfile}
+ chown ${clamav_user} ${logfile}
fi
- chown ${clamav_user} ${logfile}
- chmod 640 ${logfile}
fi
}
diff --git a/main/clamav/freshclam.initd b/main/clamav/freshclam.initd
index 279b529066..6589da0bca 100644
--- a/main/clamav/freshclam.initd
+++ b/main/clamav/freshclam.initd
@@ -45,9 +45,10 @@ logfix() {
local freshclam_user=$(awk '$1 == "DatabaseOwner" { print $2 }' $CONF)
if [ -n "${logfile}" -a -n "${clamav_user}" ]; then
if [ ! -f "${logfile}" ]; then
- touch ${logfile}
+ checkpath -fm 0640 ${logfile}
+ else
+ chmod 640 ${logfile}
fi
chown ${freshclam_user} ${logfile}
- chmod 640 ${logfile}
fi
}
diff --git a/main/clang/APKBUILD b/main/clang/APKBUILD
index d37d981851..dd491ff703 100644
--- a/main/clang/APKBUILD
+++ b/main/clang/APKBUILD
@@ -1,10 +1,11 @@
# Contributor Eric Molitor <eric@molitor.org>
+# Contributor Patrick Gansterer <paroga@paroga.com>
# Contributor Travis Tilley <ttilley@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=clang
# Note: Update together with llvm.
-pkgver=10.0.0
-pkgrel=2
+pkgver=10.0.1
+pkgrel=0
_llvmver=${pkgver%%.*}
pkgdesc="A C language family front-end for LLVM"
arch="all"
@@ -29,7 +30,9 @@ checkdepends="diffutils bash"
depends_dev="$pkgname=$pkgver-r$pkgrel $pkgname-extra-tools=$pkgver-r$pkgrel"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs
$pkgname-analyzer::noarch
- $pkgname-extra-tools:extra"
+ $pkgname-extra-tools:extra
+ py3-$pkgname:python:noarch
+ "
source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-$pkgver.src.tar.xz
https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-tools-extra-$pkgver.src.tar.xz
10-add-musl-triples.patch
@@ -49,6 +52,8 @@ build() {
mkdir -p "$builddir"/build
cd "$builddir"/build
+ python_version=$(python3 -V | sed 's/.*\([0-9]\{1,\}\.[0-9]\{1,\}\)\..*/\1/')
+
cmake .. -G Ninja -Wno-dev \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_C_FLAGS_MINSIZEREL_INIT="$CFLAGS" \
@@ -59,6 +64,7 @@ build() {
-DCLANG_VENDOR=Alpine \
-DCLANG_BUILD_EXAMPLES=OFF \
-DCLANG_INCLUDE_DOCS=ON \
+ -DCLANG_PYTHON_BINDINGS_VERSIONS="$python_version" \
-DLLVM_BUILD_DOCS=ON \
-DLLVM_ENABLE_SPHINX=ON \
-DSPHINX_WARNINGS_AS_ERRORS=OFF \
@@ -142,8 +148,16 @@ extra() {
#mv usr/bin/tool-template "$subpkgdir"/usr/bin/
}
-sha512sums="b1cccc13c46abcda3d689f51d486fa613ecec40c581c72d8b15951715100a2b8fb24370161601e6716cdba5a784337439e99ec2f0766f988e9cce92de6d775da clang-10.0.0.src.tar.xz
-33b6019e64e9ac94bd7c000b77a4a927602a2705baa9b370e392a56b53fe09c8dad1ff7d583892729e9eb291440433ad7d71df768a96d927e4dbc1988fc01d99 clang-tools-extra-10.0.0.src.tar.xz
+python() {
+ pkgdesc="Clang Python Bindings"
+ depends="$pkgname-libs=$pkgver-r$pkgrel python3"
+
+ mkdir -p "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
+}
+
+sha512sums="c6712d491ce5e166ef72724cf855d742d88da825ffc25585612d7f2eb7770343e3ae48fa78e0af3e5d5efdde3a9686a7361dac3b546a4378de22448ea6e4026c clang-10.0.1.src.tar.xz
+7833197fd1f6d65e8f1fa1c169844a40e8b64f6a5cff984b29333d92527dcef532749907df2ea35b20643898baa0f49bb64b03e4ef54f9a3c4dd77bf1750a634 clang-tools-extra-10.0.1.src.tar.xz
533558863dc7247202b2a739e1bd2d81a99a16be329370cb734d338284b5408ecd14fe78ac836aaf922e377334b7a3ebef532cf8395d91aafe346bf71eb8b7fc 10-add-musl-triples.patch
a8557c5a26774bf98548b9fe77cd54a1b0591bc75beffcb5fbd070986ba954d82255dddbcfcc884c07c3f433b1428c2a6ce649c3a158f4352f30e7057872335b 20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
c7f34b425b0dcea9752eeb7ff3d3a33af9cc45740fd3e77d52e4d610c5fd3daaa4d59138a255b057ef886915615a77ec1e6a447f3818b4b2724129c0ba354932 30-fix-python-shebangs.patch
diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD
index 79b2930dc9..2d8a3d2f20 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.17.3
+pkgver=3.18.1
pkgrel=0
pkgdesc="Cross-platform, open-source make system"
url="https://www.cmake.org/"
@@ -11,7 +11,7 @@ makedepends="bzip2-dev curl-dev expat-dev libarchive-dev linux-headers
libuv-dev ncurses-dev rhash-dev xz-dev zlib-dev"
options="!check"
checkdepends="file musl-utils"
-subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch
+subpackages="$pkgname-doc $pkgname-bash-completion
"
case $pkgver in
*.*.*.*) _v=v${pkgver%.*.*};;
@@ -56,14 +56,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-bashcomp() {
- depends=""
- pkgdesc="Bash completions for $pkgname"
- install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
- mkdir -p "$subpkgdir"/usr/share/bash-completion
- mv "$pkgdir"/usr/share/cmake/completions \
- "$subpkgdir"/usr/share/bash-completion/
-}
-
-sha512sums="13479bd48ef8a8c95277a62b4f42e63152a5979292a98b5456022ca42ad3963cad75e917cc8b92a8485dbf5a2b59cde3fdc90fd9abdb806bc97c8570d03c1c69 cmake-3.17.3.tar.gz"
+sha512sums="e0591d5fb234f3e7b74d6d2aad44fbf3e19e69547bd428681ba6ad0461d4f3d2a154605808b4733531d2c66f0e91eb39a179ae0d89a37e92a3f20e9cae691468 cmake-3.18.1.tar.gz"
diff --git a/main/compiler-rt/APKBUILD b/main/compiler-rt/APKBUILD
index 55467b4717..910418b77b 100644
--- a/main/compiler-rt/APKBUILD
+++ b/main/compiler-rt/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=compiler-rt
# Note: Update together with llvm.
-pkgver=10.0.0
+pkgver=10.0.1
pkgrel=0
_llvmver=${pkgver%%.*}
pkgdesc="LLVM compiler-rt runtime libraries"
@@ -72,5 +72,5 @@ package() {
esac
}
-sha512sums="c4a25d1e922a051c78255aec9fd525acbbcaa62cc53161ed6979b21a0d91301d3c2c07ca1b6460f1c4d6656c29373ff0c20d5496955ed0a0b26d7eebbf159ec4 compiler-rt-10.0.0.src.tar.xz
-7dc961aacee3a01ecc002ff2b688a2ef50661856d2abd5ecc90566ffcad7566e4976736cd339ea96592e452cd5a17aaceba9712b2effec805661cca8ff020ee7 llvm-10.0.0.src.tar.xz"
+sha512sums="a1d2e3f5ad529a04f87059903b31fc3c9803cd86f44aed1aebd87ce7e423d8dd2b6776be12e85a0374a6215f581420438d224c130aad5e6355920af32c02aa7b compiler-rt-10.0.1.src.tar.xz
+cf34d037c1684d09e7e38d5fc131714eac93c78353d6186b2f806a8fb22dcae0f4748ce22d6faf178c95cfcf20bdc3fa7c5238518a154b3112781f5ab70edaa4 llvm-10.0.1.src.tar.xz"
diff --git a/main/confuse/APKBUILD b/main/confuse/APKBUILD
index fa1575fd2d..102d162034 100644
--- a/main/confuse/APKBUILD
+++ b/main/confuse/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=confuse
-pkgver=3.2.2
-pkgrel=1
+pkgver=3.3
+pkgrel=0
pkgdesc="C library for parsing configuration files"
url="https://github.com/martinh/libconfuse"
arch="all"
@@ -35,4 +35,4 @@ package() {
install -D -m644 libconfuse.pc "$pkgdir"/usr/lib/pkgconfig/libconfuse.pc
}
-sha512sums="c6baea65e064fe7f2d1bde187c6dcbb7f03c31f5d777cb04576f9cc2d94e9c96b7ee202e030e9a2c7eb619deb240d9e76fb12b3528ae5aa0d3abe231354d12c9 confuse-3.2.2.tar.xz"
+sha512sums="93cc62d98166199315f65a2f6f540a9c0d33592b69a2c6a57fd17f132aecc6ece39b9813b96c9a49ae2b66a99b7eba1188a9ce9e360e1c5fb4b973619e7088a0 confuse-3.3.tar.xz"
diff --git a/main/conky/APKBUILD b/main/conky/APKBUILD
index 11635a1bf2..063ab2ad52 100644
--- a/main/conky/APKBUILD
+++ b/main/conky/APKBUILD
@@ -1,25 +1,23 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=conky
-pkgver=1.11.5
-pkgrel=1
+pkgver=1.11.6
+pkgrel=0
pkgdesc="An advanced, highly configurable system monitor for X based on torsmo"
url="http://conky.sourceforge.net/"
arch="all"
license="custom"
makedepends="alsa-lib-dev libxml2-dev curl-dev wireless-tools-dev
libxft-dev glib-dev libxdamage-dev libxext-dev imlib2-dev lua5.3-dev
- cairo-dev tolua++ ncurses-dev linux-headers cmake gawk libxinerama-dev"
+ cairo-dev tolua++ ncurses-dev linux-headers cmake gawk libxinerama-dev"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/brndnmtthws/conky/archive/v$pkgver.tar.gz"
prepare() {
- cd "$builddir"
sed -i -e '32 iinclude(CheckIncludeFile)' CMakeLists.txt
default_prepare
}
build() {
- cd "$builddir"
cmake . \
-DRELEASE=ON \
-DCMAKE_BUILD_TYPE=None \
@@ -36,9 +34,8 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
}
-sha512sums="71ba02acc879dad3c240ed9a38635cb2d30e3c9ac849012ff3db53f8143c28d6cc9e502816834b0a073f7486bded7cea002b58c3bb8e189e542afb1070bb84be conky-1.11.5.tar.gz"
+sha512sums="f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a conky-1.11.6.tar.gz"
diff --git a/main/coova-chilli/APKBUILD b/main/coova-chilli/APKBUILD
index bb5d2854f8..4c19b696f5 100644
--- a/main/coova-chilli/APKBUILD
+++ b/main/coova-chilli/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=coova-chilli
pkgver=1.4
-pkgrel=2
+pkgrel=3
pkgdesc="CoovaChilli is an open source access controller for wireless LAN"
url="http://www.coova.org/"
arch="all"
@@ -70,10 +70,10 @@ check() {
package() {
make DESTDIR="$pkgdir" install
- install -D -m755 "$srcdir"/chilli.initd $pkgdir/etc/init.d/chilli
- install -D -m755 "$srcdir"/chilli.confd $pkgdir/etc/conf.d/chilli
- mkdir -p $pkgdir/var/run/chilli
- chown -R $pkgusers:$pkggroups $pkgdir/var/run/chilli
+
+ install -Dm755 "$srcdir"/chilli.initd "$pkgdir"/etc/init.d/chilli
+ install -Dm644 "$srcdir"/chilli.confd "$pkgdir"/etc/conf.d/chilli
+ install -d -o $pkgusers -g $pkggroups "$pkgdir"/var/run/chilli
}
sha512sums="2ee31731c59af0f4282255a76ef045e9f37dc85da6d18a374154ae5cc690dc485acae2d83372bf48d9326db53292603d69b0093e845b4d08b26d2586455590c5 coova-chilli-1.4.tar.gz
diff --git a/main/cracklib/APKBUILD b/main/cracklib/APKBUILD
index ce595e25f5..87bdd5f032 100644
--- a/main/cracklib/APKBUILD
+++ b/main/cracklib/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=cracklib
pkgver=2.9.7
-pkgrel=2
+pkgrel=3
pkgdesc="A library used to enforce strong passwords"
url="https://github.com/cracklib/cracklib"
arch="all"
diff --git a/main/cracklib/cracklib.trigger b/main/cracklib/cracklib.trigger
index 4aa0da2104..0ac0d3840a 100644
--- a/main/cracklib/cracklib.trigger
+++ b/main/cracklib/cracklib.trigger
@@ -1,3 +1,3 @@
#!/bin/sh
-create-cracklib-dict /usr/share/cracklib/*.gz
+create-cracklib-dict /usr/share/cracklib/*.gz >/dev/null
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index 06fb032757..be7db3bc5b 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -23,6 +23,9 @@ source="https://github.com/apple/cups/releases/download/v$pkgver/cups-$pkgver-so
"
# secfixes:
+# 2.3.3-r0:
+# - CVE-2020-3898
+# - CVE-2019-8842
# 2.2.12-r0:
# - CVE-2019-8696
# - CVE-2019-8675
diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD
index 7e402e6378..3e1ff702b7 100644
--- a/main/curl/APKBUILD
+++ b/main/curl/APKBUILD
@@ -3,20 +3,24 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=curl
-pkgver=7.69.1
+pkgver=7.71.1
pkgrel=0
pkgdesc="URL retrival utility and library"
url="https://curl.haxx.se/"
arch="all"
license="MIT"
depends="ca-certificates"
-depends_dev="openssl-dev nghttp2-dev zlib-dev"
+depends_dev="openssl-dev nghttp2-dev zlib-dev brotli-dev"
checkdepends="python3"
makedepends="$depends_dev autoconf automake groff libtool perl"
subpackages="$pkgname-dbg $pkgname-static $pkgname-doc $pkgname-dev libcurl"
-source="https://curl.haxx.se/download/curl-$pkgver.tar.xz"
+source="https://curl.haxx.se/download/curl-$pkgver.tar.xz
+ "
# secfixes:
+# 7.71.0-r0:
+# - CVE-2020-8169
+# - CVE-2020-8177
# 7.66.0-r0:
# - CVE-2019-5481
# - CVE-2019-5482
@@ -128,4 +132,4 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
}
-sha512sums="dcb917ce9a6f34b30adae10e2e635d7a8c67781d69789cc5617ab2b49e898394ecfeee546453b14ab168d4b3b52baf974b2ec07e7a4b199addbc1ba57274d8fa curl-7.69.1.tar.xz"
+sha512sums="631e0ee8562e5029fe022bfab4222836a3e6d666e82e2bfbd78311fe5985105218a36d1ea68c93472fc57a12b713957a3bcca6e385eda4e58a47ca8d5d50265b curl-7.71.1.tar.xz"
diff --git a/main/cvechecker/APKBUILD b/main/cvechecker/APKBUILD
index 328a549333..9db7fb5814 100644
--- a/main/cvechecker/APKBUILD
+++ b/main/cvechecker/APKBUILD
@@ -2,20 +2,20 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=cvechecker
-pkgver=3.9
-pkgrel=2
+pkgver=4.0
+pkgrel=0
pkgdesc="A local CVE checker tool"
url="https://github.com/sjvermeu/cvechecker/wiki"
arch="all"
license="GPL-3.0"
depends="gawk wget libxslt"
makedepends="libconfig-dev sqlite-dev mariadb-connector-c-dev
- argp-standalone autoconf automake"
+ argp-standalone autoconf automake libbsd-dev"
install="$pkgname.pre-install $pkgname.post-install"
subpackages="$pkgname-doc"
pkggroups="$pkgname"
-source="$pkgname-$pkgver.tar.gz::https://github.com/sjvermeu/$pkgname/archive/v$pkgver.tar.gz"
-builddir="$srcdir"/$pkgname-$pkgver
+source="$pkgname-$pkgver.zip::https://github.com/sjvermeu/cvechecker/archive/cvechecker-$pkgver.zip"
+builddir="$srcdir"/$pkgname-$pkgname-$pkgver
prepare() {
default_prepare
@@ -27,7 +27,6 @@ prepare() {
}
build() {
- cd "$builddir"
export LIBS="-largp"
./configure \
--build=$CBUILD \
@@ -41,16 +40,14 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
mkdir -p "$pkgdir"/var/cvechecker &>/dev/null
chgrp -R $pkggroups "$pkgdir"/var/cvechecker/* &>/dev/null
chmod -R g+w "$pkgdir"/var/cvechecker &>/dev/null
}
-sha512sums="35fc8501bb56ebe8ef0f38bc8ea91f9446c06901c83ba16488acaa0c71ed446d3337637f1f44bc82c01e1b3f255630f33b13d25e04d85fca5df3a7a5bcf66606 cvechecker-3.9.tar.gz"
+sha512sums="f2c4e8ca5cbeed00b543b64e9173c64bd7d423e4cdda0731e7e79a85b81468f066bbd9903c630b58342c24e19c11b8a6b9f4c7fafe109c129d6b0baadb65aeb2 cvechecker-4.0.zip"
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 3dfc0afe03..c9c26d0239 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=6
+pkgrel=7
pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
url="https://www.cyrusimap.org/sasl/"
arch="all"
@@ -19,7 +19,6 @@ subpackages="
$pkgname-ntlm:_plugin
$pkgname-crammd5:_plugin
$pkgname-digestmd5:_plugin
- $pkgname-plain:_plugin
$pkgname-login:_plugin
"
# use heimdal to avoid circular dep: cyrus-sasl -> krb5 -> openldap -> cyrus-sasl
@@ -110,9 +109,11 @@ _plugin() {
libsasl() {
depends=
pkgdesc="Cyrus Simple Authentication and Security Layer (SASL) library"
+ replaces="cyrus-sasl-plain"
+
mkdir -p "$subpkgdir"/usr/lib/sasl2 "$subpkgdir"/etc/sasl2
local lib=
- for lib in anonymous sasldb; do
+ for lib in anonymous sasldb plain; do
mv "$pkgdir"/usr/lib/sasl2/*${lib}*.so* "$subpkgdir"/usr/lib/sasl2/
done
mv "$pkgdir"/usr/lib/libsasl*.so.* "$subpkgdir"/usr/lib/
diff --git a/main/cython/APKBUILD b/main/cython/APKBUILD
index 503d53cb33..f158ef9e38 100644
--- a/main/cython/APKBUILD
+++ b/main/cython/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Oleg Titov <oleg.titov@gmail.com>
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=cython
-pkgver=0.29.19
+pkgver=0.29.21
pkgrel=0
pkgdesc="Cython is an optimising static compiler for both the Python & the extended Cython programming languages."
url="https://cython.org/"
@@ -31,4 +31,4 @@ package() {
install -Dm 644 README.rst "$pkgdir/usr/share/doc/cython/readme.rst"
}
-sha512sums="402f95f82099db0ae99ca2f849a9aef97558c9c6be62d3b3c66c346ecc94efbbe824ffc77f3cc6dd1d7054a2fb0332b10fe855ca1b054095f2df2ee297fd96a7 cython-0.29.19.tar.gz"
+sha512sums="2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679 cython-0.29.21.tar.gz"
diff --git a/main/dahdi-linux-lts/APKBUILD b/main/dahdi-linux-lts/APKBUILD
index 9576de4945..eb700dc5f2 100644
--- a/main/dahdi-linux-lts/APKBUILD
+++ b/main/dahdi-linux-lts/APKBUILD
@@ -9,8 +9,8 @@ _rel=0
_flavor=${FLAVOR:-lts}
_kpkg=linux-$_flavor
-_kver=5.4.43
-_krel=1
+_kver=5.4.58
+_krel=0
_kpkgver="$_kver-r$_krel"
_kabi="$_kver-$_krel-$_flavor"
diff --git a/main/datefudge/APKBUILD b/main/datefudge/APKBUILD
index 3db36e62a4..9ed6f292ad 100644
--- a/main/datefudge/APKBUILD
+++ b/main/datefudge/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Simon Frankenberger <simon-alpine@fraho.eu>
# Maintainer: Simon Frankenberger <simon-alpine@fraho.eu>
pkgname=datefudge
-pkgver=1.23
+pkgver=1.24
pkgrel=0
pkgdesc="Tool to fake the system date"
url="https://packages.debian.org/sid/datefudge"
@@ -11,7 +11,6 @@ depends="coreutils"
checkdepends="perl"
subpackages="$pkgname-doc"
source="http://deb.debian.org/debian/pool/main/d/datefudge/datefudge_$pkgver.tar.xz
- musl.patch
"
build() {
@@ -29,5 +28,4 @@ package() {
-C "$builddir" install
}
-sha512sums="9b5d5f531b3f1a5ece96fbc421726c0b7edad5709ab46cb2deb201f9f6eeed2e33b7590e221e33473edb6dbdaaf46cbef0bd4be4fbd592e8efec18a343503f71 datefudge_1.23.tar.xz
-e8b004957276f1162f9d686f03593cdd64455a35764e34aeac72d419b6ac071fb044405c73999283fcb9abff312225f81039553801cfaa1165bbbfc80705d44b musl.patch"
+sha512sums="cd548a7e8ff10189e101fa339b2845cdd19a59354e43b02cf47e466855ec192dc2084951f7663a94da56a580dd24524047651d8bcb41aa478fe94b24dffaedeb datefudge_1.24.tar.xz"
diff --git a/main/datefudge/musl.patch b/main/datefudge/musl.patch
deleted file mode 100644
index 95b8d07540..0000000000
--- a/main/datefudge/musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- old/datefudge.c
-+++ new/datefudge.c
-@@ -78,7 +78,7 @@
- return 0;
- }
-
--int gettimeofday(struct timeval *x, struct timezone *y) {
-+int gettimeofday(struct timeval *__restrict x, void *__restrict y) {
- return __gettimeofday(x,y);
- }
-
diff --git a/main/dbus/APKBUILD b/main/dbus/APKBUILD
index 53ec428d59..6aa3dc86ad 100644
--- a/main/dbus/APKBUILD
+++ b/main/dbus/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dbus
-pkgver=1.12.16
-pkgrel=4
+pkgver=1.12.20
+pkgrel=0
pkgdesc="Freedesktop.org message bus system"
options="!check" # Introduces circular dependency with xorg-server (xvfb-run -> xvfb)
url="https://www.freedesktop.org/Software/dbus"
@@ -27,6 +27,8 @@ source="https://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz
"
# secfixes:
+# 1.12.18-r0:
+# - CVE-2020-12049
# 1.12.16-r0:
# - CVE-2019-12749
@@ -84,6 +86,6 @@ x11() {
mv "$pkgdir"/usr/bin/dbus-launch "$subpkgdir"/usr/bin/
}
-sha512sums="27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb dbus-1.12.16.tar.gz
+sha512sums="0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056 dbus-1.12.20.tar.gz
3db35499361e84d8e2469b88b033f49813b179188ac25f1841a989988c352af398a56dfd94383813626c6dfd032194f7a9fcdba001ccc3e005e7cd22dae7a7ed 0001-_dbus_generate_random_bytes-use-getrandom-2.patch
4c6beba2382416e60a3adfa85ef843d90d93ca5f38c23f573e058ffca6d4fc3850d11d40938c74383bba61599569b7fdfb1fcf3b9d2f1463e6b2e2cc81097c84 dbus.initd"
diff --git a/main/dmvpn/APKBUILD b/main/dmvpn/APKBUILD
index 4b504d2cd4..0da7361278 100644
--- a/main/dmvpn/APKBUILD
+++ b/main/dmvpn/APKBUILD
@@ -7,6 +7,11 @@ pkgdesc="Dynamic Multipoint VPN"
url="https://git.alpinelinux.org/cgit/dmvpn-tools/"
arch="noarch"
license="MIT"
+_lua_dmvpn_deps="lua-asn1"
+_dp_deps="lighttpd"
+_ca_deps="lua5.2 lua5.2-lyaml lua5.2-ossl lua5.2-posix lua5.2-sql-sqlite3
+ lua5.2-stringy lua-asn1"
+makedepends="$_lua_dmvpn_deps $_dp_deps $_ca_deps"
depends="augeas bind-tools lua5.2 lua5.2-cqueues lua5.2-lyaml lua5.2-ossl
lua5.2-posix lua5.2-struct lua-dmvpn quagga strongswan tunnel"
subpackages="dmvpn-ca dmvpn-crl-dp lua-dmvpn"
@@ -33,8 +38,7 @@ package() {
}
ca() {
- depends="lua5.2 lua5.2-lyaml lua5.2-ossl lua5.2-posix lua5.2-sql-sqlite3
- lua5.2-stringy lua-asn1 lua-dmvpn"
+ depends="$_ca_deps lua-dmvpn"
cd "$builddir"
@@ -44,7 +48,7 @@ ca() {
}
dp() {
- depends=lighttpd
+ depends="$_dp_deps"
local bin=/usr/bin/dmvpn-crl-update
install -D "$builddir"/dmvpn-crl-update "$subpkgdir$bin"
@@ -55,7 +59,7 @@ dp() {
}
dmvpn() {
- depends=lua-asn1
+ depends="$_lua_dmvpn_deps"
cd "$builddir"
install -D -m 644 dmvpn.lua "$subpkgdir"/usr/share/lua/5.2/dmvpn.lua
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index e97806aa4b..3a0bdbbf31 100644
--- a/main/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
@@ -16,8 +16,8 @@
# - CVE-2017-14496
#
pkgname=dnsmasq
-pkgver=2.81
-pkgrel=1
+pkgver=2.82
+pkgrel=0
pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server"
url="http://www.thekelleys.org.uk/dnsmasq/"
arch="all"
@@ -69,7 +69,7 @@ dnssec() {
cp -r "$pkgdir"/etc "$subpkgdir"/etc
}
-sha512sums="70194f273d1e760d1f33635f4df2fb55ef846189d0c56582534e73e296cd8580959f7675623a0d67ca2438fa81655c8d51afdd2e42bb489aa78861314fc1bd7f dnsmasq-2.81.tar.gz
+sha512sums="bbd12c53e844709e28be141d6270539e3cc6428b5575cd94f1e6dd167c074a9794a25bcea73b0ebeeed48a80a8b158793002d250a63693be4bfbabb9584b1bd8 dnsmasq-2.82.tar.gz
a7d64a838d10f4f69e0f2178cf66f0b3725901696e30df9e8e3e09f2afd7c86e9d95af64d2b63ef66f18b8a637397b7015573938df9ad961e2b36c391c3ac579 dnsmasq.initd
9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 dnsmasq.confd
01e9e235e667abda07675009fb1947547863e0bb0256393c5a415978e2a49c1007585c7f0b51e8decce79c05e6f2ced3f400b11343feaa4de9b2e524f74a1ee3 uncomment-conf-dir.patch"
diff --git a/main/dnstop/APKBUILD b/main/dnstop/APKBUILD
index 5c4c9278f6..1a1d2ce5ef 100644
--- a/main/dnstop/APKBUILD
+++ b/main/dnstop/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=dnstop
pkgver=20140915
-pkgrel=3
+pkgrel=4
pkgdesc="A DNS traffic capture utility"
url="http://dns.measurement-factory.com/tools/dnstop/"
arch="all"
-license="BSD"
+license="BSD-3-Clause"
depends=""
depends_dev=""
makedepends="libpcap-dev ncurses-dev"
diff --git a/main/doxygen/APKBUILD b/main/doxygen/APKBUILD
index 17f2d1cb15..3f474b7922 100644
--- a/main/doxygen/APKBUILD
+++ b/main/doxygen/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=doxygen
-pkgver=1.8.18
+pkgver=1.8.19
pkgrel=0
pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
url="http://www.doxygen.nl/"
@@ -9,7 +9,6 @@ license="GPL-2.0-or-later"
checkdepends="libxml2-utils"
makedepends="flex bison coreutils perl python3 cmake"
source="http://doxygen.nl/files/doxygen-$pkgver.src.tar.gz
- doxygen-1.8.14-install.patch
"
build() {
@@ -31,5 +30,4 @@ package() {
make -C build DESTDIR="$pkgdir" install
}
-sha512sums="8a75b78db5b49c891342a40b452cae045aa4e317add12ba85a4759081dba5dab11f1a95a576df16d4f275c69a6e9ee1b8f8739c1bf8348f5b4578b1c41e2a32c doxygen-1.8.18.src.tar.gz
-a11ece43c640ffed707240f726b2005e103294e0351d7c3b6dd46ecc9bc0341b56c4bfb4e4daead3683129a1f332f283c578258aa1f611ec5a57c4da3bff8a21 doxygen-1.8.14-install.patch"
+sha512sums="d7441bbf7268b16f77d31dc13849ccf8862b27f2a564538d163f1a1c120d52f241697b6e8a85f6bab93ac1dd77d6e5a6c6a836f15135899dc4a3b3f24be1abab doxygen-1.8.19.src.tar.gz"
diff --git a/main/doxygen/doxygen-1.8.14-install.patch b/main/doxygen/doxygen-1.8.14-install.patch
deleted file mode 100644
index 748b0be77f..0000000000
--- a/main/doxygen/doxygen-1.8.14-install.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -upr doxygen-1.8.17.orig/doc/CMakeLists.txt doxygen-1.8.17/doc/CMakeLists.txt
---- doxygen-1.8.17.orig/doc/CMakeLists.txt 2020-01-05 16:37:34.415645891 +0100
-+++ doxygen-1.8.17/doc/CMakeLists.txt 2020-01-05 16:38:10.395666071 +0100
-@@ -209,22 +209,22 @@ install(FILES
- "${PROJECT_BINARY_DIR}/man/doxywizard.1"
- "${PROJECT_BINARY_DIR}/man/doxysearch.1"
- "${PROJECT_BINARY_DIR}/man/doxyindexer.1"
-- DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
-+ DESTINATION ${CMAKE_INSTALL_MANDIR}
- )
-
- install(FILES
- "${PROJECT_BINARY_DIR}/latex/doxygen_manual.pdf"
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+ DESTINATION "${DOC_INSTALL_DIR}"
- )
-
- if (build_doc_chm)
- install(FILES
- "${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm"
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+ DESTINATION "${DOC_INSTALL_DIR}"
- )
- endif ()
-
- install(DIRECTORY
- "${PROJECT_BINARY_DIR}/html"
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+ DESTINATION "${DOC_INSTALL_DIR}"
- )
diff --git a/main/dpkg/APKBUILD b/main/dpkg/APKBUILD
index b535e0fba6..657f3359b8 100644
--- a/main/dpkg/APKBUILD
+++ b/main/dpkg/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dpkg
-pkgver=1.20.0
+pkgver=1.20.5
pkgrel=0
pkgdesc="The Debian Package Manager"
url="https://packages.debian.org/dpkg"
@@ -8,7 +8,7 @@ arch="all"
license="GPL-2.0-or-later BSD-2-Clause"
depends="tar"
options="!check"
-makedepends="bzip2-dev linux-headers perl zlib-dev"
+makedepends="bzip2-dev linux-headers perl zlib-dev po4a"
subpackages="$pkgname-doc $pkgname-dev"
source="https://deb.debian.org/debian/pool/main/d/dpkg/dpkg_$pkgver.tar.xz"
@@ -66,4 +66,4 @@ dev() {
mv "$pkgdir"/usr/share/perl* "$subpkgdir"/usr/share/
}
-sha512sums="5dd7961bde19ccc891fd5b77ca0085f7fc0308c20380e20b393397ff92e50d1c0f54e7b57676c05876021b44aa3788af8258c21ff2b672110ac92c7ce0b408f9 dpkg_1.20.0.tar.xz"
+sha512sums="6b3789c25c81022181b87a28ca9baa4a463a68940a871568c699a2a30e3b4ce705835ed6a171ac8c5902e377200b31cc0be1e03cbd7d35c4eaf92c7300d9227f dpkg_1.20.5.tar.xz"
diff --git a/main/drbd-lts/APKBUILD b/main/drbd-lts/APKBUILD
index 474ca05ae3..046a95bbce 100644
--- a/main/drbd-lts/APKBUILD
+++ b/main/drbd-lts/APKBUILD
@@ -8,8 +8,8 @@ _rel=0
_flavor=${FLAVOR:-lts}
_kpkg=linux-$_flavor
-_kver=5.4.43
-_krel=1
+_kver=5.4.58
+_krel=0
_kabi="$_kver-$_krel-$_flavor"
_kpkgver="$_kver-r$_krel"
diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD
index 4666957895..b075c68369 100644
--- a/main/dropbear/APKBUILD
+++ b/main/dropbear/APKBUILD
@@ -2,10 +2,10 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dropbear
-pkgver=2019.78
+pkgver=2020.80
pkgrel=0
pkgdesc="small SSH 2 client/server designed for small memory environments"
-url="http://matt.ucc.asn.au/dropbear/dropbear.html"
+url="https://matt.ucc.asn.au/dropbear/dropbear.html"
arch="all"
license="MIT"
options="!check"
@@ -16,7 +16,7 @@ subpackages="$pkgname-doc
$pkgname-dbclient:_dbclient
$pkgname-ssh:_ssh:noarch
$pkgname-scp:_scp"
-source="https://matt.ucc.asn.au/dropbear/releases/${pkgname}-${pkgver}.tar.bz2
+source="https://matt.ucc.asn.au/dropbear/releases/dropbear-$pkgver.tar.bz2
dropbear.initd
dropbear.confd
dropbear-0.53.1-static_build_fix.patch
@@ -24,13 +24,14 @@ source="https://matt.ucc.asn.au/dropbear/releases/${pkgname}-${pkgver}.tar.bz2
"
# secfixes:
+# 2020.79-r0:
+# - CVE-2018-20685
# 2018.76-r2:
# - CVE-2018-15599
_progs="dropbear dropbearkey dbclient dropbearconvert scp"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -45,8 +46,7 @@ build() {
}
package() {
- make PROGRAMS="$_progs" DESTDIR="$pkgdir" \
- -C "$builddir" install
+ make PROGRAMS="$_progs" DESTDIR="$pkgdir" install
install -D -m755 "$srcdir"/dropbear.initd \
"$pkgdir"/etc/init.d/dropbear
@@ -82,7 +82,7 @@ _ssh() {
ln -s /usr/bin/dbclient "$subpkgdir"/usr/bin/ssh
}
-sha512sums="f667ba8dae17ea89c118642b566f2c134c71bfd0b8bacea5cf7ec87d75ac79bd7cd1864a8788367a89d30ee35427d389ef6416375adff6e83caae30ff3e0549f dropbear-2019.78.tar.bz2
+sha512sums="7fccc1003b73540fa1da9763771519f8ae52608f7a1c5f66736db1885a87c346bd9711bcf017c48ba712a83ff04f01c12bea7180ed596fe58038fe656d2fd3d3 dropbear-2020.80.tar.bz2
9c55ab3d8b61955cde1ccc1b8acbd3d2ef123feb9489e92737304c35315d07b7f85fad8a12ac7b0ec2c1dcee3d76b8bc4aa18518f4ddd963917805db33e48826 dropbear.initd
83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f dropbear.confd
413cef467db35ddc430a773af943ff650d51bdb6fb262dcabc625eb6c9f4170b5711998df5577dd05c60e21e0a9771bff022adc8273083b85a18f4d5659ffd50 dropbear-0.53.1-static_build_fix.patch
diff --git a/main/elfutils/APKBUILD b/main/elfutils/APKBUILD
index aba9183bae..68b09ac8be 100644
--- a/main/elfutils/APKBUILD
+++ b/main/elfutils/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=elfutils
-pkgver=0.179
+pkgver=0.180
pkgrel=0
pkgdesc="A collection of utilities and DSOs to handle ELF files and DWARF data"
url="http://elfutils.org/"
@@ -45,11 +45,12 @@ source="https://sourceware.org/elfutils/ftp/$pkgver/elfutils-$pkgver.tar.bz2
prepare() {
default_prepare
- autoreconf -vif
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
@@ -90,7 +91,7 @@ libelf() {
mv "$pkgdir"/usr/lib/*-*.so "$subpkgdir"/usr/lib/
}
-sha512sums="ff2d96ad1db08e3a2ddaa60bd5a05e9b61ffa71d646f889cebb6bef51322e874930809c6dd0a257ced8c6e8de4b59ecf13ca6741dc68f9400293208278a0c052 elfutils-0.179.tar.bz2
+sha512sums="62e96035ccfe8928baca2285decbe8b8703a2daa956df81ece18fecf643272fb68955806b3e807a514141a7a9bf44520bf09461672aa580bd6807485fb604d25 elfutils-0.180.tar.bz2
8b650bc78cea66f30f0ff66357005890ac8a1b04a8dcc50209cb10a4b4c5ede849505cb68463beca8316ace0fbd53bbc484cfb597805b55616f3b3fc2b864e9a error.h
c3676b0b8b40d6e437f5d88c0d658dc0829ec97d1955e4bbf96f4cff9ee9001b8f2f06174450ae7aa5858b91c7905bdbd49073b561c346416132338a9c94731b fix-aarch64_fregs.patch
b9ba55e1b56a8abf694b6d02f022d9a3a0ae6ab53a8c4a71e49552e32411ef410d3a7512fbd1a729696bc2046ac11586829816f0fa3b8226ee77c9dc4b741e58 fix-uninitialized.patch
diff --git a/main/ell/APKBUILD b/main/ell/APKBUILD
index 62d2a797d2..b88f14ba3b 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.31
+pkgver=0.32
pkgrel=0
pkgdesc="Linux library for embedded development"
url="https://01.org/ell"
@@ -32,4 +32,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="7c5b70d0d2e11c6ae8e0b28a8c3a8332a0051677f96e86df5467a028b1e628ebace6a6d35ce1f7f8a013dedbf5f89c7d70994fb8153b0f6c0ff6e2b7e4d2927b ell-0.31.tar.gz"
+sha512sums="f9b7d4198504fb9d8d0faafc23e3870d78c34cbcb22286be5658c10062e14fc502ca43c34b89d8b3941357361e881f4ce0cbbbbfb3a83c15bdfe32c2213b189f ell-0.32.tar.gz"
diff --git a/main/espeak/APKBUILD b/main/espeak/APKBUILD
index 4929ad128a..3ba76b958c 100644
--- a/main/espeak/APKBUILD
+++ b/main/espeak/APKBUILD
@@ -1,14 +1,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=espeak
pkgver=1.48.04
-pkgrel=1
+pkgrel=2
pkgdesc="Speech synthesizer for English and other languages"
url="http://espeak.sourceforge.net/"
arch="all"
license="GPL-3.0"
subpackages="$pkgname-dev"
-depends=
-makedepends=
+makedepends="portaudio-dev"
source="https://downloads.sourceforge.net/project/espeak/espeak/espeak-${pkgver%.*}/espeak-$pkgver-source.zip
fix-narrowing.patch
"
@@ -17,12 +16,13 @@ builddir="$srcdir"/$pkgname-$pkgver-source
build() {
cd "$builddir"/src
- make AUDIO=none || return 1
+ cp portaudio19.h portaudio.h
+ make
}
package() {
cd "$builddir"/src
- make AUDIO=none DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
}
sha512sums="f0759e6ace2604c8cbb19e8c3fd4b106edf4dcece247a6677f6b734af7746c35a367126edfbe585396c98f6c54f07e25d64bfab35e258e64f09bd2c0833247fa espeak-1.48.04-source.zip
diff --git a/main/ethtool/APKBUILD b/main/ethtool/APKBUILD
index af90185920..a33707f059 100644
--- a/main/ethtool/APKBUILD
+++ b/main/ethtool/APKBUILD
@@ -1,11 +1,11 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ethtool
-pkgver=5.6
+pkgver=5.8
pkgrel=0
pkgdesc="Utility for controlling network drivers and hardware"
url="https://mirrors.edge.kernel.org/pub/software/network/ethtool/"
-arch="all"
+arch="all !s390x" # failing tests
license="GPL-2.0-only"
makedepends="linux-headers libmnl-dev"
subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
@@ -36,4 +36,4 @@ bashcomp() {
amove usr/share/bash-completion/completions
}
-sha512sums="9308f8e4a297d842a7a5a51419e408951e669da1f58cb1eed41f52be4cd2f32f811d1d19e9bee59d8297938a6d5a4abff2b9bbf789d0c49ed5074a78826d3199 ethtool-5.6.tar.xz"
+sha512sums="5eada909f82573ad93bc5476e6f8d50f68ce2c9948558877eb6ace8dc17aee895b2f27343592f5f23eaef0e0fc70b5f776f76e75d9614bab305a2819ca82370e ethtool-5.8.tar.xz"
diff --git a/main/execline/APKBUILD b/main/execline/APKBUILD
index d3ed435a2d..2ab6ea7167 100644
--- a/main/execline/APKBUILD
+++ b/main/execline/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
# Contributor: John Regan <john@jrjrtech.com>
pkgname=execline
-pkgver=2.6.0.2
+pkgver=2.6.1.0
pkgrel=0
pkgdesc="A small scripting language, to be used in place of a shell in non-interactive scripts."
url="http://skarnet.org/software/$pkgname/"
@@ -37,4 +37,4 @@ static() {
rmdir -p "$pkgdir"/usr/lib || :
}
-sha512sums="915823af0d557fc7a181e088ce319568e62ea4bf743704e498786422c97b991e6b09447c7cff7d7dda520d391773ef4b2fea68e44479c02766966256719bb4c0 execline-2.6.0.2.tar.gz"
+sha512sums="5bddf400f4cddeb8ddf8c80415c426553f14c879feeb4e69d5e21adb517c76a781581e8b4769c8560b56dc6f89f10a8b38fcf296baa6989b86c73bdb2cd6603e execline-2.6.1.0.tar.gz"
diff --git a/main/fail2ban/0001-amend-to-f3dbc9dda10e52610e3de26f538b5581fd905505-ch.patch b/main/fail2ban/0001-amend-to-f3dbc9dda10e52610e3de26f538b5581fd905505-ch.patch
new file mode 100644
index 0000000000..831d7a48c5
--- /dev/null
+++ b/main/fail2ban/0001-amend-to-f3dbc9dda10e52610e3de26f538b5581fd905505-ch.patch
@@ -0,0 +1,92 @@
+From ef7aeba83a6fb936c4dca847a69140c5b22c8000 Mon Sep 17 00:00:00 2001
+From: sebres <serg.brester@sebres.de>
+Date: Fri, 7 Feb 2020 11:08:01 +0100
+Subject: [PATCH] amend to f3dbc9dda10e52610e3de26f538b5581fd905505: change
+ main thread-name back to `fail2ban-server`; implements new command line
+ option `--pname` to specify it by start of server (default
+ `fail2ban-server`); closes gh-2623 (revert change of main thread-name,
+ because it can affect process-name too, so `pgrep` & co. may be confused)
+
+(cherry picked from commit 3f489070646b363aa0374681fe910f05521cd247)
+---
+ fail2ban/client/fail2bancmdline.py | 3 ++-
+ fail2ban/server/server.py | 5 +++--
+ man/fail2ban-client.1 | 3 +++
+ man/fail2ban-server.1 | 3 +++
+ 4 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/fail2ban/client/fail2bancmdline.py b/fail2ban/client/fail2bancmdline.py
+index 1268ee9f..3c6bd0bf 100644
+--- a/fail2ban/client/fail2bancmdline.py
++++ b/fail2ban/client/fail2bancmdline.py
+@@ -97,6 +97,7 @@ class Fail2banCmdLine():
+ output(" -c <DIR> configuration directory")
+ output(" -s <FILE> socket path")
+ output(" -p <FILE> pidfile path")
++ output(" --pname <NAME> name of the process (main thread) to identify instance (default fail2ban-server)")
+ output(" --loglevel <LEVEL> logging level")
+ output(" --logtarget <TARGET> logging target, use file-name or stdout, stderr, syslog or sysout.")
+ output(" --syslogsocket auto|<FILE>")
+@@ -185,7 +186,7 @@ class Fail2banCmdLine():
+ try:
+ cmdOpts = 'hc:s:p:xfbdtviqV'
+ cmdLongOpts = ['loglevel=', 'logtarget=', 'syslogsocket=', 'test', 'async',
+- 'timeout=', 'str2sec=', 'help', 'version', 'dp', '--dump-pretty']
++ 'pname=', 'timeout=', 'str2sec=', 'help', 'version', 'dp', '--dump-pretty']
+ optList, self._args = getopt.getopt(self._argv[1:], cmdOpts, cmdLongOpts)
+ except getopt.GetoptError:
+ self.dispUsage()
+diff --git a/fail2ban/server/server.py b/fail2ban/server/server.py
+index 15265822..417f4514 100644
+--- a/fail2ban/server/server.py
++++ b/fail2ban/server/server.py
+@@ -81,8 +81,6 @@ class Server:
+ 'Linux': '/dev/log',
+ }
+ self.__prev_signals = {}
+- # replace real thread name with short process name (for top/ps/pstree or diagnostic):
+- prctl_set_th_name('f2b/server')
+
+ def __sigTERMhandler(self, signum, frame): # pragma: no cover - indirect tested
+ logSys.debug("Caught signal %d. Exiting", signum)
+@@ -113,6 +111,9 @@ class Server:
+ logSys.error(err)
+ raise ServerInitializationError(err)
+ # We are daemon.
++
++ # replace main thread (and process) name to identify server (for top/ps/pstree or diagnostic):
++ prctl_set_th_name(conf.get("pname", "fail2ban-server"))
+
+ # Set all logging parameters (or use default if not specified):
+ self.__verbose = conf.get("verbose", None)
+diff --git a/man/fail2ban-client.1 b/man/fail2ban-client.1
+index 745c080a..5727caf0 100644
+--- a/man/fail2ban-client.1
++++ b/man/fail2ban-client.1
+@@ -19,6 +19,9 @@ socket path
+ \fB\-p\fR <FILE>
+ pidfile path
+ .TP
++\fB\-\-pname\fR <NAME>
++name of the process (main thread) to identify instance (default fail2ban\-server)
++.TP
+ \fB\-\-loglevel\fR <LEVEL>
+ logging level
+ .TP
+diff --git a/man/fail2ban-server.1 b/man/fail2ban-server.1
+index 418b46dd..25c5ec96 100644
+--- a/man/fail2ban-server.1
++++ b/man/fail2ban-server.1
+@@ -19,6 +19,9 @@ socket path
+ \fB\-p\fR <FILE>
+ pidfile path
+ .TP
++\fB\-\-pname\fR <NAME>
++name of the process (main thread) to identify instance (default fail2ban\-server)
++.TP
+ \fB\-\-loglevel\fR <LEVEL>
+ logging level
+ .TP
+--
+2.20.1
+
diff --git a/main/fail2ban/APKBUILD b/main/fail2ban/APKBUILD
index e475750743..2e9b315643 100644
--- a/main/fail2ban/APKBUILD
+++ b/main/fail2ban/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fail2ban
pkgver=0.11.1
-pkgrel=1
+pkgrel=3
pkgdesc="Scans log files for login failures then updates iptables to reject originating ip address"
url="https://www.fail2ban.org"
arch="noarch !s390x" # test failures
@@ -13,6 +13,7 @@ makedepends="python3-dev py3-setuptools bash"
subpackages="$pkgname-doc $pkgname-openrc"
source="$pkgname-$pkgver.tar.gz::https://github.com/fail2ban/fail2ban/archive/$pkgver.tar.gz
ec37b1942c4da76f7a0f71efe81bea6835466648.patch
+ 0001-amend-to-f3dbc9dda10e52610e3de26f538b5581fd905505-ch.patch
fail2ban.confd
fail2ban.logrotate
alpine-ssh.jaild
@@ -51,8 +52,9 @@ package() {
sha512sums="019b088aa6375f98742ed101ef6f65adabca3324444d71d5b8597a8d1d22fa76b9f503660f0498643fe24a3b8e4368de916072a1ab77b8e2ea3eda41c3e0c8c6 fail2ban-0.11.1.tar.gz
2d57fe7a7e3d1889dfa00ac33f5071069ed62f5fc0edb1e1827aedc47fae3a36d19c568b1721ba3a8e117f4ba6b3756d11942f2320b42864d45203f45761c7b6 ec37b1942c4da76f7a0f71efe81bea6835466648.patch
+a4dbbcde8ba98368905e06a2d526c662f9087931bc1dab02dd85138d7fcd7d724cfdcee074b454f85def76f1a33d10f0c3b062d9bd777fd52ad73ea45df1dcc8 0001-amend-to-f3dbc9dda10e52610e3de26f538b5581fd905505-ch.patch
1e7581dd04e7777d6fd5c40cc842a7ec5f4e6a0374673d020d89dd61bf4093d48934844bee89bcac9084f9ae44f3beb66e714cf3c2763d79c3e8feb790c5e43b fail2ban.confd
-4ff9dd2793f42e414d83676104f47966f781b9e042e90dbc839d4e6b27faee08ebea2231b178d1d41084fa6c59aa62689bdb713977096d8b235a33e73268ccc5 fail2ban.logrotate
+ee1c229db970239ebc707cd484a650fcf2347c70b411728ee2a4a35a72f4118cfccecf2a221275603320e0332efcc16e4979201933cec1aef1c5d5a082fc4940 fail2ban.logrotate
84915967ae1276f1e14a5813680ee2ebf081af1ff452a688ae5f9ac3363f4aff90e39f8e6456b5c33d5699917d28a16308797095fd1ef9bb1fbcb46d4cea3def alpine-ssh.jaild
3e8e08d5e349e857b51ce34a9d968f16661b34e1cec06bec0aa9a32723bbe9be5a9890dd479331a9cc860821d33b1bf3b8e995182e319dead5a3d434b1816304 alpine-sshd.filterd
36a81b771be0b36fe0dfb5ee4c72c9cb5b504e110618a8eb6f0f241b4e57d92df01dc5cc04b6b68d5bc6a5e6d68de1000092770285d7a328e5937e50b4b226a3 alpine-sshd-ddos.filterd"
diff --git a/main/fail2ban/fail2ban.logrotate b/main/fail2ban/fail2ban.logrotate
index f635c3ddde..351bc40feb 100644
--- a/main/fail2ban/fail2ban.logrotate
+++ b/main/fail2ban/fail2ban.logrotate
@@ -4,7 +4,7 @@
missingok
compress
postrotate
- /usr/bin/fail2ban-client set logtarget /var/log/fail2ban.log 1>/dev/null || true
+ /usr/bin/fail2ban-client flushlogs 1>/dev/null || true
chown :wheel /var/log/fail2ban.log
chmod 640 /var/log/fail2ban.log
endscript
diff --git a/main/fcgiwrap/APKBUILD b/main/fcgiwrap/APKBUILD
index 21bd32e606..ec5214f2ac 100644
--- a/main/fcgiwrap/APKBUILD
+++ b/main/fcgiwrap/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fcgiwrap
pkgver=1.1.0
-pkgrel=3
+pkgrel=5
pkgdesc="Simple server for running CGI applications over FastCGI"
url="https://github.com/gnosek/fcgiwrap"
arch="all"
@@ -12,7 +12,7 @@ pkggroups="www-data"
install="$pkgname.pre-install"
makedepends="$depends_dev autoconf libtool automake fcgi-dev"
subpackages="$pkgname-doc $pkgname-openrc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/gnosek/$pkgname/archive/$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/gnosek/fcgiwrap/archive/$pkgver.tar.gz
$pkgname.initd
$pkgname.confd"
@@ -37,5 +37,5 @@ package() {
}
sha512sums="b8d35762d1d3c94a67602290b0092f0c38cffbbcd3dbc16597abf8b92172909b04450c238de2e430e841a17dd47fdd48d6a001f77539966980ef1af61e447ddc fcgiwrap-1.1.0.tar.gz
-0dbf5f4387e5dc5de6e9bd6d98247e175f1a7943fe1d04ea916881b1269fd0b62abfafac91f8c0dd2f4dc9c71118195ba9dd7cf9bb5e3d93e6e711ec7d770453 fcgiwrap.initd
+e6111da1089df43f8656e598edf4e658cd2d70e6066833a2c7a465229723e1edce144cf214bd8f771298d54948b8128012c4ce4d509c9d9307a54e8ef90ff2d8 fcgiwrap.initd
893e9afa92c20c9d0dab68fffc806a1be1f2e28a7e73bbb497316386a9ee083be4bad68a90f660e489311a9812a512b50fb0edb8b9c49b12f6cd266ba53b01a6 fcgiwrap.confd"
diff --git a/main/fcgiwrap/fcgiwrap.initd b/main/fcgiwrap/fcgiwrap.initd
index 353e51f393..2d2e05d8e5 100644
--- a/main/fcgiwrap/fcgiwrap.initd
+++ b/main/fcgiwrap/fcgiwrap.initd
@@ -29,6 +29,7 @@ start() {
ebegin "Starting ${name}"
start-stop-daemon --exec ${command} \
--background \
+ -k 0002 \
-u ${user} -g ${group} \
--start -- ${command_args}
eend $?
diff --git a/main/fcgiwrap/fcgiwrap.pre-install b/main/fcgiwrap/fcgiwrap.pre-install
index cdd114e0ec..ec2ba415e5 100644
--- a/main/fcgiwrap/fcgiwrap.pre-install
+++ b/main/fcgiwrap/fcgiwrap.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
adduser -S -D -H -h /var/run/fcgiwrap -s /sbin/nologin -G www-data \
fcgiwrap 2>/dev/null
exit 0
diff --git a/main/fetchmail/APKBUILD b/main/fetchmail/APKBUILD
index 356aec56b0..83438f28ff 100644
--- a/main/fetchmail/APKBUILD
+++ b/main/fetchmail/APKBUILD
@@ -1,12 +1,12 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fetchmail
-pkgver=6.4.6
+pkgver=6.4.8
pkgrel=0
pkgdesc="A remote-mail retrieval and forwarding utility"
url="https://www.fetchmail.info/"
arch="all"
-license="GPL-2.0-or-later AND Public Domain"
+license="GPL-2.0-or-later AND Public-Domain"
pkgusers="fetchmail"
pkggroups="fetchmail"
makedepends="openssl-dev python3"
@@ -63,6 +63,6 @@ fetchmailconf() {
}
-sha512sums="0101c79039c754b55e94181fb6c51f07782e581123e25ac72a99c2abe8f3ac4af3e97b12bab50813fb9300179b921c80d0bc60f528ad73c914ad266e29fb6513 fetchmail-6.4.6.tar.xz
+sha512sums="c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987 fetchmail-6.4.8.tar.xz
9520ec6616f4004d091b1c908d3ea38e104ad8f6595959a3cd3ef7544d05e3b75854631289e167ead08479250d04584d3f1855668a7a0ebd16a1ee9106f3b0b3 fetchmail.initd
6f031ec6bd4a3ae53cd04fbd8470f4d10bd46ca29cabffa634a6801aa2e7707169855fbc045ced3c9a69523e694511a3f076b611678143e49339c8ccac98074e fetchmail.confd"
diff --git a/main/file/APKBUILD b/main/file/APKBUILD
index 9ae5082dae..747031d1bd 100644
--- a/main/file/APKBUILD
+++ b/main/file/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=file
-pkgver=5.38
+pkgver=5.39
pkgrel=0
pkgdesc="File type identification utility"
url="https://www.darwinsys.com/file"
@@ -47,4 +47,4 @@ libmagic() {
mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr
}
-sha512sums="b8920b0b886600b50ef83d949028972e99830d5ac2e9545a5ff7177e5f4c3db20bfc00884d6b6961e4707a920f0290c59ae89439a02cd8cc2a8673284c4100c4 file-5.38.tar.gz"
+sha512sums="5633bf2fffc0eda03f2e8cdc8a413f4e97dab6f12f4a5727ec0f4ba6595f2887579612fe508d5d76bbc8bd63d344ed07ee60e0a17e42f4f2d9d9490574a32633 file-5.39.tar.gz"
diff --git a/main/fish/APKBUILD b/main/fish/APKBUILD
index 700e844d1a..b8c167cbe6 100644
--- a/main/fish/APKBUILD
+++ b/main/fish/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Leo <thinkabit.ukim@gmail.com>
pkgname=fish
pkgver=3.1.2
-pkgrel=0
+pkgrel=1
pkgdesc="Modern interactive commandline shell"
url="http://www.fishshell.com"
arch="all"
@@ -49,6 +49,9 @@ package() {
mkdir -p "$pkgdir"/usr/lib
mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib
+
+ # https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/10159#note_101679
+ rm "$pkgdir"/usr/share/fish/completions/rustup.fish
}
doc() {
diff --git a/main/flite/APKBUILD b/main/flite/APKBUILD
index 2fbf4b84e7..5ef757a59d 100644
--- a/main/flite/APKBUILD
+++ b/main/flite/APKBUILD
@@ -2,15 +2,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=flite
pkgver=2.1
-pkgrel=1
+pkgrel=2
pkgdesc="Small, fast speech synthesis engine (text-to-speech)"
url="http://www.speech.cs.cmu.edu/flite"
arch="all"
license="MIT"
-depends=
-depends_dev=
-makedepends="$depends_dev"
-install=""
+makedepends="alsa-lib-dev"
subpackages="$pkgname-dev"
source="http://www.festvox.org/$pkgname/packed/$pkgname-$pkgver/$pkgname-$pkgver-release.tar.bz2
fix-internal-linking.patch"
@@ -23,7 +20,8 @@ build() {
--host=$CHOST \
--prefix=/usr \
--enable-shared \
- --localstatedir=/var
+ --localstatedir=/var \
+ --with-audio=alsa
# work around parallel build issue
make -C include
make -C src
diff --git a/main/font-misc-ethiopic/APKBUILD b/main/font-misc-ethiopic/APKBUILD
index a1685b29e6..a914c339c9 100644
--- a/main/font-misc-ethiopic/APKBUILD
+++ b/main/font-misc-ethiopic/APKBUILD
@@ -1,42 +1,29 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-misc-ethiopic
-pkgver=1.0.3
+pkgver=1.0.4
pkgrel=0
pkgdesc="X.org misc ethiopic fonts"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
arch="noarch"
-license="custom"
+license="MIT"
depends="encodings font-alias mkfontscale mkfontdir fontconfig"
makedepends="font-util-dev bdftopcf"
-install=
source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
- cd "$_builddir"
- update_config_sub || return 1
-}
-
build() {
- cd "$_builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
- --with-mapfiles=/usr/share/fonts/util \
- --with-fontdir=/usr/share/fonts/ethiopic \
- || return 1
- make || return 1
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --with-fontrootdir=/usr/share/fonts
+ make
}
package() {
- cd "$_builddir"
- make -j1 DESTDIR="$pkgdir" \
- FCCACHE=: \
- MKFONTDIR=: \
- MKFONTSCALE=: \
- install || return 1
+ make DESTDIR="$pkgdir" FCCACHE=: MKFONTDIR=: MKFONTSCALE=: install
}
-sha512sums="b3e3f7462f37216796730a894761c7d60d5ede0f51351997e6c3c92e3136c788a2710690f482d05ed1396a4b6be452e1f871febc7e5b7a1a67e43bcc1ec7c77d font-misc-ethiopic-1.0.3.tar.bz2"
+sha512sums="4fed9ff3782746898c56dac199e9ca89356f4967779937049b9ff4ffad202317c023859f92d44b371dfa5485d5368ccad648e64b12cde0ed21f7d4aee5affcd5 font-misc-ethiopic-1.0.4.tar.bz2"
diff --git a/main/fontconfig/APKBUILD b/main/fontconfig/APKBUILD
index 49ed281062..8abfbb69e8 100644
--- a/main/fontconfig/APKBUILD
+++ b/main/fontconfig/APKBUILD
@@ -2,17 +2,18 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fontconfig
pkgver=2.13.1
-pkgrel=2
+pkgrel=3
pkgdesc="Library for configuring and customizing font access"
url="https://www.freedesktop.org/wiki/Software/fontconfig"
arch="all"
license="MIT"
-makedepends="freetype-dev expat-dev python3-dev gperf util-linux-dev"
+makedepends="freetype-dev expat-dev python3-dev gperf util-linux-dev docbook2x"
triggers="$pkgname.trigger=/usr/share/fonts/*"
-subpackages="$pkgname-static $pkgname-dev"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
source="https://www.freedesktop.org/software/fontconfig/release/fontconfig-$pkgver.tar.gz"
-replaces="fontconfig-doc" # Package removed as license is no longer provided
+# For generation of man pages
+export DOC2MAN=docbook2x-man
build() {
cd "$builddir"
@@ -26,15 +27,15 @@ build() {
--sysconfdir=/etc \
--localstatedir=/var \
--enable-static \
- --disable-nls \
- --disable-docs
+ --enable-docs \
+ --disable-nls
rm -f src/fcobjhash.h
make
}
check() {
cd "$builddir"
- make check
+ make -j1 check || (cat test/test-suite.log; false)
}
package() {
diff --git a/main/fping/APKBUILD b/main/fping/APKBUILD
index e2dfa2e60f..4f5ce36939 100644
--- a/main/fping/APKBUILD
+++ b/main/fping/APKBUILD
@@ -1,17 +1,16 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fping
-pkgver=4.2
+pkgver=4.4
pkgrel=0
pkgdesc="A utility to ping multiple hosts at once"
-url="http://fping.org/"
+url="https://fping.org/"
arch="all"
license="MIT"
subpackages="$pkgname-doc"
-source="http://fping.org/dist/fping-$pkgver.tar.gz"
+source="https://fping.org/dist/fping-$pkgver.tar.gz"
options="suid !check" # No testsuite
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -22,9 +21,8 @@ build() {
}
package() {
- cd "$builddir"
make install DESTDIR="$pkgdir"
chmod 4755 "$pkgdir"/usr/sbin/fping*
}
-sha512sums="2bab34dae539d942eb5e436802e6f74d57c04aa4b782f9adbd6c27830209fdb47707131f20ed966012bcec3d253c9bb3df9033a60b55bfe560af6bb1f572ee8a fping-4.2.tar.gz"
+sha512sums="8c9ff78edee10ce8e02a0d6189d4a2d91cc60954740c15730f8f1a17d037ee9f565828fa0dcd47a06f2746328063125704d467939d6280b44d5ac98a65e5acd0 fping-4.4.tar.gz"
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 46bf887814..862bf9956a 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Cameron Banta <cbanta@gmail.com>
pkgname=freeswitch
pkgver=1.10.3
-pkgrel=0
+pkgrel=1
pkgdesc="A communications platform written in C from the ground up"
url="http://www.freeswitch.org"
arch="all"
@@ -51,7 +51,9 @@ makedepends="
xmlrpc-c-dev
yasm
zlib-dev
- autoconf automake libtool
+ autoconf
+ automake
+ libtool
"
install="$pkgname.pre-install $pkgname.pre-upgrade"
_freeswitch_user=freeswitch
@@ -228,6 +230,6 @@ c1960f3c7acf729468b819f7f15d66a251c3967b2784bce18c7755b333156e687c55fdc1aceda588
4ceb48f64d2bc26a02cc0846276506241bfd30c156422b0a1d608fd172c099feb5c121a763652e9a45046dcdd0ba0eb71eab240e0c6ce2ad63ff781719e135a4 getlib.patch
98a53f289c3647cafd05b6f847da0504a838a6e06545c133c10fb058c2d941e6bccf2820f44649fc25f94a4a5b7c1280eaee91098e8110f96ed3342c1cb4346c libvpx-fix-arm-float-abi.patch
16e9208fca7f0a1985dd01ec38ddabb6a79da83ad6ab004bb66de528ac45f02fadaddc50a9f228e1aa38fae213fa5af0ca858b7af629b67a7d654339f813a68c disable-Werror.patch
-eb8949d6cc8f441e94355dfc74928d944c0c763cd438b450186b53044f3999fbef83006d191d3dcd48a0f57d4b7642fd35ac987e942febbe74418b10b78e16a8 modules.conf
+ceeb2bb37fac580483000daff327a4c005d42b7eabdba4671ed2b0e78cddda8a42ae76e42bdf4a1b2e42874c4709887bcee9cb08a4c1dafcfeaec21e467726bf modules.conf
a585f6411185a26206137a1ad97a06fd6c73e80c5439e9be45eabfa70e7a83120169ba882971fcd328436c8e0242cbd664170b80754ea2846021689baf1f1595 freeswitch.confd
643d0a2e43f5d3bf3b99fcb6f6422302cb4b74a95eccf844eafb100b15aa9856b4ff41f112d6637255c2e9e2bec9fedc9a9215dfff214dfb83b52eae16b71dca freeswitch.initd"
diff --git a/main/freeswitch/modules.conf b/main/freeswitch/modules.conf
index bf3ca84793..294f4dba2c 100644
--- a/main/freeswitch/modules.conf
+++ b/main/freeswitch/modules.conf
@@ -1,5 +1,7 @@
#applications/mod_abstraction
+#applications/mod_av
applications/mod_avmd
+#applications/mod_bert
applications/mod_blacklist
applications/mod_callcenter
#applications/mod_cidlookup
@@ -7,6 +9,7 @@ applications/mod_cluechoo
applications/mod_commands
applications/mod_conference
applications/mod_curl
+#applications/mod_cv
applications/mod_db
applications/mod_directory
applications/mod_distributor
@@ -20,29 +23,38 @@ applications/mod_fifo
#applications/mod_fsk
#applications/mod_fsv
applications/mod_hash
+#applications/mod_hiredis
applications/mod_httapi
applications/mod_http_cache
#applications/mod_ladspa
#applications/mod_lcr
#applications/mod_memcache
#applications/mod_mongo
+#applications/mod_mp4
+#applications/mod_mp4v2
#applications/mod_nibblebill
+#applications/mod_oreka
#applications/mod_osp
+#applications/mod_prefix
+#applications/mod_rad_auth
applications/mod_redis
#applications/mod_rss
+#applications/mod_signalwire
applications/mod_sms
+#applications/mod_sms_flowroute
#applications/mod_snapshot
-#applications/mod_snipe_hunt
#applications/mod_snom
+#applications/mod_sonar
#applications/mod_soundtouch
applications/mod_spandsp
applications/mod_spy
#applications/mod_stress
+#applications/mod_translate
applications/mod_valet_parking
+#applications/mod_video_filter
#applications/mod_vmd
applications/mod_voicemail
applications/mod_voicemail_ivr
-#applications/mod_random
#asr_tts/mod_cepstral
asr_tts/mod_flite
#asr_tts/mod_pocketsphinx
@@ -50,29 +62,33 @@ asr_tts/mod_flite
#asr_tts/mod_unimrcp
codecs/mod_amr
#codecs/mod_amrwb
+codecs/mod_b64
#codecs/mod_bv
-#codecs/mod_celt
+#codecs/mod_clearmode
#codecs/mod_codec2
#codecs/mod_com_g729
#codecs/mod_dahdi_codec
codecs/mod_g723_1
codecs/mod_g729
codecs/mod_h26x
-#codecs/mod_vpx
codecs/mod_ilbc
#codecs/mod_isac
+#codecs/mod_mp4v
codecs/mod_opus
codecs/mod_sangoma_codec
#codecs/mod_silk
#codecs/mod_siren
+#codecs/mod_theora
+#databases/mod_mariadb
+databases/mod_pgsql
dialplans/mod_dialplan_asterisk
#dialplans/mod_dialplan_directory
dialplans/mod_dialplan_xml
#directories/mod_ldap
#endpoints/mod_alsa
endpoints/mod_dingaling
+#endpoints/mod_gsmopen
#endpoints/mod_h323
-#endpoints/mod_html5
#endpoints/mod_khomp
endpoints/mod_loopback
#endpoints/mod_opal
@@ -80,20 +96,27 @@ endpoints/mod_portaudio
endpoints/mod_rtc
endpoints/mod_rtmp
endpoints/mod_skinny
-#endpoints/mod_skypopen
endpoints/mod_sofia
endpoints/mod_verto
+#event_handlers/mod_amqp
event_handlers/mod_cdr_csv
-event_handlers/mod_json_cdr
#event_handlers/mod_cdr_mongodb
event_handlers/mod_cdr_pg_csv
event_handlers/mod_cdr_sqlite
#event_handlers/mod_erlang_event
#event_handlers/mod_event_multicast
event_handlers/mod_event_socket
-#event_handlers/mod_event_zmq
+#event_handlers/mod_fail2ban
+#event_handlers/mod_format_cdr
+event_handlers/mod_json_cdr
#event_handlers/mod_radius_cdr
+#event_handlers/mod_odbc_cdr
+#event_handlers/mod_kazoo
+#event_handlers/mod_rayo
+#event_handlers/mod_smpp
event_handlers/mod_snmp
+#event_handlers/mod_event_zmq
+#formats/mod_imagick
formats/mod_local_stream
formats/mod_native_file
formats/mod_png
@@ -101,28 +124,39 @@ formats/mod_png
formats/mod_shell_stream
formats/mod_shout
formats/mod_sndfile
+#formats/mod_ssml
formats/mod_tone_stream
#formats/mod_vlc
+#formats/mod_opusfile
+#languages/mod_basic
#languages/mod_java
languages/mod_lua
#languages/mod_managed
languages/mod_perl
#languages/mod_python
-#languages/mod_spidermonkey
+#languages/mod_v8
#languages/mod_yaml
loggers/mod_console
+#loggers/mod_graylog2
loggers/mod_logfile
loggers/mod_syslog
+#loggers/mod_raven
say/mod_say_de
say/mod_say_en
say/mod_say_es
+say/mod_say_es_ar
+say/mod_say_fa
say/mod_say_fr
say/mod_say_he
+say/mod_say_hr
say/mod_say_hu
say/mod_say_it
+say/mod_say_ja
say/mod_say_nl
+say/mod_say_pl
say/mod_say_pt
say/mod_say_ru
+say/mod_say_sv
say/mod_say_th
say/mod_say_zh
#timers/mod_posix_timer
@@ -130,11 +164,11 @@ timers/mod_timerfd
xml_int/mod_xml_cdr
xml_int/mod_xml_curl
#xml_int/mod_xml_ldap
+#xml_int/mod_xml_radius
xml_int/mod_xml_rpc
xml_int/mod_xml_scgi
../../libs/freetdm/mod_freetdm
-#../../libs/openzap/mod_openzap
## Experimental Modules (don't cry if they're broken)
#../../contrib/mod/xml_int/mod_xml_odbc
diff --git a/main/freetds/APKBUILD b/main/freetds/APKBUILD
index a7d558127b..107ab8898a 100644
--- a/main/freetds/APKBUILD
+++ b/main/freetds/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=freetds
-pkgver=1.1.40
+pkgver=1.2.3
pkgrel=0
pkgdesc="Tabular Datastream Library"
url="https://www.freetds.org/"
@@ -38,5 +38,5 @@ package() {
make -j1 DESTDIR="$pkgdir" install
}
-sha512sums="416b000fe2b1e2838127b599d7417ccea0a342f8260d67406abe29edea0322f470c3ee03292eceecac80e741ef624da03e8e70e9fc2e7ea11939e7bfde5e3e83 freetds-1.1.40.tar.bz2
-d75d1aab6687586697f3e430db1e82f21208f10076b45996542eea682e36cbbbb344f479a9336fcfd294b5b87d7acb2ec5fb8ddd1914e990e23dd5e7ae93a0b6 fix-includes.patch"
+sha512sums="eb048633a9549c0d78d34cde4ecdb5bb6ca0cb3aa06e53ec38e19f5a452a6afa729de4fee44c4fbc77cb868afb390abf3f6193d058cabcb5341380fdc68f8d4d freetds-1.2.3.tar.bz2
+9ca126d9316cf48fa5f9572b5aa9122eb114033627ab75f6715bce0260d70c6a7bb8a71ecb1e209a4f83416332d10942c7aaf02a5249948cf1cec6a1a457a236 fix-includes.patch"
diff --git a/main/freetds/fix-includes.patch b/main/freetds/fix-includes.patch
index af9465d758..ecef5e9fb2 100644
--- a/main/freetds/fix-includes.patch
+++ b/main/freetds/fix-includes.patch
@@ -1,5 +1,6 @@
-diff --git a/src/apps/fisql/fisql.c b/src/apps/fisql/fisql.c
-index ec8fded..fd76956 100644
+Upstream: No
+Reason: Missing include
+
--- a/src/apps/fisql/fisql.c
+++ b/src/apps/fisql/fisql.c
@@ -25,6 +25,7 @@
diff --git a/main/fribidi/APKBUILD b/main/fribidi/APKBUILD
index 4450f6d5e1..a8bc91a18c 100644
--- a/main/fribidi/APKBUILD
+++ b/main/fribidi/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fribidi
-pkgver=1.0.9
+pkgver=1.0.10
pkgrel=0
pkgdesc="Free Implementation of the Unicode Bidirectional Algorithm"
url="https://github.com/fribidi/fribidi"
@@ -30,4 +30,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="e66989830941172fa003c8b9376719282fa1039592a1e158e975cab81ce8dcb2755453c64906a8464c047f9e9154e012d9bd37256b1f463e235648a13e4601ed fribidi-1.0.9.tar.xz"
+sha512sums="cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360 fribidi-1.0.10.tar.xz"
diff --git a/main/fuse3/APKBUILD b/main/fuse3/APKBUILD
index 99949c9a53..82e7ac0760 100644
--- a/main/fuse3/APKBUILD
+++ b/main/fuse3/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fuse3
_pkgname=fuse
-pkgver=3.9.1
+pkgver=3.9.3
pkgrel=0
pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface"
url="https://github.com/libfuse/libfuse"
@@ -70,6 +70,6 @@ _openrc() {
install_if="openrc fuse-common=$pkgver-r$pkgrel"
}
-sha512sums="295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329 fuse-3.9.1.tar.xz
+sha512sums="e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26 fuse-3.9.3.tar.xz
1a9e1d1e8a7b0778ffde328e4322c73b5d57ec98d52767c846d755cce861ab27989823a75b6c5f994432ddb77fa351dfa4a8f948c9467c5f7d5f471e4608358b fix-realpath.patch
7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 fuse.initd"
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index afffad628f..64346e09cd 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -6,7 +6,7 @@ pkgver=9.3.0
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
pkgname="$pkgname$_target"
-pkgrel=2
+pkgrel=4
pkgdesc="The GNU Compiler Collection"
url="https://gcc.gnu.org"
arch="all"
@@ -175,6 +175,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
gcc-4.9-musl-fortify.patch
gcc-6.1-musl-libssp.patch
gcc-pure64.patch
+ futex-time64.patch
fix-cxxflags-passing.patch
ada-shared.patch
@@ -440,6 +441,12 @@ libcxx() {
pkgdesc="GNU C++ standard runtime library"
depends=
+ if [ "$CHOST" = "$CTARGET" ]; then
+ # verify that we are using clock_gettime rather than doing direct syscalls
+ # so we dont break 32 bit arches due to time64.
+ nm -D "$pkgdir"/usr/lib/libstdc++.so.* | grep clock_gettime
+ fi
+
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libstdc++.so.* "$subpkgdir"/usr/lib/
}
@@ -473,8 +480,10 @@ objc() {
replaces="gcc"
depends="libc-dev gcc=$_gccrel libobjc=$_gccrel"
- mkdir -p "$subpkgdir"/$_gcclibdir/include \
+ mkdir -p "$subpkgdir/$_gcclibexec" \
+ "$subpkgdir"/$_gcclibdir/include \
"$subpkgdir"/usr/lib
+ mv "$pkgdir/$_gcclibexec/cc1obj" "$subpkgdir/$_gcclibexec/"
mv "$pkgdir"/$_gcclibdir/include/objc "$subpkgdir"/$_gcclibdir/include/
mv "$pkgdir"/usr/lib/libobjc.so "$pkgdir"/usr/lib/libobjc.a \
"$subpkgdir"/usr/lib/
@@ -511,15 +520,19 @@ gdc() {
depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
depends="$depends libucontext-dev"
- mkdir -p "$subpkgdir"/$_gcclibdir/include/d/ \
+ mkdir -p "$subpkgdir/$_gcclibexec" \
+ "$subpkgdir"/$_gcclibdir/include/d/ \
"$subpkgdir"/usr/lib \
"$subpkgdir"/usr/bin
# Copy: The installed '.d' files, the static lib, the binary itself
# The shared libs are part of 'libgphobos' so one can run program
# without installing the compiler
+ mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
+ mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
+ mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
}
@@ -584,6 +597,7 @@ gfortran() {
"$pkgdir"/usr/lib/libquadmath.so \
"$subpkgdir"/usr/lib/
fi
+ mv "$pkgdir"/$_gcclibdir/finclude "$subpkgdir"/$_gcclibdir/
mv "$pkgdir"/$_gcclibexec/f951 "$subpkgdir"/$_gcclibexec
mv "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir
}
@@ -634,6 +648,7 @@ d08d7ead2de0429e5c9055d5b029ec2be9a8c821d22cecaf9b51f633652c493333f98963d9267fa2
600fe5098dc54edaa9808fd5717af9dec058953f9ad37d49cfba1db4f7e9a7a8f02019342f75157fc575946fa693259422184de27b7ecc8386d9f3ecc0f7cc5d gcc-4.9-musl-fortify.patch
dbe0ee917fc7668571722364ab7c806731e3a31e8bfa30b4941b28b16b877d2a32b4a3897ef533399a28f82d43cac9b28e92de0493f0e779046db56584e07fa4 gcc-6.1-musl-libssp.patch
fa62556719449caec6b2b434355bfbcaa5ae55ffe017b3e1f827f66a2aae21b79c571ee7a4ce723ea69169bc3a6447e73650991a200cc372adf2f102677518d7 gcc-pure64.patch
+5b12af738349a22346589e53e7ab7d37a065b7f4c756aab4c1cc1b4753cdf9ad1bf198f4e4783ae10232df63da0855591bab2452b50ac96a08905972d93c1b0e futex-time64.patch
35d6d59f0b7b968f282f56767c9e0823a7bdc5aa0d450aca50fbd802649a7ca608b47671244a3faa208a9b0d6832cabb5a22724157dc817b2c0ad63d09f93282 fix-cxxflags-passing.patch
3f5bc334d9f73d06f5f7c876738d02356acdd08958bea0e4d2095ebf15c2c2ec4e411abdae0297505ae9a1699ca01b17338e853184e84663203b192b0d35fc19 ada-shared.patch
cceeac95f47ea8664e1c16c5ebecb472b5aaa56040e943c1b97c7873b50e3a2bf972d9f743d342a2444a3bb711a0720d2446fded43892c5e05bdeefd478b0cd1 ada-musl.patch
diff --git a/main/gcc/futex-time64.patch b/main/gcc/futex-time64.patch
new file mode 100644
index 0000000000..b02c1ff2b4
--- /dev/null
+++ b/main/gcc/futex-time64.patch
@@ -0,0 +1,21 @@
+needed for musl 1.2 and time64.
+Upstream bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93421
+
+--- gcc-9.2.0/libstdc++-v3/src/c++11/futex.cc.orig 2020-01-20 14:55:05.507548334 -0500
++++ gcc-9.2.0/libstdc++-v3/src/c++11/futex.cc 2020-01-20 14:56:52.458268068 -0500
+@@ -61,7 +61,15 @@
+ struct timeval tv;
+ gettimeofday (&tv, NULL);
+ // Convert the absolute timeout value to a relative timeout
++#if defined(SYS_futex_time64)
++ struct
++ {
++ long tv_sec;
++ long tv_nsec;
++ } rt;
++#else
+ struct timespec rt;
++#endif
+ rt.tv_sec = __s.count() - tv.tv_sec;
+ rt.tv_nsec = __ns.count() - tv.tv_usec * 1000;
+ if (rt.tv_nsec < 0)
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index f8aac36dc1..2b9555e582 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -25,8 +25,8 @@
# - CVE-2017-1000117
pkgname=git
-pkgver=2.27.0
-pkgrel=0
+pkgver=2.28.0
+pkgrel=1
pkgdesc="Distributed version control system"
url="https://www.git-scm.com/"
arch="all"
@@ -36,6 +36,7 @@ makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev python3-dev
pcre2-dev asciidoc xmlto perl-error tcl tk"
# note that order matters
subpackages="$pkgname-doc
+ $pkgname-dbg
$pkgname-bash-completion:completion:noarch
perl-$pkgname-svn:_perl_git_svn:noarch
perl-$pkgname:_perl_git:noarch
@@ -72,6 +73,7 @@ prepare() {
NO_SYS_POLL_H=1
CFLAGS=$CFLAGS
ICONV_OMITS_BOM=Yes
+ PYTHON_PATH=/usr/bin/python3
EOF
# The multimail hook is installed with git. Use python3 to avoid an
@@ -89,7 +91,6 @@ build() {
check() {
make prefix=/usr DESTDIR="$pkgdir" \
perlibdir=$(_perl_config vendorlib) \
- GIT_SKIP_TESTS='t4061 t4124 t5003 t5616 t5703 t7063 t9020' \
test
}
@@ -282,6 +283,6 @@ _perl_config() {
perl -e "use Config; print \$Config{$1};"
}
-sha512sums="8ddea44503db7caf1f6080e64555541aa64a7b8761fd6541965ee244d9c4a47befccda1a239f11d86c2ad0ff24923d084f65712f5f2d6cfa178573e3471c6c33 git-2.27.0.tar.xz
+sha512sums="a6159c0a15e3c5f9603157d4010664a6d74e7d65b9fe97a03b36fac12607248ed57980d96565841e88eae343001c167222232737d3af812608c8db011941df1a git-2.28.0.tar.xz
89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd
fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd"
diff --git a/main/gitolite/APKBUILD b/main/gitolite/APKBUILD
index b57f89bcd2..cab450719b 100644
--- a/main/gitolite/APKBUILD
+++ b/main/gitolite/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Łukasz Jendrysik <scadu@yandex.com>
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
pkgname=gitolite
-pkgver=3.6.11
+pkgver=3.6.12
pkgrel=0
pkgdesc="Centralized git server, with very fine-grained access control and many powerful features"
url="https://github.com/sitaramc/gitolite"
@@ -28,4 +28,4 @@ package() {
install -o git -g git -d -m 700 "$pkgdir"/var/lib/git
}
-sha512sums="7c11b3dfde9ecf9ef66185aab175d78302c42cc24f13e3e855fa27ffaee65b5887bdd7f96b00b6eed944b91af2b86993b284d1a09fe5a5a3cce82acd33631212 gitolite-3.6.11.tar.gz"
+sha512sums="f6a7f4daf8a6f73db823a95cd677c1c436e04a05460a239b5844468cf0f3e6f8da1b1cd86d98c84bb8e80e5ca446c9afd0ca221cce622398c0d0a3ce18062c22 gitolite-3.6.12.tar.gz"
diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD
index 58f685ad55..ad7b8b384e 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=glib
-pkgver=2.64.3
+pkgver=2.64.4
pkgrel=0
pkgdesc="Common C routines used by Gtk+ and other libs"
url="https://developer.gnome.org/glib/"
@@ -71,7 +71,7 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
}
-sha512sums="a3828c37a50e86eb8791be53bd8af848d144e4580841ffab28f3b6eae5144f5cdf4a5d4b43130615b97488e700b274c2468fc7d561b3701a1fc686349501a1db glib-2.64.3.tar.xz
+sha512sums="f21fe33068a5cabdbfef54ef635b3f810b389416c3b4b66ae4975e84841834f7b7640d2518d52cb7341641af5761919eebd5e7b25bd2946f3bdd002c4902b090 glib-2.64.4.tar.xz
32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch
744239ea2afb47e15d5d0214c37d7c798edac53797ca3ac14d515aee4cc3999ef9716ba744c64c40198fb259edc922559f77c9051104a568fc8ee4fc790810b1 deprecated-no-warn.patch
6ec43e76bb973367bd99c5e2077113e86df2b120b3788aeeb4692a572392bba7227e8217b28a918e02ad82fcb8ca6d260c3221b84688774d86779755af51a847 musl-libintl.patch
diff --git a/main/gnupg/APKBUILD b/main/gnupg/APKBUILD
index 33bb02a933..d652275fcc 100644
--- a/main/gnupg/APKBUILD
+++ b/main/gnupg/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gnupg
-pkgver=2.2.20
+pkgver=2.2.21
_ver=${pkgver/_beta/-beta}
pkgrel=0
pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool"
@@ -72,7 +72,7 @@ scdaemon() {
mv "$pkgdir/usr/libexec/scdaemon" "$subpkgdir/usr/libexec/"
}
-sha512sums="3e69f102366ec3415f439ab81aae2458182fa1a18dfb86565b1d9dc638f3fc4c179a5947f0042b7c5a813345676285a662793664a1803ea9ad8328f0548e0edc gnupg-2.2.20.tar.bz2
+sha512sums="b4eac75253d4a1cac341c8a1ba7bb275e849a88d5377035497777c7bcd49b5a4c91b77000311695eb7d4083856975b2b2d14518f24ab94846027280bd8c301f9 gnupg-2.2.21.tar.bz2
c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7 0001-Include-sys-select.h-for-FD_SETSIZE.patch
b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b fix-i18n.patch
4bfb9742279c2d1c872d63cd4bcb01f6a2a13d94618eff954d3a37451fa870a9bb29687330854ee47e8876d6e60dc81cb2569c3931beaefacda33db23c464402 60-scdaemon.rules"
diff --git a/main/gnutls/APKBUILD b/main/gnutls/APKBUILD
index 10238cceb9..102d2c31d5 100644
--- a/main/gnutls/APKBUILD
+++ b/main/gnutls/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gnutls
-pkgver=3.6.13
-pkgrel=2
+pkgver=3.6.14
+pkgrel=0
pkgdesc="A TLS protocol implementation"
url="https://www.gnutls.org/"
arch="all"
@@ -18,16 +18,12 @@ esac
source="https://www.gnupg.org/ftp/gcrypt/gnutls/v$_v/gnutls-$pkgver.tar.xz
tests-crq.patch
tests-certtool.patch
-
- _gnutls_pkcs11_verify_crt_status-check-validity-against-system-cert.patch
- x509-trigger-fallback-verification-path-when-cert-is-expired.patch
- tests-add-test-case-for-certificate-chain-superseding.patch
"
-
-
# Upstream Tracker: https://gnutls.org/security-new.html
# secfixes:
+# 3.6.14-r0:
+# - CVE-2020-13777 GNUTLS-SA-2020-06-03
# 3.6.13-r0:
# - CVE-2020-11501 GNUTLS-SA-2020-03-31
# 3.6.7-r0:
@@ -53,7 +49,7 @@ build() {
}
check() {
- make check
+ make -j1 check
}
package() {
@@ -73,9 +69,6 @@ xx() {
mv "$pkgdir"/usr/lib/lib*xx.so.* "$subpkgdir"/usr/lib/
}
-sha512sums="23581952cb72c9a34f378c002bb62413d5a1243b74b48ad8dc49eaea4020d33c550f8dc1dd374cf7fbfa4187b0ca1c5698c8a0430398268a8b8a863f8633305c gnutls-3.6.13.tar.xz
+sha512sums="b2d427b5542a4679117c011dffa8efb0e0bffa3ce9cebc319f8998d03f80f4168d08f9fda35df18dbeaaada59e479d325a6c1c77d5ca7f8ce221b44e42bfe604 gnutls-3.6.14.tar.xz
3e7d872963cc25e49f1ecf98de7d6f3b6b22d2c1c9e982bc4b22ce658c11d8567903728e5aa33ce7b6d3e25fe0b7a75b8aca3e8f53838155af5abe23887d33fa tests-crq.patch
-30739b5ca06bb72e93d021065fbc90a1808c5fc139ff917308738456ae8601f5c372d223d77e51cdd34a6aa4d28dcb8140101c3f753ede1e39ee12e229c24cbe tests-certtool.patch
-0b781bac53fd9e39532ff839836f362bb873a67746e01e72c10e149b4d3c2b32a078a3f0bf0a8ec369afad71845cd85ed23f4ec4056d2f18435011bc8ffb3c36 _gnutls_pkcs11_verify_crt_status-check-validity-against-system-cert.patch
-7a183193cc6551699d204f66eb80470adeff350b3391e29c06f4f962eeae6da4c9c9adf29cce384e841583061736b727227c44bfe062a80ca2cebf5f08ea7cb7 x509-trigger-fallback-verification-path-when-cert-is-expired.patch
-e57a0029130648ba7b0b47942f0d7db91c20eadc234992a250fdd93659f4fdacdb0f81438bb5d27ebd32de99de4894e4ae79dd1253d753e8979e23b7e21654a0 tests-add-test-case-for-certificate-chain-superseding.patch"
+30739b5ca06bb72e93d021065fbc90a1808c5fc139ff917308738456ae8601f5c372d223d77e51cdd34a6aa4d28dcb8140101c3f753ede1e39ee12e229c24cbe tests-certtool.patch"
diff --git a/main/gnutls/_gnutls_pkcs11_verify_crt_status-check-validity-against-system-cert.patch b/main/gnutls/_gnutls_pkcs11_verify_crt_status-check-validity-against-system-cert.patch
deleted file mode 100644
index 13d002a106..0000000000
--- a/main/gnutls/_gnutls_pkcs11_verify_crt_status-check-validity-against-system-cert.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From 299bd4f113d0bd39fa1577a671a04ed7899eff3c Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Sun, 31 May 2020 12:39:14 +0200
-Subject: [PATCH] _gnutls_pkcs11_verify_crt_status: check validity against
- system cert
-
-To verify a certificate chain, this function replaces known
-certificates with the ones in the system trust store if possible.
-
-However, if it is found, the function checks the validity of the
-original certificate rather than the certificate found in the trust
-store. That reveals a problem in a scenario that (1) a certificate is
-signed by multiple issuers and (2) one of the issuers' certificate has
-expired and included in the input chain.
-
-This patch makes it a little robuster by actually retrieving the
-certificate from the trust store and perform check against it.
-
-Signed-off-by: Daiki Ueno <ueno@gnu.org>
----
- lib/pkcs11.c | 98 +++++++++++++++++++++++++++++++++--------------
- lib/pkcs11_int.h | 5 +++
- lib/x509/verify.c | 7 +++-
- 3 files changed, 80 insertions(+), 30 deletions(-)
-
-diff --git a/lib/pkcs11.c b/lib/pkcs11.c
-index fad16aaf4f..d8d4a65114 100644
---- a/lib/pkcs11.c
-+++ b/lib/pkcs11.c
-@@ -4547,34 +4547,10 @@ int gnutls_pkcs11_get_raw_issuer_by_subject_key_id (const char *url,
- return ret;
- }
-
--/**
-- * gnutls_pkcs11_crt_is_known:
-- * @url: A PKCS 11 url identifying a token
-- * @cert: is the certificate to find issuer for
-- * @issuer: Will hold the issuer if any in an allocated buffer.
-- * @fmt: The format of the exported issuer.
-- * @flags: Use zero or flags from %GNUTLS_PKCS11_OBJ_FLAG.
-- *
-- * This function will check whether the provided certificate is stored
-- * in the specified token. This is useful in combination with
-- * %GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_TRUSTED or
-- * %GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED,
-- * to check whether a CA is present or a certificate is blacklisted in
-- * a trust PKCS #11 module.
-- *
-- * This function can be used with a @url of "pkcs11:", and in that case all modules
-- * will be searched. To restrict the modules to the marked as trusted in p11-kit
-- * use the %GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE flag.
-- *
-- * Note that the flag %GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED is
-- * specific to p11-kit trust modules.
-- *
-- * Returns: If the certificate exists non-zero is returned, otherwise zero.
-- *
-- * Since: 3.3.0
-- **/
--unsigned gnutls_pkcs11_crt_is_known(const char *url, gnutls_x509_crt_t cert,
-- unsigned int flags)
-+unsigned
-+_gnutls_pkcs11_crt_is_known(const char *url, gnutls_x509_crt_t cert,
-+ unsigned int flags,
-+ gnutls_x509_crt_t *trusted_cert)
- {
- int ret;
- struct find_cert_st priv;
-@@ -4586,6 +4562,15 @@ unsigned gnutls_pkcs11_crt_is_known(const char *url, gnutls_x509_crt_t cert,
-
- memset(&priv, 0, sizeof(priv));
-
-+ if (trusted_cert) {
-+ ret = gnutls_pkcs11_obj_init(&priv.obj);
-+ if (ret < 0) {
-+ gnutls_assert();
-+ goto cleanup;
-+ }
-+ priv.need_import = 1;
-+ }
-+
- if (url == NULL || url[0] == 0) {
- url = "pkcs11:";
- }
-@@ -4632,8 +4617,18 @@ unsigned gnutls_pkcs11_crt_is_known(const char *url, gnutls_x509_crt_t cert,
- _gnutls_debug_log("crt_is_known: did not find cert, using issuer DN + serial, using DN only\n");
- /* attempt searching with the subject DN only */
- gnutls_assert();
-+ if (priv.obj)
-+ gnutls_pkcs11_obj_deinit(priv.obj);
- gnutls_free(priv.serial.data);
- memset(&priv, 0, sizeof(priv));
-+ if (trusted_cert) {
-+ ret = gnutls_pkcs11_obj_init(&priv.obj);
-+ if (ret < 0) {
-+ gnutls_assert();
-+ goto cleanup;
-+ }
-+ priv.need_import = 1;
-+ }
- priv.crt = cert;
- priv.flags = flags;
-
-@@ -4650,9 +4645,26 @@ unsigned gnutls_pkcs11_crt_is_known(const char *url, gnutls_x509_crt_t cert,
- goto cleanup;
- }
-
-+ if (trusted_cert) {
-+ ret = gnutls_x509_crt_init(trusted_cert);
-+ if (ret < 0) {
-+ gnutls_assert();
-+ ret = 0;
-+ goto cleanup;
-+ }
-+ ret = gnutls_x509_crt_import_pkcs11(*trusted_cert, priv.obj);
-+ if (ret < 0) {
-+ gnutls_assert();
-+ gnutls_x509_crt_deinit(*trusted_cert);
-+ ret = 0;
-+ goto cleanup;
-+ }
-+ }
- ret = 1;
-
- cleanup:
-+ if (priv.obj)
-+ gnutls_pkcs11_obj_deinit(priv.obj);
- if (info)
- p11_kit_uri_free(info);
- gnutls_free(priv.serial.data);
-@@ -4660,6 +4672,36 @@ unsigned gnutls_pkcs11_crt_is_known(const char *url, gnutls_x509_crt_t cert,
- return ret;
- }
-
-+/**
-+ * gnutls_pkcs11_crt_is_known:
-+ * @url: A PKCS 11 url identifying a token
-+ * @cert: is the certificate to find issuer for
-+ * @flags: Use zero or flags from %GNUTLS_PKCS11_OBJ_FLAG.
-+ *
-+ * This function will check whether the provided certificate is stored
-+ * in the specified token. This is useful in combination with
-+ * %GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_TRUSTED or
-+ * %GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED,
-+ * to check whether a CA is present or a certificate is blacklisted in
-+ * a trust PKCS #11 module.
-+ *
-+ * This function can be used with a @url of "pkcs11:", and in that case all modules
-+ * will be searched. To restrict the modules to the marked as trusted in p11-kit
-+ * use the %GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE flag.
-+ *
-+ * Note that the flag %GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED is
-+ * specific to p11-kit trust modules.
-+ *
-+ * Returns: If the certificate exists non-zero is returned, otherwise zero.
-+ *
-+ * Since: 3.3.0
-+ **/
-+unsigned gnutls_pkcs11_crt_is_known(const char *url, gnutls_x509_crt_t cert,
-+ unsigned int flags)
-+{
-+ return _gnutls_pkcs11_crt_is_known(url, cert, flags, NULL);
-+}
-+
- /**
- * gnutls_pkcs11_obj_get_flags:
- * @obj: The pkcs11 object
-diff --git a/lib/pkcs11_int.h b/lib/pkcs11_int.h
-index 9d88807098..86cce0dee5 100644
---- a/lib/pkcs11_int.h
-+++ b/lib/pkcs11_int.h
-@@ -460,6 +460,11 @@ inline static bool is_pkcs11_url_object(const char *url)
- return 0;
- }
-
-+unsigned
-+_gnutls_pkcs11_crt_is_known(const char *url, gnutls_x509_crt_t cert,
-+ unsigned int flags,
-+ gnutls_x509_crt_t *trusted_cert);
-+
- #endif /* ENABLE_PKCS11 */
-
- #endif /* GNUTLS_LIB_PKCS11_INT_H */
-diff --git a/lib/x509/verify.c b/lib/x509/verify.c
-index d202670198..fd7c6a1642 100644
---- a/lib/x509/verify.c
-+++ b/lib/x509/verify.c
-@@ -34,6 +34,7 @@
- #include <tls-sig.h>
- #include <str.h>
- #include <datum.h>
-+#include <pkcs11_int.h>
- #include <x509_int.h>
- #include <common.h>
- #include <pk.h>
-@@ -1188,6 +1189,7 @@ _gnutls_pkcs11_verify_crt_status(const char* url,
-
- for (; i < clist_size; i++) {
- unsigned vflags;
-+ gnutls_x509_crt_t trusted_cert;
-
- if (i == 0) /* in the end certificate do full comparison */
- vflags = GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE|
-@@ -1196,9 +1198,10 @@ _gnutls_pkcs11_verify_crt_status(const char* url,
- vflags = GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE|
- GNUTLS_PKCS11_OBJ_FLAG_COMPARE_KEY|GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_TRUSTED;
-
-- if (gnutls_pkcs11_crt_is_known (url, certificate_list[i], vflags) != 0) {
-+ if (_gnutls_pkcs11_crt_is_known (url, certificate_list[i], vflags, &trusted_cert) != 0) {
-
-- status |= check_ca_sanity(certificate_list[i], now, flags);
-+ status |= check_ca_sanity(trusted_cert, now, flags);
-+ gnutls_x509_crt_deinit(trusted_cert);
-
- if (func)
- func(certificate_list[i],
---
-2.26.2
-
diff --git a/main/gnutls/tests-add-test-case-for-certificate-chain-superseding.patch b/main/gnutls/tests-add-test-case-for-certificate-chain-superseding.patch
deleted file mode 100644
index 84867c3d37..0000000000
--- a/main/gnutls/tests-add-test-case-for-certificate-chain-superseding.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 9067bcbee8ff18badff1e829d22e63590dbd7a5c Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Sun, 31 May 2020 14:28:48 +0200
-Subject: [PATCH] tests: add test case for certificate chain superseding
-
-Signed-off-by: Daiki Ueno <ueno@gnu.org>
----
- tests/test-chains.h | 97 +++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 97 insertions(+)
-
-diff --git a/tests/test-chains.h b/tests/test-chains.h
-index dd19e6a815..9b06b85f5f 100644
---- a/tests/test-chains.h
-+++ b/tests/test-chains.h
-@@ -4010,6 +4010,102 @@ static const char *ed448[] = {
- NULL
- };
-
-+/* This contains an expired intermediate CA, which should be superseded. */
-+static const char *superseding[] = {
-+ "-----BEGIN CERTIFICATE-----"
-+ "MIIDrzCCAmegAwIBAgIUcozIBhMJvM/rd1PVI7LOq7Kscs8wDQYJKoZIhvcNAQEL"
-+ "BQAwJjEkMCIGA1UEAxMbR251VExTIHRlc3QgaW50ZXJtZWRpYXRlIENBMCAXDTIw"
-+ "MDUzMTEyMTczN1oYDzk5OTkxMjMxMjM1OTU5WjA3MRgwFgYDVQQDEw90ZXN0Lmdu"
-+ "dXRscy5vcmcxGzAZBgNVBAoTEkdudVRMUyB0ZXN0IHNlcnZlcjCCASAwCwYJKoZI"
-+ "hvcNAQEKA4IBDwAwggEKAoIBAQCd2PBnWn+b0FsIMbG+f/K+og2iK/BoLCsJD3j9"
-+ "yRNSHD6wTifYwNTbe1LF/8BzxcwVRCD0zpbpFQawbjxbmBSzrXqQlUFFG11DvNBa"
-+ "w58rgHGo3TYCrtFIBfLbziyB1w/vWeX0xHvv8MMJ1iRSdY+7Y36a2cV+s85PdO4B"
-+ "TpZlLfy8LPP6p6+dgVoC+9tTu2H1wARYOVog+jt9A3Hx0L1xxVWTedFoiK2sVouz"
-+ "fLRjfp5cOwuRHSD2qbpGOAeNVVaOE88Bv3pIGPguMw0qAdEDo20hRYH23LIyvBwB"
-+ "oCnyFNnAViMtLa2QlXSliV9a9BKOXYjWzAeso2SF4pdHcvd5AgMBAAGjgZMwgZAw"
-+ "DAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg90ZXN0LmdudXRscy5vcmcwEwYDVR0l"
-+ "BAwwCgYIKwYBBQUHAwEwDwYDVR0PAQH/BAUDAweAADAdBgNVHQ4EFgQUan6mlccq"
-+ "Uy1Z64wvRv3xxg4h2ykwHwYDVR0jBBgwFoAUSCM0UwqJMThKWurKttKm3s4dKxgw"
-+ "DQYJKoZIhvcNAQELBQADggExAKAOMyMLpk0u2UTwwFWtr1hfx7evo2J7dgco410I"
-+ "DN/QWoe2Xlcxcp1h5R9rX1I3KU2WGFtdXqiMsllCLnrDEKZmlks0uz76bCpKmM99"
-+ "/1MDlY7mGCr/2PPx53USK5J5JTiqgp6r7qAcDAnpYvrPH45kk7iqwh02DhAxRnGR"
-+ "CW7KWK8h7uu0Az9iBT2YfV372g4fRDK3fqYzJofQwbhSiUuJ7wyZCRhGOoxMMmDb"
-+ "KBbc1wAYXW+tlv2cSbfzRvSxMR+CzkyH2tGDxeN//aZUfGmQ8IzWUQ7UtK5z+Q0E"
-+ "fL6fZtm2SdGabGpV1UYoGpwOtOngK+m0i9SqrMD7g5+SMhc1VuvVuTtxjr5Cha8l"
-+ "X0HEZtxgFrkdfMD4yLAqiguaCBngtbRmELF5VpebmJbiLVU="
-+ "-----END CERTIFICATE-----",
-+ "-----BEGIN CERTIFICATE-----"
-+ "MIIDkTCCAkmgAwIBAgIUY9cJ4NLNFEaojJHdP1I4Q7OHNJwwDQYJKoZIhvcNAQEL"
-+ "BQAwGTEXMBUGA1UEAxMOR251VExTIHRlc3QgQ0EwHhcNMTgxMjMxMjMwMDAwWhcN"
-+ "MjAwNTMwMjIwMDAwWjAmMSQwIgYDVQQDExtHbnVUTFMgdGVzdCBpbnRlcm1lZGlh"
-+ "dGUgQ0EwggFSMA0GCSqGSIb3DQEBAQUAA4IBPwAwggE6AoIBMQC0ayeYJa/B/x7K"
-+ "sH702LztQ4ZnVF3atB7CkF+DPAIR/BNyhbKIpGVBC3ZfI76Kn/55S3M7LsdLPL8W"
-+ "yZdVNRfzoXJLMMLgJ5QS81YA5s6CSxFdpB6b+vq5GypNGLW6peYMx6iooW2qiITc"
-+ "lg6ybBw1qufHlD351cfCog1Ls2569whfxQnNFZMa95jfKkxmiSTtH9AWY4FlpVg7"
-+ "oc0lYpuZgVQIFxjsfC8IojsoVzKdF0cKhvtisUGZ5vveqOogfvMb7rrqmiFkKZLy"
-+ "rXPlGQWdN1PiEZ8YXyK64osNAIyeL6eHPUC+SqKlkggMLmHAWHyameHWrIM5Jc8+"
-+ "G+3ro22dy8U43sHHbps0FL4wPoKQHrlKmnbk7zMMRqIxcvbDYQv4qmeJ9KXldjeh"
-+ "KZ+Aeap1AgMBAAGjZDBiMA8GA1UdEwEB/wQFMAMBAf8wDwYDVR0PAQH/BAUDAwcE"
-+ "ADAdBgNVHQ4EFgQUSCM0UwqJMThKWurKttKm3s4dKxgwHwYDVR0jBBgwFoAUHncj"
-+ "bWcxH5EHm5Yv7PzIRv6M4QMwDQYJKoZIhvcNAQELBQADggExAHP1UAQ/nvuQtRZF"
-+ "Q4b96yxVwCjMjn7knLyLNtyYGE3466xvE/ofvx5lgaR06ez/G17XP+Ok5SLJNUVc"
-+ "mplTERCv5CgnX7R5VdGJkkD1repaYxaTtwyJz0AfYEMRUj3jfaeLaiUKJvEW5RRs"
-+ "I3solY18sy/m/xGrH2X0GTNfKM9BURENABsppt07jxH719nF9m9SynV/Z2hE5hlv"
-+ "5e5vyPt4wyRPIJLUI3TKAlvb1s40zz3ua7ZTgQL/cOxfY4f9pRKW9CMB3uF69OP9"
-+ "COAxrmHVZsImmDZ6qO1qQrbY1KN/cX5kG4pKg7Ium723aOlwcWzEDXKumD960fN1"
-+ "5g+HrjNs6kW+r9Q5QS8qV5s8maZNcxTrMvQ1fF2AKBNI3Z3U7vmtrSeqxIXp3rGH"
-+ "iJwOKIk="
-+ "-----END CERTIFICATE-----",
-+ NULL
-+};
-+
-+static const char *superseding_ca[] = {
-+ "-----BEGIN CERTIFICATE-----"
-+ "MIIDkzCCAkugAwIBAgIUIs7jB4Q4sFcdCmzWVHbJLESC3T4wDQYJKoZIhvcNAQEL"
-+ "BQAwGTEXMBUGA1UEAxMOR251VExTIHRlc3QgQ0EwIBcNMjAwNTMxMTIxMzEwWhgP"
-+ "OTk5OTEyMzEyMzU5NTlaMCYxJDAiBgNVBAMTG0dudVRMUyB0ZXN0IGludGVybWVk"
-+ "aWF0ZSBDQTCCAVIwDQYJKoZIhvcNAQEBBQADggE/ADCCAToCggExALRrJ5glr8H/"
-+ "HsqwfvTYvO1DhmdUXdq0HsKQX4M8AhH8E3KFsoikZUELdl8jvoqf/nlLczsux0s8"
-+ "vxbJl1U1F/OhckswwuAnlBLzVgDmzoJLEV2kHpv6+rkbKk0Ytbql5gzHqKihbaqI"
-+ "hNyWDrJsHDWq58eUPfnVx8KiDUuzbnr3CF/FCc0Vkxr3mN8qTGaJJO0f0BZjgWWl"
-+ "WDuhzSVim5mBVAgXGOx8LwiiOyhXMp0XRwqG+2KxQZnm+96o6iB+8xvuuuqaIWQp"
-+ "kvKtc+UZBZ03U+IRnxhfIrriiw0AjJ4vp4c9QL5KoqWSCAwuYcBYfJqZ4dasgzkl"
-+ "zz4b7eujbZ3LxTjewcdumzQUvjA+gpAeuUqaduTvMwxGojFy9sNhC/iqZ4n0peV2"
-+ "N6Epn4B5qnUCAwEAAaNkMGIwDwYDVR0TAQH/BAUwAwEB/zAPBgNVHQ8BAf8EBQMD"
-+ "BwQAMB0GA1UdDgQWBBRIIzRTCokxOEpa6sq20qbezh0rGDAfBgNVHSMEGDAWgBQe"
-+ "dyNtZzEfkQebli/s/MhG/ozhAzANBgkqhkiG9w0BAQsFAAOCATEAcF9R9VGQxTwW"
-+ "aOjeIeQ9ZJxybaj0BaXC8xR4b9uZloS9d/RBFTjgRbQ82yqaj7f80mgUtabKRfTA"
-+ "ltV2MgTbJdOjwGzEDtKGhClBbovnEGrYTbPBT9rgfYPt0q7SMBr6AzGAPt+ltwI7"
-+ "9yntV81qvTxvW5MEEo0j2MuA3NT3oqe+w1rUKNQCWhnN2TUhJGkTlaaMozcgNFaE"
-+ "Dplop4dtvCGtupxOjC3Nf6FWq1k7iZQxX70AFBYVMpuF7qGh6qDp+T1hmTCSVzxP"
-+ "SfDQIBjhKgy4clhkuR5SRxhN74RX+/5eiQyVLxzr+eIhqzJhPqUCmVnCLcqYdNRi"
-+ "hpHic4uJm0wGOKYTI7EG8rb4ZP4Jz6k4iN9CnL/+kiiW5otSl3YyCAuao5VKdDq9"
-+ "izchzb9eow=="
-+ "-----END CERTIFICATE-----",
-+ "-----BEGIN CERTIFICATE-----"
-+ "MIIDZTCCAh2gAwIBAgIULcrECQOBgPaePBfBHXcyZiU0IiYwDQYJKoZIhvcNAQEL"
-+ "BQAwGTEXMBUGA1UEAxMOR251VExTIHRlc3QgQ0EwIBcNMjAwNTMxMTIxMTQzWhgP"
-+ "OTk5OTEyMzEyMzU5NTlaMBkxFzAVBgNVBAMTDkdudVRMUyB0ZXN0IENBMIIBUjAN"
-+ "BgkqhkiG9w0BAQEFAAOCAT8AMIIBOgKCATEAnORCsX1unl//fy2d1054XduIg/3C"
-+ "qVBaT3Hca65SEoDwh0KiPtQoOgZLdKY2cobGs/ojYtOjcs0KnlPYdmtjEh6WEhuJ"
-+ "U95v4TQdC4OLMiE56eIGq252hZAbHoTL84Q14DxQWGuzQK830iml7fbw2WcIcRQ8"
-+ "vFGs8SzfXw63+MI6Fq6iMAQIqP08WzGmRRzL5wvCiPhCVkrPmwbXoABub6AAsYwW"
-+ "PJB91M9/lx5gFH5k9/iPfi3s2Kg3F8MOcppqFYjxDSnsfiz6eMh1+bYVIAo367vG"
-+ "VYHigXMEZC2FezlwIHaZzpEoFlY3a7LFJ00yrjQ910r8UE+CEMTYzE40D0olCMo7"
-+ "FA9RCjeO3bUIoYaIdVTUGWEGHWSeoxGei9Gkm6u+ASj8f+i0jxdD2qXsewIDAQAB"
-+ "o0MwQTAPBgNVHRMBAf8EBTADAQH/MA8GA1UdDwEB/wQFAwMHBAAwHQYDVR0OBBYE"
-+ "FB53I21nMR+RB5uWL+z8yEb+jOEDMA0GCSqGSIb3DQEBCwUAA4IBMQAeMSzMyuTy"
-+ "FjXTjxAUv010bsr6e6fI9txq/S1tXmWWJV/8aeARthuOFZO5Jjy3C5aMbac2HDV4"
-+ "Otu0+JLaoEMSXvorAhValVuq06i5cmaPzvJBcxMWzlEAXfavSwHv5Q+kqNU3z81S"
-+ "WnjEpMHcl9OyER7o9IhF55Xom2BXY5XL83QOzQ4C3bpKrNevZC7i7zS8NoYRGP+8"
-+ "w21JseXkWQW4o2hkFqbCcRE1dlMW02iJE28RZ5aBFDIm2Y6zuLaXZIkaO7E41CAw"
-+ "IUyhowm/S1HcmQnhruAGKJvQtB6jvnhZb7pgnuSkhIvAQgw93CLE985KEua1ifY2"
-+ "p1d/6ho2TWotHHqDnDkB8pC0Wzai8R+63z18Kt0gROX2QItCyFksjNJqYPbgwZgt"
-+ "eh1COrLsOJo+"
-+ "-----END CERTIFICATE-----",
-+ NULL
-+};
-+
- #if defined __clang__ || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
- # pragma GCC diagnostic push
- # pragma GCC diagnostic ignored "-Wunused-variable"
-@@ -4178,6 +4274,7 @@ static struct
- GNUTLS_CERT_INSECURE_ALGORITHM | GNUTLS_CERT_INVALID, NULL, 1576759855, 1},
- { "ed448 - ok", ed448, &ed448[0], GNUTLS_PROFILE_TO_VFLAGS(GNUTLS_PROFILE_ULTRA),
- 0, NULL, 1584352960, 1},
-+ { "superseding - ok", superseding, superseding_ca, 0, 0, 0, 1590928011 },
- { NULL, NULL, NULL, 0, 0}
- };
-
---
-2.26.2
-
diff --git a/main/gnutls/x509-trigger-fallback-verification-path-when-cert-is-expired.patch b/main/gnutls/x509-trigger-fallback-verification-path-when-cert-is-expired.patch
deleted file mode 100644
index 1bbbb92732..0000000000
--- a/main/gnutls/x509-trigger-fallback-verification-path-when-cert-is-expired.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From cdf075e7f54cb77f046ef3e7c2147f159941faca Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Sun, 31 May 2020 13:59:53 +0200
-Subject: [PATCH] x509: trigger fallback verification path when cert is expired
-
-gnutls_x509_trust_list_verify_crt2 use the macro SIGNER_OLD_OR_UNKNOWN
-to trigger the fallback verification path if the signer of the last
-certificate is not in the trust store. Previously, it doesn't take
-into account of the condition where the certificate is expired.
-
-Signed-off-by: Daiki Ueno <ueno@gnu.org>
----
- lib/x509/verify-high.c | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/lib/x509/verify-high.c b/lib/x509/verify-high.c
-index b1421ef17a..40638ad3aa 100644
---- a/lib/x509/verify-high.c
-+++ b/lib/x509/verify-high.c
-@@ -1192,11 +1192,13 @@ gnutls_x509_trust_list_verify_crt(gnutls_x509_trust_list_t list,
-
- #define LAST_DN cert_list[cert_list_size-1]->raw_dn
- #define LAST_IDN cert_list[cert_list_size-1]->raw_issuer_dn
--/* This macro is introduced to detect a verification output
-- * which indicates an unknown signer, or a signer which uses
-- * an insecure algorithm (e.g., sha1), something that indicates
-- * a superseded signer */
--#define SIGNER_OLD_OR_UNKNOWN(output) ((output & GNUTLS_CERT_SIGNER_NOT_FOUND) || (output & GNUTLS_CERT_INSECURE_ALGORITHM))
-+/* This macro is introduced to detect a verification output which
-+ * indicates an unknown signer, a signer which uses an insecure
-+ * algorithm (e.g., sha1), a signer has expired, or something that
-+ * indicates a superseded signer */
-+#define SIGNER_OLD_OR_UNKNOWN(output) ((output & GNUTLS_CERT_SIGNER_NOT_FOUND) || \
-+ (output & GNUTLS_CERT_EXPIRED) || \
-+ (output & GNUTLS_CERT_INSECURE_ALGORITHM))
- #define SIGNER_WAS_KNOWN(output) (!(output & GNUTLS_CERT_SIGNER_NOT_FOUND))
-
- /**
---
-2.26.2
-
diff --git a/main/goaccess/APKBUILD b/main/goaccess/APKBUILD
index b357525879..3f95edec14 100644
--- a/main/goaccess/APKBUILD
+++ b/main/goaccess/APKBUILD
@@ -3,10 +3,10 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=goaccess
pkgver=1.4
-pkgrel=0
+pkgrel=1
pkgdesc="A real-time web log analyzer and interactive viewer"
options="!check" # No testsuite
-url="http://goaccess.prosoftcorp.com/"
+url="http://goaccess.io"
arch="all"
license="GPL-2.0-or-later"
makedepends="ncurses-dev geoip-dev glib-dev"
diff --git a/main/gobject-introspection/APKBUILD b/main/gobject-introspection/APKBUILD
index 75d1b5c01c..4f864307d0 100644
--- a/main/gobject-introspection/APKBUILD
+++ b/main/gobject-introspection/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gobject-introspection
pkgver=1.64.1
-pkgrel=2
+pkgrel=3
pkgdesc="Introspection system for GObject-based libraries"
url="https://wiki.gnome.org/action/show/Projects/GObjectIntrospection"
arch="all"
@@ -13,7 +13,9 @@ makedepends="$depends_dev glib-dev libffi-dev flex bison python3-dev meson"
subpackages="$pkgname-doc $pkgname-dev"
replaces="libgirepository"
checkdepends="sed"
-source="https://download.gnome.org/sources/gobject-introspection/${pkgver%.*}/gobject-introspection-$pkgver.tar.xz"
+source="https://download.gnome.org/sources/gobject-introspection/${pkgver%.*}/gobject-introspection-$pkgver.tar.xz
+ musl-time64.patch
+ "
build() {
meson \
@@ -43,4 +45,5 @@ dev() {
replaces="gobject-introspection"
}
-sha512sums="7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c gobject-introspection-1.64.1.tar.xz"
+sha512sums="7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c gobject-introspection-1.64.1.tar.xz
+a55df8fbb8d27d073bbab7e3bd2ca5e272c3fca2a3e144207d4cac06dd90f51443373b077fa64543887e2d5da4bc017bd5245473b83dd0ed551a5a437eec9241 musl-time64.patch"
diff --git a/main/gobject-introspection/musl-time64.patch b/main/gobject-introspection/musl-time64.patch
new file mode 100644
index 0000000000..ed85e01fc7
--- /dev/null
+++ b/main/gobject-introspection/musl-time64.patch
@@ -0,0 +1,41 @@
+diff --git a/giscanner/ast.py b/giscanner/ast.py
+index 66fe0cf..e2f89cc 100644
+--- a/giscanner/ast.py
++++ b/giscanner/ast.py
+@@ -344,7 +344,8 @@ type_names['FILE*'] = TYPE_ANY
+ # integers it's easy enough to expand them.
+ type_names['size_t'] = type_names['gsize']
+ type_names['ssize_t'] = type_names['gssize']
+-type_names['time_t'] = TYPE_LONG
++# musl libc 1.2 and newer uses 64 time_t for all arches
++type_names['time_t'] = TYPE_INT64
+ type_names['off_t'] = type_names['gsize']
+ type_names['pid_t'] = TYPE_INT
+ type_names['uid_t'] = TYPE_UINT
+diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir
+index cef3b12..abb09e2 100644
+--- a/tests/scanner/Regress-1.0-expected.gir
++++ b/tests/scanner/Regress-1.0-expected.gir
+@@ -2003,7 +2003,7 @@ uses a C sugar return type.</doc>
+ <type name="FooObject" c:type="RegressFooObject*"/>
+ </instance-parameter>
+ <parameter name="time" transfer-ownership="none">
+- <type name="glong" c:type="time_t"/>
++ <type name="gint64" c:type="time_t"/>
+ </parameter>
+ </parameters>
+ </method>
+@@ -8381,11 +8381,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc>
+ <function name="test_timet" c:identifier="regress_test_timet">
+ <source-position filename="regress.h" line="94"/>
+ <return-value transfer-ownership="none">
+- <type name="glong" c:type="time_t"/>
++ <type name="gint64" c:type="time_t"/>
+ </return-value>
+ <parameters>
+ <parameter name="in" transfer-ownership="none">
+- <type name="glong" c:type="time_t"/>
++ <type name="gint64" c:type="time_t"/>
+ </parameter>
+ </parameters>
+ </function>
diff --git a/main/gphoto2/APKBUILD b/main/gphoto2/APKBUILD
index ff21c29b17..42e31f1b4a 100644
--- a/main/gphoto2/APKBUILD
+++ b/main/gphoto2/APKBUILD
@@ -9,10 +9,12 @@ arch="all"
license="LGPL-2.1-or-later"
makedepends="libgphoto2-dev popt-dev gettext-dev libjpeg-turbo-dev libtool"
subpackages="$pkgname-lang $pkgname-doc"
-source="https://sourceforge.net/projects/gphoto/files/gphoto/$pkgver/gphoto2-$pkgver.tar.bz2"
+source="https://sourceforge.net/projects/gphoto/files/gphoto/$pkgver/gphoto2-$pkgver.tar.bz2
+ FlashpixVersion.patch
+ "
+
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,13 +27,12 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="b5cea3008b5b9de93444fa25b11eab13155d479896920275caada123e0578ed3f84f9b15fe82406c332e64955ba075b642341d88e20a2ee78b42991890bca86b gphoto2-2.5.23.tar.bz2"
+sha512sums="b5cea3008b5b9de93444fa25b11eab13155d479896920275caada123e0578ed3f84f9b15fe82406c332e64955ba075b642341d88e20a2ee78b42991890bca86b gphoto2-2.5.23.tar.bz2
+6a363f66c5cf60359d8728e91bcacceb559f5db89597c7ed259e186188bd4d126d3a3f53b2dc87aaeb381485acbaffa11a2a25bd826a2324a92d60bec730e7c3 FlashpixVersion.patch"
diff --git a/main/gphoto2/FlashpixVersion.patch b/main/gphoto2/FlashpixVersion.patch
new file mode 100644
index 0000000000..98abf803fb
--- /dev/null
+++ b/main/gphoto2/FlashpixVersion.patch
@@ -0,0 +1,18 @@
+From 393cfd77dd926d75dd5d9f4308e123962562e392 Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <marcus@jet.franken.de>
+Date: Sun, 7 Jun 2020 08:26:15 +0200
+Subject: [PATCH] libexif changed the case of FlashPixVersion to
+ FlashpixVersion, handle both in test
+
+---
+ tests/data/test037.param | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/data/test037.param b/tests/data/test037.param
+index 85070fc..3c3353e 100644
+--- a/tests/data/test037.param
++++ b/tests/data/test037.param
+@@ -1,2 +1,3 @@
+ TITLE='EXIF display'
+ COMMAND='$PROGRAM --camera="Directory Browse" --port=disk:"$STAGINGDIR" --show-exif=4 2> "$ERRFILE" > "$OUTFILE"'
++SEDCOMMAND="s/FlashpixVersion/FlashPixVersion/"
diff --git a/main/gpsd/APKBUILD b/main/gpsd/APKBUILD
index 94dd16d17c..db0ef9107e 100644
--- a/main/gpsd/APKBUILD
+++ b/main/gpsd/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: Nathan Angelacos <nangel@alpinelinux.org>
# Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
pkgname=gpsd
-pkgver=3.20
-pkgrel=1
-pkgdesc="A GPS daemon"
+pkgver=3.21
+pkgrel=0
+pkgdesc="GPS daemon"
arch=all
url="http://catb.org/gpsd/"
license="BSD-2-Clause"
@@ -75,7 +75,7 @@ _clients() {
mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin
}
-sha512sums="557ef5e5f3b511da4fc441f4bb2e0cd2e23c2981e8b3ce2999973767a04fde070d3ec6f14af60d0e471320078e9f4d1144e5796e7927975ecfbd55fc97f470a9 gpsd-3.20.tar.gz
+sha512sums="7fbff3698a44ef24ce4631f1d0c5192b70c2e47f28e61372d8d0c437a6b4aeee459b08dcd69d9dc02bbda7b56949fd01ac57460fb922b5f807455f4ab3e91f2d gpsd-3.21.tar.gz
eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048 timepps.h
b692c9fc77a9db3fc621693d3b9e3ef9bc2efbbc7b01651168d7b928d29d48a489b8859930bad01b6021e211372e069a726b78dd5938385ed4ae0153b38f4170 gpsd-use-local-timepps-header.patch
51319247eb78c3021d3eb897cb5d6026cc09d46a532a245a835459ed525947ffb6239f08126dd7e344de52e3b0387226bce060191ec3f14f99fc9f255d96f8ea gpsd.initd
diff --git a/main/groff/APKBUILD b/main/groff/APKBUILD
index 2b6aad06e6..ab059d8859 100644
--- a/main/groff/APKBUILD
+++ b/main/groff/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=groff
pkgver=1.22.4
-pkgrel=0
+pkgrel=1
pkgdesc="GNU troff text-formatting system"
url="https://www.gnu.org/software/groff/groff.html"
arch="all"
@@ -39,6 +39,10 @@ package() {
cat ${srcdir}/site.tmac >> \
${pkgdir}/usr/share/groff/site-tmac/${f}.local
done
+
+ # Prevent conflict with mandoc-doc
+ rm -f "$pkgdir"/usr/share/man/man1/soelim.1 \
+ "$pkgdir"/usr/share/man/man7/roff.7
}
sha512sums="1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d groff-1.22.4.tar.gz
diff --git a/main/grub/APKBUILD b/main/grub/APKBUILD
index a08d290fac..40b64f5917 100644
--- a/main/grub/APKBUILD
+++ b/main/grub/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=grub
pkgver=2.04
-pkgrel=1
+pkgrel=2
pkgdesc="Bootloader with support for Linux, Multiboot and more"
url="https://www.gnu.org/software/grub/"
arch="all !s390x"
license="GPL-3.0-or-later"
depends="mkinitfs"
triggers="grub.trigger=/boot"
-makedepends="bison flex linux-headers xz-dev lvm2-dev
+makedepends="bison flex linux-headers xz-dev lvm2-dev fuse-dev
automake autoconf libtool python3 freetype-dev unifont gettext-dev"
install="$pkgname.post-upgrade"
# strip handled by grub Makefiles, abuild strip breaks xen pv-grub
@@ -17,6 +17,8 @@ options="!check !strip" # Cannot test boot loader.
subpackages="
$pkgname-dev
$pkgname-doc
+ $pkgname-mkfont
+ $pkgname-mount
$pkgname-bash-completion:bashcomp:noarch
"
@@ -207,6 +209,20 @@ emu() {
mv $pkgdir/usr/lib/grub/*-emu $subpkgdir/usr/lib/grub/
}
+mkfont() {
+ pkgdesc="$pkgdesc (mkfont utility)"
+ depends="$pkgname"
+ mkdir -p $subpkgdir/usr/bin
+ mv $pkgdir/usr/bin/grub-mkfont $subpkgdir/usr/bin/
+}
+
+mount() {
+ pkgdesc="$pkgdesc (mount utility)"
+ depends="$pkgname"
+ mkdir -p $subpkgdir/usr/bin
+ mv $pkgdir/usr/bin/grub-mount $subpkgdir/usr/bin/
+}
+
bashcomp() {
depends=""
pkgdesc="Bash completions for $pkgname"
diff --git a/main/gtk+2.0/APKBUILD b/main/gtk+2.0/APKBUILD
index 5c99a6a4a3..9ac56cd1ed 100644
--- a/main/gtk+2.0/APKBUILD
+++ b/main/gtk+2.0/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gtk+2.0
pkgver=2.24.32
-pkgrel=1
+pkgrel=2
_subpkg=gtk-update-icon-cache
pkgdesc="The GTK+ Toolkit (v2)"
url="https://www.gtk.org/"
@@ -9,8 +9,14 @@ install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
triggers="$_subpkg.trigger=/usr/share/icons/*"
arch="all"
options="!check" # Requires xvfb, resulting in eventual circular dependency
-license="LGPL-2.0+"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $_subpkg:icon_cache"
+license="LGPL-2.0-or-later"
+subpackages="
+ $_subpkg:icon_cache
+ $pkgname-dbg
+ $pkgname-dev
+ $pkgname-doc
+ $pkgname-lang
+ "
depends="shared-mime-info gtk-update-icon-cache"
replaces="gtk+"
diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD
index b241d6fe6f..b6a0dc91a2 100644
--- a/main/gtk+3.0/APKBUILD
+++ b/main/gtk+3.0/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gtk+3.0
-pkgver=3.24.20
+pkgver=3.24.22
pkgrel=0
pkgdesc="The GTK+ Toolkit (v3)"
url="https://www.gtk.org/"
@@ -127,6 +127,6 @@ doc() {
default_doc
}
-sha512sums="bda8eeacf721afcff4565756fe45857cbf8b053494d1d747ca9b97c899e9fe21fddef6871ecd5ec9a7a0f87b0a3ede2f9d6b5e5712de10a845100d82464a4556 gtk+-3.24.20.tar.xz
+sha512sums="ac653438a0a818885f2aa46a131b1ab0038a57b438406724a674313d8bf4325b1d2e87e4e8c77a92d0cfa8f8d6eaac46ba6890830290e9a9e598c978144861a2 gtk+-3.24.22.tar.xz
e4ea76484b70bd9beb65b2964bbcff3b3f78f5f6fe70b12309a7721ca134e3735e8aaac09803f93b393a6130a703f8f346c0df89ad45d18c580dac1e0e922276 10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch
b97ccd8fb78d7c32fe91607befd6a7c0dd969fbfc9c242948fc88085133e3461583a0b18ade199b73f9659cae5f5525b940e66535a6ced4b916af9a88b3cc578 check-version.py"
diff --git a/main/haproxy/APKBUILD b/main/haproxy/APKBUILD
index 504b9ccdf4..bb5b135e4d 100644
--- a/main/haproxy/APKBUILD
+++ b/main/haproxy/APKBUILD
@@ -1,7 +1,10 @@
# Contributor: Jeff Bilyk <jbilyk@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=haproxy
-pkgver=2.1.5
+# NOTE: Upgrade only to LTS versions announced on upstream site url!
+# Using LTS versions is easier to keep it in good shape for stable releases
+pkgver=2.2.2
_pkgmajorver=${pkgver%.*}
pkgrel=0
pkgdesc="A TCP/HTTP reverse proxy for high availability environments"
@@ -53,6 +56,6 @@ package() {
"$pkgdir"/etc/haproxy/haproxy.cfg
}
-sha512sums="4f939dcf1b10eb2f33aace1df3e5ae2f4fcb8b063a94924234250047492c51bfe5fb5eba2b9f43694ef0563d4caf3259727bff8e2d4453698e80e92c91a493e4 haproxy-2.1.5.tar.gz
+sha512sums="da76bd01c9b1c806145df133f6844798eecf6152b968e1739bcf5f9f87b41c1b0190484d033b310b2f0d4fddf48c036243ce8670a5668a9021f8496946094a39 haproxy-2.2.2.tar.gz
3ab277bf77fe864ec6c927118dcd70bdec0eb3c54535812d1c3c0995fa66a3ea91a73c342edeb8944caeb097d2dd1a7761099182df44af5e3ef42de6e2176d26 haproxy.initd
26bc8f8ac504fcbaec113ecbb9bb59b9da47dc8834779ebbb2870a8cadf2ee7561b3a811f01e619358a98c6c7768e8fdd90ab447098c05b82e788c8212c4c41f haproxy.cfg"
diff --git a/main/harfbuzz/APKBUILD b/main/harfbuzz/APKBUILD
index 76d9ace2b8..4bbe3f52c2 100644
--- a/main/harfbuzz/APKBUILD
+++ b/main/harfbuzz/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpinelinux@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=harfbuzz
-pkgver=2.6.6
+pkgver=2.7.1
pkgrel=0
pkgdesc="Text shaping library"
url="https://freedesktop.org/wiki/Software/HarfBuzz"
@@ -10,36 +10,31 @@ license="MIT"
# tests depend on certain freetype behaviours
options="!check"
makedepends="freetype-dev glib-dev gobject-introspection-dev cairo-dev icu-dev
- graphite2-dev"
+ graphite2-dev meson gtk-doc"
checkdepends="python3"
subpackages="$pkgname-static $pkgname-dev $pkgname-icu $pkgname-doc"
-source="https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$pkgver.tar.xz"
-source="https://github.com/harfbuzz/harfbuzz/releases/download/$pkgver/harfbuzz-$pkgver.tar.xz"
+source="harfbuzz-$pkgname.tar.gz::https://github.com/harfbuzz/harfbuzz/archive/$pkgver.tar.gz"
build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --localstatedir=/var \
- --enable-static \
- --with-glib \
- --with-gobject \
- --with-graphite2 \
- --with-icu \
- --with-freetype
- make
+ abuild-meson \
+ --default-library=both \
+ -Dglib=enabled \
+ -Dgobject=enabled \
+ -Dgraphite=enabled \
+ -Dicu=enabled \
+ -Dfreetype=enabled \
+ -Dcairo=enabled \
+ -Dgtk_doc=enabled \
+ . output
+ ninja -C output
}
check() {
- make check
+ ninja -C output test
}
package() {
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -C output install
}
static() {
@@ -61,4 +56,4 @@ icu() {
mv "$pkgdir"/usr/lib/lib*icu.so.* "$subpkgdir"/usr/lib/
}
-sha512sums="b0b6323b893a3540e36e2358cc7e7d27c98aa14f1debe65cd8eaf817a55752ea4f22369e37e195abefd03bbc787f178d1b64f167237683ac208b9a65b0ae09c8 harfbuzz-2.6.6.tar.xz"
+sha512sums="a04864e0f5e523e9d025f066e0850afdfdf53acc9881c0284034ab4384088b118551a899ae5e77bbd821c344b97fb5e0a3d4506bbb812eb0019080be7b3f75f1 harfbuzz-harfbuzz.tar.gz"
diff --git a/main/haveged/APKBUILD b/main/haveged/APKBUILD
index a5e4eb9f9c..bd8c5cefc9 100644
--- a/main/haveged/APKBUILD
+++ b/main/haveged/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Danilo Godec <danilo.godec@agenda.si>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=haveged
-pkgver=1.9.8
-pkgrel=1
+pkgver=1.9.13
+pkgrel=0
pkgdesc="Entropy harvesting daemon using CPU timings"
url="https://www.issihosts.com/haveged/"
arch="all"
@@ -45,7 +45,7 @@ package() {
"$pkgdir"/etc/conf.d/haveged
}
-sha512sums="6a4012c7ab0ad7df77ae61dd3aca072a7aeca942c180d37c8495009fad13a4c9c0e7bf64a3ffce00e50c06679d4b948c3930a960789a06edf074076cf68d37db haveged-1.9.8.tar.gz
+sha512sums="dff0f4273643ed6b2fea26f1ba5c17be3d655d27ab0b96091bcd23e1cb984fc440cc81e694cc7bcc84a9a667d96f3c04a73675f79ecae525ee56390940cce576 haveged-1.9.13.tar.gz
e977a6487df29a0e7de07ef3ef6546776ee9671cc8ac02868800351c6461be4d0d2e05cf40c5bc54742c00d5fe1878027959ab598d96be4f81a9eb4969fce08d double-the-sample-size-used-in-the-entest.patch
9d39a7f94987b5734ba414edf23ec986f344e00748d20dd5b37b64403cebd4fad68469df52ce1d115d0ee0c71497f1ac21144d0370345b5ef57e306d7d376f89 haveged.initd
57201472fc659aaab919562a00d474d3823d5becea62e8b13ef93eda05e1fd667721c968f224fcae871d13cfcd16d1924403d9181e0899fa214fa00bf4fefc75 haveged.confd"
diff --git a/main/help2man/APKBUILD b/main/help2man/APKBUILD
index 497a0b1ff5..1a264c2b56 100644
--- a/main/help2man/APKBUILD
+++ b/main/help2man/APKBUILD
@@ -1,6 +1,7 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=help2man
-pkgver=1.47.15
+pkgver=1.47.16
pkgrel=0
pkgdesc="Create simple man pages from --help output"
url="https://www.gnu.org/software/help2man"
@@ -27,4 +28,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="2ab835610545f37eef2d77887371378decbac622196426a3444c5fb495596371d0151a92c79d3e3040e93acf3dbeefbc431dac1e76a370fdb5063b43192545ad help2man-1.47.15.tar.xz"
+sha512sums="b427e60a9e3d2e805caf1ae84c337b09c7ca6f92b7ff14771f946c4a1bf7adf177df99b9c1c223ad76df99756005ababf5b548ff8e08d4746702ff7f8150b544 help2man-1.47.16.tar.xz"
diff --git a/main/hostapd/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch b/main/hostapd/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
new file mode 100644
index 0000000000..0aa8a5ea1d
--- /dev/null
+++ b/main/hostapd/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
@@ -0,0 +1,150 @@
+From 5b78c8f961f25f4dc22d6f2b77ddd06d712cec63 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@codeaurora.org>
+Date: Wed, 3 Jun 2020 23:17:35 +0300
+Subject: [PATCH 1/3] WPS UPnP: Do not allow event subscriptions with URLs to
+ other networks
+
+The UPnP Device Architecture 2.0 specification errata ("UDA errata
+16-04-2020.docx") addresses a problem with notifications being allowed
+to go out to other domains by disallowing such cases. Do such filtering
+for the notification callback URLs to avoid undesired connections to
+external networks based on subscriptions that any device in the local
+network could request when WPS support for external registrars is
+enabled (the upnp_iface parameter in hostapd configuration).
+
+Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
+---
+ src/wps/wps_er.c | 2 +-
+ src/wps/wps_upnp.c | 38 ++++++++++++++++++++++++++++++++++++--
+ src/wps/wps_upnp_i.h | 3 ++-
+ 3 files changed, 39 insertions(+), 4 deletions(-)
+
+diff --git a/src/wps/wps_er.c b/src/wps/wps_er.c
+index 6bded14327f8..31d2e50e4cff 100644
+--- a/src/wps/wps_er.c
++++ b/src/wps/wps_er.c
+@@ -1298,7 +1298,7 @@ wps_er_init(struct wps_context *wps, const char *ifname, const char *filter)
+ "with %s", filter);
+ }
+ if (get_netif_info(er->ifname, &er->ip_addr, &er->ip_addr_text,
+- er->mac_addr)) {
++ NULL, er->mac_addr)) {
+ wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address "
+ "for %s. Does it have IP address?", er->ifname);
+ wps_er_deinit(er, NULL, NULL);
+diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c
+index 6e10e4bc0c3f..7d4b7439940e 100644
+--- a/src/wps/wps_upnp.c
++++ b/src/wps/wps_upnp.c
+@@ -303,6 +303,14 @@ static void subscr_addr_free_all(struct subscription *s)
+ }
+
+
++static int local_network_addr(struct upnp_wps_device_sm *sm,
++ struct sockaddr_in *addr)
++{
++ return (addr->sin_addr.s_addr & sm->netmask.s_addr) ==
++ (sm->ip_addr & sm->netmask.s_addr);
++}
++
++
+ /* subscr_addr_add_url -- add address(es) for one url to subscription */
+ static void subscr_addr_add_url(struct subscription *s, const char *url,
+ size_t url_len)
+@@ -381,6 +389,7 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
+
+ for (rp = result; rp; rp = rp->ai_next) {
+ struct subscr_addr *a;
++ struct sockaddr_in *addr = (struct sockaddr_in *) rp->ai_addr;
+
+ /* Limit no. of address to avoid denial of service attack */
+ if (dl_list_len(&s->addr_list) >= MAX_ADDR_PER_SUBSCRIPTION) {
+@@ -389,6 +398,13 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
+ break;
+ }
+
++ if (!local_network_addr(s->sm, addr)) {
++ wpa_printf(MSG_INFO,
++ "WPS UPnP: Ignore a delivery URL that points to another network %s",
++ inet_ntoa(addr->sin_addr));
++ continue;
++ }
++
+ a = os_zalloc(sizeof(*a) + alloc_len);
+ if (a == NULL)
+ break;
+@@ -890,11 +906,12 @@ static int eth_get(const char *device, u8 ea[ETH_ALEN])
+ * @net_if: Selected network interface name
+ * @ip_addr: Buffer for returning IP address in network byte order
+ * @ip_addr_text: Buffer for returning a pointer to allocated IP address text
++ * @netmask: Buffer for returning netmask or %NULL if not needed
+ * @mac: Buffer for returning MAC address
+ * Returns: 0 on success, -1 on failure
+ */
+ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
+- u8 mac[ETH_ALEN])
++ struct in_addr *netmask, u8 mac[ETH_ALEN])
+ {
+ struct ifreq req;
+ int sock = -1;
+@@ -920,6 +937,19 @@ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
+ in_addr.s_addr = *ip_addr;
+ os_snprintf(*ip_addr_text, 16, "%s", inet_ntoa(in_addr));
+
++ if (netmask) {
++ os_memset(&req, 0, sizeof(req));
++ os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name));
++ if (ioctl(sock, SIOCGIFNETMASK, &req) < 0) {
++ wpa_printf(MSG_ERROR,
++ "WPS UPnP: SIOCGIFNETMASK failed: %d (%s)",
++ errno, strerror(errno));
++ goto fail;
++ }
++ addr = (struct sockaddr_in *) &req.ifr_netmask;
++ netmask->s_addr = addr->sin_addr.s_addr;
++ }
++
+ #ifdef __linux__
+ os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name));
+ if (ioctl(sock, SIOCGIFHWADDR, &req) < 0) {
+@@ -1026,11 +1056,15 @@ static int upnp_wps_device_start(struct upnp_wps_device_sm *sm, char *net_if)
+
+ /* Determine which IP and mac address we're using */
+ if (get_netif_info(net_if, &sm->ip_addr, &sm->ip_addr_text,
+- sm->mac_addr)) {
++ &sm->netmask, sm->mac_addr)) {
+ wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address "
+ "for %s. Does it have IP address?", net_if);
+ goto fail;
+ }
++ wpa_printf(MSG_DEBUG, "WPS UPnP: Local IP address %s netmask %s hwaddr "
++ MACSTR,
++ sm->ip_addr_text, inet_ntoa(sm->netmask),
++ MAC2STR(sm->mac_addr));
+
+ /* Listen for incoming TCP connections so that others
+ * can fetch our "xml files" from us.
+diff --git a/src/wps/wps_upnp_i.h b/src/wps/wps_upnp_i.h
+index e87a93232df1..6ead7b4e9a30 100644
+--- a/src/wps/wps_upnp_i.h
++++ b/src/wps/wps_upnp_i.h
+@@ -128,6 +128,7 @@ struct upnp_wps_device_sm {
+ u8 mac_addr[ETH_ALEN]; /* mac addr of network i.f. we use */
+ char *ip_addr_text; /* IP address of network i.f. we use */
+ unsigned ip_addr; /* IP address of network i.f. we use (host order) */
++ struct in_addr netmask;
+ int multicast_sd; /* send multicast messages over this socket */
+ int ssdp_sd; /* receive discovery UPD packets on socket */
+ int ssdp_sd_registered; /* nonzero if we must unregister */
+@@ -158,7 +159,7 @@ struct subscription * subscription_find(struct upnp_wps_device_sm *sm,
+ const u8 uuid[UUID_LEN]);
+ void subscr_addr_delete(struct subscr_addr *a);
+ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
+- u8 mac[ETH_ALEN]);
++ struct in_addr *netmask, u8 mac[ETH_ALEN]);
+
+ /* wps_upnp_ssdp.c */
+ void msearchreply_state_machine_stop(struct advertisement_state_machine *a);
+--
+2.20.1
+
diff --git a/main/hostapd/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch b/main/hostapd/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
new file mode 100644
index 0000000000..c7a449e0b5
--- /dev/null
+++ b/main/hostapd/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
@@ -0,0 +1,59 @@
+From f7d268864a2660b7239b9a8ff5ad37faeeb751ba Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@codeaurora.org>
+Date: Wed, 3 Jun 2020 22:41:02 +0300
+Subject: [PATCH 2/3] WPS UPnP: Fix event message generation using a long URL
+ path
+
+More than about 700 character URL ended up overflowing the wpabuf used
+for building the event notification and this resulted in the wpabuf
+buffer overflow checks terminating the hostapd process. Fix this by
+allocating the buffer to be large enough to contain the full URL path.
+However, since that around 700 character limit has been the practical
+limit for more than ten years, start explicitly enforcing that as the
+limit or the callback URLs since any longer ones had not worked before
+and there is no need to enable them now either.
+
+Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
+---
+ src/wps/wps_upnp.c | 9 +++++++--
+ src/wps/wps_upnp_event.c | 3 ++-
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c
+index 7d4b7439940e..ab685d52ecab 100644
+--- a/src/wps/wps_upnp.c
++++ b/src/wps/wps_upnp.c
+@@ -328,9 +328,14 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
+ int rerr;
+ size_t host_len, path_len;
+
+- /* url MUST begin with http: */
+- if (url_len < 7 || os_strncasecmp(url, "http://", 7))
++ /* URL MUST begin with HTTP scheme. In addition, limit the length of
++ * the URL to 700 characters which is around the limit that was
++ * implicitly enforced for more than 10 years due to a bug in
++ * generating the event messages. */
++ if (url_len < 7 || os_strncasecmp(url, "http://", 7) || url_len > 700) {
++ wpa_printf(MSG_DEBUG, "WPS UPnP: Reject an unacceptable URL");
+ goto fail;
++ }
+ url += 7;
+ url_len -= 7;
+
+diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c
+index d7e6edcc6503..08a23612f338 100644
+--- a/src/wps/wps_upnp_event.c
++++ b/src/wps/wps_upnp_event.c
+@@ -147,7 +147,8 @@ static struct wpabuf * event_build_message(struct wps_event_ *e)
+ struct wpabuf *buf;
+ char *b;
+
+- buf = wpabuf_alloc(1000 + wpabuf_len(e->data));
++ buf = wpabuf_alloc(1000 + os_strlen(e->addr->path) +
++ wpabuf_len(e->data));
+ if (buf == NULL)
+ return NULL;
+ wpabuf_printf(buf, "NOTIFY %s HTTP/1.1\r\n", e->addr->path);
+--
+2.20.1
+
diff --git a/main/hostapd/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch b/main/hostapd/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
new file mode 100644
index 0000000000..9d0376043d
--- /dev/null
+++ b/main/hostapd/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
@@ -0,0 +1,47 @@
+From 85aac526af8612c21b3117dadc8ef5944985b476 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@codeaurora.org>
+Date: Thu, 4 Jun 2020 21:24:04 +0300
+Subject: [PATCH 3/3] WPS UPnP: Handle HTTP initiation failures for events more
+ properly
+
+While it is appropriate to try to retransmit the event to another
+callback URL on a failure to initiate the HTTP client connection, there
+is no point in trying the exact same operation multiple times in a row.
+Replve the event_retry() calls with event_addr_failure() for these cases
+to avoid busy loops trying to repeat the same failing operation.
+
+These potential busy loops would go through eloop callbacks, so the
+process is not completely stuck on handling them, but unnecessary CPU
+would be used to process the continues retries that will keep failing
+for the same reason.
+
+Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
+---
+ src/wps/wps_upnp_event.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c
+index 08a23612f338..c0d9e41d9a38 100644
+--- a/src/wps/wps_upnp_event.c
++++ b/src/wps/wps_upnp_event.c
+@@ -294,7 +294,7 @@ static int event_send_start(struct subscription *s)
+
+ buf = event_build_message(e);
+ if (buf == NULL) {
+- event_retry(e, 0);
++ event_addr_failure(e);
+ return -1;
+ }
+
+@@ -302,7 +302,7 @@ static int event_send_start(struct subscription *s)
+ event_http_cb, e);
+ if (e->http_event == NULL) {
+ wpabuf_free(buf);
+- event_retry(e, 0);
++ event_addr_failure(e);
+ return -1;
+ }
+
+--
+2.20.1
+
diff --git a/main/hostapd/APKBUILD b/main/hostapd/APKBUILD
index 098241c17e..dc6571eaef 100644
--- a/main/hostapd/APKBUILD
+++ b/main/hostapd/APKBUILD
@@ -1,23 +1,27 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=hostapd
pkgver=2.9
-pkgrel=1
+pkgrel=2
pkgdesc="daemon for wireless software access points"
url="https://w1.fi/hostapd/"
arch="all"
license="custom"
makedepends="openssl-dev libnl3-dev linux-headers"
subpackages="$pkgname-doc $pkgname-openrc"
-patches="CVE-2019-16275.patch"
source="https://w1.fi/releases/$pkgname-$pkgver.tar.gz
- $patches
$pkgname.initd
$pkgname.confd
+ CVE-2019-16275.patch
+ 0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
+ 0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
+ 0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
"
options="!check" #no testsuite
builddir="$srcdir"/$pkgname-$pkgver/hostapd
# secfixes:
+# 2.9-r2:
+# - CVE-2020-12695
# 2.9-r1:
# - CVE-2019-16275
# 2.8-r0:
@@ -39,10 +43,14 @@ builddir="$srcdir"/$pkgname-$pkgver/hostapd
prepare() {
local conf="$builddir/.config"
+ # This is required because our builddir is the hostapd/ directory
+ # inside the extracted archive, while patches mostly apply against
+ # the src/ directory that is in the same directory as the hostapd/
+ # one is
cd "$builddir"/..
- for i in $patches; do
- msg $i
- patch -p1 -i "$srcdir"/$i
+ for i in "$srcdir"/*.patch; do
+ msg "Applying $i..."
+ patch -p1 -i $i
done
cd "$builddir"
@@ -95,6 +103,9 @@ package() {
"$pkgdir"/usr/share/man/man1/hostapd_cli
}
sha512sums="66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c hostapd-2.9.tar.gz
-63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38 CVE-2019-16275.patch
b54b7c6aa17e5cb86a9b354a516eb2dbefb544df18471339c61d82776de447011a2ac290bea1e6c8beae4b6cebefafb8174683ea42fb773e9e8fe6c679f33ba3 hostapd.initd
-0882263bbd7c0b05bf51f51d66e11a23a0b8ca7da2a3b8a30166d2c5f044c0c134e6bccb1d02c9e81819ca8fb0c0fb55c7121a08fe7233ccaa73ff8ab9a238fe hostapd.confd"
+0882263bbd7c0b05bf51f51d66e11a23a0b8ca7da2a3b8a30166d2c5f044c0c134e6bccb1d02c9e81819ca8fb0c0fb55c7121a08fe7233ccaa73ff8ab9a238fe hostapd.confd
+63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38 CVE-2019-16275.patch
+b76bbca282a74ef16c0303e5dbd2ccd33a62461595964d52c1481b0bfa4f41deacde56830b85409b288803b87ceb6f33cf0ccc69c5b17ec632c2d4784b872f3c 0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
+00cc739e78c42353a555c0de2f29defecff372927040e14407a231d1ead7ff32a37c9fd46bea7cdf1c24e3ac891bc3d483800d44fc6d2c8a12d2ae886523b12c 0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
+69243af20cdcfa837c51917a3723779f4825e11436fb83311355b4ffe8f7a4b7a5747a976f7bf923038c410c9e9055b13b866d9a396913ad08bdec3a70e9f6e0 0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch"
diff --git a/main/hwids/APKBUILD b/main/hwids/APKBUILD
index 64bc896328..a8218766d1 100644
--- a/main/hwids/APKBUILD
+++ b/main/hwids/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=hwids
-pkgver=20200306
+pkgver=20200813
pkgrel=0
pkgdesc="Hardware identification databases"
url="https://github.com/gentoo/hwids/"
@@ -65,4 +65,4 @@ udev() {
mv "$pkgdir"/etc "$subpkgdir"/
}
-sha512sums="eff1d2783925ca459b387fbaa5cf68a98aa4209ab8509ad92a902b4d02cc7f4a47e5506c2beed4c792d24a8ab636ad77b376a92b59ae4f605d1b5258350ff250 hwids-20200306.tar.gz"
+sha512sums="096070205381fc8b698276d8927d71831684129921c1165323b62ac624a5694f779dd601b25db6dc28a01878704c3de9ff37dbb2696867afafea527544cff2e4 hwids-20200813.tar.gz"
diff --git a/main/hylafaxplus/APKBUILD b/main/hylafaxplus/APKBUILD
index c02b55f216..fe2749f894 100644
--- a/main/hylafaxplus/APKBUILD
+++ b/main/hylafaxplus/APKBUILD
@@ -2,8 +2,8 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=hylafaxplus
_pkgname=hylafax
-pkgver=7.0.2
-pkgrel=1
+pkgver=7.0.3
+pkgrel=0
pkgdesc="Making the Premier Open-Source Fax Management System Even Better"
url="http://hylafax.sourceforge.net"
arch="all"
@@ -23,6 +23,11 @@ source="https://downloads.sourceforge.net/hylafax/$_pkgname-$pkgver.tar.gz
"
builddir="$srcdir"/$_pkgname-$pkgver
+# secfixes:
+# 7.0.2-r2:
+# - CVE-2020-15396
+# - CVE-2020-15397
+
build() {
# the configure script does not handle ccache or distcc
export CC=gcc
@@ -89,7 +94,7 @@ package() {
"$pkgdir"/etc/conf.d/$pkgname
}
-sha512sums="ea68404ad79e798b29450683eaa927e73033e0fa8160b803a3e2c9000df487c81193cc8fc0c1187477f5e1b2e26eec1c065ebc17e0be82e9a3e3758b1b5b5e4e hylafax-7.0.2.tar.gz
+sha512sums="938a21e4573fdf12bbc03dfee85e00555e7790a83a26316ac9cd1983501860858175d599c35f3b383cb0748518644587c203fb429966b5de3b615689d856281a hylafax-7.0.3.tar.gz
63f032b4b39dfb03380815a1a6290c5c4338761af8fecc0e55cf6f60bcbcb02e90780659e283d35911504c07d3e7492d19a2b1c08140d2e8f314649872b301f4 hylafaxplus.initd
a2117eddc8f0ff70a23a90f2001dcb88c5bddee46ffa021d6d1701cc5cfc3bcb0362ead2b1b1ce2b288992728053c5947466d08916649f45e7dfb1876576e50f hylafaxplus.confd
41ae2055a7781d83fc275aafe18ced0fe75ba79d3ad7d5096eabaeae3a514b564723185dd33820268577174f6c53bfcfddb30922ba50754b15c5c3b0abbec837 common-functions-busybox-awk.patch
diff --git a/main/icecast/APKBUILD b/main/icecast/APKBUILD
index 5fa0f17a00..0e43153f1c 100644
--- a/main/icecast/APKBUILD
+++ b/main/icecast/APKBUILD
@@ -1,13 +1,9 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-#
-# secfixes:
-# 2.4.4-r0:
-# - CVE-2018-18820
pkgname=icecast
pkgver=2.4.4
-pkgrel=1
+pkgrel=2
pkgdesc="Open source media server"
url="http://www.icecast.org"
arch="all"
@@ -17,14 +13,16 @@ pkgusers="icecast"
pkggroups="icecast"
makedepends="libxslt-dev libxml2-dev libogg-dev libvorbis-dev libtheora-dev openssl-dev curl-dev"
subpackages="$pkgname-doc $pkgname-openrc"
-source="http://downloads.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz
+source="http://downloads.xiph.org/releases/icecast/icecast-$pkgver.tar.gz
conf-change-owner.patch
icecast.initd
icecast.confd"
-builddir="$srcdir"/$pkgname-$pkgver
+# secfixes:
+# 2.4.4-r0:
+# - CVE-2018-18820
+
build() {
- cd $builddir
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -38,16 +36,14 @@ build() {
}
check() {
- cd $builddir
make check
}
package() {
- cd $builddir
make DESTDIR="$pkgdir" install
- install -D -m755 ../icecast.initd "$pkgdir"/etc/init.d/icecast
- install -D -m755 ../icecast.confd "$pkgdir"/etc/conf.d/icecast
- install -d -D -o icecast -g icecast "$pkgdir"/var/log/icecast
+ install -Dm755 "$srcdir"/icecast.initd "$pkgdir"/etc/init.d/icecast
+ install -Dm644 "$srcdir"/icecast.confd "$pkgdir"/etc/conf.d/icecast
+ install -d -o icecast -g icecast "$pkgdir"/var/log/icecast
}
sha512sums="e9ffb478cac2570891787455591d881a59185e067bb36f51706a7070cd9d82d80425ec8cf151f5ebb17d1b75654449fc760f8b82a1bb05f020b47ec09e46b4d0 icecast-2.4.4.tar.gz
diff --git a/main/ifupdown-ng/APKBUILD b/main/ifupdown-ng/APKBUILD
new file mode 100644
index 0000000000..e9eeb195cf
--- /dev/null
+++ b/main/ifupdown-ng/APKBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
+pkgname=ifupdown-ng
+pkgver=0.7.0
+pkgrel=0
+pkgdesc="tools for managing network configuration"
+url="https://github.com/ifupdown-ng/ifupdown-ng"
+arch="all"
+license="ISC"
+depends=""
+checkdepends="kyua atf"
+makedepends="scdoc"
+install=""
+subpackages="$pkgname-doc"
+source="https://distfiles.dereferenced.org/ifupdown-ng/ifupdown-ng-$pkgver.tar.xz"
+builddir="$srcdir/ifupdown-ng-$pkgver"
+
+# We only install the core executors right now. The other executors are
+# still being ported to run under ifupdown-ng natively, and so we will
+# use the ifupdown scripts for now for those cases. However, it is nice
+# to make the automatic dependency resolution work, and ifupdown-ng
+# provides some stubs to enable that.
+_executor_stubs="bridge bond vlan"
+
+build() {
+ make
+ make docs
+}
+
+check() {
+ make check
+}
+
+package() {
+ make DESTDIR="$pkgdir" EXECUTOR_SCRIPTS_OPT="" EXECUTOR_SCRIPTS_STUB="$_executor_stubs" install install_docs
+}
+
+sha512sums="329460a51443e5a1aedd762e46f564a7cbdc7108ccdde571891939a526ee47961b5d6006774cd1cca31f30d35682fcf35427be50904b3d220133a9987b1cb708 ifupdown-ng-0.7.0.tar.xz"
diff --git a/main/imlib2/APKBUILD b/main/imlib2/APKBUILD
index 961d276009..2b880bb848 100644
--- a/main/imlib2/APKBUILD
+++ b/main/imlib2/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=imlib2
-pkgver=1.6.1
+pkgver=1.7.0
pkgrel=0
pkgdesc="Image manipulation library"
url="https://sourceforge.net/projects/enlightenment"
@@ -9,8 +9,10 @@ license="Imlib2"
subpackages="$pkgname-dev"
depends_dev="freetype-dev libxext-dev libsm-dev"
makedepends="$depends_dev tiff-dev giflib-dev bzip2-dev libpng-dev
- libid3tag-dev libjpeg-turbo-dev zlib-dev util-linux-dev"
-source="https://downloads.sourceforge.net/enlightenment/imlib2-$pkgver.tar.gz"
+ libid3tag-dev libjpeg-turbo-dev zlib-dev util-linux-dev libwebp-dev"
+source="https://downloads.sourceforge.net/enlightenment/imlib2-$pkgver.tar.gz
+ fix-s390x.patch
+ "
build() {
./configure \
@@ -29,6 +31,7 @@ build() {
--with-jpeg \
--with-png \
--with-tiff \
+ --with-webp \
--with-zlib
make
}
@@ -41,4 +44,5 @@ package() {
make DESTDIR=$pkgdir install
}
-sha512sums="0c6d874973c46c7e96e49fc391d463ec8c7c5ce9de682600cb4e28ca81ff0366a02055cbec2a2b743204051243d20b2316ab602b98df9d03dcf319297f7e6a13 imlib2-1.6.1.tar.gz"
+sha512sums="97eade309e254c62ef32eac4d18f49c038b9b9c1489f1258a92d2f084a0b53e58b0c80487eb69ecb0da9be23c9deb47f06d6361f18f5b18fa34817871c515e73 imlib2-1.7.0.tar.gz
+1ed2636affbf171e8cba969c3959d2d728216dd0250dc6dcc40b6102c0b47290b4fa63acf2f1837c944d8a3c2bf460c848b9ecd30ee094acd0e82ec15022c346 fix-s390x.patch"
diff --git a/main/imlib2/fix-s390x.patch b/main/imlib2/fix-s390x.patch
new file mode 100644
index 0000000000..1c2506a65d
--- /dev/null
+++ b/main/imlib2/fix-s390x.patch
@@ -0,0 +1,16 @@
+Upstream: Should be
+Reason: Fixes compilation on big-endian arches like s390x
+
+diff --git a/src/modules/loaders/loader_argb.c b/src/modules/loaders/loader_argb.c
+index ec58ca3..e696fe4 100644
+--- a/src/modules/loaders/loader_argb.c
++++ b/src/modules/loaders/loader_argb.c
+@@ -52,7 +52,7 @@ load2(ImlibImage * im, int load_data)
+ goto quit;
+
+ #ifdef WORDS_BIGENDIAN
+- for (l = 0; l < im->w; l++)
++ for (int l = 0; l < im->w; l++)
+ SWAP_LE_32_INPLACE(ptr[l]);
+ #endif
+ ptr += im->w;
diff --git a/main/iperf3/APKBUILD b/main/iperf3/APKBUILD
index 870c671ab4..88e832a207 100644
--- a/main/iperf3/APKBUILD
+++ b/main/iperf3/APKBUILD
@@ -2,8 +2,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=iperf3
_pkgname=iperf
-pkgver=3.7
-pkgrel=2
+pkgver=3.8.1
+pkgrel=0
pkgdesc="A tool to measure IP bandwidth using UDP or TCP"
url="https://github.com/esnet/iperf"
arch="all"
@@ -44,7 +44,7 @@ package() {
"$pkgdir"/etc/conf.d/$pkgname
}
-sha512sums="4a861a506d7e37958e1af62d1634d11c4937d5974bfce636d421aa80c88f038c96738d9e196a7667e38ef515f998b467d4ff3db30af7e3efea8d9ac8a63a61e7 iperf3-3.7.tar.gz
+sha512sums="3b551e2d603724374228682b316a0b1572f8630d51dcfed673b9d3df8589ce27679c27f3e9ce9539fabc111faa96fe5981778599076abe4f24b7a1d48ab63b09 iperf3-3.8.1.tar.gz
fdaf06316886ae02a865848ea6df6b77aecde78fab15bcbc22e077871c3f567521eeee19ef13c402fef467c2edd916a7d976a4c933dbfb637373145a18563ef9 iperf3.initd
4c6b766c154612f5f2e5f6150396f443ba37ec59ed0a8a994bf84612059db22827aee3dd3b7c3249e0bb6037163788d830efcb1caad5eba1c97d2349bdbc55f9 iperf3.confd
aef39e45bf63341b724b9131d8bfdf96702acc059e10d7d502053effa69a03097f64e9ba2a26c6a1e3e1567cf9a95013fc58b3b47623de79add14230bd820fa0 build-fixes.patch
diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD
index e5cdfc7450..2c9c720e3e 100644
--- a/main/iproute2/APKBUILD
+++ b/main/iproute2/APKBUILD
@@ -1,14 +1,15 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=iproute2
-pkgver=5.6.0
+pkgver=5.8.0
pkgrel=0
pkgdesc="IP Routing Utilities"
+options="!check" # Requires namespaces support and root
url="https://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
arch="all"
license="GPL-2.0-or-later"
install="$pkgname.post-install"
makedepends="bison flex bash iptables-dev elfutils-dev"
-subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
+subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch $pkgname-minimal $pkgname-tc $pkgname-ss"
source="https://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz
fix-install-errors.patch
musl-fixes.patch"
@@ -33,13 +34,45 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var
- make CCOPTS="-D_GNU_SOURCE $CFLAGS"
+ make CCOPTS="-D_GNU_SOURCE $CFLAGS" V=1
}
package() {
make -j1 DESTDIR="$pkgdir" install
}
+minimal() {
+ replaces="$pkgname"
+ pkgdesc="IP Routing Utilities (/sbin/ip only)"
+ install_if="$pkgname=$pkgver-r$pkgrel"
+
+ install -d -m755 "$subpkgdir"/sbin
+
+ mv "$pkgdir"/sbin/ip "$subpkgdir"/sbin/
+ mv "$pkgdir"/etc "$subpkgdir"/etc
+}
+
+tc() {
+ replaces="$pkgname"
+ pkgdesc="IP Routing Utilities (traffic control and XDP support)"
+ install_if="$pkgname=$pkgver-r$pkgrel"
+
+ install -d -m755 "$subpkgdir"/sbin
+
+ mv "$pkgdir"/sbin/tc "$subpkgdir"/sbin/
+ mv "$pkgdir"/usr "$subpkgdir"/usr
+}
+
+ss() {
+ replaces="$pkgname"
+ pkgdesc="IP Routing Utilities (socket statistics tool)"
+ install_if="$pkgname=$pkgver-r$pkgrel"
+
+ install -d -m755 "$subpkgdir"/sbin
+
+ mv "$pkgdir"/sbin/ss "$subpkgdir"/sbin/
+}
+
bashcomp() {
depends=""
pkgdesc="Bash completions for $pkgname"
@@ -52,6 +85,6 @@ bashcomp() {
rmdir -p "$pkgdir"/usr/share 2>/dev/null || true
}
-sha512sums="e52c6c8b676ab79401ae815fe3f80268c1edb490c0a00826e0f7181a816e9bf6549df9e77a40b0d56855db8ad312179b3a40002a2dd6f66c807039cff0cdfb6c iproute2-5.6.0.tar.xz
+sha512sums="f2a3f7dcf5cb39ca7cd14f0e40e45641eccf4b93427c527a09fd789ac8621c5c3359769ca61fcc8bab7e915edd943c39b7c3e15cbfc497187aa6271eed0a9152 iproute2-5.8.0.tar.xz
24fc2a901650e11f80bcaa82c839e70c21aafdf3c5b8a357d932d066a0b98ae2ec8379fc17a0a16a1b5b4fa5edc131179c10fc02e55d6101701df5a09966912c fix-install-errors.patch
2e3558caddf814da8c4d78c74eddb7a659d6f94b93de5396bdd995e2333e3cd656f9c936ac7a5a86d0477abc27a92550582575ab4ed19fc2ec0d9b6699cd612c musl-fixes.patch"
diff --git a/main/ipsec-tools/20-grekey-support.patch b/main/ipsec-tools/20-grekey-support.patch
deleted file mode 100644
index 7651b8dbf2..0000000000
--- a/main/ipsec-tools/20-grekey-support.patch
+++ /dev/null
@@ -1,786 +0,0 @@
-Index: ipsec-tools-cvs-HEAD/src/racoon/racoonctl.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/racoonctl.c 2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/racoonctl.c 2011-03-29 22:08:43.000000000 +0300
-@@ -232,7 +232,7 @@
- "\n"
- " <saopts>: \"isakmp\" <family> <src> <dst>\n"
- " : {\"esp\",\"ah\"} <family> <src/prefixlen/port> <dst/prefixlen/port>\n"
--" <ul_proto>\n"
-+" <ul_proto> [grekey <grekey>]\n"
- " <family>: \"inet\" or \"inet6\"\n"
- " <ul_proto>: \"icmp\", \"tcp\", \"udp\", \"gre\" or \"any\"\n"
- "\n",
-@@ -819,7 +819,7 @@
- {
- int family;
-
-- if (ac != 3 && ac != 4) {
-+ if (ac < 3) {
- errno = EINVAL;
- return NULL;
- }
-@@ -861,10 +861,8 @@
- struct sockaddr *src = NULL, *dst = NULL;
- int ulproto;
-
-- if (ac != 2 && ac != 3) {
-- errno = EINVAL;
-- return NULL;
-- }
-+ if (ac < 2)
-+ goto bad_args;
-
- if (get_comindex(*av, &p_name, &p_port, &p_prefs) == -1)
- goto bad;
-@@ -901,13 +899,34 @@
-
- av++;
- ac--;
-- if(ac){
-+ if (ac) {
- ulproto = get_ulproto(*av);
- if (ulproto == -1)
- goto bad;
-- }else
-+ av++;
-+ ac--;
-+ } else
- ulproto=0;
-
-+ if (ac == 2 && strcmp(av[0], "grekey") == 0) {
-+ int a, b, c, d;
-+ unsigned long u;
-+
-+ if (sscanf(av[1], "%d.%d.%d.%d", &a, &b, &c, &d) == 4) {
-+ set_port(src, (a << 8) + b);
-+ set_port(dst, (c << 8) + d);
-+ } else if (sscanf(av[1], "%lu", &u) == 1) {
-+ set_port(src, u >> 16);
-+ set_port(dst, u & 0xffff);
-+ } else
-+ goto bad_args;
-+ av += 2;
-+ ac -= 2;
-+ }
-+
-+ if (ac != 0)
-+ goto bad_args;
-+
- ci = (struct admin_com_indexes *)buf->v;
- if(p_prefs)
- ci->prefs = (u_int8_t)atoi(p_prefs); /* XXX should be handled error. */
-@@ -926,7 +945,9 @@
-
- return buf;
-
-- bad:
-+bad_args:
-+ errno = EINVAL;
-+bad:
- if (p_name)
- racoon_free(p_name);
- if (p_port)
-Index: ipsec-tools-cvs-HEAD/src/racoon/admin.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/admin.c 2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/admin.c 2011-03-30 09:41:46.000000000 +0300
-@@ -444,7 +444,7 @@
-
- /* search appropreate configuration */
- if (name == NULL)
-- rmconf = getrmconf(dst, 0);
-+ rmconf = getrmconf(dst, 0, 0);
- else
- rmconf = getrmconf_by_name(name);
- if (rmconf == NULL) {
-@@ -536,6 +536,7 @@
- spidx.prefs = ndx->prefd;
- spidx.prefd = ndx->prefs;
- spidx.ul_proto = ndx->ul_proto;
-+ spidx_normalize_ulports(&spidx);
-
- sp_in = getsp_r(&spidx);
- if (sp_in) {
-Index: ipsec-tools-cvs-HEAD/src/racoon/cftoken.l
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/cftoken.l 2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/cftoken.l 2011-03-29 22:08:43.000000000 +0300
-@@ -288,6 +288,7 @@
- <S_SAINF>any { YYD; return(ANY); }
- <S_SAINF>from { YYD; return(FROM); }
- <S_SAINF>group { YYD; return(GROUP); }
-+<S_SAINF>grekey { YYD; return(GREKEY); }
- /* sainfo spec */
- <S_SAINF>{bcl} { BEGIN S_SAINFS; return(BOC); }
- <S_SAINF>{semi} { BEGIN S_INI; return(EOS); }
-Index: ipsec-tools-cvs-HEAD/src/racoon/cfparse.y
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/cfparse.y 2011-03-14 19:12:41.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/cfparse.y 2011-03-29 22:08:43.000000000 +0300
-@@ -214,7 +214,7 @@
- /* algorithm */
- %token ALGORITHM_CLASS ALGORITHMTYPE STRENGTHTYPE
- /* sainfo */
--%token SAINFO FROM
-+%token SAINFO FROM GREKEY
- /* remote */
- %token REMOTE ANONYMOUS CLIENTADDR INHERIT REMOTE_ADDRESS
- %token EXCHANGE_MODE EXCHANGETYPE DOI DOITYPE SITUATION SITUATIONTYPE
-@@ -1302,6 +1302,35 @@
- cur_sainfo->idsrc = $1;
- cur_sainfo->iddst = $2;
- }
-+ | sainfo_id sainfo_id GREKEY ADDRSTRING
-+ {
-+ int a, b, c, d;
-+
-+ if (sscanf($4->v, "%d.%d.%d.%d", &a, &b, &c, &d) == 4) {
-+ a = ipsecdoi_fixup_id_uldata(
-+ $1, $2, IPPROTO_GRE,
-+ (a << 8) + b, (c << 8) + d);
-+ } else {
-+ yyerror("grekey format unrecognized.");
-+ return -1;
-+ }
-+ if (a != 0) {
-+ yyerror("ul_proto needs to be 'gre' to use grekey.");
-+ return -1;
-+ }
-+ cur_sainfo->idsrc = $1;
-+ cur_sainfo->iddst = $2;
-+ }
-+ | sainfo_id sainfo_id GREKEY NUMBER
-+ {
-+ if (ipsecdoi_fixup_id_uldata($1, $2, IPPROTO_GRE,
-+ ($4) >> 16, ($4) & 0xffff) != 0) {
-+ yyerror("ul_proto needs to be 'gre' to use grekey.");
-+ return -1;
-+ }
-+ cur_sainfo->idsrc = $1;
-+ cur_sainfo->iddst = $2;
-+ }
- ;
- sainfo_id
- : IDENTIFIERTYPE ADDRSTRING prefix port ul_proto
-@@ -1668,7 +1697,7 @@
- {
- struct remoteconf *from, *new;
-
-- from = getrmconf($4, GETRMCONF_F_NO_ANONYMOUS);
-+ from = getrmconf($4, GETRMCONF_F_NO_ANONYMOUS, 0);
- if (from == NULL) {
- yyerror("failed to get remoteconf for %s.",
- saddr2str($4));
-Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.h
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/ipsec_doi.h 2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.h 2011-03-30 09:22:13.000000000 +0300
-@@ -227,6 +227,10 @@
- extern int set_identifier_qual __P((vchar_t **, int, vchar_t *, int));
- extern int ipsecdoi_setid2 __P((struct ph2handle *));
- extern vchar_t *ipsecdoi_sockaddr2id __P((struct sockaddr *, u_int, u_int));
-+extern int ipsecdoi_fixup_id_uldata __P((vchar_t *, vchar_t *, u_int16_t, u_int16_t, u_int16_t));
-+extern int ipsecdoi_normalize_id_uldata __P((vchar_t *, vchar_t *));
-+extern int ipsecdoi_id_has_port __P((vchar_t *));
-+
- extern int ipsecdoi_id2sockaddr __P((vchar_t *, struct sockaddr *,
- u_int8_t *, u_int16_t *));
- extern char *ipsecdoi_id2str __P((const vchar_t *));
-Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/ipsec_doi.c 2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c 2011-03-30 16:59:49.000000000 +0300
-@@ -3308,6 +3308,7 @@
- const vchar_t *subnet;
- const vchar_t *address;
- {
-+ struct in_addr *a, *b;
- struct in_addr *mask;
-
- if (address->l != sizeof(struct in_addr))
-@@ -3316,12 +3317,15 @@
- if (subnet->l != (sizeof(struct in_addr)*2))
- return 1;
-
-+ a = (struct in_addr*)(subnet->v);
-+ b = (struct in_addr*)(address->v);
- mask = (struct in_addr*)(subnet->v + sizeof(struct in_addr));
-
-- if (mask->s_addr!=0xffffffff)
-- return 1;
-+ //if (mask->s_addr!=0xffffffff)
-+ // return 1;
-+ //return memcmp(subnet->v,address->v,address->l);
-
-- return memcmp(subnet->v,address->v,address->l);
-+ return (a->s_addr & mask->s_addr) != (b->s_addr & mask->s_addr);
- }
-
- #ifdef INET6
-@@ -3371,6 +3375,7 @@
- vchar_t ident_t;
- vchar_t ident_s;
- int result;
-+ int check_ports = 0;
-
- /* handle wildcard IDs */
-
-@@ -3410,12 +3415,14 @@
-
- if ((id_bs->type == IPSECDOI_ID_IPV4_ADDR)&&
- (id_bt->type == IPSECDOI_ID_IPV4_ADDR_SUBNET)) {
-+ check_ports = 1;
- result = ipsecdoi_subnetisaddr_v4(&ident_t,&ident_s);
- goto cmpid_result;
- }
-
- if ((id_bs->type == IPSECDOI_ID_IPV4_ADDR_SUBNET)&&
- (id_bt->type == IPSECDOI_ID_IPV4_ADDR)) {
-+ check_ports = 1;
- result = ipsecdoi_subnetisaddr_v4(&ident_s,&ident_t);
- goto cmpid_result;
- }
-@@ -3423,12 +3430,14 @@
- #ifdef INET6
- if ((id_bs->type == IPSECDOI_ID_IPV6_ADDR)&&
- (id_bt->type == IPSECDOI_ID_IPV6_ADDR_SUBNET)) {
-+ check_ports = 1;
- result = ipsecdoi_subnetisaddr_v6(&ident_t,&ident_s);
- goto cmpid_result;
- }
-
- if ((id_bs->type == IPSECDOI_ID_IPV6_ADDR_SUBNET)&&
- (id_bt->type == IPSECDOI_ID_IPV6_ADDR)) {
-+ check_ports = 1;
- result = ipsecdoi_subnetisaddr_v6(&ident_s,&ident_t);
- goto cmpid_result;
- }
-@@ -3460,6 +3469,7 @@
-
- case IPSECDOI_ID_IPV4_ADDR:
- /* validate lengths */
-+ check_ports = 1;
- if ((ident_t.l != sizeof(struct in_addr))||
- (ident_s.l != sizeof(struct in_addr)))
- goto cmpid_invalid;
-@@ -3468,6 +3478,7 @@
- case IPSECDOI_ID_IPV4_ADDR_SUBNET:
- case IPSECDOI_ID_IPV4_ADDR_RANGE:
- /* validate lengths */
-+ check_ports = 1;
- if ((ident_t.l != (sizeof(struct in_addr)*2))||
- (ident_s.l != (sizeof(struct in_addr)*2)))
- goto cmpid_invalid;
-@@ -3476,6 +3487,7 @@
- #ifdef INET6
- case IPSECDOI_ID_IPV6_ADDR:
- /* validate lengths */
-+ check_ports = 1;
- if ((ident_t.l != sizeof(struct in6_addr))||
- (ident_s.l != sizeof(struct in6_addr)))
- goto cmpid_invalid;
-@@ -3484,6 +3496,7 @@
- case IPSECDOI_ID_IPV6_ADDR_SUBNET:
- case IPSECDOI_ID_IPV6_ADDR_RANGE:
- /* validate lengths */
-+ check_ports = 1;
- if ((ident_t.l != (sizeof(struct in6_addr)*2))||
- (ident_s.l != (sizeof(struct in6_addr)*2)))
- goto cmpid_invalid;
-@@ -3502,12 +3515,18 @@
- }
-
- /* validate matching data and length */
-- if (ident_t.l == ident_s.l)
-- result = memcmp(ident_t.v,ident_s.v,ident_t.l);
-- else
-+ if (ident_t.l != ident_s.l)
- result = 1;
-+ else
-+ result = memcmp(ident_t.v,ident_s.v,ident_t.l);
-
- cmpid_result:
-+ if (check_ports &&
-+ (id_bt->port != id_bs->port && id_bs->port != 0)) {
-+ /* if target is wildcard, source should be too, otherwise
-+ * specific rule matches wildcard request */
-+ result = 1;
-+ }
-
- /* debug level output */
- if(loglevel >= LLV_DEBUG) {
-@@ -4089,6 +4108,67 @@
- return new;
- }
-
-+int ipsecdoi_fixup_id_uldata(srcid, dstid, ul_proto, ul_data1, ul_data2)
-+ vchar_t *srcid, *dstid;
-+ u_int16_t ul_proto;
-+ u_int16_t ul_data1, ul_data2;
-+{
-+ struct ipsecdoi_id_b *src = (struct ipsecdoi_id_b *) srcid->v;
-+ struct ipsecdoi_id_b *dst = (struct ipsecdoi_id_b *) dstid->v;
-+
-+ if (src->proto_id != ul_proto ||
-+ dst->proto_id != ul_proto)
-+ return -1;
-+
-+ src->port = htons(ul_data1);
-+ dst->port = htons(ul_data2);
-+
-+ return 0;
-+}
-+
-+int ipsecdoi_normalize_id_uldata(srcid, dstid)
-+ vchar_t *srcid, *dstid;
-+{
-+ struct ipsecdoi_id_b *src = (struct ipsecdoi_id_b *) srcid->v;
-+ struct ipsecdoi_id_b *dst = (struct ipsecdoi_id_b *) dstid->v;
-+ u_int16_t tmp;
-+
-+ if (src->proto_id != dst->proto_id)
-+ return -1;
-+
-+ switch (src->proto_id) {
-+ case IPPROTO_ICMP:
-+ case IPPROTO_ICMPV6:
-+ case IPPROTO_GRE:
-+ tmp = src->port;
-+ src->port = dst->port;
-+ dst->port = tmp;
-+ break;
-+ }
-+
-+ return 0;
-+}
-+
-+int ipsecdoi_id_has_port(id)
-+ vchar_t *id;
-+{
-+ struct ipsecdoi_id_b *id_b = (struct ipsecdoi_id_b *) id->v;
-+
-+ switch (id_b->type) {
-+ case IPSECDOI_ID_IPV4_ADDR:
-+ case IPSECDOI_ID_IPV4_ADDR_SUBNET:
-+ case IPSECDOI_ID_IPV4_ADDR_RANGE:
-+ case IPSECDOI_ID_IPV6_ADDR:
-+ case IPSECDOI_ID_IPV6_ADDR_SUBNET:
-+ case IPSECDOI_ID_IPV6_ADDR_RANGE:
-+ if (ntohs(id_b->port) != 0)
-+ return 1;
-+ break;
-+ }
-+ return 0;
-+}
-+
-+
- vchar_t *
- ipsecdoi_sockrange2id(laddr, haddr, ul_proto)
- struct sockaddr *laddr, *haddr;
-@@ -4318,7 +4398,7 @@
- saddr.sa.sa_len = sizeof(struct sockaddr_in);
- #endif
- saddr.sa.sa_family = AF_INET;
-- saddr.sin.sin_port = IPSEC_PORT_ANY;
-+ saddr.sin.sin_port = id_b->port;
- memcpy(&saddr.sin.sin_addr,
- id->v + sizeof(*id_b), sizeof(struct in_addr));
- break;
-@@ -4331,7 +4411,7 @@
- saddr.sa.sa_len = sizeof(struct sockaddr_in6);
- #endif
- saddr.sa.sa_family = AF_INET6;
-- saddr.sin6.sin6_port = IPSEC_PORT_ANY;
-+ saddr.sin6.sin6_port = id_b->port;
- memcpy(&saddr.sin6.sin6_addr,
- id->v + sizeof(*id_b), sizeof(struct in6_addr));
- saddr.sin6.sin6_scope_id =
-@@ -4347,7 +4427,7 @@
- #ifdef INET6
- case IPSECDOI_ID_IPV6_ADDR:
- #endif
-- len = snprintf( buf, BUFLEN, "%s", saddrwop2str(&saddr.sa));
-+ len = snprintf( buf, BUFLEN, "%s", saddr2str(&saddr.sa));
- break;
-
- case IPSECDOI_ID_IPV4_ADDR_SUBNET:
-@@ -4403,7 +4483,9 @@
- plen += l;
- }
-
-- len = snprintf( buf, BUFLEN, "%s/%i", saddrwop2str(&saddr.sa), plen);
-+ len = snprintf(buf, BUFLEN, "%s/%i[%d]",
-+ saddrwop2str(&saddr.sa), plen,
-+ ntohs(id_b->port));
- }
- break;
-
-@@ -4415,12 +4497,12 @@
- saddr.sa.sa_len = sizeof(struct sockaddr_in);
- #endif
- saddr.sa.sa_family = AF_INET;
-- saddr.sin.sin_port = IPSEC_PORT_ANY;
-+ saddr.sin.sin_port = id_b->port;
- memcpy(&saddr.sin.sin_addr,
- id->v + sizeof(*id_b) + sizeof(struct in_addr),
- sizeof(struct in_addr));
-
-- len += snprintf(buf + len, BUFLEN - len, "%s", saddrwop2str(&saddr.sa));
-+ len += snprintf(buf + len, BUFLEN - len, "%s", saddr2str(&saddr.sa));
- break;
-
- #ifdef INET6
-@@ -4431,7 +4513,7 @@
- saddr.sa.sa_len = sizeof(struct sockaddr_in6);
- #endif
- saddr.sa.sa_family = AF_INET6;
-- saddr.sin6.sin6_port = IPSEC_PORT_ANY;
-+ saddr.sin6.sin6_port = id_b->port;
- memcpy(&saddr.sin6.sin6_addr,
- id->v + sizeof(*id_b) + sizeof(struct in6_addr),
- sizeof(struct in6_addr));
-@@ -4440,7 +4522,7 @@
- ? ((struct sockaddr_in6 *)id_b)->sin6_scope_id
- : 0);
-
-- len += snprintf(buf + len, BUFLEN - len, "%s", saddrwop2str(&saddr.sa));
-+ len += snprintf(buf + len, BUFLEN - len, "%s", saddr2str(&saddr.sa));
- break;
- #endif
-
-Index: ipsec-tools-cvs-HEAD/src/racoon/sainfo.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/sainfo.c 2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/sainfo.c 2011-03-29 22:08:44.000000000 +0300
-@@ -124,7 +124,7 @@
- plog(LLV_DEBUG, LOCATION, NULL,
- "evaluating sainfo: %s\n", sainfostr);
-
-- if(s->remoteid != remoteid) {
-+ if (remoteid != -1 && s->remoteid != remoteid) {
- plog(LLV_DEBUG, LOCATION, NULL,
- "remoteid mismatch: %u != %u\n",
- s->remoteid, remoteid);
-@@ -234,16 +234,22 @@
- int pri = 0;
-
- if(s->remoteid)
-- pri += 3;
-+ pri += 7;
-
- if(s->id_i)
-- pri += 3;
-+ pri += 7;
-
-- if(s->idsrc)
-+ if(s->idsrc) {
- pri++;
-+ if (ipsecdoi_id_has_port(s->idsrc))
-+ pri += 2;
-+ }
-
-- if(s->iddst)
-+ if(s->iddst) {
- pri++;
-+ if (ipsecdoi_id_has_port(s->iddst))
-+ pri += 2;
-+ }
-
- return pri;
- }
-Index: ipsec-tools-cvs-HEAD/src/racoon/isakmp.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/isakmp.c 2011-03-14 19:18:12.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/isakmp.c 2011-03-30 09:41:46.000000000 +0300
-@@ -2173,7 +2173,15 @@
- * so no need to bother yet. --arno */
-
- if (iph1hint == NULL || iph1hint->rmconf == NULL) {
-- rmconf = getrmconf(iph2->dst, nopassive ? GETRMCONF_F_NO_PASSIVE : 0);
-+ int flags = 0;
-+ uint32_t remoteid = 0;
-+ if (nopassive)
-+ flags |= GETRMCONF_F_NO_PASSIVE;
-+ if (iph2->sainfo != NULL) {
-+ flags |= GETRMCONF_F_HAS_REMOTEID;
-+ remoteid = iph2->sainfo->remoteid;
-+ }
-+ rmconf = getrmconf(iph2->dst, flags, remoteid);
- if (rmconf == NULL) {
- plog(LLV_ERROR, LOCATION, NULL,
- "no configuration found for %s.\n",
-@@ -2249,7 +2257,7 @@
- struct secpolicy *sp_out, *sp_in;
- {
- struct remoteconf *conf;
-- uint32_t remoteid = 0;
-+ uint32_t remoteid = -1;
-
- plog(LLV_DEBUG, LOCATION, NULL,
- "new acquire %s\n", spidx2str(&sp_out->spidx));
-@@ -2276,7 +2284,7 @@
- return -1;
- }
-
-- conf = getrmconf(iph2->dst, 0);
-+ conf = getrmconf(iph2->dst, 0, 0);
- if (conf != NULL)
- remoteid = conf->ph1id;
- else
-@@ -3582,6 +3590,8 @@
-
- #undef _XIDT
-
-+ spidx_normalize_ulports(&spidx);
-+
- plog(LLV_DEBUG, LOCATION, NULL,
- "get a src address from ID payload "
- "%s prefixlen=%u ul_proto=%u\n",
-@@ -3654,6 +3664,7 @@
- pref = spidx.prefs;
- spidx.prefs = spidx.prefd;
- spidx.prefd = pref;
-+ spidx_normalize_ulports(&spidx);
-
- if (pk_sendspddelete(iph2) < 0) {
- plog(LLV_ERROR, LOCATION, NULL,
-Index: ipsec-tools-cvs-HEAD/src/racoon/remoteconf.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/remoteconf.c 2011-03-14 19:12:41.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/remoteconf.c 2011-03-29 22:08:44.000000000 +0300
-@@ -217,6 +217,13 @@
- return MATCH_NONE;
- }
-
-+ if ((rmsel->flags & GETRMCONF_F_HAS_REMOTEID) &&
-+ rmsel->remoteid != rmconf->ph1id){
-+ plog(LLV_DEBUG2, LOCATION, rmsel->remote,
-+ "Not matched: remote_id did not match.\n");
-+ return MATCH_NONE;
-+ }
-+
- ret |= MATCH_BASIC;
-
- /* Check address */
-@@ -387,9 +394,10 @@
- */
-
- struct remoteconf *
--getrmconf(remote, flags)
-+getrmconf(remote, flags, remoteid)
- struct sockaddr *remote;
- int flags;
-+ uint32_t remoteid;
- {
- struct rmconf_find_context ctx;
- int n = 0;
-@@ -397,6 +405,7 @@
- memset(&ctx, 0, sizeof(ctx));
- ctx.sel.flags = flags;
- ctx.sel.remote = remote;
-+ ctx.sel.remoteid = remoteid;
-
- if (enumrmconf(&ctx.sel, rmconf_find, &ctx) != 0) {
- plog(LLV_ERROR, LOCATION, remote,
-Index: ipsec-tools-cvs-HEAD/src/racoon/remoteconf.h
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/remoteconf.h 2011-03-14 19:12:41.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/remoteconf.h 2011-03-29 22:08:44.000000000 +0300
-@@ -178,6 +178,7 @@
- int flags;
- struct sockaddr *remote;
- int etype;
-+ uint32_t remoteid;
- struct isakmpsa *approval;
- vchar_t *identity;
- vchar_t *certificate_request;
-@@ -191,12 +192,13 @@
-
- #define GETRMCONF_F_NO_ANONYMOUS 0x0001
- #define GETRMCONF_F_NO_PASSIVE 0x0002
-+#define GETRMCONF_F_HAS_REMOTEID 0x0004
-
- #define RMCONF_ERR_MULTIPLE ((struct remoteconf *) -1)
-
- extern int rmconf_match_identity __P((struct remoteconf *rmconf,
- vchar_t *id_p));
--extern struct remoteconf *getrmconf __P((struct sockaddr *remote, int flags));
-+extern struct remoteconf *getrmconf __P((struct sockaddr *remote, int flags, uint32_t remoteid));
- extern struct remoteconf *getrmconf_by_ph1 __P((struct ph1handle *iph1));
- extern struct remoteconf *getrmconf_by_name __P((const char *name));
-
-Index: ipsec-tools-cvs-HEAD/src/racoon/pfkey.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/pfkey.c 2011-03-14 19:18:13.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/pfkey.c 2011-03-30 08:21:09.000000000 +0300
-@@ -1886,6 +1886,7 @@
- spidx.prefs = sp_out->spidx.prefd;
- spidx.prefd = sp_out->spidx.prefs;
- spidx.ul_proto = sp_out->spidx.ul_proto;
-+ spidx_normalize_ulports(&spidx);
-
- #ifdef HAVE_SECCTX
- if (m_sec_ctx) {
-@@ -2898,7 +2899,7 @@
-
- /* If we are not acting as initiator, let's just leave and
- * let the remote peer handle the restart */
-- rmconf = getrmconf(ma->remote, 0);
-+ rmconf = getrmconf(ma->remote, 0, 0);
- if (rmconf == NULL || !rmconf->passive) {
- iph1->status = PHASE1ST_EXPIRED;
- sched_schedule(&iph1->sce, 1, isakmp_ph1delete_stub);
-@@ -3068,8 +3069,10 @@
-
- if (iph2->ph1 && iph2->ph1->rmconf)
- rmconf = iph2->ph1->rmconf;
-+ else if (iph2->sainfo != NULL)
-+ rmconf = getrmconf(iph2->dst, GETRMCONF_F_HAS_REMOTEID, iph2->sainfo->remoteid);
- else
-- rmconf = getrmconf(iph2->dst, 0);
-+ rmconf = getrmconf(iph2->dst, 0, 0);
-
- if (rmconf && !rmconf->passive) {
- struct ph1handle *iph1hint;
-Index: ipsec-tools-cvs-HEAD/src/setkey/setkey.8
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/setkey/setkey.8 2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/setkey/setkey.8 2011-03-29 22:08:44.000000000 +0300
-@@ -453,7 +453,7 @@
- .Pp
- A second example of requiring transport mode encryption of specific
- GRE tunnel:
--.Dl spdadd 0.0.0.0 0.0.0.0 gre 1234 ipsec esp/transport//require ;
-+.Dl spdadd 0.0.0.0 0.0.0.0 gre 1234 -P in ipsec esp/transport//require ;
- .Pp
- .Em Note :
- .Ar upperspec
-Index: ipsec-tools-cvs-HEAD/src/racoon/racoon.conf.5
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/racoon.conf.5 2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/racoon.conf.5 2011-03-29 22:08:44.000000000 +0300
-@@ -981,6 +981,7 @@
- .Bl -tag -width Ds -compact
- .It Ic sainfo Po Ar local_id | Ic anonymous Pc \
- Po Ar remote_id | Ic clientaddr | Ic anonymous Pc \
-+Bo Ic grekey Ar key Bc \
- Bo Ic from Ar idtype Bo Ar string Bc Bc Bo Ic group Ar string Bc \
- Ic { Ar statements Ic }
- Defines the parameters of the IKE phase 2 (IPsec-SA establishment).
-@@ -1026,6 +1027,15 @@
- to restrict policy generation when racoon is acting as a client gateway
- for peers with dynamic ip addresses.
- .Pp
-+If both
-+.Ar local_id
-+and
-+.Ar remote_id
-+are specified with GRE as upper layer protocol, the upper layer GRE
-+key match can be specified with
-+.Ic grekey
-+.Ar key .
-+.Pp
- The
- .Ic from
- keyword allows an sainfo to only match for peers that use a specific phase1
-Index: ipsec-tools-cvs-HEAD/src/setkey/parse.y
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/setkey/parse.y 2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/setkey/parse.y 2011-03-29 22:08:44.000000000 +0300
-@@ -856,6 +856,17 @@
- }
- $$.len = strlen($$.buf);
- }
-+ | DECSTRING
-+ {
-+ char tmp[16];
-+ sprintf(tmp, "%lu", $1);
-+ $$.buf = strdup(tmp);
-+ if (!$$.buf) {
-+ yyerror("insufficient memory");
-+ return -1;
-+ }
-+ $$.len = strlen(tmp);
-+ }
- ;
-
- context_spec
-Index: ipsec-tools-cvs-HEAD/src/racoon/racoonctl.8
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/racoonctl.8 2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/racoonctl.8 2011-03-29 22:08:44.000000000 +0300
-@@ -158,8 +158,8 @@
- has the following format:
- .Bl -tag -width Bl
- .It isakmp {inet|inet6} Ar src Ar dst
--.It {esp|ah} {inet|inet6} Ar src/prefixlen/port Ar dst/prefixlen/port
--{icmp|tcp|udp|gre|any}
-+.It {esp|ah} {inet|inet6} Ar src/prefixlen/port Ar dst/prefixlen/port \
-+ {icmp|tcp|udp|gre|any} Oo grekey Ar key Oc
- .El
- .It vpn-connect Oo Fl u Ar username Oc Ar vpn_gateway
- This is a particular case of the previous command.
-Index: ipsec-tools-cvs-HEAD/src/racoon/isakmp_quick.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/isakmp_quick.c 2011-03-29 22:18:12.000000000 +0300
-+++ ipsec-tools-cvs-HEAD/src/racoon/isakmp_quick.c 2011-03-30 09:23:13.000000000 +0300
-@@ -2168,6 +2168,8 @@
- goto end;
- }
-
-+ ipsecdoi_normalize_id_uldata(idsrc, iddst);
-+
- #ifdef ENABLE_HYBRID
-
- /* clientaddr check : obtain modecfg address */
-@@ -2494,6 +2496,7 @@
- pref = spidx.prefs;
- spidx.prefs = spidx.prefd;
- spidx.prefd = pref;
-+ spidx_normalize_ulports(&spidx);
-
- sp_out = getsp_r(&spidx);
- if (!sp_out) {
-Index: ipsec-tools-cvs-HEAD/src/racoon/policy.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/policy.c 2011-03-30 08:03:15.000000000 +0300
-+++ ipsec-tools-cvs-HEAD/src/racoon/policy.c 2011-03-30 08:05:23.000000000 +0300
-@@ -444,6 +444,25 @@
- return new;
- }
-
-+void
-+spidx_normalize_ulports(spidx)
-+ struct policyindex *spidx;
-+{
-+ u_int16_t tmp;
-+
-+ switch (spidx->ul_proto) {
-+ case IPPROTO_ICMP:
-+ case IPPROTO_ICMPV6:
-+ case IPPROTO_GRE:
-+ /* Ports are UL specific data, and should not get swapped */
-+ tmp = extract_port((struct sockaddr *) &spidx->src);
-+ set_port((struct sockaddr *) &spidx->src,
-+ extract_port((struct sockaddr *) &spidx->dst));
-+ set_port((struct sockaddr *) &spidx->dst, tmp);
-+ break;
-+ }
-+}
-+
- const char *
- spidx2str(spidx)
- const struct policyindex *spidx;
-Index: ipsec-tools-cvs-HEAD/src/racoon/policy.h
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/policy.h 2011-03-30 08:15:44.000000000 +0300
-+++ ipsec-tools-cvs-HEAD/src/racoon/policy.h 2011-03-30 08:16:21.000000000 +0300
-@@ -156,6 +156,7 @@
- extern void flushsp __P((void));
- extern void initsp __P((void));
- extern struct ipsecrequest *newipsecreq __P((void));
-+extern void spidx_normalize_ulports __P((struct policyindex *));
-
- extern const char *spidx2str __P((const struct policyindex *));
- #ifdef HAVE_SECCTX
diff --git a/main/ipsec-tools/50-reverse-connect.patch b/main/ipsec-tools/50-reverse-connect.patch
deleted file mode 100644
index 54e77a3976..0000000000
--- a/main/ipsec-tools/50-reverse-connect.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-When new ISAKMP is required, allow incoming reverse connection to take
-
-From: Timo Teras <timo.teras@iki.fi>
-
-over pending phase1:s. Useful when the other party is firewalled or NATted.
----
-
- src/racoon/admin.c | 12 ++++++++++++
- src/racoon/evt.c | 13 +++++++++++++
- src/racoon/evt.h | 3 +++
- src/racoon/handler.c | 28 +++++++++++++++++++++-------
- src/racoon/isakmp.c | 39 ++++++++++++++++++++++++++++++++++-----
- 5 files changed, 83 insertions(+), 12 deletions(-)
-
-
-Index: ipsec-tools-cvs-HEAD/src/racoon/admin.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/admin.c 2011-03-03 21:16:47.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/admin.c 2011-03-04 13:50:30.000000000 +0200
-@@ -414,11 +414,23 @@
- struct sockaddr *dst;
- struct sockaddr *src;
- char *name = NULL;
-+ char *loc, *rem;
-
- ndx = (struct admin_com_indexes *) ((caddr_t)com + sizeof(*com));
- src = (struct sockaddr *) &ndx->src;
- dst = (struct sockaddr *) &ndx->dst;
-
-+ loc = racoon_strdup(saddr2str(src));
-+ rem = racoon_strdup(saddr2str(dst));
-+ STRDUP_FATAL(loc);
-+ STRDUP_FATAL(rem);
-+
-+ plog(LLV_INFO, LOCATION, NULL,
-+ "admin establish-sa %x %s %s\n",
-+ com->ac_proto, loc, rem);
-+ racoon_free(loc);
-+ racoon_free(rem);
-+
- if (com->ac_cmd == ADMIN_ESTABLISH_SA &&
- com->ac_len > sizeof(*com) + sizeof(*ndx))
- name = (char *) ((caddr_t) ndx + sizeof(*ndx));
-Index: ipsec-tools-cvs-HEAD/src/racoon/evt.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/evt.c 2011-03-03 19:25:50.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/evt.c 2011-03-04 13:50:30.000000000 +0200
-@@ -396,4 +396,17 @@
- evt_unsubscribe(LIST_FIRST(list));
- }
-
-+void
-+evt_list_move(from, to)
-+ struct evt_listener_list *from, *to;
-+{
-+ struct evt_listener *l;
-+
-+ while (!LIST_EMPTY(from)) {
-+ l = LIST_FIRST(from);
-+ LIST_REMOVE(l, ll_chain);
-+ LIST_INSERT_HEAD(to, l, ll_chain);
-+ }
-+}
-+
- #endif /* ENABLE_ADMINPORT */
-Index: ipsec-tools-cvs-HEAD/src/racoon/evt.h
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/evt.h 2011-03-03 19:25:50.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/evt.h 2011-03-04 13:50:30.000000000 +0200
-@@ -124,6 +124,8 @@
- vchar_t *evt_dump __P((void));
-
- int evt_subscribe __P((struct evt_listener_list *list, int fd));
-+void evt_list_move __P((struct evt_listener_list *from,
-+ struct evt_listener_list *to));
- void evt_list_init __P((struct evt_listener_list *list));
- void evt_list_cleanup __P((struct evt_listener_list *list));
-
-@@ -136,6 +138,7 @@
- #define evt_phase2(ph2, type, optdata) ;
-
- #define evt_subscribe(eventlist, fd) ;
-+#deifne evt_list_move(from, to) ;
- #define evt_list_init(eventlist) ;
- #define evt_list_cleanup(eventlist) ;
- #define evt_get_fdmask(nfds, fdset) nfds
-Index: ipsec-tools-cvs-HEAD/src/racoon/handler.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/handler.c 2011-03-03 19:29:31.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/handler.c 2011-03-04 13:53:01.000000000 +0200
-@@ -292,17 +292,32 @@
- void migrate_dying_ph12(iph1)
- struct ph1handle *iph1;
- {
-- struct ph1handle *p;
-+ struct ph1handle *p, *next;
-
-- LIST_FOREACH(p, &ph1tree, chain) {
-+ for (p = LIST_FIRST(&ph1tree); p; p = next) {
-+ next = LIST_NEXT(p, chain);
- if (p == iph1)
- continue;
-- if (p->status < PHASE1ST_DYING)
-+
-+ /* Same remote? */
-+ if (cmpsaddr(iph1->local, p->local) > CMPSADDR_WOP_MATCH ||
-+ cmpsaddr(iph1->remote, p->remote) > CMPSADDR_WOP_MATCH ||
-+ iph1->rmconf != p->rmconf)
- continue;
-
-- if (cmpsaddr(iph1->local, p->local) == CMPSADDR_MATCH
-- && cmpsaddr(iph1->remote, p->remote) == CMPSADDR_MATCH)
-+ /* migrate phase2:s from expiring entries */
-+ if (p->status >= PHASE1ST_DYING)
- migrate_ph12(p, iph1);
-+
-+ /* and allow reverse connections to release
-+ * pending connections that do not work due
-+ * to firewall or nat */
-+ if (iph1->side == RESPONDER && p->side == INITIATOR &&
-+ p->status < PHASE1ST_MSG3RECEIVED) {
-+ /* Do not delete ph1, since if the node is not NATted,
-+ * and we delete it we might get phase2's lost */
-+ evt_list_move(&p->evt_listeners, &iph1->evt_listeners);
-+ }
- }
- }
-
-Index: ipsec-tools-cvs-HEAD/src/racoon/isakmp.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/isakmp.c 2011-03-03 21:14:13.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/isakmp.c 2011-03-04 13:50:30.000000000 +0200
-@@ -2138,13 +2138,33 @@
-
- remph2(iph2);
- delph2(iph2);
--
-- return;
- }
-
- /* %%%
- * Interface between PF_KEYv2 and ISAKMP
- */
-+
-+static void
-+isakmp_chkph2there(p)
-+ struct sched *p;
-+{
-+ struct ph2handle *iph2 = container_of(p, struct ph2handle, sce);
-+ struct ph2handle *tmp;
-+
-+ /* Check if a similar phase2 appared meanwhile */
-+ remph2(iph2);
-+ tmp = getph2byid(iph2->src, iph2->dst, iph2->spid);
-+ if (tmp == NULL) {
-+ /* Nope, lets start this then */
-+ insph2(iph2);
-+ isakmp_chkph1there(iph2);
-+ } else {
-+ /* Yes, delete this initiation attempt as redundant */
-+ evt_phase2(iph2, EVT_PHASE2_UP, NULL);
-+ delph2(iph2);
-+ }
-+}
-+
- /*
- * receive ACQUIRE from kernel, and begin either phase1 or phase2.
- * if phase1 has been finished, begin phase2.
-@@ -2235,8 +2255,14 @@
- /*NOTREACHED*/
- }
-
-- /* found established ISAKMP-SA */
-- /* i.e. iph1->status == PHASE1ST_ESTABLISHED */
-+ /* found established ISAKMP-SA, if this is a RESPONDER ISAKMP-SA
-+ * add a small delay; this will make sure the initiator gets
-+ * an first attempt at rekeying, and usually avoids duplicate ph2:s */
-+ if (iph1->side == RESPONDER) {
-+ iph2->retry_checkph1 = 1;
-+ sched_schedule(&iph2->sce, 1, isakmp_chkph2there);
-+ return 0;
-+ }
-
- /* found ISAKMP-SA. */
- plog(LLV_DEBUG, LOCATION, NULL, "begin QUICK mode.\n");
-@@ -2403,7 +2429,10 @@
- plog(LLV_DEBUG2, LOCATION, NULL, "dst: %s\n", saddr2str(iph2->dst));
-
- /* begin quick mode */
-- (void)isakmp_ph2begin_i(iph1, iph2);
-+ if (isakmp_ph2begin_i(iph1, iph2)) {
-+ remph2(iph2);
-+ delph2(iph2);
-+ }
- return;
- }
-
diff --git a/main/ipsec-tools/70-defer-isakmp-ident-handling.patch b/main/ipsec-tools/70-defer-isakmp-ident-handling.patch
deleted file mode 100644
index 9be37aa154..0000000000
--- a/main/ipsec-tools/70-defer-isakmp-ident-handling.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-Index: src/racoon/isakmp.c
-===================================================================
-RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/isakmp.c,v
-retrieving revision 1.63
-diff -u -r1.63 isakmp.c
---- a/src/racoon/isakmp.c 21 Oct 2010 06:15:28 -0000 1.63
-+++ b/src/racoon/isakmp.c 29 Oct 2010 10:51:28 -0000
-@@ -130,6 +130,10 @@
- # define SOL_UDP IPPROTO_UDP
- # endif /* __NetBSD__ / __FreeBSD__ */
-
-+vchar_t *postponed_buf;
-+struct sockaddr_storage postponed_remote;
-+struct sockaddr_storage postponed_local;
-+
- static int nostate1 __P((struct ph1handle *, vchar_t *));
- static int nostate2 __P((struct ph2handle *, vchar_t *));
-
-@@ -177,7 +181,7 @@
-
- static u_char r_ck0[] = { 0,0,0,0,0,0,0,0 }; /* used to verify the r_ck. */
-
--static int isakmp_main __P((vchar_t *, struct sockaddr *, struct sockaddr *));
-+/* static int isakmp_main __P((vchar_t *, struct sockaddr *, struct sockaddr *)); */
- static int ph1_main __P((struct ph1handle *, vchar_t *));
- static int quick_main __P((struct ph2handle *, vchar_t *));
- static int isakmp_ph1begin_r __P((vchar_t *,
-@@ -374,10 +378,17 @@
- }
-
- /* isakmp main routine */
-- if (isakmp_main(buf, (struct sockaddr *)&remote,
-- (struct sockaddr *)&local) != 0) goto end;
--
-- error = 0;
-+ res = isakmp_main(buf, (struct sockaddr *)&remote,
-+ (struct sockaddr *)&local);
-+ if (res == 0) {
-+ error = 0;
-+ } else if (res == -42424 && postponed_buf == NULL) {
-+ postponed_buf = buf;
-+ postponed_remote = remote;
-+ postponed_local = local;
-+ buf = NULL;
-+ error = 0;
-+ }
-
- end:
- if (tmpbuf != NULL)
-@@ -390,7 +401,7 @@
- /*
- * main processing to handle isakmp payload
- */
--static int
-+int
- isakmp_main(msg, remote, local)
- vchar_t *msg;
- struct sockaddr *remote, *local;
-@@ -399,6 +410,7 @@
- isakmp_index *index = (isakmp_index *)isakmp;
- u_int32_t msgid = isakmp->msgid;
- struct ph1handle *iph1;
-+ int rc;
-
- #ifdef HAVE_PRINT_ISAKMP_C
- isakmp_printpacket(msg, remote, local, 0);
-@@ -604,12 +616,14 @@
- #endif
-
- /* call main process of phase 1 */
-- if (ph1_main(iph1, msg) < 0) {
-- plog(LLV_ERROR, LOCATION, iph1->remote,
-- "phase1 negotiation failed.\n");
-- remph1(iph1);
-- delph1(iph1);
-- return -1;
-+ if ((rc=ph1_main(iph1, msg)) < 0) {
-+ if (rc != -42424) {
-+ plog(LLV_ERROR, LOCATION, iph1->remote,
-+ "phase1 negotiation failed.\n");
-+ remph1(iph1);
-+ delph1(iph1);
-+ }
-+ return rc;
- }
- break;
-
-@@ -813,10 +827,11 @@
- "failed to pre-process ph1 packet (side: %d, status %d).\n",
- iph1->side, iph1->status);
- return -1;
-- } else {
-- /* ignore the error and keep phase 1 handler */
-- return 0;
- }
-+ if (error == -42424)
-+ return error;
-+ /* ignore the error and keep phase 1 handler */
-+ return 0;
- }
-
- #ifndef ENABLE_FRAG
-Index: src/racoon/isakmp_ident.c
-===================================================================
-RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c,v
-retrieving revision 1.13
-diff -u -r1.13 isakmp_ident.c
---- a/src/racoon/isakmp_ident.c 18 Sep 2009 10:31:11 -0000 1.13
-+++ b/src/racoon/isakmp_ident.c 29 Oct 2010 10:51:29 -0000
-@@ -1128,6 +1128,11 @@
- goto end;
- }
-
-+ if (postponed_buf != msg) {
-+ error = -42424;
-+ goto end;
-+ }
-+
- /* validate the type of next payload */
- pbuf = isakmp_parse(msg);
- if (pbuf == NULL)
-Index: src/racoon/isakmp_var.h
-===================================================================
-RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/isakmp_var.h,v
-retrieving revision 1.16
-diff -u -r1.16 isakmp_var.h
---- a/src/racoon/isakmp_var.h 3 Sep 2009 09:29:07 -0000 1.16
-+++ b/src/racoon/isakmp_var.h 29 Oct 2010 10:51:29 -0000
-@@ -141,4 +141,10 @@
- u_int32_t setscopeid __P((struct sockaddr *, struct sockaddr *));
- #endif
-
-+int isakmp_main __P((vchar_t *, struct sockaddr *, struct sockaddr *));
-+
-+extern vchar_t *postponed_buf;
-+extern struct sockaddr_storage postponed_remote;
-+extern struct sockaddr_storage postponed_local;
-+
- #endif /* _ISAKMP_VAR_H */
-Index: src/racoon/session.c
-===================================================================
-RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/session.c,v
-retrieving revision 1.28
-diff -u -r1.28 session.c
---- a/src/racoon/session.c 21 Oct 2010 06:15:28 -0000 1.28
-+++ b/src/racoon/session.c 29 Oct 2010 10:51:29 -0000
-@@ -172,7 +172,7 @@
- int
- session(void)
- {
-- struct timeval *timeout;
-+ struct timeval *timeout, to_zero = { 0, 0 };
- int error;
- char pid_file[MAXPATHLEN];
- FILE *fp;
-@@ -295,6 +295,8 @@
-
- /* scheduling */
- timeout = schedular();
-+ if (postponed_buf != NULL)
-+ timeout = &to_zero;
-
- /* schedular can change select() mask, so we reset
- * the working copy here */
-@@ -332,6 +334,14 @@
- break;
- }
-
-+ if (count == 0 && postponed_buf != NULL) {
-+ (void) isakmp_main(
-+ postponed_buf,
-+ (struct sockaddr *) &postponed_remote,
-+ (struct sockaddr *) &postponed_local);
-+ vfree(postponed_buf);
-+ postponed_buf = NULL;
-+ }
- }
- }
-
diff --git a/main/ipsec-tools/75-racoonctl-rcvbuf.patch b/main/ipsec-tools/75-racoonctl-rcvbuf.patch
deleted file mode 100644
index 3a68bfc2ae..0000000000
--- a/main/ipsec-tools/75-racoonctl-rcvbuf.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: src/racoon/kmpstat.c
-===================================================================
-RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/kmpstat.c,v
-retrieving revision 1.6
-diff -u -r1.6 kmpstat.c
---- a/src/racoon/kmpstat.c 2 Oct 2007 09:47:45 -0000 1.6
-+++ b/src/racoon/kmpstat.c 14 Oct 2010 12:48:22 -0000
-@@ -99,6 +99,7 @@
- com_init()
- {
- struct sockaddr_un name;
-+ int rcvSize;
-
- memset(&name, 0, sizeof(name));
- name.sun_family = AF_UNIX;
-@@ -114,6 +115,17 @@
- return -1;
- }
-
-+ /* set receive buffer size - should be relative large:
-+ * racoon daemon will try to send all info in one go, if
-+ * it does not fit we'll miss stuff */
-+ rcvSize = 1024 * 1024;
-+ if (setsockopt(so, SOL_SOCKET, SO_RCVBUF,
-+ (void*) &rcvSize, sizeof(rcvSize)) < 0) {
-+ rcvSize = 512 * 1024;
-+ (void) setsockopt(so, SOL_SOCKET, SO_RCVBUF,
-+ (void*) &rcvSize, sizeof(rcvSize));
-+ }
-+
- return 0;
- }
-
diff --git a/main/ipsec-tools/90-dead-on-initial-contact.patch b/main/ipsec-tools/90-dead-on-initial-contact.patch
deleted file mode 100644
index 9554ae3d32..0000000000
--- a/main/ipsec-tools/90-dead-on-initial-contact.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/racoon/isakmp_inf.c 15 Mar 2011 13:20:14 -0000 1.47
-+++ b/src/racoon/isakmp_inf.c 10 Aug 2011 08:42:20 -0000
-@@ -1248,6 +1248,8 @@
- if (f_local)
- return 0;
-
-+ script_hook(iph1, SCRIPT_PHASE1_DEAD);
-+
- #if 0
- loc = racoon_strdup(saddrwop2str(iph1->local));
- rem = racoon_strdup(saddrwop2str(iph1->remote));
diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD
deleted file mode 100644
index 90ae831961..0000000000
--- a/main/ipsec-tools/APKBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=ipsec-tools
-pkgver=0.8.2
-pkgrel=9
-pkgdesc="User-space IPsec tools for various IPsec implementations"
-url="http://ipsec-tools.sourceforge.net/"
-arch="all"
-license="BSD"
-depends=""
-makedepends="linux-headers bsd-compat-headers openssl-dev bison flex
- autoconf automake libtool"
-subpackages="$pkgname-doc $pkgname-dev"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
- racoon.initd
- racoon.confd
- 20-grekey-support.patch
- 50-reverse-connect.patch
- 70-defer-isakmp-ident-handling.patch
- 75-racoonctl-rcvbuf.patch
- 90-dead-on-initial-contact.patch
- musl-cdefs.patch
- fix-yywrap.patch
- ipsec-tools-openssl-1.1.patch
- disable-Werror.patch
- "
-
-builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
- default_prepare
- touch AUTHORS
- autoreconf -vif -I.
-}
-
-build() {
- cd "$builddir"
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --localstatedir=/var/lib \
- --with-kernel-headers=/usr/include \
- --disable-security-context \
- --enable-adminport \
- --enable-dpd \
- --enable-frag \
- --enable-hybrid \
- --enable-ipv6 \
- --enable-natt
- make
-}
-
-package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
-
- install -D -m755 ../racoon.initd "$pkgdir"/etc/init.d/racoon
- install -D -m644 ../racoon.confd "$pkgdir"/etc/conf.d/racoon
-}
-
-sha512sums="6cf4f1da7b461127e75f87fba8349f46b879f8bca179ae1cb27b2e011045753460c5edddbe8ba5892d6a28a021a0a01a9ff9fdb0f5da451519859570d748b9f2 ipsec-tools-0.8.2.tar.gz
-2a5e723779be12dce45fc315a948b440fbf7fba9547b7c0a019d31a529a52d694b09ab823af8bd36aa15b6ad5c059fdd7650620ed6647f1b730fdf6a105b7ca6 racoon.initd
-61c285e63a21e4162efa058d91cc061ad0a8387a7e6f654151f31bac757cdd250247c1be6776e1f04edea223dfb56d015285459ab5bbfd6218bfe3e51b861576 racoon.confd
-22b79d5906dd4c5e740655303fe88fbdc2596cfbd057347cc303f8cfdd22f83fe61098613127d78030e3098335be83f46fe6d4dd5c2ebc8dd93ed94b7904812c 20-grekey-support.patch
-2e111e0388a5e94ffa87483eac8c0b38fff1ba44d79c3db7438b3d03010db6334861acffecf044ebd3953f062230b528c34a05d38cf6831f5ebece0a307fb776 50-reverse-connect.patch
-00ea3fb4b2ac91a550aaaffe53a29cc22f37f713052e2c5aee1bada6bcbc55b55ebe577f3df1ab09b314e99a45fd322152c2858263173cff17ff17993007b042 70-defer-isakmp-ident-handling.patch
-b65fbb7b8af6863f6dcb0b1cf5a6c856deb62a50f2b19455740340c4c453f5800335bc3b89509de06fc9bc21aa8db16f9eff579aa10b0762bb649ab891a06bfb 75-racoonctl-rcvbuf.patch
-9719f7854ff5d37cb927fc6dd23241ade2c031ae7f3eaf14b41613c3f2139c7a237c739cc1df50a954b349f1c75e0992302cce6a7a551c139f4b9c5fcd376b1b 90-dead-on-initial-contact.patch
-3794055d05883ea4c0cb4822248373c2e1e37e871ef8cd9ede07ad3d212422342e9ebefb4684e312793f0c509b9e35c0ad7c6453baadc33fbd5fc01e5fc96de9 musl-cdefs.patch
-568e64288e4c15fc0b1221ce9fa2e88c234e36d5c1e366b8c52b39171aa319d99843817c1d3c0b8517b638474289e4a113220903f319806a6365115585feffc0 fix-yywrap.patch
-60c50aa09753d22c6572661058b42dca8bbb43dc3f64519ef9ad808b8b3d4a5bcfc31d5e0af70e3d71e89c589c901c1da07ad96a2663bdb21557dad7b5aa732d ipsec-tools-openssl-1.1.patch
-45cd7c76e2b8ded08fc0e3d73e14ed12fdac02be091db9a9ea25d753d655c40c3facc4ce7376bfc4316fc921bd979c686114c31c77a8465aa38f55c2edff775b disable-Werror.patch"
diff --git a/main/ipsec-tools/disable-Werror.patch b/main/ipsec-tools/disable-Werror.patch
deleted file mode 100644
index 30c0ab3b68..0000000000
--- a/main/ipsec-tools/disable-Werror.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 8506245..f00afd0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -18,7 +18,7 @@ AM_PROG_LEX
- AC_SUBST(LEXLIB)
- AC_PROG_EGREP
-
--CFLAGS_ADD="$CFLAGS_ADD -Wall -Werror -Wno-unused"
-+CFLAGS_ADD="$CFLAGS_ADD -Wall -Wno-unused"
-
- case $host in
- *netbsd*)
-@@ -131,7 +131,7 @@ RACOON_CHECK_VA_COPY
- # Check if printf accepts "%z" type modifier for size_t argument
- AC_MSG_CHECKING(if printf accepts %z)
- saved_CFLAGS=$CFLAGS
--CFLAGS="$CFLAGS -Wall -Werror"
-+CFLAGS="$CFLAGS -Wall "
- AC_TRY_COMPILE([
- #include <stdio.h>
- ], [
-@@ -433,7 +433,7 @@ if test "$libldap_dir" != "no"; then
- LIBS="$LIBS -L$libldap_dir/lib -R$libldap_dir/lib -lldap"
-
- saved_CFLAGS=$CFLAGS
-- CFLAGS="$CFLAGS -Wall -Werror"
-+ CFLAGS="$CFLAGS -Wall "
- saved_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD"
- AC_TRY_COMPILE(
-@@ -484,7 +484,7 @@ if test "x$enable_gssapi" = "xyes"; then
-
- # Check if iconv 2nd argument needs const
- saved_CFLAGS=$CFLAGS
-- CFLAGS="$CFLAGS -Wall -Werror"
-+ CFLAGS="$CFLAGS -Wall "
- saved_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD"
- AC_CHECK_HEADER([iconv.h], [], [AC_MSG_ERROR([iconv.h not found, but needed for GSSAPI support. Aborting.])])
diff --git a/main/ipsec-tools/fix-yywrap.patch b/main/ipsec-tools/fix-yywrap.patch
deleted file mode 100644
index 0a9ff37492..0000000000
--- a/main/ipsec-tools/fix-yywrap.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- ipsec-tools-0.8.2.orig/src/racoon/cftoken.l 2014-04-15 14:47:11.000000000 -0300
-+++ ipsec-tools-0.8.2/src/racoon/cftoken.l 2014-04-15 18:49:14.589422339 -0300
-@@ -110,6 +110,8 @@
- static int yy_first_time = 1;
- %}
-
-+%option noyywrap
-+
- /* common seciton */
- nl \n
- ws [ \t]+
-diff -ru ipsec-tools-0.8.2.orig/src/setkey/token.l ipsec-tools-0.8.2/src/setkey/token.l
---- ipsec-tools-0.8.2.orig/src/setkey/token.l 2012-08-23 14:10:46.000000000 -0300
-+++ ipsec-tools-0.8.2/src/setkey/token.l 2014-04-15 18:48:11.023100041 -0300
-@@ -111,7 +111,7 @@
-
- %s S_PL S_AUTHALG S_ENCALG
-
--%option noinput nounput
-+%option noinput nounput noyywrap
- %%
-
-
diff --git a/main/ipsec-tools/ipsec-tools-openssl-1.1.patch b/main/ipsec-tools/ipsec-tools-openssl-1.1.patch
deleted file mode 100644
index 3861f34ead..0000000000
--- a/main/ipsec-tools/ipsec-tools-openssl-1.1.patch
+++ /dev/null
@@ -1,1085 +0,0 @@
-This patch updates the calls to openssl 1.1 API, and adds a
-compatibility layer so it compiles with (at least) openssl 1.0.2, I
-haven't tested it with lower versions, but all that's needed is to edit
-the openssl_compat.* files and add the missing functions there--they're
-usually trivial.
-
-Signed-off-by: Eneas U de Queiroz <cote2004-github@...>
----
- src/racoon/Makefile.am | 10 +--
- src/racoon/algorithm.c | 6 +-
- src/racoon/cfparse.y | 2 +-
- src/racoon/crypto_openssl.c | 197 +++++++++++++++++++++-------------------
- src/racoon/crypto_openssl.h | 2 +-
- src/racoon/eaytest.c | 7 +-
- src/racoon/ipsec_doi.c | 2 +-
- src/racoon/openssl_compat.c | 213 ++++++++++++++++++++++++++++++++++++++++++++
- src/racoon/openssl_compat.h | 45 ++++++++++
- src/racoon/plainrsa-gen.c | 41 +++++----
- src/racoon/prsa_par.y | 28 ++++--
- src/racoon/rsalist.c | 5 +-
- 12 files changed, 431 insertions(+), 127 deletions(-)
- create mode 100644 src/racoon/openssl_compat.c
- create mode 100644 src/racoon/openssl_compat.h
-
-diff --git a/src/racoon/Makefile.am b/src/racoon/Makefile.am
-index dbaded9..4c585f3 100644
---- a/src/racoon/Makefile.am
-+++ b/src/racoon/Makefile.am
-@@ -4,7 +4,7 @@ sbin_PROGRAMS = racoon racoonctl plainrsa-gen
- noinst_PROGRAMS = eaytest
- include_racoon_HEADERS = racoonctl.h var.h vmbuf.h misc.h gcmalloc.h admin.h \
- schedule.h sockmisc.h isakmp_var.h isakmp.h isakmp_xauth.h \
-- isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h
-+ isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h openssl_compat.h
- lib_LTLIBRARIES = libracoon.la
-
- adminsockdir=${localstatedir}/racoon
-@@ -32,7 +32,7 @@ racoon_SOURCES = \
- gssapi.c dnssec.c getcertsbyname.c privsep.c \
- pfkey.c admin.c evt.c ipsec_doi.c oakley.c grabmyaddr.c vendorid.c \
- policy.c localconf.c remoteconf.c crypto_openssl.c algorithm.c \
-- proposal.c sainfo.c strnames.c \
-+ openssl_compat.c proposal.c sainfo.c strnames.c \
- plog.c logger.c schedule.c str2val.c \
- safefile.c backupsa.c genlist.c rsalist.c \
- cftoken.l cfparse.y prsa_tok.l prsa_par.y
-@@ -51,12 +51,12 @@ libracoon_la_SOURCES = kmpstat.c vmbuf.c sockmisc.c misc.c
- libracoon_la_CFLAGS = -DNOUSE_PRIVSEP $(AM_CFLAGS)
-
- plainrsa_gen_SOURCES = plainrsa-gen.c plog.c \
-- crypto_openssl.c logger.c
-+ crypto_openssl.c logger.c openssl_compat.c
- EXTRA_plainrsa_gen_SOURCES = $(MISSING_ALGOS)
- plainrsa_gen_LDADD = $(CRYPTOBJS) vmbuf.o misc.o
- plainrsa_gen_DEPENDENCIES = $(CRYPTOBJS) vmbuf.o misc.o
-
--eaytest_SOURCES = eaytest.c plog.c logger.c
-+eaytest_SOURCES = eaytest.c plog.c logger.c openssl_compat.c
- EXTRA_eaytest_SOURCES = missing/crypto/sha2/sha2.c
- eaytest_LDADD = crypto_openssl_test.o vmbuf.o str2val.o misc_noplog.o \
- $(CRYPTOBJS)
-@@ -75,7 +75,7 @@ noinst_HEADERS = \
- debugrm.h isakmp.h misc.h sainfo.h \
- dhgroup.h isakmp_agg.h netdb_dnssec.h schedule.h \
- isakmp_cfg.h isakmp_xauth.h isakmp_unity.h isakmp_frag.h \
-- throttle.h privsep.h \
-+ throttle.h privsep.h openssl_compat.h \
- cfparse_proto.h cftoken_proto.h genlist.h rsalist.h \
- missing/crypto/sha2/sha2.h missing/crypto/rijndael/rijndael_local.h \
- missing/crypto/rijndael/rijndael-api-fst.h \
-diff --git a/src/racoon/algorithm.c b/src/racoon/algorithm.c
-index 3fd50f6..66c874b 100644
---- a/src/racoon/algorithm.c
-+++ b/src/racoon/algorithm.c
-@@ -128,7 +128,7 @@ static struct enc_algorithm oakley_encdef[] = {
- { "aes", algtype_aes, OAKLEY_ATTR_ENC_ALG_AES, 16,
- eay_aes_encrypt, eay_aes_decrypt,
- eay_aes_weakkey, eay_aes_keylen, },
--#ifdef HAVE_OPENSSL_CAMELLIA_H
-+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA)
- { "camellia", algtype_camellia, OAKLEY_ATTR_ENC_ALG_CAMELLIA, 16,
- eay_camellia_encrypt, eay_camellia_decrypt,
- eay_camellia_weakkey, eay_camellia_keylen, },
-@@ -168,7 +168,7 @@ static struct enc_algorithm ipsec_encdef[] = {
- { "twofish", algtype_twofish, IPSECDOI_ESP_TWOFISH, 16,
- NULL, NULL,
- NULL, eay_twofish_keylen, },
--#ifdef HAVE_OPENSSL_IDEA_H
-+#if defined(HAVE_OPENSSL_IDEA_H) && ! defined(OPENSSL_NO_IDEA)
- { "3idea", algtype_3idea, IPSECDOI_ESP_3IDEA, 8,
- NULL, NULL,
- NULL, NULL, },
-@@ -179,7 +179,7 @@ static struct enc_algorithm ipsec_encdef[] = {
- { "rc4", algtype_rc4, IPSECDOI_ESP_RC4, 8,
- NULL, NULL,
- NULL, NULL, },
--#ifdef HAVE_OPENSSL_CAMELLIA_H
-+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA)
- { "camellia", algtype_camellia, IPSECDOI_ESP_CAMELLIA, 16,
- NULL, NULL,
- NULL, eay_camellia_keylen, },
-diff --git a/src/racoon/cfparse.y b/src/racoon/cfparse.y
-index 0d9bd67..8415752 100644
---- a/src/racoon/cfparse.y
-+++ b/src/racoon/cfparse.y
-@@ -2564,7 +2564,7 @@ set_isakmp_proposal(rmconf)
- plog(LLV_DEBUG2, LOCATION, NULL,
- "encklen=%d\n", s->encklen);
-
-- memset(types, 0, ARRAYLEN(types));
-+ memset(types, 0, sizeof types);
- types[algclass_isakmp_enc] = s->algclass[algclass_isakmp_enc];
- types[algclass_isakmp_hash] = s->algclass[algclass_isakmp_hash];
- types[algclass_isakmp_dh] = s->algclass[algclass_isakmp_dh];
-diff --git a/src/racoon/crypto_openssl.c b/src/racoon/crypto_openssl.c
-index 55b076a..8fb358f 100644
---- a/src/racoon/crypto_openssl.c
-+++ b/src/racoon/crypto_openssl.c
-@@ -90,6 +90,7 @@
- #endif
- #endif
- #include "plog.h"
-+#include "openssl_compat.h"
-
- #define USE_NEW_DES_API
-
-@@ -316,9 +317,12 @@ eay_cmp_asn1dn(n1, n2)
- i = idx+1;
- goto end;
- }
-- if ((ea->value->length == 1 && ea->value->data[0] == '*') ||
-- (eb->value->length == 1 && eb->value->data[0] == '*')) {
-- if (OBJ_cmp(ea->object,eb->object)) {
-+ ASN1_STRING *sa = X509_NAME_ENTRY_get_data(ea);
-+ ASN1_STRING *sb = X509_NAME_ENTRY_get_data(eb);
-+ if ((ASN1_STRING_length(sa) == 1 && ASN1_STRING_get0_data(sa)[0] == '*') ||
-+ (ASN1_STRING_length(sb) == 1 && ASN1_STRING_get0_data(sb)[0] == '*')) {
-+ if (OBJ_cmp(X509_NAME_ENTRY_get_object(ea),
-+ X509_NAME_ENTRY_get_object(eb))) {
- i = idx+1;
- goto end;
- }
-@@ -430,7 +434,7 @@ cb_check_cert_local(ok, ctx)
-
- if (!ok) {
- X509_NAME_oneline(
-- X509_get_subject_name(ctx->current_cert),
-+ X509_get_subject_name(X509_STORE_CTX_get_current_cert(ctx)),
- buf,
- 256);
- /*
-@@ -438,7 +442,8 @@ cb_check_cert_local(ok, ctx)
- * ok if they are self signed. But we should still warn
- * the user.
- */
-- switch (ctx->error) {
-+ int ctx_error = X509_STORE_CTX_get_error(ctx);
-+ switch (ctx_error) {
- case X509_V_ERR_CERT_HAS_EXPIRED:
- case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
- case X509_V_ERR_INVALID_CA:
-@@ -453,9 +458,9 @@ cb_check_cert_local(ok, ctx)
- }
- plog(log_tag, LOCATION, NULL,
- "%s(%d) at depth:%d SubjectName:%s\n",
-- X509_verify_cert_error_string(ctx->error),
-- ctx->error,
-- ctx->error_depth,
-+ X509_verify_cert_error_string(ctx_error),
-+ ctx_error,
-+ X509_STORE_CTX_get_error_depth(ctx),
- buf);
- }
- ERR_clear_error();
-@@ -477,10 +482,11 @@ cb_check_cert_remote(ok, ctx)
-
- if (!ok) {
- X509_NAME_oneline(
-- X509_get_subject_name(ctx->current_cert),
-+ X509_get_subject_name(X509_STORE_CTX_get_current_cert(ctx)),
- buf,
- 256);
-- switch (ctx->error) {
-+ int ctx_error=X509_STORE_CTX_get_error(ctx);
-+ switch (ctx_error) {
- case X509_V_ERR_UNABLE_TO_GET_CRL:
- ok = 1;
- log_tag = LLV_WARNING;
-@@ -490,9 +496,9 @@ cb_check_cert_remote(ok, ctx)
- }
- plog(log_tag, LOCATION, NULL,
- "%s(%d) at depth:%d SubjectName:%s\n",
-- X509_verify_cert_error_string(ctx->error),
-- ctx->error,
-- ctx->error_depth,
-+ X509_verify_cert_error_string(ctx_error),
-+ ctx_error,
-+ X509_STORE_CTX_get_error_depth(ctx),
- buf);
- }
- ERR_clear_error();
-@@ -516,14 +522,15 @@ eay_get_x509asn1subjectname(cert)
- if (x509 == NULL)
- goto error;
-
-+ X509_NAME *subject_name = X509_get_subject_name(x509);
- /* get the length of the name */
-- len = i2d_X509_NAME(x509->cert_info->subject, NULL);
-+ len = i2d_X509_NAME(subject_name, NULL);
- name = vmalloc(len);
- if (!name)
- goto error;
- /* get the name */
- bp = (unsigned char *) name->v;
-- len = i2d_X509_NAME(x509->cert_info->subject, &bp);
-+ len = i2d_X509_NAME(subject_name, &bp);
-
- X509_free(x509);
-
-@@ -661,15 +668,16 @@ eay_get_x509asn1issuername(cert)
- if (x509 == NULL)
- goto error;
-
-+ X509_NAME *issuer_name = X509_get_issuer_name(x509);
- /* get the length of the name */
-- len = i2d_X509_NAME(x509->cert_info->issuer, NULL);
-+ len = i2d_X509_NAME(issuer_name, NULL);
- name = vmalloc(len);
- if (name == NULL)
- goto error;
-
- /* get the name */
- bp = (unsigned char *) name->v;
-- len = i2d_X509_NAME(x509->cert_info->issuer, &bp);
-+ len = i2d_X509_NAME(issuer_name, &bp);
-
- X509_free(x509);
-
-@@ -850,7 +858,7 @@ eay_check_x509sign(source, sig, cert)
- return -1;
- }
-
-- res = eay_rsa_verify(source, sig, evp->pkey.rsa);
-+ res = eay_rsa_verify(source, sig, EVP_PKEY_get0_RSA(evp));
-
- EVP_PKEY_free(evp);
- X509_free(x509);
-@@ -992,7 +1000,7 @@ eay_get_x509sign(src, privkey)
- if (evp == NULL)
- return NULL;
-
-- sig = eay_rsa_sign(src, evp->pkey.rsa);
-+ sig = eay_rsa_sign(src, EVP_PKEY_get0_RSA(evp));
-
- EVP_PKEY_free(evp);
-
-@@ -1079,7 +1087,11 @@ eay_strerror()
- int line, flags;
- unsigned long es;
-
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+ es = 0; /* even when allowed by OPENSSL_API_COMPAT, it is defined as 0 */
-+#else
- es = CRYPTO_thread_id();
-+#endif
-
- while ((l = ERR_get_error_line_data(&file, &line, &data, &flags)) != 0){
- n = snprintf(ebuf + len, sizeof(ebuf) - len,
-@@ -1100,7 +1112,7 @@ vchar_t *
- evp_crypt(vchar_t *data, vchar_t *key, vchar_t *iv, const EVP_CIPHER *e, int enc)
- {
- vchar_t *res;
-- EVP_CIPHER_CTX ctx;
-+ EVP_CIPHER_CTX *ctx;
-
- if (!e)
- return NULL;
-@@ -1111,7 +1123,7 @@ evp_crypt(vchar_t *data, vchar_t *key, vchar_t *iv, const EVP_CIPHER *e, int enc
- if ((res = vmalloc(data->l)) == NULL)
- return NULL;
-
-- EVP_CIPHER_CTX_init(&ctx);
-+ ctx = EVP_CIPHER_CTX_new();
-
- switch(EVP_CIPHER_nid(e)){
- case NID_bf_cbc:
-@@ -1125,54 +1137,41 @@ evp_crypt(vchar_t *data, vchar_t *key, vchar_t *iv, const EVP_CIPHER *e, int enc
- /* XXX: can we do that also for algos with a fixed key size ?
- */
- /* init context without key/iv
-- */
-- if (!EVP_CipherInit(&ctx, e, NULL, NULL, enc))
-- {
-- OpenSSL_BUG();
-- vfree(res);
-- return NULL;
-- }
-+ */
-+ if (!EVP_CipherInit(ctx, e, NULL, NULL, enc))
-+ goto out;
-
-- /* update key size
-- */
-- if (!EVP_CIPHER_CTX_set_key_length(&ctx, key->l))
-- {
-- OpenSSL_BUG();
-- vfree(res);
-- return NULL;
-- }
--
-- /* finalize context init with desired key size
-- */
-- if (!EVP_CipherInit(&ctx, NULL, (u_char *) key->v,
-+ /* update key size
-+ */
-+ if (!EVP_CIPHER_CTX_set_key_length(ctx, key->l))
-+ goto out;
-+
-+ /* finalize context init with desired key size
-+ */
-+ if (!EVP_CipherInit(ctx, NULL, (u_char *) key->v,
- (u_char *) iv->v, enc))
-- {
-- OpenSSL_BUG();
-- vfree(res);
-- return NULL;
-- }
-+ goto out;
- break;
- default:
-- if (!EVP_CipherInit(&ctx, e, (u_char *) key->v,
-- (u_char *) iv->v, enc)) {
-- OpenSSL_BUG();
-- vfree(res);
-- return NULL;
-- }
-+ if (!EVP_CipherInit(ctx, e, (u_char *) key->v,
-+ (u_char *) iv->v, enc))
-+ goto out;
- }
-
- /* disable openssl padding */
-- EVP_CIPHER_CTX_set_padding(&ctx, 0);
-+ EVP_CIPHER_CTX_set_padding(ctx, 0);
-
-- if (!EVP_Cipher(&ctx, (u_char *) res->v, (u_char *) data->v, data->l)) {
-- OpenSSL_BUG();
-- vfree(res);
-- return NULL;
-- }
-+ if (!EVP_Cipher(ctx, (u_char *) res->v, (u_char *) data->v, data->l))
-+ goto out;
-
-- EVP_CIPHER_CTX_cleanup(&ctx);
-+ EVP_CIPHER_CTX_free(ctx);
-
- return res;
-+out:
-+ EVP_CIPHER_CTX_free(ctx);
-+ OpenSSL_BUG();
-+ vfree(res);
-+ return NULL;
- }
-
- int
-@@ -1230,7 +1229,7 @@ eay_des_keylen(len)
- return evp_keylen(len, EVP_des_cbc());
- }
-
--#ifdef HAVE_OPENSSL_IDEA_H
-+#if defined(HAVE_OPENSSL_IDEA_H) && ! defined(OPENSSL_NO_IDEA)
- /*
- * IDEA-CBC
- */
-@@ -1587,7 +1586,7 @@ eay_aes_keylen(len)
- return len;
- }
-
--#if defined(HAVE_OPENSSL_CAMELLIA_H)
-+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA)
- /*
- * CAMELLIA-CBC
- */
-@@ -1680,9 +1679,9 @@ eay_hmac_init(key, md)
- vchar_t *key;
- const EVP_MD *md;
- {
-- HMAC_CTX *c = racoon_malloc(sizeof(*c));
-+ HMAC_CTX *c = HMAC_CTX_new();
-
-- HMAC_Init(c, key->v, key->l, md);
-+ HMAC_Init_ex(c, key->v, key->l, md, NULL);
-
- return (caddr_t)c;
- }
-@@ -1761,8 +1760,7 @@ eay_hmacsha2_512_final(c)
-
- HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
- res->l = l;
-- HMAC_cleanup((HMAC_CTX *)c);
-- (void)racoon_free(c);
-+ HMAC_CTX_free((HMAC_CTX *)c);
-
- if (SHA512_DIGEST_LENGTH != res->l) {
- plog(LLV_ERROR, LOCATION, NULL,
-@@ -1811,8 +1809,7 @@ eay_hmacsha2_384_final(c)
-
- HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
- res->l = l;
-- HMAC_cleanup((HMAC_CTX *)c);
-- (void)racoon_free(c);
-+ HMAC_CTX_free((HMAC_CTX *)c);
-
- if (SHA384_DIGEST_LENGTH != res->l) {
- plog(LLV_ERROR, LOCATION, NULL,
-@@ -1861,8 +1858,7 @@ eay_hmacsha2_256_final(c)
-
- HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
- res->l = l;
-- HMAC_cleanup((HMAC_CTX *)c);
-- (void)racoon_free(c);
-+ HMAC_CTX_free((HMAC_CTX *)c);
-
- if (SHA256_DIGEST_LENGTH != res->l) {
- plog(LLV_ERROR, LOCATION, NULL,
-@@ -1912,8 +1908,7 @@ eay_hmacsha1_final(c)
-
- HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
- res->l = l;
-- HMAC_cleanup((HMAC_CTX *)c);
-- (void)racoon_free(c);
-+ HMAC_CTX_free((HMAC_CTX *)c);
-
- if (SHA_DIGEST_LENGTH != res->l) {
- plog(LLV_ERROR, LOCATION, NULL,
-@@ -1962,8 +1957,7 @@ eay_hmacmd5_final(c)
-
- HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
- res->l = l;
-- HMAC_cleanup((HMAC_CTX *)c);
-- (void)racoon_free(c);
-+ HMAC_CTX_free((HMAC_CTX *)c);
-
- if (MD5_DIGEST_LENGTH != res->l) {
- plog(LLV_ERROR, LOCATION, NULL,
-@@ -2266,6 +2260,7 @@ eay_dh_generate(prime, g, publen, pub, priv)
- u_int32_t g;
- {
- BIGNUM *p = NULL;
-+ BIGNUM *BNg = NULL;
- DH *dh = NULL;
- int error = -1;
-
-@@ -2276,25 +2271,28 @@ eay_dh_generate(prime, g, publen, pub, priv)
-
- if ((dh = DH_new()) == NULL)
- goto end;
-- dh->p = p;
-- p = NULL; /* p is now part of dh structure */
-- dh->g = NULL;
-- if ((dh->g = BN_new()) == NULL)
-+ if ((BNg = BN_new()) == NULL)
- goto end;
-- if (!BN_set_word(dh->g, g))
-+ if (!BN_set_word(BNg, g))
- goto end;
-+ if (! DH_set0_pqg(dh, p, NULL, BNg))
-+ goto end;
-+ BNg = NULL;
-+ p = NULL; /* p is now part of dh structure */
-
- if (publen != 0)
-- dh->length = publen;
-+ DH_set_length(dh, publen);
-
- /* generate public and private number */
- if (!DH_generate_key(dh))
- goto end;
-
- /* copy results to buffers */
-- if (eay_bn2v(pub, dh->pub_key) < 0)
-+ BIGNUM *pub_key, *priv_key;
-+ DH_get0_key(dh, (const BIGNUM**) &pub_key, (const BIGNUM**) &priv_key);
-+ if (eay_bn2v(pub, pub_key) < 0)
- goto end;
-- if (eay_bn2v(priv, dh->priv_key) < 0) {
-+ if (eay_bn2v(priv, priv_key) < 0) {
- vfree(*pub);
- goto end;
- }
-@@ -2306,6 +2304,8 @@ end:
- DH_free(dh);
- if (p != 0)
- BN_free(p);
-+ if (BNg != 0)
-+ BN_free(BNg);
- return(error);
- }
-
-@@ -2319,6 +2319,10 @@ eay_dh_compute(prime, g, pub, priv, pub2, key)
- int l;
- unsigned char *v = NULL;
- int error = -1;
-+ BIGNUM *p = BN_new();
-+ BIGNUM *BNg = BN_new();
-+ BIGNUM *pub_key = BN_new();
-+ BIGNUM *priv_key = BN_new();
-
- /* make public number to compute */
- if (eay_v2bn(&dh_pub, pub2) < 0)
-@@ -2327,19 +2331,21 @@ eay_dh_compute(prime, g, pub, priv, pub2, key)
- /* make DH structure */
- if ((dh = DH_new()) == NULL)
- goto end;
-- if (eay_v2bn(&dh->p, prime) < 0)
-+ if (p == NULL || BNg == NULL || pub_key == NULL || priv_key == NULL)
- goto end;
-- if (eay_v2bn(&dh->pub_key, pub) < 0)
-+
-+ if (eay_v2bn(&p, prime) < 0)
- goto end;
-- if (eay_v2bn(&dh->priv_key, priv) < 0)
-+ if (eay_v2bn(&pub_key, pub) < 0)
- goto end;
-- dh->length = pub2->l * 8;
--
-- dh->g = NULL;
-- if ((dh->g = BN_new()) == NULL)
-+ if (eay_v2bn(&priv_key, priv) < 0)
- goto end;
-- if (!BN_set_word(dh->g, g))
-+ if (!BN_set_word(BNg, g))
- goto end;
-+ DH_set0_key(dh, pub_key, priv_key);
-+ DH_set_length(dh, pub2->l * 8);
-+ DH_set0_pqg(dh, p, NULL, BNg);
-+ pub_key = priv_key = p = BNg = NULL;
-
- if ((v = racoon_calloc(prime->l, sizeof(u_char))) == NULL)
- goto end;
-@@ -2350,6 +2356,14 @@ eay_dh_compute(prime, g, pub, priv, pub2, key)
- error = 0;
-
- end:
-+ if (p != NULL)
-+ BN_free(p);
-+ if (BNg != NULL)
-+ BN_free(BNg);
-+ if (pub_key != NULL)
-+ BN_free(pub_key);
-+ if (priv_key != NULL)
-+ BN_free(priv_key);
- if (dh_pub != NULL)
- BN_free(dh_pub);
- if (dh != NULL)
-@@ -2400,12 +2414,14 @@ eay_bn2v(var, bn)
- void
- eay_init()
- {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- OpenSSL_add_all_algorithms();
- ERR_load_crypto_strings();
- #ifdef HAVE_OPENSSL_ENGINE_H
- ENGINE_load_builtin_engines();
- ENGINE_register_all_complete();
- #endif
-+#endif
- }
-
- vchar_t *
-@@ -2504,8 +2520,7 @@ binbuf_pubkey2rsa(vchar_t *binbuf)
- goto out;
- }
-
-- rsa_pub->n = mod;
-- rsa_pub->e = exp;
-+ RSA_set0_key(rsa_pub, mod, exp, NULL);
-
- out:
- return rsa_pub;
-@@ -2582,5 +2597,5 @@ eay_random()
- const char *
- eay_version()
- {
-- return SSLeay_version(SSLEAY_VERSION);
-+ return OpenSSL_version(OPENSSL_VERSION);
- }
-diff --git a/src/racoon/crypto_openssl.h b/src/racoon/crypto_openssl.h
-index 66fac73..ee5b765 100644
---- a/src/racoon/crypto_openssl.h
-+++ b/src/racoon/crypto_openssl.h
-@@ -124,7 +124,7 @@ extern vchar_t *eay_aes_decrypt __P((vchar_t *, vchar_t *, vchar_t *));
- extern int eay_aes_weakkey __P((vchar_t *));
- extern int eay_aes_keylen __P((int));
-
--#if defined(HAVE_OPENSSL_CAMELLIA_H)
-+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA)
- /* Camellia */
- extern vchar_t *eay_camellia_encrypt __P((vchar_t *, vchar_t *, vchar_t *));
- extern vchar_t *eay_camellia_decrypt __P((vchar_t *, vchar_t *, vchar_t *));
-diff --git a/src/racoon/eaytest.c b/src/racoon/eaytest.c
-index 1474bdc..ae09db3 100644
---- a/src/racoon/eaytest.c
-+++ b/src/racoon/eaytest.c
-@@ -62,6 +62,7 @@
- #include "dhgroup.h"
- #include "crypto_openssl.h"
- #include "gnuc.h"
-+#include "openssl_compat.h"
-
- #include "package_version.h"
-
-@@ -103,7 +104,7 @@ rsa_verify_with_pubkey(src, sig, pubkey_txt)
- printf ("PEM_read_PUBKEY(): %s\n", eay_strerror());
- return -1;
- }
-- error = eay_check_rsasign(src, sig, evp->pkey.rsa);
-+ error = eay_check_rsasign(src, sig, EVP_PKEY_get0_RSA(evp));
-
- return error;
- }
-@@ -698,7 +699,7 @@ ciphertest(ac, av)
- eay_cast_encrypt, eay_cast_decrypt) < 0)
- return -1;
-
--#ifdef HAVE_OPENSSL_IDEA_H
-+#if defined(HAVE_OPENSSL_IDEA_H) && ! defined(OPENSSL_NO_IDEA)
- if (ciphertest_1 ("IDEA",
- &data, 8,
- &key, key.l,
-@@ -715,7 +716,7 @@ ciphertest(ac, av)
- eay_rc5_encrypt, eay_rc5_decrypt) < 0)
- return -1;
- #endif
--#if defined(HAVE_OPENSSL_CAMELLIA_H)
-+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA)
- if (ciphertest_1 ("CAMELLIA",
- &data, 16,
- &key, key.l,
-diff --git a/src/racoon/ipsec_doi.c b/src/racoon/ipsec_doi.c
-index 84a4c71..b52469f 100644
---- a/src/racoon/ipsec_doi.c
-+++ b/src/racoon/ipsec_doi.c
-@@ -715,7 +715,7 @@ out:
- /* key length must not be specified on some algorithms */
- if (keylen) {
- if (sa->enctype == OAKLEY_ATTR_ENC_ALG_DES
--#ifdef HAVE_OPENSSL_IDEA_H
-+#if defined(HAVE_OPENSSL_IDEA_H) && ! defined(OPENSSL_NO_IDEA)
- || sa->enctype == OAKLEY_ATTR_ENC_ALG_IDEA
- #endif
- || sa->enctype == OAKLEY_ATTR_ENC_ALG_3DES) {
-diff --git a/src/racoon/openssl_compat.c b/src/racoon/openssl_compat.c
-new file mode 100644
-index 0000000..864b5fb
---- /dev/null
-+++ b/src/racoon/openssl_compat.c
-@@ -0,0 +1,213 @@
-+/*
-+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
-+ *
-+ * Licensed under the OpenSSL license (the "License"). You may not use
-+ * this file except in compliance with the License. You can obtain a copy
-+ * in the file LICENSE in the source distribution or at
-+ * https://www.openssl.org/source/license.html
-+ */
-+
-+#include "openssl_compat.h"
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+
-+#include <string.h>
-+
-+static void *OPENSSL_zalloc(size_t num)
-+{
-+ void *ret = OPENSSL_malloc(num);
-+
-+ if (ret != NULL)
-+ memset(ret, 0, num);
-+ return ret;
-+}
-+
-+int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-+{
-+ /* If the fields n and e in r are NULL, the corresponding input
-+ * parameters MUST be non-NULL for n and e. d may be
-+ * left NULL (in case only the public key is used).
-+ */
-+ if ((r->n == NULL && n == NULL)
-+ || (r->e == NULL && e == NULL))
-+ return 0;
-+
-+ if (n != NULL) {
-+ BN_free(r->n);
-+ r->n = n;
-+ }
-+ if (e != NULL) {
-+ BN_free(r->e);
-+ r->e = e;
-+ }
-+ if (d != NULL) {
-+ BN_free(r->d);
-+ r->d = d;
-+ }
-+
-+ return 1;
-+}
-+
-+int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q)
-+{
-+ /* If the fields p and q in r are NULL, the corresponding input
-+ * parameters MUST be non-NULL.
-+ */
-+ if ((r->p == NULL && p == NULL)
-+ || (r->q == NULL && q == NULL))
-+ return 0;
-+
-+ if (p != NULL) {
-+ BN_free(r->p);
-+ r->p = p;
-+ }
-+ if (q != NULL) {
-+ BN_free(r->q);
-+ r->q = q;
-+ }
-+
-+ return 1;
-+}
-+
-+int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp)
-+{
-+ /* If the fields dmp1, dmq1 and iqmp in r are NULL, the corresponding input
-+ * parameters MUST be non-NULL.
-+ */
-+ if ((r->dmp1 == NULL && dmp1 == NULL)
-+ || (r->dmq1 == NULL && dmq1 == NULL)
-+ || (r->iqmp == NULL && iqmp == NULL))
-+ return 0;
-+
-+ if (dmp1 != NULL) {
-+ BN_free(r->dmp1);
-+ r->dmp1 = dmp1;
-+ }
-+ if (dmq1 != NULL) {
-+ BN_free(r->dmq1);
-+ r->dmq1 = dmq1;
-+ }
-+ if (iqmp != NULL) {
-+ BN_free(r->iqmp);
-+ r->iqmp = iqmp;
-+ }
-+
-+ return 1;
-+}
-+
-+void RSA_get0_key(const RSA *r,
-+ const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
-+{
-+ if (n != NULL)
-+ *n = r->n;
-+ if (e != NULL)
-+ *e = r->e;
-+ if (d != NULL)
-+ *d = r->d;
-+}
-+
-+void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q)
-+{
-+ if (p != NULL)
-+ *p = r->p;
-+ if (q != NULL)
-+ *q = r->q;
-+}
-+
-+void RSA_get0_crt_params(const RSA *r,
-+ const BIGNUM **dmp1, const BIGNUM **dmq1,
-+ const BIGNUM **iqmp)
-+{
-+ if (dmp1 != NULL)
-+ *dmp1 = r->dmp1;
-+ if (dmq1 != NULL)
-+ *dmq1 = r->dmq1;
-+ if (iqmp != NULL)
-+ *iqmp = r->iqmp;
-+}
-+
-+int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+ /* If the fields p and g in d are NULL, the corresponding input
-+ * parameters MUST be non-NULL. q may remain NULL.
-+ */
-+ if ((dh->p == NULL && p == NULL)
-+ || (dh->g == NULL && g == NULL))
-+ return 0;
-+
-+ if (p != NULL) {
-+ BN_free(dh->p);
-+ dh->p = p;
-+ }
-+ if (q != NULL) {
-+ BN_free(dh->q);
-+ dh->q = q;
-+ }
-+ if (g != NULL) {
-+ BN_free(dh->g);
-+ dh->g = g;
-+ }
-+
-+ if (q != NULL) {
-+ dh->length = BN_num_bits(q);
-+ }
-+
-+ return 1;
-+}
-+
-+void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = dh->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = dh->priv_key;
-+}
-+
-+int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key)
-+{
-+ /* If the field pub_key in dh is NULL, the corresponding input
-+ * parameters MUST be non-NULL. The priv_key field may
-+ * be left NULL.
-+ */
-+ if (dh->pub_key == NULL && pub_key == NULL)
-+ return 0;
-+
-+ if (pub_key != NULL) {
-+ BN_free(dh->pub_key);
-+ dh->pub_key = pub_key;
-+ }
-+ if (priv_key != NULL) {
-+ BN_free(dh->priv_key);
-+ dh->priv_key = priv_key;
-+ }
-+
-+ return 1;
-+}
-+
-+int DH_set_length(DH *dh, long length)
-+{
-+ dh->length = length;
-+ return 1;
-+}
-+
-+HMAC_CTX *HMAC_CTX_new(void)
-+{
-+ return OPENSSL_zalloc(sizeof(HMAC_CTX));
-+}
-+
-+void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+ HMAC_CTX_cleanup(ctx);
-+ OPENSSL_free(ctx);
-+}
-+
-+RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_RSA) {
-+ return NULL;
-+ }
-+ return pkey->pkey.rsa;
-+}
-+
-+
-+#endif /* OPENSSL_VERSION_NUMBER */
-diff --git a/src/racoon/openssl_compat.h b/src/racoon/openssl_compat.h
-new file mode 100644
-index 0000000..9e152c2
---- /dev/null
-+++ b/src/racoon/openssl_compat.h
-@@ -0,0 +1,45 @@
-+#ifndef OPENSSL_COMPAT_H
-+#define OPENSSL_COMPAT_H
-+
-+#include <openssl/opensslv.h>
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+
-+#include <openssl/rsa.h>
-+#include <openssl/dh.h>
-+#include <openssl/evp.h>
-+#include <openssl/hmac.h>
-+
-+int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d);
-+int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q);
-+int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp);
-+void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d);
-+void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q);
-+void RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const BIGNUM **dmq1, const BIGNUM **iqmp);
-+
-+int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
-+void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key);
-+int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key);
-+int DH_set_length(DH *dh, long length);
-+
-+HMAC_CTX *HMAC_CTX_new(void);
-+void HMAC_CTX_free(HMAC_CTX* ctx);
-+
-+RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey);
-+
-+#define ASN1_STRING_length(s) s->length
-+#define ASN1_STRING_get0_data(s) s->data
-+
-+#define X509_get_subject_name(x) x->cert_info->subject
-+#define X509_get_issuer_name(x) x->cert_info->issuer
-+#define X509_NAME_ENTRY_get_data(n) n->value
-+#define X509_NAME_ENTRY_get_object(n) n->object
-+#define X509_STORE_CTX_get_current_cert(ctx) ctx->current_cert
-+#define X509_STORE_CTX_get_error(ctx) ctx->error
-+#define X509_STORE_CTX_get_error_depth(ctx) ctx->error_depth
-+
-+#define OPENSSL_VERSION SSLEAY_VERSION
-+#define OpenSSL_version SSLeay_version
-+
-+#endif /* OPENSSL_VERSION_NUMBER */
-+
-+#endif /* OPENSSL_COMPAT_H */
-diff --git a/src/racoon/plainrsa-gen.c b/src/racoon/plainrsa-gen.c
-index cad1861..b949b08 100644
---- a/src/racoon/plainrsa-gen.c
-+++ b/src/racoon/plainrsa-gen.c
-@@ -60,6 +60,7 @@
- #include "vmbuf.h"
- #include "plog.h"
- #include "crypto_openssl.h"
-+#include "openssl_compat.h"
-
- #include "package_version.h"
-
-@@ -90,12 +91,14 @@ mix_b64_pubkey(const RSA *key)
- char *binbuf;
- long binlen, ret;
- vchar_t *res;
--
-- binlen = 1 + BN_num_bytes(key->e) + BN_num_bytes(key->n);
-+ const BIGNUM *e, *n;
-+
-+ RSA_get0_key(key, &n, &e, NULL);
-+ binlen = 1 + BN_num_bytes(e) + BN_num_bytes(n);
- binbuf = malloc(binlen);
- memset(binbuf, 0, binlen);
-- binbuf[0] = BN_bn2bin(key->e, (unsigned char *) &binbuf[1]);
-- ret = BN_bn2bin(key->n, (unsigned char *) (&binbuf[binbuf[0] + 1]));
-+ binbuf[0] = BN_bn2bin(e, (unsigned char *) &binbuf[1]);
-+ ret = BN_bn2bin(n, (unsigned char *) (&binbuf[binbuf[0] + 1]));
- if (1 + binbuf[0] + ret != binlen) {
- plog(LLV_ERROR, LOCATION, NULL,
- "Pubkey generation failed. This is really strange...\n");
-@@ -131,16 +134,20 @@ print_rsa_key(FILE *fp, const RSA *key)
-
- fprintf(fp, "# : PUB 0s%s\n", pubkey64->v);
- fprintf(fp, ": RSA\t{\n");
-- fprintf(fp, "\t# RSA %d bits\n", BN_num_bits(key->n));
-+ const BIGNUM *n, *e, *d, *p, *q, *dmp1, *dmq1, *iqmp;
-+ RSA_get0_key(key, &n, &e, &d);
-+ RSA_get0_factors(key, &p, &q);
-+ RSA_get0_crt_params(key, &dmp1, &dmq1, &iqmp);
-+ fprintf(fp, "\t# RSA %d bits\n", BN_num_bits(n));
- fprintf(fp, "\t# pubkey=0s%s\n", pubkey64->v);
-- fprintf(fp, "\tModulus: 0x%s\n", lowercase(BN_bn2hex(key->n)));
-- fprintf(fp, "\tPublicExponent: 0x%s\n", lowercase(BN_bn2hex(key->e)));
-- fprintf(fp, "\tPrivateExponent: 0x%s\n", lowercase(BN_bn2hex(key->d)));
-- fprintf(fp, "\tPrime1: 0x%s\n", lowercase(BN_bn2hex(key->p)));
-- fprintf(fp, "\tPrime2: 0x%s\n", lowercase(BN_bn2hex(key->q)));
-- fprintf(fp, "\tExponent1: 0x%s\n", lowercase(BN_bn2hex(key->dmp1)));
-- fprintf(fp, "\tExponent2: 0x%s\n", lowercase(BN_bn2hex(key->dmq1)));
-- fprintf(fp, "\tCoefficient: 0x%s\n", lowercase(BN_bn2hex(key->iqmp)));
-+ fprintf(fp, "\tModulus: 0x%s\n", lowercase(BN_bn2hex(n)));
-+ fprintf(fp, "\tPublicExponent: 0x%s\n", lowercase(BN_bn2hex(e)));
-+ fprintf(fp, "\tPrivateExponent: 0x%s\n", lowercase(BN_bn2hex(d)));
-+ fprintf(fp, "\tPrime1: 0x%s\n", lowercase(BN_bn2hex(p)));
-+ fprintf(fp, "\tPrime2: 0x%s\n", lowercase(BN_bn2hex(q)));
-+ fprintf(fp, "\tExponent1: 0x%s\n", lowercase(BN_bn2hex(dmp1)));
-+ fprintf(fp, "\tExponent2: 0x%s\n", lowercase(BN_bn2hex(dmq1)));
-+ fprintf(fp, "\tCoefficient: 0x%s\n", lowercase(BN_bn2hex(iqmp)));
- fprintf(fp, " }\n");
-
- vfree(pubkey64);
-@@ -203,11 +210,13 @@ int
- gen_rsa_key(FILE *fp, size_t bits, unsigned long exp)
- {
- int ret;
-- RSA *key;
-+ RSA *key = RSA_new();
-+ BIGNUM *e = BN_new();
-
-- key = RSA_generate_key(bits, exp, NULL, NULL);
-- if (!key) {
-+ BN_set_word(e, exp);
-+ if (! RSA_generate_key_ex(key, bits, e, NULL)) {
- fprintf(stderr, "RSA_generate_key(): %s\n", eay_strerror());
-+ RSA_free(key);
- return -1;
- }
-
-diff --git a/src/racoon/prsa_par.y b/src/racoon/prsa_par.y
-index 1987e4d..27ce4c6 100644
---- a/src/racoon/prsa_par.y
-+++ b/src/racoon/prsa_par.y
-@@ -68,6 +68,7 @@
- #include "isakmp_var.h"
- #include "handler.h"
- #include "crypto_openssl.h"
-+#include "openssl_compat.h"
- #include "sockmisc.h"
- #include "rsalist.h"
-
-@@ -85,7 +86,18 @@ char *prsa_cur_fname = NULL;
- struct genlist *prsa_cur_list = NULL;
- enum rsa_key_type prsa_cur_type = RSA_TYPE_ANY;
-
--static RSA *rsa_cur;
-+struct my_rsa_st {
-+ BIGNUM *n;
-+ BIGNUM *e;
-+ BIGNUM *d;
-+ BIGNUM *p;
-+ BIGNUM *q;
-+ BIGNUM *dmp1;
-+ BIGNUM *dmq1;
-+ BIGNUM *iqmp;
-+};
-+
-+static struct my_rsa_st *rsa_cur;
-
- void
- prsaerror(const char *s, ...)
-@@ -201,8 +213,12 @@ rsa_statement:
- rsa_cur->iqmp = NULL;
- }
- }
-- $$ = rsa_cur;
-- rsa_cur = RSA_new();
-+ RSA * rsa_tmp = RSA_new();
-+ RSA_set0_key(rsa_tmp, rsa_cur->n, rsa_cur->e, rsa_cur->d);
-+ RSA_set0_factors(rsa_tmp, rsa_cur->p, rsa_cur->q);
-+ RSA_set0_crt_params(rsa_tmp, rsa_cur->dmp1, rsa_cur->dmq1, rsa_cur->iqmp);
-+ $$ = rsa_tmp;
-+ memset(rsa_cur, 0, sizeof(struct my_rsa_st));
- }
- | TAG_PUB BASE64
- {
-@@ -351,10 +367,12 @@ prsa_parse_file(struct genlist *list, char *fname, enum rsa_key_type type)
- prsa_cur_fname = fname;
- prsa_cur_list = list;
- prsa_cur_type = type;
-- rsa_cur = RSA_new();
-+ rsa_cur = malloc(sizeof(struct my_rsa_st));
-+ memset(rsa_cur, 0, sizeof(struct my_rsa_st));
- ret = prsaparse();
- if (rsa_cur) {
-- RSA_free(rsa_cur);
-+ memset(rsa_cur, 0, sizeof(struct my_rsa_st));
-+ free(rsa_cur);
- rsa_cur = NULL;
- }
- fclose (fp);
-diff --git a/src/racoon/rsalist.c b/src/racoon/rsalist.c
-index f152c82..96e8363 100644
---- a/src/racoon/rsalist.c
-+++ b/src/racoon/rsalist.c
-@@ -52,6 +52,7 @@
- #include "genlist.h"
- #include "remoteconf.h"
- #include "crypto_openssl.h"
-+#include "openssl_compat.h"
-
- #ifndef LIST_FIRST
- #define LIST_FIRST(head) ((head)->lh_first)
-@@ -98,7 +99,9 @@ rsa_key_dup(struct rsa_key *key)
- return NULL;
-
- if (key->rsa) {
-- new->rsa = key->rsa->d != NULL ? RSAPrivateKey_dup(key->rsa) : RSAPublicKey_dup(key->rsa);
-+ const BIGNUM *d;
-+ RSA_get0_key(key->rsa, NULL, NULL, &d);
-+ new->rsa = (d != NULL ? RSAPrivateKey_dup(key->rsa) : RSAPublicKey_dup(key->rsa));
- if (new->rsa == NULL)
- goto dup_error;
- }
diff --git a/main/ipsec-tools/musl-cdefs.patch b/main/ipsec-tools/musl-cdefs.patch
deleted file mode 100644
index 234433f61d..0000000000
--- a/main/ipsec-tools/musl-cdefs.patch
+++ /dev/null
@@ -1,156 +0,0 @@
---- ipsec-tools-0.8.1.orig/src/libipsec/ipsec_strerror.h
-+++ ipsec-tools-0.8.1/src/libipsec/ipsec_strerror.h
-@@ -34,6 +34,8 @@
- #ifndef _IPSEC_STRERROR_H
- #define _IPSEC_STRERROR_H
-
-+#include <sys/cdefs.h>
-+
- extern int __ipsec_errcode;
- extern void __ipsec_set_strerror __P((const char *));
-
---- ipsec-tools-0.8.1.orig/src/libipsec/libpfkey.h
-+++ ipsec-tools-0.8.1/src/libipsec/libpfkey.h
-@@ -34,6 +34,8 @@
- #ifndef _LIBPFKEY_H
- #define _LIBPFKEY_H
-
-+#include <sys/cdefs.h>
-+
- #ifndef KAME_LIBPFKEY_H
- #define KAME_LIBPFKEY_H
-
---- ipsec-tools-0.8.1.orig/src/racoon/cftoken.l
-+++ ipsec-tools-0.8.1/src/racoon/cftoken.l
-@@ -77,6 +77,10 @@
-
- #include "cfparse.h"
-
-+#ifndef GLOB_TILDE
-+#define GLOB_TILDE 0
-+#endif
-+
- int yyerrorcount = 0;
-
- #if defined(YIPS_DEBUG)
---- ipsec-tools-0.8.1.orig/src/racoon/logger.h
-+++ ipsec-tools-0.8.1/src/racoon/logger.h
-@@ -34,6 +34,8 @@
- #ifndef _LOGGER_H
- #define _LOGGER_H
-
-+#include <sys/cdefs.h>
-+
- struct log {
- int head;
- int siz;
---- ipsec-tools-0.8.1.orig/src/racoon/misc.h
-+++ ipsec-tools-0.8.1/src/racoon/misc.h
-@@ -34,6 +34,8 @@
- #ifndef _MISC_H
- #define _MISC_H
-
-+#include <sys/cdefs.h>
-+
- #define BIT2STR(b) bit2str(b, sizeof(b)<<3)
-
- #ifdef HAVE_FUNC_MACRO
---- ipsec-tools-0.8.1.orig/src/racoon/missing/crypto/sha2/sha2.h
-+++ ipsec-tools-0.8.1/src/racoon/missing/crypto/sha2/sha2.h
-@@ -40,6 +40,8 @@
- #ifndef __SHA2_H__
- #define __SHA2_H__
-
-+#include <sys/cdefs.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
---- ipsec-tools-0.8.1.orig/src/racoon/netdb_dnssec.h
-+++ ipsec-tools-0.8.1/src/racoon/netdb_dnssec.h
-@@ -34,6 +34,8 @@
- #ifndef _NETDB_DNSSEC_H
- #define _NETDB_DNSSEC_H
-
-+#include <sys/cdefs.h>
-+
- #ifndef T_CERT
- #define T_CERT 37 /* defined by RFC2538 section 2 */
- #endif
---- ipsec-tools-0.8.1.orig/src/racoon/plog.h
-+++ ipsec-tools-0.8.1/src/racoon/plog.h
-@@ -34,6 +34,7 @@
- #ifndef _PLOG_H
- #define _PLOG_H
-
-+#include <sys/cdefs.h>
- #ifdef HAVE_STDARG_H
- #include <stdarg.h>
- #else
---- ipsec-tools-0.8.1.orig/src/racoon/str2val.h
-+++ ipsec-tools-0.8.1/src/racoon/str2val.h
-@@ -34,6 +34,8 @@
- #ifndef _STR2VAL_H
- #define _STR2VAL_H
-
-+#include <sys/cdefs.h>
-+
- extern caddr_t val2str __P((const char *, size_t));
- extern char *str2val __P((const char *, int, size_t *));
-
---- ipsec-tools-0.8.1.orig/src/racoon/vmbuf.h
-+++ ipsec-tools-0.8.1/src/racoon/vmbuf.h
-@@ -34,6 +34,8 @@
- #ifndef _VMBUF_H
- #define _VMBUF_H
-
-+#include <sys/cdefs.h>
-+
- /*
- * bp v
- * v v
---- ipsec-tools-0.8.1.orig/src/setkey/extern.h
-+++ ipsec-tools-0.8.1/src/setkey/extern.h
-@@ -1,6 +1,6 @@
- /* $NetBSD: extern.h,v 1.5 2009/03/06 11:45:03 tteras Exp $ */
-
--
-+#include <sys/cdefs.h>
-
- void parse_init __P((void));
- int parse __P((FILE **));
---- ipsec-tools-0.8.1.orig/src/racoon/backupsa.c
-+++ ipsec-tools-0.8.1/src/racoon/backupsa.c
-@@ -276,9 +276,9 @@
- GETNEXTNUM(sa_args.a_keylen, strtoul);
- GETNEXTNUM(sa_args.flags, strtoul);
- GETNEXTNUM(sa_args.l_alloc, strtoul);
-- GETNEXTNUM(sa_args.l_bytes, strtouq);
-- GETNEXTNUM(sa_args.l_addtime, strtouq);
-- GETNEXTNUM(sa_args.l_usetime, strtouq);
-+ GETNEXTNUM(sa_args.l_bytes, strtoull);
-+ GETNEXTNUM(sa_args.l_addtime, strtoull);
-+ GETNEXTNUM(sa_args.l_usetime, strtoull);
- GETNEXTNUM(sa_args.seq, strtoul);
-
- #undef GETNEXTNUM
---- ipsec-tools-0.8.2.orig/src/setkey/setkey.c
-+++ ipsec-tools-0.8.2/src/setkey/setkey.c
-@@ -40,7 +40,6 @@
- #include <sys/socket.h>
- #include <sys/time.h>
- #include <sys/stat.h>
--#include <sys/sysctl.h>
- #include <err.h>
- #include <netinet/in.h>
- #include <net/pfkeyv2.h>
---- ipsec-tools-0.8.2.orig/src/racoon/pfkey.c
-+++ ipsec-tools-0.8.2/src/racoon/pfkey.c
-@@ -59,7 +59,6 @@
- #include <sys/param.h>
- #include <sys/socket.h>
- #include <sys/queue.h>
--#include <sys/sysctl.h>
-
- #include <net/route.h>
- #include <net/pfkeyv2.h>
diff --git a/main/ipsec-tools/racoon.confd b/main/ipsec-tools/racoon.confd
deleted file mode 100644
index bf9926c5b5..0000000000
--- a/main/ipsec-tools/racoon.confd
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/files/racoon.conf.d,v 1.3 2004/07/14 23:29:57 agriffis Exp $
-
-# Config file for /etc/init.d/racoon
-
-# See the manual pages for racoon or run `racoon --help`
-# for valid command-line options
-
-RACOON_OPTS="-4"
-SETKEY_OPTS=""
-
-RACOON_CONF="/etc/racoon/racoon.conf"
-RACOON_PSK_FILE="/etc/racoon/psk.txt"
-SETKEY_CONF="/etc/ipsec.conf"
-
-# Comment or remove the following if you don't want the policy tables
-# to be flushed when racoon is stopped.
-
-RACOON_RESET_TABLES="true"
diff --git a/main/ipsec-tools/racoon.initd b/main/ipsec-tools/racoon.initd
deleted file mode 100644
index a41671aa01..0000000000
--- a/main/ipsec-tools/racoon.initd
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- before netmount
- use net
- after firewall ntp-client
- provide ipsec
-}
-
-checkconfig() {
- if [ ! -e ${SETKEY_CONF} ] ; then
- eerror "You need to configure setkey before starting racoon."
- return 1
- fi
- if [ ! -e ${RACOON_CONF} ] ; then
- eerror "You need a configuration file to start racoon."
- return 1
- fi
- if [ ! -z ${RACOON_PSK_FILE} ] ; then
- if [ ! -f ${RACOON_PSK_FILE} ] ; then
- eerror "PSK file not found as specified."
- eerror "Set RACOON_PSK_FILE in /etc/conf.d/racoon."
- return 1
- fi
- case "`ls -Lldn ${RACOON_PSK_FILE}`" in
- -r--------*)
- ;;
- *)
- eerror "Your defined PSK file should be mode 400 for security!"
- return 1
- ;;
- esac
- fi
-}
-
-start() {
- checkconfig || return 1
- einfo "Loading ipsec policies from ${SETKEY_CONF}."
- /usr/sbin/setkey ${SETKEY_OPTS} -f ${SETKEY_CONF}
- if [ $? -eq 1 ] ; then
- eerror "Error while loading ipsec policies"
- fi
- ebegin "Starting racoon"
- start-stop-daemon -S -x /usr/sbin/racoon -- -f ${RACOON_CONF} ${RACOON_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping racoon"
- start-stop-daemon -K -p /var/run/racoon.pid
- eend $?
- if [ -n "${RACOON_RESET_TABLES}" ]; then
- ebegin "Flushing policy entries"
- /usr/sbin/setkey -F
- /usr/sbin/setkey -FP
- eend $?
- fi
-}
diff --git a/main/iptables/APKBUILD b/main/iptables/APKBUILD
index d354d52443..2afdf8b1b5 100644
--- a/main/iptables/APKBUILD
+++ b/main/iptables/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=iptables
-pkgver=1.8.4
-pkgrel=1
+pkgver=1.8.5
+pkgrel=0
pkgdesc="Linux kernel firewall, NAT and packet mangling tools"
url="https://www.netfilter.org/projects/iptables/index.html"
arch="all"
@@ -78,7 +78,7 @@ ip6tables_openrc() {
install -D -m644 "$srcdir"/ip6tables.confd "$subpkgdir"/etc/conf.d/ip6tables
}
-sha512sums="a7faaab58608ffaa51e26e8056551c0e91a49187439d30fcf5cce2800274cc3c0515db6cfba0f4c85613fb80779cf96089b8915db0e89161e9980a6384faebdb iptables-1.8.4.tar.bz2
+sha512sums="6a6baa541bb7aa331b176e0a91894e0766859814b59e77c71351ac34d6ebd337487981db48c70e476a48c67bcf891cfc663221a7582feb1496ad1df56eb28da8 iptables-1.8.5.tar.bz2
059b3bd8dd7dec60060ec5eb1e639fe8203207629f3a7dd4fdbe5ebca3f7e9b80df5592ebb27542e31830fd15a53cffac5772567053c104dfccf9b78613a31a1 iptables.initd
cb7fecd5cab2c78bd3f215a41f39ec11c37eb360efbe83982378a0e647e0aa9dc0b7ec915a5b5081aa2f7747464787e69404aa15ba15a063c32cb8fb7dd13d1e iptables.confd
0897a7a22f8b700f7f1f5c355ad6cbf39740e44d6c962af99e479978d8a2d556ca7fe4e31f238829046b4a871ce0b5fd52e2544f1361d15dd1ea3e33992646c4 ip6tables.confd
diff --git a/main/ircii/APKBUILD b/main/ircii/APKBUILD
index 7ec1b04d42..ce9b8f624f 100644
--- a/main/ircii/APKBUILD
+++ b/main/ircii/APKBUILD
@@ -2,14 +2,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ircii
pkgver=20190117
-pkgrel=0
+pkgrel=1
pkgdesc="Universal IRC for Unix systems"
url="http://www.eterna.com.au/ircii/"
arch="all"
-license="BSD"
-depends=""
+license="BSD-3-Clause"
makedepends="ncurses-dev openssl-dev"
-install=""
subpackages="$pkgname-doc"
source="http://ircii.warped.com/ircii-$pkgver.tar.bz2"
diff --git a/main/irqbalance/APKBUILD b/main/irqbalance/APKBUILD
index 7bccbccdfe..5345c571c8 100644
--- a/main/irqbalance/APKBUILD
+++ b/main/irqbalance/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=irqbalance
-pkgver=1.6.0
-pkgrel=1
+pkgver=1.7.0
+pkgrel=0
pkgdesc="Daemon that distributes interrupts over the processors"
url="https://github.com/Irqbalance/irqbalance"
arch="all"
@@ -22,7 +22,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/Irqbalance/irqbalance/archiv
irqbalance.initd
"
-builddir="$srcdir"/$pkgname-$pkgver
prepare() {
default_prepare
@@ -30,7 +29,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -42,17 +40,15 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
}
-sha512sums="ce89dc41eb3aab5950a56b4b1c817aae5e87eaa84bc69bf88618caf53386513e488bb0b4724a600ae175c96be509367cfc418c7f85531007f80e02f7de549b16 irqbalance-1.6.0.tar.gz
+sha512sums="2fa29c738275dda2fac38d78ca0ec4619826b72529e8eda7ad8ddcda5768bbf282e2260dddc16a8b46d4296289b25dc59684575ae1badca0c6c6ae30b1e9b5ea irqbalance-1.7.0.tar.gz
90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c irqbalance.confd
ba4933d35d17c0eaec8026305411605cadfddaba28e5dbbfb55f8d4311feb04db8dc8853a3e63be55ee8ab4b0356658b2f3eba60fa0b4e59effdd1db94a255c2 irqbalance.initd"
diff --git a/main/json-c/APKBUILD b/main/json-c/APKBUILD
index aee1802fa3..83c21cd4b8 100644
--- a/main/json-c/APKBUILD
+++ b/main/json-c/APKBUILD
@@ -1,16 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=json-c
-pkgver=0.14
-pkgrel=1
+pkgver=0.15
+pkgrel=0
pkgdesc="A JSON implementation in C"
url="https://github.com/json-c/json-c/wiki"
arch="all"
license="MIT"
makedepends="cmake"
subpackages="$pkgname-dev"
-source="https://s3.amazonaws.com/json-c_releases/releases/json-c-$pkgver.tar.gz
- CVE-2020-12762.patch::https://github.com/json-c/json-c/pull/608.patch
- "
+source="https://s3.amazonaws.com/json-c_releases/releases/json-c-$pkgver.tar.gz"
# secfixes:
# 0.14-r1:
@@ -24,8 +22,8 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
+ -DBUILD_STATIC_LIBS=False \
-DCMAKE_BUILD_TYPE=None \
- -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
$CMAKE_CROSSOPTS .
make -C build
}
@@ -34,5 +32,4 @@ package() {
make -C build DESTDIR="$pkgdir" install
}
-sha512sums="75537c61d0632a01f94d2394d7a4387ef1eca0b68aa56c495d3d96dd29b38ed20eb0cc3f6e5e24dc6660c8939669f8954005d9c3ba20437f3fcc9f9dd896b00d json-c-0.14.tar.gz
-e69b2dd0fd979428d3d44529877d8176ccb54f0a056eebfa1a64e68eda9d5087cffdafe11253879502048024027cc37d1bc158f17487bff06ce0386b4638843d CVE-2020-12762.patch"
+sha512sums="dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34 json-c-0.15.tar.gz"
diff --git a/main/kbd/0001-libkbdfile-Check-compression-suffix-even-if-the-suff.patch b/main/kbd/0001-libkbdfile-Check-compression-suffix-even-if-the-suff.patch
deleted file mode 100644
index f3e8628af0..0000000000
--- a/main/kbd/0001-libkbdfile-Check-compression-suffix-even-if-the-suff.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 7e27102b6fc6991a6a4eca422b513781a26b1639 Mon Sep 17 00:00:00 2001
-From: Alexey Gladkov <gladkov.alexey@gmail.com>
-Date: Wed, 21 Aug 2019 13:29:16 +0200
-Subject: [PATCH] libkbdfile: Check compression suffix even if the suffix is
- part of filename
-
-Link: https://github.com/legionus/kbd/issues/32
-
-Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
----
- src/libkbdfile/kbdfile.c | 25 ++++++++++++-------------
- src/libkbdfile/kbdfile.h | 2 ++
- 2 files changed, 14 insertions(+), 13 deletions(-)
-
-diff --git a/src/libkbdfile/kbdfile.c b/src/libkbdfile/kbdfile.c
-index fb8e035..487b434 100644
---- a/src/libkbdfile/kbdfile.c
-+++ b/src/libkbdfile/kbdfile.c
-@@ -344,20 +344,13 @@ StartScan:
- snprintf(fp->pathname, sizeof(fp->pathname), "%s/%s%s%s", dir, fnam, suf[index], (dc ? dc->ext : ""));
-
- if (!dc) {
-- fp->flags &= ~KBDFILE_PIPE;
-- fp->fd = fopen(fp->pathname, "r");
-+ rc = maybe_pipe_open(fp);
-+ goto EndScan;
-+ }
-
-- if (!(fp->fd)) {
-- strerror_r(errno, errbuf, sizeof(errbuf));
-- ERR(fp->ctx, "fopen: %s: %s", fp->pathname, errbuf);
-- rc = -1;
-- goto EndScan;
-- }
-- } else {
-- if (pipe_open(dc, fp) < 0) {
-- rc = -1;
-- goto EndScan;
-- }
-+ if (pipe_open(dc, fp) < 0) {
-+ rc = -1;
-+ goto EndScan;
- }
- }
-
-@@ -457,3 +450,9 @@ kbdfile_open(struct kbdfile_ctx *ctx, const char *filename)
-
- return fp;
- }
-+
-+int
-+kbdfile_is_compressed(struct kbdfile *fp)
-+{
-+ return (fp->flags & KBDFILE_PIPE);
-+}
-diff --git a/src/libkbdfile/kbdfile.h b/src/libkbdfile/kbdfile.h
-index 412179a..0318a8e 100644
---- a/src/libkbdfile/kbdfile.h
-+++ b/src/libkbdfile/kbdfile.h
-@@ -45,6 +45,8 @@ int kbdfile_set_pathname(struct kbdfile *fp, const char *pathname);
- FILE *kbdfile_get_file(struct kbdfile *fp);
- int kbdfile_set_file(struct kbdfile *fp, FILE *x);
-
-+int kbdfile_is_compressed(struct kbdfile *fp);
-+
- #include <syslog.h>
-
- void
diff --git a/main/kbd/0001-libkeymap-Fix-the-compatibility-with-the-busybox-s-l.patch b/main/kbd/0001-libkeymap-Fix-the-compatibility-with-the-busybox-s-l.patch
deleted file mode 100644
index 45508e3eee..0000000000
--- a/main/kbd/0001-libkeymap-Fix-the-compatibility-with-the-busybox-s-l.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c994c7763b390d28ac92223eaa6176a136ad7b58 Mon Sep 17 00:00:00 2001
-From: Alexey Gladkov <gladkov.alexey@gmail.com>
-Date: Thu, 26 Sep 2019 11:24:48 +0200
-Subject: [PATCH] libkeymap: Fix the compatibility with the busybox's loadkmap
-
-Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
----
- src/libkeymap/dump.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c
-index 83ac351..8531b5a 100644
---- a/src/libkeymap/dump.c
-+++ b/src/libkeymap/dump.c
-@@ -72,9 +72,14 @@ int lk_dump_bkeymap(struct lk_ctx *ctx, FILE *fd)
- continue;
-
- for (j = 0; j < NR_KEYS / 2; j++) {
-- int v = lk_get_key(ctx, i, j);
-+ int value = lk_get_key(ctx, i, j);
-
-- if (fwrite(&v, sizeof(v), 1, fd) != 1)
-+ if (value < 0 || value > USHRT_MAX) {
-+ ERR(ctx, _("can not bind key %d to value %d because it is too large"), j, value);
-+ goto fail;
-+ }
-+
-+ if (fwrite(&value, sizeof(unsigned short), 1, fd) != 1)
- goto fail;
- }
- }
diff --git a/main/kbd/APKBUILD b/main/kbd/APKBUILD
index 873c06ee18..ee8f1d38f4 100644
--- a/main/kbd/APKBUILD
+++ b/main/kbd/APKBUILD
@@ -1,24 +1,23 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=kbd
-pkgver=2.2.0
-pkgrel=2
+pkgver=2.3.0
+pkgrel=0
pkgdesc="Tools for configuring the console (keyboard, virtual terminals, etc.)"
url="http://kbd-project.org/"
arch="all"
license="GPL-2.0-or-later"
depends="kbd-misc"
-makedepends="linux-headers linux-pam-dev check-dev ckbcomp xkeyboard-config"
+makedepends="linux-headers linux-pam-dev check-dev ckbcomp xkeyboard-config
+ autoconf automake"
subpackages="$pkgname-bkeymaps::noarch $pkgname-legacy::noarch
- $pkgname-misc::noarch $pkgname-doc $pkgname-openrc $pkgname-vlock"
+ $pkgname-misc::noarch $pkgname-doc $pkgname-openrc $pkgname-vlock
+ $pkgname-dev $pkgname-libs"
source="https://www.kernel.org/pub/linux/utils/kbd/kbd-$pkgver.tar.gz
loadkeys.initd
loadkeys.confd
error.h
- fix-tests.patch
- 0001-libkbdfile-Check-compression-suffix-even-if-the-suff.patch
- 0001-libkeymap-Fix-the-compatibility-with-the-busybox-s-l.patch
"
_datadir=/usr/share
@@ -29,31 +28,24 @@ _badmaps="pk-ara"
prepare() {
default_prepare
- # 0001-libkeymap-Fix-the-compatibility-with-the-busybox-s-l.patch
- # makes this test fail because changes to tests were not backported.
- # Remove the following line when the patch is removed.
- truncate -s0 "$builddir"/tests/dumpkeys-bkeymap.in
-
- cd "$builddir"
- cp "$srcdir"/error.h .
+ cp "$srcdir"/error.h "$builddir"
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
--disable-nls \
--prefix=/usr \
--datadir="$_datadir" \
- --htmldir=/usr/share/html/$pkgname
+ --htmldir=/usr/share/html/$pkgname \
+ --disable-static
make
}
check() {
# dumpkeys-bkeymap fails
[ "$CARCH" = s390x ] && return 0
- cd "$builddir"
make check
}
@@ -71,7 +63,6 @@ _listxmaps() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -Dm755 "$srcdir"/loadkeys.initd \
@@ -180,10 +171,7 @@ misc() {
done
}
-sha512sums="17f70402126e545c318a5de0265875135b6ebdc0ff9905cb8094dc74a5b27a9d6cede05f7dd4f6f1e68d4aff113e9c82b41caf4da5657d818b4d6a6d477a2789 kbd-2.2.0.tar.gz
+sha512sums="e16c08579e8f985e901c7418eb9a13c976164e1d9625cca3c986c393be37000c4bf29222e302d779df6187940a2ca4390119f5ab19f3d8183e7609f2a527a485 kbd-2.3.0.tar.gz
64b5ab4c362350521da8f507d22c0b77784da99bbe1b32f0c001cd826f63c607e3f9cd6af01f06a61af8bd709760bbf2bb3cfe2010c33925f2987a1af6ef4998 loadkeys.initd
12028796552a5ffed1d5cb19d37fc6a73fb4f2e2bf34d837a81171c7ebee98d6c3f557715bf79706d79ce053b9b2450cd8cf1c4ea045428fb7d8a5915ae3ed78 loadkeys.confd
-c66f6b0d8c8b8d285c740bdbe7130dee272ac01cd5e73b35a58cedf1a77fe8d9e062631b804fb58014d8eb9861c8f28aed07bc022ef31662bcc61b5c85a21752 error.h
-bb67e5bb933a48f4a04402e07d7d67169a97485e6b469f8ccd4436466eb17ec2ddcf0ef74d22b3aae9e813feaee5bef0822ec50c384e0276a8c91f9325502a5f fix-tests.patch
-edd53405ae22c19c0c4384318fde7bdea27de5428931b304b1d1a02bc268aea147ec9ff2c7296f7f22ee1b544c6ba30688d77e85a3f8751d4c5bcbe80fd0e518 0001-libkbdfile-Check-compression-suffix-even-if-the-suff.patch
-af4c92c7420a42b5ad7a8d24ad97ce8fd63c75f37e5f3dbc04adfdce2509d343160475e74c03f78243eff32abe5d5efa9df61cbe9b754f4ed8f56c07d7890969 0001-libkeymap-Fix-the-compatibility-with-the-busybox-s-l.patch"
+c66f6b0d8c8b8d285c740bdbe7130dee272ac01cd5e73b35a58cedf1a77fe8d9e062631b804fb58014d8eb9861c8f28aed07bc022ef31662bcc61b5c85a21752 error.h"
diff --git a/main/kbd/fix-tests.patch b/main/kbd/fix-tests.patch
deleted file mode 100644
index 0ca82420c7..0000000000
--- a/main/kbd/fix-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-busybox readlink doesn't accept -e, and in these cases -f has the same effect.
---- a/tests/alt-is-meta.in
-+++ b/tests/alt-is-meta.in
-@@ -1,6 +1,6 @@
- #!/bin/sh -efu
-
--cwd="$(readlink -ev "${0%/*}")"
-+cwd="$(readlink -fv "${0%/*}")"
-
- cd "$cwd"
-
---- a/tests/dumpkeys-bkeymap.in
-+++ b/tests/dumpkeys-bkeymap.in
-@@ -1,6 +1,6 @@
- #!/bin/sh -efu
-
--cwd="$(readlink -ev "${0%/*}")"
-+cwd="$(readlink -fv "${0%/*}")"
-
- cd "$cwd"
-
---- a/tests/dumpkeys-fulltable.in
-+++ b/tests/dumpkeys-fulltable.in
-@@ -1,6 +1,6 @@
- #!/bin/sh -efu
-
--cwd="$(readlink -ev "${0%/*}")"
-+cwd="$(readlink -fv "${0%/*}")"
-
- cd "$cwd"
-
---- a/tests/dumpkeys-mktable.in
-+++ b/tests/dumpkeys-mktable.in
-@@ -1,6 +1,6 @@
- #!/bin/sh -efu
-
--cwd="$(readlink -ev "${0%/*}")"
-+cwd="$(readlink -fv "${0%/*}")"
-
- cd "$cwd"
-
diff --git a/main/keyutils/APKBUILD b/main/keyutils/APKBUILD
index 68b1e487c2..1e6aea6029 100644
--- a/main/keyutils/APKBUILD
+++ b/main/keyutils/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=keyutils
-pkgver=1.6.1
-pkgrel=1
+pkgver=1.6.3
+pkgrel=0
pkgdesc="Linux Key Management Utilities"
url="http://people.redhat.com/~dhowells/keyutils/"
arch="all"
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
source="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-$pkgver.tar.gz"
build() {
- cd "$builddir"
make -j1 \
NO_ARLIB=1 \
LIBDIR=/usr/lib \
@@ -24,7 +23,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" \
NO_ARLIB=1 \
LIBDIR=/usr/lib \
@@ -38,4 +36,4 @@ libs() {
mv "$pkgdir"/usr/lib/* "$subpkgdir"/usr/lib
}
-sha512sums="a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2 keyutils-1.6.1.tar.gz"
+sha512sums="f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9 keyutils-1.6.3.tar.gz"
diff --git a/main/knock/APKBUILD b/main/knock/APKBUILD
index 617a9e45b3..e39a5c2976 100644
--- a/main/knock/APKBUILD
+++ b/main/knock/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=knock
-pkgver=0.8
-pkgrel=1
+pkgver=0.8.1
+pkgrel=0
pkgdesc="A simple port-knocking daemon"
url="http://www.zeroflux.org/projects/knock"
arch="all"
@@ -43,6 +43,6 @@ package() {
"$pkgdir"/etc/conf.d/knockd
}
-sha512sums="cfc0b92e90c34ffa629b866e63f9f9f4b9c2423491680e6155efeb8f40c24446df29f961f2f8505441b153c2a87a32b834fd1182896b6de92dee430044680c27 knock-0.8.tar.gz
+sha512sums="d921d66e1871e3503710ab4b5630f8ad677c6d76186a245422a7e310af0d3aa7741aea530922221cf592e68cde11c441d66379c0f37b5d84d9558f252493e5bd knock-0.8.1.tar.gz
369010549a1b33efe9f634794f039249421778d49739e8f10e4d6baa83424e066a63c0ef637b70762ee34617e7b67f9ac6683125d35ded85d6779d6b2ef0f7db knock.initd
63fa311e6adf21450d4c93008a9537ec1b3c0dbed28e3daf955f2761127d9d756f2f7a84d8357d81a5e1a5a48453f9179d0c18cf18af0b9f30437c862a438d7f knock.confd"
diff --git a/main/knot/APKBUILD b/main/knot/APKBUILD
index 10fb17fe0b..25caae8b83 100644
--- a/main/knot/APKBUILD
+++ b/main/knot/APKBUILD
@@ -8,7 +8,7 @@ pkgver=2.9.4
pkgrel=0
pkgdesc="An high-performance authoritative-only DNS server"
url="https://www.knot-dns.cz/"
-arch="all"
+arch="all !x86 !armhf !armv7" # testsuite fails on 32 bit arches with musl 1.2
license="GPL-3.0-or-later"
depends=""
depends_dev="$pkgname $pkgname-libs-static $pkgname-utils"
@@ -46,6 +46,8 @@ source="https://secure.nic.cz/files/$pkgname-dns/$pkgname-$pkgver.tar.xz
knotd.confd
knotd.initd
"
+# tests fail due to alignment problems on armv6
+[ "$CARCH" = "armhf" ] && options="!check"
prepare() {
default_prepare
diff --git a/main/lcms2/APKBUILD b/main/lcms2/APKBUILD
index 36ed15661a..fc2a88a242 100644
--- a/main/lcms2/APKBUILD
+++ b/main/lcms2/APKBUILD
@@ -1,19 +1,16 @@
# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=lcms2
-pkgver=2.9
-pkgrel=1
+pkgver=2.11
+pkgrel=0
pkgdesc="Color Management Engine"
url="http://www.littlecms.com"
arch="all"
-license="MIT"
-depends=""
+license="MIT GPL-3.0-only"
depends_dev="libjpeg-turbo-dev tiff-dev zlib-dev"
makedepends="$depends_dev"
-install=""
subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
-source="http://www.littlecms.com/$pkgname-$pkgver.tar.gz
- CVE-2018-16435.patch
+source="http://www.littlecms.com/lcms2-$pkgver.tar.gz
"
# secfixes:
@@ -23,7 +20,6 @@ source="http://www.littlecms.com/$pkgname-$pkgver.tar.gz
# - CVE-2016-10165
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -41,12 +37,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
@@ -56,5 +50,4 @@ utils() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="70b1c51fa8d137d5072425e580745ff1fbf49c6e8bb1da0a8adb0647d3b7c095208793cb02de1e8d1a01363b8575fa60c61bedbff99bbec57a44228239cb00e5 lcms2-2.9.tar.gz
-9f2b0c72b7be0747fcdc71391bea1d1579a7b7ae7b6e8ac861f9faa603b4415e8cdd3c183bdeed444387bc618c16a028d74813a3d0040d70a0f474db2c90d832 CVE-2018-16435.patch"
+sha512sums="96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e lcms2-2.11.tar.gz"
diff --git a/main/lcms2/CVE-2018-16435.patch b/main/lcms2/CVE-2018-16435.patch
deleted file mode 100644
index 775225c988..0000000000
--- a/main/lcms2/CVE-2018-16435.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 768f70ca405cd3159d990e962d54456773bb8cf8 Mon Sep 17 00:00:00 2001
-From: Marti Maria <info@littlecms.com>
-Date: Wed, 15 Aug 2018 20:07:56 +0200
-Subject: [PATCH] Upgrade Visual studio 2017 15.8
-
-- Upgrade to 15.8
-- Add check on CGATS memory allocation (thanks to Quang Nguyen for
-pointing out this)
----
- Projects/VC2017/jpegicc/jpegicc.vcxproj | 1 +
- Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj | 2 +-
- Projects/VC2017/lcms2_static/lcms2_static.vcxproj | 2 +-
- Projects/VC2017/linkicc/linkicc.vcxproj | 2 +-
- Projects/VC2017/psicc/psicc.vcxproj | 2 +-
- Projects/VC2017/testbed/testbed.vcxproj | 2 +-
- Projects/VC2017/tiffdiff/tiffdiff.vcxproj | 2 +-
- Projects/VC2017/tifficc/tifficc.vcxproj | 2 +-
- Projects/VC2017/transicc/transicc.vcxproj | 1 +
- src/cmscgats.c | 14 ++++++++++----
- 10 files changed, 19 insertions(+), 11 deletions(-)
-
-diff --git a/Projects/VC2017/jpegicc/jpegicc.vcxproj b/Projects/VC2017/jpegicc/jpegicc.vcxproj
-index ab26a53..39cfd00 100644
---- a/Projects/VC2017/jpegicc/jpegicc.vcxproj
-+++ b/Projects/VC2017/jpegicc/jpegicc.vcxproj
-@@ -22,6 +22,7 @@
- <ProjectGuid>{62812507-F926-4968-96A9-17678460AD90}</ProjectGuid>
- <RootNamespace>jpegicc</RootNamespace>
- <Keyword>Win32Proj</Keyword>
-+ <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj b/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj
-index 4c8aa3f..d1bf3eb 100644
---- a/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj
-+++ b/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj
-@@ -22,7 +22,7 @@
- <ProjectGuid>{8C51BE48-ADB8-4089-A9EC-F6BF993A0548}</ProjectGuid>
- <RootNamespace>lcms2_DLL</RootNamespace>
- <Keyword>Win32Proj</Keyword>
-- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+ <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/lcms2_static/lcms2_static.vcxproj b/Projects/VC2017/lcms2_static/lcms2_static.vcxproj
-index 2a9988a..9fc05ce 100644
---- a/Projects/VC2017/lcms2_static/lcms2_static.vcxproj
-+++ b/Projects/VC2017/lcms2_static/lcms2_static.vcxproj
-@@ -22,7 +22,7 @@
- <ProjectGuid>{71DEDE59-3F1E-486B-A899-4283000F76B5}</ProjectGuid>
- <RootNamespace>lcms2_static</RootNamespace>
- <Keyword>Win32Proj</Keyword>
-- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+ <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/linkicc/linkicc.vcxproj b/Projects/VC2017/linkicc/linkicc.vcxproj
-index 30c2b4e..51586dd 100644
---- a/Projects/VC2017/linkicc/linkicc.vcxproj
-+++ b/Projects/VC2017/linkicc/linkicc.vcxproj
-@@ -22,7 +22,7 @@
- <ProjectGuid>{FBFBE1DC-DB84-4BA1-9552-B4780F457849}</ProjectGuid>
- <RootNamespace>linkicc</RootNamespace>
- <Keyword>Win32Proj</Keyword>
-- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+ <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/psicc/psicc.vcxproj b/Projects/VC2017/psicc/psicc.vcxproj
-index 9dcf89a..8f26e12 100644
---- a/Projects/VC2017/psicc/psicc.vcxproj
-+++ b/Projects/VC2017/psicc/psicc.vcxproj
-@@ -22,7 +22,7 @@
- <ProjectGuid>{EF6A8851-65FE-46F5-B9EF-14F0B671F693}</ProjectGuid>
- <RootNamespace>psicc</RootNamespace>
- <Keyword>Win32Proj</Keyword>
-- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+ <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/testbed/testbed.vcxproj b/Projects/VC2017/testbed/testbed.vcxproj
-index 0af3762..3f6aea3 100644
---- a/Projects/VC2017/testbed/testbed.vcxproj
-+++ b/Projects/VC2017/testbed/testbed.vcxproj
-@@ -22,7 +22,7 @@
- <ProjectGuid>{928A3A2B-46EF-4279-959C-513B3652FF0E}</ProjectGuid>
- <RootNamespace>testbed</RootNamespace>
- <Keyword>Win32Proj</Keyword>
-- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+ <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/tiffdiff/tiffdiff.vcxproj b/Projects/VC2017/tiffdiff/tiffdiff.vcxproj
-index 7edfe28..3a6d837 100644
---- a/Projects/VC2017/tiffdiff/tiffdiff.vcxproj
-+++ b/Projects/VC2017/tiffdiff/tiffdiff.vcxproj
-@@ -22,7 +22,7 @@
- <ProjectGuid>{75B91835-CCD7-48BE-A606-A9C997D5DBEE}</ProjectGuid>
- <RootNamespace>tiffdiff</RootNamespace>
- <Keyword>Win32Proj</Keyword>
-- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+ <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/tifficc/tifficc.vcxproj b/Projects/VC2017/tifficc/tifficc.vcxproj
-index cd9f04c..5ef954f 100644
---- a/Projects/VC2017/tifficc/tifficc.vcxproj
-+++ b/Projects/VC2017/tifficc/tifficc.vcxproj
-@@ -22,7 +22,7 @@
- <ProjectGuid>{2256DE16-ED92-4A6F-9C54-F65BB61E64A2}</ProjectGuid>
- <RootNamespace>tifficc</RootNamespace>
- <Keyword>Win32Proj</Keyword>
-- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+ <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/transicc/transicc.vcxproj b/Projects/VC2017/transicc/transicc.vcxproj
-index d9b77c6..b3173d8 100644
---- a/Projects/VC2017/transicc/transicc.vcxproj
-+++ b/Projects/VC2017/transicc/transicc.vcxproj
-@@ -22,6 +22,7 @@
- <ProjectGuid>{9EE22D66-C849-474C-9ED5-C3E141DAB160}</ProjectGuid>
- <RootNamespace>transicc</RootNamespace>
- <Keyword>Win32Proj</Keyword>
-+ <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/src/cmscgats.c b/src/cmscgats.c
-index 1a87613..8c3e96d 100644
---- a/src/cmscgats.c
-+++ b/src/cmscgats.c
-@@ -1,7 +1,7 @@
- //---------------------------------------------------------------------------------
- //
- // Little Color Management System
--// Copyright (c) 1998-2017 Marti Maria Saguer
-+// Copyright (c) 1998-2018 Marti Maria Saguer
- //
- // Permission is hereby granted, free of charge, to any person obtaining
- // a copy of this software and associated documentation files (the "Software"),
-@@ -1506,10 +1506,16 @@ void AllocateDataSet(cmsIT8* it8)
- t-> nSamples = atoi(cmsIT8GetProperty(it8, "NUMBER_OF_FIELDS"));
- t-> nPatches = atoi(cmsIT8GetProperty(it8, "NUMBER_OF_SETS"));
-
-- t-> Data = (char**)AllocChunk (it8, ((cmsUInt32Number) t->nSamples + 1) * ((cmsUInt32Number) t->nPatches + 1) *sizeof (char*));
-- if (t->Data == NULL) {
-+ if (t -> nSamples < 0 || t->nSamples > 0x7ffe || t->nPatches < 0 || t->nPatches > 0x7ffe)
-+ {
-+ SynError(it8, "AllocateDataSet: too much data");
-+ }
-+ else {
-+ t->Data = (char**)AllocChunk(it8, ((cmsUInt32Number)t->nSamples + 1) * ((cmsUInt32Number)t->nPatches + 1) * sizeof(char*));
-+ if (t->Data == NULL) {
-
-- SynError(it8, "AllocateDataSet: Unable to allocate data array");
-+ SynError(it8, "AllocateDataSet: Unable to allocate data array");
-+ }
- }
-
- }
diff --git a/main/ldb/APKBUILD b/main/ldb/APKBUILD
index bb67be4079..b65b69f224 100644
--- a/main/ldb/APKBUILD
+++ b/main/ldb/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ldb
-pkgver=2.1.2
+pkgver=2.1.4
pkgrel=0
pkgdesc="A schema-less, ldap like, API and database"
url="https://ldb.samba.org/"
@@ -20,6 +20,10 @@ source="https://www.samba.org/ftp/pub/ldb/ldb-$pkgver.tar.gz
_waf=buildtools/bin/waf
+case "$CARCH" in
+ ppc64le) options="$options !check" ;;
+esac
+
prepare() {
default_prepare
@@ -72,6 +76,6 @@ tools() {
mv "$pkgdir"/usr/lib/ldb/libldb-cmdline.* "$subpkgdir"/usr/lib/ldb/
}
-sha512sums="6b9a7e6e3f6532ccedb087394b1d2d28f53a034353288bac1ea8d9ca65da5981191e31de6493445daa87684e08cc587886dd7fce19391bd20f1c7d440dbf3fbf ldb-2.1.2.tar.gz
+sha512sums="7e0eecccc973881dde2390568dc71a2ffe7c7ed894daaa9cadf80c221e1b969fd9a8729f3c48a0f611a64b2941c295a2bc7bd8ba869881ba14f75b8bf331167e ldb-2.1.4.tar.gz
ed55d5151bbcaf5c0a1b70a1f44b461a501ad94ce02ee97e3ea10c560ce3656a190510697bbd3c5b6f70a74519bf7c0a91210bcb415ffd97d9440045e10a02e8 disable-compile-error-test.patch
ac50c60082bd761b462f32f949cd6b3bacfd354b3f5dae8bd8655aaa3589e09d6146c42e2edc7c76ca9badd5beec69b5c87cee7cc10e50655cd5c4befd3e4208 disable-failing-test-ppc64le.patch"
diff --git a/main/lftp/APKBUILD b/main/lftp/APKBUILD
index afa2565181..a9370822ac 100644
--- a/main/lftp/APKBUILD
+++ b/main/lftp/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=lftp
-pkgver=4.9.1
+pkgver=4.9.2
pkgrel=0
pkgdesc="Sophisticated ftp/http client"
url="https://lftp.tech"
@@ -42,4 +42,4 @@ check() {
make -C tests check check_PROGRAMS=http-get
}
-sha512sums="303e2354bd61a850403a02ac5b71e54719c12b026c7e36194a6382e9044f1fee93ea581ba0a55fea19981e07b896216e92c7d961c719350762eb0cfb51a2c506 lftp-4.9.1.tar.xz"
+sha512sums="cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad lftp-4.9.2.tar.xz"
diff --git a/main/libcap-ng/APKBUILD b/main/libcap-ng/APKBUILD
index 5834f6262e..07654b528e 100644
--- a/main/libcap-ng/APKBUILD
+++ b/main/libcap-ng/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libcap-ng
pkgver=0.7.10
-pkgrel=0
+pkgrel=1
pkgdesc="POSIX capabilities library"
url="http://people.redhat.com/sgrubb/libcap-ng/index.html"
arch="all"
@@ -11,6 +11,7 @@ makedepends_build=""
makedepends_host="$depends_dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
source="https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-$pkgver.tar.gz
+ async-safe-apply.patch
fix-includes.patch
"
builddir="$srcdir/$pkgname-$pkgver"
@@ -48,4 +49,5 @@ utils() {
}
sha512sums="1b93c7f5c20ae5cc705fe5244af3e299454e988388cda95f006e248d97c0713e77da2a81c67ecf15755f3958df373fc6d1ca14197d6357ab1f2d8c3a0fd12def libcap-ng-0.7.10.tar.gz
+cfd97dab1bb1c93434cc6439f78d3967905002efd91946486978dec9b84df60945a2e5f25c8af79b94c5e3a36c783e9afbaec71b9d322ebed0b0b401a6ff34e6 async-safe-apply.patch
8de98ce0fae63812cf7fd17e788343798b0cab63ba029f046ac9b89b2305da17432bafdd3dfa36046fc2cc0a453e0c889f6744c632f4617e0e5fc08e2823e324 fix-includes.patch"
diff --git a/main/libcap-ng/async-safe-apply.patch b/main/libcap-ng/async-safe-apply.patch
new file mode 100644
index 0000000000..1542863e74
--- /dev/null
+++ b/main/libcap-ng/async-safe-apply.patch
@@ -0,0 +1,29 @@
+Upstream: https://github.com/stevegrubb/libcap-ng/pull/16
+diff --git a/src/cap-ng.c b/src/cap-ng.c
+index 7aa1029..f0ad7e7 100644
+--- a/src/cap-ng.c
++++ b/src/cap-ng.c
+@@ -525,11 +525,12 @@ int capng_apply(capng_select_t set)
+
+ if (set & CAPNG_SELECT_BOUNDS) {
+ #ifdef PR_CAPBSET_DROP
+- void *s = capng_save_state();
++ struct cap_ng state;
++ memcpy(&state, &m, sizeof(state)); /* save state */
+ capng_get_caps_process();
+ if (capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP)) {
+ int i;
+- capng_restore_state(&s);
++ memcpy(&m, &state, sizeof(m)); /* restore state */
+ rc = 0;
+ for (i=0; i <= last_cap && rc == 0; i++)
+ if (capng_have_capability(CAPNG_BOUNDING_SET,
+@@ -538,7 +539,7 @@ int capng_apply(capng_select_t set)
+ if (rc == 0)
+ m.state = CAPNG_APPLIED;
+ } else
+- capng_restore_state(&s);
++ memcpy(&m, &state, sizeof(m)); /* restore state */
+ #else
+ rc = 0;
+ #endif
diff --git a/main/libcap/APKBUILD b/main/libcap/APKBUILD
index be7d315be4..a9d4a36c0e 100644
--- a/main/libcap/APKBUILD
+++ b/main/libcap/APKBUILD
@@ -1,38 +1,33 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libcap
-pkgver=2.27
+pkgver=2.42
pkgrel=0
pkgdesc="POSIX 1003.1e capabilities"
-options="checkroot"
arch="all"
license="BSD-3-Clause OR GPL-2.0-only"
-url="http://www.friedhoff.org/posixfilecaps.html"
+url="https://sites.google.com/site/fullycapable/"
depends_dev="linux-headers"
makedepends_build="linux-headers perl"
makedepends_host="$depends_dev attr-dev"
makedepends="$makedepends_build $makedepends_host"
checkdepends="bash"
-source="https://kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-$pkgver.tar.xz"
+source="https://kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-$pkgver.tar.xz
+ "
subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
-builddir="$srcdir"/$pkgname-$pkgver
build() {
- cd "$builddir"
make BUILD_CC=gcc CC="${CC:-gcc}" lib=lib prefix=/usr DESTDIR="$pkgdir"
}
check() {
- cd "$builddir"
- # Running make test runs the command below but with sudo
- cd progs && LD_LIBRARY_PATH=../libcap ./quicktest.sh
+ make -j1 test
}
package() {
- cd "$builddir"
make lib=lib prefix=/usr RAISE_SETFCAP=no DESTDIR="$pkgdir" install
# Fix perms
- chmod -v 0755 "$pkgdir"/usr/lib/libcap.so.${pkgver}
+ chmod -v 0755 "$pkgdir"/usr/lib/libcap.so.$pkgver
}
static() {
@@ -43,4 +38,4 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
}
-sha512sums="e32335fd3e0d1564574acc73df7030b5b0fd98875217bffabd76f2765f1a7a6f1369f03df2ee22a1782776838784e342378c10613ea1163d53ae5055ab6a62b6 libcap-2.27.tar.xz"
+sha512sums="2abe2d106583a48e3ee0dbc0f82e5ec92a3209cad2abcc1690a12f33364a1dab467b624670a1cdcac0c8d12761e86d5a05bca90aa4199fee75d46e181a695d50 libcap-2.42.tar.xz"
diff --git a/main/libdnet/APKBUILD b/main/libdnet/APKBUILD
index 8d6324a378..f7b9bc620e 100644
--- a/main/libdnet/APKBUILD
+++ b/main/libdnet/APKBUILD
@@ -1,18 +1,18 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libdnet
pkgver=1.12
-pkgrel=7
+pkgrel=8
pkgdesc="A simplified, portable interface to several low-level networking routines"
url="https://github.com/dugsong/libdnet"
arch="all"
-license="BSD"
+license="BSD-3-Clause"
subpackages="$pkgname-dev $pkgname-doc"
makedepends="autoconf automake bash libtool linux-headers"
-source="https://github.com/dugsong/libdnet/archive/$pkgname-$pkgver.tar.gz
+source="https://github.com/dugsong/libdnet/archive/libdnet-$pkgver.tar.gz
automake.patch
"
-
builddir="$srcdir"/$pkgname-$pkgname-$pkgver
+
prepare() {
default_prepare
# the libtool script does not add .so extention to we generate
@@ -22,7 +22,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,7 +32,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/libeconf/APKBUILD b/main/libeconf/APKBUILD
new file mode 100644
index 0000000000..5257d77384
--- /dev/null
+++ b/main/libeconf/APKBUILD
@@ -0,0 +1,27 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Leo <thinkabit.ukim@gmail.com>
+pkgname=libeconf
+pkgver=0.3.8
+pkgrel=0
+pkgdesc="Enhanced Config File Parser"
+url="https://github.com/openSUSE/libeconf"
+arch="all"
+license="MIT"
+makedepends="meson"
+subpackages="$pkgname-dev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/openSUSE/libeconf/archive/v$pkgver.tar.gz"
+
+build() {
+ abuild-meson . output
+ ninja -C output
+}
+
+check() {
+ ninja -C output test
+}
+
+package() {
+ DESTDIR="$pkgdir" ninja -C output install
+}
+
+sha512sums="78b2a27748c1dfa9d4a73e99112e2632142136f7d1f842a9a18b1afd26e4238731415c5a103925a8d03941a5cc041288aa5893d5bc86144a1500dad95c362c34 libeconf-0.3.8.tar.gz"
diff --git a/main/libedit/APKBUILD b/main/libedit/APKBUILD
index 133b76dcc0..7a977bdfe1 100644
--- a/main/libedit/APKBUILD
+++ b/main/libedit/APKBUILD
@@ -2,7 +2,7 @@
pkgname=libedit
pkgver=20191231.3.1
_ver=${pkgver/./-}
-pkgrel=0
+pkgrel=1
pkgdesc="BSD line editing library"
url="https://www.thrysoee.dk/editline"
arch="all"
@@ -35,6 +35,10 @@ check() {
package() {
cd "$builddir"
make DESTDIR="$pkgdir" install
+
+ # Prevent conflict with editline-doc and readline-doc
+ mv "$pkgdir"/usr/share/man/man3/editline.3 \
+ "$pkgdir"/usr/share/man/man3/libedit.3
rm "$pkgdir"/usr/share/man/man3/history.3*
}
diff --git a/main/libevdev/APKBUILD b/main/libevdev/APKBUILD
index f62654b1fb..044d7ead3c 100644
--- a/main/libevdev/APKBUILD
+++ b/main/libevdev/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libevdev
-pkgver=1.9.0
+pkgver=1.9.1
pkgrel=0
pkgdesc="Kernel Evdev Device Wrapper Library"
url="https://www.freedesktop.org/wiki/Software/libevdev"
@@ -12,12 +12,7 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://freedesktop.org/software/libevdev/libevdev-$pkgver.tar.xz"
build() {
- meson \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --localstatedir=/var \
- --buildtype=plain \
+ abuild-meson \
-Dtests=disabled \
-Ddocumentation=enabled \
. output
@@ -28,4 +23,4 @@ package() {
DESTDIR="$pkgdir" ninja -C output install
}
-sha512sums="6e7589b5776437ac23fbf65b3194fb1dd3a68a294696145060cdd97bcdeb9b04f355f2be028dc1a5efe98ef2cafca15e4f61115edf5d62591e3a8944dc95942a libevdev-1.9.0.tar.xz"
+sha512sums="7d845ce2279d2e2ef12437f6218550265ea0c85e5b6c0d116aff09787b73626b338fe3084baff060085d393688b5ae3d33772689e0581684eff257af01c4c645 libevdev-1.9.1.tar.xz"
diff --git a/main/libevent/APKBUILD b/main/libevent/APKBUILD
index 9de9f3175c..ae49adf39d 100644
--- a/main/libevent/APKBUILD
+++ b/main/libevent/APKBUILD
@@ -1,11 +1,11 @@
# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libevent
-pkgver=2.1.11
+pkgver=2.1.12
_pkgver=$pkgver-stable
pkgrel=1
pkgdesc="An event notification library"
-url="http://libevent.org/"
+url="https://libevent.org/"
arch="all"
license="BSD-3-Clause"
options="!check" # regression tests failed
@@ -59,4 +59,4 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
}
-sha512sums="9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3 libevent-2.1.11-stable.tar.gz"
+sha512sums="88d8944cd75cbe78bc4e56a6741ca67c017a3686d5349100f1c74f8a68ac0b6410ce64dff160be4a4ba0696ee29540dfed59aaf3c9a02f0c164b00307fcfe84f libevent-2.1.12-stable.tar.gz"
diff --git a/main/libgcrypt/APKBUILD b/main/libgcrypt/APKBUILD
index 1ed022721c..6c93cb13c9 100644
--- a/main/libgcrypt/APKBUILD
+++ b/main/libgcrypt/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libgcrypt
-pkgver=1.8.5
+pkgver=1.8.6
pkgrel=0
pkgdesc="general purpose crypto library based on the code used in GnuPG"
url="https://www.gnupg.org/"
@@ -61,4 +61,4 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
}
-sha512sums="b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89 libgcrypt-1.8.5.tar.bz2"
+sha512sums="28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b libgcrypt-1.8.6.tar.bz2"
diff --git a/main/libical/APKBUILD b/main/libical/APKBUILD
index 007877d3bd..78747669bd 100644
--- a/main/libical/APKBUILD
+++ b/main/libical/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libical
pkgver=3.0.8
-pkgrel=2
+pkgrel=4
pkgdesc="Reference implementation of the iCalendar format"
url="https://libical.github.io/libical/"
arch="all"
diff --git a/main/libinput/APKBUILD b/main/libinput/APKBUILD
index 62c5ab3816..1d0834a946 100644
--- a/main/libinput/APKBUILD
+++ b/main/libinput/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Daniel Sabogal <dsabogalcc@gmail.com>
pkgname=libinput
-pkgver=1.15.5
-pkgrel=0
+pkgver=1.15.6
+pkgrel=1
pkgdesc="Library for handling input devices"
url="https://www.freedesktop.org/wiki/Software/libinput"
arch="all"
@@ -39,6 +39,14 @@ package() {
DESTDIR="$pkgdir" ninja -C builddir/ install
}
+libs() {
+ default_libs
+
+ mv "$pkgdir"/usr/lib/udev "$subpkgdir"/usr/lib
+ mkdir -p "$subpkgdir"/usr/share/
+ mv "$pkgdir"/usr/share/libinput "$subpkgdir"/usr/share
+}
+
zshcomp() {
depends=""
pkgdesc="Zsh completions for $pkgname"
@@ -47,4 +55,4 @@ zshcomp() {
amove usr/share/zsh/site-functions
}
-sha512sums="a0a3a325048841fc017e19d3bc5f5490605972ab9e2730dc5678bda7efb7a5b1fa6f531f3c8abd8393899ec383d8d2bcfd586eacee04fc1fbda0e02ba2af956a libinput-1.15.5.tar.xz"
+sha512sums="90459e5a1f22fd42ffcbab157b461e4514c30803bcebdaced76c65c05cccfa6f259640a50497055fe7ed0b376a6979f6d1d01227ae447fe60ba88fa81142b969 libinput-1.15.6.tar.xz"
diff --git a/main/libjpeg-turbo/APKBUILD b/main/libjpeg-turbo/APKBUILD
index e8b4c25595..edd02814fa 100644
--- a/main/libjpeg-turbo/APKBUILD
+++ b/main/libjpeg-turbo/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libjpeg-turbo
-pkgver=2.0.4
-pkgrel=1
+pkgver=2.0.5
+pkgrel=0
pkgdesc="Accelerated baseline JPEG compression and decompression library"
url="https://libjpeg-turbo.org/"
arch="all"
@@ -16,6 +16,8 @@ source="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.ta
[ "$CARCH" = "mips64" ] && options="!check"
# secfixes:
+# 2.0.4-r2:
+# - CVE-2020-13790
# 2.0.4-r0:
# - CVE-2019-2201
# 2.0.2-r0:
@@ -69,4 +71,4 @@ dev() {
replaces="jpeg-dev"
}
-sha512sums="708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9 libjpeg-turbo-2.0.4.tar.gz"
+sha512sums="5bf9ecf069b43783ff24365febf36dda69ccb92d6397efec6069b2b4f359bfd7b87934a6ce4311873220fccc73acabdacef5ce0604b79209eb1912e8ba478555 libjpeg-turbo-2.0.5.tar.gz"
diff --git a/main/liblogging/APKBUILD b/main/liblogging/APKBUILD
index 9c7c7a147d..bd42f7083f 100644
--- a/main/liblogging/APKBUILD
+++ b/main/liblogging/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer:
pkgname=liblogging
pkgver=1.0.6
-pkgrel=0
+pkgrel=1
pkgdesc="An easy to use logging library"
url="http://www.liblogging.org/"
arch="all"
-license="BSD"
+license="BSD-2-Clause"
depends=""
subpackages="$pkgname-dev $pkgname-doc"
source="http://download.rsyslog.com/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/main/libmaxminddb/APKBUILD b/main/libmaxminddb/APKBUILD
index 79d733681d..7866e6b451 100644
--- a/main/libmaxminddb/APKBUILD
+++ b/main/libmaxminddb/APKBUILD
@@ -1,21 +1,20 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libmaxminddb
-pkgver=1.4.2
-pkgrel=1
+pkgver=1.4.3
+pkgrel=0
pkgdesc="Maxmind GeoIP2 database library"
url="https://github.com/maxmind/libmaxminddb"
arch="all"
license="Apache-2.0"
depends="curl"
checkdepends="perl"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-openrc"
source="$url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz
libmaxminddb.cron
libmaxminddb.confd
"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,20 +24,18 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make install DESTDIR="$pkgdir"
# install alpine specifics
mkdir -p "$pkgdir"/var/lib/libmaxminddb
- install -m755 -D "$srcdir"/libmaxminddb.cron "$pkgdir"/etc/periodic/weekly/libmaxminddb
- install -m755 -D "$srcdir"/libmaxminddb.confd "$pkgdir"/etc/conf.d/libmaxminddb
+ install -Dm755 "$srcdir"/libmaxminddb.cron "$pkgdir"/etc/periodic/weekly/libmaxminddb
+ install -Dm644 "$srcdir"/libmaxminddb.confd "$pkgdir"/etc/conf.d/libmaxminddb
}
-sha512sums="bc18d2f19a74639888a466483afde1bccfc3a83787011a6f38808b76e5a513c9912ff369ccbf584091d4def657e0574b16b35dc69ab12ae4c439aaaf3669c4c1 libmaxminddb-1.4.2.tar.gz
+sha512sums="7fd97678ea6ca41cc4530864276b0233acbb16208571dc4694902943b3aa7e97c683c5676ea3f2de948c67aebd083f5d073b9ae36b7e89059c17f797ffddf65e libmaxminddb-1.4.3.tar.gz
f6d3dbee35da062a701d57dda96739dc7ccf753f30ce8a6c3b4dc281054a3a6e82cda4f515bf32652daabf85267bb3979ea0f18e6cbef270e41b2d0c72d50e1c libmaxminddb.cron
03bdfd6d1d508ea5261a396ac9539f363dcb477b9cf11fd4c9b01001e03205fa667cde21295dc0cc3d38db50adebb9c57e147a22fc7945de7c72d75d10637128 libmaxminddb.confd"
diff --git a/main/libmnl/APKBUILD b/main/libmnl/APKBUILD
index 853f319694..194a407df3 100644
--- a/main/libmnl/APKBUILD
+++ b/main/libmnl/APKBUILD
@@ -2,31 +2,32 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=libmnl
pkgver=1.0.4
-pkgrel=0
+pkgrel=1
pkgdesc="Library for minimalistic netlink"
url="http://www.netfilter.org/projects/libmnl/"
arch="all"
license="GPL"
-depends=
depends_dev="linux-headers"
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-dev"
-source="https://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"
-builddir="$srcdir"/$pkgname-$pkgver
+makedepends="$depends_dev bsd-compat-headers"
+subpackages="$pkgname-static $pkgname-dev"
+source="https://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2
+ musl-fix-headers.patch"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
- || return 1
+ --enable-static
+}
+
+check() {
+ make check
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
}
-sha512sums="e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9 libmnl-1.0.4.tar.bz2"
+sha512sums="e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9 libmnl-1.0.4.tar.bz2
+984307f6a40bdd1231cf97ac84719eefaf436544bcad3a52f8590ab73676ac3064f44af65b57dfb7920aa3c84a44977e385410faf354a0a64efc5364b4314496 musl-fix-headers.patch"
diff --git a/main/libmnl/musl-fix-headers.patch b/main/libmnl/musl-fix-headers.patch
new file mode 100644
index 0000000000..f3338b1035
--- /dev/null
+++ b/main/libmnl/musl-fix-headers.patch
@@ -0,0 +1,13 @@
+diff --git a/examples/netfilter/nfct-daemon.c b/examples/netfilter/nfct-daemon.c
+index a97c2ec..e3bb17a 100644
+--- a/examples/netfilter/nfct-daemon.c
++++ b/examples/netfilter/nfct-daemon.c
+@@ -20,6 +20,8 @@
+ #include <linux/netfilter/nfnetlink_conntrack.h>
+
+ #include <sys/queue.h>
++#include <sys/time.h>
++#include <sys/select.h>
+
+ struct nstats {
+ LIST_ENTRY(nstats) list;
diff --git a/main/libnet/APKBUILD b/main/libnet/APKBUILD
index 64fab20fd5..1842f5f8f7 100644
--- a/main/libnet/APKBUILD
+++ b/main/libnet/APKBUILD
@@ -1,28 +1,17 @@
# Contributor: Mika Havela <mika.havela@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libnet
-pkgver=1.1.6
-pkgrel=3
+pkgver=1.2
+pkgrel=0
pkgdesc="A generic networking API that provides access to several protocols."
url="https://sourceforge.net/projects/libnet-dev/"
arch="all"
license="BSD-2-Clause"
-makedepends="autoconf automake libtool linux-headers"
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://downloads.sourceforge.net/project/libnet-dev/libnet-$pkgver.tar.gz
- fix-includes.patch
- "
-
-
-prepare() {
- default_prepare
- cd "$builddir"
- update_config_sub
-}
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
+source="https://github.com/libnet/libnet/releases/download/v$pkgver/libnet-$pkgver.tar.gz
+ fix-types.patch"
build() {
- cd "$builddir"
-
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,9 +21,8 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="a67e502b0e6957ca590e47cb50b0472dd83d622d84c62818d665d771616df91b5a8fa8fcf1040d13b7860aaabaf338152ef40f66ab97c3fc9502edb08cea0bb6 libnet-1.1.6.tar.gz
-6cde8d5c5c3c34f9a02df5ae472f23b823aab293eed2588bbd6c836d228b1c180dc04208916cd6be7b11e02d6e5b2bfffda5e34ec1ceb99e83d1adfafff09231 fix-includes.patch"
+sha512sums="84430f24e000eb7728b1fbb5e620716d13d193e8b9e024cf56a08fbeeeaaf56c9122caaf7647f01e6b38b73212e592fa5cc4e8ff56b1d5f5a73aea462e84edd6 libnet-1.2.tar.gz
+1c32c8fe62b04546550f4d961fdb4abf10a1faef8f76def691fb6c57dccb7166b5dc0b8c007b99e0d95138fce4be92c2bc72a618c6b8b7c5149bf04192aaece7 fix-types.patch"
diff --git a/main/libnet/fix-includes.patch b/main/libnet/fix-includes.patch
deleted file mode 100644
index 5eb86bc37b..0000000000
--- a/main/libnet/fix-includes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- libnet-1.1.6.orig/src/libnet_link_linux.c
-+++ libnet-1.1.6/src/libnet_link_linux.c
-@@ -30,26 +30,15 @@
- #include <sys/time.h>
-
- #include <net/if.h>
--#if (__GLIBC__)
- #include <netinet/if_ether.h>
- #include <net/if_arp.h>
--#else
--#include <linux/if_arp.h>
--#include <linux/if_ether.h>
--#endif
-
- #if (HAVE_PACKET_SOCKET)
- #ifndef SOL_PACKET
- #define SOL_PACKET 263
- #endif /* SOL_PACKET */
--#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1
- #include <netpacket/packet.h>
- #include <net/ethernet.h> /* the L2 protocols */
--#else
--#include <asm/types.h>
--#include <linux/if_packet.h>
--#include <linux/if_ether.h> /* The L2 protocols */
--#endif
- #endif /* HAVE_PACKET_SOCKET */
-
- #include "../include/libnet.h"
diff --git a/main/libnet/fix-types.patch b/main/libnet/fix-types.patch
new file mode 100644
index 0000000000..38b1f536a3
--- /dev/null
+++ b/main/libnet/fix-types.patch
@@ -0,0 +1,15 @@
+--- a/include/libnet/libnet-structures.h
++++ b/include/libnet/libnet-structures.h
+@@ -49,9 +49,9 @@
+ /* libnet statistics structure */
+ struct libnet_stats
+ {
+- __int64_t packets_sent; /* packets sent */
+- __int64_t packet_errors; /* packets errors */
+- __int64_t bytes_written; /* bytes written */
++ int64_t packets_sent; /* packets sent */
++ int64_t packet_errors; /* packets errors */
++ int64_t bytes_written; /* bytes written */
+ };
+
+
diff --git a/main/libnftnl/APKBUILD b/main/libnftnl/APKBUILD
index a4d87811a6..d0dccc1bcb 100644
--- a/main/libnftnl/APKBUILD
+++ b/main/libnftnl/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=libnftnl
-pkgver=1.1.6
+pkgver=1.1.7
pkgrel=0
pkgdesc="Netfilter library providing interface to the nf_tables subsystem"
url="https://netfilter.org/projects/libnftnl"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="3de13cb667060f0942c8dd9e139ee8c7aff1854c544793774a827c01d06e432a4ce05d54846e1062aa620b5e54533da09daa9588467866c82c9119ef4cfbb57d libnftnl-1.1.6.tar.bz2"
+sha512sums="80fd09147b1e2c1533cc2c8347d35137ff94f14118d5ba7bf3c1fbd0a226f6443560d5eca03273129e091b3442f820cd24455e72e917a8b7fedc8f3c9b6dc407 libnftnl-1.1.7.tar.bz2"
diff --git a/main/librelp/APKBUILD b/main/librelp/APKBUILD
index fc7aa068b1..d14f2a4aed 100644
--- a/main/librelp/APKBUILD
+++ b/main/librelp/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=librelp
-pkgver=1.5.0
+pkgver=1.6.0
pkgrel=0
pkgdesc="The Reliable Event Logging Protocol library"
url="https://www.rsyslog.com"
@@ -9,7 +9,7 @@ arch="all"
license="GPL-3.0-or-later"
makedepends="gnutls-dev openssl-dev"
subpackages="$pkgname-static $pkgname-dev"
-source="http://download.rsyslog.com/librelp/librelp-$pkgver.tar.gz"
+source="https://download.rsyslog.com/librelp/librelp-$pkgver.tar.gz"
options="!check" # XXX: all tests fail, don't know why
build() {
@@ -25,4 +25,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="b7fb35e4ddb5c3c14ef733699405f8aa62911adef305cd4f494170e111bc61a9208b84dab472a708582cd76ad9976894dae0e7574e60acdae2b56491aa7daf36 librelp-1.5.0.tar.gz"
+sha512sums="1bf96b700fa5ab648ed671b341ae7101fc1db4107f178abd507647afe4f12d59a94c821cc0e06998ac7b344ed41a5e3821843c722c82bf5284c6556995391228 librelp-1.6.0.tar.gz"
diff --git a/main/libressl/APKBUILD b/main/libressl/APKBUILD
index 86a81b4e4c..38671ce33c 100644
--- a/main/libressl/APKBUILD
+++ b/main/libressl/APKBUILD
@@ -10,7 +10,7 @@
# - CVE-2017-8301
#
pkgname=libressl
-pkgver=3.1.2
+pkgver=3.1.3
_namever=${pkgname}${pkgver%.*}
pkgrel=0
pkgdesc="Version of the TLS/crypto stack forked from OpenSSL"
@@ -93,7 +93,7 @@ _libs() {
fi
}
-sha512sums="b024c5661777daa73feff7085ce7be76a2e766d2f3cb5ca35c208c471e5651a365252758ca36782e20cdfb2bc8171919a08ad592420878a5c95fbe646f5288c8 libressl-3.1.2.tar.gz
+sha512sums="f9f497fe5d09b8b762175da038a8e67d9d2567462fefc49e434d306a3071ba3a4d369c89143d9d90e3bbcc7b9ba051c9c923a0dfc41d856edc08ae59fa727ee8 libressl-3.1.3.tar.gz
9f1628fbc2a697b6570353920d784b161ca0a122047066d8bee15225bad1e5271aa2ed72b145506bcd4ffe58b35da2caf38c4a048db7e014dabd16b5eba44581 starttls-ldap.patch
18e72b7db28664ee4e294a4a461e48daa90be9e9323584112a5878fd56a578d02f4730c7c788f57cc39b2bc35447df0a47a4391077d764d953419890ad511d35 ssl-libcompat.patch
4c992872addbe4fd612ba9e3f859b5ba69b448aafa7676751ca7ca09bbcfc47a2a1cad468c235f8d1a65c65e8efb38f27c512a32b444346c39ec0d8dcfbcd346 s_client-add-options-verify_.patch"
diff --git a/main/libseccomp/APKBUILD b/main/libseccomp/APKBUILD
index 164fc0c214..2652ed3902 100644
--- a/main/libseccomp/APKBUILD
+++ b/main/libseccomp/APKBUILD
@@ -2,19 +2,18 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Contributor: Dan Williams <dan@ma.ssive.co>
pkgname=libseccomp
-pkgver=2.4.3
-pkgrel=0
+pkgver=2.5.0
+pkgrel=1
pkgdesc="An interface to the Linux Kernel's syscall filtering mechanism"
url="https://github.com/seccomp/libseccomp"
arch="all"
license="LGPL-2.1-or-later"
depends_dev="linux-headers"
-makedepends="$depends_dev"
+makedepends="$depends_dev gperf"
checkdepends="bash"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
source="https://github.com/seccomp/libseccomp/releases/download/v$pkgver/libseccomp-$pkgver.tar.gz
remove-redefinition-prctl.patch
- fix-performace-regression.patch
"
case "$CARCH" in
@@ -33,6 +32,7 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
+ --enable-static \
--localstatedir=/var
make
}
@@ -51,6 +51,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="7b7af2e98493243ffe1934fefff5723b24ae9b9bdc4bf039343ee8456c15acb0ea34e81ec292a41143848272aeca794ef92ad38fc3f42c77465170cb540479ef libseccomp-2.4.3.tar.gz
-f2c31dcafdc9a1ad78e32e76b75e1c1603071eaa3f979e1f2483b879a34ad07e0a4ef3642196a695415cdf81e1ed2bf325175872fb4e203ef9d0e668c287493f remove-redefinition-prctl.patch
-c9dd939552089b006e03b94a323c9932806b0681b493b3365c291273cff4485b1066a73919a85dff238fc10e33cd4f67c99645049b0696ba0d6f229aac8d8b81 fix-performace-regression.patch"
+sha512sums="00ef5aeb4db8dafb546ae680b2d6d9b6aeed008df805d0f28f9dd15c074ff6ea7a5e5131ab503825b8011c59aa23046baedd5849ca040aa73352f43ab2d602ae libseccomp-2.5.0.tar.gz
+f2c31dcafdc9a1ad78e32e76b75e1c1603071eaa3f979e1f2483b879a34ad07e0a4ef3642196a695415cdf81e1ed2bf325175872fb4e203ef9d0e668c287493f remove-redefinition-prctl.patch"
diff --git a/main/libseccomp/fix-performace-regression.patch b/main/libseccomp/fix-performace-regression.patch
deleted file mode 100644
index 88ba597cc6..0000000000
--- a/main/libseccomp/fix-performace-regression.patch
+++ /dev/null
@@ -1,361 +0,0 @@
-From 21b98d85e8bfdb701a5f9afd54ff5175af910a45 Mon Sep 17 00:00:00 2001
-From: Paul Moore <paul@paul-moore.com>
-Date: Fri, 1 Nov 2019 12:05:58 -0400
-Subject: [PATCH] db: consolidate some of the code which adds rules to a single
- filter
-
-Pay back some of the technical debt in db_col_rule_add(), no logic
-changes in this patch, just removing some code duplication.
-
-Acked-by: Tom Hromatka <tom.hromatka@oracle.com>
-Signed-off-by: Paul Moore <paul@paul-moore.com>
----
- src/db.c | 85 +++++++++++++++++++++++++++++---------------------------
- 1 file changed, 44 insertions(+), 41 deletions(-)
-
-diff --git a/src/db.c b/src/db.c
-index 03e1ba3..6a30c64 100644
---- a/src/db.c
-+++ b/src/db.c
-@@ -2179,6 +2179,44 @@ int db_col_syscall_priority(struct db_filter_col *col,
- return rc;
- }
-
-+/**
-+ * Add a new rule to a single filter
-+ * @param filter the filter
-+ * @param rule the filter rule
-+ *
-+ * This is a helper function for db_col_rule_add() and similar functions, it
-+ * isn't generally useful. Returns zero on success, negative values on error.
-+ *
-+ */
-+static int _db_col_rule_add(struct db_filter *filter,
-+ struct db_api_rule_list *rule)
-+{
-+ int rc;
-+ struct db_api_rule_list *iter;
-+
-+ /* add the rule to the filter */
-+ rc = arch_filter_rule_add(filter, rule);
-+ if (rc != 0)
-+ return rc;
-+
-+ /* insert the chain to the end of the rule list */
-+ iter = rule;
-+ while (iter->next)
-+ iter = iter->next;
-+ if (filter->rules != NULL) {
-+ rule->prev = filter->rules->prev;
-+ iter->next = filter->rules;
-+ filter->rules->prev->next = rule;
-+ filter->rules->prev = iter;
-+ } else {
-+ rule->prev = iter;
-+ iter->next = rule;
-+ filter->rules = rule;
-+ }
-+
-+ return 0;
-+}
-+
- /**
- * Add a new rule to the current filter
- * @param col the filter collection
-@@ -2207,7 +2245,7 @@ int db_col_rule_add(struct db_filter_col *col,
- size_t chain_size;
- struct db_api_arg *chain = NULL;
- struct scmp_arg_cmp arg_data;
-- struct db_api_rule_list *rule, *rule_tmp;
-+ struct db_api_rule_list *rule;
- struct db_filter *db;
-
- /* collect the arguments for the filter rule */
-@@ -2255,9 +2293,6 @@ int db_col_rule_add(struct db_filter_col *col,
-
- /* add the rule to the different filters in the collection */
- for (iter = 0; iter < col->filter_cnt; iter++) {
--
-- /* TODO: consolidate with db_col_transaction_start() */
--
- db = col->filters[iter];
-
- /* create the rule */
-@@ -2268,24 +2303,10 @@ int db_col_rule_add(struct db_filter_col *col,
- }
-
- /* add the rule */
-- rc_tmp = arch_filter_rule_add(db, rule);
-- if (rc_tmp == 0) {
-- /* insert the chain to the end of the rule list */
-- rule_tmp = rule;
-- while (rule_tmp->next)
-- rule_tmp = rule_tmp->next;
-- if (db->rules != NULL) {
-- rule->prev = db->rules->prev;
-- rule_tmp->next = db->rules;
-- db->rules->prev->next = rule;
-- db->rules->prev = rule_tmp;
-- } else {
-- rule->prev = rule_tmp;
-- rule_tmp->next = rule;
-- db->rules = rule;
-- }
-- } else
-+ rc_tmp = _db_col_rule_add(db, rule);
-+ if (rc_tmp != 0)
- free(rule);
-+
- add_arch_fail:
- if (rc_tmp != 0 && rc == 0)
- rc = rc_tmp;
-@@ -2320,7 +2341,7 @@ int db_col_transaction_start(struct db_filter_col *col)
- unsigned int iter;
- struct db_filter_snap *snap;
- struct db_filter *filter_o, *filter_s;
-- struct db_api_rule_list *rule_o, *rule_s = NULL, *rule_tmp;
-+ struct db_api_rule_list *rule_o, *rule_s = NULL;
-
- /* allocate the snapshot */
- snap = zmalloc(sizeof(*snap));
-@@ -2350,33 +2371,15 @@ int db_col_transaction_start(struct db_filter_col *col)
- if (rule_o == NULL)
- continue;
- do {
--
-- /* TODO: consolidate with db_col_rule_add() */
--
- /* duplicate the rule */
- rule_s = db_rule_dup(rule_o);
- if (rule_s == NULL)
- goto trans_start_failure;
-
- /* add the rule */
-- rc = arch_filter_rule_add(filter_s, rule_s);
-+ rc = _db_col_rule_add(filter_s, rule_s);
- if (rc != 0)
- goto trans_start_failure;
--
-- /* insert the chain to the end of the rule list */
-- rule_tmp = rule_s;
-- while (rule_tmp->next)
-- rule_tmp = rule_tmp->next;
-- if (filter_s->rules != NULL) {
-- rule_s->prev = filter_s->rules->prev;
-- rule_tmp->next = filter_s->rules;
-- filter_s->rules->prev->next = rule_s;
-- filter_s->rules->prev = rule_tmp;
-- } else {
-- rule_s->prev = rule_tmp;
-- rule_tmp->next = rule_s;
-- filter_s->rules = rule_s;
-- }
- rule_s = NULL;
-
- /* next rule */
-From 19af04da86e9a4168a443f3563fc7aec8839edf0 Mon Sep 17 00:00:00 2001
-From: Paul Moore <paul@paul-moore.com>
-Date: Mon, 4 Nov 2019 20:15:20 -0500
-Subject: [PATCH] db: add shadow transactions
-
-Creating a transaction can be very time consuming on large filters since we
-create a duplicate filter tree iteratively using the rules supplied by the
-caller. In an effort to speed this up we introduce the idea of shadow
-transactions where on a successful transaction commit we preserve the old
-transaction checkpoint and bring it up to date with the current filter and
-save it for future use. The next time we start a new transaction we check
-to see if a shadow transaction exists, if it does we use that instead of
-creating a new transaction checkpoint from scratch.
-
-Acked-by: Tom Hromatka <tom.hromatka@oracle.com>
-Signed-off-by: Paul Moore <paul@paul-moore.com>
----
- src/db.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
- src/db.h | 1 +
- 2 files changed, 127 insertions(+), 1 deletion(-)
-
-diff --git a/src/db.c b/src/db.c
-index 6a30c64..a40cb2b 100644
---- a/src/db.c
-+++ b/src/db.c
-@@ -909,6 +909,9 @@ static void _db_snap_release(struct db_filter_snap *snap)
- {
- unsigned int iter;
-
-+ if (snap == NULL)
-+ return;
-+
- if (snap->filter_cnt > 0) {
- for (iter = 0; iter < snap->filter_cnt; iter++) {
- if (snap->filters[iter])
-@@ -1134,6 +1137,7 @@ struct db_filter_col *db_col_init(uint32_t def_action)
- void db_col_release(struct db_filter_col *col)
- {
- unsigned int iter;
-+ struct db_filter_snap *snap;
-
- if (col == NULL)
- return;
-@@ -1141,6 +1145,13 @@ void db_col_release(struct db_filter_col *col)
- /* set the state, just in case */
- col->state = _DB_STA_FREED;
-
-+ /* free any snapshots */
-+ while (col->snapshots != NULL) {
-+ snap = col->snapshots;
-+ col->snapshots = snap->next;
-+ _db_snap_release(snap);
-+ }
-+
- /* free any filters */
- for (iter = 0; iter < col->filter_cnt; iter++)
- _db_release(col->filters[iter]);
-@@ -2343,6 +2354,20 @@ int db_col_transaction_start(struct db_filter_col *col)
- struct db_filter *filter_o, *filter_s;
- struct db_api_rule_list *rule_o, *rule_s = NULL;
-
-+ /* check to see if a shadow snapshot exists */
-+ if (col->snapshots && col->snapshots->shadow) {
-+ /* we have a shadow! this will be easy */
-+
-+ /* NOTE: we don't bother to do any verification of the shadow
-+ * because we start a new transaction every time we add
-+ * a new rule to the filter(s); if this ever changes we
-+ * will need to add a mechanism to verify that the shadow
-+ * transaction is current/correct */
-+
-+ col->snapshots->shadow = false;
-+ return 0;
-+ }
-+
- /* allocate the snapshot */
- snap = zmalloc(sizeof(*snap));
- if (snap == NULL)
-@@ -2436,14 +2461,114 @@ void db_col_transaction_abort(struct db_filter_col *col)
- * Commit the top most seccomp filter transaction
- * @param col the filter collection
- *
-- * This function commits the most recent seccomp filter transaction.
-+ * This function commits the most recent seccomp filter transaction and
-+ * attempts to create a shadow transaction that is a duplicate of the current
-+ * filter to speed up future transactions.
- *
- */
- void db_col_transaction_commit(struct db_filter_col *col)
- {
-+ int rc;
-+ unsigned int iter;
- struct db_filter_snap *snap;
-+ struct db_filter *filter_o, *filter_s;
-+ struct db_api_rule_list *rule_o, *rule_s;
-
- snap = col->snapshots;
-+ if (snap == NULL)
-+ return;
-+
-+ /* check for a shadow set by a higher transaction commit */
-+ if (snap->shadow) {
-+ /* leave the shadow intact, but drop the next snapshot */
-+ if (snap->next) {
-+ snap->next = snap->next->next;
-+ _db_snap_release(snap->next);
-+ }
-+ return;
-+ }
-+
-+ /* adjust the number of filters if needed */
-+ if (col->filter_cnt > snap->filter_cnt) {
-+ unsigned int tmp_i;
-+ struct db_filter **tmp_f;
-+
-+ /* add filters */
-+ tmp_f = realloc(snap->filters,
-+ sizeof(struct db_filter *) * col->filter_cnt);
-+ if (tmp_f == NULL)
-+ goto shadow_err;
-+ snap->filters = tmp_f;
-+ do {
-+ tmp_i = snap->filter_cnt;
-+ snap->filters[tmp_i] =
-+ _db_init(col->filters[tmp_i]->arch);
-+ if (snap->filters[tmp_i] == NULL)
-+ goto shadow_err;
-+ snap->filter_cnt++;
-+ } while (snap->filter_cnt < col->filter_cnt);
-+ } else if (col->filter_cnt < snap->filter_cnt) {
-+ /* remove filters */
-+
-+ /* NOTE: while we release the filters we no longer need, we
-+ * don't bother to resize the filter array, we just
-+ * adjust the filter counter, this *should* be harmless
-+ * at the cost of a not reaping all the memory possible */
-+
-+ do {
-+ _db_release(snap->filters[snap->filter_cnt--]);
-+ } while (snap->filter_cnt > col->filter_cnt);
-+ }
-+
-+ /* loop through each filter and update the rules on the snapshot */
-+ for (iter = 0; iter < col->filter_cnt; iter++) {
-+ filter_o = col->filters[iter];
-+ filter_s = snap->filters[iter];
-+
-+ /* skip ahead to the new rule(s) */
-+ rule_o = filter_o->rules;
-+ rule_s = filter_s->rules;
-+ if (rule_o == NULL)
-+ /* nothing to shadow */
-+ continue;
-+ if (rule_s != NULL) {
-+ do {
-+ rule_o = rule_o->next;
-+ rule_s = rule_s->next;
-+ } while (rule_s != filter_s->rules);
-+
-+ /* did we actually add any rules? */
-+ if (rule_o == filter_o->rules)
-+ /* no, we are done in this case */
-+ continue;
-+ }
-+
-+ /* update the old snapshot to make it a shadow */
-+ do {
-+ /* duplicate the rule */
-+ rule_s = db_rule_dup(rule_o);
-+ if (rule_s == NULL)
-+ goto shadow_err;
-+
-+ /* add the rule */
-+ rc = _db_col_rule_add(filter_s, rule_s);
-+ if (rc != 0) {
-+ free(rule_s);
-+ goto shadow_err;
-+ }
-+
-+ /* next rule */
-+ rule_o = rule_o->next;
-+ } while (rule_o != filter_o->rules);
-+ }
-+
-+ /* success, mark the snapshot as a shadow and return */
-+ snap->shadow = true;
-+ return;
-+
-+shadow_err:
-+ /* we failed making a shadow, cleanup and return */
- col->snapshots = snap->next;
- _db_snap_release(snap);
-+ return;
- }
-diff --git a/src/db.h b/src/db.h
-index c181038..9dce65a 100644
---- a/src/db.h
-+++ b/src/db.h
-@@ -135,6 +135,7 @@ struct db_filter_snap {
- /* individual filters */
- struct db_filter **filters;
- unsigned int filter_cnt;
-+ bool shadow;
-
- struct db_filter_snap *next;
- };
diff --git a/main/libva-glx/APKBUILD b/main/libva-glx/APKBUILD
index bafb521697..52e199fd14 100644
--- a/main/libva-glx/APKBUILD
+++ b/main/libva-glx/APKBUILD
@@ -3,7 +3,7 @@
# this package is to resolve the circular dependency libva -> mesa -> libva
pkgname=libva-glx
-pkgver=2.7.1
+pkgver=2.8.0
pkgrel=0
pkgdesc="Video Acceleration (VA) API for Linux with MESA support"
url="https://01.org/linuxmedia"
@@ -49,4 +49,4 @@ package() {
mv $builddir/temp/* $pkgdir
}
-sha512sums="92cef4418eed3a0c6c0d9111abf65bbbd0163c4de5d902ae5219f51b825d4bb269aa39842f2a929d237612af58fbceb9785eebc5cb82cdd6aa68e253826cac8e libva-2.7.1.tar.gz"
+sha512sums="a6673c85205b68ba63cc9c61a1c30216cc29196843e659e91a41f64f1938c7ac3dbf0552bda32dd3dcf9dbf43695c8f29000eb6c9e41cb0db2aaaa10189ad502 libva-2.8.0.tar.gz"
diff --git a/main/libva/APKBUILD b/main/libva/APKBUILD
index 30f395a0b5..7ca1e16859 100644
--- a/main/libva/APKBUILD
+++ b/main/libva/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libva
-pkgver=2.7.1
+pkgver=2.8.0
pkgrel=0
pkgdesc="Video Acceleration (VA) API for Linux"
url="https://01.org/linuxmedia"
@@ -37,4 +37,4 @@ package() {
DESTDIR="$pkgdir" ninja -C builddir install
}
-sha512sums="92cef4418eed3a0c6c0d9111abf65bbbd0163c4de5d902ae5219f51b825d4bb269aa39842f2a929d237612af58fbceb9785eebc5cb82cdd6aa68e253826cac8e libva-2.7.1.tar.gz"
+sha512sums="a6673c85205b68ba63cc9c61a1c30216cc29196843e659e91a41f64f1938c7ac3dbf0552bda32dd3dcf9dbf43695c8f29000eb6c9e41cb0db2aaaa10189ad502 libva-2.8.0.tar.gz"
diff --git a/main/libvirt/APKBUILD b/main/libvirt/APKBUILD
index 6b3efeb199..eb1ccea730 100644
--- a/main/libvirt/APKBUILD
+++ b/main/libvirt/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=libvirt
-pkgver=6.3.0
+pkgver=6.6.0
_ver="${pkgver/_rc/-rc}"
-pkgrel=0
+pkgrel=3
pkgdesc="A virtualization API for several hypervisor and container systems"
url="https://libvirt.org/"
arch="all"
@@ -23,16 +23,20 @@ makedepends="augeas-dev cyrus-sasl-dev device-mapper
automake autoconf libtool rpcsvc-proto py3-docutils
"
install="$pkgname.post-install"
-subpackages="$pkgname-static $pkgname-libs $pkgname-dev $pkgname-doc $pkgname-client $pkgname-daemon
+subpackages="$pkgname-dbg $pkgname-static $pkgname-libs $pkgname-dev $pkgname-doc $pkgname-client $pkgname-daemon
$pkgname-lang $pkgname-lxc $pkgname-qemu $pkgname-uml::noarch $pkgname-vbox
$pkgname-bash-completion:bashcomp:noarch"
source="https://libvirt.org/sources/libvirt-$pkgver.tar.xz
libvirt.confd
libvirt.initd
+ libvirt-guests.confd
+ libvirt-guests.initd
virtlogd.initd
virtlockd.initd
musl-fix-includes.patch
stderr-fix.patch
+ libvirt-fork-exec-deadlock.patch
+ libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch
"
if [ "$CARCH" = "x86_64" ]; then
subpackages="$subpackages $pkgname-xen"
@@ -83,10 +87,14 @@ build() {
package() {
cd build
make DESTDIR="$pkgdir" install
- install -D -m755 $srcdir/$pkgname.initd $pkgdir/etc/init.d/libvirtd
- install -D -m755 $srcdir/$pkgname.confd $pkgdir/etc/conf.d/libvirtd
- install -D -m755 $srcdir/virtlogd.initd $pkgdir/etc/init.d/virtlogd
- install -D -m755 $srcdir/virtlockd.initd $pkgdir/etc/init.d/virtlockd
+ install -Dm755 $srcdir/$pkgname.initd $pkgdir/etc/init.d/libvirtd
+ install -Dm644 $srcdir/$pkgname.confd $pkgdir/etc/conf.d/libvirtd
+
+ install -Dm755 $srcdir/$pkgname.initd $pkgdir/etc/init.d/libvirt-guests
+ install -Dm644 $srcdir/$pkgname.confd $pkgdir/etc/conf.d/libvirt-guests
+
+ install -Dm755 $srcdir/virtlogd.initd $pkgdir/etc/init.d/virtlogd
+ install -Dm755 $srcdir/virtlockd.initd $pkgdir/etc/init.d/virtlockd
install -d "$pkgdir"/lib/modules-load.d
echo "tun" > "$pkgdir"/lib/modules-load.d/libvirt.conf
@@ -190,10 +198,14 @@ _common_drivers() {
"$subpkgdir"/etc/libvirt/
}
-sha512sums="29805cd59745c21b7c84b6c5aebe6e791b9bee84a83cfbc5debafe37cd40120f1773d96286434611a5b9d8726d34ee84083f36108f3f5eb74c0bd848c4e34e38 libvirt-6.3.0.tar.xz
-9aba6ab73219a635c64a340ee8887356e644445c9128734cbce73f5d54778378da2f10a190365ad88a7db8bc95b1fb17f0c6ca41fc41bb786c09e1afe84d65dc libvirt.confd
-734afb83b7a4703dd238f1d89dbc853a8c73bcf1994af648c41ab01ae4088e5c7a423f0cb91e5e31f2ae5e60c66d08a6e1583a1e3b88bb5554e0f9fd15ecc15c libvirt.initd
-36b85f473d292be8df415256d01a562131d8ae61450ba3893658090a12d589ca32215382f56f286a830b4e59ffd98fbe1d92004f2ce14ca0834451b943cd8f2f virtlogd.initd
-a4c4d26e4111931acbe7594451bf963a36c8db33c64b1bc447ab4758bb92803510bebee0511d6bc16ba80c289ab6f87e74377d47bf560412f9adb9c161a206d9 virtlockd.initd
+sha512sums="55091addcf43d3c0bdd50f9378b588351181d191272d5a19220a0babe0893c1f6e0f1e41a7f51b8c1fb8e2098236b273e1a18b81573f4008ee3cf65374ba9465 libvirt-6.6.0.tar.xz
+c3647366e589f2134599baefcbd7ec480cbc0830c71f95cd903cacb28e463d4cd8d972fbd1db81aa17eef81c1f701bd3937c9b8eb71d56ee630e1ed8b89887e9 libvirt.confd
+95debe7600826a6783334f5bf042fde81d0a01f2c599eb8d2f66e0597cf52116c13d4d5cf173784a360d134a7c44d9bf828e8f78f7e10a1ad9dada537aead480 libvirt.initd
+78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc libvirt-guests.confd
+ec2bc46d72afa61513983b777e2d49da618a35a4687bc75674b3a49ababd4e2e387661010d342fee86c7a73d259644985a263a6c2976e29a436d88921bb040b0 libvirt-guests.initd
+f93313c387c21bafb760f599942f1cdecfe952af80af42a28e8525118e5a7fd512d9f909039d8b15f1a544957f1d70a0728c55de2bae41a87e5be6dbbb4f6208 virtlogd.initd
+d8ef64d76e8be521a6551893cc7c6aa7e5d8c627a9aed87beefefc126798dc0f98bf420609b6afc027ad96cca347a1c5db8f703d09853efde4d1a6a35572fbf1 virtlockd.initd
dfe042c596028125bf8548115de2922683829c4716f6b0efb8efc38518670e3e848481661b9714bb0664c1022b87e8f3c0773611fe10187b0bc588e2336ada0c musl-fix-includes.patch
-d32551d56eae2c33bab7571964f76421336967918c293cd1d18fc66626a7ead3551b5672a9e3fc3d8b7bca82cc0abb17e428ee8271d04d73bc06fd16309918b3 stderr-fix.patch"
+d32551d56eae2c33bab7571964f76421336967918c293cd1d18fc66626a7ead3551b5672a9e3fc3d8b7bca82cc0abb17e428ee8271d04d73bc06fd16309918b3 stderr-fix.patch
+4e7825f193d3931aa291fa05470e9081218e29231cfc91a5fe5982c04fb43e68ccc19cd40cb05f653da6cac5fb5d924ec2ef3fddbedda354ea40ff22a4d29697 libvirt-fork-exec-deadlock.patch
+dc80c9fc459207dd1ff77548054ea5a51c41a2d36e1b8917eca5f69293a86168af3da47466d8ff954a8b2e0ead9f28ed7d6c2c3671cf67d0ebb4039003a0dde2 libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch"
diff --git a/main/libvirt/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch b/main/libvirt/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch
new file mode 100644
index 0000000000..bf7a328f77
--- /dev/null
+++ b/main/libvirt/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch
@@ -0,0 +1,35 @@
+From e97700d867ffa949c97f8a635a76b9ce510e806f Mon Sep 17 00:00:00 2001
+Message-Id: <e97700d867ffa949c97f8a635a76b9ce510e806f.1580460243.git.mprivozn@redhat.com>
+In-Reply-To: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@redhat.com>
+References: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@redhat.com>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Fri, 31 Jan 2020 09:42:14 +0100
+Subject: [PATCH 2/3] Fix paths in libvirt-guests.sh.in
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ tools/libvirt-guests.sh.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
+index a881f6266e..79d38b3e9a 100644
+--- a/tools/libvirt-guests.sh.in
++++ b/tools/libvirt-guests.sh.in
+@@ -39,11 +39,11 @@ START_DELAY=0
+ BYPASS_CACHE=0
+ SYNC_TIME=0
+
+-test -f "$sysconfdir"/sysconfig/libvirt-guests &&
+- . "$sysconfdir"/sysconfig/libvirt-guests
++test -f "$sysconfdir"/libvirt/libvirt-guests.conf &&
++ . "$sysconfdir"/libvirt/libvirt-guests.conf
+
+ LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests
+-VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests
++VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests
+
+ RETVAL=0
+
+--
+2.24.1
+
diff --git a/main/libvirt/libvirt-fork-exec-deadlock.patch b/main/libvirt/libvirt-fork-exec-deadlock.patch
new file mode 100644
index 0000000000..1a20b62211
--- /dev/null
+++ b/main/libvirt/libvirt-fork-exec-deadlock.patch
@@ -0,0 +1,263 @@
+Bugreport: https://gitlab.alpinelinux.org/alpine/aports/-/issues/11602
+Upstream: https://gitlab.com/libvirt/libvirt/-/issues/52
+
+diff --git a/src/util/vircommand.c b/src/util/vircommand.c
+index 5ce69ef..2ee1312 100644
+--- a/src/util/vircommand.c
++++ b/src/util/vircommand.c
+@@ -304,7 +304,7 @@ virFork(void)
+ /* Make sure any hook logging is sent to stderr, since child
+ * process may close the logfile FDs */
+ logprio = virLogGetDefaultPriority();
+- virLogReset();
++ virLogResetForExec();
+ virLogSetDefaultPriority(logprio);
+
+ /* Clear out all signal handlers from parent so nothing
+@@ -861,7 +861,7 @@ virExec(virCommandPtr cmd)
+ goto fork_error;
+
+ /* Close logging again to ensure no FDs leak to child */
+- virLogReset();
++ virLogResetForExec();
+
+ if (cmd->env)
+ execve(binary, cmd->args, cmd->env);
+diff --git a/src/util/virlog.c b/src/util/virlog.c
+index dabfe7e..d44165c 100644
+--- a/src/util/virlog.c
++++ b/src/util/virlog.c
+@@ -108,8 +108,8 @@ static size_t virLogNbOutputs;
+ */
+ static virLogPriority virLogDefaultPriority = VIR_LOG_DEFAULT;
+
+-static void virLogResetFilters(void);
+-static void virLogResetOutputs(void);
++static void virLogResetFilters(bool freemem);
++static void virLogResetOutputs(bool freemem);
+ static void virLogOutputToFd(virLogSourcePtr src,
+ virLogPriority priority,
+ const char *filename,
+@@ -284,8 +284,30 @@ virLogReset(void)
+ return -1;
+
+ virLogLock();
+- virLogResetFilters();
+- virLogResetOutputs();
++ virLogResetFilters(true);
++ virLogResetOutputs(true);
++ virLogDefaultPriority = VIR_LOG_DEFAULT;
++ virLogUnlock();
++ return 0;
++}
++
++/**
++ * virLogResetForExec:
++ *
++ * Reset the logging module to its default initial state, but avoid doing
++ * async unsafe calls
++ *
++ * Returns 0 if successful, and -1 in case or error
++ */
++int
++virLogResetForExec(void)
++{
++ if (virLogInitialize() < 0)
++ return -1;
++
++ virLogLock();
++ virLogResetFilters(false);
++ virLogResetOutputs(false);
+ virLogDefaultPriority = VIR_LOG_DEFAULT;
+ virLogUnlock();
+ return 0;
+@@ -324,9 +346,10 @@ virLogSetDefaultPriority(virLogPriority priority)
+ * Removes the set of logging filters defined.
+ */
+ static void
+-virLogResetFilters(void)
++virLogResetFilters(bool freemem)
+ {
+- virLogFilterListFree(virLogFilters, virLogNbFilters);
++ if (freemem)
++ virLogFilterListFree(virLogFilters, virLogNbFilters);
+ virLogFilters = NULL;
+ virLogNbFilters = 0;
+ virLogFiltersSerial++;
+@@ -371,9 +394,10 @@ virLogFilterListFree(virLogFilterPtr *list, int count)
+ * Removes the set of logging output defined.
+ */
+ static void
+-virLogResetOutputs(void)
++virLogResetOutputs(bool freemem)
+ {
+- virLogOutputListFree(virLogOutputs, virLogNbOutputs);
++ if (freemem)
++ virLogOutputListFree(virLogOutputs, virLogNbOutputs);
+ virLogOutputs = NULL;
+ virLogNbOutputs = 0;
+ }
+@@ -1390,7 +1414,7 @@ virLogDefineOutputs(virLogOutputPtr *outputs, size_t noutputs)
+ return -1;
+
+ virLogLock();
+- virLogResetOutputs();
++ virLogResetOutputs(true);
+
+ #if HAVE_SYSLOG_H
+ /* syslog needs to be special-cased, since it keeps the fd in private */
+@@ -1433,7 +1457,7 @@ virLogDefineFilters(virLogFilterPtr *filters, size_t nfilters)
+ return -1;
+
+ virLogLock();
+- virLogResetFilters();
++ virLogResetFilters(true);
+ virLogFilters = filters;
+ virLogNbFilters = nfilters;
+ virLogUnlock();
+diff --git a/src/util/virlog.h b/src/util/virlog.h
+index feb2f85..c82b62e 100644
+--- a/src/util/virlog.h
++++ b/src/util/virlog.h
+@@ -190,6 +190,7 @@ void virLogSetDefaultOutput(const char *fname, bool godaemon, bool privileged);
+ void virLogLock(void);
+ void virLogUnlock(void);
+ int virLogReset(void);
++int virLogResetForExec(void);
+ int virLogParseDefaultPriority(const char *priority);
+ int virLogPriorityFromSyslog(int priority);
+ void virLogMessage(virLogSourcePtr source,
+diff --git a/src/util/vircommand.c b/src/util/vircommand.c
+index 76f7eb9a3d..1efb3ba1d2 100644
+--- a/src/util/vircommand.c
++++ b/src/util/vircommand.c
+@@ -494,10 +494,48 @@ virCommandMassCloseGetFDsGeneric(virCommandPtr cmd G_GNUC_UNUSED,
+ }
+ # endif /* !__linux__ */
+
++static virBitmapPtr
++virCommandMassCloseGetFDs(virCommandPtr cmd)
++{
++ virBitmapPtr fds = NULL;
++ int openmax = sysconf(_SC_OPEN_MAX);
++
++ /* In general, it is not safe to call malloc() between fork() and exec()
++ * because the child might have forked at the worst possible time, i.e.
++ * when another thread was in malloc() and thus held its lock. That is to
++ * say, POSIX does not mandate malloc() to be async-safe. Fortunately,
++ * glibc developers are aware of this and made malloc() async-safe.
++ * Therefore we can safely allocate memory here (and transitively call
++ * opendir/readdir) without a deadlock. */
++
++ if (openmax < 0) {
++ virReportSystemError(errno, "%s", _("sysconf(_SC_OPEN_MAX) failed"));
++ return -1;
++ }
++
++ if (!(fds = virBitmapNew(openmax)))
++ return NULL;
++
++# ifdef __linux__
++ if (virCommandMassCloseGetFDsLinux(cmd, fds) < 0) {
++ virBitmapFree(fds);
++ return NULL;
++ }
++# else
++ if (virCommandMassCloseGetFDsGeneric(cmd, fds) < 0) {
++ virBitmapFree(fds);
++ return NULL;
++ }
++# endif
++ return fds;
++}
++
++
+ # ifdef __FreeBSD__
+
+ static int
+ virCommandMassClose(virCommandPtr cmd,
++ virBitmapPtr fds G_GNUC_UNUSED,
+ int childin,
+ int childout,
+ int childerr)
+@@ -550,39 +588,13 @@ virCommandMassClose(virCommandPtr cmd,
+
+ static int
+ virCommandMassClose(virCommandPtr cmd,
++ virBitmapPtr fds,
+ int childin,
+ int childout,
+ int childerr)
+ {
+- g_autoptr(virBitmap) fds = NULL;
+- int openmax = sysconf(_SC_OPEN_MAX);
+- int fd = -1;
+-
+- /* In general, it is not safe to call malloc() between fork() and exec()
+- * because the child might have forked at the worst possible time, i.e.
+- * when another thread was in malloc() and thus held its lock. That is to
+- * say, POSIX does not mandate malloc() to be async-safe. Fortunately,
+- * glibc developers are aware of this and made malloc() async-safe.
+- * Therefore we can safely allocate memory here (and transitively call
+- * opendir/readdir) without a deadlock. */
+-
+- if (openmax < 0) {
+- virReportSystemError(errno, "%s", _("sysconf(_SC_OPEN_MAX) failed"));
+- return -1;
+- }
+-
+- if (!(fds = virBitmapNew(openmax)))
+- return -1;
+-
+-# ifdef __linux__
+- if (virCommandMassCloseGetFDsLinux(cmd, fds) < 0)
+- return -1;
+-# else
+- if (virCommandMassCloseGetFDsGeneric(cmd, fds) < 0)
+- return -1;
+-# endif
++ int fd = virBitmapNextSetBit(fds, 2);
+
+- fd = virBitmapNextSetBit(fds, 2);
+ for (; fd >= 0; fd = virBitmapNextSetBit(fds, fd)) {
+ if (fd == childin || fd == childout || fd == childerr)
+ continue;
+@@ -621,6 +633,7 @@ virExec(virCommandPtr cmd)
+ int ret;
+ g_autofree gid_t *groups = NULL;
+ int ngroups;
++ virBitmapPtr fds = NULL;
+
+ if (cmd->args[0][0] != '/') {
+ if (!(binary = binarystr = virFindFileInPath(cmd->args[0]))) {
+@@ -688,13 +701,20 @@ virExec(virCommandPtr cmd)
+ if ((ngroups = virGetGroupList(cmd->uid, cmd->gid, &groups)) < 0)
+ goto cleanup;
+
++ /* get fds bitmap before we fork */
++ if ((fds = virCommandMassCloseGetFDs(cmd)) == NULL)
++ goto cleanup;
++
+ pid = virFork();
+
+- if (pid < 0)
++ if (pid < 0) {
++ virBitmapFree(fds);
+ goto cleanup;
++ }
+
+ if (pid) { /* parent */
+ VIR_FORCE_CLOSE(null);
++ virBitmapFree(fds);
+ if (cmd->outfdptr && *cmd->outfdptr == -1) {
+ VIR_FORCE_CLOSE(pipeout[1]);
+ *cmd->outfdptr = pipeout[0];
+@@ -715,7 +735,7 @@ virExec(virCommandPtr cmd)
+ umask(cmd->mask);
+ ret = EXIT_CANCELED;
+
+- if (virCommandMassClose(cmd, childin, childout, childerr) < 0)
++ if (virCommandMassClose(cmd, fds, childin, childout, childerr) < 0)
+ goto fork_error;
+
+ if (prepareStdFd(childin, STDIN_FILENO) < 0) {
diff --git a/main/libvirt/libvirt-guests.confd b/main/libvirt/libvirt-guests.confd
new file mode 100644
index 0000000000..ed2ce58064
--- /dev/null
+++ b/main/libvirt/libvirt-guests.confd
@@ -0,0 +1,68 @@
+# /etc/conf.d/libvirtd
+
+# LIBVIRT_URIS
+# space separated list of libvirt URIs to communicate with to start/stop guests
+# Valid values are anything that can be passed to 'virsh connect'
+
+#LIBVIRT_URIS="qemu:///system"
+
+
+# LIBVIRT_SHUTDOWN
+# Valid options:
+# * managedsave - Performs a state save external to the VM (for hypervisors
+# supporting this operation). qemu-kvm will stop the CPU
+# and save off all state to a separate file. When the
+# machine is started again, it will resume like nothing
+# ever happened. This is guarenteed to always successfully
+# stop your machine and restart it.
+#
+# * shutdown - Sends an ACPI shutdown (think of this as a request to
+# your guest to shutdown). There is no way to distinguish
+# between guests that are ignoring the shutdown request or
+# are stuck or are taking a long time to shutdown. We will
+# wait LIBVIRT_MAXWAIT seconds before yanking the power
+# out.
+#
+# * destroy - Immediately stop all running guests. Use with caution as
+# this can leave the guest in a corrupted state and might
+# lead to data loss.
+#
+
+#LIBVIRT_SHUTDOWN="managedsave"
+
+
+# LIBVIRT_MAXWAIT
+# Timeout in seconds until stopping a guest and "pulling the plug" on the
+# guest
+# Valid values are any integer over 0
+
+#LIBVIRT_MAXWAIT="500"
+
+
+# LIBVIRT_START
+# If this value is set to 'no', then guests and networks that were shutdown
+# by this script when it was stopped will not be started when it is started
+# back up.
+# Valid values are yes or no
+
+#LIBVIRT_START="yes"
+
+
+# LIBVIRT_IGNORE_AUTOSTART
+# If the VM is marked for autostart in its XML configuration then we won't
+# save its start when the init script is stopped. The result is that when
+# the init script starts back up, no attempt will be made to start the VM or
+# confirm it is started.
+# Valid values are yes or no
+
+#LIBVIRT_IGNORE_AUTOSTART="no"
+
+
+# LIBVIRT_NET_SHUTDOWN
+# If libvirtd created networks for you (e.g. NATed networks) then this init
+# script will shut them down for you if this is set to 'yes'. Otherwise,
+# the networks will be left running. For this option to be useful you must
+# have enabled the 'virt-network' USE flag and have had libvirt create a
+# NATed network for you. Valid values: 'yes' or 'no'
+
+#LIBVIRT_NET_SHUTDOWN="yes"
diff --git a/main/libvirt/libvirt-guests.initd b/main/libvirt/libvirt-guests.initd
new file mode 100644
index 0000000000..b29f04c24a
--- /dev/null
+++ b/main/libvirt/libvirt-guests.initd
@@ -0,0 +1,237 @@
+#!/sbin/openrc-run
+
+description="Virtual Machine Management (libvirt) Guests"
+
+depend() {
+ use libvirtd
+}
+
+# set the default to QEMU
+[ -z "${LIBVIRT_URIS}" ] && LIBVIRT_URIS="qemu:///system"
+
+# default to suspending the VM via managedsave
+case "${LIBVIRT_SHUTDOWN}" in
+ managedsave|shutdown|destroy) ;;
+ *) LIBVIRT_SHUTDOWN="managedsave" ;;
+esac
+
+# default to 500 seconds
+[ -z ${LIBVIRT_MAXWAIT} ] && LIBVIRT_MAXWAIT=500
+
+gueststatefile="/var/lib/libvirt/libvirt-guests.state"
+netstatefile="/var/lib/libvirt/libvirt-net.state"
+
+do_virsh() {
+ local hvuri=$1
+ shift
+
+ # if unset, default to qemu
+ [ -z ${hvuri} ] && hvuri="qemu:///system"
+ # if only qemu was supplied then correct the value
+ [ "xqemu" = x${hvuri} ] && hvuri="qemu:///system"
+
+ # Silence errors because virsh always throws an error about
+ # not finding the hypervisor version when connecting to libvirtd
+ # lastly strip the blank line at the end
+ LC_ALL=C virsh -c ${hvuri} "$@" 2>/dev/null | head -n -1
+}
+
+libvirtd_dom_list() {
+ # Only work with domains by their UUIDs
+ local hvuri=$1
+ shift
+
+ # The grep is to remove dom0 for xen domains. Otherwise we never hit 0
+ do_virsh "${hvuri}" list --uuid $@ | grep -v 00000000-0000-0000-0000-000000000000
+}
+
+libvirtd_dom_count() {
+ local hvuri=$1
+ shift
+
+ libvirtd_dom_list "${hvuri}" $@ | wc -l
+}
+
+libvirtd_net_list() {
+ # Only work with networks by their UUIDs
+ local hvuri=$1
+ shift
+
+ do_virsh "${hvuri}" net-list --uuid $@
+}
+
+libvirtd_net_count() {
+ local hvuri=$1
+ shift
+
+ libvirtd_net_list "${hvuri}" $@ | wc -l
+}
+
+libvirtd_dom_stop() {
+ # stops all persistent or transient domains for a given URI
+ # $1 - uri
+ # $2 - persisent/transient
+
+ local uri=$1
+ local persist=$2
+ local shutdown_type=${LIBVIRT_SHUTDOWN}
+ local counter=${LIBVIRT_MAXWAIT}
+ local dom_name=
+ local dom_as=
+ local dom_ids=
+ local uuid=
+ local dom_count=
+
+ [ "${persist}" = "--transient" ] && shutdown_type="shutdown"
+ [ -n "${counter}" ] || counter=500
+
+ einfo " Shutting down domain(s) ..."
+
+ # grab all persistent or transient domains running
+ dom_ids=$(libvirtd_dom_list ${uri} ${persist})
+
+ for uuid in ${dom_ids}; do
+ # Get the name
+ dom_name=$(do_virsh ${uri} domname ${uuid})
+ einfo " ${dom_name}"
+ # Get autostart state
+ dom_as=$(do_virsh ${uri} dominfo ${uuid} | \
+ awk '$1 == "Autostart:" { print $2 }')
+
+ if [ "${persist}" = "--persistent" ]; then
+ # Save our running state only if LIBVIRT_IGNORE_AUTOSTART != yes
+ if [ "x${LIBVIRT_IGNORE_AUTOSTART}" = "xyes" ] && \
+ [ ${dom_as} = "enabled" ]; then
+ :
+ else
+ echo "${uri} ${uuid}" >> ${gueststatefile}
+ fi
+
+ fi
+
+ # Now let's stop it
+ do_virsh "${uri}" ${shutdown_type} ${uuid} > /dev/null
+
+ done
+
+ dom_count="$(libvirtd_dom_count ${uri} ${persist})"
+ while [ ${dom_count} -gt 0 ] && [ ${counter} -gt 0 ] ; do
+ dom_count="$(libvirtd_dom_count ${uri} ${persist})"
+ sleep 1
+ if [ "${shutdown_type}" = "shutdown" ]; then
+ counter=$((${counter} - 1))
+ fi
+ printf "."
+ done
+
+ if [ "${shutdown_type}" = "shutdown" ]; then
+ # grab all domains still running
+ dom_ids=$(libvirtd_dom_list ${uri} ${persist})
+ for uuid in ${dom_ids}; do
+ dom_name=$(do_virsh ${uri} domname ${uuid})
+ eerror " ${dom_name} forcibly stopped"
+ do_virsh "${uri}" destroy ${uuid} > /dev/null
+ done
+ fi
+}
+
+libvirtd_net_stop() {
+ # stops all persistent or transient domains for a given URI
+ # $1 - uri
+ # $2 - persisent/transient
+
+ local uri=$1
+ local persist=$2
+ local uuid=
+ local net_name=
+
+ if [ "${LIBVIRT_NET_SHUTDOWN}" != "no" ]; then
+
+ einfo " Shutting down network(s):"
+ for uuid in $(libvirtd_net_list ${uri} ${persist}); do
+ net_name=$(do_virsh ${uri} net-name ${uuid})
+ einfo " ${net_name}"
+
+ if [ "${persist}" = "--persistent" ]; then
+ # Save our running state
+ echo "${uri} ${uuid}" >> ${netstatefile}
+
+ fi
+
+ # Actually stop the network
+ do_virsh qemu net-destroy ${uuid} > /dev/null
+ done
+
+ fi
+}
+
+start() {
+ local uri=
+ local uuid=
+ local name=
+
+ for uri in ${LIBVIRT_URIS}; do
+ do_virsh "${uri}" connect
+ if [ $? -ne 0 ]; then
+ eerror "Failed to connect to '${uri}'. Domains may not start."
+ fi
+ done
+
+ [ ! -e "${netstatefile}" ] && touch "${netstatefile}"
+ [ ! -e "${gueststatefile}" ] && touch "${gueststatefile}"
+
+ # if the user didn't want to start any guests up then respect their wish
+ [ "x${LIBVIRT_START}" = "xno" ] && return 0
+
+ # start networks
+ ebegin "Starting libvirt networks"
+ while read -r uri uuid
+ do
+ # ignore trash
+ [ -z "${uri}" ] || [ -z "${uuid}" ] && continue
+
+ name=$(do_virsh "${uri}" net-name ${uuid})
+ einfo " ${name}"
+ do_virsh "${uri}" net-start ${uuid} > /dev/null
+ done <"${netstatefile}"
+ eend 0
+
+ # start domains
+ ebegin "Starting libvirt domains"
+ while read -r uri uuid
+ do
+ # ignore trash
+ [ -z "${uri}" ] || [ -z "${uuid}" ] && continue
+
+ name=$(do_virsh "${uri}" domname ${uuid})
+ einfo " ${name}"
+ do_virsh "${uri}" start ${uuid} > /dev/null
+ do_virsh "${uri}" domtime --sync ${uuid} > /dev/null
+ done <"${gueststatefile}"
+ eend 0
+}
+
+stop() {
+ local counter=
+ local dom_name=
+ local net_name=
+ local dom_ids=
+ local uuid=
+ local dom_count=
+
+ rm -f "${gueststatefile}"
+ [ $? -ne 0 ] && eerror "Unable to save domain state"
+ rm -f "${netstatefile}"
+ [ $? -ne 0 ] && eerror "Unable to save net state"
+
+ for uri in ${LIBVIRT_URIS}; do
+ einfo "Stopping libvirt domains and networks for ${uri}"
+
+ libvirtd_dom_stop "${uri}" "--persistent"
+ libvirtd_dom_stop "${uri}" "--transient"
+ libvirtd_net_stop "${uri}" "--persistent"
+ libvirtd_net_stop "${uri}" "--transient"
+
+ einfo "Done stopping domains and networks for ${uri}"
+ done
+}
diff --git a/main/libvirt/libvirt.confd b/main/libvirt/libvirt.confd
index d51bdb99d1..de5af86eae 100644
--- a/main/libvirt/libvirt.confd
+++ b/main/libvirt/libvirt.confd
@@ -1,27 +1,20 @@
# /etc/conf.d/libvirtd
+# /etc/conf.d/libvirtd
+
+# Startup dependency
+# libvirtd typically requires all networks to be up and settled which
+# is what rc_need="net" provides. However if you only use specific networks
+# for libvirtd, you may override this. Or if you only use libvirtd locally.
+rc_need="net"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (25 + 5 seconds
+# per default) when you are stopping the service.
+#LIBVIRTD_TERMTIMEOUT="TERM/25/KILL/5"
+
+# LIBVIRTD_OPTS
# You may want to add '--listen' to have libvirtd listen for tcp/ip connections
# if you want to use libvirt for remote control
-
# Please consult 'libvirtd --help' for more options
-
#LIBVIRTD_OPTS="--listen"
-
-# Valid options:
-# * shutdown - Sends an ACPI shutdown (think when you tap the power button
-# on your machine and it begins a graceful shutdown). If your
-# VM ignores this, it will have the power yanked out from under
-# it in LIBVIRTD_KVM_SHUTDOWN_MAXWAIT seconds.
-# * managedsave - Performs a state save external to the VM. qemu-kvm will stop
-# stop the CPU and save off all state to a separate file. When
-# the machine is started again, it will resume like nothing ever
-# happened. This is guarenteed to always successfully stop your
-# machine and restart it. However it may take some time to finish.
-# * none - No attempts will be made to stop any VMs. If you are restarting your
-# machine the qemu-kvm process will be simply killed, which may result
-# in your VMs having disk corruption.
-LIBVIRTD_KVM_SHUTDOWN="managedsave"
-
-# Timeout in seconds until stopping libvirtd and "pulling the plug" on the
-# remaining VM's still in a running state
-#LIBVIRTD_KVM_SHUTDOWN_MAXWAIT="500"
diff --git a/main/libvirt/libvirt.initd b/main/libvirt/libvirt.initd
index 693b77b886..8876c54c1c 100644
--- a/main/libvirt/libvirt.initd
+++ b/main/libvirt/libvirt.initd
@@ -1,88 +1,32 @@
#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
-extra_started_commands="reload"
+description="Virtual Machine Management daemon (libvirt)"
-depend() {
- need net virtlogd
- use virtlockd
- after firewall
-}
-
-libvirtd_virsh() {
- # Silence errors because virsh always throws an error about
- # not finding the hypervisor version when connecting to libvirtd
- LC_ALL=C virsh -c qemu:///system "$@" 2>/dev/null
-}
+LIBVIRTD_OPTS=${LIBVIRTD_OPTS:-"${LIBVIRTD_OPTS}"}
+LIBVIRTD_TIMEOUT=${LIBVIRTD_TERMTIMEOUT:-"TERM/25/KILL/5"}
-libvirtd_dom_list() {
- # Make sure that it wouldn't be confused if the domain name
- # contains the word running.
- libvirtd_virsh list | awk '$3 == "running" { print $1 }'
-}
-
-libvirtd_dom_count() {
- # Make sure that it wouldn't be confused if the domain name
- # contains the word running.
- libvirtd_virsh list | awk 'BEGIN { count = 0 } \
- $3 == "running" { count++ } \
- END { print count }'
-}
+command="/usr/sbin/libvirtd"
+command_args="${LIBVIRTD_OPTS}"
+start_stop_daemon_args="-b --env KRB5_KTNAME=/etc/libvirt/krb5.tab"
+pidfile="/run/libvirtd.pid"
+retry="${LIBVIRTD_TERMTIMEOUT}"
-start() {
- ebegin "Starting libvirtd"
- start-stop-daemon --start \
- --env KRB5_KTNAME=/etc/libvirt/krb5.tab \
- --exec /usr/sbin/libvirtd --quiet -- -d ${LIBVIRTD_OPTS}
- eend $?
+depend() {
+ need virtlogd
+ use ceph dbus iscsid virtlockd
+ after cgconfig corosync ebtables iptables ip6tables nfs nfsmount ntp-client ntpdportmap rpc.statd sanlock xenconsoled
}
-stop() {
- ebegin "Stopping libvirtd"
- # try to shutdown all (KVM/Qemu) domains
- DOM_COUNT="$(libvirtd_dom_count)"
- if [ "${LIBVIRTD_KVM_SHUTDOWN}" != "none" ] \
- && [ "${DOM_COUNT}" != "0" ] ; then
-
- einfo " Shutting down domain(s):"
- for DOM_ID in $(libvirtd_dom_list) ; do
- NAME="$(libvirtd_virsh domname ${DOM_ID} | head -n 1)"
- einfo " ${NAME}"
- libvirtd_virsh ${LIBVIRTD_KVM_SHUTDOWN} ${DOM_ID} > /dev/null
- done
-
- if [ -n "${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" ] ; then
- COUNTER="${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}"
- else
- COUNTER=500
- fi
-
- if [ "${LIBVIRTD_KVM_SHUTDOWN}" = "shutdown" ]; then
- einfo " Waiting ${COUNTER} seconds while domains shutdown ..."
- DOM_COUNT="$(libvirtd_dom_count)"
- while [ ${DOM_COUNT} -gt 0 ] && [ ${COUNTER} -gt 0 ] ; do
- DOM_COUNT="$(libvirtd_dom_count)"
- sleep 1
- COUNTER=$((${COUNTER} - 1))
- echo -n "."
- done
- fi
-
- DOM_COUNT="$(libvirtd_dom_count)"
- if [ "${DOM_COUNT}" != "0" ] ; then
- eerror " !!! Some guests are still running, stopping anyways"
- fi
-
- fi
- start-stop-daemon --stop --quiet --exec /usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
- eend $?
-}
+start_pre() {
+ # Test configuration directories in /etc/libvirt/ to be either not
+ # present or a directory, i.e. not a regular file, bug #532892
-reload() {
- ebegin "Reloading libvirtd without shutting down your VMs"
- start-stop-daemon --stop --quiet --exec /usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
- if [ $? -ne 0 ]; then
- eend $?
- fi
- start-stop-daemon --start --quiet --exec /usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS}
- eend $?
+ checkpath --directory /etc/libvirt/lxc || return 1
+ checkpath --directory /etc/libvirt/nwfilter || return 1
+ [ -L /etc/libvirt/qemu ] ||
+ checkpath --directory /etc/libvirt/qemu || return 1
+ [ -L /etc/libvirt/storage ] ||
+ checkpath --directory /etc/libvirt/storage || return 1
}
diff --git a/main/libvirt/virtlockd.initd b/main/libvirt/virtlockd.initd
index ebb7ecf9fd..792ce6bdb4 100644
--- a/main/libvirt/virtlockd.initd
+++ b/main/libvirt/virtlockd.initd
@@ -1,12 +1,11 @@
#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# $Id$
description="libvirt virtual machine lock manager"
command="/usr/sbin/virtlockd"
-command_args="-d"
-pidfile="/var/run/virtlockd.pid"
+start_stop_daemon_args="-b"
+pidfile="/run/virtlockd.pid"
extra_started_commands="reload"
description_reload="re-exec the daemon, while maintaining locks and clients"
diff --git a/main/libvirt/virtlogd.initd b/main/libvirt/virtlogd.initd
index 0d3493bd56..0d0ad679b4 100644
--- a/main/libvirt/virtlogd.initd
+++ b/main/libvirt/virtlogd.initd
@@ -1,12 +1,11 @@
#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# $Id$
description="libvirt virtual machine logging manager"
command="/usr/sbin/virtlogd"
-command_args="-d"
-pidfile="/var/run/virtlogd.pid"
+start_stop_daemon_args="-b"
+pidfile="/run/virtlogd.pid"
extra_started_commands="reload"
description_reload="re-exec the daemon, while maintaining open connections"
@@ -22,3 +21,4 @@ reload() {
start-stop-daemon --signal SIGUSR1 \
--exec "${command}" --pidfile "${pidfile}"
}
+
diff --git a/main/libvorbis/APKBUILD b/main/libvorbis/APKBUILD
index fcd9067c7a..3d5f80b907 100644
--- a/main/libvorbis/APKBUILD
+++ b/main/libvorbis/APKBUILD
@@ -1,18 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libvorbis
-pkgver=1.3.6
-pkgrel=2
+pkgver=1.3.7
+pkgrel=0
pkgdesc="Vorbis codec library"
url="https://xiph.org/vorbis"
arch="all"
license="BSD-3-Clause"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
makedepends="libogg-dev"
-source="http://downloads.xiph.org/releases/vorbis/libvorbis-$pkgver.tar.xz
- CVE-2017-14160.patch
- CVE-2018-10392.patch
- CVE-2018-10393.patch
- "
+source="https://downloads.xiph.org/releases/vorbis/libvorbis-$pkgver.tar.xz"
# secfixes:
# 1.3.6-r2:
@@ -47,7 +43,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a5d990bb88db2501b16f8eaee9f2ecb599cefd7dab2134d16538d8905263a972157c7671867848c2a8a358bf5e5dbc7721205ece001032482f168be7bda4f132 libvorbis-1.3.6.tar.xz
-4c2f7be947f2159ae47175cba89950c7b7d357b37a20d54382e4fbecd8c268b148e6cb86cb148945c7b68bbe8b14f466e910b35b80903ab51f1b02cfccf5806e CVE-2017-14160.patch
-a60d45144882bc72c3f4937a34baa5e2bda80a3a858b858637fee508755349b616690519e013ff6aafa7e8ff85fd1d0687a3e748b0e8bce25df1abeece97dc36 CVE-2018-10392.patch
-aaa8c09458ad20d45392c99781130ba815f839484b65c61e404198bae570e12401c2cf612f9c4f0b3932cc9e5eac0b066d515950425afa6eb2d6db7cc67731a6 CVE-2018-10393.patch"
+sha512sums="bbf5f11f623d959b3ba98d6b52806521b0b918b59b867f0658c153ea1013293364eead4987e9e71f8798021379310860a2e548fcf89d10caf23d45e41aba45cd libvorbis-1.3.7.tar.xz"
diff --git a/main/libvorbis/CVE-2017-14160.patch b/main/libvorbis/CVE-2017-14160.patch
deleted file mode 100644
index 9ad9d18f75..0000000000
--- a/main/libvorbis/CVE-2017-14160.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 98a60969315dba8c1e8231f561e1551670bc80ae Mon Sep 17 00:00:00 2001
-Message-Id: <98a60969315dba8c1e8231f561e1551670bc80ae.1511192857.git.agx@sigxcpu.org>
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Wed, 15 Nov 2017 13:12:00 +0100
-Subject: [PATCH] CVE-2017-14160: make sure we don't overflow
-
----
- lib/psy.c | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/lib/psy.c b/lib/psy.c
-index 422c6f1e..8bbf6cf3 100644
---- a/lib/psy.c
-+++ b/lib/psy.c
-@@ -599,7 +599,7 @@ static void bark_noise_hybridmp(int n,const long *b,
- XY[i] = tXY;
- }
-
-- for (i = 0, x = 0.f;; i++, x += 1.f) {
-+ for (i = 0, x = 0.f; i < n; i++, x += 1.f) {
-
- lo = b[i] >> 16;
- if( lo>=0 ) break;
-@@ -621,12 +621,11 @@ static void bark_noise_hybridmp(int n,const long *b,
- noise[i] = R - offset;
- }
-
-- for ( ;; i++, x += 1.f) {
-+ for ( ; i < n; i++, x += 1.f) {
-
- lo = b[i] >> 16;
- hi = b[i] & 0xffff;
- if(hi>=n)break;
--
- tN = N[hi] - N[lo];
- tX = X[hi] - X[lo];
- tXX = XX[hi] - XX[lo];
-@@ -651,7 +650,7 @@ static void bark_noise_hybridmp(int n,const long *b,
-
- if (fixed <= 0) return;
-
-- for (i = 0, x = 0.f;; i++, x += 1.f) {
-+ for (i = 0, x = 0.f; i < n; i++, x += 1.f) {
- hi = i + fixed / 2;
- lo = hi - fixed;
- if(lo>=0)break;
-@@ -670,7 +669,7 @@ static void bark_noise_hybridmp(int n,const long *b,
-
- if (R - offset < noise[i]) noise[i] = R - offset;
- }
-- for ( ;; i++, x += 1.f) {
-+ for ( ; i < n; i++, x += 1.f) {
-
- hi = i + fixed / 2;
- lo = hi - fixed;
---
-2.15.0
-
diff --git a/main/libvorbis/CVE-2018-10392.patch b/main/libvorbis/CVE-2018-10392.patch
deleted file mode 100644
index 3d3a16cdea..0000000000
--- a/main/libvorbis/CVE-2018-10392.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 112d3bd0aaacad51305e1464d4b381dabad0e88b Mon Sep 17 00:00:00 2001
-From: Thomas Daede <daede003@umn.edu>
-Date: Thu, 17 May 2018 16:19:19 -0700
-Subject: [PATCH] Sanity check number of channels in setup.
-
-Fixes #2335.
----
- lib/vorbisenc.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/vorbisenc.c b/lib/vorbisenc.c
-index 4fc7b62..64a51b5 100644
---- a/lib/vorbisenc.c
-+++ b/lib/vorbisenc.c
-@@ -684,6 +684,7 @@ int vorbis_encode_setup_init(vorbis_info *vi){
- highlevel_encode_setup *hi=&ci->hi;
-
- if(ci==NULL)return(OV_EINVAL);
-+ if(vi->channels<1||vi->channels>255)return(OV_EINVAL);
- if(!hi->impulse_block_p)i0=1;
-
- /* too low/high an ATH floater is nonsensical, but doesn't break anything */
---
-libgit2 0.26.0
-
diff --git a/main/libvorbis/CVE-2018-10393.patch b/main/libvorbis/CVE-2018-10393.patch
deleted file mode 100644
index c61247a508..0000000000
--- a/main/libvorbis/CVE-2018-10393.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 018ca26dece618457dd13585cad52941193c4a25 Mon Sep 17 00:00:00 2001
-From: Thomas Daede <daede003@umn.edu>
-Date: Wed, 9 May 2018 14:56:59 -0700
-Subject: [PATCH] CVE-2017-14160: fix bounds check on very low sample rates.
-
----
- lib/psy.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/psy.c b/lib/psy.c
-index 422c6f1e..13101230 100644
---- a/lib/psy.c
-+++ b/lib/psy.c
-@@ -602,8 +602,9 @@ static void bark_noise_hybridmp(int n,const long *b,
- for (i = 0, x = 0.f;; i++, x += 1.f) {
-
- lo = b[i] >> 16;
-- if( lo>=0 ) break;
- hi = b[i] & 0xffff;
-+ if( lo>=0 ) break;
-+ if( hi>=n ) break;
-
- tN = N[hi] + N[-lo];
- tX = X[hi] - X[-lo];
---
-2.18.0
-
diff --git a/main/libx11/APKBUILD b/main/libx11/APKBUILD
index 3e5c0c967e..7197a9acde 100644
--- a/main/libx11/APKBUILD
+++ b/main/libx11/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libx11
-pkgver=1.6.9
+pkgver=1.6.11
pkgrel=0
pkgdesc="X11 client-side library"
url="http://xorg.freedesktop.org/"
@@ -13,6 +13,8 @@ source="https://www.x.org/releases/individual/lib/libX11-$pkgver.tar.bz2"
builddir="$srcdir"/libX11-$pkgver
# secfixes:
+# 1.6.10-r0:
+# - CVE-2020-14344
# 1.6.6-r0:
# - CVE-2018-14598
# - CVE-2018-14599
@@ -39,4 +41,4 @@ package() {
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-sha512sums="fc18f0dc17ade1fc37402179f52e1f2b9c7b7d3a1a9590fea13046eb0c5193b4796289431cd99388eac01e8e59de77db45d2c9675d4f05ef8cf3ba6382c3dd31 libX11-1.6.9.tar.bz2"
+sha512sums="2cb4e215c1e3ccb327e02586844f8c426068536a0f472a39f12191feace607f61a6a08586f03758248199678c2f6897a984b0f1222bc0d68fd2e02702f4ce0bf libX11-1.6.11.tar.bz2"
diff --git a/main/links/APKBUILD b/main/links/APKBUILD
index aee529cd21..d561e5807b 100644
--- a/main/links/APKBUILD
+++ b/main/links/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=links
-pkgver=2.20.2
-pkgrel=1
+pkgver=2.21
+pkgrel=0
pkgdesc="Web browser running in both graphics and text mode"
url="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links"
arch="all"
@@ -30,4 +30,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="82be459856f49f45c9b824589b78c0f58b039b09802e077420053e9449bc1ded272bb8ad57ea10522d8b3305ceb212a5dd08b01052538cd5b4f0447d0ba02152 links-2.20.2.tar.bz2"
+sha512sums="11fd523d0aa102d8160957bdbd36674a621aeb2e33237f0df35dcc3fad92ec288acd31dc2e7542717406047165f1249d68972c77cdb27fda076645636a056da8 links-2.21.tar.bz2"
diff --git a/main/linux-firmware/APKBUILD b/main/linux-firmware/APKBUILD
index 067ec0f79e..1179ad505b 100644
--- a/main/linux-firmware/APKBUILD
+++ b/main/linux-firmware/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=linux-firmware
pkgver=20200519
-pkgrel=0
+pkgrel=1
pkgdesc="firmware files for linux"
#url="https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary"
url="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
@@ -83,7 +83,7 @@ package() {
*.zip)
unzip -p $srcdir/${fw##*/} "cypress-firmware-*.tar.gz" | \
tar xzv -C "$pkgdir"/lib/firmware/brcm/ \
- --wildcards --strip-components=1 \
+ --wildcards --strip-components=1 --no-same-owner \
"*.bin" "*.clm_blob"
;;
esac
diff --git a/main/linux-headers/APKBUILD b/main/linux-headers/APKBUILD
index 0100831955..24f05f5cbe 100644
--- a/main/linux-headers/APKBUILD
+++ b/main/linux-headers/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=linux-headers
-pkgver=5.4.5
+pkgver=5.7.8
_kernver=${pkgver%.*}
-pkgrel=1
+pkgrel=0
pkgdesc="Linux system headers"
url="http://kernel.org"
arch="all"
@@ -46,8 +46,8 @@ package() {
rm -rf "$pkgdir"/usr/include/drm
}
-sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f linux-5.4.tar.xz
-5c33d5db4d6787d7841a82dd8dc5b38dd80c5706bdaf9bd331e82173302a4cf3bc9c5e1d00f489d3d78b54bc1f8f82f34df2fcd47b1ab4ffb0a01dc7bdc06cff patch-5.4.5.xz
+sha512sums="45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6 linux-5.7.tar.xz
+4820a45fba9fa299181a96598a96bbdbf6f5faaf1862173d9cca3cc5ea84c21d8e7d4baf0601697565fad3b7d3c76085f4ac86a726961b62c356d70968edc48f patch-5.7.8.xz
32597f2672d1ec365a936d15041a7cf219ef9353241d4a5c378244cf2fc155610443a19bbcd391c86099a0b08486c45e042ec7c90b0d04fe675c3ad0ffc36b53 revert-broken-uapi.patch
302283b1b5f560c850e24aad73febcf7f906ed62b4cad2d826bf140ffe59191631f3cd4ac29525c349cdfe61aba6a47886a0d76f1c6a4a16b744d59b94ea5df8 0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
-b1cf5a1b020f815797c8a2de18595a399800a1ec887e6793739c62a2172855aa95643c1e7a5db9db9699ae7f2b1517925630919c2307f3cd233a4d459b2c5e8b include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch"
+7cfa786144009c52d682e307bb512156e4812d7abe03b3fed99651a02d80567d47ee6f347f88d083c1b9805e0c09625fc3df08a8d0ae96b169d24eb5b83917b7 include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch"
diff --git a/main/linux-headers/include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch b/main/linux-headers/include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch
index a0b8b734e3..3ef4477ac5 100644
--- a/main/linux-headers/include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch
+++ b/main/linux-headers/include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch
@@ -1,11 +1,11 @@
+From 2b7d2ece0b60b8f450f29119f28668dc74bb692e Mon Sep 17 00:00:00 2001
From: Matt Redfearn <matt.redfearn@mips.com>
-Subject: [PATCH] include/uapi/linux/swab: Fix potentially missing __always_inline
Date: Wed, 3 Jan 2018 09:57:30 +0000
-Message-ID: <1514973450-12447-1-git-send-email-matt.redfearn@mips.com>
-X-Mailer: git-send-email 2.7.4
+Subject: [PATCH] include/uapi/linux/swab: Fix potentially missing
+ __always_inline
MIME-Version: 1.0
-Content-Type: text/plain; charset="UTF-8"
-Content-Transfer-Encoding: 8BIT
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
Commit bc27fb68aaad ("include/uapi/linux/byteorder, swab: force inlining
of some byteswap operations") added __always_inline to swab functions
@@ -33,14 +33,12 @@ indirectly, via stddef.h.
Fixes: 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to userspace headers")
Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
-
---
-
include/uapi/linux/swab.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
-index 23cd84868cc3..f6a8cf737abf 100644
+index 7272f85d6d6a..3736f2fe1541 100644
--- a/include/uapi/linux/swab.h
+++ b/include/uapi/linux/swab.h
@@ -3,7 +3,7 @@
@@ -49,8 +47,9 @@ index 23cd84868cc3..f6a8cf737abf 100644
#include <linux/types.h>
-#include <linux/compiler.h>
+#include <linux/stddef.h>
+ #include <asm/bitsperlong.h>
#include <asm/swab.h>
- /*
--
-2.7.4
+2.27.0
+
diff --git a/main/linux-lts/0001-arm64-dts-lx2160a-add-lx2160acex7-device-tree-build.patch b/main/linux-lts/0001-arm64-dts-lx2160a-add-lx2160acex7-device-tree-build.patch
new file mode 100644
index 0000000000..bc887ffedb
--- /dev/null
+++ b/main/linux-lts/0001-arm64-dts-lx2160a-add-lx2160acex7-device-tree-build.patch
@@ -0,0 +1,25 @@
+From 0038ae610ef69f00adf358d915ae618a83ac63cb Mon Sep 17 00:00:00 2001
+From: Rabeeh Khoury <rabeeh@solid-run.com>
+Date: Mon, 4 May 2020 17:33:28 +0300
+Subject: [PATCH] arm64: dts: lx2160a: add lx2160acex7 device tree build
+
+Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com>
+---
+ arch/arm64/boot/dts/freescale/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
+index 5e05e0be3aeb..7d342cffb87e 100644
+--- a/arch/arm64/boot/dts/freescale/Makefile
++++ b/arch/arm64/boot/dts/freescale/Makefile
+@@ -47,6 +47,7 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2088a-qds.dtb
+ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2088a-rdb.dtb
+ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-qds.dtb
+ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-rdb.dtb
++dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-cex7.dtb
+
+ dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb imx8mm-evk-rpmsg.dtb imx8mm-evk-rm67191.dtb \
+ imx8mm-ddr4-evk.dtb imx8mm-evk-root.dtb imx8mm-evk-inmate.dtb \
+--
+2.17.1
+
diff --git a/main/linux-lts/0001-arm64-dts-lx2160a-add-mdio-device-tree-nodes.patch b/main/linux-lts/0001-arm64-dts-lx2160a-add-mdio-device-tree-nodes.patch
new file mode 100644
index 0000000000..6140795bb7
--- /dev/null
+++ b/main/linux-lts/0001-arm64-dts-lx2160a-add-mdio-device-tree-nodes.patch
@@ -0,0 +1,48 @@
+From f9d10fd115c549938778f3a34a59ec150a3a446b Mon Sep 17 00:00:00 2001
+From: Vicentiu Galanopulo <vicentiu.galanopulo@nxp.com>
+Date: Fri, 20 Apr 2018 11:00:09 +0300
+Subject: arm64: dts: lx2160a: add MDIO device-tree nodes
+
+Signed-off-by: Vicentiu Galanopulo <vicentiu.galanopulo@nxp.com>
+---
+ arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+(limited to 'arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi')
+
+diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
+index b032f38..7cd91cd 100644
+--- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
++++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
+@@ -478,6 +478,28 @@
+ little-endian;
+ };
+
++ /* TODO: WRIOP (CCSR?) */
++ emdio1: mdio@0x8B96000 { /* WRIOP0: 0x8B8_0000, E-MDIO1: 0x1_6000 */
++ compatible = "fsl,fman-memac-mdio";
++ reg = <0x0 0x8B96000 0x0 0x1000>;
++ device_type = "mdio"; /* TODO: is this necessary? */
++ little-endian; /* force the driver in LE mode */
++
++ /* Not necessary on the QDS, but needed on the RDB */
++ #address-cells = <1>;
++ #size-cells = <0>;
++ };
++
++ emdio2: mdio@0x8B97000 { /* WRIOP0: 0x8B8_0000, E-MDIO2: 0x1_7000 */
++ compatible = "fsl,fman-memac-mdio";
++ reg = <0x0 0x8B97000 0x0 0x1000>;
++ device_type = "mdio"; /* TODO: is this necessary? */
++ little-endian; /* force the driver in LE mode */
++
++ #address-cells = <1>;
++ #size-cells = <0>;
++ };
++
+ i2c0: i2c@2000000 {
+ compatible = "fsl,vf610-i2c";
+ #address-cells = <1>;
+--
+cgit v1.1
+
diff --git a/main/linux-lts/0002-arm64-dts-lx2160a-add-lx2160acex7-device-tree.patch b/main/linux-lts/0002-arm64-dts-lx2160a-add-lx2160acex7-device-tree.patch
new file mode 100644
index 0000000000..7b3b4618c3
--- /dev/null
+++ b/main/linux-lts/0002-arm64-dts-lx2160a-add-lx2160acex7-device-tree.patch
@@ -0,0 +1,223 @@
+From 35dc5b03bb8f7b93fb474c39d7689d39062ff81a Mon Sep 17 00:00:00 2001
+From: Rabeeh Khoury <rabeeh@solid-run.com>
+Date: Sun, 28 Jul 2019 14:21:06 +0300
+Subject: [PATCH 2/3] arm64: dts: lx2160a: add lx2160acex7 device tree
+
+The device tree enables the following features -
+1. dpmac17 RGMII MAC connected to Atheros AR8035 phy
+2. 2x MDIO busses
+3. 2x USB 3.0 controllers
+4. 4x SATA ports
+5. MT35X 512Mb SPI flash
+6. Temperature sensor on i2c0 channel 3
+7. AMC6821 temperature and PWM fan controller
+
+The module supports AMC6821 and EMC2301 PWM controllers where either can
+be assembled, but not both together since the PWM and TACH signals are
+shared between them.
+
+Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com>
+---
+ .../boot/dts/freescale/fsl-lx2160a-cex7.dts | 190 ++++++++++++++++++
+ 1 file changed, 190 insertions(+)
+ create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dts
+
+diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dts b/arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dts
+new file mode 100644
+index 000000000000..872fcf9e724d
+--- /dev/null
++++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dts
+@@ -0,0 +1,190 @@
++// SPDX-License-Identifier: (GPL-2.0 OR MIT)
++//
++// Device Tree file for LX2160A-CEx7
++//
++// Copyright 2019 SolidRun ltd.
++
++/dts-v1/;
++
++#include "fsl-lx2160a.dtsi"
++
++/ {
++ model = "SolidRun LX2160A COM express type 7 module";
++ compatible = "fsl,lx2160a-cex7", "fsl,lx2160a";
++
++ aliases {
++ crypto = &crypto;
++ serial0 = &uart0;
++ serial1 = &uart1;
++ };
++
++ chosen {
++ stdout-path = "serial0:115200n8";
++ };
++
++ sb_3v3: regulator-sb3v3 {
++ compatible = "regulator-fixed";
++ regulator-name = "RT7290";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ regulator-boot-on;
++ regulator-always-on;
++ };
++};
++
++&crypto {
++ status = "okay";
++};
++
++&esdhc0 {
++ sd-uhs-sdr104;
++ sd-uhs-sdr50;
++ sd-uhs-sdr25;
++ sd-uhs-sdr12;
++ status = "okay";
++};
++
++&esdhc1 {
++ mmc-hs200-1_8v;
++ mmc-hs400-1_8v;
++ bus-width = <8>;
++ status = "okay";
++};
++
++
++/*
++i2c busses are -
++/dev/i2c0 - CTRL #0 - connected to PCA9547 I2C switch
++/dev/i2c1 - CTRL #2 - COM module to carrier (general I2C_CK/I2C_DAT)
++/dev/i2c2 - CTRL #4 - Connected to RTC PCF2129AT (0x51), EEPROM (0x54,0x55,0x56,0x57)
++
++I2C switch -
++/dev/i2c3 - CH0 - SO-DIMMs SPD (0x51, 0x53), 2Kb EEPROM (0x57), bootable 512Kb eeprom (0x50)
++/dev/i2c4 - CH1 - 100MHz clk gen (address 0x6a)
++/dev/i2c5 - CH2 - LTC3882 DC-DC controller on 0x63
++/dev/i2c6 - CH3 - SA56004ED (0x4c), SA56004FD (0x4d), COM module SMB_CK,SMB_DAT and COM module 10G_LED_SDA,10G_LED_SCL
++/dev/i2c7 - CH4 - SFP #0 I2C
++/dev/i2c8 - CH5 - SFP #1 I2C
++/dev/i2c9 - CH6 - SFP #2 I2C
++/dev/i2c10 - CH7 - SFP #3 I2C
++
++
++*/
++
++
++
++&i2c0 {
++ status = "okay";
++
++ i2c-mux@77 {
++ compatible = "nxp,pca9547";
++ reg = <0x77>;
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ i2c@1 {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ reg = <0x1>;
++ fan-temperature-ctrlr@18 {
++ compatible = "ti,amc6821";
++ reg = <0x18>;
++ cooling-min-state = <0>;
++ cooling-max-state = <9>;
++ #cooling-cells = <2>;
++ };
++ };
++ i2c@3 {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ reg = <0x3>;
++
++ temperature-sensor@48 {
++ compatible = "nxp,sa56004";
++ reg = <0x48>;
++ vcc-supply = <&sb_3v3>;
++ };
++ };
++ };
++};
++
++&i2c2 {
++ status = "okay";
++};
++
++&i2c4 {
++ status = "okay";
++
++ rtc@51 {
++ compatible = "nxp,pcf2129";
++ reg = <0x51>;
++ // IRQ10_B
++ interrupts = <0 150 0x4>;
++ };
++};
++
++&fspi {
++ status = "okay";
++ flash0: mt35xu512aba@0 {
++ #address-cells = <1>;
++ #size-cells = <1>;
++ compatible = "micron,m25p80";
++ m25p,fast-read;
++ spi-max-frequency = <50000000>;
++ reg = <0>;
++ /* The following setting enables 1-1-8 (CMD-ADDR-DATA) mode */
++ spi-rx-bus-width = <8>;
++ spi-tx-bus-width = <1>;
++ };
++};
++
++&uart0 {
++ status = "okay";
++};
++
++&uart1 {
++ status = "okay";
++};
++
++&usb0 {
++ status = "okay";
++};
++
++&usb1 {
++ status = "okay";
++};
++
++&emdio1 {
++ status = "okay";
++ rgmii_phy1: ethernet-phy@1 {
++ /* AR8035 PHY - "compatible" property not strictly needed */
++ compatible = "ethernet-phy-id004d.d072";
++ reg = <0x1>;
++ /* Poll mode - no "interrupts" property defined */
++ };
++};
++
++&emdio2 {
++ status = "okay";
++};
++
++&dpmac17 {
++ phy-handle = <&rgmii_phy1>;
++ phy-connection-type = "rgmii-id";
++};
++
++&sata0 {
++ status = "okay";
++};
++
++&sata1 {
++ status = "okay";
++};
++
++&sata2 {
++ status = "okay";
++};
++
++&sata3 {
++ status = "okay";
++};
+--
+2.17.1
+
diff --git a/main/linux-lts/0005-arm64-dts-lx2160a-cex7-add-ltc3882-support.patch b/main/linux-lts/0005-arm64-dts-lx2160a-cex7-add-ltc3882-support.patch
new file mode 100644
index 0000000000..e097ba319c
--- /dev/null
+++ b/main/linux-lts/0005-arm64-dts-lx2160a-cex7-add-ltc3882-support.patch
@@ -0,0 +1,37 @@
+From cca2439ac83136b9ed85f8519931018d4f5385e6 Mon Sep 17 00:00:00 2001
+From: Rabeeh Khoury <rabeeh@solid-run.com>
+Date: Sun, 12 Jan 2020 14:24:47 +0200
+Subject: [PATCH] arm64: dts: lx2160a-cex7: add ltc3882 support
+
+ltc3882 is lx2 cortex-a72 core voltage.
+this patch adds it to the device tree support; the driver is in
+drivers/hwmon/pmbus/ltc2978.c
+
+Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com>
+---
+ arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dts | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dts b/arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dts
+index 872fcf9e724d..1c1a0d47897d 100644
+--- a/arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dts
++++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dts
+@@ -94,6 +94,15 @@ I2C switch -
+ #cooling-cells = <2>;
+ };
+ };
++ i2c@2 {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ reg = <0x2>;
++ ltc3882@5c {
++ compatible = "ltc3882";
++ reg = <0x5c>;
++ };
++ };
+ i2c@3 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+--
+2.17.1
+
diff --git a/main/linux-lts/0006-arm64-dts-lx2160a-cex7-add-on-module-eeproms.patch b/main/linux-lts/0006-arm64-dts-lx2160a-cex7-add-on-module-eeproms.patch
new file mode 100644
index 0000000000..d430a341aa
--- /dev/null
+++ b/main/linux-lts/0006-arm64-dts-lx2160a-cex7-add-on-module-eeproms.patch
@@ -0,0 +1,52 @@
+From 05acb6ecc8eb7426c4664a1e8fd22ad69256d541 Mon Sep 17 00:00:00 2001
+From: Rabeeh Khoury <rabeeh@solid-run.com>
+Date: Sun, 26 Jan 2020 15:36:07 +0200
+Subject: [PATCH] arm64: dts: lx2160a-cex7: add on-module eeproms
+
+This patch adds 4 eeprom support on i2c mux channel #0 -
+1. Bootable 512Kbit eeprom at address 0x50.
+2. Memory SO-DIMMs SPD channels at 0x51 (upper SO-DIMM) and 0x53.
+3. 2Kb eeprom at 0x57 will be used by SolidRun to hold manufacturing
+data.
+
+Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com>
+---
+ .../boot/dts/freescale/fsl-lx2160a-cex7.dts | 22 ++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dts b/arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dts
+index 1c1a0d47897d..2b8f1118b37a 100644
+--- a/arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dts
++++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dts
+@@ -81,7 +81,27 @@ I2C switch -
+ reg = <0x77>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+-
++ i2c@0 {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ reg = <0x0>;
++ 24aa512@50 {
++ compatible = "atmel,24c512";
++ reg = <0x50>;
++ };
++ spd1@51 {
++ compatible = "atmel,spd";
++ reg = <0x51>;
++ };
++ spd2@53 {
++ compatible = "atmel,spd";
++ reg = <0x53>;
++ };
++ m24c02@57 {
++ compatible = "atmel,24c02";
++ reg = <0x57>;
++ };
++ };
+ i2c@1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+--
+2.17.1
+
diff --git a/main/linux-lts/0007-pci-hotplug-declare-IDT-bridge-as-hotpluggabl-bridge.patch b/main/linux-lts/0007-pci-hotplug-declare-IDT-bridge-as-hotpluggabl-bridge.patch
new file mode 100644
index 0000000000..522c1752da
--- /dev/null
+++ b/main/linux-lts/0007-pci-hotplug-declare-IDT-bridge-as-hotpluggabl-bridge.patch
@@ -0,0 +1,25 @@
+From 927a01dffed9eb439bc9bf6df0b6548380bc84a7 Mon Sep 17 00:00:00 2001
+From: Rabeeh Khoury <rabeeh@solid-run.com>
+Date: Mon, 10 Feb 2020 10:47:45 +0200
+Subject: [PATCH] pci: hotplug: declare IDT bridge as hotpluggabl bridge
+
+Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com>
+---
+ drivers/pci/quirks.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
+index 55870dd42b4d..bfac025931e0 100644
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -2915,6 +2915,7 @@ static void quirk_hotplug_bridge(struct pci_dev *dev)
+ dev->is_hotplug_bridge = 1;
+ }
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HINT, 0x0020, quirk_hotplug_bridge);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_IDT, 0x808c, quirk_hotplug_bridge);
+
+ /*
+ * This is a quirk for the Ricoh MMC controller found as a part of some
+--
+2.17.1
+
diff --git a/main/linux-lts/0008-pci-spr2803-quirk-to-fix-class-ID.patch b/main/linux-lts/0008-pci-spr2803-quirk-to-fix-class-ID.patch
new file mode 100644
index 0000000000..7d5cde502d
--- /dev/null
+++ b/main/linux-lts/0008-pci-spr2803-quirk-to-fix-class-ID.patch
@@ -0,0 +1,39 @@
+From bba6ebb2daac17bd2268c97b7255e477c2b15b52 Mon Sep 17 00:00:00 2001
+From: Rabeeh Khoury <rabeeh@solid-run.com>
+Date: Wed, 26 Feb 2020 17:57:54 +0200
+Subject: [PATCH] pci: spr2803: quirk to fix class ID
+
+spr2803 class is 0x0, this quirk modifies that to multimedia class in
+order to allocate memory to it's bars.
+
+Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com>
+---
+ drivers/pci/quirks.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
+index 28c64f84bfe7..4ddf7e43d531 100644
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -3068,6 +3068,18 @@ static void fixup_ti816x_class(struct pci_dev *dev)
+ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_TI, 0xb800,
+ PCI_CLASS_NOT_DEFINED, 8, fixup_ti816x_class);
+
++static void fixup_spr2803_class(struct pci_dev *dev)
++{
++ u32 class = dev->class;
++
++ /* spr2803 does not have class code */
++ dev->class = PCI_CLASS_MULTIMEDIA_VIDEO << 8;
++ pci_info(dev, "PCI class overridden (%#08x -> %#08x)\n",
++ class, dev->class);
++}
++DECLARE_PCI_FIXUP_CLASS_EARLY(0x1e00, 0x2803,
++ PCI_CLASS_NOT_DEFINED, 8, fixup_spr2803_class);
++
+ /*
+ * Some PCIe devices do not work reliably with the claimed maximum
+ * payload size supported.
+--
+2.17.1
+
diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD
index c3291f20a4..9d4633d3a3 100644
--- a/main/linux-lts/APKBUILD
+++ b/main/linux-lts/APKBUILD
@@ -2,12 +2,12 @@
_flavor=lts
pkgname=linux-${_flavor}
-pkgver=5.4.43
+pkgver=5.4.58
case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;;
esac
-pkgrel=1
+pkgrel=0
pkgdesc="Linux lts kernel"
url="https://www.kernel.org"
depends="mkinitfs"
@@ -20,6 +20,14 @@ install=
source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
0002-powerpc-config-defang-gcc-check-for-stack-protector-.patch
+ 0001-arm64-dts-lx2160a-add-mdio-device-tree-nodes.patch
+ 0001-arm64-dts-lx2160a-add-lx2160acex7-device-tree-build.patch
+ 0002-arm64-dts-lx2160a-add-lx2160acex7-device-tree.patch
+ 0005-arm64-dts-lx2160a-cex7-add-ltc3882-support.patch
+ 0006-arm64-dts-lx2160a-cex7-add-on-module-eeproms.patch
+ 0007-pci-hotplug-declare-IDT-bridge-as-hotpluggabl-bridge.patch
+ 0008-pci-spr2803-quirk-to-fix-class-ID.patch
+
config-lts.aarch64
config-lts.armv7
config-lts.x86
@@ -31,6 +39,7 @@ source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver
config-virt.aarch64
config-virt.armv7
+ config-virt.ppc64le
config-virt.x86
config-virt.x86_64
"
@@ -223,16 +232,24 @@ _dev() {
sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f linux-5.4.tar.xz
d19365fe94431008768c96a2c88955652f70b6df6677457ee55ee95246a64fdd2c6fed9b3bef37c29075178294a7fc91f148ead636382530ebfa822be4ad8c2f 0002-powerpc-config-defang-gcc-check-for-stack-protector-.patch
-02dce3a58b21c001655032d14f5ecb33347a823061d5eb0b2b085f3b3598ba066e0cfdc99c2dfb915a69ed20028251285ba5a8cfe5ba19d60b85f4b684d7a9ee config-lts.aarch64
-d9db5d29d6bbec5005d1de1552c2eb5f6f63fc848d15a938dbbb6e6e4267e07760d01c14f98c5dd429d477b8f5afd1025cda4ff27dd9612e356895c6a746ba81 config-lts.armv7
-3a95268cfa31eaf4a7730e478043ddd3d260c990339daa5da7515ece6aa76882907cb3a3c6128da95b5daecdcc3a9bbecce73d73b06f62e2c780170904e421b7 config-lts.x86
-4a7a80f859be00d892192f37e5f894bb472404e5422f1b592c80c7dfeb35c4123ac0c6127078a39f1d51c082aa3d0592d85407dfe447c15aa0b26d49428ede83 config-lts.x86_64
-bd2edcba4d39f35760ec78b01790388e07b97160dec5b2b5d613108d7477c8e8267c768039102c60efc69db4c259ea95928acc6521cbf3b02ada4e791260aa0b config-lts.ppc64le
-f153aab0ae56bf1e48afc53e0f312eba4a616a0f36719e3382213c7acaf815b1a6e10558ce9170de9d3d12936ead92102b89be1e09aa881ec1e9daf16148e001 config-lts.s390x
-feb5724d64610fd34cbf28a98fd8daeb0cfba4d197c7156cd1078ab6a8e34ec3382487090f984224c810176da27fceeaaeb61b6635ca3ea69ffdf5d227b4bd29 config-lts.mips64
-b5e8671accbbac759c7c354592f92e843bffdfca33e17a4e05f54072b6cca53b12fa745b91893fb7d77eb347517edddb0b9002b189373e86afb19ba47afc52a9 config-lts.mips
-75e4c843874a5ce05593818459382c735fb71216c2cf9c76f32d58f56639262b51dbfbe370b5fb597f361f5e2c00e481419cd8ad2c501abd327b34d688cb815f config-virt.aarch64
-f4d518802a94a93b94b5441050056f5fb43cdcf848ecd2b63d00206caf3803a40cf42bbb39bff1a2e9137fef3a21619ab5e70c003c802e85856b8ebd7d531c9b config-virt.armv7
-eab4db372882dc322a766f1d2bb9c0b9b506924efa1491cf07a85b8f820cc9ea8d43b974a7b6cda3e05842aab1bf78ae30dc5657530be47bcae7367ed8911e58 config-virt.x86
-5e2658b4a7754acaf359de4ffcf4eff7bd31b9f8668e89800f25f322df3b5a4ba32c721ebc7fb3211f737bb71207bec48e6b7578e1742f5d7bbf2322a6caf298 config-virt.x86_64
-8c68bd5b4137c4d6d58bf9c9d3d7ef34bcdc8eff73961926d19a91faabe94f9eec5154cce2aba27d3d0bca352c490c9283f106f335e3f333137e7448515fea75 patch-5.4.43.xz"
+cfcd03668a80944706c66f89055f641c972c1839bf33123c19d63681d3d3958c8a0d4ab0679af9b921d0e9fd0c25445b8c417a21d1519e3d196780a0d5bd1520 0001-arm64-dts-lx2160a-add-mdio-device-tree-nodes.patch
+1c87556c43b20c70e40d628624f0043a7dea1c3e66be26e15f594a1aed449a11f214795617d25309e1c1d5af92ec644222c4e68be652be043bdda80af0c0ece2 0001-arm64-dts-lx2160a-add-lx2160acex7-device-tree-build.patch
+e75ab07e3d2d0d3fd085fb4132b3fee1650ae3bf1b6eaefe1f92b90071547a4f3ceef35ad4ce0f9345e78fac2de1697f6db3de1a526e730262be7ff299bd0038 0002-arm64-dts-lx2160a-add-lx2160acex7-device-tree.patch
+d27bf4b8169ac047f60beae326da8f5e4d4f887c893cb4dd97f87d0c363d02e00704bf07d2026d9fd622b612cd9abbebfe4c5adfb7c033d73939b959e9652add 0005-arm64-dts-lx2160a-cex7-add-ltc3882-support.patch
+926cb8f9a15f82bb90db962c9b7f7cbb3dbb754d3b1a0d7d12c0593ea60de8f07744ccd7c86e0e43daf1eab3392cc8624786680e1244fa96982e676a908ab88d 0006-arm64-dts-lx2160a-cex7-add-on-module-eeproms.patch
+ca5aafac37e0b5f3fcbaf801e12f98beb58ffaf1d8c88f76caff22b059831869b4094e7fdcb6d6860422d6b2d036e072caff460e1feb84bd04d10740ad56265b 0007-pci-hotplug-declare-IDT-bridge-as-hotpluggabl-bridge.patch
+cbe85cf34e8420c91d2276c2d2aa0ab5023af68e57a1fa613f073f16a76766c67f585eda71c28f232bd0625e0dc8275a9eddc95f49409205dc0dbcc28c9fac1c 0008-pci-spr2803-quirk-to-fix-class-ID.patch
+4327ec22203cb3b84d67a560077007dbf91af17c0369ae4cde7e2de30ce8590751eb54aa8de41042124d09e86f2f7af6fddfaf0aebc868b743a386f072d3c790 config-lts.aarch64
+d55d697addc87fb430e711d54d237780b06eab34ece004fbb1c23649e00f637cc707cc370ec352f4d6edaa5ead5330f849d625c9b0470d10cc0e4a964a2135d0 config-lts.armv7
+4aa2c5061663debc0a6b14c0ade9c980d169b937d9a1eeb182ff2cdcabceabb4c139c1a9b8ed6cc7df888ef13375c04e32946ea0afb49d038236ec07885b62e7 config-lts.x86
+631cc00596f0e9d90a602b98040211a375279c38ec577ba4954bde37114e5518b374a59e242be3a8d311bd2aa2e0141fa3d1aea9e5dd6d1abc9885067569898a config-lts.x86_64
+38ac135a78ef662b8f785aebe9feecb9f3aa333f0eb7984891a8c2db0f4d5744b54cb9fc9b820ea5a7e71e0ee52891286eeb53e9056ec8833358539b14451229 config-lts.ppc64le
+a6c82d78d124d777297533269a376a996dea3a60b75e50fc94ceb852aa29f5175ca08b3f233db7f7c423ca1f085b05a038a005e07f6dc479542246476126e315 config-lts.s390x
+1bb04a6621a8581c782f793f6081fa390fc9167e5b4e0e0619d0a48b0137706065c543ebc4a7de1c2b60bff9282cd94f9164834a8f9a37a09387dc629f5962a4 config-lts.mips64
+4ac2ded62bc4ee683ccd308c2a17fed25ddad44e2c59f505b4c2f65c925172fc2d0412ef51a707937122492aa0de1c3b70fe3a4f613732cbf883358c49320574 config-lts.mips
+c1d75ca3dbb0872e39ff4d95698f9e1c5c1727178a62b39e8a1563de85ede9a179d91c1aa94e7f238d461b91fa45d3b7bc6556a4c7ff520f41fa09a30c9025a0 config-virt.aarch64
+185589999cf5215aa614a1a5c4eab9c6763de6b9525ba66e109c458079fc61b51c5712d2d462911e5b1f17ba9ec5a25800dc32139d16fa7646ccfc6663132c20 config-virt.armv7
+f02115e419c5e2d1091b578bcfd39c9c910e7cc6cfe0ca5d17c99cc04d289c8efa57ebacd99f439288687b873a1da03806f9f2abcf8154ff467b42f8886b6d26 config-virt.ppc64le
+29a1078ea69484d84f124b96fe13090e5079b5f841c46cb014a024a16568cb559a01948ce122d853de5b71f6acf6c0661f2a4a82b8ff775884047a632f629054 config-virt.x86
+70369ebc0c44cf84222126e1536de5cc484c594c74b6a89567871d1067f4843d7654f2d8c4250217dbd9719540c9dddfdd483587c65bb65ff76998eb0b8cfa95 config-virt.x86_64
+9b821aa688f14c2336ce53c95e5302538439ad7a6e440010fa1a033d760e1adfdfec3d4aa3ad0a65d366ed051474cd20b0b91a076d6932f1b77c2e6ec47eb8f1 patch-5.4.58.xz"
diff --git a/main/linux-lts/config-lts.aarch64 b/main/linux-lts/config-lts.aarch64
index 47f7865d0a..c97822d18c 100644
--- a/main/linux-lts/config-lts.aarch64
+++ b/main/linux-lts/config-lts.aarch64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.35 Kernel Configuration
+# Linux/arm64 5.4.58 Kernel Configuration
#
#
@@ -12,7 +12,6 @@ CONFIG_CLANG_VERSION=0
CONFIG_CC_CAN_LINK=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_EXTABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
@@ -326,6 +325,7 @@ CONFIG_ARM64_ERRATUM_1418040=y
CONFIG_ARM64_ERRATUM_1165522=y
CONFIG_ARM64_ERRATUM_1286807=y
CONFIG_ARM64_ERRATUM_1463225=y
+CONFIG_ARM64_ERRATUM_1542419=y
CONFIG_CAVIUM_ERRATUM_22375=y
CONFIG_CAVIUM_ERRATUM_23144=y
CONFIG_CAVIUM_ERRATUM_23154=y
@@ -574,6 +574,7 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
# end of EFI (Extensible Firmware Interface) Support
CONFIG_EFI_EARLYCON=y
+CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
#
# Tegra firmware driver
@@ -650,7 +651,7 @@ CONFIG_VHOST_NET=m
CONFIG_VHOST_SCSI=m
CONFIG_VHOST_VSOCK=m
CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+CONFIG_VHOST_CROSS_ENDIAN_LEGACY=y
CONFIG_ARM64_CRYPTO=y
CONFIG_CRYPTO_SHA256_ARM64=m
CONFIG_CRYPTO_SHA512_ARM64=m
@@ -1982,7 +1983,7 @@ CONFIG_SUNXI_RSB=m
CONFIG_TEGRA_ACONNECT=m
# CONFIG_TEGRA_GMI is not set
CONFIG_VEXPRESS_CONFIG=y
-# CONFIG_FSL_MC_BUS is not set
+CONFIG_FSL_MC_BUS=y
# end of Bus devices
CONFIG_CONNECTOR=y
@@ -2302,7 +2303,6 @@ CONFIG_SCSI_PROC_FS=y
CONFIG_BLK_DEV_SD=m
CONFIG_CHR_DEV_ST=m
CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m
CONFIG_CHR_DEV_SCH=m
CONFIG_SCSI_ENCLOSURE=m
@@ -2810,6 +2810,8 @@ CONFIG_NET_VENDOR_FREESCALE=y
CONFIG_FSL_PQ_MDIO=m
CONFIG_FSL_XGMAC_MDIO=m
CONFIG_GIANFAR=m
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
# CONFIG_FSL_ENETC is not set
# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_ENETC_MDIO is not set
@@ -5847,7 +5849,7 @@ CONFIG_SND_VX_LIB=m
CONFIG_SND_AC97_CODEC=m
CONFIG_SND_DRIVERS=y
CONFIG_SND_DUMMY=m
-# CONFIG_SND_ALOOP is not set
+CONFIG_SND_ALOOP=m
CONFIG_SND_VIRMIDI=m
CONFIG_SND_MTPAV=m
CONFIG_SND_MTS64=m
@@ -6320,7 +6322,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_COMMON=y
CONFIG_USB_LED_TRIG=y
-# CONFIG_USB_ULPI_BUS is not set
+CONFIG_USB_ULPI_BUS=m
# CONFIG_USB_CONN_GPIO is not set
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB=m
@@ -6349,7 +6351,7 @@ CONFIG_USB_XHCI_HCD=m
CONFIG_USB_XHCI_PCI=m
CONFIG_USB_XHCI_PLATFORM=m
# CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_MTK is not set
+CONFIG_USB_XHCI_MTK=m
CONFIG_USB_XHCI_MVEBU=m
CONFIG_USB_XHCI_TEGRA=m
CONFIG_USB_EHCI_HCD=m
@@ -6422,14 +6424,66 @@ CONFIG_USBIP_VHCI_HCD=m
CONFIG_USBIP_VHCI_HC_PORTS=8
CONFIG_USBIP_VHCI_NR_HCS=1
CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_VUDC is not set
# CONFIG_USBIP_DEBUG is not set
-# CONFIG_USB_CDNS3 is not set
-# CONFIG_USB_MTU3 is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_ISP1760 is not set
+CONFIG_USB_CDNS3=m
+# CONFIG_USB_CDNS3_GADGET is not set
+# CONFIG_USB_CDNS3_HOST is not set
+CONFIG_USB_CDNS3_PCI_WRAP=m
+CONFIG_USB_MTU3=m
+# CONFIG_USB_MTU3_HOST is not set
+# CONFIG_USB_MTU3_GADGET is not set
+CONFIG_USB_MTU3_DUAL_ROLE=y
+# CONFIG_USB_MTU3_DEBUG is not set
+CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+
+#
+# Platform Glue Layer
+#
+
+#
+# MUSB DMA mode
+#
+# CONFIG_MUSB_PIO_ONLY is not set
+CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_ULPI is not set
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_EXYNOS=m
+CONFIG_USB_DWC3_PCI=m
+CONFIG_USB_DWC3_HAPS=m
+CONFIG_USB_DWC3_OF_SIMPLE=m
+CONFIG_USB_DWC3_QCOM=m
+CONFIG_USB_DWC2=m
+# CONFIG_USB_DWC2_HOST is not set
+
+#
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
+#
+# CONFIG_USB_DWC2_PERIPHERAL is not set
+CONFIG_USB_DWC2_DUAL_ROLE=y
+CONFIG_USB_DWC2_PCI=m
+# CONFIG_USB_DWC2_DEBUG is not set
+# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_OF=m
+CONFIG_USB_CHIPIDEA_PCI=m
+# CONFIG_USB_CHIPIDEA_UDC is not set
+# CONFIG_USB_CHIPIDEA_HOST is not set
+CONFIG_USB_ISP1760=m
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1761_UDC=y
+# CONFIG_USB_ISP1760_HOST_ROLE is not set
+# CONFIG_USB_ISP1760_GADGET_ROLE is not set
+CONFIG_USB_ISP1760_DUAL_ROLE=y
#
# USB port drivers
@@ -6540,6 +6594,34 @@ CONFIG_USB_ULPI_VIEWPORT=y
# end of USB Physical Layer drivers
CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+
+#
+# USB Peripheral Controller
+#
+# CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_GR_UDC is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_SNP_UDC_PLAT is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_BDC_UDC is not set
+# CONFIG_USB_AMD5536UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_NET2280 is not set
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_GADGET_XILINX is not set
+# CONFIG_USB_DUMMY_HCD is not set
+# end of USB Peripheral Controller
+
+# CONFIG_USB_CONFIGFS is not set
CONFIG_TYPEC=m
# CONFIG_TYPEC_TCPM is not set
# CONFIG_TYPEC_UCSI is not set
@@ -6558,7 +6640,7 @@ CONFIG_TYPEC_DP_ALTMODE=m
# CONFIG_TYPEC_NVIDIA_ALTMODE is not set
# end of USB Type-C Alternate Mode drivers
-CONFIG_USB_ROLE_SWITCH=m
+CONFIG_USB_ROLE_SWITCH=y
CONFIG_MMC=m
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SD8787 is not set
@@ -7116,6 +7198,8 @@ CONFIG_ASHMEM=y
# CONFIG_UNISYSSPAR is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
# CONFIG_FB_TFT is not set
+CONFIG_FSL_DPAA2=y
+CONFIG_FSL_DPAA2_ETHSW=m
# CONFIG_WILC1000_SDIO is not set
# CONFIG_WILC1000_SPI is not set
# CONFIG_MOST is not set
@@ -7395,6 +7479,7 @@ CONFIG_BCM2835_POWER=y
#
# CONFIG_FSL_DPAA is not set
CONFIG_FSL_GUTS=y
+CONFIG_FSL_MC_DPIO=y
CONFIG_DPAA2_CONSOLE=y
# end of NXP/Freescale QorIQ SoC drivers
@@ -7956,6 +8041,7 @@ CONFIG_ARM_GIC_V2M=y
CONFIG_ARM_GIC_V3=y
CONFIG_ARM_GIC_V3_ITS=y
CONFIG_ARM_GIC_V3_ITS_PCI=y
+CONFIG_ARM_GIC_V3_ITS_FSL_MC=y
# CONFIG_AL_FIC is not set
CONFIG_DW_APB_ICTL=y
CONFIG_HISILICON_IRQ_MBIGEN=y
@@ -8023,6 +8109,8 @@ CONFIG_PHY_MVEBU_A3700_UTMI=y
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_UFS is not set
+# CONFIG_PHY_QCOM_USB_HS is not set
+# CONFIG_PHY_QCOM_USB_HSIC is not set
CONFIG_PHY_ROCKCHIP_DP=m
CONFIG_PHY_ROCKCHIP_EMMC=m
# CONFIG_PHY_ROCKCHIP_INNO_HDMI is not set
@@ -8033,8 +8121,11 @@ CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_EXYNOS_DP_VIDEO=y
CONFIG_PHY_EXYNOS_MIPI_VIDEO=y
# CONFIG_PHY_EXYNOS_PCIE is not set
+CONFIG_PHY_SAMSUNG_USB2=m
+CONFIG_PHY_EXYNOS5_USBDRD=m
CONFIG_PHY_TEGRA_XUSB=m
# CONFIG_PHY_TEGRA194_P2U is not set
+# CONFIG_PHY_TUSB1210 is not set
# end of PHY Subsystem
# CONFIG_POWERCAP is not set
@@ -8697,6 +8788,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
+# CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM is not set
# CONFIG_CRYPTO_DEV_EXYNOS_RNG is not set
CONFIG_CRYPTO_DEV_S5P=m
# CONFIG_CRYPTO_DEV_EXYNOS_HASH is not set
@@ -9031,7 +9123,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_SCHED_TRACER is not set
CONFIG_HWLAT_TRACER=y
-# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_FTRACE_SYSCALLS=y
# CONFIG_TRACER_SNAPSHOT is not set
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
diff --git a/main/linux-lts/config-lts.armv7 b/main/linux-lts/config-lts.armv7
index 1d8229f189..3ffd09cfa1 100644
--- a/main/linux-lts/config-lts.armv7
+++ b/main/linux-lts/config-lts.armv7
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.4.35 Kernel Configuration
+# Linux/arm 5.4.58 Kernel Configuration
#
#
@@ -12,7 +12,6 @@ CONFIG_CLANG_VERSION=0
CONFIG_CC_CAN_LINK=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -2184,7 +2183,6 @@ CONFIG_SCSI_PROC_FS=y
CONFIG_BLK_DEV_SD=m
CONFIG_CHR_DEV_ST=m
CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m
CONFIG_CHR_DEV_SCH=m
CONFIG_SCSI_ENCLOSURE=m
@@ -4922,7 +4920,7 @@ CONFIG_SND_MPU401_UART=m
CONFIG_SND_AC97_CODEC=m
CONFIG_SND_DRIVERS=y
CONFIG_SND_DUMMY=m
-# CONFIG_SND_ALOOP is not set
+CONFIG_SND_ALOOP=m
CONFIG_SND_VIRMIDI=m
CONFIG_SND_MTPAV=m
CONFIG_SND_SERIAL_U16550=m
@@ -5429,10 +5427,13 @@ CONFIG_USBIP_VHCI_HCD=m
CONFIG_USBIP_VHCI_HC_PORTS=8
CONFIG_USBIP_VHCI_NR_HCS=1
CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_VUDC is not set
# CONFIG_USBIP_DEBUG is not set
# CONFIG_USB_CDNS3 is not set
CONFIG_USB_MUSB_HDRC=m
CONFIG_USB_MUSB_HOST=y
+# CONFIG_USB_MUSB_GADGET is not set
+# CONFIG_USB_MUSB_DUAL_ROLE is not set
#
# Platform Glue Layer
@@ -5563,6 +5564,32 @@ CONFIG_AM335X_PHY_USB=m
# end of USB Physical Layer drivers
CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+
+#
+# USB Peripheral Controller
+#
+# CONFIG_USB_FSL_USB2 is not set
+# CONFIG_USB_FUSB300 is not set
+# CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_GR_UDC is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_SNP_UDC_PLAT is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_BDC_UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_GADGET_XILINX is not set
+# CONFIG_USB_DUMMY_HCD is not set
+# end of USB Peripheral Controller
+
+# CONFIG_USB_CONFIGFS is not set
CONFIG_TYPEC=m
# CONFIG_TYPEC_TCPM is not set
# CONFIG_TYPEC_UCSI is not set
@@ -7745,7 +7772,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_SCHED_TRACER is not set
# CONFIG_HWLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_FTRACE_SYSCALLS=y
# CONFIG_TRACER_SNAPSHOT is not set
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
diff --git a/main/linux-lts/config-lts.mips b/main/linux-lts/config-lts.mips
index 3d4355ee52..6a81be35ff 100644
--- a/main/linux-lts/config-lts.mips
+++ b/main/linux-lts/config-lts.mips
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/mips 5.4.43 Kernel Configuration
+# Linux/mips 5.4.58 Kernel Configuration
#
#
diff --git a/main/linux-lts/config-lts.mips64 b/main/linux-lts/config-lts.mips64
index 524f3385e4..c9a87f1901 100644
--- a/main/linux-lts/config-lts.mips64
+++ b/main/linux-lts/config-lts.mips64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/mips 5.4.43 Kernel Configuration
+# Linux/mips 5.4.58 Kernel Configuration
#
#
diff --git a/main/linux-lts/config-lts.ppc64le b/main/linux-lts/config-lts.ppc64le
index 2b8276e638..524d2c8889 100644
--- a/main/linux-lts/config-lts.ppc64le
+++ b/main/linux-lts/config-lts.ppc64le
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.43 Kernel Configuration
+# Linux/powerpc 5.4.58 Kernel Configuration
#
#
@@ -132,7 +132,7 @@ CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
# CONFIG_CFS_BANDWIDTH is not set
# CONFIG_RT_GROUP_SCHED is not set
-# CONFIG_CGROUP_PIDS is not set
+CONFIG_CGROUP_PIDS=y
# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_FREEZER=y
# CONFIG_CGROUP_HUGETLB is not set
@@ -490,7 +490,7 @@ CONFIG_KVM_XICS=y
CONFIG_KVM_XIVE=y
CONFIG_VHOST_NET=m
CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+CONFIG_VHOST_CROSS_ENDIAN_LEGACY=y
#
# General architecture-dependent options
@@ -1681,7 +1681,6 @@ CONFIG_SCSI_PROC_FS=y
CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=y
CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=y
# CONFIG_CHR_DEV_SCH is not set
CONFIG_SCSI_CONSTANTS=y
@@ -4538,7 +4537,7 @@ CONFIG_FTRACE=y
# CONFIG_IRQSOFF_TRACER is not set
CONFIG_SCHED_TRACER=y
# CONFIG_HWLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_FTRACE_SYSCALLS=y
CONFIG_TRACER_SNAPSHOT=y
# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_BRANCH_PROFILE_NONE=y
diff --git a/main/linux-lts/config-lts.s390x b/main/linux-lts/config-lts.s390x
index 75826273c6..8f0bf30b1a 100644
--- a/main/linux-lts/config-lts.s390x
+++ b/main/linux-lts/config-lts.s390x
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.4.43 Kernel Configuration
+# Linux/s390 5.4.58 Kernel Configuration
#
#
@@ -1738,7 +1738,6 @@ CONFIG_SCSI_PROC_FS=y
CONFIG_BLK_DEV_SD=m
CONFIG_CHR_DEV_ST=m
CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m
CONFIG_CHR_DEV_SCH=m
CONFIG_SCSI_CONSTANTS=y
@@ -3471,7 +3470,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_SCHED_TRACER is not set
# CONFIG_HWLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_FTRACE_SYSCALLS=y
# CONFIG_TRACER_SNAPSHOT is not set
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
diff --git a/main/linux-lts/config-lts.x86 b/main/linux-lts/config-lts.x86
index ec5fed7140..8a45577069 100644
--- a/main/linux-lts/config-lts.x86
+++ b/main/linux-lts/config-lts.x86
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.43 Kernel Configuration
+# Linux/x86 5.4.58 Kernel Configuration
#
#
@@ -643,6 +643,7 @@ CONFIG_UEFI_CPER=y
CONFIG_UEFI_CPER_X86=y
CONFIG_EFI_DEV_PATH_PARSER=y
CONFIG_EFI_EARLYCON=y
+CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
#
# Tegra firmware driver
@@ -2246,7 +2247,6 @@ CONFIG_SCSI_PROC_FS=y
CONFIG_BLK_DEV_SD=m
CONFIG_CHR_DEV_ST=m
CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m
CONFIG_CHR_DEV_SCH=m
CONFIG_SCSI_ENCLOSURE=m
@@ -3716,7 +3716,7 @@ CONFIG_SERIAL_8250_S