From 0e238df04d38e2c17ea8c10bde72b106f6f4fb8ee1163380fbaa0e60e43c438e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 25 Aug 2021 13:43:14 +0000 Subject: [PATCH 1/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsoup?expand=0&rev=6 --- jsoup-1.14.2.tar.gz | 3 +++ jsoup-build.xml | 23 ++++++++++++++++++----- jsoup.spec | 14 +++++++++----- 3 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 jsoup-1.14.2.tar.gz diff --git a/jsoup-1.14.2.tar.gz b/jsoup-1.14.2.tar.gz new file mode 100644 index 0000000..fcc0934 --- /dev/null +++ b/jsoup-1.14.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84e5bf69bd73e50fb348a0963a067e8306a77db6ffc54dac1aa16c9fb9cfb4e5 +size 299703 diff --git a/jsoup-build.xml b/jsoup-build.xml index 1511c01..4a0877e 100644 --- a/jsoup-build.xml +++ b/jsoup-build.xml @@ -11,7 +11,7 @@ - + @@ -24,11 +24,21 @@ - + + + + + + + + + + + @@ -56,6 +66,7 @@ + @@ -100,7 +111,9 @@ overview="${build.javadocDir.0}/overview.html" doctitle="${project.name} ${project.version} API" windowtitle="${project.name} ${project.version} API" - breakiterator="false"/> + breakiterator="false"> + + @@ -122,8 +135,8 @@ - - + + diff --git a/jsoup.spec b/jsoup.spec index 375709b..353f6b1 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,7 +1,7 @@ # # spec file for package jsoup # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: jsoup -Version: 1.11.3 +Version: 1.14.2 Release: 0 Summary: Java library for working with HTML License: MIT Group: Development/Libraries/Java -URL: http://jsoup.org/ +URL: https://jsoup.org/ # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz Source1: %{name}-build.xml @@ -32,6 +32,7 @@ BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 1.7 BuildRequires: javapackages-local +BuildRequires: jsr-305 BuildArch: noarch %description @@ -62,10 +63,13 @@ API documentation for %{name}. cp %{SOURCE1} . %pom_remove_plugin :animal-sniffer-maven-plugin -%pom_remove_plugin :maven-javadoc-plugin +%pom_remove_plugin :japicmp-maven-plugin +%pom_remove_plugin :maven-failsafe-plugin %build -%ant -f %{name}-build.xml jar javadoc +mkdir -p lib +build-jar-repository -s lib jsr-305 +%{ant} -f %{name}-build.xml jar javadoc %install # jar From 035dc2f2d993b8e7b1fbbf09cae394ca9a8af4af366e47ea0e499687de1f633d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 25 Aug 2021 13:44:38 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsoup?expand=0&rev=7 --- jsoup-1.11.3.tar.gz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 jsoup-1.11.3.tar.gz diff --git a/jsoup-1.11.3.tar.gz b/jsoup-1.11.3.tar.gz deleted file mode 100644 index 39c35b6..0000000 --- a/jsoup-1.11.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6054c9a7f5cc99b2e6c12016e68075a59b76d4415a626cc609f6a2bc8bddf805 -size 242975 From 5018b5d99022d6a55ee238bef6c5619759f9fa59dcc81a54222fa4fc1247a711 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 26 Aug 2021 07:00:57 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsoup?expand=0&rev=8 --- jsoup-build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsoup-build.xml b/jsoup-build.xml index 4a0877e..cfc9f6f 100644 --- a/jsoup-build.xml +++ b/jsoup-build.xml @@ -135,8 +135,8 @@ - - + + From 5c00cebf86628e9e517702c7dc3e533dd20e93a5911d89a5eec9d39b5af5ec6e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 26 Aug 2021 13:30:41 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsoup?expand=0&rev=9 --- jsoup-build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsoup-build.xml b/jsoup-build.xml index cfc9f6f..4a0877e 100644 --- a/jsoup-build.xml +++ b/jsoup-build.xml @@ -135,8 +135,8 @@ - - + + From 1e9930d8424c94995f7d6efae04bfbfbff1f322c65437b13bee4a22c980ab6c1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 27 Aug 2021 06:55:02 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsoup?expand=0&rev=10 --- _service | 14 ++++++++++++++ generate-tarball.sh | 21 --------------------- jsoup-1.14.2.tar.gz | 3 --- jsoup-1.14.2.tar.xz | 3 +++ jsoup-build.xml | 8 ++++---- jsoup.spec | 6 ++---- 6 files changed, 23 insertions(+), 32 deletions(-) create mode 100644 _service delete mode 100644 generate-tarball.sh delete mode 100644 jsoup-1.14.2.tar.gz create mode 100644 jsoup-1.14.2.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..577f47c --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/jhy/jsoup.git + 1.14.2 + jsoup-1.14.2 + src/test/resources + + + *.tar + xz + + + diff --git a/generate-tarball.sh b/generate-tarball.sh deleted file mode 100644 index e504d9c..0000000 --- a/generate-tarball.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -set -e - -name=jsoup -version="$(sed -n 's/Version:\s*//p' *.spec)" - -# RETRIEVE -wget "https://github.com/jhy/${name}/archive/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" - -rm -rf tarball-tmp -mkdir tarball-tmp -cd tarball-tmp -tar xf "../${name}-${version}.orig.tar.gz" - -# CLEAN TARBALL -# contains scraped news articles (non-free) -rm -r */src/test/resources - -tar czf "../${name}-${version}.tar.gz" * -cd .. -rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/jsoup-1.14.2.tar.gz b/jsoup-1.14.2.tar.gz deleted file mode 100644 index fcc0934..0000000 --- a/jsoup-1.14.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84e5bf69bd73e50fb348a0963a067e8306a77db6ffc54dac1aa16c9fb9cfb4e5 -size 299703 diff --git a/jsoup-1.14.2.tar.xz b/jsoup-1.14.2.tar.xz new file mode 100644 index 0000000..3059833 --- /dev/null +++ b/jsoup-1.14.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0857c2c3399879acdd239ef3d56fdcbfe73311d304cf72fb9f3c7ac24f3ef221 +size 227624 diff --git a/jsoup-build.xml b/jsoup-build.xml index 4a0877e..b24b1f1 100644 --- a/jsoup-build.xml +++ b/jsoup-build.xml @@ -106,7 +106,7 @@ nonavbar="false" serialwarn="false" source="${compiler.source}" - encoding="${project.build.sourceEncoding}" + encoding="${project.build.sourceEncoding}" linksource="false" overview="${build.javadocDir.0}/overview.html" doctitle="${project.name} ${project.version} API" @@ -135,10 +135,10 @@ - - + + - + diff --git a/jsoup.spec b/jsoup.spec index 353f6b1..43e339a 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -24,10 +24,8 @@ License: MIT Group: Development/Libraries/Java URL: https://jsoup.org/ # ./generate-tarball.sh -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.xz Source1: %{name}-build.xml -# The sources contain non-free scraped web pages as test data -Source100: generate-tarball.sh BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 1.7 @@ -59,7 +57,7 @@ Group: Documentation/HTML API documentation for %{name}. %prep -%setup -q -n %{name}-%{name}-%{version} +%setup -q cp %{SOURCE1} . %pom_remove_plugin :animal-sniffer-maven-plugin From 7ad0bbed8e7d14a52a63eab3b47fd99eccb6b77dabe722f55a54b2191a28d5ce Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 27 Aug 2021 06:58:30 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsoup?expand=0&rev=11 --- jsoup.changes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jsoup.changes b/jsoup.changes index 5abc228..69ebd21 100644 --- a/jsoup.changes +++ b/jsoup.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 27 06:57:23 UTC 2021 - Fridrich Strba + +- Upgrade to upstream version 1.14.2 + * fixes bsc#1189749, CVE-2021-37714 +- Generate tarball using source service instead of a script + ------------------------------------------------------------------- Fri Feb 22 22:39:00 UTC 2019 - Fridrich Strba