i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated builds of openssl, openssh, git, mercurial, curl and neon.

Browse Source 
Fixed typo on previous commit of expat.
Note that this moves the location of openssl, so other packages that 
make use of openssl may or may not require rebuilding as well.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41458 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Scott McCreary
2011-05-12 00:40:21 +00:00
parent 0798779a2f
commit fb90397da7
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalBuildFeatures
+2 -2
View File
@@ -12,9 +12,9 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
} }
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_OPENSSL_PACKAGE = openssl-1.0.0c-x86-gcc4-2010-12-23.zip ; HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-x86-gcc4-2011-05-04.zip ;
} else { } else {
HAIKU_OPENSSL_PACKAGE = openssl-1.0.0c-x86-gcc2-2010-12-23.zip ; HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-x86-gcc2-2011-05-08.zip ;
} }
local baseURL = http://haiku-files.org/files/optional-packages ; local baseURL = http://haiku-files.org/files/optional-packages ;
build/jam/OptionalPackages
+17 -17
View File
@@ -435,11 +435,11 @@ if [ IsOptionalHaikuImagePackageAdded Curl ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package Curl available for $(TARGET_ARCH)" ; Echo "No optional package Curl available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage curl-7.21.4-x86-gcc4-2011-03-14.zip InstallOptionalHaikuImagePackage curl-7.21.4-x86-gcc4-2011-05-10.zip
: $(baseURL)/curl-7.21.4-x86-gcc4-2011-03-14.zip ; : $(baseURL)/curl-7.21.6-x86-gcc4-2011-05-10.zip ;
} else { } else {
InstallOptionalHaikuImagePackage curl-7.21.4-x86-gcc2-2011-03-14.zip InstallOptionalHaikuImagePackage curl-7.21.6-x86-gcc2-2011-05-10.zip
: $(baseURL)/curl-7.21.4-x86-gcc2-2011-03-14.zip ; : $(baseURL)/curl-7.21.6-x86-gcc2-2011-05-10.zip ;
} }
} }
@@ -733,7 +733,7 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] {
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
expat-2.0.1-r1a2-x86-gcc2-2011-05-08.zip expat-2.0.1-x86-gcc2-2011-05-08.zip
: $(baseURL)/expat-2.0.1-x86-gcc2-2011-05-08.zip : $(baseURL)/expat-2.0.1-x86-gcc2-2011-05-08.zip
: : true ; : : true ;
} }
@@ -795,8 +795,8 @@ if [ IsOptionalHaikuImagePackageAdded Git ] {
Echo "No optional package Git available for $(TARGET_ARCH)" ; Echo "No optional package Git available for $(TARGET_ARCH)" ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
git-1.7.3.5-x86-gcc2-2011-03-15.zip git-1.7.5-x86-gcc2-2011-05-10.zip
: $(baseURL)/git-1.7.3.5-x86-gcc2-2011-03-15.zip : $(baseURL)/git-1.7.5-x86-gcc2-2011-05-10.zip
: : true ; : : true ;
} }
} }
@@ -1070,13 +1070,13 @@ if [ IsOptionalHaikuImagePackageAdded Mercurial ] {
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
mercurial-1.6-x86-gcc4-2010-11-12.zip mercurial-1.8.3-x86-gcc4-2011-05-10.zip
: $(baseURL)/mercurial-1.6-x86-gcc4-2010-11-12.zip : $(baseURL)/mercurial-1.8.3-x86-gcc4-2011-05-10.zip
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
mercurial-1.6-x86-gcc2-2010-07-01.zip mercurial-1.8.3-x86-gcc2-2011-05-10.zip
: $(baseURL)/mercurial-1.6-x86-gcc2-2010-07-01.zip : $(baseURL)/mercurial-1.8.3-x86-gcc2-2011-05-10.zip
: : true ; : : true ;
} }
} }
@@ -1112,8 +1112,8 @@ if [ IsOptionalHaikuImagePackageAdded Neon ] {
: $(baseURL)/neon-0.29.5-x86-gcc4-2011-03-16.zip ; : $(baseURL)/neon-0.29.5-x86-gcc4-2011-03-16.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
neon-0.29.5-x86-gcc2-2011-03-16.zip neon-0.29.6-x86-gcc2-2011-05-10.zip
: $(baseURL)/neon-0.29.5-x86-gcc2-2011-03-16.zip ; : $(baseURL)/neon-0.29.6-x86-gcc2-2011-05-10.zip ;
} }
} }
} }
@@ -1204,12 +1204,12 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
openssh-5.8p1-x86-gcc4-2011-02-28.zip openssh-5.8p2-x86-gcc4-2011-05-11.zip
: $(baseURL)/openssh-5.8p1-x86-gcc4-2011-02-28.zip ; : $(baseURL)/openssh-5.8p2-x86-gcc4-2011-05-11.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
openssh-5.8p1-x86-gcc2-2011-03-01.zip openssh-5.8p2-x86-gcc2-2011-05-10.zip
: $(baseURL)/openssh-5.8p1-x86-gcc2-2011-03-01.zip ; : $(baseURL)/openssh-5.8p2-x86-gcc2-2011-05-10.zip ;
} }
AddUserToHaikuImage sshd : 1001 : 100 : /var/empty : /bin/true AddUserToHaikuImage sshd : 1001 : 100 : /var/empty : /bin/true