hrev43758 adds 3 changesets to branch 'master' old head: 7e2730f0485e36b0111eff0c5cca5da71dcd8eb7 new head: bff40a31c1af031ad0e46d190f2e1af51cbabebf ---------------------------------------------------------------------------- 94c3d30: Created CARootCertificates, extracts to common/data/ssl/cert.pem Via a cron script, www.haiku-files.org will automatically create a new package from http://curl.haxx.se/ca/cacert.pem. This new package satisfies our OpenSSL's expectations of where the certificate file lives. It also ensures that new builds of Haiku will have the newest certificate file. As an example, the cacert.pem included in Web+ was from Sept-2009. Updated builds of Curl and Web+ to follow. ea70913: Rebuilt Curl 7.21.7 (haikuports r1815) to support cert.pem Thanks Chris Roberts for the help with Curl! bff40a3: Updated WebPositive. Supports common/data/ssl/cert.pem This package contains only the app + libs. The certificate file is satisfied through OptionalPackageDependencies. The bookmarks have been moved (and updated) to a separate archive. Thanks Rene Gollent and Chris Roberts for the help! This group of changesets should close #7707, though it is possible that other optional-packages, pre-built software will still fail to locate the certificates file in the new location. [ Matt Madia <mattmadia@xxxxxxxxx> ] ---------------------------------------------------------------------------- 2 files changed, 24 insertions(+), 7 deletions(-) build/jam/OptionalPackageDependencies | 3 ++- build/jam/OptionalPackages | 28 ++++++++++++++++++++++------ ############################################################################ Commit: 94c3d306db4ba4bfd7b666fa74ccf97379d4a295 URL: http://cgit.haiku-os.org/haiku/commit/?id=94c3d30 Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Sun Feb 19 09:14:03 2012 UTC Created CARootCertificates, extracts to common/data/ssl/cert.pem Via a cron script, www.haiku-files.org will automatically create a new package from http://curl.haxx.se/ca/cacert.pem. This new package satisfies our OpenSSL's expectations of where the certificate file lives. It also ensures that new builds of Haiku will have the newest certificate file. As an example, the cacert.pem included in Web+ was from Sept-2009. Updated builds of Curl and Web+ to follow. ---------------------------------------------------------------------------- diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies index de55869..d64f501 100644 --- a/build/jam/OptionalPackageDependencies +++ b/build/jam/OptionalPackageDependencies @@ -26,6 +26,7 @@ OptionalPackageDependencies Neon : LibXML2 ; OptionalPackageDependencies NetFS : UserlandFS ; OptionalPackageDependencies NetSurf : OpenSSL Curl LibXML2 LibIconv Libmng ; OptionalPackageDependencies OpenSSH : OpenSSL ; +OptionalPackageDependencies OpenSSL : CARootCertificates ; OptionalPackageDependencies Paladin : CCache Fastdep ; OptionalPackageDependencies Pe : PCRE ; OptionalPackageDependencies SDLLibs : XiphLibs libmad libmikmod Libmng libmodplug physfs ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index d5dee2f..9ed8132 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -353,6 +353,14 @@ if [ IsOptionalHaikuImagePackageAdded Bzip ] { } +# CARootCertificates +if [ IsOptionalHaikuImagePackageAdded CARootCertificates ] { + InstallOptionalHaikuImagePackage cert.zip + : $(baseURL)/cert.zip + : common data ssl ; +} + + # CCache if [ IsOptionalHaikuImagePackageAdded CCache ] { if $(TARGET_ARCH) != x86 { ############################################################################ Commit: ea70913a5c45216ffab0b77a989d305d88663ec7 URL: http://cgit.haiku-os.org/haiku/commit/?id=ea70913 Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Sun Feb 19 09:16:02 2012 UTC Rebuilt Curl 7.21.7 (haikuports r1815) to support cert.pem Thanks Chris Roberts for the help with Curl! ---------------------------------------------------------------------------- diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 9ed8132..b31f644 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -473,11 +473,11 @@ 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.7-x86-gcc4-2011-06-23.zip - : $(baseURL)/curl-7.21.7-x86-gcc4-2011-06-23.zip ; + InstallOptionalHaikuImagePackage curl-7.21.7-x86-gcc4-2012-02-18.zip + : $(baseURL)/curl-7.21.7-x86-gcc4-2012-02-18.zip ; } else { - InstallOptionalHaikuImagePackage curl-7.21.7-x86-gcc2-2011-06-23.zip - : $(baseURL)/curl-7.21.7-x86-gcc2-2011-06-23.zip ; + InstallOptionalHaikuImagePackage curl-7.21.7-x86-gcc2-2012-02-18.zip + : $(baseURL)/curl-7.21.7-x86-gcc2-2012-02-18.zip ; } } ############################################################################ Revision: hrev43758 Commit: bff40a31c1af031ad0e46d190f2e1af51cbabebf URL: http://cgit.haiku-os.org/haiku/commit/?id=bff40a3 Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Sun Feb 19 09:26:10 2012 UTC Ticket: https://dev.haiku-os.org/ticket/7707 Updated WebPositive. Supports common/data/ssl/cert.pem This package contains only the app + libs. The certificate file is satisfied through OptionalPackageDependencies. The bookmarks have been moved (and updated) to a separate archive. Thanks Rene Gollent and Chris Roberts for the help! This group of changesets should close #7707, though it is possible that other optional-packages, pre-built software will still fail to locate the certificates file in the new location. ---------------------------------------------------------------------------- diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies index d64f501..97bf7b6 100644 --- a/build/jam/OptionalPackageDependencies +++ b/build/jam/OptionalPackageDependencies @@ -33,7 +33,7 @@ OptionalPackageDependencies SDLLibs : XiphLibs libmad libmikmod Libmng libmodplu OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL SQLite ; OptionalPackageDependencies Transmission : LibEvent Curl OpenSSL LibIconv ; OptionalPackageDependencies Vim : GetText LibIconv ; -OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite ; +OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite WebPositiveBookmarks ; OptionalPackageDependencies wpa_supplicant : OpenSSL ; OptionalPackageDependencies XZ-Utils : Tar ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index b31f644..de2e34a 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -88,6 +88,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1 # Vim - Vi IMproved. Highly configurable text editor # Vision - powerful native IRC client # WebPositive - native, WebKit-based web browser +# WebPositiveBookmarks - bookmarks for WebPositive # Welcome - introductory documentation to Haiku # WifiFirmwareScriptData - data files needed by install-wifi-firmwares.sh # WonderBrush - native graphics application @@ -1722,14 +1723,21 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] { Echo "No optional package WebPositive available for gcc2" ; } else { InstallOptionalHaikuImagePackage - WebPositive-gcc4-x86-r583-2012-01-23a.zip - : $(baseURL)/WebPositive-gcc4-x86-r583-2012-01-23a.zip ; + WebPositive-gcc4-x86-r584-2012-02-18.zip + : $(baseURL)/WebPositive-gcc4-x86-r584-2012-02-18.zip ; AddSymlinkToHaikuImage home config settings deskbar Applications : /boot/apps/WebPositive/WebPositive ; } } +# WebPositiveBookmarks +if [ IsOptionalHaikuImagePackageAdded WebPositiveBookmarks ] { + InstallOptionalHaikuImagePackage WebPositiveBookmarks-2012-02-18.zip + : $(baseURL)/WebPositiveBookmarks-2012-02-18.zip + : home config settings WebPositive ; +} + # Welcome if [ IsOptionalHaikuImagePackageAdded Welcome ] { CopyDirectoryToHaikuImage system documentation