[PR PATCH] masterpassword-cli: update to 2.7.

[PR PATCH] masterpassword-cli: update to 2.7.

[Eloitor]

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

There is a new pull request by Eloitor against master on the void-packages repository

https://github.com/Eloitor/void-packages masterpassword-cli
https://github.com/void-linux/void-packages/pull/40407

masterpassword-cli: update to 2.7.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

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

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

From 391b596e01914872716e69fbd6bc90e6493acfdb Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Wed, 9 Nov 2022 11:25:06 +0100
Subject: [PATCH] masterpassword-cli: update to 2.7.

---
 .../masterpassword-cli/patches/fix-cflags.patch  | 13 -------------
 .../patches/lowercase-boolean.patch              | 11 -----------
 srcpkgs/masterpassword-cli/template              | 16 ++++++++--------
 3 files changed, 8 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/masterpassword-cli/patches/fix-cflags.patch
 delete mode 100644 srcpkgs/masterpassword-cli/patches/lowercase-boolean.patch

diff --git a/srcpkgs/masterpassword-cli/patches/fix-cflags.patch b/srcpkgs/masterpassword-cli/patches/fix-cflags.patch
deleted file mode 100644
index 90df7d0a836f..000000000000
--- a/srcpkgs/masterpassword-cli/patches/fix-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: platform-independent/cli-c/CMakeLists.txt
-===================================================================
---- a/platform-independent/cli-c/CMakeLists.txt
-+++ b/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/patches/lowercase-boolean.patch b/srcpkgs/masterpassword-cli/patches/lowercase-boolean.patch
deleted file mode 100644
index 47374b613efc..000000000000
--- a/srcpkgs/masterpassword-cli/patches/lowercase-boolean.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/core/c/mpw-marshal-util.c	2017-09-25 02:59:09.000000000 -0400
-+++ b/core/c/mpw-marshal-util.c	2020-05-31 11:32:02.362438198 -0400
-@@ -112,7 +112,7 @@
-     if (!json_value)
-         return defaultValue;
- 
--    return json_object_get_boolean( json_value ) == TRUE;
-+    return json_object_get_boolean( json_value ) == true;
- }
- #endif
- 
diff --git a/srcpkgs/masterpassword-cli/template b/srcpkgs/masterpassword-cli/template
index 6f41996c72aa..37b3cb3077c2 100644
--- a/srcpkgs/masterpassword-cli/template
+++ b/srcpkgs/masterpassword-cli/template
@@ -1,8 +1,8 @@
 # Template file for 'masterpassword-cli'
 pkgname=masterpassword-cli
-version=2.6
-revision=6
-build_wrksrc=platform-independent/cli-c
+version=2.7
+revision=1
+build_wrksrc=platform-independent/c/cli
 build_style=cmake
 cmake_builddir=cmake
 hostmakedepends="libsodium-devel json-c-devel ncurses-devel"
@@ -11,8 +11,8 @@ short_desc="CLI version of Master Password"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 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
+distfiles="https://github.com/Lyndir/MasterPassword/archive/${version}-cli-1.tar.gz"
+checksum=192aa64e3d879b20de84543dd0786153d09c2c885b58054ade8d8f60758968bc
 # Apache-1.0 is incompatible with GPL-3+
 restricted=yes
 
@@ -25,10 +25,10 @@ do_install() {
 	vinstall bashcomplib 644 usr/share/bash-completion/completions mpw
 	vbin ${cmake_builddir}/mpw
 
-	sed -n '5,31p' cli/blf.h >blowfish.4BSD
+	sed -n '5,31p' src/blf.h >blowfish.4BSD
 	vlicense blowfish.4BSD
-	sed -n '4,17p' cli/bcrypt.h >bcrypt.ISC
+	sed -n '4,17p' src/bcrypt.c >bcrypt.ISC
 	vlicense bcrypt.ISC
-	head -55 core/base64.c >base64.license
+	head -55 ../core/src/base64.c >base64.license
 	vlicense base64.license
 }

Re: masterpassword-cli: update to 2.7.

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/40407#issuecomment-1421894513

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Updated] masterpassword-cli: update to 2.7.

[Eloitor]

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

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

https://github.com/Eloitor/void-packages masterpassword-cli
https://github.com/void-linux/void-packages/pull/40407

