Wed Jul 20 23:12:48 UTC 2011

8 files changed, 57 insertions, 30 deletions

diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 6455c3d0f..cfa168116 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 132002 2011-07-18 22:19:52Z bisson $
+# $Id: PKGBUILD 132051 2011-07-19 15:33:15Z 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=2
+pkgrel=3
 pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality'
 arch=('i686' 'x86_64')
 url='http://audacious-media-player.org/'
diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD
index a43010488..0d2cea023 100644
--- a/extra/freeciv/PKGBUILD
+++ b/extra/freeciv/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 115046 2011-03-16 15:19:54Z eric $
+# $Id: PKGBUILD 132082 2011-07-19 22:17:46Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=freeciv
-pkgver=2.2.5
+pkgver=2.2.7
 pkgrel=1
 pkgdesc="A multiuser clone of the famous Microprose game of Civilization"
 arch=('i686' 'x86_64')
 url="http://www.freeciv.org/"
 license=('GPL')
-depends=('gtk2' 'sdl_mixer' 'readline' 'bzip2')
+depends=('gtk2' 'sdl_mixer' 'bzip2' 'hicolor-icon-theme')
 options=('!libtool')
 install=freeciv.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e717de02c77139593f21b930245d1709')
-sha1sums=('b204c4ae581be632fd2385517ada62558d48e702')
+md5sums=('db61c36222ad0bd1de233cf29226ff27')
+sha1sums=('b7cf680a25e9006cb3a289a2e5c786dd385577cb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index c4757a5df..e8fdbdff1 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124848 2011-05-24 19:25:12Z giovanni $
+# $Id: PKGBUILD 132036 2011-07-19 10:15:48Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=gparted
-pkgver=0.8.1
+pkgver=0.9.0
 pkgrel=1
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64')
@@ -21,7 +21,7 @@ optdepends=('e2fsprogs: for ext2/ext3 partitions'
             'gpart: for recovering corrupt partition tables')
 install=gparted.install
 source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ba3a434a259ae2ddcfc7f7488ee648ef')
+md5sums=('56ec9c80413ba2d8ad0193bfc2b5a99f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/iperf/PKGBUILD b/extra/iperf/PKGBUILD
index d37cd1c6c..e07fa4562 100644
--- a/extra/iperf/PKGBUILD
+++ b/extra/iperf/PKGBUILD
@@ -1,25 +1,35 @@
-# $Id: PKGBUILD 86402 2010-08-01 10:53:45Z giovanni $
+# $Id: PKGBUILD 132026 2011-07-19 09:15:09Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=iperf
 pkgver=2.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool to measure maximum TCP bandwidth"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://iperf.sourceforge.net"
-depends=(gcc-libs)
+depends=('gcc-libs')
 source=(http://downloads.sourceforge.net/iperf/iperf-2.0.5.tar.gz
-	license)
+	license
+        client.cpp.patch)
 md5sums=('44b5536b67719f4250faed632a3cd016'
-         'a2879f900b76668b28a1cc922909db18')
+         'a2879f900b76668b28a1cc922909db18'
+         '82ce63c87cc8bb2f0f94069857ac14a9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # FS#25159
+  patch -Np1 -i ${srcdir}/client.cpp.patch
+
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -Dm644 ${srcdir}/license "${pkgdir}/usr/share/licenses/iperf/LICENSE" || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 ${srcdir}/license "${pkgdir}/usr/share/licenses/iperf/LICENSE"
 }
diff --git a/extra/iperf/client.cpp.patch b/extra/iperf/client.cpp.patch
new file mode 100644
index 000000000..85f89e765
--- /dev/null
+++ b/extra/iperf/client.cpp.patch
@@ -0,0 +1,17 @@
+--- a/src/Client.cpp	2010-04-01 22:23:17.000000000 +0200
++++ b/src/Client.cpp	2011-07-19 11:03:42.000000000 +0200
+@@ -212,10 +212,10 @@
+     char* readAt = mBuf;
+ 
+ #if HAVE_THREAD
+-    if ( !isUDP( mSettings ) ) {
+-	RunTCP();
+-	return;
+-    }
++//    if ( !isUDP( mSettings ) ) {
++//	RunTCP();
++//	return;
++//    }
+ #endif
+     
+     // Indicates if the stream is readable 
diff --git a/extra/pyopenssl/PKGBUILD b/extra/pyopenssl/PKGBUILD
index 6197ba57a..f8b192ac5 100644
--- a/extra/pyopenssl/PKGBUILD
+++ b/extra/pyopenssl/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 110679 2011-02-21 13:19:09Z stephane $
+# $Id: PKGBUILD 132041 2011-07-19 13:27:24Z ibiru $
 # Maintainer : Ionut Biru<ibiru@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgbase=pyopenssl
 pkgname=('pyopenssl' 'python2-pyopenssl')
-pkgver=0.11
-pkgrel=2
+pkgver=0.12
+pkgrel=1
 arch=('i686' 'x86_64')
 url="https://launchpad.net/pyopenssl/"
 license=('LGPL2.1')
 makedepends=('python' 'python2' 'openssl')
-source=(http://launchpad.net/${pkgname}/main/${pkgver}/+download/pyOpenSSL-${pkgver}.tar.gz)
-md5sums=('9e76e57e00fa48745fcfe23944db1e6c')
+source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz)
+md5sums=('60a7bbb6160950823eddcbba2cbcb0d6')
 
 build() {
     cd "${srcdir}"
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 654c7d390..7dc877239 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 131876 2011-07-16 10:50:22Z giovanni $
+# $Id: PKGBUILD 132018 2011-07-19 08:30:36Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=1.1.11
-pkgrel=1
+pkgrel=2
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('GPL')
-depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio'
+depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
          'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
          'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
          'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
          'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
          'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
-makedepends=('avahi' 'pkgconfig' 'libxpm' 'live-media' 'libnotify'
+makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify'
              'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
              'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
              'lirc-utils' 'gnutls' 'libcaca')
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index eac2509d0..c7925666d 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127256 2011-06-11 21:34:35Z guillaume $
+# $Id: PKGBUILD 132077 2011-07-19 20:50:29Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume at alaux dot net>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=(wireshark-cli wireshark-gtk)
 pkgbase=wireshark
-pkgver=1.6.0
+pkgver=1.6.1
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -11,7 +11,7 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'lu
 url="http://www.wireshark.org/"
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('9f9314c89bf1c8b440a7909884838cfd')
+md5sums=('dc1e8c9800b64130674b120a183e2308')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"