7 files changed, 260 insertions, 185 deletions

diff --git a/www/web2ldap/files/patch-aa b/www/web2ldap/files/patch-aa
index 62c0e0acf52e..bb46b2ca1d52 100644
--- a/www/web2ldap/files/patch-aa
+++ b/www/web2ldap/files/patch-aa
@@ -1,32 +1,86 @@
-*** cgi-bin/web2ldap.py.orig	Sat Jul 22 02:23:06 2000
---- cgi-bin/web2ldap.py	Sat Jul 22 02:23:30 2000
+*** /dev/null	Sat Jul 22 02:21:51 2000
+--- etc/mime.types	Sat Jul 22 02:24:24 2000
 ***************
-*** 1,4 ****
-! #!/usr/bin/python
-  
-  ########################################################################
-  # web2ldap
---- 1,4 ----
-! #!/usr/local/bin/python
-  
-  ########################################################################
-  # web2ldap
-***************
-*** 12,19 ****
-  if os.environ.has_key('GATEWAY_INTERFACE'):
-  
-    if os.name == 'posix':
-!     # For finding web2ldapcnf.py in /etc/web2ldap on Unix systems
-!     sys.path.append('/etc/web2ldap')
-    else:
-      # For finding web2ldapcnf.py in system dirs on Windows systems
-      for i in ['SystemRoot','windir']:
---- 12,19 ----
-  if os.environ.has_key('GATEWAY_INTERFACE'):
-  
-    if os.name == 'posix':
-!     # For finding web2ldapcnf.py in /usr/local/web2ldap/etc/web2ldap on FreeBSD systems
-!     sys.path.append('/usr/local/web2ldap/etc/web2ldap')
-    else:
-      # For finding web2ldapcnf.py in system dirs on Windows systems
-      for i in ['SystemRoot','windir']:
+*** 0 ****
+--- 1,81 ----
++ #
++ # sample mime.types
++ #
++ 
++ application/andrew-inset	ez
++ application/excel		xls
++ application/octet-stream	bin
++ application/oda			oda
++ application/pdf			pdf
++ application/pgp			pgp
++ application/postscript		ps PS eps
++ application/rtf			rtf
++ application/x-arj-compressed	arj
++ application/x-bcpio		bcpio
++ application/x-chess-pgn		pgn
++ application/x-cpio		cpio
++ application/x-csh		csh
++ application/x-debian-package	deb
++ application/x-msdos-program	com exe bat
++ application/x-dvi		dvi
++ application/x-gtar		gtar
++ application/x-gunzip		gz
++ application/x-hdf		hdf
++ application/x-latex		latex
++ application/x-mif		mif
++ application/x-netcdf		cdf nc
++ application/x-perl		pl pm
++ application/x-rar-compressed	rar
++ application/x-sh		sh
++ application/x-shar		shar
++ application/x-sv4cpio		sv4cpio
++ application/x-sv4crc		sv4crc
++ application/x-tar		tar
++ application/x-tar-gz		tgz tar.gz
++ application/x-tcl		tcl
++ application/x-tex		tex
++ application/x-texinfo		texi texinfo
++ application/x-troff		t tr roff
++ application/x-troff-man		man
++ application/x-troff-me		me
++ application/x-troff-ms		ms
++ application/x-ustar		ustar
++ application/x-wais-source	src
++ application/x-zip-compressed	zip
++ 
++ audio/basic			snd
++ audio/midi			mid midi
++ audio/ulaw			au
++ audio/x-aiff			aif aifc aiff
++ audio/x-wav			wav
++ 
++ image/gif			gif
++ image/ief			ief
++ image/jpeg			jpe jpeg jpg
++ image/png			png
++ image/tiff			tif tiff
++ image/x-cmu-raster		ras
++ image/x-portable-anymap		pnm
++ image/x-portable-bitmap		pbm
++ image/x-portable-graymap	pgm
++ image/x-portable-pixmap		ppm
++ image/x-rgb			rgb
++ image/x-xbitmap			xbm
++ image/x-xpixmap			xpm
++ image/x-xwindowdump		xwd
++ 
++ text/html			html htm
++ text/plain			asc txt
++ text/richtext			rtx
++ text/tab-separated-values	tsv
++ text/x-setext			etx
++ 
++ video/dl			dl
++ video/fli			fli
++ video/gl			gl
++ video/mpeg			mp2 mpe mpeg mpg
++ video/quicktime			mov qt
++ video/x-msvideo			avi
++ video/x-sgi-movie		movie
++ 
++ x-world/x-vrml			vrm vrml wrl
diff --git a/www/web2ldap/files/patch-ab b/www/web2ldap/files/patch-ab
index bb46b2ca1d52..36c01983e4de 100644
--- a/www/web2ldap/files/patch-ab
+++ b/www/web2ldap/files/patch-ab
@@ -1,86 +1,62 @@
-*** /dev/null	Sat Jul 22 02:21:51 2000
---- etc/mime.types	Sat Jul 22 02:24:24 2000
+*** 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
 ***************
