download.lst | 4 +--
external/libassuan/ExternalPackage_libassuan.mk | 2 -
external/libassuan/UnpackedTarball_libassuan.mk | 1
external/libassuan/drop_putc_unlocked.patch.1 | 26 ------------------------
4 files changed, 3 insertions(+), 30 deletions(-)
New commits:
commit 3eae7c9db4d66b44c2f9a06db3ecbe4e05e1ae4c
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Feb 19 09:47:16 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 20 15:46:08 2025 +0100
libassuan: upgrade to 3.0.2
Downloaded from
https://gnupg.org/ftp/gcrypt/libassuan/libassuan-3.0.2.tar.bz2
Change-Id: I007756045035517ef17eaa45086b3858eaf49f69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181870
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit dbff1a3506ef405829afc91cba92c1bc82d010c1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181883
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/download.lst b/download.lst
index 06e80b9f4246..79e6cbe2fd15 100644
--- a/download.lst
+++ b/download.lst
@@ -369,8 +369,8 @@ LCMS2_TARBALL := lcms2-2.16.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-LIBASSUAN_SHA256SUM :=
c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1
-LIBASSUAN_TARBALL := libassuan-3.0.1.tar.bz2
+LIBASSUAN_SHA256SUM :=
d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6
+LIBASSUAN_TARBALL := libassuan-3.0.2.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/libassuan/ExternalPackage_libassuan.mk
b/external/libassuan/ExternalPackage_libassuan.mk
index 2ef3d7b509a0..0def15dfb2ec 100644
--- a/external/libassuan/ExternalPackage_libassuan.mk
+++ b/external/libassuan/ExternalPackage_libassuan.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
ifeq ($(OS),LINUX)
-$(eval $(call
gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.9,src/.libs/libassuan.so.9.0.1))
+$(eval $(call
gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.9,src/.libs/libassuan.so.9.0.2))
else ifeq ($(OS),MACOSX)
diff --git a/external/libassuan/UnpackedTarball_libassuan.mk
b/external/libassuan/UnpackedTarball_libassuan.mk
index e3fc5391d373..3604fa36a395 100644
--- a/external/libassuan/UnpackedTarball_libassuan.mk
+++ b/external/libassuan/UnpackedTarball_libassuan.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libassuan,0))
$(eval $(call gb_UnpackedTarball_add_patches,libassuan, \
external/libassuan/find-libgpg-error.patch \
- external/libassuan/drop_putc_unlocked.patch.1 \
external/libassuan/fix-autoconf-macros.patch \
$(if $(filter MSC,$(COM)),external/libassuan/w32-build-fixes.patch.1) \
external/libassuan/w32-build-fixes-2.patch \
diff --git a/external/libassuan/drop_putc_unlocked.patch.1
b/external/libassuan/drop_putc_unlocked.patch.1
deleted file mode 100644
index 31e04489bd15..000000000000
--- a/external/libassuan/drop_putc_unlocked.patch.1
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 69069bc63e6b1152e34e39bc322132fd4fd7284d
-Author: Werner Koch <w...@gnupg.org>
-Date: Tue Jun 25 09:06:04 2024 +0200
-
- Remove an declaration for an unused function
-
- * src/assuan-defs.h (putc_unlocked): Remove declaration.
- --
-
- It seems the test for putc_unlocked was remove a long time ago.
- GnuPG-bug-id: 7111
-
-diff --git a/src/assuan-defs.h b/src/assuan-defs.h
-index faf9aae..5052e8e 100644
---- a/src/assuan-defs.h
-+++ b/src/assuan-defs.h
-@@ -431,9 +431,6 @@ char *stpcpy (char *dest, const char *src);
- #define clearenv _assuan_clearenv
- int setenv (const char *name, const char *value, int replace);
- #endif
--#ifndef HAVE_PUTC_UNLOCKED
--int putc_unlocked (int c, FILE *stream);
--#endif
-
-
- #define DIM(v) (sizeof(v)/sizeof((v)[0]))
