Patchwork [112/131] libksba: Add recipe (version 1.3.0) needed for upgraded gnupg

login
register
mail settings
Submitter christian.braunersorensen@prevas.dk
Date Jan. 14, 2014, 12:34 p.m.
Message ID <2f28195ac9b12d2f6a0e5af7ae94a17a0b045456.1389702652.git.christian.braunersorensen@prevas.dk>
Download mbox | patch
Permalink /patch/310715/
State Accepted
Delegated to: Esben Haabendal
Headers show

Comments

christian.braunersorensen@prevas.dk - Jan. 14, 2014, 12:34 p.m.
From: Christian Sørensen <christian.braunersorensen@prevas.dk>

Signed-off-by: Christian Sørensen <christian.braunersorensen@prevas.dk>
---
 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

Patch

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 <Qi.Chen@windriver.com>
+
+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