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

Update to git-1.6.4.

Browse Source 
Tested by Simon Kuhnle, sturm@, msf@ and Daniel Dickman.
Thanks!
This commit is contained in:
bernd 2009-08-17 14:47:54 +00:00
parent 823e192159
commit 5c0b50e772
7 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/git/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.49 2009/07/29 14:22:12 bernd Exp $
# $OpenBSD: Makefile,v 1.50 2009/08/17 14:47:54 bernd Exp $
COMMENT-main= GIT - Tree History Storage Tool
COMMENT-svn= GIT - subversion interoperability tools
COMMENT-x11= GIT - graphical tools
V= 1.6.3.4
V= 1.6.4
DISTNAME= git-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-svn= git-svn-${V}

30
devel/git/distinfo
View File

@ -1,15 +1,15 @@
MD5 (git-1.6.3.4.tar.gz) = QfQatouJmEnvaLC5gFfzMA==
MD5 (git-htmldocs-1.6.3.4.tar.gz) = 6LXptKw2s4OxkIVEFgWDTQ==
MD5 (git-manpages-1.6.3.4.tar.gz) = T1PCnWckQRHfrLN++xC1Yg==
RMD160 (git-1.6.3.4.tar.gz) = iL/Jy8sjlk8jyMgsis3RvEKi1CY=
RMD160 (git-htmldocs-1.6.3.4.tar.gz) = PiuwpObxyFu4Gp6vZkS23kPIIaU=
RMD160 (git-manpages-1.6.3.4.tar.gz) = XILsojZaAyCLMnFkMzMPsHD352M=
SHA1 (git-1.6.3.4.tar.gz) = 0rKccgBHulfAwrC/VRU07P2ylMo=
SHA1 (git-htmldocs-1.6.3.4.tar.gz) = b/MKiU57+K/jQ0I611ywGyCFK/U=
SHA1 (git-manpages-1.6.3.4.tar.gz) = 2WWuCToR95oHMRg2bUvioKGXKf4=
SHA256 (git-1.6.3.4.tar.gz) = qBOGVAM1Vg6GwgwT5iS5GlK+iJTbiYSQhOJIM30Yl7U=
SHA256 (git-htmldocs-1.6.3.4.tar.gz) = lRAXjfOjNz/24qxsnRnsm01ClX4ogFe1ycSEfkL2tLk=
SHA256 (git-manpages-1.6.3.4.tar.gz) = OFf3ZFjzVduGiFby28R1MiH9xJ+q/3QEbE7mfsF96nI=
SIZE (git-1.6.3.4.tar.gz) = 2518365
SIZE (git-htmldocs-1.6.3.4.tar.gz) = 1052494
SIZE (git-manpages-1.6.3.4.tar.gz) = 345583
MD5 (git-1.6.4.tar.gz) = vL6ccWEzAiSKKefmXTJebA==
MD5 (git-htmldocs-1.6.4.tar.gz) = 4PZ0/9Vd+x0dF+WgATxlIQ==
MD5 (git-manpages-1.6.4.tar.gz) = G/mUQq7Xdn6sSKA23GmCVg==
RMD160 (git-1.6.4.tar.gz) = tmDg2zWRRtUb8OqMrgAMlojzJU4=
RMD160 (git-htmldocs-1.6.4.tar.gz) = aO3/iHbgNmiHkbPPaFuJzvklnRc=
RMD160 (git-manpages-1.6.4.tar.gz) = XtLNxvLFrumu7xVIQwgemo/D5JU=
SHA1 (git-1.6.4.tar.gz) = HEBXHU/Qm3b5zjQ16Gb+MzjfS7M=
SHA1 (git-htmldocs-1.6.4.tar.gz) = QdcorqpRJhP1UBdnD2vRj6Xl9bY=
SHA1 (git-manpages-1.6.4.tar.gz) = P+5ZC2BTkuqVZhXa8HBDo86qPB4=
SHA256 (git-1.6.4.tar.gz) = RO3xJ8rpT8LE8hp7KB4GapNd161qYD9I7eHQp3jZOSI=
SHA256 (git-htmldocs-1.6.4.tar.gz) = HhqrMVBJYrW67k3iN0Z/JMijoJjc2mf9EdF9g2ShMGw=
SHA256 (git-manpages-1.6.4.tar.gz) = wsUcHdztc+K0wPD2oqAHaLUG0wQu11LpUa2dkdK3DX0=
SIZE (git-1.6.4.tar.gz) = 2621645
SIZE (git-htmldocs-1.6.4.tar.gz) = 1063903
SIZE (git-manpages-1.6.4.tar.gz) = 349774

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

