cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to git-1.5.3.7.

Browse Source
This commit is contained in:
bernd 2007-12-17 20:00:05 +00:00
parent a79561be89
commit 348e34f88d
9 changed files with 158 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devel/git/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.15 2007/09/08 11:29:40 bernd Exp $
# $OpenBSD: Makefile,v 1.16 2007/12/17 20:00:05 bernd Exp $
COMMENT-main= GIT - Tree History Storage Tool
COMMENT-svn= GIT - subversion interoperability tools
V= 1.5.2.5
V= 1.5.3.7
DISTNAME= git-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-svn= git-svn-${V}
@ -52,12 +52,14 @@ PKG_ARCH-svn= *
MAKE_ENV= prefix=${PREFIX} CC="${CC}" CFLAGS="${CFLAGS}" V=1 \
SYSCONFDIR=${SYSCONFDIR} \
TCLTK_PATH=${LOCALBASE}/bin/wish8.4
TCLTK_PATH=${LOCALBASE}/bin/wish8.4 \
TCL_PATH=${LOCALBASE}/bin/tclsh8.4
USE_X11= Yes
USE_GMAKE= Yes
REGRESS_DEPENDS= :zip-*:archivers/zip
REGRESS_DEPENDS= :zip-*:archivers/zip \
:cvsps-*:devel/cvsps
post-extract:
@mkdir -p ${WRKSRC}/doc

30
devel/git/distinfo
View File

@ -1,15 +1,15 @@
MD5 (git-1.5.2.5.tar.gz) = To3p5WiC8yFKkvbX3DxJ7A==
MD5 (git-htmldocs-1.5.2.5.tar.gz) = N9mZ3d4N/BW/BivpRD5tCw==
MD5 (git-manpages-1.5.2.5.tar.gz) = PwmsPnzZUX6nrv+Vvxu6tQ==
RMD160 (git-1.5.2.5.tar.gz) = 1vN2F5NV5ZKfnXC2dQfGJB8oreA=
RMD160 (git-htmldocs-1.5.2.5.tar.gz) = ZZIHGEer2gY1aormtzNc5Dps4DM=
RMD160 (git-manpages-1.5.2.5.tar.gz) = UM+OIKk6BYxaiwcdfv92je/s4XQ=
SHA1 (git-1.5.2.5.tar.gz) = GOlYDX96wdqdpuYUogqQ30C9puA=
SHA1 (git-htmldocs-1.5.2.5.tar.gz) = jTDGVElwabUeHYpZnqgY5UDAeaA=
SHA1 (git-manpages-1.5.2.5.tar.gz) = ThvQpfb82hrvoRHU/5oa6cJry34=
SHA256 (git-1.5.2.5.tar.gz) = K0GgXWuEft0iHDgWk0dz/owZ64iTQ4RyIHmZZFOXS1U=
SHA256 (git-htmldocs-1.5.2.5.tar.gz) = f48eH6eYg4+RSsdPB2mH2lIzTZbWQdXTTvo/NE095Bk=
SHA256 (git-manpages-1.5.2.5.tar.gz) = JHCHQPlrVFSyGZoRzYiMabimdxovDlhgSKkr1BS/R8M=
SIZE (git-1.5.2.5.tar.gz) = 1413507
SIZE (git-htmldocs-1.5.2.5.tar.gz) = 738822
SIZE (git-manpages-1.5.2.5.tar.gz) = 209487
MD5 (git-1.5.3.7.tar.gz) = Hcg8+eUpq8601l/wGNpgog==
MD5 (git-htmldocs-1.5.3.7.tar.gz) = QzuQF+eqGTQwqXbHSC14ww==
MD5 (git-manpages-1.5.3.7.tar.gz) = deL5DVL/I8283BVmSKkOkg==
RMD160 (git-1.5.3.7.tar.gz) = UqwftVNBFAq9GKIm6N00ZUx5vmE=
RMD160 (git-htmldocs-1.5.3.7.tar.gz) = 2kQjKq5EKkdL5hW0nI3A9XbeFs8=
RMD160 (git-manpages-1.5.3.7.tar.gz) = oMyZrBZ9xM0I3SboOFkebqrWHfc=
SHA1 (git-1.5.3.7.tar.gz) = imt/Ew85dl6N6PMrsj1HmXR+4ZA=
SHA1 (git-htmldocs-1.5.3.7.tar.gz) = g+wwV/x7gsMKwRYyXQSJ3NLM9Hw=
SHA1 (git-manpages-1.5.3.7.tar.gz) = 3Osa62OQcsQzT5b49BLyd1vDSfo=
SHA256 (git-1.5.3.7.tar.gz) = wUtvC56xBqmZeft+fTd5SNT7N1PYaFi5xTRdIUuxuy0=
SHA256 (git-htmldocs-1.5.3.7.tar.gz) = /91Gzpi9VuUSGR8SEiPrBNLKnLrccCnDZEPefNqFipc=
SHA256 (git-manpages-1.5.3.7.tar.gz) = ntz4lxL2uIBNlHw0z5WDw8XcbD6mVn249m4GsY4TEu4=
SIZE (git-1.5.3.7.tar.gz) = 1612748
SIZE (git-htmldocs-1.5.3.7.tar.gz) = 796168
SIZE (git-manpages-1.5.3.7.tar.gz) = 224661

