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 2025-02-11 21:31:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netty-tcnative (Old)
and /work/SRC/openSUSE:Factory/.netty-tcnative.new.19470 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netty-tcnative"
Tue Feb 11 21:31:22 2025 rev:5 rq:1245118 version:2.0.70
Changes:
--------
--- /work/SRC/openSUSE:Factory/netty-tcnative/netty-tcnative.changes
2024-12-05 17:11:07.359829251 +0100
+++ /work/SRC/openSUSE:Factory/.netty-tcnative.new.19470/netty-tcnative.changes
2025-02-11 21:31:30.859310548 +0100
@@ -1,0 +2,6 @@
+Tue Feb 11 14:40:41 UTC 2025 - Fridrich Strba <fst...@suse.com>
+
+- Upgrade to version 2.0.70 Final
+ * No formal changelog present
+
+-------------------------------------------------------------------
Old:
----
netty-tcnative-parent-2.0.69.Final.tar.gz
New:
----
netty-tcnative-parent-2.0.70.Final.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netty-tcnative.spec ++++++
--- /var/tmp/diff_new_pack.NPrxdc/_old 2025-02-11 21:31:31.647343054 +0100
+++ /var/tmp/diff_new_pack.NPrxdc/_new 2025-02-11 21:31:31.651343219 +0100
@@ -1,7 +1,7 @@
#
# spec file for package netty-tcnative
#
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
%define with_gcc 11
%endif
Name: netty-tcnative
-Version: 2.0.69
+Version: 2.0.70
Release: 0
Summary: Fork of Tomcat Native with improved OpenSSL and mavenized build
License: Apache-2.0
++++++ netty-tcnative-parent-2.0.69.Final.tar.gz ->
netty-tcnative-parent-2.0.70.Final.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/boringssl-static/pom.xml
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/boringssl-static/pom.xml
---
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/boringssl-static/pom.xml
2024-11-01 18:00:35.000000000 +0100
+++
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/boringssl-static/pom.xml
2025-02-10 08:17:37.000000000 +0100
@@ -19,7 +19,7 @@
<parent>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-parent</artifactId>
- <version>2.0.69.Final</version>
+ <version>2.0.70.Final</version>
</parent>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<packaging>jar</packaging>
@@ -711,6 +711,7 @@
<jniClassifier>${os.detected.name}-aarch_64</jniClassifier>
<jniArch>aarch_64</jniArch>
<javaModuleNameClassifier>${os.detected.name}.aarch_64</javaModuleNameClassifier>
+ <crossCompile>linux</crossCompile>
</properties>
<build>
@@ -757,10 +758,6 @@
</files>
<content>release 7.6</content>
</requireFilesContent>
- <requireProperty>
- <property>aprArmHome</property>
- <message>The folder of APR for aarch64 must be specified
by hand. Please try -DaprArmHome=</message>
- </requireProperty>
</rules>
<ignoreCache>true</ignoreCache>
</configuration>
@@ -1013,7 +1010,7 @@
<!-- <verbose>true</verbose> -->
<configureArgs>
<configureArg>--with-ssl=no</configureArg>
- <configureArg>--with-apr=${aprArmHome}</configureArg>
+ <configureArg>--with-apr=${aprHome}</configureArg>
<configureArg>--with-static-libs</configureArg>
<configureArg>--libdir=${project.build.directory}/native-build/target/lib</configureArg>
<configureArg>CFLAGS=-O3 -Werror -fno-omit-frame-pointer
-fvisibility=hidden -Wunused -Wno-unused-value</configureArg>
@@ -1207,7 +1204,7 @@
<properties>
<linkStatic>true</linkStatic>
- <osxCrossCompile>true</osxCrossCompile>
+ <crossCompile>mac</crossCompile>
<target>arm64-apple-macos11</target>
<macOsxDeploymentTarget>OSX_DEPLOYMENT_TARGET=11.0</macOsxDeploymentTarget>
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0</cmakeOsxDeploymentTarget>
@@ -1455,7 +1452,7 @@
<properties>
<linkStatic>true</linkStatic>
- <osxCrossCompile>true</osxCrossCompile>
+ <crossCompile>mac</crossCompile>
<target>x86_64-apple-macos10.12</target>
<macOsxDeploymentTarget>OSX_DEPLOYMENT_TARGET=10.12</macOsxDeploymentTarget>
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12</cmakeOsxDeploymentTarget>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/docker/Dockerfile.arch
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/docker/Dockerfile.arch
---
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/docker/Dockerfile.arch
2024-11-01 18:00:35.000000000 +0100
+++
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/docker/Dockerfile.arch
2025-02-10 08:17:37.000000000 +0100
@@ -1,4 +1,4 @@
-FROM archlinux/base
+FROM --platform=linux/amd64 archlinux/base
ARG java_version=8
ENV JAVA_VERSION $java_version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/docker/Dockerfile.centos6
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/docker/Dockerfile.centos6
---
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/docker/Dockerfile.centos6
2024-11-01 18:00:35.000000000 +0100
+++
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/docker/Dockerfile.centos6
2025-02-10 08:17:37.000000000 +0100
@@ -1,4 +1,4 @@
-FROM centos:6.10
+FROM --platform=linux/amd64 centos:6.10
ENV SOURCE_DIR /root/source
ENV CMAKE_VERSION_BASE 3.26
@@ -27,6 +27,7 @@
patch \
perl \
perl-parent \
+ perl-devel \
tar \
unzip \
wget \
@@ -55,8 +56,9 @@
RUN curl -L https://install.perlbrew.pl | bash
RUN echo 'source ~/perl5/perlbrew/etc/bashrc' >> ~/.bashrc
-RUN /root/perl5/perlbrew/bin/perlbrew install --thread --switch perl-5.16.3
-RUN ln -sf /root/perl5/perlbrew/perls/perl-5.16.3/bin/perl /usr/bin/perl
+RUN /root/perl5/perlbrew/bin/perlbrew install-patchperl
+RUN /root/perl5/perlbrew/bin/perlbrew install --notest --force --thread
--switch perl-5.40.1
+RUN ln -sf /root/perl5/perlbrew/perls/perl-5.40.1/bin/perl /usr/bin/perl
# Downloading and installing SDKMAN!
RUN curl -s "https://get.sdkman.io"; | bash
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/docker/Dockerfile.cross_compile_aarch64
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/docker/Dockerfile.cross_compile_aarch64
---
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/docker/Dockerfile.cross_compile_aarch64
2024-11-01 18:00:35.000000000 +0100
+++
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/docker/Dockerfile.cross_compile_aarch64
2025-02-10 08:17:37.000000000 +0100
@@ -1,4 +1,4 @@
-FROM centos:7.6.1810
+FROM --platform=linux/amd64 centos:7.6.1810
ARG gcc_version=10.2-2020.11
ARG openssl_version=1_1_1d
@@ -36,24 +36,6 @@
mv gcc-arm-$GCC_VERSION-x86_64-aarch64-none-linux-gnu /
ENV PATH="/gcc-arm-$GCC_VERSION-x86_64-aarch64-none-linux-gnu/bin:${PATH}"
-# Copy over patch we need to apply to apr to not link against libcrypt
-COPY patches/apr_crypt.patch $SOURCE_DIR
-
-# Cross compile Apache Apr for aarch64 - static
-RUN set -x && \
- wget --no-check-certificate
https://downloads.apache.org//apr/apr-$APR_VERSION.tar.gz && \
- tar xvf apr-$APR_VERSION.tar.gz && \
- pushd apr-$APR_VERSION && \
- patch -p0 < $SOURCE_DIR/apr_crypt.patch && \
- ./buildconf && \
- CC=aarch64-none-linux-gnu-gcc CFLAGS='-O3 -fno-omit-frame-pointer -fPIC '
./configure --disable-shared --prefix=/opt/apr-$APR_VERSION-static
--host=aarch64-none-linux-gnu ac_cv_have_decl_sys_siglist=no
ac_cv_file__dev_zero=yes ac_cv_func_setpgrp_void=yes
apr_cv_tcp_nodelay_with_cork=yes ac_cv_sizeof_struct_iovec=8 && \
- make || true && \
- pushd tools && \
- gcc -Wall -O2 -DCROSS_COMPILE gen_test_char.c -s -o gen_test_char && \
- popd && \
- make && make install && \
- popd
-
# Cross compile Apache Apr for aarch64 - share
RUN set -x && \
wget --no-check-certificate
https://downloads.apache.org//apr/apr-$APR_VERSION.tar.gz && \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/docker/Dockerfile.debian
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/docker/Dockerfile.debian
---
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/docker/Dockerfile.debian
2024-11-01 18:00:35.000000000 +0100
+++
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/docker/Dockerfile.debian
2025-02-10 08:17:37.000000000 +0100
@@ -1,5 +1,5 @@
ARG debian_version=7
-FROM debian:$debian_version
+FROM --platform=linux/amd64 debian:$debian_version
# needed to do again after FROM due to docker limitation
ARG debian_version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/docker/Dockerfile.opensuse
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/docker/Dockerfile.opensuse
---
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/docker/Dockerfile.opensuse
2024-11-01 18:00:35.000000000 +0100
+++
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/docker/Dockerfile.opensuse
2025-02-10 08:17:37.000000000 +0100
@@ -1,5 +1,5 @@
ARG opensuse_version=15.1
-FROM opensuse/leap:$opensuse_version
+FROM --platform=linux/amd64 opensuse/leap:$opensuse_version
# needed to do again after FROM due to docker limitation
ARG opensuse_version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/docker/docker-compose.centos-7.yaml
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/docker/docker-compose.centos-7.yaml
---
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/docker/docker-compose.centos-7.yaml
2024-11-01 18:00:35.000000000 +0100
+++
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/docker/docker-compose.centos-7.yaml
2025-02-10 08:17:37.000000000 +0100
@@ -40,7 +40,7 @@
cross-compile-aarch64-build:
<<: *cross-compile-aarch64-common
- command: /bin/bash -cl "./mvnw clean package -Plinux-aarch64 -am -pl
openssl-dynamic -DaprArmHome=/opt/apr-$$APR_VERSION-share
-DopensslArmHome=/opt/openssl-$$OPENSSL_VERSION-share -DskipTests && ./mvnw
clean package -Plinux-aarch64 -am -pl boringssl-static
-DaprArmHome=/opt/apr-$$APR_VERSION-static
-DboringsslSourceDir=/root/workspace/boringssl-source
-DboringsslHome=/root/workspace/boringssl -DskipTests"
+ command: /bin/bash -cl "./mvnw clean package -Plinux-aarch64 -am -pl
openssl-dynamic -DaprArmHome=/opt/apr-$$APR_VERSION-share
-DopensslArmHome=/opt/openssl-$$OPENSSL_VERSION-share -DskipTests && ./mvnw
clean package -Plinux-aarch64 -am -pl boringssl-static -DskipTests"
cross-compile-aarch64-deploy:
<<: *cross-compile-aarch64-common
@@ -50,7 +50,7 @@
- ~/.m2/repository:/root/.m2/repository
- ~/.m2/settings.xml:/root/.m2/settings.xml
- ..:/code
- command: /bin/bash -cl "./mvnw clean deploy -Plinux-aarch64 -am -pl
openssl-dynamic -DaprArmHome=/opt/apr-$$APR_VERSION-share
-DopensslArmHome=/opt/openssl-$$OPENSSL_VERSION-share -DskipTests && ./mvnw
clean deploy -Plinux-aarch64 -am -pl boringssl-static
-DaprArmHome=/opt/apr-$$APR_VERSION-static
-DboringsslSourceDir=/root/workspace/boringssl-source
-DboringsslHome=/root/workspace/boringssl -DskipTests"
+ command: /bin/bash -cl "./mvnw clean deploy -Plinux-aarch64 -am -pl
openssl-dynamic -DaprArmHome=/opt/apr-$$APR_VERSION-share
-DopensslArmHome=/opt/openssl-$$OPENSSL_VERSION-share -DskipTests && ./mvnw
clean deploy -Plinux-aarch64 -am -pl boringssl-static -DskipTests"
cross-compile-aarch64-stage-snapshot:
<<: *cross-compile-aarch64-common
@@ -60,7 +60,7 @@
- ~/.m2/repository:/root/.m2/repository
- ~/local-staging:/root/local-staging
- ..:/code
- command: /bin/bash -cl "./mvnw -Plinux-aarch64 -am -pl openssl-dynamic
-DaprArmHome=/opt/apr-$$APR_VERSION-share
-DopensslArmHome=/opt/openssl-$$OPENSSL_VERSION-share clean package
org.sonatype.plugins:nexus-staging-maven-plugin:deploy
-DaltStagingDirectory=/root/local-staging -DskipRemoteStaging=true
-DskipTests=true && ./mvnw -Plinux-aarch64 -am -pl boringssl-static
-DaprArmHome=/opt/apr-$$APR_VERSION-static
-DboringsslSourceDir=/root/workspace/boringssl-source
-DboringsslHome=/root/workspace/boringssl clean package
org.sonatype.plugins:nexus-staging-maven-plugin:deploy
-DaltStagingDirectory=/root/local-staging -DskipRemoteStaging=true
-DskipTests=true"
+ command: /bin/bash -cl "./mvnw -Plinux-aarch64 -am -pl openssl-dynamic
-DaprArmHome=/opt/apr-$$APR_VERSION-share
-DopensslArmHome=/opt/openssl-$$OPENSSL_VERSION-share clean package
org.sonatype.plugins:nexus-staging-maven-plugin:deploy
-DaltStagingDirectory=/root/local-staging -DskipRemoteStaging=true
-DskipTests=true && ./mvnw -Plinux-aarch64 -am -pl boringssl-static clean
package org.sonatype.plugins:nexus-staging-maven-plugin:deploy
-DaltStagingDirectory=/root/local-staging -DskipRemoteStaging=true
-DskipTests=true"
cross-compile-aarch64-stage-release:
<<: *cross-compile-aarch64-common
@@ -70,5 +70,5 @@
- ~/.m2/settings.xml:/root/.m2/settings.xml
- ~/local-staging:/root/local-staging
- ..:/code
- command: /bin/bash -cl "cat <(echo -e \"${GPG_PRIVATE_KEY}\") | gpg
--batch --import && ./mvnw -Plinux-aarch64 -am -pl openssl-dynamic
-DaprArmHome=/opt/apr-$$APR_VERSION-share
-DopensslArmHome=/opt/openssl-$$OPENSSL_VERSION-share clean javadoc:jar package
gpg:sign org.sonatype.plugins:nexus-staging-maven-plugin:deploy
-DnexusUrl=https://oss.sonatype.org -DserverId=sonatype-nexus-staging
-DaltStagingDirectory=/root/local-staging -DskipRemoteStaging=true
-DskipTests=true -Dgpg.passphrase=${GPG_PASSPHRASE}
-Dgpg.keyname=${GPG_KEYNAME} && ./mvnw -Plinux-aarch64 -am -pl boringssl-static
-DaprArmHome=/opt/apr-$$APR_VERSION-static
-DboringsslSourceDir=/root/workspace/boringssl-source
-DboringsslHome=/root/workspace/boringssl clean javadoc:jar package gpg:sign
org.sonatype.plugins:nexus-staging-maven-plugin:deploy
-DnexusUrl=https://oss.sonatype.org -DserverId=sonatype-nexus-staging
-DaltStagingDirectory=/root/local-staging -DskipRemoteStaging=true
-DskipTests=true -Dgpg.passphrase=${G
PG_PASSPHRASE} -Dgpg.keyname=${GPG_KEYNAME}"
+ command: /bin/bash -cl "cat <(echo -e \"${GPG_PRIVATE_KEY}\") | gpg
--batch --import && ./mvnw -Plinux-aarch64 -am -pl openssl-dynamic
-DaprArmHome=/opt/apr-$$APR_VERSION-share
-DopensslArmHome=/opt/openssl-$$OPENSSL_VERSION-share clean javadoc:jar package
gpg:sign org.sonatype.plugins:nexus-staging-maven-plugin:deploy
-DnexusUrl=https://oss.sonatype.org -DserverId=sonatype-nexus-staging
-DaltStagingDirectory=/root/local-staging -DskipRemoteStaging=true
-DskipTests=true -Dgpg.passphrase=${GPG_PASSPHRASE}
-Dgpg.keyname=${GPG_KEYNAME} && ./mvnw -Plinux-aarch64 -am -pl boringssl-static
clean javadoc:jar package gpg:sign
org.sonatype.plugins:nexus-staging-maven-plugin:deploy
-DnexusUrl=https://oss.sonatype.org -DserverId=sonatype-nexus-staging
-DaltStagingDirectory=/root/local-staging -DskipRemoteStaging=true
-DskipTests=true -Dgpg.passphrase=${GPG_PASSPHRASE}
-Dgpg.keyname=${GPG_KEYNAME}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/libressl-static/pom.xml
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/libressl-static/pom.xml
---
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/libressl-static/pom.xml
2024-11-01 18:00:35.000000000 +0100
+++
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/libressl-static/pom.xml
2025-02-10 08:17:37.000000000 +0100
@@ -19,7 +19,7 @@
<parent>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-parent</artifactId>
- <version>2.0.69.Final</version>
+ <version>2.0.70.Final</version>
</parent>
<artifactId>netty-tcnative-libressl-static</artifactId>
<packaging>jar</packaging>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/openssl-classes/pom.xml
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/openssl-classes/pom.xml
---
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/openssl-classes/pom.xml
2024-11-01 18:00:35.000000000 +0100
+++
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/openssl-classes/pom.xml
2025-02-10 08:17:37.000000000 +0100
@@ -19,7 +19,7 @@
<parent>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-parent</artifactId>
- <version>2.0.69.Final</version>
+ <version>2.0.70.Final</version>
</parent>
<artifactId>netty-tcnative-classes</artifactId>
<packaging>jar</packaging>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/openssl-dynamic/pom.xml
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/openssl-dynamic/pom.xml
---
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/openssl-dynamic/pom.xml
2024-11-01 18:00:35.000000000 +0100
+++
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/openssl-dynamic/pom.xml
2025-02-10 08:17:37.000000000 +0100
@@ -19,7 +19,7 @@
<parent>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-parent</artifactId>
- <version>2.0.69.Final</version>
+ <version>2.0.70.Final</version>
</parent>
<artifactId>netty-tcnative</artifactId>
<packaging>jar</packaging>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/openssl-dynamic/src/main/c/ssl.c
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/openssl-dynamic/src/main/c/ssl.c
---
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/openssl-dynamic/src/main/c/ssl.c
2024-11-01 18:00:35.000000000 +0100
+++
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/openssl-dynamic/src/main/c/ssl.c
2025-02-10 08:17:37.000000000 +0100
@@ -994,6 +994,7 @@
TCN_CHECK_NULL(bio, bioAddress, 0);
TCN_CHECK_NULL(wbuf, wbufAddress, 0);
+ TCN_CHECK_POSITIVE_OR_ZERO(wlen, wlen must be >= 0, 0);
return BIO_write(bio, wbuf, wlen);
}
@@ -1008,7 +1009,7 @@
struct TCN_bio_bytebuffer* bioUserData = NULL;
TCN_CHECK_NULL(bio, bioAddress, /* void */);
TCN_CHECK_NULL(buffer, bufferAddress, /* void */);
-
+ TCN_CHECK_POSITIVE_OR_ZERO(maxUsableBytes, maxUsableBytes must be >= 0, /*
void */);
bioUserData = (struct TCN_bio_bytebuffer*) BIO_get_data(bio);
TCN_ASSERT(bioUserData != NULL);
@@ -1056,6 +1057,7 @@
TCN_CHECK_NULL(ssl_, ssl, 0);
TCN_CHECK_NULL(w, wbuf, 0);
+ TCN_CHECK_POSITIVE_OR_ZERO(wlen, wlen must be >= 0, 0);
return SSL_write(ssl_, w, wlen);
}
@@ -1070,6 +1072,7 @@
TCN_CHECK_NULL(ssl_, ssl, 0);
TCN_CHECK_NULL(r, rbuf, 0);
+ TCN_CHECK_POSITIVE_OR_ZERO(rlen, rlen must be >=, 0);
return SSL_read(ssl_, r, rlen);
}
@@ -1136,10 +1139,7 @@
TCN_CHECK_NULL(ssl_, ssl, 0);
- if (nonApplicationBufferSize <= 0) {
- tcn_ThrowException(e, "nonApplicationBufferSize <= 0");
- return 0;
- }
+ TCN_CHECK_POSITIVE(nonApplicationBufferSize, nonApplicationBufferSize must
be > 0, 0);
bio = BIO_new(BIO_java_bytebuffer());
if (bio == NULL) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/openssl-dynamic/src/main/c/tcn.h
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/openssl-dynamic/src/main/c/tcn.h
---
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/openssl-dynamic/src/main/c/tcn.h
2024-11-01 18:00:35.000000000 +0100
+++
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/openssl-dynamic/src/main/c/tcn.h
2025-02-10 08:17:37.000000000 +0100
@@ -111,6 +111,22 @@
} \
NETTY_JNI_UTIL_END_MACRO
+#define TCN_CHECK_POSITIVE_OR_ZERO(V, M, R) \
+ NETTY_JNI_UTIL_BEGIN_MACRO \
+ if (V < 0) { \
+ tcn_ThrowIllegalArgumentException(e, #M); \
+ return R; \
+ } \
+ NETTY_JNI_UTIL_END_MACRO
+
+#define TCN_CHECK_POSITIVE(V, M, R) \
+ NETTY_JNI_UTIL_BEGIN_MACRO \
+ if (V <= 0) { \
+ tcn_ThrowIllegalArgumentException(e, #M); \
+ return R; \
+ } \
+ NETTY_JNI_UTIL_END_MACRO
+
#define TCN_FREE_JSTRING(V) \
NETTY_JNI_UTIL_BEGIN_MACRO \
if (c##V) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/openssl-static/pom.xml
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/openssl-static/pom.xml
---
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/openssl-static/pom.xml
2024-11-01 18:00:35.000000000 +0100
+++
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/openssl-static/pom.xml
2025-02-10 08:17:37.000000000 +0100
@@ -19,7 +19,7 @@
<parent>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-parent</artifactId>
- <version>2.0.69.Final</version>
+ <version>2.0.70.Final</version>
</parent>
<artifactId>netty-tcnative-openssl-static</artifactId>
<packaging>jar</packaging>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/pom.xml
new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/pom.xml
--- old/netty-tcnative-netty-tcnative-parent-2.0.69.Final/pom.xml
2024-11-01 18:00:35.000000000 +0100
+++ new/netty-tcnative-netty-tcnative-parent-2.0.70.Final/pom.xml
2025-02-10 08:17:37.000000000 +0100
@@ -24,7 +24,7 @@
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-parent</artifactId>
- <version>2.0.69.Final</version>
+ <version>2.0.70.Final</version>
<packaging>pom</packaging>
<name>Netty/TomcatNative [Parent]</name>
@@ -103,7 +103,7 @@
<aprSourceDir>${project.build.directory}/apr-source</aprSourceDir>
<archBits>64</archBits>
<linkStatic>false</linkStatic>
- <osxCrossCompile>false</osxCrossCompile>
+ <crossCompile>false</crossCompile>
<sslHome>${project.build.directory}/ssl</sslHome>
<msvcSslIncludeDirs>${sslHome}/include</msvcSslIncludeDirs>
<msvcSslLibDirs>${sslHome}/lib</msvcSslLibDirs>
@@ -699,7 +699,7 @@
<exec executable="buildconf" failonerror="true"
dir="${aprSourceDir}" resolveexecutable="true" />
<if>
- <equals arg1="${osxCrossCompile}" arg2="true" />
+ <equals arg1="${crossCompile}" arg2="mac" />
<then>
<!--
+ We need to set some extra variables as otherwise
the configure of apr will fail when trying to cross-compile.
@@ -723,6 +723,32 @@
<arg line="install" />
</exec>
</then>
+ <elseif>
+ <equals arg1="${crossCompile}" arg2="linux" />
+ <then>
+ <!--
+ + We need to set some extra variables as
otherwise the configure of apr will fail when trying to cross-compile.
+ + See https://stackoverflow.com/a/1605497/1074097
+ + -->
+ <exec executable="configure" failonerror="true"
dir="${aprSourceDir}" resolveexecutable="true">
+ <arg line="--disable-shared
--prefix=${aprHome} --host=aarch64-linux-gnu CC=aarch64-none-linux-gnu-gcc
CFLAGS='-O3 -fno-omit-frame-pointer -fPIC' ac_cv_have_decl_sys_siglist=no
ac_cv_file__dev_zero=yes ac_cv_func_setpgrp_void=yes
apr_cv_tcp_nodelay_with_cork=yes ac_cv_sizeof_struct_iovec=8" />
+ </exec>
+ <!--
+ Make will fail when it tries to use the
gen_test_char program.
+ We work around this by compile gen_test_char
separate, execute and than rerun make.
+ See
https://stackoverflow.com/a/56262330/1074097
+ -->
+ <exec executable="make" failonerror="false"
dir="${aprSourceDir}" resolveexecutable="true" />
+ <exec executable="gcc" failonerror="true"
dir="${aprSourceDir}" resolveexecutable="true">
+ <arg line="-Wall -O2 -DCROSS_COMPILE
tools/gen_test_char.c -o tools/gen_test_char" />
+ </exec>
+ <exec executable="tools/gen_test_char"
failonerror="true" dir="${aprSourceDir}" resolveexecutable="true"
output="${aprSourceDir}/include/private/apr_escape_test_char.h" />
+ <exec executable="make" failonerror="true"
dir="${aprSourceDir}" resolveexecutable="true" />
+ <exec executable="make" failonerror="true"
dir="${aprSourceDir}" resolveexecutable="true">
+ <arg line="install" />
+ </exec>
+ </then>
+ </elseif>
<else>
<exec executable="configure" failonerror="true"
dir="${aprSourceDir}" resolveexecutable="true">
<!--
