sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

augeas: upgrade to 1.0.0 

0001-Add-missing-argument-to-escape.patch: removed
    - included in the new version

remove-gets.patch: not needed anymore

add-missing-argz-conditional.patch: added
    - the Makefiles assume that the argz conditional
is present in configure.ac

(From OE-Core rev: a711a8617c39b06c9a494d0ceae9f96f65b024f9)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Constantin Musca 2013-02-18 14:05:09 +02:00 committed by Richard Purdie
parent e04afd89be
commit a0277dd674
6 changed files with 27 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-extended/augeas/augeas.inc
View File

@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff"
SRC_URI = "http://augeas.net/download/${BP}.tar.gz \
file://0001-Add-missing-argument-to-escape.patch \
file://add-missing-argz-conditional.patch \
"
DEPENDS = "readline libxml2"

29
meta/recipes-extended/augeas/augeas/0001-Add-missing-argument-to-escape.patch
View File

@ -1,29 +0,0 @@
Upstream-Status: Backport
Signed-off-by: Khem Raj <raj.khem@gmail.com>
From 021ea39f8e400225e2d01b4c62eb9d56404f2ecd Mon Sep 17 00:00:00 2001
From: Michael Chapman <mike@very.puzzling.org>
Date: Fri, 16 Dec 2011 21:30:07 +1100
Subject: [PATCH] Add missing argument to escape()
Fixes ticket #242.
---
src/regexp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/regexp.c b/src/regexp.c
index cf0ea5d..811087d 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -50,7 +50,7 @@ char *regexp_escape(const struct regexp *r) {
ret = fa_restrict_alphabet(r->pattern->str, strlen(r->pattern->str),
&nre, &nre_len, 2, 1);
if (ret == 0) {
- pat = escape(nre, nre_len);
+ pat = escape(nre, nre_len, RX_ESCAPES);
free(nre);
}
#endif
--
1.7.5.4

20
meta/recipes-extended/augeas/augeas/add-missing-argz-conditional.patch Normal file
View File

@ -0,0 +1,20 @@
Add missing GL_GENERATE_ARGZ_H conditional
- GL_GENERATE_ARGZ_H is used in gnulib/lib/Makefile.am
Upstream-Status: Pending
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Index: augeas-1.0.0/configure.ac
===================================================================
--- augeas-1.0.0.orig/configure.ac
+++ augeas-1.0.0/configure.ac
@@ -55,6 +55,8 @@ AC_ARG_WITH([failmalloc],
AM_CONDITIONAL([WITH_FAILMALLOC], [test x$with_failmalloc != xno])
+AM_CONDITIONAL([GL_GENERATE_ARGZ_H], [test -n "$ARGZ_H"])
+
dnl --enable-debug=(yes|no)
AC_ARG_ENABLE([debug],
[AC_HELP_STRING([--enable-debug=no/yes],

20
meta/recipes-extended/augeas/augeas/remove-gets.patch
View File

@ -1,20 +0,0 @@
eglibc 2.16 has remove gets so check for it to be there before using it
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: augeas-0.10.0/gnulib/lib/stdio.in.h
===================================================================
--- augeas-0.10.0.orig/gnulib/lib/stdio.in.h 2011-03-03 17:07:59.000000000 -0800
+++ augeas-0.10.0/gnulib/lib/stdio.in.h 2012-07-03 19:46:42.871894833 -0700
@@ -161,8 +161,10 @@
/* It is very rare that the developer ever has full control of stdin,
so any use of gets warrants an unconditional warning. Assume it is
always declared, since it is required by C89. */
+#if defined gets
#undef gets
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+#endif
#if @GNULIB_FOPEN@
# if @REPLACE_FOPEN@

8
meta/recipes-extended/augeas/augeas_0.10.0.bb
View File

@ -1,8 +0,0 @@
require augeas.inc
SRC_URI += "file://remove-gets.patch \
"
PR = "r3"
SRC_URI[md5sum] = "fe1834e90a066c3208ac0214622c7352"
SRC_URI[sha256sum] = "ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca"

6
meta/recipes-extended/augeas/augeas_1.0.0.bb Normal file
View File

@ -0,0 +1,6 @@
require augeas.inc
PR = "r0"
SRC_URI[md5sum] = "82131019432ecf8102e1491610ad2dd1"
SRC_URI[sha256sum] = "31bf757c5b8197765946b3805f3793c32b03cd92a7a77ec95d37e71a1f131912"