From 1d2f1a1e70011a41d17f2f16d5e90c491ccdabb8 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 11 Sep 2011 23:14:33 +0000
Subject: Sun Sep 11 23:14:33 UTC 2011

---
 extra/grip/PKGBUILD                            | 24 ++++++++++++++-------
 extra/grip/grip-3.3.1-invalid-genre-size.patch | 30 ++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 8 deletions(-)
 create mode 100644 extra/grip/grip-3.3.1-invalid-genre-size.patch

(limited to 'extra/grip')

diff --git a/extra/grip/PKGBUILD b/extra/grip/PKGBUILD
index 9cc95af96..904ab4eda 100644
--- a/extra/grip/PKGBUILD
+++ b/extra/grip/PKGBUILD
@@ -1,22 +1,30 @@
-# $Id: PKGBUILD 57044 2009-10-31 11:06:52Z allan $
+# $Id: PKGBUILD 137616 2011-09-10 05:34:08Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Todd Musall <tmusall@comcast.net>
 
 pkgname=grip
 pkgver=3.3.1
-pkgrel=8
+pkgrel=9
 pkgdesc="A cd-player and ripper for the Gnome desktop"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://nostatic.org/grip/"
 depends=('vte' 'curl' 'libgnomeui' 'id3lib' 'cdparanoia')
-install=grip.install
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('4b4233999b9f2bc85c711092553ea9aa')
+optdepends=('yelp: to display the help and notices')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \
+        grip-3.3.1-invalid-genre-size.patch)
+md5sums=('4b4233999b9f2bc85c711092553ea9aa'
+         '046448be7d1580e86a2211cd8661d855')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/grip-3.3.1-invalid-genre-size.patch"
+  sed -i '/[.] conftest[.]id3/s: c: ./c:' configure 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make || return 1
-  make DESTDIR=${pkgdir} install
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/grip/grip-3.3.1-invalid-genre-size.patch b/extra/grip/grip-3.3.1-invalid-genre-size.patch
new file mode 100644
index 000000000..c826fc6e2
--- /dev/null
+++ b/extra/grip/grip-3.3.1-invalid-genre-size.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/285105
+
+--- grip-3.3.1/src/id3.c
++++ grip-3.3.1/src/id3.c
+@@ -252,8 +252,8 @@
+       
+       if ( frames[ i ] ) {
+ 	char *c_data = NULL;
+-	char gen[ 5 ] = "(   )";
+-	char trk[ 4 ] = "   ";
++	char gen[ 6 ] = "(   )"; /* max unsigned char: 255 */
++	char trk[ 3 ] = "  "; /* max CDDA tracks: 99 */
+ 	
+ 	switch( frameids[ i ] ) {
+ 	case ID3FID_TITLE:
+@@ -278,12 +278,12 @@
+ 	  
+ 	case ID3FID_CONTENTTYPE:
+ 	  c_data = gen;
+-	  sprintf( gen, "(%d)", genre ); /* XXX */
++	  snprintf( gen, 6, "(%d)", genre );
+ 	  break;
+ 	  
+ 	case ID3FID_TRACKNUM:
+ 	  c_data = trk;
+-	  sprintf( trk, "%d", tracknum ); /* XXX */
++	  snprintf( trk, 3, "%d", tracknum );
+ 	  break;
+ 	  
+ 	default:
-- 
cgit v1.2.3-54-g00ecf