Hello community,
here is the log from the commit of package netty-tcnative for openSUSE:Factory
checked in at 2020-01-09 22:53:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netty-tcnative (Old)
and /work/SRC/openSUSE:Factory/.netty-tcnative.new.6675 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netty-tcnative"
Thu Jan 9 22:53:23 2020 rev:2 rq:762263 version:1.1.33
Changes:
--------
--- /work/SRC/openSUSE:Factory/netty-tcnative/netty-tcnative.changes
2019-11-18 20:08:20.001654918 +0100
+++ /work/SRC/openSUSE:Factory/.netty-tcnative.new.6675/netty-tcnative.changes
2020-01-09 22:54:07.970815528 +0100
@@ -1,0 +2,10 @@
+Thu Jan 9 14:50:34 UTC 2020 - Fridrich Strba <fst...@suse.com>
+
+- Update to the 1.1.33 Final26, the last version of 1.1 series
+- Use directement libtcnative-1-0 package, since it is API
+ compatible and supports openssl 1.1.x
+- Removed patch:
+ * i388aprFix.patch
+ + Integrated upstream
+
+-------------------------------------------------------------------
Old:
----
i388aprFix.patch
netty-tcnative-1.1.30.Fork2.tar.gz
New:
----
netty-tcnative-parent-1.1.33.Fork26.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netty-tcnative.spec ++++++
--- /var/tmp/diff_new_pack.nxaN9d/_old 2020-01-09 22:54:08.786815937 +0100
+++ /var/tmp/diff_new_pack.nxaN9d/_new 2020-01-09 22:54:08.794815941 +0100
@@ -1,7 +1,7 @@
#
# spec file for package netty-tcnative
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,33 +16,24 @@
#
-%global namedreltag .Fork2
+%global namedreltag .Fork26
%global namedversion %{version}%{?namedreltag}
Name: netty-tcnative
-Version: 1.1.30
+Version: 1.1.33
Release: 0
Summary: Fork of Tomcat Native with improved OpenSSL and mavenized build
License: Apache-2.0
URL: https://github.com/netty/netty/wiki/Forked-Tomcat-Native
-Source0:
https://github.com/netty/netty-tcnative/archive/%{name}-%{namedversion}.tar.gz
+Source0:
https://github.com/netty/netty-tcnative/archive/%{name}-parent-%{namedversion}.tar.gz
Source1: fixLibNames.patch.in
-Patch2: i388aprFix.patch
-BuildRequires: apr-devel
-BuildRequires: autoconf fdupes
-BuildRequires: automake
-BuildRequires: glibc-devel
-BuildRequires: libopenssl-1_0_0-devel
-BuildRequires: libtool
+BuildRequires: fdupes
+BuildRequires: libtcnative-1-0
BuildRequires: maven-local
BuildRequires: mvn(io.netty:netty-parent:pom:)
BuildRequires: mvn(kr.motd.maven:os-maven-plugin)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
-BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
-BuildRequires: mvn(org.fusesource.hawtjni:maven-hawtjni-plugin)
-BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
-#!BuildIgnore: openssl
+Requires: libtcnative-1-0
%description
netty-tcnative is a fork of Tomcat Native. It includes a set of changes
@@ -62,11 +53,20 @@
%{summary}.
%prep
-%setup -q -n %{name}-%{name}-%{namedversion}
+%setup -q -n %{name}-%{name}-parent-%{namedversion}
patch=`mktemp`
-sed "s;@PATH@;%{_libdir}/%{name};g" < %{SOURCE1} > $patch
+sed "s;@PATH@;%{_libdir};g" < %{SOURCE1} > $patch
patch -p1 < $patch
-%patch2 -p1
+
+# Build only the openssl-dynamic module
+%pom_disable_module openssl-static
+%pom_disable_module boringssl-static
+%pom_disable_module libressl-static
+
+%pom_remove_plugin :maven-enforcer-plugin .
+%pom_remove_plugin :maven-antrun-plugin . openssl-dynamic
+%pom_remove_plugin :maven-hawtjni-plugin openssl-dynamic
+%pom_xpath_remove pom:project/pom:profiles openssl-dynamic
%build
%{mvn_build} -f -- -Dsource=7
@@ -74,14 +74,8 @@
%install
%mvn_install
%fdupes -s %{buildroot}%{_javadocdir}
-mkdir -p %{buildroot}%{_libdir}/%{name}/
-cp target/native-build/target/lib/lib%{name}-%{namedversion}.so
%{buildroot}%{_libdir}/%{name}/lib%{name}.so
%files -f .mfiles
-%dir %{_libdir}/%{name}
-%dir %{_jnidir}/%{name}
-%dir %{_mavenpomdir}/%{name}
-%{_libdir}/%{name}/lib%{name}.so
%files javadoc -f .mfiles-javadoc
++++++ fixLibNames.patch.in ++++++
--- /var/tmp/diff_new_pack.nxaN9d/_old 2020-01-09 22:54:08.862815974 +0100
+++ /var/tmp/diff_new_pack.nxaN9d/_new 2020-01-09 22:54:08.862815974 +0100
@@ -1,16 +1,16 @@
----
netty-tcnative-netty-tcnative-1.1.30.Fork2/src/main/java/org/apache/tomcat/jni/Library
(copy).java
-+++
netty-tcnative-netty-tcnative-1.1.30.Fork2/src/main/java/org/apache/tomcat/jni/Library.java
-@@ -24,7 +24,7 @@
+---
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 {
/* Default library names */
-- private static final String [] NAMES = {"tcnative-1", "libtcnative-1"};
-+ 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"};
++ 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.
*/
-@@ -36,8 +36,9 @@
- boolean loaded = false;
+@@ -38,22 +38,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";
@@ -18,23 +18,20 @@
- System.loadLibrary(NAMES[i]);
+ System.load(name);
loaded = true;
- }
- catch (Throwable t) {
-@@ -47,16 +48,10 @@
- if (t instanceof VirtualMachineError) {
- throw (VirtualMachineError) t;
- }
+ } catch (ThreadDeath t) {
+ throw t;
+ } catch (VirtualMachineError t) {
+ throw t;
+ } catch (Throwable t) {
- String name = System.mapLibraryName(NAMES[i]);
-- String path = System.getProperty("java.library.path");
-- String sep = System.getProperty("path.separator");
-- String [] paths = path.split(sep);
-- for (int j=0; j<paths.length; j++) {
+- 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);
++ java.io.File fd = new java.io.File(name);
if (fd.exists()) {
- t.printStackTrace();
+ // File exists but failed to load
+ throw new RuntimeException(t);
}
- }
- if ( i > 0)
+ if (i > 0) {
err.append(", ");
- err.append(t.getMessage());
+ }
