summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@gentoo.org>2008-09-29 12:39:10 +0000
committerGunnar Wrobel <wrobel@gentoo.org>2008-09-29 12:39:10 +0000
commitbe51f8a442de873a81c93c7d29a4df070e438c4f (patch)
tree2b592bd2ed13b24826814c2ec3c6ae565256492c
parentFixed license information (diff)
downloadkolab-be51f8a442de873a81c93c7d29a4df070e438c4f.tar.gz
kolab-be51f8a442de873a81c93c7d29a4df070e438c4f.tar.bz2
kolab-be51f8a442de873a81c93c7d29a4df070e438c4f.zip
An additional patch is needed on the Horde_Auth package.
svn path=/overlay/; revision=2961
-rw-r--r--dev-php/Horde_Auth/ChangeLog4
-rw-r--r--dev-php/Horde_Auth/Horde_Auth-0.1.0.ebuild7
-rw-r--r--dev-php/Horde_Auth/Manifest5
-rw-r--r--dev-php/Horde_Auth/files/HK-GW-Auth-Special_user_login.patch16
4 files changed, 30 insertions, 2 deletions
diff --git a/dev-php/Horde_Auth/ChangeLog b/dev-php/Horde_Auth/ChangeLog
index 42eaab6..fbd90ca 100644
--- a/dev-php/Horde_Auth/ChangeLog
+++ b/dev-php/Horde_Auth/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 29 Sep 2008; wrobel@gentoo.org +files/HK-GW-Auth-Special_user_login.patch,
+ Horde_Auth-0.1.0.ebuild:
+ An additional patch is needed on the Horde_Auth package.
+
16 Sep 2008; wrobel@gentoo.org ++, -Horde_Auth-0.0.3.20080912.ebuild:
Updated to Horde_Auth-0.1.0.
diff --git a/dev-php/Horde_Auth/Horde_Auth-0.1.0.ebuild b/dev-php/Horde_Auth/Horde_Auth-0.1.0.ebuild
index 01cfa78..c1e68ba 100644
--- a/dev-php/Horde_Auth/Horde_Auth-0.1.0.ebuild
+++ b/dev-php/Horde_Auth/Horde_Auth-0.1.0.ebuild
@@ -25,3 +25,10 @@ DEPEND="dev-php/PEAR-Horde-Channel
RDEPEND="${DEPEND}"
S="${WORKDIR}/${PEAR_PN}"
+
+src_unpack() {
+
+ unpack ${A} && cd "${S}"
+
+ epatch "${FILESDIR}"/HK-GW-Auth-Special_user_login.patch
+}
diff --git a/dev-php/Horde_Auth/Manifest b/dev-php/Horde_Auth/Manifest
index d54b463..0d03875 100644
--- a/dev-php/Horde_Auth/Manifest
+++ b/dev-php/Horde_Auth/Manifest
@@ -1,4 +1,5 @@
+AUX HK-GW-Auth-Special_user_login.patch 677 RMD160 e5b560d3577dab2529bcf86fad1bb8c7478ff976 SHA1 ef24e1e4d8fcd6fab31a5db125e83efb2e414827 SHA256 eaf5756817dbf17407d4166149e2df677bfe05432f2f4f7e0a61ecd5e595645c
DIST Auth-0.1.0.tgz 41894 RMD160 47060f3df37bc4a78a9bfa7c41a69846165862bc SHA1 35171213ee8f7855b190f8935c1f2b5b3fe79add SHA256 b958654932475849c4251e57a4a64adb5787b6cacc4bbc12b48af98ec09ccf2f
-EBUILD Horde_Auth-0.1.0.ebuild 552 RMD160 9de703ec97c9d8dbbb395a6d1462dc26381d9d7a SHA1 869fa8a08492d426af36ba2f484a8e451f679425 SHA256 fdd5b920a49684f7cb77c523bec9b2dfbe62417aa3f054c3878708898fa769aa
-MISC ChangeLog 288 RMD160 dc8ea1ff0f072a7ec070b9ba29af2a71207ce761 SHA1 9319177f6ccf0c41ee87c3d8e7fa13d1963a8cd4 SHA256 8313ba835b4be16beb409f67686fe7c9d775a47e0045503a2be184ce3ef80cb6
+EBUILD Horde_Auth-0.1.0.ebuild 663 RMD160 a1df386001cd70829f188dca420a05046c2f1747 SHA1 77e4d0f355323a1c14410ebbe22bec49814ceda3 SHA256 b018f18190aae46f03426bf418c404a6d5558c313e87a973c85f59628340a4f5
+MISC ChangeLog 452 RMD160 12870365d2d488f241ac10142876cfea65b476bc SHA1 bc6f0fee04ce60e9d178018fa38a6d2de4506e70 SHA256 cf615991a5ded45b524a600868c4464de02c69b2ef403ee7dab1c0fe06a11343
MISC metadata.xml 255 RMD160 00d1bf05efc8050697b679c64d4992fae7bf6145 SHA1 5988787daa740dee18325bf78b25c044877e25a2 SHA256 1d7904c945fbe3d9946d23bcd9f1b00ac8c94700c9121955d71a0301016cb968
diff --git a/dev-php/Horde_Auth/files/HK-GW-Auth-Special_user_login.patch b/dev-php/Horde_Auth/files/HK-GW-Auth-Special_user_login.patch
new file mode 100644
index 0000000..47014dd
--- /dev/null
+++ b/dev-php/Horde_Auth/files/HK-GW-Auth-Special_user_login.patch
@@ -0,0 +1,16 @@
+diff -r cf94ea7d6215 framework/Auth/Auth/kolab.php
+--- a/framework/Auth/Auth/kolab.php Mon Sep 22 15:16:08 2008 +0200
++++ b/framework/Auth/Auth/kolab.php Mon Sep 22 17:53:35 2008 +0200
+@@ -154,7 +154,11 @@
+ if (is_a($user, 'PEAR_Error')) {
+ return $user;
+ }
+- if (!is_a($user, 'Horde_Kolab_Server_Object_user')) {
++
++ global $conf;
++
++ if (empty($conf['kolab']['misc']['allow_special'])
++ && !is_a($user, 'Horde_Kolab_Server_Object_user')) {
+ return PEAR::raiseError(_('User is not a standard Kolab user.'));
+ }
+ $result = $user->getServer('imap');