From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- media-gfx/aview/Manifest | 10 +++ media-gfx/aview/aview-1.3.0_rc1-r1.ebuild | 37 +++++++++++ media-gfx/aview/aview-1.3.0_rc1-r3.ebuild | 42 ++++++++++++ .../aview/files/aview-1.3.0_rc1-asciiview.patch | 76 ++++++++++++++++++++++ .../files/aview-1.3.0_rc1-filename-spaces.patch | 53 +++++++++++++++ .../aview/files/aview-1.3.0_rc1-includes.patch | 11 ++++ .../aview/files/aview-1.3.0_rc1-tmp_creation.patch | 46 +++++++++++++ media-gfx/aview/metadata.xml | 8 +++ 8 files changed, 283 insertions(+) create mode 100644 media-gfx/aview/Manifest create mode 100644 media-gfx/aview/aview-1.3.0_rc1-r1.ebuild create mode 100644 media-gfx/aview/aview-1.3.0_rc1-r3.ebuild create mode 100644 media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch create mode 100644 media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch create mode 100644 media-gfx/aview/files/aview-1.3.0_rc1-includes.patch create mode 100644 media-gfx/aview/files/aview-1.3.0_rc1-tmp_creation.patch create mode 100644 media-gfx/aview/metadata.xml (limited to 'media-gfx/aview') diff --git a/media-gfx/aview/Manifest b/media-gfx/aview/Manifest new file mode 100644 index 000000000000..330f5e2c19d4 --- /dev/null +++ b/media-gfx/aview/Manifest @@ -0,0 +1,10 @@ +AUX aview-1.3.0_rc1-asciiview.patch 1936 SHA256 b0743c2ec3f374783d83e0e713fba3201f96f7543e8d70e989ce84bb6ae581c7 SHA512 3666e403e5ed8b4be557b8aea314e33e5ad7162c2d7c7291810b4bc6824161f53a5b5b5325c4a4667467f72582303693710750e1d30a3761304346bc335f6299 WHIRLPOOL 04f5333f09ed838f38a790b56215baa4c6a7cf51a6e43bb5a9f6d2f2b986c9b1b8d992666372288fe6b644b399971fd12c57d3091919a65556dc0842774cde70 +AUX aview-1.3.0_rc1-filename-spaces.patch 1393 SHA256 f2db2767fdb8340c2284cc56f00dfabdc084aae5cc36048a8859f28bf42491a8 SHA512 837ecdf7116946baa752db47a446bf48527b3a3aa1457a900a93117f06ee2e2dea3d7bcf8d82f220acf59db21617fb54fa1154802e3f06bcd341ef71780fb6ec WHIRLPOOL 1ceec0a1df389e157302c5b1ff5adbe7433ce67f4939dc0326b552328441df58bf0d9e1eff836678c4019d90799c3cb5b7e88add43e9d1c26b097fb25d3fbfcb +AUX aview-1.3.0_rc1-includes.patch 281 SHA256 f4f9def04b601ce2e987f3295187c2d4e139408e14424a19fce78d75c919cc5c SHA512 c8a5303be05a9205baba541e286725413fd8e8b161cb7d0bb1a32a8809b4e977ca12b9bd0df2c793be0e72e2353fdf9b09f96d541d361c5df87af7885cc350c7 WHIRLPOOL 04bfa4100b1cf3a05c4f23344479cc8d559a0df0ad2f1b2a54887d38ac78769cf9dc440a4f80a01f8d438ec40bb4904a8ca0385bd0e97026657d6f6e8bc8d71c +AUX aview-1.3.0_rc1-tmp_creation.patch 1142 SHA256 3d7c40f5ba8369243953206c9e2718277ec5acd091b2898a9fdf45f091e8eb15 SHA512 7fdc336cd2c595754f46948031722f87bb40b0e159950f84ed0959ccdacd01840c0d24dfeac6a9937ab456b8ed66e5c9b8d49a4e98ee45ec64295f8234249d06 WHIRLPOOL a4ab4ea462a946955bae449e94b039b56ceb1c671b42d56cdabb34718d22c74e66026895de34d21e6d1057458f908706770331b408cda58a3ccc3517419b1037 +DIST aview-1.3.0rc1.tar.gz 54317 SHA256 42d61c4194e8b9b69a881fdde698c83cb27d7eda59e08b300e73aaa34474ec99 SHA512 941f2a92aaf3852b403daf688cda4ca2eb82ec32ee6566cd2aef3d121f259f1bb0214f872c4d5020c658bd81adba0577313acc5972d2f44b295f21905e107144 WHIRLPOOL eae555567be4943f16542b75e6f68b7c7548d8028f16cfe12f46648ed27bd8cbd87189d1925e7fe16a7c86247f121aca82fa24f9e901844ec6e9f39c7bcff74d +EBUILD aview-1.3.0_rc1-r1.ebuild 706 SHA256 9373341aa937ea3e282f136845f4ece76fe3beb39ea6df7c14d287a3c6659e68 SHA512 2620ad6616b15520c0b8392df0c3e5260065641d097c2a9c597f53491fa7bcd23a37b6dcba3f6f85dbf13f3b6eb3ea57adae3c651f1c63604fbd6f0ae82d7d69 WHIRLPOOL 878610f0e7dbb05e097d327cf6614acb978b0917a224fef5dc0fdc656156d605918d6d303a96af81ada3876681fc2a7ca37763ca4cc31f0e2bdf9745d41f860f +EBUILD aview-1.3.0_rc1-r3.ebuild 801 SHA256 4cf22a3a4aabcf13fc78b52bde2a2225d8ecb50c1932ef9ce2db5c314028e72b SHA512 af951ac253755a996f8eee02a8edeac2bffd7f8e53a3a1b92f24a794cfe41ca7057c8a915ee7089250c4471f63ddd41c7f453fd9c417dc349c254c42017cd6fc WHIRLPOOL 86f31e3d3c71e0b7ceaa1a4decc7f4e5d99dd515e37f6d41f68712d135edeecf8c761dc9e67178c5fe23ff1939cf06e9620cd61d1bf126ae54172da7e46454d3 +MISC ChangeLog 2769 SHA256 bf6720b1a1344cf75c9a522e28117cb819b35117dc1edd4bd0c331f4b52e704b SHA512 180e4ed1ea72f4c25e1b91fca6c3f97f3c75ff450e0a7cd24a9f2840cc3bdc44fd839845d9a055529be43890ea65368a7c700d544f3ab4ce2538cf3ed0844347 WHIRLPOOL e38c29e292f30e1505d28b7ce47346e922e588cc961d189b3bcb395f251c8061f0b69c3526033c02a898bd6a074a782b08cddffeef34d8f6d651a507557cfbe2 +MISC ChangeLog-2015 3047 SHA256 36de70894d8ea261a25b0a06f93477d9c7a9dd4edbd26dc8b51e78d8481253a0 SHA512 3f7c05a73d1321f2acffd8442fde0737dc36fccdd66a517c2ff06a7d89291ae7aa101235284760391ae8ac688251caa495d5bd03033ea2cac6626dda819fa9e5 WHIRLPOOL 59e47881d46a6e6cce0f151782673cdb8d9d6ce08b32ab9c6754b801a6f873cf724ace3556544813ec5e9c6e34e1356afaeb5d21abe63fdd32efe05b90b0ea76 +MISC metadata.xml 252 SHA256 bf654be180aee21270abc2f2fc7d00a15293d1493c8a9f64a7c74921f9b2e48f SHA512 bd3eef9d63a167ed485cb156ca81b53649a9ed2bd4fbaf3f58328cadb09f5b4b65b2343a6f032b7540c445a98bb6c3abb3084f91dc1cf78ecfe9a067732e4385 WHIRLPOOL ccb1a885f19d99f41d153c620fa6abbe524466b30a4dfee62b9562b503ae8d512c5739fe3407443dd20f9a281d4a897186a9b8c48815ffbf6c07423d32600713 diff --git a/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild b/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild new file mode 100644 index 000000000000..1e5b6b8b0f42 --- /dev/null +++ b/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +inherit base + +MY_P=${P/_/} +S=${WORKDIR}/${MY_P/rc*/} +DESCRIPTION="An ASCII Image Viewer" +SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz" +HOMEPAGE="http://aa-project.sourceforge.net/aview/" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="amd64 ppc x86" +IUSE="" + +DEPEND=">=media-libs/aalib-1.4_rc4" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-filename-spaces.patch + "${FILESDIR}"/${P}-tmp_creation.patch + "${FILESDIR}"/${P}-includes.patch +) + +src_compile() { + econf || die + make aview || die +} + +src_install() { + into /usr + dobin aview asciiview + + doman *.1 + dodoc ANNOUNCE ChangeLog README TODO +} diff --git a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild new file mode 100644 index 000000000000..218cb86e9ff3 --- /dev/null +++ b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +inherit base + +MY_P=${P/_/} +S=${WORKDIR}/${MY_P/rc*/} +DESCRIPTION="An ASCII Image Viewer" +SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz" +HOMEPAGE="http://aa-project.sourceforge.net/aview/" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +IUSE="" + +DEPEND=">=media-libs/aalib-1.4_rc4" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-asciiview.patch + "${FILESDIR}"/${P}-includes.patch +) + +src_prepare() { + base_src_prepare + + sed -i -e 's:#include :#include :g' "${S}"/*.c || die +} + +src_compile() { + make aview +} + +src_install() { + dobin aview asciiview + + doman *.1 + dodoc ANNOUNCE ChangeLog README TODO +} diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch b/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch new file mode 100644 index 000000000000..6d71bbb967b1 --- /dev/null +++ b/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch @@ -0,0 +1,76 @@ +Support spaces in filenames (bug #39207) based on a patch from +kyberneticist AT yahoo DOT com with additional fixes to address bug +#293654 by Kevin McCarthy + +Fix insecure temporary file permissions (bug #235808) based on a patch from +Robert Buchholz + +Fix ignored interactive keyboard commands when aview is called from the +asciiview script (bug #293654) by Kevin McCarthy + +Rollup patch created by Kevin McCarthy + +--- asciiview ++++ asciiview +@@ -3,13 +3,13 @@ + 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 ++ 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,27 +44,34 @@ + options="$options $1" + shift + ;; +- *) +- filenames="$filenames $1" ++ *) ++ if [ "$filenames" = "" ] ++ then ++ filenames=$1 #avoid leading null ++ else ++ filenames=$(echo -e "$filenames\n$1") ++ fi + shift + ;; + esac + done + trap clear 0 +-mkfifo /tmp/aview$$.pgm +-outfile=/tmp/aview$$.pgm +-for name in $filenames ; do +-if test -r $name ; then +-case $name in ++tmpdir=`mktemp -t -d` ++outfile=$tmpdir/aview.pgm ++mkfifo $outfile ++exec 3<&0 ++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" "$outfile" >"$outfile" & + pid=$! + PATH="$PATH:." +- aview $options /tmp/aview$$.pgm ++ aview $options $outfile <&3 + kill $pid 2>/dev/null + esac + else 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 new file mode 100644 index 000000000000..e42ed0d5c583 --- /dev/null +++ b/media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch @@ -0,0 +1,53 @@ +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-includes.patch b/media-gfx/aview/files/aview-1.3.0_rc1-includes.patch new file mode 100644 index 000000000000..3e5006b4c549 --- /dev/null +++ b/media-gfx/aview/files/aview-1.3.0_rc1-includes.patch @@ -0,0 +1,11 @@ +Index: aview-1.3.0/main.c +=================================================================== +--- aview-1.3.0.orig/main.c ++++ aview-1.3.0/main.c +@@ -1,4 +1,6 @@ + #include ++#include ++#include + #include "image.h" + #include "ui.h" + #include "config.h" 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 new file mode 100644 index 000000000000..f792e8bfebbb --- /dev/null +++ b/media-gfx/aview/files/aview-1.3.0_rc1-tmp_creation.patch @@ -0,0 +1,46 @@ +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 diff --git a/media-gfx/aview/metadata.xml b/media-gfx/aview/metadata.xml new file mode 100644 index 000000000000..89e6ed9726f3 --- /dev/null +++ b/media-gfx/aview/metadata.xml @@ -0,0 +1,8 @@ + + + + + + aa-project + + -- cgit v1.2.3