[-]
[+]
|
Added |
t1lib.spec
|
|
[-]
[+]
|
Added |
t1lib-5.1.2-segf.patch
^
|
@@ -0,0 +1,59 @@
+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);
|
[-]
[+]
|
Added |
t1lib_5.1.1-3.diff.gz
^
|
@@ -0,0 +1,1405 @@
+--- t1lib-5.1.1.orig/debian/patches/cve-2007-4033.diff
++++ t1lib-5.1.1/debian/patches/cve-2007-4033.diff
+@@ -0,0 +1,19 @@
++This patch fixes CVE-2007-4033.
++
++Index: t1lib-5.1.1/lib/t1lib/t1env.c
++===================================================================
++--- t1lib-5.1.1.orig/lib/t1lib/t1env.c 2008-01-05 19:08:50.000000000 +0100
+++++ t1lib-5.1.1/lib/t1lib/t1env.c 2008-01-05 19:09:14.000000000 +0100
++@@ -611,6 +611,12 @@
++ #endif
++ strcat( pathbuf, DIRECTORY_SEP);
++ /* And finally the filename: */
+++ /* If current pathbuf + StrippedName + 1 byte for NULL is bigger than pathbuf
+++ let's try next pathbuf */
+++ if( strlen(pathbuf) + strlen(StrippedName) + 1 > sizeof(pathbuf) ) {
+++ i++;
+++ continue;
+++ }
++ strcat( pathbuf, StrippedName);
++
++ /* Check for existence of the path: */
+--- t1lib-5.1.1.orig/debian/patches/segfault.diff
++++ t1lib-5.1.1/debian/patches/segfault.diff
+@@ -0,0 +1,93 @@
++Index: t1lib-5.1.1/lib/t1lib/t1base.c
++===================================================================
++--- t1lib-5.1.1.orig/lib/t1lib/t1base.c 2005-05-18 05:08:01.000000000 +0200
+++++ t1lib-5.1.1/lib/t1lib/t1base.c 2008-01-06 20:48:32.000000000 +0100
++@@ -455,7 +455,7 @@
++ 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 @@
++ 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;
++Index: t1lib-5.1.1/lib/t1lib/t1env.c
++===================================================================
++--- t1lib-5.1.1.orig/lib/t1lib/t1env.c 2008-01-06 20:48:32.000000000 +0100
+++++ t1lib-5.1.1/lib/t1lib/t1env.c 2008-01-06 20:48:32.000000000 +0100
++@@ -807,6 +807,14 @@
++
++ }
++
+++/* 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,
++Index: t1lib-5.1.1/lib/t1lib/t1env.h
++===================================================================
++--- t1lib-5.1.1.orig/lib/t1lib/t1env.h 2005-05-16 20:37:43.000000000 +0200
+++++ t1lib-5.1.1/lib/t1lib/t1env.h 2008-01-06 20:48:32.000000000 +0100
++@@ -35,6 +35,7 @@
++ 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 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: t1lib-5.1.1/lib/t1lib/t1load.c
++===================================================================
++--- t1lib-5.1.1.orig/lib/t1lib/t1load.c 2005-05-02 01:16:05.000000000 +0200
+++++ t1lib-5.1.1/lib/t1lib/t1load.c 2008-01-06 20:49:36.000000000 +0100
++@@ -160,6 +160,27 @@
++ free(FileNamePath);
++
++
+++ /* set some default values if not assigned to avoid library crash */
+++ /* XXX: may be it is better to issue error, and return -1 */
+++ if (pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP == NULL) {
+++ if ((pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP =
+++ (psobj *)vm_alloc(4 * sizeof(psobj))) == NULL) {
+++ T1_PrintLog( "T1_LoadFont()", "Error allocating memory for fontbbox objects (FontID=%d)",
+++ T1LOG_WARNING, FontID);
+++ T1_errno=T1ERR_ALLOC_MEM;
+++ return(-1);
+++ }
+++ for (i = 0; i < 4; i++) {
+++ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[i].type = OBJ_INTEGER;
+++ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[i].len = 0;
+++ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[i].data.integer = 0;
+++ }
+++ }
+++ if (pFontBase->pFontArray[FontID].pFontEnc == NULL &&
+++ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[ENCODING].value.data.arrayP == NULL) {
+++ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[ENCODING].value.data.valueP = (char *) StdEncArrayP;
+++ }
+++
++ /* Store the base address of virtual memory and realloc in order not
++ to waste too much memory: */
++ pFontBase->pFontArray[FontID].vm_base=vm_base;
+--- t1lib-5.1.1.orig/debian/patches/lib-cleanup.diff
++++ t1lib-5.1.1/debian/patches/lib-cleanup.diff
+@@ -0,0 +1,59 @@
++do not link against libraries that are not needed
++
++Index: t1lib-5.1.1/lib/Makefile.in
++===================================================================
++--- t1lib-5.1.1.orig/lib/Makefile.in 2008-01-05 19:17:21.000000000 +0100
+++++ t1lib-5.1.1/lib/Makefile.in 2008-01-05 19:17:38.000000000 +0100
++@@ -24,7 +24,7 @@
++ X_LIBS = @X_LIBS@
++ TOPSRC = @top_srcdir@
++ XPM_LIB = -lXpm
++-XLIB = @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
+++XLIB = -lX11
++ LDFLAGS = @LDFLAGS@
++ LDLIBS = @LDLIBS@
++ AR = ar rc
++@@ -137,7 +137,7 @@
++ $(LIBTOOL) --mode=link \
++ $(CC) $(LDFLAGS) -o $@ $(T1LIBX_OBJS) \
++ -version-info @T1LIB_LT_CURRENT@:@T1LIB_LT_REVISION@:@T1LIB_LT_AGE@ \
++- libt1.la $(X_LIBS) $(XPM_LIB) $(XLIB) -no-undefined -rpath $(libdir)
+++ libt1.la $(X_LIBS) $(XLIB) -no-undefined -rpath $(libdir)
++ cp t1lib/t1libx.h .
++
++
++Index: t1lib-5.1.1/type1afm/Makefile.in
++===================================================================
++--- t1lib-5.1.1.orig/type1afm/Makefile.in 2008-01-05 19:17:52.000000000 +0100
+++++ t1lib-5.1.1/type1afm/Makefile.in 2008-01-05 19:18:02.000000000 +0100
++@@ -70,7 +70,7 @@
++
++ type1afm: $(OBJS) ../lib/t1lib.h
++ $(LIBTOOL) --mode=link \
++- $(CC) -o type1afm $(LDFLAGS) $(OBJS) $(T1LIB) $(LDLIBS)
+++ $(CC) -o type1afm $(LDFLAGS) $(OBJS) $(T1LIB)
++
++ .SUFFIXES: .lo
++ .c.lo:
++Index: t1lib-5.1.1/xglyph/Makefile.in
++===================================================================
++--- t1lib-5.1.1.orig/xglyph/Makefile.in 2008-01-05 19:18:15.000000000 +0100
+++++ t1lib-5.1.1/xglyph/Makefile.in 2008-01-05 19:18:31.000000000 +0100
++@@ -24,7 +24,7 @@
++ X_LIBS = @X_LIBS@
++ TOPSRC = @top_srcdir@
++ XPM_LIB = -lXpm
++-XLIB = @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
+++XLIB = -lX11 @X_EXTRA_LIBS@
++ LDFLAGS = @LDFLAGS@
++ LDLIBS = @LDLIBS@
++ AR = ar rc
++@@ -65,7 +65,7 @@
++
++ T1LIB = ../lib/libt1.la
++ T1LIBX = ../lib/libt1x.la
++-XAWLIB = -lXaw -lXt -lXmu
+++XAWLIB = -lXaw -lXt
++
++
++ all: xglyph
+--- t1lib-5.1.1.orig/debian/patches/no-config.diff
++++ t1lib-5.1.1/debian/patches/no-config.diff
+@@ -0,0 +1,57 @@
++do not install a static configuration file
++
++Index: t1lib-5.1.1/lib/Makefile.in
++===================================================================
++--- t1lib-5.1.1.orig/lib/Makefile.in 2008-01-05 19:13:57.000000000 +0100
+++++ t1lib-5.1.1/lib/Makefile.in 2008-01-05 19:14:18.000000000 +0100
++@@ -161,17 +161,17 @@
++ install: dummy
++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(includedir)
++- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@
+++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@
++ $(LIBTOOL) --mode=install \
++ $(INSTALL_DATA) $(MAIN_TARGET) $(DESTDIR)$(libdir)
++ $(LIBTOOL) --mode=install \
++ $(INSTALL_DATA) $(MAIN_HEADER) $(DESTDIR)$(includedir)
|
[-]
[+]
|
Deleted |
_aggregate
^
|
@@ -1,5 +0,0 @@
-<aggregatelist>
- <aggregate project="home:jg:devel">
- <package>t1lib</package>
- </aggregate>
-</aggregatelist>
|
|
Added |
t1lib-5.1.2.tar.gz
^
|