[arch-commits] Commit in grip/repos (7 files)
Eric Bélanger
eric at archlinux.org
Sat Sep 10 05:31:16 UTC 2011
Date: Saturday, September 10, 2011 @ 01:31:16
Author: eric
Revision: 137615
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
grip/repos/extra-i686/PKGBUILD
(from rev 137614, grip/trunk/PKGBUILD)
grip/repos/extra-i686/grip-3.3.1-invalid-genre-size.patch
(from rev 137614, grip/trunk/grip-3.3.1-invalid-genre-size.patch)
grip/repos/extra-x86_64/grip-3.3.1-invalid-genre-size.patch
(from rev 137614, grip/trunk/grip-3.3.1-invalid-genre-size.patch)
Deleted:
grip/repos/extra-i686/PKGBUILD
grip/repos/extra-i686/grip.install
grip/repos/extra-x86_64/PKGBUILD
grip/repos/extra-x86_64/grip.install
--------------------------------------------------+
extra-i686/PKGBUILD | 52 ++++++++++++---------
extra-i686/grip-3.3.1-invalid-genre-size.patch | 30 ++++++++++++
extra-i686/grip.install | 33 -------------
extra-x86_64/PKGBUILD | 22 --------
extra-x86_64/grip-3.3.1-invalid-genre-size.patch | 30 ++++++++++++
extra-x86_64/grip.install | 33 -------------
6 files changed, 90 insertions(+), 110 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-09-10 05:30:42 UTC (rev 137614)
+++ extra-i686/PKGBUILD 2011-09-10 05:31:16 UTC (rev 137615)
@@ -1,22 +0,0 @@
-# $Id$
-# Maintainer: tobias <tobias at archlinux.org>
-# Contributor: Todd Musall <tmusall at comcast.net>
-
-pkgname=grip
-pkgver=3.3.1
-pkgrel=8
-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')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
- make || return 1
- make DESTDIR=${pkgdir} install
-}
Copied: grip/repos/extra-i686/PKGBUILD (from rev 137614, grip/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-10 05:31:16 UTC (rev 137615)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: tobias <tobias at archlinux.org>
+# Contributor: Todd Musall <tmusall at comcast.net>
+
+pkgname=grip
+pkgver=3.3.1
+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')
+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}"
+ 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
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: grip/repos/extra-i686/grip-3.3.1-invalid-genre-size.patch (from rev 137614, grip/trunk/grip-3.3.1-invalid-genre-size.patch)
===================================================================
--- extra-i686/grip-3.3.1-invalid-genre-size.patch (rev 0)
+++ extra-i686/grip-3.3.1-invalid-genre-size.patch 2011-09-10 05:31:16 UTC (rev 137615)
@@ -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: extra-i686/grip.install
===================================================================
--- extra-i686/grip.install 2011-09-10 05:30:42 UTC (rev 137614)
+++ extra-i686/grip.install 2011-09-10 05:31:16 UTC (rev 137615)
@@ -1,33 +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
-}
-
-op=$1
-shift
-$op $*
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-09-10 05:30:42 UTC (rev 137614)
+++ extra-x86_64/PKGBUILD 2011-09-10 05:31:16 UTC (rev 137615)
@@ -1,22 +0,0 @@
-# $Id$
-# Maintainer: tobias <tobias at archlinux.org>
-# Contributor: Todd Musall <tmusall at comcast.net>
-
-pkgname=grip
-pkgver=3.3.1
-pkgrel=8
-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')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
- make || return 1
- make DESTDIR=${pkgdir} install
-}
Copied: grip/repos/extra-x86_64/grip-3.3.1-invalid-genre-size.patch (from rev 137614, grip/trunk/grip-3.3.1-invalid-genre-size.patch)
===================================================================
--- extra-x86_64/grip-3.3.1-invalid-genre-size.patch (rev 0)
+++ extra-x86_64/grip-3.3.1-invalid-genre-size.patch 2011-09-10 05:31:16 UTC (rev 137615)
@@ -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: extra-x86_64/grip.install
===================================================================
--- extra-x86_64/grip.install 2011-09-10 05:30:42 UTC (rev 137614)
+++ extra-x86_64/grip.install 2011-09-10 05:31:16 UTC (rev 137615)
@@ -1,33 +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
-}
-
-op=$1
-shift
-$op $*
More information about the arch-commits
mailing list