Date: Monday, May 2, 2022 @ 21:00:52 Author: segaja Revision: 1192335
archrelease: copy trunk to community-x86_64 Added: ncdu/repos/community-x86_64/PKGBUILD (from rev 1192334, ncdu/trunk/PKGBUILD) Deleted: ncdu/repos/community-x86_64/PKGBUILD ncdu/repos/community-x86_64/hardening.patch -----------------+ PKGBUILD | 115 +++++++++++++++++++++++++++--------------------------- hardening.patch | 11 ----- 2 files changed, 58 insertions(+), 68 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-05-02 21:00:38 UTC (rev 1192334) +++ PKGBUILD 2022-05-02 21:00:52 UTC (rev 1192335) @@ -1,57 +0,0 @@ -# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> -# Maintainer: Andreas 'Segaja' Schleifer <segaja at archlinux dot org> -# Contributor: Eli Schwartz <eschwa...@archlinux.org> -# Contributor: lp76 <l.ped...@gmail.com> -# Contributor: Daenyth <Daenyth+Arch AT gmail DOT com> -# Contributor: Gaetan Bisson <bis...@archlinux.org> - -pkgname='ncdu' -pkgver=2.1.1 -pkgrel=1 -pkgdesc='Disk usage analyzer with an ncurses interface' -url='https://dev.yorhel.nl/ncdu' -license=('MIT') -depends=('ncurses') -makedepends=('zig') -arch=('x86_64') -source=("https://dev.yorhel.nl/download/${pkgname}-${pkgver}.tar.gz"{,.asc} - "hardening.patch") -sha256sums=('d6c2374ca50d40b6211346972a2e89c9601172fd0704d885eda5b1e09a2a48ed' - 'SKIP' - '4b90e881d1dd5fb36b269e52952be40e050926dd6d4ce08ac7a7f0e5940e790d') -b2sums=('27857c110b80d2b90313d628dd0412dd281948ccae924c9b2b3e870232786f02006658899668e1a342b7f845ef992358cfc0cc06899f3008cb34baddca34951e' - 'SKIP' - '54b47c408e4144bee629d1d80410e4c97baf375d10399da3644a7a929b21732b8323723b2218890fe7d7d5b9b7b42427a8af74bc64c4002ef23e722c3ed969bf') -validpgpkeys=('74460D32B80810EBA9AFA2E962394C698C2739FA') # Yoran Heling <proje...@yorhel.nl> - -prepare() { - cd "${pkgname}-${pkgver}" - - patch --verbose --strip=1 --input=../hardening.patch -} - -build() { - cd "${pkgname}-${pkgver}" - - # since RELRO is not doable in the zig.build file (https://github.com/ziglang/zig/issues/6977) - # we are running zig build-exe directly - #zig build -Drelease-safe -Dcpu=baseline - - zig build-exe ./src/main.zig ./src/ncurses_refs.c -lc -lncursesw -OReleaseSafe --name ncdu -target native-native -mcpu x86_64 -D _DEFAULT_SOURCE -D _XOPEN_SOURCE=600 -fPIE -z relro -z now -fno-each-lib-rpath -} - -check() { - cd "${pkgname}-${pkgver}" - - zig build test -} - -package() { - cd "${pkgname}-${pkgver}" - - install --verbose -D --mode=755 "./${pkgname}" "${pkgdir}/usr/bin/${pkgname}" - - make install-doc PREFIX="${pkgdir}/usr" - - install --verbose -D --mode=644 LICENSES/MIT.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: ncdu/repos/community-x86_64/PKGBUILD (from rev 1192334, ncdu/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-05-02 21:00:52 UTC (rev 1192335) @@ -0,0 +1,58 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Andreas 'Segaja' Schleifer <segaja at archlinux dot org> +# Contributor: Daurnimator <daurnima...@archlinux.org> +# Contributor: Eli Schwartz <eschwa...@archlinux.org> +# Contributor: lp76 <l.ped...@gmail.com> +# Contributor: Daenyth <Daenyth+Arch AT gmail DOT com> +# Contributor: Gaetan Bisson <bis...@archlinux.org> + +pkgname='ncdu' +pkgver=2.1.2 +pkgrel=1 +pkgdesc='Disk usage analyzer with an ncurses interface' +url='https://dev.yorhel.nl/ncdu' +license=('MIT') +depends=('ncurses') +makedepends=('zig') +arch=('x86_64') +source=("https://dev.yorhel.nl/download/${pkgname}-${pkgver}.tar.gz"{,.asc}) +sha256sums=('9e0d6ef03618a3c316726bf49217b7efe45cec758b2c917ce892ded74332c6dc' + 'SKIP') +b2sums=('fb64058bec2e8f286fa82e16986cddd9126e5c94d513740d48ff1c971e7ee95270fe6c1cfbbe240bb8e99fba4e3fd6d2624f99870422835da44447a2507f0b8b' + 'SKIP') +validpgpkeys=('74460D32B80810EBA9AFA2E962394C698C2739FA') # Yoran Heling <proje...@yorhel.nl> + +build() { + cd "${pkgname}-${pkgver}" + + # since RELRO is not doable in the zig.build file (https://github.com/ziglang/zig/issues/6977) + # we are running zig build-exe directly + zig build-exe \ + -target x86_64-linux.5.10-gnu.2.34 -mcpu baseline \ + -L /usr/local/lib -L /usr/lib \ + -isystem /usr/local/include -isystem /usr/include \ + ./src/main.zig ./src/ncurses_refs.c \ + -lc -lncursesw \ + -OReleaseSafe \ + --name ncdu \ + -D _DEFAULT_SOURCE -D _XOPEN_SOURCE=600 \ + -fPIE \ + -z relro -z now \ + -fno-each-lib-rpath +} + +check() { + cd "${pkgname}-${pkgver}" + + zig build test +} + +package() { + cd "${pkgname}-${pkgver}" + + install --verbose -D --mode=755 "./${pkgname}" "${pkgdir}/usr/bin/${pkgname}" + + make install-doc PREFIX="${pkgdir}/usr" + + install --verbose -D --mode=644 LICENSES/MIT.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Deleted: hardening.patch =================================================================== --- hardening.patch 2022-05-02 21:00:38 UTC (rev 1192334) +++ hardening.patch 2022-05-02 21:00:52 UTC (rev 1192335) @@ -1,11 +0,0 @@ ---- ncdu-2.1/build.zig 2022-01-01 15:59:36.000000000 +0100 -+++ ncdu-2.1_patched/build.zig 2022-03-23 22:58:15.208756978 +0100 -@@ -13,6 +13,8 @@ - exe.addCSourceFile("src/ncurses_refs.c", &[_][]const u8{}); - exe.linkLibC(); - exe.linkSystemLibrary("ncursesw"); -+ exe.pie = true; -+ exe.each_lib_rpath = false; - exe.install(); - - const run_cmd = exe.run();