[arch-commits] Commit in ncdu/trunk (PKGBUILD hardening.patch)

[Andreas Schleifer]

    Date: Tuesday, March 8, 2022 @ 23:56:08
  Author: segaja
Revision: 1145628

upgpkg: ncdu 2.1-2; fix binary on non-AMD systems; add tests, add PIE

Added:
  ncdu/trunk/hardening.patch
Modified:
  ncdu/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   34 +++++++++++++++++++++++++++-------
 hardening.patch |   10 ++++++++++
 2 files changed, 37 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-08 22:41:29 UTC (rev 1145627)
+++ PKGBUILD	2022-03-08 23:56:08 UTC (rev 1145628)
@@ -7,7 +7,7 @@
 
 pkgname=ncdu
 pkgver=2.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Disk usage analyzer with an ncurses interface'
 url='https://dev.yorhel.nl/ncdu'
 license=('MIT')
@@ -14,22 +14,42 @@
 depends=('ncurses')
 makedepends=('zig')
 arch=('x86_64')
-source=("https://dev.yorhel.nl/download/${pkgname}-${pkgver}.tar.gz"{,.asc})
+source=("https://dev.yorhel.nl/download/${pkgname}-${pkgver}.tar.gz"{,.asc}
+        "hardening.patch")
 sha256sums=('4ba8d20a64a55cc00af2d2c6138afcc9dc25e40a5ed6a8c544cb9e2285a195fe'
-            'SKIP')
+            'SKIP'
+            '833142036e56cd7f8ee111f2e0855f12d305d2ec03925c2f3848a14f7305abbf')
 b2sums=('9dd90b63ad7edbd402b0cdab7f5aa5263c6df562afb15229b5c2b6143cf7efc7af94fabcd710593b2fd94fca02742e08b401fc0103b1154c6cd278f5709eeef8'
-        'SKIP')
+        'SKIP'
+        'bf38e61d425d2d264320fcbf27ad8e3af769aaa2b3df5d51cdaf7176b8aeb84504abb157560d558094afaf1fac406a6b35cc93e769459fda2e34eacf803b210f')
 validpgpkeys=('74460D32B80810EBA9AFA2E962394C698C2739FA') # Yoran Heling <projects at yorhel.nl>
 
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+
+    patch --verbose --strip=1 --input=../hardening.patch
+}
+
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
 
-    make
+    zig build -Drelease-safe -Dcpu=baseline
+
+    make doc
 }
 
+check() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+
+    zig build test
+}
+
 package() {
     cd "${srcdir}/${pkgname}-${pkgver}"
 
-    make install PREFIX="${pkgdir}/usr"
-    install -Dm644 LICENSES/MIT.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -D --mode=755 "./zig-out/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+
+    make install-doc PREFIX="${pkgdir}/usr"
+
+    install -D --mode=644 LICENSES/MIT.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Added: hardening.patch
===================================================================
--- hardening.patch	                        (rev 0)
+++ hardening.patch	2022-03-08 23:56:08 UTC (rev 1145628)
@@ -0,0 +1,10 @@
+--- ncdu-2.1/build.zig	2022-01-01 15:59:36.000000000 +0100
++++ ncdu-2.1_patched/build.zig	2022-03-09 00:19:11.898641095 +0100
+@@ -13,6 +13,7 @@
+     exe.addCSourceFile("src/ncurses_refs.c", &[_][]const u8{});
+     exe.linkLibC();
+     exe.linkSystemLibrary("ncursesw");
++    exe.pie = true;
+     exe.install();
+ 
+     const run_cmd = exe.run();