sync openssl in wr and ng, update to 0.9.8d for security fixes

[openwrt.git] / package / openssl / Makefile

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 4b7995a..54b4aac 100644 (file)
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -9,18 +9,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssl
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssl

-PKG_VERSION:=0.9.8b
+PKG_VERSION:=0.9.8d

 PKG_RELEASE:=1
 
 PKG_RELEASE:=1
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 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:=12cedbeb6813a0d7919dbf1f82134b86
+PKG_MD5SUM:=8ed1853538e1d05a1f5ada61ebf8bffa

 PKG_CAT:=zcat
 
 PKG_CAT:=zcat
 

+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk


@@ -66,8 +66,6 @@ OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-rmd160 no-aes192
 OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dynamic no-engines
 
 define Build/Configure
 OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dynamic no-engines
 
 define Build/Configure

-       $(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' $(PKG_BUILD_DIR)/Configure
-       $(SED) s/OPENWRT_OPTIMIZATION_FLAGS/$(BR2_TARGET_OPTIMIZATION)/g $(PKG_BUILD_DIR)/Configure

        (cd $(PKG_BUILD_DIR); \
                ./Configure linux-openwrt \
                        --prefix=/usr \
        (cd $(PKG_BUILD_DIR); \
                ./Configure linux-openwrt \
                        --prefix=/usr \


@@ -85,17 +83,19 @@ define Build/Compile
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
                MAKEDEPPROG="$(TARGET_CROSS)gcc" \
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
                MAKEDEPPROG="$(TARGET_CROSS)gcc" \

+               OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \

                depend
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
                CC="$(TARGET_CC)" \
                AR="$(TARGET_CROSS)ar r" \
                RANLIB="$(TARGET_CROSS)ranlib" \
                depend
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
                CC="$(TARGET_CC)" \
                AR="$(TARGET_CROSS)ar r" \
                RANLIB="$(TARGET_CROSS)ranlib" \

+               OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \

                all 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) -j1 \
                CC="$(TARGET_CC)" \
                all 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) -j1 \
                CC="$(TARGET_CC)" \

-               CCOPTS="$(TARGET_CFLAGS) -fomit-frame-pointer" \
+               OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \

                do_linux-shared
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
                INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
                do_linux-shared
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
                INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \


@@ -110,8 +110,7 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
 endef
 
 define Build/UninstallDev

-       rm -rf \
-               $(STAGING_DIR)/usr/include/openssl \
+       rm -rf  $(STAGING_DIR)/usr/include/openssl \

                $(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*}
 endef
 
                $(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*}
 endef