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, 4 insertions, 4 deletions

diff --git a/core/libssh2/PKGBUILD b/core/libssh2/PKGBUILD
index 73ab68c67..5b9c65afe 100644
--- a/core/libssh2/PKGBUILD
+++ b/core/libssh2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 156610 2012-04-21 17:49:44Z dreisner $
+# $Id: PKGBUILD 159788 2012-05-27 02:25:20Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -6,7 +6,7 @@
 # Contributor: ice-man <icemanf@gmail.com>
 
 pkgname=libssh2
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts"
 url="http://www.libssh2.org/"
@@ -17,8 +17,8 @@ makedepends=('zlib')
 provides=('libssh2.so')
 options=('!libtool')
 source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc})
-md5sums=('b94106e046af37fdc0734e487842fe66'
-         'd120a091e9f594c6608815d72b07c7a3')
+md5sums=('42e2b3796ac07fc1dbafc7abcc002cd3'
+         '872cfb1d61dbd5acd0481ab030e8f130')
 
 build() {
   cd "$pkgname-$pkgver"