rpms/tclhttpd/devel tclhttpd-md5-3.5.1.patch,NONE,1.1

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/tclhttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419

Added Files:
	tclhttpd-md5-3.5.1.patch 
Log Message:
Added patch for utils.tcl to prevent error due to missing md5 function.



tclhttpd-md5-3.5.1.patch:

--- NEW FILE tclhttpd-md5-3.5.1.patch ---
Index: lib/utils.tcl
===================================================================
RCS file: /cvsroot/tclhttpd/tclhttpd/lib/utils.tcl,v
retrieving revision 1.10
retrieving revision 1.14
diff -c -r1.10 -r1.14
*** lib/utils.tcl	27 May 2004 01:25:19 -0000	1.10
--- lib/utils.tcl	22 Oct 2004 03:43:06 -0000	1.14
***************
*** 4,13 ****
  # See the file "license.terms" for information on usage and redistribution
  # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  #
! # RCS: @(#) $Id: utils.tcl,v 1.10 2004/05/27 01:25:19 coldstore Exp $
  
  package provide httpd::utils 1.0
  
  # Stderr - print to standard error
  
  proc Stderr {string} {
--- 4,15 ----
  # See the file "license.terms" for information on usage and redistribution
  # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  #
! # RCS: @(#) $Id: utils.tcl,v 1.14 2004/10/22 03:43:06 coldstore Exp $
  
  package provide httpd::utils 1.0
  
+ package require httpd::log	;# Log_SetFile
+ 
  # Stderr - print to standard error
  
  proc Stderr {string} {
***************
*** 24,30 ****
  
  proc lappendOnce {listName value} {
      upvar $listName list
!     if ![info exists list] {
  	lappend list $value
      } else {
  	set ix [lsearch $list $value]
--- 26,32 ----
  
  proc lappendOnce {listName value} {
      upvar $listName list
!     if {![info exists list]} {
  	lappend list $value
      } else {
  	set ix [lsearch $list $value]
***************
*** 106,112 ****
  
  proc ldelete {varList value} {
      upvar $varList list
!     if ![info exist list] {
  	return 0
      }
      set ix [lsearch $list $value]
--- 108,114 ----
  
  proc ldelete {varList value} {
      upvar $varList list
!     if {![info exist list]} {
  	return 0
      }
      set ix [lsearch $list $value]
***************
*** 310,316 ****
      foreach name [array names a $pat] {
  	setmax max [string length $name]
      }
!     if ![info exists max] {
  	return {}
      }
      incr max [string length $aname]
--- 312,318 ----
      foreach name [array names a $pat] {
  	setmax max [string length $name]
      }
!     if {![info exists max]} {
  	return {}
      }
      incr max [string length $aname]
***************
*** 415,421 ****
  	set hit 0
  	for {set c $limit} {$c >= 0} {incr c -1} {
  	    set char [string index $line $c]
! 	    if [regexp \[\ \t\n>/\] $char] {
  		set hit 1
  		break
  	    }
--- 417,423 ----
  	set hit 0
  	for {set c $limit} {$c >= 0} {incr c -1} {
  	    set char [string index $line $c]
! 	    if {[regexp \[\ \t\n>/\] $char]} {
  		set hit 1
  		break
  	    }
***************
*** 606,619 ****
  proc K {a b} {set a}
  proc lambda {argl body} {K [info level 0] [proc [info level 0] $argl $body]}
  
- # Tcllib 1.6 has inconsistencies with md5 1.4.3 and 2.0.0,
- # and requiring 1.0 cures later conflicts with 2.0
- # we run with whatever version is available
- # by making an aliased wrapper
- if {[package vcompare [package present md5] 2.0] > -1} {
-     # we have md5 v2 - it needs to be told to return hex
-     interp alias {} md5hex {} ::md5::md5 --hex --
- } else {
-     # we have md5 v1 - it returns hex anyway
-     interp alias {} md5hex {} ::md5::md5
- }
--- 608,610 ----