diff --git a/.gitignore b/.gitignore index f2d1b19b31e95..a9cd67d9fd407 100644 --- a/.gitignore +++ b/.gitignore @@ -285,7 +285,6 @@ vs-chromium-project.txt /third_party/angle /third_party/angle_dx11 /third_party/apache-mime4j -/third_party/apache-portable-runtime/src /third_party/apache-win32/bin/*.exe /third_party/apache-win32/bin/*.dll /third_party/apache-win32/bin/iconv/*.so @@ -367,8 +366,6 @@ vs-chromium-project.txt /third_party/mocha /third_party/mockito/src /third_party/nacl_sdk_binaries/ -/third_party/netty-tcnative/src -/third_party/netty4/src /third_party/nss /third_party/omaha/src/omaha /third_party/openmax_dl/ diff --git a/DEPS b/DEPS index 6d4646d91bf7d..188d3e71f89e9 100644 --- a/DEPS +++ b/DEPS @@ -434,9 +434,6 @@ deps_os = { 'src/third_party/apache-mime4j': Var('chromium_git') + '/chromium/deps/apache-mime4j.git' + '@' + '28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a', - 'src/third_party/apache-portable-runtime/src': - Var('chromium_git') + '/external/apache-portable-runtime.git' + '@' + 'c76a8c4277e09a82eaa229e35246edea1ee0a6a1', - 'src/third_party/appurify-python/src': Var('chromium_git') + '/external/github.com/appurify/appurify-python.git' + '@' + 'ee7abd5c5ae3106f72b2a0b9d2cb55094688e867', @@ -452,7 +449,7 @@ deps_os = { 'src/third_party/freetype-android/src': Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + 'a512b0fe7a8d9db0e5aa9c0a4db1e92cb861722d', - 'src/third_party/elfutils/src': + 'src/third_party/elfutils/src': Var('chromium_git') + '/external/elfutils.git' + '@' + '249673729a7e5dbd5de4f3760bdcaa3d23d154d7', 'src/third_party/httpcomponents-client': @@ -473,12 +470,6 @@ deps_os = { 'src/third_party/mockito/src': Var('chromium_git') + '/external/mockito/mockito.git' + '@' + '4d987dcd923b81525c42b1333e6c4e07440776c3', - 'src/third_party/netty-tcnative/src': - Var('chromium_git') + '/external/netty-tcnative.git' + '@' + '12d01332921695e974175870175eb14a889313a1', - - 'src/third_party/netty4/src': - Var('chromium_git') + '/external/netty4.git' + '@' + 'e0f26303b4ce635365be19414d0ac81f2ef6ba3c', - 'src/third_party/robolectric/lib': Var('chromium_git') + '/chromium/third_party/robolectric.git' + '@' + '6b63c99a8b6967acdb42cbed0adb067c80efc810', diff --git a/components/cronet.gypi b/components/cronet.gypi index a05dee63246e1..b45aeda7c4de0 100644 --- a/components/cronet.gypi +++ b/components/cronet.gypi @@ -381,8 +381,6 @@ 'dependencies': [ 'cronet_java', '../net/net.gyp:net_java_test_support', - '../third_party/netty-tcnative/netty-tcnative.gyp:netty-tcnative', - '../third_party/netty4/netty.gyp:netty_all', ], 'variables': { 'apk_name': 'CronetTest', @@ -391,9 +389,6 @@ 'asset_location': 'cronet/android/test/assets', 'native_lib_target': 'libcronet_tests', 'run_findbugs': 1, - 'additional_bundled_libs': [ - '<(PRODUCT_DIR)/lib/libnetty-tcnative.so', - ], }, 'includes': [ '../build/java_apk.gypi' ], }, diff --git a/third_party/apache-portable-runtime/LICENSE b/third_party/apache-portable-runtime/LICENSE deleted file mode 100644 index 5ffb1dcde1586..0000000000000 --- a/third_party/apache-portable-runtime/LICENSE +++ /dev/null @@ -1,294 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - -APACHE PORTABLE RUNTIME SUBCOMPONENTS: - -The Apache Portable Runtime includes a number of subcomponents with -separate copyright notices and license terms. Your use of the source -code for these subcomponents is subject to the terms and conditions -of the following licenses. - -From strings/apr_fnmatch.c, include/apr_fnmatch.h, misc/unix/getopt.c, -file_io/unix/mktemp.c, strings/apr_strings.c: - -/* - * Copyright (c) 1987, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - -From network_io/unix/inet_ntop.c, network_io/unix/inet_pton.c: - -/* Copyright (c) 1996 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS - * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE - * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - -From dso/aix/dso.c: - - * Based on libdl (dlfcn.c/dlfcn.h) which is - * Copyright (c) 1992,1993,1995,1996,1997,1988 - * Jens-Uwe Mager, Helios Software GmbH, Hannover, Germany. - * - * Not derived from licensed software. - * - * Permission is granted to freely use, copy, modify, and redistribute - * this software, provided that the author is not construed to be liable - * for any results of using the software, alterations are clearly marked - * as such, and this notice is not modified. - -From strings/apr_strnatcmp.c, include/apr_strings.h: - - strnatcmp.c -- Perform 'natural order' comparisons of strings in C. - Copyright (C) 2000 by Martin Pool - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - diff --git a/third_party/apache-portable-runtime/OWNERS b/third_party/apache-portable-runtime/OWNERS deleted file mode 100644 index 96b9292c3694c..0000000000000 --- a/third_party/apache-portable-runtime/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -kapishnikov@chromium.org -mef@chromium.org diff --git a/third_party/apache-portable-runtime/README.chromium b/third_party/apache-portable-runtime/README.chromium deleted file mode 100644 index bd1de0353ee88..0000000000000 --- a/third_party/apache-portable-runtime/README.chromium +++ /dev/null @@ -1,24 +0,0 @@ -Name: Apache Portable Runtime -Short Name: apr -URL: https://apr.apache.org/download.cgi -MD5: 98492e965963f852ab29f9e61b2ad700 *apr-1.5.2.tar.gz -Version: 1.5.2 -Date: April 29, 2015 -License: Apache 2.0 -License File: NOT_SHIPPED -Security Critical: no -The library is not security critical because it is used for tests only. -Do not link it into production code. - -Description: - The Apache Portable Runtime Library provides a predictable and - consistent interface to underlying platform-specific - implementations, with an API to which software developers may code - and be assured of predictable if not identical behavior regardless - of the platform on which their software is built, relieving them of - the need to code special-case conditions to work around or take - advantage of platform-specific deficiencies or features. - -Local Modifications: -1. Ran ./configure -2. See the other changes in diff.patch diff --git a/third_party/apache-portable-runtime/apr.gyp b/third_party/apache-portable-runtime/apr.gyp deleted file mode 100644 index ac5911185254d..0000000000000 --- a/third_party/apache-portable-runtime/apr.gyp +++ /dev/null @@ -1,113 +0,0 @@ -# Builds 'Apache Portable Runtime'. See http://apr.apache.org -{ - 'targets': [ - { - 'target_name': 'apr', - 'type': '<(component)', - 'sources': [ - 'src/atomic/unix/builtins.c', - 'src/atomic/unix/ia32.c', - 'src/atomic/unix/mutex.c', - 'src/atomic/unix/ppc.c', - 'src/atomic/unix/s390.c', - 'src/atomic/unix/solaris.c', - 'src/dso/unix/dso.c', - 'src/file_io/unix/buffer.c', - 'src/file_io/unix/copy.c', - 'src/file_io/unix/dir.c', - 'src/file_io/unix/fileacc.c', - 'src/file_io/unix/filedup.c', - 'src/file_io/unix/filepath.c', - 'src/file_io/unix/filepath_util.c', - 'src/file_io/unix/filestat.c', - 'src/file_io/unix/flock.c', - 'src/file_io/unix/fullrw.c', - 'src/file_io/unix/mktemp.c', - 'src/file_io/unix/open.c', - 'src/file_io/unix/pipe.c', - 'src/file_io/unix/readwrite.c', - 'src/file_io/unix/seek.c', - 'src/file_io/unix/tempdir.c', - 'src/include/apr_skiplist.h', - 'src/include/arch/apr_private_common.h', - 'src/include/arch/unix/apr_arch_atomic.h', - 'src/include/arch/unix/apr_arch_dso.h', - 'src/include/arch/unix/apr_arch_file_io.h', - 'src/include/arch/unix/apr_arch_global_mutex.h', - 'src/include/arch/unix/apr_arch_internal_time.h', - 'src/include/arch/unix/apr_arch_misc.h', - 'src/include/arch/unix/apr_arch_networkio.h', - 'src/include/arch/unix/apr_arch_poll_private.h', - 'src/include/arch/unix/apr_arch_proc_mutex.h', - 'src/include/arch/unix/apr_arch_shm.h', - 'src/include/arch/unix/apr_arch_thread_cond.h', - 'src/include/arch/unix/apr_arch_thread_mutex.h', - 'src/include/arch/unix/apr_arch_thread_rwlock.h', - 'src/include/arch/unix/apr_arch_threadproc.h', - 'src/include/arch/unix/apr_private.h', - 'src/locks/unix/global_mutex.c', - 'src/locks/unix/proc_mutex.c', - 'src/locks/unix/thread_cond.c', - 'src/locks/unix/thread_mutex.c', - 'src/locks/unix/thread_rwlock.c', - 'src/memory/unix/apr_pools.c', - 'src/misc/unix/charset.c', - 'src/misc/unix/env.c', - 'src/misc/unix/errorcodes.c', - 'src/misc/unix/getopt.c', - 'src/misc/unix/otherchild.c', - 'src/misc/unix/rand.c', - 'src/misc/unix/start.c', - 'src/misc/unix/version.c', - 'src/mmap/unix/common.c', - 'src/mmap/unix/mmap.c', - 'src/network_io/unix/inet_ntop.c', - 'src/network_io/unix/inet_pton.c', - 'src/network_io/unix/multicast.c', - 'src/network_io/unix/sendrecv.c', - 'src/network_io/unix/sockaddr.c', - 'src/network_io/unix/sockets.c', - 'src/network_io/unix/sockopt.c', - 'src/passwd/apr_getpass.c', - 'src/poll/unix/epoll.c', - 'src/poll/unix/kqueue.c', - 'src/poll/unix/poll.c', - 'src/poll/unix/pollcb.c', - 'src/poll/unix/pollset.c', - 'src/poll/unix/port.c', - 'src/poll/unix/select.c', - 'src/random/unix/apr_random.c', - 'src/random/unix/sha2.c', - 'src/random/unix/sha2.h', - 'src/random/unix/sha2_glue.c', - 'src/shmem/unix/shm.c', - 'src/strings/apr_cpystrn.c', - 'src/strings/apr_fnmatch.c', - 'src/strings/apr_snprintf.c', - 'src/strings/apr_strings.c', - 'src/strings/apr_strnatcmp.c', - 'src/strings/apr_strtok.c', - 'src/support/unix/waitio.c', - 'src/tables/apr_hash.c', - 'src/tables/apr_skiplist.c', - 'src/tables/apr_tables.c', - 'src/threadproc/unix/proc.c', - 'src/threadproc/unix/procsup.c', - 'src/threadproc/unix/signals.c', - 'src/threadproc/unix/thread.c', - 'src/threadproc/unix/threadpriv.c', - 'src/time/unix/time.c', - 'src/time/unix/timestr.c', - 'src/user/unix/groupinfo.c', - 'src/user/unix/userinfo.c', - ], - 'include_dirs': [ - 'src/include', - 'src/include/arch/unix', - ], - 'cflags': [ - '-w', - ], - }, - ], -} \ No newline at end of file diff --git a/third_party/apache-portable-runtime/diff.patch b/third_party/apache-portable-runtime/diff.patch deleted file mode 100644 index f4cf44cf48812..0000000000000 --- a/third_party/apache-portable-runtime/diff.patch +++ /dev/null @@ -1,234 +0,0 @@ -diff -ruN ./original/include/apr.h ./changed/include/apr.h ---- ./original/include/apr.h 2016-01-04 13:12:47.009354091 -0500 -+++ ./changed/include/apr.h 2016-01-04 10:18:31.701765503 -0500 -@@ -80,7 +80,7 @@ - #define APR_HAVE_LIMITS_H 1 - #define APR_HAVE_NETDB_H 1 - #define APR_HAVE_NETINET_IN_H 1 --#define APR_HAVE_NETINET_SCTP_H 1 -+#define APR_HAVE_NETINET_SCTP_H 0 - #define APR_HAVE_NETINET_SCTP_UIO_H 0 - #define APR_HAVE_NETINET_TCP_H 1 - #define APR_HAVE_PROCESS_H 0 -@@ -220,19 +220,19 @@ - #define APR_USE_SHMEM_MMAP_SHM 0 - #define APR_USE_SHMEM_MMAP_ZERO 0 - #define APR_USE_SHMEM_SHMGET_ANON 0 --#define APR_USE_SHMEM_SHMGET 1 -+#define APR_USE_SHMEM_SHMGET 0 - #define APR_USE_SHMEM_MMAP_ANON 1 - #define APR_USE_SHMEM_BEOS 0 - - #define APR_USE_FLOCK_SERIALIZE 0 --#define APR_USE_SYSVSEM_SERIALIZE 1 -+#define APR_USE_SYSVSEM_SERIALIZE 0 - #define APR_USE_POSIXSEM_SERIALIZE 0 - #define APR_USE_FCNTL_SERIALIZE 0 - #define APR_USE_PROC_PTHREAD_SERIALIZE 0 - #define APR_USE_PTHREAD_SERIALIZE 1 - - #define APR_HAS_FLOCK_SERIALIZE 1 --#define APR_HAS_SYSVSEM_SERIALIZE 1 -+#define APR_HAS_SYSVSEM_SERIALIZE 0 - #define APR_HAS_POSIXSEM_SERIALIZE 1 - #define APR_HAS_FCNTL_SERIALIZE 1 - #define APR_HAS_PROC_PTHREAD_SERIALIZE 1 -@@ -260,7 +260,7 @@ - #define APR_HAVE_MEMCHR 1 - #define APR_HAVE_STRUCT_RLIMIT 1 - #define APR_HAVE_UNION_SEMUN 0 --#define APR_HAVE_SCTP 1 -+#define APR_HAVE_SCTP 0 - #define APR_HAVE_IOVEC 1 - - /* APR Feature Macros */ -@@ -278,7 +278,7 @@ - #define APR_HAS_USER 1 - #define APR_HAS_LARGE_FILES 0 - #define APR_HAS_XTHREAD_FILES 0 --#define APR_HAS_OS_UUID 1 -+#define APR_HAS_OS_UUID 0 - - #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0 - -@@ -349,8 +349,8 @@ - #define UINT64_C(v) (v ## ULL) - #endif - #else -- typedef long apr_int64_t; -- typedef unsigned long apr_uint64_t; -+ typedef long long apr_int64_t; -+ typedef unsigned long long apr_uint64_t; - #endif - - typedef size_t apr_size_t; -diff -ruN ./original/include/arch/netware/DEPS ./changed/include/arch/netware/DEPS ---- ./original/include/arch/netware/DEPS 1969-12-31 19:00:00.000000000 -0500 -+++ ./changed/include/arch/netware/DEPS 2016-01-04 10:18:31.705765573 -0500 -@@ -0,0 +1,3 @@ -+include_rules = [ -+ '+../original/apr_private_common.h', -+] -diff -ruN ./original/include/arch/unix/apr_private.h ./changed/include/arch/unix/apr_private.h ---- ./original/include/arch/unix/apr_private.h 2016-01-04 13:12:47.193357456 -0500 -+++ ./changed/include/arch/unix/apr_private.h 2016-01-04 10:18:31.705765573 -0500 -@@ -31,7 +31,7 @@ - #define DEV_RANDOM "/dev/urandom" - - /* Define if struct dirent has an inode member */ --#define DIRENT_INODE d_fileno -+/* #define DIRENT_INODE d_fileno */ - - /* Define if struct dirent has a d_type member */ - #define DIRENT_TYPE d_type -@@ -73,7 +73,7 @@ - /* #undef GETSERVBYNAME_IS_THREAD_SAFE */ - - /* Define if getservbyname_r has the glibc style */ --#define GETSERVBYNAME_R_GLIBC2 1 -+/* #define GETSERVBYNAME_R_GLIBC2 1 */ - - /* Define if getservbyname_r has the OSF/1 style */ - /* #undef GETSERVBYNAME_R_OSF1 */ -@@ -82,7 +82,7 @@ - /* #undef GETSERVBYNAME_R_SOLARIS */ - - /* Define if accept4 function is supported */ --#define HAVE_ACCEPT4 1 -+/* #define HAVE_ACCEPT4 1 */ - - /* Define if async i/o supports message q's */ - /* #undef HAVE_AIO_MSGQ */ -@@ -141,7 +141,7 @@ - /* #undef HAVE_DL_H */ - - /* Define if dup3 function is supported */ --#define HAVE_DUP3 1 -+/* #define HAVE_DUP3 1 */ - - /* Define if EGD is supported */ - /* #undef HAVE_EGD */ -@@ -150,7 +150,7 @@ - #define HAVE_EPOLL 1 - - /* Define if epoll_create1 function is supported */ --#define HAVE_EPOLL_CREATE1 1 -+/* #define HAVE_EPOLL_CREATE1 1 */ - - /* Define to 1 if you have the header file. */ - #define HAVE_ERRNO_H 1 -@@ -195,13 +195,13 @@ - #define HAVE_GETHOSTBYNAME_R 1 - - /* Define to 1 if you have the `getifaddrs' function. */ --#define HAVE_GETIFADDRS 1 -+/* #define HAVE_GETIFADDRS 1 */ - - /* Define if getnameinfo exists */ - #define HAVE_GETNAMEINFO 1 - - /* Define to 1 if you have the `getpass' function. */ --#define HAVE_GETPASS 1 -+/* #define HAVE_GETPASS 1 */ - - /* Define to 1 if you have the `getpassphrase' function. */ - /* #undef HAVE_GETPASSPHRASE */ -@@ -318,7 +318,7 @@ - /* #undef HAVE_NET_ERRNO_H */ - - /* Define to 1 if you have the `nl_langinfo' function. */ --#define HAVE_NL_LANGINFO 1 -+/* #define HAVE_NL_LANGINFO 1 */ - - /* Define to 1 if you have the header file. */ - /* #undef HAVE_OS2_H */ -@@ -360,7 +360,7 @@ - #define HAVE_PTHREAD_MUTEX_RECURSIVE 1 - - /* Define if cross-process robust mutexes are available */ --#define HAVE_PTHREAD_MUTEX_ROBUST 1 -+/* #define HAVE_PTHREAD_MUTEX_ROBUST 1 */ - - /* Define if PTHREAD_PROCESS_SHARED is defined in pthread.h */ - #define HAVE_PTHREAD_PROCESS_SHARED 1 -@@ -372,7 +372,7 @@ - #define HAVE_PTHREAD_RWLOCK_INIT 1 - - /* Define to 1 if you have the `pthread_yield' function. */ --#define HAVE_PTHREAD_YIELD 1 -+/* #define HAVE_PTHREAD_YIELD 1 */ - - /* Define to 1 if you have the `putenv' function. */ - #define HAVE_PUTENV 1 -@@ -474,7 +474,7 @@ - #define HAVE_SOCKLEN_T 1 - - /* Define if the SOCK_CLOEXEC flag is supported */ --#define HAVE_SOCK_CLOEXEC 1 -+/* #define HAVE_SOCK_CLOEXEC 1 */ - - /* Define if SO_ACCEPTFILTER is defined in sys/socket.h */ - /* #undef HAVE_SO_ACCEPTFILTER */ -@@ -531,7 +531,7 @@ - /* #undef HAVE_STRUCT_STAT_ST_ATIME_N */ - - /* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */ --#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1 -+/* #define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 0 */ - - /* Define to 1 if `st_blocks' is a member of `struct stat'. */ - #define HAVE_STRUCT_STAT_ST_BLOCKS 1 -@@ -543,7 +543,7 @@ - /* #undef HAVE_STRUCT_STAT_ST_CTIME_N */ - - /* Define to 1 if `st_ctim.tv_nsec' is a member of `struct stat'. */ --#define HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC 1 -+/* #define HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC 1 */ - - /* Define to 1 if `st_mtimensec' is a member of `struct stat'. */ - /* #undef HAVE_STRUCT_STAT_ST_MTIMENSEC */ -@@ -552,7 +552,7 @@ - /* #undef HAVE_STRUCT_STAT_ST_MTIME_N */ - - /* Define to 1 if `st_mtim.tv_nsec' is a member of `struct stat'. */ --#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 -+/* #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 */ - - /* Define to 1 if `tm_gmtoff' is a member of `struct tm'. */ - #define HAVE_STRUCT_TM_TM_GMTOFF 1 -@@ -594,13 +594,13 @@ - #define HAVE_SYS_SELECT_H 1 - - /* Define to 1 if you have the header file. */ --#define HAVE_SYS_SEM_H 1 -+/* #define HAVE_SYS_SEM_H 1 */ - - /* Define to 1 if you have the header file. */ - #define HAVE_SYS_SENDFILE_H 1 - - /* Define to 1 if you have the header file. */ --#define HAVE_SYS_SHM_H 1 -+/* #define HAVE_SYS_SHM_H 1 */ - - /* Define to 1 if you have the header file. */ - #define HAVE_SYS_SIGNAL_H 1 -@@ -633,7 +633,7 @@ - #define HAVE_SYS_UN_H 1 - - /* Define to 1 if you have the header file. */ --/* #undef HAVE_SYS_UUID_H */ -+#undef HAVE_SYS_UUID_H - - /* Define to 1 if you have the header file. */ - #define HAVE_SYS_WAIT_H 1 -@@ -687,7 +687,7 @@ - /* #undef HAVE_UUID_H */ - - /* Define to 1 if you have the header file. */ --#define HAVE_UUID_UUID_H 1 -+/* #define HAVE_UUID_UUID_H 1 */ - - /* Define if C compiler supports VLA */ - #define HAVE_VLA 1 - - diff --git a/third_party/netty-tcnative/LICENSE b/third_party/netty-tcnative/LICENSE deleted file mode 100644 index d645695673349..0000000000000 --- a/third_party/netty-tcnative/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/third_party/netty-tcnative/OWNERS b/third_party/netty-tcnative/OWNERS deleted file mode 100644 index 96b9292c3694c..0000000000000 --- a/third_party/netty-tcnative/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -kapishnikov@chromium.org -mef@chromium.org diff --git a/third_party/netty-tcnative/README.chromium b/third_party/netty-tcnative/README.chromium deleted file mode 100644 index 681bb0d3e61f8..0000000000000 --- a/third_party/netty-tcnative/README.chromium +++ /dev/null @@ -1,163 +0,0 @@ -Name: Tomcat Native Fork for Netty -Short Name: netty-tcnative -URL: https://github.com/netty/netty-tcnative -SHA: 856865181ca38c07b7d2be619903ee98f6f77a23 netty-tcnative-1.1.33.zip -Version: 1.1.33 -Date: October 13, 2015 -Revision: 2aa47be27783ec31086ca9881402f845543de4e6 -License: Apache 2.0 -License File: NOT_SHIPPED -Security Critical: no -The library is not security critical because it is used for tests only. -Do not link it into production code. - -Description: - netty-tcnative is a fork of Tomcat Native. It includes a set of changes contributed - by Twitter, Inc, such as: - - Simplified distribution and linkage of native library - Complete mavenization of the project - Improved OpenSSL support - -Local Modifications: - -diff -ruN ./original/src/main/c/ssl.c ./src/third_party/netty-tcnative/src/c/ssl.c ---- ./original/src/main/c/ssl.c 2015-10-13 08:36:59.000000000 -0400 -+++ ./src/third_party/netty-tcnative/src/c/ssl.c 2016-01-04 10:18:31.729765992 -0500 -@@ -1821,7 +1821,7 @@ - verify = SSL_VERIFY_NONE; - - UNREFERENCED(o); -- TCN_ASSERT(ctx != 0); -+ TCN_ASSERT(c->ctx != 0); - c->verify_mode = level; - - if (c->verify_mode == SSL_CVERIFY_UNSET) - -diff --git a/c/ssl.c b/c/ssl.c -index 89e6cad..97c7982 100644 ---- a/c/ssl.c -+++ b/c/ssl.c -@@ -231,26 +231,38 @@ static const jint supported_ssl_opts = 0 - - static int ssl_tmp_key_init_rsa(int bits, int idx) - { --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(OPENSSL_USE_DEPRECATED) -- if (!(SSL_temp_keys[idx] = -- RSA_generate_key(bits, RSA_F4, NULL, NULL))) { -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ return 0; -+#else -+ - #ifdef OPENSSL_FIPS -- /** -- * With FIPS mode short RSA keys cannot be -- * generated. -- */ -- if (bits < 1024) -- return 0; -- else --#endif -- return 1; -- } -- else { -+ /** -+ * Short RSA keys cannot be generated in FIPS mode. -+ */ -+ if (bits < 1024) - return 0; -- } --#else -- return 0; - #endif -+ -+ BIGNUM *e = BN_new(); -+ RSA *rsa = RSA_new(); -+ int ret = 1; -+ -+ if (e == NULL || -+ rsa == NULL || -+ !BN_set_word(e, RSA_F4) || -+ RSA_generate_key_ex(rsa, bits, e, NULL) != 1) { -+ goto err; -+ } -+ -+ SSL_temp_keys[idx] = rsa; -+ rsa = NULL; -+ ret = 0; -+ -+err: -+ BN_free(e); -+ RSA_free(rsa); -+ return ret; -+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ - } - - static int ssl_tmp_key_init_dh(int bits, int idx) -@@ -610,45 +622,6 @@ int SSL_rand_seed(const char *file) - return RAND_status(); - } - --static int ssl_rand_make(const char *file, int len, int base64) --{ -- int r; -- int num = len; -- BIO *out = NULL; -- -- out = BIO_new(BIO_s_file()); -- if (out == NULL) -- return 0; -- if ((r = BIO_write_filename(out, (char *)file)) < 0) { -- BIO_free_all(out); -- return 0; -- } -- if (base64) { -- BIO *b64 = BIO_new(BIO_f_base64()); -- if (b64 == NULL) { -- BIO_free_all(out); -- return 0; -- } -- out = BIO_push(b64, out); -- } -- while (num > 0) { -- unsigned char buf[4096]; -- int len = num; -- if (len > sizeof(buf)) -- len = sizeof(buf); -- r = RAND_bytes(buf, len); -- if (r <= 0) { -- BIO_free_all(out); -- return 0; -- } -- BIO_write(out, buf, len); -- num -= len; -- } -- r = BIO_flush(out); -- BIO_free_all(out); -- return r > 0 ? 1 : 0; --} -- - TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine) - { - int r = 0; -@@ -785,17 +758,6 @@ TCN_IMPLEMENT_CALL(jboolean, SSL, randSave)(TCN_STDARGS, jstring file) - return r ? JNI_TRUE : JNI_FALSE; - } - --TCN_IMPLEMENT_CALL(jboolean, SSL, randMake)(TCN_STDARGS, jstring file, -- jint length, jboolean base64) --{ -- TCN_ALLOC_CSTRING(file); -- int r; -- UNREFERENCED(o); -- r = ssl_rand_make(J2S(file), length, base64); -- TCN_FREE_CSTRING(file); -- return r ? JNI_TRUE : JNI_FALSE; --} -- - TCN_IMPLEMENT_CALL(void, SSL, randSet)(TCN_STDARGS, jstring file) - { - TCN_ALLOC_CSTRING(file); - - - diff --git a/third_party/netty-tcnative/netty-tcnative.gyp b/third_party/netty-tcnative/netty-tcnative.gyp deleted file mode 100644 index 9bd8490918131..0000000000000 --- a/third_party/netty-tcnative/netty-tcnative.gyp +++ /dev/null @@ -1,72 +0,0 @@ -# Builds the Netty fork of Tomcat Native. See http://netty.io/wiki/forked-tomcat-native.html -{ - 'targets': [ - { - 'target_name': 'netty-tcnative-so', - 'product_name': 'netty-tcnative', - 'type': 'shared_library', - 'sources': [ - 'src/c/address.c', - 'src/c/bb.c', - 'src/c/dir.c', - 'src/c/error.c', - 'src/c/file.c', - 'src/c/info.c', - 'src/c/jnilib.c', - 'src/c/lock.c', - 'src/c/misc.c', - 'src/c/mmap.c', - 'src/c/multicast.c', - 'src/c/network.c', - 'src/c/os.c', - 'src/c/os_unix_system.c', - 'src/c/os_unix_uxpipe.c', - 'src/c/poll.c', - 'src/c/pool.c', - 'src/c/proc.c', - 'src/c/shm.c', - 'src/c/ssl.c', - 'src/c/sslcontext.c', - 'src/c/sslinfo.c', - 'src/c/sslnetwork.c', - 'src/c/ssl_private.h', - 'src/c/sslutils.c', - 'src/c/stdlib.c', - 'src/c/tcn_api.h', - 'src/c/tcn.h', - 'src/c/tcn_version.h', - 'src/c/thread.c', - 'src/c/user.c', - ], - 'include_dirs': [ - '../apache-portable-runtime/src/include', - ], - 'defines': [ - 'HAVE_OPENSSL', - ], - 'cflags': [ - '-w', - ], - 'dependencies': [ - '../apache-portable-runtime/apr.gyp:apr', - '../boringssl/boringssl.gyp:boringssl', - ], - 'variables': { - 'component': 'static_library', - 'use_native_jni_exports': 1, - } - }, - { - 'target_name': 'netty-tcnative', - 'type': 'none', - 'variables': { - 'java_in_dir': 'src/java', - 'javac_includes': [ '**/org/apache/tomcat/jni/*.java' ], - }, - 'includes': [ '../../build/java.gypi' ], - 'dependencies': [ - 'netty-tcnative-so', - ], - }, - ], -} \ No newline at end of file diff --git a/third_party/netty4/LICENSE b/third_party/netty4/LICENSE deleted file mode 100644 index d645695673349..0000000000000 --- a/third_party/netty4/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/third_party/netty4/OWNERS b/third_party/netty4/OWNERS deleted file mode 100644 index 96b9292c3694c..0000000000000 --- a/third_party/netty4/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -kapishnikov@chromium.org -mef@chromium.org diff --git a/third_party/netty4/README.chromium b/third_party/netty4/README.chromium deleted file mode 100644 index 5cce515286fb5..0000000000000 --- a/third_party/netty4/README.chromium +++ /dev/null @@ -1,28 +0,0 @@ -Name: Netty -Short Name: netty -URL: http://netty.io/ -SHA: f40598a04aae5fa4b24810f30aaaf4a61c9c4385 netty-4.1.0.Beta8.tar.bz2 -Version: 4.1.0.Beta8 -Date: November 10, 2015 -License: Apache 2.0 -License File: NOT_SHIPPED -Security Critical: no -The library is not security critical because it is used for tests only. -Do not link it into production code. - -Description: -Netty is a NIO client server framework which enables quick and easy development -of network applications such as protocol servers and clients. It greatly -simplifies and streamlines network programming such as TCP and UDP socket server. - -Local Modifications: -Replaced netty-all jar files with the nightly build version -and deleted all 4.1.0.Beta8 version jars. - -URL: https://oss.sonatype.org/content/repositories/snapshots/io/netty/netty-all/4.1.0.CR1-SNAPSHOT/ -SHA: 2748f46eca4216a08e75dd9ce618f61ed067c4f5 netty-all-4.1.0.CR1-20160111.120759-50-sources.jar -Date: January 11, 2016 - -URL: https://oss.sonatype.org/content/repositories/snapshots/io/netty/netty-all/4.1.0.CR1-SNAPSHOT/ -SHA: 16cc4addd84c7fb3444e6d79f7d8cef74adefc7d netty-all-4.1.0.CR1-20160111.120759-50.jar -Date: January 11, 2016 diff --git a/third_party/netty4/netty.gyp b/third_party/netty4/netty.gyp deleted file mode 100644 index 5a9bac12ed0e8..0000000000000 --- a/third_party/netty4/netty.gyp +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2010 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -{ - 'targets': [ - { # This target references prebuilt Netty Jar file. - 'target_name': 'netty_all', - 'type' : 'none', - 'variables': { - 'jar_path': 'src/jar/all-in-one/netty-all-4.1.0.CR1-20160111.120759-50.jar', - 'exclude_from_apk': 1, - }, - 'includes': ['../../build/java_prebuilt.gypi'], - }, - ], -} \ No newline at end of file