Date: Wed, 19 Sep 2018 06:56:37 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r338775 - in projects/openssl111/contrib: serf serf/auth serf/buckets serf/build telnet/libtelnet unbound Message-ID: <201809190656.w8J6ubRw066730@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed Sep 19 06:56:37 2018 New Revision: 338775 URL: https://svnweb.freebsd.org/changeset/base/338775 Log: Revert r338774. Unrelated changes were committed with Apache Serf. Modified: projects/openssl111/contrib/serf/CHANGES projects/openssl111/contrib/serf/NOTICE projects/openssl111/contrib/serf/README projects/openssl111/contrib/serf/SConstruct projects/openssl111/contrib/serf/auth/auth.c projects/openssl111/contrib/serf/auth/auth.h projects/openssl111/contrib/serf/auth/auth_basic.c projects/openssl111/contrib/serf/auth/auth_digest.c projects/openssl111/contrib/serf/auth/auth_spnego.c projects/openssl111/contrib/serf/auth/auth_spnego.h projects/openssl111/contrib/serf/auth/auth_spnego_gss.c projects/openssl111/contrib/serf/auth/auth_spnego_sspi.c projects/openssl111/contrib/serf/buckets/aggregate_buckets.c projects/openssl111/contrib/serf/buckets/allocator.c projects/openssl111/contrib/serf/buckets/barrier_buckets.c projects/openssl111/contrib/serf/buckets/buckets.c projects/openssl111/contrib/serf/buckets/bwtp_buckets.c projects/openssl111/contrib/serf/buckets/chunk_buckets.c projects/openssl111/contrib/serf/buckets/dechunk_buckets.c projects/openssl111/contrib/serf/buckets/deflate_buckets.c projects/openssl111/contrib/serf/buckets/file_buckets.c projects/openssl111/contrib/serf/buckets/headers_buckets.c projects/openssl111/contrib/serf/buckets/iovec_buckets.c projects/openssl111/contrib/serf/buckets/limit_buckets.c projects/openssl111/contrib/serf/buckets/mmap_buckets.c projects/openssl111/contrib/serf/buckets/request_buckets.c projects/openssl111/contrib/serf/buckets/response_body_buckets.c projects/openssl111/contrib/serf/buckets/response_buckets.c projects/openssl111/contrib/serf/buckets/simple_buckets.c projects/openssl111/contrib/serf/buckets/socket_buckets.c projects/openssl111/contrib/serf/buckets/ssl_buckets.c projects/openssl111/contrib/serf/build/check.py projects/openssl111/contrib/serf/build/gen_def.py projects/openssl111/contrib/serf/context.c projects/openssl111/contrib/serf/incoming.c projects/openssl111/contrib/serf/outgoing.c projects/openssl111/contrib/serf/serf.h projects/openssl111/contrib/serf/serf_bucket_types.h projects/openssl111/contrib/serf/serf_bucket_util.h projects/openssl111/contrib/serf/serf_private.h projects/openssl111/contrib/serf/ssltunnel.c projects/openssl111/contrib/telnet/libtelnet/enc_des.c projects/openssl111/contrib/telnet/libtelnet/encrypt.h projects/openssl111/contrib/telnet/libtelnet/kerberos.c projects/openssl111/contrib/telnet/libtelnet/pk.c projects/openssl111/contrib/telnet/libtelnet/pk.h projects/openssl111/contrib/unbound/config.h Modified: projects/openssl111/contrib/serf/CHANGES ============================================================================== --- projects/openssl111/contrib/serf/CHANGES Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/CHANGES Wed Sep 19 06:56:37 2018 (r338775) @@ -1,26 +1,7 @@ -Apache Serf 1.3.9 [2016-09-01, from tags/1.3.9, rxxxx] - serf is now Apache Serf; apply header changes (r1700062) - Fix issue #151: SCons build broken when only one library in ENVPATH - Fix issue #153: avoid SSPI handle leak - Fix issue #167: Explicitly use the ANSI version of SSPI - Fix issue #170: Allow building with Microsoft Visual Studio 2015 - Fix build of 'check' target when using VPATH-style builds (r1699858, ...) - (builddir != srcdir). - Resolve a bucket (aka "memory") leak when a request bucket is - destroyed before it is morphed into an aggregate bucket (r1699791) - Reset state variables when resetting connection (r1708849) - Fix types of passed, but unused batons (r1699986, r1699987) - Fix some usages of the openssl BIO api (r1699852) - Improve handling of bad data in the response state line. (r1699985) - Resolve several compiler issues with less common compilers - Support more overrides via SCons arguments (r1701836, ...) - Adapt to OpenSSL 1.1.x api (r1750819) - - -Serf 1.3.8 [2014-10-20, from /tags/1.3.8, r2441] - Fix issue #152: CRC calculation error for gzipped http reponses > 4GB. - Fix issue #153: SSPI CredHandle not freed when APR pool is destroyed. - Fix issue #154: Disable SSLv2 and SSLv3 as both or broken. +Serf 1.3.8 [2014-10-20, from /tags/1.3.8, rxxxx] +Fix issue #152: CRC calculation error for gzipped http reponses > 4GB. +Fix issue #153: SSPI CredHandle not freed when APR pool is destroyed. +Fix issue #154: Disable SSLv2 and SSLv3 as both or broken. Serf 1.3.7 [2014-08-11, from /tags/1.3.7, r2411] Modified: projects/openssl111/contrib/serf/NOTICE ============================================================================== --- projects/openssl111/contrib/serf/NOTICE Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/NOTICE Wed Sep 19 06:56:37 2018 (r338775) @@ -1,7 +1,2 @@ -Apache Serf -Copyright 2015 The Apache Software Foundation - -This product includes software developed by many people, and distributed -under Contributor License Agreements to The Apache Software Foundation -(http://www.apache.org/). See the revision logs for an exact contribution -history. +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). Modified: projects/openssl111/contrib/serf/README ============================================================================== --- projects/openssl111/contrib/serf/README Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/README Wed Sep 19 06:56:37 2018 (r338775) @@ -1,14 +1,15 @@ -Welcome to Apache Serf, a high-performance asynchronous HTTP client library. +Welcome to serf, a high-performance asynchronous HTTP client library. -The Apache Serf library is a C-based HTTP client library built upon the Apache +The serf library is a C-based HTTP client library built upon the Apache Portable Runtime (APR) library. It multiplexes connections, running the read/write communication asynchronously. Memory copies and transformations are kept to a minimum to provide high performance operation. - * Site: http://serf.apache.org// - * Code: http://svn.apache.org/repos/asf/serf/ - * Issues: https://issues.apache.org/jira/browse/SERF - * Mail: dev@serf.apache.org + * Status: http://code.google.com/p/serf/wiki/ + * Site: http://code.google.com/p/serf/ + * Code: http://serf.googlecode.com/svn/ + * Issues: http://code.google.com/p/serf/issues/list + * Mail: serf-dev@googlegroups.com * People: Justin Erenkrantz, Greg Stein ---- @@ -17,8 +18,8 @@ kept to a minimum to provide high performance operatio 1.1. SCons build system -Apache Serf uses SCons 2.3 for its build system. If it is not installed -on your system, then you can install it onto your system. If you do not +serf uses SCons 2.3 for its build system. If it is not installed on +your system, then you can install it onto your system. If you do not have permissions, then you can download and install the "local" version into your home directory. When installed privately, simply create a symlink for 'scons' in your PATH to /path/to/scons/scons.py. @@ -27,7 +28,7 @@ Fetch the scons-local package: http://prdownloads.sourceforge.net/scons/scons-local-2.3.0.tar.gz -1.2 Building Apache Serf +1.2 Building serf To build serf: @@ -69,7 +70,7 @@ $ scons --help $ scons check -1.4 Installing Apache Serf +1.4 Installing serf $ scons install Modified: projects/openssl111/contrib/serf/SConstruct ============================================================================== --- projects/openssl111/contrib/serf/SConstruct Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/SConstruct Wed Sep 19 06:56:37 2018 (r338775) @@ -1,24 +1,19 @@ # -*- python -*- # -# ==================================================================== -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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. -# ==================================================================== +# Copyright 2011-2012 Justin Erenkrantz and Greg Stein # +# 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. +# import sys import os @@ -140,8 +135,7 @@ if sys.platform == 'win32': EnumVariable('MSVC_VERSION', "Visual C++ to use for building (E.g. 11.0, 9.0)", None, - allowed_values=('14.0', '12.0', - '11.0', '10.0', '9.0', '8.0', '6.0') + allowed_values=('12.0', '11.0', '10.0', '9.0', '8.0', '6.0') ), # We always documented that we handle an install layout, but in fact we @@ -183,7 +177,8 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetO unknown = opts.UnknownVariables() if unknown: - print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) + print 'Unknown variables:', ', '.join(unknown.keys()) + Exit(1) apr = str(env['APR']) apu = str(env['APU']) @@ -215,8 +210,7 @@ incdir = '$PREFIX/include/serf-$MAJOR' # Unfortunately we can't set the .dylib compatibility_version option separately # from current_version, so don't use the PATCH level to avoid that build and # runtime patch levels have to be identical. -if sys.platform != 'sunos5': - env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0) +env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0) LIBNAME = 'libserf-%d' % (MAJOR,) if sys.platform != 'win32': @@ -229,43 +223,31 @@ env.Append(RPATH=libdir, if sys.platform == 'darwin': # linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,)) - env.Append(LINKFLAGS=['-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)]) + env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)) if sys.platform != 'win32': - def CheckGnuCC(context): - src = ''' - #ifndef __GNUC__ - oh noes! - #endif - ''' - context.Message('Checking for GNU-compatible C compiler...') - result = context.TryCompile(src, '.c') - context.Result(result) - return result + ### gcc only. figure out appropriate test / better way to check these + ### flags, and check for gcc. + env.Append(CFLAGS='-std=c89') - conf = Configure(env, custom_tests = dict(CheckGnuCC=CheckGnuCC)) - have_gcc = conf.CheckGnuCC() - env = conf.Finish() - - if have_gcc: - env.Append(CFLAGS=['-std=c89']) + ### These warnings are not available on Solaris + if sys.platform != 'sunos5': env.Append(CCFLAGS=['-Wdeclaration-after-statement', '-Wmissing-prototypes', '-Wall']) if debug: - env.Append(CCFLAGS=['-g']) + env.Append(CCFLAGS='-g') env.Append(CPPDEFINES=['DEBUG', '_DEBUG']) else: - env.Append(CCFLAGS=['-O2']) - env.Append(CPPDEFINES=['NDEBUG']) + env.Append(CCFLAGS='-O2') + env.Append(CPPDEFINES='NDEBUG') ### works for Mac OS. probably needs to change env.Append(LIBS=['ssl', 'crypto', 'z', ]) if sys.platform == 'sunos5': - env.Append(LIBS=['m']) - env.Append(PLATFORM='posix') + env.Append(LIBS='m') else: # Warning level 4, no unused argument warnings env.Append(CCFLAGS=['/W4', '/wd4100']) @@ -278,8 +260,8 @@ else: else: # Optimize for speed, use DLL runtime env.Append(CCFLAGS=['/O2', '/MD']) - env.Append(CPPDEFINES=['NDEBUG']) - env.Append(LINKFLAGS=['/RELEASE']) + env.Append(CPPDEFINES='NDEBUG') + env.Append(LINKFLAGS='/RELEASE') # PLAN THE BUILD SHARED_SOURCES = [] @@ -309,7 +291,6 @@ if sys.platform == 'win32': if aprstatic: apr_libs='apr-1.lib' apu_libs='aprutil-1.lib' - env.Append(LIBS=['shell32.lib', 'xml.lib']) else: apr_libs='libapr-1.lib' apu_libs='libaprutil-1.lib' @@ -326,25 +307,25 @@ if sys.platform == 'win32': CPPPATH=['$APR/include', '$APU/include']) # zlib - env.Append(LIBS=['zlib.lib']) + env.Append(LIBS='zlib.lib') if not env.get('SOURCE_LAYOUT', None): - env.Append(CPPPATH=['$ZLIB/include'], - LIBPATH=['$ZLIB/lib']) + env.Append(CPPPATH='$ZLIB/include', + LIBPATH='$ZLIB/lib') else: - env.Append(CPPPATH=['$ZLIB'], - LIBPATH=['$ZLIB']) + env.Append(CPPPATH='$ZLIB', + LIBPATH='$ZLIB') # openssl env.Append(LIBS=['libeay32.lib', 'ssleay32.lib']) if not env.get('SOURCE_LAYOUT', None): - env.Append(CPPPATH=['$OPENSSL/include/openssl'], - LIBPATH=['$OPENSSL/lib']) + env.Append(CPPPATH='$OPENSSL/include/openssl', + LIBPATH='$OPENSSL/lib') elif 0: # opensslstatic: - env.Append(CPPPATH=['$OPENSSL/inc32'], - LIBPATH=['$OPENSSL/out32']) + env.Append(CPPPATH='$OPENSSL/inc32', + LIBPATH='$OPENSSL/out32') else: - env.Append(CPPPATH=['$OPENSSL/inc32'], - LIBPATH=['$OPENSSL/out32dll']) + env.Append(CPPPATH='$OPENSSL/inc32', + LIBPATH='$OPENSSL/out32dll') else: if os.path.isdir(apr): apr = os.path.join(apr, 'bin', 'apr-1-config') @@ -370,8 +351,8 @@ else: apr_libs = '' apu_libs = '' - env.Append(CPPPATH=['$OPENSSL/include']) - env.Append(LIBPATH=['$OPENSSL/lib']) + env.Append(CPPPATH='$OPENSSL/include') + env.Append(LIBPATH='$OPENSSL/lib') # If build with gssapi, get its information and define SERF_HAVE_GSSAPI @@ -381,7 +362,7 @@ if gssapi and CALLOUT_OKAY: env['GSSAPI_LIBS'] = cmd.strip() return env.MergeFlags(cmd, unique) env.ParseConfig('$GSSAPI --libs gssapi', parse_libs) - env.Append(CPPDEFINES=['SERF_HAVE_GSSAPI']) + env.Append(CPPDEFINES='SERF_HAVE_GSSAPI') if sys.platform == 'win32': env.Append(CPPDEFINES=['SERF_HAVE_SSPI']) @@ -447,12 +428,6 @@ env.Alias('install', ['install-lib', 'install-inc', 'i tenv = env.Clone() -# MockHTTP requires C99 standard, so use it for the test suite. -cflags = tenv['CFLAGS'] -tenv.Replace(CFLAGS = [f.replace('-std=c89', '-std=c99') for f in cflags]) - -tenv.Append(CPPDEFINES=['MOCKHTTP_OPENSSL']) - TEST_PROGRAMS = [ 'serf_get', 'serf_response', 'serf_request', 'serf_spider', 'test_all', 'serf_bwtp' ] if sys.platform == 'win32': @@ -460,22 +435,13 @@ if sys.platform == 'win32': else: TEST_EXES = [ os.path.join('test', '%s' % (prog)) for prog in TEST_PROGRAMS ] +env.AlwaysBuild(env.Alias('check', TEST_EXES, sys.executable + ' build/check.py', + ENV={'PATH' : os.environ['PATH']})) + # Find the (dynamic) library in this directory tenv.Replace(RPATH=thisdir) tenv.Prepend(LIBS=[LIBNAMESTATIC, ], LIBPATH=[thisdir, ]) - -check_script = env.File('build/check.py').rstr() -test_dir = env.File('test/test_all.c').rfile().get_dir() -src_dir = env.File('serf.h').rfile().get_dir() -test_app = ("%s %s %s %s") % (sys.executable, check_script, test_dir, 'test') - -# Set the library search path for the test programs -test_env = {'PATH' : os.environ['PATH'], - 'srcdir' : src_dir} -if sys.platform != 'win32': - test_env['LD_LIBRARY_PATH'] = ':'.join(tenv.get('LIBPATH', [])) -env.AlwaysBuild(env.Alias('check', TEST_EXES, test_app, ENV=test_env)) testall_files = [ 'test/test_all.c', Modified: projects/openssl111/contrib/serf/auth/auth.c ============================================================================== --- projects/openssl111/contrib/serf/auth/auth.c Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/auth/auth.c Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2009 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ #include "serf.h" Modified: projects/openssl111/contrib/serf/auth/auth.h ============================================================================== --- projects/openssl111/contrib/serf/auth/auth.h Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/auth/auth.h Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2009 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ #ifndef AUTH_H Modified: projects/openssl111/contrib/serf/auth/auth_basic.c ============================================================================== --- projects/openssl111/contrib/serf/auth/auth_basic.c Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/auth/auth_basic.c Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2009 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ /*** Basic authentication ***/ Modified: projects/openssl111/contrib/serf/auth/auth_digest.c ============================================================================== --- projects/openssl111/contrib/serf/auth/auth_digest.c Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/auth/auth_digest.c Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2009 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ /*** Digest authentication ***/ Modified: projects/openssl111/contrib/serf/auth/auth_spnego.c ============================================================================== --- projects/openssl111/contrib/serf/auth/auth_spnego.c Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/auth/auth_spnego.c Wed Sep 19 06:56:37 2018 (r338775) @@ -1,23 +1,17 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2009 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ - #include "auth_spnego.h" Modified: projects/openssl111/contrib/serf/auth/auth_spnego.h ============================================================================== --- projects/openssl111/contrib/serf/auth/auth_spnego.h Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/auth/auth_spnego.h Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2010 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ #ifndef AUTH_SPNEGO_H Modified: projects/openssl111/contrib/serf/auth/auth_spnego_gss.c ============================================================================== --- projects/openssl111/contrib/serf/auth/auth_spnego_gss.c Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/auth/auth_spnego_gss.c Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2009 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ #include "serf.h" Modified: projects/openssl111/contrib/serf/auth/auth_spnego_sspi.c ============================================================================== --- projects/openssl111/contrib/serf/auth/auth_spnego_sspi.c Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/auth/auth_spnego_sspi.c Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2010 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ #include "auth_spnego.h" @@ -143,7 +138,7 @@ serf__spnego_create_sec_context(serf__spnego_context_t else sspi_package = "NTLM"; - sspi_status = AcquireCredentialsHandleA( + sspi_status = AcquireCredentialsHandle( NULL, sspi_package, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &ctx->sspi_credentials, NULL); @@ -252,7 +247,7 @@ serf__spnego_init_sec_context(serf_connection_t *conn, sspi_out_buffer_desc.pBuffers = &sspi_out_buffer; sspi_out_buffer_desc.ulVersion = SECBUFFER_VERSION; - status = InitializeSecurityContextA( + status = InitializeSecurityContext( &ctx->sspi_credentials, ctx->initalized ? &ctx->sspi_context : NULL, ctx->target_name, Modified: projects/openssl111/contrib/serf/buckets/aggregate_buckets.c ============================================================================== --- projects/openssl111/contrib/serf/buckets/aggregate_buckets.c Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/buckets/aggregate_buckets.c Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ #include "serf.h" Modified: projects/openssl111/contrib/serf/buckets/allocator.c ============================================================================== --- projects/openssl111/contrib/serf/buckets/allocator.c Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/buckets/allocator.c Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ #include <stdlib.h> Modified: projects/openssl111/contrib/serf/buckets/barrier_buckets.c ============================================================================== --- projects/openssl111/contrib/serf/buckets/barrier_buckets.c Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/buckets/barrier_buckets.c Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ #include <apr_pools.h> Modified: projects/openssl111/contrib/serf/buckets/buckets.c ============================================================================== --- projects/openssl111/contrib/serf/buckets/buckets.c Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/buckets/buckets.c Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ #include <apr_pools.h> Modified: projects/openssl111/contrib/serf/buckets/bwtp_buckets.c ============================================================================== --- projects/openssl111/contrib/serf/buckets/bwtp_buckets.c Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/buckets/bwtp_buckets.c Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ #include <apr_pools.h> Modified: projects/openssl111/contrib/serf/buckets/chunk_buckets.c ============================================================================== --- projects/openssl111/contrib/serf/buckets/chunk_buckets.c Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/buckets/chunk_buckets.c Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ #include <apr_pools.h> Modified: projects/openssl111/contrib/serf/buckets/dechunk_buckets.c ============================================================================== --- projects/openssl111/contrib/serf/buckets/dechunk_buckets.c Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/buckets/dechunk_buckets.c Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ #include <apr_strings.h> Modified: projects/openssl111/contrib/serf/buckets/deflate_buckets.c ============================================================================== --- projects/openssl111/contrib/serf/buckets/deflate_buckets.c Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/buckets/deflate_buckets.c Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ #include <apr_strings.h> Modified: projects/openssl111/contrib/serf/buckets/file_buckets.c ============================================================================== --- projects/openssl111/contrib/serf/buckets/file_buckets.c Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/buckets/file_buckets.c Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ #include <apr_pools.h> Modified: projects/openssl111/contrib/serf/buckets/headers_buckets.c ============================================================================== --- projects/openssl111/contrib/serf/buckets/headers_buckets.c Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/buckets/headers_buckets.c Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2004 Justin Erenkrantz and Greg Stein * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. - * ==================================================================== + * 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. */ #include <stdlib.h> Modified: projects/openssl111/contrib/serf/buckets/iovec_buckets.c ============================================================================== --- projects/openssl111/contrib/serf/buckets/iovec_buckets.c Wed Sep 19 06:49:55 2018 (r338774) +++ projects/openssl111/contrib/serf/buckets/iovec_buckets.c Wed Sep 19 06:56:37 2018 (r338775) @@ -1,21 +1,16 @@ -/* ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 +/* Copyright 2011 Justin Erenkrantz and Greg Stein * *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809190656.w8J6ubRw066730>