Fix build after upstream changes, add license

2 files changed, 12 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7a91126df2a4..111ef8f5dd99 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,17 @@
 pkgbase = sandsifter-git
 	pkgdesc = The x86 processor fuzzer
-	pkgver = r22.d0e9e8e
+	pkgver = r53.4ae3e6e
 	pkgrel = 1
 	url = https://github.com/rigred/sandsifter
 	arch = i686
 	arch = x86_64
-	license = unknown
+	license = BSD
 	makedepends = git
 	depends = python2-capstone
 	provides = sandsifter
 	conflicts = sandsifter
 	source = sandsifter::git+https://github.com/rigred/sandsifter
-	source = sandsifter-git.patch
 	sha256sums = SKIP
-	sha256sums = fbe1e12694f8be31ab3128932c6a5e91950f14fd1c22196559dd74711b9d080f
 
 pkgname = sandsifter-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 1228cf0b0d39..fe80977e2197 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,25 @@
 # Maintainer: xiretza <xiretza+aur@gmail.com>
 _pkgname=sandsifter
 pkgname="${_pkgname}-git"
-pkgver=r22.d0e9e8e
+pkgver=r53.4ae3e6e
 pkgrel=1
 pkgdesc="The x86 processor fuzzer"
 arch=("i686" "x86_64")
 url="https://github.com/rigred/${_pkgname}"
-# see https://github.com/xoreaxeaxeax/sandsifter/issues/13
-license=("unknown")
+license=('BSD')
 groups=()
 depends=(python2-capstone)
 makedepends=('git')
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
-source=("${_pkgname}::git+${url}"
-	"${pkgname}.patch")
-sha256sums=('SKIP'
-            'fbe1e12694f8be31ab3128932c6a5e91950f14fd1c22196559dd74711b9d080f')
+source=("${_pkgname}::git+${url}")
+sha256sums=('SKIP')
 
 pkgver() {
 	cd "$srcdir/${_pkgname}"
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-	cd "$srcdir/${_pkgname}"
-	patch -p1 -i "${srcdir}/${pkgname}.patch"
-}
-
 build() {
 	cd "$srcdir/${_pkgname}"
 	# TODO: get it to build with -m32
@@ -41,8 +33,12 @@ build() {
 package() {
 	cd "$srcdir/${_pkgname}"
 	install -Dm 644 -t "${pkgdir}/opt/${_pkgname}" mutator.py
-	install -Dm 655 -t "${pkgdir}/opt/${_pkgname}" summarize.py injector
+	install -Dm 655 -t "${pkgdir}/opt/${_pkgname}" sifter-summarize.py
 	cp -r disas gui pyutil "${pkgdir}/opt/${_pkgname}/"
+
+	install -Dm 655 -t "${pkgdir}/usr/bin" sifter-injector
 	install -Dm 655 -t "${pkgdir}/usr/bin/" sifter.py
-	ln -s "/opt/${_pkgname}/summarize.py" "${pkgdir}/usr/bin/"
+	ln -s "/opt/${_pkgname}/sifter-summarize.py" "${pkgdir}/usr/bin/"
+
+	install -Dm 644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
 }