jobcore several upgrades

2023-01-22 18:59:52 +02:00 · 2023-01-22 18:59:52 +02:00 · 52e75aa97b
commit 52e75aa97b
parent 771d2e56f3
102 changed files with 206458 additions and 155 deletions
--- a/binutils/PKGBUILD
+++ b/binutils/PKGBUILD
@ -6,9 +6,11 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------

 pkgname=binutils
-pkgver=2.39
-_commit=9e855cffa1fda44629e7f9b76dfa3e5a51a440e9
-pkgrel=04
+pkgver=2.40
+#_commit=78eca0130feecb321bb6943045b2161583f61dd2
+#pkgrel=01
+_commit=bcea253f5fa194e57f9564e8461c718e228bd26e
+pkgrel=02
 pkgdesc='A set of programs to assemble and manipulate binary and object files'
 arch=(x86_64)
 #url='https://www.gnu.org/software/binutils'
@ -23,6 +25,7 @@ replaces=(binutils-multilib)
 backup=('etc/gprofng.rc')
 options=(staticlibs !distcc !ccache)
 #options=(staticlibs !distcc !ccache debug)  ## uncomment this line to have the debug pkg produced
+# the above was removed by arch in version 2.40-1
 source=(git+https://sourceware.org/git/binutils-gdb.git#commit=${_commit}
        gold-warn-unsupported.patch)

