From d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 1 Sep 2010 19:09:11 +0100 Subject: packages: Separate out most of the remaining packages into recipes Signed-off-by: Richard Purdie --- meta/packages/attr/attr-2.4.44/double-free.patch | 18 -------- .../attr/attr-2.4.44/memory-leak-in-copy.patch | 50 ---------------------- meta/packages/attr/attr-2.4.44/memory-leak2.patch | 18 -------- .../attr/attr-2.4.44/pull-in-string.h.patch | 21 --------- .../attr/attr-2.4.44/thinko-in-restore.patch | 19 -------- 5 files changed, 126 deletions(-) delete mode 100644 meta/packages/attr/attr-2.4.44/double-free.patch delete mode 100644 meta/packages/attr/attr-2.4.44/memory-leak-in-copy.patch delete mode 100644 meta/packages/attr/attr-2.4.44/memory-leak2.patch delete mode 100644 meta/packages/attr/attr-2.4.44/pull-in-string.h.patch delete mode 100644 meta/packages/attr/attr-2.4.44/thinko-in-restore.patch (limited to 'meta/packages/attr/attr-2.4.44') diff --git a/meta/packages/attr/attr-2.4.44/double-free.patch b/meta/packages/attr/attr-2.4.44/double-free.patch deleted file mode 100644 index 6fc684f6c..000000000 --- a/meta/packages/attr/attr-2.4.44/double-free.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 5b28eb3b0e0430ce6af28edc9100ca23299d1218 -Author: Kamil Dudka -Date: Thu Jun 3 15:29:54 2010 +0200 - - attr_parse_attr_conf: eliminate a double free - -diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c -index 030bbf5..2697328 100644 ---- a/libattr/attr_copy_action.c -+++ b/libattr/attr_copy_action.c -@@ -81,6 +81,7 @@ repeat: - fclose(file); - file = NULL; - free(text); -+ text = NULL; - size_guess *= 2; - goto repeat; - } 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 deleted file mode 100644 index 966632d87..000000000 --- a/meta/packages/attr/attr-2.4.44/memory-leak-in-copy.patch +++ /dev/null @@ -1,50 +0,0 @@ -commit 972b42a67393f762936e74d3ce929914181f5f28 -Author: Brandon Philips -Date: Thu Dec 17 17:15:57 2009 -0800 - - libattr: fix memory leak in attr_copy_action() - - stanse found that attr_copy_action returns before freeing the memory - allocated for text. - - Move fopen() above the malloc so this is not a problem. - - Fixes this bug: - https://bugzilla.novell.com/show_bug.cgi?id=564735 - - Signed-off-by: Brandon Philips - -diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c -index 0d7aca5..dc94224 100644 ---- a/libattr/attr_copy_action.c -+++ b/libattr/attr_copy_action.c -@@ -53,7 +53,7 @@ free_attr_actions(void) - static int - attr_parse_attr_conf(struct error_context *ctx) - { -- char *text, *t; -+ char *text = NULL, *t; - size_t size_guess = 4096, len; - FILE *file; - char *pattern = NULL; -@@ -64,15 +64,16 @@ attr_parse_attr_conf(struct error_context *ctx) - return 0; - - repeat: -- text = malloc(size_guess + 1); -- if (!text) -- goto fail; -- - if ((file = fopen(ATTR_CONF, "r")) == NULL) { - if (errno == ENOENT) - return 0; - goto fail; - } -+ -+ text = malloc(size_guess + 1); -+ if (!text) -+ goto fail; -+ - len = fread(text, 1, size_guess, file); - if (ferror(file)) - 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 deleted file mode 100644 index 03395423d..000000000 --- a/meta/packages/attr/attr-2.4.44/memory-leak2.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 42f50a130d144ffbc01738f15da9d4f1b57505bd -Author: Kamil Dudka -Date: Thu Jun 3 15:23:04 2010 +0200 - - attr_parse_attr_conf: eliminate a memory leak - -diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c -index dc94224..030bbf5 100644 ---- a/libattr/attr_copy_action.c -+++ b/libattr/attr_copy_action.c -@@ -129,6 +129,7 @@ repeat: - - t += strcspn(t, "\n"); - } -+ free(text); - return 0; - - 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 deleted file mode 100644 index ccbc23628..000000000 --- a/meta/packages/attr/attr-2.4.44/pull-in-string.h.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 235cdd2af498d288f1af1142e7a23fbd16dff907 -Author: Mike Frysinger -Date: Fri Jan 8 21:53:19 2010 -0500 - - quote: pull in string.h for strchr prototype - - Signed-off-by: Mike Frysinger - Signed-off-by: Brandon Philips - -diff --git a/libmisc/quote.c b/libmisc/quote.c -index f98c887..bf8f9eb 100644 ---- a/libmisc/quote.c -+++ b/libmisc/quote.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include "misc.h" - - 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 deleted file mode 100644 index a84de94ed..000000000 --- a/meta/packages/attr/attr-2.4.44/thinko-in-restore.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit e8d568c696692eed5c92d5a35498e1c26e13d6b3 -Author: Kamil Dudka -Date: Thu Jun 3 15:30:19 2010 +0200 - - setfattr.c: fix thinko in restore() - -diff --git a/setfattr/setfattr.c b/setfattr/setfattr.c -index 491c25a..0a14cfa 100644 ---- a/setfattr/setfattr.c -+++ b/setfattr/setfattr.c -@@ -120,7 +120,7 @@ int restore(const char *filename) - break; - line++; - if (strncmp(l, "# file: ", 8) != 0) { -- if (filename) { -+ if (file != stdin) { - fprintf(stderr, _("%s: %s: No filename found " - "in line %d, aborting\n"), - progname, filename, backup_line); -- cgit v1.2.3