Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/fotoxx/PKGBUILD
	community/gtkdialog/PKGBUILD
	community/hubbub/PKGBUILD
	community/libgdamm/PKGBUILD
	community/libparserutils/PKGBUILD
	community/mingw32-binutils/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/mtpaint/PKGBUILD
	community/netsurf/PKGBUILD
	community/patchage/PKGBUILD
	community/qgo/PKGBUILD
	community/tomoyo-tools/PKGBUILD
	community/tre/PKGBUILD
	community/virtualbox/PKGBUILD
	core/net-tools/PKGBUILD
	core/openldap/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/evolution/PKGBUILD
	extra/exiv2/PKGBUILD
	extra/folks/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/koffice/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/pavucontrol/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/swt/PKGBUILD
	extra/tomcat/PKGBUILD
	extra/totem/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vte/PKGBUILD
	extra/xulrunner/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-atk/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/wine/PKGBUILD
	social/miniupnpc/PKGBUILD
	testing/icedtea-web-java7/PKGBUILD
	testing/sqlite3/PKGBUILD
	~xihh/abiword/PKGBUILD

1 files changed, 57 insertions, 0 deletions

diff --git a/community-staging/collectd/yajl-2.x.patch b/community-staging/collectd/yajl-2.x.patch
new file mode 100644
index 000000000..b90543dfe
--- /dev/null
+++ b/community-staging/collectd/yajl-2.x.patch
@@ -0,0 +1,57 @@
+--- old/src/curl_json.c	2011-04-25 20:43:00.972938855 -0400
++++ new/src/curl_json.c	2011-04-25 20:46:03.859938860 -0400
+@@ -98,8 +98,7 @@
+     return (0);
+ 
+   status = yajl_parse(db->yajl, (unsigned char *)buf, len);
+-  if ((status != yajl_status_ok)
+-      && (status != yajl_status_insufficient_data))
++  if ((status != yajl_status_ok))
+   {
+     unsigned char *msg =
+       yajl_get_error(db->yajl, /* verbose = */ 1,
+@@ -130,7 +129,7 @@
+ /* "number" may not be null terminated, so copy it into a buffer before
+  * parsing. */
+ static int cj_cb_number (void *ctx,
+-    const char *number, unsigned int number_len)
++    const char *number, size_t number_len)
+ {
+   char buffer[number_len + 1];
+ 
+@@ -159,7 +158,7 @@
+ } /* int cj_cb_number */
+ 
+ static int cj_cb_map_key (void *ctx, const unsigned char *val,
+-                            unsigned int len)
++                            size_t len)
+ {
+   cj_t *db = (cj_t *)ctx;
+   c_avl_tree_t *tree;
+@@ -187,7 +186,7 @@
+ }
+ 
+ static int cj_cb_string (void *ctx, const unsigned char *val,
+-                           unsigned int len)
++                           size_t len)
+ {
+   cj_t *db = (cj_t *)ctx;
+   char str[len + 1];
+@@ -697,7 +696,7 @@
+   char *url;
+   yajl_handle yprev = db->yajl;
+ 
+-  db->yajl = yajl_alloc (&ycallbacks, NULL, NULL, (void *)db);
++  db->yajl = yajl_alloc (&ycallbacks, NULL, (void *)db);
+   if (db->yajl == NULL)
+   {
+     ERROR ("curl_json plugin: yajl_alloc failed.");
+@@ -730,7 +729,7 @@
+     return (-1);
+   }
+ 
+-  status = yajl_parse_complete (db->yajl);
++  status = yajl_complete_parse (db->yajl);
+   if (status != yajl_status_ok)
+   {
+     unsigned char *errmsg;