Branch '2.3-stable' - 2 commits - pear/kolab-webadmin

Christoph Wickert wickert at kolabsys.com
Wed Jun 1 13:30:04 CEST 2011


 pear/kolab-webadmin/Makefile                                              |    2 
 pear/kolab-webadmin/kolab-webadmin.spec                                   |   13 -
 pear/kolab-webadmin/package.info                                          |    5 
 pear/kolab-webadmin/templates/kolab-webadmin-2.3.1/webadmin.conf.template |  117 ----------
 pear/kolab-webadmin/templates/webadmin.conf.template                      |  117 ++++++++++
 5 files changed, 131 insertions(+), 123 deletions(-)

New commits:
commit a08788386ebf05f9a978218ffd711937934e8be3
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Jun 1 13:29:54 2011 +0200

    kolab-webadmin: Update to 2.3.2

diff --git a/pear/kolab-webadmin/kolab-webadmin.spec b/pear/kolab-webadmin/kolab-webadmin.spec
index 424454d..3539d38 100644
--- a/pear/kolab-webadmin/kolab-webadmin.spec
+++ b/pear/kolab-webadmin/kolab-webadmin.spec
@@ -6,8 +6,8 @@
 %define         V_package_origin WGET
 %define         V_repo_commit 
 %define         V_repo_release 
-%define         V_version 2.3.1
-%define         V_release 20110428
+%define         V_version 2.3.2
+%define         V_release 20110601
 %define         V_sourceurl http://files.kolab.org/server/development-2.3/sources
 %define         V_php_lib_loc php
 %define         V_summary A frontend for the Kolab user database.
@@ -96,3 +96,12 @@ Kolab user database stored in LDAP.
 	rm -rf $RPM_BUILD_ROOT
 
 %files -f files
+
+* Wed Jun 01 2011 Christoph Wickert <wickert at kolabsys.com> - 2.3.2-20110601
+- Update to 2.3.2
+
+* Thu Apr 28 2011 Christoph Wickert <wickert at kolabsys.com> - 2.3.1-20110428
+- Update to 2.3.1
+
+* Thu Apr 14 2011 Christoph Wickert <wickert at kolabsys.com> - 2.3.0-20110414
+- Update to 2.3.0
diff --git a/pear/kolab-webadmin/package.info b/pear/kolab-webadmin/package.info
index 54ff1c5..07b64c5 100644
--- a/pear/kolab-webadmin/package.info
+++ b/pear/kolab-webadmin/package.info
@@ -13,14 +13,13 @@ package_url='http://pear.horde.org/index.php?package='
 package_origin='WGET'
 
 # Version number
-version='2.3.1'
+version='2.3.2'
 
 # Package release number
-release='20110428'
+release='20110601'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/server/development-2.3/sources'
-#sourceurl='http://files.kolab.org/incoming/wickert/2.3.1pre/'
 
 # In which PHP library location should the library get installed
 php_lib_loc='php'
diff --git a/pear/kolab-webadmin/templates/kolab-webadmin-2.3.1/webadmin.conf.template b/pear/kolab-webadmin/templates/kolab-webadmin-2.3.1/webadmin.conf.template
deleted file mode 100644
index c499d46..0000000
--- a/pear/kolab-webadmin/templates/kolab-webadmin-2.3.1/webadmin.conf.template
+++ /dev/null
@@ -1,117 +0,0 @@
-KOLAB_META_START
-TARGET=@@@phplibdir@@@/KolabAdmin/include/config.php
-PERMISSIONS=0640
-OWNERSHIP=@@@webserver_musr@@@:@@@webserver_grp@@@
-KOLAB_META_END
-<?php
-@@@warning@@@
-
-/**
- * (c) 2005 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
- * (c) 2004 Klarälvdalens Datakonsult AB
- * (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
- * (c) 2003 Martin Konold <martin.konold at erfrakon.de>
- *
- *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
- *
- *  This  program is free  software; you can redistribute  it and/or
- *  modify it  under the terms of the GNU  General Public License as
- *  published by the  Free Software Foundation; either version 2, or
- *  (at your option) any later version.
- *
- *  This program is  distributed in the hope that it will be useful,
- *  but WITHOUT  ANY WARRANTY; without even the  implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  General Public License for more details.
- *
- *  You can view the  GNU General Public License, online, at the GNU
- *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
- */
-
-$topdir = '/@@@kolab_php_module_prefix@@@admin';
-$kolab_prefix = '@@@prefix@@@';
-$php_dir      = '@@@phplibdir@@@';
-$locale_dir   = "$php_dir/data/KolabAdmin/locale/";
-$smarty_compiledir = '@@@smarty_compiledir@@@/';
-
-require_once('@@@kolab_php_smarty_prefix@@@/Smarty.class.php');
-
-$webserver_web_prefix = '@@@webserver_web_prefix@@@';
-
-$WITHOPENPKG = '@@@WITHOPENPKG@@@';
-$RPM = '@@@RPM@@@';
-$kolab_pkgs = '@@@kolab_pkgs@@@';
-$pear_horde_pkgs = '@@@pear_horde_pkgs@@@';
-$kolabversion = '2.3.1';
-
-/*
- * Session variables fetched from LDAP
- *
- * TODO(steffen): Make those variables non-session variables.
- * We dont really need to store those in the session,
- * since we source this file on every invokation anyway.
- */
-
- at session_start();
-
-$_SESSION['fqdnhostname'] = "@@@fqdnhostname@@@";
-$_SESSION['ldap_master_uri'] = "@@@ldap_master_uri@@@";
-$_SESSION['base_dn'] = "@@@base_dn@@@";
-$_SESSION['php_dn'] = "@@@php_dn@@@";
-$_SESSION['php_pw'] = "@@@php_pw@@@";
-
-
-/***********************************************************************
- * Global config
- */
-
-$params = array();
-
-/*
- * Entry location of the web admin user interface.
- */
-$params['kolab_wui'] = '@@@kolab_wui@@@';
-
-/*
- * Which user classes can log in to the webgui?
- * Currently 4 user classes exist: user, admin, maintainer and manager
- */
-$params['allow_user_classes'] = array( 'user', 'admin', 'maintainer', 'manager', 'domain-maintainer' );
-
-/*
- * Array to configure visibility/access of LDAP attributes to user's account object
- *
- * Possible values for attribute is 
- *
- * 'ro' (readonly)
- * 'rw' (read/write)
- * 'hidden' (atribute removed from display)
- * 'mandatory' (read/write and must not be empty)
- *
- * If an attribute is not in this array, it defaults to 'rw'
- *
- * Note, attributes correspond to form attribute names and not LDAP attribute names.
- *
- * TODO(steffen): Make form and LDAP attributes the same.
- */
-
-$params['attribute_access'] = array(
-			 /*
-                         // Examples
-			 'firstname'  => 'ro',
-			 'lastname'   => 'ro',
-			 'password'   => 'rw',
-			 'mail'       => 'ro',
-			 'uid'        => 'ro',
-			 'title'      => 'ro',
-			 'roomNumber' => 'mandatory',
-			 'kolabdelegate'  => 'ro',
-			 'telephoneNumber' => 'hidden'
-			 */
-);
-
-/**
- * Hide section administrative email addresses (hostmaster at ..., postmaster at ...)
- * in the "Settings" section.
- */
-define('HIDE_ADMINISTRATIVE_EMAILSETTINGS', false);


commit 12a9a15aafe8772dcac48a2f0f3e99bbfb096443
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Jun 1 13:29:14 2011 +0200

    kolab-webadmin: Move template into unversioned directory so we actually see the changes in the VCS

diff --git a/pear/kolab-webadmin/Makefile b/pear/kolab-webadmin/Makefile
index 2d16367..e9ef118 100644
--- a/pear/kolab-webadmin/Makefile
+++ b/pear/kolab-webadmin/Makefile
@@ -2,6 +2,6 @@ SPEC_PRESENT = yes
 include ../../make-helper/pear.mk
 
 # Get the list of templates if there are any in the template directory
-TEMPLATES = $(shell ls templates/$(PACKAGE)-$(VERSION)/*.template 2> /dev/null)
+TEMPLATES = $(shell ls templates/*.template 2> /dev/null)
 
 EXTRA = package.patch $(TEMPLATES)
diff --git a/pear/kolab-webadmin/templates/webadmin.conf.template b/pear/kolab-webadmin/templates/webadmin.conf.template
new file mode 100644
index 0000000..c499d46
--- /dev/null
+++ b/pear/kolab-webadmin/templates/webadmin.conf.template
@@ -0,0 +1,117 @@
+KOLAB_META_START
+TARGET=@@@phplibdir@@@/KolabAdmin/include/config.php
+PERMISSIONS=0640
+OWNERSHIP=@@@webserver_musr@@@:@@@webserver_grp@@@
+KOLAB_META_END
+<?php
+@@@warning@@@
+
+/**
+ * (c) 2005 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ * (c) 2004 Klarälvdalens Datakonsult AB
+ * (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+ * (c) 2003 Martin Konold <martin.konold at erfrakon.de>
+ *
+ *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ *
+ *  This  program is free  software; you can redistribute  it and/or
+ *  modify it  under the terms of the GNU  General Public License as
+ *  published by the  Free Software Foundation; either version 2, or
+ *  (at your option) any later version.
+ *
+ *  This program is  distributed in the hope that it will be useful,
+ *  but WITHOUT  ANY WARRANTY; without even the  implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ *  General Public License for more details.
+ *
+ *  You can view the  GNU General Public License, online, at the GNU
+ *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+ */
+
+$topdir = '/@@@kolab_php_module_prefix@@@admin';
+$kolab_prefix = '@@@prefix@@@';
+$php_dir      = '@@@phplibdir@@@';
+$locale_dir   = "$php_dir/data/KolabAdmin/locale/";
+$smarty_compiledir = '@@@smarty_compiledir@@@/';
+
+require_once('@@@kolab_php_smarty_prefix@@@/Smarty.class.php');
+
+$webserver_web_prefix = '@@@webserver_web_prefix@@@';
+
+$WITHOPENPKG = '@@@WITHOPENPKG@@@';
+$RPM = '@@@RPM@@@';
+$kolab_pkgs = '@@@kolab_pkgs@@@';
+$pear_horde_pkgs = '@@@pear_horde_pkgs@@@';
+$kolabversion = '2.3.1';
+
+/*
+ * Session variables fetched from LDAP
+ *
+ * TODO(steffen): Make those variables non-session variables.
+ * We dont really need to store those in the session,
+ * since we source this file on every invokation anyway.
+ */
+
+ at session_start();
+
+$_SESSION['fqdnhostname'] = "@@@fqdnhostname@@@";
+$_SESSION['ldap_master_uri'] = "@@@ldap_master_uri@@@";
+$_SESSION['base_dn'] = "@@@base_dn@@@";
+$_SESSION['php_dn'] = "@@@php_dn@@@";
+$_SESSION['php_pw'] = "@@@php_pw@@@";
+
+
+/***********************************************************************
+ * Global config
+ */
+
+$params = array();
+
+/*
+ * Entry location of the web admin user interface.
+ */
+$params['kolab_wui'] = '@@@kolab_wui@@@';
+
+/*
+ * Which user classes can log in to the webgui?
+ * Currently 4 user classes exist: user, admin, maintainer and manager
+ */
+$params['allow_user_classes'] = array( 'user', 'admin', 'maintainer', 'manager', 'domain-maintainer' );
+
+/*
+ * Array to configure visibility/access of LDAP attributes to user's account object
+ *
+ * Possible values for attribute is 
+ *
+ * 'ro' (readonly)
+ * 'rw' (read/write)
+ * 'hidden' (atribute removed from display)
+ * 'mandatory' (read/write and must not be empty)
+ *
+ * If an attribute is not in this array, it defaults to 'rw'
+ *
+ * Note, attributes correspond to form attribute names and not LDAP attribute names.
+ *
+ * TODO(steffen): Make form and LDAP attributes the same.
+ */
+
+$params['attribute_access'] = array(
+			 /*
+                         // Examples
+			 'firstname'  => 'ro',
+			 'lastname'   => 'ro',
+			 'password'   => 'rw',
+			 'mail'       => 'ro',
+			 'uid'        => 'ro',
+			 'title'      => 'ro',
+			 'roomNumber' => 'mandatory',
+			 'kolabdelegate'  => 'ro',
+			 'telephoneNumber' => 'hidden'
+			 */
+);
+
+/**
+ * Hide section administrative email addresses (hostmaster at ..., postmaster at ...)
+ * in the "Settings" section.
+ */
+define('HIDE_ADMINISTRATIVE_EMAILSETTINGS', false);





More information about the commits mailing list