masterpassword-cli: update to 2.7.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

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

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

From d9c98472937bf8fb7ade459edd99f63cdf47ef9a Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Wed, 9 Nov 2022 11:25:06 +0100
Subject: [PATCH] masterpassword-cli: update to 2.7.

---
 .../masterpassword-cli/patches/fix-cflags.patch  | 13 -------------
 .../patches/lowercase-boolean.patch              | 11 -----------
 srcpkgs/masterpassword-cli/template              | 16 ++++++++--------
 3 files changed, 8 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/masterpassword-cli/patches/fix-cflags.patch
 delete mode 100644 srcpkgs/masterpassword-cli/patches/lowercase-boolean.patch

diff --git a/srcpkgs/masterpassword-cli/patches/fix-cflags.patch b/srcpkgs/masterpassword-cli/patches/fix-cflags.patch
deleted file mode 100644
index 90df7d0a836f..000000000000
--- a/srcpkgs/masterpassword-cli/patches/fix-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: platform-independent/cli-c/CMakeLists.txt
-===================================================================
---- a/platform-independent/cli-c/CMakeLists.txt
-+++ b/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/patches/lowercase-boolean.patch b/srcpkgs/masterpassword-cli/patches/lowercase-boolean.patch
deleted file mode 100644
index 47374b613efc..000000000000
--- a/srcpkgs/masterpassword-cli/patches/lowercase-boolean.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/core/c/mpw-marshal-util.c	2017-09-25 02:59:09.000000000 -0400
-+++ b/core/c/mpw-marshal-util.c	2020-05-31 11:32:02.362438198 -0400
-@@ -112,7 +112,7 @@
-     if (!json_value)
-         return defaultValue;
- 
--    return json_object_get_boolean( json_value ) == TRUE;
-+    return json_object_get_boolean( json_value ) == true;
- }
- #endif
- 
diff --git a/srcpkgs/masterpassword-cli/template b/srcpkgs/masterpassword-cli/template
index 6f41996c72aa..37b3cb3077c2 100644
--- a/srcpkgs/masterpassword-cli/template
+++ b/srcpkgs/masterpassword-cli/template
@@ -1,8 +1,8 @@
 # Template file for 'masterpassword-cli'
 pkgname=masterpassword-cli
-version=2.6
-revision=6
-build_wrksrc=platform-independent/cli-c
+version=2.7
+revision=1
+build_wrksrc=platform-independent/c/cli
 build_style=cmake
 cmake_builddir=cmake
 hostmakedepends="libsodium-devel json-c-devel ncurses-devel"
@@ -11,8 +11,8 @@ short_desc="CLI version of Master Password"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 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
+distfiles="https://github.com/Lyndir/MasterPassword/archive/${version}-cli-1.tar.gz"
+checksum=192aa64e3d879b20de84543dd0786153d09c2c885b58054ade8d8f60758968bc
 # Apache-1.0 is incompatible with GPL-3+
 restricted=yes
 
@@ -25,10 +25,10 @@ do_install() {
 	vinstall bashcomplib 644 usr/share/bash-completion/completions mpw
 	vbin ${cmake_builddir}/mpw
 
-	sed -n '5,31p' cli/blf.h >blowfish.4BSD
+	sed -n '5,31p' src/blf.h >blowfish.4BSD
 	vlicense blowfish.4BSD
-	sed -n '4,17p' cli/bcrypt.h >bcrypt.ISC
+	sed -n '4,17p' src/bcrypt.c >bcrypt.ISC
 	vlicense bcrypt.ISC
-	head -55 core/base64.c >base64.license
+	head -55 ../core/src/base64.c >base64.license
 	vlicense base64.license
 }

Re: masterpassword-cli: update to 2.7.

[Eloitor]

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

New comment by Eloitor on void-packages repository

https://github.com/void-linux/void-packages/pull/40407#issuecomment-1423835674

Comment:
By the way, the github says that the project moved to https://gitlab.com/spectre.app

Re: masterpassword-cli: update to 2.7.

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/40407#issuecomment-1544989387

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Closed]: masterpassword-cli: update to 2.7.

[github-actions]

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

There's a closed pull request on the void-packages repository

masterpassword-cli: update to 2.7.
https://github.com/void-linux/void-packages/pull/40407

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)