Sat Aug 6 23:14:27 UTC 2011

20 files changed, 193 insertions, 117 deletions

diff --git a/community-staging/ruby-glib2/PKGBUILD b/community-staging/ruby-glib2/PKGBUILD
new file mode 100644
index 000000000..fb2a1fac3
--- /dev/null
+++ b/community-staging/ruby-glib2/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 53576 2011-08-05 22:47:58Z bfanella $
+# Maintainer: Brad Fanella <bradfanella@archlinux.us>
+# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
+# Contributor: kritoke <kritoke@nospam.gmail.com>
+
+pkgname=ruby-glib2
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="Ruby bindings for glib2."
+arch=('i686' 'x86_64')
+url="http://ruby-gnome2.sourceforge.jp"
+license=('LGPL')
+depends=('ruby')
+makedepends=('ruby-pkgconfig')
+source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
+md5sums=('e9711eb5bd88debda90a920deb96d7d0')
+
+build() {
+	cd "$srcdir/ruby-gtk2-$pkgver"
+	ruby extconf.rb glib2 --topdir=$pkgdir
+	make
+}
+package() {
+	cd "$srcdir/ruby-gtk2-$pkgver"
+	make DESTDIR="$pkgdir" install
+}
diff --git a/community/clipgrab/PKGBUILD b/community/clipgrab/PKGBUILD
index 724a294d4..52618ef13 100644
--- a/community/clipgrab/PKGBUILD
+++ b/community/clipgrab/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: thacrazze <thacrazze|googlemail|com>
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 pkgname=clipgrab
-pkgver=3.1.0.1
+pkgver=3.1.0.2
 pkgrel=1
 pkgdesc='A video downloader and converter for YouTube, Veoh, DailyMotion, MyVideo, ...'
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ license=('GPL')
 depends=('qt')
 optdepends=('ffmpeg: for some encodings')
 source=(http://clipgrab.de/download/${pkgname}-${pkgver}.tar.bz2 ${pkgname}.png ${pkgname}.desktop)
-md5sums=('87df4d8fdc4c1097eb78cf064561db24'
+md5sums=('1250e1fb29cd88b7ce1a37d937de0146'
          'ef030502ae0922e632742f47283313f4'
          '9a141791f6952917c441050c3dac81ce')
 
diff --git a/community/curlftpfs/PKGBUILD b/community/curlftpfs/PKGBUILD
index 7db8af17f..e0570edaf 100644
--- a/community/curlftpfs/PKGBUILD
+++ b/community/curlftpfs/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 17286 2010-05-22 17:59:00Z cbrannon $
+# $Id: PKGBUILD 53536 2011-08-05 12:01:25Z cbrannon $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: Philip Nilsson <leffeman@gmail.com>
 
 pkgname=curlftpfs
 pkgver=0.9.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A filesystem for acessing FTP hosts based on FUSE and libcurl."
 url="http://curlftpfs.sourceforge.net/"
 license=('GPL')
 depends=('curl>=7.15.4' 'fuse' 'glib2')
 makedepends=('pkgconfig>=0.9.0')
 arch=('i686' 'x86_64')
-source=(http://downloads.sourceforge.net/sourceforge/curlftpfs/$pkgname-$pkgver.tar.gz)
-md5sums=('b452123f755114cd4461d56c648d9f12')
+source=(http://downloads.sourceforge.net/sourceforge/curlftpfs/$pkgname-$pkgver.tar.gz
+        ioerror.patch)
+md5sums=('b452123f755114cd4461d56c648d9f12'
+         '7a8db686293463ba3148c7032871c883')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 < "$srcdir/ioerror.patch"
   ./configure --prefix=/usr || return 1
   make || return 1
 }
diff --git a/community/curlftpfs/ioerror.patch b/community/curlftpfs/ioerror.patch
new file mode 100644
index 000000000..6ca1afb4f
--- /dev/null
+++ b/community/curlftpfs/ioerror.patch
@@ -0,0 +1,11 @@
+--- curlftpfs-0.9.2.orig/ftpfs.c	2008-04-30 03:05:47.000000000 +0400
++++ curlftpfs-0.9.2.orig/ftpfs.c	2011-01-20 20:33:38.000000000 +0300
+@@ -503,7 +503,7 @@ static void *ftpfs_write_thread(void *da
+   
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, fh->full_path);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_UPLOAD, 1);
+-  curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, -1);
++  curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, (curl_off_t)-1);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READFUNCTION, write_data_bg);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READDATA, fh);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_LOW_SPEED_LIMIT, 1);
diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD
index f708e5d61..bc1d4a8cf 100755
--- a/community/mathomatic/PKGBUILD
+++ b/community/mathomatic/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer:  Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=mathomatic
-pkgver=15.6.2
+pkgver=15.6.3
 pkgrel=1
 pkgdesc="General purpose Computer Algebra System written in C"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial'
             'bash: for running a test script' 
             'gnuplot: for plotting')
 source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2)
