rpms/xv/EL-6 xv-3.10a-namemax.patch,NONE,1.1 xv.spec,1.7,1.8

[L. Gabriel Somlo]

Author: somlo

Update of /cvs/nonfree/rpms/xv/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16436

Modified Files:
	xv.spec 
Added Files:
	xv-3.10a-namemax.patch 
Log Message:
* Mon Mar  4 2013 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-16
- fix buffer overflow caused by filenames longer than the window title limit


xv-3.10a-namemax.patch:
 xvtext.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xv-3.10a-namemax.patch ---
diff -NarU5 xv-3.10a/xvtext.c xv-3.10a.namemax/xvtext.c
--- xv-3.10a/xvtext.c	2013-03-04 16:34:40.000000000 -0500
+++ xv-3.10a.namemax/xvtext.c	2013-03-04 16:50:39.217371154 -0500
@@ -51,11 +51,11 @@
 #  define TV_MSCODE   7
 
 #  define TV_J_NBUTTS 8
 #endif
 
-#define TITLELEN 128
+#define TITLELEN NAME_MAX
 
 #ifdef TV_MULTILINGUAL
 struct coding_spec {
     struct coding_system coding_system;
     char *(*converter)PARM((char *, int, int *));


Index: xv.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xv/EL-6/xv.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xv.spec	8 Sep 2011 00:48:06 -0000	1.7
+++ xv.spec	4 Mar 2013 22:28:32 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name: xv
 Version: %{vprog}.jumbopatch.%{vjumbo}
-Release: 12%{?dist}
+Release: 16%{?dist}
 Summary: Interactive image display program for X
 Summary(de.UTF-8): X-basierender Bild-Viewer für praktische sämtliche Grafiken
 Summary(es.UTF-8): Visualizador de imágenes para X para cuasi todos los formatos de imágenes
@@ -28,6 +28,8 @@
 Patch2: xv-3.10a-cleanup.patch
 Patch3: xv-FLmask.v2.1.patch
 Patch4: xv-wait.patch
+Patch5: xv-3.10a-libpng15.patch
+Patch6: xv-3.10a-namemax.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtiff-devel libpng-devel jasper-devel desktop-file-utils
 %if "%{?rhel}" != "4"
@@ -138,6 +140,12 @@
 # replace CLK_TCK with sysconf(_SC_CLK_TCK)
 %patch4 -p1
 
+# libpng 1.5 compatibility
+%patch5 -p0
+
+# NAME_MAX buffer overflow fix
+%patch6 -p1
+
 # Include permission to distribute
 %{__install} -m 0644 -p %{SOURCE2} .
 
@@ -273,6 +281,18 @@
 %doc %{_docdir}/%{name}-%{vprog}/manuals/
 
 %changelog
+* Mon Mar  4 2013 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-16
+- fix buffer overflow caused by filenames longer than the window title limit
+
+* Mon Aug  6 2012 Paul Howarth <paul at city-fan.org> 3.10a.jumbopatch.20070520-15
+- rebuild for libtiff.so.5 (libtiff 4.0) in Rawhide
+
+* Thu Feb  9 2012 Nicolas Chauvet <kwizart at gmail.com> 3.10a.jumbopatch.20070520-14
+- rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Fri Dec  9 2011 Paul Howarth <paul at city-fan.org> 3.10a.jumbopatch.20070520-13
+- add patch from Gentoo for libpng 1.5 compatibility
+
 * Wed Sep 07 2011 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-12
 - fix wait timer (BZ 1929, thanks to Sjoerd Mullender <sjoerd at acm.org>)