From 90ab8a6c5450c64a33f1eb79ea2d6805e3098292 Mon Sep 17 00:00:00 2001 From: Torsten Kurbad Date: Tue, 30 Oct 2012 21:34:10 +0100 Subject: [PATCH] Updated compatibility patch --- .../squirrelmail-1.5.2_p20121030-compatibility.patch | 11 +++++++++++ .../squirrelmail/squirrelmail-1.5.2_p20121030.ebuild | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 mail-client/squirrelmail/files/squirrelmail-1.5.2_p20121030-compatibility.patch diff --git a/mail-client/squirrelmail/files/squirrelmail-1.5.2_p20121030-compatibility.patch b/mail-client/squirrelmail/files/squirrelmail-1.5.2_p20121030-compatibility.patch new file mode 100644 index 0000000..b1d4633 --- /dev/null +++ b/mail-client/squirrelmail/files/squirrelmail-1.5.2_p20121030-compatibility.patch @@ -0,0 +1,11 @@ +--- squirrelmail.devel/functions/strings.php.orig 2012-04-01 22:09:11.000000000 +0200 ++++ squirrelmail.devel/functions/strings.php 2012-10-30 21:31:01.231496016 +0100 +@@ -12,6 +12,8 @@ + * @package squirrelmail + */ + ++include_once(SM_PATH . 'plugins/compatibility/functions.php'); ++ + /** + * Appends citation markers to the string. + * Also appends a trailing space. diff --git a/mail-client/squirrelmail/squirrelmail-1.5.2_p20121030.ebuild b/mail-client/squirrelmail/squirrelmail-1.5.2_p20121030.ebuild index 0cf5688..992fe49 100644 --- a/mail-client/squirrelmail/squirrelmail-1.5.2_p20121030.ebuild +++ b/mail-client/squirrelmail/squirrelmail-1.5.2_p20121030.ebuild @@ -92,11 +92,11 @@ src_unpack() { src_prepare() { cd "${S}" + epatch "${FILESDIR}/${P}-compatibility.patch + sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" \ config/config.php || die - epatch "${S}"/plugins/compatibility/patches/compatibility_patch-1.5.0.diff - cd "${S}/plugins" || die if use ldap; then epatch "${FILESDIR}"/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch