From a4a6104465c2f98bf13d3ba1f5aaa5149c2f26a5 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 1/2] masterpassword-cli: hardening + set restricted --- .../masterpassword-cli/patches/fix-cflags.patch | 13 +++++++++++++ srcpkgs/masterpassword-cli/template | 16 ++++++++++++---- 2 files changed, 25 insertions(+), 4 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..92d58928730a 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,18 +10,26 @@ 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 - echo '2.6-cli-3-0-ga85eff42' > ${wrksrc}/${build_wrksrc}/VERSION + echo '2.6-cli' > ${wrksrc}/${build_wrksrc}/VERSION } 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 } From 35fe2d479a6b9d3911b524890b5b69c954e51074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 29 Mar 2021 21:58:56 +0700 Subject: [PATCH 2/2] removed-packages: remove masterpassword-cli --- srcpkgs/removed-packages/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 342c036a14aa..133a72f3146a 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=38 +revision=39 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -199,6 +199,7 @@ replaces=" luxrays<=3.1_18 luxrays-devel<=3.1_18 mac<=3.99u4b5s7_3 + masterpassword-cli<=2.6_5 mattermost-desktop<=4.6.0_1 mdds0<=0.12.1_3 mirrorbits<=0.5.1_1