git: 905f5dd2d042 - main - sysutils/passwordsafe: Update to 1.20.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Bernard Spil <brnrd_at_FreeBSD.org>
Date: Sat, 08 Feb 2025 12:32:53 UTC
The branch main has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=905f5dd2d042059738e196be813c185a06d4da42

commit 905f5dd2d042059738e196be813c185a06d4da42
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2025-02-08 12:32:03 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2025-02-08 12:32:48 +0000

    sysutils/passwordsafe: Update to 1.20.0
---
 sysutils/passwordsafe/files/patch-Makefile.freebsd | 10 +++---
 .../passwordsafe/files/patch-help_Makefile.freebsd | 36 -------------------
 .../passwordsafe/files/patch-src_core_ItemData.cpp | 11 ------
 .../passwordsafe/files/patch-src_core_Makefile     | 41 ++++++++++++++++++++++
 .../files/patch-src_core_PwsPlatform.h             | 14 --------
 .../files/patch-src_ui_wxWidgets_wxUtilities.cpp   | 15 +++-----
 6 files changed, 51 insertions(+), 76 deletions(-)

diff --git a/sysutils/passwordsafe/files/patch-Makefile.freebsd b/sysutils/passwordsafe/files/patch-Makefile.freebsd
index 28b0b23ba73a..3ce3f38baa3d 100644
--- a/sysutils/passwordsafe/files/patch-Makefile.freebsd
+++ b/sysutils/passwordsafe/files/patch-Makefile.freebsd
@@ -1,6 +1,6 @@
---- Makefile.freebsd.orig	2017-10-07 17:53:15 UTC
+--- Makefile.freebsd.orig	2024-11-06 19:10:17 UTC
 +++ Makefile.freebsd
-@@ -34,8 +34,6 @@ GIT := git
+@@ -34,8 +34,6 @@ ECHO := /bin/echo
  GZIP := gzip
  ECHO := /bin/echo
  
