[pkg-fgfs-crew] [PATCH] For version 3.4 (experimental)

Florent Rougon f.rougon at free.fr
Wed Apr 1 08:50:21 UTC 2015


Hi Markus and Rebecca,

FWIW, here (in the next mail) is what I applied on top of the flightgear
Git packaging from alioth/experimental concerning this bug report (one
line change, almost identical to what Rebecca committed upstream). It
does not seem to cause any problem.

It was tempting (for my personal use at least) to take more changes from
flightgear-git to the same file (src/Main/util.cxx) as they seemed to go
in the direction of better security wrt Nasal scripts, but I have the
impression they are not quite self-contained because of type changes...
(/me being a relatively ignorant in C++)

The patch should be ready for 'git am' onto alioth/experimental.
However, it doesn't automatically apply onto alioth/master---not
implying you will necessarily want to do that---failing at the series
file. I think the reason is that the patch context differs between the
two branches (only 6a30e7.patch in experimental:debian/patches/series
whereas master:debian/patches/series also has fix-mobile-tacan.patch,
750939.patch and others before 6a30e7.patch). Hand application with
'patch -p1' instead of 'git am' works, with only this (expected) notice:

  patching file debian/patches/series
  Hunk #1 succeeded at 5 (offset 4 lines).

and application of
remove-slash-tmp-xml-files-from-allowed-paths-list_51bfdc21e0b4528797697d32664eacb15d297449.patch
by quilt/dpkg-buildpackage at package build time also works.

Florent Rougon (1):
  New patch:
    remove-slash-tmp-xml-files-from-allowed-paths-list_51bfdc21e0b4528797697d32664eacb15d297449.patch
  
 ...list_51bfdc21e0b4528797697d32664eacb15d297449.patch | 18 ++++++++++++++++++
 debian/patches/series                                  |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 debian/patches/remove-slash-tmp-xml-files-from-allowed-paths-list_51bfdc21e0b4528797697d32664eacb15d297449.patch

-- 
2.1.4




More information about the pkg-fgfs-crew mailing list