Sat Mar 23 19:00:31 2013 UTC ()
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.


(spz)
diff -r1.53 -r1.54 pkgsrc/devel/scmgit/Makefile.version
diff -r1.57 -r1.58 pkgsrc/devel/scmgit-base/Makefile
diff -r1.67 -r1.68 pkgsrc/devel/scmgit-base/distinfo
diff -r1.15 -r1.16 pkgsrc/devel/scmgit-docs/PLIST

cvs diff -r1.53 -r1.54 pkgsrc/devel/scmgit/Attic/Makefile.version (expand / switch to unified diff)

--- pkgsrc/devel/scmgit/Attic/Makefile.version 2013/01/30 17:39:39 1.53
+++ pkgsrc/devel/scmgit/Attic/Makefile.version 2013/03/23 19:00:30 1.54
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1# $NetBSD: Makefile.version,v 1.53 2013/01/30 17:39:39 adam Exp $ 1# $NetBSD: Makefile.version,v 1.54 2013/03/23 19:00:30 spz Exp $
2# 2#
3# used by devel/scmgit/Makefile.common 3# used by devel/scmgit/Makefile.common
4# used by www/gitweb/Makefile 4# used by www/gitweb/Makefile
5 5
6GIT_VERSION= 1.8.1.2 6GIT_VERSION= 1.8.1.5

cvs diff -r1.57 -r1.58 pkgsrc/devel/scmgit-base/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/scmgit-base/Attic/Makefile 2013/02/06 23:22:11 1.57
+++ pkgsrc/devel/scmgit-base/Attic/Makefile 2013/03/23 19:00:30 1.58
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.57 2013/02/06 23:22:11 jperkin Exp $ 1# $NetBSD: Makefile,v 1.58 2013/03/23 19:00:30 spz Exp $
2 2
3.include "../../devel/scmgit/Makefile.common" 3.include "../../devel/scmgit/Makefile.common"
4 4
5PKGNAME= scmgit-base-${GIT_VERSION} 5PKGNAME= scmgit-base-${GIT_VERSION}
6PKGREVISION= 1 
7COMMENT= GIT Tree History Storage Tool (base package) 6COMMENT= GIT Tree History Storage Tool (base package)
8 7
9CONFLICTS+= git<4.9.5nb1 # misc/git 8CONFLICTS+= git<4.9.5nb1 # misc/git
10 9
11DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error 10DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error
12# for git-send-email 11# for git-send-email
13DEPENDS+= p5-MIME-Base64>=3.13:../../converters/p5-MIME-Base64 12DEPENDS+= p5-MIME-Base64>=3.13:../../converters/p5-MIME-Base64
14DEPENDS+= p5-Email-Valid>=0.190:../../mail/p5-Email-Valid 13DEPENDS+= p5-Email-Valid>=0.190:../../mail/p5-Email-Valid
15DEPENDS+= p5-MailTools>=2.11:../../mail/p5-MailTools 14DEPENDS+= p5-MailTools>=2.11:../../mail/p5-MailTools
16DEPENDS+= p5-Net-SMTP-SSL>=1.01:../../mail/p5-Net-SMTP-SSL 15DEPENDS+= p5-Net-SMTP-SSL>=1.01:../../mail/p5-Net-SMTP-SSL
17DEPENDS+= p5-Authen-SASL>=1.0:../../security/p5-Authen-SASL 16DEPENDS+= p5-Authen-SASL>=1.0:../../security/p5-Authen-SASL
18 17
19USE_LANGUAGES= c99 18USE_LANGUAGES= c99

