Added new 0.4.4 version which was missing. Added new revisions to fix format string vulnerabilities.

(Portage version: 2.0.51.22-r1)

10 files changed, 255 insertions, 17 deletions

diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index 72cec8541270..b3723be5a9c2 100644
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/gxine
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.32 2005/04/19 09:20:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.33 2005/05/24 14:01:03 flameeyes Exp $
+
+*gxine-0.4.4 (24 May 2005)
+*gxine-0.4.1-r1 (24 May 2005)
+*gxine-0.3.3-r2 (24 May 2005)
+
+  24 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/gxine-0.3.3-secfix.patch, +files/gxine-0.4.4-secfix.patch,
+  +gxine-0.3.3-r2.ebuild, +gxine-0.4.1-r1.ebuild, +gxine-0.4.4.ebuild:
+  Added new 0.4.4 version which was missing. Added new revisions to fix format
+  string vulnerabilities.
 
   19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove retired developer from metadata.xml.
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index d79346a28d76..e8cc793e7381 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -1,21 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 feffa186e0e9f65b29b011da1fa043c0 gxine-0.4.3.ebuild 1456
 MD5 4a89cde90b8941f521faaade2170dbac ChangeLog 4153
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 cafe249a3ad39fdbb4a2e3991dc00f91 gxine-0.4.1.ebuild 1338
 MD5 e7e292bd9b33c877797d54c58b4db1b1 gxine-0.3.3-r1.ebuild 1377
-MD5 0b50a3889d71fe54fb9249c53257d9d6 files/gxine-0.4.1-menu-fix.patch 873
+MD5 cafe249a3ad39fdbb4a2e3991dc00f91 gxine-0.4.1.ebuild 1338
+MD5 feffa186e0e9f65b29b011da1fa043c0 gxine-0.4.3.ebuild 1456
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 b4923d4ce8f9370f5a1360ec6e1c1a4a gxine-0.3.3-r2.ebuild 1458
+MD5 e8a7b6fa63246db65880ed0327822b7f gxine-0.4.1-r1.ebuild 1465
+MD5 50ace22340164cd733418be4bf6c5250 gxine-0.4.4.ebuild 1538
+MD5 689afd25d46e954e12a5ab290aa4c29b files/gxine-0.3.3-secfix.patch 635
 MD5 a0134d60cfc89d88f7f76826e3728379 files/digest-gxine-0.3.3-r1 64
-MD5 b18643e0d818679a729863e11852b1ac files/gxine-0.3.3-Makefile.in.patch 360
 MD5 69140a1cb8cc6acb6ffdca76e9301493 files/digest-gxine-0.4.1 64
-MD5 2a140bbbc46a7d9e1117771638ad8d60 files/gxine-0.3.3-http-overflow.patch 484
 MD5 7ddbda50741fc22459217975509408cd files/digest-gxine-0.4.3 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCZM1yKf2g/qXtneoRAoP+AJ9+rnTBnqyVm/QjG1c00EKtaTbKNwCfZpr/
-pcpLjzR902pTDBcRBvjESNU=
-=8w5S
------END PGP SIGNATURE-----
+MD5 b18643e0d818679a729863e11852b1ac files/gxine-0.3.3-Makefile.in.patch 360
+MD5 2a140bbbc46a7d9e1117771638ad8d60 files/gxine-0.3.3-http-overflow.patch 484
+MD5 0b50a3889d71fe54fb9249c53257d9d6 files/gxine-0.4.1-menu-fix.patch 873
+MD5 a5dc1655a0734939aaf026899e7c97a8 files/gxine-0.4.4-secfix.patch 515
+MD5 a0134d60cfc89d88f7f76826e3728379 files/digest-gxine-0.3.3-r2 64
+MD5 69140a1cb8cc6acb6ffdca76e9301493 files/digest-gxine-0.4.1-r1 64
+MD5 bd3744a1ecbba9a89f8fb1ded2e58e30 files/digest-gxine-0.4.4 64
diff --git a/media-video/gxine/files/digest-gxine-0.3.3-r2 b/media-video/gxine/files/digest-gxine-0.3.3-r2
new file mode 100644
index 000000000000..6a3e9fa9bf88
--- /dev/null
+++ b/media-video/gxine/files/digest-gxine-0.3.3-r2
@@ -0,0 +1 @@
+MD5 d54af2f901065555348a77fa3b61581e gxine-0.3.3.tar.gz 1038778
diff --git a/media-video/gxine/files/digest-gxine-0.4.1-r1 b/media-video/gxine/files/digest-gxine-0.4.1-r1
new file mode 100644
index 000000000000..5358c15b173f
--- /dev/null
+++ b/media-video/gxine/files/digest-gxine-0.4.1-r1
@@ -0,0 +1 @@
+MD5 4a04df0d971a8952fb395b6eb0bc8dab gxine-0.4.1.tar.gz 1286144
diff --git a/media-video/gxine/files/digest-gxine-0.4.4 b/media-video/gxine/files/digest-gxine-0.4.4
new file mode 100644
index 000000000000..84ae884659f9
--- /dev/null
+++ b/media-video/gxine/files/digest-gxine-0.4.4
@@ -0,0 +1 @@
+MD5 9c9c2f28412ecb1befa27bcd6ac1aacc gxine-0.4.4.tar.gz 1319862
diff --git a/media-video/gxine/files/gxine-0.3.3-secfix.patch b/media-video/gxine/files/gxine-0.3.3-secfix.patch
new file mode 100644
index 000000000000..07f7af07ceb4
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.3.3-secfix.patch
@@ -0,0 +1,20 @@
+diff -ur gxine-0.3.3/src/utils.c gxine-0.3.3-secfix/src/utils.c
+--- gxine-0.3.3/src/utils.c	2003-03-20 20:03:07.000000000 +0100
++++ gxine-0.3.3-secfix/src/utils.c	2005-05-24 15:29:14.314623648 +0200
+@@ -177,6 +177,7 @@
+ 				   GTK_DIALOG_DESTROY_WITH_PARENT,
+ 				   GTK_MESSAGE_ERROR,
+ 				   GTK_BUTTONS_CLOSE,
++				   "%s",
+ 				   msg);
+ 
+   gtk_window_set_title (GTK_WINDOW (dialog), title);
+@@ -202,6 +203,7 @@
+ 				   GTK_DIALOG_DESTROY_WITH_PARENT,
+ 				   GTK_MESSAGE_INFO,
+ 				   GTK_BUTTONS_CLOSE,
++				   "%s",
+ 				   msg);
+ 
+   gtk_window_set_title (GTK_WINDOW (dialog), title);
+Only in gxine-0.3.3-secfix/src: utils.c~
diff --git a/media-video/gxine/files/gxine-0.4.4-secfix.patch b/media-video/gxine/files/gxine-0.4.4-secfix.patch
new file mode 100644
index 000000000000..242b428ee745
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.4.4-secfix.patch
@@ -0,0 +1,12 @@
+diff -ur gxine-0.4.4/src/utils.c gxine-0.4.4-secfix/src/utils.c
+--- gxine-0.4.4/src/utils.c	2005-03-17 01:55:23.000000000 +0100
++++ gxine-0.4.4-secfix/src/utils.c	2005-05-24 15:11:20.002943848 +0200
+@@ -164,7 +164,7 @@
+   va_end (ap);
+ 
+   dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, type,
+-				   GTK_BUTTONS_CLOSE, msg);
++				   GTK_BUTTONS_CLOSE, "%s", msg);
+   gtk_window_set_title (GTK_WINDOW (dialog), title);
+   gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
+ 
diff --git a/media-video/gxine/gxine-0.3.3-r2.ebuild b/media-video/gxine/gxine-0.3.3-r2.ebuild
new file mode 100644
index 000000000000..c9d7a2f6ebd5
--- /dev/null
+++ b/media-video/gxine/gxine-0.3.3-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.3.3-r2.ebuild,v 1.1 2005/05/24 14:01:03 flameeyes Exp $
+
+inherit eutils nsplugins
+
+DESCRIPTION="GTK+ Front-End for libxine"
+HOMEPAGE="http://xine.sourceforge.net/"
+LICENSE="GPL-2"
+
+DEPEND="media-libs/libpng
+	>=media-libs/xine-lib-1_beta10
+	>=x11-libs/gtk+-2.0.0
+	lirc? ( app-misc/lirc )
+	X? ( virtual/x11 )"
+RDEPEND="nls? ( sys-devel/gettext )"
+
+IUSE="X nls lirc"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	#fixes bug #65303 with missing X11 libs
+	epatch ${FILESDIR}/${P}-Makefile.in.patch
+
+	#fixes bug http overflow security bug #70055
+	epatch ${FILESDIR}/${P}-http-overflow.patch
+
+	#fixes format string security bug #93532
+	epatch ${FILESDIR}/${P}-secfix.patch
+}
+
+src_compile() {
+
+	# Most of these are not working currently, but are here for completeness
+	local myconf
+	use X	   || myconf="${myconf} --disable-x11 --disable-xv"
+
+	myconf="${myconf} $(use_enable nls)"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+
+	make DESTDIR=${D} \
+		docdir=/usr/share/doc/${PF} \
+		docsdir=/usr/share/doc/${PF} \
+		install || die
+
+	insinto /usr/share/pixmaps
+	doins pixmaps/gxine-logo.png
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+
+	inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
+}
diff --git a/media-video/gxine/gxine-0.4.1-r1.ebuild b/media-video/gxine/gxine-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..caa4c86518dd
--- /dev/null
+++ b/media-video/gxine/gxine-0.4.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.4.1-r1.ebuild,v 1.1 2005/05/24 14:01:03 flameeyes Exp $
+
+inherit eutils nsplugins fdo-mime
+
+DESCRIPTION="GTK+ Front-End for libxine"
+HOMEPAGE="http://xine.sourceforge.net/"
+LICENSE="GPL-2"
+
+DEPEND="media-libs/libpng
+	>=media-libs/xine-lib-1_beta10
+	>=x11-libs/gtk+-2.4
+	>=dev-libs/glib-2.4
+	lirc? ( app-misc/lirc )
+	X? ( virtual/x11 )"
+RDEPEND="nls? ( sys-devel/gettext )"
+
+IUSE="nls lirc mozilla"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-menu-fix.patch
+
+	#fixes format string security bug #93532
+	epatch ${FILESDIR}/${PN}-0.4.4-secfix.patch
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable lirc) \
+		$(use_with mozilla browser-plugin) \
+		--disable-dependency-tracking || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} \
+		docdir=/usr/share/doc/${PF} \
+		docsdir=/usr/share/doc/${PF} \
+		install || die
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	newins pixmaps/gxine-logo.png gxine.png
+
+	insinto /usr/share/pixmaps
+	doins pixmaps/gxine-logo.png
+
+	use mozilla && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/media-video/gxine/gxine-0.4.4.ebuild b/media-video/gxine/gxine-0.4.4.ebuild
new file mode 100644
index 000000000000..ae3e1c00409a
--- /dev/null
+++ b/media-video/gxine/gxine-0.4.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.4.4.ebuild,v 1.1 2005/05/24 14:01:03 flameeyes Exp $
+
+inherit eutils nsplugins fdo-mime
+
+DESCRIPTION="GTK+ Front-End for libxine"
+HOMEPAGE="http://xine.sourceforge.net/"
+LICENSE="GPL-2"
+
+DEPEND="media-libs/libpng
+	>=media-libs/xine-lib-1_beta10
+	>=x11-libs/gtk+-2.4
+	>=dev-libs/glib-2.4
+	dev-lang/spidermonkey
+	lirc? ( app-misc/lirc )
+	X? ( virtual/x11 )"
+RDEPEND="nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+IUSE="nls lirc mozilla"
+
+SLOT="0"
+# Those needs spidermonkey: ~ppc64 ~sparc
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.4.1-menu-fix.patch
+
+	#fixes format string security bug #93532
+	epatch ${FILESDIR}/${P}-secfix.patch
+
+	# Fix icon as per icon theme specs.
+	sed -i -e 's:gxine-logo.png:gxine:' ${S}/gxine.desktop
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable lirc) \
+		--disable-dependency-tracking || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} \
+		docdir=/usr/share/doc/${PF} \
+		docsdir=/usr/share/doc/${PF} \
+		install || die
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	newins pixmaps/gxine-logo.png gxine.png
+
+	use mozilla && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}