-*** 0 ****
---- 1,81 ----
-+ #
-+ # sample mime.types
-+ #
-+ 
-+ application/andrew-inset	ez
-+ application/excel		xls
-+ application/octet-stream	bin
-+ application/oda			oda
-+ application/pdf			pdf
-+ application/pgp			pgp
-+ application/postscript		ps PS eps
-+ application/rtf			rtf
-+ application/x-arj-compressed	arj
-+ application/x-bcpio		bcpio
-+ application/x-chess-pgn		pgn
-+ application/x-cpio		cpio
-+ application/x-csh		csh
-+ application/x-debian-package	deb
-+ application/x-msdos-program	com exe bat
-+ application/x-dvi		dvi
-+ application/x-gtar		gtar
-+ application/x-gunzip		gz
-+ application/x-hdf		hdf
-+ application/x-latex		latex
-+ application/x-mif		mif
-+ application/x-netcdf		cdf nc
-+ application/x-perl		pl pm
-+ application/x-rar-compressed	rar
-+ application/x-sh		sh
-+ application/x-shar		shar
-+ application/x-sv4cpio		sv4cpio
-+ application/x-sv4crc		sv4crc
-+ application/x-tar		tar
-+ application/x-tar-gz		tgz tar.gz
-+ application/x-tcl		tcl
-+ application/x-tex		tex
-+ application/x-texinfo		texi texinfo
-+ application/x-troff		t tr roff
-+ application/x-troff-man		man
-+ application/x-troff-me		me
-+ application/x-troff-ms		ms
-+ application/x-ustar		ustar
-+ application/x-wais-source	src
-+ application/x-zip-compressed	zip
-+ 
-+ audio/basic			snd
-+ audio/midi			mid midi
-+ audio/ulaw			au
-+ audio/x-aiff			aif aifc aiff
-+ audio/x-wav			wav
-+ 
-+ image/gif			gif
-+ image/ief			ief
-+ image/jpeg			jpe jpeg jpg
-+ image/png			png
-+ image/tiff			tif tiff
-+ image/x-cmu-raster		ras
-+ image/x-portable-anymap		pnm
-+ image/x-portable-bitmap		pbm
-+ image/x-portable-graymap	pgm
-+ image/x-portable-pixmap		ppm
-+ image/x-rgb			rgb
-+ image/x-xbitmap			xbm
-+ image/x-xpixmap			xpm
-+ image/x-xwindowdump		xwd
-+ 
-+ text/html			html htm
-+ text/plain			asc txt
-+ text/richtext			rtx
-+ text/tab-separated-values	tsv
-+ text/x-setext			etx
-+ 
-+ video/dl			dl
-+ video/fli			fli
-+ video/gl			gl
-+ video/mpeg			mp2 mpe mpeg mpg
-+ video/quicktime			mov qt
-+ video/x-msvideo			avi
-+ video/x-sgi-movie		movie
-+ 
-+ x-world/x-vrml			vrm vrml wrl
+*** 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',
+      }
+    },
+  
+--- 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',
+      }
+    },
+  
diff --git a/www/web2ldap/files/patch-ac b/www/web2ldap/files/patch-ac
index 06ddb993a6ad..4343c0e74185 100644
--- a/www/web2ldap/files/patch-ac
+++ b/www/web2ldap/files/patch-ac
@@ -1,13 +1,19 @@
-*** sbin/compile.py.orig	Sat Jul 22 02:24:55 2000
---- sbin/compile.py	Sat Jul 22 02:25:07 2000
+*** 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
 ***************
-*** 1,4 ****
-! #!/usr/bin/python
+*** 4,10 ****
+  """
   
-  import compileall
+  # A list with directories containing additional Python modules
+! pylibdirs = ['/usr/lib/web2ldap/pylib']
   
---- 1,4 ----
-! #!/usr/local/bin/python
+  ########################################################################
+  # HTTP-Options
+--- 4,10 ----
+  """
   
-  import compileall
+  # A list with directories containing additional Python modules
+! pylibdirs = ['/usr/local/web2ldap/pylib']
   
+  ########################################################################
+  # HTTP-Options
diff --git a/www/web2ldap/files/patch-ad b/www/web2ldap/files/patch-ad
index be25133e5c52..8816378e7107 100644
--- a/www/web2ldap/files/patch-ad
+++ b/www/web2ldap/files/patch-ad
@@ -1,32 +1,42 @@
-*** sbin/web2ldap.py.orig	Sat Jul 22 02:24:59 2000
---- sbin/web2ldap.py	Sat Jul 22 02:25:26 2000
+*** 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
 ***************
-*** 1,4 ****
-! #!/usr/bin/python
+*** 6,12 ****
+  """
+  
+  # User account name to setuid after being started as root
+! run_username = 'wwwrun'
+  
+  # Contact mail address of the server admin when running stand-alone
+  server_admin = 'admin@web2ldap.de'
+--- 6,12 ----
+  """
+  
+  # User account name to setuid after being started as root
+! run_username = 'nobody'
+  
+  # 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'
   
   ########################################################################
