Updated to latest upstream version, remove uneeded patch as it is now in dnsmasq...

[openwrt.git] / package / openssl / Makefile

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index f822e9a..0558db6 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:=2
+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/ \


@@ -28,7 +28,7 @@ $(PKG_BUILD_DIR)/.configured:
        $(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' $(PKG_BUILD_DIR)/Configure
        (cd $(PKG_BUILD_DIR); \
                PATH=$(TARGET_PATH) \
        $(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' $(PKG_BUILD_DIR)/Configure
        (cd $(PKG_BUILD_DIR); \
                PATH=$(TARGET_PATH) \

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

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


@@ -63,26 +63,27 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LIBOPENSSL):
        install -d -m0755 $(IDIR_LIBOPENSSL)/usr/lib
 
 $(IPKG_LIBOPENSSL):
        install -d -m0755 $(IDIR_LIBOPENSSL)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(IDIR_LIBOPENSSL)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(IDIR_LIBOPENSSL)/usr/lib/

        chmod 0644 $(IDIR_LIBOPENSSL)/usr/lib/*
        $(RSTRIP) $(IDIR_LIBOPENSSL)
        $(IPKG_BUILD) $(IDIR_LIBOPENSSL) $(PACKAGE_DIR)
 
 $(IPKG_OPENSSL_UTIL):
        install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl
        chmod 0644 $(IDIR_LIBOPENSSL)/usr/lib/*
        $(RSTRIP) $(IDIR_LIBOPENSSL)
        $(IPKG_BUILD) $(IDIR_LIBOPENSSL) $(PACKAGE_DIR)
 
 $(IPKG_OPENSSL_UTIL):
        install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl

-       cp -fpR $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(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/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
        install -d -m0755 $(IDIR_OPENSSL_UTIL)/usr/bin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/openssl $(IDIR_OPENSSL_UTIL)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/openssl $(IDIR_OPENSSL_UTIL)/usr/bin/

        $(RSTRIP) $(IDIR_OPENSSL_UTIL)
        $(IPKG_BUILD) $(IDIR_OPENSSL_UTIL) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libssl.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        $(RSTRIP) $(IDIR_OPENSSL_UTIL)
        $(IPKG_BUILD) $(IDIR_OPENSSL_UTIL) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libssl.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include

-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/openssl $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/openssl $(STAGING_DIR)/usr/include/

        mkdir -p $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(STAGING_DIR)/usr/lib/

        touch $@
        
 install-dev: $(STAGING_DIR)/usr/lib/libssl.so
        touch $@
        
 install-dev: $(STAGING_DIR)/usr/lib/libssl.so