From 4cb414fbc5f4af11fc49567c01b8a525bad24d3b Mon Sep 17 00:00:00 2001
From: Joe Bo Run <joborun@disroot.org>
Date: Mon, 29 Aug 2022 22:43:20 +0300
Subject: [PATCH] upg pacman-mirrorlist grub file

---
 file/PKGBUILD                   |  5 ++++-
 file/PKGBUILD-arch              |  4 ++--
 grub/PKGBUILD                   | 13 ++++++++++++-
 grub/PKGBUILD-arch              | 12 +++++++++++-
 grub/deps                       |  1 -
 pacman-mirrorlist/PKGBUILD      |  4 ++--
 pacman-mirrorlist/PKGBUILD-arch |  6 +++---
 pacman-mirrorlist/deps          |  4 ----
 8 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/file/PKGBUILD b/file/PKGBUILD
index 103b903..a5893a7 100644
--- a/file/PKGBUILD
+++ b/file/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=file
 pkgver=5.42
-pkgrel=01
+pkgrel=02
 pkgdesc='File type identification utility'
 arch=('x86_64')
 groups=('base-devel')
@@ -15,6 +15,7 @@ url='https://www.darwinsys.com/file/'
 depends=('glibc' 'zlib' 'xz' 'bzip2' 'libseccomp' 'libseccomp.so')
 provides=('libmagic.so')
 options=('!emptydirs')
+#options=('!emptydirs' 'debug')  ## uncomment this to have the debug pkg produced
 source=("https://astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc})
 
 prepare() {
@@ -64,3 +65,5 @@ validpgpkeys=('BE04995BA8F90ED0C0C176C471112AB16CB33B3A') # Christos Zoulas
 
 sha256sums=(c076fb4d029c74073f15c43361ef572cfb868407d347190ba834af3b1639b0e4 # file-5.42.tar.gz
 	a19648a484f356b53aa9a486442438bb03b679f32c03011b31c466627bfcec12) # file-5.42.tar.gz.asc
+
+
diff --git a/file/PKGBUILD-arch b/file/PKGBUILD-arch
index 3fa56bc..370a288 100644
--- a/file/PKGBUILD-arch
+++ b/file/PKGBUILD-arch
@@ -4,7 +4,7 @@
 
 pkgname=file
 pkgver=5.42
-pkgrel=1
+pkgrel=2
 pkgdesc='File type identification utility'
 arch=('x86_64')
 license=('custom')
@@ -12,7 +12,7 @@ groups=('base-devel')
 url='https://www.darwinsys.com/file/'
 depends=('glibc' 'zlib' 'xz' 'bzip2' 'libseccomp' 'libseccomp.so')
 provides=('libmagic.so')
-options=('!emptydirs')
+options=('!emptydirs' 'debug')
 source=("https://astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc})
 validpgpkeys=('BE04995BA8F90ED0C0C176C471112AB16CB33B3A') # Christos Zoulas
 sha256sums=('c076fb4d029c74073f15c43361ef572cfb868407d347190ba834af3b1639b0e4'
diff --git a/grub/PKGBUILD b/grub/PKGBUILD
index 0e9797d..217a09b 100644
--- a/grub/PKGBUILD
+++ b/grub/PKGBUILD
@@ -24,7 +24,7 @@ _commit='d9b4638c50b16d4722e66d334e2c1a674b4a45cc'
 _pkgver=2.06.r322.gd9b4638c5
 _unifont_ver='14.0.04'
 pkgver=${_pkgver/-/}
-pkgrel=01
+pkgrel=03
 url='https://www.gnu.org/software/grub/'
 arch=('x86_64')
 backup=('etc/default/grub'
@@ -68,6 +68,9 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#commit=${_commit}"
 #
 #)
 
+_reverts=(
+)
+
 _configure_options=(
 	PACKAGE_VERSION="${epoch}:${pkgver}-${pkgrel}"
 	FREETYPE="pkg-config freetype2"
@@ -102,6 +105,14 @@ prepare() {
 		git cherry-pick -n "${_c}"
 	done
 
+	echo "Apply reverts..."
+	local _c
+	for _c in "${_reverts[@]}"; do
+		git log --oneline -1 "${_c}"
+		git revert -n "${_c}"
+	done
+
+
 	echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..."
 	## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html
         patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch"
diff --git a/grub/PKGBUILD-arch b/grub/PKGBUILD-arch
index f39dd2b..4765b19 100644
--- a/grub/PKGBUILD-arch
+++ b/grub/PKGBUILD-arch
@@ -22,7 +22,7 @@ _commit='d9b4638c50b16d4722e66d334e2c1a674b4a45cc'
 _pkgver=2.06.r322.gd9b4638c5
 _unifont_ver='14.0.04'
 pkgver=${_pkgver/-/}
-pkgrel=1
+pkgrel=3
 url='https://www.gnu.org/software/grub/'
 arch=('x86_64')
 license=('GPL3')
@@ -77,6 +77,9 @@ sha256sums=('SKIP'
 _backports=(
 )
 
+_reverts=(
+)
+
 _configure_options=(
 	PACKAGE_VERSION="${epoch}:${pkgver}-${pkgrel}"
 	FREETYPE="pkg-config freetype2"
@@ -111,6 +114,13 @@ prepare() {
 		git cherry-pick -n "${_c}"
 	done
 
+	echo "Apply reverts..."
+	local _c
+	for _c in "${_reverts[@]}"; do
+		git log --oneline -1 "${_c}"
+		git revert -n "${_c}"
+	done
+
 	echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..."
 	## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html
         patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch"
diff --git a/grub/deps b/grub/deps
index 69bb546..ac0873a 100644
--- a/grub/deps
+++ b/grub/deps
@@ -16,4 +16,3 @@ bison
 os-prober
 
 
-
diff --git a/pacman-mirrorlist/PKGBUILD b/pacman-mirrorlist/PKGBUILD
index 0002cb9..5cbfc5e 100644
--- a/pacman-mirrorlist/PKGBUILD
+++ b/pacman-mirrorlist/PKGBUILD
@@ -6,7 +6,7 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=pacman-mirrorlist
-pkgver=20220724
+pkgver=20220828
 pkgrel=01
 pkgdesc="Arch Linux mirror list for use by pacman HTTPS ONLY"
 arch=('any')
@@ -37,5 +37,5 @@ package() {
 
 license=('GPL')
 
-sha256sums=(3bb6bea7409d92edee2854014bf1a467fddb744075dd18b05bf233ec5772367c) # mirrorlist
+sha256sums=(586425be2572b3a06abe579bd4d091f551f28b6ef1b0e4a6b98fd2d18763150d) # mirrorlist
 
diff --git a/pacman-mirrorlist/PKGBUILD-arch b/pacman-mirrorlist/PKGBUILD-arch
index ce98dc2..7f85fd4 100644
--- a/pacman-mirrorlist/PKGBUILD-arch
+++ b/pacman-mirrorlist/PKGBUILD-arch
@@ -2,7 +2,7 @@
 # Contributor: Dan McGee <dan@archlinux.org>
 
 pkgname=pacman-mirrorlist
-pkgver=20220724
+pkgver=20220828
 pkgrel=1
 pkgdesc="Arch Linux mirror list for use by pacman"
 arch=('any')
@@ -27,5 +27,5 @@ package() {
   install -m644 "$srcdir/mirrorlist" "$pkgdir/etc/pacman.d/"
 }
 
-md5sums=('414ac013b01bb6aa49a66f8eb51971b6')
-sha256sums=('3bb6bea7409d92edee2854014bf1a467fddb744075dd18b05bf233ec5772367c')
+md5sums=('763a8a7d72ead582769aefb9797d7f1b')
+sha256sums=('586425be2572b3a06abe579bd4d091f551f28b6ef1b0e4a6b98fd2d18763150d')
diff --git a/pacman-mirrorlist/deps b/pacman-mirrorlist/deps
index 8621783..b28b04f 100644
--- a/pacman-mirrorlist/deps
+++ b/pacman-mirrorlist/deps
@@ -1,7 +1,3 @@
- 
-
-
-