From ba0efac0c5bd671e00924c49f51f6988baf09ecb8674176c423a8464b7526697 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 13 Mar 2019 12:41:31 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/httpcomponents-core?expand=0&rev=1 --- .gitattributes | 23 + .gitignore | 1 + ...-generated-expired-test-certificates.patch | Bin 0 -> 21328 bytes httpcomponents-core-4.4.10-src.tar.gz | 3 + httpcomponents-core-build.tar.xz | 3 + httpcomponents-core-java8compat.patch | 546 ++++++++++++++++++ httpcomponents-core.changes | 11 + httpcomponents-core.spec | 157 +++++ 8 files changed, 744 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 0001-Re-generated-expired-test-certificates.patch create mode 100644 httpcomponents-core-4.4.10-src.tar.gz create mode 100644 httpcomponents-core-build.tar.xz create mode 100644 httpcomponents-core-java8compat.patch create mode 100644 httpcomponents-core.changes create mode 100644 httpcomponents-core.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/0001-Re-generated-expired-test-certificates.patch b/0001-Re-generated-expired-test-certificates.patch new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..d8ab2cb0f31e598f4fa42ac232b550c3d4a5478c09486ebcc0928e412a99d79f GIT binary patch literal 21328 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 M&I;jSg`lDRKjLV_MF0Q* literal 0 HcmV?d00001 diff --git a/httpcomponents-core-4.4.10-src.tar.gz b/httpcomponents-core-4.4.10-src.tar.gz new file mode 100644 index 0000000..1406694 --- /dev/null +++ b/httpcomponents-core-4.4.10-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:700b3e15254aadc5c3f5e897f7c33709b292dc0c2079db094bfdb9444f895572 +size 559657 diff --git a/httpcomponents-core-build.tar.xz b/httpcomponents-core-build.tar.xz new file mode 100644 index 0000000..d77a1ca --- /dev/null +++ b/httpcomponents-core-build.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:243894b18c08b95dc2b845ba3d3ab2a2aab2458875c2d39d12bd1c6120a82736 +size 2964 diff --git a/httpcomponents-core-java8compat.patch b/httpcomponents-core-java8compat.patch new file mode 100644 index 0000000..0529be6 --- /dev/null +++ b/httpcomponents-core-java8compat.patch @@ -0,0 +1,546 @@ +--- httpcomponents-core-4.4.10/httpcore/src/main/java/org/apache/http/impl/io/SessionInputBufferImpl.java 2017-06-15 13:33:20.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore/src/main/java/org/apache/http/impl/io/SessionInputBufferImpl.java 2019-03-13 09:49:02.215922903 +0100 +@@ -29,6 +29,7 @@ + + import java.io.IOException; + import java.io.InputStream; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.CharBuffer; + import java.nio.charset.CharsetDecoder; +@@ -366,7 +367,7 @@ + } + final CoderResult result = this.decoder.flush(this.cbuf); + len += handleDecodingResult(result, charbuffer, bbuf); +- this.cbuf.clear(); ++ ((Buffer)(this.cbuf)).clear(); + return len; + } + +@@ -377,7 +378,7 @@ + if (result.isError()) { + result.throwException(); + } +- this.cbuf.flip(); ++ ((Buffer)(this.cbuf)).flip(); + final int len = this.cbuf.remaining(); + while (this.cbuf.hasRemaining()) { + charbuffer.append(this.cbuf.get()); +--- httpcomponents-core-4.4.10/httpcore/src/main/java/org/apache/http/impl/io/SessionOutputBufferImpl.java 2017-05-12 09:14:53.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore/src/main/java/org/apache/http/impl/io/SessionOutputBufferImpl.java 2019-03-13 09:46:50.107248277 +0100 +@@ -29,6 +29,7 @@ + + import java.io.IOException; + import java.io.OutputStream; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.CharBuffer; + import java.nio.charset.CharsetEncoder; +@@ -269,7 +270,7 @@ + } + final CoderResult result = this.encoder.flush(this.bbuf); + handleEncodingResult(result); +- this.bbuf.clear(); ++ ((Buffer)(this.bbuf)).clear(); + } + + private void handleEncodingResult(final CoderResult result) throws IOException { +--- httpcomponents-core-4.4.10/httpcore/src/main/java-deprecated/org/apache/http/impl/io/AbstractSessionInputBuffer.java 2017-05-12 09:14:53.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore/src/main/java-deprecated/org/apache/http/impl/io/AbstractSessionInputBuffer.java 2019-03-13 09:44:05.490407553 +0100 +@@ -29,6 +29,7 @@ + + import java.io.IOException; + import java.io.InputStream; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.CharBuffer; + import java.nio.charset.Charset; +@@ -369,7 +370,7 @@ + } + final CoderResult result = this.decoder.flush(this.cbuf); + len += handleDecodingResult(result, charbuffer, bbuf); +- this.cbuf.clear(); ++ ((Buffer)(this.cbuf)).clear(); + return len; + } + +@@ -380,7 +381,7 @@ + if (result.isError()) { + result.throwException(); + } +- this.cbuf.flip(); ++ ((Buffer)(this.cbuf)).flip(); + final int len = this.cbuf.remaining(); + while (this.cbuf.hasRemaining()) { + charbuffer.append(this.cbuf.get()); +--- httpcomponents-core-4.4.10/httpcore/src/main/java-deprecated/org/apache/http/impl/io/AbstractSessionOutputBuffer.java 2017-05-12 09:14:53.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore/src/main/java-deprecated/org/apache/http/impl/io/AbstractSessionOutputBuffer.java 2019-03-13 09:44:13.614449039 +0100 +@@ -29,6 +29,7 @@ + + import java.io.IOException; + import java.io.OutputStream; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.CharBuffer; + import java.nio.charset.Charset; +@@ -293,14 +294,14 @@ + } + final CoderResult result = this.encoder.flush(this.bbuf); + handleEncodingResult(result); +- this.bbuf.clear(); ++ ((Buffer)(this.bbuf)).clear(); + } + + private void handleEncodingResult(final CoderResult result) throws IOException { + if (result.isError()) { + result.throwException(); + } +- this.bbuf.flip(); ++ ((Buffer)(this.bbuf)).flip(); + while (this.bbuf.hasRemaining()) { + write(this.bbuf.get()); + } +--- httpcomponents-core-4.4.10/httpcore-nio/src/examples/org/apache/http/examples/nio/ElementalEchoServer.java 2017-09-03 13:21:05.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore-nio/src/examples/org/apache/http/examples/nio/ElementalEchoServer.java 2019-03-13 09:50:53.600493731 +0100 +@@ -29,6 +29,7 @@ + import java.io.IOException; + import java.io.InterruptedIOException; + import java.net.InetSocketAddress; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + + import org.apache.http.impl.nio.reactor.DefaultListeningIOReactor; +@@ -83,7 +84,7 @@ + public void outputReady(final IOSession session) { + System.out.println("writeable"); + try { +- this.buffer.flip(); ++ ((Buffer)(this.buffer)).flip(); + final int bytesWritten = session.channel().write(this.buffer); + if (!this.buffer.hasRemaining()) { + session.setEventMask(EventMask.READ); +--- httpcomponents-core-4.4.10/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java 2017-09-03 13:21:05.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java 2019-03-13 09:53:52.393418469 +0100 +@@ -30,6 +30,7 @@ + import java.io.InterruptedIOException; + import java.net.InetSocketAddress; + import java.net.URI; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.security.cert.CertificateException; + import java.security.cert.X509Certificate; +@@ -343,8 +344,8 @@ + } + + public void reset() { +- this.inBuffer.clear(); +- this.outBuffer.clear(); ++ ((Buffer)(this.inBuffer)).clear(); ++ ((Buffer)(this.outBuffer)).clear(); + this.target = null; + this.id = null; + this.responseTrigger = null; +@@ -555,7 +556,7 @@ + this.httpExchange.setOriginIOControl(ioctrl); + // Send data to the origin server + final ByteBuffer buf = this.httpExchange.getInBuffer(); +- buf.flip(); ++ ((Buffer)buf).flip(); + final int n = encoder.write(buf); + buf.compact(); + System.out.println("[proxy->origin] " + this.httpExchange.getId() + " " + n + " bytes written"); +--- httpcomponents-core-4.4.10/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentDecoder.java 2017-05-10 09:30:47.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentDecoder.java 2019-03-13 10:07:11.833553436 +0100 +@@ -28,6 +28,7 @@ + package org.apache.http.impl.nio.codecs; + + import java.io.IOException; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.channels.ReadableByteChannel; + +@@ -120,9 +121,9 @@ + if (dst.remaining() > limit) { + final int oldLimit = dst.limit(); + final int newLimit = oldLimit - (dst.remaining() - limit); +- dst.limit(newLimit); ++ ((Buffer)dst).limit(newLimit); + bytesRead = this.channel.read(dst); +- dst.limit(oldLimit); ++ ((Buffer)dst).limit(oldLimit); + } else { + bytesRead = this.channel.read(dst); + } +--- httpcomponents-core-4.4.10/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentEncoder.java 2017-05-10 09:30:47.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentEncoder.java 2019-03-13 10:08:17.497898152 +0100 +@@ -28,6 +28,7 @@ + package org.apache.http.impl.nio.codecs; + + import java.io.IOException; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.channels.WritableByteChannel; + +@@ -157,9 +158,9 @@ + if (src.remaining() > chunk) { + final int oldLimit = src.limit(); + final int newLimit = oldLimit - (src.remaining() - chunk); +- src.limit(newLimit); ++ ((Buffer)src).limit(newLimit); + bytesWritten = doWriteChunk(src, direct); +- src.limit(oldLimit); ++ ((Buffer)src).limit(oldLimit); + } else { + bytesWritten = doWriteChunk(src, direct); + } +--- httpcomponents-core-4.4.10/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkEncoder.java 2017-05-10 09:30:47.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkEncoder.java 2019-03-13 10:04:27.556703765 +0100 +@@ -28,6 +28,7 @@ + package org.apache.http.impl.nio.codecs; + + import java.io.IOException; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.channels.WritableByteChannel; + +@@ -110,9 +111,9 @@ + this.lineBuffer.append(Integer.toHexString(chunk)); + this.buffer.writeLine(this.lineBuffer); + final int oldlimit = src.limit(); +- src.limit(src.position() + chunk); ++ ((Buffer)src).limit(src.position() + chunk); + this.buffer.write(src); +- src.limit(oldlimit); ++ ((Buffer)src).limit(oldlimit); + } else { + // write all + this.lineBuffer.clear(); +--- httpcomponents-core-4.4.10/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionInputBufferImpl.java 2017-05-10 09:30:47.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionInputBufferImpl.java 2019-03-13 10:36:24.146708469 +0100 +@@ -28,6 +28,7 @@ + package org.apache.http.impl.nio.reactor; + + import java.io.IOException; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.CharBuffer; + import java.nio.channels.ReadableByteChannel; +@@ -221,9 +222,9 @@ + if (this.buffer.remaining() > chunk) { + final int oldLimit = this.buffer.limit(); + final int newLimit = this.buffer.position() + chunk; +- this.buffer.limit(newLimit); ++ ((Buffer)(this.buffer)).limit(newLimit); + dst.put(this.buffer); +- this.buffer.limit(oldLimit); ++ ((Buffer)(this.buffer)).limit(oldLimit); + return len; + } else { + dst.put(this.buffer); +@@ -249,9 +250,9 @@ + if (this.buffer.remaining() > maxLen) { + final int oldLimit = this.buffer.limit(); + final int newLimit = oldLimit - (this.buffer.remaining() - maxLen); +- this.buffer.limit(newLimit); ++ ((Buffer)(this.buffer)).limit(newLimit); + bytesRead = dst.write(this.buffer); +- this.buffer.limit(oldLimit); ++ ((Buffer)(this.buffer)).limit(oldLimit); + } else { + bytesRead = dst.write(this.buffer); + } +@@ -302,7 +303,7 @@ + } + } + final int origLimit = this.buffer.limit(); +- this.buffer.limit(pos); ++ ((Buffer)(this.buffer)).limit(pos); + + final int requiredCapacity = this.buffer.limit() - this.buffer.position(); + // Ensure capacity of len assuming ASCII as the most likely charset +@@ -314,7 +315,7 @@ + final int off = this.buffer.position(); + final int len = this.buffer.remaining(); + linebuffer.append(b, off, len); +- this.buffer.position(off + len); ++ ((Buffer)(this.buffer)).position(off + len); + } else { + while (this.buffer.hasRemaining()) { + linebuffer.append((char) (this.buffer.get() & 0xff)); +@@ -335,12 +336,12 @@ + result.throwException(); + } + if (result.isOverflow()) { +- this.charbuffer.flip(); ++ ((Buffer)(this.buffer)).flip(); + linebuffer.append( + this.charbuffer.array(), + this.charbuffer.position(), + this.charbuffer.remaining()); +- this.charbuffer.clear(); ++ ((Buffer)(this.charbuffer)).clear(); + } + if (result.isUnderflow()) { + break; +@@ -349,7 +350,7 @@ + + // flush the decoder + this.chardecoder.flush(this.charbuffer); +- this.charbuffer.flip(); ++ ((Buffer)(this.charbuffer)).flip(); + // append the decoded content to the line buffer + if (this.charbuffer.hasRemaining()) { + linebuffer.append( +@@ -359,7 +360,7 @@ + } + + } +- this.buffer.limit(origLimit); ++ ((Buffer)(this.buffer)).limit(origLimit); + + // discard LF if found + int l = linebuffer.length(); +--- httpcomponents-core-4.4.10/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionOutputBufferImpl.java 2017-05-10 09:30:47.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionOutputBufferImpl.java 2019-03-13 10:30:57.585039770 +0100 +@@ -28,6 +28,7 @@ + package org.apache.http.impl.nio.reactor; + + import java.io.IOException; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.CharBuffer; + import java.nio.channels.ReadableByteChannel; +@@ -243,7 +244,7 @@ + eol = true; + } + this.charbuffer.put(linebuffer.buffer(), offset, l); +- this.charbuffer.flip(); ++ ((Buffer)(this.charbuffer)).flip(); + + boolean retry = true; + while (retry) { +--- httpcomponents-core-4.4.10/httpcore-nio/src/main/java/org/apache/http/nio/entity/EntityAsyncContentProducer.java 2017-05-10 09:30:47.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore-nio/src/main/java/org/apache/http/nio/entity/EntityAsyncContentProducer.java 2019-03-13 10:13:33.467573632 +0100 +@@ -29,6 +29,7 @@ + + import java.io.IOException; + import java.io.InputStream; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.channels.Channels; + import java.nio.channels.ReadableByteChannel; +@@ -65,7 +66,7 @@ + this.channel = Channels.newChannel(this.entity.getContent()); + } + final int i = this.channel.read(this.buffer); +- this.buffer.flip(); ++ ((Buffer)(this.buffer)).flip(); + encoder.write(this.buffer); + final boolean buffering = this.buffer.hasRemaining(); + this.buffer.compact(); +--- httpcomponents-core-4.4.10/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java 2017-05-10 09:30:47.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java 2019-03-13 10:17:13.516740495 +0100 +@@ -31,6 +31,7 @@ + import java.io.IOException; + import java.io.InputStream; + import java.io.OutputStream; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + + import org.apache.http.entity.AbstractHttpEntity; +@@ -116,7 +117,7 @@ + */ + @Override + public void close() { +- this.buf.rewind(); ++ ((Buffer)(this.buf)).rewind(); + } + + /** +--- httpcomponents-core-4.4.10/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java 2017-05-10 09:30:47.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java 2019-03-13 10:18:25.637122928 +0100 +@@ -32,6 +32,7 @@ + import java.io.InputStream; + import java.io.OutputStream; + import java.io.UnsupportedEncodingException; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.charset.Charset; + +@@ -155,7 +156,7 @@ + */ + @Override + public void close() { +- this.buf.rewind(); ++ ((Buffer)(this.buf)).rewind(); + } + + /** +--- httpcomponents-core-4.4.10/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullRequestConsumer.java 2017-05-10 09:30:47.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullRequestConsumer.java 2019-03-13 10:11:01.842769659 +0100 +@@ -28,6 +28,7 @@ + package org.apache.http.nio.protocol; + + import java.io.IOException; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + + import org.apache.http.HttpRequest; +@@ -54,7 +55,7 @@ + final ContentDecoder decoder, final IOControl ioctrl) throws IOException { + int lastRead; + do { +- this.buffer.clear(); ++ ((Buffer)(this.buffer)).clear(); + lastRead = decoder.read(this.buffer); + } while (lastRead > 0); + } +--- httpcomponents-core-4.4.10/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java 2018-06-26 14:35:43.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java 2019-03-13 10:23:52.638856850 +0100 +@@ -30,6 +30,7 @@ + import java.io.IOException; + import java.net.Socket; + import java.net.SocketAddress; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.channels.ByteChannel; + import java.nio.channels.CancelledKeyException; +@@ -312,7 +313,7 @@ + final ByteBuffer inPlainBuf = this.inPlain.acquire(); + + // Perform operations +- inEncryptedBuf.flip(); ++ ((Buffer)inEncryptedBuf).flip(); + result = doUnwrap(inEncryptedBuf, inPlainBuf); + inEncryptedBuf.compact(); + +@@ -421,7 +422,7 @@ + final ByteBuffer outEncryptedBuf = this.outEncrypted.acquire(); + + // Perform operation +- outEncryptedBuf.flip(); ++ ((Buffer)outEncryptedBuf).flip(); + final int bytesWritten = this.session.channel().write(outEncryptedBuf); + outEncryptedBuf.compact(); + +@@ -458,7 +459,7 @@ + final ByteBuffer inPlainBuf = this.inPlain.acquire(); + + // Perform operations +- inEncryptedBuf.flip(); ++ ((Buffer)inEncryptedBuf).flip(); + final SSLEngineResult result = doUnwrap(inEncryptedBuf, inPlainBuf); + inEncryptedBuf.compact(); + +@@ -579,7 +580,7 @@ + final ByteBuffer inPlainBuf = this.inPlain.acquire(); + + // Perform opertaions +- inPlainBuf.flip(); ++ ((Buffer)inPlainBuf).flip(); + final int n = Math.min(inPlainBuf.remaining(), dst.remaining()); + for (int i = 0; i < n; i++) { + dst.put(inPlainBuf.get()); +--- httpcomponents-core-4.4.10/httpcore-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java 2018-02-16 15:33:59.000000000 +0100 ++++ httpcomponents-core-4.4.10.new/httpcore-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java 2019-03-13 10:28:16.808218211 +0100 +@@ -27,6 +27,7 @@ + + package org.apache.http.nio.util; + ++import java.nio.Buffer; + import java.nio.BufferOverflowException; + import java.nio.ByteBuffer; + +@@ -85,7 +86,7 @@ + */ + protected void setOutputMode() { + if (this.mode != OUTPUT_MODE) { +- this.buffer.flip(); ++ ((Buffer)(this.buffer)).flip(); + this.mode = OUTPUT_MODE; + } + } +@@ -98,7 +99,7 @@ + if (this.buffer.hasRemaining()) { + this.buffer.compact(); + } else { +- this.buffer.clear(); ++ ((Buffer)(this.buffer)).clear(); + } + this.mode = INPUT_MODE; + } +@@ -107,7 +108,7 @@ + private void expandCapacity(final int capacity) { + final ByteBuffer oldbuffer = this.buffer; + this.buffer = allocator.allocate(capacity); +- oldbuffer.flip(); ++ ((Buffer)oldbuffer).flip(); + this.buffer.put(oldbuffer); + } + +@@ -196,7 +197,7 @@ + * Clears buffer. + */ + protected void clear() { +- this.buffer.clear(); ++ ((Buffer)(this.buffer)).clear(); + this.mode = INPUT_MODE; + } + +--- httpcomponents-core-4.4.10/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/NHttpEntityWrapper.java 2017-05-10 09:30:47.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/NHttpEntityWrapper.java 2019-03-13 10:01:50.723892601 +0100 +@@ -30,6 +30,7 @@ + import java.io.IOException; + import java.io.InputStream; + import java.io.OutputStream; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.channels.Channels; + import java.nio.channels.ReadableByteChannel; +@@ -86,7 +87,7 @@ + final ContentEncoder encoder, + final IOControl ioctrl) throws IOException { + final int i = this.channel.read(this.buffer); +- this.buffer.flip(); ++ ((Buffer)(this.buffer)).flip(); + encoder.write(this.buffer); + final boolean buffering = this.buffer.hasRemaining(); + this.buffer.compact(); +--- httpcomponents-core-4.4.10/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/SkipContentListener.java 2017-05-10 09:30:47.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/SkipContentListener.java 2019-03-13 10:02:44.656171552 +0100 +@@ -28,6 +28,7 @@ + package org.apache.http.nio.entity; + + import java.io.IOException; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + + import org.apache.http.nio.ContentDecoder; +@@ -59,7 +60,7 @@ + final IOControl ioctrl) throws IOException { + int lastRead; + do { +- buffer.clear(); ++ ((Buffer)buffer).clear(); + lastRead = decoder.read(buffer); + } while (lastRead > 0); + } +--- httpcomponents-core-4.4.10/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NullNHttpEntity.java 2017-05-10 09:30:47.000000000 +0200 ++++ httpcomponents-core-4.4.10.new/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NullNHttpEntity.java 2019-03-13 10:00:53.319595690 +0100 +@@ -30,6 +30,7 @@ + import java.io.IOException; + import java.io.InputStream; + import java.io.OutputStream; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + + import org.apache.http.HttpEntity; +@@ -72,7 +73,7 @@ + final IOControl ioctrl) throws IOException { + int lastRead; + do { +- buffer.clear(); ++ ((Buffer)buffer).clear(); + lastRead = decoder.read(buffer); + } while (lastRead > 0); + } diff --git a/httpcomponents-core.changes b/httpcomponents-core.changes new file mode 100644 index 0000000..c9c7ffb --- /dev/null +++ b/httpcomponents-core.changes @@ -0,0 +1,11 @@ +------------------------------------------------------------------- +Wed Mar 13 12:38:27 UTC 2019 - Fridrich Strba + +- Initial packaging of httpcomponent-core 4.4.10 +- Generate and customize the ant build files +- Added patches: + * 0001-Re-generated-expired-test-certificates.patch + + upstream fix to update expired certificates in tests + * httpcomponents-core-java8compat.patch + + fix code so that it produces binaries compatible with + Java 8 diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec new file mode 100644 index 0000000..db04c48 --- /dev/null +++ b/httpcomponents-core.spec @@ -0,0 +1,157 @@ +# +# spec file for package httpcomponents-core +# +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%bcond_with tests +Name: httpcomponents-core +Version: 4.4.10 +Release: 0 +Summary: Set of low level Java HTTP transport components for HTTP services +License: Apache-2.0 +Group: Development/Libraries/Java +URL: http://hc.apache.org/ +Source0: http://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-%{version}-src.tar.gz +Source1: %{name}-build.tar.xz +# Expired test certificates. Backported from upstream commit 8caeb927a. +Patch0: 0001-Re-generated-expired-test-certificates.patch +Patch1: %{name}-java8compat.patch +BuildRequires: ant +BuildRequires: fdupes +BuildRequires: javapackages-local +BuildArch: noarch +%if %{with tests} +BuildRequires: ant-junit +BuildRequires: apache-commons-lang3 +BuildRequires: apache-commons-logging +BuildRequires: cglib +BuildRequires: mockito +BuildRequires: objectweb-asm +BuildRequires: objenesis +BuildConflicts: java-devel >= 9 +%endif + +%description +HttpCore is a set of low level HTTP transport components that can be +used to build custom client and server side HTTP services with a +minimal footprint. HttpCore supports two I/O models: blocking I/O +model based on the classic Java I/O and non-blocking, event driven I/O +model based on Java NIO. + +The blocking I/O model may be more appropriate for data intensive, low +latency scenarios, whereas the non-blocking model may be more +appropriate for high latency scenarios where raw data throughput is +less important than the ability to handle thousands of simultaneous +HTTP connections in a resource efficient manner. + +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +%{summary}. + +%prep +%setup -q -a1 + +%patch0 -p1 +%patch1 -p1 + +# Random test failures on ARM -- 100 ms sleep is not eneough on this +# very performant arch, lets make it 2 s +sed -i '/Thread.sleep/s/100/2000/' httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java + +%pom_remove_plugin :maven-checkstyle-plugin +%pom_remove_plugin :apache-rat-plugin +%pom_remove_plugin :maven-source-plugin +%pom_remove_plugin :maven-javadoc-plugin + +# we don't need these artifacts right now +%pom_disable_module httpcore-osgi +%pom_disable_module httpcore-ab + +# OSGify modules +for module in httpcore httpcore-nio; do + %pom_xpath_remove "pom:project/pom:packaging" $module + %pom_xpath_inject "pom:project" "bundle" $module + %pom_remove_plugin :maven-jar-plugin $module + %pom_xpath_inject "pom:build/pom:plugins" " + + org.apache.felix + maven-bundle-plugin + true + + + * + + org.apache.httpcomponents.$module + <_nouses>true + + + " $module +done + +for module in httpcore httpcore-nio; do + %pom_xpath_inject "pom:project" " + org.apache.httpcomponents + %{version}" $module + %pom_remove_parent $module +done + +# install JARs to httpcomponents/ for compatibility reasons +# several other packages expect to find the JARs there +%{mvn_file} ":{*}" httpcomponents/@1 + +%build +mkdir -p lib +%if %{with tests} +build-jar-repository -s lib cglib/cglib commons-lang3 commons-logging mockito/mockito-core objectweb-asm/asm objenesis/objenesis +%endif +%ant \ +%if %{without tests} + -Dtest.skip=true \ +%endif + package javadoc + +%install +# jar +install -dm 0755 %{buildroot}%{_javadir}/httpcomponents +for module in httpcore httpcore-nio; do + install -pm 0644 ${module}/target/${module}-%{version}.jar %{buildroot}%{_javadir}/httpcomponents/${module}.jar +done +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/httpcomponents +for module in httpcore httpcore-nio; do + install -pm 0644 ${module}/pom.xml %{buildroot}%{_mavenpomdir}/httpcomponents/${module}.pom + %add_maven_depmap httpcomponents/${module}.pom httpcomponents/${module}.jar +done +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +for module in httpcore httpcore-nio; do + install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/${module} + cp -pr ${module}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/${module}/ +done +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%license LICENSE.txt +%doc NOTICE.txt README.txt RELEASE_NOTES.txt + +%files javadoc +%license LICENSE.txt +%doc NOTICE.txt +%{_javadocdir}/%{name} + +%changelog