[Gnash-commit] gnash ChangeLog configure.ac libbase/Makefile.a...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/26 10:10:37

Modified files:
        .              : ChangeLog configure.ac 
        libbase        : Makefile.am rc.cpp 
Added files:
        libbase        : sysgnashpluginrc.in sysgnashrc.in 

Log message:
                * libbase/rc.cpp: explicitly initialize the default
                  value for _solsafedir to "/tmp/" (will be done
                  so by SharedObject.cpp for an empty string anyway);
                  drop the hard-coded DEFAULT_STREAMS_TIMEOUT as it's
                  now set at configure time.
                * configure.ac: provide DEFAULT_STREAMS_TIMEOUT, and
                  all the FLASH_VERSION macros as substitutable symbols;
                  generate libbase/sysgnashpluginrc and libbase/sysgnashrc
                * libbase/: Makefile.am, sysgnashpluginrc.in, sysgnashrc.in:
                  Provide systemwide default configuration files.
                  They are created and distributed, but still not installed.
        
        Please review the sysgnash*.in to add any missing supported directive,
        document them, find out their default. 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6402&r2=1.6403
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.517&r2=1.518
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/sysgnashpluginrc.in?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/sysgnashrc.in?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6402
retrieving revision 1.6403
diff -u -b -r1.6402 -r1.6403
--- ChangeLog   26 Apr 2008 08:33:27 -0000      1.6402
+++ ChangeLog   26 Apr 2008 10:10:35 -0000      1.6403
@@ -1,5 +1,19 @@
 2008-04-26 Sandro Santilli <address@hidden>
 
+       * libbase/rc.cpp: explicitly initialize the default
+         value for _solsafedir to "/tmp/" (will be done
+         so by SharedObject.cpp for an empty string anyway);
+         drop the hard-coded DEFAULT_STREAMS_TIMEOUT as it's
+         now set at configure time.
+       * configure.ac: provide DEFAULT_STREAMS_TIMEOUT, and
+         all the FLASH_VERSION macros as substitutable symbols;
+         generate libbase/sysgnashpluginrc and libbase/sysgnashrc
+       * libbase/: Makefile.am, sysgnashpluginrc.in, sysgnashrc.in:
+         Provide systemwide default configuration files.
+         They are created and distributed, but still not installed.
+
+2008-04-26 Sandro Santilli <address@hidden>
+
        * libbase/rc.cpp: add support for 'include' directive,
          cleanup parser to recognize empty lines and comments
          not starting on first column and to be more verbose

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -b -r1.517 -r1.518
--- configure.ac        25 Apr 2008 22:22:27 -0000      1.517
+++ configure.ac        26 Apr 2008 10:10:36 -0000      1.518
@@ -37,66 +37,83 @@
 dnl Set the default values for Flash Version. These are converted into
 dnl various strings to make JavaScript or ActionScript detectors
 dnl recognize Gnash as a Flash Player.
-AC_DEFINE([DEFAULT_FLASH_MAJOR_VERSION], ["9"], [Default Flash major version])
-AC_DEFINE([DEFAULT_FLASH_MINOR_VERSION], ["0"], [Default Flash minor version])
-AC_DEFINE([DEFAULT_FLASH_REV_NUMBER], ["999"], [Default Flash revision number])
+DEFAULT_FLASH_MAJOR_VERSION="9"
+DEFAULT_FLASH_MINOR_VERSION="0"
+DEFAULT_FLASH_REV_NUMBER="999"
+AC_SUBST(DEFAULT_FLASH_MAJOR_VERSION)
+AC_SUBST(DEFAULT_FLASH_MINOR_VERSION)
+AC_SUBST(DEFAULT_FLASH_REV_NUMBER)
+
+AC_DEFINE([DEFAULT_FLASH_MAJOR_VERSION], [${DEFAULT_FLASH_MAJOR_VERSION}], 
[Default Flash major version])
+AC_DEFINE([DEFAULT_FLASH_MINOR_VERSION], [${DEFAULT_FLASH_MINOR_VERSION}], 
[Default Flash minor version])
+AC_DEFINE([DEFAULT_FLASH_REV_NUMBER], [${DEFAULT_FLASH_REV_NUMBER}], [Default 
Flash revision number])
 
 dnl TODO: use host/build/target -- whatever is more appropriate
 case "${host}" in
   *-apple-*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["MAC"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["MacOS"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="MAC"
+    DEFAULT_FLASH_SYSTEM_OS="MacOS"
     ;;
   *-openbsd*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["BSD"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["OpenBSD"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="BSD"
+    DEFAULT_FLASH_SYSTEM_OS="OpenBSD"
     ;;
   *-freebsd*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["BSD"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["FreeBSD"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="BSD"
+    DEFAULT_FLASH_SYSTEM_OS="FreeBSD"
     ;;
   *-netbsd*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["BSD"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["NetBSD"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="BSD"
+    DEFAULT_FLASH_SYSTEM_OS="NetBSD"
     ;;
   *-linux-gnu)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["LNX"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["GNU/Linux"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="LNX"
+    DEFAULT_FLASH_SYSTEM_OS="GNU/Linux"
     ;;
   *-linux*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["LNX"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["Linux"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="LNX"
+    DEFAULT_FLASH_SYSTEM_OS="Linux"
     ;;
   *-cygwin* | *-mingw* | *-pw32*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["WIN"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["Windows"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="WIN"
+    DEFAULT_FLASH_SYSTEM_OS="Windows"
     ;;
   *-*solaris*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["SUN"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["Solaris"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="SUN"
+    DEFAULT_FLASH_SYSTEM_OS="Solaris"
     ;;
   *-os2*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["OS2"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["OS/2"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="OS2"
+    DEFAULT_FLASH_SYSTEM_OS="OS/2"
     ;;
   *-sco*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["SCO"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["SCO/Unix"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="SCO"
+    DEFAULT_FLASH_SYSTEM_OS="SCO/Unix"
     ;;
   *-irix*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["IRX"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["IRIX"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="IRX"
+    DEFAULT_FLASH_SYSTEM_OS="IRIX"
     ;;
   *-hpux*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["HPX"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["HPUX"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="HPX"
+    DEFAULT_FLASH_SYSTEM_OS="HPUX"
     ;;    
   *)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["UNK"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["Unknown"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="UNK"
+    DEFAULT_FLASH_SYSTEM_OS="Unknown"
     ;;
 esac
 
+AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], [${DEFAULT_FLASH_PLATFORM_ID}], 
[Default 3-letter platform identifier for version string])
+AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], [${DEFAULT_FLASH_SYSTEM_OS}], [Default 
value for System.capabilities.os])
+
+AC_SUBST(DEFAULT_FLASH_PLATFORM_ID)
+AC_SUBST(DEFAULT_FLASH_SYSTEM_OS)
+
+DEFAULT_STREAMS_TIMEOUT=10
+AC_SUBST(DEFAULT_STREAMS_TIMEOUT)
+AC_DEFINE([DEFAULT_STREAMS_TIMEOUT], [${DEFAULT_STREAMS_TIMEOUT}], [Default 
streams timeout in seconds])
+
 
 dnl Some things you can only do by looking at the platform name.
 case "${host}" in
@@ -1988,6 +2005,8 @@
 libmedia/Makefile
 po/Makefile
 libbase/Makefile
+libbase/sysgnashrc
+libbase/sysgnashpluginrc
 libgeometry/Makefile
 server/Makefile
 server/asobj/Makefile

Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- libbase/Makefile.am 26 Apr 2008 07:58:16 -0000      1.108
+++ libbase/Makefile.am 26 Apr 2008 10:10:36 -0000      1.109
@@ -15,7 +15,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-EXTRA_DIST = 
+EXTRA_DIST = sysgnashrc.in sysgnashpluginrc.in
 
 # this is where Gnash plugins get installed
 pluginsdir = $(prefix)/lib/gnash/plugins

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- libbase/rc.cpp      26 Apr 2008 08:33:28 -0000      1.69
+++ libbase/rc.cpp      26 Apr 2008 10:10:36 -0000      1.70
@@ -45,11 +45,6 @@
 
 #include <boost/tokenizer.hpp>
 
-#ifndef DEFAULT_STREAMS_TIMEOUT
-// TODO: add a ./configure switch to set this
-# define DEFAULT_STREAMS_TIMEOUT 10
-#endif
-
 using std::endl;
 using std::cout;
 using std::cerr;
@@ -96,6 +91,7 @@
                           _startStopped(false),
                           _insecureSSL(false),
                           _streamsTimeout(DEFAULT_STREAMS_TIMEOUT),
+                           _solsandbox("/tmp/"),
                            _solreadonly(false),
                            _sollocaldomain(false),
                            _lcdisabled(false),

Index: libbase/sysgnashpluginrc.in
===================================================================
RCS file: libbase/sysgnashpluginrc.in
diff -N libbase/sysgnashpluginrc.in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ libbase/sysgnashpluginrc.in 26 Apr 2008 10:10:36 -0000      1.1
@@ -0,0 +1,21 @@
+###########################################################
+#
+# Sat Apr 26 11:47:04 CEST 2008
+#
+# This file will be used as a config file by
+# the gnash NPAPI plugin (still not by the KPARTS one)
+#
+# At time of writing, the plugin will first parse the
+# systemwide 'gnashrc' file, then the user '.gnashrc'
+# file, then the systemwide 'gnashpluginrc' file and
+# finally user '.gnashpluginrc'.
+#
+###########################################################
+
+# Start the gui in STOP mode
+#
+# This is a commonly wanted feature for plugin  runs.
+#
+# Default: off
+#
+set startStopped on

Index: libbase/sysgnashrc.in
===================================================================
RCS file: libbase/sysgnashrc.in
diff -N libbase/sysgnashrc.in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ libbase/sysgnashrc.in       26 Apr 2008 10:10:36 -0000      1.1
@@ -0,0 +1,193 @@
+###########################################################
+#
+# Sat Apr 26 11:47:04 CEST 2008
+#
+# This file will be used as a config file by
+# all gnash processes.
+#
+# At time of writing, the plugin will first parse the
+# systemwide 'gnashrc' file, then the user '.gnashrc'
+# file, then the systemwide 'gnashpluginrc' file and
+# finally user '.gnashpluginrc'.
+#
+###########################################################
+
+
+# Display a splash screen when starting.
+#
+# Default: on
+#
+#set splashScreen off
+
+# Only access remote content from our local domain 
+#
+# Default: off
+#
+#set localdomain on
+
+# Only access content from our local host
+#
+# Default: off
+#
+#set localhost on
+
+# If whitelist is non-empty, only SWF from the given domains
+# are allowed to be loaded.
+#
+# Default: empty
+#
+#set whitelist www.doonesbury.com www.cnn.com
+#append whiteList www.9news.com
+
+# If whitelist is empty, these are the only domains from 
+# which loading SWFs will be forbidden.
+#
+# Default: empty
+#
+#set blacklist www.doubleclick.com www.ebay.com
+#append blacklist www.evil.com
+
+# The delay between frame advance,
+# 0 to use what's specified in the SWF.
+#
+# Default: 0
+#
+#set delay 50
+
+# Gnash verbosity level:
+#  0: no output
+#  1: user traces, internal errors, unimplemented messages
+#  2: debug messages
+#
+# Default: 0
+#
+#set verbosity 1
+
+# Print a lot of info about ActionScript processing
+#
+# Default: off
+# 
+#set actionDump on
+
+# Print a lot of info about SWF parsing
+#
+# Default: off
+# 
+#set parserDump on
+
+# File to send logs to (if writelog is on)
+#
+# Default: gnash-dbg.log (in current working dir)
+#
+#set debuglog /tmp/gnash-dbg.log
+
+# Write a debug log to disk
+#
+# Default: off
+#
+#set writelog on
+
+# Version string to pass to ActionScript
+#
+# Default: @DEFAULT_FLASH_PLATFORM_ID@ 
@DEFAULT_FLASH_MAJOR_VERSION@,@DEFAULT_FLASH_MINOR_VERSION@,@DEFAULT_FLASH_REV_NUMBER@,0
+#
+#set flashVersionString GSH 9,0,99,0
+
+# Enable the ActionScript debugger (if compile-time support was enabled)
+#
+# Default: off
+#
+#set debugger on
+
+# Activate sound
+#
+# Default: on
+#
+#set sound off
+
+# Activate sound when called as a plugin
+#
+# NOTE: this is a deprecated directive, should
+#       use the gnashpluginrc file for plugin-specific
+#       settings
+#
+# Default: on
+#
+#set pluginSoUND off
+
+# Enable Gnash extensions (custom ActionScript classes in the player API)
+#
+# You shouldn't enable this unless you really know what you're doing
+#
+# Default: off
+#
+#set enableExtensions on
+
+# Start the gui in STOP mode
+#
+# This is a commonly wanted feature for plugin
+# runs, better override in gnashpluginrc
+#
+# Default: off
+#
+#set startStopped on
+
+# Allow unverified SSL connections
+#
+# Default: false
+#
+#set insecureSSL on
+
+# Timeout in seconds for stream download
+#
+# The download will timeout after the given seconds
+# of inactivity. Every activity resets the timer
+#
+# Default: @DEFAULT_STREAMS_TIMEOUT@
+#
+set streamsTimeout 1.5
+
+# A space-separated list of directories you want movies
+# to have access to.
+#
+# Note that the directory from which your swf was loaded
+# (if loaded from local filesystem) will be always appended
+# to the list.
+#
+# Default: empty
+# 
+#set localSandboxPath /tmp/flashsandbox
+#append localSandboxPath /tmp/flashsandbox2
+
+# Use the following command format to open urls if 
+# no host-request FD was given.
+#
+# The '%u' label will be substituted with the url
+# to open.
+# 
+# NOTE that the NPAPI plugin provides an host request FD
+# to send url opening requests to.
+#
+# Default: firefox -remote 'openurl(%u)'
+#
+#set urlOpenerFormat lynx %u
+
+# Directory to store SharedObject files 
+#
+# If the directory doens't exist SharedObject won't work.
+# 
+# Default: /tmp/
+#
+set SOLSafeDir /dev/null
+
+# Never write SharedObject (kind of cookies), only read them
+#
+# Default: false
+#
+#set SOLReadOnly true
+
+# Enable LocalConnection ActionScript class
+#
+# Default: false
+#
+set LocalConnection off