diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
commit | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch) | |
tree | ade7cb031f363fad64c77139dea7aa3d81908537 /media-gfx/aview/files | |
parent | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff) |
gentoo resync : 16.02.1018
Diffstat (limited to 'media-gfx/aview/files')
-rw-r--r-- | media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch | 53 | ||||
-rw-r--r-- | media-gfx/aview/files/aview-1.3.0_rc1-tmp_creation.patch | 46 |
2 files changed, 0 insertions, 99 deletions
diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch b/media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch deleted file mode 100644 index e42ed0d5c583..000000000000 --- a/media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -ur aview-1.3.0-orig/asciiview aview-1.3.0/asciiview ---- aview-1.3.0-orig/asciiview 2005-08-15 21:20:16.000000000 -0400 -+++ aview-1.3.0/asciiview 2005-08-15 21:20:19.000000000 -0400 -@@ -7,9 +7,9 @@ - } - myconvert() - { -- if anytopnm $1 >/tmp/aview$$.pgm 2>/dev/null ; then -+ if anytopnm "$1" >/tmp/aview$$.pgm 2>/dev/null ; then - exit -- elif convert -colorspace gray $1 pgm:- 2>/dev/null ; then -+ elif convert -colorspace gray "$1" pgm:- 2>/dev/null ; then - exit - fi - echo "Failed to convert file format to PNM by both convert and anytopnm" >&2 -@@ -44,8 +44,13 @@ - options="$options $1" - shift - ;; -- *) -- filenames="$filenames $1" -+ *) -+ if [ "$filenames" = "" ] -+ then -+ filenames=$1 #avoid leading null -+ else -+ filenames=$(echo -e "$filenames\000$1") -+ fi - shift - ;; - esac -@@ -53,15 +58,16 @@ - trap clear 0 - mkfifo /tmp/aview$$.pgm - outfile=/tmp/aview$$.pgm --for name in $filenames ; do --if test -r $name ; then --case $name in -+IFS=$(echo -e "\000") -+echo $filenames | while read name; do -+if test -r "$name" ; then -+case "$name" in - *.fli | *.lfc | *.flic ) - PATH="$PATH:." -- aaflip $options $name -+ aaflip $options "$name" - ;; - *) -- myconvert $name >/tmp/aview$$.pgm & -+ myconvert "$name" >/tmp/aview$$.pgm & - pid=$! - PATH="$PATH:." - aview $options /tmp/aview$$.pgm diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-tmp_creation.patch b/media-gfx/aview/files/aview-1.3.0_rc1-tmp_creation.patch deleted file mode 100644 index f792e8bfebbb..000000000000 --- a/media-gfx/aview/files/aview-1.3.0_rc1-tmp_creation.patch +++ /dev/null @@ -1,46 +0,0 @@ -Fix insecure temporary file creation, see: -https://bugs.gentoo.org/show_bug.cgi?id=235808 - -Index: aview-1.3.0/asciiview -=================================================================== ---- aview-1.3.0.orig/asciiview -+++ aview-1.3.0/asciiview -@@ -3,11 +3,11 @@ - clear() - { - kill $! 2>/dev/null -- rm -f /tmp/aview$$.pgm 2>/dev/null -+ rm -rf $tmpdir 2>/dev/null - } - myconvert() - { -- if anytopnm "$1" >/tmp/aview$$.pgm 2>/dev/null ; then -+ if anytopnm "$1" >"$2" 2>/dev/null ; then - exit - elif convert -colorspace gray "$1" pgm:- 2>/dev/null ; then - exit -@@ -56,8 +56,9 @@ while [ "$1" != "" ]; do - esac - done - trap clear 0 --mkfifo /tmp/aview$$.pgm --outfile=/tmp/aview$$.pgm -+tmpdir=`mktemp -t -d` -+outfile=$tmpdir/aview.pgm -+mkfifo $outfile - IFS=$(echo -e "\000") - echo $filenames | while read name; do - if test -r "$name" ; then -@@ -67,10 +68,10 @@ case "$name" in - aaflip $options "$name" - ;; - *) -- myconvert "$name" >/tmp/aview$$.pgm & -+ myconvert "$name" "$outfile" >"$outfile" & - pid=$! - PATH="$PATH:." -- aview $options /tmp/aview$$.pgm -+ aview $options $outfile - kill $pid 2>/dev/null - esac - else |