upgpkg: efitools-git v1.9.2.r0.392836a-1

Reupload after a deletion request (PRQ#8733)

4 files changed, 22 insertions, 86 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f47f73bd5f5d..b0b3be9d2d75 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = efitools-git
-	pkgdesc = Tools for manipulating UEFI secure boot platforms (git version)
-	pkgver = 1.7.0.3.g791e463
+	pkgdesc = UEFI secure boot toolkit
+	pkgver = v1.9.2.r0.392836a
 	pkgrel = 1
-	url = http://blog.hansenpartnership.com/efitools-1-4-with-linux-key-manipulation-utilities-released/
-	install = efitools.install
+	url = https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git
 	arch = x86_64
 	license = GPL2
 	license = LGPL2.1
@@ -13,13 +12,10 @@ pkgbase = efitools-git
 	makedepends = perl-file-slurp
 	makedepends = sbsigntools
 	depends = openssl
-	optdepends = mactel-boot: For bless command in Apple Mac systems
-	provides = efitools=1.7.0.3.g791e463
+	provides = efitools
 	conflicts = efitools
-	options = !strip
-	options = !makeflags
-	source = efitools::git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git#branch=master
-	sha1sums = SKIP
+	source = git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git
+	sha512sums = SKIP
 
 pkgname = efitools-git
 
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ed8bba0d2c55..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-src/
-pkg/
-efitools/
-*.pkg.tar*
-*.tar.xz
-*.tar.gz
-*.zip
-*.sig
-*.log*
diff --git a/PKGBUILD b/PKGBUILD
index f61f6ffab7cd..86441475b9a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,70 +1,29 @@
-# Maintainer: Darren Hobin <firstname lastname atttt live daughhhttt calm>
-# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-
-_pkgname="efitools"
-pkgname="${_pkgname}-git"
-
-pkgver=1.7.0.3.g791e463
+# Maintainer: Jonas Witschel <diabonas at gmx dot de>
+pkgname=efitools-git
+pkgver=v1.9.2.r0.392836a
 pkgrel=1
-pkgdesc="Tools for manipulating UEFI secure boot platforms (git version)"
-url="http://blog.hansenpartnership.com/efitools-1-4-with-linux-key-manipulation-utilities-released/"
+pkgdesc='UEFI secure boot toolkit'
 arch=('x86_64')
+url='https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git'
 license=('GPL2' 'LGPL2.1')
-
-makedepends=('git' 'gnu-efi-libs' 'help2man' 'perl-file-slurp' 'sbsigntools')
 depends=('openssl')
-optdepends=('mactel-boot: For bless command in Apple Mac systems')
-
-conflicts=("${_pkgname}")
-provides=("${_pkgname}=${pkgver}")
-
-options=('!strip' '!makeflags')
-install="${_pkgname}.install"
-
-source=("${_pkgname}::git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git#branch=master")
-
-sha1sums=('SKIP')
+makedepends=('git' 'gnu-efi-libs' 'help2man' 'perl-file-slurp' 'sbsigntools')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=("git+$url")
+sha512sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${_pkgname}/"
-	echo "$(git describe --tags)" | sed -e 's|^v||g' -e 's|-|.|g'
-}
-
-prepare() {
-	
-	rm -rf "${srcdir}/${_pkgname}_build/" || true
-	cp -r "${srcdir}/${_pkgname}" "${srcdir}/${_pkgname}_build"
-	cd "${srcdir}/${_pkgname}_build/"
-	
-	sed 's|-DEFI_FUNCTION_WRAPPER|-DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args|g' -i "${srcdir}/${_pkgname}_build/Make.rules"
-	
+	cd "${pkgname%-git}"
+	printf '%s' "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
 build() {
-	
-	cd "${srcdir}/${_pkgname}_build/"
-	
-	## Unset all compiler FLAGS
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
-	
-	make V=1 -j1
-	echo
-	
+	cd "${pkgname%-git}"
+	make
 }
 
 package() {
-	
-	cd "${srcdir}/${_pkgname}_build/"
-	
-	make DESTDIR="${pkgdir}/" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/efitools-git/COPYING
-	echo
-	
-	## Do not install LockDown.efi
-	rm -f "${pkgdir}/usr/share/efitools/efi/LockDown.efi" || true
-	
+	cd "${pkgname%-git}"
+	make DESTDIR="$pkgdir" ARCH="$CARCH" install
 }
diff --git a/efitools.install b/efitools.install
deleted file mode 100644
index 44ce03d2973c..000000000000
--- a/efitools.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-	echo
-	echo "For info on how to setup own UEFI Secure Boot Keys and "
-	echo "Certificates, read /usr/share/efitools/README"
-	echo
-}
-
-post_upgrade() {
-	post_install
-}