Re: [PR PATCH] [Updated] masterpassword-cli: hardening + set restricted

[sgn <sgn@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1627 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages masterpassword-cli-restricted
https://github.com/void-linux/void-packages/pull/29855

masterpassword-cli: hardening + set restricted
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29855.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-masterpassword-cli-restricted-29855.patch --]
[-- Type: text/x-diff, Size: 3983 bytes --]

From 37d53ba4d3e8049c5f847ee4b68744e586d78634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
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..9ec280670628 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 <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 '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 0cbd508ce8216ee44bf894788cf8286498e3acbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
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 <chocimier@tlen.pl>"
@@ -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