[Buildroot] [PATCH 0/5] Add support for gnupg2

[Buildroot] [PATCH 0/5] Add support for gnupg2

[Vicente Olivert Riera]

This series of patches add support for gnupg2 by adding the gnupg2 
package. The pth and libksba packages are added because they are direct 
dependencies of gnupg2.
It also makes gnupg and gnupg2 mutual exclusive because they can't be 
installed at the same time due to file collisions.
And it also add support for pinentry by adding this package to make the 
gnupg and gnupg2 packages more useful. Right now we can't even generate 
a key with "gpg --gen-key" because there isn't a pinentry program to ask 
for a passphrase.

Vicente Olivert Riera (5):
  pth: new package
  libksba: new package
  gnupg2: new package
  gnupg: Make gnupg and gnupg2 mutual exclusive
  pinentry: new package

 package/Config.in                               |    4 +
 package/gnupg/Config.in                         |    1 +
 package/gnupg2/Config.in                        |   39 ++++++++++++
 package/gnupg2/gnupg2.mk                        |   27 ++++++++
 package/libksba/Config.in                       |    7 ++
 package/libksba/libksba.mk                      |   16 +++++
 package/pinentry/Config.in                      |   53 ++++++++++++++++
 package/pinentry/pinentry.mk                    |   47 ++++++++++++++
 package/pth/Config.in                           |   10 +++
 package/pth/pth-001-disable-documentation.patch |   74 +++++++++++++++++++++++
 package/pth/pth.mk                              |   28 +++++++++
 11 files changed, 306 insertions(+), 0 deletions(-)
 create mode 100644 package/gnupg2/Config.in
 create mode 100644 package/gnupg2/gnupg2.mk
 create mode 100644 package/libksba/Config.in
 create mode 100644 package/libksba/libksba.mk
 create mode 100644 package/pinentry/Config.in
 create mode 100644 package/pinentry/pinentry.mk
 create mode 100644 package/pth/Config.in
 create mode 100644 package/pth/pth-001-disable-documentation.patch
 create mode 100644 package/pth/pth.mk

[Buildroot] [PATCH 1/5] pth: new package

[Vicente Olivert Riera]

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Markos Chandras <Markos.Chandras@imgtec.com>
---
 package/Config.in                               |    1 +
 package/pth/Config.in                           |   10 +++
 package/pth/pth-001-disable-documentation.patch |   74 +++++++++++++++++++++++
 package/pth/pth.mk                              |   28 +++++++++
 4 files changed, 113 insertions(+), 0 deletions(-)
 create mode 100644 package/pth/Config.in
 create mode 100644 package/pth/pth-001-disable-documentation.patch
 create mode 100644 package/pth/pth.mk

diff --git a/package/Config.in b/package/Config.in
index 1706197..14508ae 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -829,6 +829,7 @@ source "package/p11-kit/Config.in"
 source "package/poco/Config.in"
 source "package/protobuf/Config.in"
 source "package/protobuf-c/Config.in"
+source "package/pth/Config.in"
 source "package/qhull/Config.in"
 source "package/schifra/Config.in"
 source "package/startup-notification/Config.in"
diff --git a/package/pth/Config.in b/package/pth/Config.in
new file mode 100644
index 0000000..54bb34c
--- /dev/null
+++ b/package/pth/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PTH
+	bool "pth"
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC
+	help
+	  GNU Pth - The GNU Portable Threads
+
+	  http://www.gnu.org/software/pth/
+
+comment "pth doesn't work with uClibc"
+	depends on BR2_TOOLCHAIN_USES_UCLIBC
diff --git a/package/pth/pth-001-disable-documentation.patch b/package/pth/pth-001-disable-documentation.patch
new file mode 100644
index 0000000..b9f9500
--- /dev/null
+++ b/package/pth/pth-001-disable-documentation.patch
@@ -0,0 +1,74 @@
+--- pth-2.0.7/Makefile.in.orig	2014-06-05 14:49:36.860173486 +0100
++++ pth-2.0.7/Makefile.in	2014-06-05 14:54:51.662441551 +0100
+@@ -174,24 +174,6 @@ libpthread.la: pthread.lo $(LOBJS)
+ 	$(LIBTOOL) --mode=link --quiet $(CC) -o libpthread.la pthread.lo $(LOBJS) \
+ 	-rpath $(libdir) -version-info `$(SHTOOL) version -lc -dlibtool $(_VERSION_FILE)`
+ 
+-#   build the manual pages
+-$(S)pth-config.1: $(S)pth-config.pod $(_VERSION_FILE)
+-	@BASENAME="pth-config"; SEC=1; \
+-	NAME="GNU Pth"; ONELINE="GNU Portable Threads"; \
+-	$(_MANPAGE)
+-$(S)pth.3: $(S)pth.pod $(_VERSION_FILE)
+-	@BASENAME="pth"; SEC=3; \
+-	NAME="GNU Pth"; ONELINE="GNU Portable Threads"; \
+-	$(_MANPAGE)
+-$(S)pthread-config.1: $(S)pthread-config.pod $(_VERSION_FILE)
+-	@BASENAME="pthread-config"; SEC=1; \
+-	NAME="GNU Pth"; ONELINE="POSIX Threading API of GNU Pth"; \
+-	$(_MANPAGE)
+-$(S)pthread.3: $(S)pthread.pod $(_VERSION_FILE)
+-	@BASENAME="pthread"; SEC=3; \
+-	NAME="GNU Pth"; ONELINE="POSIX Threading API of GNU Pth"; \
+-	$(_MANPAGE)
+-
+ #   build test program
+ test_std: test_std.o test_common.o libpth.la
+ 	$(LIBTOOL) --mode=link --quiet $(CC) $(LDFLAGS) -o test_std test_std.o test_common.o libpth.la $(LIBS)
+@@ -224,22 +206,16 @@ install-dirs:
+ 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir)
+ 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(includedir)
+ 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(libdir)
+-	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
+-	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man3
+ 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(datadir)/aclocal
+ install-pth:
+ 	$(SHTOOL) install -c -m 755 pth-config $(DESTDIR)$(bindir)/pth-config
+-	$(SHTOOL) install -c -m 644 $(S)pth-config.1 $(DESTDIR)$(mandir)/man1/pth-config.1
+-	$(SHTOOL) install -c -m 644 $(S)pth.3 $(DESTDIR)$(mandir)/man3/pth.3
+ 	$(SHTOOL) install -c -m 644 $(S)pth.m4 $(DESTDIR)$(datadir)/aclocal/pth.m4
+ 	$(SHTOOL) install -c -m 644 pth.h $(DESTDIR)$(includedir)/pth.h
+ 	@umask 022; $(LIBTOOL) --mode=install \
+ 	$(SHTOOL) install -c libpth.la $(DESTDIR)$(libdir)/libpth.la
+ install-pthread:
+ 	$(SHTOOL) install -c -m 755 pthread-config $(DESTDIR)$(bindir)/pthread-config
+-	$(SHTOOL) install -c -m 644 $(S)pthread-config.1 $(DESTDIR)$(mandir)/man1/pthread-config.1
+ 	$(SHTOOL) install -c -m 644 pthread.h $(DESTDIR)$(includedir)/pthread.h
+-	$(SHTOOL) install -c -m 644 $(S)pthread.3 $(DESTDIR)$(mandir)/man3/pthread.3
+ 	@umask 022; $(LIBTOOL) --mode=install \
+ 	$(SHTOOL) install -c libpthread.la $(DESTDIR)$(libdir)/libpthread.la
+ 
+@@ -250,23 +226,16 @@ uninstall:
+ 	@$(MAKE) $(MKFLAGS) what-next
+ uninstall-pthread:
+ 	$(RM) $(DESTDIR)$(bindir)/pthread-config
+-	$(RM) $(DESTDIR)$(mandir)/man1/pthread-config.1
+ 	$(RM) $(DESTDIR)$(includedir)/pthread.h
+-	$(RM) $(DESTDIR)$(mandir)/man3/pthread.3
+ 	@$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libpthread.la
+ uninstall-pth:
+ 	$(RM) $(DESTDIR)$(bindir)/pth-config
+-	$(RM) $(DESTDIR)$(mandir)/man1/pth-config.1
+-	$(RM) $(DESTDIR)$(mandir)/man3/pth.3
+ 	$(RM) $(DESTDIR)$(datadir)/aclocal/pth.m4
+ 	$(RM) $(DESTDIR)$(includedir)/pth.h
+ 	@$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libpth.la
+ uninstall-dirs:
+ 	-$(RMDIR) $(DESTDIR)$(datadir)/aclocal >/dev/null 2>&1 || $(TRUE)
+ 	-$(RMDIR) $(DESTDIR)$(datadir) >/dev/null 2>&1 || $(TRUE)
+-	-$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
+-	-$(RMDIR) $(DESTDIR)$(mandir)/man3 >/dev/null 2>&1 || $(TRUE)
+-	-$(RMDIR) $(DESTDIR)$(mandir) >/dev/null 2>&1 || $(TRUE)
+ 	-$(RMDIR) $(DESTDIR)$(libdir) >/dev/null 2>&1 || $(TRUE)
+ 	-$(RMDIR) $(DESTDIR)$(includedir) >/dev/null 2>&1 || $(TRUE)
+ 	-$(RMDIR) $(DESTDIR)$(bindir) >/dev/null 2>&1 || $(TRUE)
diff --git a/package/pth/pth.mk b/package/pth/pth.mk
new file mode 100644
index 0000000..5768f12
--- /dev/null
+++ b/package/pth/pth.mk
@@ -0,0 +1,28 @@
+################################################################################
+#
+# pth
+#
+################################################################################
+
+PTH_VERSION = 2.0.7
+PTH_SOURCE = pth-$(PTH_VERSION).tar.gz
+PTH_SITE = ftp://ftp.gnu.org/gnu/pth
+PTH_LICENSE = LGPL
+PTH_LICENSE_FILES = COPYING
+PTH_CONFIG_SCRIPTS = pth-config
+PTH_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+PTH_CONFIG_OPT = --enable-static
+else
+PTH_CONFIG_OPT = --disable-static
+endif
+
+# This hooks fixes a race condition in the Makefile.
+# It allows you to run make with multiple jobs.
+define PTH_FIX_SMP_BUILD
+	cd $(@D) && sed -i 's#$(LOBJS): Makefile#$(LOBJS): pth_p.h Makefile#' Makefile.in
+endef
+PTH_PRE_CONFIGURE_HOOKS += PTH_FIX_SMP_BUILD
+
+$(eval $(autotools-package))
-- 
1.7.1

