rpms/staging-kmod/F-20 staging-kmod.spec,1.84,1.85
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/staging-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23102
Modified Files:
staging-kmod.spec
Log Message:
* Sat Dec 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 3.17.2-1.4
- Rebuilt for kernel
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-20/staging-kmod.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- staging-kmod.spec 23 Nov 2014 16:41:38 -0000 1.84
+++ staging-kmod.spec 13 Dec 2014 12:33:51 -0000 1.85
@@ -28,7 +28,7 @@
Name: staging-kmod
Version: 3.17.2
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.3
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.4
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -143,6 +143,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Dec 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 3.17.2-1.4
+- Rebuilt for kernel
+
* Sun Nov 23 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 3.17.2-1.3
- Rebuilt for kernel
9 years, 4 months
rpms/openafs-kmod/F-20 openafs-kmod.spec,1.96,1.97
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/openafs-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22981
Modified Files:
openafs-kmod.spec
Log Message:
* Sat Dec 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.10-0.1pre1.10
- Rebuilt for kernel
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-20/openafs-kmod.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- openafs-kmod.spec 23 Nov 2014 16:41:32 -0000 1.96
+++ openafs-kmod.spec 13 Dec 2014 12:33:44 -0000 1.97
@@ -24,7 +24,7 @@
Name: %{kmod_name}-kmod
Version: 1.6.10
-Release: %{?pre:0.}1%{?pre}%{?dist}.9
+Release: %{?pre:0.}1%{?pre}%{?dist}.10
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -104,6 +104,9 @@
%changelog
+* Sat Dec 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.10-0.1pre1.10
+- Rebuilt for kernel
+
* Sun Nov 23 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.10-0.1pre1.9
- Rebuilt for kernel
9 years, 4 months
rpms/ndiswrapper-kmod/F-20 ndiswrapper-kmod.spec,1.115,1.116
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ndiswrapper-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22854
Modified Files:
ndiswrapper-kmod.spec
Log Message:
* Sat Dec 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.59-6.32
- Rebuilt for kernel
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-20/ndiswrapper-kmod.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- ndiswrapper-kmod.spec 23 Nov 2014 16:41:26 -0000 1.115
+++ ndiswrapper-kmod.spec 13 Dec 2014 12:33:35 -0000 1.116
@@ -8,7 +8,7 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.59
-Release: 6%{?dist}.31
+Release: 6%{?dist}.32
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
@@ -75,6 +75,9 @@
%changelog
+* Sat Dec 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.59-6.32
+- Rebuilt for kernel
+
* Sun Nov 23 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.59-6.31
- Rebuilt for kernel
9 years, 4 months
rpms/buildsys-build-rpmfusion/F-19 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.93, 1.94 buildsys-build-rpmfusion.spec, 1.119, 1.120
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22631
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Sat Dec 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 10:19-80
- rebuild for kernel 3.14.26-100.fc19
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-19/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- buildsys-build-rpmfusion-kerneldevpkgs-current 23 Nov 2014 16:13:26 -0000 1.93
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 13 Dec 2014 12:23:12 -0000 1.94
@@ -1,4 +1,4 @@
-3.14.25-100.fc19
-3.14.25-100.fc19smp
-3.14.25-100.fc19PAE
-3.14.25-100.fc19lpae
+3.14.26-100.fc19
+3.14.26-100.fc19smp
+3.14.26-100.fc19PAE
+3.14.26-100.fc19lpae
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-19/buildsys-build-rpmfusion.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- buildsys-build-rpmfusion.spec 23 Nov 2014 16:13:27 -0000 1.119
+++ buildsys-build-rpmfusion.spec 13 Dec 2014 12:23:12 -0000 1.120
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 19
-Release: 79
+Release: 80
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Sat Dec 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 10:19-80
+- rebuild for kernel 3.14.26-100.fc19
+
* Sun Nov 23 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 10:19-79
- rebuild for kernel 3.14.25-100.fc19
9 years, 4 months
rpms/buildsys-build-rpmfusion/F-20 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.76, 1.77 buildsys-build-rpmfusion.spec, 1.97, 1.98
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22392
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Sat Dec 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 10:20-53
- rebuild for kernel 3.17.6-200.fc20
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-20/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- buildsys-build-rpmfusion-kerneldevpkgs-current 23 Nov 2014 16:12:49 -0000 1.76
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 13 Dec 2014 12:21:36 -0000 1.77
@@ -1,4 +1,4 @@
-3.17.4-200.fc20
-3.17.4-200.fc20smp
-3.17.4-200.fc20PAE
-3.17.4-200.fc20lpae
+3.17.6-200.fc20
+3.17.6-200.fc20smp
+3.17.6-200.fc20PAE
+3.17.6-200.fc20lpae
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-20/buildsys-build-rpmfusion.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- buildsys-build-rpmfusion.spec 23 Nov 2014 16:12:49 -0000 1.97
+++ buildsys-build-rpmfusion.spec 13 Dec 2014 12:21:37 -0000 1.98
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 20
-Release: 52
+Release: 53
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Sat Dec 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 10:20-53
+- rebuild for kernel 3.17.6-200.fc20
+
* Sun Nov 23 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 10:20-52
- rebuild for kernel 3.17.4-200.fc20
9 years, 4 months
rpms/phonon-backend-vlc/devel .cvsignore, 1.17, 1.18 phonon-backend-vlc.spec, 1.27, 1.28 sources, 1.17, 1.18
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/phonon-backend-vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11262
Modified Files:
.cvsignore phonon-backend-vlc.spec sources
Log Message:
* Fri Dec 12 2014 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.2-1
- 0.8.2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 8 Nov 2014 13:37:11 -0000 1.17
+++ .cvsignore 12 Dec 2014 16:37:41 -0000 1.18
@@ -1 +1 @@
-phonon-backend-vlc-0.8.1.tar.xz
+phonon-backend-vlc-0.8.2.tar.xz
Index: phonon-backend-vlc.spec
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/phonon-backend-vlc.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- phonon-backend-vlc.spec 17 Nov 2014 17:05:00 -0000 1.27
+++ phonon-backend-vlc.spec 12 Dec 2014 16:37:41 -0000 1.28
@@ -1,8 +1,8 @@
name: phonon-backend-vlc
Summary: VLC phonon backend
-Version: 0.8.1
-Release: 2%{?dist}
+Version: 0.8.2
+Release: 1%{?dist}
License: LGPLv2+
URL: http://phonon.kde.org/
@@ -11,7 +11,7 @@
# git archive --prefix=phonon-backend-vlc-%{version}/ master | xz > phonon-backend-vlc-%{version}-%{snap}.tar.xz
Source0: phonon-backend-vlc-%{version}-%{snap}.tar.xz
%else
-Source0: http://download.kde.org/stable/phonon/phonon-backend-vlc/%{version}/phono...
+Source0: http://download.kde.org/stable/phonon/phonon-backend-vlc/%{version}/src/p...
%endif
## downstream patches
@@ -87,6 +87,9 @@
%changelog
+* Fri Dec 12 2014 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.2-1
+- 0.8.2
+
* Mon Nov 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 0.8.1-2
- Rebuild for vlc 2.2.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 8 Nov 2014 13:37:11 -0000 1.17
+++ sources 12 Dec 2014 16:37:41 -0000 1.18
@@ -1 +1 @@
-5276dcf1baf1dece1cc78d8b4088771a phonon-backend-vlc-0.8.1.tar.xz
+3937517ce4929dea4398ad9834507f97 phonon-backend-vlc-0.8.2.tar.xz
9 years, 4 months
rpms/cairo-dock/devel cairo-dock.spec,1.76,1.77
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7782
Modified Files:
cairo-dock.spec
Log Message:
* Fri Dec 12 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-2
- Build Messaging-Menu, Status-Notifier
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- cairo-dock.spec 1 Dec 2014 05:19:45 -0000 1.76
+++ cairo-dock.spec 12 Dec 2014 08:58:41 -0000 1.77
@@ -29,7 +29,7 @@
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 1
+%global fedora_main_rel 2
%global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
@@ -104,6 +104,8 @@
BuildRequires: libetpan-devel
BuildRequires: lm_sensors-devel
BuildRequires: pkgconfig(indicator3-0.4)
+BuildRequires: pkgconfig(dbusmenu-glib-0.4)
+BuildRequires: pkgconfig(dbusmenu-gtk3-0.4)
# For plug-ins-xfce
%if %{build_xfce} > 0
BuildRequires: Thunar-devel
@@ -640,6 +642,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Dec 12 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-2
+- Build Messaging-Menu, Status-Notifier
+
* Mon Dec 1 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-1
- 3.4.0
9 years, 4 months
rpms/freetype-freeworld/F-20 freetype-2.5.0-hintmap.patch, NONE, 1.1 freetype-2.5.0-hintmask.patch, NONE, 1.1 freetype-freeworld.spec, 1.32, 1.33
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/freetype-freeworld/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1803/F-20
Modified Files:
freetype-freeworld.spec
Added Files:
freetype-2.5.0-hintmap.patch freetype-2.5.0-hintmask.patch
Log Message:
* Fri Dec 12 2014 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.5.0.1-5
- Add freetype-2.5.0-hintmask.patch from Fedora freetype (rh#1172634)
(Don't append to stem arrays after hintmask is constructed.)
- Add freetype-2.5.0-hintmap.patch from Fedora freetype (rh#1172634)
(Suppress an assert when hintMap.count == 0 in specific situations.)
freetype-2.5.0-hintmap.patch:
cf2hints.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
--- NEW FILE freetype-2.5.0-hintmap.patch ---
>From f89396cb6284954ff98b5dcbfc38e144deccdc83 Mon Sep 17 00:00:00 2001
From: Dave Arnold <darnold(a)adobe.com>
Date: Thu, 04 Dec 2014 05:17:26 +0000
Subject: [cff] Modify an FT_ASSERT.
* src/cff/cf2hints.c (cf2_hintmap_map): After the fix for Savannah
bug #43661, the test font `...aspartam.otf' still triggers an
FT_ASSERT. Since hintmap still works with count==0, ...
(cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): ... add that term to
suppress the assert.
---
diff --git a/src/cff/cf2hints.c b/src/cff/cf2hints.c
index 28a892b..040d193 100644
--- a/src/cff/cf2hints.c
+++ b/src/cff/cf2hints.c
@@ -304,9 +304,6 @@
cf2_hintmap_map( CF2_HintMap hintmap,
CF2_Fixed csCoord )
{
- FT_ASSERT( hintmap->isValid ); /* must call Build before Map */
- FT_ASSERT( hintmap->lastIndex < CF2_MAX_HINT_EDGES );
-
if ( hintmap->count == 0 || ! hintmap->hinted )
{
/* there are no hints; use uniform scale and zero offset */
@@ -317,6 +314,7 @@
/* start linear search from last hit */
CF2_UInt i = hintmap->lastIndex;
+ FT_ASSERT( hintmap->lastIndex < CF2_MAX_HINT_EDGES );
/* search up */
while ( i < hintmap->count - 1 &&
@@ -1586,7 +1584,8 @@
if ( glyphpath->elemIsQueued )
{
- FT_ASSERT( cf2_hintmap_isValid( &glyphpath->hintMap ) );
+ FT_ASSERT( cf2_hintmap_isValid( &glyphpath->hintMap ) ||
+ glyphpath->hintMap.count == 0 );
cf2_glyphpath_pushPrevElem( glyphpath,
&glyphpath->hintMap,
@@ -1672,7 +1671,8 @@
if ( glyphpath->elemIsQueued )
{
- FT_ASSERT( cf2_hintmap_isValid( &glyphpath->hintMap ) );
+ FT_ASSERT( cf2_hintmap_isValid( &glyphpath->hintMap ) ||
+ glyphpath->hintMap.count == 0 );
cf2_glyphpath_pushPrevElem( glyphpath,
&glyphpath->hintMap,
--
cgit v0.9.0.2
freetype-2.5.0-hintmask.patch:
cf2hints.c | 5 ++++-
cf2intrp.c | 22 ++++++++++++++--------
2 files changed, 18 insertions(+), 9 deletions(-)
--- NEW FILE freetype-2.5.0-hintmask.patch ---
>From 2cdc4562f873237f1c77d43540537c7a721d3fd8 Mon Sep 17 00:00:00 2001
From: Dave Arnold <darnold(a)adobe.com>
Date: Thu, 04 Dec 2014 05:10:16 +0000
Subject: [cff] Fix Savannah bug #43661.
* src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdHSTEM,
cf2_cmdVSTEM, cf2_cmdHINTMASK>: Don't append to stem arrays after
hintmask is constructed.
* src/cff/cf2hints.c (cf2_hintmap_build): Add defensive code to
avoid reading past end of hintmask.
---
diff --git a/src/cff/cf2hints.c b/src/cff/cf2hints.c
index 81049f4..28a892b 100644
--- a/src/cff/cf2hints.c
+++ b/src/cff/cf2hints.c
@@ -794,9 +794,12 @@
maskPtr = cf2_hintmask_getMaskPtr( &tempHintMask );
/* use the hStem hints only, which are first in the mask */
- /* TODO: compare this to cffhintmaskGetBitCount */
bitCount = cf2_arrstack_size( hStemHintArray );
+ /* Defense-in-depth. Should never return here. */
+ if ( bitCount > hintMask->bitCount )
+ return;
+
/* synthetic embox hints get highest priority */
if ( font->blues.doEmBoxHints )
{
diff --git a/src/cff/cf2intrp.c b/src/cff/cf2intrp.c
index 5610917..a269606 100644
--- a/src/cff/cf2intrp.c
+++ b/src/cff/cf2intrp.c
@@ -4,7 +4,7 @@
/* */
/* Adobe's CFF Interpreter (body). */
/* */
-/* Copyright 2007-2013 Adobe Systems Incorporated. */
+/* Copyright 2007-2014 Adobe Systems Incorporated. */
/* */
/* This software, and all works of authorship, whether in source or */
/* object code form as indicated by the copyright notice(s) included */
@@ -593,8 +593,11 @@
/* never add hints after the mask is computed */
if ( cf2_hintmask_isValid( &hintMask ) )
+ {
FT_TRACE4(( "cf2_interpT2CharString:"
" invalid horizontal hint mask\n" ));
+ break;
+ }
cf2_doStems( font,
opStack,
@@ -614,8 +617,11 @@
/* never add hints after the mask is computed */
if ( cf2_hintmask_isValid( &hintMask ) )
+ {
FT_TRACE4(( "cf2_interpT2CharString:"
" invalid vertical hint mask\n" ));
+ break;
+ }
cf2_doStems( font,
opStack,
@@ -1141,15 +1147,16 @@
/* `cf2_hintmask_read' (which also traces the mask bytes) */
FT_TRACE4(( op1 == cf2_cmdCNTRMASK ? " cntrmask" : " hintmask" ));
- /* if there are arguments on the stack, there this is an */
- /* implied cf2_cmdVSTEMHM */
- if ( cf2_stack_count( opStack ) != 0 )
+ /* never add hints after the mask is computed */
+ if ( cf2_stack_count( opStack ) > 1 &&
+ cf2_hintmask_isValid( &hintMask ) )
{
- /* never add hints after the mask is computed */
- if ( cf2_hintmask_isValid( &hintMask ) )
- FT_TRACE4(( "cf2_interpT2CharString: invalid hint mask\n" ));
+ FT_TRACE4(( "cf2_interpT2CharString: invalid hint mask\n" ));
+ break;
}
+ /* if there are arguments on the stack, there this is an */
+ /* implied cf2_cmdVSTEMHM */
cf2_doStems( font,
opStack,
&vStemHintArray,
--
cgit v0.9.0.2
Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/F-20/freetype-freeworld.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- freetype-freeworld.spec 11 Mar 2014 11:31:07 -0000 1.32
+++ freetype-freeworld.spec 12 Dec 2014 04:04:27 -0000 1.33
@@ -1,7 +1,7 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.5.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
Group: System Environment/Libraries
URL: http://www.freetype.org
@@ -20,6 +20,10 @@
Patch93: freetype-2.5.0-CVE-2014-2240.patch
Patch94: freetype-2.5.0-CVE-2014-2241.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=1172634
+Patch95: freetype-2.5.0-hintmask.patch
+Patch96: freetype-2.5.0-hintmap.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
Provides: freetype-bytecode
@@ -53,6 +57,9 @@
%patch93 -p1 -b .CVE-2014-2240
%patch94 -p1 -b .CVE-2014-2241
+%patch95 -p1 -b .hintmask
+%patch96 -p1 -b .hintmap
+
%build
@@ -97,6 +104,12 @@
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Fri Dec 12 2014 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.5.0.1-5
+- Add freetype-2.5.0-hintmask.patch from Fedora freetype (rh#1172634)
+ (Don't append to stem arrays after hintmask is constructed.)
+- Add freetype-2.5.0-hintmap.patch from Fedora freetype (rh#1172634)
+ (Suppress an assert when hintMap.count == 0 in specific situations.)
+
* Tue Mar 11 2014 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.5.0.1-4
- Add freetype-2.5.0-CVE-2014-2240.patch from Fedora freetype (rh#1074647)
(Return when `hintMask' is invalid.)
9 years, 4 months
rpms/freetype-freeworld/devel freetype-2.5.3-hintmap.patch, NONE, 1.1 freetype-2.5.3-hintmask.patch, NONE, 1.1 freetype-freeworld.spec, 1.36, 1.37
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/freetype-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1423/devel
Modified Files:
freetype-freeworld.spec
Added Files:
freetype-2.5.3-hintmap.patch freetype-2.5.3-hintmask.patch
Log Message:
* Fri Dec 12 2014 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.5.3-3
- Add freetype-2.5.3-hintmask.patch from Fedora freetype (rh#1172634)
(Don't append to stem arrays after hintmask is constructed.)
- Add freetype-2.5.3-hintmap.patch from Fedora freetype (rh#1172634)
(Suppress an assert when hintMap.count == 0 in specific situations.)
freetype-2.5.3-hintmap.patch:
cf2hints.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
--- NEW FILE freetype-2.5.3-hintmap.patch ---
>From f89396cb6284954ff98b5dcbfc38e144deccdc83 Mon Sep 17 00:00:00 2001
From: Dave Arnold <darnold(a)adobe.com>
Date: Thu, 04 Dec 2014 05:17:26 +0000
Subject: [cff] Modify an FT_ASSERT.
* src/cff/cf2hints.c (cf2_hintmap_map): After the fix for Savannah
bug #43661, the test font `...aspartam.otf' still triggers an
FT_ASSERT. Since hintmap still works with count==0, ...
(cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): ... add that term to
suppress the assert.
---
diff --git a/src/cff/cf2hints.c b/src/cff/cf2hints.c
index 28a892b..040d193 100644
--- a/src/cff/cf2hints.c
+++ b/src/cff/cf2hints.c
@@ -304,9 +304,6 @@
cf2_hintmap_map( CF2_HintMap hintmap,
CF2_Fixed csCoord )
{
- FT_ASSERT( hintmap->isValid ); /* must call Build before Map */
- FT_ASSERT( hintmap->lastIndex < CF2_MAX_HINT_EDGES );
-
if ( hintmap->count == 0 || ! hintmap->hinted )
{
/* there are no hints; use uniform scale and zero offset */
@@ -317,6 +314,7 @@
/* start linear search from last hit */
CF2_UInt i = hintmap->lastIndex;
+ FT_ASSERT( hintmap->lastIndex < CF2_MAX_HINT_EDGES );
/* search up */
while ( i < hintmap->count - 1 &&
@@ -1694,7 +1692,8 @@
if ( glyphpath->elemIsQueued )
{
- FT_ASSERT( cf2_hintmap_isValid( &glyphpath->hintMap ) );
+ FT_ASSERT( cf2_hintmap_isValid( &glyphpath->hintMap ) ||
+ glyphpath->hintMap.count == 0 );
cf2_glyphpath_pushPrevElem( glyphpath,
&glyphpath->hintMap,
@@ -1780,7 +1779,8 @@
if ( glyphpath->elemIsQueued )
{
- FT_ASSERT( cf2_hintmap_isValid( &glyphpath->hintMap ) );
+ FT_ASSERT( cf2_hintmap_isValid( &glyphpath->hintMap ) ||
+ glyphpath->hintMap.count == 0 );
cf2_glyphpath_pushPrevElem( glyphpath,
&glyphpath->hintMap,
--
cgit v0.9.0.2
freetype-2.5.3-hintmask.patch:
cf2hints.c | 5 ++++-
cf2intrp.c | 22 ++++++++++++++--------
2 files changed, 18 insertions(+), 9 deletions(-)
--- NEW FILE freetype-2.5.3-hintmask.patch ---
>From 2cdc4562f873237f1c77d43540537c7a721d3fd8 Mon Sep 17 00:00:00 2001
From: Dave Arnold <darnold(a)adobe.com>
Date: Thu, 04 Dec 2014 05:10:16 +0000
Subject: [cff] Fix Savannah bug #43661.
* src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdHSTEM,
cf2_cmdVSTEM, cf2_cmdHINTMASK>: Don't append to stem arrays after
hintmask is constructed.
* src/cff/cf2hints.c (cf2_hintmap_build): Add defensive code to
avoid reading past end of hintmask.
---
diff --git a/src/cff/cf2hints.c b/src/cff/cf2hints.c
index 81049f4..28a892b 100644
--- a/src/cff/cf2hints.c
+++ b/src/cff/cf2hints.c
@@ -794,9 +794,12 @@
maskPtr = cf2_hintmask_getMaskPtr( &tempHintMask );
/* use the hStem hints only, which are first in the mask */
- /* TODO: compare this to cffhintmaskGetBitCount */
bitCount = cf2_arrstack_size( hStemHintArray );
+ /* Defense-in-depth. Should never return here. */
+ if ( bitCount > hintMask->bitCount )
+ return;
+
/* synthetic embox hints get highest priority */
if ( font->blues.doEmBoxHints )
{
diff --git a/src/cff/cf2intrp.c b/src/cff/cf2intrp.c
index 5610917..a269606 100644
--- a/src/cff/cf2intrp.c
+++ b/src/cff/cf2intrp.c
@@ -4,7 +4,7 @@
/* */
/* Adobe's CFF Interpreter (body). */
/* */
-/* Copyright 2007-2013 Adobe Systems Incorporated. */
+/* Copyright 2007-2014 Adobe Systems Incorporated. */
/* */
/* This software, and all works of authorship, whether in source or */
/* object code form as indicated by the copyright notice(s) included */
@@ -593,8 +593,11 @@
/* never add hints after the mask is computed */
if ( cf2_hintmask_isValid( &hintMask ) )
+ {
FT_TRACE4(( "cf2_interpT2CharString:"
" invalid horizontal hint mask\n" ));
+ break;
+ }
cf2_doStems( font,
opStack,
@@ -614,8 +617,11 @@
/* never add hints after the mask is computed */
if ( cf2_hintmask_isValid( &hintMask ) )
+ {
FT_TRACE4(( "cf2_interpT2CharString:"
" invalid vertical hint mask\n" ));
+ break;
+ }
cf2_doStems( font,
opStack,
@@ -1141,15 +1147,16 @@
/* `cf2_hintmask_read' (which also traces the mask bytes) */
FT_TRACE4(( op1 == cf2_cmdCNTRMASK ? " cntrmask" : " hintmask" ));
- /* if there are arguments on the stack, there this is an */
- /* implied cf2_cmdVSTEMHM */
- if ( cf2_stack_count( opStack ) != 0 )
+ /* never add hints after the mask is computed */
+ if ( cf2_stack_count( opStack ) > 1 &&
+ cf2_hintmask_isValid( &hintMask ) )
{
- /* never add hints after the mask is computed */
- if ( cf2_hintmask_isValid( &hintMask ) )
- FT_TRACE4(( "cf2_interpT2CharString: invalid hint mask\n" ));
+ FT_TRACE4(( "cf2_interpT2CharString: invalid hint mask\n" ));
+ break;
}
+ /* if there are arguments on the stack, there this is an */
+ /* implied cf2_cmdVSTEMHM */
cf2_doStems( font,
opStack,
&vStemHintArray,
--
cgit v0.9.0.2
Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/devel/freetype-freeworld.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- freetype-freeworld.spec 1 Sep 2014 02:25:23 -0000 1.36
+++ freetype-freeworld.spec 12 Dec 2014 03:58:15 -0000 1.37
@@ -1,7 +1,7 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.5.3
-Release: 2%{?dist}
+Release: 3%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
URL: http://www.freetype.org
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta...
@@ -11,6 +11,11 @@
# Enable otvalid and gxvalid modules
Patch46: freetype-2.2.1-enable-valid.patch
+## Security fixes:
+# https://bugzilla.gnome.org/show_bug.cgi?id=1172634
+Patch93: freetype-2.5.3-hintmask.patch
+Patch94: freetype-2.5.3-hintmap.patch
+
Provides: freetype-bytecode
Provides: freetype-subpixel
@@ -39,6 +44,9 @@
%patch46 -p1 -b .enable-valid
+%patch93 -p1 -b .hintmask
+%patch94 -p1 -b .hintmap
+
%build
%configure --disable-static
@@ -77,6 +85,12 @@
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Fri Dec 12 2014 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.5.3-3
+- Add freetype-2.5.3-hintmask.patch from Fedora freetype (rh#1172634)
+ (Don't append to stem arrays after hintmask is constructed.)
+- Add freetype-2.5.3-hintmap.patch from Fedora freetype (rh#1172634)
+ (Suppress an assert when hintMap.count == 0 in specific situations.)
+
* Mon Sep 01 2014 Sérgio Basto <sergio(a)serjux.com> - 2.5.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
9 years, 4 months
rpms/pipelight/F-19 pipelight.spec,1.1,1.2
by Björn Esser
Author: besser82
Update of /cvs/nonfree/rpms/pipelight/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21525/F-19
Modified Files:
pipelight.spec
Log Message:
fix build, link against mingw-winpthreads-static
Index: pipelight.spec
===================================================================
RCS file: /cvs/nonfree/rpms/pipelight/F-19/pipelight.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pipelight.spec 10 Dec 2014 15:47:19 -0000 1.1
+++ pipelight.spec 11 Dec 2014 09:14:57 -0000 1.2
@@ -26,7 +26,7 @@
Name: pipelight
Version: 0.2.8
-Release: 1%{?gitrel}%{?dist}
+Release: 2%{?gitrel}%{?dist}
Summary: NPAPI Wrapper Plugin for using Windows plugins in Linux browsers
License: GPLv2+ or LGPLv2+ or MPLv1.1
@@ -45,8 +45,8 @@
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw64-gcc-c++
%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
-BuildRequires: mingw32-winpthreads
-BuildRequires: mingw64-winpthreads
+BuildRequires: mingw32-winpthreads-static
+BuildRequires: mingw64-winpthreads-static
%endif # 0%{?fedora} >= 20 || 0%{?rhel} >= 7
Requires: mozilla-filesystem%{?_isa}
@@ -107,9 +107,6 @@
%{__cp} -a debian/changelog ChangeLog
%{__cp} -a debian/copyright COPYRIGHT
-# Remove extra static-flag from mingw-linker-flags.
-%{__sed} -i -e 's![ \t*]-static"$!"!g' configure
-
# Replace the install-dependency-script with a more recent version
# from upstream's scm and fix it's hashbang.
%{__gpg} --batch --no-default-keyring --no-options --skip-verify \
@@ -190,6 +187,9 @@
%changelog
+* Thu Dec 11 2014 Björn Esser <bjoern.esser(a)gmail.com> - 0.2.8-2
+- fix build, link against mingw-winpthreads-static
+
* Wed Dec 10 2014 Björn Esser <bjoern.esser(a)gmail.com> - 0.2.8-1
- new upstream release v0.2.8
9 years, 4 months