Sat Aug 13 23:14:28 UTC 2011

8 files changed, 37 insertions, 36 deletions

diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 95f3bab04..ecf4e4c7c 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 132306 2011-07-22 16:28:25Z bisson $
+# $Id: PKGBUILD 135326 2011-08-12 20:59:31Z bisson $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=audacious
-pkgver=3.0
-pkgrel=5
+pkgver=3.0.1
+pkgrel=1
 pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality'
 arch=('i686' 'x86_64')
 url='http://audacious-media-player.org/'
@@ -13,7 +13,7 @@ license=('GPL3')
 depends=('gtk3' 'libmcs' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme')
 optdepends=('unzip: zipped skins support')
 source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('d32de719f5b09440d0f6c802a5140a32b3827475')
+sha1sums=('1532fce78702da80418d940dea96b857b75c1f9e')
 
 provides=('audacious-player')
 replaces=('audacious-player')
diff --git a/extra/ettercap/01_pointers_and_ints_dont_mix.diff b/extra/ettercap/01_pointers_and_ints_dont_mix.diff
index bf7022266..65571309c 100644
--- a/extra/ettercap/01_pointers_and_ints_dont_mix.diff
+++ b/extra/ettercap/01_pointers_and_ints_dont_mix.diff
@@ -1,12 +1,13 @@
 See debian bug #521857, patch from Timothy Redaelli <timothy@redaelli.eu>
+Revised by Robert Edmonds <edmonds@debian.org>
 
---- ettercap-0.7.3.orig/src/protocols/ec_tcp.c
-+++ ettercap-0.7.3/src/protocols/ec_tcp.c
+--- a/src/protocols/ec_tcp.c
++++ b/src/protocols/ec_tcp.c
 @@ -116,7 +116,7 @@
     tcp = (struct tcp_header *)DECODE_DATA;
     
     opt_start = (u_char *)(tcp + 1);
 -   opt_end = (u_char *)((int)tcp + tcp->off * 4);
-+   opt_end = (u_char *)(tcp + tcp->off * 4);
++   opt_end = (u_char *)(((u_char *)tcp) + tcp->off * 4);
  
     DECODED_LEN = (u_int32)(tcp->off * 4);
diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD
index 0d88722b6..fcba9b8b4 100644
--- a/extra/ettercap/PKGBUILD
+++ b/extra/ettercap/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 134606 2011-08-06 11:42:31Z giovanni $
+# $Id: PKGBUILD 135334 2011-08-12 21:28:33Z giovanni $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ettercap
 pkgver=NG_0.7.3
 _origver=NG-0.7.3
-pkgrel=17
+pkgrel=18
 pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
 arch=('i686' 'x86_64')
 url="http://ettercap.sourceforge.net/"
@@ -18,8 +18,8 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_origver}.tar.
         01_pointers_and_ints_dont_mix.diff
         ettercap-NG-0.7.3_dns_support_on_x86_64.patch)
 md5sums=('28fb15cd024162c55249888fe1b97820'
-         'ad235cd90aaa3e168575d06efac4d862'
-         'f3d66186eece056a6d71453f9f288623')
+         'c8f2b004f69ac3522ffebb530478b324'
+         'd44f80292afcefdc13cba9a30c6391d6')
 
 build() {
   cd ${srcdir}/${pkgname}-${_origver}
diff --git a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch b/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch
index ed455a878..1754f2e3d 100644
--- a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch
+++ b/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch
@@ -14,7 +14,7 @@
  
  else
 -   if false; then
-+if true; then
++   if true; then
    HAVE_DN_EXPAND_TRUE=
    HAVE_DN_EXPAND_FALSE='#'
  else
diff --git a/extra/java-commons-daemon/PKGBUILD b/extra/java-commons-daemon/PKGBUILD
index 91d32fd90..2f98df6db 100644
--- a/extra/java-commons-daemon/PKGBUILD
+++ b/extra/java-commons-daemon/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 pkgname=('java-commons-daemon' 'java-jsvc')
 pkgbase=java-commons-daemon
-pkgver=1.0.5
+pkgver=1.0.6
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://commons.apache.org/daemon/"
 license=('APACHE')
 _libname=commons-daemon
 source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz)
-md5sums=('2fe0a35d4a9c0338ecd45dad20f33662')
+md5sums=('28dc2e0a3634b2dc3605e9e6444d079f')
 makedepends=('apache-ant' 'docbook2x' 'docbook-xsl')
 
 
@@ -25,7 +25,7 @@ build() {
 }
 
 package_java-commons-daemon() {
-  pkgdesc="Set of Apache libraries for making Java applications run on UNIX more easily"
+  pkgdesc="Alternative invocation mechanism for unix-daemon-like java code"
   depends=('java-runtime')
 
   cd "${srcdir}/${_libname}-${pkgver}-src"
@@ -40,7 +40,6 @@ package_java-jsvc() {
   pkgdesc="Apache application for making Java applications run on UNIX more easily"
   depends=("java-${_libname}" 'libcap')
 
-  # jsvc
   cd "${srcdir}/${_libname}-${pkgver}-src/src/native/unix"
 
   install -Dm755 jsvc ${pkgdir}/usr/bin/jsvc
diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD
index 04b21679e..29a67fc6d 100644
--- a/extra/qemu-kvm/PKGBUILD
+++ b/extra/qemu-kvm/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 126938 2011-06-08 20:01:54Z tpowa $
+# $Id: PKGBUILD 135290 2011-08-12 09:22:48Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu-kvm
-pkgver=0.14.1
-pkgrel=2
+pkgver=0.15.0
+pkgrel=1
 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=(i686 x86_64)
 license=('GPL2' 'LGPL2.1')
 url="http://www.linux-kvm.org"
-depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'esound' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng')
-makedepends=('texi2html' 'perl')
+depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng')
+makedepends=('texi2html' 'perl' 'python2')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu-kvm.install
 conflicts=('qemu')
@@ -23,8 +23,9 @@ build()
     cd ${srcdir}/${pkgname}-${pkgver}
     # fix esound building
     ./configure --prefix=/usr \
+                --python=/usr/bin/python2 \
                 --sysconfdir=/etc \
-                --audio-drv-list=alsa,sdl,oss,esd \
+                --audio-drv-list=alsa,sdl,oss \
                 --audio-card-list=ac97,sb16,es1370,hda \
                 --enable-docs
     make
@@ -53,5 +54,5 @@ package()
       esac
     done
 }
-md5sums=('ed37a2c0b1981220b842920140574c63'
+md5sums=('b45b0deebba4ce47dcaaab3807f6ed47'
          'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index c1ed81cf3..ea74ed99a 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 124178 2011-05-17 13:06:59Z tpowa $
+# $Id: PKGBUILD 135285 2011-08-12 09:21:08Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
-pkgver=0.14.1
+pkgver=0.15.0
 pkgrel=1
-pkgdesc="QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
+pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
 url="http://wiki.qemu.org/Index.html"
-makedepends=('texi2html' 'perl')
-depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'esound' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl')
+makedepends=('texi2html' 'perl' 'python2')
+depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu.install
-source=(http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz
+source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz
         65-kvm.rules)
 options=(!strip)
 
@@ -19,10 +19,10 @@ build()
 {
   cd ${srcdir}/${pkgname}-${pkgver}
   sed -i -e 's/lib64/lib/g' x86_64.ld
-  ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,esd \
+  ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl \
+              --python=/usr/bin/python2 \
               --audio-card-list=ac97,sb16,es1370,hda \
-              --enable-docs \
-              --kerneldir="/usr/src/linux-$(uname -r)"
+              --enable-docs
               make
 }
 
@@ -40,5 +40,5 @@ package() {
     done
 
 }
-md5sums=('b6c713a8db638e173af53a62d5178640'
+md5sums=('dbc55b014bcd21b98e347f6a90f7fb6d'
          'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/extra/sdl/PKGBUILD b/extra/sdl/PKGBUILD
index 46ed5bfdd..e238ef068 100644
--- a/extra/sdl/PKGBUILD
+++ b/extra/sdl/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 99967 2010-11-19 16:37:58Z heftig $
+# $Id: PKGBUILD 135310 2011-08-12 14:45:48Z ibiru $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=sdl
 pkgver=1.2.14
-pkgrel=6
+pkgrel=7
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
 arch=('i686' 'x86_64')
 url="http://www.libsdl.org"
 license=('LGPL')
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
-makedepends=('alsa-lib' 'esound' 'mesa' 'libpulse')
+makedepends=('alsa-lib' 'mesa' 'libpulse')
 options=('!libtool')
 source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
         sdl-1.2.14-joystick-crash.diff