Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Nov 1999 21:39:14 -0500 (EST)
From:      Mikhail Teterin <mi@misha.cisco.com>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        a.kupries@westend.com
Subject:   ports/14991: Tcl Data transformations (Tcl-Trf) port
Message-ID:  <199911190239.VAA05833@misha.cisco.com>

next in thread | raw e-mail | index | archive | help

>Number:         14991
>Category:       ports
>Synopsis:       Tcl Data transformations (Tcl-Trf) port
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 18 18:40:02 PST 1999
>Closed-Date:
>Last-Modified:
>Originator:     Mikhail Teterin
>Release:        FreeBSD 3.3-STABLE i386
>Organization:
Virtual Estates, Inc.
>Environment:

	Can be built against either Tcl-8.0 or 8.2, but
		NEEDS PLUS PATCHES
	The sooner the standard TCL/TK ports incorporate the plus-patches
	from http://www.worldaccess.nl/~nijtmans/plus.html the better for
	the world peace.

>Description:

	See the pkg/DESCR shar-ed below.

>How-To-Repeat:

>Fix:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	tcl-trf
#	tcl-trf/Makefile
#	tcl-trf/files
#	tcl-trf/files/md5
#	tcl-trf/pkg
#	tcl-trf/pkg/PLIST
#	tcl-trf/pkg/DESCR
#	tcl-trf/pkg/COMMENT
#	tcl-trf/patches
#	tcl-trf/patches/patch-conf
#	tcl-trf/patches/patch-mkin
#	tcl-trf/patches/patch-md
#
echo c - tcl-trf
mkdir -p tcl-trf > /dev/null 2>&1
echo x - tcl-trf/Makefile
sed 's/^X//' >tcl-trf/Makefile << 'END-of-tcl-trf/Makefile'
X# New ports collection makefile for:	TclTrf
X# Version required:		2.0
X# Date created:			Nov 18, 1999
X# Whom:				Mikhail Teterin <mi@aldan.algebra.com>
X#
X# $FreeBSD: $
X#
X
XDISTNAME=		trf2.0
XPKGNAME=		TclTrf-2.0
XCATEGORIES=		devel
XMASTER_SITES=	http://www.oche.de/~akupries/soft/trf/download/
X
XMAINTAINER=     mi@aldan.algebra.com
X
XLIB_DEPENDS=	ssl:${PORTSDIR}/security/openssl
XBUILD_DEPENDS=	tclsh${TCLV}:${PORTSDIR}/lang/tcl${TCLVND}
X
XWWW_SITE=	http://www.oche.de/~akupries/soft/trf/index.html
X
XWRKSRC=		${WRKDIR}/${DISTNAME}/unix
X
X# Bzip2 library is also needed, but it requested implicitly below.
X# Also, the current Bzip2 port only builds the static version :(
X# bz2:${PORTSDIR}/archivers/bzip2
X
XGNU_CONFIGURE=	yes
XPLIST_SUB+=	TCLV=${TCLV}
XCONFIGURE_ARGS=	--with-tcl-include-dir=${PREFIX}/include/tcl${TCLV}
XALL_TARGET=	library
X
XUSE_BZIP2=	yes
X
XTCLV=		8.0
XTCLVND=		${TCLV:S/.//}
XDDIR=		${PREFIX}/lib/tcl${TCLV}/Trf
X
XMAN3= Trf_BaseOptions.3 Trf_CheckOptions.3 Trf_ClearCtrlBlock.3 \
X	Trf_ControlBlock.3 Trf_ConverterOptionBlock.3 \
X	Trf_ConverterOptions.3 Trf_CreateCtrlBlock.3 Trf_CreateOptions.3 \
X	Trf_DeleteCtrlBlock.3 Trf_DeleteOptions.3 Trf_FlipRegisterLong.3 \
X	Trf_FlipRegisterShort.3 Trf_FlushTransformation.3 Trf_Init.3 \
X	Trf_InitStubs.3 Trf_IsInitialized.3 Trf_LoadLibrary.3 \
X	Trf_MDCheck.3 Trf_MDFinal.3 Trf_MDStart.3 Trf_MDUpdate.3 \
X	Trf_MDUpdateBuf.3 Trf_MessageDigestDescription.3 \
X	Trf_OptionVectors.3 Trf_Options.3 Trf_QueryMaxRead.3 \
X	Trf_QueryOptions.3 Trf_Register.3 Trf_RegisterMessageDigest.3 \
X	Trf_SafeInit.3 Trf_SeekQueryOptions.3 Trf_SetObjOption.3 \
X	Trf_SetOption.3 Trf_ShiftRegister.3 Trf_TransformBuffer.3 \
X	Trf_TransformCharacter.3 Trf_TypeDefinition.3 Trf_Vectors.3 \
X	Trf_WriteProc.3 Trf_XorBuffer.3
X
Xpost-patch:
X	${RM} -rf ${WRKSRC}/../compat
X	${RM} -rf ${WRKSRC}/../md5-crypt
X
Xdo-install:
X	${MKDIR} ${DDIR}
X	${INSTALL_DATA} ${WRKSRC}/libtrf*.so* ${DDIR}
X	${INSTALL_DATA} ${WRKSRC}/pkgIndex.tcl ${DDIR}
X	${INSTALL_DATA} ${WRKSRC}/../generic/transform.h \
X		${WRKSRC}/../generic/trfDecls.h \
X			${PREFIX}/include/
X	cd ${WRKSRC}/../doc/man/ && ${INSTALL_MAN} ${MAN3} ${PREFIX}/man/man3/
X.ifndef(NOPORTDOCS)
X	# Installing HTML documentation into ${PREFIX}/share/Trf/doc/html
X	${MKDIR} ${PREFIX}/share/doc/Trf
X	${TAR} cpf - -C ${WRKSRC}/../doc html | ${TAR} xpf - -C ${PREFIX}/share/doc/Trf
X	${CHOWN} -R root.bin ${PREFIX}/share/doc/Trf
X	${CHMOD} 755 ${PREFIX}/share/doc/Trf/html ${PREFIX}/share/doc/Trf/html/capi \
X		${PREFIX}/share/doc/Trf/html/img
X.endif
X
X.include <bsd.port.mk>
END-of-tcl-trf/Makefile
echo c - tcl-trf/files
mkdir -p tcl-trf/files > /dev/null 2>&1
echo x - tcl-trf/files/md5
sed 's/^X//' >tcl-trf/files/md5 << 'END-of-tcl-trf/files/md5'
XMD5 (trf2.0.tar.bz2) = 6cd62e7d34ae86071dc3b56c885c76cd
END-of-tcl-trf/files/md5
echo c - tcl-trf/pkg
mkdir -p tcl-trf/pkg > /dev/null 2>&1
echo x - tcl-trf/pkg/PLIST
sed 's/^X//' >tcl-trf/pkg/PLIST << 'END-of-tcl-trf/pkg/PLIST'
Xinclude/trfDecls.h
Xinclude/transform.h
Xlib/tcl%%TCLV%%/Trf/libtrf80.so.1
Xlib/tcl%%TCLV%%/Trf/pkgIndex.tcl
Xshare/doc/Trf/html/capi/Trf_Init.html
Xshare/doc/Trf/html/capi/Trf_SafeInit.html
Xshare/doc/Trf/html/capi/Trf_IsInitialized.html
Xshare/doc/Trf/html/capi/Trf_CreateOptions.html
Xshare/doc/Trf/html/capi/Trf_DeleteOptions.html
Xshare/doc/Trf/html/capi/Trf_CheckOptions.html
Xshare/doc/Trf/html/capi/Trf_SetOption.html
Xshare/doc/Trf/html/capi/Trf_SetObjOption.html
Xshare/doc/Trf/html/capi/Trf_QueryOptions.html
Xshare/doc/Trf/html/capi/Trf_SeekQueryOptions.html
Xshare/doc/Trf/html/capi/Trf_WriteProc.html
Xshare/doc/Trf/html/capi/Trf_CreateCtrlBlock.html
Xshare/doc/Trf/html/capi/Trf_DeleteCtrlBlock.html
Xshare/doc/Trf/html/capi/Trf_TransformCharacter.html
Xshare/doc/Trf/html/capi/Trf_TransformBuffer.html
Xshare/doc/Trf/html/capi/Trf_FlushTransformation.html
Xshare/doc/Trf/html/capi/Trf_ClearCtrlBlock.html
Xshare/doc/Trf/html/capi/Trf_QueryMaxRead.html
Xshare/doc/Trf/html/capi/Trf_Register.html
Xshare/doc/Trf/html/capi/Trf_ConverterOptions.html
Xshare/doc/Trf/html/capi/Trf_MDStart.html
Xshare/doc/Trf/html/capi/Trf_MDUpdate.html
Xshare/doc/Trf/html/capi/Trf_MDUpdateBuf.html
Xshare/doc/Trf/html/capi/Trf_MDFinal.html
Xshare/doc/Trf/html/capi/Trf_MDCheck.html
Xshare/doc/Trf/html/capi/Trf_RegisterMessageDigest.html
Xshare/doc/Trf/html/capi/Trf_LoadLibrary.html
Xshare/doc/Trf/html/capi/Trf_XorBuffer.html
Xshare/doc/Trf/html/capi/Trf_ShiftRegister.html
Xshare/doc/Trf/html/capi/Trf_FlipRegisterShort.html
Xshare/doc/Trf/html/capi/Trf_InitStubs.html
Xshare/doc/Trf/html/capi/Trf_FlipRegisterLong.html
Xshare/doc/Trf/html/img/logo-120x181.gif
Xshare/doc/Trf/html/img/chan.gif
Xshare/doc/Trf/html/img/up.gif
Xshare/doc/Trf/html/img/trfchan.gif
Xshare/doc/Trf/html/img/trfchan2.gif
Xshare/doc/Trf/html/img/smiley16.gif
Xshare/doc/Trf/html/trf_ack.html
Xshare/doc/Trf/html/trf_bdist.html
Xshare/doc/Trf/html/trf_binio.html
Xshare/doc/Trf/html/trf_bz2.html
Xshare/doc/Trf/html/trf_capi.html
Xshare/doc/Trf/html/trf_cmac.html
Xshare/doc/Trf/html/trf_cmds.html
Xshare/doc/Trf/html/trf_compile.html
Xshare/doc/Trf/html/trf_conv.html
Xshare/doc/Trf/html/trf_copyrights.html
Xshare/doc/Trf/html/trf_ctea.html
Xshare/doc/Trf/html/trf_cunix.html
Xshare/doc/Trf/html/trf_cwin.html
Xshare/doc/Trf/html/trf_danger.html
Xshare/doc/Trf/html/trf_future.html
Xshare/doc/Trf/html/index.html
Xshare/doc/Trf/html/trf_install.html
Xshare/doc/Trf/html/trf_intro.html
Xshare/doc/Trf/html/trf_md.html
Xshare/doc/Trf/html/trf_logo.html
Xshare/doc/Trf/html/trf_misc.html
Xshare/doc/Trf/html/trf_news.html
Xshare/doc/Trf/html/trf_patch.html
Xshare/doc/Trf/html/trf_seek.html
Xshare/doc/Trf/html/trf_ssleay.html
Xshare/doc/Trf/html/trf_techintro.html
Xshare/doc/Trf/html/trf_transform.html
Xshare/doc/Trf/html/trf_where.html
Xshare/doc/Trf/html/trf_zip.html
Xshare/doc/Trf/html/sitemap.html
X@dirrm lib/tcl%%TCLV%%/Trf
X@dirrm share/doc/Trf/html/img/
X@dirrm share/doc/Trf/html/capi/
X@dirrm share/doc/Trf/html/
X@dirrm share/doc/Trf
END-of-tcl-trf/pkg/PLIST
echo x - tcl-trf/pkg/DESCR
sed 's/^X//' >tcl-trf/pkg/DESCR << 'END-of-tcl-trf/pkg/DESCR'
XTcl    Data    transformations     (Tcl-Trf)    by    Andreas    Kupries
X(a.kupries@westend.com). A freely distributable extension to Tcl/Tk. The
Xprovided procedures include:
X
X*	Generation of message digests (hash values, checksums)
X
X	MD2, MD5, SHA/SHS, SHA-1, HAVAL, RIPEMD-128, -160
X	CRC (polynomial used by PGP) ADLER (based upon zlib)
X
X*	Conversion from and to various data encodings:
X
X	dual, octal, hexadecimal representation	
X	uuencoding, base64-encoding, ASCII85-encoding
X
X*	A reed-solomon error correcting coder.
X
X*	(De)Compression based on zlib, bzlib
X
XTcl-Trf is developed for Tcl 7.6 or  higher. It is a pure Tcl extension,
XTk is not  required. The extension requires a patched  core. Patch files
Xfor 7.6,  8.0 and 8.0a2 are  part of the distribution.  The plus-patches
Xmaintained  by Jan  Nijtmans (nijtmans@nici.kun.nl)  contain this  patch
Xtoo.
END-of-tcl-trf/pkg/DESCR
echo x - tcl-trf/pkg/COMMENT
sed 's/^X//' >tcl-trf/pkg/COMMENT << 'END-of-tcl-trf/pkg/COMMENT'
XTcl Data transformations (Tcl-Trf) -- loadable TCL-extension
END-of-tcl-trf/pkg/COMMENT
echo c - tcl-trf/patches
mkdir -p tcl-trf/patches > /dev/null 2>&1
echo x - tcl-trf/patches/patch-conf
sed 's/^X//' >tcl-trf/patches/patch-conf << 'END-of-tcl-trf/patches/patch-conf'
X--- configure.orig	Fri Nov 12 18:23:10 1999
X+++ configure	Thu Nov 18 15:06:31 1999
X@@ -1779,3 +1779,6 @@
X 
X-file=$TCL_LIB_DIR/tclConfig.sh
X+for version in 8.2 8.1.1 8.1 8.0.6 8.0.5 8.0.4 8.0.3 8.0 7.6 ""; do
X+	file=$TCL_LIB_DIR/tcl${version}/tclConfig.sh
X+	test -f $file && break
X+done
X . $file
X@@ -2057,3 +2060,3 @@
X 
X-for ac_prog in tclsh8.2${EXEEXT} tclsh82${EXEEXT} tclsh${EXEEXT}
X+for ac_prog in tclsh8.2${EXEEXT} tclsh82${EXEEXT} tclsh8.0${EXEEXT} tclsh${EXEEXT}
X do
END-of-tcl-trf/patches/patch-conf
echo x - tcl-trf/patches/patch-mkin
sed 's/^X//' >tcl-trf/patches/patch-mkin << 'END-of-tcl-trf/patches/patch-mkin'
X--- Makefile.in.orig	Fri Nov 12 18:22:34 1999
X+++ Makefile.in	Thu Nov 18 20:30:29 1999
X@@ -87,3 +87,3 @@
X # to -g, change the following line:
X-CFLAGS		=	-O
X+#CFLAGS		=	-O	# On FreeBSD set centrally in /etc/make.conf
X 
X@@ -142,3 +142,3 @@
X 
X-LIBS = @TRF_LD_SEARCH_FLAGS@ @SHARED_LIBS@
X+LIBS = @TRF_LD_SEARCH_FLAGS@ @SHARED_LIBS@ -ldescrypt -lmd
X 
X@@ -175,4 +175,4 @@
X 
X-TCLSH_PATH	=	`tclsh $(tool)/findinpath tclsh`
X-WISH_PATH	=	`tclsh $(tool)/findinpath wish`
X+TCLSH_PATH	=	@TCLSH_PROG@
X+WISH_PATH	=	`${TCLSH_PATH} $(tool)/findinpath wish`
X 
X@@ -187,2 +187,3 @@
X 			-DTRF_VERSION=\"$(VERSION)\"			\
X+			-DHAVE_BZLIB_H \
X 			$(LIBDES_OPTS) @TCL_DEFS@ @TRF_DEFS@
X@@ -351,3 +352,3 @@
X 		$(INSTALL_PROGRAM) $(tool)/$$i $(BIN_INSTALL_DIR); \
X-		tclsh $(tool)/fixhbline $(TCLSH_PATH) $(WISH_PATH) $(BIN_INSTALL_DIR)/$$i; \
X+		${TCLSH_PATH} $(tool)/fixhbline $(TCLSH_PATH) $(WISH_PATH) $(BIN_INSTALL_DIR)/$$i; \
X 	done
X@@ -365,3 +366,3 @@
X 
X-library:	$(TRF_LIB_FILE) $(TRF_STUB_LIB_FILE) $(MD5_LIB_FILE)
X+library:	$(TRF_LIB_FILE) $(TRF_STUB_LIB_FILE) # $(MD5_LIB_FILE)
X 	@echo ... done
X@@ -391,3 +392,3 @@
X test:
X-	TCL_LIBRARY=$(TCL_SRC_DIR)/library; export TCL_LIBRARY; \
X+	TCL_LIBRARY=$(TCL_LIB_DIR)/lib${TCL_VERSION}; export TCL_LIBRARY; \
X 	LD_LIBRARY_PATH="$(srcdir):./unix:../unix:$(TCL_LIB_DIR):$(ZLIB_LIB_DIR):$(SSL_LIB_DIR)"; \
END-of-tcl-trf/patches/patch-mkin
echo x - tcl-trf/patches/patch-md
sed 's/^X//' >tcl-trf/patches/patch-md << 'END-of-tcl-trf/patches/patch-md'
X# This forces Trf to use the FreeBSD's -lmd for md5 and md2 routines
X# instead of compiling its own... It looks like this is how Trf used
X# to be (by the comments in the code), but changed, probably, due to
X# some compatability issues (?).	-mi
X--- crypt.c.orig	Fri Nov 12 17:43:31 1999
X+++ ../generic/crypt.c	Thu Nov 18 19:19:21 1999
X@@ -29,4 +29,4 @@
X 
X+#include	<unistd.h>
X #include	"transformInt.h"
X-#include	"loadman.h"
X 
X@@ -125,6 +125,2 @@
X 
X-  if (TrfLoadMD5 (interp) != TCL_OK) {
X-    return TCL_ERROR;
X-  }
X-
X   if ((objc < 1) || (objc > 3)) {
X@@ -156,3 +152,3 @@
X   TrfLock;
X-  res = Tcl_NewStringObj ((char*) md5f.crypt (passwd, salt_b) + 3, -1);
X+  res = Tcl_NewStringObj (crypt(passwd, salt_b) + 3, -1);
X   TrfUnlock;
X--- loadman.c.orig	Tue Oct 19 18:34:29 1999
X+++ ../generic/loadman.c	Thu Nov 18 19:17:49 1999
X@@ -39,6 +39,2 @@
X   void* handle;
X-  /* MD2 */
X-  void (* md2_init)        _ANSI_ARGS_ ((MD2_CTX* c));
X-  void (* md2_update)      _ANSI_ARGS_ ((MD2_CTX* c, unsigned char* data, unsigned long length));
X-  void (* md2_final)       _ANSI_ARGS_ ((unsigned char* digest, MD2_CTX* c));
X   /* SHA1 */
X@@ -51,6 +47,2 @@
X static char* ssl_symbols [] = {
X-  /* md2 */
X-  "MD2_Init",
X-  "MD2_Update",
X-  "MD2_Final",
X   /* sha1 */
X@@ -63,14 +55,2 @@
X 
X-static char* crypt_symbols [] = {
X-  /* md5 */
X-  "md5_init_ctx",
X-  "md5_process_bytes",
X-  "md5_finish_ctx",
X-  "crypt",
X-  /* -- */
X-  (char *) NULL,
X-};
X-
X-
X-
X 
X@@ -80,4 +60,2 @@
X 
X-md2Functions  md2f  = {0}; /* THREADING: serialize initialization */
X-md5Functions  md5f  = {0}; /* THREADING: serialize initialization */
X sha1Functions sha1f = {0}; /* THREADING: serialize initialization */
X@@ -91,94 +69,3 @@
X static sslLibFunctions ssl; /* THREADING: serialize initialization */
X-
X-/*
X- *------------------------------------------------------*
X- *
X- *	TrfLoadMD2 --
X- *
X- *	------------------------------------------------*
X- *	Makes MD2 functionality available.
X- *	------------------------------------------------*
X- *
X- *	Sideeffects:
X- *		Loads the required shared library and
X- *		makes the addresses of MD2 functionality
X- *		available. In case of failure an error
X- *		message is left in the result area of
X- *		the specified interpreter.
X- *
X- *	Result:
X- *		A standard tcl error code.
X- *
X- *------------------------------------------------------*
X- */
X-
X-int
X-TrfLoadMD2 (interp)
X-    Tcl_Interp* interp;
X-{
X-  int res;
X-
X-  TrfLock; /* THREADING: serialize initialization */
X-
X-  if (md2f.loaded) {
X-    TrfUnlock;
X-    return TCL_OK;
X-  }
X-
X-  res = Trf_LoadLibrary (interp, SSL_LIB_NAME, (VOID**) &ssl, ssl_symbols, 0);
X-
X-  if ((res == TCL_OK) &&
X-      (ssl.md2_init   != NULL) &&
X-      (ssl.md2_update != NULL) &&
X-      (ssl.md2_final  != NULL)) {
X-
X-    md2f.loaded = 1;
X-    md2f.init   = ssl.md2_init;
X-    md2f.update = ssl.md2_update;
X-    md2f.final  = ssl.md2_final;
X-
X-    TrfUnlock;
X-    return TCL_OK;
X-  }
X-
X-  TrfUnlock;
X-  return TCL_ERROR;
X-}
X-
X-/*
X- *------------------------------------------------------*
X- *
X- *	TrfLoadMD5 --
X- *
X- *	------------------------------------------------*
X- *	Makes MD5 functionality available.
X- *	------------------------------------------------*
X- *
X- *	Sideeffects:
X- *		Loads the required shared library and
X- *		makes the addresses of MD5 functionality
X- *		available. In case of failure an error
X- *		message is left in the result area of
X- *		the specified interpreter.
X- *
X- *	Result:
X- *		A standard tcl error code.
X- *
X- *------------------------------------------------------*
X- */
X 
X-int
X-TrfLoadMD5 (interp)
X-    Tcl_Interp* interp;
X-{
X-  int res;
X-
X-  TrfLock; /* THREADING: serialize initialization */
X-  res = Trf_LoadLibrary (interp, CRYPT_LIB_NAME, (VOID**) &md5f,
X-			 crypt_symbols, 0);
X-  TrfUnlock;
X-
X-  return res;
X-}
X-
X /*
X--- loadman.h.orig	Tue Oct 19 18:34:29 1999
X+++ ../generic/loadman.h	Thu Nov 18 19:20:29 1999
X@@ -68,3 +68,3 @@
X 
X-#include "../md5-crypt/md5.h"
X+#include <md5.h>
X 
X@@ -88,21 +88,2 @@
X 
X-typedef struct Md2Functions {
X-  long loaded;
X-  void (* init)   _ANSI_ARGS_ ((MD2_CTX* c));
X-  void (* update) _ANSI_ARGS_ ((MD2_CTX* c, unsigned char* data,
X-				unsigned long length));
X-  void (* final)  _ANSI_ARGS_ ((unsigned char* digest, MD2_CTX* c));
X-} md2Functions;
X-
X-typedef struct Md5Functions {
X-  long loaded;
X-  void (* init)   _ANSI_ARGS_ ((struct md5_ctx* c));
X-  void (* update) _ANSI_ARGS_ ((unsigned char* data, unsigned long length,
X-				struct md5_ctx* c));
X-  void (* final)  _ANSI_ARGS_ ((struct md5_ctx* c, unsigned char* digest));
X-
X-  const char* (* crypt) _ANSI_ARGS_ ((const char* key, const char* salt));
X-
X-} md5Functions;
X-
X typedef struct Sha1Functions {
X@@ -123,12 +104,3 @@
X 
X-EXTERN md2Functions  md2f;  /* THREADING: serialize initialization */
X-EXTERN md5Functions  md5f;  /* THREADING: serialize initialization */
X EXTERN sha1Functions sha1f; /* THREADING: serialize initialization */
X-
X-
X-EXTERN int
X-TrfLoadMD2 _ANSI_ARGS_ ((Tcl_Interp *interp));
X-
X-EXTERN int
X-TrfLoadMD5 _ANSI_ARGS_ ((Tcl_Interp *interp));
X 
X--- md2.c.orig	Sun May 30 05:40:28 1999
X+++ ../generic/md2.c	Thu Nov 18 18:41:27 1999
X@@ -29,3 +29,4 @@
X 
X-#include "loadman.h"
X+#include <md2.h>
X+#include "transform.h"
X 
X@@ -39,3 +40,3 @@
X 
X-#define DIGEST_SIZE               (MD2_DIGEST_LENGTH)
X+#define DIGEST_SIZE               16
X #define CTX_TYPE                  MD2_CTX
X@@ -115,3 +116,3 @@
X {
X-  md2f.init ((MD2_CTX*) context);
X+  MD2Init((MD2_CTX*) context);
X }
X@@ -144,3 +145,3 @@
X 
X-  md2f.update ((MD2_CTX*) context, &buf, 1);
X+  MD2Update((MD2_CTX*) context, &buf, 1);
X }
X@@ -172,3 +173,3 @@
X {
X-  md2f.update ((MD2_CTX*) context, (unsigned char*) buffer, bufLen);
X+  MD2Update((MD2_CTX*) context, (unsigned char*) buffer, bufLen);
X }
X@@ -199,3 +200,3 @@
X {
X-  md2f.final ((unsigned char*) digest, (MD2_CTX*) context);
X+  MD2Final((unsigned char*) digest, (MD2_CTX*) context);
X }
X@@ -226,3 +227,3 @@
X {
X-  return TrfLoadMD2 (interp);
X+  return TCL_OK;
X }
X--- md5dig.c.orig	Fri Oct 15 19:08:26 1999
X+++ ../generic/md5dig.c	Thu Nov 18 19:02:55 1999
X@@ -30,4 +30,3 @@
X #include "transformInt.h"
X-#include "loadman.h"
X-/*#include "md5/md5.h"*/
X+#include <md5.h>
X 
X@@ -41,4 +40,3 @@
X 
X-#define MD5_CTX  struct md5_ctx
X-#define MD5_CTXP (struct md5_ctx*)
X+#define MD5_CTXP (MD5_CTX*)
X 
X@@ -134,4 +132,4 @@
X {
X-  /*  MD5Init ((MD5_CTX*) context);*/
X-  md5f.init (MD5_CTXP context);
X+  MD5Init ((MD5_CTX*) context);
X+  /*  md5f.init (MD5_CTXP context);*/
X 
X@@ -171,5 +169,5 @@
X 
X-  /*  MD5Update ((MD5_CTX*) context, &buf, 1); */
X+  MD5Update ((MD5_CTX*) context, &buf, 1);
X 
X-  md5f.update (&buf, 1, MD5_CTXP context);
X+  /*  md5f.update (&buf, 1, MD5_CTXP context); */
X }
X@@ -211,3 +209,3 @@
X 
X-  md5f.update ((unsigned char*) buffer, bufLen, MD5_CTXP context);
X+  MD5Update ((MD5_CTX*) context, buffer, bufLen);
X 
X@@ -246,4 +244,4 @@
X #ifndef OTP
X-  /*  MD5Final ((unsigned char*) digest, (MD5_CTX*) context); */
X-  md5f.final (MD5_CTXP context, (unsigned char*) digest);
X+  MD5Final ((unsigned char*) digest, (MD5_CTX*) context);
X+  /*  md5f.final (MD5_CTXP context, (unsigned char*) digest); */
X #else
X@@ -252,4 +250,4 @@
X 
X-    /*    MD5Final ((unsigned char*) result, (MD5_CTX*) context);*/
X-    md5f.final (MD5_CTXP context, (unsigned char*) result);
X+    MD5Final ((unsigned char*) result, (MD5_CTX*) context);
X+    /*    md5f.final (MD5_CTXP context, (unsigned char*) result);*/
X 
X@@ -293,3 +291,3 @@
X {
X-  return TrfLoadMD5 (interp);
X+  return TCL_OK;
X }
END-of-tcl-trf/patches/patch-md
exit


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199911190239.VAA05833>