From 817e58c278cb8ebee7743205877d0f67c431fcec Mon Sep 17 00:00:00 2001 From: root Date: Thu, 5 Jan 2012 23:14:48 +0000 Subject: Thu Jan 5 23:14:48 UTC 2012 --- extra/audacious/PKGBUILD | 8 +++---- extra/cvs/PKGBUILD | 24 +++++++++++--------- extra/cvs/cvs-1.11.19-extzlib.patch | 44 +++++++++++++++++++++++++++++++++++++ extra/gcin/PKGBUILD | 6 ++--- extra/gedit/PKGBUILD | 6 ++--- extra/glib-networking/PKGBUILD | 10 ++++----- 6 files changed, 73 insertions(+), 25 deletions(-) create mode 100644 extra/cvs/cvs-1.11.19-extzlib.patch (limited to 'extra') diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 1f8957f6a..28686cfd4 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 144890 2011-12-09 03:35:28Z bisson $ +# $Id: PKGBUILD 146058 2012-01-04 19:41:50Z bisson $ # Contributor: Alexander Fehr # Contributor: Giovanni Scafora # Maintainer: Gaetan Bisson pkgname=audacious -pkgver=3.1.1 +pkgver=3.1.2 pkgrel=1 pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality' url='http://audacious-media-player.org/' @@ -13,8 +13,8 @@ arch=('i686' 'x86_64') depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils') optdepends=('unzip: zipped skins support') -source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('fa5629d68ac1b12d563e8c0b4be083dea7c7924c') +source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('ebaaefcfa291a1f97d2dae1b2d7f0cacb545dc7f') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/cvs/PKGBUILD b/extra/cvs/PKGBUILD index 76f71a2a1..971e0d498 100644 --- a/extra/cvs/PKGBUILD +++ b/extra/cvs/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 121072 2011-04-28 22:54:58Z stephane $ +# $Id: PKGBUILD 146046 2012-01-04 17:18:48Z dan $ # Contributor: dorphell pkgname=cvs pkgver=1.11.23 -pkgrel=7 +pkgrel=8 pkgdesc="Concurrent Versions System - a source control system" arch=(i686 x86_64) -url="http://cvs.nongnu.org" +url="http://cvs.nongnu.org/" license=('GPL') -depends=('krb5') -optdepends=('openssh: for using cvs over ssh' 'inetutils: for using cvs over rsh') +depends=('krb5' 'zlib') +optdepends=('openssh: for using cvs over ssh' + 'inetutils: for using cvs over rsh') install=cvs.install source=(ftp://ftp.gnu.org/non-gnu/cvs/source/stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - cvs-1.11.23-getline64.patch + cvs-1.11.19-extzlib.patch + cvs-1.11.23-getline64.patch cvs-1.11.23-cve-2010-3846.patch) sha256sums=('400f51b59d85116e79b844f2d5dbbad4759442a789b401a94aa5052c3d7a4aa9' + '0587ac3753d1257fa6d22557fa077178ee1ec004178c0a0348720e8171b1e942' '9126d7992ace943980ad8a10d5a09aeb6f1eeeb9b921fc796fe31de7b1c220cf' 'c6506d0a5efc7b0cab6415f26e070ec214fb9781fac8d295506f4d0825431a8f') @@ -22,11 +25,12 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" unset EDITOR VISUAL - patch -Np1 -i ../cvs-1.11.23-getline64.patch - - # CVE-2010-3864, see https://www.redhat.com/security/data/cve/CVE-2010-3846.html - patch -Np1 -i ../cvs-1.11.23-cve-2010-3846.patch + patch -Np1 < ../cvs-1.11.19-extzlib.patch + patch -Np1 < ../cvs-1.11.23-getline64.patch + # CVE-2010-3864, https://www.redhat.com/security/data/cve/CVE-2010-3846.html + patch -Np1 < ../cvs-1.11.23-cve-2010-3846.patch + autoreconf ./configure --prefix=/usr make } diff --git a/extra/cvs/cvs-1.11.19-extzlib.patch b/extra/cvs/cvs-1.11.19-extzlib.patch new file mode 100644 index 000000000..9a8506da3 --- /dev/null +++ b/extra/cvs/cvs-1.11.19-extzlib.patch @@ -0,0 +1,44 @@ +--- cvs-1.11.19/configure.in.old.old4 2005-02-01 00:10:49.000000000 +0100 ++++ cvs-1.11.19/configure.in 2005-02-28 13:27:10.000000000 +0100 +@@ -1040,8 +1040,8 @@ + tools/Makefile \ + vms/Makefile \ + windows-NT/Makefile \ +- windows-NT/SCC/Makefile \ +- zlib/Makefile]) ++ windows-NT/SCC/Makefile ++ ]) + + dnl and we're done + AC_OUTPUT +--- cvs-1.11.19/Makefile.am.old.old4 2004-11-11 23:30:36.000000000 +0100 ++++ cvs-1.11.19/Makefile.am 2005-02-28 13:25:32.000000000 +0100 +@@ -17,7 +17,7 @@ + ## Subdirectories to run make in for the primary targets. + # Unix source subdirs, where we'll want to run lint and etags: + # This is a legacy variable from b4 Automake +-USOURCE_SUBDIRS = lib zlib diff src ++USOURCE_SUBDIRS = lib diff src + # All other subdirs: + SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \ + windows-NT os2 emx vms +--- cvs-1.11.19/src/Makefile.am.old.old4 2005-01-31 23:07:35.000000000 +0100 ++++ cvs-1.11.19/src/Makefile.am 2005-02-28 13:24:26.000000000 +0100 +@@ -24,7 +24,7 @@ + # try and remove naming ocnflicts and fix Automake to allow particular includes + # to be attached only to particular object files. Short term fix is either or. + ##INCLUDES = -I. -I.. -I$(srcdir) -I$(top_srcdir)/lib +-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt) ++INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt) + + bin_PROGRAMS = cvs + bin_SCRIPTS = cvsbug +@@ -105,7 +105,7 @@ + cvs_LDADD = \ + ../diff/libdiff.a \ + ../lib/libcvs.a \ +- ../zlib/libz.a ++ -lz + + # extra clean targets + # wish this could be distclean-hdr-local but it's not part of automake diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index c3d13e584..72aa5ebb6 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145904 2012-01-03 23:21:58Z bisson $ +# $Id: PKGBUILD 146056 2012-01-04 19:11:47Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Andreas Radke # Contributor: damir pkgname=gcin -pkgver=2.6.9 +pkgver=2.7.0 pkgrel=1 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' @@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" 'qt4-lib64.patch') -sha1sums=('1de9add43fe1b885b8d143343744016ef0c398fb' +sha1sums=('ff52b67a9456e1afe18c9c86a8f84c9dc16b9414' '3d1b769dcd8820c8351f239ec32ee5bcd9d98b70') install=install diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index 1470ba2db..702ee9809 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 144900 2011-12-09 12:16:38Z ibiru $ +# $Id: PKGBUILD 146050 2012-01-04 17:54:12Z ibiru $ # Maintainer: Jan de Groot pkgname=gedit -pkgver=3.2.5 +pkgver=3.2.6 pkgrel=1 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0cec1916b4ba878531d32163767a8d39b72eea8d6893103238c82d3a27127c81') +sha256sums=('92b5c44203dbc222c79cb35ba43d32de115e2ef89b7bb80451239d0c3fa02f7f') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index ad979c58c..529ee0675 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140877 2011-10-20 05:42:23Z ibiru $ +# $Id: PKGBUILD 146052 2012-01-04 17:56:55Z ibiru $ # Maintainer: Jan "heftig" Steffens pkgname=glib-networking -pkgver=2.30.1 +pkgver=2.30.2 pkgrel=1 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-de makedepends=('intltool') options=('!libtool') install=glib-networking.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('5acc7e76cb66734379d9ad983985c671af12591b84e93cd698fe8ea25d29f7d3') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('9f7542500939ca25896f0a74955cd3889758524583f6a15d02e00c9b815559bc') build() { cd "$srcdir/$pkgname-$pkgver" @@ -25,7 +25,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf