Bugfixing update to gnash-0.8.10
from brad
This commit is contained in:
parent
1805bc8d2b
commit
2a94fad035
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.49 2011/12/19 21:23:24 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.50 2012/02/22 13:22:00 dcoppa Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
@ -6,12 +6,12 @@ ONLY_FOR_ARCHS= ${GCC4_ARCHS}
|
||||
|
||||
COMMENT= SWF player with Firefox browser plugin
|
||||
|
||||
VER= 0.8.9
|
||||
VER= 0.8.10
|
||||
DISTNAME= gnash-${VER}
|
||||
REVISION= 6
|
||||
EPOCH= 0
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= ${MASTER_SITE_GNU:=gnash/${VER}/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
HOMEPAGE= http://gnashdev.org
|
||||
|
||||
@ -48,13 +48,13 @@ LIB_DEPENDS= audio/speex \
|
||||
USE_GMAKE= Yes
|
||||
USE_LIBTOOL= Yes
|
||||
LIBTOOL_FLAGS+= --tag=disable-static
|
||||
CONFIGURE_STYLE= autoconf
|
||||
AUTOCONF_VERSION= 2.67
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS= --disable-cygnal \
|
||||
--disable-jemalloc \
|
||||
--enable-renderer=agg \
|
||||
--enable-gui=gtk \
|
||||
--enable-media=ffmpeg \
|
||||
--without-gconf \
|
||||
--with-npapi-plugindir=${LOCALBASE}/lib/mozilla/plugins
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (gnash-0.8.9.tar.gz) = AdBCCTLu3gchHjaNQFrunA==
|
||||
RMD160 (gnash-0.8.9.tar.gz) = /xnsPC/2b6U/NTZYDTB4iB3DFmM=
|
||||
SHA1 (gnash-0.8.9.tar.gz) = FhO/QjqWKl9v4W7KSRtL+FC+hcs=
|
||||
SHA256 (gnash-0.8.9.tar.gz) = tzmpYmF4L9NOlP1/m0/+v4EoBjt/sR2cqQunmat7zko=
|
||||
SIZE (gnash-0.8.9.tar.gz) = 5081709
|
||||
MD5 (gnash-0.8.10.tar.bz2) = Y+n3nEHZPUjFovqUhWVIxA==
|
||||
RMD160 (gnash-0.8.10.tar.bz2) = AJMXTsCpEjCXcsAztfHBrUarQdw=
|
||||
SHA1 (gnash-0.8.10.tar.bz2) = vjsSpe3NOwXyrnPQLwmRqnhucwA=
|
||||
SHA256 (gnash-0.8.10.tar.bz2) = liUHLkXfkrqiwo/JmZ1OLetmvIJ1MLrt+tLk4iktEiQ=
|
||||
SIZE (gnash-0.8.10.tar.bz2) = 4238106
|
||||
|
@ -1,54 +0,0 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.4 2011/12/19 21:23:24 sthen Exp $
|
||||
--- configure.ac.orig Fri Mar 18 09:49:55 2011
|
||||
+++ configure.ac Thu Dec 15 05:05:30 2011
|
||||
@@ -191,7 +191,6 @@ case "${host}" in
|
||||
esac
|
||||
|
||||
|
||||
-AM_CONDITIONAL(PLUGIN_LINK_UNDEFINED, test x$openbsd_os = xopenbsd)
|
||||
AM_CONDITIONAL(WIN32, test x$windows = xyes)
|
||||
AM_CONDITIONAL(HAIKU, test x$haiku = xyes)
|
||||
AM_CONDITIONAL(AMIGAOS4, test x$amigaos4 = xyes)
|
||||
@@ -636,7 +635,7 @@ AC_ARG_ENABLE(gui,
|
||||
[ dnl Run the following code if no --enable-gui is given
|
||||
build_fb=auto
|
||||
build_sdl=auto
|
||||
- if test x"${openbsd_os}" = x"openbsd"; then
|
||||
+ if test x"${openbsd}" = xyes; then
|
||||
build_gtk=yes
|
||||
build_dump=auto
|
||||
else if test x"${haiku}" = xyes; then
|
||||
@@ -1936,11 +1935,7 @@ AC_CHECK_HEADERS(signal.h)
|
||||
AC_CHECK_HEADERS(unistd.h)
|
||||
AC_CHECK_HEADERS(sys/time.h)
|
||||
AC_CHECK_HEADERS(ieeefp.h)
|
||||
-dnl libcurl3-dev on Ubuntu has a dependency on lber, and Gnash won't link
|
||||
-dnl on most machines without it. While it isn't diretly used by Gnash at all,
|
||||
-dnl it's to work around an Ubuntu packaging bug.
|
||||
-AC_CHECK_LIB(lber, ber_free)
|
||||
-AC_CHECK_LIB(bz2, BZ2_bzopen)
|
||||
+AC_CHECK_LIB(bz2, BZ2_bzopen, [AC_SUBST(BZ2_LIBS, -lbz2)])
|
||||
AC_CHECK_LIB(c, getpwnam, AC_DEFINE(HAVE_GETPWNAM, 1, [Has getpwnam] ))
|
||||
|
||||
dnl X11 is needed for fltk (at least),
|
||||
@@ -2129,6 +2124,7 @@ if test "x$ac_cv_long_timezone" = "xyes" ; then
|
||||
AC_DEFINE(HAVE_LONG_TIMEZONE, [1], [extern timezone is a long integer, not a function])
|
||||
fi
|
||||
|
||||
+AC_CHECK_FUNCS(mkstemps)
|
||||
AC_CHECK_FUNCS(sysconf)
|
||||
AC_CHECK_FUNCS(shmget shmat shmdt mmap)
|
||||
AC_CHECK_FUNCS(memmove)
|
||||
@@ -2147,11 +2143,7 @@ AC_SUBST(WINDRES)
|
||||
|
||||
GNASH_PKG_FIND(z, [zlib.h], [zlib compression library], compress)
|
||||
GNASH_PKG_FIND(jpeg, [jpeglib.h], [jpeg images], jpeg_mem_init)
|
||||
-if test x"${openbsd_os}" = x"yes"; then
|
||||
- GNASH_PKG_FIND(libpng, [png.h], [png images], png_info_init)
|
||||
-else
|
||||
- GNASH_PKG_FIND(png, [png.h], [png images], png_info_init)
|
||||
-fi
|
||||
+GNASH_PKG_FIND(png, [png.h], [png images], png_info_init)
|
||||
GNASH_PKG_FIND(gif, [gif_lib.h], [gif images], DGifOpen)
|
||||
if test x"${GIF_LIBS}" = x ; then
|
||||
GNASH_PKG_FIND(ungif, [gif_lib.h], [gif images], DGifOpen)
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-doc_C_Makefile_in,v 1.2 2011/03/23 16:20:03 dcoppa Exp $
|
||||
--- doc/C/Makefile.in.orig Fri Mar 18 21:57:44 2011
|
||||
+++ doc/C/Makefile.in Fri Mar 18 22:00:17 2011
|
||||
@@ -443,7 +443,7 @@ curlconfig = @curlconfig@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
docbook_styles = @docbook_styles@
|
||||
-docdir = $(datadir)/$(PACKAGE)/doc/$(docname)/$(lang)
|
||||
+docdir = $(datadir)/doc/$(PACKAGE)
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-macros_boost_m4,v 1.1 2011/12/15 09:47:23 sthen Exp $
|
||||
--- macros/boost.m4.orig Sat Feb 26 13:11:08 2011
|
||||
+++ macros/boost.m4 Thu Dec 8 19:34:32 2011
|
||||
@@ -34,10 +34,10 @@ AC_DEFUN([GNASH_PATH_BOOST],
|
||||
libname=""
|
||||
dnl this is a list of *required* headers. If any of these are missing, this
|
||||
dnl test will return a failure, and Gnash won't build.
|
||||
- boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp program_options/options_description.hpp"
|
||||
+ boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp program_options/options_description.hpp iostreams/stream.hpp"
|
||||
dnl this is a list of *required* libraries. If any of these are missing, this
|
||||
dnl test will return a failure, and Gnash won't build.
|
||||
- boost_libs="thread program_options"
|
||||
+ boost_libs="thread program_options iostreams"
|
||||
|
||||
dnl this is a list of *recommended* libraries. If any of these are missing, this
|
||||
dnl test will return a warning, and Gnash will build, but testing won't work.
|
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-macros_curl_m4,v 1.1 2011/04/03 15:02:12 dcoppa Exp $
|
||||
--- macros/curl.m4.orig Fri Apr 1 20:04:45 2011
|
||||
+++ macros/curl.m4 Fri Apr 1 20:05:19 2011
|
||||
@@ -118,6 +118,14 @@ AC_DEFUN([GNASH_PATH_CURL],
|
||||
|
||||
if test x"${ac_cv_path_curl_lib}" != x ; then
|
||||
CURL_LIBS="${ac_cv_path_curl_lib}"
|
||||
+ dnl libcurl3-dev on Ubuntu has a dependency on lber, and Gnash won't link
|
||||
+ dnl on most machines without it. (Ubuntu packaging bug.)
|
||||
+ save_LIBS="$LIBS"
|
||||
+ LIBS="$LIBS $CURL_LIBS"
|
||||
+ AC_TRY_LINK_FUNC(curl_easy_init, [echo "ok!"],
|
||||
+ [AC_CHECK_LIB(lber, ber_free, [CURL_LIBS="$CURL_LIBS -llber"])])
|
||||
+ dnl FIXME: complain if that didn't do the trick?
|
||||
+ LIBS="$save_LIBS"
|
||||
else
|
||||
CURL_LIBS=""
|
||||
fi
|
@ -1,143 +0,0 @@
|
||||
$OpenBSD: patch-macros_ffmpeg_m4,v 1.1 2011/04/03 15:02:12 dcoppa Exp $
|
||||
--- macros/ffmpeg.m4.orig Sat Feb 26 13:11:08 2011
|
||||
+++ macros/ffmpeg.m4 Fri Apr 1 23:43:14 2011
|
||||
@@ -22,6 +22,7 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
|
||||
backupLIBS="$LIBS"
|
||||
backupCFLAGS="$CFLAGS"
|
||||
avcodec_h=""
|
||||
+ avcodec_version_h=""
|
||||
ffmpeg_top_incl=""
|
||||
|
||||
dnl If the user specify an path to include headers from, we assume it's the full
|
||||
@@ -46,6 +47,9 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
|
||||
else
|
||||
AC_MSG_ERROR([${with_ffmpeg_incl} directory does not contain the avcodec.h header])
|
||||
fi
|
||||
+ if test -f ${with_ffmpeg_incl}/version.h; then
|
||||
+ avcodec_version_h=${with_ffmpeg_incl}/version.h
|
||||
+ fi
|
||||
fi
|
||||
])
|
||||
|
||||
@@ -66,6 +70,9 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
|
||||
if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then
|
||||
ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}; pwd)`"
|
||||
avcodec_h="${ffmpeg_top_incl}/${i}/avcodec.h"
|
||||
+ if test -f ${ffmpeg_top_incl}/${i}/version.h; then
|
||||
+ avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h
|
||||
+ fi
|
||||
break
|
||||
fi
|
||||
done
|
||||
@@ -182,14 +189,24 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
|
||||
dnl a modified form of grepping may be better, making sure all old kinds of
|
||||
dnl version numbering fail gracefully.
|
||||
|
||||
+ versionfile=""
|
||||
+
|
||||
dnl Check avcodec version number, if it was found
|
||||
- if test x"${avcodec_h}" != x; then
|
||||
+ if test x"${avcodec_version_h}" != x; then
|
||||
+ versionfile=${avcodec_version_h}
|
||||
+ else
|
||||
+ if test x"${avcodec_h}" != x; then
|
||||
+ versionfile=${avcodec_h}
|
||||
+ fi
|
||||
+ fi
|
||||
|
||||
+ if test x"${versionfile}" != x; then
|
||||
+
|
||||
AC_MSG_CHECKING([ffmpeg version])
|
||||
|
||||
- ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
|
||||
- ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
|
||||
- ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
|
||||
+ ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"`
|
||||
+ ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"`
|
||||
+ ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${versionfile} | sed -e "s%[[^0-9]]%%g"`
|
||||
|
||||
if test x"${ffmpeg_major_version}" != x ; then
|
||||
|
||||
@@ -198,15 +215,15 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
|
||||
else
|
||||
|
||||
dnl #define LIBAVCODEC_VERSION_TRIPLET 51,50,1
|
||||
- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%,%.%g"`
|
||||
+ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${versionfile} | awk '{print $'3'}' | sed -e "s%,%.%g"`
|
||||
|
||||
if test x"${ffmpeg_version}" = x ; then
|
||||
|
||||
dnl NOTE: the [0-9]*d. pattern discards deb-heads rubbish prefix
|
||||
- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"`
|
||||
+ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${versionfile} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"`
|
||||
|
||||
if test x"${ffmpeg_version}" = x ; then
|
||||
- ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | awk '{print $'3'}'`
|
||||
+ ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${versionfile} | awk '{print $'3'}'`
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -384,32 +401,6 @@ dnl AC_EGREP_HEADER(avcodec_decode_audio2, ${avcodec
|
||||
dnl
|
||||
if test x"${ac_cv_path_ffmpeg_lib}" != x; then
|
||||
|
||||
- dnl Look for the DTS library, which is required on some systems. {
|
||||
- dnl
|
||||
- dnl TODO: skip this if -ldts is already in due to pkg-config
|
||||
- dnl
|
||||
- AC_MSG_CHECKING([for libdts library])
|
||||
- if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
|
||||
- $PKG_CONFIG --exists libdts && libdts=`$PKG_CONFIG --libs-only-l libdts`
|
||||
- else
|
||||
- libdts=""
|
||||
- fi
|
||||
- if test x"${libdts}" = x; then
|
||||
- if test -f ${top_lib_dir}/libdts.a -o -f ${top_lib_dir}/libdts.${shlibext}; then
|
||||
- ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldts"
|
||||
- AC_MSG_RESULT(${top_lib_dir}/libdts)
|
||||
- else
|
||||
- AC_MSG_RESULT(no)
|
||||
- if test x${cross_compiling} = xno; then
|
||||
- AC_CHECK_LIB(dts, dts_init, [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldts"])
|
||||
- fi
|
||||
- fi
|
||||
- else
|
||||
- AC_MSG_RESULT(${libdts})
|
||||
- ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libdts}"
|
||||
- fi
|
||||
- dnl End of DTS library looking }
|
||||
-
|
||||
dnl Look for the VORBISENC library, which is required on some systems. {
|
||||
AC_MSG_CHECKING([for libvorbisenc library])
|
||||
if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
|
||||
@@ -525,22 +516,16 @@ dnl AC_EGREP_HEADER(avcodec_decode_audio2, ${avcodec
|
||||
libgsm=""
|
||||
fi
|
||||
|
||||
- dnl OpenBSD seems to have a problem with libgsm.
|
||||
- if test x$openbsd_os != xopenbsd; then
|
||||
- if test x"${libgsm}" = x; then
|
||||
- if test -f ${top_lib_dir}/libgsm.a -o -f ${top_lib_dir}/libgsm.${shlibext}; then
|
||||
- ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"
|
||||
- AC_MSG_RESULT(${top_lib_dir}/libgsm)
|
||||
- else
|
||||
- AC_MSG_RESULT(no)
|
||||
- if test x${cross_compiling} = xno; then
|
||||
- AC_CHECK_LIB(gsm, gsm_destroy, [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"])
|
||||
- fi
|
||||
+ if test x"${libgsm}" = x; then
|
||||
+ if test -f ${top_lib_dir}/libgsm.a -o -f ${top_lib_dir}/libgsm.${shlibext}; then
|
||||
+ ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"
|
||||
+ AC_MSG_RESULT(${top_lib_dir}/libgsm)
|
||||
+ else
|
||||
+ AC_MSG_RESULT(no)
|
||||
+ if test x${cross_compiling} = xno; then
|
||||
+ AC_CHECK_LIB(gsm, gsm_destroy, [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"])
|
||||
fi
|
||||
fi
|
||||
- else
|
||||
- AC_MSG_RESULT(${libgsm})
|
||||
- ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libgsm}"
|
||||
fi
|
||||
dnl End of GSM library looking }
|
||||
|
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-plugin_npapi_Makefile_in,v 1.1 2011/12/15 09:47:23 sthen Exp $
|
||||
--- plugin/npapi/Makefile.in.orig Thu Dec 8 19:32:00 2011
|
||||
+++ plugin/npapi/Makefile.in Thu Dec 8 19:33:02 2011
|
||||
@@ -647,6 +647,7 @@ noinst_HEADERS = plugin.h mozilla-sdk/pluginbase.h \
|
||||
@AMIGAOS4_FALSE@@WIN32_FALSE@ callbacks.cpp external.cpp
|
||||
@AMIGAOS4_FALSE@@WIN32_FALSE@libgnashplugin_la_LIBADD = \
|
||||
@AMIGAOS4_FALSE@@WIN32_FALSE@ $(GLIB_LIBS) \
|
||||
+@AMIGAOS4_FALSE@@WIN32_FALSE@ -lboost_iostreams \
|
||||
@AMIGAOS4_FALSE@@WIN32_FALSE@ $(NULL)
|
||||
|
||||
@AMIGAOS4_FALSE@@WIN32_FALSE@test_LDADD = \
|
@ -1,131 +0,0 @@
|
||||
$OpenBSD: patch-plugin_npapi_plugin_cpp,v 1.7 2011/12/19 21:23:24 sthen Exp $
|
||||
|
||||
Fix creating world-readable cookies under /tmp with predictable filenames. CVE-2011-4328
|
||||
|
||||
--- plugin/npapi/plugin.cpp.orig Fri Mar 18 09:44:30 2011
|
||||
+++ plugin/npapi/plugin.cpp Thu Dec 15 05:12:51 2011
|
||||
@@ -25,6 +25,9 @@
|
||||
#include <boost/scoped_array.hpp>
|
||||
#include <boost/algorithm/string/replace.hpp>
|
||||
#include <boost/algorithm/string/find.hpp>
|
||||
+#define BOOST_IOSTREAMS_USE_DEPRECATED
|
||||
+#include <boost/iostreams/device/file_descriptor.hpp>
|
||||
+#include <boost/iostreams/stream.hpp>
|
||||
#include <cassert>
|
||||
#include <string>
|
||||
#include <cstdlib> // getenv
|
||||
@@ -150,6 +153,37 @@ getPluginDescription()
|
||||
return desc;
|
||||
}
|
||||
|
||||
+boost::iostreams::file_descriptor_sink getfdsink(char mkstemplate[]);
|
||||
+
|
||||
+boost::iostreams::file_descriptor_sink
|
||||
+getfdsink(char mksTemplate[])
|
||||
+{
|
||||
+ int fd, suffix = std::string(mksTemplate).size() - std::string(mksTemplate).find("XXXXXX") - 6;
|
||||
+#ifdef HAVE_MKSTEMPS
|
||||
+ fd = mkstemps (mksTemplate, suffix);
|
||||
+#else
|
||||
+ if (suffix > 0) {
|
||||
+ char *mksTNoSuff = const_cast<char*>(std::string(mksTemplate).substr(0, std::string(mksTemplate).size() - suffix).c_str());
|
||||
+ fd = mkstemp (mksTNoSuff);
|
||||
+ const char *mksTSuffix = std::string(mksTemplate).substr(std::string(mksTemplate).size() - suffix, suffix).c_str();
|
||||
+ std::stringstream mksTFull;
|
||||
+ mksTFull << mksTNoSuff << mksTSuffix;
|
||||
+ if (rename (mksTNoSuff, mksTFull.str().c_str()) != 0) {
|
||||
+ gnash::log_error("Failed to rename %s", mksTNoSuff);
|
||||
+ }
|
||||
+ strcpy (mksTemplate, mksTFull.str().c_str());
|
||||
+ } else {
|
||||
+ fd = mkstemp (mksTemplate);
|
||||
+ }
|
||||
+#endif
|
||||
+#if BOOST_VERSION < 104400
|
||||
+ boost::iostreams::file_descriptor_sink fdsink(fd, true);
|
||||
+#else
|
||||
+ boost::iostreams::file_descriptor_sink fdsink(fd, boost::iostreams::close_handle);
|
||||
+#endif
|
||||
+ return fdsink;
|
||||
+}
|
||||
+
|
||||
//
|
||||
// general initialization and shutdown
|
||||
//
|
||||
@@ -954,22 +988,25 @@ create_standalone_launcher(const std::string& page_url
|
||||
return;
|
||||
}
|
||||
|
||||
- std::ofstream saLauncher;
|
||||
+ char debugname[] = "/tmp/gnash-debug-XXXXXX.sh";
|
||||
+ boost::iostreams::file_descriptor_sink fdsink = getfdsink(debugname);
|
||||
+#if BOOST_VERSION >= 104400
|
||||
+ if (fdsink.handle() == -1) {
|
||||
+ gnash::log_error("Failed to create sink: %s", debugname);
|
||||
+ return;
|
||||
+ }
|
||||
+#endif
|
||||
+ boost::iostreams::stream<boost::iostreams::file_descriptor_sink>
|
||||
+ saLauncher (fdsink);
|
||||
|
||||
- std::stringstream ss;
|
||||
- static int debugno = 0;
|
||||
- debugno = (debugno + 1) % 10;
|
||||
- ss << "/tmp/gnash-debug-" << debugno << ".sh";
|
||||
- saLauncher.open(ss.str().c_str(), std::ios::out | std::ios::trunc);
|
||||
-
|
||||
if (!saLauncher) {
|
||||
- gnash::log_error("Failed to open new file for standalone launcher: " + ss.str());
|
||||
+ gnash::log_error("Failed to open new file for standalone launcher: %s", debugname);
|
||||
return;
|
||||
}
|
||||
|
||||
saLauncher << "#!/bin/sh" << std::endl
|
||||
<< "export GNASH_COOKIES_IN="
|
||||
- << "/tmp/gnash-cookies." << getpid() << std::endl
|
||||
+ << std::getenv("GNASH_COOKIES_IN") << std::endl
|
||||
<< getGnashExecutable() << " ";
|
||||
|
||||
if (!page_url.empty()) {
|
||||
@@ -992,6 +1029,7 @@ create_standalone_launcher(const std::string& page_url
|
||||
<< std::endl;
|
||||
|
||||
saLauncher.close();
|
||||
+ fdsink.close();
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -1097,12 +1135,17 @@ nsPluginInstance::setupCookies(const std::string& page
|
||||
}
|
||||
|
||||
gnash::log_debug("The Cookie for %s is %s", url, ncookie);
|
||||
- std::ofstream cookiefile;
|
||||
- std::stringstream ss;
|
||||
- ss << "/tmp/gnash-cookies." << getpid();
|
||||
+ char cookiename[] = "/tmp/gnash-cookies.XXXXXX";
|
||||
+ boost::iostreams::file_descriptor_sink fdsink = getfdsink(cookiename);
|
||||
+#if BOOST_VERSION >= 104400
|
||||
+ if (fdsink.handle() == -1) {
|
||||
+ gnash::log_error("Failed to create sink: %s", cookiename);
|
||||
+ return;
|
||||
+ }
|
||||
+#endif
|
||||
+ boost::iostreams::stream<boost::iostreams::file_descriptor_sink>
|
||||
+ cookiefile (fdsink);
|
||||
|
||||
- cookiefile.open(ss.str().c_str(), std::ios::out | std::ios::trunc);
|
||||
-
|
||||
// Firefox provides cookies in the following format:
|
||||
//
|
||||
// cookie1=value1;cookie2=value2;cookie3=value3
|
||||
@@ -1121,8 +1164,9 @@ nsPluginInstance::setupCookies(const std::string& page
|
||||
}
|
||||
|
||||
cookiefile.close();
|
||||
+ fdsink.close();
|
||||
|
||||
- if (setenv("GNASH_COOKIES_IN", ss.str().c_str(), 1) < 0) {
|
||||
+ if (setenv("GNASH_COOKIES_IN", cookiename, 1) < 0) {
|
||||
gnash::log_error(
|
||||
"Couldn't set environment variable GNASH_COOKIES_IN to %s",
|
||||
ncookie);
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.11 2011/12/03 23:20:52 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.12 2012/02/22 13:22:00 dcoppa Exp $
|
||||
bin/gnash
|
||||
bin/gnash-gtk-launcher
|
||||
@bin bin/gprocessor
|
||||
@ -45,7 +45,6 @@ include/gnash/Point_as.h
|
||||
include/gnash/RTMP.h
|
||||
include/gnash/Range2d.h
|
||||
include/gnash/Rectangle_as.h
|
||||
include/gnash/Renderer.h
|
||||
include/gnash/SWFCtype.h
|
||||
include/gnash/SharedMem.h
|
||||
include/gnash/SimpleBuffer.h
|
||||
@ -130,6 +129,7 @@ include/gnash/asobj/TextFormat_as.h
|
||||
include/gnash/asobj/TextSnapshot_as.h
|
||||
include/gnash/asobj/UserFunction.h
|
||||
include/gnash/asobj/Video.h
|
||||
include/gnash/asobj/Video_as.h
|
||||
include/gnash/asobj/XMLNode_as.h
|
||||
include/gnash/asobj/XMLSocket_as.h
|
||||
include/gnash/asobj/XML_as.h
|
||||
@ -150,7 +150,10 @@ include/gnash/geom_pkg.h
|
||||
include/gnash/getclocktime.hpp
|
||||
include/gnash/gettext.h
|
||||
include/gnash/gmemory.h
|
||||
include/gnash/jemtree.h
|
||||
include/gnash/jemalloc.h
|
||||
include/gnash/jemalloc_gnash.h
|
||||
include/gnash/jemalloc_rb.h
|
||||
include/gnash/jemalloc_types.h
|
||||
include/gnash/log.h
|
||||
include/gnash/net_pkg.h
|
||||
include/gnash/noseek_fd_adapter.h
|
||||
@ -159,7 +162,6 @@ include/gnash/parser/movie_definition.h
|
||||
include/gnash/rc.h
|
||||
include/gnash/ref_counted.h
|
||||
include/gnash/sharedlib.h
|
||||
include/gnash/smart_ptr.h
|
||||
include/gnash/snappingrange.h
|
||||
include/gnash/string_table.h
|
||||
include/gnash/text_pkg.h
|
||||
@ -181,6 +183,9 @@ lib/gnash/libgnashbase-${VER}.so
|
||||
lib/gnash/libgnashbase.so
|
||||
lib/gnash/libgnashcore-${VER}.so
|
||||
lib/gnash/libgnashcore.so
|
||||
lib/gnash/libgnashdevice-${VER}.so
|
||||
lib/gnash/libgnashdevice.la
|
||||
lib/gnash/libgnashdevice.so
|
||||
lib/gnash/libgnashmedia-${VER}.so
|
||||
lib/gnash/libgnashmedia.so
|
||||
lib/gnash/libgnashrender-${VER}.so
|
||||
@ -218,12 +223,21 @@ share/gnash/gnash-splash.swf
|
||||
share/gnash/gnash_128_96.ico
|
||||
share/icons/hicolor/32x32/apps/gnash.xpm
|
||||
share/locale/cs/LC_MESSAGES/gnash.mo
|
||||
share/locale/da/LC_MESSAGES/gnash.mo
|
||||
share/locale/de/LC_MESSAGES/gnash.mo
|
||||
share/locale/el/LC_MESSAGES/gnash.mo
|
||||
share/locale/en_GB/LC_MESSAGES/gnash.mo
|
||||
share/locale/es/LC_MESSAGES/gnash.mo
|
||||
share/locale/fi/LC_MESSAGES/gnash.mo
|
||||
share/locale/fr/LC_MESSAGES/gnash.mo
|
||||
share/locale/it/LC_MESSAGES/gnash.mo
|
||||
share/locale/ja/LC_MESSAGES/gnash.mo
|
||||
share/locale/km/
|
||||
share/locale/km/LC_MESSAGES/
|
||||
share/locale/km/LC_MESSAGES/gnash.mo
|
||||
share/locale/ne/LC_MESSAGES/gnash.mo
|
||||
share/locale/ru/LC_MESSAGES/gnash.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/gnash.mo
|
||||
@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
|
||||
@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
|
||||
@exec %D/bin/update-desktop-database
|
||||
|
Loading…
x
Reference in New Issue
Block a user