[netty-tcnative] 02/06: Merge tag 'upstream/1.1.33.Fork14'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository netty-tcnative.

commit d645e6564557ed15dd5555bdec8fb1582ad19165
Merge: 09873cf b8a9c13
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Feb 25 00:19:15 2016 +0100

    Merge tag 'upstream/1.1.33.Fork14'
    
    Upstream version 1.1.33.Fork14

 boringssl-static/pom.xml                           | 194 ++++++
 libressl-static/pom.xml                            | 221 +++++++
 openssl-dynamic/pom.xml                            | 144 +++++
 {src => openssl-dynamic/src}/main/c/address.c      |   0
 {src => openssl-dynamic/src}/main/c/bb.c           |   0
 {src => openssl-dynamic/src}/main/c/dir.c          |   0
 {src => openssl-dynamic/src}/main/c/error.c        |   0
 {src => openssl-dynamic/src}/main/c/file.c         |   0
 {src => openssl-dynamic/src}/main/c/info.c         |   0
 {src => openssl-dynamic/src}/main/c/jnilib.c       |   0
 {src => openssl-dynamic/src}/main/c/lock.c         |   0
 {src => openssl-dynamic/src}/main/c/misc.c         |   0
 {src => openssl-dynamic/src}/main/c/mmap.c         |   0
 {src => openssl-dynamic/src}/main/c/multicast.c    |   0
 {src => openssl-dynamic/src}/main/c/network.c      |   0
 {src => openssl-dynamic/src}/main/c/os.c           |   0
 .../src}/main/c/os_unix_system.c                   |   0
 .../src}/main/c/os_unix_uxpipe.c                   |   0
 .../src}/main/c/os_win32_apache.ico                | Bin
 .../src}/main/c/os_win32_libtcnative.rc            |   0
 .../src}/main/c/os_win32_logmessages.bin           | Bin
 .../src}/main/c/os_win32_logmessages.mc            |   0
 .../src}/main/c/os_win32_ntpipe.c                  |   0
 .../src}/main/c/os_win32_registry.c                |   0
 .../src}/main/c/os_win32_system.c                  |   0
 {src => openssl-dynamic/src}/main/c/poll.c         |   0
 {src => openssl-dynamic/src}/main/c/pool.c         |   0
 {src => openssl-dynamic/src}/main/c/proc.c         |   0
 {src => openssl-dynamic/src}/main/c/shm.c          |   0
 {src => openssl-dynamic/src}/main/c/ssl.c          |   0
 {src => openssl-dynamic/src}/main/c/ssl_private.h  |   4 +-
 {src => openssl-dynamic/src}/main/c/sslcontext.c   | 110 +++-
 {src => openssl-dynamic/src}/main/c/sslinfo.c      |   0
 {src => openssl-dynamic/src}/main/c/sslnetwork.c   |   0
 {src => openssl-dynamic/src}/main/c/sslutils.c     |   0
 {src => openssl-dynamic/src}/main/c/stdlib.c       |   0
 {src => openssl-dynamic/src}/main/c/tcn.h          |   0
 {src => openssl-dynamic/src}/main/c/tcn_api.h      |   0
 {src => openssl-dynamic/src}/main/c/tcn_version.h  |   0
 {src => openssl-dynamic/src}/main/c/thread.c       |   0
 {src => openssl-dynamic/src}/main/c/user.c         |   0
 .../src}/main/java/org/apache/tomcat/Apr.java      |   0
 .../main/java/org/apache/tomcat/jni/Address.java   |   0
 .../java/org/apache/tomcat/jni/BIOCallback.java    |   0
 .../main/java/org/apache/tomcat/jni/Buffer.java    |   0
 .../org/apache/tomcat/jni/CertificateVerifier.java | 100 ++++
 .../main/java/org/apache/tomcat/jni/Directory.java |   0
 .../main/java/org/apache/tomcat/jni/Error.java     |   0
 .../src}/main/java/org/apache/tomcat/jni/File.java |   0
 .../main/java/org/apache/tomcat/jni/FileInfo.java  |   0
 .../main/java/org/apache/tomcat/jni/Global.java    |   0
 .../main/java/org/apache/tomcat/jni/Library.java   |   0
 .../apache/tomcat/jni/LibraryNotFoundError.java    |   0
 .../main/java/org/apache/tomcat/jni/Local.java     |   0
 .../src}/main/java/org/apache/tomcat/jni/Lock.java |   0
 .../src}/main/java/org/apache/tomcat/jni/Mmap.java |   0
 .../main/java/org/apache/tomcat/jni/Multicast.java |   0
 .../src}/main/java/org/apache/tomcat/jni/OS.java   |   0
 .../org/apache/tomcat/jni/PasswordCallback.java    |   0
 .../src}/main/java/org/apache/tomcat/jni/Poll.java |   0
 .../src}/main/java/org/apache/tomcat/jni/Pool.java |   0
 .../java/org/apache/tomcat/jni/PoolCallback.java   |   0
 .../src}/main/java/org/apache/tomcat/jni/Proc.java |   0
 .../org/apache/tomcat/jni/ProcErrorCallback.java   |   0
 .../main/java/org/apache/tomcat/jni/Procattr.java  |   0
 .../main/java/org/apache/tomcat/jni/Registry.java  |   0
 .../src}/main/java/org/apache/tomcat/jni/SSL.java  |   0
 .../java/org/apache/tomcat/jni/SSLContext.java     |   0
 .../main/java/org/apache/tomcat/jni/SSLExt.java    |   0
 .../main/java/org/apache/tomcat/jni/SSLSocket.java |   0
 .../org/apache/tomcat/jni/SessionTicketKey.java    |   0
 .../src}/main/java/org/apache/tomcat/jni/Shm.java  |   0
 .../main/java/org/apache/tomcat/jni/Sockaddr.java  |   0
 .../main/java/org/apache/tomcat/jni/Socket.java    |   0
 .../main/java/org/apache/tomcat/jni/Status.java    |   0
 .../main/java/org/apache/tomcat/jni/Stdlib.java    |   0
 .../main/java/org/apache/tomcat/jni/Thread.java    |   0
 .../src}/main/java/org/apache/tomcat/jni/Time.java |   0
 .../src}/main/java/org/apache/tomcat/jni/User.java |   0
 .../org/apache/tomcat/jni/socket/AprSocket.java    |   0
 .../apache/tomcat/jni/socket/AprSocketContext.java |   0
 .../org/apache/tomcat/jni/socket/HostInfo.java     |   0
 .../src}/main/native-package/configure.ac          |   0
 .../src}/main/native-package/m4/apr_common.m4      |   0
 .../src}/main/native-package/m4/custom.m4          |   0
 .../src}/main/native-package/m4/find_apr.m4        |   0
 .../src}/main/native-package/m4/tcnative.m4        |   0
 .../src}/main/native-package/vs2010.vcxproj        |  88 +--
 .../resources/org/apache/tomcat/apr.properties     |   0
 openssl-static/pom.xml                             | 228 +++++++
 pom.xml                                            | 666 +++++++--------------
 .../org/apache/tomcat/jni/CertificateVerifier.java |  33 -
 ...s2010.vcxproj => vs2010.vcxproj.static.template | 102 ++--
 93 files changed, 1272 insertions(+), 618 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty-tcnative.git