Sat Oct 15 23:14:29 UTC 2011

11 files changed, 106 insertions, 62 deletions

diff --git a/community/blueman/PKGBUILD b/community/blueman/PKGBUILD
index 0f42d755d..f4311acdd 100644
--- a/community/blueman/PKGBUILD
+++ b/community/blueman/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 40729 2011-02-26 08:51:40Z ibiru $
+# $Id: PKGBUILD 56850 2011-10-14 21:12:20Z spupykin $
 # Maintainer : Ionut Biru <ibiru@archlinux.org
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 
 pkgname=blueman
-pkgver=1.21
-pkgrel=7
+pkgver=1.23
+pkgrel=1
 pkgdesc="GTK+ bluetooth manager"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -22,13 +22,13 @@ options=('!libtool')
 install=$pkgname.install
 source=(http://download.tuxfamily.org/blueman/${pkgname}-${pkgver}.tar.gz
         PulsePatch.patch)
-md5sums=('26b70341b3d3da28da62c917c8b20377'
+md5sums=('f0bee59589f4c23e35bf08c2ef8acaef'
          'cdce55a57d7628ed8b6c7fcf4391f4f0')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
 
-    patch -Np1 -i "${srcdir}/PulsePatch.patch"
+#    patch -Np1 -i "${srcdir}/PulsePatch.patch"
 
     # python2 fix
     for file in apps/blueman*; do
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 3d1beb13f..0824f557d 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56089 2011-09-30 23:22:23Z giovanni $
+# $Id: PKGBUILD 56837 2011-10-14 14:47:09Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.8.21
+pkgver=0.8.22
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
@@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug')
 install=calibre.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'desktop_integration.patch')
-md5sums=('46317b1f4bd6f1cd5279a5f8a1d712ae'
+md5sums=('b4e968cda582f362124a52ad588f8af0'
          '253ce4fe5d01f8ff76b63cd3825755ea')
 
 build() {
diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD
index 93b88a2d1..10c60f529 100644
--- a/community/cherokee/PKGBUILD
+++ b/community/cherokee/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56629 2011-10-09 09:37:35Z foutrelis $
+# $Id: PKGBUILD 56833 2011-10-14 14:02:14Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgname=cherokee
 pkgver=1.2.100
-pkgrel=1
+pkgrel=2
 pkgdesc="A very fast, flexible and easy to configure Web Server"
 arch=('i686' 'x86_64')
 url="http://www.cherokee-project.com/"
@@ -26,11 +26,13 @@ options=('!libtool')
 source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz
         cherokee.rc
         cherokee.logrotate
-        fix-ctk-path-handler-match.patch)
+        fix-ctk-path-handler-match.patch
+        cherokee-admin-socket-bind.patch)
 sha1sums=('2ed95504c7f156227f9b688a901608be21cf3dff'
           '85e24ccc94e6e97858226222ac62cca79c17bc80'
           '266064ab6d3ebd206d7207e1d97b003d2021b2e4'
-          '6d64371dfb23f43c29a24e37e7ae99e08a0c84cc')
+          '6d64371dfb23f43c29a24e37e7ae99e08a0c84cc'
+          '3c0b407e7282542657125d7cfb1c64eb3521ed8c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/cherokee/cherokee-admin-socket-bind.patch b/community/cherokee/cherokee-admin-socket-bind.patch
new file mode 100644
index 000000000..0b266a245
--- /dev/null
+++ b/community/cherokee/cherokee-admin-socket-bind.patch
@@ -0,0 +1,23 @@
+diff --git a/cherokee/main_admin.c b/cherokee/main_admin.c
+index 861473f..e52b2d6 100644
+--- a/cherokee/main_admin.c
++++ b/cherokee/main_admin.c
+@@ -89,9 +89,9 @@ find_empty_port (int starting, int *port)
+ 	cherokee_buffer_add_str (&bind_, "127.0.0.1");
+ 
+ 	cherokee_socket_init (&s);
+-	cherokee_socket_create_fd (&s, AF_INET);
+ 
+ 	while (true) {
++		cherokee_socket_create_fd (&s, AF_INET);
+ 		ret = cherokee_socket_bind (&s, p, &bind_);
+ 		if (ret == ret_ok)
+ 			break;
+@@ -104,6 +104,7 @@ find_empty_port (int starting, int *port)
+ 		}
+ 	}
+ 
++	cherokee_socket_close (&s);
+ 	cherokee_socket_mrproper (&s);
+ 	cherokee_buffer_mrproper (&bind_);
+ 
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index ddab85731..186d4cae9 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 55608 2011-09-15 21:38:48Z stephane $
+# $Id: PKGBUILD 56835 2011-10-14 14:22:51Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 pkgname=cppcheck
-pkgver=1.50
+pkgver=1.51
 pkgrel=1
 pkgdesc="A tool for static C/C++ code analysis"
 arch=('i686' 'x86_64')
@@ -9,7 +9,7 @@ url="http://cppcheck.wiki.sourceforge.net/"
 license=('GPL')
 depends=('pcre')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('39ad14cb4cb9caa45fd3365203c5f54981ee2870')
+sha1sums=('d6774e123b9fa086cb6cc3722743e1de7a1f0b0c')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/ibus-table/PKGBUILD b/community/ibus-table/PKGBUILD
index f60bfb58e..eb75f17bd 100644
--- a/community/ibus-table/PKGBUILD
+++ b/community/ibus-table/PKGBUILD
@@ -1,25 +1,26 @@
+# $Id: PKGBUILD 56830 2011-10-14 06:44:36Z ebelanger $
 # Contributor: coderoar <coderoar@gmail.com>
 # Contributor: leemars <leemars@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ibus-table
-pkgver=1.3.0.20100621
-pkgrel=4
+pkgver=1.3.9.20110827
+pkgrel=1
 pkgdesc='The IM Engine framework for table-based input methods, such as ZhengMa, WuBi, ErBi, CangJie and so on.'
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/ibus/"
 license=('LGPL')
 depends=('python2-pyenchant' 'ibus' 'aspell-en')
 source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('0fd5812197400f7b586480fca1a0c082')
+md5sums=('251e2c8ace8ed265d780b30755afc163')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   # python2 fix
   find -type f -exec sed -i -e 's_exec python_exec python2_' -e 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' -e 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' {} \;
 
-  ./configure \
+  PYTHON=/usr/bin/python2 ./configure \
     --prefix=/usr \
     --libexecdir=/usr/lib/ibus
 
