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/recipes-support/attr/acl.inc | 26 +++++++++++ meta/recipes-support/attr/acl_2.2.49.bb | 3 ++ .../attr/attr-2.4.44/double-free.patch | 18 ++++++++ .../attr/attr-2.4.44/memory-leak-in-copy.patch | 50 ++++++++++++++++++++++ .../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 ++++++++ meta/recipes-support/attr/attr.inc | 20 +++++++++ meta/recipes-support/attr/attr_2.4.44.bb | 9 ++++ meta/recipes-support/attr/ea-acl.inc | 35 +++++++++++++++ .../attr/files/relative-libdir.patch | 23 ++++++++++ 11 files changed, 242 insertions(+) create mode 100644 meta/recipes-support/attr/acl.inc create mode 100644 meta/recipes-support/attr/acl_2.2.49.bb create mode 100644 meta/recipes-support/attr/attr-2.4.44/double-free.patch create mode 100644 meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch create mode 100644 meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch create mode 100644 meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch create mode 100644 meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch create mode 100644 meta/recipes-support/attr/attr.inc create mode 100644 meta/recipes-support/attr/attr_2.4.44.bb create mode 100644 meta/recipes-support/attr/ea-acl.inc create mode 100644 meta/recipes-support/attr/files/relative-libdir.patch (limited to 'meta/recipes-support/attr') diff --git a/meta/recipes-support/attr/acl.inc b/meta/recipes-support/attr/acl.inc new file mode 100644 index 0000000000..68745dd728 --- /dev/null +++ b/meta/recipes-support/attr/acl.inc @@ -0,0 +1,26 @@ +DESCRIPTION = "utilities for access control list" +HOMEPAGE = "http://savannah.nongnu.org/projects/acl/" +SECTION = "libs" + +LICENSE = "LGPLv2.1+ & GPLv2+" +LICENSE_${PN} = "GPLv2+" +LICENSE_lib${PN} = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \ + file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764" + +DEPENDS = "attr" +SRC_URI = "http://mirror.cinquix.com/pub/savannah/acl/${BP}.src.tar.gz" + +require ea-acl.inc + +# avoid RPATH hardcode to staging dir +do_configure_append() { + sed -i ${S}/config.status -e s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\', + ${S}/config.status +} + +# libdir should point to .la +do_install_append() { + sed -i ${D}${libdir}/libacl.la -e \ + s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\', +} diff --git a/meta/recipes-support/attr/acl_2.2.49.bb b/meta/recipes-support/attr/acl_2.2.49.bb new file mode 100644 index 0000000000..e5d5509de1 --- /dev/null +++ b/meta/recipes-support/attr/acl_2.2.49.bb @@ -0,0 +1,3 @@ +require acl.inc + +PR = "r0" 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 new file mode 100644 index 0000000000..6fc684f6c2 --- /dev/null +++ b/meta/recipes-support/attr/attr-2.4.44/double-free.patch @@ -0,0 +1,18 @@ +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/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 new file mode 100644 index 0000000000..966632d87e --- /dev/null +++ b/meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch @@ -0,0 +1,50 @@ +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/recipes-support/attr/attr-2.4.44/memory-leak2.patch b/meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch new file mode 100644 index 0000000000..03395423da --- /dev/null +++ b/meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch @@ -0,0 +1,18 @@ +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/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 new file mode 100644 index 0000000000..ccbc236284 --- /dev/null +++ b/meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch @@ -0,0 +1,21 @@ +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/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch b/meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch new file mode 100644 index 0000000000..a84de94ed0 --- /dev/null +++ b/meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch @@ -0,0 +1,19 @@ +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); diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc new file mode 100644 index 0000000000..da7924631e --- /dev/null +++ b/meta/recipes-support/attr/attr.inc @@ -0,0 +1,20 @@ +DESCRIPTION = "utilities for manipulating filesystem extended attributes" +HOMEPAGE = "http://savannah.nongnu.org/projects/attr/" +SECTION = "libs" + +LICENSE = "LGPLv2.1+ & GPLv2+" +LICENSE_${PN} = "GPLv2+" +LICENSE_lib${PN} = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \ + file://attr/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \ + file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb" + +SRC_URI = "http://nongnu.askapache.com/attr/${BP}.src.tar.gz" + +require ea-acl.inc + +# libdir should point to .la +do_install_append() { + sed -i ${D}${libdir}/libattr.la -e \ + s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\', +} diff --git a/meta/recipes-support/attr/attr_2.4.44.bb b/meta/recipes-support/attr/attr_2.4.44.bb new file mode 100644 index 0000000000..0b21b33dcf --- /dev/null +++ b/meta/recipes-support/attr/attr_2.4.44.bb @@ -0,0 +1,9 @@ +require attr.inc + +PR = "r1" + +SRC_URI += "file://memory-leak-in-copy.patch \ + file://memory-leak2.patch \ + file://double-free.patch \ + file://pull-in-string.h.patch \ + file://thinko-in-restore.patch" diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc new file mode 100644 index 0000000000..77fa2b4fd6 --- /dev/null +++ b/meta/recipes-support/attr/ea-acl.inc @@ -0,0 +1,35 @@ +# this build system is mostly shared by attr and acl + +DEPENDS =+ "gettext" + +SRC_URI += "file://relative-libdir.patch;striplevel=0" + +inherit autotools + +# the package comes with a custom config.h.in, it cannot be +# overwritten by autoheader +export AUTOHEADER = "true" +EXTRA_OECONF = "INSTALL_USER=root INSTALL_GROUP=root" + +EXTRA_OEMAKE = "PKG_LIB_DIR=${base_libdir} PKG_DEVLIB_DIR=${libdir}" + +do_install () { + oe_runmake install install-lib install-dev DIST_ROOT="${D}" +} + +PACKAGES =+ "lib${PN} lib${PN}-dev lib${PN}-doc" + +FILES_lib${PN} = "${base_libdir}/lib*.so.*" + +FILES_lib${PN}-dev = "${includedir} \ + ${libdir}/lib*.so \ + ${libdir}/lib*.a \ + ${libdir}/lib*.la \ + ${base_libdir}/lib*.so \ + ${base_libdir}/lib*.a \ + ${base_libdir}/lib*.la" + +FILES_lib${PN}-doc = "${mandir}/man2 \ + ${mandir}/man3" + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/attr/files/relative-libdir.patch b/meta/recipes-support/attr/files/relative-libdir.patch new file mode 100644 index 0000000000..f989dd0ccc --- /dev/null +++ b/meta/recipes-support/attr/files/relative-libdir.patch @@ -0,0 +1,23 @@ +use relative path in symbolic links, or it fails in staging +sed expression from udev + +7/29/2010 - created by Qing He + +diff -u include.orig/buildmacros include/buildmacros +--- include.orig/buildmacros 2010-07-29 17:39:48.000000000 +0800 ++++ include/buildmacros 2010-07-29 18:20:34.000000000 +0800 +@@ -88,9 +88,11 @@ + ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ + ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ + if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \ +- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ +- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ +- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ ++ rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ ++ ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ ++ ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ ++ rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ ++ ../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ + fi + else + INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) -- cgit v1.2.3-54-g00ecf