Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package netty-tcnative for openSUSE:Factory
checked in at 2021-03-25 14:52:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netty-tcnative (Old)
and /work/SRC/openSUSE:Factory/.netty-tcnative.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netty-tcnative"
Thu Mar 25 14:52:19 2021 rev:3 rq:881100 version:2.0.36
Changes:
--------
--- /work/SRC/openSUSE:Factory/netty-tcnative/netty-tcnative.changes
2020-01-09 22:54:07.970815528 +0100
+++ /work/SRC/openSUSE:Factory/.netty-tcnative.new.2401/netty-tcnative.changes
2021-03-25 14:52:20.756486724 +0100
@@ -1,0 +2,7 @@
+Wed Mar 24 05:24:03 UTC 2021 - Fridrich Strba <fst...@suse.com>
+
+- Update to the 2.0.36 Final
+ * fix build in factory
+ * new dependency on netty-jni-util-sources
+
+-------------------------------------------------------------------
Old:
----
netty-tcnative-parent-1.1.33.Fork26.tar.gz
New:
----
netty-tcnative-parent-2.0.36.Final.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netty-tcnative.spec ++++++
--- /var/tmp/diff_new_pack.03lmf9/_old 2021-03-25 14:52:21.252487229 +0100
+++ /var/tmp/diff_new_pack.03lmf9/_new 2021-03-25 14:52:21.252487229 +0100
@@ -1,7 +1,7 @@
#
# spec file for package netty-tcnative
#
-# 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,10 +16,10 @@
#
-%global namedreltag .Fork26
+%global namedreltag .Final
%global namedversion %{version}%{?namedreltag}
Name: netty-tcnative
-Version: 1.1.33
+Version: 2.0.36
Release: 0
Summary: Fork of Tomcat Native with improved OpenSSL and mavenized build
License: Apache-2.0
@@ -27,12 +27,15 @@
Source0:
https://github.com/netty/netty-tcnative/archive/%{name}-parent-%{namedversion}.tar.gz
Source1: fixLibNames.patch.in
BuildRequires: fdupes
+BuildRequires: gcc
BuildRequires: libtcnative-1-0
BuildRequires: maven-local
-BuildRequires: mvn(io.netty:netty-parent:pom:)
+BuildRequires: mvn(io.netty:netty-jni-util::sources:)
BuildRequires: mvn(kr.motd.maven:os-maven-plugin)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
+BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
Requires: libtcnative-1-0
%description
@@ -63,6 +66,7 @@
%pom_disable_module boringssl-static
%pom_disable_module libressl-static
+%pom_remove_plugin :japicmp-maven-plugin .
%pom_remove_plugin :maven-enforcer-plugin .
%pom_remove_plugin :maven-antrun-plugin . openssl-dynamic
%pom_remove_plugin :maven-hawtjni-plugin openssl-dynamic
++++++ fixLibNames.patch.in ++++++
--- /var/tmp/diff_new_pack.03lmf9/_old 2021-03-25 14:52:21.276487253 +0100
+++ /var/tmp/diff_new_pack.03lmf9/_new 2021-03-25 14:52:21.280487257 +0100
@@ -1,21 +1,23 @@
----
netty-tcnative-netty-tcnative-parent-1.1.33.Fork26/openssl-dynamic/src/main/java/org/apache/tomcat/jni/Library.java.orig
2020-01-09 11:01:40.309218963 +0100
-+++
netty-tcnative-netty-tcnative-parent-1.1.33.Fork26/openssl-dynamic/src/main/java/org/apache/tomcat/jni/Library.java
2020-01-09 11:04:45.202196578 +0100
-@@ -26,7 +26,7 @@
- public final class Library {
-
+---
netty-tcnative-netty-tcnative-parent-2.0.37.Final.orig/openssl-dynamic/src/main/java/io/netty/internal/tcnative/Library.java
2021-02-11 18:31:40.893244271 +0100
++++
netty-tcnative-netty-tcnative-parent-2.0.37.Final/openssl-dynamic/src/main/java/io/netty/internal/tcnative/Library.java
2021-02-11 18:42:25.537083503 +0100
+@@ -39,7 +39,9 @@
/* Default library names */
-- private static final String [] NAMES = {"netty-tcnative",
"libnetty-tcnative", "netty-tcnative-1", "libnetty-tcnative-1"};
-+ private static final String [] NAMES = {"netty-tcnative",
"libnetty-tcnative", "netty-tcnative-1", "libnetty-tcnative-1", "tcnative-1",
"libtcnative-1"};
- /*
- * A handle to the unique Library singleton instance.
- */
-@@ -38,22 +38,20 @@
+ private static final String [] NAMES = {
+ "netty_tcnative",
+- "libnetty_tcnative"
++ "libnetty_tcnative",
++ "tcnative-1",
++ "libtcnative-1"
+ };
+
+ private static final String PROVIDED = "provided";
+@@ -55,22 +57,20 @@
String [] paths = path.split(File.pathSeparator);
StringBuilder err = new StringBuilder();
for (int i = 0; i < NAMES.length; i++) {
+ String name = "@PATH@/" + NAMES[i] + ".so";
try {
-- System.loadLibrary(NAMES[i]);
+- loadLibrary(NAMES[i]);
+ System.load(name);
loaded = true;
} catch (ThreadDeath t) {
@@ -25,8 +27,8 @@
} catch (Throwable t) {
- String name = System.mapLibraryName(NAMES[i]);
- for (int j = 0; j < paths.length; j++) {
-- java.io.File fd = new java.io.File(paths[j] , name);
-+ java.io.File fd = new java.io.File(name);
+- File fd = new File(paths[j] , name);
++ File fd = new java.io.File(name);
if (fd.exists()) {
// File exists but failed to load
throw new RuntimeException(t);
