diff mbox

[v2] gnutls: fix --disable-crywrap

Message ID 1450129196-15461-1-git-send-email-gustavo@zacarias.com.ar
State Changes Requested
Headers show

Commit Message

Gustavo Zacarias Dec. 14, 2015, 9:39 p.m. UTC 
Add a patch to really enable the --disable-crywrap option in gnutls.
Fixes:
http://autobuild.buildroot.org/results/d86/d8604fe448bb11395e8443726d09b041eb34c6d5/

Status: sent upstream (mailing list).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
v2: need gettextize

 ...onfigure-really-make-disable-crywrap-work.patch | 38 ++++++++++++++++++++++
 package/gnutls/gnutls.mk                           |  3 ++
 2 files changed, 41 insertions(+)
 create mode 100644 package/gnutls/0001-configure-really-make-disable-crywrap-work.patch

Comments

Baruch Siach Dec. 15, 2015, 7:05 a.m. UTC | #1 
Hi Gustavo,

On Mon, Dec 14, 2015 at 06:39:56PM -0300, Gustavo Zacarias wrote:
> Add a patch to really enable the --disable-crywrap option in gnutls.
> Fixes:
> http://autobuild.buildroot.org/results/d86/d8604fe448bb11395e8443726d09b041eb34c6d5/
> 
> Status: sent upstream (mailing list).

This comment would be more helpful in the patch itself.

> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> v2: need gettextize
> 
>  ...onfigure-really-make-disable-crywrap-work.patch | 38 ++++++++++++++++++++++
>  package/gnutls/gnutls.mk                           |  3 ++
>  2 files changed, 41 insertions(+)
>  create mode 100644 package/gnutls/0001-configure-really-make-disable-crywrap-work.patch
> 
> diff --git a/package/gnutls/0001-configure-really-make-disable-crywrap-work.patch b/package/gnutls/0001-configure-really-make-disable-crywrap-work.patch
> new file mode 100644
> index 0000000..01ed6bf
> --- /dev/null
> +++ b/package/gnutls/0001-configure-really-make-disable-crywrap-work.patch
> @@ -0,0 +1,38 @@
> +From 996b3741e8c7a5d19ae6c554e062f20c259f52d7 Mon Sep 17 00:00:00 2001
> +From: Gustavo Zacarias <gustavo@zacarias.com.ar>
> +Date: Mon, 14 Dec 2015 15:16:24 -0300
> +Subject: [PATCH] configure: really make --disable-crywrap work
> +
> +The crywrap variable is set regardless of the state of enable_crywrap,
> +hence --disable-crywrap never works.
> +Just put the tests for crywrap deps inside the enable_crywrap
> +conditional.

Also, a link to your gnutls submission 
(http://lists.gnutls.org/pipermail/gnutls-devel/2015-December/007818.html) 
would be helpful.

> +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

baruch
Gustavo Zacarias Dec. 15, 2015, 9:36 a.m. UTC | #2 
On 15/12/15 04:05, Baruch Siach wrote:

> Hi Gustavo,

Hi Baruch.

> Also, a link to your gnutls submission
> (http://lists.gnutls.org/pipermail/gnutls-devel/2015-December/007818.html)
> would be helpful.

At the time i sent the patch the archives weren't updated yet, so i 
didn't have a link to it.
Unfortunately that's quite common of them (archives) taking some time to 
update.
Regards.
Thomas Petazzoni Dec. 15, 2015, 8:50 p.m. UTC | #3 
Gustavo,

On Mon, 14 Dec 2015 18:39:56 -0300, Gustavo Zacarias wrote:
> Add a patch to really enable the --disable-crywrap option in gnutls.
> Fixes:
> http://autobuild.buildroot.org/results/d86/d8604fe448bb11395e8443726d09b041eb34c6d5/
> 
> Status: sent upstream (mailing list).
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

This patch does not apply (probably because it was based in your tree
on other commits that are not in the official Buildroot git repo).
Also, it would be good if you could take into account the two comments
made by Baruch.

thomas@skate:~/projets/buildroot (master)$ git pwam 556658
Applying patch #556658 using 'git am -s -3'
Description: [v2] gnutls: fix --disable-crywrap
Applying: gnutls: fix --disable-crywrap
fatal: sha1 information is lacking or useless (package/gnutls/gnutls.mk).
error: could not build fake ancestor
Patch failed at 0001 gnutls: fix --disable-crywrap
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Thanks!

Thomas
Gustavo Zacarias Dec. 16, 2015, 12:05 a.m. UTC | #4 
On 15/12/15 17:50, Thomas Petazzoni wrote:

> Gustavo,
>
> On Mon, 14 Dec 2015 18:39:56 -0300, Gustavo Zacarias wrote:
>> Add a patch to really enable the --disable-crywrap option in gnutls.
>> Fixes:
>> http://autobuild.buildroot.org/results/d86/d8604fe448bb11395e8443726d09b041eb34c6d5/
>>
>> Status: sent upstream (mailing list).
>>
>> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
>
> This patch does not apply (probably because it was based in your tree
> on other commits that are not in the official Buildroot git repo).
> Also, it would be good if you could take into account the two comments
> made by Baruch.

Hi.
It does, after the licensing fixes that were previously sent.
As i mentioned to Baruch and you probably already know, mailing list 
archives usually don't update quickly, so i didn't have a URL to copy/paste.
Mundanely trivial v3 sent.
Regards.
Thomas Petazzoni Dec. 16, 2015, 8:12 a.m. UTC | #5 
Gustavo,

On Tue, 15 Dec 2015 21:05:46 -0300, Gustavo Zacarias wrote:

> It does, after the licensing fixes that were previously sent.
> As i mentioned to Baruch and you probably already know, mailing list 
> archives usually don't update quickly, so i didn't have a URL to copy/paste.

Sure. If the patch had applied, I would have added the mailing list
archive link myself before committing. But since the patch didn't apply
as is, and there were plenty of other patches to take care of, I
preferred to let you update and resend the patch :)

Thomas
diff mbox

Patch

diff --git a/package/gnutls/0001-configure-really-make-disable-crywrap-work.patch b/package/gnutls/0001-configure-really-make-disable-crywrap-work.patch
new file mode 100644
index 0000000..01ed6bf
--- /dev/null
+++ b/package/gnutls/0001-configure-really-make-disable-crywrap-work.patch
@@ -0,0 +1,38 @@ 
+From 996b3741e8c7a5d19ae6c554e062f20c259f52d7 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Mon, 14 Dec 2015 15:16:24 -0300
+Subject: [PATCH] configure: really make --disable-crywrap work
+
+The crywrap variable is set regardless of the state of enable_crywrap,
+hence --disable-crywrap never works.
+Just put the tests for crywrap deps inside the enable_crywrap
+conditional.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ configure.ac | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e1d1df0..efacc30 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -836,11 +836,10 @@ AC_ARG_ENABLE(crywrap,
+ 
+ 
+  if test "x$enable_crywrap" != "xno" ; then
+-	AC_CHECK_FUNCS([argp_usage],[ac_argp=yes],[ac_argp=no])
+- fi
+-
+- if test "$ac_cv_func_daemon" != "no" && test "$ac_argp" != "no" && test "$with_libidn" != "no";then
+-  crywrap=yes
++   AC_CHECK_FUNCS([argp_usage],[ac_argp=yes],[ac_argp=no])
++   if test "$ac_cv_func_daemon" != "no" && test "$ac_argp" != "no" && test "$with_libidn" != "no";then
++     crywrap=yes
++   fi
+  fi
+ 
+ fi
+-- 
+2.4.10
+
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index d681c10..d5b3147 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -11,6 +11,9 @@  GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
 GNUTLS_LICENSE = GPLv3+, LGPLv2.1+
 GNUTLS_LICENSE_FILES = COPYING COPYING.LESSER
 GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre
+# For 0001-configure-really-make-disable-crywrap-work.patch
+GNUTLS_AUTORECONF = YES
+GNUTLS_GETTEXTIZE = YES
 GNUTLS_CONF_OPTS = \
 	--disable-doc \
 	--disable-guile \