[openmeca] 02/04: Add patch(es): 0003-hardening...
Damien André
damien-andre-guest at moszumanska.debian.org
Tue Apr 25 11:31:11 UTC 2017
This is an automated email from the git hooks/post-receive script.
damien-andre-guest pushed a commit to branch master
in repository openmeca.
commit d1e47e6a714e8feb194894444a635259309e9442
Author: Damien André <damien.andre at unilim.fr>
Date: Tue Apr 25 09:32:24 2017 +0200
Add patch(es): 0003-hardening...
---
...03-add-hardening-option-linthian-warnings.patch | 266 +++++++++++++++++++++
debian/patches/fix-shared-lib-qglviewer | 17 +-
debian/patches/series | 1 +
debian/patches/typos.patch | 81 ++++---
4 files changed, 328 insertions(+), 37 deletions(-)
diff --git a/debian/patches/0003-add-hardening-option-linthian-warnings.patch b/debian/patches/0003-add-hardening-option-linthian-warnings.patch
new file mode 100644
index 0000000..68fbab1
--- /dev/null
+++ b/debian/patches/0003-add-hardening-option-linthian-warnings.patch
@@ -0,0 +1,266 @@
+From: =?utf-8?q?Damien_Andr=C3=A9?= <damien.andre at unilim.fr>
+Date: Tue, 25 Apr 2017 09:29:58 +0200
+Subject: add hardening option (linthian warnings)
+
+---
+ SRC/ChronoEngine/ChronoEngine.pro | 7 +++
+ SRC/OpenMeca/OpenMeca.pro | 5 ++
+ SRC/Serialization/Serialization.pro | 8 +++
+ debian/copyright | 97 ++++++++++++++++++-------------------
+ 4 files changed, 68 insertions(+), 49 deletions(-)
+
+diff --git a/SRC/ChronoEngine/ChronoEngine.pro b/SRC/ChronoEngine/ChronoEngine.pro
+index c4a5636..2acb2f4 100644
+--- a/SRC/ChronoEngine/ChronoEngine.pro
++++ b/SRC/ChronoEngine/ChronoEngine.pro
+@@ -17,6 +17,13 @@
+ ## You should have received a copy of the GNU General Public License
+ ## along with this program. If not, see <http://www.gnu.org/licenses/>.
+
++# Compilation option for debian hardening
++QMAKE_CPPFLAGS *= $(shell dpkg-buildflags --get CPPFLAGS)
++QMAKE_CFLAGS *= $(shell dpkg-buildflags --get CFLAGS)
++QMAKE_CXXFLAGS *= $(shell dpkg-buildflags --get CXXFLAGS)
++QMAKE_LFLAGS *= $(shell dpkg-buildflags --get LDFLAGS)
++
++
+ CONFIG += qt
+ CONFIG += warn_on
+ CONFIG += no_keywords
+diff --git a/SRC/OpenMeca/OpenMeca.pro b/SRC/OpenMeca/OpenMeca.pro
+index 12a0c90..03b093f 100644
+--- a/SRC/OpenMeca/OpenMeca.pro
++++ b/SRC/OpenMeca/OpenMeca.pro
+@@ -17,6 +17,11 @@
+ ## You should have received a copy of the GNU General Public License
+ ## along with this program. If not, see <http://www.gnu.org/licenses/>.
+
++# Compilation option for debian hardening
++QMAKE_CPPFLAGS *= $(shell dpkg-buildflags --get CPPFLAGS)
++QMAKE_CFLAGS *= $(shell dpkg-buildflags --get CFLAGS)
++QMAKE_CXXFLAGS *= $(shell dpkg-buildflags --get CXXFLAGS)
++QMAKE_LFLAGS *= $(shell dpkg-buildflags --get LDFLAGS)
+
+
+ TEMPLATE = app
+diff --git a/SRC/Serialization/Serialization.pro b/SRC/Serialization/Serialization.pro
+index 01cf1d2..ec0623b 100644
+--- a/SRC/Serialization/Serialization.pro
++++ b/SRC/Serialization/Serialization.pro
+@@ -1,3 +1,11 @@
++
++# Compilation option for debian hardening
++QMAKE_CPPFLAGS *= $(shell dpkg-buildflags --get CPPFLAGS)
++QMAKE_CFLAGS *= $(shell dpkg-buildflags --get CFLAGS)
++QMAKE_CXXFLAGS *= $(shell dpkg-buildflags --get CXXFLAGS)
++QMAKE_LFLAGS *= $(shell dpkg-buildflags --get LDFLAGS)
++
++
+ ######################################################################
+ # qmake internal options
+ ######################################################################
+diff --git a/debian/copyright b/debian/copyright
+index a2f1518..61b21b3 100644
+--- a/debian/copyright
++++ b/debian/copyright
+@@ -3,152 +3,151 @@ Upstream-Name: openmeca
+ Source: https://gitlab.com/damien.andre/openmeca
+
+ Files: LICENSE Makefile README.md SRC/README
+-Copyright: Copyright (C) 2017 Damien ANDRE
++Copyright: 2017 Damien ANDRE
+ License: GPL-3.0
+
+ Files: debian/*
+-Copyright: Copyright (C) 2017 Damien ANDRE
++Copyright: 2017 Damien ANDRE
+ License: GPL-3.0
+
+ Files: SRC/OpenMeca/*
+-Copyright: Copyright (C) 2012-2017 Damien ANDRE
++Copyright: 2012-2017 Damien ANDRE
+ License: GPL-3.0
+
+ Files: SRC/OpenMeca/Util/exprtk.hpp
+-Copyright: Copyright (C) (1999-2016) Arash Partow
++Copyright: 1999-2016 Arash Partow
+ License: CPL-1.0
+
+ Files: SRC/ChronoEngine/*
+-Copyright: Copyright (c) 2013 Project Chrono
+- Copyright (c) 1996, 2003, 2005, 2006, 2008, 2010, 2011, 2012 Alessandro Tasora
++Copyright: 2013 Project Chrono
++ 1996, 2003, 2005, 2006, 2008, 2010, 2011, 2012 Alessandro Tasora
+ License: BSD-3-Clause
+
+ Files: SRC/ChronoEngine/collision/bullet/*
+-Copyright: Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Erwin Coumans
+- Copyright (c) 2006 Simon Hobbs
+- Copyright (c) 2006-2007 Erin Catto
+- Copyright (C) 2001,2002 Russell L. Smith
+- Copyright (c) Ricardo Padrela 2006
+- Copyright (c) 2006-2009, 2006-2010 Charlie C & Erwin Coumans
+- Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans
++Copyright: 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Erwin Coumans
++ 2006 Simon Hobbs
++ 2006-2007 Erin Catto
++ 2001,2002 Russell L. Smith
++ Ricardo Padrela 2006
++ 2006-2009, 2006-2010 Charlie C & Erwin Coumans
++ 2003-2006 Gino van den Bergen / Erwin Coumans
+ License: Zlib
+
+ Files: SRC/ChronoEngine/collision/bullet/LinearMath/btConvexHull.*
+-Copyright: Copyright (c) 2003-2006 Stan Melax
+- Copyright (c) 2008 Stan Melax
++Copyright: 2003-2006, 2008 Stan Melax
+ License: Zlib
+
+ Files: SRC/ChronoEngine/collision/gimpact/ConvexDecomposition/*
+-Copyright: Copyright (c) 2004 Open Dynamics Framework Group
++Copyright: 2004 Open Dynamics Framework Group
+ License: BSD-3-Clause
+
+ Files: SRC/ChronoEngine/collision/gimpact/GIMPACT/*
+-Copyright: Copyright (c) 2007, 2007 Francisco Leon Najera. C.C. 80087371.
++Copyright: 2007, 2007 Francisco Leon Najera. C.C. 80087371.
+ License: Zlib
+
+ Files: SRC/ChronoEngine/collision/gimpact/GIMPACTUtils/*
+-Copyright: Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
++Copyright: 2007 Francisco Leon Najera. C.C. 80087371.
+ License: Zlib
+
+ Files: SRC/ChronoEngine/collision/gimpact/GIMPACT/Bullet/btGenericPoolAllocator.*
+-Copyright: Copyright (c) 2003-2006 Erwin Coumans
++Copyright: 2003-2006 Erwin Coumans
+ License: Zlib
+
+ Files: SRC/ChronoEngine/parallel/ChThreadsSync.h
+-Copyright: Copyright (c) 2007 Starbreeze Studios
++Copyright: 2007 Starbreeze Studios
+ License: Zlib
+
+ Files: SRC/Serialization/*
+-Copyright: (C) Copyright 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Robert Ramey
+- Copyright 2002, 2005 Daryle Walker
+- (C) Copyright 2006 David Abrahams
+- (C) Copyright 2004 Robert Ramey and Martin Ecker
+- (C) Copyright 2004-2009 Robert Ramey, Martin Ecker and Takatoshi Kondo
+- (C) Copyright 2003-4 Pavel Vozenilek and Robert Ramey
+- (C) Copyright Robert Ramey 2003. Jonathan Turkanis 2004.
++Copyright: 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Robert Ramey
++ 2002, 2005 Daryle Walker
++ 2006 David Abrahams
++ 2004 Robert Ramey and Martin Ecker
++ 2004-2009 Robert Ramey, Martin Ecker and Takatoshi Kondo
++ 2003-4 Pavel Vozenilek and Robert Ramey
++ 2004 Jonathan Turkanis
+ License: BSL-1.0
+
+ Files: SRC/Serialization/archive/detail/register_archive.hpp
+-Copyright: Copyright David Abrahams 2006
++Copyright: 2006 David Abrahams
+ License: BSL-1.0
+
+ Files: SRC/Serialization/archive/detail/utf8_codecvt_facet.hpp
+-Copyright: Copyright (c) 2001 Ronald Garcia, Indiana University
++Copyright: 2001 Ronald Garcia, Indiana University
+ License: BSL-1.0
+
+ Files: SRC/Serialization/array.hpp
+-Copyright: (C) Copyright 2005 Matthias Troyer and Dave Abrahams
++Copyright: 2005 Matthias Troyer and Dave Abrahams
+ License: BSL-1.0
+
+ Files: SRC/Serialization/bitset.hpp
+-Copyright: copyright 2004 Brian Ravnsgaard Riis
++Copyright: 2004 Brian Ravnsgaard Riis
+ License: BSL-1.0
+
+ Files: SRC/Serialization/collection_size_type.hpp
+-Copyright: (C) Copyright 2005 Matthias Troyer
++Copyright: 2005 Matthias Troyer
+ License: BSL-1.0
+
+ Files: SRC/Serialization/complex.hpp
+-Copyright: (C) Copyright 2007 Matthias Troyer
++Copyright: 2007 Matthias Troyer
+ License: BSL-1.0
+
+ Files: SRC/Serialization/detail/get_data.hpp
+-Copyright: (C) Copyright 2005 Matthias Troyer
++Copyright: 2005 Matthias Troyer
+ License: BSL-1.0
+
+ Files: SRC/Serialization/detail/shared_count_132.hpp
+-Copyright: Copyright (c) 2001, 2002, 2003 Peter Dimov and Multi Media Ltd.
++Copyright: 2001, 2002, 2003 Peter Dimov and Multi Media Ltd.
+ License: BSL-1.0
+
+ Files: SRC/Serialization/detail/shared_ptr_132.hpp
+-Copyright: (C) Copyright Greg Colvin and Beman Dawes 1998, 1999.
+- Copyright (c) 2001, 2002, 2003 Peter Dimov
++Copyright: 1998, 1999 Greg Colvin and Beman Dawes
++ 2001, 2002, 2003 Peter Dimov
+ License: BSL-1.0
+
+ Files: SRC/Serialization/detail/shared_ptr_nmt_132.hpp
+-Copyright: (C) Copyright Greg Colvin and Beman Dawes 1998, 1999.
+- Copyright (c) 2001, 2002 Peter Dimov
++Copyright: 1998, 1999 Greg Colvin and Beman Dawes
++ 2001, 2002 Peter Dimov
+ License: BSL-1.0
+
+ Files: SRC/Serialization/ephemeral.hpp
+-Copyright: (C) Copyright 2007 Matthias Troyer.
++Copyright: 2007 Matthias Troyer
+ License: BSL-1.0
+
+
+ Files: SRC/Serialization/is_bitwise_serializable.hpp
+-Copyright: (C) Copyright 2007 Matthias Troyer
++Copyright: 2007 Matthias Troyer
+ License: BSL-1.0
+
+ Files: SRC/Serialization/optional.hpp
+-Copyright: (C) Copyright 2002-4 Pavel Vozenilek
++Copyright: 2002-4 Pavel Vozenilek
+ License: BSL-1.0
+
+ Files: SRC/Serialization/scoped_ptr.hpp
+-Copyright: Copyright (c) 2003 Vladimir Prus
++Copyright: 2003 Vladimir Prus
+ License: BSL-1.0
+
+ Files: SRC/Serialization/src/utf8_codecvt_facet.cpp
+-Copyright: Copyright Vladimir Prus 2004.
++Copyright: 2004 Vladimir Prus
+ License: BSL-1.0
+
+ Files: SRC/Serialization/throw_exception.hpp
+-Copyright: Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
++Copyright: 2002 Peter Dimov and Multi Media Ltd.
+ License: BSL-1.0
+
+ Files: SRC/Serialization/valarray.hpp
+-Copyright: (C) Copyright 2005 Matthias Troyer
++Copyright: 2005 Matthias Troyer
+ License: BSL-1.0
+
+ Files: SRC/Serialization/variant.hpp
+-Copyright: copyright (c) 2005 troy d. straszheim
++Copyright: 2005 troy d. straszheim
+ License: BSL-1.0
+
+ Files: SRC/Serialization/vector_135.hpp
+-Copyright: (C) Copyright 2008 Matthias Troyer
++Copyright: 2008 Matthias Troyer
+ License: BSL-1.0
+
+ Files: SRC/Serialization/wrapper.hpp
+-Copyright: (C) Copyright 2005-2006 Matthias Troyer
++Copyright: 2005-2006 Matthias Troyer
+ License: BSL-1.0
+
+
diff --git a/debian/patches/fix-shared-lib-qglviewer b/debian/patches/fix-shared-lib-qglviewer
index c8bce43..7dd8cf3 100644
--- a/debian/patches/fix-shared-lib-qglviewer
+++ b/debian/patches/fix-shared-lib-qglviewer
@@ -1,4 +1,8 @@
-Description: <short summary of the patch>
+From: Debian Science Maintainers
+ <debian-science-maintainers at lists.alioth.debian.org>
+Date: Tue, 25 Apr 2017 09:26:51 +0200
+Subject: fix-shared-lib-qglviewer
+
Fix qglviewer shared library name for link.
.
openmeca (2.2.5-1) unstable; urgency=medium
@@ -6,11 +10,14 @@ Fix qglviewer shared library name for link.
* Initial release. (Closes: #850590)
Author: Damien Andre <dada at yakuru.fr>
Bug-Debian: https://bugs.debian.org/850590
-
---
-Author: Damien Andre <dada at yakuru.fr>
---- openmeca-2.2.5.orig/SRC/OpenMeca/OpenMeca.pro
-+++ openmeca-2.2.5/SRC/OpenMeca/OpenMeca.pro
+ SRC/OpenMeca/OpenMeca.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/SRC/OpenMeca/OpenMeca.pro b/SRC/OpenMeca/OpenMeca.pro
+index 81f3883..12a0c90 100644
+--- a/SRC/OpenMeca/OpenMeca.pro
++++ b/SRC/OpenMeca/OpenMeca.pro
@@ -48,7 +48,7 @@ INCLUDEPATH = ./ ../../ ../ \
LIBS += ../ChronoEngine/BUILD/libchronoengine.a \
diff --git a/debian/patches/series b/debian/patches/series
index a0d4704..b3d9c84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
fix-shared-lib-qglviewer
typos.patch
+0003-add-hardening-option-linthian-warnings.patch
diff --git a/debian/patches/typos.patch b/debian/patches/typos.patch
index b156cae..2bca0e5 100644
--- a/debian/patches/typos.patch
+++ b/debian/patches/typos.patch
@@ -1,7 +1,19 @@
-Index: openmeca/SRC/OpenMeca/Core/Software.cpp
+From: Debian Science Maintainers
+ <debian-science-maintainers at lists.alioth.debian.org>
+Date: Tue, 25 Apr 2017 09:26:51 +0200
+Subject: typos
+
===================================================================
---- openmeca.orig/SRC/OpenMeca/Core/Software.cpp
-+++ openmeca/SRC/OpenMeca/Core/Software.cpp
+---
+ SRC/OpenMeca/Core/Software.cpp | 58 ++++++++++++++++++------------------
+ SRC/OpenMeca/Gui/MainWindow.cpp | 2 +-
+ SRC/OpenMeca/Rsc/Lang/openmeca_fr.ts | 2 +-
+ 3 files changed, 31 insertions(+), 31 deletions(-)
+
+diff --git a/SRC/OpenMeca/Core/Software.cpp b/SRC/OpenMeca/Core/Software.cpp
+index c634808..24f9be7 100644
+--- a/SRC/OpenMeca/Core/Software.cpp
++++ b/SRC/OpenMeca/Core/Software.cpp
@@ -91,35 +91,35 @@ namespace OpenMeca
QFile file(fileInfo_.c_str());
if(!file.open(QIODevice::ReadOnly))
@@ -9,10 +21,7 @@ Index: openmeca/SRC/OpenMeca/Core/Software.cpp
- OMC_ASSERT_MSG(0, "Can't read the sofware file info");
- }
- QTextStream in(&file);
-+ OMC_ASSERT_MSG(0, "Can't read the software file info");
-+ }
-+ QTextStream in(&file);
-
+-
- while(!in.atEnd())
- {
- QString line = in.readLine();
@@ -21,6 +30,27 @@ Index: openmeca/SRC/OpenMeca/Core/Software.cpp
- fields.first().replace(" ","");
- const std::string key = (fields.first()).toStdString();
- const std::string value = (fields.last()).toStdString();
+-
+- OMC_ASSERT_MSG(info_.count(key)==0, "Problem while reading software info file, the key value is already used");
+- info_[key] = value;
+- }
+- }
+-
+-
+- void
+- Software::FakeTranslate()
+- {
+- // It's just to force translation of some keywords...
+-
+- // Keyword inside xml menumanager file
+- QObject::tr("Geometry");
+- QObject::tr("Cosmetic");
+- QObject::tr("Loading");
+- QObject::tr("Plot data...");
++ OMC_ASSERT_MSG(0, "Can't read the software file info");
++ }
++ QTextStream in(&file);
++
+ while(!in.atEnd())
+ {
+ QString line = in.readLine();
@@ -29,31 +59,18 @@ Index: openmeca/SRC/OpenMeca/Core/Software.cpp
+ fields.first().replace(" ","");
+ const std::string key = (fields.first()).toStdString();
+ const std::string value = (fields.last()).toStdString();
-
-- OMC_ASSERT_MSG(info_.count(key)==0, "Problem while reading software info file, the key value is already used");
-- info_[key] = value;
-- }
-- }
++
+ OMC_ASSERT_MSG(info_.count(key)==0, "Problem while reading software info file, the key value is already used");
+ info_[key] = value;
+ }
+ }
-
-
-- void
-- Software::FakeTranslate()
-- {
-- // It's just to force translation of some keywords...
++
++
+ void
+ Software::FakeTranslate()
+ {
+ // It's just to force translation of some keywords...
-
-- // Keyword inside xml menumanager file
-- QObject::tr("Geometry");
-- QObject::tr("Cosmetic");
-- QObject::tr("Loading");
-- QObject::tr("Plot data...");
++
+ // Keyword inside xml menumanager file
+ QObject::tr("Geometry");
+ QObject::tr("Cosmetic");
@@ -62,10 +79,10 @@ Index: openmeca/SRC/OpenMeca/Core/Software.cpp
QObject::tr("Save data...");
QObject::tr("Help");
QObject::tr("About...");
-Index: openmeca/SRC/OpenMeca/Gui/MainWindow.cpp
-===================================================================
---- openmeca.orig/SRC/OpenMeca/Gui/MainWindow.cpp
-+++ openmeca/SRC/OpenMeca/Gui/MainWindow.cpp
+diff --git a/SRC/OpenMeca/Gui/MainWindow.cpp b/SRC/OpenMeca/Gui/MainWindow.cpp
+index 8bf3cb9..02309b8 100755
+--- a/SRC/OpenMeca/Gui/MainWindow.cpp
++++ b/SRC/OpenMeca/Gui/MainWindow.cpp
@@ -628,7 +628,7 @@ namespace OpenMeca
text += "<br><br>";
@@ -75,10 +92,10 @@ Index: openmeca/SRC/OpenMeca/Gui/MainWindow.cpp
text += Core::Software::Get().HtmlText();
-Index: openmeca/SRC/OpenMeca/Rsc/Lang/openmeca_fr.ts
-===================================================================
---- openmeca.orig/SRC/OpenMeca/Rsc/Lang/openmeca_fr.ts
-+++ openmeca/SRC/OpenMeca/Rsc/Lang/openmeca_fr.ts
+diff --git a/SRC/OpenMeca/Rsc/Lang/openmeca_fr.ts b/SRC/OpenMeca/Rsc/Lang/openmeca_fr.ts
+index a01c112..e227875 100644
+--- a/SRC/OpenMeca/Rsc/Lang/openmeca_fr.ts
++++ b/SRC/OpenMeca/Rsc/Lang/openmeca_fr.ts
@@ -709,7 +709,7 @@ The dialog will be closed</source>
</message>
<message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openmeca.git
More information about the debian-science-commits
mailing list