diff options
author | Erwin Lansing <erwin@FreeBSD.org> | 2009-06-13 19:22:49 +0000 |
---|---|---|
committer | Erwin Lansing <erwin@FreeBSD.org> | 2009-06-13 19:22:49 +0000 |
commit | adbca29e83b79341b9269d0e582619cea059db3a (patch) | |
tree | 251ccf3e545218797aa6a6f6fa2fc4d62eccd102 /devel | |
parent | 8bebdfc940bd1b2cd50f63d7bfe7a7124f144a3f (diff) | |
download | ports-adbca29e83b79341b9269d0e582619cea059db3a.tar.gz ports-adbca29e83b79341b9269d0e582619cea059db3a.zip |
Notes
Diffstat (limited to 'devel')
-rw-r--r-- | devel/Makefile | 1 | ||||
-rw-r--r-- | devel/tcl-trf/Makefile | 92 | ||||
-rw-r--r-- | devel/tcl-trf/distinfo | 3 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-buggytests | 36 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-bz2_opt | 16 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-configure | 28 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-crypt | 32 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-haval | 118 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-intsize | 33 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-loadman | 22 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-md2 | 138 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-md5dig | 204 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-mkin | 66 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-reftocrc | 14 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-rmd128 | 24 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-rmd160 | 242 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-sha | 196 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-sha1 | 141 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-test | 38 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-warnings | 117 | ||||
-rw-r--r-- | devel/tcl-trf/files/patch-zlib | 112 | ||||
-rw-r--r-- | devel/tcl-trf/pkg-descr | 12 | ||||
-rw-r--r-- | devel/tcl-trf/pkg-plist | 80 |
23 files changed, 0 insertions, 1765 deletions
diff --git a/devel/Makefile b/devel/Makefile index c2c7e2551c07..4bd88b714547 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -2742,7 +2742,6 @@ SUBDIR += tbb SUBDIR += tcl-memchan SUBDIR += tcl-neo - SUBDIR += tcl-trf SUBDIR += tclcheck SUBDIR += tclcl SUBDIR += tclgetopts diff --git a/devel/tcl-trf/Makefile b/devel/tcl-trf/Makefile deleted file mode 100644 index 81ed130e5b00..000000000000 --- a/devel/tcl-trf/Makefile +++ /dev/null @@ -1,92 +0,0 @@ -# New ports collection makefile for: tcl-Trf -# Date created: May 22, 2000 -# Whom: Mikhail Teterin <mi@aldan.algebra.com> -# -# $FreeBSD$ -# - -PORTNAME= Trf -PORTVERSION= 2.1p2 -PORTREVISION= 4 -CATEGORIES= devel tcl -MASTER_SITES= http://www.oche.de/~akupries/soft/trf/download/ -PKGNAMEPREFIX= tcl- -DISTNAME= trf${PORTVERSION} - -MAINTAINER= mi@aldan.algebra.com -COMMENT= Data conversion, digests, compression, error-correction for Tcl - -BUILD_DEPENDS= tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${TCL_VER:S/.//} \ - ${LOCALBASE}/lib/tcl${TCL_VER}/Memchan/pkgIndex.tcl:${PORTSDIR}/devel/tcl-memchan - -BROKEN= self-test fails - -USE_BZIP2= yes - -ALL_TARGET= all test - -TCL_VER?= 8.4 -DDIR= ${PREFIX}/lib/tcl${TCL_VER}/Trf - -MAKE_ENV+= TCL_VER=${TCL_VER} MKDIR="${MKDIR}" \ - INSTALL_DATA="${INSTALL_DATA}" - -REINPLACE_ARGS= -i "" -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl${TCL_VER} \ - --with-tclinclude=${LOCALBASE}/include/tcl${TCL_VER} \ - --enable-static-zlib --enable-static-bzlib \ - --enable-static-md5 - -post-extract: - ${RM} -rf ${WRKSRC}/compat - -post-patch: - # Make direct calls to -lbz2 - ${REINPLACE_CMD} -E 's,bz\.([^(]+),BZ2_bz\1,g' \ - ${WRKSRC}/generic/bz2.c - ${REINPLACE_CMD} -E \ - 's,BZ2_bzcomp,BZ2_bzComp,g;s,BZ2_bzdecomp,BZ2_bzDecomp,g' \ - ${WRKSRC}/generic/bz2.c - # Make direct calls to -lz - ${REINPLACE_CMD} -E 's,zf\.([^(]+),\1,g' ${WRKSRC}/generic/adler.c \ - ${WRKSRC}/generic/crc_zlib.c ${WRKSRC}/generic/zip.c - # Don't re-invent the dynamic linker: - ${REINPLACE_CMD} 's,"loadman\.h","transformInt.h",' ${WRKSRC}/generic/*.c -.ifdef TRF_USE_MD - # - # Using FreeBSD's own -lmd instead of OpenSSL's -lcrypto - # - ${REINPLACE_CMD} -E -e 's,openssl/,,' \ - -e 's,(MD[25])_([A-Z][a-z]),\1\2,g' \ - ${WRKSRC}/generic/*.[ch] - ${REINPLACE_CMD} 's,-lcrypto,-lmd,' ${WRKSRC}/Makefile.in -.else - # - # Using OpenSSL's impelemtations of for message digests (-lcrypto) - # To use FreeBSD's own -lmd, stop now and restart make with: - # - # -DTRF_USE_MD - # -USE_OPENSSL= yes -.endif - -post-install: - ${LN} -sf ${SHLIB_NAME} ${PREFIX}/lib/${SHLIB_LINK} -.ifndef(NOPORTDOCS) - ${RM} -f ${WRKSRC}/doc/html/*.orig - ${MKDIR} ${DOCSDIR} - ${CP} -pR ${WRKSRC}/doc/html/* ${DOCSDIR} - ${CHMOD} -R +r ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/painless-guide-to-crc.txt ${DOCSDIR} -.endif - -.include <bsd.port.pre.mk> - -SHLIB_NAME= libTrf2.so.1 -SHLIB_LINK= ${SHLIB_NAME:C/\.so\..*/.so/} - -PLIST_SUB+= SHLIB_NAME=${SHLIB_NAME} SHLIB_LINK=${SHLIB_LINK} \ - TCL_DVER=${TCL_VER:C/\.//} - -.include <bsd.port.post.mk> diff --git a/devel/tcl-trf/distinfo b/devel/tcl-trf/distinfo deleted file mode 100644 index f6575b69322f..000000000000 --- a/devel/tcl-trf/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (trf2.1p2.tar.bz2) = 4332afc167f7d1b3a90b942c30424491 -SHA256 (trf2.1p2.tar.bz2) = 42dcc3cf379cbf039d81cf5bfb60fd1741b001f5d49a8634c44a6a4da00f4670 -SIZE (trf2.1p2.tar.bz2) = 1262347 diff --git a/devel/tcl-trf/files/patch-buggytests b/devel/tcl-trf/files/patch-buggytests deleted file mode 100644 index be903aebd68d..000000000000 --- a/devel/tcl-trf/files/patch-buggytests +++ /dev/null @@ -1,36 +0,0 @@ - -*************************************************************** - - This patch-set "fixes" the three tests, which fail - for the reasons unknown to me. The failures may, in - fact, be justified, but the software author is yet - to get back to me with his opinion. - - -mi - -*************************************************************** - ---- tests/base64.test Fri Jul 9 14:36:32 1999 -+++ tests/base64.test Fri Feb 15 02:01:22 2002 -@@ -57,5 +57,5 @@ - close $ma - list [string length $data] $data --} {4 hell} -+} {3 hel} - - -@@ -69,4 +69,3 @@ - close $ma - list [string length $data] $data --} {9 {aGVsbG8= --}} -+} {4 aGVs} ---- tests/transform.test Tue Aug 21 01:51:33 2001 -+++ tests/transform.test Fri Feb 15 02:03:07 2002 -@@ -74,5 +74,5 @@ - - set tracevar --} [82 {create/write-0 create/read-0 query/ratio-0 query/maxRead-0 read-17 query/maxRead-0 flush/read-0 flush/write-0 delete/write-0 delete/read-0} {create/write-0 create/read-0 query/ratio-0 query/maxRead-0 read-17 query/maxRead-0 flush/read-0 query/maxRead-0 flush/write-0 delete/write-0 delete/read-0}] -+} [82 {create/write-0 create/read-0 query/ratio-0 query/maxRead-0 read-17 query/maxRead-0 flush/write-0 flush/read-0 delete/write-0 delete/read-0} {create/write-0 create/read-0 query/ratio-0 query/maxRead-0 read-17 query/maxRead-0 flush/read-0 query/maxRead-0 flush/write-0 delete/write-0 delete/read-0}] - - diff --git a/devel/tcl-trf/files/patch-bz2_opt b/devel/tcl-trf/files/patch-bz2_opt deleted file mode 100644 index 15c071d06b2a..000000000000 --- a/devel/tcl-trf/files/patch-bz2_opt +++ /dev/null @@ -1,16 +0,0 @@ ---- generic/bz2_opt.c Sat Nov 18 17:42:31 2000 -+++ generic/bz2_opt.c Fri Feb 15 14:09:36 2002 -@@ -182,13 +182,4 @@ - - /* -- * 'bz2' is used, therefore load the required library. -- * And bail out if it is not available. -- */ -- -- if (TCL_OK != TrfLoadBZ2lib (interp)) { -- return TCL_ERROR; -- } -- -- /* - * Now perform the real option check. - */ diff --git a/devel/tcl-trf/files/patch-configure b/devel/tcl-trf/files/patch-configure deleted file mode 100644 index 03210cc3d209..000000000000 --- a/devel/tcl-trf/files/patch-configure +++ /dev/null @@ -1,28 +0,0 @@ ---- configure Tue Aug 21 01:52:30 2001 -+++ configure Fri Feb 8 11:52:30 2002 -@@ -1487,5 +1487,5 @@ - #include "confdefs.h" - --main(){return(0);} -+int main(){return(0);} - EOF - if { (eval echo configure:1492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -@@ -2658,7 +2658,7 @@ - - if test "${SHARED_BUILD}" = "1" ; then -- CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS}' -+ CFLAGS='${CFLAGS_WARNING} ${SHLIB_CFLAGS}' - else -- CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING}' -+ CFLAGS='${CFLAGS_WARNING}' - fi - -@@ -2690,6 +2690,6 @@ - ;; - *) -- MAKE_STATIC_LIB="\${STLIB_LD} \$@ \$(\$@_OBJECTS)" -- MAKE_SHARED_LIB="\${SHLIB_LD} -o \$@ \$(\$@_OBJECTS) \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS}" -+ MAKE_STATIC_LIB="\${STLIB_LD} \$@ \$(.ALLSRC)" -+ MAKE_SHARED_LIB="\${SHLIB_LD} -o \$@ \$(.ALLSRC) \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS}" - ;; - esac diff --git a/devel/tcl-trf/files/patch-crypt b/devel/tcl-trf/files/patch-crypt deleted file mode 100644 index c611354e8fe9..000000000000 --- a/devel/tcl-trf/files/patch-crypt +++ /dev/null @@ -1,32 +0,0 @@ ---- generic/crypt.c Sat Nov 18 17:42:31 2000 -+++ generic/crypt.c Fri Feb 8 11:59:47 2002 -@@ -29,4 +29,6 @@ - -+#include <sys/types.h> -+#include <unistd.h> - #include "loadman.h" - - static int -@@ -112,4 +112,6 @@ - */ - -+char *crypt_md5(const char *pw, const char *salt); /* Lives in -lcrypt */ -+ - static int - TrfMd5CryptObjCmd (notUsed, interp, objc, objv) -@@ -128,8 +130,4 @@ - Tcl_Obj* res; - -- if (TrfLoadMD5 (interp) != TCL_OK) { -- return TCL_ERROR; -- } -- - if (objc != 3) { - Tcl_AppendResult (interp, -@@ -159,5 +157,5 @@ - - TrfLock; -- res = Tcl_NewStringObj ((char*) md5f.crypt (passwd, salt_b) + 3, -1); -+ res = Tcl_NewStringObj (crypt_md5(passwd, salt_b) + 3, -1); - TrfUnlock; - diff --git a/devel/tcl-trf/files/patch-haval b/devel/tcl-trf/files/patch-haval deleted file mode 100644 index f6527b081264..000000000000 --- a/devel/tcl-trf/files/patch-haval +++ /dev/null @@ -1,118 +0,0 @@ ---- generic/haval.c Wed Aug 9 15:13:17 2000 -+++ generic/haval.c Fri Jul 9 16:25:39 2004 -@@ -46,8 +46,5 @@ - */ - --static void MDHaval_Start _ANSI_ARGS_ ((VOID* context)); - static void MDHaval_Update _ANSI_ARGS_ ((VOID* context, unsigned int character)); --static void MDHaval_UpdateBuf _ANSI_ARGS_ ((VOID* context, unsigned char* buffer, int bufLen)); --static void MDHaval_Final _ANSI_ARGS_ ((VOID* context, VOID* digest)); - - /* -@@ -59,8 +56,8 @@ - sizeof (CTX_TYPE), - DIGEST_SIZE, -- MDHaval_Start, -+ (Trf_MDStart *)haval_start, - MDHaval_Update, -- MDHaval_UpdateBuf, -- MDHaval_Final, -+ (Trf_MDUpdateBuf *)haval_hash, -+ (Trf_MDFinal *)haval_end, - NULL - }; -@@ -94,30 +91,4 @@ - *------------------------------------------------------* - * -- * MDHaval_Start -- -- * -- * ------------------------------------------------* -- * Initialize the internal state of the message -- * digest generator. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * As of the called procedure. -- * -- * Result: -- * None. -- * -- *------------------------------------------------------* -- */ -- --static void --MDHaval_Start (context) --VOID* context; --{ -- haval_start ((CTX_TYPE*) context); --} -- --/* -- *------------------------------------------------------* -- * - * MDHaval_Update -- - * -@@ -145,63 +116,3 @@ - haval_hash ((CTX_TYPE*) context, &buf, 1); - } -- --/* -- *------------------------------------------------------* -- * -- * MDHaval_UpdateBuf -- -- * -- * ------------------------------------------------* -- * Update the internal state of the message digest -- * generator for a character buffer. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * As of the called procedure. -- * -- * Result: -- * None. -- * -- *------------------------------------------------------* -- */ -- --static void --MDHaval_UpdateBuf (context, buffer, bufLen) --VOID* context; --unsigned char* buffer; --int bufLen; --{ -- haval_hash ((CTX_TYPE*) context, (unsigned char*) buffer, bufLen); --} -- --/* -- *------------------------------------------------------* -- * -- * MDHaval_Final -- -- * -- * ------------------------------------------------* -- * Generate the digest from the internal state of -- * the message digest generator. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * As of the called procedure. -- * -- * Result: -- * None. -- * -- *------------------------------------------------------* -- */ -- --static void --MDHaval_Final (context, digest) --VOID* context; --VOID* digest; --{ -- haval_end ((CTX_TYPE*) context, (unsigned char*) digest); --} -- --/* -- * External code from here on. -- */ -- - #include "haval.1996/haval.c" /* THREADING: import of one constant var, read-only => safe */ diff --git a/devel/tcl-trf/files/patch-intsize b/devel/tcl-trf/files/patch-intsize deleted file mode 100644 index f95655d2aac7..000000000000 --- a/devel/tcl-trf/files/patch-intsize +++ /dev/null @@ -1,33 +0,0 @@ ---- generic/haval.1996/haval.h Fri Jul 11 12:07:36 1997 -+++ generic/haval.1996/haval.h Sun Jul 11 13:43:41 2004 -@@ -47,9 +47,6 @@ - */ - --#ifdef __alpha /* aku, Sep 23, 1996 */ --typedef unsigned int haval_word; /* a HAVAL word = 32 bits */ --#else --typedef unsigned long int haval_word; /* a HAVAL word = 32 bits */ --#endif -+#include <sys/types.h> -+typedef uint32_t haval_word; /* a HAVAL word = 32 bits */ - - typedef struct { ---- generic/ripemd/rmd128.h Mon May 19 16:53:18 1997 -+++ generic/ripemd/rmd128.h Sun Jul 11 13:48:54 2004 -@@ -33,12 +33,8 @@ - /* adapt these, if necessary, - for your operating system and compiler */ -+#include <sys/types.h> --typedef unsigned char byte; /* unsigned 8-bit type */ --typedef unsigned short word; /* unsigned 16-bit type */ -- --#ifdef __alpha --typedef unsigned int dword; /* unsigned 32-bit integer (AXP) */ --#else --typedef unsigned long dword; /* unsigned 32-bit type */ --#endif -+typedef uint8_t byte; /* unsigned 8-bit type */ -+typedef uint16_t word; /* unsigned 16-bit type */ -+typedef uint32_t dword; /* unsigned 32-bit type */ - - /********************************************************************/ diff --git a/devel/tcl-trf/files/patch-loadman b/devel/tcl-trf/files/patch-loadman deleted file mode 100644 index a963d3188193..000000000000 --- a/devel/tcl-trf/files/patch-loadman +++ /dev/null @@ -1,22 +0,0 @@ ---- generic/loadman.h Fri Feb 15 14:49:06 2002 -+++ generic/loadman.h Fri Feb 15 14:50:48 2002 -@@ -48,9 +48,4 @@ - - #ifdef HAVE_MD2_H --# ifdef OPENSSL_SUB --# include <openssl/md2.h> --# else --# include <md2.h> --# endif - #else - # include "../compat/md2.h" -@@ -58,9 +54,4 @@ - - #ifdef HAVE_SHA_H --# ifdef OPENSSL_SUB --# include <openssl/sha.h> --# else --# include <sha.h> --# endif - #else - # include "../compat/sha.h" diff --git a/devel/tcl-trf/files/patch-md2 b/devel/tcl-trf/files/patch-md2 deleted file mode 100644 index e9702c18fba9..000000000000 --- a/devel/tcl-trf/files/patch-md2 +++ /dev/null @@ -1,138 +0,0 @@ ---- generic/md2.c Wed Aug 9 15:13:17 2000 -+++ generic/md2.c Sat Jul 10 17:43:07 2004 -@@ -28,4 +28,6 @@ - */ - -+#include <sys/types.h> -+#include <openssl/md2.h> - #include "loadman.h" - -@@ -38,5 +40,5 @@ - */ - --#define DIGEST_SIZE (MD2_DIGEST_LENGTH) -+#define DIGEST_SIZE (16) - #define CTX_TYPE MD2_CTX - -@@ -45,9 +47,6 @@ - */ - --static void MDmd2_Start _ANSI_ARGS_ ((VOID* context)); - static void MDmd2_Update _ANSI_ARGS_ ((VOID* context, unsigned int character)); --static void MDmd2_UpdateBuf _ANSI_ARGS_ ((VOID* context, unsigned char* buffer, int bufLen)); - static void MDmd2_Final _ANSI_ARGS_ ((VOID* context, VOID* digest)); --static int MDmd2_Check _ANSI_ARGS_ ((Tcl_Interp* interp)); - - /* -@@ -59,9 +58,9 @@ - sizeof (CTX_TYPE), - DIGEST_SIZE, -- MDmd2_Start, -+ (Trf_MDStart *)MD2_Init, - MDmd2_Update, -- MDmd2_UpdateBuf, -+ (Trf_MDUpdateBuf *)MD2_Update, - MDmd2_Final, -- MDmd2_Check -+ NULL - }; - -@@ -94,30 +93,4 @@ - *------------------------------------------------------* - * -- * MDmd2_Start -- -- * -- * ------------------------------------------------* -- * Initialize the internal state of the message -- * digest generator. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * As of the called procedure. -- * -- * Result: -- * None. -- * -- *------------------------------------------------------* -- */ -- --static void --MDmd2_Start (context) --VOID* context; --{ -- md2f.init ((MD2_CTX*) context); --} -- --/* -- *------------------------------------------------------* -- * - * MDmd2_Update -- - * -@@ -143,33 +116,5 @@ - unsigned char buf = character; - -- md2f.update ((MD2_CTX*) context, &buf, 1); --} -- --/* -- *------------------------------------------------------* -- * -- * MDmd2_UpdateBuf -- -- * -- * ------------------------------------------------* -- * Update the internal state of the message digest -- * generator for a character buffer. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * As of the called procedure. -- * -- * Result: -- * None. -- * -- *------------------------------------------------------* -- */ -- --static void --MDmd2_UpdateBuf (context, buffer, bufLen) --VOID* context; --unsigned char* buffer; --int bufLen; --{ -- md2f.update ((MD2_CTX*) context, (unsigned char*) buffer, bufLen); -+ MD2_Update ((MD2_CTX*) context, &buf, 1); - } - -@@ -198,31 +143,4 @@ - VOID* digest; - { -- md2f.final ((unsigned char*) digest, (MD2_CTX*) context); --} -- --/* -- *------------------------------------------------------* -- * -- * MDmd2_Check -- -- * -- * ------------------------------------------------* -- * Do global one-time initializations of the message -- * digest generator. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * Loads the shared library containing the -- * MD2 functionality -- * -- * Result: -- * A standard Tcl error code. -- * -- *------------------------------------------------------* -- */ -- --static int --MDmd2_Check (interp) --Tcl_Interp* interp; --{ -- return TrfLoadMD2 (interp); -+ MD2_Final ((unsigned char*) digest, (MD2_CTX*) context); - } diff --git a/devel/tcl-trf/files/patch-md5dig b/devel/tcl-trf/files/patch-md5dig deleted file mode 100644 index a0755602ef44..000000000000 --- a/devel/tcl-trf/files/patch-md5dig +++ /dev/null @@ -1,204 +0,0 @@ ---- generic/md5dig.c Wed Aug 9 15:13:17 2000 -+++ generic/md5dig.c Sat Jul 10 16:40:44 2004 -@@ -30,4 +30,6 @@ - #include "loadman.h" - -+#include <sys/types.h> -+#include <openssl/md5.h> - /* - * Generator description -@@ -38,7 +39,4 @@ - */ - --#define MD5_CTX struct md5_ctx --#define MD5_CTXP (struct md5_ctx*) -- - #ifndef OTP - #define DIGEST_SIZE (16) -@@ -52,10 +50,6 @@ - */ - --static void MDmd5_Start _ANSI_ARGS_ ((VOID* context)); - static void MDmd5_Update _ANSI_ARGS_ ((VOID* context, unsigned int character)); --static void MDmd5_UpdateBuf _ANSI_ARGS_ ((VOID* context, -- unsigned char* buffer, int bufLen)); - static void MDmd5_Final _ANSI_ARGS_ ((VOID* context, VOID* digest)); --static int MDmd5_Check _ANSI_ARGS_ ((Tcl_Interp* interp)); - - /* -@@ -72,9 +66,9 @@ - sizeof (CTX_TYPE), - DIGEST_SIZE, -- MDmd5_Start, -+ (Trf_MDStart *)MD5_Init, - MDmd5_Update, -- MDmd5_UpdateBuf, -+ (Trf_MDUpdateBuf *)MD5_Update, - MDmd5_Final, -- MDmd5_Check -+ NULL, - }; - -@@ -111,38 +105,4 @@ - *------------------------------------------------------* - * -- * MDmd5_Start -- -- * -- * ------------------------------------------------* -- * Initialize the internal state of the message -- * digest generator. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * As of the called procedure. -- * -- * Result: -- * None. -- * -- *------------------------------------------------------* -- */ -- --static void --MDmd5_Start (context) --VOID* context; --{ -- /* MD5Init ((MD5_CTX*) context);*/ -- md5f.init (MD5_CTXP context); -- --#ifdef TRF_DEBUG -- { -- MD5_CTX* c = MD5_CTXP context; -- PRINT ("Init ABCD = %d %d %d %d\n", c->A, c->B, c->C, c->D); FL; -- } --#endif --} -- --/* -- *------------------------------------------------------* -- * - * MDmd5_Update -- - * -@@ -168,52 +128,5 @@ - unsigned char buf = character; - -- /* MD5Update ((MD5_CTX*) context, &buf, 1); */ -- -- md5f.update (&buf, 1, MD5_CTXP context); --} -- --/* -- *------------------------------------------------------* -- * -- * MDmd5_UpdateBuf -- -- * -- * ------------------------------------------------* -- * Update the internal state of the message digest -- * generator for a character buffer. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * As of the called procedure. -- * -- * Result: -- * None. -- * -- *------------------------------------------------------* -- */ -- --static void --MDmd5_UpdateBuf (context, buffer, bufLen) --VOID* context; --unsigned char* buffer; --int bufLen; --{ -- /* MD5Update ((MD5_CTX*) context, (unsigned char*) buffer, bufLen);*/ -- -- PRTSTR ("update by %d (%s)\n", bufLen, buffer); --#ifdef TRF_DEBUG -- { -- MD5_CTX* c = MD5_CTXP context; -- PRINT ("Upd1 ABCD = %d %d %d %d\n", c->A, c->B, c->C, c->D); FL; -- } --#endif -- -- md5f.update ((unsigned char*) buffer, bufLen, MD5_CTXP context); -- --#ifdef TRF_DEBUG -- { -- MD5_CTX* c = MD5_CTXP context; -- PRINT ("Upd2 ABCD = %d %d %d %d\n", c->A, c->B, c->C, c->D); FL; -- } --#endif -+ MD5_Update ((MD5_CTX*) context, &buf, 1); - } - -@@ -243,6 +156,5 @@ - { - #ifndef OTP -- /* MD5Final ((unsigned char*) digest, (MD5_CTX*) context); */ -- md5f.final (MD5_CTXP context, (unsigned char*) digest); -+ MD5_Final ((unsigned char*) digest, (MD5_CTX*) context); - #else - int i; -@@ -250,5 +162,5 @@ - - /* MD5Final ((unsigned char*) result, (MD5_CTX*) context);*/ -- md5f.final (MD5_CTXP context, (unsigned char*) result); -+ MD5_Final ((unsigned char*) result, (MD5_CTX*) context); - - for (i = 0; i < 8; i++) -@@ -265,54 +177,2 @@ - #endif - } -- --/* -- *------------------------------------------------------* -- * -- * MDmd5_Check -- -- * -- * ------------------------------------------------* -- * Do global one-time initializations of the message -- * digest generator. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * Loads the shared library containing the -- * SHA1 functionality -- * -- * Result: -- * A standard Tcl error code. -- * -- *------------------------------------------------------* -- */ -- --static int --MDmd5_Check (interp) --Tcl_Interp* interp; --{ --#ifdef MD5_STATIC_BUILD -- return TCL_OK; --#else -- return TrfLoadMD5 (interp); --#endif --} -- --/* Import the MD5 code in case of static linkage. -- */ --#ifdef MD5_STATIC_BUILD --/* -- * External code from here on. -- */ -- --#ifndef OTP --#include "../md5-crypt/md5.c" /* THREADING: import of one constant var, read-only => safe */ --#endif -- --md5Functions md5f = { -- 0, -- md5_init_ctx, -- md5_process_bytes, -- md5_finish_ctx, -- 0, /* no crypt code! */ --}; -- --#endif diff --git a/devel/tcl-trf/files/patch-mkin b/devel/tcl-trf/files/patch-mkin deleted file mode 100644 index fe288c5a95e6..000000000000 --- a/devel/tcl-trf/files/patch-mkin +++ /dev/null @@ -1,66 +0,0 @@ ---- Makefile.in Tue Aug 21 01:52:21 2001 -+++ Makefile.in Sat Jul 10 17:51:42 2004 -@@ -34,5 +34,5 @@ - #======================================================================== - --lib_BINARIES = $(Trf_LIB_FILE) $(Trf_STUB_LIB_FILE) $(MD5_LIB_FILE) -+lib_BINARIES = $(Trf_LIB_FILE) $(Trf_STUB_LIB_FILE) - BINARIES = $(lib_BINARIES) - -@@ -50,5 +50,4 @@ - TRF_BASE_SRC = $(TRF_GENSRCDIR)/zlib.c \ - $(TRF_GENSRCDIR)/bz2lib.c \ -- $(TRF_GENSRCDIR)/loadman.c \ - $(TRF_GENSRCDIR)/init.c \ - $(TRF_GENSRCDIR)/registry.c \ -@@ -123,7 +123,5 @@ - $(TRF_COMPRESS_OBJ) - --TRF_BASE_OBJ = @DL_OBJS@ bz2lib.$(OBJEXT) \ -- zlib.$(OBJEXT) \ -- loadman.$(OBJEXT) \ -+TRF_BASE_OBJ = @DL_OBJS@ \ - init.$(OBJEXT) \ - registry.$(OBJEXT) \ -@@ -191,5 +190,5 @@ - #======================================================================== - --Trf_LIB_FILE = @Trf_LIB_FILE@ -+Trf_LIB_FILE = libTrf2.so.1 - $(Trf_LIB_FILE)_OBJECTS = $(Trf_OBJECTS) - -@@ -299,10 +298,10 @@ - RANLIB = @RANLIB@ - SHLIB_CFLAGS = @SHLIB_CFLAGS@ --SHLIB_LD = @SHLIB_LD@ -+SHLIB_LD = $(CC) -shared - SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ --SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -+SHLIB_LD_LIBS = -lcrypto -lbz2 -lz @SHLIB_LD_LIBS@ - STLIB_LD = @STLIB_LD@ - TCL_BIN_DIR = @TCL_BIN_DIR@ --TCL_DEFS = @TCL_DEFS@ -+TCL_DEFS = @TCL_DEFS@ -DHAVE_BZLIB_H - TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ - TCL_LD_FLAGS = @TCL_LD_FLAGS@ -@@ -346,5 +345,5 @@ - LIBS = @LIBS@ - AR = ar --CFLAGS = @CFLAGS@ -+CFLAGS += @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - -@@ -431,5 +430,5 @@ - - check: test --test: -+test: $(Trf_LIB_FILE) - LD_LIBRARY_PATH="$(srcdir):../tea/:$(ZLIB_LIB_DIR):$(SSL_LIB_DIR)"; \ - export LD_LIBRARY_PATH; \ -@@ -755,5 +757,5 @@ - done - if test "x$(MAKE_LIB)" = "x$(MAKE_SHARED_LIB)"; then \ -- $(TCLSH_PROG) mkIndex.tcl $(lib_BINARIES); \ -+ $(TCLSH_PROG) mkIndex.tcl $(Trf_LIB_FILE); \ - fi - diff --git a/devel/tcl-trf/files/patch-reftocrc b/devel/tcl-trf/files/patch-reftocrc deleted file mode 100644 index ea0a3c380841..000000000000 --- a/devel/tcl-trf/files/patch-reftocrc +++ /dev/null @@ -1,14 +0,0 @@ -This adds a link to the painless-guide-to-crc.txt -- a text document -bundled in with the Trf distribution. Someone browsing the doc directory -will most likely see the index.html file, and it might be useful if this -document is referenced from it. - - -mi - ---- doc/html/index.html Tue Aug 21 01:52:27 2001 -+++ doc/html/index.html Fri Feb 15 02:19:50 2002 -@@ -10,3 +10,3 @@ - <hr> --<p align=center><font size=7><b>[</b></font> <a href="sitemap.html">Sitemap</a> <font size=7><b>]</b></font>       <font size=7><b>[</b></font> <a href="trf_news.html">News</a><font size=7><b>|</b></font> <a href="trf_changelog.html">ChangeLog</a><font size=7><b>|</b></font> <a href="trf_intro.html">Introduction</a><font size=7><b>|</b></font> <a href="trf_where.html">Download</a><font size=7><b>|</b></font> <a href="trf_ack.html">Acknowledgements, Disclaimer</a><font size=7><b>|</b></font> <a href="trf_danger.html">Danger!</a><font size=7><b>|</b></font> <a href="trf_install.html">Installation</a><font size=7><b>|</b></font> <a href="trf_cmds.html">Commands</a><font size=7><b>|</b></font> <a href="trf_capi.html">C API</a><font size=7><b>|</b></font> <a href="trf_copyrights.html">Copyrights</a><font size=7><b>|</b></font> <a href="trf_future.html">Future work</a> <font size=7><b>]</b></font></p> -+<p align=center><font size=7><b>[</b></font> <a href="sitemap.html">Sitemap</a> <font size=7><b>]</b></font>       <font size=7><b>[</b></font> <a href="trf_news.html">News</a><font size=7><b>|</b></font> <a href="trf_changelog.html">ChangeLog</a><font size=7><b>|</b></font> <a href="trf_intro.html">Introduction</a><font size=7><b>|</b></font> <a href="trf_where.html">Download</a><font size=7><b>|</b></font> <a href="trf_ack.html">Acknowledgements, Disclaimer</a><font size=7><b>|</b></font> <a href="trf_danger.html">Danger!</a><font size=7><b>|</b></font> <a href="trf_install.html">Installation</a><font size=7><b>|</b></font> <a href="trf_cmds.html">Commands</a><font size=7><b>|</b></font> <a href="trf_capi.html">C API</a><font size=7><b>|</b></font> <a href="trf_copyrights.html">Copyrights</a><font size=7><b>|</b></font> <a href="trf_future.html">Future work</a> <font size=7><b>|</b></font> <A href="painless-guide-to-crc.txt">Painless Guide to CRC</A> <font size=7><b>]</b></font></p> - <hr> diff --git a/devel/tcl-trf/files/patch-rmd128 b/devel/tcl-trf/files/patch-rmd128 deleted file mode 100644 index 0936f10bf452..000000000000 --- a/devel/tcl-trf/files/patch-rmd128 +++ /dev/null @@ -1,24 +0,0 @@ -Patch obtained from the TRF's CVS... Many thanks to Denis Shaposhnikov -for finding it. - -TRF's RIPEMD160 implementation suffered from the same problem, but this -port does not use it. - - -mi - ---- generic/rmd128.c Wed Aug 9 15:13:18 2000 -+++ generic/rmd128.c Mon May 8 12:52:04 2006 -@@ -46,5 +46,5 @@ - typedef struct ripemd_context { - dword state [5]; /* state variables of ripemd-128 */ -- byte buf [CHUNK_SIZE]; /* buffer of 15-dword's */ -+ byte buf [CHUNK_SIZE]; /* buffer of 16-dword's */ - byte byteCount; /* number of bytes in buffer */ - dword lowc; /* lower half of a 64bit counter */ -@@ -235,5 +235,5 @@ - } /* k == CHUNK_SIZE => internal buffer was empty, so skip it entirely */ - -- while (bufLen > CHUNK_SIZE) { -+ while (bufLen >= CHUNK_SIZE) { - CountLength (ctx, CHUNK_SIZE); - diff --git a/devel/tcl-trf/files/patch-rmd160 b/devel/tcl-trf/files/patch-rmd160 deleted file mode 100644 index b4c1bcc92b14..000000000000 --- a/devel/tcl-trf/files/patch-rmd160 +++ /dev/null @@ -1,242 +0,0 @@ ---- generic/rmd160.c Wed Aug 9 15:13:18 2000 -+++ generic/rmd160.c Sat Jul 10 17:17:57 2004 -@@ -29,5 +29,5 @@ - - #include "transformInt.h" --#include "ripemd/rmd160.h" -+#include <openssl/ripemd.h> - - /* -@@ -40,16 +40,4 @@ - - #define DIGEST_SIZE (20) --/*#define CTX_TYPE */ --#define CONTEXT_SIZE (20) --#define CHUNK_SIZE (64) -- --typedef struct ripemd_context { -- dword state [5]; /* state variables of ripemd-160 */ -- byte buf [CHUNK_SIZE]; /* buffer of 15-dword's */ -- byte byteCount; /* number of bytes in buffer */ -- dword lowc; /* lower half of a 64bit counter */ -- dword highc; /* upper half of a 64bit counter */ --} ripemd_context; -- - - /* -@@ -57,10 +45,6 @@ - */ - --static void MDrmd160_Start _ANSI_ARGS_ ((VOID* context)); - static void MDrmd160_Update _ANSI_ARGS_ ((VOID* context, unsigned int character)); --static void MDrmd160_UpdateBuf _ANSI_ARGS_ ((VOID* context, unsigned char* buffer, int bufLen)); - static void MDrmd160_Final _ANSI_ARGS_ ((VOID* context, VOID* digest)); --static void CountLength _ANSI_ARGS_ ((ripemd_context* ctx, -- unsigned int nbytes)); - - /* -@@ -70,9 +54,9 @@ - static Trf_MessageDigestDescription mdDescription = { /* THREADING: constant, read-only => safe */ - "ripemd160", -- sizeof (ripemd_context), -+ sizeof (RIPEMD160_CTX), - DIGEST_SIZE, -- MDrmd160_Start, -+ (Trf_MDStart *)RIPEMD160_Init, - MDrmd160_Update, -- MDrmd160_UpdateBuf, -+ (Trf_MDUpdateBuf *)RIPEMD160_Update, - MDrmd160_Final, - NULL -@@ -107,37 +91,4 @@ - *------------------------------------------------------* - * -- * MDrmd160_Start -- -- * -- * ------------------------------------------------* -- * Initialize the internal state of the message -- * digest generator. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * As of the called procedure. -- * -- * Result: -- * None. -- * -- *------------------------------------------------------* -- */ -- --static void --MDrmd160_Start (context) --VOID* context; --{ -- ripemd_context* ctx = (ripemd_context*) context; -- -- ripemd160_MDinit (ctx->state); -- memset (ctx->buf, '\0', CHUNK_SIZE); -- -- ctx->byteCount = 0; -- ctx->lowc = 0; -- ctx->highc = 0; --} -- --/* -- *------------------------------------------------------* -- * - * MDrmd160_Update -- - * -@@ -161,97 +112,7 @@ - unsigned int character; - { -- ripemd_context* ctx = (ripemd_context*) context; -- -- ctx->buf [ctx->byteCount] = character; -- ctx->byteCount ++; -- -- if (ctx->byteCount == CHUNK_SIZE) { -- CountLength (ctx, CHUNK_SIZE); -- --#ifdef WORDS_BIGENDIAN -- Trf_FlipRegisterLong (ctx->buf, CHUNK_SIZE); --#endif -- ripemd160_compress (ctx->state, (dword*) ctx->buf); -- ctx->byteCount = 0; -- } --} -- --/* -- *------------------------------------------------------* -- * -- * MDrmd160_UpdateBuf -- -- * -- * ------------------------------------------------* -- * Update the internal state of the message digest -- * generator for a character buffer. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * As of the called procedure. -- * -- * Result: -- * None. -- * -- *------------------------------------------------------* -- */ -- --static void --MDrmd160_UpdateBuf (context, buffer, bufLen) --VOID* context; --unsigned char* buffer; --int bufLen; --{ -- ripemd_context* ctx = (ripemd_context*) context; -- -- if ((ctx->byteCount + bufLen) < CHUNK_SIZE) { -- /* -- * Not enough for full chunk. Remember incoming -- * data and wait for another call containing more data. -- */ -- -- memcpy ((VOID*) (ctx->buf + ctx->byteCount), (VOID*) buffer, bufLen); -- ctx->byteCount += bufLen; -- } else { -- /* -- * Complete chunk with incoming data, update digest, -- * then use all chunks contained in the buffer. Remember -- * an incomplete chunk and wait for further calls. -- */ -- -- int k = CHUNK_SIZE - ctx->byteCount; -- -- if (k < CHUNK_SIZE) { -- memcpy ((VOID*) (ctx->buf + ctx->byteCount), (VOID*) buffer, k); -- -- CountLength (ctx, CHUNK_SIZE); -+ char c = character; - --#ifdef WORDS_BIGENDIAN -- Trf_FlipRegisterLong (ctx->buf, CHUNK_SIZE); --#endif -- ripemd160_compress (ctx->state, (dword*) ctx->buf); -- -- buffer += k; -- bufLen -= k; -- } /* k == CHUNK_SIZE => internal buffer was empty, so skip it entirely */ -- -- while (bufLen > CHUNK_SIZE) { -- CountLength (ctx, CHUNK_SIZE); -- --#ifdef WORDS_BIGENDIAN -- Trf_FlipRegisterLong (buffer, CHUNK_SIZE); --#endif -- ripemd160_compress (ctx->state, (dword*) buffer); --#ifdef WORDS_BIGENDIAN -- Trf_FlipRegisterLong (buffer, CHUNK_SIZE); --#endif -- -- buffer += CHUNK_SIZE; -- bufLen -= CHUNK_SIZE; -- } -- -- ctx->byteCount = bufLen; -- if (bufLen > 0) -- memcpy ((VOID*) ctx->buf, (VOID*) buffer, bufLen); -- } -+ RIPEMD160_Update(context, &c, 1); - } - -@@ -280,52 +141,4 @@ - VOID* digest; - { -- ripemd_context* ctx = (ripemd_context*) context; -- -- CountLength (ctx, ctx->byteCount); -- -- ripemd160_MDfinish (ctx->state, ctx->buf, ctx->lowc, ctx->highc); -- -- memcpy (digest, ctx->state, DIGEST_SIZE); --#ifdef WORDS_BIGENDIAN -- Trf_FlipRegisterLong (digest, DIGEST_SIZE); --#endif --} -- --/* -- *------------------------------------------------------* -- * -- * CountLength -- -- * -- * ------------------------------------------------* -- * Update the 64bit counter in the context structure -- * ------------------------------------------------* -- * -- * Sideeffects: -- * See above. -- * -- * Result: -- * None. -- * -- *------------------------------------------------------* -- */ -- --static void --CountLength (ctx, nbytes) -- ripemd_context* ctx; -- unsigned int nbytes; --{ -- /* update length counter */ -- -- if ((ctx->lowc + nbytes) < ctx->lowc) { -- /* overflow to msb of length */ -- ctx->highc ++; -- } -- -- ctx->lowc += nbytes; -+ (void)RIPEMD160_Final(digest, context); - } -- --/* -- * External code from here on. -- */ -- --#include "ripemd/rmd160.c" diff --git a/devel/tcl-trf/files/patch-sha b/devel/tcl-trf/files/patch-sha deleted file mode 100644 index 57a2b90b5a6a..000000000000 --- a/devel/tcl-trf/files/patch-sha +++ /dev/null @@ -1,196 +0,0 @@ ---- generic/sha.c Wed Aug 9 15:13:18 2000 -+++ generic/sha.c Sat Jul 10 16:49:48 2004 -@@ -34,5 +34,5 @@ - #endif - --#include "sha/sha.h" -+#include <openssl/sha.h> - - /* -@@ -44,28 +44,9 @@ - */ - --#define DIGEST_SIZE (SHA_DIGESTSIZE) --#define CTX_TYPE sha_trf_info --#define CHUNK_SIZE 256 -- --/* We cannot use SHA_INFO directly as context cause 'sha_update' handles -- * a chunk smaller then CHUNK_SIZE bytes correct if and only if it is -- * the last chunk. This forces us to buffer the incoming bytes till a chunk -- * is complete before doing an update. -- */ -- --typedef struct _sha_trf_info { -- SHA_INFO s; -- unsigned short count; -- unsigned char buf [CHUNK_SIZE]; /* SHA block */ --} sha_trf_info; -- -- - /* - * Declarations of internal procedures. - */ - --static void MDsha_Start _ANSI_ARGS_ ((VOID* context)); - static void MDsha_Update _ANSI_ARGS_ ((VOID* context, unsigned int character)); --static void MDsha_UpdateBuf _ANSI_ARGS_ ((VOID* context, unsigned char* buffer, int bufLen)); - static void MDsha_Final _ANSI_ARGS_ ((VOID* context, VOID* digest)); - -@@ -76,9 +57,9 @@ - static Trf_MessageDigestDescription mdDescription = { /* THREADING: constant, read-only => safe */ - "sha", -- sizeof (CTX_TYPE), -- DIGEST_SIZE, -- MDsha_Start, -+ sizeof (SHA_CTX), -+ SHA_DIGEST_LENGTH, -+ (Trf_MDStart *)SHA_Init, - MDsha_Update, -- MDsha_UpdateBuf, -+ (Trf_MDUpdateBuf *)SHA_Update, - MDsha_Final, - NULL -@@ -113,33 +94,4 @@ - *------------------------------------------------------* - * -- * MDsha_Start -- -- * -- * ------------------------------------------------* -- * Initialize the internal state of the message -- * digest generator. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * As of the called procedure. -- * -- * Result: -- * None. -- * -- *------------------------------------------------------* -- */ -- --static void --MDsha_Start (context) --VOID* context; --{ -- sha_trf_info* s = (sha_trf_info*) context; -- -- memset (s, '\0', sizeof (sha_trf_info)); -- sha_init (&s->s); --} -- --/* -- *------------------------------------------------------* -- * - * MDsha_Update -- - * -@@ -163,79 +115,7 @@ - unsigned int character; - { -- sha_trf_info* s = (sha_trf_info*) context; -- -- s->buf [s->count] = character; -- s->count ++; -+ unsigned char buf = character; - -- if (s->count == CHUNK_SIZE) { -- sha_update (&s->s, s->buf, s->count); -- s->count = 0; -- } --} -- --/* -- *------------------------------------------------------* -- * -- * MDsha_UpdateBuf -- -- * -- * ------------------------------------------------* -- * Update the internal state of the message digest -- * generator for a character buffer. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * As of the called procedure. -- * -- * Result: -- * None. -- * -- *------------------------------------------------------* -- */ -- --static void --MDsha_UpdateBuf (context, buffer, bufLen) --VOID* context; --unsigned char* buffer; --int bufLen; --{ -- sha_trf_info* s = (sha_trf_info*) context; -- -- if ((s->count + bufLen) < CHUNK_SIZE) { -- /* -- * Not enough for full chunk. Remember incoming -- * data and wait for another call containing more data. -- */ -- -- memcpy ((VOID*) (s->buf + s->count), (VOID*) buffer, bufLen); -- s->count += bufLen; -- } else { -- /* -- * Complete chunk with incoming data, update digest, -- * then use all chunks contained in the buffer. Remember -- * an incomplete chunk and wait for further calls. -- */ -- -- int k = CHUNK_SIZE - s->count; -- -- if (k < CHUNK_SIZE) { -- memcpy ((VOID*) (s->buf + s->count), (VOID*) buffer, k); -- -- sha_update (&s->s, s->buf, CHUNK_SIZE); -- -- buffer += k; -- bufLen -= k; -- } /* k == CHUNK_SIZE => internal buffer was empty, so skip it entirely */ -- -- while (bufLen > CHUNK_SIZE) { -- sha_update (&s->s, buffer, CHUNK_SIZE); -- -- buffer += CHUNK_SIZE; -- bufLen -= CHUNK_SIZE; -- } -- -- s->count = bufLen; -- if (bufLen > 0) -- memcpy ((VOID*) s->buf, (VOID*) buffer, bufLen); -- } -+ SHA_Update ((SHA_CTX*)context, &buf, 1); - } - -@@ -264,26 +144,4 @@ - VOID* digest; - { -- sha_trf_info* s = (sha_trf_info*) context; -- -- if (s->count > 0) { -- sha_update (&s->s, s->buf, s->count); -- } -- -- sha_final (&s->s); -- --#ifndef WORDS_BIGENDIAN -- Trf_FlipRegisterLong (s->s.digest, SHA_DIGESTSIZE); --#endif -- -- memcpy (digest, s->s.digest, SHA_DIGESTSIZE); -+ SHA_Final(digest, context); - } -- --/* -- * External code from here on. -- * -- * To make smaller object code, but run a little slower, don't use UNROLL_LOOPS. -- * To use NIST's modified SHA of 7/11/94, define USE_MODIFIED_SHA -- */ -- --#define UNROLL_LOOPS --#include "sha/sha.c" diff --git a/devel/tcl-trf/files/patch-sha1 b/devel/tcl-trf/files/patch-sha1 deleted file mode 100644 index b812c3ee0ea4..000000000000 --- a/devel/tcl-trf/files/patch-sha1 +++ /dev/null @@ -1,141 +0,0 @@ ---- generic/sha1.c Wed Aug 9 15:13:18 2000 -+++ generic/sha1.c Sat Jul 10 18:00:47 2004 -@@ -28,5 +28,6 @@ - */ - - #include "loadman.h" -+#include <openssl/sha.h> - - /* -@@ -49,9 +50,6 @@ - */ - --static void MDsha1_Start _ANSI_ARGS_ ((VOID* context)); - static void MDsha1_Update _ANSI_ARGS_ ((VOID* context, unsigned int character)); --static void MDsha1_UpdateBuf _ANSI_ARGS_ ((VOID* context, unsigned char* buffer, int bufLen)); - static void MDsha1_Final _ANSI_ARGS_ ((VOID* context, VOID* digest)); --static int MDsha1_Check _ANSI_ARGS_ ((Tcl_Interp* interp)); - - /* -@@ -67,9 +65,9 @@ - sizeof (CTX_TYPE), - DIGEST_SIZE, -- MDsha1_Start, -+ (Trf_MDStart *)SHA1_Init, - MDsha1_Update, -- MDsha1_UpdateBuf, -+ (Trf_MDUpdateBuf *)SHA1_Update, - MDsha1_Final, -- MDsha1_Check -+ NULL - }; - -@@ -106,30 +104,4 @@ - *------------------------------------------------------* - * -- * MDsha1_Start -- -- * -- * ------------------------------------------------* -- * Initialize the internal state of the message -- * digest generator. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * As of the called procedure. -- * -- * Result: -- * None. -- * -- *------------------------------------------------------* -- */ -- --static void --MDsha1_Start (context) --VOID* context; --{ -- sha1f.init ((SHA_CTX*) context); --} -- --/* -- *------------------------------------------------------* -- * - * MDsha1_Update -- - * -@@ -155,33 +127,5 @@ - unsigned char buf = character; - -- sha1f.update ((SHA_CTX*) context, &buf, 1); --} -- --/* -- *------------------------------------------------------* -- * -- * MDsha1_UpdateBuf -- -- * -- * ------------------------------------------------* -- * Update the internal state of the message digest -- * generator for a character buffer. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * As of the called procedure. -- * -- * Result: -- * None. -- * -- *------------------------------------------------------* -- */ -- --static void --MDsha1_UpdateBuf (context, buffer, bufLen) --VOID* context; --unsigned char* buffer; --int bufLen; --{ -- sha1f.update ((SHA_CTX*) context, (unsigned char*) buffer, bufLen); -+ SHA1_Update ((SHA_CTX*) context, &buf, 1); - } - -@@ -211,9 +155,9 @@ - { - #ifndef OTP -- sha1f.final ((unsigned char*) digest, (SHA_CTX*) context); -+ SHA1_Final ((unsigned char*) digest, (SHA_CTX*) context); - #else - unsigned int result[SHA_DIGEST_LENGTH / sizeof (char)]; - -- sha1f.final ((unsigned char*) result, (SHA_CTX*) context); -+ SHA1_Final ((unsigned char*) result, (SHA_CTX*) context); - - result[0] ^= result[2]; -@@ -224,30 +168,3 @@ - memcpy ((VOID *) digest, (VOID *) result, DIGEST_SIZE); - #endif --} -- --/* -- *------------------------------------------------------* -- * -- * MDsha1_Check -- -- * -- * ------------------------------------------------* -- * Do global one-time initializations of the message -- * digest generator. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * Loads the shared library containing the -- * SHA1 functionality -- * -- * Result: -- * A standard Tcl error code. -- * -- *------------------------------------------------------* -- */ -- --static int --MDsha1_Check (interp) --Tcl_Interp* interp; --{ -- return TrfLoadSHA1 (interp); - } diff --git a/devel/tcl-trf/files/patch-test b/devel/tcl-trf/files/patch-test deleted file mode 100644 index 5b385963ffb0..000000000000 --- a/devel/tcl-trf/files/patch-test +++ /dev/null @@ -1,38 +0,0 @@ -This patch-set makes the ``all'' script fail if any of the test scripts -report an error... - - -mi - ---- tests/all Wed Feb 5 15:51:13 1997 -+++ tests/all Fri Feb 15 00:52:39 2002 -@@ -10,2 +10,5 @@ - source $i - } -+ -+puts stderr "$errors error(s)" -+exit $errors ---- tests/defs Sat Sep 25 15:04:01 1999 -+++ tests/defs Fri Feb 15 00:51:56 2002 -@@ -300,6 +300,8 @@ - - proc test {name description script answer args} { -- global VERBOSE TESTS testConfig -- -+ global VERBOSE TESTS testConfig errors -+ if {![info exist errors]} { -+ set errors 0 -+ } - if {[string compare $TESTS ""] != 0} { - set ok 0 -@@ -362,4 +364,5 @@ - print_verbose $name $description $constraints $script \ - $code $result -+ incr errors - } elseif {[string compare $result $answer] == 0} { - if {$VERBOSE} { -@@ -378,4 +381,5 @@ - puts stdout "$answer" - puts stdout "---- $name FAILED" -+ incr errors - } - } diff --git a/devel/tcl-trf/files/patch-warnings b/devel/tcl-trf/files/patch-warnings deleted file mode 100644 index 4613f0db7512..000000000000 --- a/devel/tcl-trf/files/patch-warnings +++ /dev/null @@ -1,117 +0,0 @@ ---- generic/init.c Wed Aug 9 15:13:17 2000 -+++ generic/init.c Tue Apr 6 12:20:51 2004 -@@ -60,5 +60,5 @@ - - #ifdef USE_TCL_STUBS -- char* actualVersion; -+ const char* actualVersion; - - actualVersion = Tcl_InitStubs(interp, "8.1", 0); ---- generic/transformInt.h Tue Aug 21 01:51:33 2001 -+++ generic/transformInt.h Tue Apr 6 12:27:33 2004 -@@ -678,4 +678,8 @@ - #define TCL_STORAGE_CLASS DLLIMPORT - -+#ifndef CONST84 -+# define CONST84 -+#endif -+ - #ifdef __cplusplus - } ---- generic/registry.c Tue Aug 21 01:51:33 2001 -+++ generic/registry.c Tue Apr 6 12:32:35 2004 -@@ -285,5 +285,5 @@ - static int - TrfOutput _ANSI_ARGS_ ((ClientData instanceData, -- char* buf, int toWrite, -+ CONST84 char* buf, int toWrite, - int* errorCodePtr)); - -@@ -300,9 +300,9 @@ - static int - TrfGetOption _ANSI_ARGS_ ((ClientData instanceData, Tcl_Interp* interp, -- char* optionName, Tcl_DString* dsPtr)); -+ CONST84 char* optionName, Tcl_DString* dsPtr)); - - static int - TrfSetOption _ANSI_ARGS_((ClientData instanceData, Tcl_Interp* interp, -- char* optionName, char* value)); -+ CONST84 char* optionName, CONST84 char* value)); - #ifdef USE_TCL_STUBS - static int -@@ -364,9 +364,9 @@ - DownSOpt _ANSI_ARGS_ ((Tcl_Interp* interp, - TrfTransformationInstance* ctrl, -- char* optionName, char* value)); -+ CONST84 char* optionName, CONST84 char* value)); - static int - DownGOpt _ANSI_ARGS_ ((Tcl_Interp* interp, - TrfTransformationInstance* ctrl, -- char* optionName, Tcl_DString* dsPtr)); -+ CONST84 char* optionName, Tcl_DString* dsPtr)); - - #define DOWNC(trans) (DownChannel (trans)) -@@ -1708,5 +1708,5 @@ - TrfOutput (instanceData, buf, toWrite, errorCodePtr) - ClientData instanceData; --char* buf; -+CONST84 char* buf; - int toWrite; - int* errorCodePtr; -@@ -2162,6 +2162,6 @@ - ClientData instanceData; - Tcl_Interp* interp; -- char* optionName; -- char* value; -+ CONST84 char* optionName; -+ CONST84 char* value; - { - /* Recognized options: -@@ -2315,5 +2315,5 @@ - ClientData instanceData; - Tcl_Interp* interp; -- char* optionName; -+ CONST84 char* optionName; - Tcl_DString* dsPtr; - { -@@ -3207,6 +3207,6 @@ - Tcl_Interp* interp; - TrfTransformationInstance* ctrl; -- char* optionName; -- char* value; -+ CONST84 char* optionName; -+ CONST84 char* value; - { - Tcl_Channel parent = DOWNC (ctrl); -@@ -3252,5 +3252,5 @@ - Tcl_Interp* interp; - TrfTransformationInstance* ctrl; -- char* optionName; -+ CONST84 char* optionName; - Tcl_DString* dsPtr; - { ---- generic/trfStubLib.c Mon Sep 20 17:07:24 1999 -+++ generic/trfStubLib.c Tue Apr 6 13:13:38 2004 -@@ -61,5 +61,5 @@ - #endif - --char * -+const char * - Trf_InitStubs(interp, version, exact) - Tcl_Interp *interp; -@@ -67,5 +67,5 @@ - int exact; - { -- char *actualVersion; -+ const char *actualVersion; - - actualVersion = Tcl_PkgRequireEx(interp, "Trf", (char *) version, exact, ---- generic/transform.h Tue Aug 21 01:52:21 2001 -+++ generic/transform.h Tue Apr 6 13:15:22 2004 -@@ -916,5 +916,5 @@ - #define TCL_STORAGE_CLASS - --EXTERN char *Trf_InitStubs _ANSI_ARGS_((Tcl_Interp *interp, CONST char *version, int exact)); -+EXTERN const char *Trf_InitStubs _ANSI_ARGS_((Tcl_Interp *interp, CONST char *version, int exact)); - - #ifndef USE_TRF_STUBS diff --git a/devel/tcl-trf/files/patch-zlib b/devel/tcl-trf/files/patch-zlib deleted file mode 100644 index 4a3dd12feeb9..000000000000 --- a/devel/tcl-trf/files/patch-zlib +++ /dev/null @@ -1,112 +0,0 @@ ---- generic/adler.c Wed Aug 9 15:13:17 2000 -+++ generic/adler.c Fri Jul 9 16:30:50 2004 -@@ -49,5 +49,4 @@ - static void MDAdler_UpdateBuf _ANSI_ARGS_ ((VOID* context, unsigned char* buffer, int bufLen)); - static void MDAdler_Final _ANSI_ARGS_ ((VOID* context, VOID* digest)); --static int MDAdler_Check _ANSI_ARGS_ ((Tcl_Interp* interp)); - - /* -@@ -63,5 +62,5 @@ - MDAdler_UpdateBuf, - MDAdler_Final, -- MDAdler_Check -+ NULL - }; - -@@ -222,36 +221,2 @@ - out [3] = (char) ((adler >> 0) & 0xff); - } -- --/* -- *------------------------------------------------------* -- * -- * MDAdler_Check -- -- * -- * ------------------------------------------------* -- * Check for existence of libz, load it. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * As of the called procedure. -- * -- * Result: -- * None. -- * -- *------------------------------------------------------* -- */ -- --static int --MDAdler_Check (interp) --Tcl_Interp* interp; --{ -- int res; -- -- START (MDAdler_Check); -- -- res = TrfLoadZlib (interp); -- -- PRINT ("res = %d\n", res); -- DONE (MDAdler_Check); -- return res; --} -- ---- generic/crc_zlib.c Wed Aug 9 15:13:17 2000 -+++ generic/crc_zlib.c Fri Jul 9 16:34:11 2004 -@@ -49,5 +49,4 @@ - static void MDcrcz_UpdateBuf _ANSI_ARGS_ ((VOID* context, unsigned char* buffer, int bufLen)); - static void MDcrcz_Final _ANSI_ARGS_ ((VOID* context, VOID* digest)); --static int MDcrcz_Check _ANSI_ARGS_ ((Tcl_Interp* interp)); - - /* -@@ -63,5 +62,5 @@ - MDcrcz_UpdateBuf, - MDcrcz_Final, -- MDcrcz_Check -+ NULL - }; - -@@ -217,28 +216,2 @@ - out [0] = (char) ((crc >> 0) & 0xff); - } -- --/* -- *------------------------------------------------------* -- * -- * MDcrcz_Check -- -- * -- * ------------------------------------------------* -- * Check for existence of libz, load it. -- * ------------------------------------------------* -- * -- * Sideeffects: -- * As of the called procedure. -- * -- * Result: -- * None. -- * -- *------------------------------------------------------* -- */ -- --static int --MDcrcz_Check (interp) --Tcl_Interp* interp; --{ -- return TrfLoadZlib (interp); --} -- ---- generic/zip_opt.c Sat Nov 18 17:42:32 2000 -+++ generic/zip_opt.c Fri Feb 15 15:13:22 2002 -@@ -183,13 +183,4 @@ - - /* -- * 'zip' is used, therefore load the required library. -- * And bail out if it is not available. -- */ -- -- if (TCL_OK != TrfLoadZlib (interp)) { -- return TCL_ERROR; -- } -- -- /* - * Now perform the real option check. - */ diff --git a/devel/tcl-trf/pkg-descr b/devel/tcl-trf/pkg-descr deleted file mode 100644 index 206ba55ae371..000000000000 --- a/devel/tcl-trf/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -This is a loadable extension to Tcl providing commands for data -conversion, message digests, zlib based compression, error-correction, -channel-based manipulation of binary data. Trf extends the language at -the C-level with so-called ``transformer''-procedures. With the help of -some patches (*) to the core the package is able to intercept all -read/write operations on designated channels, thus giving it the ability -to transform the buffer contents as desired. This allows things like -transparent encryption, compression, charset recoding, etc. Build upon -this framework (and as proof of concept) a collection of tcl-level -commands was implemented. - -WWW: http://www.oche.de/~akupries/soft/trf/ diff --git a/devel/tcl-trf/pkg-plist b/devel/tcl-trf/pkg-plist deleted file mode 100644 index 3a01af5a178a..000000000000 --- a/devel/tcl-trf/pkg-plist +++ /dev/null @@ -1,80 +0,0 @@ -lib/%%SHLIB_NAME%% -lib/%%SHLIB_LINK%% -lib/libTrfstub%%TCL_DVER%%.a -lib/Trf/pkgIndex.tcl -include/trfDecls.h -include/transform.h -@dirrm lib/Trf -%%PORTDOCS%%share/doc/Trf/capi/Trf_CheckOptions.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_ClearCtrlBlock.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_ConverterOptions.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_CreateCtrlBlock.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_CreateOptions.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_DeleteCtrlBlock.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_DeleteOptions.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_FlipRegisterLong.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_FlipRegisterShort.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_FlushTransformation.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_Init.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_InitStubs.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_IsInitialized.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_LoadLibrary.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_MDCheck.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_MDFinal.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_MDStart.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_MDUpdate.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_MDUpdateBuf.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_QueryMaxRead.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_QueryOptions.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_Register.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_RegisterMessageDigest.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_SafeInit.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_SeekQueryOptions.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_SetObjOption.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_SetOption.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_ShiftRegister.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_TransformBuffer.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_TransformCharacter.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_WriteProc.html -%%PORTDOCS%%share/doc/Trf/capi/Trf_XorBuffer.html -%%PORTDOCS%%@dirrm share/doc/Trf/capi -%%PORTDOCS%%share/doc/Trf/img/chan.gif -%%PORTDOCS%%share/doc/Trf/img/logo-120x181.gif -%%PORTDOCS%%share/doc/Trf/img/smiley16.gif -%%PORTDOCS%%share/doc/Trf/img/trfchan.gif -%%PORTDOCS%%share/doc/Trf/img/trfchan2.gif -%%PORTDOCS%%share/doc/Trf/img/up.gif -%%PORTDOCS%%@dirrm share/doc/Trf/img -%%PORTDOCS%%share/doc/Trf/index.html -%%PORTDOCS%%share/doc/Trf/painless-guide-to-crc.txt -%%PORTDOCS%%share/doc/Trf/sitemap.html -%%PORTDOCS%%share/doc/Trf/trf_ack.html -%%PORTDOCS%%share/doc/Trf/trf_bdist.html -%%PORTDOCS%%share/doc/Trf/trf_binio.html -%%PORTDOCS%%share/doc/Trf/trf_bz2.html -%%PORTDOCS%%share/doc/Trf/trf_capi.html -%%PORTDOCS%%share/doc/Trf/trf_changelog.html -%%PORTDOCS%%share/doc/Trf/trf_cmac.html -%%PORTDOCS%%share/doc/Trf/trf_cmds.html -%%PORTDOCS%%share/doc/Trf/trf_compile.html -%%PORTDOCS%%share/doc/Trf/trf_conv.html -%%PORTDOCS%%share/doc/Trf/trf_copyrights.html -%%PORTDOCS%%share/doc/Trf/trf_ctea.html -%%PORTDOCS%%share/doc/Trf/trf_cunix.html -%%PORTDOCS%%share/doc/Trf/trf_cwin.html -%%PORTDOCS%%share/doc/Trf/trf_danger.html -%%PORTDOCS%%share/doc/Trf/trf_future.html -%%PORTDOCS%%share/doc/Trf/trf_install.html -%%PORTDOCS%%share/doc/Trf/trf_intro.html -%%PORTDOCS%%share/doc/Trf/trf_logo.html -%%PORTDOCS%%share/doc/Trf/trf_md.html -%%PORTDOCS%%share/doc/Trf/trf_misc.html -%%PORTDOCS%%share/doc/Trf/trf_news.html -%%PORTDOCS%%share/doc/Trf/trf_patch.html -%%PORTDOCS%%share/doc/Trf/trf_seek.html -%%PORTDOCS%%share/doc/Trf/trf_ssleay.html -%%PORTDOCS%%share/doc/Trf/trf_techintro.html -%%PORTDOCS%%share/doc/Trf/trf_transform.html -%%PORTDOCS%%share/doc/Trf/trf_where.html -%%PORTDOCS%%share/doc/Trf/trf_zip.html -%%PORTDOCS%%@dirrm share/doc/Trf |