From patchwork Tue Jan 14 12:34:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: christian.braunersorensen@prevas.dk X-Patchwork-Id: 310715 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id CA8C92C00AF for ; Tue, 14 Jan 2014 23:37:23 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 9DBB340564 for ; Tue, 14 Jan 2014 13:37:22 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail02.prevas.se (mail02.prevas.se [62.95.78.10]) by hugin.dotsrc.org (Postfix) with ESMTPS id DA83E40570 for ; Tue, 14 Jan 2014 13:35:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=4028; q=dns/txt; s=ironport2; t=1389702908; x=1421238908; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=9Wucng1ATUbsk49/YUafSNBAQTaShT0ljV47Ywl/DHU=; b=rpfMdDGjT9x9G1tJ/DQoS6yUN5vY68hUk3pXovy65pHOEKiQM+j6cco7 /tU7NgpE4ho9FW9bHU7xomkv7LbTM+n+IZQkQUyeGwtRntJX7UTmsT9c3 6DgXmTR7/kNGbxx0mJ8ihIhfu3tkxdKCpdQrD6oBjG/PdqvaL8Zox1Fn2 E=; X-IronPort-AV: E=Sophos;i="4.95,658,1384297200"; d="scan'208";a="196401" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport2.prevas.se with ESMTP/TLS/AES128-SHA; 14 Jan 2014 13:35:04 +0100 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Tue, 14 Jan 2014 13:35:04 +0100 Received: by localhost (Postfix, from userid 30007) id 10D5B681563; Tue, 14 Jan 2014 12:35:04 +0000 (UTC) From: To: Subject: [PATCH 112/131] libksba: Add recipe (version 1.3.0) needed for upgraded gnupg Date: Tue, 14 Jan 2014 12:34:39 +0000 Message-ID: <2f28195ac9b12d2f6a0e5af7ae94a17a0b045456.1389702652.git.christian.braunersorensen@prevas.dk> X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Christian Sørensen Signed-off-by: Christian Sørensen --- recipes/libksba/libksba.inc | 14 +++++ .../libksba/ksba-add-pkgconfig-support.patch | 59 ++++++++++++++++++++++ recipes/libksba/libksba_1.3.0.oe | 13 +++++ recipes/libksba/libksba_1.3.0.oe.sig | 1 + 4 files changed, 87 insertions(+) create mode 100644 recipes/libksba/libksba.inc create mode 100644 recipes/libksba/libksba/ksba-add-pkgconfig-support.patch create mode 100644 recipes/libksba/libksba_1.3.0.oe create mode 100644 recipes/libksba/libksba_1.3.0.oe.sig diff --git a/recipes/libksba/libksba.inc b/recipes/libksba/libksba.inc new file mode 100644 index 0000000..4deafa5 --- /dev/null +++ b/recipes/libksba/libksba.inc @@ -0,0 +1,14 @@ +SUMMARY = "Easy API to create and parse X.509 and CMS related objects" +HOMEPAGE = "http://www.gnupg.org/related_software/libksba/" +LICENSE = "GPLv2+ | LGPLv3+ | GPLv3+" + +DEPENDS = "libgpg-error" + +inherit autotools-autoreconf pkgconfig library auto-package-utils binconfig + +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${PN}/${PN}-${PV}.tar.bz2" + +AUTO_PACKAGE_UTILS += "ksba-config" + +DEPENDS_${PN} += "libgpg-error libc" +RDEPENDS_${PN} += "libgpg-error libc" diff --git a/recipes/libksba/libksba/ksba-add-pkgconfig-support.patch b/recipes/libksba/libksba/ksba-add-pkgconfig-support.patch new file mode 100644 index 0000000..fe1ec0f --- /dev/null +++ b/recipes/libksba/libksba/ksba-add-pkgconfig-support.patch @@ -0,0 +1,59 @@ +Upstream-Status: Rejected + +Add pkgconfig support to libksba. +This patch is rejected by upstream for the reason below: +They think pkgconfig adds no portability and maintaining them is not worthwhile. + +Signed-off-by: Chen Qi + +Index: Makefile.am +=============================================================== +--- a/Makefile.am ++++ b/Makefile.am +@@ -21,6 +21,9 @@ + ACLOCAL_AMFLAGS = -I m4 -I gl/m4 + AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip + ++pkgconfigdir = ${libdir}/pkgconfig ++pkgconfig_DATA = ksba.pc ++ + # (A suitable gitlog-to-changelog script can be found in GnuPG master.) + GITLOG_TO_CHANGELOG=gitlog-to-changelog + +Index: configure.ac +=============================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -399,6 +399,7 @@ m4/Makefile + gl/Makefile + src/Makefile + src/ksba-config + src/versioninfo.rc ++ksba.pc + tests/Makefile + doc/Makefile + +Index: src/ksba.pc.in +=============================================================== +--- /dev/null ++++ b/ksba.pc.in +@@ -0,0 +1,16 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++# API info ++api_version=@KSBA_CONFIG_API_VERSION@ ++ ++Name: ksba ++Description: Libksba provides an easy API to create and parse X.509 and CMS related objects ++Requires: ++Version: @VERSION@ ++Libs: -L${libdir} -lksba ++Libs.private: -L{libdir} -lgpg-error ++Cflags: -I${includedir} ++ +-- +1.7.5.4 + diff --git a/recipes/libksba/libksba_1.3.0.oe b/recipes/libksba/libksba_1.3.0.oe new file mode 100644 index 0000000..1834072 --- /dev/null +++ b/recipes/libksba/libksba_1.3.0.oe @@ -0,0 +1,13 @@ +require libksba.inc + +SRC_URI += "file://ksba-add-pkgconfig-support.patch" + +LIBRARY_VERSION = "8" + +do_install[postfuncs] += "do_install_fix_path_error" +do_install_fix_path_error() { + sed -i -e 's#\(libs=\"-lksba\).*\( -lgpg-error\"\)#\1\2#' \ + ${D}${bindir}/ksba-config + sed -i -e 's#\(cflags=\"\).*\(\"\)#\1\2#' \ + ${D}${bindir}/ksba-config +} diff --git a/recipes/libksba/libksba_1.3.0.oe.sig b/recipes/libksba/libksba_1.3.0.oe.sig new file mode 100644 index 0000000..3888c1f --- /dev/null +++ b/recipes/libksba/libksba_1.3.0.oe.sig @@ -0,0 +1 @@ +241afcb2dfbf3f3fc27891a53a33f12d9084d772 libksba-1.3.0.tar.bz2