Update to version 0.10.4

PR: 36201
Submitted by: MAINTAINER

13 files changed, 234 insertions, 298 deletions

diff --git a/www/web2ldap/Makefile b/www/web2ldap/Makefile
index e8d6f809dc47..22c212f9efab 100644
--- a/www/web2ldap/Makefile
+++ b/www/web2ldap/Makefile
@@ -6,28 +6,28 @@
 #
 
 PORTNAME=	web2ldap
-PORTVERSION=	0.8.1
+PORTVERSION=	0.10.4
 CATEGORIES=	www
 MASTER_SITES=	http://www.web2ldap.de/download/ \
 		http://www.tricknology.org/ports/
 
 MAINTAINER=	oddbjorn@tricknology.org
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_ldapmodule.so:${PORTSDIR}/net/py-ldap1
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_ldap.so:${PORTSDIR}/net/py-ldap2
 
 NO_BUILD=	yes
 USE_PYTHON=	yes
-PYTHON_VERSION=	python2.0
 
 do-install:
 	@${MKDIR} ${PREFIX}/${PORTNAME}
-	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/cgi-bin/web2ldap.py.orig
-	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/sbin/web2ldap.py.orig
-	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/sbin/compile.py.orig
-	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/etc/mime.types.orig
-	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/etc/web2ldap/web2ldapcnf/misc.py.orig
+	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/contrib/occonf2ldapoc-esj.py.orig
+	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/fcgi/web2ldap.py.orig
+	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/sbin/occonf2ldapoc.py.orig
+	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/sbin/pickleasn1cfg.py.orig
 	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/etc/web2ldap/web2ldapcnf/standalone.py.orig
-	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/etc/web2ldap/web2ldapcnf/hosts.py.orig
+	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/etc/mime.types.orig
+	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/sbin/compile.py.orig
+	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/sbin/web2ldap.py.orig
 	@${LOCALBASE}/bin/python ${WRKDIR}/${PORTNAME}-${PORTVERSION}/sbin/compile.py
 	@${CP} -r ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ ${PREFIX}/${PORTNAME}
 	@if [ -w /var/log ]; then ${MKDIR} /var/log/web2ldap; fi
diff --git a/www/web2ldap/distinfo b/www/web2ldap/distinfo
index 6003864c92db..4ec22f9ecbfc 100644
--- a/www/web2ldap/distinfo
+++ b/www/web2ldap/distinfo
@@ -1 +1 @@
-MD5 (web2ldap-0.8.1.tar.gz) = 9334b813448011990ec13001a693ce08
+MD5 (web2ldap-0.10.4.tar.gz) = 1c9f866e79bb224e20521912ff712a78
diff --git a/www/web2ldap/files/patch-ab b/www/web2ldap/files/patch-ab
index 36c01983e4de..49d059ae5700 100644
--- a/www/web2ldap/files/patch-ab
+++ b/www/web2ldap/files/patch-ab
@@ -1,62 +1,13 @@
-*** etc/web2ldap/web2ldapcnf/hosts.py.orig	Thu Jan 11 23:52:07 2001
---- etc/web2ldap/web2ldapcnf/hosts.py	Thu Jan 11 23:52:42 2001
+*** contrib/occonf2ldapoc-esj.py.orig	Wed Mar 20 15:54:51 2002
+--- contrib/occonf2ldapoc-esj.py	Wed Mar 20 15:55:02 2002
 ***************
-*** 55,71 ****
-      # vCard template files
-      'vcard_template': {
-        # 'object class':'pathname of vCard template file'
-!       'person':'/usr/lib/web2ldap/templates/vcard_person.txt',
-      },
-      # HTML template files for printing table entries
-      'print_template': {
-        # 'object class':'pathname of printable HTML template file'
-!       'person':'/usr/lib/web2ldap/templates/print_person.html',
-!       'organization':'/usr/lib/web2ldap/templates/print_organization.html',
-!       'organizationalUnit':'/usr/lib/web2ldap/templates/print_organizationalUnit.html',
-      },
-      # HTML template file for Basic Search form
-!     'searchform_template': '/usr/lib/web2ldap/templates/searchform_Base.html',
-      # Attributes which should be present in attribute select list of advanced search form
-      'search_attrs':['cn','mail','o','ou','telephoneNumber','homePhone','description'],
-      # There are some situations where this client just wants to get the
---- 55,71 ----
-      # vCard template files
-      'vcard_template': {
-        # 'object class':'pathname of vCard template file'
-!       'person':'/usr/local/web2ldap/templates/vcard_person.txt',
-      },
-      # HTML template files for printing table entries
-      'print_template': {
-        # 'object class':'pathname of printable HTML template file'
-!       'person':'/usr/local/web2ldap/templates/print_person.html',
-!       'organization':'/usr/local/web2ldap/templates/print_organization.html',
-!       'organizationalUnit':'/usr/local/web2ldap/templates/print_organizationalUnit.html',
-      },
-      # HTML template file for Basic Search form
-!     'searchform_template': '/usr/local/web2ldap/templates/searchform_Base.html',
-      # Attributes which should be present in attribute select list of advanced search form
-      'search_attrs':['cn','mail','o','ou','telephoneNumber','homePhone','description'],
-      # There are some situations where this client just wants to get the
-***************
-*** 113,122 ****
-      },
-      'read_template': {
-        # 'object class':'pathname of HTML template file'
-!       'person':'/usr/lib/web2ldap/templates/read_person.html',
-!       'posixAccount':'/usr/lib/web2ldap/templates/read_posixAccount.html',
-!       'bankArrangement':'/usr/lib/web2ldap/templates/read_bankArrangement.html',
-!       'musician':'/usr/lib/web2ldap/templates/read_musician.html',
-      }
-    },
+*** 1,4 ****
+! #!/usr/bin/python
+  
+  import sys,string,fileinput,re,getopt
+  
+--- 1,4 ----
+! #!/usr/local/bin/python
   
---- 113,122 ----
-      },
-      'read_template': {
-        # 'object class':'pathname of HTML template file'
-!       'person':'/usr/local/web2ldap/templates/read_person.html',
-!       'posixAccount':'/usr/local/web2ldap/templates/read_posixAccount.html',
-!       'bankArrangement':'/usr/local/web2ldap/templates/read_bankArrangement.html',
-!       'musician':'/usr/local/web2ldap/templates/read_musician.html',
-      }
-    },
+  import sys,string,fileinput,re,getopt
   
diff --git a/www/web2ldap/files/patch-ac b/www/web2ldap/files/patch-ac
index 4343c0e74185..2a8e7fcc263c 100644
--- a/www/web2ldap/files/patch-ac
+++ b/www/web2ldap/files/patch-ac
@@ -1,19 +1,13 @@
-*** etc/web2ldap/web2ldapcnf/misc.py.orig	Thu Jan 11 23:35:00 2001
---- etc/web2ldap/web2ldapcnf/misc.py	Thu Jan 11 23:38:00 2001
+*** fcgi/web2ldap.py.orig	Wed Mar 20 15:57:19 2002
+--- fcgi/web2ldap.py	Wed Mar 20 15:57:25 2002
 ***************
-*** 4,10 ****
-  """
-  
-  # A list with directories containing additional Python modules
-! pylibdirs = ['/usr/lib/web2ldap/pylib']
+*** 1,4 ****
+! #!/usr/bin/python -OO
   
-  ########################################################################
-  # HTTP-Options
---- 4,10 ----
   """
+  fcgi/web2ldap.py - stub script for running as FastCGI server
+--- 1,4 ----
+! #!/usr/local/bin/python -OO
   
-  # A list with directories containing additional Python modules
-! pylibdirs = ['/usr/local/web2ldap/pylib']
-  
-  ########################################################################
-  # HTTP-Options
+  """
+  fcgi/web2ldap.py - stub script for running as FastCGI server
diff --git a/www/web2ldap/files/patch-ad b/www/web2ldap/files/patch-ad
index 8816378e7107..0638a946621d 100644
--- a/www/web2ldap/files/patch-ad
+++ b/www/web2ldap/files/patch-ad
@@ -1,42 +1,13 @@
-*** etc/web2ldap/web2ldapcnf/standalone.py.orig	Wed Dec 20 15:09:50 2000
---- etc/web2ldap/web2ldapcnf/standalone.py	Fri Jan 12 00:12:39 2001
+*** sbin/compile.py.orig	Wed Mar 20 15:58:16 2002
+--- sbin/compile.py	Wed Mar 20 15:58:46 2002
 ***************
-*** 6,12 ****
-  """
+*** 1,4 ****
+! #!/usr/bin/python
   
-  # User account name to setuid after being started as root
-! run_username = 'wwwrun'
+  import compileall
   
