hrev49885 adds 2 changesets to branch 'master'
old head: 087cbdf98d139bb977138ce44c13935f77a8d876
new head: e7e318fc73b16374a1aa978fcef4136a7dba9d8e
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=e7e318fc73b1+%5E087cbdf98d13
----------------------------------------------------------------------------
e1fa42848bfd: Update openssl package for x86.
* libssl and libcrypto provides aren't compatible: rebuilt dependent packages.
* some packages built by Anevilyak.
e7e318fc73b1: haiku-x86: add a dependency on libssl and libcrypt
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 48 insertions(+), 38 deletions(-)
build/jam/repositories/HaikuPorts/x86 | 82 +++++++++++++++++--------------
src/data/package_infos/x86/haiku | 4 ++
############################################################################
Commit: e1fa42848bfd770410a6c7139e318676677df4d7
URL: http://cgit.haiku-os.org/haiku/commit/?id=e1fa42848bfd
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Thu Nov 26 17:44:33 2015 UTC
Update openssl package for x86.
* libssl and libcrypto provides aren't compatible: rebuilt dependent packages.
* some packages built by Anevilyak.
----------------------------------------------------------------------------
diff --git a/build/jam/repositories/HaikuPorts/x86
b/build/jam/repositories/HaikuPorts/x86
index 6157e75..27dccf4 100644
--- a/build/jam/repositories/HaikuPorts/x86
+++ b/build/jam/repositories/HaikuPorts/x86
@@ -4,7 +4,7 @@ RemotePackageRepository HaikuPorts
:
# architecture "any" packages
be_book-2008_10_26-1
- ca_root_certificates-2014_08_13-1
+ ca_root_certificates-2015_10_28-1
caladea-20130214-3
carlito-20130920-1
dejavu-2.34-1
@@ -17,16 +17,16 @@ RemotePackageRepository HaikuPorts
# repository architecture packages
# primary architecture (x86)
ale-0.9.1-2
- apr-1.4.6-7
- apr_devel-1.4.6-7
- apr_util-1.4.1-4
- apr_util_devel-1.4.1-4
+ apr-1.5.2-1
+ apr_devel-1.5.2-1
+ apr_util-1.5.4-1
+ apr_util_devel-1.5.4-1
aspell-0.60.6.1-1
aspell_devel-0.60.6.1-1
autoconf-2.69-6
automake-1.13.1-4
bash-4.3.42-1
- beam-1.2-1
+ beam-1.2-2
bepdf-1.2.0-1
bescreencapture-1.9.4-1
binutils-2.25_12015_07_31-1
@@ -68,8 +68,8 @@ RemotePackageRepository HaikuPorts
coreutils-8.24-1
cpio-2.10-1
ctags-5.8-3
- curl-7.44.0-1
- curl_devel-7.44.0-1
+ curl-7.45.0-2
+ curl_devel-7.45.0-2
cvs-1.12.13.1-6
cvsps-2.2b1-1
cython-0.23.4-1
@@ -87,12 +87,12 @@ RemotePackageRepository HaikuPorts
file-5.15-1
file_devel-5.15-1
findutils-4.4.2-3
- ffmpeg-0.10.2-4
- ffmpeg_devel-0.10.2-4
+ ffmpeg-2.8.2-1
+ ffmpeg_devel-2.8.2-1
flac-1.3.1-1
flac_devel-1.3.1-1
flex-2.5.39-2
- fossil-1.34-1
+ fossil-1.34-2
freetype-2.6-1
freetype_devel-2.6-1
gawk-4.1.3-1
@@ -147,8 +147,8 @@ RemotePackageRepository HaikuPorts
less-458-1
libedit-2015_03_21_3.1-2
libedit_devel-2015_03_21_3.1-2
- libevent-2.0.21-7
- libevent_devel-2.0.21-7
+ libevent-2.0.21-8
+ libevent_devel-2.0.21-8
libexecinfo-1.1-1
libexecinfo_devel-1.1-1
libffi-3.2.1-2
@@ -171,21 +171,23 @@ RemotePackageRepository HaikuPorts
libogg_devel-1.3.0-2
libpcap-1.7.4-1
libpcap_devel-1.7.4-1
- libpcre-8.37-1
- libpcre_devel-8.37-1
+ libpcre-8.38-1
+ libpcre_devel-8.38-1
libpcre0-8.21-6
libpng-1.5.22-1
libpng_devel-1.5.22-1
libpng16-1.6.18-1
libpng16_devel-1.6.18-1
- libqt4-4.8.7-2
- libqt4_devel-4.8.7-2
+ libqt4-4.8.7-4
+ libqt4_devel-4.8.7-4
libsanta-3.0.1-1
libsanta_devel-3.0.1-1
libsdl-1.2.15-9
libsdl_devel-1.2.15-9
- libssh2-1.5.0-1
- libssh2_devel-1.5.0-1
+ libsndfile-1.0.26-1
+ libsndfile_devel-1.0.26-1
+ libssh2-1.5.0-2
+ libssh2_devel-1.5.0-2
libsolv-0.3.0_haiku_2014_12_22-1
libsolv_devel-0.3.0_haiku_2014_12_22-1
libtheora-1.1.1-2
@@ -200,9 +202,9 @@ RemotePackageRepository HaikuPorts
libvpx_devel-1.0.0-2
libwebp-0.4.1-2
libwebp_devel-0.4.1-2
- libxml2-2.9.2-1
- libxml2_devel-2.9.2-1
- libxml2_python-2.9.2-1
+ libxml2-2.9.3-1
+ libxml2_devel-2.9.3-1
+ libxml2_python-2.9.3-1
libxslt-1.1.28-2
libxslt_devel-1.1.28-2
llvm-3.5.2-1
@@ -231,17 +233,17 @@ RemotePackageRepository HaikuPorts
ncurses_devel-5.9-10
ncurses6-6.0-1
ncurses6_devel-6.0-1
- neon-0.29.6-7
- neon_devel-0.29.6-7
+ neon-0.30.1-2
+ neon_devel-0.30.1-2
netcat-1.10-1
ninja-1.5.1-2
openal-1.13.0-2
openal_devel-1.13.0-2
openjdk-1.7_2013_11_08-2
- openssh-6.9p1-1
+ openssh-7.1p1-1
# sync openssl with secondary architecture (x86_gcc2)
- openssl-1.0.0s-2
- openssl_devel-1.0.0s-2
+ openssl-1.0.2d-4
+ openssl_devel-1.0.2d-4
p7zip-9.20.1-4
patch-2.7.5-1
pe-2.4.5-2
@@ -249,7 +251,7 @@ RemotePackageRepository HaikuPorts
pixman-0.32.6-1
pkgconfig-0.27.1-2
pyenet-20141025-1
- python-2.7.10-1
+ python-2.7.10-2
python_mako-1.0.1-1
python_setuptools-5.3-2
python_twisted-13.2.0-1
@@ -262,8 +264,8 @@ RemotePackageRepository HaikuPorts
qrencode_devel-3.4.4-1
readline-6.3.8-1
readline_devel-6.3.8-1
- ruby-2.2.2-1
- ruby_devel-2.2.2-1
+ ruby-2.2.2-3
+ ruby_devel-2.2.2-3
scons-2.3.1-4
sdl_gfx-2.0.25-2
sdl_gfx_devel-2.0.25-2
@@ -278,6 +280,8 @@ RemotePackageRepository HaikuPorts
sdl_ttf-2.0.11-2
sdl_ttf_devel-2.0.11-2
sed-4.2.1-6
+ serf-1.3.8-1
+ serf_devel-1.3.8-1
sharutils-4.14-1
smpeg-0.4.5-4
smpeg_devel-0.4.5-4
@@ -285,8 +289,8 @@ RemotePackageRepository HaikuPorts
speex_devel-1.2~rc1-2
sqlite-3.8.11.1-1
sqlite_devel-3.8.11.1-1
- subversion-1.6.18-6
- subversion_devel-1.6.18-6
+ subversion-1.8.11-6
+ subversion_devel-1.8.11-6
tar-1.27.1-2
tcpdump-4.7.4-2
texinfo-4.13a-7
@@ -298,14 +302,14 @@ RemotePackageRepository HaikuPorts
tiff4_tools-4.0.6-1
tinyxml-2.6.2-1
tinyxml_devel-2.6.2-1
- transmission-2.84-3
+ transmission-2.84-4
unrar-5.3.2-1
unzip-6.0-2
vision-0.9.7.r949-3
vim-7.4-1
wget-1.16.3-1
which-2.21-1
- wpa_supplicant-2.0-3
+ wpa_supplicant-2.0-4
xml_parser-2.36-1
xz_utils-5.0.8-2
xz_utils_devel-5.0.8-2
@@ -318,8 +322,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.44.0-1
- curl_x86_gcc2_devel-7.44.0-1
+ curl_x86_gcc2-7.45.0-2
+ curl_x86_gcc2_devel-7.45.0-2
expat_x86_gcc2-2.1.0-1
expat_x86_gcc2_devel-2.1.0-1
ffmpeg_x86_gcc2-0.10.2-4
@@ -378,8 +382,8 @@ RemotePackageRepository HaikuPorts
ncurses_x86_gcc2_devel-5.9-10
ncurses6_x86_gcc2-6.0-1
ncurses6_x86_gcc2_devel-6.0-1
- openssl_x86_gcc2-1.0.0s-2
- openssl_x86_gcc2_devel-1.0.0s-2
+ openssl_x86_gcc2-1.0.2d-4
+ openssl_x86_gcc2_devel-1.0.2d-4
pkgconfig_x86_gcc2-0.27.1-2
speex_x86_gcc2-1.2~rc1-2
speex_x86_gcc2_devel-1.2~rc1-2
@@ -484,6 +488,7 @@ RemotePackageRepository HaikuPorts
libpng16
libsanta
libsdl
+ libsndfile
libssh2
libsolv
libtheora
@@ -543,6 +548,7 @@ RemotePackageRepository HaikuPorts
sdl_sound
sdl_ttf
sed
+ serf
sharutils
smpeg
speex
############################################################################
Revision: hrev49885
Commit: e7e318fc73b16374a1aa978fcef4136a7dba9d8e
URL: http://cgit.haiku-os.org/haiku/commit/?id=e7e318fc73b1
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Thu Nov 26 17:47:32 2015 UTC
haiku-x86: add a dependency on libssl and libcrypt
----------------------------------------------------------------------------
diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
index e3d5727..12e6dda 100644
--- a/src/data/package_infos/x86/haiku
+++ b/src/data/package_infos/x86/haiku
@@ -99,6 +99,10 @@ requires {
#ifdef HAIKU_BUILD_FEATURE_X86_LIBWEBP_ENABLED
lib:libwebp
#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_OPENSSL_ENABLED
+ lib:libssl >= 1.0.0
+ lib:libcrypto >= 1.0.0
+#endif
#endif
lib:libsolv
lib:libsolvext
