rpms/tcl-trf/F-10 tcl-trf.spec, 1.1, 1.2 trf2.1.3-noripemd.patch, 1.1, 1.2
Tom Callaway
spot at fedoraproject.org
Mon Jul 6 19:00:04 UTC 2009
Author: spot
Update of /cvs/pkgs/rpms/tcl-trf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22093/F-10
Modified Files:
tcl-trf.spec trf2.1.3-noripemd.patch
Log Message:
fix noripemd patch, resolves bz 506072
Index: tcl-trf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-trf/F-10/tcl-trf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tcl-trf.spec 13 Mar 2009 14:05:26 -0000 1.1
+++ tcl-trf.spec 6 Jul 2009 18:59:34 -0000 1.2
@@ -4,7 +4,7 @@
Name: tcl-%{realname}
Version: 2.1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Tcl extension providing "transformer" commands
Group: System Environment/Libraries
License: MIT and BSD and LGPLv2+ and GPLv2+ and Public Domain and OpenSSL
@@ -53,7 +53,7 @@ mv haval-1.1 haval/
ln -s haval haval.1996
popd
%patch0 -p1 -b .haval
-%patch1 -p1
+%patch1 -p1 -b .ripemd
# Get rid of incorrect ripemd docs
rm -rf doc/digest/ripemd.inc doc/man/ripemd128.n doc/man/ripemd160.n doc/ripemd128.man doc/tmml/ripemd128.tmml doc/tmml/ripemd160.tmml
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
%{_includedir}/trfDecls.h
%changelog
+* Mon Jul 6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.1.3-3
+- fix noripemd patch to resolve undefined symbols (bz 506072)
+
* Thu Mar 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.1.3-2
- update haval implementation for proper licensing
- drop non-free ripemd bits
trf2.1.3-noripemd.patch:
Index: trf2.1.3-noripemd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-trf/F-10/trf2.1.3-noripemd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- trf2.1.3-noripemd.patch 13 Mar 2009 14:05:26 -0000 1.1
+++ trf2.1.3-noripemd.patch 6 Jul 2009 18:59:34 -0000 1.2
@@ -1,6 +1,6 @@
-diff -up trf2.1.3/configure.in.noripemd trf2.1.3/configure.in
---- trf2.1.3/configure.in.noripemd 2009-03-12 11:59:56.000000000 -0400
-+++ trf2.1.3/configure.in 2009-03-12 12:00:09.000000000 -0400
+diff -up trf2.1.3/configure.in.ripemd trf2.1.3/configure.in
+--- trf2.1.3/configure.in.ripemd 2008-12-05 16:00:23.000000000 -0500
++++ trf2.1.3/configure.in 2009-07-06 13:06:18.594475506 -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])
@@ -9,9 +9,9 @@ diff -up trf2.1.3/configure.in.noripemd
TEA_ADD_SOURCES([otpmd5.c otpsha1.c])
TEA_ADD_SOURCES([rs_ecc.c])
-diff -up trf2.1.3/configure.noripemd trf2.1.3/configure
---- trf2.1.3/configure.noripemd 2009-03-12 11:59:23.000000000 -0400
-+++ trf2.1.3/configure 2009-03-12 11:59:47.000000000 -0400
+diff -up trf2.1.3/configure.ripemd trf2.1.3/configure
+--- trf2.1.3/configure.ripemd 2008-12-05 16:00:23.000000000 -0500
++++ trf2.1.3/configure 2009-07-06 13:06:18.598475318 -0400
@@ -6566,7 +6566,7 @@ echo "$as_me: error: could not find sour
@@ -21,9 +21,9 @@ diff -up trf2.1.3/configure.noripemd trf
for i in $vars; do
case $i in
\$*)
-diff -up trf2.1.3/DESCRIPTION.noripemd trf2.1.3/DESCRIPTION
---- trf2.1.3/DESCRIPTION.noripemd 2008-12-05 16:00:23.000000000 -0500
-+++ trf2.1.3/DESCRIPTION 2009-03-12 11:57:40.000000000 -0400
+diff -up trf2.1.3/DESCRIPTION.ripemd trf2.1.3/DESCRIPTION
+--- trf2.1.3/DESCRIPTION.ripemd 2008-12-05 16:00:23.000000000 -0500
++++ trf2.1.3/DESCRIPTION 2009-07-06 13:06:18.599475306 -0400
@@ -26,7 +26,7 @@ extension trf {
keywords {
tcl, conversion, message digests,
@@ -33,9 +33,9 @@ diff -up trf2.1.3/DESCRIPTION.noripemd t
uuencode, base64, ascii85, reed-solomon, zlib, otp_md5, otp_sha1,
otp_words
}
-diff -up trf2.1.3/doc/trf.man.noripemd trf2.1.3/doc/trf.man
---- trf2.1.3/doc/trf.man.noripemd 2008-12-05 16:00:23.000000000 -0500
-+++ trf2.1.3/doc/trf.man 2009-03-12 11:57:40.000000000 -0400
+diff -up trf2.1.3/doc/trf.man.ripemd trf2.1.3/doc/trf.man
+--- trf2.1.3/doc/trf.man.ripemd 2008-12-05 16:00:23.000000000 -0500
++++ trf2.1.3/doc/trf.man 2009-07-06 13:06:18.599475306 -0400
@@ -102,10 +102,6 @@ The second category are message digests
[cmd sha1_otp]
[enum]
@@ -56,9 +56,42 @@ diff -up trf2.1.3/doc/trf.man.noripemd t
[keywords transformation encoding {message digest} compression {error correction}]
[manpage_end]
-diff -up trf2.1.3/LSM.noripemd trf2.1.3/LSM
---- trf2.1.3/LSM.noripemd 2008-12-05 16:00:23.000000000 -0500
-+++ trf2.1.3/LSM 2009-03-12 11:57:40.000000000 -0400
+diff -up trf2.1.3/generic/init.c.ripemd trf2.1.3/generic/init.c
+--- trf2.1.3/generic/init.c.ripemd 2008-12-05 16:00:23.000000000 -0500
++++ trf2.1.3/generic/init.c 2009-07-06 13:10:48.011460824 -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.3/generic/transformInt.h.ripemd trf2.1.3/generic/transformInt.h
+--- trf2.1.3/generic/transformInt.h.ripemd 2008-12-05 16:00:23.000000000 -0500
++++ trf2.1.3/generic/transformInt.h 2009-07-06 13:06:18.600474735 -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.3/LSM.ripemd trf2.1.3/LSM
+--- trf2.1.3/LSM.ripemd 2008-12-05 16:00:23.000000000 -0500
++++ trf2.1.3/LSM 2009-07-06 13:06:18.600474735 -0400
@@ -18,7 +18,7 @@ Description: A loadable extension to
an official part of the core.
Keywords: tcl, conversion, message digests, data compression,
@@ -68,9 +101,9 @@ diff -up trf2.1.3/LSM.noripemd trf2.1.3/
reed-solomon, zlib, otp_md5, otp_sha1, otp_words
Author: Andreas Kupries (a.kupries at westend.com)
Maintained-by: Andreas Kupries (a.kupries at westend.com)
-diff -up trf2.1.3/PREPARE.noripemd trf2.1.3/PREPARE
---- trf2.1.3/PREPARE.noripemd 2008-12-05 16:26:05.000000000 -0500
-+++ trf2.1.3/PREPARE 2009-03-12 11:57:40.000000000 -0400
+diff -up trf2.1.3/PREPARE.ripemd trf2.1.3/PREPARE
+--- trf2.1.3/PREPARE.ripemd 2008-12-05 16:26:05.000000000 -0500
++++ trf2.1.3/PREPARE 2009-07-06 13:06:18.601475072 -0400
@@ -89,7 +89,7 @@ puts Generating digests (please wait)...
set files [exec /usr/bin/find . -type f -print]
regsub -all "\n" $files { } files
@@ -80,9 +113,9 @@ diff -up trf2.1.3/PREPARE.noripemd trf2.
puts $md ...
catch {eval exec md -a $md $files > digests.$md}
}
-diff -up trf2.1.3/tea.tests/common_md.test.noripemd trf2.1.3/tea.tests/common_md.test
---- trf2.1.3/tea.tests/common_md.test.noripemd 2009-03-12 11:58:29.000000000 -0400
-+++ trf2.1.3/tea.tests/common_md.test 2009-03-12 11:58:40.000000000 -0400
+diff -up trf2.1.3/tea.tests/common_md.test.ripemd trf2.1.3/tea.tests/common_md.test
+--- trf2.1.3/tea.tests/common_md.test.ripemd 2008-12-05 16:00:23.000000000 -0500
++++ trf2.1.3/tea.tests/common_md.test 2009-07-06 13:06:18.601475072 -0400
@@ -13,7 +13,7 @@
# $Id$
@@ -92,9 +125,9 @@ diff -up trf2.1.3/tea.tests/common_md.te
# tests done with builtin digest 'crc'.
foreach {i opt ovalue} {
-diff -up trf2.1.3/tea.tests/________.noripemd trf2.1.3/tea.tests/________
---- trf2.1.3/tea.tests/________.noripemd 2008-12-05 16:00:23.000000000 -0500
-+++ trf2.1.3/tea.tests/________ 2009-03-12 11:57:40.000000000 -0400
+diff -up trf2.1.3/tea.tests/________.ripemd trf2.1.3/tea.tests/________
+--- trf2.1.3/tea.tests/________.ripemd 2008-12-05 16:00:23.000000000 -0500
++++ trf2.1.3/tea.tests/________ 2009-07-06 13:06:18.601475072 -0400
@@ -13,7 +13,7 @@
cd ../unix
@@ -113,9 +146,9 @@ diff -up trf2.1.3/tea.tests/________.nor
set fail [catch {
exec unix/tclsh tools/md -a $md -c digests.$md | sed -e {s/^/ /} >@ stdout
} msg];#{}
-diff -up trf2.1.3/tests/common.md.test.noripemd trf2.1.3/tests/common.md.test
---- trf2.1.3/tests/common.md.test.noripemd 2009-03-12 11:58:58.000000000 -0400
-+++ trf2.1.3/tests/common.md.test 2009-03-12 11:59:09.000000000 -0400
+diff -up trf2.1.3/tests/common.md.test.ripemd trf2.1.3/tests/common.md.test
+--- trf2.1.3/tests/common.md.test.ripemd 2008-12-05 16:00:23.000000000 -0500
++++ trf2.1.3/tests/common.md.test 2009-07-06 13:06:18.602474780 -0400
@@ -14,7 +14,7 @@
if {[string compare test [info procs test]] == 1} then {source defs}
@@ -125,9 +158,9 @@ diff -up trf2.1.3/tests/common.md.test.n
# tests done with builtin digest 'crc'.
foreach {i opt ovalue} {
-diff -up trf2.1.3/tests/________.noripemd trf2.1.3/tests/________
---- trf2.1.3/tests/________.noripemd 2008-12-05 16:00:23.000000000 -0500
-+++ trf2.1.3/tests/________ 2009-03-12 11:57:40.000000000 -0400
+diff -up trf2.1.3/tests/________.ripemd trf2.1.3/tests/________
+--- trf2.1.3/tests/________.ripemd 2008-12-05 16:00:23.000000000 -0500
++++ trf2.1.3/tests/________ 2009-07-06 13:06:18.602474780 -0400
@@ -13,7 +13,7 @@
cd ../unix
@@ -146,9 +179,9 @@ diff -up trf2.1.3/tests/________.noripem
set fail [catch {
exec unix/tclsh tools/md -a $md -c digests.$md | sed -e {s/^/ /} >@ stdout
} msg];#{}
-diff -up trf2.1.3/tools/md.noripemd trf2.1.3/tools/md
---- trf2.1.3/tools/md.noripemd 2008-12-05 16:00:23.000000000 -0500
-+++ trf2.1.3/tools/md 2009-03-12 11:57:40.000000000 -0400
+diff -up trf2.1.3/tools/md.ripemd trf2.1.3/tools/md
+--- trf2.1.3/tools/md.ripemd 2008-12-05 16:00:23.000000000 -0500
++++ trf2.1.3/tools/md 2009-07-06 13:06:18.603475257 -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"
More information about the fedora-extras-commits
mailing list