From 10bc1510be8f37a1f328f595260d8bf5a69cc150 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Sat, 31 Jan 2009 16:04:12 +0000 Subject: [PATCH] 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 --- build/jam/OptionalPackages | 6 +++--- src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile | 2 +- src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile | 2 +- src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index a0da2ca656..a8f9ff4224 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -378,9 +378,9 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] { Echo "No optional package OpenSSL available for $(TARGET_ARCH)" ; } else { local baseURL = http://haiku-files.org/files/optional-packages ; - InstallOptionalHaikuImagePackage openssl-0.9.8g-gcc2-2008-03-28 - : $(baseURL)/openssl-0.9.8g-gcc2-2008-03-28.zip - : home + InstallOptionalHaikuImagePackage openssl-0.9.8j-gcc2-2009-01-28 + : $(baseURL)/openssl-0.9.8j-gcc2-2009-01-28.zip + : ; } } diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile index bd86b6dcac..a0c73b6768 100644 --- a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile +++ b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile @@ -14,7 +14,7 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ; if $(USE_SSL) { SubDirC++Flags -DUSE_SSL ; if ! $(SSL_DIR) { - sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl config ] ; + sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl common ] ; } else { sslDir = $(SSL_DIR) ; } diff --git a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile index 994ba2fab8..f839aac19d 100644 --- a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile +++ b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile @@ -16,7 +16,7 @@ local sslDir ; if $(USE_SSL) { SubDirC++Flags -DUSE_SSL ; if ! $(SSL_DIR) { - sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl config ] ; + sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl common ] ; } else { sslDir = $(SSL_DIR) ; } diff --git a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile index 58396adf93..54a3ced8c9 100644 --- a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile +++ b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile @@ -14,7 +14,7 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ; if $(USE_SSL) { SubDirC++Flags -DUSE_SSL ; if ! $(SSL_DIR) { - sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl config ] ; + sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl common ] ; } else { sslDir = $(SSL_DIR) ; }