Re: [PR PATCH] [Updated] botan: update to 3.1.1.

[mhmdanas <mhmdanas@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1356 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages botan-3.0.0
https://github.com/void-linux/void-packages/pull/43974

botan: update to 3.1.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

`corectrl` has an upstream patch to support Botan 3, might bump the package and incorporate the patch later.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/43974.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-botan-3.0.0-43974.patch --]
[-- Type: text/x-diff, Size: 4912 bytes --]

From 40cdca3428a56f2c02bf088cb202201a10ca1e34 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Fri, 1 Dec 2023 23:23:54 +0000
Subject: [PATCH 1/2] New package: botan3-3.2.0

---
 common/shlibs           |  1 +
 srcpkgs/botan/update    |  1 +
 srcpkgs/botan3-devel    |  1 +
 srcpkgs/botan3-doc      |  1 +
 srcpkgs/botan3/template | 91 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 95 insertions(+)
 create mode 100644 srcpkgs/botan/update
 create mode 120000 srcpkgs/botan3-devel
 create mode 120000 srcpkgs/botan3-doc
 create mode 100644 srcpkgs/botan3/template

diff --git a/common/shlibs b/common/shlibs
index 90018a5616f86..de81e2c05b0c8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2840,6 +2840,7 @@ libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
 libbotan-2.so.19 botan-2.19.1_1
+libbotan-3.so.2 botan3-3.1.1_1
 libswipl.so.9 swi-prolog-9.0.0_1
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
diff --git a/srcpkgs/botan/update b/srcpkgs/botan/update
new file mode 100644
index 0000000000000..370e7276de932
--- /dev/null
+++ b/srcpkgs/botan/update
@@ -0,0 +1 @@
+ignore="[^2].*"
diff --git a/srcpkgs/botan3-devel b/srcpkgs/botan3-devel
new file mode 120000
index 0000000000000..a965da97290f7
--- /dev/null
+++ b/srcpkgs/botan3-devel
@@ -0,0 +1 @@
+botan3
\ No newline at end of file
diff --git a/srcpkgs/botan3-doc b/srcpkgs/botan3-doc
new file mode 120000
index 0000000000000..a965da97290f7
--- /dev/null
+++ b/srcpkgs/botan3-doc
@@ -0,0 +1 @@
+botan3
\ No newline at end of file
diff --git a/srcpkgs/botan3/template b/srcpkgs/botan3/template
new file mode 100644
index 0000000000000..0efc919fd4aaf
--- /dev/null
+++ b/srcpkgs/botan3/template
@@ -0,0 +1,91 @@
+# Template file for 'botan3'
+pkgname=botan3
+version=3.2.0
+revision=1
+build_style=gnu-makefile
+hostmakedepends="doxygen python3"
+makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+short_desc="Crypto library written in C++"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://botan.randombit.net/"
+changelog="https://botan.randombit.net/news.html"
+distfiles="https://botan.randombit.net/releases/Botan-${version}.tar.xz"
+checksum=049c847835fcf6ef3a9e206b33de05dd38999c325e247482772a5598d9e5ece3
+python_version=3
+
+LDFLAGS="-pthread"
+
+do_configure() {
+	local _args _cpu
+
+	_args="--prefix=/usr --os=linux --with-doxygen --with-bzip2 --with-lzma
+	 --with-zlib --with-sqlite3 --cc=gcc --build-targets cli
+	 --build-targets shared --build-targets static"
+
+	if [ "$XBPS_CHECK_PKGS" ]; then
+		_args+=" --build-targets tests"
+	fi
+
+	case "$XBPS_TARGET_MACHINE" in
+	i686*)
+		_cpu="i686"
+		;;
+	x86_64*)
+		_cpu="x86_64"
+		;;
+	armv[56]*)
+		_cpu="arm"
+		_args+=" --disable-modules=simd"
+		;;
+	armv7*)
+		_cpu="armv7-a"
+		_args+=" --disable-modules=simd"
+		;;
+	aarch64*)
+		_cpu="armv8-a"
+		;;
+	mips*)
+		_cpu="mips32"
+		;;
+	ppc64le*)
+		_cpu="ppc64le"
+		;;
+	ppc64*)
+		_cpu="ppc64"
+		;;
+	ppc*)
+		_cpu="ppc"
+		;;
+	*)
+		_cpu="${XBPS_TARGET_MACHINE%-musl}"
+		;;
+	esac
+
+	python3 configure.py \
+		--distribution-info="Void Linux botan-${version}_${revision}" \
+		--cpu=${_cpu} \
+		${_args}
+}
+
+post_install() {
+	vlicense license.txt
+}
+
+botan3-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
+
+botan3-devel_package() {
+	short_desc+=" - development files"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 4860bb827ab755d67ec9b47352e9cd5e6f4338d9 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Fri, 1 Dec 2023 23:24:42 +0000
Subject: [PATCH 2/2] keepassxc: update to 2.7.6.

---
 srcpkgs/keepassxc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index a215aefc2b1ca..636f182c3bb39 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
 # Template file for 'keepassxc'
 pkgname=keepassxc
 version=2.7.6
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
  -DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
@@ -12,7 +12,7 @@ configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
  -DWITH_XC_SSHAGENT=$(vopt_if sshagent ON OFF)
  -DWITH_XC_YUBIKEY=$(vopt_if yubikey ON OFF)"
 hostmakedepends="qt5-devel ruby-asciidoctor"
-makedepends="qt5-tools-devel qt5-svg-devel botan-devel libargon2-devel
+makedepends="qt5-tools-devel qt5-svg-devel botan3-devel libargon2-devel
  qrencode-devel readline-devel pcsclite-devel
  qt5-x11extras-devel
  $(vopt_if autotype 'libXtst-devel libXi-devel')