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

Conflicts:
	community/luaexpat/PKGBUILD
	community/udevil/PKGBUILD
	extra/help2man/PKGBUILD

7 files changed, 45 insertions, 26 deletions

diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index 39f5dbf42..9b9ad58ac 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 172015 2012-11-26 14:36:27Z giovanni $
+# $Id: PKGBUILD 173201 2012-12-13 00:53:58Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gparted
-pkgver=0.14.0
-pkgrel=3
+pkgver=0.14.1
+pkgrel=1
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gparted.sourceforge.net"
@@ -24,7 +24,7 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions'
 install=gparted.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         'org.archlinux.pkexec.gparted.policy')
-md5sums=('fc3507479e930967a2049c533907384d'
+md5sums=('1ffe859c70e102a776dffb1ff0a2164a'
          '27c264cfad8fa413d75954dda7a2dd50')
 
 build() {
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index 628f8f5f3..23ff46985 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165837 2012-08-31 19:58:16Z giovanni $
+# $Id: PKGBUILD 173203 2012-12-13 02:36:19Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 
 pkgname=help2man
-pkgver=1.40.12
-pkgrel=1.1
+pkgver=1.40.13
+pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/help2man/"
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('perl-locale-gettext')
 install=help2man.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('6a37675ce2b0897cd8c6c19106e510a3')
+md5sums=('ecbc98f1f146e404e85d7bef520b34d8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/htop/PKGBUILD b/extra/htop/PKGBUILD
index 4266349dc..e0352434e 100644
--- a/extra/htop/PKGBUILD
+++ b/extra/htop/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 170397 2012-11-07 01:25:17Z dreisner $
+# $Id: PKGBUILD 173197 2012-12-12 17:29:21Z heftig $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=htop
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive process viewer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://htop.sourceforge.net/"
@@ -15,8 +15,10 @@ makedepends=('python2')
 optdepends=('lsof: show files opened by a process'
             'strace: attach to a running process')
 options=('!emptydirs')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('0d01cca8df3349c74569cefebbd9919e')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+        tree-crash.patch)
+md5sums=('0d01cca8df3349c74569cefebbd9919e'
+         '48eba3c0303bfd19d761b859bc69d713')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -24,6 +26,10 @@ build() {
   sed -i 's|ncursesw/curses.h|curses.h|' RichString.[ch] configure
   sed -i 's|python|python2|' scripts/MakeHeader.py
 
+  # Boost field buffer size - crashes when trying to draw very deep UTF-8 trees
+  # Test by nesting 30 shells
+  patch -N -i ../tree-crash.patch
+
   ./configure \
       --prefix=/usr \
       --enable-unicode \
diff --git a/extra/htop/tree-crash.patch b/extra/htop/tree-crash.patch
new file mode 100644
index 000000000..b949e262d
--- /dev/null
+++ b/extra/htop/tree-crash.patch
@@ -0,0 +1,13 @@
+Index: Process.c
+===================================================================
+--- Process.c	(revision 302)
++++ Process.c	(working copy)
+@@ -371,7 +371,7 @@
+ }
+ 
+ static void Process_writeField(Process* this, RichString* str, ProcessField field) {
+-   char buffer[128]; buffer[127] = '\0';
++   char buffer[256]; buffer[255] = '\0';
+    int attr = CRT_colors[DEFAULT_COLOR];
+    int baseattr = CRT_colors[PROCESS_BASENAME];
+    int n = sizeof(buffer) - 1;
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index a9940fb9c..d234a3ea1 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170371 2012-11-06 17:48:48Z giovanni $
+# $Id: PKGBUILD 173199 2012-12-13 00:42:44Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.4
+pkgver=2.4.1
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
         'mercurial.profile')
-md5sums=('c1fc9bec6951dd3c913092c3c72da014'
+md5sums=('31b328679951158a05f22c3323644b51'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD
index 8add8c625..8458514ed 100644
--- a/extra/perl-net-ssleay/PKGBUILD
+++ b/extra/perl-net-ssleay/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 167980 2012-10-04 16:11:02Z giovanni $
+# $Id: PKGBUILD 173205 2012-12-13 02:46:32Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Manolis Tzanidakis
 
 pkgname=perl-net-ssleay
 _cpanname=Net-SSLeay
-pkgver=1.49
+pkgver=1.50
 pkgrel=1
 pkgdesc="Perl extension for using OpenSSL"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ options=(!emptydirs)
 replaces=('net-ssleay')
 provides=('net-ssleay')
 source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz")
-md5sums=('9e05acd6773ff5e94c5a1dcd7c0ec4a7')
+md5sums=('5e239c5aae70dece79fcd6a4307fc53e')
 
 build() {
   cd ${srcdir}/${_cpanname}-${pkgver}
diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD
index b5000d64f..94c7bc9ec 100644
--- a/extra/swt/PKGBUILD
+++ b/extra/swt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168613 2012-10-13 11:49:41Z andyrtr $
+# $Id: PKGBUILD 173193 2012-12-12 16:57:29Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 pkgname=swt
-pkgver=4.2
-pkgrel=2
-_date=201206081400
+pkgver=4.2.1
+pkgrel=1
+_date=201209141800
 pkgdesc="An open source widget toolkit for Java"
 arch=('i686' 'x86_64')
 url="http://www.eclipse.org/swt/"
@@ -13,13 +13,13 @@ optdepends=('libgnomeui' 'mesa' 'glu' 'libwebkit')
 makedepends=('java-environment' 'libxtst' 'mesa' 'glu' 'libgnomeui' 'unzip' 'pkgconfig' 'libwebkit' 'apache-ant')
 if [ "${CARCH}" = "i686" ]; then
   _carch=x86
-  md5sums=('3efe0404f6129183abae46f7620fe14f'
-           '2f556ab534fc2488c6e8c0ee6c02825c')
+  sha256sums=('6198cd749ec25303a8c3a044e7680d643209862d2947f9efdda20bf7467575ba'
+              '6bb48007a95e3d8c6b577cc9cc4b61a51ce928b04f4fcd393cf72f8f727fe923')
 fi
 if [ "${CARCH}" = "x86_64" ]; then
   _carch=x86_64
-  md5sums=('9e06b576116ff409f395571603582827'
-           '2f556ab534fc2488c6e8c0ee6c02825c')
+  sha256sums=('e89e330df24ca72c57a381e81590293ce3f475d855258183179436bd5dcd85c8'
+              '6bb48007a95e3d8c6b577cc9cc4b61a51ce928b04f4fcd393cf72f8f727fe923')
 fi
 source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip
         build-swt.xml)