|
|
@@ -4,8 +4,8 @@
|
|
|
Summary: A graphics library for drawing .png files.
|
|
|
Summary(ja): PNGイメージファイルを描写するためのグラフィックライブラリ
|
|
|
Name: gd
|
|
|
-Version: 2.3.0
|
|
|
-Release: 2%{_dist_release}
|
|
|
+Version: 2.3.2
|
|
|
+Release: 1%{_dist_release}
|
|
|
Group: system
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
@@ -18,8 +18,7 @@ Source0: https://github.com/libgd/libgd/releases/download/gd-%{version}/libgd-%{
|
|
|
Source1: https://raw.githubusercontent.com/libgd/libgd/master/config/getlib.sh
|
|
|
Patch0: gd-2.1.0-multilib.patch
|
|
|
# https://github.com/libgd/libgd/issues/615
|
|
|
-Patch1: gdImageStringFT.patch
|
|
|
-Patch2: textLayout.patch
|
|
|
+Patch1000: CVE-2021-38115.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: freetype2-devel
|
|
|
@@ -156,8 +155,7 @@ If you're installing the gd graphics library, you must install gd-devel.
|
|
|
%prep
|
|
|
%setup -q -n libgd-%{version}
|
|
|
#patch0 -p1 -b .mlib
|
|
|
-%patch1 -p1 -b .text1
|
|
|
-%patch2 -p1 -b .text2
|
|
|
+%patch1000 -p1
|
|
|
|
|
|
cp %{SOURCE1} ./config/
|
|
|
chmod 755 ./config/getlib.sh
|
|
|
@@ -204,15 +202,6 @@ make %{?_smp_mflags} check
|
|
|
[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
-%post -p /sbin/ldconfig
|
|
|
-%postun -p /sbin/ldconfig
|
|
|
-
|
|
|
-%if %{build_compat32}
|
|
|
-%post -n compat32-%{name} -p /sbin/ldconfig
|
|
|
-%postun -n compat32-%{name} -p /sbin/ldconfig
|
|
|
-%endif
|
|
|
-
|
|
|
-
|
|
|
%files
|
|
|
%defattr(-,root,root)
|
|
|
%license COPYING
|
|
|
@@ -240,6 +229,12 @@ make %{?_smp_mflags} check
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Aug 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.2-1
|
|
|
+- new upstream release.
|
|
|
+- dropped ldconfig scriptlets.
|
|
|
+- imported Patch1000 from upstream to fix CVE-2021-38115.
|
|
|
+- dropped Patch1 and 2: fixed in upstream.
|
|
|
+
|
|
|
* Sun Dec 20 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.0-2
|
|
|
- add Patch1 and 2 to fix drawing text.
|
|
|
|
