download.lst | 4
external/zxcvbn-c/0001-There-is-no-std-basic_string-int.patch.1 | 72
----------
external/zxcvbn-c/0001-use-const-for-these-arrays.patch.1 | 42 -----
external/zxcvbn-c/UnpackedTarball_zxcvbn-c.mk | 2
4 files changed, 2 insertions(+), 118 deletions(-)
New commits:
commit 5ed5f6d0b6bbadfe43fc60eabe7debdfaaa3685c
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Aug 7 10:17:30 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Aug 7 12:11:08 2025 +0200
zxcvbn-c: upgrade to 2.6
* 0001-There-is-no-std-basic_string-int.patch.1 and
0001-use-const-for-these-arrays.patch.1
are fixed uptream now
Downloaded from
https://github.com/tsyrogit/zxcvbn-c/archive/refs/tags/v2.5.tar.gz
Change-Id: I80b2d5f2b9a6a6bb274f56098f72010291934b21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189041
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Jenkins
diff --git a/download.lst b/download.lst
index 53f022fc6a15..fc968ac42806 100644
--- a/download.lst
+++ b/download.lst
@@ -706,8 +706,8 @@ ZMF_TARBALL := libzmf-0.0.2.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-ZXCVBN_C_SHA256SUM :=
77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd
-ZXCVBN_C_TARBALL := zxcvbn-c-2.5.tar.gz
+ZXCVBN_C_SHA256SUM :=
11e39f6776f9c82c68b2acb94336e32697d4ab6cdb4ac16f9583ccbdd735113a
+ZXCVBN_C_TARBALL := zxcvbn-c-2.6.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/zxcvbn-c/0001-There-is-no-std-basic_string-int.patch.1
b/external/zxcvbn-c/0001-There-is-no-std-basic_string-int.patch.1
deleted file mode 100644
index a1fe25bba08e..000000000000
--- a/external/zxcvbn-c/0001-There-is-no-std-basic_string-int.patch.1
+++ /dev/null
@@ -1,72 +0,0 @@
-From 92c6ea875231876ca264187326ce2d615d5ad543 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <stephan.bergm...@allotropia.de>
-Date: Tue, 6 Feb 2024 13:14:08 +0100
-Subject: There is no std::basic_string<int>
-
-...and at least LLVM 19 trunk libc++ complains about it now since
-<c3668779c13596e223c26fbd49670d18cd638c40> "[libc++] Remove deprecated
-char_traits base template (#72694)" with
-
-> In file included from dict-generate.cpp:25:
-> In file included from ~/llvm/inst/bin/../include/c++/v1/iostream:43:
-> In file included from ~/llvm/inst/bin/../include/c++/v1/ios:223:
-> In file included from ~/llvm/inst/bin/../include/c++/v1/__locale:24:
-> ~/llvm/inst/bin/../include/c++/v1/string:746:43: error: implicit
instantiation of undefined template 'std::char_traits<int>'
-> 746 | static_assert((is_same<_CharT, typename
traits_type::char_type>::value),
-> | ^
-> dict-generate.cpp:861:18: note: in instantiation of template class
'std::basic_string<int>' requested here
-> 861 | StringOfInts Chld;
-> | ^
-> ~/llvm/inst/bin/../include/c++/v1/__fwd/string.h:23:29: note: template is
declared here
-> 23 | struct _LIBCPP_TEMPLATE_VIS char_traits;
-> | ^
-
-etc., so use a std::vector<int> instead
----
- dict-generate.cpp | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/dict-generate.cpp b/dict-generate.cpp
-index eebcca9..fcfaaea 100644
---- a/dict-generate.cpp
-+++ b/dict-generate.cpp
-@@ -22,6 +22,7 @@
- *
-
**********************************************************************************/
-
-+#include <algorithm>
- #include <iostream>
- #include <string>
- #include <fstream>
-@@ -387,7 +388,7 @@ typedef map<string, Entry> EntryMap_t;
- typedef list<string> StringList_t;
- typedef list<NodeSPtr> NodeList_t;
- typedef set<StringInt> StringIntSet_t;
--typedef basic_string<int> StringOfInts;
-+typedef vector<int> StringOfInts;
- typedef vector<unsigned int> UintVect;
- typedef vector<uint64_t> Uint64Vect;
- typedef vector<StringInt *> StrIntPtrVect_t;
-@@ -864,15 +865,14 @@ void CreateArrays(NodeSPtr Root, StringIntSet_t &
StrSet, StringOfInts & ChildAd
- for(Itc = Root->ChildBegin(); Itc != Root->ChildEnd(); ++Itc)
- {
- int i = Itc->second->GetAddr();
-- Chld += i;
-+ Chld.push_back(i);
- }
- // Find where in pointer array the child pointer string is
-- StringOfInts::size_type x = ChildAddrs.find(Chld);
-- if (x == StringOfInts::npos)
-+ StringOfInts::size_type x = search(ChildAddrs.begin(), ChildAddrs.end(),
Chld.begin(), Chld.end()) - ChildAddrs.begin();
-+ if (x == ChildAddrs.size())
- {
- // Not found, add it
-- x = ChildAddrs.length();
-- ChildAddrs += Chld;
-+ ChildAddrs.insert(ChildAddrs.end(), Chld.begin(), Chld.end());
- }
- // Val will contain the final node data
- uint64_t Val = Its->i;
---
-2.43.0
-
diff --git a/external/zxcvbn-c/0001-use-const-for-these-arrays.patch.1
b/external/zxcvbn-c/0001-use-const-for-these-arrays.patch.1
deleted file mode 100644
index 77cd9876921d..000000000000
--- a/external/zxcvbn-c/0001-use-const-for-these-arrays.patch.1
+++ /dev/null
@@ -1,42 +0,0 @@
-From fb847af696b873750adf2e61410d897d128f3dee Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnam...@collabora.com>
-Date: Sat, 12 Jul 2025 21:21:48 +0100
-Subject: [PATCH] use const for these arrays
-
-so they don't appear in the .data section. With const WordEndBits
-ends up in the .rodata section and Formats in the .data.rel.ro
-section.
----
- dict-generate.cpp | 2 +-
- zxcvbn.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dict-generate.cpp b/dict-generate.cpp
-index 878b4aa..7041be7 100644
---- a/dict-generate.cpp
-+++ b/dict-generate.cpp
-@@ -1246,7 +1246,7 @@ int OutputCode(ostream *Out, bool Cmnts, const string &
CharSet, StringIntSet_t
- unsigned int Len = ((NodeData.size() + 7) / 8);
- OutputSize += Len;
- x = 999;
-- *Out << "static unsigned char WordEndBits[" << Len << "] =
{";
-+ *Out << "static const unsigned char WordEndBits[" << Len << "] =
{";
- Index = 0;
- unsigned int v = 0;
- unsigned int y = 0;
-diff --git a/zxcvbn.c b/zxcvbn.c
-index 95aa88f..f6d843b 100644
---- a/zxcvbn.c
-+++ b/zxcvbn.c
-@@ -1228,7 +1228,7 @@ static void SpatialMatch(ZxcMatch_t **Result, const
uint8_t *Passwd, int Start,
-
- /* The possible date formats ordered by length (d for day, m for month, */
- /* y for year, ? for separator) */
--static const char *Formats[] =
-+static const char * const Formats[] =
- {
- "yyyy",
- "d?m?yy",
---
-2.49.0
-
diff --git a/external/zxcvbn-c/UnpackedTarball_zxcvbn-c.mk
b/external/zxcvbn-c/UnpackedTarball_zxcvbn-c.mk
index 7f02f50dbc1c..39572be93685 100644
--- a/external/zxcvbn-c/UnpackedTarball_zxcvbn-c.mk
+++ b/external/zxcvbn-c/UnpackedTarball_zxcvbn-c.mk
@@ -19,8 +19,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,zxcvbn-c,2))
# <https://github.com/tsyrogit/zxcvbn-c/pull/37> "use const for these
arrays":
$(eval $(call gb_UnpackedTarball_add_patches,zxcvbn-c,\
external/zxcvbn-c/zxcvbn-c-2.5-do-not-use-stdafx.patch \
- external/zxcvbn-c/0001-There-is-no-std-basic_string-int.patch.1 \
- external/zxcvbn-c/0001-use-const-for-these-arrays.patch.1 \
))
# vim: set noet sw=4 ts=4:
