update gits version to one that fixes http://secunia.com/advisories/52361/

Changelogs:

Fixes since v1.8.1.2
--------------------

 * The attribute mechanism didn't allow limiting attributes to be
   applied to only a single directory itself with "path/" like the
   exclude mechanism does. The fix for this in 1.8.1.2 had
   performance degradations.

 * Command line completion code was inadvertently made incompatible with
   older versions of bash by using a newer array notation.

 * Scripts to test bash completion was inherently flaky as it was
   affected by whatever random things the user may have on $PATH.

 * A fix was added to the build procedure to work around buggy
   versions of ccache broke the auto-generation of dependencies, which
   unfortunately is still relevant because some people use ancient
   distros.

 * We used to stuff "user@" and then append what we read from
   /etc/mailname to come up with a default e-mail ident, but a bug
   lost the "user@" part.

 * "git am" did not parse datestamp correctly from Hg generated patch,
   when it is run in a locale outside C (or en).

 * Attempt to "branch --edit-description" an existing branch, while
   being on a detached HEAD, errored out.

 * "git cherry-pick" did not replay a root commit to an unborn branch.

 * We forgot to close the file descriptor reading from "gpg" output,
   killing "git log --show-signature" on a long history.

 * "git rebase --preserve-merges" lost empty merges in recent versions
   of Git.

 * Rebasing the history of superproject with change in the submodule
   has been broken since v1.7.12.

 * A failure to push due to non-ff while on an unborn branch
   dereferenced a NULL pointer when showing an error message.

Also contains various documentation fixes.

Fixes since v1.8.1.3
--------------------

 * "git imap-send" talking over imaps:// did make sure it received a
   valid certificate from the other end, but did not check if the
   certificate matched the host it thought it was talking to.

Also contains various documentation fixes.

Fixes since v1.8.1.4
--------------------

 * Given a string with a multi-byte character that begins with '-' on
   the command line where an option is expected, the option parser
   used just one byte of the unknown letter when reporting an error.

 * In v1.8.1, the attribute parser was tightened too restrictive to
   error out upon seeing an entry that begins with an ! (exclamation),
   which may confuse users to expect a "negative match", which does
   not exist. This has been demoted to a warning; such an entry is
   still ignored.

 * "git apply --summary" has been taught to make sure the similarity
   value shown in its output is sensible, even when the input had a
   bogus value.

 * "git clean" showed what it was going to do, but sometimes ended
   up finding that it was not allowed to do so, which resulted in a
   confusing output (e.g. after saying that it will remove an
   untracked directory, it found an embedded git repository there
   which it is not allowed to remove). It now performs the actions
   and then reports the outcome more faithfully.

 * "git clone" used to allow --bare and --separate-git-dir=$there
   options at the same time, which was nonsensical.

 * "git cvsimport" mishandled timestamps at DST boundary.

 * We used to have an arbitrary 32 limit for combined diff input,
   resulting in incorrect number of leading colons shown when showing
   the "--raw --cc" output.

 * The smart HTTP clients forgot to verify the content-type that comes
   back from the server side to make sure that the request is being
   handled properly.

 * "git help remote-helpers" failed to find the documentation.

 * "gitweb" pages served over HTTPS, when configured to show picon or
   gravatar, referred to these external resources to be fetched via
   HTTP, resulting in mixed contents warning in browsers.

Also contains various documentation fixes.

4 files changed, 9 insertions, 10 deletions

diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index 484adc06cf2..0d32be72bea 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2013/02/06 23:22:11 jperkin Exp $
+# $NetBSD: Makefile,v 1.58 2013/03/23 19:00:30 spz Exp $
 
 .include "../../devel/scmgit/Makefile.common"
 
 PKGNAME=	scmgit-base-${GIT_VERSION}
-PKGREVISION=	1
 COMMENT=	GIT Tree History Storage Tool (base package)
 
 CONFLICTS+=		git<4.9.5nb1		# misc/git
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 9658976fc6f..8ff79dfd723 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.67 2013/01/30 17:39:39 adam Exp $
+$NetBSD: distinfo,v 1.68 2013/03/23 19:00:30 spz Exp $
 
-SHA1 (git-1.8.1.2.tar.gz) = 29a2dee568b1f86e9d3d8f9dcc376f24439b6a0c
-RMD160 (git-1.8.1.2.tar.gz) = d67332f59e180eb8b1cc0f7c429e4d9f030ac843
-Size (git-1.8.1.2.tar.gz) = 4297221 bytes
+SHA1 (git-1.8.1.5.tar.gz) = 3349a15de7c5501715bda9b68301d0406272f8e0
+RMD160 (git-1.8.1.5.tar.gz) = 791dfe5853a753edfc69e6da251233cc7ffe50fb
+Size (git-1.8.1.5.tar.gz) = 4306780 bytes
 SHA1 (patch-aa) = b1a8a325a62013438324ec001bbe48eaebd56f5a
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
diff --git a/devel/scmgit-docs/PLIST b/devel/scmgit-docs/PLIST
index ab6994cd7aa..3411191ab4d 100644
--- a/devel/scmgit-docs/PLIST
+++ b/devel/scmgit-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2012/09/04 12:17:12 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2013/03/23 19:00:31 spz Exp $
 man/man1/git-add.1
 man/man1/git-am.1
 man/man1/git-annotate.1
@@ -101,7 +101,7 @@ man/man1/git-reflog.1
 man/man1/git-relink.1
 man/man1/git-remote-ext.1
 man/man1/git-remote-fd.1
-man/man1/git-remote-helpers.1
+man/man1/gitremote-helpers.1
 man/man1/git-remote-testgit.1
 man/man1/git-remote.1
 man/man1/git-repack.1
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index 83fd6e6c7cb..0b1b2f0c550 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.53 2013/01/30 17:39:39 adam Exp $
+# $NetBSD: Makefile.version,v 1.54 2013/03/23 19:00:30 spz Exp $
 #
 # used by devel/scmgit/Makefile.common
 # used by www/gitweb/Makefile
 
-GIT_VERSION=	1.8.1.2
+GIT_VERSION=	1.8.1.5