[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/Module_external.mk RepositoryExternal.mk solenv/gbuild

2023-11-06 Thread Rene Engelhard (via logerrit) 
 RepositoryExternal.mk  |   13 +
 config_host.mk.in  |1 +
 configure.ac   |   24 
 external/Module_external.mk|2 +-
 solenv/gbuild/extensions/pre_BuildTools.mk |2 +-
 5 files changed, 40 insertions(+), 2 deletions(-)

New commits:
commit 82a955498bf1e0d4ca7a582425bd30866ca7eb75
Author: Rene Engelhard 
AuthorDate: Mon Oct 30 20:27:12 2023 +0100
Commit: René Engelhard 
CommitDate: Mon Nov 6 20:02:07 2023 +0100

add --with-system-zxcvbn

Change-Id: I9a90585d8eb498861a6ef4752ab85dcff8eeaab6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158674
Tested-by: René Engelhard 
Reviewed-by: René Engelhard 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0a0be689fd07..0eddf400a77c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4287,6 +4287,17 @@ endef
 
 endif # SYSTEM_BOX2D
 
+ifneq ($(SYSTEM_ZXCVBN),)
+define gb_LinkTarget__use_zxcvbn-c
+$(call gb_LinkTarget_set_include,$(1),\
+   -DSYSTEM_ZXCVBN \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),-lzxcvbn)
+endef
+
+else
+
 define gb_LinkTarget__use_zxcvbn-c
 $(call gb_LinkTarget_use_unpacked,$(1),zxcvbn-c)
 $(call gb_LinkTarget_set_include,$(1),\
@@ -4297,6 +4308,8 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
zxcvbn-c \
 )
 endef
+endif
+
 
 ifneq ($(SYSTEM_ZXING),)
 
diff --git a/config_host.mk.in b/config_host.mk.in
index c8990ddab3ae..f71fe453051e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -686,6 +686,7 @@ SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@
 SYSTEM_POPPLER=@SYSTEM_POPPLER@
 SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@
 SYSTEM_PYTHON=@SYSTEM_PYTHON@
+SYSTEM_ZXCVBN=@SYSTEM_ZXCVBN@
 SYSTEM_ZXING=@SYSTEM_ZXING@
 SYSTEM_QXP=@SYSTEM_QXP@
 SYSTEM_REDLAND=@SYSTEM_REDLAND@
diff --git a/configure.ac b/configure.ac
index 7b821c6343d5..c3a43716c6b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2499,6 +2499,11 @@ AC_ARG_WITH(system-zxing,
 [Use libzxing already on system.]),,
 [with_system_zxing="$with_system_libs"])
 
