summaryrefslogtreecommitdiffstats
path: root/package/openssl/patches/160-disable_doc_tests.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-03 18:45:35 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-03 18:45:35 +0000
commit7f1f989a38d91dbcbf08cf93693cfe1531b58587 (patch)
treee04ac1de23579b4ab22e687c6526f8273515c9a5 /package/openssl/patches/160-disable_doc_tests.patch
parente4ff786a36023736eab994cb27b24a6f2799beb4 (diff)
openssl: update to 1.0.0c
Signed-off-by: Peter Wagner <tripolar@gmx.at> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25348 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/openssl/patches/160-disable_doc_tests.patch')
-rw-r--r--package/openssl/patches/160-disable_doc_tests.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/package/openssl/patches/160-disable_doc_tests.patch b/package/openssl/patches/160-disable_doc_tests.patch
index 8c042ef6f..4ae35b1b6 100644
--- a/package/openssl/patches/160-disable_doc_tests.patch
+++ b/package/openssl/patches/160-disable_doc_tests.patch
@@ -1,15 +1,15 @@
--- a/Makefile
+++ b/Makefile
-@@ -134,7 +134,7 @@ FIPSCANLIB=
-
- BASEADDR=0xFB00000
+@@ -111,7 +111,7 @@ LIBKRB5=
+ ZLIB_INCLUDE=
+ LIBZLIB=
-DIRS= crypto ssl engines apps test tools
+DIRS= crypto ssl engines apps tools
+ ENGDIRS= ccgost
SHLIBDIRS= crypto ssl
- # dirs in crypto to build
-@@ -151,7 +151,7 @@ SDIRS= \
+@@ -129,7 +129,7 @@ SDIRS= \
# tests to perform. "alltests" is a special word indicating that all tests
# should be performed.
@@ -18,7 +18,7 @@
MAKEFILE= Makefile
-@@ -163,7 +163,7 @@ SHELL=/bin/sh
+@@ -143,7 +143,7 @@ SHELL=/bin/sh
TOP= .
ONEDIRS=out tmp
@@ -27,16 +27,16 @@
WDIRS= windows
LIBS= libcrypto.a libssl.a
SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
-@@ -323,7 +323,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
- ../crypto/uid.o
+@@ -239,7 +239,7 @@ reflect:
+ @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
sub_all: build_all
-build_all: build_libs build_apps build_tests build_tools
+build_all: build_libs build_apps build_tools
- build_libs: build_crypto build_fips build_ssl build_shared build_engines
+ build_libs: build_crypto build_ssl build_engines
-@@ -617,7 +617,7 @@ dist:
+@@ -494,7 +494,7 @@ dist:
dist_pem_h:
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
@@ -47,7 +47,7 @@
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
--- a/Makefile.org
+++ b/Makefile.org
-@@ -615,7 +615,7 @@ dist:
+@@ -492,7 +492,7 @@ dist:
dist_pem_h:
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)