ports/68496: [PATCH]: security/libtomcrypt

[Wesley Shields]

>Number:         68496
>Category:       ports
>Synopsis:       [PATCH]: security/libtomcrypt
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 30 01:50:22 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Wesley Shields
>Release:        FreeBSD 5.2.1-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD ack.ghi-east.org 5.2.1-RELEASE-p8 FreeBSD 5.2.1-RELEASE-p8 #0: Wed May 26 17:54:49 EST 2004 root at ack.ghi-east.org:/usr/obj/usr/src/sys/ACK i386

>Description:
Update security/libtomcrypt to 0.97a

>How-To-Repeat:
N/A

>Fix:
The attached patch updates libtomcrypt to 0.97a.  I've also put a copy
of the patch online at: 
http://www.atarininja.com/~wxs/patches/libtomcrypt-97a.diff

The maintainer has been CC'ed on this for approval.

diff -ruN security/libtomcrypt.orig/Makefile security/libtomcrypt/Makefile
--- security/libtomcrypt.orig/Makefile	Mon May  3 11:05:39 2004
+++ security/libtomcrypt/Makefile	Tue Jun 29 20:21:41 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libtomcrypt
-PORTVERSION=	0.94
+PORTVERSION=	0.97a
 CATEGORIES=	security
 MASTER_SITES=	http://libtomcrypt.org/files/
 DISTNAME=	crypt-${PORTVERSION}
@@ -30,10 +30,7 @@
 
 .if defined(MAINTAINER_MODE)
 test:	build
-	(cd ${WRKSRC} && ${MAKE} test && ${WRKSRC}/test)
+	(cd ${WRKSRC}/demos/test && ${MAKE} && ${WRKSRC}/demos/test/test)
 .endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|
||' ${WRKSRC}/whirl.c
 
 .include <bsd.port.mk>
diff -ruN security/libtomcrypt.orig/distinfo security/libtomcrypt/distinfo
--- security/libtomcrypt.orig/distinfo	Mon May  3 11:05:39 2004
+++ security/libtomcrypt/distinfo	Mon Jun 28 21:11:13 2004
@@ -1,2 +1,2 @@
-MD5 (crypt-0.94.tar.bz2) = f53f3977e74d63e4733e388bffc69087
-SIZE (crypt-0.94.tar.bz2) = 820131
+MD5 (crypt-0.97a.tar.bz2) = c1345cacd7a4724fbbbd6757ddcf9db8
+SIZE (crypt-0.97a.tar.bz2) = 838998
diff -ruN security/libtomcrypt.orig/files/patch-makefile security/libtomcrypt/files/patch-makefile
--- security/libtomcrypt.orig/files/patch-makefile	Sat Apr 10 18:16:07 2004
+++ security/libtomcrypt/files/patch-makefile	Tue Jun 29 20:46:51 2004
@@ -1,6 +1,6 @@
---- makefile.orig	Wed Dec 24 20:59:55 2003
-+++ makefile	Sat Apr 10 23:01:52 2004
-@@ -52,9 +52,9 @@
+--- makefile.orig	Mon Jun 28 21:20:11 2004
++++ makefile	Mon Jun 28 21:33:41 2004
+@@ -43,9 +43,9 @@
  #LIBPATH-The directory for libtomcrypt to be installed to.
  #INCPATH-The directory to install the header files for libtomcrypt.
  #DATAPATH-The directory to install the pdf docs.
@@ -13,15 +13,7 @@
  DATAPATH=/usr/share/doc/libtomcrypt/pdf
  
  #List of objects to compile.
-@@ -106,6 +106,7 @@
- 
- #This rule makes the test program included with libtomcrypt
- test: library $(TESTOBJECTS)
-+	mv $(TEST).o demos
- 	$(CC) $(TESTOBJECTS) $(LIBNAME) -o $(TEST) $(WARN)
- 
- #This rule makes the hash program included with libtomcrypt
-@@ -129,13 +130,19 @@
+@@ -178,13 +178,19 @@
  #This rule installs the library and the header files. This must be run
  #as root in order to have a high enough permission to write to the correct
  #directories and to set the owner and group to root.
@@ -31,7 +23,7 @@
 -	install -d -g root -o root $(DESTDIR)$(DATAPATH)
 -	install -g root -o root $(LIBNAME) $(DESTDIR)$(LIBPATH)
 -	install -g root -o root $(HEADERS) $(DESTDIR)$(INCPATH)
--	install -g root -o root crypt.pdf $(DESTDIR)$(DATAPATH)
+-	install -g root -o root doc/crypt.pdf $(DESTDIR)$(DATAPATH)
 +install: library docs install-nodocs
 +	install -d -g wheel -o root $(DOCSDIR)
 +	install -g wheel -o root crypt.pdf $(DOCSDIR)
@@ -44,7 +36,7 @@
 +	install -g wheel -o root $(LIBNAME) $(DESTDIR)$(LIBPATH)
 +	install -g wheel -o root $(HEADERS) $(DESTDIR)$(INCPATH)
 +	install -g wheel -o root examples/* $(EXAMPLESDIR)
-+	install -g wheel -o root demos/* $(EXAMPLESDIR)
++	install -g wheel -o root demos/*.c $(EXAMPLESDIR)
  
  #This rule cleans the source tree of all compiled code, not including the pdf
  #documentation.
diff -ruN security/libtomcrypt.orig/files/patch-test-makefile security/libtomcrypt/files/patch-test-makefile
--- security/libtomcrypt.orig/files/patch-test-makefile	Wed Dec 31 19:00:00 1969
+++ security/libtomcrypt/files/patch-test-makefile	Mon Jun 28 22:30:38 2004
@@ -0,0 +1,18 @@
+--- demos/test/makefile.orig	Wed Jun 23 14:51:49 2004
++++ demos/test/makefile	Mon Jun 28 22:29:28 2004
+@@ -1,5 +1,5 @@
+ # make test harness, it is good.
+-CFLAGS += -Wall -W -Os -I../../ -I./
++CFLAGS += -Wall -W -Os -I../../ -I./ -I/usr/local/include -L/usr/local/lib
+ 
+ # add -g3 for ccmalloc debugging 
+ #CFLAGS += -g3
+@@ -19,7 +19,7 @@
+ #CCMALLOC = -lccmalloc -ldl
+ 
+ test: $(OBJECTS)
+-	$(CC) $(OBJECTS) -ltomcrypt  $(CCMALLOC) -o test
++	$(CC) $(CFLAGS) $(OBJECTS) -ltomcrypt  $(CCMALLOC) -o test
+ 	
+ clean:
+ 	rm -f test *.o *.obj *.exe *~	
diff -ruN security/libtomcrypt.orig/pkg-plist security/libtomcrypt/pkg-plist
--- security/libtomcrypt.orig/pkg-plist	Mon May  3 11:05:39 2004
+++ security/libtomcrypt/pkg-plist	Tue Jun 29 20:43:24 2004
@@ -1,8 +1,6 @@
 lib/libtomcrypt.a
-include/tommath.h
+include/ltc_tommath.h
 include/mycrypt_cfg.h
-include/mycrypt_gf.h
-include/mycrypt_kr.h
 include/mycrypt_misc.h
 include/mycrypt_prng.h
 include/mycrypt_cipher.h
@@ -20,7 +18,6 @@
 %%EXAMPLESDIR%%/small.c
 %%EXAMPLESDIR%%/x86_prof.c
 %%EXAMPLESDIR%%/hashsum.c
-%%EXAMPLESDIR%%/test.c
 %%EXAMPLESDIR%%/tv_gen.c
 %%PORTDOCS%%%%DOCSDIR%%/crypt.pdf
 %%PORTDOCS%%%%DOCSDIR%%/cipher_tv.txt
>Release-Note:
>Audit-Trail:
>Unformatted: