commit: 9ee4a9564863f1bcabd8750f26286aea5da5a28a
Author: Gunnar Wrobel <wrobel <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 16 08:00:03 2008 +0000
Commit: Pavlos Ratis <dastergon <AT> gentoo <DOT> org>
CommitDate: Tue Dec 16 08:00:03 2008 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kolab.git;a=commit;h=9ee4a956
The patch is not required anymore in the newer version.
svn path=/overlay/; revision=3012
---
dev-php/Horde_Auth/ChangeLog | 4 ++++
dev-php/Horde_Auth/Horde_Auth-0.1.1.ebuild | 7 -------
dev-php/Horde_Auth/Manifest | 5 ++---
.../Horde_Auth/files/HK-GW-Auth-Special_user_login.patch | 16 ----------------
4 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/dev-php/Horde_Auth/ChangeLog b/dev-php/Horde_Auth/ChangeLog
index bbc2e07..03d9851 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: $
+ 16 Dec 2008; Gunnar Wrobel <wro...@gentoo.org> Horde_Auth-0.1.1.ebuild,
+ -files/HK-GW-Auth-Special_user_login.patch:
+ The patch is not required anymore in the newer version.
+
16 Dec 2008; Gunnar Wrobel <wro...@gentoo.org> -Horde_Auth-0.1.0.ebuild,
+Horde_Auth-0.1.1.ebuild:
Update to Horde-Auth-0.1.1.
diff --git a/dev-php/Horde_Auth/Horde_Auth-0.1.1.ebuild
b/dev-php/Horde_Auth/Horde_Auth-0.1.1.ebuild
index c1e68ba..01cfa78 100644
--- a/dev-php/Horde_Auth/Horde_Auth-0.1.1.ebuild
+++ b/dev-php/Horde_Auth/Horde_Auth-0.1.1.ebuild
@@ -25,10 +25,3 @@ 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 4701577..601a0df 100644
--- a/dev-php/Horde_Auth/Manifest
+++ b/dev-php/Horde_Auth/Manifest
@@ -1,5 +1,4 @@
-AUX HK-GW-Auth-Special_user_login.patch 677 RMD160
e5b560d3577dab2529bcf86fad1bb8c7478ff976 SHA1
ef24e1e4d8fcd6fab31a5db125e83efb2e414827 SHA256
eaf5756817dbf17407d4166149e2df677bfe05432f2f4f7e0a61ecd5e595645c
DIST Auth-0.1.1.tgz 45610 RMD160 cc134304f0e42b7c58e243f634584c68f513afff SHA1
13f020291fba4ef2467a2095e9780576c6e91daa SHA256
198a2e5e500b063f49fa2b9009e639175cc3d7aeb57a1127ec2a1d8245ab3393
-EBUILD Horde_Auth-0.1.1.ebuild 663 RMD160
a1df386001cd70829f188dca420a05046c2f1747 SHA1
77e4d0f355323a1c14410ebbe22bec49814ceda3 SHA256
b018f18190aae46f03426bf418c404a6d5558c313e87a973c85f59628340a4f5
-MISC ChangeLog 586 RMD160 81ba020e3e02d4d2ce5804b54a00e4579960ca6d SHA1
eb24c62cc2e7708a764ff266f4f32050cdc53cdb SHA256
5b3d0e79dbd0aa8350292ed62d411738c1f212b2d724d9c1a0dfca68fae18e12
+EBUILD Horde_Auth-0.1.1.ebuild 552 RMD160
9de703ec97c9d8dbbb395a6d1462dc26381d9d7a SHA1
869fa8a08492d426af36ba2f484a8e451f679425 SHA256
fdd5b920a49684f7cb77c523bec9b2dfbe62417aa3f054c3878708898fa769aa
+MISC ChangeLog 765 RMD160 d20ae7a6a7fe9f8238f808864cbe14e3530cd504 SHA1
6aefde398324e2a8cca2ece8260616794f09b416 SHA256
48701895884c0b04233cbf5b72a084fdb97df0cc4bd64e6b8c84a91f42898a23
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
deleted file mode 100644
index 47014dd..0000000
--- a/dev-php/Horde_Auth/files/HK-GW-Auth-Special_user_login.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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');
