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.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 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 1511c01..b24b1f1 100644 --- a/jsoup-build.xml +++ b/jsoup-build.xml @@ -11,7 +11,7 @@ - + @@ -24,11 +24,21 @@ - + + + + + + + + + + + @@ -56,6 +66,7 @@ + @@ -95,12 +106,14 @@ 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" windowtitle="${project.name} ${project.version} API" - breakiterator="false"/> + breakiterator="false"> + + @@ -122,10 +135,10 @@ - - + + - + 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 diff --git a/jsoup.spec b/jsoup.spec index 375709b..43e339a 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,21 +17,20 @@ 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 +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 BuildRequires: javapackages-local +BuildRequires: jsr-305 BuildArch: noarch %description @@ -58,14 +57,17 @@ 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 -%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