Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Jan 2013 13:20:01 GMT
From:      dfilter@FreeBSD.ORG (dfilter service)
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/175322: commit references a PR
Message-ID:  <201301271320.r0RDK1FP033315@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/175322; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/175322: commit references a PR
Date: Sun, 27 Jan 2013 13:14:38 +0000 (UTC)

 Author: rakuco
 Date: Sun Jan 27 13:14:30 2013
 New Revision: 311065
 URL: http://svnweb.freebsd.org/changeset/ports/311065
 
 Log:
   - Update to 1.0.9.
   - Add clang support.
   - Add LICENSE.
   - Update MASTER_SITE.
   - Trim old Makefile header.
   
   PR:		ports/175322
   Submitted by:	Mykola Marzhan <delgod@portaone.com> (maintainer)
 
 Modified:
   head/sysutils/isomd5sum/Makefile
   head/sysutils/isomd5sum/distinfo
   head/sysutils/isomd5sum/files/patch-Makefile
   head/sysutils/isomd5sum/files/patch-md5.c
 
 Modified: head/sysutils/isomd5sum/Makefile
 ==============================================================================
 --- head/sysutils/isomd5sum/Makefile	Sun Jan 27 12:51:44 2013	(r311064)
 +++ head/sysutils/isomd5sum/Makefile	Sun Jan 27 13:14:30 2013	(r311065)
 @@ -1,19 +1,17 @@
 -# New ports collection makefile for:	isomd5sum
 -# Date created:				June 17, 2008
 -# Whom:					Marzhan Mykola <delgod@portaone.com>
 -#
 +# Created by: Mykola Marzhan <delgod@portaone.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	isomd5sum
 -PORTVERSION=	1.0.4
 +PORTVERSION=	1.0.9
  PORTREVISION=	1
  CATEGORIES=	sysutils
 -MASTER_SITES=	https://fedorahosted.org/releases/i/s/isomd5sum/
 +MASTER_SITES=	http://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.0:${PORTSDIR}/devel/popt
  
  USE_GMAKE=	yes
 
 Modified: head/sysutils/isomd5sum/distinfo
 ==============================================================================
 --- head/sysutils/isomd5sum/distinfo	Sun Jan 27 12:51:44 2013	(r311064)
 +++ head/sysutils/isomd5sum/distinfo	Sun Jan 27 13:14:30 2013	(r311065)
 @@ -1,2 +1,2 @@
 -SHA256 (isomd5sum-1.0.4.tar.bz2) = 7c113eeac39026deec395195aad10566c6f0ce97a63844f8bc023313fce53621
 -SIZE (isomd5sum-1.0.4.tar.bz2) = 18486
 +SHA256 (isomd5sum-1.0.9.tar.bz2) = 307736e466a84bcf15a34af301d93cba5fcb23f8bd75624dbabdf75d37eeec8d
 +SIZE (isomd5sum-1.0.9.tar.bz2) = 18143
 
 Modified: head/sysutils/isomd5sum/files/patch-Makefile
 ==============================================================================
 --- head/sysutils/isomd5sum/files/patch-Makefile	Sun Jan 27 12:51:44 2013	(r311064)
 +++ head/sysutils/isomd5sum/files/patch-Makefile	Sun Jan 27 13:14:30 2013	(r311065)
 @@ -1,58 +1,77 @@
 ---- ./Makefile.orig	2008-02-08 04:30:07.000000000 +0000
 -+++ ./Makefile	2008-06-17 17:07:37.000000000 +0000
 -@@ -1,14 +1,14 @@
 +--- ./Makefile.orig	2012-03-09 21:51:31.000000000 +0200
 ++++ ./Makefile	2012-10-10 06:07:15.000000000 +0300
 +@@ -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}
   
 --ifneq (,$(filter ppc64 x86_64 s390x,$(shell uname -m)))
 + VERSION=1.0.9
 + 
 +-ifneq (,$(filter sparc64 ppc64 x86_64 s390x,$(shell uname -m)))
  -LIBDIR = lib64
  -else
 -+#ifneq (,$(filter ppc64 x86_64 s390x,$(shell uname -m)))
 ++#ifneq (,$(filter sparc64 ppc64 x86_64 s390x,$(shell uname -m)))
  +#LIBDIR = lib64
  +#else
   LIBDIR = lib
  -endif
  +#endif
   
 --CFLAGS = $(RPM_OPT_FLAGS) -Wall -Werror -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -fPIC -I$(PYTHONINCLUDE)
 -+CFLAGS = $(RPM_OPT_FLAGS) -Wall -Werror -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -fPIC -I$(PYTHONINCLUDE) -I${LOCALBASE}/include -L${LOCALBASE}/lib
 +-CFLAGS += -Wall -Werror -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -fPIC -I$(PYTHONINCLUDE)
 ++CFLAGS += -Wall -Werror -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -fPIC -I$(PYTHONINCLUDE) -I${LOCALBASE}/include
   
   OBJECTS = md5.o libimplantisomd5.o checkisomd5.o implantisomd5
   SOURCES = $(patsubst %.o,%.c,$(OBJECTS))
 -@@ -35,21 +35,21 @@
 - 	$(CC) -shared -g -o pyisomd5sum.so -fpic $(PYOBJS) $(LDFLAGS)
 +@@ -24,10 +24,10 @@
 + 	$(CC) -c -O $(CFLAGS) -o $@ $<
 + 
 + implantisomd5: implantisomd5.o libimplantisomd5.a
 +-	$(CC) $(CFLAGS) implantisomd5.o libimplantisomd5.a -lpopt -o implantisomd5
 ++	$(CC) $(CFLAGS) -L${LOCALBASE}/lib implantisomd5.o libimplantisomd5.a -lpopt -o implantisomd5
 + 
 + checkisomd5: checkisomd5.o libcheckisomd5.a
 +-	$(CC) $(CFLAGS) checkisomd5.o libcheckisomd5.a -lpopt -o checkisomd5
 ++	$(CC) $(CFLAGS) -L${LOCALBASE}/lib checkisomd5.o libcheckisomd5.a -lpopt -o checkisomd5
 + 
 + libimplantisomd5.a: libimplantisomd5.a(libimplantisomd5.o md5.o)
 + 
 +@@ -39,24 +39,24 @@
 + install: all install-bin install-python install-devel
 + 
 + install-bin:
 +-	install -d -m 0755 $(DESTDIR)/usr/bin
 +-	install -d -m 0755 $(DESTDIR)/usr/share/man/man1
 +-	install -m 0755 implantisomd5 $(DESTDIR)/usr/bin
 +-	install -m 0755 checkisomd5 $(DESTDIR)/usr/bin
 +-	install -m 0644 implantisomd5.1 $(DESTDIR)/usr/share/man/man1
 +-	install -m 0644 checkisomd5.1 $(DESTDIR)/usr/share/man/man1
 ++	install -d -m 0755 $(DESTDIR)$(PREFIX)/bin
 ++	install -d -m 0755 $(DESTDIR)$(PREFIX)/man/man1
 ++	install -m 0755 implantisomd5 $(DESTDIR)$(PREFIX)/bin
 ++	install -m 0755 checkisomd5 $(DESTDIR)$(PREFIX)/bin
 ++	install -m 0644 implantisomd5.1 $(DESTDIR)$(PREFIX)/man/man1
 ++	install -m 0644 checkisomd5.1 $(DESTDIR)$(PREFIX)/man/man1
 + 
 + install-python:
 +-	install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR)/$(PYTHON)/site-packages
 +-	install -m 0755 pyisomd5sum.so $(DESTDIR)/usr/$(LIBDIR)/$(PYTHON)/site-packages
 ++	install -d -m 0755 $(DESTDIR)$(PYTHONPREFIX_SITELIBDIR)
 ++	install -m 0755 pyisomd5sum.so $(DESTDIR)$(PYTHONPREFIX_SITELIBDIR)
   
 - install: all
 --	mkdir -p $(DESTDIR)/usr/$(LIBDIR)/$(PYTHON)/site-packages
 --	mkdir -p $(DESTDIR)/usr/include
 --	mkdir -p $(DESTDIR)/usr/bin
 --	mkdir -p $(DESTDIR)/usr/share/man/man1
 --	install -m 755 implantisomd5 $(DESTDIR)/usr/bin
 --	install -m 755 checkisomd5 $(DESTDIR)/usr/bin
 --	install -m 755 implantisomd5.1 $(DESTDIR)/usr/share/man/man1
 --	install -m 755 checkisomd5.1 $(DESTDIR)/usr/share/man/man1
 --	install -m 755 pyisomd5sum.so $(DESTDIR)/usr/$(LIBDIR)/$(PYTHON)/site-packages
 -+	mkdir -p $(PYTHONPREFIX_SITELIBDIR)
 -+	mkdir -p $(PREFIX)/include
 -+	mkdir -p $(PREFIX)/bin
 -+	mkdir -p $(PREFIX)/man/man1
 -+	install -m 755 implantisomd5 $(PREFIX)/bin
 -+	install -m 755 checkisomd5 $(PREFIX)/bin
 -+	install -m 755 implantisomd5.1 $(PREFIX)/man/man1
 -+	install -m 755 checkisomd5.1 $(PREFIX)/man/man1
 -+	install -m 755 pyisomd5sum.so $(PYTHONPREFIX_SITELIBDIR)
 - #	ln -s ../../bin/implantisomd5 $(DESTDIR)/usr/lib/anaconda-runtime/implantisomd5
 - #	ln -s ../../bin/checkisomd5 $(DESTDIR)/usr/lib/anaconda-runtime/checkisomd5
 --	install -m 644 libimplantisomd5.h $(DESTDIR)/usr/include/
 --	install -m 644 libcheckisomd5.h $(DESTDIR)/usr/include/
 --	install -m 644 libimplantisomd5.a $(DESTDIR)/usr/$(LIBDIR)
 --	install -m 644 libcheckisomd5.a $(DESTDIR)/usr/$(LIBDIR)
 -+	install -m 644 libimplantisomd5.h $(PREFIX)/include/
 -+	install -m 644 libcheckisomd5.h $(PREFIX)/include/
 -+	install -m 644 libimplantisomd5.a $(PREFIX)/$(LIBDIR)
 -+	install -m 644 libcheckisomd5.a $(PREFIX)/$(LIBDIR)
 + install-devel:
 +-	install -d -m 0755 $(DESTDIR)/usr/include
 +-	install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR)
 +-	install -m 0644 libimplantisomd5.h $(DESTDIR)/usr/include/
 +-	install -m 0644 libcheckisomd5.h $(DESTDIR)/usr/include/
 +-	install -m 0644 libimplantisomd5.a $(DESTDIR)/usr/$(LIBDIR)
 +-	install -m 0644 libcheckisomd5.a $(DESTDIR)/usr/$(LIBDIR)
 ++	install -d -m 0755 $(DESTDIR)$(PREFIX)/include
 ++	install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
 ++	install -m 0644 libimplantisomd5.h $(DESTDIR)$(PREFIX)/include/
 ++	install -m 0644 libcheckisomd5.h $(DESTDIR)$(PREFIX)/include/
 ++	install -m 0644 libimplantisomd5.a $(DESTDIR)$(PREFIX)/$(LIBDIR)
 ++	install -m 0644 libcheckisomd5.a $(DESTDIR)$(PREFIX)/$(LIBDIR)
   
   clean:
   	rm -f *.o *.so *.pyc *.a .depend *~
 
 Modified: head/sysutils/isomd5sum/files/patch-md5.c
 ==============================================================================
 --- head/sysutils/isomd5sum/files/patch-md5.c	Sun Jan 27 12:51:44 2013	(r311064)
 +++ head/sysutils/isomd5sum/files/patch-md5.c	Sun Jan 27 13:14:30 2013	(r311065)
 @@ -1,5 +1,5 @@
 ---- ./md5.c.orig	2008-02-08 04:30:07.000000000 +0000
 -+++ ./md5.c	2008-06-17 17:05:34.000000000 +0000
 +--- ./md5.c.orig	2012-10-09 13:34:42.000000000 +0300
 ++++ ./md5.c	2012-10-09 13:34:51.000000000 +0300
  @@ -20,13 +20,13 @@
    */
   
 @@ -17,3 +17,12 @@
   
   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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301271320.r0RDK1FP033315>