Hi again,
Am 28.08.22 um 17:56 schrieb Rene Engelhard:
Am 28.08.22 um 17:46 schrieb Rene Engelhard:
Am 31.07.22 um 16:44 schrieb Rene Engelhard:
This is now https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1016420
(where the upstream bug which that one is marked as forwarded to has
also the reasoning why support for < 3.16 was dropped which makes the
patch bigger).
I now did a minimal patch (attached.) in case the original patch is
deemed to big (which I can understand)
Hrmf. doesn't build (for whatever reason). Will investigate...
OK, got it, forgot adapt the internal EApi.h. Patch attached.
Regards,
Rene
diff --git a/changelog b/changelog
index 41633702..08449161 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:7.0.4-4+deb11u3) stable; urgency=medium
+
+ * debian/patches/fix-e_book_client_connect_direct_sync-sig.diff:
+ as name says (closes: #1016420)
+
+ -- Rene Engelhard <r...@debian.org> Sun, 28 Aug 2022 18:32:57 +0200
+
libreoffice (1:7.0.4-4+deb11u2) stable; urgency=medium
* debian/patches/hrk-euro.diff: add EUR to .hr i18n;
diff --git a/patches/fix-e_book_client_connect_direct_sync-sig.diff
b/patches/fix-e_book_client_connect_direct_sync-sig.diff
new file mode 100644
index 00000000..a12f915d
--- /dev/null
+++ b/patches/fix-e_book_client_connect_direct_sync-sig.diff
@@ -0,0 +1,32 @@
+diff --git a/connectivity/source/drivers/evoab2/EApi.h
b/connectivity/source/drivers/evoab2/EApi.h
+index 8c05f95fa2ce..daed075ba80b 100644
+--- a/connectivity/source/drivers/evoab2/EApi.h
++++ b/connectivity/source/drivers/evoab2/EApi.h
+@@ -147,7 +147,11 @@ EAPI_EXTERN const gchar* (*eds_check_version) (guint
required_major, guint requi
+ EAPI_EXTERN const gchar* (*e_source_get_uid) (ESource *source);
+ EAPI_EXTERN ESource* (*e_source_registry_ref_source) (ESourceRegistry
*registry, const gchar *uid);
+ EAPI_EXTERN EBookClient* (*e_book_client_new) (ESource *source, GError
**error);
++#if EDS_CHECK_VERSION ( 3, 16, 0)
++EAPI_EXTERN EBookClient* (*e_book_client_connect_direct_sync)
(ESourceRegistry *registry, ESource *source, guint32
wait_for_connected_seconds, GCancellable *cancellable, GError **error);
++#else
+ EAPI_EXTERN EBookClient* (*e_book_client_connect_direct_sync)
(ESourceRegistry *registry, ESource *source, GCancellable *cancellable, GError
**error);
++#endif
+ EAPI_EXTERN gboolean (*e_client_open_sync) (EClient *client, gboolean
only_if_exists, GCancellable *cancellable, GError **error);
+ EAPI_EXTERN ESource* (*e_client_get_source) (EClient *client);
+ EAPI_EXTERN gboolean (*e_book_client_get_contacts_sync) (EBookClient *client,
const gchar *sexp, GSList **contacts, GCancellable *cancellable, GError
**error);
+diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx
b/connectivity/source/drivers/evoab2/NResultSet.cxx
+index 77d53939c1aa..dc73574d8368 100644
+--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
++++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
+@@ -477,7 +477,10 @@ class OEvoabVersion38Helper : public OEvoabVersion36Helper
+ protected:
+ virtual EBookClient * createClient( ESource *pSource ) override
+ {
+- return e_book_client_connect_direct_sync (get_e_source_registry (),
pSource, nullptr, nullptr);
++ if (eds_check_version( 3, 16, 0 ) == nullptr)
++ return e_book_client_connect_direct_sync (get_e_source_registry
(), pSource, 10, nullptr, nullptr);
++ else
++ return e_book_client_connect_direct_sync (get_e_source_registry
(), pSource, 10, nullptr, nullptr);
+ }
+ };
+
diff --git a/patches/series b/patches/series
index fa58e363..69db8a90 100644
--- a/patches/series
+++ b/patches/series
@@ -62,3 +62,4 @@ b0404f80577de9ff69e58390c6f6ef949fdb0139.patch
0002-CVE-2022-26307-make-hash-encoding-match-decoding.patch
0003-CVE-2022-26306-add-Initialization-Vectors-to-passwor.patch
0004-CVE-2022-2630-6-7-add-infobar-to-prompt-to-refresh-t.patch
+fix-e_book_client_connect_direct_sync-sig.diff
