upg glibc binutils grub dhclient dhcp iproute2 pacman

2022-10-06 20:59:58 +03:00 · 2022-10-06 20:59:58 +03:00 · 13a137317a
parent ad12d8f421
commit 13a137317a
19 changed files with 81 additions and 113 deletions
--- a/binutils/PKGBUILD
+++ b/binutils/PKGBUILD
@ -7,8 +7,8 @@

 pkgname=binutils
 pkgver=2.39
-_commit=b51c2fec1da205ea3e7354cbb3e253018d64873c
-pkgrel=03
+_commit=9e855cffa1fda44629e7f9b76dfa3e5a51a440e9
+pkgrel=04
 pkgdesc='A set of programs to assemble and manipulate binary and object files'
 arch=(x86_64)
 #url='https://www.gnu.org/software/binutils'
@ -20,6 +20,7 @@ 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)
 #options=(staticlibs !distcc !ccache debug)  ## uncomment this line to have the debug pkg produced
 source=(git+https://sourceware.org/git/binutils-gdb.git#commit=${_commit}
@ -46,9 +47,11 @@ build() {

  "$srcdir/binutils-gdb/configure" \
    --prefix=/usr \
+    --sysconfdir="${pkgdir}"/etc \
    --with-lib-path=/usr/lib:/usr/local/lib \
    --with-bugurl=https://bugs.archlinux.org/ \
    --enable-cet \
+    --enable-default-execstack=no \
    --enable-deterministic-archives \
    --enable-gold \
    --enable-install-libiberty \
--- a/binutils/PKGBUILD-arch
+++ b/binutils/PKGBUILD-arch
@ -7,8 +7,8 @@

 pkgname=binutils
 pkgver=2.39
-_commit=b51c2fec1da205ea3e7354cbb3e253018d64873c
-pkgrel=2
+_commit=9e855cffa1fda44629e7f9b76dfa3e5a51a440e9
+pkgrel=3
 pkgdesc='A set of programs to assemble and manipulate binary and object files'
 arch=(x86_64)
 url='https://www.gnu.org/software/binutils/'
@ -20,6 +20,7 @@ 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)
 source=(git+https://sourceware.org/git/binutils-gdb.git#commit=${_commit}
        gold-warn-unsupported.patch)
@ -48,9 +49,11 @@ build() {

  "$srcdir/binutils-gdb/configure" \
    --prefix=/usr \
+    --sysconfdir="${pkgdir}"/etc \
    --with-lib-path=/usr/lib:/usr/local/lib \
    --with-bugurl=https://bugs.archlinux.org/ \
    --enable-cet \
+    --enable-default-execstack=no \
    --enable-deterministic-archives \
    --enable-gold \
    --enable-install-libiberty \
--- a/binutils/time
+++ b/binutils/time
@ -17,3 +17,9 @@ 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
+ 
--- a/dhclient/PKGBUILD
+++ b/dhclient/PKGBUILD
@ -9,9 +9,9 @@ pkgbase=dhcp
 pkgname=('dhcp' 'dhclient')

 # separate patch levels with a period to maintain proper versioning.
-_realver=4.4.3
+_realver=4.4.3-P1
 pkgver=${_realver/-/.}
-pkgrel=03
+pkgrel=01
 arch=('x86_64')
 url='https://www.isc.org/dhcp/'
 makedepends=('bash' 'iproute2' 'openldap')
@ -98,9 +98,8 @@ license=('custom:isc-dhcp')

 validpgpkeys=('7E1C91AC8030A5A59D1EFAB9750F3C87723E4012') # Internet Systems Consortium, Inc. (Signing key, 2021-2022) <codesign@isc.org>

-sha256sums=(0e3ec6b4c2a05ec0148874bcd999a66d05518378d77421f607fb0bc9d0135818 # dhcp-4.4.3.tar.gz
-	7cc76060099bf5058364b38fce502e58e221c42ade909bba266cc1a97bfc3900 # dhcp-4.4.3.tar.gz.asc
+sha256sums=(0ac416bb55997ca8632174fd10737fd61cdb8dba2752160a335775bc21dc73c7 # dhcp-4.4.3-P1.tar.gz
+	4295715b00f2368877bb59017c70fbbb738d5d654442b3bfec34e0d7f53306be # dhcp-4.4.3-P1.tar.gz.asc
 	f3dd5fe585eae18a982bfdbe163f3e3749057cb595ee59a154348094109351c2 # 0001-99-replace-hostname-with-uname-n.patch
 	b16083e6bb572ffacaa7cd97e7fde5fcfa1b6dbeb166f162e2ec6e8ec4b928d6 # dhcp-sysusers.conf
 	abcd30e9e8428e34d22ab4d3074ef4bd84c2b11f5868597111b47d6f56d204da) # dhcp-tmpfiles.conf
-
--- a/dhclient/PKGBUILD-arch
+++ b/dhclient/PKGBUILD-arch
@ -5,9 +5,9 @@ pkgbase=dhcp
 pkgname=('dhcp' 'dhclient')

 # separate patch levels with a period to maintain proper versioning.
-_realver=4.4.3
+_realver=4.4.3-P1
 pkgver=${_realver/-/.}
-pkgrel=2
+pkgrel=1
 arch=('x86_64')
 license=('custom:isc-dhcp')
 url='https://www.isc.org/dhcp/'
@ -21,9 +21,9 @@ source=("https://downloads.isc.org/isc/${pkgbase}/${_realver}/${pkgbase}-${_real
        'dhcpd4.service'
        'dhcpd6.service'
        'dhclient@.service')
-sha256sums=('0e3ec6b4c2a05ec0148874bcd999a66d05518378d77421f607fb0bc9d0135818'
+sha256sums=('0ac416bb55997ca8632174fd10737fd61cdb8dba2752160a335775bc21dc73c7'
            'SKIP'
-            'f3dd5fe585eae18a982bfdbe163f3e3749057cb595ee59a154348094109351c2'
+            '559ed9ce6318f1a3700f8b879552bd22844c7c5b96622202dbf3164cd99c444e'
            'b16083e6bb572ffacaa7cd97e7fde5fcfa1b6dbeb166f162e2ec6e8ec4b928d6'
            'abcd30e9e8428e34d22ab4d3074ef4bd84c2b11f5868597111b47d6f56d204da'
            '03fce30efab819b2d928085b0bab962a33ce56fc376acae98ad9b30aa278c9c8'
--- a/dhclient/deps
+++ b/dhclient/deps
@ -1,2 +1,3 @@
 openldap

+
--- a/glibc/PKGBUILD
+++ b/glibc/PKGBUILD
@ -11,8 +11,8 @@
 pkgbase=glibc
 pkgname=(glibc lib32-glibc)
 pkgver=2.36
-_commit=645d94808aaa90fb1b20a25ff70bb50d9eb1d55b
-pkgrel=04
+_commit=da5f134f6d59701a3a6119309ae91c93c3fa5b51
+pkgrel=05
 arch=(x86_64)
 url='https://www.gnu.org/software/libc'
 makedepends=(git gd lib32-gcc-libs python)
@ -179,8 +179,10 @@ package_glibc() {
  install -m644 "$srcdir/locale.gen.txt" "$pkgdir/etc/locale.gen"
  sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
    "$srcdir/glibc/localedata/SUPPORTED" >> "$pkgdir/etc/locale.gen"
-  # Add SUPPORTED file
-  install -m644 "${srcdir}"/glibc/localedata/SUPPORTED "${pkgdir}"/usr/share/i18n/SUPPORTED
+
+  # Add SUPPORTED file to pkg
+  sed -e '1,3d' -e 's|/| |g' -e 's| \\||g' \
+    "${srcdir}"/glibc/localedata/SUPPORTED > "${pkgdir}"/usr/share/i18n/SUPPORTED

  # install C.UTF-8 so that it is always available
  install -dm755 "$pkgdir/usr/lib/locale"
@ -225,7 +227,7 @@ validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell
              BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar

 sha256sums=(SKIP
-	d42648cea552ba5353a32e264686e992263289d5cc86207314dffc54ab514981 # locale.gen.txt
+	2a7dd6c906b6c54a68f48a21898664a32fdb136cbd9ff7bfd48f01d1aaa649ae # locale.gen.txt
 	8c5cc09018cbd65e8570430f872e118caa2644e311d6200b7d5f0cba837fbba4 # locale-gen
 	c27424154a6096ae32c0824b785e05de6acef33d9224fd6147d1936be9b4962b # lib32-glibc.conf
 	774061aff612a377714a509918a9e0e0aafce708b87d2d7e06b1bd1f6542fe70 # sdt.h
--- a/glibc/PKGBUILD-arch
+++ b/glibc/PKGBUILD-arch
@ -9,8 +9,8 @@
 pkgbase=glibc
 pkgname=(glibc lib32-glibc)
 pkgver=2.36
-_commit=645d94808aaa90fb1b20a25ff70bb50d9eb1d55b
-pkgrel=4
+_commit=da5f134f6d59701a3a6119309ae91c93c3fa5b51
+pkgrel=5
 arch=(x86_64)
 url='https://www.gnu.org/software/libc'
 license=(GPL LGPL)
@ -26,7 +26,7 @@ source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
 validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell
              BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar
 b2sums=('SKIP'
-        '23c772feb247e6b5216b7962528617e53730267cb0913fd184edd6d3f59a4874ee7a864a56c48eb6e2936abadb30fc53166477b733a8a3e973932d79370c7b24'
+        'c859bf2dfd361754c9e3bbd89f10de31f8e81fd95dc67b77d10cb44e23834b096ba3caa65fbc1bd655a8696c6450dfd5a096c476b3abf5c7e125123f97ae1a72'
        '04fbb3b0b28705f41ccc6c15ed5532faf0105370f22133a2b49867e790df0491f5a1255220ff6ebab91a462f088d0cf299491b3eb8ea53534cb8638a213e46e3'
        '7c265e6d36a5c0dff127093580827d15519b6c7205c2e1300e82f0fb5b9dd00b6accb40c56581f18179c4fbbc95bd2bf1b900ace867a83accde0969f7b609f8a'
        'a6a5e2f2a627cc0d13d11a82458cfd0aa75ec1c5a3c7647e5d5a3bb1d4c0770887a3909bfda1236803d5bc9801bfd6251e13483e9adf797e4725332cd0d91a0e'
@ -185,8 +185,9 @@ package_glibc() {
  sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
    "${srcdir}"/glibc/localedata/SUPPORTED >> "${pkgdir}"/etc/locale.gen

-  # Add SUPPORTED file
-  install -m644 "${srcdir}"/glibc/localedata/SUPPORTED "${pkgdir}"/usr/share/i18n/SUPPORTED
+  # Add SUPPORTED file to pkg
+  sed -e '1,3d' -e 's|/| |g' -e 's| \\||g' \
+    "${srcdir}"/glibc/localedata/SUPPORTED > "${pkgdir}"/usr/share/i18n/SUPPORTED

  # install C.UTF-8 so that it is always available
  install -dm755 "${pkgdir}"/usr/lib/locale
--- a/glibc/locale.gen.txt
+++ b/glibc/locale.gen.txt
@ -9,15 +9,9 @@
 #  where <locale> is one of the locales given in /usr/share/i18n/locales
 #  and <charset> is one of the character sets listed in /usr/share/i18n/charmaps
 #
-#  Examples:
-#  en_US ISO-8859-1
-#  en_US.UTF-8 UTF-8
-#  de_DE ISO-8859-1
-#  de_DE@euro ISO-8859-15
-#
 #  The locale-gen command will generate all the locales,
 #  placing them in /usr/lib/locale.
 #
-#  A list of supported locales is included in this file.
-#  Uncomment the ones you need.
+#  A list of supported locales is given in /usr/share/i18n/SUPPORTED
+#  and is included in this file. Uncomment the needed locales below.
 #
--- a/grub/PKGBUILD
+++ b/grub/PKGBUILD
@ -20,11 +20,11 @@ _GRUB_EMU_BUILD="0"
 pkgname='grub'
 pkgdesc='GNU GRand Unified Bootloader (2)'
 epoch=2
-_commit='d9b4638c50b16d4722e66d334e2c1a674b4a45cc'
-_pkgver=2.06.r322.gd9b4638c5
-_unifont_ver='14.0.04'
+_commit='34037747033879287864be289abb911a29751634'
+_pkgver=2.06.r334.g340377470
+_unifont_ver='15.0.01'
 pkgver=${_pkgver/-/}
-pkgrel=04
+pkgrel=01
 url='https://www.gnu.org/software/grub/'
 arch=('x86_64')
 backup=('etc/default/grub'
@ -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-kern-efi-mm-increase-default-heap-size.patch'
        'grub.default'
        'grub.default.run'
        'grub.default.66'
@ -120,8 +119,8 @@ prepare() {

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

-	echo "Patch to increase default heap size..."
-	patch -Np1 -i "${srcdir}/0003-kern-efi-mm-increase-default-heap-size.patch"
+#	echo "Patch to increase default heap size..."
+#	patch -Np1 -i "${srcdir}/0003-kern-efi-mm-increase-default-heap-size.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"
@ -326,11 +325,10 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209'  # Vladimir 'phcoder' S

 sha256sums=(SKIP
 	SKIP
-	0bad2b8a46fcc4864c7b4cee4072653a58b9f36e2f54a5a395c7d6dc97766526 # unifont-14.0.04.bdf.gz
-	c43bf8ae5ca345aff1e7bd7e1aa50834a90db99c8cc1cdc6b0b65a3f71f45797 # unifont-14.0.04.bdf.gz.sig
+	1fddba900a36b8a067bf2177b05c4a2482a0f7ca1545cf531c03509f47ce1590 # unifont-15.0.01.bdf.gz
+	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
-	5529b5ef0cc735106b39b27329a6d1360323195cc2e75148d323ec0e681ed398 # 0003-kern-efi-mm-increase-default-heap-size.patch
 	83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96 # grub.default
 	83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96 # grub.default.run
 	adad61d98de32e241a1cf55a166699de449533fa16e15e97a326515f80639ef7 # grub.default.66
--- a/grub/PKGBUILD-arch
+++ b/grub/PKGBUILD-arch
@ -18,11 +18,11 @@ _GRUB_EMU_BUILD="0"
 pkgname='grub'
 pkgdesc='GNU GRand Unified Bootloader (2)'
 epoch=2
-_commit='d9b4638c50b16d4722e66d334e2c1a674b4a45cc'
-_pkgver=2.06.r322.gd9b4638c5
-_unifont_ver='14.0.04'
+_commit='34037747033879287864be289abb911a29751634'
+_pkgver=2.06.r334.g340377470
+_unifont_ver='15.0.01'
 pkgver=${_pkgver/-/}
-pkgrel=4
+pkgrel=1
 url='https://www.gnu.org/software/grub/'
 arch=('x86_64')
 license=('GPL3')
@ -62,17 +62,15 @@ 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-kern-efi-mm-increase-default-heap-size.patch'
        'grub.default'
        'sbat.csv')

 sha256sums=('SKIP'
            'SKIP'
-            '0bad2b8a46fcc4864c7b4cee4072653a58b9f36e2f54a5a395c7d6dc97766526'
+            '1fddba900a36b8a067bf2177b05c4a2482a0f7ca1545cf531c03509f47ce1590'
            'SKIP'
            '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
            '8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'
-            '5529b5ef0cc735106b39b27329a6d1360323195cc2e75148d323ec0e681ed398'
            'c17bf255a41103f6b71a1710afc7e9addaebc578bcf51a48845e227b2f651682'
            '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 increase default heap size..."
-	patch -Np1 -i "${srcdir}/0003-kern-efi-mm-increase-default-heap-size.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/iproute2/PKGBUILD
+++ b/iproute2/PKGBUILD
@ -7,8 +7,8 @@

 ##  rebuild after any libbpf upgrade ##
 pkgname=iproute2
-pkgver=5.19.0
-pkgrel=03
+pkgver=6.0.0
+pkgrel=01
 pkgdesc='IP Routing Utilities'
 arch=('x86_64')
 url='https://git.kernel.org/pub/scm/network/iproute2/iproute2.git'
@ -67,9 +67,8 @@ license=('GPL2')

 validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger

-sha256sums=(26b7a34d6a7fd2f7a42e2b39c5a90cb61bac522d1096067ffeb195e5693d7791 # iproute2-5.19.0.tar.xz
-	6a25f5d6c2b0d099adce2722e2f891cc0d12347a14950d251c9be158d10aedce # iproute2-5.19.0.tar.sign
+sha256sums=(523139e9e72aec996374fa2de74be4c53d2dd05589488934d21ff97bae19580a # iproute2-6.0.0.tar.xz
+	391efc43ca1b2748d687c94b5bda47d874efa4ba82a565daa9c1f396c309591b # iproute2-6.0.0.tar.sign
 	758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d) #  0001-make-iproute2-fhs-compliant.patch
-#	837a64189b949afae951655546967cc8f17f2f2cf370faabff00575364f0fcf7) # 0002-iproute2.patch


--- a/iproute2/PKGBUILD-arch
+++ b/iproute2/PKGBUILD-arch
@ -3,8 +3,8 @@
 # Contributor: Judd Vinet <jvinet@zeroflux.org>

 pkgname=iproute2
-pkgver=5.19.0
-pkgrel=2
+pkgver=6.0.0
+pkgrel=1
 pkgdesc='IP Routing Utilities'
 arch=('x86_64')
 license=('GPL2')
@ -28,7 +28,7 @@ options=('staticlibs' 'debug')
 validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
 source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
        '0001-make-iproute2-fhs-compliant.patch')
-sha256sums=('26b7a34d6a7fd2f7a42e2b39c5a90cb61bac522d1096067ffeb195e5693d7791'
+sha256sums=('523139e9e72aec996374fa2de74be4c53d2dd05589488934d21ff97bae19580a'
            'SKIP'
            '758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d')

--- a/iproute2/deps
+++ b/iproute2/deps
@ -3,4 +3,3 @@ bison
 gettext


-
--- a/iproute2/time
+++ b/iproute2/time
@ -1,5 +1,6 @@

-real	0m28.172s
-user	1m13.450s
-sys	0m5.576s

+real	0m49.095s
+user	0m45.317s
+sys	0m4.531s
+ 
--- a/pacman/PKGBUILD
+++ b/pacman/PKGBUILD
@ -6,8 +6,8 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------

 pkgname=pacman
-pkgver=6.0.1
-pkgrel=09
+pkgver=6.0.2
+pkgrel=01
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 url="https://www.archlinux.org/pacman/"
@ -23,24 +23,11 @@ backup=(etc/pacman.conf
 #options=('strip' 'debug')
 options=(strip)
 source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig}
-	"fix-wkd-lookup.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/e1246baddd14ec6f4b6270b59bea0e1b639472a7.patch"
-	add-flto-to-LDFLAGS-for-clang.patch
-#	sync_first_option.patch    # an Obarun patch that ensures upgraded keyrings preceed
-#	remaining upgrades, so new packages don't get rejected
-	makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch
-	libmakepkg-add-extra-buildflags-only-when-buildflags.patch
-	make-link-time-optimization-flags-configurable.patch
 	pacman.conf
 	makepkg.conf)

 prepare() {
  cd "$pkgname-$pkgver"
-  patch -Np1 -i ../add-flto-to-LDFLAGS-for-clang.patch
-#  patch -Np1 -i ../sync_first_option.patch  # 
-  patch -Np1 -i ../makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch
-  patch -Np1 -i ../libmakepkg-add-extra-buildflags-only-when-buildflags.patch
-  patch -Np1 -i ../make-link-time-optimization-flags-configurable.patch
-  patch -Np1 -i ../fix-wkd-lookup.patch
 }

 build() {
@ -82,14 +69,9 @@ license=('GPL')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan@archlinux.org>
 	      'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org>

-sha256sums=(0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731 # pacman-6.0.1.tar.xz
-	34671ed2cd6715696fbd7a7675d264e21065c1145d4d94751b212d68abd5bc19 # pacman-6.0.1.tar.xz.sig
-	8ab5b1338874d7d58e11c5d1185ea3454fcc89755f9c18faf87ff348ad1ed16c # fix-wkd-lookup.patch
-	82ff91b85f4c6ceba19f9330437e2a22aabc966c2b9e2a20a53857f98a42c223 # add-flto-to-LDFLAGS-for-clang.patch
-#	0ac2908abc7ee33b25e49713f1f4cc325ca32ef34dc5f1bf95ba7b00a69ca68c # sync_first_option.patch
-	b940e6c0c05a185dce1dbb9da0dcbebf742fca7a63f3e3308d49205afe5a6582 # makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch
-	7d0aee976c9c71fcf7c96ef1d99aa76efe47d8c1f4451842d6d159ec7deb4278 # libmakepkg-add-extra-buildflags-only-when-buildflags.patch
-	5b43e26a76be3ed10a69d4bfb2be48db8cce359baf46583411c7f124737ebe6a # make-link-time-optimization-flags-configurable.patch
+sha256sums=(7d8e3e8c5121aec0965df71f59bedf46052c6cf14f96365c4411ec3de0a4c1a5 # pacman-6.0.2.tar.xz
+	e3b75fafa8f177752800b31b9d59c454694647ae39b02a8009384a6821ee3be3 # pacman-6.0.2.tar.xz.sig
 	aa2e113eba452b9d9fef85aa87333370ae2d3bb0e06df4b0776e04c3ec76d028 # pacman.conf
 	7e1af6a61b1b8565b5d608ba77b435e55585ad8acb7b106585458124a020c462) # makepkg.conf

+
--- a/pacman/PKGBUILD-arch
+++ b/pacman/PKGBUILD-arch
@ -1,9 +1,9 @@
 # vim: set ts=2 sw=2 et:
-# Maintainer: 
+# Maintainer: Morten Linderud <foxboron@archlinux.org>

 pkgname=pacman
-pkgver=6.0.1
-pkgrel=7
+pkgver=6.0.2
+pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 url="https://www.archlinux.org/pacman/"
@ -21,33 +21,14 @@ options=('strip' 'debug')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan@archlinux.org>
              'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org>
 source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig}
-        "fix-wkd-lookup.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/e1246baddd14ec6f4b6270b59bea0e1b639472a7.patch"
-        add-flto-to-LDFLAGS-for-clang.patch
-        makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch
-        libmakepkg-add-extra-buildflags-only-when-buildflags.patch
-        make-link-time-optimization-flags-configurable.patch
        pacman.conf
        makepkg.conf)
-sha256sums=('0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731'
+sha256sums=('7d8e3e8c5121aec0965df71f59bedf46052c6cf14f96365c4411ec3de0a4c1a5'
            'SKIP'
-            '8ab5b1338874d7d58e11c5d1185ea3454fcc89755f9c18faf87ff348ad1ed16c'
-            '82ff91b85f4c6ceba19f9330437e2a22aabc966c2b9e2a20a53857f98a42c223'
-            'b940e6c0c05a185dce1dbb9da0dcbebf742fca7a63f3e3308d49205afe5a6582'
-            '7d0aee976c9c71fcf7c96ef1d99aa76efe47d8c1f4451842d6d159ec7deb4278'
-            '5b43e26a76be3ed10a69d4bfb2be48db8cce359baf46583411c7f124737ebe6a'
            '606e55f06c297d2b508bc4438890b229a1abaa68b0374a2d7f94c8e7be6792d7'
            '072020e34f2c55b94a9a486829a7eadab0a830ddb4d8e759b0c4e6cf1bde73a6')


-prepare() {
-  cd "$pkgname-$pkgver"
-  patch -Np1 -i ../add-flto-to-LDFLAGS-for-clang.patch
-  patch -Np1 -i ../makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch
-  patch -Np1 -i ../libmakepkg-add-extra-buildflags-only-when-buildflags.patch
-  patch -Np1 -i ../make-link-time-optimization-flags-configurable.patch
-  patch -Np1 -i ../fix-wkd-lookup.patch
-}
-
 build() {
  cd "$pkgname-$pkgver"

--- a/pacman/deps
+++ b/pacman/deps
@ -3,5 +3,7 @@ asciidoc
 doxygen
 python
 fakechroot
-cmake bash-completion
+cmake 
+bash-completion
+

--- a/pacman/time
+++ b/pacman/time
@ -1,4 +1,6 @@

-real	0m25.610s
-user	1m14.179s
-sys	0m9.737s
+
+real	0m10.092s
+user	0m22.674s
+sys	0m2.466s
+