diff options
| author | he <he@pkgsrc.org> | 2005-08-10 16:50:18 +0000 |
|---|---|---|
| committer | he <he@pkgsrc.org> | 2005-08-10 16:50:18 +0000 |
| commit | 98725f554856d71ab88eece7fc7b21a51e62334f (patch) | |
| tree | 2ea820c11dda6de965a168d55f4d309c02be646b /graphics/xv/Makefile | |
| parent | 72c8689bba4fd884c0f49a27420048f3882ec843 (diff) | |
| download | pkgsrc-98725f554856d71ab88eece7fc7b21a51e62334f.tar.gz | |
Instead of separately integrating several different patches, instead
pull in the Jumbo patches from http://www.sonic.net/~roelofs/greg_xv.html.
As far as I can see this covers all our existing patches for added
functionality, although I cannot claim that I have tested each and
every one of them in the new version.
These patches disable a number of image formats that I think are less
common, which have potential heap overflows in the code due to in-
sufficient validation of image dimensions.
The version of the Jumbo patch used here is the 20050501 version.
Package revision bumped to nb10.
Diffstat (limited to 'graphics/xv/Makefile')
| -rw-r--r-- | graphics/xv/Makefile | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index 9a12acfff6e..43961b5335c 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -1,32 +1,28 @@ -# $NetBSD: Makefile,v 1.58 2005/07/19 13:56:48 wiz Exp $ +# $NetBSD: Makefile,v 1.59 2005/08/10 16:50:18 he Exp $ DISTNAME= xv-3.10a -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= graphics x11 -MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/ \ - ftp://ftp.kuis.kyoto-u.ac.jp/X11/contrib/clients/xv/ \ - ftp://ftp.tohoku.ac.jp/pub/X/app/xv/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - xv310a-magpic2-PhotoCD-patch.tar.gz # only from Japan +MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/ +#DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -PATCH_SITES= ftp://ftp.cis.upenn.edu/pub/xv/ -PATCHFILES= xv-3.10a.JPEG-patch xv-3.10a.TIFF-patch # (for tiff3.4) +PATCHFILES= xv-3.10a-jumbo-patches-20050501.tar.bz2 +PATCH_SITES= ${MASTER_SITE_SOURCEFORGE:=png-mng/} +PATCH_DIST_CAT= ${BZCAT} $$patchfile | ${TAR} -Oxf - "*-patch-*" +PATCH_DIST_STRIP= -p1 MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.trilon.com/xv/ +# and... http://www.sonic.net/~roelofs/greg_xv.html COMMENT= X11 program that displays images of various formats - USE_IMAKE= YES LICENSE= xv-license .include "../../mk/bsd.prefs.mk" -pre-patch: - @${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/Patch.magpic2.PhotoCD.XV310a - -post-patch: +pre-configure: ${MV} ${WRKSRC}/config.h ${WRKSRC}/config.h.orig && \ ${SED} -e 's|@LOCALBASE@|${LOCALBASE}|g' \ ${WRKSRC}/config.h.orig > ${WRKSRC}/config.h |