Update to version 0.10.4

PR: 36201
Submitted by: MAINTAINER

8 files changed, 75 insertions, 163 deletions

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'