Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

openssl:

 * add optional openssl-1.0.x support
 * revise 0.9.8 patches
 * revise .mk file

openssl-1.0.x:
 * is 233kB bigger than openssl-0.9.8
 * could NOT be used as a replacement for AVM's OpenSSL library
 * contains assembler optimized code giving performance improvements of up to 30%(according to OpenSSL developers) / 120%(according to openwrt developers), performance improvement is the actual reason for adding it
 * inspired by this openwrt commit https://dev.openwrt.org/changeset/33531



git-svn-id: file:///var/svn/freetz/trunk@9421 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information...
commit 05730a1c8d48faee33ae191407439e19bff5a36e 1 parent 4d2d366
er13 authored
Showing with 1,176 additions and 309 deletions.
  1. +1 −0  CHANGELOG
  2. +3 −2 Config.in.patches
  3. +1 −0  make/apache2/apache2.mk
  4. +1 −0  make/bip/bip.mk
  5. +1 −0  make/curl/curl.mk
  6. +3 −0  make/davfs2/davfs2.mk
  7. +1 −0  make/git/git.mk
  8. +1 −0  make/ipsec-tools/ipsec-tools.mk
  9. +1 −0  make/irssi/irssi.mk
  10. +1 −0  make/lftp/lftp.mk
  11. +1 −0  make/libs/libavmhmac/libavmhmac.mk
  12. +1 −0  make/libs/neon/neon.mk
  13. +11 −0 make/libs/neon/patches/120-dont-cache-openssl-version-dependent-values.neon.patch
  14. +31 −1 make/libs/openssl/Config.in
  15. +2 −2 make/libs/openssl/external.files
  16. +2 −2 make/libs/openssl/external.in
  17. +34 −25 make/libs/openssl/openssl.mk
  18. +2 −2 make/libs/openssl/patches/{ → 0.9.8x}/100-hmac-avm.openssl.patch
  19. +4 −4 make/libs/openssl/patches/{ → 0.9.8x}/110-optimize-for-size.openssl.patch
  20. +2 −3 make/libs/openssl/patches/{ → 0.9.8x}/120-makedepend.openssl.patch
  21. +64 −0 make/libs/openssl/patches/0.9.8x/130-perl-path.openssl.patch
  22. +3 −3 make/libs/openssl/patches/{ → 0.9.8x}/140-makefile-dirs.openssl.patch
  23. +16 −16 make/libs/openssl/patches/{ → 0.9.8x}/150-no_engines.openssl.patch
  24. +47 −0 make/libs/openssl/patches/0.9.8x/160-disable_doc_tests.openssl.patch
  25. +239 −0 make/libs/openssl/patches/0.9.8x/180-jobserver_unavailable_fix.openssl.patch
  26. +2 −2 make/libs/openssl/patches/{ → 0.9.8x}/190-configure_quiet.openssl.patch
  27. 0  make/libs/openssl/patches/{ → 0.9.8x}/200-dont-force-large-file.openssl.patch
  28. 0  make/libs/openssl/patches/{ → 0.9.8x}/210-optional-ipv6.openssl.patch
  29. 0  make/libs/openssl/patches/{ → 0.9.8x}/220-uclibc-susv3-legacy.openssl.patch
  30. +3 −3 make/libs/openssl/patches/{ → 0.9.8x}/230-remove_timestamp_check.openssl.patch
  31. +20 −0 make/libs/openssl/patches/0.9.8x/250-no_host_LD_LIBRARY_PATH.openssl.patch
  32. +27 −0 make/libs/openssl/patches/0.9.8x/260-missing_libssl_workaround.openssl.patch
  33. +15 −0 make/libs/openssl/patches/1.0.1c/100-hmac-avm.openssl.patch
  34. +15 −0 make/libs/openssl/patches/1.0.1c/110-optimize-for-size.openssl.patch
  35. +8 −0 make/libs/openssl/patches/1.0.1c/120-makedepend_using_bash.openssl.patch
  36. +64 −0 make/libs/openssl/patches/1.0.1c/130-perl-path.openssl.patch
  37. +11 −0 make/libs/openssl/patches/1.0.1c/140-makefile-dirs.openssl.patch
  38. +81 −0 make/libs/openssl/patches/1.0.1c/150-no_engines.openssl.patch
  39. +47 −0 make/libs/openssl/patches/1.0.1c/160-disable_doc_tests.openssl.patch
  40. +208 −0 make/libs/openssl/patches/1.0.1c/180-jobserver_unavailable_fix.openssl.patch
  41. +21 −0 make/libs/openssl/patches/1.0.1c/190-configure_quiet.openssl.patch
  42. +19 −0 make/libs/openssl/patches/1.0.1c/200-dont-force-large-file.openssl.patch
  43. +64 −0 make/libs/openssl/patches/1.0.1c/210-fix_aes_mips.openssl.patch
  44. +23 −0 make/libs/openssl/patches/1.0.1c/230-remove_timestamp_check.openssl.patch
  45. +20 −0 make/libs/openssl/patches/1.0.1c/250-no_host_LD_LIBRARY_PATH.openssl.patch
  46. +27 −0 make/libs/openssl/patches/1.0.1c/260-missing_libssl_workaround.openssl.patch
  47. +0 −72 make/libs/openssl/patches/130-perl-path.openssl.patch
  48. +0 −76 make/libs/openssl/patches/160-disable_doc_tests.openssl.patch
  49. +0 −96 make/libs/openssl/patches/180-makefile.openssl.patch
  50. +1 −0  make/lighttpd/lighttpd.mk
  51. +1 −0  make/mcabber/mcabber.mk
  52. +2 −0  make/mediatomb/mediatomb.mk
  53. +1 −0  make/netatalk/netatalk.mk
  54. +1 −0  make/netsnmp/netsnmp.mk
  55. +1 −0  make/ngircd/ngircd.mk
  56. +2 −0  make/openconnect/openconnect.mk
  57. +1 −0  make/opendd/opendd.mk
  58. +1 −0  make/openssh/openssh.mk
  59. +1 −0  make/openvpn/openvpn.mk
  60. +1 −0  make/php/php.mk
  61. +1 −0  make/shellinabox/shellinabox.mk
  62. +1 −0  make/socat/socat.mk
  63. +1 −0  make/stunnel/stunnel.mk
  64. +3 −0  make/subversion/subversion.mk
  65. +1 −0  make/tinc/tinc.mk
  66. +1 −0  make/tor/tor.mk
  67. +1 −0  make/transmission/transmission.mk
  68. +1 −0  make/umurmur/umurmur.mk
  69. +1 −0  make/vpnc/vpnc.mk
  70. +1 −0  make/vsftpd/vsftpd.mk
  71. +1 −0  make/vtun/vtun.mk
  72. +1 −0  make/wget/wget.mk
  73. +1 −0  make/xmail/xmail.mk