-  # web2ldap
---- 1,4 ----
-! #!/usr/local/bin/python
+  # 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'
   
   ########################################################################
-  # web2ldap
-***************
-*** 10,17 ****
-  import sys,os
-  
-  if os.name == 'posix':
-!   # For finding web2ldapcnf.py in /etc/web2ldap on Unix systems
-!   sys.path.append('/etc/web2ldap')
-  else:
-    # For finding web2ldapcnf.py in system dirs on Windows systems
-    for i in ['SystemRoot','windir']:
---- 10,17 ----
-  import sys,os
-  
-  if os.name == 'posix':
-!   # For finding web2ldapcnf.py in /usr/local/web2ldap/etc/web2ldap on FreeBSD systems
-!   sys.path.append('/usr/local/web2ldap/etc/web2ldap')
-  else:
-    # For finding web2ldapcnf.py in system dirs on Windows systems
-    for i in ['SystemRoot','windir']:
+  # SSL-options for running as stand-alone web server
diff --git a/www/web2ldap/files/patch-ae b/www/web2ldap/files/patch-ae
index 4764bb013e53..d1bd8f299a06 100644
--- a/www/web2ldap/files/patch-ae
+++ b/www/web2ldap/files/patch-ae
@@ -1,19 +1,13 @@
-*** etc/web2ldap/web2ldapcnf/misc.py.orig	Sat Jul 22 02:26:08 2000
---- etc/web2ldap/web2ldapcnf/misc.py	Sat Jul 22 02:26:48 2000
+*** sbin/compile.py.orig	Thu Jan 11 23:46:13 2001
+--- sbin/compile.py	Thu Jan 11 23:46:30 2001
 ***************
-*** 4,10 ****
-  ########################################################################
+*** 1,4 ****
+! #!/usr/bin/python
   
-  # A list with directories containing additional Python modules
-! pylibdirs = ['/usr/lib/web2ldap/pylib']
+  import compileall
   
-  ########################################################################
-  # HTTP-Options
---- 4,10 ----
-  ########################################################################
+--- 1,4 ----
+! #!/usr/local/bin/python2.0
   
-  # A list with directories containing additional Python modules
-! pylibdirs = ['/usr/local/web2ldap/pylib']
+  import compileall
   
-  ########################################################################
-  # HTTP-Options
diff --git a/www/web2ldap/files/patch-af b/www/web2ldap/files/patch-af
index 615fef41c80b..1f03743a1c74 100644
--- a/www/web2ldap/files/patch-af
+++ b/www/web2ldap/files/patch-af
@@ -1,25 +1,30 @@
-*** etc/web2ldap/web2ldapcnf/standalone.py.orig	Sat Jul 22 02:26:12 2000
---- etc/web2ldap/web2ldapcnf/standalone.py	Sat Jul 22 02:27:10 2000
+*** sbin/web2ldap.py.orig	Thu Jan 11 23:46:19 2001
+--- sbin/web2ldap.py	Thu Jan 11 23:47:16 2001
 ***************
-*** 13,22 ****
-  error_log = '/var/log/web2ldap/error_log'
+*** 1,4 ****
+! #!/usr/bin/python
   
-  # Where static documents reside
-! document_root = '/usr/lib/web2ldap/htdocs/'
+  ########################################################################
+  # web2ldap -  web-based LDAP Client, see http://www.web2ldap.de
+--- 1,4 ----
+! #!/usr/local/bin/python2.0
   
-  # Path name of mime.types file
-! mime_types = '/etc/mime.types'
-  
-  # Contact mail address of the server admin when running stand-alone
-  server_admin = 'admin@web2ldap.de'
---- 13,22 ----
-  error_log = '/var/log/web2ldap/error_log'
-  
-  # Where static documents reside
-! document_root = '/usr/local/web2ldap/htdocs/'
+  ########################################################################
+  # web2ldap -  web-based LDAP Client, see http://www.web2ldap.de
+***************
+*** 13,19 ****
   
-  # Path name of mime.types file
-! mime_types = '/usr/local/web2ldap/etc/mime.types'
+  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 ----
   
-  # Contact mail address of the server admin when running stand-alone
-  server_admin = 'admin@web2ldap.de'
+  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
new file mode 100644
index 000000000000..9496de08ccd7
--- /dev/null
+++ b/www/web2ldap/files/patch-ag
@@ -0,0 +1,30 @@
+*** cgi-bin/web2ldap.py.orig	Thu Jan 11 23:55:56 2001
+--- cgi-bin/web2ldap.py	Thu Jan 11 23:56:20 2001
+***************
+*** 1,4 ****
+! #!/usr/bin/python
+  
+  ########################################################################
+  # web2ldap -  web-based LDAP Client, see http://www.web2ldap.de
+--- 1,4 ----
+! #!/usr/local/bin/python2.0
+  
+  ########################################################################
+  # 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']: