From e88c3fed803313d4e8886280854f29702e169f2c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 25 Dec 2013 15:30:02 +0100 Subject: [PATCH] ca-certification: merge with package 'openssl' Signed-off-by: Stephan Raue --- packages/security/ca-certification/install | 24 ------------- packages/security/ca-certification/meta | 34 ------------------- .../script => openssl/cert}/ca-bundle.crt | 0 .../script => openssl/cert}/certdata.txt | 0 .../script => openssl/cert}/mk-ca-bundle.pl | 0 packages/security/openssl/package.mk | 8 ++++- 6 files changed, 7 insertions(+), 59 deletions(-) delete mode 100755 packages/security/ca-certification/install delete mode 100644 packages/security/ca-certification/meta rename packages/security/{ca-certification/script => openssl/cert}/ca-bundle.crt (100%) rename packages/security/{ca-certification/script => openssl/cert}/certdata.txt (100%) rename packages/security/{ca-certification/script => openssl/cert}/mk-ca-bundle.pl (100%) diff --git a/packages/security/ca-certification/install b/packages/security/ca-certification/install deleted file mode 100755 index 0c90f41ea4..0000000000 --- a/packages/security/ca-certification/install +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC 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 of the License, or -# (at your option) any later version. -# -# OpenELEC 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. If not, see . -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/$SSL_CERTIFICATES - cp $PKG_DIR/script/ca-bundle.crt $INSTALL/$SSL_CERTIFICATES/cacert.pem diff --git a/packages/security/ca-certification/meta b/packages/security/ca-certification/meta deleted file mode 100644 index 2e9982ffec..0000000000 --- a/packages/security/ca-certification/meta +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC 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 of the License, or -# (at your option) any later version. -# -# OpenELEC 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. If not, see . -################################################################################ - -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" diff --git a/packages/security/ca-certification/script/ca-bundle.crt b/packages/security/openssl/cert/ca-bundle.crt similarity index 100% rename from packages/security/ca-certification/script/ca-bundle.crt rename to packages/security/openssl/cert/ca-bundle.crt diff --git a/packages/security/ca-certification/script/certdata.txt b/packages/security/openssl/cert/certdata.txt similarity index 100% rename from packages/security/ca-certification/script/certdata.txt rename to packages/security/openssl/cert/certdata.txt diff --git a/packages/security/ca-certification/script/mk-ca-bundle.pl b/packages/security/openssl/cert/mk-ca-bundle.pl similarity index 100% rename from packages/security/ca-certification/script/mk-ca-bundle.pl rename to packages/security/openssl/cert/mk-ca-bundle.pl diff --git a/packages/security/openssl/package.mk b/packages/security/openssl/package.mk index f923a769a4..3a34182d99 100644 --- a/packages/security/openssl/package.mk +++ b/packages/security/openssl/package.mk @@ -23,7 +23,7 @@ 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 ca-certification" +PKG_DEPENDS="zlib" PKG_BUILD_DEPENDS_TARGET="toolchain zlib" PKG_PRIORITY="optional" PKG_SECTION="security" @@ -99,4 +99,10 @@ post_makeinstall_target() { rm -rf $INSTALL/etc/pki/tls/misc rm -rf $INSTALL/usr/bin/c_rehash $STRIP $INSTALL/usr/bin/openssl + +# ca-certification: provides a tool to download and create ca-bundle.crt +# download url: http://curl.haxx.se +# create new cert: perl ./mk-ca-bundle.pl + mkdir -p $INSTALL/$SSL_CERTIFICATES + cp $PKG_DIR/cert/ca-bundle.crt $INSTALL/$SSL_CERTIFICATES/cacert.pem }