-md5sums=('96b64d056c6ab3c72338ff7566b6b11e')
+md5sums=('afe923c5164b2d8746ef8dc87b868ba0')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/nas/PKGBUILD b/community/nas/PKGBUILD
index b6e3fe87b..62c62ddf0 100644
--- a/community/nas/PKGBUILD
+++ b/community/nas/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 21701 2010-07-16 22:42:31Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# $Id: PKGBUILD 53530 2011-08-05 06:06:18Z bfanella $
+# Maintainer: Brad Fanella <bradfanella@archlinux.us>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=nas
-pkgver=1.9.2
-pkgrel=2
+pkgver=1.9.3
+pkgrel=1
 pkgdesc='Network Audio System is a network transparent, client/server audio transport system'
 arch=('i686' 'x86_64')
 url='http://radscan.com/nas.html'
@@ -13,23 +14,20 @@ depends=('libxaw')
 makedepends=('imake')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tar.gz"
         'license.txt')
-md5sums=('ed7864f55b384452167959022cfb403b'
+md5sums=('ecd01a3b4e17a9d464efa83a03618025'
          'f11eb8c3fb83946e66e60f7532e8d5da')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  	cd ${pkgname}-${pkgver}
 
-  xmkmf
-
-  make World
+  	xmkmf
+  	make World
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} USRLIBDIR=/usr/lib install
-
-  chmod 644 ${pkgdir}/usr/include/audio/*
+  	cd ${pkgname}-${pkgver}
 
-  install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license
+  	make DESTDIR=${pkgdir} USRLIBDIR=/usr/lib install
+	chmod 644 ${pkgdir}/usr/include/audio/*
+	install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license
 }
diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD
index 1e1d61777..a45136361 100644
--- a/community/rawtherapee/PKGBUILD
+++ b/community/rawtherapee/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 52439 2011-07-25 17:38:27Z stativ $
+# $Id: PKGBUILD 53541 2011-08-05 12:13:39Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
 # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com>
 # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz>
 # Contributor: Archie <mymaud@gmail.com>
 
 pkgname=rawtherapee
-pkgver=3.1.1
+pkgver=4.0.0
 pkgrel=1
 pkgdesc="RAW photo editor"
 arch=('i686' 'x86_64')
diff --git a/core/dbus-core/PKGBUILD b/core/dbus-core/PKGBUILD
index 360802755..50c3d0110 100644
--- a/core/dbus-core/PKGBUILD
+++ b/core/dbus-core/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 128605 2011-06-24 14:03:41Z ibiru $
+# $Id: PKGBUILD 134377 2011-08-03 11:19:59Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus-core
-pkgver=1.4.12
+pkgver=1.4.14
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
@@ -16,7 +16,7 @@ options=(!libtool)
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
         dbus)
-md5sums=('104f2ea94c10a896dfb1edecb5714cb1'
+md5sums=('ae6de2562a57516cfabaf56903375ba9'
          '08f93dd19cffd1b45ab05c1fd4efb560')
 
 build() {
diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD
index 2a5489e9d..4d7b9cf95 100644
--- a/core/file/PKGBUILD
+++ b/core/file/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131726 2011-07-14 01:54:47Z allan $
+# $Id: PKGBUILD 134479 2011-08-04 09:59:01Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=file
-pkgver=5.07
-pkgrel=4
+pkgver=5.08
+pkgrel=1
 pkgdesc="File type identification utility"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -12,17 +12,12 @@ groups=('base')
 url="http://www.darwinsys.com/file/"
 depends=('glibc' 'zlib')
 options=('!libtool')
-source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz 
-        file-5.07-zip-detect.patch)
-md5sums=('b8d1f9a8a644067bd0a703cebf3f4858'
-         'ac155cf89af6665dfee76738c27366d8')
+source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('6a2a263c20278f01fe3bb0f720b27d4e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's#\$(datadir)/misc#\$(datadir)#' configure 
-
-  # combined upstream patches to fix zip file detection
-  patch -Np1 -i ${srcdir}/file-5.07-zip-detect.patch
+  sed -i 's#\$(datadir)/misc#\$(datadir)#' configure
   
   ./configure --prefix=/usr --datadir=/usr/share/file
   make 
diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD
index 2d91dbbf9..6afa61fee 100644
--- a/core/libcap/PKGBUILD
+++ b/core/libcap/PKGBUILD
@@ -1,17 +1,17 @@
-#$Id: PKGBUILD 122049 2011-05-02 01:47:02Z allan $
+#$Id: PKGBUILD 132720 2011-07-25 12:05:15Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libcap
-pkgver=2.21
+pkgver=2.22
 pkgrel=1
 pkgdesc="POSIX 1003.1e capabilities"
 arch=('i686' 'x86_64')
-url="http://www.kernel.org/pub/linux/libs/security/linux-privs/"
-license=('GPL')
+url="http://sites.google.com/site/fullycapable/"
+license=('GPL2')
 depends=('glibc' 'attr')
 source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${pkgname}-${pkgver}.tar.gz)
-md5sums=('61966ef40f2dee8731b69db895e4548d')
+md5sums=('b4896816b626bea445f0b3849bdd4077')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/core/pcmciautils/PKGBUILD b/core/pcmciautils/PKGBUILD
index 8744b8392..fee30155d 100644
--- a/core/pcmciautils/PKGBUILD
+++ b/core/pcmciautils/PKGBUILD
@@ -1,20 +1,18 @@
-# $Id: PKGBUILD 113400 2011-03-08 14:24:47Z stephane $
+# $Id: PKGBUILD 134400 2011-08-03 16:55:02Z tomegun $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pcmciautils
-pkgver=017
-pkgrel=2
+pkgver=018
+pkgrel=1
 pkgdesc="Utilities for inserting and removing PCMCIA cards"
 arch=(i686 x86_64)
 url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
 license=('GPL')
 groups=('base')
-depends=('glibc' 'sysfsutils' 'module-init-tools>=3.2pre9')
+# sysfsutils will not be required in the next release
+depends=('udev' 'sysfsutils')
 conflicts=('pcmcia-cs')
-source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${pkgver}.tar.bz2
-        60-pcmcia.rules)
+source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${pkgver}.tar.bz2)
 options=(!makeflags)
-md5sums=('5245af28eeba57ec0606a874d44d10f7'
-         'f88ac464ab9c75fe1565af551e6553a2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -25,8 +23,5 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  # fix lspcmcia symlink
-  ln -sf pccardctl "${pkgdir}"/sbin/lspcmcia
-  # add fixed rules file
-  install -D -m644 "${srcdir}"/60-pcmcia.rules "${pkgdir}"/lib/udev/rules.d/
 }
+md5sums=('5d85669b3440baa4532363da6caaf1b4')
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 43d36c2a6..1d3b15889 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 134142 2011-08-02 09:11:04Z jgc $
+# $Id: PKGBUILD 134554 2011-08-05 18:35:01Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=1.4.7
-pkgrel=4
+pkgver=1.4.8
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -16,7 +16,7 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
         cups-no-gcrypt.patch
         cups cups.logrotate cups.pam)
 #options=('!emptydirs')
-md5sums=('1590033ab4c739b859aeb672fe849089'
+md5sums=('0ec52d3f3c69bc2ab5ed70c594edbce6'
          '8ebd390197501ffd709f0ee546937fd5'
          '9b8467a1e51d360096b70e2c3c081e6c'
          'c9ede95cfc8e76571bd8156f0a573e3b'
diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD
index bcac66a7a..6def02fe7 100644
--- a/extra/dbus/PKGBUILD
+++ b/extra/dbus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 128609 2011-06-24 14:05:28Z ibiru $
+# $Id: PKGBUILD 134376 2011-08-03 11:19:50Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus
-pkgver=1.4.12
+pkgver=1.4.14
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
@@ -12,7 +12,7 @@ license=('GPL' 'custom')
 depends=("dbus-core>=${pkgver}" 'libx11')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
         30-dbus)
-md5sums=('104f2ea94c10a896dfb1edecb5714cb1'
+md5sums=('ae6de2562a57516cfabaf56903375ba9'
          'd14e59575f04e55d21a04907b6fd9f3c')
 
 build() {
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index 88b2e2eb0..c411dd4fc 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 113641 2011-03-10 11:31:08Z juergen $
+# $Id: PKGBUILD 134523 2011-08-05 07:55:30Z juergen $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 pkgname=emacs
-pkgver=23.3
+pkgver=23.3a
 pkgrel=1
 pkgdesc="The Emacs Editor"
 arch=(i686 x86_64)
@@ -12,30 +12,30 @@ options=(docs)
 replaces=(cedet)
 depends=('dbus-core' 'librsvg' 'gpm'  'giflib' 'libtiff'  'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme' 'gconf')
 source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop)
-md5sums=('bf07c01ef473d8540c9c39f94506b1e6'
+md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04'
          '8af038d2ba4561271e935bb444ceb4e3')
 install=emacs.install
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $startdir/src/$pkgname-${pkgver%[a-z]}
   mandir=/usr/share/man
-  
+
   # gcc 4.5 Workaround: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43904
   CFLAGS="${CFLAGS} -fno-optimize-sibling-calls"\
     ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
     --localstatedir=/var --mandir=${mandir} --without-sound --with-x-toolkit=gtk
-  make 
-  make DESTDIR=$startdir/pkg install 
+  make
+  make DESTDIR=$startdir/pkg install
 
   # remove conflict with ctags package
-  mv $startdir/pkg/usr/bin/{ctags,ctags.emacs} 
-  mv $startdir/pkg/usr/bin/{etags,etags.emacs} 
-  mv $startdir/pkg${mandir}/man1/{etags.1,etags.emacs.1} 
-  mv $startdir/pkg${mandir}/man1/{ctags.1,ctags.emacs.1} 
+  mv $startdir/pkg/usr/bin/{ctags,ctags.emacs}
+  mv $startdir/pkg/usr/bin/{etags,etags.emacs}
+  mv $startdir/pkg${mandir}/man1/{etags.1,etags.emacs.1}
+  mv $startdir/pkg${mandir}/man1/{ctags.1,ctags.emacs.1}
   # fix all the 777 perms on directories
-  find $startdir/pkg/usr/share/emacs/$pkgver -type d -exec chmod 755 {} \;
+  find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -type d -exec chmod 755 {} \;
   # fix user/root permissions on usr/share files
-  find $startdir/pkg/usr/share/emacs/$pkgver -exec chown root.root {} \;
+  find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -exec chown root.root {} \;
   # fix perms on /var/games
   chmod 775 ${startdir}/pkg/var/games
   chmod 775 ${startdir}/pkg/var/games/emacs
@@ -43,8 +43,8 @@ build() {
   chown -R root:50 ${startdir}/pkg/var/games
 
 
-  # fix  FS#9253 
+  # fix  FS#9253
   mkdir -p $startdir/pkg/usr/share/pixmaps ${startdir}/pkg/usr/share/applications
   install -D -m644 ${startdir}/src/${pkgname}.desktop   ${startdir}/pkg/usr/share/applications
-  ln -s  ../emacs/${pkgver}/etc/images/icons/hicolor/48x48/apps/emacs.png $startdir/pkg/usr/share/pixmaps/emacs-icon.png  
+  ln -s  ../emacs/${pkgver%[a-z]}/etc/images/icons/hicolor/48x48/apps/emacs.png $startdir/pkg/usr/share/pixmaps/emacs-icon.png
 }
diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD
index c247ae6a9..f24789350 100644
--- a/extra/ettercap/PKGBUILD
+++ b/extra/ettercap/PKGBUILD
@@ -1,36 +1,46 @@
-# $Id: PKGBUILD 75608 2010-04-01 23:02:08Z giovanni $
+# $Id: PKGBUILD 134559 2011-08-05 19:15:39Z giovanni $
+# Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Kevin Piche <kevin@archlinux.org>
 
 pkgname=ettercap
 pkgver=NG_0.7.3
 _origver=NG-0.7.3
-pkgrel=15
+pkgrel=16
 pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
 arch=('i686' 'x86_64')
 url="http://ettercap.sourceforge.net/"
 license=('GPL')
-depends=('ncurses' 'openssl' 'libpcap>=1.0.0' 'zlib' 'pcre' 'libtool>=2.2.4' 'libnet')
-makedepends=('libnet')
+depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet')
+makedepends=('libnet' 'pkgconfig')
 options=(!libtool)
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$_origver.tar.gz
-	01_pointers_and_ints_dont_mix.diff)
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_origver}.tar.gz"
+        01_pointers_and_ints_dont_mix.diff)
 md5sums=('28fb15cd024162c55249888fe1b97820'
          'ad235cd90aaa3e168575d06efac4d862')
 
 build() {
   cd ${srcdir}/${pkgname}-${_origver}
+  unset LDFLAGS
 
-  export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-  patch -Np1 -i ${srcdir}/01_pointers_and_ints_dont_mix.diff || return 1
+  libtoolize --force --copy
+  aclocal
+  autoconf
 
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-plugins \
-      --enable-https --disable-gtk
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-  cd plug-ins
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  chmod 755 ${pkgdir}/usr/lib/ettercap/*
-  chmod 755 ${pkgdir}/usr/bin/ettercap
+  patch -Np1 -i ${srcdir}/01_pointers_and_ints_dont_mix.diff
+
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              --mandir=/usr/share/man \
+              --datarootdir=/usr/share \
+              --enable-plugins \
+              --enable-https \
+              --disable-gtk
+  sed -i 's/LTDL_SHLIB_EXT/\".so\"/' src/ec_plugins.c
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${_origver}
+
+  make DESTDIR=${pkgdir} install
 }
diff --git a/extra/krusader/PKGBUILD b/extra/krusader/PKGBUILD
index 413724c27..566054515 100644
--- a/extra/krusader/PKGBUILD
+++ b/extra/krusader/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 129545 2011-06-28 19:04:18Z andrea $
+# $Id: PKGBUILD 134530 2011-08-05 09:45:45Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
@@ -7,7 +7,7 @@
 pkgname=krusader
 pkgver=2.4.0beta1
 _pkgver=2.4.0-beta1
-pkgrel=3
+pkgrel=4
 pkgdesc="An alternative file manager for KDE resembling Midnight Commander"
 arch=('i686' 'x86_64')
 url="http://krusader.sourceforge.net/"
@@ -15,8 +15,9 @@ license=('GPL')
 depends=('kdebase-runtime' 'kdebase-lib')
 makedepends=('cmake' 'automoc4' 'docbook-xsl' 'kdeutils-ark')
 optdepends=("kdebase-keditbookmarks: to edit bookmarks"
+            "kdebase-kwrite: to edit/view files"
             "kdeutils-ark: extract archive with right-click")
-install=krusader.install
+install=${pkgname}.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2")
 md5sums=('d2340718d05d69e7f2a7f0846471ee12')
 
diff --git a/extra/libvpx/PKGBUILD b/extra/libvpx/PKGBUILD
index cbe82e07f..573747f4c 100644
--- a/extra/libvpx/PKGBUILD
+++ b/extra/libvpx/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 113551 2011-03-09 12:18:46Z ibiru $
+# $Id: PKGBUILD 134545 2011-08-05 13:19:02Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=libvpx
-pkgver=0.9.6
-pkgrel=2
+pkgver=0.9.7
+pkgrel=1
 pkgdesc="The VP8 Codec SDK"
 arch=('i686' 'x86_64')
 url="http://www.webmproject.org/"
@@ -10,11 +10,11 @@ license=('BSD')
 depends=('glibc')
 makedepends=('yasm')
 source=(http://webm.googlecode.com/files/${pkgname}-v${pkgver}.tar.bz2)
-sha1sums=('a3522bd2b73d52381ba767ded1cbf4760e9cc6f8')
+sha1sums=('639596df7182a93db83f61af8f5bb5b6a13dcf63')
 
 build() {
     cd "${srcdir}/${pkgname}-v${pkgver}"
-    ./configure --enable-vp8 \
+    ./configure --prefix=/usr --enable-vp8 \
         --enable-runtime-cpu-detect \
         --enable-shared \
         --enable-postproc \
@@ -28,5 +28,4 @@ package() {
     cd "${srcdir}/${pkgname}-v${pkgver}"
     make DIST_DIR="$pkgdir/usr" install
     install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-    chmod 644 "$pkgdir"/usr/include/vpx/*.h
 }
diff --git a/multilib/lib32-curl/PKGBUILD b/multilib/lib32-curl/PKGBUILD
index 48ab2a1b7..e082dac0f 100755
--- a/multilib/lib32-curl/PKGBUILD
+++ b/multilib/lib32-curl/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 36008 2010-12-25 14:36:29Z ibiru $
+# $Id: PKGBUILD 53559 2011-08-05 17:14:56Z bluewind $
 # Maintainer: Florian Pritz <flo@xssn.at>
 
 _pkgbasename=curl
 pkgname=lib32-$_pkgbasename
-pkgver=7.21.3
+pkgver=7.21.7
 pkgrel=1
 pkgdesc="An URL retrieval utility and library (32-bit)"
 arch=('x86_64')
 url="http://curl.haxx.se"
 license=('MIT')
-depends=('lib32-zlib' 'lib32-openssl' 'bash' 'ca-certificates' $_pkgbasename)
+depends=('lib32-zlib' 'lib32-openssl' 'bash' 'ca-certificates' 'lib32-libssh2' $_pkgbasename)
 makedepends=(gcc-multilib)
 options=('!libtool')
 source=("http://curl.haxx.se/download/${_pkgbasename}-${pkgver}.tar.bz2")
-md5sums=('5b57fee22090b5c43a6886fdd35af2ce')
+md5sums=('5f6d50c4d4ee38c57fe37e3cff75adbd')
 
 
 build() {
@@ -31,11 +31,12 @@ build() {
       --enable-ipv6 \
       --disable-ldaps \
       --disable-ldap \
-      --enable-manual \
+      --disable-manual \
       --enable-versioned-symbols \
-      --with-ca-path=/etc/ssl/certs \
+      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
       --without-libidn \
-      --libdir=/usr/lib32
+      --libdir=/usr/lib32 \
+      --enable-threaded-resolver
   make
 }
 
diff --git a/multilib/lib32-libssh2/PKGBUILD b/multilib/lib32-libssh2/PKGBUILD
new file mode 100644
index 000000000..963693b7b
--- /dev/null
+++ b/multilib/lib32-libssh2/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Florian Pritz <flo@xssn.at>
+# $Id: PKGBUILD 53557 2011-08-05 17:14:21Z bluewind $
+# Contributor: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: ice-man <icemanf@gmail.com>
+
+_pkgbasename=libssh2
+pkgname=lib32-$_pkgbasename
+pkgver=1.2.7
+pkgrel=2
+pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts (32-bit)"
+url="http://www.libssh2.org/"
+arch=('i686' 'x86_64')
+license=('BSD')
+depends=('openssl' $_pkgbasename)
+makedepends=('zlib' "gcc-multilib")
+options=('!libtool')
+source=("http://www.libssh2.org/download/${_pkgbasename}-${pkgver}.tar.gz")
+md5sums=('a5d78344886f1282e4008c09bf568076')
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd ${srcdir}/${_pkgbasename}-${pkgver}
+  ./configure --prefix=/usr --libdir=/usr/lib32
+  make
+}
+
+package() {
+  cd ${srcdir}/${_pkgbasename}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  rm -rf "${pkgdir}"/usr/{include,share,bin,sbin}
+  mkdir -p "$pkgdir/usr/share/licenses"
+  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+}
diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD
index 735e35d1c..0c98b6962 100644
--- a/multilib/wine/PKGBUILD
+++ b/multilib/wine/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 52371 2011-07-23 22:28:40Z svenstaro $
+# $Id: PKGBUILD 53566 2011-08-05 19:08:11Z bluewind $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=wine
-pkgver=1.3.25
+pkgver=1.3.26
 pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
 source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
-md5sums=('15471f78fee9d211c63381da815cbfb6')
+md5sums=('92ea09eb11aec92672671853ce9b792b')
 
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
@@ -46,7 +46,6 @@ makedepends=(autoconf ncurses bison perl fontforge flex prelink
   lcms            lib32-lcms
   mpg123          lib32-mpg123
   openal          lib32-openal
-  jack            lib32-jack
   libcups         lib32-libcups
   gnutls          lib32-gnutls
   v4l-utils       lib32-v4l-utils
@@ -61,7 +60,6 @@ optdepends=(
   libxml2         lib32-libxml2
   mpg123          lib32-mpg123
   openal          lib32-openal
-  jack            lib32-jack
   libcups         lib32-libcups
   gnutls          lib32-gnutls
   v4l-utils       lib32-v4l-utils