33
devel/git/patches/patch-Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.10 2007/07/12 18:26:04 bernd Exp $
--- Makefile.orig Sat Jun 16 17:31:24 2007
+++ Makefile Sun Jun 17 19:42:08 2007
@@ -137,13 +137,13 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo
$OpenBSD: patch-Makefile,v 1.11 2007/12/17 20:00:05 bernd Exp $
--- Makefile.orig Sun Nov 18 23:55:49 2007
+++ Makefile Thu Nov 22 20:32:19 2007
@@ -139,13 +139,13 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo
# CFLAGS and LDFLAGS are for the users to override from the command line.
@ -16,33 +16,36 @@ $OpenBSD: patch-Makefile,v 1.10 2007/07/12 18:26:04 bernd Exp $
+#prefix = $(HOME)
bindir = $(prefix)/bin
gitexecdir = $(bindir)
sharedir = $(prefix)/share/
@@ -153,7 +153,7 @@ sysconfdir = /etc
else
sharedir = $(prefix)/share
@@ -156,7 +156,7 @@ else
sysconfdir = $(prefix)/etc
endif
lib = lib
-ETC_GITCONFIG = $(sysconfdir)/gitconfig
+ETC_GITCONFIG = $(SYSCONFDIR)/gitconfig
# DESTDIR=
# default configuration for gitweb
@@ -174,13 +174,13 @@ GITWEB_SITE_FOOTER =
@@ -177,15 +177,15 @@ GITWEB_SITE_FOOTER =
export prefix bindir gitexecdir sharedir template_dir sysconfdir
-CC = gcc
+CC ?= gcc
AR = ar
RM = rm -f
TAR = tar
FIND = find
INSTALL = install
RPMBUILD = rpmbuild
TCL_PATH = tclsh
-TCL_PATH = tclsh
-TCLTK_PATH = wish
+TCL_PATH ?= tclsh
+TCLTK_PATH ?= wish
export TCL_PATH TCLTK_PATH
@@ -451,10 +451,9 @@ ifeq ($(uname_S),FreeBSD)
@@ -445,10 +445,9 @@ ifeq ($(uname_S),FreeBSD)
BASIC_LDFLAGS += -L/usr/local/lib
endif
ifeq ($(uname_S),OpenBSD)
@ -55,16 +58,16 @@ $OpenBSD: patch-Makefile,v 1.10 2007/07/12 18:26:04 bernd Exp $
endif
ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@ -531,7 +530,7 @@ ifndef NO_CURL
endif
@@ -535,7 +534,7 @@ endif
EXTLIBS += -lz
ifndef NO_OPENSSL
- OPENSSL_LIBSSL = -lssl
+ OPENSSL_LIBSSL = -lssl -lcrypto
ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
OPENSSL_LINK = -L$(OPENSSLDIR)/lib $(CC_LD_DYNPATH)$(OPENSSLDIR)/lib
@@ -962,7 +961,7 @@ all:: $(TEST_PROGRAMS)
OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
@@ -967,7 +966,7 @@ all:: $(TEST_PROGRAMS)
export NO_SVN_TESTS
@ -72,4 +75,4 @@ $OpenBSD: patch-Makefile,v 1.10 2007/07/12 18:26:04 bernd Exp $
+test:
$(MAKE) -C t/ all
test-date$X: test-date.c date.o ctype.o
test-date$X: date.o ctype.o

