Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/cdemu-client/PKGBUILD
	community/dcron/PKGBUILD
	community/freevo/PKGBUILD
	community/gmerlin-avdecoder/PKGBUILD
	community/hacburn/PKGBUILD
	community/htmldoc/PKGBUILD
	community/ibus-table/PKGBUILD
	community/iksemel/PKGBUILD
	community/isomaster/PKGBUILD
	community/libmatio/PKGBUILD
	community/libtlen/PKGBUILD
	community/luarocks/PKGBUILD
	community/lxde-common/PKGBUILD
	community/multipath-tools/PKGBUILD
	community/nvclock/PKGBUILD
	community/pam-krb5/PKGBUILD
	community/pidgin-musictracker/PKGBUILD
	community/pkgfile/PKGBUILD
	community/pkgtools/PKGBUILD
	community/print-manager/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python-pyxmpp/PKGBUILD
	community/python2-simplejson/PKGBUILD
	community/rsnapshot/PKGBUILD
	community/setconf/PKGBUILD
	community/tagpy/PKGBUILD
	community/terminator/PKGBUILD
	community/udunits/PKGBUILD
	community/vlock/PKGBUILD
	community/winefish/PKGBUILD
	core/nss-myhostname/PKGBUILD
	extra/avfs/PKGBUILD
	extra/bmp-musepack/PKGBUILD
	extra/bmp-wma/PKGBUILD
	extra/bochs/PKGBUILD
	extra/botan/PKGBUILD
	extra/cdargs/PKGBUILD
	extra/cx_freeze/PKGBUILD
	extra/dcfldd/PKGBUILD
	extra/devilspie/PKGBUILD
	extra/emelfm2/PKGBUILD
	extra/evilwm/PKGBUILD
	extra/fssos-nsvs/PKGBUILD
	extra/gimp-dbp/PKGBUILD
	extra/gimp-gap/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gmpc/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/hercules/PKGBUILD
	extra/herqq/PKGBUILD
	extra/hydrogen/PKGBUILD
	extra/kdegames/PKGBUILD
	extra/kradio/PKGBUILD
	extra/kshutdown/PKGBUILD
	extra/libmusicbrainz4/PKGBUILD
	extra/mahjong/PKGBUILD
	extra/mcrypt/PKGBUILD
	extra/monica/PKGBUILD
	extra/mpck/PKGBUILD
	extra/mrtg/PKGBUILD
	extra/nicotine/PKGBUILD
	extra/normalize/PKGBUILD
	extra/oprofile/PKGBUILD
	extra/perl-event/PKGBUILD
	extra/perl-unicode-string/PKGBUILD
	extra/pidgin-encryption/PKGBUILD
	extra/proftpd/PKGBUILD
	extra/pymad/PKGBUILD
	extra/qiv/PKGBUILD
	extra/quodlibet/PKGBUILD
	extra/ratpoison/PKGBUILD
	extra/rox/PKGBUILD
	extra/scrot/PKGBUILD
	extra/stardict/PKGBUILD
	extra/terminal/PKGBUILD
	extra/usbview/PKGBUILD
	extra/xdelta/PKGBUILD
	extra/xdelta3/PKGBUILD
	extra/xorg-xlsfonts/PKGBUILD
	extra/zile/PKGBUILD
	mozilla-testing/iceweasel-libre/mozconfig
	mozilla-testing/iceweasel-libre/vendor.js
	social/tokyocabinet/PKGBUILD
	~fauno/notmuch/PKGBUILD
	~mtjm/thinkfan/PKGBUILD
	~mtjm/zbar/PKGBUILD

1 files changed, 0 insertions, 108 deletions

