aboutsummaryrefslogtreecommitdiffstats
path: root/community
diff options
context:
space:
mode:
Diffstat (limited to 'community')
-rw-r--r--community/ceph/30-32bit_fix.patch.noauto2
-rw-r--r--community/ceph/APKBUILD8
-rw-r--r--community/fio/APKBUILD6
-rw-r--r--community/firefox-esr/APKBUILD38
-rw-r--r--community/go/APKBUILD16
-rw-r--r--community/gpsd/APKBUILD82
-rw-r--r--community/gpsd/gpsd.confd7
-rw-r--r--community/gpsd/gpsd.initd38
-rw-r--r--community/gpsd/timepps.h216
-rw-r--r--community/ifstate/APKBUILD8
-rw-r--r--community/jool-modules-lts/APKBUILD2
-rw-r--r--community/jool-modules-rpi/APKBUILD2
-rw-r--r--community/libmad/APKBUILD2
-rw-r--r--community/marble/APKBUILD2
-rw-r--r--community/mozjs78/APKBUILD11
-rw-r--r--community/nextcloud/APKBUILD17
-rw-r--r--community/php7/APKBUILD10
-rw-r--r--community/php8/APKBUILD10
-rw-r--r--community/plasma-workspace/APKBUILD2
-rw-r--r--community/py3-pyroute2/001-ipset-content.patch11
-rw-r--r--community/py3-pyroute2/APKBUILD11
-rw-r--r--community/rtl8821ce-lts/APKBUILD2
-rw-r--r--community/rtpengine-lts/APKBUILD2
-rw-r--r--community/sngrep/APKBUILD6
-rw-r--r--community/stellarium/APKBUILD2
-rw-r--r--community/stunnel/APKBUILD8
-rw-r--r--community/swaylock/APKBUILD17
-rw-r--r--community/swaylock/fix-version.patch11
-rw-r--r--community/swaylock/ungit-version.patch21
-rw-r--r--community/tinc-pre/APKBUILD17
-rw-r--r--community/tinc-pre/prevent-large-amounts-of-UDP-probes.patch70
-rw-r--r--community/wofi/APKBUILD7
32 files changed, 184 insertions, 480 deletions
diff --git a/community/ceph/30-32bit_fix.patch.noauto b/community/ceph/30-32bit_fix.patch.noauto
index 818504c970..dfa6a7ef6e 100644
--- a/community/ceph/30-32bit_fix.patch.noauto
+++ b/community/ceph/30-32bit_fix.patch.noauto
@@ -52,7 +52,7 @@ diff -uNr ceph-15.2.4/src/client/Client.h ceph-15.2.4-arm32_fix/src/client/Clien
@@ -1179,7 +1179,7 @@
int _lookup_parent(Inode *in, const UserPerm& perms, Inode **parent=NULL);
int _lookup_name(Inode *in, Inode *parent, const UserPerm& perms);
- int _lookup_ino(inodeno_t ino, const UserPerm& perms, Inode **inode=NULL);
+ int _lookup_vino(vinodeno_t ino, const UserPerm& perms, Inode **inode=NULL);
- bool _ll_forget(Inode *in, uint64_t count);
+ bool _ll_forget(Inode *in, size_t count);
diff --git a/community/ceph/APKBUILD b/community/ceph/APKBUILD
index 32f1b558d3..a7905e140e 100644
--- a/community/ceph/APKBUILD
+++ b/community/ceph/APKBUILD
@@ -3,8 +3,8 @@
# Contributor: Duncan Bellamy <dunk@denkimushi.com>
# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
pkgname=ceph
-pkgver=15.2.13
-pkgrel=1
+pkgver=15.2.14
+pkgrel=0
pkgdesc="Ceph is a distributed object store and file system"
pkgusers="ceph"
pkggroups="ceph"
@@ -545,12 +545,12 @@ _pkg() {
}
sha512sums="
-bde28c331c489db0845959f65c425146c317466a7793f56a83e2827dec35b8cd6f600bf9056151c1e6926cc0155deebbc8681c240ac9f37ad876b9a6afae96da ceph_15.2.13.orig.tar.gz
+eacc4dea0d8dfe2753aff78d89324d81c5634a784313c3da8ded778e2734958c216f8c705b25f070d7ba66b559424ad3c47cb68852f66f8c9c83a83ca78ad5a5 ceph_15.2.14.orig.tar.gz
110bdbcb40216c7ed155a8d23020784741b4992d895f4f04a146d275506e4e68053854d3b063b41e9c9b3e3e4f95b6b90602f92c185c853c0d8f47ad0c6b7121 ceph.confd
ce5f162501f6b67fe254546dddf880d1a5b1d1a0fa69e0b1918de17e8da45c5c6124512b8cbd98b76f29d931403de0d11c5ffd330ed8ee1f4dc75bb04baecae3 ceph.initd
c608f11cf358d76daf5281467a4ea941a81474fbe7f5faa41f7f4d0abaf9136a01576bbb1ab24bdd7bc91a49f66bd7f0a84717de5ec27250d74dd1e47e3b5dd3 10-musl-fixes.patch
427ab410aeb02d49c5caa8ff68c7b8df325229823d625b7069cd48c66dd9e129e742270850fb2be2238eb6fa12b8256845b4d94426ca96b2a9187b2726e78423 20-pci.patch
-29161e75e7bff5a1394c5eb27e0fd5dc8044d2e144e311accbac5257bb4aa7ebf8f58293e98de8cbbd629923301b24bdaff165fa4027a79538b4e8e9c2c7c2ed 30-32bit_fix.patch.noauto
+68660da5df1fe290f88707feb3781b5ccb5310fa248fd8b7c5075811b3ad4620bcc0aaed8cde857ff63695160172a4bfb668efc8b0fa55745fb8301168c6fe66 30-32bit_fix.patch.noauto
f974ab36cd6fa49c1d4613203a4f2152723e4952a185dfb6349bc4ca8ee1a7a9d0477bea136c54248271de30a4e584734ba41e8ec41bf274b04074622888ae39 31-32bit_fix_tests.patch.noauto
62ef2e7e10978e9e0eef4a094bc63d9890f0d7e71eba0f0e15baede0597ea179a77924f6dbd4d4a9c9b151c9ae934f4c10d7f2a17ee960b017f942ec57c7af35 34-fix_cpu_detection.patch
8a3e902309238ae6917b4c5fe9fa371dad3ba8e01848f462a9b67ad8d69b8370a8957f6c88462a7016319fd323eb6d6c31415734db56485a8a8b279d2705aff5 35-fix_ErasureCodeShec.patch
diff --git a/community/fio/APKBUILD b/community/fio/APKBUILD
index 9a04c1be27..01d0c89f15 100644
--- a/community/fio/APKBUILD
+++ b/community/fio/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: wener <wenermail@gmail.com>
pkgname=fio
pkgver=3.25
-pkgrel=0
+pkgrel=1
pkgdesc="Flexible I/O Tester"
url="https://github.com/axboe/fio"
arch="all"
@@ -18,7 +18,9 @@ case "$CARCH" in
esac
build() {
- ./configure --prefix=/usr
+ ./configure \
+ --prefix=/usr \
+ --disable-native
make T_TEST_PROGS=
}
diff --git a/community/firefox-esr/APKBUILD b/community/firefox-esr/APKBUILD
index 112943b2f9..b35c21034e 100644
--- a/community/firefox-esr/APKBUILD
+++ b/community/firefox-esr/APKBUILD
@@ -2,9 +2,9 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=firefox-esr
-pkgver=78.11.0
+pkgver=78.14.0
# Date of release, YY-MM-DD for metainfo file (see package())
-_releasedate=2021-06-01
+_releasedate=2021-09-07
pkgrel=0
pkgdesc="Firefox web browser - Extended Support Release"
url="https://www.mozilla.org/en-US/firefox/organizations/"
@@ -86,6 +86,20 @@ _mozappdir=/usr/lib/firefox
ldpath="$_mozappdir"
# secfixes:
+# 78.14.0-r0:
+# - CVE-2021-38492
+# - CVE-2021-38493
+# 78.13.0-r0:
+# - CVE-2021-29980
+# - CVE-2021-29984
+# - CVE-2021-29985
+# - CVE-2021-29986
+# - CVE-2021-29988
+# - CVE-2021-29989
+# 78.12.0-r0:
+# - CVE-2021-29970
+# - CVE-2021-29976
+# - CVE-2021-30547
# 78.11.0-r0:
# - CVE-2021-29967
# 78.10.0-r0:
@@ -453,7 +467,25 @@ npapi() {
}
sha512sums="
-d02fc2eda587155b1c54ca12a6c5cde220a29f41f154f1c9b71ae8f966d8cc9439201a5b241e03fc0795b74e2479f7aa5d6b69f70b7639432e5382f321f7a6f4 firefox-78.11.0esr.source.tar.xz
+5d5e4b1197f87b458a8ab14a62701fa0f3071e9facbb4fba71a64ef69abf31edbb4c5efa6c20198de573216543b5289270b5929c6e917f01bb165ce8c139c1ac firefox-78.14.0esr.source.tar.xz
+0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h
+2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71 fix-fortify-system-wrappers.patch
+4510fb92653d0fdcfbc6d30e18087c0d22d4acd5eb53be7d0a333abe087a9e0bf9e58e56bafe96e1e1b28ebd1fd33b8926dbb70c221007e335b33d1468755c66 fix-tools.patch
+a4a3e062661bda64d502d426c480ac9645345860118de9df9ffe6e0597738c70c11e5cdef2d4fd12c5e2ee30a09310159230524655a419a4f7e4eeeb0f3c06b0 mallinfo.patch
+454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c disable-moz-stackwalk.patch
+089c97e6011e86a9b9d9e7b0c8ba3af0519d1ce4e2b1e9ab7719762d6968388bfa47dad3bf23a6d41c3d66fdcc6c15e2c926e3ff9500bfd4fbf1b53e6d19dc57 fix-rust-target.patch
+d35cacb9ede80e6bfbef0709823e536dddfb1c02d776275b0b7adb5969e9927d8c6117df96873569c3f3db0a18ee5db24f8086a9311a05077892be43a3dd8d79 fix-webrtc-glibcisms.patch
+60845dcb034b2c4459c30f7d5f25c8176cf42df794e2cc0e86c3e2abb6541c24b962f3a16ca70a288d4d6f377b68d00b2904b22463108559612053d835d9bff1 fd6847c9416f9eebde636e21d794d25d1be8791d.patch
+4e584621145cf8add069c6dac18e805b3274a1ee402d84e924df2341f7d3c5be261a93ef51283bacbd606f47fbdc628c4323ecc31efc5b403b8d224b18dc278f allow-custom-rust-vendor.patch
+f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop
+5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop
+bb75b2abda86e455d81571052a2cfec5a9d858ffa91c50a7217b4b6c02cbfc0400e9114a27bd54ce78d7d3a44e9b03927cf0317654d98c0f39d26c63c9670117 remove-faulty-libvpx-check.patch
+f963fcdba7307a0b1712dfb95ceba4ab49f449f60e550bb69d15d50272e6df9add90862251ee561e4ea5fd171a2703552ffa7aade92996f5f0b3e577f1544a6d disable-neon-in-aom.patch
+4911ddb41bef8d9f6d6200159cde465627e940fe1c09099be55769d21a5a52a3f737e1bf803daa96126c035b091aea880fbc5d2e6cf5da96ddd17322461a72d6 sandbox-fork.patch
+db26757b2ebf9f567962e32294b4ae48b3a5d0378a7589dfe650fe3a179ff58befbab5082981c68e1c25fb9e56b2db1e4e510d4bca17c3e3aedbf9a2f21806eb sandbox-sched_setscheduler.patch
+"
+sha512sums="
+5d5e4b1197f87b458a8ab14a62701fa0f3071e9facbb4fba71a64ef69abf31edbb4c5efa6c20198de573216543b5289270b5929c6e917f01bb165ce8c139c1ac firefox-78.14.0esr.source.tar.xz
0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h
2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71 fix-fortify-system-wrappers.patch
4510fb92653d0fdcfbc6d30e18087c0d22d4acd5eb53be7d0a333abe087a9e0bf9e58e56bafe96e1e1b28ebd1fd33b8926dbb70c221007e335b33d1468755c66 fix-tools.patch
diff --git a/community/go/APKBUILD b/community/go/APKBUILD
index 3daeff7aa0..e2a7eb7dd4 100644
--- a/community/go/APKBUILD
+++ b/community/go/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=go
# go binaries are statically linked, security updates require rebuilds
-pkgver=1.15.12
+pkgver=1.15.15
pkgrel=0
pkgdesc="Go programming language compiler"
url="https://golang.org/"
@@ -24,6 +24,15 @@ case "$CARCH" in
esac
# secfixes:
+# 1.15.15-r0:
+# - CVE-2021-36221
+# 1.15.14-r0:
+# - CVE-2021-34558
+# 1.15.13-r0:
+# - CVE-2021-33195
+# - CVE-2021-33196
+# - CVE-2021-33197
+# - CVE-2021-33198
# 1.15.12-r0:
# - CVE-2021-31525
# 1.15.10-r0:
@@ -167,3 +176,8 @@ ab4aa83d8a9bf10bbb93ad029095b47c6eea7d5532703d84449884039116e07897871649feb1df81
c20c126ce12f9a5190784f2a772a47658f375e44fb67884a0450ec3bbd0db61a978388b4c862bd80234e579bab58fd55b6306f3953acda11fd58603799b2e3b3 fix-setrlimit-hang.patch
6017caacf77c2911e9e882878fdaa2ed066b76b7e97b2ad776bc33d96b21cabc802966473946642c86a8f985c69adcc5e7ea61684f6d0dbacd468a6aad687229 allow-unshare-to-return-enosys.patch
"
+sha512sums="bf8a6f669d024ce77271fbc8dc1d7a727c4da85c70cad00d0baaef157e7c5d7879ea9ae71cdb04e55f9c07f5ae76655264ca8a159c971eab1cf8a8861b74e69b go1.15.15.src.tar.gz
+988a436727aefc5124702bd70cb01bb457a921affcdd03e17f78937685482e899080d95baf125e054d1f634dae5c747d05a3662f1f4f462b87965b06270c788f disable-flaky-sync-test.patch
+ab4aa83d8a9bf10bbb93ad029095b47c6eea7d5532703d84449884039116e07897871649feb1df8128f10257cbdb5d7eb03820ab0f1a3f60315e195302f6e516 disable-flaky-gc-test.patch
+c20c126ce12f9a5190784f2a772a47658f375e44fb67884a0450ec3bbd0db61a978388b4c862bd80234e579bab58fd55b6306f3953acda11fd58603799b2e3b3 fix-setrlimit-hang.patch
+6017caacf77c2911e9e882878fdaa2ed066b76b7e97b2ad776bc33d96b21cabc802966473946642c86a8f985c69adcc5e7ea61684f6d0dbacd468a6aad687229 allow-unshare-to-return-enosys.patch"
diff --git a/community/gpsd/APKBUILD b/community/gpsd/APKBUILD
deleted file mode 100644
index db0ef9107e..0000000000
--- a/community/gpsd/APKBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# Contributor: Nathan Angelacos <nangel@alpinelinux.org>
-# Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
-pkgname=gpsd
-pkgver=3.21
-pkgrel=0
-pkgdesc="GPS daemon"
-arch=all
-url="http://catb.org/gpsd/"
-license="BSD-2-Clause"
-makedepends="scons python3-dev libcap-dev ncurses-dev"
-subpackages="$pkgname-dev $pkgname-doc py3-$pkgname:_py $pkgname-clients:_clients"
-source="https://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-$pkgver.tar.gz
- timepps.h
- gpsd-use-local-timepps-header.patch
- gpsd.initd
- gpsd.confd"
-
-options="!check" # FIXME: tests fails
-
-prepare() {
- # We copy timepps.h to the local build directory instead of
- # creating a pps-tools-dev package for ppstime.h
- # (See https://github.com/ago/pps-tools)
- mkdir -p "$builddir"/sys
- cp "$srcdir"/timepps.h "$builddir"/sys/
-
- # Hack to get scons to respect python
- ln -s /usr/bin/python3 python
- export PATH="$PATH:."
-
- default_prepare
-}
-
-build() {
- CPPFLAGS="$CPPFLAGS -I. -DHAVE_SYS_TIMEPPS_H"
- scons -j${JOBS:-1} \
- prefix=/usr \
- target_python=python3 \
- dbus_export=no \
- systemd=no
-}
-
-check() {
- scons check
-}
-
-package() {
- DESTDIR="$pkgdir" scons install
- # fix python interpreter path
- sed -e "s,#!/usr/bin/\(python[23]\?\|env \+python[23]\?\),#!/usr/bin/python3},g" -i \
- gegps gpscat gpsfake xgps xgpsspeed gpsprof gps/*.py
- install -m755 -D "$srcdir"/gpsd.initd "$pkgdir"/etc/init.d/gpsd
- install -m644 -D "$srcdir"/gpsd.confd "$pkgdir"/etc/conf.d/gpsd
-}
-
-_py() {
- local _py=${subpkgname##-*}
- local _pyver=${_py%py}
- pkgdesc="$pkgname library and clients for python $_pyver"
- mkdir -p "$subpkgdir"/usr/lib
- # As of 3.18.1, gpsd wants to put the python stuff in /usr/local
- mv "$pkgdir"/usr/local/lib/python* "$subpkgdir"/usr/lib/
- rm -rf "$pkgdir"/usr/local
-
- mkdir -p "$subpkgdir"/usr/bin
- for n in gpscat gpsfake gpsprof; do
- mv "$pkgdir"/usr/bin/$n "$subpkgdir"/usr/bin/
- done
-
-}
-
-_clients() {
- pkgdesc="$pkgname clients"
- mkdir -p "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin
-}
-
-sha512sums="7fbff3698a44ef24ce4631f1d0c5192b70c2e47f28e61372d8d0c437a6b4aeee459b08dcd69d9dc02bbda7b56949fd01ac57460fb922b5f807455f4ab3e91f2d gpsd-3.21.tar.gz
-eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048 timepps.h
-b692c9fc77a9db3fc621693d3b9e3ef9bc2efbbc7b01651168d7b928d29d48a489b8859930bad01b6021e211372e069a726b78dd5938385ed4ae0153b38f4170 gpsd-use-local-timepps-header.patch
-51319247eb78c3021d3eb897cb5d6026cc09d46a532a245a835459ed525947ffb6239f08126dd7e344de52e3b0387226bce060191ec3f14f99fc9f255d96f8ea gpsd.initd
-75dbfe39eb900cc9587dd70794ee77ae2230765bbede47760ca227145aa3f2290b6995335ffcfeae6cd86f56b01ca87367548f4fbcf810aff1bc012b7416deef gpsd.confd"
diff --git a/community/gpsd/gpsd.confd b/community/gpsd/gpsd.confd
deleted file mode 100644
index 0f52aa9b5e..0000000000
--- a/community/gpsd/gpsd.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Config file for gpsd server
-GPSD_OPTIONS=""
-DEVICES=""
-GPSD_SOCKET="/var/run/gpsd.sock"
diff --git a/community/gpsd/gpsd.initd b/community/gpsd/gpsd.initd
deleted file mode 100644
index d2a30071a2..0000000000
--- a/community/gpsd/gpsd.initd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- after dbus
- before ntpd
-}
-
-PIDFILE=/var/run/${SVCNAME}.pid
-DAEMON=/usr/sbin/gpsd
-
-checkconfig() {
- # Note: these GPSD_xxx var names should be kept in sync with the udev rules.
- if [ -z "${GPSD_SOCKET}" ] && [ -z "${DEVICES}" ]; then
- GPSD_SOCKET="/var/run/gpsd.sock"
- fi
-
- if [ -n "${GPSD_SOCKET}" ]; then
- GPSD_OPTIONS="${GPSD_OPTIONS} -F ${GPSD_SOCKET}"
- fi
-}
-
-start() {
- checkconfig
- ebegin "Starting gpsd"
-
- start-stop-daemon --start --quiet --pidfile ${PIDFILE} --exec ${DAEMON} -- \
- ${GPSD_OPTIONS} -P ${PIDFILE} ${DEVICES}
- eend $?
-}
-
-stop() {
- ebegin "Stopping gpsd"
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile ${PIDFILE}
- eend $?
- rm -f ${PIDFILE}
-}
diff --git a/community/gpsd/timepps.h b/community/gpsd/timepps.h
deleted file mode 100644
index 8c3bd835d6..0000000000
--- a/community/gpsd/timepps.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * timepps.h -- PPS API main header
- *
- * Copyright (C) 2005-2007 Rodolfo Giometti <giometti@linux.it>
- * Copyright (C) 2009-2011 Alexander Gordeev <alex@gordick.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * Source: https://github.com/ago/pps-tools/ - Retreived Dec 2013
- */
-
-#ifndef _SYS_TIMEPPS_H_
-#define _SYS_TIMEPPS_H_
-
-#include <errno.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include <linux/types.h>
-#include <linux/pps.h>
-
-#define LINUXPPS 1 /* signal we are using LinuxPPS */
-
-/*
- * New data structures
- */
-
-struct ntp_fp {
- unsigned int integral;
- unsigned int fractional;
-};
-
-union pps_timeu {
- struct timespec tspec;
- struct ntp_fp ntpfp;
- unsigned long longpad[3];
-};
-
-struct pps_info {
- unsigned long assert_sequence; /* seq. num. of assert event */
- unsigned long clear_sequence; /* seq. num. of clear event */
- union pps_timeu assert_tu; /* time of assert event */
- union pps_timeu clear_tu; /* time of clear event */
- int current_mode; /* current mode bits */
-};
-
-struct pps_params {
- int api_version; /* API version # */
- int mode; /* mode bits */
- union pps_timeu assert_off_tu; /* offset compensation for assert */
- union pps_timeu clear_off_tu; /* offset compensation for clear */
-};
-
-typedef int pps_handle_t; /* represents a PPS source */
-typedef unsigned long pps_seq_t; /* sequence number */
-typedef struct ntp_fp ntp_fp_t; /* NTP-compatible time stamp */
-typedef union pps_timeu pps_timeu_t; /* generic data type for time stamps */
-typedef struct pps_info pps_info_t;
-typedef struct pps_params pps_params_t;
-
-#define assert_timestamp assert_tu.tspec
-#define clear_timestamp clear_tu.tspec
-
-#define assert_timestamp_ntpfp assert_tu.ntpfp
-#define clear_timestamp_ntpfp clear_tu.ntpfp
-
-#define assert_offset assert_off_tu.tspec
-#define clear_offset clear_off_tu.tspec
-
-#define assert_offset_ntpfp assert_off_tu.ntpfp
-#define clear_offset_ntpfp clear_off_tu.ntpfp
-
-/*
- * The PPS API
- */
-
-static __inline int time_pps_create(int source, pps_handle_t *handle)
-{
- int ret;
- struct pps_kparams dummy;
-
- if (!handle) {
- errno = EINVAL;
- return -1;
- }
-
- /* First we check if current device is a valid PPS one by
- * doing a dummy PPS_GETPARAMS...
- */
- ret = ioctl(source, PPS_GETPARAMS, &dummy);
- if (ret) {
- errno = EOPNOTSUPP;
- return -1;
- }
-
- /* ... then since in LinuxPPS there are no differences between a
- * "PPS source" and a "PPS handle", we simply return the same value.
- */
- *handle = source;
-
- return 0;
-}
-
-static __inline int time_pps_destroy(pps_handle_t handle)
-{
- return close(handle);
-}
-
-static __inline int time_pps_getparams(pps_handle_t handle,
- pps_params_t *ppsparams)
-{
- int ret;
- struct pps_kparams __ppsparams;
-
- ret = ioctl(handle, PPS_GETPARAMS, &__ppsparams);
-
- ppsparams->api_version = __ppsparams.api_version;
- ppsparams->mode = __ppsparams.mode;
- ppsparams->assert_off_tu.tspec.tv_sec = __ppsparams.assert_off_tu.sec;
- ppsparams->assert_off_tu.tspec.tv_nsec = __ppsparams.assert_off_tu.nsec;
- ppsparams->clear_off_tu.tspec.tv_sec = __ppsparams.clear_off_tu.sec;
- ppsparams->clear_off_tu.tspec.tv_nsec = __ppsparams.clear_off_tu.nsec;
-
- return ret;
-}
-
-static __inline int time_pps_setparams(pps_handle_t handle,
- const pps_params_t *ppsparams)
-{
- struct pps_kparams __ppsparams;
-
- __ppsparams.api_version = ppsparams->api_version;
- __ppsparams.mode = ppsparams->mode;
- __ppsparams.assert_off_tu.sec = ppsparams->assert_off_tu.tspec.tv_sec;
- __ppsparams.assert_off_tu.nsec = ppsparams->assert_off_tu.tspec.tv_nsec;
- __ppsparams.clear_off_tu.sec = ppsparams->clear_off_tu.tspec.tv_sec;
- __ppsparams.clear_off_tu.nsec = ppsparams->clear_off_tu.tspec.tv_nsec;
-
- return ioctl(handle, PPS_SETPARAMS, &__ppsparams);
-}
-
-/* Get capabilities for handle */
-static __inline int time_pps_getcap(pps_handle_t handle, int *mode)
-{
- return ioctl(handle, PPS_GETCAP, mode);
-}
-
-static __inline int time_pps_fetch(pps_handle_t handle, const int tsformat,
- pps_info_t *ppsinfobuf,
- const struct timespec *timeout)
-{
- struct pps_fdata __fdata;
- int ret;
-
- /* Sanity checks */
- if (tsformat != PPS_TSFMT_TSPEC) {
- errno = EINVAL;
- return -1;
- }
-
- if (timeout) {
- __fdata.timeout.sec = timeout->tv_sec;
- __fdata.timeout.nsec = timeout->tv_nsec;
- __fdata.timeout.flags = ~PPS_TIME_INVALID;
- } else
- __fdata.timeout.flags = PPS_TIME_INVALID;
-
- ret = ioctl(handle, PPS_FETCH, &__fdata);
-
- ppsinfobuf->assert_sequence = __fdata.info.assert_sequence;
- ppsinfobuf->clear_sequence = __fdata.info.clear_sequence;
- ppsinfobuf->assert_tu.tspec.tv_sec = __fdata.info.assert_tu.sec;
- ppsinfobuf->assert_tu.tspec.tv_nsec = __fdata.info.assert_tu.nsec;
- ppsinfobuf->clear_tu.tspec.tv_sec = __fdata.info.clear_tu.sec;
- ppsinfobuf->clear_tu.tspec.tv_nsec = __fdata.info.clear_tu.nsec;
- ppsinfobuf->current_mode = __fdata.info.current_mode;
-
- return ret;
-}
-
-#ifdef PPS_KC_BIND
-
-static __inline int time_pps_kcbind(pps_handle_t handle,
- const int kernel_consumer,
- const int edge, const int tsformat)
-{
- struct pps_bind_args __bind_args;
-
- __bind_args.tsformat = tsformat;
- __bind_args.edge = edge;
- __bind_args.consumer = kernel_consumer;
-
- return ioctl(handle, PPS_KC_BIND, &__bind_args);
-}
-
-#else /* !PPS_KC_BIND */
-
-static __inline int time_pps_kcbind(pps_handle_t handle,
- const int kernel_consumer,
- const int edge, const int tsformat)
-{
- /* LinuxPPS doesn't implement kernel consumer feature */
- errno = EOPNOTSUPP;
- return -1;
-}
-
-#endif /* PPS_KC_BIND */
-
-#endif /* _SYS_TIMEPPS_H_ */
diff --git a/community/ifstate/APKBUILD b/community/ifstate/APKBUILD
index a6cd93f843..9eac111214 100644
--- a/community/ifstate/APKBUILD
+++ b/community/ifstate/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Thomas Liske <thomas@fiasko-nw.net>
pkgname=ifstate
-pkgver=1.5.2
+pkgver=1.5.6
pkgrel=0
pkgdesc="Manage host interface settings in a declarative manner"
url="https://ifstate.net/"
@@ -25,6 +25,8 @@ package() {
install -Dm755 "$srcdir"/ifstate.initd "$pkgdir"/etc/init.d/ifstate
}
-sha512sums="ca6533f2fbe1bedce7fa1ba4dfa4da8d55ac4e9966516f4b008f672d98bb34bd4f4e87dfcd7bcd1930686d693d998ae5d34ae46aa200be46c9638738cf98e4c0 ifstate-1.5.2.tar.gz
+sha512sums="
+457b00b2599c024866a7bcbd6811157dfe935d16387e529097edbfd52ffe0a79e973dadcfa4bd2bdf707e2fd9a6d6f1f917dcb4b8fb8bba3f377ea92d2fed458 ifstate-1.5.6.tar.gz
dfc31dc7452c63ec18d368803ffb3bef1cd96d98345d0c5ef1baeb8b2819130b504d3e6e82d99ee86fa18d4576b7927d0b80d6d79f9f20e388e07faa09a87285 ifstate.conf
-e583c764c65dbf00ce6a4269cef5d8a78c2ec47851671cc25bbebd2d6095c42f0a10eccfd021728e05b3b67d8b950f9e4359da63226da551b8dc5ebd5d8aa0ef ifstate.initd"
+e583c764c65dbf00ce6a4269cef5d8a78c2ec47851671cc25bbebd2d6095c42f0a10eccfd021728e05b3b67d8b950f9e4359da63226da551b8dc5ebd5d8aa0ef ifstate.initd
+"
diff --git a/community/jool-modules-lts/APKBUILD b/community/jool-modules-lts/APKBUILD
index 3914476030..16ab91e8e2 100644
--- a/community/jool-modules-lts/APKBUILD
+++ b/community/jool-modules-lts/APKBUILD
@@ -21,7 +21,7 @@ fi
# Kernel version
# Keep in sync with main/linux-lts!
_kpkg=linux-$_flavor
-_kver=5.10.38
+_kver=5.10.61
_krel=0
_kpkgver="$_kver-r$_krel"
diff --git a/community/jool-modules-rpi/APKBUILD b/community/jool-modules-rpi/APKBUILD
index a06b4266e7..61ef51ebfe 100644
--- a/community/jool-modules-rpi/APKBUILD
+++ b/community/jool-modules-rpi/APKBUILD
@@ -21,7 +21,7 @@ fi
# Kernel version
# Keep in sync with main/linux-rpi!
_kpkg=linux-$_flavor
-_kver=5.10.36
+_kver=5.10.61
_krel=0
_kpkgver="$_kver-r$_krel"
diff --git a/community/libmad/APKBUILD b/community/libmad/APKBUILD
index d9dc9ba2c6..df80e6a945 100644
--- a/community/libmad/APKBUILD
+++ b/community/libmad/APKBUILD
@@ -26,6 +26,8 @@ source="https://downloads.sourceforge.net/sourceforge/mad/libmad-$pkgver.tar.gz
# - CVE-2017-8372
# - CVE-2017-8373
# - CVE-2017-8374
+# - CVE-2017-11552
+# - CVE-2018-7263
prepare() {
update_config_sub
diff --git a/community/marble/APKBUILD b/community/marble/APKBUILD
index 3fcda12d5c..9e55e8c764 100644
--- a/community/marble/APKBUILD
+++ b/community/marble/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=marble
pkgver=20.12.3
-pkgrel=0
+pkgrel=1
pkgdesc="A Virtual Globe and World Atlas that you can use to learn more about Earth"
# mips, ppc64le and s390x blocked by qt5-qtwebengine
# armhf blocked by qt5-qtdeclarative
diff --git a/community/mozjs78/APKBUILD b/community/mozjs78/APKBUILD
index d4df64f266..da4818fadd 100644
--- a/community/mozjs78/APKBUILD
+++ b/community/mozjs78/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=mozjs78
-pkgver=78.12.0
+pkgver=78.15.0
pkgrel=0
pkgdesc="Standalone Mozilla JavaScript engine"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
@@ -40,6 +40,13 @@ builddir="$srcdir"/firefox-$pkgver
_builddir="$builddir/js/src"
# secfixes:
+# 78.15.0-r0:
+# - CVE-2021-38500
+# 78.14.0-r0:
+# - CVE-2021-38493
+# 78.13.0-r0:
+# - CVE-2021-29984
+# - CVE-2021-29989
# 78.12.0-r0:
# - CVE-2021-29976
# - CVE-2021-29967
@@ -124,7 +131,7 @@ package() {
}
sha512sums="
-646eb803e0d0e541773e3111708c7eaa85e784e4bae6e4a77dcecdc617ee29e2e349c9ef16ae7e663311734dd7491aebd904359124dda62672dbc18bfb608f0a firefox-78.12.0esr.source.tar.xz
+ac3de735b246ce4f0e1619cd2664321ffa374240ce6843e785d79a350dc30c967996bbcc5e3b301cb3d822ca981cbea116758fc4122f1738d75ddfd1165b6378 firefox-78.15.0esr.source.tar.xz
f7e5bee97cfa495d491dac4b8b98e5d3081346d920700e8bb6d077543e18245e5c82201a9981036ec0bf16d9fbdd42fd76e8cf6d90bb811e7338261204020149 0001-silence-sandbox-violations.patch
4f2cb93f91e798218d83cb3ac4c60b61a3658c5b269bfe250f4c4875aedaacbd77598d8d20e3a868626e49988b2073a2404e37d6918b11def774c25db68dd08d disable-jslint.patch
60845dcb034b2c4459c30f7d5f25c8176cf42df794e2cc0e86c3e2abb6541c24b962f3a16ca70a288d4d6f377b68d00b2904b22463108559612053d835d9bff1 fd6847c9416f9eebde636e21d794d25d1be8791d.patch
diff --git a/community/nextcloud/APKBUILD b/community/nextcloud/APKBUILD
index 903899b5f9..52b54cd967 100644
--- a/community/nextcloud/APKBUILD
+++ b/community/nextcloud/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
pkgname=nextcloud
-pkgver=20.0.11
+pkgver=20.0.13
pkgrel=0
pkgdesc="A safe home for all your data"
url="http://nextcloud.com"
@@ -246,7 +246,7 @@ _package_app() {
}
sha512sums="
-7490191ca05a9fffce49e6c4076a188d03c4a8223283b8966e637eadd0ad74b51340e0508aa29454e4e7f06693cf179d71d73754724ecaa975c2470abdbe2ff7 nextcloud-20.0.10.zip
+0082757bd98e746b088eba77cba8815e87f7273142ccb364b85cbd3aca734f246ffd78644c5735630f72dd2f9d2a1ca1d67d7c2a5371c9327cf94fed1145403e nextcloud-20.0.13.zip
aea0adb2c3a48ec6af2958c6ccfe13adff86316a56084e763b7e6df9e21aa3435b13305b7c15cc2b795e83c9388b05006862f6465c29e3dc2c1fbd8eb8befcb9 nextcloud19-dont-chmod.patch
2d03b90c1e2f3d96001f31f1bbf902e4c411c8de7dc5a4f956fa8297533324cb12092d3ad2198f2e02ff4835dc22febee2d49e449b003caef5b990d9dcff1e70 nextcloud-app-encryption-info-add-mcrypt.patch
aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731 dont-update-htaccess.patch
@@ -260,16 +260,3 @@ edb699ea6127b231793254115b334006c2d50a0d2ecc846188c3521ddffc3c0e19c5e2944f03cae8
ee9073a6df4286cba2d1d855cf40863968f20677729b2c7848ab50a70d4915b8e84c957a850a03a707231256c11312e5792e7817dd50afbf73efe767fef2112d fpm-pool.conf
959852e34f010e635470829d66713f3e22c47717ec2c6487759eed2b6aeff9fd1421fe0271d494a02781bd1c98beb2823583623ee2cf03057cd5db794627d6c2 occ
"
-sha512sums="1373e3491d6f5a0d3c7cffdc9794e3972f6bf067ac622be07da966dd31e7905486d5725594dab7e404ff82c1d3af60f3b230259bbaf488bf60b604375c11c993 nextcloud-20.0.11.zip
-aea0adb2c3a48ec6af2958c6ccfe13adff86316a56084e763b7e6df9e21aa3435b13305b7c15cc2b795e83c9388b05006862f6465c29e3dc2c1fbd8eb8befcb9 nextcloud19-dont-chmod.patch
-2d03b90c1e2f3d96001f31f1bbf902e4c411c8de7dc5a4f956fa8297533324cb12092d3ad2198f2e02ff4835dc22febee2d49e449b003caef5b990d9dcff1e70 nextcloud-app-encryption-info-add-mcrypt.patch
-aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731 dont-update-htaccess.patch
-d2100a837fef1eeae5f706650ab4c985d9e00f61efa5526ef76c7c1f5811c3906eb6c3c13c151eff9677a0c303faab64411a5a84d6792728bc520d2c618d7d5b disable-integrity-check-as-default.patch
-3fc3e06580a619d81b12f448976ffac34f0bb80fc73e9443fa213a73f160ba4b9bd14a26c134258ee12c04d8e103b46f4de10d7b11e4544a328878e57d436055 iconv-ascii-translit-not-supported.patch
-df1a16414a278c205876ec86c210a02a9009954e2d4f9033ff3c9b76c371e2764ef3587db5a4b8f76302655c6c8688c8729d1685279a77d279d3839cc359fbcd use-external-docs-if-local-not-avail.patch
-5f73cd9399fa484ef15bd47e803c93381deffbc7699eceadbb5c27e43b20156806d74e5021a64d28f0165ef87b519e962780651711a37bceb9f0b04455dfdce1 nextcloud-config.php
-7388458a9e8b7afd3d3269718306410ffa59c3c23da4bef367a4d7f6d2570136fae9dd421b19c1441e7ffb15a5405e18bb5da67b1a15f9f45e8b98d3fda532ba nextcloud.logrotate
-dcc57735d7d4af4a7ebbdd1186d301e51d2ae4675022aea6bf1111222dfa188a3a490ebd6e7c8a7ac30046cb7d93f81cec72a51acbc60d0c10b7fb64630c637a nextcloud.confd
-edb699ea6127b231793254115b334006c2d50a0d2ecc846188c3521ddffc3c0e19c5e2944f03cae81e6c645c859258380691081b1c522a22d40939b31db36e8a nextcloud.cron
-ee9073a6df4286cba2d1d855cf40863968f20677729b2c7848ab50a70d4915b8e84c957a850a03a707231256c11312e5792e7817dd50afbf73efe767fef2112d fpm-pool.conf
-959852e34f010e635470829d66713f3e22c47717ec2c6487759eed2b6aeff9fd1421fe0271d494a02781bd1c98beb2823583623ee2cf03057cd5db794627d6c2 occ"
diff --git a/community/php7/APKBUILD b/community/php7/APKBUILD
index e8075bc8f2..ea81ac853a 100644
--- a/community/php7/APKBUILD
+++ b/community/php7/APKBUILD
@@ -25,7 +25,7 @@
pkgname=php7
_pkgreal=php
-pkgver=7.4.21
+pkgver=7.4.24
pkgrel=0
_apiver=20190902
_suffix=${pkgname#php}
@@ -174,6 +174,8 @@ done
subpackages="$subpackages $pkgname-common::noarch"
# secfixes:
+# 7.4.24-r0:
+# - CVE-2021-21706
# 7.4.21-r0:
# - CVE-2021-21705
# 7.4.15-r0:
@@ -679,7 +681,8 @@ _mv() {
mv "$@"
}
-sha512sums="778ddbfe614fdc6a00bc82c61f4c636bdbe815ce3398415a29bd24a2fd4ca2113b3b804303585d8830242e04b0c202bbc7c725a46c9bad79b070a0e896e5e681 php-7.4.21.tar.xz
+sha512sums="
+30dd0a83d6184791f4cff3edcffeb05470de8f98ddadba3c11544449bf500280ff2048a8ca8588b35d0622dcbbf16f55ea297f51d469ae137048cab2d40da9cd php-7.4.24.tar.xz
1c708de82d1086f272f484faf6cf6d087af7c31750cc2550b0b94ed723961b363f28a947b015b2dfc0765caea185a75f5d2c2f2b099c948b65c290924f606e4f php7-fpm.initd
cacce7bf789467ff40647b7319e3760c6c587218720538516e8d400baa75651f72165c4e28056cd0c1dc89efecb4d00d0d7823bed80b29136262c825ce816691 php7-fpm.logrotate
274bd7b0b2b7002fa84c779640af37b59258bb37b05cb7dd5c89452977d71807f628d91b523b5039608376d1f760f3425d165242ca75ee5129b2730e71c4e198 php7-module.conf
@@ -689,4 +692,5 @@ ebf571c5e595221b9944d7e840807ebb68c1be38bf117186e19a3bd1070310ece5918bcaa5f94167
965b52893affb666af64e00d09e0208dcd41b17ce2864cf05616c6d05a05c0121694c0b209d403b8c0c55d18e6f1528c4aba1a4fcdce7b282a13304d12cd0f9d sharedir.patch
16399fbf6a966f9beffe00f659f9551ef8e52285bca116da5bd5b15ec99a2b0bd5fa03be0faa6c893802aa44c100d634083343a9ac0cd2467812865df66dd572 php7-fpm-version-suffix.patch
3bfeea79f9acfaa7be5bab85cd3d02713abb569e54024a22bb2c747c06d97f83ac2c63dcd75c7c409426ac03f8bc2ccc01bcd66bc39a767930d32542349123f9 fix-tests-devserver.patch
-7c8c3cac9efce81d525cb5a70e1402e393881b83ef4c7b5d39d3565803d21cd283daf3d74e9a8b059ecac66cf339756acc63608ffcb83d960dba86583bd45108 enchant-2.patch"
+7c8c3cac9efce81d525cb5a70e1402e393881b83ef4c7b5d39d3565803d21cd283daf3d74e9a8b059ecac66cf339756acc63608ffcb83d960dba86583bd45108 enchant-2.patch
+"
diff --git a/community/php8/APKBUILD b/community/php8/APKBUILD
index 5bf4977457..3ba058d3c3 100644
--- a/community/php8/APKBUILD
+++ b/community/php8/APKBUILD
@@ -25,7 +25,7 @@
pkgname=php8
_pkgreal=php
-pkgver=8.0.8
+pkgver=8.0.11
pkgrel=0
_apiver=20200930
_suffix=${pkgname#php}
@@ -172,6 +172,8 @@ done
subpackages="$subpackages $pkgname-common::noarch"
# secfixes:
+# 8.0.11-r0:
+# - CVE-2021-21706
# 8.0.8-r0:
# - CVE-2021-21705
# 8.0.2-r0:
@@ -611,7 +613,8 @@ _mv() {
mv "$@"
}
-sha512sums="1f8b94083b64705e24365af57169f8ff08115f31a7471238d9ed7a24b692e46c789f3fc00ff2bef2205243b9cd9c4736831e995a004afc7fc4127f3b74932428 php-8.0.8.tar.xz
+sha512sums="
+2d346959b2691ea0d5334dc9cad225b7a65ec53d6a6493f3b95c4819a0c088bec36aa1bf4ab3c8044a631bcfefb689d85463ff2259d42000e65dac30badcc59d php-8.0.11.tar.xz
8a9a63cddfd9bdde23db85a7be0711e14688bab35b580abd0184d370c54de80b72cbdeb369570cd23927154984f024eaad5d222d53d9e19130fb2e8758dd4540 php8-fpm.initd
cd3a96d3febde3b6657ed80ff58945641443e84e5e0fd3d9df29e640e9549bc452a3412f1999fa02ae1ee2b64c08040998fa75805f67e0252741c376e26e1c3c php8-fpm.logrotate
95f536addfbb28fbca8b14da46d95a3595369d6e98d345f55f0fda1b12bdefd1579a27505424e7d1088a987d330798253cec9bd42b544bb567189cba746217c7 php8-module.conf
@@ -620,4 +623,5 @@ ec206639d076ddac6c2d1db697a5428ed3be979157db39417af7fbe6ab837e8dc00315ae0e55aea4
79f919ca110530cac2f1ed1e7a86e2c396c25022f00501b520b6bd2efa8eefd962df4ad25235b8a37d8a30d67d257baaf9dfb4041891206a5b15a9c895f1797d includedir.patch
b5d7e87df4f45171a185aec1d4cf96157b3c6b9ea9625237e31b0756220a12a64c260cc20c38bfb0146f11fca25c9c25be1981a922ecb14de5cc2965d29d8fe3 sharedir.patch
f634ac591576dff87487d239578420364edb56e977535c4a5ab799d360a799179edf1e7e6a4e6b6e5b4f58e267dbf913ed77bde140ad8425e6df4093bfa69e70 php8-fpm-version-suffix.patch
-1b64a7cef9e81387f955cb60ffa4e3d2277b4f6072e9328d779c0d447c202c8ee9dff0d8d8c34abc82c150311f51c4e9316a3b72a383ca6c9a6e683bc5b349a0 fix-tests-devserver.patch"
+1b64a7cef9e81387f955cb60ffa4e3d2277b4f6072e9328d779c0d447c202c8ee9dff0d8d8c34abc82c150311f51c4e9316a3b72a383ca6c9a6e683bc5b349a0 fix-tests-devserver.patch
+"
diff --git a/community/plasma-workspace/APKBUILD b/community/plasma-workspace/APKBUILD
index 480009dbb1..29fa0c88b3 100644
--- a/community/plasma-workspace/APKBUILD
+++ b/community/plasma-workspace/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-workspace
pkgver=5.20.5
-pkgrel=1
+pkgrel=2
pkgdesc="KDE Plasma Workspace"
# armhf blocked by kirigami2
# s390x blocked by kactivitymanagerd
diff --git a/community/py3-pyroute2/001-ipset-content.patch b/community/py3-pyroute2/001-ipset-content.patch
new file mode 100644
index 0000000000..b74ad3f988
--- /dev/null
+++ b/community/py3-pyroute2/001-ipset-content.patch
@@ -0,0 +1,11 @@
+--- a/pyroute2/wiset.py.orig 2021-05-12 23:14:00.000000000 +0200
++++ b/pyroute2/wiset.py 2021-08-13 19:12:57.590768736 +0200
+@@ -251,6 +251,8 @@
+ proto = IP_PROTOCOLS.get(proto, str(proto)).lower()
+ key += '{proto}:'.format(proto=proto)
+ key += str(entry.get_attr("IPSET_ATTR_PORT_FROM"))
++ elif parse_type == "mac":
++ key += entry.get_attr("IPSET_ATTR_ETHER")
+ key += ","
+
+ key = key.strip(",")
diff --git a/community/py3-pyroute2/APKBUILD b/community/py3-pyroute2/APKBUILD
index 5064ffc1dc..0a55da2f74 100644
--- a/community/py3-pyroute2/APKBUILD
+++ b/community/py3-pyroute2/APKBUILD
@@ -2,13 +2,15 @@
pkgname=py3-pyroute2
_pkgname=pyroute2
pkgver=0.5.19
-pkgrel=0
+pkgrel=1
pkgdesc="Python Netlink library"
url="https://github.com/svinota/pyroute2"
arch="noarch"
license="GPL-2.0-or-later OR Apache-2.0"
makedepends="py3-setuptools py3-pytest"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
+ 001-ipset-content.patch
+ "
builddir="$srcdir/$_pkgname-$pkgver"
build() {
@@ -26,4 +28,7 @@ package() {
rm -rf "${pkgdir:?}/usr/bin"
}
-sha512sums="bd60e2adf59b8438ff4f6abf2d41cf18eb60dcef3072577648488db45ffe89bd9c7207c4eccc38eb9256533ea2950e7f20b82ae4940b1207ba71d0f261e83f6d pyroute2-0.5.19.tar.gz"
+sha512sums="
+bd60e2adf59b8438ff4f6abf2d41cf18eb60dcef3072577648488db45ffe89bd9c7207c4eccc38eb9256533ea2950e7f20b82ae4940b1207ba71d0f261e83f6d pyroute2-0.5.19.tar.gz
+1e38436bf3e2670dd8fd47128d739b4c83d4fc087ba3fb75fac0205754a1c7ae8a5c2996cecfccf80111581ea6656ffefa02e053835dd2e33737748532365be8 001-ipset-content.patch
+"
diff --git a/community/rtl8821ce-lts/APKBUILD b/community/rtl8821ce-lts/APKBUILD
index a111e3efc7..c21e408e73 100644
--- a/community/rtl8821ce-lts/APKBUILD
+++ b/community/rtl8821ce-lts/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Kevin Daudt <kdaudt@alpinelinux.org>
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
-_kver=5.10.38
+_kver=5.10.61
_krel=0
_flavor="$FLAVOR"
[ -z "$_flavor" ] && _flavor=lts
diff --git a/community/rtpengine-lts/APKBUILD b/community/rtpengine-lts/APKBUILD
index eecbc51630..f20d9a3b46 100644
--- a/community/rtpengine-lts/APKBUILD
+++ b/community/rtpengine-lts/APKBUILD
@@ -5,7 +5,7 @@ _ver=9.0.1.10
_rel=0
# kernel version
-_kver=5.10.38
+_kver=5.10.61
_krel=0
_kpkgver="$_kver-r$_krel"
diff --git a/community/sngrep/APKBUILD b/community/sngrep/APKBUILD
index ff4fc69491..aa18b60e05 100644
--- a/community/sngrep/APKBUILD
+++ b/community/sngrep/APKBUILD
@@ -1,8 +1,9 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=sngrep
-pkgver=1.4.8
+pkgver=1.4.9
pkgrel=0
+pkgdesc="A tool for displaying SIP call message flows from a terminal"
pkgdesc="display SIP call message flows from a terminal"
url="https://github.com/irontec/sngrep"
arch="all !ppc64le"
@@ -27,6 +28,7 @@ build() {
--with-pcre \
--disable-logo \
--enable-unicode \
+ --enable-eep \
--enable-ipv6
make
}
@@ -39,5 +41,5 @@ package() {
make DESTDIR="$pkgdir/" install
}
-sha512sums="11082b93ab4e31710639663566729fbe6ee87f512bd767889dc43858489d5937bce00f16c6f4541ddaaaebcd29e37c85f1273ce08ce6bddeb33e17bac42a42d3 sngrep-1.4.8.tar.gz
+sha512sums="f25e8c5b1a6feddc2210fc8295f6e2c7ce708ae4bc4903f33b334f210e67c5c58d636e0a3bcaecef6d0c2bdfb9cab7c9ee28a5605d4df5ab1251be0856674c42 sngrep-1.4.9.tar.gz
89ba9d63fedb28bdb7e066f833811cb3155e5f1a73d2aa09595588326783543229a54f54b387df3161b9df37020fae46743d937855647bc974875a9c188dc989 disabled-not-working-tests.patch"
diff --git a/community/stellarium/APKBUILD b/community/stellarium/APKBUILD
index afe3c60767..0444fc07e9 100644
--- a/community/stellarium/APKBUILD
+++ b/community/stellarium/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=stellarium
pkgver=0.20.4
-pkgrel=0
+pkgrel=1
pkgdesc="A stellarium with great graphics and a nice database of sky-objects"
url="http://stellarium.org/"
arch="all !mips !mips64 !armhf" # Limited by qt5-qtmultimedia-dev
diff --git a/community/stunnel/APKBUILD b/community/stunnel/APKBUILD
index bca05d9320..8b8bbb92cc 100644
--- a/community/stunnel/APKBUILD
+++ b/community/stunnel/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=stunnel
-pkgver=5.57
+pkgver=5.60
pkgrel=0
pkgdesc="SSL encryption wrapper between network client and server"
url="https://www.stunnel.org"
@@ -44,6 +44,8 @@ package() {
"$pkgdir"/usr/share/doc/$pkgname/examples/
}
-sha512sums="de5feec6c2c01a6aba2c3b9b9356a8b115ba67c194b6459927870c4a5e37f8a57ac74129f223671586393539d789c868bc8f794331c7e4af058e540123b409e9 stunnel-5.57.tar.gz
+sha512sums="
+4ad0423a7e52c0db8746caf4b64ff69abe1f5c880417779d9933597d7ca86f240b64b578dc3e625fba04bbbddad7aa056dd62d2ecdf6d6a842ffa228bace705e stunnel-5.60.tar.gz
51d56a6c0d961f6de5cd2ef07a1cfdb19fb1b74300da9c340899daa919bd9b2c0bfff472f03746df0dd1aa6098c79035921ca36108ca0b93693377f1ac1c7fb4 stunnel.initd
-a72bfddeb74787d58c9fd24782d86c0498ce3530a43fbdd4ec4c4b57baa6257b6ef21005aca274b22c4a22cdbbbcee63dd3d841f458af248db9c69e8d59fa56f stunnel.conf"
+a72bfddeb74787d58c9fd24782d86c0498ce3530a43fbdd4ec4c4b57baa6257b6ef21005aca274b22c4a22cdbbbcee63dd3d841f458af248db9c69e8d59fa56f stunnel.conf
+"
diff --git a/community/swaylock/APKBUILD b/community/swaylock/APKBUILD
index 8a833f2ee1..7b12f9ffe5 100644
--- a/community/swaylock/APKBUILD
+++ b/community/swaylock/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=swaylock
pkgver=1.5
-pkgrel=4
+pkgrel=5
pkgdesc="Screen locker for Wayland"
url="https://swaywm.org"
arch="all"
@@ -24,7 +24,12 @@ subpackages="
$pkgname-fish-completion
$pkgname-zsh-completion
"
-source="$pkgname-$pkgver.tar.gz::https://github.com/swaywm/swaylock/archive/$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/swaywm/swaylock/archive/$pkgver.tar.gz
+ $pkgname-call-fclose-vice-free.patch::https://github.com/swaywm/swaylock/commit/366db56553ee02334871756ab19c72d2171ad364.patch
+ $pkgname-fix-potential-use-after-free.patch::https://github.com/swaywm/swaylock/commit/235b925df7e1bb82d98f1ac8c02e8f85d0a54ee9.patch
+ ungit-version.patch
+ fix-version.patch
+ "
prepare() {
default_prepare
@@ -57,4 +62,10 @@ package() {
mv "$pkgdir"/usr/share/fish/vendor_completions.d "$pkgdir"/usr/share/fish/completions
}
-sha512sums="16dd9b912ca702849290cf18d91ffbd64a70118cc284982a84b567c4974fd4590b12707c0aae1fcda7ccd1caa7880f342c633b9345bd795c36702916696d1f67 swaylock-1.5.tar.gz"
+sha512sums="
+16dd9b912ca702849290cf18d91ffbd64a70118cc284982a84b567c4974fd4590b12707c0aae1fcda7ccd1caa7880f342c633b9345bd795c36702916696d1f67 swaylock-1.5.tar.gz
+c306fa82587a82e698ddc5046ad74e95acff1064b488ec6cd3449a16ca0c879fdf990d940cdbb6ab48cedad3bb28a9a9cf34d75733ed66fe07f2c03eb4e2e0c6 swaylock-call-fclose-vice-free.patch
+fdf99132c12af93c9545344b5b892ba7b1491cd021d565aeb4b02a13f01433c71abd5df442e193497f8fd4c3a2aa97e6e2fed9feb265367d5aed68b1746585fa swaylock-fix-potential-use-after-free.patch
+9919bb17e2cf2c8dc4fbac3ba91434f775574caca345026bd8f56e6e9caeff85fa5ad86a9485b103da9be7e393734c37c20c32141cd42cc7f479273ca2147f6b ungit-version.patch
+3e9316339d6a255662ed7b59e8405885e25bddf95f064f8a0042baaec661affe6588c59cd6d0e0ab44a06bc322b910c61aed86c13189874b98cc978ec446993f fix-version.patch
+"
diff --git a/community/swaylock/fix-version.patch b/community/swaylock/fix-version.patch
new file mode 100644
index 0000000000..a9f6a448c6
--- /dev/null
+++ b/community/swaylock/fix-version.patch
@@ -0,0 +1,11 @@
+--- a/meson.build
++++ b/meson.build
+@@ -1,7 +1,7 @@
+ project(
+ 'swaylock',
+ 'c',
+- version: '1.4',
++ version: '1.5',
+ license: 'MIT',
+ meson_version: '>=0.48.0',
+ default_options: [
diff --git a/community/swaylock/ungit-version.patch b/community/swaylock/ungit-version.patch
new file mode 100644
index 0000000000..fe542d8be5
--- /dev/null
+++ b/community/swaylock/ungit-version.patch
@@ -0,0 +1,21 @@
+--- a/meson.build
++++ b/meson.build
+@@ -46,18 +46,10 @@
+ crypt = cc.find_library('crypt', required: not libpam.found())
+ math = cc.find_library('m')
+
+-git = find_program('git', required: false)
+ scdoc = find_program('scdoc', required: get_option('man-pages'))
+ wayland_scanner = find_program('wayland-scanner')
+
+ version = '"@0@"'.format(meson.project_version())
+-if git.found()
+- git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags'])
+- git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD'])
+- if git_commit_hash.returncode() == 0 and git_branch.returncode() == 0
+- version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash.stdout().strip(), git_branch.stdout().strip())
+- endif
+-endif
+ add_project_arguments('-DSWAYLOCK_VERSION=@0@'.format(version), language: 'c')
+
+ wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
diff --git a/community/tinc-pre/APKBUILD b/community/tinc-pre/APKBUILD
index dfe9cc04a7..19534490f4 100644
--- a/community/tinc-pre/APKBUILD
+++ b/community/tinc-pre/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
-# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: wener <wenermail@gmail.com>
pkgname=tinc-pre
-_distver="1.1pre17"
+_distver="1.1pre18"
pkgver=${_distver/pre/.}
-pkgrel=3
+pkgrel=0
pkgdesc="Virtual Private Network (VPN) daemon (pre-release)"
url="https://tinc-vpn.org/"
# s390x: tests hang
@@ -14,10 +14,8 @@ makedepends="linux-headers ncurses-dev readline-dev
zlib-dev lzo-dev openssl-dev texinfo
automake autoconf libtool bash"
subpackages="$pkgname-doc"
-# TODO remove prevent-large-amounts-of-UDP-probes.patch on next release
-source="http://tinc-vpn.org/packages/tinc-$_distver.tar.gz
+source="https://tinc-vpn.org/packages/tinc-$_distver.tar.gz
tinc-1.1-fix-paths.patch
- prevent-large-amounts-of-UDP-probes.patch
$pkgname.initd
$pkgname.confd
$pkgname.networks
@@ -65,9 +63,10 @@ package() {
"$pkgdir"/etc/conf.d/tinc.networks
}
-sha512sums="b966dbfa522e12ff6766c4deb54a9da29cddc15c3a1df0f0e084df27ee5f1421ffbebc0e29472b1bcd79ea8b41f8c0ef904172e333dcba0b85bafe4654a63b30 tinc-1.1pre17.tar.gz
+sha512sums="
+d8b03c78fd579df58d4c8a03f5d2241d2c95edb660ce9aa34441f6e75df09e3fff7524215c7c4b3622311e80f5bb452a6ac1205f3fd13424d56135f70b973183 tinc-1.1pre18.tar.gz
bb6f9a1fedf6ffab21f6bfa65c8d977b24453a5d667229eec995b979bbe8dcdaa0617f076a3d9081c4580068b385f7595b80856d5abcf9c928b866eb9c6f4910 tinc-1.1-fix-paths.patch
-ce2ff7c57798bfb85f6b382552e31cd1f79ddcc3a1ecc6b823b51103a480d7ccf43475d0e4511b0aa48f4f1515d0e544a1af65a170caf3b6aacc084b391a4855 prevent-large-amounts-of-UDP-probes.patch
59811c3e5241d08ebdfbd539556b7cee0dfaab89727ad503512c98f1a696fae143ecdf2682a652c5d71d077ed254ffe2e1c442b1c305c7e7ea94d9af9a1d385e tinc-pre.initd
f8d9354af5ebc07420ced98059262751bffef434b61c6333964338f327e2ac01ae676e375954efa794a1bccf8b939c78387b9fb7261f675f1237b0d946b529c9 tinc-pre.confd
-f7cb459c170898e51176bd92c642335386db90b7bca2abb3f6eb2514546efbd74e5fd2c8845060111dd48a0dd2cc1890717a03315c9b86185047c259cdc27135 tinc-pre.networks"
+f7cb459c170898e51176bd92c642335386db90b7bca2abb3f6eb2514546efbd74e5fd2c8845060111dd48a0dd2cc1890717a03315c9b86185047c259cdc27135 tinc-pre.networks
+"
diff --git a/community/tinc-pre/prevent-large-amounts-of-UDP-probes.patch b/community/tinc-pre/prevent-large-amounts-of-UDP-probes.patch
deleted file mode 100644
index 6701b2a919..0000000000
--- a/community/tinc-pre/prevent-large-amounts-of-UDP-probes.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Upstream: Yes, merged
-Reason: Prevent large amounts of UDP probes being sent consecutively
-Url: http://git.tinc-vpn.org/git/browse?p=tinc;a=commit;h=2b0aeec02d64bb4724da9ff1dbc19b7d35d7c904
-
-From 017a7fb57655d9b1d706ee78f7e3d0000411b883 Mon Sep 17 00:00:00 2001
-From: Guus Sliepen <guus@tinc-vpn.org>
-Date: Tue, 18 Dec 2018 17:44:08 +0100
-Subject: [PATCH] Prevent large amounts of UDP probes being sent consecutively.
-
-We cannot reset udp_ping_sent to zero when we receive a valid reply to
-an UDP probe, because that would cause a new one to be sent immediately
-in try_udp(). Instead, add a bit to node_status_t to keep track of whether we
-have a UDP probe that's waiting for a reply.
-
-Thanks to Ronny Nilsson for spotting the source of the problem.
----
- src/net_packet.c | 7 ++++---
- src/node.h | 3 ++-
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/net_packet.c b/src/net_packet.c
-index 5a856429..31c66d32 100644
---- a/src/net_packet.c
-+++ b/src/net_packet.c
-@@ -152,11 +152,12 @@ static void udp_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
- len = ntohs(len16);
- }
-
-- if(n->udp_ping_sent.tv_sec != 0) { // a probe in flight
-+ if(n->status.ping_sent) { // a probe in flight
- gettimeofday(&now, NULL);
- struct timeval rtt;
- timersub(&now, &n->udp_ping_sent, &rtt);
- n->udp_ping_rtt = rtt.tv_sec * 1000000 + rtt.tv_usec;
-+ n->status.ping_sent = false;
- logger(DEBUG_TRAFFIC, LOG_INFO, "Got type %d UDP probe reply %d from %s (%s) rtt=%d.%03d", DATA(packet)[0], len, n->name, n->hostname, n->udp_ping_rtt / 1000, n->udp_ping_rtt % 1000);
- } else {
- logger(DEBUG_TRAFFIC, LOG_INFO, "Got type %d UDP probe reply %d from %s (%s)", DATA(packet)[0], len, n->name, n->hostname);
-@@ -175,8 +176,7 @@ static void udp_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
- reset_address_cache(n->address_cache, &n->address);
- }
-
-- // Reset the UDP ping timer. (no probe in flight)
-- n->udp_ping_sent.tv_sec = 0;
-+ // Reset the UDP ping timer.
-
- if(udp_discovery) {
- timeout_del(&n->udp_ping_timeout);
-@@ -1132,6 +1132,7 @@ static void try_udp(node_t *n) {
- if(ping_tx_elapsed.tv_sec >= interval) {
- gettimeofday(&now, NULL);
- n->udp_ping_sent = now; // a probe in flight
-+ n->status.ping_sent = true;
- send_udp_probe_packet(n, MIN_PROBE_SIZE);
-
- if(localdiscovery && !n->status.udp_confirmed && n->prevedge) {
-diff --git a/src/node.h b/src/node.h
-index 3daffd4a..1b33789e 100644
---- a/src/node.h
-+++ b/src/node.h
-@@ -41,7 +41,8 @@ typedef struct node_status_t {
- unsigned int udppacket: 1; /* 1 if the most recently received packet was UDP */
- unsigned int validkey_in: 1; /* 1 if we have sent a valid key to him */
- unsigned int has_address: 1; /* 1 if we know an external address for this node */
-- unsigned int unused: 20;
-+ unsigned int ping_sent: 1; /* 1 if we sent a UDP probe but haven't received the reply yet */
-+ unsigned int unused: 19;
- } node_status_t;
-
- typedef struct node_t {
diff --git a/community/wofi/APKBUILD b/community/wofi/APKBUILD
index 7ec44fdf28..87316a0446 100644
--- a/community/wofi/APKBUILD
+++ b/community/wofi/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Galen Abell <galen@galenabell.com>
# Maintainer: Galen Abell <galen@galenabell.com>
pkgname=wofi
-pkgver=1.2.3
+pkgver=1.2.4
pkgrel=0
pkgdesc="A launcher/menu program for wlroots based wayland compositors."
url="https://hg.sr.ht/~scoopta/wofi"
@@ -9,7 +9,7 @@ arch="all"
license="GPL-3.0-only"
makedepends="wayland-dev gtk+3.0-dev meson"
options="!check" # no tests
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-dev"
source="$pkgname-v$pkgver.tar.gz::https://hg.sr.ht/~scoopta/wofi/archive/v$pkgver.tar.gz"
builddir="$srcdir/$pkgname-v$pkgver"
@@ -21,4 +21,5 @@ build() {
package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C build
}
-sha512sums="613df12ff3da401d8ca661937cb7a8403ef23ceec328cf45e91b9da8ff6e64f4f669e7052b71c30f4560c975937c18d8912ee55a60bd32ace7498357ab0a8d5a wofi-v1.2.3.tar.gz"
+
+sha512sums="6ae4b05a8521b8953f2603fe22876ecc55744a10ff510f5275c74a00ebe8ce04694a87b92534b1022a00c935c44d3603a415fca7eb46e28a7319be6e8a561698 wofi-v1.2.4.tar.gz"