project: Update for 3.6.5 merge.

ShiftMediaProject · Sep 9, 2019 · a1567a0 · a1567a0
1 parent 96b2932
commit a1567a0
Show file tree

Hide file tree

Showing 30 changed files with 16,147 additions and 7,371 deletions.
diff --git a/SMP/SMP.patch b/SMP/SMP.patch
diff --git a/SMP/appveyor.yml b/SMP/appveyor.yml
@@ -24,6 +24,7 @@ environment:
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
 
 install:
+- cmd: git submodule update --init --recursive
 # Install GitLink
 - cmd: nuget install gitlink -Version 2.4.0
 - cmd: for /f "tokens=*" %%f in ('dir /s /b gitlink.exe') do copy /b %%f .\

diff --git a/SMP/config.h b/SMP/config.h
@@ -77,6 +77,9 @@
 /* Enable FIPS140-2 mode */
 /* #undef ENABLE_FIPS140 */
 
+/* enable GOST support */
+/* #undef ENABLE_GOST */
+
 /* enable heartbeat support */
 #define ENABLE_HEARTBEAT 1
 
@@ -89,9 +92,6 @@
 /* enable OCSP support */
 #define ENABLE_OCSP 1
 
-/* use openpgp authentication */
-#define ENABLE_OPENPGP 1
-
 /* Enable padlock acceleration */
 #define ENABLE_PADLOCK 1
 
@@ -101,12 +101,6 @@
 /* enable PSK authentication */
 #define ENABLE_PSK 1
 
-/* Self checks are included in the library */
-/* #undef ENABLE_SELF_CHECKS */
-
-/* enable session tickets support */
-#define ENABLE_SESSION_TICKETS 1
-
 /* enable SRP authentication */
 #define ENABLE_SRP 1
 
@@ -727,9 +721,6 @@
 /* Define to 1 if you have the <libgen.h> header file. */
 /* #undef HAVE_LIBGEN_H */
 
-/* Build IDNA support */
-/* #undef HAVE_LIBIDN */
-
 /* Define if IDNA 2008 support is enabled. */
 /* #undef HAVE_LIBIDN2 */
 
@@ -807,6 +798,12 @@
    concept. */
 #define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1
 
+/* Define to 1 if you have the `nettle_cmac128_update' function. */
+#define HAVE_NETTLE_CMAC128_UPDATE 1
+
+/* Define to 1 if you have the `nettle_cfb8_encrypt' function. */
+#define HAVE_NETTLE_CFB8_ENCRYPT 1
+
 /* Define to 1 if you have the `nanosleep' function. */
 /* #undef HAVE_NANOSLEEP */
 
@@ -2132,8 +2129,6 @@
 # define _GL_INLINE_HEADER_END
 #endif
 
-/* static lib rename */
-#define fread_file _gnutls_fread_file
 
 /* Define to `int' if <sys/types.h> doesn't define. */
 #define gid_t int
@@ -2176,12 +2171,6 @@
    doesn't define it. */
 /* #undef ptrdiff_t */
 
-/* static lib rename */
-#define read_binary_file _gnutls_read_binary_file
-
-/* static lib rename */
-#define read_file _gnutls_read_file
-
 /* Define to the equivalent of the C99 'restrict' keyword, or to
    nothing if this is not supported.  Do not define if restrict is
    supported directly.  */

diff --git a/SMP/lib/unistring/unictype.h → SMP/gnulib/lib/unictype.h b/SMP/lib/unistring/unictype.h → SMP/gnulib/lib/unictype.h
@@ -1,28 +1,18 @@
 /* Unicode character classification and properties.
-   Copyright (C) 2002, 2005-2016 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2018 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
-   under the terms of either:
-
-    * the GNU Lesser General Public License as published
+   under the terms of the GNU Lesser General Public License as published
    by the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
-   or
-
-   * the GNU General Public License as published by the Free
-   Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   or both in parallel, as here.
-
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _UNICTYPE_H
 #define _UNICTYPE_H
@@ -561,7 +551,10 @@ enum
   UC_JOINING_GROUP_MANICHAEAN_FIVE,       /* Manichaean_Five */
   UC_JOINING_GROUP_MANICHAEAN_TEN,        /* Manichaean_Ten */
   UC_JOINING_GROUP_MANICHAEAN_TWENTY,     /* Manichaean_Twenty */
-  UC_JOINING_GROUP_MANICHAEAN_HUNDRED     /* Manichaean_Hundred */
+  UC_JOINING_GROUP_MANICHAEAN_HUNDRED,    /* Manichaean_Hundred */
+  UC_JOINING_GROUP_AFRICAN_FEH,           /* African_Feh */
+  UC_JOINING_GROUP_AFRICAN_QAF,           /* African_Qaf */
+  UC_JOINING_GROUP_AFRICAN_NOON           /* African_Noon */
 };
 
 /* Return the name of a joining group.  */

diff --git a/SMP/lib/unistring/uninorm.h → SMP/gnulib/lib/uninorm.h b/SMP/lib/unistring/uninorm.h → SMP/gnulib/lib/uninorm.h
@@ -1,29 +1,19 @@
 /* Normalization forms (composition and decomposition) of Unicode strings.
-   Copyright (C) 2001-2002, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2009-2018 Free Software Foundation, Inc.
    Written by Bruno Haible <[email protected]>, 2009.
 
    This program is free software: you can redistribute it and/or modify it
-   under the terms of either:
-
-    * the GNU Lesser General Public License as published
+   under the terms of the GNU Lesser General Public License as published
    by the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
-   or
-
-   * the GNU General Public License as published by the Free
-   Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   or both in parallel, as here.
-
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _UNINORM_H
 #define _UNINORM_H