From cb3f065c822b81c597cc64d81ee621ec9e94fa0d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 09 2023 05:35:14 +0000 Subject: import ongres-scram-1.9~beta1-1.module+el9.2.0+18203+94903160 --- diff --git a/.gitignore b/.gitignore index f7f8cda..d7a959d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/scram-1.0.0-beta.2.tar.gz +SOURCES/scram-1.9-beta1.tar.gz diff --git a/.ongres-scram.metadata b/.ongres-scram.metadata index ab15bb1..a893640 100644 --- a/.ongres-scram.metadata +++ b/.ongres-scram.metadata @@ -1 +1 @@ -eeeeb9d71d8361e4f6b92b99307419ddd1b32b4d SOURCES/scram-1.0.0-beta.2.tar.gz +81d98734200a66ab6c08c2338f183a116af09380 SOURCES/scram-1.9-beta1.tar.gz diff --git a/SOURCES/remove-annotations.patch b/SOURCES/remove-annotations.patch new file mode 100644 index 0000000..fd0240b --- /dev/null +++ b/SOURCES/remove-annotations.patch @@ -0,0 +1,19 @@ +--- common/src/main/java/com/ongres/scram/common/message/ServerFinalMessage.java 2019-06-28 19:55:36.000000000 +0200 ++++ common/src/main/java/com/ongres/scram/common/message/ServerFinalMessage.java.new 2023-01-02 13:55:25.491161211 +0100 +@@ -37,8 +37,6 @@ + import com.ongres.scram.common.util.StringWritable; + import com.ongres.scram.common.util.StringWritableCsv; + +-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +- + + /** + * Constructs and parses server-final-messages. Formal syntax is: +@@ -162,7 +160,6 @@ + return null != error; + } + +- @SuppressFBWarnings("EI_EXPOSE_REP") + public byte[] getVerifier() { + return verifier; + } diff --git a/SPECS/ongres-scram.spec b/SPECS/ongres-scram.spec index d52f729..47a4bbe 100644 --- a/SPECS/ongres-scram.spec +++ b/SPECS/ongres-scram.spec @@ -1,16 +1,18 @@ %global upstream_name scram -%global upstream_version 1.0.0-beta.2 +%global upstream_version 1.9-beta1 Name: ongres-%upstream_name Version: %(echo %upstream_version | sed 's/-/~/g') -Release: 15%{?dist} +Release: 1%{?dist} Summary: Salted Challenge Response Authentication Mechanism (SCRAM) - Java Implementation -License: BSD +License: BSD and MIT and ASL 2.0 URL: https://github.com/ongres/%upstream_name Source0: https://github.com/ongres/%upstream_name/archive/%upstream_version/%upstream_name-%upstream_version.tar.gz BuildRequires: maven-local junit BuildArch: noarch +Patch0: remove-annotations.patch + %description This is a Java implementation of SCRAM (Salted Challenge Response Authentication Mechanism) which is part of the family of Simple @@ -19,6 +21,7 @@ mechanisms. It is described as part of RFC 5802 and RFC7677. %package client Summary: Client for %{name} +License: BSD %description client This package contains the client for %{name} @@ -31,17 +34,20 @@ This package contains javadoc for %{name} %package parent Summary: Parent POM of %{name} +License: BSD %description parent This package contains the %{name} parent POM. %prep -%autosetup -p1 -n "%upstream_name-%upstream_version" +%autosetup -p0 -n "%upstream_name-%upstream_version" find \( -name '*.jar' -o -name '*.class' \) -delete %pom_remove_plugin :nexus-staging-maven-plugin %pom_remove_plugin :maven-source-plugin %pom_remove_plugin :maven-dependency-plugin client %pom_remove_plugin -r :maven-javadoc-plugin +%pom_remove_dep com.google.code.findbugs:annotations + %build %mvn_build -s @@ -50,7 +56,7 @@ find \( -name '*.jar' -o -name '*.class' \) -delete %mvn_install %files -f .mfiles-common -%license LICENSE +%license LICENSE NOTICE thirdparty/bouncycastle-LICENSE thirdparty/saslprep-LICENSE %files client -f .mfiles-client %license LICENSE @@ -62,6 +68,10 @@ find \( -name '*.jar' -o -name '*.class' \) -delete %license LICENSE %changelog +* Wed Dec 21 2022 Zuzana Miklankova - 1.9.0~beta1-1 +- Rebase to 1.9-beta1 +- change of licences of ongres-scram and ongres-scram-javadoc to "BSD and MIT and ASL 2.0" + * Mon Aug 09 2021 Mohan Boddu - 1.0.0~beta.2-15 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688