summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2011-04-21 14:10:45 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-04 00:54:39 +0100
commitd41c3a8726392168e52d3609a475c3de14e47290 (patch)
tree427daeaba56c446a6fa009c2454131d8deca5ba1
parentf8e02f31a74d0c80d4056ab945819809f745b47b (diff)
downloadpoky-d41c3a8726392168e52d3609a475c3de14e47290.tar.gz
attr: upgrade to version 2.4.46
from 2.4.44 - remove the backported patch that is now in the tarball - prog path issue has also been fixed in the upstream (From OE-Core rev: b56ab842a8c0bc183f839edc035dc89399d783c3) Signed-off-by: Qing He <qing.he@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-support/attr/attr-2.4.44/double-free.patch18
-rw-r--r--meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch50
-rw-r--r--meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch18
-rw-r--r--meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch21
-rw-r--r--meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch19
-rw-r--r--meta/recipes-support/attr/attr_2.4.44.bb12
-rw-r--r--meta/recipes-support/attr/attr_2.4.46.bb6
-rw-r--r--meta/recipes-support/attr/ea-acl.inc2
-rw-r--r--meta/recipes-support/attr/files/no-fixed-prog-path.patch99
9 files changed, 7 insertions, 238 deletions
diff --git a/meta/recipes-support/attr/attr-2.4.44/double-free.patch b/meta/recipes-support/attr/attr-2.4.44/double-free.patch
deleted file mode 100644
index 6fc684f6c2..0000000000
--- a/meta/recipes-support/attr/attr-2.4.44/double-free.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1commit 5b28eb3b0e0430ce6af28edc9100ca23299d1218
2Author: Kamil Dudka <kdudka@redhat.com>
3Date: Thu Jun 3 15:29:54 2010 +0200
4
5 attr_parse_attr_conf: eliminate a double free
6
7diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c
8index 030bbf5..2697328 100644
9--- a/libattr/attr_copy_action.c
10+++ b/libattr/attr_copy_action.c
11@@ -81,6 +81,7 @@ repeat:
12 fclose(file);
13 file = NULL;
14 free(text);
15+ text = NULL;
16 size_guess *= 2;
17 goto repeat;
18 }
diff --git a/meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch b/meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch
deleted file mode 100644
index 966632d87e..0000000000
--- a/meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1commit 972b42a67393f762936e74d3ce929914181f5f28
2Author: Brandon Philips <brandon@ifup.org>
3Date: Thu Dec 17 17:15:57 2009 -0800
4
5 libattr: fix memory leak in attr_copy_action()
6
7 stanse found that attr_copy_action returns before freeing the memory
8 allocated for text.
9
10 Move fopen() above the malloc so this is not a problem.
11
12 Fixes this bug:
13 https://bugzilla.novell.com/show_bug.cgi?id=564735
14
15 Signed-off-by: Brandon Philips <bphilips@suse.de>
16
17diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c
18index 0d7aca5..dc94224 100644
19--- a/libattr/attr_copy_action.c
20+++ b/libattr/attr_copy_action.c
21@@ -53,7 +53,7 @@ free_attr_actions(void)
22 static int
23 attr_parse_attr_conf(struct error_context *ctx)
24 {
25- char *text, *t;
26+ char *text = NULL, *t;
27 size_t size_guess = 4096, len;
28 FILE *file;
29 char *pattern = NULL;
30@@ -64,15 +64,16 @@ attr_parse_attr_conf(struct error_context *ctx)
31 return 0;
32
33 repeat:
34- text = malloc(size_guess + 1);
35- if (!text)
36- goto fail;
37-
38 if ((file = fopen(ATTR_CONF, "r")) == NULL) {
39 if (errno == ENOENT)
40 return 0;
41 goto fail;
42 }
43+
44+ text = malloc(size_guess + 1);
45+ if (!text)
46+ goto fail;
47+
48 len = fread(text, 1, size_guess, file);
49 if (ferror(file))
50 goto fail;
diff --git a/meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch b/meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch
deleted file mode 100644
index 03395423da..0000000000
--- a/meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1commit 42f50a130d144ffbc01738f15da9d4f1b57505bd
2Author: Kamil Dudka <kdudka@redhat.com>
3Date: Thu Jun 3 15:23:04 2010 +0200
4
5 attr_parse_attr_conf: eliminate a memory leak
6
7diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c
8index dc94224..030bbf5 100644
9--- a/libattr/attr_copy_action.c
10+++ b/libattr/attr_copy_action.c
11@@ -129,6 +129,7 @@ repeat:
12
13 t += strcspn(t, "\n");
14 }
15+ free(text);
16 return 0;
17
18 parse_error:
diff --git a/meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch b/meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch
deleted file mode 100644
index ccbc236284..0000000000
--- a/meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1commit 235cdd2af498d288f1af1142e7a23fbd16dff907
2Author: Mike Frysinger <vapier@gentoo.org>
3Date: Fri Jan 8 21:53:19 2010 -0500
4
5 quote: pull in string.h for strchr prototype
6
7 Signed-off-by: Mike Frysinger <vapier@gentoo.org>
8 Signed-off-by: Brandon Philips <brandon@ifup.org>
9
10diff --git a/libmisc/quote.c b/libmisc/quote.c
11index f98c887..bf8f9eb 100644
12--- a/libmisc/quote.c
13+++ b/libmisc/quote.c
14@@ -20,6 +20,7 @@
15 #include <stdio.h>
16 #include <stdlib.h>
17 #include <ctype.h>
18+#include <string.h>
19 #include "misc.h"
20
21 const char *quote(const char *str, const char *quote_chars)
diff --git a/meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch b/meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch
deleted file mode 100644
index a84de94ed0..0000000000
--- a/meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1commit e8d568c696692eed5c92d5a35498e1c26e13d6b3
2Author: Kamil Dudka <kdudka@redhat.com>
3Date: Thu Jun 3 15:30:19 2010 +0200
4
5 setfattr.c: fix thinko in restore()
6
7diff --git a/setfattr/setfattr.c b/setfattr/setfattr.c
8index 491c25a..0a14cfa 100644
9--- a/setfattr/setfattr.c
10+++ b/setfattr/setfattr.c
11@@ -120,7 +120,7 @@ int restore(const char *filename)
12 break;
13 line++;
14 if (strncmp(l, "# file: ", 8) != 0) {
15- if (filename) {
16+ if (file != stdin) {
17 fprintf(stderr, _("%s: %s: No filename found "
18 "in line %d, aborting\n"),
19 progname, filename, backup_line);
diff --git a/meta/recipes-support/attr/attr_2.4.44.bb b/meta/recipes-support/attr/attr_2.4.44.bb
deleted file mode 100644
index a0945f1755..0000000000
--- a/meta/recipes-support/attr/attr_2.4.44.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require attr.inc
2
3PR = "r3"
4
5SRC_URI += "file://memory-leak-in-copy.patch \
6 file://memory-leak2.patch \
7 file://double-free.patch \
8 file://pull-in-string.h.patch \
9 file://thinko-in-restore.patch"
10
11SRC_URI[md5sum] = "d132c119831c27350e10b9f885711adc"
12SRC_URI[sha256sum] = "9f6214b8e53f4bba651ac5a72c0f6193b12aa21fbf1d675d89a7b4bc45264498"
diff --git a/meta/recipes-support/attr/attr_2.4.46.bb b/meta/recipes-support/attr/attr_2.4.46.bb
new file mode 100644
index 0000000000..9fef41b31c
--- /dev/null
+++ b/meta/recipes-support/attr/attr_2.4.46.bb
@@ -0,0 +1,6 @@
1require attr.inc
2
3PR = "r0"
4
5SRC_URI[md5sum] = "db557c17fdfa4f785333ecda08654010"
6SRC_URI[sha256sum] = "dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f"
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index a09c31c0d1..afe2f1c544 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -1,7 +1,7 @@
1# this build system is mostly shared by attr and acl 1# this build system is mostly shared by attr and acl
2 2
3SRC_URI += "file://relative-libdir.patch;striplevel=0 \ 3SRC_URI += "file://relative-libdir.patch;striplevel=0 \
4 file://no-fixed-prog-path.patch" 4 "
5 5
6inherit autotools gettext 6inherit autotools gettext
7 7
diff --git a/meta/recipes-support/attr/files/no-fixed-prog-path.patch b/meta/recipes-support/attr/files/no-fixed-prog-path.patch
deleted file mode 100644
index 88d9c0e0de..0000000000
--- a/meta/recipes-support/attr/files/no-fixed-prog-path.patch
+++ /dev/null
@@ -1,99 +0,0 @@
1Not using fixed utility path, but respect $PATH
2
310/09/2010 - created by Qing He <qing.he@intel.com>
4
5diff --git a/m4/package_utilies.m4 b/m4/package_utilies.m4
6index 165db35..0afe578 100644
7--- a/m4/package_utilies.m4
8+++ b/m4/package_utilies.m4
9@@ -37,22 +37,22 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
10 AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
11
12 if test -z "$MAKE"; then
13- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
14+ AC_PATH_PROG(MAKE, gmake)
15 fi
16 if test -z "$MAKE"; then
17- AC_PATH_PROG(MAKE, make,, /usr/bin)
18+ AC_PATH_PROG(MAKE, make)
19 fi
20 make=$MAKE
21 AC_SUBST(make)
22 AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
23
24 if test -z "$TAR"; then
25- AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
26+ AC_PATH_PROG(TAR, tar)
27 fi
28 tar=$TAR
29 AC_SUBST(tar)
30 if test -z "$ZIP"; then
31- AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin)
32+ AC_PATH_PROG(ZIP, gzip)
33 fi
34
35 zip=$ZIP
36@@ -65,25 +65,25 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
37 AC_SUBST(makedepend)
38
39 if test -z "$AWK"; then
40- AC_PATH_PROG(AWK, awk,, /bin:/usr/bin)
41+ AC_PATH_PROG(AWK, awk)
42 fi
43 awk=$AWK
44 AC_SUBST(awk)
45
46 if test -z "$SED"; then
47- AC_PATH_PROG(SED, sed,, /bin:/usr/bin)
48+ AC_PATH_PROG(SED, sed)
49 fi
50 sed=$SED
51 AC_SUBST(sed)
52
53 if test -z "$ECHO"; then
54- AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin)
55+ AC_PATH_PROG(ECHO, echo)
56 fi
57 echo=$ECHO
58 AC_SUBST(echo)
59
60 if test -z "$SORT"; then
61- AC_PATH_PROG(SORT, sort,, /bin:/usr/bin)
62+ AC_PATH_PROG(SORT, sort)
63 fi
64 sort=$SORT
65 AC_SUBST(sort)
66@@ -93,21 +93,21 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
67
68 if test "$enable_gettext" = yes; then
69 if test -z "$MSGFMT"; then
70- AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
71+ AC_PATH_PROG(MSGFMT, msgfmt)
72 fi
73 msgfmt=$MSGFMT
74 AC_SUBST(msgfmt)
75 AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
76
77 if test -z "$MSGMERGE"; then
78- AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
79+ AC_PATH_PROG(MSGMERGE, msgmerge)
80 fi
81 msgmerge=$MSGMERGE
82 AC_SUBST(msgmerge)
83 AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext)
84
85 if test -z "$XGETTEXT"; then
86- AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
87+ AC_PATH_PROG(XGETTEXT, xgettext)
88 fi
89 xgettext=$XGETTEXT
90 AC_SUBST(xgettext)
91@@ -117,7 +117,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
92 fi
93
94 if test -z "$RPM"; then
95- AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
96+ AC_PATH_PROG(RPM, rpm)
97 fi
98 rpm=$RPM
99 AC_SUBST(rpm)
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-09 14:31:03 +0000