20
devel/git/patches/patch-config_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-config_c,v 1.1 2007/12/17 20:00:05 bernd Exp $
Backport fix to prevent a segmentation fault.
commit 6281f394674bf2db861967da6c2215cfc3fc78af
Date: Sat Dec 8 16:48:05 2007 +0100
config.c:store_write_pair(): don't read the byte before a malloc'd buffer.
--- config.c.orig Sat Dec 15 00:35:13 2007
+++ config.c Sat Dec 15 00:35:13 2007
@@ -636,7 +636,7 @@ static int store_write_pair(int fd, const char* key, c
for (i = 0; value[i]; i++)
if (value[i] == ';' || value[i] == '#')
quote = 1;
- if (value[i-1] == ' ')
+ if (i && value[i-1] == ' ')
quote = 1;
if (write_in_full(fd, "\t", 1) != 1 ||

18
devel/git/patches/patch-git-cvsimport_perl
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-git-cvsimport_perl,v 1.2 2007/07/24 05:16:04 bernd Exp $
Backport commit 7051c3b1294a110a862a7b48e983490fba32389f from the git
repository to fix a problem with git-cvsimport.
Fixed in git 1.5.3.x.
--- git-cvsimport.perl.orig Thu Jul 12 19:24:26 2007
+++ git-cvsimport.perl Thu Jul 12 19:24:54 2007
@@ -1020,7 +1020,7 @@ if ($orig_branch) {
unless -f "$git_dir/refs/heads/master";
system('git-update-ref', 'HEAD', "$orig_branch");
unless ($opt_i) {
- system('git checkout');
+ system('git checkout -f');
die "checkout failed: $?\n" if $?;
}
}

24
devel/git/patches/patch-gitweb_gitweb_perl Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-gitweb_gitweb_perl,v 1.1 2007/12/17 20:00:05 bernd Exp $
This prevents the following error: '-T and -B not implemented on filehandles'
--- gitweb/gitweb.perl.orig Sat Dec 15 00:14:50 2007
+++ gitweb/gitweb.perl Sat Dec 15 00:12:58 2007
@@ -4108,7 +4108,7 @@ sub git_blob_plain {
}
my $type = shift;
- open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
+ open my $fd, "-|:raw:perlio", git_cmd(), "cat-file", "blob", $hash
or die_error(undef, "Couldn't cat $file_name, $hash");
$type ||= blob_mimetype($fd, $file_name);
@@ -4150,7 +4150,7 @@ sub git_blob {
}
my ($have_blame) = gitweb_check_feature('blame');
- open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
+ open my $fd, "-|:raw:perlio", git_cmd(), "cat-file", "blob", $hash
or die_error(undef, "Couldn't cat $file_name, $hash");
my $mimetype = blob_mimetype($fd, $file_name);
if ($mimetype !~ m!^(?:text/|image/(?:gif|png|jpeg)$)!) {

10
devel/git/patches/patch-perl_Makefile_PL
View File

@ -1,16 +1,18 @@
$OpenBSD: patch-perl_Makefile_PL,v 1.1 2007/05/08 09:48:07 bernd Exp $
--- perl/Makefile.PL.orig Mon May 7 18:14:50 2007
+++ perl/Makefile.PL Mon May 7 18:15:32 2007
$OpenBSD: patch-perl_Makefile_PL,v 1.2 2007/12/17 20:00:05 bernd Exp $
--- perl/Makefile.PL.orig Wed Oct 3 21:44:53 2007
+++ perl/Makefile.PL Fri Oct 12 22:47:53 2007
@@ -1,4 +1,5 @@
use ExtUtils::MakeMaker;
+use Config;
sub MY::postamble {
return <<'MAKE_FRAG';
@@ -29,5 +30,6 @@ WriteMakefile(
@@ -29,6 +30,7 @@ WriteMakefile(
VERSION_FROM => 'Git.pm',
PM => \%pm,
MAKEFILE => 'perl.mak',
- INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3',
+ INSTALLARCHLIB => $Config{installsitearch},
+ INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3p',
%extra
);

27
devel/git/patches/patch-t_t7501-commit_sh Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-t_t7501-commit_sh,v 1.1 2007/12/17 20:00:05 bernd Exp $
Backport git commit 41ec097aea91b4be038b1c4bbbe1bcb9d4e7aa53 to remove a
GNU sed(1) only option.
--- t/t7501-commit.sh.orig Sat Dec 1 22:21:12 2007
+++ t/t7501-commit.sh Sat Dec 15 00:53:34 2007
@@ -79,7 +79,8 @@ test_expect_success \
cat >editor <<\EOF
#!/bin/sh
-sed -i -e "s/a file/an amend commit/g" $1
+sed -e "s/a file/an amend commit/g" < $1 > $1-
+mv $1- $1
EOF
chmod 755 editor
@@ -98,7 +99,8 @@ test_expect_success \
cat >editor <<\EOF
#!/bin/sh
-sed -i -e "s/amend/older/g" $1
+sed -e "s/amend/older/g" < $1 > $1-
+mv $1- $1
EOF
chmod 755 editor

54
devel/git/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.7 2007/09/08 11:29:40 bernd Exp $
@comment $OpenBSD: PLIST-main,v 1.8 2007/12/17 20:00:05 bernd Exp $
@pkgpath devel/git
bin/git
bin/git-add
@ -6,8 +6,6 @@ bin/git-add--interactive
bin/git-am
bin/git-annotate
bin/git-apply
bin/git-applymbox
bin/git-applypatch
bin/git-archimport
bin/git-archive
bin/git-bisect
@ -42,6 +40,7 @@ bin/git-fast-import
bin/git-fetch
bin/git-fetch--tool
bin/git-fetch-pack
bin/git-filter-branch
bin/git-fmt-merge-msg
bin/git-for-each-ref
bin/git-format-patch
@ -97,6 +96,7 @@ bin/git-push
bin/git-quiltimport
bin/git-read-tree
bin/git-rebase
bin/git-rebase--interactive
bin/git-receive-pack
bin/git-reflog
bin/git-relink
@ -124,8 +124,10 @@ bin/git-ssh-fetch
bin/git-ssh-pull
bin/git-ssh-push
bin/git-ssh-upload
bin/git-stash
bin/git-status
bin/git-stripspace
bin/git-submodule
bin/git-symbolic-ref
bin/git-tag
bin/git-tar-tree
@ -149,8 +151,6 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
@man man/man1/git-am.1
@man man/man1/git-annotate.1
@man man/man1/git-apply.1
@man man/man1/git-applymbox.1
@man man/man1/git-applypatch.1
@man man/man1/git-archimport.1
@man man/man1/git-archive.1
@man man/man1/git-bisect.1
@ -164,6 +164,7 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
@man man/man1/git-checkout.1
@man man/man1/git-cherry-pick.1
@man man/man1/git-cherry.1
@man man/man1/git-citool.1
@man man/man1/git-clean.1
@man man/man1/git-clone.1
@man man/man1/git-commit-tree.1
@ -183,6 +184,7 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
@man man/man1/git-fast-import.1
@man man/man1/git-fetch-pack.1
@man man/man1/git-fetch.1
@man man/man1/git-filter-branch.1
@man man/man1/git-fmt-merge-msg.1
@man man/man1/git-for-each-ref.1
@man man/man1/git-format-patch.1
@ -191,6 +193,7 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
@man man/man1/git-gc.1
@man man/man1/git-get-tar-commit-id.1
@man man/man1/git-grep.1
@man man/man1/git-gui.1
@man man/man1/git-hash-object.1
@man man/man1/git-http-fetch.1
@man man/man1/git-http-push.1
@ -256,8 +259,10 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
@man man/man1/git-show.1
@man man/man1/git-ssh-fetch.1
@man man/man1/git-ssh-upload.1
@man man/man1/git-stash.1
@man man/man1/git-status.1
@man man/man1/git-stripspace.1
@man man/man1/git-submodule.1
@man man/man1/git-symbolic-ref.1
@man man/man1/git-tag.1
@man man/man1/git-tar-tree.1
@ -278,6 +283,7 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
@man man/man3p/Git.3p
@man man/man5/gitattributes.5
@man man/man5/gitignore.5
@man man/man5/gitmodules.5
share/doc/git/
share/doc/git/RelNotes-1.5.0.1.txt
share/doc/git/RelNotes-1.5.0.2.txt
@ -300,6 +306,14 @@ share/doc/git/RelNotes-1.5.2.3.txt
share/doc/git/RelNotes-1.5.2.4.txt
share/doc/git/RelNotes-1.5.2.5.txt
share/doc/git/RelNotes-1.5.2.txt
share/doc/git/RelNotes-1.5.3.1.txt
share/doc/git/RelNotes-1.5.3.2.txt
share/doc/git/RelNotes-1.5.3.3.txt
share/doc/git/RelNotes-1.5.3.4.txt
share/doc/git/RelNotes-1.5.3.5.txt
share/doc/git/RelNotes-1.5.3.6.txt
share/doc/git/RelNotes-1.5.3.7.txt
share/doc/git/RelNotes-1.5.3.txt
share/doc/git/blame-options.txt
share/doc/git/cmds-ancillaryinterrogators.txt
share/doc/git/cmds-ancillarymanipulators.txt
@ -311,7 +325,6 @@ share/doc/git/cmds-purehelpers.txt
share/doc/git/cmds-synchelpers.txt
share/doc/git/cmds-synchingrepositories.txt
share/doc/git/config.txt
share/doc/git/core-intro.txt
share/doc/git/core-tutorial.html
share/doc/git/core-tutorial.txt
share/doc/git/cvs-migration.html
@ -331,10 +344,6 @@ share/doc/git/git-annotate.html
share/doc/git/git-annotate.txt
share/doc/git/git-apply.html
share/doc/git/git-apply.txt
share/doc/git/git-applymbox.html
share/doc/git/git-applymbox.txt
share/doc/git/git-applypatch.html
share/doc/git/git-applypatch.txt
share/doc/git/git-archimport.html
share/doc/git/git-archimport.txt
share/doc/git/git-archive.html
@ -361,6 +370,8 @@ share/doc/git/git-cherry-pick.html
share/doc/git/git-cherry-pick.txt
share/doc/git/git-cherry.html
share/doc/git/git-cherry.txt
share/doc/git/git-citool.html
share/doc/git/git-citool.txt
share/doc/git/git-clean.html
share/doc/git/git-clean.txt
share/doc/git/git-clone.html
@ -399,6 +410,8 @@ share/doc/git/git-fetch-pack.html
share/doc/git/git-fetch-pack.txt
share/doc/git/git-fetch.html
share/doc/git/git-fetch.txt
share/doc/git/git-filter-branch.html
share/doc/git/git-filter-branch.txt
share/doc/git/git-fmt-merge-msg.html
share/doc/git/git-fmt-merge-msg.txt
share/doc/git/git-for-each-ref.html
@ -415,6 +428,8 @@ share/doc/git/git-get-tar-commit-id.html
share/doc/git/git-get-tar-commit-id.txt
share/doc/git/git-grep.html
share/doc/git/git-grep.txt
share/doc/git/git-gui.html
share/doc/git/git-gui.txt
share/doc/git/git-hash-object.html
share/doc/git/git-hash-object.txt
share/doc/git/git-http-fetch.html
@ -469,8 +484,6 @@ share/doc/git/git-mv.html
share/doc/git/git-mv.txt
share/doc/git/git-name-rev.html
share/doc/git/git-name-rev.txt
share/doc/git/git-p4import.html
share/doc/git/git-p4import.txt
share/doc/git/git-pack-objects.html
share/doc/git/git-pack-objects.txt
share/doc/git/git-pack-redundant.html
@ -547,10 +560,14 @@ share/doc/git/git-ssh-fetch.html
share/doc/git/git-ssh-fetch.txt
share/doc/git/git-ssh-upload.html
share/doc/git/git-ssh-upload.txt
share/doc/git/git-stash.html
share/doc/git/git-stash.txt
share/doc/git/git-status.html
share/doc/git/git-status.txt
share/doc/git/git-stripspace.html
share/doc/git/git-stripspace.txt
share/doc/git/git-submodule.html
share/doc/git/git-submodule.txt
share/doc/git/git-svn.html
share/doc/git/git-svn.txt
share/doc/git/git-svnimport.html
@ -595,6 +612,8 @@ share/doc/git/gitignore.html
share/doc/git/gitignore.txt
share/doc/git/gitk.html
share/doc/git/gitk.txt
share/doc/git/gitmodules.html
share/doc/git/gitmodules.txt
share/doc/git/glossary.html
share/doc/git/glossary.txt
share/doc/git/hooks.html
@ -624,6 +643,7 @@ share/doc/git/tutorial-2.html
share/doc/git/tutorial-2.txt
share/doc/git/tutorial.html
share/doc/git/tutorial.txt
share/doc/git/urls-remotes.txt
share/doc/git/urls.txt
share/doc/git/user-manual.html
share/doc/git/user-manual.txt
@ -652,17 +672,27 @@ share/git-gui/
share/git-gui/lib/
share/git-gui/lib/blame.tcl
share/git-gui/lib/branch.tcl
share/git-gui/lib/branch_checkout.tcl
share/git-gui/lib/branch_create.tcl
share/git-gui/lib/branch_delete.tcl
share/git-gui/lib/branch_rename.tcl
share/git-gui/lib/browser.tcl
share/git-gui/lib/checkout_op.tcl
share/git-gui/lib/choose_font.tcl
share/git-gui/lib/choose_rev.tcl
share/git-gui/lib/class.tcl
share/git-gui/lib/commit.tcl
share/git-gui/lib/console.tcl
share/git-gui/lib/database.tcl
share/git-gui/lib/diff.tcl
share/git-gui/lib/encoding.tcl
share/git-gui/lib/error.tcl
share/git-gui/lib/index.tcl
share/git-gui/lib/merge.tcl
share/git-gui/lib/option.tcl
share/git-gui/lib/remote.tcl
share/git-gui/lib/remote_branch_delete.tcl
share/git-gui/lib/shortcut.tcl
share/git-gui/lib/status_bar.tcl
share/git-gui/lib/tclIndex
share/git-gui/lib/transport.tcl