Fix insecure creation of temporary files, bug #351724. Drop vulnerable versions.

(Portage version: 2.2.0_alpha15/cvs/Linux x86_64)

14 files changed, 56 insertions, 1336 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index 6dd25633338d..f5f397179b40 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-plugins/gnash
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.52 2010/12/06 22:44:21 chithanh Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.53 2011/01/17 16:00:06 chithanh Exp $
+
+  17 Jan 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -files/gnash-0.8.5-moc-qt4.patch, -files/gnash-0.8.x-libpng14.patch,
+  -gnash-0.8.5.ebuild, -files/gnash-0.8.5-xpcom-idldir.patch,
+  -files/gnash-0.8.5-xpidl-sdkdir.patch, -gnash-0.8.6.ebuild,
+  -files/gnash-0.8.6-libcore-as3-headers.patch,
+  -files/gnash-0.8.6-libssh-0.4.patch, -gnash-0.8.7.ebuild,
+  -files/gnash-0.8.7-klash.patch, -files/gnash-0.8.7-xpcom-idldir.patch,
+  gnash-0.8.8.ebuild, +files/gnash-0.8.8-secure-tempfile-creation.patch:
+  Fix insecure creation of temporary files, bug #351724. Drop vulnerable
+  versions.
 
   06 Dec 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   gnash-0.8.5.ebuild, gnash-0.8.6.ebuild, gnash-0.8.7.ebuild,
