diff options
author | Qing He <qing.he@intel.com> | 2010-07-07 18:58:54 +0800 |
---|---|---|
committer | Saul Wold <Saul.Wold@intel.com> | 2010-07-08 21:14:00 -0700 |
commit | 23dd7251a88eccaf9f2896bbb98e7c6d263ee695 (patch) | |
tree | 5bb6ef76f3fbbcd296a3818b5986672f7c9a010f | |
parent | a604cb78cc6ea2bebac0b2b17871afdb962f3e72 (diff) | |
download | poky-23dd7251a88eccaf9f2896bbb98e7c6d263ee695.tar.gz |
attr: add new package
version 2.4.44
Signed-off-by: Qing He <qing.he@intel.com>
-rw-r--r-- | meta/packages/attr/attr-2.4.44/double-free.patch | 18 | ||||
-rw-r--r-- | meta/packages/attr/attr-2.4.44/memory-leak-in-copy.patch | 50 | ||||
-rw-r--r-- | meta/packages/attr/attr-2.4.44/memory-leak2.patch | 18 | ||||
-rw-r--r-- | meta/packages/attr/attr-2.4.44/pull-in-string.h.patch | 21 | ||||
-rw-r--r-- | meta/packages/attr/attr-2.4.44/thinko-in-restore.patch | 19 | ||||
-rw-r--r-- | meta/packages/attr/attr.inc | 51 | ||||
-rw-r--r-- | meta/packages/attr/attr_2.4.44.bb | 9 |
7 files changed, 186 insertions, 0 deletions
diff --git a/meta/packages/attr/attr-2.4.44/double-free.patch b/meta/packages/attr/attr-2.4.44/double-free.patch new file mode 100644 index 0000000000..6fc684f6c2 --- /dev/null +++ b/meta/packages/attr/attr-2.4.44/double-free.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | commit 5b28eb3b0e0430ce6af28edc9100ca23299d1218 | ||
2 | Author: Kamil Dudka <kdudka@redhat.com> | ||
3 | Date: Thu Jun 3 15:29:54 2010 +0200 | ||
4 | |||
5 | attr_parse_attr_conf: eliminate a double free | ||
6 | |||
7 | diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c | ||
8 | index 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/packages/attr/attr-2.4.44/memory-leak-in-copy.patch b/meta/packages/attr/attr-2.4.44/memory-leak-in-copy.patch new file mode 100644 index 0000000000..966632d87e --- /dev/null +++ b/meta/packages/attr/attr-2.4.44/memory-leak-in-copy.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | commit 972b42a67393f762936e74d3ce929914181f5f28 | ||
2 | Author: Brandon Philips <brandon@ifup.org> | ||
3 | Date: 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 | |||
17 | diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c | ||
18 | index 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/packages/attr/attr-2.4.44/memory-leak2.patch b/meta/packages/attr/attr-2.4.44/memory-leak2.patch new file mode 100644 index 0000000000..03395423da --- /dev/null +++ b/meta/packages/attr/attr-2.4.44/memory-leak2.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | commit 42f50a130d144ffbc01738f15da9d4f1b57505bd | ||
2 | Author: Kamil Dudka <kdudka@redhat.com> | ||
3 | Date: Thu Jun 3 15:23:04 2010 +0200 | ||
4 | |||
5 | attr_parse_attr_conf: eliminate a memory leak | ||
6 | |||
7 | diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c | ||
8 | index 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/packages/attr/attr-2.4.44/pull-in-string.h.patch b/meta/packages/attr/attr-2.4.44/pull-in-string.h.patch new file mode 100644 index 0000000000..ccbc236284 --- /dev/null +++ b/meta/packages/attr/attr-2.4.44/pull-in-string.h.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | commit 235cdd2af498d288f1af1142e7a23fbd16dff907 | ||
2 | Author: Mike Frysinger <vapier@gentoo.org> | ||
3 | Date: 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 | |||
10 | diff --git a/libmisc/quote.c b/libmisc/quote.c | ||
11 | index 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/packages/attr/attr-2.4.44/thinko-in-restore.patch b/meta/packages/attr/attr-2.4.44/thinko-in-restore.patch new file mode 100644 index 0000000000..a84de94ed0 --- /dev/null +++ b/meta/packages/attr/attr-2.4.44/thinko-in-restore.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | commit e8d568c696692eed5c92d5a35498e1c26e13d6b3 | ||
2 | Author: Kamil Dudka <kdudka@redhat.com> | ||
3 | Date: Thu Jun 3 15:30:19 2010 +0200 | ||
4 | |||
5 | setfattr.c: fix thinko in restore() | ||
6 | |||
7 | diff --git a/setfattr/setfattr.c b/setfattr/setfattr.c | ||
8 | index 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/packages/attr/attr.inc b/meta/packages/attr/attr.inc new file mode 100644 index 0000000000..69b7442f7e --- /dev/null +++ b/meta/packages/attr/attr.inc | |||
@@ -0,0 +1,51 @@ | |||
1 | DESCRIPTION = "utilities for manipulating filesystem extended attributes" | ||
2 | HOMEPAGE = "http://savannah.nongnu.org/projects/attr/" | ||
3 | SECTION = "libs" | ||
4 | |||
5 | LICENSE = "LGPLv2.1+ & GPLv2+" | ||
6 | LICENSE_${PN} = "GPLv2+" | ||
7 | LICENSE_lib${PN} = "LGPLv2.1+" | ||
8 | LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \ | ||
9 | file://attr/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \ | ||
10 | file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb" | ||
11 | |||
12 | DEPENDS = "gettext" | ||
13 | |||
14 | SRC_URI = "http://nongnu.askapache.com/attr/${BPN}-${PV}.src.tar.gz" | ||
15 | |||
16 | inherit autotools | ||
17 | |||
18 | # the package comes with a custom config.h.in, it cannot be | ||
19 | # overwritten by autoheader | ||
20 | export AUTOHEADER = "true" | ||
21 | EXTRA_OECONF = "INSTALL_USER=root INSTALL_GROUP=root" | ||
22 | |||
23 | # absolute path will be used in ln -s if PKG_LIB_DIR and | ||
24 | # PKG_DEVLIB_DIR are different | ||
25 | EXTRA_OEMAKE = "PKG_LIB_DIR=${libdir} PKG_DEVLIB_DIR=${libdir}" | ||
26 | |||
27 | do_install () { | ||
28 | oe_runmake install install-lib install-dev DIST_ROOT="${D}" | ||
29 | } | ||
30 | |||
31 | PACKAGES = "${PN} ${PN}-doc ${PN}-dbg ${PN}-locale lib${PN} lib${PN}-dev lib${PN}-doc" | ||
32 | |||
33 | FILES_${PN} = "${bindir}" | ||
34 | |||
35 | FILES_${PN}-dbg = "${bindir}/.debug" | ||
36 | |||
37 | FILES_${PN}-doc = "${docdir} \ | ||
38 | ${mandir}/man1 \ | ||
39 | ${mandir}/man5" | ||
40 | |||
41 | FILES_lib${PN} = "${libdir}/lib*.so.*" | ||
42 | |||
43 | FILES_lib${PN}-dev = "${includedir} \ | ||
44 | ${libdir}/lib*.so \ | ||
45 | ${libdir}/lib*.a \ | ||
46 | ${libdir}/lib*.la" | ||
47 | |||
48 | FILES_lib${PN}-doc = "${mandir}/man2 \ | ||
49 | ${mandir}/man3" | ||
50 | |||
51 | BBCLASSEXTEND = "native" | ||
diff --git a/meta/packages/attr/attr_2.4.44.bb b/meta/packages/attr/attr_2.4.44.bb new file mode 100644 index 0000000000..f63d238350 --- /dev/null +++ b/meta/packages/attr/attr_2.4.44.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | require attr.inc | ||
2 | |||
3 | PR = "r0" | ||
4 | |||
5 | SRC_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" | ||