diff --git a/devel/git/Makefile b/devel/git/Makefile index 35fee4f5838..11521ef7f7c 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.56 2009/10/26 09:12:09 bernd Exp $ +# $OpenBSD: Makefile,v 1.57 2009/11/17 16:29:42 bernd Exp $ COMMENT-main= GIT - Tree History Storage Tool COMMENT-svn= GIT - subversion interoperability tools COMMENT-x11= GIT - graphical tools -V= 1.6.5.2 +V= 1.6.5.3 DISTNAME= git-${V} PKGNAME-main= ${DISTNAME} PKGNAME-svn= git-svn-${V} diff --git a/devel/git/distinfo b/devel/git/distinfo index e5db56c4b3b..ee4e5bfa36e 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,15 +1,15 @@ -MD5 (git-1.6.5.2.tar.gz) = GxZyqhrvc4p8+8cjt8PTnw== -MD5 (git-htmldocs-1.6.5.2.tar.gz) = 26m9l8wEZkwA3Y0mMYBakg== -MD5 (git-manpages-1.6.5.2.tar.gz) = yGI6SwMGYeLCBRkb6+xdyg== -RMD160 (git-1.6.5.2.tar.gz) = urT81vHsUnkEk4X0Tkfiumsg6Rg= -RMD160 (git-htmldocs-1.6.5.2.tar.gz) = +V7WA0dDUpcDlykAdXuHk4BPNwc= -RMD160 (git-manpages-1.6.5.2.tar.gz) = PA04SF7CWAO0TGfKQKMbI2Ulq4g= -SHA1 (git-1.6.5.2.tar.gz) = xUH7SvMhtdSimabD8HorFGutEyA= -SHA1 (git-htmldocs-1.6.5.2.tar.gz) = uI/Y919aw46pIFscCGAnQ5Ffi2w= -SHA1 (git-manpages-1.6.5.2.tar.gz) = eIf9gD3XX9mSaHOhD9pE54HpYBY= -SHA256 (git-1.6.5.2.tar.gz) = fW3Jg/5ITsIu+VbfBDhszX9FixZ1vQRlnCLmGCGjxFk= -SHA256 (git-htmldocs-1.6.5.2.tar.gz) = r4K6HlEOQB/lfXjyQxzgAQy9JLjUi8+V1ocpfPglwsA= -SHA256 (git-manpages-1.6.5.2.tar.gz) = vJEfvjNF0NCcmuvaleMTNFa1e7MORulZVwwo0w/nTw4= -SIZE (git-1.6.5.2.tar.gz) = 2704448 -SIZE (git-htmldocs-1.6.5.2.tar.gz) = 1086122 -SIZE (git-manpages-1.6.5.2.tar.gz) = 367575 +MD5 (git-1.6.5.3.tar.gz) = xX+q4vAQksh7+nDISRslLA== +MD5 (git-htmldocs-1.6.5.3.tar.gz) = oGGtYCUhjCx55TRJoMfWQA== +MD5 (git-manpages-1.6.5.3.tar.gz) = 7Ys1hOm7m7kmSHTdkkNBXQ== +RMD160 (git-1.6.5.3.tar.gz) = 1YlS3Vu00zgGikYsBpyHYKV3k8M= +RMD160 (git-htmldocs-1.6.5.3.tar.gz) = hbte/zFPIeml4C2jJuB/wFDvxpI= +RMD160 (git-manpages-1.6.5.3.tar.gz) = /RENoqmrMdIDmge8IeXweH5o78g= +SHA1 (git-1.6.5.3.tar.gz) = rapPh2qlhYqcRlleBf87nunUb74= +SHA1 (git-htmldocs-1.6.5.3.tar.gz) = 6EiMiLURjdlu6KhfnPRJ4qkPjsk= +SHA1 (git-manpages-1.6.5.3.tar.gz) = g1yKO+9ytrMv5RUaNZA/HBp6DME= +SHA256 (git-1.6.5.3.tar.gz) = cAbA0nLYr7nmQFHNbF8tVSqdQJSFyphDWjQZldVAA1g= +SHA256 (git-htmldocs-1.6.5.3.tar.gz) = pjVCsleItHwNtMccb0Lf8NhBjjJUb4CvLnhKTlj0OTI= +SHA256 (git-manpages-1.6.5.3.tar.gz) = Kg1Sok3KUFeoWkqRiHToJO92zSWwUiHVcWUeqs5dvxI= +SIZE (git-1.6.5.3.tar.gz) = 2708784 +SIZE (git-htmldocs-1.6.5.3.tar.gz) = 1088032 +SIZE (git-manpages-1.6.5.3.tar.gz) = 368115 diff --git a/devel/git/patches/patch-Makefile b/devel/git/patches/patch-Makefile index 64aa01bd506..c3dbf44cc4b 100644 --- a/devel/git/patches/patch-Makefile +++ b/devel/git/patches/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Sun Oct 11 03:42:04 2009 -+++ Makefile Mon Oct 12 15:38:28 2009 -@@ -214,7 +214,7 @@ uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo +--- Makefile.orig Mon Nov 16 23:14:46 2009 ++++ Makefile Tue Nov 17 14:30:55 2009 +@@ -218,7 +218,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) -@@ -232,22 +232,16 @@ STRIP ?= strip +@@ -236,22 +236,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. @@ -36,7 +36,7 @@ lib = lib # DESTDIR= pathsep = : -@@ -272,16 +266,16 @@ GITWEB_SITE_FOOTER = +@@ -276,16 +270,16 @@ GITWEB_SITE_FOOTER = export prefix bindir sharedir sysconfdir @@ -57,7 +57,7 @@ export TCL_PATH TCLTK_PATH -@@ -798,13 +792,12 @@ ifeq ($(uname_S),FreeBSD) +@@ -803,13 +797,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) -@@ -1078,7 +1071,7 @@ ifndef NO_POSIX_ONLY_PROGRAMS +@@ -1083,7 +1076,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) -@@ -1666,7 +1659,7 @@ all:: $(TEST_PROGRAMS) +@@ -1671,7 +1664,7 @@ all:: $(TEST_PROGRAMS) export NO_SVN_TESTS diff --git a/devel/git/patches/patch-builtin-help_c b/devel/git/patches/patch-builtin-help_c index c9472f8f32c..bd7d91748c6 100644 --- a/devel/git/patches/patch-builtin-help_c +++ b/devel/git/patches/patch-builtin-help_c @@ -1,9 +1,9 @@ -$OpenBSD: patch-builtin-help_c,v 1.4 2009/08/17 14:47:54 bernd Exp $ +$OpenBSD: patch-builtin-help_c,v 1.5 2009/11/17 16:29:42 bernd Exp $ Fix "warning: missing sentinel in function call" on 64bit archs. ---- builtin-help.c.orig Wed Jul 29 10:18:18 2009 -+++ builtin-help.c Sat Aug 1 10:41:01 2009 +--- builtin-help.c.orig Mon Nov 16 23:14:46 2009 ++++ builtin-help.c Tue Nov 17 14:31:50 2009 @@ -119,7 +119,7 @@ static void exec_woman_emacs(const char *path, const c if (!path) path = "emacsclient"; @@ -46,6 +46,6 @@ Fix "warning: missing sentinel in function call" on 64bit archs. setenv("INFOPATH", system_path(GIT_INFO_PATH), 1); - execlp("info", "info", "gitman", page, NULL); + execlp("info", "info", "gitman", page, (void *)NULL); + die("no info viewer handled the request"); } - static void get_html_page_path(struct strbuf *page_path, const char *page) diff --git a/devel/git/patches/patch-gitweb_gitweb_perl b/devel/git/patches/patch-gitweb_gitweb_perl index 28820521541..eb6283dbed9 100644 --- a/devel/git/patches/patch-gitweb_gitweb_perl +++ b/devel/git/patches/patch-gitweb_gitweb_perl @@ -1,10 +1,10 @@ -$OpenBSD: patch-gitweb_gitweb_perl,v 1.13 2009/10/16 10:55:06 bernd Exp $ +$OpenBSD: patch-gitweb_gitweb_perl,v 1.14 2009/11/17 16:29:42 bernd Exp $ This prevents the following error: '-T and -B not implemented on filehandles' ---- gitweb/gitweb.perl.orig Sun Oct 11 03:42:04 2009 -+++ gitweb/gitweb.perl Mon Oct 12 15:38:28 2009 -@@ -4953,7 +4953,7 @@ sub git_blob_plain { +--- gitweb/gitweb.perl.orig Mon Nov 16 23:14:46 2009 ++++ gitweb/gitweb.perl Tue Nov 17 14:30:56 2009 +@@ -4952,7 +4952,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) -@@ -5006,7 +5006,7 @@ sub git_blob { +@@ -5005,7 +5005,7 @@ sub git_blob { } my $have_blame = gitweb_check_feature('blame'); diff --git a/devel/git/patches/patch-imap-send_c b/devel/git/patches/patch-imap-send_c index b2508c77677..4046d22352a 100644 --- a/devel/git/patches/patch-imap-send_c +++ b/devel/git/patches/patch-imap-send_c @@ -1,10 +1,10 @@ -$OpenBSD: patch-imap-send_c,v 1.5 2009/08/17 14:47:54 bernd Exp $ +$OpenBSD: patch-imap-send_c,v 1.6 2009/11/17 16:29:42 bernd Exp $ Fix "warning: missing sentinel in function call" on 64bit archs. ---- 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) +--- imap-send.c.orig Mon Nov 16 23:14:46 2009 ++++ imap-send.c Tue Nov 17 14:30:56 2009 +@@ -502,7 +502,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); } -@@ -1009,7 +1009,7 @@ static struct store *imap_open_store(struct imap_serve +@@ -1013,7 +1013,7 @@ static struct store *imap_open_store(struct imap_serve _exit(127); close(a[0]); close(a[1]); diff --git a/devel/git/patches/patch-t_t4019-diff-wserror_sh b/devel/git/patches/patch-t_t4019-diff-wserror_sh index e34f6908f56..f87cc637948 100644 --- a/devel/git/patches/patch-t_t4019-diff-wserror_sh +++ b/devel/git/patches/patch-t_t4019-diff-wserror_sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-t_t4019-diff-wserror_sh,v 1.3 2008/09/27 21:47:20 bernd Exp $ ---- t/t4019-diff-wserror.sh.orig Sun Aug 17 22:43:06 2008 -+++ t/t4019-diff-wserror.sh Mon Aug 25 09:30:05 2008 +$OpenBSD: patch-t_t4019-diff-wserror_sh,v 1.4 2009/11/17 16:29:42 bernd Exp $ +--- t/t4019-diff-wserror.sh.orig Mon Nov 16 23:14:46 2009 ++++ t/t4019-diff-wserror.sh Tue Nov 17 14:55:54 2009 @@ -23,8 +23,8 @@ blue_grep='7;34m' ;# ESC [ 7 ; 3 4 m test_expect_success default ' @@ -100,3 +100,12 @@ $OpenBSD: patch-t_t4019-diff-wserror_sh,v 1.3 2008/09/27 21:47:20 bernd Exp $ grep Eight normal >/dev/null && grep HT error >/dev/null && +@@ -195,7 +195,7 @@ test_expect_success 'color new trailing blank lines' ' + git add x && + { echo a; echo; echo; echo; echo c; echo; echo; echo; echo; } >x && + git diff --color x >output && +- cnt=$(grep "${blue_grep}" output | wc -l) && ++ cnt=$(grep -a "${blue_grep}" output | wc -l) && + test $cnt = 2 + ' + diff --git a/devel/git/pkg/PLIST-main b/devel/git/pkg/PLIST-main index c330d96d7ef..df1f4eeb802 100644 --- a/devel/git/pkg/PLIST-main +++ b/devel/git/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.37 2009/10/26 09:12:10 bernd Exp $ +@comment $OpenBSD: PLIST-main,v 1.38 2009/11/17 16:29:42 bernd Exp $ @pkgpath devel/git @bin bin/git bin/git-cvsserver @@ -384,6 +384,7 @@ share/doc/git/RelNotes-1.6.4.4.txt share/doc/git/RelNotes-1.6.4.txt share/doc/git/RelNotes-1.6.5.1.txt share/doc/git/RelNotes-1.6.5.2.txt +share/doc/git/RelNotes-1.6.5.3.txt share/doc/git/RelNotes-1.6.5.txt share/doc/git/blame-options.txt share/doc/git/cmds-ancillaryinterrogators.txt