diff --git a/optipng-0.7.4.tar.gz b/optipng-0.7.4.tar.gz deleted file mode 100644 index 7fd58cb..0000000 Binary files a/optipng-0.7.4.tar.gz and /dev/null differ diff --git a/optipng-0.7.7.tar.gz b/optipng-0.7.7.tar.gz new file mode 100644 index 0000000..a07d868 Binary files /dev/null and b/optipng-0.7.7.tar.gz differ diff --git a/optipng.spec b/optipng.spec index 4072232..85f3b91 100644 --- a/optipng.spec +++ b/optipng.spec @@ -1,14 +1,13 @@ Name: optipng -Version: 0.7.4 +Version: 0.7.7 Release: 1 Summary: PNG optimizer and converter -Group: Applications/Multimedia License: zlib URL: http://optipng.sourceforge.net/ Source0: http://downloads.sourceforge.net/optipng/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: gcc BuildRequires: zlib-devel libpng-devel %description @@ -20,7 +19,9 @@ and corrections. %prep %setup -q -f=AUTHORS.txt ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f +for f in AUTHORS.txt doc/history.txt ; do + iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f +done # Ensure system libs and headers are used; as of 0.6.3 pngxtern will use # the bundled headers if present even with -with-system-*, causing failures. @@ -28,32 +29,33 @@ rm -rf src/libpng src/zlib %build +%set_build_flags ./configure -prefix=%{_prefix} -mandir=%{_mandir} \ -with-system-zlib -with-system-libpng -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" +%make_build %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%make_install chmod -c 755 $RPM_BUILD_ROOT%{_bindir}/optipng %check -make test CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" - - -%clean -rm -rf $RPM_BUILD_ROOT +%__make test %files -%defattr(-,root,root,-) -%doc AUTHORS.txt README.txt LICENSE.txt doc/* +%{!?_licensedir:%global license %%doc} +%license LICENSE.txt +%doc AUTHORS.txt README.txt doc/* %{_bindir}/optipng %{_mandir}/man1/optipng.1* %changelog -* Thu May 06 2021 wulei 0.7.4 - 1 -- Initial package \ No newline at end of file +* Tue Jun 8 2021 wutao - 0.7.7-1 +- upgrade to 0.7.7 to fix CVE-2016-3981 CVE-2016-3982 + +* Thu May 06 2021 wulei 0.7.4 - 1 +- Initial package