From f029f674840df44db5aae53493bbc583ec9d2c54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 3 Jun 2011 00:52:53 +0000 Subject: [PATCH 01/55] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From f69051876195dbe4f25bd033ae97b23e1970c786 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Fri, 3 Jun 2011 19:40:36 +0200 Subject: [PATCH 02/55] Initial import --- .gitignore | 1 + mingw-libjpeg-turbo.spec | 133 +++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 135 insertions(+) create mode 100644 mingw-libjpeg-turbo.spec diff --git a/.gitignore b/.gitignore index e69de29..5a1b1b0 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/libjpeg-turbo-1.1.1.tar.gz diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec new file mode 100644 index 0000000..8aa2d49 --- /dev/null +++ b/mingw-libjpeg-turbo.spec @@ -0,0 +1,133 @@ +%global __strip %{_mingw32_strip} +%global __objdump %{_mingw32_objdump} +%define __debug_install_post %{_mingw32_debug_install_post} + +# Build the programs like cjpeg, etc. +# https://bugzilla.redhat.com/show_bug.cgi?id=467401#c7 +%global build_programs 0 + +Name: mingw-libjpeg-turbo +Version: 1.1.1 +Release: 3%{?dist} +Summary: MinGW Windows Libjpeg-turbo library + +License: wxWidgets +URL: http://libjpeg-turbo.virtualgl.org/ +Group: Development/Libraries +Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz + +BuildArch: noarch + +BuildRequires: mingw32-filesystem >= 68 +BuildRequires: mingw32-gcc +BuildRequires: mingw32-gcc-c++ +BuildRequires: mingw32-binutils +BuildRequires: mingw32-libpng +BuildRequires: mingw32-zlib +BuildRequires: nasm +BuildRequires: cmake + +%description +MinGW Windows cross compiled Libjpeg-turbo library. + + +%package -n %{_mingw32_pkg_name} +Summary: MinGW Windows Libjpeg-turbo library +Obsoletes: mingw32-libjpeg < 7-4 +Provides: mingw32-libjpeg = 7-4 + +%description -n %{_mingw32_pkg_name} +MinGW Windows cross compiled Libjpeg-turbo library. + + +%package -n %{_mingw32_pkg_name}-static +Summary: Static version of the MinGW Windows Libjpeg-turbo library +Requires: mingw32-libjpeg-turbo = %{version}-%{release} +Obsoletes: mingw32-libjpeg-static < 7-4 +Provides: mingw32-libjpeg-static = 7-4 + +%description -n %{_mingw32_pkg_name}-static +Static version of the MinGW Windows cross compiled Libjpeg-turbo library. + + +%{?_mingw32_debug_package} + + +%prep +%setup -q -n libjpeg-turbo-%{version} + + +%build +%{_mingw32_cmake} +make %{?_smp_mflags} + + +%install +make install DESTDIR=$RPM_BUILD_ROOT + +# Remove manual pages which duplicate Fedora native. +rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} + +# The CMake build system also installed some docs +rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/doc + +# Remove win32 native binaries if wanted +%if %build_programs == 0 +rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/*.exe +%endif + +# Fix perms +chmod -x README-turbo.txt + + +%files -n %{_mingw32_pkg_name} +%doc README README-turbo.txt change.log ChangeLog.txt LGPL.txt LICENSE.txt +%if %build_programs +%{_mingw32_bindir}/*.exe +%endif +%{_mingw32_bindir}/libjpeg-62.dll +%{_mingw32_bindir}/libturbojpeg.dll +%{_mingw32_includedir}/jconfig.h +%{_mingw32_includedir}/jerror.h +%{_mingw32_includedir}/jmorecfg.h +%{_mingw32_includedir}/jpeglib.h +%{_mingw32_includedir}/turbojpeg.h +%{_mingw32_libdir}/libjpeg.dll.a +%{_mingw32_libdir}/libturbojpeg.dll.a + +%files -n %{_mingw32_pkg_name}-static +%{_mingw32_libdir}/libjpeg.a +%{_mingw32_libdir}/libturbojpeg.a + + +%changelog +* Thu Jun 2 2011 Erik van Pienbroek - 1.1.1-3 +- Moved the obsoletes/provides to the right location +- Bundle the licence and other %%doc's +- Fixed a small rpmlint warning + +* Thu Jun 2 2011 Erik van Pienbroek - 1.1.1-2 +- Use CMake to build this package as it creates a more mingw-friendly + version of the library + +* Thu Jun 2 2011 Erik van Pienbroek - 1.1.1-1 +- Update to 1.1.1 +- Temporary made the package compliant to the old guidelines as the new + mingw-w64 based toolchain isn't approved for inclusion in Fedora yet + +* Fri Apr 15 2011 Erik van Pienbroek - 1.1.0-1 +- Update to 1.1.0 +- Made the package compliant with the new approved packaging guidelines + +* Tue Feb 15 2011 Erik van Pienbroek - 1.0.1-3 +- Bumped the obsoletes mingw32-libjpeg + +* Wed Jan 19 2011 Erik van Pienbroek - 1.0.1-2 +- Generate per-target RPMs + +* Sun Oct 3 2010 Erik van Pienbroek - 1.0.1-1 +- Initial release (based on mingw32-libjpeg) +- Dropped the BR: mingw32-dlfcn +- Obsoletes/provides mingw32-libjpeg and mingw32-libjpeg-static +- Disable SIMD support for now because libtool doesn't recognize nasm + diff --git a/sources b/sources index e69de29..425db53 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +03b9c1406c7bfdc204313c2917ce6962 libjpeg-turbo-1.1.1.tar.gz From 9a24fbe4746497c8ba6b7fbd5ed7841a8fc9c9f9 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Fri, 3 Jun 2011 20:57:30 +0200 Subject: [PATCH 03/55] Fix a conflict between w32api's basetsd.h and jmorecfg.h There's a conflict between basetsd.h (w32api) and jmorecfg.h Both contain a definition for the data type INT32, but they're different from each other (signed int vs. long). Added a patch which makes the library use the data type signed int for INT32 --- libjpeg-turbo-dont-conflict-with-basetsd-h.diff | 16 ++++++++++++++++ mingw-libjpeg-turbo.spec | 13 ++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 libjpeg-turbo-dont-conflict-with-basetsd-h.diff diff --git a/libjpeg-turbo-dont-conflict-with-basetsd-h.diff b/libjpeg-turbo-dont-conflict-with-basetsd-h.diff new file mode 100644 index 0000000..4b84f77 --- /dev/null +++ b/libjpeg-turbo-dont-conflict-with-basetsd-h.diff @@ -0,0 +1,16 @@ +--- win/jconfig.h.in.orig 2011-06-03 20:17:01.918582804 +0200 ++++ win/jconfig.h.in 2011-06-03 20:19:23.622100937 +0200 +@@ -25,7 +25,14 @@ + #endif + #define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ + ++/* Define "INT32" as int, not long, per Windows custom */ ++#ifndef _BASETSD_H_ /* don't conflict if basetsd.h already read */ ++typedef short INT16; ++typedef signed int INT32; ++#endif ++#define XMD_H /* prevent jmorecfg.h from redefining it */ ++ + #define inline __inline + + #ifdef JPEG_INTERNALS diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 8aa2d49..fa6147f 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -8,7 +8,7 @@ Name: mingw-libjpeg-turbo Version: 1.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -16,6 +16,12 @@ URL: http://libjpeg-turbo.virtualgl.org/ Group: Development/Libraries Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz +# There's a conflict between basetsd.h (w32api) and jmorecfg.h +# Both contain a definition for the data type INT32, but they're +# different from each other (signed int vs. long) +# This patch makes the library use the data type signed int for INT32 +Patch0: libjpeg-turbo-dont-conflict-with-basetsd-h.diff + BuildArch: noarch BuildRequires: mingw32-filesystem >= 68 @@ -55,6 +61,7 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo library. %prep %setup -q -n libjpeg-turbo-%{version} +%patch0 -p0 %build @@ -101,6 +108,10 @@ chmod -x README-turbo.txt %changelog +* Fri Jun 3 2011 Erik van Pienbroek - 1.1.1-4 +- Fix a conflict between w32api's basetsd.h and jmorecfg.h (conflicting + declarations for INT32) + * Thu Jun 2 2011 Erik van Pienbroek - 1.1.1-3 - Moved the obsoletes/provides to the right location - Bundle the licence and other %%doc's From b28de457201e3d5dda66bb49cab2a228d6d787b9 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Fri, 3 Jun 2011 21:29:06 +0200 Subject: [PATCH 04/55] Updated the INT32 patch so that both the mingw.org and the mingw-w64 toolchains are supported --- libjpeg-turbo-dont-conflict-with-basetsd-h.diff | 2 +- mingw-libjpeg-turbo.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libjpeg-turbo-dont-conflict-with-basetsd-h.diff b/libjpeg-turbo-dont-conflict-with-basetsd-h.diff index 4b84f77..318dccb 100644 --- a/libjpeg-turbo-dont-conflict-with-basetsd-h.diff +++ b/libjpeg-turbo-dont-conflict-with-basetsd-h.diff @@ -5,7 +5,7 @@ #define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ +/* Define "INT32" as int, not long, per Windows custom */ -+#ifndef _BASETSD_H_ /* don't conflict if basetsd.h already read */ ++#if !(defined(_BASETSD_H_) || defined(_BASETSD_H)) /* don't conflict if basetsd.h already read */ +typedef short INT16; +typedef signed int INT32; +#endif diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index fa6147f..c5e7f02 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -8,7 +8,7 @@ Name: mingw-libjpeg-turbo Version: 1.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -108,6 +108,10 @@ chmod -x README-turbo.txt %changelog +* Fri Jun 3 2011 Erik van Pienbroek - 1.1.1-5 +- Updated the INT32 patch so that both the mingw.org and the mingw-w64 + toolchains are supported + * Fri Jun 3 2011 Erik van Pienbroek - 1.1.1-4 - Fix a conflict between w32api's basetsd.h and jmorecfg.h (conflicting declarations for INT32) From 631b5fa4dd4cdc9edbf02d720cac76b6bdc35025 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 03:53:45 -0600 Subject: [PATCH 05/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index c5e7f02..896a34c 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -8,7 +8,7 @@ Name: mingw-libjpeg-turbo Version: 1.1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -108,6 +108,9 @@ chmod -x README-turbo.txt %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 1.1.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri Jun 3 2011 Erik van Pienbroek - 1.1.1-5 - Updated the INT32 patch so that both the mingw.org and the mingw-w64 toolchains are supported From 5b3d620cf276fcc0f519fb38b442ac9691e1d2e6 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Mon, 27 Feb 2012 23:27:17 +0100 Subject: [PATCH 06/55] Rebuild against the mingw-w64 toolchain --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 896a34c..7ebfe5d 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -8,7 +8,7 @@ Name: mingw-libjpeg-turbo Version: 1.1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -108,6 +108,9 @@ chmod -x README-turbo.txt %changelog +* Mon Feb 27 2012 Erik van Pienbroek - 1.1.1-7 +- Rebuild against the mingw-w64 toolchain + * Fri Jan 13 2012 Fedora Release Engineering - 1.1.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 7747417c57398e0da848b080567a5550fdbe4d78 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sat, 10 Mar 2012 20:43:49 +0100 Subject: [PATCH 07/55] Added win64 support - Added win64 support - Use mingw macros without leading underscore --- mingw-libjpeg-turbo.spec | 117 ++++++++++++++++++++++++++++----------- 1 file changed, 86 insertions(+), 31 deletions(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 7ebfe5d..a636377 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -1,6 +1,7 @@ -%global __strip %{_mingw32_strip} -%global __objdump %{_mingw32_objdump} -%define __debug_install_post %{_mingw32_debug_install_post} +%?mingw_package_header + +%global mingw_build_win32 1 +%global mingw_build_win64 1 # Build the programs like cjpeg, etc. # https://bugzilla.redhat.com/show_bug.cgi?id=467401#c7 @@ -8,7 +9,7 @@ Name: mingw-libjpeg-turbo Version: 1.1.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -24,12 +25,20 @@ Patch0: libjpeg-turbo-dont-conflict-with-basetsd-h.diff BuildArch: noarch -BuildRequires: mingw32-filesystem >= 68 +BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-gcc BuildRequires: mingw32-gcc-c++ BuildRequires: mingw32-binutils BuildRequires: mingw32-libpng BuildRequires: mingw32-zlib + +BuildRequires: mingw64-filesystem >= 95 +BuildRequires: mingw64-gcc +BuildRequires: mingw64-gcc-c++ +BuildRequires: mingw64-binutils +BuildRequires: mingw64-libpng +BuildRequires: mingw64-zlib + BuildRequires: nasm BuildRequires: cmake @@ -37,26 +46,44 @@ BuildRequires: cmake MinGW Windows cross compiled Libjpeg-turbo library. -%package -n %{_mingw32_pkg_name} +# Win32 +%package -n mingw32-libjpeg-turbo Summary: MinGW Windows Libjpeg-turbo library Obsoletes: mingw32-libjpeg < 7-4 Provides: mingw32-libjpeg = 7-4 -%description -n %{_mingw32_pkg_name} +%description -n mingw32-libjpeg-turbo MinGW Windows cross compiled Libjpeg-turbo library. - -%package -n %{_mingw32_pkg_name}-static +%package -n mingw32-libjpeg-turbo-static Summary: Static version of the MinGW Windows Libjpeg-turbo library Requires: mingw32-libjpeg-turbo = %{version}-%{release} Obsoletes: mingw32-libjpeg-static < 7-4 Provides: mingw32-libjpeg-static = 7-4 -%description -n %{_mingw32_pkg_name}-static +%description -n mingw32-libjpeg-turbo-static +Static version of the MinGW Windows cross compiled Libjpeg-turbo library. + +# Win64 +%package -n mingw64-libjpeg-turbo +Summary: MinGW Windows Libjpeg-turbo library +Obsoletes: mingw64-libjpeg < 8a-2%{?dist} +Provides: mingw64-libjpeg = 8a-2%{?dist} + +%description -n mingw64-libjpeg-turbo +MinGW Windows cross compiled Libjpeg-turbo library. + +%package -n mingw64-libjpeg-turbo-static +Summary: Static version of the MinGW Windows Libjpeg-turbo library +Requires: mingw64-libjpeg-turbo = %{version}-%{release} +Obsoletes: mingw64-libjpeg-static < 8a-2%{?dist} +Provides: mingw64-libjpeg-static = 8a-2%{?dist} + +%description -n mingw64-libjpeg-turbo-static Static version of the MinGW Windows cross compiled Libjpeg-turbo library. -%{?_mingw32_debug_package} +%?mingw_debug_package %prep @@ -65,49 +92,77 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo library. %build -%{_mingw32_cmake} -make %{?_smp_mflags} +%mingw_cmake +%mingw_make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT +%mingw_make_install DESTDIR=$RPM_BUILD_ROOT # Remove manual pages which duplicate Fedora native. -rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} +rm -rf $RPM_BUILD_ROOT%{mingw32_mandir} +rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} # The CMake build system also installed some docs -rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/doc +rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/doc +rm -rf $RPM_BUILD_ROOT%{mingw64_prefix}/doc # Remove win32 native binaries if wanted %if %build_programs == 0 -rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/*.exe +rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/*.exe +rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/*.exe %endif # Fix perms chmod -x README-turbo.txt -%files -n %{_mingw32_pkg_name} +# Win32 +%files -n mingw32-libjpeg-turbo %doc README README-turbo.txt change.log ChangeLog.txt LGPL.txt LICENSE.txt %if %build_programs -%{_mingw32_bindir}/*.exe +%{mingw32_bindir}/*.exe %endif -%{_mingw32_bindir}/libjpeg-62.dll -%{_mingw32_bindir}/libturbojpeg.dll -%{_mingw32_includedir}/jconfig.h -%{_mingw32_includedir}/jerror.h -%{_mingw32_includedir}/jmorecfg.h -%{_mingw32_includedir}/jpeglib.h -%{_mingw32_includedir}/turbojpeg.h -%{_mingw32_libdir}/libjpeg.dll.a -%{_mingw32_libdir}/libturbojpeg.dll.a +%{mingw32_bindir}/libjpeg-62.dll +%{mingw32_bindir}/libturbojpeg.dll +%{mingw32_includedir}/jconfig.h +%{mingw32_includedir}/jerror.h +%{mingw32_includedir}/jmorecfg.h +%{mingw32_includedir}/jpeglib.h +%{mingw32_includedir}/turbojpeg.h +%{mingw32_libdir}/libjpeg.dll.a +%{mingw32_libdir}/libturbojpeg.dll.a + +%files -n mingw32-libjpeg-turbo-static +%{mingw32_libdir}/libjpeg.a +%{mingw32_libdir}/libturbojpeg.a + +# Win64 +%files -n mingw64-libjpeg-turbo +%doc README README-turbo.txt change.log ChangeLog.txt LGPL.txt LICENSE.txt +%if %build_programs +%{mingw64_bindir}/*.exe +%endif +%{mingw64_bindir}/libjpeg-62.dll +%{mingw64_bindir}/libturbojpeg.dll +%{mingw64_includedir}/jconfig.h +%{mingw64_includedir}/jerror.h +%{mingw64_includedir}/jmorecfg.h +%{mingw64_includedir}/jpeglib.h +%{mingw64_includedir}/turbojpeg.h +%{mingw64_libdir}/libjpeg.dll.a +%{mingw64_libdir}/libturbojpeg.dll.a -%files -n %{_mingw32_pkg_name}-static -%{_mingw32_libdir}/libjpeg.a -%{_mingw32_libdir}/libturbojpeg.a +%files -n mingw64-libjpeg-turbo-static +%{mingw64_libdir}/libjpeg.a +%{mingw64_libdir}/libturbojpeg.a %changelog +* Sat Mar 10 2012 Erik van Pienbroek - 1.1.1-8 +- Added win64 support +- Use mingw macros without leading underscore + * Mon Feb 27 2012 Erik van Pienbroek - 1.1.1-7 - Rebuild against the mingw-w64 toolchain From ed82f079fd5d3e899d01b12b2442d971fb44dcc7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 20:29:29 -0500 Subject: [PATCH 08/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index a636377..0b8d759 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -9,7 +9,7 @@ Name: mingw-libjpeg-turbo Version: 1.1.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -159,6 +159,9 @@ chmod -x README-turbo.txt %changelog +* Fri Jul 20 2012 Fedora Release Engineering - 1.1.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Mar 10 2012 Erik van Pienbroek - 1.1.1-8 - Added win64 support - Use mingw macros without leading underscore From d2c7c0d77a00e46b800aa592f6f02b1493d13017 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 7 Oct 2012 15:07:22 +0200 Subject: [PATCH 09/55] Minor spec file cleanup --- mingw-libjpeg-turbo.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 0b8d759..c1c1ff7 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -1,8 +1,5 @@ %?mingw_package_header -%global mingw_build_win32 1 -%global mingw_build_win64 1 - # Build the programs like cjpeg, etc. # https://bugzilla.redhat.com/show_bug.cgi?id=467401#c7 %global build_programs 0 @@ -97,7 +94,7 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo library. %install -%mingw_make_install DESTDIR=$RPM_BUILD_ROOT +%mingw_make install DESTDIR=$RPM_BUILD_ROOT # Remove manual pages which duplicate Fedora native. rm -rf $RPM_BUILD_ROOT%{mingw32_mandir} From f1beb8bcbd093fca9b02847cf19b80fb386a216a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 7 Oct 2012 15:08:25 +0200 Subject: [PATCH 10/55] Update to 1.2.1 ... and drop upstreamed libjpeg-turbo-dont-conflict-with-basetsd-h.diff. --- .gitignore | 1 + ...eg-turbo-dont-conflict-with-basetsd-h.diff | 16 ---------------- mingw-libjpeg-turbo.spec | 19 ++++++++----------- sources | 2 +- 4 files changed, 10 insertions(+), 28 deletions(-) delete mode 100644 libjpeg-turbo-dont-conflict-with-basetsd-h.diff diff --git a/.gitignore b/.gitignore index 5a1b1b0..10ef247 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libjpeg-turbo-1.1.1.tar.gz +/libjpeg-turbo-1.2.1.tar.gz diff --git a/libjpeg-turbo-dont-conflict-with-basetsd-h.diff b/libjpeg-turbo-dont-conflict-with-basetsd-h.diff deleted file mode 100644 index 318dccb..0000000 --- a/libjpeg-turbo-dont-conflict-with-basetsd-h.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- win/jconfig.h.in.orig 2011-06-03 20:17:01.918582804 +0200 -+++ win/jconfig.h.in 2011-06-03 20:19:23.622100937 +0200 -@@ -25,7 +25,14 @@ - #endif - #define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ - -+/* Define "INT32" as int, not long, per Windows custom */ -+#if !(defined(_BASETSD_H_) || defined(_BASETSD_H)) /* don't conflict if basetsd.h already read */ -+typedef short INT16; -+typedef signed int INT32; -+#endif -+#define XMD_H /* prevent jmorecfg.h from redefining it */ -+ - #define inline __inline - - #ifdef JPEG_INTERNALS diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index c1c1ff7..bc19bd2 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,8 +5,8 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 1.1.1 -Release: 9%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -14,12 +14,6 @@ URL: http://libjpeg-turbo.virtualgl.org/ Group: Development/Libraries Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz -# There's a conflict between basetsd.h (w32api) and jmorecfg.h -# Both contain a definition for the data type INT32, but they're -# different from each other (signed int vs. long) -# This patch makes the library use the data type signed int for INT32 -Patch0: libjpeg-turbo-dont-conflict-with-basetsd-h.diff - BuildArch: noarch BuildRequires: mingw32-filesystem >= 95 @@ -85,7 +79,6 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo library. %prep %setup -q -n libjpeg-turbo-%{version} -%patch0 -p0 %build @@ -116,7 +109,7 @@ chmod -x README-turbo.txt # Win32 %files -n mingw32-libjpeg-turbo -%doc README README-turbo.txt change.log ChangeLog.txt LGPL.txt LICENSE.txt +%doc README README-turbo.txt change.log ChangeLog.txt %if %build_programs %{mingw32_bindir}/*.exe %endif @@ -136,7 +129,7 @@ chmod -x README-turbo.txt # Win64 %files -n mingw64-libjpeg-turbo -%doc README README-turbo.txt change.log ChangeLog.txt LGPL.txt LICENSE.txt +%doc README README-turbo.txt change.log ChangeLog.txt %if %build_programs %{mingw64_bindir}/*.exe %endif @@ -156,6 +149,10 @@ chmod -x README-turbo.txt %changelog +* Sun Oct 07 2012 Kalev Lember - 1.2.1-1 +- Update to 1.2.1 +- Dropped upstreamed int32 patch + * Fri Jul 20 2012 Fedora Release Engineering - 1.1.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 425db53..0e8a5e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03b9c1406c7bfdc204313c2917ce6962 libjpeg-turbo-1.1.1.tar.gz +f61e60ff01381ece4d2fe65eeb52669e libjpeg-turbo-1.2.1.tar.gz From 7946c8d86473b000e7180c04a541d347fdee7aa5 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sun, 14 Oct 2012 16:52:01 +0200 Subject: [PATCH 11/55] Dropped phantom dependency on libpng and zlib (RHBZ #866185) --- mingw-libjpeg-turbo.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index bc19bd2..9577e96 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -20,15 +20,11 @@ BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-gcc BuildRequires: mingw32-gcc-c++ BuildRequires: mingw32-binutils -BuildRequires: mingw32-libpng -BuildRequires: mingw32-zlib BuildRequires: mingw64-filesystem >= 95 BuildRequires: mingw64-gcc BuildRequires: mingw64-gcc-c++ BuildRequires: mingw64-binutils -BuildRequires: mingw64-libpng -BuildRequires: mingw64-zlib BuildRequires: nasm BuildRequires: cmake @@ -149,6 +145,9 @@ chmod -x README-turbo.txt %changelog +* Sun Oct 14 2012 Nicola Fontana - 1.2.1-2 +- Dropped phantom dependency on libpng and zlib (RHBZ #866185) + * Sun Oct 07 2012 Kalev Lember - 1.2.1-1 - Update to 1.2.1 - Dropped upstreamed int32 patch From e5fc6bdddfb9ec3666d92e598a79c0e4afa9ae5e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 01:05:16 -0600 Subject: [PATCH 12/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 9577e96..91832bd 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -145,6 +145,9 @@ chmod -x README-turbo.txt %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Oct 14 2012 Nicola Fontana - 1.2.1-2 - Dropped phantom dependency on libpng and zlib (RHBZ #866185) From 0a7fac3507cf96adeea3eb37adf958da2960fb4e Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sun, 24 Mar 2013 18:33:42 +0100 Subject: [PATCH 13/55] Update to 1.2.90 --- .gitignore | 1 + mingw-libjpeg-turbo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 10ef247..a8f5a68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /libjpeg-turbo-1.1.1.tar.gz /libjpeg-turbo-1.2.1.tar.gz +/libjpeg-turbo-1.2.90.tar.gz diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 91832bd..c3f3203 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,8 +5,8 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 1.2.1 -Release: 3%{?dist} +Version: 1.2.90 +Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -145,6 +145,9 @@ chmod -x README-turbo.txt %changelog +* Sun Mar 24 2013 Erik van Pienbroek - 1.2.90-1 +- Update to 1.2.90 + * Thu Feb 14 2013 Fedora Release Engineering - 1.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 0e8a5e2..c4fedcc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f61e60ff01381ece4d2fe65eeb52669e libjpeg-turbo-1.2.1.tar.gz +ea53fc1e8a00c26e2f501385f887f1f6 libjpeg-turbo-1.2.90.tar.gz From ec88fc97148fd7f31a862fde762f9bdecc043438 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 05:49:35 -0500 Subject: [PATCH 14/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index c3f3203..ff01818 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 1.2.90 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -145,6 +145,9 @@ chmod -x README-turbo.txt %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.2.90-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sun Mar 24 2013 Erik van Pienbroek - 1.2.90-1 - Update to 1.2.90 From 8f8b58073df47e55a74d1e62453ce17875a0d475 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sat, 3 Aug 2013 21:58:12 +0200 Subject: [PATCH 15/55] Update to 1.3.0 and make jconfig.h more autoconf friendly --- .gitignore | 1 + libjpeg-turbo-match-autoconf-behavior.patch | 31 +++++++++++++++++++++ mingw-libjpeg-turbo.spec | 13 +++++++-- sources | 2 +- 4 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 libjpeg-turbo-match-autoconf-behavior.patch diff --git a/.gitignore b/.gitignore index a8f5a68..04e3a1e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /libjpeg-turbo-1.1.1.tar.gz /libjpeg-turbo-1.2.1.tar.gz /libjpeg-turbo-1.2.90.tar.gz +/libjpeg-turbo-1.3.0.tar.gz diff --git a/libjpeg-turbo-match-autoconf-behavior.patch b/libjpeg-turbo-match-autoconf-behavior.patch new file mode 100644 index 0000000..d18a449 --- /dev/null +++ b/libjpeg-turbo-match-autoconf-behavior.patch @@ -0,0 +1,31 @@ +--- libjpeg-turbo-1.3.0/win/jconfig.h.in.orig 2013-08-03 21:52:45.115856655 +0200 ++++ libjpeg-turbo-1.3.0/win/jconfig.h.in 2013-08-03 21:53:40.335912080 +0200 +@@ -7,14 +7,14 @@ + #cmakedefine D_ARITH_CODING_SUPPORTED + #cmakedefine MEM_SRCDST_SUPPORTED + +-#define HAVE_PROTOTYPES +-#define HAVE_UNSIGNED_CHAR +-#define HAVE_UNSIGNED_SHORT ++#define HAVE_PROTOTYPES 1 ++#define HAVE_UNSIGNED_CHAR 1 ++#define HAVE_UNSIGNED_SHORT 1 + /* #define void char */ + /* #define const */ + #undef CHAR_IS_UNSIGNED +-#define HAVE_STDDEF_H +-#define HAVE_STDLIB_H ++#define HAVE_STDDEF_H 1 ++#define HAVE_STDLIB_H 1 + #undef NEED_BSD_STRINGS + #undef NEED_SYS_TYPES_H + #undef NEED_FAR_POINTERS /* we presume a 32-bit flat memory model */ +@@ -25,7 +25,7 @@ + #ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ + typedef unsigned char boolean; + #endif +-#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ ++#define HAVE_BOOLEAN 1 /* prevent jmorecfg.h from redefining it */ + + /* Define "INT32" as int, not long, per Windows custom */ + #if !(defined(_BASETSD_H_) || defined(_BASETSD_H)) /* don't conflict if basetsd.h already read */ diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index ff01818..00cfb85 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,8 +5,8 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 1.2.90 -Release: 2%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -14,6 +14,10 @@ URL: http://libjpeg-turbo.virtualgl.org/ Group: Development/Libraries Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz +# Make jconfig.h more autoconf friendly +# https://bugzilla.redhat.com/show_bug.cgi?id=843193 +Patch0: libjpeg-turbo-match-autoconf-behavior.patch + BuildArch: noarch BuildRequires: mingw32-filesystem >= 95 @@ -75,6 +79,7 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo library. %prep %setup -q -n libjpeg-turbo-%{version} +%patch0 -p1 %build @@ -145,6 +150,10 @@ chmod -x README-turbo.txt %changelog +* Sat Aug 3 2013 Erik van Pienbroek - 1.3.0-1 +- Update to 1.3.0 +- Make jconfig.h more autoconf friendly (RHBZ #843193) + * Sat Aug 03 2013 Fedora Release Engineering - 1.2.90-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index c4fedcc..230c149 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea53fc1e8a00c26e2f501385f887f1f6 libjpeg-turbo-1.2.90.tar.gz +e1e65cc711a1ade1322c06ad4a647741 libjpeg-turbo-1.3.0.tar.gz From 4dc43ceafb6806031e8894da434a06e2bfb04b4a Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Thu, 29 May 2014 16:44:22 +0200 Subject: [PATCH 16/55] Update to 1.3.1 --- .gitignore | 1 + mingw-libjpeg-turbo.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 04e3a1e..91e2b72 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /libjpeg-turbo-1.2.1.tar.gz /libjpeg-turbo-1.2.90.tar.gz /libjpeg-turbo-1.3.0.tar.gz +/libjpeg-turbo-1.3.1.tar.gz diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 00cfb85..7ef04ba 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,7 +5,7 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library @@ -150,6 +150,10 @@ chmod -x README-turbo.txt %changelog +* Thu May 29 2014 Erik van Pienbroek - 1.3.1-1 +- Update to 1.3.1 +- Fixes CVE-2013-6629 and CVE-2013-6630 (RHBZ #1031740) + * Sat Aug 3 2013 Erik van Pienbroek - 1.3.0-1 - Update to 1.3.0 - Make jconfig.h more autoconf friendly (RHBZ #843193) diff --git a/sources b/sources index 230c149..e1e9636 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1e65cc711a1ade1322c06ad4a647741 libjpeg-turbo-1.3.0.tar.gz +2c3a68129dac443a72815ff5bb374b05 libjpeg-turbo-1.3.1.tar.gz From f40c4581f5fc89a5b3e22b5c04c6acc3721b6439 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Thu, 29 May 2014 17:01:43 +0200 Subject: [PATCH 17/55] Fix compatibility with older CMake versions (as used on RHEL7) --- libjpeg-turbo-r1237.patch | 14 ++++++++++++++ mingw-libjpeg-turbo.spec | 9 ++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 libjpeg-turbo-r1237.patch diff --git a/libjpeg-turbo-r1237.patch b/libjpeg-turbo-r1237.patch new file mode 100644 index 0000000..de3480e --- /dev/null +++ b/libjpeg-turbo-r1237.patch @@ -0,0 +1,14 @@ +--- libjpeg-turbo-1.3.1/CMakeLists.txt.orig 2014-05-29 17:00:31.775255437 +0200 ++++ libjpeg-turbo-1.3.1/CMakeLists.txt 2014-05-29 17:01:07.174824178 +0200 +@@ -3,7 +3,10 @@ + # + + cmake_minimum_required(VERSION 2.8.8) +-cmake_policy(SET CMP0022 OLD) ++# Use LINK_INTERFACE_LIBRARIES instead of INTERFACE_LINK_LIBRARIES ++if(POLICY CMP0022) ++ cmake_policy(SET CMP0022 OLD) ++endif() + + project(libjpeg-turbo C) + set(VERSION 1.3.1) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 7ef04ba..24d622e 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 1.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -18,6 +18,9 @@ Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{v # https://bugzilla.redhat.com/show_bug.cgi?id=843193 Patch0: libjpeg-turbo-match-autoconf-behavior.patch +# Fix compatibility with older CMake versions (as used on RHEL7) +Patch1: libjpeg-turbo-r1237.patch + BuildArch: noarch BuildRequires: mingw32-filesystem >= 95 @@ -80,6 +83,7 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo library. %prep %setup -q -n libjpeg-turbo-%{version} %patch0 -p1 +%patch1 -p1 %build @@ -150,6 +154,9 @@ chmod -x README-turbo.txt %changelog +* Thu May 29 2014 Erik van Pienbroek - 1.3.1-2 +- Fix compatibility with older CMake versions (as used on RHEL7) + * Thu May 29 2014 Erik van Pienbroek - 1.3.1-1 - Update to 1.3.1 - Fixes CVE-2013-6629 and CVE-2013-6630 (RHBZ #1031740) From 8f63a1adb4ab2f3cdfbdfcf7f2abd18a925dd168 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 04:54:12 -0500 Subject: [PATCH 18/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 24d622e..21fba1e 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 1.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -154,6 +154,9 @@ chmod -x README-turbo.txt %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu May 29 2014 Erik van Pienbroek - 1.3.1-2 - Fix compatibility with older CMake versions (as used on RHEL7) From e968c5631e81a4a7fb9e267bb628675168fb48fd Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Mon, 22 Dec 2014 17:23:44 +0100 Subject: [PATCH 19/55] Fix CVE-2014-9092 (RHBZ #1169851 #1169853) --- libjpeg-turbo-commit-1365.patch | 29 +++++++++++++++++++++++++++++ libjpeg-turbo-commit-1367.patch | 29 +++++++++++++++++++++++++++++ mingw-libjpeg-turbo.spec | 11 ++++++++++- 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 libjpeg-turbo-commit-1365.patch create mode 100644 libjpeg-turbo-commit-1367.patch diff --git a/libjpeg-turbo-commit-1365.patch b/libjpeg-turbo-commit-1365.patch new file mode 100644 index 0000000..13df124 --- /dev/null +++ b/libjpeg-turbo-commit-1365.patch @@ -0,0 +1,29 @@ +--- a/jchuff.c ++++ b/jchuff.c +@@ -4,7 +4,7 @@ + * This file was part of the Independent JPEG Group's software: + * Copyright (C) 1991-1997, Thomas G. Lane. + * libjpeg-turbo Modifications: +- * Copyright (C) 2009-2011, D. R. Commander. ++ * Copyright (C) 2009-2011, 2014 D. R. Commander. + * For conditions of distribution and use, see the accompanying README file. + * + * This file contains Huffman entropy encoding routines. +@@ -426,7 +426,7 @@ + LOCAL(boolean) + flush_bits (working_state * state) + { +- JOCTET _buffer[BUFSIZE], *buffer; ++ JOCTET _buffer[BUFSIZE + 8], *buffer; + size_t put_buffer; int put_bits; + size_t bytes, bytestocopy; int localbuf = 0; + +@@ -455,7 +455,7 @@ + int temp, temp2, temp3; + int nbits; + int r, code, size; +- JOCTET _buffer[BUFSIZE], *buffer; ++ JOCTET _buffer[BUFSIZE + 8], *buffer; + size_t put_buffer; int put_bits; + int code_0xf0 = actbl->ehufco[0xf0], size_0xf0 = actbl->ehufsi[0xf0]; + size_t bytes, bytestocopy; int localbuf = 0; diff --git a/libjpeg-turbo-commit-1367.patch b/libjpeg-turbo-commit-1367.patch new file mode 100644 index 0000000..9c3b224 --- /dev/null +++ b/libjpeg-turbo-commit-1367.patch @@ -0,0 +1,29 @@ +--- a/jchuff.c ++++ b/jchuff.c +@@ -408,7 +408,7 @@ + #endif + + +-#define BUFSIZE (DCTSIZE2 * 2) ++#define BUFSIZE (DCTSIZE2 * 2) + 8 + + #define LOAD_BUFFER() { \ + if (state->free_in_buffer < BUFSIZE) { \ +@@ -443,7 +443,7 @@ + LOCAL(boolean) + flush_bits (working_state * state) + { +- JOCTET _buffer[BUFSIZE + 8], *buffer; ++ JOCTET _buffer[BUFSIZE], *buffer; + size_t put_buffer; int put_bits; + size_t bytes, bytestocopy; int localbuf = 0; + +@@ -472,7 +472,7 @@ + int temp, temp2, temp3; + int nbits; + int r, code, size; +- JOCTET _buffer[BUFSIZE + 8], *buffer; ++ JOCTET _buffer[BUFSIZE], *buffer; + size_t put_buffer; int put_bits; + int code_0xf0 = actbl->ehufco[0xf0], size_0xf0 = actbl->ehufsi[0xf0]; + size_t bytes, bytestocopy; int localbuf = 0; diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 21fba1e..6eadde8 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 1.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -21,6 +21,10 @@ Patch0: libjpeg-turbo-match-autoconf-behavior.patch # Fix compatibility with older CMake versions (as used on RHEL7) Patch1: libjpeg-turbo-r1237.patch +# Fix CVE-2014-9092 (RHBZ #1169851 #1169853) +Patch2: libjpeg-turbo-commit-1365.patch +Patch3: libjpeg-turbo-commit-1367.patch + BuildArch: noarch BuildRequires: mingw32-filesystem >= 95 @@ -84,6 +88,8 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo library. %setup -q -n libjpeg-turbo-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build @@ -154,6 +160,9 @@ chmod -x README-turbo.txt %changelog +* Mon Dec 22 2014 Erik van Pienbroek - 1.3.1-4 +- Fix CVE-2014-9092 (RHBZ #1169851 #1169853) + * Sat Jun 07 2014 Fedora Release Engineering - 1.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From a88a61d272eb1ca844630c6e6a16043d3d1132f9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 20:25:50 +0000 Subject: [PATCH 20/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 6eadde8..5b230ee 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 1.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -160,6 +160,9 @@ chmod -x README-turbo.txt %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Dec 22 2014 Erik van Pienbroek - 1.3.1-4 - Fix CVE-2014-9092 (RHBZ #1169851 #1169853) From fe5f90f7475cd58fc60c248d12b661622026c62d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 08:15:26 +0000 Subject: [PATCH 21/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 5b230ee..21f99a5 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 1.3.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -160,6 +160,9 @@ chmod -x README-turbo.txt %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 1.3.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From e839a929eac6cce6872e3f89647eb02de85871e7 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 10 May 2016 17:14:07 +0200 Subject: [PATCH 22/55] Update to 1.4.2 --- .gitignore | 1 + libjpeg-turbo-commit-1365.patch | 29 --------------------- libjpeg-turbo-commit-1367.patch | 29 --------------------- libjpeg-turbo-match-autoconf-behavior.patch | 16 +++++------- libjpeg-turbo-r1237.patch | 14 ---------- mingw-libjpeg-turbo.spec | 17 ++++-------- sources | 2 +- 7 files changed, 14 insertions(+), 94 deletions(-) delete mode 100644 libjpeg-turbo-commit-1365.patch delete mode 100644 libjpeg-turbo-commit-1367.patch delete mode 100644 libjpeg-turbo-r1237.patch diff --git a/.gitignore b/.gitignore index 91e2b72..6fb3e8d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /libjpeg-turbo-1.2.90.tar.gz /libjpeg-turbo-1.3.0.tar.gz /libjpeg-turbo-1.3.1.tar.gz +/libjpeg-turbo-1.4.2.tar.gz diff --git a/libjpeg-turbo-commit-1365.patch b/libjpeg-turbo-commit-1365.patch deleted file mode 100644 index 13df124..0000000 --- a/libjpeg-turbo-commit-1365.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/jchuff.c -+++ b/jchuff.c -@@ -4,7 +4,7 @@ - * This file was part of the Independent JPEG Group's software: - * Copyright (C) 1991-1997, Thomas G. Lane. - * libjpeg-turbo Modifications: -- * Copyright (C) 2009-2011, D. R. Commander. -+ * Copyright (C) 2009-2011, 2014 D. R. Commander. - * For conditions of distribution and use, see the accompanying README file. - * - * This file contains Huffman entropy encoding routines. -@@ -426,7 +426,7 @@ - LOCAL(boolean) - flush_bits (working_state * state) - { -- JOCTET _buffer[BUFSIZE], *buffer; -+ JOCTET _buffer[BUFSIZE + 8], *buffer; - size_t put_buffer; int put_bits; - size_t bytes, bytestocopy; int localbuf = 0; - -@@ -455,7 +455,7 @@ - int temp, temp2, temp3; - int nbits; - int r, code, size; -- JOCTET _buffer[BUFSIZE], *buffer; -+ JOCTET _buffer[BUFSIZE + 8], *buffer; - size_t put_buffer; int put_bits; - int code_0xf0 = actbl->ehufco[0xf0], size_0xf0 = actbl->ehufsi[0xf0]; - size_t bytes, bytestocopy; int localbuf = 0; diff --git a/libjpeg-turbo-commit-1367.patch b/libjpeg-turbo-commit-1367.patch deleted file mode 100644 index 9c3b224..0000000 --- a/libjpeg-turbo-commit-1367.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/jchuff.c -+++ b/jchuff.c -@@ -408,7 +408,7 @@ - #endif - - --#define BUFSIZE (DCTSIZE2 * 2) -+#define BUFSIZE (DCTSIZE2 * 2) + 8 - - #define LOAD_BUFFER() { \ - if (state->free_in_buffer < BUFSIZE) { \ -@@ -443,7 +443,7 @@ - LOCAL(boolean) - flush_bits (working_state * state) - { -- JOCTET _buffer[BUFSIZE + 8], *buffer; -+ JOCTET _buffer[BUFSIZE], *buffer; - size_t put_buffer; int put_bits; - size_t bytes, bytestocopy; int localbuf = 0; - -@@ -472,7 +472,7 @@ - int temp, temp2, temp3; - int nbits; - int r, code, size; -- JOCTET _buffer[BUFSIZE + 8], *buffer; -+ JOCTET _buffer[BUFSIZE], *buffer; - size_t put_buffer; int put_bits; - int code_0xf0 = actbl->ehufco[0xf0], size_0xf0 = actbl->ehufsi[0xf0]; - size_t bytes, bytestocopy; int localbuf = 0; diff --git a/libjpeg-turbo-match-autoconf-behavior.patch b/libjpeg-turbo-match-autoconf-behavior.patch index d18a449..597fc0a 100644 --- a/libjpeg-turbo-match-autoconf-behavior.patch +++ b/libjpeg-turbo-match-autoconf-behavior.patch @@ -1,18 +1,16 @@ ---- libjpeg-turbo-1.3.0/win/jconfig.h.in.orig 2013-08-03 21:52:45.115856655 +0200 -+++ libjpeg-turbo-1.3.0/win/jconfig.h.in 2013-08-03 21:53:40.335912080 +0200 -@@ -7,14 +7,14 @@ - #cmakedefine D_ARITH_CODING_SUPPORTED - #cmakedefine MEM_SRCDST_SUPPORTED +--- libjpeg-turbo-1.4.2/win/jconfig.h.in.orig 2016-05-10 17:10:15.359564444 +0200 ++++ libjpeg-turbo-1.4.2/win/jconfig.h.in 2016-05-10 17:11:10.705555543 +0200 +@@ -18,13 +18,13 @@ + + #define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */ --#define HAVE_PROTOTYPES -#define HAVE_UNSIGNED_CHAR -#define HAVE_UNSIGNED_SHORT -+#define HAVE_PROTOTYPES 1 +#define HAVE_UNSIGNED_CHAR 1 +#define HAVE_UNSIGNED_SHORT 1 /* #define void char */ /* #define const */ - #undef CHAR_IS_UNSIGNED + #undef __CHAR_UNSIGNED__ -#define HAVE_STDDEF_H -#define HAVE_STDLIB_H +#define HAVE_STDDEF_H 1 @@ -20,7 +18,7 @@ #undef NEED_BSD_STRINGS #undef NEED_SYS_TYPES_H #undef NEED_FAR_POINTERS /* we presume a 32-bit flat memory model */ -@@ -25,7 +25,7 @@ +@@ -34,7 +34,7 @@ #ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ typedef unsigned char boolean; #endif diff --git a/libjpeg-turbo-r1237.patch b/libjpeg-turbo-r1237.patch deleted file mode 100644 index de3480e..0000000 --- a/libjpeg-turbo-r1237.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- libjpeg-turbo-1.3.1/CMakeLists.txt.orig 2014-05-29 17:00:31.775255437 +0200 -+++ libjpeg-turbo-1.3.1/CMakeLists.txt 2014-05-29 17:01:07.174824178 +0200 -@@ -3,7 +3,10 @@ - # - - cmake_minimum_required(VERSION 2.8.8) --cmake_policy(SET CMP0022 OLD) -+# Use LINK_INTERFACE_LIBRARIES instead of INTERFACE_LINK_LIBRARIES -+if(POLICY CMP0022) -+ cmake_policy(SET CMP0022 OLD) -+endif() - - project(libjpeg-turbo C) - set(VERSION 1.3.1) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 21f99a5..8601115 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,8 +5,8 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 1.3.1 -Release: 6%{?dist} +Version: 1.4.2 +Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -18,13 +18,6 @@ Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{v # https://bugzilla.redhat.com/show_bug.cgi?id=843193 Patch0: libjpeg-turbo-match-autoconf-behavior.patch -# Fix compatibility with older CMake versions (as used on RHEL7) -Patch1: libjpeg-turbo-r1237.patch - -# Fix CVE-2014-9092 (RHBZ #1169851 #1169853) -Patch2: libjpeg-turbo-commit-1365.patch -Patch3: libjpeg-turbo-commit-1367.patch - BuildArch: noarch BuildRequires: mingw32-filesystem >= 95 @@ -87,9 +80,6 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo library. %prep %setup -q -n libjpeg-turbo-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build @@ -160,6 +150,9 @@ chmod -x README-turbo.txt %changelog +* Tue May 10 2016 Kalev Lember - 1.4.2-1 +- Update to 1.4.2 + * Thu Feb 04 2016 Fedora Release Engineering - 1.3.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index e1e9636..704a22b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c3a68129dac443a72815ff5bb374b05 libjpeg-turbo-1.3.1.tar.gz +86b0d5f7507c2e6c21c00219162c3c44 libjpeg-turbo-1.4.2.tar.gz From 1ea4496aa7d015dd45071d264e6f1164de86230b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 16 Sep 2016 08:18:51 +0200 Subject: [PATCH 23/55] Update to 1.5.0 --- .gitignore | 1 + mingw-libjpeg-turbo.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6fb3e8d..612bf19 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /libjpeg-turbo-1.3.0.tar.gz /libjpeg-turbo-1.3.1.tar.gz /libjpeg-turbo-1.4.2.tar.gz +/libjpeg-turbo-1.5.0.tar.gz diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 8601115..1265892 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,7 +5,7 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 1.4.2 +Version: 1.5.0 Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library @@ -105,12 +105,12 @@ rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/*.exe %endif # Fix perms -chmod -x README-turbo.txt +chmod -x README.md # Win32 %files -n mingw32-libjpeg-turbo -%doc README README-turbo.txt change.log ChangeLog.txt +%doc README.* ChangeLog.md %if %build_programs %{mingw32_bindir}/*.exe %endif @@ -130,7 +130,7 @@ chmod -x README-turbo.txt # Win64 %files -n mingw64-libjpeg-turbo -%doc README README-turbo.txt change.log ChangeLog.txt +%doc README.* ChangeLog.md %if %build_programs %{mingw64_bindir}/*.exe %endif @@ -150,6 +150,9 @@ chmod -x README-turbo.txt %changelog +* Fri Sep 16 2016 Kalev Lember - 1.5.0-1 +- Update to 1.5.0 + * Tue May 10 2016 Kalev Lember - 1.4.2-1 - Update to 1.4.2 diff --git a/sources b/sources index 704a22b..6f0d250 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -86b0d5f7507c2e6c21c00219162c3c44 libjpeg-turbo-1.4.2.tar.gz +3fc5d9b6a8bce96161659ae7a9939257 libjpeg-turbo-1.5.0.tar.gz From c697ef5a6e4d6c4f831244a0289a4a30fd06e82b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 16 Sep 2016 08:19:38 +0200 Subject: [PATCH 24/55] Include license files --- mingw-libjpeg-turbo.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 1265892..b929115 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -110,6 +110,7 @@ chmod -x README.md # Win32 %files -n mingw32-libjpeg-turbo +%license LICENSE.md %doc README.* ChangeLog.md %if %build_programs %{mingw32_bindir}/*.exe @@ -130,6 +131,7 @@ chmod -x README.md # Win64 %files -n mingw64-libjpeg-turbo +%license LICENSE.md %doc README.* ChangeLog.md %if %build_programs %{mingw64_bindir}/*.exe @@ -152,6 +154,7 @@ chmod -x README.md %changelog * Fri Sep 16 2016 Kalev Lember - 1.5.0-1 - Update to 1.5.0 +- Include license files * Tue May 10 2016 Kalev Lember - 1.4.2-1 - Update to 1.4.2 From e1077c12ce2766dbc2cd9c34e3ea246d9e58a49f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 16 Sep 2016 08:20:42 +0200 Subject: [PATCH 25/55] Don't set group tags They are unused in Fedora. --- mingw-libjpeg-turbo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index b929115..ead50a7 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -11,7 +11,6 @@ Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets URL: http://libjpeg-turbo.virtualgl.org/ -Group: Development/Libraries Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz # Make jconfig.h more autoconf friendly @@ -155,6 +154,7 @@ chmod -x README.md * Fri Sep 16 2016 Kalev Lember - 1.5.0-1 - Update to 1.5.0 - Include license files +- Don't set group tags * Tue May 10 2016 Kalev Lember - 1.4.2-1 - Update to 1.4.2 From 787841ffc58ddfd4db3b8efb28483ce51ea883bb Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 13 Oct 2016 11:15:21 +0200 Subject: [PATCH 26/55] Update to 1.5.1 --- .gitignore | 1 + mingw-libjpeg-turbo.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 612bf19..81a4c26 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /libjpeg-turbo-1.3.1.tar.gz /libjpeg-turbo-1.4.2.tar.gz /libjpeg-turbo-1.5.0.tar.gz +/libjpeg-turbo-1.5.1.tar.gz diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index ead50a7..5a66918 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,7 +5,7 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 1.5.0 +Version: 1.5.1 Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library @@ -151,6 +151,9 @@ chmod -x README.md %changelog +* Thu Oct 13 2016 Kalev Lember - 1.5.1-1 +- Update to 1.5.1 + * Fri Sep 16 2016 Kalev Lember - 1.5.0-1 - Update to 1.5.0 - Include license files diff --git a/sources b/sources index 6f0d250..7da3223 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3fc5d9b6a8bce96161659ae7a9939257 libjpeg-turbo-1.5.0.tar.gz +55deb139b0cac3c8200b75d485fc13f3 libjpeg-turbo-1.5.1.tar.gz From 4b384a4950cc34719072cdf51ac0305eb484411e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 21:11:18 +0000 Subject: [PATCH 27/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 5a66918..52945e2 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 1.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -151,6 +151,9 @@ chmod -x README.md %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Oct 13 2016 Kalev Lember - 1.5.1-1 - Update to 1.5.1 From 6193b4a113d06ed04b55c9490099a7c8e6069982 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 21:40:31 +0000 Subject: [PATCH 28/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 52945e2..523e284 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 1.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -151,6 +151,9 @@ chmod -x README.md %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 198e5f53f7f9feebeb9209526230781488fecf34 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 02:18:57 +0000 Subject: [PATCH 29/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 523e284..e4978ca 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 1.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -151,6 +151,9 @@ chmod -x README.md %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 1.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 5a7caf2cb9c68a8c292c5681875b8977aba9e6ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 10:29:06 +0000 Subject: [PATCH 30/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index e4978ca..083b516 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 1.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -151,6 +151,9 @@ chmod -x README.md %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Fedora Release Engineering - 1.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 725cc42085232267f4d237db40e456d5d71e9aba Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 1 Aug 2018 01:07:16 +0200 Subject: [PATCH 31/55] Update to 2.0.0 --- .gitignore | 1 + libjpeg-turbo-match-autoconf-behavior.patch | 33 +++++++++++---------- mingw-libjpeg-turbo.spec | 15 ++++++++-- sources | 2 +- 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 81a4c26..ff4f2be 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /libjpeg-turbo-1.4.2.tar.gz /libjpeg-turbo-1.5.0.tar.gz /libjpeg-turbo-1.5.1.tar.gz +/libjpeg-turbo-2.0.0.tar.gz diff --git a/libjpeg-turbo-match-autoconf-behavior.patch b/libjpeg-turbo-match-autoconf-behavior.patch index 597fc0a..8928690 100644 --- a/libjpeg-turbo-match-autoconf-behavior.patch +++ b/libjpeg-turbo-match-autoconf-behavior.patch @@ -1,29 +1,30 @@ ---- libjpeg-turbo-1.4.2/win/jconfig.h.in.orig 2016-05-10 17:10:15.359564444 +0200 -+++ libjpeg-turbo-1.4.2/win/jconfig.h.in 2016-05-10 17:11:10.705555543 +0200 -@@ -18,13 +18,13 @@ +diff -rupN libjpeg-turbo-2.0.0/win/jconfig.h.in libjpeg-turbo-2.0.0-new/win/jconfig.h.in +--- libjpeg-turbo-2.0.0/win/jconfig.h.in 2018-07-27 18:47:48.000000000 +0200 ++++ libjpeg-turbo-2.0.0-new/win/jconfig.h.in 2018-08-01 00:53:23.644702905 +0200 +@@ -9,13 +9,13 @@ #define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */ --#define HAVE_UNSIGNED_CHAR --#define HAVE_UNSIGNED_SHORT -+#define HAVE_UNSIGNED_CHAR 1 -+#define HAVE_UNSIGNED_SHORT 1 - /* #define void char */ - /* #define const */ - #undef __CHAR_UNSIGNED__ -#define HAVE_STDDEF_H -#define HAVE_STDLIB_H +#define HAVE_STDDEF_H 1 +#define HAVE_STDLIB_H 1 - #undef NEED_BSD_STRINGS #undef NEED_SYS_TYPES_H - #undef NEED_FAR_POINTERS /* we presume a 32-bit flat memory model */ -@@ -34,7 +34,7 @@ - #ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ + #undef NEED_BSD_STRINGS + +-#define HAVE_UNSIGNED_CHAR +-#define HAVE_UNSIGNED_SHORT ++#define HAVE_UNSIGNED_CHAR 1 ++#define HAVE_UNSIGNED_SHORT 1 + #undef INCOMPLETE_TYPES_BROKEN + #undef RIGHT_SHIFT_IS_UNSIGNED + #undef __CHAR_UNSIGNED__ +@@ -24,7 +24,7 @@ + #ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ typedef unsigned char boolean; #endif --#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ -+#define HAVE_BOOLEAN 1 /* prevent jmorecfg.h from redefining it */ +-#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ ++#define HAVE_BOOLEAN 1 /* prevent jmorecfg.h from redefining it */ /* Define "INT32" as int, not long, per Windows custom */ #if !(defined(_BASETSD_H_) || defined(_BASETSD_H)) /* don't conflict if basetsd.h already read */ diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 083b516..956e259 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,8 +5,8 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 1.5.1 -Release: 5%{?dist} +Version: 2.0.0 +Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -89,9 +89,11 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo library. %install %mingw_make install DESTDIR=$RPM_BUILD_ROOT -# Remove manual pages which duplicate Fedora native. +# Remove manual pages and docs which duplicate Fedora native. rm -rf $RPM_BUILD_ROOT%{mingw32_mandir} rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} +rm -rf $RPM_BUILD_ROOT%{mingw32_docdir} +rm -rf $RPM_BUILD_ROOT%{mingw64_docdir} # The CMake build system also installed some docs rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/doc @@ -123,6 +125,8 @@ chmod -x README.md %{mingw32_includedir}/turbojpeg.h %{mingw32_libdir}/libjpeg.dll.a %{mingw32_libdir}/libturbojpeg.dll.a +%{mingw32_libdir}/pkgconfig/libjpeg.pc +%{mingw32_libdir}/pkgconfig/libturbojpeg.pc %files -n mingw32-libjpeg-turbo-static %{mingw32_libdir}/libjpeg.a @@ -144,6 +148,8 @@ chmod -x README.md %{mingw64_includedir}/turbojpeg.h %{mingw64_libdir}/libjpeg.dll.a %{mingw64_libdir}/libturbojpeg.dll.a +%{mingw64_libdir}/pkgconfig/libjpeg.pc +%{mingw64_libdir}/pkgconfig/libturbojpeg.pc %files -n mingw64-libjpeg-turbo-static %{mingw64_libdir}/libjpeg.a @@ -151,6 +157,9 @@ chmod -x README.md %changelog +* Wed Aug 01 2018 Sandro Mani - 2.0.0-1 +- Update to 2.0.0 + * Fri Jul 13 2018 Fedora Release Engineering - 1.5.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 7da3223..86499b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55deb139b0cac3c8200b75d485fc13f3 libjpeg-turbo-1.5.1.tar.gz +SHA512 (libjpeg-turbo-2.0.0.tar.gz) = 220e5248e780d3c40c7842ba52937b9b0860e89164bca16ec6e2afaf99dd5d0bc706dd9320f4d2aef67ac11d4876453ef688b1efeaf93ceb42e8c25e83da2487 From ae6be94c5b646d3da76e64e8db45e741ce77fc19 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 11 Jan 2019 12:38:20 +0100 Subject: [PATCH 32/55] Fix CVE-2018-19664 and CVE-2018-20330 --- libjpeg-turbo-CVE-2018-19664.patch | 33 ++++++++++++++++++++++++++ libjpeg-turbo-CVE-2018-20330.patch | 38 ++++++++++++++++++++++++++++++ mingw-libjpeg-turbo.spec | 10 +++++--- 3 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 libjpeg-turbo-CVE-2018-19664.patch create mode 100644 libjpeg-turbo-CVE-2018-20330.patch diff --git a/libjpeg-turbo-CVE-2018-19664.patch b/libjpeg-turbo-CVE-2018-19664.patch new file mode 100644 index 0000000..f99863e --- /dev/null +++ b/libjpeg-turbo-CVE-2018-19664.patch @@ -0,0 +1,33 @@ +From 4a3f52b4d191d79f500831649037b9b24c730e37 Mon Sep 17 00:00:00 2001 +From: DRC +Date: Tue, 1 Jan 2019 20:32:40 -0600 +Subject: [PATCH] wrbmp.c: Don't allow quantization w/ non-RGB CS + +If cinfo->quantize_colors == 1, then jpeg_calc_output_dimensions() will +set cinfo->output_components to 1, and if cinfo->out_color_space is not +RGB (or extended RGB), hilarity will ensue. + +Fixes #305 +--- + wrbmp.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/wrbmp.c b/wrbmp.c +index 38a64e8..3489f14 100644 +--- a/wrbmp.c ++++ b/wrbmp.c +@@ -506,8 +506,9 @@ jinit_write_bmp(j_decompress_ptr cinfo, boolean is_os2, + dest->pub.put_pixel_rows = put_gray_rows; + else + dest->pub.put_pixel_rows = put_pixel_rows; +- } else if (cinfo->out_color_space == JCS_RGB565 || +- cinfo->out_color_space == JCS_CMYK) { ++ } else if (!cinfo->quantize_colors && ++ (cinfo->out_color_space == JCS_RGB565 || ++ cinfo->out_color_space == JCS_CMYK)) { + dest->pub.put_pixel_rows = put_pixel_rows; + } else { + ERREXIT(cinfo, JERR_BMP_COLORSPACE); +-- +2.17.2 + diff --git a/libjpeg-turbo-CVE-2018-20330.patch b/libjpeg-turbo-CVE-2018-20330.patch new file mode 100644 index 0000000..169d01a --- /dev/null +++ b/libjpeg-turbo-CVE-2018-20330.patch @@ -0,0 +1,38 @@ +From 9c5f56c55a8610953854408b3aade01320064e07 Mon Sep 17 00:00:00 2001 +From: DRC +Date: Tue, 1 Jan 2019 18:57:36 -0600 +Subject: [PATCH] tjLoadImage(): Fix int overflow/segfault w/big BMP + +Fixes #304 +--- + turbojpeg.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/turbojpeg.c b/turbojpeg.c +index 90a9ce6..3b5154f 100644 +--- a/turbojpeg.c ++++ b/turbojpeg.c +@@ -1960,7 +1960,8 @@ DLLEXPORT unsigned char *tjLoadImage(const char *filename, int *width, + int align, int *height, int *pixelFormat, + int flags) + { +- int retval = 0, tempc, pitch; ++ int retval = 0, tempc; ++ size_t pitch; + tjhandle handle = NULL; + tjinstance *this; + j_compress_ptr cinfo = NULL; +@@ -2013,7 +2014,9 @@ DLLEXPORT unsigned char *tjLoadImage(const char *filename, int *width, + *pixelFormat = cs2pf[cinfo->in_color_space]; + + pitch = PAD((*width) * tjPixelSize[*pixelFormat], align); +- if ((dstBuf = (unsigned char *)malloc(pitch * (*height))) == NULL) ++ if ((unsigned long long)pitch * (unsigned long long)(*height) > ++ (unsigned long long)((size_t)-1) || ++ (dstBuf = (unsigned char *)malloc(pitch * (*height))) == NULL) + _throwg("tjLoadImage(): Memory allocation failure"); + + if (setjmp(this->jerr.setjmp_buffer)) { +-- +2.17.2 + diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 956e259..90d9570 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -16,6 +16,8 @@ Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{v # Make jconfig.h more autoconf friendly # https://bugzilla.redhat.com/show_bug.cgi?id=843193 Patch0: libjpeg-turbo-match-autoconf-behavior.patch +Patch1: libjpeg-turbo-CVE-2018-19664.patch +Patch2: libjpeg-turbo-CVE-2018-20330.patch BuildArch: noarch @@ -77,8 +79,7 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo library. %prep -%setup -q -n libjpeg-turbo-%{version} -%patch0 -p1 +%autosetup -n libjpeg-turbo-%{version} -p1 %build @@ -157,6 +158,9 @@ chmod -x README.md %changelog +* Fri Jan 11 2019 Kalev Lember - 2.0.0-2 +- Fix CVE-2018-19664 and CVE-2018-20330 + * Wed Aug 01 2018 Sandro Mani - 2.0.0-1 - Update to 2.0.0 From 2539464b21747e582398ab65f601016abd075a05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 10:40:47 +0000 Subject: [PATCH 33/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 90d9570..cad4254 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -158,6 +158,9 @@ chmod -x README.md %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 2.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jan 11 2019 Kalev Lember - 2.0.0-2 - Fix CVE-2018-19664 and CVE-2018-20330 From 3ce54ba6b3fd314ccea05926430445830c073ce9 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 27 Feb 2019 18:34:14 +0100 Subject: [PATCH 34/55] Update to 2.0.2 --- .gitignore | 1 + libjpeg-turbo-CVE-2018-19664.patch | 33 -------------------------- libjpeg-turbo-CVE-2018-20330.patch | 38 ------------------------------ mingw-libjpeg-turbo.spec | 9 +++---- sources | 2 +- 5 files changed, 7 insertions(+), 76 deletions(-) delete mode 100644 libjpeg-turbo-CVE-2018-19664.patch delete mode 100644 libjpeg-turbo-CVE-2018-20330.patch diff --git a/.gitignore b/.gitignore index ff4f2be..cdecad8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /libjpeg-turbo-1.5.0.tar.gz /libjpeg-turbo-1.5.1.tar.gz /libjpeg-turbo-2.0.0.tar.gz +/libjpeg-turbo-2.0.2.tar.gz diff --git a/libjpeg-turbo-CVE-2018-19664.patch b/libjpeg-turbo-CVE-2018-19664.patch deleted file mode 100644 index f99863e..0000000 --- a/libjpeg-turbo-CVE-2018-19664.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4a3f52b4d191d79f500831649037b9b24c730e37 Mon Sep 17 00:00:00 2001 -From: DRC -Date: Tue, 1 Jan 2019 20:32:40 -0600 -Subject: [PATCH] wrbmp.c: Don't allow quantization w/ non-RGB CS - -If cinfo->quantize_colors == 1, then jpeg_calc_output_dimensions() will -set cinfo->output_components to 1, and if cinfo->out_color_space is not -RGB (or extended RGB), hilarity will ensue. - -Fixes #305 ---- - wrbmp.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/wrbmp.c b/wrbmp.c -index 38a64e8..3489f14 100644 ---- a/wrbmp.c -+++ b/wrbmp.c -@@ -506,8 +506,9 @@ jinit_write_bmp(j_decompress_ptr cinfo, boolean is_os2, - dest->pub.put_pixel_rows = put_gray_rows; - else - dest->pub.put_pixel_rows = put_pixel_rows; -- } else if (cinfo->out_color_space == JCS_RGB565 || -- cinfo->out_color_space == JCS_CMYK) { -+ } else if (!cinfo->quantize_colors && -+ (cinfo->out_color_space == JCS_RGB565 || -+ cinfo->out_color_space == JCS_CMYK)) { - dest->pub.put_pixel_rows = put_pixel_rows; - } else { - ERREXIT(cinfo, JERR_BMP_COLORSPACE); --- -2.17.2 - diff --git a/libjpeg-turbo-CVE-2018-20330.patch b/libjpeg-turbo-CVE-2018-20330.patch deleted file mode 100644 index 169d01a..0000000 --- a/libjpeg-turbo-CVE-2018-20330.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9c5f56c55a8610953854408b3aade01320064e07 Mon Sep 17 00:00:00 2001 -From: DRC -Date: Tue, 1 Jan 2019 18:57:36 -0600 -Subject: [PATCH] tjLoadImage(): Fix int overflow/segfault w/big BMP - -Fixes #304 ---- - turbojpeg.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/turbojpeg.c b/turbojpeg.c -index 90a9ce6..3b5154f 100644 ---- a/turbojpeg.c -+++ b/turbojpeg.c -@@ -1960,7 +1960,8 @@ DLLEXPORT unsigned char *tjLoadImage(const char *filename, int *width, - int align, int *height, int *pixelFormat, - int flags) - { -- int retval = 0, tempc, pitch; -+ int retval = 0, tempc; -+ size_t pitch; - tjhandle handle = NULL; - tjinstance *this; - j_compress_ptr cinfo = NULL; -@@ -2013,7 +2014,9 @@ DLLEXPORT unsigned char *tjLoadImage(const char *filename, int *width, - *pixelFormat = cs2pf[cinfo->in_color_space]; - - pitch = PAD((*width) * tjPixelSize[*pixelFormat], align); -- if ((dstBuf = (unsigned char *)malloc(pitch * (*height))) == NULL) -+ if ((unsigned long long)pitch * (unsigned long long)(*height) > -+ (unsigned long long)((size_t)-1) || -+ (dstBuf = (unsigned char *)malloc(pitch * (*height))) == NULL) - _throwg("tjLoadImage(): Memory allocation failure"); - - if (setjmp(this->jerr.setjmp_buffer)) { --- -2.17.2 - diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index cad4254..7726e0f 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,8 +5,8 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 2.0.0 -Release: 3%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -16,8 +16,6 @@ Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{v # Make jconfig.h more autoconf friendly # https://bugzilla.redhat.com/show_bug.cgi?id=843193 Patch0: libjpeg-turbo-match-autoconf-behavior.patch -Patch1: libjpeg-turbo-CVE-2018-19664.patch -Patch2: libjpeg-turbo-CVE-2018-20330.patch BuildArch: noarch @@ -158,6 +156,9 @@ chmod -x README.md %changelog +* Wed Feb 27 2019 Kalev Lember - 2.0.2-1 +- Update to 2.0.2 + * Fri Feb 01 2019 Fedora Release Engineering - 2.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 86499b1..bc1b8f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libjpeg-turbo-2.0.0.tar.gz) = 220e5248e780d3c40c7842ba52937b9b0860e89164bca16ec6e2afaf99dd5d0bc706dd9320f4d2aef67ac11d4876453ef688b1efeaf93ceb42e8c25e83da2487 +SHA512 (libjpeg-turbo-2.0.2.tar.gz) = 204b6d083e99488c975c75efb08699e4dc1c409556e4dee4f21e3ee67e9c6682eb342f2e5712816b0342c00399fbe6e43fbce30c3d22f30f7ef91db006b3be08 From 214f50b9255b96ed0ed921784268eeaf81cc314d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 16:54:10 +0000 Subject: [PATCH 35/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 7726e0f..2f98512 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 2.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -156,6 +156,9 @@ chmod -x README.md %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Feb 27 2019 Kalev Lember - 2.0.2-1 - Update to 2.0.2 From 4fe1921ad4aca3cb802c65c3c3ffdb8b47f994c5 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 16 Sep 2019 11:43:06 +0200 Subject: [PATCH 36/55] Update to 2.0.3 --- .gitignore | 1 + mingw-libjpeg-turbo.spec | 29 ++++++++++++++++------------- sources | 2 +- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index cdecad8..1e2dde8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /libjpeg-turbo-1.5.1.tar.gz /libjpeg-turbo-2.0.0.tar.gz /libjpeg-turbo-2.0.2.tar.gz +/libjpeg-turbo-2.0.3.tar.gz diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 2f98512..59c9118 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -1,12 +1,12 @@ -%?mingw_package_header +%{?mingw_package_header} # Build the programs like cjpeg, etc. # https://bugzilla.redhat.com/show_bug.cgi?id=467401#c7 %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 2.0.2 -Release: 2%{?dist} +Version: 2.0.3 +Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -73,7 +73,7 @@ Provides: mingw64-libjpeg-static = 8a-2%{?dist} Static version of the MinGW Windows cross compiled Libjpeg-turbo library. -%?mingw_debug_package +%{?mingw_debug_package} %prep @@ -86,22 +86,22 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo library. %install -%mingw_make install DESTDIR=$RPM_BUILD_ROOT +%mingw_make install DESTDIR=%{buildroot} # Remove manual pages and docs which duplicate Fedora native. -rm -rf $RPM_BUILD_ROOT%{mingw32_mandir} -rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} -rm -rf $RPM_BUILD_ROOT%{mingw32_docdir} -rm -rf $RPM_BUILD_ROOT%{mingw64_docdir} +rm -rf %{buildroot}%{mingw32_mandir} +rm -rf %{buildroot}%{mingw64_mandir} +rm -rf %{buildroot}%{mingw32_docdir} +rm -rf %{buildroot}%{mingw64_docdir} # The CMake build system also installed some docs -rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/doc -rm -rf $RPM_BUILD_ROOT%{mingw64_prefix}/doc +rm -rf %{buildroot}%{mingw32_prefix}/doc +rm -rf %{buildroot}%{mingw64_prefix}/doc # Remove win32 native binaries if wanted %if %build_programs == 0 -rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/*.exe -rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/*.exe +rm -f %{buildroot}%{mingw32_bindir}/*.exe +rm -f %{buildroot}%{mingw64_bindir}/*.exe %endif # Fix perms @@ -156,6 +156,9 @@ chmod -x README.md %changelog +* Mon Sep 16 2019 Sandro Mani - 2.0.3-1 +- Update to 2.0.3 + * Thu Jul 25 2019 Fedora Release Engineering - 2.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index bc1b8f3..317c743 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libjpeg-turbo-2.0.2.tar.gz) = 204b6d083e99488c975c75efb08699e4dc1c409556e4dee4f21e3ee67e9c6682eb342f2e5712816b0342c00399fbe6e43fbce30c3d22f30f7ef91db006b3be08 +SHA512 (libjpeg-turbo-2.0.3.tar.gz) = ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36 From 5ef54e6006214f0352415294f75547167cd9164f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 9 Jan 2020 11:22:46 +0100 Subject: [PATCH 37/55] Update to 2.0.4 --- .gitignore | 1 + libjpeg-turbo-match-autoconf-behavior.patch | 6 +++--- mingw-libjpeg-turbo.spec | 5 ++++- sources | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1e2dde8..1defa04 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /libjpeg-turbo-2.0.0.tar.gz /libjpeg-turbo-2.0.2.tar.gz /libjpeg-turbo-2.0.3.tar.gz +/libjpeg-turbo-2.0.4.tar.gz diff --git a/libjpeg-turbo-match-autoconf-behavior.patch b/libjpeg-turbo-match-autoconf-behavior.patch index 8928690..616ffd9 100644 --- a/libjpeg-turbo-match-autoconf-behavior.patch +++ b/libjpeg-turbo-match-autoconf-behavior.patch @@ -1,6 +1,6 @@ -diff -rupN libjpeg-turbo-2.0.0/win/jconfig.h.in libjpeg-turbo-2.0.0-new/win/jconfig.h.in ---- libjpeg-turbo-2.0.0/win/jconfig.h.in 2018-07-27 18:47:48.000000000 +0200 -+++ libjpeg-turbo-2.0.0-new/win/jconfig.h.in 2018-08-01 00:53:23.644702905 +0200 +diff -rupN --no-dereference libjpeg-turbo-2.0.4/win/jconfig.h.in libjpeg-turbo-2.0.4-new/win/jconfig.h.in +--- libjpeg-turbo-2.0.4/win/jconfig.h.in 2019-12-31 08:10:30.000000000 +0100 ++++ libjpeg-turbo-2.0.4-new/win/jconfig.h.in 2020-01-09 11:17:50.042476396 +0100 @@ -9,13 +9,13 @@ #define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */ diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 59c9118..63e6ce2 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,7 +5,7 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 2.0.3 +Version: 2.0.4 Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library @@ -156,6 +156,9 @@ chmod -x README.md %changelog +* Thu Jan 09 2020 Sandro Mani - 2.0.4-1 +- Update to 2.0.4 + * Mon Sep 16 2019 Sandro Mani - 2.0.3-1 - Update to 2.0.3 diff --git a/sources b/sources index 317c743..d59ca0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libjpeg-turbo-2.0.3.tar.gz) = ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36 +SHA512 (libjpeg-turbo-2.0.4.tar.gz) = 708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9 From 1017ed0e17802f7750547482633b8b1c071677c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 13:10:08 +0000 Subject: [PATCH 38/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 63e6ce2..a9c153c 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 2.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -156,6 +156,9 @@ chmod -x README.md %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jan 09 2020 Sandro Mani - 2.0.4-1 - Update to 2.0.4 From f6c3cc8708e13c6699a93df02520911a30ef7be4 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 16 Jun 2020 11:49:10 +0200 Subject: [PATCH 39/55] Fix CVE-2020-13790 https://bugzilla.redhat.com/show_bug.cgi?id=1847160 --- libjpeg-turbo-CVE-2020-13790.patch | 32 ++++++++++++++++++++++++++++++ mingw-libjpeg-turbo.spec | 6 +++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 libjpeg-turbo-CVE-2020-13790.patch diff --git a/libjpeg-turbo-CVE-2020-13790.patch b/libjpeg-turbo-CVE-2020-13790.patch new file mode 100644 index 0000000..7b5487d --- /dev/null +++ b/libjpeg-turbo-CVE-2020-13790.patch @@ -0,0 +1,32 @@ +From a224e4dfd34823a4d993dcb97819bdcee8471676 Mon Sep 17 00:00:00 2001 +From: DRC +Date: Tue, 2 Jun 2020 14:15:37 -0500 +Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM + +This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to +include binary PPM files with maximum values < 255, thus preventing a +malformed binary PPM input file with those specifications from +triggering an overrun of the rescale array and potentially crashing +cjpeg, TJBench, or any program that uses the tjLoadImage() function. + +Fixes #433 +--- + rdppm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rdppm.c b/rdppm.c +index 87bc330..71dd146 100644 +--- a/rdppm.c ++++ b/rdppm.c +@@ -720,7 +720,7 @@ start_input_ppm(j_compress_ptr cinfo, cjpeg_source_ptr sinfo) + /* On 16-bit-int machines we have to be careful of maxval = 65535 */ + source->rescale = (JSAMPLE *) + (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE, +- (size_t)(((long)maxval + 1L) * ++ (size_t)(((long)MAX(maxval, 255) + 1L) * + sizeof(JSAMPLE))); + half_maxval = maxval / 2; + for (val = 0; val <= (long)maxval; val++) { +-- +2.26.2 + diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index a9c153c..b8e8658 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 2.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -16,6 +16,7 @@ Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{v # Make jconfig.h more autoconf friendly # https://bugzilla.redhat.com/show_bug.cgi?id=843193 Patch0: libjpeg-turbo-match-autoconf-behavior.patch +Patch2: libjpeg-turbo-CVE-2020-13790.patch BuildArch: noarch @@ -156,6 +157,9 @@ chmod -x README.md %changelog +* Tue Jun 16 2020 Kalev Lember - 2.0.4-3 +- Fix CVE-2020-13790 (#1847160) + * Wed Jan 29 2020 Fedora Release Engineering - 2.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From d896f3d39a3cf80419b21a96bcf789abb05eb9ff Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 4 Jul 2020 10:06:35 +0200 Subject: [PATCH 40/55] Update to 2.0.5 --- .gitignore | 1 + libjpeg-turbo-CVE-2020-13790.patch | 32 --------------------- libjpeg-turbo-match-autoconf-behavior.patch | 6 ++-- mingw-libjpeg-turbo.spec | 12 ++++---- sources | 2 +- 5 files changed, 12 insertions(+), 41 deletions(-) delete mode 100644 libjpeg-turbo-CVE-2020-13790.patch diff --git a/.gitignore b/.gitignore index 1defa04..bf8760e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /libjpeg-turbo-2.0.2.tar.gz /libjpeg-turbo-2.0.3.tar.gz /libjpeg-turbo-2.0.4.tar.gz +/libjpeg-turbo-2.0.5.tar.gz diff --git a/libjpeg-turbo-CVE-2020-13790.patch b/libjpeg-turbo-CVE-2020-13790.patch deleted file mode 100644 index 7b5487d..0000000 --- a/libjpeg-turbo-CVE-2020-13790.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a224e4dfd34823a4d993dcb97819bdcee8471676 Mon Sep 17 00:00:00 2001 -From: DRC -Date: Tue, 2 Jun 2020 14:15:37 -0500 -Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM - -This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to -include binary PPM files with maximum values < 255, thus preventing a -malformed binary PPM input file with those specifications from -triggering an overrun of the rescale array and potentially crashing -cjpeg, TJBench, or any program that uses the tjLoadImage() function. - -Fixes #433 ---- - rdppm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rdppm.c b/rdppm.c -index 87bc330..71dd146 100644 ---- a/rdppm.c -+++ b/rdppm.c -@@ -720,7 +720,7 @@ start_input_ppm(j_compress_ptr cinfo, cjpeg_source_ptr sinfo) - /* On 16-bit-int machines we have to be careful of maxval = 65535 */ - source->rescale = (JSAMPLE *) - (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE, -- (size_t)(((long)maxval + 1L) * -+ (size_t)(((long)MAX(maxval, 255) + 1L) * - sizeof(JSAMPLE))); - half_maxval = maxval / 2; - for (val = 0; val <= (long)maxval; val++) { --- -2.26.2 - diff --git a/libjpeg-turbo-match-autoconf-behavior.patch b/libjpeg-turbo-match-autoconf-behavior.patch index 616ffd9..3c7b896 100644 --- a/libjpeg-turbo-match-autoconf-behavior.patch +++ b/libjpeg-turbo-match-autoconf-behavior.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference libjpeg-turbo-2.0.4/win/jconfig.h.in libjpeg-turbo-2.0.4-new/win/jconfig.h.in ---- libjpeg-turbo-2.0.4/win/jconfig.h.in 2019-12-31 08:10:30.000000000 +0100 -+++ libjpeg-turbo-2.0.4-new/win/jconfig.h.in 2020-01-09 11:17:50.042476396 +0100 +diff -rupN --no-dereference libjpeg-turbo-2.0.5/win/jconfig.h.in libjpeg-turbo-2.0.5-new/win/jconfig.h.in +--- libjpeg-turbo-2.0.5/win/jconfig.h.in 2020-06-19 06:40:20.000000000 +0200 ++++ libjpeg-turbo-2.0.5-new/win/jconfig.h.in 2020-07-04 09:54:58.390069926 +0200 @@ -9,13 +9,13 @@ #define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */ diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index b8e8658..a2037ac 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,8 +5,8 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 2.0.4 -Release: 3%{?dist} +Version: 2.0.5 +Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -16,7 +16,6 @@ Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{v # Make jconfig.h more autoconf friendly # https://bugzilla.redhat.com/show_bug.cgi?id=843193 Patch0: libjpeg-turbo-match-autoconf-behavior.patch -Patch2: libjpeg-turbo-CVE-2020-13790.patch BuildArch: noarch @@ -83,11 +82,11 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo library. %build %mingw_cmake -%mingw_make %{?_smp_mflags} +%mingw_make_build %install -%mingw_make install DESTDIR=%{buildroot} +%mingw_make_install # Remove manual pages and docs which duplicate Fedora native. rm -rf %{buildroot}%{mingw32_mandir} @@ -157,6 +156,9 @@ chmod -x README.md %changelog +* Sat Jul 04 2020 Sandro Mani - 2.0.5-1 +- Update to 2.0.5 + * Tue Jun 16 2020 Kalev Lember - 2.0.4-3 - Fix CVE-2020-13790 (#1847160) diff --git a/sources b/sources index d59ca0b..de45df5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libjpeg-turbo-2.0.4.tar.gz) = 708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9 +SHA512 (libjpeg-turbo-2.0.5.tar.gz) = 5bf9ecf069b43783ff24365febf36dda69ccb92d6397efec6069b2b4f359bfd7b87934a6ce4311873220fccc73acabdacef5ce0604b79209eb1912e8ba478555 From c8bb7e266718d2fdd2e38b95cb7051f63b7bce7a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 07:44:40 +0000 Subject: [PATCH 41/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index a2037ac..616ba5e 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 2.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -156,6 +156,9 @@ chmod -x README.md %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jul 04 2020 Sandro Mani - 2.0.5-1 - Update to 2.0.5 From cd7687f056940a9dbb45bffb1a3d195f1d7a0270 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 13 Jan 2021 04:06:12 +0000 Subject: [PATCH 42/55] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- mingw-libjpeg-turbo.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 616ba5e..90822b0 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -19,6 +19,7 @@ Patch0: libjpeg-turbo-match-autoconf-behavior.patch BuildArch: noarch +BuildRequires: make BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-gcc BuildRequires: mingw32-gcc-c++ From 0209c7d8bfbab055f7ec872655dda3c152bfd7d6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 20:05:29 +0000 Subject: [PATCH 43/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 90822b0..4243ddf 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 2.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -157,6 +157,9 @@ chmod -x README.md %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 2.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From e880d53e5017639d3f62562467f6ebcf17e8c4ed Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 28 Jan 2021 14:46:14 +0100 Subject: [PATCH 44/55] Update to 2.0.90 --- .gitignore | 1 + libjpeg-turbo-match-autoconf-behavior.patch | 10 +++++----- mingw-libjpeg-turbo.spec | 9 +++++++-- sources | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index bf8760e..1ecad02 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /libjpeg-turbo-2.0.3.tar.gz /libjpeg-turbo-2.0.4.tar.gz /libjpeg-turbo-2.0.5.tar.gz +/libjpeg-turbo-2.0.90.tar.gz diff --git a/libjpeg-turbo-match-autoconf-behavior.patch b/libjpeg-turbo-match-autoconf-behavior.patch index 3c7b896..2c093ea 100644 --- a/libjpeg-turbo-match-autoconf-behavior.patch +++ b/libjpeg-turbo-match-autoconf-behavior.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference libjpeg-turbo-2.0.5/win/jconfig.h.in libjpeg-turbo-2.0.5-new/win/jconfig.h.in ---- libjpeg-turbo-2.0.5/win/jconfig.h.in 2020-06-19 06:40:20.000000000 +0200 -+++ libjpeg-turbo-2.0.5-new/win/jconfig.h.in 2020-07-04 09:54:58.390069926 +0200 +diff -rupN --no-dereference libjpeg-turbo-2.0.90/win/jconfig.h.in libjpeg-turbo-2.0.90-new/win/jconfig.h.in +--- libjpeg-turbo-2.0.90/win/jconfig.h.in 2020-11-25 04:56:19.000000000 +0100 ++++ libjpeg-turbo-2.0.90-new/win/jconfig.h.in 2021-01-28 13:40:54.823347735 +0100 @@ -9,13 +9,13 @@ #define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */ @@ -18,8 +18,8 @@ diff -rupN --no-dereference libjpeg-turbo-2.0.5/win/jconfig.h.in libjpeg-turbo-2 +#define HAVE_UNSIGNED_SHORT 1 #undef INCOMPLETE_TYPES_BROKEN #undef RIGHT_SHIFT_IS_UNSIGNED - #undef __CHAR_UNSIGNED__ -@@ -24,7 +24,7 @@ + +@@ -23,7 +23,7 @@ #ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ typedef unsigned char boolean; #endif diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 4243ddf..690fa4b 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,8 +5,8 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 2.0.5 -Release: 3%{?dist} +Version: 2.0.90 +Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -123,6 +123,7 @@ chmod -x README.md %{mingw32_includedir}/jmorecfg.h %{mingw32_includedir}/jpeglib.h %{mingw32_includedir}/turbojpeg.h +%{mingw32_libdir}/cmake/libjpeg-turbo/ %{mingw32_libdir}/libjpeg.dll.a %{mingw32_libdir}/libturbojpeg.dll.a %{mingw32_libdir}/pkgconfig/libjpeg.pc @@ -146,6 +147,7 @@ chmod -x README.md %{mingw64_includedir}/jmorecfg.h %{mingw64_includedir}/jpeglib.h %{mingw64_includedir}/turbojpeg.h +%{mingw64_libdir}/cmake/libjpeg-turbo/ %{mingw64_libdir}/libjpeg.dll.a %{mingw64_libdir}/libturbojpeg.dll.a %{mingw64_libdir}/pkgconfig/libjpeg.pc @@ -157,6 +159,9 @@ chmod -x README.md %changelog +* Thu Jan 28 2021 Sandro Mani - 2.0.90-1 +- Update to 2.0.90 + * Tue Jan 26 2021 Fedora Release Engineering - 2.0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index de45df5..2d86f33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libjpeg-turbo-2.0.5.tar.gz) = 5bf9ecf069b43783ff24365febf36dda69ccb92d6397efec6069b2b4f359bfd7b87934a6ce4311873220fccc73acabdacef5ce0604b79209eb1912e8ba478555 +SHA512 (libjpeg-turbo-2.0.90.tar.gz) = e00cab142c81e90d0eaf891d44ce3dccfdfe7d61e4efe8e81c5983dc6444ca1775f555316cce17b6551afc4b9e285202f53f6d0a8561433840fda311f630bc6d From eba9d4c9933e08ceaf8391da66b66dd2835c479d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 12 Apr 2021 10:21:18 +0200 Subject: [PATCH 45/55] Backport patch for CVE-2021-20205 --- CVE-2021-20205.patch | 72 +++++++++++++++++++++ libjpeg-turbo-match-autoconf-behavior.patch | 2 +- mingw-libjpeg-turbo.spec | 12 +++- 3 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 CVE-2021-20205.patch diff --git a/CVE-2021-20205.patch b/CVE-2021-20205.patch new file mode 100644 index 0000000..affcb55 --- /dev/null +++ b/CVE-2021-20205.patch @@ -0,0 +1,72 @@ +diff -rupN --no-dereference libjpeg-turbo-2.0.90/cderror.h libjpeg-turbo-2.0.90-new/cderror.h +--- libjpeg-turbo-2.0.90/cderror.h 2020-11-25 04:56:19.000000000 +0100 ++++ libjpeg-turbo-2.0.90-new/cderror.h 2021-04-12 10:20:58.463111547 +0200 +@@ -1,9 +1,11 @@ + /* + * cderror.h + * ++ * This file was part of the Independent JPEG Group's software: + * Copyright (C) 1994-1997, Thomas G. Lane. + * Modified 2009-2017 by Guido Vollbeding. +- * This file is part of the Independent JPEG Group's software. ++ * libjpeg-turbo Modifications: ++ * Copyright (C) 2021, D. R. Commander. + * For conditions of distribution and use, see the accompanying README.ijg + * file. + * +@@ -60,6 +62,7 @@ JMESSAGE(JTRC_BMP_OS2_MAPPED, "%ux%u 8-b + JMESSAGE(JERR_GIF_BUG, "GIF output got confused") + JMESSAGE(JERR_GIF_CODESIZE, "Bogus GIF codesize %d") + JMESSAGE(JERR_GIF_COLORSPACE, "GIF output must be grayscale or RGB") ++JMESSAGE(JERR_GIF_EMPTY, "Empty GIF image") + JMESSAGE(JERR_GIF_IMAGENOTFOUND, "Too few images in GIF file") + JMESSAGE(JERR_GIF_NOT, "Not a GIF file") + JMESSAGE(JTRC_GIF, "%ux%ux%d GIF image") +diff -rupN --no-dereference libjpeg-turbo-2.0.90/ChangeLog.md libjpeg-turbo-2.0.90-new/ChangeLog.md +--- libjpeg-turbo-2.0.90/ChangeLog.md 2020-11-25 04:56:19.000000000 +0100 ++++ libjpeg-turbo-2.0.90-new/ChangeLog.md 2021-04-12 10:20:58.463111547 +0200 +@@ -140,6 +140,10 @@ been reverted. + 15. The build system can now be used to generate a universal x86-64 + Armv8 + libjpeg-turbo SDK package for both iOS and macOS. + ++4. Fixed a floating point exception that occurred when attempting to compress a ++specially-crafted malformed GIF image with a specified image width of 0 using ++cjpeg. ++ + + 2.0.6 + ===== +diff -rupN --no-dereference libjpeg-turbo-2.0.90/rdgif.c libjpeg-turbo-2.0.90-new/rdgif.c +--- libjpeg-turbo-2.0.90/rdgif.c 2020-11-25 04:56:19.000000000 +0100 ++++ libjpeg-turbo-2.0.90-new/rdgif.c 2021-04-12 10:20:58.463111547 +0200 +@@ -1,9 +1,11 @@ + /* + * rdgif.c + * ++ * This file was part of the Independent JPEG Group's software: + * Copyright (C) 1991-1997, Thomas G. Lane. + * Modified 2019 by Guido Vollbeding. +- * This file is part of the Independent JPEG Group's software. ++ * libjpeg-turbo Modifications: ++ * Copyright (C) 2021, D. R. Commander. + * For conditions of distribution and use, see the accompanying README.ijg + * file. + * +@@ -404,6 +406,8 @@ start_input_gif(j_compress_ptr cinfo, cj + ERREXIT(cinfo, JERR_INPUT_EOF); + width = LM_to_uint(hdrbuf, 0); + height = LM_to_uint(hdrbuf, 2); ++ if (width == 0 || height == 0) ++ ERREXIT(cinfo, JERR_GIF_EMPTY); + /* we ignore the color resolution, sort flag, and background color index */ + aspectRatio = UCH(hdrbuf[6]); + if (aspectRatio != 0 && aspectRatio != 49) +@@ -446,6 +450,8 @@ start_input_gif(j_compress_ptr cinfo, cj + /* we ignore top/left position info, also sort flag */ + width = LM_to_uint(hdrbuf, 4); + height = LM_to_uint(hdrbuf, 6); ++ if (width == 0 || height == 0) ++ ERREXIT(cinfo, JERR_GIF_EMPTY); + source->is_interlaced = (BitSet(hdrbuf[8], INTERLACE) != 0); + + /* Read local colormap if header indicates it is present */ diff --git a/libjpeg-turbo-match-autoconf-behavior.patch b/libjpeg-turbo-match-autoconf-behavior.patch index 2c093ea..db1e71e 100644 --- a/libjpeg-turbo-match-autoconf-behavior.patch +++ b/libjpeg-turbo-match-autoconf-behavior.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference libjpeg-turbo-2.0.90/win/jconfig.h.in libjpeg-turbo-2.0.90-new/win/jconfig.h.in --- libjpeg-turbo-2.0.90/win/jconfig.h.in 2020-11-25 04:56:19.000000000 +0100 -+++ libjpeg-turbo-2.0.90-new/win/jconfig.h.in 2021-01-28 13:40:54.823347735 +0100 ++++ libjpeg-turbo-2.0.90-new/win/jconfig.h.in 2021-04-12 10:20:58.427111546 +0200 @@ -9,13 +9,13 @@ #define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */ diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 690fa4b..59c3dff 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 2.0.90 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -17,9 +17,12 @@ Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{v # https://bugzilla.redhat.com/show_bug.cgi?id=843193 Patch0: libjpeg-turbo-match-autoconf-behavior.patch +# Backport patch for CVE-2021-20205 +# https://github.com/libjpeg-turbo/libjpeg-turbo/commit/1719d12e51641cce5c77e259516649ba5ef6303c +Patch1: CVE-2021-20205.patch + BuildArch: noarch -BuildRequires: make BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-gcc BuildRequires: mingw32-gcc-c++ @@ -32,6 +35,8 @@ BuildRequires: mingw64-binutils BuildRequires: nasm BuildRequires: cmake +BuildRequires: make + %description MinGW Windows cross compiled Libjpeg-turbo library. @@ -159,6 +164,9 @@ chmod -x README.md %changelog +* Mon Apr 12 2021 Sandro Mani - 2.0.90-2 +- Backport patch for CVE-2021-20205 + * Thu Jan 28 2021 Sandro Mani - 2.0.90-1 - Update to 2.0.90 From 428eb313fd42dea724b4c0e830371d6aa5c43012 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 26 Apr 2021 18:27:48 +0200 Subject: [PATCH 46/55] Update to 2.1.0 --- .gitignore | 1 + CVE-2021-20205.patch | 72 --------------------- libjpeg-turbo-match-autoconf-behavior.patch | 6 +- mingw-libjpeg-turbo.spec | 11 ++-- sources | 2 +- 5 files changed, 10 insertions(+), 82 deletions(-) delete mode 100644 CVE-2021-20205.patch diff --git a/.gitignore b/.gitignore index 1ecad02..8019dbc 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /libjpeg-turbo-2.0.4.tar.gz /libjpeg-turbo-2.0.5.tar.gz /libjpeg-turbo-2.0.90.tar.gz +/libjpeg-turbo-2.1.0.tar.gz diff --git a/CVE-2021-20205.patch b/CVE-2021-20205.patch deleted file mode 100644 index affcb55..0000000 --- a/CVE-2021-20205.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -rupN --no-dereference libjpeg-turbo-2.0.90/cderror.h libjpeg-turbo-2.0.90-new/cderror.h ---- libjpeg-turbo-2.0.90/cderror.h 2020-11-25 04:56:19.000000000 +0100 -+++ libjpeg-turbo-2.0.90-new/cderror.h 2021-04-12 10:20:58.463111547 +0200 -@@ -1,9 +1,11 @@ - /* - * cderror.h - * -+ * This file was part of the Independent JPEG Group's software: - * Copyright (C) 1994-1997, Thomas G. Lane. - * Modified 2009-2017 by Guido Vollbeding. -- * This file is part of the Independent JPEG Group's software. -+ * libjpeg-turbo Modifications: -+ * Copyright (C) 2021, D. R. Commander. - * For conditions of distribution and use, see the accompanying README.ijg - * file. - * -@@ -60,6 +62,7 @@ JMESSAGE(JTRC_BMP_OS2_MAPPED, "%ux%u 8-b - JMESSAGE(JERR_GIF_BUG, "GIF output got confused") - JMESSAGE(JERR_GIF_CODESIZE, "Bogus GIF codesize %d") - JMESSAGE(JERR_GIF_COLORSPACE, "GIF output must be grayscale or RGB") -+JMESSAGE(JERR_GIF_EMPTY, "Empty GIF image") - JMESSAGE(JERR_GIF_IMAGENOTFOUND, "Too few images in GIF file") - JMESSAGE(JERR_GIF_NOT, "Not a GIF file") - JMESSAGE(JTRC_GIF, "%ux%ux%d GIF image") -diff -rupN --no-dereference libjpeg-turbo-2.0.90/ChangeLog.md libjpeg-turbo-2.0.90-new/ChangeLog.md ---- libjpeg-turbo-2.0.90/ChangeLog.md 2020-11-25 04:56:19.000000000 +0100 -+++ libjpeg-turbo-2.0.90-new/ChangeLog.md 2021-04-12 10:20:58.463111547 +0200 -@@ -140,6 +140,10 @@ been reverted. - 15. The build system can now be used to generate a universal x86-64 + Armv8 - libjpeg-turbo SDK package for both iOS and macOS. - -+4. Fixed a floating point exception that occurred when attempting to compress a -+specially-crafted malformed GIF image with a specified image width of 0 using -+cjpeg. -+ - - 2.0.6 - ===== -diff -rupN --no-dereference libjpeg-turbo-2.0.90/rdgif.c libjpeg-turbo-2.0.90-new/rdgif.c ---- libjpeg-turbo-2.0.90/rdgif.c 2020-11-25 04:56:19.000000000 +0100 -+++ libjpeg-turbo-2.0.90-new/rdgif.c 2021-04-12 10:20:58.463111547 +0200 -@@ -1,9 +1,11 @@ - /* - * rdgif.c - * -+ * This file was part of the Independent JPEG Group's software: - * Copyright (C) 1991-1997, Thomas G. Lane. - * Modified 2019 by Guido Vollbeding. -- * This file is part of the Independent JPEG Group's software. -+ * libjpeg-turbo Modifications: -+ * Copyright (C) 2021, D. R. Commander. - * For conditions of distribution and use, see the accompanying README.ijg - * file. - * -@@ -404,6 +406,8 @@ start_input_gif(j_compress_ptr cinfo, cj - ERREXIT(cinfo, JERR_INPUT_EOF); - width = LM_to_uint(hdrbuf, 0); - height = LM_to_uint(hdrbuf, 2); -+ if (width == 0 || height == 0) -+ ERREXIT(cinfo, JERR_GIF_EMPTY); - /* we ignore the color resolution, sort flag, and background color index */ - aspectRatio = UCH(hdrbuf[6]); - if (aspectRatio != 0 && aspectRatio != 49) -@@ -446,6 +450,8 @@ start_input_gif(j_compress_ptr cinfo, cj - /* we ignore top/left position info, also sort flag */ - width = LM_to_uint(hdrbuf, 4); - height = LM_to_uint(hdrbuf, 6); -+ if (width == 0 || height == 0) -+ ERREXIT(cinfo, JERR_GIF_EMPTY); - source->is_interlaced = (BitSet(hdrbuf[8], INTERLACE) != 0); - - /* Read local colormap if header indicates it is present */ diff --git a/libjpeg-turbo-match-autoconf-behavior.patch b/libjpeg-turbo-match-autoconf-behavior.patch index db1e71e..c9adc02 100644 --- a/libjpeg-turbo-match-autoconf-behavior.patch +++ b/libjpeg-turbo-match-autoconf-behavior.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference libjpeg-turbo-2.0.90/win/jconfig.h.in libjpeg-turbo-2.0.90-new/win/jconfig.h.in ---- libjpeg-turbo-2.0.90/win/jconfig.h.in 2020-11-25 04:56:19.000000000 +0100 -+++ libjpeg-turbo-2.0.90-new/win/jconfig.h.in 2021-04-12 10:20:58.427111546 +0200 +diff -rupN --no-dereference libjpeg-turbo-2.1.0/win/jconfig.h.in libjpeg-turbo-2.1.0-new/win/jconfig.h.in +--- libjpeg-turbo-2.1.0/win/jconfig.h.in 2021-04-23 18:42:40.000000000 +0200 ++++ libjpeg-turbo-2.1.0-new/win/jconfig.h.in 2021-04-26 18:21:31.722086767 +0200 @@ -9,13 +9,13 @@ #define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */ diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 59c3dff..ed41418 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,8 +5,8 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 2.0.90 -Release: 2%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -17,10 +17,6 @@ Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{v # https://bugzilla.redhat.com/show_bug.cgi?id=843193 Patch0: libjpeg-turbo-match-autoconf-behavior.patch -# Backport patch for CVE-2021-20205 -# https://github.com/libjpeg-turbo/libjpeg-turbo/commit/1719d12e51641cce5c77e259516649ba5ef6303c -Patch1: CVE-2021-20205.patch - BuildArch: noarch BuildRequires: mingw32-filesystem >= 95 @@ -164,6 +160,9 @@ chmod -x README.md %changelog +* Mon Apr 26 2021 Sandro Mani - 2.1.0-1 +- Update to 2.1.0 + * Mon Apr 12 2021 Sandro Mani - 2.0.90-2 - Backport patch for CVE-2021-20205 diff --git a/sources b/sources index 2d86f33..786548a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libjpeg-turbo-2.0.90.tar.gz) = e00cab142c81e90d0eaf891d44ce3dccfdfe7d61e4efe8e81c5983dc6444ca1775f555316cce17b6551afc4b9e285202f53f6d0a8561433840fda311f630bc6d +SHA512 (libjpeg-turbo-2.1.0.tar.gz) = 6632a2a71cb3a350fe4f850fe84e51e361755c373babf2b47fb164c3a9fc3fd66705639bebedd8c1b40cf6c15fd702e814425b0be5919048987bbec357828605 From e212e75a88e15079a6e88a38442e26e44b8b873a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 10 May 2021 19:10:19 +0200 Subject: [PATCH 47/55] Split off turbojpeg library --- mingw-libjpeg-turbo.spec | 59 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index ed41418..f75cd75 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -47,6 +47,7 @@ Provides: mingw32-libjpeg = 7-4 %description -n mingw32-libjpeg-turbo MinGW Windows cross compiled Libjpeg-turbo library. + %package -n mingw32-libjpeg-turbo-static Summary: Static version of the MinGW Windows Libjpeg-turbo library Requires: mingw32-libjpeg-turbo = %{version}-%{release} @@ -56,6 +57,22 @@ Provides: mingw32-libjpeg-static = 7-4 %description -n mingw32-libjpeg-turbo-static Static version of the MinGW Windows cross compiled Libjpeg-turbo library. + +%package -n mingw32-turbojpeg +Summary: MinGW Windows turbojpeg library + +%description -n mingw32-turbojpeg +MinGW Windows cross compiled turbojpeg library. + + +%package -n mingw32-turbojpeg-static +Summary: Static version of the MinGW Windows turbojpeg library +Requires: mingw32-turbojpeg = %{version}-%{release} + +%description -n mingw32-turbojpeg-static +Static version of the MinGW Windows turbojpeg library. + + # Win64 %package -n mingw64-libjpeg-turbo Summary: MinGW Windows Libjpeg-turbo library @@ -65,6 +82,7 @@ Provides: mingw64-libjpeg = 8a-2%{?dist} %description -n mingw64-libjpeg-turbo MinGW Windows cross compiled Libjpeg-turbo library. + %package -n mingw64-libjpeg-turbo-static Summary: Static version of the MinGW Windows Libjpeg-turbo library Requires: mingw64-libjpeg-turbo = %{version}-%{release} @@ -75,6 +93,21 @@ Provides: mingw64-libjpeg-static = 8a-2%{?dist} Static version of the MinGW Windows cross compiled Libjpeg-turbo library. +%package -n mingw64-turbojpeg +Summary: MinGW Windows turbojpeg library + +%description -n mingw64-turbojpeg +MinGW Windows cross compiled turbojpeg library. + + +%package -n mingw64-turbojpeg-static +Summary: Static version of the MinGW Windows turbojpeg library +Requires: mingw64-turbojpeg = %{version}-%{release} + +%description -n mingw64-turbojpeg-static +Static version of the MinGW Windows turbojpeg library. + + %{?mingw_debug_package} @@ -118,20 +151,24 @@ chmod -x README.md %{mingw32_bindir}/*.exe %endif %{mingw32_bindir}/libjpeg-62.dll -%{mingw32_bindir}/libturbojpeg.dll %{mingw32_includedir}/jconfig.h %{mingw32_includedir}/jerror.h %{mingw32_includedir}/jmorecfg.h %{mingw32_includedir}/jpeglib.h -%{mingw32_includedir}/turbojpeg.h %{mingw32_libdir}/cmake/libjpeg-turbo/ %{mingw32_libdir}/libjpeg.dll.a -%{mingw32_libdir}/libturbojpeg.dll.a %{mingw32_libdir}/pkgconfig/libjpeg.pc -%{mingw32_libdir}/pkgconfig/libturbojpeg.pc %files -n mingw32-libjpeg-turbo-static %{mingw32_libdir}/libjpeg.a + +%files -n mingw32-turbojpeg +%{mingw32_bindir}/libturbojpeg.dll +%{mingw32_includedir}/turbojpeg.h +%{mingw32_libdir}/libturbojpeg.dll.a +%{mingw32_libdir}/pkgconfig/libturbojpeg.pc + +%files -n mingw32-turbojpeg-static %{mingw32_libdir}/libturbojpeg.a # Win64 @@ -158,8 +195,20 @@ chmod -x README.md %{mingw64_libdir}/libjpeg.a %{mingw64_libdir}/libturbojpeg.a +%files -n mingw64-turbojpeg +%{mingw64_bindir}/libturbojpeg.dll +%{mingw64_includedir}/turbojpeg.h +%{mingw64_libdir}/libturbojpeg.dll.a +%{mingw64_libdir}/pkgconfig/libturbojpeg.pc + +%files -n mingw64-turbojpeg-static +%{mingw64_libdir}/libturbojpeg.a + %changelog +* Mon May 10 2021 Sandro Mani - 2.1.0-2 +- Split off turbojpeg library + * Mon Apr 26 2021 Sandro Mani - 2.1.0-1 - Update to 2.1.0 From e100e7881114029e51cc97f25c9ecabe411852cc Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 10 May 2021 23:55:06 +0200 Subject: [PATCH 48/55] Fix files packaged twice --- mingw-libjpeg-turbo.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index f75cd75..66d806e 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 2.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -179,21 +179,16 @@ chmod -x README.md %{mingw64_bindir}/*.exe %endif %{mingw64_bindir}/libjpeg-62.dll -%{mingw64_bindir}/libturbojpeg.dll %{mingw64_includedir}/jconfig.h %{mingw64_includedir}/jerror.h %{mingw64_includedir}/jmorecfg.h %{mingw64_includedir}/jpeglib.h -%{mingw64_includedir}/turbojpeg.h %{mingw64_libdir}/cmake/libjpeg-turbo/ %{mingw64_libdir}/libjpeg.dll.a -%{mingw64_libdir}/libturbojpeg.dll.a %{mingw64_libdir}/pkgconfig/libjpeg.pc -%{mingw64_libdir}/pkgconfig/libturbojpeg.pc %files -n mingw64-libjpeg-turbo-static %{mingw64_libdir}/libjpeg.a -%{mingw64_libdir}/libturbojpeg.a %files -n mingw64-turbojpeg %{mingw64_bindir}/libturbojpeg.dll @@ -206,6 +201,9 @@ chmod -x README.md %changelog +* Mon May 10 2021 Sandro Mani - 2.1.0-3 +- Fix files packaged twice + * Mon May 10 2021 Sandro Mani - 2.1.0-2 - Split off turbojpeg library From 1b76a6de703ee1a8c5876695d99414e7a78279c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 14:36:30 +0000 Subject: [PATCH 49/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 66d806e..0dee0ff 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 2.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -201,6 +201,9 @@ chmod -x README.md %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 10 2021 Sandro Mani - 2.1.0-3 - Fix files packaged twice From 289825bcc68a645485bb0793bf7f9056b11655c0 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 11 Aug 2021 09:47:35 +0200 Subject: [PATCH 50/55] Update to 2.1.1 --- .gitignore | 1 + libjpeg-turbo-match-autoconf-behavior.patch | 6 +++--- mingw-libjpeg-turbo.spec | 7 +++++-- sources | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8019dbc..d98ce11 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /libjpeg-turbo-2.0.5.tar.gz /libjpeg-turbo-2.0.90.tar.gz /libjpeg-turbo-2.1.0.tar.gz +/libjpeg-turbo-2.1.1.tar.gz diff --git a/libjpeg-turbo-match-autoconf-behavior.patch b/libjpeg-turbo-match-autoconf-behavior.patch index c9adc02..63752de 100644 --- a/libjpeg-turbo-match-autoconf-behavior.patch +++ b/libjpeg-turbo-match-autoconf-behavior.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference libjpeg-turbo-2.1.0/win/jconfig.h.in libjpeg-turbo-2.1.0-new/win/jconfig.h.in ---- libjpeg-turbo-2.1.0/win/jconfig.h.in 2021-04-23 18:42:40.000000000 +0200 -+++ libjpeg-turbo-2.1.0-new/win/jconfig.h.in 2021-04-26 18:21:31.722086767 +0200 +diff -rupN --no-dereference libjpeg-turbo-2.1.1/win/jconfig.h.in libjpeg-turbo-2.1.1-new/win/jconfig.h.in +--- libjpeg-turbo-2.1.1/win/jconfig.h.in 2021-08-10 01:16:57.000000000 +0200 ++++ libjpeg-turbo-2.1.1-new/win/jconfig.h.in 2021-08-11 09:41:47.843314951 +0200 @@ -9,13 +9,13 @@ #define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */ diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 0dee0ff..f3ca068 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,8 +5,8 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 2.1.0 -Release: 4%{?dist} +Version: 2.1.1 +Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -201,6 +201,9 @@ chmod -x README.md %changelog +* Wed Aug 11 2021 Sandro Mani - 2.1.1-1 +- Update to 2.1.1 + * Thu Jul 22 2021 Fedora Release Engineering - 2.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 786548a..69c3d07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libjpeg-turbo-2.1.0.tar.gz) = 6632a2a71cb3a350fe4f850fe84e51e361755c373babf2b47fb164c3a9fc3fd66705639bebedd8c1b40cf6c15fd702e814425b0be5919048987bbec357828605 +SHA512 (libjpeg-turbo-2.1.1.tar.gz) = 9cf61b4677b38e254063248a3fdbe138634d23a35ae8f2ee2661bdb3248b1d0500bd43201b8d9fe66c779d578074fd9ed19bc097ba22e10143530c2a19738673 From 37cca06dcfe22150795d78f0b8008539a669a936 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 23 Nov 2021 10:53:54 +0100 Subject: [PATCH 51/55] Update to 2.1.2 --- .gitignore | 1 + libjpeg-turbo-match-autoconf-behavior.patch | 6 +++--- mingw-libjpeg-turbo.spec | 5 ++++- sources | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d98ce11..2514829 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /libjpeg-turbo-2.0.90.tar.gz /libjpeg-turbo-2.1.0.tar.gz /libjpeg-turbo-2.1.1.tar.gz +/libjpeg-turbo-2.1.2.tar.gz diff --git a/libjpeg-turbo-match-autoconf-behavior.patch b/libjpeg-turbo-match-autoconf-behavior.patch index 63752de..be7b9b1 100644 --- a/libjpeg-turbo-match-autoconf-behavior.patch +++ b/libjpeg-turbo-match-autoconf-behavior.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference libjpeg-turbo-2.1.1/win/jconfig.h.in libjpeg-turbo-2.1.1-new/win/jconfig.h.in ---- libjpeg-turbo-2.1.1/win/jconfig.h.in 2021-08-10 01:16:57.000000000 +0200 -+++ libjpeg-turbo-2.1.1-new/win/jconfig.h.in 2021-08-11 09:41:47.843314951 +0200 +diff -rupN --no-dereference libjpeg-turbo-2.1.2/win/jconfig.h.in libjpeg-turbo-2.1.2-new/win/jconfig.h.in +--- libjpeg-turbo-2.1.2/win/jconfig.h.in 2021-11-19 04:04:35.000000000 +0100 ++++ libjpeg-turbo-2.1.2-new/win/jconfig.h.in 2021-11-23 10:45:37.808397996 +0100 @@ -9,13 +9,13 @@ #define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */ diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index f3ca068..75df77e 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,7 +5,7 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 2.1.1 +Version: 2.1.2 Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library @@ -201,6 +201,9 @@ chmod -x README.md %changelog +* Tue Nov 23 2021 Sandro Mani - 2.1.2-1 +- Update to 2.1.2 + * Wed Aug 11 2021 Sandro Mani - 2.1.1-1 - Update to 2.1.1 diff --git a/sources b/sources index 69c3d07..8fafb9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libjpeg-turbo-2.1.1.tar.gz) = 9cf61b4677b38e254063248a3fdbe138634d23a35ae8f2ee2661bdb3248b1d0500bd43201b8d9fe66c779d578074fd9ed19bc097ba22e10143530c2a19738673 +SHA512 (libjpeg-turbo-2.1.2.tar.gz) = f0377b58d00310b2e644da31f807ac6c3425823f362ea88bcbed32991dddbea4e7a478676a7c1c4874a34bc578f262bf1d32c925e2f14fa517a50fd911ba8dd5 From 18ff601043f476047582092196ad8acf0bf1610a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 19:34:44 +0000 Subject: [PATCH 52/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 75df77e..62bbb99 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 2.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -201,6 +201,9 @@ chmod -x README.md %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Nov 23 2021 Sandro Mani - 2.1.2-1 - Update to 2.1.2 From a969aee6970afaee2a02d46646d36877bd85a346 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 28 Feb 2022 09:48:48 +0100 Subject: [PATCH 53/55] Update to 2.1.3 --- .gitignore | 1 + libjpeg-turbo-match-autoconf-behavior.patch | 30 --------------------- mingw-libjpeg-turbo.spec | 11 ++++---- sources | 2 +- 4 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 libjpeg-turbo-match-autoconf-behavior.patch diff --git a/.gitignore b/.gitignore index 2514829..bce01e6 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /libjpeg-turbo-2.1.0.tar.gz /libjpeg-turbo-2.1.1.tar.gz /libjpeg-turbo-2.1.2.tar.gz +/libjpeg-turbo-2.1.3.tar.gz diff --git a/libjpeg-turbo-match-autoconf-behavior.patch b/libjpeg-turbo-match-autoconf-behavior.patch deleted file mode 100644 index be7b9b1..0000000 --- a/libjpeg-turbo-match-autoconf-behavior.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -rupN --no-dereference libjpeg-turbo-2.1.2/win/jconfig.h.in libjpeg-turbo-2.1.2-new/win/jconfig.h.in ---- libjpeg-turbo-2.1.2/win/jconfig.h.in 2021-11-19 04:04:35.000000000 +0100 -+++ libjpeg-turbo-2.1.2-new/win/jconfig.h.in 2021-11-23 10:45:37.808397996 +0100 -@@ -9,13 +9,13 @@ - - #define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */ - --#define HAVE_STDDEF_H --#define HAVE_STDLIB_H -+#define HAVE_STDDEF_H 1 -+#define HAVE_STDLIB_H 1 - #undef NEED_SYS_TYPES_H - #undef NEED_BSD_STRINGS - --#define HAVE_UNSIGNED_CHAR --#define HAVE_UNSIGNED_SHORT -+#define HAVE_UNSIGNED_CHAR 1 -+#define HAVE_UNSIGNED_SHORT 1 - #undef INCOMPLETE_TYPES_BROKEN - #undef RIGHT_SHIFT_IS_UNSIGNED - -@@ -23,7 +23,7 @@ - #ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ - typedef unsigned char boolean; - #endif --#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ -+#define HAVE_BOOLEAN 1 /* prevent jmorecfg.h from redefining it */ - - /* Define "INT32" as int, not long, per Windows custom */ - #if !(defined(_BASETSD_H_) || defined(_BASETSD_H)) /* don't conflict if basetsd.h already read */ diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 62bbb99..8aed91f 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,18 +5,14 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 2.1.2 -Release: 2%{?dist} +Version: 2.1.3 +Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets URL: http://libjpeg-turbo.virtualgl.org/ Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz -# Make jconfig.h more autoconf friendly -# https://bugzilla.redhat.com/show_bug.cgi?id=843193 -Patch0: libjpeg-turbo-match-autoconf-behavior.patch - BuildArch: noarch BuildRequires: mingw32-filesystem >= 95 @@ -201,6 +197,9 @@ chmod -x README.md %changelog +* Mon Feb 28 2022 Sandro Mani - 2.1.3-1 +- Update to 2.1.3 + * Thu Jan 20 2022 Fedora Release Engineering - 2.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 8fafb9d..883e638 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libjpeg-turbo-2.1.2.tar.gz) = f0377b58d00310b2e644da31f807ac6c3425823f362ea88bcbed32991dddbea4e7a478676a7c1c4874a34bc578f262bf1d32c925e2f14fa517a50fd911ba8dd5 +SHA512 (libjpeg-turbo-2.1.3.tar.gz) = 975c9835de7d70c6c8c5a1959adfa18f7f956bc9946fde8f1b40c1d853245c38a3118ac06b93841ec3e90be6945c38d687d062b371496c2ee9b5638d7f60418d From 03523baef30c0fd33c8d5deba83df3c57c39af9b Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 25 Mar 2022 14:24:49 +0100 Subject: [PATCH 54/55] Rebuild with mingw-gcc-12 --- mingw-libjpeg-turbo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 8aed91f..a6bcf87 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -6,7 +6,7 @@ Name: mingw-libjpeg-turbo Version: 2.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -197,6 +197,9 @@ chmod -x README.md %changelog +* Fri Mar 25 2022 Sandro Mani - 2.1.3-2 +- Rebuild with mingw-gcc-12 + * Mon Feb 28 2022 Sandro Mani - 2.1.3-1 - Update to 2.1.3 From c4910ed9a17511b9b66050e97c60089b2defce81 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:26:07 +0300 Subject: [PATCH 55/55] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 883e638..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (libjpeg-turbo-2.1.3.tar.gz) = 975c9835de7d70c6c8c5a1959adfa18f7f956bc9946fde8f1b40c1d853245c38a3118ac06b93841ec3e90be6945c38d687d062b371496c2ee9b5638d7f60418d