fix jffs2 and mini_fo mount in failsafe (patch from #7134)

[openwrt.git] / package / openssl / patches / 160-disable_doc_tests.patch

diff --git a/package/openssl/patches/160-disable_doc_tests.patch b/package/openssl/patches/160-disable_doc_tests.patch
index 27e2033..8c042ef 100644 (file)
--- a/package/openssl/patches/160-disable_doc_tests.patch
+++ b/package/openssl/patches/160-disable_doc_tests.patch
@@ -1,25 +1,24 @@
-diff -urN openssl-0.9.8a/Makefile openssl-0.9.8a.new/Makefile
---- openssl-0.9.8a/Makefile    2005-10-11 12:21:48.000000000 +0200
-+++ openssl-0.9.8a.new/Makefile        2006-03-29 15:23:28.107586680 +0200
-@@ -102,7 +102,7 @@
- KRB5_INCLUDES=
- LIBKRB5=
+--- a/Makefile
++++ b/Makefile
+@@ -134,7 +134,7 @@ FIPSCANLIB=
+ 
+ BASEADDR=0xFB00000
  
 -DIRS=   crypto ssl engines apps test tools
 +DIRS=   crypto ssl engines apps tools
  SHLIBDIRS= crypto ssl
  
  # dirs in crypto to build
-@@ -119,7 +119,7 @@
+@@ -151,7 +151,7 @@ SDIRS=  \
  
  # tests to perform.  "alltests" is a special word indicating that all tests
  # should be performed.
 -TESTS = alltests
-+TESTS = 
++TESTS =
  
  MAKEFILE= Makefile
  
-@@ -131,7 +131,7 @@
+@@ -163,7 +163,7 @@ SHELL=/bin/sh
  
  TOP=    .
  ONEDIRS=out tmp
@@ -28,16 +27,16 @@ diff -urN openssl-0.9.8a/Makefile openssl-0.9.8a.new/Makefile
  WDIRS=  windows
  LIBS=   libcrypto.a libssl.a
  SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
-@@ -204,7 +204,7 @@
-       @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
+@@ -323,7 +323,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
+       ../crypto/uid.o
  
  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_ssl build_engines
+ build_libs: build_crypto build_fips build_ssl build_shared build_engines
  
-@@ -454,7 +454,7 @@
+@@ -617,7 +617,7 @@ dist:   
  dist_pem_h:
        (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
  
@@ -46,10 +45,9 @@ diff -urN openssl-0.9.8a/Makefile openssl-0.9.8a.new/Makefile
  
  install_sw:
        @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
-diff -urN openssl-0.9.8b/Makefile.org openssl-0.9.8b.new/Makefile.org
---- openssl-0.9.8b/Makefile.org        2006-09-01 19:34:51.000000000 +0200
-+++ openssl-0.9.8b.new/Makefile.org    2006-09-01 19:36:38.000000000 +0200
-@@ -473,7 +473,7 @@
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -615,7 +615,7 @@ dist:   
  dist_pem_h:
        (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)