Skip to content

Commit

Permalink
Merge branch 'flavorjones-try-libxml-2.9.9'
Browse files Browse the repository at this point in the history
  • Loading branch information
flavorjones committed Jan 4, 2019
2 parents 416651c + c5d661f commit d48820a
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 148 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ This release ends support for:
* JRuby 1.7, for which [official support ended on 2017-11-21](https://github.com/jruby/jruby/issues/4112) [#1741]


### Dependencies

* [MRI] libxml2 is updated from 2.9.8 to 2.9.9
* [MRI] libxslt is updated from 1.1.32 to 1.1.33


## 1.9.1 / 2018-12-17

### Bug fixes
Expand Down
2 changes: 0 additions & 2 deletions Manifest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -234,5 +234,3 @@ lib/xercesImpl.jar
lib/xml-apis.jar
lib/xsd/xmlparser/nokogiri.rb
patches/libxml2/0001-Revert-Do-not-URI-escape-in-server-side-includes.patch
patches/libxml2/0002-Fix-nullptr-deref-with-XPath-logic-ops.patch
patches/libxml2/0003-Fix-infinite-loop-in-LZMA-decompression.patch
87 changes: 45 additions & 42 deletions dependencies.yml
Original file line number Diff line number Diff line change
@@ -1,56 +1,59 @@
libxml2:
version: "2.9.8"
sha256: "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732"
# manually verified checksum:
version: "2.9.9"
sha256: "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"
# manually verified checksum:
#
# $ gpg --verify libxml2-2.9.8.tar.gz.asc ./ports/archives/libxml2-2.9.8.tar.gz
# gpg: Signature made Mon 05 Mar 2018 11:07:45 AM EST using RSA key ID 596BEA5D
# gpg: Good signature from "Daniel Veillard (Red Hat work email) <[email protected]>"
# gpg: aka "Daniel Veillard <[email protected]>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: C744 15BA 7C9C 7F78 F02E 1DC3 4606 B8A5 DE95 BC1F
# Subkey fingerprint: DB46 681B B91A DCEA 170F A2D4 1558 8B26 596B EA5D
# $ gpg --verify libxml2-2.9.9.tar.gz.asc ports/archives/libxml2-2.9.9.tar.gz
# gpg: Signature made Thu 03 Jan 2019 01:14:47 PM EST
# gpg: using RSA key 15588B26596BEA5D
# gpg: Good signature from "Daniel Veillard (Red Hat work email) <[email protected]>" [unknown]
# gpg: aka "Daniel Veillard <[email protected]>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: C744 15BA 7C9C 7F78 F02E 1DC3 4606 B8A5 DE95 BC1F
# Subkey fingerprint: DB46 681B B91A DCEA 170F A2D4 1558 8B26 596B EA5D
#
# using this pgp signature:
# -----BEGIN PGP SIGNATURE-----
# using this pgp signature:
#
# iQEcBAABAgAGBQJanWtRAAoJEBVYiyZZa+pdV7oIAJWdFahwt+reN/Zt2RPmjjcr
# eSsY7UV1RXjScnNjTzJT1h2hJ7SnUjCkqjR6VdtKDUIzpuX+S2U83joafJH6mxUb
# yw2nO4RfjYTPxpz5JkvqT7jmgEIaD81BuwcMehqpMpIfiKa2NgO1DSfZxgs8a9E2
# +ehc/kZWuI5gmNGrd84EEWUqpYW/Xx7jy02osioJuU5IMPjzZKNR3maXp9oAKeBc
# S2QNa1ID/pUk3K3M/5nlwNgAtQ7lxQrqhrSma2dsKt/IpL6VXomxuD4Bh1r2MZhX
# uZ456X/xJN8UmPewLZWGBU1MK9wqu3Zx5Qwz64H6UdlYIzXZ2jXj2YWZa6xkxPA=
# =69xn
# -----END PGP SIGNATURE-----
# -----BEGIN PGP SIGNATURE-----
#
# iQEbBAABAgAGBQJcLlEXAAoJEBVYiyZZa+pd1B8H93xeCYNBLx+eX0xe3qS3ReS/
# YstjkXKUkmDQYwqQ/9Knmv1P6NX64hQL5E1pZX5sXp36giwXXJ5tCK72VRzektzU
# Kpo+M1/QA9feZQs1GmyKaXYzNwTSJnsdKA9nWqTHZ3bzfdhFSZ0czo94vgY/cz5z
# 9P3FIgeldj1vi8p2rjXbArMFQyaxHnve9LdxI8hbudNSeUw/FEV6mjtXrlZ7MXqn
# hmAkah2JwktOStF5tIlddCRqZeUPUX5flBxT95gfskXXlGEhaoGMXcC3izqqJyV2
# sx5nY7fnXdkwfYsgRUXYWmDmbs8DnFjXH9lux9O4OWglLonaRoAqFPcOzE3aCw==
# =4qWg
# -----END PGP SIGNATURE-----
#

libxslt:
version: "1.1.32"
sha256: "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460"
# manually verified checksum:
version: "1.1.33"
sha256: "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8"
# manually verified checksum:
#
# $ gpg --verify libxslt-1.1.32.tar.gz.asc libxslt-1.1.32.tar.gz
# gpg: Signature made Thu 02 Nov 2017 04:35:04 PM EDT using RSA key ID 596BEA5D
# gpg: Good signature from "Daniel Veillard (Red Hat work email) <[email protected]>"
# gpg: aka "Daniel Veillard <[email protected]>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: C744 15BA 7C9C 7F78 F02E 1DC3 4606 B8A5 DE95 BC1F
# Subkey fingerprint: DB46 681B B91A DCEA 170F A2D4 1558 8B26 596B EA5D
# $ gpg --verify libxslt-1.1.33.tar.gz.asc ports/archives/libxslt-1.1.33.tar.gz
# gpg: Signature made Thu 03 Jan 2019 01:30:49 PM EST
# gpg: using RSA key 15588B26596BEA5D
# gpg: Good signature from "Daniel Veillard (Red Hat work email) <[email protected]>" [unknown]
# gpg: aka "Daniel Veillard <[email protected]>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: C744 15BA 7C9C 7F78 F02E 1DC3 4606 B8A5 DE95 BC1F
# Subkey fingerprint: DB46 681B B91A DCEA 170F A2D4 1558 8B26 596B EA5D
#
# using this pgp signature:
# using this pgp signature:
#
# -----BEGIN PGP SIGNATURE-----
# -----BEGIN PGP SIGNATURE-----
#
# iQEcBAABAgAGBQJZ+4F4AAoJEBVYiyZZa+pdy1IIAMX1DpzYGdnv6GCPSKeZ0woD
# sHmSkygJep0/sUQD1cYunNsNZnGDgWhnsLAvHOn3opJgsiaZhmhJ8Uo7QNlT+ni1
# AvRFgQoSXLWSF5kkun4u7RvnpDI6jYfCuYSwb9SO4EAYFAQQJXQaKCeFq71gad+p
# XGHJFAy2TqUVLNZ5I1mQz/oBeDsJ7RzHpYqaBxsLDqrCzRQ9ai23q+dFGS3jvLBr
# 0gXw0MK73ceOwW12L5aLj4erNbATWmMFMDYZZwftysv3bgx2YfiOoZUTzufrB/Bc
# MG8hP76aYBwIKNbhiDFGa2qdHGZGF7YQ4mi1/ZDX1K1G2tKKeEYxscM13JwiGb8=
# =NuQO
# -----END PGP SIGNATURE-----
# iQEcBAABAgAGBQJcLlTZAAoJEBVYiyZZa+pd9NkIAIf6ei2iSpR/0QOyS71esDq8
# 407PcUXd/yUjDANm4Uvm7kKK+SbbfBxFIPva4g984Noe1zYMfjK3u3iNs6jykySf
# mN5eo2wNCxsZnqjbnsLgQvn5VCQpPInTddTuGUxgqJyvnR7p785L1oA2EStSPMP4
# BGZ9dZGlbreK35WzgrhUi0VN5egJW2fpMsw7rTPvfwK+90gXL0DEm8v3WlA7fCDL
# QsvuPm7jPOXxdt5bYrVP8wpNMTJIGqV6jxh7Vvl6kiGLldUjCyoCh0AGXLror0Gs
# sAMlRKJNodpcCYkIWxzjLt74sUciKNrPLHZlXJcclZMONen1GWnVDcv83Tt9n6w=
# =iAm8
# -----END PGP SIGNATURE-----
#

zlib:
Expand Down
54 changes: 0 additions & 54 deletions patches/libxml2/0002-Fix-nullptr-deref-with-XPath-logic-ops.patch

This file was deleted.

50 changes: 0 additions & 50 deletions patches/libxml2/0003-Fix-infinite-loop-in-LZMA-decompression.patch

This file was deleted.

0 comments on commit d48820a

Please sign in to comment.