From 88de9d7023eef69eab542dd57883a70c0075542d Mon Sep 17 00:00:00 2001 From: Michael Januszewski Date: Sat, 15 Apr 2006 21:39:19 +0000 Subject: Removed an old ebuild. Added a fix for an insecure temp. file creation problem in fbgs (bug #129470). Package-Manager: portage-2.1_pre7-r5 --- media-gfx/fbida/ChangeLog | 9 +++- media-gfx/fbida/fbida-2.03-r3.ebuild | 84 +++++++++++++++++++++++++++++ media-gfx/fbida/fbida-2.03.ebuild | 65 ---------------------- media-gfx/fbida/files/digest-fbida-2.03 | 1 - media-gfx/fbida/files/digest-fbida-2.03-r3 | 3 ++ media-gfx/fbida/files/fbida-2.03-fbgs.patch | 14 +++++ 6 files changed, 109 insertions(+), 67 deletions(-) create mode 100644 media-gfx/fbida/fbida-2.03-r3.ebuild delete mode 100644 media-gfx/fbida/fbida-2.03.ebuild delete mode 100644 media-gfx/fbida/files/digest-fbida-2.03 create mode 100644 media-gfx/fbida/files/digest-fbida-2.03-r3 create mode 100644 media-gfx/fbida/files/fbida-2.03-fbgs.patch (limited to 'media-gfx') diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog index 104758a30135..8749582b66e8 100644 --- a/media-gfx/fbida/ChangeLog +++ b/media-gfx/fbida/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/fbida # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.15 2006/04/09 17:13:34 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.16 2006/04/15 21:39:19 spock Exp $ + +*fbida-2.03-r3 (15 Apr 2006) + + 15 Apr 2006; Michał Januszewski -fbida-2.03.ebuild, + +fbida-2.03-r3.ebuild: + Removed an old ebuild. Added a fix for an insecure temp. file creation + problem in fbgs (bug #129470). 09 Apr 2006; Jeroen Roovers fbida-2.03-r2.ebuild: Marked ~hppa (bug #119923). diff --git a/media-gfx/fbida/fbida-2.03-r3.ebuild b/media-gfx/fbida/fbida-2.03-r3.ebuild new file mode 100644 index 000000000000..757eb6e6930f --- /dev/null +++ b/media-gfx/fbida/fbida-2.03-r3.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.03-r3.ebuild,v 1.1 2006/04/15 21:34:37 spock Exp $ + +inherit eutils + +DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)." +HOMEPAGE="http://linux.bytesex.org/fbida/" +SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~hppa ~ppc ppc64 ~sparc ~x86" +IUSE="png jpeg gif tiff curl lirc X fbcon pdf" + +RDEPEND="jpeg? ( >=media-libs/jpeg-6b ) + png? ( media-libs/libpng ) + gif? ( media-libs/giflib ) + pdf? ( virtual/ghostscript media-libs/tiff ) + tiff? ( media-libs/tiff ) + curl? ( net-misc/curl ) + lirc? ( app-misc/lirc ) + X? ( || ( ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm ) + virtual/x11 ) + virtual/motif ) + !media-gfx/fbi + media-libs/libexif + >=media-libs/freetype-2.0 + >=media-libs/fontconfig-2.2" + +DEPEND="${RDEPEND} + X? ( || ( ( x11-proto/xextproto x11-proto/xproto ) + virtual/x11 ) )" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-fbgs.patch + sed -e 's/DGifOpenFileName,ungif/DGifOpenFileName,gif/' \ + -e 's/-lungif/-lgif/' -i ${S}/GNUmakefile +} + +src_compile() { + # Let autoconf do its job and then fix things to build fbida + # according to our specifications + emake Make.config || die + + set_feat() { + local useflag=${1} + local config=${2} + + local option="yes" + if ! use ${useflag}; then + option="no" + fi + + sed -e "s/${config}.*/${config} := ${option}/" -i ${S}/Make.config + } + + set_feat fbcon HAVE_LINUX_FB_H + set_feat X HAVE_MOTIF + set_feat tiff HAVE_LIBTIFF + + # The 'pdf' flag forces the use of libtiff. + set_feat pdf HAVE_LIBTIFF + set_feat png HAVE_LIBPNG + set_feat gif HAVE_LIBUNGIF + set_feat lirc HAVE_LIBLIRC + set_feat curl HAVE_LIBCURL + + emake || die +} + +src_install() { + make \ + DESTDIR=${D} \ + prefix=/usr \ + install || die + dodoc README + + if ! use pdf; then + rm -f ${D}/usr/bin/fbgs ${D}/usr/share/man/man1/fbgs.1 + fi +} diff --git a/media-gfx/fbida/fbida-2.03.ebuild b/media-gfx/fbida/fbida-2.03.ebuild deleted file mode 100644 index 2ebd053eebe0..000000000000 --- a/media-gfx/fbida/fbida-2.03.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.03.ebuild,v 1.5 2006/01/22 14:54:50 spock Exp $ - -DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)." -HOMEPAGE="http://linux.bytesex.org/fbida/" -SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86" -IUSE="png jpeg gif tiff curl lirc X fbcon" - -RDEPEND="jpeg? ( >=media-libs/jpeg-6b ) - png? ( media-libs/libpng ) - gif? ( media-libs/giflib ) - tiff? ( media-libs/tiff ) - curl? ( net-misc/curl ) - lirc? ( app-misc/lirc ) - X? ( || ( ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm ) - virtual/x11 ) - virtual/motif ) - media-libs/libexif - !media-gfx/fbi" - -DEPEND="${RDEPEND} - X? ( || ( ( x11-proto/xextproto x11-proto/xproto ) - virtual/x11 ) )" - -src_compile() { - # let autoconf do its job and then fix things to build fbida - # according to our specifications - emake Make.config || die - if ! use fbcon; then - sed -e 's/HAVE_LINUX_FB_H.*/HAVE_LINUX_FB_H := no/' -i ${S}/Make.config - fi - if ! use X; then - sed -e 's/HAVE_MOTIF.*/HAVE_MOTIF := no/' -i ${S}/Make.config - fi - if ! use tiff; then - sed -e 's/HAVE_LIBTIFF.*/HAVE_LIBTIFF := no/' -i ${S}/Make.config - fi - if ! use png; then - sed -e 's/HAVE_LIBPNG.*/HAVE_LIBPNG := no/' -i ${S}/Make.config - fi - if ! use gif; then - sed -e 's/HAVE_LIBUNGIF.*/HAVE_LIBUNGIF := no/' -i ${S}/Make.config - fi - if ! use lirc; then - sed -e 's/HAVE_LIBLIRC.*/HAVE_LIBLIRC := no/' -i ${S}/Make.config - fi - if ! use curl; then - sed -e 's/HAVE_LIBCURL.*/HAVE_LIBCURL := no/' -i ${S}/Make.config - fi - - emake || die -} - -src_install() { - make \ - DESTDIR=${D} \ - prefix=/usr \ - install || die - dodoc README -} diff --git a/media-gfx/fbida/files/digest-fbida-2.03 b/media-gfx/fbida/files/digest-fbida-2.03 deleted file mode 100644 index 2a165f0ce84e..000000000000 --- a/media-gfx/fbida/files/digest-fbida-2.03 +++ /dev/null @@ -1 +0,0 @@ -MD5 8fd76661686a38a7bcd251b7aadc73eb fbida-2.03.tar.gz 205955 diff --git a/media-gfx/fbida/files/digest-fbida-2.03-r3 b/media-gfx/fbida/files/digest-fbida-2.03-r3 new file mode 100644 index 000000000000..b9c2da50d5d8 --- /dev/null +++ b/media-gfx/fbida/files/digest-fbida-2.03-r3 @@ -0,0 +1,3 @@ +MD5 8fd76661686a38a7bcd251b7aadc73eb fbida-2.03.tar.gz 205955 +RMD160 f2ee360dd7f86c69c9bf482d79ec921dfdf3c65a fbida-2.03.tar.gz 205955 +SHA256 457ab582926337924b4de1b6d022193e6995340f838915f3d44c332f2bde54e6 fbida-2.03.tar.gz 205955 diff --git a/media-gfx/fbida/files/fbida-2.03-fbgs.patch b/media-gfx/fbida/files/fbida-2.03-fbgs.patch new file mode 100644 index 000000000000..f0c95fb24fa0 --- /dev/null +++ b/media-gfx/fbida/files/fbida-2.03-fbgs.patch @@ -0,0 +1,14 @@ +diff -Naurp fbida-2.03-orig/fbgs fbida-2.03/fbgs +--- fbida-2.03-orig/fbgs 2006-04-15 22:40:55.000000000 +0200 ++++ fbida-2.03/fbgs 2006-04-15 22:41:56.000000000 +0200 +@@ -1,8 +1,8 @@ + #!/bin/bash + + # tmp dir +-DIR="${TMPDIR-/var/tmp}/fbps-$$" +-mkdir -p $DIR || exit 1 ++DIR=`mktemp -dtp /tmp fbgs-XXXXXX` ++[ -d $DIR ] || exit 1 + trap "rm -rf $DIR" EXIT + + # parse options -- cgit v1.2.3-65-gdbad