From 1596ce4b99b1b82b2ced6e89789a2a5ba795102e Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Wed, 27 Aug 2014 23:59:12 +0300 Subject: [PATCH] ca-certificates: add recipe from newer OE --- .../ca-certificates-20130119.inc | 16 ++++++ .../ca-certificates-cross_20130119.bb | 12 ++++ ...date-ca-certificates-remove-c-rehash.patch | 45 +++++++++++++++ ...2-update-ca-certificates-use-SYSROOT.patch | 56 +++++++++++++++++++ .../ca-certificates_20130119.bb | 30 ++++++++++ 5 files changed, 159 insertions(+) create mode 100644 recipes/ca-certificates/ca-certificates-20130119.inc create mode 100644 recipes/ca-certificates/ca-certificates-cross_20130119.bb create mode 100644 recipes/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch create mode 100644 recipes/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch create mode 100644 recipes/ca-certificates/ca-certificates_20130119.bb diff --git a/recipes/ca-certificates/ca-certificates-20130119.inc b/recipes/ca-certificates/ca-certificates-20130119.inc new file mode 100644 index 0000000000..d304bcdcda --- /dev/null +++ b/recipes/ca-certificates/ca-certificates-20130119.inc @@ -0,0 +1,16 @@ +DESCRIPTION = "Common CA certificates" +HOMEPAGE = "http://packages.debian.org/sid/ca-certificates" +SECTION = "misc" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=6135800ff6d893c7904d7aad90972eb5" +PR = "r1" + +SRC_URI = "${DEBIAN_MIRROR}/main/c/ca-certificates/ca-certificates_${PV}.tar.gz \ + file://0001-update-ca-certificates-remove-c-rehash.patch \ + file://0002-update-ca-certificates-use-SYSROOT.patch" + +SRC_URI[md5sum] = "1fbbec2028a33cf865b79c204aa2e626" +SRC_URI[sha256sum] = "fb51ec9a2c551838cc1646a0b3c9e6bea5c1bb20ff5d71c542451fac4b191c22" + +# inherit allarch +PACKAGE_ARCH = "all" diff --git a/recipes/ca-certificates/ca-certificates-cross_20130119.bb b/recipes/ca-certificates/ca-certificates-cross_20130119.bb new file mode 100644 index 0000000000..171d6a07cf --- /dev/null +++ b/recipes/ca-certificates/ca-certificates-cross_20130119.bb @@ -0,0 +1,12 @@ +require ca-certificates-${PV}.inc + +do_install() { + install -d ${D}${bindir_crossscripts} + install -m755 ${S}/sbin/update-ca-certificates ${D}${bindir_crossscripts} +} + +SYSROOT_PREPROCESS_FUNCS += "ca_certificates_sysroot_preprocess" + +ca_certificates_sysroot_preprocess() { + sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts} +} diff --git a/recipes/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch b/recipes/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch new file mode 100644 index 0000000000..ccb0efcc6c --- /dev/null +++ b/recipes/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch @@ -0,0 +1,45 @@ +From 111e905fe931da1a3800accfc675cc01c8ee080c Mon Sep 17 00:00:00 2001 +From: Ulf Samuelsson +Date: Tue, 28 Feb 2012 06:42:58 +0100 +Subject: [PATCH] update-ca-certificates: remove c rehash + +Updated earlier patch to apply clean on 2012-02-12 +Signed-off-by: Ulf Samuelsson +--- + sbin/update-ca-certificates | 20 ++++++++++---------- + 1 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates +index 5375950..c567e3d 100755 +--- a/sbin/update-ca-certificates ++++ b/sbin/update-ca-certificates +@@ -132,16 +132,16 @@ rm -f "$CERTBUNDLE" + ADDED_CNT=$(wc -l < "$ADDED") + REMOVED_CNT=$(wc -l < "$REMOVED") + +-if [ "$ADDED_CNT" -gt 0 ] || [ "$REMOVED_CNT" -gt 0 ] +-then +- # only run if set of files has changed +- if [ "$verbose" = 0 ] +- then +- c_rehash . > /dev/null +- else +- c_rehash . +- fi +-fi ++#if [ "$ADDED_CNT" -gt 0 ] || [ "$REMOVED_CNT" -gt 0 ] ++#then ++# # only run if set of files has changed ++# if [ "$verbose" = 0 ] ++# then ++# c_rehash . > /dev/null ++# else ++# c_rehash . ++# fi ++#fi + + chmod 0644 "$TEMPBUNDLE" + mv -f "$TEMPBUNDLE" "$CERTBUNDLE" +-- +1.7.4.1 + diff --git a/recipes/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch b/recipes/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch new file mode 100644 index 0000000000..689fdd90b7 --- /dev/null +++ b/recipes/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch @@ -0,0 +1,56 @@ +Upstream-Status: Pending + +From 724cb153ca0f607fb38b3a8db3ebb2742601cd81 Mon Sep 17 00:00:00 2001 +From: Andreas Oberritter +Date: Tue, 19 Mar 2013 17:14:33 +0100 +Subject: [PATCH 2/2] update-ca-certificates: use $SYSROOT + +Signed-off-by: Andreas Oberritter +--- + sbin/update-ca-certificates | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates +index c567e3d..923b68a 100755 +--- a/sbin/update-ca-certificates ++++ b/sbin/update-ca-certificates +@@ -37,11 +37,11 @@ do + shift + done + +-CERTSCONF=/etc/ca-certificates.conf +-CERTSDIR=/usr/share/ca-certificates +-LOCALCERTSDIR=/usr/local/share/ca-certificates ++CERTSCONF=$SYSROOT/etc/ca-certificates.conf ++CERTSDIR=$SYSROOT/usr/share/ca-certificates ++LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates + CERTBUNDLE=ca-certificates.crt +-ETCCERTSDIR=/etc/ssl/certs ++ETCCERTSDIR=$SYSROOT/etc/ssl/certs + + cleanup() { + rm -f "$TEMPBUNDLE" +@@ -64,9 +64,9 @@ add() { + PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \ + -e 's/[()]/=/g' \ + -e 's/,/_/g').pem" +- if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ] ++ if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "${CERT##$SYSROOT}" ] + then +- ln -sf "$CERT" "$PEM" ++ ln -sf "${CERT##$SYSROOT}" "$PEM" + echo +$PEM >> "$ADDED" + fi + cat "$CERT" >> "$TEMPBUNDLE" +@@ -148,7 +148,7 @@ mv -f "$TEMPBUNDLE" "$CERTBUNDLE" + + echo "$ADDED_CNT added, $REMOVED_CNT removed; done." + +-HOOKSDIR=/etc/ca-certificates/update.d ++HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d + echo -n "Running hooks in $HOOKSDIR...." + VERBOSE_ARG= + [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose +-- +1.7.10.4 + diff --git a/recipes/ca-certificates/ca-certificates_20130119.bb b/recipes/ca-certificates/ca-certificates_20130119.bb new file mode 100644 index 0000000000..504190fd59 --- /dev/null +++ b/recipes/ca-certificates/ca-certificates_20130119.bb @@ -0,0 +1,30 @@ +DEPENDS = "ca-certificates-cross" + +require ca-certificates-${PV}.inc + +inherit autotools + +do_install_prepend() { + mkdir -p ${D}/usr/share/ca-certificates + mkdir -p ${D}/usr/sbin + mkdir -p ${D}/etc/ssl/certs + mkdir -p ${D}/etc/ca-certificates/update.d +} + +do_install_append() { + cd ${D}/usr/share/ca-certificates + echo "# Lines starting with # will be ignored" > ${D}/etc/ca-certificates.conf + echo "# Lines starting with ! will remove certificate on next update" >> ${D}/etc/ca-certificates.conf + echo "#" >> ${D}/etc/ca-certificates.conf + for crt in $(find . -type f -name '*.crt' -print) + do + crt=$(echo $crt | sed -e 's/\.\///') + echo $crt >> ${D}/etc/ca-certificates.conf + done +} + +pkg_postinst_${PN} () { +SYSROOT="$D" update-ca-certificates +} + +CONFFILES_${PN} = "/etc/ca-certificates.conf" -- 2.39.5