From db9819a858841867cd1c6de750d30bcbf4720dd8 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sun, 20 May 2012 18:17:25 +0400 Subject: [PATCH] New release --- .gitignore | 1 + mupdf-buffer_overflow.patch | 47 -------------------------------- mupdf-upstream.patch | 14 ++++++++++ mupdf.spec | 54 ++++++++++++++++++++----------------- sources | 2 +- 5 files changed, 45 insertions(+), 73 deletions(-) delete mode 100644 mupdf-buffer_overflow.patch create mode 100644 mupdf-upstream.patch diff --git a/.gitignore b/.gitignore index a779ea9..4989f28 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /mupdf-0.8.15-source.tar.gz /mupdf-0.8.165-source.tar.gz /mupdf-0.9-source.tar.gz +/mupdf-1.0-source.tar.gz diff --git a/mupdf-buffer_overflow.patch b/mupdf-buffer_overflow.patch deleted file mode 100644 index 68a3644..0000000 --- a/mupdf-buffer_overflow.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/apps/pdfapp.c -+++ b/apps/pdfapp.c -@@ -285,8 +287,20 @@ static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage, int repai - - if (drawpage) - { -- sprintf(buf, "%s - %d/%d (%d dpi)", app->doctitle, -+ char buf2[64]; -+ int len; -+ -+ sprintf(buf2, " - %d/%d (%d dpi)", - app->pageno, app->pagecount, app->resolution); -+ len = MAX_TITLE-strlen(buf2); -+ if (strlen(app->doctitle) > len) -+ { -+ snprintf(buf, len-3, "%s", app->doctitle); -+ strcat(buf, "..."); -+ strcat(buf, buf2); -+ } -+ else -+ sprintf(buf, "%s%s", app->doctitle, buf2); - wintitle(app, buf); - - ctm = pdfapp_viewctm(app); --- ---- apps/pdfapp.c 2012-03-14 21:50:05.673159926 +0400 -+++ b/apps/pdfapp.c 2012-03-14 21:50:36.621159125 +0400 -@@ -339,7 +339,7 @@ - - static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage, int repaint) - { -- char buf[256]; -+ char buf[MAX_TITLE]; - fz_device *idev; - fz_device *tdev; - fz_colorspace *colorspace; ---- apps/pdfapp.c 2012-03-14 21:53:20.659154121 +0400 -+++ b/apps/pdfapp.c 2012-03-14 21:55:33.566150087 +0400 -@@ -336,7 +336,7 @@ - - xps_free_page(app->xps, page); - } -- -+#define MAX_TITLE 256 - static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage, int repaint) - { - char buf[MAX_TITLE]; diff --git a/mupdf-upstream.patch b/mupdf-upstream.patch new file mode 100644 index 0000000..34c449e --- /dev/null +++ b/mupdf-upstream.patch @@ -0,0 +1,14 @@ +--- a/fitz/image_jpx.c ++++ b/fitz/image_jpx.c +@@ -50,8 +50,11 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace *defcs + evtmgr.info_handler = fz_opj_info_callback; + + opj_set_default_decoder_parameters(¶ms); ++ ++#ifdef OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG + if (indexed) + params.flags |= OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG; ++#endif + + info = opj_create_decompress(format); + opj_set_event_mgr((opj_common_ptr)info, &evtmgr, ctx); diff --git a/mupdf.spec b/mupdf.spec index b114290..ffacff1 100644 --- a/mupdf.spec +++ b/mupdf.spec @@ -1,14 +1,14 @@ Name: mupdf -Version: 0.9 -Release: 4%{?dist} +Version: 1.0 +Release: 1%{?dist} Summary: A lightweight PDF viewer and toolkit - Group: Applications/Publishing License: GPLv3 URL: http://mupdf.com/ Source0: http://mupdf.com/download/%{name}-%{version}-source.tar.gz Source1: %{name}.desktop -Patch0: %{name}-buffer_overflow.patch +## http://bugs.ghostscript.com/show_bug.cgi?format=multiple&id=693010 +Patch0: %{name}-upstream.patch BuildRequires: openjpeg-devel jbig2dec-devel desktop-file-utils BuildRequires: libjpeg-devel freetype-devel libXext-devel @@ -38,19 +38,20 @@ The mupdf-devel package contains header files for developing applications that use mupdf and static libraries %prep -%setup -q +%setup -q -n %{name}-%{version}-source %patch0 -p1 %build export CFLAGS="%{optflags}" -make %{?_smp_mflags} verbose=1 +make -j1 +## %{?_smp_mflags} verbose=1 %install make DESTDIR=%{buildroot} install prefix=%{buildroot}/usr libdir=%{buildroot}%{_libdir} desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} install -D -m644 debian/%{name}.xpm %{buildroot}/%{_datadir}/pixmaps/%{name}.xpm ## filename conflict with poppler -mv %{buildroot}%{_bindir}/pdfinfo %{buildroot}%{_bindir}/pdfinfo-mupdf +### mv %{buildroot}%{_bindir}/pdfinfo %{buildroot}%{_bindir}/pdfinfo-mupdf ## fix strange permissons chmod 0644 %{buildroot}/%{_includedir}/*.h chmod 0644 %{buildroot}%{_libdir}/*.a @@ -65,34 +66,37 @@ update-desktop-database &> /dev/null || : %files %defattr(-,root,root,-) %doc COPYING README -%{_bindir}/%{name} -%{_bindir}/pdfclean -%{_bindir}/pdfdraw -%{_bindir}/pdfextract -%{_bindir}/pdfshow -%{_bindir}/pdfinfo-mupdf -%{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.xpm -%{_mandir}/man?/*.1* -%{_bindir}/xpsdraw +%{_bindir}/mudraw +%{_bindir}/mupdf +%{_bindir}/mupdfclean +%{_bindir}/mupdfextract +%{_bindir}/mupdfinfo +%{_bindir}/mupdfshow +%{_datadir}/applications/mupdf.desktop +%{_mandir}/man1/mudraw.1.gz +%{_mandir}/man1/mupdf.1.gz +%{_mandir}/man1/mupdfclean.1.gz +%{_mandir}/man1/mupdfshow.1.gz +%{_datadir}/pixmaps/mupdf.xpm + + %files devel %defattr(-,root,root,-) %{_includedir}/fitz.h -%{_includedir}/%{name}.h +%{_includedir}/memento.h +%{_includedir}/mucbz.h +%{_includedir}/mupdf.h %{_includedir}/muxps.h %{_libdir}/libfitz.a -%{_libdir}/libmupdf.a -%{_libdir}/libmuxps.a %changelog -* Wed Mar 14 2012 Pavel Zhukov - 0.9-4 +* Sun May 20 2012 Pavel Zhukov - 1.0-1 +- New release + +* Wed Mar 14 2012 Pavel Zhukov - 0.9-2 - Fix buffer overflow (#752388) -* Thu Feb 09 2012 Rex Dieter 0.9-3 -- rebuild (openjpeg) - - * Fri Jan 13 2012 Fedora Release Engineering - 0.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 0190526..fbb1dec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76640ee16a797a27fe49cc0eaa87ce3a mupdf-0.9-source.tar.gz +d986ab98e2b035b7abd61afc474562b3 mupdf-1.0-source.tar.gz