From f6144bf7196f8f1bd46fdc28bb41035c51487867 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 9 Sep 2011 22:27:08 +0000 Subject: [PATCH] Updated openssl to 1.0.0e and openssh to 5.9p1. Note that this moves the ssl directory to now be in B_COMMON_DATA_DIRECTORY/ssl, and may require rebuilding of other packages as well. See Haikuports changeset1635 and Haiku r41767. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42733 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalBuildFeatures | 4 ++-- build/jam/OptionalPackages | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures index b12bbd1999..00d38406ab 100644 --- a/build/jam/OptionalBuildFeatures +++ b/build/jam/OptionalBuildFeatures @@ -12,9 +12,9 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] { } if $(HAIKU_GCC_VERSION[1]) >= 4 { - HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-r1a3-x86-gcc4-2011-05-20.zip ; + HAIKU_OPENSSL_PACKAGE = openssl-1.0.0e-x86-gcc4-2011-09-08.zip ; } else { - HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-r1a3-x86-gcc2-2011-05-17.zip ; + HAIKU_OPENSSL_PACKAGE = openssl-1.0.0e-x86-gcc2-2011-09-09.zip ; } local baseURL = http://haiku-files.org/files/optional-packages ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 12c5e08b12..2db287c254 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -1250,12 +1250,12 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - openssh-5.8p2-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/openssh-5.8p2-r1a3-x86-gcc4-2011-05-24.zip ; + openssh-5.9p1-x86-gcc4-2011-09-08.zip + : $(baseURL)/openssh-5.9p1-x86-gcc4-2011-09-08.zip ; } else { InstallOptionalHaikuImagePackage - openssh-5.8p2-r1a3-x86-gcc2-2011-05-18.zip - : $(baseURL)/openssh-5.8p2-r1a3-x86-gcc2-2011-05-18.zip ; + openssh-5.9p1-x86-gcc2-2011-09-09.zip + : $(baseURL)/openssh-5.9p1-x86-gcc2-2011-09-09.zip ; } AddUserToHaikuImage sshd : 1001 : 100 : /var/empty : /bin/true