From b89e063e375ce9d9805401975a6ed5fa17afe7c8 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 31 Jul 2019 13:10:31 +0200
Subject: [PATCH] Update to upstream version 2.7.2

---
 .gitignore          |  4 ++++
 generate-tarball.sh |  2 +-
 sources             |  8 ++++----
 xalan-j2.spec       | 24 +++++++++++-------------
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 25135ae..1806014 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,7 @@ xalan-j_2_7_1-src.tar.gz
 /xalan-2.7.1.pom
 /xsltc-2.7.1.pom
 /xalan-j2-2.7.1.tar.gz
+/xalan-j2-2.7.2.tar.gz
+/xalan-2.7.2.pom
+/serializer-2.7.2.pom
+/xsltc-2.7.2.pom
diff --git a/generate-tarball.sh b/generate-tarball.sh
index bee814c..dc65318 100755
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -5,7 +5,7 @@ name=xalan-j2
 version="$(sed -n 's/Version:\s*//p' *.spec)"
 
 # RETRIEVE
-wget "http://archive.apache.org/dist/xml/xalan-j/xalan-j_${version//./_}-src.tar.gz" -O "${name}-${version}.orig.tar.gz"
+wget "http://apache.miloslavbrada.cz/xalan/xalan-j/source/xalan-j_${version//./_}-src.tar.gz" -O "${name}-${version}.orig.tar.gz"
 
 rm -rf tarball-tmp
 mkdir tarball-tmp
diff --git a/sources b/sources
index cfbfa6a..a3431fd 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (xalan-j2-2.7.1.tar.gz) = 695d3dd18974e0041a398774106ff2cf76435b1827e2c698036d6384cabbe8811e3045fb8ea115bf15f91136af1b56617cac647e06d25ced07b9e1e880714552
-SHA512 (xalan-2.7.1.pom) = 70ac6007b72674ddc861e73bd5c84732fefc71b7e60ed4030066d2ebc6367fa2ba4dda064b369544b70bd329a04e4b79c13e73f136710b2adf2a6616ce72bb03
-SHA512 (serializer-2.7.1.pom) = 910c397021681d4b3617a99cf5639e449bb8964c3ea81d3c03d0df1d6054c04ceb5ffcc9d0fd4201dfaa348fad4581449dd720d5a85b99c61b415c332dd4222c
-SHA512 (xsltc-2.7.1.pom) = a4cc7c36ea6cb37ffde9cf1b5e661aa82803b12ed51dd6ade70d52d7f33d0191ee66d6a9d7688b1119dcafd07c4e0aa0af6cb3be355b6e8a30ee8e1f7e2aa94d
+SHA512 (xalan-j2-2.7.2.tar.gz) = eee706314640d3f1966abca0f14c84ab0f6f4ec8f36dd55975e9fd0809710b94e233df3fd34700a21f89e4cc115ff289bbc522524ef8997858b6fa270467495a
+SHA512 (xalan-2.7.2.pom) = 4b95e3eb3a2ab262c9a27040a5214cfb8c49c36ece8e71a933074eb063205ef96deff351f017b034c9c97d43d77b020482aade7bc01e1245d8ee10a51269c5ce
+SHA512 (serializer-2.7.2.pom) = 1a20cd7008ab876f9605a67515d558b26b9be009c4f49cb27ddf5aa715b5d164c476c236b6d6edf39e81538dfb1516271c3859af8e73f8cdbeee24efb45e9a44
+SHA512 (xsltc-2.7.2.pom) = 89c5c2cd358c32a9b8073869abdcb1df21a95c21a1a099c1b91f25ac3de7fdf9893977cb227efa4dad1de29773aaaef155155d1ec8648aae3c2e512154c200ef
diff --git a/xalan-j2.spec b/xalan-j2.spec
index 4fec765..92fb3c9 100644
--- a/xalan-j2.spec
+++ b/xalan-j2.spec
@@ -28,11 +28,11 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%global cvs_version 2_7_1
+%global cvs_version %(echo %{version} | tr . _)
 
 Name:           xalan-j2
-Version:        2.7.1
-Release:        39%{?dist}
+Version:        2.7.2
+Release:        1%{?dist}
 Summary:        Java XSLT processor
 # src/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java is W3C
 License:        ASL 2.0 and W3C
@@ -40,19 +40,15 @@ URL:            http://xalan.apache.org/
 
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
-Source1:        %{name}-serializer-MANIFEST.MF
-Source2:        http://repo1.maven.org/maven2/xalan/xalan/2.7.1/xalan-2.7.1.pom
-Source3:        http://repo1.maven.org/maven2/xalan/serializer/2.7.1/serializer-2.7.1.pom
+Source1:        xalan-j2-serializer-MANIFEST.MF
+Source2:        http://repo1.maven.org/maven2/xalan/xalan/%{version}/xalan-%{version}.pom
+Source3:        http://repo1.maven.org/maven2/xalan/serializer/%{version}/serializer-%{version}.pom
 Source4:        xsltc-%{version}.pom
-Source5:        %{name}-MANIFEST.MF
+Source5:        xalan-j2-MANIFEST.MF
 # Remove bundled binaries which cannot be easily verified for licensing
 Source6:        generate-tarball.sh
 
-Patch0:         %{name}-noxsltcdeps.patch
-# Fix CVE-2014-0107: insufficient constraints in secure processing
-# feature (oCERT-2014-002).  Generated form upstream revisions 1581058
-# and 1581426.
-Patch2:         %{name}-CVE-2014-0107.patch
+Patch0:         xalan-j2-noxsltcdeps.patch
 
 BuildArch:      noarch
 
@@ -116,7 +112,6 @@ Demonstrations and samples for %{name}.
 %prep
 %setup -q -n xalan-j_%{cvs_version}
 %patch0 -p0
-%patch2 -p1
 
 find . -name '*.jar' -delete
 find . -name '*.class' -delete
@@ -209,6 +204,9 @@ mv %{_javadir}/jaxp_transform_impl.jar{.tmp,} || :
 %{_datadir}/%{name}
 
 %changelog
+* Wed Jul 31 2019 Marian Koncek <mkoncek@redhat.com> - 2.7.2-1
+- Update to upstream version 2.7.2
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.7.1-39
 - Mass rebuild for javapackages-tools 201901