Hi,
Hrmpf.
This happens if you try to build a minimal patch (and doing the diffs
and tests in different trees) in parallel to sending the diff :/ And
that in time pressure to do it today because I won't have time next week
probably for it and then the timeframe for 11.5 closes...
Am 28.08.22 um 18:46 schrieb Rene Engelhard:
.... which contained a cut and paste error I introduced when redoing it
after deciding I do the version check again for complenetess' sake...
That doesn't work either. EDS_CHECK_VERSION is not available from only
libebook, we'd need libedataserver for it too.
As I don't want to add that....
Reverted that and hardcoded it anyway. >= 3.16 is a given anyway.
Really working patch attached.
Sorry again.
Regards,
Rene
diff --git a/changelog b/changelog
index 41633702..82ecac2d 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 19:22:27 +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..bc3ecf31
--- /dev/null
+++ b/patches/fix-e_book_client_connect_direct_sync-sig.diff
@@ -0,0 +1,26 @@
+diff --git a/connectivity/source/drivers/evoab2/EApi.h
b/connectivity/source/drivers/evoab2/EApi.h
+index 8c05f95fa2ce..928786d79f00 100644
+--- a/connectivity/source/drivers/evoab2/EApi.h
++++ b/connectivity/source/drivers/evoab2/EApi.h
+@@ -147,7 +147,7 @@ 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);
+-EAPI_EXTERN EBookClient* (*e_book_client_connect_direct_sync)
(ESourceRegistry *registry, ESource *source, GCancellable *cancellable, GError
**error);
++EAPI_EXTERN EBookClient* (*e_book_client_connect_direct_sync)
(ESourceRegistry *registry, ESource *source, guint32
wait_for_connected_seconds, GCancellable *cancellable, GError **error);
+ 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..83e792538fc0 100644
+--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
++++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
+@@ -477,7 +477,7 @@ 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);
++ 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
