Date: Monday, February 27, 2017 @ 14:59:56 Author: spupykin Revision: 214051
upgpkg: flightgear 2017.1.1-1 upd Modified: flightgear/trunk/PKGBUILD Deleted: flightgear/trunk/sec-fix.patch ---------------+ PKGBUILD | 15 ++++----------- sec-fix.patch | 42 ------------------------------------------ 2 files changed, 4 insertions(+), 53 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-02-27 14:04:01 UTC (rev 214050) +++ PKGBUILD 2017-02-27 14:59:56 UTC (rev 214051) @@ -4,9 +4,9 @@ # Contributor: Hans Janssen <h...@janserv.xs4all.nl> pkgname=flightgear -pkgver=2016.4.4 +pkgver=2017.1.1 _pkgver=${pkgver%.*} -pkgrel=2 +pkgrel=1 pkgdesc="An open-source, multi-platform flight simulator" arch=(i686 x86_64) depends=('libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu' 'openal') @@ -15,16 +15,9 @@ license=("GPL") url="http://www.flightgear.org/" options=('!makeflags') -source=("http://downloads.sourceforge.net/project/flightgear/release-${_pkgver}/${pkgname}-${pkgver}.tar.bz2" - sec-fix.patch) -sha256sums=('d51992cbe40f1812f9821ab27b838d52e04c10551772d57fc2e815f4444dfafc' - 'c45d9596ee8269594ee600e3fe1de10422f202c2ce4b3fb733062ce92f37b11b') +source=("http://downloads.sourceforge.net/project/flightgear/release-${_pkgver}/${pkgname}-${pkgver}.tar.bz2") +sha256sums=('8f98bbdc027164564cddf660856e0b2f4924c5c9b6a32735b14cd57b4338a028') -prepare() { - cd "$srcdir"/flightgear-$pkgver -# patch -p1 -i $srcdir/sec-fix.patch -} - build() { cd "$srcdir"/flightgear-$pkgver cmake \ Deleted: sec-fix.patch =================================================================== --- sec-fix.patch 2017-02-27 14:04:01 UTC (rev 214050) +++ sec-fix.patch 2017-02-27 14:59:56 UTC (rev 214051) @@ -1,42 +0,0 @@ ---- a/src/Autopilot/route_mgr.cxx -+++ b/src/Autopilot/route_mgr.cxx -@@ -44,6 +44,7 @@ - #include <simgear/timing/sg_time.hxx> - #include <simgear/sg_inlines.h> - -+#include <Main/globals.hxx> - #include "Main/fg_props.hxx" - #include "Navaids/positioned.hxx" - #include <Navaids/waypoint.hxx> -@@ -54,6 +55,8 @@ - #include "Airports/runways.hxx" - #include <GUI/new_gui.hxx> - #include <GUI/dialog.hxx> -+#include <Main/util.hxx> // fgValidatePath() -+#include <GUI/MessageBox.hxx> - - #define RM "/autopilot/route-manager/" - -@@ -709,7 +712,21 @@ - mgr->loadRoute(path); - } else if (!strcmp(s, "@SAVE")) { - SGPath path(mgr->_pathNode->getStringValue()); -- mgr->saveRoute(path); -+ SGPath authorizedPath = fgValidatePath(path, true /* write */); -+ -+ if (!authorizedPath.isNull()) { -+ mgr->saveRoute(authorizedPath); -+ } else { -+ std::string msg = -+ "The route manager was asked to write the flightplan to '" + -+ path.utf8Str() + "', but this path is not authorized for writing. " + -+ "Please choose another location, for instance in the $FG_HOME/Export " -+ "folder (" + (globals->get_fg_home() / "Export").utf8Str() + ")."; -+ -+ SG_LOG(SG_AUTOPILOT, SG_ALERT, msg); -+ modalMessageBox("FlightGear", "Unable to write to the specified file", -+ msg); -+ } - } else if (!strcmp(s, "@NEXT")) { - mgr->jumpToIndex(mgr->currentIndex() + 1); - } else if (!strcmp(s, "@PREVIOUS")) {