Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

2 files changed, 23 insertions, 4 deletions

diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD
index 054faa0c4..9500dd9f4 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' 'mips64el')
 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
+
     if [ "$CARCH" = "mips64el" ]; then
     ./configure --prefix=/usr \
                 --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);