From 15426bc2a4d1b7b54f03a2255963774494eb9eb1 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 24 Dec 2010 19:21:12 +0000 Subject: [PATCH] Updated openssl to 1.0.0c Updated curl to 7.21.3 Updated build of SDL to include off by 1 resolution fix by GCI student Daniel Marth, and the OpenGL fix by Urias McCullough git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39940 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalBuildFeatures | 4 ++-- build/jam/OptionalLibPackages | 8 ++++---- build/jam/OptionalPackages | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures index f8693b560d..21b5d444da 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.0a-x86-gcc4-2010-11-12.zip ; + HAIKU_OPENSSL_PACKAGE = openssl-1.0.0c-x86-gcc4-2010-12-23.zip ; } else { - HAIKU_OPENSSL_PACKAGE = openssl-1.0.0a-x86-gcc2-2010-08-29.zip ; + HAIKU_OPENSSL_PACKAGE = openssl-1.0.0c-x86-gcc2-2010-12-23.zip ; } local baseURL = http://haiku-files.org/files/optional-packages ; diff --git a/build/jam/OptionalLibPackages b/build/jam/OptionalLibPackages index d69da958d9..e94a63aed4 100644 --- a/build/jam/OptionalLibPackages +++ b/build/jam/OptionalLibPackages @@ -261,8 +261,8 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] { Echo "No optional package SDLLibs available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libsdl-1.2-hg-x86-gcc4-2010-10-30.zip - : $(baseURL)/lib/libsdl-1.2-hg-x86-gcc4-2010-10-30.zip ; + libsdl-1.2-hg-x86-gcc4-2010-12-23.zip + : $(baseURL)/lib/libsdl-1.2-hg-x86-gcc4-2010-12-23.zip ; InstallOptionalHaikuImagePackage guilib-1.2.1-x86-gcc4-2010-10-30.zip : $(baseURL)/lib/guilib-1.2.1-x86-gcc4-2010-10-30.zip ; @@ -298,8 +298,8 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] { : $(baseURL)/lib/smpeg-0.4.5-x86-gcc4-2010-10-29.zip ; } else { InstallOptionalHaikuImagePackage - libsdl-1.2-hg-x86-gcc2-2010-10-29.zip - : $(baseURL)/lib/libsdl-1.2-hg-x86-gcc2-2010-10-29.zip ; + libsdl-1.2-hg-x86-gcc2-2010-12-23.zip + : $(baseURL)/lib/libsdl-1.2-hg-x86-gcc2-2010-12-23.zip ; InstallOptionalHaikuImagePackage guilib-1.2.1-x86-gcc2-2010-10-29.zip : $(baseURL)/lib/guilib-1.2.1-x86-gcc2-2010-10-29.zip ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 59976c6e10..9846b1d1d0 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -474,12 +474,12 @@ if [ IsOptionalHaikuImagePackageAdded Curl ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Curl available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage curl-7.21.2-x86-gcc4-2010-11-12.zip - : $(baseURL)/curl-7.21.2-x86-gcc4-2010-11-12.zip + InstallOptionalHaikuImagePackage curl-7.21.3-x86-gcc4-2010-12-23.zip + : $(baseURL)/curl-7.21.3-x86-gcc4-2010-12-23.zip : : true ; } else { - InstallOptionalHaikuImagePackage curl-7.21.2-x86-gcc2-2010-10-13.zip - : $(baseURL)/curl-7.21.2-x86-gcc2-2010-10-13.zip + InstallOptionalHaikuImagePackage curl-7.21.3-x86-gcc2-2010-12-23.zip + : $(baseURL)/curl-7.21.3-x86-gcc2-2010-12-23.zip : : true ; } }