[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 2 commits - configure.ac external/neon

2022-01-27 Thread Jan-Marek Glogowski (via logerrit) 
 configure.ac  |2 ++
 external/neon/Library_neon.mk |6 ++
 2 files changed, 8 insertions(+)

New commits:
commit bfd905f9ccd8ffe630ad03040fb22ec44f57148f
Author: Jan-Marek Glogowski 
AuthorDate: Fri Feb 7 10:05:27 2020 +
Commit: Michael Stahl 
CommitDate: Wed Jan 26 17:40:29 2022 +0100

neon: enable NE_DEBUG support for gb_ENABLE_DBGUTIL

This builds NEON with its debugging / logging facility, if
gb_ENABLE_DBGUTIL is set. This still has to be enabled in code by
calling something like ne_debug_init(stderr, NE_DBG_XML) to enable
and ne_debug_init(NULL, 0) to disable it again.

Change-Id: I85ea1cb2bd9586072d5a12a1cb809dd8c76b37d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88171
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 5c89198f69f4487b1c872269ec6f2931490b3d02)

diff --git a/external/neon/Library_neon.mk b/external/neon/Library_neon.mk
index 2698fe8aeff0..43ee401d93fd 100644
--- a/external/neon/Library_neon.mk
+++ b/external/neon/Library_neon.mk
@@ -97,4 +97,10 @@ $(eval $(call gb_Library_add_libs,neon,\
 ))
 endif
 
+ifneq (,$(gb_ENABLE_DBGUTIL))
+$(eval $(call gb_Library_add_cflags,neon,\
+-DNE_DEBUGGING \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
commit 3f335f68f33dd57d4588aca85a5ee67c85e8e06a
Author: Stephan Bergmann 
AuthorDate: Mon May 31 13:30:37 2021 +0200
Commit: Michael Stahl 
CommitDate: Wed Jan 26 17:40:29 2022 +0100

Adapt to hamcrest-2.2-3.fc35.noarch.rpm

Change-Id: Ibddfc30a5f0828ab77235ec1155f1c2e1eef24ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116506
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit e6c25186c8584f68b5f8074004556bd855200fff)

diff --git a/configure.ac b/configure.ac
index 627e5ddba650..c50eabb784c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11815,6 +11815,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no"; 
then
 HAMCREST_JAR=/usr/share/lib/java/hamcrest.jar
 elif test -e /usr/share/java/hamcrest/core.jar; then
 HAMCREST_JAR=/usr/share/java/hamcrest/core.jar
+elif test -e /usr/share/java/hamcrest/hamcrest.jar; then
+HAMCREST_JAR=/usr/share/java/hamcrest/hamcrest.jar
 else
 HAMCREST_JAR=/usr/share/java/hamcrest.jar
 fi

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 2 commits - configure.ac external/neon

2019-12-20 Thread Thorsten Behrens (via logerrit) 
Rebased ref, commits from common ancestor:
commit 5b64e4e64bf2696b164e59da7372ebb0aecab8b2
Author: Thorsten Behrens 
AuthorDate: Fri Dec 20 22:17:33 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Dec 20 22:17:33 2019 +0100

Bump version to 6.1.7.8

Change-Id: I1237c4502d5b7f46fc510fce00377c8cce8dbcf0

diff --git a/configure.ac b/configure.ac
index 92ef5852cc86..6bd8da094b2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice powered by 
CIB],[6.1.7.7],[],[],[https://libreoffice.cib.eu/])
+AC_INIT([LibreOffice powered by 
CIB],[6.1.7.8],[],[],[https://libreoffice.cib.eu/])
 
 AC_PREREQ([2.59])
 
commit 56a7cf2a4c54f535b185d76497e591433bdb654e
Author: Thorsten Behrens 
AuthorDate: Fri Dec 20 07:03:47 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Dec 20 22:09:32 2019 +0100

tdf#129519 Fix crash during WebDAV lock refresh

- NeonSession is shared amongst several files (if on the same server
  instance)
  - there's explicit code in DAVSessionFactory::createDAVSession()
to share sessions for same host/target
- so then after a while, locks get refreshed, and session timeout
  hits
- first lock -> no prob, ne_auth.c:ah_post_send() has
  auth_challenge() failing, returning error, which puts that lock
  into m_aRemoveDeferred list
- _but_ ah_post_send() then does a clean_session(), and the next
  lock refresh from the same session hits NULLPTR session host

-> so let's delay any sspi_host cleanup until session object gets
   freed, instead of just cleaned

Change-Id: Ie257310c47913aef9fcfec92c1722d64b28c4f89
Reviewed-on: https://gerrit.libreoffice.org/85614
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/external/neon/UnpackedTarball_neon.mk 
b/external/neon/UnpackedTarball_neon.mk
index dacf425fa80f..74ac2eb38c97 100644
--- a/external/neon/UnpackedTarball_neon.mk
+++ b/external/neon/UnpackedTarball_neon.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,neon,\
external/neon/ubsan.patch \
external/neon/neon_fix_lock_token_on_if.patch \
external/neon/neon_fix_lock_timeout_windows.patch \
+   external/neon/neon_fix_sspi_session_timeout.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/neon/neon_fix_sspi_session_timeout.patch 
b/external/neon/neon_fix_sspi_session_timeout.patch
new file mode 100644
index ..5003fda35022
--- /dev/null
+++ b/external/neon/neon_fix_sspi_session_timeout.patch
@@ -0,0 +1,22 @@
+--- src/ne_auth.c~ 2019-12-05 15:38:50.246997951 +0100
 src/ne_auth.c  2019-12-20 06:54:31.555836285 +0100
+@@ -300,8 +300,6 @@
+ sess->sspi_token = NULL;
+ ne_sspi_destroy_context(sess->sspi_context);
+ sess->sspi_context = NULL;
+-if (sess->sspi_host) ne_free(sess->sspi_host);
+-sess->sspi_host = NULL;
+ #endif
+ #ifdef HAVE_NTLM
+ if (sess->ntlm_context) {
+@@ -1599,6 +1597,10 @@
+ }
+ 
+ clean_session(sess);
++#ifdef HAVE_SSPI
++if (sess->sspi_host) ne_free(sess->sspi_host);
++sess->sspi_host = NULL;
++#endif
+ ne_free(sess);
+ }
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits