From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 2 18:40:26 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F65616A422 for ; Fri, 2 Dec 2005 18:40:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10FE343D7C for ; Fri, 2 Dec 2005 18:40:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jB2Ie2GI070033 for ; Fri, 2 Dec 2005 18:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jB2Ie2hs070032; Fri, 2 Dec 2005 18:40:02 GMT (envelope-from gnats) Resent-Date: Fri, 2 Dec 2005 18:40:02 GMT Resent-Message-Id: <200512021840.jB2Ie2hs070032@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Wesley Shields Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9C3816A41F for ; Fri, 2 Dec 2005 18:33:29 +0000 (GMT) (envelope-from wxs@syn.csh.rit.edu) Received: from syn.csh.rit.edu (syn.csh.rit.edu [129.21.60.158]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42E0643D7C for ; Fri, 2 Dec 2005 18:33:23 +0000 (GMT) (envelope-from wxs@syn.csh.rit.edu) Received: from syn.csh.rit.edu (localhost [127.0.0.1]) by syn.csh.rit.edu (8.13.3/8.13.1) with ESMTP id jB2IZUsZ091198 for ; Fri, 2 Dec 2005 13:35:30 -0500 (EST) (envelope-from wxs@syn.csh.rit.edu) Received: (from wxs@localhost) by syn.csh.rit.edu (8.13.3/8.13.1/Submit) id jB2IZUAC091197; Fri, 2 Dec 2005 13:35:30 -0500 (EST) (envelope-from wxs) Message-Id: <200512021835.jB2IZUAC091197@syn.csh.rit.edu> Date: Fri, 2 Dec 2005 13:35:30 -0500 (EST) From: Wesley Shields To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/89861: [MAINTAINER UPDATE]: security/libtomcrypt X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Wesley Shields List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2005 18:40:26 -0000 >Number: 89861 >Category: ports >Synopsis: [MAINTAINER UPDATE]: security/libtomcrypt >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Dec 02 18:40:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Wesley Shields >Release: FreeBSD 5.4-RELEASE-p8 i386 >Organization: >Environment: System: FreeBSD syn 5.4-RELEASE-p8 FreeBSD 5.4-RELEASE-p8 #4: Tue Oct 11 10:45:25 EST 2005 root@syn:/usr/obj/usr/src/sys/GENERIC i386 >Description: Libtomcrypt is now up to 1.08. The attached patch enhances the MAINTAINER_MODE testing to use both math backends. As this is only to be used by the maintainer I figure it's safe to not explictly add BUILD_DEPENDS there, and just assume the maintainer has installed both math backends. >How-To-Repeat: N/A >Fix: diff -ruN security/libtomcrypt.orig/Makefile security/libtomcrypt/Makefile --- security/libtomcrypt.orig/Makefile Fri Nov 18 16:34:31 2005 +++ security/libtomcrypt/Makefile Fri Dec 2 12:39:55 2005 @@ -6,14 +6,11 @@ # PORTNAME= libtomcrypt -PORTVERSION= 1.06 +PORTVERSION= 1.08 CATEGORIES= security MASTER_SITES= http://libtomcrypt.org/files/ DISTNAME= crypt-${PORTVERSION} -PATCH_SITES= http://www.libtomcrypt.org/files/patch-1.06/ -PATCHFILES= makefile.diff - MAINTAINER= wxs@csh.rit.edu COMMENT= Comprehensive, modular and portable cryptographic toolkit @@ -52,12 +49,19 @@ BUILD_DEPENDS+= latex:${PORTSDIR}/print/teTeX .else NOPORTDOCS= yes -INSTALL_TARGET= install_lib +MAKE_ARGS+= NODOCS=yes .endif .if defined(MAINTAINER_MODE) test: build - (cd ${WRKSRC} && ${GMAKE} test && ${WRKSRC}/test) -.endif + @${ECHO_MSG} "Testing with -DUSE_TFM..." + (cd ${WRKSRC} && CFLAGS="${CFLAGS} -DUSE_TFM" EXTRALIBS="-L${PREFIX}/lib -ltfm" ${GMAKE} test && ${WRKSRC}/test) + @${ECHO_MSG} "Cleaning up test binary..." + @${RM} ${WRKSRC}/test + @${RM} ${WRKSRC}/demos/test.o + + @${ECHO_MSG} "Testing with -DUSE_LTM..." + (cd ${WRKSRC} && CFLAGS="${CFLAGS} -DUSE_LTM" EXTRALIBS="-L${PREFIX}/lib -ltommath" ${GMAKE} test && ${WRKSRC}/test) +.endif .include diff -ruN security/libtomcrypt.orig/distinfo security/libtomcrypt/distinfo --- security/libtomcrypt.orig/distinfo Fri Nov 18 16:34:31 2005 +++ security/libtomcrypt/distinfo Fri Nov 25 13:25:06 2005 @@ -1,4 +1,3 @@ -MD5 (crypt-1.06.tar.bz2) = f7b5fd2a5d4b2917576da7885f27e4a0 -SIZE (crypt-1.06.tar.bz2) = 1160330 -MD5 (makefile.diff) = 76b18782400494589c35e12e6cdd081d -SIZE (makefile.diff) = 1372 +MD5 (crypt-1.08.tar.bz2) = 3cce06f48b4ae59f0e287d21fb2d2a54 +SHA256 (crypt-1.08.tar.bz2) = e972295b49f89ddf6e5d3e12295048aece888ba421924289be14abadeac54119 +SIZE (crypt-1.08.tar.bz2) = 1192803 diff -ruN security/libtomcrypt.orig/files/patch-makefile security/libtomcrypt/files/patch-makefile --- security/libtomcrypt.orig/files/patch-makefile Fri Nov 18 16:34:31 2005 +++ security/libtomcrypt/files/patch-makefile Fri Nov 25 12:00:08 2005 @@ -1,15 +1,6 @@ ---- makefile.orig Thu Aug 18 13:07:13 2005 -+++ makefile Thu Aug 18 13:10:14 2005 -@@ -15,7 +15,7 @@ - #ARFLAGS=r - - # Compilation flags. Note the += does not write over the user's CFLAGS! --CFLAGS += -c -I./testprof/ -I./src/headers/ -Wall -Wsign-compare -W -Wshadow -Wno-unused-parameter -DLTC_SOURCE -+CFLAGS += -c -I./testprof/ -I./src/headers/ -Wall -Wsign-compare -W -Wshadow -DLTC_SOURCE - - # additional warnings (newer GCC 3.4 and higher) - #CFLAGS += -Wsystem-headers -Wdeclaration-after-statement -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wmissing-prototypes \ -@@ -24,10 +24,10 @@ +--- makefile.orig Fri Nov 18 06:11:19 2005 ++++ makefile Wed Nov 23 09:49:00 2005 +@@ -35,10 +35,10 @@ ifndef IGNORE_SPEED # optimize for SPEED @@ -22,26 +13,21 @@ # optimize for SIZE #CFLAGS += -Os -DLTC_SMALL_CODE -@@ -249,10 +249,16 @@ - install: library docs +@@ -270,11 +270,11 @@ + endif install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH) install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH) - install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(DATAPATH) -+ install -d -g $(GROUP) -o $(USER) $(DATAPATH) -+ install -g $(GROUP) -o $(USER) $(LIBNAME) $(DESTDIR)$(LIBPATH) -+ install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH) -+ install -g $(GROUP) -o $(USER) doc/crypt.pdf $(DATAPATH) -+ -+install_lib: library -+ install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH) -+ install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH) install -g $(GROUP) -o $(USER) $(LIBNAME) $(DESTDIR)$(LIBPATH) install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH) + ifndef NODOCS - install -g $(GROUP) -o $(USER) doc/crypt.pdf $(DESTDIR)$(DATAPATH) ++ install -d -g $(GROUP) -o $(USER) $(DATAPATH) ++ install -g $(GROUP) -o $(USER) doc/crypt.pdf $(DATAPATH) + endif install_test: testprof/$(LIBTEST) - install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH) -@@ -305,7 +311,7 @@ +@@ -328,7 +328,7 @@ latex crypt > /dev/null makeindex crypt.idx > /dev/null latex crypt > /dev/null >Release-Note: >Audit-Trail: >Unformatted: