upgpkg: shim-git 15.4.r7.9f973e4-1: rename shim-efi-git to shim-git

The previous shim-git package has been deleted because it referred to an
abandoned project that doesn't compile any more (cf. PRQ#26911,
https://lists.archlinux.org/pipermail/aur-requests/2021-July/056014.html), so
shim-efi-git can now be renamed to shim-git in order to match the naming of the
stable shim package in [community].

4 files changed, 50 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a741691d35d1..4b75719e86e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,19 @@
 pkgbase = shim-git
-	pkgdesc = wedge this HTTP proxy between your browser and Tor
-	pkgver = 0.1.0.r23.ge506733
+	pkgdesc = UEFI shim loader
+	pkgver = 15.4.r7.9f973e4
 	pkgrel = 1
-	epoch = 1
-	url = https://github.com/nmathewson/shim/
-	arch = i686
+	url = https://github.com/rhboot/shim
 	arch = x86_64
-	license = unknown
+	license = BSD
+	checkdepends = xxd
 	makedepends = git
-	depends = libevent
-	optdepends = tor
-	backup = etc/conf.d/shim
-	source = git://github.com/nmathewson/shim.git
-	source = shim.conf
-	source = shim.service
-	sha256sums = SKIP
-	sha256sums = d4a0af79f6e1494bf8630c09654d15b9791ef10d7337141a969962ecf5041e67
-	sha256sums = 054d6c62ec97debe7cb282601a4db47f18e0fffb2dc63a14c5b80bdb130b350c
+	provides = shim
+	conflicts = shim
+	replaces = shim-efi-git
+	options = !buildflags
+	source = git+https://github.com/rhboot/shim.git#branch=main
+	source = rhboot-gnu-efi::git+https://github.com/rhboot/gnu-efi.git
+	sha512sums = SKIP
+	sha512sums = SKIP
 
 pkgname = shim-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 79bff9c28aa8..17935b4ea8ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,50 @@
+# Maintainer: Jonas Witschel <diabonas@archlinux.org>
+# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Contributor: Pablo Lezaeta <(prflr 88) (arro'a) (gmail) (puntocom)>
 pkgname=shim-git
-pkgver=0.1.0.r23.ge506733
+pkgver=15.4.r7.9f973e4
 pkgrel=1
-epoch=1
-pkgdesc='wedge this HTTP proxy between your browser and Tor'
-arch=('i686' 'x86_64')
-url='https://github.com/nmathewson/shim/'
-license=('unknown')
-depends=('libevent')
-optdepends=('tor')
+pkgdesc='UEFI shim loader'
+arch=('x86_64')
+url='https://github.com/rhboot/shim'
+license=('BSD')
 makedepends=('git')
-backup=('etc/conf.d/shim')
-source=('git://github.com/nmathewson/shim.git'
-        'shim.conf'
-        'shim.service')
-sha256sums=('SKIP'
-            'd4a0af79f6e1494bf8630c09654d15b9791ef10d7337141a969962ecf5041e67'
-            '054d6c62ec97debe7cb282601a4db47f18e0fffb2dc63a14c5b80bdb130b350c')
-
-_gitname='shim'
+checkdepends=('xxd')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+replaces=('shim-efi-git')
+options=('!buildflags')
+source=("git+$url.git#branch=main"
+        'rhboot-gnu-efi::git+https://github.com/rhboot/gnu-efi.git')
+sha512sums=('SKIP'
+            'SKIP')
 
 pkgver() {
-  cd "$srcdir/$_gitname"
-  printf "%s.r%s.g%s" "$(grep AC_INIT configure.in | sed -E 's/.*\[([0-9.]+)\].*/\1/g')" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	cd shim
+	git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g'
+}
+
+prepare() {
+	cd shim
+	git submodule init
+	git config submodule.gnu-efi.url "$srcdir/rhboot-gnu-efi"
+	git submodule update
+
+	sed -e 's/-Werror //g' -i Makefile Make.defaults
 }
 
 build() {
-  cd "$srcdir/$_gitname"
+	cd shim
+	make
+}
 
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
+check() {
+	cd shim
+	make test
 }
 
 package() {
-  cd "$srcdir/$_gitname"
-  make DESTDIR="$pkgdir/" install
-  mkdir -p "$pkgdir/etc/conf.d"
-  mkdir -p "$pkgdir/usr/lib/systemd/system"
-  install -m 644 "$srcdir/shim.conf" "$pkgdir/etc/conf.d/shim"
-  install -m 644 "$srcdir/shim.service" "$pkgdir/usr/lib/systemd/system/"
+	cd shim
+	make DESTDIR="$pkgdir" install-as-data
+	install -Dm644 COPYRIGHT -t "$pkgdir/usr/share/licenses/$pkgname"
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/shim.conf b/shim.conf
deleted file mode 100644
index 5c3cccee096f..000000000000
--- a/shim.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-SHIM_HOST="127.0.0.1"
-SHIM_PORT=8123
-SHIM_SOCKS_PROXY="socks4a://127.0.0.1:9050"
diff --git a/shim.service b/shim.service
deleted file mode 100644
index 728a85c1dcf7..000000000000
--- a/shim.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-After=network.target
-
-[Service]
-EnvironmentFile=/etc/conf.d/shim
-ExecStart=/usr/bin/shim -l $SHIM_HOST -p $SHIM_PORT $SHIM_SOCKS_PROXY
-
-[Install]
-WantedBy=multi-user.target