[Buildroot] [PATCH 1/5] pth: new package

[Thomas Petazzoni]

Dear Vicente Olivert Riera,

On Fri, 6 Jun 2014 14:44:25 +0100, Vicente Olivert Riera wrote:

> diff --git a/package/pth/Config.in b/package/pth/Config.in
> new file mode 100644
> index 0000000..54bb34c
> --- /dev/null
> +++ b/package/pth/Config.in
> @@ -0,0 +1,10 @@
> +config BR2_PACKAGE_PTH
> +	bool "pth"
> +	depends on !BR2_TOOLCHAIN_USES_UCLIBC
> +	help
> +	  GNU Pth - The GNU Portable Threads
> +
> +	  http://www.gnu.org/software/pth/

We already have a pthsem package, which claims in its description:

config BR2_PACKAGE_LIBPTHSEM
        bool "libpthsem"
        depends on BR2_USE_MMU # fork()
        select BR2_PACKAGE_ARGP_STANDALONE
        help
          GNU pth is a user mode multi threading library. pthsem is an extend
          version, with support for semaphores added.

Do you know if pthsem could be used instead of pth for gnupg, or if pth
and pthsem would conflict with each other?

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/5] pth: new package

[Vicente Olivert Riera]

On 06/06/2014 08:47 PM, Thomas Petazzoni wrote:
> Dear Vicente Olivert Riera,
>
> On Fri, 6 Jun 2014 14:44:25 +0100, Vicente Olivert Riera wrote:
>
>> diff --git a/package/pth/Config.in b/package/pth/Config.in
>> new file mode 100644
>> index 0000000..54bb34c
>> --- /dev/null
>> +++ b/package/pth/Config.in
>> @@ -0,0 +1,10 @@
>> +config BR2_PACKAGE_PTH
>> +	bool "pth"
>> +	depends on !BR2_TOOLCHAIN_USES_UCLIBC
>> +	help
>> +	  GNU Pth - The GNU Portable Threads
>> +
>> +	  http://www.gnu.org/software/pth/
>
> We already have a pthsem package, which claims in its description:
>
> config BR2_PACKAGE_LIBPTHSEM
>          bool "libpthsem"
>          depends on BR2_USE_MMU # fork()
>          select BR2_PACKAGE_ARGP_STANDALONE
>          help
>            GNU pth is a user mode multi threading library. pthsem is an extend
>            version, with support for semaphores added.
>
> Do you know if pthsem could be used instead of pth for gnupg, or if pth
> and pthsem would conflict with each other?

