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

1 files changed, 0 insertions, 113 deletions

diff --git a/core/procps/procps-3.2.7-slabtop-once.patch b/core/procps/procps-3.2.7-slabtop-once.patch
deleted file mode 100644
index d3319cfe7..000000000
--- a/core/procps/procps-3.2.7-slabtop-once.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -up procps-3.2.7/slabtop.c.once procps-3.2.7/slabtop.c
---- procps-3.2.7/slabtop.c.once	2008-12-11 13:24:52.000000000 +0100
-+++ procps-3.2.7/slabtop.c	2008-12-11 13:33:12.000000000 +0100
-@@ -268,9 +268,24 @@ static void parse_input(char c)
- 	}
- }
- 
-+/*printw or printf depending on the context*/
-+static void printwf(int once, const char *s,...)
-+{
-+va_list va;
-+
-+va_start(va,s);
-+if(once) 
-+    vprintf(s,va);
-+else     
-+    vwprintw(stdscr, s, va);
-+va_end(va);
-+}
-+
-+
- int main(int argc, char *argv[])
- {
- 	int o;
-+        int once = 0;
- 	unsigned short old_rows;
- 	struct slab_info *slab_list = NULL;
- 
-@@ -307,6 +322,7 @@ int main(int argc, char *argv[])
- 			break;
- 		case 'o':
- 			delay = 0;
-+                        once = 1;
- 			break;
- 		case 'V':
- 			display_version();
-@@ -322,12 +338,18 @@ int main(int argc, char *argv[])
- 	if (tcgetattr(0, &saved_tty) == -1)
- 		perror("tcgetattr");
- 
--	initscr();
--	term_size(0);
--	old_rows = rows;
--	resizeterm(rows, cols);
--	signal(SIGWINCH, term_size);
--	signal(SIGINT, sigint_handler);
-+        if(!once) {
-+            initscr();
-+	    term_size(0);
-+	    old_rows = rows;
-+	    resizeterm(rows, cols);
-+	    signal(SIGWINCH, term_size);
-+	    signal(SIGINT, sigint_handler); 
-+        } else {
-+            old_rows = rows;
-+            rows = 80;
-+            cols = 24;
-+        }
- 
- 	do {
- 		struct slab_info *curr;
-@@ -341,12 +363,12 @@ int main(int argc, char *argv[])
- 			break;
- 
- 		if (old_rows != rows) {
--			resizeterm(rows, cols);
-+			if(!once) resizeterm(rows, cols);
- 			old_rows = rows;
- 		}
- 
- 		move(0,0);
--		printw(	" Active / Total Objects (%% used)    : %d / %d (%.1f%%)\n"
-+		printwf(once,	" Active / Total Objects (%% used)    : %d / %d (%.1f%%)\n"
- 			" Active / Total Slabs (%% used)      : %d / %d (%.1f%%)\n"
- 			" Active / Total Caches (%% used)     : %d / %d (%.1f%%)\n"
- 			" Active / Total Size (%% used)       : %.2fK / %.2fK (%.1f%%)\n"
-@@ -360,15 +382,15 @@ int main(int argc, char *argv[])
- 
- 		slab_list = slabsort(slab_list);
- 
--		attron(A_REVERSE);
--		printw(	"%6s %6s %4s %8s %6s %8s %10s %-23s\n",
-+		if(!once) attron(A_REVERSE);
-+		printwf(once,	"%6s %6s %4s %8s %6s %8s %10s %-23s\n",
- 			"OBJS", "ACTIVE", "USE", "OBJ SIZE", "SLABS",
- 			"OBJ/SLAB", "CACHE SIZE", "NAME");
--		attroff(A_REVERSE);
-+		if(!once) attroff(A_REVERSE);
- 
- 		curr = slab_list;
- 		for (i = 0; i < rows - 8 && curr->next; i++) {
--			printw("%6u %6u %3u%% %7.2fK %6u %8u %9uK %-23s\n",
-+			printwf(once, "%6u %6u %3u%% %7.2fK %6u %8u %9uK %-23s\n",
- 				curr->nr_objs, curr->nr_active_objs, curr->use,
- 				curr->obj_size / 1024.0, curr->nr_slabs,
- 				curr->objs_per_slab, (unsigned)(curr->cache_size / 1024),
-@@ -376,7 +398,7 @@ int main(int argc, char *argv[])
- 			curr = curr->next;
- 		}
- 
--		refresh();
-+		if(!once) refresh();
- 		put_slabinfo(slab_list);
- 
- 		FD_ZERO(&readfds);
-@@ -392,6 +414,6 @@ int main(int argc, char *argv[])
- 
- 	tcsetattr(0, TCSAFLUSH, &saved_tty);
- 	free_slabinfo(slab_list);
--	endwin();
-+	if(!once) endwin();
- 	return 0;
- }