From f44d20cb494cfa381f040e0f9bc3fa6f5919f9f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Wed, 12 Nov 2014 20:02:04 +0100 Subject: [PATCH] Update curl and libpng packages, add libpng16 packages. * curl: security update for CVE-2014-3707 * libpng16 can be installed next to libpng, libpng16_devel cannot be installed next to libpng_devel (only one of them). --- build/jam/repositories/HaikuPorts/x86 | 21 +++++++++++++-------- build/jam/repositories/HaikuPorts/x86_64 | 11 +++++++---- build/jam/repositories/HaikuPorts/x86_gcc2 | 21 +++++++++++++-------- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/build/jam/repositories/HaikuPorts/x86 b/build/jam/repositories/HaikuPorts/x86 index 354dd76629..95c6872602 100644 --- a/build/jam/repositories/HaikuPorts/x86 +++ b/build/jam/repositories/HaikuPorts/x86 @@ -31,8 +31,8 @@ RemotePackageRepository HaikuPorts cmake-3.0.0_rc3-1 cpio-2.10-1 ctags-5.8-3 - curl-7.36.0-1 - curl_devel-7.36.0-1 + curl-7.39.0-1 + curl_devel-7.39.0-1 cvs-1.12.13.1-6 doxygen-1.6.3-4 dtc-1.4.0-1 @@ -105,8 +105,10 @@ RemotePackageRepository HaikuPorts libogg_devel-1.3.0-2 libpcre-8.21-5 libpcre_devel-8.21-5 - libpng-1.5.12-3 - libpng_devel-1.5.12-3 + libpng-1.5.12-4 + libpng_devel-1.5.12-4 + libpng16-1.6.13-1 + libpng16_devel-1.6.13-1 libsdl-1.2.15-6 libsdl_devel-1.2.15-6 libsolv-0.3.0_haiku_2013_10_01-2 @@ -194,8 +196,8 @@ RemotePackageRepository HaikuPorts binutils_x86_gcc2-2.17_2013_04_21-2 bzip2_x86_gcc2-1.0.6-5 bzip2_x86_gcc2_devel-1.0.6-5 - curl_x86_gcc2-7.26.0-5 - curl_x86_gcc2_devel-7.26.0-5 + curl_x86_gcc2-7.39.0-1 + curl_x86_gcc2_devel-7.39.0-1 expat_x86_gcc2-2.0.1-7 expat_x86_gcc2_devel-2.0.1-7 ffmpeg_x86_gcc2-0.10.2-4 @@ -229,8 +231,10 @@ RemotePackageRepository HaikuPorts libiconv_x86_gcc2_devel-1.13.1-6 libogg_x86_gcc2-1.3.0-2 libogg_x86_gcc2_devel-1.3.0-2 - libpng_x86_gcc2-1.5.12-3 - libpng_x86_gcc2_devel-1.5.12-3 + libpng_x86_gcc2-1.5.12-4 + libpng_x86_gcc2_devel-1.5.12-4 + libpng16_x86_gcc2-1.6.13-1 + libpng16_x86_gcc2_devel-1.6.13-1 libsolv_x86_gcc2-0.3.0_haiku_2013_10_01-2 libsolv_x86_gcc2_devel-0.3.0_haiku_2013_10_01-2 libtheora_x86_gcc2-1.1.1-2 @@ -321,6 +325,7 @@ RemotePackageRepository HaikuPorts libogg libpcre libpng + libpng16 libsdl libsolv libtheora diff --git a/build/jam/repositories/HaikuPorts/x86_64 b/build/jam/repositories/HaikuPorts/x86_64 index 9081676751..5e4e19d690 100644 --- a/build/jam/repositories/HaikuPorts/x86_64 +++ b/build/jam/repositories/HaikuPorts/x86_64 @@ -27,8 +27,8 @@ RemotePackageRepository HaikuPorts cdrtools-3.01~a07-3 cmake-3.0.0_rc6-1 ctags-5.8-3 - curl-7.38.0-1 - curl_devel-7.38.0-1 + curl-7.39.0-1 + curl_devel-7.39.0-1 cvs-1.12.13.1-6 doxygen-1.6.3-4 dtc-1.4.0-1 @@ -104,8 +104,10 @@ RemotePackageRepository HaikuPorts libogg_devel-1.3.0-2 libpcre-8.21-5 libpcre_devel-8.21-5 - libpng-1.5.12-3 - libpng_devel-1.5.12-3 + libpng-1.5.12-4 + libpng_devel-1.5.12-4 + libpng16-1.6.13-1 + libpng16_devel-1.6.13-1 libsndfile-1.0.25-3 libsndfile_devel-1.0.25-3 libsdl-1.2.15-6 @@ -250,6 +252,7 @@ RemotePackageRepository HaikuPorts libogg libpcre libpng + libpng16 libsdl libsndfile libsolv diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2 b/build/jam/repositories/HaikuPorts/x86_gcc2 index 54a768e686..8e803c447f 100644 --- a/build/jam/repositories/HaikuPorts/x86_gcc2 +++ b/build/jam/repositories/HaikuPorts/x86_gcc2 @@ -53,8 +53,8 @@ RemotePackageRepository HaikuPorts cdrtools-3.01~a18-1 cdrtools_devel-3.01~a18-1 ctags-5.8-3 - curl-7.37.1-1 - curl_devel-7.37.1-1 + curl-7.39.0-1 + curl_devel-7.39.0-1 cvs-1.12.13.1-6 dfu_util-0.7-1 distcc-3.1-3 @@ -173,8 +173,10 @@ RemotePackageRepository HaikuPorts libpaper_devel-1.1.24-1 libpcre-8.21-5 libpcre_devel-8.21-5 - libpng-1.5.12-3 - libpng_devel-1.5.12-3 + libpng-1.5.12-4 + libpng_devel-1.5.12-4 + libpng16-1.6.13-1 + libpng16_devel-1.6.13-1 libpthread_stubs-0.3-2 libsanta-3.0.0-3 libsanta_devel-3.0.0-3 @@ -376,8 +378,8 @@ RemotePackageRepository HaikuPorts confuse_x86-2.7-1 confuse_x86_devel-2.7-1 copynametoclipboard-1.0.1-2 - curl_x86-7.26.0-5 - curl_x86_devel-7.26.0-5 + curl_x86-7.39.0-1 + curl_x86_devel-7.39.0-1 cvsps_x86-2.2b1-1 dbus_x86-1.8.6-1 dbus_x86_devel-1.8.6-1 @@ -479,8 +481,10 @@ RemotePackageRepository HaikuPorts libpaper_x86_devel-1.1.24-1 libpcre_x86-8.33-2 libpcre_x86_devel-8.33-2 - libpng_x86-1.5.12-3 - libpng_x86_devel-1.5.12-3 + libpng_x86-1.5.12-4 + libpng_x86_devel-1.5.12-4 + libpng16_x86-1.6.13-1 + libpng16_x86_devel-1.6.13-1 libqt4_x86-4.8.6.4-1 libqt4_x86_devel-4.8.6.4-1 libsdl_x86-1.2.15-7 @@ -749,6 +753,7 @@ RemotePackageRepository HaikuPorts libpcre libpcre_x86 libpng + libpng16 libpthread_stubs libqt4_x86 libsanta