From 39c759cd43f4e4371ef9654bf4d821436a5eaebf Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 5 Aug 2015 16:08:38 -0700 Subject: ca-certificates: Update 20141019 -> 20150426 Older SRCREV was not fetchable which triggered this upgrade Change-Id: I85d028294ff0018f4c81c6bb81ae262b18af7a87 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...ertificates-don-t-use-Debianisms-in-run-p.patch | 31 ++++----- .../0002-update-ca-certificates-use-SYSROOT.patch | 41 +++++------ .../ca-certificates/default-sysroot.patch | 10 +-- .../ca-certificates/ca-certificates_20141019.bb | 80 ---------------------- .../ca-certificates/ca-certificates_20150426.bb | 80 ++++++++++++++++++++++ 5 files changed, 115 insertions(+), 127 deletions(-) delete mode 100644 meta/recipes-support/ca-certificates/ca-certificates_20141019.bb create mode 100644 meta/recipes-support/ca-certificates/ca-certificates_20150426.bb (limited to 'meta/recipes-support/ca-certificates') diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch b/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch index d7d487e676..4b4b287d4e 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch +++ b/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch @@ -13,21 +13,18 @@ Signed-off-by: Ross Burton sbin/update-ca-certificates | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates -index fed9c25..29ecc69 100755 ---- a/sbin/update-ca-certificates -+++ b/sbin/update-ca-certificates -@@ -186,9 +186,7 @@ echo "$ADDED_CNT added, $REMOVED_CNT removed; done." +Index: git/sbin/update-ca-certificates +=================================================================== +--- git.orig/sbin/update-ca-certificates ++++ git/sbin/update-ca-certificates +@@ -191,9 +191,7 @@ if [ -d "$HOOKSDIR" ] + then - HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d - echo -n "Running hooks in $HOOKSDIR...." --VERBOSE_ARG= --[ "$verbose" = 0 ] || VERBOSE_ARG=--verbose --eval run-parts $VERBOSE_ARG --test -- $HOOKSDIR | while read hook -+eval run-parts --test $HOOKSDIR | while read hook - do - ( cat $ADDED - cat $REMOVED ) | $hook || echo E: $hook exited with code $?. --- -2.1.4 - + echo "Running hooks in $HOOKSDIR..." +- VERBOSE_ARG= +- [ "$verbose" = 0 ] || VERBOSE_ARG="--verbose" +- eval run-parts "$VERBOSE_ARG" --test -- "$HOOKSDIR" | while read hook ++ eval run-parts --test -- "$HOOKSDIR" | while read hook + do + ( cat "$ADDED" + cat "$REMOVED" ) | "$hook" || echo "E: $hook exited with code $?." diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch b/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch index f4c84fea44..792b4030b2 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch +++ b/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch @@ -10,14 +10,14 @@ 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 - +Index: git/sbin/update-ca-certificates +=================================================================== +--- git.orig/sbin/update-ca-certificates ++++ git/sbin/update-ca-certificates +@@ -24,12 +24,12 @@ + verbose=0 + fresh=0 + default=0 -CERTSCONF=/etc/ca-certificates.conf -CERTSDIR=/usr/share/ca-certificates -LOCALCERTSDIR=/usr/local/share/ca-certificates @@ -26,11 +26,13 @@ index c567e3d..923b68a 100755 +LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates CERTBUNDLE=ca-certificates.crt -ETCCERTSDIR=/etc/ssl/certs +-HOOKSDIR=/etc/ca-certificates/update.d +ETCCERTSDIR=$SYSROOT/etc/ssl/certs - - cleanup() { - rm -f "$TEMPBUNDLE" -@@ -64,9 +64,9 @@ add() { ++HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d + + while [ $# -gt 0 ]; + do +@@ -92,9 +92,9 @@ add() { PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \ -e 's/[()]/=/g' \ -e 's/,/_/g').pem" @@ -39,17 +41,6 @@ index c567e3d..923b68a 100755 then - ln -sf "$CERT" "$PEM" + ln -sf "${CERT##$SYSROOT}" "$PEM" - echo +$PEM >> "$ADDED" + 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 + # Add trailing newline to certificate, if it is missing (#635570) diff --git a/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch b/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch index 6a5d6da676..f8b0791bea 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch +++ b/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch @@ -8,11 +8,10 @@ Index: git/sbin/update-ca-certificates =================================================================== --- git.orig/sbin/update-ca-certificates +++ git/sbin/update-ca-certificates -@@ -37,6 +37,39 @@ do +@@ -66,6 +66,39 @@ do shift done -+ +if [ -z "$SYSROOT" ]; then + local_which () { + if [ $# -lt 1 ]; then @@ -45,6 +44,7 @@ Index: git/sbin/update-ca-certificates + SYSROOT= + fi +fi - CERTSCONF=$SYSROOT/etc/ca-certificates.conf - CERTSDIR=$SYSROOT/usr/share/ca-certificates - LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates ++ + if [ ! -s "$CERTSCONF" ] + then + fresh=1 diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20141019.bb b/meta/recipes-support/ca-certificates/ca-certificates_20141019.bb deleted file mode 100644 index cc58e4d60b..0000000000 --- a/meta/recipes-support/ca-certificates/ca-certificates_20141019.bb +++ /dev/null @@ -1,80 +0,0 @@ -SUMMARY = "Common CA certificates" -DESCRIPTION = "This package includes PEM files of CA certificates to allow \ -SSL-based applications to check for the authenticity of SSL connections. \ -This derived from Debian's CA Certificates." -HOMEPAGE = "http://packages.debian.org/sid/ca-certificates" -SECTION = "misc" -LICENSE = "GPL-2.0+ & MPL-2.0" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=48d2baf97986999e776b43c8dd9e0c5a" - -# This is needed to ensure we can run the postinst at image creation time -DEPENDS = "ca-certificates-native" -DEPENDS_class-native = "" - -# tag: debian/20140325 + 2 -SRCREV = "2b8a047c78aadbecd90bf8e49ccf68898a211610" - -SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \ - file://0001-update-ca-certificates-remove-c-rehash.patch \ - file://0002-update-ca-certificates-use-SYSROOT.patch \ - file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \ - file://default-sysroot.patch \ - file://sbindir.patch" - -S = "${WORKDIR}/git" - -inherit allarch - -EXTRA_OEMAKE = "\ - 'CERTSDIR=${datadir}/ca-certificates' \ - 'SBINDIR=${sbindir}' \ -" - -do_compile_prepend() { - oe_runmake clean -} - -do_install () { - install -d ${D}${datadir}/ca-certificates \ - ${D}${sysconfdir}/ssl/certs \ - ${D}${sysconfdir}/ca-certificates/update.d - oe_runmake 'DESTDIR=${D}' install - - install -d ${D}${mandir}/man8 - install -m 0644 sbin/update-ca-certificates.8 ${D}${mandir}/man8/ - - install -d ${D}${sysconfdir} - { - echo "# Lines starting with # will be ignored" - echo "# Lines starting with ! will remove certificate on next update" - echo "#" - find ${D}${datadir}/ca-certificates -type f -name '*.crt' | \ - sed 's,^${D}${datadir}/ca-certificates/,,' - } >${D}${sysconfdir}/ca-certificates.conf -} - -do_install_append_class-target () { - sed -i -e 's,/etc/,${sysconfdir}/,' \ - -e 's,/usr/share/,${datadir}/,' \ - -e 's,/usr/local,${prefix}/local,' \ - ${D}${sbindir}/update-ca-certificates \ - ${D}${mandir}/man8/update-ca-certificates.8 -} - -pkg_postinst_${PN} () { - SYSROOT="$D" update-ca-certificates -} - -CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf" - -# Postinsts don't seem to be run for nativesdk packages when populating SDKs. -CONFFILES_${PN}_append_class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt" -do_install_append_class-nativesdk () { - SYSROOT="${D}${SDKPATHNATIVE}" update-ca-certificates -} - -do_install_append_class-native () { - SYSROOT="${D}${base_prefix}" ${D}${sbindir}/update-ca-certificates -} - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb b/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb new file mode 100644 index 0000000000..716e3dfca5 --- /dev/null +++ b/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb @@ -0,0 +1,80 @@ +SUMMARY = "Common CA certificates" +DESCRIPTION = "This package includes PEM files of CA certificates to allow \ +SSL-based applications to check for the authenticity of SSL connections. \ +This derived from Debian's CA Certificates." +HOMEPAGE = "http://packages.debian.org/sid/ca-certificates" +SECTION = "misc" +LICENSE = "GPL-2.0+ & MPL-2.0" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=48d2baf97986999e776b43c8dd9e0c5a" + +# This is needed to ensure we can run the postinst at image creation time +DEPENDS = "ca-certificates-native" +DEPENDS_class-native = "" + +# tag: debian/20150426 + 2 +SRCREV = "d4790d2832aaac9152f450e06661511067592227" + +SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \ + file://0001-update-ca-certificates-remove-c-rehash.patch \ + file://0002-update-ca-certificates-use-SYSROOT.patch \ + file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \ + file://default-sysroot.patch \ + file://sbindir.patch" + +S = "${WORKDIR}/git" + +inherit allarch + +EXTRA_OEMAKE = "\ + 'CERTSDIR=${datadir}/ca-certificates' \ + 'SBINDIR=${sbindir}' \ +" + +do_compile_prepend() { + oe_runmake clean +} + +do_install () { + install -d ${D}${datadir}/ca-certificates \ + ${D}${sysconfdir}/ssl/certs \ + ${D}${sysconfdir}/ca-certificates/update.d + oe_runmake 'DESTDIR=${D}' install + + install -d ${D}${mandir}/man8 + install -m 0644 sbin/update-ca-certificates.8 ${D}${mandir}/man8/ + + install -d ${D}${sysconfdir} + { + echo "# Lines starting with # will be ignored" + echo "# Lines starting with ! will remove certificate on next update" + echo "#" + find ${D}${datadir}/ca-certificates -type f -name '*.crt' | \ + sed 's,^${D}${datadir}/ca-certificates/,,' + } >${D}${sysconfdir}/ca-certificates.conf +} + +do_install_append_class-target () { + sed -i -e 's,/etc/,${sysconfdir}/,' \ + -e 's,/usr/share/,${datadir}/,' \ + -e 's,/usr/local,${prefix}/local,' \ + ${D}${sbindir}/update-ca-certificates \ + ${D}${mandir}/man8/update-ca-certificates.8 +} + +pkg_postinst_${PN} () { + SYSROOT="$D" update-ca-certificates +} + +CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf" + +# Postinsts don't seem to be run for nativesdk packages when populating SDKs. +CONFFILES_${PN}_append_class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt" +do_install_append_class-nativesdk () { + SYSROOT="${D}${SDKPATHNATIVE}" update-ca-certificates +} + +do_install_append_class-native () { + SYSROOT="${D}${base_prefix}" ${D}${sbindir}/update-ca-certificates +} + +BBCLASSEXTEND += "native nativesdk" -- cgit 1.2.3-korg