From 846dd948ba93d0b73f375c97c467e78914d0495b Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 26 May 2022 13:21:25 -0400 Subject: [PATCH] Auto sync2gitlab import of pixman-0.38.4-2.el8.src.rpm --- .gitignore | 1 + ...rary-buffers-in-general_composite_re.patch | 34 ++++ EMPTY | 1 - make-pixman-snapshot.sh | 16 ++ pixman.spec | 162 ++++++++++++++++++ sources | 1 + 6 files changed, 214 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 0001-Initialize-temporary-buffers-in-general_composite_re.patch delete mode 100644 EMPTY create mode 100755 make-pixman-snapshot.sh create mode 100644 pixman.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b127527 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/pixman-0.38.4.tar.bz2 diff --git a/0001-Initialize-temporary-buffers-in-general_composite_re.patch b/0001-Initialize-temporary-buffers-in-general_composite_re.patch new file mode 100644 index 0000000..b6e9a77 --- /dev/null +++ b/0001-Initialize-temporary-buffers-in-general_composite_re.patch @@ -0,0 +1,34 @@ +From 6fe0131394fb029d2fccaee6b8edcb108840ad8a Mon Sep 17 00:00:00 2001 +From: Federico Mena Quintero +Date: Wed, 18 Mar 2020 18:49:30 -0600 +Subject: [PATCH] Initialize temporary buffers in general_composite_rect() + +Otherwise, Valgrind shows things like "conditional jump or move +depends on uninitialised values" errors much later in calling code. +For example, see https://gitlab.gnome.org/GNOME/librsvg/issues/572 + +Fixes https://gitlab.freedesktop.org/pixman/pixman/issues/9 +--- + pixman/pixman-general.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c +index 7d74f98..7e5a0d0 100644 +--- a/pixman/pixman-general.c ++++ b/pixman/pixman-general.c +@@ -165,6 +165,12 @@ general_composite_rect (pixman_implementation_t *imp, + + if (!scanline_buffer) + return; ++ ++ memset (scanline_buffer, 0, width * Bpp * 3 + 15 * 3); ++ } ++ else ++ { ++ memset (stack_scanline_buffer, 0, sizeof (stack_scanline_buffer)); + } + + src_buffer = ALIGN (scanline_buffer); +-- +2.34.1 + diff --git a/EMPTY b/EMPTY deleted file mode 100644 index 0519ecb..0000000 --- a/EMPTY +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/make-pixman-snapshot.sh b/make-pixman-snapshot.sh new file mode 100755 index 0000000..0cd65a3 --- /dev/null +++ b/make-pixman-snapshot.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +DIRNAME=pixman-$( date +%Y%m%d ) + +rm -rf $DIRNAME +git clone git://git.freedesktop.org/git/pixman $DIRNAME +cd $DIRNAME +if [ -z "$1" ]; then + git log | head -1 +else + git checkout $1 +fi +rm -rf .git +cd .. +tar jcf $DIRNAME.tar.bz2 $DIRNAME +rm -rf $DIRNAME diff --git a/pixman.spec b/pixman.spec new file mode 100644 index 0000000..b6244a1 --- /dev/null +++ b/pixman.spec @@ -0,0 +1,162 @@ +%define gitdate 20070827 +%define gitrev 8ff7213f39edc1b2b8b60d6b0cc5d5f14ca1928d + +Name: pixman +Version: 0.38.4 +Release: 2%{?dist} +Summary: Pixel manipulation library + +Group: System Environment/Libraries +License: MIT +URL: https://gitlab.freedesktop.org/pixman/pixman +#VCS: git:git://git.freedesktop.org/git/pixman +# To make git snapshots: +# ./make-pixman-snapshot.sh %{\?gitrev} +# if no revision specified, makes a new one from HEAD. +Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 +Source1: make-pixman-snapshot.sh + +Patch0: 0001-Initialize-temporary-buffers-in-general_composite_re.patch + +BuildRequires: automake autoconf libtool +BuildRequires: gcc + +%description +Pixman is a pixel manipulation library for X and Cairo. + +%package devel +Summary: Pixel manipulation library development package +Group: Development/Libraries +Requires: %{name}%{?isa} = %{version}-%{release} +Requires: pkgconfig + +%description devel +Development library for pixman. + +%prep +%autosetup -p1 + +%build +%configure \ +%ifarch %{arm} + --disable-arm-iwmmxt --disable-arm-iwmmxt2 \ +%endif + --disable-static + +make %{?_smp_mflags} V=1 + +%install +make install DESTDIR=$RPM_BUILD_ROOT + +find %{buildroot} -type f -name "*.la" -delete + +%check +make check %{?_smp_mflags} V=1 + +%ldconfig_post +%ldconfig_postun + +%files +%doc COPYING +%{_libdir}/libpixman-1*.so.* + +%files devel +%dir %{_includedir}/pixman-1 +%{_includedir}/pixman-1/pixman.h +%{_includedir}/pixman-1/pixman-version.h +%{_libdir}/libpixman-1*.so +%{_libdir}/pkgconfig/pixman-1.pc + +%changelog +* Tue Feb 22 2022 Adam Jackson - 0.38.4-2 +- Backport the pixman part of cairo CVE-2020-35492 + +* Tue Nov 19 2019 Adam Jackson - 0.38.4-1 +- pixman 0.38.4 + +* Thu Nov 29 2018 Adam Jackson - 0.36.0-1 +- pixman 0.36.0 + +* Fri Jul 13 2018 Fedora Release Engineering - 0.34.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Jun 29 2018 Adam Jackson - 0.34.0-9 +- Use ldconfig scriptlet macros + +* Fri May 04 2018 Dan Horák - 0.34.0-8 +- fix vector loads in VMX (ppc64le) (#1572540) + +* Thu Apr 26 2018 Adam Jackson - 0.34.0-7 +- Enable %%check +- --disable-vmx to fix %%check failures with gcc8 +- Remove stray --disable-ssse3 + +* Fri Feb 09 2018 Fedora Release Engineering - 0.34.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 0.34.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.34.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.34.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 0.34.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Feb 01 2016 - 0.34.0-1 +- Update to 0.34.0 (#1249357) + +* Tue Dec 22 2015 Oded Gabbay 0.33.6-1 +- pixman 0.33.6 + +* Fri Oct 23 2015 Oded Gabbay 0.33.4-1 +- pixman 0.33.4 + +* Sun Aug 09 2015 Oded Gabbay 0.33.2-1 +- pixman 0.33.2 +- Enable VMX fast paths on ppc64le now that they are fixed + +* Tue Jun 16 2015 Peter Robinson 0.32.6-6 +- revert cflag option added in -5 the broke building + +* Mon May 11 2015 Adam Jackson 0.32.6-5 +- Fix devel's requirement on the base package to include %%{?isa} + +* Mon Nov 10 2014 Adam Jackson 0.32.6-4 +- Disable (broken) VMX fast paths on ppc64le for now. + +* Sun Aug 17 2014 Fedora Release Engineering - 0.32.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jul 11 2014 Peter Robinson 0.32.6-2 +- Enable make check but don't (currently) fail the build on failure +- Include COPYING as per packaging guidelines +- Minor spec cleanups + +* Sun Jul 06 2014 Soren Sandmann 0.32.6-1 +- pixman 0.32.6 +- drop SSSE3 patch + +* Sat Jun 07 2014 Fedora Release Engineering - 0.32.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Nov 14 2013 Soren Sandmann 0.32.0-2 +- Add patch to fix SSSE3 detection + +* Sun Nov 10 2013 Soren Sandmann 0.32.0-1 +- pixman 0.32.0 + +* Sat Nov 2 2013 Soren Sandmann 0.31.2-1 +- pixman 0.31.2 + +* Sun Aug 04 2013 Fedora Release Engineering - 0.30.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Jul 04 2013 Karsten Hopp 0.30.0-2 +- bump release and rebuild to fix dependencies on PPC + +* Wed May 8 2013 Soren Sandmann 0.30.0-1 +- pixman 0.30.0 diff --git a/sources b/sources new file mode 100644 index 0000000..f1d9f6a --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (pixman-0.38.4.tar.bz2) = 0683b7f67caa0881b23188b7e6f8487c7e0a1257a912686616b7d862efd5a9efdb51641c81ec54905a6f6b1029d796ca4e25c0909db28fc29fa3617bf09f9cf9