diff options
Diffstat (limited to 'media-gfx/aview')
-rw-r--r-- | media-gfx/aview/Manifest | 5 | ||||
-rw-r--r-- | media-gfx/aview/aview-1.3.0_rc1-r1.ebuild | 39 | ||||
-rw-r--r-- | media-gfx/aview/aview-1.3.0_rc1-r3.ebuild | 2 | ||||
-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 |
5 files changed, 2 insertions, 143 deletions
diff --git a/media-gfx/aview/Manifest b/media-gfx/aview/Manifest index 3b80b6f4c546..93f528a586f7 100644 --- a/media-gfx/aview/Manifest +++ b/media-gfx/aview/Manifest @@ -1,8 +1,5 @@ AUX aview-1.3.0_rc1-asciiview.patch 1936 BLAKE2B bdf5ba38805fb2f8920ca9c3b342a69b76b01d33df5667a57ba0cbdcde576f8847f7b0cac420f3744516f74725e72ef1170d44a21a53536046d33329d6a7a83e SHA512 3666e403e5ed8b4be557b8aea314e33e5ad7162c2d7c7291810b4bc6824161f53a5b5b5325c4a4667467f72582303693710750e1d30a3761304346bc335f6299 -AUX aview-1.3.0_rc1-filename-spaces.patch 1393 BLAKE2B 054b0bfc569394f305ebfcadddb46b7e6cb432284c5fe90ccd99429b9e5fd504d1baf30a50aa58b78fa520280b2b00cebbd372d93f8660a8029002f2e0e19271 SHA512 837ecdf7116946baa752db47a446bf48527b3a3aa1457a900a93117f06ee2e2dea3d7bcf8d82f220acf59db21617fb54fa1154802e3f06bcd341ef71780fb6ec AUX aview-1.3.0_rc1-includes.patch 281 BLAKE2B 768cd3d142a119910e88b0cd219ec1a431549df18427cb3ae22fd91ae99ec23fc223da8025fc9bff82fd8268dcb7dcd017d0c53ad6c323bd4e3735cd9f658b38 SHA512 c8a5303be05a9205baba541e286725413fd8e8b161cb7d0bb1a32a8809b4e977ca12b9bd0df2c793be0e72e2353fdf9b09f96d541d361c5df87af7885cc350c7 -AUX aview-1.3.0_rc1-tmp_creation.patch 1142 BLAKE2B 6042d5b39f2a0f9a4be0207b8d57ff55ef203ed9d6d80ccb593770cc2864262dcc7850bb17ad0414702cad1fc7d17c6ad95d3580dd4ad5639c59d9c719c6aedc SHA512 7fdc336cd2c595754f46948031722f87bb40b0e159950f84ed0959ccdacd01840c0d24dfeac6a9937ab456b8ed66e5c9b8d49a4e98ee45ec64295f8234249d06 DIST aview-1.3.0rc1.tar.gz 54317 BLAKE2B 3a47dab51763f7c5cd9d4d5950437f3e0b86b46a9bf498c93e88258daefb511c82789b1d4bb1288844dbc70aae033fd0ffd9ffab4b28eb553effa7a2c777ef69 SHA512 941f2a92aaf3852b403daf688cda4ca2eb82ec32ee6566cd2aef3d121f259f1bb0214f872c4d5020c658bd81adba0577313acc5972d2f44b295f21905e107144 -EBUILD aview-1.3.0_rc1-r1.ebuild 714 BLAKE2B c73e2364234b5b75fab250963c43ef13924c6dcab5333a9e405701e1b7adc35d7830f71645e707a6562d145240ecfe5720a46179e875d1b4dae23387944b0ecf SHA512 4ac6bfc8e11ba1e4d1b6dc8764e963f736a6735a0a1cd6ae817cc17f7050899cd5919f11866f1a97c5cf1ee71f3ed0f023b9e547d9765bf5594f1478f5686449 -EBUILD aview-1.3.0_rc1-r3.ebuild 797 BLAKE2B 92753bfee226b1ab02f967b79630d7b50414d1287fe6240bf2ded478602d53c4c04363ef5051bbb8c0ce08774028475d1bb49357c867ec502d3c6ef51f9bc5fb SHA512 ebf8304bed3b79d21e214501f43ebe095124b5af606c826f4de0cf0479db3da8a47e7d96fe14eaa717f251dcc0000c88d056de2e08cca33cceb14234c32ef7bd +EBUILD aview-1.3.0_rc1-r3.ebuild 795 BLAKE2B c5555997150e6ced634ebf32f6b98614edbefad00a26154c5331ef4a7d3e160f88853930c58f77fb85fda25b27c65aff00a9d882d4e832abfe9774522d50203b SHA512 8d627352973103e17ccf063302ce96bb772b1c0453326a3783281757222cb9eb2956b4b07da23964d6fad06ac9961f590be021e9910cc0fbcfe61932c7071796 MISC metadata.xml 252 BLAKE2B e7a66be557802d7ca467631d022e882e2985f5d724603ca154106cc8ac13a6c13bb9d2c9d69cfc68871ec9473dc93e883e62d6463496d5ce8987546dfe2afeb3 SHA512 bd3eef9d63a167ed485cb156ca81b53649a9ed2bd4fbaf3f58328cadb09f5b4b65b2343a6f032b7540c445a98bb6c3abb3084f91dc1cf78ecfe9a067732e4385 diff --git a/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild b/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild deleted file mode 100644 index d7700f082355..000000000000 --- a/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -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 index 938ed7cb773a..4487794334ea 100644 --- a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild +++ b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://aa-project.sourceforge.net/aview/" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="" DEPEND=">=media-libs/aalib-1.4_rc4" 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 |