Tue Mar 8 17:09:25 2011 UTC ()
update to 0.8
no changelog available, at least some security fixes were done:
-fix possible memory corruption due to malformed JPEG images
(was patched in pkgsrc)
-fix (at least) 2 cases of integer overflow in array allocation (SA42320)
(drochner)
diff -r1.7 -r1.8 pkgsrc/print/mupdf/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/print/mupdf/buildlink3.mk
diff -r1.4 -r1.5 pkgsrc/print/mupdf/distinfo
diff -r1.1 -r1.2 pkgsrc/print/mupdf/patches/patch-ac
diff -r1.1 -r0 pkgsrc/print/mupdf/patches/patch-ad
diff -r0 -r1.1 pkgsrc/print/mupdf/patches/patch-ae
--- pkgsrc/print/mupdf/Makefile 2011/01/31 17:44:30 1.7
+++ pkgsrc/print/mupdf/Makefile 2011/03/08 17:09:25 1.8
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2011/01/31 17:44:30 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2011/03/08 17:09:25 drochner Exp $
#
-DISTNAME= mupdf-0.7
-PKGREVISION= 1
+DISTNAME= mupdf-0.8-source
+PKGNAME= mupdf-0.8
CATEGORIES= print
MASTER_SITES= http://ccxvii.net/mupdf/download/ \
http://ccxvii.net/mupdf/download/archive/
@@ -12,6 +12,7 @@
COMMENT= Lightweight PDF viewer and toolkit
LICENSE= gnu-gpl-v3
+WRKSRC= ${WRKDIR}/mupdf-0.8
PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= pkg-config gmake
--- pkgsrc/print/mupdf/buildlink3.mk 2010/02/18 10:07:32 1.1.1.1
+++ pkgsrc/print/mupdf/buildlink3.mk 2011/03/08 17:09:25 1.2
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/02/18 10:07:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2011/03/08 17:09:25 drochner Exp $
BUILDLINK_TREE+= mupdf
@@ -6,9 +6,8 @@
MUPDF_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.mupdf+= mupdf>=0.0.937
-BUILDLINK_PKGSRCDIR.mupdf?= ../../nih/mupdf
+BUILDLINK_PKGSRCDIR.mupdf?= ../../print/mupdf
-BUILDLINK_DEPMETHOD.mupdf?= build
.endif # MUPDF_BUILDLINK3_MK
BUILDLINK_TREE+= -mupdf
--- pkgsrc/print/mupdf/distinfo 2011/01/31 17:44:30 1.4
+++ pkgsrc/print/mupdf/distinfo 2011/03/08 17:09:25 1.5
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2011/01/31 17:44:30 drochner Exp $
+$NetBSD: distinfo,v 1.5 2011/03/08 17:09:25 drochner Exp $
-SHA1 (mupdf-0.7.tar.gz) = 3e97cefa9a65b770cc1be7584d6a5da9dc064d84
-RMD160 (mupdf-0.7.tar.gz) = 82723652fb967be7665cfc55f4b2bb7c3ff55b69
-Size (mupdf-0.7.tar.gz) = 3557621 bytes
+SHA1 (mupdf-0.8-source.tar.gz) = bb3938226b422042f1880eba887501046653e618
+RMD160 (mupdf-0.8-source.tar.gz) = d4296e9d01a7719fa148181704aac9e1d90af4c3
+Size (mupdf-0.8-source.tar.gz) = 3837000 bytes
SHA1 (patch-ab) = ab4f0f5518dcc8e76ef2578f8c539b94e95d4f0a
-SHA1 (patch-ac) = 2c2b4a64b486e0b628e1a097c71f8e011daf85f5
+SHA1 (patch-ac) = 2c409e63bc9bf99428dba95afe4363bfe2467a11
-SHA1 (patch-ad) = 58aa0c2006e1222c4575a33ee276995cf02e6c5b
+SHA1 (patch-ae) = d4e5dcee67de682e38bf537d5b93948135af5dd7
--- pkgsrc/print/mupdf/patches/patch-ac 2010/09/15 13:15:29 1.1
+++ pkgsrc/print/mupdf/patches/patch-ac 2011/03/08 17:09:25 1.2
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1 2010/09/15 13:15:29 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2011/03/08 17:09:25 drochner Exp $
---- Makefile.orig 2010-08-25 14:12:08.000000000 +0000
+--- Makefile.orig 2011-03-03 15:10:58.000000000 +0000
+++ Makefile
@@ -41,32 +41,21 @@ CFLAGS += $(THIRD_INCS) $(SYS_FREETYPE_I
# Build commands
@@ -39,7 +39,7 @@
$(LD_CMD)
#
-@@ -112,7 +101,7 @@ FITZ_SRC := \
+@@ -113,7 +102,7 @@ FITZ_SRC := \
fitz/stm_buffer.c \
fitz/stm_open.c \
fitz/stm_read.c
@@ -48,7 +48,7 @@
$(FITZ_OBJ): $(FITZ_HDR)
DRAW_SRC := $(DRAW_ARCH_SRC) \
-@@ -128,8 +117,8 @@ DRAW_SRC := $(DRAW_ARCH_SRC) \
+@@ -129,8 +118,8 @@ DRAW_SRC := $(DRAW_ARCH_SRC) \
draw/pathscan.c \
draw/pathstroke.c \
draw/porterduff.c
@@ -59,7 +59,7 @@
$(DRAW_OBJ): $(FITZ_HDR)
MUPDF_HDR := $(FITZ_HDR) mupdf/mupdf.h
-@@ -166,19 +155,19 @@ MUPDF_SRC := \
+@@ -167,19 +156,19 @@ MUPDF_SRC := \
mupdf/pdf_unicode.c \
mupdf/pdf_xobject.c \
mupdf/pdf_xref.c
@@ -90,7 +90,7 @@
#
# Generated font file dumps
-@@ -217,7 +206,7 @@ FONT_SRC := \
+@@ -218,7 +207,7 @@ FONT_SRC := \
$(GENDIR)/font_base14.c \
$(GENDIR)/font_cjk.c
@@ -99,7 +99,7 @@
#
-@@ -287,13 +276,13 @@ CMAP_SRC := \
+@@ -288,13 +277,13 @@ CMAP_SRC := \
$(GENDIR)/cmap_japan.c \
$(GENDIR)/cmap_korea.c
@@ -115,7 +115,7 @@
$(MUPDF_LIB): $(FITZ_OBJ) $(DRAW_OBJ) $(MUPDF_OBJ) $(CMAP_OBJ) $(FONT_OBJ)
$(AR_CMD)
-@@ -303,40 +292,40 @@ $(MUPDF_LIB): $(FITZ_OBJ) $(DRAW_OBJ) $(
+@@ -304,40 +293,40 @@ $(MUPDF_LIB): $(FITZ_OBJ) $(DRAW_OBJ) $(
APPS = $(PDFSHOW_EXE) $(PDFCLEAN_EXE) $(PDFDRAW_EXE) $(PDFEXTRACT_EXE) $(PDFINFO_EXE) $(PDFVIEW_EXE)
@@ -164,7 +164,7 @@
$(PDFINFO_OBJ): $(MUPDF_HDR)
$(PDFINFO_EXE): $(PDFINFO_OBJ) $(MUPDF_LIB) $(THIRD_LIBS)
$(LD_CMD)
-@@ -344,7 +333,7 @@ $(PDFINFO_EXE): $(PDFINFO_OBJ) $(MUPDF_L
+@@ -345,7 +334,7 @@ $(PDFINFO_EXE): $(PDFINFO_OBJ) $(MUPDF_L
PDFAPP_HDR = apps/pdfapp.h
X11VIEW_SRC=apps/x11_main.c apps/x11_image.c apps/pdfapp.c
@@ -173,7 +173,7 @@
X11VIEW_EXE=$(OBJDIR)/mupdf
$(X11VIEW_OBJ): $(MUPDF_HDR) $(PDFAPP_HDR)
-@@ -353,7 +342,7 @@ $(X11VIEW_EXE): $(X11VIEW_OBJ) $(MUPDF_L
+@@ -354,7 +343,7 @@ $(X11VIEW_EXE): $(X11VIEW_OBJ) $(MUPDF_L
WINVIEW_SRC=apps/win_main.c apps/pdfapp.c
WINVIEW_RES=apps/win_res.rc
@@ -182,15 +182,15 @@
WINVIEW_EXE=$(OBJDIR)/mupdf.exe
$(OBJDIR)/%.o: apps/%.rc
-@@ -378,7 +367,7 @@ nuke:
- rm -rf build
+@@ -383,7 +372,7 @@ LIBDIR ?= $(prefix)/lib
+ INCDIR ?= $(prefix)/include
install: $(OBJDIR) $(GENDIR) $(MUPDF_LIB) $(APPS)
-- install -d $(prefix)/bin $(prefix)/lib $(prefix)/include
+- install -d $(BINDIR) $(LIBDIR) $(INCDIR)
-- install $(APPS) $(prefix)/bin
+- install $(APPS) $(BINDIR)
-- install $(MUPDF_LIB) $(prefix)/lib
+- install $(MUPDF_LIB) $(LIBDIR)
-- install $(MUPDF_HDR) $(prefix)/include
+- install $(MUPDF_HDR) $(INCDIR)
-+ mkdir -p $(prefix)/bin $(prefix)/lib $(prefix)/include
++ mkdir -p $(BINDIR) $(LIBDIR) $(INCDIR)
-+ libtool --mode=install ${BSD_INSTALL_PROGRAM} $(APPS) $(prefix)/bin
++ libtool --mode=install ${BSD_INSTALL_PROGRAM} $(APPS) $(BINDIR)
-+ libtool --mode=install ${BSD_INSTALL_LIB} $(MUPDF_LIB) $(prefix)/lib
++ libtool --mode=install ${BSD_INSTALL_LIB} $(MUPDF_LIB) $(LIBDIR)
-+ ${BSD_INSTALL_DATA} $(MUPDF_HDR) $(prefix)/include
++ ${BSD_INSTALL_DATA} $(MUPDF_HDR) $(INCDIR)
$NetBSD: patch-ae,v 1.1 2011/03/08 17:09:25 drochner Exp $
avoid namespace conflict on NetBSD
--- fitz/crypt_sha2.c.orig 2011-03-08 16:13:19.000000000 +0000
+++ fitz/crypt_sha2.c
@@ -15,7 +15,7 @@ static inline int isbigendian(void)
return *(char*)&one == 0;
}
-static inline unsigned int bswap32(unsigned int num)
+static inline unsigned int mup_bswap32(unsigned int num)
{
if (!isbigendian())
{
@@ -86,7 +86,7 @@ transform(unsigned int state[8], const u
/* ensure big-endian integers */
for (j = 0; j < 16; j++)
- data[j] = bswap32(data_xe[j]);
+ data[j] = mup_bswap32(data_xe[j]);
/* Copy state[] to working vars. */
memcpy(T, state, sizeof(T));
@@ -172,11 +172,11 @@ void fz_sha256final(fz_sha256 *context,
context->count[1] = (context->count[1] << 3) + (context->count[0] >> 29);
context->count[0] = context->count[0] << 3;
- context->buffer.u32[14] = bswap32(context->count[1]);
- context->buffer.u32[15] = bswap32(context->count[0]);
+ context->buffer.u32[14] = mup_bswap32(context->count[1]);
+ context->buffer.u32[15] = mup_bswap32(context->count[0]);
transform(context->state, context->buffer.u32);
for (j = 0; j < 8; j++)
- ((unsigned int *)digest)[j] = bswap32(context->state[j]);
+ ((unsigned int *)digest)[j] = mup_bswap32(context->state[j]);
memset(context, 0, sizeof(fz_sha256));
}