diff --git a/extra/php-apc/svn.patch b/extra/php-apc/svn.patch
deleted file mode 100644
index 6a846a752..000000000
--- a/extra/php-apc/svn.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Index: apc_string.c
-===================================================================
---- apc_string.c	(Revision 325040)
-+++ apc_string.c	(Revision 326091)
-@@ -91,17 +91,18 @@
-         p = p->pNext;
-     }
-    
--    if (APCSG(interned_strings_top) + ZEND_MM_ALIGNED_SIZE(sizeof(Bucket) + nKeyLength) >=
-+    if (APCSG(interned_strings_top) + ZEND_MM_ALIGNED_SIZE(sizeof(Bucket) + nKeyLength + 1) >=
-         APCSG(interned_strings_end)) {
-         /* no memory */
-         return NULL;
-     }
- 
-     p = (Bucket *) APCSG(interned_strings_top);
--    APCSG(interned_strings_top) += ZEND_MM_ALIGNED_SIZE(sizeof(Bucket) + nKeyLength);
-+    APCSG(interned_strings_top) += ZEND_MM_ALIGNED_SIZE(sizeof(Bucket) + nKeyLength + 1);
- 
-     p->arKey = (char*)(p+1);
-     memcpy(p->arKey, arKey, nKeyLength);
-+    ((char *)p->arKey)[nKeyLength] = '\0';
-     p->nKeyLength = nKeyLength;
-     p->h = h;
-     p->pData = &p->pDataPtr;
-@@ -154,7 +155,7 @@
-         }
- 
- 		if (ce->name) {
--            ce->name = apc_new_interned_string(ce->name, ce->name_length TSRMLS_CC);
-+            ce->name = apc_new_interned_string(ce->name, ce->name_length+1 TSRMLS_CC);
- 		}
- 
-         q = ce->properties_info.pListHead;
-@@ -166,7 +167,7 @@
-             }
- 
-             if (info->name) {
--                info->name = apc_new_interned_string(info->name, info->name_length TSRMLS_CC);
-+                info->name = apc_new_interned_string(info->name, info->name_length+1 TSRMLS_CC);
-             }
- 
-             q = q->pListNext;
-Index: apc.php
-===================================================================
---- apc.php	(Revision 325040)
-+++ apc.php	(Revision 326091)
-@@ -91,7 +91,7 @@
- 	'SORT1'	=> '/^[AHSMCDTZ]$/',	// first sort key
- 	'SORT2'	=> '/^[DA]$/',			// second sort key
- 	'AGGR'	=> '/^\d+$/',			// aggregation by dir level
--	'SEARCH'	=> '~^[a-zA-Z0-1/_.-]*$~'			// aggregation by dir level
-+	'SEARCH'	=> '~^[a-zA-Z0-9/_.-]*$~'			// aggregation by dir level
- );
- 
- // default cache mode
-Index: php_apc.c
-===================================================================
---- php_apc.c	(Revision 325040)
-+++ php_apc.c	(Revision 326091)
-@@ -724,6 +724,10 @@
-     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz", &strkey, &strkey_len, &(args.step), &success) == FAILURE) {
-         return;
-     }
-+    
-+	if (success) {
-+		zval_dtor(success);
-+	}
- 
-     if(_apc_update(strkey, strkey_len, inc_updater, &args TSRMLS_CC)) {
-         if(success) ZVAL_TRUE(success);
-@@ -747,6 +751,10 @@
-     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz", &strkey, &strkey_len, &(args.step), &success) == FAILURE) {
-         return;
-     }
-+    
-+	if (success) {
-+		zval_dtor(success);
-+	}
- 
-     args.step = args.step * -1;
- 
-Index: php_apc.h
-===================================================================
---- php_apc.h	(Revision 325040)
-+++ php_apc.h	(Revision 326091)
-@@ -35,7 +35,7 @@
- #include "apc_php.h"
- #include "apc_globals.h"
- 
--#define PHP_APC_VERSION "3.1.9"
-+#define PHP_APC_VERSION "3.1.10"
- 
- extern zend_module_entry apc_module_entry;
- #define apc_module_ptr &apc_module_entry
-Index: apc_cache.c
-===================================================================
---- apc_cache.c	(Revision 325040)
-+++ apc_cache.c	(Revision 326091)
-@@ -944,7 +944,7 @@
- 
-     len = strlen(filename);
-     if(APCG(fpstat)==0) {
--        if(IS_ABSOLUTE_PATH(filename,len)) {
-+        if(IS_ABSOLUTE_PATH(filename,len) || strstr(filename, "://")) {
-             key->data.fpfile.fullpath = filename;
-             key->data.fpfile.fullpath_len = len;
-             key->h = string_nhash_8(key->data.fpfile.fullpath, key->data.fpfile.fullpath_len);