New pkg: pesign-git

3 files changed, 32 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cb9c65f710f8..407e9dfee6bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
-pkgbase = shim-efi-x86_64-git
-	pkgdesc = Simple bootloader for x86_64 UEFI Secure Boot - GIT Version
-	pkgver = 53ba265
+pkgbase = pesign-git
+	pkgdesc = Tools for manipulating signed PE-COFF binaries - GIT Version
+	pkgver = 0.106.1.g7b60469.7b60469
 	pkgrel = 1
-	url = https://github.com/mjg59/shim
-	install = shim-efi-x86_64.install
-	arch = any
-	license = GPL
+	url = https://github.com/vathpela/pesign
+	arch = x86_64
+	arch = i686
+	license = GPL2
 	makedepends = git
-	makedepends = gnu-efi-libs
-	depends = dosfstools
-	depends = efibootmgr
-	optdepends = mactel-boot: For bless command in Apple Mac systems
-	provides = shim-efi-x86_64
-	conflicts = shim-efi-x86_64
+	depends = popt
+	depends = nss
+	provides = pesign
+	conflicts = pesign
 	options = !strip
+	options = !emptydirs
 	options = docs
-	source = shim::git+git://github.com/mjg59/shim.git#branch=master
+	source = pesign::git+git://github.com/vathpela/pesign.git#branch=master
 	sha1sums = SKIP
 
-pkgname = shim-efi-x86_64-git
+pkgname = pesign-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 6030cab26fbe..0b9f67461e8b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,59 +1,42 @@
 # Maintainer: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
-_gitroot="git://github.com/mjg59/shim.git"
-_gitname="shim"
+_gitroot="git://github.com/vathpela/pesign.git"
+_gitname="pesign"
 _gitbranch="master"
 
-_pkgname="shim-efi-x86_64"
+_pkgname="pesign"
 pkgname="${_pkgname}-git"
 
-pkgver=53ba265
+pkgver=0.106.1.g7b60469.7b60469
 pkgrel=1
-pkgdesc="Simple bootloader for x86_64 UEFI Secure Boot - GIT Version"
-url="https://github.com/mjg59/shim"
-arch=('any')
-license=('GPL')
-
-makedepends=('git' 'gnu-efi-libs')
-
-depends=('dosfstools' 'efibootmgr')
-optdepends=('mactel-boot: For bless command in Apple Mac systems')
+pkgdesc="Tools for manipulating signed PE-COFF binaries - GIT Version"
+url="https://github.com/vathpela/pesign"
+arch=('x86_64' 'i686')
+license=('GPL2')
+makedepends=('git')
+depends=('popt' 'nss')
 
 conflicts=("${_pkgname}")
 provides=("${_pkgname}")
 
-options=('!strip' 'docs')
-install="${_pkgname}.install"
+options=('!strip' '!emptydirs' 'docs')
 
 source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}")
 sha1sums=('SKIP')
 
 pkgver() {
 	cd "${srcdir}/${_gitname}/"
-	git describe --always | sed 's|-|.|g'
+	echo "$(git describe --tags).$(git describe --always)" | sed 's|-|.|g'
 }
 
 build() {
 	
-	if [[ "${CARCH}" != "x86_64" ]]; then
-		echo "${pkgname} package can be built only in a x86_64 system. Exiting."
-		exit 1
-	fi
-	
 	rm -rf "${srcdir}/${_gitname}_build/" || true
 	cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build"
 	
-	cd "${srcdir}/${_gitname}_build"
-	echo
-	
-	sed 's|/usr/lib64/gnuefi|/usr/lib|g' -i "${srcdir}/${_gitname}_build/Makefile"
-	sed 's|/usr/lib64|/usr/lib|g' -i "${srcdir}/${_gitname}_build/Makefile"
-	echo
+	cd "${srcdir}/${_gitname}_build/"
 	
-	make clean || true
-	rm -f "${srcdir}/${_gitname}_build/shim.so" || true
-	rm -f "${srcdir}/${_gitname}_build/shim.efi" || true
-	rm -f "${srcdir}/${_gitname}_build/shim.efi.debug" || true
+	git clean -x -d -f
 	echo
 	
 	unset CFLAGS
@@ -62,7 +45,7 @@ build() {
 	unset LDFLAGS
 	unset MAKEFLAGS
 	
-	make
+	make PREFIX="/usr/" LIBDIR="/usr/lib/"
 	echo
 	
 }
@@ -71,8 +54,8 @@ package() {
 	
 	cd "${srcdir}/${_gitname}_build"
 	
-	## Install shim x86_64 UEFI application
-	install -d "${pkgdir}/usr/lib/shim/"
-	install -D -m0644 "${srcdir}/${_gitname}_build/shim.efi" "${pkgdir}/usr/lib/shim/shimx64.efi"
+	make INSTALLROOT="${pkgdir}/" PREFIX="/usr/" LIBDIR="/usr/lib/" install
+	
+	chmod 0644 "${pkgdir}/usr/lib/libdpe.a"
 	
 }
diff --git a/shim-efi-x86_64.install b/shim-efi-x86_64.install
deleted file mode 100644
index 1b1a1a2c5fb8..000000000000
--- a/shim-efi-x86_64.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-	
-	cat << EOF 
-
-shim-efi-x86_64 is installed at /usr/lib/shim/shimx64.efi
-
-EOF
-	
-}
-
-post_upgrade() {
-	
-	post_install
-	
-}
-