summaryrefslogtreecommitdiff
path: root/pear
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2008-09-22 16:34:28 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2008-09-22 16:34:28 (GMT)
commitdea725b0c4be3affce9ca38a339c3a3a008a73eb (patch)
tree87cb63ef9a6e4e798ce25ccb02a2b5526b00f7bb /pear
parent2dc6932efa98a418aea2a0d444b4fe72273155c1 (diff)
downloadserver-dea725b0c4be3affce9ca38a339c3a3a008a73eb.tar.gz
Added a patch required to allow manager to log in for special tasks.
Diffstat (limited to 'pear')
-rw-r--r--pear/Horde_Auth/ChangeLog5
-rw-r--r--pear/Horde_Auth/HK-GW-Auth-Special_user_login.patch16
-rw-r--r--pear/Horde_Auth/Horde_Auth.spec5
-rw-r--r--pear/Horde_Auth/Makefile3
4 files changed, 29 insertions, 0 deletions
diff --git a/pear/Horde_Auth/ChangeLog b/pear/Horde_Auth/ChangeLog
index 5dbf934..21830bd 100644
--- a/pear/Horde_Auth/ChangeLog
+++ b/pear/Horde_Auth/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-22 Gunnar Wrobel <p@rdus.de>
+
+ * Horde_Auth.spec: Added a patch required to allow "manager" to
+ log in for special tasks.
+
2008-09-16 Gunnar Wrobel <p@rdus.de>
* Horde_Auth.spec: Updated to Auth-0.1.0.
diff --git a/pear/Horde_Auth/HK-GW-Auth-Special_user_login.patch b/pear/Horde_Auth/HK-GW-Auth-Special_user_login.patch
new file mode 100644
index 0000000..47014dd
--- /dev/null
+++ b/pear/Horde_Auth/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');
diff --git a/pear/Horde_Auth/Horde_Auth.spec b/pear/Horde_Auth/Horde_Auth.spec
index 9e88e13..312c6af 100644
--- a/pear/Horde_Auth/Horde_Auth.spec
+++ b/pear/Horde_Auth/Horde_Auth.spec
@@ -18,6 +18,9 @@ Distribution: OpenPKG
# List of Sources
Source: http://pear.horde.org/get/%{V_horde_package}-%{V_version}.tgz
+# List of patches
+Patch0: HK-GW-Auth-Special_user_login.patch
+
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
@@ -63,6 +66,8 @@ contains implementations for:
%prep
%setup -n %{V_horde_package}-%{V_version}
+ %patch -p3 -P 0
+
%build
%install
diff --git a/pear/Horde_Auth/Makefile b/pear/Horde_Auth/Makefile
index a61f835..787815d 100644
--- a/pear/Horde_Auth/Makefile
+++ b/pear/Horde_Auth/Makefile
@@ -17,6 +17,7 @@ ifeq "x$(KOLABRPMTMP)" "x"
endif
SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
+PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -35,6 +36,8 @@ $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
+ for PATCH in $(PATCHES); do cp "$$PATCH" $(KOLABRPMSRC)/$(PACKAGE); done
+
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec