|
|
@@ -4,8 +4,8 @@
|
|
|
Summary: A graphics library for drawing .png files.
|
|
|
Summary(ja): PNGイメージファイルを描写するためのグラフィックライブラリ
|
|
|
Name: gd
|
|
|
-Version: 2.3.2
|
|
|
-Release: 2%{_dist_release}
|
|
|
+Version: 2.3.3
|
|
|
+Release: 1%{_dist_release}
|
|
|
Group: system
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
@@ -17,10 +17,6 @@ Source0: https://github.com/libgd/libgd/releases/download/gd-%{version}/libgd-%{
|
|
|
# https://github.com/libgd/libgd/issues/610
|
|
|
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
|
|
|
-Patch1000: CVE-2021-38115.patch
|
|
|
-# https://github.com/libgd/libgd/issues/700
|
|
|
-Patch1001: CVE-2021-40145.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: freetype2-devel
|
|
|
@@ -157,12 +153,17 @@ If you're installing the gd graphics library, you must install gd-devel.
|
|
|
%prep
|
|
|
%setup -q -n libgd-%{version}
|
|
|
#patch0 -p1 -b .mlib
|
|
|
-%patch1000 -p1
|
|
|
-%patch1001 -p1
|
|
|
|
|
|
-cp %{SOURCE1} ./config/
|
|
|
-chmod 755 ./config/getlib.sh
|
|
|
-autoreconf -vif
|
|
|
+#cp %{SOURCE1} ./config/
|
|
|
+#chmod 755 ./config/getlib.sh
|
|
|
+
|
|
|
+# regenerate autotool stuff
|
|
|
+if [ -f configure ]; then
|
|
|
+ libtoolize --copy --force
|
|
|
+ autoreconf -vif
|
|
|
+else
|
|
|
+ ./bootstrap.sh
|
|
|
+fi
|
|
|
|
|
|
|
|
|
%build
|
|
|
@@ -179,7 +180,7 @@ CFLAGS="$RPM_OPT_FLAGS -DDEFAULT_FONTPATH='\"\
|
|
|
/usr/share/fonts/TrueType-linux-liberation/\
|
|
|
\"'"
|
|
|
|
|
|
-%configure CPPFLAGS="-DHAVE_ICONV -DHAVE_STDARG_H -DHAVE_ERRNO_H" \
|
|
|
+%configure \
|
|
|
--with-freetype \
|
|
|
--with-tiff=%{_prefix} \
|
|
|
%if %{with libvpx}
|
|
|
@@ -197,7 +198,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
|
|
|
|
|
|
%check
|
|
|
%ifarch x86_64
|
|
|
-make %{?_smp_mflags} check
|
|
|
+TMP=/tmp make %{?_smp_mflags} check
|
|
|
%endif
|
|
|
|
|
|
|
|
|
@@ -232,8 +233,12 @@ make %{?_smp_mflags} check
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
-* Fri Sep 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.2-2.
|
|
|
-- imported Patch1001 from upstream to fix CVE-2021-40145.
|
|
|
+* Mon Sep 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.3-1
|
|
|
+- new upstream release.
|
|
|
+- dropped Patch1000 and 1001: fixed in upstream.
|
|
|
+
|
|
|
+* Fri Sep 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.2-2
|
|
|
+- imported Patch1000 and 1001 from upstream to fix CVE-2021-40145.
|
|
|
|
|
|
* Thu Aug 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.2-1
|
|
|
- new upstream release.
|
