packages: phorum/paths.patch, phorum/phorum.spec - start update to 5.2.16
glen
glen at pld-linux.org
Tue Feb 1 15:17:03 CET 2011
Author: glen Date: Tue Feb 1 14:17:03 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- start update to 5.2.16
---- Files affected:
packages/phorum:
paths.patch (1.23 -> 1.24) , phorum.spec (1.65 -> 1.66)
---- Diffs:
================================================================
Index: packages/phorum/paths.patch
diff -u packages/phorum/paths.patch:1.23 packages/phorum/paths.patch:1.24
--- packages/phorum/paths.patch:1.23 Wed Nov 3 16:34:30 2010
+++ packages/phorum/paths.patch Tue Feb 1 15:16:57 2011
@@ -178,8 +178,8 @@
// Run sanity checks prior to installing Phorum. Here we do some
// checks to see if the environment is setup correctly for running
---- phorum/include/admin/header.php 2010-01-06 20:02:05.938378394 +0200
-+++ phorum-5.2.15a/include/admin/header.php 2010-11-03 17:28:23.203504874 +0200
+--- phorum-5.2.16/include/admin/header.php~ 2011-01-31 16:15:33.000000000 +0200
++++ phorum-5.2.16/include/admin/header.php 2011-01-31 16:15:45.020813848 +0200
@@ -22,10 +22,10 @@
// load the default Phorum language
if(isset($PHORUM["default_forum_options"]["language"])){
@@ -193,12 +193,14 @@
}
// HTTP Content-Type header with the charset from the default language
-@@ -36,7 +36,7 @@
+@@ -36,8 +36,8 @@
// set the path to the CSS file to pull in
$default_admin_css_file = 'default.css';
-- $admin_css_path = $PHORUM["http_path"].'/include/admin/css/' . $default_admin_css_file;
-+ $admin_css_path = $PHORUM["http_path"].'/admin/css/' . $default_admin_css_file;
+- $admin_css_path = dirname($PHORUM['admin_http_path']) .
+- '/include/admin/css/' . $default_admin_css_file;
++ $admin_css_path = $PHORUM['admin_http_path'] .
++ '/admin/css/' . $default_admin_css_file;
/**
* [hook]
@@ -278,9 +280,9 @@
include PHORUM_INCLUDES_DIR.'/ajax/call.$ajax_call.php';
exit();
}
---- phorum/htdocs/javascript.php 2010-01-12 19:00:24.036492037 +0200
-+++ phorum-5.2.15a/htdocs/javascript.php 2010-11-03 17:28:23.199339500 +0200
-@@ -31,14 +31,14 @@
+--- phorum-5.2.16/htdocs/javascript.php~ 2011-01-31 15:57:12.000000000 +0200
++++ phorum-5.2.16/htdocs/javascript.php 2011-01-31 16:17:20.624954178 +0200
+@@ -36,7 +36,7 @@
$module_registrations[] = array(
'module' => 'core',
'source' => 'file(include/ajax/json2.js.php)',
@@ -288,7 +290,8 @@
+ 'cache_key' => filemtime(PHORUM_INCLUDES_DIR.'/ajax/json2.js.php')
);
- // Add core Phorum posting form object manipulation client JavaScript code.
+ // Add the jQuery JavaScript library code.
+@@ -70,7 +70,7 @@
$module_registrations[] = array(
'module' => 'core',
'source' => 'file(include/posting/form_objects.js.php)',
@@ -297,7 +300,7 @@
);
-@@ -46,15 +46,15 @@
+@@ -78,7 +78,7 @@
$module_registrations[] = array(
'module' => 'core',
'source' => 'file(include/ajax/client.js.php)',
@@ -306,16 +309,17 @@
$PHORUM['DATA']['URL']['AJAX']
);
- // Add template specific javascript code, if available. The template writer
+@@ -86,8 +86,8 @@
// can put the javascript code to include in the file
// "templates/<name>/javascript.tpl" or "templates/<name>/javascript.php".
--if (file_exists("./templates/{$PHORUM['template']}/javascript.tpl") ||
-- file_exists("./templates/{$PHORUM['template']}/javascript.php")) {
-+if (file_exists(PHORUM_DIR."/templates/{$PHORUM['template']}/javascript.tpl") ||
-+ file_exists(PHORUM_DIR."/templates/{$PHORUM['template']}/javascript.php")) {
- $module_registrations[] = array(
- 'module' => $PHORUM['template'] . ' template',
- 'source' => 'template(javascript)'
+ if (!$for_admin) {
+- if (file_exists("./templates/{$PHORUM['template']}/javascript.tpl") ||
+- file_exists("./templates/{$PHORUM['template']}/javascript.php")) {
++ if (file_exists(PHORUM_DIR."/templates/{$PHORUM['template']}/javascript.tpl") ||
++ file_exists(PHORUM_DIR."/templates/{$PHORUM['template']}/javascript.php")) {
+ $module_registrations[] = array(
+ 'module' => $PHORUM['template'] . ' template',
+ 'source' => 'template(javascript)'
@@ -249,10 +249,10 @@
{
case "file":
@@ -501,14 +505,14 @@
return array(
PHORUM_SANITY_WARN,
"Your module "$entry" doesn't have an corresponding .php file in its directory.
---- phorum-5.2.14/mods/username_restrictions/settings.php~ 2010-01-13 22:36:06.000000000 +0200
-+++ phorum-5.2.14/mods/username_restrictions/settings.php 2010-01-13 22:41:43.609857184 +0200
+--- phorum-5.2.16/mods/username_restrictions/settings.php~ 2011-01-31 15:57:12.000000000 +0200
++++ phorum-5.2.16/mods/username_restrictions/settings.php 2011-01-31 16:14:26.662057255 +0200
@@ -1,7 +1,7 @@
<?php
if (!defined("PHORUM_ADMIN")) return;
-- include("./mods/username_restrictions/defaults.php");
-+ include(PHORUM_DIR."/mods/username_restrictions/defaults.php");
+- require_once "./mods/username_restrictions/defaults.php";
++ require_once PHORUM_DIR."/mods/username_restrictions/defaults.php";
// Options for the valid username characters.
$valid_chars_options = array(
@@ -613,55 +617,28 @@
// The default list of smileys to install upon initial setup.
global $MOD_SMILEY_DEFAULT_SMILEYS;
---- phorum-5.2.14/mods/spamhurdles/db.php~ 2010-01-13 22:36:06.000000000 +0200
-+++ phorum-5.2.14/mods/spamhurdles/db.php 2010-01-13 22:45:21.459835060 +0200
-@@ -17,7 +17,7 @@
- {
- global $PHORUM;
-
-- $layerpath = "./mods/spamhurdles/db/{$PHORUM["DBCONFIG"]["type"]}";
-+ $layerpath = PHORUM_DIR."/mods/spamhurdles/db/{$PHORUM["DBCONFIG"]["type"]}";
-
- // Allow db layers to provide an initialization script of their own.
- // The main goal for this script is to allow a db layer to override the
---- phorum-5.2.14/mods/spamhurdles/spamhurdles.php 2010-01-13 22:45:36.219833260 +0200
-+++ phorum/mods/spamhurdles/spamhurdles.php 2010-03-29 19:52:17.206811507 +0300
-@@ -92,7 +92,7 @@
- // If a spoken captcha is requested, then generate a wav file for it
- // and stream it to the user.
- if (isset($PHORUM["args"]["spokencaptcha"])) {
-- include("./mods/spamhurdles/captcha/spoken_captcha.php");
-+ include(PHORUM_DIR."/mods/spamhurdles/captcha/spoken_captcha.php");
- exit(0);
- }
+--- phorum-5.2.16/mods/spamhurdles/api.php~ 2011-01-31 23:08:38.000000000 +0200
++++ phorum-5.2.16/mods/spamhurdles/api.php 2011-02-01 09:58:16.184438583 +0200
+@@ -2,14 +2,14 @@
+
+ // {{{ Required libraries
+
+-require_once './mods/spamhurdles/defaults.php' ;
+-require_once './mods/spamhurdles/db.php' ;
+-require_once './mods/spamhurdles/include/crypt/aes.php';
++require_once PHORUM_DIR.'/spamhurdles/defaults.php' ;
++require_once PHORUM_DIR.'/spamhurdles/db.php' ;
++require_once PHORUM_DIR.'/spamhurdles/include/crypt/aes.php';
+
+ // For EVENTLOG_LVL_INFO. Made conditional, just in case the Event Logging
+ // module was removed from the Phorum tree.
+-if (file_exists('./mods/event_logging/constants.php')) {
+- require_once './mods/event_logging/constants.php';
++if (file_exists(PHORUM_DIR.'/event_logging/constants.php')) {
++ require_once PHORUM_DIR.'/event_logging/constants.php';
+ }
-@@ -104,7 +104,7 @@
- isset($PHORUM["SPAMHURDLES"]["captcha_class"])) {
- $question = $PHORUM["SPAMHURDLES"]["captcha"]["question"];
- $class = $PHORUM["SPAMHURDLES"]["captcha_class"];
-- require_once PHORUM_DIR.'/mods/spamhurdles/captcha/class.{$class}.php';
-+ require_once PHORUM_DIR."/mods/spamhurdles/captcha/class.{$class}.php";
- $captcha = new $class();
- $captcha->generate_image($question);
- exit(0);
-@@ -170,7 +170,7 @@
- ($type == "external_captcha")) ) {
-
- $class = "captcha_" . $conf["captcha_type"];
-- require_once PHORUM_DIR.'/mods/spamhurdles/captcha/class.{$class}.php';
-+ require_once PHORUM_DIR."/mods/spamhurdles/captcha/class.{$class}.php";
- $captcha = new $class();
- $captcha = $captcha->generate_captcha();
- $PHORUM["SPAMHURDLES"]["captcha_class"] = $class;
-@@ -423,7 +423,7 @@
- // Check if the captcha is filled in right.
- if (!$do_block && isset($spamhurdles["captcha"])) {
- $class = $spamhurdles["captcha_class"];
-- require_once PHORUM_DIR.'/mods/spamhurdles/captcha/class.{$class}.php';
-+ require_once PHORUM_DIR."/mods/spamhurdles/captcha/class.{$class}.php";
- $captcha = new $class();
- $error = $captcha->check_answer($spamhurdles["captcha"]);
- if ($error) {
+ // }}}
--- phorum/include/admin/forum_defaults.php~ 2010-01-13 23:12:00.000000000 +0200
+++ phorum/include/admin/forum_defaults.php 2010-01-13 23:16:15.052984229 +0200
@@ -21,6 +21,6 @@
================================================================
Index: packages/phorum/phorum.spec
diff -u packages/phorum/phorum.spec:1.65 packages/phorum/phorum.spec:1.66
--- packages/phorum/phorum.spec:1.65 Thu Jan 27 12:24:17 2011
+++ packages/phorum/phorum.spec Tue Feb 1 15:16:57 2011
@@ -7,12 +7,12 @@
Summary: Phorum is a web based message board written in PHP
Summary(pl.UTF-8): Phorum - implementacja forum WWW w PHP
Name: phorum
-Version: %{mainver}.15a
-Release: 4
+Version: %{mainver}.16
+Release: 0.1
License: Apache-like
Group: Applications/WWW
Source0: http://www.phorum.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: e1a0a3974fc60ced71c95d282e7bcc3e
+# Source0-md5: fb35b7b4a2561c83c76488f9a6186ad7
Source3: apache.conf
Patch0: paths.patch
Patch1: mysql.patch
@@ -312,6 +312,13 @@
sed -i -e "s,require_once PHORUM_DIR.'/common.php';,require_once '../common.php';," htdocs/*.php
sed -i -e "s,require_once PHORUM_DIR.'/common.php';,require_once 'common.php';," *.php
+# NOTE when upgrading version:
+# no paths should contain ./mods/, ./includes, those should be marked by
+# PHORUM_DIR or PHORUM_INCLUDES_DIR constants
+# grep -Fr ./mods/ .
+# you can rm -rf these dirs to simplify:
+# rm -rf htmldoc/ docbook/ docs/ examples/ *.lang
+
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -348,6 +355,7 @@
et estonian
fi finnish
fr french
+fr french-utf8
it italian
nb norwegian
nl dutch
@@ -505,6 +513,13 @@
%{_appdir}/htdocs/search.php
%{_appdir}/htdocs/versioncheck.php
+# TODO: check and use external pkg
+%dir %{_appdir}/include/javascript
+%{_appdir}/include/javascript/jquery-1.4.4.min.js
+%{_appdir}/include/javascript/jquery.bgiframe-2.1.1.min.js
+%{_appdir}/include/javascript/jquery.json-1.3.min.js
+%{_appdir}/include/javascript/phorum-javascript-library.php
+
%dir %attr(770,root,http) /var/cache/phorum
%{_examplesdir}/%{name}-%{version}
@@ -563,9 +578,9 @@
%defattr(644,root,root,755)
%{_appdir}/mods/spamhurdles/captcha
%{_appdir}/mods/spamhurdles/db
-%{_appdir}/mods/spamhurdles/lib
-%{_appdir}/mods/spamhurdles/*.css
-%{_appdir}/mods/spamhurdles/*.jpg
+%{_appdir}/mods/spamhurdles/hurdles
+%{_appdir}/mods/spamhurdles/include
+%{_appdir}/mods/spamhurdles/spamhurdles.js
%files mod-tidy
%defattr(644,root,root,755)
@@ -598,6 +613,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.66 2011/02/01 14:16:57 glen
+- start update to 5.2.16
+
Revision 1.65 2011/01/27 11:24:17 glen
- utf8 compatible wordwrap; rel 4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/paths.patch?r1=1.23&r2=1.24&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/phorum.spec?r1=1.65&r2=1.66&f=u
More information about the pld-cvs-commit
mailing list