aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/abuild/0001-Revert-set-CARGO_HOME-to-SRCDEST-cargo.patch38
-rw-r--r--main/abuild/APKBUILD9
-rw-r--r--main/acct/APKBUILD2
-rw-r--r--main/acf-alpine-baselayout/APKBUILD16
-rw-r--r--main/acf-alpine-conf/APKBUILD16
-rw-r--r--main/acf-amavisd-new/APKBUILD12
-rw-r--r--main/acf-apk-tools/APKBUILD13
-rw-r--r--main/acf-asterisk/APKBUILD20
-rw-r--r--main/acf-awall/APKBUILD18
-rw-r--r--main/acf-chrony/APKBUILD16
-rw-r--r--main/acf-clamav/APKBUILD20
-rw-r--r--main/acf-core/APKBUILD25
-rw-r--r--main/acf-dansguardian/APKBUILD20
-rw-r--r--main/acf-db/APKBUILD24
-rw-r--r--main/acf-dhcp/APKBUILD20
-rw-r--r--main/acf-dnscache/APKBUILD16
-rw-r--r--main/acf-dnsmasq/APKBUILD16
-rw-r--r--main/acf-dovecot/APKBUILD20
-rw-r--r--main/acf-fetchmail/APKBUILD23
-rw-r--r--main/acf-freeradius3/APKBUILD16
-rw-r--r--main/acf-freeswitch-vmail/APKBUILD15
-rw-r--r--main/acf-freeswitch/APKBUILD18
-rw-r--r--main/acf-gross/APKBUILD16
-rw-r--r--main/acf-heimdal/APKBUILD20
-rw-r--r--main/acf-iproute2-qos/APKBUILD13
-rw-r--r--main/acf-iptables/APKBUILD20
-rw-r--r--main/acf-jquery/APKBUILD15
-rw-r--r--main/acf-kamailio/APKBUILD19
-rw-r--r--main/acf-lib/APKBUILD19
-rw-r--r--main/acf-lighttpd/APKBUILD16
-rw-r--r--main/acf-lvm2/APKBUILD18
-rw-r--r--main/acf-mariadb/APKBUILD17
-rw-r--r--main/acf-mdadm/APKBUILD18
-rw-r--r--main/acf-nsd/APKBUILD16
-rw-r--r--main/acf-openldap/APKBUILD20
-rw-r--r--main/acf-opennhrp/APKBUILD16
-rw-r--r--main/acf-openntpd/APKBUILD20
-rw-r--r--main/acf-openssh/APKBUILD16
-rw-r--r--main/acf-openssl/APKBUILD20
-rw-r--r--main/acf-openvpn/APKBUILD20
-rw-r--r--main/acf-pingu/APKBUILD20
-rw-r--r--main/acf-postfix/APKBUILD20
-rw-r--r--main/acf-postgresql/APKBUILD17
-rw-r--r--main/acf-ppp/APKBUILD16
-rw-r--r--main/acf-provisioning/APKBUILD19
-rw-r--r--main/acf-quagga/APKBUILD16
-rw-r--r--main/acf-samba/APKBUILD20
-rw-r--r--main/acf-skins/APKBUILD15
-rw-r--r--main/acf-snort/APKBUILD20
-rw-r--r--main/acf-squid/APKBUILD20
-rw-r--r--main/acf-tinydns/APKBUILD16
-rw-r--r--main/acf-unbound/APKBUILD17
-rw-r--r--main/acf-weblog/APKBUILD20
-rw-r--r--main/aconf/APKBUILD6
-rw-r--r--main/alpine-base/APKBUILD2
-rw-r--r--main/alpine-baselayout/APKBUILD8
-rw-r--r--main/alpine-baselayout/profile1
-rw-r--r--main/alpine-conf/0001-setup-disk-don-t-add-syslinux-package-for-mounted-ro.patch26
-rw-r--r--main/alpine-conf/0001-update-kernel-remove-nopad.patch28
-rw-r--r--main/alpine-conf/0001-update-kernel-use-nopad-Xbcj-for-modloop.patch33
-rw-r--r--main/alpine-conf/APKBUILD14
-rw-r--r--main/alpine-make-rootfs/APKBUILD20
-rw-r--r--main/alpine-sdk/APKBUILD4
-rw-r--r--main/alsa-lib/APKBUILD5
-rw-r--r--main/amavisd-milter/APKBUILD6
-rw-r--r--main/amavisd-milter/amavisd-milter.initd3
-rw-r--r--main/ansible-base/APKBUILD4
-rw-r--r--main/ansible/APKBUILD4
-rw-r--r--main/apache2/APKBUILD19
-rw-r--r--main/apk-tools/APKBUILD8
-rw-r--r--main/apk-tools/_apk129
-rw-r--r--main/aports-build/APKBUILD6
-rw-r--r--main/aports-build/aports-build8
-rw-r--r--main/argp-standalone/APKBUILD4
-rw-r--r--main/arpwatch/APKBUILD2
-rw-r--r--main/asciidoc/APKBUILD8
-rw-r--r--main/aspell-en/APKBUILD6
-rw-r--r--main/asterisk/APKBUILD21
-rw-r--r--main/atop/APKBUILD8
-rw-r--r--main/atop/atop-bb-compat.patch7
-rw-r--r--main/atop/fix-limits-on-ppc64le.patch10
-rw-r--r--main/audit/APKBUILD4
-rw-r--r--main/autoconf-archive/APKBUILD6
-rw-r--r--main/autoconf/APKBUILD2
-rw-r--r--main/avahi-ui/APKBUILD18
-rw-r--r--main/avahi/APKBUILD5
-rw-r--r--main/avfs/APKBUILD41
-rw-r--r--main/avfs/fix-PATH_MAX.patch16
-rw-r--r--main/awall/APKBUILD4
-rw-r--r--main/bacula/APKBUILD7
-rw-r--r--main/bash-completion/APKBUILD4
-rw-r--r--main/bash/APKBUILD28
-rw-r--r--main/bash/fix-jobs.patch26
-rw-r--r--main/batctl/APKBUILD23
-rw-r--r--main/bctoolbox/APKBUILD10
-rw-r--r--main/bctoolbox/cmake-lib-version-fix.patch34
-rw-r--r--main/bind/APKBUILD9
-rw-r--r--main/binutils/APKBUILD13
-rw-r--r--main/bison/APKBUILD4
-rw-r--r--main/bluez/APKBUILD25
-rw-r--r--main/bluez/test-mesh-crypto.patch14
-rw-r--r--main/bonding/APKBUILD4
-rwxr-xr-xmain/bonding/bonding.pre-up2
-rw-r--r--main/boost/boost-fiber-mips64-ftbfs.patch13
-rw-r--r--main/boost1.75/0001-revert-cease-dependence-on-range.patch (renamed from main/boost/0001-revert-cease-dependence-on-range.patch)0
-rw-r--r--main/boost1.75/APKBUILD (renamed from main/boost/APKBUILD)66
-rw-r--r--main/boost1.75/boost-1.57.0-python-abi_letters.patch (renamed from main/boost/boost-1.57.0-python-abi_letters.patch)0
-rw-r--r--main/boost1.75/boost-1.57.0-python-libpython_dep.patch (renamed from main/boost/boost-1.57.0-python-libpython_dep.patch)0
-rw-r--r--main/boost1.75/boost-context-mips-softfloat.patch72
-rw-r--r--main/boost1.75/build-undefine-statx-syscall.patch17
-rw-r--r--main/botan/APKBUILD2
-rw-r--r--main/brotli/APKBUILD33
-rw-r--r--main/btrfs-progs/APKBUILD4
-rw-r--r--main/bubblewrap/APKBUILD12
-rw-r--r--main/bubblewrap/realpath-workaround.patch53
-rw-r--r--main/busybox/0001-Revert-ash-jobs-Only-clear-gotsigchld-when-waiting-f.patch212
-rw-r--r--main/busybox/0001-echo-do-not-assume-that-free-leaves-errno-unmodified.patch63
-rw-r--r--main/busybox/0006-ping-make-ping-work-without-root-privileges.patch40
-rw-r--r--main/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch6
-rw-r--r--main/busybox/APKBUILD28
-rw-r--r--main/busybox/busybox.post-upgrade2
-rw-r--r--main/busybox/busyboxconfig15
-rw-r--r--main/busybox/busyboxconfig-extras15
-rw-r--r--main/busybox/default.script50
-rw-r--r--main/bwm-ng/APKBUILD6
-rw-r--r--main/byacc/APKBUILD4
-rw-r--r--main/c-ares/APKBUILD6
-rw-r--r--main/ccache/APKBUILD30
-rw-r--r--main/checkbashisms/APKBUILD4
-rw-r--r--main/cifs-utils/APKBUILD9
-rw-r--r--main/cifs-utils/path-install.patch17
-rw-r--r--main/cjdns/0001-seccomp-handle-__NR_clock_gettime64-when-appropriate.patch31
-rw-r--r--main/cjdns/APKBUILD14
-rw-r--r--main/cjdns/no-march-flag.patch10
-rw-r--r--main/cjson/APKBUILD38
-rw-r--r--main/ckbcomp/APKBUILD6
-rw-r--r--main/cksfv/APKBUILD6
-rw-r--r--main/clamav/APKBUILD8
-rw-r--r--main/clucene/APKBUILD2
-rw-r--r--main/cmake/APKBUILD6
-rw-r--r--main/conntrack-tools/APKBUILD29
-rw-r--r--main/conntrack-tools/conntrackd.logrotate14
-rw-r--r--main/coreutils/APKBUILD2
-rw-r--r--main/cpufrequtils/0001-Only-x86-has-cpuid-instruction.patch34
-rw-r--r--main/cpufrequtils/0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch1511
-rw-r--r--main/cpufrequtils/0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch35
-rw-r--r--main/cpufrequtils/0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch29
-rw-r--r--main/cpufrequtils/0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch46
-rw-r--r--main/cpufrequtils/0007-po-add-missing-word-in-DE.patch28
-rw-r--r--main/cpufrequtils/0008-cpufrequtils-make-NLS-optional.patch88
-rw-r--r--main/cpufrequtils/APKBUILD61
-rw-r--r--main/cpufrequtils/cpufrequtils.confd7
-rw-r--r--main/cpufrequtils/cpufrequtils.initd22
-rw-r--r--main/cryptsetup/APKBUILD4
-rw-r--r--main/cryptsetup/dmcrypt.initd2
-rw-r--r--main/ctags/APKBUILD6
-rw-r--r--main/cups/APKBUILD4
-rw-r--r--main/curl/APKBUILD13
-rw-r--r--main/cyrus-sasl/APKBUILD4
-rw-r--r--main/cyrus-sasl/fix-saslauthd-man-page.patch31
-rw-r--r--main/cython/APKBUILD4
-rw-r--r--main/czmq/APKBUILD6
-rw-r--r--main/dahdi-linux-lts/APKBUILD12
-rw-r--r--main/dahdi-linux-lts/kernel-5.6.patch499
-rw-r--r--main/dahdi-linux-lts/kernel-5.9.patch249
-rw-r--r--main/dahdi-linux-lts/kernel-compat-5.0.patch19
-rw-r--r--main/darkhttpd/0001-Add-svg-support-to-default-mimetypes.patch24
-rw-r--r--main/darkhttpd/APKBUILD21
-rw-r--r--main/darkhttpd/darkhttpd.confd10
-rw-r--r--main/darkhttpd/darkhttpd.initd13
-rw-r--r--main/dbus/APKBUILD4
-rw-r--r--main/debian-archive-keyring/APKBUILD8
-rw-r--r--main/dhcpcd-dbus/APKBUILD13
-rw-r--r--main/dhcpcd/APKBUILD4
-rw-r--r--main/dhcpcd/dhcpcd.initd8
-rw-r--r--main/dialog/APKBUILD4
-rw-r--r--main/dnsmasq/APKBUILD12
-rw-r--r--main/doas/APKBUILD8
-rw-r--r--main/dosfstools/APKBUILD29
-rw-r--r--main/dovecot/APKBUILD17
-rw-r--r--main/dovecot/fix-out-of-memory-test.patch22
-rw-r--r--main/doxygen/APKBUILD9
-rw-r--r--main/dpkg/APKBUILD11
-rw-r--r--main/dpkg/time_t.patch95
-rw-r--r--main/drbd-lts/APKBUILD55
-rw-r--r--main/dropbear/APKBUILD2
-rw-r--r--main/dtach/APKBUILD4
-rw-r--r--main/dtc/APKBUILD22
-rw-r--r--main/dtc/increase_max_srcfile_depth.patch15
-rw-r--r--main/dtc/install-pylibfdt-to-destdir.patch13
-rw-r--r--main/e2fsprogs/APKBUILD9
-rw-r--r--main/e2fsprogs/ensure-small-filesystems-are-Y2038-ok.patch36
-rw-r--r--main/ed/APKBUILD9
-rw-r--r--main/efibootmgr/APKBUILD2
-rw-r--r--main/efivar/APKBUILD2
-rw-r--r--main/eggdrop/APKBUILD4
-rw-r--r--main/elfutils/APKBUILD4
-rw-r--r--main/ell/APKBUILD8
-rw-r--r--main/ell/uintset-Fix-incomplete-memcpy-in_clone.patch28
-rw-r--r--main/email/APKBUILD4
-rw-r--r--main/enca/APKBUILD39
-rw-r--r--main/encfs/APKBUILD2
-rw-r--r--main/esh/APKBUILD4
-rw-r--r--main/etckeeper/APKBUILD4
-rw-r--r--main/ethtool/APKBUILD4
-rw-r--r--main/eudev/APKBUILD6
-rw-r--r--main/execline/APKBUILD6
-rw-r--r--main/expat/APKBUILD4
-rw-r--r--main/fakeroot/APKBUILD11
-rw-r--r--main/fakeroot/fakeroot-skip-ipc-sanity-check.patch46
-rw-r--r--main/fcgi/APKBUILD6
-rw-r--r--main/ferm/APKBUILD4
-rw-r--r--main/fetchmail/APKBUILD68
-rw-r--r--main/fetchmail/fetchmail.confd5
-rw-r--r--main/fetchmail/fetchmail.initd37
-rw-r--r--main/fetchmail/fetchmail.pre-install6
-rw-r--r--main/fftw/APKBUILD23
-rw-r--r--main/findutils/APKBUILD4
-rw-r--r--main/fish/APKBUILD30
-rw-r--r--main/fish/README.alpine1
-rw-r--r--main/font-alias/APKBUILD34
-rw-r--r--main/fortify-headers/0000-do-not-mess-with-ppoll.patch34
-rw-r--r--main/fortify-headers/APKBUILD6
-rw-r--r--main/fprobe/APKBUILD4
-rw-r--r--main/freeradius-client/APKBUILD2
-rw-r--r--main/freeradius/APKBUILD4
-rw-r--r--main/freeradius/radiusd.initd11
-rw-r--r--main/freeswitch/APKBUILD3
-rw-r--r--main/freetds/APKBUILD4
-rw-r--r--main/freetype/APKBUILD6
-rw-r--r--main/fuse3/APKBUILD4
-rw-r--r--main/gawk/APKBUILD20
-rw-r--r--main/gawk/echild-strerror.patch14
-rw-r--r--main/gc/APKBUILD6
-rw-r--r--main/gcc/0001-posix_memalign.patch4
-rw-r--r--main/gcc/0002-gcc-poison-system-directories.patch6
-rw-r--r--main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch8
-rw-r--r--main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch8
-rw-r--r--main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch6
-rw-r--r--main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch4
-rw-r--r--main/gcc/0007-Enable-Wtrampolines-by-default.patch4
-rw-r--r--main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch6
-rw-r--r--main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch6
-rw-r--r--main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch4
-rw-r--r--main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch4
-rw-r--r--main/gcc/0012-libitm-disable-FORTIFY.patch4
-rw-r--r--main/gcc/0013-libgcc_s.patch4
-rw-r--r--main/gcc/0014-nopie.patch4
-rw-r--r--main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch4
-rw-r--r--main/gcc/0016-dlang-update-zlib-binding.patch4
-rw-r--r--main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch4
-rw-r--r--main/gcc/0018-ada-fix-shared-linking.patch4
-rw-r--r--main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch4
-rw-r--r--main/gcc/0020-add-fortify-headers-paths.patch (renamed from main/gcc/0021-add-fortify-headers-paths.patch)4
-rw-r--r--main/gcc/0020-libstdc-futex-add-time64-compatibility.patch32
-rw-r--r--main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch (renamed from main/gcc/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch)8
-rw-r--r--main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch (renamed from main/gcc/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch)4
-rw-r--r--main/gcc/0023-Pure-64-bit-MIPS.patch (renamed from main/gcc/0024-Pure-64-bit-MIPS.patch)4
-rw-r--r--main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch (renamed from main/gcc/0025-use-pure-64-bit-configuration-where-appropriate.patch)4
-rw-r--r--main/gcc/0025-always-build-libgcc_eh.a.patch (renamed from main/gcc/0026-always-build-libgcc_eh.a.patch)4
-rw-r--r--main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch (renamed from main/gcc/0027-ada-libgnarl-compatibility-for-musl.patch)4
-rw-r--r--main/gcc/0027-ada-musl-support-fixes.patch (renamed from main/gcc/0028-ada-musl-support-fixes.patch)4
-rw-r--r--main/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch (renamed from main/gcc/0029-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch)4
-rw-r--r--main/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch (renamed from main/gcc/0030-gcc-go-Don-t-include-sys-user.h.patch)4
-rw-r--r--main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch (renamed from main/gcc/0031-gcc-go-Fix-ucontext_t-on-PPC64.patch)4
-rw-r--r--main/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch (renamed from main/gcc/0032-gcc-go-Fix-handling-of-signal-34-on-musl.patch)4
-rw-r--r--main/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch (renamed from main/gcc/0033-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch)4
-rw-r--r--main/gcc/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch (renamed from main/gcc/0034-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch)5
-rw-r--r--main/gcc/0034-gcc-go-signal-34-is-special-on-musl-libc.patch (renamed from main/gcc/0035-gcc-go-signal-34-is-special-on-musl-libc.patch)4
-rw-r--r--main/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch (renamed from main/gcc/0036-gcc-go-Prefer-_off_t-over-_off64_t.patch)4
-rw-r--r--main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch (renamed from main/gcc/0037-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch)4
-rw-r--r--main/gcc/0037-gcc-go-link-to-libucontext.patch (renamed from main/gcc/0038-gcc-go-link-to-libucontext.patch)4
-rw-r--r--main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch (renamed from main/gcc/0039-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch)5
-rw-r--r--main/gcc/0040-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch (renamed from main/gcc/0041-dlang-support-musl-1.2.0.patch)13
-rw-r--r--main/gcc/APKBUILD138
-rw-r--r--main/gcr/APKBUILD6
-rw-r--r--main/gd/APKBUILD10
-rw-r--r--main/gdbm/APKBUILD11
-rw-r--r--main/gdbm/gcc-10.patch17
-rw-r--r--main/gdk-pixbuf/APKBUILD15
-rw-r--r--main/gettext/APKBUILD16
-rw-r--r--main/gettext/musl-realpath.patch40
-rw-r--r--main/git/APKBUILD23
-rw-r--r--main/git/fix-t4219-with-sticky-bit.patch48
-rw-r--r--main/gitolite/APKBUILD4
-rw-r--r--main/glib/APKBUILD6
-rw-r--r--main/glslang/APKBUILD4
-rw-r--r--main/gmp/APKBUILD8
-rw-r--r--main/gnupg/APKBUILD4
-rw-r--r--main/gnupg1/APKBUILD53
-rw-r--r--main/gnutls/APKBUILD6
-rw-r--r--main/goaccess/APKBUILD4
-rw-r--r--main/gpsd/APKBUILD82
-rw-r--r--main/gpsd/gpsd-use-local-timepps-header.patch13
-rw-r--r--main/gpsd/gpsd.confd7
-rw-r--r--main/gpsd/gpsd.initd38
-rw-r--r--main/gpsd/timepps.h216
-rw-r--r--main/gptfdisk/APKBUILD9
-rw-r--r--main/gptfdisk/fix-wrong-include.patch2
-rw-r--r--main/graphite2/APKBUILD2
-rw-r--r--main/graphviz/APKBUILD8
-rw-r--r--main/gross/APKBUILD2
-rw-r--r--main/grub/APKBUILD2
-rw-r--r--main/gst-plugins-base/APKBUILD4
-rw-r--r--main/gstreamer/APKBUILD4
-rw-r--r--main/gtk+2.0/APKBUILD9
-rw-r--r--main/gtk+3.0/APKBUILD25
-rw-r--r--main/gtk-doc/APKBUILD4
-rw-r--r--main/haproxy/APKBUILD6
-rw-r--r--main/harfbuzz/APKBUILD19
-rw-r--r--main/haveged/APKBUILD10
-rw-r--r--main/haveged/haveged.confd10
-rw-r--r--main/haveged/haveged.initd12
-rw-r--r--main/help2man/APKBUILD4
-rw-r--r--main/highlight/APKBUILD10
-rw-r--r--main/htop/APKBUILD10
-rw-r--r--main/hunspell-en/APKBUILD11
-rw-r--r--main/hunspell-pt-br/APKBUILD4
-rw-r--r--main/hunspell-pt/APKBUILD12
-rw-r--r--main/hwids/APKBUILD4
-rw-r--r--main/iaxmodem/APKBUILD4
-rw-r--r--main/icecast/APKBUILD13
-rw-r--r--main/icecast/icecast.confd1
-rw-r--r--main/icecast/icecast.initd22
-rw-r--r--main/icu/APKBUILD15
-rw-r--r--main/ifupdown-ng/APKBUILD10
-rw-r--r--main/igmpproxy/APKBUILD10
-rw-r--r--main/imlib2/APKBUILD9
-rw-r--r--main/imlib2/fix-s390x.patch16
-rw-r--r--main/inih/APKBUILD70
-rw-r--r--main/inih/fix-pkgconfig-version.patch28
-rw-r--r--main/intel-ucode/APKBUILD28
-rw-r--r--main/iperf/APKBUILD10
-rw-r--r--main/iperf/long-to-time-t.patch15
-rw-r--r--main/iproute2/APKBUILD10
-rw-r--r--main/iproute2/fix-install-errors.patch40
-rw-r--r--main/iproute2/musl-fixes.patch19
-rw-r--r--main/ipset/APKBUILD4
-rw-r--r--main/iptables/APKBUILD5
-rw-r--r--main/iptraf-ng/APKBUILD41
-rw-r--r--main/iputils/APKBUILD23
-rw-r--r--main/irssi/APKBUILD6
-rw-r--r--main/irssi/glib-2-63.patch38
-rw-r--r--main/iucode-tool/APKBUILD37
-rw-r--r--main/iw/APKBUILD22
-rw-r--r--main/jack/APKBUILD4
-rw-r--r--main/java-common/APKBUILD25
-rw-r--r--main/java-common/java-common.trigger13
-rwxr-xr-xmain/jitterentropy-library/APKBUILD22
-rw-r--r--main/jpeg/APKBUILD4
-rw-r--r--main/json-c/APKBUILD4
-rw-r--r--main/kamailio/APKBUILD12
-rw-r--r--main/kbd/APKBUILD7
-rw-r--r--main/kmod/APKBUILD7
-rw-r--r--main/knot/APKBUILD7
-rw-r--r--main/lcms2/APKBUILD4
-rw-r--r--main/ldns/APKBUILD2
-rw-r--r--main/ldoc/APKBUILD10
-rw-r--r--main/lftp/APKBUILD6
-rw-r--r--main/libarchive/APKBUILD6
-rw-r--r--main/libbsd/APKBUILD4
-rw-r--r--main/libburn/APKBUILD4
-rw-r--r--main/libcap-ng/APKBUILD11
-rw-r--r--main/libcap-ng/apply.patch119
-rw-r--r--main/libcap/APKBUILD10
-rw-r--r--main/libdrm/APKBUILD8
-rw-r--r--main/libedit/APKBUILD10
-rw-r--r--main/libepoxy/APKBUILD33
-rw-r--r--main/libevdev/APKBUILD26
-rw-r--r--main/libfastjson/APKBUILD15
-rw-r--r--main/libgcrypt/APKBUILD34
-rw-r--r--main/libgpg-error/APKBUILD10
-rw-r--r--main/libical/APKBUILD6
-rw-r--r--main/libid3tag/APKBUILD6
-rw-r--r--main/libimagequant/APKBUILD4
-rw-r--r--main/libinput/APKBUILD46
-rw-r--r--main/libisoburn/APKBUILD4
-rw-r--r--main/libisofs/APKBUILD6
-rw-r--r--main/libjpeg-turbo/APKBUILD2
-rw-r--r--main/liblockfile/APKBUILD9
-rw-r--r--main/libmaxminddb/APKBUILD16
-rwxr-xr-xmain/libmaxminddb/libmaxminddb.cron6
-rw-r--r--main/libmnl/APKBUILD2
-rw-r--r--main/libnetfilter_log/APKBUILD6
-rw-r--r--main/libnftnl/APKBUILD4
-rw-r--r--main/libpcap/APKBUILD6
-rw-r--r--main/libpng/APKBUILD2
-rw-r--r--main/libressl/APKBUILD91
-rw-r--r--main/libressl/s_client-add-options-verify_.patch71
-rw-r--r--main/libressl/ssl-libcompat.patch13
-rw-r--r--main/libressl/starttls-ldap.patch207
-rw-r--r--main/librsync/APKBUILD9
-rw-r--r--main/librsync/Fix-heap-corruption-from-too-small-kbloom.patch23
-rw-r--r--main/libseccomp/APKBUILD2
-rw-r--r--main/libshout/APKBUILD4
-rw-r--r--main/libsndfile/APKBUILD17
-rw-r--r--main/libssh2/APKBUILD20
-rw-r--r--main/libtheora/APKBUILD27
-rw-r--r--main/libtirpc/APKBUILD6
-rw-r--r--main/libtirpc/soname-suffix.patch69
-rw-r--r--main/libucontext/APKBUILD10
-rw-r--r--main/libucontext0/APKBUILD31
-rw-r--r--main/libunistring/APKBUILD2
-rw-r--r--main/libunwind/APKBUILD2
-rw-r--r--main/liburing/APKBUILD28
-rw-r--r--main/libusb/APKBUILD11
-rw-r--r--main/libusb/f38f09da98acc63966b65b72029b1f7f81166bef.patch217
-rw-r--r--main/libutempter/APKBUILD8
-rw-r--r--main/libuv/APKBUILD34
-rw-r--r--main/libuv/disable-test-failing-on-builders.patch20
-rw-r--r--main/libva-glx/APKBUILD51
-rw-r--r--main/libva-intel-driver/APKBUILD32
-rw-r--r--main/libva/APKBUILD6
-rw-r--r--main/libwebp/APKBUILD4
-rw-r--r--main/libwebsockets/APKBUILD6
-rw-r--r--main/libxkbcommon/APKBUILD4
-rw-r--r--main/libxml2/APKBUILD6
-rw-r--r--main/libxslt/APKBUILD8
-rw-r--r--main/libxt/APKBUILD7
-rw-r--r--main/lighttpd/APKBUILD9
-rw-r--r--main/linux-firmware/APKBUILD4
-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/APKBUILD46
-rw-r--r--main/linux-lts/config-lts.aarch641330
-rw-r--r--main/linux-lts/config-lts.armv71048
-rw-r--r--main/linux-lts/config-lts.mips3163
-rw-r--r--main/linux-lts/config-lts.mips64786
-rw-r--r--main/linux-lts/config-lts.ppc64le571
-rw-r--r--main/linux-lts/config-lts.s390x525
-rw-r--r--main/linux-lts/config-lts.x861240
-rw-r--r--main/linux-lts/config-lts.x86_641335
-rw-r--r--main/linux-lts/config-virt.aarch64686
-rw-r--r--main/linux-lts/config-virt.armv7581
-rw-r--r--main/linux-lts/config-virt.ppc64le562
-rw-r--r--main/linux-lts/config-virt.x86530
-rw-r--r--main/linux-lts/config-virt.x86_64569
-rw-r--r--main/linux-pam/0001-avoid-opendir-since-it-may-be-called-during-fork-exe.patch34
-rw-r--r--main/linux-pam/0adbaeb273da1d45213134aa271e95987103281c.patch74
-rw-r--r--main/linux-pam/APKBUILD17
-rw-r--r--main/linux-pam/c9593778a6133bf29eb2f47c24cc6d2f5d729fc8.patch275
-rw-r--r--main/linux-rpi/APKBUILD15
-rw-r--r--main/linux-rpi/issue-4973.patch67
-rw-r--r--main/llvm10/APKBUILD12
-rw-r--r--main/lmdb/APKBUILD4
-rw-r--r--main/logcheck/APKBUILD14
-rw-r--r--main/logrotate/APKBUILD11
-rw-r--r--main/lsyncd/APKBUILD13
-rw-r--r--main/lsyncd/lua5.4.patch20
-rw-r--r--main/lua-alt-getopt/APKBUILD44
-rw-r--r--main/lua-alt-getopt/lua5.2-compat.patch77
-rw-r--r--main/lua-aports/APKBUILD8
-rw-r--r--main/lua-augeas/APKBUILD26
-rw-r--r--main/lua-b64/APKBUILD9
-rw-r--r--main/lua-bit32/APKBUILD13
-rw-r--r--main/lua-cjson/APKBUILD9
-rw-r--r--main/lua-cmsgpack/APKBUILD7
-rw-r--r--main/lua-cqueues/APKBUILD4
-rw-r--r--main/lua-curl/APKBUILD9
-rw-r--r--main/lua-dbi/APKBUILD6
-rw-r--r--main/lua-discount/APKBUILD17
-rw-r--r--main/lua-expat/APKBUILD25
-rw-r--r--main/lua-feedparser/APKBUILD6
-rw-r--r--main/lua-file-magic/APKBUILD7
-rw-r--r--main/lua-filesize/APKBUILD5
-rw-r--r--main/lua-filesystem/APKBUILD4
-rw-r--r--main/lua-gversion/APKBUILD5
-rw-r--r--main/lua-hashids/APKBUILD15
-rw-r--r--main/lua-iconv/APKBUILD22
-rw-r--r--main/lua-inspect/APKBUILD11
-rw-r--r--main/lua-json4/APKBUILD9
-rw-r--r--main/lua-ldap/APKBUILD3
-rw-r--r--main/lua-luaxml/APKBUILD7
-rw-r--r--main/lua-lub/APKBUILD5
-rw-r--r--main/lua-lustache/APKBUILD4
-rw-r--r--main/lua-lxc/APKBUILD16
-rw-r--r--main/lua-lyaml/APKBUILD4
-rw-r--r--main/lua-lzlib/APKBUILD25
-rw-r--r--main/lua-lzmq/APKBUILD5
-rw-r--r--main/lua-maxminddb/APKBUILD24
-rw-r--r--main/lua-md5/APKBUILD40
-rw-r--r--main/lua-md5/create-libdir.patch12
-rw-r--r--main/lua-microlight/APKBUILD29
-rw-r--r--main/lua-mosquitto/APKBUILD4
-rw-r--r--main/lua-mqtt-publish/APKBUILD8
-rw-r--r--main/lua-openrc/APKBUILD24
-rw-r--r--main/lua-optarg/APKBUILD8
-rw-r--r--main/lua-ossl/APKBUILD10
-rw-r--r--main/lua-pc/APKBUILD19
-rw-r--r--main/lua-penlight/APKBUILD6
-rw-r--r--main/lua-posix/APKBUILD40
-rw-r--r--main/lua-posixtz/APKBUILD10
-rw-r--r--main/lua-pty/APKBUILD6
-rw-r--r--main/lua-rex/APKBUILD4
-rw-r--r--main/lua-sec/APKBUILD12
-rw-r--r--main/lua-socket/APKBUILD4
-rw-r--r--main/lua-sql/APKBUILD14
-rw-r--r--main/lua-sqlite/APKBUILD22
-rw-r--r--main/lua-stdlib-debug/APKBUILD5
-rw-r--r--main/lua-stdlib-normalize/APKBUILD4
-rw-r--r--main/lua-stdlib/APKBUILD7
-rw-r--r--main/lua-stringy/APKBUILD4
-rw-r--r--main/lua-struct/APKBUILD6
-rw-r--r--main/lua-subprocess/APKBUILD2
-rw-r--r--main/lua-unit/APKBUILD8
-rw-r--r--main/lua-uuid/APKBUILD6
-rw-r--r--main/lua-yaml/APKBUILD4
-rw-r--r--main/lua5.4/APKBUILD107
-rw-r--r--main/lua5.4/lua-5.4-make.patch74
-rw-r--r--main/lua5.4/lua-5.4-module_paths.patch35
-rw-r--r--main/lua5.4/lua5.4.pc24
-rw-r--r--main/luajit/APKBUILD13
-rw-r--r--main/luajit/CVE-2020-15890.patch22
-rw-r--r--main/lxc/APKBUILD6
-rw-r--r--main/lz4/APKBUILD7
-rw-r--r--main/lzip/APKBUILD19
-rw-r--r--main/m4/APKBUILD6
-rw-r--r--main/m4/musl-realpath.patch23
-rw-r--r--main/macifrename/APKBUILD4
-rw-r--r--main/macifrename/macifrename.initd1
-rw-r--r--main/mailcap/APKBUILD4
-rw-r--r--main/mailx/APKBUILD2
-rw-r--r--main/man-pages/APKBUILD4
-rw-r--r--main/mariadb-connector-c/APKBUILD4
-rw-r--r--main/mariadb/APKBUILD19
-rw-r--r--main/mariadb/disable-failing-test.patch11
-rw-r--r--main/mariadb/have_stacktrace.patch21
-rw-r--r--main/mariadb/ppc-remove-glibc-dep.patch10
-rw-r--r--main/mbedtls/APKBUILD4
-rw-r--r--main/mc/APKBUILD6
-rw-r--r--main/mc/fix-cchar_t.patch11
-rw-r--r--main/mdadm/APKBUILD10
-rw-r--r--main/mdadm/fix-monitor-tv_sec.patch16
-rw-r--r--main/mdadm/fix-use-after-free.patch20
-rw-r--r--main/mesa/APKBUILD13
-rw-r--r--main/mesa/adjust-cache-deflate-buffer.patch12
-rw-r--r--main/mesa/disable-rgb10-by-default.patch14
-rw-r--r--main/meson/APKBUILD7
-rw-r--r--main/minicom/APKBUILD12
-rw-r--r--main/minicom/fix-includes.patch24
-rw-r--r--main/minicom/gcc-10.patch31
-rw-r--r--main/mkinitfs/0001-mkinitfs-add-optional-support-for-pigz.patch46
-rw-r--r--main/mkinitfs/APKBUILD13
-rw-r--r--main/monit/APKBUILD8
-rw-r--r--main/mosh/APKBUILD2
-rw-r--r--main/mosquitto/APKBUILD23
-rw-r--r--main/mosquitto/config.patch39
-rw-r--r--main/mosquitto/disable-ci-tests.patch13
-rw-r--r--main/mosquitto/mosquitto.confd10
-rw-r--r--main/mosquitto/mosquitto.initd17
-rw-r--r--main/mpc1/APKBUILD4
-rw-r--r--main/mpdecimal/10-pthreads.patch32
-rw-r--r--main/mpdecimal/APKBUILD32
-rw-r--r--main/mpg123/APKBUILD6
-rw-r--r--main/mtd-utils/APKBUILD11
-rw-r--r--main/mtdev/APKBUILD46
-rw-r--r--main/mtools/APKBUILD2
-rw-r--r--main/musl-nscd/APKBUILD4
-rw-r--r--main/musl-nscd/musl-nscd.post-deinstall9
-rw-r--r--main/musl-obstack/APKBUILD15
-rw-r--r--main/musl/APKBUILD14
-rw-r--r--main/musl/getent.c25
-rw-r--r--main/musl/revert-faccessat2.patch41
-rw-r--r--main/nagios-plugins/APKBUILD6
-rw-r--r--main/nagios-plugins/fix-compilation-warnings-about-sys-poll.patch16
-rw-r--r--main/nagios-plugins/fix-mysql-headers.patch24
-rw-r--r--main/nagios/APKBUILD6
-rw-r--r--main/nano/APKBUILD4
-rw-r--r--main/ncftp/APKBUILD6
-rw-r--r--main/ncurses/APKBUILD4
-rw-r--r--main/ndisc6/APKBUILD5
-rw-r--r--main/ndisc6/rdnssd.initd4
-rw-r--r--main/net-snmp/APKBUILD24
-rw-r--r--main/nettle/APKBUILD6
-rw-r--r--main/network-extras/APKBUILD17
-rw-r--r--main/nfs-utils/APKBUILD12
-rw-r--r--main/nfs-utils/musl-configure_ac.patch30
-rw-r--r--main/nftables/APKBUILD4
-rw-r--r--main/nghttp2/APKBUILD5
-rw-r--r--main/nginx/APKBUILD142
-rw-r--r--main/nginx/nginx-module-vts~cast-key-length-to-correct-type.patch24
-rw-r--r--main/nginx/nginx-module-vts~fix-uri-overflow.patch30
-rw-r--r--main/nginx/nginx-module-vts~set-histogram-buckets-on-first-request.patch147
-rw-r--r--main/nginx/nginx.conf53
-rw-r--r--main/nginx/nginx.post-install14
-rw-r--r--main/nginx/nginx.post-upgrade42
-rw-r--r--main/nginx/nginx.pre-upgrade27
-rw-r--r--main/nginx/nginx_cookie_flag_module~fix-mem-allocations.patch182
-rw-r--r--main/nginx/stream.conf14
-rw-r--r--main/nginx/traffic-accounting-nginx-module~disable-stream-module.patch14
-rw-r--r--main/ngircd/APKBUILD4
-rw-r--r--main/nodejs/APKBUILD35
-rw-r--r--main/nodejs/disable-running-gyp-on-shared-deps.patch (renamed from main/nodejs/dont-run-gyp-files-for-bundled-deps.patch)2
-rw-r--r--main/nrpe/APKBUILD12
-rw-r--r--main/nsd/APKBUILD8
-rw-r--r--main/nss/APKBUILD183
-rw-r--r--main/nss/nss-config.in145
-rw-r--r--main/nss/nss-softokn.pc.in11
-rw-r--r--main/nss/nss-util.pc.in11
-rw-r--r--main/nss/nss.pc.in11
-rw-r--r--main/ntfs-3g/APKBUILD6
-rw-r--r--main/numactl/APKBUILD8
-rw-r--r--main/oidentd/APKBUILD2
-rw-r--r--main/oniguruma/APKBUILD2
-rw-r--r--main/open-iscsi/APKBUILD6
-rw-r--r--main/open-isns/APKBUILD4
-rw-r--r--main/open-lldp/APKBUILD2
-rw-r--r--main/openjpeg/APKBUILD20
-rw-r--r--main/openjpeg/CVE-2019-12973.patch152
-rw-r--r--main/openjpeg/CVE-2020-15389.patch39
-rw-r--r--main/openjpeg/CVE-2020-6851.patch29
-rw-r--r--main/openjpeg/CVE-2020-8112.patch43
-rw-r--r--main/openldap/APKBUILD30
-rw-r--r--main/openldap/CVE-2021-27212.patch25
-rw-r--r--main/openldap/fix-manpages.patch2
-rw-r--r--main/openldap/openldap-2.4-ppolicy.patch2
-rw-r--r--main/openntpd/APKBUILD10
-rw-r--r--main/openntpd/gcc-10.patch63
-rw-r--r--main/openrc/0014-time_t-64bit.patch30
-rw-r--r--main/openrc/APKBUILD6
-rwxr-xr-xmain/openrc/modloop.initd9
-rw-r--r--main/openresolv/APKBUILD4
-rw-r--r--main/opensmtpd/APKBUILD44
-rw-r--r--main/opensmtpd/autoconf-decl-checks.patch11
-rw-r--r--main/opensmtpd/smtpd.conf.patch10
-rw-r--r--main/opensmtpd/smtpd.confd8
-rw-r--r--main/opensmtpd/smtpd.initd21
-rw-r--r--main/openssh/2e0beff67def2120f4b051b1016d7fbf84823e78.patch23
-rw-r--r--main/openssh/APKBUILD10
-rw-r--r--main/openssh/d9e727dcc04a52caaac87543ea1d230e9e6b5604.patch30
-rw-r--r--main/openssl/APKBUILD12
-rw-r--r--main/openvpn/APKBUILD14
-rw-r--r--main/opus/APKBUILD2
-rw-r--r--main/ortp/APKBUILD4
-rw-r--r--main/p11-kit/APKBUILD10
-rw-r--r--main/pam-pgsql/APKBUILD21
-rw-r--r--main/pango/APKBUILD4
-rw-r--r--main/parallel/APKBUILD4
-rw-r--r--main/parted/APKBUILD4
-rw-r--r--main/pax-utils/APKBUILD6
-rw-r--r--main/pcre2/APKBUILD6
-rw-r--r--main/pcsc-lite/APKBUILD6
-rw-r--r--main/perl-astro-suntime/APKBUILD4
-rw-r--r--main/perl-b-hooks-endofscope/APKBUILD4
-rw-r--r--main/perl-canary-stability/APKBUILD2
-rw-r--r--main/perl-cgi-fast/APKBUILD2
-rw-r--r--main/perl-cgi-session/APKBUILD18
-rw-r--r--main/perl-class-accessor/APKBUILD20
-rw-r--r--main/perl-class-singleton/APKBUILD42
-rw-r--r--main/perl-compress-raw-bzip2/APKBUILD6
-rw-r--r--main/perl-compress-raw-zlib/APKBUILD6
-rw-r--r--main/perl-control-x10/APKBUILD24
-rw-r--r--main/perl-convert-asn1/APKBUILD4
-rw-r--r--main/perl-convert-tnef/APKBUILD9
-rw-r--r--main/perl-convert-uulib/APKBUILD6
-rw-r--r--main/perl-crypt-openssl-random/APKBUILD9
-rw-r--r--main/perl-crypt-openssl-rsa/APKBUILD8
-rw-r--r--main/perl-css-minifier-xs/APKBUILD41
-rw-r--r--main/perl-data-hexdump/APKBUILD36
-rw-r--r--main/perl-datetime-format-w3cdtf/APKBUILD21
-rw-r--r--main/perl-datetime-locale/APKBUILD7
-rw-r--r--main/perl-datetime-timezone/APKBUILD11
-rw-r--r--main/perl-datetime/APKBUILD11
-rw-r--r--main/perl-dbix-searchbuilder/APKBUILD6
-rw-r--r--main/perl-device-serialport/APKBUILD4
-rw-r--r--main/perl-dist-checkconflicts/APKBUILD4
-rw-r--r--main/perl-encode/APKBUILD24
-rw-r--r--main/perl-file-listing/APKBUILD5
-rw-r--r--main/perl-future/APKBUILD4
-rw-r--r--main/perl-http-cookies/APKBUILD5
-rw-r--r--main/perl-http-message/APKBUILD12
-rw-r--r--main/perl-importer/APKBUILD2
-rw-r--r--main/perl-io-async/APKBUILD6
-rw-r--r--main/perl-io-socket-ssl/APKBUILD24
-rw-r--r--main/perl-io-tty/APKBUILD9
-rw-r--r--main/perl-io/APKBUILD9
-rw-r--r--main/perl-ipc-sharelite/APKBUILD2
-rw-r--r--main/perl-javascript-minifier-xs/APKBUILD41
-rw-r--r--main/perl-javascript-minifier/APKBUILD40
-rw-r--r--main/perl-json/APKBUILD10
-rw-r--r--main/perl-ldap/APKBUILD10
-rw-r--r--main/perl-libwww/APKBUILD4
-rw-r--r--main/perl-log-any/APKBUILD7
-rw-r--r--main/perl-lwp-protocol-https/APKBUILD40
-rw-r--r--main/perl-lwp-useragent-determined/APKBUILD4
-rw-r--r--main/perl-mail-imapclient/APKBUILD38
-rw-r--r--main/perl-mime-lite/APKBUILD4
-rw-r--r--main/perl-mime-types/APKBUILD39
-rw-r--r--main/perl-module-scandeps/APKBUILD23
-rw-r--r--main/perl-module-util/APKBUILD4
-rw-r--r--main/perl-net-http/APKBUILD27
-rw-r--r--main/perl-net-ssleay/APKBUILD9
-rw-r--r--main/perl-net-telnet/APKBUILD4
-rw-r--r--main/perl-package-anon/APKBUILD4
-rw-r--r--main/perl-package-deprecationmanager/APKBUILD4
-rw-r--r--main/perl-path-tiny/APKBUILD23
-rw-r--r--main/perl-pathtools/APKBUILD4
-rw-r--r--main/perl-php-serialization/APKBUILD4
-rw-r--r--main/perl-probe-perl/APKBUILD4
-rw-r--r--main/perl-role-tiny/APKBUILD32
-rw-r--r--main/perl-specio/APKBUILD16
-rw-r--r--main/perl-test-eol/APKBUILD17
-rw-r--r--main/perl-test-leaktrace/APKBUILD32
-rw-r--r--main/perl-test-manifest/APKBUILD42
-rw-r--r--main/perl-test-mockmodule/APKBUILD5
-rw-r--r--main/perl-test-output/APKBUILD41
-rw-r--r--main/perl-test-script/APKBUILD6
-rw-r--r--main/perl-test2-suite/APKBUILD4
-rw-r--r--main/perl-tree-dag_node/APKBUILD36
-rw-r--r--main/perl-type-tiny/APKBUILD4
-rw-r--r--main/perl-uri/APKBUILD6
-rw-r--r--main/perl-x10/APKBUILD4
-rw-r--r--main/perl-xml-namespacesupport/APKBUILD2
-rw-r--r--main/perl-xml-sax-base/APKBUILD2
-rw-r--r--main/perl-xml-sax/APKBUILD2
-rw-r--r--main/perl/APKBUILD4
-rw-r--r--main/pgpool/APKBUILD13
-rw-r--r--main/pgpool/fix-listen_address.patch57
-rw-r--r--main/pigz/APKBUILD15
-rw-r--r--main/pinentry/APKBUILD7
-rw-r--r--main/po4a/APKBUILD11
-rw-r--r--main/poppler/APKBUILD4
-rw-r--r--main/postfix/APKBUILD6
-rw-r--r--main/postfix/postfix-musl-2.patch53
-rw-r--r--main/postgresql-pllua/APKBUILD4
-rw-r--r--main/postgresql/APKBUILD23
-rw-r--r--main/postgresql/czech-snowball-stemmer.patch1064
-rw-r--r--main/postgresql/disable-test-collate.icu.utf8.patch20
-rw-r--r--main/postgresql/perl-rpath.patch8
-rw-r--r--main/postgresql/postgresql.confd39
-rw-r--r--main/postgresql/postgresql.initd170
-rw-r--r--main/ppp/APKBUILD20
-rw-r--r--main/ppp/fix-bound-check-eap.patch40
-rw-r--r--main/ppp/fix-paths.patch12
-rw-r--r--main/ppp/fix-pppd-pppoe.h.patch21
-rw-r--r--main/ppp/musl-fix-headers.patch77
-rw-r--r--main/ppp/pppd-Ignore-received-EAP-messages-when-not-doing-EAP.patch64
-rw-r--r--main/ppp/radius-Prevent-buffer-overflow-in-rc_mksid.patch33
-rw-r--r--main/privoxy/APKBUILD4
-rw-r--r--main/procps/APKBUILD11
-rw-r--r--main/procps/musl-fixes.patch41
-rw-r--r--main/protobuf-c/APKBUILD5
-rw-r--r--main/protobuf/APKBUILD2
-rw-r--r--main/psmisc/APKBUILD11
-rw-r--r--main/pspg/APKBUILD4
-rw-r--r--main/pssh/APKBUILD26
-rw-r--r--main/pssh/python3.patch56
-rw-r--r--main/py3-alabaster/APKBUILD2
-rw-r--r--main/py3-babel/APKBUILD5
-rw-r--r--main/py3-bcrypt/APKBUILD8
-rw-r--r--main/py3-certifi/APKBUILD22
-rw-r--r--main/py3-certifi/use-alpine-system-certs.patch42
-rw-r--r--main/py3-cffi/APKBUILD4
-rw-r--r--main/py3-chardet/440828f8faafdb58700c64a9ea8f6a30b154c08b.patch26
-rw-r--r--main/py3-chardet/APKBUILD13
-rw-r--r--main/py3-coverage/APKBUILD4
-rw-r--r--main/py3-cryptography/APKBUILD14
-rw-r--r--main/py3-dnspython/APKBUILD6
-rw-r--r--main/py3-elftools/APKBUILD5
-rw-r--r--main/py3-future/APKBUILD8
-rw-r--r--main/py3-hypothesis/APKBUILD4
-rw-r--r--main/py3-idna/APKBUILD6
-rw-r--r--main/py3-iso8601/APKBUILD6
-rw-r--r--main/py3-jinja2/APKBUILD10
-rw-r--r--main/py3-mako/APKBUILD15
-rw-r--r--main/py3-markdown/APKBUILD7
-rw-r--r--main/py3-mock/APKBUILD4
-rw-r--r--main/py3-more-itertools/APKBUILD10
-rw-r--r--main/py3-packaging/APKBUILD7
-rw-r--r--main/py3-pbr/APKBUILD5
-rw-r--r--main/py3-pillow/APKBUILD8
-rw-r--r--main/py3-pluggy/0001-remove-setuptools_scm.patch13
-rw-r--r--main/py3-pluggy/APKBUILD24
-rw-r--r--main/py3-ptyprocess/APKBUILD7
-rw-r--r--main/py3-py/APKBUILD4
-rw-r--r--main/py3-pycryptodome/APKBUILD52
-rw-r--r--main/py3-pygments/APKBUILD11
-rw-r--r--main/py3-pytest/APKBUILD19
-rw-r--r--main/py3-requests/0002-allow-idna-3.patch15
-rw-r--r--main/py3-requests/APKBUILD21
-rw-r--r--main/py3-requests/certs.patch14
-rw-r--r--main/py3-requests/dont-depend-on-certifi.patch17
-rw-r--r--main/py3-requests/update-urllib3.patch29
-rw-r--r--main/py3-setuptools/APKBUILD9
-rw-r--r--main/py3-snowballstemmer/APKBUILD8
-rw-r--r--main/py3-sphinx/APKBUILD2
-rw-r--r--main/py3-sphinx_rtd_theme/APKBUILD2
-rw-r--r--main/py3-tappy/APKBUILD6
-rw-r--r--main/py3-testtools/APKBUILD5
-rw-r--r--main/py3-tz/APKBUILD4
-rw-r--r--main/py3-urllib3/APKBUILD12
-rw-r--r--main/py3-virtualenv/APKBUILD19
-rw-r--r--main/py3-wheel/APKBUILD29
-rw-r--r--main/py3-yaml/APKBUILD12
-rw-r--r--main/py3-zipp/APKBUILD31
-rw-r--r--main/python3/APKBUILD19
-rw-r--r--main/python3/ece5dfd403dac211f8d3c72701fe7ba7b7aa5b5f.patch186
-rw-r--r--main/python3/mpdecimal-2.5.1.patch33
-rw-r--r--main/python3/test_nntplib.patch34
-rw-r--r--main/ragel/APKBUILD44
-rw-r--r--main/raspberrypi-bootloader/APKBUILD4
-rw-r--r--main/razor/APKBUILD23
-rw-r--r--main/razor/fix-cosmetic-pv.patch24
-rw-r--r--main/razor/fix-manpage-quoting.patch17
-rw-r--r--main/readline/APKBUILD13
-rw-r--r--main/redis/APKBUILD27
-rw-r--r--main/redis/makefile-dont-duplicate-binary.patch18
-rw-r--r--main/redis/musl-zmalloc.patch23
-rw-r--r--main/redis/redis.conf.patch29
-rw-r--r--main/redis/upstream-musl-changes.patch134
-rw-r--r--main/rgb/APKBUILD29
-rw-r--r--main/rhash/APKBUILD4
-rw-r--r--main/rng-tools/01-fix-jitter-format-warning.patch22
-rw-r--r--main/rng-tools/02-fix-list-for-enabled-sources.patch62
-rw-r--r--main/rng-tools/APKBUILD106
-rw-r--r--main/rng-tools/fix-encrypt-name-clash.patch22
-rw-r--r--main/rng-tools/fix-textrels-on-PIC-x86.patch36
-rw-r--r--main/rng-tools/rngd-extra.confd85
-rw-r--r--main/rng-tools/rngd-extra.initd66
-rw-r--r--main/rng-tools/rngd.confd73
-rw-r--r--main/rng-tools/rngd.initd50
-rw-r--r--main/rng-tools/stack.patch13
-rw-r--r--main/rp-pppoe/APKBUILD4
-rw-r--r--main/rsnapshot/APKBUILD11
-rw-r--r--main/rssh/APKBUILD39
-rw-r--r--main/rssh/fix-error-message-for-invalid-option.patch18
-rw-r--r--main/rssh/handle-rsync-v3-e-option.patch130
-rw-r--r--main/rssh/makefile.patch18
-rw-r--r--main/rssh/rssh.post-deinstall4
-rw-r--r--main/rssh/rssh.post-install4
-rw-r--r--main/rsync/APKBUILD6
-rw-r--r--main/rsync/rsyncd.confd7
-rw-r--r--main/rsync/rsyncd.initd11
-rw-r--r--main/rsyslog/APKBUILD6
-rw-r--r--main/ruby-bundler/APKBUILD6
-rw-r--r--main/ruby/APKBUILD8
-rw-r--r--main/s390-tools/0002-musl-fixes.patch33
-rw-r--r--main/s390-tools/0009-link-libexecinfo.patch2
-rw-r--r--main/s390-tools/0300-disable-program-using-gnu-ext.patch8
-rw-r--r--main/s390-tools/0400-busybox-compat.patch32
-rw-r--r--main/s390-tools/0500-remove-lib64.patch65
-rw-r--r--main/s390-tools/APKBUILD21
-rw-r--r--main/s390-tools/argz.patch34
-rw-r--r--main/s390-tools/bash.patch2
-rw-r--r--main/s6-dns/APKBUILD8
-rw-r--r--main/s6-linux-init/APKBUILD6
-rw-r--r--main/s6-linux-utils/APKBUILD6
-rw-r--r--main/s6-networking/APKBUILD8
-rw-r--r--main/s6-portable-utils/APKBUILD6
-rw-r--r--main/s6-rc/APKBUILD8
-rw-r--r--main/s6/APKBUILD8
-rw-r--r--main/s6/s6-svscanboot4
-rw-r--r--main/samba/APKBUILD11
-rw-r--r--main/samurai/20-query-tool.patch86
-rw-r--r--main/samurai/APKBUILD10
-rw-r--r--main/scdoc/APKBUILD4
-rw-r--r--main/scons/APKBUILD5
-rw-r--r--main/screen/APKBUILD11
-rw-r--r--main/screen/CVE-2021-26937.patch59
-rw-r--r--main/sdl/0001-CVE-2019-7572.patch64
-rw-r--r--main/sdl/0001-CVE-2019-7573.patch83
-rw-r--r--main/sdl/0001-CVE-2019-7574.patch71
-rw-r--r--main/sdl/0001-CVE-2019-7575.patch84
-rw-r--r--main/sdl/0001-CVE-2019-7577.patch75
-rw-r--r--main/sdl/0001-CVE-2019-7578.patch67
-rw-r--r--main/sdl/0001-CVE-2019-7635.patch53
-rw-r--r--main/sdl/0001-CVE-2019-7636.patch29
-rw-r--r--main/sdl/0001-CVE-2019-7637.patch182
-rw-r--r--main/sdl/0002-CVE-2019-7572.patch59
-rw-r--r--main/sdl/0002-CVE-2019-7577.patch57
-rw-r--r--main/sdl/0002-CVE-2019-7635.patch21
-rw-r--r--main/sdl/0002-CVE-2019-7637.patch42
-rw-r--r--main/sdl/APKBUILD98
-rw-r--r--main/sdl/SDL-1.2.10-GrabNotViewable.patch22
-rw-r--r--main/sdl/SDL-1.2.15-const_XData32.patch16
-rw-r--r--main/seabios/APKBUILD21
-rw-r--r--main/seabios/config.seabios-128k1
-rw-r--r--main/ser2net/APKBUILD2
-rw-r--r--main/setxkbmap/APKBUILD31
-rw-r--r--main/shared-mime-info/APKBUILD33
-rw-r--r--main/sircbot/APKBUILD14
-rw-r--r--main/skalibs/APKBUILD6
-rw-r--r--main/slibtool/APKBUILD25
-rw-r--r--main/smartmontools/APKBUILD10
-rw-r--r--main/smartmontools/smartd.confd12
-rw-r--r--main/smartmontools/smartd.initd24
-rw-r--r--main/smokeping/APKBUILD29
-rw-r--r--main/snownews/APKBUILD35
-rw-r--r--main/snownews/configure.patch11
-rw-r--r--main/snownews/openssl-1.1.patch1674
-rw-r--r--main/socat/APKBUILD6
-rw-r--r--main/sofia-sip/APKBUILD4
-rw-r--r--main/spamassassin/APKBUILD22
-rw-r--r--main/spamassassin/spamd.crond4
-rw-r--r--main/speedtest-cli/APKBUILD5
-rw-r--r--main/sqlite-tcl/APKBUILD8
-rw-r--r--main/sqlite/APKBUILD8
-rw-r--r--main/squid/APKBUILD12
-rw-r--r--main/sshpass/APKBUILD31
-rw-r--r--main/static-routing/APKBUILD17
-rw-r--r--main/static-routing/static-routing4
-rw-r--r--main/statserial/APKBUILD4
-rw-r--r--main/strace/APKBUILD19
-rw-r--r--main/strace/remove-ipproto-max.patch26
-rw-r--r--main/subversion/APKBUILD8
-rw-r--r--main/sudo/APKBUILD10
-rw-r--r--main/supervisor/APKBUILD8
-rw-r--r--main/swig/APKBUILD2
-rw-r--r--main/sysfsutils/APKBUILD20
-rw-r--r--main/syslinux/APKBUILD9
-rw-r--r--main/talloc/APKBUILD4
-rw-r--r--main/tar/APKBUILD10
-rw-r--r--main/tcl/APKBUILD4
-rw-r--r--main/tcpdump/APKBUILD9
-rw-r--r--main/tcpflow/APKBUILD13
-rw-r--r--main/tcpflow/CVE-2018-18409.patch183
-rw-r--r--main/terminus-font/APKBUILD23
-rw-r--r--main/thin-provisioning-tools/APKBUILD35
-rw-r--r--main/tiff/APKBUILD14
-rw-r--r--main/tig/APKBUILD10
-rw-r--r--main/tig/time_t.patch33
-rw-r--r--main/tiny-ec2-bootstrap/APKBUILD4
-rw-r--r--main/ttf-cantarell/APKBUILD6
-rw-r--r--main/ttf-droid/APKBUILD2
-rw-r--r--main/tunnel/APKBUILD13
-rw-r--r--main/tzdata/APKBUILD10
-rw-r--r--main/u-boot/APKBUILD44
-rw-r--r--main/uboot-tools/APKBUILD47
-rw-r--r--main/uboot-tools/defang-efi-bootcmd.patch13
-rw-r--r--main/uboot-tools/fix-ulong-typedef.patch10
-rw-r--r--main/umurmur/APKBUILD6
-rw-r--r--main/unbound/APKBUILD19
-rw-r--r--main/unbound/unbound.confd3
-rw-r--r--main/unbound/unbound.initd14
-rw-r--r--main/unifont/APKBUILD4
-rw-r--r--main/unixodbc/APKBUILD6
-rw-r--r--main/unrar/APKBUILD8
-rw-r--r--main/unzip/APKBUILD10
-rw-r--r--main/userspace-rcu/APKBUILD4
-rw-r--r--main/util-linux/APKBUILD4
-rw-r--r--main/util-macros/APKBUILD11
-rw-r--r--main/utmps/APKBUILD10
-rw-r--r--main/uwsgi/APKBUILD6
-rw-r--r--main/vala/APKBUILD4
-rw-r--r--main/valgrind/APKBUILD9
-rw-r--r--main/vblade/APKBUILD32
-rw-r--r--main/vim/APKBUILD4
-rw-r--r--main/vlan/APKBUILD17
-rw-r--r--main/wayland/APKBUILD8
-rw-r--r--main/wget/APKBUILD14
-rw-r--r--main/wget/gcc-10.patch33
-rw-r--r--main/wireguard-tools/APKBUILD54
-rw-r--r--main/wireless-regdb/APKBUILD4
-rw-r--r--main/wpa_supplicant/APKBUILD24
-rw-r--r--main/wpa_supplicant/CVE-2021-0326.patch37
-rw-r--r--main/wpa_supplicant/config6
-rw-r--r--main/wpa_supplicant/wpa_supplicant.initd2
-rw-r--r--main/xauth/APKBUILD32
-rw-r--r--main/xcb-util-image/APKBUILD44
-rw-r--r--main/xcb-util-renderutil/APKBUILD42
-rw-r--r--main/xen/0001-x86-mm-Refactor-map_pages_to_xen-to-have-only-a-sing.patch94
-rw-r--r--main/xen/0001-x86-pv-Drop-FLUSH_TLB_GLOBAL-in-do_mmu_update-for-XP.patch58
-rw-r--r--main/xen/0002-x86-mm-Refactor-modify_xen_mappings-to-have-one-exit.patch68
-rw-r--r--main/xen/0002-x86-pv-Flush-TLB-in-response-to-paging-structure-cha.patch166
-rw-r--r--main/xen/0003-x86-mm-Prevent-some-races-in-hypervisor-mapping-upda.patch249
-rw-r--r--main/xen/APKBUILD131
-rw-r--r--main/xen/gcc10-arm64-force-inline-atomics.patch42
-rw-r--r--main/xen/musl-hvmloader-fix-stdint.patch71
-rw-r--r--main/xen/xsa333.patch39
-rw-r--r--main/xen/xsa334.patch51
-rw-r--r--main/xen/xsa335-qemu.patch84
-rw-r--r--main/xen/xsa336.patch283
-rw-r--r--main/xen/xsa337-1.patch87
-rw-r--r--main/xen/xsa337-2.patch184
-rw-r--r--main/xen/xsa338.patch42
-rw-r--r--main/xen/xsa339.patch76
-rw-r--r--main/xen/xsa340.patch65
-rw-r--r--main/xen/xsa342.patch152
-rw-r--r--main/xen/xsa343-1.patch199
-rw-r--r--main/xen/xsa343-2.patch295
-rw-r--r--main/xen/xsa343-3.patch392
-rw-r--r--main/xen/xsa344-1.patch137
-rw-r--r--main/xen/xsa344-2.patch210
-rw-r--r--main/xen/xsa346-1.patch50
-rw-r--r--main/xen/xsa346-2.patch204
-rw-r--r--main/xen/xsa347-4.14-1.patch149
-rw-r--r--main/xen/xsa347-4.14-2.patch72
-rw-r--r--main/xen/xsa347-4.14-3.patch59
-rw-r--r--main/xen/xsa351-arm.patch58
-rw-r--r--main/xen/xsa351-x86-4.14-1.patch155
-rw-r--r--main/xen/xsa351-x86-4.14-2.patch126
-rw-r--r--main/xen/xsa355.patch23
-rw-r--r--main/xen/xsa360-4.14.patch97
-rw-r--r--main/xen/xsa364.patch69
-rw-r--r--main/xfsprogs/APKBUILD6
-rw-r--r--main/xinit/06_move_serverauthfile_into_tmp.patch20
-rw-r--r--main/xinit/APKBUILD51
-rw-r--r--main/xinit/Xsession55
-rw-r--r--main/xinit/xinitrc51
-rw-r--r--main/xinit/xserverrc2
-rw-r--r--main/xinit/xsession.skel10
-rw-r--r--main/xinput/APKBUILD33
-rw-r--r--main/xkeyboard-config/APKBUILD25
-rw-r--r--main/xmlrpc-c/APKBUILD4
-rw-r--r--main/xmlto/APKBUILD2
-rw-r--r--main/xmodmap/APKBUILD34
-rw-r--r--main/xrdb/APKBUILD32
-rw-r--r--main/xtables-addons-lts/APKBUILD12
-rw-r--r--main/xtables-addons-lts/ip_route_me_harder-5.4.78.patch48
-rw-r--r--main/xtables-addons/APKBUILD6
-rw-r--r--main/zeromq/APKBUILD6
-rw-r--r--main/zfs-lts/APKBUILD12
-rw-r--r--main/zfs-rpi/APKBUILD10
-rw-r--r--main/zfs/0001-etc-zfs-Makefile.am-set-initconfdir.patch30
-rw-r--r--main/zfs/APKBUILD15
-rw-r--r--main/zip/APKBUILD4
-rw-r--r--main/zstd/APKBUILD20
1020 files changed, 16698 insertions, 24867 deletions
diff --git a/main/abuild/0001-Revert-set-CARGO_HOME-to-SRCDEST-cargo.patch b/main/abuild/0001-Revert-set-CARGO_HOME-to-SRCDEST-cargo.patch
deleted file mode 100644
index d91e8fc6dc..0000000000
--- a/main/abuild/0001-Revert-set-CARGO_HOME-to-SRCDEST-cargo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 10aa67a0cab480c9df2a050e0d102aca0cf18a02 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 27 Nov 2020 15:16:57 +0000
-Subject: [PATCH] Revert "set CARGO_HOME to $SRCDEST/cargo"
-
-the SRCDEST may be shared by multiple builders and apparently cargo does
-not seem to handle that well. There are also no good way to do clean-up
-of the cache for purging things that is no longer in use.
-
-This reverts commit af0c88e6abbb1e49224759f5c51b3068e6eab28b.
----
- abuild.in | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/abuild.in b/abuild.in
-index d600e92..eeb5f62 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -2685,7 +2685,6 @@ aportsgit=${APORTSDIR:-${startdir}}
- repo_template=$aportsgit/$repo/.rootbld-repositories
-
- SRCDEST=${SRCDEST:-$startdir}
--CARGO_HOME=$SRCDEST/cargo
-
- BUILD_ROOT=
-
-@@ -2704,7 +2703,7 @@ if [ -z "$REPODEST" ]; then
- fi
-
- # for recursive action
--export REPODEST SRCDEST CARGO_HOME
-+export REPODEST SRCDEST
-
- # add dbg subpackage if its enabled globally
- if [ -n "$DEFAULT_DBG" ] && ! subpackage_types_has "dbg" && ! options_has "!dbg" && [ "$arch" != "noarch" ]; then
---
-2.29.2
-
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index f43596a0ee..e88996ba2b 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=abuild
-pkgver=3.7.0_rc1
+pkgver=3.7.0
_ver=${pkgver%_git*}
pkgrel=1
pkgdesc="Script to build Alpine Packages"
@@ -27,7 +27,6 @@ subpackages="
options="suid"
pkggroups="abuild"
source="https://git.alpinelinux.org/abuild/snapshot/abuild-$pkgver.tar.xz
- 0001-Revert-set-CARGO_HOME-to-SRCDEST-cargo.patch
"
builddir="$srcdir"/abuild-$pkgver
@@ -71,7 +70,8 @@ gems() {
pypi() {
pkgdesc="Script to generate python3 APKBUILD from PYPI"
- depends="perl perl-libwww perl-json perl-module-build-tiny perl-lwp-protocol-https"
+ depends="perl perl-libwww perl-json perl-module-build-tiny perl-lwp-protocol-https
+ perl-ipc-system-simple"
mkdir -p "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/apkbuild-pypi "$subpkgdir"/usr/bin/
@@ -83,5 +83,4 @@ _rootbld() {
mkdir -p "$subpkgdir"
}
-sha512sums="ff0b7fd5e65b41185c0ec452703ecbcd73d409de75ffa14677ea9ed77919bc70347d53e42c6a3c6b569e260d2fb8bde495b151d9cf42adb097fe6b0764362248 abuild-3.7.0_rc1.tar.xz
-5efb7491ca7097289ab2ebeceaaef0eec79bae1be0e2efc7fbb0b21919c87f3722cf0541285d68cfd1a77d68e3e844837aa830207e06dcd7a7bdcad4a82c2bb2 0001-Revert-set-CARGO_HOME-to-SRCDEST-cargo.patch"
+sha512sums="455371b11626b67ac96df780dd80d074eabdfd942bccc5736cb4f58e8a55f0cf79edba11792e43fa0608803726aaa902a5718dd8d756a8099a76c4720ea0248f abuild-3.7.0.tar.xz"
diff --git a/main/acct/APKBUILD b/main/acct/APKBUILD
index 543c1ab953..10a7350160 100644
--- a/main/acct/APKBUILD
+++ b/main/acct/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=acct
pkgver=6.6.4
diff --git a/main/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD
index b47fc0c217..d9edc3f3d3 100644
--- a/main/acf-alpine-baselayout/APKBUILD
+++ b/main/acf-alpine-baselayout/APKBUILD
@@ -2,18 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-alpine-baselayout
pkgver=0.13.3
-pkgrel=0
-pkgdesc="A web-based system administration interface for alpine-baselayout"
-url="https://git.alpinelinux.org/cgit/acf/acf-alpine-baselayout"
+pkgrel=2
+pkgdesc="Web-based system administration interface for alpine-baselayout"
+url="https://gitlab.alpinelinux.org/acf/acf-alpine-baselayout"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core lua-json4 lua-posix"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
-options="!check"
+source="https://gitlab.alpinelinux.org/acf/acf-alpine-baselayout/-/archive/v$pkgver/acf-alpine-baselayout-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="fb8f398c22cba14ed823eaaeb35c80289667f6568e0d309c7172676069f0596330fc15777ad87622c085196412970ccea2fdc4d10fc67368786c253c5c017ef0 acf-alpine-baselayout-0.13.3.tar.xz"
+sha512sums="8c948736f65a042d653d2bfaa1cfb33ba2b2abf802b35a0b668c7ec49aa594655547c92ed33728dcdc6786597edb35717bb9f57e76f2e12514e4ab8c44e2ff43 acf-alpine-baselayout-v0.13.3.tar.gz"
diff --git a/main/acf-alpine-conf/APKBUILD b/main/acf-alpine-conf/APKBUILD
index ab82012df5..3d3f779800 100644
--- a/main/acf-alpine-conf/APKBUILD
+++ b/main/acf-alpine-conf/APKBUILD
@@ -2,16 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-alpine-conf
pkgver=0.9.0
-pkgrel=4
-pkgdesc="A web-based system administration interface for alpine-conf"
-url="https://git.alpinelinux.org/cgit/acf/acf-alpine-conf"
+pkgrel=6
+pkgdesc="Web-based system administration interface for alpine-conf"
+url="https://gitlab.alpinelinux.org/acf/acf-alpine-conf"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core lua-posix openssl"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-alpine-conf/-/archive/v$pkgver/acf-alpine-conf-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="a018089b1ada43270ff2e10eecc83e0a56289e722de52344a3a0acac2b74914165a23aea4602ad48b1748af4873c36d2f61d5fbaae578f1d3749a82a41d5f03c acf-alpine-conf-0.9.0.tar.xz"
+
+sha512sums="ff0b988e733b53e7f06f3dd4aa95d05b2c2d16019d6c4feaac7c7111b3af61771d88d9d673ec0270ce60aeaa6ae3a0a4d0fdaecce43374d99f8ba8d6885c7fcf acf-alpine-conf-v0.9.0.tar.gz"
diff --git a/main/acf-amavisd-new/APKBUILD b/main/acf-amavisd-new/APKBUILD
index d8daa58b5b..1ca268d966 100644
--- a/main/acf-amavisd-new/APKBUILD
+++ b/main/acf-amavisd-new/APKBUILD
@@ -2,16 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-amavisd-new
pkgver=0.4.0
-pkgrel=3
+pkgrel=5
pkgdesc="ACF module for amavis"
-url="https://git.alpinelinux.org/cgit/acf/acf-amavisd-new"
+url="https://gitlab.alpinelinux.org/acf/acf-amavisd-new"
arch="noarch !x86" # amavis
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core amavis"
-source="https://dev.alpinelinux.org/archive/acf-amavisd-new/acf-amavisd-new-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-amavisd-new/-/archive/v$pkgver/acf-amavisd-new-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="d3012f1622b27ca661a0c3c20b9611b5f793fcfc1e08f0c8edf30c048e89f27bed6e6f2268c4a723b3cdcf808db29b922b15c5ad870d4af0e87d8d0e65968666 acf-amavisd-new-0.4.0.tar.xz"
+sha512sums="0a3f047a1f6074b3b61967c29a6108426e3bbb27f30b5faa341a94b2d0905184af73773737749250ec52aac7c19d399afa5b64f28602cedaa40b31595e61cd14 acf-amavisd-new-v0.4.0.tar.gz"
diff --git a/main/acf-apk-tools/APKBUILD b/main/acf-apk-tools/APKBUILD
index 27c9cd8527..3f545e735d 100644
--- a/main/acf-apk-tools/APKBUILD
+++ b/main/acf-apk-tools/APKBUILD
@@ -2,17 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-apk-tools
pkgver=0.11.0
-pkgrel=1
+pkgrel=3
pkgdesc="ACF module for apk"
-url="https://git.alpinelinux.org/cgit/acf/acf-apk-tools"
+url="https://gitlab.alpinelinux.org/acf/acf-apk-tools"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core lua-posix apk-tools"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-apk-tools/-/archive/v$pkgver/acf-apk-tools-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="f931d3aaa6e1275dd635b925d59a4d8c12cd2d0c6a0f1ed3df80bc477dadb8f305fdacb89be179e34a88342041e250d7cd1f3fd2706d2359d468f9432218f0ac acf-apk-tools-0.11.0.tar.xz"
+sha512sums="aefe0b1bfa1e05e7291ccf4407e18008d6c46af3fea60e4bfbdcd622bfc912bb92933bdfdf6a38e6fa88998c2557840f06d030155dce8e02771ba1867f463dd7 acf-apk-tools-v0.11.0.tar.gz"
diff --git a/main/acf-asterisk/APKBUILD b/main/acf-asterisk/APKBUILD
index 048c4fde50..18a0e57484 100644
--- a/main/acf-asterisk/APKBUILD
+++ b/main/acf-asterisk/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-asterisk
pkgver=0.7.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for asterisk"
-url="https://git.alpinelinux.org/cgit/acf/acf-asterisk"
+pkgrel=4
+pkgdesc="Web-based system administration interface for asterisk"
+url="https://gitlab.alpinelinux.org/acf/acf-asterisk"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core asterisk"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/acf-asterisk/acf-asterisk-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-asterisk/-/archive/v$pkgver/acf-asterisk-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="40542c60ea2fa3b3c96fd310bf710d754c98f7da511180e685d1861482adb0500d1f80fcdc23878383b6d528f969751f2c28b2cdac17eea000b314867bc3f1f2 acf-asterisk-0.7.0.tar.xz"
+sha512sums="a2684979e45d23b2f1293cda413613b73041cd953bb489d5bfdbdc347bcc6417a9319c98d9b9a7e534599885efd510cdd55d4b3cc1d4646ab7d7bdbd626d8ce8 acf-asterisk-v0.7.0.tar.gz"
diff --git a/main/acf-awall/APKBUILD b/main/acf-awall/APKBUILD
index ac823db13e..1c9fcc30a0 100644
--- a/main/acf-awall/APKBUILD
+++ b/main/acf-awall/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-awall
pkgver=0.4.1
-pkgrel=2
+pkgrel=4
pkgdesc="ACF for Alpine Wall"
-url="https://git.alpinelinux.org/cgit/acf/acf-awall"
+url="https://gitlab.alpinelinux.org/acf/acf-awall"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core awall"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-awall/-/archive/v$pkgver/acf-awall-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="00797d1bf9874654856f22a44a431ded3a1d07a7d325b836844d071889f685a746b504b669c6bd1b00672ce77e910de2bd7aa5dc3142095d86665cb4953fa9ff acf-awall-0.4.1.tar.xz"
+sha512sums="caa15c1f39409face10adc5348cd38104fe06bdd7575e0c94794addf98ffc5d68941cd262a1f9f0b2d05e8fbacc63c32507262b3a16df794bd8180cd4e01ba6e acf-awall-v0.4.1.tar.gz"
diff --git a/main/acf-chrony/APKBUILD b/main/acf-chrony/APKBUILD
index d6a40e2f20..ad44a355f7 100644
--- a/main/acf-chrony/APKBUILD
+++ b/main/acf-chrony/APKBUILD
@@ -2,16 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-chrony
pkgver=0.8.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for chrony"
-url="https://git.alpinelinux.org/cgit/acf/acf-chrony"
+pkgrel=4
+pkgdesc="Web-based system administration interface for chrony"
+url="https://gitlab.alpinelinux.org/acf/acf-chrony"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core lua-posix chrony"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-chrony/-/archive/v$pkgver/acf-chrony-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="eb317d9448b6d6eb41371d4805cfcd952dbd200d878016b5a3cabe7a4be5f74799241232edafd9b1a596d3efc583751a797a865e3e7e679d5783b2ec3ca674fc acf-chrony-0.8.0.tar.xz"
+
+sha512sums="7932acb108ef387b12f58c91133981f87c947c3426f80a4a8829eadba6c60a3ecd0fff7965d19db255357704c25b61e80f78037524db38157c7e90019dc7b2d5 acf-chrony-v0.8.0.tar.gz"
diff --git a/main/acf-clamav/APKBUILD b/main/acf-clamav/APKBUILD
index 9c31dc3f21..90d197e36f 100644
--- a/main/acf-clamav/APKBUILD
+++ b/main/acf-clamav/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-clamav
pkgver=0.8.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for clamav"
-url="https://git.alpinelinux.org/cgit/acf/acf-clamav"
+pkgrel=4
+pkgdesc="Web-based system administration interface for clamav"
+url="https://gitlab.alpinelinux.org/acf/acf-clamav"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core clamav"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-clamav/-/archive/v$pkgver/acf-clamav-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="c397de4927ebd0347732d6ffd6246d45481a059cf2878851ee4fe06889fdae8792002f46e06dc6108eedede53108b5b0361a78168d6090237758064ecaad9fc6 acf-clamav-0.8.0.tar.xz"
+sha512sums="52f1df5e53dee8672b2b246cf62975a4cba3660ce89207705159688225ec425396dae2baaddb6c0453eac78f62040050dee8bdb332cf9a728ba09e024b31d494 acf-clamav-v0.8.0.tar.gz"
diff --git a/main/acf-core/APKBUILD b/main/acf-core/APKBUILD
index 617296c981..17ec45bb35 100644
--- a/main/acf-core/APKBUILD
+++ b/main/acf-core/APKBUILD
@@ -3,30 +3,31 @@
_luaversion="5.2"
pkgname=acf-core
pkgver=0.22.0
-pkgrel=0
-pkgdesc="A web-based system administration interface framework"
-url="https://git.alpinelinux.org/cgit/acf/acf-core"
+pkgrel=2
+pkgdesc="Web-based system administration interface framework"
+url="https://gitlab.alpinelinux.org/acf/acf-core"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
install="$pkgname.post-upgrade"
depends="acf-jquery acf-lib acf-skins haserl-lua$_luaversion lua$_luaversion
lua$_luaversion-posix lua$_luaversion-md5 lua-json4
lua$_luaversion-subprocess"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-core/-/archive/v$pkgver/acf-core-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
- sed "s~luadir=.*~luadir=\${prefix}/share/lua/$_luaversion/acf~" -i config.mk \
- || return 1
+ sed "s~luadir=.*~luadir=\${prefix}/share/lua/$_luaversion/acf~" -i config.mk
# fix shebang
sed -i -e "1s:#!/usr/bin/haserl :#!/usr/bin/haserl-lua$_luaversion :" \
- www/cgi-bin/acf || return 1
+ www/cgi-bin/acf
sed -i -e "1s:#!/usr/bin/lua.*:#!/usr/bin/lua$_luaversion:" \
- bin/acf-cli || return 1
+ bin/acf-cli
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
mkdir -p "$pkgdir"/etc/acf/skins
}
-sha512sums="34f92f36cd3ecf71f7ab5c94cd35cb54eec195e04997091ebd131c04820cb4a0b3566c7a085e5282c38c6ad80b6b1558db7252fcf47c096811070e278f27a92e acf-core-0.22.0.tar.xz"
+
+sha512sums="b73d7001bb2f8e60fef6b562f058282250726a8bb3211b6c98eb7e35334eb936700648b241d86e074e079071ccf05d7aaa4690b14b8e05959299688ae850484d acf-core-v0.22.0.tar.gz"
diff --git a/main/acf-dansguardian/APKBUILD b/main/acf-dansguardian/APKBUILD
index 3eb9dfcb46..da433ad603 100644
--- a/main/acf-dansguardian/APKBUILD
+++ b/main/acf-dansguardian/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-dansguardian
pkgver=0.8.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for dansguardian"
-url="https://git.alpinelinux.org/cgit/acf/acf-dansguardian"
+pkgrel=4
+pkgdesc="Web-based system administration interface for dansguardian"
+url="https://gitlab.alpinelinux.org/acf/acf-dansguardian"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core dansguardian"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-dansguardian/-/archive/v$pkgver/acf-dansguardian-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="e6334e165ff224958ec4d9a80a8eb253e6b9e82d5faf7e68da0b12557ebfab41eef359f8679550afeea0e1bf18404bebffba99595a014c4899ad51d5ae0a99ec acf-dansguardian-0.8.0.tar.xz"
+sha512sums="9240622557a64f742a3a284a4e98cf148cdf6f7639c1e6cd7f6395cb06c7665e20881c429a83e6bbdef7a57ac51cbb268fdde73b6641e41826125cc8ebdfe65d acf-dansguardian-v0.8.0.tar.gz"
diff --git a/main/acf-db/APKBUILD b/main/acf-db/APKBUILD
index 08bb71e083..b1774d2953 100644
--- a/main/acf-db/APKBUILD
+++ b/main/acf-db/APKBUILD
@@ -2,31 +2,27 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-db
pkgver=0.2.1
-pkgrel=2
-pkgdesc="A web-based system administration interface for databases"
-url="https://git.alpinelinux.org/cgit/acf/acf-db"
+pkgrel=4
+pkgdesc="Web-based system administration interface for databases"
+url="https://gitlab.alpinelinux.org/acf/acf-db"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core acf-db-lib"
-makedepends=""
-install=
subpackages="$pkgname-lib"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-db/-/archive/v$pkgver/acf-db-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
lib() {
pkgdesc="ACF database support library"
depends="acf-core lua acf-lib"
- mkdir -p "$subpkgdir"/usr/share/acf/lib/ \
- || return 1
+ mkdir -p "$subpkgdir"/usr/share/acf/lib/
mv "$pkgdir"/usr/share/acf/lib/* \
- "$subpkgdir"/usr/share/acf/lib/ || return 1
+ "$subpkgdir"/usr/share/acf/lib/
}
-sha512sums="850a3c5a2b294bd6e0b718357f93a3aaa7668a852b4854f636541c3e40cddce3dc1805a291c5900808cd95fa7ccd718db481431069a98df2a775d0fab1b6f3c4 acf-db-0.2.1.tar.xz"
+sha512sums="ffc504a8de75710599be474f8cd97a97c49dcb852a81e4d6a7677fa93c62e7b2e3094cb89dc4fd747e0ae1e964dbee7be20478cb50a77cae1988189c855f26f3 acf-db-v0.2.1.tar.gz"
diff --git a/main/acf-dhcp/APKBUILD b/main/acf-dhcp/APKBUILD
index cdd472d288..b9b2fa4b15 100644
--- a/main/acf-dhcp/APKBUILD
+++ b/main/acf-dhcp/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-dhcp
pkgver=0.9.1
-pkgrel=0
-pkgdesc="A web-based system administration interface for dhcp"
-url="https://git.alpinelinux.org/cgit/acf/acf-dhcp"
+pkgrel=2
+pkgdesc="Web-based system administration interface for dhcp"
+url="https://gitlab.alpinelinux.org/acf/acf-dhcp"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core dhcp"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-dhcp/-/archive/v$pkgver/acf-dhcp-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="f428416072fbae3cd88f5d135a7a0d2bc4cf68fd242b4d004f2547bbec2a530f7d4c3b112fc462994bd836889a0a44ab441d37a2ed4112b7f5f095a3f2b3ff24 acf-dhcp-0.9.1.tar.xz"
+sha512sums="04745b82038622496bba6db6b8f43b866980ce751a2d19d07d59972dc0f05a5418b4a449b56bf2fecd16e951de6df6050dd42c975a630f6fe514c0d4d40fd251 acf-dhcp-v0.9.1.tar.gz"
diff --git a/main/acf-dnscache/APKBUILD b/main/acf-dnscache/APKBUILD
index 7a3cdecd5d..f1a4a6ea53 100644
--- a/main/acf-dnscache/APKBUILD
+++ b/main/acf-dnscache/APKBUILD
@@ -2,16 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-dnscache
pkgver=0.6.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for dnscache"
-url="https://git.alpinelinux.org/cgit/acf/acf-dnscache"
+pkgrel=4
+pkgdesc="Web-based system administration interface for dnscache"
+url="https://gitlab.alpinelinux.org/acf/acf-dnscache"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core lua-posix dnscache"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-dnscache/-/archive/v$pkgver/acf-dnscache-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="64b6b43bd503fa410df8e6c471afbf5ad4091da6d84db462f1f933299ee65b22f45165f175d9a4cc96ca6b8efd5853b77c440b6fb5203bc14a75ba80182451ed acf-dnscache-0.6.0.tar.xz"
+
+sha512sums="19831114c029fc9e0f9b0055d55f344c02e39ba9fd9a1fbfdcb79f1ab05ab20872514badb76a3bbaba76d3ed1b5bff52725e3fd2dd92323a1d2c73b20dbfc374 acf-dnscache-v0.6.0.tar.gz"
diff --git a/main/acf-dnsmasq/APKBUILD b/main/acf-dnsmasq/APKBUILD
index f5783b01c1..6a9f8028d0 100644
--- a/main/acf-dnsmasq/APKBUILD
+++ b/main/acf-dnsmasq/APKBUILD
@@ -2,16 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-dnsmasq
pkgver=0.7.1
-pkgrel=0
-pkgdesc="A web-based system administration interface for dnsmasq"
-url="https://git.alpinelinux.org/cgit/acf/acf-dnsmasq"
+pkgrel=2
+pkgdesc="Web-based system administration interface for dnsmasq"
+url="https://gitlab.alpinelinux.org/acf/acf-dnsmasq"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core dnsmasq"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-dnsmasq/-/archive/v$pkgver/acf-dnsmasq-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="78703842c53c5d8bab7e304e2b81e0bdb175165b652bdb53a45ca5aa610c5f6ceffbf627bd940d6b8e5dc71cc2a8a6268672513ef235a74f35d0d91edb8080f2 acf-dnsmasq-0.7.1.tar.xz"
+
+sha512sums="77b8d88eef4031a21ee4ee71df79b7b517ed0ef4a46a5541b90d8883f130f4c584b18d452400f275f4aebdd8910fa03e15adfd9259b3f3453fefb7789f964368 acf-dnsmasq-v0.7.1.tar.gz"
diff --git a/main/acf-dovecot/APKBUILD b/main/acf-dovecot/APKBUILD
index 8080bc3e88..b627457a63 100644
--- a/main/acf-dovecot/APKBUILD
+++ b/main/acf-dovecot/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-dovecot
pkgver=0.6.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for dovecot"
-url="https://git.alpinelinux.org/cgit/acf/acf-dovecot"
+pkgrel=4
+pkgdesc="Web-based system administration interface for dovecot"
+url="https://gitlab.alpinelinux.org/acf/acf-dovecot"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core dovecot"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-dovecot/-/archive/v$pkgver/acf-dovecot-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="7838987e88505d1c8f929088e4e05e6f5161a01d55fe9892b0e10f4e9b850981423e2fff93053d21b18d3e4384bbdbe7912b7a155af0eae4afc4c61517a7abd8 acf-dovecot-0.6.0.tar.xz"
+sha512sums="f8c1b0973fe3cf0936900e99522f4e69aff122628d6553fa10f3a3866401c25c9c5476bd4f0c8781a41a7f049ed1b7342f5d8cf540fdf7caa44199863a457d15 acf-dovecot-v0.6.0.tar.gz"
diff --git a/main/acf-fetchmail/APKBUILD b/main/acf-fetchmail/APKBUILD
deleted file mode 100644
index 393211f6c7..0000000000
--- a/main/acf-fetchmail/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Contributor: Ted Trask <ttrask01@yahoo.com>
-# Maintainer: Ted Trask <ttrask01@yahoo.com>
-pkgname=acf-fetchmail
-pkgver=0.9.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for fetchmail"
-url="https://git.alpinelinux.org/cgit/acf/acf-fetchmail"
-arch="noarch"
-license="GPL-2.0"
-depends="acf-core fetchmail"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
-}
-
-sha512sums="7cf3fdb81305fcd29333051d5e199d31f7b0527bacf69ddb20dd301bedb3ac19b4b12374e24136a1c37626a2081d222e75f880c7c9fb8d0aa26e33191476a9ad acf-fetchmail-0.9.0.tar.xz"
diff --git a/main/acf-freeradius3/APKBUILD b/main/acf-freeradius3/APKBUILD
index fe2a340d89..88e776e851 100644
--- a/main/acf-freeradius3/APKBUILD
+++ b/main/acf-freeradius3/APKBUILD
@@ -2,20 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-freeradius3
pkgver=0.3.1
-pkgrel=0
+pkgrel=2
pkgdesc="ACF for freeradius 3"
-url="https://git.alpinelinux.org/cgit/acf/acf-freeradius3"
+url="https://gitlab.alpinelinux.org/acf/acf-freeradius3"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core freeradius>3"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-freeradius3/-/archive/v$pkgver/acf-freeradius3-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="79a60ad1114c8e050431824b042b5799d39c96cfc2c101d0ec2c15569c5d4354565e0596bb7ef6471860d063df3f72e201e283b04ab9a50ffbf3e6bf7d31a9ee acf-freeradius3-0.3.1.tar.xz"
+sha512sums="45bb5a7fe2e827a27a342afe69ae19ee803130dfdcd9b380488a48abfb932378a759defd1eb8592ab0563b6a3431ec962204394b4adb11465a610659be09a635 acf-freeradius3-v0.3.1.tar.gz"
diff --git a/main/acf-freeswitch-vmail/APKBUILD b/main/acf-freeswitch-vmail/APKBUILD
index a719e3303f..39a959a56b 100644
--- a/main/acf-freeswitch-vmail/APKBUILD
+++ b/main/acf-freeswitch-vmail/APKBUILD
@@ -2,20 +2,19 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-freeswitch-vmail
pkgver=0.6.2
-pkgrel=1
+pkgrel=4
pkgdesc="ACF for a web interface for freeswitch voicemail"
-url="http://git.alpinelinux.org/cgit/acf/$pkgname"
+url="https://gitlab.alpinelinux.org/acf/acf-freeswitch-vmail"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core lua-sql-sqlite3 lua-socket freeswitch"
-makedepends=""
install="$pkgname.post-upgrade"
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-freeswitch-vmail/-/archive/v$pkgver/acf-freeswitch-vmail-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
-sha512sums="9f5984dc8339162274d3b3efb4946e88bee715674b315ed4026de7e4bb0fc334641de09aad5244dc093fc2c2225a62bd424f09a78f0ae5994c80ca5ce3c3b79a acf-freeswitch-vmail-0.6.2.tar.xz"
+sha512sums="1b84e1dbae0f1cc64a878c37eb258fc2bb198bd02ce7d797bf922a1af3973032e3286b008008fa898914f92c1a741afb9b274a3770e493faa2a71c6d64bb3e9a acf-freeswitch-vmail-v0.6.2.tar.gz"
diff --git a/main/acf-freeswitch/APKBUILD b/main/acf-freeswitch/APKBUILD
index 72c74f5e57..84c23d1625 100644
--- a/main/acf-freeswitch/APKBUILD
+++ b/main/acf-freeswitch/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-freeswitch
pkgver=0.8.0
-pkgrel=3
+pkgrel=4
pkgdesc="ACF for freeswitch"
-url="https://git.alpinelinux.org/cgit/acf/acf-freeswitch"
+url="https://gitlab.alpinelinux.org/acf/acf-freeswitch"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core freeswitch lua-luaxml"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-freeswitch/-/archive/v$pkgver/acf-freeswitch-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="c5df1ce9acdd98c160bbeff08be9891a1eefe4ed02fb4b2c720d2cf81444d34eea4f75dd8ff133e1e0837db708398e275b546a29d6669a5c874ec864d9f8f128 acf-freeswitch-0.8.0.tar.xz"
+sha512sums="3a82cc4a4a6a0ae5be01f9a053c5885e2475df3d556049a4e3bdebaf2e60d370fce718f52492bf069b480b71b780cbc7efc66996a06646cd874196fbb2a9a5cc acf-freeswitch-v0.8.0.tar.gz"
diff --git a/main/acf-gross/APKBUILD b/main/acf-gross/APKBUILD
index 4ab68a4758..d3238d526f 100644
--- a/main/acf-gross/APKBUILD
+++ b/main/acf-gross/APKBUILD
@@ -2,16 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-gross
pkgver=0.6.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for gross"
-url="https://git.alpinelinux.org/cgit/acf/acf-gross"
+pkgrel=4
+pkgdesc="Web-based system administration interface for gross"
+url="https://gitlab.alpinelinux.org/acf/acf-gross"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core gross"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-gross/-/archive/v$pkgver/acf-gross-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="2bbda9e68e20c154210f21125d8c8f061980a6542e3c5831d432a0a968067d1a285333dd15bc22f9414a72fa2ad48f7338a91ec9a3fd01f329c08b806934350c acf-gross-0.6.0.tar.xz"
+
+sha512sums="d8bf1dfe4be7e475991ca88fcf3d2602e3db8856d3b58ba1da30b4aa073d5ab0e2971fab784a8ba0ec101aad1602c11ba92d3f0e4c56a0e6772f5ddb62052353 acf-gross-v0.6.0.tar.gz"
diff --git a/main/acf-heimdal/APKBUILD b/main/acf-heimdal/APKBUILD
index 3c032a12d6..8fcd3b443a 100644
--- a/main/acf-heimdal/APKBUILD
+++ b/main/acf-heimdal/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-heimdal
pkgver=0.6.0
-pkgrel=2
+pkgrel=5
pkgdesc="ACF module for heimdal"
-url="http://git.alpinelinux.org/cgit/acf/$pkgname"
+url="https://gitlab.alpinelinux.org/acf/acf-heimdal"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core heimdal"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-heimdal/-/archive/v$pkgver/acf-heimdal-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
+ make DESTDIR="$pkgdir" install
}
-sha512sums="8843c2f5b580f400c398826566bf4a5b3e8bd4d53f01ee8cf3c41972fc89d9bcf80fdc7e787c48fac25cbec2bc671821f63c5ab6453f9243d13b9674fd168af3 acf-heimdal-0.6.0.tar.xz"
+sha512sums="eaa7d03a6a32940d5aa46ea2e4d086f8110bae592e4ab5cd729ac646d9fb8e114d30a1914e277a03a550d324c35aaa6c3e9e8f11ee5d97aaa4f6bec7077d186b acf-heimdal-v0.6.0.tar.gz"
diff --git a/main/acf-iproute2-qos/APKBUILD b/main/acf-iproute2-qos/APKBUILD
index 5afac4577c..c98ad20def 100644
--- a/main/acf-iproute2-qos/APKBUILD
+++ b/main/acf-iproute2-qos/APKBUILD
@@ -2,17 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-iproute2-qos
pkgver=0.4.0
-pkgrel=2
+pkgrel=5
pkgdesc="ACF module for iproute2-qos"
-url="http://git.alpinelinux.org/cgit/acf/$pkgname"
+url="https://gitlab.alpinelinux.org/acf/acf-iproute2-qos"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core iproute2-qos acf-alpine-baselayout>=0.5.7"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-iproute2-qos/-/archive/v$pkgver/acf-iproute2-qos-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="ff06d5e8e3f7f5bbcbdf5dbe9aa4fc82b15ea0b1626e36a5659064dcc01f5ea1d055f0ae99ce105398091057ed073f93c3fc7c8ecac469c6ccdd1dd10ad00596 acf-iproute2-qos-0.4.0.tar.xz"
+sha512sums="855c88819c5df0dbe3fba50c85ec26260ff0d0e5fac301affcd0b18e30e8ce31d1f56fdc39dfb65f683446b0e37c6cd014c601dc71a668f0cd78bb67558115a5 acf-iproute2-qos-v0.4.0.tar.gz"
diff --git a/main/acf-iptables/APKBUILD b/main/acf-iptables/APKBUILD
index 6e25e02608..a6e62be309 100644
--- a/main/acf-iptables/APKBUILD
+++ b/main/acf-iptables/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-iptables
pkgver=0.7.1
-pkgrel=2
-pkgdesc="A web-based system administration interface for iptables"
-url="https://git.alpinelinux.org/cgit/acf/acf-iptables"
+pkgrel=4
+pkgdesc="Web-based system administration interface for iptables"
+url="https://gitlab.alpinelinux.org/acf/acf-iptables"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core iptables"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-iptables/-/archive/v$pkgver/acf-iptables-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="1def7240cbbceb06e810ac00463b8b7693e6fe7c7f70be91c0ee8b4fe3a25869bf583425f6b9f16057d41909f819b1875ed48cc9f3837a265e42986eb303f303 acf-iptables-0.7.1.tar.xz"
+sha512sums="98bb361d13b4aa1b6c6328b39b75158770b1b93ecc2ac3933852b5daa33dccb743bf2d8196ec57deeb4dd7bc60dab7dff9d526820c3c0328cdd77ded1475d8d6 acf-iptables-v0.7.1.tar.gz"
diff --git a/main/acf-jquery/APKBUILD b/main/acf-jquery/APKBUILD
index be4e3e9231..23f89e8969 100644
--- a/main/acf-jquery/APKBUILD
+++ b/main/acf-jquery/APKBUILD
@@ -2,17 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-jquery
pkgver=0.4.3
-pkgrel=0
+pkgrel=2
pkgdesc="jquery libraries for ACF"
-url="https://git.alpinelinux.org/cgit/acf/acf-jquery"
+url="https://gitlab.alpinelinux.org/acf/acf-jquery"
arch="noarch"
-license="GPL-2.0"
-depends=""
+license="GPL-2.0-only"
+options="!check" # no test suite
replaces="acf-core"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-jquery/-/archive/v$pkgver/acf-jquery-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="adec4facdd31cab95454095080091d32306511d1535b12c9a00788ba0d08a52abdfec1cedf1c7b024c8bafff0cbcdc01b12f23212e638162ead4363fef3e8c83 acf-jquery-0.4.3.tar.xz"
+
+sha512sums="adbc94f2b0d928bf8c4f059c107decd9039481aceb940d71cf9af1038b6be7dd1644d34c2fe4a2fbc371d3ac33a1dc678f0751a72c1ba8793483d239dd152807 acf-jquery-v0.4.3.tar.gz"
diff --git a/main/acf-kamailio/APKBUILD b/main/acf-kamailio/APKBUILD
index 53c9b32fc8..e247386b9d 100644
--- a/main/acf-kamailio/APKBUILD
+++ b/main/acf-kamailio/APKBUILD
@@ -2,22 +2,19 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-kamailio
pkgver=0.10.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for kamailio"
-url="https://git.alpinelinux.org/cgit/acf/acf-kamailio"
+pkgrel=4
+pkgdesc="Web-based system administration interface for kamailio"
+url="https://gitlab.alpinelinux.org/acf/acf-kamailio"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core kamailio acf-db-lib"
makedepends="acf-db-lib"
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-kamailio/-/archive/v$pkgver/acf-kamailio-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="6f513c96b5a92ed3e538ebe4e8d13ef88685a0dd0354e8aa5ac8d737580ac7155fd6aab1bae485909d77c256b63c2acf27d023a67d283594ea9001f65f5a8424 acf-kamailio-0.10.0.tar.xz"
+sha512sums="70743f31896850e3d5ef923bbf363044aa637814a31d57178cac8f61840f03ea2d4dde0e7dba6123bb9d24ca52153e26849d4329784acbdcfc510cdf62c14fbf acf-kamailio-v0.10.0.tar.gz"
diff --git a/main/acf-lib/APKBUILD b/main/acf-lib/APKBUILD
index 0a63103162..9f4a821e2d 100644
--- a/main/acf-lib/APKBUILD
+++ b/main/acf-lib/APKBUILD
@@ -3,22 +3,23 @@
_luaversions="5.1 5.2"
pkgname=acf-lib
pkgver=0.11.0
-pkgrel=0
+pkgrel=2
pkgdesc="Lua libraries for ACF"
-url="https://git.alpinelinux.org/cgit/acf/acf-lib"
+url="https://gitlab.alpinelinux.org/acf/acf-lib"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="lua-subprocess"
-subpackages=""
for _i in $_luaversions; do
subpackages="$subpackages acf-lib-lua$_i:split_${_i/./_}"
done
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-lib/-/archive/v$pkgver/acf-lib-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
mkdir -p "$pkgdir"
echo "package with pkgdir=$pkgdir"
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$builddir"
for _i in $_luaversions; do
sed "s~luadir=.*~luadir=\${prefix}/share/lua/$_i/acf~" -i config.mk
make DESTDIR="$pkgdir-lua$_i" install
@@ -26,15 +27,15 @@ package() {
}
_split() {
- local d= _ver=$1
+ local _ver=$1
pkgdesc="Lua $_ver libraries for ACF"
install_if="lua$_ver $pkgname=$pkgver-r$pkgrel"
replaces="$pkgname"
- depends=
+ depends=""
}
for _i in $_luaversions; do
eval "split_${_i/./_}() { _split $_i; }"
done
-sha512sums="0818e1b0e7f2076982bd402d9916b059d7b18e479d5b09b01d2c755ce44701bbf549a38dc139834c83230b6cd6bc9da9d12fc87314196405a67ecac52cb45705 acf-lib-0.11.0.tar.xz"
+sha512sums="6b807e4efadd82345fae273ac459ad0c719eb646dd9b2ba4f60739e849b27c60c62831eacc8be3b672e9e41af89967f0772f6e6e0b5dc3aaa06f4b8073e063df acf-lib-v0.11.0.tar.gz"
diff --git a/main/acf-lighttpd/APKBUILD b/main/acf-lighttpd/APKBUILD
index f3d7d0edbd..10b664ac88 100644
--- a/main/acf-lighttpd/APKBUILD
+++ b/main/acf-lighttpd/APKBUILD
@@ -2,16 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-lighttpd
pkgver=0.6.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for lighttpd"
-url="https://git.alpinelinux.org/cgit/acf/acf-lighttpd"
+pkgrel=4
+pkgdesc="Web-based system administration interface for lighttpd"
+url="https://gitlab.alpinelinux.org/acf/acf-lighttpd"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core lighttpd"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-lighttpd/-/archive/v$pkgver/acf-lighttpd-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="6916c981f371ccd230cd1b77d274a79933ea24b8bf2b9e6f1c56811bb8d22317fc2778c0380136f6df448dc3113bc8d44d680421ecf722a9f63da748dbecb6cb acf-lighttpd-0.6.0.tar.xz"
+
+sha512sums="4e01fb7b4b27f3cb5b3540b1fc3075ef7757456349125b7942ef3c290664ebac94fa06d67ac132a78656a2e21fb3f24a452c6375c37f87e48c5b7c15db016c13 acf-lighttpd-v0.6.0.tar.gz"
diff --git a/main/acf-lvm2/APKBUILD b/main/acf-lvm2/APKBUILD
index 571faa49bb..2a6cebd26c 100644
--- a/main/acf-lvm2/APKBUILD
+++ b/main/acf-lvm2/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-lvm2
pkgver=0.7.0
-pkgrel=2
+pkgrel=5
pkgdesc="ACF module for lvm2"
-url="http://git.alpinelinux.org/cgit/acf/$pkgname"
+url="https://gitlab.alpinelinux.org/acf/acf-lvm2"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core lvm2"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-lvm2/-/archive/v$pkgver/acf-lvm2-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="0f5a5bf3c7dd814de690470d95e2d3644bfa4b0c6aa63fc9f3c768daf6eb9b853bc1bde7024ac5de23ebb8894c8f557a5e252d06db776d6d1d9bc6a5f7af06ee acf-lvm2-0.7.0.tar.xz"
+sha512sums="e731e5350fa267284b4d8ffb610f340020490a3a7f53ea228070448021fe063ab733761417ea5b721a3198147c709c3e8a488c559a33ac036d0cb39ecf0144c0 acf-lvm2-v0.7.0.tar.gz"
diff --git a/main/acf-mariadb/APKBUILD b/main/acf-mariadb/APKBUILD
index 5092aa56f3..b1aaef9b46 100644
--- a/main/acf-mariadb/APKBUILD
+++ b/main/acf-mariadb/APKBUILD
@@ -2,23 +2,20 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-mariadb
pkgver=0.2.0
-pkgrel=2
+pkgrel=5
pkgdesc="ACF module for mariadb"
-url="http://git.alpinelinux.org/cgit/acf/$pkgname"
+url="https://gitlab.alpinelinux.org/acf/acf-mariadb"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core mariadb mariadb-client lua-sql-mysql acf-db-lib"
makedepends="acf-db-lib"
-install=
-subpackages=""
replaces="acf-mysql"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-mariadb/-/archive/v$pkgver/acf-mariadb-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="7974ed3c59e1fc4d22dee3e4becda359b67c97bec30d254c7c0ce2569883667626326f9fd6b2c6ef7dd57fe013635b3fb7c239f0f873d86e6b244582da835995 acf-mariadb-0.2.0.tar.xz"
+sha512sums="e0ecc6c16957ee933dd3ced67cb6936418f5de82c9c1b983425fe55cc01a395fe28dbb2d0f8757a09098d03fe13eae7af2ea01db2fdab36e35ac142c9d6310f3 acf-mariadb-v0.2.0.tar.gz"
diff --git a/main/acf-mdadm/APKBUILD b/main/acf-mdadm/APKBUILD
index b080d2d197..35777ca15e 100644
--- a/main/acf-mdadm/APKBUILD
+++ b/main/acf-mdadm/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-mdadm
pkgver=0.5.0
-pkgrel=2
+pkgrel=5
pkgdesc="ACF module for mdadm"
-url="http://git.alpinelinux.org/cgit/acf/$pkgname"
+url="https://gitlab.alpinelinux.org/acf/acf-mdadm"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core mdadm"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-mdadm/-/archive/v$pkgver/acf-mdadm-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="7d21620a3bdc1f512f43685e89e6fd968920217764d22ceb98b15d33db653b5160a8f4f661ca58156896ba26e640ef7acf5db6bacfbd810160258433f8e3ba8e acf-mdadm-0.5.0.tar.xz"
+sha512sums="f2446688c5d4d1a4a65fcf17b9559cb50a4bbe7c38ddad7d2cf67e24c7307806f98c10de67f3294af86bb8ee06856bb5339f746b48758d4bbed5fa157efccdb4 acf-mdadm-v0.5.0.tar.gz"
diff --git a/main/acf-nsd/APKBUILD b/main/acf-nsd/APKBUILD
index 5e9f0ae15c..103edf8cd1 100644
--- a/main/acf-nsd/APKBUILD
+++ b/main/acf-nsd/APKBUILD
@@ -2,16 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-nsd
pkgver=0.0.1
-pkgrel=0
-pkgdesc="A web-based system administration interface for nsd"
-url="https://git.alpinelinux.org/cgit/acf/acf-nsd"
+pkgrel=2
+pkgdesc="Web-based system administration interface for nsd"
+url="https://gitlab.alpinelinux.org/acf/acf-nsd"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core nsd"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-nsd/-/archive/v$pkgver/acf-nsd-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="a6df9f4eb856877a4866ceeb9f9f439b1b8dc8f048c6149f12753344bc07294068a867f1e6d9a8d8336c1929257595d19b2822fb8f4816fa1e7914dcbe380071 acf-nsd-0.0.1.tar.xz"
+
+sha512sums="b476ba247175d74a7ae20a859c6793faab0930dbfb58385e3b96bddc81c2191c2d679e0116af84c7b2074a3c9e714fe54ac51ddf725817889397b426f70b2937 acf-nsd-v0.0.1.tar.gz"
diff --git a/main/acf-openldap/APKBUILD b/main/acf-openldap/APKBUILD
index d7748daee5..d74dffb54e 100644
--- a/main/acf-openldap/APKBUILD
+++ b/main/acf-openldap/APKBUILD
@@ -2,20 +2,18 @@
# Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
pkgname=acf-openldap
pkgver=1.0.1
-pkgrel=4
+pkgrel=7
pkgdesc="ACF module for OpenLDAP"
-url="http://git.alpinelinux.org/cgit/user/alacerda/$pkgname/"
+url="https://gitlab.alpinelinux.org/acf/acf-openldap"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core openldap openldap-back-bdb"
-depends_dev=""
-makedepends="$depends_dev"
-install=""
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-openldap/-/archive/v$pkgver/acf-openldap-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
-sha512sums="974974496904a8ca9c540bb4b6d72dbce9ea0f33806bd0334191bbc8f716b2ec9fdbe28600aa59b576c3ac6c179ba6470051ad4e5d68bde383a6ad506022729e acf-openldap-1.0.1.tar.xz"
+
+sha512sums="b0d5b4a96244f1c30d779d7c6d821b695b4f4f421683fb9a3c696e273b7e97c17499e53255bc330f7fd5a3161623012f7a01550565952b18cb42638dd7200557 acf-openldap-v1.0.1.tar.gz"
diff --git a/main/acf-opennhrp/APKBUILD b/main/acf-opennhrp/APKBUILD
index b6411431bf..9364db6db9 100644
--- a/main/acf-opennhrp/APKBUILD
+++ b/main/acf-opennhrp/APKBUILD
@@ -2,16 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-opennhrp
pkgver=0.10.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for opennhrp"
-url="https://git.alpinelinux.org/cgit/acf/acf-opennhrp"
+pkgrel=4
+pkgdesc="Web-based system administration interface for opennhrp"
+url="https://gitlab.alpinelinux.org/acf/acf-opennhrp"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core lua-posix opennhrp"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-opennhrp/-/archive/v$pkgver/acf-opennhrp-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="5dbd1392da95e1cf16b56ca46d03f74a8724a2dfb839fb7289948b65ab98c186f23035128c5e99174496fb6c0d65b35abccdc64b669bd641944a04d0808c9c16 acf-opennhrp-0.10.0.tar.xz"
+
+sha512sums="ab49adba9a34016aa1a662a7638d9157c0edfd3797d7fe6f7f85dcc17a1b34dbc631893c083f7f3a035b87f4293abce2c1ec81f02348e3c243b3fc53f5a02b8f acf-opennhrp-v0.10.0.tar.gz"
diff --git a/main/acf-openntpd/APKBUILD b/main/acf-openntpd/APKBUILD
index 8758cc5286..37fc39d77e 100644
--- a/main/acf-openntpd/APKBUILD
+++ b/main/acf-openntpd/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-openntpd
pkgver=0.9.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for openntpd"
-url="https://git.alpinelinux.org/cgit/acf/acf-openntpd"
+pkgrel=4
+pkgdesc="Web-based system administration interface for openntpd"
+url="https://gitlab.alpinelinux.org/acf/acf-openntpd"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core openntpd"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-openntpd/-/archive/v$pkgver/acf-openntpd-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="e30067fbd52e24d6cad462f916ef8798118346e8149e704bfd89a0e70e6170dba742af5fb5105ef2a48feaeaa4f8acb50a28fbdd0388b7574da63313bba39883 acf-openntpd-0.9.0.tar.xz"
+sha512sums="6a49256b9f75f109783e5cb21ede411cee50208f7a72c9eed2a0980e31b78a993ffb7fcf9c3b950db04360768dd3cc3be487de8eff4db3f5509b6830e35a2cd5 acf-openntpd-v0.9.0.tar.gz"
diff --git a/main/acf-openssh/APKBUILD b/main/acf-openssh/APKBUILD
index 93c73992b8..383a15c703 100644
--- a/main/acf-openssh/APKBUILD
+++ b/main/acf-openssh/APKBUILD
@@ -2,16 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-openssh
pkgver=0.11.2
-pkgrel=0
-pkgdesc="A web-based system administration interface for openssh"
-url="https://git.alpinelinux.org/cgit/acf/acf-openssh"
+pkgrel=2
+pkgdesc="Web-based system administration interface for openssh"
+url="https://gitlab.alpinelinux.org/acf/acf-openssh"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core openssh"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-openssh/-/archive/v$pkgver/acf-openssh-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="e89ba4980ac84f995df4e07915d6f263a8b74b2da9cc001ede00a3cf356311a207b08601d683e96d59b4cd61b858e5126aa79d61509535c2c24cc894e383d3f2 acf-openssh-0.11.2.tar.xz"
+
+sha512sums="784fb2316be06949e0e81a6cf8ba63ddc0db9a7eafd6413fa3bdee540f0908648bb0127cc91b6dc418d6d262473198af100dc441d177050001700e9d4e8c39c2 acf-openssh-v0.11.2.tar.gz"
diff --git a/main/acf-openssl/APKBUILD b/main/acf-openssl/APKBUILD
index a7a84470e1..f74b4acf7e 100644
--- a/main/acf-openssl/APKBUILD
+++ b/main/acf-openssl/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-openssl
pkgver=0.10.1
-pkgrel=4
-pkgdesc="A web-based system administration interface for open/librelssl"
-url="https://git.alpinelinux.org/cgit/acf/acf-openssl"
+pkgrel=6
+pkgdesc="Web-based system administration interface for open/librelssl"
+url="https://gitlab.alpinelinux.org/acf/acf-openssl"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core openssl"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-openssl/-/archive/v$pkgver/acf-openssl-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="bf885b78caa7757df2f2560155bc04c960c0f421f751a972ecf5ed40c8179a8ce0e94363d259e05a5cadc33df1389db96e2985149b4b760b378d371385946fb2 acf-openssl-0.10.1.tar.xz"
+sha512sums="639b9d0f3038b23df662e15b10890a9e8a9ac8c88930bfae36dec0ff8eee6fe5db4b2c000f6898c982e5107ea0c18f03d14697d4b0ca6f60005033f72e8deea4 acf-openssl-v0.10.1.tar.gz"
diff --git a/main/acf-openvpn/APKBUILD b/main/acf-openvpn/APKBUILD
index 1da008e5e6..68d0545c75 100644
--- a/main/acf-openvpn/APKBUILD
+++ b/main/acf-openvpn/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-openvpn
pkgver=0.11.1
-pkgrel=2
-pkgdesc="A web-based system administration interface for openvpn"
-url="https://git.alpinelinux.org/cgit/acf/acf-openvpn"
+pkgrel=4
+pkgdesc="Web-based system administration interface for openvpn"
+url="https://gitlab.alpinelinux.org/acf/acf-openvpn"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core openvpn"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-openvpn/-/archive/v$pkgver/acf-openvpn-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="4109e6ec2e4c46f273983a07e3fac810652b5b83a694526fbdb71a7d75171779dc7960642dc0c81f80ca02c43b6d6cf81f5c3a042681ad00270e5cfe1db3d4af acf-openvpn-0.11.1.tar.xz"
+sha512sums="8cf5ad95db3f3803c192b26e0ca3bdd02e36785175f1fc4c559975fe9da91803af5c3741821020a8677a2dfaad582861193fcb5bcb5e1beb5b34da4aeac17c2b acf-openvpn-v0.11.1.tar.gz"
diff --git a/main/acf-pingu/APKBUILD b/main/acf-pingu/APKBUILD
index bbb81271cf..3d896d0b59 100644
--- a/main/acf-pingu/APKBUILD
+++ b/main/acf-pingu/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-pingu
pkgver=0.4.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for pingu"
-url="https://git.alpinelinux.org/cgit/acf/acf-pingu"
+pkgrel=4
+pkgdesc="Web-based system administration interface for pingu"
+url="https://gitlab.alpinelinux.org/acf/acf-pingu"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core pingu"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-pingu/-/archive/v$pkgver/acf-pingu-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="33ffd2838b4ffe30c9cc314b922fe13d351256e8354b387abeb163abf8fa3c86986fabfde1df96e13f5346fb78bbe209053f0e6e6d780e9add5dbd0844192973 acf-pingu-0.4.0.tar.xz"
+sha512sums="79ef0fdc46ba07a47e1818c6594ddb9f91af4a08ecb4d69276f9e6570492db7a16f2073be8d836ce45177e73978bdf7fa46f88641b71965dbd3b2aad0d4aac4c acf-pingu-v0.4.0.tar.gz"
diff --git a/main/acf-postfix/APKBUILD b/main/acf-postfix/APKBUILD
index b399a325f9..c9f83b0c71 100644
--- a/main/acf-postfix/APKBUILD
+++ b/main/acf-postfix/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-postfix
pkgver=0.10.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for postfix"
-url="https://git.alpinelinux.org/cgit/acf/acf-postfix"
+pkgrel=4
+pkgdesc="Web-based system administration interface for postfix"
+url="https://gitlab.alpinelinux.org/acf/acf-postfix"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core postfix"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-postfix/-/archive/v$pkgver/acf-postfix-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="022c9df2c8af416cf4df2ff96c17dd16a43147660e40a36558f0dfe64dcf310ceb8f73855797e3304e7ba736829663f83180962c5af9538b7e90219a0e65fe64 acf-postfix-0.10.0.tar.xz"
+sha512sums="ca25a3275a8acabd750109164fab14955df9b6808bb42c34c5e60d7a4def7b10432329cbc05a7b89d75668112f83ea0780cf1a5c568aa63ca892816d90bdac28 acf-postfix-v0.10.0.tar.gz"
diff --git a/main/acf-postgresql/APKBUILD b/main/acf-postgresql/APKBUILD
index 26e1438117..3a2dd3bb73 100644
--- a/main/acf-postgresql/APKBUILD
+++ b/main/acf-postgresql/APKBUILD
@@ -2,22 +2,19 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-postgresql
pkgver=0.11.0
-pkgrel=2
+pkgrel=4
pkgdesc="ACF module for postgresql"
-url="http://git.alpinelinux.org/cgit/acf/$pkgname"
+url="https://gitlab.alpinelinux.org/acf/acf-postgresql"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core postgresql acf-db-lib lua-sql-postgres"
makedepends="acf-db-lib"
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-postgresql/-/archive/v$pkgver/acf-postgresql-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="50ecb0d5bee5ae674188f4c70f9bf30084c7e6b506819a89baf660e3af102e51b67d54dbe15a92e8b52162ddc666a2e2e8f09dbbb6f07734eb86073a2b6243fe acf-postgresql-0.11.0.tar.xz"
+sha512sums="7ee9b9ade8cfcf297e74ffd8c8887092db0513d19c5d687940e35b326ae4f101b2b067d5fb8ebba91ad9c84c38f3a33cfef9614924666cbac5e1e6f7b5578dd2 acf-postgresql-v0.11.0.tar.gz"
diff --git a/main/acf-ppp/APKBUILD b/main/acf-ppp/APKBUILD
index 916812b961..694b26f8de 100644
--- a/main/acf-ppp/APKBUILD
+++ b/main/acf-ppp/APKBUILD
@@ -2,16 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-ppp
pkgver=0.5.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for ppp"
-url="https://git.alpinelinux.org/cgit/acf/acf-ppp"
+pkgrel=4
+pkgdesc="Web-based system administration interface for ppp"
+url="https://gitlab.alpinelinux.org/acf/acf-ppp"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core ppp"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-ppp/-/archive/v$pkgver/acf-ppp-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="970b6d13d33b583ca7e8224bc563b1b3ead83f2a51b449e4c68adabd8f2cc123661d83cd07899ebdf8221a3ae9cd9d62dddfeee1bb4b3c3863fdd1382085137e acf-ppp-0.5.0.tar.xz"
+
+sha512sums="1b7815d1f08aa57032c756a34fc36f8d6f0053287ea51f0d43eb5f3f914a771496a8dac487c850d3067fa8e1562de036f306b080827654c51ed89ef447bb2c79 acf-ppp-v0.5.0.tar.gz"
diff --git a/main/acf-provisioning/APKBUILD b/main/acf-provisioning/APKBUILD
index 5202a22fa6..a8b2841193 100644
--- a/main/acf-provisioning/APKBUILD
+++ b/main/acf-provisioning/APKBUILD
@@ -3,25 +3,22 @@
_luaversion=5.2
pkgname=acf-provisioning
pkgver=0.10.1
-pkgrel=1
+pkgrel=3
pkgdesc="ACF for provisioning templated configs to devices"
-url="https://git.alpinelinux.org/cgit/acf/acf-provisioning"
+url="https://gitlab.alpinelinux.org/acf/acf-provisioning"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core lua-sql-postgres postgresql-client lua-posixtz lua-luaxml"
-makedepends=""
-install=""
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-provisioning/-/archive/v$pkgver/acf-provisioning-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir"/$pkgname-$pkgver
-
# fix shebang
sed -i -e "1s:#!/usr/bin/haserl :#!/usr/bin/haserl-lua$_luaversion :" \
- cgi-bin/provisioning.cgi || return 1
+ cgi-bin/provisioning.cgi
make DESTDIR="$pkgdir" install
}
-sha512sums="3e5678cb94ce8cd6ccd011aa1941173dd4b77811928299f2db3415dac4aab4a428ffc4dfcfcc462383ade2bc859c755683e147ccae01ef44a7b39249b7e0aaca acf-provisioning-0.10.1.tar.xz"
+sha512sums="f2c1c6663714242fe14a68579dd37e7b35944b4c0c2fe014554d85363f53ff635a5f98a684ad066bbce94a7198f308ae2153f6ba983c602194f269e789ad9e41 acf-provisioning-v0.10.1.tar.gz"
diff --git a/main/acf-quagga/APKBUILD b/main/acf-quagga/APKBUILD
index 0556dc9e19..ef30f60fe5 100644
--- a/main/acf-quagga/APKBUILD
+++ b/main/acf-quagga/APKBUILD
@@ -2,16 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-quagga
pkgver=0.10.1
-pkgrel=1
-pkgdesc="A web-based system administration interface for quagga"
-url="https://git.alpinelinux.org/cgit/acf/acf-quagga"
+pkgrel=3
+pkgdesc="Web-based system administration interface for quagga"
+url="https://gitlab.alpinelinux.org/acf/acf-quagga"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core lua-socket quagga"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-quagga/-/archive/v$pkgver/acf-quagga-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="cf89a6caa4ba782725267eba99a9955db790845dd99f88c353f2d0dc930d75dee06b9c7d947540a79d72baf3721bcda5c7daf2c998c282f42a0620a3ba4eeee5 acf-quagga-0.10.1.tar.xz"
+
+sha512sums="1b93c25fb9b06ee6f2c7cc1bad88acef52d7a28cf69fce38e39dddbe5aa0517d4422750a34d19bf8d1cd55fab4f9987a30aae45d7c3977c9137deb9608b52848 acf-quagga-v0.10.1.tar.gz"
diff --git a/main/acf-samba/APKBUILD b/main/acf-samba/APKBUILD
index b223987466..64165335ce 100644
--- a/main/acf-samba/APKBUILD
+++ b/main/acf-samba/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-samba
pkgver=0.10.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for samba"
-url="https://git.alpinelinux.org/cgit/acf/acf-samba"
+pkgrel=4
+pkgdesc="Web-based system administration interface for samba"
+url="https://gitlab.alpinelinux.org/acf/acf-samba"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core samba"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-samba/-/archive/v$pkgver/acf-samba-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="93d1771635d433b6bf4425061203e1e43715ff6db672cb7cb1c879c8e9a0d48db9c0361d5f7e247f35ad3da88379b4550f7022e6d088ac01de4a0b7eccdab1c6 acf-samba-0.10.0.tar.xz"
+sha512sums="fc91c68387b732e0f930917807454128042089a4b0b79791c759c2a36fbd9ca90ae6b203987ea193329719f2bd51231f6bf658eea3f89cc7b37ff5170b1dc005 acf-samba-v0.10.0.tar.gz"
diff --git a/main/acf-skins/APKBUILD b/main/acf-skins/APKBUILD
index e264352ec8..8d7ec6a116 100644
--- a/main/acf-skins/APKBUILD
+++ b/main/acf-skins/APKBUILD
@@ -2,16 +2,17 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-skins
pkgver=0.6.0
-pkgrel=1
+pkgrel=3
pkgdesc="Skins for ACF"
-url="https://git.alpinelinux.org/cgit/acf/acf-skins"
+url="https://gitlab.alpinelinux.org/acf/acf-skins"
arch="noarch"
-license="GPL-2.0"
-depends=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+license="GPL-2.0-only"
+options="!check" # no test suite
+source="https://gitlab.alpinelinux.org/acf/acf-skins/-/archive/v$pkgver/acf-skins-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="941b760086b6c214b4b4118dabc131b0699b66d52043e9014018e609179e96ec209c1b7667844b6771abc5b0c0c0e0d44798bf6bf4eb5ddb765a746fffccd9a9 acf-skins-0.6.0.tar.xz"
+
+sha512sums="aefbb7d704f84251294a80a3e09edddd56a44ae616e770eceafe771693cf59d4c09c6a95af5c77b7837b9efea76c898f9800fea4161f073edda96c5f9a89acd8 acf-skins-v0.6.0.tar.gz"
diff --git a/main/acf-snort/APKBUILD b/main/acf-snort/APKBUILD
index 4676d7fbb2..00f36289e0 100644
--- a/main/acf-snort/APKBUILD
+++ b/main/acf-snort/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-snort
pkgver=0.8.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for snort"
-url="https://git.alpinelinux.org/cgit/acf/acf-snort"
+pkgrel=4
+pkgdesc="Web-based system administration interface for snort"
+url="https://gitlab.alpinelinux.org/acf/acf-snort"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core snort"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-snort/-/archive/v$pkgver/acf-snort-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="082dd5ac4f60530b0392c9e841452692dfbe8b317b0c219070e4087b01efbb7ac5d3f67037d0fd8718ecc6a5110764727b45fcd71f5b6568443dcbe9561b80b9 acf-snort-0.8.0.tar.xz"
+sha512sums="d732fc419c6385fbdccd855b7a37ca80bbb1e268fab8f15784d5d242e5664a938ead073bfae183fc252b3558ab347be435ce343b092e6da792417971c09efc1e acf-snort-v0.8.0.tar.gz"
diff --git a/main/acf-squid/APKBUILD b/main/acf-squid/APKBUILD
index 72962ff07b..c2a403ad17 100644
--- a/main/acf-squid/APKBUILD
+++ b/main/acf-squid/APKBUILD
@@ -2,22 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-squid
pkgver=0.11.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for squid"
-url="https://git.alpinelinux.org/cgit/acf/acf-squid"
+pkgrel=4
+pkgdesc="Web-based system administration interface for squid"
+url="https://gitlab.alpinelinux.org/acf/acf-squid"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core squid"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-squid/-/archive/v$pkgver/acf-squid-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
-
}
-sha512sums="6d3e0726da1159657516f99cc0730b4e452f4740973b436f48436bd96fe5f0ddf81a653c19b2732ff2664875382176dd4f13f952e4defdc3f227631fffc656f5 acf-squid-0.11.0.tar.xz"
+sha512sums="41a94835333e6fd12b66c7dcf68072ee3cba06f9e9f011e1342c587e75921db32e0b4496de60f377b02b8fe8003b9aaac3cfb19ba8f02bcb57fba531c67ff1f0 acf-squid-v0.11.0.tar.gz"
diff --git a/main/acf-tinydns/APKBUILD b/main/acf-tinydns/APKBUILD
index 6de61f25c5..3c976879db 100644
--- a/main/acf-tinydns/APKBUILD
+++ b/main/acf-tinydns/APKBUILD
@@ -2,16 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-tinydns
pkgver=0.11.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for tinydns"
-url="https://git.alpinelinux.org/cgit/acf/acf-tinydns"
+pkgrel=4
+pkgdesc="Web-based system administration interface for tinydns"
+url="https://gitlab.alpinelinux.org/acf/acf-tinydns"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core tinydns"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-tinydns/-/archive/v$pkgver/acf-tinydns-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="58d24b86d53a3f9d6b8415af20d193869150d865b9e5f31faa542199d0f4da506ad4ea54b2b68e48c0a9e9e3a6276114cffafd370d6b28fdfbdb20294500ec74 acf-tinydns-0.11.0.tar.xz"
+
+sha512sums="f5dcccf3f333d920ba7ee4bc003efa822b72bdf6265992f5855cbdaa84d556ca966aa1d2b05d084f28e13cda120ce23d5a95c3f91fd4e7faa382a4d66071f93b acf-tinydns-v0.11.0.tar.gz"
diff --git a/main/acf-unbound/APKBUILD b/main/acf-unbound/APKBUILD
index 85fa49a6dd..5aa4429629 100644
--- a/main/acf-unbound/APKBUILD
+++ b/main/acf-unbound/APKBUILD
@@ -2,17 +2,18 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-unbound
pkgver=0.1.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for unbound"
-url="http://git.alpinelinux.org/cgit/acf/$pkgname"
+pkgrel=5
+pkgdesc="Web-based system administration interface for unbound"
+url="https://gitlab.alpinelinux.org/acf/acf-unbound"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core unbound"
-replaces=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-unbound/-/archive/v$pkgver/acf-unbound-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-sha512sums="e42eeb5aa11405e9f68822503cd459076d0a185abdc077558da8d42d9a9643c2703a9db72f26e69161933fcd7a4fa76d4c82d4de4c8c6c373b21a9299c4f8a65 acf-unbound-0.1.0.tar.xz"
+
+sha512sums="fcf1301a5deabf9670ecda51d8fdb3a67697639e6e69169b05627fe89dc9bb40905aa4ef41e1f14d76c1dc4aa8cdc371207c45ae5d1740cdb925a5fcaabd06c6 acf-unbound-v0.1.0.tar.gz"
diff --git a/main/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD
index cdb404b520..ebc5a092d3 100644
--- a/main/acf-weblog/APKBUILD
+++ b/main/acf-weblog/APKBUILD
@@ -2,24 +2,24 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-weblog
pkgver=0.11.1
-pkgrel=1
+pkgrel=3
pkgdesc="ACF for web proxy (squid and dansguardian) logfiles"
-url="https://git.alpinelinux.org/cgit/acf/acf-weblog"
+url="https://gitlab.alpinelinux.org/acf/acf-weblog"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
depends="acf-core lua-sql-postgres wget postgresql-client lua-subprocess"
-makedepends=""
install="$pkgname.post-upgrade"
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
- acf-weblog-update-schema"
+source="https://gitlab.alpinelinux.org/acf/acf-weblog/-/archive/v$pkgver/acf-weblog-v$pkgver.tar.gz
+ acf-weblog-update-schema
+ "
+builddir="$srcdir/$pkgname-v$pkgver"
package() {
- cd "$srcdir"/$pkgname-$pkgver
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
install -Dm755 "$srcdir"/acf-weblog-update-schema \
"$pkgdir"/usr/sbin/acf-weblog-update-schema
}
-sha512sums="396e0e3cbbd01f2c12f9e3b00ee1b8c0b9ec379af9c09b19ebf4b4571a265c040e9266dc3fe9012510136214a5ad49198020cdf861045ce19512d76afbc22dd1 acf-weblog-0.11.1.tar.xz
+sha512sums="de259ceba7e2511b96f9f84a51fac80c7fe6f8f685f99e018a2629095dace93e28f8aa3feb5c107b89856fd7078394f5e4e9d854fc2991b8757d1056473af1b7 acf-weblog-v0.11.1.tar.gz
98474adf2b60b30dbe060753db9b8c8d70696e063cfae810f7aab59cba229e45e15abe368609bd9ab3480c594fd6e9545c5c128fcdc81908df4463f86cb475e3 acf-weblog-update-schema"
diff --git a/main/aconf/APKBUILD b/main/aconf/APKBUILD
index fd01918f36..ecc1db71bd 100644
--- a/main/aconf/APKBUILD
+++ b/main/aconf/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
pkgname=aconf
pkgver=0.8.1
-pkgrel=0
+pkgrel=1
pkgdesc="Alpine Configurator"
-url="https://git.alpinelinux.org/cgit/user/kunkku/aconf/"
+url="https://gitlab.alpinelinux.org/kunkku/aconf/"
arch="noarch"
-license="BSD"
+license="BSD-2-Clause"
_luaver="5.3"
_lua="lua$_luaver"
depends="$_lua-augeas $_lua-b64 $_lua-cjson $_lua-file-magic $_lua-openrc
diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD
index f4ea1627cf..60f3c91a31 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.13.0_alpha20200917
+pkgver=3.14.0_alpha20210212
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 0f71f7af25..2851e03439 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=8
+pkgrel=9
pkgdesc="Alpine base dir structure and init scripts"
url="https://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
arch="all"
@@ -31,7 +31,7 @@ source="mkmntdirs.c
builddir="$srcdir/build"
prepare() {
- default_prepare
+ default_prepare
mkdir -p "$builddir"
mv "$srcdir"/services-$pkgver-$pkgrel "$srcdir"/services
}
@@ -233,6 +233,6 @@ bfe947bdd69e7d93b32c8cb4e2cabe5717cb6c1e1f49a74015ac2cfb13e96d1f12c4be23ae93a1d6
abb391a9b5c2b418ad9ea15dcc373a0a0946e5e438d371d00d4bd6c8c60fa81613429a3b8d4313970dcc7eae527793a874c31a9b5a62706f450ab9bb9e8db405 group
fdab6f8fec2a556ab817d90a73635a927ea04dbc4e0470ed59ee6a62c87393f9534c9b746b09a776d938c25b8af9c9fb1686578e24f8307d1d074921ade1bdc7 inittab
06d12a7b9ca14fe17e412d0f24814620b67d035ae859be7906cbf4782dd69e359a6a555dafb98060b7fb7e4714aaa676c88d9017cded36e6d8398e23369bb290 passwd
-424a3dc91b9ff056c55b49fbbf7100b1a3707603f91410c5846ab869bdf6fb72287481b1ee78ef07e7b9e20a35310118d5fdbcc96e1bbb2fc5e9b2e0583b8a1c profile
+07a440966e54edadfd2da5d2817ecda0d4bb46a97db8a5799461dcf56c546619bf8676f2914e6484c158084827e2a022f875e9101bcd083673b72e78ff3446e3 profile
f1548a2b5a107479446f15905f0f2fbf8762815b2215188d49d905c803786d35de6d98005dc0828fb2486b04aaa356f1216a964befddf1e72cb169656e23b6ac protocols
-680add49729cb9d88a03dfdd35c49784a951a18289adbf567f2126eb96b0378deca7b1d7999dac1579295466fca49e1cd5251341dd75da1a0f06f970ba8e0293 services-3.2.0-8"
+680add49729cb9d88a03dfdd35c49784a951a18289adbf567f2126eb96b0378deca7b1d7999dac1579295466fca49e1cd5251341dd75da1a0f06f970ba8e0293 services-3.2.0-9"
diff --git a/main/alpine-baselayout/profile b/main/alpine-baselayout/profile
index f76472ce23..f4482ce2d2 100644
--- a/main/alpine-baselayout/profile
+++ b/main/alpine-baselayout/profile
@@ -1,6 +1,5 @@
export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
export PAGER=less
-export PS1='\h:\w\$ '
umask 022
for script in /etc/profile.d/*.sh ; do
diff --git a/main/alpine-conf/0001-setup-disk-don-t-add-syslinux-package-for-mounted-ro.patch b/main/alpine-conf/0001-setup-disk-don-t-add-syslinux-package-for-mounted-ro.patch
deleted file mode 100644
index d7d22b0879..0000000000
--- a/main/alpine-conf/0001-setup-disk-don-t-add-syslinux-package-for-mounted-ro.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 43e4d0b3d7441611a58ba89dfa3ae69269c16e52 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <dne+alpine@mayonnaise.net>
-Date: Sat, 2 May 2020 22:02:51 +0000
-Subject: [PATCH] setup-disk: don't add syslinux package for mounted root
- install unless requested
-
----
- setup-disk.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup-disk.in b/setup-disk.in
-index 7a3a2a3..86136de 100644
---- a/setup-disk.in
-+++ b/setup-disk.in
-@@ -1212,7 +1212,7 @@ shift $(( $OPTIND - 1))
-
- if [ -d "$1" ]; then
- # install to given mounted root
-- apk add --quiet syslinux
-+ [ "$BOOTLOADER" = "syslinux" ] && apk add --quiet syslinux
- install_mounted_root "${1%/}" \
- && echo "You might need fix the MBR to be able to boot" >&2
- exit $?
---
-2.26.2
-
diff --git a/main/alpine-conf/0001-update-kernel-remove-nopad.patch b/main/alpine-conf/0001-update-kernel-remove-nopad.patch
new file mode 100644
index 0000000000..36cece148f
--- /dev/null
+++ b/main/alpine-conf/0001-update-kernel-remove-nopad.patch
@@ -0,0 +1,28 @@
+From 8beb8f42f4bd33227f7a57193631d5d3a951a8de Mon Sep 17 00:00:00 2001
+From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
+Date: Sat, 9 Jan 2021 12:10:56 -0500
+Subject: [PATCH] update-kernel: remove nopad
+
+-nopad squashfs files cannot be mounted by Linux kernel.
+
+Fixes: 30e6933e71fc ("update-kernel: use -nopad -Xbcj for modloop")
+---
+ update-kernel.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/update-kernel.in b/update-kernel.in
+index d0b67e8..143e8ec 100644
+--- a/update-kernel.in
++++ b/update-kernel.in
+@@ -323,7 +323,7 @@ case $ARCH in
+ x86|x86_64) mksfs="-Xbcj x86" ;;
+ *) mksfs=
+ esac
+-mksquashfs $MODLOOP "$STAGING/$MODIMG" -comp xz -exit-on-error -nopad $mksfs
++mksquashfs $MODLOOP "$STAGING/$MODIMG" -comp xz -exit-on-error $mksfs
+
+ if [ -n "$MODLOOPSIGN" ]; then
+ sign_modloop "$STAGING/$MODIMG"
+--
+2.30.0
+
diff --git a/main/alpine-conf/0001-update-kernel-use-nopad-Xbcj-for-modloop.patch b/main/alpine-conf/0001-update-kernel-use-nopad-Xbcj-for-modloop.patch
new file mode 100644
index 0000000000..e04dc66aa4
--- /dev/null
+++ b/main/alpine-conf/0001-update-kernel-use-nopad-Xbcj-for-modloop.patch
@@ -0,0 +1,33 @@
+From 30e6933e71fc18ff5bcb5a7d9dad105e464272bf Mon Sep 17 00:00:00 2001
+From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
+Date: Mon, 6 Jul 2020 10:50:55 -0400
+Subject: [PATCH] update-kernel: use -nopad -Xbcj for modloop
+
+reduces x86 modloop size by about 38k. -all-time 0 reduces by 300 bytes
+more, but probably more confusing than it's worth
+---
+ update-kernel.in | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/update-kernel.in b/update-kernel.in
+index 67eb94b..d0b67e8 100644
+--- a/update-kernel.in
++++ b/update-kernel.in
+@@ -317,7 +317,13 @@ if [ -e "$ROOT"/lib/modules/*/kernel/drivers/bluetooth/btbcm.ko ]; then
+ done
+ fi
+
+-mksquashfs $MODLOOP "$STAGING/$MODIMG" -comp xz -exit-on-error
++case $ARCH in
++ armhf) mksfs="-Xbcj arm" ;;
++ armv7|aarch64) mksfs="-Xbcj arm,armthumb" ;;
++ x86|x86_64) mksfs="-Xbcj x86" ;;
++ *) mksfs=
++esac
++mksquashfs $MODLOOP "$STAGING/$MODIMG" -comp xz -exit-on-error -nopad $mksfs
+
+ if [ -n "$MODLOOPSIGN" ]; then
+ sign_modloop "$STAGING/$MODIMG"
+--
+2.30.0
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index ddf59c2720..2682069781 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,14 +1,15 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
-pkgver=3.9.0
-pkgrel=1
+pkgver=3.11.0
+pkgrel=2
pkgdesc="Alpine configuration management scripts"
url="https://git.alpinelinux.org/alpine-conf/about"
arch="all"
license="MIT"
depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3"
-source="https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.bz2
- 0001-setup-disk-don-t-add-syslinux-package-for-mounted-ro.patch
+source="https://gitlab.alpinelinux.org/alpine/alpine-conf/-/archive/$pkgver/alpine-conf-$pkgver.tar.gz
+ 0001-update-kernel-use-nopad-Xbcj-for-modloop.patch
+ 0001-update-kernel-remove-nopad.patch
"
builddir="$srcdir"/$pkgname-$pkgver
@@ -25,5 +26,6 @@ package() {
done
}
-sha512sums="c7f7ba8341d7c84aa85f521624de511acbea42337377693099156750462a380e0116c9bde2d3a1595c8942c024f1421e7106566c4c0415c734513ddf5ec08cb2 alpine-conf-3.9.0.tar.bz2
-7f29d2993d03d55784c60e87ea8d357744786f7de07f6946ffec24446004e62711b801a8fc5d13e36c2d72abfcaa39f97ab6c7126c70b12601aed851dd93a168 0001-setup-disk-don-t-add-syslinux-package-for-mounted-ro.patch"
+sha512sums="3fc373836aa30a2193d76d2cccc50dddb95c21e1f3530bf0b841a815161fea287b9bbb1370d2d2616615448df7fa5791328e59903cf87907477846758c689c38 alpine-conf-3.11.0.tar.gz
+00ad34bdce80c716396c613b25346e23c7747b9084de0f88c2a099e5829f612b15e0a5584d139c66947907c8fbee88359979a4bea292ab5b96db4d6c2796d455 0001-update-kernel-use-nopad-Xbcj-for-modloop.patch
+c40169cc063235e09a8e3d03670e6ad19a941c58939dd9ecff6aad1781dfc7be3e19d6f23861c854dc1434282275325933eaff8bcdc54c5b08fcd53a1f4ea52b 0001-update-kernel-remove-nopad.patch"
diff --git a/main/alpine-make-rootfs/APKBUILD b/main/alpine-make-rootfs/APKBUILD
new file mode 100644
index 0000000000..1914a65b31
--- /dev/null
+++ b/main/alpine-make-rootfs/APKBUILD
@@ -0,0 +1,20 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=alpine-make-rootfs
+pkgver=0.5.1
+pkgrel=0
+pkgdesc="Make customized Alpine Linux rootfs (base image) for containers"
+url="https://github.com/alpinelinux/alpine-make-rootfs"
+arch="noarch"
+license="MIT"
+depends="tar"
+source="$pkgname-$pkgver.tar.gz::https://github.com/alpinelinux/$pkgname/archive/v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-$pkgver"
+options="!check" # no suitable tests provided
+
+package() {
+ cd "$builddir"
+ make install DESTDIR="$pkgdir" PREFIX=/usr
+}
+
+sha512sums="d2c98c3fc69b4f61d798714711b668da7abafb111846a0a8d4cbcf1003a2b677a18ad9cfa3565a0f2cb0a74a2f30f485786310a8e09ff942037bf60d88bf3245 alpine-make-rootfs-0.5.1.tar.gz"
diff --git a/main/alpine-sdk/APKBUILD b/main/alpine-sdk/APKBUILD
index 6329686c42..cfe8dca095 100644
--- a/main/alpine-sdk/APKBUILD
+++ b/main/alpine-sdk/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-sdk
pkgver=1.0
-pkgrel=0
-url=http://dev.alpinelinux.org/cgit
+pkgrel=1
+url="https://git.alpinelinux.org/"
pkgdesc="Alpine Software Development Kit meta package"
depends="abuild build-base git"
arch="noarch"
diff --git a/main/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD
index ad5fee6a56..76cd6de3fa 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.4
-pkgrel=1
+pkgrel=2
pkgdesc="Advanced Linux Sound Architecture (ALSA) library"
url="http://www.alsa-project.org"
arch="all"
@@ -23,11 +23,10 @@ build() {
--enable-rawmidi \
--enable-seq \
--enable-aload \
+ --without-debug \
--disable-dependency-tracking \
--without-versioned
make
- rm -rf "$builddir"/include/sound/*
- printf "all:\ncheck:\ninstall:\n" > "$builddir"/include/sound/Makefile
}
check() {
diff --git a/main/amavisd-milter/APKBUILD b/main/amavisd-milter/APKBUILD
index 80c8e019a3..22ec5e58bf 100644
--- a/main/amavisd-milter/APKBUILD
+++ b/main/amavisd-milter/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Elias Werberich <elias@werberich.de>
# Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting>
pkgname=amavisd-milter
-pkgver=1.7.0
+pkgver=1.7.1
pkgrel=0
pkgdesc="sendmail milter for amavisd-new using the AM.PDP protocol"
url="http://amavisd-milter.sourceforge.net/"
@@ -42,6 +42,6 @@ package() {
install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
-sha512sums="52fdfe4acdd94e387de63d93aa3347dce46e7e16b8ab51679c7bbfc4f6faba160de5ca55aae141cbd06f3d9d1122dea67fdd67562dd5b8314055f7f6071545af amavisd-milter-1.7.0.tar.gz
-3e45a8766f6b5bbb089bcb508efe99d17f107d544b2d50d12437a6b7103e2ce143eef9c6ecc0e2a9ced37b153d122e1eb8f171e4000e4e56a7f2a210587c2d68 amavisd-milter.initd
+sha512sums="db2fd53a3047a21fb20743fce7d01899eb92efffc62159d3022e0b5014dbfb3667e1664868734d84b58f5daadd8270d3e05a68c60a01a1ac35d104105cc86586 amavisd-milter-1.7.1.tar.gz
+3f631248da7ecc36790123bad82b0d17a110947dd84aa03fc1e81c3ed99db43ae52d3cef10c048a9147d86973a8d730494b6c289f96195dbafab2804538191fd amavisd-milter.initd
f44ab528c65050e23a2e78dafd937dae5bc73bd83ff780d7a193d47744674f3991c9d1ae99c4fb8ce1762c50ed6ca5fb604eb2c4cf69fe2e27e8a4076b6f2eec amavisd-milter.confd"
diff --git a/main/amavisd-milter/amavisd-milter.initd b/main/amavisd-milter/amavisd-milter.initd
index c76cd259ef..c0daeb46a0 100644
--- a/main/amavisd-milter/amavisd-milter.initd
+++ b/main/amavisd-milter/amavisd-milter.initd
@@ -4,8 +4,7 @@ pidfile="/var/amavis/amavisd-milter.pid"
name=amavisd-milter
command="/usr/sbin/$name"
-command_args="-f -B -w $workdir -s $socket_milter -S $socket_amavis -m $connections"
-command_background="yes"
+command_args="-B -w $workdir -s $socket_milter -S $socket_amavis -m $connections"
start_stop_daemon_args="--user $user:$group"
diff --git a/main/ansible-base/APKBUILD b/main/ansible-base/APKBUILD
index 6fe4b299a1..a1a5e5ba64 100644
--- a/main/ansible-base/APKBUILD
+++ b/main/ansible-base/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Takuya Noguchi <takninnovationresearch@gmail.com>
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=ansible-base
-pkgver=2.10.3
+pkgver=2.10.5
pkgrel=0
pkgdesc="A configuration-management, deployment, task-execution, and multinode orchestration framework"
url="https://ansible.com/"
@@ -65,5 +65,5 @@ package() {
install -m644 README.rst "$pkgdir"/usr/share/doc/$pkgname
}
-sha512sums="4da2c79c7d990bbe07e136447643484d947e512693194017623deadd88d6556dac67865069182059ae2daf82a13876600dc5472712d6ab6e0556cb829fce3b5b ansible-base-2.10.3.tar.gz
+sha512sums="2449a36bdea7242a3f4e248e42388339299340cd6c377d6a20b02803db527895912e49040f3931a1aa2ebf04e3d4d5594cfc08aec28da44b73c8206dc81ddb89 ansible-base-2.10.5.tar.gz
57364eb94bd5fa1add6fb2f60d4e3790a6f1d7582f92ec1e25ea9459704d12ffe49b09ebde4aef91463d1950cfc9a4a34ab2ef83c60f1bc1c1fb6399e900369d 0001-new-module-lbu.patch"
diff --git a/main/ansible/APKBUILD b/main/ansible/APKBUILD
index a6f6a2b97f..c327018fb9 100644
--- a/main/ansible/APKBUILD
+++ b/main/ansible/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Takuya Noguchi <takninnovationresearch@gmail.com>
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=ansible
-pkgver=2.10.3
+pkgver=2.10.6
pkgrel=0
pkgdesc="A configuration-management, deployment, task-execution, and multinode orchestration framework"
url="https://ansible.com/"
@@ -26,4 +26,4 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="f0f6a8e54b73e9319c2b8432deac6e3aa0f3ba709a390218b3cba3551a4f9bdf82917b012edc843123eed5df819b99be1afb1e87d54e62d9f7b7acdee0707105 ansible-2.10.3.tar.gz"
+sha512sums="d5d2af728f3f6ff281e078fd4791c7278819d79d6c734f8e9d01fa549f0db25241045456d6aa6e8ccbceab4905039e7431c9db3aaaa89acb01ca599186963e24 ansible-2.10.6.tar.gz"
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index 0d20af53dc..449d4a851e 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -3,7 +3,7 @@
pkgname=apache2
_pkgreal=httpd
pkgver=2.4.46
-pkgrel=0
+pkgrel=3
pkgdesc="A high performance Unix-based HTTP server"
url="https://httpd.apache.org/"
arch="all"
@@ -11,12 +11,13 @@ license="Apache-2.0"
install="$pkgname.pre-install $pkgname.pre-upgrade"
pkgusers="apache"
pkggroups="apache"
-makedepends="apr-dev apr-util-dev autoconf automake libxml2-dev lua-dev
- nghttp2-dev openssl-dev pcre-dev sed zlib-dev"
+makedepends="apr-dev apr-util-dev autoconf automake brotli-dev libxml2-dev
+ lua-dev nghttp2-dev openssl-dev pcre-dev sed zlib-dev"
subpackages="$pkgname-ctl
+ $pkgname-error:_error:noarch
$pkgname-dev
$pkgname-doc
- $pkgname-error:_error:noarch
+ $pkgname-brotli
$pkgname-http2
$pkgname-icons::noarch
$pkgname-ldap
@@ -247,8 +248,18 @@ _error() {
_mv_conf multilang-errordoc
}
+brotli() {
+ pkgdesc="Brotli content compression for the Apache HTTP Server"
+ depends="apache2"
+ install -d "$subpkgdir"/usr/lib/apache2
+ mv "$pkgdir"/usr/lib/apache2/mod_brotli.so \
+ "$subpkgdir"/usr/lib/apache2
+ _load_mods
+}
+
http2() {
pkgdesc="HTTP/2 transport layer for the Apache HTTP Server"
+ depends="apache2"
install -d "$subpkgdir"/usr/lib/apache2
mv "$pkgdir"/usr/lib/apache2/mod_http2.so \
"$subpkgdir"/usr/lib/apache2
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index b6855e0740..ff8b7f4e33 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
-pkgver=2.12.0
-pkgrel=1
+pkgver=2.12.3
+pkgrel=0
pkgdesc="Alpine Package Keeper - package manager for alpine"
arch="all"
url="https://gitlab.alpinelinux.org/alpine/apk-tools"
@@ -77,5 +77,5 @@ luaapk() {
mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/
}
-sha512sums="feabd7959e6212156191b8468a10193103ea8887f921060891c5fdb6e17258cb0d80140cbcd27affd572086dcc9244bce9328ae3c352659ca7db213bf79eae6a apk-tools-v2.12.0.tar.gz
-3265749409e8862beb6009488ff8726e2c9d1700a4c3827f44b6734809208a09296a151b138cf33c2bcae2217a1f825fdbe491273c2631c1ee29fd94d68cb0a2 _apk"
+sha512sums="564e6ba560270e42845b0086c7a2c8cd9891865b4491f9a1c704ecb163c63435fdc21d5ccacc8af3a85e891fd3b647520fbf6dc5f20f1934c3a7d5f7a736ce51 apk-tools-v2.12.3.tar.gz
+102e6d01a984fb7a84c9432f797e4d8d2c90e9570dd26208b8485569ab471ea88a2cc81eabd3b3f7e4c9685a37afc458dec172a65b03c19c78a7efb598c54f45 _apk"
diff --git a/main/apk-tools/_apk b/main/apk-tools/_apk
index 198ae95c31..d00105c012 100644
--- a/main/apk-tools/_apk
+++ b/main/apk-tools/_apk
@@ -50,27 +50,33 @@ function _apk {
local curcontext="$curcontext"
local ret=1
- function _ccache_apk_world { [[ ~/.zshcompcache/apk_index_packages_installed -ot /etc/apk/world ]] }
-
- # TODO: Add _ccache_apk_avail for available packages, some systems don't have a package cache
- # so there's a bit of work for that. apk is still pretty quick so this is not necessary
+ function _ccache_apk_world { [[ "$1" -ot /etc/apk/world ]] }
+ function _ccache_apk_avail {
+ for i in /var/cache/apk/APKINDEX.*; do
+ [[ "$1" -ot "$i" ]] && return
+ done
+ }
function _apk_available_pkgs {
- local -a packs
+ local -a _apk_available_packs
+ zstyle ":completion:${curcontext}:" cache-policy _ccache_apk_avail
local IFS=$'\n'
- packs=(${$(/sbin/apk list -a)%-[[:digit:][:lower:]._]##-r[[:digit:]]## * \{*\} (*)})
- _describe 'available packages' packs
+ if _cache_invalid apk_index_packages_available || ! _retrieve_cache apk_index_packages_available; then
+ _apk_available_packs=(${${$(/sbin/apk list -a 2>/dev/null)%% *}%%-[[:digit:].]##([[:alpha:]]#)#(_[[:alpha:]]#[[:digit:]])#(-r[[:digit:]]##)#})
+ _store_cache apk_index_packages_available _apk_available_packs
+ fi
+ _describe 'available packages' _apk_available_packs
}
function _apk_installed_pkgs {
- local -a packs
+ local -a _apk_installed_packs
zstyle ":completion:${curcontext}:" cache-policy _ccache_apk_world
local IFS=$'\n'
if _cache_invalid apk_index_packages_installed || ! _retrieve_cache apk_index_packages_installed; then
- packs=(${$(/sbin/apk list -I)%-[[:digit:][:lower:]._]##-r[[:digit:]]## * \{*\} (*)})
- _store_cache apk_index_packages_installed packs
+ _apk_installed_packs=(${${$(/sbin/apk list -I 2>/dev/null)%% *}%%-[[:digit:].]##([[:alpha:]]#)#(_[[:alpha:]]#[[:digit:]])#(-r[[:digit:]]##)#})
+ _store_cache apk_index_packages_installed _apk_installed_packs
fi
- _describe 'installed packages' packs
+ _describe 'installed packages' _apk_installed_packs
}
function _apk_packages {
@@ -109,35 +115,40 @@ function _apk {
_describe 'subcommand' cmds
}
- function _apk_subcmd_args {
- local -a add_args=(
- $global_opts \
+ local -a completion_spec=($global_opts ':subcommand:_apk_subcmds')
+
+ case ${${words:#-*}[2]} in
+ (add)
+ completion_spec+=(
$commit_opts \
$latest_opt \
$upgrade_opt \
"--initdb[Initialize a new package database]" \
"(-t --virtual)"{-t,--virtual}"[Create virtual package with given dependencies]" \
- "*::package:_apk_packages"
+ "*:package:_apk_packages"
)
- local -a del_args=(
- $global_opts \
+ ;;
+ (del)
+ completion_spec+=(
$commit_opts \
"--rdepeds[Recursively delete all top-level reverse dependencies]" \
- "*::installed package:_apk_installed_pkgs"
+ "*:installed package:_apk_installed_pkgs"
)
- local -a fix_args=(
- $global_opts \
+ ;;
+ (fix)
+ completion_spec+=(
$commit_opts \
"(-d --depends)"{-d,--depends}"[Fix dependencies of specified packages]" \
"(-r --reinstall)"{-r,--reinstall}"[Reinstall packages]" \
"(-u --upgrade)"{-u,--upgrade}"[Upgrade if an upgrade is available and does not break dependencies]" \
"(-x --xattr)"{-x,--xattr}"[Fix packages with broken xattrs]" \
"--directory-permissions[Reset all directory permissions]" \
- "*::package:_apk_packages"
+ "*:package:_apk_packages"
)
- local -a update_args=($global_opts $commit_opts)
- local -a upgrade_args=(
- $global_opts \
+ ;;
+ (update) completion_spec+=($commit_opts);;
+ (upgrade)
+ completion_spec+=(
$commit_opts \
$latest_opt \
"(-a --available)"{-a,--available}"[Reset all packages to versions available from current repositories]" \
@@ -145,16 +156,18 @@ function _apk {
"--no-self-upgrade[Do not do an early upgrade of the 'apk-tools' package]" \
"--prune[Remove packages which are no longer available from any configured repository]" \
"--self-upgrade-only[Only perform a self-upgrade of the 'apk-tools' package]" \
- "*::package:_apk_packages"
+ "*:package:_apk_packages"
)
- local -a cache_args=(
- $global_opts \
+ ;;
+ (cache)
+ completion_spec+=(
$latest_opt \
$upgrade_opt \
- ':subcommand:_apk_cache'
+ '2:subcommand:_apk_cache'
)
- local -a info_args=(
- $global_opts \
+ ;;
+ (info)
+ completion_spec+=(
"(-a --all)"{-a,--all}"[List all information known about the package]" \
"(-d --description)"{-d,--descripton}"[Print the package description]" \
"(-e --installed)"{-e,--installed}"[Check package installed status]" \
@@ -169,10 +182,11 @@ function _apk {
"--license[Print the package SPDX license identifier]" \
"--replaces[List the other packages for which this package is marked as a replacement]" \
"--triggers[Print active triggers for the package]" \
- "*::package:_apk_packages"
+ "*:package:_apk_packages"
)
- local -a list_args=(
- $global_opts \
+ ;;
+ (list)
+ completion_spec+=(
"(-I --installed)"{-I,--installed}"[Consider only installed packages]" \
"(-O --orphaned)"{-O,--orphaned}"[Consider only orphaned packages]" \
"(-a --available)"{-a,--available}"[Consider only available packages]" \
@@ -180,50 +194,47 @@ function _apk {
"(-o --origin)"{-o,--origin}"[List packages by origin]" \
"(-d --depends)"{-d,--depends}"[List packages by dependency]" \
"(-P --providers)"{-P,--providers}"[List packages by provider]" \
- "*::pattern"
+ "*:pattern"
)
- local -a dot_args=(
- $global_opts \
+ ;;
+ (dot)
+ completion_spec+=(
"--errors[Consider only packages with errors]" \
"--installed[Consider only installed packages]"
)
- local -a policy_args=($global_opts)
- local -a index_args=(
- $global_opts \
+ ;;
+ (index)
+ completion_spec+=(
"(-d --description)"{-d,--description}"[Add a description to the index]:description" \
"(-o --output)"{-o,--output}"[Output generated index to file]:output:_files" \
"(-x --index)"{-x,--index}"[Read an existing index to speed up the creation of the new index]" \
"--no-warnings[Disable warnings about missing dependencies]" \
- "*::package:_apk_packages"
+ "*:package:_apk_packages"
)
- local -a fetch_args=(
- $global_opts \
+ ;;
+ (fetch)
+ completion_spec+=(
"(-l --link)"{-l,--link}"[Create hard links if possible]" \
"(-o --output)"{-o,--output}"[Where to write the downloaded files]:directory:_dir_list" \
"(-r --recursive)"{-r,--recursive}"[Fetch packages and all of their dependencies]" \
"(-s --stdout)"{-s,--stdout}"[Dump the .apk file(s) to stdout]" \
"--simulate[Simulate the requested operation without making any changes]" \
- "*::package:_apk_packages"
+ "*:package:_apk_packages"
)
- local -a manifest_args=($global_opts "*::package:_apk_packages")
- local -a verify_args=($global_opts "*::package:_apk_packages")
- local -a audit_args=($global_opts "*::files:_files")
- local -a stats_args=($global_opts)
- local -a version_args=(
- $global_opts \
+ ;;
+ (manifest) completion_spec+=("*:package:_apk_packages");;
+ (verify) completion_spec+=("*:package:_apk_packages");;
+ (audit) completion_spec+=("*:files:_files");;
+ (version)
+ completion_spec+=(
"-a[Consider packages from all repository tags]" \
"-l[Limit to packages with output matching given operand]:operand" \
- "*::package:_apk_packages"
+ "*:package:_apk_packages"
)
- local cmdvar="${words[1]}_args"
- _arguments -s -C ${(P)cmdvar} && ret=0
- }
-
- # Main arguments
- _arguments -C -s \
- $global_opts \
- ':subcommand:_apk_subcmds' \
- '*::subcommand:_apk_subcmd_args' && ret=0
+ ;;
+ (policy) completion_spec+=("*:package:_apk_packages");;
+ esac
+ _arguments -C -s $completion_spec && ret=0
return ret
}
diff --git a/main/aports-build/APKBUILD b/main/aports-build/APKBUILD
index ab6a399da6..7e9d595e70 100644
--- a/main/aports-build/APKBUILD
+++ b/main/aports-build/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=aports-build
-pkgver=1.5.1
-pkgrel=1
+pkgver=1.5.3
+pkgrel=0
pkgdesc="MQTT based build-on-git-push scripts for Alpine Linux"
url="https://alpinelinux.org"
arch="noarch"
@@ -46,7 +46,7 @@ package() {
EOF
}
-sha512sums="c2497ad359ab0eb8a34a86ebe0f0d4205b191af870d4e612ce2e05041a3600ee648e017fceb1594be7536c007411656b5ade3fc454b7a32eead81f6dc367078f aports-build
+sha512sums="81c039c6999fddde2489fccdc48b29760c80ea1ff5265cc2d7f73d6575e0173a0f51b89a4d49e5100e2d841b6260adc48e4ab00e8608d52b3b69b17a590467ad aports-build
821035bda47152c341ec94bf960fa67e3377051826712ceb74f39103e6e422777b6e082231bfb87865653d2b93b7d3154cfc24abf65a52e3e66da69412dd7e41 aports-build.initd
62ed5cb6d1fef03fa707512c8c99c572a91e64706ebcc2e7097108811818615618bab908292d0ba0ad2afe93a27333d9c91deb347d6c99703eb8983d1ee5f480 mqtt-exec.aports-build.confd
cf0d8e65e517857ee781e451a1d3e6404cd72aeb5c7dba25017229ff79c4c43425712d2fcbbaad89af45a358e86f33467ac1df47e8fba0f30f81d84794e1206c report-build-errors.lua"
diff --git a/main/aports-build/aports-build b/main/aports-build/aports-build
index 5e1960d0d0..423eb9b8d8 100644
--- a/main/aports-build/aports-build
+++ b/main/aports-build/aports-build
@@ -67,6 +67,7 @@ create_release() {
s390x) release_deps="$release_deps s390-tools";;
esac
+ log "creating $release release"
cd "$aports"
abuild-apk add --virtual .alpine-release-deps $release_deps
(
@@ -80,6 +81,7 @@ create_release() {
fi
if $use_network; then
+ log "uploading $release release"
ssh $upload_host mkdir -p "${upload_iso#${upload_host}:}"
rsync -ruva $rsync_opts "$releasedir"/* "$upload_iso" || return 1
fi
@@ -138,6 +140,12 @@ while true; do
log "$_old_tag -> $_current_tag"
do_release=true
fi
+
+ # don't create release candidates on edge
+ if [ "$rel" = "edge" ] && [ "${_current_tag%_rc*}" != "$_current_tag" ]; then
+ do_release=false
+ fi
+
if [ "$_old" = "$_current" ] && [ -f /tmp/uploaded ] && [ -z "$force" ] && [ "$_current_tag" = "$_old_tag" ]; then
break
fi
diff --git a/main/argp-standalone/APKBUILD b/main/argp-standalone/APKBUILD
index 0870342f8f..5799c19d1f 100644
--- a/main/argp-standalone/APKBUILD
+++ b/main/argp-standalone/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=argp-standalone
pkgver=1.3
pkgrel=4
diff --git a/main/arpwatch/APKBUILD b/main/arpwatch/APKBUILD
index 9d8bc8cf24..0ba85e532b 100644
--- a/main/arpwatch/APKBUILD
+++ b/main/arpwatch/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=arpwatch
pkgver=2.1a15
pkgrel=17
diff --git a/main/asciidoc/APKBUILD b/main/asciidoc/APKBUILD
index 667b41e707..c1f22d4d01 100644
--- a/main/asciidoc/APKBUILD
+++ b/main/asciidoc/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=asciidoc
-pkgver=9.0.4
+pkgver=9.0.5
pkgrel=0
pkgdesc="Text based documentation"
url="https://asciidoc.org/"
@@ -32,8 +32,12 @@ build() {
make
}
+check() {
+ make test
+}
+
package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="9e24aaaf33ab56cf1dfa510a6be9722af364633234c9ffb20eeee3d0ba756059290f443de53b040570654a316ab4782a177c31377fc69747814da75760fcc88b asciidoc-9.0.4.tar.gz"
+sha512sums="5b79d74c1efd43a960e8a415d3a68f26dcd3a3eee748b830101cec69475b0af40de7ad190ae105cade8ee558a59a643d04f38c1be490d253e3a6740c347d94e3 asciidoc-9.0.5.tar.gz"
diff --git a/main/aspell-en/APKBUILD b/main/aspell-en/APKBUILD
index aa7e916de7..81cd47f9e4 100644
--- a/main/aspell-en/APKBUILD
+++ b/main/aspell-en/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=aspell-en
-pkgver=2019.10.06
+pkgver=2020.12.07
pkgrel=0
_lang=${pkgname##*-}
_name=${pkgname%%-*}6-$_lang-$pkgver-0
@@ -15,15 +15,13 @@ source="https://ftp.gnu.org/gnu/aspell/dict/$_lang/$_name.tar.bz2"
builddir="$srcdir"/$_name
build() {
- cd "$builddir"
./configure
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -D -m644 Copyright "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
-sha512sums="e16c76bd2da4515af6f1e3dbbc1c5f26fc3be550e022cbb5b741b867be2acc1359a8902af1b359f6c8cff38de01b9aa43a02153a5a6bc618296e75bf86020a6e aspell6-en-2019.10.06-0.tar.bz2"
+sha512sums="9ed4e64891242e5e5e7d6ac82a0d1fda3bdc5116bd9d926e787b8f381080b357915f0c9b39cae04c1da0f2ec6e47ffe30a584f7f3bf7d455a46e8518a7858547 aspell6-en-2020.12.07-0.tar.bz2"
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 5b8d2c212e..5d9d7a718c 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -3,9 +3,9 @@
# Contributor: Timo Teras <timo.teras@iki.fi>
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=asterisk
-pkgver=18.0.0
-pkgrel=1
-pkgdesc="Asterisk: A Module Open Source PBX System"
+pkgver=18.2.1
+pkgrel=0
+pkgdesc="Modular Open Source PBX System"
pkgusers="asterisk"
pkggroups="asterisk"
url="https://www.asterisk.org/"
@@ -38,6 +38,16 @@ source="$_download/asterisk-$pkgver.tar.gz
asterisk.logrotate"
# secfixes:
+# 18.2.1-r0:
+# - CVE-2021-26712
+# - CVE-2021-26713
+# - CVE-2021-26717
+# - CVE-2021-26906
+# 18.1.1-r0:
+# - CVE-2020-35652
+# - CVE-2020-35776
+# 18.0.1-r0:
+# - CVE-2020-28327
# 16.6.2-r0:
# - CVE-2019-18610
# - CVE-2019-18790
@@ -113,7 +123,8 @@ build() {
}
package() {
- make -j1 DESTDIR="$pkgdir" LDCONFIG_FLAGS="-n" install
+ make DESTDIR="$pkgdir" LDCONFIG_FLAGS="-n" install
+ make DESTDIR="$pkgdir" install-headers
install -d "$pkgdir"/var/run/asterisk
install -d "$pkgdir"/var/lib/asterisk
@@ -174,7 +185,7 @@ sound_en() {
chown -R asterisk:asterisk "$subpkgdir"/var/*/asterisk
}
-sha512sums="5ff099114e989180b5d3cb5f8bd0ffc7c03f1bb214675238a23ded97c9e19ec6098d0db8855802fe8cdc8658d0f974df060fb866be5a5510de21330ba954e686 asterisk-18.0.0.tar.gz
+sha512sums="9d7ab83059509dacfab85fdecbdecdb9a90d5da5e3e7f2dce3b49edbbcf5198e19afe8c23b6c4fa480285f00406e74e29bf16bb40cb90a96d03b3e6b315191f9 asterisk-18.2.1.tar.gz
aacef3f4796fb1abd33266998b53909cb4b36e7cc5ad2f7bac68bdc43e9a9072d9a4e2e7e681bddfa31f3d04575eb248afe6ea95da780c67e4829c1e22adfe1b asterisk-addon-mp3-r201.patch.gz
771237ba6d42ab62d914f2702234b23fd0bc8c22f2aa33b0e745c9170163c8046f6d48ecb299faab3d6fb397f1aa046421083c3cc88510c9779861c522f357dd 10-musl-mutex-init.patch
0fae11b42894ab3d405bc50e9275b9084712b482fbf9b4259ea938667fc5cbe413655f3ff83da0f607151bb2b6e49c2f741b5ada6944dbb478f076ef8d86380a 20-musl-astmm-fix.patch
diff --git a/main/atop/APKBUILD b/main/atop/APKBUILD
index 717ccf9b58..69e6231a32 100644
--- a/main/atop/APKBUILD
+++ b/main/atop/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=atop
-pkgver=2.5.0
+pkgver=2.6.0
pkgrel=0
pkgdesc="Resource-specific view of processes"
url="https://www.atoptool.nl/"
@@ -9,9 +9,9 @@ license="GPL-2.0-or-later"
makedepends="zlib-dev ncurses-dev linux-headers"
subpackages="$pkgname-doc"
source="https://www.atoptool.nl/download/atop-$pkgver.tar.gz
- atop-bb-compat.patch
atop-daily-bb.patch
atop-include-macros.patch
+ fix-limits-on-ppc64le.patch
atop.initd
"
options="suid"
@@ -45,8 +45,8 @@ package() {
}
-sha512sums="675bbd902d8fe584b1ff47c275ee06d7bfe9127fadf79825ca64bbb6bcb6c34cab485e0686854d805bbdfaf69ebb40d790f7cc00c788544bff73b49c3d24dc08 atop-2.5.0.tar.gz
-165e5f17f1a752f8663a774d72476eac5693f93922b32fa198f09233ca6dfde2d6c63b10c31d0388ac9f10d210e7067787f30ef25e0ef9419a1520486f290b15 atop-bb-compat.patch
+sha512sums="8d4e2ae56a63738fc615f294d1f4e27cd9eab20acaf5d36c82d87390f96d38cf28cab0a00507459c3ce6e535294a442c4546e0cf732bad253cb518a14cdf5e88 atop-2.6.0.tar.gz
664225450074962aac0e13484c9b2feaf08620bbe1e0f9c5dc1b02f1ecd315224cd04df53134f2d107210fc9223a64d8885ae70d33d0663c2335fa6d46f6ddfd atop-daily-bb.patch
f30c9e6051332af8c8cafcd881f89a0e2d2a8e1d84eee8ac0c8c6b58f3ae3431fcf9c40dea6d03e271f8969802de449d33b4323c13045bdb38a539732c81a8b6 atop-include-macros.patch
+87cc78832774299227d435643551d099c3d88babb13049fe71e170e1220204a26be9ab570a59eccc90c9cb4faabd371e1c031063c70cb20a0c4620566c906425 fix-limits-on-ppc64le.patch
172c9d367b936427ccbbbd1140c7808ec8ffe3194b3557ba024820dac8fa68c9919f7dc34d332e91283fde64d731db7bdbfee3c2d6caad3cd291e0f1c227cb03 atop.initd"
diff --git a/main/atop/atop-bb-compat.patch b/main/atop/atop-bb-compat.patch
deleted file mode 100644
index 015f06be6e..0000000000
--- a/main/atop/atop-bb-compat.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/atop.daily b/atop.daily
-index c72214c..ac4b3b7 100755
---- a/atop.daily
-+++ b/atop.daily
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
diff --git a/main/atop/fix-limits-on-ppc64le.patch b/main/atop/fix-limits-on-ppc64le.patch
new file mode 100644
index 0000000000..82e3547d91
--- /dev/null
+++ b/main/atop/fix-limits-on-ppc64le.patch
@@ -0,0 +1,10 @@
+--- a/photosyst.c 2020-12-25 13:13:46.569591017 +0000
++++ b/photosyst.c 2020-12-25 13:13:52.399619155 +0000
+@@ -165,6 +165,7 @@
+ #include <dirent.h>
+ #include <sys/ioctl.h>
+ #include <sys/sysmacros.h>
++#include <limits.h>
+
+ #define SCALINGMAXCPU 8 // threshold for scaling info per CPU
+
diff --git a/main/audit/APKBUILD b/main/audit/APKBUILD
index 1304fb33a1..b99bc5a5b4 100644
--- a/main/audit/APKBUILD
+++ b/main/audit/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Tycho Andersen <tycho@docker.com>
pkgname=audit
pkgver=2.8.5
-pkgrel=2
+pkgrel=3
pkgdesc="User space tools for 2.6 kernel auditing"
url="https://people.redhat.com/sgrubb/audit/"
arch="all"
@@ -43,6 +43,8 @@ build() {
--localstatedir=/var \
--disable-zos-remote \
--enable-shared=audit \
+ --with-arm \
+ --with-aarch64 \
$WITHOUT
make
}
diff --git a/main/autoconf-archive/APKBUILD b/main/autoconf-archive/APKBUILD
index 0ac18c6e48..b4d85808be 100644
--- a/main/autoconf-archive/APKBUILD
+++ b/main/autoconf-archive/APKBUILD
@@ -1,7 +1,7 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com>
pkgname=autoconf-archive
-pkgver=2019.01.06
+pkgver=2021.02.19
pkgrel=0
pkgdesc="Collection of re-usable GNU Autoconf macros"
url="https://www.gnu.org/software/autoconf-archive"
@@ -27,4 +27,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="14bf8d0bf8be4a4dc078677de1977e496d4d9cf095bc897c174e331311b722cd3a34054e74c2146fff4b5c84269463e6a6fc61907d77d1c51bb221c8fb124fcb autoconf-archive-2019.01.06.tar.xz"
+sha512sums="a968c355c3cf66d74dc5b452141afbdf763e84a6c43b12c25da9a08482910d6d57ba3952aaf270d8cd5fd8b9d2dadf2d7d943ae2e1b067d68b71d2738d881aa0 autoconf-archive-2021.02.19.tar.xz"
diff --git a/main/autoconf/APKBUILD b/main/autoconf/APKBUILD
index 26f54d9601..28e27f86a1 100644
--- a/main/autoconf/APKBUILD
+++ b/main/autoconf/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=autoconf
pkgver=2.69
-pkgrel=2
+pkgrel=3
pkgdesc="A GNU tool for automatically configuring source code"
arch="noarch"
license="GPL-2.0-or-later"
diff --git a/main/avahi-ui/APKBUILD b/main/avahi-ui/APKBUILD
index 43f296763e..75e6acf5ca 100644
--- a/main/avahi-ui/APKBUILD
+++ b/main/avahi-ui/APKBUILD
@@ -1,22 +1,22 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=avahi-ui
-pkgver=0.7
-pkgrel=4
+pkgver=0.8
+pkgrel=0
pkgdesc="Gtk user interface library for Avahi"
-url="http://www.avahi.org/"
+url="https://www.avahi.org/"
arch="all"
license="LGPL-2.0-or-later"
depends_dev="gdbm-dev"
-makedepends="$depends_dev py3-gobject3-dev py3-dbus-dev intltool
+makedepends="$depends_dev py3-gobject3-dev py3-dbus-dev intltool libevent-dev
gobject-introspection-dev expat-dev libdaemon-dev glib-dev dbus-dev
libcap-dev python3-dev autoconf automake libtool avahi-dev gtk+3.0-dev"
subpackages="$pkgname-dev $pkgname-tools $pkgname-gtk3"
source="http://www.avahi.org/download/avahi-$pkgver.tar.gz
system-avahi.patch
gnome-nettool.png"
-
_subdirs="avahi-ui avahi-python"
builddir="$srcdir"/avahi-$pkgver
+
prepare() {
default_prepare
autoreconf -vif
@@ -24,6 +24,7 @@ prepare() {
build() {
# we dont build autoipd since dhcpcd does same job
+ LDFLAGS="$LDFLAGS -lintl" \
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,6 +34,7 @@ build() {
--disable-autoipd \
--disable-qt3 \
--disable-qt4 \
+ --disable-qt5 \
--disable-gtk \
--enable-gtk3 \
--disable-mono \
@@ -51,6 +53,10 @@ build() {
done
}
+check() {
+ make check
+}
+
package() {
make install-pkgconfigDATA DESTDIR="$pkgdir" \
pkgconfig_DATA="avahi-ui-gtk3.pc"
@@ -80,6 +86,6 @@ gtk3() {
"$subpkgdir"/usr/lib/
}
-sha512sums="bae5a1e9204aca90b90e7fd223d19e809e3514d03ba5fa2da1e55bf1d72d3d3b98567f357900c36393613dc17dc98e15ff3ebf0f226f2f6b9766e592452a6ce7 avahi-0.7.tar.gz
+sha512sums="c6ba76feb6e92f70289f94b3bf12e5f5c66c11628ce0aeb3cadfb72c13a5d1a9bd56d71bdf3072627a76cd103b9b056d9131aa49ffe11fa334c24ab3b596c7de avahi-0.8.tar.gz
99723e66889601044ac5ca919e79aa328083cb377bb3d270f3e8d2baee27505f967949f72faa0424756e5f18b1359fd7f7fb30636861d47455ff7b92ed48bcfa system-avahi.patch
d8e92fcdd82759f8de536ebfa356fe208c27b2d998ce5bb51d585dffc163dc16228be4a7108644fe1a11defbe750244bc8105a430b1397297cdef4cb83ab0db5 gnome-nettool.png"
diff --git a/main/avahi/APKBUILD b/main/avahi/APKBUILD
index 421f52284e..4eaa0da7ad 100644
--- a/main/avahi/APKBUILD
+++ b/main/avahi/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=avahi
pkgver=0.8
-pkgrel=2
-pkgdesc="A multicast/unicast DNS-SD framework"
+pkgrel=3
+pkgdesc="multicast/unicast DNS-SD framework"
url="https://www.avahi.org/"
arch="all"
license="LGPL-2.0-or-later"
@@ -54,6 +54,7 @@ build() {
--enable-compat-libdns_sd \
--enable-compat-howl \
--disable-python \
+ --with-dbus-sys=/usr/share/dbus-1/system.d \
--with-distro="gentoo"
make
}
diff --git a/main/avfs/APKBUILD b/main/avfs/APKBUILD
deleted file mode 100644
index 0560f39566..0000000000
--- a/main/avfs/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Contributor: V.Krishn <vkrishn4@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=avfs
-pkgver=1.1.3
-pkgrel=0
-pkgdesc="A Virtual File System for looking into archives"
-url="http://avf.sourceforge.net/"
-arch="all"
-license="GPL-2.0-or-later"
-depends="bash"
-makedepends="zlib-dev bzip2-dev fuse-dev zstd-dev xz-dev"
-subpackages="$pkgname-dev"
-source="https://downloads.sourceforge.net/project/avf/avfs/$pkgver/avfs-$pkgver.tar.bz2
- fix-PATH_MAX.patch
- "
-
-build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --enable-fuse \
- --enable-library \
- --with-system-zlib \
- --with-system-bzlib \
- --with-xz \
- --with-zstd \
- --prefix=/usr \
- --disable-static
- make
-}
-
-check() {
- make check
-}
-
-package() {
- make DESTDIR="$pkgdir" install
-}
-
-sha512sums="8e87655cbdb64f0cbbcc399142957ea9e04a998953cc64def9c8bb338b46abffc85a35e09b5fa52bb9ddcf56e27c4f62503050d32c8201eaad61c54e22bdd005 avfs-1.1.3.tar.bz2
-281d36f65652a265781e305647a4c1c8f03b851ba458a0b7d9f36119f5489f3b16337019da2b8521695c9bb5cee7ee01ef0a040453c27e1f82f51d858f4940b5 fix-PATH_MAX.patch"
diff --git a/main/avfs/fix-PATH_MAX.patch b/main/avfs/fix-PATH_MAX.patch
deleted file mode 100644
index 36cdc4acac..0000000000
--- a/main/avfs/fix-PATH_MAX.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream: No (it is in sourceforge)
-Reason: Fixes compilation with musl libc
-
-diff --git a/modules/urar.c b/modules/urar.c
-index 206d2af..83c4660 100644
---- a/modules/urar.c
-+++ b/modules/urar.c
-@@ -16,6 +16,7 @@
- #include "version.h"
-
- #include <fcntl.h>
-+#include <limits.h>
- #include <unistd.h>
-
- #define DOS_DIR_SEP_CHAR '\\'
-
diff --git a/main/awall/APKBUILD b/main/awall/APKBUILD
index f24a644703..1d6763ace2 100644
--- a/main/awall/APKBUILD
+++ b/main/awall/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
pkgname=awall
-pkgver=1.8.1
+pkgver=1.8.2
pkgrel=0
pkgdesc="Alpine Wall"
url="https://gitlab.alpinelinux.org/alpine/awall"
@@ -51,6 +51,6 @@ policies() {
install -D "$srcdir"/setup-firewall "$subpkgdir"/usr/sbin/setup-firewall
}
-sha512sums="d2e8063218ab6a0181c617fd1c44c96a326b54b15bb2c42714a500e6273660bbb1804a8f40d8f1d4138d3902a98c7f8930b441888d5e934042423c7f4277f800 awall-v1.8.1.tar.bz2
+sha512sums="40bb09d81152618be65e5b6c907b0b49a9e7ebcdf7d940d029450eae5cf51ad02aca4ba9208f89919b079ff7048d6f7cced26a27f579c27d5fbc3a27bde39b15 awall-v1.8.2.tar.bz2
e83ea3281c298092530e45fa5b62f6f85b9e5109b11e109799465ea832608294c7d9c4c3f5b0f321dfc0e82040daf3a17d066e9dea65cb0dbae2c453ea9e62cd awall-init
1cd4b7fa5fc6c9ac6667dff5cc00d96a3cc42aaccafe3c5562d3dcfd9f22ddec9cfe5a9339fee8001b67ccb8e8b81c9417f39a461e5052af9bf74a2753559bf7 setup-firewall"
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index dc0ee7c37a..d19ece0448 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.6.6
-pkgrel=0
+pkgver=9.6.7
+pkgrel=1
pkgdesc="Enterprise ready, network based backup program"
url="https://www.bacula.org"
arch="all"
@@ -159,6 +159,7 @@ libs() {
client_openrc() {
pkgdesc="Bacula client init script"
+ install_if="openrc $pkgname-client=$pkgver-r$pkgrel"
install -D -m755 "$pkgdir"/etc/init.d/$pkgname-fd \
"$subpkgdir"/etc/init.d/$pkgname-fd
}
@@ -174,7 +175,7 @@ client() {
install -d -o $pkgname -g $pkgname "$subpkgdir"/$_bworkdir
}
-sha512sums="1b669bbf1e54f40e0426603601a4751c42101985de901f951a68add7644971d48615b3089c65fafd444c762c3d82b67cafdcae9636e8a19af8fd94ae631c315a bacula-9.6.6.tar.gz
+sha512sums="27551faa2e4b13c6c2b9a2500f1253dfa5ee84929013491a7bf512d965d655c5af78b08201090474bc9b29827ca0a5c1c5a23a55712a1f739f37de75449cfd4d bacula-9.6.7.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 e9f302e29a..41e22b9c9f 100644
--- a/main/bash-completion/APKBUILD
+++ b/main/bash-completion/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Lucas Ramage <ramage.lucas@openmailbox.org>
+# Maintainer: Lucas Ramage <ramage.lucas@protonmail.com>
pkgname=bash-completion
pkgver=2.11
-pkgrel=1
+pkgrel=2
pkgdesc="Command-line tab-completion for bash"
options="!check" # 7 Tests fail
url="https://github.com/scop/bash-completion"
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index 78f1e38134..131eed39a9 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.18
+pkgver=5.1.4
_patchlevel=${pkgver##*.}
_myver=${pkgver%.*}
_patchbase=${_myver/./}
@@ -17,7 +17,6 @@ install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc"
source="https://ftp.gnu.org/gnu/bash/bash-$_myver.tar.gz
bash-noinfo.patch
- fix-jobs.patch
"
# generate url's to patches. note: no forks allowed!
_i=1
@@ -91,24 +90,9 @@ dev() {
mv "$pkgdir"/usr/lib/$pkgname/Makefile* "$subpkgdir"/usr/lib/$pkgname
}
-sha512sums="bb4519f06e278f271d08722b531e49d2e842cc3e0b02a6b3eee422e2efcb5b6226111af43f5e5eae56beb85ac8bfebcd6a4aacbabb8f609e529aa4d571890864 bash-5.0.tar.gz
+sha512sums="c44a0ce381469219548a3a27589af3fea4f22eda1ca4e9434b59fc16da81b471c29ce18e31590e0860a6a251a664b68c2b45e3a17d22cfc02799ffd9a208390c bash-5.1.tar.gz
9d8845491d0fe335bdd8e9a2bd98bda54bfed2ae3c35b2196c6d5a38bdf96c4d97572ba7d6b19ab605ef4e8f001f64cf3312f87dedebb9e37a95ad2c44e33cdb bash-noinfo.patch
-79473c41e620d78d25139b56c37d18adac5c03dc28939f218729dfcd3558d8cbac5e83db814ffd27aa833cd3e55f81aad26aaf62af3688c927d8ac2a4172eaa4 fix-jobs.patch
-e3bf036287d3be1f3e91755678c04c9a8e1b4a98e34e181871dfaeb13987dda18c31a44db3f3829d91a185ba4414b9c0229f2a15f6e8a951cbc6c1054252bfdd bash50-001
-59b1cfa1be1029ada53c63fe651d51451ead5523c50c115e0eada07e34e641c693ed728366986acb431f96fdc61818efd3f8cd168ce416001edc62602e5f28dd bash50-002
-520b5cc0b7aeea6cd8b7471b553d8979996f3627a3e5c8889023562dadc82475be243aca2ec608217b78400a1dceb134b877d3ded926e581445234f1b69409e6 bash50-003
-cbf51bb242edf36289bd483b47c9451132c12f341f494212c0e5d969cd06a3c1c4d121295f3bacb1d7d5e56f789258ba9f54c4cfb5760ed3c70ec1f49f25c719 bash50-004
-4d3e6f337a76b9ff1887c4c6e4e4352885779504f3c975b8d6fa587962f01e8adbd843b5341c1fc1d11152cf465f2982eebd9dc6e1384f319157d29740d510da bash50-005
-71df829a3a3927a363ad961de8af8db898ea8b0ccf604c5f1326fe4646d0d50b3c7038ee473c225fc10d26c2dc1f711d66b74d003bb0445d36a8a70c49e056e0 bash50-006
-467d377836c53d188cda39de550ce1e00b58895a6646c4da3535e74e599978558a92d8e7bf7c59c988159468fbce04f3a0dbf62cbded28472272f1b9811786e8 bash50-007
-110fef44c1a26819ad8926ce00bd5378e99275763db4b0e9cfd125ba1ab7eb9f93abf912efb9841fa2ac59c380995e477683afc8cf6bf00367a9af7ae371e7f4 bash50-008
-6b770dbd4ca1175f9b958931b1e725d96626a24fb270bac5414d1679dde05276c87654815e9957d6932c515e8792caf8a5f0e9f2dc108bdd041d8024cf75a833 bash50-009
-8ca2cea0264bc0401414207fd8752d4d6eda64be3bb10fdc22529fa2bcedb84e6ab257ba2badc7078ece7f2ae1e2964635926f227eea7aed58166e82871322c2 bash50-010
-05833d6c85f3795a9c100246335f39155c1b5d190e073bf382269c2bbceb13a2de3f85dbe1dd5d4c7824fcca481febe3bdbb4c555e1f2de86bec05fcf6f5871e bash50-011
-24d67358eec07cc4cd0457ec0c296567558f20bf713b917fc8a8e5095a83f1c5db880bb863d483ca0c9e003972ac5f56596a2eb10c26c82bf6326d0475784e7e bash50-012
-38fff9856c2259fbba607aacee027dd61e8733c6e5f476b7491bc43755fb5a63e82372f9f18663ec81e7480f0738b296271c948e1932e851f68f53cf3a1935b5 bash50-013
-e8f65be24b425ecaf66672eb4271e0efac2f495f882aeb559d60b52359a468b51852ed7aeeea0ab77cf648a48c9d37f2a00e263d06d29e9fa75b67a648399d91 bash50-014
-3a1a552d1f03dec9ed41be8d8c319fb3cbd01df9978ab25a7b37322913014beca6703980f342ea908250b666d72db95402d7b8219ffdd3df717acb36ed4b72b9 bash50-015
-dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa bash50-016
-d4a4b2746a106a7e78f7df2467cfd4ca486ab36b3e6e97eb9d47ede728033b1246bc1b60edc271cdb49df998af196619b09e598c0da1b425f05455237e256b65 bash50-017
-cfbad36b1805ad76cb21d9136843171d794e57383318a014522e2d35905cf262d6721615f0a79972cacc45152de636977c957cbbad08ccb52f96de40b09bba5c bash50-018"
+1cd86805a2639614372aec29a710bc456e330abcbbaa0867820c94f714a1fa5fb5c1b18aa2c10263ae0bce9dad7579c7af2f732282315c1c34bfd6a90777bfd2 bash51-001
+923e7822a9629645347d3aea0058fb5e2d52223507159a62369309f264612df44a84931c19e0ccb3852e98ce672dfbd454477090b4041b5a0de477c94eb61088 bash51-002
+01e952dcfdae58624723d64912ea3444eed2fdcd266ba1a929b95ec3abd70f914bf400607c3f7bb7a94ac2925f794f91f37c1929d5bb987de2ba7f60a19cb8bd bash51-003
+10ff24cd91a2cd88818bfa7218050843af6b409e43fcca89f5ec70d8266020c6c2a55132426271f165cd0f154f49eb0f8ec2761b80fc066c921b83120bb543ce bash51-004"
diff --git a/main/bash/fix-jobs.patch b/main/bash/fix-jobs.patch
deleted file mode 100644
index ddb9d4659a..0000000000
--- a/main/bash/fix-jobs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/jobs.c b/jobs.c
-index cef3c79..bf99266 100644
---- a/jobs.c
-+++ b/jobs.c
-@@ -4166,10 +4166,8 @@ initialize_job_control (force)
- if (js.c_childmax < 0)
- js.c_childmax = DEFAULT_CHILD_MAX;
-
--#if 0
- if (js.c_childmax > MAX_CHILD_MAX)
- js.c_childmax = MAX_CHILD_MAX;
--#endif
-
- return job_control;
- }
-@@ -4547,10 +4545,8 @@ mark_dead_jobs_as_notified (force)
- if (js.c_childmax < 0)
- js.c_childmax = DEFAULT_CHILD_MAX;
-
--#if 0
- if (js.c_childmax > MAX_CHILD_MAX)
- js.c_childmax = MAX_CHILD_MAX;
--#endif
-
- /* Don't do anything if the number of dead processes is less than CHILD_MAX
- and we're not forcing a cleanup. */
diff --git a/main/batctl/APKBUILD b/main/batctl/APKBUILD
new file mode 100644
index 0000000000..303d2cfbca
--- /dev/null
+++ b/main/batctl/APKBUILD
@@ -0,0 +1,23 @@
+# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
+pkgname=batctl
+pkgver=2021.0
+pkgrel=0
+pkgdesc="B.A.T.M.A.N. advanced control and management tool"
+url="https://www.open-mesh.org/"
+arch="all"
+license="GPL-2"
+depends_dev="libnl3-dev linux-headers"
+makedepends="$depends_dev"
+subpackages="$pkgname-doc"
+source="https://downloads.open-mesh.org/batman/releases/batman-adv-$pkgver/batctl-$pkgver.tar.gz"
+options="!check" # No test suite.
+
+build() {
+ make PREFIX=/usr
+}
+
+package() {
+ make PREFIX=/usr DESTDIR="$pkgdir" install
+}
+
+sha512sums="87a773667377826d2d7fcdc16d2b34f61e3d02ed8303617bf33f5ef9d5a9c46cfe6bfe560ff8899c45290ce3e8581ddf798991590f48ba3e70b2e0e07f7a8e69 batctl-2021.0.tar.gz"
diff --git a/main/bctoolbox/APKBUILD b/main/bctoolbox/APKBUILD
index 2757c4834e..a37d147196 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.4.9
+pkgver=4.4.32
pkgrel=0
pkgdesc="Utilities library used by Belledonne Communications softwares like belle-sip, mediastreamer2 and linphone"
url="https://github.com/BelledonneCommunications/bctoolbox"
@@ -11,7 +11,8 @@ options="!check" # bcunit not available
makedepends="cmake mbedtls-dev"
subpackages="$pkgname-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/BelledonneCommunications/bctoolbox/archive/$pkgver.tar.gz
- cmake-bcunit-fix.patch"
+ cmake-bcunit-fix.patch
+ cmake-lib-version-fix.patch"
build() {
cmake \
@@ -46,5 +47,6 @@ dev() {
rmdir "$pkgdir"/usr/share
}
-sha512sums="1b67330e0aa3cb97f58c96b023c197d1d97e1b82d7b0dd4297697745708b0e069bf45e849ebf7dbf154ea4a3cfe3b1d260f09353da62f8d66f21dea1520abe82 bctoolbox-4.4.9.tar.gz
-466d2a7aa33952c8086c698030af0addc79373aa31104cbe6133d352682439ae5c30055ea4f162cc9b6b9fc54bf3dea0ddcff78e0042e7ce43833d82b9487116 cmake-bcunit-fix.patch"
+sha512sums="6e5703c5010064a28bb2950ae3f3395b602bb40b55b7a8ad0d2b8004679375f70d8c7f755844f91db8e305cf0e2120e485b833c68e2fb6db38e8556ccd6e245d bctoolbox-4.4.32.tar.gz
+466d2a7aa33952c8086c698030af0addc79373aa31104cbe6133d352682439ae5c30055ea4f162cc9b6b9fc54bf3dea0ddcff78e0042e7ce43833d82b9487116 cmake-bcunit-fix.patch
+ee9ae2db8a2a0be0e70e1e017747bbb498f6fc2e64c5e0283343bec91d0b849db2d88f185ba0c8e67a3d654c13ce56615d8db14a0b78b3aae127fa9343877cad cmake-lib-version-fix.patch"
diff --git a/main/bctoolbox/cmake-lib-version-fix.patch b/main/bctoolbox/cmake-lib-version-fix.patch
new file mode 100644
index 0000000000..f2e88c34b1
--- /dev/null
+++ b/main/bctoolbox/cmake-lib-version-fix.patch
@@ -0,0 +1,34 @@
+diff --git a/cmake/BcToolboxCMakeUtils.cmake b/cmake/BcToolboxCMakeUtils.cmake
+index fd4894e..da8daf1 100644
+--- a/cmake/BcToolboxCMakeUtils.cmake
++++ b/cmake/BcToolboxCMakeUtils.cmake
+@@ -147,29 +147,7 @@ function(bc_parse_full_version version major minor patch)
+ endfunction()
+
+ function(bc_compute_lib_version OUTPUT_VERSION default_version)
+- find_program(GIT_EXECUTABLE git NAMES Git CMAKE_FIND_ROOT_PATH_BOTH)
+- if(GIT_EXECUTABLE)
+- execute_process(
+- COMMAND "${GIT_EXECUTABLE}" "describe"
+- OUTPUT_VARIABLE GIT_DESCRIBE_VERSION
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- ERROR_QUIET
+- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+- )
+-
+- # parse git describe version
+- if (NOT (GIT_DESCRIBE_VERSION MATCHES "^([0-9]+)[.]([0-9]+)[.]([0-9]+)(-alpha|-beta)?(-[0-9]+)?(-g[0-9a-f]+)?$"))
+- message(FATAL_ERROR "invalid git describe version: '${GIT_DESCRIBE_VERSION}'")
+- endif()
+- set(version_major ${CMAKE_MATCH_1})
+- set(version_minor ${CMAKE_MATCH_2})
+- set(version_patch ${CMAKE_MATCH_3})
+-
+- # format lib version
+- set(${OUTPUT_VERSION} "${version_major}.${version_minor}.${version_patch}" CACHE STRING "")
+- else()
+ set(${OUTPUT_VERSION} "${default_version}" CACHE STRING "")
+- endif()
+ endfunction()
+
+ function(bc_compute_full_version OUTPUT_VERSION)
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index a26b280e55..f675a74915 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -1,11 +1,11 @@
# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Contributor: ungleich <alpinelinux@ungleich.ch>
# Maintainer:
pkgname=bind
-pkgver=9.16.8
+pkgver=9.16.11
_ver=${pkgver%_p*}
_p=${pkgver#*_p}
_major=${pkgver%%.*}
@@ -142,7 +142,8 @@ build() {
--enable-linux-caps \
--enable-shared \
--enable-static \
- --disable-isc-spnego
+ --disable-isc-spnego \
+ --disable-backtrace
make
}
@@ -253,7 +254,7 @@ _gpgfingerprints="
BE0E 9748 B718 253A 28BB 89FF F1B1 1BF0 5CF0 2E57
"
-sha512sums="803af842b4f83c16556036f3a2a52b4aeab4781bafb35385b786a3331cf17ef6148c23928f6903fd371337ba92870d7a8548f5d178b805d160d0af34af45fee7 bind-9.16.8.tar.xz
+sha512sums="5ed632df7c74f5e6693db9b378450ea3073b8002e9924df1d0465f8b8edb933df3a853d3965a290a0477a67ca2bfa79f679d7e344db08a65462860c58d04dc1b bind-9.16.11.tar.xz
2b32d1e7f62cd1e01bb4fdd92d15460bc14761b933d5acc463a91f5ecd4773d7477c757c5dd2738e8e433693592cf3f623ffc142241861c91848f01aa84640d6 bind.plugindir.patch
7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch
53db80f7ee4902f42fb1d0bc959242bcb6f20d95256bda99ce2c206af8b4703c7f72bb26d026c633f70451b84a37c3946b210951e34dd5d6620b181cd0183de4 named.initd
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index b6eef9e42d..b7de31e0c1 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -9,7 +9,7 @@ makedepends_host="zlib-dev"
makedepends="$makedepends_build $makedepends_host"
arch="all"
license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-gold"
+subpackages="$pkgname-dev $pkgname-doc"
source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
binutils-ld-fix-static-linking.patch
gold-mips.patch
@@ -18,6 +18,10 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
"
builddir="$srcdir/$pkgname-$pkgver"
+if [ "$CHOST" = "$CBUILD" -a "$CBUILD" = "$CTARGET" ]; then
+ subpackages="$subpackages $pkgname-gold"
+fi
+
if [ "$CHOST" != "$CTARGET" ]; then
pkgname="$pkgname-$CTARGET_ARCH"
subpackages=""
@@ -37,12 +41,17 @@ build() {
local _sysroot=/
local _cross_configure="--enable-install-libiberty --enable-shared"
local _arch_configure=""
+ local _gold_configure="--disable-gold"
if [ "$CHOST" != "$CTARGET" ]; then
_sysroot="$CBUILDROOT"
_cross_configure="--disable-install-libiberty"
fi
+ if [ "$CHOST" = "$CBUILD" -a "$CBUILD" = "$CTARGET" ]; then
+ _gold_configure="--enable-gold"
+ fi
+
if [ "$CTARGET_ARCH" = "x86_64" ]; then
_arch_configure="--enable-targets=x86_64-pep"
fi
@@ -63,7 +72,7 @@ build() {
--infodir=/usr/share/info \
--disable-multilib \
--enable-ld=default \
- --enable-gold=yes \
+ $_gold_configure \
--enable-64-bit-bfd \
--enable-plugins \
--enable-relro \
diff --git a/main/bison/APKBUILD b/main/bison/APKBUILD
index 38187fa058..9b4e7f7181 100644
--- a/main/bison/APKBUILD
+++ b/main/bison/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bison
-pkgver=3.7.3
+pkgver=3.7.5
pkgrel=0
pkgdesc="The GNU general-purpose parser generator"
arch="all"
@@ -41,4 +41,4 @@ package() {
rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
}
-sha512sums="34fe630749dc015f15a830ad13742c4b0b9163143a11e987c16954bee0451e819ec2fa7b43bd34c867e5ce72c758eb9070348d1d581c9435b9531a99caa46eed bison-3.7.3.tar.xz"
+sha512sums="98cdfaf114b8f8eb0927b29fe999dc9629336333d85bd2f87c4c558125500c44ee6fbfff453e3121c7e9e239a632f8c72e08c39be7dfb045361d35ec59d31811 bison-3.7.5.tar.xz"
diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD
index e919eb0f21..9dc35feb91 100644
--- a/main/bluez/APKBUILD
+++ b/main/bluez/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bluez
-pkgver=5.55
-pkgrel=1
+pkgver=5.56
+pkgrel=0
pkgdesc="Tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
arch="all"
@@ -16,7 +16,6 @@ subpackages="
$pkgname-dev
$pkgname-doc
$pkgname-libs
- $pkgname-bccmd
$pkgname-btmgmt
$pkgname-btmon
$pkgname-cups
@@ -38,6 +37,7 @@ source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz
disable-lock-test.patch
fix-endianness.patch
musl.patch
+ test-mesh-crypto.patch
"
case "$CARCH" in
@@ -49,6 +49,11 @@ esac
# 5.54-r0:
# - CVE-2020-0556
+prepare() {
+ default_prepare
+ autoreconf -vif
+}
+
build() {
./configure \
--build=$CBUILD \
@@ -63,7 +68,8 @@ build() {
--enable-deprecated \
--enable-hid2hci \
--enable-mesh \
- --enable-sixaxis
+ --enable-sixaxis \
+ --with-dbusconfdir=/usr/share
make
}
@@ -84,12 +90,6 @@ package() {
install -Dm755 test/simple-agent "$pkgdir"/usr/bin/bluez-simple-agent
}
-bccmd() {
- pkgdesc="Bluez utility for the CSR BCCMD interface"
- mkdir -p "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/bccmd "$subpkgdir"/usr/bin/
-}
-
btmgmt() {
pkgdesc="Bluez tool for the Bluetooth Management API"
install -Dm755 "$builddir"/tools/btmgmt "$subpkgdir"/usr/bin/btmgmt
@@ -154,7 +154,7 @@ zshcomp() {
amove usr/share/zsh/site-functions
}
-sha512sums="9423cb60d15a6f068838497a1eaea9f5a32d70c07191c313ba821a6919d6e0c436ada4f547cc5f2db5eacc0123429ad54851f57df2554f61fa293743ec14a033 bluez-5.55.tar.xz
+sha512sums="b320ee9d49a516f5cecb5fbc410ba42e9127f44ebcfb95647f68bd5d300147d0eaf633f8e8d0678631a2184ea3afae7b01b5f228157328874fa2a87832ed0ae1 bluez-5.56.tar.xz
fc43c78ed248ea412529eed5ae8bb47bacca9bf5b3b10de121ddd4e792c85893561a88be4aa2c6318106e5d2146a721445152d44fa60ca257ca0b4eb87318c1e bluetooth.initd
8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd
a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd
@@ -164,4 +164,5 @@ d5fd1c962bd846eaa6fff879bab85f753eb367d514f82d133b5d3242e1da989af5eddd942c60a87d
42ac04044a8c66e07487598b3a75ef52efc32999ebce4e7c63f6198e2f603f4a1442e74600e43a0938cb4f52d4db0298aa99050b18144b84990cda71748e9de5 004-Move-the-43xx-firmware-into-lib-firmware.patch
04c4889372c8e790bb338dde7ffa76dc32fcf7370025c71b9184fcf17fd01ade4a6613d84d648303af3bbc54043ad489f29fc0cd4679ec8c9029dcb846d7e026 disable-lock-test.patch
118d55183860f395fc4bdc93efffb13902ebf7388cad722b9061cd2860d404333e500af521741c3d92c0f8a161f6810348fbeb6682e49c372383f417aed8c76a fix-endianness.patch
-641e425333d269833eed624edec0e29cba04bb0ff6570f6afda178a164fc2bb77456fa88957fe49f36000d3601ac00bb7ba089400977c1577e9c226e74baa3d6 musl.patch"
+641e425333d269833eed624edec0e29cba04bb0ff6570f6afda178a164fc2bb77456fa88957fe49f36000d3601ac00bb7ba089400977c1577e9c226e74baa3d6 musl.patch
+9c57bb1abf1b4927441a2a25c3c2599b0da82850e6b945d09e824e25be7c7efa99e54999cf5b799a1093303202badf08833cc4ccb36203901dfa516031ea8eb0 test-mesh-crypto.patch"
diff --git a/main/bluez/test-mesh-crypto.patch b/main/bluez/test-mesh-crypto.patch
new file mode 100644
index 0000000000..90fc293311
--- /dev/null
+++ b/main/bluez/test-mesh-crypto.patch
@@ -0,0 +1,14 @@
+Requires kernel option that might not be enabled on the builder
+https://bugzilla.kernel.org/show_bug.cgi?id=206815
+diff --git a/Makefile.am b/Makefile.am
+index ff0df21..a384c31 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -539,7 +539,6 @@ unit_test_midi_LDADD = src/libshared-glib.la \
+ endif
+
+ if MESH
+-unit_tests += unit/test-mesh-crypto
+ unit_test_mesh_crypto_CPPFLAGS = $(ell_cflags)
+ unit_test_mesh_crypto_SOURCES = unit/test-mesh-crypto.c \
+ mesh/crypto.h ell/internal ell/ell.h
diff --git a/main/bonding/APKBUILD b/main/bonding/APKBUILD
index 4fcf23ce2c..39d2643009 100644
--- a/main/bonding/APKBUILD
+++ b/main/bonding/APKBUILD
@@ -5,7 +5,7 @@
pkgname=bonding
pkgver=2.6
-pkgrel=4
+pkgrel=5
pkgdesc="Scripts for network interface bonding"
url="https://wiki.alpinelinux.org/wiki/Bonding"
arch="noarch"
@@ -19,6 +19,6 @@ package() {
done
}
-sha512sums="88d0566242b172c60b66bd62ce1b5c9f01e5d3b79a2caa7eea8f2ec0255158f449392a54348dd5c375d14f4d8fa6182333c2154582c7eab7f3e8f4a7adce900a bonding.pre-up
+sha512sums="de37ddcd56b512f7adda2bddf9c84618796e95c8bc23df8948452c892cd48eff7043d4f0f5ee068bcd634c11907f6859a6216a72d50cb6a4d2473a7a641c71f5 bonding.pre-up
5c81b2891c281df2df4c98a560f776b857e4b6b20ac733858683d87fb7b1ac57423f57003cfdcfac24c8257de31062c4596270e9482b8d35d517e29f2bac0951 bonding.up
c6b6f06d1c0a7be1022feb18cdcc55780cad2200ac0121f276527442becb7d75a7850b809ae9c6d5b914a1a03f791bd65c088f1289ce0e28b5a02bd86e3868de bonding.post-down"
diff --git a/main/bonding/bonding.pre-up b/main/bonding/bonding.pre-up
index 17f27070cc..6d26740b1d 100755
--- a/main/bonding/bonding.pre-up
+++ b/main/bonding/bonding.pre-up
@@ -120,7 +120,7 @@ setup_slaves()
# Are there anything to do ?
# Option slaves deprecated, replaced by bond-slaves, but still supported for backward compatibility.
-IF_BOND_SLAVES=${IF_BOND_SLAVES:-$IF_SLAVES}
+IF_BOND_SLAVES=${IF_BOND_MEMBERS:-${IF_BOND_SLAVES:-$IF_SLAVES}}
if [ "$IF_BOND_MASTER" ] ; then
BOND_MASTER="$IF_BOND_MASTER"
diff --git a/main/boost/boost-fiber-mips64-ftbfs.patch b/main/boost/boost-fiber-mips64-ftbfs.patch
deleted file mode 100644
index bde053ff7f..0000000000
--- a/main/boost/boost-fiber-mips64-ftbfs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Roughly equivalent to upstream 5f7cda29add367c5381775a314ec9f90e311457a.
-
---- a/boost/fiber/detail/cpu_relax.hpp
-+++ b/boost/fiber/detail/cpu_relax.hpp
-@@ -47,7 +47,7 @@ namespace detail {
- # else
- # define cpu_relax() asm volatile ("nop" ::: "memory");
- # endif
--#elif BOOST_ARCH_MIPS
-+#elif BOOST_ARCH_MIPS && (__mips_isa_rev > 1)
- # define cpu_relax() asm volatile ("pause" ::: "memory");
- #elif BOOST_ARCH_PPC
- // http://code.metager.de/source/xref/gnu/glibc/sysdeps/powerpc/sys/platform/ppc.h
diff --git a/main/boost/0001-revert-cease-dependence-on-range.patch b/main/boost1.75/0001-revert-cease-dependence-on-range.patch
index a6002074ab..a6002074ab 100644
--- a/main/boost/0001-revert-cease-dependence-on-range.patch
+++ b/main/boost1.75/0001-revert-cease-dependence-on-range.patch
diff --git a/main/boost/APKBUILD b/main/boost1.75/APKBUILD
index a0698bec35..cbf2709b3f 100644
--- a/main/boost/APKBUILD
+++ b/main/boost1.75/APKBUILD
@@ -1,23 +1,29 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=boost
-pkgver=1.72.0
+pkgname=boost1.75
+pkgver=1.75.0
_pkgver="${pkgver//./_}"
-pkgrel=6
+pkgrel=5
pkgdesc="Free peer-reviewed portable C++ source libraries"
url="https://www.boost.org/"
arch="all"
license="custom"
depends="$pkgname-libs"
-depends_dev="$pkgname linux-headers"
-makedepends="$depends_dev python3-dev>=3.8 flex bison bzip2-dev icu-dev xz-dev zlib-dev"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
+depends_dev="$pkgname linux-headers bzip2-dev icu-dev xz-dev zlib-dev"
+makedepends="$depends_dev python3-dev>=3.8 flex bison"
+subpackages="
+ $pkgname-static
+ $pkgname-dev
+ $pkgname-doc
+ boost-dev:_dev
+ "
source="https://dl.bintray.com/boostorg/release/$pkgver/source/boost_$_pkgver.tar.bz2
boost-1.57.0-python-abi_letters.patch
boost-1.57.0-python-libpython_dep.patch
0001-revert-cease-dependence-on-range.patch
- boost-fiber-mips64-ftbfs.patch
+ boost-context-mips-softfloat.patch
+ build-undefine-statx-syscall.patch
"
-builddir="$srcdir/${pkgname}_$_pkgver"
+builddir="$srcdir/boost_$_pkgver"
_enginedir="tools/build/src/engine"
_bjam="$builddir"/$_enginedir/b2
@@ -53,12 +59,19 @@ _libs="
unit_test_framework
wave
wserialization
+ json
+ nowide
"
for _lib in $_libs; do
subpackages="$subpackages $pkgname-${_lib}:_boostlib"
done; unset -v _lib
subpackages="$subpackages $pkgname-libs"
+# Claim the unversioned name, this must be removed once we switch our
+# boost to a new version
+provides="boost=$pkgver-r$pkgrel"
+replaces="boost"
+
_set_options() {
[ -n "$PY3_VERSION" ] || PY3_VERSION="$(_pyversion python3)"
@@ -93,7 +106,7 @@ prepare() {
cat > user-config.jam <<-__EOF__
using gcc : : $CC : <cxxflags>"$CXXFLAGS" <linkflags>"$LDFLAGS" ;
- using python : ${PY3_VERSION:+$PY3_VERSION }: /usr/bin/python3 : ${PY3_VERSION:+/usr/include/python${PY3_VERSION}${abiflags} }: : : : ${abiflags:+$abiflags };
+ using python : ${PY3_VERSION:+$PY3_VERSION }: /usr/bin/python3 : ${PY3_VERSION:+/usr/include/python${PY3_VERSION}$abiflags }: : : : ${abiflags:+$abiflags };
__EOF__
}
@@ -144,6 +157,11 @@ static() {
pkgdesc="Boost static libraries"
depends="$depends_static"
+ # Claim the unversioned name, this must be removed once we switch our
+ # boost to a new version
+ provides="boost-static=$pkgver-r$pkgrel"
+ replaces="boost-static"
+
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/lib*.a "$subpkgdir"/usr/lib/
}
@@ -153,6 +171,11 @@ _boostlib() {
pkgdesc="Boost $name shared library"
depends="$depends__boostlib"
+ # Claim the unversioned name, this must be removed once we switch our
+ # boost to a new version
+ provides="boost-$name=$pkgver-r$pkgrel"
+ replaces="boost-$name"
+
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/libboost_$name*.so.[0-9]* "$subpkgdir"/usr/lib/
}
@@ -160,6 +183,11 @@ _boostlib() {
libs() {
default_libs
+ # Claim the unversioned name, this must be removed once we switch our
+ # boost to a new version
+ provides="boost-libs=$pkgver-r$pkgrel"
+ replaces="boost-libs"
+
pkgdesc="Boost shared libraries"
depends="$depends_libs"
local _pkg; for _pkg in $origsubpackages; do
@@ -172,12 +200,28 @@ libs() {
rmdir "$pkgdir"/usr/lib >/dev/null 2>&1 || :
}
+_dev() {
+ # This makes boost-dev be a metapackage that depends on boostX.Y-dev
+ mkdir -p "$subpkgdir"
+ depends="$pkgname-dev=$pkgver-r$pkgrel"
+}
+
+doc() {
+ # Claim the unversioned name, this must be removed once we switch our
+ # boost to a new version
+ provides="boost-doc=$pkgver-r$pkgrel"
+ replaces="boost-doc"
+
+ default_doc
+}
+
_pyversion() {
"$1" -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))'
}
-sha512sums="63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6 boost_1_72_0.tar.bz2
+sha512sums="d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a boost_1_75_0.tar.bz2
d96d4d37394a31764ed817d0bc4a99cffa68a75ff1ecfd4417b9e1e5ae2c31a96ed24f948c6f2758ffdac01328d2402c4cf0d33a37107e4f5f721e636daebd66 boost-1.57.0-python-abi_letters.patch
132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02 boost-1.57.0-python-libpython_dep.patch
9b53d2fe2dddd592e43db03c26fadd6c07d4c45a980ae4c775b7a914346a3914f6e0c3ef42dad5e2ea4568afb86c9967e09444ff609cfba1e1d39f4980b22ad6 0001-revert-cease-dependence-on-range.patch
-054f475a3a89d550c374a0a80cda580adf5d12e75a44166c9cddf7247e603285c85b428c3c799f00cdd8e4af3fc690d9cef05320ac2fbf2a07dae9827d4bd647 boost-fiber-mips64-ftbfs.patch"
+1ace57c256017a99f84cdd32fedca0ade12b1666edf3c8e2465e6f01a95ee978b9eea010917787997d81ad7832f06dd25ff392d6a83cb12398e546d5b9eceadd boost-context-mips-softfloat.patch
+debb898a9d2295a4480a32bec69a77c6e8d5dc094b0be39df1f1afc3a0f610fe916c59be1304bc904ad74440f93a224e4b138c60a5f0253143c9eb5db973cd2b build-undefine-statx-syscall.patch"
diff --git a/main/boost/boost-1.57.0-python-abi_letters.patch b/main/boost1.75/boost-1.57.0-python-abi_letters.patch
index 7df3ee7047..7df3ee7047 100644
--- a/main/boost/boost-1.57.0-python-abi_letters.patch
+++ b/main/boost1.75/boost-1.57.0-python-abi_letters.patch
diff --git a/main/boost/boost-1.57.0-python-libpython_dep.patch b/main/boost1.75/boost-1.57.0-python-libpython_dep.patch
index 57bfc26774..57bfc26774 100644
--- a/main/boost/boost-1.57.0-python-libpython_dep.patch
+++ b/main/boost1.75/boost-1.57.0-python-libpython_dep.patch
diff --git a/main/boost1.75/boost-context-mips-softfloat.patch b/main/boost1.75/boost-context-mips-softfloat.patch
new file mode 100644
index 0000000000..38e2b52b09
--- /dev/null
+++ b/main/boost1.75/boost-context-mips-softfloat.patch
@@ -0,0 +1,72 @@
+diff -urN boost_1_72_0.orig/libs/context/src/asm/jump_mips64_n64_elf_gas.S boost_1_72_0/libs/context/src/asm/jump_mips64_n64_elf_gas.S
+--- boost_1_72_0.orig/libs/context/src/asm/jump_mips64_n64_elf_gas.S 2021-01-15 02:29:42.053471423 -0700
++++ boost_1_72_0/libs/context/src/asm/jump_mips64_n64_elf_gas.S 2021-01-15 02:31:15.297335652 -0700
+@@ -67,7 +67,7 @@
+ sd $ra, 144($sp) # save RA
+ sd $ra, 152($sp) # save RA as PC
+
+-
++#ifdef __mips_hard_float
+ s.d $f24, 0($sp) # save F24
+ s.d $f25, 8($sp) # save F25
+ s.d $f26, 16($sp) # save F26
+@@ -76,6 +76,7 @@
+ s.d $f29, 40($sp) # save F29
+ s.d $f30, 48($sp) # save F30
+ s.d $f31, 56($sp) # save F31
++#endif
+
+ # store SP (pointing to old context-data) in v0 as return
+ move $v0, $sp
+@@ -83,6 +84,7 @@
+ # get SP (pointing to new context-data) from a0 param
+ move $sp, $a0
+
++#ifdef __mips_hard_float
+ l.d $f24, 0($sp) # restore F24
+ l.d $f25, 8($sp) # restore F25
+ l.d $f26, 16($sp) # restore F26
+@@ -91,6 +93,7 @@
+ l.d $f29, 40($sp) # restore F29
+ l.d $f30, 48($sp) # restore F30
+ l.d $f31, 56($sp) # restore F31
++#endif
+
+ ld $s0, 64($sp) # restore S0
+ ld $s1, 72($sp) # restore S1
+diff -urN boost_1_72_0.orig/libs/context/src/asm/ontop_mips64_n64_elf_gas.S boost_1_72_0/libs/context/src/asm/ontop_mips64_n64_elf_gas.S
+--- boost_1_72_0.orig/libs/context/src/asm/ontop_mips64_n64_elf_gas.S 2021-01-15 02:29:42.056804776 -0700
++++ boost_1_72_0/libs/context/src/asm/ontop_mips64_n64_elf_gas.S 2021-01-15 02:31:48.294188377 -0700
+@@ -67,7 +67,7 @@
+ sd $ra, 144($sp) # save RA
+ sd $ra, 152($sp) # save RA as PC
+
+-
++#ifdef __mips_hard_float
+ s.d $f24, 0($sp) # save F24
+ s.d $f25, 8($sp) # save F25
+ s.d $f26, 16($sp) # save F26
+@@ -76,6 +76,7 @@
+ s.d $f29, 40($sp) # save F29
+ s.d $f30, 48($sp) # save F30
+ s.d $f31, 56($sp) # save F31
++#endif
+
+ # store SP (pointing to context-data) in t0
+ move $t0, $sp
+@@ -83,6 +84,7 @@
+ # restore SP (pointing to context-data) from a0
+ move $sp, $a0
+
++#ifdef __mips_hard_float
+ l.d $f24, 0($sp) # restore F24
+ l.d $f25, 8($sp) # restore F25
+ l.d $f26, 16($sp) # restore F26
+@@ -91,6 +93,7 @@
+ l.d $f29, 40($sp) # restore F29
+ l.d $f30, 48($sp) # restore F30
+ l.d $f31, 56($sp) # restore F31
++#endif
+
+ ld $s0, 64($sp) # restore S0
+ ld $s1, 72($sp) # restore S1
diff --git a/main/boost1.75/build-undefine-statx-syscall.patch b/main/boost1.75/build-undefine-statx-syscall.patch
new file mode 100644
index 0000000000..4b984f0b34
--- /dev/null
+++ b/main/boost1.75/build-undefine-statx-syscall.patch
@@ -0,0 +1,17 @@
+Description: The way the statx function is defined is broken, and does not fall
+back in case the syscall is not present, which is the case for mips64, which
+runs Linux 4.9.
+Upstream: rejected
+URL: https://github.com/boostorg/filesystem/issues/173
+diff --git a/libs/filesystem/build/Jamfile.v2 b/libs/filesystem/build/Jamfile.v2
+index 132641a32..76547eb92 100644
+--- a/libs/filesystem/build/Jamfile.v2
++++ b/libs/filesystem/build/Jamfile.v2
+@@ -54,7 +54,6 @@ project boost/filesystem
+ [ check-target-builds ../config//has_stat_st_birthtimensec "has stat::st_birthtimensec" : <define>BOOST_FILESYSTEM_HAS_STAT_ST_BIRTHTIMENSEC ]
+ [ check-target-builds ../config//has_stat_st_birthtimespec "has stat::st_birthtimespec" : <define>BOOST_FILESYSTEM_HAS_STAT_ST_BIRTHTIMESPEC ]
+ [ check-target-builds ../config//has_statx "has statx" : <define>BOOST_FILESYSTEM_HAS_STATX ]
+- [ check-target-builds ../config//has_statx_syscall "has statx syscall" : <define>BOOST_FILESYSTEM_HAS_STATX_SYSCALL ]
+ <conditional>@select-windows-crypto-api
+ : source-location ../src
+ : usage-requirements # pass these requirement to dependents (i.e. users)
diff --git a/main/botan/APKBUILD b/main/botan/APKBUILD
index 7e50c9fbfb..b7f005b11b 100644
--- a/main/botan/APKBUILD
+++ b/main/botan/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=botan
pkgver=2.11.0
-pkgrel=5
+pkgrel=6
pkgdesc="Crypto and TLS for C++11"
url="https://botan.randombit.net/"
arch="all"
diff --git a/main/brotli/APKBUILD b/main/brotli/APKBUILD
index ad1171fc67..21624e5b9c 100644
--- a/main/brotli/APKBUILD
+++ b/main/brotli/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: prspkt <prspkt@protonmail.com>
pkgname=brotli
pkgver=1.0.9
-pkgrel=2
+pkgrel=3
pkgdesc="Generic lossless compressor"
url="https://github.com/google/brotli"
arch="all"
license="MIT"
-makedepends_build="automake autoconf libtool"
+makedepends_build="cmake"
if [ -z "$BOOTSTRAP" ]; then
makedepends_host="python3-dev"
python="py3-$pkgname:py3"
@@ -26,23 +26,34 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/google/brotli/archive/v$pkgv
prepare() {
default_prepare
sed -i 's,/usr/bin/env bash,/bin/sh,' tests/*.sh
- ./bootstrap
}
build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- make
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake -B build \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=True \
+ -DBUILD_STATIC_LIBS=False \
+ -DCMAKE_BUILD_TYPE=None \
+ $CMAKE_CROSSOPTS .
+ make -C build
+ if [ -z "$BOOTSTRAP" ]; then
+ python3 setup.py build
+ fi
}
check() {
- make check
+ make -C build test
+ if [ -z "$BOOTSTRAP" ]; then
+ python3 setup.py check
+ fi
}
package() {
- make DESTDIR="$pkgdir" install
+ make -C build DESTDIR="$pkgdir" install
local man; for man in docs/*.?; do
install -D -m644 $man "$pkgdir"/usr/share/man/man${man##*.}/${man##*/}
@@ -51,7 +62,7 @@ package() {
py3() {
cd "$builddir"
- python3 setup.py install --prefix=/usr --root="$subpkgdir"
+ python3 setup.py install --prefix=/usr --root="$subpkgdir" --skip-build
}
sha512sums="b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5 brotli-1.0.9.tar.gz
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index 50803cf01f..506419da33 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.9
+pkgver=5.10.1
pkgrel=0
pkgdesc="BTRFS filesystem utilities"
url="https://btrfs.wiki.kernel.org"
@@ -75,4 +75,4 @@ extra() {
rmdir "$subpkgdir"/usr/lib
}
-sha512sums="38db047198ab0467d3fe235f7e8e1fd14ade00dd0b182588220c5f5e4b598efbdcd30a3d5d56cf0a0ed8a902d2374af0927eb7f3720cd761172c7291a2a65c94 btrfs-progs-v5.9.tar.xz"
+sha512sums="32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d btrfs-progs-v5.10.1.tar.xz"
diff --git a/main/bubblewrap/APKBUILD b/main/bubblewrap/APKBUILD
index 7f6231d7b7..4b36f6bd7e 100644
--- a/main/bubblewrap/APKBUILD
+++ b/main/bubblewrap/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=bubblewrap
pkgver=0.4.1
-pkgrel=0
+pkgrel=2
pkgdesc="Unprivileged sandboxing tool"
url="https://github.com/containers/bubblewrap"
arch="all"
@@ -10,9 +10,7 @@ license="LGPL-2.0-or-later"
options="!check suid" # Testsuite with suid requires sudo binary and some socket operations fail
makedepends="autoconf automake libcap-dev docbook-xsl"
subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
-source="bubblewrap-$pkgver.tar.gz::https://github.com/containers/bubblewrap/archive/v$pkgver.tar.gz
- realpath-workaround.patch
- "
+source="bubblewrap-$pkgver.tar.gz::https://github.com/containers/bubblewrap/archive/v$pkgver.tar.gz"
# secfixes:
# 0.4.1-r0:
@@ -31,7 +29,8 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--localstatedir=/var \
- --with-priv-mode=setuid
+ --with-priv-mode=none \
+ --enable-require-userns=yes
make
}
@@ -48,5 +47,4 @@ bashcomp() {
mv "$pkgdir"/usr/share/bash-completion/ "$subpkgdir"/usr/share/
}
-sha512sums="83e036e242503e1364b2d0052bba5127175891203c57bd22ba47a1b1e934fdca64ca620cd0e48c903fa2bc7cdcf92339b8a7fcb8716b54c2e28034b6d6f86adc bubblewrap-0.4.1.tar.gz
-7e8395aa7801263056b0c072194240f0ae1ee1a3b0acd874baf112a7b7b5e53ac5f688ece9099067bfc1e28e52e81f107964a3288a615cc1eedb1af5f82bbd8e realpath-workaround.patch"
+sha512sums="83e036e242503e1364b2d0052bba5127175891203c57bd22ba47a1b1e934fdca64ca620cd0e48c903fa2bc7cdcf92339b8a7fcb8716b54c2e28034b6d6f86adc bubblewrap-0.4.1.tar.gz"
diff --git a/main/bubblewrap/realpath-workaround.patch b/main/bubblewrap/realpath-workaround.patch
deleted file mode 100644
index 8474faf358..0000000000
--- a/main/bubblewrap/realpath-workaround.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Musl realpath() implementation currently depends on /proc which is
-not available when setting up pivot root. For the time being just
-fallback to a naive normalization algorithm originated from
-VoidLinux' xbps. If there was path that would have required advanced
-normalizing as provided by realpath() the following parse_mountinfo()
-will fail.
-
-
-diff --git bind-mount.c.orig bind-mount.c
-index 045fa0e..d05b540 100644
---- ./bind-mount.c.orig
-+++ ./bind-mount.c
-@@ -23,6 +23,28 @@
- #include "utils.h"
- #include "bind-mount.h"
-
-+#ifndef __GLIBC__
-+static char *
-+normpath(char *path)
-+{
-+ char *seg = NULL, *p = NULL;
-+
-+ for (p = path, seg = NULL; *p; p++) {
-+ if (strncmp(p, "/../", 4) == 0 || strncmp(p, "/..", 4) == 0) {
-+ memmove(seg ? seg : p, p+3, strlen(p+3) + 1);
-+ return normpath(path);
-+ } else if (strncmp(p, "/./", 3) == 0 || strncmp(p, "/.", 3) == 0) {
-+ memmove(p, p+2, strlen(p+2) + 1);
-+ } else if (strncmp(p, "//", 2) == 0 || strncmp(p, "/", 2) == 0) {
-+ memmove(p, p+1, strlen(p+1) + 1);
-+ }
-+ if (*p == '/')
-+ seg = p;
-+ }
-+ return path;
-+}
-+#endif
-+
- static char *
- skip_token (char *line, bool eat_whitespace)
- {
-@@ -397,7 +419,11 @@ bind_mount (int proc_fd,
- path, so to find it in the mount table we need to do that too. */
- resolved_dest = realpath (dest, NULL);
- if (resolved_dest == NULL)
-+#ifdef __GLIBC__
- return 2;
-+#else
-+ resolved_dest = normpath(strdup(dest));
-+#endif
-
- mount_tab = parse_mountinfo (proc_fd, resolved_dest);
- if (mount_tab[0].mountpoint == NULL)
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
deleted file mode 100644
index 69c55e1605..0000000000
--- a/main/busybox/0001-Revert-ash-jobs-Only-clear-gotsigchld-when-waiting-f.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-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-echo-do-not-assume-that-free-leaves-errno-unmodified.patch b/main/busybox/0001-echo-do-not-assume-that-free-leaves-errno-unmodified.patch
new file mode 100644
index 0000000000..ab445baedf
--- /dev/null
+++ b/main/busybox/0001-echo-do-not-assume-that-free-leaves-errno-unmodified.patch
@@ -0,0 +1,63 @@
+From ffd2a7e631ddf25ee7097fc64b45283f7f8910d3 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 21 Jan 2021 14:12:51 +0100
+Subject: [PATCH] echo: do not assume that free() leaves errno unmodified
+
+musl libc's mallocng free() may modify errno if kernel does not support
+MADV_FREE which causes echo to echo with error when it shouldn't.
+
+Future versions of POSIX[1] will require that free() leaves errno
+unmodified but til then, do not rely free() implementation.
+
+Should fix downstream issues:
+https://github.com/alpinelinux/docker-alpine/issues/134
+https://gitlab.alpinelinux.org/alpine/aports/-/issues/12311
+
+Bloatcheck on x86_64:
+
+function old new delta
+echo_main 414 406 -8
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-8) Total: -8
+bytes
+ text data bss dec hex filename
+ 881114 15196 2000 898310 db506 busybox_old
+ 881106 15196 2000 898302 db4fe busybox_unstripped
+---
+ coreutils/echo.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/coreutils/echo.c b/coreutils/echo.c
+index b3828894c..002832ead 100644
+--- a/coreutils/echo.c
++++ b/coreutils/echo.c
+@@ -97,6 +97,7 @@ int echo_main(int argc UNUSED_PARAM, char **argv)
+ #else
+ char nflag = 1;
+ char eflag = 0;
++ int err;
+
+ while ((arg = *++argv) != NULL) {
+ char n, e;
+@@ -184,14 +185,12 @@ int echo_main(int argc UNUSED_PARAM, char **argv)
+
+ do_write:
+ /* Careful to error out on partial writes too (think ENOSPC!) */
+- errno = 0;
+- /*r =*/ full_write(STDOUT_FILENO, buffer, out - buffer);
+- free(buffer);
+- if (/*WRONG:r < 0*/ errno) {
++ err = full_write(STDOUT_FILENO, buffer, out - buffer) != out - buffer;
++ if (err) {
+ bb_simple_perror_msg(bb_msg_write_error);
+- return 1;
+ }
+- return 0;
++ free(buffer);
++ return err;
+ }
+
+ /*
+--
+2.30.0
+
diff --git a/main/busybox/0006-ping-make-ping-work-without-root-privileges.patch b/main/busybox/0006-ping-make-ping-work-without-root-privileges.patch
index 40ade91782..ed352298b8 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,17 +1,17 @@
-From b82f49ced05dbf6ccee728380e9d78744454bcb0 Mon Sep 17 00:00:00 2001
+From 278c73292f2cfc1ecef2dac71efdc7201c021211 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
---
- networking/ping.c | 103 +++++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 87 insertions(+), 16 deletions(-)
+ networking/ping.c | 115 +++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 94 insertions(+), 21 deletions(-)
diff --git a/networking/ping.c b/networking/ping.c
-index a47342fee..88484e272 100644
+index c4a15e06e..a2dccb57f 100644
--- a/networking/ping.c
+++ b/networking/ping.c
-@@ -167,6 +167,7 @@ enum {
+@@ -170,6 +170,7 @@ enum {
pingsock = 0,
};
@@ -19,7 +19,7 @@ index a47342fee..88484e272 100644
static void
#if ENABLE_PING6
create_icmp_socket(len_and_sockaddr *lsa)
-@@ -183,9 +184,23 @@ create_icmp_socket(void)
+@@ -186,9 +187,23 @@ create_icmp_socket(void)
#endif
sock = socket(AF_INET, SOCK_RAW, 1); /* 1 == ICMP */
if (sock < 0) {
@@ -46,7 +46,7 @@ index a47342fee..88484e272 100644
}
xmove_fd(sock, pingsock);
-@@ -238,10 +253,12 @@ static void ping4(len_and_sockaddr *lsa)
+@@ -241,10 +256,12 @@ static void ping4(len_and_sockaddr *lsa)
bb_simple_perror_msg("recvfrom");
continue;
}
@@ -62,7 +62,7 @@ index a47342fee..88484e272 100644
if (pkt->icmp_id != G.myid)
continue; /* not our ping */
if (pkt->icmp_type == ICMP_ECHOREPLY)
-@@ -646,19 +663,21 @@ static void unpack_tail(int sz, uint32_t *tp,
+@@ -653,19 +670,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 a47342fee..88484e272 100644
if (icmppkt->icmp_id != myid)
return 0; /* not our ping */
-@@ -670,7 +689,7 @@ static int unpack4(char *buf, int sz, struct sockaddr_in *from)
+@@ -677,7 +696,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 a47342fee..88484e272 100644
return 1;
}
if (icmppkt->icmp_type != ICMP_ECHO) {
-@@ -720,11 +739,31 @@ static void ping4(len_and_sockaddr *lsa)
+@@ -727,11 +746,31 @@ static void ping4(len_and_sockaddr *lsa)
int sockopt;
pingaddr.sin = lsa->u.sin;
@@ -132,7 +132,7 @@ index a47342fee..88484e272 100644
}
/* enable broadcast pings */
-@@ -741,6 +780,15 @@ static void ping4(len_and_sockaddr *lsa)
+@@ -748,6 +787,15 @@ static void ping4(len_and_sockaddr *lsa)
setsockopt_int(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, opt_ttl);
}
@@ -148,7 +148,7 @@ index a47342fee..88484e272 100644
signal(SIGINT, print_stats_and_exit);
/* start the ping's going ... */
-@@ -778,10 +826,33 @@ static void ping6(len_and_sockaddr *lsa)
+@@ -785,10 +833,33 @@ static void ping6(len_and_sockaddr *lsa)
char control_buf[CMSG_SPACE(36)];
pingaddr.sin6 = lsa->u.sin6;
@@ -183,12 +183,24 @@ index a47342fee..88484e272 100644
{
struct icmp6_filter filt;
if (!(option_mask32 & OPT_VERBOSE)) {
-@@ -927,7 +998,7 @@ static int common_ping_main(int opt, char **argv)
+@@ -934,12 +1005,14 @@ 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();
+- /* we can use native-endian ident, but other Unix ping/traceroute
+- * utils use *big-endian pid*, and e.g. traceroute on our machine may be
+- * *not* from busybox, idents may collide. Follow the convention:
+- */
+- myid = htons(myid);
++ if (!using_dgram) {
++ myid = (uint16_t) getpid();
++ /* we can use native-endian ident, but other Unix ping/traceroute
++ * utils use *big-endian pid*, and e.g. traceroute on our machine may be
++ * *not* from busybox, idents may collide. Follow the convention:
++ */
++ myid = htons(myid);
++ }
hostname = argv[optind];
#if ENABLE_PING6
{
diff --git a/main/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch b/main/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch
index da69e06e18..e647d8d033 100644
--- a/main/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch
+++ b/main/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch
@@ -1,4 +1,4 @@
-From 73318f344e6e57821464068364e30edef18e747d Mon Sep 17 00:00:00 2001
+From 03293c16e509501ce7ec952900413138475f125d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 25 Jul 2014 15:28:33 +0200
Subject: [PATCH] Add flag for not following symlinks when recursing
@@ -15,7 +15,7 @@ diff_main 1665 1662 -3
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/editors/diff.c b/editors/diff.c
-index 1462a9b18..2c899578e 100644
+index 280091756..42a36e2d4 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -113,6 +113,9 @@
@@ -43,7 +43,7 @@ index 1462a9b18..2c899578e 100644
- recursive_action(p[i], ACTION_RECURSE | ACTION_FOLLOWLINKS,
+ recursive_action(p[i], ACTION_RECURSE |
+ ((option_mask32 & FLAG(no_deref)) ? 0 : ACTION_FOLLOWLINKS),
- add_to_dirlist, skip_dir, &list[i], 0);
+ add_to_dirlist, skip_dir, &list[i]);
/* Sort dl alphabetically.
* GNU diff does this ignoring any number of trailing dots.
@@ -964,6 +969,7 @@ static const char diff_longopts[] ALIGN1 =
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 21a43c2885..03f0a1612b 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -3,8 +3,8 @@
# Contributor: Michal Artazov <michal@artazov.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
-pkgver=1.32.0
-pkgrel=7
+pkgver=1.33.0
+pkgrel=2
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
@@ -34,7 +34,8 @@ 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
- 0001-Revert-ash-jobs-Only-clear-gotsigchld-when-waiting-f.patch
+
+ 0001-echo-do-not-assume-that-free-leaves-errno-unmodified.patch
acpid.logrotate
busyboxconfig
@@ -110,7 +111,7 @@ build() {
msg "Building static busybox"
# enable internal ssl_client for static build
sed -e "s/.*CONFIG_PIE.*/\# CONFIG_PIE is not set/" \
- -e "s/.*CONFIG_STATIC.*/CONFIG_STATIC=y/" \
+ -e "s/.*CONFIG_STATIC\([A-Z_]*\).*/CONFIG_STATIC\1=y/" \
-e "s/.*CONFIG_SSL_CLIENT.*/CONFIG_SSL_CLIENT=y/" \
"$_config" > .config
# musl does not support GNU regex
@@ -172,6 +173,10 @@ tty9
tty10
tty11
hvc0
+ttyS0
+ttyS1
+ttyAMA0
+ttyAMA1
EOF
# script for udhcpc
@@ -219,8 +224,7 @@ ifupdown() {
mkdir -p "$subpkgdir"
}
-
-sha512sums="1b1227af69a97e820e28f5f1c62413e4e179202ab525725ea0b1afe9b9f9a5f00e5e32f4603e804ba1596b0fedd60d60457a6d2b8fcedfab45b6e049caeb319b busybox-1.32.0.tar.bz2
+sha512sums="20f8f5197c5cbc8b244f69d82d6628066296c7306a9736ee1344cb555882854412cf7f264490f9a735251c139b9621004f48e972d06ef2623a3c99278f8e765a busybox-1.33.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
e858bb6a0065d0b0cd757df1fb0eb7af1bc1890b276f20706f828b34171d3af3aea4e244233f495e752fb5b591e62da756d46a5b5cbb002c570d3efbb726f704 0001-properly-fix-wget-https-support.patch
@@ -228,17 +232,17 @@ d8694293edc8cd55cecafeb902f03c01af318e13966f399365cf792b840793891ac086bb67ef83e7
8c34dd5ce9a6e84279fa6494cbae0b254778976f341af1d0ccc2a3afb405fb22d374e9623ea83d1500da77c7463db2ed5218d2c9f49350a21114bd0bb17fd87d 0003-ash-exec-busybox.static.patch
e4be12a1453a306a58c4ea59cd8a0bf1f261514ae090ea962ac6f7609dc1e9dab0d4d8d351d7adf4f76bf52d37db9ad0102116635e437945c131f762d5750d19 0004-app-location-for-cpio-vi-and-lspci.patch
095c5617ba7e9f1523deb77ae465e635c347bb2a0934038b91e779f8deb4d7c7ff9ccabbb3bf8a176e83a3994df74692b0f3547d39ff87678cc54b08c8124db0 0005-udhcpc-set-default-discover-retries-to-5.patch
-457ff4b0c4aee8ab88c682bd7831b348f78e91e24b3ecbbb6554fdc67dce915d99d6d5d1a19b4cb30255367736294f33c93a2156667a8dee6d6431dc2db1407b 0006-ping-make-ping-work-without-root-privileges.patch
+89215c328a46afc686c458a133dd88dcda817586df60eb041a694715e73dc78a297fc0f9a92e8ee7d0a39ce7f6053a6b8e38f3ee078ff90ed13fac2608510105 0006-ping-make-ping-work-without-root-privileges.patch
7873b98c676a92faea61511d50c1efac1220354d20afd53de19e2c8f1472559cb333b9dd4e0d6432616d8c5f59885f1503c448c86a912e8031c9bfed628c2db1 0007-fbsplash-support-console-switching.patch
2c56906dac70dea6276e4c573707cb06c4c8b53defcd33b1e5a28f928e7dafe905a52ce40571de430e4af7e00a75ecc0f249d2fec02da5f3d9edd4e904919a35 0008-fbsplash-support-image-and-bar-alignment-and-positio.patch
df02adb3e3cd3349cc8d070911e3392164cb2e30bd72cae7ceaa974b2db6f958fdcedf809abc7b4bee37c729a4d20abf127f615b0e238a667d572137abe6a79e 0009-depmod-support-generating-kmod-binary-index-files.patch
-3b13ba6bd9b697e48864cb5376849c1ac95b30650e3e27605cc05edf4fdc1ecbb4c4503d4fe9012a581bcd660f6bb44d644575cf437d30423614cb83ee92c22c 0010-Add-flag-for-not-following-symlinks-when-recursing.patch
+ecbe5c890d966f09280c7eb534109f785c68e292765f17ed7ff62fcc61d20f61443c4155add0a1ebfb67ce8564e104c1aa22a8ef0400e119b0bca2bca3671f2d 0010-Add-flag-for-not-following-symlinks-when-recursing.patch
4d043999ffbf6875e6b28ffdb43a36dd5d37d51e862ed7d89c6007e38cdda056292c5322a3ac3189fd489bf3ad1cce7b20508a96aee55c09f09354e1c3f5f5fe 0012-udhcpc-Don-t-background-if-n-is-given.patch
-0121eb37ee6ace28802f39eddd3c758f459a5228882af57d362ecc49788e0aa068956913b5f78e7e91c15668286c95ea49f2aef28dc156b085524d616b8fe053 0001-Revert-ash-jobs-Only-clear-gotsigchld-when-waiting-f.patch
+1ec62ab67e32684e2bbfbafefc9e2bffeb758248a97a1ed9468f449d1fc67fca5c1a6743acc889e12c6f18636708e35ba4bab3345c4994eea6be11f10c9a128c 0001-echo-do-not-assume-that-free-leaves-errno-unmodified.patch
aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate
-4b5867df16fc81e4fdd9328801865c00874b3481e50f87a5f564a298f7167f2c824f18c8fc55d46412931a79dda61b4e4ceafa74de1b145f8e33f20a493ccdb1 busyboxconfig
-931e628184a25ae29760f7853c15c570dfb33075af167346e9662b9c7c5829e834ec81027bb10526c376261d229152bb096eb741cea0a5c0e3c614dd2c9d287e busyboxconfig-extras
+e8e1647b2c26033d0ec61a1786b6703a309cb66bba6558132ee15f28113d77e069f20fe65fd7eb5f27924be33bec26280df5e9c926841dfed7a53ff888e5153c busyboxconfig
+fe9fd2c46b7fba920e5c588d69b35858129100e7ec6bf4ea747ef7823e096bea135dab42e1bc37a9fb285193c8d611621d6c85d9aaa63eaf9bfcb6ce3a525b3b busyboxconfig-extras
0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c
b993ce589685d5d1f806153d0b7f71657f2d37556654ec60884130a40f09acc4944a13e0a4d02914000bedd779e5a35da08c760fed5f7ca5b601243aff7ba2c9 dad.if-up
646ad9aefe3596d0170d92c8506ca1846e43b5b83cbef97ae565f15ffa7b14665a8c7061bc69c608c043f834c134c5d63f042509f8999031e89163508a868e46 ssl_client.c
-c047594a1a3c685f679b98bb80015020ed51e7502c0b2f535f8483a8852b8d43b894b36f34ba680ef96a52c67f3d1af706edbfe43c4a2117c469bb2967215252 default.script"
+c3194ccffe7300a0f55d50fb56d38c8df55d588adac13056fd0be2676594974477f94de5570a5a882bc864c3711cf67aa43b6ad6808e672f4533dd0f7363d2f5 default.script"
diff --git a/main/busybox/busybox.post-upgrade b/main/busybox/busybox.post-upgrade
index 138f3e9435..f5ec35cf8e 100644
--- a/main/busybox/busybox.post-upgrade
+++ b/main/busybox/busybox.post-upgrade
@@ -14,7 +14,7 @@
cd /
( find bin sbin usr/bin usr/sbin -maxdepth 1 -type l; busybox --list-all) \
| sort | uniq -u \
- | xargs stat -c "%N" \
+ | xargs -r stat -c "%N" \
| awk "\$3 == \"'/bin/busybox'\" {print \$1}" \
| sed "s/^'//; s/'$//" \
| xargs -r rm
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index b2dd003ee4..7feb9a85c7 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.32.0
-# Wed Nov 25 05:48:01 2020
+# Busybox version: 1.33.0
+# Fri Jan 8 19:34:17 2021
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -36,7 +36,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
# CONFIG_FEATURE_CLEAN_UP is not set
CONFIG_FEATURE_SYSLOG_INFO=y
CONFIG_FEATURE_SYSLOG=y
-CONFIG_PLATFORM_LINUX=y
#
# Build Options
@@ -55,6 +54,7 @@ CONFIG_EXTRA_LDFLAGS=""
CONFIG_EXTRA_LDLIBS=""
# CONFIG_USE_PORTABLE_CODE is not set
CONFIG_STACK_OPTIMIZATION_386=y
+CONFIG_STATIC_LIBGCC=y
#
# Installation Options ("make install" behavior)
@@ -331,6 +331,7 @@ CONFIG_UNIQ=y
CONFIG_UNLINK=y
CONFIG_USLEEP=y
CONFIG_UUDECODE=y
+# CONFIG_BASE32 is not set
CONFIG_BASE64=y
CONFIG_UUENCODE=y
CONFIG_WC=y
@@ -624,7 +625,6 @@ CONFIG_FSTRIM=y
CONFIG_GETOPT=y
CONFIG_FEATURE_GETOPT_LONG=y
CONFIG_HEXDUMP=y
-CONFIG_FEATURE_HEXDUMP_REVERSE=y
CONFIG_HD=y
CONFIG_XXD=y
CONFIG_HWCLOCK=y
@@ -716,6 +716,7 @@ CONFIG_VOLUMEID=y
CONFIG_FEATURE_VOLUMEID_BCACHE=y
CONFIG_FEATURE_VOLUMEID_BTRFS=y
CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_EROFS=y
CONFIG_FEATURE_VOLUMEID_EXFAT=y
CONFIG_FEATURE_VOLUMEID_EXT=y
CONFIG_FEATURE_VOLUMEID_F2FS=y
@@ -875,6 +876,10 @@ CONFIG_DNSDOMAINNAME=y
# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
# CONFIG_FEATURE_HTTPD_PROXY is not set
# CONFIG_FEATURE_HTTPD_GZIP is not set
+# CONFIG_FEATURE_HTTPD_ETAG is not set
+# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set
+# CONFIG_FEATURE_HTTPD_DATE is not set
+# CONFIG_FEATURE_HTTPD_ACL_IP is not set
CONFIG_IFCONFIG=y
CONFIG_FEATURE_IFCONFIG_STATUS=y
CONFIG_FEATURE_IFCONFIG_SLIP=y
@@ -1019,7 +1024,7 @@ CONFIG_MAKEMIME=y
# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
CONFIG_REFORMIME=y
CONFIG_FEATURE_REFORMIME_COMPAT=y
-# CONFIG_SENDMAIL is not set
+CONFIG_SENDMAIL=y
CONFIG_FEATURE_MIME_CHARSET="us-ascii"
#
diff --git a/main/busybox/busyboxconfig-extras b/main/busybox/busyboxconfig-extras
index 3b1d516724..c76cba6644 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.32.0
-# Sat Jun 27 00:24:40 2020
+# Busybox version: 1.33.0
+# Fri Jan 8 19:34:47 2021
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -36,7 +36,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
# CONFIG_FEATURE_CLEAN_UP is not set
CONFIG_FEATURE_SYSLOG_INFO=y
CONFIG_FEATURE_SYSLOG=y
-CONFIG_PLATFORM_LINUX=y
#
# Build Options
@@ -55,6 +54,7 @@ CONFIG_EXTRA_LDFLAGS=""
CONFIG_EXTRA_LDLIBS=""
# CONFIG_USE_PORTABLE_CODE is not set
CONFIG_STACK_OPTIMIZATION_386=y
+CONFIG_STATIC_LIBGCC=y
#
# Installation Options ("make install" behavior)
@@ -327,6 +327,7 @@ CONFIG_BB_ARCH=y
# CONFIG_UNLINK is not set
# CONFIG_USLEEP is not set
# CONFIG_UUDECODE is not set
+# CONFIG_BASE32 is not set
# CONFIG_BASE64 is not set
# CONFIG_UUENCODE is not set
# CONFIG_WC is not set
@@ -608,7 +609,6 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
# CONFIG_GETOPT is not set
# CONFIG_FEATURE_GETOPT_LONG is not set
# CONFIG_HEXDUMP is not set
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
# CONFIG_HD is not set
# CONFIG_XXD is not set
# CONFIG_HWCLOCK is not set
@@ -692,6 +692,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
# CONFIG_FEATURE_VOLUMEID_BCACHE is not set
# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_EROFS is not set
# CONFIG_FEATURE_VOLUMEID_EXFAT is not set
# CONFIG_FEATURE_VOLUMEID_EXT is not set
# CONFIG_FEATURE_VOLUMEID_F2FS is not set
@@ -851,6 +852,10 @@ CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
CONFIG_FEATURE_HTTPD_PROXY=y
CONFIG_FEATURE_HTTPD_GZIP=y
+CONFIG_FEATURE_HTTPD_ETAG=y
+CONFIG_FEATURE_HTTPD_LAST_MODIFIED=y
+CONFIG_FEATURE_HTTPD_DATE=y
+CONFIG_FEATURE_HTTPD_ACL_IP=y
# CONFIG_IFCONFIG is not set
# CONFIG_FEATURE_IFCONFIG_STATUS is not set
# CONFIG_FEATURE_IFCONFIG_SLIP is not set
@@ -958,7 +963,7 @@ CONFIG_UDHCPD=y
CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y
CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
CONFIG_DHCPD_LEASES_FILE="/var/lib/udhcpd/udhcpd.leases"
-# CONFIG_DUMPLEASES is not set
+CONFIG_DUMPLEASES=y
# CONFIG_DHCPRELAY is not set
# CONFIG_UDHCPC is not set
# CONFIG_FEATURE_UDHCPC_ARPING is not set
diff --git a/main/busybox/default.script b/main/busybox/default.script
index 2b787b1484..e2cd5218d6 100644
--- a/main/busybox/default.script
+++ b/main/busybox/default.script
@@ -16,6 +16,7 @@ export interface
export ip
export mask
export metric
+export staticroutes
export router
export subnet
@@ -56,28 +57,47 @@ calc_metric() {
echo $(( $base + $(if_index) ))
}
+route_add() {
+ local to=$1 gw=$2 num=$3
+ # special case for /32 subnets:
+ # /32 instructs kernel to always use routing for all outgoing packets
+ # (they can never be sent to local subnet - there is no local subnet for /32).
+ # Used in datacenters, avoids the need for private ip-addresses between two hops.
+ if [ "$subnet" = "255.255.255.255" ]; then
+ ip -4 route add $gw dev $interface
+ fi
+ ip -4 route add $to via $gw dev $interface \
+ metric $(( $num + ${IF_METRIC:-$(calc_metric)} ))
+}
+
routes() {
- [ -z "$router" ] && return
+ [ -z "$router" ] && [ -z "$staticroutes" ] && return
for i in $NO_GATEWAY; do
[ "$i" = "$interface" ] && return
done
- local gw= num=
while ip -4 route del default via dev $interface 2>/dev/null; do
:
done
- num=0
- for gw in $router; do
- if [ "$subnet" = "255.255.255.255" ]; then
- # special case for /32 subnets:
- # /32 instructs kernel to always use routing for all outgoing packets
- # (they can never be sent to local subnet - there is no local subnet for /32).
- # Used in datacenters, avoids the need for private ip-addresses between two hops.
- ip -4 route add $gw dev $interface
- fi
- ip -4 route add 0.0.0.0/0 via $gw dev $interface \
- metric $(( $num + ${IF_METRIC:-$(calc_metric)} ))
- num=$(( $num + 1 ))
- done
+ local num=0
+ # RFC3442:
+ # If the DHCP server returns both a Classless Static Routes option
+ # and a Router option, the DHCP client MUST ignore the Router option.
+ if [ -n "$staticroutes" ]; then
+ # static routes format: dest1/mask gw1 ... destn/mask gwn
+ set -- $staticroutes
+ while [ -n "$1" ] && [ -n "$2" ]; do
+ local dest="$1" gw="$2"
+ if [ "$gw" != "0.0.0.0" ]; then
+ route_add $dest $gw $num && num=$(( $num + 1))
+ fi
+ shift 2
+ done
+ else
+ local gw=
+ for gw in $router; do
+ route_add 0.0.0.0/0 $gw $num && num=$(( $num + 1 ))
+ done
+ fi
}
resolvconf() {
diff --git a/main/bwm-ng/APKBUILD b/main/bwm-ng/APKBUILD
index aff5966994..f6878a9bcb 100644
--- a/main/bwm-ng/APKBUILD
+++ b/main/bwm-ng/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bwm-ng
-pkgver=0.6.2
+pkgver=0.6.3
pkgrel=0
pkgdesc="A small and simple console-based live bandwidth monitor"
url="http://www.gropp.org/"
@@ -16,7 +16,6 @@ prepare() {
}
build() {
- cd "$builddir"
CFLAGS="$CFLAGS -std=gnu89" \
./configure \
--build=$CBUILD \
@@ -30,8 +29,7 @@ build() {
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
}
-sha512sums="4a7f141692f96dfab0c1729a7df36f5213a75ddb891b967b2cf951419daea7b84354c276705a0ee7c09f4ed26948ca068f65a04b8f9d18b2b8ed2df97b5e3b0a bwm-ng-0.6.2.tgz"
+sha512sums="85ce29e6ffa9643b4e7c1d731f4e928ddca8cfdc71c86b65ec4e55058b951eb8da9ab80139145300518223589d5fece5bdc11ede91a1ea394d569993ccdb0ab8 bwm-ng-0.6.3.tgz"
diff --git a/main/byacc/APKBUILD b/main/byacc/APKBUILD
index feeb5bd79e..a6ae0039ed 100644
--- a/main/byacc/APKBUILD
+++ b/main/byacc/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
pkgname=byacc
-pkgver=20200910
+pkgver=20210109
pkgrel=0
pkgdesc="The Berkeley Yacc general-purpose parser generator"
url="https://invisible-island.net/byacc/byacc.html"
@@ -29,4 +29,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="491bbde2d5b0fdf2ad57bec5080112ad7c12ce3830b5e14f2289092aad1addae6edd4698368a9c8d69219a95ae5fa47eb32a95a2625841915297972591bebea3 byacc-20200910.tgz"
+sha512sums="95eafe81948fee1839fed8fff71d65c23d85de02af51672c118b2eed7c680f0dd300cec54cf366a248307c480844edc66a027575b29e20ef2f71f3c243ad5202 byacc-20210109.tgz"
diff --git a/main/c-ares/APKBUILD b/main/c-ares/APKBUILD
index 86bb67870f..8b0d659a63 100644
--- a/main/c-ares/APKBUILD
+++ b/main/c-ares/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=c-ares
pkgver=1.17.1
-pkgrel=0
+pkgrel=1
pkgdesc="An asynchronously DNS/names resolver library"
url="https://c-ares.haxx.se/"
arch="all"
diff --git a/main/ccache/APKBUILD b/main/ccache/APKBUILD
index e5b5a83523..61a560ada2 100644
--- a/main/ccache/APKBUILD
+++ b/main/ccache/APKBUILD
@@ -1,40 +1,32 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ccache
-pkgver=3.7.12
+pkgver=4.2
pkgrel=0
pkgdesc="fast C/C++ compiler cache"
+options="!check" # Tests fail on the builders
url="https://ccache.dev/"
arch="all"
license="GPL-3.0-or-later"
-makedepends="zlib-dev"
+makedepends="cmake zstd-dev asciidoc perl"
checkdepends="bash perl"
subpackages="$pkgname-doc"
source="https://github.com/ccache/ccache/releases/download/v$pkgver/ccache-$pkgver.tar.xz"
-prepare() {
- default_prepare
- update_config_sub
-}
-
build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --localstatedir=/var
- make
+ cmake -B build \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ cmake --build build
}
check() {
- make test
+ make -C build test
}
package() {
- install -Dm 755 ccache "$pkgdir"/usr/bin/ccache
- install -Dm 644 doc/ccache.1 "$pkgdir"/usr/share/man/man1/ccache.1
+ install -Dm 755 build/ccache "$pkgdir"/usr/bin/ccache
+ install -Dm 644 build/doc/ccache.1 "$pkgdir"/usr/share/man/man1/ccache.1
local link=
mkdir -p "$pkgdir"/usr/lib/ccache/bin
@@ -45,4 +37,4 @@ package() {
done
}
-sha512sums="0eb47869f86d36b3e5fad0d5073973f0444f3efe23fd14469a9e05154ea219228443098b1c5e4a8a0c5c78b4bfa7623735b50ebd6b8b4d0626766061850d6a62 ccache-3.7.12.tar.xz"
+sha512sums="b7e5823a0705b9a1100c959281170dcd682228b585c329821337ef57d5b5cf47d6f3d644a6d5a3675a32a02730559f8fe6d84d11f01847f47b77c0893d1d1fbe ccache-4.2.tar.xz"
diff --git a/main/checkbashisms/APKBUILD b/main/checkbashisms/APKBUILD
index 8676cff290..1d7346112e 100644
--- a/main/checkbashisms/APKBUILD
+++ b/main/checkbashisms/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=checkbashisms
-pkgver=2.20.5
+pkgver=2.21.1
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="fbd372a62758e3d2872f37bfd93d9b169d0cc745719057078378949c4d01b4fb27830ae501fe45b06b30a869e8afc853d8477419bb2f46d7fd62749f54981ec0 devscripts_2.20.5.tar.xz"
+sha512sums="5bcdd1cc8138e2e1aab2efd948cc104aee138b64e93059e929d8365afe1a1a92fac88586186ab53294d17104c661f2e29102bdcdd55f1b73d24be287615207ad devscripts_2.21.1.tar.xz"
diff --git a/main/cifs-utils/APKBUILD b/main/cifs-utils/APKBUILD
index 2642d36255..836599ab17 100644
--- a/main/cifs-utils/APKBUILD
+++ b/main/cifs-utils/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=cifs-utils
-pkgver=6.11
+pkgver=6.12
pkgrel=0
pkgdesc="CIFS filesystem user-space tools"
url="https://wiki.samba.org/index.php/LinuxCIFS_utils"
@@ -13,7 +13,7 @@ subpackages="$pkgname-doc $pkgname-dev"
source="https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-$pkgver.tar.bz2
musl-fix-includes.patch
xattr_size_max.patch
- path-install.patch"
+ "
options="suid"
# secfixes:
@@ -44,7 +44,6 @@ package() {
chmod +s $pkgdir/sbin/mount.cifs
}
-sha512sums="064c0ac75572fb44908390508462e4fdfe0686751149fd8b656a209dd961a5a24a7d9774c38c0e72fa5f9875b43aea7bf2de038c4e4a63a11664e71d9003100e cifs-utils-6.11.tar.bz2
+sha512sums="2f2e1cba8d56c9039fc28236fa63812a09f07f14931c3bd7bd5ae3e6aeb372130c5a059569d8714fb973bea87eba394fd30228fbaeabe700961bba400dd01ca6 cifs-utils-6.12.tar.bz2
99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch
-2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch
-2c44eab140eec13f4e6c36c1fd3d0961af01baa867b16011fb2241718eb1c785660bd874dc845213161e058341cee6fd5fdb7487b7f7731cf1886fd73597924d path-install.patch"
+2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch"
diff --git a/main/cifs-utils/path-install.patch b/main/cifs-utils/path-install.patch
deleted file mode 100644
index 02a464073d..0000000000
--- a/main/cifs-utils/path-install.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index fe9cd34..6ab4b01 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -119,10 +119,10 @@ endif
- SUBDIRS = contrib
-
- install-exec-hook:
-- (cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3)
-+ (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3)
-
- install-data-hook:
-- (cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8)
-+ (cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8)
-
- uninstall-hook:
- (cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3)
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
deleted file mode 100644
index c220b94ad4..0000000000
--- a/main/cjdns/0001-seccomp-handle-__NR_clock_gettime64-when-appropriate.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 daafa31343..bcbabebb1e 100644
--- a/main/cjdns/APKBUILD
+++ b/main/cjdns/APKBUILD
@@ -2,18 +2,17 @@
# Contributor: kpcyrd <git@rxv.cc>
# Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
pkgname=cjdns
-pkgver=20.7
+pkgver=21.1
pkgrel=0
pkgdesc="A routing engine designed for security, scalability, speed and ease of use"
url="https://github.com/cjdelisle/cjdns"
-arch="all !mips64"
+arch="all !mips64 !s390x !ppc64le"
license="GPL-3.0-or-later"
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
- 0001-seccomp-handle-__NR_clock_gettime64-when-appropriate.patch"
+ no-march-flag.patch"
builddir="$srcdir/$pkgname-$pkgname-v$pkgver"
@@ -29,6 +28,8 @@ check() {
package() {
install -Dm755 cjdroute "$pkgdir/usr/sbin/cjdroute"
install -Dm755 contrib/openrc/cjdns "$pkgdir/etc/init.d/cjdns"
+ install -Dm644 doc/man/cjdroute.1 \
+ "$pkgdir/usr/share/man/man1/cjdroute.1"
install -Dm644 doc/man/cjdroute.conf.5 \
"$pkgdir/usr/share/man/man5/cjdroute.conf.5"
install -Dm 644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
@@ -44,6 +45,5 @@ package() {
doc/tunnel.md
}
-sha512sums="db103e70e3d9f5e4958dcbeed51df358450f9489b6573f9b9eddc1839ee2051fe5180eede894b465e92915fabcb4cb64ce08a41c06450f14de75943879633f25 cjdns-20.7.tar.gz
-0c487a46609b75408d83cee954fc49f47997f0e9ee2bb8f64c3edc7e67273e5e90b4b2028847e09faa4bd1310b82f1a86fa7d0d0c42f18510cc9dcd4bccb8808 no-march-flag.patch
-33f78eed9ee8d417c8f055a1dc5e0c38ebaee2e7a87a6218ac9e58cefb9a5498821c10a68c2ced4fe4a3c19df22bdae97217db5da70ec253adb343a0b9111802 0001-seccomp-handle-__NR_clock_gettime64-when-appropriate.patch"
+sha512sums="5a50b22ce018a8e799ebaa11c0c2998d8a75489c2e54da11b4d9f07f2b00073af34328c431b90afbe6e8796302f2137aa62625dcdd56c0cced785fc2b280ccf6 cjdns-21.1.tar.gz
+571c675a83c5464d31ca1dc130d559dea1866013f7e4445fb16a5f9c9d9f9b63c07a9a9714f47abbb3a62ff334b4eeaadd849cb90818bec88be773d525ff7d5f no-march-flag.patch"
diff --git a/main/cjdns/no-march-flag.patch b/main/cjdns/no-march-flag.patch
index aaec16c2ed..29132d4f0c 100644
--- a/main/cjdns/no-march-flag.patch
+++ b/main/cjdns/no-march-flag.patch
@@ -1,13 +1,11 @@
-diff --git a/node_build/make.js b/node_build/make.js
-index b3ae15d..b86e07f 100644
--- a/node_build/make.js
+++ b/node_build/make.js
-@@ -29,7 +29,7 @@ var GCC = process.env['CC'];
+@@ -27,7 +27,7 @@
+
var CFLAGS = process.env['CFLAGS'];
var LDFLAGS = process.env['LDFLAGS'];
-
-var NO_MARCH_FLAG = ['arm', 'ppc', 'ppc64'];
+var NO_MARCH_FLAG = ['arm', 'arm64', 'mips', 'mips64', 'mips64el', 'mipsel', 'ppc', 'ppc64'];
- if (GCC) {
- // Already specified.
+ Builder.configure({
+ systemName: process.env['SYSTEM'] || process.platform,
diff --git a/main/cjson/APKBUILD b/main/cjson/APKBUILD
new file mode 100644
index 0000000000..bbb539c1aa
--- /dev/null
+++ b/main/cjson/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Leo <thinkabit.ukim@gmail.com>
+pkgname=cjson
+pkgver=1.7.14
+pkgrel=0
+pkgdesc="Lighweight JSON parser in C"
+url="https://github.com/DaveGamble/cJSON"
+arch="all"
+license="MIT"
+makedepends="cmake"
+subpackages="$pkgname-dev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/DaveGamble/cJSON/archive/v$pkgver.tar.gz"
+builddir="$srcdir/cJSON-$pkgver"
+
+build() {
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake -B build \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_C_FLAGS="$CFLAGS" \
+ $CMAKE_CROSSOPTS
+ cmake --build build
+}
+
+check() {
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --build build --target install
+}
+
+sha512sums="8de1dedc123ed025a9cbe6764e5963eb0550f726d06a8f6bedfe05b84e852cd9c1587cd381669663073967f42be894a535ba239013f304ce544c3b15a6477c01 cjson-1.7.14.tar.gz"
diff --git a/main/ckbcomp/APKBUILD b/main/ckbcomp/APKBUILD
index 2158b1385e..8cf27fa93d 100644
--- a/main/ckbcomp/APKBUILD
+++ b/main/ckbcomp/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ckbcomp
-pkgver=1.198
+pkgver=1.199
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-$pkgver
+builddir="$srcdir"/console-setup
package() {
install -D -m755 Keyboard/$pkgname $pkgdir/usr/bin/$pkgname
install -D -m644 man/$pkgname.1 $pkgdir/usr/share/man/man1/$pkgname.1
}
-sha512sums="38e6b10e6e232e49eee5de548dcec29ccc319e8b1028b4c95bc9d87ae8cc24ad635cdae87bf6c3f81fa00435bb7560a2605624ec7dd17bb3ae2ab79e22268672 console-setup_1.198.tar.xz"
+sha512sums="8d969de9e6c300c799fb8c58c5300112c1576768c41cd29a9185ecbf0d5c5205356439b54141f00ef4e76ceaf3dc2106cb5fd3e9ec430a205183c07bea341d96 console-setup_1.199.tar.xz"
diff --git a/main/cksfv/APKBUILD b/main/cksfv/APKBUILD
index 3bcf3332b9..a783d2bb5e 100644
--- a/main/cksfv/APKBUILD
+++ b/main/cksfv/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=cksfv
pkgver=1.3.15
-pkgrel=0
+pkgrel=1
pkgdesc="Simple File Verification"
url="http://zakalwe.fi/~shd/foss/cksfv"
arch="all"
diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index 637114860c..a4a49bd366 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=clamav
-pkgver=0.103.0
+pkgver=0.103.1
pkgrel=0
pkgusers="clamav"
pkggroups="clamav"
@@ -252,7 +252,7 @@ milter() {
"$subpkgdir"/etc/clamav/clamav-milter.conf
}
-sha512sums="e0712ed3c068dc8dab1d31b7cbc19cd69c62875fdcf314abb28e6f42660daf162a3aae69e0a008919e7b809675b68d35f79d3cb98379442bcbc6f5c8ee4313bf clamav-0.103.0.tar.gz
+sha512sums="f13e9542898ef42c0db6f7826bcb220b9cb57de2a88bfedc6c991b76ff06c59290522d31119132eaa2093da58c5069d63103f6260e271497bda2b472c3cd6ffb clamav-0.103.1.tar.gz
d886d810de66e8da800384c1e8192f7da4352402ffc3b33cfbca93d81a2235d8c902ca9d436b9be70f00740b4555e1efbf09bf9f84059095a1a297b27581cd20 clamd.initd
59c561b3dcb0b616b647cd8e4ebc46a2cc5e7144c8c7ea0054cc1c3021d1da8f67e4dad5c083c3fe712ed887aaabfca91b538f4759537e7c4c9ab71ba4fd5794 clamd.confd
6f0c615b89f0f0d2f0e9f965f025b9ac8c81b2168fa6727dc8a47222abd780f9b656732f289d6061a20126b16126a975d50e8b3b8ff131f55dd8803da8be5dec freshclam.initd
diff --git a/main/clucene/APKBUILD b/main/clucene/APKBUILD
index 991bb4d85a..6447c05c93 100644
--- a/main/clucene/APKBUILD
+++ b/main/clucene/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=clucene
pkgver=2.3.3.4
-pkgrel=7
+pkgrel=8
pkgdesc="A C++ port of Lucene"
url="http://www.sourceforge.net/projects/clucene"
arch="all"
diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD
index 14b7873c91..51293375db 100644
--- a/main/cmake/APKBUILD
+++ b/main/cmake/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cmake
-pkgver=3.18.4
-pkgrel=1
+pkgver=3.19.6
+pkgrel=0
pkgdesc="Cross-platform, open-source make system"
url="https://www.cmake.org/"
arch="all"
@@ -57,4 +57,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="2f0c5647ed58bf911d0bfeafc7f22a3de09aa3be86301158fa51c8560e994534d7500869067432ecf91e82213a0b36ddb5db11c5c55d2ca5e5647ac9f75717b9 cmake-3.18.4.tar.gz"
+sha512sums="556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9 cmake-3.19.6.tar.gz"
diff --git a/main/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD
index 5460761dc5..e1ad0fa20c 100644
--- a/main/conntrack-tools/APKBUILD
+++ b/main/conntrack-tools/APKBUILD
@@ -1,18 +1,28 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=conntrack-tools
pkgver=1.4.6
-pkgrel=0
+pkgrel=1
pkgdesc="Connection tracking userspace tools"
-url="http://conntrack-tools.netfilter.org"
+url="https://www.netfilter.org/projects/conntrack-tools/"
arch="all"
license="GPL-2.0-or-later"
subpackages="$pkgname-doc $pkgname-openrc"
-makedepends="linux-headers libnfnetlink-dev libnetfilter_conntrack-dev bison flex
- libmnl-dev libnetfilter_cttimeout-dev libnetfilter_cthelper-dev
- libnetfilter_queue-dev libtirpc-dev"
+makedepends="
+ bison
+ flex
+ libmnl-dev
+ libnetfilter_conntrack-dev
+ libnetfilter_cthelper-dev
+ libnetfilter_cttimeout-dev
+ libnetfilter_queue-dev
+ libnfnetlink-dev
+ libtirpc-dev
+ linux-headers
+ "
source="https://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-$pkgver.tar.bz2
conntrackd.initd
conntrackd.confd
+ conntrackd.logrotate
"
build() {
@@ -29,12 +39,15 @@ build() {
package() {
make DESTDIR="$pkgdir" install
- install -Dm755 ../conntrackd.initd "$pkgdir"/etc/init.d/conntrackd
- install -Dm644 ../conntrackd.confd "$pkgdir"/etc/conf.d/conntrackd
+ install -Dm755 "$srcdir"/conntrackd.initd "$pkgdir"/etc/init.d/conntrackd
+ install -Dm644 "$srcdir"/conntrackd.confd "$pkgdir"/etc/conf.d/conntrackd
install -Dm644 doc/stats/conntrackd.conf \
"$pkgdir"/etc/conntrackd/conntrackd.conf
+ install -Dm644 "$srcdir"/conntrackd.logrotate \
+ "$pkgdir"/etc/logrotate.d/conntrackd
}
sha512sums="a48260308a12b11b584fcf4658ec2c4c1adb2801c9cf9a73fc259e5c30d2fbe401aca21e931972413f03e415f98fbf9bd678d2126faa6c6d5748e8a652e58f1a conntrack-tools-1.4.6.tar.bz2
1d8e6d6eec79233b276d12e78c5d184d356df85ede299bfa9f6967ace30987f3b2f8c8077a1e2f9123a817f2805fdb9bf8fa9ec441882a112d83cabf84932e16 conntrackd.initd
-fd8cfab207867844db6671a8395efadca792d6085c3436381e574dc52f3b4e41d9526b3db6114dd98e534a5419ca19f291d21c091f8cf0426024d73d18133e6f conntrackd.confd"
+fd8cfab207867844db6671a8395efadca792d6085c3436381e574dc52f3b4e41d9526b3db6114dd98e534a5419ca19f291d21c091f8cf0426024d73d18133e6f conntrackd.confd
+1e4e6414bbf4210fab83d1a8cd7198bf11f2638d378abd674b1b66bd6ab6bdc048fc4052c3e263bd02dfc8085d007f3092f24e818f8579a940aa3b5af19c1766 conntrackd.logrotate"
diff --git a/main/conntrack-tools/conntrackd.logrotate b/main/conntrack-tools/conntrackd.logrotate
new file mode 100644
index 0000000000..8f5f1de2f9
--- /dev/null
+++ b/main/conntrack-tools/conntrackd.logrotate
@@ -0,0 +1,14 @@
+/var/log/conntrackd-stats.log {
+ compress
+ dateext
+ notifempty
+ missingok
+ nocreate
+ weekly
+ rotate 2
+ copytruncate
+
+ postrotate
+ /etc/init.d/conntrackd --quiet --ifstarted restart || true
+ endscript
+}
diff --git a/main/coreutils/APKBUILD b/main/coreutils/APKBUILD
index 0b2704b0ee..10aa518ab0 100644
--- a/main/coreutils/APKBUILD
+++ b/main/coreutils/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=coreutils
pkgver=8.32
-pkgrel=1
+pkgrel=2
pkgdesc="The basic file, shell and text manipulation utilities"
url="https://www.gnu.org/software/coreutils/"
arch="all"
diff --git a/main/cpufrequtils/0001-Only-x86-has-cpuid-instruction.patch b/main/cpufrequtils/0001-Only-x86-has-cpuid-instruction.patch
deleted file mode 100644
index d3bc14d51b..0000000000
--- a/main/cpufrequtils/0001-Only-x86-has-cpuid-instruction.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f1b6bccf08f53295b2f7f448f28bbd37533c14a2 Mon Sep 17 00:00:00 2001
-From: Zhang Le <r0bertz@gentoo.org>
-Date: Sun, 18 Jul 2010 02:05:28 +0800
-Subject: [PATCH 1/8] Only x86 has cpuid instruction
-
-Signed-off-by: Zhang Le <r0bertz@gentoo.org>
-Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
----
- utils/aperf.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/utils/aperf.c b/utils/aperf.c
-index 627fb17..1c64501 100644
---- a/utils/aperf.c
-+++ b/utils/aperf.c
-@@ -68,11 +68,15 @@ struct avg_perf_cpu_info
-
- static int cpu_has_effective_freq()
- {
-+#if defined(__i386__) || defined(__x86_64__)
- /* largest base level */
- if (cpuid_eax(0) < 6)
- return 0;
-
- return cpuid_ecx(6) & 0x1;
-+#else
-+ return 0;
-+#endif
- }
-
- /*
---
-1.7.10
-
diff --git a/main/cpufrequtils/0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch b/main/cpufrequtils/0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch
deleted file mode 100644
index b2ae533406..0000000000
--- a/main/cpufrequtils/0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch
+++ /dev/null
@@ -1,1511 +0,0 @@
-From adb7e044755aa06b12212d05c4acbcccb023d2cd Mon Sep 17 00:00:00 2001
-From: Thomas Renninger <trenn@suse.de>
-Date: Wed, 1 Sep 2010 02:18:00 +0200
-Subject: [PATCH 2/8] cpufrequtils: Remove proc compile option and interfaces
-
-proc cpufreq kernel support is deprecated since the beginning of 2.6?)
-If someone still likes to have support for the 2.4 cpufreq proc
-interface one has to pick out an old cpufrequtils version
-from now on...
-
-Signed-off-by: Thomas Renninger <trenn@suse.de>
-Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
----
- Makefile | 29 +-------
- lib/cpufreq.c | 99 +++++--------------------
- lib/interfaces.h | 76 -------------------
- lib/proc.c | 216 ------------------------------------------------------
- lib/sysfs.h | 18 +++++
- po/cs.po | 186 +++++++++++++++++++++++++++-------------------
- po/de.po | 2 +-
- po/fr.po | 187 +++++++++++++++++++++++++++-------------------
- po/it.po | 2 +-
- po/pt.po | 2 +-
- 10 files changed, 264 insertions(+), 553 deletions(-)
- delete mode 100644 lib/interfaces.h
- delete mode 100644 lib/proc.c
- create mode 100644 lib/sysfs.h
-
-diff --git a/Makefile b/Makefile
-index 3ef2af7..e23c644 100644
---- a/Makefile
-+++ b/Makefile
-@@ -37,13 +37,6 @@ NLS ?= true
- # cpufreq-bench benchmarking tool
- CPUFRQ_BENCH ?= false
-
--# Use the sysfs-based interface which is included in all 2.6 kernels
--# built with cpufreq support
--SYSFS ?= true
--
--# Use the proc-based interface which is used in the 2.4 patch for cpufreq
--PROC ?= true
--
- # Prefix to the directories we're installing to
- DESTDIR ?=
-
-@@ -119,24 +112,12 @@ CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \
- -DPACKAGE_BUGREPORT=\"$(PACKAGE_BUGREPORT)\" -D_GNU_SOURCE
-
- UTIL_SRC = utils/info.c utils/set.c utils/aperf.c utils/cpuid.h
--LIB_HEADERS = lib/cpufreq.h lib/interfaces.h
--LIB_SRC = lib/cpufreq.c
--LIB_OBJS = lib/cpufreq.o
-+LIB_HEADERS = lib/cpufreq.h lib/sysfs.h
-+LIB_SRC = lib/cpufreq.c lib/sysfs.c
-+LIB_OBJS = lib/cpufreq.o lib/sysfs.o
-
- CFLAGS += -pipe
-
--ifeq ($(strip $(PROC)),true)
-- LIB_OBJS += lib/proc.o
-- LIB_SRC += lib/proc.c
-- CPPFLAGS += -DINTERFACE_PROC
--endif
--
--ifeq ($(strip $(SYSFS)),true)
-- LIB_OBJS += lib/sysfs.o
-- LIB_SRC += lib/sysfs.c
-- CPPFLAGS += -DINTERFACE_SYSFS
--endif
--
- ifeq ($(strip $(NLS)),true)
- INSTALL_NLS += install-gmo
- COMPILE_NLS += update-gmo
-@@ -183,10 +164,6 @@ lib/%.o: $(LIB_SRC) $(LIB_HEADERS) build/ccdv
- $(QUIET) $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ -c lib/$*.c
-
- libcpufreq.so.$(LIB_MAJ): $(LIB_OBJS)
-- @if [ $(strip $(SYSFS)) != true -a $(strip $(PROC)) != true ]; then \
-- echo '*** At least one of /sys support or /proc support MUST be enabled ***'; \
-- exit -1; \
-- fi;
- $(QUIET) $(CC) -shared $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
- -Wl,-soname,libcpufreq.so.$(LIB_MIN) $(LIB_OBJS)
- @ln -sf $@ libcpufreq.so
-diff --git a/lib/cpufreq.c b/lib/cpufreq.c
-index 0c9f28e..603dbf8 100644
---- a/lib/cpufreq.c
-+++ b/lib/cpufreq.c
-@@ -11,60 +11,39 @@
- #include <string.h>
-
- #include "cpufreq.h"
--#include "interfaces.h"
-+#include "sysfs.h"
-
- int cpufreq_cpu_exists(unsigned int cpu)
- {
-- int ret = sysfs_cpu_exists(cpu);
-- if (ret == -ENOSYS)
-- ret = proc_cpu_exists(cpu);
-- return (ret);
-+ return sysfs_cpu_exists(cpu);
- }
-
- unsigned long cpufreq_get_freq_kernel(unsigned int cpu)
- {
-- unsigned long ret = sysfs_get_freq_kernel(cpu);
-- if (!ret)
-- ret = proc_get_freq_kernel(cpu);
-- return (ret);
-+ return sysfs_get_freq_kernel(cpu);
- }
-
- unsigned long cpufreq_get_freq_hardware(unsigned int cpu)
- {
-- unsigned long ret = sysfs_get_freq_hardware(cpu);
-- if (!ret)
-- ret = proc_get_freq_hardware(cpu);
-- return (ret);
-+ return sysfs_get_freq_hardware(cpu);
- }
-
- unsigned long cpufreq_get_transition_latency(unsigned int cpu)
- {
-- unsigned long ret = sysfs_get_transition_latency(cpu);
-- if (!ret)
-- ret = proc_get_transition_latency(cpu);
-- return (ret);
-+ return sysfs_get_transition_latency(cpu);
- }
-
- int cpufreq_get_hardware_limits(unsigned int cpu,
- unsigned long *min,
- unsigned long *max)
- {
-- int ret;
- if ((!min) || (!max))
- return -EINVAL;
-- ret = sysfs_get_hardware_limits(cpu, min, max);
-- if (ret)
-- ret = proc_get_hardware_limits(cpu, min, max);
-- return (ret);
-+ return sysfs_get_hardware_limits(cpu, min, max);
- }
-
- char * cpufreq_get_driver(unsigned int cpu) {
-- char * ret;
-- ret = sysfs_get_driver(cpu);
-- if (!ret) {
-- ret = proc_get_driver(cpu);
-- }
-- return (ret);
-+ return sysfs_get_driver(cpu);
- }
-
- void cpufreq_put_driver(char * ptr) {
-@@ -74,11 +53,7 @@ void cpufreq_put_driver(char * ptr) {
- }
-
- struct cpufreq_policy * cpufreq_get_policy(unsigned int cpu) {
-- struct cpufreq_policy * ret;
-- ret = sysfs_get_policy(cpu);
-- if (!ret)
-- ret = proc_get_policy(cpu);
-- return (ret);
-+ return sysfs_get_policy(cpu);
- }
-
- void cpufreq_put_policy(struct cpufreq_policy *policy) {
-@@ -91,11 +66,7 @@ void cpufreq_put_policy(struct cpufreq_policy *policy) {
- }
-
- struct cpufreq_available_governors * cpufreq_get_available_governors(unsigned int cpu) {
-- struct cpufreq_available_governors *ret;
-- ret = sysfs_get_available_governors(cpu);
-- if (!ret)
-- ret = proc_get_available_governors(cpu);
-- return (ret);
-+ return sysfs_get_available_governors(cpu);
- }
-
- void cpufreq_put_available_governors(struct cpufreq_available_governors *any) {
-@@ -116,11 +87,7 @@ void cpufreq_put_available_governors(struct cpufreq_available_governors *any) {
-
-
- struct cpufreq_available_frequencies * cpufreq_get_available_frequencies(unsigned int cpu) {
-- struct cpufreq_available_frequencies * ret;
-- ret = sysfs_get_available_frequencies(cpu);
-- if (!ret)
-- ret = proc_get_available_frequencies(cpu);
-- return (ret);
-+ return sysfs_get_available_frequencies(cpu);
- }
-
- void cpufreq_put_available_frequencies(struct cpufreq_available_frequencies *any) {
-@@ -139,11 +106,7 @@ void cpufreq_put_available_frequencies(struct cpufreq_available_frequencies *any
-
-
- struct cpufreq_affected_cpus * cpufreq_get_affected_cpus(unsigned int cpu) {
-- struct cpufreq_affected_cpus * ret;
-- ret = sysfs_get_affected_cpus(cpu);
-- if (!ret)
-- ret = proc_get_affected_cpus(cpu);
-- return (ret);
-+ return sysfs_get_affected_cpus(cpu);
- }
-
- void cpufreq_put_affected_cpus(struct cpufreq_affected_cpus *any) {
-@@ -162,11 +125,7 @@ void cpufreq_put_affected_cpus(struct cpufreq_affected_cpus *any) {
-
-
- struct cpufreq_affected_cpus * cpufreq_get_related_cpus(unsigned int cpu) {
-- struct cpufreq_affected_cpus * ret;
-- ret = sysfs_get_related_cpus(cpu);
-- if (!ret)
-- ret = proc_get_related_cpus(cpu);
-- return (ret);
-+ return sysfs_get_related_cpus(cpu);
- }
-
- void cpufreq_put_related_cpus(struct cpufreq_affected_cpus *any) {
-@@ -175,56 +134,32 @@ void cpufreq_put_related_cpus(struct cpufreq_affected_cpus *any) {
-
-
- int cpufreq_set_policy(unsigned int cpu, struct cpufreq_policy *policy) {
-- int ret;
- if (!policy || !(policy->governor))
- return -EINVAL;
-
-- ret = sysfs_set_policy(cpu, policy);
-- if (ret)
-- ret = proc_set_policy(cpu, policy);
-- return (ret);
-+ return sysfs_set_policy(cpu, policy);
- }
-
-
- int cpufreq_modify_policy_min(unsigned int cpu, unsigned long min_freq) {
-- int ret;
--
-- ret = sysfs_modify_policy_min(cpu, min_freq);
-- if (ret)
-- ret = proc_modify_policy_min(cpu, min_freq);
-- return (ret);
-+ return sysfs_modify_policy_min(cpu, min_freq);
- }
-
-
- int cpufreq_modify_policy_max(unsigned int cpu, unsigned long max_freq) {
-- int ret;
--
-- ret = sysfs_modify_policy_max(cpu, max_freq);
-- if (ret)
-- ret = proc_modify_policy_max(cpu, max_freq);
-- return (ret);
-+ return sysfs_modify_policy_max(cpu, max_freq);
- }
-
-
- int cpufreq_modify_policy_governor(unsigned int cpu, char *governor) {
-- int ret;
--
- if ((!governor) || (strlen(governor) > 19))
- return -EINVAL;
-
-- ret = sysfs_modify_policy_governor(cpu, governor);
-- if (ret)
-- ret = proc_modify_policy_governor(cpu, governor);
-- return (ret);
-+ return sysfs_modify_policy_governor(cpu, governor);
- }
-
- int cpufreq_set_frequency(unsigned int cpu, unsigned long target_frequency) {
-- int ret;
--
-- ret = sysfs_set_frequency(cpu, target_frequency);
-- if (ret)
-- ret = proc_set_frequency(cpu, target_frequency);
-- return (ret);
-+ return sysfs_set_frequency(cpu, target_frequency);
- }
-
- struct cpufreq_stats * cpufreq_get_stats(unsigned int cpu, unsigned long long *total_time) {
-diff --git a/lib/interfaces.h b/lib/interfaces.h
-deleted file mode 100644
-index 67ee131..0000000
---- a/lib/interfaces.h
-+++ /dev/null
-@@ -1,76 +0,0 @@
--#ifdef INTERFACE_SYSFS
--
--extern unsigned int sysfs_cpu_exists(unsigned int cpu);
--extern unsigned long sysfs_get_freq_kernel(unsigned int cpu);
--extern unsigned long sysfs_get_freq_hardware(unsigned int cpu);
--extern unsigned long sysfs_get_transition_latency(unsigned int cpu);
--extern int sysfs_get_hardware_limits(unsigned int cpu, unsigned long *min, unsigned long *max);
--extern char * sysfs_get_driver(unsigned int cpu);
--extern struct cpufreq_policy * sysfs_get_policy(unsigned int cpu);
--extern struct cpufreq_available_governors * sysfs_get_available_governors(unsigned int cpu);
--extern struct cpufreq_available_frequencies * sysfs_get_available_frequencies(unsigned int cpu);
--extern struct cpufreq_affected_cpus * sysfs_get_affected_cpus(unsigned int cpu);
--extern struct cpufreq_affected_cpus * sysfs_get_related_cpus(unsigned int cpu);
--extern struct cpufreq_stats * sysfs_get_stats(unsigned int cpu, unsigned long long *total_time);
--extern unsigned long sysfs_get_transitions(unsigned int cpu);
--extern int sysfs_set_policy(unsigned int cpu, struct cpufreq_policy *policy);
--extern int sysfs_modify_policy_min(unsigned int cpu, unsigned long min_freq);
--extern int sysfs_modify_policy_max(unsigned int cpu, unsigned long max_freq);
--extern int sysfs_modify_policy_governor(unsigned int cpu, char *governor);
--extern int sysfs_set_frequency(unsigned int cpu, unsigned long target_frequency);
--
--#else
--
--static inline unsigned int sysfs_cpu_exists(unsigned int cpu) { return -ENOSYS; }
--static inline unsigned long sysfs_get_freq_kernel(unsigned int cpu) { return 0; }
--static inline unsigned long sysfs_get_freq_hardware(unsigned int cpu) { return 0; }
--static inline unsigned long sysfs_get_transition_latency(unsigned int cpu) { return 0; }
--static inline int sysfs_get_hardware_limits(unsigned int cpu, unsigned long *min, unsigned long *max) { return -ENOSYS; }
--static inline char * sysfs_get_driver(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_policy * sysfs_get_policy(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_available_governors * sysfs_get_available_governors(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_available_frequencies * sysfs_get_available_frequencies(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_affected_cpus * sysfs_get_affected_cpus(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_related_cpus * sysfs_get_affected_cpus(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_stats * sysfs_get_stats(unsigned int cpu, unsigned long long *total_time) { return NULL; }
--static inline unsigned long sysfs_get_transitions(unsigned int cpu) { return 0; }
--static inline int sysfs_set_policy(unsigned int cpu, struct cpufreq_policy *policy) { return -ENOSYS; }
--static inline int sysfs_modify_policy_min(unsigned int cpu, unsigned long min_freq) { return -ENOSYS; }
--static inline int sysfs_modify_policy_max(unsigned int cpu, unsigned long max_freq) { return -ENOSYS; }
--static inline int sysfs_modify_policy_governor(unsigned int cpu, char *governor) { return -ENOSYS; }
--static inline int sysfs_set_frequency(unsigned int cpu, unsigned long target_frequency) { return -ENOSYS; }
--
--#endif
--
--
--#ifdef INTERFACE_PROC
--
--extern int proc_cpu_exists(unsigned int cpu);
--extern unsigned long proc_get_freq_kernel(unsigned int cpu);
--extern struct cpufreq_policy * proc_get_policy(unsigned int cpu);
--extern int proc_set_policy(unsigned int cpu, struct cpufreq_policy *policy);
--extern int proc_set_frequency(unsigned int cpu, unsigned long target_frequency);
--#else
--
--static inline int proc_cpu_exists(unsigned int cpu) {return -ENOSYS; }
--static inline unsigned long proc_get_freq_kernel(unsigned int cpu) { return 0; }
--static inline struct cpufreq_policy * proc_get_policy(unsigned int cpu) { return NULL; }
--static inline int proc_set_policy(unsigned int cpu, struct cpufreq_policy *policy) { return -ENOSYS; }
--static inline int proc_set_frequency(unsigned int cpu, unsigned long target_frequency) { return -ENOSYS; }
--
--#endif
--
--/* these aren't implemented in /proc, and probably never will...*/
--
--static inline unsigned long proc_get_freq_hardware(unsigned int cpu) { return 0; }
--static inline unsigned long proc_get_transition_latency(unsigned int cpu) { return -ENOSYS; }
--static inline int proc_get_hardware_limits(unsigned int cpu, unsigned long *min, unsigned long *max) { return -ENOSYS; }
--static inline char * proc_get_driver(unsigned int cpu) {return NULL; }
--static inline struct cpufreq_available_governors * proc_get_available_governors(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_available_frequencies * proc_get_available_frequencies(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_affected_cpus * proc_get_affected_cpus(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_affected_cpus * proc_get_related_cpus(unsigned int cpu) { return NULL; }
--static inline int proc_modify_policy_min(unsigned int cpu, unsigned long min_freq) { return -ENOSYS; }
--static inline int proc_modify_policy_max(unsigned int cpu, unsigned long max_freq) { return -ENOSYS; }
--static inline int proc_modify_policy_governor(unsigned int cpu, char *governor) { return -ENOSYS; }
--
-diff --git a/lib/proc.c b/lib/proc.c
-deleted file mode 100644
-index 38d8483..0000000
---- a/lib/proc.c
-+++ /dev/null
-@@ -1,216 +0,0 @@
--/*
-- * (C) 2004 Dominik Brodowski <linux@dominikbrodowski.de>
-- *
-- * Licensed under the terms of the GNU GPL License version 2.
-- */
--
--#include <stdio.h>
--#include <errno.h>
--#include <stdlib.h>
--#include <string.h>
--
--#include "cpufreq.h"
--
--#define MAX_LINE_LEN 255
--
--static int readout_proc_cpufreq(unsigned int cpu, unsigned long *min, unsigned long *max, char **governor)
--{
-- FILE *fp;
-- char value[MAX_LINE_LEN];
-- char gov_value[MAX_LINE_LEN];
-- int ret = -ENODEV;
-- unsigned int cpu_read;
-- unsigned int tmp1, tmp2;
--
-- if ((!min) || (!max) || (!governor))
-- return -EINVAL;
--
-- fp = fopen("/proc/cpufreq","r");
-- if (!fp)
-- return -ENODEV;
--
--
-- if (!fgets(value, MAX_LINE_LEN, fp)) {
-- ret = -EIO;
-- goto error;
-- }
--
-- if (strlen(value) > (MAX_LINE_LEN - 10)) {
-- ret = -EIO;
-- goto error;
-- }
--
-- while(!feof(fp)) {
-- if (!fgets(value, MAX_LINE_LEN, fp)) {
-- ret = -EIO;
-- goto error;
-- }
--
-- if (strlen(value) > (MAX_LINE_LEN - 10)) {
-- ret = -EIO;
-- goto error;
-- }
--
-- ret = sscanf(value, "CPU%3d %9lu kHz (%3d %%) - %9lu kHz (%3d %%) - %s",
-- &cpu_read , min, &tmp1, max, &tmp2, gov_value);
-- if (ret != 6) {
-- ret = -EIO;
-- goto error;
-- }
--
-- if (cpu_read != cpu)
-- continue;
--
-- if ((tmp2 < tmp1) || (tmp2 > 100) || (*max < *min)) {
-- ret = -ENOSYS;
-- goto error;
-- }
--
-- tmp1 = strlen(gov_value);
-- if (tmp1 > 20) {
-- ret = -ENOSYS;
-- goto error;
-- }
--
-- *governor = malloc(sizeof(char) * (tmp1 + 2));
-- if (!*governor) {
-- ret = -ENOMEM;
-- goto error;
-- }
--
-- strncpy(*governor, gov_value, tmp1);
-- (*governor)[tmp1] = '\0';
--
-- ret = 0;
--
-- break;
-- }
--
-- error:
-- fclose(fp);
-- return (ret);
--}
--
--int proc_cpu_exists(unsigned int cpu) {
-- unsigned long tmp1, tmp2;
-- char *tmp3;
-- int ret;
--
-- ret = readout_proc_cpufreq(cpu, &tmp1, &tmp2, &tmp3);
-- if (ret)
-- return -ENODEV;
--
-- free(tmp3);
-- return 0;
--}
--
--struct cpufreq_policy * proc_get_policy(unsigned int cpu) {
-- struct cpufreq_policy tmp;
-- struct cpufreq_policy *ret;
-- int err;
--
-- err = readout_proc_cpufreq(cpu, &tmp.min, &tmp.max, &tmp.governor);
-- if (err)
-- return NULL;
--
-- ret = malloc(sizeof(struct cpufreq_policy));
-- if (!ret)
-- return NULL;
--
-- ret->min = tmp.min;
-- ret->max = tmp.max;
-- ret->governor = tmp.governor;
--
-- return (ret);
--}
--
--unsigned long proc_get_freq_kernel(unsigned int cpu) {
-- FILE *fp;
-- char value[MAX_LINE_LEN];
-- char file[MAX_LINE_LEN];
-- unsigned long value2;
--
-- snprintf(file, MAX_LINE_LEN, "/proc/sys/cpu/%u/speed", cpu);
--
-- fp = fopen(file,"r");
-- if (!fp)
-- return 0;
--
-- if (!fgets(value, MAX_LINE_LEN, fp)) {
-- fclose(fp);
-- return 0;
-- }
--
-- fclose(fp);
--
-- if (strlen(value) > (MAX_LINE_LEN - 10)) {
-- return 0;
-- }
--
-- if (sscanf(value, "%lu", &value2) != 1)
-- return 0;
--
-- return value2;
--}
--
--int proc_set_policy(unsigned int cpu, struct cpufreq_policy *policy) {
-- FILE *fp;
-- char value[MAX_LINE_LEN];
-- int ret = -ENODEV;
--
-- if ((!policy) || (!policy->governor) || (strlen(policy->governor) > 15))
-- return -EINVAL;
--
-- snprintf(value, MAX_LINE_LEN, "%d:%lu:%lu:%s", cpu, policy->min, policy->max, policy->governor);
--
-- value[MAX_LINE_LEN - 1]='\0';
--
-- fp = fopen("/proc/cpufreq","r+");
-- if (!fp)
-- return -ENODEV;
-- ret = fputs(value, fp);
-- fclose(fp);
--
-- if (ret < 0)
-- return (ret);
--
-- return 0;
--}
--
--int proc_set_frequency(unsigned int cpu, unsigned long target_frequency) {
-- struct cpufreq_policy *pol = proc_get_policy(cpu);
-- struct cpufreq_policy new_pol;
-- char userspace_gov[] = "userspace";
-- FILE *fp;
-- char value[MAX_LINE_LEN];
-- char file[MAX_LINE_LEN];
-- int ret = 0;
--
-- if (!pol)
-- return -ENODEV;
--
-- if (strncmp(pol->governor, userspace_gov, 9) != 0) {
-- cpufreq_put_policy(pol);
-- new_pol.min = pol->min;
-- new_pol.max = pol->max;
-- new_pol.governor = userspace_gov;
-- ret = proc_set_policy(cpu, &new_pol);
-- if (ret)
-- return (ret);
-- }
--
--
-- snprintf(file, MAX_LINE_LEN, "/proc/sys/cpu/%u/speed", cpu);
-- snprintf(value, MAX_LINE_LEN, "%lu", target_frequency);
--
-- fp = fopen(file,"r+");
-- if (!fp)
-- return -EINVAL;
-- ret = fputs(value, fp);
-- fclose(fp);
--
-- if (ret < 0)
-- return (ret);
--
-- return 0;
--}
-diff --git a/lib/sysfs.h b/lib/sysfs.h
-new file mode 100644
-index 0000000..99619d5
---- /dev/null
-+++ b/lib/sysfs.h
-@@ -0,0 +1,18 @@
-+extern unsigned int sysfs_cpu_exists(unsigned int cpu);
-+extern unsigned long sysfs_get_freq_kernel(unsigned int cpu);
-+extern unsigned long sysfs_get_freq_hardware(unsigned int cpu);
-+extern unsigned long sysfs_get_transition_latency(unsigned int cpu);
-+extern int sysfs_get_hardware_limits(unsigned int cpu, unsigned long *min, unsigned long *max);
-+extern char * sysfs_get_driver(unsigned int cpu);
-+extern struct cpufreq_policy * sysfs_get_policy(unsigned int cpu);
-+extern struct cpufreq_available_governors * sysfs_get_available_governors(unsigned int cpu);
-+extern struct cpufreq_available_frequencies * sysfs_get_available_frequencies(unsigned int cpu);
-+extern struct cpufreq_affected_cpus * sysfs_get_affected_cpus(unsigned int cpu);
-+extern struct cpufreq_affected_cpus * sysfs_get_related_cpus(unsigned int cpu);
-+extern struct cpufreq_stats * sysfs_get_stats(unsigned int cpu, unsigned long long *total_time);
-+extern unsigned long sysfs_get_transitions(unsigned int cpu);
-+extern int sysfs_set_policy(unsigned int cpu, struct cpufreq_policy *policy);
-+extern int sysfs_modify_policy_min(unsigned int cpu, unsigned long min_freq);
-+extern int sysfs_modify_policy_max(unsigned int cpu, unsigned long max_freq);
-+extern int sysfs_modify_policy_governor(unsigned int cpu, char *governor);
-+extern int sysfs_set_frequency(unsigned int cpu, unsigned long target_frequency);
-diff --git a/po/cs.po b/po/cs.po
-index a4c14a7..4fdfffb 100644
---- a/po/cs.po
-+++ b/po/cs.po
-@@ -9,7 +9,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: cs\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2008-07-17 11:29+0200\n"
-+"POT-Creation-Date: 2010-09-01 01:20+0200\n"
- "PO-Revision-Date: 2008-06-11 16:26+0200\n"
- "Last-Translator: Karel Volný <kavol@seznam.cz>\n"
- "Language-Team: Czech <diskuze@lists.l10n.cz>\n"
-@@ -24,64 +24,74 @@ msgstr ""
- msgid "Couldn't count the number of CPUs (%s: %s), assuming 1\n"
- msgstr "Nelze zjistit počet CPU (%s: %s), předpokládá se 1.\n"
-
--#: utils/info.c:67
-+#: utils/info.c:68
- #, c-format
- msgid ""
- " minimum CPU frequency - maximum CPU frequency - governor\n"
- msgstr ""
- " minimální frekvence CPU - maximální frekvence CPU - regulátor\n"
-
--#: utils/info.c:128
-+#: utils/info.c:156
- #, c-format
- msgid "couldn't analyze CPU %d as it doesn't seem to be present\n"
- msgstr "nelze analyzovat CPU %d, vypadá to, že není přítomen\n"
-
--#: utils/info.c:132
-+#: utils/info.c:160
- #, c-format
- msgid "analyzing CPU %d:\n"
- msgstr "analyzuji CPU %d:\n"
-
--#: utils/info.c:139
-+#: utils/info.c:167
- #, c-format
- msgid " no or unknown cpufreq driver is active on this CPU\n"
- msgstr " pro tento CPU není aktivní žádný známý ovladač cpufreq\n"
-
--#: utils/info.c:141
-+#: utils/info.c:169
- #, c-format
- msgid " driver: %s\n"
- msgstr " ovladač: %s\n"
-
--#: utils/info.c:147
--#, c-format
--msgid " CPUs which need to switch frequency at the same time: "
-+#: utils/info.c:175
-+#, fuzzy, c-format
-+msgid " CPUs which run at the same hardware frequency: "
-+msgstr " CPU, které musí měnit frekvenci zároveň: "
-+
-+#: utils/info.c:186
-+#, fuzzy, c-format
-+msgid " CPUs which need to have their frequency coordinated by software: "
- msgstr " CPU, které musí měnit frekvenci zároveň: "
-
--#: utils/info.c:157
-+#: utils/info.c:197
-+#, c-format
-+msgid " maximum transition latency: "
-+msgstr ""
-+
-+#: utils/info.c:203
- #, c-format
- msgid " hardware limits: "
- msgstr " hardwarové meze: "
-
--#: utils/info.c:166
-+#: utils/info.c:212
- #, c-format
- msgid " available frequency steps: "
- msgstr " dostupné frekvence: "
-
--#: utils/info.c:179
-+#: utils/info.c:225
- #, c-format
- msgid " available cpufreq governors: "
- msgstr " dostupné regulátory: "
-
--#: utils/info.c:190
-+#: utils/info.c:236
- #, c-format
- msgid " current policy: frequency should be within "
- msgstr " současná taktika: frekvence by měla být mezi "
-
--#: utils/info.c:192
-+#: utils/info.c:238
- #, c-format
- msgid " and "
- msgstr " a "
-
--#: utils/info.c:196
-+#: utils/info.c:242
- #, c-format
- msgid ""
- "The governor \"%s\" may decide which speed to use\n"
-@@ -90,51 +100,51 @@ msgstr ""
- " Regulátor \"%s\" může rozhodnout jakou frekvenci použít\n"
- " v těchto mezích.\n"
-
--#: utils/info.c:203
-+#: utils/info.c:249
- #, c-format
- msgid " current CPU frequency is "
- msgstr " současná frekvence CPU je "
-
--#: utils/info.c:206
-+#: utils/info.c:252
- #, c-format
- msgid " (asserted by call to hardware)"
- msgstr " (zjištěno hardwarovým voláním)"
-
--#: utils/info.c:214
-+#: utils/info.c:260
- #, c-format
- msgid " cpufreq stats: "
- msgstr " statistika cpufreq: "
-
--#: utils/info.c:361 utils/set.c:30
-+#: utils/info.c:440 utils/set.c:31
- #, c-format
- msgid "Report errors and bugs to %s, please.\n"
- msgstr ""
- "Chyby v programu prosím hlaste na %s (anglicky).\n"
- "Chyby v překladu prosím hlaste na kavol@seznam.cz (česky ;-)\n"
-
--#: utils/info.c:365
-+#: utils/info.c:444
- #, c-format
- msgid "Usage: cpufreq-info [options]\n"
- msgstr "Užití: cpufreq-info [přepínače]\n"
-
--#: utils/info.c:366 utils/set.c:35
-+#: utils/info.c:445 utils/set.c:37
- #, c-format
- msgid "Options:\n"
- msgstr "Přepínače:\n"
-
--#: utils/info.c:367
-+#: utils/info.c:446
- #, c-format
- msgid ""
- " -c CPU, --cpu CPU CPU number which information shall be determined "
- "about\n"
- msgstr " -c CPU, --cpu CPU Číslo CPU, o kterém se mají zjistit informace\n"
-
--#: utils/info.c:368
-+#: utils/info.c:447
- #, c-format
- msgid " -e, --debug Prints out debug information\n"
- msgstr " -e, --debug Vypíše ladicí informace\n"
-
--#: utils/info.c:369
-+#: utils/info.c:448
- #, c-format
- msgid ""
- " -f, --freq Get frequency the CPU currently runs at, according\n"
-@@ -143,7 +153,7 @@ msgstr ""
- " -f, --freq Zjistí aktuální frekvenci, na které CPU běží\n"
- " podle cpufreq *\n"
-
--#: utils/info.c:371
-+#: utils/info.c:450
- #, c-format
- msgid ""
- " -w, --hwfreq Get frequency the CPU currently runs at, by reading\n"
-@@ -152,7 +162,7 @@ msgstr ""
- " -w, --hwfreq Zjistí aktuální frekvenci, na které CPU běží\n"
- " z hardware (dostupné jen uživateli root) *\n"
-
--#: utils/info.c:373
-+#: utils/info.c:452
- #, c-format
- msgid ""
- " -l, --hwlimits Determine the minimum and maximum CPU frequency "
-@@ -161,36 +171,52 @@ msgstr ""
- " -l, --hwlimits Zjistí minimální a maximální dostupnou frekvenci CPU "
- "*\n"
-
--#: utils/info.c:374
-+#: utils/info.c:453
- #, c-format
- msgid " -d, --driver Determines the used cpufreq kernel driver *\n"
- msgstr " -d, --driver Zjistí aktivní ovladač cpufreq *\n"
-
--#: utils/info.c:375
-+#: utils/info.c:454
- #, c-format
- msgid " -p, --policy Gets the currently used cpufreq policy *\n"
- msgstr " -p, --policy Zjistí aktuální taktiku cpufreq *\n"
-
--#: utils/info.c:376
-+#: utils/info.c:455
- #, c-format
- msgid " -g, --governors Determines available cpufreq governors *\n"
- msgstr " -g, --governors Zjistí dostupné regulátory cpufreq *\n"
-
--#: utils/info.c:377
--#, c-format
-+#: utils/info.c:456
-+#, fuzzy, c-format
- msgid ""
--" -a, --affected-cpus Determines which CPUs can only switch frequency at "
--"the\n"
--" same time *\n"
-+" -r, --related-cpus Determines which CPUs run at the same hardware "
-+"frequency *\n"
- msgstr ""
- " -a, --affected-cpus Zjistí, které CPU musí měnit frekvenci zároveň *\n"
-
--#: utils/info.c:379
-+#: utils/info.c:457
-+#, fuzzy, c-format
-+msgid ""
-+" -a, --affected-cpus Determines which CPUs need to have their frequency\n"
-+" coordinated by software *\n"
-+msgstr ""
-+" -a, --affected-cpus Zjistí, které CPU musí měnit frekvenci zároveň *\n"
-+
-+#: utils/info.c:459
- #, c-format
- msgid " -s, --stats Shows cpufreq statistics if available\n"
- msgstr " -s, --stats Zobrazí statistiku cpufreq, je-li dostupná\n"
-
--#: utils/info.c:380
-+#: utils/info.c:460
-+#, fuzzy, c-format
-+msgid ""
-+" -y, --latency Determines the maximum latency on CPU frequency "
-+"changes *\n"
-+msgstr ""
-+" -l, --hwlimits Zjistí minimální a maximální dostupnou frekvenci CPU "
-+"*\n"
-+
-+#: utils/info.c:461
- #, c-format
- msgid ""
- " -o, --proc Prints out information like provided by the /proc/"
-@@ -200,21 +226,21 @@ msgstr ""
- " -o, --proc Vypíše informace ve formátu, jaký používalo rozhraní\n"
- " /proc/cpufreq v kernelech řady 2.4 a časné 2.6\n"
-
--#: utils/info.c:382
--#, c-format
-+#: utils/info.c:463
-+#, fuzzy, c-format
- msgid ""
--" -m, --human human-readable output for the -f, -w and -s "
-+" -m, --human human-readable output for the -f, -w, -s and -y "
- "parameters\n"
- msgstr ""
- " -m, --human Výstup parametrů -f, -w a -s v „lidmi čitelném“ "
- "formátu\n"
-
--#: utils/info.c:383 utils/set.c:42
-+#: utils/info.c:464
- #, c-format
- msgid " -h, --help Prints out this screen\n"
- msgstr " -h, --help Vypíše tuto nápovědu\n"
-
--#: utils/info.c:386
-+#: utils/info.c:467
- #, c-format
- msgid ""
- "If no argument or only the -c, --cpu parameter is given, debug output about\n"
-@@ -224,7 +250,7 @@ msgstr ""
- "jsou\n"
- "vypsány ladicí informace, což může být užitečné například při hlášení chyb.\n"
-
--#: utils/info.c:388
-+#: utils/info.c:469
- #, c-format
- msgid ""
- "For the arguments marked with *, omitting the -c or --cpu argument is\n"
-@@ -233,14 +259,14 @@ msgstr ""
- "Není-li při použití přepínačů označených * zadán parametr -c nebo --cpu,\n"
- "předpokládá se jeho hodnota 0.\n"
-
--#: utils/info.c:478
-+#: utils/info.c:563
- #, c-format
- msgid ""
- "The argument passed to this tool can't be combined with passing a --cpu "
- "argument\n"
- msgstr "Zadaný parametr nemůže být použit zároveň s přepínačem -c nebo --cpu\n"
-
--#: utils/info.c:491
-+#: utils/info.c:576
- #, c-format
- msgid ""
- "You can't specify more than one --cpu parameter and/or\n"
-@@ -249,17 +275,17 @@ msgstr ""
- "Nelze zadat více než jeden parametr -c nebo --cpu\n"
- "anebo více než jeden parametr určující výstup\n"
-
--#: utils/info.c:497 utils/set.c:79
-+#: utils/info.c:582 utils/set.c:95
- #, c-format
- msgid "invalid or unknown argument\n"
- msgstr "neplatný nebo neznámý parametr\n"
-
--#: utils/set.c:34
-+#: utils/set.c:36
- #, c-format
- msgid "Usage: cpufreq-set [options]\n"
- msgstr "Užití: cpufreq-set [přepínače]\n"
-
--#: utils/set.c:36
-+#: utils/set.c:38
- #, c-format
- msgid ""
- " -c CPU, --cpu CPU number of CPU where cpufreq settings shall be "
-@@ -268,7 +294,7 @@ msgstr ""
- " -c CPU, --cpu CPU Číslo CPU pro který se má provést nastavení "
- "cpufreq\n"
-
--#: utils/set.c:37
-+#: utils/set.c:39
- #, c-format
- msgid ""
- " -d FREQ, --min FREQ new minimum CPU frequency the governor may "
-@@ -277,7 +303,7 @@ msgstr ""
- " -d FREQ, --min FREQ Nová nejnižší frekvence, kterou může regulátor "
- "vybrat\n"
-
--#: utils/set.c:38
-+#: utils/set.c:40
- #, c-format
- msgid ""
- " -u FREQ, --max FREQ new maximum CPU frequency the governor may "
-@@ -286,12 +312,12 @@ msgstr ""
- " -u FREQ, --max FREQ Nová nejvyšší frekvence, kterou může regulátor "
- "zvolit\n"
-
--#: utils/set.c:39
-+#: utils/set.c:41
- #, c-format
- msgid " -g GOV, --governor GOV new cpufreq governor\n"
- msgstr " -g GOV, --governors GOV Nový regulátor cpufreq\n"
-
--#: utils/set.c:40
-+#: utils/set.c:42
- #, c-format
- msgid ""
- " -f FREQ, --freq FREQ specific frequency to be set. Requires userspace\n"
-@@ -303,6 +329,16 @@ msgstr ""
-
- #: utils/set.c:44
- #, c-format
-+msgid " -r, --related Switches all hardware-related CPUs\n"
-+msgstr ""
-+
-+#: utils/set.c:45
-+#, fuzzy, c-format
-+msgid " -h, --help Prints out this screen\n"
-+msgstr " -h, --help Vypíše tuto nápovědu\n"
-+
-+#: utils/set.c:47
-+#, c-format
- msgid ""
- "Notes:\n"
- "1. Omitting the -c or --cpu argument is equivalent to setting it to zero\n"
-@@ -322,30 +358,7 @@ msgstr ""
- " připojením názvu jednotky bez mezery mezi číslem a jednotkou\n"
- " (FREQ v kHz =^ Hz * 0,001 = ^ MHz * 1000 =^ GHz * 1000000)\n"
-
--#: utils/set.c:251
--#, c-format
--msgid ""
--"the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n"
--"-g/--governor parameters\n"
--msgstr ""
--"přepínač -f/--freq nemůže být použit zároveň\n"
--"s přepínačem -d/--min, -u/--max nebo -g/--governor\n"
--
--#: utils/set.c:262
--#, c-format
--msgid ""
--"At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n"
--"-g/--governor must be passed\n"
--msgstr ""
--"Musí být zadán alespoň jeden přepínač\n"
--"-f/--freq, -d/--min, -u/--max nebo -g/--governor\n"
--
--#: utils/set.c:282
--#, c-format
--msgid "wrong, unknown or unhandled CPU?\n"
--msgstr "neznámý nebo nepodporovaný CPU?\n"
--
--#: utils/set.c:306
-+#: utils/set.c:69
- #, c-format
- msgid ""
- "Error setting new values. Common errors:\n"
-@@ -365,3 +378,26 @@ msgstr ""
- "- Snažíte se nastavit určitou frekvenci, ale není dostupný\n"
- " regulátor ‚userspace‘, například protože není nahrán v jádře,\n"
- " nebo nelze na tomto hardware nastavit určitou frekvenci?\n"
-+
-+#: utils/set.c:183
-+#, c-format
-+msgid "wrong, unknown or unhandled CPU?\n"
-+msgstr "neznámý nebo nepodporovaný CPU?\n"
-+
-+#: utils/set.c:336
-+#, c-format
-+msgid ""
-+"the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n"
-+"-g/--governor parameters\n"
-+msgstr ""
-+"přepínač -f/--freq nemůže být použit zároveň\n"
-+"s přepínačem -d/--min, -u/--max nebo -g/--governor\n"
-+
-+#: utils/set.c:342
-+#, c-format
-+msgid ""
-+"At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n"
-+"-g/--governor must be passed\n"
-+msgstr ""
-+"Musí být zadán alespoň jeden přepínač\n"
-+"-f/--freq, -d/--min, -u/--max nebo -g/--governor\n"
-diff --git a/po/de.po b/po/de.po
-index 4c3a2bb..a5970ae 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -7,7 +7,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: cpufrequtils 006\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2009-08-09 11:53+0200\n"
-+"POT-Creation-Date: 2010-09-01 01:20+0200\n"
- "PO-Revision-Date: 2009-08-08 17:18+0100\n"
- "Last-Translator: <linux@dominikbrodowski.net>\n"
- "Language-Team: NONE\n"
-diff --git a/po/fr.po b/po/fr.po
-index fffdb42..4ebb40b 100644
---- a/po/fr.po
-+++ b/po/fr.po
-@@ -8,7 +8,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: cpufrequtils 0.1-pre2\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2008-07-17 11:29+0200\n"
-+"POT-Creation-Date: 2010-09-01 01:20+0200\n"
- "PO-Revision-Date: 2004-11-17 15:53+1000\n"
- "Last-Translator: Bruno Ducrot <ducrot@poupinou.org>\n"
- "Language-Team: NONE\n"
-@@ -21,64 +21,74 @@ msgstr ""
- msgid "Couldn't count the number of CPUs (%s: %s), assuming 1\n"
- msgstr "Dtermination du nombre de CPUs (%s : %s) impossible. Assume 1\n"
-
--#: utils/info.c:67
-+#: utils/info.c:68
- #, c-format
- msgid ""
- " minimum CPU frequency - maximum CPU frequency - governor\n"
- msgstr ""
- " Frquence CPU minimale - Frquence CPU maximale - rgulateur\n"
-
--#: utils/info.c:128
-+#: utils/info.c:156
- #, c-format
- msgid "couldn't analyze CPU %d as it doesn't seem to be present\n"
- msgstr "analyse du CPU %d impossible puisqu'il ne semble pas tre prsent\n"
-
--#: utils/info.c:132
-+#: utils/info.c:160
- #, c-format
- msgid "analyzing CPU %d:\n"
- msgstr "analyse du CPU %d :\n"
-
--#: utils/info.c:139
-+#: utils/info.c:167
- #, c-format
- msgid " no or unknown cpufreq driver is active on this CPU\n"
- msgstr " pas de pilotes cpufreq reconnu pour ce CPU\n"
-
--#: utils/info.c:141
-+#: utils/info.c:169
- #, c-format
- msgid " driver: %s\n"
- msgstr " pilote : %s\n"
-
--#: utils/info.c:147
--#, c-format
--msgid " CPUs which need to switch frequency at the same time: "
-+#: utils/info.c:175
-+#, fuzzy, c-format
-+msgid " CPUs which run at the same hardware frequency: "
-+msgstr " CPUs qui doivent changer de frquences en mme temps : "
-+
-+#: utils/info.c:186
-+#, fuzzy, c-format
-+msgid " CPUs which need to have their frequency coordinated by software: "
- msgstr " CPUs qui doivent changer de frquences en mme temps : "
-
--#: utils/info.c:157
-+#: utils/info.c:197
-+#, c-format
-+msgid " maximum transition latency: "
-+msgstr ""
-+
-+#: utils/info.c:203
- #, c-format
- msgid " hardware limits: "
- msgstr " limitation matrielle : "
-
--#: utils/info.c:166
-+#: utils/info.c:212
- #, c-format
- msgid " available frequency steps: "
- msgstr " plage de frquence : "
-
--#: utils/info.c:179
-+#: utils/info.c:225
- #, c-format
- msgid " available cpufreq governors: "
- msgstr " rgulateurs disponibles : "
-
--#: utils/info.c:190
-+#: utils/info.c:236
- #, c-format
- msgid " current policy: frequency should be within "
- msgstr " tactique actuelle : la frquence doit tre comprise entre "
-
--#: utils/info.c:192
-+#: utils/info.c:238
- #, c-format
- msgid " and "
- msgstr " et "
-
--#: utils/info.c:196
-+#: utils/info.c:242
- #, c-format
- msgid ""
- "The governor \"%s\" may decide which speed to use\n"
-@@ -87,37 +97,37 @@ msgstr ""
- "Le rgulateur \"%s\" est libre de choisir la vitesse\n"
- " dans cette plage de frquences.\n"
-
--#: utils/info.c:203
-+#: utils/info.c:249
- #, c-format
- msgid " current CPU frequency is "
- msgstr " la frquence actuelle de ce CPU est "
-
--#: utils/info.c:206
-+#: utils/info.c:252
- #, c-format
- msgid " (asserted by call to hardware)"
- msgstr " (vrifi par un appel direct du matriel)"
-
--#: utils/info.c:214
-+#: utils/info.c:260
- #, c-format
- msgid " cpufreq stats: "
- msgstr " des statistique concernant cpufreq:"
-
--#: utils/info.c:361 utils/set.c:30
-+#: utils/info.c:440 utils/set.c:31
- #, c-format
- msgid "Report errors and bugs to %s, please.\n"
- msgstr "Veuillez rapportez les erreurs et les bogues %s, s'il vous plait.\n"
-
--#: utils/info.c:365
-+#: utils/info.c:444
- #, c-format
- msgid "Usage: cpufreq-info [options]\n"
- msgstr "Usage : cpufreq-info [options]\n"
-
--#: utils/info.c:366 utils/set.c:35
-+#: utils/info.c:445 utils/set.c:37
- #, c-format
- msgid "Options:\n"
- msgstr "Options :\n"
-
--#: utils/info.c:367
-+#: utils/info.c:446
- #, c-format
- msgid ""
- " -c CPU, --cpu CPU CPU number which information shall be determined "
-@@ -126,12 +136,12 @@ msgstr ""
- " -c CPU, --cpu CPU Numro du CPU pour lequel l'information sera "
- "affiche\n"
-
--#: utils/info.c:368
-+#: utils/info.c:447
- #, c-format
- msgid " -e, --debug Prints out debug information\n"
- msgstr " -e, --debug Afficher les informations de dboguage\n"
-
--#: utils/info.c:369
-+#: utils/info.c:448
- #, c-format
- msgid ""
- " -f, --freq Get frequency the CPU currently runs at, according\n"
-@@ -140,7 +150,7 @@ msgstr ""
- " -f, --freq Obtenir la frquence actuelle du CPU selon le point\n"
- " de vue du coeur du systme de cpufreq *\n"
-
--#: utils/info.c:371
-+#: utils/info.c:450
- #, c-format
- msgid ""
- " -w, --hwfreq Get frequency the CPU currently runs at, by reading\n"
-@@ -149,7 +159,7 @@ msgstr ""
- " -w, --hwfreq Obtenir la frquence actuelle du CPU directement par\n"
- " le matriel (doit tre root) *\n"
-
--#: utils/info.c:373
-+#: utils/info.c:452
- #, c-format
- msgid ""
- " -l, --hwlimits Determine the minimum and maximum CPU frequency "
-@@ -158,40 +168,57 @@ msgstr ""
- " -l, --hwlimits Affiche les frquences minimales et maximales du CPU "
- "*\n"
-
--#: utils/info.c:374
-+#: utils/info.c:453
- #, c-format
- msgid " -d, --driver Determines the used cpufreq kernel driver *\n"
- msgstr " -d, --driver Affiche le pilote cpufreq utilis *\n"
-
--#: utils/info.c:375
-+#: utils/info.c:454
- #, c-format
- msgid " -p, --policy Gets the currently used cpufreq policy *\n"
- msgstr " -p, --policy Affiche la tactique actuelle de cpufreq *\n"
-
--#: utils/info.c:376
-+#: utils/info.c:455
- #, c-format
- msgid " -g, --governors Determines available cpufreq governors *\n"
- msgstr ""
- " -g, --governors Affiche les rgulateurs disponibles de cpufreq *\n"
-
--#: utils/info.c:377
--#, c-format
-+#: utils/info.c:456
-+#, fuzzy, c-format
- msgid ""
--" -a, --affected-cpus Determines which CPUs can only switch frequency at "
--"the\n"
--" same time *\n"
-+" -r, --related-cpus Determines which CPUs run at the same hardware "
-+"frequency *\n"
- msgstr ""
- " -a, --affected-cpus Affiche quels sont les CPUs qui doivent changer de\n"
- " frquences en mme temps *\n"
-
--#: utils/info.c:379
-+#: utils/info.c:457
-+#, fuzzy, c-format
-+msgid ""
-+" -a, --affected-cpus Determines which CPUs need to have their frequency\n"
-+" coordinated by software *\n"
-+msgstr ""
-+" -a, --affected-cpus Affiche quels sont les CPUs qui doivent changer de\n"
-+" frquences en mme temps *\n"
-+
-+#: utils/info.c:459
- #, c-format
- msgid " -s, --stats Shows cpufreq statistics if available\n"
- msgstr ""
- " -s, --stats Indique des statistiques concernant cpufreq, si\n"
- " disponibles\n"
-
--#: utils/info.c:380
-+#: utils/info.c:460
-+#, fuzzy, c-format
-+msgid ""
-+" -y, --latency Determines the maximum latency on CPU frequency "
-+"changes *\n"
-+msgstr ""
-+" -l, --hwlimits Affiche les frquences minimales et maximales du CPU "
-+"*\n"
-+
-+#: utils/info.c:461
- #, c-format
- msgid ""
- " -o, --proc Prints out information like provided by the /proc/"
-@@ -203,21 +230,21 @@ msgstr ""
- "versions\n"
- " 2.4 et les anciennes versions 2.6 du noyau\n"
-
--#: utils/info.c:382
--#, c-format
-+#: utils/info.c:463
-+#, fuzzy, c-format
- msgid ""
--" -m, --human human-readable output for the -f, -w and -s "
-+" -m, --human human-readable output for the -f, -w, -s and -y "
- "parameters\n"
- msgstr ""
- " -m, --human affiche dans un format lisible pour un humain\n"
- " pour les options -f, -w et -s (MHz, GHz)\n"
-
--#: utils/info.c:383 utils/set.c:42
-+#: utils/info.c:464
- #, c-format
- msgid " -h, --help Prints out this screen\n"
- msgstr " -h, --help affiche l'aide-mmoire\n"
-
--#: utils/info.c:386
-+#: utils/info.c:467
- #, c-format
- msgid ""
- "If no argument or only the -c, --cpu parameter is given, debug output about\n"
-@@ -227,21 +254,21 @@ msgstr ""
- "argument, ou bien si seulement l'argument -c (--cpu) est donn, afin de\n"
- "faciliter les rapports de bogues par exemple\n"
-
--#: utils/info.c:388
-+#: utils/info.c:469
- #, c-format
- msgid ""
- "For the arguments marked with *, omitting the -c or --cpu argument is\n"
- "equivalent to setting it to zero\n"
- msgstr "Les arguments avec un * utiliseront le CPU 0 si -c (--cpu) est omis\n"
-
--#: utils/info.c:478
-+#: utils/info.c:563
- #, c-format
- msgid ""
- "The argument passed to this tool can't be combined with passing a --cpu "
- "argument\n"
- msgstr "Cette option est incompatible avec --cpu\n"
-
--#: utils/info.c:491
-+#: utils/info.c:576
- #, c-format
- msgid ""
- "You can't specify more than one --cpu parameter and/or\n"
-@@ -250,17 +277,17 @@ msgstr ""
- "On ne peut indiquer plus d'un paramtre --cpu, tout comme l'on ne peut\n"
- "spcifier plus d'un argument de formatage\n"
-
--#: utils/info.c:497 utils/set.c:79
-+#: utils/info.c:582 utils/set.c:95
- #, c-format
- msgid "invalid or unknown argument\n"
- msgstr "option invalide\n"
-
--#: utils/set.c:34
-+#: utils/set.c:36
- #, c-format
- msgid "Usage: cpufreq-set [options]\n"
- msgstr "Usage : cpufreq-set [options]\n"
-
--#: utils/set.c:36
-+#: utils/set.c:38
- #, c-format
- msgid ""
- " -c CPU, --cpu CPU number of CPU where cpufreq settings shall be "
-@@ -269,7 +296,7 @@ msgstr ""
- " -c CPU, --cpu CPU numro du CPU prendre en compte pour les\n"
- " changements\n"
-
--#: utils/set.c:37
-+#: utils/set.c:39
- #, c-format
- msgid ""
- " -d FREQ, --min FREQ new minimum CPU frequency the governor may "
-@@ -278,7 +305,7 @@ msgstr ""
- " -d FREQ, --min FREQ nouvelle frquence minimale du CPU utiliser\n"
- " par le rgulateur\n"
-
--#: utils/set.c:38
-+#: utils/set.c:40
- #, c-format
- msgid ""
- " -u FREQ, --max FREQ new maximum CPU frequency the governor may "
-@@ -287,12 +314,12 @@ msgstr ""
- " -u FREQ, --max FREQ nouvelle frquence maximale du CPU utiliser\n"
- " par le rgulateur\n"
-
--#: utils/set.c:39
-+#: utils/set.c:41
- #, c-format
- msgid " -g GOV, --governor GOV new cpufreq governor\n"
- msgstr " -g GOV, --governor GOV active le rgulateur GOV\n"
-
--#: utils/set.c:40
-+#: utils/set.c:42
- #, c-format
- msgid ""
- " -f FREQ, --freq FREQ specific frequency to be set. Requires userspace\n"
-@@ -304,6 +331,16 @@ msgstr ""
-
- #: utils/set.c:44
- #, c-format
-+msgid " -r, --related Switches all hardware-related CPUs\n"
-+msgstr ""
-+
-+#: utils/set.c:45
-+#, fuzzy, c-format
-+msgid " -h, --help Prints out this screen\n"
-+msgstr " -h, --help affiche l'aide-mmoire\n"
-+
-+#: utils/set.c:47
-+#, c-format
- msgid ""
- "Notes:\n"
- "1. Omitting the -c or --cpu argument is equivalent to setting it to zero\n"
-@@ -322,30 +359,7 @@ msgstr ""
- " les valeurs par hz, kHz (par dfaut), MHz, GHz ou THz\n"
- " (kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000).\n"
-
--#: utils/set.c:251
--#, c-format
--msgid ""
--"the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n"
--"-g/--governor parameters\n"
--msgstr ""
--"l'option -f/--freq est incompatible avec les options -d/--min, -u/--max et\n"
--"-g/--governor\n"
--
--#: utils/set.c:262
--#, c-format
--msgid ""
--"At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n"
--"-g/--governor must be passed\n"
--msgstr ""
--"L'un de ces paramtres est obligatoire : -f/--freq, -d/--min, -u/--max et\n"
--"-g/--governor\n"
--
--#: utils/set.c:282
--#, c-format
--msgid "wrong, unknown or unhandled CPU?\n"
--msgstr "CPU inconnu ou non support ?\n"
--
--#: utils/set.c:306
-+#: utils/set.c:69
- #, c-format
- msgid ""
- "Error setting new values. Common errors:\n"
-@@ -368,3 +382,26 @@ msgstr ""
- "- vous voulez utiliser l'option -f/--freq, mais le rgulateur userspace \n"
- " n'est pas disponible, par exemple parce que le matriel ne le supporte\n"
- " pas, ou bien n'est tout simplement pas charg.\n"
-+
-+#: utils/set.c:183
-+#, c-format
-+msgid "wrong, unknown or unhandled CPU?\n"
-+msgstr "CPU inconnu ou non support ?\n"
-+
-+#: utils/set.c:336
-+#, c-format
-+msgid ""
-+"the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n"
-+"-g/--governor parameters\n"
-+msgstr ""
-+"l'option -f/--freq est incompatible avec les options -d/--min, -u/--max et\n"
-+"-g/--governor\n"
-+
-+#: utils/set.c:342
-+#, c-format
-+msgid ""
-+"At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n"
-+"-g/--governor must be passed\n"
-+msgstr ""
-+"L'un de ces paramtres est obligatoire : -f/--freq, -d/--min, -u/--max et\n"
-+"-g/--governor\n"
-diff --git a/po/it.po b/po/it.po
-index 36f09ed..4e9aa83 100644
---- a/po/it.po
-+++ b/po/it.po
-@@ -8,7 +8,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: cpufrequtils 0.3\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2009-08-09 11:53+0200\n"
-+"POT-Creation-Date: 2010-09-01 01:20+0200\n"
- "PO-Revision-Date: 2009-08-15 12:00+0900\n"
- "Last-Translator: Mattia Dongili <malattia@gmail.com>\n"
- "Language-Team: NONE\n"
-diff --git a/po/pt.po b/po/pt.po
-index 75cca0d..2baf1d5 100644
---- a/po/pt.po
-+++ b/po/pt.po
-@@ -8,7 +8,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: cpufrequtils 004\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2009-08-09 11:53+0200\n"
-+"POT-Creation-Date: 2010-09-01 01:20+0200\n"
- "PO-Revision-Date: 2008-06-14 22:16-0400\n"
- "Last-Translator: Claudio Eduardo <claudioeddy@gmail.com>\n"
- "MIME-Version: 1.0\n"
---
-1.7.10
-
diff --git a/main/cpufrequtils/0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch b/main/cpufrequtils/0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch
deleted file mode 100644
index 308e73a5b6..0000000000
--- a/main/cpufrequtils/0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d4490efed068a552e8b67d52a0726458a224c9a0 Mon Sep 17 00:00:00 2001
-From: Frank Arnold <frank.arnold@amd.com>
-Date: Wed, 8 Dec 2010 17:39:14 +0100
-Subject: [PATCH 3/8] cpufrequtils aperf: Fix MSR read on 32-bit
-
-The cpufreq-aperf command does not work on 32-bit systems. The reason
-for that is a wrong count argument passed to the read() call. Instead
-of the buffer size, the size of the pointer to the buffer is used. On
-64-bit systems this just happened to work, because we need to read an
-8 byte value and a pointer has a size of 8 bytes on 64-bit. On 32-bit
-systems only 4 bytes are read, which then triggers the error path.
-
-Signed-off-by: Frank Arnold <frank.arnold@amd.com>
-Reviewed-by: Thomas Renninger <trenn@suse.de>
-Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
----
- utils/aperf.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utils/aperf.c b/utils/aperf.c
-index 1c64501..6302f5a 100644
---- a/utils/aperf.c
-+++ b/utils/aperf.c
-@@ -100,7 +100,7 @@ static int read_msr(int cpu, unsigned int idx, unsigned long long *val)
- return -1;
- if (lseek(fd, idx, SEEK_CUR) == -1)
- goto err;
-- if (read(fd, val, sizeof val) != sizeof *val)
-+ if (read(fd, val, sizeof *val) != sizeof *val)
- goto err;
- close(fd);
- return 0;
---
-1.7.10
-
diff --git a/main/cpufrequtils/0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch b/main/cpufrequtils/0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch
deleted file mode 100644
index 94088300f9..0000000000
--- a/main/cpufrequtils/0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9f2efa7bc6969c10562ac2c720d50ff77083e5c2 Mon Sep 17 00:00:00 2001
-From: Roman Vasiyarov <rvasiyarov@gmail.com>
-Date: Mon, 25 Apr 2011 21:34:23 +0400
-Subject: [PATCH 5/8] cpufrequtils sysfs: increase MAX_LINE_LEN
-
-larger sysfs data (>255 bytes) was truncated and thus used improperly
-
-Signed-off-by: Roman Vasiyarov <rvasiyarov@gmail.com>
-Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
----
- lib/sysfs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/sysfs.c b/lib/sysfs.c
-index 4e0edab..24dd563 100644
---- a/lib/sysfs.c
-+++ b/lib/sysfs.c
-@@ -18,7 +18,7 @@
- #include "cpufreq.h"
-
- #define PATH_TO_CPU "/sys/devices/system/cpu/"
--#define MAX_LINE_LEN 255
-+#define MAX_LINE_LEN 4096
- #define SYSFS_PATH_MAX 255
-
- /* helper function to read file from /sys into given buffer */
---
-1.7.10
-
diff --git a/main/cpufrequtils/0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch b/main/cpufrequtils/0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch
deleted file mode 100644
index ee3adff75a..0000000000
--- a/main/cpufrequtils/0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 9085ce6f615d9d2e0182d3ce029b882835bd0a6b Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 26 Jul 2011 19:28:31 -0400
-Subject: [PATCH 6/8] aperf: fix compilation on x86-32 with -fPIC
-
-ebx is used to store the GOT pointer when compiled with -fPIC, so it's
-not usable by inline assembly.
-
-https://bugs.gentoo.org/375967
-
-Signed-off-by: Matt Turner <mattst88@gmail.com>
-Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
----
- utils/cpuid.h | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/utils/cpuid.h b/utils/cpuid.h
-index 2bac69a..53da789 100644
---- a/utils/cpuid.h
-+++ b/utils/cpuid.h
-@@ -5,9 +5,21 @@ static inline void __cpuid(unsigned int *eax, unsigned int *ebx,
- unsigned int *ecx, unsigned int *edx)
- {
- /* ecx is often an input as well as an output. */
-- asm volatile("cpuid"
-+ asm volatile(
-+#if defined(__i386__) && defined(__PIC__)
-+ "push %%ebx\n"
-+ "cpuid\n"
-+ "movl %%ebx, %1\n"
-+ "pop %%ebx\n"
-+#else
-+ "cpuid\n"
-+#endif
- : "=a" (*eax),
-+#if defined(__i386__) && defined(__PIC__)
-+ "=r" (*ebx),
-+#else
- "=b" (*ebx),
-+#endif
- "=c" (*ecx),
- "=d" (*edx)
- : "0" (*eax), "2" (*ecx));
---
-1.7.10
-
diff --git a/main/cpufrequtils/0007-po-add-missing-word-in-DE.patch b/main/cpufrequtils/0007-po-add-missing-word-in-DE.patch
deleted file mode 100644
index d116791b14..0000000000
--- a/main/cpufrequtils/0007-po-add-missing-word-in-DE.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 26ce99ab92ae9f1f367a58b7858a96f4e1e6814c Mon Sep 17 00:00:00 2001
-From: Dominik Brodowski <linux@dominikbrodowski.net>
-Date: Fri, 29 Jul 2011 19:40:46 +0200
-Subject: [PATCH 7/8] po: add missing word in DE
-
-Reported-by: Michael Basse
-Reported-by: <tkranz@zedat.fu-berlin.de>
-Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
----
- po/de.po | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/po/de.po b/po/de.po
-index 1da1f2b..ee793f5 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -304,7 +304,7 @@ msgid ""
- "modified\n"
- msgstr ""
- " -c CPU, --cpu CPU Nummer der CPU, deren Taktfrequenz-Einstellung\n"
--" werden soll\n"
-+" verndert werden soll\n"
-
- #: utils/set.c:39
- #, c-format
---
-1.7.10
-
diff --git a/main/cpufrequtils/0008-cpufrequtils-make-NLS-optional.patch b/main/cpufrequtils/0008-cpufrequtils-make-NLS-optional.patch
deleted file mode 100644
index 03724f1ef0..0000000000
--- a/main/cpufrequtils/0008-cpufrequtils-make-NLS-optional.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From a2f0c39d5f21596bb9f5223e895c0ff210b265d0 Mon Sep 17 00:00:00 2001
-From: Sergey Dryabzhinsky <sergey.dryabzhinsky@gmail.com>
-Date: Sat, 13 Aug 2011 23:02:20 -0400
-Subject: [PATCH 8/8] cpufrequtils: make NLS optional
-
-https://bugs.gentoo.org/205576
-
-Signed-off-by: Matt Turner <mattst88@gmail.com>
-Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
----
- Makefile | 1 +
- utils/info.c | 10 +++++++++-
- utils/set.c | 10 +++++++++-
- 3 files changed, 19 insertions(+), 2 deletions(-)
-
-Index: cpufrequtils/Makefile
-===================================================================
---- cpufrequtils.orig/Makefile 2012-05-06 13:30:41.865796974 +0900
-+++ cpufrequtils/Makefile 2012-05-06 13:35:13.994099919 +0900
-@@ -140,6 +140,7 @@
- ifeq ($(strip $(NLS)),true)
- INSTALL_NLS += install-gmo
- COMPILE_NLS += update-gmo
-+ CPPFLAGS += -DNLS
- endif
-
- ifeq ($(strip $(CPUFRQ_BENCH)),true)
-Index: cpufrequtils/utils/info.c
-===================================================================
---- cpufrequtils.orig/utils/info.c 2012-05-06 11:56:20.287842838 +0900
-+++ cpufrequtils/utils/info.c 2012-05-06 13:35:13.994099919 +0900
-@@ -10,7 +10,6 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
--#include <libintl.h>
- #include <locale.h>
-
- #include <getopt.h>
-@@ -18,9 +17,18 @@
- #include "cpufreq.h"
-
-
-+#ifdef NLS
-+#include <libintl.h>
- #define _(String) gettext (String)
- #define gettext_noop(String) String
- #define N_(String) gettext_noop (String)
-+#else
-+#define gettext_noop(String) String
-+#define _(String) gettext_noop (String)
-+#define gettext(String) gettext_noop (String)
-+#define N_(String) gettext_noop (String)
-+#define textdomain(String)
-+#endif
-
- #define LINE_LEN 10
-
-Index: cpufrequtils/utils/set.c
-===================================================================
---- cpufrequtils.orig/utils/set.c 2012-05-06 11:56:20.287842838 +0900
-+++ cpufrequtils/utils/set.c 2012-05-06 13:35:13.994099919 +0900
-@@ -12,16 +12,24 @@
- #include <limits.h>
- #include <string.h>
- #include <ctype.h>
--#include <libintl.h>
- #include <locale.h>
-
- #include <getopt.h>
-
- #include "cpufreq.h"
-
-+#ifdef NLS
-+#include <libintl.h>
- #define _(String) gettext(String)
- #define gettext_noop(String) String
- #define N_(String) gettext_noop(String)
-+#else
-+#define gettext_noop(String) String
-+#define _(String) gettext_noop (String)
-+#define gettext(String) gettext_noop (String)
-+#define N_(String) gettext_noop (String)
-+#define textdomain(String)
-+#endif
-
- #define NORM_FREQ_LEN 32
-
diff --git a/main/cpufrequtils/APKBUILD b/main/cpufrequtils/APKBUILD
deleted file mode 100644
index 028bf74e99..0000000000
--- a/main/cpufrequtils/APKBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=cpufrequtils
-pkgver=008
-pkgrel=4
-pkgdesc="Userspace tools for the kernel cpufreq subsystem"
-url="https://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"
-arch="all"
-license="GPL-2.0"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="sysfsutils"
-makedepends="sysfsutils-dev libtool"
-source="https://sources.archlinux.org/other/cpufrequtils/cpufrequtils-$pkgver.tar.bz2
- 0001-Only-x86-has-cpuid-instruction.patch
- 0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch
- 0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch
- 0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch
- 0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch
- 0007-po-add-missing-word-in-DE.patch
- 0008-cpufrequtils-make-NLS-optional.patch
- $pkgname.initd
- $pkgname.confd"
-
-prepare() {
- cd "$srcdir"/$pkgname-$pkgver
- for i in ../*.patch; do
- msg "Applying $i..."
- patch -p1 < $i || return 1
- done
-}
-
-build() {
- cd "$srcdir"/$pkgname-$pkgver
- # distcc and ccache makes libtool confused about the tag.
- # we save 4k by disabling the 2.4 kernel support (PROC=false)
- make -j1 LIBTOOL_OPT="--tag=CC --silent" \
- NLS=false \
- PROC=false \
- || return 1
-}
-
-package() {
- cd "$srcdir"/$pkgname-$pkgver
- make mandir=/usr/share/man \
- NLS=false \
- INSTALL=install \
- DESTDIR="$pkgdir" \
- install || return 1
- install -D -m755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
- install -D -m644 ../$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-}
-
-sha512sums="d25dcc4fbf15bdca65a3fab6ee33d6cf4b7ab7ed291aea42ed7970b707535ddfcd27fd0189aa48affc2792abf72539f1388cc544019e6fc06353a2f9c5a49d17 cpufrequtils-008.tar.bz2
-4d841bdf2b829518932505747e68d661219337259c1321cdd6671faf2eb72ff6d7f437e42b98f093f9d6564d2bb7be1d4ab645f08b0fbd58ce43339a12be37da 0001-Only-x86-has-cpuid-instruction.patch
-6d8c6beb98d680d4d47c5cc0a067545b1683f259b7d2474a61876b5e97987be30b8d212017122157236ae91bd415793e5f5a0d22214bfc3f2ec72cf626d28832 0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch
-41082f5ed4cc2962927b12b8dcf4b0dadf6fb227b66b8f383931c7ae0416fa5f73e765664376b50e07948e48060770a7d32bc7422b144c0cb82166515e197f9b 0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch
-00fb946b1f0b42038297b9cf63740a4123a4aafa5292400225803ef8cd6f1e89b387509c2f74fa6223b3b2b3032b6e0edcbfc3b6bf15aab73bb480c0208330b9 0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch
-7e924424fe3381fd804edfcb0c0c98e73b67e4da7972c7cfe0bc9cfb5febd2ec660f4e84b6bebe2b0b6d2dc5e60279ebe85d1892905b1112ee43d60b46bcdef5 0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch
-69343ab9c9b795523bcd09359f4acdb279510a95c6aa13f70be1d0e2e89ed59952a34f979969f6a3ac3498ad7196ee1c810677fe2d04c5f02207682b820b97bb 0007-po-add-missing-word-in-DE.patch
-5d5eab9815d77b8ae9c6c9d122f52da7501068b9a6fe7766e74a8f59d1296c0bcb6e5a61a643e371e2e1433912d48205c8f522207144bb02a3c9961043eb968b 0008-cpufrequtils-make-NLS-optional.patch
-c9b867a2b49b2ab3c2b7540de7e48443b155a6eb329ec7bd9cfa077993fad66d9168d9009e869191a73e6a4c15448b39294e1eb4cedb364173955209b0b708f9 cpufrequtils.initd
-81adc035c781c2c6f94fdb9a69dfb5d867830ab0685f2badce055b9f8095881456522fc0cd5386140d920fd1d9b96c82d8dcecd9962e3e6ef5f9be926153802b cpufrequtils.confd"
diff --git a/main/cpufrequtils/cpufrequtils.confd b/main/cpufrequtils/cpufrequtils.confd
deleted file mode 100644
index 68f5b7594c..0000000000
--- a/main/cpufrequtils/cpufrequtils.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/conf.d/cpufrequtils: config file for /etc/init.d/cpufrequtils
-
-# Options when starting cpufreq (given to the `cpufreq-set` program)
-START_OPTS="--governor ondemand"
-
-# Options when stopping cpufreq (given to the `cpufreq-set` program)
-STOP_OPTS="--governor performance"
diff --git a/main/cpufrequtils/cpufrequtils.initd b/main/cpufrequtils/cpufrequtils.initd
deleted file mode 100644
index 6e032424de..0000000000
--- a/main/cpufrequtils/cpufrequtils.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-init.d-005,v 1.2 2008/10/21 21:20:59 vapier Exp $
-
-affect_change() {
- local c ret=0
- ebegin "Running cpufreq-set $*"
- for c in $(cpufreq-info -o | awk '$1 == "CPU" { print $2 }') ; do
- cpufreq-set -c ${c} $*
- : $((ret+=$?))
- done
- eend ${ret}
-}
-
-start() {
- affect_change ${START_OPTS}
-}
-
-stop() {
- affect_change ${STOP_OPTS}
-}
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index 5b8c54fbfe..797e43b7b8 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cryptsetup
pkgver=2.3.4
-pkgrel=0
+pkgrel=1
pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
url="https://gitlab.com/cryptsetup/cryptsetup"
arch="all"
@@ -62,4 +62,4 @@ libs() {
sha512sums="a0a4981ca7294d6f0568bc9465e78ee1781ad73fe77e8daa0bbe67693534f02d3510e6fba9f76749b90ce7533bc9ac96dd27b73d733f8051e9560a3b4196ca3c cryptsetup-2.3.4.tar.gz
dc896fdb7697d01443a168819f01af02db00a9de75589f062a1ebbfc0bc185b6d2109b18352309c41b818e3ad89609dcea3660d6f3cda890de825f053f94de97 flush-stdout.patch
74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 dmcrypt.confd
-81dad61cdecf1dc529b26eb3cdc15979a582c876b01268f88e7a71c8fae6911137c03bfa63fee64e064e5fb31f673610be27ecab9fc432229f13e7040698bd5c dmcrypt.initd"
+a3ca3e648749136ee724692b61488cd855f118eb93435942c2b04964a34fe49d0f0da4ef64cd2531c1c0f650e77808cf5d802789fd7664398248ead668bb35e5 dmcrypt.initd"
diff --git a/main/cryptsetup/dmcrypt.initd b/main/cryptsetup/dmcrypt.initd
index 340b579b75..85c77f7c1d 100644
--- a/main/cryptsetup/dmcrypt.initd
+++ b/main/cryptsetup/dmcrypt.initd
@@ -191,7 +191,7 @@ dm_crypt_execute() {
else
ewarn "${source} will not be decrypted ..."
einfo "Reason: cannot find gpg application."
- einfo "You have to install app-crypt/gnupg first."
+ einfo "You have to install gnupg first."
einfo "If you have /usr on its own partition, try copying gpg to /bin ."
fi
else
diff --git a/main/ctags/APKBUILD b/main/ctags/APKBUILD
index ab4fbb4097..467cbe6ce9 100644
--- a/main/ctags/APKBUILD
+++ b/main/ctags/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=ctags
-pkgver=0_git20201010
-_commit=952bd1e9df69e9faf02e319ea1b084984d3c36b0
+pkgver=0_git20201201
+_commit=e52cf4a795c49cfcf6859447124e2612741ac145
pkgrel=0
pkgdesc="Generator of tags for all types of C/C++ languages"
url="https://ctags.io/"
@@ -49,4 +49,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="89ad930345ee334aaa527c75a6e0c89b430ee2aedcb82c0fa3cb65099fc79f54e719ffef2317950a2c1958d6fa34b584c43f408a8655bd2a007ede6f9cc44625 ctags-0_git20201010.tar.gz"
+sha512sums="4cd6b9cd8c9ca3042b3c193de73699fdb6859e517f2808570ce16486a25bdfc9c8520dbb4367aa8a0c19535ddaf9bb1caf4766db65a0099042fa6badc7fa555a ctags-0_git20201201.tar.gz"
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index e896426228..de6d9e6f30 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cups
pkgver=2.3.3
-pkgrel=1
+pkgrel=2
pkgdesc="The CUPS Printing System"
url="https://www.cups.org/"
arch="all"
@@ -56,7 +56,7 @@ build() {
--disable-pam \
--enable-raw-printing \
--enable-dbus \
- --with-dbusdir=/etc/dbus-1 \
+ --with-dbusdir=/usr/share/dbus-1 \
--enable-libpaper \
--enable-ssl=yes \
--enable-gnutls \
diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD
index a91aa5e2a4..6513f0db80 100644
--- a/main/curl/APKBUILD
+++ b/main/curl/APKBUILD
@@ -2,8 +2,13 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+
+# RESTRICTED: Do NOT enable the rustls or hyper backends, as they depend on Rust
+# and Rust is not yet available on all architectures. Any commit which changes
+# this aport from arch=all WILL be reverted.
+
pkgname=curl
-pkgver=7.73.0
+pkgver=7.75.0
pkgrel=0
pkgdesc="URL retrival utility and library"
url="https://curl.haxx.se/"
@@ -19,6 +24,10 @@ source="https://curl.haxx.se/download/curl-$pkgver.tar.xz
"
# secfixes:
+# 7.74.0-r0:
+# - CVE-2020-8284
+# - CVE-2020-8285
+# - CVE-2020-8286
# 7.72.0-r0:
# - CVE-2020-8231
# 7.71.0-r0:
@@ -135,4 +144,4 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
}
-sha512sums="95330bac2d6bc5306d47723b3c7bdb754fabe2ba2df7b2a8027453a40286f1c7caaee69333f0715e59fbc7fdf09080968ea624398c995cabf3d57493973867bd curl-7.73.0.tar.xz"
+sha512sums="4c2fc6658379b8b93dd50665b70f3000b63d3bcafd2df60b7e651a8edf4735b3decb06c338b84cb22058191aa9f8f4dc85760a42f9987210b59300758304b746 curl-7.75.0.tar.xz"
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 9865dbe5bd..d6e5215a70 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=10
+pkgrel=11
pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
url="https://www.cyrusimap.org/sasl/"
arch="all"
@@ -41,6 +41,7 @@ source="https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-$pk
cyrus-sasl-2.1.27-doc_build_fix.patch
cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
CVE-2019-19906.patch
+ fix-saslauthd-man-page.patch
saslauthd.initd
"
@@ -124,4 +125,5 @@ sha512sums="d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623
6d723e7ec2c431b45c011b887187b6a670dbe646aa4c39d38171047ab23db529c30c433f8d4dd624181917c5ce4e5271f86e35e2644ede1c40dfb09cb67dccde cyrus-sasl-2.1.27-doc_build_fix.patch
fca4f2b7e427c7613f71daa4a31772c33c8c0fe9d7f85b57b85da71bc5a88a18fc52f7caea463188b4addd31cd041d5349af689d5face2cc45fb50c700a8afd7 cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
c39efd87dc9c883d3b07474197f6835fbd32f23baa1f5cd04b25a0473639f847321c40f232e390d4dc9d9ee189dbd177c05d3d1461af4d28a48a4827abc5d9b8 CVE-2019-19906.patch
+ce4ce9ac1fbca22b545996796101d7712dcc6a9d5b375fc2fbab5e7c6b937ac335b36b9a734c64cab552e2b806433f088683239ae30b82bfff3783bd1bb5b627 fix-saslauthd-man-page.patch
f76bfb61567172428cdbc1ed900d5e0b6e66afc38118db6ba0e2fd8ba01956ad896e56463b2249bdc46d8725384f1b975a2af3601c0735327d3f8bc26ce1ed75 saslauthd.initd"
diff --git a/main/cyrus-sasl/fix-saslauthd-man-page.patch b/main/cyrus-sasl/fix-saslauthd-man-page.patch
new file mode 100644
index 0000000000..c6ecc4ce0c
--- /dev/null
+++ b/main/cyrus-sasl/fix-saslauthd-man-page.patch
@@ -0,0 +1,31 @@
+Fixes https://gitlab.alpinelinux.org/alpine/aports/-/issues/12342
+
+See: https://github.com/cyrusimap/cyrus-sasl/pull/569
+
+diff -upr cyrus-sasl-2.1.27.orig/saslauthd/Makefile.am cyrus-sasl-2.1.27/saslauthd/Makefile.am
+--- cyrus-sasl-2.1.27.orig/saslauthd/Makefile.am 2021-01-23 12:19:13.058918319 +0100
++++ cyrus-sasl-2.1.27/saslauthd/Makefile.am 2021-01-23 12:20:07.132516526 +0100
+@@ -32,20 +32,15 @@ testsaslauthd_LDADD = @LIB_SOCKET@
+
+ saslcache_SOURCES = saslcache.c
+
+-EXTRA_DIST = saslauthd.8 saslauthd.mdoc include \
++EXTRA_DIST = saslauthd.mdoc include \
+ getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD
+ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)/common -I$(top_srcdir)/common
+ DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I..
+
+
+-dist-hook: saslauthd.8
+-
+-saslauthd.8: saslauthd.mdoc
+- nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8
+-
+-install-data-local: saslauthd.8
++install-data-local: saslauthd.mdoc
+ $(mkinstalldirs) $(DESTDIR)$(mandir)/man8
+- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8
++ $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8
+
+ uninstall-local:
+ -rm -rf $(DESTDIR)$(mandir)/man8/saslauthd.8
diff --git a/main/cython/APKBUILD b/main/cython/APKBUILD
index f158ef9e38..6e579ab392 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.21
+pkgver=0.29.22
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="2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679 cython-0.29.21.tar.gz"
+sha512sums="b7f22112678f159bf1d0ad5fe4f7c103e96f240bab4d9dc07edd7c2f66a9887b9af72b32f1d5886361b48d428bc2b9499d3c5b59ce5af1068f20a26549783dd6 cython-0.29.22.tar.gz"
diff --git a/main/czmq/APKBUILD b/main/czmq/APKBUILD
index 3c62aa2f76..f007ea70ac 100644
--- a/main/czmq/APKBUILD
+++ b/main/czmq/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=czmq
-pkgver=4.2.0
-pkgrel=2
+pkgver=4.2.1
+pkgrel=0
pkgdesc="High-level C binding for ZeroMQ"
url="http://czmq.zeromq.org/"
arch="all !s390x" # zproxy test timeouts on s390x
@@ -39,4 +39,4 @@ package() {
mv "$pkgdir"/usr/share/cmake "$pkgdir"/usr/lib
}
-sha512sums="d6b6356c07095579e6780386e6c5ead6f87c1f3a80d15afbfaea24a9c108ef13ab750e7dcffbcc4d8528fb5b14b0b28f08008d513b2cf85f2df10b7cf5903212 czmq-4.2.0.tar.gz"
+sha512sums="65a21f7bd5935b119e1b24ce3b2ce8462031ab7c9a4ba587bb99fe618c9f8cb672cfa202993ddd79e0fb0f154ada06560b79a1b4f762fcce8f88f2f450ecee01 czmq-4.2.1.tar.gz"
diff --git a/main/dahdi-linux-lts/APKBUILD b/main/dahdi-linux-lts/APKBUILD
index cc5d48dcc2..b8814add19 100644
--- a/main/dahdi-linux-lts/APKBUILD
+++ b/main/dahdi-linux-lts/APKBUILD
@@ -9,7 +9,7 @@ _rel=0
_flavor=${FLAVOR:-lts}
_kpkg=linux-$_flavor
-_kver=5.4.80
+_kver=5.10.19
_krel=0
_kpkgver="$_kver-r$_krel"
@@ -20,7 +20,7 @@ pkgver=$_kver
pkgrel=$(( $_krel + $_rel ))
pkgdesc="Digium Asterisk Hardware Device Interface drivers"
-url="http://www.asterisk.org"
+url="https://www.asterisk.org/"
arch="x86_64"
license="GPL-2.0-or-later"
depends="dahdi-linux $_kpkg=$_kpkgver"
@@ -31,8 +31,9 @@ subpackages="$pkgname-dev"
source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_name}-$_ver.tar.gz
dahdi-depmod.patch
dahdi-bri_dchan.patch
- kernel-compat-5.0.patch
kernel-compat-5.4.patch
+ kernel-5.6.patch
+ kernel-5.9.patch
"
builddir="$srcdir/$_name-$_ver"
@@ -78,5 +79,6 @@ dev() {
sha512sums="440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4 dahdi-linux-3.1.0.tar.gz
aba01eb90d9db1c595ff22078c76aadb20900486b5794d38b7ee61fa30d2fb51be318a4d059246017640447aee03fb09bb5514c818e3caa1cd98e331ec065173 dahdi-depmod.patch
fa2fa9e96eefc0f31a1a4a8f8f44e77936f6da0d7b74fe3c3d1f0de085621744ae4367932ac97a10b7f96b7d0954843b0bfe07a251b85434079cc6da29e243ba dahdi-bri_dchan.patch
-342f2467aae3ef00440d613a0bb4e8bd06cd1df2d4c9878ba8cf4af0eaa5b9cd7455c14e10c66c462f29812560622187bfb12b35b7b6cb466475a365dd998f40 kernel-compat-5.0.patch
-a03fde27c801bd7a9f5267505072a50dc738dcac9cafb08539bbd38eb78f3bb688f067bbbcbe05521a6f38fe28d4e8bfee68c30acea24647a4ea0d28a05bd987 kernel-compat-5.4.patch"
+a03fde27c801bd7a9f5267505072a50dc738dcac9cafb08539bbd38eb78f3bb688f067bbbcbe05521a6f38fe28d4e8bfee68c30acea24647a4ea0d28a05bd987 kernel-compat-5.4.patch
+136f49357761252cde233e664c1972beb140877ae46d8095364377eafcbe3ca908adcb6741881d9b0d0716a8525cda134e1db221f38b1ef3d39aea0b9c522b0d kernel-5.6.patch
+2430f50caf6145c0fc3c318fb54968004939a5eb7a3e2d85e9a91a2a71b8408a16cecc63e8c741659b6974bad078d0ead540e5364729e29a62ba81c84638923a kernel-5.9.patch"
diff --git a/main/dahdi-linux-lts/kernel-5.6.patch b/main/dahdi-linux-lts/kernel-5.6.patch
new file mode 100644
index 0000000000..6cb63b8649
--- /dev/null
+++ b/main/dahdi-linux-lts/kernel-5.6.patch
@@ -0,0 +1,499 @@
+From 34b9c77c9ab2794d4e912461e4c1080c4b1f6184 Mon Sep 17 00:00:00 2001
+From: Shaun Ruffell <sruffell@sruffell.net>
+Date: Sun, 23 Feb 2020 19:39:24 -0600
+Subject: [PATCH] Use proc_ops on kernels >= 5.6
+
+In commit (d56c0d45f0e27 "proc: decouple proc from VFS with "struct proc_ops"")
+[1], proc_create_data no longer takes a file_operations structure, but instead
+takes a struct proc_ops in order to conserve memory in the kernel.
+
+This change is necessary for DAHDI to work with kernels >= 5.6
+
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d56c0d45f0e27f814e87a1676b6bd
+
+Signed-off-by: Shaun Ruffell <sruffell@sruffell.net>
+---
+ drivers/dahdi/dahdi-base.c | 9 +++++
+ drivers/dahdi/dahdi_dynamic_ethmf.c | 18 +++++++---
+ drivers/dahdi/xpp/card_bri.c | 23 ++++++++++---
+ drivers/dahdi/xpp/card_fxo.c | 25 ++++++++++----
+ drivers/dahdi/xpp/card_fxs.c | 35 +++++++++++++++++---
+ drivers/dahdi/xpp/xbus-core.c | 62 ++++++++++++++++++++++++++++-------
+ drivers/dahdi/xpp/xpp_dahdi.c | 23 ++++++++++---
+ drivers/dahdi/xpp/xpp_usb.c | 26 +++++++++++----
+ include/dahdi/kernel.h | 11 +++++--
+ 9 files changed, 187 insertions(+), 45 deletions(-)
+
+diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
+index d05eff9..4fb06d9 100644
+--- a/drivers/dahdi/dahdi-base.c
++++ b/drivers/dahdi/dahdi-base.c
+@@ -1015,6 +1015,14 @@ static int dahdi_proc_open(struct inode *inode, struct file *file)
+ return single_open(file, dahdi_seq_show, PDE_DATA(inode));
+ }
+
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops dahdi_proc_ops = {
++ .proc_open = dahdi_proc_open,
++ .proc_read = seq_read,
++ .proc_lseek = seq_lseek,
++ .proc_release = single_release,
++};
++#else
+ static const struct file_operations dahdi_proc_ops = {
+ .owner = THIS_MODULE,
+ .open = dahdi_proc_open,
+@@ -1022,6 +1030,7 @@ static const struct file_operations dahdi_proc_ops = {
+ .llseek = seq_lseek,
+ .release = single_release,
+ };
++#endif /* DAHDI_HAVE_PROC_OPS */
+
+ #endif
+
+diff --git a/drivers/dahdi/dahdi_dynamic_ethmf.c b/drivers/dahdi/dahdi_dynamic_ethmf.c
+index b729079..022afc7 100644
+--- a/drivers/dahdi/dahdi_dynamic_ethmf.c
++++ b/drivers/dahdi/dahdi_dynamic_ethmf.c
+@@ -733,12 +733,22 @@ static int ztdethmf_proc_open(struct inode *inode, struct file *file)
+ return single_open(file, ztdethmf_proc_show, NULL);
+ }
+
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops ztdethmf_proc_fops = {
++ .proc_open = ztdethmf_proc_open,
++ .proc_read = seq_read,
++ .proc_lseek = seq_lseek,
++ .proc_release = seq_release,
++};
++#else
+ static const struct file_operations ztdethmf_proc_fops = {
+- .open = ztdethmf_proc_open,
+- .read = seq_read,
+- .llseek = seq_lseek,
+- .release = seq_release,
++ .owner = THIS_MODULE,
++ .open = ztdethmf_proc_open,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = seq_release,
+ };
++#endif /* DAHDI_HAVE_PROC_OPS */
+ #endif
+
+ static int __init ztdethmf_init(void)
+diff --git a/drivers/dahdi/xpp/card_bri.c b/drivers/dahdi/xpp/card_bri.c
+index 12efecf..5d819ca 100644
+--- a/drivers/dahdi/xpp/card_bri.c
++++ b/drivers/dahdi/xpp/card_bri.c
+@@ -153,8 +153,12 @@ static int write_state_register(xpd_t *xpd, __u8 value);
+ static bool bri_packet_is_valid(xpacket_t *pack);
+ static void bri_packet_dump(const char *msg, xpacket_t *pack);
+ #ifdef CONFIG_PROC_FS
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops proc_bri_info_ops;
++#else
+ static const struct file_operations proc_bri_info_ops;
+ #endif
++#endif
+ static int bri_spanconfig(struct file *file, struct dahdi_span *span,
+ struct dahdi_lineconfig *lc);
+ static int bri_chanconfig(struct file *file, struct dahdi_chan *chan,
+@@ -1740,13 +1744,22 @@ static int proc_bri_info_open(struct inode *inode, struct file *file)
+ return single_open(file, proc_bri_info_show, PDE_DATA(inode));
+ }
+
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops proc_bri_info_ops = {
++ .proc_open = proc_bri_info_open,
++ .proc_read = seq_read,
++ .proc_lseek = seq_lseek,
++ .proc_release = single_release,
++};
++#else
+ static const struct file_operations proc_bri_info_ops = {
+- .owner = THIS_MODULE,
+- .open = proc_bri_info_open,
+- .read = seq_read,
+- .llseek = seq_lseek,
+- .release = single_release,
++ .owner = THIS_MODULE,
++ .open = proc_bri_info_open,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = single_release,
+ };
++#endif /* DAHDI_HAVE_PROC_OPS */
+ #endif
+
+ static int bri_xpd_probe(struct device *dev)
+diff --git a/drivers/dahdi/xpp/card_fxo.c b/drivers/dahdi/xpp/card_fxo.c
+index 1dbd299..82dbb7a 100644
+--- a/drivers/dahdi/xpp/card_fxo.c
++++ b/drivers/dahdi/xpp/card_fxo.c
+@@ -107,9 +107,13 @@ enum fxo_leds {
+ static bool fxo_packet_is_valid(xpacket_t *pack);
+ static void fxo_packet_dump(const char *msg, xpacket_t *pack);
+ #ifdef CONFIG_PROC_FS
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops proc_fxo_info_ops;
++#else
+ static const struct file_operations proc_fxo_info_ops;
++#endif
+ #ifdef WITH_METERING
+-static const struct file_operations proc_xpd_metering_ops;
++static const struct proc_ops proc_xpd_metering_ops;
+ #endif
+ #endif
+ static void dahdi_report_battery(xpd_t *xpd, lineno_t chan);
+@@ -1484,13 +1488,22 @@ static int proc_fxo_info_open(struct inode *inode, struct file *file)
+ return single_open(file, proc_fxo_info_show, PDE_DATA(inode));
+ }
+
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops proc_fxo_info_ops = {
++ .proc_open = proc_fxo_info_open,
++ .proc_read = seq_read,
++ .proc_lseek = seq_lseek,
++ .proc_release = single_release,
++};
++#else
+ static const struct file_operations proc_fxo_info_ops = {
+- .owner = THIS_MODULE,
+- .open = proc_fxo_info_open,
+- .read = seq_read,
+- .llseek = seq_lseek,
+- .release = single_release,
++ .owner = THIS_MODULE,
++ .open = proc_fxo_info_open,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = single_release,
+ };
++#endif
+
+ #ifdef WITH_METERING
+ static int proc_xpd_metering_show(struct seq_file *sfile, void *not_used)
+diff --git a/drivers/dahdi/xpp/card_fxs.c b/drivers/dahdi/xpp/card_fxs.c
+index a3a9233..bb1c169 100644
+--- a/drivers/dahdi/xpp/card_fxs.c
++++ b/drivers/dahdi/xpp/card_fxs.c
+@@ -160,11 +160,19 @@ enum neon_state {
+ static bool fxs_packet_is_valid(xpacket_t *pack);
+ static void fxs_packet_dump(const char *msg, xpacket_t *pack);
+ #ifdef CONFIG_PROC_FS
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops proc_fxs_info_ops;
++#else
+ static const struct file_operations proc_fxs_info_ops;
++#endif
+ #ifdef WITH_METERING
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops proc_xpd_metering_ops;
++#else
+ static const struct file_operations proc_xpd_metering_ops;
+ #endif
+ #endif
++#endif
+ static void start_stop_vm_led(xbus_t *xbus, xpd_t *xpd, lineno_t pos);
+
+ #define PROC_FXS_INFO_FNAME "fxs_info"
+@@ -2115,13 +2123,22 @@ static int proc_fxs_info_open(struct inode *inode, struct file *file)
+ return single_open(file, proc_fxs_info_show, PDE_DATA(inode));
+ }
+
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops proc_fxs_info_ops = {
++ .proc_open = proc_fxs_info_open,
++ .proc_read = seq_read,
++ .proc_lseek = seq_lseek,
++ .proc_release = single_release,
++};
++#else
+ static const struct file_operations proc_fxs_info_ops = {
+- .owner = THIS_MODULE,
+- .open = proc_fxs_info_open,
+- .read = seq_read,
+- .llseek = seq_lseek,
+- .release = single_release,
++ .owner = THIS_MODULE,
++ .open = proc_fxs_info_open,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = single_release,
+ };
++#endif
+
+ #ifdef WITH_METERING
+ static ssize_t proc_xpd_metering_write(struct file *file,
+@@ -2165,12 +2182,20 @@ static int proc_xpd_metering_open(struct inode *inode, struct file *file)
+ file->private_data = PDE_DATA(inode);
+ }
+
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops proc_xpd_metering_ops = {
++ .proc_open = proc_xpd_metering_open,
++ .proc_write = proc_xpd_metering_write,
++ .proc_release = single_release,
++};
++#else
+ static const struct file_operations proc_xpd_metering_ops = {
+ .owner = THIS_MODULE,
+ .open = proc_xpd_metering_open,
+ .write = proc_xpd_metering_write,
+ .release = single_release,
+ };
++#endif /* DAHDI_HAVE_PROC_OPS */
+ #endif
+ #endif
+
+diff --git a/drivers/dahdi/xpp/xbus-core.c b/drivers/dahdi/xpp/xbus-core.c
+index fc4ce7b..ed7c0f9 100644
+--- a/drivers/dahdi/xpp/xbus-core.c
++++ b/drivers/dahdi/xpp/xbus-core.c
+@@ -50,8 +50,15 @@ static const char rcsid[] = "$Id$";
+ #ifdef PROTOCOL_DEBUG
+ #ifdef CONFIG_PROC_FS
+ #define PROC_XBUS_COMMAND "command"
++
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops proc_xbus_command_ops;
++#else
+ static const struct file_operations proc_xbus_command_ops;
++#endif /* DAHDI_HAVE_PROC_OPS */
++
+ #endif
++
+ #endif
+
+ /* Command line parameters */
+@@ -65,8 +72,15 @@ static DEF_PARM_BOOL(dahdi_autoreg, 0, 0444,
+ "Register devices automatically (1) or not (0). UNUSED.");
+
+ #ifdef CONFIG_PROC_FS
++
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops xbus_read_proc_ops;
++#else
+ static const struct file_operations xbus_read_proc_ops;
+-#endif
++#endif /* DAHDI_HAVE_PROC_OPS */
++
++#endif /* CONFIG_PROC_FS */
++
+ static void transport_init(xbus_t *xbus, struct xbus_ops *ops,
+ ushort max_send_size,
+ struct device *transport_device, void *priv);
+@@ -1828,13 +1842,22 @@ static int xbus_read_proc_open(struct inode *inode, struct file *file)
+ return single_open(file, xbus_proc_show, PDE_DATA(inode));
+ }
+
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops xbus_read_proc_ops = {
++ .proc_open = xbus_read_proc_open,
++ .proc_read = seq_read,
++ .proc_lseek = seq_lseek,
++ .proc_release = single_release,
++};
++#else
+ static const struct file_operations xbus_read_proc_ops = {
+- .owner = THIS_MODULE,
+- .open = xbus_read_proc_open,
+- .read = seq_read,
+- .llseek = seq_lseek,
+- .release = single_release,
++ .owner = THIS_MODULE,
++ .open = xbus_read_proc_open,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = single_release,
+ };
++#endif /* DAHDI_HAVE_PROC_OPS */
+
+ #ifdef PROTOCOL_DEBUG
+ static ssize_t proc_xbus_command_write(struct file *file,
+@@ -1927,11 +1950,19 @@ static int proc_xbus_command_open(struct inode *inode, struct file *file)
+ return 0;
+ }
+
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops proc_xbus_command_ops = {
++ .proc_open = proc_xbus_command_open,
++ .proc_write = proc_xbus_command_write,
++};
++#else
+ static const struct file_operations proc_xbus_command_ops = {
+ .owner = THIS_MODULE,
+ .open = proc_xbus_command_open,
+ .write = proc_xbus_command_write,
+ };
++#endif /* DAHDI_HAVE_PROC_OPS */
++
+ #endif
+
+ static int xpp_proc_read_show(struct seq_file *sfile, void *data)
+@@ -1961,13 +1992,22 @@ static int xpp_proc_read_open(struct inode *inode, struct file *file)
+ return single_open(file, xpp_proc_read_show, PDE_DATA(inode));
+ }
+
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops xpp_proc_read_ops = {
++ .proc_open = xpp_proc_read_open,
++ .proc_read = seq_read,
++ .proc_lseek = seq_lseek,
++ .proc_release = single_release,
++};
++#else
+ static const struct file_operations xpp_proc_read_ops = {
+- .owner = THIS_MODULE,
+- .open = xpp_proc_read_open,
+- .read = seq_read,
+- .llseek = seq_lseek,
+- .release = single_release,
++ .owner = THIS_MODULE,
++ .open = xpp_proc_read_open,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = single_release,
+ };
++#endif /* DAHDI_HAVE_PROC_OPS */
+
+ #endif
+
+diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c
+index ecc272b..fd8b835 100644
+--- a/drivers/dahdi/xpp/xpp_dahdi.c
++++ b/drivers/dahdi/xpp/xpp_dahdi.c
+@@ -103,8 +103,12 @@ int total_registered_spans(void)
+ }
+
+ #ifdef CONFIG_PROC_FS
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops xpd_read_proc_ops;
++#else
+ static const struct file_operations xpd_read_proc_ops;
+ #endif
++#endif
+
+ /*------------------------- XPD Management -------------------------*/
+
+@@ -392,13 +396,22 @@ static int xpd_read_proc_open(struct inode *inode, struct file *file)
+ return single_open(file, xpd_read_proc_show, PDE_DATA(inode));
+ }
+
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops xpd_read_proc_ops = {
++ .proc_open = xpd_read_proc_open,
++ .proc_read = seq_read,
++ .proc_lseek = seq_lseek,
++ .proc_release = single_release,
++};
++#else
+ static const struct file_operations xpd_read_proc_ops = {
+- .owner = THIS_MODULE,
+- .open = xpd_read_proc_open,
+- .read = seq_read,
+- .llseek = seq_lseek,
+- .release = single_release,
++ .owner = THIS_MODULE,
++ .open = xpd_read_proc_open,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = single_release,
+ };
++#endif
+
+ #endif
+
+diff --git a/drivers/dahdi/xpp/xpp_usb.c b/drivers/dahdi/xpp/xpp_usb.c
+index 1a591b1..bae2f57 100644
+--- a/drivers/dahdi/xpp/xpp_usb.c
++++ b/drivers/dahdi/xpp/xpp_usb.c
+@@ -227,9 +227,14 @@ static void xpp_receive_callback(struct urb *urb);
+ static int xusb_probe(struct usb_interface *interface,
+ const struct usb_device_id *id);
+ static void xusb_disconnect(struct usb_interface *interface);
+-#ifdef CONFIG_PROC_FS
++
++#ifdef CONFIG_PROC_FS
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops xusb_read_proc_ops;
++#else
+ static const struct file_operations xusb_read_proc_ops;
+ #endif
++#endif
+
+ /*------------------------------------------------------------------*/
+
+@@ -1108,13 +1113,22 @@ static int xusb_read_proc_open(struct inode *inode, struct file *file)
+ return single_open(file, xusb_read_proc_show, PDE_DATA(inode));
+ }
+
++#ifdef DAHDI_HAVE_PROC_OPS
++static const struct proc_ops xusb_read_proc_ops = {
++ .proc_open = xusb_read_proc_open,
++ .proc_read = seq_read,
++ .proc_lseek = seq_lseek,
++ .proc_release = single_release,
++};
++#else
+ static const struct file_operations xusb_read_proc_ops = {
+- .owner = THIS_MODULE,
+- .open = xusb_read_proc_open,
+- .read = seq_read,
+- .llseek = seq_lseek,
+- .release = single_release,
++ .owner = THIS_MODULE,
++ .open = xusb_read_proc_open,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = single_release,
+ };
++#endif
+
+
+ #endif
+diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
+index cf629eb..dc16f81 100644
+--- a/include/dahdi/kernel.h
++++ b/include/dahdi/kernel.h
+@@ -62,6 +62,8 @@
+ #define HAVE_NET_DEVICE_OPS
+ #endif
+
++#define DAHDI_HAVE_PROC_OPS
++
+ /* __dev* were removed in 3.8. They still have effect in 2.6.18. */
+ #ifndef __devinit
+ # define __devinit
+@@ -1369,6 +1371,10 @@ static inline short dahdi_txtone_nextsample(struct dahdi_chan *ss)
+ /*! Maximum audio mask */
+ #define DAHDI_FORMAT_AUDIO_MASK ((1 << 16) - 1)
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
++
++#undef DAHDI_HAVE_PROC_OPS
++
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+
+ #ifndef TIMER_DATA_TYPE
+@@ -1479,14 +1485,13 @@ static inline void *PDE_DATA(const struct inode *inode)
+ #endif /* 4.10.0 */
+ #endif /* 4.11.0 */
+ #endif /* 4.13.0 */
+-#else /* >= 4.15.0 */
++#endif /* 4.15.0 */
++#endif /* 5.6 */
+
+ #ifndef TIMER_DATA_TYPE
+ #define TIMER_DATA_TYPE struct timer_list *
+ #endif
+
+-#endif /* 4.15.0 */
+-
+ #ifndef dahdi_ktime_equal
+ static inline int dahdi_ktime_equal(const ktime_t cmp1, const ktime_t cmp2)
+ {
+--
+1.7.9.5
+
diff --git a/main/dahdi-linux-lts/kernel-5.9.patch b/main/dahdi-linux-lts/kernel-5.9.patch
new file mode 100644
index 0000000000..75c23a548f
--- /dev/null
+++ b/main/dahdi-linux-lts/kernel-5.9.patch
@@ -0,0 +1,249 @@
+From 4df746fe3ffd6678f36b16c9b0750fa552da92e4 Mon Sep 17 00:00:00 2001
+From: Shaun Ruffell <sruffell@sruffell.net>
+Date: Mon, 16 Nov 2020 22:01:21 -0600
+Subject: [PATCH] Remove support for 32-bit userspace with 64-bit kernel
+
+I am not aware of anyone who tests in this configuration, and I'm not
+sure if it currently works. I'll remove any support for the time being
+and can add it back in if someone comes forward needing support for it.
+
+Signed-off-by: Shaun Ruffell <sruffell@sruffell.net>
+---
+ drivers/dahdi/dahdi-base.c | 34 ----------------------------------
+ 1 file changed, 34 deletions(-)
+
+diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
+index 4fb06d9..9fb0c79 100644
+--- a/drivers/dahdi/dahdi-base.c
++++ b/drivers/dahdi/dahdi-base.c
+@@ -7019,17 +7019,6 @@ static int dahdi_ioctl(struct inode *inode, struct file *file,
+ }
+ #endif
+
+-#ifdef HAVE_COMPAT_IOCTL
+-static long dahdi_ioctl_compat(struct file *file, unsigned int cmd,
+- unsigned long data)
+-{
+- if (cmd == DAHDI_SFCONFIG)
+- return -ENOTTY; /* Not supported yet */
+-
+- return dahdi_unlocked_ioctl(file, cmd, data);
+-}
+-#endif
+-
+ /**
+ * _get_next_channo - Return the next taken channel number from the span list.
+ * @span: The span with which to start the search.
+@@ -10285,9 +10274,6 @@ static const struct file_operations dahdi_fops = {
+ .release = dahdi_release,
+ #ifdef HAVE_UNLOCKED_IOCTL
+ .unlocked_ioctl = dahdi_unlocked_ioctl,
+-#ifdef HAVE_COMPAT_IOCTL
+- .compat_ioctl = dahdi_ioctl_compat,
+-#endif
+ #else
+ .ioctl = dahdi_ioctl,
+ #endif
+@@ -10301,9 +10287,6 @@ static const struct file_operations dahdi_timer_fops = {
+ .release = dahdi_timer_release,
+ #ifdef HAVE_UNLOCKED_IOCTL
+ .unlocked_ioctl = dahdi_timer_unlocked_ioctl,
+-#ifdef HAVE_COMPAT_IOCTL
+- .compat_ioctl = dahdi_timer_unlocked_ioctl,
+-#endif
+ #else
+ .ioctl = dahdi_timer_ioctl,
+ #endif
+@@ -10377,24 +10360,10 @@ static int nodev_ioctl(struct inode *inode, struct file *file,
+ }
+ #endif
+
+-#ifdef HAVE_COMPAT_IOCTL
+-static long nodev_ioctl_compat(struct file *file, unsigned int cmd,
+- unsigned long data)
+-{
+- if (cmd == DAHDI_SFCONFIG)
+- return -ENOTTY; /* Not supported yet */
+-
+- return nodev_unlocked_ioctl(file, cmd, data);
+-}
+-#endif
+-
+ static const struct file_operations nodev_fops = {
+ .owner = THIS_MODULE,
+ #ifdef HAVE_UNLOCKED_IOCTL
+ .unlocked_ioctl = nodev_unlocked_ioctl,
+-#ifdef HAVE_COMPAT_IOCTL
+- .compat_ioctl = nodev_ioctl_compat,
+-#endif
+ #else
+ .ioctl = nodev_ioctl,
+ #endif
+@@ -10409,9 +10378,6 @@ static const struct file_operations dahdi_chan_fops = {
+ .release = dahdi_release,
+ #ifdef HAVE_UNLOCKED_IOCTL
+ .unlocked_ioctl = dahdi_unlocked_ioctl,
+-#ifdef HAVE_COMPAT_IOCTL
+- .compat_ioctl = dahdi_ioctl_compat,
+-#endif
+ #else
+ .ioctl = dahdi_ioctl,
+ #endif
+--
+1.7.9.5
+
+From 6d4c748e0470efac90e7dc4538ff3c5da51f0169 Mon Sep 17 00:00:00 2001
+From: Shaun Ruffell <sruffell@sruffell.net>
+Date: Mon, 16 Nov 2020 22:01:22 -0600
+Subject: [PATCH] Remove checks for HAVE_UNLOCKED_IOCTL for kernel >= 5.9
+
+In upstream commit (4e24566a134ea1674 "fs: remove the HAVE_UNLOCKED_IOCTL and
+HAVE_COMPAT_IOCTL defines") [1] the kernel removed these defines.
+
+All supported kernels include support for the unlocked_ioctl now, so
+DAHDI can also remove these checks.
+
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4e24566a134ea167441a1ffa3d439a27c
+
+Signed-off-by: Shaun Ruffell <sruffell@sruffell.net>
+---
+ drivers/dahdi/dahdi-base.c | 44 ---------------------------------------
+ drivers/dahdi/dahdi_transcode.c | 11 ----------
+ 2 files changed, 55 deletions(-)
+
+diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
+index 9fb0c79..bb51e9c 100644
+--- a/drivers/dahdi/dahdi-base.c
++++ b/drivers/dahdi/dahdi-base.c
+@@ -53,10 +53,6 @@
+ #include <linux/ktime.h>
+ #include <linux/slab.h>
+
+-#if defined(HAVE_UNLOCKED_IOCTL) && defined(CONFIG_BKL)
+-#include <linux/smp_lock.h>
+-#endif
+-
+ #include <linux/ppp_defs.h>
+
+ #include <asm/atomic.h>
+@@ -4069,14 +4065,6 @@ dahdi_timer_unlocked_ioctl(struct file *file, unsigned int cmd,
+ return 0;
+ }
+
+-#ifndef HAVE_UNLOCKED_IOCTL
+-static int dahdi_timer_ioctl(struct inode *inode, struct file *file,
+- unsigned int cmd, unsigned long data)
+-{
+- return dahdi_timer_unlocked_ioctl(file, cmd, data);
+-}
+-#endif
+-
+ static int dahdi_ioctl_getgains(struct file *file, unsigned long data)
+ {
+ int res = 0;
+@@ -7011,14 +6999,6 @@ exit:
+ return ret;
+ }
+
+-#ifndef HAVE_UNLOCKED_IOCTL
+-static int dahdi_ioctl(struct inode *inode, struct file *file,
+- unsigned int cmd, unsigned long data)
+-{
+- return dahdi_unlocked_ioctl(file, cmd, data);
+-}
+-#endif
+-
+ /**
+ * _get_next_channo - Return the next taken channel number from the span list.
+ * @span: The span with which to start the search.
+@@ -10272,11 +10252,7 @@ static const struct file_operations dahdi_fops = {
+ .owner = THIS_MODULE,
+ .open = dahdi_open,
+ .release = dahdi_release,
+-#ifdef HAVE_UNLOCKED_IOCTL
+ .unlocked_ioctl = dahdi_unlocked_ioctl,
+-#else
+- .ioctl = dahdi_ioctl,
+-#endif
+ .poll = dahdi_poll,
+ .read = dahdi_no_read,
+ .write = dahdi_no_write,
+@@ -10285,11 +10261,7 @@ static const struct file_operations dahdi_fops = {
+ static const struct file_operations dahdi_timer_fops = {
+ .owner = THIS_MODULE,
+ .release = dahdi_timer_release,
+-#ifdef HAVE_UNLOCKED_IOCTL
+ .unlocked_ioctl = dahdi_timer_unlocked_ioctl,
+-#else
+- .ioctl = dahdi_timer_ioctl,
+-#endif
+ .poll = dahdi_timer_poll,
+ .read = dahdi_no_read,
+ .write = dahdi_no_write,
+@@ -10352,21 +10324,9 @@ nodev_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long data)
+ return nodev_common("ioctl");
+ }
+
+-#ifndef HAVE_UNLOCKED_IOCTL
+-static int nodev_ioctl(struct inode *inode, struct file *file,
+- unsigned int cmd, unsigned long data)
+-{
+- return nodev_unlocked_ioctl(file, cmd, data);
+-}
+-#endif
+-
+ static const struct file_operations nodev_fops = {
+ .owner = THIS_MODULE,
+-#ifdef HAVE_UNLOCKED_IOCTL
+ .unlocked_ioctl = nodev_unlocked_ioctl,
+-#else
+- .ioctl = nodev_ioctl,
+-#endif
+ .read = nodev_chan_read,
+ .write = nodev_chan_write,
+ .poll = nodev_chan_poll,
+@@ -10376,11 +10336,7 @@ static const struct file_operations dahdi_chan_fops = {
+ .owner = THIS_MODULE,
+ .open = dahdi_open,
+ .release = dahdi_release,
+-#ifdef HAVE_UNLOCKED_IOCTL
+ .unlocked_ioctl = dahdi_unlocked_ioctl,
+-#else
+- .ioctl = dahdi_ioctl,
+-#endif
+ .read = dahdi_chan_read,
+ .write = dahdi_chan_write,
+ .poll = dahdi_chan_poll,
+diff --git a/drivers/dahdi/dahdi_transcode.c b/drivers/dahdi/dahdi_transcode.c
+index a495dcf..6021aac 100644
+--- a/drivers/dahdi/dahdi_transcode.c
++++ b/drivers/dahdi/dahdi_transcode.c
+@@ -397,13 +397,6 @@ static long dahdi_tc_unlocked_ioctl(struct file *file, unsigned int cmd, unsigne
+ };
+ }
+
+-#ifndef HAVE_UNLOCKED_IOCTL
+-static int dahdi_tc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long data)
+-{
+- return (int)dahdi_tc_unlocked_ioctl(file, cmd, data);
+-}
+-#endif
+-
+ static unsigned int dahdi_tc_poll(struct file *file, struct poll_table_struct *wait_table)
+ {
+ int ret;
+@@ -427,11 +420,7 @@ static struct file_operations __dahdi_transcode_fops = {
+ .owner = THIS_MODULE,
+ .open = dahdi_tc_open,
+ .release = dahdi_tc_release,
+-#ifdef HAVE_UNLOCKED_IOCTL
+ .unlocked_ioctl = dahdi_tc_unlocked_ioctl,
+-#else
+- .ioctl = dahdi_tc_ioctl,
+-#endif
+ .read = dahdi_tc_read,
+ .write = dahdi_tc_write,
+ .poll = dahdi_tc_poll,
+--
+1.7.9.5
+
diff --git a/main/dahdi-linux-lts/kernel-compat-5.0.patch b/main/dahdi-linux-lts/kernel-compat-5.0.patch
deleted file mode 100644
index 3729db3c0c..0000000000
--- a/main/dahdi-linux-lts/kernel-compat-5.0.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/include/dahdi/kernel.h
-+++ b/include/dahdi/kernel.h
-@@ -1695,4 +1695,15 @@
-
- #endif /* DAHDI_PRINK_MACROS_USE_debug */
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
-+static inline void do_gettimeofday(struct timeval *tv)
-+{
-+ struct timespec64 now;
-+
-+ ktime_get_real_ts64(&now);
-+ tv->tv_sec = now.tv_sec;
-+ tv->tv_usec = now.tv_nsec/1000;
-+}
-+#endif
-+
- #endif /* _DAHDI_KERNEL_H */
-
diff --git a/main/darkhttpd/0001-Add-svg-support-to-default-mimetypes.patch b/main/darkhttpd/0001-Add-svg-support-to-default-mimetypes.patch
deleted file mode 100644
index b81c7e4247..0000000000
--- a/main/darkhttpd/0001-Add-svg-support-to-default-mimetypes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c5412405c3a697d4bb8ecae96442a9d1c050983a Mon Sep 17 00:00:00 2001
-From: Carlo Landmeter <clandmeter@alpinelinux.org>
-Date: Mon, 14 May 2018 09:01:32 +0000
-Subject: [PATCH] Add svg support to default mimetypes
-
----
- darkhttpd.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/darkhttpd.c b/darkhttpd.c
-index 1c5eff5..6b81bf8 100644
---- a/darkhttpd.c
-+++ b/darkhttpd.c
-@@ -317,6 +317,7 @@ static const char *default_extension_map[] = {
- "image/gif" " gif",
- "image/jpeg" " jpeg jpe jpg",
- "image/png" " png",
-+ "image/svg+xml" " svg svgz",
- "text/css" " css",
- "text/html" " html htm",
- "text/javascript" " js",
---
-2.17.0
-
diff --git a/main/darkhttpd/APKBUILD b/main/darkhttpd/APKBUILD
index ead1738329..f22aaa0226 100644
--- a/main/darkhttpd/APKBUILD
+++ b/main/darkhttpd/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Alan Lacerda <alacerda@alpinelinux.org>
# Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
pkgname=darkhttpd
-pkgver=1.12
-pkgrel=5
+pkgver=1.13
+pkgrel=0
pkgdesc="A simple, single-threaded, static content webserver"
url="https://unix4lyfe.org/darkhttpd/"
arch="all"
@@ -10,12 +10,10 @@ license="ISC"
options="!check" # no tests
install="$pkgname.pre-install"
subpackages="$pkgname-openrc"
-source="https://unix4lyfe.org/darkhttpd/darkhttpd-$pkgver.tar.bz2
+source="darkhttpd-$pkgver.tar.gz::https://github.com/emikulic/darkhttpd/archive/v$pkgver.tar.gz
darkhttpd.logrotate
darkhttpd.initd
darkhttpd.confd
-
- 0001-Add-svg-support-to-default-mimetypes.patch
"
build() {
@@ -23,16 +21,15 @@ build() {
}
package() {
- install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
+ install -Dm755 darkhttpd "$pkgdir"/usr/bin/darkhttpd
install -d "$pkgdir"/var/www/localhost/htdocs \
"$pkgdir"/var/log/darkhttpd
- install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
- install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+ install -Dm755 "$srcdir"/darkhttpd.initd "$pkgdir"/etc/init.d/darkhttpd
+ install -Dm644 "$srcdir"/darkhttpd.confd "$pkgdir"/etc/conf.d/darkhttpd
}
-sha512sums="e977ba0401b24a122733f8d5084fcdea4a3e2664dd5c127b26b822bfdbe458124104b1d5c673a8689af988b5713ce2e902945238b815b82104f286f577eea8bd darkhttpd-1.12.tar.bz2
+sha512sums="2c8c5dd225f3ba8b636adeae049039b5c3f852b3efe17969075cd361c34f7bfbef9efa6d64a0a9c6021fae939d85befe92981923e1fa3d326c8a8402f3358868 darkhttpd-1.13.tar.gz
bb95277a9f8f227aeec8bfe6ef54f52a2f034ed0dd25258b996c17f9ce9dd4ad220366b10490246b25bb6b18ccde7bda0d52eeb88667941cf2fdab15c940dbbc darkhttpd.logrotate
-4f7a720f05642b26bc2e2254098033e943856986a7da4a607fe8633fcf9d9c763c3e35de98ceb16fe8d88c2e288a54d62a1bd643009a119a77f4d48b95254ebb darkhttpd.initd
-4920c242c80ed9df6dc5589ca2c4fca158ff1fb58669b77b75a24b26be94719a062a959bd52b678b2bd37043440e26a06bff7ac3330dd48256138c31169e21ed darkhttpd.confd
-71a35551e2e34e8ced60e2c836c7d22f9b543b79fda2e273b41eaed7aefc22895d9c0b2e6f86dc7d0f916ed244b9ea42e2236f796eab07e7e0ba83faa4ba5762 0001-Add-svg-support-to-default-mimetypes.patch"
+dd792892588e03cef4a36bb8e81297990884298d8a2bc1c14ae2d8986a0a17af8d15bf3fb4e1830d22b154dc00591d884e20da915f51fd8ecf3b05b6c92dc7d4 darkhttpd.initd
+79ecdbc751e8b5497a1afee294cf0addb4261f041a58a382e7fb51dd698dd99625a369173542c905e1e4eac7c68dfa1d8d778f4777ebe74d5031817a6ec437ad darkhttpd.confd"
diff --git a/main/darkhttpd/darkhttpd.confd b/main/darkhttpd/darkhttpd.confd
index 0e9013ef3b..1c947b5326 100644
--- a/main/darkhttpd/darkhttpd.confd
+++ b/main/darkhttpd/darkhttpd.confd
@@ -1,8 +1,12 @@
# darkhttpd web server config
#
-# document_root="-/var/www/localhost/htdocs"
+# document_root="/var/www/localhost/htdocs"
+logdir="/var/log/$SVCNAME"
# addr=127.0.0.1
# port=8080
+run_as_user=darkhttpd
+run_as_group=www-data
+run_in_chroot=yes
-#extra arguments
-darkhttpd_args=""
+# extra arguments
+# darkhttpd_args=""
diff --git a/main/darkhttpd/darkhttpd.initd b/main/darkhttpd/darkhttpd.initd
index 93154234d8..2b3e099e07 100644
--- a/main/darkhttpd/darkhttpd.initd
+++ b/main/darkhttpd/darkhttpd.initd
@@ -6,7 +6,7 @@ name="darkhttpd web server"
description="Simple, single-threaded, static content webserver"
command="/usr/bin/darkhttpd"
-command_args="${document_root:-/var/www/localhost/htdocs} --chroot --uid darkhttpd --gid www-data $darkhttpd_args"
+command_args="${document_root:-/var/www/localhost/htdocs} ${darkhttpd_args}"
optional_arg() {
if [ -n "$2" ]; then
@@ -15,10 +15,17 @@ optional_arg() {
}
start_pre() {
- checkpath --directory --owner darkhttpd "${logdir:-/var/log/$SVCNAME}"
- optional_arg --log "${logdir:-/var/log/$SVCNAME}"/access.log
+ if [ -n "$logdir" ]; then
+ checkpath --directory --owner darkhttpd "${logdir}"
+ command_args="$command_args --log ${logdir}/access.log"
+ fi
optional_arg --addr "$addr"
optional_arg --port "$port"
+ optional_arg --uid "$run_as_user"
+ optional_arg --gid "$run_as_group"
optional_arg --mimetypes "$mimetypes"
+ if yesno "${run_in_chroot:-no}"; then
+ command_args="${command_args} --chroot"
+ fi
}
diff --git a/main/dbus/APKBUILD b/main/dbus/APKBUILD
index c938624b40..c1a9a270c7 100644
--- a/main/dbus/APKBUILD
+++ b/main/dbus/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dbus
pkgver=1.12.20
-pkgrel=1
+pkgrel=2
pkgdesc="Freedesktop.org message bus system"
options="!check" # Introduces circular dependency with xorg-server (xvfb-run -> xvfb)
url="https://www.freedesktop.org/Software/dbus"
@@ -9,7 +9,7 @@ pkggroups="messagebus"
arch="all"
license="AFL-2.1 OR GPL-2.0-or-later"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-x11 $pkgname-openrc"
-triggers="$pkgname.trigger=/etc/dbus-1/system.d"
+triggers="$pkgname.trigger=/usr/share/dbus-1/system.d"
depends_dev="util-linux-dev"
makedepends="$depends_dev
autoconf automake libtool autoconf-archive
diff --git a/main/debian-archive-keyring/APKBUILD b/main/debian-archive-keyring/APKBUILD
index 13523b6c50..8de2bc4dae 100644
--- a/main/debian-archive-keyring/APKBUILD
+++ b/main/debian-archive-keyring/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=debian-archive-keyring
-pkgver=2019.1
-pkgrel=1
+pkgver=2021.1.1
+pkgrel=0
pkgdesc="GnuPG archive keys of the Debian archive"
url="https://packages.debian.org/sid/debian-archive-keyring"
arch="noarch"
@@ -28,7 +28,7 @@ build() {
package() {
mkdir -p "$pkgdir"
- tar -xf "$srcdir"/data.tar.xz -C "$pkgdir"/
+ unxz -c "$srcdir"/data.tar.xz | tar -x -C "$pkgdir"/
}
-sha512sums="051b8507c9deba0d13dc0137ff43ae9db27b20b78c3437ca680046ae9b1c81ac505dc0a4460d4a83c4b256a04a2e57d1280eb2e8a3afb2a58f150ca6c37d0d63 debian-archive-keyring_2019.1_all.deb"
+sha512sums="64575ab9f23b69ca98f13d535e18574b6d7805add0d56238e760b9e639c9990f3f3d865460fdaf86480c3905a3f3d7637b56e2998ae60f2f05e2d08e148ddcc7 debian-archive-keyring_2021.1.1_all.deb"
diff --git a/main/dhcpcd-dbus/APKBUILD b/main/dhcpcd-dbus/APKBUILD
index 7536c0f8f0..a611938e99 100644
--- a/main/dhcpcd-dbus/APKBUILD
+++ b/main/dhcpcd-dbus/APKBUILD
@@ -2,18 +2,24 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
pkgname=dhcpcd-dbus
pkgver=0.6.1
-pkgrel=4
+pkgrel=5
pkgdesc="DBUS binding to dhcpcd"
url="https://roy.marples.name/projects/dhcpcd"
arch="all"
license="BSD-2-Clause"
depends="dbus"
makedepends="dbus-dev"
-source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2
+source="http://roy.marples.name/downloads/dhcpcd/dhcpcd-dbus-$pkgver.tar.bz2
fix-dhcpcd.patch"
+prepare() {
+ default_prepare
+ # Fix location of dbus configuration
+ sed -e 's|${SYSCONFDIR}/dbus-1/system.d|/usr/share/dbus-1/system.d|g' \
+ -i Makefile
+}
+
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,7 +31,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index 0982ae810e..d4b5a1251c 100644
--- a/main/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dhcpcd
pkgver=8.1.6
-pkgrel=0
+pkgrel=1
pkgdesc="RFC2131 compliant DHCP client"
url="https://roy.marples.name/projects/dhcpcd"
arch="all"
@@ -47,5 +47,5 @@ package() {
sha512sums="f4d7ea5f4c139a2735e795e13be68f6edac89d86d97589c2cdd67f89b890a093675dcc207c681332e2163b1094da8ce75bda2ee614c19bafd01410d9fadf19df dhcpcd-8.1.6.tar.xz
692b2c8c75166fabd512a7cc69c650f9391e0f682ce9cbe1771bfa44e82dcf09e322c46493c45ca75000f479d3cddde306754ba31d28a798a15e2b79a56045f0 busybox-logger.patch
1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch
-d4610be2b694ae3c7ba2defc4273635b87579c51ae5a74cc4c3ecce66dfc7cb32c4713655ac0324781445c5271fcfdc14b20584b332a2c1e2dbbeaf7ff17b44b dhcpcd.initd
+dc3b30295dbe5310526443736e60ccc53621d465d512639e8ea20efe598037ff33730e46964e4e7bc32d4ce88aaecf3b9bb9a4ceab892d8bff3423e0374ccae1 dhcpcd.initd
082aa80798476917e2a86003cb95136212cbb9b8da986e7d8186d7f3d857e81a4cb03af56296484e035e5006d36c695ef57f571ea9c1fd18b4200a9cf745a6b4 musl.patch"
diff --git a/main/dhcpcd/dhcpcd.initd b/main/dhcpcd/dhcpcd.initd
index 58c405c65d..aab118242e 100644
--- a/main/dhcpcd/dhcpcd.initd
+++ b/main/dhcpcd/dhcpcd.initd
@@ -1,13 +1,11 @@
#!/sbin/openrc-run
-supervisor=supervise-daemon
-
-name="DHCP Client Daemon"
description="DHCP Client Daemon"
-command=/sbin/dhcpcd
-command_args_foreground="-B"
+command="/sbin/dhcpcd"
command_args="-q ${command_args:-}"
+command_args_foreground="-B"
+pidfile="/run/dhcpcd.pid"
depend() {
provide net
diff --git a/main/dialog/APKBUILD b/main/dialog/APKBUILD
index dce859f993..ccbb5893b3 100644
--- a/main/dialog/APKBUILD
+++ b/main/dialog/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dialog
-pkgver=1.3.20200327
+pkgver=1.3.20210117
_pkgver=${pkgver%.*}-${pkgver##*.}
pkgrel=0
pkgdesc="Script interpreter providing curses widgets"
@@ -38,4 +38,4 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
}
-sha512sums="c8c7ccd86fa189a2b6739320f59f127512e53f908ed257280099f8c45754da98d2095835d0c14090cd071af0ed6e8ff95f9938f5ca8027b0b7001c7fd746fe59 dialog-1.3-20200327.tgz"
+sha512sums="c9387b5c96241220080fe5b50c66c6b3ed97f4bf366b1893ff30253f635a1b57f29920efbabebf0b4af5303760beb0496760c630682b96e0f52dd40b16e1ec2f dialog-1.3-20210117.tgz"
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index 3a0bdbbf31..b271d18eb5 100644
--- a/main/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
@@ -2,6 +2,14 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
#
# secfixes:
+# 2.83-r0:
+# - CVE-2020-25681
+# - CVE-2020-25682
+# - CVE-2020-25683
+# - CVE-2020-25684
+# - CVE-2020-25685
+# - CVE-2020-25686
+# - CVE-2020-25687
# 2.80-r5:
# - CVE-2019-14834
# 2.79-r0:
@@ -16,7 +24,7 @@
# - CVE-2017-14496
#
pkgname=dnsmasq
-pkgver=2.82
+pkgver=2.84
pkgrel=0
pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server"
url="http://www.thekelleys.org.uk/dnsmasq/"
@@ -69,7 +77,7 @@ dnssec() {
cp -r "$pkgdir"/etc "$subpkgdir"/etc
}
-sha512sums="bbd12c53e844709e28be141d6270539e3cc6428b5575cd94f1e6dd167c074a9794a25bcea73b0ebeeed48a80a8b158793002d250a63693be4bfbabb9584b1bd8 dnsmasq-2.82.tar.gz
+sha512sums="051eef7f9cc84ceeaea0071e5ac03f004fb3be217e9e1b6b6ad692ecda3c448d5bf210b7be933aba48166e7f5a8cb62043e37e0bea1ca1b27a05237db10b4e8a dnsmasq-2.84.tar.gz
a7d64a838d10f4f69e0f2178cf66f0b3725901696e30df9e8e3e09f2afd7c86e9d95af64d2b63ef66f18b8a637397b7015573938df9ad961e2b36c391c3ac579 dnsmasq.initd
9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 dnsmasq.confd
01e9e235e667abda07675009fb1947547863e0bb0256393c5a415978e2a49c1007585c7f0b51e8decce79c05e6f2ced3f400b11343feaa4de9b2e524f74a1ee3 uncomment-conf-dir.patch"
diff --git a/main/doas/APKBUILD b/main/doas/APKBUILD
index dee428a648..3abbc541e0 100644
--- a/main/doas/APKBUILD
+++ b/main/doas/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=doas
-pkgver=6.8
+pkgver=6.8.1
pkgrel=0
pkgdesc="OpenBSD's temporary privilege escalation tool"
url="https://github.com/Duncaen/OpenDoas"
@@ -12,6 +12,10 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/Duncaen/OpenDoas/archive/v$p
builddir="$srcdir/OpenDoas-$pkgver"
options="$options suid"
+# secfixes:
+# 6.8-r1:
+# - CVE-2019-25016
+
build() {
./configure \
--prefix=/usr \
@@ -37,4 +41,4 @@ package() {
chmod 440 "$pkgdir"/etc/doas.conf
}
-sha512sums="4a57079bba353247e645bc07a5d4e78fd01471d193e83751fd87b72cffa4e152c0f7ea172563f767a7193b14489f57bc066b4fee50842d30b5b7f7ce918434bb doas-6.8.tar.gz"
+sha512sums="d96fe1cdd70e9211de9996ad05bcf7a127facd02af48f7ab2561869d9d16708f1b61722c6e6b9fe15a62e9ef501e09b1ba444b7b43a066f1895e543ebc9402e7 doas-6.8.1.tar.gz"
diff --git a/main/dosfstools/APKBUILD b/main/dosfstools/APKBUILD
index 35e184f374..e56b121a9c 100644
--- a/main/dosfstools/APKBUILD
+++ b/main/dosfstools/APKBUILD
@@ -1,30 +1,21 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dosfstools
-pkgver=4.1
-pkgrel=1
+pkgver=4.2
+pkgrel=0
pkgdesc="DOS filesystem utilities"
url="https://github.com/dosfstools/dosfstools"
arch="all"
license="GPL-3.0-or-later"
-depends=""
makedepends="linux-headers autoconf automake libtool"
subpackages="$pkgname-doc"
-source="https://github.com/dosfstools/dosfstools/releases/download/v$pkgver/dosfstools-$pkgver.tar.xz
- "
+source="https://github.com/dosfstools/dosfstools/releases/download/v$pkgver/dosfstools-$pkgver.tar.gz"
-_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
- cd "$_builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
- autoreconf -vif
+ default_prepare
+ ./autogen.sh
}
build() {
- cd "$_builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,14 +24,12 @@ build() {
--mandir=/usr/share/man \
--localstatedir=/var \
--disable-nls \
- --enable-compat-symlinks \
- || return 1
- make || return 1
+ --enable-compat-symlinks
+ make
}
package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
}
-sha512sums="e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78 dosfstools-4.1.tar.xz"
+sha512sums="3cc0808edb4432428df8a67da4bb314fd1f27adc4a05754c1a492091741a7b6875ebd9f6a509cc4c5ad85643fc40395b6e0cadee548b25cc439cc9b725980156 dosfstools-4.2.tar.gz"
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index b7cca0f284..18361d7778 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -4,11 +4,11 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dovecot
-pkgver=2.3.11.3
+pkgver=2.3.13
_pkgverminor=${pkgver%.*}
_pkgvermajor=${_pkgverminor%.*}
pkgrel=0
-_pigeonholever=0.5.11
+_pigeonholever=0.5.13
_pigeonholevermajor=${_pigeonholever%.*}
pkgdesc="IMAP and POP3 server"
url="https://www.dovecot.org/"
@@ -55,18 +55,22 @@ subpackages="
$pkgname-fts-solr:_fts_solr
$pkgname-fts-lucene:_fts_lucene
"
-source="https://www.dovecot.org/releases/$_pkgvermajor/dovecot-$pkgver.tar.gz
- https://pigeonhole.dovecot.org/releases/$_pkgvermajor/$pkgname-$_pkgverminor-pigeonhole-$_pigeonholever.tar.gz
+source="https://www.dovecot.org/releases/$_pkgverminor/dovecot-$pkgver.tar.gz
+ https://pigeonhole.dovecot.org/releases/$_pkgverminor/$pkgname-$_pkgverminor-pigeonhole-$_pigeonholever.tar.gz
skip-iconv-check.patch
split-protocols.patch
default-config.patch
fix-oauth2-jwt.c.patch
+ fix-out-of-memory-test.patch
dovecot.logrotate
dovecot.initd
"
_builddir_pigeonhole="$srcdir/$pkgname-$_pkgverminor-pigeonhole-$_pigeonholever"
# secfixes:
+# 2.3.13-r0:
+# - CVE-2020-24386
+# - CVE-2020-25275
# 2.3.11.3-r0:
# - CVE-2020-12100
# - CVE-2020-12673
@@ -311,11 +315,12 @@ _submv() {
done
}
-sha512sums="d83e52a7faab918a8e6f6257acc5936b81733c10489affd042c3a043cb842db060286cba9978be378e4958e9ac2e60b55ce289d7f3a88df08e7637e4785e23bb dovecot-2.3.11.3.tar.gz
-ef65b49092fec736258cd793f4f338cd7838c0e6e23922f6df36b428089e88ff236b8e67a7f31ee9c7e4d587a60a1533fde45d689fa9563fbfd4224bee3d2536 dovecot-2.3.11-pigeonhole-0.5.11.tar.gz
+sha512sums="758a169fba8925637ed18fa7522a6f06c9fe01a1707b1ca0d0a4d8757c578a8e117c91733e8314403839f9a484bbcac71ce3532c82379eb583b480756d556a95 dovecot-2.3.13.tar.gz
+fcbc13d71af4e6dd4e34192484e203d755e5015da76a4774b11a79182b2baad36cab5a471346093111ace36a7775dfe8294555f8b777786dde386820b3ec5cd3 dovecot-2.3-pigeonhole-0.5.13.tar.gz
fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a skip-iconv-check.patch
794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5 split-protocols.patch
0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07 default-config.patch
7f428b0f14323a5dda00aef93f4835c2c38a7b780a939a47f759d31df4636e86055f95d17e2358cb37a2704ea022dfad602c7ed4568cba644347f20fd1e15e3b fix-oauth2-jwt.c.patch
+733cdbfb7f6b2608470bd30a0f9190ec86099d4c8e48b7fb92d7b595be665bf749976889033e1ad438edd3f99f2e0d496dd0d667291915c80df82f7e62483f59 fix-out-of-memory-test.patch
9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0 dovecot.logrotate
d91951b81150d7a3ef6a674c0dc7b012f538164dac4b9d27a6801d31da6813b764995a438f69b6a680463e1b60a3b4f2959654f68e565fe116ea60312d5e5e70 dovecot.initd"
diff --git a/main/dovecot/fix-out-of-memory-test.patch b/main/dovecot/fix-out-of-memory-test.patch
new file mode 100644
index 0000000000..09df953d5c
--- /dev/null
+++ b/main/dovecot/fix-out-of-memory-test.patch
@@ -0,0 +1,22 @@
+fixes test in src/lib/test-file-cache.c for musl
+
+--- a/src/lib/test-file-cache.c 2021-01-04 17:55:39.550032767 +0000
++++ b/src/lib/test-file-cache.c 2021-01-04 17:54:31.439645416 +0000
+@@ -263,7 +263,7 @@
+ };
+ const char *errstr =
+ t_strdup_printf("mmap_anon(.test_file_cache, %zu) failed: "
+- "Cannot allocate memory", page_size);
++ "Out of memory", page_size);
+ test_assert(setrlimit(RLIMIT_AS, &rl_new) == 0);
+ test_expect_error_string(errstr);
+ test_assert(file_cache_set_size(cache, 1024) == -1);
+@@ -271,7 +271,7 @@
+
+ /* same for mremap */
+ errstr = t_strdup_printf("mremap_anon(.test_file_cache, %zu) failed: "
+- "Cannot allocate memory", page_size*2);
++ "Out of memory", page_size*2);
+ test_assert(file_cache_set_size(cache, 1) == 0);
+ test_assert(setrlimit(RLIMIT_AS, &rl_new) == 0);
+ test_expect_error_string(errstr);
diff --git a/main/doxygen/APKBUILD b/main/doxygen/APKBUILD
index 4320849638..716ea93314 100644
--- a/main/doxygen/APKBUILD
+++ b/main/doxygen/APKBUILD
@@ -1,15 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=doxygen
-pkgver=1.8.20
+pkgver=1.9.1
pkgrel=0
pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
-url="http://www.doxygen.nl/"
+url="https://www.doxygen.nl/"
arch="all"
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
- "
+source="https://doxygen.nl/files/doxygen-$pkgver.src.tar.gz"
build() {
cmake -B build \
@@ -30,4 +29,4 @@ package() {
make -C build DESTDIR="$pkgdir" install
}
-sha512sums="65d104d25061ee59199c74c0328f59fbeaf14f0dade755187ebd43f59008adfef243d4da448b71ae04dc325b848f9bdd109eb20e6f6092f3ed19862426d060cf doxygen-1.8.20.src.tar.gz"
+sha512sums="637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed doxygen-1.9.1.src.tar.gz"
diff --git a/main/dpkg/APKBUILD b/main/dpkg/APKBUILD
index 34c88c541e..197c93a138 100644
--- a/main/dpkg/APKBUILD
+++ b/main/dpkg/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dpkg
-pkgver=1.20.5
-pkgrel=3
+pkgver=1.20.7.1
+pkgrel=0
pkgdesc="The Debian Package Manager"
url="https://wiki.debian.org/Teams/Dpkg"
arch="all"
@@ -12,7 +12,7 @@ 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
0001-t-command-Fix-test_command_exec-program-invocation.patch
- time_t.patch"
+ "
prepare() {
default_prepare
@@ -91,6 +91,5 @@ dev() {
mv "$pkgdir"/usr/share/perl* "$subpkgdir"/usr/share/
}
-sha512sums="6b3789c25c81022181b87a28ca9baa4a463a68940a871568c699a2a30e3b4ce705835ed6a171ac8c5902e377200b31cc0be1e03cbd7d35c4eaf92c7300d9227f dpkg_1.20.5.tar.xz
-059875c06146382f1e4a339860c558a71393a43bf9e6580c0a2211c629cc9be1b4fd12c900b002f833a241ad9a339f138b458b60664da06db5b32db1c6490b2f 0001-t-command-Fix-test_command_exec-program-invocation.patch
-4eb01daac6d1079bcac1450b52c0d052de2c2f0341feafb4b5e2b23b7c191c9ce21d2e8e3b9ea917f8f81162229c4575bbf62f1d1f38da21b7dfd1fe80569bce time_t.patch"
+sha512sums="beec7a7ba1cfbd6954b3d583e57c811af3bfa5e4e4554e6af6673d4a4be0e79fb4aded2f6aeeda592c2ba3d91facb82138f2eb8eb2338dc4fae1832911df2fd6 dpkg_1.20.7.1.tar.xz
+059875c06146382f1e4a339860c558a71393a43bf9e6580c0a2211c629cc9be1b4fd12c900b002f833a241ad9a339f138b458b60664da06db5b32db1c6490b2f 0001-t-command-Fix-test_command_exec-program-invocation.patch"
diff --git a/main/dpkg/time_t.patch b/main/dpkg/time_t.patch
deleted file mode 100644
index a47675654e..0000000000
--- a/main/dpkg/time_t.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-musl 1.2 switched from 32-bit time_t to 64-bit time_t on 32-bit arches.
-Unfourtunatly, the dpkg code assumes that time_t is a long int (or long
-unsigned int in some place). As a dirty workaround use PRId64 instead.
-
-See also: http://musl.libc.org/time64.html
-
-diff -upr dpkg-1.20.5.orig/dpkg-deb/build.c dpkg-1.20.5/dpkg-deb/build.c
---- dpkg-1.20.5.orig/dpkg-deb/build.c 2020-06-27 20:24:28.000000000 +0200
-+++ dpkg-1.20.5/dpkg-deb/build.c 2020-08-27 23:00:05.501645000 +0200
-@@ -38,6 +38,7 @@
- #include <stdint.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <inttypes.h>
-
- #include <dpkg/i18n.h>
- #include <dpkg/c-ctype.h>
-@@ -457,7 +458,7 @@ tarball_pack(const char *dir, filenames_
- if (chdir(dir))
- ohshite(_("failed to chdir to '%.255s'"), dir);
-
-- snprintf(mtime, sizeof(mtime), "@%ld", options->timestamp);
-+ snprintf(mtime, sizeof(mtime), "@%" PRId64, options->timestamp);
-
- command_init(&cmd, TAR, "tar -cf");
- command_add_args(&cmd, "tar", "-cf", "-", "--format=gnu",
-diff -upr dpkg-1.20.5.orig/lib/dpkg/perf.h dpkg-1.20.5/lib/dpkg/perf.h
---- dpkg-1.20.5.orig/lib/dpkg/perf.h 2019-11-27 14:39:09.000000000 +0100
-+++ dpkg-1.20.5/lib/dpkg/perf.h 2020-08-27 23:00:58.851649314 +0200
-@@ -24,6 +24,7 @@
-
- #include <config.h>
- #include <compat.h>
-+#include <inttypes.h>
-
- #include <time.h>
- #include <stdio.h>
-@@ -50,7 +51,7 @@ perf_ts_mark_print(const char *str)
-
- clock_gettime(CLOCK_MONOTONIC, &ts);
-
-- printf("%lu.%.9lu: %s\n", ts.tv_sec, ts.tv_nsec, str);
-+ printf("%" PRId64 ".%.9lu: %s\n", ts.tv_sec, ts.tv_nsec, str);
- }
-
- static void
-@@ -60,7 +61,7 @@ perf_ts_slot_print(struct perf_slot *ps,
-
- perf_ts_sub(&ps->t_end, &ps->t_ini, &t_res);
-
-- printf("%lu.%.9lu: %s (%lu.%.9lu sec)\n",
-+ printf("%" PRId64 ".%.9lu: %s (%lu.%.9lu sec)\n",
- ps->t_end.tv_sec, ps->t_end.tv_nsec,
- str, t_res.tv_sec, t_res.tv_nsec);
- }
-diff -upr dpkg-1.20.5.orig/lib/dpkg/pkg-format.c dpkg-1.20.5/lib/dpkg/pkg-format.c
---- dpkg-1.20.5.orig/lib/dpkg/pkg-format.c 2020-06-02 04:51:37.000000000 +0200
-+++ dpkg-1.20.5/lib/dpkg/pkg-format.c 2020-08-27 23:01:24.044984684 +0200
-@@ -31,6 +31,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <unistd.h>
-+#include <inttypes.h>
-
- #include <dpkg/i18n.h>
- #include <dpkg/error.h>
-@@ -299,7 +300,7 @@ virt_fsys_last_modified(struct varbuf *v
- pkgbin_name_const(pkg, pkgbin, pnaw_nonambig));
- }
-
-- varbuf_printf(vb, "%ld", st.st_mtime);
-+ varbuf_printf(vb, "%" PRId64, st.st_mtime);
- }
-
- /*
-diff -upr dpkg-1.20.5.orig/lib/dpkg/t/c-tarextract.c dpkg-1.20.5/lib/dpkg/t/c-tarextract.c
---- dpkg-1.20.5.orig/lib/dpkg/t/c-tarextract.c 2020-06-02 04:51:37.000000000 +0200
-+++ dpkg-1.20.5/lib/dpkg/t/c-tarextract.c 2020-08-27 23:01:53.108320365 +0200
-@@ -31,6 +31,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <inttypes.h>
-
- #include <dpkg/ehandle.h>
- #include <dpkg/fdio.h>
-@@ -65,7 +66,7 @@ tar_object_skip(struct tar_archive *tar,
- static int
- tar_object(struct tar_archive *tar, struct tar_entry *te)
- {
-- printf("%s mode=%o time=%ld.%.9d uid=%d gid=%d", te->name,
-+ printf("%s mode=%o time=%" PRId64 ".%.9d uid=%d gid=%d", te->name,
- te->stat.mode, te->mtime, 0, te->stat.uid, te->stat.gid);
- if (te->stat.uname)
- printf(" uname=%s", te->stat.uname);
diff --git a/main/drbd-lts/APKBUILD b/main/drbd-lts/APKBUILD
deleted file mode 100644
index 5acde3cb1e..0000000000
--- a/main/drbd-lts/APKBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Contributor: Roland Kammerer <roland.kammerer@linbit.com>
-# Maintainer: Roland Kammerer <roland.kammerer@linbit.com>
-
-# when changing _ver we *must* bump _rel
-_name=drbd
-_ver=9.0.22-2
-_rel=0
-
-_flavor=${FLAVOR:-lts}
-_kpkg=linux-$_flavor
-_kver=5.4.80
-_krel=0
-_kabi="$_kver-$_krel-$_flavor"
-_kpkgver="$_kver-r$_krel"
-
-pkgname=$_name-$_flavor
-pkgver=$_kver
-pkgrel=$(( $_krel + $_rel ))
-
-pkgdesc="Network-based RAID 1 version 9"
-url="https://www.linbit.com/en/drbd-community/drbd-download/"
-arch="all !armhf"
-license="GPL-2.0-or-later"
-depends="$_kpkg=$_kpkgver"
-makedepends="$_kpkg-dev=$_kpkgver bash coreutils"
-source="http://www.linbit.com/downloads/drbd/${_ver%.*}/drbd-$_ver.tar.gz"
-
-builddir=$srcdir/$_name-$_ver
-
-prepare() {
- default_prepare
- # verify the kernel version
- local _kapkbuild=../../main/linux-$_flavor/APKBUILD
- if [ -f $_kapkbuild ]; then
- ( . $_kapkbuild
- pkgname=$_name-$_flavor
- [ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
- [ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
- return 0
- )
- fi
-}
-
-build() {
- cd "$builddir"
- unset LDFLAGS
- make KVER=$_kabi
-}
-
-package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
-}
-
-sha512sums="ddb3ad0a83cbd07eaa178168c9fea74999a5577ccc94164c0ca3c6a41a50d67944533b82957ccd8ad8bf6adacc116774fb978497c15ac54b8d8c780b97face20 drbd-9.0.22-2.tar.gz"
diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD
index 4280ae3e26..b457f8faf1 100644
--- a/main/dropbear/APKBUILD
+++ b/main/dropbear/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dropbear
pkgver=2020.81
diff --git a/main/dtach/APKBUILD b/main/dtach/APKBUILD
index 2a7bebf71f..b0f2d6cec8 100644
--- a/main/dtach/APKBUILD
+++ b/main/dtach/APKBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=dtach
pkgver=0.9
-pkgrel=1
+pkgrel=2
pkgdesc="A program that emulates the detach feature of screen"
url="http://dtach.sourceforge.net"
arch="all"
diff --git a/main/dtc/APKBUILD b/main/dtc/APKBUILD
index d1ec6ef883..8cd502e02b 100644
--- a/main/dtc/APKBUILD
+++ b/main/dtc/APKBUILD
@@ -1,16 +1,17 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dtc
pkgver=1.6.0
-pkgrel=0
+pkgrel=2
pkgdesc="Device Tree Compiler"
url="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/"
arch="all"
license="GPL-2.0-or-later"
-makedepends="$depends_dev bison flex"
+makedepends="bison flex python3-dev swig"
checkdepends="coreutils"
-subpackages="$pkgname-dev libfdt"
+subpackages="$pkgname-dev libfdt py3-libfdt:py3_libfdt"
source="https://kernel.org/pub/software/utils/dtc/dtc-$pkgver.tar.xz
- "
+ increase_max_srcfile_depth.patch
+ install-pylibfdt-to-destdir.patch"
prepare() {
default_prepare
@@ -32,8 +33,15 @@ package() {
libfdt() {
pkgdesc="Device tree library"
- mkdir -p "$subpkgdir"/usr/lib/
- mv "$pkgdir"/usr/lib/libfdt* "$subpkgdir"/usr/lib/
+ amove usr/lib/libfdt*
}
-sha512sums="15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3 dtc-1.6.0.tar.xz"
+py3_libfdt() {
+ pkgdesc="Device tree library for Python 3"
+ depends="python3"
+ amove usr/lib/python3*
+}
+
+sha512sums="15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3 dtc-1.6.0.tar.xz
+d30b04d6c177578f000465654d1bb0ebe4509fb290842f14d4dbdcd7c0bbdc8f2c8c73cfac2fc87a1896e17352652090cbac46c4e8d62c4e8cb97d5e9bd99647 increase_max_srcfile_depth.patch
+1c43dfae8d15861c4f0170f0df9ba63d197ab3be50e39fe5748e547074c52dc7b042ca5e9c64d3d4bb0a8e8cde8df7e71660cde93e9512923405c38debcaa01c install-pylibfdt-to-destdir.patch"
diff --git a/main/dtc/increase_max_srcfile_depth.patch b/main/dtc/increase_max_srcfile_depth.patch
new file mode 100644
index 0000000000..c821dcde4b
--- /dev/null
+++ b/main/dtc/increase_max_srcfile_depth.patch
@@ -0,0 +1,15 @@
+Upstream dtc has MAX_SRCFILE_DEPTH set to 100 in srcpos.c, which is max number of includes set to prevent infinite recursion.
+Unfortunately some kernels require this number to be bigger, and since it's just a sanity check to detect infinite recursion it shouldn't hurt increasing it to 200.
+diff --git a/srcpos.c b/srcpos.c
+index f5205fb..4fdb22a 100644
+--- a/srcpos.c
++++ b/srcpos.c
+@@ -20,7 +20,7 @@ struct search_path {
+ static struct search_path *search_path_head, **search_path_tail;
+
+ /* Detect infinite include recursion. */
+-#define MAX_SRCFILE_DEPTH (100)
++#define MAX_SRCFILE_DEPTH (200)
+ static int srcfile_depth; /* = 0 */
+
+ static char *get_dirname(const char *path)
diff --git a/main/dtc/install-pylibfdt-to-destdir.patch b/main/dtc/install-pylibfdt-to-destdir.patch
new file mode 100644
index 0000000000..31c7a6b480
--- /dev/null
+++ b/main/dtc/install-pylibfdt-to-destdir.patch
@@ -0,0 +1,13 @@
+diff --git a/pylibfdt/Makefile.pylibfdt b/pylibfdt/Makefile.pylibfdt
+index 6866a0b..6363840 100644
+--- a/pylibfdt/Makefile.pylibfdt
++++ b/pylibfdt/Makefile.pylibfdt
+@@ -22,7 +22,7 @@ $(PYMODULE): $(PYLIBFDT_srcs) $(LIBFDT_archive) $(SETUP) $(VERSION_FILE)
+
+ install_pylibfdt: $(PYMODULE)
+ @$(VECHO) INSTALL-PYLIB
+- $(PYTHON) $(SETUP) $(SETUPFLAGS) install --prefix=$(PREFIX)
++ $(PYTHON) $(SETUP) $(SETUPFLAGS) install --prefix=$(PREFIX) --root=$(DESTDIR)
+
+ pylibfdt_clean:
+ @$(VECHO) CLEAN "(pylibfdt)"
diff --git a/main/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD
index cc7e3aef01..96ae297ddf 100644
--- a/main/e2fsprogs/APKBUILD
+++ b/main/e2fsprogs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=e2fsprogs
-pkgver=1.45.6
+pkgver=1.46.1
pkgrel=0
pkgdesc="Standard Ext2/3/4 filesystem utilities"
url="http://e2fsprogs.sourceforge.net"
@@ -11,7 +11,9 @@ depends_dev="util-linux-dev"
makedepends="$depends_dev linux-headers"
checkdepends="diffutils perl"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc libcom_err $pkgname-libs $pkgname-extra"
-source="$pkgname-$pkgver.tar.gz::https://github.com/tytso/e2fsprogs/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/tytso/e2fsprogs/archive/v$pkgver.tar.gz
+ ensure-small-filesystems-are-Y2038-ok.patch
+ "
# secfixes:
# 1.45.5-r0:
@@ -89,4 +91,5 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
}
-sha512sums="0de9ee4df69d6be79f0c23baebf32266f0c0fb15190181edf9ebc78d486458b34229c18466646221566d16bc75a011cbe311fd34a72da53340e8de340f064cf9 e2fsprogs-1.45.6.tar.gz"
+sha512sums="5476f643e159f349cfd0e7d045c66a0b52ca2de88ca87fcdabc76d6a2b9745bda29dbb3908cb6671dc35285cc11affa3b70b754dac3aa30bf9c71d1aa7b3703b e2fsprogs-1.46.1.tar.gz
+daf63f8ca704eaa9a3293444469ef1a36c09806614d20e844b451af2426d5c8611a61669c99e4702f1fd787145cf9a34f1345ae5ed15ef47c41ca02f03302231 ensure-small-filesystems-are-Y2038-ok.patch"
diff --git a/main/e2fsprogs/ensure-small-filesystems-are-Y2038-ok.patch b/main/e2fsprogs/ensure-small-filesystems-are-Y2038-ok.patch
new file mode 100644
index 0000000000..df77148b57
--- /dev/null
+++ b/main/e2fsprogs/ensure-small-filesystems-are-Y2038-ok.patch
@@ -0,0 +1,36 @@
+From: Dermot Bradley <dermot_bradley@yahoo.com>
+Date: Thu, 10 Dec 2020 23:52 +0000
+Subject: ensure that small filesystems are Y2038 ok
+
+When formatting a partition with a EXT2/3/4 filesystem, if the partition
+specified is 512M or smaller in size then the "small" entry from
+/etc/mke2fs.conf is used, in addition to the defaults in that file, for
+the new filesystem's settings. Currently the "small" entry specifies an
+inode size of 128bytes which is insufficient to hold timestamps beyond
+2038.
+
+After booting a system with an affected EXT2/3/4 filesystem the kernel
+buffer will show a warning:
+
+$ dmesg | grep 2038
+
+ filesystem being remounted at / supports timestamps until 2038
+
+This patch removes the 128 byte inode size entry from the 'small'
+definition and so the formatting tool will fallback to the default
+value of 256 byte inodes which will ensure no Y2038 issues. The disk
+space overhead when formatting after this change will slightly increase.
+
+---
+
+diff -aur a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in
+--- a/misc/mke2fs.conf.in
++++ b/misc/mke2fs.conf.in
+@@ -16,7 +16,6 @@
+ }
+ small = {
+ blocksize = 1024
+- inode_size = 128
+ inode_ratio = 4096
+ }
+ floppy = {
diff --git a/main/ed/APKBUILD b/main/ed/APKBUILD
index f492e2a74b..7e2d7f6c92 100644
--- a/main/ed/APKBUILD
+++ b/main/ed/APKBUILD
@@ -1,8 +1,9 @@
-# Maintainer: Breno Leitao <breno.leitao@gmail.com>
+# Contributor: Breno Leitao <breno.leitao@gmail.com>
+# Maintainer:
pkgname=ed
-pkgver=1.16
+pkgver=1.17
pkgrel=0
-pkgdesc="GNU ed is a line-oriented text editor. It is used to create, display, modify and otherwise manipulate text files"
+pkgdesc="line-oriented text editor used to create, display, modify and otherwise manipulate text files"
url="https://www.gnu.org/software/ed/"
arch="all"
license="GPL-3.0-only"
@@ -29,4 +30,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="1ca999edd7007c56bf9aa91436997a813e665910dda19a3307fa5b85adc05667eb120cb54cb6544b919f1c7f631baf3ee03079abe1171b875fb9653f535fa7bd ed-1.16.tar.lz"
+sha512sums="fbceac0d3c01880a57776aaf3a3c02ce177bcf1e021f237ed7b6fc84f88471dd36cd0385b80b3a2de58640d8ef3ca07b4c5755803854ab52e4e9f636e5544dbf ed-1.17.tar.lz"
diff --git a/main/efibootmgr/APKBUILD b/main/efibootmgr/APKBUILD
index 38be6c2b03..be7ff431c4 100644
--- a/main/efibootmgr/APKBUILD
+++ b/main/efibootmgr/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Lucas Ramage <ramage.lucas@protonmail.com>
pkgname=efibootmgr
pkgver=17
diff --git a/main/efivar/APKBUILD b/main/efivar/APKBUILD
index 510de1d2d8..4236921c5c 100644
--- a/main/efivar/APKBUILD
+++ b/main/efivar/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Lucas Ramage <ramage.lucas@protonmail.com>
pkgname=efivar
pkgver=37
diff --git a/main/eggdrop/APKBUILD b/main/eggdrop/APKBUILD
index f342c82428..963500c57f 100644
--- a/main/eggdrop/APKBUILD
+++ b/main/eggdrop/APKBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=eggdrop
pkgver=1.8.4
-pkgrel=0
+pkgrel=1
pkgdesc="World's most popular Open Source IRC bot"
url="https://eggheads.org/"
arch="all"
diff --git a/main/elfutils/APKBUILD b/main/elfutils/APKBUILD
index d12227da30..aad47bcb61 100644
--- a/main/elfutils/APKBUILD
+++ b/main/elfutils/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=elfutils
pkgver=0.182
-pkgrel=0
+pkgrel=1
pkgdesc="Utilities and DSOs to handle ELF files and DWARF data"
url="http://elfutils.org/"
arch="all"
-license="GPL-3.0-or-later and (GPL-2.0-or-later or LGPL-3.0-or-later)"
+license="GPL-3.0-or-later AND (GPL-2.0-or-later OR LGPL-3.0-or-later)"
makedepends="bison flex-dev zlib-dev bzip2-dev xz-dev argp-standalone
bsd-compat-headers autoconf automake libtool fts-dev musl-obstack-dev
linux-headers"
diff --git a/main/ell/APKBUILD b/main/ell/APKBUILD
index a560bf0f01..7a9182e34c 100644
--- a/main/ell/APKBUILD
+++ b/main/ell/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Milan P. Stanić <mps@arvanta.net>
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=ell
-pkgver=0.33
-pkgrel=1
+pkgver=0.38
+pkgrel=0
pkgdesc="Linux library for embedded development"
url="https://01.org/ell"
arch="all"
@@ -11,7 +11,6 @@ makedepends="glib-dev linux-headers"
checkdepends="dbus"
subpackages="$pkgname-dev"
source="https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-$pkgver.tar.gz
- uintset-Fix-incomplete-memcpy-in_clone.patch
"
build() {
@@ -34,5 +33,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="ce4f91bd53d2606b71297505cb5f94048024da4a27ba74cd36685565344637f4a0b72e67465ff464f2d55485361f50ce5a9f2eda8da55a3ed9d7b0d6e27d3508 ell-0.33.tar.gz
-f0fd872af9e58cce5ba4664013c918e25df30c1f6178ea777c97b0acad2381773677494d42f25fe2910e7f1ac69faabf22f8235e64fe54024fd2ffd5e5e03e87 uintset-Fix-incomplete-memcpy-in_clone.patch"
+sha512sums="b8585c75b6800aad912025feb49203478f67190afca3afa10916f1bd241da2c043f5bb165fa5f4b7f08a597c87fb613e4ac2a2bbe1ee7a91beb558ef9d03d55f ell-0.38.tar.gz"
diff --git a/main/ell/uintset-Fix-incomplete-memcpy-in_clone.patch b/main/ell/uintset-Fix-incomplete-memcpy-in_clone.patch
deleted file mode 100644
index 1811263dc7..0000000000
--- a/main/ell/uintset-Fix-incomplete-memcpy-in_clone.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5ff7cf20042f5bed6b898e2cda15712a755d91e5 Mon Sep 17 00:00:00 2001
-From: Denis Kenzior <denkenz@gmail.com>
-Date: Wed, 21 Oct 2020 16:55:47 -0500
-Subject: uintset: Fix incomplete memcpy in _clone
-
-l_uintset_clone was not calculating the bitmap size correctly and not
-fully copying the bits of the original set.
----
- ell/uintset.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/ell/uintset.c b/ell/uintset.c
-index d18ccfa..5a64d65 100644
---- a/ell/uintset.c
-+++ b/ell/uintset.c
-@@ -485,7 +485,8 @@ LIB_EXPORT struct l_uintset *l_uintset_clone(const struct l_uintset *original)
- if (unlikely(!original))
- return NULL;
-
-- bitmap_size = (original->size + BITS_PER_LONG - 1) / BITS_PER_LONG;
-+ bitmap_size = sizeof(unsigned long) *
-+ ((original->size + BITS_PER_LONG - 1) / BITS_PER_LONG);
-
- clone = l_uintset_new_from_range(original->min, original->max);
- memcpy(clone->bits, original->bits, bitmap_size);
---
-cgit 1.2.3-1.el7
-
diff --git a/main/email/APKBUILD b/main/email/APKBUILD
index 7626dbcbb4..d8a9c867df 100644
--- a/main/email/APKBUILD
+++ b/main/email/APKBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=email
pkgver=3.1.4
-pkgrel=8
+pkgrel=9
pkgdesc="command line SMTP client that's simple"
options="!check" # No testsuite
url="http://www.cleancode.org/projects/email"
diff --git a/main/enca/APKBUILD b/main/enca/APKBUILD
deleted file mode 100644
index f580ffce9d..0000000000
--- a/main/enca/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: Carlo Landmeter
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=enca
-pkgver=1.19
-pkgrel=1
-pkgdesc="Charset analyser and converter"
-url="http://freshmeat.net/projects/enca/"
-arch="all"
-license="GPL"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://dl.cihar.com/${pkgname}/${pkgname}-${pkgver}.tar.xz"
-
-builddir="$srcdir/$pkgname-$pkgver"
-
-build() {
- cd "$builddir"
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --libexecdir=/usr/lib \
- --enable-external
- make
-}
-
-check() {
- cd "$builddir"
- make check
-}
-
-package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
-}
-
-sha512sums="6678639992685180457bbef7b0da6e475071ec6935dfd672188fc242ef80b906e75eff9a206e07989893d0ef4ae5eb500f1d0bbd6b4d58146c94bb143b5fb296 enca-1.19.tar.xz"
diff --git a/main/encfs/APKBUILD b/main/encfs/APKBUILD
index 04053c3b7d..20e9f6a870 100644
--- a/main/encfs/APKBUILD
+++ b/main/encfs/APKBUILD
@@ -3,7 +3,7 @@
pkgname=encfs
pkgver=1.9.5
_ver=${pkgver/_/-}
-pkgrel=6
+pkgrel=7
pkgdesc="EncFS provides an encrypted filesystem in user-space"
url="https://vgough.github.io/encfs/"
arch="all"
diff --git a/main/esh/APKBUILD b/main/esh/APKBUILD
index 9fc5598495..fc6c53e03b 100644
--- a/main/esh/APKBUILD
+++ b/main/esh/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=esh
-pkgver=0.3.0
+pkgver=0.3.1
pkgrel=0
pkgdesc="Simple template system based on shell"
url="https://github.com/jirutka/esh"
@@ -22,4 +22,4 @@ package() {
make DESTDIR="$pkgdir" prefix=/usr install
}
-sha512sums="6c1a55a9301af37272223b1155b69000667bb86fb95e5533ee08ecafbaaafb3d93a63e538b8511e33268dfc04a9cbb767308bc5795e019b90c72e8ce687d55b6 esh-0.3.0.tar.gz"
+sha512sums="a29f8b028ceba305c8a37f2df20be95701fa3bdaeefd9853e05cc6423a6c685b33954deabda9af25c31baeae2321084e2a2badee216010c8efd75e58888effa3 esh-0.3.1.tar.gz"
diff --git a/main/etckeeper/APKBUILD b/main/etckeeper/APKBUILD
index 2fdff6eb85..e781df001c 100644
--- a/main/etckeeper/APKBUILD
+++ b/main/etckeeper/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Henrik Riomar <henrik.riomar@gmail.com>
# Maintainer: Henrik Riomar <henrik.riomar@gmail.com>
pkgname=etckeeper
-pkgver=1.18.15
+pkgver=1.18.16
pkgrel=0
pkgdesc="Store /etc in git."
url="http://etckeeper.branchable.com"
@@ -65,6 +65,6 @@ package() {
"$pkgdir"/etc/apk/commit_hooks.d/"$pkgname"
}
-sha512sums="7b2cca6c346a7c2b97ffd9b418169712ec46d947a3c8685490ce95eb9f5b6fa389e7b3ae6ad2c1ad6774bed88212b05c5ffe202ad055dea19fdde2509a349a85 etckeeper-1.18.15.tar.gz
+sha512sums="48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07 etckeeper-1.18.16.tar.gz
d0ff88615359e8b03da5f9162a7bae3f32c06891a8899096025283d77e950dd72280c6c19b8eb8a4cde08742c6ca715cd32c37c16e8bbf2d030e9fd16a1fc940 apk-commit_hook
471c1f8f2cce94248f679e56e2bfc4ac384d9b6944d4023a2ebdd3d197f95d335f4ccc0d3d946a68513d3cc5638189fa8e04923f097605435fd3e4f01c60e1c2 etckeeper.cron"
diff --git a/main/ethtool/APKBUILD b/main/ethtool/APKBUILD
index 925af2b208..2a64d521bd 100644
--- a/main/ethtool/APKBUILD
+++ b/main/ethtool/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ethtool
-pkgver=5.9
+pkgver=5.10
pkgrel=0
pkgdesc="Utility for controlling network drivers and hardware"
url="https://mirrors.edge.kernel.org/pub/software/network/ethtool/"
@@ -37,4 +37,4 @@ bashcomp() {
amove usr/share/bash-completion/completions
}
-sha512sums="9166a06b823373188e754b3085cf8e8f71455d83d1bcfcaf1350433b21bdbc6ae851f62108d3d2e3bbbca33ca595382cd2c68966ce4824b55f7f59eb0996bf36 ethtool-5.9.tar.xz"
+sha512sums="128ecc0445ec44e231d95158a71cea2c03f059314f1a844cfb2f424970bd68608fb73b8dc5e8905b88ad0da2b65a8884a626be78d6d25f770ce043c6c87580a6 ethtool-5.10.tar.xz"
diff --git a/main/eudev/APKBUILD b/main/eudev/APKBUILD
index d4f957dba3..5143f61adb 100644
--- a/main/eudev/APKBUILD
+++ b/main/eudev/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=eudev
-pkgver=3.2.9
-pkgrel=3
+pkgver=3.2.10
+pkgrel=0
pkgdesc="OpenRC compatible fork of systemd-udev"
url="https://wiki.gentoo.org/wiki/Project:Eudev"
arch="all"
@@ -100,7 +100,7 @@ generator() {
"$subpkgdir"/lib/udev/rule_generator.functions
}
-sha512sums="09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f eudev-3.2.9.tar.gz
+sha512sums="d0a076d8a54e9d4ca9ca48cf885d082965144b322950d351b7ead4a5035c2dad6fd66b7f137d7281982876c3c50330cdd5e599788f23e1369388181dd178941d eudev-3.2.10.tar.gz
683e3c26ca4f058303f8db7d4977e436d728386ee6866719c4f11ff31db27572d3f486f51d3173310e1ec2cf995fa4c396f2415bdf45dabdd80e6e55e798a314 default-rules.patch
ff5928fd555e095d9f3234dd004ac4c5925405d308777e9b018e8e03112cd109935b51d75a3bc4a2a1018eb486e8a5e5ef6ee978860002a8fff93b116e9721f5 load-fbcon.patch
8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88 udev-postmount.initd
diff --git a/main/execline/APKBUILD b/main/execline/APKBUILD
index 0e328d6b55..811904ca21 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.1.1
+pkgver=2.8.0.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/"
@@ -10,7 +10,7 @@ license="ISC"
options="!check"
makedepends="skalibs-dev"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="http://skarnet.org/software/execline/execline-$pkgver.tar.gz"
+source="https://skarnet.org/software/execline/execline-$pkgver.tar.gz"
build() {
./configure \
@@ -37,4 +37,4 @@ static() {
rmdir -p "$pkgdir"/usr/lib || :
}
-sha512sums="5826abb407742ad8a2cd48c09b966827d129dda420db07c893cd7a27e806441d7b117a0c61fdc0222e527aada976da26e4779a4896fc084cdf6efa8294ffac5b execline-2.6.1.1.tar.gz"
+sha512sums="9250248ff3753806c05c99d8fd76b17f511413e691fcb2fe0907cbd16b691e17ff260b15f504a8c8bc279cd53360012f345af803fd48b0a27a1009c171a8ddf9 execline-2.8.0.0.tar.gz"
diff --git a/main/expat/APKBUILD b/main/expat/APKBUILD
index c212ceb8e1..9bf52beab2 100644
--- a/main/expat/APKBUILD
+++ b/main/expat/APKBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=expat
pkgver=2.2.10
-pkgrel=0
+pkgrel=1
pkgdesc="XML Parser library written in C"
url="http://www.libexpat.org/"
arch="all"
diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD
index 0a3d544f4b..8a9b0497ba 100644
--- a/main/fakeroot/APKBUILD
+++ b/main/fakeroot/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fakeroot
pkgver=1.25.3
-pkgrel=0
+pkgrel=3
pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
arch="all"
license="GPL-3.0-or-later"
@@ -10,12 +10,13 @@ checkdepends="bash"
makedepends_build="libtool autoconf automake po4a"
makedepends_host="libcap-dev acl-dev linux-headers"
makedepends="$makedepends_build $makedepends_host"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-dbg $pkgname-doc"
source="http://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_$pkgver.orig.tar.gz
fakeroot-no64.patch
fakeroot-stdint.patch
xstatjunk.patch
fix-shell-in-fakeroot.patch
+ fakeroot-skip-ipc-sanity-check.patch
"
check() {
@@ -34,8 +35,7 @@ build() {
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
- --disable-static \
- --with-ipc=tcp
+ --disable-static
make
cd doc
@@ -50,4 +50,5 @@ sha512sums="b54366ef82b49af414d7214d069a4bc7dd188dfa4f8e3121f6bd65fd67268b02346f
7a832e6bed3838c7c488e0e12ba84b8d256e84bbb06d6020247452a991de505fa5c6bd7bcb84dce8753eb242e0fcab863b5461301cd56695f2b003fe8d6ff209 fakeroot-no64.patch
ed7a58b0d201139545420f9e5429f503c00e00f36dea84473e77ea99b23bb8d421da1a8a8ce98ff90e72e378dff4cb9ea3c1a863a969899a5f50dfac3b9c5fac fakeroot-stdint.patch
5efd33fd778bd94a529ed7e439fb8fea25ff865dda3f6f9e431264e942b37f3b5d7a0ad14107b55c5fa81b86efd5a82aedb3803cfab08ec57f27f5b229d2fe88 xstatjunk.patch
-47593b3d86a66bab832c50a1d967cdc70e42bbd9ef4436f18140067ccefdd6418516e5157102c67e604f3623ed1b9f4fe1423fc5dad4dfe5356fc250c12818a7 fix-shell-in-fakeroot.patch"
+47593b3d86a66bab832c50a1d967cdc70e42bbd9ef4436f18140067ccefdd6418516e5157102c67e604f3623ed1b9f4fe1423fc5dad4dfe5356fc250c12818a7 fix-shell-in-fakeroot.patch
+f1dcd9c34e74eb225c6a96262847e70f86f437c6bcf41c5d554ced2e3d08798296a66310296cc0ab177a7ea5a0271151326a3e79f72e4ed640b3bd20dbaabec1 fakeroot-skip-ipc-sanity-check.patch"
diff --git a/main/fakeroot/fakeroot-skip-ipc-sanity-check.patch b/main/fakeroot/fakeroot-skip-ipc-sanity-check.patch
new file mode 100644
index 0000000000..fc96c2922a
--- /dev/null
+++ b/main/fakeroot/fakeroot-skip-ipc-sanity-check.patch
@@ -0,0 +1,46 @@
+diff -urN fakeroot-1.25.3.orig/configure.ac fakeroot-1.25.3/configure.ac
+--- fakeroot-1.25.3.orig/configure.ac 2020-12-15 02:33:22.866626448 -0700
++++ fakeroot-1.25.3/configure.ac 2020-12-15 02:33:40.563359415 -0700
+@@ -25,42 +25,6 @@
+ [ac_cv_use_ipc],
+ [ac_cv_use_ipc=sysv])
+
+-if test $ac_cv_use_ipc = "sysv"; then
+- AC_MSG_CHECKING([whether SysV IPC message queues are actually working on the host])
+-
+- AC_LANG_PUSH(C)
+- AC_TRY_RUN([
+-#include <stdlib.h>
+-#include <sys/types.h>
+-#include <sys/ipc.h>
+-#include <sys/msg.h>
+-#include <time.h>
+-#include <unistd.h>
+-
+-int main() {
+-
+- srandom(time(NULL)+getpid()*33151);
+- key_t msg_key = random();
+- int msg_get = msgget(msg_key, IPC_CREAT|0600);
+-
+- if (msg_get==-1) {
+- return 1;
+- } else {
+- msgctl(msg_get, IPC_RMID, NULL);
+- return 0;
+- }
+-
+-}], [ac_cv_use_ipc=sysv], [ac_cv_use_ipc=tcp])
+-
+- if test $ac_cv_use_ipc = "tcp"; then
+- AC_MSG_RESULT([No, using TCP])
+- else
+- AC_MSG_RESULT([Yes])
+- fi
+-
+- AC_LANG_POP(C)
+-fi
+-
+ AC_ARG_WITH([dbformat],
+ AS_HELP_STRING([--with-dbformat@<:@=DBFORMAT@:>@],
+ [database format to use: either inode (default) or path]),
diff --git a/main/fcgi/APKBUILD b/main/fcgi/APKBUILD
index f579b0627c..14e2a72dad 100644
--- a/main/fcgi/APKBUILD
+++ b/main/fcgi/APKBUILD
@@ -1,9 +1,9 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=fcgi
_pkgname=fcgi2
pkgver=2.4.2
-pkgrel=0
+pkgrel=1
pkgdesc="FAST CGI(fcgi) is a language independent, high performant extension to CGI"
url="https://github.com/FastCGI-Archives/fcgi2"
arch="all"
diff --git a/main/ferm/APKBUILD b/main/ferm/APKBUILD
index adf8419cf0..727de4c926 100644
--- a/main/ferm/APKBUILD
+++ b/main/ferm/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=ferm
-pkgver=2.5.1
+pkgver=2.6
pkgrel=0
case $pkgver in
*.*.*) _pkgver=${pkgver%.*};;
@@ -52,6 +52,6 @@ openrc() {
mv "$pkgdir/etc" "$subpkgdir/"
install_if="openrc ferm=$pkgver-r$pkgrel"
}
-sha512sums="bc7228fbf452722fef54519fec97d3548bc73ec5350aa1f7dd68aa2ac35c233f6fae6aeee6bf687c478cc58f20afab3ce25dd237cd68ebe2eb9b23c77d29e4ab ferm-2.5.1.tar.xz
+sha512sums="af2bb852630304a86629c2ce3af8f557d17f59c704589ea130d8578f300a606e4fedbd39c88f89646df974947fc27982e3ea21de1187257afc74a6056fdf666c ferm-2.6.tar.xz
26e4673f7c8d0f77eb1d8fdc2051f1a3729e482b075346c65e39305e29014391c390c682cd597cf3dc67fa0f9fe69818e928c41cb362814a69fc67e8bbdf7ad5 ferm.confd
c36a275d7abeac7dcb17240311b47007aafa8e07e4fd50ce45af3d79e713627624d26eea1bffe7854824f2c174a18524669cedab510ca9cea1565dda4606d394 ferm.initd"
diff --git a/main/fetchmail/APKBUILD b/main/fetchmail/APKBUILD
deleted file mode 100644
index 8bf36f5d1a..0000000000
--- a/main/fetchmail/APKBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=fetchmail
-pkgver=6.4.14
-pkgrel=0
-pkgdesc="remote-mail retrieval and forwarding utility"
-url="https://www.fetchmail.info/"
-arch="all"
-license="GPL-2.0-or-later WITH OpenSSL-Exception AND Public-Domain"
-pkgusers="fetchmail"
-pkggroups="fetchmail"
-makedepends="openssl-dev python3"
-install="fetchmail.pre-install"
-subpackages="
- $pkgname-doc
- $pkgname-openrc
- fetchmailconf::noarch
- "
-source="https://downloads.sourceforge.net/fetchmail/fetchmail-$pkgver.tar.xz
- $pkgname.initd
- $pkgname.confd
- "
-
-build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --with-ssl \
- --disable-nls \
- --enable-POP3 \
- --enable-IMAP \
- --without-hesiod \
- --enable-ETRN \
- --enable-NTLM \
- --enable-SDPS \
- --enable-RPA \
- --without-kerberos5 \
- --without-gssapi \
- --enable-fallback=no
- make
-}
-
-package() {
- make DESTDIR="$pkgdir" install
- install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
- install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
- install -o fetchmail -g fetchmail -d "$pkgdir"/var/lib/fetchmail \
- "$pkgdir"/var/run/fetchmail
-}
-
-fetchmailconf() {
- depends="python3 py3-future python3-tkinter"
- pkgdesc="GUI for generating fetchmail configuration files"
- install=""
-
- amove usr/bin/fetchmailconf*
- amove usr/lib/python3*/site-packages/fetchmailconf.py*
- amove usr/lib/python3*/site-packages/__pycache__/fetchmailconf*
-}
-
-
-sha512sums="a0295094462abfd6ddeef32772c591f1ec87765f76e116e0bb17af1215c61be965bf1e9f10864fed53b4c072b240a40d43fe51f4287f0ed138795a630be2a276 fetchmail-6.4.14.tar.xz
-9520ec6616f4004d091b1c908d3ea38e104ad8f6595959a3cd3ef7544d05e3b75854631289e167ead08479250d04584d3f1855668a7a0ebd16a1ee9106f3b0b3 fetchmail.initd
-6f031ec6bd4a3ae53cd04fbd8470f4d10bd46ca29cabffa634a6801aa2e7707169855fbc045ced3c9a69523e694511a3f076b611678143e49339c8ccac98074e fetchmail.confd"
diff --git a/main/fetchmail/fetchmail.confd b/main/fetchmail/fetchmail.confd
deleted file mode 100644
index baa1a4c2af..0000000000
--- a/main/fetchmail/fetchmail.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# /etc/conf.d/fetchmail: config file for /etc/init.d/fetchmail
-
-# See the fetchmail(1) man page for possible options to put here.
-CFGFILE="/etc/fetchmailrc"
-FETCHMAIL_OPTS="-d ${polling_period:-300}"
diff --git a/main/fetchmail/fetchmail.initd b/main/fetchmail/fetchmail.initd
deleted file mode 100644
index cee4f69f86..0000000000
--- a/main/fetchmail/fetchmail.initd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-
-description="Remote mail retrieval and forwarding"
-
-pidfile=/var/run/fetchmail/fetchmail.pid
-
-depend() {
- need net
- after firewall
- use mta
-}
-
-checkconfig() {
- if [ ! -f "${CFGFILE}" ]; then
- eerror "Configuration file ${CFGFILE} not found"
- return 1
- fi
-}
-
-start() {
- checkconfig || return 1
- checkpath -d ${pidfile%/*} -o fetchmail
-
- ebegin "Starting fetchmail"
- start-stop-daemon --start --quiet \
- --user fetchmail --exec /usr/bin/fetchmail \
- -- -f "${CFGFILE}" ${FETCHMAIL_OPTS} \
- --pidfile ${pidfile} -i /var/lib/fetchmail/.fetchids
- eend ${?}
-}
-
-stop() {
- ebegin "Stopping fetchmail"
- start-stop-daemon --stop --quiet --pidfile ${pidfile}
- eend ${?}
-}
-
diff --git a/main/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install
deleted file mode 100644
index ef46a104d7..0000000000
--- a/main/fetchmail/fetchmail.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S fetchmail 2>/dev/null
-adduser -S -D -H -h /var/lib/fetchmail -s /sbin/nologin -G fetchmail -g fetchmail fetchmail 2>/dev/null
-
-exit 0
diff --git a/main/fftw/APKBUILD b/main/fftw/APKBUILD
index 5803e0faf7..b58a73259e 100644
--- a/main/fftw/APKBUILD
+++ b/main/fftw/APKBUILD
@@ -1,31 +1,32 @@
-# Contributor:
-# Maintainer:
+# Contributor:
+# Maintainer:
pkgname=fftw
-pkgver=3.3.8
+pkgver=3.3.9
+_pkgver=${pkgver//p/-pl}
pkgrel=0
pkgdesc="Discrete Fourier transform (DFT) library"
-url="http://www.fftw.org"
+url="http://www.fftw.org/"
arch="all"
license="GPL-2.0-or-later"
makedepends="texinfo"
# order of the libs split functions are important because of lib naming
subpackages="$pkgname-dev $pkgname-doc $pkgname-single-libs:single
$pkgname-long-double-libs:long_double $pkgname-double-libs:double"
-srcpkgver=${pkgver//p/-pl}
-source="http://www.fftw.org/$pkgname-$srcpkgver.tar.gz
- cycle.h.patch"
-builddir="$srcdir/$pkgname-$srcpkgver"
+source="http://www.fftw.org/fftw-$_pkgver.tar.gz
+ cycle.h.patch
+ "
_precision="single double long-double"
+# disable tests for arm due to bug with gcc >= 9
+# see https://github.com/FFTW/fftw3/issues/213
case "$CARCH" in
- armv7) options="$options !check" ;;
+ armhf|armv7) options="$options !check";;
esac
prepare() {
default_prepare
- cd "$builddir"
local i; for i in $_precision; do
cp -r "$builddir" $srcdir/$i
done
@@ -97,5 +98,5 @@ long_double() {
"$subpkgdir"/usr/lib/
}
-sha512sums="ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38 fftw-3.3.8.tar.gz
+sha512sums="52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf fftw-3.3.9.tar.gz
7da269fc43dabd02ae6fad2ebad92b07e06825b6b7c6f8987fc6444f02e0d55080db4ba6e401760e071f5c33015faf8c710f643636cab7a79bdf1af5d434dbb4 cycle.h.patch"
diff --git a/main/findutils/APKBUILD b/main/findutils/APKBUILD
index e0d293e28e..1a44c0bc66 100644
--- a/main/findutils/APKBUILD
+++ b/main/findutils/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=findutils
-pkgver=4.7.0
+pkgver=4.8.0
pkgrel=0
pkgdesc="GNU utilities for finding files"
url="https://www.gnu.org/software/findutils/"
@@ -34,5 +34,5 @@ package() {
rm -rf "$pkgdir"/usr/lib
}
-sha512sums="650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e findutils-4.7.0.tar.xz
+sha512sums="eaa2da304dbeb2cd659b9210ac37da1bde4cd665c12a818eca98541c5ed5cba1050641fc0c39c0a446a5a7a87a8d654df0e0e6b0cee21752ea485188c9f1071e findutils-4.8.0.tar.xz
79571dc889afa5e6f01c9e1d4134df5e4112a410f24eb3e315645f6886a901780745abe49597d07c6409a3e3ecd3380b1721d86a684b7705c35767111c93bbf5 test-parse-datetime.patch"
diff --git a/main/fish/APKBUILD b/main/fish/APKBUILD
index b8c167cbe6..97fb70e76b 100644
--- a/main/fish/APKBUILD
+++ b/main/fish/APKBUILD
@@ -1,26 +1,22 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Leo <thinkabit.ukim@gmail.com>
pkgname=fish
-pkgver=3.1.2
-pkgrel=1
+pkgver=3.2.0
+pkgrel=0
pkgdesc="Modern interactive commandline shell"
-url="http://www.fishshell.com"
+url="https://fishshell.com/"
arch="all"
license="GPL-2.0-only"
depends="bc"
+depends_doc="util-linux" # Requires 'ul' program
depends_dev="$pkgname-tools"
makedepends="cmake doxygen ncurses-dev ncurses pcre2-dev"
-checkdepends="expect bash"
+checkdepends="py3-pexpect bash"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools::noarch"
-source="https://github.com/fish-shell/fish-shell/releases/download/$pkgver/fish-$pkgver.tar.gz"
-
-prepare() {
- default_prepare
- for f in $(find share/tools -type f -name '*.py'); do
- sed -i -e '1{s@^#!.*@#!%{__python3}@}' "$f"
- done
-}
+source="https://github.com/fish-shell/fish-shell/releases/download/$pkgver/fish-$pkgver.tar.xz
+ README.alpine
+ "
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -39,7 +35,6 @@ build() {
}
check() {
- cd builddir
ctest
}
@@ -47,11 +42,17 @@ package() {
make -C builddir install DESTDIR="$pkgdir"
rm -fr "$pkgdir"/usr/share/$pkgname/groff
+ # Install our README
+ install -Dm 644 "$srcdir"/README.alpine -t "$pkgdir"/usr/share/doc/fish
+
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
+
+ # https://github.com/fish-shell/fish-shell/issues/2436
+ rm "$pkgdir"/usr/share/fish/completions/docker.fish
}
doc() {
@@ -69,4 +70,5 @@ tools() {
mv "$pkgdir"/usr/share/$pkgname/tools "$subpkgdir"/usr/share/$pkgname
}
-sha512sums="b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563 fish-3.1.2.tar.gz"
+sha512sums="4525b8dd991179f77a298080d389813d1da8557bd394d174ded9238570715137e3aeec009d123811b34c07856d5f7cbe0ad35dc599d748f8f305036c3b74face fish-3.2.0.tar.xz
+c28cef48e3d9cde4956d36192dc221e63eca89282a937e2683578ac0958d98a9c54420aea4f1d91d516f5ee2c74589a75865a973305421e1ad0a9e70854dff4f README.alpine"
diff --git a/main/fish/README.alpine b/main/fish/README.alpine
new file mode 100644
index 0000000000..54c9a2eb4c
--- /dev/null
+++ b/main/fish/README.alpine
@@ -0,0 +1 @@
+To use the `help` command in builtins provided by fish install `fish-doc`
diff --git a/main/font-alias/APKBUILD b/main/font-alias/APKBUILD
index 30e7eeee80..3569f1c2f8 100644
--- a/main/font-alias/APKBUILD
+++ b/main/font-alias/APKBUILD
@@ -1,29 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-alias
-pkgver=1.0.3
-pkgrel=1
+pkgver=1.0.4
+pkgrel=0
pkgdesc="X.org font alias files"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
arch="noarch"
-license="custom"
-depends=""
-makedepends="util-macros"
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
+license="MIT"
+source="https://www.x.org/releases/individual/font/font-alias-$pkgver.tar.bz2"
-builddir="$srcdir"/$pkgname-$pkgver
-
-check() {
- cd "$builddir"
- make check
-}
-
-prepare() {
- update_config_sub
- default_prepare
-}
-
-build () {
- cd "$builddir"
+build() {
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,9 +17,12 @@ build () {
make
}
+check() {
+ make check
+}
+
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="05abfef4615722d8cf3f21ab1118494522553a75427140d9753b3d312f404735c20766ceacc1b53f9e783ea25ec8f2f6bdb8696525a4962afe29f524ed8b6552 font-alias-1.0.3.tar.bz2"
+sha512sums="c67ac2ee344a601fcc09471580214b30c3fd6acc4800702840de44f0733e6d18b3faeec2fa3f4e2314025cc1724d7d6796ebaf620398fe350710182fd2c4b07d font-alias-1.0.4.tar.bz2"
diff --git a/main/fortify-headers/0000-do-not-mess-with-ppoll.patch b/main/fortify-headers/0000-do-not-mess-with-ppoll.patch
new file mode 100644
index 0000000000..e9685ecafd
--- /dev/null
+++ b/main/fortify-headers/0000-do-not-mess-with-ppoll.patch
@@ -0,0 +1,34 @@
+diff -rNU3 fortify-headers-1.1.old/README fortify-headers-1.1/README
+--- fortify-headers-1.1.old/README 2019-04-14 10:26:11.000000000 +0200
++++ fortify-headers-1.1/README 2021-02-16 18:10:51.305259894 +0100
+@@ -67,7 +67,6 @@
+ mempcpy
+ memset
+ poll
+-ppoll
+ pread
+ read
+ readlink
+diff -rNU3 fortify-headers-1.1.old/include/poll.h fortify-headers-1.1/include/poll.h
+--- fortify-headers-1.1.old/include/poll.h 2019-04-14 10:26:11.000000000 +0200
++++ fortify-headers-1.1/include/poll.h 2021-02-16 18:11:25.415259531 +0100
+@@ -39,19 +39,6 @@
+ return __orig_poll(__f, __n, __s);
+ }
+
+-#ifdef _GNU_SOURCE
+-#undef ppoll
+-_FORTIFY_FN(ppoll) int ppoll(struct pollfd *__f, nfds_t __n, const struct timespec *__s,
+- const sigset_t *__m)
+-{
+- __typeof__(sizeof 0) __b = __builtin_object_size(__f, 0);
+-
+- if (__n > __b / sizeof(struct pollfd))
+- __builtin_trap();
+- return __orig_ppoll(__f, __n, __s, __m);
+-}
+-#endif
+-
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/main/fortify-headers/APKBUILD b/main/fortify-headers/APKBUILD
index 2148b3b72c..8701f52920 100644
--- a/main/fortify-headers/APKBUILD
+++ b/main/fortify-headers/APKBUILD
@@ -2,13 +2,14 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=fortify-headers
pkgver=1.1
-pkgrel=0
+pkgrel=1
pkgdesc="standalone fortify source implementation"
url="http://git.2f30.org/fortify-headers/"
arch="noarch"
options="!check" # No test suite.
license="BSD-0"
source="http://dl.2f30.org/releases/$pkgname-$pkgver.tar.gz
+ 0000-do-not-mess-with-ppoll.patch
"
builddir="$srcdir"/$pkgname-$pkgver
@@ -22,4 +23,5 @@ package() {
make DESTDIR="$pkgdir" PREFIX=/usr install
}
-sha512sums="a39d6e7c002bf91085f712aa46bc3f53ff934cc963694a229fa82d84ff4a7556105212a84a231ab5367c01c6a1e385172173f1f4a34d5eb4d2d9c58472c23dd0 fortify-headers-1.1.tar.gz"
+sha512sums="a39d6e7c002bf91085f712aa46bc3f53ff934cc963694a229fa82d84ff4a7556105212a84a231ab5367c01c6a1e385172173f1f4a34d5eb4d2d9c58472c23dd0 fortify-headers-1.1.tar.gz
+a48dca5f9e0ac301ae7c31e20af233e25709bc799be9a7fc97ebdff3b1f20d65fb6f8245d6b1b0d632a5661bc2c06144f9c2e97fb20122311da78fed8148c66b 0000-do-not-mess-with-ppoll.patch"
diff --git a/main/fprobe/APKBUILD b/main/fprobe/APKBUILD
index 2595e80a7e..c75b7f644a 100644
--- a/main/fprobe/APKBUILD
+++ b/main/fprobe/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=fprobe
pkgver=1.1
-pkgrel=8
+pkgrel=9
pkgdesc="libpcap-based tool that collect network traffic"
url="http://fprobe.sourceforge.net/"
arch="all"
diff --git a/main/freeradius-client/APKBUILD b/main/freeradius-client/APKBUILD
index 3f0c0a61ed..61a0169649 100644
--- a/main/freeradius-client/APKBUILD
+++ b/main/freeradius-client/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Francesco Colsita <francesco.colista@gmail.com>
+# Contributor: Francesco Colsita <fcolista@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=freeradius-client
pkgver=1.1.7
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index 061273d281..e66e036414 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -5,7 +5,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=freeradius
pkgver=3.0.21
-pk