Date: Thu, 10 Apr 2014 12:57:09 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350804 - in head/devel/tcl-trf: . files Message-ID: <201404101257.s3ACv9T8033580@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Apr 10 12:57:09 2014 New Revision: 350804 URL: http://svnweb.freebsd.org/changeset/ports/350804 QAT: https://qat.redports.org/buildarchive/r350804/ Log: - Unbreak by using Debian's reimplemented MD2 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664713 - Stage - Convert to USES=tar Added: head/devel/tcl-trf/files/patch-md2d (contents, props changed) Modified: head/devel/tcl-trf/Makefile head/devel/tcl-trf/files/patch-md2 head/devel/tcl-trf/pkg-plist Modified: head/devel/tcl-trf/Makefile ============================================================================== --- head/devel/tcl-trf/Makefile Thu Apr 10 12:50:22 2014 (r350803) +++ head/devel/tcl-trf/Makefile Thu Apr 10 12:57:09 2014 (r350804) @@ -14,11 +14,9 @@ COMMENT= Data conversion, digests, compr BUILD_DEPENDS= ${LOCALBASE}/lib/Memchan2.3/pkgIndex.tcl:${PORTSDIR}/devel/tcl-memchan -USE_BZIP2= yes - ALL_TARGET= all -USES+= tcl +USES+= tcl tar:bzip2 USE_LDCONFIG= ${PREFIX}/lib/Trf DDIR= ${PREFIX}/lib/tcl${TCL_VER}/Trf CFLAGS+= -Wall -Werror @@ -33,17 +31,14 @@ CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/ --enable-static-zlib --enable-static-bzlib \ --enable-static-md5 -NO_STAGE= yes - .include <bsd.port.options.mk> post-patch: -.if defined(TRF_USE_MD) || ${OSREL} > 10 -BROKEN= Does not build, requires ancient MD2 +.if defined(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' \ + -e 's,(MD[5])_([A-Z][a-z]),\1\2,g' \ ${WRKSRC}/generic/*.[ch] ${REINPLACE_CMD} 's,-lcrypto,-lmd,' ${WRKSRC}/Makefile.in .else @@ -57,23 +52,17 @@ USE_OPENSSL= yes .endif do-install: - ${MKDIR} ${PREFIX}/lib/Trf - ${INSTALL_DATA} ${WRKSRC}/libTrf${PORTVERSION}.so \ - ${WRKSRC}/pkgIndex.tcl ${PREFIX}/lib/Trf/ + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/Trf + ${INSTALL_DATA} ${WRKSRC}/libTrf${PORTVERSION}.so \ + ${WRKSRC}/pkgIndex.tcl ${STAGEDIR}${PREFIX}/lib/Trf/ for m in ${WRKSRC}/doc/man/*.n ; \ do \ - ${INSTALL_MAN} $$m ${MANNPREFIX}/man/mann/ ;\ + ${INSTALL_MAN} $$m ${STAGEDIR}${MANNPREFIX}/man/mann/ ;\ done check regression-test post-build test: cd ${WRKSRC}/tests && ${SETENV} TCLLIBPATH="${WRKSRC}" ${TCLSH} all -MANN= adler.n ascii85.n base64.n bin.n bz2.n crc-zlib.n crc.n \ - crypt.n haval.n hex.n md2.n md5.n md5_otp.n md5crypt.n \ - oct.n otp_words.n quoted-printable.n ripemd128.n ripemd160.n \ - rs_ecc.n sha.n sha1.n sha1_otp.n transform.n trf.n unstack.n \ - uuencode.n zip.n - .include <bsd.port.pre.mk> PLIST_SUB+= TCL_DVER=${TCL_VER:C/\.//} VER=${PORTVERSION} Modified: head/devel/tcl-trf/files/patch-md2 ============================================================================== --- head/devel/tcl-trf/files/patch-md2 Thu Apr 10 12:50:22 2014 (r350803) +++ head/devel/tcl-trf/files/patch-md2 Thu Apr 10 12:57:09 2014 (r350804) @@ -5,7 +5,7 @@ -#include "loadman.h" +#include "transformInt.h" -+#include <openssl/md2.h> ++#include "md2d.h" /* @@ -38,18 +39,8 @@ Added: head/devel/tcl-trf/files/patch-md2d ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/tcl-trf/files/patch-md2d Thu Apr 10 12:57:09 2014 (r350804) @@ -0,0 +1,266 @@ +Description: Patch reimplements MD2 hash because it was removed from + the OpenSSL implementation which was used in Trf. The actual + implementation is borrowed from Heimdal (http://www.h5l.org/) +Author: Sergei Golovan + +--- configure.in ++++ configure.in +@@ -89,6 +89,8 @@ + TEA_ADD_SOURCES([rmd160.c rmd128.c]) + TEA_ADD_SOURCES([otpmd5.c otpsha1.c]) + ++TEA_ADD_SOURCES([md2d.c]) ++ + TEA_ADD_SOURCES([rs_ecc.c]) + TEA_ADD_SOURCES([zip_opt.c zip.c bz2_opt.c bz2.c]) + +--- configure ++++ configure +@@ -7114,6 +7114,42 @@ + + + ++ vars="md2d.c" ++ for i in $vars; do ++ case $i in ++ \$*) ++ # allow $-var names ++ PKG_SOURCES="$PKG_SOURCES $i" ++ PKG_OBJECTS="$PKG_OBJECTS $i" ++ ;; ++ *) ++ # check for existence - allows for generic/win/unix VPATH ++ # To add more dirs here (like 'src'), you have to update VPATH ++ # in Makefile.in as well ++ if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ ++ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ ++ ; then ++ { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5 ++echo "$as_me: error: could not find source file '$i'" >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ PKG_SOURCES="$PKG_SOURCES $i" ++ # this assumes it is in a VPATH dir ++ i=`basename $i` ++ # handle user calling this before or after TEA_SETUP_COMPILER ++ if test x"${OBJEXT}" != x ; then ++ j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}" ++ else ++ j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}" ++ fi ++ PKG_OBJECTS="$PKG_OBJECTS $j" ++ ;; ++ esac ++ done ++ ++ ++ ++ + vars="rs_ecc.c" + for i in $vars; do + case $i in +--- generic/md2d.c ++++ generic/md2d.c +@@ -0,0 +1,137 @@ ++/* ++ * Copyright (c) 2006 Kungliga Tekniska Högskolan ++ * (Royal Institute of Technology, Stockholm, Sweden). ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * 3. Neither the name of the Institute nor the names of its contributors ++ * may be used to endorse or promote products derived from this software ++ * without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND ++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE ++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ */ ++ ++/* ++ * Modified by Sergei Golovan for TclTrf Debian package ++ */ ++ ++#include <string.h> ++ ++#include "md2d.h" ++ ++static const unsigned char subst[256] = { ++ 41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6, ++ 19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188, ++ 76, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24, ++ 138, 23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251, ++ 245, 142, 187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63, ++ 148, 194, 16, 137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50, ++ 39, 53, 62, 204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165, ++ 181, 209, 215, 94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210, ++ 150, 164, 125, 182, 118, 252, 107, 226, 156, 116, 4, 241, 69, 157, ++ 112, 89, 100, 113, 135, 32, 134, 91, 207, 101, 230, 45, 168, 2, 27, ++ 96, 37, 173, 174, 176, 185, 246, 28, 70, 97, 105, 52, 64, 126, 15, ++ 85, 71, 163, 35, 221, 81, 175, 58, 195, 92, 249, 206, 186, 197, ++ 234, 38, 44, 83, 13, 110, 133, 40, 132, 9, 211, 223, 205, 244, 65, ++ 129, 77, 82, 106, 220, 55, 200, 108, 193, 171, 250, 36, 225, 123, ++ 8, 12, 189, 177, 74, 120, 136, 149, 139, 227, 99, 232, 109, 233, ++ 203, 213, 254, 59, 0, 29, 57, 242, 239, 183, 14, 102, 88, 208, 228, ++ 166, 119, 114, 248, 235, 117, 75, 10, 49, 68, 80, 180, 143, 237, ++ 31, 26, 219, 153, 141, 51, 159, 17, 131, 20 ++}; ++ ++void ++MD2_Init (struct md2 *m) ++{ ++ memset(m, 0, sizeof(*m)); ++} ++ ++static void ++calc(struct md2 *m, const void *v) ++{ ++ unsigned char x[48], L; ++ const unsigned char *p = v; ++ int i, j, t; ++ ++ L = m->checksum[15]; ++ for (i = 0; i < 16; i++) ++ L = m->checksum[i] ^= subst[p[i] ^ L]; ++ ++ for (i = 0; i < 16; i++) { ++ x[i] = m->state[i]; ++ x[i + 16] = p[i]; ++ x[i + 32] = x[i] ^ p[i]; ++ } ++ ++ t = 0; ++ for (i = 0; i < 18; i++) { ++ for (j = 0; j < 48; j++) ++ t = x[j] ^= subst[t]; ++ t = (t + i) & 0xff; ++ } ++ ++ memcpy(m->state, x, 16); ++ memset(x, 0, sizeof(x)); ++} ++ ++void ++MD2_Update (struct md2 *m, const void *v, size_t len) ++{ ++ size_t idx = m->len & 0xf; ++ const unsigned char *p = v; ++ ++ m->len += len; ++ if (len + idx >= 16) { ++ if (idx) { ++ memcpy(m->data + idx, p, 16 - idx); ++ calc(m, m->data); ++ p += 16; ++ len -= 16 - idx; ++ } ++ while (len >= 16) { ++ calc(m, p); ++ p += 16; ++ len -= 16; ++ } ++ idx = 0; ++ } ++ ++ memcpy(m->data + idx, p, len); ++} ++ ++void ++MD2_Final (void *res, struct md2 *m) ++{ ++ unsigned char pad[16]; ++ size_t padlen; ++ ++ padlen = 16 - (m->len % 16); ++ memset(pad, padlen, padlen); ++ ++ MD2_Update(m, pad, padlen); ++ memcpy(pad, m->checksum, 16); ++ MD2_Update(m, pad, 16); ++ ++ memcpy(res, m->state, MD2_DIGEST_LENGTH); ++ memset(m, 0, sizeof(*m)); ++} +--- generic/md2d.h ++++ generic/md2d.h +@@ -0,0 +1,62 @@ ++/* ++ * Copyright (c) 2006 Kungliga Tekniska Högskolan ++ * (Royal Institute of Technology, Stockholm, Sweden). ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * 3. Neither the name of the Institute nor the names of its contributors ++ * may be used to endorse or promote products derived from this software ++ * without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND ++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE ++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ */ ++ ++/* ++ * Modified by Sergei Golovan for TclTrf Debian package ++ */ ++ ++/* $Id$ */ ++ ++#ifndef HEIM_MD2_H ++#define HEIM_MD2_H 1 ++ ++/* ++ * ++ */ ++ ++#define MD2_DIGEST_LENGTH 16 ++ ++struct md2 { ++ size_t len; ++ unsigned char data[16]; /* stored unalligned data between Update's */ ++ unsigned char checksum[16]; ++ unsigned char state[16]; /* lower 16 bytes of X */ ++}; ++ ++typedef struct md2 MD2_CTX; ++ ++void MD2_Init (struct md2 *m); ++void MD2_Update (struct md2 *m, const void *p, size_t len); ++void MD2_Final (void *res, struct md2 *m); ++ ++#endif /* HEIM_MD2_H */ Modified: head/devel/tcl-trf/pkg-plist ============================================================================== --- head/devel/tcl-trf/pkg-plist Thu Apr 10 12:50:22 2014 (r350803) +++ head/devel/tcl-trf/pkg-plist Thu Apr 10 12:57:09 2014 (r350804) @@ -1,3 +1,31 @@ lib/Trf/pkgIndex.tcl lib/Trf/libTrf%%VER%%.so +man/mann/adler.n.gz +man/mann/ascii85.n.gz +man/mann/base64.n.gz +man/mann/bin.n.gz +man/mann/bz2.n.gz +man/mann/crc-zlib.n.gz +man/mann/crc.n.gz +man/mann/crypt.n.gz +man/mann/haval.n.gz +man/mann/hex.n.gz +man/mann/md2.n.gz +man/mann/md5.n.gz +man/mann/md5_otp.n.gz +man/mann/md5crypt.n.gz +man/mann/oct.n.gz +man/mann/otp_words.n.gz +man/mann/quoted-printable.n.gz +man/mann/ripemd128.n.gz +man/mann/ripemd160.n.gz +man/mann/rs_ecc.n.gz +man/mann/sha.n.gz +man/mann/sha1.n.gz +man/mann/sha1_otp.n.gz +man/mann/transform.n.gz +man/mann/trf.n.gz +man/mann/unstack.n.gz +man/mann/uuencode.n.gz +man/mann/zip.n.gz @dirrm lib/Trf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404101257.s3ACv9T8033580>