From 06de5a573b947683ffdd15ab1077866f90f5c6bb Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 18 Aug 2014 21:43:16 +0000 Subject: [PATCH] openssl: added recipe for version 1.0.0n * clean up old versions --- dev-libs/openssl/openssl-1.0.0d.recipe | 78 --- dev-libs/openssl/openssl-1.0.0j.recipe | 121 ---- ...sl-1.0.0l.recipe => openssl-1.0.0n.recipe} | 3 +- dev-libs/openssl/patches/openssl-1.0.0d.patch | 54 -- dev-libs/openssl/patches/openssl-1.0.0e.patch | 54 -- dev-libs/openssl/patches/openssl-1.0.0g.patch | 54 -- dev-libs/openssl/patches/openssl-1.0.0j.patch | 479 --------------- .../openssl/patches/openssl-1.0.0l.patchset | 579 ------------------ .../openssl/patches/openssl-1.0.0n.patchset | 102 +++ 9 files changed, 103 insertions(+), 1421 deletions(-) delete mode 100644 dev-libs/openssl/openssl-1.0.0d.recipe delete mode 100644 dev-libs/openssl/openssl-1.0.0j.recipe rename dev-libs/openssl/{openssl-1.0.0l.recipe => openssl-1.0.0n.recipe} (96%) delete mode 100644 dev-libs/openssl/patches/openssl-1.0.0d.patch delete mode 100644 dev-libs/openssl/patches/openssl-1.0.0e.patch delete mode 100644 dev-libs/openssl/patches/openssl-1.0.0g.patch delete mode 100644 dev-libs/openssl/patches/openssl-1.0.0j.patch delete mode 100644 dev-libs/openssl/patches/openssl-1.0.0l.patchset create mode 100644 dev-libs/openssl/patches/openssl-1.0.0n.patchset diff --git a/dev-libs/openssl/openssl-1.0.0d.recipe b/dev-libs/openssl/openssl-1.0.0d.recipe deleted file mode 100644 index cdf43d957..000000000 --- a/dev-libs/openssl/openssl-1.0.0d.recipe +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY="Full-strength general purpose cryptography library (with SSL/TLS)" -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. The \ -project is managed by a worldwide community of volunteers that use the \ -Internet to communicate, plan, and develop the OpenSSL toolkit and its related \ -documentation. -OpenSSL is based on the excellent SSLeay library developed by Eric A. Young \ -and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style \ -licence, which basically means that you are free to get and use it for \ -commercial and non-commercial purposes subject to some simple license \ -conditions. -" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.0d.tar.gz" -CHECKSUM_SHA256="92511d1f0caaa298dba250426f8e7d5d00b271847886d1adc62422778d6320db" -LICENSE="OpenSSL" -COPYRIGHT=" - 1995-1998 Eric Young - 1998-2011 The OpenSSL Project. - " -REVISION="5" -ARCHITECTURES="x86_gcc2 ?x86" - -PATCHES="openssl-1.0.0d.patch" - -PROVIDES=" - openssl = $portVersion compat >= 1.0.0 - cmd:c_rehash = $portVersion compat >= 1 - cmd:openssl = $portVersion compat >= 1 - lib:libcrypto = $portVersion compat >= 1.0.0 - lib:libssl = $portVersion compat >= 1.0.0 - " -REQUIRES=" - haiku >= $haikuVersion - zlib >= 1.2.3 - " -BUILD_REQUIRES=" - zlib_devel >= 1.2.3 - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc - cmd:ld - cmd:make - cmd:perl >= 5 - cmd:sed - " - - -BUILD() -{ - # Fix hardcoded directory for manpages - sed -i "s@MANDIR=.*\$@MANDIR=$manDir@g" Make* - - ./config --prefix=$prefix zlib shared --openssldir=$dataRootDir/ssl - make -} - -INSTALL() -{ - make install - - # move include dir to correct location - mkdir -p $(dirname $includeDir) - mv $prefix/include $includeDir - - # prepare develop/lib - prepareInstalledDevelLibs libcrypto libssl - fixPkgconfig -} - -TEST() -{ - make test -} diff --git a/dev-libs/openssl/openssl-1.0.0j.recipe b/dev-libs/openssl/openssl-1.0.0j.recipe deleted file mode 100644 index 47c8745c0..000000000 --- a/dev-libs/openssl/openssl-1.0.0j.recipe +++ /dev/null @@ -1,121 +0,0 @@ -SUMMARY="Full-strength general purpose cryptography library (with SSL/TLS)" -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. The \ -project is managed by a worldwide community of volunteers that use the \ -Internet to communicate, plan, and develop the OpenSSL toolkit and its related \ -documentation. -OpenSSL is based on the excellent SSLeay library developed by Eric A. Young \ -and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style \ -licence, which basically means that you are free to get and use it for \ -commercial and non-commercial purposes subject to some simple license \ -conditions. -" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.0j.tar.gz" -CHECKSUM_SHA256="626fb8fcb3eb7e966edbe71553ff993d137f6e8a87b05051a3695e621098b8af" -LICENSE="OpenSSL" -COPYRIGHT=" - 1995-1998 Eric Young - 1998-2012 The OpenSSL Project. - " -REVISION="5" -ARCHITECTURES="x86_gcc2 x86 x86_64 arm" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PATCHES="openssl-1.0.0j.patch" - -PROVIDES=" - openssl$secondaryArchSuffix = $portVersion compat >= 1.0.0 - lib:libcrypto$secondaryArchSuffix = $portVersion compat >= 1.0.0 - lib:libssl$secondaryArchSuffix = $portVersion compat >= 1.0.0 - " -if [ -z "$secondaryArchSuffix" ]; then - PROVIDES="$PROVIDES - cmd:c_rehash = $portVersion compat >= 1 - cmd:openssl = $portVersion compat >= 1 - " -fi - -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - lib:libz$secondaryArchSuffix >= 1.2.3 - " -if [ -n "$secondaryArchSuffix" ]; then - REQUIRES="$REQUIRES - openssl == $portVersion base - " -fi - -BUILD_REQUIRES=" - devel:libz$secondaryArchSuffix >= 1.2.3 - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:gcc${secondaryArchSuffix} - cmd:ld${secondaryArchSuffix} - cmd:make - cmd:perl >= 5 - cmd:sed - " - -PATCH() -{ - # fix hard-coded perl path - sed -i 's,/usr/bin/perl,/bin/env perl,g' apps/tsget -} - -BUILD() -{ - PERL="/bin/env perl" \ - ./config --prefix=$prefix --libdir=$relativeLibDir \ - --openssldir=$dataRootDir/ssl \ - zlib shared - make - # multi-job builds don't work correctly -} - -INSTALL() -{ - make MANDIR=$manDir install - - # move include dir to correct location - mkdir -p $(dirname $includeDir) - mv $prefix/include $includeDir - - # prepare develop/lib - prepareInstalledDevelLibs libcrypto libssl - fixPkgconfig - - # devel package - packageEntries devel \ - $developDir \ - $manDir/man3 - - # Remove stuff we don't need in the secondary architecture base package, - # since we make it depend on the primary package. - if [ -n "$secondaryArchSuffix" ]; then - rm -rf $prefix/bin - rm -rf $dataRootDir/ssl - rm -rf $documentationDir - fi -} - -TEST() -{ - cd openssl-1.0.0j - make test -} - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - openssl${secondaryArchSuffix}_devel = $portVersion - devel:libcrypto${secondaryArchSuffix} = $portVersion compat >= 1.0.0 - devel:libssl${secondaryArchSuffix} = $portVersion compat >= 1.0.0 - " -REQUIRES_devel=" - openssl${secondaryArchSuffix} == $portVersion base - " diff --git a/dev-libs/openssl/openssl-1.0.0l.recipe b/dev-libs/openssl/openssl-1.0.0n.recipe similarity index 96% rename from dev-libs/openssl/openssl-1.0.0l.recipe rename to dev-libs/openssl/openssl-1.0.0n.recipe index 0a3aeaeb7..7861a6d28 100644 --- a/dev-libs/openssl/openssl-1.0.0l.recipe +++ b/dev-libs/openssl/openssl-1.0.0n.recipe @@ -15,7 +15,7 @@ conditions. " HOMEPAGE="http://www.openssl.org/" SRC_URI="http://www.openssl.org/source/openssl-$portVersion.tar.gz" -CHECKSUM_SHA256="2a072e67d9e3ae900548c43d7936305ba576025bd083d1e91ff14d68ded1fdec" +CHECKSUM_SHA256="3895eb5b1c2ba079406d081340d9e1dc064f4fbf4d0f41d53cefd154adef2aa2" LICENSE="OpenSSL" COPYRIGHT=" 1995-1998 Eric Young @@ -105,7 +105,6 @@ INSTALL() TEST() { - cd openssl-1.0.0j make test } diff --git a/dev-libs/openssl/patches/openssl-1.0.0d.patch b/dev-libs/openssl/patches/openssl-1.0.0d.patch deleted file mode 100644 index 79404e3f4..000000000 --- a/dev-libs/openssl/patches/openssl-1.0.0d.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN openssl-1.0.0d/Configure openssl-1.0.0d-haiku/Configure ---- openssl-1.0.0d/Configure 2010-11-30 22:19:26.013631488 +0000 -+++ openssl-1.0.0d-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.0d/Makefile.shared openssl-1.0.0d-haiku/Makefile.shared ---- openssl-1.0.0d/Makefile.shared 2010-08-21 11:36:49.004456448 +0000 -+++ openssl-1.0.0d-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.0d/config openssl-1.0.0d-haiku/config ---- openssl-1.0.0d/config 2010-03-09 17:08:39.013369344 +0000 -+++ openssl-1.0.0d-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" ;; diff --git a/dev-libs/openssl/patches/openssl-1.0.0e.patch b/dev-libs/openssl/patches/openssl-1.0.0e.patch deleted file mode 100644 index 92bb62dc2..000000000 --- a/dev-libs/openssl/patches/openssl-1.0.0e.patch +++ /dev/null @@ -1,54 +0,0 @@ -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" ;; diff --git a/dev-libs/openssl/patches/openssl-1.0.0g.patch b/dev-libs/openssl/patches/openssl-1.0.0g.patch deleted file mode 100644 index a66237b5c..000000000 --- a/dev-libs/openssl/patches/openssl-1.0.0g.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN openssl-1.0.0g/Configure openssl-1.0.0g-haiku/Configure ---- openssl-1.0.0g/Configure 2010-11-30 22:19:26.013631488 +0000 -+++ openssl-1.0.0g-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.0g/Makefile.shared openssl-1.0.0g-haiku/Makefile.shared ---- openssl-1.0.0g/Makefile.shared 2010-08-21 11:36:49.004456448 +0000 -+++ openssl-1.0.0g-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.0g/config openssl-1.0.0g-haiku/config ---- openssl-1.0.0g/config 2010-03-09 17:08:39.013369344 +0000 -+++ openssl-1.0.0g-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" ;; diff --git a/dev-libs/openssl/patches/openssl-1.0.0j.patch b/dev-libs/openssl/patches/openssl-1.0.0j.patch deleted file mode 100644 index 2cd6bf0e3..000000000 --- a/dev-libs/openssl/patches/openssl-1.0.0j.patch +++ /dev/null @@ -1,479 +0,0 @@ -diff -Naur openssl-1.0.0j/config openssl-1.0.0j-haiku/config ---- openssl-1.0.0j/config 2012-03-13 14:22:26.025427968 -0500 -+++ openssl-1.0.0j-haiku/config 2013-10-19 01:35:15.671612928 -0500 -@@ -134,6 +134,14 @@ - echo "${MACHINE}-dg-dgux"; exit 0 - ;; - -+ Haiku:*:BePC) -+ echo "i586-pc-haiku"; exit 0 -+ ;; -+ -+ Haiku:*:*) -+ echo "${MACHINE}-unknown-haiku"; exit 0 -+ ;; -+ - HI-UX:*) - echo "${MACHINE}-hi-hiux"; exit 0 - ;; -@@ -799,6 +807,9 @@ - options="$options no-asm" - fi - ;; -+ i586-*-haiku) OUT="haiku-x86" ;; -+ x86_64-*-haiku) OUT="haiku-x86_64" ;; -+ - # these are all covered by the catchall below - # *-dgux) OUT="dgux" ;; - mips-sony-newsos4) OUT="newsos4-gcc" ;; -diff -Naur openssl-1.0.0j/Configure openssl-1.0.0j-haiku/Configure ---- openssl-1.0.0j/Configure 2012-03-03 07:48:21.025690112 -0600 -+++ openssl-1.0.0j-haiku/Configure 2013-10-19 01:35:15.666632192 -0500 -@@ -582,6 +582,10 @@ - "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)", -+"haiku-x86_64", "gcc:-m64 -DL_ENDIAN -O2 -Wall -DMD32_REG_T=int::-D_REENTRANT::-lnetwork:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:haiku-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", -+ - ); - - my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A -diff -Naur openssl-1.0.0j/doc/apps/cms.pod openssl-1.0.0j-haiku/doc/apps/cms.pod ---- openssl-1.0.0j/doc/apps/cms.pod 2009-09-30 18:40:37.031195136 -0500 -+++ openssl-1.0.0j-haiku/doc/apps/cms.pod 2013-10-19 01:35:39.000786432 -0500 -@@ -450,28 +450,28 @@ - - =over 4 - --=item 0 -+=item C<0> - - the operation was completely successfully. - --=item 1 -+=item C<1> - - an error occurred parsing the command options. - --=item 2 -+=item C<2> - - one of the input files could not be read. - --=item 3 -+=item C<3> - - an error occurred creating the CMS file or when reading the MIME - message. - --=item 4 -+=item C<4> - - an error occurred decrypting or verifying the message. - --=item 5 -+=item C<5> - - the message was verified correctly but an error occurred writing out - the signers certificates. -diff -Naur openssl-1.0.0j/doc/apps/smime.pod openssl-1.0.0j-haiku/doc/apps/smime.pod ---- openssl-1.0.0j/doc/apps/smime.pod 2010-10-04 08:28:35.034603008 -0500 -+++ openssl-1.0.0j-haiku/doc/apps/smime.pod 2013-10-19 01:35:39.003407872 -0500 -@@ -308,28 +308,28 @@ - - =over 4 - --=item 0 -+=item C<0> - - the operation was completely successfully. - --=item 1 -+=item C<1> - - an error occurred parsing the command options. - --=item 2 -+=item C<2> - - one of the input files could not be read. - --=item 3 -+=item C<3> - - an error occurred creating the PKCS#7 file or when reading the MIME - message. - --=item 4 -+=item C<4> - - an error occurred decrypting or verifying the message. - --=item 5 -+=item C<5> - - the message was verified correctly but an error occurred writing out - the signers certificates. -diff -Naur openssl-1.0.0j/doc/crypto/X509_STORE_CTX_get_error.pod openssl-1.0.0j-haiku/doc/crypto/X509_STORE_CTX_get_error.pod ---- openssl-1.0.0j/doc/crypto/X509_STORE_CTX_get_error.pod 2009-10-18 10:28:59.056360960 -0500 -+++ openssl-1.0.0j-haiku/doc/crypto/X509_STORE_CTX_get_error.pod 2013-10-19 01:35:39.005767168 -0500 -@@ -278,6 +278,8 @@ - an application specific error. This will never be returned unless explicitly - set by an application. - -+=back -+ - =head1 NOTES - - The above functions should be used instead of directly referencing the fields -diff -Naur openssl-1.0.0j/doc/ssl/SSL_accept.pod openssl-1.0.0j-haiku/doc/ssl/SSL_accept.pod ---- openssl-1.0.0j/doc/ssl/SSL_accept.pod 2003-06-03 04:59:44.058982400 -0500 -+++ openssl-1.0.0j-haiku/doc/ssl/SSL_accept.pod 2013-10-19 01:35:39.007864320 -0500 -@@ -44,12 +44,12 @@ - - =over 4 - --=item 1 -+=item C<1> - - The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been - established. - --=item 0 -+=item C<0> - - The TLS/SSL handshake was not successful but was shut down controlled and - by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the -diff -Naur openssl-1.0.0j/doc/ssl/SSL_clear.pod openssl-1.0.0j-haiku/doc/ssl/SSL_clear.pod ---- openssl-1.0.0j/doc/ssl/SSL_clear.pod 2011-10-13 08:24:37.059244544 -0500 -+++ openssl-1.0.0j-haiku/doc/ssl/SSL_clear.pod 2013-10-19 01:35:39.009961472 -0500 -@@ -56,12 +56,12 @@ - - =over 4 - --=item 0 -+=item C<0> - - The SSL_clear() operation could not be performed. Check the error stack to - find out the reason. - --=item 1 -+=item C<1> - - The SSL_clear() operation was successful. - -diff -Naur openssl-1.0.0j/doc/ssl/SSL_COMP_add_compression_method.pod openssl-1.0.0j-haiku/doc/ssl/SSL_COMP_add_compression_method.pod ---- openssl-1.0.0j/doc/ssl/SSL_COMP_add_compression_method.pod 2003-11-29 04:33:25.059506688 -0600 -+++ openssl-1.0.0j-haiku/doc/ssl/SSL_COMP_add_compression_method.pod 2013-10-19 01:35:39.012058624 -0500 -@@ -53,11 +53,11 @@ - - =over 4 - --=item 0 -+=item C<0> - - The operation succeeded. - --=item 1 -+=item C<1> - - The operation failed. Check the error queue to find out the reason. - -diff -Naur openssl-1.0.0j/doc/ssl/SSL_connect.pod openssl-1.0.0j-haiku/doc/ssl/SSL_connect.pod ---- openssl-1.0.0j/doc/ssl/SSL_connect.pod 2003-06-03 04:59:44.059506688 -0500 -+++ openssl-1.0.0j-haiku/doc/ssl/SSL_connect.pod 2013-10-19 01:35:39.014155776 -0500 -@@ -41,12 +41,12 @@ - - =over 4 - --=item 1 -+=item C<1> - - The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been - established. - --=item 0 -+=item C<0> - - The TLS/SSL handshake was not successful but was shut down controlled and - by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the -diff -Naur openssl-1.0.0j/doc/ssl/SSL_CTX_add_session.pod openssl-1.0.0j-haiku/doc/ssl/SSL_CTX_add_session.pod ---- openssl-1.0.0j/doc/ssl/SSL_CTX_add_session.pod 2002-10-28 18:33:01.059768832 -0600 -+++ openssl-1.0.0j-haiku/doc/ssl/SSL_CTX_add_session.pod 2013-10-19 01:35:39.016252928 -0500 -@@ -52,13 +52,13 @@ - - =over 4 - --=item 0 -+=item C<0> - - The operation failed. In case of the add operation, it was tried to add - the same (identical) session twice. In case of the remove operation, the - session was not found in the cache. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff -Naur openssl-1.0.0j/doc/ssl/SSL_CTX_load_verify_locations.pod openssl-1.0.0j-haiku/doc/ssl/SSL_CTX_load_verify_locations.pod ---- openssl-1.0.0j/doc/ssl/SSL_CTX_load_verify_locations.pod 2001-09-07 01:13:39.060293120 -0500 -+++ openssl-1.0.0j-haiku/doc/ssl/SSL_CTX_load_verify_locations.pod 2013-10-19 01:35:39.018350080 -0500 -@@ -100,13 +100,13 @@ - - =over 4 - --=item 0 -+=item C<0> - - The operation failed because B and B are NULL or the - processing at one of the locations specified failed. Check the error - stack to find out the reason. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff -Naur openssl-1.0.0j/doc/ssl/SSL_CTX_set_client_CA_list.pod openssl-1.0.0j-haiku/doc/ssl/SSL_CTX_set_client_CA_list.pod ---- openssl-1.0.0j/doc/ssl/SSL_CTX_set_client_CA_list.pod 2001-04-12 11:02:34.061079552 -0500 -+++ openssl-1.0.0j-haiku/doc/ssl/SSL_CTX_set_client_CA_list.pod 2013-10-19 01:35:39.020709376 -0500 -@@ -66,11 +66,11 @@ - - =over 4 - --=item 1 -+=item C<1> - - The operation succeeded. - --=item 0 -+=item C<0> - - A failure while manipulating the STACK_OF(X509_NAME) object occurred or - the X509_NAME could not be extracted from B. Check the error stack -diff -Naur openssl-1.0.0j/doc/ssl/SSL_CTX_set_session_id_context.pod openssl-1.0.0j-haiku/doc/ssl/SSL_CTX_set_session_id_context.pod ---- openssl-1.0.0j/doc/ssl/SSL_CTX_set_session_id_context.pod 2004-06-14 08:27:28.062390272 -0500 -+++ openssl-1.0.0j-haiku/doc/ssl/SSL_CTX_set_session_id_context.pod 2013-10-19 01:35:39.022806528 -0500 -@@ -64,13 +64,13 @@ - - =over 4 - --=item 0 -+=item C<0> - - The length B of the session id context B exceeded - the maximum allowed length of B. The error - is logged to the error stack. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff -Naur openssl-1.0.0j/doc/ssl/SSL_CTX_set_ssl_version.pod openssl-1.0.0j-haiku/doc/ssl/SSL_CTX_set_ssl_version.pod ---- openssl-1.0.0j/doc/ssl/SSL_CTX_set_ssl_version.pod 2005-08-14 16:48:32.062652416 -0500 -+++ openssl-1.0.0j-haiku/doc/ssl/SSL_CTX_set_ssl_version.pod 2013-10-19 01:35:39.024903680 -0500 -@@ -42,11 +42,11 @@ - - =over 4 - --=item 0 -+=item C<0> - - The new choice failed, check the error stack to find out the reason. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff -Naur openssl-1.0.0j/doc/ssl/SSL_CTX_use_psk_identity_hint.pod openssl-1.0.0j-haiku/doc/ssl/SSL_CTX_use_psk_identity_hint.pod ---- openssl-1.0.0j/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2006-03-10 17:06:17.063176704 -0600 -+++ openssl-1.0.0j-haiku/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2013-10-19 01:35:39.027262976 -0500 -@@ -81,6 +81,8 @@ - - Return values from the server callback are interpreted as follows: - -+=over -+ - =item > 0 - - PSK identity was found and the server callback has provided the PSK -@@ -94,9 +96,11 @@ - connection will fail with decryption_error before it will be finished - completely. - --=item 0 -+=item C<0> - - PSK identity was not found. An "unknown_psk_identity" alert message - will be sent and the connection setup fails. - -+=back -+ - =cut -diff -Naur openssl-1.0.0j/doc/ssl/SSL_do_handshake.pod openssl-1.0.0j-haiku/doc/ssl/SSL_do_handshake.pod ---- openssl-1.0.0j/doc/ssl/SSL_do_handshake.pod 2002-07-19 06:05:49.063438848 -0500 -+++ openssl-1.0.0j-haiku/doc/ssl/SSL_do_handshake.pod 2013-10-19 01:35:39.029622272 -0500 -@@ -45,12 +45,12 @@ - - =over 4 - --=item 1 -+=item C<1> - - The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been - established. - --=item 0 -+=item C<0> - - The TLS/SSL handshake was not successful but was shut down controlled and - by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the -diff -Naur openssl-1.0.0j/doc/ssl/SSL_read.pod openssl-1.0.0j-haiku/doc/ssl/SSL_read.pod ---- openssl-1.0.0j/doc/ssl/SSL_read.pod 2008-08-01 10:03:20.065536000 -0500 -+++ openssl-1.0.0j-haiku/doc/ssl/SSL_read.pod 2013-10-19 01:35:39.031719424 -0500 -@@ -86,7 +86,7 @@ - The read operation was successful; the return value is the number of - bytes actually read from the TLS/SSL connection. - --=item 0 -+=item C<0> - - The read operation was not successful. The reason may either be a clean - shutdown due to a "close notify" alert sent by the peer (in which case -diff -Naur openssl-1.0.0j/doc/ssl/SSL_session_reused.pod openssl-1.0.0j-haiku/doc/ssl/SSL_session_reused.pod ---- openssl-1.0.0j/doc/ssl/SSL_session_reused.pod 2001-07-20 13:57:15.066060288 -0500 -+++ openssl-1.0.0j-haiku/doc/ssl/SSL_session_reused.pod 2013-10-19 01:35:39.033816576 -0500 -@@ -27,11 +27,11 @@ - - =over 4 - --=item 0 -+=item C<0> - - A new session was negotiated. - --=item 1 -+=item C<1> - - A session was reused. - -diff -Naur openssl-1.0.0j/doc/ssl/SSL_set_fd.pod openssl-1.0.0j-haiku/doc/ssl/SSL_set_fd.pod ---- openssl-1.0.0j/doc/ssl/SSL_set_fd.pod 2000-09-16 11:00:38.066322432 -0500 -+++ openssl-1.0.0j-haiku/doc/ssl/SSL_set_fd.pod 2013-10-19 01:35:39.035913728 -0500 -@@ -35,11 +35,11 @@ - - =over 4 - --=item 0 -+=item C<0> - - The operation failed. Check the error stack to find out why. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff -Naur openssl-1.0.0j/doc/ssl/SSL_set_session.pod openssl-1.0.0j-haiku/doc/ssl/SSL_set_session.pod ---- openssl-1.0.0j/doc/ssl/SSL_set_session.pod 2001-10-12 07:29:16.066584576 -0500 -+++ openssl-1.0.0j-haiku/doc/ssl/SSL_set_session.pod 2013-10-19 01:35:39.038010880 -0500 -@@ -37,11 +37,11 @@ - - =over 4 - --=item 0 -+=item C<0> - - The operation failed; check the error stack to find out the reason. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff -Naur openssl-1.0.0j/doc/ssl/SSL_shutdown.pod openssl-1.0.0j-haiku/doc/ssl/SSL_shutdown.pod ---- openssl-1.0.0j/doc/ssl/SSL_shutdown.pod 2004-11-14 07:55:16.066846720 -0600 -+++ openssl-1.0.0j-haiku/doc/ssl/SSL_shutdown.pod 2013-10-19 01:35:39.040108032 -0500 -@@ -92,12 +92,12 @@ - - =over 4 - --=item 1 -+=item C<1> - - The shutdown was successfully completed. The "close notify" alert was sent - and the peer's "close notify" alert was received. - --=item 0 -+=item C<0> - - The shutdown is not yet finished. Call SSL_shutdown() for a second time, - if a bidirectional shutdown shall be performed. -diff -Naur openssl-1.0.0j/doc/ssl/SSL_write.pod openssl-1.0.0j-haiku/doc/ssl/SSL_write.pod ---- openssl-1.0.0j/doc/ssl/SSL_write.pod 2002-07-19 06:53:54.000000000 -0500 -+++ openssl-1.0.0j-haiku/doc/ssl/SSL_write.pod 2013-10-19 01:35:39.042467328 -0500 -@@ -79,7 +79,7 @@ - The write operation was successful, the return value is the number of - bytes actually written to the TLS/SSL connection. - --=item 0 -+=item C<0> - - The write operation was not successful. Probably the underlying connection - was closed. Call SSL_get_error() with the return value B to find out, -diff -Naur openssl-1.0.0j/doc/apps/genpkey.pod openssl-1.0.0j-haiku/doc/apps/genpkey.pod ---- openssl-1.0.0j/doc/apps/genpkey.pod 2009-04-10 11:42:27.032505856 -0500 -+++ openssl-1.0.0j-haiku/doc/apps/genpkey.pod 2013-10-19 01:56:29.162529280 -0500 -@@ -114,6 +114,8 @@ - - The number of bits in the generated parameters. If not specified 1024 is used. - -+=back -+ - =head1 DH PARAMETER GENERATION OPTIONS - - =over 4 -diff -Naur openssl-1.0.0j/doc/apps/openssl.pod openssl-1.0.0j-haiku/doc/apps/openssl.pod ---- openssl-1.0.0j/doc/apps/openssl.pod 2010-01-21 12:46:28.033030144 -0600 -+++ openssl-1.0.0j-haiku/doc/apps/openssl.pod 2013-10-19 02:04:12.774111232 -0500 -@@ -287,8 +287,6 @@ - - SHA-1 Digest - --=back -- - =item B - - SHA-224 Digest -@@ -305,6 +303,8 @@ - - SHA-512 Digest - -+=back -+ - =head2 ENCODING AND CIPHER COMMANDS - - =over 10 -diff -Naur openssl-1.0.0j/Makefile.shared openssl-1.0.0j-haiku/Makefile.shared ---- openssl-1.0.0j/Makefile.shared 2010-08-21 06:36:49.017039360 -0500 -+++ openssl-1.0.0j-haiku/Makefile.shared 2013-10-19 01:35:15.668991488 -0500 -@@ -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 --git a/dev-libs/openssl/patches/openssl-1.0.0l.patchset b/dev-libs/openssl/patches/openssl-1.0.0l.patchset deleted file mode 100644 index 8b8e0ab62..000000000 --- a/dev-libs/openssl/patches/openssl-1.0.0l.patchset +++ /dev/null @@ -1,579 +0,0 @@ -From 4f6b8899f1231fbc3250dc17c63200007a51b2f5 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 15 May 2014 18:19:59 +0000 -Subject: import patch from 1.0.0j - - -diff --git a/Configure b/Configure -index cd849e3..0ff7727 100755 ---- a/Configure -+++ b/Configure -@@ -583,6 +583,10 @@ my %table=( - "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)", -+"haiku-x86_64", "gcc:-m64 -DL_ENDIAN -O2 -Wall -DMD32_REG_T=int::-D_REENTRANT::-lnetwork:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:haiku-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", -+ - ); - - my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A -diff --git a/Makefile.shared b/Makefile.shared -index e753f44..cce510f 100644 ---- a/Makefile.shared -+++ b/Makefile.shared -@@ -594,10 +594,10 @@ symlink.hpux: - 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 --git a/config b/config -index 30e9a37..c2894cc 100755 ---- a/config -+++ b/config -@@ -134,6 +134,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in - echo "${MACHINE}-dg-dgux"; exit 0 - ;; - -+ Haiku:*:BePC) -+ echo "i586-pc-haiku"; exit 0 -+ ;; -+ -+ Haiku:*:*) -+ echo "${MACHINE}-unknown-haiku"; exit 0 -+ ;; -+ - HI-UX:*) - echo "${MACHINE}-hi-hiux"; exit 0 - ;; -@@ -799,6 +807,9 @@ case "$GUESSOS" in - options="$options no-asm" - fi - ;; -+ i586-*-haiku) OUT="haiku-x86" ;; -+ x86_64-*-haiku) OUT="haiku-x86_64" ;; -+ - # these are all covered by the catchall below - # *-dgux) OUT="dgux" ;; - mips-sony-newsos4) OUT="newsos4-gcc" ;; -diff --git a/doc/apps/cms.pod b/doc/apps/cms.pod -index a09588a..2d19d91 100644 ---- a/doc/apps/cms.pod -+++ b/doc/apps/cms.pod -@@ -450,28 +450,28 @@ remains DER. - - =over 4 - --=item 0 -+=item C<0> - - the operation was completely successfully. - --=item 1 -+=item C<1> - - an error occurred parsing the command options. - --=item 2 -+=item C<2> - - one of the input files could not be read. - --=item 3 -+=item C<3> - - an error occurred creating the CMS file or when reading the MIME - message. - --=item 4 -+=item C<4> - - an error occurred decrypting or verifying the message. - --=item 5 -+=item C<5> - - the message was verified correctly but an error occurred writing out - the signers certificates. -diff --git a/doc/apps/genpkey.pod b/doc/apps/genpkey.pod -index 1611b5c..c74d097 100644 ---- a/doc/apps/genpkey.pod -+++ b/doc/apps/genpkey.pod -@@ -114,6 +114,8 @@ hexadecimal value if preceded by B<0x>. Default value is 65537. - - The number of bits in the generated parameters. If not specified 1024 is used. - -+=back -+ - =head1 DH PARAMETER GENERATION OPTIONS - - =over 4 -diff --git a/doc/apps/openssl.pod b/doc/apps/openssl.pod -index 738142e..64a160c 100644 ---- a/doc/apps/openssl.pod -+++ b/doc/apps/openssl.pod -@@ -287,8 +287,6 @@ SHA Digest - - SHA-1 Digest - --=back -- - =item B - - SHA-224 Digest -@@ -305,6 +303,8 @@ SHA-384 Digest - - SHA-512 Digest - -+=back -+ - =head2 ENCODING AND CIPHER COMMANDS - - =over 10 -diff --git a/doc/apps/smime.pod b/doc/apps/smime.pod -index e4e89af..72c7b24 100644 ---- a/doc/apps/smime.pod -+++ b/doc/apps/smime.pod -@@ -308,28 +308,28 @@ remains DER. - - =over 4 - --=item 0 -+=item C<0> - - the operation was completely successfully. - --=item 1 -+=item C<1> - - an error occurred parsing the command options. - --=item 2 -+=item C<2> - - one of the input files could not be read. - --=item 3 -+=item C<3> - - an error occurred creating the PKCS#7 file or when reading the MIME - message. - --=item 4 -+=item C<4> - - an error occurred decrypting or verifying the message. - --=item 5 -+=item C<5> - - the message was verified correctly but an error occurred writing out - the signers certificates. -diff --git a/doc/ssl/SSL_COMP_add_compression_method.pod b/doc/ssl/SSL_COMP_add_compression_method.pod -index 42fa66b..80175a3 100644 ---- a/doc/ssl/SSL_COMP_add_compression_method.pod -+++ b/doc/ssl/SSL_COMP_add_compression_method.pod -@@ -53,11 +53,11 @@ SSL_COMP_add_compression_method() may return the following values: - - =over 4 - --=item 0 -+=item C<0> - - The operation succeeded. - --=item 1 -+=item C<1> - - The operation failed. Check the error queue to find out the reason. - -diff --git a/doc/ssl/SSL_CTX_add_session.pod b/doc/ssl/SSL_CTX_add_session.pod -index 82676b2..fd927f8 100644 ---- a/doc/ssl/SSL_CTX_add_session.pod -+++ b/doc/ssl/SSL_CTX_add_session.pod -@@ -52,13 +52,13 @@ The following values are returned by all functions: - - =over 4 - --=item 0 -+=item C<0> - - The operation failed. In case of the add operation, it was tried to add - the same (identical) session twice. In case of the remove operation, the - session was not found in the cache. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff --git a/doc/ssl/SSL_CTX_load_verify_locations.pod b/doc/ssl/SSL_CTX_load_verify_locations.pod -index 84a799f..de01065 100644 ---- a/doc/ssl/SSL_CTX_load_verify_locations.pod -+++ b/doc/ssl/SSL_CTX_load_verify_locations.pod -@@ -100,13 +100,13 @@ The following return values can occur: - - =over 4 - --=item 0 -+=item C<0> - - The operation failed because B and B are NULL or the - processing at one of the locations specified failed. Check the error - stack to find out the reason. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff --git a/doc/ssl/SSL_CTX_set_client_CA_list.pod b/doc/ssl/SSL_CTX_set_client_CA_list.pod -index 5e66133..bcf35dc 100644 ---- a/doc/ssl/SSL_CTX_set_client_CA_list.pod -+++ b/doc/ssl/SSL_CTX_set_client_CA_list.pod -@@ -66,13 +66,13 @@ values: - - =over 4 - --=item 0 -+=item C<0> - - A failure while manipulating the STACK_OF(X509_NAME) object occurred or - the X509_NAME could not be extracted from B. Check the error stack - to find out the reason. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff --git a/doc/ssl/SSL_CTX_set_session_id_context.pod b/doc/ssl/SSL_CTX_set_session_id_context.pod -index 58fc685..ed0a81c 100644 ---- a/doc/ssl/SSL_CTX_set_session_id_context.pod -+++ b/doc/ssl/SSL_CTX_set_session_id_context.pod -@@ -64,13 +64,13 @@ return the following values: - - =over 4 - --=item 0 -+=item C<0> - - The length B of the session id context B exceeded - the maximum allowed length of B. The error - is logged to the error stack. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff --git a/doc/ssl/SSL_CTX_set_ssl_version.pod b/doc/ssl/SSL_CTX_set_ssl_version.pod -index 254f2b4..5ea8f0d 100644 ---- a/doc/ssl/SSL_CTX_set_ssl_version.pod -+++ b/doc/ssl/SSL_CTX_set_ssl_version.pod -@@ -42,11 +42,11 @@ and SSL_set_ssl_method(): - - =over 4 - --=item 0 -+=item C<0> - - The new choice failed, check the error stack to find out the reason. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff --git a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod -index 7e60df5..721e884 100644 ---- a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod -+++ b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod -@@ -83,6 +83,8 @@ Return values from the server callback are interpreted as follows: - - =over 4 - -+=over -+ - =item > 0 - - PSK identity was found and the server callback has provided the PSK -diff --git a/doc/ssl/SSL_clear.pod b/doc/ssl/SSL_clear.pod -index d4df1bf..2da0b02 100644 ---- a/doc/ssl/SSL_clear.pod -+++ b/doc/ssl/SSL_clear.pod -@@ -56,12 +56,12 @@ The following return values can occur: - - =over 4 - --=item 0 -+=item C<0> - - The SSL_clear() operation could not be performed. Check the error stack to - find out the reason. - --=item 1 -+=item C<1> - - The SSL_clear() operation was successful. - -diff --git a/doc/ssl/SSL_read.pod b/doc/ssl/SSL_read.pod -index 7038cd2..3982b81 100644 ---- a/doc/ssl/SSL_read.pod -+++ b/doc/ssl/SSL_read.pod -@@ -86,7 +86,7 @@ The following return values can occur: - The read operation was successful; the return value is the number of - bytes actually read from the TLS/SSL connection. - --=item 0 -+=item C<0> - - The read operation was not successful. The reason may either be a clean - shutdown due to a "close notify" alert sent by the peer (in which case -diff --git a/doc/ssl/SSL_session_reused.pod b/doc/ssl/SSL_session_reused.pod -index da7d062..033d54c 100644 ---- a/doc/ssl/SSL_session_reused.pod -+++ b/doc/ssl/SSL_session_reused.pod -@@ -27,11 +27,11 @@ The following return values can occur: - - =over 4 - --=item 0 -+=item C<0> - - A new session was negotiated. - --=item 1 -+=item C<1> - - A session was reused. - -diff --git a/doc/ssl/SSL_set_fd.pod b/doc/ssl/SSL_set_fd.pod -index 7029112..59e1b2b 100644 ---- a/doc/ssl/SSL_set_fd.pod -+++ b/doc/ssl/SSL_set_fd.pod -@@ -35,11 +35,11 @@ The following return values can occur: - - =over 4 - --=item 0 -+=item C<0> - - The operation failed. Check the error stack to find out why. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff --git a/doc/ssl/SSL_set_session.pod b/doc/ssl/SSL_set_session.pod -index 5f54714..d35e6d3 100644 ---- a/doc/ssl/SSL_set_session.pod -+++ b/doc/ssl/SSL_set_session.pod -@@ -37,11 +37,11 @@ The following return values can occur: - - =over 4 - --=item 0 -+=item C<0> - - The operation failed; check the error stack to find out the reason. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff --git a/doc/ssl/SSL_write.pod b/doc/ssl/SSL_write.pod -index e013c12..30f9e2b 100644 ---- a/doc/ssl/SSL_write.pod -+++ b/doc/ssl/SSL_write.pod -@@ -79,7 +79,7 @@ The following return values can occur: - The write operation was successful, the return value is the number of - bytes actually written to the TLS/SSL connection. - --=item 0 -+=item C<0> - - The write operation was not successful. Probably the underlying connection - was closed. Call SSL_get_error() with the return value B to find out, --- -1.8.3.4 - - -From 0c4539d72e181675fcc7bd1fdbf3d5ebabed2d51 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 15 May 2014 19:58:00 +0000 -Subject: doc fixes - - -diff --git a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod -index 721e884..d2644c6 100644 ---- a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod -+++ b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod -@@ -98,7 +98,7 @@ data to B and return the length of the random data, so the - connection will fail with decryption_error before it will be finished - completely. - --=item 0 -+=item C<0> - - PSK identity was not found. An "unknown_psk_identity" alert message - will be sent and the connection setup fails. --- -1.8.3.4 - - -From 94e239bab7b08aef02831852932696e7e472ea9f Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 15 May 2014 20:16:41 +0000 -Subject: doc fixes - - -diff --git a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod -index d2644c6..45f1ed5 100644 ---- a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod -+++ b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod -@@ -83,8 +83,6 @@ Return values from the server callback are interpreted as follows: - - =over 4 - --=over -- - =item > 0 - - PSK identity was found and the server callback has provided the PSK --- -1.8.3.4 - - -From 5c9a621eef12a8bb020f7994014cd34d97daee0d Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 15 May 2014 20:26:29 +0000 -Subject: doc fixes - - -diff --git a/doc/ssl/SSL_accept.pod b/doc/ssl/SSL_accept.pod -index b1c34d1..288203f 100644 ---- a/doc/ssl/SSL_accept.pod -+++ b/doc/ssl/SSL_accept.pod -@@ -44,13 +44,13 @@ The following return values can occur: - - =over 4 - --=item 0 -+=item C<0> - - The TLS/SSL handshake was not successful but was shut down controlled and - by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the - return value B to find out the reason. - --=item 1 -+=item C<1> - - The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been - established. --- -1.8.3.4 - - -From 282293a280a46d39cfecb786c45749e6532392b9 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 15 May 2014 20:40:45 +0000 -Subject: doc fixes - - -diff --git a/doc/ssl/SSL_connect.pod b/doc/ssl/SSL_connect.pod -index 946ca89..e62a838 100644 ---- a/doc/ssl/SSL_connect.pod -+++ b/doc/ssl/SSL_connect.pod -@@ -41,13 +41,13 @@ The following return values can occur: - - =over 4 - --=item 0 -+=item C<0> - - The TLS/SSL handshake was not successful but was shut down controlled and - by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the - return value B to find out the reason. - --=item 1 -+=item C<1> - - The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been - established. -diff --git a/doc/ssl/SSL_do_handshake.pod b/doc/ssl/SSL_do_handshake.pod -index 7f8cf24..88947ca 100644 ---- a/doc/ssl/SSL_do_handshake.pod -+++ b/doc/ssl/SSL_do_handshake.pod -@@ -45,13 +45,13 @@ The following return values can occur: - - =over 4 - --=item 0 -+=item C<0> - - The TLS/SSL handshake was not successful but was shut down controlled and - by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the - return value B to find out the reason. - --=item 1 -+=item C<1> - - The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been - established. -diff --git a/doc/ssl/SSL_set_shutdown.pod b/doc/ssl/SSL_set_shutdown.pod -index 011a022..9139211 100644 ---- a/doc/ssl/SSL_set_shutdown.pod -+++ b/doc/ssl/SSL_set_shutdown.pod -@@ -24,7 +24,7 @@ The shutdown state of an ssl connection is a bitmask of: - - =over 4 - --=item 0 -+=item C<0> - - No shutdown setting, yet. - -diff --git a/doc/ssl/SSL_shutdown.pod b/doc/ssl/SSL_shutdown.pod -index 42a89b7..d86ac7c 100644 ---- a/doc/ssl/SSL_shutdown.pod -+++ b/doc/ssl/SSL_shutdown.pod -@@ -92,19 +92,19 @@ The following return values can occur: - - =over 4 - --=item 0 -+=item C<0> - - The shutdown is not yet finished. Call SSL_shutdown() for a second time, - if a bidirectional shutdown shall be performed. - The output of L may be misleading, as an - erroneous SSL_ERROR_SYSCALL may be flagged even though no error occurred. - --=item 1 -+=item C<1> - - The shutdown was successfully completed. The "close notify" alert was sent - and the peer's "close notify" alert was received. - --=item -1 -+=item C<-1> - - The shutdown was not successful because a fatal error occurred either - at the protocol level or a connection failure occurred. It can also occur if --- -1.8.3.4 - diff --git a/dev-libs/openssl/patches/openssl-1.0.0n.patchset b/dev-libs/openssl/patches/openssl-1.0.0n.patchset new file mode 100644 index 000000000..ed643c50b --- /dev/null +++ b/dev-libs/openssl/patches/openssl-1.0.0n.patchset @@ -0,0 +1,102 @@ +From 32832917dfac06f89f0ef56f088859b2ad555f3e Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 5 Jun 2014 15:47:46 +0000 +Subject: [PATCH 1/2] import patch from 1.0.0l + +--- + Configure | 4 ++++ + Makefile.shared | 8 ++++---- + config | 11 +++++++++++ + 3 files changed, 19 insertions(+), 4 deletions(-) + +diff --git a/Configure b/Configure +index cd849e3..0ff7727 100755 +--- a/Configure ++++ b/Configure +@@ -583,6 +583,10 @@ my %table=( + "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)", ++"haiku-x86_64", "gcc:-m64 -DL_ENDIAN -O2 -Wall -DMD32_REG_T=int::-D_REENTRANT::-lnetwork:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:haiku-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", ++ + ); + + my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A +diff --git a/Makefile.shared b/Makefile.shared +index e753f44..cce510f 100644 +--- a/Makefile.shared ++++ b/Makefile.shared +@@ -594,10 +594,10 @@ symlink.hpux: + 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 --git a/config b/config +index 30e9a37..c2894cc 100755 +--- a/config ++++ b/config +@@ -134,6 +134,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in + echo "${MACHINE}-dg-dgux"; exit 0 + ;; + ++ Haiku:*:BePC) ++ echo "i586-pc-haiku"; exit 0 ++ ;; ++ ++ Haiku:*:*) ++ echo "${MACHINE}-unknown-haiku"; exit 0 ++ ;; ++ + HI-UX:*) + echo "${MACHINE}-hi-hiux"; exit 0 + ;; +@@ -799,6 +807,9 @@ case "$GUESSOS" in + options="$options no-asm" + fi + ;; ++ i586-*-haiku) OUT="haiku-x86" ;; ++ x86_64-*-haiku) OUT="haiku-x86_64" ;; ++ + # these are all covered by the catchall below + # *-dgux) OUT="dgux" ;; + mips-sony-newsos4) OUT="newsos4-gcc" ;; +-- +1.8.3.4 + +From ad3b79df8dbaaafa1297204c2632e3bbb2a26489 Mon Sep 17 00:00:00 2001 +From: Alexander von Gluck IV +Date: Sat, 21 Jun 2014 21:45:05 +0000 +Subject: [PATCH 2/2] openssl: Adjust default CA cert path + +--- + crypto/cryptlib.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h +index fc249c5..273aa94 100644 +--- a/crypto/cryptlib.h ++++ b/crypto/cryptlib.h +@@ -82,7 +82,7 @@ extern "C" { + #ifndef OPENSSL_SYS_VMS + #define X509_CERT_AREA OPENSSLDIR + #define X509_CERT_DIR OPENSSLDIR "/certs" +-#define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++#define X509_CERT_FILE OPENSSLDIR "/CARootCertificates.pem" + #define X509_PRIVATE_DIR OPENSSLDIR "/private" + #else + #define X509_CERT_AREA "SSLROOT:[000000]" +-- +1.8.3.4 +