commit: 110b3f73439dc0b32e80ed8781341eaa2e414179 Author: Jakub Moc <jakub <AT> gentoo <DOT> org> AuthorDate: Fri Mar 7 10:57:38 2008 +0000 Commit: Pavlos Ratis <dastergon <AT> gentoo <DOT> org> CommitDate: Fri Mar 7 10:57:38 2008 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapps-experimental.git;a=commit;h=110b3f73
mail-client/roundcube: Nuke check for sockets wrt http://trac.roundcube.net/ticket/1484834 svn path=/experimental/; revision=845 --- mail-client/roundcube/ChangeLog | 4 ++ mail-client/roundcube/Manifest | 5 +- .../files/roundcube-0.1-no-sockets-check.patch | 72 ++++++++++++++++++++++ mail-client/roundcube/roundcube-0.1.ebuild | 11 ++-- 4 files changed, 85 insertions(+), 7 deletions(-) diff --git a/mail-client/roundcube/ChangeLog b/mail-client/roundcube/ChangeLog index cf2f829..5c042ed 100644 --- a/mail-client/roundcube/ChangeLog +++ b/mail-client/roundcube/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 07 Mar 2008; Jakub Moc <ja...@gentoo.org> + +files/roundcube-0.1-no-sockets-check.patch, roundcube-0.1.ebuild: + Nuke check for sockets wrt http://trac.roundcube.net/ticket/1484834 + 04 Mar 2008; Jakub Moc <ja...@gentoo.org> files/postinstall-en.txt, -roundcube-0.1_rc1.ebuild, -roundcube-0.1_rc2.ebuild, +roundcube-0.1.ebuild: Version bump to 0.1 final; drop PEAR dependencies are they are now bundled diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest index ee272b9..42e7627 100644 --- a/mail-client/roundcube/Manifest +++ b/mail-client/roundcube/Manifest @@ -1,5 +1,6 @@ AUX postinstall-en.txt 2513 RMD160 c2a04efcdd4007642221797a10877c2fc57ad874 SHA1 8bc888b2944694bbbadeddfe6f193c3a8a995a87 SHA256 5c1fa9d43f29158521188aae417654f968fb41662c46721b8183728df37eb4c4 +AUX roundcube-0.1-no-sockets-check.patch 2435 RMD160 1d03b74d38693edc6f816f2e34422d2b46442751 SHA1 62a5d11dc2bb437543eb449e4e6f4014a95c3ccf SHA256 3075384ee99ce0b5f0077b6a56e2a140afb00af6e12d6e32863ec14d03cd8696 DIST roundcubemail-0.1.tar.gz 1406854 RMD160 225b3a37c70bcf3b471b7d650233aec30dae2f76 SHA1 8b5b516b41bad98c3bbaf0da0e70b0db82580424 SHA256 ea4f4b23b9a20308cc0b1fef3b7301700c9ce4544189007bc62756e8d5f67051 -EBUILD roundcube-0.1.ebuild 2716 RMD160 0fbf4f2bf1885e8c735c4e639161592d6d3f1050 SHA1 cb44d75cc6c870096392b1b46486cabe31cb3ef6 SHA256 b9e54e3daa3157aba584e46f4f6dff27bac90278fb261a622e31d7b164314287 -MISC ChangeLog 1296 RMD160 0a4e900dab53bea9b7f878d2a52918005ac512a6 SHA1 099bd3cfd98c3fbc7377fd4ca5921233850ce263 SHA256 1dd26ed4a53d53235672252354f8c43570491cb8c3fb3a7ffade0ff50fb8eb1f +EBUILD roundcube-0.1.ebuild 2754 RMD160 a3a6a933b79881d6eb0fbc8e6c4c78e9e3e63a13 SHA1 f63a4ddea99fd306eef8af6f1e0881f1d5edc5ed SHA256 87a066609833ec391a3cd461e24bb1fb803389108c2c7e06e123f61ef31a6c31 +MISC ChangeLog 1480 RMD160 89abfa82bf083319ff5161e4f4bd982ebede682f SHA1 f6892413ee683067de4bc2eb1ade793623dcb7fe SHA256 a73bc59bed0f28481aed9c757328b0f65b8673d314c19cf55bc5f1585edb6fa1 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 diff --git a/mail-client/roundcube/files/roundcube-0.1-no-sockets-check.patch b/mail-client/roundcube/files/roundcube-0.1-no-sockets-check.patch new file mode 100644 index 0000000..69bd563 --- /dev/null +++ b/mail-client/roundcube/files/roundcube-0.1-no-sockets-check.patch @@ -0,0 +1,72 @@ +http://trac.roundcube.net/changeset/1186 +http://trac.roundcube.net/ticket/1484834 +Index: /trunk/roundcubemail/installer/check.php +=================================================================== +--- installer/check.php (revision 1169) ++++ installer/check.php (revision 1186) +@@ -2,5 +2,5 @@ + <?php + +-$required_php_exts = array('PCRE' => 'pcre', 'Session' => 'session', 'Sockets' => 'sockets'); ++$required_php_exts = array('PCRE' => 'pcre', 'Session' => 'session'); + + $optional_php_exts = array('FileInfo' => 'fileinfo', 'Libiconv' => 'iconv', +@@ -66,5 +66,5 @@ + ?> + +-<p class="hint">These extensions are <em>optional</em> but recommended to get the best performance:</p> ++<p class="hint">The next couple of extensions are <em>optional</em> but recommended to get the best performance:</p> + <?php + +Index: /trunk/roundcubemail/installer/test.php +=================================================================== +--- installer/test.php (revision 1171) ++++ installer/test.php (revision 1186) +@@ -32,9 +32,36 @@ + ?> + ++<h3>Check if directories are writable</h3> ++<p>RoundCube may need to write/save files into these directories</p> ++<?php ++ ++if ($RCI->configured) { ++ $pass = false; ++ foreach (array($RCI->config['temp_dir'],$RCI->config['log_dir']) as $dir) { ++ $dirpath = $dir{0} == '/' ? $dir : $docroot . '/' . $dir; ++ if (is_writable(realpath($dirpath))) { ++ $RCI->pass($dir); ++ $pass = true; ++ } ++ else { ++ $RCI->fail($dir, 'not writeable for the webserver'); ++ } ++ echo '<br />'; ++ } ++ ++ if (!$pass) ++ echo '<p class="hint">Use <tt>chmod</tt> or <tt>chown</tt> to grant write privileges to the webserver</p>'; ++} ++else { ++ $RCI->fail('Config', 'Could not read config files'); ++} ++ ++?> ++ + <h3>Check configured database settings</h3> + <?php + + $db_working = false; +-if (!empty($RCI->config)) { ++if ($RCI->configured) { + if (!empty($RCI->config['db_backend']) && !empty($RCI->config['db_dsnw'])) { + +Index: /trunk/roundcubemail/installer/welcome.html +=================================================================== +--- installer/welcome.html (revision 1162) ++++ installer/welcome.html (revision 1186) +@@ -11,5 +11,4 @@ + <li>PCRE (perl compatible regular expression)</li> + <li>Session support</li> +- <li>Sockets enabled</li> + <li>Libiconv (recommended)</li> + <li>OpenSSL (recommended)</li> diff --git a/mail-client/roundcube/roundcube-0.1.ebuild b/mail-client/roundcube/roundcube-0.1.ebuild index cf946bf..eed85f4 100644 --- a/mail-client/roundcube/roundcube-0.1.ebuild +++ b/mail-client/roundcube/roundcube-0.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit webapp depend.php depend.apache +inherit eutils webapp depend.php depend.apache MY_PN="${PN}mail" MY_P="${MY_PN}-${PV}" @@ -23,7 +23,7 @@ need_php_httpd S="${WORKDIR}/${MY_P}" pkg_setup() { - local flags="crypt iconv imap pcre session sockets unicode" + local flags="crypt iconv imap pcre session unicode" use ldap && flags="${flags} ldap" use ssl && flags="${flags} ssl" use spell && flags="${flags} curl ssl" @@ -62,9 +62,10 @@ pkg_setup() { src_unpack() { unpack ${A} - cd "${S}"/config - mv db.inc.php.dist db.inc.php - mv main.inc.php.dist main.inc.php + cd "${S}" + epatch "${FILESDIR}"/${P}-no-sockets-check.patch + mv config/db.inc.php{.dist,} + mv config/main.inc.php{.dist,} } src_install () {
