rpms/roundcubemail/F-7 roundcubemail-0.2-alpha-confpath.patch, NONE, 1.1 roundcubemail.spec, 1.10, 1.11 sources, 1.7, 1.8

[Jon Ciesla (limb)]

Author: limb

Update of /cvs/pkgs/rpms/roundcubemail/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5269

Modified Files:
	roundcubemail.spec sources 
Added Files:
	roundcubemail-0.2-alpha-confpath.patch 
Log Message:
XSS fixes.


roundcubemail-0.2-alpha-confpath.patch:

--- NEW FILE roundcubemail-0.2-alpha-confpath.patch ---
--- program/include/rcube_config.php	2008-06-13 10:15:51.000000000 -0500
+++ program/include/rcube_config.php	2008-06-13 10:15:51.000000000 -0500
@@ -50,11 +50,13 @@
     ob_start();
     
     // load main config file
-    include_once(INSTALL_PATH . 'config/main.inc.php');
+    #include_once(INSTALL_PATH . 'config/main.inc.php');
+    include_once('/etc/roundcubemail/main.inc.php');
     $this->prop = (array)$rcmail_config;
 
     // load database config
-    include_once(INSTALL_PATH . 'config/db.inc.php');
+    #include_once(INSTALL_PATH . 'config/db.inc.php');
+    include_once('/etc/roundcubemail/db.inc.php');
     $this->prop += (array)$rcmail_config;
     
     // load host-specific configuration


Index: roundcubemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/F-7/roundcubemail.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- roundcubemail.spec	10 Apr 2008 17:17:24 -0000	1.10
+++ roundcubemail.spec	13 Jun 2008 17:18:54 -0000	1.11
@@ -1,7 +1,7 @@
 %define roundcubedir %{_datadir}/roundcubemail
 Name: roundcubemail
 Version:  0.1.1
-Release:  3%{?dist}.1
+Release:  0.alpha%{?dist}.1
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
@@ -11,8 +11,7 @@
 Source1: roundcubemail.conf
 Source2: roundcubemail.logrotate
 Source4: roundcubemail-README.fedora
-Patch0: roundcubemail-0.1.1-mysql.update.sql.patch
-Patch1: roundcubemail-0.1.1-pear.patch
+Patch0: roundcubemail-0.2-alpha-confpath.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
@@ -23,6 +22,10 @@
 Requires: php-pear-Net-Socket
 Requires: php, httpd
 #Requires: php-pear-Mail-mimeDecode
+Requires: php-mcrypt
+Requires: php-pear-MDB2
+Requires: php-pear-MDB2-Driver-mysql
+Requires: php-pecl-Fileinfo
 
 %description
 RoundCube Webmail is a browser-based multilingual IMAP client
@@ -34,10 +37,9 @@
 interface is fully skinnable using XHTML and CSS 2.
 
 %prep
-%setup -q -n roundcubemail-0.1.1-dep
+%setup -q -n roundcubemail-0.2-alpha-dependent
 
 %patch0 -p0
-%patch1 -p0
 
 # fix permissions and remove any .htaccess files
 find . -type f -print | xargs chmod a-x
@@ -125,6 +127,13 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Fri Jun 13 2008 Jon Ciesla <limb at jcomserv.net> = 0.2-0.alpha.fc7.1
+- Update to 0.2-alpha, security fixes for BZ 423271. 
+- mysql update and pear patches applied upstream.
+- Patched config paths.
+- Backported fixed deps.
+- Squeaked in by FC-7 EOL. :)
+
 * Thu Apr 10 2008 Jon Ciesla <limb at jcomserv.net> = 0.1.1-3.fc7.1
 - Drop Requires for php-pear-Mail-mimDecode, not split in F-7.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Apr 2008 16:56:05 -0000	1.7
+++ sources	13 Jun 2008 17:18:54 -0000	1.8
@@ -1 +1 @@
-658c88252b2a9cd74e1e556b2728324a  roundcubemail-0.1.1-dep.tar.gz
+3bb410b3416e9c012470cca2cbc5610a  roundcubemail-0.2-alpha-dep.tar.gz