[PATCH] gnupg: set development_version as no

[PATCH] gnupg: set development_version as no

[wenzong.fan]

From: Wenzong Fan <wenzong.fan@windriver.com>

The development_version used to mark if gnupg is a beta version. The
checking logic in autogen.sh always assume that gnupg is beta if below
command is not run in gnupg's git-repo:

  './autogen.sh --find-version 2 1 7'

This does not work for integration. Set development_version as no to
fix runtime issue:

  $gpg --list-sigs
  gpg: NOTE: THIS IS A DEVELOPMENT VERSION!
  gpg: It is only intended for test purposes and should NOT be
  gpg: used in a production environment or with production keys!

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
 .../configure-set-development_version-as-no.patch  | 36 ++++++++++++++++++++++
 meta/recipes-support/gnupg/gnupg_2.1.7.bb          |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 meta/recipes-support/gnupg/gnupg/configure-set-development_version-as-no.patch

diff --git a/meta/recipes-support/gnupg/gnupg/configure-set-development_version-as-no.patch b/meta/recipes-support/gnupg/gnupg/configure-set-development_version-as-no.patch
new file mode 100644
index 0000000..3c71040
--- /dev/null
+++ b/meta/recipes-support/gnupg/gnupg/configure-set-development_version-as-no.patch
@@ -0,0 +1,36 @@
+From 6cdc55816048afb52f1c3a706c0ba99dfc069b89 Mon Sep 17 00:00:00 2001
+From: Wenzong Fan <wenzong.fan@windriver.com>
+Date: Thu, 22 Oct 2015 02:51:46 -0400
+Subject: [PATCH] gnupg: set development_version as no
+
+The development_version used to mark if gnupg is a beta version. The
+checking logic in autogen.sh always assume that gnupg is beta if below
+command is not run in gnupg's git-repo:
+
+  './autogen.sh --find-version 2 1 7'
+
+This does not work for integration.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b38aa06..ea40c19 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -70,7 +70,7 @@ NEED_NPTH_VERSION=0.91
+ NEED_GNUTLS_VERSION=3.0
+ 
+ 
+-development_version=mym4_isbeta
++development_version=no
+ PACKAGE=$PACKAGE_NAME
+ PACKAGE_GT=${PACKAGE_NAME}2
+ VERSION=$PACKAGE_VERSION
+-- 
+1.9.1
+
diff --git a/meta/recipes-support/gnupg/gnupg_2.1.7.bb b/meta/recipes-support/gnupg/gnupg_2.1.7.bb
index 48c7c96..638af6d 100644
--- a/meta/recipes-support/gnupg/gnupg_2.1.7.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.1.7.bb
@@ -12,6 +12,7 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://pkgconfig.patch \
            file://use-pkgconfig-instead-of-npth-config.patch \
            file://dirmngr-uses-libgpg-error.patch \
+           file://configure-set-development_version-as-no.patch \
           "
 
 SRC_URI[md5sum] = "ebdf92b15b8bcd8579b643c7f41a3238"
-- 
1.9.1

Re: [PATCH] gnupg: set development_version as no

[Burton, Ross]

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

On 22 October 2015 at 10:33, <wenzong.fan@windriver.com> wrote:

> +-development_version=mym4_isbeta
> ++development_version=no
>

I'd say that a neater fix would be to change the logic in autogen,sh to set
beta=no in the find-version logic.  There's a chance you can use the
argument that taking an upstream tarball and re-running autoconf shouldn't
be considered a development release to get it upstreamed then.

Ross

[-- Attachment #2: Type: text/html, Size: 857 bytes --]

Re: [PATCH] gnupg: set development_version as no

[wenzong fan]

On 10/23/2015 06:40 PM, Burton, Ross wrote:
>
> On 22 October 2015 at 10:33, <wenzong.fan@windriver.com
> <mailto:wenzong.fan@windriver.com>> wrote:
>
>     +-development_version=mym4_isbeta
>     ++development_version=no
>
>
> I'd say that a neater fix would be to change the logic in autogen,sh to
> set beta=no in the find-version logic.  There's a chance you can use the
> argument that taking an upstream tarball and re-running autoconf
> shouldn't be considered a development release to get it upstreamed then.

Ok, I'll update the patch.

Thanks
Wenzong

>
> Ross