From 38433ea622db2bd04435232251007d25c84ec54c Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 26 Feb 2024 11:27:32 +0800 Subject: Commit patch queue (exported by git-debrebase) [git-debrebase make-patches: export and commit patches] --- debian/patches/cross.patch | 29 +++++++++++ ...Use-CPPFLAGS_FOR_BUILD-CXXFLAGS_FOR_BUILD.patch | 31 +++++++++++ debian/patches/patch-README-for-Debian.patch | 60 ++++++++++++++++++++++ debian/patches/series | 3 ++ 4 files changed, 123 insertions(+) create mode 100644 debian/patches/cross.patch create mode 100644 debian/patches/makefile-Use-CPPFLAGS_FOR_BUILD-CXXFLAGS_FOR_BUILD.patch create mode 100644 debian/patches/patch-README-for-Debian.patch create mode 100644 debian/patches/series diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch new file mode 100644 index 0000000..704b7fa --- /dev/null +++ b/debian/patches/cross.patch @@ -0,0 +1,29 @@ +From: Helmut Grohne +Date: Sun, 25 Mar 2018 13:36:47 +0200 +Subject: fix crossbuilding zxcvbn-c + +--- + makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/makefile b/makefile +index 399bccc..5e8ea98 100644 +--- a/makefile ++++ b/makefile +@@ -5,6 +5,7 @@ CXXFLAGS ?= -O2 -Wall -Wextra + CC ?= gcc + AR ?= ar + CXX ?= g++ ++CXX_FOR_BUILD ?= $(CXX) + + # need zxcvbn.h prior to package installation + CPPFLAGS += -I. +@@ -61,7 +62,7 @@ dict-crc.h: dictgen $(WORDS) + ./dictgen -b -o zxcvbn.dict -h dict-crc.h $(WORDS) + + dictgen: dict-generate.cpp makefile +- $(CXX) $(CPPFLAGS) -std=c++11 $(CXXFLAGS) \ ++ $(CXX_FOR_BUILD) $(CPPFLAGS) -std=c++11 $(CXXFLAGS) \ + -o dictgen dict-generate.cpp $(LDFLAGS) + + test-c++inline: test.c zxcvbn-c++inline.o diff --git a/debian/patches/makefile-Use-CPPFLAGS_FOR_BUILD-CXXFLAGS_FOR_BUILD.patch b/debian/patches/makefile-Use-CPPFLAGS_FOR_BUILD-CXXFLAGS_FOR_BUILD.patch new file mode 100644 index 0000000..ddee2e0 --- /dev/null +++ b/debian/patches/makefile-Use-CPPFLAGS_FOR_BUILD-CXXFLAGS_FOR_BUILD.patch @@ -0,0 +1,31 @@ +From: Helmut Grohne +Date: Mon, 8 Jan 2024 08:09:08 +0100 +Subject: makefile: Use CPPFLAGS_FOR_BUILD & CXXFLAGS_FOR_BUILD + +--- + makefile | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/makefile b/makefile +index 5e8ea98..5a5a130 100644 +--- a/makefile ++++ b/makefile +@@ -10,6 +10,9 @@ CXX_FOR_BUILD ?= $(CXX) + # need zxcvbn.h prior to package installation + CPPFLAGS += -I. + ++CPPFLAGS_FOR_BUILD ?= $(CPPFLAGS) ++CXXFLAGS_FOR_BUILD ?= $(CXXFLAGS) ++ + # library metadata + TARGET_LIB = libzxcvbn.so.0.0.0 + SONAME = libzxcvbn.so.0 +@@ -62,7 +65,7 @@ dict-crc.h: dictgen $(WORDS) + ./dictgen -b -o zxcvbn.dict -h dict-crc.h $(WORDS) + + dictgen: dict-generate.cpp makefile +- $(CXX_FOR_BUILD) $(CPPFLAGS) -std=c++11 $(CXXFLAGS) \ ++ $(CXX_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) -std=c++11 $(CXXFLAGS_FOR_BUILD) \ + -o dictgen dict-generate.cpp $(LDFLAGS) + + test-c++inline: test.c zxcvbn-c++inline.o diff --git a/debian/patches/patch-README-for-Debian.patch b/debian/patches/patch-README-for-Debian.patch new file mode 100644 index 0000000..44f389b --- /dev/null +++ b/debian/patches/patch-README-for-Debian.patch @@ -0,0 +1,60 @@ +From: Sean Whitton +Date: Sat, 24 Sep 2016 13:46:46 -0700 +Subject: patch README for Debian + +Remove build instructions, and functions for when zxcvbn-c ws compiled +with USE_DICT_FILE (see README.source). + +Forwarded: not-needed +--- + README.md | 29 +---------------------------- + 1 file changed, 1 insertion(+), 28 deletions(-) + +diff --git a/README.md b/README.md +index 2833487..9d4d0ea 100644 +--- a/README.md ++++ b/README.md +@@ -11,42 +11,15 @@ The original CoffeeScript version is available at + An article on the reasons for zxcvbn is at + https://blogs.dropbox.com/tech/2012/04/zxcvbn-realistic-password-strength-estimation/ + +-## Building +- +-The makefile will build several test programs to test the code. It shows the steps needed +-to use the code in C and C++ programs, using the dictionary data read from file or included +-within the program executable. +-The makefile has only been tried on Linux using GCC version 4.8.4, but should be fairly +-portable to other systems. +- +-When dictionary data is included in your program's executable, the files `zxcvbn.c` , +-`zxcvbn.h` , `dict-src.h` are used in your program. +- +-When dictionary data is read from file, the files `zxcvbn.c` , `zxcvbn.h` , `dict-crc.h` +-and `zxcvbn.dict` are used in your program, compiled with `#define USE_DICT_FILE`. The CRC +-of the dictionary data file is written to `dict-crc.h` so your executable can detect +-corruption of the data. +- +-Rename `zxcvbn.c` to `zxcvbn.cpp` (or whatever your compiler uses) to compile as C++. +- +-The `dict*.h` and `zxcvbn.dict` files are generated by the dictgen program compiled from +-dict-generate.cpp (see makefile for details). +- + ## Using + +-Initially call `ZxcvbnInit()` with the pathname of the `zxcvbn.dict` file. This can be +-omitted when dictionary data is included in the executable. +- + Call `ZxcvbnMatch()` with the password and optional user dictionary to get the entropy + estimation and optional information on the password parts (which will need freeing with + `ZxcvbnFreeInfo()` after use). Do this for each password to be tested, or as each character + of it is entered into your program. The optional user dictionary can change between each + call. + +-Finally call `ZxcvbnUninit()` to free the dictionary data from read from file. This can be +-omitted when dictionary data is included in the executable. +- +-Review the test program in `test.c` for an example. ++Review the test program in `examples/test.c` for an example. + + + ## Differences from the original version diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..66236a7 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +patch-README-for-Debian.patch +cross.patch +makefile-Use-CPPFLAGS_FOR_BUILD-CXXFLAGS_FOR_BUILD.patch -- cgit v1.2.3