sync openssl in wr and ng, update to 0.9.8d for security fixes

[openwrt.git] / package / openssl / Makefile

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index afa5f30..54b4aac 100644 (file)
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -1,81 +1,134 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#

 # $Id$
 
 include $(TOPDIR)/rules.mk
 
 # $Id$
 
 include $(TOPDIR)/rules.mk
 

-PKG_NAME := openssl
-PKG_VERSION := 0.9.7f
-PKG_RELEASE := 1
-PKG_MD5SUM := b2d37d7eb8a5a5040d834105d5ae1a50
+PKG_NAME:=openssl
+PKG_VERSION:=0.9.8d
+PKG_RELEASE:=1

 
 

-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:=$(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:=8ed1853538e1d05a1f5ada61ebf8bffa
+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

 
 

-.NOTPARALLEL:
+include $(INCLUDE_DIR)/package.mk

 
 

-$(DL_DIR)/$(PKG_SOURCE_FILE):
-       mkdir -p $(DL_DIR)
-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
+define Package/openssl/Default
+  TITLE:=Open source SSL toolkit
+  DESCRIPTION:=\
+       The OpenSSL Project is a collaborative effort to develop a robust, \\\
+       commercial-grade, full-featured, and Open Source toolkit implementing the \\\
+       Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) \\\
+       protocols as well as a full-strength general purpose cryptography library.
+  URL:=http://www.openssl.org/
+endef

 
 

-$(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
+define Package/libopenssl
+  $(call Package/openssl/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+zlib
+  TITLE+= (libraries)
+  DESCRIPTION+=\\\
+       \\\
+       This package contains the OpenSSL shared libraries, needed by other \\\
+       programs.
+endef

 
 

-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
+define Package/openssl-util
+  $(call Package/openssl/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libopenssl
+  TITLE+= (utility)
+  DESCRIPTION+=\\\
+       \\\
+       This package contains the OpenSSL command-line utility.
+endef
+
+define Package/openssl-util/conffiles
+/etc/ssl/openssl.cnf
+endef
+
+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
+
+define Build/Configure

        (cd $(PKG_BUILD_DIR); \
        (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
-
-$(PKG_BUILD_DIR)/apps/openssl: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) -j1 CC=$(TARGET_CC) -C $(PKG_BUILD_DIR) all build-shared
+               ./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) \
+                       $(OPENSSL_OPTIONS) \
+       )
+endef
+
+define Build/Compile
+       rm -rf $(PKG_INSTALL_DIR)
+       mkdir -p $(PKG_INSTALL_DIR)
+       $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
+               MAKEDEPPROG="$(TARGET_CROSS)gcc" \
+               OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
+               depend
+       $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
+               CC="$(TARGET_CC)" \
+               AR="$(TARGET_CROSS)ar r" \
+               RANLIB="$(TARGET_CROSS)ranlib" \
+               OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
+               all build-shared

        # Work around openssl build bug to link libssl.so with libcrypto.so.
        -rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
        # Work around openssl build bug to link libssl.so with libcrypto.so.
        -rm $(PKG_BUILD_DIR)/libssl.so.*.*.*

-       $(MAKE) -j1 CC=$(TARGET_CC) -C $(PKG_BUILD_DIR) do_linux-shared
-
-$(STAGING_DIR)/lib/libssl.so: $(PKG_BUILD_DIR)/apps/openssl
-       $(MAKE) -j1 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)
-
-$(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_STATE_DIR)/info/openssl.list: $(PKG_IPK)
-       $(IPKG) install $(PKG_IPK)
-
-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
-
-clean:
-       rm -rf $(PKG_BUILD_DIR)
-       rm -f $(STAGING_DIR)/lib/libssl*
-       rm -f $(STAGING_DIR)/lib/libcrypto*
-       rm -f $(PKG_IPK)
+       $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
+               CC="$(TARGET_CC)" \
+               OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
+               do_linux-shared
+       $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
+               INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
+               install
+endef
+
+define Build/InstallDev
+       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/
+endef
+
+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
+
+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

 
 

+$(eval $(call BuildPackage,libopenssl))
+$(eval $(call BuildPackage,openssl-util))