brcm47xx: update bcma and ssb to master-2011-07-21

[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 07c8e57..4ae35b1 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 -burN openssl-0.9.8j/Makefile openssl-0.9.8j.patched/Makefile
---- openssl-0.9.8j/Makefile    2009-01-07 12:57:01.000000000 +0100
-+++ openssl-0.9.8j.patched/Makefile    2009-01-17 14:16:50.279667198 +0100
-@@ -133,7 +133,7 @@
- 
- BASEADDR=0xFB00000
- 
--DIRS=   crypto fips ssl engines apps test tools
-+DIRS=   crypto fips ssl engines apps tools
+--- a/Makefile
++++ b/Makefile
+@@ -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
  
  SHLIBDIRS= crypto ssl
  

- # dirs in crypto to build
-@@ -150,7 +150,7 @@
+@@ -129,7 +129,7 @@ SDIRS=  \

  
  # tests to perform.  "alltests" is a special word indicating that all tests
  # should be performed.
 -TESTS = alltests
  
  # tests to perform.  "alltests" is a special word indicating that all tests
  # should be performed.
 -TESTS = alltests

-+TESTS = 
++TESTS =

  
  MAKEFILE= Makefile
  
  
  MAKEFILE= Makefile
  

-@@ -162,7 +162,7 @@
+@@ -143,7 +143,7 @@ SHELL=/bin/sh

  
  TOP=    .
  ONEDIRS=out tmp
  
  TOP=    .
  ONEDIRS=out tmp


@@ -28,16 +27,16 @@ diff -burN openssl-0.9.8j/Makefile openssl-0.9.8j.patched/Makefile
  WDIRS=  windows
  LIBS=   libcrypto.a libssl.a
  SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
  WDIRS=  windows
  LIBS=   libcrypto.a libssl.a
  SHARED_CRYPTO=libcrypto$(SHLIB_EXT)

-@@ -321,7 +321,7 @@
-       ../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
  
  
  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

  
  

-@@ -610,7 +610,7 @@
+@@ -494,7 +494,7 @@ dist:

  dist_pem_h:
        (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
  
  dist_pem_h:
        (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
  


@@ -46,10 +45,9 @@ diff -burN openssl-0.9.8j/Makefile openssl-0.9.8j.patched/Makefile
  
  install_sw:
        @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
  
  install_sw:
        @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \

-diff -burN openssl-0.9.8j/Makefile.org openssl-0.9.8j.patched/Makefile.org
---- openssl-0.9.8j/Makefile.org        2008-12-30 14:26:26.000000000 +0100
-+++ openssl-0.9.8j.patched/Makefile.org        2009-01-17 14:14:18.874409981 +0100
-@@ -608,7 +608,7 @@
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -492,7 +492,7 @@ dist:

  dist_pem_h:
        (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
  
  dist_pem_h:
        (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)