diff --git a/SOURCES/fontforge-20170731-covscan-issue-fix-revertbad.patch b/SOURCES/fontforge-20170731-covscan-issue-fix-revertbad.patch deleted file mode 100644 index d24dda6..0000000 --- a/SOURCES/fontforge-20170731-covscan-issue-fix-revertbad.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff -Naurp a/fontforge/bitmapchar.c b/fontforge/bitmapchar.c ---- a/fontforge/bitmapchar.c 2019-05-29 23:01:41.558539879 +0000 -+++ b/fontforge/bitmapchar.c 2019-05-30 01:56:44.866932108 +0000 -@@ -372,7 +372,7 @@ void SFReplaceFontnameBDFProps(SplineFon - } - } - free(bpt); -- free(pt); -+ //free(pt); - } - - BDFProperties *BdfPropsCopy(BDFProperties *props, int cnt ) { -diff -Naurp a/fontforge/featurefile.c b/fontforge/featurefile.c ---- a/fontforge/featurefile.c 2019-05-29 23:01:41.562539887 +0000 -+++ b/fontforge/featurefile.c 2019-05-30 01:56:44.867932111 +0000 -@@ -4648,7 +4648,7 @@ static FPST *fea_markedglyphs_to_fpst(st - } - r->lookup_cnt = lc; - } -- free(bcovers); -+ //free(bcovers); - return( fpst ); - } - -@@ -7101,7 +7101,7 @@ static struct feat_item *fea_ApplyFeatur - } - if ( f!=NULL && f->type == ft_feat_end ) - f = f->next; -- free(sl); -+ //free(sl); //??? - return( f ); - } - -diff -Naurp a/fontforge/plugins.c b/fontforge/plugins.c ---- a/fontforge/plugins.c 2019-05-29 23:01:41.571539906 +0000 -+++ b/fontforge/plugins.c 2019-05-30 01:56:44.869932118 +0000 -@@ -35,7 +35,7 @@ - int LoadPlugin(const char *dynamic_lib_name) { - lt_dlhandle plugin; - plugin = load_plugin(dynamic_lib_name, LogError); -- free(plugin); -+ //free(plugin); - return (plugin != NULL); - } - -diff -Naurp a/fontforge/psread.c b/fontforge/psread.c ---- a/fontforge/psread.c 2019-05-29 23:01:41.573539911 +0000 -+++ b/fontforge/psread.c 2019-05-30 01:56:44.951932373 +0000 -@@ -4690,6 +4690,6 @@ SplineChar *PSCharStringToSplines(uint8 - if ( name!=NULL && strcmp(name,".notdef")!=0 ) - ret->widthset = true; - free(pending_hm); -- free(pt); -+ //free(pt); - return( ret ); - } -diff -Naurp a/fontforge/sfd.c b/fontforge/sfd.c ---- a/fontforge/sfd.c 2019-05-29 23:01:41.583539931 +0000 -+++ b/fontforge/sfd.c 2019-05-30 01:56:44.962932407 +0000 -@@ -8302,7 +8302,7 @@ bool SFD_GetFontMetaData( FILE *sfd, - // - return false; - } -- free(kc); -+ //free(kc); - return true; - } - -@@ -8746,7 +8746,7 @@ static SplineFont *SFD_GetFont( FILE *sf - else if ( lastnamedinstance !=NULL ) - lastnamedinstance->names = names; - pushedbacktok = true; -- free(names); -+ //free(names); - } else if ( strmatch(tok,"MMCDV:")==0 ) { - MMSet *mm = sf->mm; - if ( mm!=NULL ) -@@ -8870,7 +8870,7 @@ exit( 1 ); - if (sf->map == NULL) sf->map = EncMapNew(sf->glyphcnt,sf->glyphcnt,&custom); - - SFDFixupUndoRefs(sf); -- free(remap); -+ //free(remap); - return( sf ); - } - -diff -Naurp a/fontforge/ttfspecial.c b/fontforge/ttfspecial.c ---- a/fontforge/ttfspecial.c 2019-05-29 23:01:41.594539954 +0000 -+++ b/fontforge/ttfspecial.c 2019-05-30 01:56:45.001932528 +0000 -@@ -1356,7 +1356,7 @@ static void pfed_read_glyph_layer(FILE * - } - } - free(contours); -- free(cur); -+ //free(cur); - } - - static void pfed_readguidelines(FILE *ttf,struct ttfinfo *info,uint32 base) { diff --git a/SOURCES/fontforge-20170731-covscan-issue-fix.patch b/SOURCES/fontforge-20170731-covscan-issue-fix.patch index 064a710..27999c4 100644 --- a/SOURCES/fontforge-20170731-covscan-issue-fix.patch +++ b/SOURCES/fontforge-20170731-covscan-issue-fix.patch @@ -206,15 +206,6 @@ diff -urN fontforge-20170731.old/fontforge/featurefile.c fontforge-20170731/font return; } gm = chunkalloc(sizeof(*gm)); -@@ -4639,7 +4648,7 @@ - } - r->lookup_cnt = lc; - } -- -+ free(bcovers); - return( fpst ); - } - @@ -7092,6 +7101,7 @@ } if ( f!=NULL && f->type == ft_feat_end ) @@ -1330,14 +1321,6 @@ diff -urN fontforge-20170731.old/fontforge/sfd.c fontforge-20170731/fontforge/sf if (d->lastgroupvkern != NULL) d->lastgroupvkern->next = kerntmp; else sf->groupvkerns = kerntmp; d->lastgroupvkern = kerntmp; } -@@ -8267,6 +8302,7 @@ - // - return false; - } -+ free(kc); - return true; - } - @@ -8710,6 +8746,7 @@ else if ( lastnamedinstance !=NULL ) lastnamedinstance->names = names; diff --git a/SOURCES/fontforge-20170731-override-upstream-optimization-flags-splinerefigure-c.patch b/SOURCES/fontforge-20170731-override-upstream-optimization-flags-splinerefigure-c.patch new file mode 100644 index 0000000..5ba528e --- /dev/null +++ b/SOURCES/fontforge-20170731-override-upstream-optimization-flags-splinerefigure-c.patch @@ -0,0 +1,12 @@ +diff -urN fontforge-20170731.old/fontforge/Makefile.am fontforge-20170731/fontforge/Makefile.am +--- fontforge-20170731.old/fontforge/Makefile.am 2017-07-31 03:19:01.000000000 +0530 ++++ fontforge-20170731/fontforge/Makefile.am 2019-06-01 23:35:57.644257299 +0530 +@@ -192,7 +192,7 @@ + # without optimization. + splinerefigure.lo: $(srcdir)/splinerefigure.c $(srcdir)/splinefont.h + $(LIBTOOL) --mode=compile $(CC) $(RAW_COMPILE_PLATFORM_CFLAGS) -g -c -o \ +- splinerefigure.lo $(AM_CPPFLAGS) $(srcdir)/splinerefigure.c ++ splinerefigure.lo $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(srcdir)/splinerefigure.c + + #-------------------------------------------------------------------------- + EXTRA_DIST = generate_codepoint_selector.py threaddummy.c diff --git a/SPECS/fontforge.spec b/SPECS/fontforge.spec index 48e8419..8645d76 100644 --- a/SPECS/fontforge.spec +++ b/SPECS/fontforge.spec @@ -4,7 +4,7 @@ Name: fontforge Version: %{gittag0} -Release: 8%{?dist}.0.2 +Release: 13%{?dist} Summary: Outline and bitmap font editor License: GPLv3+ @@ -17,8 +17,7 @@ Patch0: fontforge-20140813-use-system-uthash.patch # Fedora specific patch to have python3 support only Patch1: Add-python3-support.patch Patch2: fontforge-20170731-covscan-issue-fix.patch - -Patch9999: fontforge-20170731-covscan-issue-fix-revertbad.patch +Patch3: fontforge-20170731-override-upstream-optimization-flags-splinerefigure-c.patch Requires: xdg-utils Requires: autotrace @@ -158,11 +157,20 @@ chmod 644 $RPM_BUILD_ROOT%{_datadir}/fontforge/nodejs/collabwebview/js/contentEd %doc htdocs %changelog -* Wed May 29 2019 Pablo Greco - 20170731-8.0.2 -- Fix more segfaults (https://bugzilla.redhat.com/show_bug.cgi?id=1665939) +* Sun Jun 02 2019 Parag Nemade - 20170731-13 +- Resolves:rh#1665940 - harden the missing splinerefigure.c file + +* Fri May 31 2019 Parag Nemade - 20170731-12 +- Resolves:rh#1665940 - Fixed covscan patch to fix some font packages build + +* Mon May 20 2019 Parag Nemade - 20170731-11 +- Resolves:rh#1682233 - Fixed gating.yml rule + +* Sat May 18 2019 Parag Nemade - 20170731-10 +- Resolves:rh#1682233 - fontforge changes blocked until gating tests are added -* Wed May 29 2019 Pablo Greco - 20170731-8.0.1 -- Fix segfault building some fonts (https://bugzilla.redhat.com/show_bug.cgi?id=1665939) +* Mon May 13 2019 Parag Nemade - 20170731-9 +- Resolves:rh#1665940 - fontforge: Use after free during dejavu-fonts build * Tue Oct 30 2018 Parag Nemade - 20170731-8 - Resolves:rh#1644224 - fix some issues from covscan patch