From c7fd3b08e227a739803d62e0bb3033ebe65da775 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 17 Sep 2011 23:14:43 +0000 Subject: Sat Sep 17 23:14:43 UTC 2011 --- extra/ffmpeg/PKGBUILD | 6 +- extra/garcon/PKGBUILD | 9 ++- extra/glade/PKGBUILD | 4 +- extra/glib-networking/PKGBUILD | 11 ++-- .../fix_G_TLS_ERROR_EOF_handling.patch | 73 ++++++++++++++++++++++ extra/gtk-vnc/PKGBUILD | 4 +- extra/lftp/PKGBUILD | 8 +-- extra/libgpod/PKGBUILD | 4 +- extra/libxfce4util/PKGBUILD | 10 +-- extra/mysql/PKGBUILD | 8 +-- extra/nss/PKGBUILD | 18 +----- extra/pygtk/PKGBUILD | 4 +- extra/python-numpy/PKGBUILD | 6 +- extra/xfce4-session/PKGBUILD | 17 +++-- extra/xfdesktop/PKGBUILD | 13 ++-- 15 files changed, 125 insertions(+), 70 deletions(-) create mode 100644 extra/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch (limited to 'extra') diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 8fa929967..3b1a20146 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137654 2011-09-10 10:56:29Z pierre $ +# $Id: PKGBUILD 138105 2011-09-16 14:11:53Z ibiru $ # Maintainer : Ionut Biru # Contributor: Tom Newsom # Contributor: Paul Mattal pkgname=ffmpeg -pkgver=20110910 +pkgver=20110916 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' ' makedepends=('yasm' 'git') #git clone git://git.videolan.org/ffmpeg.git source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz) -md5sums=('f726ae21f9c12551603d8a9cf301280a') +md5sums=('d065a16866c9bcf4d06c5452b2fbdc56') build() { cd "$srcdir/$pkgname" diff --git a/extra/garcon/PKGBUILD b/extra/garcon/PKGBUILD index 8f4b2c5c9..00c56c1d3 100644 --- a/extra/garcon/PKGBUILD +++ b/extra/garcon/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 127908 2011-06-19 16:23:50Z andyrtr $ +# $Id: PKGBUILD 138123 2011-09-17 02:21:25Z allan $ # Maintainer: AndyRTR # Contributor: Xavier Devlamynck pkgname=garcon -pkgver=0.1.8 +pkgver=0.1.9 pkgrel=1 pkgdesc="implementation of the freedesktop.org menu specification" arch=('i686' 'x86_64') license=('LGPL') url="http://wiki.xfce.org/dev/garcon" groups=('xfce4') -depends=('glib2') # 'perl') +depends=('glib2' 'libxfce4util') # 'perl') makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools>=4.7.4') -conflicts=('garcon-git') replaces=('libxfce4menu') options=('!libtool' '!makeflags') source=(http://archive.xfce.org/src/libs/garcon/0.1/garcon-${pkgver}.tar.bz2) -md5sums=('18fbf523ed2865dfaccdfb40b4b20b05') +md5sums=('a3ca1e54ad731c98f688900f6398fc20') build() { cd ${srcdir}/garcon-${pkgver} diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD index 352bfef15..e385b2c32 100644 --- a/extra/glade/PKGBUILD +++ b/extra/glade/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 118419 2011-04-06 17:54:27Z ibiru $ +# $Id: PKGBUILD 138085 2011-09-16 07:41:36Z ibiru $ # Maintainer: Douglas Soares de Andrade pkgname=glade @@ -8,7 +8,7 @@ pkgdesc="User interface builder for GTK+ and GNOME." arch=(i686 x86_64) license=('GPL' 'LGPL') depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'pygobject-devel') +makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'pygobject2-devel') optdepends=('python2: Python widgets support') options=('!libtool') url="http://glade.gnome.org/" diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index d6f4c744e..42253c635 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 135780 2011-08-18 15:04:08Z andyrtr $ +# $Id: PKGBUILD 138109 2011-09-16 18:27:00Z ibiru $ # Maintainer: Jan "heftig" Steffens pkgname=glib-networking pkgver=2.28.7 -pkgrel=4 +pkgrel=5 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -12,13 +12,16 @@ makedepends=('intltool') options=('!libtool') install=glib-networking.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2 - glib-networking-2.29.9-port-gnutls3-API.patch) + glib-networking-2.29.9-port-gnutls3-API.patch + fix_G_TLS_ERROR_EOF_handling.patch) sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c' - '101daf107773f84d08d7ab55a354875e2e021c3b5dd3cdc259fb544f94a8beee') + '101daf107773f84d08d7ab55a354875e2e021c3b5dd3cdc259fb544f94a8beee' + '286d64a121cb987866b51af70f55d47bafc5bf60e813aa1412dce51e426cc553') build() { cd "$srcdir/$pkgname-$pkgver" patch -Np0 -i "$srcdir/glib-networking-2.29.9-port-gnutls3-API.patch" + patch -Np1 -i "$srcdir/fix_G_TLS_ERROR_EOF_handling.patch" ./configure \ --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/glib-networking --disable-static diff --git a/extra/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch b/extra/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch new file mode 100644 index 000000000..c26f422aa --- /dev/null +++ b/extra/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch @@ -0,0 +1,73 @@ +From 9e2aaacafb45d51cff57dc033f4b5ad5bc1a1762 Mon Sep 17 00:00:00 2001 +From: Dan Winship +Date: Fri, 16 Sep 2011 15:29:29 +0000 +Subject: gnutls: fix G_TLS_ERROR_EOF handling with gnutls 3.0 + +gnutls 3.0 has a new error code for "peer closed connection without +sending a Close packet", so add some #ifdefs to do the right thing +with either 2.x or 3.x. + +https://bugzilla.gnome.org/show_bug.cgi?id=659233 +--- +diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c +index c1ede79..0f792bb 100644 +--- a/tls/gnutls/gtlsconnection-gnutls.c ++++ b/tls/gnutls/gtlsconnection-gnutls.c +@@ -132,7 +132,10 @@ struct _GTlsConnectionGnutlsPrivate + + GError *error; + GCancellable *cancellable; +- gboolean blocking, eof; ++ gboolean blocking; ++#ifndef GNUTLS_E_PREMATURE_TERMINATION ++ gboolean eof; ++#endif + GIOCondition internal_direction; + }; + +@@ -548,19 +551,22 @@ end_gnutls_io (GTlsConnectionGnutls *gnutls, + gnutls->priv->need_handshake = TRUE; + return status; + } +- else if (status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH) ++ else if ( ++#ifdef GNUTLS_E_PREMATURE_TERMINATION ++ status == GNUTLS_E_PREMATURE_TERMINATION ++#else ++ status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH && gnutls->priv->eof ++#endif ++ ) + { +- if (gnutls->priv->eof) ++ if (gnutls->priv->require_close_notify) + { +- if (gnutls->priv->require_close_notify) +- { +- g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF, +- _("TLS connection closed unexpectedly")); +- return status; +- } +- else +- return 0; ++ g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF, ++ _("TLS connection closed unexpectedly")); ++ return status; + } ++ else ++ return 0; + } + + return status; +@@ -795,8 +801,10 @@ g_tls_connection_gnutls_pull_func (gnutls_transport_ptr_t transport_data, + + if (ret < 0) + set_gnutls_error (gnutls, G_IO_IN); ++#ifndef GNUTLS_E_PREMATURE_TERMINATION + else if (ret == 0) + gnutls->priv->eof = TRUE; ++#endif + + return ret; + } +-- +cgit v0.9.0.2 diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD index bccf58f72..5dc117c4f 100644 --- a/extra/gtk-vnc/PKGBUILD +++ b/extra/gtk-vnc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135784 2011-08-18 15:04:13Z andyrtr $ +# $Id: PKGBUILD 138088 2011-09-16 07:43:49Z ibiru $ # Maintainer: # Contributor: Jan de Groot # Contributor: Allan McRae @@ -13,7 +13,7 @@ url="http://live.gnome.org/gtk-vnc" license=('LGPL') depends=('gtk3') optdepends=('gtk2: GTK2 widget') -makedepends=('intltool' 'pygtk' 'pygobject-devel' 'gtk-doc' 'gtk2') +makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) sha256sums=('b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377') diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index 2883bbcc7..802be8df5 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135786 2011-08-18 15:04:15Z andyrtr $ +# $Id: PKGBUILD 138121 2011-09-17 02:03:36Z allan $ # Maintainer: Andreas Radke # Contributor: Aaron Griffin pkgname=lftp -pkgver=4.3.1 -pkgrel=2 +pkgver=4.3.2 +pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64') license=('GPL3') @@ -14,7 +14,7 @@ makedepends=('autoconf') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ea45acfb47b5590d4675c50dc0c6e13c') +md5sums=('18f5c5b351cfad0a0ab069592effd664') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD index 2c6a4f74d..18e28d3e2 100644 --- a/extra/libgpod/PKGBUILD +++ b/extra/libgpod/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135794 2011-08-18 15:04:25Z andyrtr $ +# $Id: PKGBUILD 138079 2011-09-16 07:31:23Z ibiru $ # Maintainer: Daniel Isenmann # Contributor: William Rea @@ -9,7 +9,7 @@ pkgdesc="A shared library to access the contents of an iPod" arch=(i686 x86_64) license=('LGPL') depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice') -makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject-devel' 'gtk-sharp-2') +makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2') optdepends=('gtk-sharp-2: Mono bindings') url="http://www.gtkpod.org/libgpod/" source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/libxfce4util/PKGBUILD b/extra/libxfce4util/PKGBUILD index fb95fda85..ccfd512e8 100644 --- a/extra/libxfce4util/PKGBUILD +++ b/extra/libxfce4util/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 124279 2011-05-18 16:40:43Z andyrtr $ +# $Id: PKGBUILD 138125 2011-09-17 02:23:22Z allan $ # Maintainer: AndyRTR # Contributor: tobias pkgname=libxfce4util -pkgver=4.8.1 -pkgrel=2 +pkgver=4.8.2 +pkgrel=1 pkgdesc="Basic utility non-GUI functions for Xfce" arch=('i686' 'x86_64') license=('GPL2') url="http://www.xfce.org/" -depends=("glib2") +depends=('glib2') makedepends=('pkgconfig' 'intltool' 'gtk-doc') options=('!libtool') source=(http://archive.xfce.org/src/xfce/libxfce4util/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2be3af4c7db5ad293a7525e1021e6f0f') +md5sums=('3376a77637a4292a863027d595548ee2') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index a3a8f726c..53403fbbd 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 133474 2011-07-28 13:52:29Z andrea $ +# $Id: PKGBUILD 138094 2011-09-16 08:53:20Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Douglas Soares de Andrade # Contributor: judd pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.15 +pkgver=5.5.16 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') @@ -15,7 +15,7 @@ options=('!libtool') source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld' 'my.cnf') -md5sums=('306b5549c7bd72e8e705a890db0da82b' +md5sums=('462ab3752dd666ec06ca32f92673b59e' '2234207625baa29b2ff7d7b4f088abce' '1c949c0dbea5206af0db14942d9927b6') @@ -95,7 +95,7 @@ package_mysql-clients(){ done # provided by mysql - rm "${pkgdir}"/usr/bin/{mysql_upgrade,mysqlbinlog,mysqltest} + rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest} } package_mysql(){ diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index 71d6f37da..e02510821 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136639 2011-08-31 10:15:56Z jgc $ +# $Id: PKGBUILD 138102 2011-09-16 12:01:21Z ibiru $ # Maintainer: Jan de Groot pkgname=nss @@ -25,7 +25,7 @@ md5sums=('ca0ca058380be200cf247ea2496b5352' 'c547b030c57fe1ed8b77c73bf52b3ded' '46bee81908f1e5b26d6a7a2e14c64d9f' 'bbd7d8a8e2f6ffc8b3e5f6614e5f3ccf' - 'f8690c4cfef46b2796026581db15b4ea' + 'ba2357c5b9881bfd7d54b037954ba0ff' 'd83c7b61abb7e9f8f7bcd157183d1ade') build() { @@ -104,17 +104,3 @@ package() { install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/" } -md5sums=('ca0ca058380be200cf247ea2496b5352' - 'e5c97db0c884d5f4cfda21e562dc9bba' - 'c547b030c57fe1ed8b77c73bf52b3ded' - '46bee81908f1e5b26d6a7a2e14c64d9f' - 'bbd7d8a8e2f6ffc8b3e5f6614e5f3ccf' - 'f8690c4cfef46b2796026581db15b4ea' - 'd83c7b61abb7e9f8f7bcd157183d1ade') -md5sums=('ca0ca058380be200cf247ea2496b5352' - 'e5c97db0c884d5f4cfda21e562dc9bba' - 'c547b030c57fe1ed8b77c73bf52b3ded' - '46bee81908f1e5b26d6a7a2e14c64d9f' - 'bbd7d8a8e2f6ffc8b3e5f6614e5f3ccf' - 'ba2357c5b9881bfd7d54b037954ba0ff' - 'd83c7b61abb7e9f8f7bcd157183d1ade') diff --git a/extra/pygtk/PKGBUILD b/extra/pygtk/PKGBUILD index bc7c56efa..da57d172a 100644 --- a/extra/pygtk/PKGBUILD +++ b/extra/pygtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 131736 2011-07-14 11:07:45Z stephane $ +# $Id: PKGBUILD 138082 2011-09-16 07:34:35Z ibiru $ # Maintainer: Jan de Groot # Contributor: Sarah Hay @@ -9,7 +9,7 @@ pkgdesc="Python bindings for the GTK widget set" arch=('i686' 'x86_64') license=('LGPL') depends=('libglade' 'python2-cairo' 'pygobject') -makedepends=('python2-numpy' 'pygobject-devel') +makedepends=('python2-numpy' 'pygobject2-devel') optdepends=('python2-numpy') options=('!libtool') url="http://www.pygtk.org/" diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD index 699137cf6..81c6953e0 100755 --- a/extra/python-numpy/PKGBUILD +++ b/extra/python-numpy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 131668 2011-07-13 13:42:02Z stephane $ +# $Id: PKGBUILD 138131 2011-09-17 03:10:10Z allan $ # Maintainer: Jan de Groot # Contributor: Douglas Soares de Andrade # Contributor: Angel 'angvp' Velasquez pkgbase=python-numpy pkgname=('python2-numpy' 'python-numpy') -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 pkgdesc="Scientific tools for Python" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('custom') url="http://numpy.scipy.org/" makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose') source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz) -md5sums=('e0993c74cb8e83292e560eac1a9be8e9') +md5sums=('2bce18c08fc4fce461656f0f4dd9103e') build() { cd "${srcdir}" diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD index f8179e2e3..b8d7b5de0 100644 --- a/extra/xfce4-session/PKGBUILD +++ b/extra/xfce4-session/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 136121 2011-08-23 06:05:20Z eric $ +# $Id: PKGBUILD 138127 2011-09-17 02:26:42Z allan $ # Maintainer: AndyRTR # Contributor: tobias pkgname=xfce4-session -pkgver=4.8.1 -pkgrel=3 +pkgver=4.8.2 +pkgrel=1 pkgdesc="A session manager for Xfce" arch=('i686' 'x86_64') license=('GPL2') @@ -22,17 +22,14 @@ options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2 org.freedesktop.consolekit.pkla - org.freedesktop.upower.pkla - gdm.patch) -md5sums=('478080ff666fdd36786a243829663efd' + org.freedesktop.upower.pkla) +md5sums=('48780cbcf784ab64debc9312f17765f2' '2e2519950d8c591dc9440ed8957a49ed' - '5fa270637b5e685f033863d8664795a2' - '61423d0e235cad7ffcbbdacc96c9151b') + '5fa270637b5e685f033863d8664795a2') build() { cd ${srcdir}/${pkgname}-${pkgver} - # fix usage with gdm and custom langs https://bugs.archlinux.org/task/24327 - patch -Np1 -i ${srcdir}/gdm.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/xfce4 \ diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD index b0a502474..e4853d4c5 100644 --- a/extra/xfdesktop/PKGBUILD +++ b/extra/xfdesktop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135949 2011-08-20 21:30:39Z eric $ +# $Id: PKGBUILD 138129 2011-09-17 02:28:33Z allan $ # Maintainer: AndyRTR # Contributor: tobias pkgname=xfdesktop -pkgver=4.8.2 -pkgrel=3 +pkgver=4.8.3 +pkgrel=1 pkgdesc="A desktop manager for Xfce" arch=('i686' 'x86_64') license=('GPL2') @@ -17,14 +17,11 @@ conflicts=('xfce4-menueditor') replaces=('xfce4-menueditor') options=('!libtool') install=xfdesktop.install -source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2 - fix-desktop-drag-and-drop.patch) -md5sums=('ed25d59f478afda552d121e96657d16f' - '86d464bcd8ffae9f048454f49603658a') +source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) +md5sums=('617c667c469698e8c974e38412cb484c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../fix-desktop-drag-and-drop.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ -- cgit v1.2.3-54-g00ecf