From 488551a5977c478ab09fe55dc4c351569b3f795da69d908ebd08a2ba8038a875 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 26 Aug 2021 06:14:58 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsr-305?expand=0&rev=34 --- _service | 13 ++++ jsr-305-20130910svn.tgz | 3 - jsr-305-3.0.2.tar.xz | 3 + jsr-305-ri-build.xml | 141 ++++++++++++++++++++++++++++++---------- jsr-305.spec | 30 +++------ 5 files changed, 133 insertions(+), 57 deletions(-) create mode 100644 _service delete mode 100644 jsr-305-20130910svn.tgz create mode 100644 jsr-305-3.0.2.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..806d1fa --- /dev/null +++ b/_service @@ -0,0 +1,13 @@ + + + git + https://github.com/amaembo/jsr-305.git + d7734b13c61492982784560ed5b4f4bd6cf9bb2c + 3.0.2 + + + *.tar + xz + + + diff --git a/jsr-305-20130910svn.tgz b/jsr-305-20130910svn.tgz deleted file mode 100644 index cc6d9b4..0000000 --- a/jsr-305-20130910svn.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc848a5aa60cb6e3fe0cc677df766a915057de11ac07940af3ba4471ee739517 -size 38557 diff --git a/jsr-305-3.0.2.tar.xz b/jsr-305-3.0.2.tar.xz new file mode 100644 index 0000000..f8fd2cc --- /dev/null +++ b/jsr-305-3.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c5beee060062f2e34ce81bf67a22e105c51e5b143d4d700b79f18a75788ffed +size 25324 diff --git a/jsr-305-ri-build.xml b/jsr-305-ri-build.xml index b3e3382..e200c46 100644 --- a/jsr-305-ri-build.xml +++ b/jsr-305-ri-build.xml @@ -1,40 +1,115 @@ - - - - - - - - - - - + - - - - + - - - - - + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - diff --git a/jsr-305.spec b/jsr-305.spec index e290ba5..c2bc486 100644 --- a/jsr-305.spec +++ b/jsr-305.spec @@ -1,7 +1,7 @@ # # spec file for package jsr-305 # -# 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 @@ -16,23 +16,14 @@ # -%global svn_revision 51 -%global svn_date 20130910 Name: jsr-305 -Version: 0.1+%{svn_date} +Version: 3.0.2 Release: 0 Summary: Correctness annotations for Java code -# The majority of code is BSD-licensed, but some Java sources -# are licensed under CC-BY license, see: $ grep -r Creative . License: BSD-3-Clause Group: Development/Libraries/Java -URL: http://code.google.com/p/jsr-305/ -# There has been no official release yet. This is a snapshot of the Subversion -# repository as of 10 Sep 2013. Use the following commands to generate the -# tarball: -# svn export -r %{svn_revision} http://%{name}.googlecode.com/svn/trunk %{name} -# tar -czvf %{name}-%{svn_date}svn.tgz %{name} -Source0: jsr-305-%{svn_date}svn.tgz +URL: https://code.google.com/p/jsr-305/ +Source0: %{name}-%{version}.tar.xz Source1: jsr-305-ri-build.xml # File containing URL to CC-BY license text Source2: NOTICE-CC-BY.txt @@ -55,7 +46,7 @@ Detection. This package contains the API documentation for %{name}. %prep -%setup -q -n %{name} +%setup -q cp -a %{SOURCE1} ri/build.xml cp %{SOURCE2} NOTICE-CC-BY dos2unix sampleUses/pom.xml @@ -68,27 +59,24 @@ for module in ri tcl sampleUses proposedAnnotations; do done %build -export OPT_JAR_LIST=: -export CLASSPATH= pushd ri -%{ant} -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ - -Dversion=%{version} -Djava.javadoc=%{_javadocdir}/java +%{ant} jar javadoc popd %install # jars install -dm 0755 %{buildroot}%{_javadir} -install -pm 0644 ri/jsr-305-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +install -pm 0644 ri/target/jsr305-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar ln -s %{name}.jar %{buildroot}%{_javadir}/jsr305.jar # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -pm 0644 ri/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom -%add_maven_depmap %{name}.pom %{name}.jar -a com.google.code.findbugs:jsr305 +%add_maven_depmap %{name}.pom %{name}.jar -a org.jsr-305:ri # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} -cp -pr ri/javadoc/* %{buildroot}%{_javadocdir}/%{name} +cp -pr ri/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles From de5b0f4c43cac6aa1171a7e69e1cf9a11af8f7a5dd65c5ba0a95b0d537c0f148 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 26 Aug 2021 07:03:07 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsr-305?expand=0&rev=35 --- jsr-305-ri-build.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/jsr-305-ri-build.xml b/jsr-305-ri-build.xml index e200c46..8fbb169 100644 --- a/jsr-305-ri-build.xml +++ b/jsr-305-ri-build.xml @@ -92,18 +92,18 @@ index="false" basedir="${build.outputDir}" excludes="**/package.html"> - + - - + + - - - - + + + + - - + + From 63d43033c9ae1f4356395162d500198e3eed3c309a362ab3849fbb7ba34fd1a6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 26 Aug 2021 07:05:59 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsr-305?expand=0&rev=36 --- jsr-305.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsr-305.spec b/jsr-305.spec index c2bc486..cc22911 100644 --- a/jsr-305.spec +++ b/jsr-305.spec @@ -72,7 +72,7 @@ ln -s %{name}.jar %{buildroot}%{_javadir}/jsr305.jar # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -pm 0644 ri/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom -%add_maven_depmap %{name}.pom %{name}.jar -a org.jsr-305:ri +%add_maven_depmap %{name}.pom %{name}.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} From 8520483695e6175561f6bce4c21abf07bd83133bba94c131fb296e0a33c466b7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 26 Aug 2021 10:11:05 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsr-305?expand=0&rev=37 --- jsr-305-ri-build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsr-305-ri-build.xml b/jsr-305-ri-build.xml index 8fbb169..2b50159 100644 --- a/jsr-305-ri-build.xml +++ b/jsr-305-ri-build.xml @@ -99,7 +99,7 @@ - + From 33fe0f21bc69b7694a658d0812a1f21184f5ef4be85474aeb19f7c580af491d5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 27 Aug 2021 07:00:46 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsr-305?expand=0&rev=38 --- jsr-305.changes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jsr-305.changes b/jsr-305.changes index 20a9432..f475e85 100644 --- a/jsr-305.changes +++ b/jsr-305.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 27 06:59:45 UTC 2021 - Fridrich Strba + +- Upgrade to upstream version 3.0.2 + * needed by the fix for bsc#1189749, CVE-2021-37714 in jsoup + package + ------------------------------------------------------------------- Sat Oct 5 12:51:38 UTC 2019 - Fridrich Strba