[Buildroot] [PATCH 1/3] package/argp-standalone: format patches to git patches

[Buildroot] [PATCH 1/3] package/argp-standalone: format patches to git patches

[Romain Naour]

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 .../argp-standalone/0001-throw-in-funcdef.patch    | 102 ++++++++++++---------
 package/argp-standalone/0002-isprint.patch         |  41 ++++++---
 2 files changed, 88 insertions(+), 55 deletions(-)

diff --git a/package/argp-standalone/0001-throw-in-funcdef.patch b/package/argp-standalone/0001-throw-in-funcdef.patch
index 4a90751..a07e559 100644
--- a/package/argp-standalone/0001-throw-in-funcdef.patch
+++ b/package/argp-standalone/0001-throw-in-funcdef.patch
@@ -1,79 +1,97 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone
-# Copyright (C) 2006 The T2 SDE Project
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- T2-COPYRIGHT-NOTE-END ---
+From 28ed8fb9333d0618212fd8b4391b4978072a4120 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@openwide.fr>
+Date: Fri, 1 May 2015 18:15:53 +0200
+Subject: [PATCH 1/2] No __THROW in function implementation
 
+--- T2-COPYRIGHT-NOTE-BEGIN ---
+This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+
+T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone
+Copyright (C) 2006 The T2 SDE Project
+
+More information can be found in the files COPYING and README.
+
+This patch file is dual-licensed. It is available under the license the
+patched project is licensed under, as long as it is an OpenSource license
+as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+--- T2-COPYRIGHT-NOTE-END ---
 
 No __THROW in function implementation.
 	--jsaw
 
---- argp-standalone-1.4-test2/argp.h.orig	2006-01-06 02:29:59.000000000 +0100
-+++ argp-standalone-1.4-test2/argp.h	2006-01-06 02:41:10.000000000 +0100
-@@ -560,17 +560,17 @@
- # endif
- 
- # ifndef ARGP_EI
--#  define ARGP_EI extern __inline__
-+#  define ARGP_EI extern inline
- # endif
- 
- ARGP_EI void
+[Romain: format to git patch]
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+---
+ argp-parse.c | 6 +++---
+ argp.h       | 8 ++++----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/argp-parse.c b/argp-parse.c
+index 10bff92..bdb4ad6 100644
+--- a/argp-parse.c
++++ b/argp-parse.c
+@@ -1277,13 +1277,13 @@ weak_alias (__argp_input, _argp_input)
+ /* Defined here, in case a user is not inlining the definitions in
+  * argp.h */
+ void
 -__argp_usage (__const struct argp_state *__state) __THROW
 +__argp_usage (__const struct argp_state *__state)
  {
    __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
  }
  
- ARGP_EI int
+ int
 -__option_is_short (__const struct argp_option *__opt) __THROW
-+__option_is_short (__const struct argp_option *__opt)
++__option_is_short (__const struct argp_option *__opt) 
  {
    if (__opt->flags & OPTION_DOC)
      return 0;
-@@ -582,7 +582,7 @@
+@@ -1297,7 +1297,7 @@ __option_is_short (__const struct argp_option *__opt) __THROW
  }
  
- ARGP_EI int
+ int
 -__option_is_end (__const struct argp_option *__opt) __THROW
-+__option_is_end (__const struct argp_option *__opt)
++__option_is_end (__const struct argp_option *__opt) 
  {
    return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
  }
---- argp-standalone-1.4-test2/argp-parse.c.orig	2006-01-06 02:47:48.000000000 +0100
-+++ argp-standalone-1.4-test2/argp-parse.c	2006-01-06 02:48:16.000000000 +0100
-@@ -1290,13 +1290,13 @@
- /* Defined here, in case a user is not inlining the definitions in
-  * argp.h */
- void
+diff --git a/argp.h b/argp.h
+index 56f1c3d..ee23c99 100644
+--- a/argp.h
++++ b/argp.h
+@@ -560,17 +560,17 @@ __argp_short_program_name(const struct argp_state *state) __THROW;
+ # endif
+ 
+ # ifndef ARGP_EI
+-#  define ARGP_EI extern __inline__
++#  define ARGP_EI extern inline
+ # endif
+ 
+ ARGP_EI void
 -__argp_usage (__const struct argp_state *__state) __THROW
 +__argp_usage (__const struct argp_state *__state)
  {
    __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
  }
  
- int
+ ARGP_EI int
 -__option_is_short (__const struct argp_option *__opt) __THROW
