Update OpenSSL package to 0.9.8j and relocate it to /boot/common. Thanks to Matt Madia and Scott McCreary for the patches! This closes ticket #2640.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29100 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
dc027966d7
commit
10bc1510be
@ -378,9 +378,9 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
|
|||||||
Echo "No optional package OpenSSL available for $(TARGET_ARCH)" ;
|
Echo "No optional package OpenSSL available for $(TARGET_ARCH)" ;
|
||||||
} else {
|
} else {
|
||||||
local baseURL = http://haiku-files.org/files/optional-packages ;
|
local baseURL = http://haiku-files.org/files/optional-packages ;
|
||||||
InstallOptionalHaikuImagePackage openssl-0.9.8g-gcc2-2008-03-28
|
InstallOptionalHaikuImagePackage openssl-0.9.8j-gcc2-2009-01-28
|
||||||
: $(baseURL)/openssl-0.9.8g-gcc2-2008-03-28.zip
|
: $(baseURL)/openssl-0.9.8j-gcc2-2009-01-28.zip
|
||||||
: home
|
:
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,7 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
|
|||||||
if $(USE_SSL) {
|
if $(USE_SSL) {
|
||||||
SubDirC++Flags -DUSE_SSL ;
|
SubDirC++Flags -DUSE_SSL ;
|
||||||
if ! $(SSL_DIR) {
|
if ! $(SSL_DIR) {
|
||||||
sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl config ] ;
|
sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl common ] ;
|
||||||
} else {
|
} else {
|
||||||
sslDir = $(SSL_DIR) ;
|
sslDir = $(SSL_DIR) ;
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,7 @@ local sslDir ;
|
|||||||
if $(USE_SSL) {
|
if $(USE_SSL) {
|
||||||
SubDirC++Flags -DUSE_SSL ;
|
SubDirC++Flags -DUSE_SSL ;
|
||||||
if ! $(SSL_DIR) {
|
if ! $(SSL_DIR) {
|
||||||
sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl config ] ;
|
sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl common ] ;
|
||||||
} else {
|
} else {
|
||||||
sslDir = $(SSL_DIR) ;
|
sslDir = $(SSL_DIR) ;
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,7 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
|
|||||||
if $(USE_SSL) {
|
if $(USE_SSL) {
|
||||||
SubDirC++Flags -DUSE_SSL ;
|
SubDirC++Flags -DUSE_SSL ;
|
||||||
if ! $(SSL_DIR) {
|
if ! $(SSL_DIR) {
|
||||||
sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl config ] ;
|
sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl common ] ;
|
||||||
} else {
|
} else {
|
||||||
sslDir = $(SSL_DIR) ;
|
sslDir = $(SSL_DIR) ;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user