ports/149635: mail/roundcube updated from 0.4-beta to 0.4

[Grzegorz Blach]

>Number:         149635
>Category:       ports
>Synopsis:       mail/roundcube updated from 0.4-beta to 0.4
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 13 22:20:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Grzegorz Blach
>Release:        8.1-RELEASE amd64
>Organization:
>Environment:
FreeBSD roorback.net 8.1-RELEASE FreeBSD 8.1-RELEASE #4 r210430: Sat Jul 24 11:46:53 CEST 2010     magik at roorback.net:/usr/obj/usr/src/sys/ROORBACK  i386

>Description:
As in summary: port mail/roundcube updated from 0.4-beta to 0.4.

Patch in attachment.

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -x .svn -ruN /var/cache/portshaker/ports/mail/roundcube/Makefile mail/roundcube/Makefile
--- /var/cache/portshaker/ports/mail/roundcube/Makefile	2010-04-26 16:20:28.000000000 +0200
+++ mail/roundcube/Makefile	2010-08-13 23:57:32.840336123 +0200
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	roundcube
-DISTVERSION=	0.4-beta
+DISTVERSION=	0.4
 PORTEPOCH=	1
 CATEGORIES?=	mail www
-MASTER_SITES=	SF/${PORTNAME}mail/${PORTNAME}mail-beta/${DISTVERSION}
+MASTER_SITES=	SF/${PORTNAME}mail/${PORTNAME}mail/${DISTVERSION}
 DISTNAME=	${PORTNAME}mail-${DISTVERSION}
 
 MAINTAINER?=	ale at FreeBSD.org
diff -x .svn -ruN /var/cache/portshaker/ports/mail/roundcube/distinfo mail/roundcube/distinfo
--- /var/cache/portshaker/ports/mail/roundcube/distinfo	2010-04-26 16:20:28.000000000 +0200
+++ mail/roundcube/distinfo	2010-08-13 23:57:32.836337011 +0200
@@ -1,3 +1,3 @@
-MD5 (roundcubemail-0.4-beta.tar.gz) = ccbae69017c6d0056b12536e5adc52cd
-SHA256 (roundcubemail-0.4-beta.tar.gz) = cf9cbaccd09cb164e85a889d929f07fe37b7d5d10a3cad021e0d9ffb5b728941
-SIZE (roundcubemail-0.4-beta.tar.gz) = 2033675
+MD5 (roundcubemail-0.4.tar.gz) = 6e5d2313087ce1e1209eb0f4fd71beab
+SHA256 (roundcubemail-0.4.tar.gz) = 1da2a57f0fa866cabc179d01c2a29c80dcf6108d45e415210129ef90ff8b2c1c
+SIZE (roundcubemail-0.4.tar.gz) = 2159645
diff -x .svn -ruN /var/cache/portshaker/ports/mail/roundcube/files/patch-config_main.inc.php.dist mail/roundcube/files/patch-config_main.inc.php.dist
--- /var/cache/portshaker/ports/mail/roundcube/files/patch-config_main.inc.php.dist	2008-04-26 21:37:16.000000000 +0200
+++ mail/roundcube/files/patch-config_main.inc.php.dist	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
---- config/main.inc.php.dist.orig	2008-04-26 00:18:03.000000000 +0200
-+++ config/main.inc.php.dist	2008-04-26 00:19:22.000000000 +0200
-@@ -188,8 +188,8 @@
- // requires to be compiled with Open SSL support
- $rcmail_config['enable_spellcheck'] = TRUE;
- 
--// For a locally installed Nox Spell Server, please specify the URI to call it.
--// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72
-+// For a locally installed spellcheker, specify the URI to call it, for example:
-+// 'http://' . $_SERVER['HTTP_HOST'] . '/spellchecker.php?lang='
- // Leave empty to use the Google spell checking service, what means
- // that the message content will be sent to Google in order to check spelling
- $rcmail_config['spellcheck_uri'] = '';
diff -x .svn -ruN /var/cache/portshaker/ports/mail/roundcube/files/patch-program_include_iniset.php mail/roundcube/files/patch-program_include_iniset.php
--- /var/cache/portshaker/ports/mail/roundcube/files/patch-program_include_iniset.php	2010-04-26 16:20:29.000000000 +0200
+++ mail/roundcube/files/patch-program_include_iniset.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- program/include/iniset.php.orig	2010-04-26 15:54:45.000000000 +0200
-+++ program/include/iniset.php	2010-04-26 15:54:53.000000000 +0200
-@@ -25,7 +25,6 @@
- // an error/warning in the logs later. See (#1486307).
- $crit_opts = array(
-     'mbstring.func_overload' => 0,
--    'suhosin.session.encrypt' => 0,
-     'session.auto_start' => 0,
-     'file_uploads' => 1,
- );
diff -x .svn -ruN /var/cache/portshaker/ports/mail/roundcube/files/patch-program_include_rcube_message.php mail/roundcube/files/patch-program_include_rcube_message.php
--- /var/cache/portshaker/ports/mail/roundcube/files/patch-program_include_rcube_message.php	2009-09-07 22:57:06.000000000 +0200
+++ mail/roundcube/files/patch-program_include_rcube_message.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- program/include/rcube_message.php.orig	2009-08-27 10:08:27.000000000 +0200
-+++ program/include/rcube_message.php	2009-09-07 17:47:43.000000000 +0200
-@@ -384,7 +384,7 @@
- 
-         // part is a file/attachment
-         else if (preg_match('/^(inline|attach)/', $mail_part->disposition) ||
--                 $mail_part->headers['content-id'] || (empty($mail_part->disposition) && $mail_part->filename)) {
-+                 $mail_part->headers['content-id'] || $mail_part->filename) {
- 
-           // skip apple resource forks
-           if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')


>Release-Note:
>Audit-Trail:
>Unformatted: