bugfix update to roundcube 0.7.1
This commit is contained in:
sthen
parent
adc0f3dcb5
commit
1e43185cb4
@ -1,51 +1,50 @@
|
||||
# $OpenBSD: Makefile,v 1.48 2011/12/14 21:56:56 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.49 2012/01/11 02:35:49 sthen Exp $
|
||||
|
||||
COMMENT = imap4 webmail client
|
||||
COMMENT= imap4 webmail client
|
||||
|
||||
DISTNAME = roundcubemail-0.7
|
||||
REVISION = 2
|
||||
CATEGORIES = mail www
|
||||
HOMEPAGE = http://www.roundcube.net/
|
||||
DISTNAME= roundcubemail-0.7.1
|
||||
CATEGORIES= mail www
|
||||
HOMEPAGE= http://www.roundcube.net/
|
||||
|
||||
MAINTAINER = Stuart Henderson <sthen@openbsd.org>
|
||||
MAINTAINER= Stuart Henderson <sthen@openbsd.org>
|
||||
|
||||
# GPLv2
|
||||
PERMIT_PACKAGE_CDROM = Yes
|
||||
PERMIT_PACKAGE_FTP = Yes
|
||||
PERMIT_DISTFILES_CDROM =Yes
|
||||
PERMIT_DISTFILES_FTP = Yes
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
|
||||
#MASTER_SITES = http://nightly.roundcube.net/trunk/
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
|
||||
|
||||
NO_BUILD = Yes
|
||||
NO_REGRESS = Yes
|
||||
PKG_ARCH = *
|
||||
NO_BUILD= Yes
|
||||
NO_REGRESS= Yes
|
||||
PKG_ARCH= *
|
||||
|
||||
PREFIX = /var/www
|
||||
INSTDIR = ${PREFIX}/roundcubemail
|
||||
TINSTDIR = ${TRUEPREFIX}/roundcubemail
|
||||
SUBST_VARS = INSTDIR TINSTDIR
|
||||
PREFIX= /var/www
|
||||
INSTDIR= ${PREFIX}/roundcubemail
|
||||
TINSTDIR= ${TRUEPREFIX}/roundcubemail
|
||||
SUBST_VARS= INSTDIR TINSTDIR
|
||||
|
||||
MODULES = lang/php
|
||||
RUN_DEPENDS = lang/php/${MODPHP_VERSION},-mcrypt \
|
||||
MODULES= lang/php
|
||||
RUN_DEPENDS= lang/php/${MODPHP_VERSION},-mcrypt \
|
||||
lang/php/${MODPHP_VERSION},-pspell \
|
||||
sysutils/pecl-fileinfo \
|
||||
php-mysql-*|php-pgsql-*|php-sqlite-*:lang/php/${MODPHP_VERSION},-sqlite
|
||||
|
||||
do-configure:
|
||||
perl -pi -e '$$. == 1 && s,^#!.*env.*php.*,#!${MODPHP_BIN},;' \
|
||||
-e 'close ARGV if eof;' ${WRKSRC}/bin/* ${WRKSRC}/tests/runtests.sh
|
||||
-e 'close ARGV if eof;' ${WRKSRC}/bin/*
|
||||
|
||||
do-install:
|
||||
cp -Rp ${WRKDIST} ${INSTDIR}
|
||||
.for i in .htaccess config/mimetypes.php
|
||||
mv ${INSTDIR}/$i ${INSTDIR}/$i.dist
|
||||
.endfor
|
||||
${SUBST_CMD} -c ${FILESDIR}/roundcubemail.conf \
|
||||
${INSTDIR}/roundcubemail.conf.dist; \
|
||||
@${SUBST_CMD} -c ${FILESDIR}/roundcubemail.conf \
|
||||
${INSTDIR}/roundcubemail.conf.dist
|
||||
chown -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}; \
|
||||
find ${INSTDIR} \( -name \*.orig -or -name \*.src \) -exec rm -f {} \;
|
||||
rm -rf ${INSTDIR}/tests # requires simpletest/unit_tester.php
|
||||
chgrp -R wheel ${INSTDIR}/bin; \
|
||||
chmod -R o-rwx ${INSTDIR}/bin; \
|
||||
find ${INSTDIR} \( -name \*.orig -or -name \*.src \) -exec rm -f {} +
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (roundcubemail-0.7.tar.gz) = /1TZuEDxxagoWbe5cTP0/A==
|
||||
RMD160 (roundcubemail-0.7.tar.gz) = +6FavbGwYNp9JwWgdQafK7eqIzI=
|
||||
SHA1 (roundcubemail-0.7.tar.gz) = iajAi6uyuH5xygyhDAY1KChwyfA=
|
||||
SHA256 (roundcubemail-0.7.tar.gz) = ClF8Meh5b6sz/vsnv4S3zmqnRROZbIt7H0CRKg8zRVY=
|
||||
SIZE (roundcubemail-0.7.tar.gz) = 2707916
|
||||
MD5 (roundcubemail-0.7.1.tar.gz) = vE8g09f2ml3wrlQXLaKZjw==
|
||||
RMD160 (roundcubemail-0.7.1.tar.gz) = A9zLnE+2uwyp1KWRYrMH/i+K/8M=
|
||||
SHA1 (roundcubemail-0.7.1.tar.gz) = INfHID3hRyfyvc+7xhkWt/9aPcI=
|
||||
SHA256 (roundcubemail-0.7.1.tar.gz) = Oz2j+FrmSlp1E6H7yLXql64sOakg+bEdqhEIPcfjxYc=
|
||||
SIZE (roundcubemail-0.7.1.tar.gz) = 2710511
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
$OpenBSD: patch-SQL_mysql_update_sql,v 1.2 2010/09/29 20:55:39 sthen Exp $
|
||||
|
||||
current mysql version is affected by this bug; uncomment workaround
|
||||
|
||||
--- SQL/mysql.update.sql.orig Sat Sep 25 14:03:53 2010
|
||||
+++ SQL/mysql.update.sql Wed Sep 29 14:29:03 2010
|
||||
@@ -71,7 +71,7 @@ ALTER TABLE `contacts`
|
||||
-- If not, use: ALTER TABLE xxx ENGINE=InnoDB;
|
||||
|
||||
/* MySQL bug workaround: http://bugs.mysql.com/bug.php?id=46293 */
|
||||
-/*!40014 SET FOREIGN_KEY_CHECKS=0 */;
|
||||
+SET FOREIGN_KEY_CHECKS=0;
|
||||
|
||||
ALTER TABLE `messages` DROP FOREIGN KEY `user_id_fk_messages`;
|
||||
ALTER TABLE `cache` DROP FOREIGN KEY `user_id_fk_cache`;
|
||||
@@ -117,7 +117,7 @@ CREATE TABLE `contactgroupmembers` (
|
||||
REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE ON UPDATE CASCADE
|
||||
) /*!40000 ENGINE=INNODB */;
|
||||
|
||||
-/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
|
||||
+SET FOREIGN_KEY_CHECKS=1;
|
||||
|
||||
-- Updates from version 0.4-beta
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-SQL_sqlite_initial_sql,v 1.2 2011/12/14 21:56:56 sthen Exp $
|
||||
|
||||
r5615: Fix broken CREATE INDEX queries in SQLite DDL files
|
||||
|
||||
--- SQL/sqlite.initial.sql.orig Wed Dec 14 21:27:21 2011
|
||||
+++ SQL/sqlite.initial.sql Wed Dec 14 21:27:50 2011
|
||||
@@ -147,7 +147,7 @@ CREATE TABLE searches (
|
||||
data text NOT NULL
|
||||
);
|
||||
|
||||
-CREATE UNIQUE INDEX ix_searches_user_type_name (user_id, type, name);
|
||||
+CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name);
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-SQL_sqlite_update_sql,v 1.2 2011/12/14 21:56:56 sthen Exp $
|
||||
|
||||
r5615: Fix broken CREATE INDEX queries in SQLite DDL files
|
||||
|
||||
--- SQL/sqlite.update.sql.orig Wed Dec 14 21:43:04 2011
|
||||
+++ SQL/sqlite.update.sql Wed Dec 14 21:43:16 2011
|
||||
@@ -246,7 +246,7 @@ CREATE TABLE searches (
|
||||
data text NOT NULL
|
||||
);
|
||||
|
||||
-CREATE UNIQUE INDEX ix_searches_user_type_name (user_id, type, name);
|
||||
+CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name);
|
||||
|
||||
DROP TABLE messages;
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
$OpenBSD: patch-installer_rcube_install_php,v 1.1 2011/12/14 21:56:56 sthen Exp $
|
||||
|
||||
r5614: update dropdown list in installer for updates
|
||||
|
||||
--- installer/rcube_install.php.orig Wed Dec 14 21:48:40 2011
|
||||
+++ installer/rcube_install.php Wed Dec 14 21:50:21 2011
|
||||
@@ -504,17 +504,25 @@ class rcube_install
|
||||
|
||||
return $out;
|
||||
}
|
||||
-
|
||||
+
|
||||
/**
|
||||
* Create a HTML dropdown to select a previous version of Roundcube
|
||||
*/
|
||||
function versions_select($attrib = array())
|
||||
{
|
||||
$select = new html_select($attrib);
|
||||
- $select->add(array('0.1-stable', '0.1.1', '0.2-alpha', '0.2-beta', '0.2-stable', '0.3-stable', '0.3.1', '0.4-beta', '0.4.2', '0.5-beta', '0.5', '0.5.1'));
|
||||
+ $select->add(array(
|
||||
+ '0.1-stable', '0.1.1',
|
||||
+ '0.2-alpha', '0.2-beta', '0.2-stable',
|
||||
+ '0.3-stable', '0.3.1',
|
||||
+ '0.4-beta', '0.4.2',
|
||||
+ '0.5-beta', '0.5', '0.5.1',
|
||||
+ '0.6-beta', '0.6',
|
||||
+ '0.7-beta', '0.7',
|
||||
+ ));
|
||||
return $select;
|
||||
}
|
||||
-
|
||||
+
|
||||
/**
|
||||
* Return a list with available subfolders of the skin directory
|
||||
*/
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.22 2011/12/14 15:24:45 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.23 2012/01/11 02:35:49 sthen Exp $
|
||||
roundcubemail/
|
||||
roundcubemail/.htaccess.dist
|
||||
@sample roundcubemail/.htaccess
|
||||
@ -17,19 +17,17 @@ roundcubemail/SQL/sqlite.initial.sql
|
||||
roundcubemail/SQL/sqlite.update.sql
|
||||
roundcubemail/UPGRADING
|
||||
roundcubemail/bin/
|
||||
@mode 700
|
||||
@owner root
|
||||
roundcubemail/bin/cleandb.sh
|
||||
roundcubemail/bin/decrypt.sh
|
||||
roundcubemail/bin/dumpschema.sh
|
||||
roundcubemail/bin/indexcontacts.sh
|
||||
roundcubemail/bin/installto.sh
|
||||
roundcubemail/bin/jsshrink.sh
|
||||
roundcubemail/bin/jsunshrink.sh
|
||||
roundcubemail/bin/makedoc.sh
|
||||
roundcubemail/bin/msgexport.sh
|
||||
roundcubemail/bin/msgimport.sh
|
||||
roundcubemail/bin/update.sh
|
||||
@mode
|
||||
@owner
|
||||
roundcubemail/config/
|
||||
roundcubemail/config/.htaccess
|
||||
roundcubemail/config/db.inc.php.dist
|
||||
@ -587,6 +585,7 @@ roundcubemail/program/include/rcube_browser.php
|
||||
roundcubemail/program/include/rcube_cache.php
|
||||
roundcubemail/program/include/rcube_config.php
|
||||
roundcubemail/program/include/rcube_contacts.php
|
||||
roundcubemail/program/include/rcube_content_filter.php
|
||||
roundcubemail/program/include/rcube_html_page.php
|
||||
roundcubemail/program/include/rcube_imap.php
|
||||
roundcubemail/program/include/rcube_imap_cache.php
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user