Security Fix, see bug #195996

(Portage version: 2.1.3.15)

4 files changed, 117 insertions, 1 deletions

diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index 4cb2eb58c981..98896272573d 100644
--- a/media-gfx/hugin/ChangeLog
+++ b/media-gfx/hugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/hugin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.26 2007/10/13 00:06:49 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.27 2007/10/25 23:51:40 lu_zero Exp $
+
+*hugin-0.6.1-r1 (25 Oct 2007)
+
+  25 Oct 2007; Luca Barbato <lu_zero@gentoo.org>
+  +files/hugin-0.6.1-1_0.6.1-1.1.patch, +hugin-0.6.1-r1.ebuild:
+  Security Fix, see bug #195996. Debian patch applied
 
   13 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> hugin-0.5_rc1-r2.ebuild,
   hugin-0.5.ebuild, hugin-0.6.1.ebuild, hugin-0.7_beta4.ebuild:
diff --git a/media-gfx/hugin/files/digest-hugin-0.6.1-r1 b/media-gfx/hugin/files/digest-hugin-0.6.1-r1
new file mode 100644
index 000000000000..f1c1d678e694
--- /dev/null
+++ b/media-gfx/hugin/files/digest-hugin-0.6.1-r1
@@ -0,0 +1,3 @@
+MD5 46bc3136d42acbabab837128ff471507 hugin-0.6.1.tar.bz2 2151921
+RMD160 4d5c1fa47f0bbe0ce452cab90443d7bd4b6e602a hugin-0.6.1.tar.bz2 2151921
+SHA256 18546d42ef15154246d5b84ebde847aa2cf003c6305cc64a17cc5396db346ae7 hugin-0.6.1.tar.bz2 2151921
diff --git a/media-gfx/hugin/files/hugin-0.6.1-1_0.6.1-1.1.patch b/media-gfx/hugin/files/hugin-0.6.1-1_0.6.1-1.1.patch
new file mode 100644
index 000000000000..cd098f07e3c1
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-0.6.1-1_0.6.1-1.1.patch
@@ -0,0 +1,36 @@
+--- hugin-0.6.1.orig/src/hugin/AutoCtrlPointCreator.cpp
++++ hugin-0.6.1/src/hugin/AutoCtrlPointCreator.cpp
+@@ -224,8 +224,7 @@
+ 		wxSetWorkingDirectory(apDir);
+ 	}
+ #endif
+-
+-    wxString ptofile(wxT("autopano_result_tempfile.pto"));
++    wxString ptofile = wxFileName::CreateTempFileName(wxT("ap_res"));
+     autopanoArgs.Replace(wxT("%o"), ptofile);
+     wxString tmp;
+     tmp.Printf(wxT("%d"), nFeatures);
+@@ -415,7 +414,7 @@
+         imgNr++;
+     }
+ 
+-    wxString ptofile(wxT("autopano_result_tempfile"));
++    wxString ptofile = wxFileName::CreateTempFileName(wxT("ap_res"));
+     autopanoArgs.Replace(wxT("%o"), ptofile);
+     wxString tmp;
+     tmp.Printf(wxT("%d"), nFeatures);
+only in patch2:
+unchanged:
+--- hugin-0.6.1.orig/src/Panorama/PTOptimise.cpp
++++ hugin-0.6.1/src/Panorama/PTOptimise.cpp
+@@ -36,8 +36,8 @@
+ #include <boost/property_map.hpp>
+ #include <boost/graph/graph_utility.hpp>
+ 
+-#define DEBUG_WRITE_OPTIM_OUTPUT
+-#define DEBUG_WRITE_OPTIM_OUTPUT_FILE "hugin_debug_optim_results.txt"
++//#define DEBUG_WRITE_OPTIM_OUTPUT
++//#define DEBUG_WRITE_OPTIM_OUTPUT_FILE "hugin_debug_optim_results.txt"
+ 
+ using namespace std;
+ using namespace PT;
diff --git a/media-gfx/hugin/hugin-0.6.1-r1.ebuild b/media-gfx/hugin/hugin-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..63b876365226
--- /dev/null
+++ b/media-gfx/hugin/hugin-0.6.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.6.1-r1.ebuild,v 1.1 2007/10/25 23:51:40 lu_zero Exp $
+
+inherit wxwidgets eutils
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2 SIFT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="unicode debug enblend sift"
+
+DEPEND=">=media-libs/libpano12-2.8.4
+		>=dev-libs/boost-1.30.0
+		=x11-libs/wxGTK-2.6*
+		sys-libs/zlib
+		media-libs/libpng
+		media-libs/jpeg
+		media-libs/tiff
+		enblend? ( >=media-gfx/enblend-2.4 )
+		sift? ( media-gfx/autopano-sift )"
+
+pkg_setup() {
+	if ! built_with_use --missing true dev-libs/boost threads ; then
+		local msg="Build dev-libs/boost with USE=threads"
+		eerror "$msg"
+		die "$msg"
+	fi
+	if ! use enblend; then
+		elog "It is recommended to emerge this package with the"
+		elog "enblend use flag to install media-gfx/enblend"
+		elog "that blends the seams between images in a panorama."
+	fi
+	if ! use sift; then
+		elog "It is recommended to emerge this package with the"
+		elog "sift use flag to install media-gfx/autopano-sift"
+		elog "that produces control points between images in a"
+		elog "panorama."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	sed -i -e 's/autopanog\.exe/autopanog/' "${S}"/src/include/hugin/config_defaults.h
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-1_0.6.1-1.1.patch"
+}
+
+src_compile() {
+	export WX_GTK_VER="2.6"
+
+	if use unicode; then
+		need-wxwidgets unicode || die "Emerge wxGTK with unicode in USE"
+	else
+		need-wxwidgets gtk2 || die "Emerge wxGTK with gtk2 in USE"
+	fi
+
+	myconf="`use_with unicode`
+			`use_enable debug`"
+
+	econf --with-wx-config="${WX_CONFIG}" ${myconf} || die "configure failed"
+	emake || die "compiling failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	dodoc AUTHORS BUGS README TODO
+}