Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package jnr-netdb for openSUSE:Factory
checked in at 2021-07-10 00:00:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jnr-netdb (Old)
and /work/SRC/openSUSE:Factory/.jnr-netdb.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jnr-netdb"
Sat Jul 10 00:00:16 2021 rev:2 rq:905168 version:1.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/jnr-netdb/jnr-netdb.changes 2020-07-24
15:03:55.920114372 +0200
+++ /work/SRC/openSUSE:Factory/.jnr-netdb.new.2625/jnr-netdb.changes
2021-07-10 00:03:05.082776972 +0200
@@ -1,0 +2,7 @@
+Thu Jul 8 12:32:11 UTC 2021 - Anton Shvetz <shvetz.an...@gmail.com>
+
+- Update to v1.2.0
+- Change the package description
+- Install the artifact into %{_javadir}/jnr
+
+-------------------------------------------------------------------
Old:
----
jnr-netdb-1.1.6.tar.gz
New:
----
jnr-netdb-1.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jnr-netdb.spec ++++++
--- /var/tmp/diff_new_pack.iFeCG3/_old 2021-07-10 00:03:05.490773799 +0200
+++ /var/tmp/diff_new_pack.iFeCG3/_new 2021-07-10 00:03:05.494773768 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jnr-netdb
#
-# Copyright (c) 2020 SUSE LLC
+# 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,13 +16,15 @@
#
-Name: jnr-netdb
-Version: 1.1.6
+%global cluster jnr
+Name: %{cluster}-netdb
+Version: 1.2.0
Release: 0
Summary: Network services database access for java
License: Apache-2.0
-URL: https://github.com/jnr/%{name}/
-Source0:
https://github.com/jnr/%{name}/archive/%{name}-%{version}.tar.gz
+Group: Development/Libraries/Java
+URL: https://github.com/%{cluster}/%{name}/
+Source0: %{url}/archive/%{name}-%{version}.tar.gz
BuildRequires: fdupes
BuildRequires: maven-local
BuildRequires: mvn(com.github.jnr:jnr-ffi)
@@ -30,28 +32,27 @@
BuildArch: noarch
%description
-jnr-netdb is a java interface to getservbyname(3), getservbyport(3)
+jnr-netdb is a java interface to getservbyname(3), getservbyport(3).
+
+It tries to use the native functions if possible, falling back to parsing
+/etc/services directly, and finally to an inbuilt table for use in environments
+where neither native code, nor filesystem access is possible.
%package javadoc
Summary: Javadoc for %{name}
+Group: Development/Libraries/Java
%description javadoc
Javadoc for %{name}.
%prep
%setup -q -n %{name}-%{name}-%{version}
+%{mvn_file} : %{cluster}/%{name}
-find ./ -name '*.jar' -exec rm -f '{}' \;
-find ./ -name '*.class' -exec rm -f '{}' \;
-
-%pom_xpath_set "pom:project/pom:properties/pom:maven.compiler.source" "1.6"
-%pom_xpath_set "pom:project/pom:properties/pom:maven.compiler.target" "1.6"
+find . -name '*.jar' -delete
%build
-%{mvn_build} -f \
-%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
- -- -Dmaven.compiler.release=6 \
-%endif
+%{mvn_build} -f
%install
%mvn_install
++++++ jnr-netdb-1.1.6.tar.gz -> jnr-netdb-1.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jnr-netdb-jnr-netdb-1.1.6/.github/workflows/ci.yml
new/jnr-netdb-jnr-netdb-1.2.0/.github/workflows/ci.yml
--- old/jnr-netdb-jnr-netdb-1.1.6/.github/workflows/ci.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/jnr-netdb-jnr-netdb-1.2.0/.github/workflows/ci.yml 2020-09-12
01:01:08.000000000 +0200
@@ -0,0 +1,37 @@
+# This workflow will build a Java project with Maven
+# For more information see:
https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ branches: [ master ]
+
+jobs:
+ jdk8:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up JDK 8
+ uses: actions/setup-java@v1
+ with:
+ java-version: 8
+ - name: Build with Maven
+ run: mvn -B package --file pom.xml
+
+ jdk11:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up JDK 11
+ uses: actions/setup-java@v1
+ with:
+ java-version: 11
+ - name: Build with Maven
+ run: mvn -B package --file pom.xml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jnr-netdb-jnr-netdb-1.1.6/pom.xml
new/jnr-netdb-jnr-netdb-1.2.0/pom.xml
--- old/jnr-netdb-jnr-netdb-1.1.6/pom.xml 2016-09-29 01:12:39.000000000
+0200
+++ new/jnr-netdb-jnr-netdb-1.2.0/pom.xml 2020-09-12 01:01:08.000000000
+0200
@@ -9,7 +9,7 @@
<groupId>com.github.jnr</groupId>
<artifactId>jnr-netdb</artifactId>
<packaging>jar</packaging>
- <version>1.1.6</version>
+ <version>1.2.0</version>
<name>jnr-netdb</name>
<description>Lookup TCP and UDP services from java</description>
<url>http://github.com/jnr/jnr-netdb</url>
@@ -38,8 +38,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.5</maven.compiler.source>
- <maven.compiler.target>1.5</maven.compiler.target>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
</properties>
<dependencies>
@@ -54,10 +54,53 @@
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-ffi</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+
<Automatic-Module-Name>org.jnrproject.netdb</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>java9</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- Use -release compiler option rather than source/target if
9+ -->
+ <release>${maven.compiler.target}</release>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ </profile>
+ </profiles>
+
</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jnr-netdb-jnr-netdb-1.1.6/src/test/java/jnr/netdb/FileProtocolDBTest.java
new/jnr-netdb-jnr-netdb-1.2.0/src/test/java/jnr/netdb/FileProtocolDBTest.java
---
old/jnr-netdb-jnr-netdb-1.1.6/src/test/java/jnr/netdb/FileProtocolDBTest.java
2016-09-29 01:12:39.000000000 +0200
+++
new/jnr-netdb-jnr-netdb-1.2.0/src/test/java/jnr/netdb/FileProtocolDBTest.java
2020-09-12 01:01:08.000000000 +0200
@@ -34,17 +34,32 @@
@Test public void canLookupIpProtocolByName() {
ProtocolsDB db = FileProtocolsDB.getInstance();
- Protocol p = db.getProtocolByName("ip");
- assertNotNull("could not lookup ip protocol", p);
- assertEquals("incorrect proto number", 0, p.getProto());
- assertEquals("incorrect name", "ip", p.getName());
+ // we try ip first and then ipv4 due to jnr/jnr-netdb#4
+ Protocol p = Protocol.getProtocolByName("ip");
+ if (p != null) {
+ assertEquals("incorrect proto number", 0, p.getProto());
+ assertEquals("incorrect name", "ip", p.getName());
+ } else {
+ p = Protocol.getProtocolByName("ipv4");
+ assertNotNull("could not lookup ipv4 protocol", p);
+ assertEquals("incorrect proto number", 4, p.getProto());
+ assertEquals("incorrect name", "ipv4", p.getName());
+ }
}
@Test public void canLookupIpProtocolByNumber() {
ProtocolsDB db = FileProtocolsDB.getInstance();
- Protocol p = db.getProtocolByNumber(0);
- assertNotNull("could not lookup ip protocol", p);
- assertEquals("incorrect proto number", 0, p.getProto());
- assertEquals("incorrect name", "ip", p.getName());
+ // we try ip first and then ipv4 due to jnr/jnr-netdb#4
+ Protocol p = Protocol.getProtocolByName("ip");
+ if (p != null) {
+ p = Protocol.getProtocolByNumber(0);
+ assertEquals("incorrect proto number", 0, p.getProto());
+ assertEquals("incorrect name", "ip", p.getName());
+ } else {
+ p = Protocol.getProtocolByNumber(4);
+ assertNotNull("could not lookup ip protocol", p);
+ assertEquals("incorrect proto number", 4, p.getProto());
+ assertEquals("incorrect name", "ipv4", p.getName());
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jnr-netdb-jnr-netdb-1.1.6/src/test/java/jnr/netdb/NativeProtocolsDBTest.java
new/jnr-netdb-jnr-netdb-1.2.0/src/test/java/jnr/netdb/NativeProtocolsDBTest.java
---
old/jnr-netdb-jnr-netdb-1.1.6/src/test/java/jnr/netdb/NativeProtocolsDBTest.java
2016-09-29 01:12:39.000000000 +0200
+++
new/jnr-netdb-jnr-netdb-1.2.0/src/test/java/jnr/netdb/NativeProtocolsDBTest.java
2020-09-12 01:01:08.000000000 +0200
@@ -34,18 +34,33 @@
@Test public void canLookupIpProtocolByName() {
ProtocolsDB db = NativeProtocolsDB.getInstance();
- Protocol p = db.getProtocolByName("ip");
- assertNotNull("could not lookup ip protocol", p);
- assertEquals("incorrect proto number", 0, p.getProto());
- assertEquals("incorrect name", "ip", p.getName());
+ // we try ip first and then ipv4 due to jnr/jnr-netdb#4
+ Protocol p = Protocol.getProtocolByName("ip");
+ if (p != null) {
+ assertEquals("incorrect proto number", 0, p.getProto());
+ assertEquals("incorrect name", "ip", p.getName());
+ } else {
+ p = Protocol.getProtocolByName("ipv4");
+ assertNotNull("could not lookup ipv4 protocol", p);
+ assertEquals("incorrect proto number", 4, p.getProto());
+ assertEquals("incorrect name", "ipv4", p.getName());
+ }
}
@Test public void canLookupIpProtocolByNumber() {
ProtocolsDB db = NativeProtocolsDB.getInstance();
- Protocol p = db.getProtocolByNumber(0);
- assertNotNull("could not lookup ip protocol", p);
- assertEquals("incorrect proto number", 0, p.getProto());
- assertEquals("incorrect name", "ip", p.getName());
+ // we try ip first and then ipv4 due to jnr/jnr-netdb#4
+ Protocol p = Protocol.getProtocolByName("ip");
+ if (p != null) {
+ p = Protocol.getProtocolByNumber(0);
+ assertEquals("incorrect proto number", 0, p.getProto());
+ assertEquals("incorrect name", "ip", p.getName());
+ } else {
+ p = Protocol.getProtocolByNumber(4);
+ assertNotNull("could not lookup ip protocol", p);
+ assertEquals("incorrect proto number", 4, p.getProto());
+ assertEquals("incorrect name", "ipv4", p.getName());
+ }
}
@Test public void canLookupTcpProtocolByName() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jnr-netdb-jnr-netdb-1.1.6/src/test/java/jnr/netdb/ProtocolTest.java
new/jnr-netdb-jnr-netdb-1.2.0/src/test/java/jnr/netdb/ProtocolTest.java
--- old/jnr-netdb-jnr-netdb-1.1.6/src/test/java/jnr/netdb/ProtocolTest.java
2016-09-29 01:12:39.000000000 +0200
+++ new/jnr-netdb-jnr-netdb-1.2.0/src/test/java/jnr/netdb/ProtocolTest.java
2020-09-12 01:01:08.000000000 +0200
@@ -33,10 +33,17 @@
}
@Test public void canLookupIpProtocolByName() {
+ // we try ip first and then ipv4 due to jnr/jnr-netdb#4
Protocol p = Protocol.getProtocolByName("ip");
- assertNotNull("could not lookup ip protocol", p);
- assertEquals("incorrect proto number", 0, p.getProto());
- assertEquals("incorrect name", "ip", p.getName());
+ if (p != null) {
+ assertEquals("incorrect proto number", 0, p.getProto());
+ assertEquals("incorrect name", "ip", p.getName());
+ } else {
+ p = Protocol.getProtocolByName("ipv4");
+ assertNotNull("could not lookup ipv4 protocol", p);
+ assertEquals("incorrect proto number", 4, p.getProto());
+ assertEquals("incorrect name", "ipv4", p.getName());
+ }
}
@Test public void returnsNullOnUnknownProtocol() {
@@ -45,10 +52,18 @@
}
@Test public void canLookupIpProtocolByNumber() {
- Protocol p = Protocol.getProtocolByNumber(0);
- assertNotNull("could not lookup ip protocol", p);
- assertEquals("incorrect proto number", 0, p.getProto());
- assertEquals("incorrect name", "ip", p.getName());
+ // we try ip first and then ipv4 due to jnr/jnr-netdb#4
+ Protocol p = Protocol.getProtocolByName("ip");
+ if (p != null) {
+ p = Protocol.getProtocolByNumber(0);
+ assertEquals("incorrect proto number", 0, p.getProto());
+ assertEquals("incorrect name", "ip", p.getName());
+ } else {
+ p = Protocol.getProtocolByNumber(4);
+ assertNotNull("could not lookup ip protocol", p);
+ assertEquals("incorrect proto number", 4, p.getProto());
+ assertEquals("incorrect name", "ipv4", p.getName());
+ }
}
@Test public void returnsNullOnInvalidNumber() {
