From 99d0ec7ebad2eda5f3a03098962e3b250e3bef4c Mon Sep 17 00:00:00 2001 From: root Date: Tue, 16 Oct 2012 00:33:10 -0700 Subject: Tue Oct 16 00:33:08 PDT 2012 --- extra/akonadi/PKGBUILD | 11 ++-- extra/foobillard++/PKGBUILD | 7 +-- extra/ftgl/PKGBUILD | 3 +- extra/gnuplot/PKGBUILD | 8 +-- extra/miro/PKGBUILD | 6 +-- extra/perl-sdl/PKGBUILD | 6 +-- extra/qrencode/PKGBUILD | 6 +-- extra/xfce4-xkb-plugin/PKGBUILD | 46 ++++++++++------- ...kb-plugin-0.5.4.3-2-fix-memory-corruption.patch | 59 ++++++++++++++++++++++ 9 files changed, 112 insertions(+), 40 deletions(-) create mode 100644 extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch (limited to 'extra') diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index d539ce3fa..a5225c3a6 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 164827 2012-08-06 23:06:21Z andrea $ +# $Id: PKGBUILD 168740 2012-10-15 06:35:45Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=akonadi -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64') -url='http://pim.kde.org/akonadi' +url='http://community.kde.org/KDE_PIM/Akonadi' license=('LGPL') depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('81156d883b40241cfc0ddb885f55bcfe') +md5sums=('39411abc7bec8a485362ea7460e7e3d7') build() { - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -27,6 +26,6 @@ build() { } package() { - cd "${srcdir}/build" + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/foobillard++/PKGBUILD b/extra/foobillard++/PKGBUILD index 5cedf397f..13dcd633e 100644 --- a/extra/foobillard++/PKGBUILD +++ b/extra/foobillard++/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 148666 2012-02-05 11:46:13Z ibiru $ +# $Id: PKGBUILD 168755 2012-10-15 17:52:10Z eric $ # Maintainer: Eric Bélanger pkgname=foobillard++ pkgver=3.42beta -pkgrel=3 +pkgrel=4 pkgdesc="An OpenGL billiard game" arch=('i686' 'x86_64') url="http://foobillardplus.sourceforge.net/" license=('GPL2') -depends=('freetype2' 'libpng' 'mesa' 'sdl_net' 'sdl_mixer') +depends=('freetype2' 'libpng' 'glu' 'sdl_net' 'sdl_mixer') +makedepends=('mesa') replaces=('foobillard') source=(http://downloads.sourceforge.net/foobillardplus/foobillardplus-${pkgver}.tar.gz) sha1sums=('51507efab0f595cfff26149003faf669c0a42f32') diff --git a/extra/ftgl/PKGBUILD b/extra/ftgl/PKGBUILD index ecc5e938a..279f616a2 100644 --- a/extra/ftgl/PKGBUILD +++ b/extra/ftgl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168600 2012-10-13 11:46:59Z andyrtr $ +# $Id: PKGBUILD 168802 2012-10-16 03:14:27Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Alexander Baldeck # Contributor: tobias @@ -19,6 +19,7 @@ md5sums=('c7879018cde844059495b3029b0b6503') build() { cd "$srcdir/$pkgname-${_pkgver/-/~}" + sed -i '/^SUBDIRS =/s/demo//' Makefile.in ./configure --prefix=/usr --with-pic --disable-static make } diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD index 432dff742..80183ab73 100644 --- a/extra/gnuplot/PKGBUILD +++ b/extra/gnuplot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155689 2012-04-04 18:17:55Z ronald $ +# $Id: PKGBUILD 168770 2012-10-15 19:50:22Z ronald $ # Maintainer: Ronald van Haren # Contributor: damir # Contributor: Tom Newsom pkgname=gnuplot -pkgver=4.6.0 -pkgrel=3 +pkgver=4.6.1 +pkgrel=1 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" arch=('i686' 'x86_64') url="http://www.gnuplot.info" @@ -14,7 +14,7 @@ depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua') makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra') install=gnuplot.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") -sha1sums=('9a43ae13546d97d4b174533ddac31a14e0edc9b2') +sha1sums=('1ea21a628223159b0297ae65fe8293afd5aab3c0') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD index 73d430778..4972e01e9 100644 --- a/extra/miro/PKGBUILD +++ b/extra/miro/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164751 2012-08-04 17:46:43Z ronald $ +# $Id: PKGBUILD 168768 2012-10-15 19:27:04Z ronald $ # Maintainer: Ronald van Haren pkgname=miro -pkgver=5.0.2 +pkgver=5.0.4 pkgrel=1 pkgdesc="The free and open source internet TV platform" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ makedepends=('pkg-config' 'boost') install=miro.install source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz" 'ffmpeg.patch') -sha1sums=('67babcf76cc08b72b8f55d425b1372ae0a979805' +sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f' 'ce0f42be2a0a3ac99f07b5abfabf0975928c841c') build() { diff --git a/extra/perl-sdl/PKGBUILD b/extra/perl-sdl/PKGBUILD index 0a71a319c..d8273a34e 100644 --- a/extra/perl-sdl/PKGBUILD +++ b/extra/perl-sdl/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 165864 2012-09-01 20:41:29Z heftig $ +# $Id: PKGBUILD 168746 2012-10-15 12:11:10Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae # Contributor: Sarah Hay pkgname=perl-sdl pkgver=2.540 -pkgrel=2 +pkgrel=3 pkgdesc="Simple DirectMedia Layer for Perl" arch=(i686 x86_64) license=(LGPL) url="http://sdl.perl.org" depends=(perl-alien-sdl perl-tie-simple - sdl_net sdl_ttf sdl_image sdl_mixer sdl_gfx sdl_pango mesa smpeg) + sdl_net sdl_ttf sdl_image sdl_mixer sdl_gfx sdl_pango smpeg) makedepends=('perl-module-build>=0.40') options=('!emptydirs') replaces=(sdl_perl) diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD index 7caabccb0..fa809653c 100644 --- a/extra/qrencode/PKGBUILD +++ b/extra/qrencode/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156492 2012-04-19 15:59:03Z bluewind $ +# $Id: PKGBUILD 168742 2012-10-15 07:00:19Z bluewind $ # Maintainer: Florian Pritz< flo@xinu.at> # Contributor: Dany Martineau pkgname=qrencode -pkgver=3.3.1 +pkgver=3.4.0 pkgrel=1 pkgdesc="C library for encoding data in a QR Code symbol." arch=(i686 x86_64) @@ -13,7 +13,7 @@ url="http://megaui.net/fukuchi/works/qrencode/index.en.html" license=('GPL') options=(!libtool) source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('14920ba9d0515bddcaebfbd728229c5d') +md5sums=('5af7879ab5b300663f2076c287c09030') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/extra/xfce4-xkb-plugin/PKGBUILD b/extra/xfce4-xkb-plugin/PKGBUILD index ee0f53873..1ed492de2 100644 --- a/extra/xfce4-xkb-plugin/PKGBUILD +++ b/extra/xfce4-xkb-plugin/PKGBUILD @@ -1,34 +1,46 @@ -# $Id: PKGBUILD 157903 2012-04-30 04:21:40Z foutrelis $ -# Maintainer: AndyRTR +# $Id: PKGBUILD 168753 2012-10-15 14:42:49Z foutrelis $ +# Maintainer: Evangelos Foutras +# Contributor: AndyRTR # Contributor: Tobias Kieslich pkgname=xfce4-xkb-plugin pkgver=0.5.4.3 -pkgrel=2 +pkgrel=3 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel" arch=('i686' 'x86_64') -license=('custom') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin" +license=('custom') groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg') +depends=('xfce4-panel' 'libxklavier' 'librsvg') makedepends=('intltool') options=('!libtool') -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('4dc42f96dc16a3bd78f86454ea3a931464e18497') +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2 + xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch) +sha256sums=('ca4801bb2edfe04eeceb71879b3cf79a0674e8311c39117efdb9d3521307396d' + 'f5e6e5964df897045ed8c3443f632033689409459acdc54c0351264edc11b4ce') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --disable-debug + cd "$srcdir/$pkgname-$pkgver" + + # https://bugs.archlinux.org/task/31880 + patch -Np1 -i "$srcdir/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch b/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch new file mode 100644 index 000000000..16f684b12 --- /dev/null +++ b/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch @@ -0,0 +1,59 @@ +From ac73bc9de624d322b318c2eda0ace7f0bee97a64 Mon Sep 17 00:00:00 2001 +From: Igor Slepchin +Date: Thu, 19 Jul 2012 05:59:40 +0000 +Subject: Fix memory corruption. + +g_free(c) in the original code was freeing memory at the pointer +that was incremented a few times since the allocation. + +This is similar to ubuntu bug #899290 and fedora bug 589898. +--- +diff --git a/panel-plugin/xkb-util.c b/panel-plugin/xkb-util.c +index d0d0230..324928f 100644 +--- a/panel-plugin/xkb-util.c ++++ b/panel-plugin/xkb-util.c +@@ -66,11 +66,10 @@ xkb_util_get_layout_string (const gchar *group_name, const gchar *variant) + gchar* + xkb_util_normalize_group_name (const gchar* group_name) + { +- gchar *c; ++ const gchar *c; + gchar *result; + gint cut_length; + gint index_of_na = -1; +- gint index_tmp = -1; + + if (!group_name) + return NULL; +@@ -78,27 +77,19 @@ xkb_util_normalize_group_name (const gchar* group_name) + if (strlen (group_name) <= 3) + return g_strdup (group_name); + +- c = g_strdup (group_name); +- +- while (*c) ++ for (c = group_name; *c; c++) + { +- index_tmp++; +- + if (!((*c >= 'a' && *c <= 'z') || (*c >= 'A' && *c <= 'Z'))) + { +- index_of_na = index_tmp; ++ index_of_na = group_name - c; + break; + } +- +- c++; + } + + cut_length = (index_of_na != -1 && index_of_na <= 3) ? index_of_na : 3; + + result = g_strndup (group_name, cut_length); + +- g_free (c); +- + return result; + } + +-- +cgit v0.9.0.3 -- cgit v1.2.3-54-g00ecf