Please read the comments on the gnupg2 patch. Everything is explained 
there: http://patchwork.ozlabs.org/patch/356812/

> Thanks,
>
> Thomas
>


-- 
Vincent

[Buildroot] [PATCH 1/5] pth: new package

[Thomas Petazzoni]

Dear Vicente Olivert Riera,

On Fri, 6 Jun 2014 14:44:25 +0100, Vicente Olivert Riera wrote:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> Reviewed-by: Markos Chandras <Markos.Chandras@imgtec.com>
> ---
>  package/Config.in                               |    1 +
>  package/pth/Config.in                           |   10 +++
>  package/pth/pth-001-disable-documentation.patch |   74 +++++++++++++++++++++++
>  package/pth/pth.mk                              |   28 +++++++++
>  4 files changed, 113 insertions(+), 0 deletions(-)
>  create mode 100644 package/pth/Config.in
>  create mode 100644 package/pth/pth-001-disable-documentation.patch
>  create mode 100644 package/pth/pth.mk

As explained in my reply to the gnupg2 package, this pth package is not
needed, since pthsem has a --enable-compat option to enable
compatibility with the old pth library.

Therefore, I've marked this patch as Rejected in patchwork.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 2/5] libksba: new package

[Vicente Olivert Riera]

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Markos Chandras <Markos.Chandras@imgtec.com>
---
 package/Config.in          |    1 +
 package/libksba/Config.in  |    7 +++++++
 package/libksba/libksba.mk |   16 ++++++++++++++++
 3 files changed, 24 insertions(+), 0 deletions(-)
 create mode 100644 package/libksba/Config.in
 create mode 100644 package/libksba/libksba.mk

diff --git a/package/Config.in b/package/Config.in
index 14508ae..56ef7ea 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -535,6 +535,7 @@ source "package/libassuan/Config.in"
 source "package/libgcrypt/Config.in"
 source "package/libgpg-error/Config.in"
 source "package/libgpgme/Config.in"
+source "package/libksba/Config.in"
 source "package/libmcrypt/Config.in"
 source "package/libmhash/Config.in"
 source "package/libnss/Config.in"
diff --git a/package/libksba/Config.in b/package/libksba/Config.in
new file mode 100644
index 0000000..780fed9
--- /dev/null
+++ b/package/libksba/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBKSBA
+	bool "libksba"
+	select BR2_PACKAGE_LIBGPG_ERROR
+	help
+	  CMS and X.509 library
+
+	  https://www.gnupg.org/related_software/libksba/
diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk
new file mode 100644
index 0000000..431a03d
--- /dev/null
+++ b/package/libksba/libksba.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# libksba
+#
+################################################################################
+
+LIBKSBA_VERSION = 1.3.0
+LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2
+LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba
+LIBKSBA_LICENSE = Mixture of GPL and LGPL licenses
+LIBKSBA_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3
+LIBKSBA_INSTALL_STAGING = YES
+LIBKSBA_DEPENDENCIES = libgpg-error
+LIBKSBA_CONF_OPT = --with-gpg-error-prefix=$(STAGING_DIR)/usr
+
+$(eval $(autotools-package))
-- 
1.7.1

[Buildroot] [PATCH 2/5] libksba: new package

[Bernd Kuhls]

Vicente Olivert Riera
<Vincent.Riera@imgtec.com> wrote in
news:1402062269-57018-3-git-send-email-Vincent.Riera at imgtec.com: 

> Signed-off-by: Vicente Olivert Riera
> <Vincent.Riera@imgtec.com> Reviewed-by:
> Markos Chandras
> <Markos.Chandras@imgtec.com> ---
>  package/Config.in          |    1 +
>  package/libksba/Config.in  |    7 +++++++
>  package/libksba/libksba.mk |   16 ++++++++++++++++
>  3 files changed, 24 insertions(+), 0 deletions(-)

Reviewed-by: Bernd Kuhls <bernd.kuhls@t-online.de>

[Buildroot] [PATCH 2/5] libksba: new package

[Thomas Petazzoni]

Dear Vicente Olivert Riera,

On Fri, 6 Jun 2014 14:44:26 +0100, Vicente Olivert Riera wrote:

