From 9c92fbc607cbec99f3df3e2b8669873e8497a66c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 26 Mar 2021 21:14:31 +0700 Subject: [PATCH] masterpassword-cli: hardening + set restricted --- srcpkgs/masterpassword-cli/patches/fix-cflags.patch | 13 +++++++++++++ srcpkgs/masterpassword-cli/template | 13 +++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/masterpassword-cli/patches/fix-cflags.patch diff --git a/srcpkgs/masterpassword-cli/patches/fix-cflags.patch b/srcpkgs/masterpassword-cli/patches/fix-cflags.patch new file mode 100644 index 000000000000..a303f6954544 --- /dev/null +++ b/srcpkgs/masterpassword-cli/patches/fix-cflags.patch @@ -0,0 +1,13 @@ +Index: platform-independent/cli-c/CMakeLists.txt +=================================================================== +--- platform-independent/cli-c/CMakeLists.txt.orig ++++ platform-independent/cli-c/CMakeLists.txt +@@ -15,8 +15,6 @@ option( BUILD_MPW_BENCH "C CLI M + option( BUILD_MPW_TESTS "C Master Password algorithm test suite (needs: mpw_sodium, mpw_xml)." OFF ) + + # Default build flags. +-set( CMAKE_BUILD_TYPE Release ) +-set( CMAKE_C_FLAGS "-O3" ) + + # Version. + file( READ "VERSION" mpw_version ) diff --git a/srcpkgs/masterpassword-cli/template b/srcpkgs/masterpassword-cli/template index ee2b8d41ae4b..275a80680b20 100644 --- a/srcpkgs/masterpassword-cli/template +++ b/srcpkgs/masterpassword-cli/template @@ -1,7 +1,7 @@ # Template file for 'masterpassword-cli' pkgname=masterpassword-cli version=2.6 -revision=5 +revision=6 wrksrc=MasterPassword-${version}-cli-3 build_wrksrc=platform-independent/cli-c build_style=cmake @@ -10,10 +10,12 @@ hostmakedepends="libsodium-devel json-c-devel ncurses-devel" makedepends="libsodium-devel json-c-devel ncurses-devel" short_desc="CLI version of Master Password" maintainer="SolitudeSF " -license="GPL-3" +license="GPL-3.0-or-later, Apache-1.0, ISC, BSD-4-Clause," homepage="https://ssl.masterpasswordapp.com/" distfiles="https://github.com/Lyndir/MasterPassword/archive/${version}-cli-3.tar.gz" checksum=35dc64bc74c04b534824c21da96e4a10fc7978da376fcc036d7ec08fd800ab7a +# Apache-1.0 is incompatible with GPL-3+ +restricted=yes pre_configure() { sed -i 's|\"-O3\"|\"-fPIC -O3\"|' ${wrksrc}/${build_wrksrc}/CMakeLists.txt @@ -24,4 +26,11 @@ do_install() { cat mpw.completion.bash | tail -n +3 >> bashcomplib vinstall bashcomplib 644 usr/share/bash-completion/completions mpw vbin ${cmake_builddir}/mpw + + sed -n '5,31p' cli/blf.h >provos.4BSD + vlicense provos.4BSD + sed -n '4,17p' cli/bcrypt.h >bcrypt.ISC + vlicense bcrypt.ISC + head -55 core/base64.c >base64.license + vlicense base64.license }