@ -1,6 +1,6 @@
--- Makefile.orig Wed Jul 29 10:06:16 2009
+++ Makefile Wed Jul 29 15:49:41 2009
@@ -192,7 +192,7 @@ uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo
--- Makefile.orig Wed Jul 29 10:18:18 2009
+++ Makefile Sat Aug 1 10:41:01 2009
@@ -212,7 +212,7 @@ uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo
# CFLAGS and LDFLAGS are for the users to override from the command line.
@ -9,7 +9,7 @@
LDFLAGS =
ALL_CFLAGS = $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
@@ -210,22 +210,16 @@ STRIP ?= strip
@@ -230,22 +230,16 @@ STRIP ?= strip
# runtime figures out where they are based on the path to the executable.
# This can help installing the suite in a relocatable way.
@ -35,8 +35,8 @@
+ETC_GITCONFIG = $(SYSCONFDIR)/gitconfig
lib = lib
# DESTDIR=
@@ -249,16 +243,16 @@ GITWEB_SITE_FOOTER =
pathsep = :
@@ -270,16 +264,16 @@ GITWEB_SITE_FOOTER =
export prefix bindir sharedir sysconfdir
@ -57,7 +57,7 @@
export TCL_PATH TCLTK_PATH
@@ -751,13 +745,12 @@ ifeq ($(uname_S),FreeBSD)
@@ -791,13 +785,12 @@ ifeq ($(uname_S),FreeBSD)
endif
endif
ifeq ($(uname_S),OpenBSD)
@ -74,7 +74,7 @@
endif
ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@ -923,7 +916,7 @@ ifndef NO_POSIX_ONLY_PROGRAMS
@@ -1009,7 +1002,7 @@ ifndef NO_POSIX_ONLY_PROGRAMS
PROGRAMS += git-imap-send$X
endif
ifndef NO_OPENSSL
@ -83,7 +83,7 @@
ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
@@ -1484,7 +1477,7 @@ all:: $(TEST_PROGRAMS)
@@ -1589,7 +1582,7 @@ all:: $(TEST_PROGRAMS)
export NO_SVN_TESTS

