pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/xv Instead of separately integrating several ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/12f55d2425b3
branches: trunk
changeset: 498026:12f55d2425b3
user: he <he%pkgsrc.org@localhost>
date: Wed Aug 10 16:50:18 2005 +0000
description:
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:
graphics/xv/Makefile | 24 +-
graphics/xv/PLIST | 5 +-
graphics/xv/distinfo | 45 +-
graphics/xv/patches/patch-aa | 13 -
graphics/xv/patches/patch-ab | 58 --
graphics/xv/patches/patch-ac | 22 +-
graphics/xv/patches/patch-ad | 12 +-
graphics/xv/patches/patch-ae | 474 --------------------
graphics/xv/patches/patch-af | 50 +-
graphics/xv/patches/patch-ag | 975 -------------------------------------------
graphics/xv/patches/patch-ah | 42 +-
graphics/xv/patches/patch-ai | 81 +--
graphics/xv/patches/patch-aj | 80 +--
graphics/xv/patches/patch-ak | 62 --
graphics/xv/patches/patch-al | 179 -------
graphics/xv/patches/patch-am | 63 --
graphics/xv/patches/patch-an | 233 ----------
graphics/xv/patches/patch-ao | 86 ---
graphics/xv/patches/patch-ap | 97 ----
graphics/xv/patches/patch-aq | 152 ------
graphics/xv/patches/patch-ar | 37 -
graphics/xv/patches/patch-as | 52 --
graphics/xv/patches/patch-at | 90 ---
graphics/xv/patches/patch-au | 39 -
graphics/xv/patches/patch-av | 39 -
graphics/xv/patches/patch-aw | 45 -
graphics/xv/patches/patch-ax | 395 -----------------
graphics/xv/patches/patch-ay | 18 -
28 files changed, 108 insertions(+), 3360 deletions(-)
diffs (truncated from 3697 to 300 lines):
diff -r 3b5c362cd888 -r 12f55d2425b3 graphics/xv/Makefile
--- a/graphics/xv/Makefile Wed Aug 10 16:28:59 2005 +0000
+++ b/graphics/xv/Makefile Wed Aug 10 16:50:18 2005 +0000
@@ -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@localhost
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
diff -r 3b5c362cd888 -r 12f55d2425b3 graphics/xv/PLIST
--- a/graphics/xv/PLIST Wed Aug 10 16:28:59 2005 +0000
+++ b/graphics/xv/PLIST Wed Aug 10 16:50:18 2005 +0000
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/01 00:06:41 grant Exp $
-bin/xv
+@comment $NetBSD: PLIST,v 1.3 2005/08/10 16:50:18 he Exp $
bin/bggen
bin/vdcomp
bin/xcmap
+bin/xv
bin/xvpictoppm
+lib/X11/xv_mgcsfx.sample
${IMAKE_MAN_DIR}/xv.${IMAKE_MANNEWSUFFIX}
${IMAKE_MAN_DIR}/bggen.${IMAKE_MANNEWSUFFIX}
${IMAKE_MAN_DIR}/vdcomp.${IMAKE_MANNEWSUFFIX}
diff -r 3b5c362cd888 -r 12f55d2425b3 graphics/xv/distinfo
--- a/graphics/xv/distinfo Wed Aug 10 16:28:59 2005 +0000
+++ b/graphics/xv/distinfo Wed Aug 10 16:50:18 2005 +0000
@@ -1,39 +1,14 @@
-$NetBSD: distinfo,v 1.10 2005/05/25 12:32:30 wiz Exp $
+$NetBSD: distinfo,v 1.11 2005/08/10 16:50:18 he Exp $
SHA1 (xv-3.10a.tar.gz) = 9e6372f154be9e9e355972cbeb91d98d9c342474
RMD160 (xv-3.10a.tar.gz) = 7d545e0c0e5b0120a7d026ea549cba19a53fbc0d
Size (xv-3.10a.tar.gz) = 2259124 bytes
-SHA1 (xv310a-magpic2-PhotoCD-patch.tar.gz) = b36192f0ab6cefba4221f8137d717a4c2cd45abd
-RMD160 (xv310a-magpic2-PhotoCD-patch.tar.gz) = 012c800f252d6d64c4906051e1964e59d32cf128
-Size (xv310a-magpic2-PhotoCD-patch.tar.gz) = 56612 bytes
-SHA1 (xv-3.10a.JPEG-patch) = 05d0de5a3c4babc36f867247e1920eca6b9e9ff0
-RMD160 (xv-3.10a.JPEG-patch) = f69cb0c07c116fbcec58678bcba1b5ef96cb7e62
-Size (xv-3.10a.JPEG-patch) = 3297 bytes
-SHA1 (xv-3.10a.TIFF-patch) = 5e1ce5610a83a88d5878eefe175352a4cc2aa21c
-RMD160 (xv-3.10a.TIFF-patch) = 4c09609558f1b93a67cae2abaf14462208dd850b
-Size (xv-3.10a.TIFF-patch) = 3241 bytes
-SHA1 (patch-aa) = 2c3b3819b77df503d6d86725cbc2fce2d101a1b0
-SHA1 (patch-ab) = dee0a3fc05e01f8b15c636ec4dcf745533eca345
-SHA1 (patch-ac) = 79793d6feb5d15e8e91f3e0747b7b14b00b21254
-SHA1 (patch-ad) = 699c3b8e636b369ec2f0de995df0c028f6b1e91a
-SHA1 (patch-ae) = a2adc219090e3214ff6c891cd76d3285ee0596b0
-SHA1 (patch-af) = 1c6578865affe775936d10118de72aada84887c5
-SHA1 (patch-ag) = 6802096dc1493a92379cd2750448407cf4e08dc4
-SHA1 (patch-ah) = 5d9fbc3459c44e8c61f50d9f0624ec2069795af9
-SHA1 (patch-ai) = 1beb3d45b08be536f297661f5dbdca050591548a
-SHA1 (patch-aj) = 0df06a5187f43dd4a97f795d9ef29fe773b21806
-SHA1 (patch-ak) = cfefb6ed9d0747f620f9ea4dcfc948fd8355f137
-SHA1 (patch-al) = 7a1118af7b5581ab0fd28b95d4a973aefb544b09
-SHA1 (patch-am) = 6b59620ae2998f28a06c88d292c6ab9fc9095ccb
-SHA1 (patch-an) = 8eb0076fc932ad3859e72b5de228806457e812f8
-SHA1 (patch-ao) = a708368db9288b0697d9c7fac117b4a1c2eaa751
-SHA1 (patch-ap) = d80d3f42ef65f8941a9a2b318ec3895cf35a6fa4
-SHA1 (patch-aq) = 5ab291d650c65437000951c6cbb42c0b7799db8f
-SHA1 (patch-ar) = 61747379c2f080d13bc76b2175e8e7ae61647374
-SHA1 (patch-as) = 03e8fafaf267fda7e17aee58ba48096796161e74
-SHA1 (patch-at) = 25e111754de9fbb48f17bf140f984e14a29413a9
-SHA1 (patch-au) = 3cb2fde94db4b71a449c81e4b912132b204b0062
-SHA1 (patch-av) = cb815b12de135927cad826623c5071e938a59509
-SHA1 (patch-aw) = 2085110d88d34a78d14b68dd6a3cbff56251352f
-SHA1 (patch-ax) = 81adbda29a9e3633085bd41b409f5795d0f353b1
-SHA1 (patch-ay) = 55ccef29880f7fed50a1287402dd5e8b50b98b48
+SHA1 (xv-3.10a-jumbo-patches-20050501.tar.bz2) = deb42fc30697312f13fcedb88f10cc3ed0ced8ac
+RMD160 (xv-3.10a-jumbo-patches-20050501.tar.bz2) = d199e7d1b6c5162e0cad09d4118b3735f1d156ef
+Size (xv-3.10a-jumbo-patches-20050501.tar.bz2) = 369886 bytes
+SHA1 (patch-ac) = cc0da5cefbb4a13b86daaca482c52ece4bc3294c
+SHA1 (patch-ad) = 3a49ca0152f6a7d6cf79348e3b5308da509b63ea
+SHA1 (patch-af) = bff31d4bc15986e293cf4796dcd3df808057f6db
+SHA1 (patch-ah) = 830139139ddf49a505786cde8930ba1e9ae006f4
+SHA1 (patch-ai) = 10febc95047fc25a3b93c157eb39ed1ed7a30bc6
+SHA1 (patch-aj) = 7f40c002d8a16b1507c6171db543285447e3cf81
diff -r 3b5c362cd888 -r 12f55d2425b3 graphics/xv/patches/patch-aa
--- a/graphics/xv/patches/patch-aa Wed Aug 10 16:28:59 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:55 agc Exp $
-
---- ./xvpcd.c.org Wed Jul 2 23:59:27 1997
-+++ ./xvpcd.c Thu Jul 3 00:17:25 1997
-@@ -623,7 +623,7 @@
-
- for (i=0; i<T_NBUTTS; i++) BTRedraw(&tbut[i]);
-
-- ULineString(pcdW, "Resolution", resnRB->x-16, resnRB->y-10-DESCENT);
-+ ULineString(pcdW, resnRB->x-16, resnRB->y-10-DESCENT, "Resolution");
- RBRedraw(resnRB, -1);
-
- XDrawString(theDisp, pcdW, theGC, 20, 19, title, strlen(title));
diff -r 3b5c362cd888 -r 12f55d2425b3 graphics/xv/patches/patch-ab
--- a/graphics/xv/patches/patch-ab Wed Aug 10 16:28:59 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2003/02/28 23:44:38 grant Exp $
-
---- vdcomp.c.orig Sat Mar 1 10:42:12 2003
-+++ vdcomp.c
-@@ -109,12 +109,16 @@
- !defined(__bsd43) && \
- !defined(aux) && \
- !defined(__bsdi__) && \
-- !defined(sequent)
-+ !defined(sequent) && \
-+ !defined(__FreeBSD__) && \
-+ !defined(__NetBSD__) && \
-+ !defined(__DARWIN__)
-
- # if defined(hp300) || defined(hp800) || defined(NeXT)
- # include <sys/malloc.h> /* it's in 'sys' on HPs and NeXT */
- # else
--# if !defined(__386BSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
-+# if !defined(__386BSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) \
-+ && !defined(__Darwin__)
- /*
- I want to use BSD macro for checking if this OS is *BSD or not,
- but the macro is defined in <sys/parm.h>, which I don't know all
-@@ -437,10 +441,13 @@ int host;
- {
- short shortint;
- typedef long off_t;
-+ char *s;
-
- if (inname[0] == ' ') {
- printf("\nEnter name of file to be decompressed: ");
-- gets (inname);
-+ fgets (inname, sizeof(inname), stdin);
-+ if ((s = strchr(inname, '\n')) != NULL)
-+ *s = '\0';
- }
-
- if (host == 1 | host == 2) {
-@@ -482,13 +489,17 @@ int host;
- printf("\n 3. VICAR format.");
- printf("\n 4. Unlabelled binary array.\n");
- printf("\n Enter format number:");
-- gets(inname);
-+ fgets (inname, sizeof(inname), stdin);
-+ if ((s = strchr(inname, '\n')) != NULL)
-+ *s = '\0';
- output_format = atoi(inname);
- } while (output_format < 1 || output_format > 4);
-
- if (outname[0] == ' ') {
- printf("\nEnter name of uncompressed output file: ");
-- gets (outname);
-+ fgets (outname, sizeof(outname), stdin);
-+ if ((s = strchr(outname, '\n')) != NULL)
-+ *s = '\0';
- }
-
- return(host);
diff -r 3b5c362cd888 -r 12f55d2425b3 graphics/xv/patches/patch-ac
--- a/graphics/xv/patches/patch-ac Wed Aug 10 16:28:59 2005 +0000
+++ b/graphics/xv/patches/patch-ac Wed Aug 10 16:50:18 2005 +0000
@@ -1,26 +1,18 @@
-$NetBSD: patch-ac,v 1.7 2000/04/20 16:30:52 jlam Exp $
+$NetBSD: patch-ac,v 1.8 2005/08/10 16:50:18 he Exp $
---- config.h.orig Fri Nov 19 09:32:02 1999
-+++ config.h Fri Nov 19 09:32:57 1999
-@@ -13,7 +13,7 @@
- * definition appropriately. (use 'which gunzip' to find if you have gunzip,
- * and where it lives)
- */
--#undef USE_GUNZIP
-+#define USE_GUNZIP
-
- #ifdef USE_GUNZIP
- # ifdef VMS
-@@ -98,9 +98,9 @@
+--- config.h.orig 2005-07-29 15:11:02.000000000 +0200
++++ config.h
+@@ -116,10 +116,9 @@
* should not need to be changed
*/
-/* #define GS_PATH "/usr/local/bin/gs" */
+-#define GS_PATH "/usr/bin/gs"
-/* #define GS_LIB "." */
-/* #define GS_DEV "ppmraw" */
+#define GS_PATH "@LOCALBASE@/bin/gs"
-+#define GS_LIB "@LOCALBASE@/share/ghostscript"
-+#define GS_DEV "ppmraw"
++#define GS_LIB "@LOCALBASE@/share/ghostscript"
++#define GS_DEV "ppmraw"
/***************************************************************************
diff -r 3b5c362cd888 -r 12f55d2425b3 graphics/xv/patches/patch-ad
--- a/graphics/xv/patches/patch-ad Wed Aug 10 16:28:59 2005 +0000
+++ b/graphics/xv/patches/patch-ad Wed Aug 10 16:50:18 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.8 2001/04/05 13:57:15 wiz Exp $
+$NetBSD: patch-ad,v 1.9 2005/08/10 16:50:18 he Exp $
---- Imakefile.orig Tue Oct 27 00:45:53 1998
-+++ Imakefile Tue Oct 27 01:13:26 1998
+--- Imakefile.orig 2005-07-29 15:14:59.000000000 +0200
++++ Imakefile
@@ -6,13 +6,15 @@
/* if, for whatever reason, you're unable to get the JPEG library to compile
* on your machine, *COMMENT OUT* the following line
@@ -20,7 +20,7 @@
/* if, for whatever reason, you're unable to get the PDS/VICAR support
-@@ -119,16 +121,30 @@
+@@ -124,16 +126,30 @@ MGCSFX = -DMGCSFXDIR=\"$(MGCSFXDIR)\"
JPEG = -DDOJPEG
JPEGDIR = jpeg
LIBJPEG = $(JPEGDIR)/libjpeg.a
@@ -51,7 +51,7 @@
#ifdef HavePDS
PDS = -DDOPDS
#endif
-@@ -141,8 +157,8 @@
+@@ -149,8 +165,8 @@ SYS_LIBRARIES= -lm
#endif
@@ -62,7 +62,7 @@
DEFINES= $(SCO) $(UNIX) $(NODIRENT) $(VPRINTF) $(TIMERS) \
$(HPUX7) $(JPEG) $(TIFF) $(PDS) $(DXWM) $(RAND) \
-@@ -182,10 +198,10 @@
+@@ -194,10 +210,10 @@ OBJS5= xvpictoppm.o
PROGRAMS= xv bggen vdcomp xcmap xvpictoppm
diff -r 3b5c362cd888 -r 12f55d2425b3 graphics/xv/patches/patch-ae
--- a/graphics/xv/patches/patch-ae Wed Aug 10 16:28:59 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,474 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 10:40:56 agc Exp $
-
---- xvimage.c~ Fri Jan 13 18:11:36 1995
-+++ xvimage.c Tue Oct 15 16:41:47 1996
-@@ -46,6 +46,274 @@
- static int ReadImageFile1 PARM((char *, PICINFO *));
-
-
-+/* The following array represents the pixel values for each shade of
-+ * the primary color components.
-+ * If 'p' is a pointer to a source image rgb-byte-triplet, we can
-+ * construct the output pixel value simply by 'oring' together
-+ * the corresponding components:
-+ *
-+ * unsigned char *p;
-+ * unsigned long pixval;
-+ *
-+ * pixval = screen_rgb[0][*p++];
-+ * pixval |= screen_rgb[1][*p++];
-+ * pixval |= screen_rgb[2][*p++];
-+ *
-+ * This is both efficient and generic, since the only assumption
-+ * is that the primary color components have separate bits.
-+ * The order and distribution of bits does not matter, and we
Home |
Main Index |
Thread Index |
Old Index