[pkg-fgfs-crew] [simgear] 01/03: * New upstream release: 2.12.0 * Strip package names by patch version. * Drop patches gcc-macro-correction.diff, osg-compat.diff, CVE-2012-2090.diff CVE-2012-2091.diff. These got applied upstream.
Markus Wanner
markus_wanner-guest at alioth.debian.org
Sat Sep 21 18:53:12 UTC 2013
This is an automated email from the git hooks/post-receive script.
markus_wanner-guest pushed a commit to branch master
in repository simgear.
commit 3484fc63fa3892a9af06e4901ae544d79fe4af4f
Author: Markus Wanner <markus at bluegap.ch>
Date: Sat Sep 21 20:46:11 2013 +0200
* New upstream release: 2.12.0
* Strip package names by patch version.
* Drop patches gcc-macro-correction.diff, osg-compat.diff,
CVE-2012-2090.diff CVE-2012-2091.diff. These got applied upstream.
---
debian/changelog | 9 ++++++
debian/control | 22 +++++++-------
debian/patches/CVE-2012-2090.diff | 26 ----------------
debian/patches/CVE-2012-2091.diff | 49 ------------------------------
debian/patches/gcc-macro-correction.diff | 26 ----------------
debian/patches/osg-compat.diff | 43 --------------------------
debian/patches/series | 4 ---
debian/rules | 4 +--
8 files changed, 22 insertions(+), 161 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bef9d17..0efb818 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+simgear (2.12.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Strip package names by patch version.
+ * Drop patches gcc-macro-correction.diff, osg-compat.diff,
+ CVE-2012-2090.diff CVE-2012-2091.diff. These got applied upstream.
+
+ --
+
simgear (2.10.0-6) unstable; urgency=low
* Keep using strict-aliasing on mipsel.
diff --git a/debian/control b/debian/control
index ed55074..2dfc0dd 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Homepage: http://www.simgear.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/simgear.git
Vcs-Git: git://anonscm.debian.org/collab-maint/simgear.git
-Package: libsimgearcore2.10.0
+Package: libsimgearcore2.12
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -30,12 +30,12 @@ Description: Simulator Construction Gear -- core library
.
This package contains the core library.
-Package: libsimgearcore2.10.0-dbg
+Package: libsimgearcore2.12-dbg
Architecture: any
Section: debug
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore2.10.0 (= ${binary:Version}),
+Depends: libsimgearcore2.12 (= ${binary:Version}),
${misc:Depends}
Description: debugging symbols for libsimgearcore
SimGear is a collection of libraries useful for constructing
@@ -44,11 +44,11 @@ Description: debugging symbols for libsimgearcore
.
This package contains the debug symbols for the core library.
-Package: libsimgearscene2.10.0
+Package: libsimgearscene2.12
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore2.10.0 (= ${binary:Version}),
+Depends: libsimgearcore2.12 (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
Conflicts: simgear0
Description: Simulator Construction Gear -- scene library
@@ -58,12 +58,12 @@ Description: Simulator Construction Gear -- scene library
.
This package contains the scene library.
-Package: libsimgearscene2.10.0-dbg
+Package: libsimgearscene2.12-dbg
Architecture: any
Section: debug
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore2.10.0 (= ${binary:Version}),
+Depends: libsimgearcore2.12 (= ${binary:Version}),
${misc:Depends}
Conflicts: simgear0
Description: debugging symbols for libsimgearscene
@@ -76,11 +76,11 @@ Description: debugging symbols for libsimgearscene
Package: libsimgear-dev
Architecture: any
Section: libdevel
-Depends: libsimgearcore2.10.0 (= ${binary:Version}),
- libsimgearscene2.10.0 (= ${binary:Version}),
+Depends: libsimgearcore2.12 (= ${binary:Version}),
+ libsimgearscene2.12 (= ${binary:Version}),
libopenscenegraph-dev, libc6-dev, ${misc:Depends}
-Replaces: simgear-dev (<< 2.10.0~)
-Breaks: simgear-dev (<< 2.10.0~)
+Replaces: simgear-dev (<< 2.12.0~)
+Breaks: simgear-dev (<< 2.12.0~)
Description: Simulator Construction Gear -- development files
SimGear is a collection of libraries useful for constructing
simulation and visualization applications such as FlightGear
diff --git a/debian/patches/CVE-2012-2090.diff b/debian/patches/CVE-2012-2090.diff
deleted file mode 100644
index cfa42d3..0000000
--- a/debian/patches/CVE-2012-2090.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Subject: Fix for CVE-2012-2090: prevent %n being passed to format strings
- CVE-2012-2090 mentions multiple places in simgear and flightgear that
- allow an unsafe %n specifier to be passed as a format string. This patch
- prevents this for simgear's SGText::UpdateCallback() constructor.
-From: Saikrishna Arcot
-Origin: https://bugs.launchpad.net/ubuntu/+source/flightgear/+bug/1077624/+attachment/3805987/+files/cve-2012-2090-check-for-%25n-in-printf-format.patch
-Last-Update: 2013-09-06
-
---- a/simgear/scene/model/SGText.cxx
-+++ b/simgear/scene/model/SGText.cxx
-@@ -46,6 +46,15 @@
- if( format.size() == 0 ) {
- if( numeric ) format = "%f";
- else format = "%s";
-+ } else {
-+ // It is never safe for format to be %n.
-+ string unsafe ("%n");
-+ size_t found;
-+ found=format.find(unsafe);
-+ if (found!=string::npos) {
-+ SG_LOG(SG_COCKPIT, SG_WARN, "format type contained %n, but this is unsafe, reverting to %s");
-+ format = "%s";
-+ }
- }
- }
-
diff --git a/debian/patches/CVE-2012-2091.diff b/debian/patches/CVE-2012-2091.diff
deleted file mode 100644
index 11a24cd..0000000
--- a/debian/patches/CVE-2012-2091.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-Subject: Fix for CVE-2012-2091: add checks against buffer overruns
- CVE-2012-2091 mentions various buffer overruns in simgear and
- flightgear. This patch addresses issues in SGSocketUDP::read() and
- SGSocketUDP::readline() - for simgear only, obviously.
-From: Rebecca Palmer, Saikrishna Arcot
-Origin: https://bugs.launchpad.net/ubuntu/+source/flightgear/+bug/1077624/+attachment/3806309/+files/simgear_CVE2012_2091.patch
-Last-Update: 2013-09-07
-
---- a/simgear/io/sg_socket_udp.cxx
-+++ b/simgear/io/sg_socket_udp.cxx
-@@ -103,9 +103,13 @@
- return 0;
- }
-
-+ if (length <= 0) {
-+ return 0;
-+ }
- int result;
-+ int maxsize = (length - 1) < SG_IO_MAX_MSG_SIZE ? (length - 1) : SG_IO_MAX_MSG_SIZE;
-
-- if ( (result = sock.recv(buf, SG_IO_MAX_MSG_SIZE, 0)) >= 0 ) {
-+ if ( (result = sock.recv(buf, maxsize, 0)) >= 0 ) {
- buf[result] = '\0';
- // printf("msg received = %s\n", buf);
- }
-@@ -120,10 +124,14 @@
- return 0;
- }
-
-+ if (length <= 0) {
-+ return 0;
-+ }
- // cout << "sock = " << sock << endl;
-
- char *buf_ptr = save_buf + save_len;
-- int result = sock.recv(buf_ptr, SG_IO_MAX_MSG_SIZE, 0);
-+ int maxsize = save_len < SG_IO_MAX_MSG_SIZE ? SG_IO_MAX_MSG_SIZE : 2 * SG_IO_MAX_MSG_SIZE - save_len; //prevent buffer overflow (size of save_buf is 2 * SG_IO_MAX_MSG_SIZE)
-+ int result = sock.recv(buf_ptr, maxsize, 0);
- // printf("msg received = %s\n", buf);
- save_len += result;
-
-@@ -142,6 +150,7 @@
- // we found an end of line
-
- // copy to external buffer
-+ result = result < (length - 1) ? result : (length - 1); //prevent buffer overflow
- strncpy( buf, save_buf, result );
- buf[result] = '\0';
- // cout << "sg_socket line = " << buf << endl;
diff --git a/debian/patches/gcc-macro-correction.diff b/debian/patches/gcc-macro-correction.diff
deleted file mode 100644
index d530cd0..0000000
--- a/debian/patches/gcc-macro-correction.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Subject: Back-port compatibility with OpenSceneGraph 3.2
-From: Markus Wanner <markus at bluegap.ch>
-Last-Update: 2013-08-22
-
---- a/simgear/compiler.h
-+++ b/simgear/compiler.h
-@@ -46,7 +46,7 @@
- # warning GCC compilers prior to 3.4 are suspect
- # endif
-
--# define GCC_VERSION (__GNUC__ * 10000 \
-+# define SG_GCC_VERSION (__GNUC__ * 10000 \
- + __GNUC_MINOR__ * 100 \
- + __GNUC_PATCHLEVEL__)
- # define SG_COMPILER_STR "GNU C++ version " SG_STRINGIZE(__GNUC__) "." SG_STRINGIZE(__GNUC_MINOR__)
---- a/simgear/nasal/cppbind/Ghost.hxx
-+++ b/simgear/nasal/cppbind/Ghost.hxx
-@@ -281,7 +281,7 @@
- // Both ways of retrieving the address of a static member function
- // should be legal but not all compilers know this.
- // g++-4.4.7+ has been tested to work with both versions
--#if defined(GCC_VERSION) && GCC_VERSION < 40407
-+#if defined(SG_GCC_VERSION) && SG_GCC_VERSION < 40407
- // The old version of g++ used on Jenkins (16.11.2012) only compiles
- // this version.
- &getTypeFor<BaseGhost>
diff --git a/debian/patches/osg-compat.diff b/debian/patches/osg-compat.diff
deleted file mode 100644
index f9cfc55..0000000
--- a/debian/patches/osg-compat.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-Subject: Back-port compatibility with OpenSceneGraph 3.2
-From: Markus Wanner <markus at bluegap.ch>
-Last-Update: 2013-07-31
-
---- a/simgear/scene/material/EffectGeode.cxx
-+++ b/simgear/scene/material/EffectGeode.cxx
-@@ -22,6 +22,8 @@
- #include "Effect.hxx"
- #include "Technique.hxx"
-
-+#include <osg/Version>
-+
- #include <osgUtil/CullVisitor>
- #include <osgUtil/TangentSpaceGenerator>
-
-@@ -80,15 +82,27 @@
- int n = _effect->getGenerator(Effect::TANGENT);
- tsg->generate(geometry, 0); // 0 is normal_unit, but I have no idea what that is!
- if (n != -1 && !geometry->getVertexAttribArray(n))
-+#if OSG_MIN_VERSION_REQUIRED(3,1,8)
-+ geometry->setVertexAttribArray(n, tsg->getTangentArray(), osg::Array::BIND_PER_VERTEX);
-+#else
- geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getTangentArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE));
-+#endif
-
- n = _effect->getGenerator(Effect::BINORMAL);
- if (n != -1 && !geometry->getVertexAttribArray(n))
-+#if OSG_MIN_VERSION_REQUIRED(3,1,8)
-+ geometry->setVertexAttribArray(n, tsg->getBinormalArray(), osg::Array::BIND_PER_VERTEX);
-+#else
- geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getBinormalArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE));
-+#endif
-
- n = _effect->getGenerator(Effect::NORMAL);
- if (n != -1 && !geometry->getVertexAttribArray(n))
-+#if OSG_MIN_VERSION_REQUIRED(3,1,8)
-+ geometry->setVertexAttribArray(n, tsg->getNormalArray(), osg::Array::BIND_PER_VERTEX);
-+#else
- geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getNormalArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE));
-+#endif
- }
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index 1dcd6c6..0ca05fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-gcc-macro-correction.diff
-osg-compat.diff
-CVE-2012-2090.diff
-CVE-2012-2091.diff
cppbind-charsignedness.diff
diff --git a/debian/rules b/debian/rules
index cd1d05b..4d5c2c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,8 +38,8 @@ override_dh_auto_configure:
cd build && cmake .. $(CMAKE_FLAGS)
override_dh_strip:
- dh_strip -plibsimgearcore2.10.0 --dbg-package=libsimgearcore2.10.0-dbg
- dh_strip -plibsimgearscene2.10.0 --dbg-package=libsimgearscene2.10.0-dbg
+ dh_strip -plibsimgearcore2.12 --dbg-package=libsimgearcore2.12-dbg
+ dh_strip -plibsimgearscene2.12 --dbg-package=libsimgearscene2.12-dbg
get-orig-source:
uscan --download-current-version --verbose --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/simgear.git
More information about the pkg-fgfs-crew
mailing list