View
1  CHANGELOG
@@ -88,6 +88,7 @@ Latest changes:
* libtiff 3.9.5
* libusb1 1.0.9
* libyaml 2.0.2
+ * openssl 1.0.1c (as an alternative to the also available openssl 0.9.8)
* pcscd 1.8.3
* protobuf-c 0.15
* samba 3.6.8 (as an alternative to the 3.0.37, 3.0.37 is still the default one)
View
5 Config.in.patches
@@ -1187,8 +1187,9 @@ config FREETZ_REMOVE_WLAN
comment "Replacement patches --------------------"
config FREETZ_REPLACE_SSL_LIBS
- bool "Replace AVM SSL libraries" if FREETZ_SHOW_ADVANCED
- depends on FREETZ_HAS_AVM_OPENSSL_LIBS
+ bool "Replace AVM's version of OpenSSL libraries" if FREETZ_SHOW_ADVANCED
+ depends on FREETZ_HAS_AVM_OPENSSL_LIBS && FREETZ_LIB_libcrypto && FREETZ_OPENSSL_VERSION_0
+ select FREETZ_LIB_libssl
default n
help
Use this option only if you are running out of space and if you
View
1  make/apache2/apache2.mk
@@ -15,6 +15,7 @@ ifeq ($(strip $(FREETZ_PACKAGE_APACHE2_DEFLATE)),y)
$(PKG)_DEPENDS_ON += zlib
endif
ifeq ($(strip $(FREETZ_PACKAGE_APACHE2_SSL)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON += openssl
endif
ifeq ($(strip $(FREETZ_PACKAGE_APACHE2_LIBXML)),y)
View
1  make/bip/bip.mk
@@ -7,6 +7,7 @@ $(PKG)_BINARY:=$($(PKG)_DIR)/src/bip
$(PKG)_TARGET_BINARY:=$($(PKG)_DEST_DIR)/usr/bin/bip
ifeq ($(strip $(FREETZ_PACKAGE_BIP_WITH_SSL)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON := openssl
$(PKG)_LIBS := -lssl -lcrypto -ldl
endif
View
1  make/curl/curl.mk
@@ -14,6 +14,7 @@ ifeq ($(strip $(FREETZ_LIB_libcurl_WITH_CYASSL)),y)
$(PKG)_DEPENDS_ON += cyassl
endif
ifeq ($(strip $(FREETZ_LIB_libcurl_WITH_OPENSSL)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON += openssl
endif
ifeq ($(strip $(FREETZ_LIB_libcurl_WITH_POLARSSL)),y)
View
3  make/davfs2/davfs2.mk
@@ -19,6 +19,9 @@ $(PKG)_LIBS += -liconv
endif
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_DAVFS2_WITH_SSL
+ifeq ($(strip $(FREETZ_PACKAGE_DAVFS2_WITH_SSL)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
+endif
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_DAVFS2_WITH_ZLIB
$(PKG_SOURCE_DOWNLOAD)
View
1  make/git/git.mk
@@ -17,6 +17,7 @@ $(PKG)_DEPENDS_ON += libiconv
endif
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_GIT_WITH_PCRE
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_CONFIGURE_ENV += ac_cv_c_c99_format=yes
$(PKG)_CONFIGURE_ENV += ac_cv_fread_reads_directories=no
View
1  make/ipsec-tools/ipsec-tools.mk
@@ -44,6 +44,7 @@ $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_IPSEC_TOOLS_STATIC
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_IPSEC_TOOLS_WITH_MGMNT
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_IPSEC_TOOLS_WITH_RACOONCTL
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_IPSEC_TOOLS_WITH_PLAINRSAGEN
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_REBUILD_SUBOPTS += FREETZ_TARGET_IPV6_SUPPORT
$(PKG)_CONFIGURE_PRE_CMDS += $(call PKG_PREVENT_RPATH_HARDCODING,./configure)
View
1  make/irssi/irssi.mk
@@ -18,6 +18,7 @@ endif
$(PKG)_DEPENDS_ON := glib2 ncurses
ifeq ($(strip $(FREETZ_PACKAGE_IRSSI_WITH_OPENSSL)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON += openssl
endif
View
1  make/lftp/lftp.mk
@@ -29,6 +29,7 @@ $(PKG)_CONFIGURE_OPTIONS += --disable-rpath
$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_LFTP_WITH_SSL),--with-openssl,--without-openssl)
$(PKG)_REBUILD_SUBOPTS += FREETZ_STDCXXLIB
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_LFTP_STATIC
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_LFTP_WITH_SSL
View
1  make/libs/libavmhmac/libavmhmac.mk
@@ -9,6 +9,7 @@ $(PKG)_STAGING_BINARY:=$(TARGET_TOOLCHAIN_STAGING_DIR)/lib/$(pkg).so.$($(PKG)_LI
$(PKG)_TARGET_BINARY:=$($(PKG)_DEST_LIB)/$(pkg).so.$($(PKG)_LIB_VERSION)
$(PKG)_DEPENDS_ON := openssl
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG_SOURCE_DOWNLOAD)
$(PKG_UNPACKED)
View
1  make/libs/neon/neon.mk
@@ -10,6 +10,7 @@ $(PKG)_TARGET_BINARY:=$($(PKG)_TARGET_DIR)/libneon.so.$($(PKG)_LIB_VERSION)
$(PKG)_DEPENDS_ON := expat
ifeq ($(strip $(FREETZ_LIB_libneon_WITH_SSL)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON += openssl
endif
ifeq ($(strip $(FREETZ_LIB_libneon_WITH_ZLIB)),y)
View
11 make/libs/neon/patches/120-dont-cache-openssl-version-dependent-values.neon.patch
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -6546,7 +6546,7 @@
+ LIBS="$LIBS $NEON_LIBS"
+ for ac_func in CRYPTO_set_idptr_callback SSL_SESSION_cmp
+ do :
+- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ as_ac_var=`$as_echo "neon_noncached_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+ if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
View
32 make/libs/openssl/Config.in
@@ -1,6 +1,6 @@
config FREETZ_LIB_libcrypto
bool "OpenSSL cryptographic library (libcrypto.so)"
- select FREETZ_LIB_libssl if FREETZ_REPLACE_SSL_LIBS
+ select FREETZ_LIB_libdl
default n
help
crypto - OpenSSL cryptographic library
@@ -20,9 +20,39 @@ config FREETZ_LIB_libcrypto
config FREETZ_LIB_libssl
bool "OpenSSL SSL/TLS library (libssl.so)"
depends on FREETZ_LIB_libcrypto
+ select FREETZ_LIB_libdl
default n
help
SSL - OpenSSL SSL/TLS library
The OpenSSL ssl library implements the Secure Sockets Layer (SSL v2/v3)
and Transport Layer Security (TLS v1) protocols. It provides a rich API.
+
+choice
+
+ depends on FREETZ_LIB_libcrypto
+ prompt "OpenSSL version"
+ default FREETZ_OPENSSL_VERSION_0 if FREETZ_HAS_AVM_OPENSSL_LIBS && (FREETZ_UCLIBC_0_9_28_BASED_BOX || FREETZ_UCLIBC_0_9_28_BASED_BOX)
+ default FREETZ_OPENSSL_VERSION_1
+
+ config FREETZ_OPENSSL_VERSION_0
+ bool "0.9.8x"
+ help
+ - is smaller than 1.0.x (about 233kB)
+ - could be used (with some limitations) as a replacement for AVM's OpenSSL library
+ - contains no assembler optimized code
+
+ config FREETZ_OPENSSL_VERSION_1
+ bool "1.0.1c"
+ help
+ - is bigger than 0.9.8 (about 233kB)
+ - could NOT be used as a replacement for AVM's OpenSSL library
+ - contains assembler optimized code giving performance improvements of up to 30%
+
+endchoice
+
+config FREETZ_OPENSSL_SHLIB_VERSION
+ depends on FREETZ_LIB_libcrypto
+ string
+ default "0.9.8" if FREETZ_OPENSSL_VERSION_0
+ default "1.0.0" if FREETZ_OPENSSL_VERSION_1
View
4 make/libs/openssl/external.files
@@ -1,2 +1,2 @@
-[ "$EXTERNAL_FREETZ_LIB_libcrypto" == "y" ] && EXTERNAL_FILES+=" $FREETZ_LIBRARY_DIR/libcrypto.so.0.9.8"
-[ "$EXTERNAL_FREETZ_LIB_libssl" == "y" ] && EXTERNAL_FILES+=" $FREETZ_LIBRARY_DIR/libssl.so.0.9.8"
+[ "$EXTERNAL_FREETZ_LIB_libcrypto" == "y" ] && EXTERNAL_FILES+=" $FREETZ_LIBRARY_DIR/libcrypto.so.$FREETZ_OPENSSL_SHLIB_VERSION"
+[ "$EXTERNAL_FREETZ_LIB_libssl" == "y" ] && EXTERNAL_FILES+=" $FREETZ_LIBRARY_DIR/libssl.so.$FREETZ_OPENSSL_SHLIB_VERSION"
View
4 make/libs/openssl/external.in
@@ -4,7 +4,7 @@ config EXTERNAL_FREETZ_LIB_libssl
default n
help
externals these file(s):
- /usr/lib/freetz/libssl.so.0.9.8
+ /usr/lib/freetz/libssl.so.${FREETZ_OPENSSL_SHLIB_VERSION}
config EXTERNAL_FREETZ_LIB_libcrypto
depends on EXTERNAL_ENABLED && FREETZ_LIB_libcrypto
@@ -12,4 +12,4 @@ config EXTERNAL_FREETZ_LIB_libcrypto
default n
help
externals these file(s):
- /usr/lib/freetz/libcrypto.so.0.9.8
+ /usr/lib/freetz/libcrypto.so.${FREETZ_OPENSSL_SHLIB_VERSION}
View
59 make/libs/openssl/openssl.mk
@@ -1,8 +1,11 @@
-$(call PKG_INIT_LIB, 0.9.8x)
-$(PKG)_LIB_VERSION:=0.9.8
+$(call PKG_INIT_LIB,$(if $(FREETZ_OPENSSL_VERSION_0),0.9.8x,1.0.1c))
+$(PKG)_LIB_VERSION:=$(call qstrip,$(FREETZ_OPENSSL_SHLIB_VERSION))
$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz
-$(PKG)_SOURCE_MD5:=ee17e9bc805c8cc7d0afac3b0ef78eda
+$(PKG)_SOURCE_MD5_0.9.8x := ee17e9bc805c8cc7d0afac3b0ef78eda
+$(PKG)_SOURCE_MD5_1.0.1c := ae412727c8c15b67880aef7bd2999b2e
+$(PKG)_SOURCE_MD5 := $($(PKG)_SOURCE_MD5_$($(PKG)_VERSION))
$(PKG)_SITE:=http://www.openssl.org/source
+$(PKG)_CONDITIONAL_PATCHES+=$($(PKG)_VERSION)
$(PKG)_SSL_BINARY:=$($(PKG)_DIR)/libssl.so.$($(PKG)_LIB_VERSION)
$(PKG)_CRYPTO_BINARY:=$($(PKG)_DIR)/libcrypto.so.$($(PKG)_LIB_VERSION)
@@ -11,43 +14,47 @@ $(PKG)_STAGING_CRYPTO_BINARY:=$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libcrypto.
$(PKG)_TARGET_SSL_BINARY:=$($(PKG)_TARGET_DIR)/libssl.so.$($(PKG)_LIB_VERSION)
$(PKG)_TARGET_CRYPTO_BINARY:=$($(PKG)_TARGET_DIR)/libcrypto.so.$($(PKG)_LIB_VERSION)
-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-engines \
- no-sse2 no-perlasm
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_VERSION_0
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_VERSION_1
-$(PKG)_CONFIGURE_PRE_CMDS += $(SED) -i -e 's/FREETZ_MOD_OPTIMIZATION_FLAGS/$(TARGET_CFLAGS)/g' Configure;
+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-engines no-sse2 $(if $(FREETZ_OPENSSL_VERSION_1),,no-perlasm)
+
+# Makefile is regenerated by configure
+$(PKG)_CONFIGURE_PRE_CMDS += $(RM) Makefile;
$(PKG)_CONFIGURE_PRE_CMDS += ln -s Configure configure;
$(PKG)_CONFIGURE_DEFOPTS := n
-$(PKG)_CONFIGURE_OPTIONS += linux-freetz-$(if $(FREETZ_TARGET_ARCH_BE),be,le)
+$(PKG)_CONFIGURE_OPTIONS += linux-freetz-$(if $(FREETZ_TARGET_ARCH_BE),be,le)$(if $(FREETZ_OPENSSL_VERSION_1),-asm)
$(PKG)_CONFIGURE_OPTIONS += --prefix=/usr
$(PKG)_CONFIGURE_OPTIONS += --openssldir=/mod/etc/ssl
$(PKG)_CONFIGURE_OPTIONS += -DOPENSSL_SMALL_FOOTPRINT
$(PKG)_CONFIGURE_OPTIONS += $(OPENSSL_NO_CIPHERS)
$(PKG)_CONFIGURE_OPTIONS += $(OPENSSL_OPTIONS)
+$(PKG)_MAKE_FLAGS += -C $(OPENSSL_DIR)
+$(PKG)_MAKE_FLAGS += MAKEDEPPROG="$(TARGET_CC)"
+$(PKG)_MAKE_FLAGS += CC="$(TARGET_CC)"
+$(PKG)_MAKE_FLAGS += AR="$(TARGET_AR) r"
+$(PKG)_MAKE_FLAGS += RANLIB="$(TARGET_RANLIB)"
+$(PKG)_MAKE_FLAGS += NM="$(TARGET_NM)"
+$(PKG)_MAKE_FLAGS += FREETZ_MOD_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)"
+$(PKG)_MAKE_FLAGS += SHARED_LDFLAGS=""
+$(PKG)_MAKE_FLAGS += INSTALL_PREFIX="$(TARGET_TOOLCHAIN_STAGING_DIR)"
+
$(PKG_SOURCE_DOWNLOAD)
$(PKG_UNPACKED)
$(PKG_CONFIGURED_CONFIGURE)
$($(PKG)_SSL_BINARY) $($(PKG)_CRYPTO_BINARY): $($(PKG)_DIR)/.configured
- $(SUBMAKE) -C $(OPENSSL_DIR) \
- SHARED_LDFLAGS="" \
- CC="$(TARGET_CC)" \
- AR="$(TARGET_AR) r" \
- RANLIB="$(TARGET_RANLIB)" \
- all
- # Work around openssl build bug to link libssl.so with libcrypto.so.
- $(SUBMAKE) -C $(OPENSSL_DIR) \
- CC="$(TARGET_CC)" \
- CCOPTS="$(TARGET_CFLAGS) -fomit-frame-pointer" \
- do_linux-shared
+# OpenSSL's "make depend" looks for installed headers before its own, so remove installed stuff first
+ $(MAKE) openssl-clean-staging
+ for target in depend all; do \
+ $(SUBMAKE1) $(OPENSSL_MAKE_FLAGS) $$target; \
+ done
$($(PKG)_STAGING_SSL_BINARY) $($(PKG)_STAGING_CRYPTO_BINARY): $($(PKG)_SSL_BINARY) $($(PKG)_CRYPTO_BINARY)
- $(SUBMAKE) -C $(OPENSSL_DIR) \
- INSTALL_PREFIX="$(TARGET_TOOLCHAIN_STAGING_DIR)" \
- install
+ $(SUBMAKE) $(OPENSSL_MAKE_FLAGS) install
$(call PKG_FIX_LIBTOOL_LA,prefix) \
$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/pkgconfig/{libcrypto,libssl,openssl}.pc
@@ -61,8 +68,10 @@ $(pkg): $($(PKG)_STAGING_SSL_BINARY) $($(PKG)_STAGING_CRYPTO_BINARY)
$(pkg)-precompiled: $($(PKG)_TARGET_SSL_BINARY) $($(PKG)_TARGET_CRYPTO_BINARY)
-$(pkg)-clean:
- -$(SUBMAKE) -C $(OPENSSL_DIR) clean
+$(pkg)-clean: $(pkg)-clean-staging
+ -$(SUBMAKE) $(OPENSSL_MAKE_FLAGS) clean
+
+$(pkg)-clean-staging:
$(RM) -r \
$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/bin/openssl* \
$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/{libssl,libcrypto}* \
View
4 make/libs/openssl/patches/100-hmac-avm.openssl.patch → ...openssl/patches/0.9.8x/100-hmac-avm.openssl.patch
@@ -1,5 +1,5 @@
---- crypto/hmac/hmac.c.orig 2010-06-12 15:18:51.000000000 +0200
-+++ crypto/hmac/hmac.c 2010-11-17 10:49:51.000000000 +0100
+--- crypto/hmac/hmac.c
++++ crypto/hmac/hmac.c
@@ -177,4 +177,13 @@
EVP_MD_CTX_set_flags(&ctx->md_ctx, flags);
}
View
8 ...enssl/patches/110-optimize-for-size.openssl.patch → ...atches/0.9.8x/110-optimize-for-size.openssl.patch
@@ -1,12 +1,12 @@
---- Configure.orig 2010-12-11 01:30:42.000000000 +0100
-+++ Configure 2011-02-09 21:42:29.000000000 +0100
+--- Configure
++++ Configure
@@ -370,6 +370,9 @@
"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"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:${no_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:${no_asm}",
+# freetz targets
-+"linux-freetz-le","gcc:-DL_ENDIAN -DTERMIO FREETZ_MOD_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)",
-+"linux-freetz-be","gcc:-DB_ENDIAN -DTERMIO FREETZ_MOD_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)",
++"linux-freetz-le","gcc:-DL_ENDIAN -DTERMIO \$(FREETZ_MOD_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)",
++"linux-freetz-be","gcc:-DB_ENDIAN -DTERMIO \$(FREETZ_MOD_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)",
View
5 ...libs/openssl/patches/120-makedepend.openssl.patch → ...enssl/patches/0.9.8x/120-makedepend.openssl.patch
@@ -1,6 +1,5 @@
-diff -ruN util/domd util/domd
---- util/domd 2004-05-11 14:46:18.000000000 +0200
-+++ util/domd 2005-05-30 20:20:04.000000000 +0200
+--- util/domd
++++ util/domd
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
View
64 make/libs/openssl/patches/0.9.8x/130-perl-path.openssl.patch
@@ -0,0 +1,64 @@
+--- Configure
++++ Configure
+@@ -1,4 +1,4 @@
+-:
++#!/usr/bin/perl
+ eval 'exec perl -S $0 ${1+"$@"}'
+ if $running_under_some_shell;
+ ##
+--- tools/c_rehash.in
++++ 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
+--- util/clean-depend.pl
++++ util/clean-depend.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ # Clean the dependency list in a makefile of standard includes...
+ # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
+
+--- util/mkdef.pl
++++ util/mkdef.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl
+ #
+ # generate a .def file
+ #
+--- util/mkerr.pl
++++ util/mkerr.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl
+
+ my $config = "crypto/err/openssl.ec";
+ my $debug = 0;
+--- util/mkstack.pl
++++ 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
+--- util/pod2man.pl
++++ 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;
+
+--- util/selftest.pl
++++ util/selftest.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl
+ #
+ # Run the test suite and generate a report
+ #
View
6 ...s/openssl/patches/140-makefile-dirs.openssl.patch → ...sl/patches/0.9.8x/140-makefile-dirs.openssl.patch
@@ -1,11 +1,11 @@
---- Makefile.org.orig 2009-01-08 14:58:51.000000000 +0100
-+++ Makefile.org 2009-01-08 14:59:15.000000000 +0100
+--- Makefile.org
++++ Makefile.org
@@ -132,7 +132,7 @@
BASEADDR=
-DIRS= crypto fips ssl engines apps test tools
-+DIRS= crypto fips ssl apps
++DIRS= crypto fips ssl apps
SHLIBDIRS= crypto ssl fips
# dirs in crypto to build
View
32 ...libs/openssl/patches/150-no_engines.openssl.patch → ...enssl/patches/0.9.8x/150-no_engines.openssl.patch
@@ -1,5 +1,19 @@
---- util/libeay.num.orig 2010-03-25 13:17:16.000000000 +0100
-+++ util/libeay.num 2011-02-09 21:42:29.000000000 +0100
+--- Configure
++++ Configure
+@@ -1908,6 +1908,11 @@
+ close(OUT);
+ }
+
++# ugly hack to disable engines
++if($target eq "mingwx") {
++ system("sed -e s/^LIB/XLIB/g -i engines/Makefile");
++}
++
+ print <<EOF;
+
+ Configured for $target.
+--- util/libeay.num
++++ util/libeay.num
@@ -2071,7 +2071,6 @@
UI_add_error_string 2633 EXIST::FUNCTION:
KRB5_CHECKSUM_free 2634 EXIST::FUNCTION:
@@ -65,17 +79,3 @@
EC_GROUP_set_curve_name 3533 EXIST::FUNCTION:EC
X509_CERT_PAIR_it 3534 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
X509_CERT_PAIR_it 3534 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
---- Configure.orig 2011-02-09 21:42:29.000000000 +0100
-+++ Configure 2011-02-09 21:42:29.000000000 +0100
-@@ -1908,6 +1908,11 @@
- close(OUT);
- }
-
-+# ugly hack to disable engines
-+if($target eq "mingwx") {
-+ system("sed -e s/^LIB/XLIB/g -i engines/Makefile");
-+}
-+
- print <<EOF;
-
- Configured for $target.
View
47 make/libs/openssl/patches/0.9.8x/160-disable_doc_tests.openssl.patch
@@ -0,0 +1,47 @@
+--- Makefile.org
++++ Makefile.org
+@@ -149,7 +149,7 @@
+
+ # tests to perform. "alltests" is a special word indicating that all tests
+ # should be performed.
+-TESTS = alltests
++TESTS =
+
+ MAKEFILE= Makefile
+
+@@ -161,7 +161,7 @@
+
+ TOP= .
+ ONEDIRS=out tmp
+-EDIRS= times doc bugs util include certs ms shlib mt demos perl sf dep VMS
++EDIRS= times bugs util include certs ms shlib mt demos perl sf dep VMS
+ WDIRS= windows
+ LIBS= libcrypto.a libssl.a
+ SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
+@@ -321,7 +321,7 @@
+ ../crypto/uid.o
+
+ sub_all: build_all
+-build_all: build_libs build_apps build_tests build_tools
++build_all: build_libs build_apps build_tools
+
+ build_libs: build_crypto build_fips build_ssl build_shared build_engines
+
+@@ -346,7 +346,7 @@
+ build_tools: build_libs
+ @dir=tools; target=all; $(BUILD_ONE_CMD)
+
+-all_testapps: build_libs build_testapps
++all_testapps: build_libs
+ build_testapps:
+ @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
+
+@@ -615,7 +615,7 @@
+ dist_pem_h:
+ (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+
+-install: all install_docs install_sw
++install: all install_sw
+
+ install_sw:
+ @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
View
239 make/libs/openssl/patches/0.9.8x/180-jobserver_unavailable_fix.openssl.patch
@@ -0,0 +1,239 @@
+--- Makefile.org
++++ Makefile.org
+@@ -326,7 +326,7 @@
+ build_libs: build_crypto build_fips build_ssl build_shared build_engines
+
+ build_crypto:
+- if [ -n "$(FIPSCANLIB)" ]; then \
++ +if [ -n "$(FIPSCANLIB)" ]; then \
+ EXCL_OBJ='$(AES_ASM_OBJ) $(BN_ASM) $(DES_ENC) $(CPUID_OBJ) $(SHA1_ASM_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \
+ ARX='$(PERL) $${TOP}/util/arx.pl $(AR)' ; \
+ else \
+@@ -334,21 +334,21 @@
+ fi ; export ARX ; \
+ dir=crypto; target=all; $(BUILD_ONE_CMD)
+ build_fips:
+- @dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD)
++ @+dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD)
+ build_ssl: build_crypto
+- @dir=ssl; target=all; $(BUILD_ONE_CMD)
++ @+dir=ssl; target=all; $(BUILD_ONE_CMD)
+ build_engines: build_crypto
+- @dir=engines; target=all; $(BUILD_ONE_CMD)
++ @+dir=engines; target=all; $(BUILD_ONE_CMD)
+ build_apps: build_libs
+- @dir=apps; target=all; $(BUILD_ONE_CMD)
++ @+dir=apps; target=all; $(BUILD_ONE_CMD)
+ build_tests: build_libs
+- @dir=test; target=all; $(BUILD_ONE_CMD)
++ @+dir=test; target=all; $(BUILD_ONE_CMD)
+ build_tools: build_libs
+- @dir=tools; target=all; $(BUILD_ONE_CMD)
++ @+dir=tools; target=all; $(BUILD_ONE_CMD)
+
+ all_testapps: build_libs
+ build_testapps:
+- @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
++ @+dir=crypto; target=testapps; $(BUILD_ONE_CMD)
+
+ build_shared: $(SHARED_LIBS)
+ libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
+@@ -395,7 +395,7 @@
+ fi
+
+ libfips.a:
+- dir=fips; target=all; $(BUILD_ONE_CMD)
++ +dir=fips; target=all; $(BUILD_ONE_CMD)
+
+ clean-shared:
+ @set -e; for i in $(SHLIBDIRS); do \
+@@ -484,7 +484,7 @@
+
+ clean: libclean
+ rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
+- @set -e; target=clean; $(RECURSIVE_BUILD_CMD)
++ @+set -e; target=clean; $(RECURSIVE_BUILD_CMD)
+ rm -f $(LIBS)
+ rm -f openssl.pc libssl.pc libcrypto.pc
+ rm -f speed.* .pure
+@@ -500,12 +500,12 @@
+
+ files:
+ $(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO
+- @set -e; target=files; $(RECURSIVE_BUILD_CMD)
++ @+set -e; target=files; $(RECURSIVE_BUILD_CMD)
+
+ links:
+ @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
+ @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
+- @set -e; target=links; $(RECURSIVE_BUILD_CMD)
++ @+set -e; target=links; $(RECURSIVE_BUILD_CMD)
+ @if [ -z "$(FIPSCANLIB)" ]; then \
+ set -e; target=links; dir=fips ; $(BUILD_CMD) ; \
+ fi
+@@ -516,7 +516,7 @@
+
+ dclean:
+ rm -f *.bak
+- @set -e; target=dclean; $(RECURSIVE_BUILD_CMD)
++ @+set -e; target=dclean; $(RECURSIVE_BUILD_CMD)
+
+ rehash: rehash.time
+ rehash.time: certs apps
+@@ -539,10 +539,10 @@
+ @$(PERL) util/selftest.pl
+
+ depend:
+- @set -e; target=depend; $(RECURSIVE_BUILD_CMD)
++ @+set -e; target=depend; $(RECURSIVE_BUILD_CMD)
+
+ lint:
+- @set -e; target=lint; $(RECURSIVE_BUILD_CMD)
++ @+set -e; target=lint; $(RECURSIVE_BUILD_CMD)
+
+ tags:
+ rm -f TAGS
+@@ -631,7 +631,7 @@
+ (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ done;
+- @set -e; target=install; $(RECURSIVE_BUILD_CMD)
++ @+set -e; target=install; $(RECURSIVE_BUILD_CMD)
+ @set -e; for i in $(LIBS) ;\
+ do \
+ if [ -f "$$i" ]; then \
+--- crypto/Makefile
++++ crypto/Makefile
+@@ -82,17 +82,17 @@
+ @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+
+ subdirs:
+- @target=all; $(RECURSIVE_MAKE)
++ @+target=all; $(RECURSIVE_MAKE)
+
+ files:
+ $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+- @target=files; $(RECURSIVE_MAKE)
++ @+target=files; $(RECURSIVE_MAKE)
+
+ links:
+ @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
+ @$(PERL) $(TOP)/util/mklink.pl ../test $(TEST)
+ @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS)
+- @target=links; $(RECURSIVE_MAKE)
++ @+target=links; $(RECURSIVE_MAKE)
+
+ # lib: and $(LIB): are splitted to avoid end-less loop
+ lib: buildinf.h $(LIB) subdirs
+@@ -107,7 +107,7 @@
+ fi
+
+ libs:
+- @target=lib; $(RECURSIVE_MAKE)
++ @+target=lib; $(RECURSIVE_MAKE)
+
+ install:
+ @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+@@ -116,26 +116,26 @@
+ (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ done;
+- @target=install; $(RECURSIVE_MAKE)
++ @+target=install; $(RECURSIVE_MAKE)
+
+ lint:
+- @target=lint; $(RECURSIVE_MAKE)
++ @+target=lint; $(RECURSIVE_MAKE)
+
+ depend:
+ @[ -z "$(THIS)" -o -f buildinf.h ] || touch buildinf.h # fake buildinf.h if it does not exist
+ @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDE) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ @[ -z "$(THIS)" -o -s buildinf.h ] || rm buildinf.h
+- @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) )
++ @+[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) )
+ @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+
+ clean:
+ rm -f buildinf.h *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+- @target=clean; $(RECURSIVE_MAKE)
++ @+target=clean; $(RECURSIVE_MAKE)
+
+ dclean:
+ $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+ mv -f Makefile.new $(MAKEFILE)
+- @target=dclean; $(RECURSIVE_MAKE)
++ @+target=dclean; $(RECURSIVE_MAKE)
+
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
+
+--- fips/Makefile
++++ fips/Makefile
+@@ -130,16 +130,16 @@
+ fi
+
+ subdirs:
+- @target=all; $(RECURSIVE_MAKE)
++ @+target=all; $(RECURSIVE_MAKE)
+
+ files:
+ $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+- @target=files; $(RECURSIVE_MAKE)
++ @+target=files; $(RECURSIVE_MAKE)
+
+ links:
+ @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
+ @$(PERL) $(TOP)/util/mklink.pl ../test $(TEST)
+- @target=links; $(RECURSIVE_MAKE)
++ @+target=links; $(RECURSIVE_MAKE)
+
+ # lib: and $(LIB): are splitted to avoid end-less loop
+ lib: $(LIB)
+@@ -162,10 +162,10 @@
+ shared: lib subdirs fips_premain_dso$(EXE_EXT)
+
+ libs:
+- @target=lib; $(RECURSIVE_MAKE)
++ @+target=lib; $(RECURSIVE_MAKE)
+
+ fips_test: top
+- @target=fips_test; $(RECURSIVE_MAKE)
++ @+target=fips_test; $(RECURSIVE_MAKE)
+
+ fips_test_diff:
+ @if diff -b -B -I '^\#' -cr -X fips-nodiff.txt $(FIPS_TVDIR) $(FIPS_TVOK) ; then \
+@@ -182,7 +182,7 @@
+ (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ done;
+- @target=install; $(RECURSIVE_MAKE)
++ @+target=install; $(RECURSIVE_MAKE)
+ for i in $(EXE) ; \
+ do \
+ echo "installing $$i"; \
+@@ -196,22 +196,22 @@
+ chmod 0444 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/fips*
+
+ lint:
+- @target=lint; $(RECURSIVE_MAKE)
++ @+target=lint; $(RECURSIVE_MAKE)
+
+ depend:
+ @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDE) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+- @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) )
++ @+[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) )
+ @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+
+ clean:
+ rm -f fipscanister.o.sha1 fips_premain_dso$(EXE_EXT) fips_standalone_sha1$(EXE_EXT) \
+ *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+- @target=clean; $(RECURSIVE_MAKE)
++ @+target=clean; $(RECURSIVE_MAKE)
+
+ dclean:
+ $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+ mv -f Makefile.new $(MAKEFILE)
+- @target=dclean; $(RECURSIVE_MAKE)
++ @+target=dclean; $(RECURSIVE_MAKE)
+
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
+
View
4 ...openssl/patches/190-configure_quiet.openssl.patch → .../patches/0.9.8x/190-configure_quiet.openssl.patch
@@ -1,5 +1,5 @@
---- Configure.orig 2011-02-09 21:42:29.000000000 +0100
-+++ Configure 2011-02-09 21:42:29.000000000 +0100
+--- Configure
++++ Configure
@@ -867,6 +867,10 @@
{
$baseaddr="$1";
View
0  ...l/patches/200-dont-force-large-file.openssl.patch → ...es/0.9.8x/200-dont-force-large-file.openssl.patch
File renamed without changes
View
0  ...s/openssl/patches/210-optional-ipv6.openssl.patch → ...sl/patches/0.9.8x/210-optional-ipv6.openssl.patch
File renamed without changes
View
0  ...ssl/patches/220-uclibc-susv3-legacy.openssl.patch → ...ches/0.9.8x/220-uclibc-susv3-legacy.openssl.patch
File renamed without changes
View
6 .../patches/230-remove_timestamp_check.openssl.patch → ...s/0.9.8x/230-remove_timestamp_check.openssl.patch
@@ -1,15 +1,15 @@
--- Makefile.org
+++ Makefile.org
-@@ -179,7 +179,7 @@ WTARFILE= $(NAME)-win.tar
+@@ -179,7 +179,7 @@
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
++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
-@@ -474,11 +474,6 @@ openssl.pc: Makefile
+@@ -474,11 +474,6 @@
echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
View
20 make/libs/openssl/patches/0.9.8x/250-no_host_LD_LIBRARY_PATH.openssl.patch
@@ -0,0 +1,20 @@
+--- Makefile.shared
++++ Makefile.shared
+@@ -93,7 +93,7 @@
+ LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
+ LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
+ LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
+- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
++ LD_LIBRARY_PATH=$$LIBPATH \
+ $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
+
+ LINK_SO= \
+@@ -103,7 +103,7 @@
+ SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
+ LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
+ LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
+- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
++ LD_LIBRARY_PATH=$$LIBPATH \
+ $${SHAREDCMD} $${SHAREDFLAGS} \
+ -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+ $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
View
27 make/libs/openssl/patches/0.9.8x/260-missing_libssl_workaround.openssl.patch
@@ -0,0 +1,27 @@
+#
+# Dirty workaround!
+#
+# Do not rebuild shared library if it already exists.
+# Fixes sporadic build problems: libcrypto.so: file not recognized: File truncated
+# resulting in missing libssl.so.*
+#
+--- Makefile.shared
++++ Makefile.shared
+@@ -97,6 +97,7 @@
+ $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
+
+ LINK_SO= \
++ if [ ! -e "$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" ]; then sleep 1; \
+ ( $(SET_X); \
+ LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
+ SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \
+@@ -107,7 +108,8 @@
+ $${SHAREDCMD} $${SHAREDFLAGS} \
+ -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+ $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
+- ) && $(SYMLINK_SO)
++ ) && $(SYMLINK_SO); \
++ fi
+
+ SYMLINK_SO= \
+ if [ -n "$$INHIBIT_SYMLINKS" ]; then :; else \
View
15 make/libs/openssl/patches/1.0.1c/100-hmac-avm.openssl.patch
@@ -0,0 +1,15 @@
+--- crypto/hmac/hmac.c
++++ crypto/hmac/hmac.c
+@@ -249,3 +249,12 @@
+ EVP_MD_CTX_set_flags(&ctx->o_ctx, flags);
+ EVP_MD_CTX_set_flags(&ctx->md_ctx, flags);
+ }
++
++// Define alias names for compatibility with AVMs libcrypto
++#define DEFINE_ALIAS(n) extern __typeof (n) ossl_##n __attribute__ ((alias (#n)));
++
++DEFINE_ALIAS (HMAC);
++DEFINE_ALIAS (HMAC_Init);
++DEFINE_ALIAS (HMAC_Init_ex);
++DEFINE_ALIAS (HMAC_Update);
++DEFINE_ALIAS (HMAC_Final);
View
15 make/libs/openssl/patches/1.0.1c/110-optimize-for-size.openssl.patch
@@ -0,0 +1,15 @@
+--- Configure
++++ Configure
+@@ -400,6 +400,12 @@
+ "linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "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}",
++# freetz targets
++"linux-freetz-le","gcc:-DL_ENDIAN -DTERMIO \$(FREETZ_MOD_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)",
++"linux-freetz-be","gcc:-DB_ENDIAN -DTERMIO \$(FREETZ_MOD_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)",
++# freetz targets with asm-optimizations
++"linux-freetz-le-asm","gcc:-DL_ENDIAN -DTERMIO \$(FREETZ_MOD_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-freetz-be-asm","gcc:-DB_ENDIAN -DTERMIO \$(FREETZ_MOD_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)",
+
+ # 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)",
View
8 make/libs/openssl/patches/1.0.1c/120-makedepend_using_bash.openssl.patch
@@ -0,0 +1,8 @@
+--- util/domd
++++ util/domd
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # Do a makedepend, only leave out the standard headers
+ # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
+
View
64 make/libs/openssl/patches/1.0.1c/130-perl-path.openssl.patch
@@ -0,0 +1,64 @@
+--- Configure
++++ Configure
+@@ -1,4 +1,4 @@
+-:
++#!/usr/bin/perl
+ eval 'exec perl -S $0 ${1+"$@"}'
+ if $running_under_some_shell;
+ ##
+--- tools/c_rehash.in
++++ 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
+--- util/clean-depend.pl
++++ 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 <ben@algroup.co.uk> 19 Jan 1999
+
+--- util/mkdef.pl
++++ util/mkdef.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl
+ #
+ # generate a .def file
+ #
+--- util/mkerr.pl
++++ util/mkerr.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl
+
+ my $config = "crypto/err/openssl.ec";
+ my $hprefix = "openssl/";
+--- util/mkstack.pl
++++ 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
+--- util/pod2man.pl
++++ 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;
+
+--- util/selftest.pl
++++ util/selftest.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl
+ #
+ # Run the test suite and generate a report
+ #
View
11 make/libs/openssl/patches/1.0.1c/140-makefile-dirs.openssl.patch
@@ -0,0 +1,11 @@
+--- Makefile.org
++++ Makefile.org
+@@ -135,7 +135,7 @@
+
+ BASEADDR=
+
+-DIRS= crypto ssl engines apps test tools
++DIRS= crypto ssl apps
+ ENGDIRS= ccgost
+ SHLIBDIRS= crypto ssl
+
View
81 make/libs/openssl/patches/1.0.1c/150-no_engines.openssl.patch
@@ -0,0 +1,81 @@
+--- Configure
++++ Configure
+@@ -2004,6 +2004,11 @@ EOF
+ close(OUT);
+ }
+
++# ugly hack to disable engines
++if($target eq "mingwx") {
++ system("sed -e s/^LIB/XLIB/g -i engines/Makefile");
++}
++
+ print <<EOF;
+
+ Configured for $target.
+--- util/libeay.num
++++ util/libeay.num
+@@ -2071,7 +2071,6 @@ PKCS7_ATTR_SIGN_it
+ UI_add_error_string 2633 EXIST::FUNCTION:
+ KRB5_CHECKSUM_free 2634 EXIST::FUNCTION:
+ OCSP_REQUEST_get_ext 2635 EXIST::FUNCTION:
+-ENGINE_load_ubsec 2636 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ ENGINE_register_all_digests 2637 EXIST::FUNCTION:ENGINE
+ PKEY_USAGE_PERIOD_it 2638 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+ PKEY_USAGE_PERIOD_it 2638 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+@@ -2545,7 +2544,6 @@ OCSP_RESPONSE_new
+ AES_set_encrypt_key 3024 EXIST::FUNCTION:AES
+ OCSP_resp_count 3025 EXIST::FUNCTION:
+ KRB5_CHECKSUM_new 3026 EXIST::FUNCTION:
+-ENGINE_load_cswift 3027 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ OCSP_onereq_get0_id 3028 EXIST::FUNCTION:
+ ENGINE_set_default_ciphers 3029 EXIST::FUNCTION:ENGINE
+ NOTICEREF_it 3030 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+@@ -2576,7 +2574,6 @@ ASN1_primitive_free
+ i2d_EXTENDED_KEY_USAGE 3052 EXIST::FUNCTION:
+ i2d_OCSP_SIGNATURE 3053 EXIST::FUNCTION:
+ asn1_enc_save 3054 EXIST::FUNCTION:
+-ENGINE_load_nuron 3055 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ _ossl_old_des_pcbc_encrypt 3056 EXIST::FUNCTION:DES
+ PKCS12_MAC_DATA_it 3057 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+ PKCS12_MAC_DATA_it 3057 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+@@ -2600,7 +2597,6 @@ asn1_get_choice_selector
+ i2d_KRB5_CHECKSUM 3072 EXIST::FUNCTION:
+ ENGINE_set_table_flags 3073 EXIST::FUNCTION:ENGINE
+ AES_options 3074 EXIST::FUNCTION:AES
+-ENGINE_load_chil 3075 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ OCSP_id_cmp 3076 EXIST::FUNCTION:
+ OCSP_BASICRESP_new 3077 EXIST::FUNCTION:
+ OCSP_REQUEST_get_ext_by_NID 3078 EXIST::FUNCTION:
+@@ -2667,7 +2663,6 @@ OCSP_CRLID_it
+ OCSP_CRLID_it 3127 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ i2d_KRB5_AUTHENTBODY 3128 EXIST::FUNCTION:
+ OCSP_REQUEST_get_ext_count 3129 EXIST::FUNCTION:
+-ENGINE_load_atalla 3130 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ X509_NAME_it 3131 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+ X509_NAME_it 3131 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ USERNOTICE_it 3132 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+@@ -2762,8 +2757,6 @@ DES_read_2passwords
+ DES_read_password 3207 EXIST::FUNCTION:DES
+ UI_UTIL_read_pw 3208 EXIST::FUNCTION:
+ UI_UTIL_read_pw_string 3209 EXIST::FUNCTION:
+-ENGINE_load_aep 3210 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+-ENGINE_load_sureware 3211 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ OPENSSL_add_all_algorithms_noconf 3212 EXIST:!VMS:FUNCTION:
+ OPENSSL_add_all_algo_noconf 3212 EXIST:VMS:FUNCTION:
+ OPENSSL_add_all_algorithms_conf 3213 EXIST:!VMS:FUNCTION:
+@@ -2772,7 +2765,6 @@ OPENSSL_load_builtin_modules
+ AES_ofb128_encrypt 3215 EXIST::FUNCTION:AES
+ AES_ctr128_encrypt 3216 EXIST::FUNCTION:AES
+ AES_cfb128_encrypt 3217 EXIST::FUNCTION:AES
+-ENGINE_load_4758cca 3218 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ _ossl_096_des_random_seed 3219 EXIST::FUNCTION:DES
+ EVP_aes_256_ofb 3220 EXIST::FUNCTION:AES
+ EVP_aes_192_ofb 3221 EXIST::FUNCTION:AES
+@@ -3107,7 +3099,6 @@ EC_GFp_nist_method
+ STORE_meth_set_modify_fn 3530 NOEXIST::FUNCTION:
+ STORE_method_set_modify_function 3530 NOEXIST::FUNCTION:
+ STORE_parse_attrs_next 3531 NOEXIST::FUNCTION:
+-ENGINE_load_padlock 3532 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ EC_GROUP_set_curve_name 3533 EXIST::FUNCTION:EC
+ X509_CERT_PAIR_it 3534 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+ X509_CERT_PAIR_it 3534 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
View
47 make/libs/openssl/patches/1.0.1c/160-disable_doc_tests.openssl.patch
@@ -0,0 +1,47 @@
+--- Makefile.org
++++ Makefile.org
+@@ -153,7 +153,7 @@
+
+ # tests to perform. "alltests" is a special word indicating that all tests
+ # should be performed.
+-TESTS = alltests
++TESTS =
+
+ MAKEFILE= Makefile
+
+@@ -167,7 +167,7 @@
+
+ TOP= .
+ ONEDIRS=out tmp
+-EDIRS= times doc bugs util include certs ms shlib mt demos perl sf dep VMS
++EDIRS= times bugs util include certs ms shlib mt demos perl sf dep VMS
+ WDIRS= windows
+ LIBS= libcrypto.a libssl.a
+ SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
+@@ -268,7 +268,7 @@
+ @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
+
+ sub_all: build_all
+-build_all: build_libs build_apps build_tests build_tools
++build_all: build_libs build_apps build_tools
+
+ build_libs: build_crypto build_ssl build_engines
+
+@@ -285,7 +285,7 @@
+ build_tools:
+ @dir=tools; target=all; $(BUILD_ONE_CMD)
+
+-all_testapps: build_libs build_testapps
++all_testapps: build_libs
+ build_testapps:
+ @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
+
+@@ -537,7 +537,7 @@
+ dist_pem_h:
+ (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+
+-install: all install_docs install_sw
++install: all install_sw
+
+ install_sw:
+ @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
View
208 make/libs/openssl/patches/1.0.1c/180-jobserver_unavailable_fix.openssl.patch
@@ -0,0 +1,208 @@
+--- Makefile.org
++++ Makefile.org
+@@ -273,21 +273,21 @@
+ build_libs: build_crypto build_ssl build_engines
+
+ build_crypto:
+- @dir=crypto; target=all; $(BUILD_ONE_CMD)
++ @+dir=crypto; target=all; $(BUILD_ONE_CMD)
+ build_ssl:
+- @dir=ssl; target=all; $(BUILD_ONE_CMD)
++ @+dir=ssl; target=all; $(BUILD_ONE_CMD)
+ build_engines:
+- @dir=engines; target=all; $(BUILD_ONE_CMD)
++ @+dir=engines; target=all; $(BUILD_ONE_CMD)
+ build_apps:
+- @dir=apps; target=all; $(BUILD_ONE_CMD)
++ @+dir=apps; target=all; $(BUILD_ONE_CMD)
+ build_tests:
+- @dir=test; target=all; $(BUILD_ONE_CMD)
++ @+dir=test; target=all; $(BUILD_ONE_CMD)
+ build_tools:
+- @dir=tools; target=all; $(BUILD_ONE_CMD)
++ @+dir=tools; target=all; $(BUILD_ONE_CMD)
+
+ all_testapps: build_libs
+ build_testapps:
+- @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
++ @+dir=crypto; target=testapps; $(BUILD_ONE_CMD)
+
+ fips_premain_dso$(EXE_EXT): libcrypto.a
+ [ -z "$(FIPSCANLIB)" ] || $(CC) $(CFLAG) -Iinclude \
+@@ -406,7 +406,7 @@
+
+ clean: libclean
+ rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
+- @set -e; target=clean; $(RECURSIVE_BUILD_CMD)
++ @+set -e; target=clean; $(RECURSIVE_BUILD_CMD)
+ rm -f $(LIBS)
+ rm -f openssl.pc libssl.pc libcrypto.pc
+ rm -f speed.* .pure
+@@ -422,12 +422,12 @@
+
+ files:
+ $(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO
+- @set -e; target=files; $(RECURSIVE_BUILD_CMD)
++ @+set -e; target=files; $(RECURSIVE_BUILD_CMD)
+
+ links:
+ @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
+ @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
+- @set -e; target=links; $(RECURSIVE_BUILD_CMD)
++ @+set -e; target=links; $(RECURSIVE_BUILD_CMD)
+
+ gentests:
+ @(cd test && echo "generating dummy tests (if needed)..." && \
+@@ -435,7 +435,7 @@
+
+ dclean:
+ rm -rf *.bak include/openssl certs/.0
+- @set -e; target=dclean; $(RECURSIVE_BUILD_CMD)
++ @+set -e; target=dclean; $(RECURSIVE_BUILD_CMD)
+
+ rehash: rehash.time
+ rehash.time: certs apps
+@@ -459,10 +459,10 @@
+ @$(PERL) util/selftest.pl
+
+ depend:
+- @set -e; target=depend; $(RECURSIVE_BUILD_CMD)
++ @+set -e; target=depend; $(RECURSIVE_BUILD_CMD)
+
+ lint:
+- @set -e; target=lint; $(RECURSIVE_BUILD_CMD)
++ @+set -e; target=lint; $(RECURSIVE_BUILD_CMD)
+
+ tags:
+ rm -f TAGS
+@@ -553,7 +553,7 @@
+ (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ done;
+- @set -e; target=install; $(RECURSIVE_BUILD_CMD)
++ @+set -e; target=install; $(RECURSIVE_BUILD_CMD)
+ @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
+ do \
+ if [ -f "$$i" ]; then \
+--- crypto/Makefile
++++ crypto/Makefile
+@@ -86,17 +86,17 @@
+ @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+
+ subdirs:
+- @target=all; $(RECURSIVE_MAKE)
++ @+target=all; $(RECURSIVE_MAKE)
+
+ files:
+ $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+- @target=files; $(RECURSIVE_MAKE)
++ @+target=files; $(RECURSIVE_MAKE)
+
+ links:
+ @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
+ @$(PERL) $(TOP)/util/mklink.pl ../test $(TEST)
+ @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS)
+- @target=links; $(RECURSIVE_MAKE)
++ @+target=links; $(RECURSIVE_MAKE)
+
+ # lib: $(LIB): are splitted to avoid end-less loop
+ lib: $(LIB)
+@@ -112,7 +112,7 @@
+ fi
+
+ libs:
+- @target=lib; $(RECURSIVE_MAKE)
++ @+target=lib; $(RECURSIVE_MAKE)
+
+ install:
+ @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+@@ -121,27 +121,27 @@
+ (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ done;
+- @target=install; $(RECURSIVE_MAKE)
++ @+target=install; $(RECURSIVE_MAKE)
+
+ lint:
+- @target=lint; $(RECURSIVE_MAKE)
++ @+target=lint; $(RECURSIVE_MAKE)
+
+ depend:
+ @[ -z "$(THIS)" -o -f buildinf.h ] || touch buildinf.h # fake buildinf.h if it does not exist
+ @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDE) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ @[ -z "$(THIS)" -o -s buildinf.h ] || rm buildinf.h
+- @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) )
++ @+[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) )
+ @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+
+ clean:
+ rm -f buildinf.h *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+- @target=clean; $(RECURSIVE_MAKE)
++ @+target=clean; $(RECURSIVE_MAKE)
+
+ dclean:
+ $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+ mv -f Makefile.new $(MAKEFILE)
+ rm -f opensslconf.h
+- @target=dclean; $(RECURSIVE_MAKE)
++ @+target=dclean; $(RECURSIVE_MAKE)
+
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
+
+--- engines/Makefile
++++ engines/Makefile
+@@ -89,14 +89,14 @@
+
+ subdirs:
+ echo $(EDIRS)
+- @target=all; $(RECURSIVE_MAKE)
++ @+target=all; $(RECURSIVE_MAKE)
+
+ files:
+ $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+- @target=files; $(RECURSIVE_MAKE)
++ @+target=files; $(RECURSIVE_MAKE)
+
+ links:
+- @target=links; $(RECURSIVE_MAKE)
++ @+target=links; $(RECURSIVE_MAKE)
+
+ # XXXXX This currently only works on systems that use .so as suffix
+ # for shared libraries as well as for Cygwin which uses the
+@@ -128,7 +128,7 @@
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
+ done; \
+ fi
+- @target=install; $(RECURSIVE_MAKE)
++ @+target=install; $(RECURSIVE_MAKE)
+
+ tags:
+ ctags $(SRC)
+@@ -144,23 +144,23 @@
+
+ lint:
+ lint -DLINT $(INCLUDES) $(SRC)>fluff
+- @target=lint; $(RECURSIVE_MAKE)
++ @+target=lint; $(RECURSIVE_MAKE)
+
+ depend:
+ @if [ -z "$(THIS)" ]; then \
+ $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
+ fi
+ @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+- @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) )
++ @+[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) )
+
+ dclean:
+ $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+ mv -f Makefile.new $(MAKEFILE)
+- @target=dclean; $(RECURSIVE_MAKE)
++ @+target=dclean; $(RECURSIVE_MAKE)
+
+ clean:
+ rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+- @target=clean; $(RECURSIVE_MAKE)
++ @+target=clean; $(RECURSIVE_MAKE)
+
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
+
View
21 make/libs/openssl/patches/1.0.1c/190-configure_quiet.openssl.patch
@@ -0,0 +1,21 @@
+--- Configure
++++ Configure
+@@ -705,6 +705,7 @@
+ my $default_ranlib;
+ my $perl;
+ my $fips=0;
++my $quiet=0;
+
+ if (exists $ENV{FIPSDIR})
+ {
+@@ -924,6 +925,10 @@
+ {
+ $cross_compile_prefix=$1;
+ }
++ elsif (/^--quiet$/)
++ {
++ $quiet=1
++ }
+ else
+ {
+ print STDERR $usage;
View
19 make/libs/openssl/patches/1.0.1c/200-dont-force-large-file.openssl.patch
@@ -0,0 +1,19 @@
+[patch]: bss_file.c: don't force largefile mode
+---
+ crypto/bio/bss_file.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+Index: crypto/bio/bss_file.c
+===================================================================
+--- crypto/bio/bss_file.c
++++ crypto/bio/bss_file.c
+@@ -78,9 +78,6 @@
+ * sequential access of large files without extra "magic" comprise *BSD,
+ * Darwin, IRIX...
+ */
+-#ifndef _FILE_OFFSET_BITS
+-#define _FILE_OFFSET_BITS 64
+-#endif
+ #endif
+
+ #include <stdio.h>
View
64 make/libs/openssl/patches/1.0.1c/210-fix_aes_mips.openssl.patch
@@ -0,0 +1,64 @@
+--- crypto/aes/asm/aes-mips.pl
++++ crypto/aes/asm/aes-mips.pl
+@@ -1036,9 +1036,9 @@ _mips_AES_set_encrypt_key:
+ nop
+ .end _mips_AES_set_encrypt_key
+
+-.globl AES_set_encrypt_key
+-.ent AES_set_encrypt_key
+-AES_set_encrypt_key:
++.globl private_AES_set_encrypt_key
++.ent private_AES_set_encrypt_key
++private_AES_set_encrypt_key:
+ .frame $sp,$FRAMESIZE,$ra
+ .mask $SAVED_REGS_MASK,-$SZREG
+ .set noreorder
+@@ -1060,7 +1060,7 @@ $code.=<<___ if ($flavour =~ /nubi/i); #
+ ___
+ $code.=<<___ if ($flavour !~ /o32/i); # non-o32 PIC-ification
+ .cplocal $Tbl
+- .cpsetup $pf,$zero,AES_set_encrypt_key
++ .cpsetup $pf,$zero,private_AES_set_encrypt_key
+ ___
+ $code.=<<___;
+ .set reorder
+@@ -1083,7 +1083,7 @@ ___
+ $code.=<<___;
+ jr $ra
+ $PTR_ADD $sp,$FRAMESIZE
+-.end AES_set_encrypt_key
++.end private_AES_set_encrypt_key
+ ___
+
+ my ($head,$tail)=($inp,$bits);
+@@ -1091,9 +1091,9 @@ my ($tp1,$tp2,$tp4,$tp8,$tp9,$tpb,$tpd,$
+ my ($m,$x80808080,$x7f7f7f7f,$x1b1b1b1b)=($at,$t0,$t1,$t2);
+ $code.=<<___;
+ .align 5
+-.globl AES_set_decrypt_key
+-.ent AES_set_decrypt_key
+-AES_set_decrypt_key:
++.globl private_AES_set_decrypt_key
++.ent private_AES_set_decrypt_key
++private_AES_set_decrypt_key:
+ .frame $sp,$FRAMESIZE,$ra
+ .mask $SAVED_REGS_MASK,-$SZREG
+ .set noreorder
+@@ -1115,7 +1115,7 @@ $code.=<<___ if ($flavour =~ /nubi/i); #
+ ___
+ $code.=<<___ if ($flavour !~ /o32/i); # non-o32 PIC-ification
+ .cplocal $Tbl
+- .cpsetup $pf,$zero,AES_set_decrypt_key
++ .cpsetup $pf,$zero,private_AES_set_decrypt_key
+ ___
+ $code.=<<___;
+ .set reorder
+@@ -1226,7 +1226,7 @@ ___
+ $code.=<<___;
+ jr $ra
+ $PTR_ADD $sp,$FRAMESIZE
+-.end AES_set_decrypt_key
++.end private_AES_set_decrypt_key
+ ___
+ }}}
+
View
23 make/libs/openssl/patches/1.0.1c/230-remove_timestamp_check.openssl.patch
@@ -0,0 +1,23 @@
+--- Makefile.org
++++ Makefile.org
+@@ -184,7 +184,7 @@
+ 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 @@
+ 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
+
View
20 make/libs/openssl/patches/1.0.1c/250-no_host_LD_LIBRARY_PATH.openssl.patch
@@ -0,0 +1,20 @@
+--- Makefile.shared
++++ Makefile.shared
+@@ -95,7 +95,7 @@ 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 \
++ LD_LIBRARY_PATH=$$LIBPATH \
+ $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
+
+ LINK_SO= \
+@@ -105,7 +105,7 @@ 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 \
++ LD_LIBRARY_PATH=$$LIBPATH \
+ $${SHAREDCMD} $${SHAREDFLAGS} \
+ -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+ $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
View
27 make/libs/openssl/patches/1.0.1c/260-missing_libssl_workaround.openssl.patch
@@ -0,0 +1,27 @@
+#
+# Dirty workaround!
+#
+# Do not rebuild shared library if it already exists.
+# Fixes sporadic build problems: libcrypto.so: file not recognized: File truncated
+# resulting in missing libssl.so.*
+#
+--- Makefile.shared
++++ Makefile.shared
+@@ -99,6 +99,7 @@
+ $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
+
+ LINK_SO= \
++ if [ ! -e "$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" ]; then sleep 1; \
+ ( $(SET_X); \
+ LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
+ SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \
+@@ -109,7 +110,8 @@
+ $${SHAREDCMD} $${SHAREDFLAGS} \
+ -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+ $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
+- ) && $(SYMLINK_SO)
++ ) && $(SYMLINK_SO); \
++ fi
+
+ SYMLINK_SO= \
+ if [ -n "$$INHIBIT_SYMLINKS" ]; then :; else \
View
72 make/libs/openssl/patches/130-perl-path.openssl.patch
@@ -1,72 +0,0 @@
-diff -Nur Configure Configure
---- Configure 2005-03-12 12:28:21.000000000 +0100
-+++ Configure 2005-04-03 20:32:00.000000000 +0200
-@@ -1,4 +1,4 @@
--:
-+#!/usr/bin/perl
- eval 'exec perl -S $0 ${1+"$@"}'
- if $running_under_some_shell;
- ##
-diff -Nur tools/c_rehash.in tools/c_rehash.in
---- tools/c_rehash.in 2002-10-11 22:35:45.000000000 +0200
-+++ tools/c_rehash.in 2005-04-03 20:41:17.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
-
- # Perl c_rehash script, scan all files in a directory
-diff -Nur util/clean-depend.pl util/clean-depend.pl
---- util/clean-depend.pl 2001-10-10 10:27:28.000000000 +0200
-+++ util/clean-depend.pl 2005-04-03 20:41:38.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl -w
- # Clean the dependency list in a makefile of standard includes...
- # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
-
-diff -Nur util/mkdef.pl util/mkdef.pl
---- util/mkdef.pl 2005-02-05 18:19:23.000000000 +0100
-+++ util/mkdef.pl 2005-04-03 20:42:49.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
- #
- # generate a .def file
- #
-diff -Nur util/mkerr.pl util/mkerr.pl
---- util/mkerr.pl 2005-01-31 02:28:17.000000000 +0100
-+++ util/mkerr.pl 2005-04-03 20:43:02.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
-
- my $config = "crypto/err/openssl.ec";
- my $debug = 0;
-diff -Nur util/mkstack.pl util/mkstack.pl
---- util/mkstack.pl 2004-10-04 18:27:36.000000000 +0200
-+++ util/mkstack.pl 2005-04-03 20:43:18.000000000 +0200
-@@ -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
-diff -Nur util/pod2man.pl util/pod2man.pl
---- util/pod2man.pl 2002-05-30 17:30:21.000000000 +0200
-+++ util/pod2man.pl 2005-04-03 20:43:52.000000000 +0200
-@@ -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;
-
-diff -Nur util/selftest.pl util/selftest.pl
---- util/selftest.pl 2004-05-11 14:46:19.000000000 +0200
-+++ util/selftest.pl 2005-04-03 20:44:10.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
- #
- # Run the test suite and generate a report
- #
View
76 make/libs/openssl/patches/160-disable_doc_tests.openssl.patch
@@ -1,76 +0,0 @@
---- Makefile.orig 2009-01-07 12:57:01.000000000 +0100
-+++ Makefile 2009-01-08 15:37:02.000000000 +0100
-@@ -163,7 +163,7 @@
-
- TOP= .
- ONEDIRS=out tmp
--EDIRS= times doc bugs util include certs ms shlib mt demos perl sf dep VMS
-+EDIRS= times bugs util include certs ms shlib mt demos perl sf dep VMS
- WDIRS= windows
- LIBS= libcrypto.a libssl.a
- SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
-@@ -323,7 +323,7 @@
- ../crypto/uid.o
-
- sub_all: build_all
--build_all: build_libs build_apps build_tests build_tools
-+build_all: build_libs build_apps build_tools
-
- build_libs: build_crypto build_fips build_ssl build_shared build_engines
-
-@@ -617,7 +617,7 @@
- dist_pem_h:
- (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
-
--install: all install_docs install_sw
-+install: all install_sw
-
- install_sw:
- @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
---- Makefile.org.orig 2009-01-08 15:37:02.000000000 +0100
-+++ Makefile.org 2009-01-08 15:37:03.000000000 +0100
-@@ -149,7 +149,7 @@
-
- # tests to perform. "alltests" is a special word indicating that all tests
- # should be performed.
--TESTS = alltests
-+TESTS =
-
- MAKEFILE= Makefile
-
-@@ -161,7 +161,7 @@
-
- TOP= .
- ONEDIRS=out tmp
--EDIRS= times doc bugs util include certs ms shlib mt demos perl sf dep VMS
-+EDIRS= times bugs util include certs ms shlib mt demos perl sf dep VMS
- WDIRS= windows
- LIBS= libcrypto.a libssl.a
- SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
-@@ -321,7 +321,7 @@
- ../crypto/uid.o
-
- sub_all: build_all
--build_all: build_libs build_apps build_tests build_tools
-+build_all: build_libs build_apps build_tools
-
- build_libs: build_crypto build_fips build_ssl build_shared build_engines
-
-@@ -346,7 +346,7 @@
- build_tools: build_libs
- @dir=tools; target=all; $(BUILD_ONE_CMD)
-
--all_testapps: build_libs build_testapps
-+all_testapps: build_libs
- build_testapps:
- @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
-
-@@ -615,7 +615,7 @@
- dist_pem_h:
- (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
-
--install: all install_docs install_sw
-+install: all install_sw
-
- install_sw:
- @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
View
96 make/libs/openssl/patches/180-makefile.openssl.patch
@@ -1,96 +0,0 @@
---- Makefile.org.orig 2009-12-03 15:10:41.000000000 +0100
-+++ Makefile.org 2009-12-03 15:10:41.000000000 +0100
-@@ -323,10 +323,10 @@
- sub_all: build_all
- build_all: build_libs build_apps build_tools
-
--build_libs: build_crypto build_fips build_ssl build_shared build_engines
-+build_libs: build_crypto build_fips build_ssl build_engines
-
- build_crypto:
-- if [ -n "$(FIPSCANLIB)" ]; then \
-+ +if [ -n "$(FIPSCANLIB)" ]; then \
- EXCL_OBJ='$(AES_ASM_OBJ) $(BN_ASM) $(DES_ENC) $(CPUID_OBJ) $(SHA1_ASM_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \
- ARX='$(PERL) $${TOP}/util/arx.pl $(AR)' ; \
- else \
-@@ -334,17 +334,17 @@
- fi ; export ARX ; \
- dir=crypto; target=all; $(BUILD_ONE_CMD)
- build_fips:
-- @dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD)
--build_ssl: build_crypto
-- @dir=ssl; target=all; $(BUILD_ONE_CMD)
--build_engines: build_crypto
-- @dir=engines; target=all; $(BUILD_ONE_CMD)
--build_apps: build_libs
-- @dir=apps; target=all; $(BUILD_ONE_CMD)
--build_tests: build_libs
-- @dir=test; target=all; $(BUILD_ONE_CMD)
--build_tools: build_libs
-- @dir=tools; target=all; $(BUILD_ONE_CMD)
-+ @+dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD)
-+build_ssl: build_crypto
-+ @+dir=ssl; target=all; $(BUILD_ONE_CMD)
-+build_engines: build_crypto
-+ @+dir=engines; target=all; $(BUILD_ONE_CMD)
-+build_apps: build_libs
-+ @+dir=apps; target=all; $(BUILD_ONE_CMD)
-+build_tests: build_libs
-+ @+dir=test; target=all; $(BUILD_ONE_CMD)
-+build_tools: build_libs
-+ @+dir=tools; target=all; $(BUILD_ONE_CMD)
-
- all_testapps: build_libs
- build_testapps:
-@@ -500,7 +500,7 @@
-
- files:
- $(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO
-- @set -e; target=files; $(RECURSIVE_BUILD_CMD)
-+ @+set -e; target=files; $(RECURSIVE_BUILD_CMD)
-
- links:
- @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
-@@ -631,7 +631,7 @@
- (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
- done;
-- @set -e; target=install; $(RECURSIVE_BUILD_CMD)
-+ @+set -e; target=install; $(RECURSIVE_BUILD_CMD)
- @set -e; for i in $(LIBS) ;\
- do \
- if [ -f "$$i" ]; then \
---- crypto/Makefile.orig 2009-11-05 14:53:07.000000000 +0100
-+++ crypto/Makefile 2009-12-03 15:10:41.000000000 +0100
-@@ -82,11 +82,11 @@
- @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
-
- subdirs:
-- @target=all; $(RECURSIVE_MAKE)
-+ @+target=all; $(RECURSIVE_MAKE)
-
- files:
- $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-- @target=files; $(RECURSIVE_MAKE)
-+ @+target=files; $(RECURSIVE_MAKE)
-
- links:
- @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
-@@ -107,7 +107,7 @@
- fi
-
- libs:
-- @target=lib; $(RECURSIVE_MAKE)
-+ @+target=lib; $(RECURSIVE_MAKE)
-
- install:
- @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-@@ -116,7 +116,7 @@
- (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
- done;
-- @target=install; $(RECURSIVE_MAKE)
-+ @+target=install; $(RECURSIVE_MAKE)
-
- lint:
- @target=lint; $(RECURSIVE_MAKE)
View
1  make/lighttpd/lighttpd.mk
@@ -48,6 +48,7 @@ $(PKG)_CONFIGURE_ENV += OPENSSL_ALTERNATIVE=cyassl
$(PKG)_CONFIGURE_ENV += OPENSSL_ALTERNATIVE_FCT_PREFIX=Cya
$(PKG)_CONFIGURE_ENV += OPENSSL_ALTERNATIVE_EXTRALIBS="-lm -lz"
else
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON += openssl
$(PKG)_CONFIGURE_OPTIONS += --with-openssl-includes="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/include"
endif
View
1  make/mcabber/mcabber.mk
@@ -12,6 +12,7 @@ $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_MCABBER_STATIC
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_MCABBER_WITH_SSL
ifeq ($(strip $(FREETZ_PACKAGE_MCABBER_WITH_SSL)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON += openssl
endif
View
2  make/mediatomb/mediatomb.mk
@@ -16,6 +16,7 @@ endif
$(PKG)_REBUILD_SUBOPTS += FREETZ_STDCXXLIB
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_MEDIATOMB_WITH_PLAYLIST_SUPPORT
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_MEDIATOMB_STATIC
+$(PKG)_REBUILD_SUBOPTS += $(filter FREETZ_LIB_libcurl_% FREETZ_OPENSSL_SHLIB_VERSION,$(CURL_REBUILD_SUBOPTS))
$(PKG)_CONFIGURE_OPTIONS += --disable-rpl-malloc
$(PKG)_CONFIGURE_OPTIONS += --enable-pthread-lib
@@ -74,6 +75,7 @@ $(pkg)-precompiled: $($(PKG)_TARGET_BINARY) $($(PKG)_TARGET_WEBIF)
$(pkg)-clean:
-$(SUBMAKE) -C $(MEDIATOMB_DIR) clean
$(RM) $(MEDIATOMB_DIR)/.configured
+ $(RM) $(MEDIATOMB_FREETZ_CONFIG_FILE)
$(pkg)-uninstall:
$(RM) -r $(MEDIATOMB_TARGET_BINARY) $(MEDIATOMB_DEST_DIR)$(MEDIATOMB_SHARE_DIR)
View
1  make/netatalk/netatalk.mk
@@ -32,6 +32,7 @@ ifeq ($(strip $(FREETZ_PACKAGE_NETATALK_ENABLE_ZEROCONF)),y)
$(PKG)_DEPENDS_ON += avahi
endif
ifeq ($(strip $(FREETZ_PACKAGE_NETATALK_DHX)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON += openssl
endif
ifeq ($(strip $(FREETZ_PACKAGE_NETATALK_DHX2)),y)
View
1  make/netsnmp/netsnmp.mk
@@ -91,6 +91,7 @@ $(PKG)_CONFIGURE_OPTIONS += --enable-ipv6
endif
ifeq ($(strip $(FREETZ_PACKAGE_NETSNMP_WITH_OPENSSL)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON := openssl
endif
View
1  make/ngircd/ngircd.mk
@@ -21,6 +21,7 @@ $(PKG)_DEPENDS_ON += zlib
endif
ifeq ($(strip $(FREETZ_PACKAGE_NGIRCD_WITH_SSL)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON += openssl
endif
View
2  make/openconnect/openconnect.mk
@@ -6,6 +6,8 @@ $(PKG)_BINARY:=$($(PKG)_DIR)/$(pkg)
$(PKG)_TARGET_BINARY:=$($(PKG)_DEST_DIR)/sbin/$(pkg)
$(PKG)_STARTLEVEL=81
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
+
$(PKG)_DEPENDS_ON := libxml2 zlib openssl
$(PKG)_LIBS := -lcrypto -lssl
View
1  make/opendd/opendd.mk
@@ -9,6 +9,7 @@ $(PKG)_PEM:=$($(PKG)_DIR)/$(pkg).pem
$(PKG)_TARGET_PEM:=$($(PKG)_DEST_DIR)/etc/default.$(pkg)/$(pkg).pem
ifeq ($(strip $(FREETZ_PACKAGE_OPENDD_WITH_SSL)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_LIBS := -lcrypto -lssl
$(PKG)_OPTS := -DUSE_SOCKET_SSL
$(PKG)_DEPENDS_ON := openssl
View
1  make/openssh/openssh.mk
@@ -20,6 +20,7 @@ $(PKG)_LIB_BINARIES_TARGET_DIR := $(addprefix $($(PKG)_DEST_DIR)/usr/lib/,$($(P
$(PKG)_DEPENDS_ON := openssl zlib
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_OPENSSH_STATIC
$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_OPENSSH_STATIC),--disable-shared,--enable-shared)
View
1  make/openvpn/openvpn.mk
@@ -19,6 +19,7 @@ $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_OPENVPN_WITH_LZO
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_OPENVPN_WITH_MGMNT
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_OPENVPN_ENABLE_SMALL
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_OPENVPN_STATIC
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_REBUILD_SUBOPTS += FREETZ_TARGET_IPV6_SUPPORT
# ipv6 patch modifies both files, touch them to prevent configure from being regenerated
View
1  make/php/php.mk
@@ -99,6 +99,7 @@ $(PKG)_CONFIGURE_OPTIONS += --without-pdo-sqlite
endif
ifeq ($(strip $(FREETZ_PACKAGE_PHP_WITH_SSL)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON += openssl
$(PKG)_CONFIGURE_OPTIONS += --with-openssl="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr"
$(PKG)_LIBS += -ldl
View
1  make/shellinabox/shellinabox.mk
@@ -15,6 +15,7 @@ $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SHELLINABOX_STATIC
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SHELLINABOX_SSL
ifeq ($(strip $(FREETZ_PACKAGE_SHELLINABOX_SSL)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON += openssl
$(PKG)_CONFIGURE_OPTIONS += --enable-ssl
# will not work with SSL disabled, I suspect a bug in source??
View
1  make/socat/socat.mk
@@ -15,6 +15,7 @@ $(PKG)_CONFIGURE_OPTIONS += sc_cv_sys_crdly_shift=9
$(PKG)_CONFIGURE_OPTIONS += sc_cv_sys_tabdly_shift=11
$(PKG)_CONFIGURE_OPTIONS += sc_cv_sys_csize_shift=4
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SOCAT_WITHTERMIOS
$(PKG_SOURCE_DOWNLOAD)
View
1  make/stunnel/stunnel.mk
@@ -14,6 +14,7 @@ $(PKG)_DEPENDS_ON += cyassl
$(PKG)_LIBS := -lutil -lcyassl -lz -lm -lpthread
$(PKG)_CONFIGURE_ENV += OPENSSL_ALTERNATIVE=cyassl
else
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON += openssl
$(PKG)_LIBS := -lutil -lssl -lcrypto -lz -ldl -lpthread
endif
View
3  make/subversion/subversion.mk
@@ -51,6 +51,9 @@ $(PKG)_DEPENDS_ON += apache2
endif
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SUBVERSION_WITH_SSL
+ifeq ($(strip $(FREETZ_PACKAGE_SUBVERSION_WITH_SSL)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
+endif
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SUBVERSION_WITH_LIBDB
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SUBVERSION_STATIC
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SUBVERSION_APACHE_MODULES
View
1  make/tinc/tinc.mk
@@ -14,6 +14,7 @@ $(PKG)_LDFLAGS := -static
endif
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_TINC_STATIC
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG_SOURCE_DOWNLOAD)
$(PKG_UNPACKED)
View
1  make/tor/tor.mk
@@ -21,6 +21,7 @@ $(PKG)_CONFIGURE_OPTIONS += --enable-static
$(PKG)_CONFIGURE_OPTIONS += --with-openssl-dir="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib"
$(PKG)_CONFIGURE_OPTIONS += --with-libevent-dir="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib"
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_TOR_STATIC
# add EXTRA_(C|LD)FLAGS
View
1  make/transmission/transmission.mk
@@ -36,6 +36,7 @@ endif
$(PKG)_DEPENDS_ON := zlib openssl curl libevent
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_REBUILD_SUBOPTS += FREETZ_TARGET_IPV6_SUPPORT
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_TRANSMISSION_STATIC
View
1  make/umurmur/umurmur.mk
@@ -13,6 +13,7 @@ ifeq ($(strip $(FREETZ_PACKAGE_UMURMUR_USE_POLARSSL)),y)
$(PKG)_DEPENDS_ON += polarssl
$(PKG)_CONFIGURE_OPTIONS += --with-ssl=polarssl
else
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON += openssl
$(PKG)_CONFIGURE_OPTIONS += --with-ssl=openssl
endif
View
1  make/vpnc/vpnc.mk
@@ -12,6 +12,7 @@ $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_VPNC_WITH_HYBRID_AUTH
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_VPNC_NAT_SUPPORT
ifeq ($(strip $(FREETZ_PACKAGE_VPNC_WITH_HYBRID_AUTH)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON += openssl
$(PKG)_OPENSSL_GPL_VIOLATION := -DOPENSSL_GPL_VIOLATION
$(PKG)_OPENSSLLIBS := -lcrypto
View
1  make/vsftpd/vsftpd.mk
@@ -10,6 +10,7 @@ $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_VSFTPD_STATIC
$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_VSFTPD_WITH_SSL
ifeq ($(strip $(FREETZ_PACKAGE_VSFTPD_WITH_SSL)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON := openssl
$(PKG)_CFLAGS := -DFREETZ_PACKAGE_VSFTPD_WITH_SSL
$(PKG)_LDFLAGS := -lssl -lcrypto -ldl
View
1  make/vtun/vtun.mk
@@ -13,6 +13,7 @@ ifeq ($(strip $(FREETZ_PACKAGE_VTUN_WITH_ZLIB)),y)
$(PKG)_DEPENDS_ON += zlib
endif
ifeq ($(strip $(FREETZ_PACKAGE_VTUN_WITH_SSL)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON += openssl
endif
View
1  make/wget/wget.mk
@@ -22,6 +22,7 @@ ifeq ($(strip $(FREETZ_PACKAGE_WGET_STATIC)),y)
$(PKG)_STATIC_LIBS := -ltasn1 -lz
endif
else
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON += openssl
$(PKG)_CONFIGURE_OPTIONS += --with-ssl=openssl
$(PKG)_CONFIGURE_OPTIONS += --with-libssl-prefix="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr"
View
1  make/xmail/xmail.mk
@@ -25,6 +25,7 @@ ifeq ($(strip $(FREETZ_PACKAGE_XMAIL_STATIC)),y)
$(PKG)_LDFLAGS += -static
endif
ifeq ($(strip $(FREETZ_PACKAGE_XMAIL_WITH_SSL)),y)
+$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON += openssl
$(PKG)_LDFLAGS += -lssl -lcrypto
$(PKG)_CFLAGS += -DWITH_SSL
Please sign in to comment.
Something went wrong with that request. Please try again.