* Re: [PR PATCH] [Updated] k9s: update to 0.24.7
2021-04-27 9:28 [PR PATCH] k9s: update to 0.24.7 bvdeenen
2021-04-27 19:36 ` [PR PATCH] [Updated] " bvdeenen
@ 2021-04-27 19:40 ` bvdeenen
2021-04-27 19:44 ` bvdeenen
2021-04-27 19:44 ` [PR PATCH] [Closed]: " bvdeenen
3 siblings, 0 replies; 5+ messages in thread
From: bvdeenen @ 2021-04-27 19:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1591 bytes --]
There is an updated pull request by bvdeenen against master on the void-packages repository
https://github.com/bvdeenen/void-packages master
https://github.com/void-linux/void-packages/pull/30542
k9s: update to 0.24.7
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [X ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/30542.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-30542.patch --]
[-- Type: text/x-diff, Size: 70257 bytes --]
From 7a0e6565b5266715aa9ac772aaa1e1282471a428 Mon Sep 17 00:00:00 2001
From: Bart van Deenen <bartvandeenen@streammachine.io>
Date: Tue, 27 Apr 2021 11:01:52 +0200
Subject: [PATCH 01/36] k9s: update to 0.24.7
---
srcpkgs/k9s/patches/go.mod.patch | 11 +++++++++++
srcpkgs/k9s/patches/go.sum.patch | 11 +++++++++++
srcpkgs/k9s/template | 4 ++--
3 files changed, 24 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/k9s/patches/go.mod.patch
create mode 100644 srcpkgs/k9s/patches/go.sum.patch
diff --git a/srcpkgs/k9s/patches/go.mod.patch b/srcpkgs/k9s/patches/go.mod.patch
new file mode 100644
index 000000000000..c3a7137d1b18
--- /dev/null
+++ b/srcpkgs/k9s/patches/go.mod.patch
@@ -0,0 +1,11 @@
+--- go.mod.org 2021-04-27 10:51:23.602448450 +0200
++++ go.mod 2021-04-27 10:51:33.685466458 +0200
+@@ -2,8 +2,6 @@
+
+ go 1.16
+
+-replace github.com/derailed/tview => ../tview
+-
+ replace (
+ github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
+ github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
diff --git a/srcpkgs/k9s/patches/go.sum.patch b/srcpkgs/k9s/patches/go.sum.patch
new file mode 100644
index 000000000000..89288e248eb4
--- /dev/null
+++ b/srcpkgs/k9s/patches/go.sum.patch
@@ -0,0 +1,11 @@
+--- go.sum.org 2021-04-27 10:55:02.442782948 +0200
++++ go.sum 2021-04-27 10:55:27.707814111 +0200
+@@ -191,6 +191,8 @@
+ github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
+ github.com/derailed/popeye v0.9.0 h1:0zP4BAzo94RUjrUkzgF962v0zL9B3xyopd7kU7tMxuc=
+ github.com/derailed/popeye v0.9.0/go.mod h1:g3hudQlbEEChCA7U44fA+utTM9xQpD4pINUMQaiq5Gs=
++github.com/derailed/tview v0.5.3 h1:rzUz7sDoWJQjrx1u8YSbfQNmva+z2bnQqzoR6CZruo8=
++github.com/derailed/tview v0.5.3/go.mod h1:Cd1rHezeTZDlze2WsQMuGFwiooP1bO0RttWj7XtZbFM=
+ github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 6ceec1f3e0ad..de0e7a9b08f4 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
# Template file for 'k9s'
pkgname=k9s
-version=0.24.6
+version=0.24.7
revision=1
build_style=go
go_import_path="github.com/derailed/k9s"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="https://k9scli.io/"
distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=72cce161786273f203421e93d8b22bfa7659fecdf2d0f018a5dc113302ba3958
+checksum=a205852c7e0f0a04824514c7a3332dc1a99ad8c701f966cf59dd4419e5857609
From 32830a8bb500995e7350edeb2057ea316f73fba6 Mon Sep 17 00:00:00 2001
From: Bart van Deenen <bartvandeenen@streammachine.io>
Date: Tue, 27 Apr 2021 21:28:07 +0200
Subject: [PATCH 02/36] combined patch
---
srcpkgs/k9s/patches/go.mod.patch | 11 -----------
srcpkgs/k9s/patches/go.sum.patch | 11 -----------
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/k9s/patches/go.mod.patch
delete mode 100644 srcpkgs/k9s/patches/go.sum.patch
diff --git a/srcpkgs/k9s/patches/go.mod.patch b/srcpkgs/k9s/patches/go.mod.patch
deleted file mode 100644
index c3a7137d1b18..000000000000
--- a/srcpkgs/k9s/patches/go.mod.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- go.mod.org 2021-04-27 10:51:23.602448450 +0200
-+++ go.mod 2021-04-27 10:51:33.685466458 +0200
-@@ -2,8 +2,6 @@
-
- go 1.16
-
--replace github.com/derailed/tview => ../tview
--
- replace (
- github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
- github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
diff --git a/srcpkgs/k9s/patches/go.sum.patch b/srcpkgs/k9s/patches/go.sum.patch
deleted file mode 100644
index 89288e248eb4..000000000000
--- a/srcpkgs/k9s/patches/go.sum.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- go.sum.org 2021-04-27 10:55:02.442782948 +0200
-+++ go.sum 2021-04-27 10:55:27.707814111 +0200
-@@ -191,6 +191,8 @@
- github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
- github.com/derailed/popeye v0.9.0 h1:0zP4BAzo94RUjrUkzgF962v0zL9B3xyopd7kU7tMxuc=
- github.com/derailed/popeye v0.9.0/go.mod h1:g3hudQlbEEChCA7U44fA+utTM9xQpD4pINUMQaiq5Gs=
-+github.com/derailed/tview v0.5.3 h1:rzUz7sDoWJQjrx1u8YSbfQNmva+z2bnQqzoR6CZruo8=
-+github.com/derailed/tview v0.5.3/go.mod h1:Cd1rHezeTZDlze2WsQMuGFwiooP1bO0RttWj7XtZbFM=
- github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
- github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
- github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
From f96e583e5c4dda7aa28ec9e2a19abbde670a15ee Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 26 Apr 2021 10:45:39 +0200
Subject: [PATCH 03/36] janet: update to 1.15.5.
---
srcpkgs/janet/patches/dynlink.patch | 4 ++--
srcpkgs/janet/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/janet/patches/dynlink.patch b/srcpkgs/janet/patches/dynlink.patch
index 4518660e0e1b..81397b105b4b 100644
--- a/srcpkgs/janet/patches/dynlink.patch
+++ b/srcpkgs/janet/patches/dynlink.patch
@@ -1,13 +1,13 @@
--- meson.build.orig
+++ meson.build
-@@ -184,10 +184,11 @@
+@@ -192,10 +192,11 @@
else
extra_cflags = []
endif
-janet_mainclient = executable('janet', janetc, mainclient_src,
+janet_mainclient = executable('janet', mainclient_src,
include_directories : incdir,
- dependencies : [m_dep, dl_dep, thread_dep],
+ dependencies : janet_dependencies,
c_args : extra_cflags,
+ link_with : [libjanet],
install : true)
diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 4cd9ddacf2e2..56ff6277f68b 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
# Template file for 'janet'
pkgname=janet
-version=1.15.4
+version=1.15.5
revision=1
build_style=meson
configure_args="-Db_lto=false" # breaks jpm
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://janet-lang.org/"
distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=8eed302c8ded1df882544d13ce7e415b213cf7bc8fa77ca16110c89b36d19763
+checksum=7f90dbad2d7049847034182240d61b491411544ed82b110c5778dabd9eea84ca
post_install() {
vlicense LICENSE
From 0fd1bb9f5bdadbc05e6ec029c3173fdad5a30d81 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 27 Apr 2021 11:36:27 +0200
Subject: [PATCH 04/36] ugrep: update to 3.1.12.
---
srcpkgs/ugrep/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 567a712401c4..7f1c9e0ba389 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
# Template file for 'ugrep'
pkgname=ugrep
-version=3.1.11
+version=3.1.12
revision=1
build_style=gnu-configure
configure_args="--disable-avx"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://github.com/Genivia/ugrep"
distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=43542115612f066ae22610da1510356955b142135bb23e97ed4266be28ec3e13
+checksum=f783b8bcc628f792ba418f073b38f089a14d709cbd0438ee27a0cc437e0543ac
post_install() {
vlicense LICENSE.txt LICENSE
From ab710e8eb542d75e5e2fdb866d45b7ced115c72e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 27 Apr 2021 11:38:40 +0200
Subject: [PATCH 05/36] debootstrap: update to 1.0.124.
---
srcpkgs/debootstrap/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template
index f1be3ccca072..0c2813d9b0ce 100644
--- a/srcpkgs/debootstrap/template
+++ b/srcpkgs/debootstrap/template
@@ -1,16 +1,16 @@
# Template file for 'debootstrap'
pkgname=debootstrap
-version=1.0.123
-revision=2
+version=1.0.124
+revision=1
build_style=fetch
-depends="binutils gnupg gzip tar wget xz"
+depends="binutils gnupg gzip tar wget xz zstd"
short_desc="Bootstrap a basic Debian system"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="http://packages.qa.debian.org/d/debootstrap.html"
distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb
${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2019.1_all.deb"
-checksum="0ab37218fa9719517fccee68b552545f17a5336bbf5801c6d565213ca1aa014e
+checksum="df202f7e485be563270e803d25072d0c027d9ba3f624d1dd370dcaeaaa493210
9cefd8917f3d97a999c136aa87f04a3024408b5bc1de470de7d6dfa5e4bd4361"
case "$XBPS_TARGET_MACHINE" in
From bc2456571b90c1ba95c272b8f28a61937e2c53b4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 27 Apr 2021 11:40:01 +0200
Subject: [PATCH 06/36] tcsh: update to 6.22.04.
---
srcpkgs/tcsh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tcsh/template b/srcpkgs/tcsh/template
index ba88789c6328..6a54f6f55c5c 100644
--- a/srcpkgs/tcsh/template
+++ b/srcpkgs/tcsh/template
@@ -1,6 +1,6 @@
# Template file for 'tcsh'
pkgname=tcsh
-version=6.22.03
+version=6.22.04
revision=1
build_style=gnu-configure
conf_files="/etc/csh.login /etc/csh.cshrc"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="http://www.tcsh.org/"
distfiles="http://ftp.astron.com/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=be2cfd653d2a0c7f506d2dd14c12324ba749bd484037be6df44a3973f52262b7
+checksum=eb16356243218c32f39e07258d72bf8b21e62ce94bb0e8a95e318b151397e231
register_shell="/bin/tcsh /bin/csh"
CFLAGS="-fcommon"
From 9685e0b1099713c81bea56259a7b790e64d1f4e2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 27 Apr 2021 11:44:19 +0200
Subject: [PATCH 07/36] tcsh: update to 6.22.04.
---
srcpkgs/tcsh/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/tcsh/template b/srcpkgs/tcsh/template
index 6a54f6f55c5c..a107625c7992 100644
--- a/srcpkgs/tcsh/template
+++ b/srcpkgs/tcsh/template
@@ -13,8 +13,6 @@ distfiles="http://ftp.astron.com/pub/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=eb16356243218c32f39e07258d72bf8b21e62ce94bb0e8a95e318b151397e231
register_shell="/bin/tcsh /bin/csh"
-CFLAGS="-fcommon"
-
post_extract() {
sed -i '/define BSDWAIT/d' sh.proc.c
}
From cc3bda3053bd5c66c15ebedfa1dd6ae509f329a5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 27 Apr 2021 11:46:05 +0200
Subject: [PATCH 08/36] at: update to 3.2.2.
---
srcpkgs/at/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/at/template b/srcpkgs/at/template
index 172ab638ee48..772c4582b3e7 100644
--- a/srcpkgs/at/template
+++ b/srcpkgs/at/template
@@ -1,7 +1,7 @@
# Template file for 'at'
pkgname=at
-version=3.1.23
-revision=2
+version=3.2.2
+revision=1
build_style=gnu-configure
configure_args="--with-jobdir=/var/spool/atd --with-atspool=/var/spool/atd
--sbindir=/usr/bin --with-daemon_username=at --with-daemon_groupname=at
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="http://packages.qa.debian.org/a/at.html"
distfiles="${DEBIAN_SITE}/main/a/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-checksum=97450aa954aaa8a70218cc8e61a33df9fee9f86527e9f861de302fb7a3c81710
+checksum=2211da14914fde1f9cc83592838fb6385a32fb11fcecb7816c77700df6559088
disable_parallel_build=yes
conf_files="/etc/at.deny"
From 32ded29705cc441aba24630fbb97df0aa9937bab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 27 Apr 2021 09:09:15 -0300
Subject: [PATCH 09/36] libgpg-error: update to 1.42.
Remove gen-lock-obj.sh workaround added in
e79f72db82769fef0830b0c34803a7685be1d268 (should have been removed at
the first update after that).
Use rm -r in post_install.
---
srcpkgs/libgpg-error/patches/cross.patch | 20 +++++++++++++
srcpkgs/libgpg-error/patches/echo-fix.patch | 32 +++++++++++++++++++++
srcpkgs/libgpg-error/template | 17 ++++-------
3 files changed, 57 insertions(+), 12 deletions(-)
create mode 100644 srcpkgs/libgpg-error/patches/cross.patch
create mode 100644 srcpkgs/libgpg-error/patches/echo-fix.patch
diff --git a/srcpkgs/libgpg-error/patches/cross.patch b/srcpkgs/libgpg-error/patches/cross.patch
new file mode 100644
index 000000000000..253fc50f6614
--- /dev/null
+++ b/srcpkgs/libgpg-error/patches/cross.patch
@@ -0,0 +1,20 @@
+Upstream commit 1fb90a7da186ee2ee098a666f6f3a35bb1720e59 added a
+--disable-threads config option and changed the case to only match linux-gnu*
+instead of linux*, because those are obviously very related changes.
+
+This patch reverts that part of the commit, and fixes cross building to musl
+archs for us.
+
+diff --git a/configure b/configure
+index 24b1cee..89a9937 100755
+--- a/configure
++++ b/configure
+@@ -17433,7 +17433,7 @@ if test x"$gl_use_threads" = xno; then
+ $as_echo "$as_me: generated src/lock-obj-pub.native.h for $host" >&6;}
+ elif test x$cross_compiling = xyes; then
+ case $host in
+- *-*-linux-gnu*)
++ *-*-linux*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}objdump; ac_word=$2
diff --git a/srcpkgs/libgpg-error/patches/echo-fix.patch b/srcpkgs/libgpg-error/patches/echo-fix.patch
new file mode 100644
index 000000000000..78d98dd7b3d1
--- /dev/null
+++ b/srcpkgs/libgpg-error/patches/echo-fix.patch
@@ -0,0 +1,32 @@
+From 33593864cd54143db594c4237bba41e14179061c Mon Sep 17 00:00:00 2001
+From: David Michael <fedora.dm0@gmail.com>
+Date: Fri, 26 Mar 2021 16:06:50 +0900
+Subject: [PATCH] build: Fix generation of lock-obj-pub.native.h for cross
+ build.
+
+* src/gen-lock-obj.sh: Capture echo output with quotes.
+
+--
+
+Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374
+Signed-off-by: David Michael <fedora.dm0@gmail.com>
+---
+ src/gen-lock-obj.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh
+index a710f0c..258eec6 100755
+--- a/src/gen-lock-obj.sh
++++ b/src/gen-lock-obj.sh
+@@ -38,7 +38,7 @@
+ # AWK=gawk ./gen-lock-obj.sh
+ #
+
+-if test -n `echo -n`; then
++if test -n "`echo -n`"; then
+ ECHO_C='\c'
+ ECHO_N=''
+ else
+--
+2.11.0
+
diff --git a/srcpkgs/libgpg-error/template b/srcpkgs/libgpg-error/template
index dbccf9aecf65..309860f3f5a7 100644
--- a/srcpkgs/libgpg-error/template
+++ b/srcpkgs/libgpg-error/template
@@ -1,29 +1,22 @@
# Template file for 'libgpg-error'
pkgname=libgpg-error
-version=1.41
+version=1.42
revision=1
build_style=gnu-configure
short_desc="Library for error values used by GnuPG component"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://www.gnupg.org"
-distfiles="https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2
- https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob_plain;f=src/gen-lock-obj.sh;h=13858cfbf6c5f69f5f5fd64cd6fcc6a6c80eca3b>gen-lock-obj.sh"
-checksum="64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742
- 83892a9ebe3e19e8fd754a7ad02b6c81240e64554aab6490a4ea5aa36ea49a81"
-skip_extraction="gen-lock-obj.sh"
+distfiles="https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23
+patch_args=-Np1
if [ "$CROSS_BUILD" ]; then
hostmakedepends="qemu-user-static"
fi
-pre_configure() {
- cp -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/gen-lock-obj.sh ${wrksrc}/src
- chmod +x ${wrksrc}/src/gen-lock-obj.sh
-}
-
post_install() {
- rm -rf ${DESTDIR}/usr/share/common-lisp
+ rm -r ${DESTDIR}/usr/share/common-lisp
}
libgpg-error-devel_package() {
From 8f95689a107e9d0213665a87060cf25b4806cac4 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 27 Apr 2021 09:39:04 +0200
Subject: [PATCH 10/36] youtube-dl: update to 2021.04.26.
---
srcpkgs/youtube-dl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index e98055f1c8af..90f696378b97 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,6 +1,6 @@
# Template file for 'youtube-dl'
pkgname=youtube-dl
-version=2021.04.17
+version=2021.04.26
revision=1
wrksrc="${pkgname}"
build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
homepage="https://yt-dl.org"
changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog"
distfiles="${homepage}/downloads/${version}/${pkgname}-${version}.tar.gz"
-checksum=75eff59a6a81708e1bf075f1a46cea4058694c286f154a35ee7d6dd760da0e42
+checksum=4ccf21f4a0daee0d58bef569c71dd459bd1f629248995b4e4856b6926531ea4a
do_check() {
PYTHON=/usr/bin/python3 make offlinetest
From 41b92e06b292233412f3d89cf658e24e281f4bc3 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 27 Apr 2021 09:45:02 +0200
Subject: [PATCH 11/36] hdparm: update to 9.61.
Closes: #30541 [via git-merge-pr]
---
srcpkgs/hdparm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hdparm/template b/srcpkgs/hdparm/template
index 7b4ae3c99857..f742d1e42891 100644
--- a/srcpkgs/hdparm/template
+++ b/srcpkgs/hdparm/template
@@ -1,6 +1,6 @@
# Template file for 'hdparm'
pkgname=hdparm
-version=9.60
+version=9.61
revision=1
build_style=gnu-makefile
make_install_args="exec_prefix=/usr sbindir=/usr/bin"
@@ -9,7 +9,7 @@ maintainer="teldra <teldra@rotce.de>"
license="0BSD" # Upstream is very unclear and names their stuff 'bsd-style'
homepage="https://sourceforge.net/projects/hdparm/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=8397739c73e44d5ab96c4aef28fa9c0147276d53a1b5657ce04c4565cf6635cc
+checksum=da1a1c3887f10b8397e8e02013caa61142e0e72cb0d73997421ca2f2f4df5343
post_install() {
vlicense LICENSE.TXT
From 6c1aedc39f62988010a6c9b498d0d83d1b0227b5 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sun, 25 Apr 2021 07:24:04 +0000
Subject: [PATCH 12/36] firefox-esr: update to 78.10.0
[ci skip]
---
srcpkgs/firefox-esr/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 61f36d2058e8..fbd9ed2fb8ec 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
#
pkgname=firefox-esr
-version=78.8.0
+version=78.10.0
revision=1
wrksrc="firefox-${version}"
build_helper="rust qemu"
@@ -22,13 +22,17 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.mozilla.org/firefox/organizations/"
distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=1cf2dfdee2e31fd0a5ecced6275a33fa11bee1d2a7c65e23350b26992584a110
+checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
lib32disabled=yes
conflicts="firefox>=0"
build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland"
build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland"
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
+
case $XBPS_TARGET_MACHINE in
armv[56]*) broken="required NEON extensions are not supported on armv[56]" ;;
ppc64*) ;;
@@ -37,10 +41,6 @@ esac
CXXFLAGS="-Wno-class-memaccess -Wno-unused-function"
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
-fi
-
# We need this because cargo verifies checksums of all files
# in vendor crates when it builds and gives us no way to
# override or update the file sanely... so just clear out the file list
From f8daf67d292eaf4bb3c6a792249df14317d8c751 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sun, 25 Apr 2021 07:24:54 +0000
Subject: [PATCH 13/36] firefox-esr-i18n: update to 78.10.0
---
srcpkgs/firefox-esr-i18n/template | 188 +++++++++++++++---------------
1 file changed, 94 insertions(+), 94 deletions(-)
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index 5d62a9f8a99a..db026b7334d4 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
# Template file for 'firefox-esr-i18n'
pkgname=firefox-esr-i18n
-version=78.8.0
+version=78.10.0
revision=1
build_style=meta
short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
}
}
-checksum="7f0782919012140a2eb30fe22b011b2a9c43248ea1037a8bae85c18e68e4285e
- 25387a38fc9fb8aded62119033b98b72f8c8229e90dfb7403352d578cc6528cc
- ab375580808e6f4599f4c2c0643885c33f5863eacfb966c05984165c4c5a7ad1
- abd9a55274de8aedab52164dbb61275971f81e454dae9e6f63c5b3545da91c3b
- e3e2758c38736c05855ea61dc9b54d3ea4830cce5441cb5121022c7996ec1759
- e7efd2e42c4c8f858e85b0342e1179d0e7e3f2e3c8fc815a9fd37b25030a4869
- 64579e748d87dc1eb63fea3bb00408759d48ba3226e66afcbf48c554fe32dc0e
- ab898e74b67d0e3dd39a516b7ee642050847b03512b59461a7dd7077e8719e59
- b3355aeb801c41ac1a4dd70f1c26ef440ef5e7f85b1c52ef1517d99544f5e614
- 7ce0eba825fa22519c2ec15db24321cdd795c2f086d5c35861e1c36693cf15a7
- 6645dce4ba62d3e4fb387f572dd56c9c794148d9f08aeae3600e2f69073bc6ee
- d4cd2b9edd691962f6e579ea59525d8756a2bcbaa08f180efd9725b82377c8bc
- 061d0023fcb04bd93fcfa72c8d4b43614bb2037eb6feccaa7ef889ceff2598c5
- 360dcd18c92376fe36261ec8fd338fc2c1d2142e3f2851d26d2f6c66a28438a7
- e1774876227de045ef25d5618a22be81c2990259726ae1ebdaa07667de5b73a0
- def26117eef49e2cdc340527d8e6712803b0da5d729574ffa82789cc1de94a8d
- a50344da84226cc163d72e9c50e8dde9d1f73598b9a0dd3107dc0bda5728de70
- 2b52d1d1809bfd704e130fccf229b9e01d14cb012de14ad84508ae516be6f0db
- 5894674b57a0095e4d0173f5ad7a7f34f69a89f8bcbae74ce304ed38613231fa
- 092f137b5155b599f2dbd1c2dd3c69877222f43628633ae9ff6b684b970bbea8
- 72038ab140d7e89ff17f2b498dd8ae3c872b3dc846038c4d68ac742d6b5a4229
- 6cf32136e9d634fa5bbc4f5f7dedc0b20ad7f3138e9952b5a28a98f46c8b6d02
- 37230145ed4d4c60798f4c1562bef24645af563b387f7df27684b4aa946c35e7
- 5d7c57b5a1a361deb43eb7990adb7a3f40e5dd65799e814a99707b4556e7c353
- 1613ce3a8fc3696a2cb55eb179ee563236388755065ee102c238b88c6b523983
- 4c27a15f06f72aed3e95f32eaee8eacfa9bebca54ee7bf9615dbd4725101bbdd
- e1c659fcbc02435e5f4e99c5d0b0efc94809b26010ae448165246b8f6fc8eb56
- a3f23e82e18cf9fed95e56feea74ab39d46fae2c9cac5208ea24fae2b098600a
- e7f9aa97ddc952f61cfcfc5e85400fce57a3a4ce58d883d1412c84bd351450b6
- 1fdc53d91df16e7ccd82aeb94ca75620e74160b86db89288067d7e3557ebd476
- 6b5820aeaba3307743adc13df898f6136e349f085d50d69aa4542a35ef8a4956
- 8a1314cbd61b1ddcc0a1b048c9cf6a73a17bc44c7103cdc3f3befe5c3ab8c5d2
- a672cd6fe8e193441a9df8ce900727c41a92ccec0b402b18539c5fb0fbd316d4
- b6aeb12ae4ea45bd344fd1763f15a3ce5e6a69fe3f0a5644ebcfc35b246ba544
- a57253a35ad63f78c4e4a53477b52a3c59feee1003c8e7376ae03a6a5ec7035d
- 9e64eaa8fe170ae8ada477cf9f68aca9e3a0c1a45cbb8ac05f27fcb21b86abc5
- 69d8297a877a44836bff65af73218152b7bf0ed796996b020d1101af54b0d8bd
- 93422ec57211be52fb9d967beefc8e56aa1de24b80a3ae7ce8e331a6fcec2e74
- 8eaddc78b47e54e52b4d86c7329f6ab923909a8202694c32bf069a1899d4dc55
- 25d33eb6d9a6c401ac9bf608a8151fa408a654cd737aab07273a132db3b60be7
- 8e6e17c9760a93d53342bc3d6257ac30f11477e3f8b9a9f752f8d9adf26550dd
- 73e51cc2f87b13efb074d98e5c8148952e5379562a7e73ad9cb36ca374b1a6b8
- 17c5d45278fba93625fd9d00eccbfd3c739923a30873050ffda8f2ae12df6a86
- c4df8dd56ebca61488ecf55fb893f5cbfa2600249b45e382a8a0a9d9152ae704
- 29d4e5587319023c7f1490ae364be792ffea6c8a70003a87d1d68a5deafea660
- 9a0f31c479973454eca83c3e0e00cdbb4fc99f2d933bdc07bd0040d2c11d6ad2
- 7fc60239662a92e17d1d98e541468f09e3d11c7d6782caefc66a7af9b36a4c38
- 357d06e25fd60cc71a4099bfa5f1105b49a9059748fa5918012b7bbe481aca4b
- aa7678ed21dc12960e1caac3a0cf4a096297f98f125f9b723da1718b366bd213
- 8370f53002d8606b5fd535832347a5392075df802f62512f6e9db0cf6697978f
- 3fe01327107ea48bb372ecd940f6e3bb5a317d517ccfef1e3e4db0d64e68d022
- af0b696bc5c16de8b285d889bbae049a087469b4dec330b1179c0e0e4a566da4
- 05c56f48e1b523e7e5cc37b31870347f7d8139a7ca678d6208f2ee56b40cdd92
- 5b000fe576ee76c39762c864a74d3d1b8cceb764f79b679a5ba293ac6035d39d
- 91a9c4c3bc53412dc839c59effa82e329848f2021cef5cd4ad9f66a0379baa74
- 3925fb837da23f0082fcb645f153e7832cbda5e7298427d2cedd87ca438f5e6e
- 98e7ae2a552d020820cc28e71c59fc17650589c5df58817b98d1a32a651b1731
- 6d30e58330e3fc166003a8d6899f0c310c654b5fd8dfe7f0f7fe3e5592320b13
- 4409a6110b26dee020222f3fa62c2fb7a05c80a2529afc039163ddb839a94851
- 57a59face2e0a28792239fca9d973341fbe915dc3ef44fd14392c22d34ed5c59
- cc7cc0492a45923b4b716961152774bb4757506d07c147af013e6b19ab60db53
- b49316db77d0ab229c2ff8cde3e12c664900d01544d45dc421d39a1917bd3bf4
- c4fa2099b45412fc6d2c230862a6dd94121ceefdc5adaca9ac31417e18ce4ee1
- 6bc73fa7897b2fd0017294293eb3b4b718917f2b2c281d6ac500002c70774ba4
- 2c718b8646ad8b79929df9f49aa520be0884fdcf58ed13f1fcf60bea089cad25
- 58062ec5f74f5157c3fea735e838733cbb4dc2fdeba841eefb1cf01971cfcac6
- 07aae280e3d7a2d5f8a56dc1ec59af454fd3a3e2f67de7620bfedeab2df63747
- 1b873373b1bdaccf670f1ea3fc791dc54b658e334bd4cbf2ddd83ad47366b19a
- 855fac5cd2207307242348c031c52a9c108f11b32bc52d2ae6e7dbdc4f8e4cef
- fcb1a530764c3249cc834402d3ec2c2e34d0f0ff4843f0d25111b66c98b531ce
- 56990cd4e5be208f326833c55c5c7f02b5a417a7659c8dab47242f2ace7f7eb5
- 556ef6257e3273caecf779cc2d2cf2bd5e4fdf7956e1754adf3e71433d08a393
- b5187594fbbf654c944cda8be3f16b179d073e72b66285186ea22fddff5160b9
- f4add1da3f3de9b71acfdf19ac6e7872a78d2dd02161cca9dcefaeedf78234a6
- 788cdc6760bf43898819378597fdafe6715a192cb81ba5b1b011fac9275e9c2c
- f78ccc32a5c154af1e0fe59b9aa501b12b4d0ad8c3013492ffa6e0ce7752ddf5
- 1bb9968d140fbbea0ce0be266255bd6695099aa875412eb9c10bfafc078c68b0
- 3a65e9f5c6d56248fab29a7d512bfe78ff39ffe7869961157f56bf48e8bfe1d1
- 81e749e6cae036fd5b2c93ef826426277294662c6d34e1e5d6245c35c523ba8e
- e437d9e94bf4bceec2be8a50545de83d47825eda8eeb8756743c63734c1bcdbc
- ca9e8a120a8308375ae02b416a0d019f50ae423535e3da7b687ae097b63713be
- 9330f2860e7c11c6189d25197d0fad07da2a06a42c145903196705f2da75db67
- c3230128f9df010390d0ce29e886c7afd8e1e4471e5ffd863c3a3ecb3b7b18e2
- eaa24f8bcab9933e8e51dda52bcbe0c9a186c99ab73c8f0402713c8327a2b0fc
- 4ee297dc895a92378068fd51fb8d2eaa02e0067216549ad28520568635bd0e5c
- 2ac679a8d6e40db227f07b8598e4dc4abede0f7cdfb9a79249832b89e9ada5dc
- 83e5282025df6b591da40f3f20f4c41adaf9bc8d8903c5729d02f2ccb0d49ecd
- f8eaba78a6cb08193e05fb247144a2ce0e9d41c209fa19ebd1995a7ac531a055
- a3afb00ab3a494702ec5396f7d95c342472a93d31f5b406f37f0e75f4d8553e2
- 7655e926b6b82227d1bb8eb41eac3160e43591c6c6adfeb1e967d28bc2c2dcad
- dda55049cfed59a6a12ca986a47390c62ff3c34e82846b6769b7898cc162d95b
- 8d513578c69e9971b4a9ba00d9def9de83c851200d38df791f7ee7f4c42a4bb4
- 968ee7ab12abb69035d97e5481a4daa052debf9097896e775c3e49a52b5c56e0"
+checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
+ d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
+ bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
+ e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
+ 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
+ afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
+ 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
+ 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
+ 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
+ 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
+ bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
+ bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
+ cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
+ b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
+ a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
+ 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
+ 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
+ c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
+ cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
+ dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
+ a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
+ 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
+ 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
+ b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
+ c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
+ 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
+ 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
+ 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
+ f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
+ 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
+ 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
+ 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
+ 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
+ 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
+ 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
+ d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
+ 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
+ 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
+ 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
+ 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
+ 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
+ ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
+ 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
+ ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
+ 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
+ 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
+ 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
+ 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
+ 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
+ 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
+ c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
+ c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
+ c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
+ ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
+ 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
+ b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
+ 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
+ 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
+ ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
+ 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
+ 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
+ ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
+ b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
+ aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
+ f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
+ d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
+ 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
+ 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
+ b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
+ 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
+ feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
+ 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
+ ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
+ 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
+ c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
+ 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
+ dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
+ 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
+ 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
+ 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
+ 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
+ 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
+ c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
+ 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
+ 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
+ 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
+ b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
+ 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
+ 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
+ e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
+ d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
+ 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
+ f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
From 83e0c83a76b343d951cc50b135bef67c648f53f8 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 24 Apr 2021 18:15:21 +0300
Subject: [PATCH 14/36] lmdb++: upate to 1.0.0
Move to an active fork
---
srcpkgs/lmdb++/template | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/lmdb++/template b/srcpkgs/lmdb++/template
index f1d8add382ef..1b4a6b5b747f 100644
--- a/srcpkgs/lmdb++/template
+++ b/srcpkgs/lmdb++/template
@@ -1,14 +1,15 @@
# Template file for 'lmdb++'
pkgname=lmdb++
-version=0.9.14.0+20160229
-revision=3
-_commit=0b43ca87d8cfabba392dfe884eb1edb83874de02
-wrksrc="lmdbxx-${_commit}"
+version=1.0.0
+revision=1
+wrksrc="lmdbxx-${version}"
build_style=gnu-makefile
depends="lmdb-devel"
short_desc="C++11 wrapper for the LMDB database library"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="Unlicense"
-homepage="https://github.com/drycpp/lmdbxx/"
-distfiles="https://github.com/drycpp/lmdbxx/archive/${_commit}.tar.gz"
-checksum=93721132bbf5045d38ad62de2997655e9984c48ea5c9886746d42128f4b26fbd
+homepage="https://github.com/hoytech/lmdbxx/"
+distfiles="https://github.com/hoytech/lmdbxx/archive/${version}.tar.gz"
+checksum=5e12eb3aefe9050068af7df2c663edabc977ef34c9e7ba7b9d2c43e0ad47d8df
+# Check links against libsanitizer, not available on all platforms
+make_check=no
From b41827805887f9adb4d01cf05dd5bcf4359be14c Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 24 Apr 2021 18:11:40 +0300
Subject: [PATCH 15/36] libunwind: enable c++ exception handling
Exclude x86
---
common/shlibs | 20 ++++++++++----------
srcpkgs/libunwind/template | 8 +++++++-
2 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4e69b5ccb4ae..140a3893f942 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1318,16 +1318,16 @@ libjsoncpp.so.24 jsoncpp-1.9.4_1
libesmtp.so.6 libesmtp-1.0.6_21
libcaca.so.0 libcaca-0.99.beta18_3
libcaca++.so.0 libcaca-0.99.beta18_3
-libunwind.so.8 libunwind-1.1_1
-libunwind-ptrace.so.0 libunwind-1.1_1
-libunwind-x86_64.so.8 libunwind-1.1_1
-libunwind-x86.so.8 libunwind-1.1_1
-libunwind-arm.so.8 libunwind-1.1_4
-libunwind-mips.so.8 libunwind-1.1_4
-libunwind-aarch64.so.8 libunwind-1.2rc1_1
-libunwind-ppc32.so.8 libunwind-1.2.1_1
-libunwind-ppc64.so.8 libunwind-1.2.1_1
-libunwind-setjmp.so.0 libunwind-1.4_1
+libunwind.so.8 libunwind-1.5.0_3
+libunwind-ptrace.so.0 libunwind-1.5.0_3
+libunwind-x86_64.so.8 libunwind-1.5.0_3
+libunwind-x86.so.8 libunwind-1.5.0_3
+libunwind-arm.so.8 libunwind-1.5.0_3
+libunwind-mips.so.8 libunwind-1.5.0_3
+libunwind-aarch64.so.8 libunwind-1.5.0_3
+libunwind-ppc32.so.8 libunwind-1.5.0_3
+libunwind-ppc64.so.8 libunwind-1.5.0_3
+libunwind-setjmp.so.0 libunwind-1.5.0_3
libmicrohttpd.so.12 libmicrohttpd-0.9.48_1
libmicrodns.so.0 libmicrodns-0.1.0_1
libgit2.so.1.0 libgit2-1.0.1_3
diff --git a/srcpkgs/libunwind/template b/srcpkgs/libunwind/template
index 3ef73d90d5bf..d4819ce54acd 100644
--- a/srcpkgs/libunwind/template
+++ b/srcpkgs/libunwind/template
@@ -1,7 +1,7 @@
# Template file for 'libunwind'
pkgname=libunwind
version=1.5.0
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="libtool automake"
makedepends="liblzma-devel"
@@ -14,6 +14,12 @@ checksum=90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017
CFLAGS="-fcommon"
+# Enable C++ exception handling (doesn't work too well on x86)
+case "$XBPS_TARGET_MACHINE" in
+ x86_64*|i686*) ;;
+ *) configure_args+=" --enable-cxx-exceptions" ;;
+esac
+
# LDFLAGS is necessary because libunwind.so itself uses getcontext/setcontext
case "$XBPS_TARGET_MACHINE" in
i686-musl) LDFLAGS=" -lssp_nonshared" ;;
From 5de34c9b65279f72b1759811f9897daf5c80c29e Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 8 Mar 2021 13:53:11 +0300
Subject: [PATCH 16/36] mtxclient: update to 0.5.1
---
common/shlibs | 2 +-
srcpkgs/mtxclient/template | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 140a3893f942..0774539703f9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -416,7 +416,7 @@ libField3D.so.1.7 Field3D-1.7.3_1
libMAC.so.6 libMAC-5.28_1
libmad.so.0 libmad-0.15.1b_1
libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.3.1 mtxclient-0.3.1_3
+libmatrix_client.so.0.5.1 mtxclient-0.5.1_1
libebml.so.5 libebml-1.4.0_1
libdvdread.so.8 libdvdread-6.1.1_1
libdvdnav.so.4 libdvdnav-4.1.3_1
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 5c5806d3cf7d..35f3d4a10f42 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,17 +1,17 @@
# Template file for 'mtxclient'
pkgname=mtxclient
-version=0.3.1
-revision=3
+version=0.5.1
+revision=1
build_style=cmake
-configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
+configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel"
short_desc="Client API library for the Matrix protocol"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="MIT"
homepage="https://github.com/Nheko-Reborn/mtxclient"
distfiles="https://github.com/Nheko-Reborn/mtxclient/archive/v${version}.tar.gz"
-checksum=e4899cc4ce87397de2aef865e94ea2cdb8d9cb86253727e7d90532b925ecc770
+checksum=9478d870296ebe7679c90f563cb798eb3cdd3f9c4578ceea5af75b66f456baaa
post_install() {
vlicense LICENSE
From e24cfcb87e2c182b7cf7a5615656dfe36eac1e6a Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 8 Mar 2021 14:15:14 +0300
Subject: [PATCH 17/36] nheko: update to 0.8.2
---
common/shlibs | 1 +
srcpkgs/nheko/template | 20 ++++++++++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0774539703f9..3c7a6e7f8f53 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1132,6 +1132,7 @@ libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.18.3_2
libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2
libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2
libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1
libsecret-1.so.0 libsecret-0.10_1
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index dd635f70f249..a32ac2a6117e 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,18 +1,26 @@
# Template file for 'nheko'
pkgname=nheko
-version=0.7.2
-revision=3
+version=0.8.2
+revision=1
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
- tweeny spdlog mtxclient-devel boost-devel cmark-devel olm-devel json-c++
- libsodium-devel lmdb++ qt5-declarative-devel qt5-quickcontrols2-devel"
+ spdlog mtxclient-devel boost-devel cmark-devel olm-devel json-c++ lmdb++
+ qt5-declarative-devel qt5-quickcontrols2-devel qtkeychain-qt5-devel
+ gst-plugins-bad1-devel gst-plugins-base1-devel xcb-util-wm-devel"
depends="hicolor-icon-theme qt5-quickcontrols2 qt5-graphicaleffects
- qt5-multimedia"
+ qt5-multimedia gst-plugins-good1 gst-plugins-good1-qt5"
short_desc="Desktop client for Matrix using Qt and C++14"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/Nheko-Reborn/nheko"
changelog="https://github.com/Nheko-Reborn/nheko/blob/master/CHANGELOG.md"
distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
-checksum=412908fcec0e66a0557db5359556b65e85dd22b8644a6a2ed569a90dea4bde3c
+checksum=df4575c47daab47d418637a4637b599e3848dd749132ca1e92f981d9212eabb2
+
+case "$XBPS_TARGET_MACHINE" in
+ armv*-musl)
+ makedepends+=" libunwind-devel"
+ configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lunwind" ;;
+ *) ;;
+esac
From 5a389d56cb433e21bd2da0cdfba1dbf563f9b880 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 27 Apr 2021 07:06:56 +0300
Subject: [PATCH 18/36] calcurse: update to 4.7.1
---
srcpkgs/calcurse/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/calcurse/template b/srcpkgs/calcurse/template
index bfc9fe3f606f..aefd36d204da 100644
--- a/srcpkgs/calcurse/template
+++ b/srcpkgs/calcurse/template
@@ -1,16 +1,16 @@
# Template file for 'calcurse'
pkgname=calcurse
-version=4.7.0
+version=4.7.1
revision=1
build_style=gnu-configure
makedepends="ncurses-devel"
depends="python3-httplib2"
-short_desc="Ncurses planner"
+short_desc="Text-based calendar and scheduling application"
maintainer="silvernode <mollusk@homebutter.com>"
license="BSD-2-Clause"
homepage="https://calcurse.org"
distfiles="https://calcurse.org/files/${pkgname}-${version}.tar.gz"
-checksum=ef6675966a53f41196006ce624ece222fe400da0563f4fed1ae0272ad45c8435
+checksum=0a7c55d07674569d166c0b0e7587b2972d3da8160cdb7d60b1dbd2895803afb0
post_install() {
vlicense COPYING
From 49ca0a9522df47d6594a864786d33c0207cb44cf Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 27 Apr 2021 07:47:15 +0300
Subject: [PATCH 19/36] mate-session-manager: update to 1.24.3.
---
srcpkgs/mate-session-manager/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mate-session-manager/template b/srcpkgs/mate-session-manager/template
index f186ef57c31f..7be98f824528 100644
--- a/srcpkgs/mate-session-manager/template
+++ b/srcpkgs/mate-session-manager/template
@@ -1,6 +1,6 @@
# Template file for 'mate-session-manager'
pkgname=mate-session-manager
-version=1.24.2
+version=1.24.3
revision=1
build_style=gnu-configure
configure_args="--disable-static --with-elogind"
@@ -11,4 +11,4 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://mate-desktop.org"
distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6b0b9c0c4fe831e4f000e55a2ebb953cf2a83eed613faaf3e23c8beec42c8bc9
+checksum=90a0aec5b59b6287b4d2c4d452b0b6410f9d12490ca1f890e81ba2801bdab0a2
From e49669f9e553f604d16626879f989afd9ae96d28 Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Sat, 17 Apr 2021 11:25:07 -0700
Subject: [PATCH 20/36] lavalauncher: update to 2.1.0.
---
srcpkgs/lavalauncher/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/lavalauncher/template b/srcpkgs/lavalauncher/template
index b9fd51753b81..554c7d2b6c8b 100644
--- a/srcpkgs/lavalauncher/template
+++ b/srcpkgs/lavalauncher/template
@@ -1,17 +1,17 @@
# Template file for 'lavalauncher'
pkgname=lavalauncher
-version=2.0.0
+version=2.1.0
revision=1
wrksrc="${pkgname}-v${version}"
build_style=meson
hostmakedepends="wayland-devel pkg-config scdoc"
-makedepends="wayland-protocols wayland-devel cairo-devel librsvg-devel"
+makedepends="wayland-protocols wayland-devel cairo-devel librsvg-devel libxkbcommon-devel"
short_desc="Simple panel launcher for Wayland"
maintainer="Jony <maybe-one-day-ubermensch@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://git.sr.ht/~leon_plickat/lavalauncher"
distfiles="https://git.sr.ht/~leon_plickat/lavalauncher/archive/v${version}.tar.gz"
-checksum=6aa9d6fe189f658dabb709c1902454ebaa7dace8259d39c2256397657a411f9b
+checksum=4d51d857ddfc682cf7dbc4dcd60a776b6816610230afead4608fdd7693261274
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
configure_args="-Dc_args=-D__off64_t=off_t"
From 39ded0537d4d5d04a56c5fb885b3ac13bf7f99d9 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 27 Apr 2021 08:11:00 +0300
Subject: [PATCH 21/36] osinfo-db: update to 20210426.
---
srcpkgs/osinfo-db/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 61623edce241..6f5a598f0abe 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
# Template file for 'osinfo-db'
pkgname=osinfo-db
-version=20210312
+version=20210426
revision=1
build_style=fetch
hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://libosinfo.org"
distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=7548ec09e445ca7378c5ceb99e39edca8857f8293831e0b3cb558f4230870e10
+checksum=66c93b4a5b319b2ff7d40360d9e94486a9a45f2c0dd1c30d4b31de4f223070d0
skip_extraction="${pkgname}-${version}.tar.xz"
do_install() {
From 7758e644ddd4401ed8ee0d546f158199994bafa1 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 27 Apr 2021 06:36:39 +0300
Subject: [PATCH 22/36] element-desktop: update to 1.7.26
---
srcpkgs/element-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 2f6c753e247c..556b6504aadb 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'element-desktop'
pkgname=element-desktop
-version=1.7.25
+version=1.7.26
revision=1
wrksrc="element-web-${version}"
conf_files="/etc/${pkgname}/config.json"
@@ -18,8 +18,8 @@ _ghpage="https://github.com/vector-im"
_archive="archive/v${version}.tar.gz"
distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="33ddceb3538b9bf5ae6104c14d01ea2148e89c689b24d724dd5e60182bf5fe95
- c38fc7e77c82c655457b244b0e7e5802618aa088ddbbaa9bae4db4185236b972"
+checksum="ae3c96f04dbdfc0f69d14399bfcb0a7f4b3dec2b5db62c09da02c427c57d79c2
+ 3a81a2ed8126f4cb286de312f10c84b11f9663658e126ffb1ae2d92b8d3c3a60"
export USE_SYSTEM_APP_BUILDER=true
From 9da7560f4f230dc3ecd18464e25a9efdb0b7d53f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 27 Apr 2021 07:51:49 -0500
Subject: [PATCH 23/36] yara: update to 4.1.0.
---
common/shlibs | 2 +-
srcpkgs/yara/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 3c7a6e7f8f53..bbe55668e47c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2951,7 +2951,7 @@ libbctoolbox.so.1 bctoolbox-0.6.0_1
libortp.so.15 ortp-4.4.0_1
libsuperlu.so.5 superlu-5.2.1_1
libgosu.so.0 gosu-0.12.0_1
-libyara.so.4 libyara-4.0.5_2
+libyara.so.8 libyara-4.1.0_1
libyaz_icu.so.5 yaz-5.23.1_1
libyaz.so.5 yaz-5.23.1_1
libyaz_server.so.5 yaz-5.23.1_1
diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 668ab97b1a7d..9fd7c4eb4b31 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,7 +1,7 @@
# Template file for 'yara'
pkgname=yara
-version=4.0.5
-revision=2
+version=4.1.0
+revision=1
build_style=gnu-configure
configure_args="--enable-magic --enable-cuckoo"
hostmakedepends="automake libtool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="BSD-3-Clause"
homepage="https://virustotal.github.io/yara/"
distfiles="https://github.com/VirusTotal/yara/archive/v${version}.tar.gz"
-checksum=ea7ebefad05831faf6f780cab721611b0135803f03a84c27eeba7bfe0afc3aae
+checksum=8bee0e16ce56335d88e33349783dba8957d02da3339fd04df577ff1d2fa811af
pre_configure() {
autoreconf -fi
From 595a8da67921bfe35098852fcc299f3e85f01541 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 27 Apr 2021 07:51:59 -0500
Subject: [PATCH 24/36] python3-yara: update to 4.1.0.
---
srcpkgs/python3-yara/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-yara/template b/srcpkgs/python3-yara/template
index 8235913d2774..d3c42f7fa06f 100644
--- a/srcpkgs/python3-yara/template
+++ b/srcpkgs/python3-yara/template
@@ -1,6 +1,6 @@
# Template file for 'python3-yara'
pkgname=python3-yara
-version=4.0.5
+version=4.1.0
revision=1
wrksrc="yara-python-${version}"
build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="http://virustotal.github.io/yara/"
distfiles="https://github.com/VirusTotal/yara-python/archive/v${version}.tar.gz"
-checksum=2c99f3858eddfd0efa179b0713df3df95912eb5323c44a1136dd3e17dbc954da
+checksum=4bc1a69bc9c5f70419806e15a05123a7879456b52a9c50832c34c22eecb4de81
From e7d9564a5c6278d000b4b8107e992573ec0996fd Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 27 Apr 2021 06:32:03 +0300
Subject: [PATCH 25/36] OTPClient: update to 2.4.4
---
srcpkgs/OTPClient/patches/fix-cflags.patch | 10 +++++-----
srcpkgs/OTPClient/template | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/OTPClient/patches/fix-cflags.patch b/srcpkgs/OTPClient/patches/fix-cflags.patch
index ae70f441538f..5474d055d57f 100644
--- a/srcpkgs/OTPClient/patches/fix-cflags.patch
+++ b/srcpkgs/OTPClient/patches/fix-cflags.patch
@@ -1,17 +1,17 @@
-Index: OTPClient-2.4.2/CMakeLists.txt
+Index: OTPClient-2.4.4/CMakeLists.txt
===================================================================
---- OTPClient-2.4.2.orig/CMakeLists.txt
-+++ OTPClient-2.4.2/CMakeLists.txt
+--- OTPClient-2.4.4.orig/CMakeLists.txt
++++ OTPClient-2.4.4/CMakeLists.txt
@@ -11,11 +11,10 @@ option(BUILD_GUI "Build the GUI" ON)
option(BUILD_CLI "Build the CLI" ON)
set(CMAKE_C_STANDARD 11)
--set(CMAKE_C_FLAGS "-Wall -Wextra -O3 -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
+-set(CMAKE_C_FLAGS "-Wall -Wextra -O2 -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always -Wstrict-prototypes -Wunreachable-code")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wchar-subscripts -Wwrite-strings -Wpointer-arith -Wbad-function-cast -Wcast-align")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=format-security -Werror=implicit-function-declaration -Wno-sign-compare")
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3")
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2")
if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pie -fPIE")
endif()
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index f5af76e655a6..bea17c56a1e4 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,6 +1,6 @@
# Template file for 'OTPClient'
pkgname=OTPClient
-version=2.4.2
+version=2.4.4
revision=1
build_style=cmake
hostmakedepends="pkg-config"
@@ -11,5 +11,5 @@ maintainer="Ulf <void@uw.anonaddy.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/paolostivanin/OTPClient"
distfiles="https://github.com/paolostivanin/OTPClient/archive/v${version}.tar.gz"
-checksum=74bc4312aa1cd336ca983434e3bed951c5ead327091e7708e3beb08508813495
+checksum=5b976782906f15e2a4e001d73909a05f6146010cea83d78e3ad5c850f4049da4
patch_args=-Np1
From 4c6c8b9546fcb88874f05cedf9dd97c4403e88e2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Apr 2021 11:34:29 -0400
Subject: [PATCH 26/36] python3-pytools: update to 2021.2.6.
---
srcpkgs/python3-pytools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index dcff93248267..079943789034 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pytools'
pkgname=python3-pytools
-version=2021.2.5
+version=2021.2.6
revision=1
wrksrc=${pkgname#*-}-${version}
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="X11"
homepage="https://pypi.org/project/pytools"
distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=a96eae85aad86fe63cefa06e6cd9f6dcf8e85bd9aab0fd00b7f381a6366c5776
+checksum=02160d723ff481349dae9c733477a34b04661190519cb1c84b985d549eee416d
post_install() {
vlicense LICENSE
From ee7dc47d899f517216e02ca771051da658eec2a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Apr 2021 11:48:21 -0400
Subject: [PATCH 27/36] python3-scipy: update to 1.6.3.
---
srcpkgs/python3-scipy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index ca4f93158526..569c1ce07341 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
# Template file for 'python3-scipy'
pkgname=python3-scipy
-version=1.6.2
+version=1.6.3
revision=1
wrksrc="scipy-${version}"
build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause"
homepage="https://scipy.org/scipylib/"
distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=8fadc443044396283c48191d48e4e07a3c3b6e2ae320b1a56e76bb42929e84d2
+checksum=3851fdcb1e6877241c3377aa971c85af0d44f90c57f4dd4e54e1b2bbd742635e
build_options="openblas"
From 7534dd83a8374a87a8ee33d6b229d10732f425f2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Apr 2021 12:14:12 -0400
Subject: [PATCH 28/36] python3-acme: update to 1.14.0.
---
srcpkgs/python3-acme/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-acme/template b/srcpkgs/python3-acme/template
index 31f97a8d7ea3..ef4b0810aeb6 100644
--- a/srcpkgs/python3-acme/template
+++ b/srcpkgs/python3-acme/template
@@ -1,6 +1,6 @@
# Template file for 'python3-acme'
pkgname=python3-acme
-version=1.13.0
+version=1.14.0
revision=1
wrksrc="acme-${version}"
build_style=python3-module
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://github.com/certbot/certbot"
distfiles="${PYPI_SITE}/a/acme/acme-${version}.tar.gz"
-checksum=6b4257dfd6a6d5f01e8cd4f0b10422c17836bed7c67e9c5b0a0ad6c7d651c088
+checksum=61daccfb0343628cbbca551a7fc4c82482113952c21db3fe0c585b7c98fa1c35
From b50eede5e18634d10f6e30693030139873331668 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Apr 2021 12:15:01 -0400
Subject: [PATCH 29/36] certbot: update to 1.14.0.
---
srcpkgs/certbot/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index 2642bb26b35e..5390a48b71bb 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,6 +1,6 @@
# Template file for 'certbot'
pkgname=certbot
-version=1.13.0
+version=1.14.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,4 +14,4 @@ maintainer="Alex Childs <misuchiru03+void@gmail.com>"
license="Apache-2.0"
homepage="https://certbot.eff.org/"
distfiles="${PYPI_SITE}/c/certbot/certbot-${version}.tar.gz"
-checksum=64cf41b57df7667d9d849fcaa9031a4f151788246733d1f4c3f37a5aa5e2f458
+checksum=959ea90c6bb8dca38eab9772722cb940972ef6afcd5f15deef08b3c3636841eb
From 212bd6ca1c20399e8cca34d1c6fda5c574149819 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Apr 2021 12:16:01 -0400
Subject: [PATCH 30/36] certbot-apache: update to 1.14.0.
---
srcpkgs/certbot-apache/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/certbot-apache/template b/srcpkgs/certbot-apache/template
index f4a4e287c1c1..b67f362c42e5 100644
--- a/srcpkgs/certbot-apache/template
+++ b/srcpkgs/certbot-apache/template
@@ -1,6 +1,6 @@
# Template file for 'certbot-apache'
pkgname=certbot-apache
-version=1.13.0
+version=1.14.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Kartik S. <kartik.ynwa@gmail.com>"
license="Apache-2.0"
homepage="https://certbot.eff.org/"
distfiles="${PYPI_SITE}/c/certbot-apache/certbot-apache-${version}.tar.gz"
-checksum=4b5a16e80c1418e2edc05fc2578f522fb24974b2c13eb747cdfeef69e5bd5ae1
+checksum=887fe4a21af2de1e5c2c9428bacba6eb7c1219257bc70f1a1d8447c8a321adb0
From 8eb4a5b2cd9814cc7da1e16ef2480b9381a43e46 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Apr 2021 12:16:41 -0400
Subject: [PATCH 31/36] certbot-nginx: update to 1.14.0.
---
srcpkgs/certbot-nginx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/certbot-nginx/template b/srcpkgs/certbot-nginx/template
index 189735143579..95c3f7dc013b 100644
--- a/srcpkgs/certbot-nginx/template
+++ b/srcpkgs/certbot-nginx/template
@@ -1,6 +1,6 @@
# Template file for 'certbot-nginx'
pkgname=certbot-nginx
-version=1.13.0
+version=1.14.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
license="Apache-2.0"
homepage="https://certbot.eff.org/"
distfiles="${PYPI_SITE}/c/certbot-nginx/certbot-nginx-${version}.tar.gz"
-checksum=9e972cc19c0fa9e5b7863da0423b156fbfb5623fd30b558fd2fd6d21c24c0b08
+checksum=cc2a8a0de56d9bb6b2efbda6c80c647dad8db2bb90675cac03ade94bd5fc8597
From 0137e2ac681c63f8f8034ef4abc57504bc8d5b36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 27 Apr 2021 15:16:45 -0300
Subject: [PATCH 32/36] abiword: use enchant2.
Also remove gtk3 build option, we don't want to use gtk2.
---
srcpkgs/abiword/patches/enchant-2.patch | 60 +++++++++++++++++++++++++
srcpkgs/abiword/template | 17 +++----
2 files changed, 69 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/abiword/patches/enchant-2.patch
diff --git a/srcpkgs/abiword/patches/enchant-2.patch b/srcpkgs/abiword/patches/enchant-2.patch
new file mode 100644
index 000000000000..bb0edcd4bcf3
--- /dev/null
+++ b/srcpkgs/abiword/patches/enchant-2.patch
@@ -0,0 +1,60 @@
+Upstream: https://gitlab.gnome.org/World/AbiWord/-/commit/ae05e92df5a5d6151641622c83d35a6fdba47b1f
+Adapted to change configure directly instead of configure.ac
+
+From ae05e92df5a5d6151641622c83d35a6fdba47b1f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <hub@figuiere.net>
+Date: Fri, 22 Nov 2019 20:02:52 -0500
+Subject: [PATCH] Require enchant 2 now
+
+---
+ configure.ac | 2 +-
+ src/af/xap/xp/enchant_checker.cpp | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index fdc3076..308b87b 100755
+--- a/configure
++++ b/configure
+@@ -4200,7 +4200,7 @@ xp_pkgs="
+ "
+
+ # optional deps
+-enchant_req='enchant >= 1.2.0'
++enchant_req='enchant-2'
+ gio_req='gio-2.0'
+ goffice_req='libgoffice-0.10 >= 0.10.0'
+
+diff --git a/src/af/xap/xp/enchant_checker.cpp b/src/af/xap/xp/enchant_checker.cpp
+index ed97c1fb9f..5f64852412 100644
+--- a/src/af/xap/xp/enchant_checker.cpp
++++ b/src/af/xap/xp/enchant_checker.cpp
+@@ -127,7 +127,7 @@ EnchantChecker::_suggestWord (const UT_UCSChar *ucszWord, size_t len)
+ pvSugg->addItem (ucszSugg);
+ }
+
+- enchant_dict_free_suggestions (m_dict, suggestions);
++ enchant_dict_free_string_list(m_dict, suggestions);
+ }
+
+ return pvSugg;
+@@ -139,7 +139,7 @@ bool EnchantChecker::addToCustomDict (const UT_UCSChar *word, size_t len)
+
+ if (word && len) {
+ UT_UTF8String utf8 (word, len);
+- enchant_dict_add_to_personal (m_dict, utf8.utf8_str(), utf8.byteLength());
++ enchant_dict_add(m_dict, utf8.utf8_str(), utf8.byteLength());
+ return true;
+ }
+ return false;
+@@ -150,7 +150,7 @@ bool EnchantChecker::isIgnored (const UT_UCSChar *toCorrect, size_t toCorrectLen
+ UT_return_val_if_fail (m_dict, false);
+
+ UT_UTF8String ignore (toCorrect, toCorrectLen);
+- return enchant_dict_is_in_session (m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
++ return enchant_dict_is_added(m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
+ }
+
+ void EnchantChecker::ignoreWord (const UT_UCSChar *toCorrect, size_t toCorrectLen)
+--
+GitLab
+
diff --git a/srcpkgs/abiword/template b/srcpkgs/abiword/template
index 459c7eeba20b..0f48222f8180 100644
--- a/srcpkgs/abiword/template
+++ b/srcpkgs/abiword/template
@@ -1,17 +1,16 @@
# Template file for 'abiword'
pkgname=abiword
version=3.0.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-plugins --enable-clipart --enable-templates
- $(vopt_if gtk3 '--with-gtk3' '--with-gtk2')
- $(vopt_enable goffice)"
+ --with-gtk3 $(vopt_enable goffice)"
hostmakedepends="automake libtool flex pkg-config"
makedepends="libjpeg-turbo-devel libpng-devel fribidi-devel libgsf-devel
- enchant-devel librsvg-devel wv-devel boost-devel libxslt-devel
+ enchant2-devel librsvg-devel wv-devel boost-devel libxslt-devel
libwmf-devel libchamplain-devel redland-devel libical-devel
libgcrypt-devel harfbuzz-devel $(vopt_if goffice goffice-devel)
- $(vopt_if gtk3 'gtk+3-devel' 'gtk+-devel')"
+ gtk+3-devel"
depends="hicolor-icon-theme desktop-file-utils"
short_desc="Free word processing program similar to Microsoft(R) Word"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,8 +18,10 @@ license="GPL-2.0-or-later"
homepage="http://www.abisource.com/"
distfiles="${homepage}/downloads/${pkgname}/${version}/source/${pkgname}-${version}.tar.gz"
checksum=e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7
-build_options="gtk3 goffice"
-build_options_default="gtk3 goffice"
+patch_args=-Np1
+
+build_options="goffice"
+build_options_default="goffice"
CXXFLAGS="-std=c++11"
@@ -31,7 +32,7 @@ libabiword_package() {
}
}
abiword-devel_package() {
- depends="fribidi-devel libgsf-devel wv-devel enchant-devel gtk+3-devel
+ depends="fribidi-devel libgsf-devel wv-devel enchant2-devel gtk+3-devel
librsvg-devel libabiword>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
From 79f0cf3fe3d41766477faa18604c0b0734eb9245 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 27 Apr 2021 09:31:44 +0200
Subject: [PATCH 33/36] rclone: update to 1.55.1.
Also disable selfupdate
---
srcpkgs/rclone/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 65240e5cf4b3..da28404b0342 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,10 +1,11 @@
# Template file for 'rclone'
pkgname=rclone
-version=1.55.0
+version=1.55.1
revision=1
wrksrc="rclone-v${version}"
build_style=go
go_import_path=github.com/rclone/rclone
+go_build_tags="noselfupdate"
go_ldflags="-extldflags=-fuse-ld=bfd -X github.com/rclone/rclone/fs.Version=v${version}"
short_desc="Rsync for cloud storage"
maintainer="Diogo Leal <diogo@diogoleal.com>"
@@ -12,7 +13,9 @@ license="MIT"
homepage="https://rclone.org/"
changelog="https://raw.githubusercontent.com/rclone/rclone/master/docs/content/changelog.md"
distfiles="https://downloads.rclone.org/v${version}/rclone-v${version}.tar.gz"
-checksum=75accdaedad3b82edc185dc8824a19a59c30dc6392de7074b6cd98d1dc2c9040
+checksum=25da7fc5c9269b3897f27b0d946919df595c6dda1b127085fda0fe32aa59d29d
+# tests fail on CI
+make_check=ci-skip
pre_build() {
if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_LIBC" = musl ]; then
From 4bc0fc44358aed3dba3501d7c037d43c2d410501 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 27 Apr 2021 12:17:54 +0200
Subject: [PATCH 34/36] libedit: update to 20210419.3.1.
---
srcpkgs/libedit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libedit/template b/srcpkgs/libedit/template
index 09c69eb90322..43b23196160a 100644
--- a/srcpkgs/libedit/template
+++ b/srcpkgs/libedit/template
@@ -1,6 +1,6 @@
# Template file for 'libedit'
pkgname=libedit
-_datever=20210216
+_datever=20210419
_distver=3.1
version="${_datever}.${_distver}"
revision=1
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://www.thrysoee.dk/editline/"
distfiles="http://www.thrysoee.dk/editline/libedit-${_datever}-${_distver}.tar.gz"
-checksum=2283f741d2aab935c8c52c04b57bf952d02c2c02e651172f8ac811f77b1fc77a
+checksum=571ebe44b74860823e24a08cf04086ff104fd7dfa1020abf26c52543134f5602
post_install() {
vlicense COPYING
From 0ece33b64ba533e9f2197fd82cce1ec367f135a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Apr 2021 15:03:45 -0400
Subject: [PATCH 35/36] sshuttle: update to 1.0.5.
---
srcpkgs/sshuttle/template | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/sshuttle/template b/srcpkgs/sshuttle/template
index b7e8505d4fa6..eadcff89acce 100644
--- a/srcpkgs/sshuttle/template
+++ b/srcpkgs/sshuttle/template
@@ -1,28 +1,28 @@
# Template file for 'sshuttle'
pkgname=sshuttle
-version=1.0.4
-revision=2
+version=1.0.5
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools python3-Sphinx"
-depends="python3-setuptools iptables"
+hostmakedepends="python3-setuptools_scm python3-Sphinx"
+depends="python3-psutil"
+checkdepends="python3-flake8 python3-mock python3-pytest"
short_desc="Transparent proxy server that forwards TCP packets over ssh"
maintainer="Daniel Santana <daniel@santana.tech>"
license="LGPL-2.1-or-later"
homepage="https://github.com/sshuttle/sshuttle"
changelog="https://github.com/sshuttle/sshuttle/raw/master/CHANGES.rst"
distfiles="${PYPI_SITE}/s/sshuttle/sshuttle-${version}.tar.gz"
-checksum=21a11f3f0f710de92241d8ffca58bebb969f689f650d59e97ba366d7407e16e5
+checksum=fd8c691aac2cb80933aae7f94d9d9e271a820efc5c48e73408f1a90da426a1bd
post_extract() {
- sed -i setup.py \
- -e '/setup_requires=/d' \
- -e '/use_scm_version/,+3d' \
- -e "/name=/ a\
- version='${version}',"
# BUG: wrong permissions (https://github.com/sshuttle/sshuttle/issues/217)
chmod -R go+rX .
}
+pre_check() {
+ sed -i -e '/addopts/d' setup.cfg
+}
+
post_install() {
make -C docs man
vman docs/_build/man/sshuttle.1
From acb19ec5add3a25fb1d7c9b2bdbbe0582d4744d0 Mon Sep 17 00:00:00 2001
From: Bart van Deenen <bartvandeenen@streammachine.io>
Date: Tue, 27 Apr 2021 21:28:52 +0200
Subject: [PATCH 36/36] combined patch
---
srcpkgs/k9s/patches/combined.patch | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/k9s/patches/combined.patch
diff --git a/srcpkgs/k9s/patches/combined.patch b/srcpkgs/k9s/patches/combined.patch
new file mode 100644
index 000000000000..c0e07a5e2ba4
--- /dev/null
+++ b/srcpkgs/k9s/patches/combined.patch
@@ -0,0 +1,22 @@
+--- go.mod.org 2021-04-27 10:51:23.602448450 +0200
++++ go.mod 2021-04-27 10:51:33.685466458 +0200
+@@ -2,8 +2,6 @@
+
+ go 1.16
+
+-replace github.com/derailed/tview => ../tview
+-
+ replace (
+ github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
+ github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
+--- go.sum.org 2021-04-27 10:55:02.442782948 +0200
++++ go.sum 2021-04-27 10:55:27.707814111 +0200
+@@ -191,6 +191,8 @@
+ github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
+ github.com/derailed/popeye v0.9.0 h1:0zP4BAzo94RUjrUkzgF962v0zL9B3xyopd7kU7tMxuc=
+ github.com/derailed/popeye v0.9.0/go.mod h1:g3hudQlbEEChCA7U44fA+utTM9xQpD4pINUMQaiq5Gs=
++github.com/derailed/tview v0.5.3 h1:rzUz7sDoWJQjrx1u8YSbfQNmva+z2bnQqzoR6CZruo8=
++github.com/derailed/tview v0.5.3/go.mod h1:Cd1rHezeTZDlze2WsQMuGFwiooP1bO0RttWj7XtZbFM=
+ github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
^ permalink raw reply [flat|nested] 5+ messages in thread