rpms/t1lib/devel t1lib-5.1.2-segf.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 t1lib.spec, 1.21, 1.22

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/t1lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20000

Modified Files:
	.cvsignore sources t1lib.spec 
Added Files:
	t1lib-5.1.2-segf.patch 
Log Message:
* Sat Jan 12 2008 Patrice Dumas <pertusus[AT]free.fr> - 5.1.2-1
- update to 5.1.2


t1lib-5.1.2-segf.patch:

--- NEW FILE t1lib-5.1.2-segf.patch ---
diff -up t1lib-5.1.2/lib/t1lib/t1base.c.segf t1lib-5.1.2/lib/t1lib/t1base.c
--- t1lib-5.1.2/lib/t1lib/t1base.c.segf	2007-12-23 16:49:42.000000000 +0100
+++ t1lib-5.1.2/lib/t1lib/t1base.c	2008-01-12 01:43:42.000000000 +0100
@@ -455,7 +455,7 @@ int intT1_scanFontDBase( char *filename)
 	   to test_for_t1_file() filename is substituted by an emty
 	   string if the file was not found: */
 	sprintf( err_warn_msg_buf, "Type 1 Font file %s.[pfa/pfb] not found (FontID=%d, SearchPath=%s)",
-		 linebuf, m-1, T1_GetFileSearchPath(T1_PFAB_PATH));
+		 linebuf, m-1, intT1_GetFileSearchPath(T1_PFAB_PATH));
 	if ((test_for_t1_file( &linebuf[0]))){
 	  T1_PrintLog( "intT1_scanFontDBase()", err_warn_msg_buf, T1LOG_WARNING);
 	  located=0;
@@ -579,7 +579,7 @@ int intT1_scanFontDBaseXLFD( char *filen
 	   to test_for_t1_file() filename is substituted by an emty
 	   string if the file was not found: */
 	sprintf( err_warn_msg_buf, "Type 1 Font file %s.[pfa/pfb] not found (FontID=%d, SearchPath=%s)",
-		 linebuf, m-1, T1_GetFileSearchPath(T1_PFAB_PATH));
+		 linebuf, m-1, intT1_GetFileSearchPath(T1_PFAB_PATH));
 	if ((test_for_t1_file( &linebuf[0]))){
 	  T1_PrintLog( "intT1_scanFontDBase()", err_warn_msg_buf, T1LOG_WARNING);
 	  located=0;
diff -up t1lib-5.1.2/lib/t1lib/t1env.c.segf t1lib-5.1.2/lib/t1lib/t1env.c
--- t1lib-5.1.2/lib/t1lib/t1env.c.segf	2007-12-23 16:49:42.000000000 +0100
+++ t1lib-5.1.2/lib/t1lib/t1env.c	2008-01-12 01:43:42.000000000 +0100
@@ -818,6 +818,14 @@ char *T1_GetFileSearchPath( int type)
 
 }
 
+/* intT1_GetFileSearchPath(): 
+ call T1_GetFileSearchPath and truncate the line to avoid overflowing
+ error buffers*/ 
+char *intT1_GetFileSearchPath( int type)
+{
+   char  *res = T1_GetFileSearchPath(type);
+   res[900] = 0;
+}
 
 /* T1_AddToFileSearchPath(): Add the specified path element to
    the specified search path. If the existing path is the default path,
diff -up t1lib-5.1.2/lib/t1lib/t1load.c.segf t1lib-5.1.2/lib/t1lib/t1load.c
diff -up t1lib-5.1.2/lib/t1lib/t1env.h.segf t1lib-5.1.2/lib/t1lib/t1env.h
--- t1lib-5.1.2/lib/t1lib/t1env.h.segf	2007-12-23 16:49:42.000000000 +0100
+++ t1lib-5.1.2/lib/t1lib/t1env.h	2008-01-12 01:43:42.000000000 +0100
@@ -35,6 +35,7 @@ char *intT1_Env_GetCompletePath( char *F
 int T1_SetFileSearchPath( int type, char *pathname);
 int T1_AddToFileSearchPath( int pathtype, int mode, char *pathname);
 char *T1_GetFileSearchPath( int type);
+char *intT1_GetFileSearchPath( int type);
 int T1_SetFontDataBase( char *filename);
 int T1_AddFontDataBase( int mode, char *filename);
 int T1_SetFontDataBaseXLFD( char *filename);
@@ -49,6 +50,7 @@ extern char *intT1_Env_GetCompletePath( 
 extern int T1_SetFileSearchPath( int type, char *pathname);
 extern int T1_AddToFileSearchPath( int pathtype, int mode, char *pathname);
 extern char *T1_GetFileSearchPath( int type);
+extern char *intT1_GetFileSearchPath( int type);
 extern int T1_SetFontDataBase( char *filename);
 extern int T1_AddFontDataBase( int mode, char *filename);
 extern int T1_SetFontDataBaseXLFD( char *filename);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Jan 2008 09:54:28 -0000	1.5
+++ .cvsignore	12 Jan 2008 01:03:35 -0000	1.6
@@ -1,2 +1,2 @@
-t1lib-5.1.1.tar.gz
+t1lib-5.1.2.tar.gz
 t1lib_5.1.1-3.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jan 2008 09:54:28 -0000	1.5
+++ sources	12 Jan 2008 01:03:35 -0000	1.6
@@ -1,2 +1,2 @@
-b1b86b5014364d92ab3b7cee6c81e29d  t1lib-5.1.1.tar.gz
+a5629b56b93134377718009df1435f3c  t1lib-5.1.2.tar.gz
 293442d7226eff695b0f4115cbeba0f0  t1lib_5.1.1-3.diff.gz


Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/t1lib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- t1lib.spec	8 Jan 2008 21:43:43 -0000	1.21
+++ t1lib.spec	12 Jan 2008 01:03:35 -0000	1.22
@@ -1,14 +1,15 @@
 Name:           t1lib
-Version:        5.1.1
-Release:        7%{?dist}
+Version:        5.1.2
+Release:        1%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
 Group:          Applications/Publishing
 License:        LGPLv2+
-URL:            ftp://sunsite.unc.edu/pub/Linux/libs/graphics
+URL:            ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-%{version}.lsm
 Source0:        ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-%{version}.tar.gz
 Patch0:         http://ftp.de.debian.org/debian/pool/main/t/t1lib/t1lib_5.1.1-3.diff.gz
+Patch1:         t1lib-5.1.2-segf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libXaw-devel
 
@@ -42,10 +43,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .segf
 
 # use debian patches directly instead of duplicating them
-patch -p1 < debian/patches/cve-2007-4033.diff
-patch -p1 < debian/patches/segfault.diff -b -z .segf
+#patch -p1 < debian/patches/segfault.diff -b -z .segf
 patch -p1 < debian/patches/no-config.diff
 patch -p1 < debian/patches/no-docs.diff
 patch -p1 < debian/patches/lib-cleanup.diff
@@ -124,6 +125,9 @@
 
 
 %changelog
+* Sat Jan 12 2008 Patrice Dumas <pertusus[AT]free.fr> - 5.1.2-1
+- update to 5.1.2
+
 * Tue Jan  8 2008 Patrice Dumas <pertusus[AT]free.fr> - 5.1.1-7
 - add X libs BuildRequires (#353861)