rpms/lcms/F-8 coverity-boundchecking-cmsio1.patch, NONE, 1.1 lcms.spec, 1.12, 1.13 lcms-1.14-fc4-swigtype.patch, 1.1, NONE

[Chauvet (kwizart)]

Author: kwizart

Update of /cvs/pkgs/rpms/lcms/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28037

Modified Files:
	lcms.spec 
Added Files:
	coverity-boundchecking-cmsio1.patch 
Removed Files:
	lcms-1.14-fc4-swigtype.patch 
Log Message:
- Fix Array indexing error in ReadCurve - #448066
- Fix packaging bug #432568 (multilib transition).
- Move libs to mutlilibs
- Prevent timestramps change
- Convert files-not-utf8


coverity-boundchecking-cmsio1.patch:

--- NEW FILE coverity-boundchecking-cmsio1.patch ---
Index: modules/lcms/src/cmsio1.c
===================================================================
RCS file: /cvsroot/mozilla/modules/lcms/src/cmsio1.c,v
retrieving revision 1.2
diff -u -8 -p -r1.2 cmsio1.c
--- modules/lcms/src/cmsio1.c	6 Aug 2007 20:01:21 -0000	1.2
+++ modules/lcms/src/cmsio1.c	3 Jan 2008 11:15:18 -0000
@@ -919,17 +919,17 @@ LPGAMMATABLE ReadCurve(LPLCMSICCPROFILE 
            icUInt32Number Reserved;
            icUInt16Number   Type;
            int i;
            
            if (Icc -> Read(&Type, sizeof(icUInt16Number), 1, Icc) != 1) return NULL;
            if (Icc -> Read(&Reserved, sizeof(icUInt16Number), 1, Icc) != 1) return NULL;
            
            AdjustEndianess16((LPBYTE) &Type);
-           if (Type > 5) {
+           if (Type > 4) {
 
                 cmsSignalError(LCMS_ERRC_ABORTED, "Unknown parametric curve type '%d' found.", Type);
                 return NULL;
            }
         
           ZeroMemory(Params, 10* sizeof(double));
           n = ParamsByType[Type];
 
@@ -1028,17 +1028,17 @@ LPGAMMATABLE ReadCurveReversed(LPLCMSICC
            icUInt16Number   Type;
            int i;
 
 
            if (Icc -> Read(&Type, sizeof(icUInt16Number), 1, Icc) != 1) return NULL;
            if (Icc -> Read(&Reserved, sizeof(icUInt16Number), 1, Icc) != 1) return NULL;
            
            AdjustEndianess16((LPBYTE) &Type);
-           if (Type > 5) {
+           if (Type > 4) {
 
                 cmsSignalError(LCMS_ERRC_ABORTED, "Unknown parametric curve type '%d' found.", Type);
                 return NULL;
            }
         
           ZeroMemory(Params, 10* sizeof(double));
           n = ParamsByType[Type];
 


Index: lcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcms/F-8/lcms.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lcms.spec	22 Aug 2007 15:22:35 -0000	1.12
+++ lcms.spec	3 Jun 2008 09:30:42 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           lcms
 Version:        1.17
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        Color Management System
 
 Group:          Applications/Productivity
@@ -10,6 +10,7 @@
 URL:            http://www.littlecms.com/
 Source0:        http://www.littlecms.com/lcms-%{version}.tar.gz
 Patch1:         lcms-1.16-python-lib64.patch
+Patch2:         coverity-boundchecking-cmsio1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -26,6 +27,15 @@
 LittleCMS intends to be a small-footprint, speed optimized color management
 engine in open source form.
 
+%package        libs
+Summary:        Library for %{name}
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+# Introduced in F-9 to solve multilib transition
+Obsoletes:      lcms < 1.17-3
+
+%description    libs
+The %{name}-libs package contains library for %{name}.
 
 %package     -n python-%{name}
 Summary:        Python interface to LittleCMS
@@ -40,7 +50,7 @@
 %package        devel
 Summary:        Development files for LittleCMS
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 Requires:       pkgconfig
 Provides:       littlecms-devel = %{version}-%{release}
 
@@ -51,8 +61,21 @@
 %prep
 %setup -q
 %patch1 -p1 -b .python-lib64
+%patch2 -p2 -b .type4
 find . -name \*.[ch] | xargs chmod -x
 
+# Convert not UTF-8 files
+pushd doc
+mkdir -p __temp
+for f in LCMSAPI.TXT TUTORIAL.TXT ;do
+cp -p $f __temp/$f
+iconv -f ISO-8859-1 -t UTF-8 __temp/$f > $f
+touch -r __temp/$f $f
+done
+rm -rf __temp
+popd
+
+
 %build
 autoreconf
 %configure --with-python --disable-static
@@ -62,7 +85,7 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
+make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
 chmod 0644 AUTHORS COPYING ChangeLog NEWS README.1ST doc/TUTORIAL.TXT doc/LCMSAPI.TXT
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 
@@ -71,18 +94,22 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 
-%post -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README.1ST doc/TUTORIAL.TXT
+%doc README.1ST doc/TUTORIAL.TXT
 %{_bindir}/*
-%{_libdir}/*.so.*
 %{_mandir}/man1/*
 
+%files libs
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS
+%{_libdir}/*.so.*
+
 %files devel
 %defattr(-,root,root,-)
 %doc doc/LCMSAPI.TXT
@@ -97,6 +124,18 @@
 
 
 %changelog
+* Tue Jun 3 2008 kwizart < kwizart at gmail.com > - 1.17-5
+- Fix Array indexing error in ReadCurve - #448066
+
+* Wed Feb 13 2008 kwizart < kwizart at gmail.com > - 1.17-4
+- Fix packaging bug #432568 (multilib transition).
+
+* Mon Feb 11 2008 kwizart < kwizart at gmail.com > - 1.17-3
+- Rebuild for gcc 4.3
+- Move libs to mutlilibs
+- Prevent timestramps change
+- Convert files-not-utf8
+
 * Wed Aug 22 2007 kwizart < kwizart at gmail.com > - 1.17-2
 - Disable static for now.
 


--- lcms-1.14-fc4-swigtype.patch DELETED ---