haiku.git

author	Scott McCreary <scottmc2@gmail.com>	2010-04-16 5:18:34.0 +00:00:00
committer	Scott McCreary <scottmc2@gmail.com>	2010-04-16 5:18:34.0 +00:00:00
commit	ae85d9bebc31163e915c85cfdd4acc8d117aaf5f [patch]
tree	65267f5025288ee83cf867402b70678ed9219663
parent	6bea662d4c7edf92926e7fd66ae25730efe35fa1
download	ae85d9bebc31163e915c85cfdd4acc8d117aaf5f.tar.gz

Updated openSSL to 1.0.0, this required rebuilding openSSH, git, curl, neon, python, subversion, and perhaps others that will need to be updated.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36326 a95241bf-73f2-0310-859d-f6bbb57e9c96

Diff

 build/jam/OptionalBuildFeatures |  2 +-
 build/jam/OptionalPackages      | 24 +++++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index 7a422a7..63694af 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -12,7 +12,7 @@
}

local baseURL = http://haiku-files.org/files/optional-packages ;
HAIKU_OPENSSL_PACKAGE = openssl-0.9.8m-x86-gcc2-2010-03-03.zip ;
HAIKU_OPENSSL_PACKAGE = openssl-1.0.0-x86-gcc2-2010-04-08.zip ;
HAIKU_OPENSSL_URL = $(baseURL)/$(HAIKU_OPENSSL_PACKAGE) ;

if $(HAIKU_BUILD_FEATURE_SSL) {
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 03c29a9..1048046 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -356,8 +356,8 @@
	if $(TARGET_ARCH) != x86 {
		Echo "No optional package Curl available for $(TARGET_ARCH)" ;
	} else {
		InstallOptionalHaikuImagePackage curl-7.20.0-x86-gcc2-2010-03-03.zip
			: $(baseURL)/curl-7.20.0-x86-gcc2-2010-03-03.zip
		InstallOptionalHaikuImagePackage curl-7.20.1-x86-gcc2-2010-04-16.zip
			: $(baseURL)/curl-7.20.1-x86-gcc2-2010-04-16.zip
			:
			: true
		;
@@ -596,8 +596,8 @@
	if $(TARGET_ARCH) != x86 {
		Echo "No optional package Git available for $(TARGET_ARCH)" ;
	} else {
		InstallOptionalHaikuImagePackage git-1.6.4.2-r1a1-x86-gcc2-2009-08-30.zip
			: $(baseURL)/git-1.6.4.2-r1a1-x86-gcc2-2009-08-30.zip
		InstallOptionalHaikuImagePackage git-1.7.0.5-x86-gcc2-2010-04-14.zip
			: $(baseURL)/git-1.7.0.5-x86-gcc2-2010-04-14.zip
			:
			: true
		;
@@ -762,8 +762,8 @@
	if $(TARGET_ARCH) != x86 {
		Echo "No optional package Neon available for $(TARGET_ARCH)" ;
	} else {
		InstallOptionalHaikuImagePackage neon-0.29.3-x86-gcc2-2010-02-28.zip
			: $(baseURL)/neon-0.29.3-x86-gcc2-2010-02-28.zip
		InstallOptionalHaikuImagePackage neon-0.29.3-x86-gcc2-2010-04-08.zip
			: $(baseURL)/neon-0.29.3-x86-gcc2-2010-04-08.zip
			:
			: true
		;
@@ -865,8 +865,8 @@
				"variable to be set!" ;
		}

		InstallOptionalHaikuImagePackage openssh-5.3p1-r1a1-x86-gcc2-2009-10-11.zip
			: $(baseURL)/openssh-5.3p1-r1a1-x86-gcc2-2009-10-11.zip
		InstallOptionalHaikuImagePackage openssh-5.5p1-x86-gcc2-2010-04-16.zip
			: $(baseURL)/openssh-5.5p1-x86-gcc2-2010-04-16.zip
			:
		;

@@ -974,8 +974,8 @@
	if $(TARGET_ARCH) != x86 {
		Echo "No optional package Python available for $(TARGET_ARCH)" ;
	} else {
		InstallOptionalHaikuImagePackage python-2.6.5-x86-gcc2-2010-03-20.zip
			: $(baseURL)/python-2.6.5-x86-gcc2-2010-03-20.zip
		InstallOptionalHaikuImagePackage python-2.6.5-x86-gcc2-2010-04-08.zip
			: $(baseURL)/python-2.6.5-x86-gcc2-2010-04-08.zip
			:
			: true
		;
@@ -1029,8 +1029,8 @@
	if $(TARGET_ARCH) != x86 {
		Echo "No optional package Subversion available for $(TARGET_ARCH)" ;
	} else {
		InstallOptionalHaikuImagePackage subversion-1.6.9-x86-gcc2-2010-03-15.zip
			: $(baseURL)/subversion-1.6.9-x86-gcc2-2010-03-15.zip
		InstallOptionalHaikuImagePackage subversion-1.6.9-x86-gcc2-2010-04-08.zip
			: $(baseURL)/subversion-1.6.9-x86-gcc2-2010-04-08.zip
			:
			: true
		;