diff --git a/www-plugins/gnash/files/gnash-0.8.5-moc-qt4.patch b/www-plugins/gnash/files/gnash-0.8.5-moc-qt4.patch
deleted file mode 100644
index bc8e062cf7b4..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.5-moc-qt4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/macros/qt4.m4	2009-03-02 16:29:42.000000000 +0100
-+++ b/macros/qt4.m4	2009-09-08 14:53:31.355928666 +0200
-@@ -165,8 +165,8 @@
-       has_qt4="no"
-     fi
- 
--    AC_PATH_PROG(MOC4, moc-qt4, ,[${QTDIR}/bin /usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
--    AC_PATH_PROG(UIC4, uic-qt4, ,[${QTDIR}/bin /usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
-+    AC_PATH_PROGS(MOC4, [moc-qt4 moc], ,[/usr/bin ${QTDIR}/bin /usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
-+    AC_PATH_PROGS(UIC4, [uic-qt4 uic], ,[/usr/bin ${QTDIR}/bin /usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
- 
- 
-     AC_SUBST([QT4_CFLAGS])
diff --git a/www-plugins/gnash/files/gnash-0.8.5-xpcom-idldir.patch b/www-plugins/gnash/files/gnash-0.8.5-xpcom-idldir.patch
deleted file mode 100644
index cdea85df2570..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.5-xpcom-idldir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Chi-Thanh Christopher Nguyen <chithanh@cs.tu-berlin.de>
-Subject: Use pkg-config to determine XPCOM_IDL_DIR instead of non-portable construct.
-Bug: #284073
-
----
-
-diff -ur a/macros/xpcom.m4 b/macros/xpcom.m4
---- a/macros/xpcom.m4	2009-03-02 16:29:48.000000000 +0100
-+++ b/macros/xpcom.m4	2009-09-08 22:02:21.548228034 +0200
-@@ -102,7 +102,7 @@
- 
-   if test x"${ac_cv_path_xpcom_incl}" != x; then
-     XPCOM_CFLAGS="${ac_cv_path_xpcom_incl}"
--    XPCOM_IDL_CFLAGS=`echo $XPCOM_CFLAGS | sed -e 's:include:share/idl:'`
-+    XPCOM_IDL_CFLAGS="-I`$PKG_CONFIG --variable=idldir libxul`/unstable"
-     XPIDL=$(pkg-config libxul --variable=sdkdir)
-     XPIDL="${XPIDL}xpidl"
-     AC_DEFINE([HAVE_XPCOM], [1], [Use XPCOM in the NPAPI plugin])
diff --git a/www-plugins/gnash/files/gnash-0.8.5-xpidl-sdkdir.patch b/www-plugins/gnash/files/gnash-0.8.5-xpidl-sdkdir.patch
deleted file mode 100644
index 5bb456b44222..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.5-xpidl-sdkdir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e462e38c02b4b1a7d5fe76df3f9bcb1c5a9e8940 Mon Sep 17 00:00:00 2001
-From: Romain Perier <mrpouet@gentoo.org>
-Date: Sat, 5 Sep 2009 12:46:21 +0200
-Subject: [PATCH] Fix xpidl binary path in XPIDL
-
-Which didn't lookup into sdkdir variable from libxul.pc
-
----
- macros/xpcom.m4 |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/macros/xpcom.m4 b/macros/xpcom.m4
-index 8a5be6b..37e32a9 100644
---- a/macros/xpcom.m4
-+++ b/macros/xpcom.m4
-@@ -103,8 +103,8 @@ AC_DEFUN([GNASH_PATH_XPCOM],
-   if test x"${ac_cv_path_xpcom_incl}" != x; then
-     XPCOM_CFLAGS="${ac_cv_path_xpcom_incl}"
-     XPCOM_IDL_CFLAGS=`echo $XPCOM_CFLAGS | sed -e 's:include:share/idl:'`
--    XPIDL=`echo ${ac_cv_path_xpidl} | sed -e 's:-L::' -e 's:sdk-::' -e 's:sdk/lib::' -e 's:-devel::' -e 's:lib$::'`
--    XPIDL="${XPIDL}xpidl"
-+    XPIDL=$(pkg-config libxul --variable=sdkdir)
-+    XPIDL="${XPIDL}/bin/xpidl"
-     AC_DEFINE([HAVE_XPCOM], [1], [Use XPCOM in the NPAPI plugin])
-   else
-     XPCOM_CFLAGS=""
--- 
-1.6.4.2
-
diff --git a/www-plugins/gnash/files/gnash-0.8.6-libcore-as3-headers.patch b/www-plugins/gnash/files/gnash-0.8.6-libcore-as3-headers.patch
deleted file mode 100644
index bb2cc3c79948..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.6-libcore-as3-headers.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ff5404812aaf33b64ce8d4d2efedee3c8099ce9e Mon Sep 17 00:00:00 2001
-From: Romain Perier <mrpouet@gentoo.org>
-Date: Fri, 25 Sep 2009 17:12:53 +0200
-Subject: [PATCH] Fix missing headers sub-directory for libcore when AS3 is enabled
-
----
- libcore/asClass.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libcore/asClass.h b/libcore/asClass.h
-index 0fe0e17..4f67c9c 100644
---- a/libcore/asClass.h
-+++ b/libcore/asClass.h
-@@ -33,7 +33,7 @@
- 
- #ifdef ENABLE_AVM2
- # include "CodeStream.h"
--# include "AbcBlock.h"
-+# include "parser/AbcBlock.h"
- #endif
- 
- namespace gnash {
--- 
-1.6.5.rc1
-
diff --git a/www-plugins/gnash/files/gnash-0.8.6-libssh-0.4.patch b/www-plugins/gnash/files/gnash-0.8.6-libssh-0.4.patch
deleted file mode 100644
index 35ec76b2f6c0..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.6-libssh-0.4.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-Upstream patch from trunk r11722.
-https://savannah.gnu.org/bugs/?28354
-
-=== modified file 'libnet/sshclient.cpp'
---- libnet/sshclient.cpp	2009-07-17 19:35:07 +0000
-+++ libnet/sshclient.cpp	2009-12-20 16:54:06 +0000
-@@ -79,7 +79,6 @@
-       _need_server_auth(true),
-       _state(0),
-       _session(0),
--      _options(0),
-       _channel(0)
- {
- //     GNASH_REPORT_FUNCTION;
-@@ -173,37 +172,29 @@
- }
- 
- bool
--SSHClient::sshConnect(int fd, std::string &hostname)
-+SSHClient::sshConnect(int /* fd */, std::string &hostname)
- {
- //     GNASH_REPORT_FUNCTION;
-     char *password;
-     char *banner;
-     char *hexa;
--    char buf[10];
--
--//    _options.reset(ssh_options_new());
--    // Setup the options to for this SSH session
--    _options = ssh_options_new();
- 
-     // We always need a hostname to connect to
--    if (ssh_options_set_host(_options, hostname.c_str()) < 0) {
-+    if (ssh_options_set(_session, SSH_OPTIONS_HOST, hostname.c_str()) < 0) {
- 	log_error("Couldn't set hostname option");
--	ssh_options_free(_options);
- 	return false;
-     }
- 
-     // We always need a user name for the connection
-     if (_user.empty()) {
--	if (ssh_options_set_username(_options, _user.c_str()) < 0) {
-+	if (ssh_options_set(_session, SSH_OPTIONS_USER, _user.c_str()) < 0) {
- 	    log_error("Couldn't set user name option");
--	    ssh_options_free(_options);
- 	    return false;
- 	}
-     }
-     
-     // Start a new session
-     _session = ssh_new();
--    ssh_set_options(_session, _options);
-     if(ssh_connect(_session)){
-         log_error("Connection failed : %s\n", ssh_get_error(_session));
- 	sshShutdown();
-@@ -345,7 +336,7 @@
- }
- 
- int
--SSHClient::authKbdint(SSH_SESSION *session)
-+SSHClient::authKbdint(ssh_session session)
- {
- //    GNASH_REPORT_FUNCTION;
-     int err = ssh_userauth_kbdint(session, NULL, NULL);
-@@ -354,15 +345,15 @@
-     int i,n;
-     char echo;
-     while (err == SSH_AUTH_INFO){
--        name = ssh_userauth_kbdint_getname(session);
--        instruction = ssh_userauth_kbdint_getinstruction(session);
-+        name = const_cast<char *>(ssh_userauth_kbdint_getname(session));
-+        instruction = const_cast<char *>(ssh_userauth_kbdint_getinstruction(session));
-         n=ssh_userauth_kbdint_getnprompts(session);
-         if(strlen(name)>0)
-             log_debug("%s", name);
-         if(strlen(instruction)>0)
-             log_debug("%s", instruction);
-         for(i=0; i<n; ++i){
--            prompt = ssh_userauth_kbdint_getprompt(session, i, &echo);
-+            prompt = const_cast<char *>(ssh_userauth_kbdint_getprompt(session, i, &echo));
-             if(echo){
-                 log_debug("%s", prompt);
-                 fgets(buffer,sizeof(buffer),stdin);
-@@ -387,7 +378,7 @@
- }
- 
- // Channel operations
--CHANNEL *
-+ssh_channel
- SSHClient::openChannel()
- {
- //    GNASH_REPORT_FUNCTION;
-@@ -395,8 +386,8 @@
- }
- 
- 
--CHANNEL *
--SSHClient::openChannel(SSH_SESSION *session)
-+ssh_channel
-+SSHClient::openChannel(ssh_session session)
- {
- //    GNASH_REPORT_FUNCTION;
-     if (session) {
-@@ -414,7 +405,7 @@
- }
- 
- int 
--SSHClient::readChannel(CHANNEL *channel, amf::Buffer &buf)
-+SSHClient::readChannel(ssh_channel channel, amf::Buffer &buf)
- {
- //    GNASH_REPORT_FUNCTION;
-     int ret = -1;
-@@ -429,7 +420,7 @@
- }
- 
- int 
--SSHClient::writeChannel(CHANNEL *channel, amf::Buffer &buf)
-+SSHClient::writeChannel(ssh_channel channel, amf::Buffer &buf)
- {
- //    GNASH_REPORT_FUNCTION;
-     int ret = -1;
-@@ -439,6 +430,8 @@
-     } else {
- 	log_error("Can't write to a non-existant channel!");
-     }
-+
-+    return ret;
- }
- 
- void 
-@@ -449,7 +442,7 @@
- }
- 
- void 
--SSHClient::closeChannel(CHANNEL *channel)
-+SSHClient::closeChannel(ssh_channel channel)
- {
- //    GNASH_REPORT_FUNCTION;
- 
-
-=== modified file 'libnet/sshclient.h'
---- libnet/sshclient.h	2009-07-15 21:44:51 +0000
-+++ libnet/sshclient.h	2009-12-20 16:54:06 +0000
-@@ -98,25 +98,25 @@
-     transport_type_t getTransportType() { return _transporttype; };
- 
-     int authKbdint();
--    int authKbdint(SSH_SESSION *);
-+    int authKbdint(ssh_session);
- 
-     // Channel operations
--    CHANNEL *openChannel();
--    CHANNEL *openChannel(SSH_SESSION *session);
-+    ssh_channel openChannel();
-+    ssh_channel openChannel(ssh_session session);
- 
-     void closeChannel();
--    void closeChannel(CHANNEL *channel);
-+    void closeChannel(ssh_channel channel);
- 
-     // Accessors
--    CHANNEL *getChannel()     { return _channel; };
--    SSH_SESSION *getSession() { return _session; };
-+    ssh_channel getChannel() { return _channel; };
-+    ssh_session getSession() { return _session; };
-     boost::shared_ptr<amf::Buffer> &getBuffer()  { return _buffer; };
- 
-     // Dump internal data to the screen for debugging
-     void dump();
-  protected:
--    int readChannel(CHANNEL *channel, amf::Buffer &buf);
--    int writeChannel(CHANNEL *channel, amf::Buffer &buf);
-+    int readChannel (ssh_channel channel, amf::Buffer &buf);
-+    int writeChannel(ssh_channel channel, amf::Buffer &buf);
- 
-     std::string		_hostname;
-     std::string		_user;
-@@ -126,12 +126,11 @@
-     transport_type_t	_transporttype;
-     int			_state;
- #if 0
--    boost::shared_ptr<SSH_SESSION> _session;
-+    boost::shared_ptr<ssh_session> _session;
-     boost::shared_ptr<SSH_OPTIONS> _options;
- #else
--    SSH_SESSION *_session;
--    SSH_OPTIONS *_options;
--    CHANNEL	*_channel;
-+    ssh_session _session;
-+    ssh_channel	_channel;
- #endif
-     boost::shared_ptr<amf::Buffer> _buffer;
- };
-
-=== modified file 'libnet/sshserver.cpp'
---- libnet/sshserver.cpp	2009-07-20 20:57:44 +0000
-+++ libnet/sshserver.cpp	2009-12-20 16:54:06 +0000
-@@ -95,50 +95,56 @@
- 
- // Authenticate the password from the user
- bool
--SSHServer::authPassword(string &user, string &passwd)
-+SSHServer::authPassword(string & /* user */, string & /* passwd */)
- {
-+    return false;
- }
- 
- bool
--SSHServer::authPassword(SSH_SESSION *session, string &user, string &passwd)
-+SSHServer::authPassword(ssh_session /* session */, string &/* user */, string & /* passwd */)
- {
-+    return false;
- }
- 
- // Wait for an incoming network connection
- bool
- SSHServer::acceptConnections()
- {
--}
--
--bool
--SSHServer::acceptConnections(short port)
--{
--}
--
--bool
--SSHServer::acceptConnections(SSH_SESSION *session)
--{
--}
--
--bool
--SSHServer::acceptConnections(SSH_SESSION *session, short port)
--{
-+    return false;
-+}
-+
-+bool
-+SSHServer::acceptConnections(short /* port */)
-+{
-+    return false;
-+}
-+
-+bool
-+SSHServer::acceptConnections(ssh_session /* session */)
-+{
-+    return false;
-+}
-+
-+bool
-+SSHServer::acceptConnections(ssh_session /* session */, short /* port */)
-+{
-+    return false;
- }
- 
- // Parse an SSH command message and do something
- bool
--SSHServer::processSSHMessage(SSH_MESSAGE *message)
-+SSHServer::processSSHMessage(ssh_message message)
- {
-     if (!message) {
- 	return false;
-     }
-     switch(ssh_message_type(message)){
--    case SSH_AUTH_REQUEST:
-+    case SSH_REQUEST_AUTH:
- 	switch(ssh_message_subtype(message)) {
- 	    // not authenticated, send default message
-- 	case SSH_AUTH_NONE:
-+ 	case SSH_AUTH_METHOD_NONE:
-  	    break;
--	case SSH_AUTH_PASSWORD:
-+	case SSH_AUTH_METHOD_PASSWORD:
- 	    {
- 		log_debug("User %s wants to auth with pass %s\n",
- 			  ssh_message_auth_user(message),
-@@ -152,20 +158,20 @@
- 		}
- 		break;
- 	    }
--	case SSH_AUTH_HOSTBASED:
--	    break;
--	case SSH_AUTH_PUBLICKEY:
--	    break;
--	case SSH_AUTH_KEYBINT:
--	    break;
--	case SSH_AUTH_UNKNOWN:
-+	case SSH_AUTH_METHOD_HOSTBASED:
-+	    break;
-+	case SSH_AUTH_METHOD_PUBLICKEY:
-+	    break;
-+	case SSH_AUTH_METHOD_INTERACTIVE:
-+	    break;
-+	case SSH_AUTH_METHOD_UNKNOWN:
- 	    break;
- 	default:
--	    ssh_message_auth_set_methods(message,SSH_AUTH_PASSWORD);
-+	    ssh_message_auth_set_methods(message,SSH_AUTH_METHOD_PASSWORD);
- 	    ssh_message_reply_default(message);
- 	    break;
- 	}
--    case SSH_CHANNEL_REQUEST_OPEN:
-+    case SSH_REQUEST_CHANNEL_OPEN:
- 	if(ssh_message_subtype(message)==SSH_CHANNEL_SESSION){
- 	    _channel = ssh_message_channel_request_open_reply_accept(message);
- 	    break;
-@@ -185,6 +191,8 @@
- 	ssh_message_reply_default(message);
-     }
-     ssh_message_free(message);
-+
-+    return false;
- }
- 
- void
-
-=== modified file 'libnet/sshserver.h'
---- libnet/sshserver.h	2009-07-17 19:35:07 +0000
-+++ libnet/sshserver.h	2009-12-20 16:54:06 +0000
-@@ -64,26 +64,25 @@
-     
-     // Authenticate the password from the user
-     bool authPassword(std::string &user, std::string &passwd);
--    bool authPassword(SSH_SESSION *session, std::string &user, std::string &passwd);
-+    bool authPassword(ssh_session session, std::string &user, std::string &passwd);
- 
-     // Wait for an incoming network connection
-     bool acceptConnections();
-     bool acceptConnections(short port);
--    bool acceptConnections(SSH_SESSION *session);
--    bool acceptConnections(SSH_SESSION *session, short port);
-+    bool acceptConnections(ssh_session session);
-+    bool acceptConnections(ssh_session session, short port);
- 
-     // Parse an SSH command message and do something
--    bool processSSHMessage(SSH_MESSAGE *message);
-+    bool processSSHMessage(ssh_message message);
- 
-     void dump();
-  protected:
-     // Get the SSH command message
--    SSH_MESSAGE *getSSHMessage();
--    SSH_MESSAGE *getSSHMessage(SSH_SESSION *session);
-+    ssh_message getSSHMessage();
-+    ssh_message getSSHMessage(ssh_session session);
- 
--    SSH_SESSION *_session;	// the current session
--    SSH_OPTIONS *_options;	// the current list of options
--    SSH_MESSAGE *_message;	// the current SSH command message
-+    ssh_session _session;	// the current session
-+    ssh_message _message;	// the current SSH command message
- };
-     
- } // end of gnash namespace
-
diff --git a/www-plugins/gnash/files/gnash-0.8.7-klash.patch b/www-plugins/gnash/files/gnash-0.8.7-klash.patch
deleted file mode 100644
index 1d31fb873e00..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.7-klash.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- gnash-0.8.5/macros/kde4.m4.alt-kde4	2009-02-28 15:27:53 +0300
-+++ gnash-0.8.5/macros/kde4.m4	2009-07-15 16:02:13 +0400
-@@ -24,7 +24,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
-              with_kde4_incl=${withval})
-   dnl make sure the path is a useable one
-   if test x"${with_kde4_incl}" != x ; then
--    if test ! -f ${with_kde4_incl}/kapp.h ; then
-+    if test ! -f ${with_kde4_incl}/kapplication.h ; then
-       AC_MSG_ERROR([${with_kde4_incl} directory doesn't contain any KDE 4.x headers])
-     fi
-   fi
-@@ -38,7 +38,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
-              with_kde4_lib=${withval})
-   dnl make sure the path is a useable one
-   if test x"${with_kde4_lib}" != x ; then 
--    if test ! -f ${with_kde4_lib}/libkdeui.la; then
-+    if test ! -f ${with_kde4_lib}/libkdeui.so; then
-       AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain any KDE 4.x libraries!])
-     fi
-   fi
-@@ -136,7 +136,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
-     dnl Look for the libraries
-     AC_CACHE_VAL(ac_cv_path_kde4_lib, [
-       if test x"${with_kde4_lib}" != x ; then
--        if test -f ${with_kde4_lib}/libkdeui.la; then
-+        if test -f ${with_kde4_lib}/libkdeui.so; then
- 	        ac_cv_path_kde4_lib="-L`(cd ${with_kde4_lib}; pwd)`"
-         else
- 	        AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain KDE 4.x libraries.])
-@@ -146,7 +146,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
-         AC_MSG_CHECKING([for kdeui library])
-         kde4_topdir=
-         for i in ${kde4_prefix}/lib64 ${kde4_prefix}/lib $libslist ; do
--          if test -f $i/libkdeui.${shlibext} -o -f $i/libkdeui.la; then
-+          if test -f $i/libkdeui.${shlibext} -o -f $i/libkdeui.so; then
-             kde4_topdir=$i
-             AC_MSG_RESULT(${kde4_topdir}/libkdeui)
- 	          if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
-@@ -169,19 +169,6 @@ AC_DEFUN([GNASH_PATH_KDE4],
-          AC_MSG_RESULT(no)
-         fi
-       fi
--      dnl Look for the kdeprint library, which is required
--      AC_MSG_CHECKING([for kdeprint library])
--      if test x"${libkdeprint}" = x; then
--        if test -f ${kde4_topdir}/libkdeprint.la -o -f ${kde4_topdir}/libkdeprint.${shlibext}; then
--          ac_cv_path_kde4_lib="${ac_cv_path_kde4_lib} -lkdeprint"
--          AC_MSG_RESULT(${kde4_topdir}/libkdeprint)
--        else
--          AC_MSG_RESULT(no)
--        fi
--      else
--        AC_MSG_RESULT(${libkdeprint})
--        ac_cv_path_kde4_lib="${ac_cv_path_kde4_lib} ${libkdeprint}"
--      fi	
-     ])                  dnl end of cache ac_cv_path_kde4_lib
-   fi                    dnl end of build_kde4
- 
-@@ -201,7 +201,7 @@
-     KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
-     KDE4_SERVICESDIR="${KDE4_PREFIX}/share/kde4/services"
-     KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config"
--    KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"
-+    KDE4_APPSDATADIR="${KDE4_PREFIX}/share/apps/klash"
-   fi                            dnl end of build_kparts4
- 
-   if test x"${ac_cv_path_kde4_incl}" != x ; then
-@@ -218,7 +205,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
-   fi                            dnl end of build_kparts4
- 
-   if test x"${ac_cv_path_kde4_incl}" != x ; then
--    if test x"${ac_cv_path_kde3_incl}" != x"-I/usr/include"; then
-+    if test x"${ac_cv_path_kde4_incl}" != x"-I/usr/include"; then
-       KDE4_CFLAGS="${ac_cv_path_kde4_incl}"
-     else
-       KDE4_CFLAGS=""
---- gnash-0.8.5/plugin/klash4/Makefile.am.alt-kde4	2009-06-15 11:53:31 +0400
-+++ gnash-0.8.5/plugin/klash4/Makefile.am	2009-07-15 16:02:58 +0400
-@@ -42,6 +39,7 @@ libklashpart_la_LDFLAGS = -avoid-version
- else
- libklashpart_la_LDFLAGS = -module -avoid-version -L$(plugindir) $(KDE4_LIBS) $(QT4_LIBS)
- endif
-+libklashpart_la_LIBADD = $(KDE4_LIBS) $(QT4_LIBS) $(X11_LIBS) -lkparts
- 
- dist_kde_services_DATA = klash_part.desktop
- dist_kde_rc_DATA = klashpartui.rc
---- gnash-0.8.5/plugin/klash4/pluginsinfo.alt-kde4	2008-12-28 13:13:38 +0300
-+++ gnash-0.8.5/plugin/klash4/pluginsinfo	2009-07-15 16:02:13 +0400
-@@ -1,7 +1,7 @@
- number=1
- 
- [0]
--description=Shockwave Flash 7.0
-+description=Shockwave Flash 10.1 r999
- file=libklashpart.so
- mime=application/x-shockwave-flash:swf:Shockwave Flash;application/futuresplash:spl:FutureSplash Player
- name=Shockwave Flash
diff --git a/www-plugins/gnash/files/gnash-0.8.7-xpcom-idldir.patch b/www-plugins/gnash/files/gnash-0.8.7-xpcom-idldir.patch
deleted file mode 100644
index 02f990827208..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.7-xpcom-idldir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Chi-Thanh Christopher Nguyen <chithanh@cs.tu-berlin.de>
-Subject: Use pkg-config to determine XPCOM_IDL_DIR instead of non-portable construct.
-Bug: #284073
-
----
-
-diff -ur a/macros/xpcom.m4 b/macros/xpcom.m4
---- a/macros/xpcom.m4	2009-03-02 16:29:48.000000000 +0100
-+++ b/macros/xpcom.m4	2009-09-08 22:02:21.548228034 +0200
-@@ -102,7 +102,7 @@
- 
-   if test x"${ac_cv_path_xpcom_incl}" != x; then
-     XPCOM_CFLAGS="${ac_cv_path_xpcom_incl}"
--    XPCOM_IDL_CFLAGS=`echo $XPCOM_CFLAGS | sed -e 's:include:share/idl:'`
-+    XPCOM_IDL_CFLAGS="-I`$PKG_CONFIG --variable=idldir libxul`"
-     XPIDL=$(pkg-config libxul --variable=sdkdir)
-     XPIDL="${XPIDL}xpidl"
-     AC_DEFINE([HAVE_XPCOM], [1], [Use XPCOM in the NPAPI plugin])
diff --git a/www-plugins/gnash/files/gnash-0.8.8-secure-tempfile-creation.patch b/www-plugins/gnash/files/gnash-0.8.8-secure-tempfile-creation.patch
new file mode 100644
index 000000000000..8c9e79dfccaa
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.8-secure-tempfile-creation.patch
@@ -0,0 +1,38 @@
+From 6d86dd8cb9d567d8a6cedac301850c7349fe0ced Mon Sep 17 00:00:00 2001
+From: Gabriele Giacone <1o5g4r8o@gmail.com>
+Date: Mon, 03 Jan 2011 16:55:51 +0000
+Subject: Create configure temporary files in a secure way
+
+---
+diff --git a/configure.ac b/configure.ac
+index 08d217b..85e19da 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3021,9 +3021,14 @@ cygnal/testsuite/cygnal.all/Makefile
+ ########################## Final report begins... ############################
+ ###
+ 
+-cerr=/tmp/gnash-configure-errors.$$
+-cwarn=/tmp/gnash-configure-warnings.$$
+-crec=/tmp/gnash-configure-recommended.$$
++dnl Create temporary directory in a secure way
++tmp=`mktemp -d ${TMPDIR=/tmp}/gnash-configure-XXXXXX`
++if test \! -n "$tmp" || test \! -d "$tmp"; then
++  tmp=`(umask 077 && mkdir -d ${TMPDIR=/tmp}/gnash-configure-${RANDOM}-$$) 2>/dev/null`
++fi
++cerr=${tmp}/errors
++cwarn=${tmp}/warnings
++crec=${tmp}/recommended
+ echo ""
+ 
+ #trap 'rm cerr' 0 # trap isn't a good idea, might override other traps
+@@ -4051,6 +4056,7 @@ else
+   rm $cerr
+ fi
+ 
++rmdir $tmp
+ 
+ if test x"$fork" = x"no"; then
+   AC_MSG_ERROR([Currently only forking the standalone player works!])
+--
+cgit v0.8.3.2
diff --git a/www-plugins/gnash/files/gnash-0.8.x-libpng14.patch b/www-plugins/gnash/files/gnash-0.8.x-libpng14.patch
deleted file mode 100644
index 63668da2b3fc..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.x-libpng14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libbase/GnashImagePng.cpp
-+++ libbase/GnashImagePng.cpp
-@@ -164,7 +164,7 @@
-     if (type == PNG_COLOR_TYPE_GRAY && bitDepth < 8)
-     {
-         log_debug("Setting grey bit depth(%d) to 8", bitDepth);
--        png_set_gray_1_2_4_to_8(_pngPtr);
-+        png_set_expand_gray_1_2_4_to_8(_pngPtr);
-     }
- 
-     // Apply the transparency block if it exists.
diff --git a/www-plugins/gnash/gnash-0.8.5.ebuild b/www-plugins/gnash/gnash-0.8.5.ebuild
deleted file mode 100644
index cfade045808e..000000000000
--- a/www-plugins/gnash/gnash-0.8.5.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.16 2010/12/06 22:44:21 chithanh Exp $
-
-EAPI="2"
-CMAKE_REQUIRED="never"
-KDE_REQUIRED="optional"
-AT_M4DIR="cygnal"
-
-inherit autotools eutils kde4-base multilib nsplugins
-
-DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features"
-HOMEPAGE="http://www.gnu.org/software/gnash/"
-SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="agg cairo cygnal doc +ffmpeg gnome gstreamer gtk kde +nls nsplugin +opengl +sdl +speex video_cards_intel +zlib"
-
-RDEPEND=">=dev-libs/boost-1.35.0
-	dev-libs/expat
-	dev-libs/libxml2
-	virtual/jpeg
-	media-libs/libpng
-	net-misc/curl
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXv
-	media-libs/giflib
-	x11-proto/xproto
-	agg? ( x11-libs/agg )
-	cairo? ( x11-libs/cairo )
-	doc? (
-	>=app-text/docbook2X-0.8.8
-	app-text/docbook-sgml-utils
-	)
-	ffmpeg? (
-	media-libs/libsdl[X]
-	>=media-video/ffmpeg-0.5
-	)
-	gstreamer? (
-	media-plugins/gst-plugins-ffmpeg
-	media-plugins/gst-plugins-mad
-	media-plugins/gst-plugins-meta
-	)
-	gtk? (
-	x11-libs/gtk+:2
-	net-libs/xulrunner:1.9
-	)
-	kde? ( >=kde-base/kdebase-startkde-${KDE_MINIMAL} )
-	opengl? (
-	virtual/opengl
-	gtk? ( x11-libs/gtkglext )
-	)
-	sdl? ( media-libs/libsdl[X] )
-	nsplugin? ( net-libs/xulrunner:1.9 )
-	speex? ( media-libs/speex[ogg] )
-	zlib? ( sys-libs/zlib )
-	>=sys-devel/libtool-2.2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	gnome? ( app-text/rarian )"
-
-pkg_setup() {
-	if ! ( use agg || use cairo || use opengl ); then
-		ewarn "You are trying to build Gnash without choosing a renderer [agg|cairo|opengl]."
-		has_version x11-libs/cairo && ewarn "cairo enabled as default" \
-			|| die "Please enable a renderer"
-	elif use agg && use cairo && use opengl; then
-		ewarn "You enabled 3 renderers, agg was chosen as default."
-	fi
-
-	if use cairo && use !agg && use !opengl && use kde; then
-		eerror "The cairo renderer and kde gui are not compatible."
-		die "Cairo renderer incompatible with kde gui !"
-	fi
-
-	if ! ( use kde || use gtk || use sdl ); then
-		ewarn "You are trying to build Gnash without choosing a gui frontend [gtk,kde,sdl]."
-		has_version media-libs/libsdl[X] && ewarn "sdl enabled as default" \
-			|| die "Please enable at least one of these USE flags."
-	fi
-
-	if use nsplugin && use !gtk; then
-		eerror "Building gnash with nsplugin requires the gtk gui."
-		die "Nsplugin requires the gtk gui."
-	fi
-	kde4-base_pkg_setup
-}
-
-src_prepare() {
-	local mozsdk_incdir=${S}/plugin/mozilla-sdk/include
-
-	# Defines $(XPIDL) correctly using sdkdir variable from libxul.pc
-	epatch "${FILESDIR}"/${P}-xpidl-sdkdir.patch
-
-	# Use pkgconfig to determine XPCOM_IDL_DIR instead of non-portable construct.
-	# Fixes building against xulrunner-1.9.0, bug #284073.
-	epatch "${FILESDIR}"/${P}-xpcom-idldir.patch
-
-	# Resurect patch from bug #230287
-	epatch "${FILESDIR}"/${PN}-0.8.3-boost-dynamic-link.patch
-
-	# Adapted from Alt Linux to fix klash support properly
-	epatch "${FILESDIR}"/${P}-klash.patch
-
-	# Make gnash find moc and uic properly, upstream bug #25758,
-	# gentoo bug #283905
-	epatch "${FILESDIR}"/${P}-moc-qt4.patch
-
-	epatch "${FILESDIR}"/${PN}-0.8.x-libpng14.patch
-
-	# Conflict headers with npapi.h from mozilla-sdk embedded stuffs and libxul-unstable header
-	# in case where xpcom (implicitly added with gtk) is enabled, we use the system header
-	if use gtk; then
-		rm -f ${mozsdk_incdir}/npapi.h
-		ln -s $(pkg-config libxul-unstable --variable=includedir)/unstable/npapi.h \
-			${mozsdk_incdir}/npapi.h || die "symlink failed"
-	fi
-	eautoreconf
-}
-src_configure() {
-	local myconf
-	local gui
-	# Set nsplugin install directory.
-	use nsplugin && myconf="${myconf} --with-npapi-plugindir=/opt/netscape/plugins"
-	# Set kde and konqueror plugin directories.
-	if use kde; then
-		myconf="${myconf}
-			--with-kde4-incl=${KDEDIR}/include
-			--with-kde4-configdir=${KDEDIR}/share/config
-			--with-kde4-prefix=${KDEDIR}
-			--with-kde4-lib=${KDEDIR}/$(get_libdir)
-			--with-kde-appsdatadir=${KDEDIR}/share/apps/klash
-			--with-kde4-servicesdir=${KDEDIR}/share/services"
-		 fi
-	# Set rendering engine.
-	if use agg; then
-		myconf="${myconf} --enable-renderer=agg"
-	elif use opengl; then
-		myconf="${myconf} --enable-renderer=ogl"
-	else
-		myconf="${myconf} --enable-renderer=cairo"
-	fi
-	# Set media handler.
-	if use ffmpeg; then
-		myconf="${myconf} --enable-media=ffmpeg"
-	elif use gstreamer; then
-		myconf="${myconf} --enable-media=gst"
-	else
-		myconf="${myconf} --enable-media=none"
-	fi
-	# Set gui.
-	use gtk && gui=",gtk"
-	use kde && gui="${gui},kde4"
-	use sdl && gui="${gui},sdl"
-
-	if [ -z "$gui" ]; then
-		gui="sdl"
-	fi
-	# Strip extra comma from gui.
-	gui=$( echo $gui|sed -e 's/,//' )
-	econf \
-		--disable-dependency-tracking \
-		--disable-kparts3 \
-		--enable-nspr \
-		--enable-expat \
-		--enable-jpeg \
-		--enable-png \
-		--enable-gif \
-		--enable-ungif \
-		$(use_enable cygnal) \
-		$(use_enable doc docbook) \
-		$(use_enable gnome ghelp) \
-		$(use_enable gtk xpcom) \
-		$(use_enable gtk npapi) \
-		$(use_enable kde kparts4) \
-		$(use_enable nls) \
-		$(use_enable nsplugin npapi) \
-		$(use_enable speex) \
-		$(use_enable speex speexdsp) \
-		$(use_enable video_cards_intel i810-lod-bias) \
-		$(use_enable zlib z) \
-		--enable-gui=${gui} \
-		${myconf}
-}
-src_test() {
-	local log=testsuite-results.txt
-	cd testsuite
-	emake check || die "make check failed"
-	./anaylse-results.sh > $log || die "results analyze failed"
-	cat $log
-}
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install nsplugin in directory set by --with-npapi-plugindir.
-	if use nsplugin; then
-		emake DESTDIR="${D}" install-plugin || die "install plugins failed"
-	fi
-
-	# Install kde konqueror plugin.
-	if use kde; then
-		pushd "${S}/plugin/klash4" >& /dev/null
-		emake DESTDIR="${D}" install-plugin || die "install kde plugins failed"
-		popd >& /dev/null
-	fi
-	# Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory.
-	use nsplugin && inst_plugin /opt/netscape/plugins/libgnashplugin.so \
-		|| rm -rf "${D}/opt"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
-pkg_postinst() {
-	if use !ffmpeg && use !gstreamer || use gstreamer && ( ! use gnome ); then
-		ewarn ""
-		ewarn "Gnash was built without a media handler and or http handler !"
-		ewarn ""
-		ewarn "If you want Gnash to support video then you will need to"
-		ewarn "rebuild Gnash with either the ffmpeg or gstreamer use flags set."
-		ewarn ""
-	fi
-	ewarn "${PN} is still in heavy development"
-	ewarn "Please first report bugs on upstream gnashdevs and deal with them"
-	ewarn "And then report a Gentoo bug to the maintainer"
-	use kde && kde4-base_pkg_postinst
-}
diff --git a/www-plugins/gnash/gnash-0.8.6.ebuild b/www-plugins/gnash/gnash-0.8.6.ebuild
deleted file mode 100644
index 5276f0459917..000000000000
--- a/www-plugins/gnash/gnash-0.8.6.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.6.ebuild,v 1.15 2010/12/06 22:44:21 chithanh Exp $
-
-EAPI="2"
-CMAKE_REQUIRED="never"
-KDE_REQUIRED="optional"
-AT_M4DIR="cygnal"
-
-inherit autotools eutils kde4-base multilib nsplugins
-
-DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features"
-HOMEPAGE="http://www.gnu.org/software/gnash/"
-SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="+agg cairo cygnal dbus doc +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl python +sdl ssh ssl test video_cards_intel"
-
-RDEPEND=">=dev-libs/boost-1.35.0
-	dev-libs/expat
-	dev-libs/libxml2
-	virtual/jpeg
-	media-libs/libpng
-	net-misc/curl
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXv
-	media-libs/giflib
-	x11-proto/xproto
-	agg? ( x11-libs/agg )
-	cairo? ( x11-libs/cairo )
-	doc? (
-	>=app-text/docbook2X-0.8.8
-	app-text/docbook-sgml-utils
-	)
-	ffmpeg? (
-	media-libs/libsdl[X]
-	>=media-video/ffmpeg-0.5
-	)
-	gstreamer? (
-	media-plugins/gst-plugins-ffmpeg
-	media-plugins/gst-plugins-mad
-	media-plugins/gst-plugins-meta
-	)
-	gtk? (
-	x11-libs/gtk+:2
-	net-libs/xulrunner:1.9
-	python? ( dev-python/pygtk:2 )
-	)
-	kde? ( >=kde-base/kdebase-startkde-${KDE_MINIMAL} )
-	opengl? (
-	virtual/opengl
-	gtk? ( x11-libs/gtkglext )
-	)
-	sdl? ( media-libs/libsdl[X] )
-	nsplugin? ( net-libs/xulrunner:1.9 )
-	media-libs/speex[ogg]
-	sys-libs/zlib
-	>=sys-devel/libtool-2.2
-	mysql? ( virtual/mysql )
-	lirc? ( app-misc/lirc )
-	dbus? ( sys-apps/dbus )
-	ssh?  ( >=net-libs/libssh-0.4[server] )
-	ssl?  ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	gnome? ( app-text/rarian )"
-
-pkg_setup() {
-	if ! ( use agg || use cairo || use opengl ); then
-		ewarn "You are trying to build Gnash without choosing a renderer [agg|cairo|opengl]."
-		has_version x11-libs/cairo && ewarn "cairo enabled as default" \
-			|| die "Please enable a renderer"
-	elif use agg && use cairo && use opengl; then
-		ewarn "You enabled 3 renderers, agg was chosen as default."
-	fi
-
-	if use cairo && use !agg && use !opengl && use kde; then
-		eerror "The cairo renderer and kde gui are not compatible."
-		die "Cairo renderer incompatible with kde gui !"
-	fi
-
-	if ! ( use kde || use gtk || use sdl ); then
-		ewarn "You are trying to build Gnash without choosing a gui frontend [gtk,kde,sdl]."
-		has_version media-libs/libsdl[X] && ewarn "sdl enabled as default" \
-			|| die "Please enable at least one of these USE flags."
-	fi
-
-	if use nsplugin && use !gtk; then
-		eerror "Building gnash with nsplugin requires the gtk gui."
-		die "Nsplugin requires the gtk gui."
-	fi
-
-	if use sdl; then
-		ewarn "Enable SDL as gui frontend and sound handler"
-	fi
-
-	if use lirc; then
-		ewarn "Enable LIRC daemon support and lirc extension"
-	fi
-
-	kde4-base_pkg_setup
-}
-
-src_prepare() {
-	local mozsdk_incdir=${S}/plugin/mozilla-sdk/include
-
-	# Defines $(XPIDL) correctly using sdkdir variable from libxul.pc
-	epatch "${FILESDIR}"/${PN}-0.8.5-xpidl-sdkdir.patch
-
-	# Use pkgconfig to determine XPCOM_IDL_DIR instead of non-portable construct.
-	# Fixes building against xulrunner-1.9.0, bug #284073.
-	epatch "${FILESDIR}"/${PN}-0.8.5-xpcom-idldir.patch
-
-	# Resurect patch from bug #230287
-	epatch "${FILESDIR}"/${PN}-0.8.3-boost-dynamic-link.patch
-
-	# Adapted from Alt Linux to fix klash support properly
-	epatch "${FILESDIR}"/${PN}-0.8.5-klash.patch
-
-	# Patch to make gnash buildable with libssh-0.4
-	epatch "${FILESDIR}"/${PN}-0.8.6-libssh-0.4.patch
-
-	# Fix build failure due to missing headers sub-directory in libcore/asClass.h
-	# when AS3 support is enabled (as default)
-	epatch "${FILESDIR}"/${P}-libcore-as3-headers.patch
-
-	epatch "${FILESDIR}"/${PN}-0.8.x-libpng14.patch
-
-	# Conflict headers with npapi.h from mozilla-sdk embedded stuffs and libxul-unstable header
-	# in case where xpcom (implicitly added with gtk) is enabled, we use the system header
-	if use gtk; then
-		rm -f ${mozsdk_incdir}/npapi.h
-		ln -s $(pkg-config libxul-unstable --variable=includedir)/unstable/npapi.h \
-			${mozsdk_incdir}/npapi.h || die "symlink failed"
-	fi
-	eautoreconf
-}
-src_configure() {
-	local myconf myext gui
-
-	# Set nsplugin install directory.
-	use nsplugin && myconf="${myconf} --with-npapi-plugindir=/opt/netscape/plugins"
-	# Set rendering engine.
-	if use agg; then
-		myconf="${myconf} --enable-renderer=agg"
-	elif use opengl; then
-		myconf="${myconf} --enable-renderer=ogl"
-	else
-		myconf="${myconf} --enable-renderer=cairo"
-	fi
-	# Set kde and konqueror plugin directories.
-	if use kde; then
-		myconf="${myconf}
-			--with-plugins-install=system
-			--with-kde4-incl=${KDEDIR}/include
-			--with-kde4-configdir=${KDEDIR}/share/config
-			--with-kde4-prefix=${KDEDIR}
-			--with-kde4-lib=${KDEDIR}/$(get_libdir)
-			--with-kde-appsdatadir=${KDEDIR}/share/apps/klash
-			--with-kde4-servicesdir=${KDEDIR}/share/kde4/services
-			--with-kde4-plugindir=${KDEDIR}/$(get_libdir)/kde4/plugins"
-	fi
-
-	# Set media handler.
-	if use ffmpeg; then
-		myconf="${myconf} --enable-media=ffmpeg"
-	elif use gstreamer; then
-		myconf="${myconf} --enable-media=gst"
-	else
-		myconf="${myconf} --enable-media=none"
-	fi
-	# Set gui.
-	use gtk && gui=",gtk"
-	use kde && gui="${gui},kde4"
-
-	if use sdl; then
-		gui="${gui},sdl"
-		myconf="${myconf} --enable-sound=sdl"
-	fi
-
-	# Set extensions
-	use mysql && myext=",mysql"
-	use gtk && myext="${myext},gtk"
-	use lirc && myext="${myext},lirc"
-	use dbus && myext="${myext},dbus"
-
-	if [ -z "$gui" ]; then
-		gui="sdl"
-	fi
-
-	# Strip extra comma from gui and myext.
-	gui=$( echo $gui | sed -e 's/,//' )
-	myext=$( echo $myext | sed -e 's/,//' )
-
-	econf \
-		--disable-dependency-tracking \
-		--disable-kparts3 \
-		--enable-avm2 \
-		$(use_enable cygnal) \
-		$(use_enable cygnal cgibins) \
-		$(use_enable doc docbook) \
-		$(use_enable gnome ghelp) \
-		$(use_enable gtk xpcom) \
-		$(use_enable gtk npapi) \
-		$(use_enable kde kparts4) \
-		$(use_enable lirc) \
-		$(use_enable nls) \
-		$(use_enable nsplugin npapi) \
-		$(use_enable python) \
-		$(use_enable ssh) \
-		$(use_enable ssl) \
-		$(use_enable test testsuite) \
-		$(use_enable video_cards_intel i810-lod-bias) \
-		--enable-gui=${gui} \
-		--enable-extensions=${myext} \
-		${myconf}
-}
-src_test() {
-	local log=testsuite-results.txt
-	cd testsuite
-	emake check || die "make check failed"
-	./anaylse-results.sh > $log || die "results analyze failed"
-	cat $log
-}
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install nsplugin in directory set by --with-npapi-plugindir.
-	if use nsplugin; then
-		emake DESTDIR="${D}" install-plugin || die "install plugins failed"
-	fi
-
-	# Install kde konqueror plugin.
-	if use kde; then
-		pushd "${S}/plugin/klash4" >& /dev/null
-		emake DESTDIR="${D}" install-plugin || die "install kde plugins failed"
-		popd >& /dev/null
-	fi
-	# Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory.
-	use nsplugin && inst_plugin /opt/netscape/plugins/libgnashplugin.so \
-		|| rm -rf "${D}/opt"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
-pkg_postinst() {
-	if use !ffmpeg && use !gstreamer || use gstreamer && ( ! use gnome ); then
-		ewarn ""
-		ewarn "Gnash was built without a media handler and or http handler !"
-		ewarn ""
-		ewarn "If you want Gnash to support video then you will need to"
-		ewarn "rebuild Gnash with either the ffmpeg or gstreamer use flags set."
-		ewarn ""
-	fi
-	ewarn "${PN} is still in heavy development"
-	ewarn "Please first report bugs on upstream gnashdevs and deal with them"
-	ewarn "And then report a Gentoo bug to the maintainer"
-	use kde && kde4-base_pkg_postinst
-}
diff --git a/www-plugins/gnash/gnash-0.8.7.ebuild b/www-plugins/gnash/gnash-0.8.7.ebuild
deleted file mode 100644
index 73d289f2eb99..000000000000
--- a/www-plugins/gnash/gnash-0.8.7.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.7.ebuild,v 1.11 2010/12/06 22:44:21 chithanh Exp $
-
-EAPI="2"
-CMAKE_REQUIRED="never"
-KDE_REQUIRED="optional"
-AT_M4DIR="cygnal"
-
-inherit autotools eutils kde4-base multilib nsplugins flag-o-matic
-
-DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features"
-HOMEPAGE="http://www.gnu.org/software/gnash/"
-SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="+agg cairo cygnal dbus doc +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl python +sdl ssh ssl test video_cards_intel"
-
-RDEPEND=">=dev-libs/boost-1.35.0
-	dev-libs/expat
-	dev-libs/libxml2
-	virtual/jpeg
-	media-libs/libpng
-	net-misc/curl
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXv
-	media-libs/giflib
-	x11-proto/xproto
-	agg? ( x11-libs/agg )
-	cairo? ( x11-libs/cairo )
-	doc? (
-	>=app-text/docbook2X-0.8.8
-	app-text/docbook-sgml-utils
-	)
-	ffmpeg? (
-	media-libs/libsdl[X]
-	>=media-video/ffmpeg-0.5
-	)
-	gstreamer? (
-	media-plugins/gst-plugins-ffmpeg
-	media-plugins/gst-plugins-mad
-	media-plugins/gst-plugins-meta
-	)
-	gtk? (
-	x11-libs/gtk+:2
-	net-libs/xulrunner:1.9
-	python? ( dev-python/pygtk:2 )
-	)
-	kde? ( >=kde-base/kdebase-startkde-${KDE_MINIMAL} )
-	opengl? (
-	virtual/opengl
-	gtk? ( x11-libs/gtkglext )
-	)
-	sdl? ( media-libs/libsdl[X] )
-	!kde? ( !gtk? ( media-libs/libsdl[X] ) )
-	nsplugin? ( net-libs/xulrunner:1.9 )
-	media-libs/speex[ogg]
-	sys-libs/zlib
-	>=sys-devel/libtool-2.2
-	mysql? ( virtual/mysql )
-	lirc? ( app-misc/lirc )
-	dbus? ( sys-apps/dbus )
-	ssh?  ( >=net-libs/libssh-0.4[server] )
-	ssl?  ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	gnome? ( app-text/rarian )"
-
-pkg_setup() {
-	if ! ( use agg || use cairo || use opengl ); then
-		eerror "You are trying to build Gnash without choosing a renderer [agg|cairo|opengl]."
-		die "Please enable a renderer"
-	elif use agg && use cairo && use opengl; then
-		ewarn "You enabled 3 renderers, agg was chosen as default."
-	elif use !agg && use cairo && use opengl; then
-		ewarn "You enabled cairo and opengl, cairo was chosen as default."
-	fi
-
-	if ! ( use kde || use gtk || use sdl ); then
-		ewarn "You are trying to build Gnash without choosing a gui frontend [gtk,kde,sdl]."
-		ewarn "sdl enabled as default"
-#		die "Please enable at least one of these USE flags."
-	fi
-
-	if use python && use !gtk; then
-		eerror "Building gnash with python support requires gtk."
-		die "python requires the gtk USE flag."
-	fi
-
-	if use nsplugin && use !gtk; then
-		eerror "Building gnash with nsplugin requires the gtk gui."
-		die "Nsplugin requires the gtk gui."
-	fi
-
-	if use sdl; then
-		elog "Enable SDL as gui frontend and sound handler"
-	fi
-
-	if use lirc; then
-		elog "Enable LIRC daemon support and lirc extension"
-	fi
-
-	kde4-base_pkg_setup
-}
-
-src_prepare() {
-	local mozsdk_incdir=${S}/plugin/mozilla-sdk/include
-
-	# Fix missing includes of amr.h, bug #286933
-	epatch "${FILESDIR}"/${PN}-0.8.7-amf-include.patch
-
-	# Defines $(XPIDL) correctly using sdkdir variable from libxul.pc
-	epatch "${FILESDIR}"/${PN}-0.8.5-xpidl-sdkdir.patch
-
-	# Use pkgconfig to determine XPCOM_IDL_DIR instead of non-portable construct.
-	# Fixes building against xulrunner-1.9.0, bug #284073.
-	if has_version ">=net-libs/xulrunner-1.9.2"; then
-		epatch "${FILESDIR}"/${PN}-0.8.7-xpcom-idldir.patch
-	else
-		epatch "${FILESDIR}"/${PN}-0.8.5-xpcom-idldir.patch
-	fi
-
-	# Resurect patch from bug #230287
-	epatch "${FILESDIR}"/${PN}-0.8.3-boost-dynamic-link.patch
-
-	# Adapted from Alt Linux to fix klash support properly
-	epatch "${FILESDIR}"/${PN}-0.8.7-klash.patch
-
-	# Make gnash find moc and uic properly, upstream bug #25758,
-	# gentoo bug #283905
-	epatch "${FILESDIR}"/${PN}-0.8.7-moc-qt4.patch
-
-	# Conflict headers with npapi.h from mozilla-sdk embedded stuffs and libxul-unstable header
-	# in case where xpcom (implicitly added with gtk) is enabled, we use the system header
-	if use gtk; then
-		rm -f ${mozsdk_incdir}/npapi.h
-		if has_version ">=net-libs/xulrunner-1.9.2"; then
-			ln -s $(pkg-config libxul --variable=includedir)/npapi.h \
-				${mozsdk_incdir}/npapi.h || die "symlink failed"
-		else
-			ln -s $(pkg-config libxul-unstable --variable=includedir)/unstable/npapi.h \
-				${mozsdk_incdir}/npapi.h || die "symlink failed"
-		fi
-	fi
-	eautoreconf
-}
-src_configure() {
-	append-flags -D__STDC_CONSTANT_MACROS #324357
-
-	local myconf myext gui
-
-	# Set nsplugin install directory.
-	use nsplugin && myconf="${myconf} --with-npapi-plugindir=/opt/netscape/plugins"
-	# Set rendering engine.
-	if use agg; then
-		myconf="${myconf} --enable-renderer=agg"
-	elif use cairo; then
-		myconf="${myconf} --enable-renderer=cairo"
-	else
-		myconf="${myconf} --enable-renderer=ogl"
-	fi
-	# Set kde and konqueror plugin directories.
-	if use kde; then
-		myconf="${myconf}
-			--with-plugins-install=system
-			--with-kde4-incl=${KDEDIR}/include
-			--with-kde4-configdir=${KDEDIR}/share/config
-			--with-kde4-prefix=${KDEDIR}
-			--with-kde4-lib=${KDEDIR}/$(get_libdir)
-			--with-kde-appsdatadir=${KDEDIR}/share/apps/klash
-			--with-kde4-servicesdir=${KDEDIR}/share/kde4/services
-			--with-kde4-plugindir=${KDEDIR}/$(get_libdir)/kde4/plugins"
-	fi
-
-	# Set media handler.
-	if use ffmpeg; then
-		myconf="${myconf} --enable-media=ffmpeg"
-	elif use gstreamer; then
-		myconf="${myconf} --enable-media=gst"
-	else
-		myconf="${myconf} --enable-media=none"
-	fi
-	# Set gui.
-	use gtk && gui=",gtk"
-	use kde && gui="${gui},kde4"
-
-	if use sdl; then
-		gui="${gui},sdl"
-		myconf="${myconf} --enable-sound=sdl"
-	fi
-
-	# Set extensions
-	use mysql && myext=",mysql"
-	use gtk && myext="${myext},gtk"
-	use lirc && myext="${myext},lirc"
-	use dbus && myext="${myext},dbus"
-
-	if [ -z "$gui" ]; then
-		gui="sdl"
-	fi
-
-	# Strip extra comma from gui and myext.
-	gui=$( echo $gui | sed -e 's/,//' )
-	myext=$( echo $myext | sed -e 's/,//' )
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--disable-kparts3 \
-		--enable-avm2 \
-		$(use_enable cygnal) \
-		$(use_enable cygnal cgibins) \
-		$(use_enable doc docbook) \
-		$(use_enable gnome ghelp) \
-		$(use_enable gtk npapi) \
-		$(use_enable kde kparts4) \
-		$(use_enable lirc) \
-		$(use_enable nls) \
-		$(use_enable nsplugin npapi) \
-		$(use_enable python) \
-		$(use_enable ssh) \
-		$(use_enable ssl) \
-		$(use_enable test testsuite) \
-		$(use_enable video_cards_intel i810-lod-bias) \
-		--enable-gui=${gui} \
-		--enable-extensions=${myext} \
-		${myconf}
-}
-src_test() {
-	local log=testsuite-results.txt
-	cd testsuite
-	emake check || die "make check failed"
-	./anaylse-results.sh > $log || die "results analyze failed"
-	cat $log
-}
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install nsplugin in directory set by --with-npapi-plugindir.
-	if use nsplugin; then
-		emake DESTDIR="${D}" install-plugin || die "install plugins failed"
-	fi
-
-	# Install kde konqueror plugin.
-	if use kde; then
-		pushd "${S}/plugin/klash4" >& /dev/null
-		emake DESTDIR="${D}" install-plugin || die "install kde plugins failed"
-		popd >& /dev/null
-	fi
-	# Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory.
-	use nsplugin && inst_plugin /opt/netscape/plugins/libgnashplugin.so \
-		|| rm -rf "${D}/opt"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
-pkg_postinst() {
-	if use !gnome || use !gstreamer && use !ffmpeg ; then
-		ewarn ""
-		ewarn "Gnash was built without a media handler and or http handler !"
-		ewarn ""
-		ewarn "If you want Gnash to support video then you will need to"
-		ewarn "rebuild Gnash with either the ffmpeg or gstreamer and gnome use flags set."
-		ewarn ""
-	fi
-	ewarn "${PN} is still in heavy development"
-	ewarn "Please first report bugs on upstream gnashdevs and deal with them"
-	ewarn "And then report a Gentoo bug to the maintainer"
-	use kde && kde4-base_pkg_postinst
-}
diff --git a/www-plugins/gnash/gnash-0.8.8.ebuild b/www-plugins/gnash/gnash-0.8.8.ebuild
index 1ee59a3805b4..2ee2f48561ff 100644
--- a/www-plugins/gnash/gnash-0.8.8.ebuild
+++ b/www-plugins/gnash/gnash-0.8.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.8.ebuild,v 1.13 2010/12/06 22:44:21 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.8.ebuild,v 1.14 2011/01/17 16:00:06 chithanh Exp $
 
 EAPI=3
 CMAKE_REQUIRED="never"
@@ -157,6 +157,9 @@ src_prepare() {
 	# Use external dejagnu for tests, bug #321017
 	epatch "${FILESDIR}"/${PN}-0.8.8-external-dejagnu.patch
 
+	# Fix insecure creation of temporary files, bug #351724
+	epatch "${FILESDIR}"/${PN}-0.8.8-secure-tempfile-creation.patch
+
 	# Fix building on ppc64, bug #342535
 	use ppc64 && append-flags -mminimal-toc