cvs diff -r1.67 -r1.68 pkgsrc/devel/scmgit-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/scmgit-base/Attic/distinfo 2013/01/30 17:39:39 1.67
+++ pkgsrc/devel/scmgit-base/Attic/distinfo 2013/03/23 19:00:30 1.68
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.67 2013/01/30 17:39:39 adam Exp $ 1$NetBSD: distinfo,v 1.68 2013/03/23 19:00:30 spz Exp $
2 2
3SHA1 (git-1.8.1.2.tar.gz) = 29a2dee568b1f86e9d3d8f9dcc376f24439b6a0c 3SHA1 (git-1.8.1.5.tar.gz) = 3349a15de7c5501715bda9b68301d0406272f8e0
4RMD160 (git-1.8.1.2.tar.gz) = d67332f59e180eb8b1cc0f7c429e4d9f030ac843 4RMD160 (git-1.8.1.5.tar.gz) = 791dfe5853a753edfc69e6da251233cc7ffe50fb
5Size (git-1.8.1.2.tar.gz) = 4297221 bytes 5Size (git-1.8.1.5.tar.gz) = 4306780 bytes
6SHA1 (patch-aa) = b1a8a325a62013438324ec001bbe48eaebd56f5a 6SHA1 (patch-aa) = b1a8a325a62013438324ec001bbe48eaebd56f5a
7SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091 7SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
8SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca 8SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
9SHA1 (patch-af) = bdabf7e3b24171cbdc2117735e83765e6e23648c 9SHA1 (patch-af) = bdabf7e3b24171cbdc2117735e83765e6e23648c
10SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 10SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
11SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7 11SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
12SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e 12SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e

cvs diff -r1.15 -r1.16 pkgsrc/devel/scmgit-docs/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/scmgit-docs/Attic/PLIST 2012/09/04 12:17:12 1.15
+++ pkgsrc/devel/scmgit-docs/Attic/PLIST 2013/03/23 19:00:31 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.15 2012/09/04 12:17:12 adam Exp $ 1@comment $NetBSD: PLIST,v 1.16 2013/03/23 19:00:31 spz Exp $
2man/man1/git-add.1 2man/man1/git-add.1
3man/man1/git-am.1 3man/man1/git-am.1
4man/man1/git-annotate.1 4man/man1/git-annotate.1
5man/man1/git-apply.1 5man/man1/git-apply.1
6man/man1/git-archimport.1 6man/man1/git-archimport.1
7man/man1/git-archive.1 7man/man1/git-archive.1
8man/man1/git-bisect.1 8man/man1/git-bisect.1
9man/man1/git-blame.1 9man/man1/git-blame.1
10man/man1/git-branch.1 10man/man1/git-branch.1
11man/man1/git-bundle.1 11man/man1/git-bundle.1
12man/man1/git-cat-file.1 12man/man1/git-cat-file.1
13man/man1/git-check-attr.1 13man/man1/git-check-attr.1
14man/man1/git-check-ref-format.1 14man/man1/git-check-ref-format.1
@@ -91,27 +91,27 @@ man/man1/git-patch-id.1 @@ -91,27 +91,27 @@ man/man1/git-patch-id.1
91man/man1/git-peek-remote.1 91man/man1/git-peek-remote.1
92man/man1/git-prune-packed.1 92man/man1/git-prune-packed.1
93man/man1/git-prune.1 93man/man1/git-prune.1
94man/man1/git-pull.1 94man/man1/git-pull.1
95man/man1/git-push.1 95man/man1/git-push.1
96man/man1/git-quiltimport.1 96man/man1/git-quiltimport.1
97man/man1/git-read-tree.1 97man/man1/git-read-tree.1
98man/man1/git-rebase.1 98man/man1/git-rebase.1
99man/man1/git-receive-pack.1 99man/man1/git-receive-pack.1
100man/man1/git-reflog.1 100man/man1/git-reflog.1
101man/man1/git-relink.1 101man/man1/git-relink.1
102man/man1/git-remote-ext.1 102man/man1/git-remote-ext.1
103man/man1/git-remote-fd.1 103man/man1/git-remote-fd.1
104man/man1/git-remote-helpers.1 104man/man1/gitremote-helpers.1
105man/man1/git-remote-testgit.1 105man/man1/git-remote-testgit.1
106man/man1/git-remote.1 106man/man1/git-remote.1
107man/man1/git-repack.1 107man/man1/git-repack.1
108man/man1/git-replace.1 108man/man1/git-replace.1
109man/man1/git-repo-config.1 109man/man1/git-repo-config.1
110man/man1/git-request-pull.1 110man/man1/git-request-pull.1
111man/man1/git-rerere.1 111man/man1/git-rerere.1
112man/man1/git-reset.1 112man/man1/git-reset.1
113man/man1/git-rev-list.1 113man/man1/git-rev-list.1
114man/man1/git-rev-parse.1 114man/man1/git-rev-parse.1
115man/man1/git-revert.1 115man/man1/git-revert.1
116man/man1/git-rm.1 116man/man1/git-rm.1
117man/man1/git-send-email.1 117man/man1/git-send-email.1