diff options
author | Eray Aslan <eras@gentoo.org> | 2011-08-18 06:17:48 +0000 |
---|---|---|
committer | Eray Aslan <eras@gentoo.org> | 2011-08-18 06:17:48 +0000 |
commit | 5d8f85982b4c88e3afbbe576b74defc330334bda (patch) | |
tree | 261549482d8974528d42bdbff1154e48f86c8dd3 /mail-client/squirrelmail | |
parent | Version bump. (diff) | |
download | gentoo-2-5d8f85982b4c88e3afbbe576b74defc330334bda.tar.gz gentoo-2-5d8f85982b4c88e3afbbe576b74defc330334bda.tar.bz2 gentoo-2-5d8f85982b4c88e3afbbe576b74defc330334bda.zip |
QA - bug #379629
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'mail-client/squirrelmail')
-rw-r--r-- | mail-client/squirrelmail/ChangeLog | 5 | ||||
-rw-r--r-- | mail-client/squirrelmail/squirrelmail-1.4.22.ebuild | 22 |
2 files changed, 17 insertions, 10 deletions
diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog index c0a20d51736f..f7e59a0b0b96 100644 --- a/mail-client/squirrelmail/ChangeLog +++ b/mail-client/squirrelmail/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for mail-client/squirrelmail # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.160 2011/07/13 18:50:27 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.161 2011/08/18 06:17:48 eras Exp $ + + 18 Aug 2011; Eray Aslan <eras@gentoo.org> squirrelmail-1.4.22.ebuild: + QA - bug #379629 *squirrelmail-1.4.22 (13 Jul 2011) diff --git a/mail-client/squirrelmail/squirrelmail-1.4.22.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.22.ebuild index 6fa21fa74074..a5a3c4ef5fa1 100644 --- a/mail-client/squirrelmail/squirrelmail-1.4.22.ebuild +++ b/mail-client/squirrelmail/squirrelmail-1.4.22.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.22.ebuild,v 1.1 2011/07/13 18:50:27 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.22.ebuild,v 1.2 2011/08/18 06:17:48 eras Exp $ EAPI=2 @@ -59,14 +59,9 @@ src_unpack() { mv config/config_default.php config/config.php || die - sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" \ - config/config.php || die - # Now do the plugins cd "${S}/plugins" || die - sed -i 's:/usr/games/fortune:/usr/bin/fortune:g' fortune/setup.php || die "Unable to fix fortunes plugin." - unpack compatibility-${COMPATIBILITY_VER}.tar.gz unpack admin_add.${ADMINADD_VER}.tar.gz @@ -78,9 +73,7 @@ src_unpack() { mv amavisnewsql/config.php.dist amavisnewsql/config.php use ldap && - unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz && - epatch "${FILESDIR}"/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch && - mv ldapuserdata/config_sample.php ldapuserdata/config.php + unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz use ssl && unpack secure_login-${SECURELOGIN_VER}.tar.gz && @@ -93,6 +86,17 @@ src_unpack() { unpack all_locales-${LOCALES_VER}.tar.bz2 } +src_prepare() { + sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" \ + config/config.php || die + + cd "${S}/plugins" || die + if use ldap; then + epatch "${FILESDIR}"/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch + mv ldapuserdata/config_sample.php ldapuserdata/config.php || die + fi +} + src_configure() { #we need to have this empty function ... echo "Nothing to configure" |