From 771b5017b85c35790c3d133d472ad2ee4f421091 Mon Sep 17 00:00:00 2001 From: Carie Pointer Date: Fri, 15 Jun 2018 14:29:04 -0700 Subject: [PATCH] Add WOLFSSL/include to ngx_feature_path --- nginx-1.10.3-wolfssl.patch | 2 +- nginx-1.11.10-wolfssl.patch | 2 +- nginx-1.11.13-wolfssl.patch | 2 +- nginx-1.11.7-wolfssl.patch | 2 +- nginx-1.12.0-wolfssl.patch | 2 +- nginx-1.12.1-wolfssl.patch | 2 +- nginx-1.12.2-wolfssl.patch | 2 +- nginx-1.13.0-wolfssl.patch | 2 +- nginx-1.13.12-wolfssl.patch | 2 +- nginx-1.13.2-wolfssl.patch | 2 +- nginx-1.13.8-wolfssl.patch | 2 +- nginx-1.14.0-wolfssl.patch | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nginx-1.10.3-wolfssl.patch b/nginx-1.10.3-wolfssl.patch index 0856953..1c9860b 100644 --- a/nginx-1.10.3-wolfssl.patch +++ b/nginx-1.10.3-wolfssl.patch @@ -33,7 +33,7 @@ diff -ur nginx-1.10.3/auto/lib/openssl/conf nginx-1.10.3-wolfssl/auto/lib/openss + + if [ $WOLFSSL != NONE ]; then + ngx_feature="wolfSSL library in $WOLFSSL" -+ ngx_feature_path="$WOLFSSL/include/wolfssl" ++ ngx_feature_path="$WOLFSSL/include/wolfssl $WOLFSSL/include" + + if [ $NGX_RPATH = YES ]; then + ngx_feature_libs="-R$WOLFSSL/lib -L$WOLFSSL/lib -lwolfssl -lm $NGX_LIBDL" diff --git a/nginx-1.11.10-wolfssl.patch b/nginx-1.11.10-wolfssl.patch index 89a9fad..ffc97fe 100644 --- a/nginx-1.11.10-wolfssl.patch +++ b/nginx-1.11.10-wolfssl.patch @@ -14,7 +14,7 @@ diff -ur nginx-1.11.10/auto/lib/openssl/conf nginx-1.11.10-wolfssl/auto/lib/open + + if [ $WOLFSSL != NONE ]; then + ngx_feature="wolfSSL library in $WOLFSSL" -+ ngx_feature_path="$WOLFSSL/include/wolfssl" ++ ngx_feature_path="$WOLFSSL/include/wolfssl $WOLFSSL/include" + + if [ $NGX_RPATH = YES ]; then + ngx_feature_libs="-R$WOLFSSL/lib -L$WOLFSSL/lib -lwolfssl -lm $NGX_LIBDL" diff --git a/nginx-1.11.13-wolfssl.patch b/nginx-1.11.13-wolfssl.patch index 5cdc2a9..44e3b18 100644 --- a/nginx-1.11.13-wolfssl.patch +++ b/nginx-1.11.13-wolfssl.patch @@ -14,7 +14,7 @@ diff -ur nginx-1.11.13/auto/lib/openssl/conf nginx-1.11.13-wolfssl/auto/lib/open + + if [ $WOLFSSL != NONE ]; then + ngx_feature="wolfSSL library in $WOLFSSL" -+ ngx_feature_path="$WOLFSSL/include/wolfssl" ++ ngx_feature_path="$WOLFSSL/include/wolfssl $WOLFSSL/include" + + if [ $NGX_RPATH = YES ]; then + ngx_feature_libs="-R$WOLFSSL/lib -L$WOLFSSL/lib -lwolfssl -lm $NGX_LIBDL" diff --git a/nginx-1.11.7-wolfssl.patch b/nginx-1.11.7-wolfssl.patch index 1918b26..7c1b5c9 100644 --- a/nginx-1.11.7-wolfssl.patch +++ b/nginx-1.11.7-wolfssl.patch @@ -33,7 +33,7 @@ diff -ur nginx-1.11.7/auto/lib/openssl/conf nginx-1.11.7-wolfssl/auto/lib/openss + + if [ $WOLFSSL != NONE ]; then + ngx_feature="wolfSSL library in $WOLFSSL" -+ ngx_feature_path="$WOLFSSL/include/wolfssl" ++ ngx_feature_path="$WOLFSSL/include/wolfssl $WOLFSSL/include" + + if [ $NGX_RPATH = YES ]; then + ngx_feature_libs="-R$WOLFSSL/lib -L$WOLFSSL/lib -lwolfssl -lm $NGX_LIBDL" diff --git a/nginx-1.12.0-wolfssl.patch b/nginx-1.12.0-wolfssl.patch index c784e04..4599d94 100644 --- a/nginx-1.12.0-wolfssl.patch +++ b/nginx-1.12.0-wolfssl.patch @@ -14,7 +14,7 @@ diff -ur nginx-1.12.0/auto/lib/openssl/conf nginx-1.12.0-wolfssl/auto/lib/openss + + if [ $WOLFSSL != NONE ]; then + ngx_feature="wolfSSL library in $WOLFSSL" -+ ngx_feature_path="$WOLFSSL/include/wolfssl" ++ ngx_feature_path="$WOLFSSL/include/wolfssl $WOLFSSL/include" + + if [ $NGX_RPATH = YES ]; then + ngx_feature_libs="-R$WOLFSSL/lib -L$WOLFSSL/lib -lwolfssl -lm $NGX_LIBDL" diff --git a/nginx-1.12.1-wolfssl.patch b/nginx-1.12.1-wolfssl.patch index ee1f18f..2b6e749 100644 --- a/nginx-1.12.1-wolfssl.patch +++ b/nginx-1.12.1-wolfssl.patch @@ -14,7 +14,7 @@ diff -ur nginx-1.12.1/auto/lib/openssl/conf nginx-1.12.1-wolfssl/auto/lib/openss + + if [ $WOLFSSL != NONE ]; then + ngx_feature="wolfSSL library in $WOLFSSL" -+ ngx_feature_path="$WOLFSSL/include/wolfssl" ++ ngx_feature_path="$WOLFSSL/include/wolfssl $WOLFSSL/include" + + if [ $NGX_RPATH = YES ]; then + ngx_feature_libs="-R$WOLFSSL/lib -L$WOLFSSL/lib -lwolfssl -lm $NGX_LIBDL" diff --git a/nginx-1.12.2-wolfssl.patch b/nginx-1.12.2-wolfssl.patch index fd77a4e..3588d10 100644 --- a/nginx-1.12.2-wolfssl.patch +++ b/nginx-1.12.2-wolfssl.patch @@ -14,7 +14,7 @@ diff -ur nginx-1.12.2/auto/lib/openssl/conf nginx-1.12.2-wolfssl/auto/lib/openss + + if [ $WOLFSSL != NONE ]; then + ngx_feature="wolfSSL library in $WOLFSSL" -+ ngx_feature_path="$WOLFSSL/include/wolfssl" ++ ngx_feature_path="$WOLFSSL/include/wolfssl $WOLFSSL/include" + + if [ $NGX_RPATH = YES ]; then + ngx_feature_libs="-R$WOLFSSL/lib -L$WOLFSSL/lib -lwolfssl -lm $NGX_LIBDL" diff --git a/nginx-1.13.0-wolfssl.patch b/nginx-1.13.0-wolfssl.patch index bd58a62..da2da0c 100644 --- a/nginx-1.13.0-wolfssl.patch +++ b/nginx-1.13.0-wolfssl.patch @@ -14,7 +14,7 @@ diff -ur nginx-1.13.0/auto/lib/openssl/conf nginx-1.13.0-wolfssl/auto/lib/openss + + if [ $WOLFSSL != NONE ]; then + ngx_feature="wolfSSL library in $WOLFSSL" -+ ngx_feature_path="$WOLFSSL/include/wolfssl" ++ ngx_feature_path="$WOLFSSL/include/wolfssl $WOLFSSL/include" + + if [ $NGX_RPATH = YES ]; then + ngx_feature_libs="-R$WOLFSSL/lib -L$WOLFSSL/lib -lwolfssl -lm $NGX_LIBDL" diff --git a/nginx-1.13.12-wolfssl.patch b/nginx-1.13.12-wolfssl.patch index a141a5e..c2ff469 100644 --- a/nginx-1.13.12-wolfssl.patch +++ b/nginx-1.13.12-wolfssl.patch @@ -8,7 +8,7 @@ diff -ur nginx-1.13.12/auto/lib/openssl/conf nginx-1.13.12-wolfssl/auto/lib/open + + if [ $WOLFSSL != NONE ]; then + ngx_feature="wolfSSL library in $WOLFSSL" -+ ngx_feature_path="$WOLFSSL/include/wolfssl" ++ ngx_feature_path="$WOLFSSL/include/wolfssl $WOLFSSL/include" + + if [ $NGX_RPATH = YES ]; then + ngx_feature_libs="-R$WOLFSSL/lib -L$WOLFSSL/lib -lwolfssl $NGX_LIBDL" diff --git a/nginx-1.13.2-wolfssl.patch b/nginx-1.13.2-wolfssl.patch index 4530d33..0f70af2 100644 --- a/nginx-1.13.2-wolfssl.patch +++ b/nginx-1.13.2-wolfssl.patch @@ -14,7 +14,7 @@ diff -ur nginx-1.13.2/auto/lib/openssl/conf nginx-1.13.2-wolfssl/auto/lib/openss + + if [ $WOLFSSL != NONE ]; then + ngx_feature="wolfSSL library in $WOLFSSL" -+ ngx_feature_path="$WOLFSSL/include/wolfssl" ++ ngx_feature_path="$WOLFSSL/include/wolfssl $WOLFSSL/include" + + if [ $NGX_RPATH = YES ]; then + ngx_feature_libs="-R$WOLFSSL/lib -L$WOLFSSL/lib -lwolfssl -lm $NGX_LIBDL" diff --git a/nginx-1.13.8-wolfssl.patch b/nginx-1.13.8-wolfssl.patch index 75477eb..192f190 100644 --- a/nginx-1.13.8-wolfssl.patch +++ b/nginx-1.13.8-wolfssl.patch @@ -14,7 +14,7 @@ diff -ur nginx-1.13.8/auto/lib/openssl/conf nginx-1.13.8-wolfssl/auto/lib/openss + + if [ $WOLFSSL != NONE ]; then + ngx_feature="wolfSSL library in $WOLFSSL" -+ ngx_feature_path="$WOLFSSL/include/wolfssl" ++ ngx_feature_path="$WOLFSSL/include/wolfssl $WOLFSSL/include" + + if [ $NGX_RPATH = YES ]; then + ngx_feature_libs="-R$WOLFSSL/lib -L$WOLFSSL/lib -lwolfssl -lm $NGX_LIBDL" diff --git a/nginx-1.14.0-wolfssl.patch b/nginx-1.14.0-wolfssl.patch index 81a07fa..69cd2e4 100644 --- a/nginx-1.14.0-wolfssl.patch +++ b/nginx-1.14.0-wolfssl.patch @@ -8,7 +8,7 @@ diff -ur nginx-1.14.0/auto/lib/openssl/conf nginx-1.14.0-wolfssl/auto/lib/openss + + if [ $WOLFSSL != NONE ]; then + ngx_feature="wolfSSL library in $WOLFSSL" -+ ngx_feature_path="$WOLFSSL/include/wolfssl" ++ ngx_feature_path="$WOLFSSL/include/wolfssl $WOLFSSL/include" + + if [ $NGX_RPATH = YES ]; then + ngx_feature_libs="-R$WOLFSSL/lib -L$WOLFSSL/lib -lwolfssl $NGX_LIBDL"