Mon May 28 20:14:39 UTC 2012

2 files changed, 0 insertions, 113 deletions

diff --git a/community/libvirt/unixperms.patch b/community/libvirt/unixperms.patch
deleted file mode 100644
index b3fb86cf5..000000000
--- a/community/libvirt/unixperms.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ur libvirt-0.7.4-orig/daemon/libvirtd.conf libvirt-0.7.4-patched/daemon/libvirtd.conf
---- libvirt-0.7.4-orig/daemon/libvirtd.conf	2009-11-23 03:10:33.398655655 -0800
-+++ libvirt-0.7.4-patched/daemon/libvirtd.conf	2009-11-23 03:09:37.831189671 -0800
-@@ -78,14 +78,14 @@
- # without becoming root.
- #
- # This is restricted to 'root' by default.
--#unix_sock_group = "libvirt"
-+unix_sock_group = "libvirt"
- 
- # Set the UNIX socket permissions for the R/O socket. This is used
- # for monitoring VM status only
- #
- # Default allows any user. If setting group ownership may want to
- # restrict this to:
--#unix_sock_ro_perms = "0777"
-+unix_sock_ro_perms = "0770"
- 
- # Set the UNIX socket permissions for the R/W socket. This is used
- # for full management of VMs
-@@ -95,7 +95,7 @@
- #
- # If not using PolicyKit and setting group ownership for access
- # control then you may want to relax this to:
--#unix_sock_rw_perms = "0770"
-+unix_sock_rw_perms = "0770"
- 
- # Set the name of the directory in which sockets will be found/created.
- #unix_sock_dir = "/var/run/libvirt"
-@@ -126,7 +126,7 @@
- #
- # To restrict monitoring of domains you may wish to enable
- # an authentication mechanism here
--#auth_unix_ro = "none"
-+auth_unix_ro = "none"
- 
- # Set an authentication scheme for UNIX read-write sockets
- # By default socket permissions only allow root. If PolicyKit
-@@ -135,7 +135,7 @@
- #
- # If the unix_sock_rw_perms are changed you may wish to enable
- # an authentication mechanism here
--#auth_unix_rw = "none"
-+auth_unix_rw = "none"
- 
- # Change the authentication scheme for TCP sockets.
- #
diff --git a/community/libvirt/yajl-2.x.patch b/community/libvirt/yajl-2.x.patch
deleted file mode 100644
index 80d3edce0..000000000
--- a/community/libvirt/yajl-2.x.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/src/util/json.c	2011-03-24 03:10:26.000000000 -0400
-+++ b/src/util/json.c	2011-04-25 20:01:29.354939116 -0400
-@@ -709,7 +709,7 @@
- 
- static int virJSONParserHandleNumber(void * ctx,
-                                      const char * s,
--                                     unsigned int l)
-+                                     size_t l)
- {
-     virJSONParserPtr parser = ctx;
-     char *str = strndup(s, l);
-@@ -735,7 +735,7 @@
- 
- static int virJSONParserHandleString(void * ctx,
-                                      const unsigned char * stringVal,
--                                     unsigned int stringLen)
-+                                     size_t stringLen)
- {
-     virJSONParserPtr parser = ctx;
-     virJSONValuePtr value = virJSONValueNewStringLen((const char *)stringVal,
-@@ -756,7 +756,7 @@
- 
- static int virJSONParserHandleMapKey(void * ctx,
-                                      const unsigned char * stringVal,
--                                     unsigned int stringLen)
-+                                     size_t stringLen)
- {
-     virJSONParserPtr parser = ctx;
-     virJSONParserStatePtr state;
-@@ -894,14 +894,14 @@
- /* XXX add an incremental streaming parser - yajl trivially supports it */
- virJSONValuePtr virJSONValueFromString(const char *jsonstring)
- {
--    yajl_parser_config cfg = { 1, 1 };
-     yajl_handle hand;
-     virJSONParser parser = { NULL, NULL, 0 };
-     virJSONValuePtr ret = NULL;
- 
-     VIR_DEBUG("string=%s", jsonstring);
- 
--    hand = yajl_alloc(&parserCallbacks, &cfg, NULL, &parser);
-+    hand = yajl_alloc(&parserCallbacks, NULL, &parser);
-+    yajl_config(hand, yajl_allow_comments, 1);
- 
-     if (yajl_parse(hand,
-                    (const unsigned char *)jsonstring,
-@@ -1002,15 +1002,16 @@
- 
- char *virJSONValueToString(virJSONValuePtr object)
- {
--    yajl_gen_config conf = { 0, " " }; /* Turns off pretty printing since QEMU can't cope */
-     yajl_gen g;
-     const unsigned char *str;
-     char *ret = NULL;
--    unsigned int len;
-+    size_t len;
- 
-     VIR_DEBUG("object=%p", object);
- 
--    g = yajl_gen_alloc(&conf, NULL);
-+    g = yajl_gen_alloc(NULL);
-+    yajl_gen_config(g, yajl_gen_beautify, 0);
-+    yajl_gen_config(g, yajl_gen_indent_string, " ");
- 
-     if (virJSONValueToStringOne(object, g) < 0) {
-         virReportOOMError();