Attachment 111307 Details for Bug 152540 – mailzu-0.8.r3.patch

[patch] mailzu-0.8.r3.patch

mailzu-0.8.r3.patch (text/plain), 6.92 KB, created by michael on 2010-11-24 10:40:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: michael

Created: 2010-11-24 10:40:11 UTC

Size: 6.92 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/security/mailzu/distinfo /usr/ports/security/mailzu.updated/distinfo
>--- /usr/ports/security/mailzu/distinfo	2009-08-14 21:54:33.000000000 +0200
>+++ /usr/ports/security/mailzu.updated/distinfo	2010-11-24 11:34:51.000000000 +0100
>@@ -1,3 +1,2 @@
>-MD5 (MailZu_0.8RC3.tar.gz) = 9c50ed9d468a4a932b625bfe1f835b3d
> SHA256 (MailZu_0.8RC3.tar.gz) = aec449f13642e0003eabe9d6a3daa4b8cfebe6d58b8dc9438aee0fec80a1ecc8
> SIZE (MailZu_0.8RC3.tar.gz) = 543781
>diff -ruN --exclude=CVS /usr/ports/security/mailzu/files/patch-DBEngine.class.php /usr/ports/security/mailzu.updated/files/patch-DBEngine.class.php
>--- /usr/ports/security/mailzu/files/patch-DBEngine.class.php	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/security/mailzu.updated/files/patch-DBEngine.class.php	2010-11-24 11:33:51.000000000 +0100
>@@ -0,0 +1,134 @@
>+--- lib/DBEngine.class.php.orig	2010-11-24 11:32:33.000000000 +0100
>++++ lib/DBEngine.class.php	2010-11-24 11:32:41.000000000 +0100
>+@@ -132,7 +132,7 @@
>+ 			MAX(stattable.badheaders) AS badheaders,
>+ 			MAX(stattable.pending) AS pending
>+ 			FROM (
>+-				SELECT CAST(time_iso AS DATE) AS date,
>++				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
>+ 					COUNT(content) AS spam,
>+ 					0 AS banned,
>+ 					0 AS viruses,
>+@@ -141,9 +141,9 @@
>+ 					FROM msgs INNER JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
>+ 					WHERE content='S' AND NOT (msgs.quar_type = '')
>+ 					AND msgrcpt.rs IN ('','v')
>+-					GROUP BY CAST(time_iso AS DATE)
>++					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
>+ 				UNION
>+-				SELECT CAST(time_iso AS DATE) AS date,
>++				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
>+ 					0 AS spam,
>+ 					COUNT(content) AS banned,
>+ 					0 AS viruses,
>+@@ -152,9 +152,9 @@
>+ 					FROM msgs INNER JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
>+ 					WHERE content='B' AND NOT (msgs.quar_type = '')
>+ 					AND msgrcpt.rs IN ('','v')
>+-					GROUP BY CAST(time_iso AS DATE)
>++					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
>+ 				UNION
>+-				SELECT CAST(time_iso AS DATE) AS date,
>++				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
>+ 					0 AS spam,
>+ 					0 AS banned,
>+ 					COUNT(content) AS viruses,
>+@@ -163,9 +163,9 @@
>+ 					FROM msgs INNER JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
>+ 					WHERE content='V' AND NOT (msgs.quar_type = '')
>+ 					AND msgrcpt.rs IN ('','v')
>+-					GROUP BY CAST(time_iso AS DATE)
>++					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
>+ 				UNION
>+-				SELECT CAST(time_iso AS DATE) AS date,
>++				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
>+ 					0 AS spam,
>+ 					0 AS banned,
>+ 					0 AS viruses,
>+@@ -174,9 +174,9 @@
>+ 					FROM msgs INNER JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
>+ 					WHERE content='H' AND NOT (msgs.quar_type = '')
>+ 					AND msgrcpt.rs IN ('','v')
>+-					GROUP BY CAST(time_iso AS DATE)
>++					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
>+ 				UNION
>+-				SELECT CAST(time_iso AS DATE) AS date,
>++				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
>+ 					0 AS spam,
>+ 					0 AS banned,
>+ 					0 AS viruses,
>+@@ -184,7 +184,7 @@
>+ 					COUNT(content) AS pending
>+ 					FROM msgs JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
>+ 					WHERE msgrcpt.rs='p' AND NOT (msgs.quar_type = '')
>+-					GROUP BY CAST(time_iso AS DATE)
>++					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
>+ 			) AS stattable
>+ 			GROUP BY date
>+ 			ORDER BY date";
>+@@ -253,7 +253,7 @@
>+ 			MAX(stattable.badheaders) AS badheaders,
>+ 			MAX(stattable.pending) AS pending
>+ 			FROM (
>+-				SELECT CAST(time_iso AS DATE) AS date,
>++				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
>+ 					COUNT(content) AS spam,
>+ 					0 AS banned,
>+ 					0 AS viruses,
>+@@ -263,9 +263,9 @@
>+ 					$join_type maddr AS recip ON msgrcpt.rid=recip.id
>+ 					WHERE content='S' AND NOT (msgs.quar_type = '') AND msgrcpt.rs IN ('','v')
>+ 					AND $recipEmailClause
>+-					GROUP BY CAST(time_iso AS DATE)
>++					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
>+ 				UNION
>+-				SELECT CAST(time_iso AS DATE) AS date,
>++				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
>+ 					0 AS spam,
>+ 					COUNT(content) AS banned,
>+ 					0 AS viruses,
>+@@ -275,9 +275,9 @@
>+ 					$join_type maddr AS recip ON msgrcpt.rid=recip.id
>+ 					WHERE content='B' AND NOT (msgs.quar_type = '') AND msgrcpt.rs IN ('','v')
>+ 					AND $recipEmailClause
>+-					GROUP BY CAST(time_iso AS DATE)
>++					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
>+ 				UNION
>+-				SELECT CAST(time_iso AS DATE) AS date,
>++				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
>+ 					0 AS spam,
>+ 					0 AS banned,
>+ 					COUNT(content) AS viruses,
>+@@ -287,9 +287,9 @@
>+ 					$join_type maddr AS recip ON msgrcpt.rid=recip.id
>+ 					WHERE content='V' AND NOT (msgs.quar_type = '') AND msgrcpt.rs IN ('','v')
>+ 					AND $recipEmailClause
>+-					GROUP BY CAST(time_iso AS DATE)
>++					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
>+ 				UNION
>+-				SELECT CAST(time_iso AS DATE) AS date,
>++				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
>+ 					0 AS spam,
>+ 					0 AS banned,
>+ 					0 AS viruses,
>+@@ -299,9 +299,9 @@
>+ 					$join_type maddr AS recip ON msgrcpt.rid=recip.id
>+ 					WHERE content='H' AND NOT (msgs.quar_type = '') AND msgrcpt.rs IN ('','v')
>+ 					AND $recipEmailClause
>+-					GROUP BY CAST(time_iso AS DATE)
>++					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
>+ 				UNION
>+-				SELECT CAST(time_iso AS DATE) AS date,
>++				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
>+ 					0 AS spam,
>+ 					0 AS banned,
>+ 					0 AS viruses,
>+@@ -311,7 +311,7 @@
>+ 					$join_type maddr AS recip ON msgrcpt.rid=recip.id
>+ 					WHERE msgrcpt.rs='p' AND NOT (msgs.quar_type = '')
>+ 					AND $recipEmailClause
>+-					GROUP BY CAST(time_iso AS DATE)
>++					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
>+ 			) AS stattable
>+ 			GROUP BY date
>+ 			ORDER BY date";
>diff -ruN --exclude=CVS /usr/ports/security/mailzu/files/pkg-message.in /usr/ports/security/mailzu.updated/files/pkg-message.in
>--- /usr/ports/security/mailzu/files/pkg-message.in	2009-08-14 21:54:33.000000000 +0200
>+++ /usr/ports/security/mailzu.updated/files/pkg-message.in	2010-11-24 10:51:47.000000000 +0100
>@@ -9,6 +9,8 @@
> Then, create and edit %%WWWDIR%%/config/config.php
> An example is provided in %%WWWDIR%%/config/config.php.sample 
> 
>+MailZu needs "short_open_tag = On" in %%PREFIX%%/etc/php.ini
>+
> Finally, make MailZu available through your web site.  An 
> example for httpd.conf:
> 
>@@ -21,4 +23,3 @@
>     Deny from all
>     Allow from 127.0.0.1 .example.org
> </Directory>
>-
>diff -ruN --exclude=CVS /usr/ports/security/mailzu/pkg-message /usr/ports/security/mailzu.updated/pkg-message
>--- /usr/ports/security/mailzu/pkg-message	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/security/mailzu.updated/pkg-message	2010-11-24 10:50:28.000000000 +0100
>@@ -0,0 +1,5 @@
>+*************************************************************************
>+
>+MailZu needs "short_open_tag = On" in %%PREFIX%%/etc/php.ini
>+
>+*************************************************************************

Actions: View | Diff

Attachments on bug 152540: 111307