[PATCH 0/2] Fix gpg support in opkg

[PATCH 0/2] Fix gpg support in opkg

[Paul Barker]

After recent changes to disable binconfig programs, 'gpgme-config' is no longer
installed with gpgme. This prevents opkg from finding gpgme which is needed when
'gpg' is added to PACKAGECONFIG. This is fixed in two stages:

  - A 'gpgme.pc' file was created and added to openembedded-core to be installed
    with gpgme. The Cflags and Libs values for this file were found by running
    'gpgme-config' on my development machine. This patch is included here.

  - Changes were made to 'configure.ac' in opkg to use pkg-config to find gpgme
    instead of using 'gpgme-config'. These changes could be added as a patch in
    openembedded-core but I don't think there's much point. opkg-0.2.3 should be
    released in the next couple of weeks and I'll include the relevant changes
    in that.

Additionally, I found that gpg itself wasn't installed when opkg was installed
with gpg support. The 'opkg-key' program uses gpg to manage the list of trusted
keys so without gpg it isn't possible to set up package feed verification on a
device. Therefore, I've added 'gnupg' to RDEPENDS when 'gpg' is in
PACKAGECONFIG.

Paul Barker (2):
  gpgme: Add pkg-config file
  opkg: Add runtime dep on gnupg if 'gpg' is in PACAKGECONFIG

 meta/recipes-devtools/opkg/opkg.inc             |  2 +-
 meta/recipes-support/gpgme/gpgme-1.4.3/gpgme.pc | 10 ++++++++++
 meta/recipes-support/gpgme/gpgme_1.4.3.bb       |  8 +++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/gpgme/gpgme-1.4.3/gpgme.pc

-- 
2.0.3

[PATCH 1/2] gpgme: Add pkg-config file

[Paul Barker]

A basic gpgme.pc file is installed with gpgme which should allow the library to
be found and used using pkg-config rather than gpgme-config.

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
 meta/recipes-support/gpgme/gpgme-1.4.3/gpgme.pc | 10 ++++++++++
 meta/recipes-support/gpgme/gpgme_1.4.3.bb       |  8 +++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-support/gpgme/gpgme-1.4.3/gpgme.pc

diff --git a/meta/recipes-support/gpgme/gpgme-1.4.3/gpgme.pc b/meta/recipes-support/gpgme/gpgme-1.4.3/gpgme.pc
new file mode 100644
index 0000000..30a4d56
--- /dev/null
+++ b/meta/recipes-support/gpgme/gpgme-1.4.3/gpgme.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: gpgme
+Description: GNU Privacy Guard Made Easy
+Version: 1.4.3
+Requires:
+Libs: -L${libdir} -lgpgme -lassuan -lgpg-error
+Cflags: -I${includedir}
diff --git a/meta/recipes-support/gpgme/gpgme_1.4.3.bb b/meta/recipes-support/gpgme/gpgme_1.4.3.bb
index ef08d4f..ca1e5f9 100644
--- a/meta/recipes-support/gpgme/gpgme_1.4.3.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.4.3.bb
@@ -10,7 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
-           file://disable_gpgconf_check.patch"
+           file://disable_gpgconf_check.patch \
+           file://gpgme.pc"
 
 SRC_URI[md5sum] = "334e524cffa8af4e2f43ae8afe585672"
 SRC_URI[sha256sum] = "2d1cc12411753752d9c5b9037e6fd3fd363517af720154768cc7b46b60120496"
@@ -32,3 +33,8 @@ do_configure_prepend () {
 	rm -f ${S}/m4/gpg-error.m4
 	rm -f ${S}/m4/libassuan.m4
 }
+
+do_install_append () {
+        install -d ${D}${libdir}/pkgconfig
+        install -m 0644 ${WORKDIR}/gpgme.pc ${D}${libdir}/pkgconfig/
+}
-- 
2.0.3

[PATCH 2/2] opkg: Add runtime dep on gnupg if 'gpg' is in PACAKGECONFIG

[Paul Barker]

The 'opkg-key' utility requires gpg to manage the list of trusted keys. The
ability to verify package signatures is not much use without the ability to add
keys to the trusted list...

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
 meta/recipes-devtools/opkg/opkg.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index ba21d84..56c54b6 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -27,7 +27,7 @@ OPKGLIBDIR = "${target_localstatedir}/lib"
 
 PACKAGECONFIG ??= ""
 
-PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error"
+PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error,gnupg"
 PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
 PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl openssl"
 PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
-- 
2.0.3

Re: [PATCH 2/2] opkg: Add runtime dep on gnupg if 'gpg' is in PACAKGECONFIG

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1420 bytes --]

On Fri, Aug 08, 2014 at 11:37:09AM +0000, Paul Barker wrote:
> The 'opkg-key' utility requires gpg to manage the list of trusted keys. The
> ability to verify package signatures is not much use without the ability to add
> keys to the trusted list...
> 
> Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
> ---
>  meta/recipes-devtools/opkg/opkg.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
> index ba21d84..56c54b6 100644
> --- a/meta/recipes-devtools/opkg/opkg.inc
> +++ b/meta/recipes-devtools/opkg/opkg.inc
> @@ -27,7 +27,7 @@ OPKGLIBDIR = "${target_localstatedir}/lib"
>  
>  PACKAGECONFIG ??= ""
>  
> -PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error"
> +PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error,gnupg"

Shouldn't this be gpgme?

>  PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
>  PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl openssl"
>  PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
> -- 
> 2.0.3
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 2/2] opkg: Add runtime dep on gnupg if 'gpg' is in PACAKGECONFIG

[Paul Barker]

[-- Attachment #1: Type: text/plain, Size: 1191 bytes --]

On Fri, Aug 08, 2014 at 02:13:46PM +0200, Martin Jansa wrote:
> On Fri, Aug 08, 2014 at 11:37:09AM +0000, Paul Barker wrote:
> > The 'opkg-key' utility requires gpg to manage the list of trusted keys. The
> > ability to verify package signatures is not much use without the ability to add
> > keys to the trusted list...
> > 
> > Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
> > ---
> >  meta/recipes-devtools/opkg/opkg.inc | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
> > index ba21d84..56c54b6 100644
> > --- a/meta/recipes-devtools/opkg/opkg.inc
> > +++ b/meta/recipes-devtools/opkg/opkg.inc
> > @@ -27,7 +27,7 @@ OPKGLIBDIR = "${target_localstatedir}/lib"
> >  
> >  PACKAGECONFIG ??= ""
> >  
> > -PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error"
> > +PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error,gnupg"
> 
> Shouldn't this be gpgme?
> 

Which bit? The PACKAGECONFIG name or one of the comma separated fields?

Thanks,

-- 
Paul Barker

Email: paul@paulbarker.me.uk
http://www.paulbarker.me.uk

[-- Attachment #2: Type: application/pgp-signature, Size: 484 bytes --]

Re: [PATCH 2/2] opkg: Add runtime dep on gnupg if 'gpg' is in PACAKGECONFIG

[Paul Barker]

[-- Attachment #1: Type: text/plain, Size: 1386 bytes --]

On Fri, Aug 08, 2014 at 12:16:28PM +0000, Paul Barker wrote:
> On Fri, Aug 08, 2014 at 02:13:46PM +0200, Martin Jansa wrote:
> > On Fri, Aug 08, 2014 at 11:37:09AM +0000, Paul Barker wrote:
> > > The 'opkg-key' utility requires gpg to manage the list of trusted keys. The
> > > ability to verify package signatures is not much use without the ability to add
> > > keys to the trusted list...
> > > 
> > > Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
> > > ---
> > >  meta/recipes-devtools/opkg/opkg.inc | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
> > > index ba21d84..56c54b6 100644
> > > --- a/meta/recipes-devtools/opkg/opkg.inc
> > > +++ b/meta/recipes-devtools/opkg/opkg.inc
> > > @@ -27,7 +27,7 @@ OPKGLIBDIR = "${target_localstatedir}/lib"
> > >  
> > >  PACKAGECONFIG ??= ""
> > >  
> > > -PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error"
> > > +PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error,gnupg"
> > 
> > Shouldn't this be gpgme?
> > 
> 
> Which bit? The PACKAGECONFIG name or one of the comma separated fields?
> 

Sorry Martin, I didn't understand your comment. Could you clarify for me?

Thanks,

-- 
Paul Barker

Email: paul@paulbarker.me.uk
http://www.paulbarker.me.uk

[-- Attachment #2: Type: application/pgp-signature, Size: 484 bytes --]

Re: [PATCH 2/2] opkg: Add runtime dep on gnupg if 'gpg' is in PACAKGECONFIG

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1829 bytes --]

On Thu, Aug 14, 2014 at 04:50:33PM +0000, Paul Barker wrote:
> On Fri, Aug 08, 2014 at 12:16:28PM +0000, Paul Barker wrote:
> > On Fri, Aug 08, 2014 at 02:13:46PM +0200, Martin Jansa wrote:
> > > On Fri, Aug 08, 2014 at 11:37:09AM +0000, Paul Barker wrote:
> > > > The 'opkg-key' utility requires gpg to manage the list of trusted keys. The
> > > > ability to verify package signatures is not much use without the ability to add
> > > > keys to the trusted list...
> > > > 
> > > > Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
> > > > ---
> > > >  meta/recipes-devtools/opkg/opkg.inc | 2 +-
> > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > > 
> > > > diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
> > > > index ba21d84..56c54b6 100644
> > > > --- a/meta/recipes-devtools/opkg/opkg.inc
> > > > +++ b/meta/recipes-devtools/opkg/opkg.inc
> > > > @@ -27,7 +27,7 @@ OPKGLIBDIR = "${target_localstatedir}/lib"
> > > >  
> > > >  PACKAGECONFIG ??= ""
> > > >  
> > > > -PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error"
> > > > +PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error,gnupg"
> > > 
> > > Shouldn't this be gpgme?
> > > 
> > 
> > Which bit? The PACKAGECONFIG name or one of the comma separated fields?
> > 
> 
> Sorry Martin, I didn't understand your comment. Could you clarify for me?

Sorry for late reply, I haven't noticed your earlier e-mail.

It has build-time dependency on gpgme and runtime dependency on gnupg
(in comma separated fields) - it could be OK, I just wasn't sure.

Is opkg-key calling gnupg tools?

> Thanks,
> 
> -- 
> Paul Barker
> 
> Email: paul@paulbarker.me.uk
> http://www.paulbarker.me.uk



-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 2/2] opkg: Add runtime dep on gnupg if 'gpg' is in PACAKGECONFIG

[Paul Barker]

[-- Attachment #1: Type: text/plain, Size: 2042 bytes --]

On Thu, Aug 14, 2014 at 07:16:53PM +0200, Martin Jansa wrote:
> On Thu, Aug 14, 2014 at 04:50:33PM +0000, Paul Barker wrote:
> > On Fri, Aug 08, 2014 at 12:16:28PM +0000, Paul Barker wrote:
> > > On Fri, Aug 08, 2014 at 02:13:46PM +0200, Martin Jansa wrote:
> > > > On Fri, Aug 08, 2014 at 11:37:09AM +0000, Paul Barker wrote:
> > > > > The 'opkg-key' utility requires gpg to manage the list of trusted keys. The
> > > > > ability to verify package signatures is not much use without the ability to add
> > > > > keys to the trusted list...
> > > > > 
> > > > > Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
> > > > > ---
> > > > >  meta/recipes-devtools/opkg/opkg.inc | 2 +-
> > > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > > > 
> > > > > diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
> > > > > index ba21d84..56c54b6 100644
> > > > > --- a/meta/recipes-devtools/opkg/opkg.inc
> > > > > +++ b/meta/recipes-devtools/opkg/opkg.inc
> > > > > @@ -27,7 +27,7 @@ OPKGLIBDIR = "${target_localstatedir}/lib"
> > > > >  
> > > > >  PACKAGECONFIG ??= ""
> > > > >  
> > > > > -PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error"
> > > > > +PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error,gnupg"
> > > > 
> > > > Shouldn't this be gpgme?
> > > > 
> > > 
> > > Which bit? The PACKAGECONFIG name or one of the comma separated fields?
> > > 
> > 
> > Sorry Martin, I didn't understand your comment. Could you clarify for me?
> 
> Sorry for late reply, I haven't noticed your earlier e-mail.
> 
> It has build-time dependency on gpgme and runtime dependency on gnupg
> (in comma separated fields) - it could be OK, I just wasn't sure.
> 
> Is opkg-key calling gnupg tools?
> 

Yes, opkg-key is just a shell script which runs 'gpg' with appropriate command
line options. The main opkg program uses the gpgme library instead.

Thanks,

-- 
Paul Barker

Email: paul@paulbarker.me.uk
http://www.paulbarker.me.uk

[-- Attachment #2: Type: application/pgp-signature, Size: 484 bytes --]

Re: [PATCH 0/2] Fix gpg support in opkg

[Paul Barker]

[-- Attachment #1: Type: text/plain, Size: 1908 bytes --]

On Fri, Aug 08, 2014 at 11:37:07AM +0000, Paul Barker wrote:
> After recent changes to disable binconfig programs, 'gpgme-config' is no longer
> installed with gpgme. This prevents opkg from finding gpgme which is needed when
> 'gpg' is added to PACKAGECONFIG. This is fixed in two stages:
> 
>   - A 'gpgme.pc' file was created and added to openembedded-core to be installed
>     with gpgme. The Cflags and Libs values for this file were found by running
>     'gpgme-config' on my development machine. This patch is included here.
> 
>   - Changes were made to 'configure.ac' in opkg to use pkg-config to find gpgme
>     instead of using 'gpgme-config'. These changes could be added as a patch in
>     openembedded-core but I don't think there's much point. opkg-0.2.3 should be
>     released in the next couple of weeks and I'll include the relevant changes
>     in that.
> 
> Additionally, I found that gpg itself wasn't installed when opkg was installed
> with gpg support. The 'opkg-key' program uses gpg to manage the list of trusted
> keys so without gpg it isn't possible to set up package feed verification on a
> device. Therefore, I've added 'gnupg' to RDEPENDS when 'gpg' is in
> PACKAGECONFIG.
> 
> Paul Barker (2):
>   gpgme: Add pkg-config file
>   opkg: Add runtime dep on gnupg if 'gpg' is in PACAKGECONFIG
> 
>  meta/recipes-devtools/opkg/opkg.inc             |  2 +-
>  meta/recipes-support/gpgme/gpgme-1.4.3/gpgme.pc | 10 ++++++++++
>  meta/recipes-support/gpgme/gpgme_1.4.3.bb       |  8 +++++++-
>  3 files changed, 18 insertions(+), 2 deletions(-)
>  create mode 100644 meta/recipes-support/gpgme/gpgme-1.4.3/gpgme.pc
> 

Ping on these two patches. I think I've addressed Martin's question on the
second patch now, they should hopefully be ok to merge.

Thanks,

-- 
Paul Barker

Email: paul@paulbarker.me.uk
http://www.paulbarker.me.uk

[-- Attachment #2: Type: application/pgp-signature, Size: 484 bytes --]

Re: [PATCH 0/2] Fix gpg support in opkg

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2146 bytes --]

On Tue, Aug 19, 2014 at 06:55:26PM +0000, Paul Barker wrote:
> On Fri, Aug 08, 2014 at 11:37:07AM +0000, Paul Barker wrote:
> > After recent changes to disable binconfig programs, 'gpgme-config' is no longer
> > installed with gpgme. This prevents opkg from finding gpgme which is needed when
> > 'gpg' is added to PACKAGECONFIG. This is fixed in two stages:
> > 
> >   - A 'gpgme.pc' file was created and added to openembedded-core to be installed
> >     with gpgme. The Cflags and Libs values for this file were found by running
> >     'gpgme-config' on my development machine. This patch is included here.
> > 
> >   - Changes were made to 'configure.ac' in opkg to use pkg-config to find gpgme
> >     instead of using 'gpgme-config'. These changes could be added as a patch in
> >     openembedded-core but I don't think there's much point. opkg-0.2.3 should be
> >     released in the next couple of weeks and I'll include the relevant changes
> >     in that.
> > 
> > Additionally, I found that gpg itself wasn't installed when opkg was installed
> > with gpg support. The 'opkg-key' program uses gpg to manage the list of trusted
> > keys so without gpg it isn't possible to set up package feed verification on a
> > device. Therefore, I've added 'gnupg' to RDEPENDS when 'gpg' is in
> > PACKAGECONFIG.
> > 
> > Paul Barker (2):
> >   gpgme: Add pkg-config file
> >   opkg: Add runtime dep on gnupg if 'gpg' is in PACAKGECONFIG
> > 
> >  meta/recipes-devtools/opkg/opkg.inc             |  2 +-
> >  meta/recipes-support/gpgme/gpgme-1.4.3/gpgme.pc | 10 ++++++++++
> >  meta/recipes-support/gpgme/gpgme_1.4.3.bb       |  8 +++++++-
> >  3 files changed, 18 insertions(+), 2 deletions(-)
> >  create mode 100644 meta/recipes-support/gpgme/gpgme-1.4.3/gpgme.pc
> > 
> 
> Ping on these two patches. I think I've addressed Martin's question on the
> second patch now, they should hopefully be ok to merge.

Yes, it's fine with me.

> Thanks,
> 
> -- 
> Paul Barker
> 
> Email: paul@paulbarker.me.uk
> http://www.paulbarker.me.uk



-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]