[pkg-java] r12843 - in trunk/red5/debian: . patches

Sat Jul 31 17:21:04 UTC 2010

Author: drazzib
Date: 2010-07-31 17:21:04 +0000 (Sat, 31 Jul 2010)
New Revision: 12843

Added:
   trunk/red5/debian/patches/15_jython25.diff
Modified:
   trunk/red5/debian/changelog
   trunk/red5/debian/control
   trunk/red5/debian/patches/14_document_removed_stuff.diff
   trunk/red5/debian/patches/series
   trunk/red5/debian/red5-server.README.Debian
Log:
* Bump Standards-Version to 3.9.1: no changes needed.
* Improve d/README.Debian and d/patches/14_document_removed_stuff.diff:
  - Describe security issues with /installer and /demos webapps
  - Explain how to install them directly on index.html
* d/patches/15_jython25.diff: Fix FTBFS with Jython >= 2.5.

Modified: trunk/red5/debian/changelog
===================================================================

--- trunk/red5/debian/changelog	2010-07-29 10:18:48 UTC (rev 12842)
+++ trunk/red5/debian/changelog	2010-07-31 17:21:04 UTC (rev 12843)
@@ -1,3 +1,13 @@
+red5 (0.9.1-3) unstable; urgency=low
+
+  * Bump Standards-Version to 3.9.1: no changes needed.
+  * Improve d/README.Debian and d/patches/14_document_removed_stuff.diff:
+    - Describe security issues with /installer and /demos webapps
+    - Explain how to install them directly on index.html
+  * d/patches/15_jython25.diff: Fix FTBFS with Jython >= 2.5.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 31 Jul 2010 19:01:44 +0200
+
 red5 (0.9.1-2) unstable; urgency=low
 
   * /etc/init.d/red5-server:

Modified: trunk/red5/debian/control
===================================================================
--- trunk/red5/debian/control	2010-07-29 10:18:48 UTC (rev 12842)
+++ trunk/red5/debian/control	2010-07-31 17:21:04 UTC (rev 12843)
@@ -16,7 +16,7 @@
  libbackport-util-concurrent-java,
  default-jdk-doc, libmina2-java-doc, liblog4j1.2-java-doc, groovy-doc
 Build-Conflicts: liblogback-java (= 0.9.20-1)
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/red5/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/red5/
 Homepage: http://www.red5.org/

Modified: trunk/red5/debian/patches/14_document_removed_stuff.diff
===================================================================
--- trunk/red5/debian/patches/14_document_removed_stuff.diff	2010-07-29 10:18:48 UTC (rev 12842)
+++ trunk/red5/debian/patches/14_document_removed_stuff.diff	2010-07-31 17:21:04 UTC (rev 12843)
@@ -2,14 +2,42 @@
  in index.html
 Author: Damien Raude-Morvan <drazzib at drazzib.com>
 Forwarded: not-needed
-Last-Update: 2010-07-01
+Last-Update: 2010-07-31
 --- a/webapps/root/index.html
 +++ b/webapps/root/index.html
-@@ -92,6 +92,7 @@
+@@ -92,6 +92,35 @@
  <br />
  If you prefer to jump right in, follow these steps:
  <ul>
-+<li>Follow instructions in "Demos" section of <a href="file:///usr/share/doc/red5-server/README.Debian">/usr/share/doc/red5-server/README.Debian</a> to install /demos or /installer webapp.</li>
++<li>
++<p>
++Debian "red5-server" package doesn't contains /demos or /installer webapps.
++Please note that /installer and /demos webapps are for demonstration purpose 
++only and should never be installed on a public red5 server
++(no security at all in those applications).
++</p>
++<p>
++Furthermore, they contains non-free stuffs :
++<ul>
++<li> *.swf binary-only (Flash Player) files</li>
++<li> *.flv movies trailers like Avatar / Toy Story 3</li>
++</ul>
++</p>
++<p>
++As root, you can install /demos (SWF files) and /installer webapp, by issuing :
++<pre>
++wget http://www.red5.org/downloads/0_9/red5-0.9.1.tar.gz
++tar xvzf red5-*.tar.gz
++cd red5-*
++cp -R webapps/root/demos/* /var/lib/red5/webapps/root/demos/*
++cp -R webapps/installer/* /var/lib/red5/webapps/installer/*
++find /var/lib/red5/webapps/ -type d -exec chown _red5 {} \;
++cd ..
++rm -rf red5-*
++</pre>
++</p>
++<i>Excerpt from /usr/share/doc/red5-server/README.Debian</i>
++</li>
  <li><a href="installer" target="_blank">Install</a> a ready-made application</li>
  <li>Launch a <a href="demos">demo</a></li>
  </ul>

Added: trunk/red5/debian/patches/15_jython25.diff
===================================================================
--- trunk/red5/debian/patches/15_jython25.diff	                        (rev 0)
+++ trunk/red5/debian/patches/15_jython25.diff	2010-07-31 17:21:04 UTC (rev 12843)
@@ -0,0 +1,27 @@
+Description: Compatibility with Jython 2.5.x release.
+ PyJavaInstance doesn't exist anymore:
+ <http://markmail.org/message/6xuwt3xvt6ejounm>
+ <http://markmail.org/message/lv4ta34hnwezbzof>
+ Replace it by Py.java2py(Object);
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-07-31
+Forwarded: no
+--- a/src/org/red5/server/script/jython/JythonScriptFactory.java
++++ b/src/org/red5/server/script/jython/JythonScriptFactory.java
+@@ -25,7 +25,6 @@
+ 
+ import org.python.core.Py;
+ import org.python.core.PyFunction;
+-import org.python.core.PyJavaInstance;
+ import org.python.core.PyObject;
+ import org.python.core.PySystemState;
+ import org.python.util.PythonInterpreter;
+@@ -145,7 +144,7 @@
+ 				} else {
+ 					PyObject[] args = new PyObject[arguments.length];
+ 					for (int i = 0; i < arguments.length; i++) {
+-						args[i] = new PyJavaInstance(arguments[i]);
++						args[i] = Py.java2py(arguments[i]);
+ 					}
+ 					_this = ((PyFunction) getInstance).__call__(args);
+ 				}

Modified: trunk/red5/debian/patches/series
===================================================================
--- trunk/red5/debian/patches/series	2010-07-29 10:18:48 UTC (rev 12842)
+++ trunk/red5/debian/patches/series	2010-07-31 17:21:04 UTC (rev 12843)
@@ -7,3 +7,4 @@
 12_javadoc_links.diff
 13_jaudiotagger2.diff
 14_document_removed_stuff.diff
+15_jython25.diff

Modified: trunk/red5/debian/red5-server.README.Debian
===================================================================
--- trunk/red5/debian/red5-server.README.Debian	2010-07-29 10:18:48 UTC (rev 12842)
+++ trunk/red5/debian/red5-server.README.Debian	2010-07-31 17:21:04 UTC (rev 12843)
@@ -44,8 +44,11 @@
 
 Demos
 -----
-Current red5-server package doesn't contains /demos or /installer webapps.
-They contains non-free stuffs :
+Debian "red5-server" package doesn't contains /demos or /installer webapps.
+Please note that /installer and /demos webapps are for demonstration purpose
+only and should never be installed on a public red5 server
+(no security at all in those applications).
+Furthermore, they contains non-free stuffs :
 - *.swf binary-only (Flash Player) files
 - *.flv movies trailers like Avatar / Toy Story 3
 


