[pkg-fgfs-crew] [flightgear-data] 01/01: Commit various changes by Rebecca Palmer:

Markus Wanner markus_wanner-guest at moszumanska.debian.org
Mon Apr 13 09:39:10 UTC 2015


This is an automated email from the git hooks/post-receive script.

markus_wanner-guest pushed a commit to branch experimental
in repository flightgear-data.

commit 23de65c8eec9ba3bfd6a6cbd1693e8b05055b20c
Author: Markus Wanner <markus at bluegap.ch>
Date:   Mon Apr 13 11:44:26 2015 +0200

    Commit various changes by Rebecca Palmer:
    
    * Add f14fix.diff from upstream.
    * Remove FG_SCENERY/* and /tmp/*.xml from allowed Nasal paths.
      Closes: #780716.
---
 debian/changelog                         |   9 ++
 debian/patches/f14fix.diff               | 164 +++++++++++++++++++++++++++++++
 debian/patches/restrict-nasal-paths.diff |  18 ++++
 debian/patches/series                    |   2 +
 4 files changed, 193 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 902f410..732226d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+flightgear-data (3.4.0+dfsg-0~exp2) UNRELEASED; urgency=medium
+
+  [ Rebecca N. Palmer ]
+  * Add f14fix.diff from upstream.
+  * Remove FG_SCENERY/* and /tmp/*.xml from allowed Nasal paths.
+    Closes: #780716.
+
+ -- Markus Wanner <markus at bluegap.ch>  Mon, 13 Apr 2015 11:40:10 +0200
+
 flightgear-data (3.4.0+dfsg-0~exp1) experimental; urgency=medium
 
   [ Florent Rougon ]
diff --git a/debian/patches/f14fix.diff b/debian/patches/f14fix.diff
new file mode 100644
index 0000000..0c8eeb4
--- /dev/null
+++ b/debian/patches/f14fix.diff
@@ -0,0 +1,164 @@
+Description: F14-B : Use correct property for scene illumination
+ otherwise we get black contrails for MP aircraft.
+Origin: upstream d23c88c76151243141223f01f88adf8479582ae7
+Author: Richard Harrison
+
+diff --git a/Aircraft/f-14b/Models/Fx/contrail1.xml b/Aircraft/f-14b/Models/Fx/contrail1.xml
+index d6bae46..3bc4ad8 100644
+--- a/Aircraft/f-14b/Models/Fx/contrail1.xml
++++ b/Aircraft/f-14b/Models/Fx/contrail1.xml
+@@ -62,9 +62,9 @@
+    <particle>
+      <start>
+        <color>
+-         <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+-         <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+-         <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++         <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++         <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++         <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+          <alpha><value> 0.2 </value></alpha>
+        </color>
+        <size>
+@@ -74,9 +74,9 @@
+ 
+      <end>
+        <color>
+-         <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+-         <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+-         <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++         <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++         <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++         <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+          <alpha><value> 0.6 </value></alpha>
+        </color>
+        <size>
+diff --git a/Aircraft/f-14b/Models/Fx/contrail2.xml b/Aircraft/f-14b/Models/Fx/contrail2.xml
+index 8a4665b..f8f39cf 100644
+--- a/Aircraft/f-14b/Models/Fx/contrail2.xml
++++ b/Aircraft/f-14b/Models/Fx/contrail2.xml
+@@ -62,9 +62,9 @@
+    <particle>
+      <start>
+        <color>
+-         <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+-         <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+-         <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++         <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++         <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++         <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+          <alpha><value> 0.2 </value></alpha>
+        </color>
+        <size>
+@@ -74,9 +74,9 @@
+ 
+      <end>
+        <color>
+-         <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+-         <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+-         <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++         <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++         <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++         <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+          <alpha><value> 0.6 </value></alpha>
+        </color>
+        <size>
+diff --git a/Aircraft/f-14b/Models/Fx/smoke-generator.xml b/Aircraft/f-14b/Models/Fx/smoke-generator.xml
+index d5077b2..7674993 100644
+--- a/Aircraft/f-14b/Models/Fx/smoke-generator.xml
++++ b/Aircraft/f-14b/Models/Fx/smoke-generator.xml
+@@ -50,9 +50,9 @@ based on standard my wingtip contrail:    rjh at zaretto.com
+    <particle>
+      <start>
+        <color>
+-         <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+-         <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+-         <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++         <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++         <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++         <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+          <alpha><value> 0.6 </value></alpha>
+        </color>
+        <size>
+@@ -62,9 +62,9 @@ based on standard my wingtip contrail:    rjh at zaretto.com
+  
+      <end>
+        <color>
+-         <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+-         <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+-         <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++         <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++         <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++         <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+          <alpha><value> 0.00000001</value></alpha>
+        </color>
+        <size>
+diff --git a/Aircraft/f-14b/Models/Fx/smoke-trail.xml b/Aircraft/f-14b/Models/Fx/smoke-trail.xml
+index 4fff354..ded9b83 100644
+--- a/Aircraft/f-14b/Models/Fx/smoke-trail.xml
++++ b/Aircraft/f-14b/Models/Fx/smoke-trail.xml
+@@ -3,7 +3,7 @@ based on standard my wingtip contrail:    rjh at zaretto.com
+  -->
+ <PropertyList> 
+  <particlesystem>
+-   <name>wingroot-smoke</name>
++   <name>Smoke Generator</name>
+    <texture>vapour.png</texture>
+  
+    <emissive type="bool">false</emissive>
+@@ -50,9 +50,9 @@ based on standard my wingtip contrail:    rjh at zaretto.com
+    <particle>
+      <start>
+        <color>
+-         <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+-         <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+-         <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++         <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++         <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++         <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+          <alpha><value> 0.6 </value></alpha>
+        </color>
+        <size>
+@@ -62,9 +62,9 @@ based on standard my wingtip contrail:    rjh at zaretto.com
+  
+      <end>
+        <color>
+-         <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+-         <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+-         <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++         <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++         <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++         <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+          <alpha><value> 0.00000001</value></alpha>
+        </color>
+        <size>
+diff --git a/Aircraft/f-14b/Models/Fx/vapour.xml b/Aircraft/f-14b/Models/Fx/vapour.xml
+index cfde110..243a91a 100644
+--- a/Aircraft/f-14b/Models/Fx/vapour.xml
++++ b/Aircraft/f-14b/Models/Fx/vapour.xml
+@@ -79,9 +79,9 @@ based on standard FG wingtip contrail example; but modified condition params
+    <particle>
+      <start>
+        <color>
+-         <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+-         <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+-         <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++         <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++         <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++         <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+          <alpha><value> 0.5 </value></alpha>
+        </color>
+        <size>
+@@ -91,9 +91,9 @@ based on standard FG wingtip contrail example; but modified condition params
+  
+      <end>
+        <color>
+-         <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+-         <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+-         <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++         <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++         <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++         <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+          <alpha><value> 0.1 </value></alpha>
+        </color>
+        <size>
diff --git a/debian/patches/restrict-nasal-paths.diff b/debian/patches/restrict-nasal-paths.diff
new file mode 100644
index 0000000..05770fa
--- /dev/null
+++ b/debian/patches/restrict-nasal-paths.diff
@@ -0,0 +1,18 @@
+Description: Remove FG_SCENERY/* and /tmp/*.xml from allowed paths list
+
+Author: Rebecca Palmer <rebecca_palmer at zoho.com>
+Bug-Debian: https://bugs.debian.org/780716 https://bugs.debian.org/780867
+Forwarded: not-needed
+
+--- a/Nasal/IOrules
++++ b/Nasal/IOrules
+@@ -28,9 +28,7 @@
+ 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
+ WRITE ALLOW $FG_HOME/*.log
+ WRITE ALLOW $FG_HOME/cache/*
diff --git a/debian/patches/series b/debian/patches/series
index b6b3e18..7f993e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 use-system-jslibs.diff
+f14fix.diff
+restrict-nasal-paths.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/flightgear-data.git



More information about the pkg-fgfs-crew mailing list