packages: phorum/phorum.spec, phorum/cli-progs.patch (NEW) - cli program fixes

[glen]

Author: glen                         Date: Tue Feb  1 14:53:54 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cli program fixes

---- Files affected:
packages/phorum:
   phorum.spec (1.68 -> 1.69) , cli-progs.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/phorum/phorum.spec
diff -u packages/phorum/phorum.spec:1.68 packages/phorum/phorum.spec:1.69
--- packages/phorum/phorum.spec:1.68	Tue Feb  1 15:53:31 2011
+++ packages/phorum/phorum.spec	Tue Feb  1 15:53:49 2011
@@ -25,6 +25,7 @@
 Patch10:	translate-macros.patch
 Patch11:	wordwrap.patch
 Patch12:	unhide-errors.patch
+Patch13:	cli-progs.patch
 URL:		http://www.phorum.org/
 BuildRequires:	iconv
 BuildRequires:	rpm-php-pearprov
@@ -337,6 +338,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -624,6 +626,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2011/02/01 14:53:49  glen
+- cli program fixes
+
 Revision 1.68  2011/02/01 14:53:31  glen
 - package console_upgrade and perform upgrades automatically
 

================================================================
Index: packages/phorum/cli-progs.patch
diff -u /dev/null packages/phorum/cli-progs.patch:1.1
--- /dev/null	Tue Feb  1 15:53:54 2011
+++ packages/phorum/cli-progs.patch	Tue Feb  1 15:53:49 2011
@@ -0,0 +1,16 @@
+--- phorum-5.2.16/scripts/console_upgrade.php	2011-02-01 16:22:29.924607784 +0200
++++ phorum/scripts/console_upgrade.php	2011-02-01 16:49:34.415565684 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/php
+ <?php
+ ///////////////////////////////////////////////////////////////////////////////
+ //                                                                           //
+@@ -17,6 +18,8 @@
+ //                                                                           //
+ ///////////////////////////////////////////////////////////////////////////////
+ 
++if ('cli' != php_sapi_name()) die();
++
+ // I guess the phorum-directory is one level up. if you move the script to
+ // somewhere else you'll need to change that.
+ $PHORUM_DIRECTORY = dirname(__FILE__) . "/../";
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/phorum.spec?r1=1.68&r2=1.69&f=u