From 8cbe74c4f148e8dc1d211f225d382b844d612e93 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Tue, 4 Oct 2016 10:32:45 +0200 Subject: [PATCH] ghostscript-system-openjpeg2.patch removed * THIS COMMIT WILL DISABLE SUPPORT FOR OpenJPEG * New version of OpenJPEG library causes the build to fail. We need to build it in order to fix a security issue (see later commits). This is only a temporary solution, to fix the security issue. Then we will have more time on fixing the issue with OpenJPEG. --- ghostscript-system-openjpeg2.patch | 60 ------------------------------ ghostscript.spec | 8 ++-- 2 files changed, 4 insertions(+), 64 deletions(-) delete mode 100644 ghostscript-system-openjpeg2.patch diff --git a/ghostscript-system-openjpeg2.patch b/ghostscript-system-openjpeg2.patch deleted file mode 100644 index 5118522..0000000 --- a/ghostscript-system-openjpeg2.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -up ghostscript-9.16/base/openjpeg.mak.system-openjpeg2 ghostscript-9.16/base/openjpeg.mak ---- ghostscript-9.16/base/openjpeg.mak.system-openjpeg2 2015-03-30 09:21:24.000000000 +0100 -+++ ghostscript-9.16/base/openjpeg.mak 2015-03-30 17:05:55.160034798 +0100 -@@ -16,6 +16,7 @@ - # makefile for Luratech lwf_jp2 library code. - # Users of this makefile must define the following: - # SHARE_JPX - whether to compile in or link to the library -+# SHARE_JPX_LIB - name of external library to link to - # JPXSRCDIR - the library source directory - # - # gs.mak and friends define the following: -@@ -105,7 +106,7 @@ $(OPEN_JPEG_GEN)openjpeg.dev : $(TOP_MAK - # external link .dev - $(OPEN_JPEG_GEN)openjpeg_1.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_MAK) $(ECHOGS_XE) \ - $(MAKEDIRS) -- $(SETMOD) $(OPEN_JPEG_GEN)openjpeg_1 -lib lib_openjpeg -+ $(SETMOD) $(OPEN_JPEG_GEN)openjpeg_1 -lib $(SHARE_JPX_LIB) - - # compile our own .dev - $(OPEN_JPEG_GEN)openjpeg_0.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_MAK) $(ECHOGS_XE) $(open_jpeg_OBJS) \ -diff -up ghostscript-9.16/configure.ac.system-openjpeg2 ghostscript-9.16/configure.ac ---- ghostscript-9.16/configure.ac.system-openjpeg2 2015-03-30 09:21:24.000000000 +0100 -+++ ghostscript-9.16/configure.ac 2015-03-30 17:05:08.563193858 +0100 -@@ -1531,6 +1531,17 @@ if test "x$JPX_DECODER" = "x"; then - JPXDEVS='$(PSD)jpx.dev' - else - AC_MSG_RESULT([no]) -+ AC_MSG_CHECKING([for system OpenJPEG library]) -+ if $PKGCONFIG --exists libopenjp2; then -+ AC_MSG_RESULT(yes) -+ JPX_DECODER=openjpeg -+ SHARE_JPX=1 -+ SHARE_JPX_LIB="`$PKGCONFIG libopenjp2 --libs | sed -e 's,^-l,,'`" -+ JPX_AUTOCONF_CFLAGS="-DUSE_OPENJPEG_JP2 `$PKGCONFIG libopenjp2 --cflags`" -+ JPXDEVS='$(PSD)jpx.dev' -+ else -+ AC_MSG_RESULT(no) -+ fi - fi - fi - fi -@@ -1539,6 +1550,7 @@ AC_SUBST(JPX_DECODER) - AC_SUBST(JPX_AUTOCONF_CFLAGS) - AC_SUBST(JPXDIR) - AC_SUBST(SHARE_JPX) -+AC_SUBST(SHARE_JPX_LIB) - AC_SUBST(JPXDEVS) - - dnl check if we can/should build the gtk loader -diff -up ghostscript-9.16/Makefile.in.system-openjpeg2 ghostscript-9.16/Makefile.in ---- ghostscript-9.16/Makefile.in.system-openjpeg2 2015-03-30 17:02:51.000000000 +0100 -+++ ghostscript-9.16/Makefile.in 2015-03-30 17:05:08.563193858 +0100 -@@ -248,6 +248,7 @@ JBIG2_CFLAGS=@JBIG2_AUTOCONF_CFLAGS@ - # and source location and configuration flags for compiling in - JPX_LIB=@JPX_DECODER@ - SHARE_JPX=@SHARE_JPX@ -+SHARE_JPX_LIB=@SHARE_JPX_LIB@ - JPXSRCDIR=@JPXDIR@ - JPX_CFLAGS=@JPX_AUTOCONF_CFLAGS@ - diff --git a/ghostscript.spec b/ghostscript.spec index 5763bd0..196369d 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer Name: ghostscript Version: %{gs_ver} -Release: 4%{?dist} +Release: 5%{?dist} # Included CMap data is Redistributable, no modification permitted, # see http://bugzilla.redhat.com/487510 @@ -29,7 +29,6 @@ Patch4: ghostscript-runlibfileifexists.patch Patch5: ghostscript-icc-missing-check.patch Patch6: ghostscript-Fontmap.local.patch Patch7: ghostscript-wrf-snprintf.patch -Patch8: ghostscript-system-openjpeg2.patch Patch9: ghostscript-system-zlib.patch Patch10: ghostscript-urw-fonts-naming.patch @@ -144,8 +143,6 @@ rm -rf expat freetype icclib jasper jpeg jpegxr lcms lcms2 libpng openjpeg zlib # Use more caution when converting floats to strings (bug #980085). %patch7 -p1 -b .wrf-snprintf -%patch8 -p1 -b .system-openjpeg2 - # Fixes for using the system zlib. %patch9 -p1 -b .system-zlib @@ -351,6 +348,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgs.so %changelog +* Tue Oct 4 2016 David Kaspar [Dee'Kej] - 9.16-5 +- [TEMPORARY] Support for OpenJPEG disabled for builds to pass. + * Wed Feb 03 2016 Fedora Release Engineering - 9.16-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild