gunnar: server/pear/Horde_Auth HK-GW-Auth-Special_user_login.patch, NONE, 1.1 ChangeLog, 1.2, 1.3 Horde_Auth.spec, 1.3, 1.4 Makefile, 1.3, 1.4
cvs at kolab.org
cvs at kolab.org
Mon Sep 22 18:34:30 CEST 2008
Author: gunnar
Update of /kolabrepository/server/pear/Horde_Auth
In directory doto:/tmp/cvs-serv6636
Modified Files:
ChangeLog Horde_Auth.spec Makefile
Added Files:
HK-GW-Auth-Special_user_login.patch
Log Message:
Added a patch required to allow manager to log in for special tasks.
--- NEW FILE: HK-GW-Auth-Special_user_login.patch ---
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');
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Auth/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog 16 Sep 2008 13:00:57 -0000 1.2
+++ ChangeLog 22 Sep 2008 16:34:28 -0000 1.3
@@ -1,3 +1,8 @@
+2008-09-22 Gunnar Wrobel <p at rdus.de>
+
+ * Horde_Auth.spec: Added a patch required to allow "manager" to
+ log in for special tasks.
+
2008-09-16 Gunnar Wrobel <p at rdus.de>
* Horde_Auth.spec: Updated to Auth-0.1.0.
Index: Horde_Auth.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Auth/Horde_Auth.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Horde_Auth.spec 16 Sep 2008 13:00:57 -0000 1.3
+++ Horde_Auth.spec 22 Sep 2008 16:34:28 -0000 1.4
@@ -18,6 +18,9 @@
# 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}
@@ -62,6 +65,8 @@
%prep
%setup -n %{V_horde_package}-%{V_version}
+
+ %patch -p3 -P 0
%build
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Auth/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 16 Sep 2008 13:00:57 -0000 1.3
+++ Makefile 22 Sep 2008 16:34:28 -0000 1.4
@@ -17,6 +17,7 @@
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
@@ -34,6 +35,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
More information about the commits
mailing list