svn commit: r317974 - in head: . devel/hs-git-annex devel/hs-git-annex/files

[Gabor Pali]

Author: pgj
Date: Sun May 12 19:39:00 2013
New Revision: 317974
URL: http://svnweb.freebsd.org/changeset/ports/317974

Log:
  - Fix a silent hashing problem for git-annex, please study the UPDATING
    entry before proceeding!
  
  Submitted by:	Justin Bedő <cu at cua0.org>
  Obtained from:	FreeBSD Haskell

Added:
  head/devel/hs-git-annex/files/patch-Build__Configure.hs   (contents, props changed)
Modified:
  head/UPDATING
  head/devel/hs-git-annex/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sun May 12 19:30:28 2013	(r317973)
+++ head/UPDATING	Sun May 12 19:39:00 2013	(r317974)
@@ -5,6 +5,25 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20130512:
+  AFFECTS: users of devel/hs-git-annex
+  AUTHOR: haskell at FreeBSD.org
+
+  On FreeBSD, git-annex incorrectly calculated SHA256 hashes for files
+  added to the annex repository due to the BSD-style output of
+  /sbin/sha256.  The result of this is silent data corruption.
+
+  This problem has been fixed, but every file stored in an annex
+  repository will fail a `git annex fsck` after the upgrade.  Thus,
+  before updating, it is wise to issue the command below and restore the
+  files.
+
+  $ git annex uninit
+
+  Corruptions can then be found by finding all files with the same hash.
+  Note that only files that were mishashed to the same location are a
+  problem.
+
 20130511:
   AFFECTS: users of TeX
   AUTHOR: hrs at FreeBSD.org

Modified: head/devel/hs-git-annex/Makefile
==============================================================================
--- head/devel/hs-git-annex/Makefile	Sun May 12 19:30:28 2013	(r317973)
+++ head/devel/hs-git-annex/Makefile	Sun May 12 19:39:00 2013	(r317974)
@@ -3,6 +3,7 @@
 
 PORTNAME=	git-annex
 PORTVERSION=	4.20130323
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell at FreeBSD.org
@@ -22,10 +23,12 @@ USE_GMAKE=		yes
 USE_PERL5_BUILD=	yes
 
 BUILD_DEPENDS+=	rsync:${PORTSDIR}/net/rsync \
-		git:${PORTSDIR}/devel/git
+		git:${PORTSDIR}/devel/git \
+		gsha256sum:${PORTSDIR}/sysutils/coreutils
 
 RUN_DEPENDS+=	rsync:${PORTSDIR}/net/rsync \
-		git:${PORTSDIR}/devel/git
+		git:${PORTSDIR}/devel/git \
+		gsha256sum:${PORTSDIR}/sysutils/coreutils
 
 EXECUTABLE=	git-annex git-annex-shell
 STANDALONE=	yes

Added: head/devel/hs-git-annex/files/patch-Build__Configure.hs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/hs-git-annex/files/patch-Build__Configure.hs	Sun May 12 19:39:00 2013	(r317974)
@@ -0,0 +1,11 @@
+--- ./Build/Configure.hs.orig	2013-03-23 20:06:19.000000000 +0200
++++ ./Build/Configure.hs	2013-05-09 22:49:33.000000000 +0200
+@@ -55,7 +55,7 @@
+ 		key = "sha" ++ show n
+ 		check = "</dev/null 2>/dev/null | grep -q '" ++ knowngood ++ "'"
+ 	shacmds n = concatMap (\x -> [x, 'g':x, osxpath </> x]) $
+-		map (\x -> "sha" ++ show n ++ x) ["sum", ""]
++		map (\x -> "gsha" ++ show n ++ x) ["sum", ""]
+ 	{- Max OSX sometimes puts GNU tools outside PATH, so look in
+ 	 - the location it uses, and remember where to run them
+ 	 - from. -}