> +LIBKSBA_VERSION = 1.3.0
> +LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2
> +LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba
> +LIBKSBA_LICENSE = Mixture of GPL and LGPL licenses
> +LIBKSBA_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3

Thanks to the details available in the AUTHORS file, I've made the
LIBKSBA_LICENSE value a bit more useful, and I've added the AUTHORS
file to LIBKSBA_LICENSE_FILES.

Applied with those changes, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 3/5] gnupg2: new package

[Vicente Olivert Riera]

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Markos Chandras <Markos.Chandras@imgtec.com>
---
 package/Config.in        |    1 +
 package/gnupg2/Config.in |   39 +++++++++++++++++++++++++++++++++++++++
 package/gnupg2/gnupg2.mk |   27 +++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 0 deletions(-)
 create mode 100644 package/gnupg2/Config.in
 create mode 100644 package/gnupg2/gnupg2.mk

diff --git a/package/Config.in b/package/Config.in
index 56ef7ea..03d6670 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1073,6 +1073,7 @@ source "package/dialog/Config.in"
 source "package/dtach/Config.in"
 source "package/file/Config.in"
 source "package/gnupg/Config.in"
+source "package/gnupg2/Config.in"
 source "package/inotify-tools/Config.in"
 source "package/lockfile-progs/Config.in"
 source "package/logrotate/Config.in"
diff --git a/package/gnupg2/Config.in b/package/gnupg2/Config.in
new file mode 100644
index 0000000..ac2974d
--- /dev/null
+++ b/package/gnupg2/Config.in
@@ -0,0 +1,39 @@
+config BR2_PACKAGE_GNUPG2
+	bool "gnupg2"
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_LIBGPG_ERROR
+	select BR2_PACKAGE_LIBGCRYPT
+	select BR2_PACKAGE_LIBASSUAN
+	select BR2_PACKAGE_LIBKSBA
+	select BR2_PACKAGE_PTH
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC # pth
+	depends on BR2_USE_MMU # libassuan
+	help
+	  GnuPG is the GNU project's complete and free implementation
+	  of the OpenPGP standard as defined by RFC4880. GnuPG allows
+	  to encrypt and sign your data and communication, features a
+	  versatile key management system as well as access modules
+	  for all kinds of public key directories. GnuPG, also known
+	  as GPG, is a command line tool with features for easy
+	  integration with other applications.
+
+	  http://gnupg.org/
+
+if BR2_PACKAGE_GNUPG2
+
+config BR2_PACKAGE_GNUPG2_GPGV2
+	bool "gpgv2"
+	help
+	  gpgv2 is an OpenPGP signature verification tool.
+
+	  This program is actually a stripped-down version of gpg
+	  which is only able to check signatures. It is somewhat
+	  smaller than the fully-blown gpg and uses a different (and
+	  simpler) way to check that the public keys used to make the
+	  signature are valid. There are no configuration files and
+	  only a few options are implemented.
+
+endif
+
+comment "gnupg2 depends on pth which doesn't work with uClibc"
+	depends on BR2_TOOLCHAIN_USES_UCLIBC
diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk
new file mode 100644
index 0000000..ff694e2
--- /dev/null
+++ b/package/gnupg2/gnupg2.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# gnupg2
+#
+################################################################################
+
+GNUPG2_VERSION = 2.0.23
+GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
+GNUPG2_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
+GNUPG2_LICENSE = GPLv3+
+GNUPG2_LICENSE_FILES = COPYING
+GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba pth
+GNUPG2_CONF_OPT = --disable-rpath --disable-regex --disable-doc
+GNUPG2_CONF_OPT += --with-libgpg-error-prefix=$(STAGING_DIR)/usr
+GNUPG2_CONF_OPT += --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+GNUPG2_CONF_OPT += --with-libassuan-prefix=$(STAGING_DIR)/usr
+GNUPG2_CONF_OPT += --with-ksba-prefix=$(STAGING_DIR)/usr
+GNUPG2_CONF_OPT += --with-pth-prefix=$(STAGING_DIR)/usr
+
+ifneq ($(BR2_PACKAGE_GNUPG2_GPGV2),y)
+define GNUPG2_REMOVE_GPGV2
+	rm -f $(TARGET_DIR)/usr/bin/gpgv2
+endef
+GNUPG2_POST_INSTALL_TARGET_HOOKS += GNUPG2_REMOVE_GPGV2
+endif
+
+$(eval $(autotools-package))
-- 
1.7.1

