Author: Alexander Zangerl <az@debian.org>
Subject: include recent upstream change to get rid of exmh_lassign


diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' exmh-2.8.0~/exmh.CHANGES exmh-2.8.0/exmh.CHANGES
--- exmh-2.8.0~/exmh.CHANGES	2012-04-22 14:02:56.000000000 +1000
+++ exmh-2.8.0/exmh.CHANGES	2012-04-26 18:48:32.924254320 +1000
@@ -1,4 +1,15 @@
 HISTORY
+cvs repository 04/24/2012 valdis.kletnieks@vt.edu
+  Fix the 'lassign' issue more correctly - Brent Welch suggested
+  how to define one on the fly for pre-tcl8.5.  So we bite the bullet
+  and actually use the 8.5 calling sequence.
+  main.tcl, html.tcl, html_formtag.tcl, html_get_http.tcl,
+  html_links.tcl, msgShow.tcl
+
+cvs repository 04/22/2012 az@debian.org
+  added two patches from debian:
+  . make audit logging a configurable option
+  . ensure that $HOSTNAME is set in exmhwrapper
 
 cvs repository 04/21/2012 welch@panasas.com
   Update version to 2.8.0
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' exmh-2.8.0~/lib/html.tcl exmh-2.8.0/lib/html.tcl
--- exmh-2.8.0~/lib/html.tcl	2012-04-22 14:02:56.000000000 +1000
+++ exmh-2.8.0/lib/html.tcl	2012-04-26 18:46:13.751726085 +1000
@@ -209,7 +209,7 @@
 }
 proc HtmlHit {win x y} {
     upvar #0 HM$win var
-    exmh_lassign {href name} [UrlGetLink $win $x $y]
+    lassign [UrlGetLink $win $x $y] href name
     UrlResolve $var(S_url) href
     URI_StartViewer $href
 }
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' exmh-2.8.0~/lib/html_formtag.tcl exmh-2.8.0/lib/html_formtag.tcl
--- exmh-2.8.0~/lib/html_formtag.tcl	2012-04-22 14:02:56.000000000 +1000
+++ exmh-2.8.0/lib/html_formtag.tcl	2012-04-26 18:46:18.739458285 +1000
@@ -690,7 +690,7 @@
     upvar #0 HM[Window_GetMaster $win] var $formVar form
     foreach w [array names form widgets,*] {
         regsub ^widgets, $w {} w
-	exmh_lassign {htag param} $form(widgets,$w)
+	lassign $form(widgets,$w) htag param
 	if {"$htag" == "input"} {
 	    set type text
 	    HMextract_param $param type
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' exmh-2.8.0~/lib/html_get_http.tcl exmh-2.8.0/lib/html_get_http.tcl
--- exmh-2.8.0~/lib/html_get_http.tcl	2012-04-22 14:02:56.000000000 +1000
+++ exmh-2.8.0/lib/html_get_http.tcl	2012-04-26 18:46:28.382940513 +1000
@@ -155,7 +155,7 @@
     }
     if {$protocol == "http"} {
 	# Callback to determine if a proxy is necessary
-	exmh_lassign {proxy pport} [Http_Proxy $host]
+	lassign [Http_Proxy $host] proxy pport
 	if [catch {
 	    if [string length $proxy] {
 		set sock [HttpConnect $proxy $pport $data(protocol) $url]
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' exmh-2.8.0~/lib/html_links.tcl exmh-2.8.0/lib/html_links.tcl
--- exmh-2.8.0~/lib/html_links.tcl	2012-04-22 14:02:56.000000000 +1000
+++ exmh-2.8.0/lib/html_links.tcl	2012-04-26 18:46:37.265463604 +1000
@@ -81,13 +81,13 @@
 }
 proc Url_Hit {win x y} {
     dputs Url_Hit $x $y
-    exmh_lassign {href name} [UrlGetLink $win $x $y]
+    lassign [UrlGetLink $win $x $y] href name
     Html_HistoryAdd $win $href
     Frame_Display $win $name $href
 }
 # This is like Url_Hit for regular hits, but it opens a new window.
 proc Url_HitNew {win x y} {
-    exmh_lassign {href target} [UrlGetLink $win $x $y]
+    lassign [UrlGetLink $win $x $y] href target
     Url_DisplayNew $href $win
 }
 
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' exmh-2.8.0~/lib/main.tcl exmh-2.8.0/lib/main.tcl
--- exmh-2.8.0~/lib/main.tcl	2012-04-22 15:15:53.000000000 +1000
+++ exmh-2.8.0/lib/main.tcl	2012-04-26 18:47:45.392805987 +1000
@@ -558,4 +558,9 @@
         ::tk::unsupported::ExposePrivateCommand tkTextResetAnchor
         ::tk::unsupported::ExposePrivateVariable tkPriv
     }
+    if {[info exists tcl_version] && ($tcl_version < "8.5")} {
+        proc lassign {values args} {
+          uplevel 1 [list foreach $args $values break]
+        }
+    }
 }
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' exmh-2.8.0~/lib/msgShow.tcl exmh-2.8.0/lib/msgShow.tcl
--- exmh-2.8.0~/lib/msgShow.tcl	2012-04-22 14:02:56.000000000 +1000
+++ exmh-2.8.0/lib/msgShow.tcl	2012-04-26 18:46:07.453064276 +1000
@@ -523,7 +523,7 @@
 #	    continue
 #	}
 
-	exmh_lassign {qt_cnt qt_str} [MsgHighlightQuoteLevel $txt]
+	lassign [MsgHighlightQuoteLevel $txt] qt_cnt qt_str
 	if {$qt_cnt >= 5} {
 	    set qt_cnt 5
 	}
