commit 48379a65f38c52f536b137c29eedb87ce40f72b8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Sep 6 21:13:44 2018 +0200
- bumped system libs versions to greater or equal internal ones
- upstream dropped svgalib support, remove remnants from spec (incl. setuid patch)
- BR: cups-devel
ghostscript-setuid.patch | 43 -------------------------------------
ghostscript.spec | 55 +++++++++++++++++-------------------------------
2 files changed, 19 insertions(+), 79 deletions(-)
---
diff --git a/ghostscript.spec b/ghostscript.spec
index ae3eb64..c51d758 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -7,7 +7,6 @@
%bcond_without system_freetype # build with included freetype
%bcond_without system_jbig2dec # build with included jbig2dec
%bcond_with system_lcms2 # build with included lcms2 (which is thread safe)
-%bcond_with svga # svgalib display support (vgalib,lvga256 devices) [broken in sources]
%bcond_without gtk # gsx (GTK+ based frontend)
%bcond_without texdocs # skip tetex BRs
@@ -28,13 +27,11 @@ Source0: https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 9b5953aa0cc155f4364f20036b848585
Patch0: %{name}-missquotes.patch
-Patch1: %{name}-setuid.patch
Patch2: ijs-pkgconfig.patch
Patch6: %{name}-gdevcd8-fixes.patch
Patch8: %{name}-zlib.patch
-
# fedora
Patch20: %{name}-scripts.patch
Patch21: %{name}-runlibfileifexists.patch
@@ -45,22 +42,21 @@ URL: http://www.ghostscript.com/
BuildRequires: autoconf >= 2.57
BuildRequires: automake >= 1.6
%{?with_cairo:BuildRequires: cairo-devel >= 1.2.0}
+BuildRequires: cups-devel >= 1.5
BuildRequires: dbus-devel
BuildRequires: docbook-style-dsssl
BuildRequires: fontconfig-devel
-%{?with_system_freetype:BuildRequires: freetype-devel >= 1:2.6}
+%{?with_system_freetype:BuildRequires: freetype-devel >= 1:2.9.1}
%{?with_gtk:BuildRequires: gtk+3-devel >= 3.0}
-%{?with_system_jbig2dec:BuildRequires: jbig2dec-devel >= 0.12}
+%{?with_system_jbig2dec:BuildRequires: jbig2dec-devel >= 0.15}
%{?with_system_lcms2:BuildRequires: lcms2-devel >= 2.6}
BuildRequires: libidn-devel
BuildRequires: libpaper-devel
-BuildRequires: libpng-devel >= 2:1.6.17
+BuildRequires: libpng-devel >= 2:1.6.34
BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel >= 4.0.1
BuildRequires: libtool
BuildRequires: pkgconfig
-# Required by 'gdevvglb' device.
-%{?with_svga:BuildRequires: svgalib-devel}
BuildRequires: tar >= 1:1.22
# for documentation regeneration
%if %{with texdocs}
@@ -70,11 +66,16 @@ BuildRequires: tetex-dvips
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXt-devel
BuildRequires: xz
-BuildRequires: zlib-devel >= 1.2.8
+BuildRequires: zlib-devel >= 1.2.11
+%{?with_system_freetype:Requires: freetype >= 1:2.9.1}
+%{?with_system_jbig2dec:Requires: jbig2dec >= 0.15}
%{?with_system_lcms2:Requires: lcms2 >= 2.6}
+Requires: libpng >= 2:1.6.34
+Requires: zlib >= 1.2.11
Obsoletes: ghostscript-afpl
Obsoletes: ghostscript-esp
Obsoletes: ghostscript-gpl
+Obsoletes: ghostscript-svga
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _ulibdir %{_prefix}/lib
@@ -127,18 +128,6 @@ Ghostscript with GTK+ console.
%description gtk -l pl.UTF-8
Ghostscript z konsolą GTK+.
-%package svga
-Summary: SVGAlib drivers for Ghostscript
-Summary(pl.UTF-8): Sterowniki SVGAlib dla Ghostscripta
-Group: Applications/Graphics
-Requires: %{name} = %{version}-%{release}
-
-%description svga
-SVGAlib output drivers for Ghostscript: lvga256, vgalib.
-
-%description svga -l pl.UTF-8
-Sterowniki wyjściowe SVGAlib dla Ghostscripta: lvga256, vgalib.
-
%package x11
Summary: X Window System drivers for Ghostscript
Summary(pl.UTF-8): Sterowniki systemu X Window dla Ghostscripta
@@ -219,7 +208,6 @@ Statyczna wersja biblioteki IJS.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%patch6 -p1
@@ -233,14 +221,14 @@ Statyczna wersja biblioteki IJS.
%build
# use system libs:
-# freetype 2.5.5 + few pre-2.6 fixes from git
+# freetype 2.9.1 + 2 git fixes (e0015f7612cf07ff80561475321ce1f98c7c2b88 + f1458d2e44d89e8bc7c0db068f1cbc54b74b9d98)
%{?with_system_freetype:%{__rm} -r freetype}
-# jbig2dec 0.12 + minor updates
+# jbig2dec 0.15 just before version bump
%{?with_system_jbig2dec:%{__rm} -r jbig2dec}
-# (unmodified) libpng 1.6.17 and zlib 1.2.8
+# (unmodified) libpng 1.6.34 and zlib 1.2.11
%{__rm} -r libpng zlib
-# (unmodified) libjpeg 9a is built with different configuration (D_MAX_BLOCKS_IN_MCU=64)
-# openjpeg is 2.1.0 + fixes; stick to bundled for now
+# libjpeg (9c without CLAMP_DC fixes) is built with different configuration (D_MAX_BLOCKS_IN_MCU=64)
+# openjpeg is 2.3.0 + few custom fixes; stick to bundled for now
# lcms2mt is thread safe version of lcms2
%{?with_system_lcms2:%{__rm} -r lcms2mt}
%{__aclocal}
@@ -250,7 +238,7 @@ Statyczna wersja biblioteki IJS.
%{!?with_cairo:--disable-cairo} \
--disable-compile-inits \
--enable-dynamic \
- --with-drivers=ALL%{?with_svga:,svga} \
+ --with-drivers=ALL \
--with-fontpath="%{_datadir}/fonts:%{_datadir}/fonts/Type1" \
--with-ijs \
--with-jbig2dec \
@@ -290,6 +278,8 @@ rm -rf $RPM_BUILD_ROOT
cp -p base/gserrors.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
+cp -p LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
%{__rm} $RPM_BUILD_ROOT%{_bindir}/*.sh \
$RPM_BUILD_ROOT%{_mandir}/man1/{ps2pdf1{2,3},eps2eps}.1 \
$RPM_BUILD_ROOT%{_mandir}/de/man1/{ps2pdf1{2,3},eps2eps}.1
@@ -310,7 +300,6 @@ echo ".so ps2pdf.1" > $RPM_BUILD_ROOT%{_mandir}/de/man1/ps2pdf13.1
bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.ghostscript-non-english-man-pages
-#mv -f $RPM_BUILD_ROOT%{_bindir}/{gsc,gs}
ln -sf gs $RPM_BUILD_ROOT%{_bindir}/gsc
ln -sf gs $RPM_BUILD_ROOT%{_bindir}/ghostscript
@@ -396,6 +385,7 @@ rm -rf $RPM_BUILD_ROOT
%lang(pl) %{_mandir}/pl/man1/*
%files doc
+%defattr(644,root,root,755)
%doc %{_docdir}/%{name}-%{version}
%if %{with gtk}
@@ -404,13 +394,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/gsx
%endif
-%if %{with svga}
-%files svga
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/lvga256.so
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/vgalib.so
-%endif
-
%files x11
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/%{version}/X11.so
diff --git a/ghostscript-setuid.patch b/ghostscript-setuid.patch
deleted file mode 100644
index 4fa64a6..0000000
--- a/ghostscript-setuid.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- gs/psi/imainarg.c.orig Mon Dec 6 08:11:52 1999
-+++ gs/psi/imainarg.c Thu Mar 30 23:01:34 2000
-@@ -48,6 +48,18 @@
- #include "iutil.h"
- #include "ivmspace.h"
-
-+/* Change by Torsten Landschoff <torsten at debian.org>:
-+ * We need to store the original rights when run with setuid so we can
-+ * regain privileges when opening the vga library for instance.
-+ * -- Thu, 30 Mar 2000 22:47:22 +0200 */
-+
-+#include <unistd.h>
-+
-+uid_t privileged_uid;
-+gid_t privileged_gid;
-+
-+/* --- end change --- */
-+
- /* Import operator procedures */
- extern int zflush(P1(i_ctx_t *));
- extern int zflushpage(P1(i_ctx_t *));
-@@ -127,6 +139,20 @@
- arg_list args;
- FILE *stdfiles[3];
- int code;
-+
-+ /* Change by Torsten Landschoff <torsten at debian.org>:
-+ * We want to give up privileges as soon as possible when running suid.
-+ * Right, you would not want to run a piece of software as complex as
-+ * Ghostscript with setuid but you need to if you want to use the
-+ * svgalib as ordinary user.
-+ * -- Thu, 30 Mar 2000 22:46:19 +0200 */
-+
-+ /* save privileges */
-+ privileged_uid = geteuid(); privileged_gid = getegid();
-+ /* give up privileges */
-+ seteuid( getuid() ); setegid( getgid() );
-+
-+ /* --- end change --- */
-
- gs_get_real_stdio(stdfiles);
- arg_init(&args, (const char **)argv, argc,
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ghostscript.git/commitdiff/48379a65f38c52f536b137c29eedb87ce40f72b8