From c02f10580b5faf3c8735833735a3cf2d8973b261 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 7 Sep 2011 17:40:35 +0000 Subject: [PATCH] Updated openssl to 1.0.0e --- dev-libs/openssl/openssl-1.0.0e.bep | 28 ++++++++++ dev-libs/openssl/patches/openssl-1.0.0e.patch | 54 +++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 dev-libs/openssl/openssl-1.0.0e.bep create mode 100644 dev-libs/openssl/patches/openssl-1.0.0e.patch diff --git a/dev-libs/openssl/openssl-1.0.0e.bep b/dev-libs/openssl/openssl-1.0.0e.bep new file mode 100644 index 000000000..d84ffb104 --- /dev/null +++ b/dev-libs/openssl/openssl-1.0.0e.bep @@ -0,0 +1,28 @@ +DESCRIPTION="openssl" +HOMEPAGE="http://www.openssl.org/" +SRC_URI="http://www.openssl.org/source/openssl-1.0.0e.tar.gz" +CHECKSUM_MD5="7040b89c4c58c7a1016c0dfa6e821c86" +REVISION="2" +STATUS_HAIKU="stable" +DEPEND="sys-libs/zlib >= 1.2.3" +BUILD { + cd openssl-1.0.0e + sed -i 's/MANDIR=$(OPENSSLDIR)\/man/MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/man/g' Make* + config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared \ + --openssldir=`finddir B_COMMON_DATA_DIRECTORY`/ssl + make +} + +INSTALL { + cd openssl-1.0.0e + make install INSTALL_PREFIX="${DESTDIR}" +} + +TEST { + cd openssl-1.0.0e + make test +} + +LICENSE="OpenSSL" +COPYRIGHT="1995-1998 Eric Young + 1998-2011 The OpenSSL Project." diff --git a/dev-libs/openssl/patches/openssl-1.0.0e.patch b/dev-libs/openssl/patches/openssl-1.0.0e.patch new file mode 100644 index 000000000..92bb62dc2 --- /dev/null +++ b/dev-libs/openssl/patches/openssl-1.0.0e.patch @@ -0,0 +1,54 @@ +diff -urN openssl-1.0.0e/Configure openssl-1.0.0e-haiku/Configure +--- openssl-1.0.0e/Configure 2010-11-30 22:19:26.013631488 +0000 ++++ openssl-1.0.0e-haiku/Configure 2010-12-10 09:33:29.000000000 +0000 +@@ -582,6 +582,9 @@ + "uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", + "uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", + ++##### Haiku ++"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++ + ); + + my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A +diff -urN openssl-1.0.0e/Makefile.shared openssl-1.0.0e-haiku/Makefile.shared +--- openssl-1.0.0e/Makefile.shared 2010-08-21 11:36:49.004456448 +0000 ++++ openssl-1.0.0e-haiku/Makefile.shared 2010-12-10 09:33:29.000000000 +0000 +@@ -594,10 +594,10 @@ + symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos: + + # Compatibility targets +-link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu +-link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu +-link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu +-symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu ++link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu ++link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu ++link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu ++symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu + link_o.bsd-shared: link_o.bsd + link_a.bsd-shared: link_a.bsd + link_app.bsd-shared: link_app.bsd +diff -urN openssl-1.0.0e/config openssl-1.0.0e-haiku/config +--- openssl-1.0.0e/config 2010-03-09 17:08:39.013369344 +0000 ++++ openssl-1.0.0e-haiku/config 2010-12-10 09:33:29.000000000 +0000 +@@ -134,6 +134,10 @@ + echo "${MACHINE}-dg-dgux"; exit 0 + ;; + ++ Haiku:*:BePC) ++ echo "i586-pc-haiku"; exit 0 ++ ;; ++ + HI-UX:*) + echo "${MACHINE}-hi-hiux"; exit 0 + ;; +@@ -799,6 +803,8 @@ + options="$options no-asm" + fi + ;; ++ i586-*-haiku) OUT="haiku-x86" ;; ++ + # these are all covered by the catchall below + # *-dgux) OUT="dgux" ;; + mips-sony-newsos4) OUT="newsos4-gcc" ;;