[packaging] 8 commits - .gitignore roundcubemail-0.1.1-mysql.update.sql.patch roundcubemail-0.1.1-pear.patch roundcubemail-0.2-alpha-confpath.patch roundcubemail-0.2-beta-confpath.patch roundcubemail-0.2-beta-CVE-2008-5620.patch roundcubemail-0.2-beta-html2text.patch roundcubemail-0.2-CVE-2009-0413.patch roundcubemail-0.2-stable-pg-mdb2.patch roundcubemail-0.3.1-CVE-2010-0464.patch roundcubemail-0.4.1-confpath.patch roundcubemail.spec sources

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Mon Jan 9 22:06:02 CET 2012


 .gitignore                                 |    7 ++
 roundcubemail-0.1.1-mysql.update.sql.patch |   11 ---
 roundcubemail-0.1.1-pear.patch             |   11 ---
 roundcubemail-0.2-CVE-2009-0413.patch      |   24 -------
 roundcubemail-0.2-alpha-confpath.patch     |   18 -----
 roundcubemail-0.2-beta-CVE-2008-5620.patch |   60 ------------------
 roundcubemail-0.2-beta-confpath.patch      |   12 ---
 roundcubemail-0.2-beta-html2text.patch     |   94 -----------------------------
 roundcubemail-0.2-stable-pg-mdb2.patch     |    5 -
 roundcubemail-0.3.1-CVE-2010-0464.patch    |   17 -----
 roundcubemail-0.4.1-confpath.patch         |   12 +++
 roundcubemail.spec                         |   56 ++++++++++++-----
 sources                                    |    2 
 13 files changed, 59 insertions(+), 270 deletions(-)

New commits:
commit 8d5d79d6cd306e69dd63b2f27fe195c5e965c0c8
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Dec 14 17:58:48 2011 -0800

    new upstream release 0.7, drop all patches but confpath.patch

diff --git a/.gitignore b/.gitignore
index 79cd6bf..a6793fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ roundcubemail-0.3.1-dep.tar.gz
 /roundcubemail-0.5.3-dep.tar.gz
 /roundcubemail-0.5.4-dep.tar.gz
 /roundcubemail-0.6-dep.tar.gz
+/roundcubemail-0.7-dep.tar.gz
diff --git a/roundcubemail-0.1.1-mysql.update.sql.patch b/roundcubemail-0.1.1-mysql.update.sql.patch
deleted file mode 100644
index e1039f7..0000000
--- a/roundcubemail-0.1.1-mysql.update.sql.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- SQL/mysql.update.sql	2008-04-09 08:34:22.000000000 -0500
-+++ SQL/mysql.update.sql	2008-04-09 08:34:22.000000000 -0500
-@@ -5,7 +5,7 @@
- 
- ALTER TABLE `messages`
-   DROP INDEX `idx`,
--  DROP INDEX `uid`
-+  DROP INDEX `uid`;
- 
- ALTER TABLE `cache`
-   DROP INDEX `cache_key`,
diff --git a/roundcubemail-0.1.1-pear.patch b/roundcubemail-0.1.1-pear.patch
deleted file mode 100644
index 0c770e6..0000000
--- a/roundcubemail-0.1.1-pear.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- index.php~	2008-04-10 11:15:39.000000000 -0500
-+++ index.php	2008-04-10 11:15:39.000000000 -0500
-@@ -82,7 +82,7 @@
- require_once('include/rcube_imap.inc');
- require_once('include/bugs.inc');
- require_once('include/main.inc');
--require_once('PEAR.php');
-+#require_once('PEAR.php');
- 
- 
- // set PEAR error handling
diff --git a/roundcubemail-0.2-CVE-2009-0413.patch b/roundcubemail-0.2-CVE-2009-0413.patch
deleted file mode 100644
index 44c274f..0000000
--- a/roundcubemail-0.2-CVE-2009-0413.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- CHANGELOG~	2009-02-04 09:58:46.000000000 -0600
-+++ CHANGELOG	2009-02-04 09:58:46.000000000 -0600
-@@ -3,0 +4,4 @@
-+2009/01/20 (thomasb)
-+----------
-+- Fix XSS vulnerability through background attributes as reported by Julien Cayssol
-+
---- program/lib/washtml.php~	2009-02-04 10:01:02.000000000 -0600
-+++ program/lib/washtml.php	2009-02-04 10:01:02.000000000 -0600
-@@ -83 +83 @@
--  static $html_attribs = array('name', 'class', 'title', 'alt', 'width', 'height', 'align', 'nowrap', 'col', 'row', 'id', 'rowspan', 'colspan', 'cellspacing', 'cellpadding', 'valign', 'bgcolor', 'color', 'border', 'bordercolorlight', 'bordercolordark', 'face', 'marginwidth', 'marginheight', 'axis', 'border', 'abbr', 'char', 'charoff', 'clear', 'compact', 'coords', 'vspace', 'hspace', 'cellborder', 'size', 'lang', 'dir', 'background');  
-+  static $html_attribs = array('name', 'class', 'title', 'alt', 'width', 'height', 'align', 'nowrap', 'col', 'row', 'id', 'rowspan', 'colspan', 'cellspacing', 'cellpadding', 'valign', 'bgcolor', 'color', 'border', 'bordercolorlight', 'bordercolordark', 'face', 'marginwidth', 'marginheight', 'axis', 'border', 'abbr', 'char', 'charoff', 'clear', 'compact', 'coords', 'vspace', 'hspace', 'cellborder', 'size', 'lang', 'dir');  
-@@ -163 +163 @@
--         ($key == 'href' && preg_match('/^(http|https|ftp|mailto):.*/i', $value)))
-+         ($key == 'href' && preg_match('/^(http|https|ftp|mailto):.+/i', $value)))
-@@ -167 +167 @@
--      else if($key == 'src' && strtolower($node->tagName) == 'img') { //check tagName anyway
-+      else if($key == 'background' || ($key == 'src' && strtolower($node->tagName) == 'img')) { //check tagName anyway
-@@ -171 +171 @@
--        else if(preg_match('/^(http|https|ftp):.*/i', $value)) {
-+        else if(preg_match('/^(http|https|ftp):.+/i', $value)) {
-@@ -177 +177 @@
--              $t .= ' src="' . htmlspecialchars($this->config['blocked_src'], ENT_QUOTES) . '"';
-+              $t .= ' ' . $key . '="' . htmlspecialchars($this->config['blocked_src'], ENT_QUOTES) . '"';
diff --git a/roundcubemail-0.2-alpha-confpath.patch b/roundcubemail-0.2-alpha-confpath.patch
deleted file mode 100644
index efbf60e..0000000
--- a/roundcubemail-0.2-alpha-confpath.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
diff --git a/roundcubemail-0.2-beta-CVE-2008-5620.patch b/roundcubemail-0.2-beta-CVE-2008-5620.patch
deleted file mode 100644
index b6e6ff2..0000000
--- a/roundcubemail-0.2-beta-CVE-2008-5620.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- bin/quotaimg.php.orig	2008-09-12 11:48:23.000000000 -0500
-+++ bin/quotaimg.php	2008-12-16 11:21:30.000000000 -0600
-@@ -4 +4 @@
-- | program/bin/quotaimg.php                                              |
-+ | bin/quotaimg.php                                                      |
-@@ -7 +7 @@
-- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
-+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
-@@ -17 +17 @@
-- $Id: $
-+ $Id$
-@@ -21,4 +21,4 @@
--$used   = ((isset($_GET['u']) && !empty($_GET['u'])) || $_GET['u']=='0')?(int)$_GET['u']:'??';
--$quota  = ((isset($_GET['q']) && !empty($_GET['q'])) || $_GET['q']=='0')?(int)$_GET['q']:'??';
--$width  = empty($_GET['w']) ? 100 : (int)$_GET['w'];
--$height = empty($_GET['h']) ? 14 : (int)$_GET['h'];
-+$used   = isset($_GET['u']) ? intval($_GET['u']) : '??';
-+$quota  = isset($_GET['q']) ? intval($_GET['q']) : '??';
-+$width  = empty($_GET['w']) ? 100 : min(300, intval($_GET['w']));
-+$height = empty($_GET['h']) ? 14  : min(50,  intval($_GET['h']));
-@@ -99 +99 @@
--    }
-+	}
-@@ -101,2 +101 @@
--	if (strpos($used, '?') !== false || strpos($total, '?') !== false
--        && $used != 0) {
-+	if (strpos($used, '?') !== false || strpos($total, '?') !== false && $used != 0) {
-@@ -104 +103 @@
--    }
-+	}
-@@ -156 +155 @@
--		    // if($quota >= $limit['low'])
-+			// if($quota >= $limit['low'])
-@@ -166 +165 @@
--        // Print percent in black
-+		// Print percent in black
-@@ -171,5 +170,5 @@
--    
--    // @todo is harcoding GMT necessary?
--	header('Expires: ' . gmdate('D, d M Y H:i:s', mktime()+86400) . ' GMT');
--	header('Cache-Control: ');
--	header('Pragma: ');
-+
-+	// cache for 1 hour
-+	$maxage = 3600;
-+	header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$maxage). ' GMT');
-+	header('Cache-Control: max-age=' . $maxage);
-@@ -181 +180,7 @@
--genQuota($used, $quota, $width, $height);
-+if ($width > 1 && $height > 1) {
-+	genQuota($used, $quota, $width, $height);  
-+}
-+else {
-+	header("HTTP/1.0 404 Not Found");
-+}
-+
-@@ -183 +188 @@
--?>
-\ No newline at end of file
-+?>
diff --git a/roundcubemail-0.2-beta-confpath.patch b/roundcubemail-0.2-beta-confpath.patch
deleted file mode 100644
index 258ab6e..0000000
--- a/roundcubemail-0.2-beta-confpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- program/include/iniset.php	2008-10-09 07:43:13.000000000 -0500
-+++ program/include/iniset.php	2008-10-09 07:43:13.000000000 -0500
-@@ -30,7 +30,8 @@
-   define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
- }
- 
--define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
-+#define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
-+define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
- 
- // make sure path_separator is defined
- if (!defined('PATH_SEPARATOR')) {
diff --git a/roundcubemail-0.2-beta-html2text.patch b/roundcubemail-0.2-beta-html2text.patch
deleted file mode 100644
index c927caa..0000000
--- a/roundcubemail-0.2-beta-html2text.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- program/lib/html2text.php.orig	2008-08-30 07:35:36.000000000 -0500
-+++ program/lib/html2text.php	2008-12-12 10:09:19.000000000 -0600
-@@ -152,2 +151,0 @@
--        '/<h[123][^>]*>(.*?)<\/h[123]>/ie',      // H1 - H3
--        '/<h[456][^>]*>(.*?)<\/h[456]>/ie',      // H4 - H6
-@@ -156,2 +153,0 @@
--        '/<b[^>]*>(.*?)<\/b>/ie',                // <b>
--        '/<strong[^>]*>(.*?)<\/strong>/ie',      // <strong>
-@@ -164,2 +159,0 @@
--        '/<a [^>]*href=("|\')([^"\']+)\1[^>]*>(.*?)<\/a>/ie',
--                                                 // <a href="">
-@@ -170 +163,0 @@
--        '/<th[^>]*>(.*?)<\/th>/ie',              // <th> and </th>
-@@ -204,2 +196,0 @@
--        "strtoupper(\"\n\n\\1\n\n\")",          // H1 - H3
--        "ucwords(\"\n\n\\1\n\")",             // H4 - H6
-@@ -208,2 +198,0 @@
--        'strtoupper("\\1")',                    // <b>
--        'strtoupper("\\1")',                    // <strong>
-@@ -216,2 +204,0 @@
--    	'$this->_build_link_list("\\2", "\\3")',
--    	                                	// <a href="">
-@@ -222 +208,0 @@
--        "strtoupper(\"\t\t\\1\n\")",            // <th> and </th>
-@@ -235 +221 @@
--        '£',
-+        '£',
-@@ -240,0 +227,16 @@
-+    /**
-+     *  List of preg* regular expression patterns to search for
-+     *  and replace using callback function.
-+     *
-+     *  @var array $callback_search
-+     *  @access public
-+     */
-+    var $callback_search = array(
-+        '/<(h)[123456][^>]*>(.*?)<\/h[123456]>/i', // H1 - H3
-+        '/<(b)[^>]*>(.*?)<\/b>/i',                 // <b>
-+        '/<(strong)[^>]*>(.*?)<\/strong>/i',       // <strong>
-+        '/<(a) [^>]*href=("|\')([^"\']+)\2[^>]*>(.*?)<\/a>/i',
-+                                                   // <a href="">
-+        '/<(th)[^>]*>(.*?)<\/th>/i',               // <th> and </th>
-+    );
-+
-@@ -468 +470,4 @@
--	
-+
-+	// Replace known html entities
-+	$text = html_entity_decode($text, ENT_COMPAT, 'UTF-8');
-+
-@@ -470,0 +476 @@
-+        $text = preg_replace_callback($this->callback_search, array('html2text', '_preg_callback'), $text);
-@@ -546 +552 @@
--	    $text = preg_replace('/<pre[^>]*>.*<\/pre>/ismU', '<div><br>' . $result . '<br></div>', $text);
-+	    $text = preg_replace('/<pre[^>]*>.*<\/pre>/ismU', '<div><br>' . $result . '<br></div>', $text, 1);
-@@ -548,0 +555,38 @@
-+
-+    /**
-+     *  Callback function for preg_replace_callback use.
-+     *
-+     *  @param  array PREG matches
-+     *  @return string
-+     *  @access private
-+     */
-+    function _preg_callback($matches)
-+    {
-+	switch($matches[1])
-+	{
-+	    case 'b':
-+	    case 'strong':
-+		return $this->_strtoupper($matches[2]);
-+	    case 'hr':
-+		return $this->_strtoupper("\t\t". $matches[2] ."\n");
-+	    case 'h':
-+		return $this->_strtoupper("\n\n". $matches[2] ."\n\n");
-+	    case 'a':
-+    	        return $this->_build_link_list($matches[3], $matches[4]);
-+	}
-+    }
-+    
-+    /**
-+     *  Strtoupper multibyte wrapper function
-+     *
-+     *  @param  string
-+     *  @return string
-+     *  @access private
-+     */
-+    function _strtoupper($str)
-+    {
-+	if (function_exists('mb_strtoupper'))
-+    	    return mb_strtoupper($str);
-+    	else
-+	    return strtoupper($str);
-+    }
diff --git a/roundcubemail-0.2-stable-pg-mdb2.patch b/roundcubemail-0.2-stable-pg-mdb2.patch
deleted file mode 100644
index 2938ce8..0000000
--- a/roundcubemail-0.2-stable-pg-mdb2.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- program/include/rcube_mdb2.php~	2009-03-30 15:10:59.000000000 -0500
-+++ program/include/rcube_mdb2.php	2009-03-30 15:10:59.000000000 -0500
-@@ -89 +89 @@
--      $db_options['disable_smart_seqname'] = true;
-+      #$db_options['disable_smart_seqname'] = true;
diff --git a/roundcubemail-0.3.1-CVE-2010-0464.patch b/roundcubemail-0.3.1-CVE-2010-0464.patch
deleted file mode 100644
index 37bb9c0..0000000
--- a/roundcubemail-0.3.1-CVE-2010-0464.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- program/include/rcube_html_page.php~	2009-06-22 11:20:34.000000000 -0500
-+++ program/include/rcube_html_page.php	2010-02-01 12:21:44.000000000 -0600
-@@ -164,7 +164,13 @@
-             $__page_header.= ' content="text/html; charset=';
-             $__page_header.= $this->charset . '" />'."\n";
-         }
--
-+        // add hint to disable DNS prefetching 
-+        if (!headers_sent()) { 
-+            header('X-DNS-Prefetch-Control: off'); 
-+        } else { 
-+            $__page_header.= '<meta http-equiv="x-dns-prefetch-control" content="off" />'."\n"; 
-+        }
-+        
-         // definition of the code to be placed in the document header and footer
-         if (is_array($this->script_files['head'])) {
-             foreach ($this->script_files['head'] as $file) {
diff --git a/roundcubemail-0.4.1-pg-mdb2.patch b/roundcubemail-0.4.1-pg-mdb2.patch
deleted file mode 100644
index 5d54ada..0000000
--- a/roundcubemail-0.4.1-pg-mdb2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- program/include/rcube_mdb2.php~	2010-09-26 06:17:03.000000000 -0500
-+++ program/include/rcube_mdb2.php	2010-10-04 08:32:58.509966177 -0500
-@@ -87,7 +87,7 @@
-             'portability'      => MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL);
- 
-         if ($this->db_provider == 'pgsql') {
--            $db_options['disable_smart_seqname'] = true;
-+            #$db_options['disable_smart_seqname'] = true;
-             $db_options['seqname_format'] = '%s';
-         }
- 
diff --git a/roundcubemail-0.5.1-CVE-2010-0464.patch b/roundcubemail-0.5.1-CVE-2010-0464.patch
deleted file mode 100644
index 6cd2065..0000000
--- a/roundcubemail-0.5.1-CVE-2010-0464.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- program/include/rcube_html_page.php~	2011-01-29 08:55:12.000000000 -0600
-+++ program/include/rcube_html_page.php	2011-02-10 12:34:16.439813090 -0600
-@@ -192,6 +192,14 @@
-             $page_header.= $this->charset . '" />'."\n";
-         }
- 
-+        // add hint to disable DNS prefetching 
-+        if (!headers_sent()) { 
-+            header('X-DNS-Prefetch-Control: off'); 
-+        } else { 
-+            $__page_header.= '<meta http-equiv="x-dns-prefetch-control" content="off" />'."\n"; 
-+        }
-+        
-+
-         // definition of the code to be placed in the document header and footer
-         if (is_array($this->script_files['head'])) {
-             foreach ($this->script_files['head'] as $file) {
diff --git a/roundcubemail.spec b/roundcubemail.spec
index eef525f..79c45ae 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,7 +1,7 @@
 %define roundcubedir %{_datadir}/roundcubemail
 %global _logdir /var/log  
 Name: roundcubemail
-Version:  0.6
+Version:  0.7
 Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -12,16 +12,8 @@ Source0: roundcubemail-%{version}-dep.tar.gz
 Source1: roundcubemail.conf
 Source2: roundcubemail.logrotate
 Source4: roundcubemail-README.fedora
-#Patch0: roundcubemail-0.2-beta-confpath.patch
-# From upstream, not in a release yet, BZ 476223.
-#Patch1: roundcubemail-0.2-beta-html2text.patch
-# From upstream, not in a release yet, BZ 476830.
-#Patch2: roundcubemail-0.2-beta-CVE-2008-5620.patch
-#Patch3: roundcubemail-0.2-CVE-2009-0413.patch
-#Patch4: roundcubemail-0.2-stable-pg-mdb2.patch
-Patch5: roundcubemail-0.5.1-CVE-2010-0464.patch
+# Non-upstremable: Adjusts config path to Fedora policy
 Patch6: roundcubemail-0.4.1-confpath.patch
-Patch7: roundcubemail-0.4.1-pg-mdb2.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
@@ -52,14 +44,7 @@ interface is fully skinnable using XHTML and CSS 2.
 %prep
 %setup -q -n roundcubemail-%{version}-dep
 
-#%patch0 -p0
-#%patch1 -p0
-#%patch2 -p0
-#%patch3 -p0
-#%patch4 -p0
-%patch5 -p0
 %patch6 -p0
-%patch7 -p0
 
 # fix permissions and remove any .htaccess files
 find . -type f -print | xargs chmod a-x
@@ -151,6 +136,14 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Wed Dec 14 2011 Adam Williamson <awilliam at redhat.com> - 0.7-1
+- new upstream release
+- drop all patches except confpath.patch:
+	+ html2text.patch and all CVE fixes were merged upstream
+	+ pg-mdb2.patch no longer necessary as all currently supported
+	  Fedora releases have a php-pear-MDB2-Driver-pgsql package new
+	  enough to work with this option
+
 * Fri Oct 07 2011 Jon Ciesla <limb at jcomserv.net> = 0.6-1
 - New upstream.
 
diff --git a/sources b/sources
index 79af0c1..16b41bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8755dc81337897d1eb96633f5e94aca5  roundcubemail-0.6-dep.tar.gz
+ba22fffd3f5dfac9d689ebd7a28ac652  roundcubemail-0.7-dep.tar.gz


commit e3c5e1bee89171cd8b0ea3b7bd56d4e9088aa78f
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Fri Oct 7 10:20:10 2011 -0500

    0.6

diff --git a/.gitignore b/.gitignore
index 2d58979..79cd6bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ roundcubemail-0.3.1-dep.tar.gz
 /roundcubemail-0.5.2-dep.tar.gz
 /roundcubemail-0.5.3-dep.tar.gz
 /roundcubemail-0.5.4-dep.tar.gz
+/roundcubemail-0.6-dep.tar.gz
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 486c486..eef525f 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,7 +1,7 @@
 %define roundcubedir %{_datadir}/roundcubemail
 %global _logdir /var/log  
 Name: roundcubemail
-Version:  0.5.4
+Version:  0.6
 Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -151,6 +151,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Fri Oct 07 2011 Jon Ciesla <limb at jcomserv.net> = 0.6-1
+- New upstream.
+
 * Tue Sep 06 2011 Jon Ciesla <limb at jcomserv.net> = 0.5.4-1
 - New upstream, fixes multiple security issues.
 
diff --git a/sources b/sources
index 0d4b6f7..79af0c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38fe28ccdb34a8e88ac27021c018b490  roundcubemail-0.5.4-dep.tar.gz
+8755dc81337897d1eb96633f5e94aca5  roundcubemail-0.6-dep.tar.gz


commit 2b19798ae21849277812ef9339319ef9bc0da178
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Tue Sep 6 10:08:52 2011 -0500

    0.5.4.

diff --git a/.gitignore b/.gitignore
index a8f9bb3..2d58979 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ roundcubemail-0.3.1-dep.tar.gz
 /roundcubemail-0.5.1-dep.tar.gz
 /roundcubemail-0.5.2-dep.tar.gz
 /roundcubemail-0.5.3-dep.tar.gz
+/roundcubemail-0.5.4-dep.tar.gz
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 3276f72..486c486 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,7 +1,7 @@
 %define roundcubedir %{_datadir}/roundcubemail
 %global _logdir /var/log  
 Name: roundcubemail
-Version:  0.5.3
+Version:  0.5.4
 Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -151,6 +151,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Tue Sep 06 2011 Jon Ciesla <limb at jcomserv.net> = 0.5.4-1
+- New upstream, fixes multiple security issues.
+
 * Tue Jul 05 2011 Jon Ciesla <limb at jcomserv.net> = 0.5.3-1
 - New upstream.
 
diff --git a/sources b/sources
index 2eb7394..0d4b6f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f1ea1b9f5526df422f8a39a524a620d  roundcubemail-0.5.3-dep.tar.gz
+38fe28ccdb34a8e88ac27021c018b490  roundcubemail-0.5.4-dep.tar.gz


commit 1143837955869b25bbef0f4c311c207120951c2a
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Tue Jul 5 08:30:49 2011 -0500

    0.5.3.

diff --git a/.gitignore b/.gitignore
index 65f33e8..a8f9bb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ roundcubemail-0.3.1-dep.tar.gz
 /roundcubemail-0.4.2-dep.tar.gz
 /roundcubemail-0.5.1-dep.tar.gz
 /roundcubemail-0.5.2-dep.tar.gz
+/roundcubemail-0.5.3-dep.tar.gz
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 10b8537..3276f72 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,7 +1,7 @@
 %define roundcubedir %{_datadir}/roundcubemail
 %global _logdir /var/log  
 Name: roundcubemail
-Version:  0.5.2
+Version:  0.5.3
 Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -151,6 +151,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Tue Jul 05 2011 Jon Ciesla <limb at jcomserv.net> = 0.5.3-1
+- New upstream.
+
 * Tue May 17 2011 Jon Ciesla <limb at jcomserv.net> = 0.5.2-1
 - New upstream.
 
diff --git a/sources b/sources
index f4c2106..2eb7394 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ebc52cd2ee53eb2cdb3eac7b826ea3e  roundcubemail-0.5.2-dep.tar.gz
+1f1ea1b9f5526df422f8a39a524a620d  roundcubemail-0.5.3-dep.tar.gz


commit f50cc4ec40b40443115a03e10bf7602c70fb6aee
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Tue May 17 14:37:55 2011 -0500

    New upstream.

diff --git a/.gitignore b/.gitignore
index 0c59f56..65f33e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 roundcubemail-0.3.1-dep.tar.gz
 /roundcubemail-0.4.2-dep.tar.gz
 /roundcubemail-0.5.1-dep.tar.gz
+/roundcubemail-0.5.2-dep.tar.gz
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 3231dcc..10b8537 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,7 +1,7 @@
 %define roundcubedir %{_datadir}/roundcubemail
 %global _logdir /var/log  
 Name: roundcubemail
-Version:  0.5.1
+Version:  0.5.2
 Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -151,6 +151,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Tue May 17 2011 Jon Ciesla <limb at jcomserv.net> = 0.5.2-1
+- New upstream.
+
 * Thu Feb 10 2011 Jon Ciesla <limb at jcomserv.net> = 0.5.1-1
 - New upstream.
 
diff --git a/sources b/sources
index 8ef4f31..f4c2106 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dcc8b0839ba92a39ad244653d2083079  roundcubemail-0.5.1-dep.tar.gz
+0ebc52cd2ee53eb2cdb3eac7b826ea3e  roundcubemail-0.5.2-dep.tar.gz


commit 6b5605a3fd57cb4a3b9a99340dce1713013b5c21
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Thu Mar 24 11:10:11 2011 -0500

    New upstream.

diff --git a/.gitignore b/.gitignore
index 44d0474..0c59f56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 roundcubemail-0.3.1-dep.tar.gz
 /roundcubemail-0.4.2-dep.tar.gz
+/roundcubemail-0.5.1-dep.tar.gz
diff --git a/roundcubemail-0.5.1-CVE-2010-0464.patch b/roundcubemail-0.5.1-CVE-2010-0464.patch
new file mode 100644
index 0000000..6cd2065
--- /dev/null
+++ b/roundcubemail-0.5.1-CVE-2010-0464.patch
@@ -0,0 +1,17 @@
+--- program/include/rcube_html_page.php~	2011-01-29 08:55:12.000000000 -0600
++++ program/include/rcube_html_page.php	2011-02-10 12:34:16.439813090 -0600
+@@ -192,6 +192,14 @@
+             $page_header.= $this->charset . '" />'."\n";
+         }
+ 
++        // add hint to disable DNS prefetching 
++        if (!headers_sent()) { 
++            header('X-DNS-Prefetch-Control: off'); 
++        } else { 
++            $__page_header.= '<meta http-equiv="x-dns-prefetch-control" content="off" />'."\n"; 
++        }
++        
++
+         // definition of the code to be placed in the document header and footer
+         if (is_array($this->script_files['head'])) {
+             foreach ($this->script_files['head'] as $file) {
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 25dcb26..3231dcc 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,8 +1,8 @@
 %define roundcubedir %{_datadir}/roundcubemail
 %global _logdir /var/log  
 Name: roundcubemail
-Version:  0.4.2
-Release:  2%{?dist}
+Version:  0.5.1
+Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
@@ -19,7 +19,7 @@ Source4: roundcubemail-README.fedora
 #Patch2: roundcubemail-0.2-beta-CVE-2008-5620.patch
 #Patch3: roundcubemail-0.2-CVE-2009-0413.patch
 #Patch4: roundcubemail-0.2-stable-pg-mdb2.patch
-Patch5: roundcubemail-0.3.1-CVE-2010-0464.patch
+Patch5: roundcubemail-0.5.1-CVE-2010-0464.patch
 Patch6: roundcubemail-0.4.1-confpath.patch
 Patch7: roundcubemail-0.4.1-pg-mdb2.patch
 
@@ -38,6 +38,7 @@ Requires: php-pear-MDB2-Driver-mysql
 Requires: php-pecl-Fileinfo
 Requires: php-xml
 Requires: php-mbstring
+Requires: php-pear-Net-IDNA2
 
 %description
 RoundCube Webmail is a browser-based multilingual IMAP client
@@ -150,6 +151,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Thu Feb 10 2011 Jon Ciesla <limb at jcomserv.net> = 0.5.1-1
+- New upstream.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 363ca1e..8ef4f31 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-451fc2229682d410f774365b3953dfad  roundcubemail-0.4.2-dep.tar.gz
+dcc8b0839ba92a39ad244653d2083079  roundcubemail-0.5.1-dep.tar.gz


commit 511cc8a2d8f1f08e0e12620358da02745136b5f6
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Wed Feb 9 02:35:41 2011 -0600

    - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

diff --git a/roundcubemail.spec b/roundcubemail.spec
index a2a9087..25dcb26 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -2,7 +2,7 @@
 %global _logdir /var/log  
 Name: roundcubemail
 Version:  0.4.2
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
@@ -150,6 +150,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Mon Oct 18 2010 Jon Ciesla <limb at jcomserv.net> = 0.4.2-1
 - New upstream.
 


commit 816aad557b7253d6ab9c823a4667fb987826574b
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Jan 3 09:08:43 2011 -0600

    0.4.2.

diff --git a/.gitignore b/.gitignore
index de5584f..44d0474 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 roundcubemail-0.3.1-dep.tar.gz
+/roundcubemail-0.4.2-dep.tar.gz
diff --git a/roundcubemail-0.4.1-confpath.patch b/roundcubemail-0.4.1-confpath.patch
new file mode 100644
index 0000000..7311f96
--- /dev/null
+++ b/roundcubemail-0.4.1-confpath.patch
@@ -0,0 +1,12 @@
+--- program/include/iniset.php~	2010-09-29 05:04:09.000000000 -0500
++++ program/include/iniset.php	2010-10-04 08:29:02.687967293 -0500
+@@ -46,7 +46,8 @@
+ }
+ 
+ if (!defined('RCMAIL_CONFIG_DIR')) {
+-    define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
++    #define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
++    define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
+ }
+ 
+ // make sure path_separator is defined
diff --git a/roundcubemail-0.4.1-pg-mdb2.patch b/roundcubemail-0.4.1-pg-mdb2.patch
new file mode 100644
index 0000000..5d54ada
--- /dev/null
+++ b/roundcubemail-0.4.1-pg-mdb2.patch
@@ -0,0 +1,11 @@
+--- program/include/rcube_mdb2.php~	2010-09-26 06:17:03.000000000 -0500
++++ program/include/rcube_mdb2.php	2010-10-04 08:32:58.509966177 -0500
+@@ -87,7 +87,7 @@
+             'portability'      => MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL);
+ 
+         if ($this->db_provider == 'pgsql') {
+-            $db_options['disable_smart_seqname'] = true;
++            #$db_options['disable_smart_seqname'] = true;
+             $db_options['seqname_format'] = '%s';
+         }
+ 
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 994df0c..a2a9087 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,8 +1,8 @@
 %define roundcubedir %{_datadir}/roundcubemail
 %global _logdir /var/log  
 Name: roundcubemail
-Version:  0.3.1
-Release:  2%{?dist}
+Version:  0.4.2
+Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
@@ -12,14 +12,16 @@ Source0: roundcubemail-%{version}-dep.tar.gz
 Source1: roundcubemail.conf
 Source2: roundcubemail.logrotate
 Source4: roundcubemail-README.fedora
-Patch0: roundcubemail-0.2-beta-confpath.patch
+#Patch0: roundcubemail-0.2-beta-confpath.patch
 # From upstream, not in a release yet, BZ 476223.
 #Patch1: roundcubemail-0.2-beta-html2text.patch
 # From upstream, not in a release yet, BZ 476830.
 #Patch2: roundcubemail-0.2-beta-CVE-2008-5620.patch
 #Patch3: roundcubemail-0.2-CVE-2009-0413.patch
-Patch4: roundcubemail-0.2-stable-pg-mdb2.patch
+#Patch4: roundcubemail-0.2-stable-pg-mdb2.patch
 Patch5: roundcubemail-0.3.1-CVE-2010-0464.patch
+Patch6: roundcubemail-0.4.1-confpath.patch
+Patch7: roundcubemail-0.4.1-pg-mdb2.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
@@ -31,7 +33,7 @@ Requires: php-pear-Net-Socket
 Requires: php, httpd
 Requires: php-pear-Mail-mimeDecode
 Requires: php-mcrypt
-Requires: php-pear-MDB2
+Requires: php-pear-MDB2 >= 2.5.0
 Requires: php-pear-MDB2-Driver-mysql
 Requires: php-pecl-Fileinfo
 Requires: php-xml
@@ -49,12 +51,14 @@ interface is fully skinnable using XHTML and CSS 2.
 %prep
 %setup -q -n roundcubemail-%{version}-dep
 
-%patch0 -p0
+#%patch0 -p0
 #%patch1 -p0
 #%patch2 -p0
 #%patch3 -p0
-%patch4 -p0
+#%patch4 -p0
 %patch5 -p0
+%patch6 -p0
+%patch7 -p0
 
 # fix permissions and remove any .htaccess files
 find . -type f -print | xargs chmod a-x
@@ -146,6 +150,12 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Mon Oct 18 2010 Jon Ciesla <limb at jcomserv.net> = 0.4.2-1
+- New upstream.
+
+* Mon Oct 04 2010 Jon Ciesla <limb at jcomserv.net> = 0.4.1-1
+- New upstream.
+
 * Mon Feb 01 2010 Jon Ciesla <limb at jcomserv.net> = 0.3.1-2
 - Patch to fix CVE-2010-0464, BZ 560143.
 
diff --git a/sources b/sources
index 6effb20..363ca1e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad8e3ba04b53e488547f643076722aa5  roundcubemail-0.3.1-dep.tar.gz
+451fc2229682d410f774365b3953dfad  roundcubemail-0.4.2-dep.tar.gz




More information about the packaging-commits mailing list