X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/829866eaed8f1bdc07c6800146f8556a7a0da213..e7c5856bc82065b73dc6ecc4d7f4dacf5542878a:/package/openssl/Makefile diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 4b7995af4..86c584b7e 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -9,42 +9,42 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl -PKG_VERSION:=0.9.8b -PKG_RELEASE:=1 +PKG_VERSION:=0.9.8e +PKG_RELEASE:=3 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 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:=12cedbeb6813a0d7919dbf1f82134b86 -PKG_CAT:=zcat - -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_MD5SUM:=3a7ff24f6ea5cd711984722ad654b927 include $(INCLUDE_DIR)/package.mk 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 +define Package/openssl/Default/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. +endef + define Package/libopenssl - $(call Package/openssl/Default) +$(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 + +define Package/libopenssl/description +$(call Package/openssl/Default/description) + This package contains the OpenSSL shared libraries, needed by other + programs. endef define Package/openssl-util @@ -53,27 +53,31 @@ define Package/openssl-util 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 Package/openssl-util/description +$(call Package/openssl/Default/description) + This package contains the OpenSSL command-line utility. +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 +OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-threads zlib-dynamic \ + no-engines no-sse2 no-perlasm + 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); \ ./Configure linux-openwrt \ --prefix=/usr \ --openssldir=/etc/ssl \ - -I$(STAGING_DIR)/usr/include \ - -L$(STAGING_DIR)/usr/lib -ldl \ + $(TARGET_CPPFLAGS) \ + $(TARGET_LDFLAGS) -ldl \ -DOPENSSL_SMALL_FOOTPRINT \ $(OPENSSL_NO_CIPHERS) \ $(OPENSSL_OPTIONS) \ @@ -83,52 +87,51 @@ endef define Build/Compile rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ + $(MAKE) -C $(PKG_BUILD_DIR) \ MAKEDEPPROG="$(TARGET_CROSS)gcc" \ + OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ depend - $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ + $(MAKE) -C $(PKG_BUILD_DIR) \ 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.*.*.* - $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ + $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ - CCOPTS="$(TARGET_CFLAGS) -fomit-frame-pointer" \ + OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ do_linux-shared - $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ + $(MAKE) -C $(PKG_BUILD_DIR) \ 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*} + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/openssl $(1)/usr/include/ + mkdir -p $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc $(1)/usr/lib/pkgconfig/ + $(SED) 's,$(TARGET_LDFLAGS),,g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc endef define Package/libopenssl/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(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 + $(INSTALL_DIR) $(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 + $(INSTALL_DIR) $(1)/etc/ssl/certs + $(INSTALL_DIR) $(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/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/ endef $(eval $(call BuildPackage,libopenssl))