diff options
author | tonnerre <tonnerre> | 2009-01-09 13:42:15 +0000 |
---|---|---|
committer | tonnerre <tonnerre> | 2009-01-09 13:42:15 +0000 |
commit | 46f23c26296358cb7d4f9c0656c177c9bfceb047 (patch) | |
tree | f4d3700246fbbe3d13cd0a27155c77a56555c102 /devel | |
parent | 570d8e9596eda18c874686f733d5aaf74960611d (diff) | |
download | pkgsrc-46f23c26296358cb7d4f9c0656c177c9bfceb047.tar.gz |
Upgrade devel/scmgit to version 1.6.0.6 (from 1.6.0.2), in order to fix
security issues and to prepare for the outstanding upgrade of gitweb.
Changes since git 1.6.0.2:
- Fix output line format for zip archive generation.
- Fix continuation of git rebase -i in case of modified files (conflict).
- Honor the pre-rebase hook for git rebase -i.
- Fix inconsistent behavior of git diff --quiet and diff --exit-code.
- Use multiple element hunk headers from git diff correctly.
- Portability fix for the git diff hunk header regexps.
- Fix git index-pack inside .git/objects/pack directory.
- Fix git index-pack in thin-pack mode.
- Some git stash apply fixes.
- Fixed format string vulnerabilities (e.g. in git remote).
- Fix behavior of git checkout -b <existingbranch>.
- Make git checkout -q actually quiet.
- In quiet remote operation, we don't need the remote side to send along
all the statistics we discard.
- Don't do cross-directory renames when creating packs.
- git prune now also removes stale temp files under .git/objects/pack.
- Have git merge prune empty directories.
- Have git merge allocate enough memory for the structure itself when
enumerating the parents of the resulting commit.
- Stop git blame -C -C from segfaulting if it encounters a submodule
reference.
- If only file times were changed, don't have git rm claim local
modifications.
- If set-tree fails, don't let git svn output Perl compile errors.
- Fix various NULL pointer crashes (e.g. in apply, reset, update-index).
- Remove bash completion support for various non-space tools.
- Don't have git add -p claim no changes if binary files have been
modified.
- Fix git archive in bare repositories.
- Have git diff display the number of new or deleted files for the case
where there have been too many of them to allow rename detection.
- Fix git push --mirror to not try to send the stash.
- If the remote end is up to date, still update the tracking reference upon
git push.
- Make git pull $there $branch:$current_branch work on unborn branches.
- Have git reset --hard remove new paths after giving up resolving a
conflicting merge.
- Fix git send-email fd leak in directory scanning.
- Make submodule directories appear as tracked in git status.
- Have git svn invoke "git command" rather than "git-command".
- Have git update-ref -d honor --no-deref.
- Fix various memory leaks.
- Fix git checkout segfault when HEAD points to a deleted branch.
- Allow switching out of the current branch with git checkout on an
un-checked-out state.
- Have git fast-export export all tags.
- Make git ls-files --with-tree=<tree> work with options other than -c.
- If the first object in git pack-objects exceeds --max-pack-size, don't
stuff even more objects in.
- Stop git-p4 from replacing multilike keywords. (They don't exist.)
- Make git tag complain about mutually incompatible options.
- Fix performance for git internal diff on large files with repeating
chunks.
- Don't let git repack grab objects out of packs marked with .keep into
new packs.
- Fix git fsck deep recursion.
- Fix git fast-export and fast-import on old style annotated tags without
tagger information.
- Have git mergetool honor the "--".
- Fix segfault of git show <tag> where <tag> points at a nonexistent object.
- Fix handling of lists of mail addresses for git send-email.
- Fix branch ancestry logic in git svn if the history fetching process
was interrupted.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/scmgit-base/Makefile | 3 | ||||
-rw-r--r-- | devel/scmgit-base/PLIST | 4 | ||||
-rw-r--r-- | devel/scmgit-base/distinfo | 12 | ||||
-rw-r--r-- | devel/scmgit-base/patches/patch-aa | 14 | ||||
-rw-r--r-- | devel/scmgit-base/patches/patch-ag | 12 | ||||
-rw-r--r-- | devel/scmgit/Makefile.version | 4 |
6 files changed, 23 insertions, 26 deletions
diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile index 96e19dc44f7..1d67962f527 100644 --- a/devel/scmgit-base/Makefile +++ b/devel/scmgit-base/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.15 2008/10/19 19:18:09 he Exp $ +# $NetBSD: Makefile,v 1.16 2009/01/09 13:42:15 tonnerre Exp $ # .include "../../devel/scmgit/Makefile.common" PKGNAME= scmgit-base-${GIT_VERSION} -PKGREVISION= 3 COMMENT= GIT Tree History Storage Tool (base package) PKG_DESTDIR_SUPPORT= user-destdir diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST index 299c07739e9..5bc100e3b08 100644 --- a/devel/scmgit-base/PLIST +++ b/devel/scmgit-base/PLIST @@ -1,6 +1,8 @@ -@comment $NetBSD: PLIST,v 1.9 2008/10/14 21:03:41 minskim Exp $ +@comment $NetBSD: PLIST,v 1.10 2009/01/09 13:42:15 tonnerre Exp $ bin/git +bin/git-cvsserver bin/git-receive-pack +bin/git-shell bin/git-upload-archive bin/git-upload-pack ${PLIST.gui}bin/gitk diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo index a7d53a8b541..a663466bf3f 100644 --- a/devel/scmgit-base/distinfo +++ b/devel/scmgit-base/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.15 2008/09/17 01:18:42 bjs Exp $ +$NetBSD: distinfo,v 1.16 2009/01/09 13:42:15 tonnerre Exp $ -SHA1 (git-1.6.0.2.tar.gz) = 7b0814374a9734b2955718c9390a4021da3110ff -RMD160 (git-1.6.0.2.tar.gz) = 50fca8103943292194673082d70b8ce6d21aca39 -Size (git-1.6.0.2.tar.gz) = 2237730 bytes -SHA1 (patch-aa) = 2682ea5bc248ac4cdb20728196019e4b5d920b6f +SHA1 (git-1.6.0.6.tar.gz) = 4116e06859ce3b37a6e56198e5a9207e2b5d0d02 +RMD160 (git-1.6.0.6.tar.gz) = 6424a051bf656f239fe0deed5bd388a6f7290a64 +Size (git-1.6.0.6.tar.gz) = 2253596 bytes +SHA1 (patch-aa) = 9b5b686a8f96bd71380fb1ff2c562ff732c0b831 SHA1 (patch-ab) = b8cbeacd7d44791a5151deaa97d1d283ac9296d1 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091 SHA1 (patch-ad) = 50def978931bd72c0ad86cebcafc2dd68a06f578 SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce SHA1 (patch-af) = 3a86d5563bcfb9069d31f480a7271f6eb18ea1bd -SHA1 (patch-ag) = b108c7a849b8d2c0a3431fcc3e903fd27b7db9c9 +SHA1 (patch-ag) = a6c586cdfbad923a3497fa4ab0c73840dc035737 SHA1 (patch-ah) = d60b5304109f64f70146a222f6eb1deeb58dd6ac SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e diff --git a/devel/scmgit-base/patches/patch-aa b/devel/scmgit-base/patches/patch-aa index 8fcbd0f475c..7126ab03240 100644 --- a/devel/scmgit-base/patches/patch-aa +++ b/devel/scmgit-base/patches/patch-aa @@ -1,10 +1,6 @@ -$NetBSD: patch-aa,v 1.5 2008/09/17 01:18:42 bjs Exp $ +$NetBSD: patch-aa,v 1.6 2009/01/09 13:42:15 tonnerre Exp $ -NetBSD 3.0 needs -liconv, too. - -AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment. - ---- Makefile.orig 2008-09-12 22:29:50.000000000 -0400 +--- Makefile.orig 2008-12-20 06:54:30.000000000 +0100 +++ Makefile @@ -217,12 +217,8 @@ GITWEB_SITE_FOOTER = @@ -60,18 +56,18 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment. BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \ $(COMPAT_CFLAGS) -@@ -1352,10 +1345,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi +@@ -1361,10 +1354,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi export gitexec_instdir install: all - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' -- $(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X '$(DESTDIR_SQ)$(bindir_SQ)' +- $(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)' + $(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(bindir_SQ)' + $(BSD_INSTALL_SCRIPT_DIR) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' + $(BSD_INSTALL_SCRIPT) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' -+ $(BSD_INSTALL_SCRIPT) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X '$(DESTDIR_SQ)$(bindir_SQ)' ++ $(BSD_INSTALL_SCRIPT) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)' $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install ifndef NO_TCLTK diff --git a/devel/scmgit-base/patches/patch-ag b/devel/scmgit-base/patches/patch-ag index dda2c53261b..5723089500b 100644 --- a/devel/scmgit-base/patches/patch-ag +++ b/devel/scmgit-base/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.5 2008/09/13 00:36:37 bjs Exp $ +$NetBSD: patch-ag,v 1.6 2009/01/09 13:42:15 tonnerre Exp $ ---- templates/Makefile.orig 2008-08-24 19:41:58.000000000 -0400 +--- templates/Makefile.orig 2008-12-20 06:54:30.000000000 +0100 +++ templates/Makefile @@ -8,7 +8,7 @@ INSTALL ?= install TAR ?= tar @@ -15,12 +15,12 @@ $NetBSD: patch-ag,v 1.5 2008/09/13 00:36:37 bjs Exp $ case "$$boilerplate" in *~) continue ;; esac && \ dst=`echo "$$boilerplate" | sed -e 's|^this|.|;s|--|/|g'` && \ dir=`expr "$$dst" : '\(.*\)/'` && \ -- $(INSTALL) -d -m 755 blt/$$dir && \ +- mkdir -p blt/$$dir && \ + $(BSD_INSTALL_DATA_DIR) blt/$$dir && \ case "$$boilerplate" in \ - *--) ;; \ - *) cp -p $$boilerplate blt/$$dst ;; \ -@@ -46,6 +46,6 @@ clean: + *--) continue;; \ + esac && \ +@@ -48,6 +48,6 @@ clean: $(RM) -r blt boilerplates.made install: all diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version index 7deca0fcec5..a21b4cdb15e 100644 --- a/devel/scmgit/Makefile.version +++ b/devel/scmgit/Makefile.version @@ -1,3 +1,3 @@ -# $NetBSD: Makefile.version,v 1.6 2008/09/17 01:18:42 bjs Exp $ +# $NetBSD: Makefile.version,v 1.7 2009/01/09 13:42:15 tonnerre Exp $ # -GIT_VERSION= 1.6.0.2 +GIT_VERSION= 1.6.0.6 |