kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 0.1.12, add patch-ab to make sure a random pointer is not freed.

Browse source
This commit is contained in:
schnoebe 2010-04-26 01:54:26 +00:00
parent 695e7040d4
commit 52077465a3
4 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
audio/id3v2/Makefile
View file

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.22 2008/03/02 06:10:33 jlam Exp $
# $NetBSD: Makefile,v 1.23 2010/04/26 01:54:26 schnoebe Exp $
DISTNAME= id3v2-0.1.11
PKGREVISION= 2
DISTNAME= id3v2-0.1.12
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=id3v2/}
@ -9,6 +8,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://id3v2.sourceforge.net/
COMMENT= Command line editor for id3v2 tags
LICENSE= gnu-lgpl-v2.1
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
@ -17,6 +18,10 @@ USE_TOOLS+= gmake
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
post-configure:
# clean up inappropriate stuff left in the distribution archive
cd ${WRKSRC}; rm -f id3v2 *.o
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/id3v2 ${DESTDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/id3v2.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1

11
audio/id3v2/distinfo
View file

@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.8 2006/10/01 12:23:39 tonio Exp $
$NetBSD: distinfo,v 1.9 2010/04/26 01:54:26 schnoebe Exp $
SHA1 (id3v2-0.1.11.tar.gz) = ca825d851ca0c6a5783af107dc6baa7aa93f0bad
RMD160 (id3v2-0.1.11.tar.gz) = 433900ec5ccc072e5daeaf3fc25902d87bc95a01
Size (id3v2-0.1.11.tar.gz) = 52427 bytes
SHA1 (patch-aa) = 24369db9115ea921e5ebaa4befa66a71ebb4da19
SHA1 (id3v2-0.1.12.tar.gz) = 8f42153b2f53098c221da2e8fe42170e727cd9ad
RMD160 (id3v2-0.1.12.tar.gz) = 084f90bea49cc8fb93acb5f78bb55602c5358ac5
Size (id3v2-0.1.12.tar.gz) = 121476 bytes
SHA1 (patch-aa) = 80630ef4dacf8906c6a7e62ae9b3986478ddc391
SHA1 (patch-ab) = f52bebadfdcfa12a44d50643439fcbea6df3de28

19
audio/id3v2/patches/patch-aa
View file

@ -1,19 +1,20 @@
$NetBSD: patch-aa,v 1.5 2006/10/01 12:23:39 tonio Exp $
$NetBSD: patch-aa,v 1.6 2010/04/26 01:54:27 schnoebe Exp $
--- Makefile.orig 2004-05-04 20:33:53.000000000 +0200
--- Makefile.orig 2010-03-26 23:28:34.000000000 +0000
+++ Makefile
@@ -2,12 +2,12 @@ all: id3v2
VERSION=0.1.11
VERSION=0.1.12
-PREFIX= /usr/local
+PREFIX?= /usr/local
CXXFLAGS+= -I${PREFIX}/include/ -DVERSION="\"${VERSION}\"" #-DSORT_RUNTIME
-PREFIX= /opt/local
+PREFIX?= /opt/local
-CXXFLAGS+= -Wall -I${PREFIX}/include/ -DVERSION="\"${VERSION}\"" #-DSORT_RUNTIME
+CXXFLAGS+= -I${PREFIX}/include/ -DVERSION="\"${VERSION}\"" #-DSORT_RUNTIME
LDFLAGS+= -L${PREFIX}/lib/
id3v2: convert.o list.o id3v2.o genre.o
- c++ ${LDFLAGS} -pedantic -Wall -lz -lid3 -g -o $@ $^
+ c++ ${LDFLAGS} -pedantic -Wall -lz -lid3 -liconv -g -o $@ $^
- ${CXX} ${LDFLAGS} -pedantic -Wall -g -o $@ $^ -lz -lid3
+ ${CXX} ${LDFLAGS} -pedantic -Wall -g -o $@ $^ -lz -lid3 -liconv
create_map: create_map.o
c++ -Wall -g -o $@ $^
${CXX} -Wall -g -o $@ $^

14
audio/id3v2/patches/patch-ab Normal file
View file

@ -0,0 +1,14 @@
$NetBSD: patch-ab,v 1.1 2010/04/26 01:54:27 schnoebe Exp $
--- id3v2.cpp.orig 2010-03-26 23:26:46.000000000 +0000
+++ id3v2.cpp
@@ -474,7 +474,8 @@ int main( int argc, char *argv[])
myFrame->Field(ID3FN_TEXT) = frameList[ii].data;
myTag.AttachFrame(myFrame);
- free(newTrackNum);
+ if (newTrackNum != NULL)
+ free(newTrackNum);
break;
}
case ID3FID_USERTEXT: