[Pkg-voip-commits] r3173 - in ari/trunk/debian: . patches

Chris Halls halls at alioth.debian.org
Fri Feb 23 18:16:28 CET 2007 

Author: halls
Date: 2007-02-23 18:16:28 +0100 (Fri, 23 Feb 2007)
New Revision: 3173

Added:
   ari/trunk/debian/patches/fix-urlpath.dpatch
   ari/trunk/debian/patches/no-chown.dpatch
   ari/trunk/debian/patches/recording-path.dpatch
Modified:
   ari/trunk/debian/changelog
   ari/trunk/debian/install
   ari/trunk/debian/patches/00list
Log:
* recording-path: Use ari as web root in play recording popup
  - It would be nice to un-hardcode this but my PHP isn't very good & I didn't have time to test more
* no-chown: Do not attempt to chown voicemail files
  - Wierd, ari trying to chown files. Does that mean the author runs this as root?
* fix-urlpath: Escape path to file in recording popup
  - This was giving intermittent errors - sometimes a recording would play, sometimes it wouldn't
* Install misc/popup.css
  - Cosmetic fix to play recording popup


Modified: ari/trunk/debian/changelog
===================================================================
--- ari/trunk/debian/changelog	2007-02-22 16:11:02 UTC (rev 3172)
+++ ari/trunk/debian/changelog	2007-02-23 17:16:28 UTC (rev 3173)
@@ -7,10 +7,12 @@
 
   [ Kilian Krause ]
   * Add get-orig-source target
-  
-    * NOT RELEASED YET
-    
+
   [ Chris Halls ]
-  * debian/control and debian/rules fixes      
+  * debian/control and debian/rules fixes
+  * recording-path: Use ari as web root in play recording popup
+  * no-chown: Do not attempt to chown voicemail files
+  * fix-urlpath: Escape path to file in recording popup
+  * Install misc/popup.css
 
- -- Kilian Krause <kilian at debian.org>  Wed,  9 Aug 2006 20:29:15 +0200
+ -- Chris Halls <halls at debian.org>  Fri, 23 Feb 2007 17:12:54 +0000

Modified: ari/trunk/debian/install
===================================================================
--- ari/trunk/debian/install	2007-02-22 16:11:02 UTC (rev 3172)
+++ ari/trunk/debian/install	2007-02-23 17:16:28 UTC (rev 3173)
@@ -5,6 +5,7 @@
 recordings/includes/*			usr/share/ari/includes/
 recordings/locale/			usr/share/ari/
 recordings/misc/*.php			usr/share/ari/misc/
+recordings/misc/*.css			usr/share/ari/misc/
 recordings/modules/*.module		usr/share/ari/modules/
 recordings/theme/*.css			usr/share/ari/theme/
 recordings/theme/*.php			usr/share/ari/theme/

Modified: ari/trunk/debian/patches/00list
===================================================================
--- ari/trunk/debian/patches/00list	2007-02-22 16:11:02 UTC (rev 3172)
+++ ari/trunk/debian/patches/00list	2007-02-23 17:16:28 UTC (rev 3173)
@@ -1,5 +1,8 @@
 add-etc-config
 change-amp-functions-dir
+recording-path
+no-chown
+fix-urlpath
 #remove-dir-warnings
 
 #fix-include-glob

Added: ari/trunk/debian/patches/fix-urlpath.dpatch
===================================================================
--- ari/trunk/debian/patches/fix-urlpath.dpatch	2007-02-22 16:11:02 UTC (rev 3172)
+++ ari/trunk/debian/patches/fix-urlpath.dpatch	2007-02-23 17:16:28 UTC (rev 3173)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## urlencode-paths.dpatch by Chris Halls <halls at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: base64 paths generated with encrypt need to be urlescaped
+
+ at DPATCH@
+diff -urNad ari_00.10.02~/recordings/misc/audio.php ari_00.10.02/recordings/misc/audio.php
+--- ari_00.10.02~/recordings/misc/audio.php	2006-05-03 13:40:34.000000000 +0100
++++ ari_00.10.02/recordings/misc/audio.php	2007-02-23 16:42:58.000000000 +0000
+@@ -17,6 +17,7 @@
+   $crypt = new Crypt();
+ 
+   $path = $crypt->decrypt($_GET['recording'],$ARI_CRYPT_PASSWORD);
++  $path = urldecode($path);
+ 
+   // strip ".." from path for security
+   $path = preg_replace('/\.\./','',$path);
+@@ -58,4 +59,4 @@
+   } 
+ }
+ 
+-?>
+\ No newline at end of file
++?>
+diff -urNad ari_00.10.02~/recordings/misc/recording_popup.php ari_00.10.02/recordings/misc/recording_popup.php
+--- ari_00.10.02~/recordings/misc/recording_popup.php	2007-02-23 15:58:11.000000000 +0000
++++ ari_00.10.02/recordings/misc/recording_popup.php	2007-02-23 16:43:04.000000000 +0000
+@@ -26,6 +26,7 @@
+   $crypt = new Crypt();
+ 
+   $path = $crypt->encrypt($_GET['recording'],$ARI_CRYPT_PASSWORD);
++  $path = urlencode($path);
+ 
+   if (isset($path)) {
+     if (isset($_GET['date'])) {


Property changes on: ari/trunk/debian/patches/fix-urlpath.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: ari/trunk/debian/patches/no-chown.dpatch
===================================================================
--- ari/trunk/debian/patches/no-chown.dpatch	2007-02-22 16:11:02 UTC (rev 3172)
+++ ari/trunk/debian/patches/no-chown.dpatch	2007-02-23 17:16:28 UTC (rev 3173)
@@ -0,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no-chown.dpatch by Chris Halls <halls at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: We can't chown since we are not running ari as the root user
+
+ at DPATCH@
+diff -urNad ari_00.10.02~/recordings/modules/voicemail.module ari_00.10.02/recordings/modules/voicemail.module
+--- ari_00.10.02~/recordings/modules/voicemail.module	2006-05-03 13:40:34.000000000 +0100
++++ ari_00.10.02/recordings/modules/voicemail.module	2007-02-23 16:38:27.000000000 +0000
+@@ -635,19 +635,16 @@
+     $path_rx = appendPath($paths[0],$context_rx);
+     if (!is_dir($path_rx)) {
+       mkdir($path_rx, $perm); 
+-      chown($path_rx,intval($uid));
+       chgrp($path_rx,intval($gid));
+     }
+     $path_rx = appendPath($path_rx,$extension_rx);
+     if (!is_dir($path_rx)) {
+       mkdir($path_rx, $perm); 
+-      chown($path_rx,intval($uid));
+       chgrp($path_rx,intval($gid));
+     }
+     $path_rx = appendPath($path_rx,$folder_rx);
+     if (!is_dir($path_rx)) {
+       mkdir($path_rx, $perm); 
+-      chown($path_rx,intval($uid));
+       chgrp($path_rx,intval($gid));
+     }
+ 
+@@ -708,7 +705,6 @@
+ 
+               if (is_writable($dst)) {
+                 chmod($dst, $perm); 
+-                chown($dst,intval($uid));
+                 chgrp($dst,intval($gid));
+               }
+ 
+@@ -785,4 +781,4 @@
+ }
+ 
+ 
+-?>
+\ No newline at end of file
++?>


Property changes on: ari/trunk/debian/patches/no-chown.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: ari/trunk/debian/patches/recording-path.dpatch
===================================================================
--- ari/trunk/debian/patches/recording-path.dpatch	2007-02-22 16:11:02 UTC (rev 3172)
+++ ari/trunk/debian/patches/recording-path.dpatch	2007-02-23 17:16:28 UTC (rev 3173)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-recording-path.dpatch by Chris Halls <halls at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The path to audio.php was hardcoded to /recordings, but
+## DP: we are installing to /ari
+
+ at DPATCH@
+diff -urNad ari_00.10.02~/recordings/misc/recording_popup.php ari_00.10.02/recordings/misc/recording_popup.php
+--- ari_00.10.02~/recordings/misc/recording_popup.php	2007-02-23 15:58:11.000000000 +0000
++++ ari_00.10.02/recordings/misc/recording_popup.php	2007-02-23 16:40:16.000000000 +0000
+@@ -36,7 +36,7 @@
+     }
+     echo("<br>");
+     echo("<embed src='audio.php?recording=" . $path . "' width=300, height=20 autoplay=true loop=false></embed><br>");
+-    echo("<a class='popup_download' href=/recordings/misc/audio.php?recording="  . $path . ">" . _("download") . "</a><br>");
++    echo("<a class='popup_download' href=/ari/misc/audio.php?recording="  . $path . ">" . _("download") . "</a><br>");
+   }
+ 
+ ?>


Property changes on: ari/trunk/debian/patches/recording-path.dpatch
___________________________________________________________________
Name: svn:executable
   + *

More information about the Pkg-voip-commits mailing list