diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-06 17:20:37 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 15:48:02 +0100 |
| commit | 03287ddd133eed946368d4f2444fe3c9b43c4eb2 (patch) | |
| tree | 387200dcd002e66805252485372e7716da404740 | |
| parent | 8808970b78586d013db60a70386b107a15bc3a01 (diff) | |
Upgrade external/postgresql to postgresql-9.2.24
...which is the latest 9.2.x currently listed at
<https://www.postgresql.org/ftp/source/>. 9.2.1 doesn't build against
OpenSSL 1.1 which dropped SSL_library_init (cf. <https://wiki.openssl.org/
index.php/Library_Initialization#libssl_Initialization>), and 9.2.24 apparently
has that covered. (Ran into this when trying to upgrade the LibreOffice flatpak
build to org.freedesktop.Sdk//18.08, which has OpenSSL 1.1.)
On Windows, the new tarball as-is fails with
> ..\..\port\chklocale.c(214): error C2037: left of 'lc_codepage' specifies undefined struct/union '__crt_locale_data'
because at least in Windows Kits/10/Include/10.0.17763.0/ucrt/corecrt.h
(included from Windows Kits/10/Include/10.0.17763.0/ucrt/locale.h), the relevant
definitions are now
> typedef struct __crt_locale_data_public
> {
> unsigned short const* _locale_pctype;
> _Field_range_(1, 2) int _locale_mb_cur_max;
> unsigned int _locale_lc_codepage;
> } __crt_locale_data_public;
>
> typedef struct __crt_locale_pointers
> {
> struct __crt_locale_data* locinfo;
> struct __crt_multibyte_data* mbcinfo;
> } __crt_locale_pointers;
>
> typedef __crt_locale_pointers* _locale_t;
which presumably has changed from a past state where that lc_codepage member was
directly publicly accessible.
<https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2> is a copy of
<https://ftp.postgresql.org/pub/source/v9.2.24/postgresql-9.2.24.tar.bz2>;
`sha256sum postgresql-9.2.24.tar.bz2` reports the same
a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126 as recorded in
<https://ftp.postgresql.org/pub/source/v9.2.24/postgresql-9.2.24.tar.bz2.sha256>
Change-Id: I196dd93aa03471042efba57ea639e1bb6655de98
Reviewed-on: https://gerrit.libreoffice.org/64730
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit a01ac385ed16fbe4239938c9d31462691707e87b)
Reviewed-on: https://gerrit.libreoffice.org/64764
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/postgresql/UnpackedTarball_postgresql.mk | 1 | ||||
| -rw-r--r-- | external/postgresql/windows.patch.0 | 11 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 6 |
4 files changed, 17 insertions, 5 deletions
diff --git a/download.lst b/download.lst index cf56a183c165..be331f8264fc 100644 --- a/download.lst +++ b/download.lst @@ -208,8 +208,8 @@ export LIBPNG_SHA256SUM := 2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7 export LIBPNG_TARBALL := libpng-1.6.34.tar.xz export POPPLER_SHA256SUM := 2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7 export POPPLER_TARBALL := poppler-0.66.0.tar.xz -export POSTGRESQL_SHA256SUM := db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461 -export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 +export POSTGRESQL_SHA256SUM := a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126 +export POSTGRESQL_TARBALL := postgresql-9.2.24.tar.bz2 export PYTHON_SHA256SUM := 063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009 export PYTHON_TARBALL := Python-3.5.5.tar.xz export QXP_SHA256SUM := 8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73 diff --git a/external/postgresql/UnpackedTarball_postgresql.mk b/external/postgresql/UnpackedTarball_postgresql.mk index 3ae5eed0746b..a7e57ab93301 100644 --- a/external/postgresql/UnpackedTarball_postgresql.mk +++ b/external/postgresql/UnpackedTarball_postgresql.mk @@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,postgresql,3)) $(eval $(call gb_UnpackedTarball_add_patches,postgresql, \ external/postgresql/postgresql-libs-leak.patch \ external/postgresql/postgresql-9.2.1-libreoffice.patch \ + external/postgresql/windows.patch.0 \ )) ifeq ($(SYSTEM_ZLIB),) diff --git a/external/postgresql/windows.patch.0 b/external/postgresql/windows.patch.0 new file mode 100644 index 000000000000..dbac548d4659 --- /dev/null +++ b/external/postgresql/windows.patch.0 @@ -0,0 +1,11 @@ +--- src/port/chklocale.c ++++ src/port/chklocale.c +@@ -211,7 +211,7 @@ + { + r = malloc(16); /* excess */ + if (r != NULL) +- sprintf(r, "CP%u", loct->locinfo->lc_codepage); ++ sprintf(r, "CP%u", ((struct __crt_locale_data_public *) loct->locinfo)->_locale_lc_codepage); + _free_locale(loct); + } + #else diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index bfd5cfa08d70..d1908d13d4e2 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -396,10 +396,10 @@ "dest-filename": "external/tarballs/poppler-0.66.0.tar.xz" }, { - "url": "https://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2", - "sha256": "db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461", + "url": "https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2", + "sha256": "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126", "type": "file", - "dest-filename": "external/tarballs/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2" + "dest-filename": "external/tarballs/postgresql-9.2.24.tar.bz2" }, { "url": "https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz", |