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

Conflicts:
	community-testing/collectd/PKGBUILD
	community-testing/collectd/install
	community-testing/collectd/libperl.patch
	community-testing/collectd/rc.d
	community-testing/collectd/rtnl_dump_filter.patch
	community-testing/freeradius/PKGBUILD
	community-testing/freeradius/freeradius.install
	community-testing/freeradius/krb5-build-fix.patch
	community-testing/freeradius/radiusd
	community-testing/inn/PKGBUILD
	community-testing/inn/inn.install
	community-testing/inn/innd.conf
	community-testing/inn/innd.rc
	community-testing/inn/nnrpd.conf
	community-testing/inn/nnrpd.rc
	community-testing/inn/site.make.patch
	community-testing/libvirt/PKGBUILD
	community-testing/linux-tools/PKGBUILD
	community-testing/linux-tools/cpupower.conf
	community-testing/linux-tools/cpupower.rc
	community-testing/linux-tools/cpupower.service
	community-testing/perl-berkeleydb/PKGBUILD
	community-testing/perl-class-methodmaker/PKGBUILD
	community-testing/perl-clone/PKGBUILD
	community-testing/perl-crypt-blowfish/PKGBUILD
	community-testing/perl-crypt-des/PKGBUILD
	community-testing/perl-curses/PKGBUILD
	community-testing/perl-data-structure-util/PKGBUILD
	community-testing/perl-datetime/PKGBUILD
	community-testing/perl-device-serialport/PKGBUILD
	community-testing/perl-file-rsyncp/PKGBUILD
	community-testing/perl-fuse/PKGBUILD
	community-testing/perl-gd/PKGBUILD
	community-testing/perl-gssapi/PKGBUILD
	community-testing/perl-html-strip/PKGBUILD
	community-testing/perl-inline-java/PKGBUILD
	community-testing/perl-io-dirent/PKGBUILD
	community-testing/perl-io-tty/PKGBUILD
	community-testing/perl-json-xs/PKGBUILD
	community-testing/perl-libapreq2/PKGBUILD
	community-testing/perl-mail-box-parser-c/PKGBUILD
	community-testing/perl-mail-transport-dbx/PKGBUILD
	community-testing/perl-net-dbus/PKGBUILD
	community-testing/perl-net-libidn/PKGBUILD
	community-testing/perl-params-classify/PKGBUILD
	community-testing/perl-params-validate/PKGBUILD
	community-testing/perl-string-crc32/PKGBUILD
	community-testing/perl-text-charwidth/PKGBUILD
	community-testing/perl-text-kakasi/ChangeLog
	community-testing/perl-text-kakasi/PKGBUILD
	community-testing/perl-tie-hash-indexed/PKGBUILD
	community-testing/perl-www-curl/PKGBUILD
	community-testing/perl-xmms/PKGBUILD
	community-testing/pork/PKGBUILD
	community-testing/rxvt-unicode/PKGBUILD
	community-testing/rxvt-unicode/urxvt-tabbed.desktop
	community-testing/rxvt-unicode/urxvt.desktop
	community-testing/rxvt-unicode/urxvtc.desktop
	community-testing/znc/PKGBUILD
	community/blackbox/PKGBUILD
	community/ccrtp/PKGBUILD
	community/gambas2/poppler-0.20.patch
	community/gambas3/poppler-0-20.patch
	community/libunistring/PKGBUILD
	community/libzrtpcpp/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2djvu/poppler-0.20.patch
	community/sword/PKGBUILD
	community/xiphos/PKGBUILD
	core/procps/PKGBUILD
	extra/dvdrip/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/inkscape/poppler20.patch
	extra/iperf/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libreoffice/fix_broken_hebrew_wordwrapping.diff
	extra/libreoffice/libreoffice-base.install
	extra/libreoffice/libreoffice-calc.install
	extra/libreoffice/libreoffice-common.install
	extra/libreoffice/libreoffice-draw.install
	extra/libreoffice/libreoffice-impress.install
	extra/libreoffice/libreoffice-writer.install
	extra/mail-notification/PKGBUILD
	extra/nxserver/PKGBUILD
	extra/php-suhosin/PKGBUILD
	extra/poppler/PKGBUILD
	extra/streamtuner/PKGBUILD
	extra/systemd/PKGBUILD
	extra/tunepimp/PKGBUILD
	mozilla-testing/iceweasel-libre/iceweasel.install
	multilib/wine/PKGBUILD
	staging/gimp-devel/gimp-devel.install
	testing/consolekit/PKGBUILD
	testing/cryptsetup/PKGBUILD
	testing/cryptsetup/encrypt_hook
	testing/cryptsetup/encrypt_install
	testing/dmraid/PKGBUILD
	testing/dmraid/dmraid_install
	testing/graphviz/PKGBUILD
	testing/imagemagick/PKGBUILD
	testing/imagemagick/perlmagick.rpath.patch
	testing/irssi/PKGBUILD
	testing/kdebindings-perlkde/PKGBUILD
	testing/kdebindings-perlqt/PKGBUILD
	testing/lvm2/PKGBUILD
	testing/lvm2/lvm2_hook
	testing/lvm2/lvm2_install
	testing/mdadm/PKGBUILD
	testing/mdadm/mdadm_install
	testing/mdadm/mdadm_udev_install
	testing/mkinitcpio-nfs-utils/PKGBUILD
	testing/net-snmp/snmpd.rc
	testing/perl-bit-vector/PKGBUILD
	testing/perl-compress-bzip2/PKGBUILD
	testing/perl-crypt-openssl-bignum/PKGBUILD
	testing/perl-crypt-openssl-random/PKGBUILD
	testing/perl-crypt-openssl-rsa/PKGBUILD
	testing/perl-crypt-ssleay/PKGBUILD
	testing/perl-dbd-mysql/PKGBUILD
	testing/perl-dbi/PKGBUILD
	testing/perl-fcgi/PKGBUILD
	testing/perl-locale-gettext/PKGBUILD
	testing/perl-locale-gettext/compatibility-with-POSIX-module.patch
	testing/perl-net-ssleay/PKGBUILD
	testing/perl-time-hires/PKGBUILD
	testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
	testing/perl/ChangeLog
	testing/perl/PKGBUILD
	testing/perl/digest_eval_hole.diff
	testing/perl/fix-h2ph-and-tests.patch
	testing/perl/perl.install
	testing/perl/perlbin.csh
	testing/perl/perlbin.sh
	testing/perl/provides.pl
	testing/php/PKGBUILD
	testing/php/logrotate.d.php-fpm
	testing/php/rc.d.php-fpm
	testing/pidgin/pidgin.install
	testing/pinentry/pinentry.install
	testing/postgresql/postgresql.pam
	testing/slim/logrotate
	testing/subversion/PKGBUILD
	testing/vim/PKGBUILD
	testing/vim/archlinux.vim
	testing/vim/gvim.desktop
	testing/vim/gvim.install
	testing/vim/vimrc
	testing/weechat/PKGBUILD
	testing/xf86-video-ati/PKGBUILD
	testing/xf86-video-intel/PKGBUILD
	testing/xf86-video-nouveau/PKGBUILD
	testing/xorg-server/PKGBUILD

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();