Attachment #138230 for bug #184144

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




# $FreeBSD$

PORTNAME=	isomd5sum
PORTVERSION=	1.0.11
PORTREVISION=	1
CATEGORIES=	sysutils
MASTER_SITES=	https://git.fedorahosted.org/cgit/isomd5sum.git/snapshot/

MAINTAINER=	delgod@portaone.com
COMMENT=	Implanting and checking checksums within an ISO9660 image

LICENSE=	GPLv2

LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt

BROKEN=		Unfetchable due to checksum mismatch
USES=		gmake
USE_BZIP2=	yes
USE_PYTHON=	yes

Lines 1-2 Link Here

(-)sysutils/isomd5sum/distinfo (-2 / +2 lines)
1	SHA256 (isomd5sum-1.0.9.tar.bz2) = 307736e466a84bcf15a34af301d93cba5fcb23f8bd75624dbabdf75d37eeec8d	1	SHA256 (isomd5sum-1.0.11.tar.bz2) = f37a2ed2a4cd9ac518627d73165c3ca103d09a84986b57fee5865c5aa792c6fe
2	SIZE (isomd5sum-1.0.9.tar.bz2) = 18143	2	SIZE (isomd5sum-1.0.11.tar.bz2) = 18120




--- ./Makefile.orig	2013-07-17 21:42:23.000000000 +0000
+++ ./Makefile	2013-11-21 15:37:41.000000000 +0000
@@ -1,16 +1,16 @@
 PYVER  := $(shell python -c 'import sys; print sys.version[0:3]')
 PYTHON = python$(PYVER)
-PYTHONINCLUDE = /usr/include/$(PYTHON)
+PYTHONINCLUDE = ${PYTHON_INCLUDEDIR}
 
 VERSION=1.0.11
 
-ifneq (,$(filter sparc64 ppc64 x86_64 s390x aarch64,$(shell uname -m)))
-LIBDIR = lib64
-else
+#ifneq (,$(filter sparc64 ppc64 x86_64 s390x aarch64,$(shell uname -m)))
+#LIBDIR = lib64
+#else
 LIBDIR = lib

 
 OBJECTS = md5.o libimplantisomd5.o checkisomd5.o implantisomd5
 SOURCES = $(patsubst %.o,%.c,$(OBJECTS))
@@ -24,39 +24,39 @@
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -O -o $@ $<
 
 implantisomd5: implantisomd5.o libimplantisomd5.a
-	$(CC) $(CPPFLAGS) $(CFLAGS) implantisomd5.o libimplantisomd5.a -lpopt $(LDFLAGS) -o implantisomd5
+	$(CC) $(CPPFLAGS) $(CFLAGS) -L${LOCALBASE}/lib implantisomd5.o libimplantisomd5.a -lpopt $(LDFLAGS) -o implantisomd5
 
 checkisomd5: checkisomd5.o libcheckisomd5.a
-	$(CC) $(CPPFLAGS) $(CFLAGS) checkisomd5.o libcheckisomd5.a -lpopt $(LDFLAGS) -o checkisomd5
+	$(CC) $(CPPFLAGS) $(CFLAGS) -L${LOCALBASE}/lib checkisomd5.o libcheckisomd5.a -lpopt $(LDFLAGS) -o checkisomd5
 
 libimplantisomd5.a: libimplantisomd5.a(libimplantisomd5.o md5.o)
 
 libcheckisomd5.a: libcheckisomd5.a(libcheckisomd5.o md5.o)
 
 pyisomd5sum.so: $(PYOBJS)
-	$(CC) $(CPPFLAGS) $(CFLAGS) -shared -g -fpic $(PYOBJS) $(LDFLAGS) -o pyisomd5sum.so
+	$(CC) $(CPPFLAGS) $(CFLAGS) -shared -fpic $(PYOBJS) $(LDFLAGS) -o pyisomd5sum.so
 
 install: all install-bin install-python install-devel
 
 install-bin:




 
 static void byteReverse(unsigned char *buf, unsigned longs);
 
