diff options
Diffstat (limited to 'meta/recipes-support/libksba')
-rw-r--r-- | meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch | 6 | ||||
-rw-r--r-- | meta/recipes-support/libksba/libksba_1.6.6.bb (renamed from meta/recipes-support/libksba/libksba_1.5.0.bb) | 15 |
2 files changed, 13 insertions, 8 deletions
diff --git a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch index af96bd57cd..bdb80ff34d 100644 --- a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch +++ b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6081640895b6d566fa21123e2de7d111eeab5c4c Mon Sep 17 00:00:00 2001 | 1 | From ca8174aa81d7bf364b33f7254a9e887735c4996d Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 3 Dec 2012 18:17:31 +0800 | 3 | Date: Mon, 3 Dec 2012 18:17:31 +0800 |
4 | Subject: [PATCH] libksba: add pkgconfig support | 4 | Subject: [PATCH] libksba: add pkgconfig support |
@@ -16,7 +16,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
16 | 1 file changed, 4 insertions(+), 86 deletions(-) | 16 | 1 file changed, 4 insertions(+), 86 deletions(-) |
17 | 17 | ||
18 | diff --git a/src/ksba.m4 b/src/ksba.m4 | 18 | diff --git a/src/ksba.m4 b/src/ksba.m4 |
19 | index 6b55bb8..6e7336f 100644 | 19 | index 452c245..aa96255 100644 |
20 | --- a/src/ksba.m4 | 20 | --- a/src/ksba.m4 |
21 | +++ b/src/ksba.m4 | 21 | +++ b/src/ksba.m4 |
22 | @@ -23,37 +23,6 @@ dnl with a changed API. | 22 | @@ -23,37 +23,6 @@ dnl with a changed API. |
@@ -44,7 +44,7 @@ index 6b55bb8..6e7336f 100644 | |||
44 | - fi | 44 | - fi |
45 | - | 45 | - |
46 | - use_gpgrt_config="" | 46 | - use_gpgrt_config="" |
47 | - if test x"$KSBA_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then | 47 | - if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then |
48 | - if $GPGRT_CONFIG ksba --exists; then | 48 | - if $GPGRT_CONFIG ksba --exists; then |
49 | - KSBA_CONFIG="$GPGRT_CONFIG ksba" | 49 | - KSBA_CONFIG="$GPGRT_CONFIG ksba" |
50 | - AC_MSG_NOTICE([Use gpgrt-config as ksba-config]) | 50 | - AC_MSG_NOTICE([Use gpgrt-config as ksba-config]) |
diff --git a/meta/recipes-support/libksba/libksba_1.5.0.bb b/meta/recipes-support/libksba/libksba_1.6.6.bb index 005389eab6..2230a032f6 100644 --- a/meta/recipes-support/libksba/libksba_1.5.0.bb +++ b/meta/recipes-support/libksba/libksba_1.6.6.bb | |||
@@ -1,8 +1,13 @@ | |||
1 | SUMMARY = "Easy API to create and parse X.509 and CMS related objects" | 1 | SUMMARY = "Easy API to create and parse X.509 and CMS related objects" |
2 | DESCRIPTION = "A library to make the tasks of working with X.509 certificates, \ | ||
3 | CMS data and related objects more easy. It provides a highlevel interface to \ | ||
4 | the implemented protocols and presents the data in a consistent way. The \ | ||
5 | library does not rely on another cryptographic library but provides \ | ||
6 | hooks for easy integration with Libgcrypt. " | ||
2 | HOMEPAGE = "http://www.gnupg.org/related_software/libksba/" | 7 | HOMEPAGE = "http://www.gnupg.org/related_software/libksba/" |
3 | LICENSE = "GPLv3+ & (GPLv2+ | LGPLv3+)" | 8 | LICENSE = "GPL-3.0-or-later & (GPL-2.0-or-later | LGPL-3.0-or-later)" |
4 | LICENSE_${PN} = "GPLv2+ | LGPLv3+" | 9 | LICENSE:${PN} = "GPL-2.0-or-later | LGPL-3.0-or-later" |
5 | LICENSE_${PN}-doc = "GPLv3+" | 10 | LICENSE:${PN}-doc = "GPL-3.0-or-later" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=fd541d83f75d038c4e0617b672ed8bda \ | 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=fd541d83f75d038c4e0617b672ed8bda \ |
7 | file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 12 | file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
8 | file://COPYING.GPLv3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \ | 13 | file://COPYING.GPLv3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \ |
@@ -19,9 +24,9 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" | |||
19 | SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ | 24 | SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ |
20 | file://ksba-add-pkgconfig-support.patch" | 25 | file://ksba-add-pkgconfig-support.patch" |
21 | 26 | ||
22 | SRC_URI[sha256sum] = "ae4af129216b2d7fdea0b5bf2a788cd458a79c983bb09a43f4d525cc87aba0ba" | 27 | SRC_URI[sha256sum] = "5dec033d211559338838c0c4957c73dfdc3ee86f73977d6279640c9cd08ce6a4" |
23 | 28 | ||
24 | do_configure_prepend () { | 29 | do_configure:prepend () { |
25 | # Else these could be used in preference to those in aclocal-copy | 30 | # Else these could be used in preference to those in aclocal-copy |
26 | rm -f ${S}/m4/gpg-error.m4 | 31 | rm -f ${S}/m4/gpg-error.m4 |
27 | } | 32 | } |