[arch-commits] Commit in grip/trunk (3 files)

[Eric Bélanger]

    Date: Saturday, September 10, 2011 @ 01:30:42
  Author: eric
Revision: 137614

upgpkg: grip 3.3.1-9

Add patch to fix buffer overflow, Replace install file by optdepends, Fix build issue

Added:
  grip/trunk/grip-3.3.1-invalid-genre-size.patch
Modified:
  grip/trunk/PKGBUILD
Deleted:
  grip/trunk/grip.install

-------------------------------------+
 PKGBUILD                            |   22 +++++++++++++++-------
 grip-3.3.1-invalid-genre-size.patch |   30 ++++++++++++++++++++++++++++++
 grip.install                        |   29 -----------------------------
 3 files changed, 45 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-10 04:45:43 UTC (rev 137613)
+++ PKGBUILD	2011-09-10 05:30:42 UTC (rev 137614)
@@ -4,19 +4,27 @@
 
 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
+}

Added: grip-3.3.1-invalid-genre-size.patch
===================================================================
--- grip-3.3.1-invalid-genre-size.patch	                        (rev 0)
+++ grip-3.3.1-invalid-genre-size.patch	2011-09-10 05:30:42 UTC (rev 137614)
@@ -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:

Deleted: grip.install
===================================================================
--- grip.install	2011-09-10 04:45:43 UTC (rev 137613)
+++ grip.install	2011-09-10 05:30:42 UTC (rev 137614)
@@ -1,29 +0,0 @@
-
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-post_install() {
-  cat << EOM
-
- --> please note that you will need "yelp" to display the help and the notices
- --> of grip. Every other functionality can be used out of the box.
-
-EOM
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}