Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package netty for openSUSE:Factory checked in at 2026-03-13 21:18:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netty (Old) and /work/SRC/openSUSE:Factory/.netty.new.8177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netty" Fri Mar 13 21:18:28 2026 rev:12 rq:1338742 version:4.1.131 Changes: -------- --- /work/SRC/openSUSE:Factory/netty/netty.changes 2025-12-17 17:37:44.115095484 +0100 +++ /work/SRC/openSUSE:Factory/.netty.new.8177/netty.changes 2026-03-13 21:22:22.851147330 +0100 @@ -1,0 +2,26 @@ +Fri Mar 13 11:52:36 UTC 2026 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 4.1.131 + * Fixes: + + NioDatagramChannel.block(...) does not early return on failure + + Support for AWS Libcrypto (AWS-LC) netty-tcnative build + + codec-dns: Decompress MX RDATA exchange domain names during + DNS record decoding + + Buddy allocation for large buffers in adaptive allocator + + SslHandler: Only resume on EventLoop if EventLoop is not + shutting down already + + Wrap ECONNREFUSED in PortUnreachableException for UDP + + Bump com.ning:compress-lzf (4.1) + + Fix adaptive allocator bug from not noticing failed allocation + + Avoid loosing original read exception + + Backport multiple adaptive allocator changes +- Modified patches: + * 0001-Remove-optional-dep-Blockhound.patch + * 0002-Remove-optional-dep-conscrypt.patch + * 0003-Remove-optional-deps-jetty-alpn-and-npn.patch + * 0004-Disable-Brotli-and-ZStd-compression.patch + * no-werror.patch + * reproducible.patch + + rediff + +------------------------------------------------------------------- @@ -4 +30 @@ -- Upgrade to upstream verson 4.1.130 +- Upgrade to upstream version 4.1.130 Old: ---- netty-4.1.130.Final.tar.gz New: ---- netty-4.1.131.Final.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netty.spec ++++++ --- /var/tmp/diff_new_pack.NSOpxe/_old 2026-03-13 21:22:23.551176338 +0100 +++ /var/tmp/diff_new_pack.NSOpxe/_new 2026-03-13 21:22:23.555176503 +0100 @@ -1,7 +1,7 @@ # # spec file for package netty # -# Copyright (c) 2025 SUSE LLC and contributors +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global namedreltag .Final %global namedversion %{version}%{?namedreltag} Name: netty -Version: 4.1.130 +Version: 4.1.131 Release: 0 Summary: An asynchronous event-driven network application framework and tools for Java License: Apache-2.0 ++++++ 0001-Remove-optional-dep-Blockhound.patch ++++++ --- /var/tmp/diff_new_pack.NSOpxe/_old 2026-03-13 21:22:23.595178161 +0100 +++ /var/tmp/diff_new_pack.NSOpxe/_new 2026-03-13 21:22:23.599178327 +0100 @@ -1,4 +1,4 @@ -From c477054f5257b1bb65ce4be1f305a666523a8861 Mon Sep 17 00:00:00 2001 +From 0cd1cee884653902d23d36a0190a90b2e2364329 Mon Sep 17 00:00:00 2001 From: Mat Booth <[email protected]> Date: Mon, 7 Sep 2020 12:17:31 +0100 Subject: [PATCH 1/4] Remove optional dep Blockhound @@ -9,11 +9,11 @@ ...ockhound.integration.BlockHoundIntegration | 14 - pom.xml | 8 - transport-blockhound-tests/pom.xml | 228 ------- - .../NettyBlockHoundIntegrationTest.java | 568 ------------------ + .../NettyBlockHoundIntegrationTest.java | 570 ------------------ .../netty/util/internal/localhost_server.key | 28 - .../netty/util/internal/localhost_server.pem | 17 - .../io/netty/util/internal/mutual_auth_ca.pem | 19 - - 9 files changed, 1087 deletions(-) + 9 files changed, 1089 deletions(-) delete mode 100644 common/src/main/java/io/netty/util/internal/Hidden.java delete mode 100644 common/src/main/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration delete mode 100644 transport-blockhound-tests/pom.xml @@ -23,7 +23,7 @@ delete mode 100644 transport-blockhound-tests/src/test/resources/io/netty/util/internal/mutual_auth_ca.pem diff --git a/common/pom.xml b/common/pom.xml -index a413be33fb..3bf35b1110 100644 +index 4664f8f813..b1081b1d08 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -89,11 +89,6 @@ @@ -266,7 +266,7 @@ -io.netty.util.internal.Hidden$NettyBlockHoundIntegration \ No newline at end of file diff --git a/pom.xml b/pom.xml -index 8fb5555d1b..c149145262 100644 +index 8e711a4cdb..7cc071371d 100644 --- a/pom.xml +++ b/pom.xml @@ -905,7 +905,6 @@ @@ -286,14 +286,14 @@ - <dependency> - <groupId>io.projectreactor.tools</groupId> - <artifactId>blockhound</artifactId> -- <version>1.0.15.RELEASE</version> +- <version>1.0.16.RELEASE</version> - </dependency> </dependencies> </dependencyManagement> diff --git a/transport-blockhound-tests/pom.xml b/transport-blockhound-tests/pom.xml deleted file mode 100644 -index 3911b0cb1c..0000000000 +index ad874197f0..0000000000 --- a/transport-blockhound-tests/pom.xml +++ /dev/null @@ -1,228 +0,0 @@ @@ -319,7 +319,7 @@ - <parent> - <groupId>io.netty</groupId> - <artifactId>netty-parent</artifactId> -- <version>4.1.130.Final</version> +- <version>4.1.131.Final</version> - </parent> - - <artifactId>netty-transport-blockhound-tests</artifactId> @@ -527,10 +527,10 @@ -</project> diff --git a/transport-blockhound-tests/src/test/java/io/netty/util/internal/NettyBlockHoundIntegrationTest.java b/transport-blockhound-tests/src/test/java/io/netty/util/internal/NettyBlockHoundIntegrationTest.java deleted file mode 100644 -index 403b97a418..0000000000 +index 3b8da14d4e..0000000000 --- a/transport-blockhound-tests/src/test/java/io/netty/util/internal/NettyBlockHoundIntegrationTest.java +++ /dev/null -@@ -1,568 +0,0 @@ +@@ -1,570 +0,0 @@ -/* - * Copyright 2019 The Netty Project - @@ -783,6 +783,7 @@ - testHandshakeWithExecutor(executorService, "TLSv1.2"); - } finally { - executorService.shutdown(); +- assertTrue(executorService.awaitTermination(5, TimeUnit.SECONDS)); - } - } - @@ -794,6 +795,7 @@ - testHandshakeWithExecutor(executorService, "TLSv1.3"); - } finally { - executorService.shutdown(); +- assertTrue(executorService.awaitTermination(5, TimeUnit.SECONDS)); - } - } - @@ -1182,6 +1184,6 @@ -hH82y9bBeflqroOeztqMpONpWoZjlz0sWbJNvXztXINL7LaNmVYOcoUrCcxPS54T ------END CERTIFICATE----- -- -2.52.0 +2.53.0 ++++++ 0002-Remove-optional-dep-conscrypt.patch ++++++ --- /var/tmp/diff_new_pack.NSOpxe/_old 2026-03-13 21:22:23.619179155 +0100 +++ /var/tmp/diff_new_pack.NSOpxe/_new 2026-03-13 21:22:23.623179321 +0100 @@ -1,4 +1,4 @@ -From eb4608a17464639be083fbb07c46d1ec50fe80ea Mon Sep 17 00:00:00 2001 +From 8df29a5bbf89305b6714fcc8ba3b3e8eb08e099a Mon Sep 17 00:00:00 2001 From: Mat Booth <[email protected]> Date: Mon, 7 Sep 2020 13:24:30 +0100 Subject: [PATCH 2/4] Remove optional dep conscrypt @@ -15,7 +15,7 @@ delete mode 100644 handler/src/main/java/io/netty/handler/ssl/ConscryptAlpnSslEngine.java diff --git a/handler/pom.xml b/handler/pom.xml -index dd30e448f2..1076b3963f 100644 +index c961086be2..47538963b3 100644 --- a/handler/pom.xml +++ b/handler/pom.xml @@ -96,12 +96,6 @@ @@ -364,7 +364,7 @@ return new BouncyCastleAlpnSslEngine(engine, applicationNegotiator, isServer); } diff --git a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java -index f80b3004a8..6159b87ca2 100644 +index 8b8b88d4da..32ad13a25d 100644 --- a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java +++ b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java @@ -250,55 +250,6 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH @@ -434,7 +434,7 @@ SslEngineType(boolean wantsDirectBuffer, Cumulator cumulator) { diff --git a/pom.xml b/pom.xml -index c149145262..7619d72aa9 100644 +index 7cc071371d..6280e71fda 100644 --- a/pom.xml +++ b/pom.xml @@ -984,16 +984,6 @@ @@ -455,6 +455,6 @@ <dependency> <groupId>software.amazon.cryptools</groupId> -- -2.52.0 +2.53.0 ++++++ 0003-Remove-optional-deps-jetty-alpn-and-npn.patch ++++++ --- /var/tmp/diff_new_pack.NSOpxe/_old 2026-03-13 21:22:23.651180481 +0100 +++ /var/tmp/diff_new_pack.NSOpxe/_new 2026-03-13 21:22:23.655180647 +0100 @@ -1,4 +1,4 @@ -From bc24ff3d1f65d8cca6d9866f86d0d288955aecf2 Mon Sep 17 00:00:00 2001 +From ee94cacd5639220e530ce9285dc6c88473d027f9 Mon Sep 17 00:00:00 2001 From: Mat Booth <[email protected]> Date: Mon, 7 Sep 2020 13:26:20 +0100 Subject: [PATCH 3/4] Remove optional deps jetty alpn and npn @@ -15,7 +15,7 @@ delete mode 100644 handler/src/main/java/io/netty/handler/ssl/JettyNpnSslEngine.java diff --git a/handler/pom.xml b/handler/pom.xml -index 1076b3963f..a7532b58a0 100644 +index 47538963b3..ae21ff4df2 100644 --- a/handler/pom.xml +++ b/handler/pom.xml @@ -86,16 +86,6 @@ @@ -374,7 +374,7 @@ - } -} diff --git a/pom.xml b/pom.xml -index 7619d72aa9..1a96a46174 100644 +index 6280e71fda..365fa525d7 100644 --- a/pom.xml +++ b/pom.xml @@ -941,20 +941,6 @@ @@ -399,6 +399,6 @@ <dependency> <groupId>com.google.protobuf</groupId> -- -2.52.0 +2.53.0 ++++++ 0004-Disable-Brotli-and-ZStd-compression.patch ++++++ --- /var/tmp/diff_new_pack.NSOpxe/_old 2026-03-13 21:22:23.675181476 +0100 +++ /var/tmp/diff_new_pack.NSOpxe/_new 2026-03-13 21:22:23.679181642 +0100 @@ -1,18 +1,18 @@ -From e88bb2c9f01c33b8ed1263dd3624f4b24c29dff1 Mon Sep 17 00:00:00 2001 +From 96dec85327b3309c7fcc0d77376ef12415bffa34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]> Date: Thu, 30 Mar 2023 13:19:04 +0200 Subject: [PATCH 4/4] Disable Brotli and ZStd compression --- - .../codec/http/HttpContentCompressor.java | 107 +----------------- - .../codec/http/HttpContentDecompressor.java | 22 ---- - .../CompressorHttp2ConnectionEncoder.java | 42 +------ - .../DelegatingDecompressorFrameListener.java | 20 ---- - .../StandardCompressionOptions.java | 70 +----------- - 5 files changed, 5 insertions(+), 256 deletions(-) + .../codec/http/HttpContentCompressor.java | 76 +------------------ + .../codec/http/HttpContentDecompressor.java | 16 ---- + .../CompressorHttp2ConnectionEncoder.java | 31 +------- + .../DelegatingDecompressorFrameListener.java | 14 ---- + .../StandardCompressionOptions.java | 63 +-------------- + 5 files changed, 5 insertions(+), 195 deletions(-) diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java -index 17f55d3ed5..27da52dd9a 100644 +index 17f55d3ed5..9bfe5f4cce 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java @@ -24,9 +24,6 @@ import io.netty.buffer.ByteBuf; @@ -25,19 +25,17 @@ import io.netty.handler.codec.compression.CompressionOptions; import io.netty.handler.codec.compression.DeflateOptions; import io.netty.handler.codec.compression.GzipOptions; -@@ -34,11 +31,6 @@ import io.netty.handler.codec.compression.StandardCompressionOptions; +@@ -34,9 +31,6 @@ import io.netty.handler.codec.compression.StandardCompressionOptions; import io.netty.handler.codec.compression.ZlibCodecFactory; import io.netty.handler.codec.compression.ZlibEncoder; import io.netty.handler.codec.compression.ZlibWrapper; -import io.netty.handler.codec.compression.Zstd; -import io.netty.handler.codec.compression.ZstdEncoder; -import io.netty.handler.codec.compression.ZstdOptions; --import io.netty.handler.codec.compression.SnappyFrameEncoder; --import io.netty.handler.codec.compression.SnappyOptions; + import io.netty.handler.codec.compression.SnappyFrameEncoder; + import io.netty.handler.codec.compression.SnappyOptions; import io.netty.util.internal.ObjectUtil; - - import static io.netty.util.internal.ObjectUtil.checkInRange; -@@ -52,11 +44,8 @@ import static io.netty.util.internal.ObjectUtil.checkInRange; +@@ -52,10 +46,8 @@ import static io.netty.util.internal.ObjectUtil.checkInRange; */ public class HttpContentCompressor extends HttpContentEncoder { @@ -45,11 +43,10 @@ private final GzipOptions gzipOptions; private final DeflateOptions deflateOptions; - private final ZstdOptions zstdOptions; -- private final SnappyOptions snappyOptions; + private final SnappyOptions snappyOptions; private final int contentSizeThreshold; - private ChannelHandlerContext ctx; -@@ -174,11 +163,8 @@ public class HttpContentCompressor extends HttpContentEncoder { +@@ -174,10 +166,8 @@ public class HttpContentCompressor extends HttpContentEncoder { */ public HttpContentCompressor(int contentSizeThreshold, CompressionOptions... compressionOptions) { this.contentSizeThreshold = ObjectUtil.checkPositiveOrZero(contentSizeThreshold, "contentSizeThreshold"); @@ -57,11 +54,10 @@ GzipOptions gzipOptions = null; DeflateOptions deflateOptions = null; - ZstdOptions zstdOptions = null; -- SnappyOptions snappyOptions = null; + SnappyOptions snappyOptions = null; if (compressionOptions == null || compressionOptions.length == 0) { compressionOptions = defaultCompressionOptions( - StandardCompressionOptions.gzip(), StandardCompressionOptions.deflate()); -@@ -192,16 +178,10 @@ public class HttpContentCompressor extends HttpContentEncoder { +@@ -192,14 +182,10 @@ public class HttpContentCompressor extends HttpContentEncoder { // This results in the static analysis of native-image identifying the instanceof BrotliOptions check // and thus BrotliOptions itself as unreachable, enabling native-image to link all classes // at build time and not complain about the missing Brotli classes. @@ -74,22 +70,19 @@ deflateOptions = (DeflateOptions) compressionOption; - } else if (Zstd.isAvailable() && compressionOption instanceof ZstdOptions) { - zstdOptions = (ZstdOptions) compressionOption; -- } else if (compressionOption instanceof SnappyOptions) { -- snappyOptions = (SnappyOptions) compressionOption; + } else if (compressionOption instanceof SnappyOptions) { + snappyOptions = (SnappyOptions) compressionOption; } else { - throw new IllegalArgumentException("Unsupported " + CompressionOptions.class.getSimpleName() + - ": " + compressionOption); -@@ -210,9 +190,6 @@ public class HttpContentCompressor extends HttpContentEncoder { +@@ -210,8 +196,6 @@ public class HttpContentCompressor extends HttpContentEncoder { this.gzipOptions = gzipOptions; this.deflateOptions = deflateOptions; - this.brotliOptions = brotliOptions; - this.zstdOptions = zstdOptions; -- this.snappyOptions = snappyOptions; + this.snappyOptions = snappyOptions; this.factories = new HashMap<String, CompressionEncoderFactory>(); - -@@ -222,15 +199,6 @@ public class HttpContentCompressor extends HttpContentEncoder { +@@ -222,12 +206,6 @@ public class HttpContentCompressor extends HttpContentEncoder { if (this.deflateOptions != null) { this.factories.put("deflate", new DeflateEncoderFactory()); } @@ -99,17 +92,13 @@ - if (this.zstdOptions != null) { - this.factories.put("zstd", new ZstdEncoderFactory()); - } -- if (this.snappyOptions != null) { -- this.factories.put("snappy", new SnappyEncoderFactory()); -- } - } - - private static CompressionOptions[] defaultCompressionOptions( -@@ -238,14 +206,6 @@ public class HttpContentCompressor extends HttpContentEncoder { - List<CompressionOptions> options = new ArrayList<CompressionOptions>(5); + if (this.snappyOptions != null) { + this.factories.put("snappy", new SnappyEncoderFactory()); + } +@@ -239,13 +217,6 @@ public class HttpContentCompressor extends HttpContentEncoder { options.add(gzipOptions); options.add(deflateOptions); -- options.add(StandardCompressionOptions.snappy()); + options.add(StandardCompressionOptions.snappy()); - - if (Brotli.isAvailable()) { - options.add(StandardCompressionOptions.brotli()); @@ -120,17 +109,16 @@ return options.toArray(new CompressionOptions[0]); } -@@ -289,9 +249,6 @@ public class HttpContentCompressor extends HttpContentEncoder { +@@ -289,8 +260,6 @@ public class HttpContentCompressor extends HttpContentEncoder { @SuppressWarnings("FloatingPointEquality") protected String determineEncoding(String acceptEncoding) { float starQ = -1.0f; - float brQ = -1.0f; - float zstdQ = -1.0f; -- float snappyQ = -1.0f; + float snappyQ = -1.0f; float gzipQ = -1.0f; float deflateQ = -1.0f; - for (String encoding : acceptEncoding.split(",")) { -@@ -307,41 +264,20 @@ public class HttpContentCompressor extends HttpContentEncoder { +@@ -307,10 +276,6 @@ public class HttpContentCompressor extends HttpContentEncoder { } if (encoding.contains("*")) { starQ = q; @@ -138,11 +126,10 @@ - brQ = q; - } else if (encoding.contains("zstd") && q > zstdQ) { - zstdQ = q; -- } else if (encoding.contains("snappy") && q > snappyQ) { -- snappyQ = q; + } else if (encoding.contains("snappy") && q > snappyQ) { + snappyQ = q; } else if (encoding.contains("gzip") && q > gzipQ) { - gzipQ = q; - } else if (encoding.contains("deflate") && q > deflateQ) { +@@ -319,12 +284,8 @@ public class HttpContentCompressor extends HttpContentEncoder { deflateQ = q; } } @@ -152,13 +139,12 @@ - } else if (zstdQ != -1.0f && zstdQ >= snappyQ && this.zstdOptions != null) { - return "zstd"; - } else if (snappyQ != -1.0f && snappyQ >= gzipQ && this.snappyOptions != null) { -- return "snappy"; -- } else if (gzipQ != -1.0f && gzipQ >= deflateQ && this.gzipOptions != null) { -+ if (gzipQ > 0.0f || deflateQ > 0.0f) { -+ if (gzipQ != -1.0f && gzipQ >= deflateQ && this.gzipOptions != null) { ++ if (snappyQ > 0.0f || gzipQ > 0.0f || deflateQ > 0.0f) { ++ if (snappyQ != -1.0f && snappyQ >= gzipQ && this.snappyOptions != null) { + return "snappy"; + } else if (gzipQ != -1.0f && gzipQ >= deflateQ && this.gzipOptions != null) { return "gzip"; - } else if (deflateQ != -1.0f && this.deflateOptions != null) { - return "deflate"; +@@ -333,12 +294,6 @@ public class HttpContentCompressor extends HttpContentEncoder { } } if (starQ > 0.0f) { @@ -168,17 +154,13 @@ - if (zstdQ == -1.0f && this.zstdOptions != null) { - return "zstd"; - } -- if (snappyQ == -1.0f && this.snappyOptions != null) { -- return "snappy"; -- } - if (gzipQ == -1.0f && this.gzipOptions != null) { - return "gzip"; + if (snappyQ == -1.0f && this.snappyOptions != null) { + return "snappy"; } -@@ -422,41 +358,4 @@ public class HttpContentCompressor extends HttpContentEncoder { - deflateOptions.windowBits(), deflateOptions.memLevel()); +@@ -423,31 +378,6 @@ public class HttpContentCompressor extends HttpContentEncoder { } } -- + - /** - * Compression Encoder Factory that creates {@link BrotliEncoder}s - * used to compress http content for br content encoding @@ -204,23 +186,14 @@ - } - } - -- /** -- * Compression Encoder Factory for create {@link SnappyFrameEncoder} -- * used to compress http content for snappy content encoding -- */ -- private static final class SnappyEncoderFactory implements CompressionEncoderFactory { -- -- @Override -- public MessageToByteEncoder<ByteBuf> createEncoder() { -- return new SnappyFrameEncoder(); -- } -- } - } + /** + * Compression Encoder Factory for create {@link SnappyFrameEncoder} + * used to compress http content for snappy content encoding diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java -index 44e6195332..ea461844af 100644 +index 44e6195332..475a09ae58 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java -@@ -15,23 +15,15 @@ +@@ -15,23 +15,17 @@ */ package io.netty.handler.codec.http; @@ -229,14 +202,14 @@ import static io.netty.handler.codec.http.HttpHeaderValues.GZIP; import static io.netty.handler.codec.http.HttpHeaderValues.X_DEFLATE; import static io.netty.handler.codec.http.HttpHeaderValues.X_GZIP; --import static io.netty.handler.codec.http.HttpHeaderValues.SNAPPY; + import static io.netty.handler.codec.http.HttpHeaderValues.SNAPPY; -import static io.netty.handler.codec.http.HttpHeaderValues.ZSTD; import static io.netty.util.internal.ObjectUtil.checkPositiveOrZero; import io.netty.channel.embedded.EmbeddedChannel; -import io.netty.handler.codec.compression.Brotli; -import io.netty.handler.codec.compression.BrotliDecoder; --import io.netty.handler.codec.compression.SnappyFrameDecoder; + import io.netty.handler.codec.compression.SnappyFrameDecoder; import io.netty.handler.codec.compression.ZlibCodecFactory; import io.netty.handler.codec.compression.ZlibWrapper; -import io.netty.handler.codec.compression.Zstd; @@ -244,7 +217,7 @@ /** * Decompresses an {@link HttpMessage} and an {@link HttpContent} compressed in -@@ -102,20 +94,6 @@ public class HttpContentDecompressor extends HttpContentDecoder { +@@ -102,21 +96,11 @@ public class HttpContentDecompressor extends HttpContentDecoder { return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(), ctx.channel().config(), ZlibCodecFactory.newZlibDecoder(wrapper, maxAllocation)); } @@ -253,23 +226,24 @@ - ctx.channel().config(), new BrotliDecoder()); - } - -- if (SNAPPY.contentEqualsIgnoreCase(contentEncoding)) { -- return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(), -- ctx.channel().config(), new SnappyFrameDecoder()); -- } -- + if (SNAPPY.contentEqualsIgnoreCase(contentEncoding)) { + return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(), + ctx.channel().config(), new SnappyFrameDecoder()); + } + - if (Zstd.isAvailable() && ZSTD.contentEqualsIgnoreCase(contentEncoding)) { - return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(), - ctx.channel().config(), new ZstdDecoder()); - } - +- // 'identity' or unsupported return null; + } diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/CompressorHttp2ConnectionEncoder.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/CompressorHttp2ConnectionEncoder.java -index b12213dff6..fdeadaebbe 100644 +index b12213dff6..23d719c32e 100644 --- a/codec-http2/src/main/java/io/netty/handler/codec/http2/CompressorHttp2ConnectionEncoder.java +++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/CompressorHttp2ConnectionEncoder.java -@@ -21,20 +21,12 @@ import io.netty.channel.ChannelHandlerContext; +@@ -21,18 +21,12 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.handler.codec.ByteToMessageDecoder; @@ -285,12 +259,10 @@ -import io.netty.handler.codec.compression.Zstd; -import io.netty.handler.codec.compression.ZstdEncoder; -import io.netty.handler.codec.compression.ZstdOptions; --import io.netty.handler.codec.compression.SnappyFrameEncoder; --import io.netty.handler.codec.compression.SnappyOptions; + import io.netty.handler.codec.compression.SnappyFrameEncoder; + import io.netty.handler.codec.compression.SnappyOptions; import io.netty.util.concurrent.PromiseCombiner; - import io.netty.util.internal.ObjectUtil; - -@@ -43,14 +35,11 @@ import java.util.List; +@@ -43,13 +37,11 @@ import java.util.List; import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_ENCODING; import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH; @@ -301,11 +273,10 @@ import static io.netty.handler.codec.http.HttpHeaderValues.X_DEFLATE; import static io.netty.handler.codec.http.HttpHeaderValues.X_GZIP; -import static io.netty.handler.codec.http.HttpHeaderValues.ZSTD; --import static io.netty.handler.codec.http.HttpHeaderValues.SNAPPY; + import static io.netty.handler.codec.http.HttpHeaderValues.SNAPPY; /** - * A decorating HTTP2 encoder that will compress data frames according to the {@code content-encoding} header for each -@@ -69,11 +58,8 @@ public class CompressorHttp2ConnectionEncoder extends DecoratingHttp2ConnectionE +@@ -69,10 +61,8 @@ public class CompressorHttp2ConnectionEncoder extends DecoratingHttp2ConnectionE private final boolean supportsCompressionOptions; @@ -313,15 +284,13 @@ private GzipOptions gzipCompressionOptions; private DeflateOptions deflateOptions; - private ZstdOptions zstdOptions; -- private SnappyOptions snappyOptions; + private SnappyOptions snappyOptions; /** - * Create a new {@link CompressorHttp2ConnectionEncoder} instance -@@ -87,13 +73,6 @@ public class CompressorHttp2ConnectionEncoder extends DecoratingHttp2ConnectionE - List<CompressionOptions> compressionOptions = new ArrayList<CompressionOptions>(); +@@ -88,12 +78,6 @@ public class CompressorHttp2ConnectionEncoder extends DecoratingHttp2ConnectionE compressionOptions.add(StandardCompressionOptions.gzip()); compressionOptions.add(StandardCompressionOptions.deflate()); -- compressionOptions.add(StandardCompressionOptions.snappy()); + compressionOptions.add(StandardCompressionOptions.snappy()); - if (Brotli.isAvailable()) { - compressionOptions.add(StandardCompressionOptions.brotli()); - } @@ -331,7 +300,7 @@ return compressionOptions.toArray(new CompressionOptions[0]); } -@@ -139,16 +118,10 @@ public class CompressorHttp2ConnectionEncoder extends DecoratingHttp2ConnectionE +@@ -139,14 +123,10 @@ public class CompressorHttp2ConnectionEncoder extends DecoratingHttp2ConnectionE // This results in the static analysis of native-image identifying the instanceof BrotliOptions check // and thus BrotliOptions itself as unreachable, enabling native-image to link all classes at build time // and not complain about the missing Brotli classes. @@ -344,12 +313,10 @@ deflateOptions = (DeflateOptions) compressionOptions; - } else if (compressionOptions instanceof ZstdOptions) { - zstdOptions = (ZstdOptions) compressionOptions; -- } else if (compressionOptions instanceof SnappyOptions) { -- snappyOptions = (SnappyOptions) compressionOptions; + } else if (compressionOptions instanceof SnappyOptions) { + snappyOptions = (SnappyOptions) compressionOptions; } else { - throw new IllegalArgumentException("Unsupported " + CompressionOptions.class.getSimpleName() + - ": " + compressionOptions); -@@ -286,19 +259,6 @@ public class CompressorHttp2ConnectionEncoder extends DecoratingHttp2ConnectionE +@@ -286,15 +266,6 @@ public class CompressorHttp2ConnectionEncoder extends DecoratingHttp2ConnectionE if (DEFLATE.contentEqualsIgnoreCase(contentEncoding) || X_DEFLATE.contentEqualsIgnoreCase(contentEncoding)) { return newCompressionChannel(ctx, ZlibWrapper.ZLIB); } @@ -362,18 +329,14 @@ - ctx.channel().config(), new ZstdEncoder(zstdOptions.compressionLevel(), - zstdOptions.blockSize(), zstdOptions.maxEncodeSize())); - } -- if (snappyOptions != null && SNAPPY.contentEqualsIgnoreCase(contentEncoding)) { -- return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(), -- ctx.channel().config(), new SnappyFrameEncoder()); -- } - // 'identity' or unsupported - return null; - } + if (snappyOptions != null && SNAPPY.contentEqualsIgnoreCase(contentEncoding)) { + return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(), + ctx.channel().config(), new SnappyFrameEncoder()); diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/DelegatingDecompressorFrameListener.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/DelegatingDecompressorFrameListener.java -index 73e497ccb8..56a2a93677 100644 +index 73e497ccb8..085ba2bc73 100644 --- a/codec-http2/src/main/java/io/netty/handler/codec/http2/DelegatingDecompressorFrameListener.java +++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/DelegatingDecompressorFrameListener.java -@@ -20,24 +20,16 @@ import io.netty.channel.ChannelHandlerContext; +@@ -20,24 +20,18 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.handler.codec.ByteToMessageDecoder; @@ -383,7 +346,7 @@ -import io.netty.handler.codec.compression.ZstdDecoder; import io.netty.handler.codec.compression.ZlibCodecFactory; import io.netty.handler.codec.compression.ZlibWrapper; --import io.netty.handler.codec.compression.SnappyFrameDecoder; + import io.netty.handler.codec.compression.SnappyFrameDecoder; import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_ENCODING; import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH; @@ -393,12 +356,12 @@ import static io.netty.handler.codec.http.HttpHeaderValues.IDENTITY; import static io.netty.handler.codec.http.HttpHeaderValues.X_DEFLATE; import static io.netty.handler.codec.http.HttpHeaderValues.X_GZIP; --import static io.netty.handler.codec.http.HttpHeaderValues.SNAPPY; + import static io.netty.handler.codec.http.HttpHeaderValues.SNAPPY; -import static io.netty.handler.codec.http.HttpHeaderValues.ZSTD; import static io.netty.handler.codec.http2.Http2Error.INTERNAL_ERROR; import static io.netty.handler.codec.http2.Http2Exception.streamError; import static io.netty.util.internal.ObjectUtil.checkNotNull; -@@ -175,18 +167,6 @@ public class DelegatingDecompressorFrameListener extends Http2FrameListenerDecor +@@ -175,18 +169,10 @@ public class DelegatingDecompressorFrameListener extends Http2FrameListenerDecor return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(), ctx.channel().config(), ZlibCodecFactory.newZlibDecoder(wrapper, maxAllocation)); } @@ -406,10 +369,10 @@ - return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(), - ctx.channel().config(), new BrotliDecoder()); - } -- if (SNAPPY.contentEqualsIgnoreCase(contentEncoding)) { -- return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(), -- ctx.channel().config(), new SnappyFrameDecoder()); -- } + if (SNAPPY.contentEqualsIgnoreCase(contentEncoding)) { + return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(), + ctx.channel().config(), new SnappyFrameDecoder()); + } - if (Zstd.isAvailable() && ZSTD.contentEqualsIgnoreCase(contentEncoding)) { - return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(), - ctx.channel().config(), new ZstdDecoder()); @@ -418,7 +381,7 @@ return null; } diff --git a/codec/src/main/java/io/netty/handler/codec/compression/StandardCompressionOptions.java b/codec/src/main/java/io/netty/handler/codec/compression/StandardCompressionOptions.java -index 1397e12308..c1f1c8c17c 100644 +index 1397e12308..2f50f9d909 100644 --- a/codec/src/main/java/io/netty/handler/codec/compression/StandardCompressionOptions.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/StandardCompressionOptions.java @@ -15,11 +15,10 @@ @@ -434,7 +397,7 @@ * {@link GzipOptions} and {@link DeflateOptions} */ public final class StandardCompressionOptions { -@@ -28,73 +27,6 @@ public final class StandardCompressionOptions { +@@ -28,66 +27,6 @@ public final class StandardCompressionOptions { // Prevent outside initialization } @@ -498,17 +461,10 @@ - return new ZstdOptions(compressionLevel, blockSize, maxEncodeSize); - } - -- /** -- * Create a new {@link SnappyOptions} -- */ -- public static SnappyOptions snappy() { -- return new SnappyOptions(); -- } -- /** - * Default implementation of {@link GzipOptions} with - * {@code compressionLevel()} set to 6, {@code windowBits()} set to 15 and {@code memLevel()} set to 8. + * Create a new {@link SnappyOptions} + */ -- -2.52.0 +2.53.0 ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.NSOpxe/_old 2026-03-13 21:22:23.719183300 +0100 +++ /var/tmp/diff_new_pack.NSOpxe/_new 2026-03-13 21:22:23.723183465 +0100 @@ -1,6 +1,6 @@ -mtime: 1765901063 -commit: 365b40e3f59cf6ae257b1e1ea77229f8234e91b30c9b54b862ad496794ea6447 +mtime: 1773408804 +commit: efb3440ee0e76243becacb9f6ac9c1d1f348ab86439f85132c6fd022909d2d33 url: https://src.opensuse.org/java-packages/netty.git -revision: 365b40e3f59cf6ae257b1e1ea77229f8234e91b30c9b54b862ad496794ea6447 +revision: efb3440ee0e76243becacb9f6ac9c1d1f348ab86439f85132c6fd022909d2d33 projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj ++++++ build.specials.obscpio ++++++ ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-03-13 14:33:58.000000000 +0100 @@ -0,0 +1 @@ +.osc ++++++ netty-4.1.130.Final.tar.gz -> netty-4.1.131.Final.tar.gz ++++++ ++++ 6638 lines of diff (skipped) ++++++ no-werror.patch ++++++ --- /var/tmp/diff_new_pack.NSOpxe/_old 2026-03-13 21:22:27.383335134 +0100 +++ /var/tmp/diff_new_pack.NSOpxe/_new 2026-03-13 21:22:27.387335299 +0100 @@ -1,6 +1,6 @@ ---- netty-netty-4.1.72.Final/transport-native-unix-common/pom.xml 2021-12-13 17:10:20.606957494 +0100 -+++ netty-netty-4.1.72.Final/transport-native-unix-common/pom.xml 2021-12-13 17:11:21.279319445 +0100 -@@ -153,7 +153,7 @@ +--- a/transport-native-unix-common/pom.xml ++++ b/transport-native-unix-common/pom.xml +@@ -155,7 +155,7 @@ <env key="LIB_DIR" value="${nativeLibOnlyDir}" /> <env key="OBJ_DIR" value="${nativeObjsOnlyDir}" /> <env key="JNI_PLATFORM" value="${jni.platform}" /> @@ -9,7 +9,7 @@ <env key="LDFLAGS" value="-Wl,--no-as-needed -lrt -Wl,-platform_version,macos,10.9,10.9" /> <env key="LIB_NAME" value="${nativeLibName}" /> <!-- support for __attribute__((weak_import)) by the linker was added in 10.2 so ensure we -@@ -226,7 +226,7 @@ +@@ -228,7 +228,7 @@ <env key="LIB_DIR" value="${nativeLibOnlyDir}" /> <env key="OBJ_DIR" value="${nativeObjsOnlyDir}" /> <env key="JNI_PLATFORM" value="${jni.platform}" /> @@ -18,7 +18,7 @@ <env key="LDFLAGS" value="-arch arm64 -Wl,--no-as-needed -lrt -Wl,-platform_version,macos,11.0,11.0" /> <env key="LIB_NAME" value="${nativeLibName}" /> <env key="MACOSX_DEPLOYMENT_TARGET" value="11.0" /> -@@ -368,7 +368,7 @@ +@@ -370,7 +370,7 @@ <env key="LIB_DIR" value="${nativeLibOnlyDir}" /> <env key="OBJ_DIR" value="${nativeObjsOnlyDir}" /> <env key="JNI_PLATFORM" value="${jni.platform}" /> @@ -27,7 +27,7 @@ <env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" /> <env key="LIB_NAME" value="${nativeLibName}" /> </exec> -@@ -438,7 +438,7 @@ +@@ -440,7 +440,7 @@ <env key="LIB_DIR" value="${nativeLibOnlyDir}" /> <env key="OBJ_DIR" value="${nativeObjsOnlyDir}" /> <env key="JNI_PLATFORM" value="${jni.platform}" /> @@ -36,7 +36,7 @@ <env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" /> <env key="LIB_NAME" value="${nativeLibName}" /> </exec> -@@ -512,7 +512,7 @@ +@@ -510,7 +510,7 @@ <env key="LIB_DIR" value="${nativeLibOnlyDir}" /> <env key="OBJ_DIR" value="${nativeObjsOnlyDir}" /> <env key="JNI_PLATFORM" value="${jni.platform}" /> @@ -45,7 +45,7 @@ <env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" /> <env key="LIB_NAME" value="${nativeLibName}" /> </exec> -@@ -586,7 +586,7 @@ +@@ -584,7 +584,7 @@ <env key="LIB_DIR" value="${nativeLibOnlyDir}" /> <env key="OBJ_DIR" value="${nativeObjsOnlyDir}" /> <env key="JNI_PLATFORM" value="${jni.platform}" /> ++++++ reproducible.patch ++++++ --- /var/tmp/diff_new_pack.NSOpxe/_old 2026-03-13 21:22:27.415336459 +0100 +++ /var/tmp/diff_new_pack.NSOpxe/_new 2026-03-13 21:22:27.431337123 +0100 @@ -1,7 +1,5 @@ -Index: netty-netty-4.1.108.Final/transport-native-unix-common/Makefile -=================================================================== ---- netty-netty-4.1.108.Final.orig/transport-native-unix-common/Makefile -+++ netty-netty-4.1.108.Final/transport-native-unix-common/Makefile +--- a/transport-native-unix-common/Makefile ++++ b/transport-native-unix-common/Makefile @@ -39,7 +39,7 @@ all: $(LIB) $(LIB): $(OBJS)
