package cleanup

2 files changed, 23 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8348ab15f4d..2d7aafd400bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = aesfix
 	pkgdesc = Error-correction for AES key schedules
 	pkgver = 1.0.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://citp.princeton.edu/research/memory/
 	arch = x86_64
 	license = BSD
 	depends = gcc-libs
 	source = https://citpsite.s3.amazonaws.com/memory-content/src/aesfix-1.0.1.tar.gz
+	source = https://citpsite.s3.amazonaws.com/memory-content/src/aesfix-1.0.1.tar.gz.asc
+	validpgpkeys = 12E404FFD3C931F934052D06B8841A919D0FACE4
 	sha256sums = 7b177e876caee6aae48f0123102f11df6594a738483f9a47f2c76fe81cc045d4
+	sha256sums = SKIP
 
 pkgname = aesfix
-
diff --git a/PKGBUILD b/PKGBUILD
index b2d97e55d7a9..c904835f41e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,35 @@
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
 # Contributor: Andrew Sun <adsun701 at gmail dot com>
 # Contributor: Christopher Loen <christopherloen at gmail dot com>
 
 pkgname=aesfix
 pkgver=1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Error-correction for AES key schedules'
 arch=('x86_64')
 url='https://citp.princeton.edu/research/memory/'
 license=('BSD')
 depends=('gcc-libs')
-source=("https://citpsite.s3.amazonaws.com/memory-content/src/aesfix-${pkgver}.tar.gz")
-sha256sums=('7b177e876caee6aae48f0123102f11df6594a738483f9a47f2c76fe81cc045d4')
+source=("https://citpsite.s3.amazonaws.com/memory-content/src/aesfix-${pkgver}.tar.gz"
+        "https://citpsite.s3.amazonaws.com/memory-content/src/aesfix-${pkgver}.tar.gz.asc")
+sha256sums=('7b177e876caee6aae48f0123102f11df6594a738483f9a47f2c76fe81cc045d4'
+            'SKIP')
+validpgpkeys=('12E404FFD3C931F934052D06B8841A919D0FACE4')
+
+prepare() {
+	cd "$pkgname"
+	sed -i '/CXXFLAGS/s/=/?=/;/(CXX)/s/$/ \$(LDFLAGS)/' Makefile
+	cat Makefile
+}
 
 build() {
-  cd "${srcdir}/${pkgname}"
-  make
+	cd "$pkgname"
+	CXXFLAGS="$CXXFLAGS -funroll-loops" make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
-
-  # Base directories
-  mkdir -p "${pkgdir}/usr/bin"
-  mkdir -p "${pkgdir}/usr/share/${pkgname}"
-  mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
-
-  # Docs
-  cp -rf samples "${pkgdir}/usr/share/${pkgname}/"
-  cp LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-  # Executable
-  install -Dm755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+	cd "$pkgname"
+	install -Dm 755 aesfix -t "$pkgdir/usr/bin/"
+	install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+	find samples -type f -exec install -Dm 644 '{}' "$pkgdir/usr/share/$pkgname/{}" \;
 }