@@ -157,7 +157,7 @@
 	MD5_Transform(ctx->buf, (uint32 *) ctx->in);
 	if (ctx->doByteReverse) byteReverse((unsigned char *) ctx->buf, 4);
 	memcpy(digest, ctx->buf, 16);
-	memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
+	memset(ctx, 0, sizeof(*ctx));	/* In case it's sensitive */
 }
 
 #ifndef ASM_MD5

Return to bug 184144

Lines 2-20 Link Here

(-)sysutils/isomd5sum/Makefile (-4 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= isomd5sum	4	PORTNAME= isomd5sum
5	PORTVERSION= 1.0.9	5	PORTVERSION= 1.0.11
6	PORTREVISION= 1	6	PORTREVISION= 1
7	CATEGORIES= sysutils	7	CATEGORIES= sysutils
8	MASTER_SITES= http://git.fedorahosted.org/cgit/isomd5sum.git/snapshot/	8	MASTER_SITES= https://git.fedorahosted.org/cgit/isomd5sum.git/snapshot/
9		9
10	MAINTAINER= delgod@portaone.com	10	MAINTAINER= delgod@portaone.com
11	COMMENT= Implanting and checking checksums within an ISO9660 image	11	COMMENT= Implanting and checking checksums within an ISO9660 image
12		12
13	LICENSE= GPLv2	13	LICENSE= GPLv2
14		14
15	LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt	15	LIB_DEPENDS= popt:${PORTSDIR}/devel/popt
16		16
17	BROKEN= Unfetchable due to checksum mismatch
18	USES= gmake	17	USES= gmake
19	USE_BZIP2= yes	18	USE_BZIP2= yes
20	USE_PYTHON= yes	19	USE_PYTHON= yes

Lines 1-17 Link Here

(-)sysutils/isomd5sum/files/patch-Makefile (-12 / +17 lines)
1	--- ./Makefile.orig 2012-03-09 21:51:31.000000000 +0200	1	--- ./Makefile.orig 2013-07-17 21:42:23.000000000 +0000
2	+++ ./Makefile 2012-10-10 06:07:15.000000000 +0300	2	+++ ./Makefile 2013-11-21 15:37:41.000000000 +0000
3	@@ -1,16 +1,16 @@	3	@@ -1,16 +1,16 @@
4	PYVER := $(shell python -c 'import sys; print sys.version[0:3]')	4	PYVER := $(shell python -c 'import sys; print sys.version[0:3]')
5	PYTHON = python$(PYVER)	5	PYTHON = python$(PYVER)
6	-PYTHONINCLUDE = /usr/include/$(PYTHON)	6	-PYTHONINCLUDE = /usr/include/$(PYTHON)
7	+PYTHONINCLUDE = ${PYTHON_INCLUDEDIR}	7	+PYTHONINCLUDE = ${PYTHON_INCLUDEDIR}
8		8
9	VERSION=1.0.9	9	VERSION=1.0.11
10		10
11	-ifneq (,$(filter sparc64 ppc64 x86_64 s390x,$(shell uname -m)))	11	-ifneq (,$(filter sparc64 ppc64 x86_64 s390x aarch64,$(shell uname -m)))
12	-LIBDIR = lib64	12	-LIBDIR = lib64
13	-else	13	-else
14	+#ifneq (,$(filter sparc64 ppc64 x86_64 s390x,$(shell uname -m)))	14	+#ifneq (,$(filter sparc64 ppc64 x86_64 s390x aarch64,$(shell uname -m)))
15	+#LIBDIR = lib64	15	+#LIBDIR = lib64
16	+#else	16	+#else
17	LIBDIR = lib	17	LIBDIR = lib
Lines 23-42 Link Here
23		23
24	OBJECTS = md5.o libimplantisomd5.o checkisomd5.o implantisomd5	24	OBJECTS = md5.o libimplantisomd5.o checkisomd5.o implantisomd5
25	SOURCES = $(patsubst %.o,%.c,$(OBJECTS))	25	SOURCES = $(patsubst %.o,%.c,$(OBJECTS))
26	@@ -24,10 +24,10 @@	26	@@ -24,39 +24,39 @@
27	$(CC) -c -O $(CFLAGS) -o $@ $<	27	$(CC) $(CPPFLAGS) $(CFLAGS) -c -O -o $@ $<
28		28
29	implantisomd5: implantisomd5.o libimplantisomd5.a	29	implantisomd5: implantisomd5.o libimplantisomd5.a
30	- $(CC) $(CFLAGS) implantisomd5.o libimplantisomd5.a -lpopt -o implantisomd5	30	- $(CC) $(CPPFLAGS) $(CFLAGS) implantisomd5.o libimplantisomd5.a -lpopt $(LDFLAGS) -o implantisomd5
31	+ $(CC) $(CFLAGS) -L${LOCALBASE}/lib implantisomd5.o libimplantisomd5.a -lpopt -o implantisomd5	31	+ $(CC) $(CPPFLAGS) $(CFLAGS) -L${LOCALBASE}/lib implantisomd5.o libimplantisomd5.a -lpopt $(LDFLAGS) -o implantisomd5
32		32
33	checkisomd5: checkisomd5.o libcheckisomd5.a	33	checkisomd5: checkisomd5.o libcheckisomd5.a
34	- $(CC) $(CFLAGS) checkisomd5.o libcheckisomd5.a -lpopt -o checkisomd5	34	- $(CC) $(CPPFLAGS) $(CFLAGS) checkisomd5.o libcheckisomd5.a -lpopt $(LDFLAGS) -o checkisomd5
35	+ $(CC) $(CFLAGS) -L${LOCALBASE}/lib checkisomd5.o libcheckisomd5.a -lpopt -o checkisomd5	35	+ $(CC) $(CPPFLAGS) $(CFLAGS) -L${LOCALBASE}/lib checkisomd5.o libcheckisomd5.a -lpopt $(LDFLAGS) -o checkisomd5
36		36
37	libimplantisomd5.a: libimplantisomd5.a(libimplantisomd5.o md5.o)	37	libimplantisomd5.a: libimplantisomd5.a(libimplantisomd5.o md5.o)
38		38
39	@@ -39,24 +39,24 @@	39	libcheckisomd5.a: libcheckisomd5.a(libcheckisomd5.o md5.o)
		40
		41	pyisomd5sum.so: $(PYOBJS)
		42	- $(CC) $(CPPFLAGS) $(CFLAGS) -shared -g -fpic $(PYOBJS) $(LDFLAGS) -o pyisomd5sum.so
		43	+ $(CC) $(CPPFLAGS) $(CFLAGS) -shared -fpic $(PYOBJS) $(LDFLAGS) -o pyisomd5sum.so
		44
40	install: all install-bin install-python install-devel	45	install: all install-bin install-python install-devel
41		46
42	install-bin:	47	install-bin:

Lines 17-28 Link Here

(-)sysutils/isomd5sum/files/patch-md5.c (-9 lines)
17		17
18	static void byteReverse(unsigned char *buf, unsigned longs);	18	static void byteReverse(unsigned char *buf, unsigned longs);
19		19
20	@@ -157,7 +157,7 @@
21	MD5_Transform(ctx->buf, (uint32 *) ctx->in);
22	if (ctx->doByteReverse) byteReverse((unsigned char *) ctx->buf, 4);
23	memcpy(digest, ctx->buf, 16);
24	- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
25	+ memset(ctx, 0, sizeof(ctx)); / In case it's sensitive */
26	}
27
28	#ifndef ASM_MD5