packages: phorum/phorum-mysql.patch, phorum/phorum-paths.patch, phorum/phor...
glen
glen at pld-linux.org
Wed Jan 6 18:30:20 CET 2010
Author: glen Date: Wed Jan 6 17:30:20 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- prepare for 5.2.14
---- Files affected:
packages/phorum:
phorum-mysql.patch (1.1 -> 1.2) , phorum-paths.patch (1.6 -> 1.7) , phorum.spec (1.26 -> 1.27) , docsurl.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/phorum/phorum-mysql.patch
diff -u packages/phorum/phorum-mysql.patch:1.1 packages/phorum/phorum-mysql.patch:1.2
--- packages/phorum/phorum-mysql.patch:1.1 Thu Dec 27 18:21:41 2007
+++ packages/phorum/phorum-mysql.patch Wed Jan 6 18:30:14 2010
@@ -1,13 +1,13 @@
---- phorum/include/db/config.php.sample~ 2006-04-20 17:00:12.000000000 +0300
-+++ phorum/include/db/config.php.sample 2007-12-27 19:03:24.524419049 +0200
-@@ -19,8 +19,8 @@
- 'type' => 'mysql',
- 'name' => 'phorum5',
- 'server' => 'localhost',
-- 'user' => 'phorum5',
-- 'password' => 'phorum5',
-+ 'user' => 'mysql',
-+ 'password' => '',
- 'table_prefix' => 'phorum',
-
- // 'down_page' => 'http://www.example.com/phorum/down.html',
+--- phorum-5.2.14/include/db/config.php.sample~ 2010-01-06 19:24:41.000000000 +0200
++++ phorum-5.2.14/include/db/config.php.sample 2010-01-06 19:24:57.091519006 +0200
+@@ -17,8 +17,8 @@
+ 'type' => 'mysql',
+ 'name' => 'phorum5',
+ 'server' => 'localhost',
+- 'user' => 'phorum5',
+- 'password' => 'phorum5',
++ 'user' => 'mysql',
++ 'password' => '',
+ 'table_prefix' => 'phorum',
+ 'port' => '3306',
+ 'socket' => NULL,
================================================================
Index: packages/phorum/phorum-paths.patch
diff -u packages/phorum/phorum-paths.patch:1.6 packages/phorum/phorum-paths.patch:1.7
--- packages/phorum/phorum-paths.patch:1.6 Thu Dec 27 18:19:10 2007
+++ packages/phorum/phorum-paths.patch Wed Jan 6 18:30:14 2010
@@ -1,7 +1,10 @@
---- phorum-5.1.25/common.php~ 2007-12-27 18:43:19.000000000 +0200
-+++ phorum-5.1.25/common.php 2007-12-27 18:46:34.201598153 +0200
-@@ -107,17 +107,17 @@
- @ini_set("display_errors", 0);
+# require config from /etc/webapps
+# chdir .. before including common.php
+
+--- phorum-5.2.14/common.php~ 2010-01-06 19:13:05.000000000 +0200
++++ phorum-5.2.14/common.php 2010-01-06 19:15:15.204911869 +0200
+@@ -84,22 +84,22 @@
+ ob_start();
// Load configuration.
- if (! include_once( "./include/db/config.php" )) {
@@ -14,43 +17,29 @@
+ if (!file_exists("/etc/webapps/phorum/config.php")) { ?>
Phorum has been installed on this server, but the configuration<br/>
for the database connection has not yet been made. Please read<br/>
- <a href="docs/install.txt">docs/install.txt</a> for installation instructions. <?php
+ <a href="docs/install.txt">docs/install.txt</a> for installation
+ instructions. <?php
} else {
- $fp = fopen("./include/db/config.php", "r");
+ $fp = fopen("/etc/webapps/phorum/config.php", "r");
// Unable to read the configuration file.
if (!$fp) { ?>
- A database configuration file was found in ./include/db/config.php,<br/>
-@@ -151,7 +151,7 @@
- header("Location: ".$PHORUM["DBCONFIG"]["down_page"]);
- exit();
- } else {
-- echo "The database connection failed. Please check your database configuration in include/db/config.php. If the configuration is okay, check if the database server is running.";
-+ echo "The database connection failed. Please check your database configuration in /etc/webapps/phorum/config.php. If the configuration is okay, check if the database server is running.";
- exit();
- }
+ A database configuration file was found in
+- ./include/db/config.php,<br/>but Phorum was unable to read it.
++ config.php,<br/>but Phorum was unable to read it.
+ Please check the file permissions<br/>for this file. <?php
+ // Unknown error.
+ } else {
+--- phorum-5.2.14/include/admin/install.php~ 2010-01-06 19:23:20.000000000 +0200
++++ phorum-5.2.14/include/admin/install.php 2010-01-06 19:23:35.421527751 +0200
+@@ -25,7 +25,7 @@
+ include_once("./include/api/user.php");
+
+ if(!phorum_db_check_connection()){
+- echo "A database connection could not be established. Please edit include/db/config.php.";
++ echo "A database connection could not be established. Please edit config.php.";
+ return;
}
---- ./include/db/mysql.php~ 2005-10-21 23:27:53.000000000 +0300
-+++ ./include/db/mysql.php 2006-03-08 17:56:25.213522731 +0200
-@@ -10,7 +10,7 @@
- * few tables as it likes. It can store the fields anyway it wants.
- * The only thing to worry about is the table_prefix for the tables.
- * all tables for a Phorum install should be prefixed with the
-- * table_prefix that will be entered in include/db/config.php. This
-+ * table_prefix that will be entered in /etc/webapps/phorum/config.php. This
- * will allow multiple Phorum installations to use the same database.
- */
-
---- ./include/admin/install.php~ 2005-03-17 19:41:22.000000000 +0200
-+++ ./include/admin/install.php 2006-03-08 17:56:43.134679959 +0200
-@@ -3,7 +3,7 @@
- if(!defined("PHORUM_ADMIN")) return;
-
- if(!phorum_db_check_connection()){
-- echo "A database connection could not be established. Please edit include/db/config.php.";
-+ echo "A database connection could not be established. Please edit /etc/webapps/phorum/config.php.";
- return;
- }
--- phorum-5.0.21/admin.php 2005-03-17 19:41:22.000000000 +0200
+++ phorum-5.0.21.pld/admin.php 2006-03-08 18:23:04.000000000 +0200
@@ -122,12 +111,12 @@
include_once( "./common.php" );
include_once( "./include/users.php" );
include_once( "./include/email_functions.php" );
---- phorum-5.0.21/moderation.php 2005-10-21 13:35:57.000000000 +0300
-+++ phorum-5.0.21.pld/moderation.php 2006-03-08 18:23:04.000000000 +0200
-@@ -18,6 +18,7 @@
+--- phorum-5.2.14/moderation.php~ 2010-01-06 19:21:12.000000000 +0200
++++ phorum-5.2.14/moderation.php 2010-01-06 19:22:37.991532354 +0200
+@@ -19,6 +19,7 @@
////////////////////////////////////////////////////////////////////////////////
- define('phorum_page','moderation');
+ define('phorum_page','moderation');
+chdir("..");
include_once("./common.php");
include_once("./include/moderation_functions.php");
@@ -172,12 +161,13 @@
include_once("./common.php");
include_once("./include/users.php");
include_once("./include/profile_functions.php");
---- phorum-5.0.21/script.php 2005-03-17 19:41:22.000000000 +0200
-+++ phorum-5.0.21.pld/script.php 2006-03-08 18:23:05.000000000 +0200
-@@ -18,6 +18,7 @@
- ////////////////////////////////////////////////////////////////////////////////
+--- phorum-5.2.14/script.php~ 2010-01-06 19:24:04.000000000 +0200
++++ phorum-5.2.14/script.php 2010-01-06 19:24:20.091522133 +0200
+@@ -22,7 +22,7 @@
define('phorum_page','script');
+ define('PHORUM_SCRIPT', 1);
+-chdir(dirname(__FILE__));
+chdir("..");
include_once("./common.php");
@@ -192,14 +182,3 @@
include_once("./common.php");
if(!phorum_check_read_common()) {
---- phorum-5.1.25/include/admin/install.php~ 2007-12-27 18:47:40.000000000 +0200
-+++ phorum-5.1.25/include/admin/install.php 2007-12-27 18:51:17.809890092 +0200
-@@ -319,7 +319,7 @@
- case 5:
-
- phorum_db_update_settings( array("installed"=>1) );
-- echo "The setup is complete. You can now go to <a href=\"$_SERVER[PHP_SELF]\">the admin</a> and start making Phorum all your own.<br /><br /><strong>Here are some things you will want to look at:</strong><br /><br /><a href=\"$_SERVER[PHP_SELF]?module=settings\">The General Settings page</a><br /><br /><a href=\"$_SERVER[PHP_SELF]?module=mods\">Pre-installed modules</a><br /><br /><a href=\"docs/faq.txt\">The FAQ</a><br /><br /><a href=\"docs/performance.txt\">How to get peak performance from Phorum</a><br /><br /><strong>For developers:</strong><br /><br /><a href=\"docs/creating_mods.txt\">Module Creation</a><br /><br /><a href=\"docs/permissions.txt\">How Phorum permisssions work</a><br /><br /><a href=\"docs/CODING-STANDARDS\">The Phorum Team's codings standards</a>";
-+ echo "The setup is complete. You can now go to <a href=\"$_SERVER[PHP_SELF]\">the admin</a> and start making Phorum all your own.<br /><br /><strong>Here are some things you will want to look at:</strong><br /><br /><a href=\"$_SERVER[PHP_SELF]?module=settings\">The General Settings page</a><br /><br /><a href=\"$_SERVER[PHP_SELF]?module=mods\">Pre-installed modules</a><br /><br /><a href=\"http://www.phorum.org/phorum5/docs/faq.txt\">The FAQ</a><br /><br /><a href=\"http://www.phorum.org/phorum5/docs/performance.txt\">How to get peak performance from Phorum</a><br /><br /><strong>For developers:</strong><br /><br /><a href=\"docs/creating_mods.txt\">Module Creation</a><br /><br /><a href=\"docs/permissions.txt\">How Phorum permisssions work</a><br /><br /><a href=\"docs/CODING-STANDARDS\">The Phorum Team's codings standards</a>";
-
- break;
-
================================================================
Index: packages/phorum/phorum.spec
diff -u packages/phorum/phorum.spec:1.26 packages/phorum/phorum.spec:1.27
--- packages/phorum/phorum.spec:1.26 Thu Dec 27 18:21:30 2007
+++ packages/phorum/phorum.spec Wed Jan 6 18:30:14 2010
@@ -2,15 +2,16 @@
Summary: Phorum is a web based message board written in PHP
Summary(pl.UTF-8): Phorum - implementacja forum WWW w PHP
Name: phorum
-Version: 5.1.25
-Release: 0.3
+Version: 5.2.14
+Release: 0.1
License: Apache-like
Group: Applications/WWW
Source0: http://www.phorum.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 1f4741081156e73752fb49a89687b7de
+# Source0-md5: 944211b4f195a538bcb6e2883d2187c5
Source1: %{name}-apache.conf
Patch0: %{name}-paths.patch
Patch1: %{name}-mysql.patch
+Patch2: docsurl.patch
URL: http://www.phorum.org/
BuildRequires: rpmbuild(macros) >= 1.268
Requires: webapps
@@ -58,25 +59,31 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+
rm {scripts,templates,cache,portable,include,mods}/.htaccess
mv include/db/config.php.sample .
+mv include/api/examples docs/api_examples
# kill old files by phorum
-rm -f post.php
+rm post.php
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/htdocs/templates/default,/var/cache/phorum}
-cp -a *.php $RPM_BUILD_ROOT%{_appdir}/htdocs
+cp -a *.php images $RPM_BUILD_ROOT%{_appdir}/htdocs
mv $RPM_BUILD_ROOT%{_appdir}/{htdocs/,}common.php
+
cp -a include mods templates $RPM_BUILD_ROOT%{_appdir}
-cp -a images $RPM_BUILD_ROOT%{_appdir}/htdocs
-mv $RPM_BUILD_ROOT%{_appdir}/{,htdocs/}templates/default/images
-install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-install -p config.php.sample $RPM_BUILD_ROOT%{_sysconfdir}/config.php
+# TODO: move themes images to htdocs
+#mv $RPM_BUILD_ROOT%{_appdir}/{,htdocs/}templates/default/images
+#mv $RPM_BUILD_ROOT%{_appdir}/{,htdocs/}templates/default/images
+
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -a config.php.sample $RPM_BUILD_ROOT%{_sysconfdir}/config.php
%clean
rm -rf $RPM_BUILD_ROOT
@@ -111,21 +118,36 @@
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.php
+
+%dir %{_appdir}
%{_appdir}/common.php
%{_appdir}/templates
%{_appdir}/mods
+
%dir %{_appdir}/include
%{_appdir}/include/*.php
%{_appdir}/include/db
%{_appdir}/include/controlcenter
%{_appdir}/include/lang
%{_appdir}/include/posting
+%{_appdir}/include/ajax
+%{_appdir}/include/api
+%{_appdir}/include/cache
+
%dir %{_appdir}/htdocs
+%{_appdir}/htdocs/templates
+%{_appdir}/htdocs/images
+
%{_appdir}/htdocs/addon.php
+%{_appdir}/htdocs/ajax.php
+%{_appdir}/htdocs/changes.php
%{_appdir}/htdocs/control.php
+%{_appdir}/htdocs/css.php
+%{_appdir}/htdocs/feed.php
%{_appdir}/htdocs/file.php
%{_appdir}/htdocs/follow.php
%{_appdir}/htdocs/index.php
+%{_appdir}/htdocs/javascript.php
%{_appdir}/htdocs/list.php
%{_appdir}/htdocs/login.php
%{_appdir}/htdocs/moderation.php
@@ -140,8 +162,7 @@
%{_appdir}/htdocs/script.php
%{_appdir}/htdocs/search.php
%{_appdir}/htdocs/versioncheck.php
-%{_appdir}/htdocs/templates
-%{_appdir}/htdocs/images
+
%dir %attr(770,root,http) /var/cache/phorum
%files setup
@@ -155,6 +176,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.27 2010/01/06 17:30:14 glen
+- prepare for 5.2.14
+
Revision 1.26 2007/12/27 17:21:30 glen
- mysql auth
================================================================
Index: packages/phorum/docsurl.patch
diff -u /dev/null packages/phorum/docsurl.patch:1.1
--- /dev/null Wed Jan 6 18:30:20 2010
+++ packages/phorum/docsurl.patch Wed Jan 6 18:30:14 2010
@@ -0,0 +1,26 @@
+basically running and manually verifying result:
+
+grep -r '"docs/' . -l |xargs sed -i -e 's,"docs/,"http://www.phorum.org/phorum5/docs/,g'
+
+--- phorum-5.2.14/common.php 2010-01-06 19:20:04.816130942 +0200
++++ phorum-5.2.14-docsurl/common.php 2010-01-06 19:19:58.458214715 +0200
+@@ -92,7 +92,7 @@
+ if (!file_exists("/etc/webapps/phorum/config.php")) { ?>
+ Phorum has been installed on this server, but the configuration<br/>
+ for the database connection has not yet been made. Please read<br/>
+- <a href="docs/install.txt">docs/install.txt</a> for installation
++ <a href="http://www.phorum.org/phorum5/docs/install.txt">docs/install.txt</a> for installation
+ instructions. <?php
+ } else {
+ $fp = fopen("/etc/webapps/phorum/config.php", "r");
+--- phorum-5.2.14/include/admin/install.php 2010-01-06 19:20:04.822797116 +0200
++++ phorum-5.2.14-docsurl/include/admin/install.php 2010-01-06 19:19:58.468214501 +0200
+@@ -519,7 +519,7 @@
+
+ $cont_url = phorum_admin_build_url('');
+ phorum_db_update_settings( array("installed"=>1) );
+- echo "The setup is complete. You can now go to <a href=\"$cont_url\">the admin</a> and start making Phorum all your own.<br /><br /><strong>Here are some things you will want to look at:</strong><br /><br /><a href=\"$_SERVER[PHP_SELF]?module=settings\">The General Settings page</a><br /><br /><a href=\"$_SERVER[PHP_SELF]?module=mods\">Pre-installed modules</a><br /><br /><a href=\"docs/faq.txt\">The FAQ</a><br /><br /><a href=\"docs/performance.txt\">How to get peak performance from Phorum</a><br /><br /><strong>For developers:</strong><br /><br /><a href=\"docs/creating_mods.txt\">Module Creation</a><br /><br /><a href=\"docs/permissions.txt\">How Phorum permisssions work</a><br /><br /><a href=\"docs/CODING-STANDARDS\">The Phorum Team's codings standards</a>";
++ echo "The setup is complete. You can now go to <a href=\"$cont_url\">the admin</a> and start making Phorum all your own.<br /><br /><strong>Here are some things you will want to look at:</strong><br /><br /><a href=\"$_SERVER[PHP_SELF]?module=settings\">The General Settings page</a><br /><br /><a href=\"$_SERVER[PHP_SELF]?module=mods\">Pre-installed modules</a><br /><br /><a href=\"http://www.phorum.org/phorum5/docs/faq.txt\">The FAQ</a><br /><br /><a href=\"http://www.phorum.org/phorum5/docs/performance.txt\">How to get peak performance from Phorum</a><br /><br /><strong>For developers:</strong><br /><br /><a href=\"http://www.phorum.org/phorum5/docs/creating_mods.txt\">Module Creation</a><br /><br /><a href=\"http://www.phorum.org/phorum5/docs/permissions.txt\">How Phorum permisssions work</a><br /><br /><a href=\"http://www.phorum.org/phorum5/docs/CODING-STANDARDS\">The Phorum Team's codings standards</a>";
+
+ break;
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/phorum-mysql.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/phorum-paths.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/phorum.spec?r1=1.26&r2=1.27&f=u
More information about the pld-cvs-commit
mailing list