-+__option_is_short (__const struct argp_option *__opt) 
++__option_is_short (__const struct argp_option *__opt)
  {
    if (__opt->flags & OPTION_DOC)
      return 0;
-@@ -1310,7 +1310,7 @@
+@@ -582,7 +582,7 @@ __option_is_short (__const struct argp_option *__opt) __THROW
  }
  
- int
+ ARGP_EI int
 -__option_is_end (__const struct argp_option *__opt) __THROW
-+__option_is_end (__const struct argp_option *__opt) 
++__option_is_end (__const struct argp_option *__opt)
  {
    return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
  }
+-- 
+1.9.3
+
diff --git a/package/argp-standalone/0002-isprint.patch b/package/argp-standalone/0002-isprint.patch
index a2962a1..00ace31 100644
--- a/package/argp-standalone/0002-isprint.patch
+++ b/package/argp-standalone/0002-isprint.patch
@@ -1,4 +1,7 @@
-Subject: restrict value range passed to isprint function
+From 9f1c15818915b888a93d4514cf4cf3fead261c3c Mon Sep 17 00:00:00 2001
+From: Max Filippov <jcmvbkbc@gmail.com>
+Date: Fri, 1 May 2015 18:21:51 +0200
+Subject: [PATCH 2/2] restrict value range passed to isprint function
 
 According to C standards isprint argument shall be representable as an
 unsigned char or be equal to EOF, otherwise the behaviour is undefined.
@@ -8,28 +11,40 @@ Passing arbitrary ints leads to segfault in nm program from elfutils.
 Restrict isprint argument range to values representable by unsigned char.
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+[Romain:
+  - format to git patch]
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
 ---
-diff -bu argp-standalone-1.3/argp.h argp-standalone-1.3-/argp.h
---- argp-standalone-1.3/argp.h	2015-04-28 10:31:39.015319337 +0300
-+++ argp-standalone-1.3-/argp.h	2015-04-28 10:27:46.526770624 +0300
-@@ -577,7 +577,7 @@
-   else
-     {
+ argp-parse.c | 2 +-
+ argp.h       | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/argp-parse.c b/argp-parse.c
+index bdb4ad6..d8e7d54 100644
+--- a/argp-parse.c
++++ b/argp-parse.c
+@@ -1292,7 +1292,7 @@ __option_is_short (__const struct argp_option *__opt)
        int __key = __opt->key;
+       /* FIXME: whether or not a particular key implies a short option
+        * ought not to be locale dependent. */
 -      return __key > 0 && isprint (__key);
 +      return __key > 0 && __key <= UCHAR_MAX && isprint (__key);
      }
  }
  
-diff -bu argp-standalone-1.3/argp-parse.c argp-standalone-1.3-/argp-parse.c
---- argp-standalone-1.3/argp-parse.c	2015-04-28 10:31:39.016319380 +0300
-+++ argp-standalone-1.3-/argp-parse.c	2015-04-28 10:27:21.810818130 +0300
-@@ -1292,7 +1292,7 @@
+diff --git a/argp.h b/argp.h
+index ee23c99..abd8b05 100644
+--- a/argp.h
++++ b/argp.h
+@@ -577,7 +577,7 @@ __option_is_short (__const struct argp_option *__opt)
+   else
+     {
        int __key = __opt->key;
-       /* FIXME: whether or not a particular key implies a short option
-        * ought not to be locale dependent. */
 -      return __key > 0 && isprint (__key);
 +      return __key > 0 && __key <= UCHAR_MAX && isprint (__key);
      }
  }
  
+-- 
+1.9.3
+
-- 
1.9.3

[Buildroot] [PATCH 2/3] package/argp-standalone: add missing limits.h

[Romain Naour]

Fixes:
http://autobuild.buildroot.net/results/b80/b802cc638a4b11d2a2098b82615f2c0ccadf8e3f/build-end.log

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Cc: Max Filippov <jcmvbkbc@gmail.com>
---
 package/argp-standalone/0002-isprint.patch | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/package/argp-standalone/0002-isprint.patch b/package/argp-standalone/0002-isprint.patch
index 00ace31..ffdca4c 100644
--- a/package/argp-standalone/0002-isprint.patch
+++ b/package/argp-standalone/0002-isprint.patch
@@ -1,7 +1,7 @@
-From 9f1c15818915b888a93d4514cf4cf3fead261c3c Mon Sep 17 00:00:00 2001
+From f5635bb13af07190bd057889f90110bf74e1c5c0 Mon Sep 17 00:00:00 2001
 From: Max Filippov <jcmvbkbc@gmail.com>
 Date: Fri, 1 May 2015 18:21:51 +0200
-Subject: [PATCH 2/2] restrict value range passed to isprint function
+Subject: [PATCH] restrict value range passed to isprint function
 
 According to C standards isprint argument shall be representable as an
 unsigned char or be equal to EOF, otherwise the behaviour is undefined.
@@ -12,12 +12,13 @@ Restrict isprint argument range to values representable by unsigned char.
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 [Romain:
-  - format to git patch]
+  - format to git patch
+  - add missing limits.h header for UCHAR_MAX]
 Signed-off-by: Romain Naour <romain.naour@openwide.fr>
 ---
  argp-parse.c | 2 +-
- argp.h       | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ argp.h       | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/argp-parse.c b/argp-parse.c
 index bdb4ad6..d8e7d54 100644
@@ -33,10 +34,18 @@ index bdb4ad6..d8e7d54 100644
  }
  
 diff --git a/argp.h b/argp.h
-index ee23c99..abd8b05 100644
+index ee23c99..b2c5f74 100644
 --- a/argp.h
 +++ b/argp.h
-@@ -577,7 +577,7 @@ __option_is_short (__const struct argp_option *__opt)
+@@ -23,6 +23,7 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
++#include <limits.h>
+ 
+ #define __need_error_t
+ #include <errno.h>
+@@ -577,7 +578,7 @@ __option_is_short (__const struct argp_option *__opt)
    else
      {
        int __key = __opt->key;
-- 
1.9.3

[Buildroot] [PATCH 3/3] package/wvstreams: add argp-standalone as optionnal dependency

[Romain Naour]

This ensures the build reproducibility.

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 package/wvstreams/wvstreams.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/wvstreams/wvstreams.mk b/package/wvstreams/wvstreams.mk
index bc7c5d4..3db317a 100644
--- a/package/wvstreams/wvstreams.mk
+++ b/package/wvstreams/wvstreams.mk
@@ -32,6 +32,11 @@ ifneq ($(BR2_STATIC_LIBS),y)
 WVSTREAMS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fPIC"
 endif
 
+# wvstreams use argp.h which can be provided by argp-standalone package.
+ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
+WVSTREAMS_DEPENDENCIES += argp-standalone
+endif
+
 ifeq ($(BR2_PACKAGE_DBUS),y)
 WVSTREAMS_DEPENDENCIES += dbus
 WVSTREAMS_CONF_OPTS += --with-dbus
-- 
1.9.3

[Buildroot] [PATCH 2/3] package/argp-standalone: add missing limits.h

[Max Filippov]

On Fri, May 1, 2015 at 7:44 PM, Romain Naour <romain.naour@openwide.fr> wrote:
> Fixes:
> http://autobuild.buildroot.net/results/b80/b802cc638a4b11d2a2098b82615f2c0ccadf8e3f/build-end.log
>
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> ---
>  package/argp-standalone/0002-isprint.patch | 23 ++++++++++++++++-------
>  1 file changed, 16 insertions(+), 7 deletions(-)

Reviewed-by: Max Filippov <jcmvbkbc@gmail.com>

-- 
Thanks.
-- Max

[Buildroot] [PATCH 2/3] package/argp-standalone: add missing limits.h

[Thomas Petazzoni]

Dear Romain Naour,

On Fri,  1 May 2015 18:44:45 +0200, Romain Naour wrote:
> Fixes:
> http://autobuild.buildroot.net/results/b80/b802cc638a4b11d2a2098b82615f2c0ccadf8e3f/build-end.log
> 
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> ---
>  package/argp-standalone/0002-isprint.patch | 23 ++++++++++++++++-------
>  1 file changed, 16 insertions(+), 7 deletions(-)

I have already done a similar fix a few hours ago:
http://git.buildroot.net/buildroot/commit/?id=2a4ece2ed3e3766c463ef8f61a3362ba86c8a6cf.

Best regards,

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

[Buildroot] [PATCH 3/3] package/wvstreams: add argp-standalone as optionnal dependency

[Thomas Petazzoni]

Dear Romain Naour,

On Fri,  1 May 2015 18:44:46 +0200, Romain Naour wrote:
> This ensures the build reproducibility.
> 
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> ---
>  package/wvstreams/wvstreams.mk | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/package/wvstreams/wvstreams.mk b/package/wvstreams/wvstreams.mk
> index bc7c5d4..3db317a 100644
> --- a/package/wvstreams/wvstreams.mk
> +++ b/package/wvstreams/wvstreams.mk
> @@ -32,6 +32,11 @@ ifneq ($(BR2_STATIC_LIBS),y)
>  WVSTREAMS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fPIC"
>  endif
>  
> +# wvstreams use argp.h which can be provided by argp-standalone package.
> +ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
> +WVSTREAMS_DEPENDENCIES += argp-standalone
> +endif

Applied after fixing typos in the commit title and comment.

I wonder if we shouldn't make the argp-standalone package only
available on !glibc builds, since glibc provides its own argp
implementation.

Thanks,

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

[Buildroot] [PATCH 2/3] package/argp-standalone: add missing limits.h

[Romain Naour]

Hi Thomas,

Le 01/05/2015 22:48, Thomas Petazzoni a ?crit :
> Dear Romain Naour,
> 
> On Fri,  1 May 2015 18:44:45 +0200, Romain Naour wrote:
>> Fixes:
>> http://autobuild.buildroot.net/results/b80/b802cc638a4b11d2a2098b82615f2c0ccadf8e3f/build-end.log
>>
>> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>> Cc: Max Filippov <jcmvbkbc@gmail.com>
>> ---
>>  package/argp-standalone/0002-isprint.patch | 23 ++++++++++++++++-------
>>  1 file changed, 16 insertions(+), 7 deletions(-)
> 
> I have already done a similar fix a few hours ago:
> http://git.buildroot.net/buildroot/commit/?id=2a4ece2ed3e3766c463ef8f61a3362ba86c8a6cf.

Sorry, I missed it.

Best regards,
Romain

> 
> Best regards,
> 
> Thomas
> 

[Buildroot] [PATCH 3/3] package/wvstreams: add argp-standalone as optionnal dependency

[Romain Naour]

Hi Thomas,

Le 01/05/2015 23:04, Thomas Petazzoni a ?crit :
> Dear Romain Naour,
> 
> On Fri,  1 May 2015 18:44:46 +0200, Romain Naour wrote:
>> This ensures the build reproducibility.
>>
>> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>> ---
>>  package/wvstreams/wvstreams.mk | 5 +++++
>>  1 file changed, 5 insertions(+)
>>
>> diff --git a/package/wvstreams/wvstreams.mk b/package/wvstreams/wvstreams.mk
>> index bc7c5d4..3db317a 100644
>> --- a/package/wvstreams/wvstreams.mk
>> +++ b/package/wvstreams/wvstreams.mk
>> @@ -32,6 +32,11 @@ ifneq ($(BR2_STATIC_LIBS),y)
>>  WVSTREAMS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fPIC"
>>  endif
>>  
>> +# wvstreams use argp.h which can be provided by argp-standalone package.
>> +ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
>> +WVSTREAMS_DEPENDENCIES += argp-standalone
>> +endif
> 
> Applied after fixing typos in the commit title and comment.

Thanks.

> 
> I wonder if we shouldn't make the argp-standalone package only
> available on !glibc builds, since glibc provides its own argp
> implementation.

I'm agree, most of packages which uses argp.h select argp-standalone only when a
uClibc toolchain is used.
Except libpthsem package which select argp-standalone unconditionally.
However, I built successfully libpthsem with a glibc toolchain and without
argp-standalone installed.

It appears that argp.h from glibc is more up to date should be preferred to
argp-standalone one.

I can do the change if you want.

Best regards,
Romain

> 
> Thanks,
> 
> Thomas
> 

[Buildroot] [PATCH 3/3] package/wvstreams: add argp-standalone as optionnal dependency

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@openwide.fr> writes:

Hi,

>> I wonder if we shouldn't make the argp-standalone package only
 >> available on !glibc builds, since glibc provides its own argp
 >> implementation.

 > I'm agree, most of packages which uses argp.h select argp-standalone only when a
 > uClibc toolchain is used.
 > Except libpthsem package which select argp-standalone unconditionally.
 > However, I built successfully libpthsem with a glibc toolchain and without
 > argp-standalone installed.

 > It appears that argp.h from glibc is more up to date should be preferred to
 > argp-standalone one.

Yes, sounds sensible.

 > I can do the change if you want.

Please do - Thanks!

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 3/3] package/wvstreams: add argp-standalone as optionnal dependency

[Thomas Petazzoni]

Dear Romain Naour,

On Sat, 02 May 2015 00:21:09 +0200, Romain Naour wrote:

> I'm agree, most of packages which uses argp.h select argp-standalone only when a
> uClibc toolchain is used.
> Except libpthsem package which select argp-standalone unconditionally.
> However, I built successfully libpthsem with a glibc toolchain and without
> argp-standalone installed.
> 
> It appears that argp.h from glibc is more up to date should be preferred to
> argp-standalone one.
> 
> I can do the change if you want.

That would be nice.

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