[csw-devel] SF.net SVN: gar:[21027] csw/mgar/pkg/md5deep/trunk

[dmichelsen at users.sourceforge.net]

Revision: 21027
          http://gar.svn.sourceforge.net/gar/?rev=21027&view=rev
Author:   dmichelsen
Date:     2013-05-07 13:14:24 +0000 (Tue, 07 May 2013)
Log Message:
-----------
md5deep/trunk: Update to 4.3, add patch

Modified Paths:
--------------
    csw/mgar/pkg/md5deep/trunk/Makefile
    csw/mgar/pkg/md5deep/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/md5deep/trunk/files/0001-Use-MAP_FILE-only-when-available.patch
    csw/mgar/pkg/md5deep/trunk/files/bootstrap.sh

Modified: csw/mgar/pkg/md5deep/trunk/Makefile
===================================================================
--- csw/mgar/pkg/md5deep/trunk/Makefile	2013-05-07 13:05:00 UTC (rev 21026)
+++ csw/mgar/pkg/md5deep/trunk/Makefile	2013-05-07 13:14:24 UTC (rev 21027)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = md5deep
-VERSION = 4.0.0
+VERSION = 4.3
 GARTYPE = v2
 
 DESCRIPTION = Compute MD5, SHA-1, SHA-256, Tiger, or Whirlpool message digests
@@ -11,11 +11,24 @@
 endef
 
 MASTER_SITES = $(SF_MIRRORS)
-DISTFILES = $(DISTNAME).tar.gz
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += bootstrap.sh
 
+# Use patch until pull request has been merged:
+#   https://github.com/jessek/hashdeep/pull/291
+PATCHFILES += 0001-Use-MAP_FILE-only-when-available.patch
+
 GARCOMPILER = GNU
 
-CONFIGURE_ARGS = $(DIRPATHS)
+BUILD64 = 1
+ISAEXEC = 1
 
+# We need vasprintf from a newer release than the frozen one
+LINKER_MAPS =
+
 include gar/category.mk
 
+pre-configure:
+	cp $(WORKDIR)/bootstrap.sh $(WORKSRC)
+	cd $(WORKSRC) && sh bootstrap.sh
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/md5deep/trunk/checksums
===================================================================
--- csw/mgar/pkg/md5deep/trunk/checksums	2013-05-07 13:05:00 UTC (rev 21026)
+++ csw/mgar/pkg/md5deep/trunk/checksums	2013-05-07 13:14:24 UTC (rev 21027)
@@ -1 +1 @@
-fc3c0afbcf72861a5a42c699e804d6d4  md5deep-4.0.0.tar.gz
+f172e686ca1df83a53308ad90f7f706d  md5deep-4.3.tar.gz

Added: csw/mgar/pkg/md5deep/trunk/files/0001-Use-MAP_FILE-only-when-available.patch
===================================================================
--- csw/mgar/pkg/md5deep/trunk/files/0001-Use-MAP_FILE-only-when-available.patch	                        (rev 0)
+++ csw/mgar/pkg/md5deep/trunk/files/0001-Use-MAP_FILE-only-when-available.patch	2013-05-07 13:14:24 UTC (rev 21027)
@@ -0,0 +1,44 @@
+From 3413c56c49ab39d78a0aada0b1e603f0f74b4335 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 7 May 2013 14:54:43 +0200
+Subject: [PATCH] Use MAP_FILE only when available
+
+---
+ configure.ac | 3 ++-
+ src/hash.cpp | 6 +++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c51bd75..f05cbba 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -138,7 +138,8 @@ AC_CHECK_HEADERS([libgen.h fcntl.h limits.h inttypes.h malloc.h stdint.h stdlib.
+ 			   CommonCrypto/CommonDigest.h
+ 			   ])
+ 
+-
++# Definition of MAP_FILE is missing e.g. on Solaris
++AC_CHECK_DECLS([MAP_FILE])
+ 
+ # These functions not available everywhere
+ AC_CHECK_FUNCS([_gmtime64_s _gmtime64 gmtime_r mmap usleep mkstemp vasprintf getrusage getprogname isxdigit])
+diff --git a/src/hash.cpp b/src/hash.cpp
+index c4518cf..4249e24 100644
+--- a/src/hash.cpp
++++ b/src/hash.cpp
+@@ -274,7 +274,11 @@ void file_data_hasher_t::hash()
+ 		return;
+ 	    }
+ #ifdef HAVE_MMAP
+-	    fdht->base = (uint8_t *)mmap(0,fdht->stat_bytes,PROT_READ,MAP_FILE|MAP_SHARED,fd,0);
++	    fdht->base = (uint8_t *)mmap(0,fdht->stat_bytes,PROT_READ,
++#if HAVE_DECL_MAP_FILE
++		MAP_FILE|
++#endif
++		MAP_SHARED,fd,0);
+ 	    if(fdht->base>0){		
+ 		/* mmap is successful, so set the bounds.
+ 		 * if it is not successful, we default to reading the fd
+-- 
+1.8.1.4
+

Added: csw/mgar/pkg/md5deep/trunk/files/bootstrap.sh
===================================================================
--- csw/mgar/pkg/md5deep/trunk/files/bootstrap.sh	                        (rev 0)
+++ csw/mgar/pkg/md5deep/trunk/files/bootstrap.sh	2013-05-07 13:14:24 UTC (rev 21027)
@@ -0,0 +1,7 @@
+/bin/rm -rf aclocal.m4
+autoheader -f
+touch NEWS README AUTHORS ChangeLog
+touch stamp-h
+aclocal
+autoconf -f
+automake --add-missing -c

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.