summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD17
-rw-r--r--preload.sh5
3 files changed, 12 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 403788331efa..fb633c206a29 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
pkgbase = hardened_malloc
pkgdesc = Hardened allocator designed for modern systems
pkgver = 2
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/GrapheneOS/hardened_malloc
arch = x86_64
license = MIT
- depends = python
- depends = bash
+ makedepends = git
conflicts = hardened-malloc-git
- source = https://github.com/GrapheneOS/hardened_malloc/archive/2.tar.gz
- source = preload.sh
- sha256sums = 4b6e19374457b90f8cdfdc2e3590795355f43adb5fb29f0ba786c562e826547f
- sha256sums = e6dbce7ac1d689fafbc94ffb17d8c4ae5271dd3580421828d35aac2c067b652d
+ source = git+https://github.com/GrapheneOS/hardened_malloc#tag=2?signed
+ validpgpkeys = 65EEFE022108E2B708CBFCF7F9E712E59AF5F22A
+ sha256sums = SKIP
pkgname = hardened_malloc
diff --git a/PKGBUILD b/PKGBUILD
index 896c4de8e67b..2b799f04bed5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,25 @@
pkgname=hardened_malloc
pkgver=2
-pkgrel=1
+pkgrel=2
pkgdesc="Hardened allocator designed for modern systems"
arch=('x86_64')
url="https://github.com/GrapheneOS/hardened_malloc"
license=('MIT')
-depends=('python' 'bash')
+makedepends=('git')
conflicts=('hardened-malloc-git')
-source=("https://github.com/GrapheneOS/$pkgname/archive/$pkgver.tar.gz"
- 'preload.sh')
-sha256sums=('4b6e19374457b90f8cdfdc2e3590795355f43adb5fb29f0ba786c562e826547f'
- 'e6dbce7ac1d689fafbc94ffb17d8c4ae5271dd3580421828d35aac2c067b652d')
+source=("git+https://github.com/GrapheneOS/$pkgname#tag=$pkgver?signed")
+sha256sums=('SKIP')
+validpgpkeys=('65EEFE022108E2B708CBFCF7F9E712E59AF5F22A') # Daniel Micay <danielmicay@gmail.com>
build() {
- cd "$pkgname-$pkgver"
+ cd "$pkgname"
make
}
package() {
- cd "$pkgname-$pkgver"
+ cd "$pkgname"
install -Dm755 --target-directory="$pkgdir/usr/lib" libhardened_malloc.so
- install -Dm755 "$srcdir/preload.sh" "$pkgdir/usr/bin/hardened_malloc_preload"
- install -Dm755 calculate_waste.py "$pkgdir/usr/bin/hardened_malloc_calculate_waste.py"
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
diff --git a/preload.sh b/preload.sh
deleted file mode 100644
index 4a80d32c5ba7..000000000000
--- a/preload.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-[[ $LD_PRELOAD ]] && LD_PRELOAD+=" "
-export LD_PRELOAD+="/usr/lib/libhardened_malloc.so"
-exec "$@"