rpms/phpldapadmin/F-11 phpldapadmin-1.2.0.3-config.patch, NONE, 1.1 phpldapadmin.spec, 1.18, 1.19 sources, 1.11, 1.12 phpldapadmin-1.1.0.5-config.patch, 1.1, NONE

[Dmitry Butskoy]

Author: buc

Update of /cvs/extras/rpms/phpldapadmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23193

Modified Files:
	phpldapadmin.spec sources 
Added Files:
	phpldapadmin-1.2.0.3-config.patch 
Removed Files:
	phpldapadmin-1.1.0.5-config.patch 
Log Message:
Upgrade to 1.2.0.4



phpldapadmin-1.2.0.3-config.patch:
 config.php |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE phpldapadmin-1.2.0.3-config.patch ---
diff -Nrbu phpldapadmin-1.2.0.3/config/config.php phpldapadmin-1.2.0.3-OK/config/config.php
--- phpldapadmin-1.2.0.3/config/config.php	2009-09-16 17:50:36.000000000 +0400
+++ phpldapadmin-1.2.0.3-OK/config/config.php	2009-09-16 17:48:19.000000000 +0400
@@ -72,6 +72,11 @@
    30 seconds or the setting of max_exection_time if this is null. */
 // $config->custom->session['timelimit'] = 30;
 
+// $config->custom->appearance['show_clear_password'] = false;
+
+// $config->custom->search['size_limit'] = 50;
+#  $config->custom->search['size_limit'] = 1000;
+
 /* Our local timezone
    This is to make sure that when we ask the system for the current time, we
    get the right local time. If this is not set, all time() calculations will
@@ -265,7 +270,7 @@
 
 /* A convenient name that will appear in the tree viewer and throughout
    phpLDAPadmin to identify this LDAP server to users. */
-$servers->setValue('server','name','My LDAP Server');
+$servers->setValue('server','name','Local LDAP Server');
 
 /* Examples:
    'ldap.example.com',
@@ -359,6 +364,7 @@
 /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5,
    blowfish, crypt or leave blank for now default algorithm. */
 // $servers->setValue('appearance','password_hash','md5');
+$servers->setValue('appearance','password_hash','');
 
 /* If you specified 'cookie' or 'session' as the auth_type above, you can
    optionally specify here an attribute to use when logging in. If you enter
@@ -368,6 +374,7 @@
    your LDAP server requires you to login to perform searches, you can enter the
    DN to use when searching in 'bind_id' and 'bind_pass' above.
 // $servers->setValue('login','attr','dn');
+$servers->setValue('login','attr','uid');
 
 /* Base DNs to used for logins. If this value is not set, then the LDAP server
    Base DNs are used. */


Index: phpldapadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/F-11/phpldapadmin.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- phpldapadmin.spec	9 Apr 2009 14:39:56 -0000	1.18
+++ phpldapadmin.spec	23 Dec 2009 14:11:54 -0000	1.19
@@ -1,12 +1,12 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
-Version: 1.1.0.7
+Version: 1.2.0.4
 Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 URL: http://phpldapadmin.sourceforge.net
-Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tar.gz
-Patch0: phpldapadmin-1.1.0.5-config.patch
+Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tgz
+Patch0: phpldapadmin-1.2.0.3-config.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -41,7 +41,7 @@ cp config/config.php.example config/conf
 
 %build
 
-find . \( -name "*.orig" -o -name "*~" -o -name .cvsignore \) -print0 | \
+find . \( -name "*.orig" -o -name "*~" -o -name .gitignore \) -print0 | \
 								xargs -0 rm -f
 find . -type f -print0 | xargs -0 chmod -x
 
@@ -82,6 +82,7 @@ Alias /ldapadmin %{_datadir}/%{name}/htd
   Order Deny,Allow
   Deny from all
   Allow from 127.0.0.1
+  Allow from ::1
 </Directory>
 
 EOF
@@ -115,6 +116,10 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.2.0.4-1
+- Upgrade to 1.2.0.4 . Fixes #549559
+- Allow local IPv6 address by default
+
 * Thu Apr  9 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.1.0.7-1
 - update to 1.1.0.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	9 Apr 2009 14:39:56 -0000	1.11
+++ sources	23 Dec 2009 14:11:54 -0000	1.12
@@ -1 +1 @@
-a9129f81b347e98c2b31552d1adc4b51  phpldapadmin-1.1.0.7.tar.gz
+a2d914e22c1b114738eca91c80c0d09c  phpldapadmin-1.2.0.4.tgz


--- phpldapadmin-1.1.0.5-config.patch DELETED ---