X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/fa7fcec9cfd77981b585ef9cf1328bbf0620dc62..4a3137abd7b3cb269885ab694a0b11a4e84bb98d:/package/openssl/Makefile?ds=sidebyside

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 555099bd0..2937368b1 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -9,15 +9,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssl
-PKG_VERSION:=0.9.8e
-PKG_RELEASE:=3
+PKG_VERSION:=0.9.8h
+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_MD5SUM:=3a7ff24f6ea5cd711984722ad654b927
+PKG_MD5SUM:=7d3d41dafc76cf2fcb5559963b5783b3
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -67,8 +67,13 @@ endef
 
 OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc2 no-rc5 no-sha0 no-smime \
 					no-rmd160 no-aes192 no-ripemd no-camellia no-ans1 no-krb5
+ifeq ($(BOARD),ixp4xx)
+OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-threads zlib-dynamic \
+					no-sse2 no-perlasm --with-cryptodev
+else
 OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-threads zlib-dynamic \
 					no-engines no-sse2 no-perlasm
+endif
 
 
 define Build/Configure
@@ -118,12 +123,6 @@ define Build/InstallDev
 	$(SED) 's,$(TARGET_LDFLAGS),,g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc
 endef
 
-define Build/UninstallDev
-	rm -rf	$(1)/usr/include/openssl \
-		$(1)/usr/lib/lib{crypto,ssl}.{a,so*} \
-		$(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc
-endef
-
 define Package/libopenssl/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(1)/usr/lib/
@@ -137,7 +136,7 @@ define Package/openssl-util/install
 	$(INSTALL_DIR) $(1)/etc/ssl/private
 	chmod 0700 $(1)/etc/ssl/private
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,libopenssl))