[Buildroot] [PATCH 3/5] gnupg2: new package

[Bernd Kuhls]

Vicente Olivert Riera
<Vincent.Riera@imgtec.com> wrote in
news:1402062269-57018-4-git-send-email-Vincent.Riera at imgtec.com: 

> +     select BR2_PACKAGE_PTH
> +     depends on !BR2_TOOLCHAIN_USES_UCLIBC # pth

Hi,

afaik gnupg2 is compatible with uclibc if you use the existing libpthsem 
package instead of your new pth package.

Regards, Bernd

[Buildroot] [PATCH 3/5] gnupg2: new package

[Vicente Olivert Riera]

On 06/06/2014 03:33 PM, Bernd Kuhls wrote:
> Vicente Olivert Riera
> <Vincent.Riera@imgtec.com> wrote in
> news:1402062269-57018-4-git-send-email-Vincent.Riera at imgtec.com:
>
>> +     select BR2_PACKAGE_PTH
>> +     depends on !BR2_TOOLCHAIN_USES_UCLIBC # pth
>
> Hi,

Hello Bernd, all,

> afaik gnupg2 is compatible with uclibc if you use the existing libpthsem
> package instead of your new pth package.

no, it doesn't build (as is) using libpthsem. Here is why:

First, because it looks for pth-config, which is installed by pth. 
libpthsem installs pthsem-config.

Second, although you try to make a pth-config symlink pointing to 
pthsem-config, it will fail again because "pthsem-config --version" 
outputs the version in a different format than pth-config, so the pth 
version check in gnupg2's configure script will fail.

Third, although you make a copy of pthsem-config calling it pth-config, 
and you modify it to output the version in the same way as the original 
pth-config does, it will fail again because it also looks for pth.h 
which is installed by pth. pthsem installs pthsem.h.

Now, if you make a pth.h symlink pointing to pthsem.h, then it builds fine.

To summarize: if you want to build gnupg2 using libpthsem instead of 
pth, you will need to patch libpthsem package to install a compatibility 
pth-config script (just a copy with the --version modification) and a 
compatibility pth.h symlink.

So, we have three options here and we need to decide one of them:

Option 1: add the new pth package
   pros: -there is no need to patch libpthsem
   cons: -gnupg2 will not work with uclibc

Option 2: patch the libpthsem package
   pros: -no need to add pth package
         -gnupg2 will work with uclibc
   cons: -we need to patch libpthsem to install compatibility stuff

Option 3: patch gnupg2 to use libpthsem in case of pth is missing
   pros: -no need to add pth package
         -gnupg2 will work with uclibc
         -gnupg2 will work with both libpthsem and pth
   cons: -patching gnupg2 source code should be accepted upstream

Let's vote! :)

> Regards, Bernd
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>


-- 
Vincent

[Buildroot] [PATCH 3/5] gnupg2: new package

[Yann E. MORIN]

Vincente, All,

On 2014-06-06 17:34 +0100, Vicente Olivert Riera spake thusly:
> On 06/06/2014 03:33 PM, Bernd Kuhls wrote:
> >afaik gnupg2 is compatible with uclibc if you use the existing libpthsem
> >package instead of your new pth package.
> 
> no, it doesn't build (as is) using libpthsem. Here is why:
[--SNIP--]
> So, we have three options here and we need to decide one of them:
> 
> Option 1: add the new pth package
>   pros: -there is no need to patch libpthsem
>   cons: -gnupg2 will not work with uclibc
> 
> Option 2: patch the libpthsem package
>   pros: -no need to add pth package
>         -gnupg2 will work with uclibc
>   cons: -we need to patch libpthsem to install compatibility stuff
> 
> Option 3: patch gnupg2 to use libpthsem in case of pth is missing
>   pros: -no need to add pth package
>         -gnupg2 will work with uclibc
>         -gnupg2 will work with both libpthsem and pth
>   cons: -patching gnupg2 source code should be accepted upstream

I think option 1 is the best for now.

If Bernd (or anyone else) is interested in making gnupg2 work on uClibc,
it will be possible for him to apply either option 2 or option 3 later
on. Adding support for uClibc can (and should) be done in a separate
patch, anyway.

And whatever the package we patch (pthsem or gnupg2 or both), the patch
should be submitted upstream, of course! ;-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 3/5] gnupg2: new package

