remove one slash in PKG_SOURCE_URL

[openwrt.git] / package / openssl / Makefile

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index bc8b43c..4028b0e 100644 (file)
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssl
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssl

-PKG_VERSION:=0.9.7i
-PKG_RELEASE:=1
-PKG_MD5SUM:=f69d82b206ff8bff9d0e721f97380b9e
+PKG_VERSION:=0.9.8a
+PKG_RELEASE:=3
+PKG_MD5SUM:=1d16c727c10185e4d694f87f5e424ee1

 
 PKG_SOURCE_URL:=http://www.openssl.org/source/ \
        ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \
 
 PKG_SOURCE_URL:=http://www.openssl.org/source/ \
        ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \


@@ -17,7 +17,8 @@ PKG_CAT:=zcat
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 

-OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc2 no-rc5
+OPENSSL_NO_CIPHERS:= no-deprecated no-idea no-md2 no-mdc2 no-rc2 no-rc5 no-sha0 no-sha256 no-sha512 no-dsa no-rmd160 no-aes192 no-cast
+OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dynamic no-engines

 
 include $(TOPDIR)/package/rules.mk
 
 
 include $(TOPDIR)/package/rules.mk
 


@@ -26,15 +27,17 @@ $(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,$(PKG_VERSION)-$(PKG_RELEAS
 
 $(PKG_BUILD_DIR)/.configured:
        $(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' $(PKG_BUILD_DIR)/Configure
 
 $(PKG_BUILD_DIR)/.configured:
        $(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); \
                PATH=$(TARGET_PATH) \
        (cd $(PKG_BUILD_DIR); \
                PATH=$(TARGET_PATH) \

-               ./Configure linux-$(ARCH) \
+               ./Configure linux-openwrt \

                  --prefix=/usr \
                  --openssldir=/etc/ssl \
                  -I$(STAGING_DIR)/usr/include \
                  -L$(STAGING_DIR)/usr/lib -ldl \
                  --prefix=/usr \
                  --openssldir=/etc/ssl \
                  -I$(STAGING_DIR)/usr/include \
                  -L$(STAGING_DIR)/usr/lib -ldl \

+                 -DOPENSSL_SMALL_FOOTPRINT \

                  $(OPENSSL_NO_CIPHERS) \
                  $(OPENSSL_NO_CIPHERS) \

-                 shared no-asm no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dynamic \
+                 $(OPENSSL_OPTIONS) \

        )
        touch $@
 
        )
        touch $@
 


@@ -46,7 +49,6 @@ $(PKG_BUILD_DIR)/.built:
                depend
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
                CC="$(TARGET_CC)" \
                depend
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
                CC="$(TARGET_CC)" \

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

                AR="$(TARGET_CROSS)ar r" \
                RANLIB="$(TARGET_CROSS)ranlib" \
                all build-shared
                AR="$(TARGET_CROSS)ar r" \
                RANLIB="$(TARGET_CROSS)ranlib" \
                all build-shared


@@ -72,7 +74,8 @@ $(IPKG_OPENSSL_UTIL):
        install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl
        $(CP) $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(IDIR_OPENSSL_UTIL)/etc/ssl/
        install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl/certs
        install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl
        $(CP) $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(IDIR_OPENSSL_UTIL)/etc/ssl/
        install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl/certs

-       install -d -m0700 $(IDIR_OPENSSL_UTIL)/etc/ssl/private
+       install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl/private
+       chmod 0700 $(IDIR_OPENSSL_UTIL)/etc/ssl/private

        install -d -m0755 $(IDIR_OPENSSL_UTIL)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/openssl $(IDIR_OPENSSL_UTIL)/usr/bin/
        $(RSTRIP) $(IDIR_OPENSSL_UTIL)
        install -d -m0755 $(IDIR_OPENSSL_UTIL)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/openssl $(IDIR_OPENSSL_UTIL)/usr/bin/
        $(RSTRIP) $(IDIR_OPENSSL_UTIL)