Imported Debian patch 3.10.2+dfsg-2

This commit is contained in:
Felix Lechner
2017-04-22 17:48:29 -07:00
committed by Mario Fetka
parent 1893aafd38
commit 2662009d46
19 changed files with 1805 additions and 0 deletions

31
debian/patches/dfsg.patch vendored Normal file
View File

@@ -0,0 +1,31 @@
Description: Strike references to removed non-DFSG sources from build files
Forwarded: no
From: Felix Lechner <felix.lechner@lease-up.com>
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,25 +101,6 @@ include tests/include.am
include sslSniffer/sslSnifferTest/include.am
include rpm/include.am
-# Exclude references to non-DFSG sources from build files
-if !BUILD_DISTRO
-include mqx/util_lib/Sources/include.am
-include mqx/wolfcrypt_benchmark/Sources/include.am
-include mqx/wolfcrypt_test/Sources/include.am
-include mqx/wolfssl/include.am
-include mqx/wolfssl_client/Sources/include.am
-include mplabx/include.am
-include mplabx/wolfcrypt_benchmark.X/nbproject/include.am
-include mplabx/wolfcrypt_test.X/nbproject/include.am
-include mplabx/wolfssl.X/nbproject/include.am
-include mcapi/include.am
-include mcapi/wolfcrypt_mcapi.X/nbproject/include.am
-include mcapi/wolfcrypt_test.X/nbproject/include.am
-include mcapi/wolfssl.X/nbproject/include.am
-include mcapi/zlib.X/nbproject/include.am
-include tirtos/include.am
-include IDE/include.am
-endif
include scripts/include.am
if USE_VALGRIND

View File

@@ -0,0 +1,17 @@
Description: Disable CRL monitor on all architectures
CRL monitor is unvailable on Debian architecture kFreeBSD, causes FTBFS
Author: Felix Lechner <felix.lechner@lease-up.com>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=860514
Last-Update: 2017-04-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/configure.ac
+++ b/configure.ac
@@ -175,7 +175,6 @@ then
enable_ocspstapling=yes
enable_ocspstapling2=yes
enable_crl=yes
- enable_crl_monitor=yes
enable_sni=yes
enable_maxfragment=yes
enable_alpn=yes

View File

@@ -0,0 +1,18 @@
Description: Fix type definition for socklen_t on hurd-i386
Based on http://bugs.mysql.com/bug.php?id=22326
Author: Felix Lechner <felix.lechner@lease-up.com>
Forwarded: no
Last-Update: 2017-04-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/wolfssl/test.h
+++ b/wolfssl/test.h
@@ -152,7 +152,7 @@
#endif
#endif /* WOLFSSL_SOCKET_IS_INVALID */
-#if defined(__MACH__) || defined(USE_WINDOWS_API)
+#if defined(USE_WINDOWS_API)
#ifndef _SOCKLEN_T
typedef int socklen_t;
#endif

4
debian/patches/series vendored Normal file
View File

@@ -0,0 +1,4 @@
dfsg.patch
fix-hurd-i386-flags.patch
turn-off-fastmath-for-amd64.patch
disable-crl-monitor.patch

View File

@@ -0,0 +1,21 @@
Description: Turn off fastmath for amd64, where it is default
Enabling fastmath just for amd64 causes the shared library symbols to
become architecture-dependent.
Author: Felix Lechner <felix.lechner@lease-up.com>
Forwarded: not-needed
Last-Update: 2017-04-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/configure.ac
+++ b/configure.ac
@@ -2481,10 +2481,6 @@ fi
# set fastmath default
FASTMATH_DEFAULT=no
-if test "$host_cpu" = "x86_64"
-then
- FASTMATH_DEFAULT=yes
-fi
# fastmath
AC_ARG_ENABLE([fastmath],