[Thomas Petazzoni]

Dear Vicente Olivert Riera,

On Fri, 6 Jun 2014 17:34:53 +0100, Vicente Olivert Riera wrote:

> So, we have three options here and we need to decide one of them:
> 
> Option 1: add the new pth package
>    pros: -there is no need to patch libpthsem
>    cons: -gnupg2 will not work with uclibc
> 
> Option 2: patch the libpthsem package
>    pros: -no need to add pth package
>          -gnupg2 will work with uclibc
>    cons: -we need to patch libpthsem to install compatibility stuff
> 
> Option 3: patch gnupg2 to use libpthsem in case of pth is missing
>    pros: -no need to add pth package
>          -gnupg2 will work with uclibc
>          -gnupg2 will work with both libpthsem and pth
>    cons: -patching gnupg2 source code should be accepted upstream
> 
> Let's vote! :)

Option 4: use the --enable-compat option of pthsem, which was precisely
designed to offer compatibility with pth, by installing pth.h and
pth-config. The only issue was the version check in gnupg2 not
accepting the not-completely-compatible behavior of pth-config from
pthsem. A one byte patch in gnupg2 solved the problem.

Therefore, this patch (gnupg2) has been applied, after changing the
dependency from pth to pthsem, removing the !uclibc dependency, and
fixing minor formatting issues in the .mk file.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 4/5] gnupg: Make gnupg and gnupg2 mutual exclusive

[Vicente Olivert Riera]

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Markos Chandras <Markos.Chandras@imgtec.com>
---
 package/gnupg/Config.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/package/gnupg/Config.in b/package/gnupg/Config.in
index 90f07c2..1dc27a4 100644
--- a/package/gnupg/Config.in
+++ b/package/gnupg/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_GNUPG
 	bool "gnupg"
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_NCURSES
+	depends on !BR2_PACKAGE_GNUPG2
 	help
 	  GnuPG is the GNU project's complete and free implementation
 	  of the OpenPGP standard as defined by RFC4880. GnuPG allows
-- 
1.7.1

[Buildroot] [PATCH 4/5] gnupg: Make gnupg and gnupg2 mutual exclusive

[Thomas Petazzoni]

Dear Vicente Olivert Riera,

On Fri, 6 Jun 2014 14:44:28 +0100, Vicente Olivert Riera wrote:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> Reviewed-by: Markos Chandras <Markos.Chandras@imgtec.com>
> ---
>  package/gnupg/Config.in |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 5/5] pinentry: new package

[Vicente Olivert Riera]

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Markos Chandras <Markos.Chandras@imgtec.com>
Reviewed-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/Config.in            |    1 +
 package/pinentry/Config.in   |   53 ++++++++++++++++++++++++++++++++++++++++++
 package/pinentry/pinentry.mk |   47 +++++++++++++++++++++++++++++++++++++
 3 files changed, 101 insertions(+), 0 deletions(-)
 create mode 100644 package/pinentry/Config.in
 create mode 100644 package/pinentry/pinentry.mk

diff --git a/package/Config.in b/package/Config.in
index 03d6670..325a0b1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1078,6 +1078,7 @@ source "package/inotify-tools/Config.in"
 source "package/lockfile-progs/Config.in"
 source "package/logrotate/Config.in"
 source "package/logsurfer/Config.in"
+source "package/pinentry/Config.in"
 source "package/screen/Config.in"
 source "package/sudo/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
