X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c9bf3cc1380ca0ef5cb1cf3b08732f9276a36e78..859e8f7f7d8bfbefd610d338d16498190cd51e15:/package/openssl/Makefile

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 50e334cdf..39fe6b4c3 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -3,41 +3,62 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssl
-PKG_VERSION:=0.9.7g
+PKG_VERSION:=0.9.8b
 PKG_RELEASE:=1
-PKG_MD5SUM:=991615f73338a571b6a1be7d74906934
+PKG_MD5SUM:=12cedbeb6813a0d7919dbf1f82134b86
 
-PKG_SOURCE_URL:=http://www.openssl.org/source/
+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_CAT:=zcat
 
 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-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
 
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
 
-$(eval $(call PKG_template,LIBOPENSSL,libopenssl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/libopenssl
+SECTION:=base
+CATEGORY:=Libraries
+TITLE:=Open source SSL libraries
+DEPENDS:=+zlib
+DESCRIPTION:=Open source SSL (Secure Socket Layer) libraries
+URL:=http://www.openssl.org/
+endef
 
-.NOTPARALLEL:
+define Package/openssl-util
+$(call Package/libopenssl)
+DEPENDS:=libopenssl
+TITLE:=OpenSSL command line utilities
+DESCRIPTION:=OpenSSL command line utilities
+endef
 
-$(PKG_BUILD_DIR)/.configured:
+define Package/openssl-util/conffiles
+/etc/ssl/openssl.cnf
+endef
+
+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); \
 		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 \
+		  -DOPENSSL_SMALL_FOOTPRINT \
 		  $(OPENSSL_NO_CIPHERS) \
-		  shared no-asm no-ec no-engine no-err no-fips no-hw no-krb5 no-threads zlib-dynamic \
+		  $(OPENSSL_OPTIONS) \
 	)
-	touch $@
+endef
 
-$(PKG_BUILD_DIR)/.built:
+define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) -j1 \
@@ -45,7 +66,6 @@ $(PKG_BUILD_DIR)/.built:
 		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
@@ -58,38 +78,35 @@ $(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR) -j1 \
 		INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
 		install
-	touch $@
-
-$(IPKG_LIBOPENSSL):
-	install -d -m0755 $(IDIR_LIBOPENSSL)/usr/lib
-	cp -fp $(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)
+endef
 
-$(IPKG_OPENSSL_UTIL):
-	install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl
-	cp -fp $(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)/usr/bin
-	cp -fp $(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
+define Build/InstallDev
 	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/
-	cp -fp $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(STAGING_DIR)/usr/lib/
-	touch $@
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(STAGING_DIR)/usr/lib/
+endef
 	
-install-dev: $(STAGING_DIR)/usr/lib/libssl.so
+define Build/UninstallDev
+	rm -rf	$(STAGING_DIR)/usr/include/openssl \
+		$(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*}
+endef
+
+define Package/libopenssl/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(1)/usr/lib/
+	chmod 0644 $(1)/usr/lib/*
+endef
 
-uninstall-dev:
-	rm -rf \
-		$(STAGING_DIR)/usr/include/openssl \
-		$(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} \
+define Package/openssl-util/install
+	install -d -m0755 $(1)/etc/ssl
+	$(CP) $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(1)/etc/ssl/
+	install -d -m0755 $(1)/etc/ssl/certs
+	install -d -m0755 $(1)/etc/ssl/private
+	chmod 0700 $(1)/etc/ssl/private
+	install -d -m0755 $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/
+endef
 
-compile: install-dev
-clean: uninstall-dev
+$(eval $(call BuildPackage,libopenssl))
+$(eval $(call BuildPackage,openssl-util))