-  # Contact mail address of the server admin when running stand-alone
-  server_admin = 'admin@web2ldap.de'
---- 6,12 ----
-  """
+--- 1,4 ----
+! #!/usr/local/bin/python
   
-  # User account name to setuid after being started as root
-! run_username = 'nobody'
+  import compileall
   
-  # Contact mail address of the server admin when running stand-alone
-  server_admin = 'admin@web2ldap.de'
-***************
-*** 36,45 ****
-  debug_log = '/var/log/web2ldap/debug_log'
-  
-  # Where static documents reside
-! document_root = '/usr/lib/web2ldap/htdocs/'
-  
-  # Path name of mime.types file
-! mime_types = '/etc/mime.types'
-  
-  ########################################################################
-  # SSL-options for running as stand-alone web server
---- 36,45 ----
-  debug_log = '/var/log/web2ldap/debug_log'
-  
-  # Where static documents reside
-! document_root = '/usr/local/web2ldap/htdocs/'
-  
-  # Path name of mime.types file
-! mime_types = '/usr/local/web2ldap/etc/mime.types'
-  
-  ########################################################################
-  # SSL-options for running as stand-alone web server
diff --git a/www/web2ldap/files/patch-ae b/www/web2ldap/files/patch-ae
index d1bd8f299a06..696bb98bac68 100644
--- a/www/web2ldap/files/patch-ae
+++ b/www/web2ldap/files/patch-ae
@@ -1,13 +1,13 @@
-*** sbin/compile.py.orig	Thu Jan 11 23:46:13 2001
---- sbin/compile.py	Thu Jan 11 23:46:30 2001
+*** sbin/occonf2ldapoc.py.orig	Wed Mar 20 15:58:24 2002
+--- sbin/occonf2ldapoc.py	Wed Mar 20 15:58:49 2002
 ***************
 *** 1,4 ****
 ! #!/usr/bin/python
   
-  import compileall
+  import sys,string,fileinput
   
 --- 1,4 ----
-! #!/usr/local/bin/python2.0
+! #!/usr/local/bin/python
   
-  import compileall
+  import sys,string,fileinput
   
diff --git a/www/web2ldap/files/patch-af b/www/web2ldap/files/patch-af
index 1f03743a1c74..3437bbb8233a 100644
--- a/www/web2ldap/files/patch-af
+++ b/www/web2ldap/files/patch-af
@@ -1,30 +1,13 @@
-*** sbin/web2ldap.py.orig	Thu Jan 11 23:46:19 2001
---- sbin/web2ldap.py	Thu Jan 11 23:47:16 2001
+*** sbin/pickleasn1cfg.py.orig	Wed Mar 20 15:58:31 2002
+--- sbin/pickleasn1cfg.py	Wed Mar 20 15:58:52 2002
 ***************
 *** 1,4 ****
 ! #!/usr/bin/python
   
-  ########################################################################
-  # web2ldap -  web-based LDAP Client, see http://www.web2ldap.de
---- 1,4 ----
-! #!/usr/local/bin/python2.0
+  import sys
   
-  ########################################################################
-  # web2ldap -  web-based LDAP Client, see http://www.web2ldap.de
-***************
-*** 13,19 ****
+--- 1,4 ----
+! #!/usr/local/bin/python
   
-  if os.name == 'posix':
-    # For finding web2ldapcnf.py in /etc/web2ldap on Unix systems
-!   sys.path.insert(0,'/etc/web2ldap')
-  else:
-    # For finding web2ldapcnf.py in system dirs on Windows systems
-    for i in ['SystemRoot','windir']:
---- 13,19 ----
+  import sys
   
-  if os.name == 'posix':
-    # For finding web2ldapcnf.py in /etc/web2ldap on Unix systems
-!   sys.path.insert(0,'/usr/local/web2ldap/etc/web2ldap')
-  else:
-    # For finding web2ldapcnf.py in system dirs on Windows systems
-    for i in ['SystemRoot','windir']:
diff --git a/www/web2ldap/files/patch-ag b/www/web2ldap/files/patch-ag
index 9496de08ccd7..c515ff20a920 100644
--- a/www/web2ldap/files/patch-ag
+++ b/www/web2ldap/files/patch-ag
@@ -1,30 +1,13 @@
-*** cgi-bin/web2ldap.py.orig	Thu Jan 11 23:55:56 2001
---- cgi-bin/web2ldap.py	Thu Jan 11 23:56:20 2001
+*** sbin/web2ldap.py.orig	Wed Mar 20 15:58:37 2002
+--- sbin/web2ldap.py	Wed Mar 20 16:00:47 2002
 ***************
 *** 1,4 ****
 ! #!/usr/bin/python
   
-  ########################################################################
-  # web2ldap -  web-based LDAP Client, see http://www.web2ldap.de
+  """
+  sbin/web2ldap.py - startscript for running as stand-alone HTTP server
 --- 1,4 ----
-! #!/usr/local/bin/python2.0
+! #!/usr/local/bin/python
   
-  ########################################################################
-  # web2ldap -  web-based LDAP Client, see http://www.web2ldap.de
-***************
-*** 15,21 ****
-  
-    if os.name == 'posix':
-      # For finding web2ldapcnf.py in /etc/web2ldap on Unix systems
-!     sys.path.insert(0,'/etc/web2ldap')
-    else:
-      # For finding web2ldapcnf.py in system dirs on Windows systems
-      for i in ['SystemRoot','windir']:
---- 15,21 ----
-  
-    if os.name == 'posix':
-      # For finding web2ldapcnf.py in /etc/web2ldap on Unix systems
-!     sys.path.insert(0,'/usr/local/web2ldap/etc/web2ldap')
-    else:
-      # For finding web2ldapcnf.py in system dirs on Windows systems
-      for i in ['SystemRoot','windir']:
+  """
+  sbin/web2ldap.py - startscript for running as stand-alone HTTP server
diff --git a/www/web2ldap/files/patch-ah b/www/web2ldap/files/patch-ah
new file mode 100644
index 000000000000..a5e6818c39e1
--- /dev/null
+++ b/www/web2ldap/files/patch-ah
@@ -0,0 +1,19 @@
+*** etc/web2ldap/web2ldapcnf/standalone.py.orig	Wed Mar 20 16:02:37 2002
+--- etc/web2ldap/web2ldapcnf/standalone.py	Wed Mar 20 16:03:08 2002
+***************
+*** 48,54 ****
+  document_root = os.path.join(web2ldapcnf.web2ldap_dir,'htdocs')
+  
+  # Path name of mime.types file
+! mime_types = '/etc/mime.types'
+  
+  # Listing of directory content (0=disabled, 1=enabled)
+  dir_listing_allowed = 0
+--- 48,54 ----
+  document_root = os.path.join(web2ldapcnf.web2ldap_dir,'htdocs')
+  
+  # Path name of mime.types file
+! mime_types = '/usr/local/web2ldap/etc/mime.types'
+  
+  # Listing of directory content (0=disabled, 1=enabled)
+  dir_listing_allowed = 0
diff --git a/www/web2ldap/files/patch-ai b/www/web2ldap/files/patch-ai
new file mode 100644
index 000000000000..25d146a168e4
--- /dev/null
+++ b/www/web2ldap/files/patch-ai
@@ -0,0 +1,11 @@
+--- etc/web2ldap/web2ldapcnf/standalone.py.orig	Fri Mar 22 12:58:51 2002
++++ etc/web2ldap/web2ldapcnf/standalone.py	Fri Mar 22 12:59:10 2002
+@@ -11,7 +11,7 @@
+ import os,web2ldapcnf
+ 
+ # User account name to setuid after being started as root
+-run_username = 'wwwrun'
++run_username = 'nobody'
+ 
+ # Contact mail address of the server admin when running stand-alone
+ server_admin = 'admin@web2ldap.de'
diff --git a/www/web2ldap/pkg-descr b/www/web2ldap/pkg-descr
index 2010919330d8..6cc7dc1cc999 100644
--- a/www/web2ldap/pkg-descr
+++ b/www/web2ldap/pkg-descr
@@ -1,4 +1,4 @@
-web2ldap.py is a full-featured web-based LDAP v2+ client written in Python.
+web2ldap is a full-featured web-based LDAP v2+ client written in Python.
 
 WWW: http://www.web2ldap.de/
 
diff --git a/www/web2ldap/pkg-message b/www/web2ldap/pkg-message
index 4303e1c3f335..1feb7e1f2401 100644
--- a/www/web2ldap/pkg-message
+++ b/www/web2ldap/pkg-message
@@ -1,8 +1,8 @@
-Run /usr/local/web2ldap/sbin/web2ldap.py to start the standalone version
-of web2ldap. By default it only accepts connections from localhost, but
-this can be modified in 
+Run ${PREFIX}/web2ldap/sbin/web2ldap.py to start the standalone
+version of web2ldap. By default it only accepts connections from
+localhost, but this can be modified in:
 
-   /usr/local/web2ldap/etc/web2ldap/web2ldapcnf/standalone.py
+   ${PREFIX}/web2ldap/etc/web2ldap/web2ldapcnf/standalone.py
 
-For instructions on installing the CGI version of web2ldap, please look
-at the enclosed documentation in /usr/local/web2ldap/htdocs/.
+For instructions on installing the CGI version of web2ldap, please
+look at the enclosed documentation in ${PREFIX}/web2ldap/htdocs/.
diff --git a/www/web2ldap/pkg-plist b/www/web2ldap/pkg-plist
index 0f8f85a078e7..eafbcc5c434c 100644
--- a/www/web2ldap/pkg-plist
+++ b/www/web2ldap/pkg-plist
@@ -1,162 +1,186 @@
-web2ldap/cgi-bin/web2ldap.py
-web2ldap/cgi-bin/web2ldap.pyc
-web2ldap/contrib/occonf2ldapoc-esj.py
-web2ldap/contrib/occonf2ldapoc-esj.pyc
-web2ldap/etc/mime.types
-web2ldap/etc/web2ldap/ldapoc.py
-web2ldap/etc/web2ldap/ldapoc.pyc
-web2ldap/etc/web2ldap/web2ldapcnf/__init__.py
-web2ldap/etc/web2ldap/web2ldapcnf/__init__.pyc
-web2ldap/etc/web2ldap/web2ldapcnf/cgibin.py
-web2ldap/etc/web2ldap/web2ldapcnf/cgibin.pyc
-web2ldap/etc/web2ldap/web2ldapcnf/hosts.py
-web2ldap/etc/web2ldap/web2ldapcnf/hosts.pyc
-web2ldap/etc/web2ldap/web2ldapcnf/misc.py
-web2ldap/etc/web2ldap/web2ldapcnf/misc.pyc
-web2ldap/etc/web2ldap/web2ldapcnf/standalone.py
-web2ldap/etc/web2ldap/web2ldapcnf/standalone.pyc
-web2ldap/htdocs/changes.html
-web2ldap/htdocs/css/dark.css
-web2ldap/htdocs/css/redandgreen.css
+web2ldap/htdocs/css/web2ldap_default.css
+web2ldap/htdocs/css/web2ldap_fixed.css
+web2ldap/htdocs/ssi/footer.html
+web2ldap/htdocs/ssi/head.html
+web2ldap/htdocs/ssi/navigation.html
 web2ldap/htdocs/demo.html
 web2ldap/htdocs/download.html
+web2ldap/htdocs/faq.html
 web2ldap/htdocs/features.html
 web2ldap/htdocs/feedback.html
 web2ldap/htdocs/files.html
 web2ldap/htdocs/install.html
 web2ldap/htdocs/news.html
-web2ldap/htdocs/related.html
+web2ldap/htdocs/changes.html
 web2ldap/htdocs/roadmap.html
 web2ldap/htdocs/security.html
-web2ldap/htdocs/ssi/footer.html
-web2ldap/htdocs/ssi/head.html
-web2ldap/htdocs/ssi/navigation.html
 web2ldap/htdocs/web2ldap.html
 web2ldap/htdocs/web2ldapcnf.html
-web2ldap/mod_python/web2ldap.py
-web2ldap/mod_python/web2ldap.pyc
-web2ldap/pylib/cgiforms.py
-web2ldap/pylib/cgihelper.py
-web2ldap/pylib/cgihelper.pyc
-web2ldap/pylib/cgisession.py
-web2ldap/pylib/cgisession.pyc
-web2ldap/pylib/cgissl.py
-web2ldap/pylib/cgissl.pyc
-web2ldap/pylib/charset.py
-web2ldap/pylib/charset.pyc
-web2ldap/pylib/dsml.py
-web2ldap/pylib/dsml.pyc
-web2ldap/pylib/httphelper.py
-web2ldap/pylib/httphelper.pyc
-web2ldap/pylib/ipadr.py
-web2ldap/pylib/ipadr.pyc
-web2ldap/pylib/ldapbase.py
-web2ldap/pylib/ldapsession.py
-web2ldap/pylib/ldapsession.pyc
-web2ldap/pylib/ldif.py
-web2ldap/pylib/ldif.pyc
-web2ldap/pylib/msHTTPServer.py
-web2ldap/pylib/msHTTPServer.pyc
-web2ldap/pylib/msbase.py
-web2ldap/pylib/msbase.pyc
-web2ldap/pylib/msgzip.py
-web2ldap/pylib/msgzip.pyc
-web2ldap/pylib/mspki/__init__.py
-web2ldap/pylib/mspki/__init__.pyc
+web2ldap/htdocs/web2ldapcnf_fastcgi.html
+web2ldap/htdocs/web2ldapcnf_hosts.html
+web2ldap/htdocs/web2ldapcnf_misc.html
+web2ldap/htdocs/web2ldapcnf_standalone.html
+web2ldap/htdocs/related.html
+web2ldap/htdocs/compability.html
+web2ldap/contrib/occonf2ldapoc-esj.py
+web2ldap/contrib/occonf2ldapoc-esj.pyc
+web2ldap/etc/mime.types
+web2ldap/etc/rc.d/web2ldap.sh
+web2ldap/etc/web2ldap/web2ldapcnf/standalone.pyc
+web2ldap/etc/web2ldap/web2ldapcnf/fastcgi.py
+web2ldap/etc/web2ldap/web2ldapcnf/hosts.py
+web2ldap/etc/web2ldap/web2ldapcnf/misc.py
+web2ldap/etc/web2ldap/web2ldapcnf/standalone.py
+web2ldap/etc/web2ldap/web2ldapcnf/__init__.pyc
+web2ldap/etc/web2ldap/web2ldapcnf/fastcgi.pyc
+web2ldap/etc/web2ldap/web2ldapcnf/hosts.pyc
+web2ldap/etc/web2ldap/web2ldapcnf/misc.pyc
+web2ldap/etc/web2ldap/web2ldapcnf/__init__.py
+web2ldap/etc/web2ldap/ldapoc.py
+web2ldap/etc/web2ldap/ldapoidreg.py
+web2ldap/etc/web2ldap/ldapoc.pyc
+web2ldap/etc/web2ldap/ldapoidreg.pyc
+web2ldap/fcgi/web2ldap.py
+web2ldap/fcgi/web2ldap.pyc
+web2ldap/pylib/mspki/x509v3.pyc
 web2ldap/pylib/mspki/asn1helper.py
-web2ldap/pylib/mspki/asn1helper.pyc
 web2ldap/pylib/mspki/asn1types.py
-web2ldap/pylib/mspki/asn1types.pyc
-web2ldap/pylib/mspki/entrustext.py
-web2ldap/pylib/mspki/entrustext.pyc
 web2ldap/pylib/mspki/nsext.py
-web2ldap/pylib/mspki/nsext.pyc
 web2ldap/pylib/mspki/rfc2459.py
-web2ldap/pylib/mspki/rfc2459.pyc
 web2ldap/pylib/mspki/utctime.py
-web2ldap/pylib/mspki/utctime.pyc
 web2ldap/pylib/mspki/util.py
-web2ldap/pylib/mspki/util.pyc
 web2ldap/pylib/mspki/vendorext.py
-web2ldap/pylib/mspki/vendorext.pyc
 web2ldap/pylib/mspki/x500.py
-web2ldap/pylib/mspki/x500.pyc
 web2ldap/pylib/mspki/x509.py
-web2ldap/pylib/mspki/x509.pyc
 web2ldap/pylib/mspki/x509v3.py
-web2ldap/pylib/mspki/x509v3.pyc
+web2ldap/pylib/mspki/__init__.pyc
+web2ldap/pylib/mspki/asn1helper.pyc
+web2ldap/pylib/mspki/asn1types.pyc
+web2ldap/pylib/mspki/nsext.pyc
+web2ldap/pylib/mspki/rfc2459.pyc
+web2ldap/pylib/mspki/utctime.pyc
+web2ldap/pylib/mspki/util.pyc
+web2ldap/pylib/mspki/vendorext.pyc
+web2ldap/pylib/mspki/x500.pyc
+web2ldap/pylib/mspki/x509.pyc
+web2ldap/pylib/mspki/__init__.py
 web2ldap/pylib/pisces/LICENSE
 web2ldap/pylib/pisces/PATCHES
 web2ldap/pylib/pisces/__init__.py
-web2ldap/pylib/pisces/__init__.pyc
 web2ldap/pylib/pisces/asn1.py
+web2ldap/pylib/pisces/__init__.pyc
 web2ldap/pylib/pisces/asn1.pyc
+web2ldap/pylib/w2lapp/viewer.pyc
+web2ldap/pylib/w2lapp/add.py
+web2ldap/pylib/w2lapp/addmodifyform.py
+web2ldap/pylib/w2lapp/cnf.py
+web2ldap/pylib/w2lapp/connect.py
+web2ldap/pylib/w2lapp/conninfo.py
+web2ldap/pylib/w2lapp/core.py
+web2ldap/pylib/w2lapp/delete.py
+web2ldap/pylib/w2lapp/groupadm.py
+web2ldap/pylib/w2lapp/gui.py
+web2ldap/pylib/w2lapp/handler.py
+web2ldap/pylib/w2lapp/locate.py
+web2ldap/pylib/w2lapp/login.py
+web2ldap/pylib/w2lapp/modify.py
+web2ldap/pylib/w2lapp/monitor.py
+web2ldap/pylib/w2lapp/passwd.py
+web2ldap/pylib/w2lapp/read.py
+web2ldap/pylib/w2lapp/referral.py
+web2ldap/pylib/w2lapp/rename.py
+web2ldap/pylib/w2lapp/search.py
+web2ldap/pylib/w2lapp/searchform.py
+web2ldap/pylib/w2lapp/viewer.py
+web2ldap/pylib/w2lapp/__init__.pyc
+web2ldap/pylib/w2lapp/add.pyc
+web2ldap/pylib/w2lapp/cnf.pyc
+web2ldap/pylib/w2lapp/addmodifyform.pyc
+web2ldap/pylib/w2lapp/connect.pyc
+web2ldap/pylib/w2lapp/conninfo.pyc
+web2ldap/pylib/w2lapp/core.pyc
+web2ldap/pylib/w2lapp/delete.pyc
+web2ldap/pylib/w2lapp/groupadm.pyc
+web2ldap/pylib/w2lapp/gui.pyc
+web2ldap/pylib/w2lapp/handler.pyc
+web2ldap/pylib/w2lapp/locate.pyc
+web2ldap/pylib/w2lapp/login.pyc
+web2ldap/pylib/w2lapp/modify.pyc
+web2ldap/pylib/w2lapp/monitor.pyc
+web2ldap/pylib/w2lapp/passwd.pyc
+web2ldap/pylib/w2lapp/read.pyc
+web2ldap/pylib/w2lapp/referral.pyc
+web2ldap/pylib/w2lapp/rename.pyc
+web2ldap/pylib/w2lapp/search.pyc
+web2ldap/pylib/w2lapp/searchform.pyc
+web2ldap/pylib/w2lapp/__init__.py
+web2ldap/pylib/ldaputil/__init__.py
+web2ldap/pylib/ldaputil/base.py
+web2ldap/pylib/ldaputil/passwd.py
+web2ldap/pylib/ldaputil/__init__.pyc
+web2ldap/pylib/ldaputil/base.pyc
+web2ldap/pylib/ldaputil/passwd.pyc
+web2ldap/pylib/msHTTPHandler.py
+web2ldap/pylib/msHTTPServer.py
+web2ldap/pylib/msbase.py
+web2ldap/pylib/msgzip.py
 web2ldap/pylib/utctime.py
+web2ldap/pylib/dsml.pyc
+web2ldap/pylib/ipadr.pyc
+web2ldap/pylib/ldapdns.pyc
+web2ldap/pylib/ldapsession.pyc
+web2ldap/pylib/msHTTPHandler.pyc
+web2ldap/pylib/msHTTPServer.pyc
+web2ldap/pylib/msbase.pyc
+web2ldap/pylib/msgzip.pyc
+web2ldap/pylib/dsml.py
 web2ldap/pylib/utctime.pyc
-web2ldap/pylib/w2ladd.py
-web2ldap/pylib/w2ladd.pyc
-web2ldap/pylib/w2laddmodifyform.py
-web2ldap/pylib/w2laddmodifyform.pyc
-web2ldap/pylib/w2lcnf.py
-web2ldap/pylib/w2lcnf.pyc
-web2ldap/pylib/w2lconnect.py
-web2ldap/pylib/w2lcore.py
-web2ldap/pylib/w2lcore.pyc
-web2ldap/pylib/w2ldelete.py
-web2ldap/pylib/w2ldelete.pyc
-web2ldap/pylib/w2lgui.py
-web2ldap/pylib/w2lhandler.py
-web2ldap/pylib/w2llogin.py
-web2ldap/pylib/w2llogin.pyc
-web2ldap/pylib/w2lmodify.py
-web2ldap/pylib/w2lmodify.pyc
-web2ldap/pylib/w2lmodrdn.py
-web2ldap/pylib/w2lmodrdn.pyc
-web2ldap/pylib/w2lpasswd.py
-web2ldap/pylib/w2lpasswd.pyc
-web2ldap/pylib/w2lread.py
-web2ldap/pylib/w2lread.pyc
-web2ldap/pylib/w2lreferral.py
-web2ldap/pylib/w2lreferral.pyc
-web2ldap/pylib/w2lsearch.py
-web2ldap/pylib/w2lsearch.pyc
-web2ldap/pylib/w2lsearchform.py
-web2ldap/pylib/w2lsecinfo.py
-web2ldap/pylib/w2lsecinfo.pyc
-web2ldap/pylib/w2lviewer.py
-web2ldap/pylib/w2lviewer.pyc
-web2ldap/sbin/compile.py
-web2ldap/sbin/compile.pyc
+web2ldap/pylib/ipadr.py
+web2ldap/pylib/ldapdns.py
+web2ldap/pylib/ldapsession.py
+web2ldap/sbin/web2ldap.pyc
 web2ldap/sbin/occonf2ldapoc.py
-web2ldap/sbin/occonf2ldapoc.pyc
+web2ldap/sbin/pickleasn1cfg.py
 web2ldap/sbin/web2ldap.py
-web2ldap/sbin/web2ldap.pyc
+web2ldap/sbin/compile.pyc
+web2ldap/sbin/occonf2ldapoc.pyc
+web2ldap/sbin/pickleasn1cfg.pyc
+web2ldap/sbin/compile.py
+web2ldap/templates/vcard_person.txt
 web2ldap/templates/print_organization.html
 web2ldap/templates/print_organizationalUnit.html
 web2ldap/templates/print_person.html
 web2ldap/templates/read_bankArrangement.html
+web2ldap/templates/read_bibtex.html
+web2ldap/templates/read_inetOrgPerson.html
 web2ldap/templates/read_musician.html
 web2ldap/templates/read_musician.html.de
-web2ldap/templates/read_person.html
+web2ldap/templates/read_operationalattrs.html
+web2ldap/templates/read_operationalattrs.html.de
+web2ldap/templates/read_organization.html
 web2ldap/templates/read_posixAccount.html
 web2ldap/templates/searchform_Base.html
 web2ldap/templates/searchform_Base.html.de
+web2ldap/templates/searchform_bibtex.html
 web2ldap/templates/searchform_rfc2307.html
-web2ldap/templates/vcard_person.txt
-@dirrm web2ldap/cgi-bin
-@dirrm web2ldap/contrib
+web2ldap/templates/print_bibtex.html
+@dirrm web2ldap/var/run
+@dirrm web2ldap/var/log
+@dirrm web2ldap/var
+@dirrm web2ldap/templates
+@dirrm web2ldap/sbin
+@dirrm web2ldap/pylib/w2lapp
+@dirrm web2ldap/pylib/pisces
+@dirrm web2ldap/pylib/mspki
+@dirrm web2ldap/pylib/ldaputil
+@dirrm web2ldap/pylib
+@dirrm web2ldap/htdocs/ssi
+@dirrm web2ldap/htdocs/css
+@dirrm web2ldap/htdocs
+@dirrm web2ldap/fcgi
 @dirrm web2ldap/etc/web2ldap/web2ldapcnf
 @dirrm web2ldap/etc/web2ldap
+@dirrm web2ldap/etc/rc.d
 @dirrm web2ldap/etc
-@dirrm web2ldap/htdocs/css
-@dirrm web2ldap/htdocs/doc
-@dirrm web2ldap/htdocs/ssi
-@dirrm web2ldap/htdocs
-@dirrm web2ldap/html
-@dirrm web2ldap/mod_python
-@dirrm web2ldap/pylib/mspki
-@dirrm web2ldap/pylib/pisces
-@dirrm web2ldap/pylib
-@dirrm web2ldap/sbin
-@dirrm web2ldap/templates
+@dirrm web2ldap/contrib
 @dirrm web2ldap