diff --git a/package/pinentry/Config.in b/package/pinentry/Config.in
new file mode 100644
index 0000000..392133f
--- /dev/null
+++ b/package/pinentry/Config.in
@@ -0,0 +1,53 @@
+menuconfig BR2_PACKAGE_PINENTRY
+	bool "pinentry"
+	help
+	  A collection of simple PIN or pass-phrase entry dialogs
+
+	  https://www.gnupg.org/related_software/pinentry/
+
+if BR2_PACKAGE_PINENTRY
+
+config BR2_PACKAGE_PINENTRY_NCURSES
+	bool "pinentry-ncurses"
+	# At least one backend is needed to avoid build breakage
+	default y if !BR2_PACKAGE_PINENTRY_GTK2 && !BR2_PACKAGE_PINENTRY_QT4
+	select BR2_PACKAGE_NCURSES
+	help
+	  The pinentry-ncurses tool
+
+config BR2_PACKAGE_PINENTRY_GTK2
+	bool "pinentry-gtk2"
+	# propagate libgtk2's dependencies
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU
+	depends on BR2_INSTALL_LIBSTDCPP
+	# select libgtk2
+	select BR2_PACKAGE_LIBGTK2
+	help
+	  The pinentry-gtk2 tool
+
+comment "pinentry-gtk2 needs X and a toolchain w/ wchar, threads, C++"
+	depends on BR2_USE_MMU
+	depends on !BR2_PACKAGE_XORG7 || !BR2_USE_WCHAR || \
+		!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+
+config BR2_PACKAGE_PINENTRY_QT4
+	bool "pinentry-qt4"
+	# propagate qt's dependencies
+	depends on !BR2_avr32 # lacks TLS
+	depends on BR2_USE_MMU # fork
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	# select qt
+	select BR2_PACKAGE_QT
+	help
+	  The pinentry-qt4 tool
+
+comment "pinentry-qt4 needs a toolchain w/ C++, threads"
+	depends on !BR2_avr32
+	depends on BR2_USE_MMU
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+
+endif
diff --git a/package/pinentry/pinentry.mk b/package/pinentry/pinentry.mk
new file mode 100644
index 0000000..11046e6
--- /dev/null
+++ b/package/pinentry/pinentry.mk
@@ -0,0 +1,47 @@
+################################################################################
+#
+# pinentry
+#
+################################################################################
+
+PINENTRY_VERSION = 0.8.3
+PINENTRY_SOURCE = pinentry-$(PINENTRY_VERSION).tar.bz2
+PINENTRY_SITE = ftp://ftp.gnupg.org/gcrypt/pinentry
+PINENTRY_LICENSE = GPLv2
+PINENTRY_LICENSE_FILES = COPYING
+PINENTRY_CONF_OPT =  --disable-pinentry-gtk # gtk1
+PINENTRY_CONF_OPT += --disable-pinentry-qt  # qt3
+PINENTRY_CONF_OPT += --without-libcap       # requires PAM
+
+# build with X if available
+ifeq ($(BR2_PACKAGE_XORG7),y)
+PINENTRY_CONF_OPT += --with-x
+else
+PINENTRY_CONF_OPT += --without-x
+endif
+
+# pinentry-ncurses backend
+ifeq ($(BR2_PACKAGE_PINENTRY_NCURSES),y)
+PINENTRY_CONF_OPT += --enable-ncurses
+PINENTRY_DEPENDENCIES += ncurses
+else
+PINENTRY_CONF_OPT += --disable-ncurses
+endif
+
+# pinentry-gtk2 backend
+ifeq ($(BR2_PACKAGE_PINENTRY_GTK2),y)
+PINENTRY_CONF_OPT += --enable-pinentry-gtk2
+PINENTRY_DEPENDENCIES += libgtk2
+else
+PINENTRY_CONF_OPT += --disable-pinentry-gtk2
+endif
+
+# pinentry-qt4 backend
+ifeq ($(BR2_PACKAGE_PINENTRY_QT4),y)
+PINENTRY_CONF_OPT += --enable-pinentry-qt4
+PINENTRY_DEPENDENCIES += qt
+else
+PINENTRY_CONF_OPT += --disable-pinentry-qt4
+endif
+
+$(eval $(autotools-package))
-- 
1.7.1

[Buildroot] [PATCH 5/5] pinentry: new package

[Thomas Petazzoni]

Dear Vicente Olivert Riera,

On Fri, 6 Jun 2014 14:44:29 +0100, Vicente Olivert Riera wrote:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> Reviewed-by: Markos Chandras <Markos.Chandras@imgtec.com>
> Reviewed-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/Config.in            |    1 +
>  package/pinentry/Config.in   |   53 ++++++++++++++++++++++++++++++++++++++++++
>  package/pinentry/pinentry.mk |   47 +++++++++++++++++++++++++++++++++++++
>  3 files changed, 101 insertions(+), 0 deletions(-)
>  create mode 100644 package/pinentry/Config.in
>  create mode 100644 package/pinentry/pinentry.mk

Applied, after fixing a few issues:

    [Thomas:
     - fix license version: the license is GPLv2+, not GPLv2
     - make sure the ncurses backend is selected if none of the other
       backends are selected.
     - add dependency on libiconv of the curses and gtk2 backends, needed
       in !locale configurations.]

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com