Merge branch 'openelec-next' of git://github.com/OpenELEC/OpenELEC.tv into openelec-eden

packages/addons/multimedia/makemkv/addon

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+MAKEMKV_ARCH=i386
+[ "$TARGET_ARCH" = x86_64 ] && MAKEMKV_ARCH=amd64
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/bin/bin/$MAKEMKV_ARCH/makemkvcon $ADDON_BUILD/$PKG_ADDON_ID/bin/makemkvcon.bin
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $PKG_BUILD/lib/out/libmakemkv.so.[0-9] $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $PKG_BUILD/lib/out/libdriveio.so.[0-9] $ADDON_BUILD/$PKG_ADDON_ID/lib

packages/addons/multimedia/makemkv/build

@@ -22,6 +22,6 @@
 
 . config/options $1
 
-cd $PKG_BUILD
+cd $PKG_BUILD/lib
 
-make -f makefile.linux
+make GCC=$CC -f makefile.linux

packages/addons/multimedia/makemkv/changelog.txt

@@ -0,0 +1,2 @@
+0.99.1
+- initial addon based on makemkv-1.6.10

packages/addons/multimedia/makemkv/meta

@@ -19,18 +19,21 @@
 ################################################################################
 
 PKG_NAME="makemkv"
-PKG_VERSION="v1.6.8_oss"
+PKG_VERSION="1.6.10"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3"
-PKG_URL="http://www.makemkv.com/download/${PKG_NAME}_${PKG_VERSION}.tar.gz"
+PKG_URL="http://www.makemkv.com/download/${PKG_NAME}_v${PKG_VERSION}_oss.tar.gz"
+PKG_URL="$PKG_URL http://www.makemkv.com/download/${PKG_NAME}_v${PKG_VERSION}_bin.tar.gz"
 PKG_DEPENDS="openssl"
 PKG_BUILD_DEPENDS="toolchain openssl"
 PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
+PKG_SECTION="lib/multimedia"
 PKG_SHORTDESC="MakeMKV converts the video clips from proprietary (and usually encrypted) disc into a set of MKV files, preserving most information but not changing it in any way."
 PKG_LONGDESC="MakeMKV can instantly stream decrypted video without intermediate conversion to wide range of players, so you may watch Blu-ray and DVD discs with your favorite player on your favorite OS or on your favorite device."
-PKG_IS_ADDON="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
 
 PKG_AUTORECONF="no"

packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.6.10-000-crosscompiling-0.1.patch

@@ -0,0 +1,27 @@
+diff -Naur makemkv-1.6.10/lib/makefile.linux makemkv-1.6.10.patch/lib/makefile.linux
+--- makemkv-1.6.10/lib/makefile.linux	2011-05-29 23:17:48.000000000 +0200
++++ makemkv-1.6.10.patch/lib/makefile.linux	2011-05-30 15:29:15.510417904 +0200
+@@ -1,11 +1,11 @@
+ 
+ include makefile.common
+ 
+-GCC=gcc
+-RCC=rcc
++GCC:=gcc
++RCC:=rcc
+ MOC=$(strip $(shell which moc-qt4))
+ ifeq ($(MOC),)
+-MOC=moc
++MOC:=moc
+ endif
+ 
+ CXXOPTS=-Os -D_GNU_SOURCE -D_linux_
+@@ -14,7 +14,7 @@
+ BUILDINFO_BUILD_DATE=$(shell date)
+ 
+ 
+-all: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv
++all: out/libdriveio.so.0 out/libmakemkv.so.1
+ 	@echo "type \"sudo make -f makefile.linux install\" to install"
+ 
+ clean:

packages/addons/multimedia/makemkv/source/bin/makemkvcon

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+ADDON_DIR="/storage/.xbmc/addons/lib.multimedia.makemkv"
+
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ADDON_DIR/lib"
+
+chmod 755 $ADDON_DIR/lib/*
+makemkvcon.bin $@

packages/addons/multimedia/makemkv/source/default.py

@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import os
+import sys
+import xbmcaddon

packages/addons/multimedia/makemkv/unpack

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+require_eglibc $1
+
+[ -d $PKG_BUILD ] && rm -rf $PKG_BUILD
+
+mkdir -p $BUILD/$PKG_NAME-$PKG_VERSION
+mv $BUILD/${PKG_NAME}_v${PKG_VERSION}_oss $BUILD/$PKG_NAME-$PKG_VERSION/lib
+mv $BUILD/${PKG_NAME}_v${PKG_VERSION}_bin $BUILD/$PKG_NAME-$PKG_VERSION/bin
+
+echo "### Applying upstream patches ###"
+
+for patch in `ls $PKG_DIR/patches.upstream/*.patch`; do
+  cat $patch | patch -d \
+    `echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1
+done

packages/multimedia/makemkv/patches/makemkv-v1.6.8_oss-noqt-0.1.patch

@@ -1,35 +0,0 @@
---- makemkv_v1.6.8_oss/makefile.linux	2011-04-25 08:44:43.000000000 +0200
-+++ makemkv_v1.6.8_oss.patch/makefile.linux	2011-04-25 21:26:11.262636081 +0200
-@@ -14,7 +14,7 @@
- BUILDINFO_BUILD_DATE=$(shell date)
- 
- 
--all: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv
-+all: out/libdriveio.so.0 out/libmakemkv.so.1
- 	@echo "type \"sudo make -f makefile.linux install\" to install"
- 
- clean:
-@@ -23,13 +23,11 @@
- 	rm -f out/*
- 	rm -f tmp/*
- 
--install: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv
-+install: out/libdriveio.so.0 out/libmakemkv.so.1
- 	rm -f /usr/lib/libdriveio.so.0
- 	rm -f /usr/lib/libmakemkv.so.1
--	rm -f /usr/bin/makemkv
- 	install -t /usr/lib out/libdriveio.so.0 out/libmakemkv.so.1
- 	ldconfig
--	install -t /usr/bin out/makemkv
- 
- out/%: out/%.full
- 	objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
-@@ -42,7 +40,7 @@
- 
- out/libmakemkv.so.1.full: tmp/gen_buildinfo.h
- 	mkdir -p out
--	$(GCC) $(CXXOPTS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBMATROSKA_INC) \
-+	$(GCC) $(CXXOPTS) -L$(PKG_CONFIG_SYSROOT_DIR)/usr/lib -DOPENSSL_NO_EC -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBMATROSKA_INC) \
- 	$(LIBMAKEMKV_INC) $(SSTRING_INC) $(MAKEMKVGUI_INC) $(LIBABI_INC) $(LIBFFCODEC_INC) \
- 	$(LIBEBML_SRC) $(LIBMATROSKA_SRC) $(LIBMAKEMKV_SRC) $(GLIBC_SRC) $(SSTRING_SRC) \
- 	$(LIBABI_SRC) $(LIBABI_SRC_LINUX) $(LIBFFCODEC_SRC) \

packages/network/openssh/init.d/51_sshd

@@ -36,6 +36,7 @@
 
       mkdir -p /storage/.cache/ssh
         $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null
+        chmod 600 $RSA1_KEY
     fi
 
   # Check for the SSH2 RSA key
@@ -44,6 +45,7 @@
 
       mkdir -p /storage/.cache/ssh
         $KEYGEN -q -t rsa -f $RSA2_KEY -C '' -N '' >&/dev/null
+        chmod 600 $RSA2_KEY
     fi
 
   # Check for the SSH2 DSA key
@@ -52,6 +54,7 @@
 
       mkdir -p /storage/.cache/ssh
         $KEYGEN -q -t dsa -f $DSA2_KEY -C '' -N '' >&/dev/null
+        chmod 600 $DSA2_KEY
     fi
 
   # Check for predifined known hosts file

packages/network/wpa_supplicant/config/makefile.config

@@ -24,7 +24,7 @@ CONFIG_EAP_MSCHAPV2=y
 CONFIG_EAP_TLS=y
 CONFIG_EAP_PEAP=y
 CONFIG_EAP_TTLS=y
-CONFIG_EAP_FAST=y
+//CONFIG_EAP_FAST=y
 CONFIG_EAP_GTC=y
 CONFIG_EAP_OTP=y
 //CONFIG_EAP_SIM=y

packages/security/ca-certification/install

@@ -22,7 +22,6 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/lib
-  rm -f $PKG_BUILD/out/*full
-  cp -P $PKG_BUILD/out/libmakemkv.so.* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/out/libdriveio.so.* $INSTALL/usr/lib
+mkdir -p $INSTALL/etc/ssl
+  cp $PKG_DIR/script/ca-bundle.crt $INSTALL/etc/ssl
+  cp $PKG_DIR/script/ca-bundle.crt $INSTALL/etc/ssl/cacert.pem

packages/security/ca-certification/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="ca-certification"
+PKG_VERSION="1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://curl.haxx.se/"
+PKG_URL=""
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="security"
+PKG_SHORTDESC="ca-certification: provides a tool to download and create ca-bundle.crt"
+PKG_LONGDESC="ca-certification: provides a tool to download and create ca-bundle.crt"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/security/ca-certification/script/mk-ca-bundle.pl

@@ -0,0 +1,186 @@
+#!/usr/bin/perl -w
+# ***************************************************************************
+# *                                  _   _ ____  _
+# *  Project                     ___| | | |  _ \| |
+# *                             / __| | | | |_) | |
+# *                            | (__| |_| |  _ <| |___
+# *                             \___|\___/|_| \_\_____|
+# *
+# * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+# *
+# * This software is licensed as described in the file COPYING, which
+# * you should have received as part of this distribution. The terms
+# * are also available at http://curl.haxx.se/docs/copyright.html.
+# *
+# * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+# * copies of the Software, and permit persons to whom the Software is
+# * furnished to do so, under the terms of the COPYING file.
+# *
+# * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# * KIND, either express or implied.
+# *
+# ***************************************************************************
+# This Perl script creates a fresh ca-bundle.crt file for use with libcurl.
+# It downloads certdata.txt from Mozilla's source tree (see URL below),
+# then parses certdata.txt and extracts CA Root Certificates into PEM format.
+# These are then processed with the OpenSSL commandline tool to produce the
+# final ca-bundle.crt file.
+# The script is based on the parse-certs script written by Roland Krikava.
+# This Perl script works on almost any platform since its only external
+# dependency is the OpenSSL commandline tool for optional text listing.
+# Hacked by Guenter Knauf.
+#
+use Getopt::Std;
+use MIME::Base64;
+use LWP::UserAgent;
+use strict;
+use vars qw($opt_b $opt_h $opt_i $opt_l $opt_n $opt_q $opt_t $opt_u $opt_v);
+
+my $url = 'http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1';
+# If the OpenSSL commandline is not in search path you can configure it here!
+my $openssl = 'openssl';
+
+my $version = '1.15';
+
+getopts('bhilnqtuv');
+
+if ($opt_i) {
+  print ("=" x 78 . "\n");
+  print "Script Version            : $version\n";
+  print "Perl Version              : $]\n";
+  print "Operating System Name     : $^O\n";
+  print "Getopt::Std.pm Version    : ${Getopt::Std::VERSION}\n";
+  print "MIME::Base64.pm Version   : ${MIME::Base64::VERSION}\n";
+  print "LWP::UserAgent.pm Version : ${LWP::UserAgent::VERSION}\n";
+  print "LWP.pm Version            : ${LWP::VERSION}\n";
+  print ("=" x 78 . "\n");
+}
+
+$0 =~ s@.*(/|\\)@@;
+if ($opt_h) {
+  printf("Usage:\t%s [-b] [-i] [-l] [-n] [-q] [-t] [-u] [-v] [<outputfile>]\n", $0);
+  print "\t-b\tbackup an existing version of ca-bundle.crt\n";
+  print "\t-i\tprint version info about used modules\n";
+  print "\t-l\tprint license info about certdata.txt\n";
+  print "\t-n\tno download of certdata.txt (to use existing)\n";
+  print "\t-q\tbe really quiet (no progress output at all)\n";
+  print "\t-t\tinclude plain text listing of certificates\n";
+  print "\t-u\tunlink (remove) certdata.txt after processing\n";
+  print "\t-v\tbe verbose and print out processed CAs\n";
+  exit;
+}
+
+my $crt = $ARGV[0] || 'ca-bundle.crt';
+(my $txt = $url) =~ s@(.*/|\?.*)@@g;
+
+my $resp;
+
+unless ($opt_n and -e $txt) {
+  print "Downloading '$txt' ...\n" if (!$opt_q);
+
+  my $ua  = new LWP::UserAgent(agent => "$0/$version");
+  $ua->env_proxy();
+  $resp = $ua->mirror($url, $txt);
+}
+
+if ($resp && $resp->code eq '304') {
+    print "Not modified\n" unless $opt_q;
+    exit 0;
+}
+
+my $currentdate = scalar gmtime($resp ? $resp->last_modified : (stat($txt))[9]);
+
+if ($opt_b && -e $crt) {
+  my $bk = 1;
+  while (-e "$crt.~${bk}~") {
+    $bk++;
+  }
+  rename $crt, "$crt.~${bk}~";
+}
+
+my $format = $opt_t ? "plain text and " : "";
+open(CRT,">$crt") or die "Couldn't open $crt: $!";
+print CRT <<EOT;
+##
+## $crt -- Bundle of CA Root Certificates
+##
+## Certificate data from Mozilla as of: ${currentdate}
+##
+## This is a bundle of X.509 certificates of public Certificate Authorities
+## (CA). These were automatically extracted from Mozilla's root certificates
+## file (certdata.txt).  This file can be found in the mozilla source tree:
+## $url
+##
+## It contains the certificates in ${format}PEM format and therefore
+## can be directly used with curl / libcurl / php_curl, or with
+## an Apache+mod_ssl webserver for SSL client authentication.
+## Just configure this file as the SSLCACertificateFile.
+##
+
+EOT
+
+close(CRT) or die "Couldn't close $crt: $!";
+
+print "Processing  '$txt' ...\n" if (!$opt_q);
+my $caname;
+my $certnum = 0;
+open(TXT,"$txt") or die "Couldn't open $txt: $!";
+while (<TXT>) {
+  if (/\*\*\*\*\* BEGIN LICENSE BLOCK \*\*\*\*\*/) {
+    open(CRT, ">>$crt") or die "Couldn't open $crt: $!";
+    print CRT;
+    print if ($opt_l);
+    while (<TXT>) {
+      print CRT;
+      print if ($opt_l);
+      last if (/\*\*\*\*\* END LICENSE BLOCK \*\*\*\*\*/);
+    }
+    close(CRT) or die "Couldn't close $crt: $!";
+  }
+  next if /^#|^\s*$/;
+  chomp;
+  if (/^CVS_ID\s+\"(.*)\"/) {
+    open(CRT, ">>$crt") or die "Couldn't open $crt: $!";
+    print CRT "# $1\n";
+    close(CRT) or die "Couldn't close $crt: $!";
+  }
+  if (/^CKA_LABEL\s+[A-Z0-9]+\s+\"(.*)\"/) {
+    $caname = $1;
+  }
+  if (/^CKA_VALUE MULTILINE_OCTAL/) {
+    my $data;
+    while (<TXT>) {
+      last if (/^END/);
+      chomp;
+      my @octets = split(/\\/);
+      shift @octets;
+      for (@octets) {
+        $data .= chr(oct);
+      }
+    }
+    my $pem = "-----BEGIN CERTIFICATE-----\n"
+            . MIME::Base64::encode($data)
+            . "-----END CERTIFICATE-----\n";
+    open(CRT, ">>$crt") or die "Couldn't open $crt: $!";
+    print CRT "\n$caname\n";
+    print CRT ("=" x length($caname) . "\n");
+    if (!$opt_t) {
+      print CRT $pem;
+    }
+    close(CRT) or die "Couldn't close $crt: $!";
+    if ($opt_t) {
+      open(TMP, "|$openssl x509 -md5 -fingerprint -text -inform PEM >> $crt") or die "Couldn't open openssl pipe: $!";
+      print TMP $pem;
+      close(TMP) or die "Couldn't close openssl pipe: $!";
+    }
+    print "Parsing: $caname\n" if ($opt_v);
+    $certnum ++;
+  }
+}
+close(TXT) or die "Couldn't close $txt: $!";
+unlink $txt if ($opt_u);
+print "Done ($certnum CA certs processed).\n" if (!$opt_q);
+
+exit;
+
+

packages/security/openssl/build

@@ -45,16 +45,10 @@ esac
 cd $PKG_BUILD
 ./Configure \
   --prefix=/usr \
+  --openssldir=/etc/ssl \
   zlib-dynamic \
   threads \
   shared \
-  no-idea \
-  no-mdc2 \
-  no-rc5 \
-  no-krb5 \
-  no-ec \
-  no-ecdh \
-  no-ecdsa \
   $TARGET
 
 $SED -i -e "s:-march=[-a-z0-9] ::" \

packages/security/openssl/install

@@ -22,9 +22,13 @@
 
 . config/options $1
 
+mkdir -p $INSTALL/etc/ssl
+  cp -P $PKG_BUILD/apps/openssl.cnf $INSTALL/etc/ssl
+
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/libcrypto.so* $INSTALL/usr/lib
   cp -P $PKG_BUILD/libssl.so* $INSTALL/usr/lib
 
 mkdir -p $INSTALL/usr/lib/ssl/engines
   cp -P $PKG_BUILD/engines/*.so $INSTALL/usr/lib/ssl/engines
+#  cp -P $PKG_BUILD/engines/ccgost/*.so $INSTALL/usr/lib/ssl/engines

packages/security/openssl/meta

@@ -19,13 +19,14 @@
 ################################################################################
 
 PKG_NAME="openssl"
-PKG_VERSION="1.0.0d"
+#PKG_VERSION="1.0.0d"
+PKG_VERSION="0.9.8r"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.openssl.org/"
 PKG_URL="http://www.openssl.org/source/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="zlib"
+PKG_DEPENDS="zlib ca-certification"
 PKG_BUILD_DEPENDS="toolchain zlib"
 PKG_PRIORITY="optional"
 PKG_SECTION="security"

packages/web/curl/build

@@ -76,7 +76,7 @@ ac_cv_header_librtmp_rtmp_h=yes \
             --without-gnutls \
             --without-polarssl \
             --without-nss \
-            --with-ca-bundle="/etc/ssl/certs/ca-bundle.crt" \
+            --with-ca-bundle="/etc/ssl/cacert.pem" \
             --without-ca-path \
             --without-libssh2 \
             --with-librtmp="$SYSROOT_PREFIX/usr" \