Mon Sep 9 01:37:55 PDT 2013

5 files changed, 73 insertions, 15 deletions

diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 33a786dbc..44657193e 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 189860 2013-07-10 07:26:51Z bpiotrowski $
+# $Id: PKGBUILD 193960 2013-09-08 17:48:29Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
 
 pkgname=amule
-pkgver=10803
-pkgrel=3
+pkgver=10808
+pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64')
 url="http://www.amule.org"
 license=('GPL')
 depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++')
 source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('febf14f5b1185f25acde64f61b78ed38')
+md5sums=('68099241871f4e47eee06bebc7ce20a1')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD
index 54f5df4d0..680390c96 100644
--- a/extra/audacity/PKGBUILD
+++ b/extra/audacity/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 176352 2013-01-30 20:25:49Z eric $
+# $Id: PKGBUILD 193962 2013-09-08 19:31:47Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=audacity
-pkgver=2.0.3
-pkgrel=2
+pkgver=2.0.4
+pkgrel=1
 pkgdesc="A program that lets you manipulate digital audio waveforms"
 arch=('i686' 'x86_64')
 url="http://audacity.sourceforge.net/"
@@ -14,16 +14,16 @@ makedepends=('cmake')
 options=('!makeflags')
 install=audacity.install
 source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}.tar.xz)
-sha1sums=('72e634711fb96aac9df445e75e16e12e00c047e6')
+sha1sums=('4c1a42137cef598e3d83829ca7c22dba62d215be')
 
 build() {
-  cd "${srcdir}/${pkgname}-src-${pkgver}"
+  cd ${pkgname}-src-${pkgver}
   PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \
-    ./configure --prefix=/usr --docdir=/usr/share/doc/audacity
+    ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-src-${pkgver}"
+  cd ${pkgname}-src-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/audacity/audacity.install b/extra/audacity/audacity.install
index 028c9f62a..34ab919aa 100644
--- a/extra/audacity/audacity.install
+++ b/extra/audacity/audacity.install
@@ -5,9 +5,9 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  post_install $1
+  post_install
 }
diff --git a/extra/xpdf/PKGBUILD b/extra/xpdf/PKGBUILD
index 08574b777..5dbaf8468 100644
--- a/extra/xpdf/PKGBUILD
+++ b/extra/xpdf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177029 2013-02-04 13:10:00Z bisson $
+# $Id: PKGBUILD 193958 2013-09-08 17:19:05Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
@@ -6,7 +6,7 @@
 pkgname=xpdf
 #pkgver=3.03_pl1
 pkgver=3.03
-pkgrel=3
+pkgrel=4
 pkgdesc='Viewer for Portable Document Format (PDF) files'
 url='http://www.foolabs.com/xpdf/'
 license=('GPL2')
@@ -16,9 +16,11 @@ optdepends=('poppler: tools that used to be included in xpdf'
             'desktop-file-utils: for desktop environments')
 #       "ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}pl1.patch"
 source=("ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}.tar.gz"
+        'sanitize.patch'
         'char.patch'
         'desktop')
 sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248'
+          '2face78a2f550fd15eeceb8a1ce47c566104f457'   
           '5c471944685a6b24a2b0c0e000562d1a3263aeeb'
           '17ebbfe457cb92e97b12b7362e8ce961526012d9')
 
@@ -29,6 +31,7 @@ build() {
 	cd "${srcdir}/${pkgname}-${pkgver%_*}"
 
 #	patch -p1 -i "../${pkgname}-${_srcver}pl1.patch"
+	patch -p1 -i ../sanitize.patch
 	patch -p1 -i ../char.patch
 
 	sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc
diff --git a/extra/xpdf/sanitize.patch b/extra/xpdf/sanitize.patch
new file mode 100644
index 000000000..891c41fd3
--- /dev/null
+++ b/extra/xpdf/sanitize.patch
@@ -0,0 +1,55 @@
+From 3945969e0072217c143fefa3044512a31ac2afa8 Mon Sep 17 00:00:00 2001
+From: mancha <mancha1@hush.com>
+Date: Sun, 11 Aug 2013
+Subject: CVE-2012-2142
+
+Filter stuff that might end up in the shell to address CVE-2012-2142.
+This code was adapted from the Poppler project.
+---
+ Error.cc |   21 ++++++++++++++++-----
+ 1 file changed, 16 insertions(+), 5 deletions(-)
+
+--- a/xpdf/Error.cc	2013-08-11
++++ b/xpdf/Error.cc	2013-08-11
+@@ -43,7 +43,7 @@ void setErrorCallback(void (*cbk)(void *
+ 
+ void CDECL error(ErrorCategory category, int pos, const char *msg, ...) {
+   va_list args;
+-  GString *s;
++  GString *s, *sanitized;
+ 
+   // NB: this can be called before the globalParams object is created
+   if (!errorCbk && globalParams && globalParams->getErrQuiet()) {
+@@ -52,17 +52,28 @@ void CDECL error(ErrorCategory category,
+   va_start(args, msg);
+   s = GString::formatv(msg, args);
+   va_end(args);
++
++  sanitized = new GString ();
++  for (int i = 0; i < s->getLength(); ++i) {
++    const char c = s->getChar(i);
++    if (c < (char)0x20 || c >= (char)0x7f) {
++      sanitized->appendf("<{0:02x}>", c & 0xff);
++    } else {
++      sanitized->append(c);
++    }
++  }
++
+   if (errorCbk) {
+-    (*errorCbk)(errorCbkData, category, pos, s->getCString());
++    (*errorCbk)(errorCbkData, category, pos, sanitized->getCString());
+   } else {
+     if (pos >= 0) {
+       fprintf(stderr, "%s (%d): %s\n",
+-	      errorCategoryNames[category], pos, s->getCString());
++	      errorCategoryNames[category], pos, sanitized->getCString());
+     } else {
+       fprintf(stderr, "%s: %s\n",
+-	      errorCategoryNames[category], s->getCString());
++	      errorCategoryNames[category], sanitized->getCString());
+     }
+     fflush(stderr);
+   }
+-  delete s;
++  delete sanitized;
+ }