Pullup ticket #2472 - requested by kefren

Security update for scmgit-base

Revisions pulled up:
- devel/scmgit-base/Makefile		1.8
- devel/scmgit-base/distinfo		1.10
- devel/scmgit-base/patches/patch-ak	1.1
- devel/scmgit/Makefile.common		1.12
- devel/scmgit/Makefile.version		1.3
---
    Module Name:	pkgsrc
    Committed By:	bjs
    Date:		Thu Jul 24 23:22:54 UTC 2008

    Modified Files:
    	pkgsrc/devel/scmgit: Makefile.common Makefile.version
    	pkgsrc/devel/scmgit-base: Makefile distinfo
    Added Files:
    	pkgsrc/devel/scmgit-base/patches: patch-ak

    Log Message:
    Update to version 1.5.6.4.  The base package now depends on devel/p5-Error;
    this ensures that git never has to install its own copy, thereby
    avoiding future conflicts with devel/p5-Error.  Plus, the pkgsrc
    version is newer.

    While here, set PKG_SYSCONFSUBDIR=git and explicitly specify sysconfdir
    in CONFIGURE_ARGS.  Remove trailing slash from GITCOREDIR.

    Long list of changes since 1.5.6:

    Fixes since v1.5.6.3
    --------------------

    * Various commands could overflow its internal buffer on a platform
       with small PATH_MAX value in a repository that has contents with
       long pathnames.

    * There wasn't a way to make --pretty=format:%<> specifiers to honor
       .mailmap name rewriting for authors and committers.  Now you can with
       %aN and %cN.

    * Bash completion wasted too many cycles; this has been optimized to be
       usable again.

    * Bash completion lost ref part when completing something like "git show
       pu:Makefile".

    * "git-cvsserver" did not clean up its temporary working area after
       annotate request.

    * "git-daemon" called syslog() from its signal handler, which was a
       no-no.

    * "git-fetch" into an empty repository used to remind that the fetch will
        be huge by saying "no common commits", but this was an unnecessary
        noise; it is already known by the user anyway.

    * "git-http-fetch" would have segfaulted when pack idx file retrieved
       from the other side was corrupt.

    * "git-index-pack" used too much memory when dealing with a deep delta
       chain.

    * "git-mailinfo" (hence "git-am") did not correctly handle in-body [PATCH]
       line to override the commit title taken from the mail Subject header.

    * "git-rebase -i -p" lost parents that are not involved in the history
       being rewritten.

    * "git-rm" lost track of where the index file was when GIT_DIR was
       specified as a relative path.

    * "git-rev-list --quiet" was not quiet as advertised.

    Contains other various documentation fixes.

    Fixes since v1.5.6.2
    --------------------

    * Setting core.sharerepository to traditional "true" value was supposed
       to make the repository group writable but should not affect permission
       for others.  However, since 1.5.6, it was broken to drop permission
       for others when umask is 022, making the repository unreadable by others.

    * Setting GIT_TRACE will report spawning of external process via
       run_command().

    * Using an object with very deep delta chain pinned memory needed for
       extracting intermediate base objects unnecessarily long,
       leading to excess memory usage.

    * Bash completion script did not notice '--' marker on the command
       line and tried the relatively slow "ref completion" even when
       completing arguments after one.

    * Registering a non-empty blob racily and then truncating the working
       tree file for it confused "racy-git avoidance" logic into thinking
       that the path is now unchanged.

    * The section that describes attributes related to git-archive were placed
       in a wrong place in the gitattributes(5) manual page.

    * "git am" was not helpful to the users when it detected that the committer
       information is not set up properly yet.

    * "git clone" had a leftover debugging fprintf().

    * "git clone -q" was not quiet enough as it used to and gave object count
       and progress reports.

    * "git clone" marked downloaded packfile with .keep; this could be a
       good thing if the remote side is well packed but otherwise not,
       especially for a project that is not really big.

    * "git daemon" used to call syslog() from a signal handler, which
       could raise signals of its own but generally is not reentrant.  This
       was fixed by restructuring the code to report syslog() after the handler
       returns.

    * When "git push" tries to remove a remote ref, and corresponding
       tracking ref is missing, we used to report error (i.e. failure to
       remove something that does not exist).

    * "git mailinfo" (hence "git am") did not handle commit log messages in a
       MIME multipart mail correctly.

    Futureproof
    -----------

      * "git-shell" accepts requests without a dash between "git" and
        subcommand name (e.g. "git upload-pack") which the newer client will
        start to make sometime in the future.

    Fixes since v1.5.6.1
    --------------------

    * "git clone" from a remote that is named with url.insteadOf setting in
       $HOME/.gitconfig did not work well.

    * "git describe --long --tags" segfaulted when the described revision was
       tagged with a lightweight tag.

    * "git diff --check" did not report the result via its exit status
       reliably.

    * When remote side used to have branch 'foo' and git-fetch finds that now
       it has branch 'foo/bar', it refuses to lose the existing remote tracking
       branch and its reflog.  The error message has been improved to suggest
       pruning the remote if the user wants to proceed and get the latest set
       of branches from the remote, including such 'foo/bar'.

    * "git reset file" should mean the same thing as "git reset HEAD file",
       but we required disambiguating -- even when "file" is not ambiguous.

    * "git show" segfaulted when an annotated tag that points at another
       annotated tag was given to it.

    * Optimization for a large import via "git-svn" introduced in v1.5.6 had a
       serious memory and temporary file leak, which made it unusable for
       moderately large import.

    * "git-svn" mangled remote nickname used in the configuration file
       unnecessarily.

    Fixes since v1.5.6
    ------------------

    * Last minute change broke loose object creation on AIX.

    * (performance fix) We used to make $GIT_DIR absolute path early in the
       programs but keeping it relative to the current directory internally
       gives 1-3 per-cent performance boost.

    * bash completion knows the new --graph option to git-log family.

    * git-diff -c/--cc showed unnecessary "deletion" lines at the context
       boundary.

    * git-for-each-ref ignored %(object) and %(type) requests for tag
       objects.

    * git-merge usage had a typo.

    * Rebuilding of git-svn metainfo database did not take rewriteRoot
       option into account.

    * Running "git-rebase --continue/--skip/--abort" before starting a
       rebase gave nonsense error messages.

5 files changed, 33 insertions, 9 deletions

diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index ab00e8acd7d..15d7fd36d16 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/06/24 08:21:04 bjs Exp $
+# $NetBSD: Makefile,v 1.7.4.1 2008/08/12 10:00:23 tron Exp $
 #
 
 .include "${.CURDIR}/../scmgit/Makefile.common"
@@ -10,6 +10,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFLICTS+=		git-[0-9]*		# misc/git
 
+DEPENDS+=		p5-Error>=0.17015:../../devel/p5-Error
+
 USE_LANGUAGES=		c99
 USE_TOOLS+=		perl:run sh:run msgfmt
 
@@ -28,7 +30,7 @@ PERL5_CONFIGURE= 	no
 PERL5_PACKLIST=		auto/Git/.packlist
 REPLACE_PERL+=		*.perl */*.perl */*/*.perl
 
-GITCOREDIR=		${PREFIX}/libexec/git-core/
+GITCOREDIR=		${PREFIX}/libexec/git-core
 
 CONFIGURE_ENV+=		gitexecdir=${GITCOREDIR:Q}
 
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 75d813f1262..d632485f33b 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2008/06/24 08:21:04 bjs Exp $
+$NetBSD: distinfo,v 1.9.4.1 2008/08/12 10:00:23 tron Exp $
 
-SHA1 (git-1.5.6.tar.gz) = 2b0ea373e78c8bc3f4476dbd5738594abe9abf46
-RMD160 (git-1.5.6.tar.gz) = 50adf026374d834f4d82f862987598a64e6e0b6e
-Size (git-1.5.6.tar.gz) = 2087708 bytes
+SHA1 (git-1.5.6.4.tar.gz) = 85d7b109af3746f47840ca0ad018fa406f701854
+RMD160 (git-1.5.6.4.tar.gz) = 227f6c85e5ab9d700a228665419da5727fd24364
+Size (git-1.5.6.4.tar.gz) = 2100615 bytes
 SHA1 (patch-aa) = 5af7779f0ac99aa6694d2a4d87ed999ef21c9375
 SHA1 (patch-ab) = 519c6b2892d9483c08b08f7874790ab05bc3f2d6
 SHA1 (patch-ac) = 1f358de94d7476212c02374de888fbc372b60f32
@@ -13,3 +13,4 @@ SHA1 (patch-ag) = 8918a23e50f4e1f9aa0bb5dda4404140cda3c5b5
 SHA1 (patch-ah) = 94947b3d79c43246388da9c434f9e71e6716c790
 SHA1 (patch-ai) = 95b2b0a41b8b6f0ee804b48a3f3686d2fdf164f5
 SHA1 (patch-aj) = 54c2200363b4d2cc5eb6266c4b62d4a7fc43dd07
+SHA1 (patch-ak) = 0ebbc84a5ab56e6f7e52284e9aeef81ca7fd7f30
diff --git a/devel/scmgit-base/patches/patch-ak b/devel/scmgit-base/patches/patch-ak
new file mode 100644
index 00000000000..1942b05d051
--- /dev/null
+++ b/devel/scmgit-base/patches/patch-ak
@@ -0,0 +1,18 @@
+$NetBSD: patch-ak,v 1.1.2.2 2008/08/12 10:00:23 tron Exp $
+
+--- perl/Makefile.PL.orig	2008-07-19 20:23:11.000000000 -0400
++++ perl/Makefile.PL
+@@ -1,4 +1,5 @@
+ use ExtUtils::MakeMaker;
++use Config;
+ 
+ sub MY::postamble {
+ 	return <<'MAKE_FRAG';
+@@ -26,5 +27,6 @@ WriteMakefile(
+ 	VERSION_FROM    => 'Git.pm',
+ 	PM		=> \%pm,
+ 	MAKEFILE	=> 'perl.mak',
+-	INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3'
++	INSTALLARCHLIB  => $Config{installsitearch},
++	INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3'
+ );
diff --git a/devel/scmgit/Makefile.common b/devel/scmgit/Makefile.common
index e9a4770443f..d3a7678bbc5 100644
--- a/devel/scmgit/Makefile.common
+++ b/devel/scmgit/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2008/06/14 16:21:03 bjs Exp $
+# $NetBSD: Makefile.common,v 1.11.4.1 2008/08/12 10:00:23 tron Exp $
 #
 # used by devel/scmgit-base/Makefile
 # used by devel/scmgit-docs/Makefile
@@ -23,7 +23,10 @@ GNU_CONFIGURE?= 	yes
 USE_TOOLS+=		gmake tar perl sh
 EXTRACT_USING=		gtar
 
+PKG_SYSCONFSUBDIR=	git
+
 CONFIGURE_ARGS+= 	--with-perl=${PERL5:Q}
 CONFIGURE_ARGS+= 	--with-shell=${SH:Q}
 CONFIGURE_ARGS+= 	--with-tar=${TAR:Q}
 CONFIGURE_ARGS+= 	--mandir=${${PREFIX}/${PKGMANDIR}:L:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index 3ae1d945f6b..34b7bc1f2a3 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.2 2008/06/24 10:29:20 bjs Exp $
+# $NetBSD: Makefile.version,v 1.2.4.1 2008/08/12 10:00:23 tron Exp $
 #
-GIT_VERSION=	1.5.6
+GIT_VERSION=	1.5.6.4