[roundcubemail] Fixed logrotate, strict errors.

Jon Ciesla limb at fedoraproject.org
Thu Feb 16 15:32:33 UTC 2012


commit 807195b8848e0cf43c3712473dcba58711b2bdd5
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Feb 16 09:32:03 2012 -0600

    Fixed logrotate, strict errors.

 roundcubemail-0.7.1-strict.patch |   11 +++++++++++
 roundcubemail.logrotate          |    1 +
 roundcubemail.spec               |    8 +++++++-
 3 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/roundcubemail-0.7.1-strict.patch b/roundcubemail-0.7.1-strict.patch
new file mode 100644
index 0000000..55eca3c
--- /dev/null
+++ b/roundcubemail-0.7.1-strict.patch
@@ -0,0 +1,11 @@
+--- program/include/iniset.php~	2012-02-16 09:26:48.000000000 -0600
++++ program/include/iniset.php	2012-02-16 09:29:20.792947143 -0600
+@@ -66,7 +66,7 @@
+     die("Fatal error: ini_set/set_include_path does not work.");
+ }
+ 
+-ini_set('error_reporting', E_ALL&~E_NOTICE);
++ini_set('error_reporting', E_ALL & ~E_NOTICE & ~E_STRICT);
+ 
+ // increase maximum execution time for php scripts
+ // (does not work in safe mode)
diff --git a/roundcubemail.logrotate b/roundcubemail.logrotate
index bde7ff5..18e8695 100644
--- a/roundcubemail.logrotate
+++ b/roundcubemail.logrotate
@@ -1,5 +1,6 @@
 /var/log/roundcubemail/errors {
     missingok
+    su root apache
     notifempty
     size 30k
     create 0660 root apache
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 493b937..6037733 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -2,7 +2,7 @@
 %global _logdir /var/log  
 Name: roundcubemail
 Version:  0.7.1
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
@@ -14,6 +14,7 @@ Source2: roundcubemail.logrotate
 Source4: roundcubemail-README.fedora
 # Non-upstremable: Adjusts config path to Fedora policy
 Patch6: roundcubemail-0.4.1-confpath.patch
+Patch7: roundcubemail-0.7.1-strict.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
@@ -45,6 +46,7 @@ interface is fully skinnable using XHTML and CSS 2.
 %setup -q -n roundcubemail-%{version}-dep
 
 %patch6 -p0
+%patch7 -p0
 
 # fix permissions and remove any .htaccess files
 find . -type f -print | xargs chmod a-x
@@ -136,6 +138,10 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Thu Feb 16 2012 Jon Ciesla <limburgher at gmail.com> - 0.7.1-2
+- Fix logrotate, BZ 789552.
+- Modify error logging for strict, BZ 789576.
+
 * Wed Feb  1 2012 Adam Williamson <awilliam at redhat.com> - 0.7.1-1
 - new upstream release
 


More information about the scm-commits mailing list