[tcllib] Fix prev. patch

Dmitrij S. Kryzhevich krege at fedoraproject.org
Tue Mar 3 06:23:43 UTC 2015


commit 558f77eeee98cf0c57b2565c8a9559bdd0696ddd
Author: Dmitrij S. Kryzhevich <krege at land.ru>
Date:   Tue Mar 3 12:23:40 2015 +0600

    Fix prev. patch

 tcllib-1.16-textarea.patch | 53 +++-------------------------------------------
 tcllib.spec                |  5 ++++-
 2 files changed, 7 insertions(+), 51 deletions(-)
---
diff --git a/tcllib-1.16-textarea.patch b/tcllib-1.16-textarea.patch
index 090b3cc..fab1e6d 100644
--- a/tcllib-1.16-textarea.patch
+++ b/tcllib-1.16-textarea.patch
@@ -1,37 +1,8 @@
-Index: modules/html/html.man
-==================================================================
---- modules/html/html.man
-+++ modules/html/html.man
-@@ -1,7 +1,7 @@
- [comment {-*- tcl -*- doctools manpage}]
--[vset HTML_VERSION 1.4.3]
-+[vset HTML_VERSION 1.4.4]
- [manpage_begin html n [vset HTML_VERSION]]
- [see_also htmlparse]
- [see_also ncgi]
- [keywords checkbox]
- [keywords checkbutton]
-
 Index: modules/html/html.tcl
 ==================================================================
 --- modules/html/html.tcl
 +++ modules/html/html.tcl
-@@ -13,11 +13,11 @@
- #
- # Originally by Brent Welch, with help from Dan Kuchler and Melissa Chawla
- 
- package require Tcl 8.2
- package require ncgi
--package provide html 1.4.3
-+package provide html 1.4.4
- 
- namespace eval ::html {
- 
-     # State about the current page
- 
-@@ -910,11 +910,11 @@
- #
- # Results:
+@@ -912,7 +912,7 @@ proc ::html::selectPlain {name param cho
  #	The html fragment
  
  proc ::html::textarea {name {param {}} {current {}}} {
@@ -40,20 +11,14 @@ Index: modules/html/html.tcl
      return "<[string trimright \
  	"textarea name=\"$name\"\
  		[tagParam textarea $param]"]>$value</textarea>\n"
- }
- 
-
 Index: modules/html/html.test
 ==================================================================
 --- modules/html/html.test
 +++ modules/html/html.test
-@@ -451,10 +451,22 @@
-     ncgi::reset info=[ncgi::encode "The textarea value."]
-     ncgi::parse
-     html::textarea info
+@@ -453,6 +453,17 @@ test html-23.2 {html::textarea} {
  } {<textarea name="info" cols="50" rows="8">The textarea value.</textarea>
  }
-+
+ 
 +test html-23.3 {html::textarea, dangerous input} {
 +    html::init {
 +	textarea.cols 50
@@ -65,18 +30,6 @@ Index: modules/html/html.test
 +} {<textarea name="info" cols="50" rows="8">&lt;/textarea&gt;&lt;script&gt;alert(1)&lt;/script&gt;</textarea>
 +}
 +
- 
  test html-24.1 {html::submit} {
      catch {html::submit}
  } {1}
- 
-
-Index: modules/html/pkgIndex.tcl
-==================================================================
---- modules/html/pkgIndex.tcl
-+++ modules/html/pkgIndex.tcl
-@@ -1,2 +1,2 @@
- if {![package vsatisfies [package provide Tcl] 8.2]} {return}
--package ifneeded html 1.4.3 [list source [file join $dir html.tcl]]
-+package ifneeded html 1.4.4 [list source [file join $dir html.tcl]]
-
diff --git a/tcllib.spec b/tcllib.spec
index 739a3fe..d4f6235 100644
--- a/tcllib.spec
+++ b/tcllib.spec
@@ -4,7 +4,7 @@
 Summary:    The standard Tcl library
 Name:       tcllib
 Version:    1.16
-Release:    2%{?dist}
+Release:    3%{?dist}
 License:    BSD
 Group:      Development/Libraries
 Source:     http://downloads.sourceforge.net/tcllib/Tcllib-%{version}.tar.gz
@@ -74,6 +74,9 @@ find %{buildroot}/%{_datadir} -name \*.tcl -exec chmod 0644 {} \;
 %{_bindir}/tcldocstrip
 
 %changelog
+* Tue Mar 03 2015 Dmitrij S. Kryzhevich <krege at land.ru> - 1.16-3
+- Update prev. patch.
+
 * Tue Mar 03 2015 Dmitrij S. Kryzhevich <krege at land.ru> - 1.16-2
 - Fix topdir name.
 


More information about the scm-commits mailing list