openssl: update to 1.0.0e (patch by tripolar)

[openwrt.git] / package / openssl / Makefile

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 2d2a940..e345009 100644 (file)
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -8,18 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssl
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssl

-PKG_VERSION:=0.9.8l
-PKG_RELEASE:=2
+PKG_VERSION:=1.0.0e
+PKG_RELEASE:=1

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openssl.org/source/ \
        ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \
        ftp://ftp.webmonster.de/pub/openssl/source/ \
        ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openssl.org/source/ \
        ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \
        ftp://ftp.webmonster.de/pub/openssl/source/ \
        ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/

-PKG_MD5SUM:=05a0ece1372392a2cf310ebb96333025
+PKG_MD5SUM:=7040b89c4c58c7a1016c0dfa6e821c86

 
 

-PKG_BUILD_DEPENDS := ocf-crypto-headers
-PKG_CONFIG_DEPENDS := CONFIG_OPENSSL_ENGINE
+PKG_BUILD_DEPENDS:=ocf-crypto-headers
+PKG_CONFIG_DEPENDS:=CONFIG_OPENSSL_ENGINE

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -33,10 +33,10 @@ source "$(SOURCE)/Config.in"
 endef
 
 define Package/openssl/Default/description
 endef
 
 define Package/openssl/Default/description

- The OpenSSL Project is a collaborative effort to develop a robust,
- commercial-grade, full-featured, and Open Source toolkit implementing the
- Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
- protocols as well as a full-strength general purpose cryptography library.
+The OpenSSL Project is a collaborative effort to develop a robust,
+commercial-grade, full-featured, and Open Source toolkit implementing the Secure
+Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols as well
+as a full-strength general purpose cryptography library.

 endef
 
 define Package/libopenssl
 endef
 
 define Package/libopenssl


@@ -46,12 +46,12 @@ $(call Package/openssl/Default)
   CATEGORY:=Libraries
   DEPENDS:=+zlib
   TITLE+= (libraries)
   CATEGORY:=Libraries
   DEPENDS:=+zlib
   TITLE+= (libraries)

+  MENU:=1

 endef
 
 define Package/libopenssl/description
 $(call Package/openssl/Default/description)
 endef
 
 define Package/libopenssl/description
 $(call Package/openssl/Default/description)

- This package contains the OpenSSL shared libraries, needed by other
- programs.
+This package contains the OpenSSL shared libraries, needed by other programs.

 endef
 
 define Package/openssl-util
 endef
 
 define Package/openssl-util


@@ -68,7 +68,7 @@ endef
 
 define Package/openssl-util/description
 $(call Package/openssl/Default/description)
 
 define Package/openssl-util/description
 $(call Package/openssl/Default/description)

- This package contains the OpenSSL command-line utility.
+This package contains the OpenSSL command-line utility.

 endef
 
 
 endef
 
 


@@ -77,16 +77,12 @@ OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-smime \
 OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic no-sse2
 
 ifdef CONFIG_OPENSSL_ENGINE
 OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic no-sse2
 
 ifdef CONFIG_OPENSSL_ENGINE

-  OPENSSL_OPTIONS += --with-cryptodev
+  OPENSSL_OPTIONS += -DHAVE_CRYPTODEV

 else
   OPENSSL_OPTIONS += no-engines
 endif
 
 else
   OPENSSL_OPTIONS += no-engines
 endif
 

-ifdef CONFIG_arm
-OPENSSL_MAKEFLAGS := AES_ASM_OBJ="aes-armv4.o aes_cbc.o"
-else

 OPENSSL_OPTIONS += no-perlasm
 OPENSSL_OPTIONS += no-perlasm

-endif

 
 define Build/Configure
        (cd $(PKG_BUILD_DIR); \
 
 define Build/Configure
        (cd $(PKG_BUILD_DIR); \


@@ -112,13 +108,20 @@ define Build/Compile
                OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
                $(OPENSSL_MAKEFLAGS) \
                depend
                OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
                $(OPENSSL_MAKEFLAGS) \
                depend

+       $(_SINGLE)$(MAKE) -C $(PKG_BUILD_DIR) \
+               CC="$(TARGET_CC)" \
+               AR="$(TARGET_CROSS)ar r" \
+               RANLIB="$(TARGET_CROSS)ranlib" \
+               OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
+               $(OPENSSL_MAKEFLAGS) \
+               all

        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
                AR="$(TARGET_CROSS)ar r" \
                RANLIB="$(TARGET_CROSS)ranlib" \
                OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
                $(OPENSSL_MAKEFLAGS) \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
                AR="$(TARGET_CROSS)ar r" \
                RANLIB="$(TARGET_CROSS)ranlib" \
                OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
                $(OPENSSL_MAKEFLAGS) \

-               all build-shared
+               build-shared

        # Work around openssl build bug to link libssl.so with libcrypto.so.
        -rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
        $(MAKE) -C $(PKG_BUILD_DIR) \
        # Work around openssl build bug to link libssl.so with libcrypto.so.
        -rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
        $(MAKE) -C $(PKG_BUILD_DIR) \


@@ -133,11 +136,11 @@ define Build/Compile
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       mkdir -p $(1)/usr/include
+       $(INSTALL_DIR) $(1)/usr/include

        $(CP) $(PKG_INSTALL_DIR)/usr/include/openssl $(1)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/openssl $(1)/usr/include/

-       mkdir -p $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib/

        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(1)/usr/lib/

-       mkdir -p $(1)/usr/lib/pkgconfig
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig

        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc $(1)/usr/lib/pkgconfig/
        $(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc
 endef
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc $(1)/usr/lib/pkgconfig/
        $(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc
 endef