Attachment #44203 for bug #68496

View | Details | Raw Unified | Return to bug 68496
Collapse All | Expand All




#

PORTNAME=	libtomcrypt
PORTVERSION=	0.97a
CATEGORIES=	security
MASTER_SITES=	http://libtomcrypt.org/files/
DISTNAME=	crypt-${PORTVERSION}


.if defined(MAINTAINER_MODE)
test:	build
	(cd ${WRKSRC}/demos/test && ${MAKE} && ${WRKSRC}/demos/test/test)
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|
||' ${WRKSRC}/whirl.c

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)security/libtomcrypt/distinfo (-2 / +2 lines)
1	MD5 (crypt-0.94.tar.bz2) = f53f3977e74d63e4733e388bffc69087	1	MD5 (crypt-0.97a.tar.bz2) = c1345cacd7a4724fbbbd6757ddcf9db8
2	SIZE (crypt-0.94.tar.bz2) = 820131	2	SIZE (crypt-0.97a.tar.bz2) = 838998




--- 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.

 DATAPATH=/usr/share/doc/libtomcrypt/pdf
 
 #List of objects to compile.
@@ -178,13 +178,19 @@
 
 #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 @@
 #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.

-	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 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)

+	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/*.c $(EXAMPLESDIR)
 
 #This rule cleans the source tree of all compiled code, not including the pdf
 #documentation.




--- 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 *~	

Lines 1-8 Link Here

(-)security/libtomcrypt/pkg-plist (-4 / +1 lines)
1	lib/libtomcrypt.a	1	lib/libtomcrypt.a
2	include/tommath.h	2	include/ltc_tommath.h
3	include/mycrypt_cfg.h	3	include/mycrypt_cfg.h
4	include/mycrypt_gf.h
5	include/mycrypt_kr.h
6	include/mycrypt_misc.h	4	include/mycrypt_misc.h
7	include/mycrypt_prng.h	5	include/mycrypt_prng.h
8	include/mycrypt_cipher.h	6	include/mycrypt_cipher.h
Lines 20-26 Link Here
20	%%EXAMPLESDIR%%/small.c	18	%%EXAMPLESDIR%%/small.c
21	%%EXAMPLESDIR%%/x86_prof.c	19	%%EXAMPLESDIR%%/x86_prof.c
22	%%EXAMPLESDIR%%/hashsum.c	20	%%EXAMPLESDIR%%/hashsum.c
23	%%EXAMPLESDIR%%/test.c
24	%%EXAMPLESDIR%%/tv_gen.c	21	%%EXAMPLESDIR%%/tv_gen.c
25	%%PORTDOCS%%%%DOCSDIR%%/crypt.pdf	22	%%PORTDOCS%%%%DOCSDIR%%/crypt.pdf
26	%%PORTDOCS%%%%DOCSDIR%%/cipher_tv.txt	23	%%PORTDOCS%%%%DOCSDIR%%/cipher_tv.txt

Return to bug 68496

Lines 6-12 Link Here

(-)security/libtomcrypt/Makefile (-5 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= libtomcrypt	8	PORTNAME= libtomcrypt
9	PORTVERSION= 0.94	9	PORTVERSION= 0.97a
10	CATEGORIES= security	10	CATEGORIES= security
11	MASTER_SITES= http://libtomcrypt.org/files/	11	MASTER_SITES= http://libtomcrypt.org/files/
12	DISTNAME= crypt-${PORTVERSION}	12	DISTNAME= crypt-${PORTVERSION}
Lines 30-39 Link Here
30		30
31	.if defined(MAINTAINER_MODE)	31	.if defined(MAINTAINER_MODE)
32	test: build	32	test: build
33	(cd ${WRKSRC} && ${MAKE} test && ${WRKSRC}/test)	33	(cd ${WRKSRC}/demos/test && ${MAKE} && ${WRKSRC}/demos/test/test)
34	.endif	34	.endif
35
36	post-patch:
37	@${REINPLACE_CMD} -e 's\| \|\|' ${WRKSRC}/whirl.c
38		35
39	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)security/libtomcrypt/files/patch-makefile (-14 / +6 lines)
1	--- makefile.orig Wed Dec 24 20:59:55 2003	1	--- makefile.orig Mon Jun 28 21:20:11 2004
2	+++ makefile Sat Apr 10 23:01:52 2004	2	+++ makefile Mon Jun 28 21:33:41 2004
3	@@ -52,9 +52,9 @@	3	@@ -43,9 +43,9 @@
4	#LIBPATH-The directory for libtomcrypt to be installed to.	4	#LIBPATH-The directory for libtomcrypt to be installed to.
5	#INCPATH-The directory to install the header files for libtomcrypt.	5	#INCPATH-The directory to install the header files for libtomcrypt.
6	#DATAPATH-The directory to install the pdf docs.	6	#DATAPATH-The directory to install the pdf docs.
Lines 13-27 Link Here
13	DATAPATH=/usr/share/doc/libtomcrypt/pdf	13	DATAPATH=/usr/share/doc/libtomcrypt/pdf
14		14
15	#List of objects to compile.	15	#List of objects to compile.
16	@@ -106,6 +106,7 @@	16	@@ -178,13 +178,19 @@
17
18	#This rule makes the test program included with libtomcrypt
19	test: library $(TESTOBJECTS)
20	+ mv $(TEST).o demos
21	$(CC) $(TESTOBJECTS) $(LIBNAME) -o $(TEST) $(WARN)
22
23	#This rule makes the hash program included with libtomcrypt
24	@@ -129,13 +130,19 @@
25	#This rule installs the library and the header files. This must be run	17	#This rule installs the library and the header files. This must be run
26	#as root in order to have a high enough permission to write to the correct	18	#as root in order to have a high enough permission to write to the correct
27	#directories and to set the owner and group to root.	19	#directories and to set the owner and group to root.
Lines 31-37 Link Here
31	- install -d -g root -o root $(DESTDIR)$(DATAPATH)	23	- install -d -g root -o root $(DESTDIR)$(DATAPATH)
32	- install -g root -o root $(LIBNAME) $(DESTDIR)$(LIBPATH)	24	- install -g root -o root $(LIBNAME) $(DESTDIR)$(LIBPATH)
33	- install -g root -o root $(HEADERS) $(DESTDIR)$(INCPATH)	25	- install -g root -o root $(HEADERS) $(DESTDIR)$(INCPATH)
34	- install -g root -o root crypt.pdf $(DESTDIR)$(DATAPATH)	26	- install -g root -o root doc/crypt.pdf $(DESTDIR)$(DATAPATH)
35	+install: library docs install-nodocs	27	+install: library docs install-nodocs
36	+ install -d -g wheel -o root $(DOCSDIR)	28	+ install -d -g wheel -o root $(DOCSDIR)
37	+ install -g wheel -o root crypt.pdf $(DOCSDIR)	29	+ install -g wheel -o root crypt.pdf $(DOCSDIR)
Lines 44-50 Link Here
44	+ install -g wheel -o root $(LIBNAME) $(DESTDIR)$(LIBPATH)	36	+ install -g wheel -o root $(LIBNAME) $(DESTDIR)$(LIBPATH)
45	+ install -g wheel -o root $(HEADERS) $(DESTDIR)$(INCPATH)	37	+ install -g wheel -o root $(HEADERS) $(DESTDIR)$(INCPATH)
46	+ install -g wheel -o root examples/* $(EXAMPLESDIR)	38	+ install -g wheel -o root examples/* $(EXAMPLESDIR)
47	+ install -g wheel -o root demos/* $(EXAMPLESDIR)	39	+ install -g wheel -o root demos/*.c $(EXAMPLESDIR)
48		40
49	#This rule cleans the source tree of all compiled code, not including the pdf	41	#This rule cleans the source tree of all compiled code, not including the pdf
50	#documentation.	42	#documentation.

Line 0 Link Here

(-)security/libtomcrypt/files/patch-test-makefile (+18 lines)
	1	--- demos/test/makefile.orig Wed Jun 23 14:51:49 2004
	2	+++ demos/test/makefile Mon Jun 28 22:29:28 2004
	3	@@ -1,5 +1,5 @@
	4	# make test harness, it is good.
	5	-CFLAGS += -Wall -W -Os -I../../ -I./
	6	+CFLAGS += -Wall -W -Os -I../../ -I./ -I/usr/local/include -L/usr/local/lib
	7
	8	# add -g3 for ccmalloc debugging
	9	#CFLAGS += -g3
	10	@@ -19,7 +19,7 @@
	11	#CCMALLOC = -lccmalloc -ldl
	12
	13	test: $(OBJECTS)
	14	- $(CC) $(OBJECTS) -ltomcrypt $(CCMALLOC) -o test
	15	+ $(CC) $(CFLAGS) $(OBJECTS) -ltomcrypt $(CCMALLOC) -o test
	16
	17	clean:
	18	rm -f test .o .obj .exe ~