@ -51,12 +54,14 @@ build() {
    --with-lib-path=/usr/lib:/usr/local/lib \
    --with-bugurl=https://bugs.archlinux.org/ \
    --enable-cet \
+    --enable-colored-disassembly \
    --enable-default-execstack=no \
    --enable-deterministic-archives \
    --enable-gold \
    --enable-install-libiberty \
    --enable-jansson \
    --enable-ld=default \
+    --enable-new-dtags \
    --enable-pgo-build=lto \
    --enable-plugins \
    --enable-relro \
@ -110,7 +115,8 @@ package() {

  # No shared linking to these files outside binutils
  rm -f "$pkgdir"/usr/lib/lib{bfd,opcodes}.so
-  echo 'INPUT( /usr/lib/libbfd.a -liberty -lz -ldl )' > "$pkgdir/usr/lib/libbfd.so"
+  echo 'INPUT( /usr/lib/libbfd.a -lsframe -liberty -lz -lzstd -ldl )' > "$pkgdir/usr/lib/libbfd.so"
+#  echo 'INPUT( /usr/lib/libbfd.a -liberty -lz -ldl )' > "$pkgdir/usr/lib/libbfd.so"
  echo 'INPUT( /usr/lib/libopcodes.a -lbfd )' > "$pkgdir/usr/lib/libopcodes.so"

  # install FSF All Permissive License
@ -126,3 +132,6 @@ validpgpkeys=(3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F)
 sha256sums=(SKIP
 	2d430b66f84a19c154725ec535280c493be1d34f1a90f95208dce02fecd0e4e4) # gold-warn-unsupported.patch

+
+##  daebab19a8aa374df721ec28ba88e48ec6e43099e49318b9fd352588e2546876  binutils-2.40-02-x86_64.pkg.tar.xz
+
--- a/binutils/PKGBUILD-arch
+++ b/binutils/PKGBUILD-arch
@ -6,22 +6,22 @@
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->glibc->binutils->gcc

 pkgname=binutils
-pkgver=2.39
-_commit=9e855cffa1fda44629e7f9b76dfa3e5a51a440e9
-pkgrel=3
+pkgver=2.40
+_commit=bcea253f5fa194e57f9564e8461c718e228bd26e
+pkgrel=2
 pkgdesc='A set of programs to assemble and manipulate binary and object files'
 arch=(x86_64)
 url='https://www.gnu.org/software/binutils/'
 license=('GPL3' 'GPL' 'FDL1.3' 'custom:FSFAP')
 groups=(base-devel)
-depends=(glibc zlib libelf jansson)
+depends=(glibc jansson libelf zlib zstd)
 makedepends=(git)
 checkdepends=(dejagnu debuginfod bc)
 optdepends=('debuginfod: for debuginfod server/client functionality')
 conflicts=(binutils-multilib)
 replaces=(binutils-multilib)
 backup=('etc/gprofng.rc')
-options=(staticlibs !distcc !ccache debug)
+options=(staticlibs !distcc !ccache)
 source=(git+https://sourceware.org/git/binutils-gdb.git#commit=${_commit}
        gold-warn-unsupported.patch)
 sha256sums=('SKIP'
@ -53,12 +53,14 @@ build() {
    --with-lib-path=/usr/lib:/usr/local/lib \
    --with-bugurl=https://bugs.archlinux.org/ \
    --enable-cet \
+    --enable-colored-disassembly \
    --enable-default-execstack=no \
    --enable-deterministic-archives \
    --enable-gold \
    --enable-install-libiberty \
    --enable-jansson \
    --enable-ld=default \
+    --enable-new-dtags \
    --enable-pgo-build=lto \
    --enable-plugins \
    --enable-relro \
@ -108,7 +110,7 @@ package() {

  # No shared linking to these files outside binutils
  rm -f "$pkgdir"/usr/lib/lib{bfd,opcodes}.so
-  echo 'INPUT( /usr/lib/libbfd.a -liberty -lz -ldl )' > "$pkgdir/usr/lib/libbfd.so"
+  echo 'INPUT( /usr/lib/libbfd.a -lsframe -liberty -lz -lzstd -ldl )' > "$pkgdir/usr/lib/libbfd.so"
  echo 'INPUT( /usr/lib/libopcodes.a -lbfd )' > "$pkgdir/usr/lib/libopcodes.so"

  # install FSF All Permissive License
--- a/binutils/deps
+++ b/binutils/deps
@ -1,7 +1,6 @@
 dejagnu
 debuginfod
 bc
-libmicrohttpd
 git
 bison

--- a/binutils/time
+++ b/binutils/time
@ -1,25 +1,13 @@
-real	2m47.361s
-user	9m4.310s
-sys	0m34.455s
-
- 
-real	2m47.361s
-user	9m4.310s
-sys	0m34.455s
-
-
-real	13m35.011s
-user	36m42.774s
-sys	2m9.604s
-
- 2.38-07
-real	24m17.915s
-user	33m34.178s
-sys	1m57.920s
-
 binutils 2.39-04 (Thu 06 Oct 2022 01:57:22 PM EEST)

 real	48m30.348s
 user	49m41.806s
 sys	3m0.204s
 
+binutils 2.40.1 (Thu 06 Oct 2022 01:57:22 PM EEST)
+includes git clone time
+
+real	46m9.228s
+user	50m19.184s
+sys	3m1.937s
+ 
--- a/elfutils/PKGBUILD
+++ b/elfutils/PKGBUILD
@ -8,15 +8,15 @@
 pkgbase=elfutils
 pkgname=(debuginfod elfutils libelf)
 pkgver=0.188
-pkgrel=01
+pkgrel=02
 pkgdesc="Handle ELF object files and DWARF debugging information"
 arch=(x86_64)
 url="https://sourceware.org/elfutils/"
 makedepends=(bzip2 curl gcc-libs libarchive libmicrohttpd sqlite xz zlib zstd)
 #options=(debug staticlibs)
 options=(staticlibs)
-source=(https://sourceware.org/$pkgbase/ftp/$pkgver/$pkgbase-$pkgver.tar.bz2{,.sig})
-
+source=(https://sourceware.org/$pkgbase/ftp/$pkgver/$pkgbase-$pkgver.tar.bz2{,.sig}
+        curl_7.85_compat.patch)
 _pick() {
  local p="$1" f d; shift
  for f; do
@ -28,6 +28,12 @@ _pick() {
 }

 prepare() {
+  cd $pkgbase-$pkgver
+  # Use CURLOPT_PROTOCOLS_STR for libcurl >= 7.85.0
+  # https://sourceware.org/git/?p=elfutils.git;a=commit;h=6560fb26a62ef135a804357ef4f15a47de3e49b3
+  patch -Np1 < ../curl_7.85_compat.patch
+  cd ..
+
  # remove failing test due to missing glibc debug package during test: https://bugs.archlinux.org/task/74875
  sed -e 's/run-backtrace-native.sh//g' -i $pkgbase-$pkgver/tests/Makefile.am

@ -137,6 +143,12 @@ license=(LGPL3 GPL3)
 validpgpkeys=(47CC0331081B8BC6D0FD4DA08370665B57816A6A  # Mark J. Wielaard <mark@klomp.org>
 	EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A)  # Mark Wielaard <mjw@gnu.org>

-sha256sums=(fb8b0e8d0802005b9a309c60c1d8de32dd2951b56f0c3a3cb56d21ce01595dff   # elfutils-0.188.tar.bz2
-	f687c7adc1d3ec1e7315388bf8b018fdd8c461232488667edb40d3094192f11a ) # elfutils-0.188.tar.bz2.sig
+sha256sums=(fb8b0e8d0802005b9a309c60c1d8de32dd2951b56f0c3a3cb56d21ce01595dff  # elfutils-0.188.tar.bz2
+	f687c7adc1d3ec1e7315388bf8b018fdd8c461232488667edb40d3094192f11a  # elfutils-0.188.tar.bz2.sig
+	e2bc8e32401c7e325c294c45eee85bdf3a676a9d7f4676ab5620202f36b8ed17) # curl_7.85_compat.patch
+
+
+#93b40c6b65d7e4522a800914c77c625cf5534b56077bb7a40c569bc61453a391  debuginfod-0.188-02-x86_64.pkg.tar.xz
+#6895eeeea87531f6406c5e3462b5d7dbe4bd97c39a0b42f4b2d169bb0f948794  elfutils-0.188-02-x86_64.pkg.tar.xz
+#c5021767b4203fc6fba9d1e23cc8f0a091d48f4c53f892eb30f87d72a26aa75e  libelf-0.188-02-x86_64.pkg.tar.xz

--- a/elfutils/PKGBUILD-arch
+++ b/elfutils/PKGBUILD-arch
@ -6,18 +6,21 @@
 pkgbase=elfutils
 pkgname=(debuginfod elfutils libelf)
 pkgver=0.188
-pkgrel=1
+pkgrel=2
 pkgdesc="Handle ELF object files and DWARF debugging information"
 arch=(x86_64)
 url="https://sourceware.org/elfutils/"
 license=(LGPL3 GPL3)
 makedepends=(bzip2 curl gcc-libs libarchive libmicrohttpd sqlite xz zlib zstd)
-options=(debug staticlibs)
-source=(https://sourceware.org/$pkgbase/ftp/$pkgver/$pkgbase-$pkgver.tar.bz2{,.sig})
+options=(staticlibs)
+source=(https://sourceware.org/$pkgbase/ftp/$pkgver/$pkgbase-$pkgver.tar.bz2{,.sig}
+        curl_7.85_compat.patch)
 sha512sums=('585551b2d937d19d1becfc2f28935db1dd1a3d25571a62f322b70ac8da98c1a741a55d070327705df6c3e2ee026652e0b9a3c733b050a0b0ec5f2fc75d5b74b5'
-            'SKIP')
+            'SKIP'
+            '8f731bf2451ffd195a7da939d469486272873fa9fd19c2dc03a5311814840d7a7242b82de42162efc36404bee9a4fb3a6b85e0eb9fbb81e3c15f989cdd288c37')
 b2sums=('6b0474f1436eaf6af73b735b9b2ddd5448ab9c03fbaa0be745a31c89ae8f15b0e21a651409c38643ca125794ce82c19d7b46db4a079f3e72cb919d643560e7a4'
-        'SKIP')
+        'SKIP'
+        '92b92aefc011b4be7ed00baca28c3447003baa864be58482bf0c220dcd6ad75133c6e34731eaf7e3cc97dbb3e1f85d1fce88cb532c3da37b36802d2c6e7a9e36')
 validpgpkeys=(
  '47CC0331081B8BC6D0FD4DA08370665B57816A6A'  # Mark J. Wielaard <mark@klomp.org>
  'EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A'  # Mark Wielaard <mjw@gnu.org>
@ -34,18 +37,23 @@ _pick() {
 }

 prepare() {
+  cd $pkgbase-$pkgver
+  # Use CURLOPT_PROTOCOLS_STR for libcurl >= 7.85.0
+  # https://sourceware.org/git/?p=elfutils.git;a=commit;h=6560fb26a62ef135a804357ef4f15a47de3e49b3
+  patch -Np1 < ../curl_7.85_compat.patch
+  cd ..
+
  # remove failing test due to missing glibc debug package during test: https://bugs.archlinux.org/task/74875
  sed -e 's/run-backtrace-native.sh//g' -i $pkgbase-$pkgver/tests/Makefile.am
-
  (
    cd $pkgbase-$pkgver
    autoreconf -fiv
  )

  cp -av $pkgbase-$pkgver $pkgbase-test-$pkgver
-
 }

+
 build() {
  local configure_options=(
    --prefix=/usr
--- a/elfutils/curl_7.85_compat.patch
+++ b/elfutils/curl_7.85_compat.patch
@ -0,0 +1,60 @@
+diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
+index a16165bd1..1ce456327 100644
+--- a/debuginfod/debuginfod-client.c
+++ b/debuginfod/debuginfod-client.c
+@@ -1336,8 +1336,13 @@ debuginfod_query_server (debuginfod_client *c,
+
+       /* Only allow http:// + https:// + file:// so we aren't being
+ 	 redirected to some unsupported protocol.  */
+#if CURL_AT_LEAST_VERSION(7, 85, 0)
+      curl_easy_setopt_ck(data[i].handle, CURLOPT_PROTOCOLS_STR,
+			  "http,https,file");
+#else
+       curl_easy_setopt_ck(data[i].handle, CURLOPT_PROTOCOLS,
+ 			  (CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FILE));
+#endif
+       curl_easy_setopt_ck(data[i].handle, CURLOPT_URL, data[i].url);
+       if (vfd >= 0)
+ 	curl_easy_setopt_ck(data[i].handle, CURLOPT_ERRORBUFFER,
+diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
+index 8873fcc8c..692aeccec 100644
+--- a/debuginfod/debuginfod-client.c
+++ b/debuginfod/debuginfod-client.c
+@@ -1456,7 +1456,7 @@ debuginfod_query_server (debuginfod_client *c,
+              deflate-compressing proxies, this number is likely to be
+              unavailable, so -1 may show. */
+           CURLcode curl_res;
+-#ifdef CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
+#if CURL_AT_LEAST_VERSION(7, 55, 0)
+           curl_off_t cl;
+           curl_res = curl_easy_getinfo(target_handle,
+                                        CURLINFO_CONTENT_LENGTH_DOWNLOAD_T,
+@@ -1491,7 +1491,7 @@ debuginfod_query_server (debuginfod_client *c,
+           if (target_handle) /* we've committed to a server; report its download progress */
+             {
+               CURLcode curl_res;
+-#ifdef CURLINFO_SIZE_DOWNLOAD_T
+#if CURL_AT_LEAST_VERSION(7, 55, 0)
+               curl_off_t dl;
+               curl_res = curl_easy_getinfo(target_handle,
+                                            CURLINFO_SIZE_DOWNLOAD_T,
+diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
+index 692aeccec..a16165bd1 100644
+--- a/debuginfod/debuginfod-client.c
+++ b/debuginfod/debuginfod-client.c
+@@ -105,6 +105,13 @@ void debuginfod_end (debuginfod_client *c) { }
+   #include <fts.h>
+ #endif
+
+/* Older curl.h don't define CURL_AT_LEAST_VERSION.  */
+#ifndef CURL_AT_LEAST_VERSION
+  #define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z))
+  #define CURL_AT_LEAST_VERSION(x,y,z) \
+    (LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(x, y, z))
+#endif
+
+ #include <pthread.h>
+
+ static pthread_once_t init_control = PTHREAD_ONCE_INIT;
+--
+2.31.1
--- a/elfutils/deps
+++ b/elfutils/deps
@ -4,4 +4,3 @@ libmicrohttpd
 automake


-
--- a/elfutils/failed.tests
+++ b/elfutils/failed.tests
@ -0,0 +1,20 @@
+============================================================================
+Testsuite summary for elfutils 0.188
+============================================================================
+# TOTAL: 261
+# PASS:  224
+# SKIP:  30
+# XFAIL: 0
+# FAIL:  7
+# XPASS: 0
+# ERROR: 0
+============================================================================
+See tests/test-suite.log
+Please report to https://sourceware.org/bugzilla
+============================================================================
+make[3]: *** [Makefile:2615: test-suite.log] Error 1
+make[2]: *** [Makefile:2723: check-TESTS] Error 2
+make[1]: *** [Makefile:4616: check-am] Error 2
+make: *** [Makefile:533: check-recursive] Error 1
+make: Leaving directory '/src/pkg/jobcore/elfutils/src/elfutils-test-0.188'
+==> ERROR: A failure occurred in check().
--- a/elfutils/time
+++ b/elfutils/time
@ -1,5 +1,6 @@

-real	3m7.326s
-user	5m43.685s
-sys	0m41.607s

+real	3m56.656s
+user	3m33.915s
+sys	0m28.388s
+ 
--- a/eudev/deps.tmp
+++ b/eudev/deps.tmp
@ -0,0 +1,2 @@
+autoconf automake linux-lts-headers
+gobject-introspection gperf gtk-doc intltool
--- a/filesystem/artix.diff
+++ b/filesystem/artix.diff
@ -0,0 +1,85 @@
+[1m--- PKGBUILD-artix.new	2022-10-19 19:57:37.000000000 +0300[0m
+[1m+++ PKGBUILD-artix	2022-03-30 20:50:03.066596712 +0300[0m
+[36m@@ -1,8 +1,8 @@[0m
+[31m-# Maintainer: artoo <artoo@artixlinux.org>[0m
+[32m+# Maintainer: Sébastien Luttringer[0m
+ # Contributor: Tom Gundersen <teg@jklm.no>
+ 
+ pkgname=filesystem
+[31m-pkgver=2022.10.18[0m
+[32m+pkgver=2021.12.07[0m
+ pkgrel=1
+ pkgdesc='Base Artix Linux files'
+ arch=('x86_64')
+[36m@@ -12,39 +12,36 @@[0m
+ backup=('etc/crypttab' 'etc/fstab' 'etc/group' 'etc/gshadow' 'etc/host.conf'
+         'etc/hosts' 'etc/issue' 'etc/ld.so.conf' 'etc/nsswitch.conf'
+         'etc/passwd' 'etc/profile' 'etc/resolv.conf' 'etc/securetty'
+[31m-        'etc/shadow' 'etc/shells' 'etc/subuid' 'etc/subgid')[0m
+[31m-source=('crypttab' 'env-generator' 'fstab' 'group' 'gshadow' 'host.conf' 'hosts'[0m
+[31m-        'issue' 'ld.so.conf' 'locale.sh' 'nsswitch.conf' 'os-release' 'profile'[0m
+[31m-        'passwd' 'resolv.conf' 'securetty' 'shadow' 'shells' 'sysctl' 'sysusers'[0m
+[31m-        'tmpfiles' 'subuid' 'subgid' 'artixlinux-logo.svg' 'artixlinux-logo.png'[0m
+[31m-        'artixlinux-logo-text.svg' 'artixlinux-logo-text-dark.svg')[0m
+[32m+        'etc/shadow' 'etc/shells')[0m
+[32m+source=('crypttab' 'fstab' 'group' 'gshadow' 'host.conf' 'hosts'[0m
+[32m+        'issue' 'ld.so.conf' 'locale.sh' 'nsswitch.conf' 'os-release'[0m
+[32m+        'passwd' 'profile' 'resolv.conf' 'securetty' 'shadow' 'shells' 'sysctl'[0m
+[32m+        'sysusers' 'tmpfiles' 'artixlinux.svg' 'artixlinux.png'[0m
+[32m+        'artixlinux-logo.svg' 'artixlinux-logo.png')[0m
+ sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82'
+[31m-            'ed0cb4f1db4021f8c3b5ce78fdf91d2c0624708f58f36c9cf867f4d93c3bc6da'[0m
+             'e54626e74ed8fee4173b62a545ab1c3a3a069e4217a0ee8fc398d9933e9c1696'
+             '244f0718ee2a9d6862ae59d6c18c1dd1568651eada91a704574fa527fbac2b3a'
+             '90d879374f77bac47f132164c1e7fc4892e994ff1d1ac376efa0c1c26ea37273'
+             '4d7b647169063dfedbff5e1e22cee77bd1a4183dbcfd5e802e68939da4bbf733'
+             'd9cd8a77d9e0aa5e90d7f4ed74c8745c17b525e720e28e4c44364150003c35f9'
+[31m-            '9e5f1c492e6ad1c246ae71a55a4ff0eca9909bbbc2c6034fd70f31ab86c868eb'[0m
+[32m+            'fe86e5d282e55658fdc9c383eabbabb0ba2d791be04814082230ac8a9c056452'[0m
+             'dad04a370e488aa85fb0a813a5c83cf6fd981ce01883fc59685447b092de84b5'
+             '8ca2d8eef6fb5143c9ef7e9174ccfef59ac7ad2deee243574cd10c763156cc10'
+[31m-            '62855224620a1e6dcfb2373460387bf0b7870ebe0595a61bbbc74919710d7641'[0m
+[31m-            '1aa33ce150ddb33b815f0b45425948e16020fcfb0a54ecc997b49778d5643978'[0m
+[31m-            'f86a0b98d5fee4aae0e11a61fa0a1a4061927d5ca80753329285f87376acf2b6'[0m
+[32m+            'aa4dc5b2374fb32863e3bc1ce20a2de2d34fe4eed1cd63c599bc82fab21463cc'[0m
+[32m+            'fe9bb5b7ef357e38ef2efb5bee32a0ac495f55cb14d573e0e1b59a6ede43213d'[0m
+             '5e06477834f51abf42ea4e8dc199632afc6afbfd8c44354685a271e9a48d2c0a'
+[32m+            'f86a0b98d5fee4aae0e11a61fa0a1a4061927d5ca80753329285f87376acf2b6'[0m
+             '5557d8e601b17a80d1ea7de78a9869be69637cb6a02fbfe334e22fdf64e61d4c'
+             'd88be2b45b43605ff31dd83d6a138069b6c2e92bc8989b7b9ab9eba8da5f8c7b'
+             '6e13705ac4d6f69cdba118c6b70c722346fd3c45224133e6bbfe28aca719563c'
+             'c390b31fffc4a2b5d78ae8c89f5317aadef1f71baac09cfb467b675db1406d61'
+             '89e43a0b7028f52d5c8e7fb961d962c4b4f4e9595880a6157274ddb2c7c0b6b4'
+             'd6b0e95e3cdf663d3383f883301f5ed6cf900cccb7cba0c268ab8f6e78177d16'
+[31m-            '5d8e61479f0093852365090e84d8d95b1e7fccfab068274ee25863bde6ff3e07'[0m
+[31m-            'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'[0m
+[31m-            'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'[0m
+[31m-            '02302481e97d88b2bd548bbfe54aadd1611fd3aa09911fd8b7eb1208cde4351d'[0m
+[31m-            '1242caf07c6c3aa4ac600b5f2401a7422c85cbdc9ed9ef41357b068355c6a45b'[0m
+[32m+            'f17efd1c6480c5db1fdab4a0e3cfcd4baa44a3e1ae1210aebeb40f8d5c82f742'[0m
+             '7b8fffc06755488931ce2aa4d3f9547be650d9e873323b7171515004d02e83c1'
+[31m-            '7b8fffc06755488931ce2aa4d3f9547be650d9e873323b7171515004d02e83c1')[0m
+[32m+            'f52db4a98fbfdd6d957068ea0e631240c9a138df859fc43d902bf97b0759459d'[0m
+[32m+            '02302481e97d88b2bd548bbfe54aadd1611fd3aa09911fd8b7eb1208cde4351d'[0m
+[32m+            '1242caf07c6c3aa4ac600b5f2401a7422c85cbdc9ed9ef41357b068355c6a45b')[0m
+ 
+ package() {
+   cd "$pkgdir"
+[36m@@ -64,7 +61,7 @@[0m
+   # setup /etc and /usr/share/factory/etc
+   install -d etc/{ld.so.conf.d,skel,profile.d} usr/share/factory/etc
+   for f in fstab group host.conf hosts issue ld.so.conf nsswitch.conf \
+[31m-  passwd resolv.conf securetty shells profile subuid subgid; do[0m
+[32m+  passwd resolv.conf securetty shells profile; do[0m
+     install -m644 "$srcdir"/$f etc/
+     install -m644 "$srcdir"/$f usr/share/factory/etc/
+   done
+[36m@@ -125,7 +122,7 @@[0m
+   install -D -m644 "$srcdir"/tmpfiles usr/lib/tmpfiles.d/artix.conf
+ 
+   # add logo
+[31m-  install -D -m644 "$srcdir"/artixlinux-logo{.png,.svg,-text.svg,-text-dark.svg} usr/share/pixmaps[0m
+[32m+  install -D -m644 "$srcdir"/artixlinux{,-logo}.{svg,png} usr/share/pixmaps[0m
+ }
+ 
+ # vim:set ts=2 sw=2 et:
--- a/filesystem/group.1
+++ b/filesystem/group.1
@ -0,0 +1,3 @@
+root:x:0:root
+nobody:x:99:
+users:x:100:
--- a/filesystem/group.2
+++ b/filesystem/group.2
@ -0,0 +1 @@
+root:x:0:root
--- a/gcc/PKGBUILD
+++ b/gcc/PKGBUILD
@ -13,9 +13,9 @@
 # Unfortunately we have no extra time to research the evolution of the latest kernels.

 pkgname=(gcc gcc-libs lib32-gcc-libs gcc-fortran gcc-objc gcc-ada gcc-go gcc-d lto-dump libgccjit)
-pkgver=12.2.0
+pkgver=12.2.1
 _majorver=${pkgver%%.*}
-_commit=2ee5e4300186a92ad73f1a1a64cb918dc76c8d67
+_commit=eec3a65ed638a1c58fa08ddf508d2d60b64d311d
 pkgrel=01
 pkgdesc='The GNU Compiler Collection'
 arch=(x86_64)
@ -273,6 +273,12 @@ package_gcc() {
  # many packages expect this symlink
  ln -s gcc "$pkgdir"/usr/bin/cc

+  # create cc-rs compatible symlinks
+  # https://github.com/rust-lang/cc-rs/blob/1.0.73/src/lib.rs#L2578-L2581
+  for binary in {c++,g++,gcc,gcc-ar,gcc-nm,gcc-ranlib}; do
+    ln -s /usr/bin/${binary} "${pkgdir}"/usr/bin/x86_64-linux-gnu-${binary}
+  done
+
  # POSIX conformance launcher scripts for c89 and c99
  install -Dm755 "$srcdir/c89" "$pkgdir/usr/bin/c89"
  install -Dm755 "$srcdir/c99" "$pkgdir/usr/bin/c99"
@ -494,3 +500,15 @@ sha256sums=(SKIP
 	2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a # c99
 	1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f) # gcc-ada-repro.patch

+
+#20f8e2186f95bdf2dab97259ee8abc23e85a614659d886c28fa0391a178000b7  gcc-12.2.1-01-x86_64.pkg.tar.xz
+#1ad59cab86585538cec5f63a9cc214d9ad62b9d4d00715d281dc0909cd654a5d  gcc-ada-12.2.1-01-x86_64.pkg.tar.xz
+#8a2e912f51bcbfdddffab0b1497ed77f1d816eddc42c9f9ddb05a20a1e2e7e89  gcc-d-12.2.1-01-x86_64.pkg.tar.xz
+#4a1f3c39ca55dda9bb8bc7634857c4637dccf06b5927dc513a40dcb65cf04cd3  gcc-fortran-12.2.1-01-x86_64.pkg.tar.xz
+#80357a5de72d2ce035263771d59e51cde03736f920679b2c82043674a55d7d8c  gcc-go-12.2.1-01-x86_64.pkg.tar.xz
+#8545302ee01700e162329276ffd509571520079521963dea299f443cff7c3449  gcc-libs-12.2.1-01-x86_64.pkg.tar.xz
+#85f19fd525c533e7ef308debd30068f50b9451fd2f8c284aa4556e20950cec39  gcc-objc-12.2.1-01-x86_64.pkg.tar.xz
+#ac01b5392206f1fc37d413a1702f5181f2cccd6a84963d235b30df36f559a437  lib32-gcc-libs-12.2.1-01-x86_64.pkg.tar.xz
+#5b016c4dc14051cce2cec726a86bfa701ca73d7b47acc01b070c289850f35719  libgccjit-12.2.1-01-x86_64.pkg.tar.xz
+#dade8d6fd13e080a258b330f271f985895e9c5653b970d1e71b078e3856c335f  lto-dump-12.2.1-01-x86_64.pkg.tar.xz
+
--- a/gcc/PKGBUILD-arch
+++ b/gcc/PKGBUILD-arch
@ -8,9 +8,9 @@
 # NOTE: libtool requires rebuilt with each new gcc version

 pkgname=(gcc gcc-libs lib32-gcc-libs gcc-fortran gcc-objc gcc-ada gcc-go gcc-d lto-dump libgccjit)
-pkgver=12.2.0
+pkgver=12.2.1
 _majorver=${pkgver%%.*}
-_commit=2ee5e4300186a92ad73f1a1a64cb918dc76c8d67
+_commit=eec3a65ed638a1c58fa08ddf508d2d60b64d311d
 pkgrel=1
 pkgdesc='The GNU Compiler Collection'
 arch=(x86_64)
@ -37,10 +37,8 @@ checkdepends=(
  python-pytest
  tcl
 )
-options=(!emptydirs !lto debug)
+options=(!emptydirs !lto)
 _libdir=usr/lib/gcc/$CHOST/${pkgver%%+*}
-# _commit=6beb39ee6c465c21d0cc547fd66b445100cdcc35
-# source=(git://gcc.gnu.org/git/gcc.git#commit=$_commit
 source=(git+https://sourceware.org/git/gcc.git#commit=${_commit}
        c89 c99
        gcc-ada-repro.patch
@ -209,7 +207,7 @@ package_gcc() {
  optdepends=('lib32-gcc-libs: for generating code for 32-bit ABI')
  provides=($pkgname-multilib)
  replaces=($pkgname-multilib)
-  options=(!emptydirs staticlibs debug)
+  options=(!emptydirs staticlibs)

  cd gcc-build

@ -267,6 +265,12 @@ package_gcc() {
  # many packages expect this symlink
  ln -s gcc "$pkgdir"/usr/bin/cc

+  # create cc-rs compatible symlinks
+  # https://github.com/rust-lang/cc-rs/blob/1.0.73/src/lib.rs#L2578-L2581
+  for binary in {c++,g++,gcc,gcc-ar,gcc-nm,gcc-ranlib}; do
+    ln -s /usr/bin/${binary} "${pkgdir}"/usr/bin/x86_64-linux-gnu-${binary}
+  done
+
  # POSIX conformance launcher scripts for c89 and c99
  install -Dm755 "$srcdir/c89" "$pkgdir/usr/bin/c89"
  install -Dm755 "$srcdir/c99" "$pkgdir/usr/bin/c99"
@ -332,7 +336,7 @@ package_gcc-ada() {
  depends=("gcc=$pkgver-$pkgrel" libisl.so)
  provides=($pkgname-multilib)
  replaces=($pkgname-multilib)
-  options=(!emptydirs staticlibs debug)
+  options=(!emptydirs staticlibs)

  cd gcc-build/gcc
  make DESTDIR="$pkgdir" ada.install-{common,info}
@ -430,7 +434,7 @@ package_gcc-d() {
  depends=("gcc=$pkgver-$pkgrel" libisl.so)
  provides=(gdc)
  replaces=(gdc)
-  options=(staticlibs debug)
+  options=(staticlibs)

  cd gcc-build
  make -C gcc DESTDIR="$pkgdir" d.install-{common,man,info}
--- a/gcc/time
+++ b/gcc/time
@ -36,3 +36,11 @@ real	499m37.091s
 user	853m2.644s
 sys	22m1.434s

+12.2.1-01
+
+real	442m17.005s
+user	816m48.195s
+sys	21m56.182s
+ 
+
+
--- a/glib2/PKGBUILD
+++ b/glib2/PKGBUILD
@ -8,7 +8,7 @@
 #pkgbase=glib2
 #pkgname=(glib2 glib2-docs)
 pkgname=glib2
-pkgver=2.74.4
+pkgver=2.74.5
 pkgrel=01
 # this is a waste of resources rebuilding this for the shake of catching up
 # to arch's late decision to be building debug symbol packages along with the core pkg
@ -23,7 +23,7 @@ makedepends=(gettext shared-mime-info python libelf git util-linux
 #checkdepends=(desktop-file-utils glib2)
 #options=(debug staticlibs)  ###  uncomment this to have the debug pkg produced
 options=(staticlibs)
-_commit=e35768fe299d6389f8f5eef15593762389d2c07d  # tags/2.74.4^0
+_commit=39a71aff372ed491a24ca84409d9f93bc7c5d6d4  # tags/2.74.5^0
 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
         "git+https://gitlab.gnome.org/GNOME/gvdb.git"
         0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
@ -122,5 +122,3 @@ sha256sums=(SKIP
 	92d08db5aa30bda276bc3d718e7ff9dd01dc40dcab45b359182dcc290054e24e  # gio-querymodules.script
 	64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25) # glib-compile-schemas.hook

-
-
--- a/glib2/PKGBUILD-arch
+++ b/glib2/PKGBUILD-arch
@ -3,7 +3,7 @@

 pkgbase=glib2
 pkgname=(glib2 glib2-docs)
-pkgver=2.74.4
+pkgver=2.74.5
 pkgrel=1
 pkgdesc="Low level core library"
 url="https://wiki.gnome.org/Projects/GLib"
@ -35,7 +35,7 @@ options=(
  debug
  staticlibs
 )
-_commit=e35768fe299d6389f8f5eef15593762389d2c07d  # tags/2.74.4^0
+_commit=39a71aff372ed491a24ca84409d9f93bc7c5d6d4  # tags/2.74.5^0
 source=(
  "git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
  "git+https://gitlab.gnome.org/GNOME/gvdb.git"
--- a/glibc/PKGBUILD
+++ b/glibc/PKGBUILD
@ -11,8 +11,8 @@
 pkgbase=glibc
 pkgname=(glibc lib32-glibc)
 pkgver=2.36
-_commit=2bd815d8347851212b9a91dbdca8053f4dbdac87
-pkgrel=06
+_commit=93967a2a7bbdcedb73e0b246713580c7c84d001e
+pkgrel=07
 arch=(x86_64)
 url='https://www.gnu.org/software/libc'
 makedepends=(git gd lib32-gcc-libs python)
@ -234,3 +234,7 @@ sha256sums=(SKIP
 	cdc234959c6fdb43f000d3bb7d1080b0103f4080f5e67bcfe8ae1aaf477812f0 # sdt-config.h
 	bb2fc5a38158d339a51a4aaab3fe2d5cc496221f77cfce6f74768db91cb5ec1e) # reenable_DT_HASH.patch

+
+#  aa7f6a3a2a3234136236a26219ad436f2bb341a77b71bfe8b2ba6b6d2adbb013  glibc-2.36-07-x86_64.pkg.tar.xz
+#  53b49e099b646f9d1d4df9a55790e062a4128e88b557c0d10fd407fd02b75af3  lib32-glibc-2.36-07-x86_64.pkg.tar.xz
+
--- a/glibc/PKGBUILD-arch
+++ b/glibc/PKGBUILD-arch
@ -9,13 +9,13 @@
 pkgbase=glibc
 pkgname=(glibc lib32-glibc)
 pkgver=2.36
-_commit=2bd815d8347851212b9a91dbdca8053f4dbdac87
-pkgrel=6
+_commit=93967a2a7bbdcedb73e0b246713580c7c84d001e
+pkgrel=7
 arch=(x86_64)
 url='https://www.gnu.org/software/libc'
 license=(GPL LGPL)
 makedepends=(git gd lib32-gcc-libs python)
-options=(debug staticlibs !lto)
+options=(staticlibs !lto)
 source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
        locale.gen.txt
        locale-gen
--- a/glibc/deps
+++ b/glibc/deps
@ -6,3 +6,4 @@ bison
 libjpeg-turbo


+libgit2
--- a/glibc/time
+++ b/glibc/time
@ -1,5 +1,6 @@

-real	22m8.296s
-user	19m48.961s
-sys	2m52.720s

+real	26m24.374s
+user	22m44.066s
+sys	4m10.551s
+ 
--- a/gpgme/0001-python-3-10.patch
+++ b/gpgme/0001-python-3-10.patch
@ -0,0 +1,332 @@
+diff -upr gpgme-1.16.0.orig/configure gpgme-1.16.0/configure
+--- gpgme-1.16.0.orig/configure	2021-06-24 20:10:50.000000000 +0300
+++ gpgme-1.16.0/configure	2021-12-01 00:12:24.383952330 +0200
+@@ -19625,7 +19625,7 @@ $as_echo_n "checking for $am_display_PYT
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -19666,7 +19666,7 @@ else:
+ # <https://github.com/pypa/virtualenv/issues/118>
+ try:
+     from platform import python_implementation
+-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
+    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
+         can_use_sysconfig = 0
+ except ImportError:
+     pass"
+@@ -19875,7 +19875,7 @@ variable to configure. See \`\`configure
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+ 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-	if test -z "$ac_distutils_result"; then
+	if test $? -eq 0; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+@@ -19933,7 +19933,7 @@ EOD`
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[:3])"`
+					print (sys.version[:4])"`
+ 			fi
+ 		fi
+ 
+@@ -20255,7 +20255,7 @@ $as_echo_n "checking for $am_display_PYT
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -20296,7 +20296,7 @@ else:
+ # <https://github.com/pypa/virtualenv/issues/118>
+ try:
+     from platform import python_implementation
+-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
+    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
+         can_use_sysconfig = 0
+ except ImportError:
+     pass"
+@@ -20505,7 +20505,7 @@ variable to configure. See \`\`configure
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+ 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-	if test -z "$ac_distutils_result"; then
+	if test $? -eq 0; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+@@ -20563,7 +20563,7 @@ EOD`
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[:3])"`
+					print (sys.version[:4])"`
+ 			fi
+ 		fi
+ 
+@@ -20885,7 +20885,7 @@ $as_echo_n "checking for $am_display_PYT
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -20926,7 +20926,7 @@ else:
+ # <https://github.com/pypa/virtualenv/issues/118>
+ try:
+     from platform import python_implementation
+-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
+    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
+         can_use_sysconfig = 0
+ except ImportError:
+     pass"
+@@ -21135,7 +21135,7 @@ variable to configure. See \`\`configure
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+ 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-	if test -z "$ac_distutils_result"; then
+	if test $? -eq 0; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+@@ -21193,7 +21193,7 @@ EOD`
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[:3])"`
+					print (sys.version[:4])"`
+ 			fi
+ 		fi
+ 
+@@ -21515,7 +21515,7 @@ $as_echo_n "checking for $am_display_PYT
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -21556,7 +21556,7 @@ else:
+ # <https://github.com/pypa/virtualenv/issues/118>
+ try:
+     from platform import python_implementation
+-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
+    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
+         can_use_sysconfig = 0
+ except ImportError:
+     pass"
+@@ -21765,7 +21765,7 @@ variable to configure. See \`\`configure
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+ 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-	if test -z "$ac_distutils_result"; then
+	if test $? -eq 0; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+@@ -21823,7 +21823,7 @@ EOD`
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[:3])"`
+					print (sys.version[:4])"`
+ 			fi
+ 		fi
+ 
+@@ -22145,7 +22145,7 @@ $as_echo_n "checking for $am_display_PYT
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -22186,7 +22186,7 @@ else:
+ # <https://github.com/pypa/virtualenv/issues/118>
+ try:
+     from platform import python_implementation
+-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
+    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
+         can_use_sysconfig = 0
+ except ImportError:
+     pass"
+@@ -22395,7 +22395,7 @@ variable to configure. See \`\`configure
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+ 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-	if test -z "$ac_distutils_result"; then
+	if test $? -eq 0; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+@@ -22453,7 +22453,7 @@ EOD`
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[:3])"`
+					print (sys.version[:4])"`
+ 			fi
+ 		fi
+ 
+@@ -22775,7 +22775,7 @@ $as_echo_n "checking for $am_display_PYT
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -22816,7 +22816,7 @@ else:
+ # <https://github.com/pypa/virtualenv/issues/118>
+ try:
+     from platform import python_implementation
+-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
+    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
+         can_use_sysconfig = 0
+ except ImportError:
+     pass"
+@@ -23025,7 +23025,7 @@ variable to configure. See \`\`configure
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+ 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-	if test -z "$ac_distutils_result"; then
+	if test $? -eq 0; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+@@ -23083,7 +23083,7 @@ EOD`
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[:3])"`
+					print (sys.version[:4])"`
+ 			fi
+ 		fi
+ 
+@@ -23291,13 +23291,13 @@ $as_echo "$as_me: WARNING:
+ 
+         if test -n "$PYTHON"; then
+       # If the user set $PYTHON, use it and don't search something else.
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.9" >&5
+-$as_echo_n "checking whether $PYTHON version is >= 3.9... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.10" >&5
+$as_echo_n "checking whether $PYTHON version is >= 3.10... " >&6; }
+       prog="import sys
+ # split strings by '.' and convert to numeric.  Append some zeros
+ # because we need at least 4 digits for the hex conversion.
+ # map returns an iterator in Python 3.0 and a list in 2.x
+-minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0]
+minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0]
+ minverhex = 0
+ # xrange is not present in Python 3.0 and range returns an iterator
+ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
+@@ -23318,19 +23318,19 @@ fi
+     else
+       # Otherwise, try each interpreter until we find one that satisfies
+       # VERSION.
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.9" >&5
+-$as_echo_n "checking for a Python interpreter with version >= 3.9... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.10" >&5
+$as_echo_n "checking for a Python interpreter with version >= 3.10... " >&6; }
+ if ${am_cv_pathless_PYTHON+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+-	for am_cv_pathless_PYTHON           in python3.9 none; do
+	for am_cv_pathless_PYTHON           in python3.10 none; do
+ 	  test "$am_cv_pathless_PYTHON" = none && break
+ 	  prog="import sys
+ # split strings by '.' and convert to numeric.  Append some zeros
+ # because we need at least 4 digits for the hex conversion.
+ # map returns an iterator in Python 3.0 and a list in 2.x
+-minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0]
+minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0]
+ minverhex = 0
+ # xrange is not present in Python 3.0 and range returns an iterator
+ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
+@@ -23405,7 +23405,7 @@ $as_echo_n "checking for $am_display_PYT
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -23446,7 +23446,7 @@ else:
+ # <https://github.com/pypa/virtualenv/issues/118>
+ try:
+     from platform import python_implementation
+-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
+    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
+         can_use_sysconfig = 0
+ except ImportError:
+     pass"
+@@ -23655,7 +23655,7 @@ variable to configure. See \`\`configure
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+ 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-	if test -z "$ac_distutils_result"; then
+	if test $? -eq 0; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+@@ -23713,7 +23713,7 @@ EOD`
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[:3])"`
+					print (sys.version[:4])"`
+ 			fi
+ 		fi
+ 
+@@ -24035,7 +24035,7 @@ $as_echo_n "checking for $am_display_PYT
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -24076,7 +24076,7 @@ else:
+ # <https://github.com/pypa/virtualenv/issues/118>
+ try:
+     from platform import python_implementation
+-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
+    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
+         can_use_sysconfig = 0
+ except ImportError:
+     pass"
+@@ -24285,7 +24285,7 @@ variable to configure. See \`\`configure
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+ 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-	if test -z "$ac_distutils_result"; then
+	if test $? -eq 0; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+@@ -24343,7 +24343,7 @@ EOD`
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[:3])"`
+					print (sys.version[:4])"`
+ 			fi
+ 		fi
+ 
--- a/gpgme/0002-python-setup.patch
+++ b/gpgme/0002-python-setup.patch
@ -0,0 +1,166 @@
+commit ae9258fbf3b9d434495ef11fc184a91fe7c4ca57
+Author: NIIBE Yutaka <gniibe@fsij.org>
+Date:   Thu Sep 15 13:46:23 2022 +0900
+
+    build:python: Don't use gpg-error-config/gpgme-config.
+    
+    * lang/python/setup.py.in: Use @prefix@, @GPGME_CONFIG_LIBS@,
+    @GPGME_CONFIG_CFLAGS@, and @GPG_ERROR_CFLAGS@ of configure.
+    
+    --
+    
+    GnuPG-bug-id: 6204
+    Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+
+diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
+index 9785a282..6741d3c8 100755
+--- a/lang/python/setup.py.in
+++ b/lang/python/setup.py.in
+@@ -30,9 +30,6 @@ import subprocess
+ import sys
+ 
+ # Out-of-tree build of the gpg bindings.
+-gpg_error_config = ['gpg-error-config']
+-gpgme_config_flags = ['--thread=pthread']
+-gpgme_config = ['gpgme-config'] + gpgme_config_flags
+ gpgme_h = ''
+ include_dirs = [os.getcwd()]
+ library_dirs = []
+@@ -44,8 +41,6 @@ top_builddir = os.environ.get('top_builddir')
+ if top_builddir:
+     # In-tree build.
+     in_tree = True
+-    gpgme_config = [os.path.join(top_builddir, 'src/gpgme-config')
+-                    ] + gpgme_config_flags
+     gpgme_h = os.path.join(top_builddir, 'src/gpgme.h')
+     library_dirs = [os.path.join(top_builddir,
+                                  'src/.libs')]  # XXX uses libtool internals
+@@ -60,20 +55,8 @@ if hasattr(subprocess, 'DEVNULL'):
+ else:
+     devnull = open(os.devnull, 'w')
+ 
+-try:
+-    subprocess.check_call(gpgme_config + ['--version'], stdout=devnull)
+-except:
+-    sys.exit('Could not find gpgme-config.  ' +
+-             'Please install the libgpgme development package.')
+ 
+-
+-def getconfig(what, config=gpgme_config):
+-    confdata = subprocess.Popen(
+-        config + ['--%s' % what], stdout=subprocess.PIPE).communicate()[0]
+-    return [x for x in confdata.decode('utf-8').split() if x != '']
+-
+-
+-version = version_raw = getconfig('version')[0]
+version = version_raw = "@VERSION@"
+ if '-' in version:
+     version = version.split('-')[0]
+ major, minor, patch = map(int, version.split('.'))
+@@ -82,17 +65,17 @@ if not (major > 1 or (major == 1 and minor >= 7)):
+     sys.exit('Need at least GPGME version 1.7, found {}.'.format(version_raw))
+ 
+ if not gpgme_h:
+-    gpgme_h = os.path.join(getconfig('prefix')[0], 'include', 'gpgme.h')
+    gpgme_h = os.path.join('@prefix@', 'include', 'gpgme.h')
+ 
+ define_macros = []
+-libs = getconfig('libs')
+libs = '@GPGME_CONFIG_LIBS@'.split(' ')
+ 
+ # Define extra_macros for both the SWIG and C code
+ for k, v in extra_macros.items():
+     extra_swig_opts.append('-D{0}={1}'.format(k, v))
+     define_macros.append((k, str(v)))
+ 
+-for item in getconfig('cflags'):
+for item in '@GPGME_CONFIG_CFLAGS@'.split(' '):
+     if item.startswith('-I'):
+         include_dirs.append(item[2:])
+     elif item.startswith('-D'):
+@@ -182,15 +165,8 @@ class BuildExtFirstHack(build):
+ 
+     def _generate_errors_i(self):
+ 
+-        try:
+-            subprocess.check_call(
+-                gpg_error_config + ['--version'], stdout=devnull)
+-        except:
+-            sys.exit('Could not find gpg-error-config.  ' +
+-                     'Please install the libgpg-error development package.')
+-
+         gpg_error_content = self._read_header(
+-            'gpg-error.h', getconfig('cflags', config=gpg_error_config))
+            'gpg-error.h', '@GPG_ERROR_CFLAGS@'.split(' '))
+ 
+         filter_re = re.compile(r'GPG_ERR_[^ ]* =')
+         rewrite_re = re.compile(r' *(.*) = .*')
+
+commit f1802682c3c8794edaca37966405bd1f070f5e01
+Author: NIIBE Yutaka <gniibe@fsij.org>
+Date:   Wed Oct 26 11:02:36 2022 +0900
+
+    python: Fix configure generating setup.py.
+    
+    * lang/python/setup.py.in: Handle the case, when substitutions
+    may be empty.
+    
+    --
+    
+    Reported-by: Andreas Metzler
+    Fixes-commit: ae9258fbf3b9d434495ef11fc184a91fe7c4ca57
+    GnuPG-bug-id: 6204
+    Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+
+diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
+index 6741d3c8..6f36861d 100755
+--- a/lang/python/setup.py.in
+++ b/lang/python/setup.py.in
+@@ -68,22 +68,26 @@ if not gpgme_h:
+     gpgme_h = os.path.join('@prefix@', 'include', 'gpgme.h')
+ 
+ define_macros = []
+-libs = '@GPGME_CONFIG_LIBS@'.split(' ')
+if '@GPGME_CONFIG_LIBS@':
+    libs = '@GPGME_CONFIG_LIBS@'.split(' ')
+else:
+    libs = []
+ 
+ # Define extra_macros for both the SWIG and C code
+ for k, v in extra_macros.items():
+     extra_swig_opts.append('-D{0}={1}'.format(k, v))
+     define_macros.append((k, str(v)))
+ 
+-for item in '@GPGME_CONFIG_CFLAGS@'.split(' '):
+-    if item.startswith('-I'):
+-        include_dirs.append(item[2:])
+-    elif item.startswith('-D'):
+-        defitem = item[2:].split('=', 1)
+-        if len(defitem) == 2:
+-            define_macros.append((defitem[0], defitem[1]))
+-        else:
+-            define_macros.append((defitem[0], None))
+if '@GPGME_CONFIG_CFLAGS@':
+    for item in '@GPGME_CONFIG_CFLAGS@'.split(' '):
+        if item.startswith('-I'):
+            include_dirs.append(item[2:])
+        elif item.startswith('-D'):
+            defitem = item[2:].split('=', 1)
+            if len(defitem) == 2:
+                define_macros.append((defitem[0], defitem[1]))
+            else:
+                define_macros.append((defitem[0], None))
+ 
+ # Adjust include and library locations in case of win32
+ uname_s = os.popen('uname -s').read()
+@@ -165,8 +169,9 @@ class BuildExtFirstHack(build):
+ 
+     def _generate_errors_i(self):
+ 
+        ge_cflags='@GPG_ERROR_CFLAGS@'
+         gpg_error_content = self._read_header(
+-            'gpg-error.h', '@GPG_ERROR_CFLAGS@'.split(' '))
+            'gpg-error.h', ge_cflags.split(' ') if ge_cflags else [])
+ 
+         filter_re = re.compile(r'GPG_ERR_[^ ]* =')
+         rewrite_re = re.compile(r' *(.*) = .*')
--- a/gpgme/PKGBUILD
+++ b/gpgme/PKGBUILD
@ -8,7 +8,7 @@
 pkgbase=gpgme
 pkgname=(gpgme qgpgme python-gpgme)
 pkgver=1.18.0
-pkgrel=01
+pkgrel=02  # renamed one patch and added 2nd
 _python_ver=3.10
 pkgdesc="A C wrapper library for GnuPG"
 arch=('x86_64')
@ -16,11 +16,15 @@ arch=('x86_64')
 url='https://www.gnupg.org/related_software/gpgme/'
 makedepends=('libgpg-error' 'gnupg' 'qt5-base' 'python' 'swig')
 source=("https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}
-        python310.patch)
+#        python310.patch) --> 0001-***
+        0001-python-3-10.patch
+        0002-python-setup.patch)

 prepare() {
  cd ${pkgbase}-${pkgver}
-  patch -Np1 -i ../python310.patch
+
+  patch -Np1 -i ../0001-python-3-10.patch
+  patch -Np1 -i ../0002-python-setup.patch
 }

 build() {
@ -41,17 +45,17 @@ build() {

 }

-check() {
-  cd ${pkgbase}-${pkgver}
-
-  # this test fails with gnupg (FS#66572)
-  sed -i 's#"t-keylist-secret",##' tests/json/t-json.c
-
-  make check
-
-  # ensure reproducibilty whether test-suite is run or not
-  find . -name *.pyc -exec rm {} +
-}
+#check() {
+#  cd ${pkgbase}-${pkgver}
+#
+#  # this test fails with gnupg (FS#66572)
+#  sed -i 's#"t-keylist-secret",##' tests/json/t-json.c
+#
+#  make check
+#
+#  # ensure reproducibilty whether test-suite is run or not
+#  find . -name *.pyc -exec rm {} +
+#}

 package_gpgme() {
  depends=('libgpg-error' 'gnupg>=2')
@ -90,10 +94,12 @@ package_python-gpgme() {

 license=('LGPL')

-validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA') # Werner Koch (dist signing 2020)
-
-sha256sums=(361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e # gpgme-1.18.0.tar.bz2
-	105c722a34526516b9cc53e5690ee8c29651a9dcd3a0235f4009e94ef4fd684d # gpgme-1.18.0.tar.bz2.sig
-	5de2f6bcb6b30642d0cbc3fbd86803c9460d732f44a526f44cedee8bb78d291a) # python310.patch
+validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020)
+              'AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD') # Niibe Yutaka (GnuPG Release Key)

+sha256sums=(361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e  # gpgme-1.18.0.tar.bz2
+	f09812d9a1ea513aa10a06c878d351eacf7f48110e200db3cfc7961412e240aa  # gpgme-1.18.0.tar.bz2.sig
+##	105c722a34526516b9cc53e5690ee8c29651a9dcd3a0235f4009e94ef4fd684d # gpgme-1.18.0.tar.bz2.sig  ## Added Yutaka to sig
+            5de2f6bcb6b30642d0cbc3fbd86803c9460d732f44a526f44cedee8bb78d291a  # 0001-python-3-10.patch
+            84fb13e9afa549027469e0d1a1bad69bf786b63ef6359a5d65320bd226dcccc7) # 0002-python-setup.patch

--- a/gpgme/PKGBUILD-arch
+++ b/gpgme/PKGBUILD-arch
@ -5,24 +5,28 @@
 pkgbase=gpgme
 pkgname=(gpgme qgpgme python-gpgme)
 pkgver=1.18.0
-pkgrel=1
+pkgrel=2
 _python_ver=3.10
 pkgdesc='A C wrapper library for GnuPG'
 arch=('x86_64')
 url='https://www.gnupg.org/related_software/gpgme/'
 license=('LGPL')
 makedepends=('libgpg-error' 'gnupg' 'qt5-base' 'python' 'swig')
-options=('debug')
-validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA') # Werner Koch (dist signing 2020)
+validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA'  # Werner Koch (dist signing 2020)
+              'AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD') # Niibe Yutaka (GnuPG Release Key)
 source=("https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}
-        python310.patch)
+        '0001-python-3-10.patch'
+        '0002-python-setup.patch')
 sha256sums=('361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e'
            'SKIP'
-            '5de2f6bcb6b30642d0cbc3fbd86803c9460d732f44a526f44cedee8bb78d291a')
+            '5de2f6bcb6b30642d0cbc3fbd86803c9460d732f44a526f44cedee8bb78d291a'
+            '84fb13e9afa549027469e0d1a1bad69bf786b63ef6359a5d65320bd226dcccc7')

 prepare() {
  cd ${pkgbase}-${pkgver}
-  patch -Np1 -i ../python310.patch
+
+  patch -Np1 -i ../0001-python-3-10.patch
+  patch -Np1 -i ../0002-python-setup.patch
 }

 build() {
--- a/gpgme/key
+++ b/gpgme/key
@ -1 +1,2 @@
 gpg -v --recv-key 528897B826403ADA
+gpg -v --recv-key E98E9B2D19C6C8BD
--- a/grub/PKGBUILD
+++ b/grub/PKGBUILD
@ -20,8 +20,8 @@ _GRUB_EMU_BUILD="0"
 pkgname='grub'
 pkgdesc='GNU GRand Unified Bootloader (2)'
 epoch=2
-_commit='7259d55ffcf124e32eafb61aa381f9856e98a708'
-_pkgver=2.06.r403.g7259d55ff
+_commit='4de39a2af6521631d24978eb23035b7608949174'
+_pkgver=2.06.r440.g4de39a2af
 _unifont_ver='15.0.01'
 pkgver=${_pkgver/-/}
 pkgrel=01
@ -59,7 +59,6 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#commit=${_commit}"
        "https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig}
        '0001-00_header-add-GRUB_COLOR_-variables.patch'
        '0002-10_linux-detect-archlinux-initramfs.patch'
-        '0003-fix-f2fs.patch'
        'grub.default'
        'grub.default.run'
        'grub.default.66'
@ -120,9 +119,6 @@ prepare() {

 	patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch"

-	echo "Patch to fix f2fs..."
-	patch -Np1 -i "${srcdir}/0003-fix-f2fs.patch"
-
 	echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..."
 	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"

@ -330,7 +326,6 @@ sha256sums=(SKIP
 	7d2bfe94e8365d4178b849d6c12c40794e7af84ed6eebd878ac480f547fd38d0  # unifont-15.0.01.bdf.gz.sig
 	5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab  # 0001-00_header-add-GRUB_COLOR_-variables.patch
 	8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d  # 0002-10_linux-detect-archlinux-initramfs.patch
-	b783ec919b22e628d3db91ede4571272ffa833d20ab42eccace15258a884c26b  # 0003-fix-f2fs.patch
 	83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96  # grub.default
 	83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96  # grub.default.run
 	adad61d98de32e241a1cf55a166699de449533fa16e15e97a326515f80639ef7  # grub.default.66
--- a/grub/PKGBUILD-arch
+++ b/grub/PKGBUILD-arch
@ -18,8 +18,8 @@ _GRUB_EMU_BUILD="0"
 pkgname='grub'
 pkgdesc='GNU GRand Unified Bootloader (2)'
 epoch=2
-_commit='7259d55ffcf124e32eafb61aa381f9856e98a708'
-_pkgver=2.06.r403.g7259d55ff
+_commit='4de39a2af6521631d24978eb23035b7608949174'
+_pkgver=2.06.r440.g4de39a2af
 _unifont_ver='15.0.01'
 pkgver=${_pkgver/-/}
 pkgrel=1
@ -62,7 +62,6 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#commit=${_commit}"
        "https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig}
        '0001-00_header-add-GRUB_COLOR_-variables.patch'
        '0002-10_linux-detect-archlinux-initramfs.patch'
-        '0003-fix-f2fs.patch'
        'grub.default'
        'sbat.csv')

@ -72,7 +71,6 @@ sha256sums=('SKIP'
            'SKIP'
            '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
            '8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'
-            'b783ec919b22e628d3db91ede4571272ffa833d20ab42eccace15258a884c26b'
            '7df3f5cb5df7d2dfb17f4c9b5c5dedc9519ddce6f8d2c6cd43d1be17cecb65cb'
            '98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df')

@ -130,9 +128,6 @@ prepare() {
 	echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..."
 	patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch"

-	echo "Patch to fix f2fs..."
-	patch -Np1 -i "${srcdir}/0003-fix-f2fs.patch"
-
 	echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..."
 	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"

--- a/gssproxy/PKGBUILD-arch-b4-9
+++ b/gssproxy/PKGBUILD-arch-b4-9
@ -0,0 +1,77 @@
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Mantas Mikulėnas <grawity@gmail.com>
+
+pkgname=gssproxy
+pkgver=0.8.4
+pkgrel=1
+pkgdesc="GSSAPI Proxy"
+arch=(x86_64)
+url="https://github.com/gssapi/gssproxy"
+license=('custom: MIT')
+depends=('krb5' 'popt' 'ding-libs')
+makedepends=('libxslt' 'systemd' 'docbook-xsl' 'doxygen'  'po4a')
+options=('emptydirs' 'makeflags')
+backup=(etc/gssproxy/{gssproxy,24-nfs-server,80-httpd,99-nfs-client}.conf
+        etc/gss/mech.d/gssproxy.conf)
+source=(https://github.com/gssapi/gssproxy/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz)
+sha512sums=('ab81c40d6c7b1908751feb107d8da66603b7681fb67aa7a1f30194a81d542ca89e6c2f34425e9356b9c55eb3691bfa240ba41441c01498af45e862a133cd088a')
+
+prepare() {
+  cd "$srcdir/gssproxy-$pkgver"
+  # delete unneeded service dependency
+  sed -i "/# GSSPROXY will not be started until syslog is/d" systemd/gssproxy.service.in
+  sed -i "s/syslog.target //" systemd/gssproxy.service.in
+  
+  autoreconf -vfi
+}
+
+build() {
+  cd gssproxy-$pkgver
+
+  # make it find bundled verto from krb5 without its own pkg-config file
+  export VERTO_CFLAGS="-I/usr/include"
+  export VERTO_LIBS="-L/usr/lib -lverto"
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc  \
+    --with-pubconf-path=/etc/gssproxy \
+    --sbindir=/usr/bin \
+    --localstatedir=/var \
+    --without-selinux \
+    --with-initscript=systemd \
+    --with-gpp-default-behavior=REMOTE_FIRST
+
+  make
+}
+
+check() {
+  cd "$pkgname"-$pkgver
+  make test_proxymech
+}
+
+
+package() {
+  cd gssproxy-$pkgver
+  make DESTDIR=$pkgdir install
+  
+  # cleanup empty directories
+  rm -rf "$pkgdir"/usr/include
+  rm -rf "$pkgdir"/usr/share/doc
+
+  # install default config files
+  install -m644 examples/gssproxy.conf "$pkgdir"/etc/gssproxy/gssproxy.conf
+  # nfs services
+  install -m644 examples/24-nfs-server.conf "$pkgdir"/etc/gssproxy/24-nfs-server.conf
+  install -m644 examples/99-nfs-client.conf "$pkgdir"/etc/gssproxy/99-nfs-client.conf
+  # httpd service / use Arch UID/GID http/33 (by pkg filesystem)
+  install -m644 examples/80-httpd.conf "$pkgdir"/etc/gssproxy/80-httpd.conf
+  sed -i -e "s:euid = apache:euid = http:" "$pkgdir"/etc/gssproxy/80-httpd.conf