From 8a78c26186fb72273206497dfb568568cbfd4eab Mon Sep 17 00:00:00 2001
From: Joe Bo Run <joborun@disroot.org>
Date: Mon, 6 Mar 2023 04:03:11 +0200
Subject: [PATCH] uog refind bind

---
 bind/PKGBUILD        | 18 +++++++++++-------
 bind/PKGBUILD-arch   | 12 +++++-------
 bind/deps            | 12 ------------
 refind/PKGBUILD      | 17 +++++++++--------
 refind/PKGBUILD-arch | 13 +++++++------
 refind/deps          |  3 ++-
 6 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/bind/PKGBUILD b/bind/PKGBUILD
index ba9cb89..3089dc8 100644
--- a/bind/PKGBUILD
+++ b/bind/PKGBUILD
@@ -8,17 +8,16 @@
 _pkgver=9.18.12
 pkgname=bind
 pkgver=${_pkgver//-/.}
-pkgrel=01
+pkgrel=02
 pkgdesc='A complete, highly portable implementation of the DNS protocol w/o systemd geoip'
 url='https://www.isc.org/software/bind/'
-arch=('x86_64')
 options=('!emptydirs')
-makedepends=('libcap' 'libxml2' 'zlib' 'krb5' 'e2fsprogs' 'openssl' 'readline'
-  'libidn2' 'dnssec-anchors' 'python' 'json-c' 'python-ply' 'lmdb' 'zlib' 'icu'
-  'xz' 'libmaxminddb' 'libnsl' 'libuv' 'python-sphinx')
+#makedepends=('libcap' 'libxml2' 'zlib' 'krb5' 'e2fsprogs' 'openssl' 'readline'
+#  'libidn2' 'dnssec-anchors' 'python' 'json-c' 'python-ply' 'lmdb' 'zlib' 'icu'
+#  'xz' 'libmaxminddb' 'libnsl' 'libuv' 'python-sphinx')
 depends=('bash' 'dnssec-anchors' 'e2fsprogs' 'glibc' 'icu' 'libedit' 'json-c'
   'krb5' 'libcap' 'libidn2' 'libmaxminddb' 'libnsl' 'libuv' 'libxml2' 'lmdb'
-  'openssl' 'python' 'python-ply' 'readline' 'xz' 'zlib' 'jemalloc')
+  'openssl' 'readline' 'xz' 'zlib' 'jemalloc' 'libnghttp2')
 conflicts=('bind-tools' 'dnsutils')
 replaces=('bind-tools' 'dnsutils' 'host')
 provides=('bind-tools' 'dnsutils' 'dns-server')
@@ -77,6 +76,8 @@ build() {
 
 ## on the configure section above maminddb and geoip have been switched off 
 ## reverse those options if you want this feature active 
+# No test suite because it requires root.
+# See: https://gitlab.isc.org/isc-projects/bind9/-/blob/main/README.md#testing.
 
 package() {
   cd "bind-$_pkgver"
@@ -99,6 +100,8 @@ package() {
 
 #---- license gpg-key sha256sums ----
 
+arch=(x86_64)
+
 license=('MPL2')
 
 #validpgpkeys=('7E1C91AC8030A5A59D1EFAB9750F3C87723E4012') #ISC Code Signing Key 2021 – 2022 (codesign@isc.org)
@@ -114,5 +117,6 @@ sha256sums=(47766bb7b063aabbad054386b190aa7f6c14524427afd427c30ec426512027e7  #
 #	c06fc270e32a843c8b6d86335a2ec607d405dfba6875de8d8a9abde39a9e2c17  # localhost.ip6.zone
 	b88fd2b99e7d42d414b329b814b9ff3304fa0ef9c67df81bde235bbfa0f3a3b8) # 127.0.0.zone
 
-##  1f214e97778dccd9cca2cf1a24607eab80a6772a5e246f1f03c3bf5940dafffa  bind-9.18.12-01-x86_64.pkg.tar.lz
+##  0e86525fa34d0174b6ded383b8c4891fa3a96d37f8de0e7924f35deaed49149e  bind-9.18.12-02-x86_64.pkg.tar.lz
+
 
diff --git a/bind/PKGBUILD-arch b/bind/PKGBUILD-arch
index 787cc49..412996d 100644
--- a/bind/PKGBUILD-arch
+++ b/bind/PKGBUILD-arch
@@ -6,18 +6,15 @@
 _pkgver=9.18.12
 pkgname=bind
 pkgver=${_pkgver//-/.}
-pkgrel=1
+pkgrel=2
 pkgdesc='A complete, highly portable implementation of the DNS protocol'
 url='https://www.isc.org/software/bind/'
 license=('MPL2')
 arch=('x86_64')
 options=('!emptydirs')
-makedepends=('libcap' 'libxml2' 'zlib' 'krb5' 'e2fsprogs' 'openssl' 'readline'
-  'libidn2' 'dnssec-anchors' 'python' 'json-c' 'python-ply' 'lmdb' 'zlib' 'icu'
-  'xz' 'libmaxminddb' 'libnsl' 'libuv' 'python-sphinx')
 depends=('bash' 'dnssec-anchors' 'e2fsprogs' 'glibc' 'icu' 'libedit' 'json-c'
   'krb5' 'libcap' 'libidn2' 'libmaxminddb' 'libnsl' 'libuv' 'libxml2' 'lmdb'
-  'openssl' 'python' 'python-ply' 'readline' 'xz' 'zlib' 'jemalloc')
+  'openssl' 'readline' 'xz' 'zlib' 'jemalloc' 'libnghttp2')
 conflicts=('bind-tools' 'dnsutils')
 replaces=('bind-tools' 'dnsutils' 'host')
 provides=('bind-tools' 'dnsutils' 'dns-server')
@@ -64,8 +61,6 @@ build() {
   export CFLAGS
   # support to chase DNSSEC signature chains
   CFLAGS+=' -DDIG_SIGCHASE'
-  # compile with gcc10, https://gcc.gnu.org/gcc-10/porting_to.html
-  CFLAGS+=' -fcommon'
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -83,6 +78,9 @@ build() {
   make
 }
 
+# No test suite because it requires root.
+# See: https://gitlab.isc.org/isc-projects/bind9/-/blob/main/README.md#testing.
+
 package() {
   cd "bind-$_pkgver"
   install -dm755 "$pkgdir/usr/share/licenses/$pkgname/"
diff --git a/bind/deps b/bind/deps
index 469b4c8..44bc444 100644
--- a/bind/deps
+++ b/bind/deps
@@ -6,18 +6,6 @@ libnsl
 libuv
 libxml2
 lmdb
-python
-python-ply
 jemalloc
-libxml2
-dnssec-anchors
-python
-json-c
-python-ply
-lmdb
-libmaxminddb
-libnsl
-libuv
-python-sphinx
 
 
diff --git a/refind/PKGBUILD b/refind/PKGBUILD
index d66b921..1a51992 100644
--- a/refind/PKGBUILD
+++ b/refind/PKGBUILD
@@ -8,10 +8,9 @@
 #pkgbase=refind
 #pkgname=(refind refind-docs)
 pkgname=refind
-pkgver=0.13.3.1
+pkgver=0.14.0
 pkgrel=01
 pkgdesc="An EFI boot manager"
-arch=(any)
 url="https://www.rodsbooks.com/refind/"
 makedepends=(bash dosfstools efibootmgr gnu-efi)
 source=(https://sourceforge.net/projects/refind/files/$pkgver/$pkgname-src-$pkgver.tar.gz)
@@ -24,14 +23,15 @@ prepare() {
   sed -e 's|../Styles/||g' -i docs/$pkgname/*.html
   # hardcode RefindDir, so that refind-install can find refind_x64.efi
   sed -e 's|RefindDir=\"\$ThisDir/refind\"|RefindDir="/usr/share/refind/"|g' -i refind-install
+  # add vendor line to the sbat file
+  printf 'refind.%s,%s,%s,refind,%s,%s\n' 'arch' '1' 'Arch Linux' "${epoch:+${epoch}:}${pkgver}-${pkgrel}" 'https://archlinux.org/packages/?q=refind' >> refind-sbat.csv
 }
 
 build() {
   cd $pkgname-$pkgver
   make
   make gptsync
-  # NOTE: build can not be parallelized
-  make fs -j1
+  make fs
 }
 
 #package_refind() {
@@ -68,7 +68,7 @@ package() {
   install -vDm 644 icons/*.png -t "$pkgdir/usr/share/$pkgname/icons"
   install -vDm 644 icons/svg/*.svg -t "$pkgdir/usr/share/$pkgname/icons/svg/"
   # scripts
-  install -vDm 755 {refind-{install,mkdefault},mkrlconf,mvrefind} -t "$pkgdir/usr/bin/"
+  install -vDm 755 {refind-{install,mkdefault,sb-healthcheck},mkrlconf,mvrefind} -t "$pkgdir/usr/bin/"
   install -vDm 755 fonts/mkfont.sh "$pkgdir/usr/bin/$pkgname-mkfont"
   # man pages
   install -vDm 644 docs/man/*.8 -t "$pkgdir/usr/share/man/man8/"
@@ -93,10 +93,11 @@ package() {
 
 #---- license gpg-key sha256sums ----
 
+arch=(any)
+
 license=(BSD CCPL GPL2 GPL3 LGPL3)
 
-sha512sums=('7966df5dd8dc66cc49a329ed722a567672da8e2fa3f2334d53db65357cea17cba5a4dc5459e358de1079a938da3c63dc626d096ce28b6bf1fa2964be7359dbd1')
-b2sums=('ab8dd27f82954ea6f9831f827550f27b5ca426b7783e918311ba7e178fc3509698a0107f61d0394a7893318528cb3e0c8491f4522de0a4aca6a40e0749f5a6f9')
+sha256sums=(da5a1ca599381e2ea37376eaa4604fa64ac807580d702670243fe36243d06e20) # refind-src-0.14.0.tar.gz
 
-sha256sums=(7a3e3f0f81bd4ae95f24e120f44e01319231f488fef7cc8bf03a1aea23c6cfd1) # refind-src-0.13.3.1.tar.gz
+##  c4b15ba60ae1963293402189ae809684ffe75d76b86f5c4201222e968c3265b4  refind-0.14.0-01-any.pkg.tar.lz
 
diff --git a/refind/PKGBUILD-arch b/refind/PKGBUILD-arch
index abed14e..bf86f57 100644
--- a/refind/PKGBUILD-arch
+++ b/refind/PKGBUILD-arch
@@ -2,15 +2,15 @@
 
 pkgbase=refind
 pkgname=(refind refind-docs)
-pkgver=0.13.3.1
+pkgver=0.14.0
 pkgrel=1
 pkgdesc="An EFI boot manager"
 arch=(any)
 url="https://www.rodsbooks.com/refind/"
 makedepends=(bash dosfstools efibootmgr gnu-efi)
 source=(https://sourceforge.net/projects/refind/files/$pkgver/$pkgname-src-$pkgver.tar.gz)
-sha512sums=('7966df5dd8dc66cc49a329ed722a567672da8e2fa3f2334d53db65357cea17cba5a4dc5459e358de1079a938da3c63dc626d096ce28b6bf1fa2964be7359dbd1')
-b2sums=('ab8dd27f82954ea6f9831f827550f27b5ca426b7783e918311ba7e178fc3509698a0107f61d0394a7893318528cb3e0c8491f4522de0a4aca6a40e0749f5a6f9')
+sha512sums=('cd05553584187531a581bec051a815b9d507e8005eba6b6301872157cb5e5db9697568a0d4ee853d89b1b60ddc387b95ce83645e785ec7b054e3a4aef903f0a9')
+b2sums=('1862a8ef27ce7e916afb5dd0661b9f0e4d97d3df1391304c75d22d65c571857326310448cbdd8f34e2b5e426cdf2850b5b55c9d31baf765cbd0251528a1d8a88')
 _arch='x64'
 
 prepare() {
@@ -20,14 +20,15 @@ prepare() {
   sed -e 's|../Styles/||g' -i docs/$pkgbase/*.html
   # hardcode RefindDir, so that refind-install can find refind_x64.efi
   sed -e 's|RefindDir=\"\$ThisDir/refind\"|RefindDir="/usr/share/refind/"|g' -i refind-install
+  # add vendor line to the sbat file
+  printf 'refind.%s,%s,%s,refind,%s,%s\n' 'arch' '1' 'Arch Linux' "${epoch:+${epoch}:}${pkgver}-${pkgrel}" 'https://archlinux.org/packages/?q=refind' >> refind-sbat.csv
 }
 
 build() {
   cd $pkgname-$pkgver
   make
   make gptsync
-  # NOTE: build can not be parallelized
-  make fs -j1
+  make fs
 }
 
 package_refind() {
@@ -62,7 +63,7 @@ package_refind() {
   install -vDm 644 icons/*.png -t "$pkgdir/usr/share/$pkgname/icons"
   install -vDm 644 icons/svg/*.svg -t "$pkgdir/usr/share/$pkgname/icons/svg/"
   # scripts
-  install -vDm 755 {refind-{install,mkdefault},mkrlconf,mvrefind} -t "$pkgdir/usr/bin/"
+  install -vDm 755 {refind-{install,mkdefault,sb-healthcheck},mkrlconf,mvrefind} -t "$pkgdir/usr/bin/"
   install -vDm 755 fonts/mkfont.sh "$pkgdir/usr/bin/$pkgname-mkfont"
   # man pages
   install -vDm 644 docs/man/*.8 -t "$pkgdir/usr/share/man/man8/"
diff --git a/refind/deps b/refind/deps
index 36a1e24..4e6ce4e 100644
--- a/refind/deps
+++ b/refind/deps
@@ -1,5 +1,6 @@
 dosfstools
 efibootmgr
 gnu-efi
-
 efivar
+
+