[FlightGear] new upstream release
Fabrice Bellet
bellet at fedoraproject.org
Tue Sep 11 18:50:59 UTC 2012
commit ddf3382deaaabb60281281f686619334a658a2cd
Author: Fabrice Bellet <fabrice at bellet.info>
Date: Tue Sep 11 20:37:50 2012 +0200
new upstream release
.gitignore | 1 +
0001-add-zlib-dependency-to-fgadmin.patch | 24 -----------
...-sure-that-n-is-not-being-set-as-format-t.patch | 36 ++++++++++++----
0002-fix-build-with-gcc-4.7.0.patch | 24 -----------
...ch => 0002-use-snprintf-for-rotor-strings.patch | 29 +++++++++----
...ke-ShivaVG-and-FGAdminUI-static-libraries.patch | 44 ++++++++++++++++++++
FlightGear.spec | 21 +++++----
sources | 2 +-
8 files changed, 105 insertions(+), 76 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6605aab..27e08b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
FlightGear-2.0.0.tar.gz
/flightgear-2.4.0.tar.bz2
/flightgear-2.6.0.tar.bz2
+/flightgear-2.8.0.tar.bz2
diff --git a/flightgear-2.6.0-check-for-%n-in-printf-format-string.patch b/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
similarity index 63%
rename from flightgear-2.6.0-check-for-%n-in-printf-format-string.patch
rename to 0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
index a83ebde..bd0e849 100644
--- a/flightgear-2.6.0-check-for-%n-in-printf-format-string.patch
+++ b/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
@@ -1,7 +1,19 @@
-diff -up flightgear-2.6.0/src/Cockpit/panel.cxx.checkforn flightgear-2.6.0/src/Cockpit/panel.cxx
---- flightgear-2.6.0/src/Cockpit/panel.cxx.checkforn 2012-02-17 17:41:14.704313333 -0500
-+++ flightgear-2.6.0/src/Cockpit/panel.cxx 2012-05-29 21:01:31.264831372 -0400
-@@ -1209,8 +1209,18 @@ FGTextLayer::Chunk::Chunk (const string
+From e248cdad7bb3ca27bb598b87a18162c90ded5f26 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice at bellet.info>
+Date: Fri, 20 Jul 2012 16:34:05 +0200
+Subject: [PATCH 1/3] check to be sure that %n is not being set as format type
+ (CVE-2012-2090)
+
+---
+ src/Cockpit/panel.cxx | 28 ++++++++++++++++++++++++++--
+ src/Network/generic.cxx | 9 +++++++++
+ 2 files changed, 35 insertions(+), 2 deletions(-)
+
+diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
+index 3fbc199..c099aa8 100644
+--- a/src/Cockpit/panel.cxx
++++ b/src/Cockpit/panel.cxx
+@@ -1174,8 +1174,18 @@ FGTextLayer::Chunk::Chunk (const string &text, const string &fmt)
: _type(FGTextLayer::TEXT), _fmt(fmt)
{
_text = text;
@@ -22,7 +34,7 @@ diff -up flightgear-2.6.0/src/Cockpit/panel.cxx.checkforn flightgear-2.6.0/src/C
}
FGTextLayer::Chunk::Chunk (ChunkType type, const SGPropertyNode * node,
-@@ -1223,6 +1233,20 @@ FGTextLayer::Chunk::Chunk (ChunkType typ
+@@ -1188,6 +1198,20 @@ FGTextLayer::Chunk::Chunk (ChunkType type, const SGPropertyNode * node,
_fmt = "%s";
else
_fmt = "%.2f";
@@ -43,10 +55,11 @@ diff -up flightgear-2.6.0/src/Cockpit/panel.cxx.checkforn flightgear-2.6.0/src/C
}
_node = node;
}
-diff -up flightgear-2.6.0/src/Network/generic.cxx.checkforn flightgear-2.6.0/src/Network/generic.cxx
---- flightgear-2.6.0/src/Network/generic.cxx.checkforn 2012-02-17 17:41:16.428329558 -0500
-+++ flightgear-2.6.0/src/Network/generic.cxx 2012-05-29 20:50:37.212255822 -0400
-@@ -205,6 +205,8 @@ bool FGGeneric::gen_message_binary() {
+diff --git a/src/Network/generic.cxx b/src/Network/generic.cxx
+index 21f048c..96f6364 100644
+--- a/src/Network/generic.cxx
++++ b/src/Network/generic.cxx
+@@ -206,6 +206,8 @@ bool FGGeneric::gen_message_binary() {
bool FGGeneric::gen_message_ascii() {
string generic_sentence;
@@ -55,7 +68,7 @@ diff -up flightgear-2.6.0/src/Network/generic.cxx.checkforn flightgear-2.6.0/src
char tmp[255];
length = 0;
-@@ -215,6 +217,13 @@ bool FGGeneric::gen_message_ascii() {
+@@ -216,6 +218,13 @@ bool FGGeneric::gen_message_ascii() {
generic_sentence += var_separator;
}
@@ -69,3 +82,6 @@ diff -up flightgear-2.6.0/src/Network/generic.cxx.checkforn flightgear-2.6.0/src
switch (_out_message[i].type) {
case FG_INT:
val = _out_message[i].offset +
+--
+1.7.10.4
+
diff --git a/flightgear-2.6.0-use-snprintf-for-rotor-strings.patch b/0002-use-snprintf-for-rotor-strings.patch
similarity index 80%
rename from flightgear-2.6.0-use-snprintf-for-rotor-strings.patch
rename to 0002-use-snprintf-for-rotor-strings.patch
index d4c4d85..1a5c73a 100644
--- a/flightgear-2.6.0-use-snprintf-for-rotor-strings.patch
+++ b/0002-use-snprintf-for-rotor-strings.patch
@@ -1,7 +1,17 @@
-diff -up flightgear-2.6.0/src/FDM/YASim/Rotor.cpp.rotornamemax256 flightgear-2.6.0/src/FDM/YASim/Rotor.cpp
---- flightgear-2.6.0/src/FDM/YASim/Rotor.cpp.rotornamemax256 2012-05-29 21:17:49.674896892 -0400
-+++ flightgear-2.6.0/src/FDM/YASim/Rotor.cpp 2012-05-29 21:20:51.004474076 -0400
-@@ -274,7 +274,7 @@ int Rotor::getValueforFGSet(int j,char *
+From f79e6f12523d2256ef5d60a2fa33a4a87a001055 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice at bellet.info>
+Date: Fri, 20 Jul 2012 16:35:36 +0200
+Subject: [PATCH 2/3] use snprintf for rotor strings
+
+---
+ src/FDM/YASim/Rotor.cpp | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/FDM/YASim/Rotor.cpp b/src/FDM/YASim/Rotor.cpp
+index 79e5fd1..1e93ecc 100644
+--- a/src/FDM/YASim/Rotor.cpp
++++ b/src/FDM/YASim/Rotor.cpp
+@@ -274,7 +274,7 @@ int Rotor::getValueforFGSet(int j,char *text,float *f)
if (4>numRotorparts()) return 0; //compile first!
if (j==0)
{
@@ -10,7 +20,7 @@ diff -up flightgear-2.6.0/src/FDM/YASim/Rotor.cpp.rotornamemax256 flightgear-2.6
*f=(_balance1>-1)?( ((Rotorpart*)getRotorpart(0))->getrealAlpha()
+((Rotorpart*)getRotorpart(1*(_number_of_parts>>2)))->getrealAlpha()
+((Rotorpart*)getRotorpart(2*(_number_of_parts>>2)))->getrealAlpha()
-@@ -284,7 +284,7 @@ int Rotor::getValueforFGSet(int j,char *
+@@ -284,7 +284,7 @@ int Rotor::getValueforFGSet(int j,char *text,float *f)
else
if (j==1)
{
@@ -19,7 +29,7 @@ diff -up flightgear-2.6.0/src/FDM/YASim/Rotor.cpp.rotornamemax256 flightgear-2.6
_roll = ( ((Rotorpart*)getRotorpart(0))->getrealAlpha()
-((Rotorpart*)getRotorpart(2*(_number_of_parts>>2)))->getrealAlpha()
)/2*(_ccw?-1:1);
-@@ -293,7 +293,7 @@ int Rotor::getValueforFGSet(int j,char *
+@@ -293,7 +293,7 @@ int Rotor::getValueforFGSet(int j,char *text,float *f)
else
if (j==2)
{
@@ -28,7 +38,7 @@ diff -up flightgear-2.6.0/src/FDM/YASim/Rotor.cpp.rotornamemax256 flightgear-2.6
_yaw=( ((Rotorpart*)getRotorpart(1*(_number_of_parts>>2)))->getrealAlpha()
-((Rotorpart*)getRotorpart(3*(_number_of_parts>>2)))->getrealAlpha()
)/2;
-@@ -302,38 +302,38 @@ int Rotor::getValueforFGSet(int j,char *
+@@ -302,38 +302,38 @@ int Rotor::getValueforFGSet(int j,char *text,float *f)
else
if (j==3)
{
@@ -74,7 +84,7 @@ diff -up flightgear-2.6.0/src/FDM/YASim/Rotor.cpp.rotornamemax256 flightgear-2.6
*f=-_torque;;
}
else
-@@ -344,7 +344,7 @@ int Rotor::getValueforFGSet(int j,char *
+@@ -344,7 +344,7 @@ int Rotor::getValueforFGSet(int j,char *text,float *f)
return 0;
}
int w=j%3;
@@ -83,3 +93,6 @@ diff -up flightgear-2.6.0/src/FDM/YASim/Rotor.cpp.rotornamemax256 flightgear-2.6
_name,b,
w==0?"position-deg":(w==1?"flap-deg":"incidence-deg"));
*f=((Rotorpart*)getRotorpart(0))->getPhi()*180/pi
+--
+1.7.10.4
+
diff --git a/0003-make-ShivaVG-and-FGAdminUI-static-libraries.patch b/0003-make-ShivaVG-and-FGAdminUI-static-libraries.patch
new file mode 100644
index 0000000..fdeed7b
--- /dev/null
+++ b/0003-make-ShivaVG-and-FGAdminUI-static-libraries.patch
@@ -0,0 +1,44 @@
+From 5baa6a306cfe81d7743c6f968c90b8fb774d0503 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice at bellet.info>
+Date: Fri, 20 Jul 2012 17:35:57 +0200
+Subject: [PATCH 3/3] make ShivaVG and FGAdminUI static libraries
+
+---
+ src/Canvas/ShivaVG/src/CMakeLists.txt | 3 ++-
+ utils/fgadmin/src/CMakeLists.txt | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/Canvas/ShivaVG/src/CMakeLists.txt b/src/Canvas/ShivaVG/src/CMakeLists.txt
+index 63dcdef..00524a7 100644
+--- a/src/Canvas/ShivaVG/src/CMakeLists.txt
++++ b/src/Canvas/ShivaVG/src/CMakeLists.txt
+@@ -38,6 +38,7 @@ SET(ShivaVG_Src
+
+ ADD_LIBRARY(
+ ShivaVG
++ STATIC
+ ${ShivaVG_Src}
+ )
+
+@@ -45,4 +46,4 @@ TARGET_LINK_LIBRARIES(
+ ShivaVG
+ ${OPENGL_gl_LIBRARY}
+ ${OPENGL_glu_LIBRARY}
+-)
+\ No newline at end of file
++)
+diff --git a/utils/fgadmin/src/CMakeLists.txt b/utils/fgadmin/src/CMakeLists.txt
+index 42b95d7..793452e 100644
+--- a/utils/fgadmin/src/CMakeLists.txt
++++ b/utils/fgadmin/src/CMakeLists.txt
+@@ -1,6 +1,6 @@
+
+ fltk_wrap_ui(FGAdminUI fgadmin.fl)
+-add_library(FGAdminUI ${FGAdminUI_FLTK_UI_SRCS})
++add_library(FGAdminUI STATIC ${FGAdminUI_FLTK_UI_SRCS})
+
+ add_executable(fgadmin fgadmin_funcs.cxx main.cxx untarka.c)
+ add_dependencies(fgadmin FGAdminUI)
+--
+1.7.10.4
+
diff --git a/FlightGear.spec b/FlightGear.spec
index 5e7f93d..86a8f5d 100644
--- a/FlightGear.spec
+++ b/FlightGear.spec
@@ -1,10 +1,10 @@
Name: FlightGear
Summary: The FlightGear Flight Simulator
-Version: 2.6.0
-Release: 3%{?dist}
+Version: 2.8.0
+Release: 1%{?dist}
License: GPLv2+
Group: Amusements/Games
-Source: http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-%{version}.tar.bz2
+Source0: http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-%{version}.tar.bz2
Source1: %{name}.desktop
# these icons were previously available from
# http://jrbabcock.home.comcast.net/flightgear/icons
@@ -14,17 +14,18 @@ Source4: fg-48.png
Source5: fg-64.png
Source6: fg-128.png
Source7: COPYING
-Patch1: 0001-add-zlib-dependency-to-fgadmin.patch
-Patch2: 0002-fix-build-with-gcc-4.7.0.patch
-Patch3: flightgear-2.6.0-check-for-%n-in-printf-format-string.patch
-Patch4: flightgear-2.6.0-use-snprintf-for-rotor-strings.patch
+Patch1: 0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
+Patch2: 0002-use-snprintf-for-rotor-strings.patch
+Patch3: 0003-make-ShivaVG-and-FGAdminUI-static-libraries.patch
+
URL: http://www.flightgear.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openal-soft-devel >= 1.11.753, SimGear-devel >= %{version}
BuildRequires: libpng-devel, freeglut-devel, libXi-devel, libXmu-devel
BuildRequires: OpenSceneGraph-devel >= 2.8.0, boost-devel >= 1.37.0
BuildRequires: desktop-file-utils, apr-devel, subversion-devel
-Requires: FlightGear-data >= 2.4.0, opengl-games-utils
+BuildRequires: cmake
+Requires: FlightGear-data >= 2.8.0, opengl-games-utils
Requires: hicolor-icon-theme
%description
@@ -38,7 +39,6 @@ expanded and improved upon by anyone interested in contributing
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
# make rpmlint happy
find -name \*.h -o -name \*.cpp -o -name \*.cxx -o -name \*.hxx \
@@ -120,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Tue Sep 11 2012 Fabrice Bellet <fabrice at bellet.info> 2.8.0-1
+- new upstream release
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 8f10261..ef73c83 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-943f784f55c7e11ddce6082d2d1dbba4 flightgear-2.6.0.tar.bz2
+9499194146f414323efef8cb3451b750 flightgear-2.8.0.tar.bz2
More information about the scm-commits
mailing list