16
devel/git/patches/patch-builtin-help_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-builtin-help_c,v 1.3 2009/05/18 19:23:58 bernd Exp $
$OpenBSD: patch-builtin-help_c,v 1.4 2009/08/17 14:47:54 bernd Exp $
Fix "warning: missing sentinel in function call" on 64bit archs.
--- builtin-help.c.orig Thu May 7 06:29:04 2009
+++ builtin-help.c Fri May 8 09:52:09 2009
@@ -123,7 +123,7 @@ static void exec_woman_emacs(const char *path, const c
--- builtin-help.c.orig Wed Jul 29 10:18:18 2009
+++ builtin-help.c Sat Aug 1 10:41:01 2009
@@ -119,7 +119,7 @@ static void exec_woman_emacs(const char *path, const c
if (!path)
path = "emacsclient";
strbuf_addf(&man_page, "(woman \"%s\")", page);
@ -13,7 +13,7 @@ Fix "warning: missing sentinel in function call" on 64bit archs.
warning("failed to exec '%s': %s", path, strerror(errno));
}
}
@@ -151,7 +151,7 @@ static void exec_man_konqueror(const char *path, const
@@ -147,7 +147,7 @@ static void exec_man_konqueror(const char *path, const
} else
path = "kfmclient";
strbuf_addf(&man_page, "man:%s(1)", page);
@ -22,7 +22,7 @@ Fix "warning: missing sentinel in function call" on 64bit archs.
warning("failed to exec '%s': %s", path, strerror(errno));
}
}
@@ -160,7 +160,7 @@ static void exec_man_man(const char *path, const char
@@ -156,7 +156,7 @@ static void exec_man_man(const char *path, const char
{
if (!path)
path = "man";
@ -31,7 +31,7 @@ Fix "warning: missing sentinel in function call" on 64bit archs.
warning("failed to exec '%s': %s", path, strerror(errno));
}
@@ -168,7 +168,7 @@ static void exec_man_cmd(const char *cmd, const char *
@@ -164,7 +164,7 @@ static void exec_man_cmd(const char *cmd, const char *
{
struct strbuf shell_cmd = STRBUF_INIT;
strbuf_addf(&shell_cmd, "%s %s", cmd, page);
@ -40,7 +40,7 @@ Fix "warning: missing sentinel in function call" on 64bit archs.
warning("failed to exec '%s': %s", cmd, strerror(errno));
}
@@ -375,7 +375,7 @@ static void show_info_page(const char *git_cmd)
@@ -371,7 +371,7 @@ static void show_info_page(const char *git_cmd)
{
const char *page = cmd_to_page(git_cmd);
setenv("INFOPATH", system_path(GIT_INFO_PATH), 1);

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

@ -1,10 +1,10 @@
$OpenBSD: patch-gitweb_gitweb_perl,v 1.10 2009/04/05 10:05:35 bernd Exp $
$OpenBSD: patch-gitweb_gitweb_perl,v 1.11 2009/08/17 14:47:54 bernd Exp $
This prevents the following error: '-T and -B not implemented on filehandles'
--- gitweb/gitweb.perl.orig Wed Mar 4 09:18:50 2009
+++ gitweb/gitweb.perl Sat Mar 7 14:12:04 2009
@@ -4774,7 +4774,7 @@ sub git_blob_plain {
--- gitweb/gitweb.perl.orig Wed Jul 29 10:18:18 2009
+++ gitweb/gitweb.perl Sat Aug 1 10:41:01 2009
@@ -4924,7 +4924,7 @@ sub git_blob_plain {
$expires = "+1d";
}
@ -13,7 +13,7 @@ This prevents the following error: '-T and -B not implemented on filehandles'
or die_error(500, "Open git-cat-file blob '$hash' failed");
# content-type (can include charset)
@@ -4828,7 +4828,7 @@ sub git_blob {
@@ -4977,7 +4977,7 @@ sub git_blob {
}
my $have_blame = gitweb_check_feature('blame');

8
devel/git/patches/patch-imap-send_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-imap-send_c,v 1.4 2009/05/18 19:23:58 bernd Exp $
$OpenBSD: patch-imap-send_c,v 1.5 2009/08/17 14:47:54 bernd Exp $
Fix "warning: missing sentinel in function call" on 64bit archs.
--- imap-send.c.orig Thu May 7 06:29:04 2009
+++ imap-send.c Fri May 8 09:52:09 2009
--- imap-send.c.orig Wed Jul 29 10:18:18 2009
+++ imap-send.c Sat Aug 1 10:41:01 2009
@@ -498,7 +498,7 @@ static void arc4_init(void)
int i, fd;
unsigned char j, si, dat[128];
@ -13,7 +13,7 @@ Fix "warning: missing sentinel in function call" on 64bit archs.
fprintf(stderr, "Fatal: no random number source available.\n");
exit(3);
}
@@ -1011,7 +1011,7 @@ static struct store *imap_open_store(struct imap_serve
@@ -1009,7 +1009,7 @@ static struct store *imap_open_store(struct imap_serve
_exit(127);
close(a[0]);
close(a[1]);

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.30 2009/07/29 14:22:12 bernd Exp $
@comment $OpenBSD: PLIST-main,v 1.31 2009/08/17 14:47:54 bernd Exp $
@pkgpath devel/git
@bin bin/git
bin/git-cvsserver
@ -10,6 +10,7 @@ lib/libgit.a
libdata/perl5/site_perl/Git.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libexec/git/
@bin libexec/git/git
@bin libexec/git/git-add
libexec/git/git-add--interactive
libexec/git/git-am
@ -372,6 +373,7 @@ share/doc/git/RelNotes-1.6.3.2.txt
share/doc/git/RelNotes-1.6.3.3.txt
share/doc/git/RelNotes-1.6.3.4.txt
share/doc/git/RelNotes-1.6.3.txt
share/doc/git/RelNotes-1.6.4.txt
share/doc/git/blame-options.txt
share/doc/git/cmds-ancillaryinterrogators.txt
share/doc/git/cmds-ancillarymanipulators.txt