masterpassword-cli: hardening + set restricted

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 )

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 <solitudesf@protonmail.com>"
-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 "${version}-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 >blowfish.4BSD
+	vlicense blowfish.4BSD
+	sed -n '4,17p' cli/bcrypt.h >bcrypt.ISC
+	vlicense bcrypt.ISC
+	head -55 core/base64.c >base64.license
+	vlicense base64.license
 }