Index: head/audio/amarok/Makefile =================================================================== --- head/audio/amarok/Makefile (revision 230748) +++ head/audio/amarok/Makefile (revision 230749) @@ -1,132 +1,132 @@ # New ports collection makefile for: amarok # Date created: Tue Feb 24 02:21:14 CET 2004 # Whom: Markus Brueffer # # $FreeBSD$ PORTNAME= amarok PORTVERSION= 1.4.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src MAINTAINER= makc@FreeBSD.org COMMENT= Media player for KDE LIB_DEPENDS= tag.6:${PORTSDIR}/audio/taglib \ tunepimp.5:${PORTSDIR}/audio/libtunepimp \ mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \ xine.1:${PORTSDIR}/multimedia/libxine MIN_OPTIONS_VER= ${PORTNAME}-1.4.1 USE_BZIP2= yes USE_KDEBASE_VER=3 USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_GETTEXT= yes USE_SDL= sdl USE_RUBY= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes OPTIONS= GPOD "iPod support" on \ NJB "Creative Nomad and Dell support" on \ MTP "MTP device support" on \ LIBVISUAL "libvisual support" off \ OPENGL "OpenGL support" on \ AMAZON "Amazon cover fetching support" on \ MYSQL "Use MySQL as collection backend" off \ POSTGRESQL "Use PostgreSQL as collection backend" off \ HIDEMENUBAR "Revert the 'Hide Menubar' feature" off \ .include CONFIGURE_ARGS+=--without-exscalibar \ --with-mp4v2 \ --with-mp4v2-dir=${PREFIX} .if !defined(WITH_GPOD) PLIST_SUB+= GPOD="@comment " CONFIGURE_ARGS+=--without-libgpod .else LIB_DEPENDS+= gpod.3:${PORTSDIR}/audio/libgpod CONFIGURE_ARGS+=--with-libgpod PLIST_SUB+= GPOD="" .endif .if !defined(WITH_NJB) PLIST_SUB+= NJB="@comment " .else LIB_DEPENDS+= njb.6:${PORTSDIR}/audio/libnjb CONFIGURE_ARGS+=--with-libnjb PLIST_SUB+= NJB="" .endif .if !defined(WITH_MTP) PLIST_SUB+= MTP="@comment " .else LIB_DEPENDS+= mtp.8:${PORTSDIR}/audio/libmtp CONFIGURE_ARGS+=--with-libmtp PLIST_SUB+= MTP="" .endif .if defined(WITHOUT_LIBVISUAL) CONFIGURE_ARGS+=--without-libvisual .else LIB_DEPENDS+= visual-0.4:${PORTSDIR}/graphics/libvisual04 .endif .if defined(WITHOUT_OPENGL) CONFIGURE_ARGS+=--without-opengl .endif .if defined(WITHOUT_AMAZON) CONFIGURE_ARGS+=--disable-amazon .endif .if defined(WITH_MYSQL) USE_MYSQL= yes CONFIGURE_ARGS+=--enable-mysql .endif .if defined(WITH_POSTGRESQL) USE_PGSQL= yes CONFIGURE_ARGS+=--enable-postgresql .endif .if defined(WITH_HIDEMENUBAR) EXTRA_PATCHES= ${PATCHDIR}/hide-main-menu-bar-feature.patch .endif .if defined(DEBUG) CONFIGURE_ARGS+=--enable-debug=full STRIP= # none .endif pre-extract: check-options-version post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|LIBS="-ltunepimp $$LIBS"|LIBS="-ltunepimp -liconv $$LIBS"|g' \ ${WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|xx||g' ${WRKSRC}/po/Makefile.in @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${TOUCH} post-install: .if defined(WITH_MTP) || defined(WITH_NJB) || defined(WITH_GPOD) @${CAT} ${PKGMESSAGE} .endif check-options-version: .ifdef(_OPTIONS_READ) @(if ${PKG_VERSION} -t ${_OPTIONS_READ} ${MIN_OPTIONS_VER} | ${GREP} -q '<'; \ then ${ECHO_CMD} ""; \ ${ECHO_CMD} "===> You have unsupported (old) OPTIONS, please do a 'make rmconfig; make'"; \ ${ECHO_CMD} ""; \ exit 1; \ fi) .endif .include Property changes on: head/audio/amarok/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.91 \ No newline at end of property +1.92 \ No newline at end of property Index: head/audio/amarok/files/patch-tkadv2009-002 =================================================================== --- head/audio/amarok/files/patch-tkadv2009-002 (nonexistent) +++ head/audio/amarok/files/patch-tkadv2009-002 (revision 230749) @@ -0,0 +1,85 @@ +--- amarok/src/metadata/audible/audibletag.cpp 2009/01/09 17:36:52 908414 ++++ amarok/src/metadata/audible/audibletag.cpp 2009/01/09 17:38:50 908415 +@@ -71,7 +71,8 @@ + { + char buf[1023]; + fseek(fp, OFF_PRODUCT_ID, SEEK_SET); +- fread(buf, strlen("product_id"), 1, fp); ++ if (fread(buf, strlen("product_id"), 1, fp) != 1) ++ return; + if(memcmp(buf, "product_id", strlen("product_id"))) + { + buf[20]='\0'; +@@ -130,24 +131,65 @@ + + bool Audible::Tag::readTag( FILE *fp, char **name, char **value) + { ++ // arbitrary value that has to be smaller than 2^32-1 and that should be large enough for all tags ++ const uint32_t maxtaglen = 100000; ++ + uint32_t nlen; +- fread(&nlen, sizeof(nlen), 1, fp); ++ if (fread(&nlen, sizeof(nlen), 1, fp) != 1) ++ return false; + nlen = ntohl(nlen); + //fprintf(stderr, "tagname len=%x\n", (unsigned)nlen); +- *name = new char[nlen+1]; +- (*name)[nlen] = '\0'; ++ if (nlen > maxtaglen) ++ return false; + + uint32_t vlen; +- fread(&vlen, sizeof(vlen), 1, fp); ++ if (fread(&vlen, sizeof(vlen), 1, fp) != 1) ++ return false; + vlen = ntohl(vlen); + //fprintf(stderr, "tag len=%x\n", (unsigned)vlen); ++ if (vlen > maxtaglen) ++ return false; ++ ++ *name = new char[nlen+1]; ++ if (!*name) ++ return false; ++ + *value = new char[vlen+1]; ++ if (!*value) ++ { ++ delete[] *name; ++ *name = 0; ++ return false; ++ } ++ ++ (*name)[nlen] = '\0'; + (*value)[vlen] = '\0'; + +- fread(*name, nlen, 1, fp); +- fread(*value, vlen, 1, fp); ++ if (fread(*name, nlen, 1, fp) != 1) ++ { ++ delete[] *name; ++ *name = 0; ++ delete[] *value; ++ *value = 0; ++ return false; ++ } ++ if (fread(*value, vlen, 1, fp) != 1) ++ { ++ delete[] *name; ++ *name = 0; ++ delete[] *value; ++ *value = 0; ++ return false; ++ } + char lasttag; +- fread(&lasttag, 1, 1, fp); ++ if (fread(&lasttag, 1, 1, fp) != 1) ++ { ++ delete[] *name; ++ *name = 0; ++ delete[] *value; ++ *value = 0; ++ return false; ++ } + //fprintf(stderr, "%s: \"%s\"\n", *name, *value); + + m_tagsEndOffset += 2 * 4 + nlen + vlen + 1; Property changes on: head/audio/amarok/files/patch-tkadv2009-002 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property