@@ -9,11 +9,13 @@
  GPG := /usr/local/bin/gpg
  GPG_SIGN := $(GPG) --detach-sign --default-key $(GPG_KEY)
  SIGN_CMD := $(foreach file, $(wildcard $(RELEASEDIR)/*$(RELEASENAME)*), $(GPG_SIGN) $(file); )
-@@ -46,11 +44,8 @@ SF_UPLOAD_DST := $(SF_UPLOAD_ROOT)/Linux-BETA/$(RELEAS
+@@ -45,12 +43,9 @@ RELTAG = wx$(subst .,_,$(RELEASENAME))
+ SF_UPLOAD_DST := $(SF_UPLOAD_ROOT)/Linux-BETA/$(RELEASENUM)
  RELTAG = wx$(subst .,_,$(RELEASENAME))
  
- export CPPFLAGS += -std=c++11
+-export CPPFLAGS += -std=c++11
 -export CXXFLAGS += --stdlib=libc++ -I/usr/local/include
++export CPPFLAGS += -std=c++14
 +export CXXFLAGS += -I/usr/local/include
  export CFLAGS += -I/usr/local/include
 -export CC = clang
diff --git a/sysutils/passwordsafe/files/patch-help_Makefile.freebsd b/sysutils/passwordsafe/files/patch-help_Makefile.freebsd
deleted file mode 100644
index 4855ff016a0d..000000000000
--- a/sysutils/passwordsafe/files/patch-help_Makefile.freebsd
+++ /dev/null
@@ -1,36 +0,0 @@
-From fad7654fc8f709712211700d3ad02272dd2e6963 Mon Sep 17 00:00:00 2001
-From: Bernard Spil <brnrd@FreeBSD.org>
-Date: Sun, 5 Feb 2017 15:35:35 +0100
-Subject: [PATCH] Fix helpfile building on FreeBSD
-
-Signed-off-by: Bernard Spil <brnrd@FreeBSD.org>
----
- help/Makefile         |  2 ++
- help/Makefile.freebsd | 21 +++++++++++++++++++++
- 2 files changed, 23 insertions(+)
- create mode 100644 help/Makefile.freebsd
-
---- help/Makefile.freebsd.orig	2017-02-05 14:51:25 UTC
-+++ help/Makefile.freebsd
-@@ -0,0 +1,21 @@
-+BASEDIRNAME=pwsafe
-+LANGS=RU DE ES FR ZH PL
-+
-+ZIP = /usr/local/bin/zip
-+
-+all: default $(LANGS)
-+
-+default:
-+	@cd default ; $(ZIP) -Xqr ../helpEN ./*
-+
-+$(LANGS):
-+	@cd $(BASEDIRNAME)$@ ; $(ZIP) -Xqr ../help$@ ./*
-+
-+clean:
-+	$(RM) *.zip
-+
-+.PHONY: all clean default $(LANGS)
-+
-+# Local variables:
-+# mode: makefile
-+# End:
diff --git a/sysutils/passwordsafe/files/patch-src_core_ItemData.cpp b/sysutils/passwordsafe/files/patch-src_core_ItemData.cpp
deleted file mode 100644
index e60bc7f24d0f..000000000000
--- a/sysutils/passwordsafe/files/patch-src_core_ItemData.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core/ItemData.cpp.orig	2022-04-25 06:47:08 UTC
-+++ src/core/ItemData.cpp
-@@ -1940,6 +1940,7 @@ bool CItemData::DeSerializePlainText(const std::vector
- 
- #ifdef PWS_BIG_ENDIAN
--    unsigned char buf[len] = {0};
-+    unsigned char buf[len];
-+    memset(buf, 0, len*sizeof(char));
- 
-     switch(type) {
-       case CTIME:
diff --git a/sysutils/passwordsafe/files/patch-src_core_Makefile b/sysutils/passwordsafe/files/patch-src_core_Makefile
new file mode 100644
index 000000000000..c65b72366c69
--- /dev/null
+++ b/sysutils/passwordsafe/files/patch-src_core_Makefile
@@ -0,0 +1,41 @@
+--- src/core/Makefile.orig	2024-11-06 19:10:17 UTC
++++ src/core/Makefile
+@@ -36,6 +36,7 @@ LIBSRC          = CheckVersion.cpp \
+                   Command.cpp PWSrand.cpp Report.cpp \
+                   core_st.cpp RUEList.cpp \
+                   StringX.cpp SysInfo.cpp \
++                  TotpCore.cpp \
+                   UnknownField.cpp  \
+                   UTF8Conv.cpp Util.cpp CoreOtherDB.cpp \
+                   VerifyFormat.cpp XMLprefs.cpp \
+@@ -46,11 +47,13 @@ LIBSRC          = CheckVersion.cpp \
+                   XML/Xerces/XFileSAX2Handlers.cpp XML/Xerces/XFileValidator.cpp \
+                   XML/Xerces/XFileXMLProcessor.cpp XML/Xerces/XFilterSAX2Handlers.cpp \
+                   XML/Xerces/XFilterXMLProcessor.cpp XML/Xerces/XSecMemMgr.cpp PWSLog.cpp \
+-				  RUEList.cpp \
+-				  crypto/AES.cpp crypto/BlowFish.cpp crypto/pbkdf2.cpp \
+-				  crypto/KeyWrap.cpp crypto/sha1.cpp crypto/sha256.cpp \
+-				  crypto/TwoFish.cpp
++                  RUEList.cpp \
++                  crypto/AES.cpp crypto/BlowFish.cpp crypto/pbkdf2.cpp \
++                  crypto/KeyWrap.cpp crypto/sha1.cpp crypto/sha256.cpp \
++                  crypto/TwoFish.cpp \
++                  crypto/external/Chromium/base32.cpp
+ 
++
+ SRC             = $(LIBSRC)
+ 
+ OBJPATH         = ../../obj/$(CONFIG)/$(NAME)
+@@ -110,10 +113,10 @@ setup:
+ 	@rm core_st.cpp core_st.h
+ 
+ setup:
+-	@mkdir -p $(OBJPATH) $(OBJPATH)/pugixml $(OBJPATH)/crypto $(OBJPATH)/XML/Xerces $(OBJPATH)/XML/Pugi $(LIBPATH) $(DEPDIR)
++	@mkdir -p $(OBJPATH) $(OBJPATH)/pugixml $(OBJPATH)/crypto/external/Chromium $(OBJPATH)/XML/Xerces $(OBJPATH)/XML/Pugi $(LIBPATH) $(DEPDIR)
+ 
+ $(DEPDIR)/%.d: %.cpp
+-	@set -e; mkdir -p $(DEPDIR) $(DEPDIR)/pugixml $(DEPDIR)/crypto; \
++	@set -e; mkdir -p $(DEPDIR) $(DEPDIR)/pugixml $(DEPDIR)/crypto/external/Chromium; \
+ 	mkdir -p $(DEPDIR)/XML/Xerces $(DEPDIR)/XML/Pugi; \
+ 	$(RM) $@; \
+ 	$(CXX) -MM $(CPPFLAGS) $< > $@.$$$$; \
diff --git a/sysutils/passwordsafe/files/patch-src_core_PwsPlatform.h b/sysutils/passwordsafe/files/patch-src_core_PwsPlatform.h
deleted file mode 100644
index 37aa546fdf55..000000000000
--- a/sysutils/passwordsafe/files/patch-src_core_PwsPlatform.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/core/PwsPlatform.h.orig	2020-10-28 19:48:24 UTC
-+++ src/core/PwsPlatform.h
-@@ -116,8 +116,10 @@
- // * FreeBSD on Intel                           *
- // **********************************************
- #elif defined(__FreeBSD) || defined(__FreeBSD__)
--#if defined(__i386__) || defined(__amd64__)
-+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
- #define PWS_LITTLE_ENDIAN
-+#else
-+#define PWS_BIG_ENDIAN
- #endif
- // **********************************************
- // * Add other platforms here...                *
diff --git a/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxUtilities.cpp b/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxUtilities.cpp
index f14f37306d3b..b7d55402af87 100644
--- a/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxUtilities.cpp
+++ b/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxUtilities.cpp
@@ -1,18 +1,11 @@
-From b5c12954802f733cbef5a83b1b2d07b8fde8a6b0 Mon Sep 17 00:00:00 2001
-From: Bernard Spil <Sp1l@users.noreply.github.com>
-Date: Sun, 19 Nov 2017 20:53:11 +0100
-Subject: [PATCH] Unbreak build on FreeBSD
-
-The function wxLinuxDistributionInfo is only available on Linux. Add check for LINUX symbol as per [documentation](http://docs.wxwidgets.org/3.0/group__group__funcmacro__networkuseros.html#ga06f6fb212c396bd20865ee4e2f69aa1f)
-`This function is Linux-specific and is only available when the LINUX symbol is defined. `
---- src/ui/wxWidgets/wxUtilities.cpp.orig	2020-10-28 19:48:24 UTC
+--- src/ui/wxWidgets/wxUtilities.cpp.orig	2025-02-08 10:26:13 UTC
 +++ src/ui/wxWidgets/wxUtilities.cpp
-@@ -203,7 +203,7 @@ int pless(int* first, int* second) { return *first - *
+@@ -355,7 +355,7 @@ bool IsTaskBarIconAvailable()
  // on Fedora or Ubuntu
  bool IsTaskBarIconAvailable()
  {
--#if defined(__WXGTK__)
-+#if defined(__WXGTK__) && defined(LINUX)
+-#if defined(__WXGTK__) && !defined(__OpenBSD__)
++#if defined(__WXGTK__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
    const wxVersionInfo verInfo = wxGetLibraryVersionInfo();
    int major = verInfo.GetMajor();
    int minor = verInfo.GetMinor();