rpms/tcl-trf/F-11 trf2.1.4-noripemd.patch, NONE, 1.1 sources, 1.2, 1.3 tcl-trf.spec, 1.2, 1.3

Tom Callaway spot at fedoraproject.org
Thu Oct 29 18:41:31 UTC 2009


Author: spot

Update of /cvs/pkgs/rpms/tcl-trf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25072/F-11

Modified Files:
	sources tcl-trf.spec 
Added Files:
	trf2.1.4-noripemd.patch 
Log Message:
update to 2.1.4

trf2.1.4-noripemd.patch:
 DESCRIPTION              |    2 +-
 LSM                      |    2 +-
 configure                |    2 +-
 configure.in             |    1 -
 doc/trf.man              |    6 +-----
 generic/init.c           |    2 ++
 generic/transformInt.h   |    4 ++--
 tea.tests/________       |    4 ++--
 tea.tests/common_md.test |    2 +-
 tests/________           |    4 ++--
 tests/common.md.test     |    2 +-
 tools/md                 |    2 +-
 12 files changed, 15 insertions(+), 18 deletions(-)

--- NEW FILE trf2.1.4-noripemd.patch ---
diff -up trf2.1.4/configure.in.ripemd trf2.1.4/configure.in
--- trf2.1.4/configure.in.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/configure.in	2009-10-29 14:33:30.504518975 -0400
@@ -86,7 +86,6 @@ TEA_ADD_SOURCES([otpcode.c qpcode.c refl
 TEA_ADD_SOURCES([dig_opt.c digest.c])
 TEA_ADD_SOURCES([crc.c crc_zlib.c adler.c])
 TEA_ADD_SOURCES([md5dig.c haval.c sha.c md2.c sha1.c])
-TEA_ADD_SOURCES([rmd160.c rmd128.c])
 TEA_ADD_SOURCES([otpmd5.c otpsha1.c])
 
 TEA_ADD_SOURCES([rs_ecc.c])
diff -up trf2.1.4/configure.ripemd trf2.1.4/configure
--- trf2.1.4/configure.ripemd	2009-06-18 00:45:24.000000000 -0400
+++ trf2.1.4/configure	2009-10-29 14:33:30.506531382 -0400
@@ -7041,7 +7041,7 @@ echo "$as_me: error: could not find sour
 
 
 
-    vars="rmd160.c rmd128.c"
+    vars=""
     for i in $vars; do
 	case $i in
 	    \$*)
diff -up trf2.1.4/DESCRIPTION.ripemd trf2.1.4/DESCRIPTION
--- trf2.1.4/DESCRIPTION.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/DESCRIPTION	2009-10-29 14:33:30.506531382 -0400
@@ -26,7 +26,7 @@ extension trf {
     keywords {
 	tcl, conversion, message digests,
 	data compression, error-correction, binary io, crc, md2, md5,
-	sha, sha-1, haval, adler, ripemd-160, dual, hexadecimal, octal,
+	sha, sha-1, haval, adler, dual, hexadecimal, octal,
 	uuencode, base64, ascii85, reed-solomon, zlib, otp_md5, otp_sha1,
 	otp_words
     }
diff -up trf2.1.4/doc/trf.man.ripemd trf2.1.4/doc/trf.man
--- trf2.1.4/doc/trf.man.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/doc/trf.man	2009-10-29 14:33:30.506531382 -0400
@@ -102,10 +102,6 @@ The second category are message digests 
 [cmd sha1_otp]
 [enum]
 [cmd haval]
-[enum]
-[cmd ripemd-160]
-[enum]
-[cmd ripemd-128]
 [list_end]
 [nl]
 
@@ -134,7 +130,7 @@ compression, error correction and others
 
 [list_end]
 
-[see_also oct hex oct base64 uuencode ascii85 otp_words quoted-printable crc-zlib crc adler md2 md5 md5_otp sha sha1 sha1_otp haval ripemd-160 ripemd-128 crypt md5crypt transform rs_ecc zip bz2]
+[see_also oct hex oct base64 uuencode ascii85 otp_words quoted-printable crc-zlib crc adler md2 md5 md5_otp sha sha1 sha1_otp haval crypt md5crypt transform rs_ecc zip bz2]
 [keywords transformation encoding {message digest} compression {error correction}]
 [manpage_end]
 
diff -up trf2.1.4/generic/init.c.ripemd trf2.1.4/generic/init.c
--- trf2.1.4/generic/init.c.ripemd	2009-06-18 00:54:43.000000000 -0400
+++ trf2.1.4/generic/init.c	2009-10-29 14:33:30.507530461 -0400
@@ -214,6 +214,7 @@ Tcl_Interp* interp;
   if (res != TCL_OK)
     return res;
 
+  /* Disable the non-free RIPEMD bits
   res = TrfInit_RIPEMD160 (interp);
 
   if (res != TCL_OK)
@@ -223,6 +224,7 @@ Tcl_Interp* interp;
 
   if (res != TCL_OK)
     return res;
+  */
 
   /*
    * Register freeform transformation, reflector into tcl level
diff -up trf2.1.4/generic/transformInt.h.ripemd trf2.1.4/generic/transformInt.h
--- trf2.1.4/generic/transformInt.h.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/generic/transformInt.h	2009-10-29 14:33:30.507530461 -0400
@@ -630,8 +630,8 @@ EXTERN int TrfInit_SHA1      _ANSI_ARGS_
 EXTERN int TrfInit_OTP_SHA1  _ANSI_ARGS_ ((Tcl_Interp* interp));
 EXTERN int TrfInit_ADLER     _ANSI_ARGS_ ((Tcl_Interp* interp));
 EXTERN int TrfInit_CRC_ZLIB  _ANSI_ARGS_ ((Tcl_Interp* interp));
-EXTERN int TrfInit_RIPEMD128 _ANSI_ARGS_ ((Tcl_Interp* interp));
-EXTERN int TrfInit_RIPEMD160 _ANSI_ARGS_ ((Tcl_Interp* interp));
+/* EXTERN int TrfInit_RIPEMD128 _ANSI_ARGS_ ((Tcl_Interp* interp)); */
+/* EXTERN int TrfInit_RIPEMD160 _ANSI_ARGS_ ((Tcl_Interp* interp)); */
 EXTERN int TrfInit_OTP_MD5   _ANSI_ARGS_ ((Tcl_Interp* interp));
 
 EXTERN int TrfInit_RS_ECC    _ANSI_ARGS_ ((Tcl_Interp* interp));
diff -up trf2.1.4/LSM.ripemd trf2.1.4/LSM
--- trf2.1.4/LSM.ripemd	2009-06-18 00:56:17.000000000 -0400
+++ trf2.1.4/LSM	2009-10-29 14:34:03.864389148 -0400
@@ -18,7 +18,7 @@ Description:    A loadable extension to 
 	an official part of the core.
 Keywords:       tcl, conversion, message digests, data compression,
 	error-correction, binary io, crc, md2, md5, sha, sha-1, haval, adler,
-	ripemd-160, dual, hexadecimal, octal, uuencode, base64, ascii85,
+	dual, hexadecimal, octal, uuencode, base64, ascii85,
 	reed-solomon, zlib, otp_md5, otp_sha1, otp_words
 Author:         Andreas Kupries (andreas_kupries at users.sourceforge.net)
 Maintained-by:  Andreas Kupries (andreas_kupries at users.sourceforge.net)
diff -up trf2.1.4/tea.tests/common_md.test.ripemd trf2.1.4/tea.tests/common_md.test
--- trf2.1.4/tea.tests/common_md.test.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tea.tests/common_md.test	2009-10-29 14:33:30.507530461 -0400
@@ -13,7 +13,7 @@
 # $Id: common_md.test,v 1.2 2000/11/18 22:42:32 aku Exp $
 
 
-# message digests: adler, crc, crc_zlib, haval, md5, md2, sha, rmd160, rmd128
+# message digests: adler, crc, crc_zlib, haval, md5, md2, sha
 # tests done with builtin digest 'crc'.
 
 foreach {i opt ovalue} {
diff -up trf2.1.4/tea.tests/________.ripemd trf2.1.4/tea.tests/________
--- trf2.1.4/tea.tests/________.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tea.tests/________	2009-10-29 14:33:30.508529332 -0400
@@ -13,7 +13,7 @@
 
 cd ../unix
 
-foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+foreach md {crc crc-zlib adler md5 sha haval} {
     set fail [catch {
 	exec ./tclsh ../tools/mdwrap -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
     } msg];#{}
@@ -27,7 +27,7 @@ cd ../tests
 if {0} {
     cd ..
 
-    foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+    foreach md {crc crc-zlib adler md5 sha haval} {
 	set fail [catch {
 	    exec unix/tclsh tools/md -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
 	} msg];#{}
diff -up trf2.1.4/tests/common.md.test.ripemd trf2.1.4/tests/common.md.test
--- trf2.1.4/tests/common.md.test.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tests/common.md.test	2009-10-29 14:33:30.508529332 -0400
@@ -14,7 +14,7 @@
 
 if {[string compare test [info procs test]] == 1} then {source defs}
 
-# message digests: adler, crc, crc_zlib, haval, md5, md2, sha, rmd160, rmd128
+# message digests: adler, crc, crc_zlib, haval, md5, md2, sha
 # tests done with builtin digest 'crc'.
 
 foreach {i opt ovalue} {
diff -up trf2.1.4/tests/________.ripemd trf2.1.4/tests/________
--- trf2.1.4/tests/________.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tests/________	2009-10-29 14:33:30.508529332 -0400
@@ -13,7 +13,7 @@
 
 cd ../unix
 
-foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+foreach md {crc crc-zlib adler md5 sha haval} {
     set fail [catch {
 	exec ./tclsh ../tools/mdwrap -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
     } msg];#{}
@@ -27,7 +27,7 @@ cd ../tests
 if {0} {
     cd ..
 
-    foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+    foreach md {crc crc-zlib adler md5 sha haval} {
 	set fail [catch {
 	    exec unix/tclsh tools/md -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
 	} msg];#{}
diff -up trf2.1.4/tools/md.ripemd trf2.1.4/tools/md
--- trf2.1.4/tools/md.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/tools/md	2009-10-29 14:33:30.508529332 -0400
@@ -41,7 +41,7 @@ proc usage {args} {
     puts stdout "\t-c file\t\tenter check mode, read data from file"
     puts stdout "\t-a alg\t\tuse specified algorithm to generate/check digests"
     puts stdout ""
-    puts stdout "\tallowed algorithms are: md5, haval, sha, crc, crc-zlib, adler, ripemd160, ripemd128"
+    puts stdout "\tallowed algorithms are: md5, haval, sha, crc, crc-zlib, adler"
     puts stdout ""
 
     exit


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-trf/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Mar 2009 14:02:37 -0000	1.2
+++ sources	29 Oct 2009 18:41:30 -0000	1.3
@@ -1,2 +1,2 @@
 95f63280f1a71a3e7a041fcb148bea52  haval-1.1.tar.gz
-00113b594c6cc32b76096b7bb11534be  trf2.1.3-noripemd.tar.bz2
+828c76fbae46c513072982283d333b0d  trf2.1.4-noripemd.tar.bz2


Index: tcl-trf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-trf/F-11/tcl-trf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tcl-trf.spec	6 Jul 2009 18:59:34 -0000	1.2
+++ tcl-trf.spec	29 Oct 2009 18:41:30 -0000	1.3
@@ -3,8 +3,8 @@
 %define realname trf
 
 Name:		tcl-%{realname}
-Version:	2.1.3
-Release:	3%{?dist}
+Version:	2.1.4
+Release:	1%{?dist}
 Summary:	Tcl extension providing "transformer" commands
 Group:		System Environment/Libraries
 License:	MIT and BSD and LGPLv2+ and GPLv2+ and Public Domain and OpenSSL
@@ -12,14 +12,13 @@ URL:		http://tcltrf.sourceforge.net
 # We can't use the upstream source because it includes the non-free ripemd implementation
 # Source0:	http://downloads.sourceforge.net/tcl%{realname}/%{realname}%{version}.tar.bz2
 # To make the clean tarball, just run:
-# rm -rf digests.ripemd128 digests.ripemd160 doc/ripemd160.man doc/html/ripemd160.html doc/html/ripemd128.html \
-# tests/rmd128.test tests/rmd160.test tea.tests/rmd128_bb.test tea.tests/rmd160_bb.test generic/rmd128.c generic/rmd160.c \ 
-# generic/ripemd/
+# rm -rf doc/ripemd160.man doc/html/ripemd160.html doc/html/ripemd128.html ./doc/tmml/ripemd128.tmml ./doc/tmml/ripemd160.tmml ./doc/ripemd128.man 
+# ./doc/digest/ripemd.inc ./generic/ripemd/ generic/rmd1* tea.tests/rmd1* tests/rmd1*
 Source0:	%{realname}%{version}-noripemd.tar.bz2
 # BSD licensed haval bits, included code is older and has bad license
 Source1:	http://labs.calyptix.com/haval-1.1.tar.gz
 Patch0:		trf2.1.3-havalfixes.patch
-Patch1:		trf2.1.3-noripemd.patch
+Patch1:		trf2.1.4-noripemd.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Provides:	%{realname} = %{version}-%{release}
 BuildRequires:	tcl-devel, tk-devel, zlib-devel, bzip2-devel, openssl-devel
@@ -75,7 +74,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc doc/ ANNOUNCE ChangeLog DESCRIPTION README*
-%{tcl_sitearch}/Trf2.1.3
+%{tcl_sitearch}/Trf%{version}
 
 %files devel
 %defattr(-,root,root,-)
@@ -83,6 +82,12 @@ rm -rf %{buildroot}
 %{_includedir}/trfDecls.h
 
 %changelog
+* Thu Oct 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.4-1
+- Update to 2.1.4
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.1.3-3
 - fix noripemd patch to resolve undefined symbols (bz 506072)
 




More information about the scm-commits mailing list