@@ -27,7 +28,7 @@ build() {
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD
index a39946560..7f012d00b 100644
--- a/community/mplayer2/PKGBUILD
+++ b/community/mplayer2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56005 2011-09-28 18:33:51Z stephane $
+# $Id: PKGBUILD 56845 2011-10-14 19:26:53Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Bartek Piotrowski <barthalion@gmail.com>
 
 pkgname=mplayer2
 pkgver=2.0
-pkgrel=14
+pkgrel=15
 pkgdesc="A movie player"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,9 +17,11 @@ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 provides=('mplayer')
 conflicts=('mplayer')
 source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz
-        mplayer2-remove-mp3lib.patch)
+        mplayer2-remove-mp3lib.patch
+        mplayer2-SAMI-subs.patch)
 sha1sums=('0df8d4e5484128b7b28029273b7704ab5d5419bc'
-          'c55128a99406a5e01ab077555b7b24aa7b54110c')
+          'c55128a99406a5e01ab077555b7b24aa7b54110c'
+          '4059d5d0564004feb55d25b5f62f7f4672e40fb1')
 options=('!emptydirs')
 
 build() {
@@ -33,6 +35,11 @@ build() {
     rm -fr mp3lib
     patch -Np1 -i ../mplayer2-remove-mp3lib.patch
 
+    # SAMI subtitle parsing buffer overflow
+    # http://mplayerhq.hu/pipermail/mplayer-cvslog/2011-May/042075.html
+    # http://labs.mwrinfosecurity.com/files/Advisories/mwri_mplayer-sami-subtitles_2011-08-12.pdf
+    patch -Np1 -i ../mplayer2-SAMI-subs.patch
+
     ./configure --prefix=/usr \
                 --enable-runtime-cpudetection \
                 --disable-arts \
diff --git a/community/mplayer2/mplayer2-SAMI-subs.patch b/community/mplayer2/mplayer2-SAMI-subs.patch
new file mode 100644
index 000000000..8238167e2
--- /dev/null
+++ b/community/mplayer2/mplayer2-SAMI-subs.patch
@@ -0,0 +1,12 @@
+diff -Naur mplayer2-2.0.ori/sub/subreader.c mplayer2-2.0/sub/subreader.c
+--- mplayer2-2.0.ori/sub/subreader.c	2011-03-24 17:40:29.000000000 -0400
++++ mplayer2-2.0/sub/subreader.c	2011-10-14 15:04:47.196477670 -0400
+@@ -179,6 +179,8 @@
+ 	    break;
+ 
+ 	case 3: /* get all text until '<' appears */
++	    if (p - text >= LINE_LEN)
++	        sami_add_line(current, text, &p);
+ 	    if (*s == '\0') break;
+ 	    else if (!strncasecmp (s, "<br>", 4)) {
+                 sami_add_line(current, text, &p);
diff --git a/community/musepack-tools/PKGBUILD b/community/musepack-tools/PKGBUILD
index 3cb7732d0..3cebcc68a 100644
--- a/community/musepack-tools/PKGBUILD
+++ b/community/musepack-tools/PKGBUILD
@@ -1,32 +1,41 @@
-# $Id: PKGBUILD 11191 2010-02-06 17:49:24Z dgriffiths $
-# Maintainer: Corrado Primier <bardo@aur.archlinux.org>
+# $Id: PKGBUILD 56848 2011-10-14 21:03:20Z schiv $
+# Maintainer:
+# Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: Eric Belanger <belanger@astro.umontreal.ca>
 
 pkgname=musepack-tools
-pkgver=435
-pkgrel=2
+pkgver=475
+pkgrel=1
 pkgdesc="Musepack decoder/encoder"
 arch=('i686' 'x86_64')
 url="http://www.musepack.net/"
 license=('LGPL')
 depends=('libcuefile' 'libreplaygain')
 makedepends=('cmake')
-source=(http://files.musepack.net/source/musepack_src_r${pkgver}.tar.gz math.patch)
-md5sums=('0e858972978fe480fd1400b7331061de' 'f9d51d2d7ba46fbdc4d038596871f9e0')
+source=("http://files.musepack.net/source/musepack_src_r$pkgver.tar.gz"
+        "math.patch")
+md5sums=('754d67be67f713e54baf70fcfdb2817e'
+         '9de31f07a3492c7b1db1248b055fbdc8')
 
 build() {
-  export LDFLAGS="${LDFLAGS} -lm"
-  cd ${srcdir}/musepack_src_r${pkgver}
+  cd "$srcdir/musepack_src_r$pkgver"
 
-  patch -Np0 -i ${srcdir}/math.patch || return 1
+  #export LDFLAGS+="-lm"
 
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=ON .. || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  patch -Np1 -i "$srcdir/math.patch"
+
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr \
+          -DCMAKE_SKIP_RPATH=ON
+}
+
+package() {
+  cd "$srcdir/musepack_src_r$pkgver"
+
+  make DESTDIR="$pkgdir" install
 
   for bin in chap cut dec enc gain 2sv8; do
-	install -Dm755 ${srcdir}/musepack_src_r${pkgver}/build/mpc${bin}/mpc${bin} \
-      ${pkgdir}/usr/bin/mpc${bin}
+    install -Dm755 mpc$bin/mpc$bin "$pkgdir/usr/bin/mpc$bin"
   done
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/musepack-tools/math.patch b/community/musepack-tools/math.patch
index 11588cbbf..61b3d07ec 100644
--- a/community/musepack-tools/math.patch
+++ b/community/musepack-tools/math.patch
@@ -1,22 +1,12 @@
---- include/mpc/mpcmath.h.orig	2009-07-25 16:49:10.000000000 +0300
-+++ include/mpc/mpcmath.h	2009-07-31 15:33:45.000000000 +0300
-@@ -16,6 +16,8 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
-+#include <math.h>
-+
- #include <mpc/mpc_types.h>
- 
- typedef union mpc_floatint
---- CMakeLists.txt.orig	2008-03-29 20:23:23.000000000 +0100
-+++ CMakeLists.txt	2010-02-04 12:31:27.498930581 +0100
-@@ -9,7 +9,7 @@
+diff -aur musepack_src_r475.old/CMakeLists.txt musepack_src_r475/CMakeLists.txt
+--- musepack_src_r475.old/CMakeLists.txt	2011-10-14 16:31:05.536450109 +0800
++++ musepack_src_r475/CMakeLists.txt	2011-10-14 16:31:34.022962450 +0800
+@@ -16,7 +16,7 @@
  add_definitions(-DFAST_MATH -DCVD_FASTLOG)
  
  if(NOT MSVC)
--set(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -pipe")
-+set(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -pipe -lm")
+-  set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe")
++  set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe -lm")
  endif(NOT MSVC)
  
  add_subdirectory(libmpcdec)
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index ebcbab11a..d15f6cd32 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 56203 2011-10-03 11:01:21Z spupykin $
+# $Id: PKGBUILD 56852 2011-10-14 21:13:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
-pkgver=2.2.14
-pkgrel=2
+pkgver=2.4.0
+pkgrel=1
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64')
 url="http://redis.io/"
@@ -18,13 +18,13 @@ backup=("etc/redis.conf"
 source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
 	"redis.d"
 	"redis.logrotate")
-md5sums=('3605e3d4c9465fdfefa2e96f3a408ef5'
+md5sums=('efdfa0d40fc7676199005bd0178cf6a9'
          '9726d06d0a0c60cb5d55a31b3dc1e55d'
          '9e2d75b7a9dc421122d673fe520ef17f')
 
 build() {
     cd "$srcdir/${pkgname}-${pkgver}"
-    CFLAGS="$CFLAGS -std=c99" make
+    CFLAGS="$CFLAGS -std=c99" make FORCE_LIBC_MALLOC=yes
 }
 
 package() {