subject:"\[Libreoffice\-commits\] core.git\: Branch 'feature\/cib_contract891' \- download.lst external\/libxslt"

[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - download.lst external/libxslt

2020-09-30 Thread David Tardon (via logerrit)

 download.lst |5 +++--
 external/libxslt/ExternalPackage_xslt.mk |4 ++--
 external/libxslt/libxslt-msvc.patch.2|2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit b13ff230d160562deec75667ebb0d16b5831169f
Author: David Tardon 
AuthorDate: Tue Nov 7 19:50:04 2017 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Wed Sep 30 12:16:39 2020 +0200

upload libxslt 1.1.32

Reviewed-on: https://gerrit.libreoffice.org/44422
Tested-by: Jenkins 
Reviewed-by: David Tardon 
(cherry picked from commit c110dabbf0fcddf9da2e61d66ca093cf6e6c57a1)

Conflicts:
download.lst

Change-Id: Idee2f18dccdf309027142137683ac86735f575cc

diff --git a/download.lst b/download.lst
index cda937e06284..b6363dcce2ec 100644
--- a/download.lst
+++ b/download.lst
@@ -94,8 +94,9 @@ export LIBEXTTEXTCAT_TARBALL := 
ae330b9493bd4503ac390106ff6060d7-libexttextcat-3
 export LIBLANGTAG_TARBALL := 
36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 export LIBXMLSEC_TARBALL := 
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 export LIBXML_TARBALL := ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz
-export LIBXSLT_MD5SUM := 70becbbcb1dad55f14de0b84171b91d5
-export LIBXSLT_TARBALL := libxslt-1.1.30.tar.gz
+export LIBXSLT_MD5SUM := 1fc72f98e98bf4443f1651165f3aa146
+export LIBXSLT_VERSION_MICRO := 32
+export LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
 export MDDS_TARBALL := a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2
diff --git a/external/libxslt/ExternalPackage_xslt.mk 
b/external/libxslt/ExternalPackage_xslt.mk
index 4354bd4b6191..f0fd5336297d 100644
--- a/external/libxslt/ExternalPackage_xslt.mk
+++ b/external/libxslt/ExternalPackage_xslt.mk
@@ -24,8 +24,8 @@ $(eval $(call 
gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.dll,wi
 $(eval $(call 
gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.dll,win32/bin.msvc/libexslt.dll))
 endif
 else # OS!=WNT
-$(eval $(call 
gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.30))
-$(eval $(call 
gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.18))
+$(eval $(call 
gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.$(LIBXSLT_VERSION_MICRO)))
+$(eval $(call 
gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.20))
 endif
 endif # DISABLE_DYNLOADING
 
diff --git a/external/libxslt/libxslt-msvc.patch.2 
b/external/libxslt/libxslt-msvc.patch.2
index d5b01dab2c25..19343a782511 100644
--- a/external/libxslt/libxslt-msvc.patch.2
+++ b/external/libxslt/libxslt-msvc.patch.2
@@ -1,7 +1,7 @@
 --- build/libxslt-1.1.26/win32/Makefile.msvc.old   2010-10-20 
01:02:55.359375000 +0200
 +++ build/libxslt-1.1.26/win32/Makefile.msvc   2010-10-20 01:03:05.18750 
+0200
 @@ -54,6 +54,7 @@
- CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W3 $(CRUNTIME) /D 
"_REENTRANT"
+ CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /W3 /wd4244 /wd4267 $(CRUNTIME) /D 
"_REENTRANT"
  CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX)
  CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
 +CFLAGS = $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - download.lst external/libxslt Makefile.fetch

2020-09-30 Thread Michael Stahl (via logerrit)

 Makefile.fetch|2 
 download.lst  |3 -
 external/libxslt/ExternalPackage_xslt.mk  |4 -
 external/libxslt/UnpackedTarball_xslt.mk  |2 
 external/libxslt/libxslt-internal-symbols.patch   |   64 --
 external/libxslt/libxslt-internal-symbols.patch.1 |   13 
 6 files changed, 19 insertions(+), 69 deletions(-)

New commits:
commit 7c0e027dbcd56d2ce9c9370161a51bb1b56e6861
Author: Michael Stahl 
AuthorDate: Tue Sep 5 16:55:50 2017 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Wed Sep 30 12:09:31 2020 +0200

libxslt: upgrade to release 1.1.30

* drop most of libxslt-internal-symbols.patch, fixed upstream

Reviewed-on: https://gerrit.libreoffice.org/41947
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 1d7b3cbe1f08319eddf88aac04923ae44873f246)

Conflicts:
download.lst

Change-Id: I59cf57a4d3139ad5fa0e5ce1a6cdaaa568ae3a40

diff --git a/Makefile.fetch b/Makefile.fetch
index cd4e8d3f6336..5961c9d3a5de 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -96,6 +96,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,PYTHON,PYTHON_TARBALL) \
$(call fetch_Optional,VISIO,VISIO_TARBALL) \
$(call fetch_Optional,ZLIB,ZLIB_TARBALL) \
+   $(call fetch_Optional,LIBXSLT,LIBXSLT_TARBALL) \
,$(call 
fetch_Download_item_special,https://dev-www.libreoffice.org/src,$(item)))
$(foreach item, \
$(call fetch_Optional,AFMS,$(AFMS_TARBALL)) \
@@ -149,7 +150,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,LIBLANGTAG,$(LIBLANGTAG_TARBALL)) \
$(call fetch_Optional,LIBXML2,$(LIBXML_TARBALL)) \
$(LIBXMLSEC_TARBALL) \
-   $(call fetch_Optional,LIBXSLT,$(LIBXSLT_TARBALL)) \
$(call fetch_Optional,LPSOLVE,$(LPSOLVE_TARBALL)) \
$(call fetch_Optional,MDDS,$(MDDS_TARBALL)) \
$(call fetch_Optional,MYSQLCPPCONN,$(MYSQLCPPCONN_TARBALL)) \
diff --git a/download.lst b/download.lst
index 914fd760ccb4..cda937e06284 100644
--- a/download.lst
+++ b/download.lst
@@ -94,7 +94,8 @@ export LIBEXTTEXTCAT_TARBALL := 
ae330b9493bd4503ac390106ff6060d7-libexttextcat-3
 export LIBLANGTAG_TARBALL := 
36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 export LIBXMLSEC_TARBALL := 
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 export LIBXML_TARBALL := ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz
-export LIBXSLT_TARBALL := 
a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz
+export LIBXSLT_MD5SUM := 70becbbcb1dad55f14de0b84171b91d5
+export LIBXSLT_TARBALL := libxslt-1.1.30.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
 export MDDS_TARBALL := a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2
diff --git a/external/libxslt/ExternalPackage_xslt.mk 
b/external/libxslt/ExternalPackage_xslt.mk
index 41c79a3fe462..4354bd4b6191 100644
--- a/external/libxslt/ExternalPackage_xslt.mk
+++ b/external/libxslt/ExternalPackage_xslt.mk
@@ -24,8 +24,8 @@ $(eval $(call 
gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.dll,wi
 $(eval $(call 
gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.dll,win32/bin.msvc/libexslt.dll))
 endif
 else # OS!=WNT
-$(eval $(call 
gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.29))
-$(eval $(call 
gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.17))
+$(eval $(call 
gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.30))
+$(eval $(call 
gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.18))
 endif
 endif # DISABLE_DYNLOADING
 
diff --git a/external/libxslt/UnpackedTarball_xslt.mk 
b/external/libxslt/UnpackedTarball_xslt.mk
index dd738106410f..c2d9827a3e5c 100644
--- a/external/libxslt/UnpackedTarball_xslt.mk
+++ b/external/libxslt/UnpackedTarball_xslt.mk
@@ -13,7 +13,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,xslt,$(LIBXSLT_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,xslt,\
external/libxslt/libxslt-config.patch.1 \
-   external/libxslt/libxslt-internal-symbols.patch \
+   external/libxslt/libxslt-internal-symbols.patch.1 \
external/libxslt/libxslt-msvc.patch.2 \
external/libxslt/libxslt-1.1.26-memdump.patch \
external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 \
diff --git a/external/libxslt/libxslt-internal-symbols.patch 
b/external/libxslt/libxslt-internal-symbols.patch
deleted file mode

[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - download.lst external/libxslt

2020-09-30 Thread Michael Stahl (via logerrit)

 download.lst   
  |2 
 
external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1
 |   29 --
 external/libxslt/ExternalPackage_xslt.mk   
  |2 
 external/libxslt/UnpackedTarball_xslt.mk   
  |6 --
 external/libxslt/libxslt-android.patch 
  |   15 -
 external/libxslt/libxslt-configure.patch.1 
  |   23 ---
 external/libxslt/libxslt-freebsd.patch.1   
  |   28 -
 external/libxslt/libxslt-msvc.patch.2  
  |   13 
 8 files changed, 3 insertions(+), 115 deletions(-)

New commits:
commit ea32f1ca30ac533045b618c2a2147c5dd0b21287
Author: Michael Stahl 
AuthorDate: Wed Jun 1 14:02:49 2016 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Wed Sep 30 11:14:59 2020 +0200

libxslt: upgrade to release 1.1.29

* drop libxslt-freebsd.patch.1
  fixed in new upstream libtool
* drop libxslt-config-guess.patch.0
  fixed in new upstream autoconf
* drop libxslt-android.patch
  fixed in new upstream autoconf
* drop libxslt-configure.patch.1
  fixed upstream
* drop libxslt-vc15.patch
  fixed upstream
* drop second hunk of libxslt-vc10.patch
  fixed upstream
* drop 0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1
  fixed upstream

Reviewed-on: https://gerrit.libreoffice.org/25775
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

Conflicts:
external/libxslt/UnpackedTarball_xslt.mk

Change-Id: I7427725ed6c82da53de12c9e1676e6ce02fd6483

diff --git a/download.lst b/download.lst
index 802f2c3ae6ef..914fd760ccb4 100644
--- a/download.lst
+++ b/download.lst
@@ -94,7 +94,7 @@ export LIBEXTTEXTCAT_TARBALL := 
ae330b9493bd4503ac390106ff6060d7-libexttextcat-3
 export LIBLANGTAG_TARBALL := 
36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 export LIBXMLSEC_TARBALL := 
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 export LIBXML_TARBALL := ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz
-export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
+export LIBXSLT_TARBALL := 
a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
 export MDDS_TARBALL := a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2
diff --git 
a/external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1
 
b/external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1
deleted file mode 100644
index 4f87e798fb57..
--- 
a/external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard 
-Date: Thu, 29 Oct 2015 19:33:23 +0800
-Subject: [PATCH] Fix for type confusion in preprocessing attributes
-
-CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10
-We need to check that the parent node is an element before dereferencing
-its namespace

- libxslt/preproc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libxslt/preproc.c b/libxslt/preproc.c
-index 0eb80a0..7f69325 100644
 a/libxslt/preproc.c
-+++ b/libxslt/preproc.c
-@@ -2249,7 +2249,8 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr 
inst) {
-   } else if (IS_XSLT_NAME(inst, "attribute")) {
-   xmlNodePtr parent = inst->parent;
- 
--  if ((parent == NULL) || (parent->ns == NULL) ||
-+  if ((parent == NULL) ||
-+  (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) ||
-   ((parent->ns != inst->ns) &&
-(!xmlStrEqual(parent->ns->href, inst->ns->href))) ||
-   (!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) {
--- 
-2.4.3
-
diff --git a/external/libxslt/ExternalPackage_xslt.mk 
b/external/libxslt/ExternalPackage_xslt.mk
index 602a281439dd..41c79a3fe462 100644
--- a/external/libxslt/ExternalPackage_xslt.mk
+++ b/external/libxslt/ExternalPackage_xslt.mk
@@ -24,7 +24,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.dll,wi
 $(eval $(call 
gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.dll,win32/bin.msvc/libexslt.dll))
 endif
 else # OS!=WNT
-$(eval $(call 
gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.28))
+$(eval $(call 
gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.29))
 $(eval $(call

[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - download.lst external/libxslt

[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - download.lst external/libxslt Makefile.fetch

[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - download.lst external/libxslt

3 matches

Site Navigation

Mail list logo

Footer information