From 27b76ab0671089c47506615a796a261e993896a7 Mon Sep 17 00:00:00 2001 From: James <> Date: Sun, 17 Mar 2013 12:16:37 +0000 Subject: fish --- package/libs/openssl/.svn/entries | 99 ++++++ .../libs/openssl/.svn/prop-base/Makefile.svn-base | 9 + .../libs/openssl/.svn/text-base/Config.in.svn-base | 13 + .../libs/openssl/.svn/text-base/Makefile.svn-base | 180 +++++++++++ package/libs/openssl/Config.in | 13 + package/libs/openssl/Makefile | 180 +++++++++++ package/libs/openssl/patches/.svn/entries | 334 +++++++++++++++++++++ .../prop-base/110-optimize-for-size.patch.svn-base | 5 + .../.svn/prop-base/130-perl-path.patch.svn-base | 5 + .../prop-base/140-makefile-dirs.patch.svn-base | 5 + .../.svn/prop-base/150-no_engines.patch.svn-base | 5 + .../prop-base/160-disable_doc_tests.patch.svn-base | 5 + .../.svn/prop-base/170-bash_path.patch.svn-base | 5 + .../text-base/110-optimize-for-size.patch.svn-base | 13 + .../text-base/120-cisco-dtls-fix.patch.svn-base | 31 ++ .../.svn/text-base/130-perl-path.patch.svn-base | 64 ++++ .../text-base/140-makefile-dirs.patch.svn-base | 11 + .../.svn/text-base/150-no_engines.patch.svn-base | 81 +++++ .../text-base/160-disable_doc_tests.patch.svn-base | 58 ++++ .../.svn/text-base/170-bash_path.patch.svn-base | 8 + .../text-base/180-fix_link_segfault.patch.svn-base | 18 ++ .../190-remove_timestamp_check.patch.svn-base | 23 ++ .../openssl/patches/110-optimize-for-size.patch | 13 + .../libs/openssl/patches/120-cisco-dtls-fix.patch | 31 ++ package/libs/openssl/patches/130-perl-path.patch | 64 ++++ .../libs/openssl/patches/140-makefile-dirs.patch | 11 + package/libs/openssl/patches/150-no_engines.patch | 81 +++++ .../openssl/patches/160-disable_doc_tests.patch | 58 ++++ package/libs/openssl/patches/170-bash_path.patch | 8 + .../openssl/patches/180-fix_link_segfault.patch | 18 ++ .../patches/190-remove_timestamp_check.patch | 23 ++ 31 files changed, 1472 insertions(+) create mode 100644 package/libs/openssl/.svn/entries create mode 100644 package/libs/openssl/.svn/prop-base/Makefile.svn-base create mode 100644 package/libs/openssl/.svn/text-base/Config.in.svn-base create mode 100644 package/libs/openssl/.svn/text-base/Makefile.svn-base create mode 100644 package/libs/openssl/Config.in create mode 100644 package/libs/openssl/Makefile create mode 100644 package/libs/openssl/patches/.svn/entries create mode 100644 package/libs/openssl/patches/.svn/prop-base/110-optimize-for-size.patch.svn-base create mode 100644 package/libs/openssl/patches/.svn/prop-base/130-perl-path.patch.svn-base create mode 100644 package/libs/openssl/patches/.svn/prop-base/140-makefile-dirs.patch.svn-base create mode 100644 package/libs/openssl/patches/.svn/prop-base/150-no_engines.patch.svn-base create mode 100644 package/libs/openssl/patches/.svn/prop-base/160-disable_doc_tests.patch.svn-base create mode 100644 package/libs/openssl/patches/.svn/prop-base/170-bash_path.patch.svn-base create mode 100644 package/libs/openssl/patches/.svn/text-base/110-optimize-for-size.patch.svn-base create mode 100644 package/libs/openssl/patches/.svn/text-base/120-cisco-dtls-fix.patch.svn-base create mode 100644 package/libs/openssl/patches/.svn/text-base/130-perl-path.patch.svn-base create mode 100644 package/libs/openssl/patches/.svn/text-base/140-makefile-dirs.patch.svn-base create mode 100644 package/libs/openssl/patches/.svn/text-base/150-no_engines.patch.svn-base create mode 100644 package/libs/openssl/patches/.svn/text-base/160-disable_doc_tests.patch.svn-base create mode 100644 package/libs/openssl/patches/.svn/text-base/170-bash_path.patch.svn-base create mode 100644 package/libs/openssl/patches/.svn/text-base/180-fix_link_segfault.patch.svn-base create mode 100644 package/libs/openssl/patches/.svn/text-base/190-remove_timestamp_check.patch.svn-base create mode 100644 package/libs/openssl/patches/110-optimize-for-size.patch create mode 100644 package/libs/openssl/patches/120-cisco-dtls-fix.patch create mode 100644 package/libs/openssl/patches/130-perl-path.patch create mode 100644 package/libs/openssl/patches/140-makefile-dirs.patch create mode 100644 package/libs/openssl/patches/150-no_engines.patch create mode 100644 package/libs/openssl/patches/160-disable_doc_tests.patch create mode 100644 package/libs/openssl/patches/170-bash_path.patch create mode 100644 package/libs/openssl/patches/180-fix_link_segfault.patch create mode 100644 package/libs/openssl/patches/190-remove_timestamp_check.patch (limited to 'package/libs/openssl') diff --git a/package/libs/openssl/.svn/entries b/package/libs/openssl/.svn/entries new file mode 100644 index 0000000..cd69627 --- /dev/null +++ b/package/libs/openssl/.svn/entries @@ -0,0 +1,99 @@ +10 + +dir +36060 +svn://svn.openwrt.org/openwrt/trunk/package/libs/openssl +svn://svn.openwrt.org/openwrt + + + +2013-02-19T17:22:51.449811Z +35684 +florian + + + + + + + + + + + + + + +3c298f89-4303-0410-b956-a3cf2f4a3e73 + +patches +dir + +Config.in +file + + + + +2013-03-17T12:13:08.000000Z +db03c18ff9ebacf4f2f605dd2407a85e +2012-10-08T11:24:12.513797Z +33657 +nbd + + + + + + + + + + + + + + + + + + + + + +241 + +Makefile +file + + + + +2013-03-17T12:13:08.000000Z +f851293b095726aade36464bc97d77cd +2013-02-14T13:00:03.576038Z +35600 +florian +has-props + + + + + + + + + + + + + + + + + + + + +5133 + diff --git a/package/libs/openssl/.svn/prop-base/Makefile.svn-base b/package/libs/openssl/.svn/prop-base/Makefile.svn-base new file mode 100644 index 0000000..8e522ae --- /dev/null +++ b/package/libs/openssl/.svn/prop-base/Makefile.svn-base @@ -0,0 +1,9 @@ +K 13 +svn:copyright +V 30 +Copyright (C) 2006 OpenWrt.org +K 13 +svn:eol-style +V 6 +native +END diff --git a/package/libs/openssl/.svn/text-base/Config.in.svn-base b/package/libs/openssl/.svn/text-base/Config.in.svn-base new file mode 100644 index 0000000..11591de --- /dev/null +++ b/package/libs/openssl/.svn/text-base/Config.in.svn-base @@ -0,0 +1,13 @@ +menu "Configuration" + depends on PACKAGE_libopenssl + +config OPENSSL_ENGINE_CRYPTO + bool + prompt "Crypto acceleration support" + +config OPENSSL_ENGINE_DIGEST + bool + depends OPENSSL_ENGINE_CRYPTO + prompt "Digests acceleration support" + +endmenu diff --git a/package/libs/openssl/.svn/text-base/Makefile.svn-base b/package/libs/openssl/.svn/text-base/Makefile.svn-base new file mode 100644 index 0000000..a8b3257 --- /dev/null +++ b/package/libs/openssl/.svn/text-base/Makefile.svn-base @@ -0,0 +1,180 @@ +# +# Copyright (C) 2006-2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=openssl +PKG_VERSION:=1.0.1e +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/mirrors/ftp.openssl.org/source \ + ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ +PKG_MD5SUM:=66bf6f10f060d561929de96f9dfe5b8c + +PKG_LICENSE:=SSLEAY OPENSSL +PKG_LICENSE_FILES:=LICENSE +PKG_BUILD_DEPENDS:=ocf-crypto-headers +PKG_CONFIG_DEPENDS:=CONFIG_OPENSSL_ENGINE_CRYPTO CONFIG_OPENSSL_ENGINE_DIGEST + +include $(INCLUDE_DIR)/package.mk + +define Package/openssl/Default + TITLE:=Open source SSL toolkit + URL:=http://www.openssl.org/ +endef + +define Package/libopenssl/config +source "$(SOURCE)/Config.in" +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) + SECTION:=libs + SUBMENU:=SSL + CATEGORY:=Libraries + DEPENDS:=+zlib + TITLE+= (libraries) + MENU:=1 +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 + $(call Package/openssl/Default) + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:=+libopenssl + TITLE+= (utility) +endef + +define Package/openssl-util/conffiles +/etc/ssl/openssl.cnf +endef + +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-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-hw no-threads zlib-dynamic no-sse2 + +ifdef CONFIG_OPENSSL_ENGINE_CRYPTO + OPENSSL_OPTIONS += -DHAVE_CRYPTODEV + ifdef CONFIG_OPENSSL_ENGINE_DIGEST + OPENSSL_OPTIONS += -DUSE_CRYPTODEV_DIGESTS + endif +else + OPENSSL_OPTIONS += no-engines +endif + +ifeq ($(CONFIG_x86_64),y) + OPENSSL_TARGET:=linux-x86_64 +else + OPENSSL_OPTIONS+=no-sse2 + ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y) + OPENSSL_TARGET:=linux-mips-openwrt + else + OPENSSL_TARGET:=linux-generic-openwrt + OPENSSL_OPTIONS+=no-perlasm + endif +endif + +define Build/Configure + (cd $(PKG_BUILD_DIR); \ + ./Configure $(OPENSSL_TARGET) \ + --prefix=/usr \ + --openssldir=/etc/ssl \ + $(TARGET_CPPFLAGS) \ + $(TARGET_LDFLAGS) -ldl \ + -DOPENSSL_SMALL_FOOTPRINT \ + $(OPENSSL_NO_CIPHERS) \ + $(OPENSSL_OPTIONS) \ + ) +endef + +TARGET_CFLAGS += $(FPIC) + +define Build/Compile + # XXX: OpenSSL "make depend" will look for installed headers before its own, + # so remove installed stuff first + -$(SUBMAKE) -j1 clean-staging + $(MAKE) -C $(PKG_BUILD_DIR) \ + MAKEDEPPROG="$(TARGET_CROSS)gcc" \ + OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ + $(OPENSSL_MAKEFLAGS) \ + depend + $(_SINGLE)$(MAKE) -C $(PKG_BUILD_DIR) \ + CC="$(TARGET_CC)" \ + AR="$(TARGET_CROSS)ar r" \ + RANLIB="$(TARGET_CROSS)ranlib" \ + OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ + $(OPENSSL_MAKEFLAGS) \ + all + $(MAKE) -C $(PKG_BUILD_DIR) \ + CC="$(TARGET_CC)" \ + AR="$(TARGET_CROSS)ar r" \ + RANLIB="$(TARGET_CROSS)ranlib" \ + OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ + $(OPENSSL_MAKEFLAGS) \ + 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) \ + CC="$(TARGET_CC)" \ + OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ + $(OPENSSL_MAKEFLAGS) \ + do_linux-shared + $(MAKE) -C $(PKG_BUILD_DIR) \ + CC="$(TARGET_CC)" \ + INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ + $(OPENSSL_MAKEFLAGS) \ + install +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/openssl $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc $(1)/usr/lib/pkgconfig/ + [ -n "$(TARGET_LDFLAGS)" ] && $(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc || true +endef + +define Package/libopenssl/install + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libcrypto.so.* $(1)/usr/lib/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libssl.so.* $(1)/usr/lib/ +endef + +define Package/openssl-util/install + $(INSTALL_DIR) $(1)/etc/ssl + $(CP) $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(1)/etc/ssl/ + $(INSTALL_DIR) $(1)/etc/ssl/certs + $(INSTALL_DIR) $(1)/etc/ssl/private + chmod 0700 $(1)/etc/ssl/private + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,libopenssl)) +$(eval $(call BuildPackage,openssl-util)) diff --git a/package/libs/openssl/Config.in b/package/libs/openssl/Config.in new file mode 100644 index 0000000..11591de --- /dev/null +++ b/package/libs/openssl/Config.in @@ -0,0 +1,13 @@ +menu "Configuration" + depends on PACKAGE_libopenssl + +config OPENSSL_ENGINE_CRYPTO + bool + prompt "Crypto acceleration support" + +config OPENSSL_ENGINE_DIGEST + bool + depends OPENSSL_ENGINE_CRYPTO + prompt "Digests acceleration support" + +endmenu diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile new file mode 100644 index 0000000..a8b3257 --- /dev/null +++ b/package/libs/openssl/Makefile @@ -0,0 +1,180 @@ +# +# Copyright (C) 2006-2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=openssl +PKG_VERSION:=1.0.1e +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/mirrors/ftp.openssl.org/source \ + ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ +PKG_MD5SUM:=66bf6f10f060d561929de96f9dfe5b8c + +PKG_LICENSE:=SSLEAY OPENSSL +PKG_LICENSE_FILES:=LICENSE +PKG_BUILD_DEPENDS:=ocf-crypto-headers +PKG_CONFIG_DEPENDS:=CONFIG_OPENSSL_ENGINE_CRYPTO CONFIG_OPENSSL_ENGINE_DIGEST + +include $(INCLUDE_DIR)/package.mk + +define Package/openssl/Default + TITLE:=Open source SSL toolkit + URL:=http://www.openssl.org/ +endef + +define Package/libopenssl/config +source "$(SOURCE)/Config.in" +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) + SECTION:=libs + SUBMENU:=SSL + CATEGORY:=Libraries + DEPENDS:=+zlib + TITLE+= (libraries) + MENU:=1 +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 + $(call Package/openssl/Default) + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:=+libopenssl + TITLE+= (utility) +endef + +define Package/openssl-util/conffiles +/etc/ssl/openssl.cnf +endef + +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-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-hw no-threads zlib-dynamic no-sse2 + +ifdef CONFIG_OPENSSL_ENGINE_CRYPTO + OPENSSL_OPTIONS += -DHAVE_CRYPTODEV + ifdef CONFIG_OPENSSL_ENGINE_DIGEST + OPENSSL_OPTIONS += -DUSE_CRYPTODEV_DIGESTS + endif +else + OPENSSL_OPTIONS += no-engines +endif + +ifeq ($(CONFIG_x86_64),y) + OPENSSL_TARGET:=linux-x86_64 +else + OPENSSL_OPTIONS+=no-sse2 + ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y) + OPENSSL_TARGET:=linux-mips-openwrt + else + OPENSSL_TARGET:=linux-generic-openwrt + OPENSSL_OPTIONS+=no-perlasm + endif +endif + +define Build/Configure + (cd $(PKG_BUILD_DIR); \ + ./Configure $(OPENSSL_TARGET) \ + --prefix=/usr \ + --openssldir=/etc/ssl \ + $(TARGET_CPPFLAGS) \ + $(TARGET_LDFLAGS) -ldl \ + -DOPENSSL_SMALL_FOOTPRINT \ + $(OPENSSL_NO_CIPHERS) \ + $(OPENSSL_OPTIONS) \ + ) +endef + +TARGET_CFLAGS += $(FPIC) + +define Build/Compile + # XXX: OpenSSL "make depend" will look for installed headers before its own, + # so remove installed stuff first + -$(SUBMAKE) -j1 clean-staging + $(MAKE) -C $(PKG_BUILD_DIR) \ + MAKEDEPPROG="$(TARGET_CROSS)gcc" \ + OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ + $(OPENSSL_MAKEFLAGS) \ + depend + $(_SINGLE)$(MAKE) -C $(PKG_BUILD_DIR) \ + CC="$(TARGET_CC)" \ + AR="$(TARGET_CROSS)ar r" \ + RANLIB="$(TARGET_CROSS)ranlib" \ + OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ + $(OPENSSL_MAKEFLAGS) \ + all + $(MAKE) -C $(PKG_BUILD_DIR) \ + CC="$(TARGET_CC)" \ + AR="$(TARGET_CROSS)ar r" \ + RANLIB="$(TARGET_CROSS)ranlib" \ + OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ + $(OPENSSL_MAKEFLAGS) \ + 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) \ + CC="$(TARGET_CC)" \ + OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ + $(OPENSSL_MAKEFLAGS) \ + do_linux-shared + $(MAKE) -C $(PKG_BUILD_DIR) \ + CC="$(TARGET_CC)" \ + INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ + $(OPENSSL_MAKEFLAGS) \ + install +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/openssl $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc $(1)/usr/lib/pkgconfig/ + [ -n "$(TARGET_LDFLAGS)" ] && $(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc || true +endef + +define Package/libopenssl/install + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libcrypto.so.* $(1)/usr/lib/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libssl.so.* $(1)/usr/lib/ +endef + +define Package/openssl-util/install + $(INSTALL_DIR) $(1)/etc/ssl + $(CP) $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(1)/etc/ssl/ + $(INSTALL_DIR) $(1)/etc/ssl/certs + $(INSTALL_DIR) $(1)/etc/ssl/private + chmod 0700 $(1)/etc/ssl/private + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,libopenssl)) +$(eval $(call BuildPackage,openssl-util)) diff --git a/package/libs/openssl/patches/.svn/entries b/package/libs/openssl/patches/.svn/entries new file mode 100644 index 0000000..bd8371e --- /dev/null +++ b/package/libs/openssl/patches/.svn/entries @@ -0,0 +1,334 @@ +10 + +dir +36060 +svn://svn.openwrt.org/openwrt/trunk/package/libs/openssl/patches +svn://svn.openwrt.org/openwrt + + + +2013-02-19T17:22:51.449811Z +35684 +florian + + + + + + + + + + + + + + +3c298f89-4303-0410-b956-a3cf2f4a3e73 + +180-fix_link_segfault.patch +file + + + + +2013-03-17T12:13:08.000000Z +bfdf3fa3a83b422e933acc9a28e9c0e5 +2012-10-08T11:24:12.513797Z +33657 +nbd + + + + + + + + + + + + + + + + + + + + + +857 + +190-remove_timestamp_check.patch +file + + + + +2013-03-17T12:13:08.000000Z +8db1faab003d9753a87b7d294e6758e5 +2012-10-08T11:24:12.513797Z +33657 +nbd + + + + + + + + + + + + + + + + + + + + + +877 + +150-no_engines.patch +file + + + + +2013-03-17T12:13:08.000000Z +00bc725aead92d3b47d6607c24ac8e57 +2013-02-08T19:36:06.852386Z +35524 +yardley +has-props + + + + + + + + + + + + + + + + + + + + +4711 + +120-cisco-dtls-fix.patch +file + + + + +2013-03-17T12:13:08.000000Z +593eee387437dc2030eaccda9d88b5b9 +2013-02-14T13:00:03.576038Z +35600 +florian + + + + + + + + + + + + + + + + + + + + + +1077 + +110-optimize-for-size.patch +file + + + + +2013-03-17T12:13:08.000000Z +1db64a89394dc47eb707ff1ae26f0774 +2013-02-08T19:36:06.852386Z +35524 +yardley +has-props + + + + + + + + + + + + + + + + + + + + +1550 + +130-perl-path.patch +file + + + + +2013-03-17T12:13:08.000000Z +6460bc4a54c252e3a84955f49ae23d57 +2012-10-08T11:24:12.513797Z +33657 +nbd +has-props + + + + + + + + + + + + + + + + + + + + +1407 + +140-makefile-dirs.patch +file + + + + +2013-03-17T12:13:08.000000Z +c2d8d1721fd6c241027242aacf420b97 +2012-10-08T11:24:12.513797Z +33657 +nbd +has-props + + + + + + + + + + + + + + + + + + + + +196 + +160-disable_doc_tests.patch +file + + + + +2013-03-17T12:13:08.000000Z +4587085c82575a8edd6f34b0240e076d +2013-02-08T19:36:06.852386Z +35524 +yardley +has-props + + + + + + + + + + + + + + + + + + + + +1515 + +170-bash_path.patch +file + + + + +2013-03-17T12:13:08.000000Z +b4d518058f28873758901a65f4880704 +2012-10-08T11:24:12.513797Z +33657 +nbd +has-props + + + + + + + + + + + + + + + + + + + + +195 + diff --git a/package/libs/openssl/patches/.svn/prop-base/110-optimize-for-size.patch.svn-base b/package/libs/openssl/patches/.svn/prop-base/110-optimize-for-size.patch.svn-base new file mode 100644 index 0000000..bdbd305 --- /dev/null +++ b/package/libs/openssl/patches/.svn/prop-base/110-optimize-for-size.patch.svn-base @@ -0,0 +1,5 @@ +K 13 +svn:eol-style +V 6 +native +END diff --git a/package/libs/openssl/patches/.svn/prop-base/130-perl-path.patch.svn-base b/package/libs/openssl/patches/.svn/prop-base/130-perl-path.patch.svn-base new file mode 100644 index 0000000..bdbd305 --- /dev/null +++ b/package/libs/openssl/patches/.svn/prop-base/130-perl-path.patch.svn-base @@ -0,0 +1,5 @@ +K 13 +svn:eol-style +V 6 +native +END diff --git a/package/libs/openssl/patches/.svn/prop-base/140-makefile-dirs.patch.svn-base b/package/libs/openssl/patches/.svn/prop-base/140-makefile-dirs.patch.svn-base new file mode 100644 index 0000000..bdbd305 --- /dev/null +++ b/package/libs/openssl/patches/.svn/prop-base/140-makefile-dirs.patch.svn-base @@ -0,0 +1,5 @@ +K 13 +svn:eol-style +V 6 +native +END diff --git a/package/libs/openssl/patches/.svn/prop-base/150-no_engines.patch.svn-base b/package/libs/openssl/patches/.svn/prop-base/150-no_engines.patch.svn-base new file mode 100644 index 0000000..bdbd305 --- /dev/null +++ b/package/libs/openssl/patches/.svn/prop-base/150-no_engines.patch.svn-base @@ -0,0 +1,5 @@ +K 13 +svn:eol-style +V 6 +native +END diff --git a/package/libs/openssl/patches/.svn/prop-base/160-disable_doc_tests.patch.svn-base b/package/libs/openssl/patches/.svn/prop-base/160-disable_doc_tests.patch.svn-base new file mode 100644 index 0000000..bdbd305 --- /dev/null +++ b/package/libs/openssl/patches/.svn/prop-base/160-disable_doc_tests.patch.svn-base @@ -0,0 +1,5 @@ +K 13 +svn:eol-style +V 6 +native +END diff --git a/package/libs/openssl/patches/.svn/prop-base/170-bash_path.patch.svn-base b/package/libs/openssl/patches/.svn/prop-base/170-bash_path.patch.svn-base new file mode 100644 index 0000000..bdbd305 --- /dev/null +++ b/package/libs/openssl/patches/.svn/prop-base/170-bash_path.patch.svn-base @@ -0,0 +1,5 @@ +K 13 +svn:eol-style +V 6 +native +END diff --git a/package/libs/openssl/patches/.svn/text-base/110-optimize-for-size.patch.svn-base b/package/libs/openssl/patches/.svn/text-base/110-optimize-for-size.patch.svn-base new file mode 100644 index 0000000..85dba1e --- /dev/null +++ b/package/libs/openssl/patches/.svn/text-base/110-optimize-for-size.patch.svn-base @@ -0,0 +1,13 @@ +--- a/Configure ++++ b/Configure +@@ -402,6 +402,10 @@ my %table=( + "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", + "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", + ++# OpenWrt targets ++"linux-mips-openwrt","gcc:-DTERMIO \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-generic-openwrt","gcc:-DTERMIO \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++ + # Android: linux-* but without -DTERMIO and pointers to headers and libs. + "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", diff --git a/package/libs/openssl/patches/.svn/text-base/120-cisco-dtls-fix.patch.svn-base b/package/libs/openssl/patches/.svn/text-base/120-cisco-dtls-fix.patch.svn-base new file mode 100644 index 0000000..11e6bb5 --- /dev/null +++ b/package/libs/openssl/patches/.svn/text-base/120-cisco-dtls-fix.patch.svn-base @@ -0,0 +1,31 @@ +From 9fe4603b8245425a4c46986ed000fca054231253 Mon Sep 17 00:00:00 2001 +From: David Woodhouse +Date: Tue, 12 Feb 2013 14:55:32 +0000 +Subject: [PATCH] Check DTLS_BAD_VER for version number. + +The version check for DTLS1_VERSION was redundant as +DTLS1_VERSION > TLS1_1_VERSION, however we do need to +check for DTLS1_BAD_VER for compatibility. + +PR:2984 +(cherry picked from commit d980abb22e22661e98e5cee33d760ab0c7584ecc) +--- + ssl/s3_cbc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c +index 02edf3f..443a31e 100644 +--- a/ssl/s3_cbc.c ++++ b/ssl/s3_cbc.c +@@ -148,7 +148,7 @@ int tls1_cbc_remove_padding(const SSL* s, + unsigned padding_length, good, to_check, i; + const unsigned overhead = 1 /* padding length byte */ + mac_size; + /* Check if version requires explicit IV */ +- if (s->version >= TLS1_1_VERSION || s->version == DTLS1_VERSION) ++ if (s->version >= TLS1_1_VERSION || s->version == DTLS1_BAD_VER) + { + /* These lengths are all public so we can test them in + * non-constant time. +-- +1.8.1.2 + diff --git a/package/libs/openssl/patches/.svn/text-base/130-perl-path.patch.svn-base b/package/libs/openssl/patches/.svn/text-base/130-perl-path.patch.svn-base new file mode 100644 index 0000000..dd4fa54 --- /dev/null +++ b/package/libs/openssl/patches/.svn/text-base/130-perl-path.patch.svn-base @@ -0,0 +1,64 @@ +--- a/Configure ++++ b/Configure +@@ -1,4 +1,4 @@ +-: ++#!/usr/bin/perl + eval 'exec perl -S $0 ${1+"$@"}' + if $running_under_some_shell; + ## +--- a/tools/c_rehash.in ++++ b/tools/c_rehash.in +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + + # Perl c_rehash script, scan all files in a directory +--- a/util/clean-depend.pl ++++ b/util/clean-depend.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/bin/perl + # Clean the dependency list in a makefile of standard includes... + # Written by Ben Laurie 19 Jan 1999 + +--- a/util/mkdef.pl ++++ b/util/mkdef.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/bin/perl + # + # generate a .def file + # +--- a/util/mkerr.pl ++++ b/util/mkerr.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/bin/perl + + my $config = "crypto/err/openssl.ec"; + my $hprefix = "openssl/"; +--- a/util/mkstack.pl ++++ b/util/mkstack.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/bin/perl + + # This is a utility that searches out "DECLARE_STACK_OF()" + # declarations in .h and .c files, and updates/creates/replaces +--- a/util/pod2man.pl ++++ b/util/pod2man.pl +@@ -1,4 +1,4 @@ +-: #!/usr/bin/perl-5.005 ++#!/usr/bin/perl + eval 'exec /usr/bin/perl -S $0 ${1+"$@"}' + if $running_under_some_shell; + +--- a/util/selftest.pl ++++ b/util/selftest.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/bin/perl + # + # Run the test suite and generate a report + # diff --git a/package/libs/openssl/patches/.svn/text-base/140-makefile-dirs.patch.svn-base b/package/libs/openssl/patches/.svn/text-base/140-makefile-dirs.patch.svn-base new file mode 100644 index 0000000..b51ca28 --- /dev/null +++ b/package/libs/openssl/patches/.svn/text-base/140-makefile-dirs.patch.svn-base @@ -0,0 +1,11 @@ +--- a/Makefile.org ++++ b/Makefile.org +@@ -135,7 +135,7 @@ FIPSCANLIB= + + BASEADDR= + +-DIRS= crypto ssl engines apps test tools ++DIRS= crypto ssl apps + ENGDIRS= ccgost + SHLIBDIRS= crypto ssl + diff --git a/package/libs/openssl/patches/.svn/text-base/150-no_engines.patch.svn-base b/package/libs/openssl/patches/.svn/text-base/150-no_engines.patch.svn-base new file mode 100644 index 0000000..8e93970 --- /dev/null +++ b/package/libs/openssl/patches/.svn/text-base/150-no_engines.patch.svn-base @@ -0,0 +1,81 @@ +--- a/Configure ++++ b/Configure +@@ -2003,6 +2003,11 @@ EOF + close(OUT); + } + ++# ugly hack to disable engines ++if($target eq "mingwx") { ++ system("sed -e s/^LIB/XLIB/g -i engines/Makefile"); ++} ++ + print < 19 Jan 1999 + diff --git a/package/libs/openssl/patches/.svn/text-base/180-fix_link_segfault.patch.svn-base b/package/libs/openssl/patches/.svn/text-base/180-fix_link_segfault.patch.svn-base new file mode 100644 index 0000000..3e36beb --- /dev/null +++ b/package/libs/openssl/patches/.svn/text-base/180-fix_link_segfault.patch.svn-base @@ -0,0 +1,18 @@ +--- a/Makefile.shared ++++ b/Makefile.shared +@@ -95,7 +95,6 @@ LINK_APP= \ + LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \ + LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ + LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ +- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ + $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} ) + + LINK_SO= \ +@@ -105,7 +104,6 @@ LINK_SO= \ + SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ + LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ + LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ +- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ + $${SHAREDCMD} $${SHAREDFLAGS} \ + -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ + $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \ diff --git a/package/libs/openssl/patches/.svn/text-base/190-remove_timestamp_check.patch.svn-base b/package/libs/openssl/patches/.svn/text-base/190-remove_timestamp_check.patch.svn-base new file mode 100644 index 0000000..2677b2d --- /dev/null +++ b/package/libs/openssl/patches/.svn/text-base/190-remove_timestamp_check.patch.svn-base @@ -0,0 +1,23 @@ +--- a/Makefile.org ++++ b/Makefile.org +@@ -184,7 +184,7 @@ WTARFILE= $(NAME)-win.tar + EXHEADER= e_os2.h + HEADER= e_os.h + +-all: Makefile build_all openssl.pc libssl.pc libcrypto.pc ++all: build_all openssl.pc libssl.pc libcrypto.pc + + # as we stick to -e, CLEARENV ensures that local variables in lower + # Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn +@@ -396,11 +396,6 @@ openssl.pc: Makefile + echo 'Libs.private: $(EX_LIBS)'; \ + echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc + +-Makefile: Makefile.org Configure config +- @echo "Makefile is older than Makefile.org, Configure or config." +- @echo "Reconfigure the source tree (via './config' or 'perl Configure'), please." +- @false +- + libclean: + rm -f *.map *.so *.so.* *.dylib *.dll engines/*.so engines/*.dll engines/*.dylib *.a engines/*.a */lib */*/lib + diff --git a/package/libs/openssl/patches/110-optimize-for-size.patch b/package/libs/openssl/patches/110-optimize-for-size.patch new file mode 100644 index 0000000..85dba1e --- /dev/null +++ b/package/libs/openssl/patches/110-optimize-for-size.patch @@ -0,0 +1,13 @@ +--- a/Configure ++++ b/Configure +@@ -402,6 +402,10 @@ my %table=( + "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", + "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", + ++# OpenWrt targets ++"linux-mips-openwrt","gcc:-DTERMIO \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-generic-openwrt","gcc:-DTERMIO \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++ + # Android: linux-* but without -DTERMIO and pointers to headers and libs. + "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", diff --git a/package/libs/openssl/patches/120-cisco-dtls-fix.patch b/package/libs/openssl/patches/120-cisco-dtls-fix.patch new file mode 100644 index 0000000..11e6bb5 --- /dev/null +++ b/package/libs/openssl/patches/120-cisco-dtls-fix.patch @@ -0,0 +1,31 @@ +From 9fe4603b8245425a4c46986ed000fca054231253 Mon Sep 17 00:00:00 2001 +From: David Woodhouse +Date: Tue, 12 Feb 2013 14:55:32 +0000 +Subject: [PATCH] Check DTLS_BAD_VER for version number. + +The version check for DTLS1_VERSION was redundant as +DTLS1_VERSION > TLS1_1_VERSION, however we do need to +check for DTLS1_BAD_VER for compatibility. + +PR:2984 +(cherry picked from commit d980abb22e22661e98e5cee33d760ab0c7584ecc) +--- + ssl/s3_cbc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c +index 02edf3f..443a31e 100644 +--- a/ssl/s3_cbc.c ++++ b/ssl/s3_cbc.c +@@ -148,7 +148,7 @@ int tls1_cbc_remove_padding(const SSL* s, + unsigned padding_length, good, to_check, i; + const unsigned overhead = 1 /* padding length byte */ + mac_size; + /* Check if version requires explicit IV */ +- if (s->version >= TLS1_1_VERSION || s->version == DTLS1_VERSION) ++ if (s->version >= TLS1_1_VERSION || s->version == DTLS1_BAD_VER) + { + /* These lengths are all public so we can test them in + * non-constant time. +-- +1.8.1.2 + diff --git a/package/libs/openssl/patches/130-perl-path.patch b/package/libs/openssl/patches/130-perl-path.patch new file mode 100644 index 0000000..dd4fa54 --- /dev/null +++ b/package/libs/openssl/patches/130-perl-path.patch @@ -0,0 +1,64 @@ +--- a/Configure ++++ b/Configure +@@ -1,4 +1,4 @@ +-: ++#!/usr/bin/perl + eval 'exec perl -S $0 ${1+"$@"}' + if $running_under_some_shell; + ## +--- a/tools/c_rehash.in ++++ b/tools/c_rehash.in +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + + # Perl c_rehash script, scan all files in a directory +--- a/util/clean-depend.pl ++++ b/util/clean-depend.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/bin/perl + # Clean the dependency list in a makefile of standard includes... + # Written by Ben Laurie 19 Jan 1999 + +--- a/util/mkdef.pl ++++ b/util/mkdef.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/bin/perl + # + # generate a .def file + # +--- a/util/mkerr.pl ++++ b/util/mkerr.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/bin/perl + + my $config = "crypto/err/openssl.ec"; + my $hprefix = "openssl/"; +--- a/util/mkstack.pl ++++ b/util/mkstack.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/bin/perl + + # This is a utility that searches out "DECLARE_STACK_OF()" + # declarations in .h and .c files, and updates/creates/replaces +--- a/util/pod2man.pl ++++ b/util/pod2man.pl +@@ -1,4 +1,4 @@ +-: #!/usr/bin/perl-5.005 ++#!/usr/bin/perl + eval 'exec /usr/bin/perl -S $0 ${1+"$@"}' + if $running_under_some_shell; + +--- a/util/selftest.pl ++++ b/util/selftest.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/bin/perl + # + # Run the test suite and generate a report + # diff --git a/package/libs/openssl/patches/140-makefile-dirs.patch b/package/libs/openssl/patches/140-makefile-dirs.patch new file mode 100644 index 0000000..b51ca28 --- /dev/null +++ b/package/libs/openssl/patches/140-makefile-dirs.patch @@ -0,0 +1,11 @@ +--- a/Makefile.org ++++ b/Makefile.org +@@ -135,7 +135,7 @@ FIPSCANLIB= + + BASEADDR= + +-DIRS= crypto ssl engines apps test tools ++DIRS= crypto ssl apps + ENGDIRS= ccgost + SHLIBDIRS= crypto ssl + diff --git a/package/libs/openssl/patches/150-no_engines.patch b/package/libs/openssl/patches/150-no_engines.patch new file mode 100644 index 0000000..8e93970 --- /dev/null +++ b/package/libs/openssl/patches/150-no_engines.patch @@ -0,0 +1,81 @@ +--- a/Configure ++++ b/Configure +@@ -2003,6 +2003,11 @@ EOF + close(OUT); + } + ++# ugly hack to disable engines ++if($target eq "mingwx") { ++ system("sed -e s/^LIB/XLIB/g -i engines/Makefile"); ++} ++ + print < 19 Jan 1999 + diff --git a/package/libs/openssl/patches/180-fix_link_segfault.patch b/package/libs/openssl/patches/180-fix_link_segfault.patch new file mode 100644 index 0000000..3e36beb --- /dev/null +++ b/package/libs/openssl/patches/180-fix_link_segfault.patch @@ -0,0 +1,18 @@ +--- a/Makefile.shared ++++ b/Makefile.shared +@@ -95,7 +95,6 @@ LINK_APP= \ + LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \ + LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ + LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ +- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ + $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} ) + + LINK_SO= \ +@@ -105,7 +104,6 @@ LINK_SO= \ + SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ + LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ + LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ +- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ + $${SHAREDCMD} $${SHAREDFLAGS} \ + -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ + $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \ diff --git a/package/libs/openssl/patches/190-remove_timestamp_check.patch b/package/libs/openssl/patches/190-remove_timestamp_check.patch new file mode 100644 index 0000000..2677b2d --- /dev/null +++ b/package/libs/openssl/patches/190-remove_timestamp_check.patch @@ -0,0 +1,23 @@ +--- a/Makefile.org ++++ b/Makefile.org +@@ -184,7 +184,7 @@ WTARFILE= $(NAME)-win.tar + EXHEADER= e_os2.h + HEADER= e_os.h + +-all: Makefile build_all openssl.pc libssl.pc libcrypto.pc ++all: build_all openssl.pc libssl.pc libcrypto.pc + + # as we stick to -e, CLEARENV ensures that local variables in lower + # Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn +@@ -396,11 +396,6 @@ openssl.pc: Makefile + echo 'Libs.private: $(EX_LIBS)'; \ + echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc + +-Makefile: Makefile.org Configure config +- @echo "Makefile is older than Makefile.org, Configure or config." +- @echo "Reconfigure the source tree (via './config' or 'perl Configure'), please." +- @false +- + libclean: + rm -f *.map *.so *.so.* *.dylib *.dll engines/*.so engines/*.dll engines/*.dylib *.a engines/*.a */lib */*/lib + -- cgit v1.2.3