[maxima] rebuild (sbcl)
by Rex Dieter
commit 8755b73606c427676664bfbcf56f551779451df1
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Mon Sep 30 12:07:00 2013 -0500
rebuild (sbcl)
maxima.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/maxima.spec b/maxima.spec
index 4bd00a9..0989d3b 100644
--- a/maxima.spec
+++ b/maxima.spec
@@ -8,7 +8,7 @@ Summary: Symbolic Computation Program
Name: maxima
Version: 5.31.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
Group: Applications/Engineering
URL: http://maxima.sourceforge.net/
@@ -463,6 +463,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Sep 30 2013 Rex Dieter <rdieter(a)fedoraproject.org> 5.31.1-2
+- rebuild (sbcl)
+
* Fri Sep 27 2013 Rex Dieter <rdieter(a)fedoraproject.org> 5.31.1-1
- 5.31.1
8Â years, 10Â months
[fgrun/f20] new upstream release
by Fabrice Bellet
Summary of changes:
4775254... new upstream release (*)
(*) This commit already existed in another branch; no separate mail sent
8Â years, 10Â months
[fgrun] new upstream release
by Fabrice Bellet
commit 477525491a94104b8ecfb24cf769c512ba96191c
Author: Fabrice Bellet <fabrice(a)bellet.info>
Date: Mon Sep 30 18:44:20 2013 +0200
new upstream release
.gitignore | 1 +
0001-Build-fgrun-with-static-ui-libs.patch | 29 ++++++++++++++++++
0002-Fix-a-crash-when-setting-defaults.patch | 32 ++++++++++++++++++++
0003-Default-settings-for-Fedora.patch | 29 ++++++++++++++++++
...-logic.patch => 0004-Fix-reloadPath-logic.patch | 24 ++++++++++++---
0005-Update-required-SimGear-version.patch | 25 +++++++++++++++
fgrun-1.6.1-build-fgrun-with-static-ui-libs.patch | 16 ----------
fgrun-1.6.1-fix-crash-when-setting-defaults.patch | 18 -----------
fgrun-1.6.2-default-settings-for-fedora.patch | 15 ---------
fgrun-1.6.2-update-required-simgear-version.patch | 12 -------
fgrun.spec | 23 ++++++++-----
sources | 2 +-
12 files changed, 150 insertions(+), 76 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 720cd90..fb753bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/fgrun-1.6.0.svn20110905.tar.gz
/fgrun-1.6.1.tar.bz2
/fgrun-1.6.2.tar.bz2
+/fgrun-1.7.0.tar.bz2
diff --git a/0001-Build-fgrun-with-static-ui-libs.patch b/0001-Build-fgrun-with-static-ui-libs.patch
new file mode 100644
index 0000000..8ed8206
--- /dev/null
+++ b/0001-Build-fgrun-with-static-ui-libs.patch
@@ -0,0 +1,29 @@
+From 8929f60c84d46b499750c4c0045796ce6ed2ebbb Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice(a)bellet.info>
+Date: Sun, 22 Sep 2013 12:50:32 +0200
+Subject: [PATCH 1/5] Build fgrun with static ui libs
+
+---
+ src/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 99dfdb8..a731b21 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -16,10 +16,10 @@ if (MSVC)
+ endif (MSVC)
+
+ FLTK_WRAP_UI(Wizard wizard.fl)
+-add_library(Wizard ${Wizard_FLTK_UI_SRCS})
++add_library(Wizard STATIC ${Wizard_FLTK_UI_SRCS})
+
+ FLTK_WRAP_UI(Advanced advanced.fl)
+-add_library(Advanced ${Advanced_FLTK_UI_SRCS})
++add_library(Advanced STATIC ${Advanced_FLTK_UI_SRCS})
+
+ set( ui_libs_1_3 Wizard Advanced )
+
+--
+1.8.3.1
+
diff --git a/0002-Fix-a-crash-when-setting-defaults.patch b/0002-Fix-a-crash-when-setting-defaults.patch
new file mode 100644
index 0000000..be89a40
--- /dev/null
+++ b/0002-Fix-a-crash-when-setting-defaults.patch
@@ -0,0 +1,32 @@
+From e0efeca270bde19245cc557ca17527097d76e533 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice(a)bellet.info>
+Date: Sun, 22 Sep 2013 12:52:15 +0200
+Subject: [PATCH 2/5] Fix a crash when setting defaults
+
+---
+ src/wizard_funcs.cxx | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/wizard_funcs.cxx b/src/wizard_funcs.cxx
+index 120f6da..23446d2 100644
+--- a/src/wizard_funcs.cxx
++++ b/src/wizard_funcs.cxx
+@@ -1299,7 +1299,6 @@ Wizard::~Wizard()
+ aircraft->clear();
+
+ delete logwin;
+- delete win;
+ delete adv;
+ }
+
+@@ -2383,7 +2382,6 @@ Wizard::reset_settings()
+ prefs.set( "time_of_day_value", "noon" );
+
+ aircraft->value( 0 );
+- preview->make_current();
+ preview->clear();
+ preview->redraw();
+
+--
+1.8.3.1
+
diff --git a/0003-Default-settings-for-Fedora.patch b/0003-Default-settings-for-Fedora.patch
new file mode 100644
index 0000000..776d700
--- /dev/null
+++ b/0003-Default-settings-for-Fedora.patch
@@ -0,0 +1,29 @@
+From 14f9883a8d054692c09f7c9b43dc1c2f54691886 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice(a)bellet.info>
+Date: Sun, 22 Sep 2013 12:53:13 +0200
+Subject: [PATCH 3/5] Default settings for Fedora
+
+---
+ fgrun.prefs | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/fgrun.prefs b/fgrun.prefs
+index c52be0b..7abb907 100644
+--- a/fgrun.prefs
++++ b/fgrun.prefs
+@@ -4,8 +4,9 @@
+
+ [.]
+
+-fg_exe:/usr/local/bin/fgfs
+-fg_root:/usr/local/lib/FlightGear/data
+-fg_scenery:/usr/local/lib/FlightGear/data/Scenery
++fg_exe:/usr/bin/fgfs
++fg_root:/usr/share/flightgear
++fg_scenery:/usr/share/flightgear/Scenery
++ts_exe:/usr/bin/terrasync
+ aircraft:c172-3d
+ airport:KSFO
+--
+1.8.3.1
+
diff --git a/fgrun-1.6.2-fix-reloadpath-logic.patch b/0004-Fix-reloadPath-logic.patch
similarity index 58%
rename from fgrun-1.6.2-fix-reloadpath-logic.patch
rename to 0004-Fix-reloadPath-logic.patch
index 0fb9006..1fe46f1 100644
--- a/fgrun-1.6.2-fix-reloadpath-logic.patch
+++ b/0004-Fix-reloadPath-logic.patch
@@ -1,6 +1,17 @@
---- fgrun-1.6.2/src/wizard_funcs.cxx.orig 2012-09-11 14:57:53.176639212 +0200
-+++ fgrun-1.6.2/src/wizard_funcs.cxx 2012-09-11 15:11:35.995000085 +0200
-@@ -296,7 +296,7 @@
+From f84acb38f39cc5a98159a19ec2c3b67d64b0ce87 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice(a)bellet.info>
+Date: Sun, 22 Sep 2013 12:54:45 +0200
+Subject: [PATCH 4/5] Fix reloadPath logic
+
+---
+ src/wizard_funcs.cxx | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/wizard_funcs.cxx b/src/wizard_funcs.cxx
+index 23446d2..59be533 100644
+--- a/src/wizard_funcs.cxx
++++ b/src/wizard_funcs.cxx
+@@ -299,7 +299,7 @@ Wizard::reset()
{
fg_scenery = buf;
}
@@ -9,7 +20,7 @@
{
fg_scenery = buf;
prefs.set("fg_scenery", buf);
-@@ -338,7 +338,7 @@
+@@ -333,7 +333,7 @@ Wizard::reset()
{
ts_dir = iVal;
}
@@ -18,7 +29,7 @@
{
prefs.set("ts_dir", ts_dir);
systemPrefs.get("ts_dir_init", iVal, 0);
-@@ -353,7 +353,7 @@
+@@ -356,7 +356,7 @@ Wizard::reset()
{
ts_exe_->value(buf);
}
@@ -27,3 +38,6 @@
{
ts_exe_->value( buf );
prefs.set("ts_exe", buf);
+--
+1.8.3.1
+
diff --git a/0005-Update-required-SimGear-version.patch b/0005-Update-required-SimGear-version.patch
new file mode 100644
index 0000000..9f37d95
--- /dev/null
+++ b/0005-Update-required-SimGear-version.patch
@@ -0,0 +1,25 @@
+From 436f659bdcef3726ece7928e221ba7ea7805381e Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice(a)bellet.info>
+Date: Sun, 22 Sep 2013 12:55:33 +0200
+Subject: [PATCH 5/5] Update required SimGear version
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aa95c59..4b6fea5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -131,7 +131,7 @@ find_package(Boost REQUIRED)
+ find_package(ZLIB REQUIRED)
+ find_package(FLTK REQUIRED)
+ find_package(OpenSceneGraph 2.8.1 REQUIRED osgText osgDB osgParticle osgUtil osgViewer osgGA)
+-find_package(SimGear 2.8.0 REQUIRED)
++find_package(SimGear 2.12.0 REQUIRED)
+ if (ENABLE_NLS)
+ find_package(Gettext)
+ endif (ENABLE_NLS)
+--
+1.8.3.1
+
diff --git a/fgrun.spec b/fgrun.spec
index b6882a1..2900bd5 100644
--- a/fgrun.spec
+++ b/fgrun.spec
@@ -1,11 +1,13 @@
Name: fgrun
Summary: Graphical front-end for launching FlightGear flight simulator
-Version: 1.6.2
-Release: 8%{?dist}
+Version: 1.7.0
+Release: 1%{?dist}
License: GPLv2+ and CC-BY-SA
Group: Amusements/Games
URL: http://sourceforge.net/projects/fgrun
-Source0: http://sourceforge.net/projects/fgrun/files/fgrun/%{version}/fgrun-%{vers...
+# git clone git://gitorious.org/fg/fgrun.git
+# git archive --format=tar.bz2 -o fgrun-1.7.0.tar.bz2 --prefix=fgrun-1.7.0/ origin/release/1.7.0
+Source0: %{name}-%{version}.tar.bz2
Source1: %{name}.desktop
Source2: README.Fedora
# The icon is licensed under the CC Attribution-Share Alike 3.0 license
@@ -16,11 +18,11 @@ Source12: Bt_plane-32.png
Source13: Bt_plane-48.png
Source14: Bt_plane-64.png
Source15: Bt_plane-128.png
-Patch0: fgrun-1.6.1-build-fgrun-with-static-ui-libs.patch
-Patch1: fgrun-1.6.1-fix-crash-when-setting-defaults.patch
-Patch2: fgrun-1.6.2-default-settings-for-fedora.patch
-Patch3: fgrun-1.6.2-fix-reloadpath-logic.patch
-Patch4: fgrun-1.6.2-update-required-simgear-version.patch
+Patch1: 0001-Build-fgrun-with-static-ui-libs.patch
+Patch2: 0002-Fix-a-crash-when-setting-defaults.patch
+Patch3: 0003-Default-settings-for-Fedora.patch
+Patch4: 0004-Fix-reloadPath-logic.patch
+Patch5: 0005-Update-required-SimGear-version.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: FlightGear, opengl-games-utils, hicolor-icon-theme
BuildRequires: SimGear-devel >= 2.6.0
@@ -35,11 +37,11 @@ FlightGear flight simulator
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
cp -a %{SOURCE2} .
%build
@@ -109,6 +111,9 @@ rm -fr %{buildroot}
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Sun Sep 22 2013 Fabrice Bellet <fabrice(a)bellet.info> - 1.7.0-1
+- new upstream release
+
* Thu Aug 15 2013 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 1.6.2-8
- Rebuilt for OSG-3.2.0.
diff --git a/sources b/sources
index ae87bbc..b00fadb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-683c0f97be2163e85a518ee706d92177 fgrun-1.6.2.tar.bz2
+ef6169a2da4a7cd53fa5147b5ef846dd fgrun-1.7.0.tar.bz2
8Â years, 10Â months
[gdl] Update to 0.9.4 - Update build patch - drop automake components - New python patch to fix python bui
by Orion Poplawski
commit 41bcadafb4afeb8bdd2af59ed44cfb3e4512e954
Author: Orion Poplawski <orion(a)nwra.com>
Date: Mon Sep 30 10:42:28 2013 -0600
Update to 0.9.4
- Update build patch - drop automake components
- New python patch to fix python build
.gitignore | 1 +
gdl-build.patch | 12 -
gdl-cvs.patch |76781 ------------------------------------------------------
gdl-python.patch | 12 +
gdl.spec | 17 +-
sources | 2 +-
6 files changed, 25 insertions(+), 76800 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8d12c58..2529a50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ gdl-0.9rc4.tar.gz
/gdl-0.9.1.tar.gz
/gdl-0.9.2.tar.gz
/gdl-0.9.3.tar.gz
+/gdl-0.9.4.tar.gz
diff --git a/gdl-build.patch b/gdl-build.patch
index 750d4d7..6997995 100644
--- a/gdl-build.patch
+++ b/gdl-build.patch
@@ -1,15 +1,3 @@
-diff -up gdl-0.9.2/testsuite/Makefile.am.build gdl-0.9.2/testsuite/Makefile.am
---- gdl-0.9.2/testsuite/Makefile.am.build 2012-05-10 15:11:37.730137963 -0600
-+++ gdl-0.9.2/testsuite/Makefile.am 2012-05-10 16:15:25.312948418 -0600
-@@ -2,7 +2,7 @@ check_LTLIBRARIES = libtest_ce.la
- libtest_ce_la_SOURCES = libtest_ce.cpp
- libtest_ce_la_LDFLAGS = -rpath $(abs_srcdir)/testsuite/.libs
-
--TESTS_ENVIRONMENT = $(top_srcdir)/testsuite/try $(top_srcdir)
-+TESTS_ENVIRONMENT = $(top_srcdir)/testsuite/try $(top_srcdir) $(top_builddir)
- TESTS = \
- test_angles.pro \
- test_base64.pro \
diff -up gdl-0.9.2/testsuite/try.build gdl-0.9.2/testsuite/try
--- gdl-0.9.2/testsuite/try.build 2011-05-02 05:00:47.000000000 -0600
+++ gdl-0.9.2/testsuite/try 2012-05-10 16:16:14.218180027 -0600
diff --git a/gdl-python.patch b/gdl-python.patch
new file mode 100644
index 0000000..709f8c1
--- /dev/null
+++ b/gdl-python.patch
@@ -0,0 +1,12 @@
+diff -up gdl-0.9.4/src/pythongdl.cpp.python gdl-0.9.4/src/pythongdl.cpp
+--- gdl-0.9.4/src/pythongdl.cpp.python 2013-07-26 03:30:32.000000000 -0600
++++ gdl-0.9.4/src/pythongdl.cpp 2013-09-30 10:24:27.092666180 -0600
+@@ -373,7 +373,7 @@ PyObject *GDLSub( PyObject *self, PyObje
+ if( libCall)
+ e = new EnvT( NULL, sub);
+ else
+- e = new EnvUDT( NULL, sub);
++ e = new EnvUDT( NULL, static_cast<DSubUD*>(sub));
+
+ Guard< EnvBaseT> e_guard( e);
+
diff --git a/gdl.spec b/gdl.spec
index 7c548ab..a3af7b2 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -1,8 +1,8 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: gdl
-Version: 0.9.3
-Release: 10.cvs20130731%{?dist}
+Version: 0.9.4
+Release: 1%{?dist}
Summary: GNU Data Language
Group: Applications/Engineering
@@ -12,7 +12,6 @@ Source0: http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{versi
Source1: gdl.csh
Source2: gdl.sh
Source3: makecvstarball
-Patch0: gdl-cvs.patch
# Build with system antlr library. Request for upstream change here:
# https://sourceforge.net/tracker/index.php?func=detail&aid=2685215&group_i...
Patch1: gdl-antlr-auto.patch
@@ -23,6 +22,9 @@ Patch3: gdl-build.patch
# Patch to support plplot's new width() function
# https://sourceforge.net/p/gnudatalanguage/patches/70/
Patch4: gdl-plwidth.patch
+# Fix python build
+# https://sourceforge.net/p/gnudatalanguage/bugs/552/
+Patch5: gdl-python.patch
Patch13: gdl-0.9-antlr-cmake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -98,7 +100,6 @@ Provides: %{name}-runtime = %{version}-%{release}
%prep
%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .cvs
rm -rf src/antlr
%patch13 -p1 -b .antlr
pushd src
@@ -110,8 +111,7 @@ popd
%patch2 -p1 -b .shared
%patch3 -p1 -b .build
%patch4 -p1 -b .plwidth
-rm ltmain.sh
-rm -r CMakeFiles
+%patch5 -p1 -b .python
%global cmake_opts \\\
-DWXWIDGETS=ON \\\
@@ -196,6 +196,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Sep 30 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.9.4-1
+- Update to 0.9.4
+- Update build patch - drop automake components
+- New python patch to fix python build
+
* Tue Aug 27 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.9.3-10.cvs20130804
- Add patch to support new width() method in plplot
diff --git a/sources b/sources
index 2ad5818..9111d52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f4a8f64e90dec5de1c89a2aca42d9e75 gdl-0.9.3.tar.gz
+5d8d5783a387cca264fe8edb09e04f10 gdl-0.9.4.tar.gz
8Â years, 10Â months
[FlightGear-Atlas] new snapshot
by Fabrice Bellet
commit a6c8e19c44effdc538e63c8528053e93bc589c64
Author: Fabrice Bellet <fabrice(a)bellet.info>
Date: Mon Sep 30 18:39:08 2013 +0200
new snapshot
.gitignore | 1 +
Atlas-0.4.9-init-render-config-dialog.patch | 12 ------------
FlightGear-Atlas.spec | 9 +++++----
sources | 3 +--
4 files changed, 7 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 647478d..3bf9cf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ Atlas-0.4.0-default-maps.tar.gz
/atlas-0.4.8.cvs20110905.tar.gz
/Atlas-0.4.9.cvs20120219.tar.bz2
/Atlas-0.4.9.cvs20120911.tar.bz2
+/Atlas-0.4.9.cvs20130922.tar.bz2
diff --git a/FlightGear-Atlas.spec b/FlightGear-Atlas.spec
index f13fe89..b93296f 100644
--- a/FlightGear-Atlas.spec
+++ b/FlightGear-Atlas.spec
@@ -1,15 +1,14 @@
-%define snapshot .cvs20120911
+%define snapshot .cvs20130922
Name: FlightGear-Atlas
Summary: Flightgear map tools
Version: 0.4.9
-Release: 0.12%{snapshot}%{?dist}
+Release: 0.13%{snapshot}%{?dist}
License: GPLv2+
Group: Amusements/Games
Source0: Atlas-%{version}%{snapshot}.tar.bz2
Source1: Atlas-0.4.0-default-maps.tar.gz
-Patch0: Atlas-0.4.9-init-render-config-dialog.patch
URL: http://atlas.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: freeglut-devel, curl-devel, libpng-devel, glew-devel
@@ -26,7 +25,6 @@ Atlas viewer
%prep
%setup -q -n Atlas
-%patch0 -p1
find -type f -name '*.[hc]xx' -exec chmod a-x {} \;
%build
@@ -66,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/flightgear/Atlas
%changelog
+* Sun Sep 22 2013 Fabrice Bellet <fabrice(a)bellet.info> - 0.4.9-0.13.cvs20130922
+- new snapshot
+
* Fri Aug 02 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.4.9-0.12.cvs20120911
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 562e63e..0014db7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-0a429e66e0cf20e049eaff61ebbcba0f Atlas-0.4.9.cvs20120911.tar.bz2
-ad39040ecb18627f695d4a3c852db81b Atlas-0.4.0-default-maps.tar.gz
+ade3561b240a3c982e7048f4b0802550 Atlas-0.4.9.cvs20130922.tar.bz2
8Â years, 10Â months
[FlightGear] new upstream release
by Fabrice Bellet
commit dfbee8196bd67f4686da904704169789864e3d2c
Author: Fabrice Bellet <fabrice(a)bellet.info>
Date: Mon Sep 30 18:35:19 2013 +0200
new upstream release
.gitignore | 1 +
...-sure-that-n-is-not-being-set-as-format-t.patch | 108 +++----------------
...ke-ShivaVG-and-FGAdminUI-static-libraries.patch | 24 +++++
0002-use-snprintf-for-rotor-strings.patch | 98 ------------------
...ke-ShivaVG-and-FGAdminUI-static-libraries.patch | 15 ---
FlightGear.spec | 11 +-
sources | 2 +-
7 files changed, 49 insertions(+), 210 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index beb1d46..5ebbca1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ FlightGear-2.0.0.tar.gz
/flightgear-2.6.0.tar.bz2
/flightgear-2.8.0.tar.bz2
/flightgear-2.10.0.tar.bz2
+/flightgear-2.12.0.tar.bz2
diff --git a/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch b/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
index 1b033cf..a3788bf 100644
--- a/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
+++ b/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
@@ -1,107 +1,33 @@
-From 611140c83aefbd72a8e099dce8595e1d6fc85766 Mon Sep 17 00:00:00 2001
+From 78d250ca468bcaa1dfb8f658d75ae324467bb9d6 Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Sun, 19 May 2013 16:53:09 +0200
-Subject: [PATCH 1/3] check to be sure that %n is not being set as format type
+Date: Sun, 22 Sep 2013 12:19:18 +0200
+Subject: [PATCH 1/2] check to be sure that %n is not being set as format type
(CVE-2012-2090)
---
- src/Cockpit/panel.cxx | 26 +++++++++++++++++++++++++-
- src/Environment/fgclouds.cxx | 9 +++++++++
- src/Network/generic.cxx | 9 +++++++++
- 3 files changed, 43 insertions(+), 1 deletion(-)
+ src/Environment/fgclouds.cxx | 9 +++++++++
+ 1 file changed, 9 insertions(+)
-diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
-index 3fbc199..09fb885 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;
-- if (_fmt.empty())
-+ if (_fmt.empty()) {
- _fmt = "%s";
-+ } else {
-+ // It is never safe for _fmt.c_str to be %n.
-+ string unsafe ("%n");
-+ size_t found;
-+ found=_fmt.find(unsafe);
-+ if (found!=string::npos) {
-+ SG_LOG(SG_COCKPIT, SG_WARN, "format type contained %n, but this is unsafe, reverting to %s");
-+ _fmt = "%s";
-+ }
-+ }
- }
-
- FGTextLayer::Chunk::Chunk (ChunkType type, const SGPropertyNode * node,
-@@ -1188,6 +1198,20 @@ FGTextLayer::Chunk::Chunk (ChunkType type, const SGPropertyNode * node,
- _fmt = "%s";
- else
- _fmt = "%.2f";
-+ } else {
-+ // It is never safe for _fmt.c_str to be %n.
-+ string unsafe ("%n");
-+ size_t found;
-+ found=_fmt.find(unsafe);
-+ if (found!=string::npos) {
-+ if (type == TEXT_VALUE) {
-+ SG_LOG(SG_COCKPIT, SG_WARN, "format type contained %n, but this is unsafe, reverting to %s");
-+ _fmt = "%s";
-+ } else {
-+ SG_LOG(SG_COCKPIT, SG_WARN, "format type contained %n, but this is unsafe, reverting to %.2f");
-+ _fmt = "%.2f";
-+ }
-+ }
- }
- _node = node;
- }
diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx
-index d5db1ed..33b9f42 100644
+index 6e77d9b..b17e53a 100644
--- a/src/Environment/fgclouds.cxx
+++ b/src/Environment/fgclouds.cxx
-@@ -224,6 +224,15 @@ void FGClouds::buildLayer(int iLayer, const string& name, double coverage) {
+@@ -214,6 +214,15 @@ void FGClouds::buildLayer(int iLayer, const string& name, double coverage) {
+ double count = acloud->getDoubleValue("count", 1.0);
tCloudVariety[CloudVarietyCount].count = count;
int variety = 0;
- cloud_name = cloud_name + "-%d";
-+ // It is never safe for cloud_name.c_str to be %n.
-+ string unsafe ("%n");
-+ size_t found;
++ // It is never safe for cloud_name.c_str to be %n.
++ string unsafe ("%n");
++ size_t found;
+
-+ found=cloud_name.find(unsafe);
-+ if (found!=string::npos) {
-+ SG_LOG(SG_GENERAL, SG_ALERT, "format type contained %n, but this is unsafe , ignore it");
-+ continue;
-+ }
++ found=cloud_name.find(unsafe);
++ if (found!=string::npos) {
++ SG_LOG(SG_GENERAL, SG_ALERT, "format type contained %n, but this is unsafe , ignore it");
++ continue;
++ }
char variety_name[50];
do {
variety++;
-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;
-+ string unsafe ("%n");
-+ size_t found;
- char tmp[255];
- length = 0;
-
-@@ -216,6 +218,13 @@ bool FGGeneric::gen_message_ascii() {
- generic_sentence += var_separator;
- }
-
-+ // It is never safe for _out_message[i].format.c_str to be %n.
-+ found=_out_message[i].format.find(unsafe);
-+ if (found!=string::npos) {
-+ SG_LOG(SG_COCKPIT, SG_WARN, "format type contained %n, but this is unsafe, reverting to %s");
-+ _out_message[i].format = "%s";
-+ }
-+
- switch (_out_message[i].type) {
- case FG_INT:
- val = _out_message[i].offset +
--
-1.8.1.4
+1.8.3.1
diff --git a/0002-make-ShivaVG-and-FGAdminUI-static-libraries.patch b/0002-make-ShivaVG-and-FGAdminUI-static-libraries.patch
new file mode 100644
index 0000000..d154ee7
--- /dev/null
+++ b/0002-make-ShivaVG-and-FGAdminUI-static-libraries.patch
@@ -0,0 +1,24 @@
+From e98eafec87cd3e506dbf0af294c6aec52214162d Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice(a)bellet.info>
+Date: Sun, 22 Sep 2013 12:21:23 +0200
+Subject: [PATCH 2/2] make ShivaVG and FGAdminUI static libraries
+
+---
+ utils/fgadmin/src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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.8.3.1
+
diff --git a/FlightGear.spec b/FlightGear.spec
index 322b31f..0f76830 100644
--- a/FlightGear.spec
+++ b/FlightGear.spec
@@ -1,7 +1,7 @@
Name: FlightGear
Summary: The FlightGear Flight Simulator
-Version: 2.10.0
-Release: 8%{?dist}
+Version: 2.12.0
+Release: 1%{?dist}
License: GPLv2+
Group: Amusements/Games
Source0: http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-%...
@@ -15,8 +15,7 @@ Source5: fg-64.png
Source6: fg-128.png
Source7: COPYING
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
+Patch2: 0002-make-ShivaVG-and-FGAdminUI-static-libraries.patch
URL: http://www.flightgear.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,7 +37,6 @@ expanded and improved upon by anyone interested in contributing
%setup -q -n flightgear-%{version}
%patch1 -p1
%patch2 -p1
-%patch3 -p1
# make rpmlint happy
find -name \*.h -o -name \*.cpp -o -name \*.cxx -o -name \*.hxx \
@@ -120,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Sun Sep 22 2013 Fabrice Bellet <fabrice(a)bellet.info> - 2.12.0-1
+- new upstream release
+
* Thu Aug 15 2013 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 2.10.0-8
- Rebuilt for OSG-3.2.0.
diff --git a/sources b/sources
index 2b22372..4946864 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae7fc8d1e446c5d1fe2aa82ee41dcac5 flightgear-2.10.0.tar.bz2
+23e2de5f311f4cbe94ec3386736ee8a5 flightgear-2.12.0.tar.bz2
8Â years, 10Â months