Hello community, here is the log from the commit of package xv for openSUSE:Factory:NonFree checked in at 2017-06-20 09:41:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/xv (Old) and /work/SRC/openSUSE:Factory:NonFree/.xv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xv" Tue Jun 20 09:41:21 2017 rev:21 rq:502764 version:3.10a Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/xv/xv.changes 2013-05-15 06:09:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.xv.new/xv.changes 2017-06-20 09:41:26.539211206 +0200 @@ -1,0 +2,11 @@ +Sat Jun 10 08:46:48 UTC 2017 - [email protected] + +- Cleanup spec file with spec-cleaner + +------------------------------------------------------------------- +Thu Jun 8 20:51:12 UTC 2017 - [email protected] + +- correctly calculate size of string buffer in png data (bnc#1043479) + * xv-3.10a-png-gimp.patch + +------------------------------------------------------------------- New: ---- xv-3.10a-png-gimp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xv.spec ++++++ --- /var/tmp/diff_new_pack.CihHXO/_old 2017-06-20 09:41:28.015003128 +0200 +++ /var/tmp/diff_new_pack.CihHXO/_new 2017-06-20 09:41:28.015003128 +0200 @@ -1,7 +1,7 @@ # # spec file for package xv # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,26 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - +%if "%{_exec_prefix}" == "%{_prefix}/X11R6" +%global _mandir %{_prefix}/man +%define _x11data %{_prefix}/lib/X11 +%define _libx11 %{_x11data} +%else +%define _x11data %{_datadir}/X11 +%define _libx11 %{_prefix}/lib/X11 +%endif Name: xv -BuildRequires: dos2unix -BuildRequires: groff -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: libtiff-devel -BuildRequires: update-desktop-files -BuildRequires: xorg-x11-devel -BuildRequires: zlib-devel -Url: http://www.trilon.com/xv/ -License: SUSE-NonFree -Group: Productivity/Graphics/Viewers -Provides: xv300 -AutoReqProv: on Version: 3.10a -Release: 1278 +Release: 0 Summary: GIF/TIFF/JPEG/PostScript Image Viewer +License: SUSE-NonFree +Group: Productivity/Graphics/Viewers +Url: http://www.trilon.com/xv/ Source: xv-3.10a.tar.bz2 #Url http://www.gregroelofs.com/greg_xv.html Source1: xv-3.10a-jumbo-patches-20070520.tar.bz2 @@ -42,7 +38,7 @@ Source3: xv.desktop Source4: xv.png Source5: xv-tests.tar.bz2 -Patch: xv-3.10a.dif +Patch0: xv-3.10a.dif Patch1: xv-3.10a-ticks.dif Patch2: xv-3.10a-signal.dif Patch3: xv-3.10a-overflow.dif @@ -52,16 +48,17 @@ Patch7: xv-3.10a-dirw.dif Patch8: xv-3.10a-enhancements.20070520-20081216.diff Patch9: xv-3.10a-libpng15.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} -%if "%_exec_prefix" == "/usr/X11R6" -%global _mandir %{_exec_prefix}/man -%define _x11data %{_exec_prefix}/lib/X11 -%define _libx11 %{_x11data} -%else -%define _x11data %{_datadir}/X11 -%define _libx11 %{_exec_prefix}/lib/X11 -%endif +Patch10: xv-3.10a-png-gimp.patch +BuildRequires: dos2unix +BuildRequires: groff +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: update-desktop-files +BuildRequires: xorg-x11-devel +BuildRequires: zlib-devel +Provides: xv300 +%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo %{_prefix}/X11R6)} %description XV is an interactive image viewer for the X Window System. XV displays @@ -76,42 +73,35 @@ It is one of the most famous programs for Linux. -The documentation can be found in /usr/share/doc/packages/xv/. +The documentation can be found in %{_docdir}/xv/. Please remember that this program has shareware status for commercial use. - - -Authors: --------- - John Bradley <[email protected]> - %prep %setup -q -b1 patch -p1 -s --suffix=.jumbo-20070520 < ../xv-3.10a-jumbo-fix-enh-patch-20070520.txt -%patch8 -p0 -b .jumbo-20081216 -%patch1 -p0 -b .ticks -%patch2 -p0 -b .sig -%patch3 -p0 -b .ovf -%patch4 -p0 -b .jpg8 -%patch5 -p0 -b .png -%patch6 -p0 -b .xwd -%patch7 -p0 -b .dirw -%patch9 -p0 -b .libpng5 -%patch +%patch8 -b .jumbo-20081216 +%patch1 -b .ticks +%patch2 -b .sig +%patch3 -b .ovf +%patch4 -b .jpg8 +%patch5 -b .png +%patch6 -b .xwd +%patch7 -b .dirw +%patch9 -b .libpng5 +%patch0 +%patch10 -p1 -b .png-gimp %build - # Do not overwrite CFLAGS here - RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector" - xmkmf -a - make +# Do not overwrite CFLAGS here +RPM_OPT_FLAGS="%{optflags} -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector" +xmkmf -a +make %{?_smp_mflags} %install -rm -rf %{buildroot} -mkdir %{buildroot} mv docs/README docs/README.docs -make install DESTDIR=%{buildroot} +%make_install make install.man DESTDIR=%{buildroot} rm docs/*._man mkdir man @@ -129,7 +119,7 @@ dos2unix docs/xvtitle.ps touch -r tmp.ps docs/xvtitle.ps fi -install -m 755 %{S:2} %{buildroot}%{_bindir}/xsetbgimg +install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/xsetbgimg rm -f %{buildroot}%{_libx11}/xv_mgcsfx.sample %suse_update_desktop_file -i xv Graphics Viewer @@ -145,10 +135,10 @@ %{_bindir}/xsetbgimg %{_bindir}/xv %{_bindir}/xvpictoppm -%doc %{_mandir}/man1/bggen.1x.gz -%doc %{_mandir}/man1/vdcomp.1x.gz -%doc %{_mandir}/man1/xcmap.1x.gz -%doc %{_mandir}/man1/xv.1x.gz -%doc %{_mandir}/man1/xvpictoppm.1x.gz +%{_mandir}/man1/bggen.1x%{ext_man} +%{_mandir}/man1/vdcomp.1x%{ext_man} +%{_mandir}/man1/xcmap.1x%{ext_man} +%{_mandir}/man1/xv.1x%{ext_man} +%{_mandir}/man1/xvpictoppm.1x%{ext_man} %changelog ++++++ xv-3.10a-png-gimp.patch ++++++ # # bnc#1043479 gimp created png crashes xv # [email protected] # it uses .text_length to determine size of buffer but strcpy's from .text # use same method to determine correct size # --- xv-3.10a/xvpng.c 2017-06-08 14:45:30.462632457 -0500 +++ xvt/xvpng.c 2017-06-08 15:13:32.422848106 -0500 @@ -1149,7 +1149,7 @@ int LoadPNG(fname, pinfo) for (i = 0; i < _num_text; i++) commentsize += strlen(_text[i].key) + 1 + - _text[i].text_length + 2; + strlen(_text[i].text) + 2; if ((pinfo->comment = malloc(commentsize)) == NULL) { png_warning(png_ptr,"can't allocate comment string");