+AC_ARG_WITH(system-zxcvbn,
+AS_HELP_STRING([--with-system-zxcvbn],
+[Use libzxcvbn already on system.]),,
+[with_system_zxcvbn="$with_system_libs"])
+
 AC_ARG_WITH(system-box2d,
 AS_HELP_STRING([--with-system-box2d],
 [Use box2d already on system.]),,
@@ -5858,6 +5863,7 @@ if test "$cross_compiling" = "yes"; then
 PYTHON
 SCRIPTING
 ZLIB
+ZXCVBN
 "
 # converts BUILD_TYPE and PERMITTED_BUILD_TARGETS into non-whitespace,
 # newlined lists, to use grep as a filter
@@ -11198,6 +11204,24 @@ AC_SUBST(SYSTEM_HUNSPELL)
 AC_SUBST(HUNSPELL_CFLAGS)
 AC_SUBST(HUNSPELL_LIBS)
 
+dnl ===
+dnl Check for system zxcvbn
+dnl ===
+AC_MSG_CHECKING([which zxcvbn to use])
+if test "$with_system_zxcvbn" = "yes"; then
+AC_MSG_RESULT([external])
+SYSTEM_ZXCVBN=TRUE
+AC_CHECK_HEADER(zxcvbn.h, [],
+   [ AC_MSG_ERROR(zxcvbn headers not foundd.)], [])
+AC_CHECK_LIB(zxcvbn, ZxcvbnMatch, [],
+[ AC_MSG_ERROR(zxcvbn library not found.)], [])
+else
+   AC_MSG_RESULT([internal])
+   BUILD_TYPE="$BUILD_TYPE ZXCVBN"
+   SYSTEM_ZXCVBN=
+fi
+AC_SUBST(SYSTEM_ZXCVBN)
+
 dnl ===
 dnl Check for system zxing
 dnl ===
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 2b2cd99ff399..11588c51dcf0 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -90,7 +90,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,POSTGRESQL,postgresql) \
$(call gb_Helper_optional,PYTHON,python3) \
$(call gb_Helper_optional,QXP,libqxp) \
-   zxcvbn-c \
+   $(call gb_Helper_optional,ZXCVBN,zxcvbn-c) \
$(call gb_Helper_optional,ZXING,zxing) \
$(call gb_Helper_optional,REDLAND,redland) \
$(call gb_Helper_optional,REVENGE,librevenge) \
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk 
b/solenv/gbuild/extensions/pre_BuildTools.mk
index 891d478262b5..deaaf0b0aff7 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -48,7 +48,7 @@ gb_BUILD_TOOLS = \
 $(foreach executable,$(gb_BUILD_TOOLS_executables),$(call 
gb_Executable_get_runtime_dependencies,$(executable))) \
 $(foreach executable,$(gb_BUILD_TOOLS_executables_extern),$(call 
gb_ExternalExecutable_get_dependencies,$(executable))) \
$(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \
-   $(call gb_ExternalProject_get_target_for_build,zxcvbn-c) \
+   $(if $(SYSTEM_ZXCVBN),,$(call 
gb_ExternalProject_get_target_for_build,zxcvbn-c)) \

[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/Module_external.mk RepositoryExternal.mk

2023-06-18 Thread Rene Engelhard (via logerrit) 
 RepositoryExternal.mk   |   10 +-
 config_host.mk.in   |2 ++
 configure.ac|   26 ++
 external/Module_external.mk |2 +-
 4 files changed, 38 insertions(+), 2 deletions(-)

New commits:
commit cd9afc213d768b9870c81c580fbb00282c0cf1c4
Author: Rene Engelhard 
AuthorDate: Sat Jun 17 14:38:27 2023 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sun Jun 18 13:31:37 2023 +0200

add --with-system-frozen

Change-Id: Ia09254cab5696fa0a3530fcafa5b48acca631ff2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153208
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 631466f0001a..b105e1d755d0 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4298,6 +4298,14 @@ endif # ENABLE_ZXING
 endif # SYSTEM_ZXING
 
 
+ifneq ($(SYSTEM_FROZEN),)
+define gb_LinkTarget__use_frozen
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+   $(FROZEN_CFLAGS)
+)
+endef
+else
 define gb_LinkTarget__use_frozen
 $(call gb_LinkTarget_use_unpacked,$(1),frozen)
 $(call gb_LinkTarget_set_include,$(1),\
@@ -4305,6 +4313,6 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 endef
-
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/config_host.mk.in b/config_host.mk.in
index 6a120c2098cc..eb5e751e100b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -134,6 +134,7 @@ export DOCDIR=@DOCDIR@
 export DOXYGEN=@DOXYGEN@
 export DO_FETCH_TARBALLS=@DO_FETCH_TARBALLS@
 export DRAGONBOX_CFLAGS=@DRAGONBOX_CFLAGS@
+export FROZEN_CFLAGS=@FROZEN_CFLAGS@
 export DPKG=@DPKG@
 export EBOOK_CFLAGS=$(gb_SPACE)@EBOOK_CFLAGS@
 export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@
@@ -158,6 +159,7 @@ export ENABLE_DBUS=@ENABLE_DBUS@
 export ENABLE_DCONF=@ENABLE_DCONF@
 export ENABLE_DEBUG=@ENABLE_DEBUG@
 SYSTEM_DRAGONBOX=@SYSTEM_DRAGONBOX@
+SYSTEM_FROZEN=@SYSTEM_FROZEN@
 export ENABLE_EPOXY=@ENABLE_EPOXY@
 export ENABLE_EOT=@ENABLE_EOT@
 export ENABLE_EVOAB2=@ENABLE_EVOAB2@
diff --git a/configure.ac b/configure.ac
index 4c1efff0799e..af24f1c4fdb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2452,6 +2452,11 @@ AC_ARG_WITH(system-dragonbox,
 [Use dragonbox already on system.]),,
 [with_system_dragonbox="$with_system_headers"])
 
+AC_ARG_WITH(system-frozen,
+AS_HELP_STRING([--with-system-frozen],
+[Use frozen already on system.]),,
+[with_system_frozen="$with_system_headers"])
+
 AC_ARG_WITH(system-libfixmath,
 AS_HELP_STRING([--with-system-libfixmath],
 [Use libfixmath already on system.]),,
@@ -10542,6 +10547,27 @@ fi
 AC_SUBST([SYSTEM_DRAGONBOX])
 AC_SUBST([DRAGONBOX_CFLAGS])
 
+dnl ===
+dnl Check for system frozen
+dnl ===
+AC_MSG_CHECKING([which frozen to use])
+if test "$with_system_frozen" = "yes"; then
+AC_MSG_RESULT([external])
+SYSTEM_FROZEN=TRUE
+AC_LANG_PUSH([C++])
+save_CPPFLAGS=$CPPFLAGS
+AC_CHECK_HEADER([frozen/unordered_map.h], [],
+   [AC_MSG_ERROR([frozen/unordered_map.h not found. install frozen 
headers])], [])
+AC_LANG_POP([C++])
+CPPFLAGS=$save_CPPFLAGS
+else
+AC_MSG_RESULT([internal])
+BUILD_TYPE="$BUILD_TYPE FROZEN"
+SYSTEM_FROZEN=
+fi
+AC_SUBST([SYSTEM_FROZEN])
+AC_SUBST([FROZEN_CFLAGS])
+
 dnl ===
 dnl Check for system libfixmath
 dnl ===
diff --git a/external/Module_external.mk b/external/Module_external.mk
index cd9c5924d71d..9feb4e21addf 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
$(call gb_Helper_optional,FREEHAND,libfreehand) \
$(call gb_Helper_optional,FREETYPE,freetype) \
-   frozen \
+   $(call gb_Helper_optional,FROZEN,frozen) \
$(call gb_Helper_optional,GLM,glm) \
$(call gb_Helper_optional,GPGMEPP,gpgmepp) \
$(call gb_Helper_optional,GRAPHITE,graphite) \

[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/Module_external.mk RepositoryExternal.mk Repository.mk xmlsecurity/inc xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/source

2017-06-22 Thread Miklos Vajna 
 Repository.mk |1 
 RepositoryExternal.mk |   28 ++
 config_host.mk.in |3 +
 configure.ac  |5 +
 external/Module_external.mk   |2 
 xmlsecurity/Library_xsec_xmlsec.mk|8 ++
 xmlsecurity/inc/xmlsec-wrapper.h  |2 
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |9 +++
 8 files changed, 55 insertions(+), 3 deletions(-)

New commits:
commit ab50f0b08b22af1e60a0b6ce5e7e8e7d1f665216
Author: Miklos Vajna 
Date:   Wed Jun 21 21:59:11 2017 +0200

xmlsecurity: implement support for building against system-xmlsec

The only remaining difference is that in the system-xmlsec case we work
with the default key manager, not with the one that's only added by our
xmlsec patches.

This works for me for the uses I know of (see


for the motivation): signing and verifying of different signatures (bad
signature, good with non-trusted CA, good with trusted CA) with
software-based certificates all behave as expected.

Change-Id: If3f3e2b8373ab7397db3f98070a5a2ce51fa7c06
Reviewed-on: https://gerrit.libreoffice.org/39075
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/Repository.mk b/Repository.mk
index 1b133d4d792c..611240ff5e1d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -917,7 +917,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
wizards_basicusr \
wizards_properties \
wizards_wizardshare \
-   xmlsec \
$(if $(ENABLE_HEADLESS),, \
chart2_opengl_shader \
) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b821955f21d2..67c078345d4d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -921,6 +921,34 @@ endef
 endif # SYSTEM_LIBXSLT
 
 
+ifneq ($(SYSTEM_XMLSEC),)
+
+define gb_LinkTarget__use_xmlsec
+$(call gb_LinkTarget_add_defs,$(1),\
+   -DSYSTEM_XMLSEC \
+)
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+   $(XMLSEC_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(XMLSEC_LIBS))
+
+endef
+
+gb_ExternalProject__use_xmlsec:=
+
+else # !SYSTEM_XMLSEC
+
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+   xmlsec \
+))
+
+define gb_LinkTarget__use_xmlsec
+
+endef
+
+endif # SYSTEM_XMLSEC
+
 ifneq ($(SYSTEM_LIBLANGTAG),)
 
 define gb_LinkTarget__use_liblangtag
diff --git a/config_host.mk.in b/config_host.mk.in
index 5bce0b32697b..2643035f7886 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -557,6 +557,7 @@ export SYSTEM_VISIO=@SYSTEM_VISIO@
 export SYSTEM_WPD=@SYSTEM_WPD@
 export SYSTEM_WPG=@SYSTEM_WPG@
 export SYSTEM_WPS=@SYSTEM_WPS@
+export SYSTEM_XMLSEC=@SYSTEM_XMLSEC@
 export SYSTEM_ZLIB=@SYSTEM_ZLIB@
 export SYSTEM_ZMF=@SYSTEM_ZMF@
 export TARFILE_LOCATION=@TARFILE_LOCATION@
@@ -611,6 +612,8 @@ export XCODE_ARCHS=@XCODE_ARCHS@
 export XCODEBUILD_SDK=@XCODEBUILD_SDK@
 export XINERAMA_LINK=@XINERAMA_LINK@
 export XMLLINT=@XMLLINT@
+export XMLSEC_CFLAGS=$(gb_SPACE)@XMLSEC_CFLAGS@
+export XMLSEC_LIBS=$(gb_SPACE)@XMLSEC_LIBS@
 export XRANDR_CFLAGS=$(gb_SPACE)@XRANDR_CFLAGS@
 export XRANDR_LIBS=$(gb_SPACE)@XRANDR_LIBS@
 export XRENDER_CFLAGS=$(gb_SPACE)@XRENDER_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 10abbcc157c0..60c4a91bb8b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7683,6 +7683,11 @@ dnl Check for system expat
 dnl ===
 libo_CHECK_SYSTEM_MODULE([expat], [EXPAT], [expat])
 
+dnl ===
+dnl Check for system xmlsec
+dnl ===
+libo_CHECK_SYSTEM_MODULE([xmlsec], [XMLSEC], [xmlsec1-nss >= 1.2.24])
+
 AC_MSG_CHECKING([whether to enable Embedded OpenType support])
 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_eot" = "yes"; then
 ENABLE_EOT="TRUE"
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 2de9c095feab..2f5373535f78 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_moduledir,external,msc-externals))
 endif
 
 $(eval $(call gb_Module_add_moduledirs,external,\
-   $(if $(filter-out IOS,$(OS)),libxmlsec) \
+   $(if $(filter-out IOS,$(OS)),$(call 
gb_Helper_optional,XMLSEC,libxmlsec)) \
$(call gb_Helper_optional,ABW,libabw) \
$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
$(call gb_Helper_optional,APR,apr) \
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk