Commit 63f2f4ed authored by Axel Beckert's avatar Axel Beckert

Add patch to make parsing of --exec optional (Closes: #706644)

parent 6d7b2b11
......@@ -17,6 +17,7 @@ tpp (1.3.1-3) UNRELEASED; urgency=low
* Adopt the package (Closes: #706041)
* Cherry-pick afb57d9 (make key events work on ruby 1.9) from upstream
(Closes: #671530)
* Add patch to make parsing of --exec optional (Closes: #706644)
* Update homepage to point to GitHub
* Fix patch header
* Update watch file to also check release tags at GitHub
......
Description: Don't execute commands with --exec by default
Author: Axel Beckert <abe@debian.org>
Debian-Bug: 706644
Index: tpp/tpp.rb
===================================================================
--- tpp.orig/tpp.rb 2013-06-12 22:13:55.000000000 +0200
+++ tpp/tpp.rb 2013-06-12 22:15:08.000000000 +0200
@@ -725,9 +725,13 @@
end
def do_exec(cmdline)
- rc = Kernel.system(cmdline)
- if not rc then
- # @todo: add error message
+ if $execok then
+ rc = Kernel.system(cmdline)
+ if not rc then
+ # @todo: add error message
+ end
+ else
+ @screen.addstr("--exec disabled by default for security reasons. Use option -x to enable it.")
end
end
@@ -1683,6 +1687,7 @@
$stderr.puts "\t -t <type>\tset filetype <type> as output format"
$stderr.puts "\t -o <file>\twrite output to file <file>"
$stderr.puts "\t -s <seconds>\twait <seconds> seconds between slides (with -t autoplay)"
+ $stderr.puts "\t -x\t\tallow parsing of --exec in input files"
$stderr.puts "\t --version\tprint the version"
$stderr.puts "\t --help\t\tprint this help"
$stderr.puts "\n\t currently available types: ncurses (default), autoplay, latex, txt"
@@ -1699,6 +1704,7 @@
output = nil
type = "ncurses"
time = 1
+$execok = nil
skip_next = false
@@ -1720,6 +1726,8 @@
elsif ARGV[i] == "-s" then
time = ARGV[i+1].to_i
skip_next = true
+ elsif ARGV[i] == "-x" then
+ $execok = 1
elsif input == nil then
input = ARGV[i]
end
Index: tpp/doc/tpp.1
===================================================================
--- tpp.orig/doc/tpp.1 2013-06-12 22:13:55.000000000 +0200
+++ tpp/doc/tpp.1 2013-06-12 22:13:55.000000000 +0200
@@ -20,6 +20,8 @@
.TP
\-l output.tex input.tpp converts tpp slides into tex
.TP
+\-x allow usage of "\-\-exec"
+.TP
\-v/\-\-version display version number
.SH KEYS
00-make.patch
05-man.patch
10-ruby19.patch
15-optional-exec.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment