Accepting request 914521 from Java:packages
bsc#1189749, CVE-2021-37714 OBS-URL: https://build.opensuse.org/request/show/914521 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jsoup?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
a54aead3c9
14
_service
Normal file
14
_service
Normal file
@ -0,0 +1,14 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">https://github.com/jhy/jsoup.git</param>
|
||||
<param name="version">1.14.2</param>
|
||||
<param name="revision">jsoup-1.14.2</param>
|
||||
<param name="exclude">src/test/resources</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
<service name="set_version" mode="disabled"/>
|
||||
</services>
|
||||
@ -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"
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6054c9a7f5cc99b2e6c12016e68075a59b76d4415a626cc609f6a2bc8bddf805
|
||||
size 242975
|
||||
3
jsoup-1.14.2.tar.xz
Normal file
3
jsoup-1.14.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0857c2c3399879acdd239ef3d56fdcbfe73311d304cf72fb9f3c7ac24f3ef221
|
||||
size 227624
|
||||
@ -11,7 +11,7 @@
|
||||
<property name="project.name" value="jsoup Java HTML Parser"/>
|
||||
<property name="project.groupId" value="org.jsoup"/>
|
||||
<property name="project.artifactId" value="jsoup"/>
|
||||
<property name="project.version" value="1.11.3"/>
|
||||
<property name="project.version" value="1.14.2"/>
|
||||
<property name="project.description" value="jsoup is a Java library for working with real-world HTML. It provides a very convenient API for extracting and manipulating data, using the best of DOM, CSS, and jquery-like methods. jsoup implements the WHATWG HTML5 specification, and parses HTML to the same DOM as modern browsers do."/>
|
||||
<property name="project.organization.name" value="Jonathan Hedley"/>
|
||||
<property name="project.build.sourceEncoding" value="UTF-8"/>
|
||||
@ -24,11 +24,21 @@
|
||||
<property name="build.resourceDir.0" value="src/main/java"/>
|
||||
<property name="build.resourceDir.1" value="."/>
|
||||
|
||||
<property name="compiler.source" value="1.7"/>
|
||||
<property name="compiler.source" value="1.8"/>
|
||||
<property name="compiler.target" value="${compiler.source}"/>
|
||||
|
||||
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Defining classpaths -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<path id="build.classpath">
|
||||
<fileset dir="lib">
|
||||
<include name="**/*.jar"/>
|
||||
</fileset>
|
||||
</path>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Cleaning up target -->
|
||||
<!-- ====================================================================== -->
|
||||
@ -56,6 +66,7 @@
|
||||
<src>
|
||||
<pathelement location="${build.srcDir.0}"/>
|
||||
</src>
|
||||
<classpath refid="build.classpath"/>
|
||||
</javac>
|
||||
<copy todir="${build.outputDir}">
|
||||
<fileset dir="${build.resourceDir.0}">
|
||||
@ -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">
|
||||
<classpath refid="build.classpath"/>
|
||||
</javadoc>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
@ -122,10 +135,10 @@
|
||||
<attribute name="Bundle-SymbolicName" value="org.jsoup"/>
|
||||
<attribute name="Bundle-Vendor" value="${project.organization.name}"/>
|
||||
<attribute name="Bundle-Version" value="${project.version}"/>
|
||||
<attribute name="Export-Package" value="org.jsoup;uses:="javax.net.ssl,org.jsoup.nodes,org.jsoup.parser,org.jsoup.safety";version="${project.version}",org.jsoup.nodes;uses:="org.jsoup,org.jsoup.parser,org.jsoup.select";version="${project.version}",org.jsoup.parser;uses:="org.jsoup.nodes";version="${project.version}",org.jsoup.helper;uses:="javax.net.ssl,javax.xml.parsers,org.jsoup,org.jsoup.nodes,org.jsoup.parser,org.jsoup.select,org.w3c.dom";version="${project.version}",org.jsoup.select;uses:="org.jsoup.nodes";version="${project.version}",org.jsoup.examples;uses:="org.jsoup.nodes";version="${project.version}",org.jsoup.safety;uses:="org.jsoup.nodes";version="${project.version}""/>
|
||||
<attribute name="Import-Package" value="javax.net.ssl,javax.xml.parsers,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.stream,org.jsoup,org.w3c.dom"/>
|
||||
<attribute name="Export-Package" value="org.jsoup;uses:="javax.annotation,javax.net.ssl,org.jsoup.nodes,org.jsoup.parser,org.jsoup.safety";version="${project.version}",org.jsoup.examples;uses:="org.jsoup.nodes";version="${project.version}",org.jsoup.helper;uses:="javax.annotation,javax.net.ssl,javax.xml.parsers,org.jsoup,org.jsoup.nodes,org.jsoup.parser,org.jsoup.select,org.w3c.dom";version="${project.version}",org.jsoup.internal;uses:="javax.annotation,javax.annotation.meta";version="${project.version}",org.jsoup.nodes;uses:="javax.annotation,org.jsoup,org.jsoup.parser,org.jsoup.select";version="${project.version}",org.jsoup.parser;uses:="javax.annotation,org.jsoup.nodes";version="${project.version}",org.jsoup.safety;uses:="org.jsoup.nodes";version="${project.version}",org.jsoup.select;uses:="javax.annotation,org.jsoup.nodes";version="${project.version}""/>
|
||||
<attribute name="Import-Package" value="javax.annotation,javax.annotation.meta,javax.net.ssl,javax.xml.parsers,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.stream,org.jsoup,org.jsoup.helper,org.jsoup.internal,org.jsoup.nodes,org.jsoup.parser,org.jsoup.safety,org.jsoup.select,org.w3c.dom"/>
|
||||
<attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/>
|
||||
</manifest>
|
||||
</manifest>
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 27 06:57:23 UTC 2021 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- 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 <fstrba@suse.com>
|
||||
|
||||
|
||||
20
jsoup.spec
20
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user