|
@@ -1,18 +1,52 @@
|
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
-%define _unpackaged_files_terminate_build 1
|
|
|
|
|
|
Name: jasper
|
|
|
Summary: implementation of the JPEG-2000 standard, Part 1
|
|
|
-Version: 2.0.12
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Version: 1.900.1
|
|
|
+Release: 11%{?_dist_release}
|
|
|
|
|
|
Group: Applications/Graphics
|
|
|
License: Modified BSD (see LICENSE)
|
|
|
URL: http://www.ece.uvic.ca/~mdadams/jasper/
|
|
|
|
|
|
-Source: %{name}-version-%{version}.tar.gz
|
|
|
-
|
|
|
-Patch1: jasper-1.900.1-CVE-2008-3520.patch
|
|
|
+Source: %{name}-%{version}.zip
|
|
|
+
|
|
|
+Patch1: jasper-1.701.0-GL.patch
|
|
|
+# autoconf/automake bits of patch1
|
|
|
+Patch2: jasper-1.701.0-GL-ac.patch
|
|
|
+# CVE-2007-2721 (bug #240397)
|
|
|
+# borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=413041;msg=88
|
|
|
+Patch3: patch-libjasper-stepsizes-overflow.diff
|
|
|
+# borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469786
|
|
|
+Patch4: jpc_dec.c.patch
|
|
|
+# OpenBSD hardening patches addressing couple of possible integer overflows
|
|
|
+# during the memory allocations
|
|
|
+# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520
|
|
|
+Patch5: jasper-1.900.1-CVE-2008-3520.patch
|
|
|
+# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522
|
|
|
+Patch6: jasper-1.900.1-CVE-2008-3522.patch
|
|
|
+# add pkg-config support
|
|
|
+Patch7: jasper-pkgconfig.patch
|
|
|
+
|
|
|
+Patch8: jasper-1.900.1-CVE-2011-4516-CVE-2011-4517-CERT-VU-887409.patch
|
|
|
+
|
|
|
+Patch9: jasper-CVE-2014-9029.patch
|
|
|
+Patch10: jasper-CVE-2014-8137.patch
|
|
|
+Patch11: jasper-CVE-2014-8138.patch
|
|
|
+
|
|
|
+# Issues found by static analysis of code
|
|
|
+Patch110: jasper-1.900.1-Coverity-BAD_SIZEOF.patch
|
|
|
+Patch111: jasper-1.900.1-Coverity-CHECKED_RETURN.patch
|
|
|
+Patch112: jasper-1.900.1-Coverity-FORWARD_NULL.patch
|
|
|
+Patch113: jasper-1.900.1-Coverity-NULL_RETURNS.patch
|
|
|
+Patch114: jasper-1.900.1-Coverity-RESOURCE_LEAK.patch
|
|
|
+Patch115: jasper-1.900.1-Coverity-UNREACHABLE.patch
|
|
|
+Patch116: jasper-1.900.1-Coverity-UNUSED_VALUE.patch
|
|
|
+
|
|
|
+# from debian
|
|
|
+Patch1000: 09-CVE-2016-1577.patch
|
|
|
+Patch1001: 10-CVE-2016-2089.patch
|
|
|
+Patch1002: 11-CVE-2016-2116.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: autoconf automake libtool
|
|
@@ -20,7 +54,6 @@ BuildRequires: freeglut-devel
|
|
|
BuildRequires: libGLU-devel
|
|
|
BuildRequires: libjpeg-devel
|
|
|
BuildRequires: pkgconfig
|
|
|
-BuildRequires: cmake
|
|
|
|
|
|
Requires: %{name}-libs = %{version}-%{release}
|
|
|
|
|
@@ -70,41 +103,49 @@ This package contains runtime libraries for JasPer.
|
|
|
|
|
|
|
|
|
%prep
|
|
|
-%setup -q -n %{name}-version-%{version}
|
|
|
-
|
|
|
-%patch1 -p1 -b .CVE-2008-3520
|
|
|
+%setup -q -n %{name}-%{version}
|
|
|
+
|
|
|
+%patch1 -p1 -b .GL
|
|
|
+%patch2 -p1 -b .GL-ac
|
|
|
+%patch3 -p1 -b .CVE-2007-2721
|
|
|
+%patch4 -p1 -b .jpc_dec_assertion
|
|
|
+%patch5 -p1 -b .CVE-2008-3520
|
|
|
+%patch6 -p1 -b .CVE-2008-3522
|
|
|
+%patch7 -p1 -b .pkgconfig
|
|
|
+%patch8 -p1 -b .CVE-2011-4516-4517
|
|
|
+%patch9 -p1 -b .CVE-2014-9029
|
|
|
+%patch10 -p1 -b .CVE-2014-8137-variant2
|
|
|
+%patch11 -p1 -b .CVE-2014-8138
|
|
|
+
|
|
|
+%patch110 -p1 -b .BAD_SIZEOF
|
|
|
+%patch111 -p1 -b .CHECKED_RETURN
|
|
|
+%patch112 -p1 -b .FORWARD_NULL
|
|
|
+%patch113 -p1 -b .NULL_RETURNS
|
|
|
+%patch114 -p1 -b .RESOURCE_LEAK
|
|
|
+%patch115 -p1 -b .UNREACHABLE
|
|
|
+%patch116 -p1 -b .UNUSED_VALUE
|
|
|
+
|
|
|
+%patch1000 -p1 -b .CVE-2016-1577
|
|
|
+%patch1001 -p1 -b .CVE-2016-2089
|
|
|
+%patch1002 -p1 -b .CVE-2016-2116
|
|
|
+
|
|
|
+autoreconf --verbose --force --install
|
|
|
|
|
|
%build
|
|
|
-mkdir -p builder
|
|
|
+CFLAGS="%{optflags} -fno-strict-overflow" \
|
|
|
+%configure --enable-shared --disable-static
|
|
|
|
|
|
-%cmake -G "Unix Makefiles" \
|
|
|
- -H%{_builddir}/%{name}-version-%{version} \
|
|
|
- -B%{_builddir}/%{name}-version-%{version}/builder
|
|
|
-
|
|
|
-pushd builder
|
|
|
-make %{?_smp_mflags} clean all
|
|
|
-popd
|
|
|
+make %{?_smp_mflags}
|
|
|
|
|
|
%install
|
|
|
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
|
|
|
-pushd builder
|
|
|
-make install DESTDIR=%{buildroot}
|
|
|
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
|
|
|
+make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
|
# remove .la
|
|
|
-rm -f %{buildroot}/%{_libdir}/*.la
|
|
|
-
|
|
|
-popd
|
|
|
-
|
|
|
-rm -rf %{buildroot}%{_docdir}/JasPer
|
|
|
-
|
|
|
-%check
|
|
|
-pushd builder
|
|
|
-LD_PRELOAD=`pwd`/src/libjasper/libjasper.so \
|
|
|
-make test
|
|
|
-popd
|
|
|
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
|
|
|
|
|
|
%clean
|
|
|
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
|
|
|
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
%post libs -p /sbin/ldconfig
|
|
|
|
|
@@ -118,7 +159,7 @@ popd
|
|
|
%defattr(-,root,root)
|
|
|
%{!?_licensedir:%global license %%doc}
|
|
|
%license COPYRIGHT LICENSE
|
|
|
-%doc INSTALL README doc/README doc/jasper.pdf doc/jpeg2000.pdf
|
|
|
+%doc ChangeLog INSTALL NEWS README doc
|
|
|
%{_bindir}/*
|
|
|
%{_mandir}/man1/*
|
|
|
|
|
@@ -145,11 +186,6 @@ popd
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
-* Mon Mar 20 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.12-1
|
|
|
-- new upstream release.
|
|
|
-- dropped all patches.
|
|
|
-- imported patch1 from rawhide.
|
|
|
-
|
|
|
* Tue Jul 19 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.900.1-11
|
|
|
- added Patch1000-1002 to fix CVE-2016-{1577,2089,2116}.
|
|
|
|