bellet pushed to FlightGear-data (f21). "Remove FG_SCENERY from Nasal allowed directories (..more)"

[notifications at fedoraproject.org]

>From 4f8108cbedd17617e8bcf3017fd70f937e54b6ea Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice at bellet.info>
Date: Sun, 19 Apr 2015 12:17:51 +0200
Subject: Remove FG_SCENERY from Nasal allowed directories

- Modernize spec

diff --git a/0000-Remove-FG_SCENERY-from-Nasal-allowed-directories.patch b/0000-Remove-FG_SCENERY-from-Nasal-allowed-directories.patch
new file mode 100644
index 0000000..79492c5
--- /dev/null
+++ b/0000-Remove-FG_SCENERY-from-Nasal-allowed-directories.patch
@@ -0,0 +1,25 @@
+From 60da2094252cee1a5cdfe737f29becd5c6800549 Mon Sep 17 00:00:00 2001
+From: "Rebecca N. Palmer" <rebecca_palmer at zoho.com>
+Date: Fri, 13 Mar 2015 18:31:38 +0000
+Subject: [PATCH] Remove FG_SCENERY from Nasal allowed directories
+
+This was insecure as Nasal could change it, and appears to be unused
+---
+ Nasal/IOrules | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Nasal/IOrules b/Nasal/IOrules
+index 71d2f67..ddb0189 100644
+--- a/Nasal/IOrules
++++ b/Nasal/IOrules
+@@ -28,7 +28,6 @@
+ READ ALLOW $FG_ROOT/*
+ READ ALLOW $FG_HOME/*
+ READ ALLOW $FG_AIRCRAFT/*
+-READ ALLOW $FG_SCENERY/*
+ 
+ WRITE ALLOW /tmp/*.xml
+ WRITE ALLOW $FG_HOME/*.sav
+-- 
+2.1.0
+
diff --git a/FlightGear-data.spec b/FlightGear-data.spec
index 6d77407..086091c 100644
--- a/FlightGear-data.spec
+++ b/FlightGear-data.spec
@@ -1,13 +1,12 @@
 Name:           FlightGear-data
 Summary:        FlightGear base scenery and data files
 Version:        3.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        GPLv2+
-Group:          Amusements/Games
 Source0:        http://mirrors.ibiblio.org/flightgear/ftp/Shared/FlightGear-data-%{version}.tar.bz2
+Patch0:         0000-Remove-FG_SCENERY-from-Nasal-allowed-directories.patch
 URL:            http://www.flightgear.org/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Obsoletes:      fgfs-base < 1.9.0-1
 
@@ -16,14 +15,14 @@ This package contains the base scenery for FlightGear and must be
 installed
 
 %prep
+%setup -q -n fgdata
+%patch0 -p1
 
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/flightgear
-tar jxf %{SOURCE0} --strip-components 1 \
-        -C $RPM_BUILD_ROOT/%{_datadir}/flightgear
+cp -alf *  $RPM_BUILD_ROOT%{_datadir}/flightgear
 
 # cleanup temporary files and fix permissions
 find $RPM_BUILD_ROOT/%{_datadir}/flightgear -name '*#*' -exec rm {} \;
@@ -59,15 +58,15 @@ do
                 $RPM_BUILD_ROOT/%{_docdir}/%{name}
 done
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-, root, root, 0755)
 %doc %{_docdir}/%{name}
 %{_datadir}/flightgear
 
 %changelog
+* Sun Apr 19 2015 Fabrice Bellet <fabrice at bellet.info> - 3.2.0-2
+- Remove FG_SCENERY from Nasal allowed directories
+- Modernize spec
+
 * Fri Oct 17 2014 Fabrice Bellet <fabrice at bellet.info> - 3.2.0-1
 - new upstream release
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/FlightGear-data.git/commit/?h=f21&id=4f8108cbedd17617e8bcf3017fd70f937e54b6ea