Changeset 77127f2 in freewrt for package/openssl

Timestamp:

Jan 13, 2009, 7:52:47 PM (17 years ago)

Author:

Dirk Nehring <dnehring@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

ca47de2

Parents:

51cbc6d

Message:

Fixes build, that fips stuff makes me a little bit nervous.

git-svn-id: ​svn://www.freewrt.org/branches/freewrt_1_0@3832 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/openssl

Files:

• Makefile (modified) (1 diff)
• patches/140-makefile-dirs.patch (modified) (1 diff)
• patches/160-disable_doc_tests.patch (modified) (8 diffs)

package/openssl/Makefile

@@ -18 +18 @@
 PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-OPENSSL_OPTIONS = shared no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dynamic no-engines
+OPENSSL_OPTIONS = shared no-ec no-err no-hw no-krb5 no-threads zlib-dynamic no-engines
 
 ifeq ($(FWRT_PACKAGE_LIBOPENSSL_CUSTOM_FEATURES),y)

package/openssl/patches/140-makefile-dirs.patch

@@ -1 @@
---- openssl-0.9.8a/Makefile.org 2006-02-21 20:57:45.000000000 -0800
-+++ openssl-0.9.8a-new/Makefile.org     2006-02-21 21:37:11.000000000 -0800
-@@ -100,7 +100,7 @@
- KRB5_INCLUDES=
- LIBKRB5=
+--- openssl-0.9.8j/Makefile.org.orig    2009-01-13 19:10:48.000000000 +0100
++++ openssl-0.9.8j/Makefile.org 2009-01-13 19:11:14.000000000 +0100
+@@ -131,7 +131,7 @@
  
--DIRS=   crypto ssl engines apps test tools
-+DIRS=   crypto ssl apps
- SHLIBDIRS= crypto ssl
+ BASEADDR=
+ 
+-DIRS=   crypto fips ssl engines apps test tools
++DIRS=   crypto fips ssl apps
+ SHLIBDIRS= crypto ssl fips
  
  # dirs in crypto to build

package/openssl/patches/160-disable_doc_tests.patch

@@ -1 @@
-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=
+diff -Nur openssl-0.9.8j.orig/Makefile openssl-0.9.8j/Makefile
+--- openssl-0.9.8j.orig/Makefile        2009-01-07 12:57:01.000000000 +0100
++++ openssl-0.9.8j/Makefile     2009-01-13 19:14:05.000000000 +0100
+@@ -133,7 +133,7 @@
  
--DIRS=   crypto ssl engines apps test tools
-+DIRS=   crypto ssl engines apps tools
+ BASEADDR=0xFB00000
+ 
+-DIRS=   crypto fips ssl engines apps test tools
++DIRS=   crypto fips ssl engines apps tools
  SHLIBDIRS= crypto ssl
  
  # dirs in crypto to build
-@@ -119,7 +119,7 @@
+@@ -150,7 +150,7 @@
  
  # tests to perform.  "alltests" is a special word indicating that all tests
@@ -20 +20 @@
  MAKEFILE= Makefile
  
-@@ -131,7 +131,7 @@
+@@ -162,7 +162,7 @@
  
  TOP=    .
@@ -29 +29 @@
  LIBS=   libcrypto.a libssl.a
  SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
-@@ -204,7 +204,7 @@
-        @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
+@@ -321,7 +321,7 @@
+        ../crypto/uid.o
  
  sub_all: build_all
@@ -36 +36 @@
 +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 @@
+@@ -610,7 +610,7 @@
  dist_pem_h:
         (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
@@ -47 +47 @@
  install_sw:
         @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
-diff -urN openssl-0.9.8a/Makefile.org openssl-0.9.8a.new/Makefile.org
---- openssl-0.9.8a/Makefile.org 2006-03-29 14:59:41.941396896 +0200
-+++ openssl-0.9.8a.new/Makefile.org     2006-03-29 15:29:46.126119128 +0200
-@@ -117,7 +117,7 @@
+diff -Nur openssl-0.9.8j.orig/Makefile.org openssl-0.9.8j/Makefile.org
+--- openssl-0.9.8j.orig/Makefile.org    2008-12-30 14:26:26.000000000 +0100
++++ openssl-0.9.8j/Makefile.org 2009-01-13 19:13:24.000000000 +0100
+@@ -148,7 +148,7 @@
  
  # tests to perform.  "alltests" is a special word indicating that all tests
@@ -59 +59 @@
  MAKEFILE= Makefile
  
-@@ -129,7 +129,7 @@
+@@ -160,7 +160,7 @@
  
  TOP=    .
@@ -68 +68 @@
  LIBS=   libcrypto.a libssl.a
  SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
-@@ -202,7 +202,7 @@
-        @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
+@@ -319,7 +319,7 @@
+        ../crypto/uid.o
  
  sub_all: build_all
@@ -75 +75 @@
 +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
  
-@@ -219,7 +219,7 @@
+@@ -344,7 +344,7 @@
  build_tools:
-        @dir=tools; target=all; $(BUILD_CMD)
+        @dir=tools; target=all; $(BUILD_ONE_CMD)
  
 -all_testapps: build_libs build_testapps
 +all_testapps: build_libs
  build_testapps:
-        @dir=crypto; target=testapps; $(BUILD_CMD)
+        @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
  
-@@ -452,7 +452,7 @@
+@@ -608,7 +608,7 @@
  dist_pem_h:
         (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)