X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ec8fa5540e88f076526bfaa388c8a4d406e37bff..fca426b4f71fc1dc1bb22d1d1b16de19e01a093e:/openwrt/package/openssl/Makefile?ds=inline

diff --git a/openwrt/package/openssl/Makefile b/openwrt/package/openssl/Makefile
index 8b6b83a79..0558db61d 100644
--- a/openwrt/package/openssl/Makefile
+++ b/openwrt/package/openssl/Makefile
@@ -2,78 +2,96 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME := openssl
-PKG_VERSION := 0.9.7e
-PKG_RELEASE := 1
-PKG_MD5SUM := a8777164bca38d84e5eb2b1535223474
+PKG_NAME:=openssl
+PKG_VERSION:=0.9.8a
+PKG_RELEASE:=2
+PKG_MD5SUM:=1d16c727c10185e4d694f87f5e424ee1
 
-PKG_SOURCE_SITE := http://www.openssl.org/source
-PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_CAT := zcat
-PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
-PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+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
 
-OPENSSL_NO_CIPHERS:=no-idea no-mdc2 no-rc5 no-rc2 no-md2 no-md4
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-$(DL_DIR)/$(PKG_SOURCE_FILE):
-	mkdir -p $(DL_DIR)
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
+OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc2 no-rc5
 
-$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE)
-	mkdir -p $(TOOL_BUILD_DIR)
-	$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(PATCH) $(PKG_BUILD_DIR) ./patches
-	$(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' \
-		$(PKG_BUILD_DIR)/Configure
-	touch $(PKG_BUILD_DIR)/.patched
+include $(TOPDIR)/package/rules.mk
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
+$(eval $(call PKG_template,LIBOPENSSL,libopenssl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured:
+	$(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' $(PKG_BUILD_DIR)/Configure
 	(cd $(PKG_BUILD_DIR); \
-		CFLAGS="-DOPENSSL_NO_KRB5 -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5" \
-        PATH=$(TARGET_PATH) ./Configure linux-$(ARCH) --prefix=/ \
-		--openssldir=/usr/lib/ssl -L$(STAGING_DIR)/lib -ldl \
-		-I$(STAGING_DIR)/include $(OPENSSL_NO_CIPHERS) \
-		shared no-krb5 no-ec no-engine zlib-dynamic no-hw no-threads )
-	touch $(PKG_BUILD_DIR)/.configured
+		PATH=$(TARGET_PATH) \
+		./Configure linux-generic32 \
+		  --prefix=/usr \
+		  --openssldir=/etc/ssl \
+		  -I$(STAGING_DIR)/usr/include \
+		  -L$(STAGING_DIR)/usr/lib -ldl \
+		  $(OPENSSL_NO_CIPHERS) \
+		  shared no-asm no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dynamic \
+	)
+	touch $@
 
-$(PKG_BUILD_DIR)/apps/openssl: $(PKG_BUILD_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(PKG_BUILD_DIR) all build-shared
+$(PKG_BUILD_DIR)/.built:
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) -j1 \
+		MAKEDEPPROG="$(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
 	# Work around openssl build bug to link libssl.so with libcrypto.so.
 	-rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
-	$(MAKE) CC=$(TARGET_CC) -C $(PKG_BUILD_DIR) do_linux-shared
-
-$(STAGING_DIR)/lib/libssl.so: $(PKG_BUILD_DIR)/apps/openssl
-	$(MAKE) CC=$(TARGET_CC) INSTALL_PREFIX=$(STAGING_DIR) -C $(PKG_BUILD_DIR) install_sw
-	cp -fa $(PKG_BUILD_DIR)/libcrypto.so* $(STAGING_DIR)/lib/
-	chmod a-x $(STAGING_DIR)/lib/libcrypto.so.0.9.7
-	(cd $(STAGING_DIR)/lib; ln -fs libcrypto.so.0.9.7 libcrypto.so)
-	(cd $(STAGING_DIR)/lib; ln -fs libcrypto.so.0.9.7 libcrypto.so.0)
-	cp -fa $(PKG_BUILD_DIR)/libssl.so* $(STAGING_DIR)/lib/
-	chmod a-x $(STAGING_DIR)/lib/libssl.so.0.9.7
-	(cd $(STAGING_DIR)/lib; ln -fs libssl.so.0.9.7 libssl.so)
-	(cd $(STAGING_DIR)/lib; ln -fs libssl.so.0.9.7 libssl.so.0)
+	$(MAKE) -C $(PKG_BUILD_DIR) -j1 \
+		CC=$(TARGET_CC) \
+		CCOPTS="$(TARGET_CFLAGS) -fomit-frame-pointer" \
+		do_linux-shared
+	$(MAKE) -C $(PKG_BUILD_DIR) -j1 \
+		INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
+		install
+	touch $@
 
-$(PKG_IPK): $(STAGING_DIR)/lib/libssl.so
-	mkdir -p $(PACKAGE_DIR)
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)/usr/lib
-	cp -a $(STAGING_DIR)/lib/libssl.so* $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)/usr/lib
-	cp -a $(STAGING_DIR)/lib/libcrypto.so* $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)/usr/lib
-	$(STRIP) $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)/usr/lib/*
-	$(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME) $(PACKAGE_DIR)
+$(IPKG_LIBOPENSSL):
+	install -d -m0755 $(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_STATE_DIR)/info/openssl.list: $(PKG_IPK)
-	$(IPKG) install $(PKG_IPK)
+$(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/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)
+	$(IPKG_BUILD) $(IDIR_OPENSSL_UTIL) $(PACKAGE_DIR)
 
-source: $(DL_DIR)/$(PKG_SOURCE_FILE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(STAGING_DIR)/lib/libssl.so $(PKG_IPK)
-install: $(PKG_ZLIB) $(IPKG_STATE_DIR)/info/openssl.list
+$(STAGING_DIR)/usr/lib/libssl.so: $(PKG_BUILD_DIR)/.built
+	mkdir -p $(STAGING_DIR)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/openssl $(STAGING_DIR)/usr/include/
+	mkdir -p $(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
 
-clean:
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(STAGING_DIR)/lib/libssl*
-	rm -f $(STAGING_DIR)/lib/libcrypto*
-	rm -f $(PKG_IPK)
+uninstall-dev:
+	rm -rf \
+		$(STAGING_DIR)/usr/include/openssl \
+		$(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} \
 
+compile-targets: install-dev
+clean-targets: uninstall-dev