diff options
| author | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2023-08-07 17:01:24 +0900 |
|---|---|---|
| committer | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2023-08-09 09:57:15 +0200 |
| commit | af3e5bef6c4e6b3158a7ab5a97c22909a7a1faa5 (patch) | |
| tree | a384346b110c6a9f445b4e755b709833596a0449 | |
| parent | 954b8253b798d0c1fe37806dc773ce0128bde785 (diff) | |
openldap: upgrade to release 2.6.6
* remove Wint-conversion.patch and configure-c99.patch, which were fixed upstream.
Change-Id: Ia93b0190e60ab3420fe79c5446f22a1573b1ea6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155441
Tested-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/openldap/UnpackedTarball_openldap.mk | 2 | ||||
| -rw-r--r-- | external/openldap/Wint-conversion.patch | 11 | ||||
| -rw-r--r-- | external/openldap/configure-c99.patch | 11 | ||||
| -rw-r--r-- | external/openldap/openldap-2.4.44.patch.1 | 2 |
5 files changed, 3 insertions, 27 deletions
diff --git a/download.lst b/download.lst index 1a7a617d4e6b..15cffa81d5f9 100644 --- a/download.lst +++ b/download.lst @@ -418,8 +418,8 @@ OFFICEOTRON_JAR := 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # three static lines # so that git cherry-pick # will not run into conflicts -OPENLDAP_SHA256SUM := d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991 -OPENLDAP_TARBALL := openldap-2.6.4.tgz +OPENLDAP_SHA256SUM := 082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0 +OPENLDAP_TARBALL := openldap-2.6.6.tgz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/openldap/UnpackedTarball_openldap.mk b/external/openldap/UnpackedTarball_openldap.mk index 98c88a28ccc5..61a083ddcd8a 100644 --- a/external/openldap/UnpackedTarball_openldap.mk +++ b/external/openldap/UnpackedTarball_openldap.mk @@ -20,8 +20,6 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,openldap,\ $(eval $(call gb_UnpackedTarball_add_patches,openldap,\ external/openldap/openldap-2.4.44.patch.1 \ - external/openldap/configure-c99.patch \ - external/openldap/Wint-conversion.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/openldap/Wint-conversion.patch b/external/openldap/Wint-conversion.patch deleted file mode 100644 index 60e14c991cc0..000000000000 --- a/external/openldap/Wint-conversion.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure -+++ configure -@@ -19241,7 +19241,7 @@ - int - main () - { --pthread_detach(NULL); -+pthread_t t; pthread_detach(t); - ; - return 0; - } diff --git a/external/openldap/configure-c99.patch b/external/openldap/configure-c99.patch deleted file mode 100644 index f1c3da6c4c23..000000000000 --- a/external/openldap/configure-c99.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure -+++ configure -@@ -14691,7 +14691,7 @@ - #include <sys/types.h> - #include <regex.h> - static char *pattern, *string; --main() -+int main() - { - int rc; - regex_t re; diff --git a/external/openldap/openldap-2.4.44.patch.1 b/external/openldap/openldap-2.4.44.patch.1 index 1521e86a2664..2dfaf355afb0 100644 --- a/external/openldap/openldap-2.4.44.patch.1 +++ b/external/openldap/openldap-2.4.44.patch.1 @@ -11,7 +11,7 @@ INSTALLDIRS= @@ -32,7 +32,3 @@ - $(RM) config.status libtool stamp-h stamp-h.in + $(RM) config.status libtool stamp-h stamp-h.in libraries/libldap/ldap.pc libraries/liblber/lber.pc distclean: veryclean FORCE - |